diff options
Diffstat (limited to 'data')
| -rw-r--r-- | data/data.s | 9 | ||||
| -rw-r--r-- | data/map_event_scripts.inc | 12 | ||||
| -rw-r--r-- | data/specials.inc | 2 |
3 files changed, 9 insertions, 14 deletions
diff --git a/data/data.s b/data/data.s index 97800a72d..db5993e4e 100644 --- a/data/data.s +++ b/data/data.s @@ -35,15 +35,10 @@ gTrainerBackPicPaletteTable:: @ 8239FD4 .incbin "baserom.gba", 0x239FD4, 0x30 gEnemyMonElevation:: @ 823A004 - .incbin "baserom.gba", 0x23A004, 0x4554 - -gTrainerClassNames:: @ 823E558 - .include "data/text/trainer_class_names.inc" + .incbin "baserom.gba", 0x23A004, 0x19C + .section .rodata.8245EE0 .align 2, 0 -gTrainers:: @ 823EAD8 - .incbin "baserom.gba", 0x23EAC8, 0x7418 - gSpeciesNames:: @ 8245EE0 .include "data/text/species_names.inc" diff --git a/data/map_event_scripts.inc b/data/map_event_scripts.inc index 62a34d33c..f7d878608 100644 --- a/data/map_event_scripts.inc +++ b/data/map_event_scripts.inc @@ -780,7 +780,7 @@ EventScript_1A4EAF:: @ 81A4EAF gUnknown_81A4EB4:: @ 81A4EB4 lock - special sub_8080628 + special PlayTrainerEncounterMusic special ScrSpecial_EndTrainerApproach waitstate goto EventScript_1A4FC7 @@ -793,7 +793,7 @@ gUnknown_81A4EC1:: @ 81A4EC1 specialvar VAR_RESULT, ScrSpecial_HasTrainerBeenFought compare_var_to_value VAR_RESULT, 0 goto_if 5, EventScript_1A4EE8 - special sub_8080628 + special PlayTrainerEncounterMusic special sub_8080398 goto EventScript_1A4FC7 @@ -810,7 +810,7 @@ gUnknown_81A4EE9:: @ 81A4EE9 special CheckForAlivePartyMons compare_var_to_value VAR_RESULT, 0 goto_if 5, EventScript_1A4F19 - special sub_8080628 + special PlayTrainerEncounterMusic special sub_8080398 goto EventScript_1A4FC7 @@ -827,7 +827,7 @@ EventScript_1A4F20:: @ 81A4F20 gUnknown_81A4F21:: @ 81A4F21 applymovement VAR_LAST_TALKED, Movement_1A4FC5 waitmovement 0 - special sub_8080628 + special PlayTrainerEncounterMusic special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 goto_if_eq EventScript_1A501A @@ -839,7 +839,7 @@ gUnknown_81A4F3E:: @ 81A4F3E specialvar VAR_RESULT, sub_810CEB4 compare_var_to_value VAR_RESULT, 0 goto_if_eq EventScript_1A4F72 - special sub_8080628 + special PlayTrainerEncounterMusic special sub_8080398 special sub_80805D8 waitmessage @@ -862,7 +862,7 @@ gUnknown_81A4F73:: @ 81A4F73 special CheckForAlivePartyMons compare_var_to_value VAR_RESULT, 0 goto_if 5, EventScript_1A4FB1 - special sub_8080628 + special PlayTrainerEncounterMusic special sub_8080398 special sub_80805D8 waitmessage diff --git a/data/specials.inc b/data/specials.inc index d8d208d43..7e6d5a0a6 100644 --- a/data/specials.inc +++ b/data/specials.inc @@ -65,7 +65,7 @@ gSpecials:: @ 815FD60 def_special sub_8080618 def_special ScrSpecial_HasTrainerBeenFought def_special ScrSpecial_EndTrainerApproach - def_special sub_8080628 + def_special PlayTrainerEncounterMusic def_special sub_810CD4C def_special sub_810CEB4 def_special sub_80805B0 |