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
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
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
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
GriffinR
07bf225f94
Continue battle_transition documenting
2021-10-29 11:24:36 -04:00
GriffinR
06351bf63c
Remove address comments
2021-07-20 15:18:31 -04:00
GriffinR
60ca1aa3fd
Restore tabs in field_effect_scripts.s
2020-07-23 05:07:20 -04:00
GriffinR
1ce929157f
Clean up field effect doc
2020-07-02 05:05:13 -04:00
GriffinR
eb80012757
Document more misc field effects
2020-06-29 16:32:46 -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
fcb541189d
Rename some flags, and use map ID macros
2019-02-18 02:02:20 -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
67636b7c64
Document deoxys rock
2018-12-29 11:36:54 -06:00
garak
e1e2132a37
sync fldeff function names with pokeruby
2018-12-09 22:24:54 -05:00
Slawter666
137f6549ff
label field_effect_helpers
2018-10-14 23:43:40 +01:00
DizzyEggg
3bcd30969a
cut field effect is decompiled and documented
2018-06-16 14:04:29 +02:00
Marcus Huderle
4d13e3394a
Bring all movement function names up-to-date with pokeruby
2018-06-13 17:51:26 -05:00
Diegoisawesome
416d67c832
Finish porting/decompiling field_effect.c
2018-05-10 18:36:57 -05:00
Diegoisawesome
80062972ae
Begin porting field_effect
2018-05-10 03:02:33 -05:00
KDSKardabox
a3d065d0bd
Decompile rom6
2018-04-10 12:17:29 +05:30
DizzyEggg
eb00e8ba4a
more work on battle transition
2018-01-02 20:38:33 +01:00
DizzyEggg
5744356989
decompile trainer see
2017-12-18 23:26:44 +01:00
ProjectRevoTPP
e7175999f5
decompile braille_puzzles.c
2017-10-05 13:02:39 -04:00
DizzyEggg
a55c5925a6
label gMapHeader
2017-09-08 18:31:57 +02:00
DizzyEggg
75a94ce58e
split and label
2017-09-04 12:22:04 +02:00
YamaArashi
a793e62d83
.s -> .inc
2016-11-01 08:29:13 -07:00
YamaArashi
f5879e72d9
clean up aligns
2016-09-03 14:31:43 -07:00
YamaArashi
deb6d7c6ba
split data1.s
2016-09-03 10:20:06 -07:00
YamaArashi
a11fe6f83b
global labels
2016-09-03 01:17:20 -07:00
YamaArashi
7bef2a2783
convert comments (; -> @)
2016-09-02 19:51:16 -07:00
YamaArashi
5ce2d43498
field effect graphics and scripts
2015-11-25 16:43:06 -08:00
