diff options
Diffstat (limited to 'data')
| -rw-r--r-- | data/battle_scripts_1.s | 30 | ||||
| -rw-r--r-- | data/battle_scripts_2.s | 8 | ||||
| -rw-r--r-- | data/data.s | 70 | ||||
| -rw-r--r-- | data/data_835B488.s | 24 | ||||
| -rw-r--r-- | data/data_83F5738.s | 23 | ||||
| -rw-r--r-- | data/data_83FECCC.s | 2 | ||||
| -rw-r--r-- | data/event_scripts.s | 52 | ||||
| -rw-r--r-- | data/maps/BirthIsland_Exterior/scripts.inc | 2 | ||||
| -rw-r--r-- | data/maps/CeruleanCave_B1F/scripts.inc | 2 | ||||
| -rw-r--r-- | data/maps/MtEmber_Summit/scripts.inc | 2 | ||||
| -rw-r--r-- | data/maps/NavelRock_Base/scripts.inc | 2 | ||||
| -rw-r--r-- | data/maps/NavelRock_Summit/scripts.inc | 2 | ||||
| -rw-r--r-- | data/maps/PokemonTower_6F/scripts.inc | 2 | ||||
| -rw-r--r-- | data/maps/PowerPlant/scripts.inc | 2 | ||||
| -rw-r--r-- | data/maps/SeafoamIslands_B4F/scripts.inc | 2 | ||||
| -rw-r--r-- | data/maps/ViridianCity/scripts.inc | 4 | ||||
| -rw-r--r-- | data/specials.inc | 24 |
17 files changed, 93 insertions, 160 deletions
diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s index 0fd65d2e0..8c049f4e0 100644 --- a/data/battle_scripts_1.s +++ b/data/battle_scripts_1.s @@ -42,46 +42,46 @@ BattleScript_GiveExp:: @ 81D8694 BattleScript_HandleFaintedMon:: @ 81D869D .incbin "baserom.gba", 0x1D869D, 0x152 -gUnknown_81D87EF:: @ 81D87EF +BattleScript_LocalTrainerBattleWon:: @ 81D87EF .incbin "baserom.gba", 0x1D87EF, 0x14 -gUnknown_81D8803:: @ 81D8803 +BattleScript_PayDayMoneyAndPickUpItems:: @ 81D8803 .incbin "baserom.gba", 0x1D8803, 0x3 -gUnknown_81D8806:: @ 81D8806 +BattleScript_LocalBattleLost:: @ 81D8806 .incbin "baserom.gba", 0x1D8806, 0xC6 -gUnknown_81D88CC:: @ 81D88CC +BattleScript_LinkBattleWonOrLost:: @ 81D88CC .incbin "baserom.gba", 0x1D88CC, 0xB gUnknown_81D88D7:: @ 81D88D7 .incbin "baserom.gba", 0x1D88D7, 0x2A -gUnknown_81D8901:: @ 81D8901 +BattleScript_SmokeBallEscape:: @ 81D8901 .incbin "baserom.gba", 0x1D8901, 0xE -gUnknown_81D890F:: @ 81D890F +BattleScript_RanAwayUsingMonAbility:: @ 81D890F .incbin "baserom.gba", 0x1D890F, 0x7 -gUnknown_81D8916:: @ 81D8916 +BattleScript_GotAwaySafely:: @ 81D8916 .incbin "baserom.gba", 0x1D8916, 0x7 -gUnknown_81D891D:: @ 81D891D +BattleScript_WildMonFled:: @ 81D891D .incbin "baserom.gba", 0x1D891D, 0x7 -gUnknown_81D8924:: @ 81D8924 +BattleScript_PrintCantRunFromTrainer:: @ 81D8924 .incbin "baserom.gba", 0x1D8924, 0x16 -gUnknown_81D893A:: @ 81D893A +BattleScript_PrintFailedToRunString:: @ 81D893A .incbin "baserom.gba", 0x1D893A, 0x9 -gUnknown_81D8943:: @ 81D8943 +BattleScript_PrintCantEscapeFromBattle:: @ 81D8943 .incbin "baserom.gba", 0x1D8943, 0x6 -gUnknown_81D8949:: @ 81D8949 +BattleScript_PrintFullBox:: @ 81D8949 .incbin "baserom.gba", 0x1D8949, 0x4 -gUnknown_81D894D:: @ 81D894D +BattleScript_ActionSwitch:: @ 81D894D .incbin "baserom.gba", 0x1D894D, 0xA4 BattleScript_Pausex20:: @ 81D89F1 @@ -237,7 +237,7 @@ BattleScript_OneHitKOMsg:: @ 81D8FE4 BattleScript_SAtkDown2:: @ 81D8FEB .incbin "baserom.gba", 0x1D8FEB, 0x2A -gUnknown_81D9015:: @ 81D9015 +BattleScript_FocusPunchSetUp:: @ 81D9015 .incbin "baserom.gba", 0x1D9015, 0x14 BattleScript_MoveUsedIsAsleep:: @ 81D9029 @@ -549,7 +549,7 @@ BattleScript_BerryStatRaiseEnd2:: @ 81D9679 BattleScript_BerryFocusEnergyEnd2:: @ 81D9694 .incbin "baserom.gba", 0x1D9694, 0x10 -gUnknown_81D96A4:: @ 81D96A4 +BattleScript_ActionSelectionItemsCantBeUsed:: @ 81D96A4 .incbin "baserom.gba", 0x1D96A4, 0x4 BattleScript_FlushMessageBox:: @ 81D96A8 diff --git a/data/battle_scripts_2.s b/data/battle_scripts_2.s index c3747cd8d..199fd0c78 100644 --- a/data/battle_scripts_2.s +++ b/data/battle_scripts_2.s @@ -1,15 +1,15 @@ .section script_data, "aw", %progbits -gUnknown_81D99B0:: @ 81D99B0 +gBattlescriptsForBallThrow:: @ 81D99B0 .incbin "baserom.gba", 0x1D99B0, 0x34 -gUnknown_81D99E4:: @ 81D99E4 +gBattlescriptsForUsingItem:: @ 81D99E4 .incbin "baserom.gba", 0x1D99E4, 0x18 -gUnknown_81D99FC:: @ 81D99FC +gBattlescriptsForRunningByItem:: @ 81D99FC .incbin "baserom.gba", 0x1D99FC, 0x8 -gUnknown_81D9A04:: @ 81D9A04 +gBattlescriptsForSafariActions:: @ 81D9A04 .incbin "baserom.gba", 0x1D9A04, 0x3E BattleScript_SuccessBallThrow:: @ 81D9A42 diff --git a/data/data.s b/data/data.s index 366d6bf46..72c9374b9 100644 --- a/data/data.s +++ b/data/data.s @@ -22,7 +22,7 @@ gUnknown_8248300:: @ 8248300 gUnknown_8248318:: @ 8248318 .incbin "baserom.gba", 0x248318, 0x8 -gUnknown_8248320:: @ 8248320 +gBattleBgTemplates:: @ 8248320 .incbin "baserom.gba", 0x248320, 0x10 gUnknown_8248330:: @ 8248330 @@ -33,73 +33,7 @@ gUnknown_824EE34:: @ 824EE34 gUnknown_824EFC4:: @ 824EFC4 .incbin "baserom.gba", 0x24EFC4, 0x20 - -gUnknown_824EFE4:: @ 824EFE4 - .incbin "baserom.gba", 0x24EFE4, 0xC - -gUnknown_824EFF0:: @ 824EFF0 - .incbin "baserom.gba", 0x24EFF0, 0x18 - -gUnknown_824F008:: @ 824F008 - .incbin "baserom.gba", 0x24F008, 0x8 - -gUnknown_824F010:: @ 824F010 - .incbin "baserom.gba", 0x24F010, 0x8 - -gUnknown_824F018:: @ 824F018 - .incbin "baserom.gba", 0x24F018, 0x8 - -gUnknown_824F020:: @ 824F020 - .incbin "baserom.gba", 0x24F020, 0x28 - -gUnknown_824F048:: @ 824F048 - .incbin "baserom.gba", 0x24F048, 0x8 - -gTypeEffectiveness:: @ 824F050 - .incbin "baserom.gba", 0x24F050, 0x150 - -gTypeNames:: @ 824F1A0 - .incbin "baserom.gba", 0x24F1A0, 0x80 - -gTrainerMoneyTable:: @ 824F220 - .incbin "baserom.gba", 0x24F220, 0x8E8 - -gUnknown_824FB08:: @ 824FB08 - .incbin "baserom.gba", 0x24FB08, 0x138 - -gUnknown_824FC40:: @ 824FC40 - .incbin "baserom.gba", 0x24FC40, 0x3F8 - -gUnknown_8250038:: @ 8250038 - .incbin "baserom.gba", 0x250038, 0x38 - -gUnknown_8250070:: @ 8250070 - .incbin "baserom.gba", 0x250070, 0x24 - -gStatusConditionString_PoisonJpn:: @ 8250094 - .incbin "baserom.gba", 0x250094, 0x8 - -gStatusConditionString_SleepJpn:: @ 825009C - .incbin "baserom.gba", 0x25009C, 0x8 - -gStatusConditionString_ParalysisJpn:: @ 82500A4 - .incbin "baserom.gba", 0x2500A4, 0x8 - -gStatusConditionString_BurnJpn:: @ 82500AC - .incbin "baserom.gba", 0x2500AC, 0x8 - -gStatusConditionString_IceJpn:: @ 82500B4 - .incbin "baserom.gba", 0x2500B4, 0x8 - -gStatusConditionString_ConfusionJpn:: @ 82500BC - .incbin "baserom.gba", 0x2500BC, 0x8 - -gStatusConditionString_LoveJpn:: @ 82500C4 - .incbin "baserom.gba", 0x2500C4, 0x8 - -gUnknown_82500CC:: @ 82500CC - .incbin "baserom.gba", 0x2500CC, 0x38 - + .section .rodata.8260270 gUnknown_8260270:: @ 8260270 diff --git a/data/data_835B488.s b/data/data_835B488.s index b2b76476c..f3385b949 100644 --- a/data/data_835B488.s +++ b/data/data_835B488.s @@ -13,29 +13,7 @@ gUnknown_83C68E4:: @ 83C68E4 gUnknown_83C68EC:: @ 83C68EC .incbin "baserom.gba", 0x3C68EC, 0x4 -gUnknown_83C68F0:: @ 83C68F0 - .incbin "baserom.gba", 0x3C68F0, 0x8 - -gUnknown_83C68F8:: @ 83C68F8 - .incbin "baserom.gba", 0x3C68F8, 0x8 - -gUnknown_83C6900:: @ 83C6900 - .incbin "baserom.gba", 0x3C6900, 0x48 - -gUnknown_83C6948:: @ 83C6948 - .incbin "baserom.gba", 0x3C6948, 0x48 - -gUnknown_83C6990:: @ 83C6990 - .incbin "baserom.gba", 0x3C6990, 0x48 - -gUnknown_83C69D8:: @ 83C69D8 - .incbin "baserom.gba", 0x3C69D8, 0x48 - -gUnknown_83C6A20:: @ 83C6A20 - .incbin "baserom.gba", 0x3C6A20, 0x48 - -gUnknown_83C6A68:: @ 83C6A68 - .incbin "baserom.gba", 0x3C6A68, 0x48 + .section .rodata.83C6AB0 gUnknown_83C6AB0:: @ 83C6AB0 .incbin "baserom.gba", 0x3C6AB0, 0x8 diff --git a/data/data_83F5738.s b/data/data_83F5738.s index 1f9839561..cd73dd0d1 100644 --- a/data/data_83F5738.s +++ b/data/data_83F5738.s @@ -424,7 +424,28 @@ gUnknown_83FE80C:: @ 83FE80C .incbin "baserom.gba", 0x3FE80C, 0x10 gUnknown_83FE81C:: @ 83FE81C - .incbin "baserom.gba", 0x3FE81C, 0x3D + .incbin "baserom.gba", 0x3FE81C, 0xE + +gText_Sleep:: @ 83FE82A + .incbin "baserom.gba", 0x3FE82A, 0x6 + +gText_Poison:: @ 83FE830 + .incbin "baserom.gba", 0x3FE830, 0x7 + +gText_Burn:: @ 83FE837 + .incbin "baserom.gba", 0x3FE837, 0x5 + +gText_Paralysis:: @ 83FE83C + .incbin "baserom.gba", 0x3FE83C, 0xA + +gText_Ice:: @ 83FE846 + .incbin "baserom.gba", 0x3FE846, 0x4 + +gText_Confusion:: @ 83FE84A + .incbin "baserom.gba", 0x3FE84A, 0xA + +gText_Love:: @ 83FE854 + .incbin "baserom.gba", 0x3FE854, 0x5 gUnknown_83FE859:: @ 83FE859 .incbin "baserom.gba", 0x3FE859, 0x3 diff --git a/data/data_83FECCC.s b/data/data_83FECCC.s index 43fbd003f..df188dda0 100644 --- a/data/data_83FECCC.s +++ b/data/data_83FECCC.s @@ -137,7 +137,7 @@ gUnknown_84020DA:: @ 84020DA gUnknown_84020E6:: @ 84020E6 .incbin "baserom.gba", 0x4020E6, 0x12 -gUnknown_84020F8:: @ 84020F8 +sOakOldManBufferCommands:: @ 84020F8 .incbin "baserom.gba", 0x4020F8, 0xE4 .section .rodata.battle_anim_special diff --git a/data/event_scripts.s b/data/event_scripts.s index 8f9e8ae26..dbb81864b 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -841,42 +841,42 @@ EventScript_1A4EAF:: @ 81A4EAF gUnknown_81A4EB4:: @ 81A4EB4 lock - special PlayTrainerEncounterMusic + special SetUpTrainerEncounterMusic special ScrSpecial_EndTrainerApproach waitstate goto EventScript_1A4FC7 -gUnknown_81A4EC1:: @ 81A4EC1 +EventScript_TryDoNormalTrainerBattle:: @ 81A4EC1 lock faceplayer applymovement VAR_LAST_TALKED, Movement_1A4FC5 waitmovement 0 - specialvar VAR_RESULT, ScrSpecial_HasTrainerBeenFought + specialvar VAR_RESULT, GetTrainerFlag compare_var_to_value VAR_RESULT, 0 goto_if ne, EventScript_1A4EE8 - special PlayTrainerEncounterMusic - special sub_8080398 + special SetUpTrainerEncounterMusic + special SetUpTrainerMovement goto EventScript_1A4FC7 EventScript_1A4EE8:: @ 81A4EE8 ontrainerbattleend -gUnknown_81A4EE9:: @ 81A4EE9 +EventScript_TryDoDoubleTrainerBattle:: @ 81A4EE9 lock faceplayer call EventScript_1A4FBA - specialvar VAR_RESULT, ScrSpecial_HasTrainerBeenFought + specialvar VAR_RESULT, GetTrainerFlag compare_var_to_value VAR_RESULT, 0 goto_if ne, EventScript_1A4F20 special CheckForAlivePartyMons compare_var_to_value VAR_RESULT, 0 goto_if ne, EventScript_1A4F19 - special PlayTrainerEncounterMusic - special sub_8080398 + special SetUpTrainerEncounterMusic + special SetUpTrainerMovement goto EventScript_1A4FC7 EventScript_1A4F19:: @ 81A4F19 - special sub_8080618 + special ShowTrainerCantBattleSpeech waitmessage waitbuttonpress release @@ -885,30 +885,30 @@ EventScript_1A4F19:: @ 81A4F19 EventScript_1A4F20:: @ 81A4F20 ontrainerbattleend -gUnknown_81A4F21:: @ 81A4F21 +EventScript_DoTrainerBattle:: @ 81A4F21 applymovement VAR_LAST_TALKED, Movement_1A4FC5 waitmovement 0 - special PlayTrainerEncounterMusic + special SetUpTrainerEncounterMusic special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 goto_if eq, EventScript_1A501A battlebegin ontrainerbattleend -gUnknown_81A4F3E:: @ 81A4F3E +EventScript_TryDoRematchBattle:: @ 81A4F3E call EventScript_1A4FBA specialvar VAR_RESULT, sub_810CEB4 compare_var_to_value VAR_RESULT, 0 goto_if eq, EventScript_1A4F72 - special PlayTrainerEncounterMusic - special sub_8080398 - special sub_80805D8 + special SetUpTrainerEncounterMusic + special SetUpTrainerMovement + special ShowTrainerIntroSpeech waitmessage waitbuttonpress special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 goto_if eq, EventScript_1A4FB8 - special sub_80805B0 + special BattleSetup_StartRematchBattle waitstate releaseall end @@ -916,22 +916,22 @@ gUnknown_81A4F3E:: @ 81A4F3E EventScript_1A4F72:: @ 81A4F72 ontrainerbattleend -gUnknown_81A4F73:: @ 81A4F73 +EventScript_TryDoDoubleRematchBattle:: @ 81A4F73 specialvar VAR_RESULT, sub_810CEB4 compare_var_to_value VAR_RESULT, 0 goto_if eq, EventScript_1A4FB0 special CheckForAlivePartyMons compare_var_to_value VAR_RESULT, 0 goto_if ne, EventScript_1A4FB1 - special PlayTrainerEncounterMusic - special sub_8080398 - special sub_80805D8 + special SetUpTrainerEncounterMusic + special SetUpTrainerMovement + special ShowTrainerIntroSpeech waitmessage waitbuttonpress special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 goto_if eq, EventScript_1A4FB8 - special sub_80805B0 + special BattleSetup_StartRematchBattle waitstate releaseall end @@ -940,7 +940,7 @@ EventScript_1A4FB0:: @ 81A4FB0 ontrainerbattleend EventScript_1A4FB1:: @ 81A4FB1 - special sub_8080618 + special ShowTrainerCantBattleSpeech waitmessage waitbuttonpress release @@ -960,14 +960,14 @@ Movement_1A4FC5:: @ 81A4FC5 step_end EventScript_1A4FC7:: @ 81A4FC7 - special sub_80805D8 + special ShowTrainerIntroSpeech waitmessage waitbuttonpress special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 goto_if eq, EventScript_1A501A battlebegin - specialvar VAR_RESULT, sub_80803CC + specialvar VAR_RESULT, GetTrainerBattleMode compare_var_to_value VAR_RESULT, 0 goto_if eq, EventScript_1A5017 compare_var_to_value VAR_RESULT, 2 @@ -987,7 +987,7 @@ EventScript_1A5019:: @ 81A5019 ontrainerbattleendgoto EventScript_1A501A:: @ 81A501A - special sub_80803FC + special SetBattledTrainerFlag releaseall end diff --git a/data/maps/BirthIsland_Exterior/scripts.inc b/data/maps/BirthIsland_Exterior/scripts.inc index f23c73615..b51a8ff00 100644 --- a/data/maps/BirthIsland_Exterior/scripts.inc +++ b/data/maps/BirthIsland_Exterior/scripts.inc @@ -92,7 +92,7 @@ EventScript_1652C0:: @ 81652C0 setvar VAR_0x8006, 0 special CreateObedientEnemyMon setflag FLAG_SYS_SPECIAL_WILD_BATTLE - special sub_807F9D8 + special BattleSetup_StartLegendaryBattle waitstate clearflag FLAG_SYS_SPECIAL_WILD_BATTLE specialvar VAR_RESULT, Special_GetBattleOutcome diff --git a/data/maps/CeruleanCave_B1F/scripts.inc b/data/maps/CeruleanCave_B1F/scripts.inc index ad68f84bc..e477ef3e3 100644 --- a/data/maps/CeruleanCave_B1F/scripts.inc +++ b/data/maps/CeruleanCave_B1F/scripts.inc @@ -41,7 +41,7 @@ CeruleanCave_B1F_EventScript_1624F5:: @ 81624F5 waitbuttonpress setwildbattle SPECIES_MEWTWO, 70, ITEM_NONE setflag FLAG_SYS_SPECIAL_WILD_BATTLE - special sub_807F9D8 + special BattleSetup_StartLegendaryBattle waitstate clearflag FLAG_SYS_SPECIAL_WILD_BATTLE specialvar VAR_RESULT, Special_GetBattleOutcome diff --git a/data/maps/MtEmber_Summit/scripts.inc b/data/maps/MtEmber_Summit/scripts.inc index 8287d1d93..87b3a6e4a 100644 --- a/data/maps/MtEmber_Summit/scripts.inc +++ b/data/maps/MtEmber_Summit/scripts.inc @@ -41,7 +41,7 @@ MtEmber_Summit_EventScript_163B33:: @ 8163B33 playbgm MUS_EXEYE, 0 waitbuttonpress setflag FLAG_SYS_SPECIAL_WILD_BATTLE - special sub_807F9D8 + special BattleSetup_StartLegendaryBattle waitstate clearflag FLAG_SYS_SPECIAL_WILD_BATTLE specialvar VAR_RESULT, Special_GetBattleOutcome diff --git a/data/maps/NavelRock_Base/scripts.inc b/data/maps/NavelRock_Base/scripts.inc index 98bb6f920..f86d87888 100644 --- a/data/maps/NavelRock_Base/scripts.inc +++ b/data/maps/NavelRock_Base/scripts.inc @@ -65,7 +65,7 @@ NavelRock_Base_EventScript_165134:: @ 8165134 setvar VAR_0x8006, 0 special CreateObedientEnemyMon setflag FLAG_SYS_SPECIAL_WILD_BATTLE - special sub_807F9D8 + special BattleSetup_StartLegendaryBattle waitstate clearflag FLAG_SYS_SPECIAL_WILD_BATTLE specialvar VAR_RESULT, Special_GetBattleOutcome diff --git a/data/maps/NavelRock_Summit/scripts.inc b/data/maps/NavelRock_Summit/scripts.inc index f73aaf1ec..46336b536 100644 --- a/data/maps/NavelRock_Summit/scripts.inc +++ b/data/maps/NavelRock_Summit/scripts.inc @@ -69,7 +69,7 @@ NavelRock_Summit_EventScript_164FFB:: @ 8164FFB setvar VAR_0x8006, 0 special CreateObedientEnemyMon setflag FLAG_SYS_SPECIAL_WILD_BATTLE - special sub_807F9D8 + special BattleSetup_StartLegendaryBattle waitstate clearflag FLAG_SYS_SPECIAL_WILD_BATTLE setvar VAR_LAST_TALKED, 1 diff --git a/data/maps/PokemonTower_6F/scripts.inc b/data/maps/PokemonTower_6F/scripts.inc index ee40d071b..55be7ec1b 100644 --- a/data/maps/PokemonTower_6F/scripts.inc +++ b/data/maps/PokemonTower_6F/scripts.inc @@ -9,7 +9,7 @@ PokemonTower_6F_EventScript_1634B8:: @ 81634B8 compare_var_to_value VAR_RESULT, 2 goto_if eq, EventScript_1A7AE0 setwildbattle SPECIES_MAROWAK, 30, ITEM_NONE - special sub_807F904 + special BattleSetup_StartMarowakBattle waitstate special sub_8112364 compare_var_to_value VAR_RESULT, 0 diff --git a/data/maps/PowerPlant/scripts.inc b/data/maps/PowerPlant/scripts.inc index aa6fa42b0..5f7b9ea24 100644 --- a/data/maps/PowerPlant/scripts.inc +++ b/data/maps/PowerPlant/scripts.inc @@ -54,7 +54,7 @@ PowerPlant_EventScript_1637B8:: @ 81637B8 playbgm MUS_EXEYE, 0 waitbuttonpress setflag FLAG_SYS_SPECIAL_WILD_BATTLE - special sub_807F9D8 + special BattleSetup_StartLegendaryBattle waitstate clearflag FLAG_SYS_SPECIAL_WILD_BATTLE specialvar VAR_RESULT, Special_GetBattleOutcome diff --git a/data/maps/SeafoamIslands_B4F/scripts.inc b/data/maps/SeafoamIslands_B4F/scripts.inc index 3b618448c..a93ecaa50 100644 --- a/data/maps/SeafoamIslands_B4F/scripts.inc +++ b/data/maps/SeafoamIslands_B4F/scripts.inc @@ -179,7 +179,7 @@ SeafoamIslands_B4F_EventScript_1631AC:: @ 81631AC playbgm MUS_EXEYE, 0 waitbuttonpress setflag FLAG_SYS_SPECIAL_WILD_BATTLE - special sub_807F9D8 + special BattleSetup_StartLegendaryBattle waitstate clearflag FLAG_SYS_SPECIAL_WILD_BATTLE specialvar VAR_RESULT, Special_GetBattleOutcome diff --git a/data/maps/ViridianCity/scripts.inc b/data/maps/ViridianCity/scripts.inc index 5c5cebf82..fe3ca4ec4 100644 --- a/data/maps/ViridianCity/scripts.inc +++ b/data/maps/ViridianCity/scripts.inc @@ -151,7 +151,7 @@ EventScript_165A65:: @ 8165A65 compare_var_to_value VAR_RESULT, 2 goto_if eq, EventScript_1A7AE0 special sub_8112364 - special sub_807F888 + special BattleSetup_StartOldManTutorialBattle waitstate release end @@ -246,7 +246,7 @@ EventScript_165B4C:: @ 8165B4C compare_var_to_value VAR_RESULT, 2 goto_if eq, EventScript_1A7AE0 special sub_8112364 - special sub_807F888 + special BattleSetup_StartOldManTutorialBattle waitstate lock faceplayer diff --git a/data/specials.inc b/data/specials.inc index bfb649961..d2ea38639 100644 --- a/data/specials.inc +++ b/data/specials.inc @@ -60,15 +60,15 @@ gSpecials:: @ 815FD60 def_special nullsub_75 def_special nullsub_75 def_special IsEnigmaBerryValid - def_special sub_80803CC - def_special sub_80805D8 - def_special sub_8080618 - def_special ScrSpecial_HasTrainerBeenFought + def_special GetTrainerBattleMode + def_special ShowTrainerIntroSpeech + def_special ShowTrainerCantBattleSpeech + def_special GetTrainerFlag def_special ScrSpecial_EndTrainerApproach - def_special PlayTrainerEncounterMusic + def_special SetUpTrainerEncounterMusic def_special sub_810CD4C def_special sub_810CEB4 - def_special sub_80805B0 + def_special BattleSetup_StartRematchBattle def_special sub_808C6A8 def_special CheckForAlivePartyMons def_special nullsub_75 @@ -166,7 +166,7 @@ gSpecials:: @ 815FD60 def_special nullsub_75 def_special nullsub_75 def_special nullsub_75 - def_special sub_807F888 + def_special BattleSetup_StartOldManTutorialBattle def_special ChangePokemonNickname def_special Special_ChooseMonFromParty def_special nullsub_75 @@ -320,10 +320,10 @@ gSpecials:: @ 815FD60 def_special sub_80CAC08 def_special sub_806E99C def_special sub_80CAC28 - def_special sub_807FA68 - def_special sub_807F9D8 + def_special BattleSetup_StartIceCaveBattle + def_special BattleSetup_StartLegendaryBattle def_special sub_807FABC - def_special sub_8080398 + def_special SetUpTrainerMovement def_special nullsub_75 def_special nullsub_75 def_special sub_807B6C0 @@ -351,7 +351,7 @@ gSpecials:: @ 815FD60 def_special GetNameOfEnigmaBerryInPlayerParty def_special nullsub_75 def_special sub_810B82C - def_special sub_807F904 + def_special BattleSetup_StartMarowakBattle def_special sub_80CA630 def_special sub_80CB7C4 def_special sub_80CBC5C @@ -408,7 +408,7 @@ gSpecials:: @ 815FD60 def_special sub_809D620 def_special sub_812781C def_special sub_8127888 - def_special sub_80803FC + def_special SetBattledTrainerFlag def_special sub_812B35C def_special Special_SSAnneDepartureCutscene def_special sub_8149A18 |