diff options
Diffstat (limited to 'engine/pinball_game')
6 files changed, 12 insertions, 12 deletions
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 67dd0f2..cefafcf 100644 --- a/engine/pinball_game/load_stage_data/load_blue_field.asm +++ b/engine/pinball_game/load_stage_data/load_blue_field.asm @@ -350,7 +350,7 @@ Func_1c3ee: ; 0x1c3ee ld hl, PaletteData_dd188
ld de, $0070
ld bc, $0010
- call Func_6fd
+ call FarCopyCGBPals
ret
Func_1c43c: ; 0x1c43c
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 c194aa6..9b97df8 100644 --- a/engine/pinball_game/load_stage_data/load_red_field.asm +++ b/engine/pinball_game/load_stage_data/load_red_field.asm @@ -299,7 +299,7 @@ Func_14234: ; 0x14234 ld hl, PaletteData_dd188
ld de, $0070
ld bc, $0010
- call Func_6fd
+ call FarCopyCGBPals
ret
Func_14282: ; 0x14282
@@ -403,7 +403,7 @@ Func_142fc: ; 0x142fc ld hl, PokeBallObjPalette
ld de, $0040
ld bc, $0008
- call Func_6fd
+ call FarCopyCGBPals
ret
.notPokeball
@@ -413,7 +413,7 @@ Func_142fc: ; 0x142fc ld hl, GreatBallObjPalette
ld de, $0040
ld bc, $0008
- call Func_6fd
+ call FarCopyCGBPals
ret
.notGreatball
@@ -423,7 +423,7 @@ Func_142fc: ; 0x142fc ld hl, UltraBallObjPalette
ld de, $0040
ld bc, $0008
- call Func_6fd
+ call FarCopyCGBPals
ret
.notUltraball
@@ -431,7 +431,7 @@ Func_142fc: ; 0x142fc ld hl, MasterBallObjPalette
ld de, $0040
ld bc, $0008
- call Func_6fd
+ call FarCopyCGBPals
ret
Func_14377: ; 0x14377
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 dca326b..6d57675 100644 --- a/engine/pinball_game/object_collision/gengar_bonus_resolve_collision.asm +++ b/engine/pinball_game/object_collision/gengar_bonus_resolve_collision.asm @@ -1440,7 +1440,7 @@ Func_18d34: ; 0x18d34 ld a, $80
ld [wFlipperCollision], a
ld de, $002f
- call Func_4d8
+ call PlaySFXIfNoneActive
.asm_18d71
ret
diff --git a/engine/pinball_game/save_game.asm b/engine/pinball_game/save_game.asm index 1d2f539..624a1a9 100644 --- a/engine/pinball_game/save_game.asm +++ b/engine/pinball_game/save_game.asm @@ -7,7 +7,7 @@ SaveGame: ; 0xda05 ld a, [wd849]
and a
call nz, Func_e5d
- call Func_576
+ call DisableLCD
ld hl, hSTAT
res 6, [hl]
ld hl, rIE
diff --git a/engine/pinball_game/stage_init/init_stages.asm b/engine/pinball_game/stage_init/init_stages.asm index 1d4ba78..5e26639 100644 --- a/engine/pinball_game/stage_init/init_stages.asm +++ b/engine/pinball_game/stage_init/init_stages.asm @@ -10,14 +10,14 @@ InitializeCurrentStage: ; 0x8311 ld hl, vBGWin
ld bc, $0400
ld a, $0
- call Func_63e
+ call __memset_8
jr .asm_833c
.asm_8331
ld hl, vBGWin
ld bc, $0400
ld a, $8
- call Func_63e
+ call __memset_8
.asm_833c
xor a
ld [rVBK], a
diff --git a/engine/pinball_game/vertical_screen_transition.asm b/engine/pinball_game/vertical_screen_transition.asm index 94290f2..f27a221 100644 --- a/engine/pinball_game/vertical_screen_transition.asm +++ b/engine/pinball_game/vertical_screen_transition.asm @@ -17,13 +17,13 @@ FieldVerticalTransition: ; 0xe674 ld [hOBP1], a
rst AdvanceFrame
call Func_e5d
- call Func_576
+ call DisableLCD
call ClearOAMBuffer
call Func_1129
call LoadStageCollisionAttributes
call LoadStageData
call Func_e5d
- call Func_588
+ call EnableLCD
ld a, $e4
ld [hBGP], a
ld a, $e1
|