diff options
Diffstat (limited to 'data')
| -rw-r--r-- | data/event_scripts.s | 10 | ||||
| -rw-r--r-- | data/field_effect_scripts.s | 20 | ||||
| -rw-r--r-- | data/maps/BattleFrontier_OutsideEast/scripts.inc | 2 | ||||
| -rw-r--r-- | data/party_menu.s | 2 | ||||
| -rw-r--r-- | data/scripts/berry_tree.inc | 2 | ||||
| -rw-r--r-- | data/specials.inc | 6 |
6 files changed, 21 insertions, 21 deletions
diff --git a/data/event_scripts.s b/data/event_scripts.s index 115c9921a..c7ef6d244 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -535,7 +535,7 @@ EventScript_23B5F0:: @ 823B5F0 goto_eq EventScript_23B5A1 msgbox Text_2767D1, 3 special sub_80E9C2C - special sub_80FA57C + special DoSecretBasePCTurnOffEffect releaseall end @@ -545,13 +545,13 @@ EventScript_23B62F:: @ 823B62F goto_eq EventScript_23B5A1 msgbox Text_2767E9, 3 special sub_80E9C2C - special sub_80FA57C + special DoSecretBasePCTurnOffEffect releaseall end EventScript_23B652:: @ 823B652 msgbox Text_27676F, 3 - special sub_80FA57C + special DoSecretBasePCTurnOffEffect closemessage releaseall end @@ -562,7 +562,7 @@ EventScript_23B660:: @ 823B660 end EventScript_23B66E:: @ 823B66E - special sub_80FA57C + special DoSecretBasePCTurnOffEffect closemessage releaseall end @@ -590,7 +590,7 @@ EventScript_SecretBaseSandOrnament:: @ 823B684 end EventScript_SecretBaseShieldOrToyTV:: @ 823B68C - special sub_80FAC78 + special GetShieldToyTVDecorationInfo compare VAR_RESULT, 0 goto_eq EventScript_23B6BC compare VAR_RESULT, 1 diff --git a/data/field_effect_scripts.s b/data/field_effect_scripts.s index eab655877..81de41aaa 100644 --- a/data/field_effect_scripts.s +++ b/data/field_effect_scripts.s @@ -118,7 +118,7 @@ gFieldEffectScript_GroundImpactDust:: @ 82DBB28 field_eff_end gFieldEffectScript_Unknown11:: @ 82DBB32 - field_eff_callnative oei_sweet_scent + field_eff_callnative FldEff_UseSecretPowerCave field_eff_end gFieldEffectScript_BikeHopTallGrass:: @ 82DBB38 @@ -179,11 +179,11 @@ gFieldEffectScript_Unknown25:: @ 82DBBB6 field_eff_end gFieldEffectScript_Unknown26:: @ 82DBBC5 - field_eff_callnative sub_80FA208 + field_eff_callnative FldEff_UseSecretPowerTree field_eff_end gFieldEffectScript_Unknown27:: @ 82DBBCB - field_eff_callnative sub_80FA36C + field_eff_callnative FldEff_UseSecretPowerShrub field_eff_end gFieldEffectScript_TreeDisguise:: @ 82DBBD1 @@ -264,11 +264,11 @@ gFieldEffectScript_HeartIcon:: @ 82DBC56 field_eff_end gFieldEffectScript_Unknown47:: @ 82DBC60 - field_eff_callnative sub_80FA6FC + field_eff_callnative FldEff_NopA6FC field_eff_end gFieldEffectScript_Unknown48:: @ 82DBC66 - field_eff_callnative sub_80FA700 + field_eff_callnative FldEff_NopA700 field_eff_end gFieldEffectScript_JumpOutOfAsh:: @ 82DBC6C @@ -284,7 +284,7 @@ gFieldEffectScript_Unknown51:: @ 82DBC80 field_eff_end gFieldEffectScript_Unknown52:: @ 82DBC86 - field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo9, sub_80FAA7C + field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo9, FldEff_SandPillar field_eff_end gFieldEffectScript_Bubbles:: @ 82DBC90 @@ -296,15 +296,15 @@ gFieldEffectScript_Unknown54:: @ 82DBC9A field_eff_end gFieldEffectScript_Unknown55:: @ 82DBCA4 - field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo7, sub_80FA13C + field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo7, FldEff_SecretPowerCave field_eff_end gFieldEffectScript_Unknown56:: @ 82DBCAE - field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo8, sub_80FA248 + field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo8, FldEff_SecretPowerTree field_eff_end gFieldEffectScript_Unknown57:: @ 82DBCB8 - field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo8, sub_80FA3AC + field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo8, FldEff_SecretPowerShrub field_eff_end gFieldEffectScript_Unknown58:: @ 82DBCC2 @@ -320,7 +320,7 @@ gFieldEffectScript_Unknown60:: @ 82DBCD2 field_eff_end gFieldEffectScript_Unknown61:: @ 82DBCD8 - field_eff_callnative sub_80FA458 + field_eff_callnative FldEff_SecretBasePCTurnOn field_eff_end gFieldEffectScript_Unknown62:: @ 82DBCDE diff --git a/data/maps/BattleFrontier_OutsideEast/scripts.inc b/data/maps/BattleFrontier_OutsideEast/scripts.inc index 6ed4d94d6..febcb05c7 100644 --- a/data/maps/BattleFrontier_OutsideEast/scripts.inc +++ b/data/maps/BattleFrontier_OutsideEast/scripts.inc @@ -117,7 +117,7 @@ BattleFrontier_OutsideEast_EventScript_242CEA:: @ 8242CEA BattleFrontier_OutsideEast_EventScript_242CFC:: @ 8242CFC lock faceplayer - special sub_80FAFF8 + special DoWateringBerryTreeAnim waitstate waitse playse 269 diff --git a/data/party_menu.s b/data/party_menu.s index eedcd4377..e271b7804 100644 --- a/data/party_menu.s +++ b/data/party_menu.s @@ -441,7 +441,7 @@ gUnknown_08615D9C:: @ 8615D9C .4byte hm_prepare_waterfall, 0x0000000d .4byte SetUpFieldMove_Teleport, 0x0000000d .4byte SetUpFieldMove_Dig, 0x0000000d - .4byte sub_80FA004, 0x0000000d + .4byte SetUpFieldMove_SecretPower, 0x0000000d .4byte SetUpFieldMove_SoftBoiled, 0x00000010 .4byte SetUpFieldMove_SoftBoiled, 0x00000010 .4byte SetUpFieldMove_SweetScent, 0x0000000d diff --git a/data/scripts/berry_tree.inc b/data/scripts/berry_tree.inc index 1fda1133f..6b9fb14ef 100644 --- a/data/scripts/berry_tree.inc +++ b/data/scripts/berry_tree.inc @@ -174,7 +174,7 @@ Route102_EventScript_2744C4:: @ 82744C4 message Route102_Text_274710 waitmessage special EventObjectInteractionWaterBerryTree - special sub_80FAFF8 + special DoWateringBerryTreeAnim waitstate message Route102_Text_274723 waitmessage diff --git a/data/specials.inc b/data/specials.inc index a1d9734ca..7dd35507d 100644 --- a/data/specials.inc +++ b/data/specials.inc @@ -34,7 +34,7 @@ gSpecials:: @ 81DBA64 def_special sub_8129708 def_special sub_80E91F8 def_special sub_80EA30C - def_special sub_80FA57C + def_special DoSecretBasePCTurnOffEffect def_special sub_80E6BE8 def_special sub_80B2DA4 def_special sub_80B2E4C @@ -105,7 +105,7 @@ gSpecials:: @ 81DBA64 def_special GiveMonArtistRibbon def_special sub_80B3000 def_special SaveGame - def_special sub_80FAFF8 + def_special DoWateringBerryTreeAnim def_special easy_chat_input_maybe def_special sub_811EECC def_special ScrSpecial_GetCurrentMauvilleMan @@ -317,7 +317,7 @@ gSpecials:: @ 81DBA64 def_special ScriptCheckFreePokemonStorageSpace def_special DoSealedChamberShakingEffect1 def_special sub_8139B60 - def_special sub_80FAC78 + def_special GetShieldToyTVDecorationInfo def_special IsPokerusInParty def_special SetSootopolisGymCrackedIceMetatiles def_special sub_8139560 |