diff options
author | jiangzhengwenjz <jiangzhengwenjzw@qq.com> | 2019-10-19 03:14:17 +0800 |
---|---|---|
committer | jiangzhengwenjz <jiangzhengwenjzw@qq.com> | 2019-10-19 03:14:17 +0800 |
commit | e48725d9b54ed9f71f65c3ba5577cffa8f4887d1 (patch) | |
tree | d5f737251666df1642aebd8ffc311bb5e07d7a9d /data | |
parent | 34b440a3584d4d2c6d4f28cb4d8bf77efb734bc3 (diff) |
document battle_setup symbols
Diffstat (limited to 'data')
-rw-r--r-- | data/data_835B488.s | 14 | ||||
-rw-r--r-- | data/map_event_scripts.inc | 48 | ||||
-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 | 22 |
12 files changed, 52 insertions, 52 deletions
diff --git a/data/data_835B488.s b/data/data_835B488.s index a1893150d..751c88f9e 100644 --- a/data/data_835B488.s +++ b/data/data_835B488.s @@ -13,28 +13,28 @@ gUnknown_83C68E4:: @ 83C68E4 gUnknown_83C68EC:: @ 83C68EC .incbin "baserom.gba", 0x3C68EC, 0x4 -gUnknown_83C68F0:: @ 83C68F0 +sBattleTransitionTable_Wild:: @ 83C68F0 .incbin "baserom.gba", 0x3C68F0, 0x8 -gUnknown_83C68F8:: @ 83C68F8 +sBattleTransitionTable_Trainer:: @ 83C68F8 .incbin "baserom.gba", 0x3C68F8, 0x8 -gUnknown_83C6900:: @ 83C6900 +sOrdinaryBattleParams:: @ 83C6900 .incbin "baserom.gba", 0x3C6900, 0x48 -gUnknown_83C6948:: @ 83C6948 +sContinueScriptBattleParams:: @ 83C6948 .incbin "baserom.gba", 0x3C6948, 0x48 -gUnknown_83C6990:: @ 83C6990 +sDoubleBattleParams:: @ 83C6990 .incbin "baserom.gba", 0x3C6990, 0x48 -gUnknown_83C69D8:: @ 83C69D8 +sOrdinaryNoIntroBattleParams:: @ 83C69D8 .incbin "baserom.gba", 0x3C69D8, 0x48 gUnknown_83C6A20:: @ 83C6A20 .incbin "baserom.gba", 0x3C6A20, 0x48 -gUnknown_83C6A68:: @ 83C6A68 +sContinueScriptDoubleBattleParams:: @ 83C6A68 .incbin "baserom.gba", 0x3C6A68, 0x48 gUnknown_83C6AB0:: @ 83C6AB0 diff --git a/data/map_event_scripts.inc b/data/map_event_scripts.inc index 62a34d33c..4e61859a6 100644 --- a/data/map_event_scripts.inc +++ b/data/map_event_scripts.inc @@ -780,12 +780,12 @@ EventScript_1A4EAF:: @ 81A4EAF gUnknown_81A4EB4:: @ 81A4EB4 lock - special sub_8080628 + special SetUpTrainerEncounterMusic special ScrSpecial_EndTrainerApproach waitstate goto EventScript_1A4FC7 -gUnknown_81A4EC1:: @ 81A4EC1 +EventScript_TryDoNormalTrainerBattle:: @ 81A4EC1 lock faceplayer applymovement VAR_LAST_TALKED, Movement_1A4FC5 @@ -793,14 +793,14 @@ gUnknown_81A4EC1:: @ 81A4EC1 specialvar VAR_RESULT, ScrSpecial_HasTrainerBeenFought compare_var_to_value VAR_RESULT, 0 goto_if 5, EventScript_1A4EE8 - special sub_8080628 - 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 @@ -810,12 +810,12 @@ gUnknown_81A4EE9:: @ 81A4EE9 special CheckForAlivePartyMons compare_var_to_value VAR_RESULT, 0 goto_if 5, EventScript_1A4F19 - special sub_8080628 - special sub_8080398 + special SetUpTrainerEncounterMusic + special SetUpTrainerMovement goto EventScript_1A4FC7 EventScript_1A4F19:: @ 81A4F19 - special sub_8080618 + special ShowTrainerCantBattleSpeech waitmessage waitbuttonpress release @@ -824,30 +824,30 @@ EventScript_1A4F19:: @ 81A4F19 EventScript_1A4F20:: @ 81A4F20 ontrainerbattleend -gUnknown_81A4F21:: @ 81A4F21 +EventScript_DoTrainerBattle:: @ 81A4F21 applymovement VAR_LAST_TALKED, Movement_1A4FC5 waitmovement 0 - special sub_8080628 + 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 sub_8080628 - 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 @@ -855,22 +855,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 5, EventScript_1A4FB1 - special sub_8080628 - 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 @@ -879,7 +879,7 @@ EventScript_1A4FB0:: @ 81A4FB0 ontrainerbattleend EventScript_1A4FB1:: @ 81A4FB1 - special sub_8080618 + special ShowTrainerCantBattleSpeech waitmessage waitbuttonpress release @@ -899,14 +899,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 @@ -926,7 +926,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 136a57b6a..45c30a274 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_0x807 - special sub_807F9D8 + special BattleSetup_StartLegendaryBattle waitstate clearflag FLAG_0x807 specialvar VAR_RESULT, sub_80CA74C diff --git a/data/maps/CeruleanCave_B1F/scripts.inc b/data/maps/CeruleanCave_B1F/scripts.inc index c12eaff5a..596c81982 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_0x807 - special sub_807F9D8 + special BattleSetup_StartLegendaryBattle waitstate clearflag FLAG_0x807 specialvar VAR_RESULT, sub_80CA74C diff --git a/data/maps/MtEmber_Summit/scripts.inc b/data/maps/MtEmber_Summit/scripts.inc index 05472f91c..25fe96603 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_0x807 - special sub_807F9D8 + special BattleSetup_StartLegendaryBattle waitstate clearflag FLAG_0x807 specialvar VAR_RESULT, sub_80CA74C diff --git a/data/maps/NavelRock_Base/scripts.inc b/data/maps/NavelRock_Base/scripts.inc index 78c468022..7eadbe013 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_0x807 - special sub_807F9D8 + special BattleSetup_StartLegendaryBattle waitstate clearflag FLAG_0x807 specialvar VAR_RESULT, sub_80CA74C diff --git a/data/maps/NavelRock_Summit/scripts.inc b/data/maps/NavelRock_Summit/scripts.inc index d359d4d25..afed91b9e 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_0x807 - special sub_807F9D8 + special BattleSetup_StartLegendaryBattle waitstate clearflag FLAG_0x807 setvar VAR_LAST_TALKED, 1 diff --git a/data/maps/PokemonTower_6F/scripts.inc b/data/maps/PokemonTower_6F/scripts.inc index dd2bdff80..df6099f4a 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 b70dc0f22..138d94bf0 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_0x807 - special sub_807F9D8 + special BattleSetup_StartLegendaryBattle waitstate clearflag FLAG_0x807 specialvar VAR_RESULT, sub_80CA74C diff --git a/data/maps/SeafoamIslands_B4F/scripts.inc b/data/maps/SeafoamIslands_B4F/scripts.inc index c0bcc1196..58841ea39 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_0x807 - special sub_807F9D8 + special BattleSetup_StartLegendaryBattle waitstate clearflag FLAG_0x807 specialvar VAR_RESULT, sub_80CA74C diff --git a/data/maps/ViridianCity/scripts.inc b/data/maps/ViridianCity/scripts.inc index 5434fa1fa..56719e468 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 d8d208d43..3968d01d3 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 GetTrainerBattleMode + def_special ShowTrainerIntroSpeech + def_special ShowTrainerCantBattleSpeech def_special ScrSpecial_HasTrainerBeenFought def_special ScrSpecial_EndTrainerApproach - def_special sub_8080628 + 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 sub_80BF8FC 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 |