Rename engine/main -> engine/pinball_game

38 files changed, 47 insertions, 46 deletions

diff --git a/engine/pinball_game.asm b/engine/pinball_game.asm
new file mode 100755
index 0000000..8915818
--- /dev/null
+++ b/engine/pinball_game.asm
@@ -0,0 +1,9 @@
+HandlePinballGame: ; 0xd853

+	ld a, [wScreenState]

+	rst JumpTable  ; calls JumpToFuncInTable

+PinballGameScreenFunctions: ; 0xd857

+	dw GameScreenFunction_LoadGFX

+	dw GameScreenFunction_StartBall

+	dw GameScreenFunction_HandleBallPhysics

+	dw GameScreenFunction_HandleBallLoss

+	dw GameScreenFunction_EndBall

diff --git a/engine/main/ball_init/ball_init.asm b/engine/pinball_game/ball_init/ball_init.asm
index e938748..e938748 100755
--- a/engine/main/ball_init/ball_init.asm
+++ b/engine/pinball_game/ball_init/ball_init.asm
diff --git a/engine/main/ball_init/ball_init_blue_field.asm b/engine/pinball_game/ball_init/ball_init_blue_field.asm
index 6aa88c1..6aa88c1 100755
--- a/engine/main/ball_init/ball_init_blue_field.asm
+++ b/engine/pinball_game/ball_init/ball_init_blue_field.asm
diff --git a/engine/main/ball_init/ball_init_diglett_bonus.asm b/engine/pinball_game/ball_init/ball_init_diglett_bonus.asm
index ef12950..ef12950 100755
--- a/engine/main/ball_init/ball_init_diglett_bonus.asm
+++ b/engine/pinball_game/ball_init/ball_init_diglett_bonus.asm
diff --git a/engine/main/ball_init/ball_init_gengar_bonus.asm b/engine/pinball_game/ball_init/ball_init_gengar_bonus.asm
index 065a1ca..065a1ca 100755
--- a/engine/main/ball_init/ball_init_gengar_bonus.asm
+++ b/engine/pinball_game/ball_init/ball_init_gengar_bonus.asm
diff --git a/engine/main/ball_init/ball_init_meowth_bonus.asm b/engine/pinball_game/ball_init/ball_init_meowth_bonus.asm
index 9747d42..9747d42 100755
--- a/engine/main/ball_init/ball_init_meowth_bonus.asm
+++ b/engine/pinball_game/ball_init/ball_init_meowth_bonus.asm
diff --git a/engine/main/ball_init/ball_init_mewtwo_bonus.asm b/engine/pinball_game/ball_init/ball_init_mewtwo_bonus.asm
index c95d283..c95d283 100755
--- a/engine/main/ball_init/ball_init_mewtwo_bonus.asm
+++ b/engine/pinball_game/ball_init/ball_init_mewtwo_bonus.asm
diff --git a/engine/main/ball_init/ball_init_red_field.asm b/engine/pinball_game/ball_init/ball_init_red_field.asm
index 78c3c8f..78c3c8f 100755
--- a/engine/main/ball_init/ball_init_red_field.asm
+++ b/engine/pinball_game/ball_init/ball_init_red_field.asm
diff --git a/engine/main/ball_init/ball_init_seel_bonus.asm b/engine/pinball_game/ball_init/ball_init_seel_bonus.asm
index 84343d1..84343d1 100755
--- a/engine/main/ball_init/ball_init_seel_bonus.asm
+++ b/engine/pinball_game/ball_init/ball_init_seel_bonus.asm
diff --git a/engine/main/ball_init/ball_init_unused_stage.asm b/engine/pinball_game/ball_init/ball_init_unused_stage.asm
index 656ce44..656ce44 100755
--- a/engine/main/ball_init/ball_init_unused_stage.asm
+++ b/engine/pinball_game/ball_init/ball_init_unused_stage.asm
diff --git a/engine/main/draw_sprites/draw_blue_field_sprites.asm b/engine/pinball_game/draw_sprites/draw_blue_field_sprites.asm
index 756971a..756971a 100755
--- a/engine/main/draw_sprites/draw_blue_field_sprites.asm
+++ b/engine/pinball_game/draw_sprites/draw_blue_field_sprites.asm
diff --git a/engine/main/draw_sprites/draw_diglett_bonus_sprites.asm b/engine/pinball_game/draw_sprites/draw_diglett_bonus_sprites.asm
index a0dded5..a0dded5 100755
--- a/engine/main/draw_sprites/draw_diglett_bonus_sprites.asm
+++ b/engine/pinball_game/draw_sprites/draw_diglett_bonus_sprites.asm
diff --git a/engine/main/draw_sprites/draw_gengar_bonus_sprites.asm b/engine/pinball_game/draw_sprites/draw_gengar_bonus_sprites.asm
index 212279d..212279d 100755
--- a/engine/main/draw_sprites/draw_gengar_bonus_sprites.asm
+++ b/engine/pinball_game/draw_sprites/draw_gengar_bonus_sprites.asm
diff --git a/engine/main/draw_sprites/draw_meowth_bonus_sprites.asm b/engine/pinball_game/draw_sprites/draw_meowth_bonus_sprites.asm
index 5d54a08..5d54a08 100755
--- a/engine/main/draw_sprites/draw_meowth_bonus_sprites.asm
+++ b/engine/pinball_game/draw_sprites/draw_meowth_bonus_sprites.asm
diff --git a/engine/main/draw_sprites/draw_mewtwo_bonus_sprites.asm b/engine/pinball_game/draw_sprites/draw_mewtwo_bonus_sprites.asm
index a4397a0..a4397a0 100755
--- a/engine/main/draw_sprites/draw_mewtwo_bonus_sprites.asm
+++ b/engine/pinball_game/draw_sprites/draw_mewtwo_bonus_sprites.asm
diff --git a/engine/main/draw_sprites/draw_red_field_sprites.asm b/engine/pinball_game/draw_sprites/draw_red_field_sprites.asm
index d56e840..d56e840 100755
--- a/engine/main/draw_sprites/draw_red_field_sprites.asm
+++ b/engine/pinball_game/draw_sprites/draw_red_field_sprites.asm
diff --git a/engine/main/draw_sprites/draw_seel_bonus_sprites.asm b/engine/pinball_game/draw_sprites/draw_seel_bonus_sprites.asm
index 261de5b..261de5b 100755
--- a/engine/main/draw_sprites/draw_seel_bonus_sprites.asm
+++ b/engine/pinball_game/draw_sprites/draw_seel_bonus_sprites.asm
diff --git a/engine/main/draw_sprites/draw_sprites.asm b/engine/pinball_game/draw_sprites/draw_sprites.asm
index 8e653bf..8e653bf 100755
--- a/engine/main/draw_sprites/draw_sprites.asm
+++ b/engine/pinball_game/draw_sprites/draw_sprites.asm
diff --git a/engine/main/draw_sprites/draw_unused_stage_sprites.asm b/engine/pinball_game/draw_sprites/draw_unused_stage_sprites.asm
index 473a8c2..473a8c2 100755
--- a/engine/main/draw_sprites/draw_unused_stage_sprites.asm
+++ b/engine/pinball_game/draw_sprites/draw_unused_stage_sprites.asm
diff --git a/engine/main/load_stage_data/load_blue_field.asm b/engine/pinball_game/load_stage_data/load_blue_field.asm
index f6e2f2f..f6e2f2f 100755
--- a/engine/main/load_stage_data/load_blue_field.asm
+++ b/engine/pinball_game/load_stage_data/load_blue_field.asm
diff --git a/engine/main/load_stage_data/load_diglett_bonus.asm b/engine/pinball_game/load_stage_data/load_diglett_bonus.asm
index 6be87a9..6be87a9 100755
--- a/engine/main/load_stage_data/load_diglett_bonus.asm
+++ b/engine/pinball_game/load_stage_data/load_diglett_bonus.asm
diff --git a/engine/main/load_stage_data/load_gengar_bonus.asm b/engine/pinball_game/load_stage_data/load_gengar_bonus.asm
index 767d37d..767d37d 100755
--- a/engine/main/load_stage_data/load_gengar_bonus.asm
+++ b/engine/pinball_game/load_stage_data/load_gengar_bonus.asm
diff --git a/engine/main/load_stage_data/load_meowth_bonus.asm b/engine/pinball_game/load_stage_data/load_meowth_bonus.asm
index 01a49ba..01a49ba 100755
--- a/engine/main/load_stage_data/load_meowth_bonus.asm
+++ b/engine/pinball_game/load_stage_data/load_meowth_bonus.asm
diff --git a/engine/main/load_stage_data/load_mewtwo_bonus.asm b/engine/pinball_game/load_stage_data/load_mewtwo_bonus.asm
index 47bbfc4..47bbfc4 100755
--- a/engine/main/load_stage_data/load_mewtwo_bonus.asm
+++ b/engine/pinball_game/load_stage_data/load_mewtwo_bonus.asm
diff --git a/engine/main/load_stage_data/load_red_field.asm b/engine/pinball_game/load_stage_data/load_red_field.asm
index 5a58a75..5a58a75 100755
--- a/engine/main/load_stage_data/load_red_field.asm
+++ b/engine/pinball_game/load_stage_data/load_red_field.asm
diff --git a/engine/main/load_stage_data/load_seel_bonus.asm b/engine/pinball_game/load_stage_data/load_seel_bonus.asm
index e72b9a7..e72b9a7 100755
--- a/engine/main/load_stage_data/load_seel_bonus.asm
+++ b/engine/pinball_game/load_stage_data/load_seel_bonus.asm
diff --git a/engine/main/load_stage_data/load_stage_data.asm b/engine/pinball_game/load_stage_data/load_stage_data.asm
index 4922289..4922289 100755
--- a/engine/main/load_stage_data/load_stage_data.asm
+++ b/engine/pinball_game/load_stage_data/load_stage_data.asm
diff --git a/engine/main/load_stage_data/load_unused_stage.asm b/engine/pinball_game/load_stage_data/load_unused_stage.asm
index 8f4dadf..8f4dadf 100755
--- a/engine/main/load_stage_data/load_unused_stage.asm
+++ b/engine/pinball_game/load_stage_data/load_unused_stage.asm
diff --git a/engine/main/stage_init/init_blue_field.asm b/engine/pinball_game/stage_init/init_blue_field.asm
index 62d2e8b..62d2e8b 100755
--- a/engine/main/stage_init/init_blue_field.asm
+++ b/engine/pinball_game/stage_init/init_blue_field.asm
diff --git a/engine/main/stage_init/init_diglett_bonus.asm b/engine/pinball_game/stage_init/init_diglett_bonus.asm
index b68501c..b68501c 100755
--- a/engine/main/stage_init/init_diglett_bonus.asm
+++ b/engine/pinball_game/stage_init/init_diglett_bonus.asm
diff --git a/engine/main/stage_init/init_gengar_bonus.asm b/engine/pinball_game/stage_init/init_gengar_bonus.asm
index 4f7da3b..4f7da3b 100755
--- a/engine/main/stage_init/init_gengar_bonus.asm
+++ b/engine/pinball_game/stage_init/init_gengar_bonus.asm
diff --git a/engine/main/stage_init/init_meowth_bonus.asm b/engine/pinball_game/stage_init/init_meowth_bonus.asm
index c001b20..c001b20 100755
--- a/engine/main/stage_init/init_meowth_bonus.asm
+++ b/engine/pinball_game/stage_init/init_meowth_bonus.asm
diff --git a/engine/main/stage_init/init_mewtwo_bonus.asm b/engine/pinball_game/stage_init/init_mewtwo_bonus.asm
index 44d7417..44d7417 100755
--- a/engine/main/stage_init/init_mewtwo_bonus.asm
+++ b/engine/pinball_game/stage_init/init_mewtwo_bonus.asm
diff --git a/engine/main/stage_init/init_red_field.asm b/engine/pinball_game/stage_init/init_red_field.asm
index d92d54e..d92d54e 100755
--- a/engine/main/stage_init/init_red_field.asm
+++ b/engine/pinball_game/stage_init/init_red_field.asm
diff --git a/engine/main/stage_init/init_seel_bonus.asm b/engine/pinball_game/stage_init/init_seel_bonus.asm
index 50a25b8..50a25b8 100755
--- a/engine/main/stage_init/init_seel_bonus.asm
+++ b/engine/pinball_game/stage_init/init_seel_bonus.asm
diff --git a/engine/main/stage_init/init_stages.asm b/engine/pinball_game/stage_init/init_stages.asm
index 948919f..948919f 100755
--- a/engine/main/stage_init/init_stages.asm
+++ b/engine/pinball_game/stage_init/init_stages.asm
diff --git a/engine/main/stage_init/init_unused_stage.asm b/engine/pinball_game/stage_init/init_unused_stage.asm
index 4fac82d..4fac82d 100755
--- a/engine/main/stage_init/init_unused_stage.asm
+++ b/engine/pinball_game/stage_init/init_unused_stage.asm
diff --git a/main.asm b/main.asm
index eb9f1c3..5b520f7 100755
--- a/main.asm
+++ b/main.asm
@@ -5,6 +5,7 @@ INCLUDE "constants.asm"
 INCLUDE "home.asm"
 
 SECTION "bank1", ROMX, BANK[$1]
+
 INCLUDE "data/oam_frames.asm"
 
 SECTION "bank2", ROMX, BANK[$2]
@@ -12,10 +13,10 @@ SECTION "bank2", ROMX, BANK[$2]
 INCLUDE "engine/select_gameboy_target_menu.asm"
 INCLUDE "engine/erase_all_data_menu.asm"
 INCLUDE "engine/copyright_screen.asm"
-INCLUDE "engine/main/stage_init/init_stages.asm"
-INCLUDE "engine/main/ball_init/ball_init.asm"
-INCLUDE "engine/main/load_stage_data/load_stage_data.asm"
-INCLUDE "engine/main/draw_sprites/draw_sprites.asm"
+INCLUDE "engine/pinball_game/stage_init/init_stages.asm"
+INCLUDE "engine/pinball_game/ball_init/ball_init.asm"
+INCLUDE "engine/pinball_game/load_stage_data/load_stage_data.asm"
+INCLUDE "engine/pinball_game/draw_sprites/draw_sprites.asm"
 
 Func_84fd:
 ; unused?
@@ -1673,16 +1674,7 @@ INCLUDE "engine/titlescreen.asm"
 INCLUDE "engine/options_screen.asm"
 INCLUDE "engine/high_scores_screen.asm"
 INCLUDE "engine/field_select_screen.asm"
-
-HandlePinballGame: ; 0xd853
-	ld a, [wScreenState]
-	rst JumpTable  ; calls JumpToFuncInTable
-PinballGameScreenFunctions: ; 0xd857
-	dw GameScreenFunction_LoadGFX
-	dw GameScreenFunction_StartBall
-	dw GameScreenFunction_HandleBallPhysics
-	dw GameScreenFunction_HandleBallLoss
-	dw GameScreenFunction_EndBall
+INCLUDE "engine/pinball_game.asm"
 
 GameScreenFunction_LoadGFX: ; 0xd861
 	xor a
@@ -8279,7 +8271,7 @@ Data_13685: ; 0x13685
 
 SECTION "bank5", ROMX, BANK[$5]
 
-INCLUDE "engine/main/load_stage_data/load_red_field.asm"
+INCLUDE "engine/pinball_game/load_stage_data/load_red_field.asm"
 INCLUDE "engine/collision/red_stage_game_object_collision.asm"
 
 Func_1460e: ; 0x1460e
@@ -17011,13 +17003,13 @@ TileData_17551: ; 0x17551
 	db $AE, $AF, $AE, $AF, $AE, $AF
 	db $00
 
-INCLUDE "engine/main/draw_sprites/draw_red_field_sprites.asm"
+INCLUDE "engine/pinball_game/draw_sprites/draw_red_field_sprites.asm"
 
 SECTION "bank6", ROMX, BANK[$6]
 
-INCLUDE "engine/main/stage_init/init_unused_stage.asm"
-INCLUDE "engine/main/ball_init/ball_init_unused_stage.asm"
-INCLUDE "engine/main/load_stage_data/load_unused_stage.asm"
+INCLUDE "engine/pinball_game/stage_init/init_unused_stage.asm"
+INCLUDE "engine/pinball_game/ball_init/ball_init_unused_stage.asm"
+INCLUDE "engine/pinball_game/load_stage_data/load_unused_stage.asm"
 
 DoNothing_18061: ; 0x18061
 	ret
@@ -17033,10 +17025,10 @@ Func_1806e: ; 0x1806e
 	callba Func_1652d
 	ret
 
-INCLUDE "engine/main/draw_sprites/draw_unused_stage_sprites.asm"
-INCLUDE "engine/main/stage_init/init_gengar_bonus.asm"
-INCLUDE "engine/main/ball_init/ball_init_gengar_bonus.asm"
-INCLUDE "engine/main/load_stage_data/load_gengar_bonus.asm"
+INCLUDE "engine/pinball_game/draw_sprites/draw_unused_stage_sprites.asm"
+INCLUDE "engine/pinball_game/stage_init/init_gengar_bonus.asm"
+INCLUDE "engine/pinball_game/ball_init/ball_init_gengar_bonus.asm"
+INCLUDE "engine/pinball_game/load_stage_data/load_gengar_bonus.asm"
 
 CheckGengarBonusStageGameObjectCollisions: ; 0x181b1
 	call CheckGengarBonusStageGastlyCollision
@@ -19173,10 +19165,10 @@ TileData_18f93: ; 0x18f93
 
 	db $00 ; terminator
 
-INCLUDE "engine/main/draw_sprites/draw_gengar_bonus_sprites.asm"
-INCLUDE "engine/main/stage_init/init_mewtwo_bonus.asm"
-INCLUDE "engine/main/ball_init/ball_init_mewtwo_bonus.asm"
-INCLUDE "engine/main/load_stage_data/load_mewtwo_bonus.asm"
+INCLUDE "engine/pinball_game/draw_sprites/draw_gengar_bonus_sprites.asm"
+INCLUDE "engine/pinball_game/stage_init/init_mewtwo_bonus.asm"
+INCLUDE "engine/pinball_game/ball_init/ball_init_mewtwo_bonus.asm"
+INCLUDE "engine/pinball_game/load_stage_data/load_mewtwo_bonus.asm"
 
 CheckMewtwoBonusStageGameObjectCollisions: ; 0x19330
 	call Func_19414
@@ -20119,10 +20111,10 @@ OrbitingBallAnimation4: ; 0x1994b
 	db $0C, $0B
 	db $00 ; terminator
 
-INCLUDE "engine/main/draw_sprites/draw_mewtwo_bonus_sprites.asm"
-INCLUDE "engine/main/stage_init/init_diglett_bonus.asm"
-INCLUDE "engine/main/ball_init/ball_init_diglett_bonus.asm"
-INCLUDE "engine/main/load_stage_data/load_diglett_bonus.asm"
+INCLUDE "engine/pinball_game/draw_sprites/draw_mewtwo_bonus_sprites.asm"
+INCLUDE "engine/pinball_game/stage_init/init_diglett_bonus.asm"
+INCLUDE "engine/pinball_game/ball_init/ball_init_diglett_bonus.asm"
+INCLUDE "engine/pinball_game/load_stage_data/load_diglett_bonus.asm"
 
 CheckDiglettBonusStageGameObjectCollisions: ; 0x19ab3
 	call CheckDiglettBonusStageDiglettHeadsCollision
@@ -21025,13 +21017,13 @@ AnimationData_1ac93: ; 0x1ac93
 	db $40, $0D
 	db $00 ; terminator
 
-INCLUDE "engine/main/draw_sprites/draw_diglett_bonus_sprites.asm"
+INCLUDE "engine/pinball_game/draw_sprites/draw_diglett_bonus_sprites.asm"
 
 SECTION "bank7", ROMX, BANK[$7]
 
-INCLUDE "engine/main/stage_init/init_blue_field.asm"
-INCLUDE "engine/main/ball_init/ball_init_blue_field.asm"
-INCLUDE "engine/main/load_stage_data/load_blue_field.asm"
+INCLUDE "engine/pinball_game/stage_init/init_blue_field.asm"
+INCLUDE "engine/pinball_game/ball_init/ball_init_blue_field.asm"
+INCLUDE "engine/pinball_game/load_stage_data/load_blue_field.asm"
 INCLUDE "engine/collision/blue_stage_game_object_collision.asm"
 
 Func_1c715: ; 0x1c715
@@ -29140,7 +29132,7 @@ Func_1f2ff: ; 0x1f2ff
 	ld [wIndicatorStates + 1], a
 	ret
 
-INCLUDE "engine/main/draw_sprites/draw_blue_field_sprites.asm"
+INCLUDE "engine/pinball_game/draw_sprites/draw_blue_field_sprites.asm"
 
 SECTION "bank8", ROMX, BANK[$8]
 
@@ -31210,9 +31202,9 @@ Func_2112a: ; 0x2112a
 
 SECTION "bank9", ROMX, BANK[$9]
 
-INCLUDE "engine/main/stage_init/init_meowth_bonus.asm"
-INCLUDE "engine/main/ball_init/ball_init_meowth_bonus.asm"
-INCLUDE "engine/main/load_stage_data/load_meowth_bonus.asm"
+INCLUDE "engine/pinball_game/stage_init/init_meowth_bonus.asm"
+INCLUDE "engine/pinball_game/ball_init/ball_init_meowth_bonus.asm"
+INCLUDE "engine/pinball_game/load_stage_data/load_meowth_bonus.asm"
 
 CheckMeowthBonusStageGameObjectCollisions: ; 0x2414d
 	call CheckMeowthBonusStageMeowthCollision
@@ -35024,10 +35016,10 @@ TileData_2580e: ; 0x2580e
 
 	db $00 ; terminator
 
-INCLUDE "engine/main/draw_sprites/draw_meowth_bonus_sprites.asm"
-INCLUDE "engine/main/stage_init/init_seel_bonus.asm"
-INCLUDE "engine/main/ball_init/ball_init_seel_bonus.asm"
-INCLUDE "engine/main/load_stage_data/load_seel_bonus.asm"
+INCLUDE "engine/pinball_game/draw_sprites/draw_meowth_bonus_sprites.asm"
+INCLUDE "engine/pinball_game/stage_init/init_seel_bonus.asm"
+INCLUDE "engine/pinball_game/ball_init/ball_init_seel_bonus.asm"
+INCLUDE "engine/pinball_game/load_stage_data/load_seel_bonus.asm"
 
 CheckSeelBonusStageGameObjectCollisions: ; 0x25bbc
 	call CheckSeelBonusStageSeelHeadCollisions
@@ -37929,7 +37921,7 @@ TileData_26b51: ; 0x26b51
 
 	db $00 ; terminator
 
-INCLUDE "engine/main/draw_sprites/draw_seel_bonus_sprites.asm"
+INCLUDE "engine/pinball_game/draw_sprites/draw_seel_bonus_sprites.asm"
 
 SECTION "banka", ROMX, BANK[$a]
 
@@ -40338,8 +40330,8 @@ INCLUDE "text/pokedex_descriptions.asm"
 
 SECTION "bankc", ROMX, BANK[$c]
 
-INCLUDE "engine/main/stage_init/init_red_field.asm"
-INCLUDE "engine/main/ball_init/ball_init_red_field.asm"
+INCLUDE "engine/pinball_game/stage_init/init_red_field.asm"
+INCLUDE "engine/pinball_game/ball_init/ball_init_red_field.asm"
 
 Func_30164: ; 0x30164
 	ld a, [wd49b]