diff options
Diffstat (limited to 'engine')
94 files changed, 117 insertions, 116 deletions
diff --git a/engine/copyright_screen.asm b/engine/copyright_screen.asm index 35a5329..35a5329 100755..100644 --- a/engine/copyright_screen.asm +++ b/engine/copyright_screen.asm diff --git a/engine/erase_all_data_menu.asm b/engine/erase_all_data_menu.asm index 7504cf5..7504cf5 100755..100644 --- a/engine/erase_all_data_menu.asm +++ b/engine/erase_all_data_menu.asm diff --git a/engine/field_select_screen.asm b/engine/field_select_screen.asm index 0033488..0033488 100755..100644 --- a/engine/field_select_screen.asm +++ b/engine/field_select_screen.asm diff --git a/engine/high_scores_screen.asm b/engine/high_scores_screen.asm index 920fc9d..9823d67 100755..100644 --- a/engine/high_scores_screen.asm +++ b/engine/high_scores_screen.asm @@ -645,7 +645,7 @@ Func_cf58: ; 0xcf58 ret
Func_cf7d: ; 0xcf7d
- ld a, [wd809]
+ ld a, [wNewlyPressedButtonsPersistent]
ld b, a
ld a, [wda85]
bit 6, b
diff --git a/engine/options_screen.asm b/engine/options_screen.asm index e29c96f..e29c96f 100755..100644 --- a/engine/options_screen.asm +++ b/engine/options_screen.asm diff --git a/engine/pinball_game.asm b/engine/pinball_game.asm index 6eb40be..766f900 100755..100644 --- a/engine/pinball_game.asm +++ b/engine/pinball_game.asm @@ -15,7 +15,7 @@ GameScreenFunction_LoadGFX: ; 0xd861 call FillBottomMessageBufferWithBlackTile
ld a, $1
ld [wd85d], a
- ld [wd4aa], a
+ ld [wDrawBottomMessageBox], a
ld hl, wScreenState
inc [hl]
ret
@@ -56,7 +56,7 @@ GameScreenFunction_StartBall: ; 0xd87f and a
call nz, Func_e5d
ld a, $1
- ld [wd4aa], a
+ ld [wDrawBottomMessageBox], a
xor a
ld [wd7c1], a
call Func_b66
@@ -179,8 +179,8 @@ GameScreenFunction_HandleBallLoss: ; 0xda36 ld [wd7eb], a
xor a
ld [wd7e9], a
- ld [wd548], a
- ld [wDisableBallGravityAndTilt], a
+ ld [wPinballIsVisible], a
+ ld [wEnableBallGravityAndTilt], a
call HandleTilts
ld a, [wCurrentStage]
bit 0, a
@@ -203,7 +203,7 @@ GameScreenFunction_HandleBallLoss: ; 0xda36 jr z, .asm_daa9
ld a, $2
ld [wd49c], a
- ld [wd4aa], a
+ ld [wDrawBottomMessageBox], a
call FillBottomMessageBufferWithBlackTile
call Func_30db
ld hl, wd5dc
@@ -306,7 +306,7 @@ TransitionToHighScoresScreen: ; 0xdb5d ld hl, rIE
res 1, [hl]
xor a
- ld [wd4aa], a
+ ld [wDrawBottomMessageBox], a
ld a, [wCurrentStage]
ld c, a
ld b, $0
diff --git a/engine/pinball_game/ball_gfx.asm b/engine/pinball_game/ball_gfx.asm index 2aff0d3..2aff0d3 100755..100644 --- a/engine/pinball_game/ball_gfx.asm +++ b/engine/pinball_game/ball_gfx.asm diff --git a/engine/pinball_game/ball_init/ball_init.asm b/engine/pinball_game/ball_init/ball_init.asm index 29dbf64..e7a13c7 100755..100644 --- a/engine/pinball_game/ball_init/ball_init.asm +++ b/engine/pinball_game/ball_init/ball_init.asm @@ -23,8 +23,8 @@ InitBallForStage: ; 0x83ba ld [wBallSpin], a
ld [wBallRotation], a
inc a
- ld [wd548], a
- ld [wDisableBallGravityAndTilt], a
+ ld [wPinballIsVisible], a
+ ld [wEnableBallGravityAndTilt], a
ld a, $20
ld [wSCX], a
ld a, [wCurrentStage]
diff --git a/engine/pinball_game/ball_init/ball_init_blue_field.asm b/engine/pinball_game/ball_init/ball_init_blue_field.asm index 6d33e83..b265880 100755..100644 --- a/engine/pinball_game/ball_init/ball_init_blue_field.asm +++ b/engine/pinball_game/ball_init/ball_init_blue_field.asm @@ -11,7 +11,7 @@ InitBallBlueField: ; 0x1c08d ld a, $98
ld [wBallYPos + 1], a
xor a
- ld [wDisableBallGravityAndTilt], a
+ ld [wEnableBallGravityAndTilt], a
ld [wd580], a
call InitBlueFieldCollisionAttributes
ld a, [wd4c9]
diff --git a/engine/pinball_game/ball_init/ball_init_diglett_bonus.asm b/engine/pinball_game/ball_init/ball_init_diglett_bonus.asm index ef12950..ef12950 100755..100644 --- a/engine/pinball_game/ball_init/ball_init_diglett_bonus.asm +++ b/engine/pinball_game/ball_init/ball_init_diglett_bonus.asm diff --git a/engine/pinball_game/ball_init/ball_init_gengar_bonus.asm b/engine/pinball_game/ball_init/ball_init_gengar_bonus.asm index 065a1ca..065a1ca 100755..100644 --- a/engine/pinball_game/ball_init/ball_init_gengar_bonus.asm +++ b/engine/pinball_game/ball_init/ball_init_gengar_bonus.asm diff --git a/engine/pinball_game/ball_init/ball_init_meowth_bonus.asm b/engine/pinball_game/ball_init/ball_init_meowth_bonus.asm index e452ecb..e452ecb 100755..100644 --- a/engine/pinball_game/ball_init/ball_init_meowth_bonus.asm +++ b/engine/pinball_game/ball_init/ball_init_meowth_bonus.asm diff --git a/engine/pinball_game/ball_init/ball_init_mewtwo_bonus.asm b/engine/pinball_game/ball_init/ball_init_mewtwo_bonus.asm index c95d283..c95d283 100755..100644 --- a/engine/pinball_game/ball_init/ball_init_mewtwo_bonus.asm +++ b/engine/pinball_game/ball_init/ball_init_mewtwo_bonus.asm diff --git a/engine/pinball_game/ball_init/ball_init_red_field.asm b/engine/pinball_game/ball_init/ball_init_red_field.asm index 5411ac8..4ae79bf 100755..100644 --- a/engine/pinball_game/ball_init/ball_init_red_field.asm +++ b/engine/pinball_game/ball_init/ball_init_red_field.asm @@ -11,7 +11,7 @@ InitBallRedField: ; 0x3007d ld a, $98
ld [wBallYPos + 1], a
xor a
- ld [wDisableBallGravityAndTilt], a
+ ld [wEnableBallGravityAndTilt], a
ld [wd580], a
ld a, [wd7ad]
bit 7, a
diff --git a/engine/pinball_game/ball_init/ball_init_seel_bonus.asm b/engine/pinball_game/ball_init/ball_init_seel_bonus.asm index 84343d1..84343d1 100755..100644 --- a/engine/pinball_game/ball_init/ball_init_seel_bonus.asm +++ b/engine/pinball_game/ball_init/ball_init_seel_bonus.asm diff --git a/engine/pinball_game/ball_init/ball_init_unused_stage.asm b/engine/pinball_game/ball_init/ball_init_unused_stage.asm index 656ce44..656ce44 100755..100644 --- a/engine/pinball_game/ball_init/ball_init_unused_stage.asm +++ b/engine/pinball_game/ball_init/ball_init_unused_stage.asm diff --git a/engine/pinball_game/ball_loss/ball_loss.asm b/engine/pinball_game/ball_loss/ball_loss.asm index 06b0cda..06b0cda 100755..100644 --- a/engine/pinball_game/ball_loss/ball_loss.asm +++ b/engine/pinball_game/ball_loss/ball_loss.asm 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 e4d8692..e9a83fb 100755..100644 --- a/engine/pinball_game/ball_loss/ball_loss_blue_field.asm +++ b/engine/pinball_game/ball_loss/ball_loss_blue_field.asm @@ -81,7 +81,7 @@ Func_ded6: ; 0xded6 ld [wd604], a
ld a, $1e
ld [wd607], a
- callba Func_10ac8
+ callba ConcludeEvolutionMode
ret
.asm_df05
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 2771d00..2771d00 100755..100644 --- a/engine/pinball_game/ball_loss/ball_loss_diglett_bonus.asm +++ b/engine/pinball_game/ball_loss/ball_loss_diglett_bonus.asm 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 6fc76fe..c2cff1f 100755..100644 --- a/engine/pinball_game/ball_loss/ball_loss_gengar_bonus.asm +++ b/engine/pinball_game/ball_loss/ball_loss_gengar_bonus.asm @@ -14,8 +14,8 @@ HandleBallLossGengarBonus: ; 0xdf1a ld a, [wd6a7]
and a
ret nz
- ld [wd548], a
- ld [wDisableBallGravityAndTilt], a
+ ld [wPinballIsVisible], a
+ ld [wEnableBallGravityAndTilt], a
ld [wBallSpin], a
ld [wBallRotation], a
ld hl, wBallXVelocity
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 ae24dd3..ae24dd3 100755..100644 --- a/engine/pinball_game/ball_loss/ball_loss_meowth_bonus.asm +++ b/engine/pinball_game/ball_loss/ball_loss_meowth_bonus.asm 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 d4a5fe5..4cafb02 100755..100644 --- a/engine/pinball_game/ball_loss/ball_loss_mewtwo_bonus.asm +++ b/engine/pinball_game/ball_loss/ball_loss_mewtwo_bonus.asm @@ -14,8 +14,8 @@ HandleBallLossMewtwoBonus: ; 0xdf7e ld a, [wd6b2]
and a
ret nz
- ld [wd548], a
- ld [wDisableBallGravityAndTilt], a
+ ld [wPinballIsVisible], a
+ ld [wEnableBallGravityAndTilt], a
ld [wBallSpin], a
ld [wBallRotation], a
ld hl, wBallXVelocity
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 f76bf6e..e219fbc 100755..100644 --- a/engine/pinball_game/ball_loss/ball_loss_red_field.asm +++ b/engine/pinball_game/ball_loss/ball_loss_red_field.asm @@ -81,7 +81,7 @@ Func_ddfd: ; 0xddfd ld [wd604], a
ld a, $1e
ld [wd607], a
- callba Func_10ac8
+ callba ConcludeEvolutionMode
jr .asm_de40
.asm_de2d
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 a5204d4..a5204d4 100755..100644 --- a/engine/pinball_game/ball_loss/ball_loss_seel_bonus.asm +++ b/engine/pinball_game/ball_loss/ball_loss_seel_bonus.asm diff --git a/engine/pinball_game/ball_saver/ball_saver_20.asm b/engine/pinball_game/ball_saver/ball_saver_20.asm index db4c55b..db4c55b 100755..100644 --- a/engine/pinball_game/ball_saver/ball_saver_20.asm +++ b/engine/pinball_game/ball_saver/ball_saver_20.asm diff --git a/engine/pinball_game/ball_saver/ball_saver_30.asm b/engine/pinball_game/ball_saver/ball_saver_30.asm index be1dda9..be1dda9 100755..100644 --- a/engine/pinball_game/ball_saver/ball_saver_30.asm +++ b/engine/pinball_game/ball_saver/ball_saver_30.asm diff --git a/engine/pinball_game/ball_saver/ball_saver_60.asm b/engine/pinball_game/ball_saver/ball_saver_60.asm index 9b6b5ef..9b6b5ef 100755..100644 --- a/engine/pinball_game/ball_saver/ball_saver_60.asm +++ b/engine/pinball_game/ball_saver/ball_saver_60.asm diff --git a/engine/pinball_game/ball_saver/ball_saver_90.asm b/engine/pinball_game/ball_saver/ball_saver_90.asm index 7acda2c..7acda2c 100755..100644 --- a/engine/pinball_game/ball_saver/ball_saver_90.asm +++ b/engine/pinball_game/ball_saver/ball_saver_90.asm diff --git a/engine/pinball_game/ball_saver/ball_saver_catchem_mode.asm b/engine/pinball_game/ball_saver/ball_saver_catchem_mode.asm index ac6c163..2d1dbdd 100755..100644 --- a/engine/pinball_game/ball_saver/ball_saver_catchem_mode.asm +++ b/engine/pinball_game/ball_saver/ball_saver_catchem_mode.asm @@ -4,7 +4,7 @@ InitBallSaverForCatchEmMode: ; 0xdbd4 ld a, [wBallSaverTimerSeconds]
ld [wBallSaverTimerSecondsBackup], a
ld a, [wNumTimesBallSavedTextWillDisplay]
- ld [wd4a8], a
+ ld [wNumTimesBallSavedTextWillDisplayBackup], a
ld a, $0
ld [wBallSaverIconOn], a
ld a, $ff
@@ -22,13 +22,13 @@ RestoreBallSaverAfterCatchEmMode: ; 0xdc00 ld [wBallSaverTimerFrames], a
ld a, [wBallSaverTimerSecondsBackup]
ld [wBallSaverTimerSeconds], a
- ld a, [wd4a8]
+ ld a, [wNumTimesBallSavedTextWillDisplayBackup]
ld [wNumTimesBallSavedTextWillDisplay], a
ld a, [wBallSaverTimerSeconds]
and a
- jr z, .asm_dc1a
+ jr z, .SetSaverIconOff
ld a, $1
-.asm_dc1a
+.SetSaverIconOff
ld [wBallSaverIconOn], a
ld a, [wBallSaverTimerSeconds]
ld c, $0
diff --git a/engine/pinball_game/billboard.asm b/engine/pinball_game/billboard.asm index 33975b7..33975b7 100755..100644 --- a/engine/pinball_game/billboard.asm +++ b/engine/pinball_game/billboard.asm diff --git a/engine/pinball_game/billboard_tiledata.asm b/engine/pinball_game/billboard_tiledata.asm index 8af3568..8af3568 100755..100644 --- a/engine/pinball_game/billboard_tiledata.asm +++ b/engine/pinball_game/billboard_tiledata.asm diff --git a/engine/pinball_game/bonus_multiplier.asm b/engine/pinball_game/bonus_multiplier.asm index dfd4a20..dfd4a20 100755..100644 --- a/engine/pinball_game/bonus_multiplier.asm +++ b/engine/pinball_game/bonus_multiplier.asm diff --git a/engine/pinball_game/catchem_mode.asm b/engine/pinball_game/catchem_mode.asm index 632e145..7dbe8f9 100755..100644 --- a/engine/pinball_game/catchem_mode.asm +++ b/engine/pinball_game/catchem_mode.asm @@ -690,8 +690,8 @@ BallCaptureInit: ; 0x10496 ld [wBallYVelocity], a
ld [wBallYVelocity + 1], a
xor a
- ld [wd548], a
- ld [wDisableBallGravityAndTilt], a
+ ld [wPinballIsVisible], a
+ ld [wEnableBallGravityAndTilt], a
lb de, $00, $0b
call PlaySoundEffect
ret
@@ -788,8 +788,8 @@ CapturePokemon: ; 0x1052d ld [wBallYPos], a
ld [wCapturingMon], a
ld a, $1
- ld [wd548], a
- ld [wDisableBallGravityAndTilt], a
+ ld [wPinballIsVisible], a
+ ld [wEnableBallGravityAndTilt], a
callba RestoreBallSaverAfterCatchEmMode
call ConcludeCatchEmMode
ld de, $0001
@@ -1078,14 +1078,14 @@ SetPokemonOwnedFlag: ; 0x1077c call SaveData
ret
-Func_107a5: ; 0x107a5
+ResetIndicatorStates: ; 0x107a5
xor a
ld hl, wIndicatorStates
ld b, $13
-.asm_107ab
+.loop
ld [hli], a
dec b
- jr nz, .asm_107ab
+ jr nz, .loop
ret
Func_107b0: ; 0x107b0
@@ -1244,7 +1244,7 @@ Func_10871: ; 0x10871 ret
Func_108f5: ; 0x108f5
- call Func_107a5
+ call ResetIndicatorStates
call Func_107c2
call Func_107c8
call Func_107e9
@@ -1375,7 +1375,7 @@ Func_1098c: ; 0x1098c ret
Func_109fc: ; 0x109fc
- call Func_107a5
+ call ResetIndicatorStates
call Func_107c2
callba Func_1f2ff
ld a, [wCurrentStage]
diff --git a/engine/pinball_game/catchem_mode/catchem_mode_blue_field.asm b/engine/pinball_game/catchem_mode/catchem_mode_blue_field.asm index c4b90fa..c4b90fa 100755..100644 --- a/engine/pinball_game/catchem_mode/catchem_mode_blue_field.asm +++ b/engine/pinball_game/catchem_mode/catchem_mode_blue_field.asm diff --git a/engine/pinball_game/catchem_mode/catchem_mode_red_field.asm b/engine/pinball_game/catchem_mode/catchem_mode_red_field.asm index b34f93d..b34f93d 100755..100644 --- a/engine/pinball_game/catchem_mode/catchem_mode_red_field.asm +++ b/engine/pinball_game/catchem_mode/catchem_mode_red_field.asm diff --git a/engine/pinball_game/draw_sprites/draw_blue_field_sprites.asm b/engine/pinball_game/draw_sprites/draw_blue_field_sprites.asm index 5354a51..5354a51 100755..100644 --- a/engine/pinball_game/draw_sprites/draw_blue_field_sprites.asm +++ b/engine/pinball_game/draw_sprites/draw_blue_field_sprites.asm diff --git a/engine/pinball_game/draw_sprites/draw_diglett_bonus_sprites.asm b/engine/pinball_game/draw_sprites/draw_diglett_bonus_sprites.asm index a0dded5..a0dded5 100755..100644 --- a/engine/pinball_game/draw_sprites/draw_diglett_bonus_sprites.asm +++ b/engine/pinball_game/draw_sprites/draw_diglett_bonus_sprites.asm diff --git a/engine/pinball_game/draw_sprites/draw_gengar_bonus_sprites.asm b/engine/pinball_game/draw_sprites/draw_gengar_bonus_sprites.asm index 212279d..212279d 100755..100644 --- a/engine/pinball_game/draw_sprites/draw_gengar_bonus_sprites.asm +++ b/engine/pinball_game/draw_sprites/draw_gengar_bonus_sprites.asm diff --git a/engine/pinball_game/draw_sprites/draw_meowth_bonus_sprites.asm b/engine/pinball_game/draw_sprites/draw_meowth_bonus_sprites.asm index 5d54a08..5d54a08 100755..100644 --- a/engine/pinball_game/draw_sprites/draw_meowth_bonus_sprites.asm +++ b/engine/pinball_game/draw_sprites/draw_meowth_bonus_sprites.asm diff --git a/engine/pinball_game/draw_sprites/draw_mewtwo_bonus_sprites.asm b/engine/pinball_game/draw_sprites/draw_mewtwo_bonus_sprites.asm index a4397a0..a4397a0 100755..100644 --- a/engine/pinball_game/draw_sprites/draw_mewtwo_bonus_sprites.asm +++ b/engine/pinball_game/draw_sprites/draw_mewtwo_bonus_sprites.asm diff --git a/engine/pinball_game/draw_sprites/draw_red_field_sprites.asm b/engine/pinball_game/draw_sprites/draw_red_field_sprites.asm index 024527b..2e34743 100755..100644 --- a/engine/pinball_game/draw_sprites/draw_red_field_sprites.asm +++ b/engine/pinball_game/draw_sprites/draw_red_field_sprites.asm @@ -512,7 +512,7 @@ Func_17e5e: ; 0x17e5e jr .asm_17e64
DrawPinball: ; 0x17e81
- ld a, [wd548]
+ ld a, [wPinballIsVisible]
and a
ret z
ld hl, wBallSpin
diff --git a/engine/pinball_game/draw_sprites/draw_seel_bonus_sprites.asm b/engine/pinball_game/draw_sprites/draw_seel_bonus_sprites.asm index 261de5b..261de5b 100755..100644 --- a/engine/pinball_game/draw_sprites/draw_seel_bonus_sprites.asm +++ b/engine/pinball_game/draw_sprites/draw_seel_bonus_sprites.asm diff --git a/engine/pinball_game/draw_sprites/draw_sprites.asm b/engine/pinball_game/draw_sprites/draw_sprites.asm index e9dc693..e9dc693 100755..100644 --- a/engine/pinball_game/draw_sprites/draw_sprites.asm +++ b/engine/pinball_game/draw_sprites/draw_sprites.asm diff --git a/engine/pinball_game/draw_sprites/draw_unused_stage_sprites.asm b/engine/pinball_game/draw_sprites/draw_unused_stage_sprites.asm index 473a8c2..473a8c2 100755..100644 --- a/engine/pinball_game/draw_sprites/draw_unused_stage_sprites.asm +++ b/engine/pinball_game/draw_sprites/draw_unused_stage_sprites.asm diff --git a/engine/pinball_game/end_of_ball_bonus.asm b/engine/pinball_game/end_of_ball_bonus.asm index 6e8ba8a..8afdf54 100755..100644 --- a/engine/pinball_game/end_of_ball_bonus.asm +++ b/engine/pinball_game/end_of_ball_bonus.asm @@ -40,7 +40,7 @@ LoadEAcuteCharacterGfx: ; 0xf55c Func_f57f: ; 0xf57f
xor a
- ld [wd4aa], a
+ ld [wDrawBottomMessageBox], a
ld hl, wBottomMessageText
ld a, $81
ld b, $40
diff --git a/engine/pinball_game/evolution_mode/evolution_mode_blue_field.asm b/engine/pinball_game/evolution_mode/evolution_mode_blue_field.asm index a9b0b00..a1af8f5 100755..100644 --- a/engine/pinball_game/evolution_mode/evolution_mode_blue_field.asm +++ b/engine/pinball_game/evolution_mode/evolution_mode_blue_field.asm @@ -174,8 +174,8 @@ Func_20c76: ; 0x20c76 Func_20d30: ; 0x20d30
callba RestoreBallSaverAfterCatchEmMode
- callba Func_10ca5
- callba Func_10ac8
+ callba PlaceEvolutionInParty
+ callba ConcludeEvolutionMode
ld de, $0001
call PlaySong
ld hl, wNumPokemonEvolvedInBallBonus
@@ -186,9 +186,9 @@ Func_20d30: ; 0x20d30 ret z
add $2
cp $3
- jr c, .asm_20d72
+ jr c, .DontClampBalls
ld a, $3
-.asm_20d72
+.DontClampBalls
ld [wNumPokeballs], a
ld a, $80
ld [wPokeballBlinkingCounter], a
@@ -201,7 +201,7 @@ Func_20d7c: ; 0x20d7c ret nz
call FillBottomMessageBufferWithBlackTile
callba RestoreBallSaverAfterCatchEmMode
- callba Func_10ac8
+ callba ConcludeEvolutionMode
ld de, $0001
call PlaySong
scf
diff --git a/engine/pinball_game/evolution_mode/evolution_mode_red_field.asm b/engine/pinball_game/evolution_mode/evolution_mode_red_field.asm index ca7faaf..a1149c1 100755..100644 --- a/engine/pinball_game/evolution_mode/evolution_mode_red_field.asm +++ b/engine/pinball_game/evolution_mode/evolution_mode_red_field.asm @@ -177,8 +177,8 @@ Func_20651: ; 0x20651 Func_2070b: ; 0x2070b
callba RestoreBallSaverAfterCatchEmMode
- callba Func_10ca5
- callba Func_10ac8
+ callba PlaceEvolutionInParty
+ callba ConcludeEvolutionMode
ld de, $0001
call PlaySong
ld hl, wNumPokemonEvolvedInBallBonus
@@ -204,7 +204,7 @@ Func_20757: ; 0x20757 ret nz
call FillBottomMessageBufferWithBlackTile
callba RestoreBallSaverAfterCatchEmMode
- callba Func_10ac8
+ callba ConcludeEvolutionMode
ld de, $0001
call PlaySong
scf
diff --git a/engine/pinball_game/extra_ball.asm b/engine/pinball_game/extra_ball.asm index babec0a..babec0a 100755..100644 --- a/engine/pinball_game/extra_ball.asm +++ b/engine/pinball_game/extra_ball.asm diff --git a/engine/pinball_game/flippers.asm b/engine/pinball_game/flippers.asm index 466975e..466975e 100755..100644 --- a/engine/pinball_game/flippers.asm +++ b/engine/pinball_game/flippers.asm diff --git a/engine/pinball_game/load_stage_data/load_blue_field.asm b/engine/pinball_game/load_stage_data/load_blue_field.asm index be4ffe0..be4ffe0 100755..100644 --- a/engine/pinball_game/load_stage_data/load_blue_field.asm +++ b/engine/pinball_game/load_stage_data/load_blue_field.asm diff --git a/engine/pinball_game/load_stage_data/load_diglett_bonus.asm b/engine/pinball_game/load_stage_data/load_diglett_bonus.asm index 6be87a9..6be87a9 100755..100644 --- a/engine/pinball_game/load_stage_data/load_diglett_bonus.asm +++ b/engine/pinball_game/load_stage_data/load_diglett_bonus.asm diff --git a/engine/pinball_game/load_stage_data/load_gengar_bonus.asm b/engine/pinball_game/load_stage_data/load_gengar_bonus.asm index 767d37d..767d37d 100755..100644 --- a/engine/pinball_game/load_stage_data/load_gengar_bonus.asm +++ b/engine/pinball_game/load_stage_data/load_gengar_bonus.asm diff --git a/engine/pinball_game/load_stage_data/load_meowth_bonus.asm b/engine/pinball_game/load_stage_data/load_meowth_bonus.asm index 01a49ba..01a49ba 100755..100644 --- a/engine/pinball_game/load_stage_data/load_meowth_bonus.asm +++ b/engine/pinball_game/load_stage_data/load_meowth_bonus.asm diff --git a/engine/pinball_game/load_stage_data/load_mewtwo_bonus.asm b/engine/pinball_game/load_stage_data/load_mewtwo_bonus.asm index 47bbfc4..47bbfc4 100755..100644 --- a/engine/pinball_game/load_stage_data/load_mewtwo_bonus.asm +++ b/engine/pinball_game/load_stage_data/load_mewtwo_bonus.asm diff --git a/engine/pinball_game/load_stage_data/load_red_field.asm b/engine/pinball_game/load_stage_data/load_red_field.asm index 2cf7296..2cf7296 100755..100644 --- a/engine/pinball_game/load_stage_data/load_red_field.asm +++ b/engine/pinball_game/load_stage_data/load_red_field.asm diff --git a/engine/pinball_game/load_stage_data/load_seel_bonus.asm b/engine/pinball_game/load_stage_data/load_seel_bonus.asm index e72b9a7..e72b9a7 100755..100644 --- a/engine/pinball_game/load_stage_data/load_seel_bonus.asm +++ b/engine/pinball_game/load_stage_data/load_seel_bonus.asm 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 957c009..957c009 100755..100644 --- a/engine/pinball_game/load_stage_data/load_stage_data.asm +++ b/engine/pinball_game/load_stage_data/load_stage_data.asm diff --git a/engine/pinball_game/load_stage_data/load_unused_stage.asm b/engine/pinball_game/load_stage_data/load_unused_stage.asm index 89d1128..89d1128 100755..100644 --- a/engine/pinball_game/load_stage_data/load_unused_stage.asm +++ b/engine/pinball_game/load_stage_data/load_unused_stage.asm diff --git a/engine/pinball_game/menu.asm b/engine/pinball_game/menu.asm index d97d039..a31ff1f 100755..100644 --- a/engine/pinball_game/menu.asm +++ b/engine/pinball_game/menu.asm @@ -6,7 +6,7 @@ HandleInGameMenu: ; 0x86d7 ld [wd917], a
call FillBottomMessageBufferWithBlackTile
xor a
- ld [wd4aa], a
+ ld [wDrawBottomMessageBox], a
ld hl, wBottomMessageText
ld a, $81
ld b, $30
@@ -83,7 +83,7 @@ HandleInGameMenu: ; 0x86d7 pop af
ld [wd917], a
ld a, $1
- ld [wd4aa], a
+ ld [wDrawBottomMessageBox], a
ld a, [wInGameMenuIndex]
and a
ret
diff --git a/engine/pinball_game/object_collision/.gitignore b/engine/pinball_game/object_collision/.gitignore new file mode 100644 index 0000000..2d96ba3 --- /dev/null +++ b/engine/pinball_game/object_collision/.gitignore @@ -0,0 +1 @@ +*.kate-swp diff --git a/engine/pinball_game/object_collision/blue_stage_object_collision.asm b/engine/pinball_game/object_collision/blue_stage_object_collision.asm index 8252802..8252802 100755..100644 --- a/engine/pinball_game/object_collision/blue_stage_object_collision.asm +++ b/engine/pinball_game/object_collision/blue_stage_object_collision.asm diff --git a/engine/pinball_game/object_collision/blue_stage_resolve_collision.asm b/engine/pinball_game/object_collision/blue_stage_resolve_collision.asm index 01fbbb6..1cabbd8 100755..100644 --- a/engine/pinball_game/object_collision/blue_stage_resolve_collision.asm +++ b/engine/pinball_game/object_collision/blue_stage_resolve_collision.asm @@ -76,7 +76,7 @@ ResolveBlueStagePinballLaunchCollision: ; 0x1c7d7 ld a, $fa
ld [wBallYVelocity + 1], a
ld a, $1
- ld [wDisableBallGravityAndTilt], a
+ ld [wEnableBallGravityAndTilt], a
lb de, $00, $0a
call PlaySoundEffect
.dontLaunch
@@ -1640,7 +1640,7 @@ ResolveBlueStagePikachuCollision: ; 0x1d0a1 ld [wBallYVelocity + 1], a
ld [wBallSpin], a
ld [wBallRotation], a
- ld [wDisableBallGravityAndTilt], a
+ ld [wEnableBallGravityAndTilt], a
call FillBottomMessageBufferWithBlackTile
jr .asm_1d110
@@ -1712,7 +1712,7 @@ Func_1d133: ; 0x1d133 ld a, $fc
ld [wBallYVelocity + 1], a
ld a, $1
- ld [wDisableBallGravityAndTilt], a
+ ld [wEnableBallGravityAndTilt], a
ld bc, FiveThousandPoints
callba AddBigBCD6FromQueueWithBallMultiplier
xor a
@@ -1805,7 +1805,7 @@ ResolveSlowpokeCollision: ; 0x1d216 ld [wBallXPos], a
ld [wBallYPos], a
xor a
- ld [wDisableBallGravityAndTilt], a
+ ld [wEnableBallGravityAndTilt], a
.asm_1d253
ld hl, SlowpokeCollisionAnimationData ; 0x1d312
ld de, wSlowpokeAnimation
@@ -1827,11 +1827,11 @@ ResolveSlowpokeCollision: ; 0x1d216 cp $1
jr nz, .asm_1d2b6
xor a
- ld [wd548], a
+ ld [wPinballIsVisible], a
ld a, [wLeftAlleyCount]
cp $3
jr nz, .asm_1d299
- callba Func_10ab3
+ callba StartEvolutionMode
ld a, [wd643]
and a
ret z
@@ -1853,7 +1853,7 @@ ResolveSlowpokeCollision: ; 0x1d216 cp $4
jr nz, .asm_1d2c3
ld a, $1
- ld [wd548], a
+ ld [wPinballIsVisible], a
ret
.asm_1d2c3
@@ -1861,7 +1861,7 @@ ResolveSlowpokeCollision: ; 0x1d216 cp $5
ret nz
ld a, $1
- ld [wDisableBallGravityAndTilt], a
+ ld [wEnableBallGravityAndTilt], a
ld a, $b0
ld [wBallXVelocity], a
ld a, $0
@@ -1927,7 +1927,7 @@ ResolveCloysterCollision: ; 0x1d32d ld [wBallXPos], a
ld [wBallYPos], a
xor a
- ld [wDisableBallGravityAndTilt], a
+ ld [wEnableBallGravityAndTilt], a
.asm_1d36a
ld hl, CloysterCollisionAnimationData
ld de, wCloysterAnimation
@@ -1949,7 +1949,7 @@ ResolveCloysterCollision: ; 0x1d32d cp $1
jr nz, .asm_1d3cb
xor a
- ld [wd548], a
+ ld [wPinballIsVisible], a
ld a, [wRightAlleyCount]
cp $2
jr c, .noCatchEmMode
@@ -1975,7 +1975,7 @@ ResolveCloysterCollision: ; 0x1d32d cp $4
jr nz, .asm_1d3d8
ld a, $1
- ld [wd548], a
+ ld [wPinballIsVisible], a
ret
.asm_1d3d8
@@ -1983,7 +1983,7 @@ ResolveCloysterCollision: ; 0x1d32d cp $5
ret nz
ld a, $1
- ld [wDisableBallGravityAndTilt], a
+ ld [wEnableBallGravityAndTilt], a
ld a, $4f
ld [wBallXVelocity], a
ld a, $ff
@@ -5753,7 +5753,7 @@ Func_1e757: ; 0x1e757 ld [hli], a
ld [hli], a
ld [hli], a
- ld [wDisableBallGravityAndTilt], a
+ ld [wEnableBallGravityAndTilt], a
ld [wBallXPos], a
ld [wBallYPos], a
ld a, $50
@@ -5788,7 +5788,7 @@ Func_1e757: ; 0x1e757 cp $c
jr nz, .asm_1e7d0
xor a
- ld [wd548], a
+ ld [wPinballIsVisible], a
ld [wBallSpin], a
ld [wBallRotation], a
ret
@@ -5843,8 +5843,8 @@ Func_1e830: ; 0x1e830 callba Func_10000
jr nc, .asm_1e84b
ld a, $1
- ld [wd548], a
- ld [wDisableBallGravityAndTilt], a
+ ld [wPinballIsVisible], a
+ ld [wEnableBallGravityAndTilt], a
ret
.asm_1e84b
@@ -5891,12 +5891,12 @@ Func_1e830: ; 0x1e830 cp $d
jr nc, .asm_1e858
ld a, $1
- ld [wd548], a
- ld [wDisableBallGravityAndTilt], a
+ ld [wPinballIsVisible], a
+ ld [wEnableBallGravityAndTilt], a
ld a, [wCatchEmOrEvolutionSlotRewardActive]
cp EVOLUTION_MODE_SLOT_REWARD
ret nz
- callba Func_10ab3
+ callba StartEvolutionMode
xor a
ld [wCatchEmOrEvolutionSlotRewardActive], a
ret
diff --git a/engine/pinball_game/object_collision/diglett_bonus_object_collision.asm b/engine/pinball_game/object_collision/diglett_bonus_object_collision.asm index 91e0f82..91e0f82 100755..100644 --- a/engine/pinball_game/object_collision/diglett_bonus_object_collision.asm +++ b/engine/pinball_game/object_collision/diglett_bonus_object_collision.asm 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 303cbe7..303cbe7 100755..100644 --- a/engine/pinball_game/object_collision/diglett_bonus_resolve_collision.asm +++ b/engine/pinball_game/object_collision/diglett_bonus_resolve_collision.asm diff --git a/engine/pinball_game/object_collision/gengar_bonus_object_collision.asm b/engine/pinball_game/object_collision/gengar_bonus_object_collision.asm index adf048b..adf048b 100755..100644 --- a/engine/pinball_game/object_collision/gengar_bonus_object_collision.asm +++ b/engine/pinball_game/object_collision/gengar_bonus_object_collision.asm 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 3a4d7cc..c73bacf 100755..100644 --- a/engine/pinball_game/object_collision/gengar_bonus_resolve_collision.asm +++ b/engine/pinball_game/object_collision/gengar_bonus_resolve_collision.asm @@ -877,8 +877,8 @@ Func_1894c: ; 0x1894c jr z, .asm_18980
inc a
ld [wd6a5], a
- ld a, [wd548]
- ld hl, wDisableBallGravityAndTilt
+ ld a, [wPinballIsVisible]
+ ld hl, wEnableBallGravityAndTilt
and [hl]
jr z, .asm_18973
ld a, [wBallYPos + 1]
diff --git a/engine/pinball_game/object_collision/meowth_bonus_object_collision.asm b/engine/pinball_game/object_collision/meowth_bonus_object_collision.asm index 4fc6179..4fc6179 100755..100644 --- a/engine/pinball_game/object_collision/meowth_bonus_object_collision.asm +++ b/engine/pinball_game/object_collision/meowth_bonus_object_collision.asm 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 9aa3d36..9aa3d36 100755..100644 --- a/engine/pinball_game/object_collision/meowth_bonus_resolve_collision.asm +++ b/engine/pinball_game/object_collision/meowth_bonus_resolve_collision.asm diff --git a/engine/pinball_game/object_collision/mewtwo_bonus_object_collision.asm b/engine/pinball_game/object_collision/mewtwo_bonus_object_collision.asm index e6bbae5..e6bbae5 100755..100644 --- a/engine/pinball_game/object_collision/mewtwo_bonus_object_collision.asm +++ b/engine/pinball_game/object_collision/mewtwo_bonus_object_collision.asm 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 1717126..1717126 100755..100644 --- a/engine/pinball_game/object_collision/mewtwo_bonus_resolve_collision.asm +++ b/engine/pinball_game/object_collision/mewtwo_bonus_resolve_collision.asm diff --git a/engine/pinball_game/object_collision/object_collision.asm b/engine/pinball_game/object_collision/object_collision.asm index 9324829..9324829 100755..100644 --- a/engine/pinball_game/object_collision/object_collision.asm +++ b/engine/pinball_game/object_collision/object_collision.asm diff --git a/engine/pinball_game/object_collision/red_stage_object_collision.asm b/engine/pinball_game/object_collision/red_stage_object_collision.asm index 2d07286..2d07286 100755..100644 --- a/engine/pinball_game/object_collision/red_stage_object_collision.asm +++ b/engine/pinball_game/object_collision/red_stage_object_collision.asm diff --git a/engine/pinball_game/object_collision/red_stage_resolve_collision.asm b/engine/pinball_game/object_collision/red_stage_resolve_collision.asm index b60060b..ac5ead8 100755..100644 --- a/engine/pinball_game/object_collision/red_stage_resolve_collision.asm +++ b/engine/pinball_game/object_collision/red_stage_resolve_collision.asm @@ -54,10 +54,10 @@ Func_146a2: ; 0x146a2 Func_146a9: ; 0x146a9
ld a, [wBallSaverTimerFrames]
ld hl, wBallSaverTimerSeconds
- or [hl]
+ or [hl] ;if both the number of frames and number of seconds left is 0, skip
ret z
ld a, [wBallXPos + 1]
- cp $9a
+ cp 154 ;if high? Byte of ball X pos is >= 154, jump ahead
jr nc, .asm_146e8
ld a, [wBallSaverTimerFrames]
dec a
@@ -2429,7 +2429,7 @@ TileDataPointers_15325: TileData_1532d: ; 0x1532d
db $01 ; total number of tiles
-
+
db $01 ; number of tiles
dw vBGMap + $121
db $27
@@ -2438,7 +2438,7 @@ TileData_1532d: ; 0x1532d TileData_15333: ; 0x15333
db $01 ; total number of tiles
-
+
db $01 ; number of tiles
dw vBGMap + $123
db $29
@@ -2447,7 +2447,7 @@ TileData_15333: ; 0x15333 TileData_15339: ; 0x15339
db $01 ; total number of tiles
-
+
db $01 ; number of tiles
dw vBGMap + $130
db $7E
@@ -2456,7 +2456,7 @@ TileData_15339: ; 0x15339 TileData_1533f: ; 0x1533f
db $01 ; total number of tiles
-
+
db $01 ; number of tiles
dw vBGMap + $132
db $7F
@@ -2465,7 +2465,7 @@ TileData_1533f: ; 0x1533f TileData_15345: ; 0x15345
db $01 ; total number of tiles
-
+
db $01 ; number of tiles
dw vBGMap + $121
db $26
@@ -2474,7 +2474,7 @@ TileData_15345: ; 0x15345 TileData_1534b: ; 0x1534b
db $01 ; total number of tiles
-
+
db $01 ; number of tiles
dw vBGMap + $123
db $28
@@ -2483,7 +2483,7 @@ TileData_1534b: ; 0x1534b TileData_15351: ; 0x15351
db $01 ; total number of tiles
-
+
db $01 ; number of tiles
dw vBGMap + $130
db $7C
@@ -2492,7 +2492,7 @@ TileData_15351: ; 0x15351 TileData_15357: ; 0x15357
db $01 ; total number of tiles
-
+
db $01 ; number of tiles
dw vBGMap + $132
db $7D
@@ -4392,7 +4392,7 @@ TileData_15e21: ; 0x15e21 TileData_15e50: ; 0x15e50
dw LoadTileLists
db $09 ; total number of tiles
-
+
db $03 ; number of tiles
dw vBGMap + $100
db $45, $46, $22
@@ -4414,7 +4414,7 @@ TileData_15e50: ; 0x15e50 TileData_15e69: ; 0x15e69
dw LoadTileLists
db $09 ; total number of tiles
-
+
db $03 ; number of tiles
dw vBGMap + $100
db $43, $44, $22
@@ -4477,7 +4477,7 @@ ResolveBellsproutCollision: ; 0x15e93 ld a, $78
ld [wBallYPos + 1], a
xor a
- ld [wDisableBallGravityAndTilt], a
+ ld [wEnableBallGravityAndTilt], a
.asm_15eda
ld hl, BellsproutAnimationData
ld de, wBellsproutAnimation
@@ -4499,7 +4499,7 @@ ResolveBellsproutCollision: ; 0x15e93 cp $1
jr nz, .asm_15f35
xor a
- ld [wd548], a
+ ld [wPinballIsVisible], a
ld a, [wRightAlleyCount]
cp $2
jr c, .noCatchEmMode
@@ -4523,7 +4523,7 @@ ResolveBellsproutCollision: ; 0x15e93 cp $4
jr nz, .asm_15f42
ld a, $1
- ld [wd548], a
+ ld [wPinballIsVisible], a
ret
.asm_15f42
@@ -4531,7 +4531,7 @@ ResolveBellsproutCollision: ; 0x15e93 cp $5
ret nz
ld a, $1
- ld [wDisableBallGravityAndTilt], a
+ ld [wEnableBallGravityAndTilt], a
xor a
ld [wBallXVelocity + 1], a
ld a, $2
@@ -4875,7 +4875,7 @@ ResolveDittoSlotCollision: ; 0x160f0 ld [hli], a
ld [hli], a
ld [hli], a
- ld [wDisableBallGravityAndTilt], a
+ ld [wEnableBallGravityAndTilt], a
ld [wBallXPos], a
ld [wBallYPos], a
ld a, $11
@@ -4909,7 +4909,7 @@ ResolveDittoSlotCollision: ; 0x160f0 cp $9
jr nz, .asm_1616d
xor a
- ld [wd548], a
+ ld [wPinballIsVisible], a
ld [wBallSpin], a
ld [wBallRotation], a
ret
@@ -4917,10 +4917,10 @@ ResolveDittoSlotCollision: ; 0x160f0 .asm_1616d
cp $6
jr nz, .asm_1618e
- callba Func_10ab3
+ callba StartEvolutionMode
ld a, $1
- ld [wd548], a
- ld [wDisableBallGravityAndTilt], a
+ ld [wPinballIsVisible], a
+ ld [wEnableBallGravityAndTilt], a
ld a, $5
ld [wd803], a
ld a, $8
@@ -5092,7 +5092,7 @@ Func_16279: ; 0x16279 ld [hli], a
ld [hli], a
ld [hli], a
- ld [wDisableBallGravityAndTilt], a
+ ld [wEnableBallGravityAndTilt], a
ld [wBallXPos], a
ld [wBallYPos], a
ld a, $50
@@ -5127,7 +5127,7 @@ Func_16279: ; 0x16279 cp $c
jr nz, .asm_162f2
xor a
- ld [wd548], a
+ ld [wPinballIsVisible], a
ld [wBallSpin], a
ld [wBallRotation], a
ret
@@ -5182,8 +5182,8 @@ Func_16352: ; 0x16352 callba Func_10000
jr nc, .asm_1636d
ld a, $1
- ld [wd548], a
- ld [wDisableBallGravityAndTilt], a
+ ld [wPinballIsVisible], a
+ ld [wEnableBallGravityAndTilt], a
ret
.asm_1636d
@@ -5230,12 +5230,12 @@ Func_16352: ; 0x16352 cp $d
jr nc, .asm_1637a
ld a, $1
- ld [wd548], a
- ld [wDisableBallGravityAndTilt], a
+ ld [wPinballIsVisible], a
+ ld [wEnableBallGravityAndTilt], a
ld a, [wCatchEmOrEvolutionSlotRewardActive]
cp EVOLUTION_MODE_SLOT_REWARD
ret nz
- callba Func_10ab3
+ callba StartEvolutionMode
ld a, [wd7ad]
ld c, a
ld a, [wStageCollisionState]
@@ -5504,7 +5504,7 @@ ResolveRedStagePinballLaunchCollision: ; 0x1652d ld a, $fa
ld [wBallYVelocity + 1], a
ld a, $1
- ld [wDisableBallGravityAndTilt], a
+ ld [wEnableBallGravityAndTilt], a
lb de, $00, $0a
call PlaySoundEffect
.notLaunchedYet
@@ -5627,7 +5627,7 @@ ResolveRedStagePikachuCollision: ; 0x1660c ld [wBallYVelocity + 1], a
ld [wBallSpin], a
ld [wBallRotation], a
- ld [wDisableBallGravityAndTilt], a
+ ld [wEnableBallGravityAndTilt], a
call FillBottomMessageBufferWithBlackTile
jr .asm_1667b
@@ -5699,7 +5699,7 @@ Func_1669e: ; 0x1669e ld a, $fc
ld [wBallYVelocity + 1], a
ld a, $1
- ld [wDisableBallGravityAndTilt], a
+ ld [wEnableBallGravityAndTilt], a
ld bc, FiveThousandPoints
callba AddBigBCD6FromQueueWithBallMultiplier
xor a
@@ -6726,7 +6726,7 @@ TileData_16c46: ; 0x16c46 TileData_16c49: ; 0x16c49
dw LoadTileLists
db $07
-
+
db $01
dw vBGMap + $23
db $5E
@@ -6752,7 +6752,7 @@ TileData_16c49: ; 0x16c49 TileData_16c63: ; 0x16c63
dw LoadTileLists
db $07
-
+
db $01
dw vBGMap + $23
db $65
@@ -6778,7 +6778,7 @@ TileData_16c63: ; 0x16c63 TileData_16c7d: ; 0x16c7d
dw LoadTileLists
db $07
-
+
db $01
dw vBGMap + $23
db $65
@@ -6804,7 +6804,7 @@ TileData_16c7d: ; 0x16c7d TileData_16c97: ; 0x16c97
dw LoadTileLists
db $07
-
+
db $01
dw vBGMap + $23
db $65
@@ -6830,7 +6830,7 @@ TileData_16c97: ; 0x16c97 TileData_16cb1: ; 0x16cb1
dw LoadTileLists
db $07
-
+
db $01
dw vBGMap + $23
db $5E
@@ -6856,7 +6856,7 @@ TileData_16cb1: ; 0x16cb1 TileData_16ccb: ; 0x16ccb
dw LoadTileLists
db $07
-
+
db $01
dw vBGMap + $30
db $6C
@@ -6882,7 +6882,7 @@ TileData_16ccb: ; 0x16ccb TileData_16ce5: ; 0x16ce5
dw LoadTileLists
db $07
-
+
db $01
dw vBGMap + $30
db $73
@@ -6908,7 +6908,7 @@ TileData_16ce5: ; 0x16ce5 TileData_16cff: ; 0x16cff
dw LoadTileLists
db $07
-
+
db $01
dw vBGMap + $30
db $73
@@ -6934,7 +6934,7 @@ TileData_16cff: ; 0x16cff TileData_16d19: ; 0x16d19
dw LoadTileLists
db $07
-
+
db $01
dw vBGMap + $30
db $73
@@ -6960,7 +6960,7 @@ TileData_16d19: ; 0x16d19 TileData_16d33: ; 0x16d33
dw LoadTileLists
db $07
-
+
db $01
dw vBGMap + $30
db $6C
@@ -6986,7 +6986,7 @@ TileData_16d33: ; 0x16d33 TileData_16d4d: ; 0x16d4d
dw LoadTileLists
db $03
-
+
db $01
dw vBGMap + $6
db $48
@@ -7000,7 +7000,7 @@ TileData_16d4d: ; 0x16d4d TileData_16d5a: ; 0x16d5a
dw LoadTileLists
db $03
-
+
db $01
dw vBGMap + $6
db $4B
@@ -7014,7 +7014,7 @@ TileData_16d5a: ; 0x16d5a TileData_16d67: ; 0x16d67
dw LoadTileLists
db $03
-
+
db $01
dw vBGMap + $D
db $4E
@@ -7028,7 +7028,7 @@ TileData_16d67: ; 0x16d67 TileData_16d74: ; 0x16d74
dw LoadTileLists
db $03
-
+
db $01
dw vBGMap + $D
db $51
@@ -7042,7 +7042,7 @@ TileData_16d74: ; 0x16d74 TileData_16d81: ; 0x16d81
dw LoadTileLists
db $04
-
+
db $02
dw vBGMap + $49
db $40, $41
@@ -7056,7 +7056,7 @@ TileData_16d81: ; 0x16d81 TileData_16d8f: ; 0x16d8f
dw LoadTileLists
db $04
-
+
db $02
dw vBGMap + $49
db $44, $45
diff --git a/engine/pinball_game/object_collision/seel_bonus_object_collision.asm b/engine/pinball_game/object_collision/seel_bonus_object_collision.asm index e702dd2..e702dd2 100755..100644 --- a/engine/pinball_game/object_collision/seel_bonus_object_collision.asm +++ b/engine/pinball_game/object_collision/seel_bonus_object_collision.asm 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 81861a4..81861a4 100755..100644 --- a/engine/pinball_game/object_collision/seel_bonus_resolve_collision.asm +++ b/engine/pinball_game/object_collision/seel_bonus_resolve_collision.asm diff --git a/engine/pinball_game/save_game.asm b/engine/pinball_game/save_game.asm index 644abb3..1d2f539 100755..100644 --- a/engine/pinball_game/save_game.asm +++ b/engine/pinball_game/save_game.asm @@ -13,7 +13,7 @@ SaveGame: ; 0xda05 ld hl, rIE
res 1, [hl]
xor a
- ld [wd4aa], a
+ ld [wDrawBottomMessageBox], a
ld a, SCREEN_TITLESCREEN
ld [wCurrentScreen], a
xor a
diff --git a/engine/pinball_game/score.asm b/engine/pinball_game/score.asm index 4134833..4134833 100755..100644 --- a/engine/pinball_game/score.asm +++ b/engine/pinball_game/score.asm diff --git a/engine/pinball_game/slot.asm b/engine/pinball_game/slot.asm index 2086c28..2086c28 100755..100644 --- a/engine/pinball_game/slot.asm +++ b/engine/pinball_game/slot.asm diff --git a/engine/pinball_game/stage_collision_attributes.asm b/engine/pinball_game/stage_collision_attributes.asm index 80ff582..80ff582 100755..100644 --- a/engine/pinball_game/stage_collision_attributes.asm +++ b/engine/pinball_game/stage_collision_attributes.asm diff --git a/engine/pinball_game/stage_init/init_blue_field.asm b/engine/pinball_game/stage_init/init_blue_field.asm index 4b166b6..4b166b6 100755..100644 --- a/engine/pinball_game/stage_init/init_blue_field.asm +++ b/engine/pinball_game/stage_init/init_blue_field.asm diff --git a/engine/pinball_game/stage_init/init_diglett_bonus.asm b/engine/pinball_game/stage_init/init_diglett_bonus.asm index a04b201..a04b201 100755..100644 --- a/engine/pinball_game/stage_init/init_diglett_bonus.asm +++ b/engine/pinball_game/stage_init/init_diglett_bonus.asm diff --git a/engine/pinball_game/stage_init/init_gengar_bonus.asm b/engine/pinball_game/stage_init/init_gengar_bonus.asm index 357de1c..357de1c 100755..100644 --- a/engine/pinball_game/stage_init/init_gengar_bonus.asm +++ b/engine/pinball_game/stage_init/init_gengar_bonus.asm diff --git a/engine/pinball_game/stage_init/init_meowth_bonus.asm b/engine/pinball_game/stage_init/init_meowth_bonus.asm index 178c90c..178c90c 100755..100644 --- a/engine/pinball_game/stage_init/init_meowth_bonus.asm +++ b/engine/pinball_game/stage_init/init_meowth_bonus.asm diff --git a/engine/pinball_game/stage_init/init_mewtwo_bonus.asm b/engine/pinball_game/stage_init/init_mewtwo_bonus.asm index 26410e3..26410e3 100755..100644 --- a/engine/pinball_game/stage_init/init_mewtwo_bonus.asm +++ b/engine/pinball_game/stage_init/init_mewtwo_bonus.asm diff --git a/engine/pinball_game/stage_init/init_red_field.asm b/engine/pinball_game/stage_init/init_red_field.asm index b691d69..b691d69 100755..100644 --- a/engine/pinball_game/stage_init/init_red_field.asm +++ b/engine/pinball_game/stage_init/init_red_field.asm diff --git a/engine/pinball_game/stage_init/init_seel_bonus.asm b/engine/pinball_game/stage_init/init_seel_bonus.asm index ee51417..ee51417 100755..100644 --- a/engine/pinball_game/stage_init/init_seel_bonus.asm +++ b/engine/pinball_game/stage_init/init_seel_bonus.asm diff --git a/engine/pinball_game/stage_init/init_stages.asm b/engine/pinball_game/stage_init/init_stages.asm index 1d4ba78..1d4ba78 100755..100644 --- a/engine/pinball_game/stage_init/init_stages.asm +++ b/engine/pinball_game/stage_init/init_stages.asm diff --git a/engine/pinball_game/stage_init/init_unused_stage.asm b/engine/pinball_game/stage_init/init_unused_stage.asm index ee02abc..ee02abc 100755..100644 --- a/engine/pinball_game/stage_init/init_unused_stage.asm +++ b/engine/pinball_game/stage_init/init_unused_stage.asm diff --git a/engine/pinball_game/timer.asm b/engine/pinball_game/timer.asm index 49afcee..49afcee 100755..100644 --- a/engine/pinball_game/timer.asm +++ b/engine/pinball_game/timer.asm diff --git a/engine/pinball_game/vertical_screen_transition.asm b/engine/pinball_game/vertical_screen_transition.asm index 81203d5..94290f2 100755..100644 --- a/engine/pinball_game/vertical_screen_transition.asm +++ b/engine/pinball_game/vertical_screen_transition.asm @@ -1,14 +1,14 @@ FieldVerticalTransition: ; 0xe674
push af
- ld a, [wd548]
+ ld a, [wPinballIsVisible]
push af
xor a
- ld [wd548], a
+ ld [wPinballIsVisible], a
ld [wd803], a
callba DrawSpritesForStage
call CleanOAMBuffer
pop af
- ld [wd548], a
+ ld [wPinballIsVisible], a
pop af
ld [wCurrentStage], a
xor a
diff --git a/engine/pokedex.asm b/engine/pokedex.asm index 7f7eddd..8251d03 100755..100644 --- a/engine/pokedex.asm +++ b/engine/pokedex.asm @@ -831,11 +831,11 @@ Func_28513: ; 0x28513 Func_285ca: ; 0x285ca
xor a
- ld [wd80a], a
+ ld [wPressedButtonsPersistent], a
call Func_28972
call Func_28a8a
call Func_28ad1
- ld a, [wd80a]
+ ld a, [wPressedButtonsPersistent]
ret
Func_285db: ; 0x285db
diff --git a/engine/pokedex/variable_width_font_character.asm b/engine/pokedex/variable_width_font_character.asm index 9dba2d8..9dba2d8 100755..100644 --- a/engine/pokedex/variable_width_font_character.asm +++ b/engine/pokedex/variable_width_font_character.asm diff --git a/engine/select_gameboy_target_menu.asm b/engine/select_gameboy_target_menu.asm index 3f18b60..3f18b60 100755..100644 --- a/engine/select_gameboy_target_menu.asm +++ b/engine/select_gameboy_target_menu.asm diff --git a/engine/titlescreen.asm b/engine/titlescreen.asm index 057e937..057e937 100755..100644 --- a/engine/titlescreen.asm +++ b/engine/titlescreen.asm |