revert some symbol documentation (I hate this)

This commit is contained in:
jiangzhengwenjz
2019-10-25 09:17:15 +08:00
parent b8c2d14f6a
commit 6ca932e5e9
14 changed files with 50 additions and 50 deletions
+8 -8
View File
@@ -876,7 +876,7 @@ EventScript_TryDoDoubleTrainerBattle:: @ 81A4EE9
goto EventScript_1A4FC7 goto EventScript_1A4FC7
EventScript_1A4F19:: @ 81A4F19 EventScript_1A4F19:: @ 81A4F19
special ShowTrainerCantBattleSpeech special ScrSpecial_ShowTrainerNonBattlingSpeech
waitmessage waitmessage
waitbuttonpress waitbuttonpress
release release
@@ -902,13 +902,13 @@ EventScript_TryDoRematchBattle:: @ 81A4F3E
goto_if eq, EventScript_1A4F72 goto_if eq, EventScript_1A4F72
special SetUpTrainerEncounterMusic special SetUpTrainerEncounterMusic
special SetUpTrainerMovement special SetUpTrainerMovement
special ShowTrainerIntroSpeech special ScrSpecial_ShowTrainerIntroSpeech
waitmessage waitmessage
waitbuttonpress waitbuttonpress
special sub_8110AB4 special sub_8110AB4
compare_var_to_value VAR_RESULT, 2 compare_var_to_value VAR_RESULT, 2
goto_if eq, EventScript_1A4FB8 goto_if eq, EventScript_1A4FB8
special BattleSetup_StartRematchBattle special ScrSpecial_StartTrainerEyeRematch
waitstate waitstate
releaseall releaseall
end end
@@ -925,13 +925,13 @@ EventScript_TryDoDoubleRematchBattle:: @ 81A4F73
goto_if ne, EventScript_1A4FB1 goto_if ne, EventScript_1A4FB1
special SetUpTrainerEncounterMusic special SetUpTrainerEncounterMusic
special SetUpTrainerMovement special SetUpTrainerMovement
special ShowTrainerIntroSpeech special ScrSpecial_ShowTrainerIntroSpeech
waitmessage waitmessage
waitbuttonpress waitbuttonpress
special sub_8110AB4 special sub_8110AB4
compare_var_to_value VAR_RESULT, 2 compare_var_to_value VAR_RESULT, 2
goto_if eq, EventScript_1A4FB8 goto_if eq, EventScript_1A4FB8
special BattleSetup_StartRematchBattle special ScrSpecial_StartTrainerEyeRematch
waitstate waitstate
releaseall releaseall
end end
@@ -940,7 +940,7 @@ EventScript_1A4FB0:: @ 81A4FB0
ontrainerbattleend ontrainerbattleend
EventScript_1A4FB1:: @ 81A4FB1 EventScript_1A4FB1:: @ 81A4FB1
special ShowTrainerCantBattleSpeech special ScrSpecial_ShowTrainerNonBattlingSpeech
waitmessage waitmessage
waitbuttonpress waitbuttonpress
release release
@@ -960,14 +960,14 @@ Movement_1A4FC5:: @ 81A4FC5
step_end step_end
EventScript_1A4FC7:: @ 81A4FC7 EventScript_1A4FC7:: @ 81A4FC7
special ShowTrainerIntroSpeech special ScrSpecial_ShowTrainerIntroSpeech
waitmessage waitmessage
waitbuttonpress waitbuttonpress
special sub_8110AB4 special sub_8110AB4
compare_var_to_value VAR_RESULT, 2 compare_var_to_value VAR_RESULT, 2
goto_if eq, EventScript_1A501A goto_if eq, EventScript_1A501A
battlebegin battlebegin
specialvar VAR_RESULT, GetTrainerBattleMode specialvar VAR_RESULT, ScrSpecial_GetTrainerBattleMode
compare_var_to_value VAR_RESULT, 0 compare_var_to_value VAR_RESULT, 0
goto_if eq, EventScript_1A5017 goto_if eq, EventScript_1A5017
compare_var_to_value VAR_RESULT, 2 compare_var_to_value VAR_RESULT, 2
+1 -1
View File
@@ -92,7 +92,7 @@ EventScript_1652C0:: @ 81652C0
setvar VAR_0x8006, 0 setvar VAR_0x8006, 0
special CreateObedientEnemyMon special CreateObedientEnemyMon
setflag FLAG_SYS_SPECIAL_WILD_BATTLE setflag FLAG_SYS_SPECIAL_WILD_BATTLE
special BattleSetup_StartLegendaryBattle special Special_StartLegendaryBattle
waitstate waitstate
clearflag FLAG_SYS_SPECIAL_WILD_BATTLE clearflag FLAG_SYS_SPECIAL_WILD_BATTLE
specialvar VAR_RESULT, Special_GetBattleOutcome specialvar VAR_RESULT, Special_GetBattleOutcome
+1 -1
View File
@@ -41,7 +41,7 @@ CeruleanCave_B1F_EventScript_1624F5:: @ 81624F5
waitbuttonpress waitbuttonpress
setwildbattle SPECIES_MEWTWO, 70, ITEM_NONE setwildbattle SPECIES_MEWTWO, 70, ITEM_NONE
setflag FLAG_SYS_SPECIAL_WILD_BATTLE setflag FLAG_SYS_SPECIAL_WILD_BATTLE
special BattleSetup_StartLegendaryBattle special Special_StartLegendaryBattle
waitstate waitstate
clearflag FLAG_SYS_SPECIAL_WILD_BATTLE clearflag FLAG_SYS_SPECIAL_WILD_BATTLE
specialvar VAR_RESULT, Special_GetBattleOutcome specialvar VAR_RESULT, Special_GetBattleOutcome
+1 -1
View File
@@ -41,7 +41,7 @@ MtEmber_Summit_EventScript_163B33:: @ 8163B33
playbgm MUS_EXEYE, 0 playbgm MUS_EXEYE, 0
waitbuttonpress waitbuttonpress
setflag FLAG_SYS_SPECIAL_WILD_BATTLE setflag FLAG_SYS_SPECIAL_WILD_BATTLE
special BattleSetup_StartLegendaryBattle special Special_StartLegendaryBattle
waitstate waitstate
clearflag FLAG_SYS_SPECIAL_WILD_BATTLE clearflag FLAG_SYS_SPECIAL_WILD_BATTLE
specialvar VAR_RESULT, Special_GetBattleOutcome specialvar VAR_RESULT, Special_GetBattleOutcome
+1 -1
View File
@@ -65,7 +65,7 @@ NavelRock_Base_EventScript_165134:: @ 8165134
setvar VAR_0x8006, 0 setvar VAR_0x8006, 0
special CreateObedientEnemyMon special CreateObedientEnemyMon
setflag FLAG_SYS_SPECIAL_WILD_BATTLE setflag FLAG_SYS_SPECIAL_WILD_BATTLE
special BattleSetup_StartLegendaryBattle special Special_StartLegendaryBattle
waitstate waitstate
clearflag FLAG_SYS_SPECIAL_WILD_BATTLE clearflag FLAG_SYS_SPECIAL_WILD_BATTLE
specialvar VAR_RESULT, Special_GetBattleOutcome specialvar VAR_RESULT, Special_GetBattleOutcome
+1 -1
View File
@@ -69,7 +69,7 @@ NavelRock_Summit_EventScript_164FFB:: @ 8164FFB
setvar VAR_0x8006, 0 setvar VAR_0x8006, 0
special CreateObedientEnemyMon special CreateObedientEnemyMon
setflag FLAG_SYS_SPECIAL_WILD_BATTLE setflag FLAG_SYS_SPECIAL_WILD_BATTLE
special BattleSetup_StartLegendaryBattle special Special_StartLegendaryBattle
waitstate waitstate
clearflag FLAG_SYS_SPECIAL_WILD_BATTLE clearflag FLAG_SYS_SPECIAL_WILD_BATTLE
setvar VAR_LAST_TALKED, 1 setvar VAR_LAST_TALKED, 1
+1 -1
View File
@@ -9,7 +9,7 @@ PokemonTower_6F_EventScript_1634B8:: @ 81634B8
compare_var_to_value VAR_RESULT, 2 compare_var_to_value VAR_RESULT, 2
goto_if eq, EventScript_1A7AE0 goto_if eq, EventScript_1A7AE0
setwildbattle SPECIES_MAROWAK, 30, ITEM_NONE setwildbattle SPECIES_MAROWAK, 30, ITEM_NONE
special BattleSetup_StartMarowakBattle special ScrSpecial_StartMarowakBattle
waitstate waitstate
special sub_8112364 special sub_8112364
compare_var_to_value VAR_RESULT, 0 compare_var_to_value VAR_RESULT, 0
+1 -1
View File
@@ -54,7 +54,7 @@ PowerPlant_EventScript_1637B8:: @ 81637B8
playbgm MUS_EXEYE, 0 playbgm MUS_EXEYE, 0
waitbuttonpress waitbuttonpress
setflag FLAG_SYS_SPECIAL_WILD_BATTLE setflag FLAG_SYS_SPECIAL_WILD_BATTLE
special BattleSetup_StartLegendaryBattle special Special_StartLegendaryBattle
waitstate waitstate
clearflag FLAG_SYS_SPECIAL_WILD_BATTLE clearflag FLAG_SYS_SPECIAL_WILD_BATTLE
specialvar VAR_RESULT, Special_GetBattleOutcome specialvar VAR_RESULT, Special_GetBattleOutcome
+1 -1
View File
@@ -179,7 +179,7 @@ SeafoamIslands_B4F_EventScript_1631AC:: @ 81631AC
playbgm MUS_EXEYE, 0 playbgm MUS_EXEYE, 0
waitbuttonpress waitbuttonpress
setflag FLAG_SYS_SPECIAL_WILD_BATTLE setflag FLAG_SYS_SPECIAL_WILD_BATTLE
special BattleSetup_StartLegendaryBattle special Special_StartLegendaryBattle
waitstate waitstate
clearflag FLAG_SYS_SPECIAL_WILD_BATTLE clearflag FLAG_SYS_SPECIAL_WILD_BATTLE
specialvar VAR_RESULT, Special_GetBattleOutcome specialvar VAR_RESULT, Special_GetBattleOutcome
+2 -2
View File
@@ -151,7 +151,7 @@ EventScript_165A65:: @ 8165A65
compare_var_to_value VAR_RESULT, 2 compare_var_to_value VAR_RESULT, 2
goto_if eq, EventScript_1A7AE0 goto_if eq, EventScript_1A7AE0
special sub_8112364 special sub_8112364
special BattleSetup_StartOldManTutorialBattle special ScrSpecial_StartOldManTutorialBattle
waitstate waitstate
release release
end end
@@ -246,7 +246,7 @@ EventScript_165B4C:: @ 8165B4C
compare_var_to_value VAR_RESULT, 2 compare_var_to_value VAR_RESULT, 2
goto_if eq, EventScript_1A7AE0 goto_if eq, EventScript_1A7AE0
special sub_8112364 special sub_8112364
special BattleSetup_StartOldManTutorialBattle special ScrSpecial_StartOldManTutorialBattle
waitstate waitstate
lock lock
faceplayer faceplayer
+10 -10
View File
@@ -60,15 +60,15 @@ gSpecials:: @ 815FD60
def_special nullsub_75 def_special nullsub_75
def_special nullsub_75 def_special nullsub_75
def_special IsEnigmaBerryValid def_special IsEnigmaBerryValid
def_special GetTrainerBattleMode def_special ScrSpecial_GetTrainerBattleMode
def_special ShowTrainerIntroSpeech def_special ScrSpecial_ShowTrainerIntroSpeech
def_special ShowTrainerCantBattleSpeech def_special ScrSpecial_ShowTrainerNonBattlingSpeech
def_special GetTrainerFlag def_special GetTrainerFlag
def_special ScrSpecial_EndTrainerApproach def_special ScrSpecial_EndTrainerApproach
def_special SetUpTrainerEncounterMusic def_special SetUpTrainerEncounterMusic
def_special sub_810CD4C def_special sub_810CD4C
def_special sub_810CEB4 def_special sub_810CEB4
def_special BattleSetup_StartRematchBattle def_special ScrSpecial_StartTrainerEyeRematch
def_special sub_808C6A8 def_special sub_808C6A8
def_special CheckForAlivePartyMons def_special CheckForAlivePartyMons
def_special nullsub_75 def_special nullsub_75
@@ -166,7 +166,7 @@ gSpecials:: @ 815FD60
def_special nullsub_75 def_special nullsub_75
def_special nullsub_75 def_special nullsub_75
def_special nullsub_75 def_special nullsub_75
def_special BattleSetup_StartOldManTutorialBattle def_special ScrSpecial_StartOldManTutorialBattle
def_special ChangePokemonNickname def_special ChangePokemonNickname
def_special Special_ChooseMonFromParty def_special Special_ChooseMonFromParty
def_special nullsub_75 def_special nullsub_75
@@ -320,9 +320,9 @@ gSpecials:: @ 815FD60
def_special sub_80CAC08 def_special sub_80CAC08
def_special sub_806E99C def_special sub_806E99C
def_special sub_80CAC28 def_special sub_80CAC28
def_special BattleSetup_StartIceCaveBattle def_special Special_StartGroudonKyogreBattle
def_special BattleSetup_StartLegendaryBattle def_special Special_StartLegendaryBattle
def_special sub_807FABC def_special Special_StartRegiBattle
def_special SetUpTrainerMovement def_special SetUpTrainerMovement
def_special nullsub_75 def_special nullsub_75
def_special nullsub_75 def_special nullsub_75
@@ -332,7 +332,7 @@ gSpecials:: @ 815FD60
def_special nullsub_75 def_special nullsub_75
def_special nullsub_75 def_special nullsub_75
def_special sub_80E5E70 def_special sub_80E5E70
def_special sub_807F998 def_special ScrSpecial_StartSouthernIslandBattle
def_special nullsub_75 def_special nullsub_75
def_special nullsub_75 def_special nullsub_75
def_special nullsub_75 def_special nullsub_75
@@ -351,7 +351,7 @@ gSpecials:: @ 815FD60
def_special GetNameOfEnigmaBerryInPlayerParty def_special GetNameOfEnigmaBerryInPlayerParty
def_special nullsub_75 def_special nullsub_75
def_special sub_810B82C def_special sub_810B82C
def_special BattleSetup_StartMarowakBattle def_special ScrSpecial_StartMarowakBattle
def_special sub_80CA630 def_special sub_80CA630
def_special sub_80CB7C4 def_special sub_80CB7C4
def_special sub_80CBC5C def_special sub_80CBC5C
+10 -10
View File
@@ -5,20 +5,20 @@
void BattleSetup_StartWildBattle(void); void BattleSetup_StartWildBattle(void);
void BattleSetup_StartRoamerBattle(void); void BattleSetup_StartRoamerBattle(void);
void BattleSetup_StartOldManTutorialBattle(void); void ScrSpecial_StartOldManTutorialBattle(void);
void BattleSetup_StartScriptedWildBattle(void); void BattleSetup_StartScriptedWildBattle(void);
void BattleSetup_StartMarowakBattle(void); void ScrSpecial_StartMarowakBattle(void);
void sub_807F998(void); void ScrSpecial_StartSouthernIslandBattle(void);
void BattleSetup_StartLegendaryBattle(void); void Special_StartLegendaryBattle(void);
void BattleSetup_StartIceCaveBattle(void); void Special_StartGroudonKyogreBattle(void);
void sub_807FABC(void); void Special_StartRegiBattle(void);
u8 BattleSetup_GetTerrainId(void); u8 BattleSetup_GetTerrainId(void);
u8 sub_8080060(void); u8 sub_8080060(void);
const u8 *BattleSetup_ConfigureTrainerBattle(const u8 *data); const u8 *BattleSetup_ConfigureTrainerBattle(const u8 *data);
void ConfigureAndSetUpOneTrainerBattle(u8 trainerEventObjId, const u8 *trainerScript); void ConfigureAndSetUpOneTrainerBattle(u8 trainerEventObjId, const u8 *trainerScript);
bool32 GetTrainerFlagFromScriptPointer(const u8 *data); bool32 GetTrainerFlagFromScriptPointer(const u8 *data);
void SetUpTrainerMovement(void); void SetUpTrainerMovement(void);
u8 GetTrainerBattleMode(void); u8 ScrSpecial_GetTrainerBattleMode(void);
u16 sub_80803D8(void); u16 sub_80803D8(void);
u16 GetTrainerFlag(void); u16 GetTrainerFlag(void);
void SetBattledTrainerFlag(void); void SetBattledTrainerFlag(void);
@@ -26,11 +26,11 @@ bool8 HasTrainerBeenFought(u16 trainerId);
void SetTrainerFlag(u16 trainerId); void SetTrainerFlag(u16 trainerId);
void ClearTrainerFlag(u16 trainerId); void ClearTrainerFlag(u16 trainerId);
void BattleSetup_StartTrainerBattle(void); void BattleSetup_StartTrainerBattle(void);
void BattleSetup_StartRematchBattle(void); void ScrSpecial_StartTrainerEyeRematch(void);
void ShowTrainerIntroSpeech(void); void ScrSpecial_ShowTrainerIntroSpeech(void);
const u8 *BattleSetup_GetScriptAddrAfterBattle(void); const u8 *BattleSetup_GetScriptAddrAfterBattle(void);
const u8 *BattleSetup_GetTrainerPostBattleScript(void); const u8 *BattleSetup_GetTrainerPostBattleScript(void);
void ShowTrainerCantBattleSpeech(void); void ScrSpecial_ShowTrainerNonBattlingSpeech(void);
void SetUpTrainerEncounterMusic(void); void SetUpTrainerEncounterMusic(void);
const u8 *GetTrainerALoseText(void); const u8 *GetTrainerALoseText(void);
const u8 *GetTrainerWonSpeech(void); const u8 *GetTrainerWonSpeech(void);
+1 -1
View File
@@ -3719,7 +3719,7 @@ static void HandleEndTurn_BattleLost(void)
} }
else else
{ {
if (gBattleTypeFlags & BATTLE_TYPE_TRAINER && GetTrainerBattleMode() == 9) if (gBattleTypeFlags & BATTLE_TYPE_TRAINER && ScrSpecial_GetTrainerBattleMode() == 9)
{ {
if (sub_80803D8() & 1) if (sub_80803D8() & 1)
gBattleCommunication[MULTISTRING_CHOOSER] = 1; gBattleCommunication[MULTISTRING_CHOOSER] = 1;
+11 -11
View File
@@ -288,7 +288,7 @@ static void DoTrainerBattle(void)
IncrementGameStat(GAME_STAT_TRAINER_BATTLES); IncrementGameStat(GAME_STAT_TRAINER_BATTLES);
} }
void BattleSetup_StartOldManTutorialBattle(void) void ScrSpecial_StartOldManTutorialBattle(void)
{ {
CreateMaleMon(&gEnemyParty[0], SPECIES_WEEDLE, 5); CreateMaleMon(&gEnemyParty[0], SPECIES_WEEDLE, 5);
ScriptContext2_Enable(); ScriptContext2_Enable();
@@ -307,7 +307,7 @@ void BattleSetup_StartScriptedWildBattle(void)
IncrementGameStat(GAME_STAT_WILD_BATTLES); IncrementGameStat(GAME_STAT_WILD_BATTLES);
} }
void BattleSetup_StartMarowakBattle(void) void ScrSpecial_StartMarowakBattle(void)
{ {
ScriptContext2_Enable(); ScriptContext2_Enable();
gMain.savedCallback = CB2_EndMarowakBattle; gMain.savedCallback = CB2_EndMarowakBattle;
@@ -326,7 +326,7 @@ void BattleSetup_StartMarowakBattle(void)
IncrementGameStat(GAME_STAT_WILD_BATTLES); IncrementGameStat(GAME_STAT_WILD_BATTLES);
} }
void sub_807F998(void) void ScrSpecial_StartSouthernIslandBattle(void)
{ {
ScriptContext2_Enable(); ScriptContext2_Enable();
gMain.savedCallback = CB2_EndScriptedWildBattle; gMain.savedCallback = CB2_EndScriptedWildBattle;
@@ -336,7 +336,7 @@ void sub_807F998(void)
IncrementGameStat(GAME_STAT_WILD_BATTLES); IncrementGameStat(GAME_STAT_WILD_BATTLES);
} }
void BattleSetup_StartLegendaryBattle(void) void Special_StartLegendaryBattle(void)
{ {
u16 species; u16 species;
@@ -367,7 +367,7 @@ void BattleSetup_StartLegendaryBattle(void)
IncrementGameStat(GAME_STAT_WILD_BATTLES); IncrementGameStat(GAME_STAT_WILD_BATTLES);
} }
void BattleSetup_StartIceCaveBattle(void) void Special_StartGroudonKyogreBattle(void)
{ {
ScriptContext2_Enable(); ScriptContext2_Enable();
gMain.savedCallback = CB2_EndScriptedWildBattle; gMain.savedCallback = CB2_EndScriptedWildBattle;
@@ -380,7 +380,7 @@ void BattleSetup_StartIceCaveBattle(void)
IncrementGameStat(GAME_STAT_WILD_BATTLES); IncrementGameStat(GAME_STAT_WILD_BATTLES);
} }
void sub_807FABC(void) void Special_StartRegiBattle(void)
{ {
ScriptContext2_Enable(); ScriptContext2_Enable();
gMain.savedCallback = CB2_EndScriptedWildBattle; gMain.savedCallback = CB2_EndScriptedWildBattle;
@@ -840,7 +840,7 @@ void SetUpTrainerMovement(void)
SetTrainerMovementType(eventObject, GetTrainerFacingDirectionMovementType(eventObject->facingDirection)); SetTrainerMovementType(eventObject, GetTrainerFacingDirectionMovementType(eventObject->facingDirection));
} }
u8 GetTrainerBattleMode(void) u8 ScrSpecial_GetTrainerBattleMode(void)
{ {
return sTrainerBattleMode; return sTrainerBattleMode;
} }
@@ -884,7 +884,7 @@ void ClearTrainerFlag(u16 trainerId)
void BattleSetup_StartTrainerBattle(void) void BattleSetup_StartTrainerBattle(void)
{ {
gBattleTypeFlags = BATTLE_TYPE_TRAINER; gBattleTypeFlags = BATTLE_TYPE_TRAINER;
if (GetTrainerBattleMode() == TRAINER_BATTLE_TUTORIAL if (ScrSpecial_GetTrainerBattleMode() == TRAINER_BATTLE_TUTORIAL
&& sub_80803D8() & 3) && sub_80803D8() & 3)
gBattleTypeFlags |= BATTLE_TYPE_FIRST_BATTLE; gBattleTypeFlags |= BATTLE_TYPE_FIRST_BATTLE;
gMain.savedCallback = CB2_EndTrainerBattle; gMain.savedCallback = CB2_EndTrainerBattle;
@@ -959,7 +959,7 @@ static void CB2_EndRematchBattle(void)
} }
} }
void BattleSetup_StartRematchBattle(void) void ScrSpecial_StartTrainerEyeRematch(void)
{ {
gBattleTypeFlags = BATTLE_TYPE_TRAINER; gBattleTypeFlags = BATTLE_TYPE_TRAINER;
gMain.savedCallback = CB2_EndRematchBattle; gMain.savedCallback = CB2_EndRematchBattle;
@@ -967,7 +967,7 @@ void BattleSetup_StartRematchBattle(void)
ScriptContext1_Stop(); ScriptContext1_Stop();
} }
void ShowTrainerIntroSpeech(void) void ScrSpecial_ShowTrainerIntroSpeech(void)
{ {
ShowFieldMessage(GetIntroSpeechOfApproachingTrainer()); ShowFieldMessage(GetIntroSpeechOfApproachingTrainer());
} }
@@ -988,7 +988,7 @@ const u8 *BattleSetup_GetTrainerPostBattleScript(void)
return EventScript_1C555B; return EventScript_1C555B;
} }
void ShowTrainerCantBattleSpeech(void) void ScrSpecial_ShowTrainerNonBattlingSpeech(void)
{ {
ShowFieldMessage(GetTrainerCantBattleSpeech()); ShowFieldMessage(GetTrainerCantBattleSpeech());
} }