More wram.asm cleanup and labeling

19 files changed, 35 insertions, 43 deletions

diff --git a/engine/pinball_game/ball_loss/ball_loss_blue_field.asm b/engine/pinball_game/ball_loss/ball_loss_blue_field.asm
index f752b7f..0e24a0f 100755
--- a/engine/pinball_game/ball_loss/ball_loss_blue_field.asm
+++ b/engine/pinball_game/ball_loss/ball_loss_blue_field.asm
@@ -50,14 +50,14 @@ HandleBallLossBlueField: ; 0xde4f
 	ld a, [wd49d]

 	ld hl, wd49e

 	cp [hl]

-	jr z, .asm_deca

+	jr z, .gameOver

 	inc a

 	ld [wd49d], a

 	ld de, EndOfBallBonusText

 	call Func_dc6d

 	ret

 

-.asm_deca

+.gameOver

 	ld de, EndOfBallBonusText

 	call Func_dc6d

 	ld a, $1

diff --git a/engine/pinball_game/ball_loss/ball_loss_diglett_bonus.asm b/engine/pinball_game/ball_loss/ball_loss_diglett_bonus.asm
index 7e9fdf9..2771d00 100755
--- a/engine/pinball_game/ball_loss/ball_loss_diglett_bonus.asm
+++ b/engine/pinball_game/ball_loss/ball_loss_diglett_bonus.asm
@@ -13,7 +13,7 @@ HandleBallLossDiglettBonus: ; 0xe056
 	ld [wd4c8], a

 	xor a

 	ld [wd7ac], a

-	ld a, [wd49a]

+	ld a, [wCompletedBonusStage]

 	and a

 	ret nz

 	call FillBottomMessageBufferWithBlackTile

diff --git a/engine/pinball_game/ball_loss/ball_loss_gengar_bonus.asm b/engine/pinball_game/ball_loss/ball_loss_gengar_bonus.asm
index 2ba10d0..3910478 100755
--- a/engine/pinball_game/ball_loss/ball_loss_gengar_bonus.asm
+++ b/engine/pinball_game/ball_loss/ball_loss_gengar_bonus.asm
@@ -39,7 +39,7 @@ HandleBallLossGengarBonus: ; 0xdf1a
 	ld [wd4c8], a

 	xor a

 	ld [wd7ac], a

-	ld a, [wd49a]

+	ld a, [wCompletedBonusStage]

 	and a

 	ret nz

 	call FillBottomMessageBufferWithBlackTile

diff --git a/engine/pinball_game/ball_loss/ball_loss_meowth_bonus.asm b/engine/pinball_game/ball_loss/ball_loss_meowth_bonus.asm
index 601bfe2..ae24dd3 100755
--- a/engine/pinball_game/ball_loss/ball_loss_meowth_bonus.asm
+++ b/engine/pinball_game/ball_loss/ball_loss_meowth_bonus.asm
@@ -4,7 +4,7 @@ HandleBallLossMeowthBonus: ; 0xdfe2
 	ld a, [wd7be]

 	and a

 	jr z, .asm_dff2

-	ld a, [wd49a]

+	ld a, [wCompletedBonusStage]

 	and a

 	jr z, .asm_e00f

 .asm_dff2

@@ -46,7 +46,7 @@ HandleBallLossMeowthBonus: ; 0xdfe2
 	xor a

 	ld [wd7ac], a

 	ld [wd712], a

-	ld a, [wd49a]

+	ld a, [wCompletedBonusStage]

 	and a

 	ret nz

 	call FillBottomMessageBufferWithBlackTile

diff --git a/engine/pinball_game/ball_loss/ball_loss_mewtwo_bonus.asm b/engine/pinball_game/ball_loss/ball_loss_mewtwo_bonus.asm
index 95d1b5d..68a0235 100755
--- a/engine/pinball_game/ball_loss/ball_loss_mewtwo_bonus.asm
+++ b/engine/pinball_game/ball_loss/ball_loss_mewtwo_bonus.asm
@@ -39,7 +39,7 @@ HandleBallLossMewtwoBonus: ; 0xdf7e
 	ld [wd4c8], a

 	xor a

 	ld [wd7ac], a

-	ld a, [wd49a]

+	ld a, [wCompletedBonusStage]

 	and a

 	ret nz

 	call FillBottomMessageBufferWithBlackTile

diff --git a/engine/pinball_game/ball_loss/ball_loss_red_field.asm b/engine/pinball_game/ball_loss/ball_loss_red_field.asm
index f342f58..ab307eb 100755
--- a/engine/pinball_game/ball_loss/ball_loss_red_field.asm
+++ b/engine/pinball_game/ball_loss/ball_loss_red_field.asm
@@ -50,14 +50,14 @@ HandleBallLossRedField: ; 0xdd76
 	ld a, [wd49d]

 	ld hl, wd49e

 	cp [hl]

-	jr z, .asm_ddf1

+	jr z, .gameOver

 	inc a

 	ld [wd49d], a

 	ld de, EndOfBallBonusText

 	call Func_dc6d

 	ret

 

-.asm_ddf1

+.gameOver

 	ld de, EndOfBallBonusText

 	call Func_dc6d

 	ld a, $1

diff --git a/engine/pinball_game/ball_loss/ball_loss_seel_bonus.asm b/engine/pinball_game/ball_loss/ball_loss_seel_bonus.asm
index f1b22ae..a5204d4 100755
--- a/engine/pinball_game/ball_loss/ball_loss_seel_bonus.asm
+++ b/engine/pinball_game/ball_loss/ball_loss_seel_bonus.asm
@@ -4,7 +4,7 @@ HandleBallLossSeelBonus: ; 0xe08b
 	ld a, [wd7be]

 	and a

 	jr z, .asm_e09b

-	ld a, [wd49a]

+	ld a, [wCompletedBonusStage]

 	and a

 	jr z, .asm_e0b8

 .asm_e09b

@@ -45,7 +45,7 @@ HandleBallLossSeelBonus: ; 0xe08b
 	xor a

 	ld [wd7ac], a

 	ld [wd794], a

-	ld a, [wd49a]

+	ld a, [wCompletedBonusStage]

 	and a

 	ret nz

 	call FillBottomMessageBufferWithBlackTile

diff --git a/engine/pinball_game/end_of_ball_bonus.asm b/engine/pinball_game/end_of_ball_bonus.asm
index 74cb0ea..d1a4071 100755
--- a/engine/pinball_game/end_of_ball_bonus.asm
+++ b/engine/pinball_game/end_of_ball_bonus.asm
@@ -66,9 +66,9 @@ Func_f5a0: ; 0xf5a0
 	ld hl, SubtotalPointsText

 	call PrintTextNoHeader

 	ld hl, wd489

-	call Func_f8b5

+	call ClearBCD6Buffer

 	ld hl, wd48f

-	call Func_f8b5

+	call ClearBCD6Buffer

 	ld a, $1

 	ld [wd4ab], a

 	call ValidateSignature6

@@ -199,7 +199,7 @@ Func_f676: ; 0xf676
 .asm_f6c7

 	push de

 	push hl

-	ld hl, wd494

+	ld hl, wd48f + $5

 	ld de, wBottomMessageText + $86

 	call Func_f8bd

 	ld bc, $0040

@@ -441,12 +441,12 @@ Func_f83a: ; 0xf83a
 Func_f853: ; 0xf853

 	push hl

 	ld hl, wd483

-	call Func_f8b5

+	call ClearBCD6Buffer

 	pop hl

 .asm_f85b

 	push de

 	push hl

-	ld hl, wd488

+	ld hl, wd483 + $5

 	ld de, wBottomMessageText + $46

 	call Func_f8bd

 	ld bc, $0040

@@ -482,7 +482,7 @@ Func_f853: ; 0xf853
 	ld hl, wd489

 	ld de, wd483

 	call AddBigBCD6

-	ld hl, wd48e

+	ld hl, wd489 + $5

 	ld de, wBottomMessageText + $86

 	call Func_f8bd

 	ld bc, $0040

@@ -490,13 +490,13 @@ Func_f853: ; 0xf853
 	call Func_f80d

 	ret

 

-Func_f8b5: ; 0xf8b5

+ClearBCD6Buffer: ; 0xf8b5

 	xor a

 	ld b, $6

-.asm_f8b8

+.loop

 	ld [hli], a

 	dec b

-	jr nz, .asm_f8b8

+	jr nz, .loop

 	ret

 

 Func_f8bd: ; 0xf8bd

diff --git a/engine/pinball_game/object_collision/diglett_bonus_resolve_collision.asm b/engine/pinball_game/object_collision/diglett_bonus_resolve_collision.asm
index bdad4ab..dd7856d 100755
--- a/engine/pinball_game/object_collision/diglett_bonus_resolve_collision.asm
+++ b/engine/pinball_game/object_collision/diglett_bonus_resolve_collision.asm
@@ -674,7 +674,7 @@ Func_1ab30: ; 0x1ab30
 	ld [wDugrioState], a

 	ld [wd498], a

 	ld a, $1

-	ld [wd49a], a

+	ld [wCompletedBonusStage], a

 	call FillBottomMessageBufferWithBlackTile

 	call Func_30db

 	ld hl, wd5dc

diff --git a/engine/pinball_game/object_collision/gengar_bonus_resolve_collision.asm b/engine/pinball_game/object_collision/gengar_bonus_resolve_collision.asm
index aae04b1..0ccf338 100755
--- a/engine/pinball_game/object_collision/gengar_bonus_resolve_collision.asm
+++ b/engine/pinball_game/object_collision/gengar_bonus_resolve_collision.asm
@@ -1002,7 +1002,7 @@ Func_189af: ; 0x189af
 	ld a, $1

 	ld [wd498], a

 	ld a, $1

-	ld [wd49a], a

+	ld [wCompletedBonusStage], a

 	call FillBottomMessageBufferWithBlackTile

 	call Func_30db

 	ld hl, wd5dc

diff --git a/engine/pinball_game/object_collision/meowth_bonus_resolve_collision.asm b/engine/pinball_game/object_collision/meowth_bonus_resolve_collision.asm
index 62d5815..3c8612d 100755
--- a/engine/pinball_game/object_collision/meowth_bonus_resolve_collision.asm
+++ b/engine/pinball_game/object_collision/meowth_bonus_resolve_collision.asm
@@ -39,7 +39,7 @@ ResolveMeowthBonusGameObjectCollisions: ; 0x2442a
 	ld de, $0000

 	call PlaySong

 	ld a, $1

-	ld [wd49a], a

+	ld [wCompletedBonusStage], a

 	call FillBottomMessageBufferWithBlackTile

 	call Func_30db

 	ld hl, wd5dc

diff --git a/engine/pinball_game/object_collision/mewtwo_bonus_resolve_collision.asm b/engine/pinball_game/object_collision/mewtwo_bonus_resolve_collision.asm
index e23850e..3e5276b 100755
--- a/engine/pinball_game/object_collision/mewtwo_bonus_resolve_collision.asm
+++ b/engine/pinball_game/object_collision/mewtwo_bonus_resolve_collision.asm
@@ -348,7 +348,7 @@ Func_19638: ; 0x19638
 	ld [wNumMewtwoBonusCompletions], a

 .asm_1965e

 	ld a, $1

-	ld [wd49a], a

+	ld [wCompletedBonusStage], a

 	call FillBottomMessageBufferWithBlackTile

 	call Func_30db

 	ld hl, wd5dc

diff --git a/engine/pinball_game/object_collision/seel_bonus_resolve_collision.asm b/engine/pinball_game/object_collision/seel_bonus_resolve_collision.asm
index 58135cb..b52be76 100755
--- a/engine/pinball_game/object_collision/seel_bonus_resolve_collision.asm
+++ b/engine/pinball_game/object_collision/seel_bonus_resolve_collision.asm
@@ -12,7 +12,7 @@ ResolveSeelBonusGameObjectCollisions: ; 0x25c5a
 	ld de, $0000

 	call PlaySong

 	ld a, $1

-	ld [wd49a], a

+	ld [wCompletedBonusStage], a

 	call FillBottomMessageBufferWithBlackTile

 	call Func_30db

 	ld hl, wd5dc

diff --git a/engine/pinball_game/stage_init/init_diglett_bonus.asm b/engine/pinball_game/stage_init/init_diglett_bonus.asm
index b68501c..ec4ce86 100755
--- a/engine/pinball_game/stage_init/init_diglett_bonus.asm
+++ b/engine/pinball_game/stage_init/init_diglett_bonus.asm
@@ -11,7 +11,7 @@ InitDiglettBonusStage: ; 0x199f2
 	xor a

 	ld [wd4c8], a

 	ld [wBallType], a

-	ld [wd49a], a

+	ld [wCompletedBonusStage], a

 	; initialize all digletts to hiding

 	ld a, $1  ; hiding diglett state

 	ld hl, wDiglettStates

diff --git a/engine/pinball_game/stage_init/init_gengar_bonus.asm b/engine/pinball_game/stage_init/init_gengar_bonus.asm
index 4f7da3b..357de1c 100755
--- a/engine/pinball_game/stage_init/init_gengar_bonus.asm
+++ b/engine/pinball_game/stage_init/init_gengar_bonus.asm
@@ -16,7 +16,7 @@ InitGengarBonusStage: ; 0x18099
 	xor a

 	ld [wd4c8], a

 	ld [wBallType], a

-	ld [wd49a], a

+	ld [wCompletedBonusStage], a

 	ld hl, GastlyInitialData

 	ld de, wd659

 	call Copy9BytesToDE

diff --git a/engine/pinball_game/stage_init/init_meowth_bonus.asm b/engine/pinball_game/stage_init/init_meowth_bonus.asm
index c001b20..178c90c 100755
--- a/engine/pinball_game/stage_init/init_meowth_bonus.asm
+++ b/engine/pinball_game/stage_init/init_meowth_bonus.asm
@@ -10,7 +10,7 @@ InitMeowthBonusStage: ; 0x24000
 	xor a

 	ld [wd4c8], a

 	ld [wBallType], a

-	ld [wd49a], a

+	ld [wCompletedBonusStage], a

 	ld a, $1

 	ld [wd7ac], a

 	ld a, $40

diff --git a/engine/pinball_game/stage_init/init_mewtwo_bonus.asm b/engine/pinball_game/stage_init/init_mewtwo_bonus.asm
index 44d7417..26410e3 100755
--- a/engine/pinball_game/stage_init/init_mewtwo_bonus.asm
+++ b/engine/pinball_game/stage_init/init_mewtwo_bonus.asm
@@ -11,7 +11,7 @@ InitMewtwoBonusStage: ; 0x1924f
 	xor a

 	ld [wd4c8], a

 	ld [wBallType], a

-	ld [wd49a], a

+	ld [wCompletedBonusStage], a

 	ld hl, Data_192ab

 	ld de, wd6b6

 	ld b, $c

diff --git a/engine/pinball_game/stage_init/init_seel_bonus.asm b/engine/pinball_game/stage_init/init_seel_bonus.asm
index 50a25b8..ee51417 100755
--- a/engine/pinball_game/stage_init/init_seel_bonus.asm
+++ b/engine/pinball_game/stage_init/init_seel_bonus.asm
@@ -12,7 +12,7 @@ InitSeelBonusStage: ; 0x25a7c
 	xor a

 	ld [wd4c8], a

 	ld [wBallType], a

-	ld [wd49a], a

+	ld [wCompletedBonusStage], a

 	ld hl, InitialSeelCoords

 	ld de, wd76d

 	call InitSeelPosition

diff --git a/wram.asm b/wram.asm
index eb85322..ca47695 100755
--- a/wram.asm
+++ b/wram.asm
@@ -142,22 +142,13 @@ wd482:: ; 0xd482
 	ds $1
 
 wd483:: ; 0xd483
-	ds $5
-
-wd488:: ; 0xd488
-	ds $1
+	ds $6
 
 wd489:: ; 0xd489
-	ds $5
-
-wd48e:: ; 0xd48e
-	ds $1
+	ds $6
 
 wd48f:: ; 0xd48f
-	ds $5
-
-wd494:: ; 0xd494
-	ds $1
+	ds $6
 
 wd495:: ; 0xd495
 	ds $1
@@ -174,7 +165,8 @@ wd498:: ; 0xd498
 wd499:: ; 0xd499
 	ds $1
 
-wd49a:: ; 0xd49a
+wCompletedBonusStage:: ; 0xd49a
+; Set to 1 when a bonus stage is successfully cleared.
 	ds $1
 
 wCurBonusMultiplier:: ; 0xd49b