Battle Tower scripts and text labels

constants/battle_tower_constants.asm

@@ -1,33 +1,39 @@
 	const_def
-	const BATTLE_TOWER_ACTION_00
+	const BATTLETOWERACTION_00
-	const BATTLE_TOWER_ACTION_01
+	const BATTLETOWERACTION_01
-	const BATTLE_TOWER_ACTION_02
+	const BATTLETOWERACTION_02
-	const BATTLE_TOWER_ACTION_03
+	const BATTLETOWERACTION_03
-	const BATTLE_TOWER_ACTION_04
+	const BATTLETOWERACTION_CHALLENGECANCELED
-	const BATTLE_TOWER_ACTION_05
+	const BATTLETOWERACTION_05
-	const BATTLE_TOWER_ACTION_06
+	const BATTLETOWERACTION_06 ; reset stuff in SRAM bank 5
-	const BATTLE_TOWER_ACTION_07
+	const BATTLETOWERACTION_SAVELEVELGROUP
-	const BATTLE_TOWER_ACTION_08
+	const BATTLETOWERACTION_LOADLEVELGROUP
-	const BATTLE_TOWER_ACTION_09
+	const BATTLETOWERACTION_CHECKSAVEFILEISYOURS
-	const BATTLE_TOWER_ACTION_0A
+	const BATTLETOWERACTION_0A
-	const BATTLE_TOWER_ACTION_0B
+	const BATTLETOWERACTION_CHECKMOBILEEVENT
-	const BATTLE_TOWER_ACTION_0C
+	const BATTLETOWERACTION_0C ; more time stuff in SRAM bank 5
-	const BATTLE_TOWER_ACTION_0D
+	const BATTLETOWERACTION_0D ; more time stuff in SRAM bank 5
-	const BATTLE_TOWER_ACTION_0E
+	const BATTLETOWERACTION_0E ; egg ticket
-	const BATTLE_TOWER_ACTION_0F
+	const BATTLETOWERACTION_0F ; check w3_d090
-	const BATTLE_TOWER_ACTION_10
+	const BATTLETOWERACTION_10 ; jumptable based on 5:a800
-	const BATTLE_TOWER_ACTION_11
+	const BATTLETOWERACTION_11 ; store 0 in 5:aa8d
-	const BATTLE_TOWER_ACTION_12
+	const BATTLETOWERACTION_12 ; store 1 in 5:aa8d
-	const BATTLE_TOWER_ACTION_13
+	const BATTLETOWERACTION_13 ; check 5:aa8d
-	const BATTLE_TOWER_ACTION_14
+	const BATTLETOWERACTION_14 ; if save file is yours: bit 0, [sbe4f]
-	const BATTLE_TOWER_ACTION_15
+	const BATTLETOWERACTION_15 ; set 0, [sbe4f]
-	const BATTLE_TOWER_ACTION_16
+	const BATTLETOWERACTION_16 ; update time in SRAM bank 5
-	const BATTLE_TOWER_ACTION_17
+	const BATTLETOWERACTION_17 ; check time in SRAM bank 5
-	const BATTLE_TOWER_ACTION_18
+	const BATTLETOWERACTION_18 ; level check
-	const BATTLE_TOWER_ACTION_19
+	const BATTLETOWERACTION_19 ; ubers check
-	const BATTLE_TOWER_ACTION_1A
+	const BATTLETOWERACTION_RESETDATA ; clear data
-	const BATTLE_TOWER_ACTION_1B
+	const BATTLETOWERACTION_1B ; give reward
-	const BATTLE_TOWER_ACTION_1C
+	const BATTLETOWERACTION_1C ; set won challenge
-	const BATTLE_TOWER_ACTION_1D
+	const BATTLETOWERACTION_1D ; set received reward
-	const BATTLE_TOWER_ACTION_1E
+	const BATTLETOWERACTION_1E ; save options
-	const BATTLE_TOWER_ACTION_1F
+	const BATTLETOWERACTION_CHOOSEREWARD
+
+BATTLETOWER_NO_CHALLENGE         EQU 0
+BATTLETOWER_SAVED_AND_LEFT       EQU 1
+BATTLETOWER_CHALLENGE_IN_PROGESS EQU 2
+BATTLETOWER_WON_CHALLENGE        EQU 3
+BATTLETOWER_RECEIVED_REWARD      EQU 4

engine/credits.asm

@@ -118,7 +118,7 @@ const_value SET -7
 	const CREDITS_END
 
 
-Function109847:: ; 109847
+Credits:: ; 109847
 	bit 6, b
 	ld a, $0
 	jr z, .asm_10984f

engine/evolution_animation.asm

@@ -389,14 +389,14 @@ Function4e881: ; 4e881
 	ld [hSCY], a
 	ld [hSCX], a
 	call EnableLCD
-	ld hl, UnknownText_0x4e8bd
+	ld hl, .SavingRecordDontTurnOff
 	call PrintText
 	call Function3200
 	call SetPalettes
 	ret
 ; 4e8bd
 
-UnknownText_0x4e8bd: ; 0x4e8bd
+.SavingRecordDontTurnOff: ; 0x4e8bd
 	; SAVING RECORD… DON'T TURN OFF!
 	text_jump UnknownText_0x1bd39e
 	db "@"
@@ -418,15 +418,15 @@ Function4e8c2: ; 4e8c2
 	ld bc, SCREEN_WIDTH * SCREEN_HEIGHT
 	xor a
 	call ByteFill
-	ld hl, wd000
+	ld hl, wd000 ; UnknBGPals
-	ld c, $40
+	ld c, 4 * $10
-.asm_4e8ee
+.load_white_palettes
-	ld a, -1
+	ld a, (palred 31 + palgreen 31 + palblue 31) % $100
 	ld [hli], a
-	ld a, " "
+	ld a, (palred 31 + palgreen 31 + palblue 31) / $100
 	ld [hli], a
 	dec c
-	jr nz, .asm_4e8ee
+	jr nz, .load_white_palettes
 	xor a
 	ld [hSCY], a
 	ld [hSCX], a

engine/map_setup.asm

@@ -272,8 +272,8 @@ MapSetupCommands: ; 15440
 	dba LoadMapAttributes ; 1a
 	dba LoadMapAttributes_SkipPeople ; 1b
 	dba ClearBGPalettes ; 1c
-	dba RotatePalettesRightPalettes ; 1d
+	dba FadeOutPalettes ; 1d
-	dba RotatePalettesLeftPalettes ; 1e
+	dba FadeInPalettes ; 1e
 	dba GetCoordOfUpperLeftCorner ; 1f
 	dba RestoreFacingAfterWarp ; 20
 	dba SpawnInFacingDown ; 21

engine/save.asm

@@ -182,7 +182,7 @@ AskOverwriteSaveFile: ; 14b89
 	ld a, [wSaveFileExists]
 	and a
 	jr z, .erase
-	call Function14bcb
+	call CompareLoadedAndSavedPlayerID
 	jr z, .yoursavefile
 	ld hl, UnknownText_0x15297
 	call SaveTheGame_yesorno
@@ -223,7 +223,7 @@ SaveTheGame_yesorno: ; 14baf
 	ret
 ; 14bcb
 
-Function14bcb: ; 14bcb
+CompareLoadedAndSavedPlayerID: ; 14bcb
 	ld a, BANK(sPlayerData)
 	call GetSRAMBank
 	ld hl, sPlayerData + (PlayerID - wPlayerData)
@@ -291,7 +291,7 @@ SaveGameData_: ; 14c10
 	ld a, BANK(sBattleTowerChallengeState)
 	call GetSRAMBank
 	ld a, [sBattleTowerChallengeState]
-	cp $4
+	cp BATTLETOWER_RECEIVED_REWARD
 	jr nz, .ok
 	xor a
 	ld [sBattleTowerChallengeState], a
@@ -373,7 +373,7 @@ ErasePreviousSave: ; 14cbb
 	call EraseLinkBattleStats
 	call EraseMysteryGift
 	call SaveData
-	call Function14d5c
+	call EraseBattleTowerStatus
 	ld a, BANK(sStackTop)
 	call GetSRAMBank
 	xor a
@@ -437,7 +437,7 @@ Unknown_14d2c: ; 14d2c
 	db $11, $0c, $0c, $06, $06, $04
 ; 14d5c
 
-Function14d5c: ; 14d5c
+EraseBattleTowerStatus: ; 14d5c
 	ld a, BANK(sBattleTowerChallengeState)
 	call GetSRAMBank
 	xor a
@@ -486,7 +486,7 @@ Function14d93: ; 14d93
 ; 14da0
 
 
-Function14da0: ; 14da0
+HallOfFame_InitSaveIfNeeded: ; 14da0
 	ld a, [wSavedAtLeastOnce]
 	and a
 	ret nz
@@ -512,7 +512,7 @@ SaveOptions: ; 14dbb
 	ld bc, OptionsEnd - Options
 	call CopyBytes
 	ld a, [Options]
-	and $ef
+	and $ff ^ (1 << NO_TEXT_SCROLL)
 	ld [sOptions], a
 	jp CloseSRAM
 ; 14dd7
@@ -791,9 +791,9 @@ LoadPlayerData: ; 14fd7 (5:4fd7)
 	ld a, BANK(sBattleTowerChallengeState)
 	call GetSRAMBank
 	ld a, [sBattleTowerChallengeState]
-	cp $4
+	cp BATTLETOWER_RECEIVED_REWARD
 	jr nz, .not_4
-	ld a, $3
+	ld a, BATTLETOWER_WON_CHALLENGE
 	ld [sBattleTowerChallengeState], a
 .not_4
 	call CloseSRAM

engine/specials.asm

@@ -66,11 +66,11 @@ SpecialsPointers:: ; c029
 	add_special Special_CardFlip
 	add_special Special_DummyNonfunctionalGameCornerGame
 	add_special Special_ClearBGPalettesBufferScreen
-	add_special RotatePalettesRightPalettes
+	add_special FadeOutPalettes
 	add_special Special_BattleTowerFade
 	add_special Special_FadeBlackQuickly
-	add_special RotatePalettesLeftPalettes
+	add_special FadeInPalettes
-	add_special Special_RotatePalettesLeftQuickly
+	add_special Special_FadeInQuickly
 	add_special Special_ReloadSpritesNoPalettes
 	add_special ClearBGPalettes
 	add_special UpdateTimePals

engine/timeofdaypals.asm

@@ -116,7 +116,7 @@ _UpdateTimePals:: ; 8c070
 	ret
 ; 8c079
 
-RotatePalettesLeftPalettes:: ; 8c079
+FadeInPalettes:: ; 8c079
 	ld c, $12
 	call GetTimePalFade
 	ld b, $4
@@ -124,7 +124,7 @@ RotatePalettesLeftPalettes:: ; 8c079
 	ret
 ; 8c084
 
-RotatePalettesRightPalettes:: ; 8c084
+FadeOutPalettes:: ; 8c084
 	call Function8c0c1
 	ld c, $9
 	call GetTimePalFade
@@ -150,7 +150,7 @@ endr
 	ret
 ; 8c0ab
 
-Special_RotatePalettesLeftQuickly: ; 8c0ab
+Special_FadeInQuickly: ; 8c0ab
 	ld c, $0
 	call GetTimePalFade
 	ld b, $4

event/field_moves.asm

@@ -7,7 +7,7 @@ PlayWhirlpoolSound: ; 8c7d4
 ; 8c7e1
 
 BlindingFlash: ; 8c7e1
-	callba RotatePalettesRightPalettes
+	callba FadeOutPalettes
 	ld hl, StatusFlags
 	set 2, [hl]
 	callba Function8c0e5
@@ -15,7 +15,7 @@ BlindingFlash: ; 8c7e1
 	ld b, SCGB_09
 	call GetSGBLayout
 	callba Function49409
-	callba RotatePalettesLeftPalettes
+	callba FadeInPalettes
 	ret
 ; 8c80a
 

event/halloffame.asm

@@ -1,5 +1,5 @@
 HallOfFame:: ; 0x8640e
-	call Function8648e
+	call HallOfFame_FadeOutMusic
 	ld a, [StatusFlags]
 	push af
 	ld a, 1
@@ -12,7 +12,7 @@ HallOfFame:: ; 0x8640e
 	ld hl, StatusFlags
 	set 6, [hl] ; hall of fame
 
-	callba Function14da0
+	callba HallOfFame_InitSaveIfNeeded
 
 	ld hl, wHallOfFameCount
 	ld a, [hl]
@@ -26,10 +26,10 @@ HallOfFame:: ; 0x8640e
 
 	xor a
 	ld [wc2cd], a
-	call Function864c3
+	call AnimateHallOfFame
 	pop af
 	ld b, a
-	callba Function109847
+	callba Credits
 	ret
 ; 0x86455
 
@@ -38,9 +38,9 @@ RedCredits:: ; 86455
 	ld [MusicFadeIDLo], a
 	ld a, MUSIC_NONE / $100
 	ld [MusicFadeIDHi], a
-	ld a, $a
+	ld a, 10
 	ld [MusicFade], a
-	callba RotatePalettesRightPalettes
+	callba FadeOutPalettes
 	xor a
 	ld [VramState], a
 	ld [hMapAnims], a
@@ -52,18 +52,18 @@ RedCredits:: ; 86455
 	ld [wSpawnAfterChampion], a
 	ld a, [StatusFlags]
 	ld b, a
-	callba Function109847
+	callba Credits
 	ret
 ; 8648e
 
-Function8648e: ; 8648e
+HallOfFame_FadeOutMusic: ; 8648e
 	ld a, MUSIC_NONE % $100
 	ld [MusicFadeIDLo], a
 	ld a, MUSIC_NONE / $100
 	ld [MusicFadeIDHi], a
 	ld a, 10
 	ld [MusicFade], a
-	callba RotatePalettesRightPalettes
+	callba FadeOutPalettes
 	xor a
 	ld [VramState], a
 	ld [hMapAnims], a
@@ -72,7 +72,7 @@ Function8648e: ; 8648e
 	jp DelayFrames
 ; 864b4
 
-Function864b4: ; 864b4
+HallOfFame_PlayMusicDE: ; 864b4
 	push de
 	ld de, MUSIC_NONE
 	call PlayMusic
@@ -82,29 +82,29 @@ Function864b4: ; 864b4
 	ret
 ; 864c3
 
-Function864c3: ; 864c3
+AnimateHallOfFame: ; 864c3
 	xor a
 	ld [wJumptableIndex], a
-	call Function8671c
+	call LoadHOFTeam
 	jr c, .done
-	ld de, SCREEN_WIDTH
+	ld de, MUSIC_HALL_OF_FAME
-	call Function864b4
+	call HallOfFame_PlayMusicDE
 	xor a
 	ld [wcf64], a
 .loop
 	ld a, [wcf64]
-	cp 6
+	cp PARTY_LENGTH
 	jr nc, .done
-	ld hl, wc608 + 1
+	ld hl, wHallOfFameTempMon1
-	ld bc, $10
+	ld bc, wHallOfFameTempMon1End - wHallOfFameTempMon1
 	call AddNTimes
 	ld a, [hl]
 	cp -1
 	jr z, .done
 	push hl
-	call Function865b5
+	call AnimateHOFMonEntrance
 	pop hl
-	call Function8650c
+	call .DisplayNewHallOfFamer
 	jr c, .done
 	ld hl, wcf64
 	inc [hl]
@@ -120,9 +120,9 @@ Function864c3: ; 864c3
 	ret
 ; 8650c
 
-Function8650c: ; 8650c
+.DisplayNewHallOfFamer: ; 8650c
-	call Function86748
+	call DisplayHOFMon
-	ld de, String_8652c
+	ld de, .String_NewHallOfFamer
 	hlcoord 1, 2
 	call PlaceString
 	call WaitBGMap
@@ -135,7 +135,7 @@ Function8650c: ; 8650c
 	ret
 ; 8652c
 
-String_8652c:
+.String_NewHallOfFamer:
 	db "New Hall of Famer!@"
 ; 8653f
 
@@ -227,7 +227,7 @@ GetHallOfFameParty: ; 8653f
 	ret
 ; 865b5
 
-Function865b5: ; 865b5
+AnimateHOFMonEntrance: ; 865b5
 	push hl
 	call ClearBGPalettes
 	callba Function4e906
@@ -265,7 +265,7 @@ endr
 	ld b, SCGB_1A
 	call GetSGBLayout
 	call SetPalettes
-	call Function86635
+	call HOF_SlideBackpic
 	xor a
 	ld [wc2c6], a
 	hlcoord 0, 0
@@ -278,23 +278,23 @@ endr
 	xor a
 	ld [hBGMapMode], a
 	ld [hSCY], a
-	call Function86643
+	call HOF_SlideFrontpic
 	ret
 ; 86635
 
-Function86635: ; 86635
+HOF_SlideBackpic:
-.loop
+.backpicloop
 	ld a, [hSCX]
 	cp $70
 	ret z
 	add $4
 	ld [hSCX], a
 	call DelayFrame
-	jr .loop
+	jr .backpicloop
 ; 86643
 
-Function86643: ; 86643
+HOF_SlideFrontpic:
-.loop
+.frontpicloop
 	ld a, [hSCX]
 	and a
 	ret z
@@ -303,7 +303,7 @@ rept 2
 endr
 	ld [hSCX], a
 	call DelayFrame
-	jr .loop
+	jr .frontpicloop
 ; 86650
 
 _HallOfFamePC: ; 86650
@@ -311,7 +311,7 @@ _HallOfFamePC: ; 86650
 	xor a
 	ld [wJumptableIndex], a
 .loop
-	call Function8671c
+	call LoadHOFTeam
 	ret c
 	call Function86665
 	ret c
@@ -361,8 +361,8 @@ Function86692: ; 86692
 	ld a, [wcf64]
 	cp $6
 	jr nc, .fail
-	ld hl, wc608 + 1
+	ld hl, wHallOfFameTempMon1
-	ld bc, $10
+	ld bc, wHallOfFameTempMon1End - wHallOfFameTempMon1
 	call AddNTimes
 	ld a, [hl]
 	cp $ff
@@ -376,8 +376,8 @@ Function86692: ; 86692
 	push hl
 	call ClearBGPalettes
 	pop hl
-	call Function86748
+	call DisplayHOFMon
-	ld a, [wc608]
+	ld a, [wHallOfFameTempWinCount]
 	cp 200 + 1
 	jr c, .print_num_hof
 	ld de, String_866fc
@@ -391,7 +391,7 @@ Function86692: ; 86692
 	hlcoord 1, 2
 	call PlaceString
 	hlcoord 2, 2
-	ld de, wc608
+	ld de, wHallOfFameTempWinCount
 	lb bc, 1, 3
 	call PrintNum
 	hlcoord 11, 2
@@ -423,10 +423,10 @@ String_8670c:
 ; 8671c
 
 
-Function8671c: ; 8671c
+LoadHOFTeam: ; 8671c
 	ld a, [wJumptableIndex]
 	cp NUM_HOF_TEAMS
-	jr nc, .full
+	jr nc, .invalid
 	ld hl, sHallOfFame
 	ld bc, HOF_LENGTH
 	call AddNTimes
@@ -434,23 +434,23 @@ Function8671c: ; 8671c
 	call GetSRAMBank
 	ld a, [hl]
 	and a
-	jr z, .fail
+	jr z, .absent
-	ld de, wc608
+	ld de, wHallOfFameTemp
 	ld bc, HOF_LENGTH
 	call CopyBytes
 	call CloseSRAM
 	and a
 	ret
 
-.fail
+.absent
 	call CloseSRAM
 
-.full
+.invalid
 	scf
 	ret
 ; 86748
 
-Function86748: ; 86748
+DisplayHOFMon: ; 86748
 	xor a
 	ld [hBGMapMode], a
 	ld a, [hli]
@@ -466,7 +466,7 @@ Function86748: ; 86748
 	ld a, [hli]
 	ld [TempMonLevel], a
 	ld de, StringBuffer2
-	ld bc, 10
+	ld bc, PKMN_NAME_LENGTH - 1
 	call CopyBytes
 	ld a, "@"
 	ld [StringBuffer2 + 10], a
@@ -564,7 +564,7 @@ Function86810: ; 86810
 	ld b, SCGB_1A
 	call GetSGBLayout
 	call SetPalettes
-	call Function86635
+	call HOF_SlideBackpic
 	xor a
 	ld [wc2c6], a
 	hlcoord 0, 0
@@ -583,7 +583,7 @@ Function86810: ; 86810
 	xor a
 	ld [hBGMapMode], a
 	ld [hSCY], a
-	call Function86643
+	call HOF_SlideFrontpic
 	xor a
 	ld [hBGMapMode], a
 	hlcoord 0, 2

event/sacred_ash.asm

@@ -52,12 +52,12 @@ SacredAshScript: ; 0x50821
 	special HealParty
 	reloadmappart
 	playsound SFX_WARP_TO
-	special RotatePalettesRightPalettes
+	special FadeOutPalettes
-	special RotatePalettesLeftPalettes
+	special FadeInPalettes
-	special RotatePalettesRightPalettes
+	special FadeOutPalettes
-	special RotatePalettesLeftPalettes
+	special FadeInPalettes
-	special RotatePalettesRightPalettes
+	special FadeOutPalettes
-	special RotatePalettesLeftPalettes
+	special FadeInPalettes
 	waitsfx
 	writetext UnknownText_0x50845
 	playsound SFX_CAUGHT_MON

event/whiteout.asm

@@ -10,7 +10,7 @@ Script_OverworldWhiteout:: ; 0x124c8
 Script_Whiteout: ; 0x124ce
 	writetext .WhitedOutText
 	waitbutton
-	special RotatePalettesRightPalettes
+	special FadeOutPalettes
 	pause 40
 	special HealParty
 	checkflag ENGINE_BUG_CONTEST_TIMER

home/map.asm

@@ -2007,7 +2007,7 @@ FadeToMenu:: ; 2b29
 	xor a
 	ld [hBGMapMode], a
 	call LoadStandardMenuDataHeader
-	callba RotatePalettesRightPalettes
+	callba FadeOutPalettes
 	call ClearSprites
 	call DisableSpriteUpdates
 	ret
@@ -2034,7 +2034,7 @@ Function2b5c:: ; 2b5c
 	call GetSGBLayout
 	callba Function49409
 	call Function3200
-	callba RotatePalettesLeftPalettes
+	callba FadeInPalettes
 	call EnableSpriteUpdates
 	ret
 ; 2b74

macros.asm

@@ -234,3 +234,7 @@ hlbgcoord EQUS "bgcoord hl,"
 debgcoord EQUS "bgcoord de,"
 bcbgcoord EQUS "bgcoord bc,"
 bgrows EQUS "* $20"
+
+palred EQUS "$0400 *"
+palgreen EQUS "$0020 *"
+palblue EQUS "$0001 *"

maps/BattleTower1F.asm

@@ -10,27 +10,27 @@ BattleTower1F_MapScriptHeader:
 	db 0
 
 .Trigger0:
-	writebyte BATTLE_TOWER_ACTION_09
+	writebyte BATTLETOWERACTION_CHECKSAVEFILEISYOURS
 	special BattleTowerAction
 	iffalse .SkipEverything
-	writebyte BATTLE_TOWER_ACTION_02
+	writebyte BATTLETOWERACTION_02 ; copybytetovar sBattleTowerChallengeState
 	special BattleTowerAction
 	if_equal $0, .SkipEverything
 	if_equal $2, .priorityjump1
 	if_equal $3, .SkipEverything
 	if_equal $4, .SkipEverything
 	loadfont
-	writetext UnknownText_0x9f037
+	writetext Text_WeveBeenWaitingForYou
 	waitbutton
 	closetext
-	priorityjump UnknownScript_0x9e44e
+	priorityjump Script_ResumeBattleTowerChallenge
 	end
 
 .priorityjump1:
 	priorityjump BattleTower_LeftWithoutSaving
-	writebyte BATTLE_TOWER_ACTION_04
+	writebyte BATTLETOWERACTION_CHALLENGECANCELED
 	special BattleTowerAction
-	writebyte BATTLE_TOWER_ACTION_06
+	writebyte BATTLETOWERACTION_06
 	special BattleTowerAction
 .SkipEverything:
 	dotrigger $1
@@ -49,13 +49,13 @@ UnknownScript_0x9e3e0:
 	end
 
 ReceptionistScript_0x9e3e2:
-	writebyte BATTLE_TOWER_ACTION_02
+	writebyte BATTLETOWERACTION_02 ; copybytetovar sBattleTowerChallengeState
 	special BattleTowerAction
-	if_equal $3, BattleTowerBattleRoomScript_0x9f4e4 ; maps/BattleTowerBattleRoom.asm
+	if_equal $3, Script_BeatenAllTrainers2 ; maps/BattleTowerBattleRoom.asm
 	loadfont
 	writetext Text_BattleTowerWelcomesYou
 	keeptextopen
-	writebyte BATTLE_TOWER_ACTION_00
+	writebyte BATTLETOWERACTION_00 ; if new save file: bit 1, [sbe4f]
 	special BattleTowerAction
 	if_not_equal $0, Script_Menu_ChallengeExplanationCancel
 	jump Script_BattleTowerIntroductionYesNo
@@ -66,10 +66,10 @@ Script_Menu_ChallengeExplanationCancel: ; 0x9e3fc
 	special Special_Menu_ChallengeExplanationCancel
 	if_equal $1, Script_ChoseChallenge
 	if_equal $2, Script_BattleTowerExplanation
-	jump UnknownScript_0x9e4b0
+	jump Script_BattleTowerHopeToServeYouAgain
 
 Script_ChoseChallenge: ; 0x9e40f
-	writebyte BATTLE_TOWER_ACTION_1A ; ResetBattleTowerTrainerSRAM
+	writebyte BATTLETOWERACTION_RESETDATA ; ResetBattleTowerTrainerSRAM
 	special BattleTowerAction
 	special SpecialCheckForBattleTowerRules
 	if_not_equal $0, Script_WaitButton
@@ -80,50 +80,50 @@ Script_ChoseChallenge: ; 0x9e40f
 	special Special_TryQuickSave
 	iffalse Script_Menu_ChallengeExplanationCancel
 	dotrigger $1
-	writebyte BATTLE_TOWER_ACTION_01
+	writebyte BATTLETOWERACTION_01 ; set 1, [sbe4f]
 	special BattleTowerAction
 	special Function1700b0
 	if_equal $a, Script_Menu_ChallengeExplanationCancel
 	if_not_equal $0, UnknownScript_0x9e550
-	writebyte BATTLE_TOWER_ACTION_11
+	writebyte BATTLETOWERACTION_11
 	special BattleTowerAction
 	writetext Text_RightThisWayToYourBattleRoom
 	waitbutton
 	closetext
-	writebyte BATTLE_TOWER_ACTION_1E
+	writebyte BATTLETOWERACTION_1E
 	special BattleTowerAction
-	jump UnknownScript_0x9e454
+	jump Script_WalkToBattleTowerElevator
 
-UnknownScript_0x9e44e:
+Script_ResumeBattleTowerChallenge:
 	closetext
-	writebyte BATTLE_TOWER_ACTION_08
+	writebyte BATTLETOWERACTION_LOADLEVELGROUP ; load choice of level group
 	special BattleTowerAction
-UnknownScript_0x9e454:
+Script_WalkToBattleTowerElevator:
-	musicfadeout MUSIC_NONE, $8
+	musicfadeout MUSIC_NONE, 8
 	domaptrigger BATTLE_TOWER_BATTLE_ROOM, $0
 	domaptrigger BATTLE_TOWER_ELEVATOR, $0
 	domaptrigger BATTLE_TOWER_HALLWAY, $0
 	follow $2, PLAYER
-	applymovement $2, MovementData_0x9e571
+	applymovement $2, MovementData_BattleTower1FWalkToElevator
-	writebyte BATTLE_TOWER_ACTION_0A
+	writebyte BATTLETOWERACTION_0A
 	special BattleTowerAction
 	warpsound
 	disappear $2
 	stopfollow
-	applymovement PLAYER, MovementData_0x9e576
+	applymovement PLAYER, MovementData_BattleTowerHallwayPlayerEntersBattleRoom
 	warpcheck
 	end
 
 Script_GivePlayerHisPrize: ; 0x9e47a
-	writebyte BATTLE_TOWER_ACTION_1C
+	writebyte BATTLETOWERACTION_1C
 	special BattleTowerAction
-	writebyte BATTLE_TOWER_ACTION_1B
+	writebyte BATTLETOWERACTION_1B
 	special BattleTowerAction
 	if_equal POTION, Script_YourPackIsStuffedFull
 	itemtotext $0, $1
 	giveitem ITEM_FROM_MEM, 5
 	writetext Text_PlayerGotFive
-	writebyte BATTLE_TOWER_ACTION_1D
+	writebyte BATTLETOWERACTION_1D
 	special BattleTowerAction
 	closetext
 	end
@@ -137,21 +137,21 @@ Script_YourPackIsStuffedFull: ; 0x9e498
 Script_BattleTowerIntroductionYesNo: ; 0x9e49e
 	writetext Text_WouldYouLikeToHearAboutTheBattleTower
 	yesorno
-	iffalse UnknownScript_0x9e4a8
+	iffalse Script_BattleTowerSkipExplanation
 Script_BattleTowerExplanation: ; 0x9e4a5
 	writetext Text_BattleTowerIntroduction_2
-UnknownScript_0x9e4a8:
+Script_BattleTowerSkipExplanation:
-	writebyte BATTLE_TOWER_ACTION_01
+	writebyte BATTLETOWERACTION_01
 	special BattleTowerAction
 	jump Script_Menu_ChallengeExplanationCancel
 
-UnknownScript_0x9e4b0:
+Script_BattleTowerHopeToServeYouAgain:
 	writetext Text_WeHopeToServeYouAgain
 	waitbutton
 	closetext
 	end
 
-UnknownScript_0x9e4b6:
+UnreferencedScript_0x9e4b6:
 	special Function17f53d
 	closetext
 	end
@@ -162,13 +162,13 @@ Script_WaitButton: ; 0x9e4bb
 	end
 
 
-UnknownScript_0x9e4be:
+UnreferencedScript_0x9e4be:
 	writetext Text_SaveBeforeEnteringBattleRoom
 	yesorno
 	iffalse Script_Menu_ChallengeExplanationCancel
 	special Special_TryQuickSave
 	iffalse Script_Menu_ChallengeExplanationCancel
-	writebyte BATTLE_TOWER_ACTION_01
+	writebyte BATTLETOWERACTION_01
 	special BattleTowerAction
 	special Function1700ba
 	if_equal $a, Script_Menu_ChallengeExplanationCancel
@@ -181,45 +181,45 @@ UnknownScript_0x9e4be:
 	closetext
 	end
 
-UnknownScript_0x9e4ea:
+UnreferencedScript_0x9e4ea:
-	writebyte BATTLE_TOWER_ACTION_18
+	writebyte BATTLETOWERACTION_18
 	special BattleTowerAction
 	if_not_equal $0, Script_APkmnLevelExceeds
-	writebyte BATTLE_TOWER_ACTION_19
+	writebyte BATTLETOWERACTION_19
 	special BattleTowerAction
 	if_not_equal $0, Script_MayNotEnterABattleRoomUnderL70
 	special SpecialCheckForBattleTowerRules
 	if_not_equal $0, Script_WaitButton
-	writebyte BATTLE_TOWER_ACTION_05
+	writebyte BATTLETOWERACTION_05
 	special BattleTowerAction
-	if_equal $0, UnknownScript_0x9e512
+	if_equal $0, .zero
-	writetext UnknownText_0x9ecb0
+	writetext Text_CantBeRegistered_PreviousRecordDeleted
-	jump UnknownScript_0x9e515
+	jump continue
 
-UnknownScript_0x9e512:
+.zero:
-	writetext UnknownText_0x9ec6d
+	writetext Text_CantBeRegistered
-UnknownScript_0x9e515:
+continue:
 	yesorno
 	iffalse Script_Menu_ChallengeExplanationCancel
-	writetext UnknownText_0x9ef79
+	writetext Text_SaveBeforeReentry
 	yesorno
 	iffalse Script_Menu_ChallengeExplanationCancel
 	dotrigger $0
 	special Special_TryQuickSave
 	iffalse Script_Menu_ChallengeExplanationCancel
 	dotrigger $1
-	writebyte BATTLE_TOWER_ACTION_06
+	writebyte BATTLETOWERACTION_06
 	special BattleTowerAction
-	writebyte BATTLE_TOWER_ACTION_12
+	writebyte BATTLETOWERACTION_12
 	special BattleTowerAction
 	writetext Text_RightThisWayToYourBattleRoom
 	waitbutton
-	jump UnknownScript_0x9e44e
+	jump Script_ResumeBattleTowerChallenge
 
-UnknownScript_0x9e53b:
+UnreferencedScript_0x9e53b:
-	writetext UnknownText_0x9f076
+	writetext Text_FiveDayBattleLimit_Mobile
 	waitbutton
-	jump UnknownScript_0x9e4b0
+	jump Script_BattleTowerHopeToServeYouAgain
 
 Script_APkmnLevelExceeds: ; 0x9e542
 	writetext Text_APkmnLevelExceeds
@@ -240,7 +240,7 @@ BattleTower_LeftWithoutSaving:
 	loadfont
 	writetext Text_BattleTower_LeftWithoutSaving
 	waitbutton
-	jump UnknownScript_0x9e4b0
+	jump Script_BattleTowerHopeToServeYouAgain
 
 YoungsterScript_0x9e55d:
 	faceplayer
@@ -260,24 +260,24 @@ BugCatcherScript_0x9e56b:
 GrannyScript_0x9e56e:
 	jumptextfaceplayer Text_BattleTowerGranny
 
-MovementData_0x9e571:
+MovementData_BattleTower1FWalkToElevator:
 	step_up
 	step_up
 	step_up
 	step_up
 	step_up
-MovementData_0x9e576:
+MovementData_BattleTowerHallwayPlayerEntersBattleRoom:
 	step_up
 	step_end
 
-MovementData_0x9e578:
+MovementData_BattleTowerElevatorExitElevator:
 	step_down
 	step_end
 
-MovementData_0x9e57a:
+MovementData_BattleTowerHallwayWalkTo1020Room:
 	step_right
 	step_right
-MovementData_0x9e57c:
+MovementData_BattleTowerHallwayWalkTo3040Room:
 	step_right
 	step_right
 	step_up
@@ -285,13 +285,13 @@ MovementData_0x9e57c:
 	turn_head_left
 	step_end
 
-MovementData_0x9e582:
+MovementData_BattleTowerHallwayWalkTo90100Room:
 	step_left
 	step_left
-MovementData_0x9e584:
+MovementData_BattleTowerHallwayWalkTo7080Room:
 	step_left
 	step_left
-MovementData_0x9e586:
+MovementData_BattleTowerHallwayWalkTo5060Room:
 	step_left
 	step_left
 	step_up
@@ -299,7 +299,7 @@ MovementData_0x9e586:
 	turn_head_right
 	step_end
 
-MovementData_0x9e58c:
+MovementData_BattleTowerBattleRoomPlayerWalksIn:
 	step_up
 	step_up
 	step_up
@@ -307,28 +307,28 @@ MovementData_0x9e58c:
 	turn_head_right
 	step_end
 
-MovementData_0x9e592:
+MovementData_BattleTowerBattleRoomOpponentWalksIn:
 	slow_step_down
 	slow_step_down
 	slow_step_down
 	turn_head_left
 	step_end
 
-MovementData_0x9e597:
+MovementData_BattleTowerBattleRoomOpponentWalksOut:
 	turn_head_up
 	slow_step_up
 	slow_step_up
 	slow_step_up
 	step_end
 
-MovementData_0x9e59c:
+MovementData_BattleTowerBattleRoomReceptionistWalksToPlayer:
 	slow_step_right
 	slow_step_right
 	slow_step_up
 	slow_step_up
 	step_end
 
-MovementData_0x9e5a1:
+MovementData_BattleTowerBattleRoomReceptionistWalksAway:
 	slow_step_down
 	slow_step_down
 	slow_step_left
@@ -336,11 +336,11 @@ MovementData_0x9e5a1:
 	turn_head_right
 	step_end
 
-MovementData_0x9e5a7:
+MovementData_BattleTowerBattleRoomPlayerTurnsToFaceReceptionist:
 	turn_head_down
 	step_end
 
-MovementData_0x9e5a9:
+MovementData_BattleTowerBattleRoomPlayerTurnsToFaceNextOpponent:
 	turn_head_right
 	step_end
 
@@ -482,7 +482,7 @@ Text_ThanksForVisiting: ; 0x9ea49
 	line "visiting!"
 	done
 
-UnknownText_0x9ea5f:
+Text_BeatenAllTheTrainers_Mobile:
 	text "Congratulations!"
 
 	para "You've beaten all"
@@ -512,7 +512,7 @@ Text_CongratulationsYouveBeatenAllTheTrainers: ; 0x9eaef
 	para ""
 	done
 
-UnknownText_0x9eb45:
+Text_AskRegisterRecord_Mobile:
 	text "Would you like to"
 	line "register your"
 
@@ -560,7 +560,7 @@ Text_WouldYouLikeToHearAboutTheBattleTower: ; 0x9ec3d
 	cont "BATTLE TOWER?"
 	done
 
-UnknownText_0x9ec6d:
+Text_CantBeRegistered:
 	text "Your record from"
 	line "the previous"
 
@@ -568,7 +568,7 @@ UnknownText_0x9ec6d:
 	line "be registered. OK?"
 	done
 
-UnknownText_0x9ecb0:
+Text_CantBeRegistered_PreviousRecordDeleted:
 	text "Your record from"
 	line "the previous"
 
@@ -637,7 +637,7 @@ Text_NextUpOpponentNo: ; 0x9eebc
 	text ". Ready?"
 	done
 
-UnknownText_0x9eee0:
+Text_SaveBeforeConnecting_Mobile:
 	text "Your session will"
 	line "be SAVED before"
 
@@ -658,7 +658,7 @@ Text_SaveAndEndTheSession: ; 0x9ef5e
 	line "session?"
 	done
 
-UnknownText_0x9ef79:
+Text_SaveBeforeReentry:
 	text "Your record will"
 	line "be SAVED before"
 
@@ -671,7 +671,7 @@ Text_CancelYourBattleRoomChallenge: ; 0x9efbf
 	line "ROOM challenge?"
 	done
 
-UnknownText_0x9efe3:
+Text_RegisterRecordOnFile_Mobile:
 	text "We have your"
 	line "previous record on"
 
@@ -680,7 +680,7 @@ UnknownText_0x9efe3:
 	cont "it at the CENTER?"
 	done
 
-UnknownText_0x9f037:
+Text_WeveBeenWaitingForYou:
 	text "We've been waiting"
 	line "for you. This way"
 
@@ -688,7 +688,7 @@ UnknownText_0x9f037:
 	line "please."
 	done
 
-UnknownText_0x9f076:
+Text_FiveDayBattleLimit_Mobile:
 	text "You may enter only"
 	line "five BATTLE ROOMS"
 	cont "each day."
@@ -713,7 +713,7 @@ Text_TooMuchTimeElapsedNoRegister: ; 0x9f0c1
 	done
 
 ; a dupe?
-UnknownText_0x9f151:
+Text_RegisterRecordTimedOut_Mobile:
 	text "Sorry, but it's"
 	line "not possible to"
 

maps/BattleTowerBattleRoom.asm

@@ -3,21 +3,21 @@ BattleTowerBattleRoom_MapScriptHeader:
 	db 2
 
 	; triggers
-	dw Script_EnterBattleRoom, 0
+	dw .EnterBattleRoom, 0
-	dw UnknownScript_0x9f420, 0
+	dw .DummyTrigger, 0
 
 .MapCallbacks:
 	db 0
 
-Script_EnterBattleRoom: ; 0x9f419
+.EnterBattleRoom: ; 0x9f419
 	disappear $2
 	priorityjump Script_BattleRoom
 	dotrigger $1
-UnknownScript_0x9f420:
+.DummyTrigger:
 	end
 
 Script_BattleRoom: ; 0x9f421
-	applymovement PLAYER, MovementData_0x9e58c
+	applymovement PLAYER, MovementData_BattleTowerBattleRoomPlayerWalksIn
 ; beat all 7 opponents in a row
 Script_BattleRoomLoop: ; 0x9f425
 	writebyte $2
@@ -25,31 +25,31 @@ Script_BattleRoomLoop: ; 0x9f425
 	appear $2
 	warpsound
 	waitsfx
-	applymovement $2, MovementData_0x9e592
+	applymovement $2, MovementData_BattleTowerBattleRoomOpponentWalksIn
 	loadfont
 	battletowertext 1
 	keeptextopen
 	closetext
 	special BattleTowerBattle ; calls predef startbattle
-	special RotatePalettesRightPalettes
+	special FadeOutPalettes
 	reloadmap
 	if_not_equal $0, Script_FailedBattleTowerChallenge
 	copybytetovar wNrOfBeatenBattleTowerTrainers ; wcf64
 	if_equal BATTLETOWER_NROFTRAINERS, Script_BeatenAllTrainers
-	applymovement $2, MovementData_0x9e597
+	applymovement $2, MovementData_BattleTowerBattleRoomOpponentWalksOut
 	warpsound
 	disappear $2
-	applymovement $3, MovementData_0x9e59c
+	applymovement $3, MovementData_BattleTowerBattleRoomReceptionistWalksToPlayer
-	applymovement PLAYER, MovementData_0x9e5a7
+	applymovement PLAYER, MovementData_BattleTowerBattleRoomPlayerTurnsToFaceReceptionist
 	loadfont
 	writetext Text_YourPkmnWillBeHealedToFullHealth
 	waitbutton
 	closetext
 	playmusic MUSIC_HEAL
-	special RotatePalettesRightPalettes
+	special FadeOutPalettes
 	special LoadMapPalettes
 	pause 60
-	special RotatePalettesLeftPalettes
+	special FadeInPalettes
 	special RestartMapMusic
 	loadfont
 	writetext Text_NextUpOpponentNo
@@ -57,43 +57,43 @@ Script_BattleRoomLoop: ; 0x9f425
 	iffalse Script_DontBattleNextOpponent
 Script_ContinueAndBattleNextOpponent: ; 0x9f477
 	closetext
-	applymovement PLAYER, MovementData_0x9e5a9
+	applymovement PLAYER, MovementData_BattleTowerBattleRoomPlayerTurnsToFaceNextOpponent
-	applymovement $3, MovementData_0x9e5a1
+	applymovement $3, MovementData_BattleTowerBattleRoomReceptionistWalksAway
 	jump Script_BattleRoomLoop
 
 Script_DontBattleNextOpponent: ; 0x9f483
 	writetext Text_SaveAndEndTheSession
 	yesorno
 	iffalse Script_DontSaveAndEndTheSession
-	writebyte BATTLE_TOWER_ACTION_07
+	writebyte BATTLETOWERACTION_SAVELEVELGROUP ; save level group
 	special BattleTowerAction
-	writebyte BATTLE_TOWER_ACTION_1F
+	writebyte BATTLETOWERACTION_CHOOSEREWARD ; choose reward
 	special BattleTowerAction
-	writebyte BATTLE_TOWER_ACTION_03
+	writebyte BATTLETOWERACTION_03 ; quicksave
 	special BattleTowerAction
 	playsound SFX_SAVE
 	waitsfx
-	special RotatePalettesRightPalettes
+	special FadeOutPalettes
 	special Reset
 Script_DontSaveAndEndTheSession: ; 0x9f4a3
 	writetext Text_CancelYourBattleRoomChallenge
 	yesorno
 	iffalse Script_ContinueAndBattleNextOpponent
-	writebyte BATTLE_TOWER_ACTION_04
+	writebyte BATTLETOWERACTION_CHALLENGECANCELED
 	special BattleTowerAction
-	writebyte BATTLE_TOWER_ACTION_06
+	writebyte BATTLETOWERACTION_06
 	special BattleTowerAction
 	closetext
-	special RotatePalettesRightPalettes
+	special FadeOutPalettes
 	warpfacing UP, BATTLE_TOWER_1F, $7, $7
 	loadfont
-	jump UnknownScript_0x9e4b0
+	jump Script_BattleTowerHopeToServeYouAgain
 
 Script_FailedBattleTowerChallenge:
 	pause 60
 	special Special_BattleTowerFade
 	warpfacing UP, BATTLE_TOWER_1F, $7, $7
-	writebyte BATTLE_TOWER_ACTION_04
+	writebyte BATTLETOWERACTION_CHALLENGECANCELED
 	special BattleTowerAction
 	loadfont
 	writetext Text_ThanksForVisiting
@@ -105,13 +105,13 @@ Script_BeatenAllTrainers: ; 0x9f4d9
 	pause 60
 	special Special_BattleTowerFade
 	warpfacing UP, BATTLE_TOWER_1F, $7, $7
-BattleTowerBattleRoomScript_0x9f4e4:
+Script_BeatenAllTrainers2:
 	loadfont
 	writetext Text_CongratulationsYouveBeatenAllTheTrainers
 	jump Script_GivePlayerHisPrize
 
-UnknownScript_0x9f4eb:
+UnreferencedScript_0x9f4eb:
-	writebyte BATTLE_TOWER_ACTION_04
+	writebyte BATTLETOWERACTION_CHALLENGECANCELED
 	special BattleTowerAction
 	loadfont
 	writetext Text_TooMuchTimeElapsedNoRegister
@@ -119,10 +119,10 @@ UnknownScript_0x9f4eb:
 	closetext
 	end
 
-UnknownScript_0x9f4f7:
+UnreferencedScript_0x9f4f7:
-	writebyte BATTLE_TOWER_ACTION_04
+	writebyte BATTLETOWERACTION_CHALLENGECANCELED
 	special BattleTowerAction
-	writebyte BATTLE_TOWER_ACTION_06
+	writebyte BATTLETOWERACTION_06
 	special BattleTowerAction
 	loadfont
 	writetext Text_ThanksForVisiting
@@ -132,7 +132,7 @@ UnknownScript_0x9f4f7:
 	end
 
 
-UnknownText_0x9f50b:
+Text_ReturnedAfterSave_Mobile:
 	text "You'll be returned"
 	line "after you SAVE."
 	done

maps/BattleTowerElevator.asm

@@ -3,43 +3,43 @@ BattleTowerElevator_MapScriptHeader:
 	db 2
 
 	; triggers
-	dw UnknownScript_0x9f562, 0
+	dw .Trigger0, 0
-	dw UnknownScript_0x9f567, 0
+	dw .Trigger1, 0
 
 .MapCallbacks:
 	db 0
 
-UnknownScript_0x9f562:
+.Trigger0:
-	priorityjump UnknownScript_0x9f568
+	priorityjump .RideElevator
 	dotrigger $1
 
-UnknownScript_0x9f567:
+.Trigger1:
 	end
 
-UnknownScript_0x9f568:
+.RideElevator:
 	follow $2, PLAYER
-	applymovement $2, MovementData_0x9f58f
+	applymovement $2, MovementData_BattleTowerElevatorReceptionistWalksIn
-	applymovement PLAYER, MovementData_0x9f592
+	applymovement PLAYER, MovementData_BattleTowerElevatorPlayerWalksIn
-	writebyte BATTLE_TOWER_ACTION_0A
+	writebyte BATTLETOWERACTION_0A
 	special BattleTowerAction
 	playsound SFX_ELEVATOR
 	earthquake 60
 	waitsfx
 	follow $2, PLAYER
-	applymovement $2, MovementData_0x9e578
+	applymovement $2, MovementData_BattleTowerElevatorExitElevator
 	stopfollow
 	warpsound
 	disappear $2
-	applymovement PLAYER, MovementData_0x9e578
+	applymovement PLAYER, MovementData_BattleTowerElevatorExitElevator
 	warpcheck
 	end
 
-MovementData_0x9f58f:
+MovementData_BattleTowerElevatorReceptionistWalksIn:
 	step_right
 	turn_head_down
 	step_end
 
-MovementData_0x9f592:
+MovementData_BattleTowerElevatorPlayerWalksIn:
 	turn_head_down
 	step_end
 
@@ -60,4 +60,4 @@ BattleTowerElevator_MapEventHeader:
 
 .PersonEvents:
 	db 1
-	person_event SPRITE_RECEPTIONIST, 2, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, MovementData_0x9f58f, -1
+	person_event SPRITE_RECEPTIONIST, 2, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, MovementData_BattleTowerElevatorReceptionistWalksIn, -1

maps/BattleTowerHallway.asm

@@ -47,23 +47,23 @@ BattleTowerHallway_MapScriptHeader:
 	if_equal 8, .L70L80
 	if_equal 9, .L90L100
 	if_equal 10, .L90L100
-	applymovement $2, MovementData_0x9e57a
+	applymovement $2, MovementData_BattleTowerHallwayWalkTo1020Room
 	jump .EnterBattleRoom
 
 .L30L40: ; 0x9f603
-	applymovement $2, MovementData_0x9e57c
+	applymovement $2, MovementData_BattleTowerHallwayWalkTo3040Room
 	jump .EnterBattleRoom
 
 .L50L60: ; 0x9f60a
-	applymovement $2, MovementData_0x9e586
+	applymovement $2, MovementData_BattleTowerHallwayWalkTo5060Room
 	jump .EnterBattleRoom
 
 .L70L80: ; 0x9f611
-	applymovement $2, MovementData_0x9e584
+	applymovement $2, MovementData_BattleTowerHallwayWalkTo7080Room
 	jump .EnterBattleRoom
 
 .L90L100: ; 0x9f618
-	applymovement $2, MovementData_0x9e582
+	applymovement $2, MovementData_BattleTowerHallwayWalkTo90100Room
 	jump .EnterBattleRoom
 
 .EnterBattleRoom: ; 0x9f61f
@@ -73,7 +73,7 @@ BattleTowerHallway_MapScriptHeader:
 	waitbutton
 	closetext
 	stopfollow
-	applymovement PLAYER, MovementData_0x9e576
+	applymovement PLAYER, MovementData_BattleTowerHallwayPlayerEntersBattleRoom
 	warpcheck
 	end
 

maps/BluesHouse.asm

@@ -30,10 +30,10 @@ UnknownScript_0x19b0de:
 	writetext UnknownText_0x19b266
 	waitbutton
 	closetext
-	special RotatePalettesRightPalettes
+	special FadeOutPalettes
 	playmusic MUSIC_HEAL
 	pause 60
-	special RotatePalettesLeftPalettes
+	special FadeInPalettes
 	special RestartMapMusic
 	loadfont
 	writetext UnknownText_0x19b296

maps/EcruteakGym.asm

@@ -84,7 +84,7 @@ UnknownScript_0x99dc6:
 	follow PLAYER, $8
 	applymovement PLAYER, MovementData_0x99e5f
 	stopfollow
-	special RotatePalettesRightPalettes
+	special FadeOutPalettes
 	playsound SFX_ENTER_DOOR
 	waitsfx
 	warp ECRUTEAK_CITY, $6, $1b

maps/FastShip1F.asm

@@ -64,7 +64,7 @@ SailorScript_0x75160:
 	closetext
 	scall .LetThePlayerOut
 	playsound SFX_EXIT_BUILDING
-	special RotatePalettesRightPalettes
+	special FadeOutPalettes
 	waitsfx
 	setevent EVENT_VERMILION_PORT_SAILOR_AT_GANGWAY
 	domaptrigger VERMILION_PORT, $1
@@ -77,7 +77,7 @@ SailorScript_0x75160:
 	closetext
 	scall .LetThePlayerOut
 	playsound SFX_EXIT_BUILDING
-	special RotatePalettesRightPalettes
+	special FadeOutPalettes
 	waitsfx
 	setevent EVENT_OLIVINE_PORT_SAILOR_AT_GANGWAY
 	domaptrigger OLIVINE_PORT, $1