diff options
| author | mid-kid <esteve.varela@gmail.com> | 2017-11-19 11:52:42 +0100 |
|---|---|---|
| committer | mid-kid <esteve.varela@gmail.com> | 2017-11-19 11:52:42 +0100 |
| commit | 671341a0fbcbdcbe41331a19f7863fef923c19c1 (patch) | |
| tree | f94e3f9eedced0e116bdbbfab8d920fbe81c5c66 /maps | |
| parent | 1bf12455e4ad9cb9a0fde0d1ac5fa29a48c63590 (diff) | |
Labelled some battle tower-related functions
The UbersCheck and LevelCheck are used only for the battle tower,
despite them living in the mobile files.
Also labelled some of the known BattleTowerActions.
Diffstat (limited to 'maps')
| -rw-r--r-- | maps/BattleTower1F.asm | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/maps/BattleTower1F.asm b/maps/BattleTower1F.asm index 5d8809b10..1ee2c8163 100644 --- a/maps/BattleTower1F.asm +++ b/maps/BattleTower1F.asm @@ -20,7 +20,7 @@ BattleTower1F_MapScriptHeader: writebyte BATTLETOWERACTION_CHECKSAVEFILEISYOURS special BattleTowerAction iffalse .SkipEverything - writebyte BATTLETOWERACTION_02 ; copybytetovar sBattleTowerChallengeState + writebyte BATTLETOWERACTION_GET_CHALLENGE_STATE ; copybytetovar sBattleTowerChallengeState special BattleTowerAction if_equal $0, .SkipEverything if_equal $2, .priorityjump1 @@ -56,13 +56,13 @@ UnknownScript_0x9e3e0: end ReceptionistScript_0x9e3e2: - writebyte BATTLETOWERACTION_02 ; copybytetovar sBattleTowerChallengeState + writebyte BATTLETOWERACTION_GET_CHALLENGE_STATE ; copybytetovar sBattleTowerChallengeState special BattleTowerAction if_equal $3, Script_BeatenAllTrainers2 ; maps/BattleTowerBattleRoom.asm opentext writetext Text_BattleTowerWelcomesYou buttonsound - writebyte BATTLETOWERACTION_00 ; if new save file: bit 1, [s1_be4f] + writebyte BATTLETOWERACTION_CHECK_EXPLANATION_READ ; if new save file: bit 1, [s1_be4f] special BattleTowerAction if_not_equal $0, Script_Menu_ChallengeExplanationCancel jump Script_BattleTowerIntroductionYesNo @@ -87,7 +87,7 @@ Script_ChoseChallenge: ; 0x9e40f special Special_TryQuickSave iffalse Script_Menu_ChallengeExplanationCancel dotrigger $1 - writebyte BATTLETOWERACTION_01 ; set 1, [s1_be4f] + writebyte BATTLETOWERACTION_SET_EXPLANATION_READ ; set 1, [s1_be4f] special BattleTowerAction special Function1700b0 if_equal $a, Script_Menu_ChallengeExplanationCancel @@ -148,7 +148,7 @@ Script_BattleTowerIntroductionYesNo: ; 0x9e49e Script_BattleTowerExplanation: ; 0x9e4a5 writetext Text_BattleTowerIntroduction_2 Script_BattleTowerSkipExplanation: - writebyte BATTLETOWERACTION_01 + writebyte BATTLETOWERACTION_SET_EXPLANATION_READ special BattleTowerAction jump Script_Menu_ChallengeExplanationCancel @@ -174,7 +174,7 @@ UnreferencedScript_0x9e4be: iffalse Script_Menu_ChallengeExplanationCancel special Special_TryQuickSave iffalse Script_Menu_ChallengeExplanationCancel - writebyte BATTLETOWERACTION_01 + writebyte BATTLETOWERACTION_SET_EXPLANATION_READ special BattleTowerAction special Function1700ba if_equal $a, Script_Menu_ChallengeExplanationCancel @@ -188,10 +188,10 @@ UnreferencedScript_0x9e4be: end UnreferencedScript_0x9e4ea: - writebyte BATTLETOWERACTION_18 + writebyte BATTLETOWERACTION_LEVEL_CHECK special BattleTowerAction if_not_equal $0, Script_APkmnLevelExceeds - writebyte BATTLETOWERACTION_19 + writebyte BATTLETOWERACTION_UBERS_CHECK special BattleTowerAction if_not_equal $0, Script_MayNotEnterABattleRoomUnderL70 special SpecialCheckForBattleTowerRules |