shithub: pokecrystal

Download patch

ref: 8c435054a0c5c8d3a0ad49f42790c492583caef5
parent: 84cfbc70fac02032d1608f89e9f551ab3d987315
parent: bb4a6e5f550c2bde42541aa201aaa720cd461005
author: Rangi <35663410+Rangi42@users.noreply.github.com>
date: Sun Sep 9 13:41:58 EDT 2018 

Merge pull request #562 from Rangi42/master

Curr → Cur


--- a/constants/wram_constants.asm
+++ b/constants/wram_constants.asm
@@ -1,7 +1,7 @@
 ; wInputType:: ; c2c7
 AUTO_INPUT EQU $ff
 
-; wCurrentDexMode:: ; c7d4
+; wCurDexMode:: ; c7d4
 	const_def
 	const DEXMODE_NEW
 	const DEXMODE_OLD
--- a/engine/events/celebi.asm
+++ b/engine/events/celebi.asm
@@ -32,7 +32,7 @@
 	inc d
 	push de
 	ld a, 36 * SPRITEOAMSTRUCT_LENGTH
-	ld [wCurrSpriteOAMAddr], a
+	ld [wCurSpriteOAMAddr], a
 	farcall DoNextFrameForAllSprites
 	call CelebiEvent_CountDown
 	ld c, 2
--- a/engine/events/checkforhiddenitems.asm
+++ b/engine/events/checkforhiddenitems.asm
@@ -10,15 +10,15 @@
 	add SCREEN_HEIGHT / 4
 	ld [wBuffer3], a
 ; Get the pointer for the first bg_event in the map...
-	ld hl, wCurrMapBGEventsPointer
+	ld hl, wCurMapBGEventsPointer
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
 ; ... before even checking to see if there are any BG events on this map.
-	ld a, [wCurrMapBGEventCount]
+	ld a, [wCurMapBGEventCount]
 	and a
 	jr z, .nobgeventitems
-; For i = 1:wCurrMapBGEventCount...
+; For i = 1:wCurMapBGEventCount...
 .loop
 ; Store the counter in wBuffer2, and store the bg_event pointer in the stack.
 	ld [wBuffer2], a
--- a/engine/events/field_moves.asm
+++ b/engine/events/field_moves.asm
@@ -38,7 +38,7 @@
 	add hl, bc
 	ld [hl], FIELDMOVE_TREE
 	ld a, 36 * SPRITEOAMSTRUCT_LENGTH
-	ld [wCurrSpriteOAMAddr], a
+	ld [wCurSpriteOAMAddr], a
 	farcall DoNextFrameForAllSprites
 	call HideHeadbuttTree
 	ld a, 32
@@ -53,7 +53,7 @@
 	jr z, .done
 	dec [hl]
 	ld a, 36 * SPRITEOAMSTRUCT_LENGTH
-	ld [wCurrSpriteOAMAddr], a
+	ld [wCurSpriteOAMAddr], a
 	farcall DoNextFrameForAllSprites
 	call DelayFrame
 	jr .loop
@@ -126,7 +126,7 @@
 	bit 7, a
 	jr nz, .finish
 	ld a, 36 * SPRITEOAMSTRUCT_LENGTH
-	ld [wCurrSpriteOAMAddr], a
+	ld [wCurSpriteOAMAddr], a
 	callfar DoNextFrameForAllSprites
 	call OWCutJumptable
 	call DelayFrame
@@ -328,7 +328,7 @@
 	bit 7, a
 	jr nz, .exit
 	ld a, 0 * SPRITEOAMSTRUCT_LENGTH
-	ld [wCurrSpriteOAMAddr], a
+	ld [wCurSpriteOAMAddr], a
 	callfar DoNextFrameForAllSprites
 	call FlyFunction_FrameTimer
 	call DelayFrame
@@ -365,7 +365,7 @@
 	bit 7, a
 	jr nz, .exit
 	ld a, 0 * SPRITEOAMSTRUCT_LENGTH
-	ld [wCurrSpriteOAMAddr], a
+	ld [wCurSpriteOAMAddr], a
 	callfar DoNextFrameForAllSprites
 	call FlyFunction_FrameTimer
 	call DelayFrame
--- a/engine/events/map_name_sign.asm
+++ b/engine/events/map_name_sign.asm
@@ -13,7 +13,7 @@
 	ld a, [wMapNumber]
 	ld c, a
 	call GetWorldMapLocation
-	ld [wCurrentLandmark], a
+	ld [wCurLandmark], a
 	call .CheckNationalParkGate
 	jr z, .nationalparkgate
 
@@ -23,7 +23,7 @@
 
 .nationalparkgate
 	ld a, -1
-	ld [wCurrentLandmark], a
+	ld [wCurLandmark], a
 
 .not_gate
 	ld hl, wEnteredMapFromContinue
@@ -33,8 +33,8 @@
 
 	call .CheckMovingWithinLandmark
 	jr z, .dont_do_map_sign
-	ld a, [wCurrentLandmark]
-	ld [wPreviousLandmark], a
+	ld a, [wCurLandmark]
+	ld [wPrevLandmark], a
 
 	call .CheckSpecialMap
 	jr z, .dont_do_map_sign
@@ -48,8 +48,8 @@
 	ret
 
 .dont_do_map_sign
-	ld a, [wCurrentLandmark]
-	ld [wPreviousLandmark], a
+	ld a, [wCurLandmark]
+	ld [wPrevLandmark], a
 	ld a, $90
 	ldh [rWY], a
 	ldh [hWY], a
@@ -58,9 +58,9 @@
 	ret
 
 .CheckMovingWithinLandmark:
-	ld a, [wCurrentLandmark]
+	ld a, [wCurLandmark]
 	ld c, a
-	ld a, [wPreviousLandmark]
+	ld a, [wPrevLandmark]
 	cp c
 	ret z
 	cp SPECIAL_MAP
@@ -140,7 +140,7 @@
 	ret
 
 PlaceMapNameCenterAlign:
-	ld a, [wCurrentLandmark]
+	ld a, [wCurLandmark]
 	ld e, a
 	farcall GetLandmarkName
 	call .GetNameLength
--- a/engine/events/mom_phone.asm
+++ b/engine/events/mom_phone.asm
@@ -38,7 +38,7 @@
 	inc [hl]
 .ok
 	ld a, PHONE_MOM
-	ld [wCurrentCaller], a
+	ld [wCurCaller], a
 	ld bc, wEngineBuffer2
 	ld hl, 0
 	add hl, bc
--- a/engine/games/slot_machine.asm
+++ b/engine/games/slot_machine.asm
@@ -182,7 +182,7 @@
 	call SlotsJumptable
 	call Slots_SpinReels
 	xor a
-	ld [wCurrSpriteOAMAddr], a
+	ld [wCurSpriteOAMAddr], a
 	callfar DoNextFrameForFirst16Sprites
 	call .PrintCoinsAndPayout
 	call .Stubbed_Function927d3
@@ -778,9 +778,9 @@
 	ld hl, REEL_X_COORD
 	add hl, bc
 	ld a, [hl]
-	ld [wCurrReelXCoord], a
+	ld [wCurReelXCoord], a
 	ld a, 10 * 8
-	ld [wCurrReelYCoord], a
+	ld [wCurReelYCoord], a
 	ld hl, REEL_POSITION
 	add hl, bc
 	ld e, [hl]
@@ -813,9 +813,9 @@
 	ld h, [hl]
 	ld l, a
 .loop
-	ld a, [wCurrReelYCoord]
+	ld a, [wCurReelYCoord]
 	ld [hli], a ; y
-	ld a, [wCurrReelXCoord]
+	ld a, [wCurReelXCoord]
 	ld [hli], a ; x
 	ld a, [de]
 	ld [hli], a ; tile id
@@ -824,9 +824,9 @@
 	set OAM_PRIORITY, a
 	ld [hli], a ; attributes
 
-	ld a, [wCurrReelYCoord]
+	ld a, [wCurReelYCoord]
 	ld [hli], a ; y
-	ld a, [wCurrReelXCoord]
+	ld a, [wCurReelXCoord]
 	add 1 * TILE_WIDTH
 	ld [hli], a ; x
 	ld a, [de]
@@ -838,9 +838,9 @@
 	set OAM_PRIORITY, a
 	ld [hli], a ; attributes
 	inc de
-	ld a, [wCurrReelYCoord]
+	ld a, [wCurReelYCoord]
 	sub 2 * TILE_WIDTH
-	ld [wCurrReelYCoord], a
+	ld [wCurReelYCoord], a
 	cp 2 * TILE_WIDTH
 	jr nz, .loop
 	ret
@@ -1412,7 +1412,7 @@
 	ret
 
 .CheckBottomRow:
-	ld hl, wCurrReelStopped
+	ld hl, wCurReelStopped
 	ld a, [wReel1Stopped]
 	cp [hl]
 	call z, .StoreResult
@@ -1419,7 +1419,7 @@
 	ret
 
 .CheckUpwardsDiag:
-	ld hl, wCurrReelStopped + 1
+	ld hl, wCurReelStopped + 1
 	ld a, [wReel1Stopped]
 	cp [hl]
 	call z, .StoreResult
@@ -1426,7 +1426,7 @@
 	ret
 
 .CheckMiddleRow:
-	ld hl, wCurrReelStopped + 1
+	ld hl, wCurReelStopped + 1
 	ld a, [wReel1Stopped + 1]
 	cp [hl]
 	call z, .StoreResult
@@ -1433,7 +1433,7 @@
 	ret
 
 .CheckDownwardsDiag:
-	ld hl, wCurrReelStopped + 1
+	ld hl, wCurReelStopped + 1
 	ld a, [wReel1Stopped + 2]
 	cp [hl]
 	call z, .StoreResult
@@ -1440,7 +1440,7 @@
 	ret
 
 .CheckTopRow:
-	ld hl, wCurrReelStopped + 2
+	ld hl, wCurReelStopped + 2
 	ld a, [wReel1Stopped + 2]
 	cp [hl]
 	call z, .StoreResult
@@ -1509,7 +1509,7 @@
 	ret
 
 .CheckBottomRow:
-	ld hl, wCurrReelStopped
+	ld hl, wCurReelStopped
 	ld a, [wReel1Stopped]
 	cp [hl]
 	ret nz
@@ -1519,7 +1519,7 @@
 	ret
 
 .CheckUpwardsDiag:
-	ld hl, wCurrReelStopped + 2
+	ld hl, wCurReelStopped + 2
 	ld a, [wReel1Stopped]
 	cp [hl]
 	ret nz
@@ -1529,7 +1529,7 @@
 	ret
 
 .CheckMiddleRow:
-	ld hl, wCurrReelStopped + 1
+	ld hl, wCurReelStopped + 1
 	ld a, [wReel1Stopped + 1]
 	cp [hl]
 	ret nz
@@ -1539,7 +1539,7 @@
 	ret
 
 .CheckDownwardsDiag:
-	ld hl, wCurrReelStopped
+	ld hl, wCurReelStopped
 	ld a, [wReel1Stopped + 2]
 	cp [hl]
 	ret nz
@@ -1549,7 +1549,7 @@
 	ret
 
 .CheckTopRow:
-	ld hl, wCurrReelStopped + 2
+	ld hl, wCurReelStopped + 2
 	ld a, [wReel1Stopped + 2]
 	cp [hl]
 	ret nz
@@ -1563,7 +1563,7 @@
 	ret
 
 Slots_CopyReelState:
-	ld de, wCurrReelStopped
+	ld de, wCurReelStopped
 	ld a, [hli]
 	ld [de], a
 	inc de
--- a/engine/gfx/sprites.asm
+++ b/engine/gfx/sprites.asm
@@ -22,7 +22,7 @@
 	push af
 
 	ld a, LOW(wVirtualOAM)
-	ld [wCurrSpriteOAMAddr], a
+	ld [wCurSpriteOAMAddr], a
 	call DoNextFrameForAllSprites
 
 	pop af
@@ -55,11 +55,11 @@
 	dec e
 	jr nz, .loop
 
-	ld a, [wCurrSpriteOAMAddr]
+	ld a, [wCurSpriteOAMAddr]
 	ld l, a
 	ld h, HIGH(wVirtualOAM)
 
-.loop2 ; Clear (wVirtualOAM + [wCurrSpriteOAMAddr] --> wVirtualOAMEnd)
+.loop2 ; Clear (wVirtualOAM + [wCurSpriteOAMAddr] --> wVirtualOAMEnd)
 	ld a, l
 	cp LOW(wVirtualOAMEnd)
 	jr nc, .done
@@ -94,11 +94,11 @@
 	dec e
 	jr nz, .loop
 
-	ld a, [wCurrSpriteOAMAddr]
+	ld a, [wCurSpriteOAMAddr]
 	ld l, a
 	ld h, HIGH(wVirtualOAMSprite16)
 
-.loop2 ; Clear (wVirtualOAM + [wCurrSpriteOAMAddr] --> Sprites + $40)
+.loop2 ; Clear (wVirtualOAM + [wCurSpriteOAMAddr] --> Sprites + $40)
 	ld a, l
 	cp LOW(wVirtualOAMSprite16)
 	jr nc, .done
@@ -233,10 +233,10 @@
 	cp -4
 	jr z, .delete
 	call GetFrameOAMPointer
-	; add byte to [wCurrAnimVTile]
-	ld a, [wCurrAnimVTile]
+	; add byte to [wCurAnimVTile]
+	ld a, [wCurAnimVTile]
 	add [hl]
-	ld [wCurrAnimVTile], a
+	ld [wCurAnimVTile], a
 	inc hl
 	; load pointer into hl
 	ld a, [hli]
@@ -243,7 +243,7 @@
 	ld h, [hl]
 	ld l, a
 	push bc
-	ld a, [wCurrSpriteOAMAddr]
+	ld a, [wCurSpriteOAMAddr]
 	ld e, a
 	ld d, HIGH(wVirtualOAM)
 	ld a, [hli]
@@ -250,10 +250,10 @@
 	ld c, a ; number of objects
 .loop
 	; first byte: y (px)
-	; [de] = [wCurrAnimYCoord] + [wCurrAnimYOffset] + [wGlobalAnimYOffset] + AddOrSubtractY([hl])
-	ld a, [wCurrAnimYCoord]
+	; [de] = [wCurAnimYCoord] + [wCurAnimYOffset] + [wGlobalAnimYOffset] + AddOrSubtractY([hl])
+	ld a, [wCurAnimYCoord]
 	ld b, a
-	ld a, [wCurrAnimYOffset]
+	ld a, [wCurAnimYOffset]
 	add b
 	ld b, a
 	ld a, [wGlobalAnimYOffset]
@@ -265,10 +265,10 @@
 	inc hl
 	inc de
 	; second byte: x (px)
-	; [de] = [wCurrAnimXCoord] + [wCurrAnimXOffset] + [wGlobalAnimXOffset] + AddOrSubtractX([hl])
-	ld a, [wCurrAnimXCoord]
+	; [de] = [wCurAnimXCoord] + [wCurAnimXOffset] + [wGlobalAnimXOffset] + AddOrSubtractX([hl])
+	ld a, [wCurAnimXCoord]
 	ld b, a
-	ld a, [wCurrAnimXOffset]
+	ld a, [wCurAnimXOffset]
 	add b
 	ld b, a
 	ld a, [wGlobalAnimXOffset]
@@ -280,8 +280,8 @@
 	inc hl
 	inc de
 	; third byte: vtile
-	; [de] = [wCurrAnimVTile] + [hl]
-	ld a, [wCurrAnimVTile]
+	; [de] = [wCurAnimVTile] + [hl]
+	ld a, [wCurAnimVTile]
 	add [hl]
 	ld [de], a
 	inc hl
@@ -293,7 +293,7 @@
 	inc hl
 	inc de
 	ld a, e
-	ld [wCurrSpriteOAMAddr], a
+	ld [wCurSpriteOAMAddr], a
 	cp LOW(wVirtualOAMEnd)
 	jr nc, .reached_the_end
 	dec c
@@ -315,7 +315,7 @@
 AddOrSubtractY:
 	push hl
 	ld a, [hl]
-	ld hl, wCurrSpriteAddSubFlags
+	ld hl, wCurSpriteAddSubFlags
 	bit 6, [hl]
 	jr z, .ok
 	; 8 - a
@@ -330,7 +330,7 @@
 AddOrSubtractX:
 	push hl
 	ld a, [hl]
-	ld hl, wCurrSpriteAddSubFlags
+	ld hl, wCurSpriteAddSubFlags
 	bit 5, [hl] ; x flip
 	jr z, .ok
 	; 8 - a
@@ -343,7 +343,7 @@
 	ret
 
 GetSpriteOAMAttr:
-	ld a, [wCurrSpriteAddSubFlags]
+	ld a, [wCurSpriteAddSubFlags]
 	ld b, a
 	ld a, [hl]
 	xor b
@@ -356,19 +356,19 @@
 
 InitSpriteAnimBuffer:
 	xor a
-	ld [wCurrSpriteAddSubFlags], a
+	ld [wCurSpriteAddSubFlags], a
 	ld hl, SPRITEANIMSTRUCT_TILE_ID
 	add hl, bc
 	ld a, [hli]
-	ld [wCurrAnimVTile], a
+	ld [wCurAnimVTile], a
 	ld a, [hli]
-	ld [wCurrAnimXCoord], a
+	ld [wCurAnimXCoord], a
 	ld a, [hli]
-	ld [wCurrAnimYCoord], a
+	ld [wCurAnimYCoord], a
 	ld a, [hli]
-	ld [wCurrAnimXOffset], a
+	ld [wCurAnimXOffset], a
 	ld a, [hli]
-	ld [wCurrAnimYOffset], a
+	ld [wCurAnimYOffset], a
 	ret
 
 GetSpriteAnimVTile:
@@ -448,7 +448,7 @@
 	ld a, [hl]
 	and $c0
 	srl a
-	ld [wCurrSpriteAddSubFlags], a
+	ld [wCurSpriteAddSubFlags], a
 	pop af
 	ret
 
--- a/engine/items/pack.asm
+++ b/engine/items/pack.asm
@@ -26,7 +26,7 @@
 	jr .loop
 
 .done
-	ld a, [wCurrPocket]
+	ld a, [wCurPocket]
 	ld [wLastPocket], a
 	ld hl, wOptions
 	res NO_TEXT_SCROLL, [hl]
@@ -63,7 +63,7 @@
 
 .InitItemsPocket:
 	xor a ; ITEM_POCKET
-	ld [wCurrPocket], a
+	ld [wCurPocket], a
 	call ClearPocketList
 	call DrawPocketName
 	call WaitBGMap_DrawPackGFX
@@ -91,7 +91,7 @@
 
 .InitKeyItemsPocket:
 	ld a, KEY_ITEM_POCKET
-	ld [wCurrPocket], a
+	ld [wCurPocket], a
 	call ClearPocketList
 	call DrawPocketName
 	call WaitBGMap_DrawPackGFX
@@ -119,7 +119,7 @@
 
 .InitTMHMPocket:
 	ld a, TM_HM_POCKET
-	ld [wCurrPocket], a
+	ld [wCurPocket], a
 	call ClearPocketList
 	call DrawPocketName
 	xor a
@@ -213,7 +213,7 @@
 
 .InitBallsPocket:
 	ld a, BALL_POCKET
-	ld [wCurrPocket], a
+	ld [wCurPocket], a
 	call ClearPocketList
 	call DrawPocketName
 	call WaitBGMap_DrawPackGFX
@@ -500,7 +500,7 @@
 	ret
 
 Unreferenced_ResetPocketCursorPositions:
-	ld a, [wCurrPocket]
+	ld a, [wCurPocket]
 	and a ; ITEM_POCKET
 	jr z, .items
 	dec a ; BALL_POCKET
@@ -532,7 +532,7 @@
 	ld a, [wItemAttributeParamBuffer]
 	and a
 	jr nz, .cant_register
-	ld a, [wCurrPocket]
+	ld a, [wCurPocket]
 	rrca
 	rrca
 	and REGISTERED_POCKET
@@ -636,7 +636,7 @@
 	jr .loop
 
 .end
-	ld a, [wCurrPocket]
+	ld a, [wCurPocket]
 	ld [wLastPocket], a
 	ld hl, wOptions
 	res NO_TEXT_SCROLL, [hl]
@@ -673,7 +673,7 @@
 
 .InitItemsPocket:
 	xor a ; ITEM_POCKET
-	ld [wCurrPocket], a
+	ld [wCurPocket], a
 	call ClearPocketList
 	call DrawPocketName
 	call WaitBGMap_DrawPackGFX
@@ -701,7 +701,7 @@
 
 .InitKeyItemsPocket:
 	ld a, KEY_ITEM_POCKET
-	ld [wCurrPocket], a
+	ld [wCurPocket], a
 	call ClearPocketList
 	call DrawPocketName
 	call WaitBGMap_DrawPackGFX
@@ -729,7 +729,7 @@
 
 .InitTMHMPocket:
 	ld a, TM_HM_POCKET
-	ld [wCurrPocket], a
+	ld [wCurPocket], a
 	call ClearPocketList
 	call DrawPocketName
 	xor a
@@ -752,7 +752,7 @@
 
 .InitBallsPocket:
 	ld a, BALL_POCKET
-	ld [wCurrPocket], a
+	ld [wCurPocket], a
 	call ClearPocketList
 	call DrawPocketName
 	call WaitBGMap_DrawPackGFX
@@ -903,7 +903,7 @@
 	; pocket id -> jumptable index
 	ld a, [wLastPocket]
 	maskbits NUM_POCKETS
-	ld [wCurrPocket], a
+	ld [wCurPocket], a
 	inc a
 	add a
 	dec a
@@ -919,7 +919,7 @@
 	ldh [hBGMapMode], a
 	ld [wJumptableIndex], a ; PACKSTATE_INITGFX
 	ld [wPackJumptableIndex], a ; PACKSTATE_INITGFX
-	ld [wCurrPocket], a ; ITEM_POCKET
+	ld [wCurPocket], a ; ITEM_POCKET
 	ld [wPackUsedItem], a
 	ld [wSwitchItem], a
 	call Pack_InitGFX
@@ -1004,7 +1004,7 @@
 	ret
 
 InitPocket:
-	ld [wCurrPocket], a
+	ld [wCurPocket], a
 	call ClearPocketList
 	call DrawPocketName
 	call WaitBGMap_DrawPackGFX
@@ -1209,7 +1209,7 @@
 WaitBGMap_DrawPackGFX:
 	call WaitBGMap
 DrawPackGFX:
-	ld a, [wCurrPocket]
+	ld a, [wCurPocket]
 	maskbits NUM_POCKETS
 	ld e, a
 	ld d, 0
@@ -1381,7 +1381,7 @@
 	ret
 
 DrawPocketName:
-	ld a, [wCurrPocket]
+	ld a, [wCurPocket]
 	; * 15
 	ld d, a
 	swap a
--- a/engine/math/math.asm
+++ b/engine/math/math.asm
@@ -4,7 +4,7 @@
 	ld b, a
 
 	xor a
-	ldh [hProduct], a
+	ldh [hMultiplicand - 1], a
 	ldh [hMathBuffer + 1], a
 	ldh [hMathBuffer + 2], a
 	ldh [hMathBuffer + 3], a
@@ -36,7 +36,7 @@
 
 	ldh a, [hMathBuffer + 1]
 	ld c, a
-	ldh a, [hProduct]
+	ldh a, [hMultiplicand - 1]
 	adc c
 	ldh [hMathBuffer + 1], a
 
@@ -58,9 +58,9 @@
 	rla
 	ldh [hMultiplicand + 0], a
 
-	ldh a, [hProduct]
+	ldh a, [hMultiplicand - 1]
 	rla
-	ldh [hProduct], a
+	ldh [hMultiplicand - 1], a
 
 	jr .loop
 
--- a/engine/menus/intro_menu.asm
+++ b/engine/menus/intro_menu.asm
@@ -67,7 +67,7 @@
 	call OakSpeech
 	call InitializeWorld
 	ld a, 1
-	ld [wPreviousLandmark], a
+	ld [wPrevLandmark], a
 
 	ld a, SPAWN_HOME
 	ld [wDefaultSpawnpoint], a
--- a/engine/menus/naming_screen.asm
+++ b/engine/menus/naming_screen.asm
@@ -672,7 +672,7 @@
 MailComposition_TryAddCharacter:
 	ld a, [wNamingScreenMaxNameLength]
 	ld c, a
-	ld a, [wNamingScreenCurrNameLength]
+	ld a, [wNamingScreenCurNameLength]
 	cp c
 	ret nc
 
@@ -683,7 +683,7 @@
 	ld [hl], a
 
 NamingScreen_AdvanceCursor_CheckEndOfString:
-	ld hl, wNamingScreenCurrNameLength
+	ld hl, wNamingScreenCurNameLength
 	inc [hl]
 	call NamingScreen_GetTextCursorPosition
 	ld a, [hl]
@@ -698,11 +698,11 @@
 	ret
 
 ; unused
-	ld a, [wNamingScreenCurrNameLength]
+	ld a, [wNamingScreenCurNameLength]
 	and a
 	ret z
 	push hl
-	ld hl, wNamingScreenCurrNameLength
+	ld hl, wNamingScreenCurNameLength
 	dec [hl]
 	call NamingScreen_GetTextCursorPosition
 	ld c, [hl]
@@ -724,7 +724,7 @@
 INCLUDE "data/text/unused_dakutens.asm"
 
 NamingScreen_DeleteCharacter:
-	ld hl, wNamingScreenCurrNameLength
+	ld hl, wNamingScreenCurNameLength
 	ld a, [hl]
 	and a
 	ret z
@@ -744,7 +744,7 @@
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
-	ld a, [wNamingScreenCurrNameLength]
+	ld a, [wNamingScreenCurNameLength]
 	ld e, a
 	ld d, 0
 	add hl, de
@@ -874,7 +874,7 @@
 	ld [wJumptableIndex], a
 	ld [wNamingScreenLetterCase], a
 	ldh [hBGMapMode], a
-	ld [wNamingScreenCurrNameLength], a
+	ld [wNamingScreenCurNameLength], a
 	ld a, $7
 	ldh [hWX], a
 	ret
@@ -1109,7 +1109,7 @@
 	call NamingScreen_GetLastCharacter
 	call MailComposition_TryAddLastCharacter
 	jr c, .start
-	ld hl, wNamingScreenCurrNameLength
+	ld hl, wNamingScreenCurNameLength
 	ld a, [hl]
 	cp MAIL_LINE_LENGTH
 	ret nz
@@ -1135,7 +1135,7 @@
 
 .b
 	call NamingScreen_DeleteCharacter
-	ld hl, wNamingScreenCurrNameLength
+	ld hl, wNamingScreenCurNameLength
 	ld a, [hl]
 	cp MAIL_LINE_LENGTH
 	ret nz
@@ -1350,13 +1350,13 @@
 	jp MailComposition_TryAddCharacter
 
 ; unused
-	ld a, [wNamingScreenCurrNameLength]
+	ld a, [wNamingScreenCurNameLength]
 	and a
 	ret z
 	cp $11
 	jr nz, .asm_121c3
 	push hl
-	ld hl, wNamingScreenCurrNameLength
+	ld hl, wNamingScreenCurNameLength
 	dec [hl]
 	dec [hl]
 	jr .asm_121c8
@@ -1363,7 +1363,7 @@
 
 .asm_121c3
 	push hl
-	ld hl, wNamingScreenCurrNameLength
+	ld hl, wNamingScreenCurNameLength
 	dec [hl]
 
 .asm_121c8
--- a/engine/menus/save.asm
+++ b/engine/menus/save.asm
@@ -489,9 +489,9 @@
 	ld de, sPlayerData
 	ld bc, wPlayerDataEnd - wPlayerData
 	call CopyBytes
-	ld hl, wCurrMapData
-	ld de, sCurrMapData
-	ld bc, wCurrMapDataEnd - wCurrMapData
+	ld hl, wCurMapData
+	ld de, sCurMapData
+	ld bc, wCurMapDataEnd - wCurMapData
 	call CopyBytes
 	jp CloseSRAM
 
@@ -550,9 +550,9 @@
 	ld de, sBackupPlayerData
 	ld bc, wPlayerDataEnd - wPlayerData
 	call CopyBytes
-	ld hl, wCurrMapData
-	ld de, sBackupCurrMapData
-	ld bc, wCurrMapDataEnd - wCurrMapData
+	ld hl, wCurMapData
+	ld de, sBackupCurMapData
+	ld bc, wCurMapDataEnd - wCurMapData
 	call CopyBytes
 	call CloseSRAM
 	ret
@@ -724,9 +724,9 @@
 	ld de, wPlayerData
 	ld bc, wPlayerDataEnd - wPlayerData
 	call CopyBytes
-	ld hl, sCurrMapData
-	ld de, wCurrMapData
-	ld bc, wCurrMapDataEnd - wCurrMapData
+	ld hl, sCurMapData
+	ld de, wCurMapData
+	ld bc, wCurMapDataEnd - wCurMapData
 	call CopyBytes
 	call CloseSRAM
 	ld a, BANK(sBattleTowerChallengeState)
@@ -779,9 +779,9 @@
 	ld de, wPlayerData
 	ld bc, wPlayerDataEnd - wPlayerData
 	call CopyBytes
-	ld hl, sBackupCurrMapData
-	ld de, wCurrMapData
-	ld bc, wCurrMapDataEnd - wCurrMapData
+	ld hl, sBackupCurMapData
+	ld de, wCurMapData
+	ld bc, wCurMapDataEnd - wCurMapData
 	call CopyBytes
 	call CloseSRAM
 	ret
--- a/engine/overworld/events.asm
+++ b/engine/overworld/events.asm
@@ -401,7 +401,7 @@
 	ret
 
 RunSceneScript:
-	ld a, [wCurrMapSceneScriptCount]
+	ld a, [wCurMapSceneScriptCount]
 	and a
 	jr z, .nope
 
@@ -412,7 +412,7 @@
 
 	ld e, a
 	ld d, 0
-	ld hl, wCurrMapSceneScriptsPointer
+	ld hl, wCurMapSceneScriptsPointer
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
--- a/engine/overworld/variables.asm
+++ b/engine/overworld/variables.asm
@@ -61,7 +61,7 @@
 	dwb wSpecialPhoneCallID,            RETVAR_STRBUF2
 	dwb wNrOfBeatenBattleTowerTrainers, RETVAR_STRBUF2
 	dwb wKurtApricornQuantity,          RETVAR_STRBUF2
-	dwb wCurrentCaller,                 RETVAR_ADDR_DE
+	dwb wCurCaller,                     RETVAR_ADDR_DE
 	dwb wBlueCardBalance,               RETVAR_ADDR_DE
 	dwb wBuenasPassword,                RETVAR_ADDR_DE
 	dwb wKenjiBreakTimer,               RETVAR_STRBUF2
--- a/engine/overworld/wildmons.asm
+++ b/engine/overworld/wildmons.asm
@@ -738,14 +738,14 @@
 	ret
 
 _BackUpMapIndices:
-	ld a, [wRoamMons_CurrentMapNumber]
+	ld a, [wRoamMons_CurMapNumber]
 	ld [wRoamMons_LastMapNumber], a
-	ld a, [wRoamMons_CurrentMapGroup]
+	ld a, [wRoamMons_CurMapGroup]
 	ld [wRoamMons_LastMapGroup], a
 	ld a, [wMapNumber]
-	ld [wRoamMons_CurrentMapNumber], a
+	ld [wRoamMons_CurMapNumber], a
 	ld a, [wMapGroup]
-	ld [wRoamMons_CurrentMapGroup], a
+	ld [wRoamMons_CurMapGroup], a
 	ret
 
 INCLUDE "data/wild/roammon_maps.asm"
--- a/engine/phone/phone.asm
+++ b/engine/phone/phone.asm
@@ -321,7 +321,7 @@
 	jr nz, .OutOfArea
 	; If the person can't take a call at that time, don't do the call
 	ld a, b
-	ld [wCurrentCaller], a
+	ld [wCurCaller], a
 	ld hl, PhoneContacts
 	ld bc, PHONE_TABLE_WIDTH
 	call AddNTimes
@@ -389,7 +389,7 @@
 	nop
 	nop
 	ld a, e
-	ld [wCurrentCaller], a
+	ld [wCurCaller], a
 	and a
 	jr nz, .actualcaller
 	ld a, BANK(WrongNumber)
@@ -463,7 +463,7 @@
 	ret
 
 Phone_CallerTextboxWithName:
-	ld a, [wCurrentCaller]
+	ld a, [wCurCaller]
 	ld b, a
 	call Function90363
 	ret
@@ -680,12 +680,12 @@
 	ret
 
 GetCallerLocation:
-	ld a, [wCurrentCaller]
+	ld a, [wCurCaller]
 	call GetCallerTrainerClass
 	ld d, c
 	ld e, b
 	push de
-	ld a, [wCurrentCaller]
+	ld a, [wCurCaller]
 	ld hl, PhoneContacts + PHONE_CONTACT_MAP_GROUP
 	ld bc, PHONE_TABLE_WIDTH
 	call AddNTimes
--- a/engine/pokedex/pokedex.asm
+++ b/engine/pokedex/pokedex.asm
@@ -58,7 +58,7 @@
 	call PlaySFX
 	call WaitSFX
 	call ClearSprites
-	ld a, [wCurrentDexMode]
+	ld a, [wCurDexMode]
 	ld [wLastDexMode], a
 
 	pop af
@@ -96,7 +96,7 @@
 	call Pokedex_CheckUnlockedUnownMode
 
 	ld a, [wLastDexMode]
-	ld [wCurrentDexMode], a
+	ld [wCurDexMode], a
 
 	call Pokedex_OrderMonsByMode
 	call Pokedex_InitCursorPosition
@@ -178,7 +178,7 @@
 	call GetWorldMapLocation
 
 .load
-	ld [wDexCurrentLocation], a
+	ld [wDexCurLocation], a
 	ret
 
 Pokedex_RunJumptable:
@@ -235,7 +235,7 @@
 	ld a, POKEDEX_SCX
 	ldh [hSCX], a
 
-	ld a, [wCurrentDexMode]
+	ld a, [wCurDexMode]
 	cp DEXMODE_OLD
 	ld a, $4a
 	jr z, .okay
@@ -442,7 +442,7 @@
 	ld a, $90
 	ldh [hWY], a
 	call Pokedex_GetSelectedMon
-	ld a, [wDexCurrentLocation]
+	ld a, [wDexCurLocation]
 	ld e, a
 	predef Pokedex_GetArea
 	call Pokedex_BlackOutBG
@@ -513,7 +513,7 @@
 	call ClearSprites
 	call Pokedex_DrawOptionScreenBG
 	call Pokedex_InitArrowCursor
-	ld a, [wCurrentDexMode] ; Index of the topmost visible item in a scrolling menu ???
+	ld a, [wCurDexMode] ; Index of the topmost visible item in a scrolling menu ???
 	ld [wDexArrowCursorPosIndex], a
 	call Pokedex_DisplayModeDescription
 	call WaitBGMap
@@ -585,12 +585,12 @@
 	ld b, DEXMODE_ABC
 
 .ChangeMode:
-	ld a, [wCurrentDexMode]
+	ld a, [wCurDexMode]
 	cp b
 	jr z, .skip_changing_mode ; Skip if new mode is same as current.
 
 	ld a, b
-	ld [wCurrentDexMode], a
+	ld [wCurDexMode], a
 	call Pokedex_OrderMonsByMode
 	call Pokedex_DisplayChangingModesMessage
 	xor a
@@ -799,7 +799,7 @@
 	call Pokedex_LoadUnownFont
 	call Pokedex_DrawUnownModeBG
 	xor a
-	ld [wDexCurrentUnownIndex], a
+	ld [wDexCurUnownIndex], a
 	call Pokedex_LoadUnownFrontpicTiles
 	call Pokedex_UnownModePlaceCursor
 	farcall PrintUnownWord
@@ -849,7 +849,7 @@
 .right
 	ld a, [wDexUnownCount]
 	ld e, a
-	ld hl, wDexCurrentUnownIndex
+	ld hl, wDexCurUnownIndex
 	ld a, [hl]
 	inc a
 	cp e
@@ -859,7 +859,7 @@
 	jr .update
 
 .left
-	ld hl, wDexCurrentUnownIndex
+	ld hl, wDexCurUnownIndex
 	ld a, [hl]
 	and a
 	ret z
@@ -886,7 +886,7 @@
 	jr Pokedex_UnownModeUpdateCursorGfx
 
 Pokedex_UnownModePlaceCursor:
-	ld a, [wDexCurrentUnownIndex]
+	ld a, [wDexCurUnownIndex]
 	ld c, $5a ; diamond cursor
 
 Pokedex_UnownModeUpdateCursorGfx:
@@ -1460,7 +1460,7 @@
 ; Prints the list of Pokémon on the main Pokédex screen.
 
 ; This check is completely useless.
-	ld a, [wCurrentDexMode]
+	ld a, [wCurDexMode]
 	cp DEXMODE_OLD
 	jr z, .okay
 	ld c, 11
@@ -1522,7 +1522,7 @@
 	ret
 
 Pokedex_PrintNumberIfOldMode:
-	ld a, [wCurrentDexMode]
+	ld a, [wCurDexMode]
 	cp DEXMODE_OLD
 	jr z, .printnum
 	ret
@@ -1613,7 +1613,7 @@
 	ld bc, wPokedexOrderEnd - wPokedexOrder
 	xor a
 	call ByteFill
-	ld a, [wCurrentDexMode]
+	ld a, [wCurDexMode]
 	ld hl, .Jumptable
 	call Pokedex_LoadPointer
 	jp hl
@@ -1968,7 +1968,7 @@
 	next "was not found.@"
 
 Pokedex_UpdateCursorOAM:
-	ld a, [wCurrentDexMode]
+	ld a, [wCurDexMode]
 	cp DEXMODE_OLD
 	jp z, Pokedex_PutOldModeCursorOAM
 	call Pokedex_PutNewModeABCModeCursorOAM
@@ -2070,7 +2070,7 @@
 	db -1
 
 Pokedex_UpdateSearchResultsCursorOAM:
-	ld a, [wCurrentDexMode]
+	ld a, [wCurDexMode]
 	cp DEXMODE_OLD
 	jp z, Pokedex_PutOldModeCursorOAM
 	ld hl, .CursorOAM
@@ -2498,7 +2498,7 @@
 Pokedex_LoadUnownFrontpicTiles:
 	ld a, [wUnownLetter]
 	push af
-	ld a, [wDexCurrentUnownIndex]
+	ld a, [wDexCurUnownIndex]
 	ld e, a
 	ld d, 0
 	ld hl, wUnownDex
--- a/engine/pokedex/pokedex_3.asm
+++ b/engine/pokedex/pokedex_3.asm
@@ -43,7 +43,7 @@
 	ld [hl], $3f
 	hlcoord 5, 16
 	ld [hl], $40
-	ld a, [wCurrentDexMode]
+	ld a, [wCurDexMode]
 	cp DEXMODE_OLD
 	jr z, .OldMode
 ; scroll bar
--- a/engine/pokedex/unown_dex.asm
+++ b/engine/pokedex/unown_dex.asm
@@ -23,7 +23,7 @@
 	ld bc, 12
 	ld a, " "
 	call ByteFill
-	ld a, [wDexCurrentUnownIndex]
+	ld a, [wDexCurUnownIndex]
 	ld e, a
 	ld d, 0
 	ld hl, wUnownDex
--- a/engine/pokegear/pokegear.asm
+++ b/engine/pokegear/pokegear.asm
@@ -1573,7 +1573,7 @@
 
 LoadStation_OaksPokemonTalk:
 	xor a ; OAKS_POKEMON_TALK
-	ld [wCurrentRadioLine], a
+	ld [wCurRadioLine], a
 	ld [wNumRadioLinesPrinted], a
 	ld a, BANK(PlayRadioShow)
 	ld hl, PlayRadioShow
@@ -1583,7 +1583,7 @@
 
 LoadStation_PokedexShow:
 	ld a, POKEDEX_SHOW
-	ld [wCurrentRadioLine], a
+	ld [wCurRadioLine], a
 	xor a
 	ld [wNumRadioLinesPrinted], a
 	ld a, BANK(PlayRadioShow)
@@ -1594,7 +1594,7 @@
 
 LoadStation_PokemonMusic:
 	ld a, POKEMON_MUSIC
-	ld [wCurrentRadioLine], a
+	ld [wCurRadioLine], a
 	xor a
 	ld [wNumRadioLinesPrinted], a
 	ld a, BANK(PlayRadioShow)
@@ -1605,7 +1605,7 @@
 
 LoadStation_LuckyChannel:
 	ld a, LUCKY_CHANNEL
-	ld [wCurrentRadioLine], a
+	ld [wCurRadioLine], a
 	xor a
 	ld [wNumRadioLinesPrinted], a
 	ld a, BANK(PlayRadioShow)
@@ -1616,7 +1616,7 @@
 
 LoadStation_BuenasPassword:
 	ld a, BUENAS_PASSWORD
-	ld [wCurrentRadioLine], a
+	ld [wCurRadioLine], a
 	xor a
 	ld [wNumRadioLinesPrinted], a
 	ld a, BANK(PlayRadioShow)
@@ -1634,7 +1634,7 @@
 
 LoadStation_UnownRadio:
 	ld a, UNOWN_RADIO
-	ld [wCurrentRadioLine], a
+	ld [wCurRadioLine], a
 	xor a
 	ld [wNumRadioLinesPrinted], a
 	ld a, BANK(PlayRadioShow)
@@ -1645,7 +1645,7 @@
 
 LoadStation_PlacesAndPeople:
 	ld a, PLACES_AND_PEOPLE
-	ld [wCurrentRadioLine], a
+	ld [wCurRadioLine], a
 	xor a
 	ld [wNumRadioLinesPrinted], a
 	ld a, BANK(PlayRadioShow)
@@ -1656,7 +1656,7 @@
 
 LoadStation_LetsAllSing:
 	ld a, LETS_ALL_SING
-	ld [wCurrentRadioLine], a
+	ld [wCurRadioLine], a
 	xor a
 	ld [wNumRadioLinesPrinted], a
 	ld a, BANK(PlayRadioShow)
@@ -1667,7 +1667,7 @@
 
 LoadStation_RocketRadio:
 	ld a, ROCKET_RADIO
-	ld [wCurrentRadioLine], a
+	ld [wCurRadioLine], a
 	xor a
 	ld [wNumRadioLinesPrinted], a
 	ld a, BANK(PlayRadioShow)
@@ -1678,7 +1678,7 @@
 
 LoadStation_PokeFluteRadio:
 	ld a, POKE_FLUTE_RADIO
-	ld [wCurrentRadioLine], a
+	ld [wCurRadioLine], a
 	xor a
 	ld [wNumRadioLinesPrinted], a
 	ld a, BANK(PlayRadioShow)
@@ -1689,7 +1689,7 @@
 
 LoadStation_EvolutionRadio:
 	ld a, EVOLUTION_RADIO
-	ld [wCurrentRadioLine], a
+	ld [wCurRadioLine], a
 	xor a
 	ld [wNumRadioLinesPrinted], a
 	ld a, BANK(PlayRadioShow)
--- a/engine/pokegear/radio.asm
+++ b/engine/pokegear/radio.asm
@@ -1,6 +1,6 @@
 PlayRadioShow:
 ; If we're already in the radio program proper, we don't need to be here.
-	ld a, [wCurrentRadioLine]
+	ld a, [wCurRadioLine]
 	cp POKE_FLUTE_RADIO
 	jr nc, .ok
 ; If Team Rocket is not occupying the radio tower, we don't need to be here.
@@ -13,10 +13,10 @@
 	jr nz, .ok
 ; Team Rocket broadcasts on all stations.
 	ld a, ROCKET_RADIO
-	ld [wCurrentRadioLine], a
+	ld [wCurRadioLine], a
 .ok
-; Jump to the currently loaded station.  The index to which we need to jump is in wCurrentRadioLine.
-	ld a, [wCurrentRadioLine]
+; Jump to the currently loaded station.  The index to which we need to jump is in wCurRadioLine.
+	ld a, [wCurRadioLine]
 	ld e, a
 	ld d, 0
 	ld hl, RadioJumptable
@@ -145,7 +145,7 @@
 	call PrintTextBoxText
 .skip
 	ld a, RADIO_SCROLL
-	ld [wCurrentRadioLine], a
+	ld [wCurRadioLine], a
 	ld a, 100
 	ld [wRadioTextDelay], a
 	ret
@@ -175,7 +175,7 @@
 	ret
 .proceed
 	ld a, [wNextRadioLine]
-	ld [wCurrentRadioLine], a
+	ld [wCurRadioLine], a
 	ld a, [wNumRadioLinesPrinted]
 	cp 1
 	call nz, CopyBottomLineToTopLine
@@ -592,7 +592,7 @@
 	ld hl, OPT_PokemonChannelText
 	call PrintText
 	ld a, OAKS_POKEMON_TALK_11
-	ld [wCurrentRadioLine], a
+	ld [wCurRadioLine], a
 	ld a, 100
 	ld [wRadioTextDelay], a
 	ret
@@ -654,7 +654,7 @@
 	xor a
 	ld [wNumRadioLinesPrinted], a
 	ld a, RADIO_SCROLL
-	ld [wCurrentRadioLine], a
+	ld [wCurRadioLine], a
 	ld a, 10
 	ld [wRadioTextDelay], a
 	ret
@@ -663,7 +663,7 @@
 	db "@"
 
 PlaceRadioString:
-	ld [wCurrentRadioLine], a
+	ld [wCurRadioLine], a
 	ld a, 100
 	ld [wRadioTextDelay], a
 	jp PlaceString
@@ -1779,7 +1779,7 @@
 	ld hl, wDailyFlags2
 	res DAILYFLAGS2_BUENAS_PASSWORD_F, [hl]
 	ld a, BUENAS_PASSWORD
-	ld [wCurrentRadioLine], a
+	ld [wCurRadioLine], a
 	xor a
 	ld [wNumRadioLinesPrinted], a
 	ld hl, BuenaOffTheAirText
@@ -1788,7 +1788,7 @@
 
 BuenasPassword21:
 	ld a, BUENAS_PASSWORD
-	ld [wCurrentRadioLine], a
+	ld [wCurRadioLine], a
 	xor a
 	ld [wNumRadioLinesPrinted], a
 	call BuenasPasswordCheckTime
@@ -1911,7 +1911,7 @@
 	call RadioTerminator
 	call PrintText
 	ld hl, RadioChannelSongs
-	ld a, [wCurrentRadioLine]
+	ld a, [wCurRadioLine]
 	ld c, a
 	ld b, 0
 	add hl, bc
--- a/home/map.asm
+++ b/home/map.asm
@@ -8,9 +8,9 @@
 	ret
 
 CheckScenes::
-; Checks wCurrMapSceneScriptPointer.  If it's empty, returns -1 in a.  Otherwise, returns the active scene ID in a.
+; Checks wCurMapSceneScriptPointer.  If it's empty, returns -1 in a.  Otherwise, returns the active scene ID in a.
 	push hl
-	ld hl, wCurrMapSceneScriptPointer
+	ld hl, wCurMapSceneScriptPointer
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
@@ -24,24 +24,24 @@
 	ret
 
 GetCurrentMapSceneID::
-; Grabs the wram map scene script pointer for the current map and loads it into wCurrMapSceneScriptPointer.
-; If there is no scene, both bytes of wCurrMapSceneScriptPointer are wiped clean.
+; Grabs the wram map scene script pointer for the current map and loads it into wCurMapSceneScriptPointer.
+; If there is no scene, both bytes of wCurMapSceneScriptPointer are wiped clean.
 ; Copy the current map group and number into bc.  This is needed for GetMapSceneID.
 	ld a, [wMapGroup]
 	ld b, a
 	ld a, [wMapNumber]
 	ld c, a
-; Blank out wCurrMapSceneScriptPointer; this is the default scenario.
+; Blank out wCurMapSceneScriptPointer; this is the default scenario.
 	xor a
-	ld [wCurrMapSceneScriptPointer], a
-	ld [wCurrMapSceneScriptPointer + 1], a
+	ld [wCurMapSceneScriptPointer], a
+	ld [wCurMapSceneScriptPointer + 1], a
 	call GetMapSceneID
 	ret c ; The map is not in the scene script table
-; Load the scene script pointer from de into wCurrMapSceneScriptPointer
+; Load the scene script pointer from de into wCurMapSceneScriptPointer
 	ld a, e
-	ld [wCurrMapSceneScriptPointer], a
+	ld [wCurMapSceneScriptPointer], a
 	ld a, d
-	ld [wCurrMapSceneScriptPointer + 1], a
+	ld [wCurMapSceneScriptPointer + 1], a
 	xor a
 	ret
 
@@ -254,12 +254,12 @@
 	ld a, [wPlayerStandingMapX]
 	sub 4
 	ld d, a
-	ld a, [wCurrMapWarpCount]
+	ld a, [wCurMapWarpCount]
 	and a
 	ret z
 
 	ld c, a
-	ld hl, wCurrMapWarpsPointer
+	ld hl, wCurMapWarpsPointer
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
@@ -292,7 +292,7 @@
 	call .IncreaseHLTwice
 	ret nc ; never encountered
 
-	ld a, [wCurrMapWarpCount]
+	ld a, [wCurMapWarpCount]
 	inc a
 	sub c
 	ld c, a
@@ -319,7 +319,7 @@
 
 .CopyWarpData:
 	push bc
-	ld hl, wCurrMapWarpsPointer
+	ld hl, wCurMapWarpsPointer
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
@@ -489,11 +489,11 @@
 ReadMapSceneScripts::
 	ld a, [hli] ; scene script count
 	ld c, a
-	ld [wCurrMapSceneScriptCount], a ; current map scene script count
+	ld [wCurMapSceneScriptCount], a
 	ld a, l
-	ld [wCurrMapSceneScriptsPointer], a ; map scene script pointer
+	ld [wCurMapSceneScriptsPointer], a
 	ld a, h
-	ld [wCurrMapSceneScriptsPointer + 1], a
+	ld [wCurMapSceneScriptsPointer + 1], a
 	ld a, c
 	and a
 	ret z
@@ -505,11 +505,11 @@
 ReadMapCallbacks::
 	ld a, [hli]
 	ld c, a
-	ld [wCurrMapCallbackCount], a
+	ld [wCurMapCallbackCount], a
 	ld a, l
-	ld [wCurrMapCallbacksPointer], a
+	ld [wCurMapCallbacksPointer], a
 	ld a, h
-	ld [wCurrMapCallbacksPointer + 1], a
+	ld [wCurMapCallbacksPointer + 1], a
 	ld a, c
 	and a
 	ret z
@@ -521,11 +521,11 @@
 ReadWarps::
 	ld a, [hli]
 	ld c, a
-	ld [wCurrMapWarpCount], a
+	ld [wCurMapWarpCount], a
 	ld a, l
-	ld [wCurrMapWarpsPointer], a
+	ld [wCurMapWarpsPointer], a
 	ld a, h
-	ld [wCurrMapWarpsPointer + 1], a
+	ld [wCurMapWarpsPointer + 1], a
 	ld a, c
 	and a
 	ret z
@@ -536,11 +536,11 @@
 ReadCoordEvents::
 	ld a, [hli]
 	ld c, a
-	ld [wCurrMapCoordEventCount], a
+	ld [wCurMapCoordEventCount], a
 	ld a, l
-	ld [wCurrMapCoordEventsPointer], a
+	ld [wCurMapCoordEventsPointer], a
 	ld a, h
-	ld [wCurrMapCoordEventsPointer + 1], a
+	ld [wCurMapCoordEventsPointer + 1], a
 
 	ld a, c
 	and a
@@ -553,11 +553,11 @@
 ReadBGEvents::
 	ld a, [hli]
 	ld c, a
-	ld [wCurrMapBGEventCount], a
+	ld [wCurMapBGEventCount], a
 	ld a, l
-	ld [wCurrMapBGEventsPointer], a
+	ld [wCurMapBGEventsPointer], a
 	ld a, h
-	ld [wCurrMapBGEventsPointer + 1], a
+	ld [wCurMapBGEventsPointer + 1], a
 
 	ld a, c
 	and a
@@ -574,17 +574,17 @@
 	ld hl, wMap1Object
 	ld a, [de]
 	inc de
-	ld [wCurrMapObjectEventCount], a
+	ld [wCurMapObjectEventCount], a
 	ld a, e
-	ld [wCurrMapObjectEventsPointer], a
+	ld [wCurMapObjectEventsPointer], a
 	ld a, d
-	ld [wCurrMapObjectEventsPointer + 1], a
+	ld [wCurMapObjectEventsPointer + 1], a
 
-	ld a, [wCurrMapObjectEventCount]
+	ld a, [wCurMapObjectEventCount]
 	call CopyMapObjectEvents
 
-; get NUM_OBJECTS - [wCurrMapObjectEventCount]
-	ld a, [wCurrMapObjectEventCount]
+; get NUM_OBJECTS - [wCurMapObjectEventCount]
+	ld a, [wCurMapObjectEventCount]
 	ld c, a
 	ld a, NUM_OBJECTS ; - 1
 	sub c
@@ -971,11 +971,11 @@
 	ret
 
 .FindCallback:
-	ld a, [wCurrMapCallbackCount]
+	ld a, [wCurMapCallbackCount]
 	ld c, a
 	and a
 	ret z
-	ld hl, wCurrMapCallbacksPointer
+	ld hl, wCurMapCallbacksPointer
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
@@ -1767,7 +1767,7 @@
 	sub 4
 	ld e, a
 ; If there are no BG events, we don't need to be here.
-	ld a, [wCurrMapBGEventCount]
+	ld a, [wCurMapBGEventCount]
 	and a
 	ret z
 
@@ -1783,7 +1783,7 @@
 
 CheckIfFacingTileCoordIsBGEvent::
 ; Checks to see if you are facing a BG event.  If so, copies it into wEngineBuffer1 and sets carry.
-	ld hl, wCurrMapBGEventsPointer
+	ld hl, wCurMapBGEventsPointer
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
@@ -1821,7 +1821,7 @@
 
 CheckCurrentMapCoordEvents::
 ; If there are no coord events, we don't need to be here.
-	ld a, [wCurrMapCoordEventCount]
+	ld a, [wCurMapCoordEventCount]
 	and a
 	ret z
 ; Copy the coord event count into c.
@@ -1837,7 +1837,7 @@
 
 .CoordEventCheck:
 ; Checks to see if you are standing on a coord event.  If yes, copies the event to wEngineBuffer1 and sets carry.
-	ld hl, wCurrMapCoordEventsPointer
+	ld hl, wCurMapCoordEventsPointer
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
--- a/home/stone_queue.asm
+++ b/home/stone_queue.asm
@@ -56,11 +56,11 @@
 	ret
 
 .check_on_warp
-	ld hl, wCurrMapWarpsPointer
+	ld hl, wCurMapWarpsPointer
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
-	ld a, [wCurrMapWarpCount]
+	ld a, [wCurMapWarpCount]
 	and a
 	jr z, .nope2
 
@@ -94,7 +94,7 @@
 .found_warp
 	pop af
 	ld d, a
-	ld a, [wCurrMapWarpCount]
+	ld a, [wCurMapWarpCount]
 	sub d
 	inc a
 	scf
--- a/mobile/mobile_45.asm
+++ b/mobile/mobile_45.asm
@@ -416,7 +416,7 @@
 	pop hl
 	push af
 	ld a, [hli]
-	ld [wCurrMapBGEventCount], a
+	ld [wCurMapBGEventCount], a
 	ldh [hFF8C], a
 	ld [MBC3SRamBank], a
 	ld a, [hli]
@@ -658,7 +658,7 @@
 .asm_11451c
 	pop hl
 	ld a, [hli]
-	ld [wCurrMapBGEventCount], a
+	ld [wCurMapBGEventCount], a
 	ldh [hFF8C], a
 	ld [MBC3SRamBank], a
 	ld e, [hl]
@@ -675,7 +675,7 @@
 .asm_114537
 	ld hl, $dc06
 	ld a, [hl]
-	ld [wCurrMapBGEventCount], a
+	ld [wCurMapBGEventCount], a
 	ldh [hFF8C], a
 	ld [MBC3SRamBank], a
 	ld hl, $dc09
@@ -686,7 +686,7 @@
 	ld a, d
 	or e
 	jr z, .asm_114559
-	ld hl, wCurrMapSceneScriptCount
+	ld hl, wCurMapSceneScriptCount
 	ld e, [hl]
 	inc hl
 	ld d, [hl]
@@ -1229,7 +1229,7 @@
 Function114867:
 	ld hl, $dc06
 	ld a, [hli]
-	ld [wCurrMapBGEventCount], a
+	ld [wCurMapBGEventCount], a
 	ldh [hFF8C], a
 	ld [MBC3SRamBank], a
 	ld e, [hl]
@@ -1257,7 +1257,7 @@
 	inc e
 	call z, Function1148b9
 	ld hl, $dc06
-	ld a, [wCurrMapBGEventCount]
+	ld a, [wCurMapBGEventCount]
 	ld [hli], a
 	ld [hl], e
 	inc hl
@@ -1286,7 +1286,7 @@
 
 Function1148b9:
 	push bc
-	ld bc, wCurrMapBGEventCount
+	ld bc, wCurMapBGEventCount
 	call Function115d80
 	pop bc
 	ret
@@ -1294,7 +1294,7 @@
 Function1148c2:
 	ld hl, $dc06
 	ld a, [hli]
-	ld [wCurrMapBGEventCount], a
+	ld [wCurMapBGEventCount], a
 	ldh [hFF8C], a
 	ld [MBC3SRamBank], a
 	ld e, [hl]
@@ -1347,7 +1347,7 @@
 	inc e
 	call z, Function114944
 	ld hl, $dc06
-	ld a, [wCurrMapBGEventCount]
+	ld a, [wCurMapBGEventCount]
 	ld [hli], a
 	ld [hl], e
 	inc hl
@@ -1384,7 +1384,7 @@
 
 Function114944:
 	push bc
-	ld bc, wCurrMapBGEventCount
+	ld bc, wCurMapBGEventCount
 	call Function115d80
 	pop bc
 	ret
@@ -1392,7 +1392,7 @@
 Function11494d:
 	ld hl, $dc06
 	ld a, [hli]
-	ld [wCurrMapBGEventCount], a
+	ld [wCurMapBGEventCount], a
 	ldh [hFF8C], a
 	ld [MBC3SRamBank], a
 	ld e, [hl]
@@ -1437,7 +1437,7 @@
 	inc e
 	call z, Function1149c3
 	ld hl, $dc06
-	ld a, [wCurrMapBGEventCount]
+	ld a, [wCurMapBGEventCount]
 	ld [hli], a
 	ld [hl], e
 	inc hl
@@ -1474,7 +1474,7 @@
 
 Function1149c3:
 	push bc
-	ld bc, wCurrMapBGEventCount
+	ld bc, wCurMapBGEventCount
 	call Function115d80
 	pop bc
 	ret
@@ -1482,7 +1482,7 @@
 Function1149cc:
 	ld hl, $dc06
 	ld a, [hl]
-	ld [wCurrMapBGEventCount], a
+	ld [wCurMapBGEventCount], a
 	ldh [hFF8C], a
 	ld [MBC3SRamBank], a
 	push de
@@ -1501,7 +1501,7 @@
 	ld [hl], d
 	dec hl
 	ld [hl], e
-	ld hl, wCurrMapSceneScriptCount
+	ld hl, wCurMapSceneScriptCount
 	ld e, [hl]
 	inc hl
 	ld d, [hl]
@@ -1514,7 +1514,7 @@
 	inc e
 	call z, Function114a0f
 	ld hl, $dc06
-	ld a, [wCurrMapBGEventCount]
+	ld a, [wCurMapBGEventCount]
 	ld [hli], a
 	ld [hl], e
 	inc hl
@@ -1530,7 +1530,7 @@
 
 Function114a0f:
 	push bc
-	ld bc, wCurrMapBGEventCount
+	ld bc, wCurMapBGEventCount
 	call Function115d80
 	pop bc
 	ret
@@ -1829,7 +1829,7 @@
 .asm_114b96
 	ld hl, $dc06
 	ld a, [hli]
-	ld [wCurrMapBGEventCount], a
+	ld [wCurMapBGEventCount], a
 	ldh [hFF8C], a
 	ld [MBC3SRamBank], a
 	ld e, [hl]
@@ -1878,7 +1878,7 @@
 	jr z, .asm_114bff
 	pop hl
 	ld a, [hli]
-	ld [wCurrMapBGEventCount], a
+	ld [wCurMapBGEventCount], a
 	ldh [hFF8C], a
 	ld [MBC3SRamBank], a
 	ld a, [hli]
@@ -2103,7 +2103,7 @@
 .asm_114d11
 	pop hl
 	ld a, [hli]
-	ld [wCurrMapBGEventCount], a
+	ld [wCurMapBGEventCount], a
 	ldh [hFF8C], a
 	ld [MBC3SRamBank], a
 	ld a, [hli]
@@ -2401,7 +2401,7 @@
 Function114ea0:
 	ld hl, $dc06
 	ld a, [hli]
-	ld [wCurrMapBGEventCount], a
+	ld [wCurMapBGEventCount], a
 	ldh [hFF8C], a
 	ld [MBC3SRamBank], a
 	ld a, [hli]
@@ -2426,7 +2426,7 @@
 	inc e
 	call z, Function114ee0
 	ld hl, $dc06
-	ld a, [wCurrMapBGEventCount]
+	ld a, [wCurMapBGEventCount]
 	ld [hli], a
 	ld a, e
 	ld [hli], a
@@ -2446,7 +2446,7 @@
 
 Function114ee0:
 	push bc
-	ld bc, wCurrMapBGEventCount
+	ld bc, wCurMapBGEventCount
 	call Function115d80
 	pop bc
 	ret
@@ -2679,7 +2679,7 @@
 	push hl
 	ld hl, $dc06
 	ld a, [hli]
-	ld [wCurrMapBGEventCount], a
+	ld [wCurMapBGEventCount], a
 	ldh [hFF8C], a
 	ld [MBC3SRamBank], a
 	ld a, [hli]
@@ -2706,7 +2706,7 @@
 
 .asm_115046
 	ld hl, $dc06
-	ld a, [wCurrMapBGEventCount]
+	ld a, [wCurMapBGEventCount]
 	ld [hli], a
 	ld a, e
 	ld [hli], a
@@ -2724,7 +2724,7 @@
 
 Function115059:
 	push bc
-	ld bc, wCurrMapBGEventCount
+	ld bc, wCurMapBGEventCount
 	call Function115d80
 	pop bc
 	ret
@@ -2887,7 +2887,7 @@
 Function115136:
 	ld hl, $dc06
 	ld a, [hli]
-	ld [wCurrMapBGEventCount], a
+	ld [wCurMapBGEventCount], a
 	ldh [hFF8C], a
 	ld [MBC3SRamBank], a
 	ld a, [hli]
@@ -2914,7 +2914,7 @@
 
 .asm_11515d
 	ld hl, $dc06
-	ld a, [wCurrMapBGEventCount]
+	ld a, [wCurMapBGEventCount]
 	ld [hli], a
 	ld a, e
 	ld [hli], a
@@ -2932,7 +2932,7 @@
 
 Function115170:
 	push bc
-	ld bc, wCurrMapBGEventCount
+	ld bc, wCurMapBGEventCount
 	call Function115d80
 	pop bc
 	ret
@@ -2940,7 +2940,7 @@
 Function115179:
 	ld hl, $dc06
 	ld a, [hli]
-	ld [wCurrMapBGEventCount], a
+	ld [wCurMapBGEventCount], a
 	ldh [hFF8C], a
 	ld [MBC3SRamBank], a
 	ld a, [hli]
@@ -3035,7 +3035,7 @@
 	inc e
 	call z, Function11520e
 	ld hl, $dc06
-	ld a, [wCurrMapBGEventCount]
+	ld a, [wCurMapBGEventCount]
 	ld [hli], a
 	ld a, e
 	ld [hli], a
@@ -3049,7 +3049,7 @@
 
 Function11520e:
 	push bc
-	ld bc, wCurrMapBGEventCount
+	ld bc, wCurMapBGEventCount
 	call Function115d80
 	pop bc
 	ret
@@ -3058,7 +3058,7 @@
 	push hl
 	ld hl, $dc06
 	ld a, [hli]
-	ld [wCurrMapBGEventCount], a
+	ld [wCurMapBGEventCount], a
 	ldh [hFF8C], a
 	ld [MBC3SRamBank], a
 	ld a, [hli]
@@ -3097,7 +3097,7 @@
 
 .asm_115252
 	ld hl, $dc06
-	ld a, [wCurrMapBGEventCount]
+	ld a, [wCurMapBGEventCount]
 	ld [hli], a
 	ld a, e
 	ld [hli], a
@@ -3141,7 +3141,7 @@
 
 Function115286:
 	push bc
-	ld bc, wCurrMapBGEventCount
+	ld bc, wCurMapBGEventCount
 	call Function115d80
 	pop bc
 	ret
@@ -3534,7 +3534,7 @@
 	ld [de], a
 	ld hl, wDecoRightOrnament
 	ld a, [hli]
-	ld [wCurrMapBGEventCount], a
+	ld [wCurMapBGEventCount], a
 	ldh [hFF8C], a
 	ld [MBC3SRamBank], a
 	ld e, [hl]
@@ -3543,7 +3543,7 @@
 	ld hl, $ddc8
 	call Function115d6a
 	ld hl, wDecoRightOrnament
-	ld a, [wCurrMapBGEventCount]
+	ld a, [wCurMapBGEventCount]
 	ld [hli], a
 	ld [hl], e
 	inc hl
@@ -3765,7 +3765,7 @@
 
 Function11560a:
 	ld a, [$dc06]
-	ld [wCurrMapBGEventCount], a
+	ld [wCurMapBGEventCount], a
 	ld a, [$dc17]
 	ld [$dc00], a
 	ldh [hFF8C], a
@@ -3774,7 +3774,7 @@
 	ld c, [hl]
 	inc hl
 	ld b, [hl]
-	ld a, [wCurrMapCallbackCount]
+	ld a, [wCurMapCallbackCount]
 	cp b
 	jp c, .asm_1156b1
 	jr nz, .asm_115631
@@ -3788,7 +3788,7 @@
 	jr z, .asm_1156a9
 	ld a, [$dc09]
 	ld l, a
-	ld a, [wCurrMapCallbackCount]
+	ld a, [wCurMapCallbackCount]
 	ld h, a
 	ld a, c
 	cpl
@@ -3801,7 +3801,7 @@
 	ld a, l
 	ld [$dc09], a
 	ld a, h
-	ld [wCurrMapCallbackCount], a
+	ld [wCurMapCallbackCount], a
 .asm_11564d
 	ld a, $3
 	cp b
@@ -3840,16 +3840,16 @@
 	inc hl
 	ld [hl], d
 	pop bc
-	ld a, [wCurrMapBGEventCount]
+	ld a, [wCurMapBGEventCount]
 	ldh [hFF8C], a
 	ld [MBC3SRamBank], a
-	ld hl, wCurrMapSceneScriptCount
+	ld hl, wCurMapSceneScriptCount
 	ld e, [hl]
 	inc hl
 	ld d, [hl]
 	ld hl, $dc24
 	call Function115d6a
-	ld hl, wCurrMapSceneScriptCount
+	ld hl, wCurMapSceneScriptCount
 	ld [hl], e
 	inc hl
 	ld [hl], d
@@ -3862,7 +3862,7 @@
 	jr nz, .asm_11564d
 
 .asm_1156a9
-	ld a, [wCurrMapBGEventCount]
+	ld a, [wCurMapBGEventCount]
 	ld [$dc06], a
 	xor a
 	ret
@@ -3930,7 +3930,7 @@
 	jp Function11425c
 
 .asm_115716
-	ld hl, wCurrMapCallbackCount
+	ld hl, wCurMapCallbackCount
 	ld a, [hli]
 	cpl
 	ld e, a
@@ -4171,9 +4171,9 @@
 	ld b, [hl]
 	inc hl
 	push hl
-	ld a, [wCurrMapCallbackCount]
+	ld a, [wCurMapCallbackCount]
 	ld l, a
-	ld a, [wCurrMapCallbacksPointer]
+	ld a, [wCurMapCallbacksPointer]
 	ld h, a
 	cp b
 	jr c, .asm_1158bb
@@ -4193,14 +4193,14 @@
 	inc bc
 	add hl, bc
 	ld a, l
-	ld [wCurrMapCallbackCount], a
+	ld [wCurMapCallbackCount], a
 	ld a, h
-	ld [wCurrMapCallbacksPointer], a
+	ld [wCurMapCallbacksPointer], a
 	pop bc
 	pop hl
-	ld hl, wCurrMapSceneScriptCount
+	ld hl, wCurMapSceneScriptCount
 	ld a, [hli]
-	ld [wCurrMapBGEventCount], a
+	ld [wCurMapBGEventCount], a
 	ldh [hFF8C], a
 	ld [MBC3SRamBank], a
 	ld e, [hl]
@@ -4208,8 +4208,8 @@
 	ld d, [hl]
 	ld hl, wPartyMon5Speed
 	call Function115d6a
-	ld hl, wCurrMapSceneScriptCount
-	ld a, [wCurrMapBGEventCount]
+	ld hl, wCurMapSceneScriptCount
+	ld a, [wCurMapBGEventCount]
 	ld [hli], a
 	ld a, e
 	ld [hli], a
@@ -4519,7 +4519,7 @@
 	jp Function11425c
 
 .asm_115a45
-	ld hl, wCurrMapCallbackCount
+	ld hl, wCurMapCallbackCount
 	ld a, [hli]
 	cpl
 	ld e, a
@@ -4726,9 +4726,9 @@
 	ld b, [hl]
 	inc hl
 	push hl
-	ld a, [wCurrMapCallbackCount]
+	ld a, [wCurMapCallbackCount]
 	ld l, a
-	ld a, [wCurrMapCallbacksPointer]
+	ld a, [wCurMapCallbacksPointer]
 	ld h, a
 	cp b
 	jr c, .asm_115b36
@@ -4748,14 +4748,14 @@
 	inc bc
 	add hl, bc
 	ld a, l
-	ld [wCurrMapCallbackCount], a
+	ld [wCurMapCallbackCount], a
 	ld a, h
-	ld [wCurrMapCallbacksPointer], a
+	ld [wCurMapCallbacksPointer], a
 	pop bc
 	pop hl
-	ld hl, wCurrMapSceneScriptCount
+	ld hl, wCurMapSceneScriptCount
 	ld a, [hli]
-	ld [wCurrMapBGEventCount], a
+	ld [wCurMapBGEventCount], a
 	ldh [hFF8C], a
 	ld [MBC3SRamBank], a
 	ld e, [hl]
@@ -4763,8 +4763,8 @@
 	ld d, [hl]
 	ld hl, $dc26
 	call Function115d6a
-	ld hl, wCurrMapSceneScriptCount
-	ld a, [wCurrMapBGEventCount]
+	ld hl, wCurMapSceneScriptCount
+	ld a, [wCurMapBGEventCount]
 	ld [hli], a
 	ld a, e
 	ld [hli], a
@@ -5130,7 +5130,7 @@
 
 Function115d77:
 	push bc
-	ld bc, wCurrMapBGEventCount
+	ld bc, wCurMapBGEventCount
 	call Function115d80
 	pop bc
 	ret
--- a/mobile/mobile_46.asm
+++ b/mobile/mobile_46.asm
@@ -5544,7 +5544,7 @@
 	call Function11acb7
 	call Function11ad6e
 	ld a, 30 * SPRITEOAMSTRUCT_LENGTH
-	ld [wCurrSpriteOAMAddr], a
+	ld [wCurSpriteOAMAddr], a
 	farcall DoNextFrameForAllSprites
 	farcall ReloadMapPart
 	jr .loop
--- a/sram.asm
+++ b/sram.asm
@@ -83,7 +83,7 @@
 
 sBackupGameData:: ; b209
 sBackupPlayerData::  ds wPlayerDataEnd - wPlayerData
-sBackupCurrMapData:: ds wCurrMapDataEnd - wCurrMapData
+sBackupCurMapData::  ds wCurMapDataEnd - wCurMapData
 sBackupPokemonData:: ds wPokemonDataEnd - wPokemonData
 sBackupGameDataEnd::
 
@@ -106,7 +106,7 @@
 
 sGameData:: ; a009
 sPlayerData::  ds wPlayerDataEnd - wPlayerData
-sCurrMapData:: ds wCurrMapDataEnd - wCurrMapData
+sCurMapData::  ds wCurMapDataEnd - wCurMapData
 sPokemonData:: ds wPokemonDataEnd - wPokemonData
 sGameDataEnd::
 
--- a/wram.asm
+++ b/wram.asm
@@ -155,8 +155,8 @@
 wPrinterOpcode:: db
 wPrevDexEntry:: db
 wDisableTextAcceleration:: db
-wPreviousLandmark:: db
-wCurrentLandmark:: db
+wPrevLandmark:: db
+wCurLandmark:: db
 wLandmarkSignTimer:: dw
 
 wLinkMode::
@@ -256,7 +256,7 @@
 ENDU ; c3b4
 
 wSpriteAnimCount:: db
-wCurrSpriteOAMAddr:: db
+wCurSpriteOAMAddr:: db
 
 wCurIcon:: db ; c3b6
 
@@ -263,13 +263,13 @@
 wCurIconTile:: db
 wSpriteAnimAddrBackup::
 wSpriteAnimIDBuffer::
-wCurrSpriteAddSubFlags::
+wCurSpriteAddSubFlags::
 	dw
-wCurrAnimVTile:: db
-wCurrAnimXCoord:: db
-wCurrAnimYCoord:: db
-wCurrAnimXOffset:: db
-wCurrAnimYOffset:: db
+wCurAnimVTile:: db
+wCurAnimXCoord:: db
+wCurAnimYCoord:: db
+wCurAnimXOffset:: db
+wCurAnimYOffset:: db
 wGlobalAnimYOffset:: db
 wGlobalAnimXOffset:: db
 wSpriteAnimsEnd::
@@ -757,7 +757,7 @@
 NEXTU ; c6d0
 ; naming screen
 wNamingScreenDestinationPointer:: dw ; c6d0
-wNamingScreenCurrNameLength:: db ; c6d2
+wNamingScreenCurNameLength:: db ; c6d2
 wNamingScreenMaxNameLength:: db ; c6d3
 wNamingScreenType:: db ; c6d4
 wNamingScreenCursorObjectPointer:: dw ; c6d5
@@ -793,10 +793,10 @@
 wFirstTwoReelsMatching:: db
 wFirstTwoReelsMatchingSevens:: db
 wSlotMatched:: db
-wCurrReelStopped:: ds 3
+wCurReelStopped:: ds 3
 wPayout:: dw
-wCurrReelXCoord:: db
-wCurrReelYCoord:: db
+wCurReelXCoord:: db
+wCurReelYCoord:: db
 	ds 2
 wSlotBuildingMatch:: db
 wSlotsDataEnd::
@@ -846,7 +846,7 @@
 wDexListingCursor:: db ; Dex cursor
 wDexListingEnd:: db ; Last mon to display
 wDexListingHeight:: db ; number of entries displayed at once in the dex listing
-wCurrentDexMode:: db ; Pokedex Mode
+wCurDexMode:: db ; Pokedex Mode
 wDexSearchMonType1:: db ; first type to search
 wDexSearchMonType2:: db ; second type to search
 wDexSearchResultCount:: db
@@ -855,7 +855,7 @@
 wDexArrowCursorBlinkCounter:: db
 wDexSearchSlowpokeFrame:: db
 wUnlockedUnownMode:: db
-wDexCurrentUnownIndex:: db
+wDexCurUnownIndex:: db
 wDexUnownCount:: db
 wDexConvertedMonType:: db ; mon type converted from dex search mon type
 wDexListingScrollOffsetBackup:: db
@@ -862,7 +862,7 @@
 wDexListingCursorBackup:: db
 wBackupDexListingCursor:: db
 wBackupDexListingPage:: db
-wDexCurrentLocation:: db
+wDexCurLocation:: db
 if DEF(_CRYSTAL11)
 wPokedexStatus:: db
 wPokedexDataEnd::
@@ -1366,7 +1366,7 @@
 NEXTU ; cf64
 ; pack
 wPackJumptableIndex:: db
-wCurrPocket:: db
+wCurPocket:: db
 wPackUsedItem:: db
 
 NEXTU ; cf64
@@ -1659,7 +1659,7 @@
 
 NEXTU ; d002
 ; radio data
-wCurrentRadioLine:: db
+wCurRadioLine:: db
 wNextRadioLine:: db
 wRadioTextDelay:: db
 wNumRadioLinesPrinted:: db
@@ -2677,21 +2677,21 @@
 	db
 	ds 1 ; cleared along with wBikeFlags by ResetBikeFlags
 
-wCurrMapSceneScriptPointer:: dw ; dbf7
+wCurMapSceneScriptPointer:: dw ; dbf7
 
-wCurrentCaller:: dw ; dbf9
-wCurrMapWarpCount:: db ; dbfb
-wCurrMapWarpsPointer:: dw ; dbfc
-wCurrMapCoordEventCount:: db ; dbfe
-wCurrMapCoordEventsPointer:: dw ; dbff
-wCurrMapBGEventCount:: db ; dc01
-wCurrMapBGEventsPointer:: dw ; dc02
-wCurrMapObjectEventCount:: db ; dc04
-wCurrMapObjectEventsPointer:: dw ; dc05
-wCurrMapSceneScriptCount:: db ; dc07
-wCurrMapSceneScriptsPointer:: dw ; dc08
-wCurrMapCallbackCount:: db ; dc0a
-wCurrMapCallbacksPointer:: dw ; dc0b
+wCurCaller:: dw ; dbf9
+wCurMapWarpCount:: db ; dbfb
+wCurMapWarpsPointer:: dw ; dbfc
+wCurMapCoordEventCount:: db ; dbfe
+wCurMapCoordEventsPointer:: dw ; dbff
+wCurMapBGEventCount:: db ; dc01
+wCurMapBGEventsPointer:: dw ; dc02
+wCurMapObjectEventCount:: db ; dc04
+wCurMapObjectEventsPointer:: dw ; dc05
+wCurMapSceneScriptCount:: db ; dc07
+wCurMapSceneScriptsPointer:: dw ; dc08
+wCurMapCallbackCount:: db ; dc0a
+wCurMapCallbacksPointer:: dw ; dc0b
 
 	ds 2
 
@@ -2770,7 +2770,7 @@
 
 wPlayerDataEnd::
 
-wCurrMapData::
+wCurMapData::
 
 wVisitedSpawns:: flag_array NUM_SPAWNS ; dca5
 
@@ -2796,7 +2796,7 @@
 wXCoord:: db ; dcb8 ; current x coordinate relative to top-left corner of current map
 wScreenSave:: ds SCREEN_META_WIDTH * SCREEN_META_HEIGHT
 
-wCurrMapDataEnd::
+wCurMapDataEnd::
 
 
 SECTION "Party", WRAMX
@@ -2876,8 +2876,8 @@
 wRoamMon2:: roam_struct wRoamMon2 ; dfd6
 wRoamMon3:: roam_struct wRoamMon3 ; dfdd
 
-wRoamMons_CurrentMapNumber:: db
-wRoamMons_CurrentMapGroup:: db
+wRoamMons_CurMapNumber:: db
+wRoamMons_CurMapGroup:: db
 wRoamMons_LastMapNumber:: db
 wRoamMons_LastMapGroup:: db