Eduardo Quezada
5130ea9da3
Merge branch '_RHH/master' into _RHH/upcoming
2024-09-28 11:45:49 -03:00
Rachel
b478881fc6
Add in-battle shadows underneath all enemy battlers ( #5178 )
...
* Add data to SpeciesInfo entries for in-battle shadows
* Implement sized shadows in the sprite visualizer
* Implement sized shadows in game code
* Show shadows for the lead battler for opponents during their battle anim
* Feedback on shadows, round 1
* Revert removal of Goomy and Sliggoo shadows
* Fixed GEN_3 setting
* Code cleanup + remove pre-processor branches
* Fix bugs with gen-3 configuration branch
* Style corrections, final shadow coordinate adjustments
* Adjustments to Garbodor and Araquanid
2024-09-10 21:27:49 +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
Ariel A
42d9f24c84
feat: added OW_MON_WANDER_WALK config option
2024-09-01 17:17:24 -04:00
Ariel A
839cf2e790
feat: static OW pokemon now bob while walking in place (per OW_MON_BOBBING)
2024-09-01 15:31:12 -04:00
hedara90
47356d181a
Fixed followers breaking for species IDs above 1535 ( #5179 )
...
* Fixed followers breaking for species Ids above 1535
* Added reminder to increase follower species bits if needed in the future
---------
Co-authored-by: Hedara <hedara90@gmail.com>
2024-08-15 10:27:35 -07:00
Eduardo Quezada
e6e2285c44
Added OBJ_EVENT_GFX_SPECIES_SHINY
2024-08-11 14:50:38 -04:00
Eduardo Quezada
d88834dd58
Backported OBJ_EVENT_GFX_SPECIES macro from Expansion
2024-08-07 13:42:18 -04:00
Eduardo Quezada
3372503430
Added OBJ_EVENT_GFX_SPECIES_SHINY macro ( #5049 )
...
* Added OBJ_EVENT_GFX_SPECIES_SHINY
* Update src/event_object_movement.c
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
---------
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2024-07-29 18:41:03 +02: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
Eduardo Quezada
ff480dec27
More review comments
2024-05-28 18:32:20 -04:00
Eduardo Quezada
8854eaa880
Removed duplicated object event tags
2024-05-28 14:16:34 -04:00
Eduardo Quezada
9fc7e37c73
Comment updates
2024-05-21 19:38:42 -04:00
Eduardo Quezada
73a13e5dd4
Some review changes
2024-05-18 10:40:09 -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
1a4bc69c5a
Moved follower settings to overworld config
2024-02-18 00:16:59 -03:00
Eduardo Quezada
f350000b44
Option to disabling follower Pokémon
2024-02-17 23:49:52 -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
Eduardo Quezada
f5239aae3c
Reading Follower data from gSpeciesInfo
2024-01-24 19:28:40 -03:00
Ariel A
b56158428e
Added new follower pokeballs & toggle.
...
Credit: shikashipx
2024-01-21 17:21:33 -05:00
Eduardo Quezada
5d372b5f8a
Merge remote-tracking branch 'merrp_origin/followers-expanded-id' into _RHH/pr/upcoming/merrpFollowers
...
# Conflicts:
# README.md
# gflib/sprite.c
# graphics/object_events/pics/pokemon/togetic.png
# 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_followers.h
# src/event_object_movement.c
# src/field_effect_helpers.c
2024-01-18 08:12:09 -03:00
Ariel A
dcaaac92d9
Added support for compressed OW graphics.
...
Added CpuSmartCopy macros (Credit: luckytyphlosion)
2023-12-31 00:35:27 -05:00
Ariel A
bf80e5cf4f
Merge branch 'followers' into followers-expanded-id
...
# TODOs changed:
# -: Define action flags:
2023-09-03 17:42:31 -04:00
Ariel A
d929aa60ed
Added support for 48x48 and 64x64 followers. See event_objects.h
2023-09-03 16:51:43 -04:00
Ariel A
394b4cb3a5
Merge branch 'followers' into followers-expanded-id
2023-07-29 17:26:31 -04:00
Ariel A
712669c822
Added support for follower bobbing. See event_objects.h
2023-07-29 17:23:32 -04:00
Eduardo Quezada
4bbe3278d6
Cleanup pt1
...
- Moved Tracks to the end of field effect scripts
- Restored whitespace in scripts to minimize conflicts
- Restored data/maps/map_groups.json
- Proper tab uses in scripts
- Allow SHADOW_SIZE_XL to be used
2023-06-17 23:34:01 -04:00
Eduardo Quezada
621ca115a2
Added OBJ_EVENT_GFX_SPECIES macro to help setting up OW Graphic IDs
2023-06-17 23:05:59 -04:00
Eduardo Quezada
33012d841a
Cleaning up follower Object Event IDs + Reverted OW Regis
...
TODO: allow OW mon to have their frames play more than once
2023-06-17 23:05:29 -04:00
Ariel A
5d392244be
Merge branch 'followers' into followers-expanded-id
2023-05-15 19:08:45 -04:00
Ariel A
d12efe8cd7
Merge branch 'master' into followers
2023-05-15 18:37:38 -04:00
GriffinR
de56e400ff
Sync clone object macro
2023-02-08 13:11:10 -05:00
Ariel A
3a0dc0f4f6
Reworked how OW pokemon's graphics are loaded.
2023-01-12 21:45:36 -05:00
Ariel A
72e723df65
Expanded graphicsId field.
2023-01-07 19:54:12 -05:00
Ariel A
9beee311c4
Merge branch 'master' into romhack
2022-07-17 15:13:15 -04:00
GriffinR
bc2dbd772e
Add warning to NUM_OBJ_EVENT_GFX
2022-06-03 16:18:34 -04:00
Ariel A
2273a61b37
Re-indexed follower & pokeball GFX IDs.
2022-02-22 20:14:02 -05:00
Ariel A
7daa78311b
Added more follower footprint types. Credit: Sonikku-DatH
...
https://www.pokecommunity.com/showthread.php?p=10410294#post10410294
2022-02-07 23:06:38 -05:00
Ariel A
bdcbb5c700
Merge branch 'master' into romhack
2021-12-18 17:14:52 -05:00
GriffinR
d414787932
Some TV clean-up
2021-11-16 16:22:17 -05:00
Ariel Antonitis
8a3b04e837
Merge branch 'master' into romhack
2021-09-02 01:03:13 -04:00
Ariel Antonitis
783149bd3f
Fixed bug where moving truck had a shadow.
2021-07-20 19:38:32 -04:00
GriffinR
0f538102d9
Add local id constants for C
2021-07-05 13:54:43 -04:00
GriffinR
10886a586b
Clean up mirage tower
2021-07-01 23:46:15 -04:00
Ariel Antonitis
221569a710
Merge branch 'master' into romhack
2021-04-18 22:17:53 -04:00
GriffinR
00c3044c96
Clarify Groudon/Kyogre/Rayquaza gfx names
2021-04-06 02:38:15 -04:00
Ariel Antonitis
4bd6642033
Use front sprite palettes for event objects.
2021-03-03 01:29:52 -05:00
