1 files changed, 19 insertions, 33 deletions
diff --git a/engine/pinball_game/ball_init/ball_init.asm b/engine/pinball_game/ball_init/ball_init.asm
index 3d894da..e545c00 100644
--- a/engine/pinball_game/ball_init/ball_init.asm
+++ b/engine/pinball_game/ball_init/ball_init.asm
@@ -1,12 +1,12 @@
 InitBallForStage: ; 0x83ba
-	ld a, [wd7c1]
+	ld a, [wLoadingSavedGame]
 	and a
-	jr z, .asm_83c7
+	jr z, .initBall
 	call TryLoadWildMonCollisionMask
 	call RestartStageMusic
 	ret
 
-.asm_83c7
+.initBall
 	xor a
 	ld [wBallXVelocity], a
 	ld [wBallXVelocity + 1], a
@@ -29,44 +29,30 @@ InitBallForStage: ; 0x83ba
 	ld [wSCX], a
 	ld a, [wCurrentStage]
 	call CallInFollowingTable
-CallTable_8404: ; 0x8404
-	; STAGE_RED_FIELD_TOP
-	padded_dab InitBallRedField
-	; STAGE_RED_FIELD_BOTTOM
-	padded_dab InitBallRedField
+InitBall_CallTable: ; 0x8404
+	padded_dab InitBallRedField          ; STAGE_RED_FIELD_TOP
+	padded_dab InitBallRedField          ; STAGE_RED_FIELD_BOTTOM
 	padded_dab Func_1804a
 	padded_dab Func_1804a
-	; STAGE_BLUE_FIELD_TOP
-	padded_dab InitBallBlueField
-	; STAGE_BLUE_FIELD_BOTTOM
-	padded_dab InitBallBlueField
-	; STAGE_GENGAR_BONUS
-	padded_dab InitBallGengarBonusStage
-	; STAGE_GENGAR_BONUS
-	padded_dab InitBallGengarBonusStage
-	; STAGE_MEWTWO_BONUS
-	padded_dab InitBallMewtwoBonusStage
-	; STAGE_MEWTWO_BONUS
-	padded_dab InitBallMewtwoBonusStage
-	; STAGE_MEOWTH_BONUS
-	padded_dab InitBallMeowthBonusStage
-	; STAGE_MEOWTH_BONUS
-	padded_dab InitBallMeowthBonusStage
-	; STAGE_DIGLETT_BONUS
-	padded_dab InitBallDiglettBonusStage
-	; STAGE_DIGLETT_BONUS
-	padded_dab InitBallDiglettBonusStage
-	; STAGE_SEEL_BONUS
-	padded_dab InitBallSeelBonusStage
-	; STAGE_SEEL_BONUS
-	padded_dab InitBallSeelBonusStage
+	padded_dab InitBallBlueField         ; STAGE_BLUE_FIELD_TOP
+	padded_dab InitBallBlueField         ; STAGE_BLUE_FIELD_BOTTOM
+	padded_dab InitBallGengarBonusStage  ; STAGE_GENGAR_BONUS
+	padded_dab InitBallGengarBonusStage  ; STAGE_GENGAR_BONUS
+	padded_dab InitBallMewtwoBonusStage  ; STAGE_MEWTWO_BONUS
+	padded_dab InitBallMewtwoBonusStage  ; STAGE_MEWTWO_BONUS
+	padded_dab InitBallMeowthBonusStage  ; STAGE_MEOWTH_BONUS
+	padded_dab InitBallMeowthBonusStage  ; STAGE_MEOWTH_BONUS
+	padded_dab InitBallDiglettBonusStage ; STAGE_DIGLETT_BONUS
+	padded_dab InitBallDiglettBonusStage ; STAGE_DIGLETT_BONUS
+	padded_dab InitBallSeelBonusStage    ; STAGE_SEEL_BONUS
+	padded_dab InitBallSeelBonusStage    ; STAGE_SEEL_BONUS
 
 TryLoadWildMonCollisionMask: ; 0x8444
 	ld a, [wInSpecialMode]
 	and a
 	jr z, .done
 	ld a, [wSpecialMode]
-	and a ; Is the current special mode "Catch 'Em" mode?
+	and a
 	jr nz, .done
 	ld a, [wWildMonIsHittable]
 	and a