Curr -> Cur

engine/events/celebi.asm

@@ -32,7 +32,7 @@ CelebiShrineEvent:
 	inc d
 	push de
 	ld a, 36 * SPRITEOAMSTRUCT_LENGTH
-	ld [wCurrSpriteOAMAddr], a
+	ld [wCurSpriteOAMAddr], a
 	farcall DoNextFrameForAllSprites
 	call CelebiEvent_CountDown
 	ld c, 2

engine/events/checkforhiddenitems.asm

@@ -10,15 +10,15 @@ CheckForHiddenItems:
 	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

engine/events/field_moves.asm

@@ -38,7 +38,7 @@ ShakeHeadbuttTree:
 	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 @@ ShakeHeadbuttTree:
 	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 @@ OWCutAnimation:
 	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 @@ FlyFromAnim:
 	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 @@ FlyToAnim:
 	bit 7, a
 	jr nz, .exit
 	ld a, 0 * SPRITEOAMSTRUCT_LENGTH
-	ld [wCurrSpriteOAMAddr], a
+	ld [wCurSpriteOAMAddr], a
 	callfar DoNextFrameForAllSprites
 	call FlyFunction_FrameTimer
 	call DelayFrame

engine/events/map_name_sign.asm

@@ -13,7 +13,7 @@ ReturnFromMapSetupScript::
 	ld a, [wMapNumber]
 	ld c, a
 	call GetWorldMapLocation
-	ld [wCurrentLandmark], a
+	ld [wCurLandmark], a
 	call .CheckNationalParkGate
 	jr z, .nationalparkgate
 
@@ -23,7 +23,7 @@ ReturnFromMapSetupScript::
 
 .nationalparkgate
 	ld a, -1
-	ld [wCurrentLandmark], a
+	ld [wCurLandmark], a
 
 .not_gate
 	ld hl, wEnteredMapFromContinue
@@ -33,7 +33,7 @@ ReturnFromMapSetupScript::
 
 	call .CheckMovingWithinLandmark
 	jr z, .dont_do_map_sign
-	ld a, [wCurrentLandmark]
+	ld a, [wCurLandmark]
 	ld [wPreviousLandmark], a
 
 	call .CheckSpecialMap
@@ -48,7 +48,7 @@ ReturnFromMapSetupScript::
 	ret
 
 .dont_do_map_sign
-	ld a, [wCurrentLandmark]
+	ld a, [wCurLandmark]
 	ld [wPreviousLandmark], a
 	ld a, $90
 	ldh [rWY], a
@@ -58,7 +58,7 @@ ReturnFromMapSetupScript::
 	ret
 
 .CheckMovingWithinLandmark:
-	ld a, [wCurrentLandmark]
+	ld a, [wCurLandmark]
 	ld c, a
 	ld a, [wPreviousLandmark]
 	cp c
@@ -140,7 +140,7 @@ InitMapNameFrame:
 	ret
 
 PlaceMapNameCenterAlign:
-	ld a, [wCurrentLandmark]
+	ld a, [wCurLandmark]
 	ld e, a
 	farcall GetLandmarkName
 	call .GetNameLength

engine/events/mom_phone.asm

@@ -38,7 +38,7 @@ MomTriesToBuySomething::
 	inc [hl]
 .ok
 	ld a, PHONE_MOM
-	ld [wCurrentCaller], a
+	ld [wCurCaller], a
 	ld bc, wEngineBuffer2
 	ld hl, 0
 	add hl, bc