summaryrefslogtreecommitdiff
path: root/maps
diff options
context:
space:
mode:
Diffstat (limited to 'maps')
-rw-r--r--maps/BattleTower1F.asm92
-rw-r--r--maps/BattleTowerBattleRoom.asm48
-rw-r--r--maps/BattleTowerElevator.asm4
-rw-r--r--maps/GoldenrodPokeCenter1F.asm8
-rw-r--r--maps/LancesRoom.asm2
-rw-r--r--maps/Route35NationalParkgate.asm4
-rw-r--r--maps/Route36NationalParkgate.asm4
7 files changed, 81 insertions, 81 deletions
diff --git a/maps/BattleTower1F.asm b/maps/BattleTower1F.asm
index 83b8e002b..cb71cb232 100644
--- a/maps/BattleTower1F.asm
+++ b/maps/BattleTower1F.asm
@@ -10,11 +10,11 @@ BattleTower1F_MapScriptHeader:
db 0
UnknownScript_0x9e39d:
- writebyte $9
- special Function170687
+ writebyte BATTLE_TOWER_ACTION_09
+ special BattleTowerAction
iffalse UnknownScript_0x9e3d1
- writebyte $2
- special Function170687
+ writebyte BATTLE_TOWER_ACTION_02
+ special BattleTowerAction
if_equal $0, UnknownScript_0x9e3d1
if_equal $2, UnknownScript_0x9e3c4
if_equal $3, UnknownScript_0x9e3d1
@@ -30,10 +30,10 @@ UnknownScript_0x9e3c4:
priorityjump UnknownScript_0x9e555
UnknownScript_0x9e3c7:
- writebyte $4
- special Function170687
- writebyte $6
- special Function170687
+ writebyte BATTLE_TOWER_ACTION_04
+ special BattleTowerAction
+ writebyte BATTLE_TOWER_ACTION_06
+ special BattleTowerAction
UnknownScript_0x9e3d1:
dotrigger $1
UnknownScript_0x9e3d3:
@@ -51,14 +51,14 @@ UnknownScript_0x9e3e0:
end
ReceptionistScript_0x9e3e2:
- writebyte $2
- special Function170687
- if_equal $3, BattleTowerBattleRoomScript_0x9f4e4
+ writebyte BATTLE_TOWER_ACTION_02
+ special BattleTowerAction
+ if_equal $3, BattleTowerBattleRoomScript_0x9f4e4 ; maps/BattleTowerBattleRoom.asm
loadfont
writetext Text_BattleTowerWelcomesYou
keeptextopen
- writebyte $0
- special Function170687
+ writebyte BATTLE_TOWER_ACTION_00
+ special BattleTowerAction
if_not_equal $0, Script_Menu_ChallengeExplanationCancel
jump Script_BattleTowerIntroductionYesNo
@@ -71,8 +71,8 @@ Script_Menu_ChallengeExplanationCancel: ; 0x9e3fc
jump UnknownScript_0x9e4b0
Script_ChoseChallenge: ; 0x9e40f
- writebyte $1a
- special Function170687
+ writebyte BATTLE_TOWER_ACTION_1A ; ResetBattleTowerTrainerSRAM
+ special BattleTowerAction
special SpecialCheckForBattleTowerRules
if_not_equal $0, Script_CloseText
writetext Text_SaveBeforeEnteringBattleRoom
@@ -82,24 +82,24 @@ Script_ChoseChallenge: ; 0x9e40f
special Special_TryQuickSave
iffalse Script_Menu_ChallengeExplanationCancel
dotrigger $1
- writebyte $1
- special Function170687
+ writebyte BATTLE_TOWER_ACTION_01
+ special BattleTowerAction
special Function1700b0
if_equal $a, Script_Menu_ChallengeExplanationCancel
if_not_equal $0, UnknownScript_0x9e550
- writebyte $11
- special Function170687
+ writebyte BATTLE_TOWER_ACTION_11
+ special BattleTowerAction
writetext Text_RightThisWayToYourBattleRoom
closetext
loadmovesprites
- writebyte $1e
- special Function170687
+ writebyte BATTLE_TOWER_ACTION_1E
+ special BattleTowerAction
jump UnknownScript_0x9e454
UnknownScript_0x9e44e:
loadmovesprites
- writebyte $8
- special Function170687
+ writebyte BATTLE_TOWER_ACTION_08
+ special BattleTowerAction
UnknownScript_0x9e454:
musicfadeout MUSIC_NONE, $8
domaptrigger BATTLE_TOWER_BATTLE_ROOM, $0
@@ -107,8 +107,8 @@ UnknownScript_0x9e454:
domaptrigger BATTLE_TOWER_HALLWAY, $0
follow $2, PLAYER
applymovement $2, MovementData_0x9e571
- writebyte $a
- special Function170687
+ writebyte BATTLE_TOWER_ACTION_0A
+ special BattleTowerAction
warpsound
disappear $2
stopfollow
@@ -117,16 +117,16 @@ UnknownScript_0x9e454:
end
Script_GivePlayerHisPrize: ; 0x9e47a
- writebyte $1c
- special Function170687
- writebyte $1b
- special Function170687
+ writebyte BATTLE_TOWER_ACTION_1C
+ special BattleTowerAction
+ writebyte BATTLE_TOWER_ACTION_1B
+ special BattleTowerAction
if_equal $12, Script_YourPackIsStuffedFull
itemtotext $0, $1
- giveitem $ff, $5
+ giveitem ITEM_FROM_MEM, 5
writetext Text_PlayerGotFive
- writebyte $1d
- special Function170687
+ writebyte BATTLE_TOWER_ACTION_1D
+ special BattleTowerAction
loadmovesprites
end
@@ -143,8 +143,8 @@ Script_BattleTowerIntroductionYesNo: ; 0x9e49e
Script_BattleTowerExplanation: ; 0x9e4a5
writetext Text_BattleTowerIntroduction_2
UnknownScript_0x9e4a8:
- writebyte $1
- special Function170687
+ writebyte BATTLE_TOWER_ACTION_01
+ special BattleTowerAction
jump Script_Menu_ChallengeExplanationCancel
UnknownScript_0x9e4b0:
@@ -170,8 +170,8 @@ UnknownScript_0x9e4be:
iffalse Script_Menu_ChallengeExplanationCancel
special Special_TryQuickSave
iffalse Script_Menu_ChallengeExplanationCancel
- writebyte $1
- special Function170687
+ writebyte BATTLE_TOWER_ACTION_01
+ special BattleTowerAction
special Function1700ba
if_equal $a, Script_Menu_ChallengeExplanationCancel
if_not_equal $0, UnknownScript_0x9e550
@@ -184,16 +184,16 @@ UnknownScript_0x9e4be:
end
UnknownScript_0x9e4ea:
- writebyte $18
- special Function170687
+ writebyte BATTLE_TOWER_ACTION_18
+ special BattleTowerAction
if_not_equal $0, Script_APkmnLevelExceeds
- writebyte $19
- special Function170687
+ writebyte BATTLE_TOWER_ACTION_19
+ special BattleTowerAction
if_not_equal $0, Script_MayNotEnterABattleRoomUnderL70
special SpecialCheckForBattleTowerRules
if_not_equal $0, Script_CloseText
- writebyte $5
- special Function170687
+ writebyte BATTLE_TOWER_ACTION_05
+ special BattleTowerAction
if_equal $0, UnknownScript_0x9e512
writetext UnknownText_0x9ecb0
jump UnknownScript_0x9e515
@@ -210,10 +210,10 @@ UnknownScript_0x9e515:
special Special_TryQuickSave
iffalse Script_Menu_ChallengeExplanationCancel
dotrigger $1
- writebyte $6
- special Function170687
- writebyte $12
- special Function170687
+ writebyte BATTLE_TOWER_ACTION_06
+ special BattleTowerAction
+ writebyte BATTLE_TOWER_ACTION_12
+ special BattleTowerAction
writetext Text_RightThisWayToYourBattleRoom
closetext
jump UnknownScript_0x9e44e
diff --git a/maps/BattleTowerBattleRoom.asm b/maps/BattleTowerBattleRoom.asm
index 82966d56a..ce8f10aa3 100644
--- a/maps/BattleTowerBattleRoom.asm
+++ b/maps/BattleTowerBattleRoom.asm
@@ -30,10 +30,10 @@ Script_BattleRoomLoop: ; 0x9f425
storetext 1
keeptextopen
loadmovesprites
- special Function170215 ; calls predef startbattle
+ special BattleTowerBattle ; calls predef startbattle
special FadeBlackBGMap
reloadmap
- if_not_equal $0, UnknownScript_0x9f4c2
+ if_not_equal $0, Script_FailedBattleTowerChallenge
copybytetovar wNrOfBeatenBattleTowerTrainers ; wcf64
if_equal BATTLETOWER_NROFTRAINERS, Script_BeatenAllTrainers
applymovement $2, MovementData_0x9e597
@@ -65,12 +65,12 @@ Script_DontBattleNextOpponent: ; 0x9f483
writetext Text_SaveAndEndTheSession
yesorno
iffalse Script_DontSaveAndEndTheSession
- writebyte $7
- special Function170687
- writebyte $1f
- special Function170687
- writebyte $3
- special Function170687
+ writebyte BATTLE_TOWER_ACTION_07
+ special BattleTowerAction
+ writebyte BATTLE_TOWER_ACTION_1F
+ special BattleTowerAction
+ writebyte BATTLE_TOWER_ACTION_03
+ special BattleTowerAction
playsound SFX_SAVE
waitbutton
special FadeBlackBGMap
@@ -79,22 +79,22 @@ Script_DontSaveAndEndTheSession: ; 0x9f4a3
writetext Text_CancelYourBattleRoomChallenge
yesorno
iffalse Script_ContinueAndBattleNextOpponent
- writebyte $4
- special Function170687
- writebyte $6
- special Function170687
+ writebyte BATTLE_TOWER_ACTION_04
+ special BattleTowerAction
+ writebyte BATTLE_TOWER_ACTION_06
+ special BattleTowerAction
loadmovesprites
special FadeBlackBGMap
- warpfacing $1, BATTLE_TOWER_1F, $7, $7
+ warpfacing UP, BATTLE_TOWER_1F, $7, $7
loadfont
jump UnknownScript_0x9e4b0
-UnknownScript_0x9f4c2:
+Script_FailedBattleTowerChallenge:
pause 60
special Special_BattleTowerFade
- warpfacing $1, BATTLE_TOWER_1F, $7, $7
- writebyte $4
- special Function170687
+ warpfacing UP, BATTLE_TOWER_1F, $7, $7
+ writebyte BATTLE_TOWER_ACTION_04
+ special BattleTowerAction
loadfont
writetext Text_ThanksForVisiting
closetext
@@ -104,15 +104,15 @@ UnknownScript_0x9f4c2:
Script_BeatenAllTrainers: ; 0x9f4d9
pause 60
special Special_BattleTowerFade
- warpfacing $1, BATTLE_TOWER_1F, $7, $7
+ warpfacing UP, BATTLE_TOWER_1F, $7, $7
BattleTowerBattleRoomScript_0x9f4e4:
loadfont
writetext Text_CongratulationsYouveBeatenAllTheTrainers
jump Script_GivePlayerHisPrize
UnknownScript_0x9f4eb:
- writebyte $4
- special Function170687
+ writebyte BATTLE_TOWER_ACTION_04
+ special BattleTowerAction
loadfont
writetext Text_TooMuchTimeElapsedNoRegister
closetext
@@ -120,10 +120,10 @@ UnknownScript_0x9f4eb:
end
UnknownScript_0x9f4f7:
- writebyte $4
- special Function170687
- writebyte $6
- special Function170687
+ writebyte BATTLE_TOWER_ACTION_04
+ special BattleTowerAction
+ writebyte BATTLE_TOWER_ACTION_06
+ special BattleTowerAction
loadfont
writetext Text_ThanksForVisiting
writetext Text_WeHopeToServeYouAgain
diff --git a/maps/BattleTowerElevator.asm b/maps/BattleTowerElevator.asm
index 8ba599340..944f15988 100644
--- a/maps/BattleTowerElevator.asm
+++ b/maps/BattleTowerElevator.asm
@@ -20,8 +20,8 @@ UnknownScript_0x9f568:
follow $2, PLAYER
applymovement $2, MovementData_0x9f58f
applymovement PLAYER, MovementData_0x9f592
- writebyte $a
- special Function170687
+ writebyte BATTLE_TOWER_ACTION_0A
+ special BattleTowerAction
playsound SFX_ELEVATOR
earthquake 60
waitbutton
diff --git a/maps/GoldenrodPokeCenter1F.asm b/maps/GoldenrodPokeCenter1F.asm
index 4b6299ffe..3a4792403 100644
--- a/maps/GoldenrodPokeCenter1F.asm
+++ b/maps/GoldenrodPokeCenter1F.asm
@@ -9,8 +9,8 @@ NurseScript_0x60f91:
jumpstd pokecenternurse
UnknownScript_0x60f94:
- writebyte $b
- special Function170687
+ writebyte BATTLE_TOWER_ACTION_0B
+ special BattleTowerAction
if_equal $b, UnknownScript_0x60f9e
end
@@ -41,8 +41,8 @@ UnknownScript_0x60fd8:
end
UnknownScript_0x60fd9:
- writebyte $b
- special Function170687
+ writebyte BATTLE_TOWER_ACTION_0B
+ special BattleTowerAction
if_equal $b, UnknownScript_0x60fe3
end
diff --git a/maps/LancesRoom.asm b/maps/LancesRoom.asm
index 0b8fa2d02..91bb5a8ad 100644
--- a/maps/LancesRoom.asm
+++ b/maps/LancesRoom.asm
@@ -127,7 +127,7 @@ LanceScript_0x180e7b:
applymovement $3, MovementData_0x180f5b
special FadeBlackBGMap
pause 15
- warpfacing $1, HALL_OF_FAME, $4, $d
+ warpfacing UP, HALL_OF_FAME, $4, $d
end
MovementData_0x180f33:
diff --git a/maps/Route35NationalParkgate.asm b/maps/Route35NationalParkgate.asm
index e061aff66..786f110ba 100644
--- a/maps/Route35NationalParkgate.asm
+++ b/maps/Route35NationalParkgate.asm
@@ -77,7 +77,7 @@ Route35NationalParkgate_GoBackIn:
playsound SFX_ENTER_DOOR
special FadeBlackBGMap
waitbutton
- warpfacing $1, NATIONAL_PARK_BUG_CONTEST, $a, $2f
+ warpfacing UP, NATIONAL_PARK_BUG_CONTEST, $a, $2f
end
OfficerScript_0x6a204:
@@ -115,7 +115,7 @@ Route35NationalParkgate_OkayToProceed:
special FadeBlackBGMap
waitbutton
special Special_SelectRandomBugContestContestants
- warpfacing $1, NATIONAL_PARK_BUG_CONTEST, $a, $2f
+ warpfacing UP, NATIONAL_PARK_BUG_CONTEST, $a, $2f
end
Route35NationalParkgate_EnterContest:
diff --git a/maps/Route36NationalParkgate.asm b/maps/Route36NationalParkgate.asm
index 87d6cf897..025133902 100644
--- a/maps/Route36NationalParkgate.asm
+++ b/maps/Route36NationalParkgate.asm
@@ -85,7 +85,7 @@ Route36NationalParkgate_MapScriptHeader:
playsound SFX_EXIT_BUILDING
special FadeBlackBGMap
waitbutton
- warpfacing $2, NATIONAL_PARK_BUG_CONTEST, $21, $12
+ warpfacing LEFT, NATIONAL_PARK_BUG_CONTEST, $21, $12
end
.CopyContestants:
@@ -169,7 +169,7 @@ Route36OfficerScriptContest:
special FadeBlackBGMap
waitbutton
special Special_SelectRandomBugContestContestants
- warpfacing $2, NATIONAL_PARK_BUG_CONTEST, $21, $12
+ warpfacing LEFT, NATIONAL_PARK_BUG_CONTEST, $21, $12
end
.LeaveMonsWithOfficer:
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-11 13:56:45 +0000