Add Shoot constants

ElectroDeoxys · Feb 26, 2024 · 3ca79d4 · 3ca79d4
1 parent fbfec8f
commit 3ca79d4
Show file tree

Hide file tree

Showing 5 changed files with 274 additions and 275 deletions.
diff --git a/src/engine/bank18.asm b/src/engine/bank18.asm
@@ -965,8 +965,8 @@ Func_61f10:
 	ld [wDollBoyNoFlashingBarrel], a
 	ld [wDollBoyRemainingParts], a
 	ld [wNumLitTorches], a
-	ld [wNumShootGoals], a
-	ld [wNumWarioGoals], a
+	ld [wShootGoals], a
+	ld [wWarioGoals], a
 	ret
 
 Func_61f2a:
@@ -976,8 +976,8 @@ Func_61f2a:
 	ld [wDollBoyNoFlashingBarrel], a
 	ld [wDollBoyRemainingParts], a
 	ld [wNumLitTorches], a
-	ld [wNumShootGoals], a
-	ld [wNumWarioGoals], a
+	ld [wShootGoals], a
+	ld [wWarioGoals], a
 	ret
 
 ClearObjects:

diff --git a/src/engine/bank7c.asm b/src/engine/bank7c.asm
@@ -584,7 +584,7 @@ SaveLevel:
 	ld a, BANK("WRAM1")
 	ldh [rSVBK], a
 	ld hl, wObjects
-	ld bc, (wNumWarioGoals - wObjects) + 5
+	ld bc, (wWarioGoals - wObjects) + 5
 	call CopyHLToDE_BC
 	pop af
 	ldh [rSVBK], a
@@ -683,7 +683,7 @@ SaveLevel:
 	ld a, BANK("WRAM1")
 	ldh [rSVBK], a
 	ld hl, wObjects
-	ld bc, (wNumWarioGoals - wObjects) + 5
+	ld bc, (wWarioGoals - wObjects) + 5
 	call CopyHLToDE_BC
 	pop af
 	ldh [rSVBK], a
@@ -748,7 +748,7 @@ SaveLevel:
 	ld a, BANK("WRAM1")
 	ldh [rSVBK], a
 	ld hl, wObjects
-	ld bc, (wNumWarioGoals - wObjects) + 5
+	ld bc, (wWarioGoals - wObjects) + 5
 	call CopyHLToDE_BC
 	pop af
 	ldh [rSVBK], a
@@ -815,7 +815,7 @@ SaveLevel:
 	ld a, BANK("WRAM1")
 	ldh [rSVBK], a
 	ld hl, wObjects
-	ld bc, (wNumWarioGoals - wObjects) + 5
+	ld bc, (wWarioGoals - wObjects) + 5
 	call CopyHLToDE_BC
 	pop af
 	ldh [rSVBK], a
@@ -1543,7 +1543,7 @@ CalculateWRAMDataChecksum:
 	ld a, BANK("WRAM1")
 	ldh [rSVBK], a
 	ld hl, wObjects
-	ld bc, (wNumWarioGoals - wObjects) + 5
+	ld bc, (wWarioGoals - wObjects) + 5
 	call CalculateChecksumLong
 	pop af
 	ldh [rSVBK], a