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)
* Update field_effect_scripts.s
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 |
|
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 |
|
Ariel A
|
1c011a9c1c
|
Merge branch 'master' into followers
|
2022-10-07 20:52:15 -04:00 |
|
Ariel A
|
8c60050553
|
Added proper movement actions for exiting/entering pokeball.
|
2022-08-28 23:34:39 -04:00 |
|
GriffinR
|
5515e328b2
|
Clean up lock/unlock anim movement
|
2022-08-12 21:18:10 -04:00 |
|
cbt6
|
9d18ad0b5a
|
Make arguments for create_movement_action required
|
2021-11-18 03:07:09 +08:00 |
|
cbt6
|
f23d9ff30e
|
Use movement action constant values over enum
|
2021-11-18 02:43:39 +08:00 |
|
cbt6
|
32aaf6912f
|
Rename movement scripts to use Faster over Fastest
|
2021-11-05 02:22:28 +08:00 |
|
Marcus Huderle
|
799edaf3e6
|
Document hide/show reflection movement actions
|
2019-10-06 14:17:34 -05:00 |
|
Marcus Huderle
|
e01dd90bb3
|
Update applymovement actions to reflect movement action names
|
2018-06-13 18:19:19 -05:00 |
|
Diegoisawesome
|
de8a058714
|
Extract more baseroms from maps
|
2017-11-10 02:52:05 -06:00 |
|
Diegoisawesome
|
29079c4b99
|
Dump numerous baseroms, begin moving data to proper files
|
2017-11-10 01:49:12 -06:00 |
|
Diegoisawesome
|
c23a633a44
|
Prepare for dumping
|
2017-10-23 21:18:49 -05:00 |
|