Tidy up call table formatting

7 files changed, 116 insertions, 262 deletions

diff --git a/engine/pinball_game/catchem_mode.asm b/engine/pinball_game/catchem_mode.asm
index ae53e5c..c72679e 100755
--- a/engine/pinball_game/catchem_mode.asm
+++ b/engine/pinball_game/catchem_mode.asm
@@ -122,16 +122,12 @@ StartCatchEmMode: ; 0x1003f
 	ld a, [wCurrentStage]

 	rst JumpTable  ; calls JumpToFuncInTable

 CallTable_10124: ; 0x10124

-	; STAGE_RED_FIELD_TOP

-	dw Func_10871

-	; STAGE_RED_FIELD_BOTTOM

-	dw Func_10871

+	dw Func_10871      ; STAGE_RED_FIELD_TOP

+	dw Func_10871      ; STAGE_RED_FIELD_BOTTOM

 	dw DoNothing_1098a

 	dw DoNothing_1098a

-	; STAGE_BLUE_FIELD_TOP

-	dw Func_1098c

-	; STAGE_BLUE_FIELD_BOTTOM

-	dw Func_1098c

+	dw Func_1098c      ; STAGE_BLUE_FIELD_TOP

+	dw Func_1098c      ; STAGE_BLUE_FIELD_BOTTOM

 

 CheckForMew:

 ; Sets the encountered mon to Mew if the following conditions are met:

@@ -176,16 +172,12 @@ ConcludeCatchEmMode: ; 0x10157
 	ld a, [wCurrentStage]

 	rst JumpTable  ; calls JumpToFuncInTable

 CallTable_10178: ; 0x10178

-	; STAGE_RED_FIELD_TOP

-	dw Func_108f5

-	; STAGE_RED_FIELD_BOTTOM

-	dw Func_108f5

+	dw Func_108f5      ; STAGE_RED_FIELD_TOP

+	dw Func_108f5      ; STAGE_RED_FIELD_BOTTOM

 	dw DoNothing_1098b

 	dw DoNothing_1098b

-	; STAGE_BLUE_FIELD_TOP

-	dw Func_109fc

-	; STAGE_BLUE_FIELD_BOTTOM

-	dw Func_109fc

+	dw Func_109fc      ; STAGE_BLUE_FIELD_TOP

+	dw Func_109fc      ; STAGE_BLUE_FIELD_BOTTOM

 

 Func_10184: ; 0x10184

 	ld a, [wCurrentStage]

diff --git a/engine/pinball_game/draw_sprites/draw_sprites.asm b/engine/pinball_game/draw_sprites/draw_sprites.asm
index 8e653bf..e9dc693 100755
--- a/engine/pinball_game/draw_sprites/draw_sprites.asm
+++ b/engine/pinball_game/draw_sprites/draw_sprites.asm
@@ -3,33 +3,19 @@ DrawSpritesForStage: ; 0x84b7
 	ld a, [wCurrentStage]

 	call CallInFollowingTable

 CallTable_84bd: ; 0x84bd

-	; STAGE_RED_FIELD_TOP

-	padded_dab DrawSpritesRedFieldTop

-	; STAGE_RED_FIELD_BOTTOM

-	padded_dab DrawSpritesRedFieldBottom

+	padded_dab DrawSpritesRedFieldTop     ; STAGE_RED_FIELD_TOP

+	padded_dab DrawSpritesRedFieldBottom  ; STAGE_RED_FIELD_BOTTOM

 	padded_dab Func_18079

 	padded_dab Func_18084

-	; STAGE_BLUE_FIELD_TOP

-	padded_dab DrawSpritesBlueFieldTop

-	; STAGE_BLUE_FIELD_BOTTOM

-	padded_dab DrawSpritesBlueFieldBottom

-	; STAGE_GENGAR_BONUS

-	padded_dab DrawSpritesGengarBonus

-	; STAGE_GENGAR_BONUS

-	padded_dab DrawSpritesGengarBonus

-	; STAGE_MEWTWO_BONUS

-	padded_dab DrawSpritesMewtwoBonus

-	; STAGE_MEWTWO_BONUS

-	padded_dab DrawSpritesMewtwoBonus

-	; STAGE_MEOWTH_BONUS

-	padded_dab DrawSpritesMeowthBonus

-	; STAGE_MEOWTH_BONUS

-	padded_dab DrawSpritesMeowthBonus

-	; STAGE_DIGLETT_BONUS

-	padded_dab DrawSpritesDiglettBonus

-	; STAGE_DIGLETT_BONUS

-	padded_dab DrawSpritesDiglettBonus

-	; STAGE_SEEL_BONUS

-	padded_dab DrawSpritesSeelBonus

-	; STAGE_SEEL_BONUS

-	padded_dab DrawSpritesSeelBonus

+	padded_dab DrawSpritesBlueFieldTop    ; STAGE_BLUE_FIELD_TOP

+	padded_dab DrawSpritesBlueFieldBottom ; STAGE_BLUE_FIELD_BOTTOM

+	padded_dab DrawSpritesGengarBonus     ; STAGE_GENGAR_BONUS

+	padded_dab DrawSpritesGengarBonus     ; STAGE_GENGAR_BONUS

+	padded_dab DrawSpritesMewtwoBonus     ; STAGE_MEWTWO_BONUS

+	padded_dab DrawSpritesMewtwoBonus     ; STAGE_MEWTWO_BONUS

+	padded_dab DrawSpritesMeowthBonus     ; STAGE_MEOWTH_BONUS

+	padded_dab DrawSpritesMeowthBonus     ; STAGE_MEOWTH_BONUS

+	padded_dab DrawSpritesDiglettBonus    ; STAGE_DIGLETT_BONUS

+	padded_dab DrawSpritesDiglettBonus    ; STAGE_DIGLETT_BONUS

+	padded_dab DrawSpritesSeelBonus       ; STAGE_SEEL_BONUS

+	padded_dab DrawSpritesSeelBonus       ; STAGE_SEEL_BONUS

diff --git a/engine/pinball_game/end_of_ball_bonus.asm b/engine/pinball_game/end_of_ball_bonus.asm
index 86fdc3d..6e8ba8a 100755
--- a/engine/pinball_game/end_of_ball_bonus.asm
+++ b/engine/pinball_game/end_of_ball_bonus.asm
@@ -105,28 +105,18 @@ HandleBallBonusForCurrentField: ; 0xf60a
 	ld a, [wCurrentStage]

 	rst JumpTable  ; calls JumpToFuncInTable

 CallTable_f60d: ; 0xf60d

-	; STAGE_RED_FIELD_TOP

-	dw HandleBallBonusRedField

-	; STAGE_RED_FIELD_BOTTOM

-	dw HandleBallBonusRedField

+	dw HandleBallBonusRedField  ; STAGE_RED_FIELD_TOP

+	dw HandleBallBonusRedField  ; STAGE_RED_FIELD_BOTTOM

 	dw DoNothing_f9f2

 	dw DoNothing_f9f2

-	; STAGE_BLUE_FIELD_TOP

-	dw HandleBallBonusBlueField

-	; STAGE_BLUE_FIELD_BOTTOM

-	dw HandleBallBonusBlueField

-	; STAGE_GENGAR_BONUS

-	dw DoNothing_faf6

-	; STAGE_GENGAR_BONUS

-	dw DoNothing_faf6

-	; STAGE_MEWTWO_BONUS

-	dw DoNothing_faf7

-	; STAGE_MEWTWO_BONUS

-	dw DoNothing_faf7

-	; STAGE_MEOWTH_BONUS

-	dw DoNothing_faf8

-	; STAGE_MEOWTH_BONUS

-	dw DoNothing_faf8

+	dw HandleBallBonusBlueField ; STAGE_BLUE_FIELD_TOP

+	dw HandleBallBonusBlueField ; STAGE_BLUE_FIELD_BOTTOM

+	dw DoNothing_faf6           ; STAGE_GENGAR_BONUS

+	dw DoNothing_faf6           ; STAGE_GENGAR_BONUS

+	dw DoNothing_faf7           ; STAGE_MEWTWO_BONUS

+	dw DoNothing_faf7           ; STAGE_MEWTWO_BONUS

+	dw DoNothing_faf8           ; STAGE_MEOWTH_BONUS

+	dw DoNothing_faf8           ; STAGE_MEOWTH_BONUS

 

 HandleNumPokemonCaughtBallBonus: ; 0xf626

 	ld de, wBottomMessageText + $01

diff --git a/engine/pinball_game/load_stage_data/load_stage_data.asm b/engine/pinball_game/load_stage_data/load_stage_data.asm
index 4922289..957c009 100755
--- a/engine/pinball_game/load_stage_data/load_stage_data.asm
+++ b/engine/pinball_game/load_stage_data/load_stage_data.asm
@@ -3,33 +3,19 @@ _LoadStageData: ; 0x8471
 	ld a, [wCurrentStage]

 	call CallInFollowingTable

 CallTable_8477: ; 0x8477

-	; STAGE_RED_FIELD_TOP

-	padded_dab _LoadStageDataRedFieldTop

-	; STAGE_RED_FIELD_BOTTOM

-	padded_dab _LoadStageDataRedFieldBottom

+	padded_dab _LoadStageDataRedFieldTop     ; STAGE_RED_FIELD_TOP

+	padded_dab _LoadStageDataRedFieldBottom  ; STAGE_RED_FIELD_BOTTOM

 	padded_dab DoNothing_1805f

 	padded_dab DoNothing_18060

-	; STAGE_BLUE_FIELD_TOP

-	padded_dab _LoadStageDataBlueFieldTop

-	; STAGE_BLUE_FIELD_BOTTOM

-	padded_dab _LoadStageDataBlueFieldBottom

-	; STAGE_GENGAR_BONUS

-	padded_dab _LoadStageDataGengarBonus

-	; STAGE_GENGAR_BONUS

-	padded_dab _LoadStageDataGengarBonus

-	; STAGE_MEWTWO_BONUS

-	padded_dab _LoadStageDataMewtwoBonus

-	; STAGE_MEWTWO_BONUS

-	padded_dab _LoadStageDataMewtwoBonus

-	; STAGE_MEOWTH_BONUS

-	padded_dab _LoadStageDataMeowthBonus

-	; STAGE_MEOWTH_BONUS

-	padded_dab _LoadStageDataMeowthBonus

-	; STAGE_DIGLETT_BONUS

-	padded_dab _LoadStageDataDiglettBonus

-	; STAGE_DIGLETT_BONUS

-	padded_dab _LoadStageDataDiglettBonus

-	; STAGE_SEEL_BONUS

-	padded_dab _LoadStageDataSeelBonus

-	; STAGE_SEEL_BONUS

-	padded_dab _LoadStageDataSeelBonus

+	padded_dab _LoadStageDataBlueFieldTop    ; STAGE_BLUE_FIELD_TOP

+	padded_dab _LoadStageDataBlueFieldBottom ; STAGE_BLUE_FIELD_BOTTOM

+	padded_dab _LoadStageDataGengarBonus     ; STAGE_GENGAR_BONUS

+	padded_dab _LoadStageDataGengarBonus     ; STAGE_GENGAR_BONUS

+	padded_dab _LoadStageDataMewtwoBonus     ; STAGE_MEWTWO_BONUS

+	padded_dab _LoadStageDataMewtwoBonus     ; STAGE_MEWTWO_BONUS

+	padded_dab _LoadStageDataMeowthBonus     ; STAGE_MEOWTH_BONUS

+	padded_dab _LoadStageDataMeowthBonus     ; STAGE_MEOWTH_BONUS

+	padded_dab _LoadStageDataDiglettBonus    ; STAGE_DIGLETT_BONUS

+	padded_dab _LoadStageDataDiglettBonus    ; STAGE_DIGLETT_BONUS

+	padded_dab _LoadStageDataSeelBonus       ; STAGE_SEEL_BONUS

+	padded_dab _LoadStageDataSeelBonus       ; STAGE_SEEL_BONUS

diff --git a/engine/pinball_game/object_collision/object_collision.asm b/engine/pinball_game/object_collision/object_collision.asm
index 49a2253..9324829 100755
--- a/engine/pinball_game/object_collision/object_collision.asm
+++ b/engine/pinball_game/object_collision/object_collision.asm
@@ -10,51 +10,22 @@ CheckGameObjectCollisions_: ; 0x272f
 	ld a, [wCurrentStage]

 	call CallInFollowingTable

 GameObjectCollisions_CallTable: ; 0x2735

-	; STAGE_RED_FIELD_TOP

-	padded_dab CheckRedStageTopGameObjectCollisions

-

-	; STAGE_RED_FIELD_BOTTOM

-	padded_dab CheckRedStageBottomGameObjectCollisions

-

+	padded_dab CheckRedStageTopGameObjectCollisions       ; STAGE_RED_FIELD_TOP

+	padded_dab CheckRedStageBottomGameObjectCollisions    ; STAGE_RED_FIELD_BOTTOM

 	padded_dab DoNothing_18061

-

 	padded_dab Func_18062

-

-	; STAGE_BLUE_FIELD_TOP

-	padded_dab CheckBlueStageTopGameObjectCollisions

-

-	; STAGE_BLUE_FIELD_BOTTOM

-	padded_dab CheckBlueStageBottomGameObjectCollisions

-

-	; STAGE_GENGAR_BONUS

-	padded_dab CheckGengarBonusStageGameObjectCollisions

-

-	; STAGE_GENGAR_BONUS

-	padded_dab CheckGengarBonusStageGameObjectCollisions

-

-	; STAGE_MEWTWO_BONUS

-	padded_dab CheckMewtwoBonusStageGameObjectCollisions

-

-	; STAGE_MEWTWO_BONUS

-	padded_dab CheckMewtwoBonusStageGameObjectCollisions

-

-	; STAGE_MEOWTH_BONUS

-	padded_dab CheckMeowthBonusStageGameObjectCollisions

-

-	; STAGE_MEOWTH_BONUS

-	padded_dab CheckMeowthBonusStageGameObjectCollisions

-

-	; STAGE_DIGLETT_BONUS

-	padded_dab CheckDiglettBonusStageGameObjectCollisions

-

-	; STAGE_DIGLETT_BONUS

-	padded_dab CheckDiglettBonusStageGameObjectCollisions

-

-	; STAGE_SEEL_BONUS

-	padded_dab CheckSeelBonusStageGameObjectCollisions

-

-	; STAGE_SEEL_BONUS

-	padded_dab CheckSeelBonusStageGameObjectCollisions

+	padded_dab CheckBlueStageTopGameObjectCollisions      ; STAGE_BLUE_FIELD_TOP

+	padded_dab CheckBlueStageBottomGameObjectCollisions   ; STAGE_BLUE_FIELD_BOTTOM

+	padded_dab CheckGengarBonusStageGameObjectCollisions  ; STAGE_GENGAR_BONUS

+	padded_dab CheckGengarBonusStageGameObjectCollisions  ; STAGE_GENGAR_BONUS

+	padded_dab CheckMewtwoBonusStageGameObjectCollisions  ; STAGE_MEWTWO_BONUS

+	padded_dab CheckMewtwoBonusStageGameObjectCollisions  ; STAGE_MEWTWO_BONUS

+	padded_dab CheckMeowthBonusStageGameObjectCollisions  ; STAGE_MEOWTH_BONUS

+	padded_dab CheckMeowthBonusStageGameObjectCollisions  ; STAGE_MEOWTH_BONUS

+	padded_dab CheckDiglettBonusStageGameObjectCollisions ; STAGE_DIGLETT_BONUS

+	padded_dab CheckDiglettBonusStageGameObjectCollisions ; STAGE_DIGLETT_BONUS

+	padded_dab CheckSeelBonusStageGameObjectCollisions    ; STAGE_SEEL_BONUS

+	padded_dab CheckSeelBonusStageGameObjectCollisions    ; STAGE_SEEL_BONUS

 

 HandleGameObjectCollision: ; 0x2775

 ; Handle collision checking for one set of game objects, such as the bumpers, Pikachu savers, etc.

@@ -202,48 +173,19 @@ ResolveGameObjectCollisions: ; 0x281c
 	call CallInFollowingTable

 CallTable_2822: ; 0x2822

 ; not collisions

-	; STAGE_RED_FIELD_TOP

-	padded_dab ResolveRedFieldTopGameObjectCollisions

-

-	; STAGE_RED_FIELD_BOTTOM

-	padded_dab ResolveRedFieldBottomGameObjectCollisions

-

+	padded_dab ResolveRedFieldTopGameObjectCollisions     ; STAGE_RED_FIELD_TOP

+	padded_dab ResolveRedFieldBottomGameObjectCollisions  ; STAGE_RED_FIELD_BOTTOM

 	padded_dab DoNothing_1806d

-

 	padded_dab Func_1806e

-

-	; STAGE_BLUE_FIELD_TOP

-	padded_dab ResolveBlueFieldTopGameObjectCollisions

-

-	; STAGE_BLUE_FIELD_BOTTOM

-	padded_dab ResolveBlueFieldBottomGameObjectCollisions

-

-	; STAGE_GENGAR_BONUS

-	padded_dab ResolveGengarBonusGameObjectCollisions

-

-	; STAGE_GENGAR_BONUS

-	padded_dab ResolveGengarBonusGameObjectCollisions

-

-	; STAGE_MEWTWO_BONUS

-	padded_dab ResolveMewtwoBonusGameObjectCollisions

-

-	; STAGE_MEWTWO_BONUS

-	padded_dab ResolveMewtwoBonusGameObjectCollisions

-

-	; STAGE_MEOWTH_BONUS

-	padded_dab ResolveMeowthBonusGameObjectCollisions

-

-	; STAGE_MEOWTH_BONUS

-	padded_dab ResolveMeowthBonusGameObjectCollisions

-

-	; STAGE_DIGLETT_BONUS

-	padded_dab ResolveDiglettBonusGameObjectCollisions

-

-	; STAGE_DIGLETT_BONUS

-	padded_dab ResolveDiglettBonusGameObjectCollisions

-

-	; STAGE_SEEL_BONUS

-	padded_dab ResolveSeelBonusGameObjectCollisions

-

-	; STAGE_SEEL_BONUS

-	padded_dab ResolveSeelBonusGameObjectCollisions

+	padded_dab ResolveBlueFieldTopGameObjectCollisions    ; STAGE_BLUE_FIELD_TOP

+	padded_dab ResolveBlueFieldBottomGameObjectCollisions ; STAGE_BLUE_FIELD_BOTTOM

+	padded_dab ResolveGengarBonusGameObjectCollisions     ; STAGE_GENGAR_BONUS

+	padded_dab ResolveGengarBonusGameObjectCollisions     ; STAGE_GENGAR_BONUS

+	padded_dab ResolveMewtwoBonusGameObjectCollisions     ; STAGE_MEWTWO_BONUS

+	padded_dab ResolveMewtwoBonusGameObjectCollisions     ; STAGE_MEWTWO_BONUS

+	padded_dab ResolveMeowthBonusGameObjectCollisions     ; STAGE_MEOWTH_BONUS

+	padded_dab ResolveMeowthBonusGameObjectCollisions     ; STAGE_MEOWTH_BONUS

+	padded_dab ResolveDiglettBonusGameObjectCollisions    ; STAGE_DIGLETT_BONUS

+	padded_dab ResolveDiglettBonusGameObjectCollisions    ; STAGE_DIGLETT_BONUS

+	padded_dab ResolveSeelBonusGameObjectCollisions       ; STAGE_SEEL_BONUS

+	padded_dab ResolveSeelBonusGameObjectCollisions       ; STAGE_SEEL_BONUS

diff --git a/engine/pinball_game/stage_init/init_stages.asm b/engine/pinball_game/stage_init/init_stages.asm
index 6536ae1..1d4ba78 100755
--- a/engine/pinball_game/stage_init/init_stages.asm
+++ b/engine/pinball_game/stage_init/init_stages.asm
@@ -25,36 +25,22 @@ InitializeCurrentStage: ; 0x8311
 	ld a, [wCurrentStage]

 	call CallInFollowingTable

 CallTable_8348: ; 0x8348

-	; STAGE_RED_FIELD_TOP

-	padded_dab InitRedField

-	; STAGE_RED_FIELD_BOTTOM

-	padded_dab InitRedField

+	padded_dab InitRedField          ; STAGE_RED_FIELD_TOP

+	padded_dab InitRedField          ; STAGE_RED_FIELD_BOTTOM

 	padded_dab Func_18000

 	padded_dab Func_18000

-	; STAGE_BLUE_FIELD_TOP

-	padded_dab InitBlueField

-	; STAGE_BLUE_FIELD_BOTTOM

-	padded_dab InitBlueField

-	; STAGE_GENGAR_BONUS

-	padded_dab InitGengarBonusStage

-	; STAGE_GENGAR_BONUS

-	padded_dab InitGengarBonusStage

-	; STAGE_MEWTWO_BONUS

-	padded_dab InitMewtwoBonusStage

-	; STAGE_MEWTWO_BONUS

-	padded_dab InitMewtwoBonusStage

-	; STAGE_MEOWTH_BONUS

-	padded_dab InitMeowthBonusStage

-	; STAGE_MEOWTH_BONUS

-	padded_dab InitMeowthBonusStage

-	; STAGE_DIGLETT_BONUS

-	padded_dab InitDiglettBonusStage

-	; STAGE_DIGLETT_BONUS

-	padded_dab InitDiglettBonusStage

-	; STAGE_SEEL_BONUS

-	padded_dab InitSeelBonusStage

-	; STAGE_SEEL_BONUS

-	padded_dab InitSeelBonusStage

+	padded_dab InitBlueField         ; STAGE_BLUE_FIELD_TOP

+	padded_dab InitBlueField         ; STAGE_BLUE_FIELD_BOTTOM

+	padded_dab InitGengarBonusStage  ; STAGE_GENGAR_BONUS

+	padded_dab InitGengarBonusStage  ; STAGE_GENGAR_BONUS

+	padded_dab InitMewtwoBonusStage  ; STAGE_MEWTWO_BONUS

+	padded_dab InitMewtwoBonusStage  ; STAGE_MEWTWO_BONUS

+	padded_dab InitMeowthBonusStage  ; STAGE_MEOWTH_BONUS

+	padded_dab InitMeowthBonusStage  ; STAGE_MEOWTH_BONUS

+	padded_dab InitDiglettBonusStage ; STAGE_DIGLETT_BONUS

+	padded_dab InitDiglettBonusStage ; STAGE_DIGLETT_BONUS

+	padded_dab InitSeelBonusStage    ; STAGE_SEEL_BONUS

+	padded_dab InitSeelBonusStage    ; STAGE_SEEL_BONUS

 

 ResetDataForStageInitialization: ; 0x8388

 ; Resets some game data, depending on which stage is being initialized.

diff --git a/main.asm b/main.asm
index bdd25f8..f0325e3 100755
--- a/main.asm
+++ b/main.asm
@@ -203,16 +203,12 @@ Func_10000: ; 0x10000
 	ld a, [wCurrentStage]
 	call CallInFollowingTable
 CallTable_10027: ; 0x10027
-	; STAGE_RED_FIELD_TOP
+	padded_dab Func_20000 ; STAGE_RED_FIELD_TOP
+	padded_dab Func_20000 ; STAGE_RED_FIELD_BOTTOM
 	padded_dab Func_20000
-	; STAGE_RED_FIELD_BOTTOM
 	padded_dab Func_20000
-	padded_dab Func_20000
-	padded_dab Func_20000
-	; STAGE_BLUE_FIELD_TOP
-	padded_dab Func_202bc
-	; STAGE_BLUE_FIELD_BOTTOM
-	padded_dab Func_202bc
+	padded_dab Func_202bc ; STAGE_BLUE_FIELD_TOP
+	padded_dab Func_202bc ; STAGE_BLUE_FIELD_BOTTOM
 
 INCLUDE "engine/pinball_game/catchem_mode.asm"
 
@@ -220,16 +216,12 @@ Func_10a95: ; 0x19a95
 	ld a, [wCurrentStage]
 	call CallInFollowingTable
 PointerTable_10a9b: ; 0x10a9b
-	; STAGE_RED_FIELD_TOP
-	padded_dab Func_20581
-	; STAGE_RED_FIELD_BOTTOM
+	padded_dab Func_20581 ; STAGE_RED_FIELD_TOP
+	padded_dab Func_20581 ; STAGE_RED_FIELD_BOTTOM
 	padded_dab Func_20581
 	padded_dab Func_20581
-	padded_dab Func_20581
-	; STAGE_BLUE_FIELD_TOP
-	padded_dab Func_20bae
-	; STAGE_BLUE_FIELD_BOTTOM
-	padded_dab Func_20bae
+	padded_dab Func_20bae ; STAGE_BLUE_FIELD_TOP
+	padded_dab Func_20bae ; STAGE_BLUE_FIELD_BOTTOM
 
 Func_10ab3: ; 0x10ab3
 	ld a, [wInSpecialMode]
@@ -238,16 +230,12 @@ Func_10ab3: ; 0x10ab3
 	ld a, [wCurrentStage]
 	rst JumpTable  ; calls JumpToFuncInTable
 CallTable_10abc: ; 0x10abc
-	; STAGE_RED_FIELD_TOP
-	dw Func_10ebb
-	; STAGE_RED_FIELD_BOTTOM
-	dw Func_10ebb
+	dw Func_10ebb ; STAGE_RED_FIELD_TOP
+	dw Func_10ebb ; STAGE_RED_FIELD_BOTTOM
 	dw Func_11054
 	dw Func_11054
-	; STAGE_BLUE_FIELD_TOP
-	dw Func_11061
-	; STAGE_BLUE_FIELD_BOTTOM
-	dw Func_11061
+	dw Func_11061 ; STAGE_BLUE_FIELD_TOP
+	dw Func_11061 ; STAGE_BLUE_FIELD_BOTTOM
 
 Func_10ac8: ; 0x10ac8
 	xor a
@@ -265,16 +253,12 @@ Func_10ac8: ; 0x10ac8
 	ld a, [wCurrentStage]
 	rst JumpTable  ; calls JumpToFuncInTable
 CallTable_10af3: ; 0x10af3
-	; STAGE_RED_FIELD_TOP
-	dw Func_10fe3
-	; STAGE_RED_FIELD_BOTTOM
-	dw Func_10fe3
+	dw Func_10fe3 ; STAGE_RED_FIELD_TOP
+	dw Func_10fe3 ; STAGE_RED_FIELD_BOTTOM
 	dw Func_11060
 	dw Func_11060
-	; STAGE_BLUE_FIELD_TOP
-	dw Func_11195
-	; STAGE_BLUE_FIELD_TOP
-	dw Func_11195
+	dw Func_11195 ; STAGE_BLUE_FIELD_TOP
+	dw Func_11195 ; STAGE_BLUE_FIELD_TOP
 
 Func_10aff: ; 0x10aff
 	ld a, [wCurrentStage]
@@ -1468,16 +1452,12 @@ Func_301ce: ; 0x301ce
 	ld a, [wCurrentStage]
 	call CallInFollowingTable
 PointerTable_301d4: ; 0x301d4
-	; STAGE_RED_FIELD_TOP
-	padded_dab Func_314ae
-	; STAGE_RED_FIELD_BOTTOM
-	padded_dab Func_314ae
+	padded_dab Func_314ae ; STAGE_RED_FIELD_TOP
+	padded_dab Func_314ae ; STAGE_RED_FIELD_BOTTOM
 	padded_dab Func_314ae
 	padded_dab Func_314ae
-	; STAGE_BLUE_FIELD_TOP
-	padded_dab Func_3161b
-	; STAGE_BLUE_FIELD_BOTTOM
-	padded_dab Func_3161b
+	padded_dab Func_3161b ; STAGE_BLUE_FIELD_TOP
+	padded_dab Func_3161b ; STAGE_BLUE_FIELD_BOTTOM
 
 StartMapMoveMode: ; 0x301ec
 	ld a, [wInSpecialMode]
@@ -1501,16 +1481,12 @@ StartMapMoveMode: ; 0x301ec
 	ld a, [wCurrentStage]
 	rst JumpTable  ; calls JumpToFuncInTable
 CallTable_3021f: ; 0x3021f
-	; STAGE_RED_FIELD_TOP
-	dw Func_311b4
-	; STAGE_RED_FIELD_BOTTOM
-	dw Func_311b4
+	dw Func_311b4 ; STAGE_RED_FIELD_TOP
+	dw Func_311b4 ; STAGE_RED_FIELD_BOTTOM
 	dw DoNothing_31324
 	dw DoNothing_31324
-	; STAGE_BLUE_FIELD_TOP
-	dw Func_31326
-	; STAGE_BLUE_FIELD_BOTTOM
-	dw Func_31326
+	dw Func_31326 ; STAGE_BLUE_FIELD_TOP
+	dw Func_31326 ; STAGE_BLUE_FIELD_BOTTOM
 
 Func_3022b: ; 0x3022b
 	xor a
@@ -1523,16 +1499,12 @@ Func_3022b: ; 0x3022b
 	ld a, [wCurrentStage]
 	rst JumpTable  ; calls JumpToFuncInTable
 CallTable_30247: ; 0x30247
-	; STAGE_RED_FIELD_TOP
-	dw Func_31234
-	; STAGE_RED_FIELD_BOTTOM
-	dw Func_31234
+	dw Func_31234 ; STAGE_RED_FIELD_TOP
+	dw Func_31234 ; STAGE_RED_FIELD_BOTTOM
 	dw DoNothing_31325
 	dw DoNothing_31325
-	; STAGE_BLUE_FIELD_TOP
-	dw Func_313c3
-	; STAGE_BLUE_FIELD_TOP
-	dw Func_313c3
+	dw Func_313c3 ; STAGE_BLUE_FIELD_TOP
+	dw Func_313c3 ; STAGE_BLUE_FIELD_TOP
 
 INCLUDE "engine/pinball_game/billboard_tiledata.asm"