kittenchilly
19009c6d21
Add support for overworld sprite gender differences + add all the sprites ( #5394 )
2024-10-04 17:56:21 +02:00
ghoulslash
be3ee1ba85
merge w upcoming
2024-09-29 13:33:20 -04:00
ghoulslash
b7246a018c
merge w upcoming
2024-09-22 09:13:25 -04:00
Bassoonian
0b429a8649
Merrp merge (September 9th) ( #5359 )
2024-09-15 13:21:39 +02:00
hedara90
9633cefd11
Custom anim table follower macro & Farfetch'd example ( #5309 )
...
Co-authored-by: Hedara <hedara90@gmail.com>
2024-09-13 10:30:01 -03:00
Liamjd14
5d8c61d813
Pokemon follower changes for issue #5135 ( #5336 )
2024-09-12 18:55:30 +02:00
Eduardo Quezada
002c770f07
Merge remote-tracking branch '_merrp_origin/followers-expanded-id' into _RHH/pr/master/merrpMerge
2024-09-09 13:52:34 -03:00
Liamjd14
e9c0784dc0
Gen 9 Follower pokemon sprites ( #5304 )
...
* Gen 9 Follower Sprites
2024-09-05 22:31:14 +02:00
Ariel A
42d9f24c84
feat: added OW_MON_WANDER_WALK config option
2024-09-01 17:17:24 -04:00
Cafei
213c097dc0
Paldean Wooper and Clodsire followers ( #5277 )
2024-08-28 11:47:08 +02:00
Eduardo Quezada
18980b20a3
Remove trailing whitespace (master) ( #5174 )
2024-08-14 19:48:20 -07:00
Hedara
a9492f5b1c
Fixed Xerneas
2024-08-06 16:52:42 +02:00
ghoulslash
0cffe4a96a
syntax fixes, turn slow movement on rock stairs default off, remove petalburg layout change
2024-07-08 14:08:15 -04:00
ghoulslash
b8dea3c7ec
sideways stairs, try to integrate with follower code
2024-06-19 10:50:59 -04:00
Eduardo Quezada
88028c0c37
Split Pokémon Object Events from Following Pokémon functionality ( #4761 )
...
* Split Pokémon Object Events from Following Pokémon functionality
* Renamed follower pngs and palettes
* Define renames
* Reorder configs
* Renaming: SpeciesInfo fields, macros and palettes.
2024-06-13 22:46:27 +02:00
Bassoonian
03cc0ae6b3
Add option to hide substitute followers ( #4765 )
...
* Add option to hide substitute followers
* Update event_object_movement.c
2024-06-12 13:53:01 -04:00
Eduardo Quezada
3202625ca5
Restored Gen 4-8 followers
...
This reverts commit 24913f53392f6f1353d59a3975f1dfd5db9f2d00.
# Conflicts:
# src/data/pokemon/species_info/gen_4_families.h
# src/data/pokemon/species_info/gen_5_families.h
# src/data/pokemon/species_info/gen_8_families.h
2024-06-02 10:31:01 -04:00
Eduardo Quezada
569749f9c2
Merge remote-tracking branch '_merrp_origin/followers-expanded-id' into _RHH/pr/upcoming/merrpFollowers
...
# Conflicts:
# Makefile
# gflib/sprite.h
# graphics/object_events/pics/pokemon/wailord.png
# include/constants/event_objects.h
# include/random.h
# src/data/object_events/object_event_graphics.h
# src/data/object_events/object_event_graphics_info.h
# src/data/object_events/object_event_graphics_info_pointers.h
# src/event_object_movement.c
# src/random.c
# src/scrcmd.c
2024-05-18 10:12:17 -04:00
Ariel A
d3849f2fc6
Merge branch 'followers' into followers-expanded-id
2024-05-17 20:46:24 -04:00
Ariel A
6856bcf610
refactor: code review for expansion
2024-05-17 20:45:32 -04:00
Eduardo Quezada
24913f5339
TEMPORARY: Reverted Gen 4-8 followers
2024-05-17 14:40:45 -04:00
Eduardo Quezada
d5268b9f01
Final cleanup
2024-05-16 18:08:10 -04:00
Eduardo Quezada
45ee5b5c8f
Multiple fixes (see commit description)
...
- New Eternatus 32x32 sprite by Gerben BSc
- Fixed missing Hero Zamazenta sprite
- Fixed missing Single Strike Urshifu sprite
- Moved Alcremie Strawberry sprite to respective folder
2024-05-11 19:09:05 -04:00
Ariel A
f3b637c115
fix: castform OW sprite & palette
...
fixed #34
2024-05-04 18:47:25 -04:00
Ariel A
e36a7c59cf
Merge branch 'followers' into followers-expanded-id
2024-05-03 00:45:04 -04:00
Ariel A
758e4049cd
fix: LARGE_OW_SUPPORT and affine OW movements
...
fixed #33
2024-05-03 00:43:39 -04:00
Ariel A
ee0d7a467a
fix: reverted Wailord OW gfx back to 32x32
2024-04-28 20:37:08 -04:00
Eduardo Quezada
1a4bc69c5a
Moved follower settings to overworld config
2024-02-18 00:16:59 -03:00
Eduardo Quezada
124c17d315
Merge remote-tracking branch 'merrp_origin/followers-expanded-id' into _RHH/pr/upcoming/merrpFollowers
...
# Conflicts:
# README.md
# data/field_effect_scripts.s
# data/maps/AncientTomb/scripts.inc
# data/maps/DesertRuins/scripts.inc
# data/maps/IslandCave/scripts.inc
# data/scripts/follower.inc
# graphics/object_events/pics/pokemon/wailord.png
# graphics/object_events/pics/pokemon_old/substitute.png
# include/constants/event_objects.h
# include/global.h
# remote_build.sh
# spritesheet_rules.mk
# src/bike.c
# src/data/object_events/object_event_anims.h
# src/data/object_events/object_event_graphics.h
# src/data/object_events/object_event_graphics_info_followers.h
# src/data/object_events/object_event_pic_tables.h
# src/event_object_movement.c
# src/field_effect_helpers.c
# src/field_screen_effect.c
# src/overworld.c
# src/palette.c
# src/pokemon_summary_screen.c
# src/scrcmd.c
# src/trainer_see.c
2024-02-17 23:40:08 -03:00
Ariel A
195d2bb79a
Merge branch 'followers' into followers-expanded-id
2024-02-17 17:19:01 -05:00
Ariel A
6bceacf403
Added override table for standalone follower palettes.
2024-02-17 16:55:11 -05:00
Ariel A
725252905b
Merge branch 'merrp/pr/style' into followers
2024-02-15 22:49:36 -05:00
Ariel A
a407c72235
Cleaned up follower code.
...
Added support for asymmetrical follower pokemon.
Fixed bug with changing GraphicsInfo size.
Added follower Substitute gfx. Credit: shikashipx
2024-02-12 20:37:01 -05:00
Eduardo Quezada
5119ee2d39
Can disable follower graphics
2024-01-24 20:13:07 -03:00
Eduardo Quezada
f5239aae3c
Reading Follower data from gSpeciesInfo
2024-01-24 19:28:40 -03:00
Eduardo Quezada
2e1a3d4191
Pic table capitalization
2024-01-23 14:13:39 -03:00
Eduardo Quezada
45caead1c2
Missing ascending frames
2024-01-23 14:11:14 -03:00
Eduardo Quezada
c29a33ea78
Moved follower sprites to graphics/pokemon folder
2024-01-23 14:04:16 -03:00
Eduardo Quezada
ebbcb7d025
Whitespace, documentation and style
2024-01-22 19:12:52 -03:00
Eduardo Quezada
ea10a1dc55
Fixed compile
2024-01-22 13:46:32 -03:00
Eduardo Quezada
19b4731c3b
Added subfolders to follower sprites (to be moved to the general mon graphic folder
2024-01-22 13:09:26 -03:00
Ariel A
b56158428e
Added new follower pokeballs & toggle.
...
Credit: shikashipx
2024-01-21 17:21:33 -05:00
Eduardo Quezada
89958a0dc0
Gen 4+ followers
2024-01-20 00:32:52 -03:00
Eduardo Quezada
48df87577b
Ascending frames
2024-01-19 23:50:52 -03:00
Eduardo Quezada
9ff599963c
0xFFFF -> TAG_NONE
2024-01-19 23:50:38 -03:00
Eduardo Quezada
e452ee93b9
Preparing ready for Gen 4+ followers
2024-01-19 23:06:32 -03:00
Eduardo Quezada
11b97597c8
Moved old mon graphics to its own folder so it's easier for the script to run
2024-01-19 14:52:34 -03:00
Eduardo Quezada
17a7c26b90
Reverted accidental INCBIN_COMPs
2024-01-19 14:27:11 -03:00
Eduardo Quezada
9d27aa7b70
Fixed Steelix, Lugia, Ho-Oh, Wailord, Kyogre and Rayquaza sizes
2024-01-19 14:26:43 -03:00
Eduardo Quezada
d4f97c7a38
Fixed Groudon follower size
2024-01-19 10:42:21 -03:00
