diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2017-12-18 23:26:44 +0100 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2017-12-18 23:26:44 +0100 |
| commit | 574435698942634f7e1bdf800a62391e6c03b064 (patch) | |
| tree | 388c852277074fed9338aefc8016a033af9b3713 /data | |
| parent | a612ef12a0a647fe0614f8003ce39448d46b02ef (diff) | |
decompile trainer see
Diffstat (limited to 'data')
| -rw-r--r-- | data/event_scripts.s | 2 | ||||
| -rw-r--r-- | data/field_effect_scripts.s | 6 | ||||
| -rw-r--r-- | data/specials.inc | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/data/event_scripts.s b/data/event_scripts.s index 8bd35d0d1..d87040701 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -844,7 +844,7 @@ EventScript_271354:: @ 8271354 EventScript_271356:: @ 8271356 special SetUpTrainerEncounterMusic - special sub_80B45AC + special EndTrainerApproach waitstate goto EventScript_ShowTrainerIntroMsg diff --git a/data/field_effect_scripts.s b/data/field_effect_scripts.s index ceb327084..9457094f9 100644 --- a/data/field_effect_scripts.s +++ b/data/field_effect_scripts.s @@ -74,7 +74,7 @@ gFieldEffectScriptPointers:: @ 82DB9D4 .4byte gFieldEffectScript_Unknown66 gFieldEffectScript_ExclamationMarkIcon1:: @ 82DBAE0 - field_eff_callnative oei_exclamation_mark + field_eff_callnative FldEff_ExclamationMarkIcon1 field_eff_end gFieldEffectScript_UseCutOnTallGrass:: @ 82DBAE6 @@ -207,7 +207,7 @@ gFieldEffectScript_FlyIn:: @ 82DBBE9 field_eff_end gFieldEffectScript_ExclamationMarkIcon2:: @ 82DBBEF - field_eff_callnative sub_80B4658 + field_eff_callnative FldEff_ExclamationMarkIcon2 field_eff_end gFieldEffectScript_FeetInFlowingWater:: @ 82DBBF5 @@ -260,7 +260,7 @@ gFieldEffectScript_Unknown45:: @ 82DBC4B field_eff_end gFieldEffectScript_HeartIcon:: @ 82DBC56 - field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo0, sub_80B4690 + field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo0, FldEff_HeartIcon field_eff_end gFieldEffectScript_Unknown47:: @ 82DBC60 diff --git a/data/specials.inc b/data/specials.inc index d159df31f..bdd99f414 100644 --- a/data/specials.inc +++ b/data/specials.inc @@ -65,7 +65,7 @@ gSpecials:: @ 81DBA64 def_special ShowTrainerIntroSpeech def_special ShowTrainerCantBattleSpeech def_special GetTrainerFlag - def_special sub_80B45AC + def_special EndTrainerApproach def_special SetUpTrainerEncounterMusic def_special ShouldTryRematchBattle def_special IsTrainerReadyForRematch |