Eduardo Quezada
8854eaa880
Removed duplicated object event tags
2024-05-28 14:16:34 -04: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
Eduardo Quezada
ebbcb7d025
Whitespace, documentation and style
2024-01-22 19:12:52 -03:00
Eduardo Quezada
ddc752eb14
Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/merrpFollowers
...
# Conflicts:
# asm/macros/event.inc
# data/field_effect_scripts.s
# data/maps/BattleFrontier_BattleTowerLobby/scripts.inc
# data/script_cmd_table.inc
# graphics/pokemon/castform/sunny/anim_front.png
# graphics/pokemon/castform/sunny/normal.pal
# include/battle_util.h
# include/constants/event_object_movement.h
# include/constants/field_effects.h
# src/battle_controller_player.c
# src/battle_util.c
# src/data/object_events/movement_action_func_tables.h
# src/data/object_events/object_event_pic_tables.h
# src/data/trainer_graphics/back_pic_anims.h
# src/daycare.c
# src/event_object_movement.c
# src/field_effect_helpers.c
# src/load_save.c
# src/scrcmd.c
# src/trainer_see.c
2024-01-17 18:11:35 -03:00
psf
fe16a2cdee
Port pokefirered's Vs. Seeker to pokeemerald ( #3256 )
...
* First version of Vs. Seeker
* Update movement.inc
98f7e9978d (r1306721924)https://github.com/rh-hideout/pokeemerald-expansion/pull/3256/files#r1306722004
* Update field_effect_scripts.s
https://github.com/rh-hideout/pokeemerald-expansion/pull/3256/files#r1306722024
* Update item_use.h
https://github.com/rh-hideout/pokeemerald-expansion/pull/3256/files#r1306722401
* Update movement_action_func_tables.h
https://github.com/rh-hideout/pokeemerald-expansion/pull/3256/files#r1306722828
* Update event_object_movement.c
https://github.com/rh-hideout/pokeemerald-expansion/pull/3256/files#r1306722887
* Update overworld.c
https://github.com/rh-hideout/pokeemerald-expansion/pull/3256/files#r1306723396
* Update vs_seeker.h
https://github.com/rh-hideout/pokeemerald-expansion/pull/3256/files#r1306724158
* Update vs_seeker.c
Addressed some cleanup comments from SBird
* Update UpdateRandomTrainerRematches
Fixed typo in ClearAllTrainerRematchStates
Fixed types in GetRematchableTrainerLocalId
* Updated UseVsSeekerEffect_2
* Updated UseVsSeekerEffect_3
* Updated UseVsSeekerEffect_4
* Fixed bug that allowed Vs Seeker to be used indoors in correct places
Moved VsSeeker function declarations into header
* Refactored FieldUseFunc_VsSeeker
* Added curly braces to else case in FieldUseFunc_VsSeeker
* renamed data[x] in Task_ResetObjectsRematchWantedState
* Refactored Task_ResetObjectsRematchWantedState
* Refactored VsSeekerResetObjectMovementAfterChargeComplete
* Refactored ResetMovementOfRematchableTrainers
* Refactored GatherNearbyTrainerInfo
* Refactored Task_VsSeeker_3
* CanUseVsSeeker
* Refactored GetVsSeekerResponseInArea
* GetCurVsSeekerResponse refactored
* Cleaned up GetTrainerFlagFromScript
* Gave sensible names to Task_VsSeeker
* Fixed two bugs where player would not have the right gfx state after using VsSeeker on a Bike or Underwater
* Renamed UseVsSeeker Functions
* Added I_VS_SEEKER_CHARGING to make Vs. Seeker broken until flag is assigned
Removed extra VsSeeker animation code
* Addressed PR feedback
* Fixed issue with building non-modern
* Refactored GetRunningBehaviorFromGraphicsId and renamed to GetResponseMovementTypeFromTrainerGraphicsId
* Addresses Lunos's PR feedback: https://github.com/rh-hideout/pokeemerald-expansion/pull/3256\#pullrequestreview-1623547850
Removed the check to see if a map was not indoors to improve readability
Made IsValidLocationForVsSeeker into a static function
* Added changes in response to Jasper's feedback
https://github.com/rh-hideout/pokeemerald-expansion/pull/3256\#pullrequestreview-1725276522
* Updated with Edu's discord feedback https://discord.com/channels/419213663107416084/1135040810082123907/1176872015085453392
* Removed ifdef tags around the repo unless needed
b5dc744ced
2023-11-26 18:58:43 +01:00
Ariel A
28ec60a776
Fixed some field effect palettes. Removed leftover CacheLightMetatiles.
2022-05-10 23:21:54 -04:00
Ariel A
483d4b3448
Fixed all field effects with gendered palette tags (warp arrow, surf blob, bird)
2022-04-27 22:43:12 -04: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
07bf225f94
Continue battle_transition documenting
2021-10-29 11:24:36 -04:00
LOuroboros
554210c5e3
Removed trailing spaces in the most relevant files
...
Command used for the job:
egrep -rl ' $' --include *.c --include *.h --include *.s --include *.inc --include *.txt * | xargs sed -i 's/\s\+$//g'
Credits to Grant Murphy from Stack Overflow.
2021-08-24 19:59:32 -03:00
Ariel Antonitis
875c4edd50
Added some conditional messages.
...
Added emote graphics.
2021-04-18 21:00:27 -04:00
GriffinR
1ce929157f
Clean up field effect doc
2020-07-02 05:05:13 -04:00
GriffinR
4ea6992172
Continue documenting overworld/field effects
2020-06-29 01:26:29 -04:00
GriffinR
18d57a3802
Document some overworld and field effects
2020-06-23 15:48:53 -04:00
Fontbane
e8add87bf3
Document Field Effects and some related text
...
Also VAR_TRICK_HOUSE_LEVEL
2019-03-23 09:57:37 -05:00
Phlosioneer
e90e3458cb
Document the regi* code more
...
Fixed some confusing naming, named some unknown symbols, and fixed the
names of some flags.
2019-02-15 18:24:55 -05:00
Marcus Huderle
d0d870e193
Cleanup formatting
2018-12-29 11:36:54 -06:00
Marcus Huderle
67636b7c64
Document deoxys rock
2018-12-29 11:36:54 -06:00
Slawter666
1d46507110
Move field effects enum to defines
2018-11-13 14:19:04 +00:00
