Merge remote-tracking branch 'YamaArashi/master'

Conflicts:
	constants/misc_constants.asm
	engine/battle/core.asm
	engine/menu/pokedex.asm
	engine/town_map.asm
	home.asm
	hram.asm

scripts/agatha.asm

@@ -24,7 +24,7 @@ AgathaScript_76443: ; 76443 (1d:6443)
 AgathaScript_76459: ; 76459 (1d:6459)
 	ld [wd09f], a
 	ld bc, $2
-	predef_jump Func_ee9e
+	predef_jump ReplaceTileBlock
 
 AgathaScript_76464: ; 76464 (1d:6464)
 	xor a
@@ -33,7 +33,7 @@ AgathaScript_76464: ; 76464 (1d:6464)
 
 AgathaScriptPointers: ; 76469 (1d:6469)
 	dw AgathaScript0
-	dw Func_324c
+	dw DisplayEnemyTrainerTextAndStartBattle
 	dw AgathaScript2
 	dw AgathaScript3
 	dw AgathaScript4
@@ -41,8 +41,8 @@ AgathaScriptPointers: ; 76469 (1d:6469)
 AgathaScript4: ; 76473 (1d:6473)
 	ret
 asm_76474: ; 76474 (1d:6474)
-	ld hl, wccd3
-	ld a, $40
+	ld hl, wSimulatedJoypadStatesEnd
+	ld a, D_UP
 	ld [hli], a
 	ld [hli], a
 	ld [hli], a
@@ -50,8 +50,8 @@ asm_76474: ; 76474 (1d:6474)
 	ld [hli], a
 	ld [hl], a
 	ld a, $6
-	ld [wcd38], a
-	call Func_3486
+	ld [wSimulatedJoypadStatesIndex], a
+	call StartSimulatingJoypadStates
 	ld a, $3
 	ld [W_AGATHACURSCRIPT], a
 	ld [W_CURMAPSCRIPT], a
@@ -64,8 +64,8 @@ AgathaScript0: ; 76490 (1d:6490)
 	xor a
 	ld [hJoyPressed], a
 	ld [hJoyHeld], a
-	ld [wccd3], a
-	ld [wcd38], a
+	ld [wSimulatedJoypadStatesEnd], a
+	ld [wSimulatedJoypadStatesIndex], a
 	ld a, [wWhichTrade] ; wWhichTrade
 	cp $3
 	jr c, .asm_764b4
@@ -77,11 +77,11 @@ AgathaScript0: ; 76490 (1d:6490)
 	ld a, $2
 	ld [H_DOWNARROWBLINKCNT2], a ; $ff8c
 	call DisplayTextID
-	ld a, $40
-	ld [wccd3], a
+	ld a, D_UP
+	ld [wSimulatedJoypadStatesEnd], a
 	ld a, $1
-	ld [wcd38], a
-	call Func_3486
+	ld [wSimulatedJoypadStatesIndex], a
+	call StartSimulatingJoypadStates
 	ld a, $3
 	ld [W_AGATHACURSCRIPT], a
 	ld [W_CURMAPSCRIPT], a
@@ -95,7 +95,7 @@ CoordsData_764d1: ; 764d1 (1d:64d1)
 	db $FF
 
 AgathaScript3: ; 764da (1d:64da)
-	ld a, [wcd38]
+	ld a, [wSimulatedJoypadStatesIndex]
 	and a
 	ret nz
 	call Delay3

scripts/battlecenterm.asm

@@ -9,7 +9,7 @@ BattleCenterMScript: ; 4fd10 (13:7d10)
 	ld [$ff8d], a
 	ld a, $1
 	ld [$ff8c], a
-	call Func_34ae
+	call SetSpriteFacingDirection
 	ld hl, wd72d
 	bit 0, [hl]
 	set 0, [hl]

scripts/billshouse.asm

@@ -57,7 +57,7 @@ BillsHouseScript3: ; 1e7c5 (7:67c5)
 	ld a, $f0
 	ld [wJoyIgnore], a
 	ld a, $2
-	ld [wcf13], a
+	ld [wSpriteIndex], a
 	ld a, $c
 	ld [$ffeb], a
 	ld a, $40
@@ -66,7 +66,7 @@ BillsHouseScript3: ; 1e7c5 (7:67c5)
 	ld [$ffed], a
 	ld a, $5
 	ld [$ffee], a
-	call Func_32f9
+	call SetSpritePosition1
 	ld a, $62
 	ld [wcc4d], a
 	predef ShowObject

scripts/bruno.asm

@@ -24,7 +24,7 @@ BrunoScript_762ec: ; 762ec (1d:62ec)
 BrunoScript_76302: ; 76302 (1d:6302)
 	ld [wd09f], a
 	ld bc, $2
-	predef_jump Func_ee9e
+	predef_jump ReplaceTileBlock
 
 BrunoScript_7630d: ; 7630d (1d:630d)
 	xor a
@@ -33,7 +33,7 @@ BrunoScript_7630d: ; 7630d (1d:630d)
 
 BrunoScriptPointers: ; 76312 (1d:6312)
 	dw BrunoScript0
-	dw Func_324c
+	dw DisplayEnemyTrainerTextAndStartBattle
 	dw BrunoScript2
 	dw BrunoScript3
 	dw BrunoScript4
@@ -41,8 +41,8 @@ BrunoScriptPointers: ; 76312 (1d:6312)
 BrunoScript4: ; 7631c (1d:631c)
 	ret
 asm_7631d: ; 7631d (1d:631d)
-	ld hl, wccd3
-	ld a, $40
+	ld hl, wSimulatedJoypadStatesEnd
+	ld a, D_UP
 	ld [hli], a
 	ld [hli], a
 	ld [hli], a
@@ -50,8 +50,8 @@ asm_7631d: ; 7631d (1d:631d)
 	ld [hli], a
 	ld [hl], a
 	ld a, $6
-	ld [wcd38], a
-	call Func_3486
+	ld [wSimulatedJoypadStatesIndex], a
+	call StartSimulatingJoypadStates
 	ld a, $3
 	ld [W_BRUNOCURSCRIPT], a
 	ld [W_CURMAPSCRIPT], a
@@ -64,8 +64,8 @@ BrunoScript0: ; 76339 (1d:6339)
 	xor a
 	ld [hJoyPressed], a
 	ld [hJoyHeld], a
-	ld [wccd3], a
-	ld [wcd38], a
+	ld [wSimulatedJoypadStatesEnd], a
+	ld [wSimulatedJoypadStatesIndex], a
 	ld a, [wWhichTrade] ; wWhichTrade
 	cp $3
 	jr c, .asm_7635d
@@ -77,11 +77,11 @@ BrunoScript0: ; 76339 (1d:6339)
 	ld a, $2
 	ld [H_DOWNARROWBLINKCNT2], a ; $ff8c
 	call DisplayTextID
-	ld a, $40
-	ld [wccd3], a
+	ld a, D_UP
+	ld [wSimulatedJoypadStatesEnd], a
 	ld a, $1
-	ld [wcd38], a
-	call Func_3486
+	ld [wSimulatedJoypadStatesIndex], a
+	call StartSimulatingJoypadStates
 	ld a, $3
 	ld [W_BRUNOCURSCRIPT], a
 	ld [W_CURMAPSCRIPT], a
@@ -95,7 +95,7 @@ CoordsData_7637a: ; 7637a (1d:637a)
 	db $FF
 
 BrunoScript3: ; 76383 (1d:6383)
-	ld a, [wcd38]
+	ld a, [wSimulatedJoypadStatesIndex]
 	and a
 	ret nz
 	call Delay3

scripts/celadongamecorner.asm

@@ -34,7 +34,7 @@ CeladonGameCornerScript_48bec: ; 48bec (12:4bec)
 	ld a, $2a
 	ld [wd09f], a
 	ld bc, $0208
-	predef_jump Func_ee9e
+	predef_jump ReplaceTileBlock
 
 CeladonGameCornerScript_48c07: ; 48c07 (12:4c07)
 	xor a
@@ -236,7 +236,7 @@ CeladonGameCornerText5: ; 48d4a (12:4d4a)
 	ld hl, wd77e
 	set 2, [hl]
 	ld a, $1
-	ld [wcc3c], a
+	ld [wDoNotWaitForButtonPressAfterDisplayingText], a
 	ld hl, Received10CoinsText
 	jr .asm_c7d1a ; 0x48d87
 .asm_d0957 ; 0x48d89
@@ -409,9 +409,9 @@ CeladonGameCornerText11: ; 48e9d (12:4e9d)
 	set 7, [hl]
 	ld hl, CeladonGameCornerText_48ed3
 	ld de, CeladonGameCornerText_48ed3
-	call PreBattleSaveRegisters
+	call SaveEndBattleTextPointers
 	ldh a, [$8c]
-	ld [wcf13], a
+	ld [wSpriteIndex], a
 	call EngageMapTrainer
 	call InitBattleEnemyParameters
 	xor a
@@ -437,7 +437,7 @@ CeladonGameCornerText13: ; 48ed8 (12:4ed8)
 CeladonGameCornerText12: ; 48edd (12:4edd)
 	db $08 ; asm
 	ld a, $1
-	ld [wcc3c], a
+	ld [wDoNotWaitForButtonPressAfterDisplayingText], a
 	ld hl, CeladonGameCornerText_48f09
 	call PrintText
 	call WaitForSoundToFinish
@@ -449,7 +449,7 @@ CeladonGameCornerText12: ; 48edd (12:4edd)
 	ld a, $43
 	ld [wd09f], a
 	ld bc, $0208
-	predef Func_ee9e
+	predef ReplaceTileBlock
 	jp TextScriptEnd
 
 CeladonGameCornerText_48f09: ; 48f09 (12:4f09)

scripts/celadongym.asm

@@ -31,7 +31,7 @@ CeladonGymText_48943: ; 48943 (12:4943)
 
 CeladonGymScriptPointers: ; 4894e (12:494e)
 	dw CheckFightingMapTrainers
-	dw Func_324c
+	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
 	dw CeladonGymScript3
 
@@ -177,9 +177,9 @@ CeladonGymText1: ; 48a11 (12:4a11)
 	set 7, [hl]
 	ld hl, CeladonGymText_48a63
 	ld de, CeladonGymText_48a63
-	call PreBattleSaveRegisters
+	call SaveEndBattleTextPointers
 	ldh a, [$8c]
-	ld [wcf13], a
+	ld [wSpriteIndex], a
 	call EngageMapTrainer
 	call InitBattleEnemyParameters
 	ld a, $4

scripts/celadonmansion3.asm

@@ -51,7 +51,7 @@ DirectorText: ; 487b2 (12:47b2)
 	db $8 ; asm
 	callab DisplayDiploma
 	ld a, $1
-	ld [wcc3c], a
+	ld [wDoNotWaitForButtonPressAfterDisplayingText], a
 	jp TextScriptEnd
 
 GameFreakPCText1: ; 487eb (12:47eb)

scripts/celadonmartelevator.asm

@@ -9,13 +9,13 @@ CeladonMartElevatorScript: ; 48600 (12:4600)
 	res 7, [hl]
 	call nz, CeladonMartElevatorScript_48654
 	xor a
-	ld [wcf0c], a
+	ld [wAutoTextBoxDrawingControl], a
 	inc a
-	ld [wcc3c], a
+	ld [wDoNotWaitForButtonPressAfterDisplayingText], a
 	ret
 
 CeladonMartElevatorScript_4861c: ; 4861c (12:461c)
-	ld hl, wd3af
+	ld hl, wWarpEntries
 	ld a, [wd73b]
 	ld b, a
 	ld a, [wd73c]

scripts/celadonmartroof.asm

@@ -230,7 +230,7 @@ CeladonMartRoofText2: ; 4856c (12:456c)
 	and a
 	jr z, .asm_914b9 ; 0x48574
 	ld a, $1
-	ld [wcc3c], a
+	ld [wDoNotWaitForButtonPressAfterDisplayingText], a
 	ld hl, CeladonMartRoofText4
 	call PrintText
 	call YesNoChoice

scripts/ceruleancity.asm

@@ -64,7 +64,7 @@ CeruleanCityScript0: ; 194c8 (6:54c8)
 	ld hl, CeruleanCityCoords2
 	call ArePlayerCoordsInArray
 	ret nc
-	ld a, [wd700]
+	ld a, [wWalkBikeSurfState]
 	and a
 	jr z, .asm_19512 ; 0x19508 $8
 	ld a, $ff
@@ -85,7 +85,7 @@ CeruleanCityScript0: ; 194c8 (6:54c8)
 	ld [$ff8c], a
 	ld a, $5
 	ld [$ff8b], a
-	call Func_3500
+	call GetPointerWithinSpriteStateData2
 	ld [hl], $19
 .asm_19535
 	ld a, $5
@@ -117,7 +117,7 @@ CeruleanCityScript_1955d: ; 1955d (6:555d)
 	ld [$ff8c],a
 	xor a
 	ld [$ff8d],a
-	jp Func_34a6 ; face object
+	jp SetSpriteFacingDirectionAndDelay ; face object
 
 CeruleanCityScript1: ; 19567 (6:5567)
 	ld a, [wd730]
@@ -133,7 +133,7 @@ CeruleanCityScript1: ; 19567 (6:5567)
 	set 7, [hl]
 	ld hl, CeruleanCityText_1966d
 	ld de, CeruleanCityText_19672
-	call PreBattleSaveRegisters
+	call SaveEndBattleTextPointers
 	ld a, SONY1 + $c8
 	ld [W_CUROPPONENT], a
 
@@ -209,7 +209,7 @@ CeruleanCityScript3: ; 19610 (6:5610)
 	predef HideObject
 	xor a
 	ld [wJoyIgnore], a
-	call Func_2307
+	call PlayDefaultMusic
 	ld a, $0
 	ld [W_CERULEANCITYCURSCRIPT], a
 	ret
@@ -277,9 +277,9 @@ CeruleanCityText2: ; 1967c (6:567c)
 	set 7, [hl]
 	ld hl, CeruleanCityText_196ee
 	ld de, CeruleanCityText_196ee
-	call PreBattleSaveRegisters
+	call SaveEndBattleTextPointers
 	ld a, [$ff8c]
-	ld [wcf13], a
+	ld [wSpriteIndex], a
 	call EngageMapTrainer
 	call InitBattleEnemyParameters
 	ld a, $4
@@ -296,7 +296,7 @@ CeruleanCityText2: ; 1967c (6:567c)
 	jr .Done
 .Success
 	ld a, $1
-	ld [wcc3c], a
+	ld [wDoNotWaitForButtonPressAfterDisplayingText], a
 	ld hl, ReceivedTM28Text
 	call PrintText
 	callba Func_74872

scripts/ceruleancity2.asm

@@ -2,7 +2,7 @@ Func_74872: ; 74872 (1d:4872)
 ; code similar to this appears in a lot of banks; this particular
 ; one is called after you beat the Rocket that gives you TM28 DIG.
 ; the screen then fades out, he disappears, and fades back in
-	call GBFadeIn1
+	call GBFadeOutToBlack
 	ld a, $07
 	ld [wcc4d], a
 	predef ShowObject
@@ -12,5 +12,5 @@ Func_74872: ; 74872 (1d:4872)
 	ld a, $06
 	ld [wcc4d], a
 	predef HideObject
-	call GBFadeOut1
+	call GBFadeInFromBlack
 	ret

scripts/ceruleangym.asm

@@ -31,7 +31,7 @@ CeruleanGymScript_5c6ed: ; 5c6ed (17:46ed)
 
 CeruleanGymScriptPointers: ; 5c6f8 (17:46f8)
 	dw CheckFightingMapTrainers
-	dw Func_324c
+	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
 	dw CeruleanGymScript3
 
@@ -126,9 +126,9 @@ CeruleanGymText1: ; 5c771 (17:4771)
 	set 7, [hl]
 	ld hl, CeruleanGymText_5c7d8
 	ld de, CeruleanGymText_5c7d8
-	call PreBattleSaveRegisters
+	call SaveEndBattleTextPointers
 	ldh a, [$8c]
-	ld [wcf13], a
+	ld [wSpriteIndex], a
 	call EngageMapTrainer
 	call InitBattleEnemyParameters
 	ld a, $2

scripts/ceruleanhouse2.asm

@@ -1,8 +1,8 @@
 CeruleanHouse2Script: ; 74e09 (1d:4e09)
 	ld a, $1
-	ld [wcf0c], a
+	ld [wAutoTextBoxDrawingControl], a
 	dec a
-	ld [wcc3c], a
+	ld [wDoNotWaitForButtonPressAfterDisplayingText], a
 	ret
 
 CeruleanHouse2TextPointers: ; 74e13 (1d:4e13)
@@ -27,7 +27,7 @@ CeruleanHouse2Text1: ; 74e15 (1d:4e15)
 	ld [wcf8c], a
 	xor a
 	ld [wcf93], a
-	ld [wcc35], a
+	ld [wMenuItemToSwap], a
 	ld a, SPECIALLISTMENU
 	ld [wListMenuID], a
 	call DisplayListMenuID

scripts/cinnabargym.asm

@@ -187,13 +187,13 @@ CinnabarGymTextPointers: ; 7589f (1d:589f)
 
 CinnabarGymScript_758b7: ; 758b7 (1d:58b7)
 	ld a, [H_DOWNARROWBLINKCNT2] ; $ff8c
-	ld [wcf13], a
+	ld [wSpriteIndex], a
 	call EngageMapTrainer
 	call InitBattleEnemyParameters
 	ld hl, wd72d
 	set 6, [hl]
 	set 7, [hl]
-	ld a, [wcf13]
+	ld a, [wSpriteIndex]
 	cp $1
 	jr z, .asm_758d4
 	ld a, $2
@@ -224,7 +224,7 @@ CinnabarGymText1: ; 758df (1d:58df)
 	call PrintText
 	ld hl, BlaineEndBattleText
 	ld de, BlaineEndBattleText
-	call PreBattleSaveRegisters
+	call SaveEndBattleTextPointers
 	ld a, $7
 	ld [W_GYMLEADERNO], a
 	jp CinnabarGymScript_758b7
@@ -267,7 +267,7 @@ CinnabarGymText2: ; 75939 (1d:5939)
 	call PrintText
 	ld hl, CinnabarGymText_75964
 	ld de, CinnabarGymText_75964 ; $5964 XXX
-	call PreBattleSaveRegisters
+	call SaveEndBattleTextPointers
 	jp CinnabarGymScript_758b7
 .asm_46bb4 ; 0x75956
 	ld hl, CinnabarGymText_75969
@@ -296,7 +296,7 @@ CinnabarGymText3: ; 7596e (1d:596e)
 	call PrintText
 	ld hl, CinnabarGymText_75999
 	ld de, CinnabarGymText_75999 ; $5999 XXX
-	call PreBattleSaveRegisters
+	call SaveEndBattleTextPointers
 	jp CinnabarGymScript_758b7
 .asm_4b406 ; 0x7598b
 	ld hl, CinnabarGymText_7599e
@@ -325,7 +325,7 @@ CinnabarGymText4: ; 759a3 (1d:59a3)
 	call PrintText
 	ld hl, CinnabarGymText_759ce
 	ld de, CinnabarGymText_759ce ; $59ce XXX
-	call PreBattleSaveRegisters
+	call SaveEndBattleTextPointers
 	jp CinnabarGymScript_758b7
 .asm_c0673 ; 0x759c0
 	ld hl, CinnabarGymText_759d3
@@ -354,7 +354,7 @@ CinnabarGymText5: ; 759d8 (1d:59d8)
 	call PrintText
 	ld hl, CinnabarGymText_75a03
 	ld de, CinnabarGymText_75a03 ; $5a03 XXX
-	call PreBattleSaveRegisters
+	call SaveEndBattleTextPointers
 	jp CinnabarGymScript_758b7
 .asm_5cfd7 ; 0x759f5
 	ld hl, CinnabarGymText_75a08
@@ -383,7 +383,7 @@ CinnabarGymText6: ; 75a0d (1d:5a0d)
 	call PrintText
 	ld hl, CinnabarGymText_75a38
 	ld de, CinnabarGymText_75a38
-	call PreBattleSaveRegisters
+	call SaveEndBattleTextPointers
 	jp CinnabarGymScript_758b7
 .asm_776b4 ; 0x75a2a
 	ld hl, CinnabarGymText_75a3d
@@ -412,7 +412,7 @@ CinnabarGymText7: ; 75a42 (1d:5a42)
 	call PrintText
 	ld hl, CinnabarGymText_75a6d
 	ld de, CinnabarGymText_75a6d
-	call PreBattleSaveRegisters
+	call SaveEndBattleTextPointers
 	jp CinnabarGymScript_758b7
 .asm_2f755 ; 0x75a5f
 	ld hl, CinnabarGymText_75a72
@@ -441,7 +441,7 @@ CinnabarGymText8: ; 75a77 (1d:5a77)
 	call PrintText
 	ld hl, CinnabarGymText_75aa2
 	ld de, CinnabarGymText_75aa2 ; $5aa2 XXX
-	call PreBattleSaveRegisters
+	call SaveEndBattleTextPointers
 	jp CinnabarGymScript_758b7
 .asm_d87be ; 0x75a94
 	ld hl, CinnabarGymText_75aa7

scripts/cinnabarisland.asm

@@ -32,10 +32,10 @@ CinnabarIslandScript0: ; 1ca38 (7:4a38)
 	xor a
 	ld [hJoyHeld], a
 	ld a, $1
-	ld [wcd38], a
-	ld a, $80
-	ld [wccd3], a
-	call Func_3486
+	ld [wSimulatedJoypadStatesIndex], a
+	ld a, D_DOWN
+	ld [wSimulatedJoypadStatesEnd], a
+	call StartSimulatingJoypadStates
 	xor a
 	ld [wSpriteStateData1 + 9], a
 	ld [wJoyIgnore], a
@@ -44,7 +44,7 @@ CinnabarIslandScript0: ; 1ca38 (7:4a38)
 	ret
 
 CinnabarIslandScript1: ; 1ca73 (7:4a73)
-	ld a, [wcd38]
+	ld a, [wSimulatedJoypadStatesIndex]
 	and a
 	ret nz
 	call Delay3

scripts/copycatshouse2f.asm

@@ -16,7 +16,7 @@ CopycatsHouse2FText1: ; 5cc82 (17:4c82)
 	bit 0, a
 	jr nz, .asm_7ccf3 ; 0x5cc88
 	ld a, $1
-	ld [wcc3c], a
+	ld [wDoNotWaitForButtonPressAfterDisplayingText], a
 	ld hl, CopycatsHouse2FText_5ccd4
 	call PrintText
 	ld b, POKE_DOLL

scripts/daycarem.asm

@@ -24,13 +24,13 @@ DayCareMText1: ; 56254 (15:6254)
 	ld hl, DayCareMText_56414
 	call PrintText
 	xor a
-	ld [wcfcb], a
+	ld [wUpdateSpritesEnabled], a
 	ld [wd07d], a
-	ld [wcc35], a
+	ld [wMenuItemToSwap], a
 	call DisplayPartyMenu
 	push af
 	call GBPalWhiteOutWithDelay3
-	call Func_3dbe
+	call RestoreScreenTilesAndReloadTilePatterns
 	call LoadGBPal
 	pop af
 	ld hl, DayCareMText_56437
@@ -65,7 +65,7 @@ DayCareMScript_562e1: ; 562e1 (15:62e1)
 	ld a, $3
 	ld [wcc49], a
 	call LoadMonData
-	callab Func_58f43
+	callab CalcLevelFromExperience
 	ld a, d
 	cp MAX_LEVEL
 	jr c, .asm_56315

scripts/fightingdojo.asm

@@ -16,7 +16,7 @@ FightingDojoScript_5cd70: ; 5cd70 (17:4d70)
 
 FightingDojoScriptPointers: ; 5cd7b (17:4d7b)
 	dw FightingDojoScript1
-	dw Func_324c
+	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
 	dw FightingDojoScript3
 
@@ -48,7 +48,7 @@ FightingDojoScript1: ; 5cd83 (17:4d83)
 	ld [$ff8c], a
 	ld a, $8
 	ld [$ff8d], a
-	call Func_34a6
+	call SetSpriteFacingDirectionAndDelay
 	ld a, $1
 	ld [$ff8c], a
 	call DisplayTextID
@@ -67,7 +67,7 @@ FightingDojoScript3: ; 5cdc6 (17:4dc6)
 	ld [$ff8c], a
 	ld a, $8
 	ld [$ff8d], a
-	call Func_34a6
+	call SetSpriteFacingDirectionAndDelay
 
 .asm_5cde4
 	ld a, $f0
@@ -147,9 +147,9 @@ FightingDojoText1: ; 5ce44 (17:4e44)
 	set 7, [hl]
 	ld hl, FightingDojoText_5ce93
 	ld de, FightingDojoText_5ce93
-	call PreBattleSaveRegisters
+	call SaveEndBattleTextPointers
 	ldh a, [$8c]
-	ld [wcf13], a
+	ld [wSpriteIndex], a
 	call EngageMapTrainer
 	call InitBattleEnemyParameters
 	ld a, $3

scripts/fuchsiagym.asm

@@ -32,7 +32,7 @@ FuchsiaGymScript_75477: ; 75477 (1d:5477)
 
 FuchsiaGymScriptPointers: ; 75482 (1d:5482)
 	dw CheckFightingMapTrainers
-	dw Func_324c
+	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
 	dw FuchsiaGymScript3
 
@@ -166,9 +166,9 @@ FuchsiaGymText1: ; 75534 (1d:5534)
 	set 7, [hl]
 	ld hl, UnnamedText_75586
 	ld de, UnnamedText_75586
-	call PreBattleSaveRegisters
+	call SaveEndBattleTextPointers
 	ldh a, [$8c]
-	ld [wcf13], a
+	ld [wSpriteIndex], a
 	call EngageMapTrainer
 	call InitBattleEnemyParameters
 	ld a, $5

scripts/gary.asm

@@ -29,12 +29,12 @@ GaryScript0: ; 75f47 (1d:5f47)
 GaryScript1: ; 75f48 (1d:5f48)
 	ld a, $ff
 	ld [wJoyIgnore], a
-	ld hl, wccd3
+	ld hl, wSimulatedJoypadStatesEnd
 	ld de, RLEMovement75f63
 	call DecodeRLEList
 	dec a
-	ld [wcd38], a
-	call Func_3486
+	ld [wSimulatedJoypadStatesIndex], a
+	call StartSimulatingJoypadStates
 	ld a, $2
 	ld [W_GARYCURSCRIPT], a
 	ret
@@ -46,7 +46,7 @@ RLEMovement75f63: ; 75f63 (1d:5f63)
 	db $ff
 
 GaryScript2: ; 75f6a (1d:5f6a)
-	ld a, [wcd38]
+	ld a, [wSimulatedJoypadStatesIndex]
 	and a
 	ret nz
 	call Delay3
@@ -63,7 +63,7 @@ GaryScript2: ; 75f6a (1d:5f6a)
 	set 7, [hl]
 	ld hl, GaryText_760f9
 	ld de, GaryText_760fe
-	call PreBattleSaveRegisters
+	call SaveEndBattleTextPointers
 	ld a, SONY3 + $c8
 	ld [W_CUROPPONENT], a
 
@@ -140,12 +140,12 @@ GaryScript5: ; 7601a (1d:601a)
 	ld [$ff8c], a
 	ld a, $8
 	ld [$ff8d], a
-	call Func_34a6
+	call SetSpriteFacingDirectionAndDelay
 	ld a, $2
 	ld [$ff8c], a
 	xor a
 	ld [$ff8d], a
-	call Func_34a6 ; face object
+	call SetSpriteFacingDirectionAndDelay ; face object
 	ld a, $3
 	ld [$ff8c], a
 	call GaryScript_760c8
@@ -158,7 +158,7 @@ GaryScript6: ; 76047 (1d:6047)
 	ld [$ff8c], a
 	ld a, $c
 	ld [$ff8d], a
-	call Func_34a6 ; face object
+	call SetSpriteFacingDirectionAndDelay ; face object
 	ld a, $4
 	ld [$ff8c], a
 	call GaryScript_760c8
@@ -171,7 +171,7 @@ GaryScript7: ; 7605f (1d:605f)
 	ld [$ff8c], a
 	xor a
 	ld [$ff8d], a
-	call Func_34a6 ; face object
+	call SetSpriteFacingDirectionAndDelay ; face object
 	ld a, $5
 	ld [$ff8c], a
 	call GaryScript_760c8
@@ -200,12 +200,12 @@ GaryScript8: ; 76083 (1d:6083)
 GaryScript9: ; 76099 (1d:6099)
 	ld a, $ff
 	ld [wJoyIgnore], a
-	ld hl, wccd3
+	ld hl, wSimulatedJoypadStatesEnd
 	ld de, RLEMovement760b4
 	call DecodeRLEList
 	dec a
-	ld [wcd38], a
-	call Func_3486
+	ld [wSimulatedJoypadStatesIndex], a
+	call StartSimulatingJoypadStates
 	ld a, $a
 	ld [W_GARYCURSCRIPT], a
 	ret
@@ -216,7 +216,7 @@ RLEMovement760b4 ; 760b4 (1d:60b4)
 	db $ff
 
 GaryScript10: ; 760b9 (1d:60b9)
-	ld a, [wcd38]
+	ld a, [wSimulatedJoypadStatesIndex]
 	and a
 	ret nz
 	xor a

scripts/halloffameroom.asm

@@ -62,12 +62,12 @@ HallofFameRoomScript2: ; 5a4bb (16:64bb)
 HallofFameRoomScript0: ; 5a50d (16:650d)
 	ld a, $ff
 	ld [wJoyIgnore], a
-	ld hl, wccd3
+	ld hl, wSimulatedJoypadStatesEnd
 	ld de, RLEMovement5a528
 	call DecodeRLEList
 	dec a
-	ld [wcd38], a
-	call Func_3486
+	ld [wSimulatedJoypadStatesIndex], a
+	call StartSimulatingJoypadStates
 	ld a, $1
 	ld [W_HALLOFFAMEROOMCURSCRIPT], a
 	ret
@@ -77,7 +77,7 @@ RLEMovement5a528: ; 5a528 (16:6528)
 	db $ff
 
 HallofFameRoomScript1: ; 5a52b (16:652b)
-	ld a, [wcd38]
+	ld a, [wSimulatedJoypadStatesIndex]
 	and a
 	ret nz
 	ld a, $1
@@ -87,7 +87,7 @@ HallofFameRoomScript1: ; 5a52b (16:652b)
 	call SetSpriteMovementBytesToFF
 	ld a, $8
 	ld [$ff8d], a
-	call Func_34a6
+	call SetSpriteFacingDirectionAndDelay
 	call Delay3
 	xor a
 	ld [wJoyIgnore], a

scripts/lance.asm

@@ -34,7 +34,7 @@ LanceScript_5a2de: ; 5a2de (16:62de)
 	ld bc, $603
 
 LanceScript_5a2f0: ; 5a2f0 (16:62f0)
-	predef_jump Func_ee9e
+	predef_jump ReplaceTileBlock
 
 LanceScript_5a2f5: ; 5a2f5 (16:62f5)
 	xor a
@@ -43,7 +43,7 @@ LanceScript_5a2f5: ; 5a2f5 (16:62f5)
 
 LanceScriptPointers: ; 5a2fa (16:62fa)
 	dw LanceScript0
-	dw Func_324c
+	dw DisplayEnemyTrainerTextAndStartBattle
 	dw LanceScript2
 	dw LanceScript3
 	dw LanceScript4
@@ -99,12 +99,12 @@ LanceScript2: ; 5a349 (16:6349)
 LanceScript_5a35b: ; 5a35b (16:635b)
 	ld a, $ff
 	ld [wJoyIgnore], a
-	ld hl, wccd3
+	ld hl, wSimulatedJoypadStatesEnd
 	ld de, RLEList_5a379
 	call DecodeRLEList
 	dec a
-	ld [wcd38], a
-	call Func_3486
+	ld [wSimulatedJoypadStatesIndex], a
+	call StartSimulatingJoypadStates
 	ld a, $3
 	ld [W_LANCECURSCRIPT], a
 	ld [W_CURMAPSCRIPT], a
@@ -118,7 +118,7 @@ RLEList_5a379: ; 5a379 (16:6379)
 	db $FF
 
 LanceScript3: ; 5a382 (16:6382)
-	ld a, [wcd38]
+	ld a, [wSimulatedJoypadStatesIndex]
 	and a
 	ret nz
 	call Delay3

scripts/lorelei.asm

@@ -25,7 +25,7 @@ LoreleiScript_76191: ; 76191 (1d:6191)
 .asm_761ab
 	ld [wd09f], a
 	ld bc, $2
-	predef_jump Func_ee9e
+	predef_jump ReplaceTileBlock
 
 LoreleiScript_761b6: ; 761b6 (1d:61b6)
 	xor a
@@ -34,7 +34,7 @@ LoreleiScript_761b6: ; 761b6 (1d:61b6)
 
 LoreleiScriptPointers: ; 761bb (1d:61bb)
 	dw LoreleiScript0
-	dw Func_324c
+	dw DisplayEnemyTrainerTextAndStartBattle
 	dw LoreleiScript2
 	dw LoreleiScript3
 	dw LoreleiScript4
@@ -42,8 +42,8 @@ LoreleiScriptPointers: ; 761bb (1d:61bb)
 LoreleiScript4: ; 761c5 (1d:61c5)
 	ret
 asm_761c6: ; 761c6 (1d:61c6)
-	ld hl, wccd3
-	ld a, $40
+	ld hl, wSimulatedJoypadStatesEnd
+	ld a, D_UP
 	ld [hli], a
 	ld [hli], a
 	ld [hli], a
@@ -51,8 +51,8 @@ asm_761c6: ; 761c6 (1d:61c6)
 	ld [hli], a
 	ld [hl], a
 	ld a, $6
-	ld [wcd38], a
-	call Func_3486
+	ld [wSimulatedJoypadStatesIndex], a
+	call StartSimulatingJoypadStates
 	ld a, $3
 	ld [W_LORELEICURSCRIPT], a
 	ld [W_CURMAPSCRIPT], a
@@ -64,8 +64,8 @@ LoreleiScript0: ; 761e2 (1d:61e2)
 	xor a
 	ld [hJoyPressed], a
 	ld [hJoyHeld], a
-	ld [wccd3], a
-	ld [wcd38], a
+	ld [wSimulatedJoypadStatesEnd], a
+	ld [wSimulatedJoypadStatesIndex], a
 	ld a, [wWhichTrade] ; wWhichTrade
 	cp $3
 	jr c, .asm_76206
@@ -77,11 +77,11 @@ LoreleiScript0: ; 761e2 (1d:61e2)
 	ld a, $2
 	ld [H_DOWNARROWBLINKCNT2], a ; $ff8c
 	call DisplayTextID
-	ld a, $40
-	ld [wccd3], a
+	ld a, D_UP
+	ld [wSimulatedJoypadStatesEnd], a
 	ld a, $1
-	ld [wcd38], a
-	call Func_3486
+	ld [wSimulatedJoypadStatesIndex], a
+	call StartSimulatingJoypadStates
 	ld a, $3
 	ld [W_LORELEICURSCRIPT], a
 	ld [W_CURMAPSCRIPT], a
@@ -95,7 +95,7 @@ CoordsData_76223: ; 76223 (1d:6223)
 	db $FF
 
 LoreleiScript3: ; 7622c (1d:622c)
-	ld a, [wcd38]
+	ld a, [wSimulatedJoypadStatesIndex]
 	and a
 	ret nz
 	call Delay3

scripts/mansion1.asm

@@ -43,7 +43,7 @@ Mansion1Script_4430b: ; 4430b (11:430b)
 	ld a, $e
 	ld [wd09f], a
 asm_44310: ; 44310 (11:4310)
-	predef Func_ee9e
+	predef ReplaceTileBlock
 	ret
 
 Mansion1Script_Switches: ; 44316 (11:4316)
@@ -58,7 +58,7 @@ Mansion1Script_Switches: ; 44316 (11:4316)
 
 Mansion1ScriptPointers: ; 44326 (11:4326)
 	dw CheckFightingMapTrainers
-	dw Func_324c
+	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
 
 Mansion1TextPointers: ; 4432c (11:432c)
@@ -106,7 +106,7 @@ Mansion1Text4: ; 4435a (11:435a)
 	and a
 	jr nz, .asm_4438c ; 0x44368 $22
 	ld a, $1
-	ld [wcc3c], a
+	ld [wDoNotWaitForButtonPressAfterDisplayingText], a
 	ld hl, wd126
 	set 5, [hl]
 	ld hl, MansionSwitchPressedText

scripts/mansion2.asm

@@ -40,7 +40,7 @@ Mansion2Script_51fee: ; 51fee (14:5fee)
 
 Mansion2Script_5202f: ; 5202f (14:602f)
 	ld [wd09f], a
-	predef_jump Func_ee9e
+	predef_jump ReplaceTileBlock
 
 Mansion2Script_Switches: ; 52037 (14:6037)
 	ld a, [wSpriteStateData1 + 9]
@@ -54,7 +54,7 @@ Mansion2Script_Switches: ; 52037 (14:6037)
 
 Mansion2ScriptPointers: ; 52047 (14:6047)
 	dw CheckFightingMapTrainers
-	dw Func_324c
+	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
 
 Mansion2TextPointers: ; 5204d (14:604d)
@@ -112,7 +112,7 @@ Mansion2Text5: ; 52087 (14:6087)
 	and a
 	jr nz, .asm_520b9 ; 0x52095 $22
 	ld a, $1
-	ld [wcc3c], a
+	ld [wDoNotWaitForButtonPressAfterDisplayingText], a
 	ld hl, wd126
 	set 5, [hl]
 	ld hl, Mansion2Text_520c7

scripts/mansion3.asm

@@ -34,13 +34,13 @@ Mansion3Script_52204: ; 52204 (14:6204)
 
 Mansion3ScriptPointers: ; 52235 (14:6235)
 	dw Mansion3Script0
-	dw Func_324c
+	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
 
 Mansion3Script0: ; 5223b (14:623b)
 	ld hl, CoordsData_52254
 	call Mansion3Script_5225b
-	ld a, [wd71e]
+	ld a, [wWhichDungeonWarp]
 	and a
 	jp z, CheckFightingMapTrainers
 	cp $3
@@ -48,7 +48,7 @@ Mansion3Script0: ; 5223b (14:623b)
 	jr nz, .asm_52250
 	ld a, $d6
 .asm_52250
-	ld [wd71d], a
+	ld [wDungeonWarpDestinationMap], a
 	ret
 
 CoordsData_52254: ; 52254 (14:6254)
@@ -59,14 +59,14 @@ CoordsData_52254: ; 52254 (14:6254)
 
 Mansion3Script_5225b: ; 5225b (14:625b)
 	xor a
-	ld [wd71e], a
+	ld [wWhichDungeonWarp], a
 	ld a, [wd72d]
 	bit 4, a
 	ret nz
 	call ArePlayerCoordsInArray
 	ret nc
 	ld a, [wWhichTrade] ; wWhichTrade
-	ld [wd71e], a
+	ld [wWhichDungeonWarp], a
 	ld hl, wd72d
 	set 4, [hl]
 	ld hl, wd732

scripts/mansion4.asm

@@ -56,7 +56,7 @@ Mansion4Script_Switches: ; 52420 (14:6420)
 
 Mansion4ScriptPointers: ; 52430 (14:6430)
 	dw CheckFightingMapTrainers
-	dw Func_324c
+	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
 
 Mansion4TextPointers: ; 52436 (14:6436)

scripts/mtmoon1.asm

@@ -9,7 +9,7 @@ MtMoon1Script: ; 499c8 (12:59c8)
 
 MtMoon1ScriptPointers: ; 499db (12:59db)
 	dw CheckFightingMapTrainers
-	dw Func_324c
+	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
 
 MtMoon1TextPointers: ; 499e1 (12:59e1)

scripts/mtmoon3.asm

@@ -47,7 +47,7 @@ MtMoon3Script_49d58: ; 49d58 (12:5d58)
 
 MtMoon3ScriptPointers: ; 49d63 (12:5d63)
 	dw MtMoon3Script0
-	dw Func_324c
+	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
 	dw MtMoon3Script3
 	dw MtMoon3Script4
@@ -138,7 +138,7 @@ MtMoon3Script5: ; 49dfb (12:5dfb)
 	ld a, $f0
 	ld [wJoyIgnore], a
 	ld a, $1
-	ld [wcc3c], a
+	ld [wDoNotWaitForButtonPressAfterDisplayingText], a
 	ld a, $a
 	ld [H_DOWNARROWBLINKCNT2], a ; $ff8c
 	call DisplayTextID
@@ -228,9 +228,9 @@ MtMoon3Text1: ; 49e79 (12:5e79)
 	set 7, [hl]
 	ld hl, MtMoon3Text_49f8a
 	ld de, MtMoon3Text_49f8a
-	call PreBattleSaveRegisters
+	call SaveEndBattleTextPointers
 	ldh a, [$8c]
-	ld [wcf13], a
+	ld [wSpriteIndex], a
 	call EngageMapTrainer
 	call InitBattleEnemyParameters
 	ld a, $3
@@ -270,7 +270,7 @@ MtMoon3Text5: ; 49edf (12:5edf)
 MtMoon3Text6: ; 49ee9 (12:5ee9)
 	db $08 ; asm
 	ld a, $1
-	ld [wcc3c], a
+	ld [wDoNotWaitForButtonPressAfterDisplayingText], a
 	ld hl, MtMoon3Text_49f24
 	call PrintText
 	call YesNoChoice
@@ -299,7 +299,7 @@ MtMoon3Text_49f24: ; 49f24 (12:5f24)
 MtMoon3Text7: ; 49f29 (12:5f29)
 	db $08 ; asm
 	ld a, $1
-	ld [wcc3c], a
+	ld [wDoNotWaitForButtonPressAfterDisplayingText], a
 	ld hl, MtMoon3Text_49f64
 	call PrintText
 	call YesNoChoice

scripts/museum1f.asm

@@ -1,8 +1,8 @@
 Museum1FScript: ; 5c0f7 (17:40f7)
 	ld a, $1
-	ld [wcf0c], a
+	ld [wAutoTextBoxDrawingControl], a
 	xor a
-	ld [wcc3c], a
+	ld [wDoNotWaitForButtonPressAfterDisplayingText], a
 	ld hl, Museum1FScriptPointers
 	ld a, [W_MUSEUM1FCURSCRIPT]
 	jp CallFunctionInTable
@@ -115,10 +115,10 @@ Museum1FText1: ; 5c135 (17:4135)
 	ld hl, Museum1FText_5c21a ; $421a
 	call PrintText
 	ld a, $1
-	ld [wcd38], a
+	ld [wSimulatedJoypadStatesIndex], a
 	ld a, $80
-	ld [wccd3], a
-	call Func_3486
+	ld [wSimulatedJoypadStatesEnd], a
+	call StartSimulatingJoypadStates
 	call UpdateSprites
 	jr asm_d1145
 .asm_0b094

scripts/namerater.asm

@@ -50,12 +50,12 @@ NameRaterText1: ; 1da56 (7:5a56)
 	call PrintText
 	xor a
 	ld [wd07d], a
-	ld [wcfcb], a
-	ld [wcc35], a
+	ld [wUpdateSpritesEnabled], a
+	ld [wMenuItemToSwap], a
 	call DisplayPartyMenu
 	push af
 	call GBPalWhiteOutWithDelay3
-	call Func_3dbe
+	call RestoreScreenTilesAndReloadTilePatterns
 	call LoadGBPal
 	pop af
 	jr c, .asm_1daae ; 0x1da80 $2c

scripts/oakslab.asm

@@ -3,9 +3,9 @@ OaksLabScript: ; 1cb0e (7:4b0e)
 	bit 6, a
 	call nz, OaksLabScript_1d076
 	ld a, $1
-	ld [wcf0c], a
+	ld [wAutoTextBoxDrawingControl], a
 	xor a
-	ld [wcc3c], a
+	ld [wDoNotWaitForButtonPressAfterDisplayingText], a
 	ld hl, OaksLabScriptPointers
 	ld a, [W_OAKSLABCURSCRIPT]
 	jp CallFunctionInTable
@@ -35,7 +35,7 @@ OaksLabScript0: ; 1cb4e (7:4b4e)
 	ld a, [wd74b]
 	bit 7, a
 	ret z
-	ld a, [wcf10]
+	ld a, [wNPCMovementScriptFunctionNum]
 	and a
 	ret nz
 	ld a, $31
@@ -50,7 +50,7 @@ OaksLabScript0: ; 1cb4e (7:4b4e)
 
 OaksLabScript1: ; 1cb6e (7:4b6e)
 	ld a, $8
-	ld [$ff8c], a
+	ld [H_SPRITEINDEX], a
 	ld de, OakEntryMovement
 	call MoveSprite
 
@@ -78,22 +78,22 @@ OaksLabScript2: ; 1cb82 (7:4b82)
 
 OaksLabScript3: ; 1cba2 (7:4ba2)
 	call Delay3
-	ld hl, wccd3
+	ld hl, wSimulatedJoypadStatesEnd
 	ld de, PlayerEntryMovementRLE
 	call DecodeRLEList
 	dec a
-	ld [wcd38], a
-	call Func_3486
+	ld [wSimulatedJoypadStatesIndex], a
+	call StartSimulatingJoypadStates
 	ld a, $1
-	ld [$ff8c], a
+	ld [H_SPRITEINDEX], a
 	xor a
 	ld [$ff8d], a
-	call Func_34a6 ; face object
+	call SetSpriteFacingDirectionAndDelay
 	ld a, $5
-	ld [$ff8c], a
+	ld [H_SPRITEINDEX], a
 	xor a
 	ld [$ff8d], a
-	call Func_34a6 ; face object
+	call SetSpriteFacingDirectionAndDelay
 
 	ld a, $4
 	ld [W_OAKSLABCURSCRIPT], a
@@ -103,7 +103,7 @@ PlayerEntryMovementRLE: ; 1cbcf (7:4bcf)
 	db $40, $8, $ff
 
 OaksLabScript4: ; 1cbd2 (7:4bd2)
-	ld a, [wcd38]
+	ld a, [wSimulatedJoypadStatesIndex]
 	and a
 	ret nz
 	ld hl, wd747
@@ -111,14 +111,14 @@ OaksLabScript4: ; 1cbd2 (7:4bd2)
 	ld hl, wd74b
 	set 0, [hl]
 	ld a, $1
-	ld [$ff8c], a
+	ld [H_SPRITEINDEX], a
 	ld a, $4
 	ld [$ff8d], a
-	call Func_34a6 ; face object
+	call SetSpriteFacingDirectionAndDelay
 	call UpdateSprites
 	ld hl, W_FLAGS_D733
 	res 1, [hl]
-	call Func_2307
+	call PlayDefaultMusic
 
 	ld a, $5
 	ld [W_OAKSLABCURSCRIPT], a
@@ -156,24 +156,24 @@ OaksLabScript6: ; 1cc36 (7:4c36)
 	cp $6
 	ret nz
 	ld a, $5
-	ld [$ff8c], a
+	ld [H_SPRITEINDEX], a
 	xor a
 	ld [$ff8d], a
-	call Func_34a6 ; face object
+	call SetSpriteFacingDirectionAndDelay
 	ld a, $1
-	ld [$ff8c], a
+	ld [H_SPRITEINDEX], a
 	xor a
 	ld [$ff8d], a
-	call Func_34a6 ; face object
+	call SetSpriteFacingDirectionAndDelay
 	call UpdateSprites
 	ld a, $c
 	ld [$ff8c], a
 	call DisplayTextID
 	ld a, $1
-	ld [wcd38], a
+	ld [wSimulatedJoypadStatesIndex], a
 	ld a, $40
-	ld [wccd3], a
-	call Func_3486
+	ld [wSimulatedJoypadStatesEnd], a
+	call StartSimulatingJoypadStates
 	ld a, $8
 	ld [wd528], a
 
@@ -182,7 +182,7 @@ OaksLabScript6: ; 1cc36 (7:4c36)
 	ret
 
 OaksLabScript7: ; 1cc72 (7:4c72)
-	ld a, [wcd38]
+	ld a, [wSimulatedJoypadStatesIndex]
 	and a
 	ret nz
 	call Delay3
@@ -231,10 +231,10 @@ OaksLabScript8: ; 1cc80 (7:4c80)
 	jr nz, .asm_1ccf3 ; 0x1cccd $24
 	push hl
 	ld a, $1
-	ld [$ff8c], a
+	ld [H_SPRITEINDEX], a
 	ld a, $4
 	ld [$ff8b], a
-	call Func_34fc
+	call GetPointerWithinSpriteStateData1
 	push hl
 	ld [hl], $4c
 	inc hl
@@ -256,7 +256,7 @@ OaksLabScript8: ; 1cc80 (7:4c80)
 
 .asm_1ccf3
 	ld a, $1
-	ld [$ff8c], a
+	ld [H_SPRITEINDEX], a
 	call MoveSprite
 
 	ld a, $9
@@ -270,10 +270,10 @@ OaksLabScript9: ; 1cd00 (7:4d00)
 	ld a, $fc
 	ld [wJoyIgnore], a
 	ld a, $1
-	ld [$ff8c], a
+	ld [H_SPRITEINDEX], a
 	ld a, $4
 	ld [$ff8d], a
-	call Func_34a6 ; face object
+	call SetSpriteFacingDirectionAndDelay
 	ld a, $d
 	ld [$ff8c], a
 	call DisplayTextID
@@ -299,10 +299,10 @@ OaksLabScript9: ; 1cd00 (7:4d00)
 	ld [wd11e], a
 	call GetMonName
 	ld a, $1
-	ld [$ff8c], a
+	ld [H_SPRITEINDEX], a
 	ld a, $4
 	ld [$ff8d], a
-	call Func_34a6 ; face object
+	call SetSpriteFacingDirectionAndDelay
 	ld a, $e
 	ld [$ff8c], a
 	call DisplayTextID
@@ -320,10 +320,10 @@ OaksLabScript10: ; 1cd6d (7:4d6d)
 	cp $6
 	ret nz
 	ld a, $1
-	ld [$ff8c], a
+	ld [H_SPRITEINDEX], a
 	xor a
 	ld [$ff8d], a
-	call Func_34a6 ; face object
+	call SetSpriteFacingDirectionAndDelay
 	ld a, $8
 	ld [wd528], a
 	ld c, BANK(Music_MeetRival)
@@ -337,14 +337,14 @@ OaksLabScript10: ; 1cd6d (7:4d6d)
 	ld a, $1
 	swap a
 	ld [$ff95], a
-	predef Func_f929
+	predef CalcPositionOfPlayerRelativeToNPC
 	ld a, [$ff95]
 	dec a
 	ld [$ff95], a
-	predef Func_f8ba
-	ld de, wcc97
+	predef FindPathToPlayer
+	ld de, wNPCMovementDirections2
 	ld a, $1
-	ld [$ff8c], a
+	ld [H_SPRITEINDEX], a
 	call MoveSprite
 
 	ld a, $b
@@ -374,11 +374,11 @@ OaksLabScript11: ; 1cdb9 (7:4db9)
 .done
 	ld [W_TRAINERNO], a
 	ld a, $1
-	ld [wcf13], a
-	call Func_32ef
+	ld [wSpriteIndex], a
+	call GetSpritePosition1
 	ld hl, OaksLabText_1d3be
 	ld de, OaksLabText_1d3c3
-	call PreBattleSaveRegisters
+	call SaveEndBattleTextPointers
 	ld hl, wd72d
 	set 6, [hl]
 	set 7, [hl]
@@ -397,13 +397,13 @@ OaksLabScript12: ; 1ce03 (7:4e03)
 	ld [wd528], a
 	call UpdateSprites
 	ld a, $1
-	ld [wcf13], a
-	call Func_32f9
+	ld [wSpriteIndex], a
+	call SetSpritePosition1
 	ld a, $1
-	ld [$ff8c], a
+	ld [H_SPRITEINDEX], a
 	xor a
 	ld [$ff8d], a
-	call Func_34a6 ; face object
+	call SetSpriteFacingDirectionAndDelay
 	predef HealParty
 	ld hl, wd74b
 	set 3, [hl]
@@ -420,7 +420,7 @@ OaksLabScript13: ; 1ce32 (7:4e32)
 	call DisplayTextID
 	callba Music_RivalAlternateStart
 	ld a, $1
-	ld [$ff8c], a
+	ld [H_SPRITEINDEX], a
 	ld de, .RivalExitMovement
 	call MoveSprite
 	ld a, [W_XCOORD]
@@ -450,7 +450,7 @@ OaksLabScript14: ; 1ce6d (7:4e6d)
 	predef HideObject
 	xor a
 	ld [wJoyIgnore], a
-	call Func_2307 ; reset to map music
+	call PlayDefaultMusic ; reset to map music
 	ld a, $12
 	ld [W_OAKSLABCURSCRIPT], a
 	jr .done ; 0x1ce8a $23
@@ -491,17 +491,17 @@ OaksLabScript15: ; 1ceb0 (7:4eb0)
 	ld a, $2a
 	ld [wcc4d], a
 	predef ShowObject
-	ld a, [wcd37]
+	ld a, [wNPCMovementDirections2Index]
 	ld [wd157], a
 	ld b, $0
 	ld c, a
-	ld hl, wcc97
+	ld hl, wNPCMovementDirections2
 	ld a, $40
 	call FillMemory
 	ld [hl], $ff
 	ld a, $1
-	ld [$ff8c], a
-	ld de, wcc97
+	ld [H_SPRITEINDEX], a
+	ld de, wNPCMovementDirections2
 	call MoveSprite
 
 	ld a, $10
@@ -510,22 +510,22 @@ OaksLabScript15: ; 1ceb0 (7:4eb0)
 
 OaksLabScript_1cefd ; 1cefd (7:4efd)
 	ld a, $1
-	ld [$ff8c], a
+	ld [H_SPRITEINDEX], a
 	ld a, $4
 	ld [$ff8d], a
-	call Func_34a6 ; face object
+	call SetSpriteFacingDirectionAndDelay
 	ld a, $8
-	ld [$ff8c], a
+	ld [H_SPRITEINDEX], a
 	xor a
 	ld [$ff8d], a
-	jp Func_34a6 ; face object
+	jp SetSpriteFacingDirectionAndDelay
 
 OaksLabScript16: ; 1cf12 (7:4f12)
 	ld a, [wd730]
 	bit 0, a
 	ret nz
 	call EnableAutoTextBoxDrawing
-	call Func_2307
+	call PlayDefaultMusic
 	ld a, $fc
 	ld [wJoyIgnore], a
 	call OaksLabScript_1cefd
@@ -558,10 +558,10 @@ OaksLabScript16: ; 1cf12 (7:4f12)
 	ld [$ff8c], a
 	call DisplayTextID
 	ld a, $1
-	ld [$ff8c], a
+	ld [H_SPRITEINDEX], a
 	ld a, $c
 	ld [$ff8d], a
-	call Func_34a6 ; face object
+	call SetSpriteFacingDirectionAndDelay
 	call Delay3
 	ld a, $1b
 	ld [$ff8c], a
@@ -579,7 +579,7 @@ OaksLabScript16: ; 1cf12 (7:4f12)
 	ld a, [wd157]
 	ld b, $0
 	ld c, a
-	ld hl, wcc97
+	ld hl, wNPCMovementDirections2
 	xor a
 	call FillMemory
 	ld [hl], $ff
@@ -588,8 +588,8 @@ OaksLabScript16: ; 1cf12 (7:4f12)
 	call PlaySound
 	callba Music_RivalAlternateStart
 	ld a, $1
-	ld [$ff8c], a
-	ld de, wcc97
+	ld [H_SPRITEINDEX], a
+	ld de, wNPCMovementDirections2
 	call MoveSprite
 
 	ld a, $11
@@ -600,7 +600,7 @@ OaksLabScript17: ; 1cfd4 (7:4fd4)
 	ld a, [wd730]
 	bit 0, a
 	ret nz
-	call Func_2307
+	call PlayDefaultMusic
 	ld a, $2a
 	ld [wcc4d], a
 	predef HideObject
@@ -652,7 +652,7 @@ OaksLabScript_1d02b: ; 1d02b (7:502b)
 	cp $3
 	jr nz, .asm_1d045 ; 0x1d038 $b
 	ld a, $4
-	ld [wcd37], a
+	ld [wNPCMovementDirections2Index], a
 	ld a, $30
 	ld b, $b
 	jr .asm_1d068 ; 0x1d043 $23
@@ -660,13 +660,13 @@ OaksLabScript_1d02b: ; 1d02b (7:502b)
 	cp $1
 	jr nz, .asm_1d054 ; 0x1d047 $b
 	ld a, $2
-	ld [wcd37], a
+	ld [wNPCMovementDirections2Index], a
 	ld a, $30
 	ld b, $9
 	jr .asm_1d068 ; 0x1d052 $14
 .asm_1d054
 	ld a, $3
-	ld [wcd37], a
+	ld [wNPCMovementDirections2Index], a
 	ld b, $a
 	ld a, [W_XCOORD]
 	cp $4
@@ -680,8 +680,8 @@ OaksLabScript_1d02b: ; 1d02b (7:502b)
 	ld a, b
 	ld [$ffed], a
 	ld a, $1
-	ld [wcf13], a
-	call Func_32f9
+	ld [wSpriteIndex], a
+	call SetSpritePosition1
 	ret
 
 OaksLabScript_1d076: ; 1d076 (7:5076)
@@ -801,7 +801,7 @@ OaksLabScript_1d133: ; 1d133 (7:5133)
 	ld [wcf91], a
 	ld [wd11e], a
 	ld a, b
-	ld [wcf13], a
+	ld [wSpriteIndex], a
 	ld a, [wd74b]
 	bit 2, a
 	jp nz, OaksLabScript_1d22d
@@ -817,17 +817,17 @@ OaksLabText39: ; 1d152 (7:5152)
 
 OaksLabScript_1d157: ; 1d157 (7:5157)
 	ld a, $5
-	ld [$ff8c], a
+	ld [H_SPRITEINDEX], a
 	ld a, $9
 	ld [$ff8b], a
-	call Func_34fc
+	call GetPointerWithinSpriteStateData1
 	ld [hl], $0
 	; manually fixed some disassembler issues around here
 	ld a, $1
-	ld [$FF8c], a
+	ld [H_SPRITEINDEX], a
 	ld a, $9
 	ld [$ff8b], a
-	call Func_34fc
+	call GetPointerWithinSpriteStateData1
 	ld [hl], $c
 	ld hl, wd730
 	set 6, [hl]
@@ -837,7 +837,7 @@ OaksLabScript_1d157: ; 1d157 (7:5157)
 	call ReloadMapData
 	ld c, $a
 	call DelayFrames
-	ld a, [wcf13]
+	ld a, [wSpriteIndex]
 	cp $2
 	jr z, OaksLabLookAtCharmander
 	cp $3
@@ -868,7 +868,7 @@ OaksLabBulbasaurText: ; 1d1ae (7:51ae)
 OaksLabMonChoiceMenu: ; 1d1b3 (7:51b3)
 	call PrintText
 	ld a, $1
-	ld [wcc3c], a
+	ld [wDoNotWaitForButtonPressAfterDisplayingText], a
 	call YesNoChoice ; yes/no menu
 	ld a, [wCurrentMenuItem]
 	and a
@@ -877,7 +877,7 @@ OaksLabMonChoiceMenu: ; 1d1b3 (7:51b3)
 	ld [W_PLAYERSTARTER], a
 	ld [wd11e], a
 	call GetMonName
-	ld a, [wcf13]
+	ld a, [wSpriteIndex]
 	cp $2
 	jr nz, asm_1d1db ; 0x1d1d5 $4
 	ld a, $2b
@@ -893,7 +893,7 @@ asm_1d1e5: ; 1d1e5 (7:51e5)
 	ld [wcc4d], a
 	predef HideObject
 	ld a, $1
-	ld [wcc3c], a
+	ld [wDoNotWaitForButtonPressAfterDisplayingText], a
 	ld hl, OaksLabMonEnergeticText
 	call PrintText
 	ld hl, OaksLabReceivedMonText
@@ -924,10 +924,10 @@ OaksLabReceivedMonText: ; 1d227 (7:5227)
 
 OaksLabScript_1d22d: ; 1d22d (7:522d)
 	ld a, $5
-	ld [$ff8c], a
+	ld [H_SPRITEINDEX], a
 	ld a, $9
 	ld [$ff8b], a
-	call Func_34fc
+	call GetPointerWithinSpriteStateData1
 	ld [hl], $0
 	ld hl, OaksLabLastMonText
 	call PrintText
@@ -956,7 +956,7 @@ OaksLabText5: ; 1d248 (7:5248)
 	ld hl, OaksLabText_1d31d
 	call PrintText
 	ld a, $1
-	ld [wcc3c], a
+	ld [wDoNotWaitForButtonPressAfterDisplayingText], a
 	predef DisplayDexRating
 	jp .asm_0f042
 .asm_b28b0 ; 0x1d279

scripts/pallettown.asm

@@ -68,7 +68,7 @@ PalletTownScript2: ; 18ed2 (6:4ed2)
 	ld [$FF8C],a
 	ld a,4
 	ld [$FF8D],a
-	call Func_34a6
+	call SetSpriteFacingDirectionAndDelay
 	call Delay3
 	ld a,1
 	ld [W_YCOORD],a
@@ -77,11 +77,11 @@ PalletTownScript2: ; 18ed2 (6:4ed2)
 	ld a,1
 	swap a
 	ld [$FF95],a
-	predef Func_f929
+	predef CalcPositionOfPlayerRelativeToNPC
 	ld hl,$FF95
 	dec [hl]
-	predef Func_f8ba ; load Oak’s movement into wcc97
-	ld de,wcc97
+	predef FindPathToPlayer ; load Oak’s movement into wNPCMovementDirections2
+	ld de,wNPCMovementDirections2
 	ld a,1 ; oak
 	ld [$FF8C],a
 	call MoveSprite
@@ -109,13 +109,13 @@ PalletTownScript3: ; 18f12 (6:4f12)
 	ld a,$FF
 	ld [wJoyIgnore],a
 	ld a,1
-	ld [wcf13],a
+	ld [wSpriteIndex],a
 	xor a
-	ld [wcf10],a
+	ld [wNPCMovementScriptFunctionNum],a
 	ld a,1
-	ld [wcc57],a
+	ld [wNPCMovementScriptPointerTableNum],a
 	ld a,[H_LOADEDROMBANK]
-	ld [wcc58],a
+	ld [wNPCMovementScriptBank],a
 
 	; trigger the next script
 	ld a,4
@@ -123,7 +123,7 @@ PalletTownScript3: ; 18f12 (6:4f12)
 	ret
 
 PalletTownScript4: ; 18f4b (6:4f4b)
-	ld a,[wcc57]
+	ld a,[wNPCMovementScriptPointerTableNum]
 	and a
 	ret nz
 
@@ -171,7 +171,7 @@ PalletTownText1: ; 18f96 (6:4f96)
 	and a
 	jr nz,.next
 	ld a,1
-	ld [wcc3c],a
+	ld [wDoNotWaitForButtonPressAfterDisplayingText],a
 	ld hl,OakAppearsText
 	jr .done
 .next

scripts/pewtercity.asm

@@ -42,18 +42,18 @@ CoordsData_19277: ; 19277 (6:5277)
 	db $ff
 
 PewterCityScript1: ; 19280 (6:5280)
-	ld a, [wcc57]
+	ld a, [wNPCMovementScriptPointerTableNum]
 	and a
 	ret nz
 	ld a, $3
-	ld [$ff8c], a
-	ld a, $4
+	ld [H_SPRITEINDEX], a
+	ld a, SPRITE_FACING_UP
 	ld [$ff8d], a
-	call Func_34a6
-	ld a, $34
+	call SetSpriteFacingDirectionAndDelay
+	ld a, ($3 << 4) | SPRITE_FACING_UP
 	ld [$ff8d], a
-	call Func_34b9
-	call Func_2307
+	call SetSpriteImageIndexAfterSettingFacingDirection
+	call PlayDefaultMusic
 	ld hl, wFlags_0xcd60
 	set 4, [hl]
 	ld a, $d
@@ -68,8 +68,8 @@ PewterCityScript1: ; 19280 (6:5280)
 	ld a, $11
 	ld [$ffee], a
 	ld a, $3
-	ld [wcf13], a
-	call Func_32f9
+	ld [wSpriteIndex], a
+	call SetSpritePosition1
 	ld a, $3
 	ld [$ff8c], a
 	ld de, MovementData_PewterMuseumGuyExit ; $52ce
@@ -94,8 +94,8 @@ PewterCityScript2: ; 192d3 (6:52d3)
 
 PewterCityScript3: ; 192e9 (6:52e9)
 	ld a, $3
-	ld [wcf13], a
-	call Func_32fe
+	ld [wSpriteIndex], a
+	call SetSpritePosition2
 	ld a, $3
 	ld [wcc4d], a
 	predef ShowObject
@@ -106,18 +106,18 @@ PewterCityScript3: ; 192e9 (6:52e9)
 	ret
 
 PewterCityScript4: ; 19305 (6:5305)
-	ld a, [wcc57]
+	ld a, [wNPCMovementScriptPointerTableNum]
 	and a
 	ret nz
 	ld a, $5
 	ld [$ff8c], a
-	ld a, $8
+	ld a, SPRITE_FACING_LEFT
 	ld [$ff8d], a
-	call Func_34a6
-	ld a, $18
+	call SetSpriteFacingDirectionAndDelay
+	ld a, ($1 << 4) | SPRITE_FACING_LEFT
 	ld [$ff8d], a
-	call Func_34b9
-	call Func_2307
+	call SetSpriteImageIndexAfterSettingFacingDirection
+	call PlayDefaultMusic
 	ld hl, wFlags_0xcd60
 	set 4, [hl]
 	ld a, $e
@@ -132,8 +132,8 @@ PewterCityScript4: ; 19305 (6:5305)
 	ld a, $10
 	ld [$ffee], a
 	ld a, $5
-	ld [wcf13], a
-	call Func_32f9
+	ld [wSpriteIndex], a
+	call SetSpritePosition1
 	ld a, $5
 	ld [$ff8c], a
 	ld de, MovementData_PewterGymGuyExit
@@ -158,8 +158,8 @@ PewterCityScript5: ; 19359 (6:5359)
 
 PewterCityScript6: ; 1936f (6:536f)
 	ld a, $5
-	ld [wcf13], a
-	call Func_32fe
+	ld [wSpriteIndex], a
+	call SetSpritePosition2
 	ld a, $4
 	ld [wcc4d], a
 	predef ShowObject
@@ -210,14 +210,14 @@ PewterCityText3: ; 193b1 (6:53b1)
 	xor a
 	ldh [$b3], a
 	ldh [$b4], a
-	ld [wcf10], a
+	ld [wNPCMovementScriptFunctionNum], a
 	ld a, $2
-	ld [wcc57], a
+	ld [wNPCMovementScriptPointerTableNum], a
 	ldh a, [$b8]
-	ld [wcc58], a
+	ld [wNPCMovementScriptBank], a
 	ld a, $3
-	ld [wcf13], a
-	call Func_32f4
+	ld [wSpriteIndex], a
+	call GetSpritePosition2
 	ld a, $1
 	ld [W_PEWTERCITYCURSCRIPT], a
 .asm_ac429 ; 0x193ee
@@ -274,14 +274,14 @@ PewterCityText5: ; 19436 (6:5436)
 	call PrintText
 	xor a
 	ldh [$b4], a
-	ld [wcf10], a
+	ld [wNPCMovementScriptFunctionNum], a
 	ld a, $3
-	ld [wcc57], a
+	ld [wNPCMovementScriptPointerTableNum], a
 	ldh a, [$b8]
-	ld [wcc58], a
+	ld [wNPCMovementScriptBank], a
 	ld a, $5
-	ld [wcf13], a
-	call Func_32f4
+	ld [wSpriteIndex], a
+	call GetSpritePosition2
 	ld a, $4
 	ld [W_PEWTERCITYCURSCRIPT], a
 	jp TextScriptEnd

scripts/pewtergym.asm

@@ -31,7 +31,7 @@ PewterGymScript_5c3bf: ; 5c3bf (17:43bf)
 
 PewterGymScriptPointers: ; 5c3ca (17:43ca)
 	dw CheckFightingMapTrainers
-	dw Func_324c
+	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
 	dw PewterGymScript3
 
@@ -126,9 +126,9 @@ PewterGymText1: ; 5c44e (17:444e)
 	set 7, [hl]
 	ld hl, PewterGymText_5c4bc
 	ld de, PewterGymText_5c4bc
-	call PreBattleSaveRegisters
+	call SaveEndBattleTextPointers
 	ldh a, [$8c]
-	ld [wcf13], a
+	ld [wSpriteIndex], a
 	call EngageMapTrainer
 	call InitBattleEnemyParameters
 	ld a, $1

scripts/pewtermart.asm

@@ -1,7 +1,7 @@
 PewterMartScript: ; 74cad (1d:4cad)
 	call EnableAutoTextBoxDrawing
 	ld a, $1
-	ld [wcf0c], a
+	ld [wAutoTextBoxDrawingControl], a
 	ret
 
 PewterMartTextPointers: ; 74cb6 (1d:4cb6)

scripts/pewterpokecenter.asm

@@ -18,7 +18,7 @@ PewterPokecenterText2: ; 5c596 (17:4596)
 PewterPokecenterText3: ; 5c59b (17:459b)
 	db $8
 	ld a, $1
-	ld [wcc3c], a
+	ld [wDoNotWaitForButtonPressAfterDisplayingText], a
 	ld hl, PewterPokecenterText5
 	call PrintText
 	ld a, $ff
@@ -61,7 +61,7 @@ PewterPokecenterText3: ; 5c59b (17:459b)
 	jr nz, .asm_5c5d1 ; 0x5c5f6 $d9
 	ld c, $30
 	call DelayFrames
-	call Func_2307
+	call PlayDefaultMusic
 	jp TextScriptEnd
 
 PewterPokecenterText5: ; 5c603 (17:4603)

scripts/pokemontower2.asm

@@ -46,7 +46,7 @@ PokemonTower2Script0: ; 6050f (18:450f)
 	ld [$ff8c], a
 	ld a, b
 	ld [$ff8d], a
-	call Func_34a6
+	call SetSpriteFacingDirectionAndDelay
 	ld a, $1
 	ld [$ff8c], a
 	call DisplayTextID
@@ -104,7 +104,7 @@ PokemonTower2Script2: ; 605bb (18:45bb)
 	predef HideObject
 	xor a
 	ld [wJoyIgnore], a
-	call Func_2307
+	call PlayDefaultMusic
 	ld a, $0
 	ld [W_POKEMONTOWER2CURSCRIPT], a
 	ld [W_CURMAPSCRIPT], a
@@ -130,7 +130,7 @@ PokemonTower2Text1: ; 605df (18:45df)
 	set 7, [hl]
 	ld hl, PokemonTower2Text_60632
 	ld de, PokemonTower2Text_60637 ; XXX $4637
-	call PreBattleSaveRegisters
+	call SaveEndBattleTextPointers
 	ld a, SONY2 + $c8
 	ld [W_CUROPPONENT], a
 

scripts/pokemontower3.asm

@@ -9,7 +9,7 @@ PokemonTower3Script: ; 606cc (18:46cc)
 
 PokemonTower3ScriptPointers: ; 606df (18:46df)
 	dw CheckFightingMapTrainers
-	dw Func_324c
+	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
 
 PokemonTower3TextPointers: ; 606e5 (18:46e5)

scripts/pokemontower4.asm

@@ -9,7 +9,7 @@ PokemonTower4Script: ; 607f6 (18:47f6)
 
 PokemonTower4ScriptPointers: ; 60809 (18:4809)
 	dw CheckFightingMapTrainers
-	dw Func_324c
+	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
 
 PokemonTower4TextPointers: ; 6080f (18:480f)

scripts/pokemontower5.asm

@@ -9,7 +9,7 @@ PokemonTower5Script: ; 60932 (18:4932)
 
 PokemonTower5ScriptPointers: ; 60945 (18:4945)
 	dw PokemonTower5Script0
-	dw Func_324c
+	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
 
 PokemonTower5Script0: ; 6094b (18:494b)
@@ -33,10 +33,10 @@ PokemonTower5Script0: ; 6094b (18:494b)
 	ld hl, wd72e
 	set 4, [hl]
 	predef HealParty
-	call GBFadeOut2
+	call GBFadeOutToWhite
 	call Delay3
 	call Delay3
-	call GBFadeIn2
+	call GBFadeInFromWhite
 	ld a, $7
 	ld [H_DOWNARROWBLINKCNT2], a ; $ff8c
 	call DisplayTextID

scripts/pokemontower6.asm

@@ -16,7 +16,7 @@ PokemonTower6Script_60b02: ; 60b02 (18:4b02)
 
 PokemonTower6ScriptPointers: ; 60b0d (18:4b0d)
 	dw PokemonTower6Script0
-	dw Func_324c
+	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
 	dw PokemonTower6Script3
 	dw PokemonTower6Script4
@@ -57,7 +57,7 @@ PokemonTower6Script4: ; 60b48 (18:4b48)
 	call UpdateSprites
 	ld a, $f0
 	ld [wJoyIgnore], a
-	ld a, [wcf0b]
+	ld a, [wBattleResult]
 	and a
 	jr nz, .asm_60b82
 	ld hl, wd768
@@ -73,12 +73,12 @@ PokemonTower6Script4: ; 60b48 (18:4b48)
 	ret
 .asm_60b82
 	ld a, $1
-	ld [wcd38], a
+	ld [wSimulatedJoypadStatesIndex], a
 	ld a, $10
-	ld [wccd3], a
+	ld [wSimulatedJoypadStatesEnd], a
 	xor a
 	ld [wSpriteStateData2 + $06], a
-	ld [wcd3b], a
+	ld [wOverrideSimulatedJoypadStatesMask], a
 	ld hl, wd730
 	set 7, [hl]
 	ld a, $3
@@ -87,7 +87,7 @@ PokemonTower6Script4: ; 60b48 (18:4b48)
 	ret
 
 PokemonTower6Script3: ; 60ba1 (18:4ba1)
-	ld a, [wcd38]
+	ld a, [wSimulatedJoypadStatesIndex]
 	and a
 	ret nz
 	call Delay3

scripts/pokemontower7.asm

@@ -16,7 +16,7 @@ PokemonTower7Script_60d18: ; 60d18 (18:4d18)
 
 PokemonTower7ScriptPointers: ; 60d23 (18:4d23)
 	dw CheckFightingMapTrainers
-	dw Func_324c
+	dw DisplayEnemyTrainerTextAndStartBattle
 	dw PokemonTower7Script2
 	dw PokemonTower7Script3
 	dw PokemonTower7Script4
@@ -30,7 +30,7 @@ PokemonTower7Script2: ; 60d23 (18:4d23)
 	call EndTrainerBattle
 	ld a, $f0
 	ld [wJoyIgnore], a
-	ld a, [wcf13]
+	ld a, [wSpriteIndex]
 	ld [H_DOWNARROWBLINKCNT2], a ; $ff8c
 	call DisplayTextID
 	call PokemonTower7Script_60db6
@@ -44,7 +44,7 @@ PokemonTower7Script3: ; 60d56 (18:4d56)
 	bit 0, a
 	ret nz
 	ld hl, W_MISSABLEOBJECTLIST
-	ld a, [wcf13]
+	ld a, [wSpriteIndex]
 	ld b, a
 .missableObjectsListLoop
 	ld a, [hli]
@@ -55,7 +55,7 @@ PokemonTower7Script3: ; 60d56 (18:4d56)
 	predef HideObject
 	xor a
 	ld [wJoyIgnore], a
-	ld [wcf13], a
+	ld [wSpriteIndex], a
 	ld [wTrainerHeaderFlagBit], a
 	ld [wda38], a
 	ld a, $0
@@ -74,7 +74,7 @@ PokemonTower7Script4: ; 60d86 (18:4d86)
 	ld a, $95
 	ld [H_DOWNARROWBLINKCNT1], a ; $ff8b
 	ld a, $1
-	ld [wd42f], a
+	ld [wDestinationWarpID], a
 	ld a, LAVENDER_TOWN
 	ld [wLastMap], a
 	ld hl, wd72d
@@ -86,7 +86,7 @@ PokemonTower7Script4: ; 60d86 (18:4d86)
 
 PokemonTower7Script_60db6: ; 60db6 (18:4db6)
 	ld hl, CoordsData_60de3 ; $4de3
-	ld a, [wcf13]
+	ld a, [wSpriteIndex]
 	dec a
 	swap a
 	ld d, $0
@@ -106,7 +106,7 @@ PokemonTower7Script_60db6: ; 60db6 (18:4db6)
 	ld a, [hli]
 	ld d, [hl]
 	ld e, a
-	ld a, [wcf13]
+	ld a, [wSpriteIndex]
 	ld [H_DOWNARROWBLINKCNT2], a ; $ff8c
 	jp MoveSprite
 .asm_60dde

scripts/powerplant.asm

@@ -9,7 +9,7 @@ PowerPlantScript: ; 1e2c6 (7:62c6)
 
 PowerPlantScriptPointers: ; 1e2d9 (7:62d9)
 	dw CheckFightingMapTrainers
-	dw Func_324c
+	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
 
 PowerPlantTextPointers: ; 1e2df (7:62df)

scripts/redshouse1f.asm

@@ -25,7 +25,7 @@ MomWakeUpText: ; 48185 (12:4185)
 MomHealPokemon: ; 4818a (12:418a)
 	ld hl, MomHealText1
 	call PrintText
-	call GBFadeOut2
+	call GBFadeOutToWhite
 	call ReloadMapData
 	predef HealParty
 	ld a, MUSIC_PKMN_HEALED
@@ -38,7 +38,7 @@ MomHealPokemon: ; 4818a (12:418a)
 	ld a, [wd35b]
 	ld [wc0ee], a
 	call PlaySound
-	call GBFadeIn2
+	call GBFadeInFromWhite
 	ld hl, MomHealText2
 	jp PrintText
 

scripts/rockethideout1.asm

@@ -30,11 +30,11 @@ RocketHideout1Script_44be0: ; 44be0 (11:4be0)
 .asm_44c03
 	ld [wd09f], a
 	ld bc, $080c
-	predef_jump Func_ee9e
+	predef_jump ReplaceTileBlock
 
 RocketHideout1ScriptPointers: ; 44c0e (11:4c0e)
 	dw CheckFightingMapTrainers
-	dw Func_324c
+	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
 
 RocketHideout1TextPointers: ; 44c14 (11:4c14)

scripts/rockethideout2.asm

@@ -9,7 +9,7 @@ RocketHideout2Script: ; 44e27 (11:4e27)
 
 RocketHideout2ScriptPointers: ; 44e3a (11:4e3a)
 	dw RocketHideout2Script0
-	dw Func_324c
+	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
 	dw RocketHideout2Script3
 
@@ -19,12 +19,12 @@ RocketHideout2Script0: ; 44e42 (11:4e42)
 	ld a, [W_XCOORD]
 	ld c, a
 	ld hl, RocketHideout2ArrowTilePlayerMovement
-	call Func_3442
+	call DecodeArrowMovementRLE
 	cp $ff
 	jp z, CheckFightingMapTrainers
 	ld hl, wd736
 	set 7, [hl]
-	call Func_3486
+	call StartSimulatingJoypadStates
 	ld a, (SFX_02_52 - SFX_Headers_02) / 3
 	call PlaySound
 	ld a, $ff
@@ -306,7 +306,7 @@ RocketHideout2ArrowMovement36: ; 44fbb (11:4fbb)
 	db $FF
 
 RocketHideout2Script3: ; 44fc2 (11:4fc2)
-	ld a, [wcd38]
+	ld a, [wSimulatedJoypadStatesIndex]
 	and a
 	jr nz, LoadSpinnerArrowTiles
 	xor a
@@ -333,7 +333,7 @@ LoadSpinnerArrowTiles: ; 44fd7 (11:4fd7)
 	jr z, .asm_44ff6
 	ld hl, GymSpinnerArrows ; $5053
 .asm_44ff6
-	ld a, [wcd38]
+	ld a, [wSimulatedJoypadStatesIndex]
 	bit 0, a
 	jr nz, .asm_45001
 	ld de, $18

scripts/rockethideout3.asm

@@ -9,7 +9,7 @@ RocketHideout3Script: ; 45225 (11:5225)
 
 RocketHideout3ScriptPointers: ; 45238 (11:5238)
 	dw RocketHideout3Script0
-	dw Func_324c
+	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
 	dw RocketHideout3Script3
 
@@ -19,12 +19,12 @@ RocketHideout3Script0: ; 45240 (11:5240)
 	ld a, [W_XCOORD]
 	ld c, a
 	ld hl, RocketHideout3ArrowTilePlayerMovement
-	call Func_3442
+	call DecodeArrowMovementRLE
 	cp $ff
 	jp z, CheckFightingMapTrainers
 	ld hl, wd736
 	set 7, [hl]
-	call Func_3486
+	call StartSimulatingJoypadStates
 	ld a, (SFX_02_52 - SFX_Headers_02) / 3
 	call PlaySound
 	ld a, $ff
@@ -136,7 +136,7 @@ RocketHideout3ArrowMovement12: ; 452e1 (11:52e1)
 	db $FF
 
 RocketHideout3Script3 ; 452e4 (11:452e4)
-	ld a, [wcd38]
+	ld a, [wSimulatedJoypadStatesIndex]
 	and a
 	jp nz, LoadSpinnerArrowTiles
 	xor a

scripts/rockethideout4.asm

@@ -31,7 +31,7 @@ RocketHideout4Script_45473: ; 45473 (11:5473)
 .asm_45498
 	ld [wd09f], a
 	ld bc, $050c
-	predef_jump Func_ee9e
+	predef_jump ReplaceTileBlock
 
 RocketHideout4Script_454a3: ; 454a3 (11:54a3)
 	xor a
@@ -42,7 +42,7 @@ RocketHideout4Script_454a3: ; 454a3 (11:54a3)
 
 RocketHideout4ScriptPointers: ; 454ae (11:54ae)c
 	dw CheckFightingMapTrainers
-	dw Func_324c
+	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
 	dw RocketHideout4Script3
 
@@ -58,7 +58,7 @@ RocketHideout4Script3: ; 454b6 (11:54b6)
 	ld a, $a
 	ld [H_SPRITEHEIGHT], a
 	call DisplayTextID
-	call GBFadeIn1
+	call GBFadeOutToBlack
 	ld a, $83
 	ld [wcc4d], a
 	predef HideObject
@@ -66,7 +66,7 @@ RocketHideout4Script3: ; 454b6 (11:54b6)
 	ld [wcc4d], a
 	predef ShowObject
 	call UpdateSprites
-	call GBFadeOut1
+	call GBFadeInFromBlack
 	xor a
 	ld [wJoyIgnore], a
 	ld hl, wd126
@@ -130,9 +130,9 @@ RocketHideout4Text1: ; 4553a (11:553a)
 	set 7, [hl]
 	ld hl, RocketHideout4Text_4557f
 	ld de, RocketHideout4Text_4557f
-	call PreBattleSaveRegisters
+	call SaveEndBattleTextPointers
 	ldh a, [$8c]
-	ld [wcf13], a
+	ld [wSpriteIndex], a
 	call EngageMapTrainer
 	call InitBattleEnemyParameters
 	xor a

scripts/rockethideoutelevator.asm

@@ -9,13 +9,13 @@ RocketHideoutElevatorScript: ; 45710 (11:5710)
 	res 7, [hl]
 	call nz, RocketHideoutElevatorScript_4575f
 	xor a
-	ld [wcf0c], a
+	ld [wAutoTextBoxDrawingControl], a
 	inc a
-	ld [wcc3c], a
+	ld [wDoNotWaitForButtonPressAfterDisplayingText], a
 	ret
 
 RocketHideoutElevatorScript_4572c: ; 4572c (11:572c)
-	ld hl, wd3af
+	ld hl, wWarpEntries
 	ld a, [wd73b]
 	ld b, a
 	ld a, [wd73c]

scripts/rocktunnel1.asm

@@ -9,7 +9,7 @@ RockTunnel1Script: ; 444dc (11:44dc)
 
 RockTunnel1ScriptPointers: ; 444ef (11:44ef)
 	dw CheckFightingMapTrainers
-	dw Func_324c
+	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
 
 RockTunnel1TextPointers: ; 444f5 (11:44f5)

scripts/rocktunnel2.asm

@@ -9,7 +9,7 @@ RockTunnel2Script: ; 45feb (11:5feb)
 
 RockTunnel2ScriptPointers: ; 45ffe (11:5ffe)
 	dw CheckFightingMapTrainers
-	dw Func_324c
+	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
 
 RockTunnel2TextPointers: ; 46004 (11:6004)

scripts/route10.asm

@@ -9,7 +9,7 @@ Route10Script: ; 59336 (16:5336)
 
 Route10ScriptPointers: ; 59349 (16:5349)
 	dw CheckFightingMapTrainers
-	dw Func_324c
+	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
 
 Route10TextPointers: ; 5934f (16:534f)

scripts/route11.asm

@@ -9,7 +9,7 @@ Route11Script: ; 5944c (16:544c)
 
 Route11ScriptPointers: ; 5945f (16:545f)
 	dw CheckFightingMapTrainers
-	dw Func_324c
+	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
 
 Route11TextPointers: ; 59465 (16:5465)

scripts/route12.asm

@@ -16,7 +16,7 @@ Route12Script_59606: ; 59606 (16:5606)
 
 Route12ScriptPointers: ; 59611 (16:5611)
 	dw Route12Script0
-	dw Func_324c
+	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
 	dw Route12Script3
 
@@ -47,7 +47,7 @@ Route12Script3: ; 5964c (16:564c)
 	cp $ff
 	jr z, Route12Script_59606
 	call UpdateSprites
-	ld a, [wcf0b]
+	ld a, [wBattleResult]
 	cp $2
 	jr z, .asm_59664
 	ld a, $e

scripts/route12gateupstairs.asm

@@ -75,5 +75,5 @@ Route12GateUpstairsScript_495c9: ; 495c9 (12:55c9)
 	call PrintText
 	xor a
 .asm_495d8
-	ld [wcc3c], a
+	ld [wDoNotWaitForButtonPressAfterDisplayingText], a
 	jp TextScriptEnd

scripts/route13.asm

@@ -9,7 +9,7 @@ Route13Script: ; 5581e (15:581e)
 
 Route13ScriptPointers: ; 55831 (15:5831)
 	dw CheckFightingMapTrainers
-	dw Func_324c
+	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
 
 Route13TextPointers: ; 55837 (15:5837)

scripts/route14.asm

@@ -9,7 +9,7 @@ Route14Script: ; 559d3 (15:59d3)
 
 Route14ScriptPointers: ; 559e6 (15:59e6)
 	dw CheckFightingMapTrainers
-	dw Func_324c
+	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
 
 Route14TextPointers: ; 559ec (15:59ec)

scripts/route15.asm

@@ -9,7 +9,7 @@ Route15Script: ; 597ae (16:57ae)
 
 Route15ScriptPointers: ; 597c1 (16:57c1)
 	dw CheckFightingMapTrainers
-	dw Func_324c
+	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
 
 Route15TextPointers: ; 597c7 (16:57c7)

scripts/route16.asm

@@ -16,7 +16,7 @@ Route16Script_59946: ; 59946 (16:5946)
 
 Route16ScriptPointers: ; 59951 (16:5951)
 	dw Route16Script0
-	dw Func_324c
+	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
 	dw Route16Script3
 
@@ -48,7 +48,7 @@ Route16Script3: ; 5998f (16:598f)
 	cp $ff
 	jp z, Route16Script_59946
 	call UpdateSprites
-	ld a, [wcf0b]
+	ld a, [wBattleResult]
 	cp $2
 	jr z, .asm_599a8
 	ld a, $b

scripts/route16gate.asm

@@ -28,13 +28,13 @@ Route16GateScript0: ; 496d7 (12:56d7)
 	jr z, .asm_4970e ; 0x496f1 $1b
 	ld a, [wWhichTrade]
 	dec a
-	ld [wcd38], a
+	ld [wSimulatedJoypadStatesIndex], a
 	ld b, $0
 	ld c, a
 	ld a, $40
-	ld hl, wccd3
+	ld hl, wSimulatedJoypadStatesEnd
 	call FillMemory
-	call Func_3486
+	call StartSimulatingJoypadStates
 	ld a, $1
 	ld [W_ROUTE16GATECURSCRIPT], a
 	ret
@@ -51,7 +51,7 @@ CoordsData_49714: ; 49714 (12:5714)
 	db $FF
 
 Route16GateScript1: ; 4971d (12:571d)
-	ld a, [wcd38]
+	ld a, [wSimulatedJoypadStatesIndex]
 	and a
 	ret nz
 	ld a, $f0
@@ -62,16 +62,16 @@ Route16GateScript2: ; 49727 (12:5727)
 	ld [H_SPRITEHEIGHT], a
 	call DisplayTextID
 	ld a, $1
-	ld [wcd38], a
+	ld [wSimulatedJoypadStatesIndex], a
 	ld a, $10
-	ld [wccd3], a
-	call Func_3486
+	ld [wSimulatedJoypadStatesEnd], a
+	call StartSimulatingJoypadStates
 	ld a, $3
 	ld [W_ROUTE16GATECURSCRIPT], a
 	ret
 
 Route16GateScript3: ; 49741 (12:5741)
-	ld a, [wcd38]
+	ld a, [wSimulatedJoypadStatesIndex]
 	and a
 	ret nz
 	xor a

scripts/route17.asm

@@ -9,7 +9,7 @@ Route17Script: ; 55b7a (15:5b7a)
 
 Route17ScriptPointers: ; 55b8d (15:5b8d)
 	dw CheckFightingMapTrainers
-	dw Func_324c
+	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
 
 Route17TextPointers: ; 55b93 (15:5b93)

scripts/route18.asm

@@ -9,7 +9,7 @@ Route18Script: ; 59ac7 (16:5ac7)
 
 Route18ScriptPointers: ; 59ada (16:5ada)
 	dw CheckFightingMapTrainers
-	dw Func_324c
+	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
 
 Route18TextPointers: ; 59ae0 (16:5ae0)

scripts/route18gate.asm

@@ -28,13 +28,13 @@ Route18GateScript0: ; 4988f (12:588f)
 	jr z, .asm_498c6 ; 0x498a9 $1b
 	ld a, [wWhichTrade]
 	dec a
-	ld [wcd38], a
+	ld [wSimulatedJoypadStatesIndex], a
 	ld b, $0
 	ld c, a
 	ld a, $40
-	ld hl, wccd3
+	ld hl, wSimulatedJoypadStatesEnd
 	call FillMemory
-	call Func_3486
+	call StartSimulatingJoypadStates
 	ld a, $1
 	ld [W_ROUTE18GATECURSCRIPT], a
 	ret
@@ -51,7 +51,7 @@ CoordsData_498cc: ; 498cc (12:58cc)
 	db $FF
 
 Route18GateScript1: ; 498d5 (12:58d5)
-	ld a, [wcd38]
+	ld a, [wSimulatedJoypadStatesIndex]
 	and a
 	ret nz
 	ld a, $f0
@@ -62,16 +62,16 @@ Route18GateScript2: ; 498df (12:58df)
 	ld [H_SPRITEHEIGHT], a
 	call DisplayTextID
 	ld a, $1
-	ld [wcd38], a
+	ld [wSimulatedJoypadStatesIndex], a
 	ld a, $10
-	ld [wccd3], a
-	call Func_3486
+	ld [wSimulatedJoypadStatesEnd], a
+	call StartSimulatingJoypadStates
 	ld a, $3
 	ld [W_ROUTE18GATECURSCRIPT], a
 	ret
 
 Route18GateScript3: ; 498f9 (12:58f9)
-	ld a, [wcd38]
+	ld a, [wSimulatedJoypadStatesIndex]
 	and a
 	ret nz
 	xor a

scripts/route19.asm

@@ -9,7 +9,7 @@ Route19Script: ; 55d44 (15:5d44)
 
 Route19ScriptPointers: ; 55d57 (15:5d57)
 	dw CheckFightingMapTrainers
-	dw Func_324c
+	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
 
 Route19TextPointers: ; 55d5d (15:5d5d)

scripts/route20.asm

@@ -58,7 +58,7 @@ Route20Script_50d14: ; 50d14 (14:4d14)
 
 Route20ScriptPointers: ; 50d1c (14:4d1c)
 	dw CheckFightingMapTrainers
-	dw Func_324c
+	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
 
 Route20TextPointers: ; 50d22 (14:4d22)

scripts/route21.asm

@@ -9,7 +9,7 @@ Route21Script: ; 55eeb (15:5eeb)
 
 Route21ScriptPointers: ; 55efe (15:5efe)
 	dw CheckFightingMapTrainers
-	dw Func_324c
+	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
 
 Route21TextPointers: ; 55f04 (15:5f04)

scripts/route22.asm

@@ -45,7 +45,7 @@ Route22MoveRivalSprite: ; 50ee6 (14:4ee6)
 	call MoveSprite
 	ld a, $c
 	ld [$ff8d], a
-	jp Func_34a6
+	jp SetSpriteFacingDirectionAndDelay
 
 Route22RivalMovementData: ; 50efb (14:4efb)
 	db $C0,$C0,$C0,$C0,$FF ; move right 4 times
@@ -83,7 +83,7 @@ Route22Script0: ; 50f00 (14:4f00)
 	xor a
 	ld [wcd50], a
 	predef EmotionBubble
-	ld a, [wd700]
+	ld a, [wWalkBikeSurfState]
 	and a
 	jr z, .asm_50f4e ; 0x50f44 $8
 	ld a, $ff
@@ -117,7 +117,7 @@ Route22Script1: ; 50f62 (14:4f62)
 	ld [$ff8d], a
 	ld a, $1
 	ld [$ff8c], a
-	call Func_34a6
+	call SetSpriteFacingDirectionAndDelay
 	xor a
 	ld [wJoyIgnore], a
 	ld a, $1
@@ -128,7 +128,7 @@ Route22Script1: ; 50f62 (14:4f62)
 	set 7, [hl]
 	ld hl, Route22RivalDefeatedText1
 	ld de, Route22Text_511bc
-	call PreBattleSaveRegisters
+	call SaveEndBattleTextPointers
 	ld a, SONY1 + $c8
 	ld [W_CUROPPONENT], a
 	ld hl, StarterMons_50faf ; $4faf
@@ -158,7 +158,7 @@ Route22Script2: ; 50fb5 (14:4fb5)
 	ld [$ff8d], a
 	ld a, $1
 	ld [$ff8c], a
-	call Func_34a6
+	call SetSpriteFacingDirectionAndDelay
 	ld a, $f0
 	ld [wJoyIgnore], a
 	ld hl, wd7eb
@@ -208,7 +208,7 @@ Route22Script3: ; 5102a (14:502a)
 	ld a, $22
 	ld [wcc4d], a
 	predef HideObject
-	call Func_2307
+	call PlayDefaultMusic
 	ld hl, wd7eb
 	res 0, [hl]
 	res 7, [hl]
@@ -222,7 +222,7 @@ Route22Script_5104e: ; 5104e (14:504e)
 	xor a
 	ld [wcd50], a
 	predef EmotionBubble
-	ld a, [wd700]
+	ld a, [wWalkBikeSurfState]
 	and a
 	jr z, .skipYVisibilityTesta
 	ld a, $ff
@@ -259,7 +259,7 @@ Route22Script4: ; 51087 (14:5087)
 	ld a, $c
 .asm_510a8
 	ld [$ff8d], a
-	call Func_34a6
+	call SetSpriteFacingDirectionAndDelay
 	xor a
 	ld [wJoyIgnore], a
 	ld a, $2
@@ -270,7 +270,7 @@ Route22Script4: ; 51087 (14:5087)
 	set 7, [hl]
 	ld hl, Route22RivalDefeatedText2 ; $51cb
 	ld de, Route22Text_511d0 ; $51d0
-	call PreBattleSaveRegisters
+	call SaveEndBattleTextPointers
 	ld a, SONY2 + $c8
 	ld [W_CUROPPONENT], a ; wd059
 	ld hl, StarterMons_510d9 ; $50d9
@@ -303,7 +303,7 @@ Route22Script5: ; 510df (14:50df)
 	ld a, $c
 .asm_51102
 	ld [$ff8d], a
-	call Func_34a6
+	call SetSpriteFacingDirectionAndDelay
 	ld a, $f0
 	ld [wJoyIgnore], a
 	ld hl, wd7eb
@@ -353,7 +353,7 @@ Route22Script6: ; 51151 (14:5151)
 	ld a, $23
 	ld [wcc4d], a
 	predef HideObject
-	call Func_2307
+	call PlayDefaultMusic
 	ld hl, wd7eb
 	res 1, [hl]
 	res 7, [hl]

scripts/route22gate.asm

@@ -34,15 +34,15 @@ Route22GateScriptCoords: ; 1e6b5 (7:66b5)
 
 Route22GateScript_1e6ba: ; 1e6ba (7:66ba)
 	ld a, $1
-	ld [wcd38], a
+	ld [wSimulatedJoypadStatesIndex], a
 	ld a, $80
-	ld [wccd3], a
+	ld [wSimulatedJoypadStatesEnd], a
 	ld [wSpriteStateData1 + 9], a
 	ld [wJoyIgnore], a
-	jp Func_3486
+	jp StartSimulatingJoypadStates
 
 Route22GateScript1: ; 1e6cd (7:66cd)
-	ld a, [wcd38]
+	ld a, [wSimulatedJoypadStatesIndex]
 	and a
 	ret nz
 	xor a

scripts/route23.asm

@@ -118,16 +118,16 @@ CascadeBadgeText: ; 512cb (14:52cb)
 
 Route23Script_512d8: ; 512d8 (14:52d8)
 	ld a, $1
-	ld [wcd38], a
+	ld [wSimulatedJoypadStatesIndex], a
 	ld a, $80
-	ld [wccd3], a
+	ld [wSimulatedJoypadStatesEnd], a
 	xor a
 	ld [wSpriteStateData1 + 9], a
 	ld [wJoyIgnore], a
-	jp Func_3486
+	jp StartSimulatingJoypadStates
 
 Route23Script1: ; 512ec (14:52ec)
-	ld a, [wcd38]
+	ld a, [wSimulatedJoypadStatesIndex]
 	and a
 	ret nz
 Route23Script2: ; 512f1 (14:52f1)

scripts/route24.asm

@@ -16,7 +16,7 @@ Route24Script_513c0: ; 513c0 (14:53c0)
 
 Route24ScriptPointers: ; 513cb (14:53cb)
 	dw Route24Script0
-	dw Func_324c
+	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
 	dw Route24Script3
 	dw Route24Script4
@@ -38,10 +38,10 @@ Route24Script0: ; 513d5 (14:53d5)
 	res 1, [hl]
 	ret z
 	ld a, $80
-	ld [wccd3], a
+	ld [wSimulatedJoypadStatesEnd], a
 	ld a, $1
-	ld [wcd38], a
-	call Func_3486
+	ld [wSimulatedJoypadStatesIndex], a
+	call StartSimulatingJoypadStates
 	ld a, $4
 	ld [W_ROUTE24CURSCRIPT], a
 	ld [W_CURMAPSCRIPT], a
@@ -51,7 +51,7 @@ CoordsData_5140e: ; 5140e (14:540e)
 	db $0F,$0A,$FF
 
 Route24Script4: ; 51411 (14:5411)
-	ld a, [wcd38]
+	ld a, [wSimulatedJoypadStatesIndex]
 	and a
 	ret nz
 	call Delay3
@@ -169,9 +169,9 @@ Route24Text1: ; 514a4 (14:54a4)
 	set 7, [hl]
 	ld hl, Route24Text_5152b
 	ld de, Route24Text_5152b
-	call PreBattleSaveRegisters
+	call SaveEndBattleTextPointers
 	ld a, [$ff8c]
-	ld [wcf13], a
+	ld [wSpriteIndex], a
 	call EngageMapTrainer
 	call InitBattleEnemyParameters
 	xor a

scripts/route25.asm

@@ -38,7 +38,7 @@ Route25Script_515e1: ; 515e1 (14:55e1)
 
 Route25ScriptPointers: ; 51622 (14:5622)
 	dw CheckFightingMapTrainers
-	dw Func_324c
+	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
 
 Route25TextPointers: ; 51628 (14:5628)

scripts/route3.asm

@@ -9,7 +9,7 @@ Route3Script: ; 554f8 (15:54f8)
 
 Route3ScriptPointers: ; 5550b (15:550b)
 	dw CheckFightingMapTrainers
-	dw Func_324c
+	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
 
 Route3TextPointers: ; 55511 (15:5511)

scripts/route4.asm

@@ -9,7 +9,7 @@ Route4Script: ; 55658 (15:5658)
 
 Route4ScriptPointers: ; 5566b (15:566b)
 	dw CheckFightingMapTrainers
-	dw Func_324c
+	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
 
 Route4TextPointers: ; 55671 (15:5671)

scripts/route5gate.asm

@@ -10,10 +10,10 @@ Route5GateScriptPointers: ; 1df3f (7:5f3f)
 
 Route5GateScript_1df43: ; 1df43 (7:5f43)
 	ld a, $40
-	ld [wccd3], a
+	ld [wSimulatedJoypadStatesEnd], a
 	ld a, $1
-	ld [wcd38], a
-	jp Func_3486
+	ld [wSimulatedJoypadStatesIndex], a
+	jp StartSimulatingJoypadStates
 
 Route5GateScript0: ; 1df50 (7:5f50)
 	ld a, [wd728]
@@ -51,7 +51,7 @@ CoordsData_1df8f: ; 1df8f (7:5f8f)
 	db $ff
 
 Route5GateScript1: ; 1df94 (7:5f94)
-	ld a, [wcd38]
+	ld a, [wSimulatedJoypadStatesIndex]
 	and a
 	ret nz
 	call Delay3

scripts/route6.asm

@@ -9,7 +9,7 @@ Route6Script: ; 590b0 (16:50b0)
 
 Route6ScriptPointers: ; 590c3 (16:50c3)
 	dw CheckFightingMapTrainers
-	dw Func_324c
+	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
 
 Route6TextPointers: ; 590c9 (16:50c9)

scripts/route6gate.asm

@@ -43,7 +43,7 @@ CoordsData_1e08c: ; 1e08c (7:608c)
 	db $02,$04,$FF
 
 Route6GateScript1: ; 1e091 (7:6091)
-	ld a, [wcd38]
+	ld a, [wSimulatedJoypadStatesIndex]
 	and a
 	ret nz
 	call Delay3
@@ -56,12 +56,12 @@ Route6GateScript_1e0a1: ; 1e0a1 (7:60a1)
 	ld hl, wd730
 	set 7, [hl]
 	ld a, $80
-	ld [wccd3], a
+	ld [wSimulatedJoypadStatesEnd], a
 	ld a, $1
-	ld [wcd38], a
+	ld [wSimulatedJoypadStatesIndex], a
 	xor a
 	ld [wSpriteStateData2 + $06], a
-	ld [wcd3b], a
+	ld [wOverrideSimulatedJoypadStatesMask], a
 	ret
 
 Route6GateTextPointers: ; 1e0b8 (7:60b8)

scripts/route7gate.asm

@@ -13,12 +13,12 @@ Route7GateScript_1e111: ; 1e111 (7:6111)
 	ld hl, wd730
 	set 7, [hl]
 	ld a, $20
-	ld [wccd3], a
+	ld [wSimulatedJoypadStatesEnd], a
 	ld a, $1
-	ld [wcd38], a
+	ld [wSimulatedJoypadStatesIndex], a
 	xor a
 	ld [wSpriteStateData2 + $06], a
-	ld [wcd3b], a
+	ld [wOverrideSimulatedJoypadStatesMask], a
 	ret
 
 Route7GateScript0: ; 1e128 (7:6128)
@@ -57,7 +57,7 @@ CoordsData_1e167: ; 1e167 (7:6167)
 	db $ff
 
 Route7GateScript1: ; 1e16c (7:616c)
-	ld a, [wcd38]
+	ld a, [wSimulatedJoypadStatesIndex]
 	and a
 	ret nz
 	call Delay3

scripts/route8.asm

@@ -9,7 +9,7 @@ Route8Script: ; 591b6 (16:51b6)
 
 Route8ScriptPointers: ; 591c9 (16:51c9)
 	dw CheckFightingMapTrainers
-	dw Func_324c
+	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
 
 Route8TextPointers: ; 591cf (16:51cf)

scripts/route8gate.asm

@@ -12,12 +12,12 @@ Route8GateScript_1e1d7: ; 1e1d7 (7:61d7)
 	ld hl, wd730
 	set 7, [hl]
 	ld a, $10
-	ld [wccd3], a
+	ld [wSimulatedJoypadStatesEnd], a
 	ld a, $1
-	ld [wcd38], a
+	ld [wSimulatedJoypadStatesIndex], a
 	xor a
 	ld [wSpriteStateData2 + $06], a
-	ld [wcd3b], a
+	ld [wOverrideSimulatedJoypadStatesMask], a
 	ret
 
 Route8GateScript0: ; 1e1ee (7:61ee)
@@ -55,7 +55,7 @@ CoordsData_1e22c: ; 1e22c (7:622c)
 	db $ff
 
 Route8GateScript1: ; 1e231 (7:6231)
-	ld a, [wcd38]
+	ld a, [wSimulatedJoypadStatesIndex]
 	and a
 	ret nz
 	call Delay3

scripts/route9.asm

@@ -9,7 +9,7 @@ Route9Script: ; 556bc (15:56bc)
 
 Route9ScriptPointers: ; 556cf (15:56cf)
 	dw CheckFightingMapTrainers
-	dw Func_324c
+	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
 
 Route9TextPointers: ; 556d5 (15:56d5)

scripts/safarizoneentrance.asm

@@ -121,14 +121,14 @@ SafariZoneEntranceScript_752a3: ; 752a3 (1d:52a3)
 	push af
 	ld b, $0
 	ld a, c
-	ld [wcd38], a
-	ld hl, wccd3
+	ld [wSimulatedJoypadStatesIndex], a
+	ld hl, wSimulatedJoypadStatesEnd
 	pop af
 	call FillMemory
-	jp Func_3486
+	jp StartSimulatingJoypadStates
 
 SafariZoneEntranceScript_752b4: ; 752b4 (1d:52b4)
-	ld a, [wcd38]
+	ld a, [wSimulatedJoypadStatesIndex]
 	and a
 	ret
 

scripts/saffrongym.asm

@@ -31,7 +31,7 @@ SaffronGymText_5d048: ; 5d048 (17:5048)
 
 SaffronGymScriptPointers: ; 5d053 (17:5053)
 	dw CheckFightingMapTrainers
-	dw Func_324c
+	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
 	dw SaffronGymScript3
 
@@ -178,9 +178,9 @@ SaffronGymText1: ; 5d118 (17:5118)
 	set 7, [hl]
 	ld hl, SaffronGymText_5d167
 	ld de, SaffronGymText_5d167
-	call PreBattleSaveRegisters
+	call SaveEndBattleTextPointers
 	ldh a, [$8c]
-	ld [wcf13], a
+	ld [wSpriteIndex], a
 	call EngageMapTrainer
 	call InitBattleEnemyParameters
 	ld a, $6

scripts/seafoamislands1.asm

@@ -34,7 +34,7 @@ SeafoamIslands1Script: ; 447e9 (11:47e9)
 	predef_jump ShowObject
 .asm_4483b
 	ld a, $9f
-	ld [wd71d], a
+	ld [wDungeonWarpDestinationMap], a
 	ld hl, Seafoam1HolesCoords
 	jp Func_46981
 

scripts/seafoamislands2.asm

@@ -32,7 +32,7 @@ SeafoamIslands2Script: ; 46315 (11:6315)
 	predef_jump ShowObject
 .asm_46362
 	ld a, $a0
-	ld [wd71d], a
+	ld [wDungeonWarpDestinationMap], a
 	ld hl, Seafoam2HolesCoords
 	jp Func_46981
 

scripts/seafoamislands3.asm

@@ -32,7 +32,7 @@ SeafoamIslands3Script: ; 46451 (11:6451)
 	predef_jump ShowObject
 .asm_4649e
 	ld a, $a1
-	ld [wd71d], a
+	ld [wDungeonWarpDestinationMap], a
 	ld hl, Seafoam3HolesCoords
 	jp Func_46981
 

scripts/seafoamislands4.asm

@@ -33,7 +33,7 @@ SeafoamIslands4Script: ; 4658d (11:658d)
 	jr .asm_465ed ; 0x465da $11
 .asm_465dc
 	ld a, $a2
-	ld [wd71d], a
+	ld [wDungeonWarpDestinationMap], a
 	ld hl, Seafoam4HolesCoords
 	call Func_46981
 	ld a, [wd732]
@@ -66,12 +66,12 @@ SeafoamIslands4Script0: ; 46603 (11:6603)
 	ld a, [W_XCOORD]
 	cp $f
 	ret nz
-	ld hl, wccd3
+	ld hl, wSimulatedJoypadStatesEnd
 	ld de, RLEMovement46632
 	call DecodeRLEList
 	dec a
-	ld [wcd38], a
-	call Func_3486
+	ld [wSimulatedJoypadStatesIndex], a
+	call StartSimulatingJoypadStates
 	ld hl, W_FLAGS_D733
 	set 2, [hl]
 	ld a, $1
@@ -85,7 +85,7 @@ RLEMovement46632: ; 46632 (11:6632)
 	db $ff
 
 SeafoamIslands4Script1: ; 46639 (11:6639)
-	ld a, [wcd38]
+	ld a, [wSimulatedJoypadStatesIndex]
 	and a
 	ret nz
 	ld a, $0
@@ -108,10 +108,10 @@ SeafoamIslands4Script2: ; 46644 (11:6644)
 .asm_4665e
 	ld de, RLEData_46688
 .asm_46661
-	ld hl, wccd3
+	ld hl, wSimulatedJoypadStatesEnd
 	call DecodeRLEList
 	dec a
-	ld [wcd38], a
+	ld [wSimulatedJoypadStatesIndex], a
 	xor a
 	ld [wSpriteStateData2 + $06], a
 	ld hl, wd730
@@ -130,7 +130,7 @@ RLEData_46688: ; 46688 (11:6688)
 	db $80,$06,$10,$02,$80,$04,$FF
 
 SeafoamIslands4Script3: ; 4668f (11:668f)
-	ld a, [wcd38]
+	ld a, [wSimulatedJoypadStatesIndex]
 	and a
 	ret nz
 	ld a, $0

scripts/seafoamislands5.asm

@@ -44,10 +44,10 @@ SeafoamIslands5Script0: ; 467c7 (11:67c7)
 .asm_467e6
 	ld a, $1
 .asm_467e8
-	ld [wcd38], a
+	ld [wSimulatedJoypadStatesIndex], a
 	ld a, $40
-	ld [wccd3], a
-	call Func_3486
+	ld [wSimulatedJoypadStatesEnd], a
+	call StartSimulatingJoypadStates
 	ld hl, W_FLAGS_D733
 	res 2, [hl]
 	ld a, $1
@@ -62,7 +62,7 @@ CoordsData_467fe: ; 467fe (11:67fe)
 	db $FF
 
 SeafoamIslands5Script1: ; 46807 (11:6807)
-	ld a, [wcd38]
+	ld a, [wSimulatedJoypadStatesIndex]
 	and a
 	ret nz
 	xor a
@@ -89,11 +89,11 @@ SeafoamIslands5Script2: ; 46816 (11:6816)
 .asm_46837
 	ld de, RLEMovementData_46852
 .asm_4683a
-	ld hl, wccd3
+	ld hl, wSimulatedJoypadStatesEnd
 	call DecodeRLEList
 	dec a
-	ld [wcd38], a
-	call Func_3486
+	ld [wSimulatedJoypadStatesIndex], a
+	call StartSimulatingJoypadStates
 	ld a, $3
 .asm_46849
 	ld [W_SEAFOAMISLANDS5CURSCRIPT], a
@@ -117,7 +117,7 @@ RLEMovementData_46859: ; 46859 (11:6859)
 	db $FF
 
 SeafoamIslands5Script3: ; 46860 (11:6860)
-	ld a, [wcd38]
+	ld a, [wSimulatedJoypadStatesIndex]
 	ld b, a
 	cp $1
 	call z, SeaFoamIslands5Script_46872
@@ -130,8 +130,8 @@ SeafoamIslands5Script3: ; 46860 (11:6860)
 
 SeaFoamIslands5Script_46872: ; 46872 (11:6872)
 	xor a
-	ld [wd700], a
-	ld [wd11a], a
+	ld [wWalkBikeSurfState], a
+	ld [wWalkBikeSurfStateCopy], a
 	jp ForceBikeOrSurf
 
 SeafoamIslands5TextPointers: ; 4687c (11:687c)

scripts/silphco10.asm

@@ -22,7 +22,7 @@ SilphCo10Script_5a14f: ; 5a14f (16:614f)
 	ld a, $54
 	ld [wd09f], a
 	ld bc, $405
-	predef_jump Func_ee9e
+	predef_jump ReplaceTileBlock
 
 DataTable_5a173: ; 5a173 (16:6173)
 	db $04,$05,$FF
@@ -37,7 +37,7 @@ SilphCo10Text_5a176: ; 5a176 (16:6176)
 
 SilphCo10ScriptPointers: ; 5a180 (16:6180)
 	dw CheckFightingMapTrainers
-	dw Func_324c
+	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
 
 SilphCo10TextPointers: ; 5a186 (16:6186)

scripts/silphco11.asm

@@ -22,14 +22,14 @@ SilphCo11Script_62110: ; 62110 (18:6110)
 	ld a, $20
 	ld [wd09f], a
 	ld bc, $603
-	predef_jump Func_ee9e
+	predef_jump ReplaceTileBlock
 
 DataTable_62134: ; 62134 (18:6134)
 	db $06,$03,$FF
 
 SilphCo11Script_62137: ; 62137 (18:6137)
 	push hl
-	ld hl, wd73f
+	ld hl, wCardKeyDoorY
 	ld a, [hli]
 	ld b, a
 	ld a, [hl]
@@ -53,7 +53,7 @@ SilphCo11Script_62137: ; 62137 (18:6137)
 	ld a, [hli]
 	cp c
 	jr nz, .asm_62143
-	ld hl, wd73f
+	ld hl, wCardKeyDoorY
 	xor a
 	ld [hli], a
 	ld [hl], a
@@ -116,7 +116,7 @@ SilphCo11Script_621c8: ; 621c8 (18:61c8)
 
 SilphCo11ScriptPointers: ; 621cf (18:61cf)
 	dw SilphCo11Script0
-	dw Func_324c
+	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
 	dw SilphCo11Script3
 	dw SilphCo11Script4
@@ -160,7 +160,7 @@ SilphCo11Script_6221a: ; 6221a (18:621a)
 	ld [H_DOWNARROWBLINKCNT2], a ; $ff8c
 	ld a, b
 	ld [$ff8d], a
-	jp Func_34a6
+	jp SetSpriteFacingDirectionAndDelay
 
 SilphCo11Script5: ; 62227 (18:6227)
 	ld a, [W_ISINBATTLE] ; W_ISINBATTLE
@@ -182,11 +182,11 @@ SilphCo11Script5: ; 62227 (18:6227)
 	ld a, $6
 	ld [H_DOWNARROWBLINKCNT2], a ; $ff8c
 	call DisplayTextID
-	call GBFadeIn1
+	call GBFadeOutToBlack
 	call SilphCo11Script_6216d
 	call UpdateSprites
 	call Delay3
-	call GBFadeOut1
+	call GBFadeInFromBlack
 	ld hl, wd838
 	set 7, [hl]
 	xor a
@@ -221,9 +221,9 @@ SilphCo11Script4: ; 62293 (18:6293)
 	set 7, [hl]
 	ld hl, SilphCo10Text_62330 ; $6330
 	ld de, SilphCo10Text_62330 ; $6330
-	call PreBattleSaveRegisters
+	call SaveEndBattleTextPointers
 	ld a, [H_DOWNARROWBLINKCNT2] ; $ff8c
-	ld [wcf13], a
+	ld [wSpriteIndex], a
 	call EngageMapTrainer
 	call InitBattleEnemyParameters
 	xor a

scripts/silphco2.asm

@@ -23,7 +23,7 @@ SilphCo2Script_59d07: ; 59d07 (16:5d07)
 	ld a, $54
 	ld [wd09f], a
 	ld bc, $0202
-	predef Func_ee9e
+	predef ReplaceTileBlock
 	pop af
 .asm_59d2e
 	bit 6, a
@@ -31,14 +31,14 @@ SilphCo2Script_59d07: ; 59d07 (16:5d07)
 	ld a, $54
 	ld [wd09f], a
 	ld bc, $0502
-	predef_jump Func_ee9e
+	predef_jump ReplaceTileBlock
 
 DataTable_59d3e: ; 59d3e (16:5d3e)
 	db $02,$02,$05,$02,$FF
 
 SilphCo2Script_59d43: ; 59d43 (16:5d43)
 	push hl
-	ld hl, wd73f
+	ld hl, wCardKeyDoorY
 	ld a, [hli]
 	ld b, a
 	ld a, [hl]
@@ -62,7 +62,7 @@ SilphCo2Script_59d43: ; 59d43 (16:5d43)
 	ld a, [hli]
 	cp c
 	jr nz, .asm_59d4f
-	ld hl, wd73f
+	ld hl, wCardKeyDoorY
 	xor a
 	ld [hli], a
 	ld [hl], a
@@ -87,7 +87,7 @@ SilphCo2Script_59d6f: ; 59d6f (16:5d6f)
 
 SilphCo2ScriptPointers: ; 59d80 (16:5d80)
 	dw CheckFightingMapTrainers
-	dw Func_324c
+	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
 
 SilphCo2TextPointers: ; 59d86 (16:5d86)

scripts/silphco3.asm

@@ -23,7 +23,7 @@ SilphCo3Script_59f71: ; 59f71 (16:5f71)
 	ld a, $5f
 	ld [wd09f], a
 	ld bc, $404
-	predef Func_ee9e
+	predef ReplaceTileBlock
 	pop af
 .asm_59f98
 	bit 1, a
@@ -31,7 +31,7 @@ SilphCo3Script_59f71: ; 59f71 (16:5f71)
 	ld a, $5f
 	ld [wd09f], a
 	ld bc, $408
-	predef_jump Func_ee9e
+	predef_jump ReplaceTileBlock
 
 DataTable_59fa8: ; 59fa8 (16:5fa8)
 	db $04,$04,$04,$08,$FF
@@ -51,7 +51,7 @@ SilphCo3Script_59fad: ; 59fad (16:5fad)
 
 SilphCo3ScriptPointers: ; 59fbe (16:5fbe)
 	dw CheckFightingMapTrainers
-	dw Func_324c
+	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
 
 SilphCo3TextPointers: ; 59fc4 (16:5fc4)

scripts/silphco4.asm

@@ -23,7 +23,7 @@ SilphCo4Script_19d21: ; 19d21 (6:5d21)
 	ld a, $54
 	ld [wd09f], a
 	ld bc, $0602
-	predef Func_ee9e
+	predef ReplaceTileBlock
 	pop af
 .asm_19d48
 	bit 1, a
@@ -31,14 +31,14 @@ SilphCo4Script_19d21: ; 19d21 (6:5d21)
 	ld a, $54
 	ld [wd09f], a
 	ld bc, $0406
-	predef_jump Func_ee9e
+	predef_jump ReplaceTileBlock
 
 SilphCo4Data19d58: ; 19d58 (6:5d58)
 	db $06, $02, $04, $06, $ff
 
 SilphCo4Script_19d5d: ; 19d5d (6:5d5d)
 	push hl
-	ld hl, wd73f
+	ld hl, wCardKeyDoorY
 	ld a, [hli]
 	ld b, a
 	ld a, [hl]
@@ -62,7 +62,7 @@ SilphCo4Script_19d5d: ; 19d5d (6:5d5d)
 	ld a, [hli]
 	cp c
 	jr nz, .asm_19d69 ; 0x19d7c $eb
-	ld hl, wd73f
+	ld hl, wCardKeyDoorY
 	xor a
 	ld [hli], a
 	ld [hl], a
@@ -87,7 +87,7 @@ SilphCo4Script_19d89: ; 19d89 (6:5d89)
 
 SilphCo4ScriptPointers: ; 19d9a (6:5d9a)
 	dw CheckFightingMapTrainers
-	dw Func_324c
+	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
 
 SilphCo4TextPointers: ; 19da0 (6:5da0)

scripts/silphco5.asm

@@ -23,7 +23,7 @@ SilphCo5Script_19f4d: ; 19f4d (6:5f4d)
 	ld a, $5f
 	ld [wd09f], a
 	ld bc, $0203
-	predef Func_ee9e
+	predef ReplaceTileBlock
 	pop af
 .asm_19f74
 	bit 1, a
@@ -32,7 +32,7 @@ SilphCo5Script_19f4d: ; 19f4d (6:5f4d)
 	ld a, $5f
 	ld [wd09f], a
 	ld bc, $0603
-	predef Func_ee9e
+	predef ReplaceTileBlock
 	pop af
 .asm_19f87
 	bit 2, a
@@ -40,7 +40,7 @@ SilphCo5Script_19f4d: ; 19f4d (6:5f4d)
 	ld a, $5f
 	ld [wd09f], a
 	ld bc, $0507
-	predef_jump Func_ee9e
+	predef_jump ReplaceTileBlock
 
 SilphCo5Coords: ; 19f97 (6:5f97) ; coords?
 	db $02, $03, $06, $03, $05, $07, $ff
@@ -65,7 +65,7 @@ SilphCo5Script_19f9e: ; 19f9e (6:5f9e)
 
 SilphCo5ScriptPointers: ; 19fb6 (6:5fb6)
 	dw CheckFightingMapTrainers
-	dw Func_324c
+	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
 
 SilphCo5TextPointers: ; 19fbc (6:5fbc)

scripts/silphco6.asm

@@ -22,7 +22,7 @@ SilphCo6Script_1a1bf: ; 1a1bf (6:61bf)
 	ld a, $5f
 	ld [wd09f], a
 	ld bc, $0602
-	predef_jump Func_ee9e
+	predef_jump ReplaceTileBlock
 
 SilphCo6Coords1: ; 1a1e3 (6:61e3)
 	db $06, $02
@@ -38,7 +38,7 @@ SilphCo6Script_1a1e6: ; 1a1e6 (6:61e6)
 
 SilphCo6ScriptPointers: ; 1a1f0 (6:61f0)
 	dw CheckFightingMapTrainers
-	dw Func_324c
+	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
 
 SilphCo6TextPointers: ; 1a1f6 (6:61f6)

scripts/silphco7.asm

@@ -23,7 +23,7 @@ SilphCo7Script_51b77: ; 51b77 (14:5b77)
 	ld a, $54
 	ld [wd09f], a
 	ld bc, $305
-	predef Func_ee9e
+	predef ReplaceTileBlock
 	pop af
 .asm_51b9e
 	bit 5, a
@@ -32,7 +32,7 @@ SilphCo7Script_51b77: ; 51b77 (14:5b77)
 	ld a, $54
 	ld [wd09f], a
 	ld bc, $20a
-	predef Func_ee9e
+	predef ReplaceTileBlock
 	pop af
 .asm_51bb1
 	bit 6, a
@@ -40,14 +40,14 @@ SilphCo7Script_51b77: ; 51b77 (14:5b77)
 	ld a, $54
 	ld [wd09f], a
 	ld bc, $60a
-	predef_jump Func_ee9e
+	predef_jump ReplaceTileBlock
 
 DataTable_51bc1: ; 51bc1 (14:5bc1)
 	db $03,$05,$02,$0A,$06,$0A,$FF
 
 SilphCo7Text_51bc8: ; 51bc8 (14:5bc8)
 	push hl
-	ld hl, wd73f
+	ld hl, wCardKeyDoorY
 	ld a, [hli]
 	ld b, a
 	ld a, [hl]
@@ -71,7 +71,7 @@ SilphCo7Text_51bc8: ; 51bc8 (14:5bc8)
 	ld a, [hli]
 	cp c
 	jr nz, .asm_51bd4
-	ld hl, wd73f
+	ld hl, wCardKeyDoorY
 	xor a
 	ld [hli], a
 	ld [hl], a
@@ -110,7 +110,7 @@ SilphCo7Text_51c10: ; 51c10 (14:5c10)
 
 SilphCo7ScriptPointers: ; 51c17 (14:5c17)
 	dw SilphCo7Script0
-	dw Func_324c
+	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
 	dw SilphCo7Script3
 	dw SilphCo7Script4
@@ -177,7 +177,7 @@ SilphCo7Script3: ; 51c82 (14:5c82)
 	set 7, [hl]
 	ld hl, SilphCo7Text14 ; $5ec8
 	ld de, SilphCo7Text_51ecd ; $5ecd
-	call PreBattleSaveRegisters
+	call SaveEndBattleTextPointers
 	ld a, SONY2 + $c8
 	ld [W_CUROPPONENT], a ; wd059
 	ld a, [W_RIVALSTARTER] ; wd715
@@ -211,7 +211,7 @@ SilphCo7Script4: ; 51cc8 (14:5cc8)
 	ld [H_DOWNARROWBLINKCNT2], a ; $ff8c
 	ld a, $4
 	ld [$ff8d], a
-	call Func_34a6
+	call SetSpriteFacingDirectionAndDelay
 	ld a, $f
 	ld [H_DOWNARROWBLINKCNT2], a ; $ff8c
 	call DisplayTextID
@@ -244,7 +244,7 @@ SilphCo7Script5: ; 51d25 (14:5d25)
 	ld a, $a7
 	ld [wcc4d], a
 	predef HideObject
-	call Func_2307
+	call PlayDefaultMusic
 	xor a
 	ld [wJoyIgnore], a
 	jp SilphCo7Text_51c10
@@ -323,7 +323,7 @@ SilphCo7Text1:
 	ld bc, (LAPRAS << 8) | 15
 	call GivePokemon
 	jr nc, .done
-	ld a, [wccd3]
+	ld a, [wSimulatedJoypadStatesEnd]
 	and a
 	call z, WaitForTextScrollButtonPress
 	call EnableAutoTextBoxDrawing

scripts/silphco8.asm

@@ -22,14 +22,14 @@ SilphCo8Script_5651a: ; 5651a (15:651a)
 	ld a, $5f
 	ld [wd09f], a
 	ld bc, $403
-	predef_jump Func_ee9e
+	predef_jump ReplaceTileBlock
 
 DataTable_5653e: ; 5653e (15:653e)
 	db $04,$03,$FF
 
 SilphCo8Script_56541: ; 56541 (15:6541)
 	push hl
-	ld hl, wd73f
+	ld hl, wCardKeyDoorY
 	ld a, [hli]
 	ld b, a
 	ld a, [hl]
@@ -53,7 +53,7 @@ SilphCo8Script_56541: ; 56541 (15:6541)
 	ld a, [hli]
 	cp c
 	jr nz, .asm_5654d
-	ld hl, wd73f
+	ld hl, wCardKeyDoorY
 	xor a
 	ld [hli], a
 	ld [hl], a
@@ -73,7 +73,7 @@ SilphCo8Script_5656d: ; 5656d (15:656d)
 
 SilphCo8ScriptPointers: ; 56577 (15:6577)
 	dw CheckFightingMapTrainers
-	dw Func_324c
+	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
 
 SilphCo8TextPointers: ; 5657d (15:657d)

scripts/silphco9.asm

@@ -23,7 +23,7 @@ SilphCo9Script_5d7d1: ; 5d7d1 (17:57d1)
 	ld a, $5f
 	ld [wd09f], a
 	ld bc, $401
-	predef Func_ee9e
+	predef ReplaceTileBlock
 	pop af
 .asm_5d7f8
 	bit 1, a
@@ -32,7 +32,7 @@ SilphCo9Script_5d7d1: ; 5d7d1 (17:57d1)
 	ld a, $54
 	ld [wd09f], a
 	ld bc, $209
-	predef Func_ee9e
+	predef ReplaceTileBlock
 	pop af
 .asm_5d80b
 	bit 2, a
@@ -41,7 +41,7 @@ SilphCo9Script_5d7d1: ; 5d7d1 (17:57d1)
 	ld a, $54
 	ld [wd09f], a
 	ld bc, $509
-	predef Func_ee9e
+	predef ReplaceTileBlock
 	pop af
 .asm_5d81e
 	bit 3, a
@@ -49,14 +49,14 @@ SilphCo9Script_5d7d1: ; 5d7d1 (17:57d1)
 	ld a, $5f
 	ld [wd09f], a
 	ld bc, $605
-	predef_jump Func_ee9e
+	predef_jump ReplaceTileBlock
 
 DataTable_5d82e: ; 5d82e (17:582e)
 	db $04,$01,$02,$09,$05,$09,$06,$05,$FF
 
 SilphCo9Script_5d837: ; 5d837 (17:5837)
 	push hl
-	ld hl, wd73f
+	ld hl, wCardKeyDoorY
 	ld a, [hli]
 	ld b, a
 	ld a, [hl]
@@ -80,7 +80,7 @@ SilphCo9Script_5d837: ; 5d837 (17:5837)
 	ld a, [hli]
 	cp c
 	jr nz, .asm_5d843
-	ld hl, wd73f
+	ld hl, wCardKeyDoorY
 	xor a
 	ld [hli], a
 	ld [hl], a
@@ -117,7 +117,7 @@ SilphCo9Script_5d863: ; 5d863 (17:5863)
 
 SilphCo9ScriptPointers: ; 5d885 (17:5885)
 	dw CheckFightingMapTrainers
-	dw Func_324c
+	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
 
 SilphCo9TextPointers: ; 5d88b (17:588b)
@@ -164,9 +164,9 @@ SilphCo9Text1: ; 5d8b8 (17:58b8)
 	ld hl, SilphCo9Text_5d8e5
 	call PrintText
 	predef HealParty
-	call GBFadeOut2
+	call GBFadeOutToWhite
 	call Delay3
-	call GBFadeIn2
+	call GBFadeInFromWhite
 	ld hl, SilphCo9Text_5d8ea
 	call PrintText
 	jr .asm_b6e28 ; 0x5d8da

scripts/silphcoelevator.asm

@@ -9,13 +9,13 @@ SilphCoElevatorScript: ; 457c0 (11:57c0)
 	res 7, [hl]
 	call nz, SilphCoElevatorScript_45827
 	xor a
-	ld [wcf0c], a
+	ld [wAutoTextBoxDrawingControl], a
 	inc a
-	ld [wcc3c], a
+	ld [wDoNotWaitForButtonPressAfterDisplayingText], a
 	ret
 
 SilphCoElevatorScript_457dc: ; 457dc (11:57dc)
-	ld hl, wd3af
+	ld hl, wWarpEntries
 	ld a, [wd73b]
 	ld b, a
 	ld a, [wd73c]

scripts/ssanne10.asm

@@ -9,7 +9,7 @@ SSAnne10Script: ; 61d55 (18:5d55)
 
 SSAnne10ScriptPointers: ; 61d68 (18:5d68)
 	dw CheckFightingMapTrainers
-	dw Func_324c
+	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
 
 SSAnne10TextPointers: ; 61d6e (18:5d6e)