diff options
Diffstat (limited to 'engine')
42 files changed, 176 insertions, 174 deletions
diff --git a/engine/copyright_screen.asm b/engine/copyright_screen.asm index c749043..f3d6a44 100644 --- a/engine/copyright_screen.asm +++ b/engine/copyright_screen.asm @@ -20,7 +20,7 @@ FadeInCopyrightScreen: ; 0x8228 ld hl, CopyrightTextGfxPointers
call LoadVideoData
call ClearOAMBuffer
- call Func_b66
+ call SetAllPalettesWhite
call EnableLCD
call SGBNormal
ld bc, $0050
diff --git a/engine/erase_all_data_menu.asm b/engine/erase_all_data_menu.asm index 6ef174f..e81a768 100644 --- a/engine/erase_all_data_menu.asm +++ b/engine/erase_all_data_menu.asm @@ -28,7 +28,7 @@ CheckForResetButtonCombo: ; 0x8167 ld hl, EraseAllDataGfxPointers
call LoadVideoData
call ClearOAMBuffer
- call Func_b66
+ call SetAllPalettesWhite
call EnableLCD
call SGBNormal
call FadeIn
diff --git a/engine/field_select_screen.asm b/engine/field_select_screen.asm index 26dfc47..f785989 100644 --- a/engine/field_select_screen.asm +++ b/engine/field_select_screen.asm @@ -23,7 +23,7 @@ LoadFieldSelectScreen: ; 0xd6dd call ClearOAMBuffer
ld a, $8
ld [wFieldSelectBlinkingBorderFrame], a
- call Func_b66
+ call SetAllPalettesWhite
ld a, $12
call SetSongBank
ld de, $0003
diff --git a/engine/high_scores_screen.asm b/engine/high_scores_screen.asm index 09b16d6..1aa3bb2 100644 --- a/engine/high_scores_screen.asm +++ b/engine/high_scores_screen.asm @@ -145,7 +145,7 @@ Func_cb14: ; 0xcb14 ld hl, hLCDC
set 3, [hl]
.asm_cb7f
- call Func_b66
+ call SetAllPalettesWhite
ld a, [wda7f]
and a
jr z, .asm_cbbd
diff --git a/engine/options_screen.asm b/engine/options_screen.asm index 64f0f43..a5e4958 100644 --- a/engine/options_screen.asm +++ b/engine/options_screen.asm @@ -31,7 +31,7 @@ Func_c35a: ; 0xc35a ld [wd91f], a
call Func_c43a
call Func_c948
- call Func_b66
+ call SetAllPalettesWhite
ld a, $12
call SetSongBank
ld de, $0002
diff --git a/engine/pinball_game.asm b/engine/pinball_game.asm index 3adce56..81fdde7 100644 --- a/engine/pinball_game.asm +++ b/engine/pinball_game.asm @@ -14,7 +14,7 @@ GameScreenFunction_LoadGFX: ; 0xd861 callba InitializeCurrentStage
call FillBottomMessageBufferWithBlackTile
ld a, $1
- ld [wd85d], a
+ ld [wAudioEngineEnabled], a
ld [wDrawBottomMessageBox], a
ld hl, wScreenState
inc [hl]
@@ -49,17 +49,17 @@ GameScreenFunction_StartBall: ; 0xd87f callba InitBallForStage
callba LoadStageCollisionAttributes
callba LoadStageData
- callba Func_ed5e
+ callba ScrollScreenToShowPinball
call ClearOAMBuffer
callba DrawSpritesForStage
- ld a, [wd849]
+ ld a, [wUpdateAudioEngineUsingTimerInterrupt]
and a
- call nz, Func_e5d
+ call nz, ToggleAudioEngineUpdateMethod
ld a, $1
ld [wDrawBottomMessageBox], a
xor a
ld [wd7c1], a
- call Func_b66
+ call SetAllPalettesWhite
call EnableLCD
call FadeIn
ld hl, wScreenState
@@ -145,25 +145,25 @@ GameScreenFunction_HandleBallPhysics: ; 0xd909 call MoveBallPosition
callba CheckStageTransition
callba DrawSpritesForStage
- call Func_33e3
- ld a, [wd5cb]
+ call UpdateBottomText
+ ld a, [wDisableDrawScoreboardInfo]
and a
- jr nz, .asm_d9e9
+ jr nz, .skipDrawingScoreboard
callba Func_85c7
callba HideScoreIfBallLow
callba Func_8645
call Func_dba9
call DrawNumPartyMonsIcon
call DrawPikachuSaverLightningBoltIcon
-.asm_d9e9
+.skipDrawingScoreboard
ld a, [wTimerActive]
and a
callba nz, Func_86a4
- ld a, [wd4ae]
+ ld a, [wMoveToNextScreenState]
and a
ret z
xor a
- ld [wd4ae], a
+ ld [wMoveToNextScreenState], a
ld hl, wScreenState
inc [hl]
ret
@@ -186,9 +186,9 @@ GameScreenFunction_HandleBallLoss: ; 0xda36 bit 0, a
callba nz, HandleFlippers
callba DrawSpritesForStage
- call Func_33e3
+ call UpdateBottomText
callba Func_85c7
- ld a, [wd5ca]
+ ld a, [wBottomTextEnabled]
and a
ret nz
ld a, [wd4c9]
@@ -231,9 +231,9 @@ GameScreenFunction_EndBall: ; 0xdab2 and a
jr nz, .asm_db28
call FadeOut
- ld a, [wd849]
+ ld a, [wUpdateAudioEngineUsingTimerInterrupt]
and a
- call z, Func_e5d
+ call z, ToggleAudioEngineUpdateMethod
call DisableLCD
ld hl, hSTAT
res 6, [hl]
@@ -249,9 +249,9 @@ GameScreenFunction_EndBall: ; 0xdab2 ld bc, $0004
call AdvanceFrames
call FadeOut
- ld a, [wd849]
+ ld a, [wUpdateAudioEngineUsingTimerInterrupt]
and a
- call nz, Func_e5d
+ call nz, ToggleAudioEngineUpdateMethod
call DisableLCD
ld hl, hSTAT
res 6, [hl]
@@ -276,9 +276,9 @@ GameScreenFunction_EndBall: ; 0xdab2 ld bc, $0004
call AdvanceFrames
call FadeOut
- ld a, [wd849]
+ ld a, [wUpdateAudioEngineUsingTimerInterrupt]
and a
- call nz, Func_e5d
+ call nz, ToggleAudioEngineUpdateMethod
call DisableLCD
ld hl, hSTAT
res 6, [hl]
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..48f8077 100644 --- a/engine/pinball_game/ball_init/ball_init_meowth_bonus.asm +++ b/engine/pinball_game/ball_init/ball_init_meowth_bonus.asm @@ -26,7 +26,7 @@ InitBallMeowthBonusStage: ; 0x24059 dec b
jr nz, .asm_24081
ld a, $1
- ld [wd7ac], a
+ ld [wDisableHorizontalScrollForBallStart], a
ld a, $40
ld [wMeowthXPosition], a
ld a, $20
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 2dd8117..6827c19 100644 --- a/engine/pinball_game/ball_loss/ball_loss_diglett_bonus.asm +++ b/engine/pinball_game/ball_loss/ball_loss_diglett_bonus.asm @@ -12,7 +12,7 @@ HandleBallLossDiglettBonus: ; 0xe056 ld a, $2
ld [wd4c8], a
xor a
- ld [wd7ac], a
+ ld [wDisableHorizontalScrollForBallStart], a
ld a, [wCompletedBonusStage]
and a
ret nz
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 59a40da..4c37222 100644 --- a/engine/pinball_game/ball_loss/ball_loss_gengar_bonus.asm +++ b/engine/pinball_game/ball_loss/ball_loss_gengar_bonus.asm @@ -10,7 +10,7 @@ HandleBallLossGengarBonus: ; 0xdf1a cp $5
jr c, .asm_df50
xor a
- ld [wd4ae], a
+ ld [wMoveToNextScreenState], a
ld a, [wd6a7]
and a
ret nz
@@ -38,7 +38,7 @@ HandleBallLossGengarBonus: ; 0xdf1a ld a, $2
ld [wd4c8], a
xor a
- ld [wd7ac], a
+ ld [wDisableHorizontalScrollForBallStart], a
ld a, [wCompletedBonusStage]
and a
ret nz
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 f80e758..cf84910 100644 --- a/engine/pinball_game/ball_loss/ball_loss_meowth_bonus.asm +++ b/engine/pinball_game/ball_loss/ball_loss_meowth_bonus.asm @@ -44,7 +44,7 @@ HandleBallLossMeowthBonus: ; 0xdfe2 ld a, $2
ld [wd4c8], a
xor a
- ld [wd7ac], a
+ ld [wDisableHorizontalScrollForBallStart], a
ld [wd712], a
ld a, [wCompletedBonusStage]
and a
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 2cd165e..07a51f0 100644 --- a/engine/pinball_game/ball_loss/ball_loss_mewtwo_bonus.asm +++ b/engine/pinball_game/ball_loss/ball_loss_mewtwo_bonus.asm @@ -10,7 +10,7 @@ HandleBallLossMewtwoBonus: ; 0xdf7e cp $8
jr c, .asm_dfb4
xor a
- ld [wd4ae], a
+ ld [wMoveToNextScreenState], a
ld a, [wd6b2]
and a
ret nz
@@ -38,7 +38,7 @@ HandleBallLossMewtwoBonus: ; 0xdf7e ld a, $2
ld [wd4c8], a
xor a
- ld [wd7ac], a
+ ld [wDisableHorizontalScrollForBallStart], a
ld a, [wCompletedBonusStage]
and a
ret nz
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 0c86084..59d4bd7 100644 --- a/engine/pinball_game/ball_loss/ball_loss_seel_bonus.asm +++ b/engine/pinball_game/ball_loss/ball_loss_seel_bonus.asm @@ -43,7 +43,7 @@ HandleBallLossSeelBonus: ; 0xe08b ld a, $2
ld [wd4c8], a
xor a
- ld [wd7ac], a
+ ld [wDisableHorizontalScrollForBallStart], a
ld [wd794], a
ld a, [wCompletedBonusStage]
and a
diff --git a/engine/pinball_game/billboard_tiledata.asm b/engine/pinball_game/billboard_tiledata.asm index 8af3568..5cc0960 100644 --- a/engine/pinball_game/billboard_tiledata.asm +++ b/engine/pinball_game/billboard_tiledata.asm @@ -14,7 +14,7 @@ LoadBillboardTileData: ; 0x30256 ld h, [hl]
ld l, a
ld a, Bank(BillboardTileDataPointers)
- call Func_10aa
+ call QueueGraphicsToLoad
pop bc
ld a, [hGameBoyColorFlag]
and a
@@ -25,7 +25,7 @@ LoadBillboardTileData: ; 0x30256 ld h, [hl]
ld l, a
ld a, Bank(BillboardPaletteDataPointers)
- call Func_10aa
+ call QueueGraphicsToLoad
ret
BillboardTileDataPointers: ; 0x3027a
diff --git a/engine/pinball_game/catchem_mode.asm b/engine/pinball_game/catchem_mode.asm index 559bf31..f556c2d 100644 --- a/engine/pinball_game/catchem_mode.asm +++ b/engine/pinball_game/catchem_mode.asm @@ -291,7 +291,7 @@ Func_101d9: ; 0x101d9 push de
xor a
ld de, Func_11d2
- call Func_10c5
+ call QueueGraphicsToLoadWithFunc
pop de
pop hl
pop bc
@@ -342,7 +342,7 @@ Func_10230: ; 0x10230 push de
xor a
ld de, LoadTileListsBank1
- call Func_10c5
+ call QueueGraphicsToLoadWithFunc
pop de
pop hl
pop bc
@@ -420,7 +420,7 @@ Func_102bc: ; 0x102bc xor a
ld bc, wc1b8
ld de, LoadPalettes
- call Func_10c5
+ call QueueGraphicsToLoadWithFunc
ret
Func_10301: ; 0x10301
@@ -487,7 +487,7 @@ Func_10301: ; 0x10301 xor a
ld bc, wc1b8
ld de, LoadPalettes
- call Func_10c5
+ call QueueGraphicsToLoadWithFunc
ret
Func_10362: ; 0x10362
@@ -560,7 +560,7 @@ Func_1038e: ; 0x1038e push de
xor a
ld de, Func_11d2
- call Func_10c5
+ call QueueGraphicsToLoadWithFunc
pop de
pop bc
ret
@@ -585,7 +585,7 @@ Func_10414: ; 0x10414 ld a, BANK(Data_10420)
ld bc, Data_10420
ld de, Func_11b5
- call Func_10c5
+ call QueueGraphicsToLoadWithFunc
ret
Data_10420:
@@ -608,7 +608,7 @@ Func_10432: ; 0x10432 ld a, BANK(Data_1043e)
ld bc, Data_1043e
ld de, LoadTileLists
- call Func_10c5
+ call QueueGraphicsToLoadWithFunc
ret
Data_1043e:
@@ -852,7 +852,7 @@ Func_10611: ; 0x10611 ld b, a
ld a, BANK(Data_1062a)
ld de, Func_11d2
- call Func_10c5
+ call QueueGraphicsToLoadWithFunc
ret
Data_1062a:
@@ -1266,12 +1266,12 @@ Func_108f5: ; 0x108f5 call LoadVRAMData
ld hl, BlankSaverSpaceTileDataRedField
ld a, BANK(BlankSaverSpaceTileDataRedField)
- call Func_10aa
+ call QueueGraphicsToLoad
ld a, [wPreviousNumPokeballs]
callba LoadPokeballsGraphics_RedField
ld hl, CaughtPokeballTileDataPointers
ld a, BANK(CaughtPokeballTileDataPointers)
- call Func_10aa
+ call QueueGraphicsToLoad
ret
BlankSaverSpaceTileDataRedField:
@@ -1396,12 +1396,12 @@ Func_109fc: ; 0x109fc call LoadVRAMData
ld hl, BlankSaverSpaceTileDataBlueField
ld a, BANK(BlankSaverSpaceTileDataBlueField)
- call Func_10aa
+ call QueueGraphicsToLoad
ld a, [wPreviousNumPokeballs]
callba LoadPokeballsGraphics_RedField
ld hl, Data_10a88
ld a, BANK(Data_10a88)
- call Func_10aa
+ call QueueGraphicsToLoad
ret
BlankSaverSpaceTileDataBlueField:
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 8bdd4c3..897bafe 100644 --- a/engine/pinball_game/catchem_mode/catchem_mode_blue_field.asm +++ b/engine/pinball_game/catchem_mode/catchem_mode_blue_field.asm @@ -200,7 +200,7 @@ CapturePokemonBlueStage: ; 0x20483 ret
Func_2048f: ; 0x2048f
- ld a, [wd5ca]
+ ld a, [wBottomTextEnabled]
and a
ret nz
call FillBottomMessageBufferWithBlackTile
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 e6cd614..ee2c5ef 100644 --- a/engine/pinball_game/catchem_mode/catchem_mode_red_field.asm +++ b/engine/pinball_game/catchem_mode/catchem_mode_red_field.asm @@ -198,7 +198,7 @@ CapturePokemonRedStage: ; 0x201c2 ret
Func_201ce: ; 0x201ce
- ld a, [wd5ca]
+ ld a, [wBottomTextEnabled]
and a
ret nz
call FillBottomMessageBufferWithBlackTile
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 ee25c7c..cc57f8d 100644 --- a/engine/pinball_game/draw_sprites/draw_red_field_sprites.asm +++ b/engine/pinball_game/draw_sprites/draw_red_field_sprites.asm @@ -149,7 +149,7 @@ Func_17665: ; 0x17665 ld h, [hl]
ld l, a
ld a, Bank(TimerDigitsTileData)
- call Func_10aa
+ call QueueGraphicsToLoad
ret
INCLUDE "data/timer_digits_tiledata.asm"
diff --git a/engine/pinball_game/evolution_mode.asm b/engine/pinball_game/evolution_mode.asm index 541c5a4..a6c594b 100755 --- a/engine/pinball_game/evolution_mode.asm +++ b/engine/pinball_game/evolution_mode.asm @@ -25,7 +25,7 @@ StartEvolutionMode_CallTable: ; 0x10abc ConcludeEvolutionMode: ; 0x10ac8
xor a
- ld [wd5ca], a
+ ld [wBottomTextEnabled], a
call FillBottomMessageBufferWithBlackTile
xor a
ld [wInSpecialMode], a
@@ -719,12 +719,12 @@ ConcludeEvolutionMode_RedField: ; 0x10fe3 .asm_11036
ld hl, BlankSaverSpaceTileDataRedField
ld a, BANK(BlankSaverSpaceTileDataRedField)
- call Func_10aa
+ call QueueGraphicsToLoad
ld a, [wPreviousNumPokeballs]
callba LoadPokeballsGraphics_RedField
ld hl, CaughtPokeballTileDataPointers
ld a, BANK(CaughtPokeballTileDataPointers)
- call Func_10aa
+ call QueueGraphicsToLoad
ret
StartEvolutionMode_UnusedField: ; 0x11054
@@ -856,12 +856,12 @@ ConcludeEvolutionMode_BlueField: ; 0x11195 .asm_111f0
ld hl, BlankSaverSpaceTileDataBlueField
ld a, BANK(BlankSaverSpaceTileDataBlueField)
- call Func_10aa
+ call QueueGraphicsToLoad
ld a, [wPreviousNumPokeballs]
callba LoadPokeballsGraphics_RedField
ld hl, Data_10a88
ld a, BANK(Data_10a88)
- call Func_10aa
+ call QueueGraphicsToLoad
ret
LoadBlueFieldTopGraphics: ; 0x1120e
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 c1e31c1..bb5042f 100644 --- a/engine/pinball_game/evolution_mode/evolution_mode_blue_field.asm +++ b/engine/pinball_game/evolution_mode/evolution_mode_blue_field.asm @@ -196,7 +196,7 @@ Func_20d30: ; 0x20d30 ret
Func_20d7c: ; 0x20d7c
- ld a, [wd5ca]
+ ld a, [wBottomTextEnabled]
and a
ret nz
call FillBottomMessageBufferWithBlackTile
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 ba3e372..e21d09f 100644 --- a/engine/pinball_game/evolution_mode/evolution_mode_red_field.asm +++ b/engine/pinball_game/evolution_mode/evolution_mode_red_field.asm @@ -199,7 +199,7 @@ Func_2070b: ; 0x2070b ret
Func_20757: ; 0x20757
- ld a, [wd5ca]
+ ld a, [wBottomTextEnabled]
and a
ret nz
call FillBottomMessageBufferWithBlackTile
diff --git a/engine/pinball_game/extra_ball.asm b/engine/pinball_game/extra_ball.asm index f753f5f..e0c99ae 100644 --- a/engine/pinball_game/extra_ball.asm +++ b/engine/pinball_game/extra_ball.asm @@ -1,6 +1,6 @@ ShowExtraBallMessage: ; 0x30188
; Displays the extra ball scrolling message, if an extra ball has been granted.
- ld a, [wd5ca]
+ ld a, [wBottomTextEnabled]
and a
ret nz
ld a, [wShowExtraBallText]
diff --git a/engine/pinball_game/map_move.asm b/engine/pinball_game/map_move.asm index 5382259..ebd26e1 100755 --- a/engine/pinball_game/map_move.asm +++ b/engine/pinball_game/map_move.asm @@ -40,7 +40,7 @@ CallTable_3021f: ; 0x3021f Func_3022b: ; 0x3022b
xor a
- ld [wd5ca], a ;turn text off
+ ld [wBottomTextEnabled], a ;turn text off
call FillBottomMessageBufferWithBlackTile ;clear text
xor a
ld [wInSpecialMode], a
@@ -471,7 +471,7 @@ Func_314f3: ; 0x314f3 ret
Func_31505: ; 0x31505
- ld a, [wd5ca]
+ ld a, [wBottomTextEnabled]
and a
ret nz
call FillBottomMessageBufferWithBlackTile
@@ -564,9 +564,9 @@ Func_315d5: ; 0x315d5 ld bc, ArrivedAtMapText
callba LoadScrollingMapNameText
.asm_31603
- callba Func_33e3
+ callba UpdateBottomText
rst AdvanceFrame
- ld a, [wd5ca]
+ ld a, [wBottomTextEnabled]
and a
jr nz, .asm_31603
ld a, $2
@@ -596,7 +596,7 @@ Func_3161b: ; 0x3161b ret
.asm_31643
- call Func_3168c
+ call UpdateMapMove_BlueField
ld a, [wd54d]
call CallInFollowingTable
PointerTable_3164c: ; 0x3164c
@@ -621,7 +621,7 @@ Func_31660: ; 0x31660 ret
Func_31672: ; 0x31672
- ld a, [wd5ca] ;if text is off
+ ld a, [wBottomTextEnabled] ;if text is off
and a
ret nz
call FillBottomMessageBufferWithBlackTile
@@ -631,14 +631,14 @@ Func_31672: ; 0x31672 scf
ret
-Func_3168c: ; 0x3168c
+UpdateMapMove_BlueField: ; 0x3168c
ld a, $50
- ld [wLeftMapMoveDiglettAnimationCounter], a
- ld [wRightMapMoveDiglettFrame], a
+ ld [wLeftMapMovePoliwagAnimationCounter], a
+ ld [wRightMapMovePsyduckFrame], a
ld a, $3
- ld [wd645], a
+ ld [wPsyduckState], a
ld a, $1
- ld [wd646], a
+ ld [wPoliwagState], a
callba PlayLowTimeSfx
ld a, [wd57e]
and a
@@ -718,9 +718,9 @@ Func_3174c: ; 0x3174c ld bc, ArrivedAtMapText
callba LoadScrollingMapNameText
.asm_3177a
- callba Func_33e3
+ callba UpdateBottomText
rst AdvanceFrame
- ld a, [wd5ca]
+ ld a, [wBottomTextEnabled]
and a
jr nz, .asm_3177a
ld a, $2
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 8cc2636..fd5992c 100644 --- a/engine/pinball_game/object_collision/blue_stage_resolve_collision.asm +++ b/engine/pinball_game/object_collision/blue_stage_resolve_collision.asm @@ -521,7 +521,7 @@ UpdateSpinnerChargeGraphics_BlueField: ; 0x1cb43 ld h, [hl]
ld l, a
ld a, Bank(TileDataPointers_1cb60)
- call Func_10aa
+ call QueueGraphicsToLoad
ret
INCLUDE "data/queued_tiledata/blue_field/spinner.asm"
@@ -577,7 +577,7 @@ LoadBumperGraphics_BlueField: ; 0x1ce7a ld h, [hl]
ld l, a
ld a, Bank(TileDataPointers_1ceca)
- call Func_10aa
+ call QueueGraphicsToLoad
ret
ApplyBumperCollision_BlueField: ; 0x1ce94
@@ -810,13 +810,13 @@ UpdatePikachuSaverAnimation_BlueField: ; 0x1d133 cp $1
jr nz, .asm_1d18c
xor a
- ld [wd85d], a
+ ld [wAudioEngineEnabled], a
call Func_310a
rst AdvanceFrame
ld a, $1
callba PlayPikachuSoundClip
ld a, $1
- ld [wd85d], a
+ ld [wAudioEngineEnabled], a
ld a, $ff
ld [wRumblePattern], a
ld a, $60
@@ -1334,7 +1334,7 @@ UpdateBonusMultiplierRailing_BlueField: ; 0x1d51b ret
ShowBonusMultiplierMessage_BlueField: ; 0x1d5bf
- ld a, [wd5ca]
+ ld a, [wBottomTextEnabled]
and a
ret nz
ld a, [wd613]
@@ -1395,7 +1395,7 @@ LoadBonusMultiplierRailingGraphics_BlueField_Gameboy: ; 0x1d602 ld h, [hl]
ld l, a
ld a, Bank(BonusMultiplierRailingTileDataPointers_1d6be)
- call Func_10aa
+ call QueueGraphicsToLoad
.asm_1d626
pop af
ld bc, $0000
@@ -1414,7 +1414,7 @@ LoadBonusMultiplierRailingGraphics_BlueField_Gameboy: ; 0x1d602 ld h, [hl]
ld l, a
ld a, Bank(BonusMultiplierRailingTileDataPointers_1d946)
- call Func_10aa
+ call QueueGraphicsToLoad
ret
LoadBonusMultiplierRailingGraphics_BlueField_GameboyColor: ; 0x1d645
@@ -1432,7 +1432,7 @@ LoadBonusMultiplierRailingGraphics_BlueField_GameboyColor: ; 0x1d645 ld h, [hl]
ld l, a
ld a, Bank(BonusMultiplierRailingTileDataPointers_1d97a)
- call Func_10aa
+ call QueueGraphicsToLoad
ret
GetBCDForNextBonusMultiplier_BlueField: ; 0x1d65f
@@ -1541,7 +1541,7 @@ ResolvePsyduckPoliwagCollision: ; 0x1dbd2 ld a, $7
callba Func_10000
ld a, $2
- ld [wd646], a
+ ld [wPoliwagState], a
ld a, $78
ld [wLeftMapMovePoliwagAnimationCounter], a
ld a, $14
@@ -1582,7 +1582,7 @@ ResolvePsyduckPoliwagCollision: ; 0x1dbd2 ccf
call z, HitPsyduck3Times
ld a, $2
- ld [wd645], a
+ ld [wPsyduckState], a
ld a, $28
ld [wRightMapMovePsyduckAnimationCounter], a
ld a, $78
@@ -1597,7 +1597,7 @@ UpdatePsyduckAndPoliwag: ; 0x1dc8e ret
UpdatePoliwag: ; 0x1dc95
- ld a, [wd646]
+ ld a, [wPoliwagState]
cp $0
ret z
ld a, [wLeftMapMovePoliwagAnimationCounter]
@@ -1618,7 +1618,7 @@ UpdatePoliwag: ; 0x1dc95 ret
.asm_1dcb9
- ld a, [wd646]
+ ld a, [wPoliwagState]
cp $2
ret nz
call Func_1130
@@ -1646,11 +1646,11 @@ UpdatePoliwag: ; 0x1dc95 ccf
call z, HitPoliwag3Times
ld a, $1
- ld [wd646], a
+ ld [wPoliwagState], a
ret
.asm_1dceb
- ld a, [wd646]
+ ld a, [wPoliwagState]
cp $1
ret nz
ld a, [wLeftMapMovePoliwagAnimationCounter]
@@ -1667,7 +1667,7 @@ UpdatePoliwag: ; 0x1dc95 ld [wStageCollisionMap + $103], a
.asm_1dd0c
ld a, $0
- ld [wd646], a
+ ld [wPoliwagState], a
ld a, [wLeftMapMoveCounter]
sub $3
ret nz
@@ -1678,14 +1678,14 @@ UpdatePoliwag: ; 0x1dc95 ld a, $0
call LoadPsyduckOrPoliwagGraphics
ld a, $0
- ld [wd646], a
+ ld [wPoliwagState], a
ret
; XXX
ret
UpdatePsyduck: ; 0x1dd2e
- ld a, [wd645]
+ ld a, [wPsyduckState]
cp $0
ret z
cp $1
@@ -1703,7 +1703,7 @@ UpdatePsyduck: ; 0x1dd2e ld a, $2
call LoadPsyduckOrPoliwagGraphics
ld a, $1
- ld [wd645], a
+ ld [wPsyduckState], a
ret
.asm_1dd53
@@ -1714,7 +1714,7 @@ UpdatePsyduck: ; 0x1dd2e add $3
call LoadPsyduckOrPoliwagGraphics
ld a, $3
- ld [wd645], a
+ ld [wPsyduckState], a
ret
.asm_1dd69
@@ -1754,7 +1754,7 @@ UpdatePsyduck: ; 0x1dd2e ld a, $25
ld [wStageCollisionMap + $110], a
ld a, $0
- ld [wd645], a
+ ld [wPsyduckState], a
.asm_1dda9
ld a, [wRightMapMoveCounter]
sub $3
@@ -1767,7 +1767,7 @@ UpdatePsyduck: ; 0x1dd2e ld a, $2
call LoadPsyduckOrPoliwagGraphics
ld a, $0
- ld [wd645], a
+ ld [wPsyduckState], a
ret
HitPoliwag3Times: ; 0x1ddc7
@@ -1840,7 +1840,7 @@ LoadPsyduckOrPoliwagGraphics: ; 0x1de4b or h
ret z
ld a, Bank(TileDataPointers_1df66)
- call Func_10aa
+ call QueueGraphicsToLoad
ret
LoadPsyduckOrPoliwagNumberGraphics: ; 0x1de6f
@@ -1866,7 +1866,7 @@ LoadPsyduckOrPoliwagNumberGraphics: ; 0x1de6f or h
ret z
ld a, Bank(TileDataPointers_1e0a4)
- call Func_10aa
+ call QueueGraphicsToLoad
ret
UpdateMapMoveCounters_BlueFieldBottom: ; 0x1de93
@@ -2175,9 +2175,9 @@ LoadPinballUpgradeTriggerGraphics_BlueField: ; 0x1e484 ld c, [hl]
inc hl
ld b, [hl]
- ld a, $7
+ ld a, Bank(TileDataPointers_1e520)
ld de, LoadTileLists
- call Func_10c5
+ call QueueGraphicsToLoadWithFunc
pop bc
ret
@@ -2402,9 +2402,9 @@ LoadCAVELightGraphics_BlueField: ; 0x1e636 ld c, [hl]
inc hl
ld b, [hl]
- ld a, $7
+ ld a, Bank(TileDataPointers_1e6d7)
ld de, LoadTileLists
- call Func_10c5
+ call QueueGraphicsToLoadWithFunc
pop bc
ret
@@ -2621,7 +2621,7 @@ DoSlotLogic_BlueField: ; 0x1e830 ld [wBonusStageSlotRewardActive], a
ld a, $1
ld [wd495], a
- ld [wd4ae], a
+ ld [wMoveToNextScreenState], a
ld a, [wd498]
ld c, a
ld b, $0
@@ -2708,7 +2708,7 @@ LoadSlotCaveCoverGraphics_BlueField: ; 0x1e8f6 or h
ret z
ld a, Bank(TileDataPointers_1e91e)
- call Func_10aa
+ call QueueGraphicsToLoad
ret
INCLUDE "data/queued_tiledata/blue_field/slot_cave.asm"
@@ -2986,7 +2986,7 @@ LoadArrowIndicatorGraphics_BlueStage: ; 0x1eb41 ld h, [hl]
ld l, a
ld a, Bank(TileDataPointers_1eb61)
- call Func_10aa
+ call QueueGraphicsToLoad
ret
INCLUDE "data/queued_tiledata/blue_field/arrow_indicators.asm"
@@ -3454,7 +3454,7 @@ UpdateForceFieldGraphics: ; 0x1f18a or h
ret z
ld a, Bank(TileDataPointers_1f1b5)
- call Func_10aa
+ call QueueGraphicsToLoad
ld a, $0
ld [wBlueStageForceFieldGfxNeedsLoading], a
.done
@@ -3479,9 +3479,9 @@ LoadPokeballsGraphics_BlueField: ; 0x1f265 ld c, a
ld a, [hli]
ld b, a
- ld a, $7
+ ld a, Bank(TileDataPointers_1f2b9)
ld de, LoadTileLists
- call Func_10c5
+ call QueueGraphicsToLoadWithFunc
ret
UpdateBlinkingPokeballs_BlueField: ; 0x1f27b
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 4bfbba4..738010d 100644 --- a/engine/pinball_game/object_collision/diglett_bonus_resolve_collision.asm +++ b/engine/pinball_game/object_collision/diglett_bonus_resolve_collision.asm @@ -41,7 +41,7 @@ Func_19bbd: ; 0x19bbd ld h, [hl]
ld l, a
ld a, Bank(Data_19bda)
- call Func_10aa
+ call QueueGraphicsToLoad
ret
Data_19bda:
@@ -355,7 +355,7 @@ Func_19da8: ; 0x19da8 ld h, [hl]
ld l, a
ld a, Bank(DiglettTileDataPointers)
- call Func_10aa
+ call QueueGraphicsToLoad
pop bc
ret
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 c1c9f78..a343bf4 100644 --- a/engine/pinball_game/object_collision/gengar_bonus_resolve_collision.asm +++ b/engine/pinball_game/object_collision/gengar_bonus_resolve_collision.asm @@ -52,7 +52,7 @@ Func_183db: ; 0x183db ld h, [hl]
ld l, a
ld a, BANK(TileDataPointers_183f8)
- call Func_10aa
+ call QueueGraphicsToLoad
ret
TileDataPointers_183f8:
@@ -885,9 +885,9 @@ Func_1894c: ; 0x1894c inc a
ld [wBallYPos + 1], a
.asm_18973
- ld a, [wd7a0]
+ ld a, [wUpperTiltPixelsOffset]
dec a
- ld [wd7a0], a
+ ld [wUpperTiltPixelsOffset], a
ld a, $1
ld [wUpperTiltPushing], a
ret
@@ -907,9 +907,9 @@ Func_1894c: ; 0x1894c jr z, .asm_189a5
dec a
ld [wd6a5], a
- ld a, [wd7a0]
+ ld a, [wUpperTiltPixelsOffset]
inc a
- ld [wd7a0], a
+ ld [wUpperTiltPixelsOffset], a
ret
.asm_189a5
@@ -1462,7 +1462,7 @@ Func_18d72: ; 0x18d72 or h
ret z
ld a, Bank(TileDataPointers_18ddb)
- call Func_10aa
+ call QueueGraphicsToLoad
ret
Func_18d91: ; 0x18d91
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 730eeaf..8f0766d 100644 --- a/engine/pinball_game/object_collision/meowth_bonus_resolve_collision.asm +++ b/engine/pinball_game/object_collision/meowth_bonus_resolve_collision.asm @@ -274,7 +274,7 @@ Func_24516: ; 0x24516 ld h, [hl]
ld l, a
ld a, Bank(TileDataPointers_24533)
- call Func_10aa
+ call QueueGraphicsToLoad
ret
TileDataPointers_24533: ; 0x24533
@@ -1894,7 +1894,7 @@ Func_24fa3: ; 0x24fa3 ld h, [hl]
ld l, a
ld a, Bank(TileDataPointers_25007)
- call Func_10aa
+ call QueueGraphicsToLoad
ret
TileDataPointers_25007:
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 2b6229e..0a2192b 100644 --- a/engine/pinball_game/object_collision/mewtwo_bonus_resolve_collision.asm +++ b/engine/pinball_game/object_collision/mewtwo_bonus_resolve_collision.asm @@ -49,7 +49,7 @@ Func_194ac: ; 0x194ac ld h, [hl]
ld l, a
ld a, Bank(Data_194c9)
- call Func_10aa
+ call QueueGraphicsToLoad
ret
Data_194c9:
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 3e534b4..6679037 100644 --- a/engine/pinball_game/object_collision/red_stage_resolve_collision.asm +++ b/engine/pinball_game/object_collision/red_stage_resolve_collision.asm @@ -160,7 +160,7 @@ LoadAgainTextGraphics: ; 0x14746 ld h, [hl]
ld l, a
ld a, BANK(AgainTextTileData)
- call Func_10aa
+ call QueueGraphicsToLoad
ret
AgainTextTileData:
@@ -528,7 +528,7 @@ LoadDiglettGraphics: ; 0x149d9 or h
ret z
ld a, BANK(TileListDataPointers_14a11)
- call Func_10aa
+ call QueueGraphicsToLoad
ret
LoadDiglettNumberGraphics: ; 0x149f5
@@ -548,7 +548,7 @@ LoadDiglettNumberGraphics: ; 0x149f5 or h
ret z
ld a, BANK(Data_14af5)
- call Func_10aa
+ call QueueGraphicsToLoad
ret
INCLUDE "data/queued_tiledata/red_field/diglett.asm"
@@ -736,7 +736,7 @@ UpdateSpinnerChargeGraphics_RedField: ; 0x14ece ld h, [hl]
ld l, a
ld a, BANK(TileDataPointers_14eeb)
- call Func_10aa
+ call QueueGraphicsToLoad
ret
INCLUDE "data/queued_tiledata/red_field/spinner.asm"
@@ -834,9 +834,9 @@ LoadCAVELightGraphics_RedField: ; 0x1523c ld c, [hl]
inc hl
ld b, [hl]
- ld a, $5
+ ld a, Bank(TileDataPointers_152dd)
ld de, LoadTileLists
- call Func_10c5
+ call QueueGraphicsToLoadWithFunc
pop bc
ret
@@ -1070,9 +1070,9 @@ LoadPinballUpgradeTriggerGraphics_RedField: ; 0x15465 ld c, [hl]
inc hl
ld b, [hl]
- ld a, $5
+ ld a, Bank(TileDataPointers_15511)
ld de, LoadTileLists
- call Func_10c5
+ call QueueGraphicsToLoadWithFunc
pop bc
ret
@@ -1224,7 +1224,7 @@ TransitionPinballUpgrade: ; 0x155a7 ld h, [hl]
ld l, a
ld a, Bank(PinballUpgradeTransition_TileDataPointers)
- call Func_10aa
+ call QueueGraphicsToLoad
; fall through
TransitionPinballUpgradePalette: ; 0x155bb
@@ -1243,7 +1243,7 @@ TransitionPinballUpgradePalette: ; 0x155bb ld b, [hl]
ld a, BANK(PinballUpgradeTransitionPalettes)
ld de, LoadPalettes
- call Func_10c5
+ call QueueGraphicsToLoadWithFunc
ret
INCLUDE "data/queued_tiledata/ball_upgrade.asm"
@@ -1512,7 +1512,7 @@ LoadFieldStructureGraphics_RedField: ; 0x159f4 or h
ret z
ld a, Bank(TileDataPointers_15a3f)
- call Func_10aa
+ call QueueGraphicsToLoad
ld a, [wStageCollisionState]
ld [wd7f2], a
ret
@@ -1678,7 +1678,7 @@ LoadBumperGraphics_RedField: ; 0x15fc0 ld h, [hl]
ld l, a
ld a, Bank(TileDataPointers_16010)
- call Func_10aa
+ call QueueGraphicsToLoad
ret
ApplyBumperCollision_RedField: ; 0x15fda
@@ -2067,7 +2067,7 @@ DoSlotLogic_RedField: ; 0x16352 ld [wBonusStageSlotRewardActive], a
ld a, $1
ld [wd495], a
- ld [wd4ae], a
+ ld [wMoveToNextScreenState], a
ld a, [wd498]
ld c, a
ld b, $0
@@ -2160,7 +2160,7 @@ LoadSlotCaveCoverGraphics_RedField: ; 0x16425 or h
ret z
ld a, Bank(TileDataPointers_1644d)
- call Func_10aa
+ call QueueGraphicsToLoad
ret
INCLUDE "data/queued_tiledata/red_field/slot_cave.asm"
@@ -2392,13 +2392,13 @@ UpdatePikachuSaverAnimation_RedField: ; 0x1669e cp $1
jr nz, .asm_166f7
xor a
- ld [wd85d], a
+ ld [wAudioEngineEnabled], a
call Func_310a
rst AdvanceFrame
ld a, $1
callba PlayPikachuSoundClip
ld a, $1
- ld [wd85d], a
+ ld [wAudioEngineEnabled], a
ld a, $ff
ld [wRumblePattern], a
ld a, $60
@@ -2602,7 +2602,7 @@ LoadStaryuGraphics_Top: ; 0x16859 or h
ret z
ld a, Bank(TileDataPointers_16899)
- call Func_10aa
+ call QueueGraphicsToLoad
ret
LoadStaryuGraphics_Bottom: ; 0x16878
@@ -2624,7 +2624,7 @@ LoadStaryuGraphics_Bottom: ; 0x16878 or h
ret z
ld a, Bank(TileDataPointers_1695a)
- call Func_10aa
+ call QueueGraphicsToLoad
ret
INCLUDE "data/queued_tiledata/red_field/staryu_bumper.asm"
@@ -2678,7 +2678,7 @@ LoadArrowIndicatorGraphics_RedField: ; 0x169cd ld h, [hl]
ld l, a
ld a, Bank(TileDataPointers_169ed)
- call Func_10aa
+ call QueueGraphicsToLoad
ret
INCLUDE "data/queued_tiledata/red_field/arrow_indicators.asm"
@@ -2839,7 +2839,7 @@ UpdateBonusMultiplierRailing_RedField: ; 0x16e51 ret
ShowBonusMultiplierMessage_RedField: ; 0x16ef5
- ld a, [wd5ca]
+ ld a, [wBottomTextEnabled]
and a
ret nz
ld a, [wd613]
@@ -2900,7 +2900,7 @@ LoadBonusMultiplierRailingGraphics_RedField_Gameboy: ; 0x16f38 ld h, [hl]
ld l, a
ld a, Bank(BonusMultiplierRailingTileDataPointers_16fc8)
- call Func_10aa
+ call QueueGraphicsToLoad
.asm_16f5c
pop af
ld bc, $0000
@@ -2919,7 +2919,7 @@ LoadBonusMultiplierRailingGraphics_RedField_Gameboy: ; 0x16f38 ld h, [hl]
ld l, a
ld a, Bank(BonusMultiplierRailingTileData_171e4)
- call Func_10aa
+ call QueueGraphicsToLoad
ret
LoadBonusMultiplierRailingGraphics_RedField_GameboyColor: ; 0x16f7b
@@ -2937,7 +2937,7 @@ LoadBonusMultiplierRailingGraphics_RedField_GameboyColor: ; 0x16f7b ld h, [hl]
ld l, a
ld a, Bank(BonusMultiplierRailingTileDataPointers_17228)
- call Func_10aa
+ call QueueGraphicsToLoad
ret
GetBCDForNextBonusMultiplier_RedField: ; 0x16f95
@@ -3002,9 +3002,9 @@ LoadPokeballsGraphics_RedField: ; 0x174d4 ld c, a
ld a, [hli]
ld b, a
- ld a, $5
+ ld a, Bank(TileDataPointers_17528)
ld de, LoadTileLists
- call Func_10c5
+ call QueueGraphicsToLoadWithFunc
ret
UpdateBlinkingPokeballs_RedField: ; 0x174ea
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 e169524..83d48db 100644 --- a/engine/pinball_game/object_collision/seel_bonus_resolve_collision.asm +++ b/engine/pinball_game/object_collision/seel_bonus_resolve_collision.asm @@ -87,7 +87,7 @@ Func_25d0e: ; 0x25d0e ld h, [hl]
ld l, a
ld a, Bank(TileDataPointers_25d2b)
- call Func_10aa
+ call QueueGraphicsToLoad
ret
TileDataPointers_25d2b:
@@ -1161,7 +1161,7 @@ Func_262f4: ; 0x262f4 ld h, [hl]
ld l, a
ld a, Bank(TileDataPointers_2634a)
- call Func_10aa
+ call QueueGraphicsToLoad
ret
TileDataPointers_2634a:
diff --git a/engine/pinball_game/save_game.asm b/engine/pinball_game/save_game.asm index 624a1a9..c1d65a8 100644 --- a/engine/pinball_game/save_game.asm +++ b/engine/pinball_game/save_game.asm @@ -4,9 +4,9 @@ SaveGame: ; 0xda05 ld bc, $0004
call AdvanceFrames
call FadeOut
- ld a, [wd849]
+ ld a, [wUpdateAudioEngineUsingTimerInterrupt]
and a
- call nz, Func_e5d
+ call nz, ToggleAudioEngineUpdateMethod
call DisableLCD
ld hl, hSTAT
res 6, [hl]
diff --git a/engine/pinball_game/slot.asm b/engine/pinball_game/slot.asm index 3331fae..a81fc14 100644 --- a/engine/pinball_game/slot.asm +++ b/engine/pinball_game/slot.asm @@ -25,7 +25,7 @@ Func_ed8e: ; 0xed8e ld hl, HandleFlippers
call nz, BankSwitch
callba DrawSpritesForStage
- call Func_33e3
+ call UpdateBottomText
call CleanOAMBuffer
rst AdvanceFrame
ld a, [wd7af]
@@ -254,13 +254,13 @@ SlotRewardPikachuSaver: ; 0xef83 ld a, MAX_PIKACHU_SAVER_CHARGE
ld [wPikachuSaverCharge], a
xor a
- ld [wd85d], a
+ ld [wAudioEngineEnabled], a
call Func_310a
rst AdvanceFrame
ld a, $0
callba PlayPikachuSoundClip
ld a, $1
- ld [wd85d], a
+ ld [wAudioEngineEnabled], a
ret
SlotRewardBonusMultiplier: ; 0xefa7
diff --git a/engine/pinball_game/stage_init/init_blue_field.asm b/engine/pinball_game/stage_init/init_blue_field.asm index 747d1af..0200f2d 100644 --- a/engine/pinball_game/stage_init/init_blue_field.asm +++ b/engine/pinball_game/stage_init/init_blue_field.asm @@ -19,7 +19,7 @@ InitBlueField: ; 0x1c000 ld [hli], a
ld [hli], a ; wNumPokeballs
ld [hli], a ; wPokeballBlinkingCounter
- ld [wd7ac], a
+ ld [wDisableHorizontalScrollForBallStart], a
ld [wd7be], a
ld [wCurrentMap], a ; PALLET_TOWN
ld a, $1
@@ -44,8 +44,8 @@ InitBlueField: ; 0x1c000 ld [wd64a], a
ld [wd643], a
ld [wd644], a
- ld [wd645], a
- ld [wd646], a
+ ld [wPsyduckState], a
+ ld [wPoliwagState], a
callba Start20SecondSaverTimer
callba GetBCDForNextBonusMultiplier_BlueField
ld a, $10
diff --git a/engine/pinball_game/stage_init/init_diglett_bonus.asm b/engine/pinball_game/stage_init/init_diglett_bonus.asm index a04b201..26af2ca 100644 --- a/engine/pinball_game/stage_init/init_diglett_bonus.asm +++ b/engine/pinball_game/stage_init/init_diglett_bonus.asm @@ -5,7 +5,7 @@ InitDiglettBonusStage: ; 0x199f2 xor a
ld [wStageCollisionState], a
ld a, $1
- ld [wd7ac], a
+ ld [wDisableHorizontalScrollForBallStart], a
ld a, [wBallType]
ld [wBallTypeBackup], a
xor a
diff --git a/engine/pinball_game/stage_init/init_gengar_bonus.asm b/engine/pinball_game/stage_init/init_gengar_bonus.asm index 357de1c..65e313c 100644 --- a/engine/pinball_game/stage_init/init_gengar_bonus.asm +++ b/engine/pinball_game/stage_init/init_gengar_bonus.asm @@ -10,7 +10,7 @@ InitGengarBonusStage: ; 0x18099 ret
.asm_180ac
ld a, $1
- ld [wd7ac], a
+ ld [wDisableHorizontalScrollForBallStart], a
ld a, [wBallType]
ld [wBallTypeBackup], a
xor a
diff --git a/engine/pinball_game/stage_init/init_meowth_bonus.asm b/engine/pinball_game/stage_init/init_meowth_bonus.asm index 178c90c..3e07fa6 100644 --- a/engine/pinball_game/stage_init/init_meowth_bonus.asm +++ b/engine/pinball_game/stage_init/init_meowth_bonus.asm @@ -12,7 +12,7 @@ InitMeowthBonusStage: ; 0x24000 ld [wBallType], a
ld [wCompletedBonusStage], a
ld a, $1
- ld [wd7ac], a
+ ld [wDisableHorizontalScrollForBallStart], a
ld a, $40
ld [wMeowthXPosition], a
ld a, $20
diff --git a/engine/pinball_game/stage_init/init_mewtwo_bonus.asm b/engine/pinball_game/stage_init/init_mewtwo_bonus.asm index 26410e3..1c26004 100644 --- a/engine/pinball_game/stage_init/init_mewtwo_bonus.asm +++ b/engine/pinball_game/stage_init/init_mewtwo_bonus.asm @@ -5,7 +5,7 @@ InitMewtwoBonusStage: ; 0x1924f xor a
ld [wStageCollisionState], a
ld a, $1
- ld [wd7ac], a
+ ld [wDisableHorizontalScrollForBallStart], a
ld a, [wBallType]
ld [wBallTypeBackup], a
xor a
diff --git a/engine/pinball_game/stage_init/init_red_field.asm b/engine/pinball_game/stage_init/init_red_field.asm index ba8d1f8..a40ace1 100644 --- a/engine/pinball_game/stage_init/init_red_field.asm +++ b/engine/pinball_game/stage_init/init_red_field.asm @@ -19,7 +19,7 @@ InitRedField: ; 0x30000 ld [hli], a
ld [hli], a ; wNumPokeballs
ld [hli], a ; wPokeballBlinkingCounter
- ld [wd7ac], a
+ ld [wDisableHorizontalScrollForBallStart], a
ld [wd7be], a
ld [wCurrentMap], a ; PALLET_TOWN
ld a, $1
diff --git a/engine/pinball_game/stage_init/init_seel_bonus.asm b/engine/pinball_game/stage_init/init_seel_bonus.asm index ee51417..2af90c9 100644 --- a/engine/pinball_game/stage_init/init_seel_bonus.asm +++ b/engine/pinball_game/stage_init/init_seel_bonus.asm @@ -6,7 +6,7 @@ InitSeelBonusStage: ; 0x25a7c ld [wd4c8], a
ld [wStageCollisionState], a
ld a, $1
- ld [wd7ac], a
+ ld [wDisableHorizontalScrollForBallStart], a
ld a, [wBallType]
ld [wBallTypeBackup], a
xor a
diff --git a/engine/pinball_game/vertical_screen_transition.asm b/engine/pinball_game/vertical_screen_transition.asm index 57ae6bb..d534a21 100644 --- a/engine/pinball_game/vertical_screen_transition.asm +++ b/engine/pinball_game/vertical_screen_transition.asm @@ -16,13 +16,13 @@ FieldVerticalTransition: ; 0xe674 ld [hOBP0], a
ld [hOBP1], a
rst AdvanceFrame
- call Func_e5d
+ call ToggleAudioEngineUpdateMethod
call DisableLCD
call ClearOAMBuffer
call Func_1129
call LoadStageCollisionAttributes
call LoadStageData
- call Func_e5d
+ call ToggleAudioEngineUpdateMethod
call EnableLCD
ld a, $e4
ld [hBGP], a
@@ -37,13 +37,13 @@ LoadStageData: ; 0xe6c2 ld a, [wCurrentStage]
bit 0, a
ld a, $86
- jr z, .asm_e6d5
- ld a, [wd5ca]
+ jr z, .gotWindowYPos
+ ld a, [wBottomTextEnabled]
and a
ld a, $86
- jr nz, .asm_e6d5
+ jr nz, .gotWindowYPos
ld a, $90
-.asm_e6d5
+.gotWindowYPos
ld [hWY], a
ld hl, StageGfxPointers_GameBoy
ld a, [hGameBoyColorFlag]
@@ -61,7 +61,7 @@ LoadStageData: ; 0xe6c2 INCLUDE "data/stage_base_gfx.asm"
CheckStageTransition: ; 0xece9
- call Func_ed5e
+ call ScrollScreenToShowPinball
ld a, [wBallYPos + 1]
add $10
cp $18
@@ -99,7 +99,7 @@ CheckStageTransition: ; 0xece9 .youLose
ld a, $1
- ld [wd4ae], a
+ ld [wMoveToNextScreenState], a
callba HandleBallLoss
ret
@@ -143,9 +143,11 @@ BallMovingDownStageTransitions: ; 0xed4e db $FF ; STAGE_SEEL_BONUS
db $FF ; STAGE_SEEL_BONUS
-Func_ed5e: ; 0xed5e
+ScrollScreenToShowPinball: ; 0xed5e
+; When the ball is launched on the Blue and Red Fields, the screen starts off scrolled to the right.
+; However, when the balls rolls in on Bonus Stages, the screen does NOT scroll.
ld hl, wSCX
- ld a, [wd7ac]
+ ld a, [wDisableHorizontalScrollForBallStart]
and a
jr nz, .modify_scx_and_scy
ld a, [wBallXPos + 1]
@@ -154,7 +156,7 @@ Func_ed5e: ; 0xed5e jr nc, .okay1
ld a, -2
.okay1
- ld [wd7aa], a
+ ld [wUnused_d7aa], a ; This is not used
add [hl]
cp $22
jr z, .modify_scx_and_scy
@@ -163,11 +165,11 @@ Func_ed5e: ; 0xed5e ld [hl], a
.modify_scx_and_scy
ld a, [hl]
- ld hl, wd79f
+ ld hl, wLeftAndRightTiltPixelsOffset
sub [hl]
ld [hSCX], a
xor a
- ld hl, wd7a0
+ ld hl, wUpperTiltPixelsOffset
sub [hl]
ld [hSCY], a
ret
diff --git a/engine/pokedex.asm b/engine/pokedex.asm index e903bb8..be3c15f 100644 --- a/engine/pokedex.asm +++ b/engine/pokedex.asm @@ -59,7 +59,7 @@ LoadPokedexScreen: ; 0x2800e call Func_28ad1
call Func_28add
call CountNumSeenOwnedMons
- call Func_b66
+ call SetAllPalettesWhite
ld a, $f
call SetSongBank
ld de, $0004
diff --git a/engine/select_gameboy_target_menu.asm b/engine/select_gameboy_target_menu.asm index 339bc55..17fecaa 100644 --- a/engine/select_gameboy_target_menu.asm +++ b/engine/select_gameboy_target_menu.asm @@ -39,7 +39,7 @@ InitSelectGameboyTargetMenu: ; 0x800a ld [hSCY], a
call LoadGameboyTargetMenuGfx
call ClearOAMBuffer
- call Func_b66
+ call SetAllPalettesWhite
call EnableLCD
call FadeIn
ld hl, wScreenState
@@ -73,7 +73,7 @@ LoadGameboyTargetMenuGfx: ; 0x8049 ld a, Bank(SelectGameboyTarget_TileData)
ld bc, SelectGameboyTarget_TileData
ld de, LoadTileLists
- call Func_10c5
+ call QueueGraphicsToLoadWithFunc
ret
SelectGameboyTargetGfxPointers: ; 0x8089
@@ -202,14 +202,14 @@ SelectCGBOrDMG: ; 0x8104 ld a, Bank(DMGSelected_TileData)
ld bc, DMGSelected_TileData
ld de, LoadTileLists
- call Func_10c5
+ call QueueGraphicsToLoadWithFunc
ret
.cgb
ld a, Bank(CGBSelected_TileData)
ld bc, CGBSelected_TileData
ld de, LoadTileLists
- call Func_10c5
+ call QueueGraphicsToLoadWithFunc
ret
DMGSelected_TileData: ; 0x813a
diff --git a/engine/titlescreen.asm b/engine/titlescreen.asm index 641b0cd..01a1aac 100644 --- a/engine/titlescreen.asm +++ b/engine/titlescreen.asm @@ -29,7 +29,7 @@ FadeInTitlescreen: ; 0xc00e ld a, $2
ld [wTitleScreenPokeballAnimationCounter], a
call HandleTitlescreenAnimations
- call Func_b66
+ call SetAllPalettesWhite
ld a, $11
call SetSongBank
ld de, $0004
|