Eduardo Quezada
|
341ce6fd95
|
Merge remote-tracking branch 'merrp_origin/followers-expanded-id' into merrp/followers_RHH_merge3
# Conflicts:
# .github/workflows/build.yml
# README.md
# gflib/sprite.c
# graphics/pokemon/banette/anim_front.png
# graphics/pokemon/banette/normal.pal
# graphics/pokemon/sentret/normal.pal
# graphics/pokemon/togetic/anim_front.png
# graphics/pokemon/togetic/normal.pal
# include/battle_script_commands.h
# include/data.h
# ld_script.txt
# src/battle_controller_player.c
# src/bike.c
# src/event_object_movement.c
|
2023-06-16 21:25:16 -04:00 |
|
LOuroboros
|
db02cd05f6
|
Purged the bKGD warning once and for all
|
2023-02-24 02:01:55 -03:00 |
|
Ariel A
|
ac6e8cd54e
|
Updated Squirtle & evolutions OW graphics. Credit: andrian_timeswift
|
2023-01-12 21:33:16 -05:00 |
|
Ariel A
|
1991f65954
|
Fixed Magnemite & Magneton OW sprite colors.
|
2022-08-14 15:16:26 -04:00 |
|
Ariel A
|
0aff5fc780
|
Updated Whismur follower sprite.
|
2022-07-15 19:34:48 -04:00 |
|
Ariel A
|
53a4708e72
|
Updated Snubbull follower sprite.
|
2022-07-04 16:50:06 -04:00 |
|
Ariel A
|
3a1be34d24
|
Updated Skiploom & Shuppet OW sprites. Credit: Jaizu
|
2022-06-21 20:00:11 -04:00 |
|
Ariel A
|
326cb5d1b3
|
Updated Combusken follower sprite. Credit: Jaizu
|
2022-05-26 20:34:41 -04:00 |
|
Ariel A
|
5727a467c4
|
Updated Chansey, Espeon, Gyarados and Magikarp sprites. Credit: Jaizu
|
2022-05-18 19:53:27 -04:00 |
|
Ariel A
|
01f73f54e1
|
Added follower transform effect and Castform forms. Credit: larryturbo
Castform forms from https://www.deviantart.com/larryturbo/art/351-Castform-Froms-830190053
|
2022-05-18 19:12:30 -04:00 |
|
Ariel A
|
8672530f10
|
Fixed missing include in event_object_movement. Fixed Lombre follower palette. Credit: Jaizu
|
2022-05-13 22:21:23 -04:00 |
|
Ariel A
|
d8a5fbdf70
|
Updated Donphan, Taillow, Swellow follower sprites. Credit: SonikkuA-DatH
|
2022-01-22 17:41:00 -05:00 |
|
BuffelSaft
|
adcf563ba1
|
Add missing berry data
Certain gen 4+ berries were missing graphics and berry data. Adding this data allows them to be viewed and planted.
|
2021-10-26 14:42:06 +13:00 |
|
Ariel Antonitis
|
38a21c436f
|
Updated Silcoon & Cascoon object events. Contributed by @SonikkuA-DatH.
|
2021-09-30 00:00:54 -04:00 |
|
Ariel Antonitis
|
b2f901058e
|
Changed 64x64 follower sprites to 32x32 ones, by LarryTurbo.
Sprite resource:
https://www.deviantart.com/larryturbo/art/Resized-OWs-for-Gen-1-4-mons-larger-than-32x32-878575906
|
2021-09-23 23:30:46 -04:00 |
|
Ariel Antonitis
|
ff2f8735c9
|
Edited OW sprites to better use vanilla palettes. Contributed by @ShinyDragonHunter (Regirock & Registeel) and @SonikkuA-DatH (others).
|
2021-09-02 20:25:41 -04:00 |
|
Ariel Antonitis
|
7d420b22e8
|
Added affine animations for followers entering/exiting pokeball.
|
2021-05-05 19:58:44 -04:00 |
|
Ariel Antonitis
|
42d5fe07fa
|
Start of implementation for time of day filter.
|
2021-03-03 02:05:21 -05:00 |
|
Ariel Antonitis
|
418cab092c
|
Fixed old graphics info collisions.
|
2021-03-03 02:00:22 -05:00 |
|
Ariel Antonitis
|
04ce1eaf83
|
Added Mr. Mime & Farfetch'd. Fixed transparency issues.
|
2021-03-03 01:48:45 -05:00 |
|
Ariel Antonitis
|
bd01b80c1d
|
Added Castform.
|
2021-03-03 01:47:37 -05:00 |
|
Ariel Antonitis
|
693246f711
|
Added Unown OW forms.
|
2021-03-03 01:47:20 -05:00 |
|
Ariel Antonitis
|
6969f3d6f7
|
Added Nidoran M & Nidoran F sprites.
|
2021-03-03 01:47:09 -05:00 |
|
Ariel Antonitis
|
6692cd992f
|
Added all 386 follower sprites.
Allow NPC pokemon objects via a custom script header.
|
2021-03-03 01:46:43 -05:00 |
|
Ariel Antonitis
|
be60824263
|
Add Banette event object.
|
2021-03-03 01:33:26 -05:00 |
|
Ariel Antonitis
|
1fa2bc0df1
|
Fixed follower not disappearing when surfing.
|
2021-03-03 01:33:13 -05:00 |
|
Ariel Antonitis
|
4bd6642033
|
Use front sprite palettes for event objects.
|
2021-03-03 01:29:52 -05:00 |
|
Ariel Antonitis
|
e52b70e46f
|
Updated follower scripting (applymovement).
|
2021-03-03 01:04:37 -05:00 |
|
Ariel Antonitis
|
8a3dfbf252
|
Added pokemon followers & script commands.
|
2021-03-03 01:04:22 -05:00 |
|
Ariel Antonitis
|
2e32a27d75
|
Testing follower pokemon.
|
2021-03-03 00:51:43 -05:00 |
|
ExpoSeed
|
208e0abe04
|
Merge branch 'master' of https://github.com/pret/pokeemerald into HEAD
|
2020-12-31 18:44:43 -06:00 |
|
GriffinR
|
bf65c1fb25
|
Name object event pals/tags
|
2020-11-23 14:24:48 -05:00 |
|
DizzyEggg
|
13c0c64d70
|
Merge with master
|
2020-02-23 12:41:36 +01:00 |
|
Marcus Huderle
|
49421a41b2
|
Move field effects data and graphics into own directory, and cleanup naming for object events
|
2020-02-12 17:32:51 -06:00 |
|
GriffinR
|
68cdd7b1cb
|
Merge master into ObjEvent rename
|
2019-12-21 05:19:27 -05:00 |
|
GriffinR
|
570881b119
|
Rename event_object directories
|
2019-11-21 00:44:55 -05:00 |
|