atiran/sovereignx
3
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
sovereignx/data/field_effect_scripts.s

377 lines
14 KiB
ArmAsm
Raw Permalink Normal View History

Port pokefirered's Vs. Seeker to pokeemerald (#3256) * First version of Vs. Seeker * Update movement.inc https://github.com/rh-hideout/pokeemerald-expansion/pull/3256/files/98f7e9978d8cd16083ea1bc7857f4f0235a9f1af#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 https://github.com/rh-hideout/pokeemerald-expansion/pull/3256/files/b5dc744cedc8e14c88d461afbbdc693c4f54e950
2023-11-26 17:58:43 +00:00
#include "config/item.h"
Restore tabs in field_effect_scripts.s
2020-07-23 10:05:03 +01:00
.include "asm/macros.inc"
.include "constants/constants.inc"
split data1.s
2016-09-03 18:20:06 +01:00
Restore tabs in field_effect_scripts.s
2020-07-23 10:05:03 +01:00
.section script_data, "aw", %progbits
split data1.s
2016-09-03 18:20:06 +01:00
Restore tabs in field_effect_scripts.s
2020-07-23 10:05:03 +01:00
.align 2
Remove address comments
2021-07-20 20:18:31 +01:00
gFieldEffectScriptPointers::
Restore tabs in field_effect_scripts.s
2020-07-23 10:05:03 +01:00
.4byte gFieldEffectScript_ExclamationMarkIcon1 @ FLDEFF_EXCLAMATION_MARK_ICON
.4byte gFieldEffectScript_UseCutOnTallGrass @ FLDEFF_USE_CUT_ON_GRASS
.4byte gFieldEffectScript_UseCutOnTree @ FLDEFF_USE_CUT_ON_TREE
.4byte gFieldEffectScript_Shadow @ FLDEFF_SHADOW
.4byte gFieldEffectScript_TallGrass @ FLDEFF_TALL_GRASS
.4byte gFieldEffectScript_Ripple @ FLDEFF_RIPPLE
.4byte gFieldEffectScript_FieldMoveShowMon @ FLDEFF_FIELD_MOVE_SHOW_MON
.4byte gFieldEffectScript_Ash @ FLDEFF_ASH
.4byte gFieldEffectScript_SurfBlob @ FLDEFF_SURF_BLOB
.4byte gFieldEffectScript_UseSurf @ FLDEFF_USE_SURF
.4byte gFieldEffectScript_GroundImpactDust @ FLDEFF_DUST
.4byte gFieldEffectScript_UseSecretPowerCave @ FLDEFF_USE_SECRET_POWER_CAVE
.4byte gFieldEffectScript_JumpTallGrass @ FLDEFF_JUMP_TALL_GRASS
.4byte gFieldEffectScript_SandFootprints @ FLDEFF_SAND_FOOTPRINTS
.4byte gFieldEffectScript_JumpBigSplash @ FLDEFF_JUMP_BIG_SPLASH
.4byte gFieldEffectScript_Splash @ FLDEFF_SPLASH
.4byte gFieldEffectScript_JumpSmallSplash @ FLDEFF_JUMP_SMALL_SPLASH
.4byte gFieldEffectScript_LongGrass @ FLDEFF_LONG_GRASS
.4byte gFieldEffectScript_JumpLongGrass @ FLDEFF_JUMP_LONG_GRASS
.4byte gFieldEffectScript_UnusedGrass @ FLDEFF_UNUSED_GRASS
.4byte gFieldEffectScript_UnusedGrass2 @ FLDEFF_UNUSED_GRASS_2
.4byte gFieldEffectScript_UnusedSand @ FLDEFF_UNUSED_SAND
.4byte gFieldEffectScript_WaterSurfacing @ FLDEFF_WATER_SURFACING
.4byte gFieldEffectScript_BerryTreeGrowthSparkle @ FLDEFF_BERRY_TREE_GROWTH_SPARKLE
.4byte gFieldEffectScript_DeepSandFootprints @ FLDEFF_DEEP_SAND_FOOTPRINTS
.4byte gFieldEffectScript_PokeCenterHeal @ FLDEFF_POKECENTER_HEAL
.4byte gFieldEffectScript_UseSecretPowerTree @ FLDEFF_USE_SECRET_POWER_TREE
.4byte gFieldEffectScript_UseSecretPowerShrub @ FLDEFF_USE_SECRET_POWER_SHRUB
.4byte gFieldEffectScript_TreeDisguise @ FLDEFF_TREE_DISGUISE
.4byte gFieldEffectScript_MountainDisguise @ FLDEFF_MOUNTAIN_DISGUISE
.4byte gFieldEffectScript_NPCUseFly @ FLDEFF_NPCFLY_OUT
.4byte gFieldEffectScript_UseFly @ FLDEFF_USE_FLY
.4byte gFieldEffectScript_FlyIn @ FLDEFF_FLY_IN
.4byte gFieldEffectScript_QuestionMarkIcon @ FLDEFF_QUESTION_MARK_ICON
.4byte gFieldEffectScript_FeetInFlowingWater @ FLDEFF_FEET_IN_FLOWING_WATER
.4byte gFieldEffectScript_BikeTireTracks @ FLDEFF_BIKE_TIRE_TRACKS
.4byte gFieldEffectScript_SandDisguisePlaceholder @ FLDEFF_SAND_DISGUISE
.4byte gFieldEffectScript_UseRockSmash @ FLDEFF_USE_ROCK_SMASH
.4byte gFieldEffectScript_UseDig @ FLDEFF_USE_DIG
.4byte gFieldEffectScript_SandPile @ FLDEFF_SAND_PILE
.4byte gFieldEffectScript_UseStrength @ FLDEFF_USE_STRENGTH
.4byte gFieldEffectScript_ShortGrass @ FLDEFF_SHORT_GRASS
.4byte gFieldEffectScript_HotSpringsWater @ FLDEFF_HOT_SPRINGS_WATER
.4byte gFieldEffectScript_UseWaterfall @ FLDEFF_USE_WATERFALL
.4byte gFieldEffectScript_UseDive @ FLDEFF_USE_DIVE
Continue battle_transition documenting
2021-10-27 21:17:27 +01:00
.4byte gFieldEffectScript_PokeballTrail @ FLDEFF_POKEBALL_TRAIL
Restore tabs in field_effect_scripts.s
2020-07-23 10:05:03 +01:00
.4byte gFieldEffectScript_HeartIcon @ FLDEFF_HEART_ICON
.4byte gFieldEffectScript_Nop47 @ FLDEFF_NOP_47
.4byte gFieldEffectScript_Nop48 @ FLDEFF_NOP_48
.4byte gFieldEffectScript_AshPuff @ FLDEFF_ASH_PUFF
.4byte gFieldEffectScript_AshLaunch @ FLDEFF_ASH_LAUNCH
.4byte gFieldEffectScript_SweetScent @ FLDEFF_SWEET_SCENT
.4byte gFieldEffectScript_SandPillar @ FLDEFF_SAND_PILLAR
.4byte gFieldEffectScript_Bubbles @ FLDEFF_BUBBLES
.4byte gFieldEffectScript_Sparkle @ FLDEFF_SPARKLE
.4byte gFieldEffectScript_ShowSecretPowerCave @ FLDEFF_SECRET_POWER_CAVE
.4byte gFieldEffectScript_ShowSecretPowerTree @ FLDEFF_SECRET_POWER_TREE
.4byte gFieldEffectScript_ShowSecretPowerShrub @ FLDEFF_SECRET_POWER_SHRUB
.4byte gFieldEffectScript_ShowCutGrass @ FLDEFF_CUT_GRASS
.4byte gFieldEffectScript_FieldMoveShowMonInit @ FLDEFF_FIELD_MOVE_SHOW_MON_INIT
.4byte gFieldEffectScript_UsePuzzleEffect @ FLDEFF_USE_TOMB_PUZZLE_EFFECT
.4byte gFieldEffectScript_SecretBaseBootPC @ FLDEFF_PCTURN_ON
.4byte gFieldEffectScript_HallOfFameRecord @ FLDEFF_HALL_OF_FAME_RECORD
.4byte gFieldEffectScript_UseTeleport @ FLDEFF_USE_TELEPORT
.4byte gFieldEffectScript_RayquazaSpotlight @ FLDEFF_RAYQUAZA_SPOTLIGHT
.4byte gFieldEffectScript_DestroyDeoxysRock @ FLDEFF_DESTROY_DEOXYS_ROCK
.4byte gFieldEffectScript_MoveDeoxysRock @ FLDEFF_MOVE_DEOXYS_ROCK
Port pokefirered's Vs. Seeker to pokeemerald (#3256) * First version of Vs. Seeker * Update movement.inc https://github.com/rh-hideout/pokeemerald-expansion/pull/3256/files/98f7e9978d8cd16083ea1bc7857f4f0235a9f1af#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 https://github.com/rh-hideout/pokeemerald-expansion/pull/3256/files/b5dc744cedc8e14c88d461afbbdc693c4f54e950
2023-11-26 17:58:43 +00:00
.4byte gFldEffScript_UseVsSeeker @ FLDEFF_USE_VS_SEEKER
.4byte gFldEffScript_XIcon @ FLDEFF_X_ICON
.4byte gFldEffScript_DoubleExclMarkIcon @ FLDEFF_DOUBLE_EXCL_MARK_ICON
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-17 02:22:58 +01:00
.4byte gFieldEffectScript_TracksSlither @ FLDEFF_TRACKS_SLITHER
Added more follower footprint types. Credit: Sonikku-DatH https://www.pokecommunity.com/showthread.php?p=10410294#post10410294
2022-02-08 02:57:24 +00:00
.4byte gFieldEffectScript_TracksBug @ FLDEFF_TRACKS_BUG
.4byte gFieldEffectScript_TracksSpot @ FLDEFF_TRACKS_SPOT
field effect graphics and scripts
2015-11-26 00:43:06 +00:00
Remove address comments
2021-07-20 20:18:31 +01:00
gFieldEffectScript_ExclamationMarkIcon1::
Restore tabs in field_effect_scripts.s
2020-07-23 10:05:03 +01:00
field_eff_callnative FldEff_ExclamationMarkIcon
field_eff_end
field effect graphics and scripts
2015-11-26 00:43:06 +00:00
Remove address comments
2021-07-20 20:18:31 +01:00
gFieldEffectScript_UseCutOnTallGrass::
Restore tabs in field_effect_scripts.s
2020-07-23 10:05:03 +01:00
field_eff_callnative FldEff_UseCutOnGrass
field_eff_end
field effect graphics and scripts
2015-11-26 00:43:06 +00:00
Remove address comments
2021-07-20 20:18:31 +01:00
gFieldEffectScript_UseCutOnTree::
Restore tabs in field_effect_scripts.s
2020-07-23 10:05:03 +01:00
field_eff_callnative FldEff_UseCutOnTree
field_eff_end
field effect graphics and scripts
2015-11-26 00:43:06 +00:00
Remove address comments
2021-07-20 20:18:31 +01:00
gFieldEffectScript_Shadow::
Restore tabs in field_effect_scripts.s
2020-07-23 10:05:03 +01:00
field_eff_callnative FldEff_Shadow
field_eff_end
field effect graphics and scripts
2015-11-26 00:43:06 +00:00
Remove address comments
2021-07-20 20:18:31 +01:00
gFieldEffectScript_TallGrass::
Restore tabs in field_effect_scripts.s
2020-07-23 10:05:03 +01:00
field_eff_loadfadedpal_callnative gSpritePalette_GeneralFieldEffect1, FldEff_TallGrass
field_eff_end
field effect graphics and scripts
2015-11-26 00:43:06 +00:00
Remove address comments
2021-07-20 20:18:31 +01:00
gFieldEffectScript_Ripple::
Restore tabs in field_effect_scripts.s
2020-07-23 10:05:03 +01:00
field_eff_loadfadedpal_callnative gSpritePalette_GeneralFieldEffect1, FldEff_Ripple
field_eff_end
field effect graphics and scripts
2015-11-26 00:43:06 +00:00
Remove address comments
2021-07-20 20:18:31 +01:00
gFieldEffectScript_FieldMoveShowMon::
Restore tabs in field_effect_scripts.s
2020-07-23 10:05:03 +01:00
field_eff_callnative FldEff_FieldMoveShowMon
field_eff_end
field effect graphics and scripts
2015-11-26 00:43:06 +00:00
Remove address comments
2021-07-20 20:18:31 +01:00
gFieldEffectScript_Ash::
Restore tabs in field_effect_scripts.s
2020-07-23 10:05:03 +01:00
field_eff_loadfadedpal_callnative gSpritePalette_GeneralFieldEffect1, FldEff_Ash
field_eff_end
field effect graphics and scripts
2015-11-26 00:43:06 +00:00
Remove address comments
2021-07-20 20:18:31 +01:00
gFieldEffectScript_SurfBlob::
Restore tabs in field_effect_scripts.s
2020-07-23 10:05:03 +01:00
field_eff_callnative FldEff_SurfBlob
field_eff_end
field effect graphics and scripts
2015-11-26 00:43:06 +00:00
Remove address comments
2021-07-20 20:18:31 +01:00
gFieldEffectScript_UseSurf::
Restore tabs in field_effect_scripts.s
2020-07-23 10:05:03 +01:00
field_eff_callnative FldEff_UseSurf
field_eff_end
field effect graphics and scripts
2015-11-26 00:43:06 +00:00
Remove address comments
2021-07-20 20:18:31 +01:00
gFieldEffectScript_GroundImpactDust::
Restore tabs in field_effect_scripts.s
2020-07-23 10:05:03 +01:00
field_eff_loadfadedpal_callnative gSpritePalette_GeneralFieldEffect0, FldEff_Dust
field_eff_end
field effect graphics and scripts
2015-11-26 00:43:06 +00:00
Remove address comments
2021-07-20 20:18:31 +01:00
gFieldEffectScript_UseSecretPowerCave::
Restore tabs in field_effect_scripts.s
2020-07-23 10:05:03 +01:00
field_eff_callnative FldEff_UseSecretPowerCave
field_eff_end
field effect graphics and scripts
2015-11-26 00:43:06 +00:00
Remove address comments
2021-07-20 20:18:31 +01:00
gFieldEffectScript_JumpTallGrass::
Restore tabs in field_effect_scripts.s
2020-07-23 10:05:03 +01:00
field_eff_loadfadedpal_callnative gSpritePalette_GeneralFieldEffect1, FldEff_JumpTallGrass
field_eff_end
field effect graphics and scripts
2015-11-26 00:43:06 +00:00
Remove address comments
2021-07-20 20:18:31 +01:00
gFieldEffectScript_SandFootprints::
Restore tabs in field_effect_scripts.s
2020-07-23 10:05:03 +01:00
field_eff_loadfadedpal_callnative gSpritePalette_GeneralFieldEffect0, FldEff_SandFootprints
field_eff_end
field effect graphics and scripts
2015-11-26 00:43:06 +00:00
Remove address comments
2021-07-20 20:18:31 +01:00
gFieldEffectScript_JumpBigSplash::
Restore tabs in field_effect_scripts.s
2020-07-23 10:05:03 +01:00
field_eff_loadfadedpal_callnative gSpritePalette_GeneralFieldEffect0, FldEff_JumpBigSplash
field_eff_end
field effect graphics and scripts
2015-11-26 00:43:06 +00:00
Remove address comments
2021-07-20 20:18:31 +01:00
gFieldEffectScript_Splash::
Restore tabs in field_effect_scripts.s
2020-07-23 10:05:03 +01:00
field_eff_loadfadedpal_callnative gSpritePalette_GeneralFieldEffect0, FldEff_Splash
field_eff_end
field effect graphics and scripts
2015-11-26 00:43:06 +00:00
Remove address comments
2021-07-20 20:18:31 +01:00
gFieldEffectScript_JumpSmallSplash::
Restore tabs in field_effect_scripts.s
2020-07-23 10:05:03 +01:00
field_eff_loadfadedpal_callnative gSpritePalette_GeneralFieldEffect0, FldEff_JumpSmallSplash
field_eff_end
field effect graphics and scripts
2015-11-26 00:43:06 +00:00
Remove address comments
2021-07-20 20:18:31 +01:00
gFieldEffectScript_LongGrass::
Restore tabs in field_effect_scripts.s
2020-07-23 10:05:03 +01:00
field_eff_loadfadedpal_callnative gSpritePalette_GeneralFieldEffect1, FldEff_LongGrass
field_eff_end
field effect graphics and scripts
2015-11-26 00:43:06 +00:00
Remove address comments
2021-07-20 20:18:31 +01:00
gFieldEffectScript_JumpLongGrass::
Restore tabs in field_effect_scripts.s
2020-07-23 10:05:03 +01:00
field_eff_loadfadedpal_callnative gSpritePalette_GeneralFieldEffect1, FldEff_JumpLongGrass
field_eff_end
field effect graphics and scripts
2015-11-26 00:43:06 +00:00
Remove address comments
2021-07-20 20:18:31 +01:00
gFieldEffectScript_UnusedGrass::
Restore tabs in field_effect_scripts.s
2020-07-23 10:05:03 +01:00
field_eff_loadfadedpal_callnative gSpritePalette_GeneralFieldEffect1, FldEff_UnusedGrass
field_eff_end
field effect graphics and scripts
2015-11-26 00:43:06 +00:00
Remove address comments
2021-07-20 20:18:31 +01:00
gFieldEffectScript_UnusedGrass2::
Restore tabs in field_effect_scripts.s
2020-07-23 10:05:03 +01:00
field_eff_loadfadedpal_callnative gSpritePalette_GeneralFieldEffect1, FldEff_UnusedGrass2
field_eff_end
field effect graphics and scripts
2015-11-26 00:43:06 +00:00
Remove address comments
2021-07-20 20:18:31 +01:00
gFieldEffectScript_UnusedSand::
Restore tabs in field_effect_scripts.s
2020-07-23 10:05:03 +01:00
field_eff_loadfadedpal_callnative gSpritePalette_GeneralFieldEffect0, FldEff_UnusedSand
field_eff_end
field effect graphics and scripts
2015-11-26 00:43:06 +00:00
Remove address comments
2021-07-20 20:18:31 +01:00
gFieldEffectScript_WaterSurfacing::
Restore tabs in field_effect_scripts.s
2020-07-23 10:05:03 +01:00
field_eff_loadfadedpal_callnative gSpritePalette_GeneralFieldEffect0, FldEff_WaterSurfacing
field_eff_end
field effect graphics and scripts
2015-11-26 00:43:06 +00:00
Remove address comments
2021-07-20 20:18:31 +01:00
gFieldEffectScript_BerryTreeGrowthSparkle::
Restore tabs in field_effect_scripts.s
2020-07-23 10:05:03 +01:00
field_eff_callnative FldEff_BerryTreeGrowthSparkle
field_eff_end
field effect graphics and scripts
2015-11-26 00:43:06 +00:00
Remove address comments
2021-07-20 20:18:31 +01:00
gFieldEffectScript_DeepSandFootprints::
Restore tabs in field_effect_scripts.s
2020-07-23 10:05:03 +01:00
field_eff_loadfadedpal_callnative gSpritePalette_GeneralFieldEffect0, FldEff_DeepSandFootprints
field_eff_end
field effect graphics and scripts
2015-11-26 00:43:06 +00:00
Remove address comments
2021-07-20 20:18:31 +01:00
gFieldEffectScript_PokeCenterHeal::
Restore tabs in field_effect_scripts.s
2020-07-23 10:05:03 +01:00
field_eff_loadfadedpal gSpritePalette_PokeballGlow
field_eff_loadfadedpal_callnative gSpritePalette_GeneralFieldEffect0, FldEff_PokecenterHeal
field_eff_end
field effect graphics and scripts
2015-11-26 00:43:06 +00:00
Remove address comments
2021-07-20 20:18:31 +01:00
gFieldEffectScript_UseSecretPowerTree::
Restore tabs in field_effect_scripts.s
2020-07-23 10:05:03 +01:00
field_eff_callnative FldEff_UseSecretPowerTree
field_eff_end
field effect graphics and scripts
2015-11-26 00:43:06 +00:00
Remove address comments
2021-07-20 20:18:31 +01:00
gFieldEffectScript_UseSecretPowerShrub::
Restore tabs in field_effect_scripts.s
2020-07-23 10:05:03 +01:00
field_eff_callnative FldEff_UseSecretPowerShrub
field_eff_end
field effect graphics and scripts
2015-11-26 00:43:06 +00:00
Remove address comments
2021-07-20 20:18:31 +01:00
gFieldEffectScript_TreeDisguise::
Restore tabs in field_effect_scripts.s
2020-07-23 10:05:03 +01:00
field_eff_callnative ShowTreeDisguiseFieldEffect
field_eff_end
field effect graphics and scripts
2015-11-26 00:43:06 +00:00
Remove address comments
2021-07-20 20:18:31 +01:00
gFieldEffectScript_MountainDisguise::
Restore tabs in field_effect_scripts.s
2020-07-23 10:05:03 +01:00
field_eff_callnative ShowMountainDisguiseFieldEffect
field_eff_end
field effect graphics and scripts
2015-11-26 00:43:06 +00:00
Remove address comments
2021-07-20 20:18:31 +01:00
gFieldEffectScript_NPCUseFly::
Restore tabs in field_effect_scripts.s
2020-07-23 10:05:03 +01:00
field_eff_callnative FldEff_NPCFlyOut
field_eff_end
field effect graphics and scripts
2015-11-26 00:43:06 +00:00
Remove address comments
2021-07-20 20:18:31 +01:00
gFieldEffectScript_UseFly::
Restore tabs in field_effect_scripts.s
2020-07-23 10:05:03 +01:00
field_eff_callnative FldEff_UseFly
field_eff_end
field effect graphics and scripts
2015-11-26 00:43:06 +00:00
Remove address comments
2021-07-20 20:18:31 +01:00
gFieldEffectScript_FlyIn::
Restore tabs in field_effect_scripts.s
2020-07-23 10:05:03 +01:00
field_eff_callnative FldEff_FlyIn
field_eff_end
field effect graphics and scripts
2015-11-26 00:43:06 +00:00
Remove address comments
2021-07-20 20:18:31 +01:00
gFieldEffectScript_QuestionMarkIcon::
Restore tabs in field_effect_scripts.s
2020-07-23 10:05:03 +01:00
field_eff_callnative FldEff_QuestionMarkIcon
field_eff_end
field effect graphics and scripts
2015-11-26 00:43:06 +00:00
Remove address comments
2021-07-20 20:18:31 +01:00
gFieldEffectScript_FeetInFlowingWater::
Restore tabs in field_effect_scripts.s
2020-07-23 10:05:03 +01:00
field_eff_loadfadedpal_callnative gSpritePalette_GeneralFieldEffect0, FldEff_FeetInFlowingWater
field_eff_end
field effect graphics and scripts
2015-11-26 00:43:06 +00:00
Remove address comments
2021-07-20 20:18:31 +01:00
gFieldEffectScript_BikeTireTracks::
Restore tabs in field_effect_scripts.s
2020-07-23 10:05:03 +01:00
field_eff_loadfadedpal_callnative gSpritePalette_GeneralFieldEffect0, FldEff_BikeTireTracks
field_eff_end
field effect graphics and scripts
2015-11-26 00:43:06 +00:00
Remove address comments
2021-07-20 20:18:31 +01:00
gFieldEffectScript_SandDisguisePlaceholder::
Restore tabs in field_effect_scripts.s
2020-07-23 10:05:03 +01:00
field_eff_callnative ShowSandDisguiseFieldEffect
field_eff_end
field effect graphics and scripts
2015-11-26 00:43:06 +00:00
Remove address comments
2021-07-20 20:18:31 +01:00
gFieldEffectScript_UseRockSmash::
Restore tabs in field_effect_scripts.s
2020-07-23 10:05:03 +01:00
field_eff_callnative FldEff_UseRockSmash
field_eff_end
field effect graphics and scripts
2015-11-26 00:43:06 +00:00
Remove address comments
2021-07-20 20:18:31 +01:00
gFieldEffectScript_UseStrength::
Restore tabs in field_effect_scripts.s
2020-07-23 10:05:03 +01:00
field_eff_callnative FldEff_UseStrength
field_eff_end
field effect graphics and scripts
2015-11-26 00:43:06 +00:00
Remove address comments
2021-07-20 20:18:31 +01:00
gFieldEffectScript_UseDig::
Restore tabs in field_effect_scripts.s
2020-07-23 10:05:03 +01:00
field_eff_callnative FldEff_UseDig
field_eff_end
field effect graphics and scripts
2015-11-26 00:43:06 +00:00
Remove address comments
2021-07-20 20:18:31 +01:00
gFieldEffectScript_SandPile::
Restore tabs in field_effect_scripts.s
2020-07-23 10:05:03 +01:00
field_eff_loadfadedpal_callnative gSpritePalette_GeneralFieldEffect0, FldEff_SandPile
field_eff_end
field effect graphics and scripts
2015-11-26 00:43:06 +00:00
Remove address comments
2021-07-20 20:18:31 +01:00
gFieldEffectScript_ShortGrass::
Restore tabs in field_effect_scripts.s
2020-07-23 10:05:03 +01:00
field_eff_loadfadedpal_callnative gSpritePalette_GeneralFieldEffect1, FldEff_ShortGrass
field_eff_end
field effect graphics and scripts
2015-11-26 00:43:06 +00:00
Remove address comments
2021-07-20 20:18:31 +01:00
gFieldEffectScript_HotSpringsWater::
Restore tabs in field_effect_scripts.s
2020-07-23 10:05:03 +01:00
field_eff_loadfadedpal_callnative gSpritePalette_GeneralFieldEffect1, FldEff_HotSpringsWater
field_eff_end
field effect graphics and scripts
2015-11-26 00:43:06 +00:00
Remove address comments
2021-07-20 20:18:31 +01:00
gFieldEffectScript_UseWaterfall::
Restore tabs in field_effect_scripts.s
2020-07-23 10:05:03 +01:00
field_eff_callnative FldEff_UseWaterfall
field_eff_end
field effect graphics and scripts
2015-11-26 00:43:06 +00:00
Remove address comments
2021-07-20 20:18:31 +01:00
gFieldEffectScript_UseDive::
Restore tabs in field_effect_scripts.s
2020-07-23 10:05:03 +01:00
field_eff_callnative FldEff_UseDive
field_eff_end
field effect graphics and scripts
2015-11-26 00:43:06 +00:00
Continue battle_transition documenting
2021-10-27 21:17:27 +01:00
gFieldEffectScript_PokeballTrail::
Restore tabs in field_effect_scripts.s
2020-07-23 10:05:03 +01:00
field_eff_loadpal gSpritePalette_Pokeball
Continue battle_transition documenting
2021-10-27 21:17:27 +01:00
field_eff_callnative FldEff_PokeballTrail
Restore tabs in field_effect_scripts.s
2020-07-23 10:05:03 +01:00
field_eff_end
field effect graphics and scripts
2015-11-26 00:43:06 +00:00
Remove address comments
2021-07-20 20:18:31 +01:00
gFieldEffectScript_HeartIcon::
Restore tabs in field_effect_scripts.s
2020-07-23 10:05:03 +01:00
field_eff_loadfadedpal_callnative gSpritePalette_GeneralFieldEffect0, FldEff_HeartIcon
field_eff_end
field effect graphics and scripts
2015-11-26 00:43:06 +00:00
Remove address comments
2021-07-20 20:18:31 +01:00
gFieldEffectScript_Nop47::
Restore tabs in field_effect_scripts.s
2020-07-23 10:05:03 +01:00
field_eff_callnative FldEff_Nop47
field_eff_end
field effect graphics and scripts
2015-11-26 00:43:06 +00:00
Remove address comments
2021-07-20 20:18:31 +01:00
gFieldEffectScript_Nop48::
Restore tabs in field_effect_scripts.s
2020-07-23 10:05:03 +01:00
field_eff_callnative FldEff_Nop48
field_eff_end
field effect graphics and scripts
2015-11-26 00:43:06 +00:00
Remove address comments
2021-07-20 20:18:31 +01:00
gFieldEffectScript_AshPuff::
Restore tabs in field_effect_scripts.s
2020-07-23 10:05:03 +01:00
field_eff_loadfadedpal_callnative gSpritePalette_Ash, FldEff_AshPuff
field_eff_end
field effect graphics and scripts
2015-11-26 00:43:06 +00:00
Remove address comments
2021-07-20 20:18:31 +01:00
gFieldEffectScript_AshLaunch::
Restore tabs in field_effect_scripts.s
2020-07-23 10:05:03 +01:00
field_eff_loadfadedpal_callnative gSpritePalette_Ash, FldEff_AshLaunch
field_eff_end
field effect graphics and scripts
2015-11-26 00:43:06 +00:00
Remove address comments
2021-07-20 20:18:31 +01:00
gFieldEffectScript_SweetScent::
Restore tabs in field_effect_scripts.s
2020-07-23 10:05:03 +01:00
field_eff_callnative FldEff_SweetScent
field_eff_end
field effect graphics and scripts
2015-11-26 00:43:06 +00:00
Remove address comments
2021-07-20 20:18:31 +01:00
gFieldEffectScript_SandPillar::
Restore tabs in field_effect_scripts.s
2020-07-23 10:05:03 +01:00
field_eff_loadfadedpal_callnative gSpritePalette_SandPillar, FldEff_SandPillar
field_eff_end
field effect graphics and scripts
2015-11-26 00:43:06 +00:00
Remove address comments
2021-07-20 20:18:31 +01:00
gFieldEffectScript_Bubbles::
Restore tabs in field_effect_scripts.s
2020-07-23 10:05:03 +01:00
field_eff_loadfadedpal_callnative gSpritePalette_GeneralFieldEffect0, FldEff_Bubbles
field_eff_end
field effect graphics and scripts
2015-11-26 00:43:06 +00:00
Remove address comments
2021-07-20 20:18:31 +01:00
gFieldEffectScript_Sparkle::
Restore tabs in field_effect_scripts.s
2020-07-23 10:05:03 +01:00
field_eff_loadfadedpal_callnative gSpritePalette_SmallSparkle, FldEff_Sparkle
field_eff_end
field effect graphics and scripts
2015-11-26 00:43:06 +00:00
Remove address comments
2021-07-20 20:18:31 +01:00
gFieldEffectScript_ShowSecretPowerCave::
Restore tabs in field_effect_scripts.s
2020-07-23 10:05:03 +01:00
field_eff_loadfadedpal_callnative gSpritePalette_SecretPower_Cave, FldEff_SecretPowerCave
field_eff_end
field effect graphics and scripts
2015-11-26 00:43:06 +00:00
Remove address comments
2021-07-20 20:18:31 +01:00
gFieldEffectScript_ShowSecretPowerTree::
Restore tabs in field_effect_scripts.s
2020-07-23 10:05:03 +01:00
field_eff_loadfadedpal_callnative gSpritePalette_SecretPower_Plant, FldEff_SecretPowerTree
field_eff_end
field effect graphics and scripts
2015-11-26 00:43:06 +00:00
Remove address comments
2021-07-20 20:18:31 +01:00
gFieldEffectScript_ShowSecretPowerShrub::
Restore tabs in field_effect_scripts.s
2020-07-23 10:05:03 +01:00
field_eff_loadfadedpal_callnative gSpritePalette_SecretPower_Plant, FldEff_SecretPowerShrub
field_eff_end
field effect graphics and scripts
2015-11-26 00:43:06 +00:00
Remove address comments
2021-07-20 20:18:31 +01:00
gFieldEffectScript_ShowCutGrass::
Restore tabs in field_effect_scripts.s
2020-07-23 10:05:03 +01:00
field_eff_loadfadedpal_callnative gSpritePalette_CutGrass, FldEff_CutGrass
field_eff_end
field effect graphics and scripts
2015-11-26 00:43:06 +00:00
Remove address comments
2021-07-20 20:18:31 +01:00
gFieldEffectScript_FieldMoveShowMonInit::
Restore tabs in field_effect_scripts.s
2020-07-23 10:05:03 +01:00
field_eff_callnative FldEff_FieldMoveShowMonInit
field_eff_end
field effect graphics and scripts
2015-11-26 00:43:06 +00:00
Remove address comments
2021-07-20 20:18:31 +01:00
gFieldEffectScript_UsePuzzleEffect::
Restore tabs in field_effect_scripts.s
2020-07-23 10:05:03 +01:00
field_eff_callnative FldEff_UsePuzzleEffect
field_eff_end
field effect graphics and scripts
2015-11-26 00:43:06 +00:00
Remove address comments
2021-07-20 20:18:31 +01:00
gFieldEffectScript_SecretBaseBootPC::
Restore tabs in field_effect_scripts.s
2020-07-23 10:05:03 +01:00
field_eff_callnative FldEff_SecretBasePCTurnOn
field_eff_end
field effect graphics and scripts
2015-11-26 00:43:06 +00:00
Remove address comments
2021-07-20 20:18:31 +01:00
gFieldEffectScript_HallOfFameRecord::
Restore tabs in field_effect_scripts.s
2020-07-23 10:05:03 +01:00
field_eff_loadfadedpal gSpritePalette_PokeballGlow
field_eff_loadfadedpal_callnative gSpritePalette_HofMonitor, FldEff_HallOfFameRecord
field_eff_end
field effect graphics and scripts
2015-11-26 00:43:06 +00:00
Remove address comments
2021-07-20 20:18:31 +01:00
gFieldEffectScript_UseTeleport::
Restore tabs in field_effect_scripts.s
2020-07-23 10:05:03 +01:00
field_eff_callnative FldEff_UseTeleport
field_eff_end
field effect graphics and scripts
2015-11-26 00:43:06 +00:00
Remove address comments
2021-07-20 20:18:31 +01:00
gFieldEffectScript_RayquazaSpotlight::
Restore tabs in field_effect_scripts.s
2020-07-23 10:05:03 +01:00
field_eff_callnative FldEff_RayquazaSpotlight
field_eff_end
field effect graphics and scripts
2015-11-26 00:43:06 +00:00
Remove address comments
2021-07-20 20:18:31 +01:00
gFieldEffectScript_DestroyDeoxysRock::
Restore tabs in field_effect_scripts.s
2020-07-23 10:05:03 +01:00
field_eff_callnative FldEff_DestroyDeoxysRock
field_eff_end
field effect graphics and scripts
2015-11-26 00:43:06 +00:00
Remove address comments
2021-07-20 20:18:31 +01:00
gFieldEffectScript_MoveDeoxysRock::
Restore tabs in field_effect_scripts.s
2020-07-23 10:05:03 +01:00
field_eff_callnative FldEff_MoveDeoxysRock
field_eff_end
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-18 04:22:19 +01:00
Port pokefirered's Vs. Seeker to pokeemerald (#3256) * First version of Vs. Seeker * Update movement.inc https://github.com/rh-hideout/pokeemerald-expansion/pull/3256/files/98f7e9978d8cd16083ea1bc7857f4f0235a9f1af#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 https://github.com/rh-hideout/pokeemerald-expansion/pull/3256/files/b5dc744cedc8e14c88d461afbbdc693c4f54e950
2023-11-26 17:58:43 +00:00
gFldEffScript_UseVsSeeker::
field_eff_callnative FldEff_UseVsSeeker
field_eff_end
gFldEffScript_XIcon::
field_eff_callnative FldEff_XIcon
field_eff_end
gFldEffScript_DoubleExclMarkIcon::
field_eff_callnative FldEff_DoubleExclMarkIcon
field_eff_end
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 21:11:35 +00:00
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-18 04:22:19 +01:00
gFieldEffectScript_TracksBug::
field_eff_loadfadedpal_callnative gSpritePalette_GeneralFieldEffect0, FldEff_TracksBug
field_eff_end
gFieldEffectScript_TracksSpot::
field_eff_loadfadedpal_callnative gSpritePalette_GeneralFieldEffect0, FldEff_TracksSpot
field_eff_end
gFieldEffectScript_TracksSlither::
field_eff_loadfadedpal_callnative gSpritePalette_GeneralFieldEffect0, FldEff_TracksSlither
field_eff_end
Reference in a new issue Copy permalink