diff options
Diffstat (limited to 'data/event_scripts.s')
-rw-r--r-- | data/event_scripts.s | 62 |
1 files changed, 31 insertions, 31 deletions
diff --git a/data/event_scripts.s b/data/event_scripts.s index 98e63347e..eff15df91 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -841,7 +841,7 @@ EventScript_1A4EAF:: @ 81A4EAF gUnknown_81A4EB4:: @ 81A4EB4 lock - special sub_8080628 + special PlayTrainerEncounterMusic special ScrSpecial_EndTrainerApproach waitstate goto EventScript_1A4FC7 @@ -854,7 +854,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 @@ -871,7 +871,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 @@ -888,7 +888,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 @@ -900,7 +900,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 @@ -923,7 +923,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 @@ -1997,7 +1997,7 @@ EventScript_1A6A46:: @ 81A6A46 end EventScript_1A6A56:: @ 81A6A56 - checkflag FLAG_0x82C + checkflag FLAG_SYS_GAME_CLEAR goto_if 0, EventScript_1A6A46 playse SE_PC_LOGIN setvar VAR_0x8004, 31 @@ -2010,7 +2010,7 @@ EventScript_1A6A56:: @ 81A6A56 end EventScript_1A6A7A:: @ 81A6A7A - checkflag FLAG_0x829 + checkflag FLAG_SYS_POKEDEX_GET goto_if 0, EventScript_1A6A46 playse SE_PC_LOGIN msgbox Text_1A5BC6 @@ -2864,49 +2864,49 @@ EventScript_1A786C:: @ 81A786C end EventScript_1A78D5:: @ 81A78D5 - checkflag FLAG_UNK820 + checkflag FLAG_BADGE01_GET goto_if 1, EventScript_1A794D goto EventScript_1A77C9 end EventScript_1A78E4:: @ 81A78E4 - checkflag FLAG_0x821 + checkflag FLAG_BADGE02_GET goto_if 1, EventScript_1A795F goto EventScript_1A77DE end EventScript_1A78F3:: @ 81A78F3 - checkflag FLAG_0x822 + checkflag FLAG_BADGE03_GET goto_if 1, EventScript_1A795F goto EventScript_1A77DE end EventScript_1A7902:: @ 81A7902 - checkflag FLAG_0x823 + checkflag FLAG_BADGE04_GET goto_if 1, EventScript_1A795F goto EventScript_1A77DE end EventScript_1A7911:: @ 81A7911 - checkflag FLAG_UNK824 + checkflag FLAG_BADGE05_GET goto_if 1, EventScript_1A795F goto EventScript_1A77DE end EventScript_1A7920:: @ 81A7920 - checkflag FLAG_0x825 + checkflag FLAG_BADGE06_GET goto_if 1, EventScript_1A795F goto EventScript_1A77DE end EventScript_1A792F:: @ 81A792F - checkflag FLAG_UNK826 + checkflag FLAG_BADGE07_GET goto_if 1, EventScript_1A795F goto EventScript_1A77DE end EventScript_1A793E:: @ 81A793E - checkflag FLAG_0x827 + checkflag FLAG_BADGE08_GET goto_if 1, EventScript_1A795F goto EventScript_1A77DE end @@ -2951,49 +2951,49 @@ EventScript_1A796E:: @ 81A796E end EventScript_1A79D8:: @ 81A79D8 - checkflag FLAG_UNK820 + checkflag FLAG_BADGE01_GET goto_if 1, EventScript_1A7A96 goto EventScript_1A7A50 end EventScript_1A79E7:: @ 81A79E7 - checkflag FLAG_0x821 + checkflag FLAG_BADGE02_GET goto_if 1, EventScript_1A7AA8 goto EventScript_1A7A77 end EventScript_1A79F6:: @ 81A79F6 - checkflag FLAG_0x822 + checkflag FLAG_BADGE03_GET goto_if 1, EventScript_1A7AA8 goto EventScript_1A7A77 end EventScript_1A7A05:: @ 81A7A05 - checkflag FLAG_0x823 + checkflag FLAG_BADGE04_GET goto_if 1, EventScript_1A7AA8 goto EventScript_1A7A77 end EventScript_1A7A14:: @ 81A7A14 - checkflag FLAG_UNK824 + checkflag FLAG_BADGE05_GET goto_if 1, EventScript_1A7AA8 goto EventScript_1A7A77 end EventScript_1A7A23:: @ 81A7A23 - checkflag FLAG_0x825 + checkflag FLAG_BADGE06_GET goto_if 1, EventScript_1A7AA8 goto EventScript_1A7A77 end EventScript_1A7A32:: @ 81A7A32 - checkflag FLAG_UNK826 + checkflag FLAG_BADGE07_GET goto_if 1, EventScript_1A7AA8 goto EventScript_1A7A77 end EventScript_1A7A41:: @ 81A7A41 - checkflag FLAG_0x827 + checkflag FLAG_BADGE08_GET goto_if 1, EventScript_1A7AA8 goto EventScript_1A7A77 end @@ -9399,7 +9399,7 @@ EventScript_1BBA04:: @ 81BBA04 special sub_8112364 lock faceplayer - checkflag FLAG_0x829 + checkflag FLAG_SYS_POKEDEX_GET goto_if 0, EventScript_1BB877 specialvar VAR_RESULT, sub_80CD034 compare_var_to_value VAR_RESULT, 1 @@ -9504,7 +9504,7 @@ EventScript_1BBB60:: @ 81BBB60 EventScript_1BBB6A:: @ 81BBB6A lock faceplayer - checkflag FLAG_0x829 + checkflag FLAG_SYS_POKEDEX_GET goto_if 0, EventScript_1BB877 msgbox gUnknown_81BDB85, 5 compare_var_to_value VAR_RESULT, 0 @@ -9525,7 +9525,7 @@ EventScript_1BBB9C:: @ 81BBB9C special sub_8112364 lock faceplayer - checkflag FLAG_0x829 + checkflag FLAG_SYS_POKEDEX_GET goto_if 0, EventScript_1BB877 specialvar VAR_RESULT, sub_80CD034 compare_var_to_value VAR_RESULT, 1 @@ -9838,7 +9838,7 @@ gUnknown_81BBFD8:: @ 81BBFD8 compare_var_to_value VAR_RESULT, 2 goto_if 1, EventScript_1A7AE0 lockall - checkflag FLAG_0x829 + checkflag FLAG_SYS_POKEDEX_GET goto_if 0, EventScript_1BB881 specialvar VAR_RESULT, IsWirelessAdapterConnected compare_var_to_value VAR_RESULT, 0 @@ -10592,7 +10592,7 @@ ViridianCity_EventScript_1BDF13:: @ 81BDF13 compare_var_to_value VAR_RESULT, 2 goto_if 1, EventScript_1A7AE0 lockall - checkflag FLAG_0x821 + checkflag FLAG_BADGE02_GET goto_if 0, EventScript_1BDF87 checkpartymove MOVE_CUT compare_var_to_value VAR_RESULT, 6 @@ -10670,7 +10670,7 @@ CeruleanCave_1F_EventScript_1BE00C:: @ 81BE00C compare_var_to_value VAR_RESULT, 2 goto_if 1, EventScript_1A7AE0 lockall - checkflag FLAG_0x825 + checkflag FLAG_BADGE06_GET goto_if 0, EventScript_1BE091 checkpartymove MOVE_ROCK_SMASH compare_var_to_value VAR_RESULT, 6 @@ -10751,7 +10751,7 @@ VictoryRoad_2F_EventScript_1BE11D:: @ 81BE11D compare_var_to_value VAR_RESULT, 2 goto_if 1, EventScript_1A7AE0 lockall - checkflag FLAG_0x823 + checkflag FLAG_BADGE04_GET goto_if 0, EventScript_1BE185 checkflag FLAG_0x805 goto_if 1, EventScript_1BE18E |