5 files changed, 27 insertions, 27 deletions
diff --git a/engine/pinball_game/catchem_mode.asm b/engine/pinball_game/catchem_mode.asm
index 8a9e427..09192f6 100644
--- a/engine/pinball_game/catchem_mode.asm
+++ b/engine/pinball_game/catchem_mode.asm
@@ -58,21 +58,21 @@ StartCatchEmMode: ; 0x1003f
 	ld bc, CatchSpriteFrameDurations ;mystery data, seems pokedex related too
 	add hl, bc
 	ld a, [hli]
-	ld [CurrentCatchMonIdleFrame1Duration], a
+	ld [wCurrentCatchMonIdleFrame1Duration], a
 	ld [wLoopsUntilNextCatchSpriteAnimationChange], a
 	ld a, [hli]
-	ld [CurrentCatchMonIdleFrame2Duration], a
+	ld [wCurrentCatchMonIdleFrame2Duration], a
 	ld a, [hli]
-	ld [CurrentCatchMonHitFrameDuration], a ;load the 3 bytes into ????
+	ld [wCurrentCatchMonHitFrameDuration], a ;load the 3 bytes into ????
 	ld hl, wBillboardTilesIlluminationStates
-	ld a, [NumberOfCatchModeTilesFlipped]
+	ld a, [wNumberOfCatchModeTilesFlipped]
 	ld c, a
 	and a
 	ld b, $18
 	jr z, .asm_100c7 ;if tiles flipped = 0, jump with b = 24 (2 seperate loops?)
 .asm_100ba
 	ld a, $1
-	ld [hli], a ;load 1 then 0 into data from NumberOfCatchModeTilesFlipped C times, where C is the contents of NumberOfCatchModeTilesFlipped
+	ld [hli], a ;load 1 then 0 into data from wNumberOfCatchModeTilesFlipped C times, where C is the contents of wNumberOfCatchModeTilesFlipped
 	xor a
 	ld [hli], a
 	dec b
@@ -81,7 +81,7 @@ StartCatchEmMode: ; 0x1003f
 	ld a, b ;load 24 - times looped into a, if 0: skip
 	and a
 	jr z, .asm_100ce
-.asm_100c7 ;loop 0 then 1 into the rest of the data from NumberOfCatchModeTilesFlipped
+.asm_100c7 ;loop 0 then 1 into the rest of the data from wNumberOfCatchModeTilesFlipped
 	xor a
 	ld [hli], a
 	inc a
@@ -165,7 +165,7 @@ ConcludeCatchEmMode: ; 0x10157
 	ld [wInSpecialMode], a
 	ld [wWildMonIsHittable], a
 	ld [wd5c6], a
-	ld [NumberOfCatchModeTilesFlipped], a
+	ld [wNumberOfCatchModeTilesFlipped], a
 	ld [wNumMonHits], a
 	call ClearWildMonCollisionMask
 	callba StopTimer
diff --git a/engine/pinball_game/catchem_mode/catchem_mode_blue_field.asm b/engine/pinball_game/catchem_mode/catchem_mode_blue_field.asm
index 8fc2a56..b990c8d 100644
--- a/engine/pinball_game/catchem_mode/catchem_mode_blue_field.asm
+++ b/engine/pinball_game/catchem_mode/catchem_mode_blue_field.asm
@@ -28,7 +28,7 @@ PointerTable_202e2: ; 0x202e2
 	padded_dab Func_2048f
 
 Func_20302: ; 0x20302
-	ld a, [NumberOfCatchModeTilesFlipped]
+	ld a, [wNumberOfCatchModeTilesFlipped]
 	cp $18
 	jr nz, .asm_2031e
 	ld a, [wCurrentStage]
@@ -101,7 +101,7 @@ Func_20394: ; 0x20394
 	jp z, .asm_20428
 	xor a
 	ld [wBallHitWildMon], a
-	ld a, [CurrentCatchMonHitFrameDuration]
+	ld a, [wCurrentCatchMonHitFrameDuration]
 	ld [wLoopsUntilNextCatchSpriteAnimationChange], a
 	xor a
 	ld [wCatchModeMonUpdateTimer], a
@@ -164,7 +164,7 @@ Func_20394: ; 0x20394
 	ld c, $1
 .asm_2043d
 	ld b, $0
-	ld hl, CurrentCatchMonIdleFrame1Duration
+	ld hl, wCurrentCatchMonIdleFrame1Duration
 	add hl, bc
 	ld a, [hl]
 	ld [wLoopsUntilNextCatchSpriteAnimationChange], a
@@ -231,7 +231,7 @@ Func_204b3: ; 0x204b3
 	ret
 
 Func_204f1: ; 0x204f1
-	ld a, [NumberOfCatchModeTilesFlipped]
+	ld a, [wNumberOfCatchModeTilesFlipped]
 	cp $18
 	jr z, .asm_2055e
 	sla a
@@ -245,18 +245,18 @@ Func_204f1: ; 0x204f1
 	ld [hli], a
 	inc hl
 	ld a, l
-	cp NumberOfCatchModeTilesFlipped % $100
+	cp wNumberOfCatchModeTilesFlipped % $100
 	jr z, .asm_2050f
 	dec d
 	jr nz, .asm_20503
 .asm_2050f
-	ld a, [NumberOfCatchModeTilesFlipped]
+	ld a, [wNumberOfCatchModeTilesFlipped]
 	add $4
 	cp $18
 	jr c, .asm_2051a
 	ld a, $18
 .asm_2051a
-	ld [NumberOfCatchModeTilesFlipped], a
+	ld [wNumberOfCatchModeTilesFlipped], a
 	cp $18
 	jr nz, .asm_20525
 	xor a
diff --git a/engine/pinball_game/catchem_mode/catchem_mode_red_field.asm b/engine/pinball_game/catchem_mode/catchem_mode_red_field.asm
index 35b1ab4..e0e4f60 100644
--- a/engine/pinball_game/catchem_mode/catchem_mode_red_field.asm
+++ b/engine/pinball_game/catchem_mode/catchem_mode_red_field.asm
@@ -26,7 +26,7 @@ PointerTable_20021: ; 0x20021
 	padded_dab Func_201ce
 
 Func_20041: ; 0x20041
-	ld a, [NumberOfCatchModeTilesFlipped]
+	ld a, [wNumberOfCatchModeTilesFlipped]
 	cp $18 ;if not 24 and not on lower stage, ret
 	jr nz, .NotDone
 	ld a, [wCurrentStage]
@@ -99,7 +99,7 @@ CatchEmModeUpdateMonStateRedTable: ; 0x200d3
 	jp z, .BallDidntHitMon ;if no ball hit(?), jump
 	xor a
 	ld [wBallHitWildMon], a ;toggle off ball hit
-	ld a, [CurrentCatchMonHitFrameDuration]
+	ld a, [wCurrentCatchMonHitFrameDuration]
 	ld [wLoopsUntilNextCatchSpriteAnimationChange], a ;load byte 3 of mystery data into ??? (cause it to loop X times between a colision check?)
 	xor a
 	ld [wCatchModeMonUpdateTimer], a ;load 0 into ??? stops double hits?
@@ -162,7 +162,7 @@ CatchEmModeUpdateMonStateRedTable: ; 0x200d3
 	ld c, $1
 .SetFrameTo0
 	ld b, $0
-	ld hl, CurrentCatchMonIdleFrame1Duration ;add c to ???, place it in ???. the mystery data sets how far apart these checks are
+	ld hl, wCurrentCatchMonIdleFrame1Duration ;add c to ???, place it in ???. the mystery data sets how far apart these checks are
 	add hl, bc
 	ld a, [hl]
 	ld [wLoopsUntilNextCatchSpriteAnimationChange], a
@@ -229,7 +229,7 @@ Func_201f2: ; 0x201f2
 	ret
 
 HandleCatchModeVoltorbHit: ; 0x20230 resolve hitting a voltorb in catch mode?
-	ld a, [NumberOfCatchModeTilesFlipped]
+	ld a, [wNumberOfCatchModeTilesFlipped]
 	cp $18
 	jr z, .AllTilesFlipped ;if FlippedCount is 24, add to jackpot and ret c
 	sla a
@@ -243,18 +243,18 @@ HandleCatchModeVoltorbHit: ; 0x20230 resolve hitting a voltorb in catch mode?
 	ld [hli], a
 	inc hl ;load in 1
 	ld a, l
-	cp NumberOfCatchModeTilesFlipped % $100
+	cp wNumberOfCatchModeTilesFlipped % $100
 	jr z, .ExitLoop ;continue until you reach FlippedCount or until 4 spaces are done
 	dec d
 	jr nz, .LoopFlippedStatusInsertion
 .ExitLoop
-	ld a, [NumberOfCatchModeTilesFlipped]
+	ld a, [wNumberOfCatchModeTilesFlipped]
 	add $4 ;then add 4 to FlippedCount, clamp to 24
 	cp $18
 	jr c, .DontClamp
 	ld a, $18
 .DontClamp
-	ld [NumberOfCatchModeTilesFlipped], a
+	ld [wNumberOfCatchModeTilesFlipped], a
 	cp $18
 	jr nz, .NotDoneFlipping
 	xor a
diff --git a/engine/pinball_game/evolution_mode.asm b/engine/pinball_game/evolution_mode.asm
index b6e5bcc..164b92b 100755
--- a/engine/pinball_game/evolution_mode.asm
+++ b/engine/pinball_game/evolution_mode.asm
@@ -30,7 +30,7 @@ ConcludeEvolutionMode: ; 0x10ac8
 	xor a
 	ld [wInSpecialMode], a
 	ld [wWildMonIsHittable], a
-	ld [NumberOfCatchModeTilesFlipped], a
+	ld [wNumberOfCatchModeTilesFlipped], a
 	ld [wNumMonHits], a
 	ld [wd551], a
 	ld [wd554], a
diff --git a/engine/pokedex.asm b/engine/pokedex.asm
index 0c57a5b..d8eea4e 100644
--- a/engine/pokedex.asm
+++ b/engine/pokedex.asm
@@ -1198,7 +1198,7 @@ Func_28815: ; 0x28815
 	and $7
 	ld [wBallHitWildMon], a
 	jr nz, .asm_28836
-	ld a, [CurrentCatchMonHitFrameDuration]
+	ld a, [wCurrentCatchMonHitFrameDuration]
 	ld [wLoopsUntilNextCatchSpriteAnimationChange], a
 	xor a
 	ld [wCatchModeMonUpdateTimer], a
@@ -1216,7 +1216,7 @@ Func_28815: ; 0x28815
 	ld c, $1
 .asm_28846
 	ld b, $0
-	ld hl, CurrentCatchMonIdleFrame1Duration
+	ld hl, wCurrentCatchMonIdleFrame1Duration
 	add hl, bc
 	ld a, [hl]
 	ld [wLoopsUntilNextCatchSpriteAnimationChange], a
@@ -1826,16 +1826,16 @@ Func_28bf5: ; 0x28bf5
 	add hl, bc
 	ld a, Bank(CatchSpriteFrameDurations)
 	call ReadByteFromBank
-	ld [CurrentCatchMonIdleFrame1Duration], a
+	ld [wCurrentCatchMonIdleFrame1Duration], a
 	ld [wLoopsUntilNextCatchSpriteAnimationChange], a
 	inc hl
 	ld a, Bank(CatchSpriteFrameDurations)
 	call ReadByteFromBank
-	ld [CurrentCatchMonIdleFrame2Duration], a
+	ld [wCurrentCatchMonIdleFrame2Duration], a
 	inc hl
 	ld a, Bank(CatchSpriteFrameDurations)
 	call ReadByteFromBank
-	ld [CurrentCatchMonHitFrameDuration], a
+	ld [wCurrentCatchMonHitFrameDuration], a
 	ld a, [wCurPokedexIndex]
 	ld c, a
 	ld b, $0