Minor fixes

5 files changed, 23 insertions, 23 deletions

diff --git a/engine/save.asm b/engine/save.asm
index bd557135..5a144d10 100755
--- a/engine/save.asm
+++ b/engine/save.asm
@@ -363,7 +363,7 @@ ChangeBox:: ; 73bed (1c:7bed)
 	call GetBoxSRAMLocation
 	ld de, wBoxDataStart
 	call CopyBoxToOrFromSRAM ; copy new box from SRAM to WRAM
-	ld hl, W_MAPTEXTPTR
+	ld hl, wMapTextPtr
 	ld de, wChangeBoxSavedMapTextPointer
 	ld a, [hli]
 	ld [de], a
diff --git a/home.asm b/home.asm
index 68342640..0ffff496 100644
--- a/home.asm
+++ b/home.asm
@@ -1247,7 +1247,7 @@ DisplayTextID:: ; 2817 (0:2817)
 .skipSwitchToMapBank
 	ld a,30 ; half a second
 	ld [H_FRAMECOUNTER],a ; used as joypad poll timer
-	ld hl,W_MAPTEXTPTR
+	ld hl,wMapTextPtr
 	ld a,[hli]
 	ld h,[hl]
 	ld l,a ; hl = map text pointer
@@ -4874,7 +4874,7 @@ Random:: ; 3e6d (0:3e6d)
 
 BankswitchCommon:: ; 3e7e (0:3e7e)
 	ld [H_LOADEDROMBANK],a
-	ld [$2000],a
+	ld [MBC1RomBank], a
 	ret
 	
 Bankswitch:: ; 3e84 (0:3e84)
@@ -4884,31 +4884,31 @@ Bankswitch:: ; 3e84 (0:3e84)
 	push af
 	ld a,b
 	ld [H_LOADEDROMBANK],a
-	ld [$2000],a
+	ld [MBC1RomBank], a
 	call JumpToAddress
 	pop bc
 	ld a,b
 	ld [H_LOADEDROMBANK],a
-	ld [$2000],a
+	ld [MBC1RomBank], a
 	ret
 JumpToAddress:: ; 3e98 (0:3e98)
 	jp [hl]
 
 SwitchSRAMBankAndLatchClockData:: ; 3e99 (0:3e99)
 	push af
-	ld a,$1
-	ld [$6000],a
-	ld a,SRAM_ENABLE
-	ld [$0],a
+	ld a, $1
+	ld [MBC1SRamBankingMode], a
+	ld a, SRAM_ENABLE
+	ld [MBC1SRamEnable],a
 	pop af
-	ld [$4000],a
+	ld [MBC1SRamBank],a
 	ret
 	
 PrepareRTCDataAndDisableSRAM:: ; 3ea9 (0:3ea9)
 	push af
-	ld a,$0
-	ld [$6000],a
-	ld [$0],a
+	ld a, $0
+	ld [MBC1SRamBankingMode], a
+	ld [MBC1SRamEnable], a
 	pop af
 	ret
 	
@@ -4960,7 +4960,7 @@ PrintPredefTextID:: ; 3f3a (0:3f3a)
 	call DisplayTextID
 
 RestoreMapTextPointer:: ; 3f4a (0:3f4a)
-	ld hl, W_MAPTEXTPTR
+	ld hl, wMapTextPtr
 	ld a, [$ffec]
 	ld [hli], a
 	ld a, [$ffec + 1]
@@ -4968,14 +4968,14 @@ RestoreMapTextPointer:: ; 3f4a (0:3f4a)
 	ret
 
 SetMapTextPointer:: ; 3f54 (0:3f54)
-	ld a, [W_MAPTEXTPTR]
+	ld a, [wMapTextPtr]
 	ld [$ffec], a
-	ld a, [W_MAPTEXTPTR + 1]
+	ld a, [wMapTextPtr + 1]
 	ld [$ffec + 1], a
 	ld a, l
-	ld [W_MAPTEXTPTR], a
+	ld [wMapTextPtr], a
 	ld a, h
-	ld [W_MAPTEXTPTR + 1], a
+	ld [wMapTextPtr + 1], a
 	ret
 
 TextPredefs:: ; 3f67 (0:3f67)
diff --git a/scripts/oakslab.asm b/scripts/oakslab.asm
index 40ecd1f9..aff39cbc 100755
--- a/scripts/oakslab.asm
+++ b/scripts/oakslab.asm
@@ -714,9 +714,9 @@ OaksLabScript_1d02b: ; 1d02b (7:502b)
 OaksLabScript_1d076: ; 1d076 (7:5076)
 	ld hl, OaksLabTextPointers + $36 ; starts at OaksLabText28
 	ld a, l
-	ld [W_MAPTEXTPTR], a
+	ld [wMapTextPtr], a
 	ld a, h
-	ld [W_MAPTEXTPTR+1], a
+	ld [wMapTextPtr+1], a
 	ret
 
 OaksLabTextPointers: ; 1d082 (7:5082)
diff --git a/scripts/viridianmart.asm b/scripts/viridianmart.asm
index 5cb6eaea..4f4b2875 100755
--- a/scripts/viridianmart.asm
+++ b/scripts/viridianmart.asm
@@ -14,9 +14,9 @@ ViridianMartScript_1d47d: ; 1d47d (7:547d)
 	ld hl, ViridianMartTextPointers + $a ; starts at ViridianMartText6
 .asm_1d48c
 	ld a, l
-	ld [W_MAPTEXTPTR], a
+	ld [wMapTextPtr], a
 	ld a, h
-	ld [W_MAPTEXTPTR+1], a
+	ld [wMapTextPtr+1], a
 	ret
 
 ViridianMartScriptPointers: ; 1d495 (7:5495)
diff --git a/wram.asm b/wram.asm
index 9bac935b..2abf935c 100755
--- a/wram.asm
+++ b/wram.asm
@@ -2368,7 +2368,7 @@ wCurMapWidth:: ; d369
 W_MAPDATAPTR:: ; d36a
 	ds 2
 
-W_MAPTEXTPTR:: ; d36c
+wMapTextPtr:: ; d36c
 	ds 2
 
 W_MAPSCRIPTPTR:: ; d36e