diff options
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 | ||||
| -rw-r--r-- | data/trainer_see.s | 83 |
4 files changed, 5 insertions, 88 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 diff --git a/data/trainer_see.s b/data/trainer_see.s deleted file mode 100644 index bff3004a7..000000000 --- a/data/trainer_see.s +++ /dev/null @@ -1,83 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - - .align 2 -gEmotion_ExclamationMarkGfx:: @ 85505AC - .incbin "graphics/misc/emotion_exclamation.4bpp" - - .align 2 -gEmotion_QuestionMarkGfx:: @ 855062C - .incbin "graphics/misc/emotion_question.4bpp" - - .align 2 -gEmotion_HeartGfx:: @ 85506AC - .incbin "graphics/misc/emotion_heart.4bpp" - - .align 2 -gIsTrainerInRange:: @ 855072C - .4byte IsTrainerInRangeSouth - .4byte IsTrainerInRangeNorth - .4byte IsTrainerInRangeWest - .4byte IsTrainerInRangeEast - - .align 2 -gTrainerSeeFuncList:: @ 855073C - .4byte sub_80B4178 - .4byte sub_80B417C - .4byte sub_80B41C0 - .4byte sub_80B4200 - .4byte sub_80B425C - .4byte sub_80B4318 - .4byte sub_80B435C - .4byte sub_80B4390 - .4byte sub_80B43AC - .4byte sub_80B43E0 - .4byte sub_80B4438 - .4byte sub_80B44AC - - .align 2 -gTrainerSeeFuncList2:: @ 855076C - .4byte sub_80B43AC - .4byte sub_80B43E0 - .4byte sub_80B4438 - .4byte sub_80B44AC - - .align 2 -gOamData_855077C:: @ 855077C - .2byte 0x0000 - .2byte 0x4000 - .2byte 0x0400 - - .align 2 -gSpriteImageTable_8550784:: @ 8550784 - obj_frame_tiles gEmotion_ExclamationMarkGfx, 0x0080 - obj_frame_tiles gEmotion_QuestionMarkGfx, 0x0080 - - .align 2 -gSpriteImageTable_8550794:: @ 8550794 - obj_frame_tiles gEmotion_HeartGfx, 0x0080 - - .align 2 -gSpriteAnim_855079C:: @ 855079C - obj_image_anim_frame 0, 60 - obj_image_anim_end - - .align 2 -gSpriteAnim_85507A4:: @ 85507A4 - obj_image_anim_frame 1, 60 - obj_image_anim_end - - .align 2 -gSpriteAnimTable_85507AC:: @ 85507AC - .4byte gSpriteAnim_855079C - .4byte gSpriteAnim_85507A4 - - .align 2 -gSpriteTemplate_85507B4:: @ 85507B4 - spr_template 0xffff, 0xffff, gOamData_855077C, gSpriteAnimTable_85507AC, gSpriteImageTable_8550784, gDummySpriteAffineAnimTable, objc_exclamation_mark_probably - - .align 2 -gSpriteTemplate_85507CC:: @ 85507CC - spr_template 0xffff, 0x1004, gOamData_855077C, gSpriteAnimTable_85507AC, gSpriteImageTable_8550794, gDummySpriteAffineAnimTable, objc_exclamation_mark_probably |