Battle Tower scripts and text labels

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 c, $40
-.asm_4e8ee
-	ld a, -1
+	ld hl, wd000 ; UnknBGPals
+	ld c, 4 * $10
+.load_white_palettes
+	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 RotatePalettesLeftPalettes ; 1e
+	dba FadeOutPalettes ; 1d
+	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 Special_RotatePalettesLeftQuickly
+	add_special FadeInPalettes
+	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