hLCDCPointer and InitList

7 files changed, 31 insertions, 31 deletions

diff --git a/engine/battle_start.asm b/engine/battle_start.asm
index ab4ab7742..627519daa 100644
--- a/engine/battle_start.asm
+++ b/engine/battle_start.asm
@@ -39,7 +39,7 @@ Predef_StartBattle: ; 8c20f
 	call DmgToCgbBGPals
 	call DelayFrame
 	xor a
-	ld [hFFC6], a
+	ld [hLCDCPointer], a
 	ld [hLYOverrideStart], a
 	ld [hLYOverrideEnd], a
 	ld [hSCY], a
@@ -302,8 +302,8 @@ StartTrainerBattle_SetUpForWavyOutro: ; 8c3e8 (23:43e8)
 
 	call StartTrainerBattle_NextScene
 
-	ld a, $43
-	ld [hFFC6], a
+	ld a, rSCX - $ff00
+	ld [hLCDCPointer], a
 	xor a
 	ld [hLYOverrideStart], a
 	ld a, $90
diff --git a/engine/credits.asm b/engine/credits.asm
index 4fd41342f..fad8a615e 100644
--- a/engine/credits.asm
+++ b/engine/credits.asm
@@ -183,7 +183,7 @@ Credits:: ; 109847
 	call ByteFill
 
 	ld a, rSCX - $ff00
-	ld [hFFC6], a
+	ld [hLCDCPointer], a
 
 	call GetCreditsPalette
 	call SetPalettes
@@ -211,7 +211,7 @@ Credits:: ; 109847
 .exit_credits
 	call ClearBGPalettes
 	xor a
-	ld [hFFC6], a
+	ld [hLCDCPointer], a
 	ld [hBGMapAddress], a
 	pop af
 	ld [hVBlank], a
diff --git a/engine/crystal_intro.asm b/engine/crystal_intro.asm
index 781a1fd15..29bb0934f 100755
--- a/engine/crystal_intro.asm
+++ b/engine/crystal_intro.asm
@@ -621,7 +621,7 @@ IntroScene5: ; e4a7a (39:4a7a)
 	call ClearTileMap
 	xor a
 	ld [hBGMapMode], a
-	ld [hFFC6], a
+	ld [hLCDCPointer], a
 	ld a, $1
 	ld [rVBK], a
 	ld hl, IntroTilemap005
@@ -815,7 +815,7 @@ IntroScene8: ; e4bd3 (39:4bd3)
 IntroScene9: ; e4c04 (39:4c04)
 ; Set up the next scene (same bg).
 	xor a
-	ld [hFFC6], a
+	ld [hLCDCPointer], a
 	call ClearSprites
 	hlcoord 0, 0, AttrMap
 	; first 12 rows have palette 1
@@ -889,7 +889,7 @@ IntroScene11: ; e4c86 (39:4c86)
 	call ClearTileMap
 	xor a
 	ld [hBGMapMode], a
-	ld [hFFC6], a
+	ld [hLCDCPointer], a
 	ld a, $1
 	ld [rVBK], a
 	ld hl, IntroTilemap007
@@ -2093,8 +2093,8 @@ Intro_ResetLYOverrides: ; e5516 (39:5516)
 
 	pop af
 	ld [rSVBK], a
-	ld a, $43
-	ld [hFFC6], a
+	ld a, rSCX - $ff00
+	ld [hLCDCPointer], a
 	ret
 
 Intro_PerspectiveScrollBG: ; e552f (39:552f)
diff --git a/engine/events_3.asm b/engine/events_3.asm
index e3e197adf..d37d6c33a 100755
--- a/engine/events_3.asm
+++ b/engine/events_3.asm
@@ -55,7 +55,7 @@ ReturnFromMapSetupScript:: ; b8000
 	ld [rWY], a
 	ld [hWY], a
 	xor a
-	ld [hFFC6], a
+	ld [hLCDCPointer], a
 	ret
 ; b8064
 
@@ -126,7 +126,7 @@ PlaceMapNameSign:: ; b8098 (2e:4098)
 	ld [rWY], a
 	ld [hWY], a
 	xor a
-	ld [hFFC6], a
+	ld [hLCDCPointer], a
 	ret
 
 
diff --git a/engine/intro_menu.asm b/engine/intro_menu.asm
index 34eb67eeb..3e4257ab7 100755
--- a/engine/intro_menu.asm
+++ b/engine/intro_menu.asm
@@ -140,7 +140,7 @@ _ResetWRAM: ; 5bae
 	ld [wSecretID + 1], a
 
 	ld hl, PartyCount
-	call InitList
+	call .InitList
 
 	xor a
 	ld [wCurBox], a
@@ -151,20 +151,20 @@ _ResetWRAM: ; 5bae
 	ld a, BANK(sBoxCount)
 	call GetSRAMBank
 	ld hl, sBoxCount
-	call InitList
+	call .InitList
 	call CloseSRAM
 
 	ld hl, NumItems
-	call InitList
+	call .InitList
 
 	ld hl, NumKeyItems
-	call InitList
+	call .InitList
 
 	ld hl, NumBalls
-	call InitList
+	call .InitList
 
 	ld hl, PCItems
-	call InitList
+	call .InitList
 
 	xor a
 	ld [wRoamMon1Species], a
@@ -232,7 +232,7 @@ ENDC
 	ret
 ; 5ca1
 
-InitList: ; 5ca1
+.InitList: ; 5ca1
 ; Loads 0 in the count and -1 in the first item or mon slot.
 	xor a
 	ld [hli], a
@@ -1041,7 +1041,7 @@ StartTitleScreen: ; 6219
 	call ClearScreen
 	call WaitBGMap2
 	xor a
-	ld [hFFC6], a
+	ld [hLCDCPointer], a
 	ld [hSCX], a
 	ld [hSCY], a
 	ld a, $7
@@ -1172,7 +1172,7 @@ TitleScreenEntrance: ; 62bc
 	ld hl, wJumptableIndex
 	inc [hl]
 	xor a
-	ld [hFFC6], a
+	ld [hLCDCPointer], a
 
 ; Play the title screen music.
 	ld de, MUSIC_TITLE
diff --git a/engine/link.asm b/engine/link.asm
index 4f20c8481..951eb1444 100755
--- a/engine/link.asm
+++ b/engine/link.asm
@@ -163,9 +163,9 @@ TimeCapsule: ; 2805d
 	ld hl, wTimeCapsulePartyMon1Species
 	call Function2868a
 	ld a, OTPartyMonOT % $100
-	ld [wd102], a
+	ld [wUnusedD102], a
 	ld a, OTPartyMonOT / $100
-	ld [wd103], a
+	ld [wUnusedD102 + 1], a
 	ld de, MUSIC_NONE
 	call PlayMusic
 	ld a, [hLinkPlayerNumber]
@@ -404,9 +404,9 @@ Gen2ToGen2LinkComms: ; 28177
 	ld bc, OTPartyDataEnd - OTPartyMons
 	call CopyBytes
 	ld a, OTPartyMonOT % $100
-	ld [wd102], a
+	ld [wUnusedD102], a
 	ld a, OTPartyMonOT / $100
-	ld [wd103], a
+	ld [wUnusedD102 + 1], a
 	ld de, MUSIC_NONE
 	call PlayMusic
 	ld a, [hLinkPlayerNumber]
@@ -1254,8 +1254,8 @@ LinkTradeOTPartymonMenuLoop: ; 28835
 	bit A_BUTTON_F, a
 	jr z, .not_a_button
 	ld a, $1
-	ld [wd263], a
-	callab LoadAddrsForLinkMonStatsScreen
+	ld [wInitListType], a
+	callab InitList
 	ld hl, OTPartyMon1Species
 	callba LinkMonStatsScreen
 	jp LinkTradePartiesMenuMasterLoop
@@ -1447,8 +1447,8 @@ Function28926: ; 28926
 	pop af
 	ld [wMenuCursorY], a
 	ld a, $4
-	ld [wd263], a
-	callab LoadAddrsForLinkMonStatsScreen
+	ld [wInitListType], a
+	callab InitList
 	callba LinkMonStatsScreen
 	call Call_LoadTempTileMapToTileMap
 	hlcoord 6, 1
diff --git a/engine/title.asm b/engine/title.asm
index 012242491..787872939 100644
--- a/engine/title.asm
+++ b/engine/title.asm
@@ -188,8 +188,8 @@ _TitleScreen: ; 10ed67
 	call ByteFill
 
 ; Let LCD Stat know we're messing around with SCX
-	ld a, rSCX - rJOYP
-	ld [hFFC6], a
+	ld a, rSCX - $ff00
+	ld [hLCDCPointer], a
 
 	pop af
 	ld [rSVBK], a