From c0382daeb5959a0be56fbf46de19873fc3a0bb39 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sun, 9 Jul 2017 13:16:25 -0400 Subject: Some more organization of HOME --- engine/copyright_screen.asm | 4 ++-- engine/erase_all_data_menu.asm | 4 ++-- engine/field_select_screen.asm | 4 ++-- engine/high_scores_screen.asm | 6 +++--- engine/options_screen.asm | 4 ++-- engine/pinball_game.asm | 10 +++++----- engine/pinball_game/load_stage_data/load_blue_field.asm | 2 +- engine/pinball_game/load_stage_data/load_red_field.asm | 10 +++++----- .../object_collision/gengar_bonus_resolve_collision.asm | 2 +- engine/pinball_game/save_game.asm | 2 +- engine/pinball_game/stage_init/init_stages.asm | 4 ++-- engine/pinball_game/vertical_screen_transition.asm | 4 ++-- engine/pokedex.asm | 4 ++-- engine/select_gameboy_target_menu.asm | 4 ++-- engine/titlescreen.asm | 8 ++++---- 15 files changed, 36 insertions(+), 36 deletions(-) (limited to 'engine') diff --git a/engine/copyright_screen.asm b/engine/copyright_screen.asm index 35a5329..c749043 100644 --- a/engine/copyright_screen.asm +++ b/engine/copyright_screen.asm @@ -21,7 +21,7 @@ FadeInCopyrightScreen: ; 0x8228 call LoadVideoData call ClearOAMBuffer call Func_b66 - call Func_588 + call EnableLCD call SGBNormal ld bc, $0050 call AdvanceFrames @@ -68,7 +68,7 @@ DisplayCopyrightScreen: ; 0x8290 FadeOutCopyrightScreenAndLoadData: ; 0x82a8 call FadeOut - call Func_576 + call DisableLCD ld hl, sHighScores ld de, wRedHighScore1Points ld bc, $0082 diff --git a/engine/erase_all_data_menu.asm b/engine/erase_all_data_menu.asm index 7504cf5..6ef174f 100644 --- a/engine/erase_all_data_menu.asm +++ b/engine/erase_all_data_menu.asm @@ -29,7 +29,7 @@ CheckForResetButtonCombo: ; 0x8167 call LoadVideoData call ClearOAMBuffer call Func_b66 - call Func_588 + call EnableLCD call SGBNormal call FadeIn ld hl, wScreenState @@ -107,7 +107,7 @@ HandleEraseAllDataInput: ; 0x81d4 ExitEraseAllDataMenu: ; 0x820f call FadeOut - call Func_576 + call DisableLCD ld hl, wCurrentScreen inc [hl] xor a diff --git a/engine/field_select_screen.asm b/engine/field_select_screen.asm index 0033488..26dfc47 100644 --- a/engine/field_select_screen.asm +++ b/engine/field_select_screen.asm @@ -28,7 +28,7 @@ LoadFieldSelectScreen: ; 0xd6dd call SetSongBank ld de, $0003 call PlaySong - call Func_588 + call EnableLCD call FadeIn ld hl, wScreenState inc [hl] @@ -82,7 +82,7 @@ ExitFieldSelectScreen: ; 0xd774 ld a, [hJoypadState] push af call FadeOut - call Func_576 + call DisableLCD ld a, [wd8f6] bit BIT_A_BUTTON, a jr z, .pressedB diff --git a/engine/high_scores_screen.asm b/engine/high_scores_screen.asm index 9823d67..09b16d6 100644 --- a/engine/high_scores_screen.asm +++ b/engine/high_scores_screen.asm @@ -164,7 +164,7 @@ Func_cb14: ; 0xcb14 ld de, $0002 call PlaySong .asm_cba6 - call Func_588 + call EnableLCD ld bc, $0009 call Func_d68a ld bc, $03c9 @@ -179,7 +179,7 @@ Func_cb14: ; 0xcb14 call SetSongBank ld de, $0004 call PlaySong - call Func_588 + call EnableLCD ld bc, $0009 call Func_d68a ld bc, $03c9 @@ -944,7 +944,7 @@ Func_d159: ; 0xd159 ExitHighScoresScreen: ; 0xd171 call FadeOut - call Func_576 + call DisableLCD ld hl, hSTAT res 6, [hl] ld hl, rIE diff --git a/engine/options_screen.asm b/engine/options_screen.asm index e29c96f..6549451 100644 --- a/engine/options_screen.asm +++ b/engine/options_screen.asm @@ -36,7 +36,7 @@ Func_c35a: ; 0xc35a call SetSongBank ld de, $0002 call PlaySong - call Func_588 + call EnableLCD ld a, [wSoundTestCurrentBackgroundMusic] hlCoord 7, 11, vBGMap call RedrawSoundTestID @@ -146,7 +146,7 @@ Func_c447: ; 0xc447 Func_c483: ; 0xc483 call FadeOut - call Func_576 + call DisableLCD ld a, SCREEN_TITLESCREEN ld [wCurrentScreen], a xor a diff --git a/engine/pinball_game.asm b/engine/pinball_game.asm index c0da4a9..4374670 100644 --- a/engine/pinball_game.asm +++ b/engine/pinball_game.asm @@ -60,7 +60,7 @@ GameScreenFunction_StartBall: ; 0xd87f xor a ld [wd7c1], a call Func_b66 - call Func_588 + call EnableLCD call FadeIn ld hl, wScreenState inc [hl] @@ -234,7 +234,7 @@ GameScreenFunction_EndBall: ; 0xdab2 ld a, [wd849] and a call z, Func_e5d - call Func_576 + call DisableLCD ld hl, hSTAT res 6, [hl] ld hl, rIE @@ -252,7 +252,7 @@ GameScreenFunction_EndBall: ; 0xdab2 ld a, [wd849] and a call nz, Func_e5d - call Func_576 + call DisableLCD ld hl, hSTAT res 6, [hl] ld hl, rIE @@ -279,7 +279,7 @@ GameScreenFunction_EndBall: ; 0xdab2 ld a, [wd849] and a call nz, Func_e5d - call Func_576 + call DisableLCD ld hl, hSTAT res 6, [hl] ld hl, rIE @@ -300,7 +300,7 @@ TransitionToHighScoresScreen: ; 0xdb5d ld bc, $0004 call AdvanceFrames call FadeOut - call Func_576 + call DisableLCD ld hl, hSTAT res 6, [hl] ld hl, rIE 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 7d5c888..6e0554d 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 1e40057..29cca35 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 diff --git a/engine/pokedex.asm b/engine/pokedex.asm index 8251d03..e903bb8 100644 --- a/engine/pokedex.asm +++ b/engine/pokedex.asm @@ -64,7 +64,7 @@ LoadPokedexScreen: ; 0x2800e call SetSongBank ld de, $0004 call PlaySong - call Func_588 + call EnableLCD call FadeIn ld hl, wScreenState inc [hl] @@ -711,7 +711,7 @@ Func_284bc: ; 0x284bc ExitPokedexScreen: ; 0x284f9 call FadeOut - call Func_576 + call DisableLCD ld hl, hSTAT res 6, [hl] ld hl, rIE diff --git a/engine/select_gameboy_target_menu.asm b/engine/select_gameboy_target_menu.asm index 3f18b60..339bc55 100644 --- a/engine/select_gameboy_target_menu.asm +++ b/engine/select_gameboy_target_menu.asm @@ -40,7 +40,7 @@ InitSelectGameboyTargetMenu: ; 0x800a call LoadGameboyTargetMenuGfx call ClearOAMBuffer call Func_b66 - call Func_588 + call EnableLCD call FadeIn ld hl, wScreenState inc [hl] @@ -230,7 +230,7 @@ CGBSelected_TileData: ; 0x8144 EndSelectGameboyTargetMenu: ; 0x414e call FadeOut - call Func_576 + call DisableLCD ld hl, wCurrentScreen inc [hl] ; set to SCREEN_ERASE_ALL_DATA xor a diff --git a/engine/titlescreen.asm b/engine/titlescreen.asm index 057e937..641b0cd 100644 --- a/engine/titlescreen.asm +++ b/engine/titlescreen.asm @@ -34,7 +34,7 @@ FadeInTitlescreen: ; 0xc00e call SetSongBank ld de, $0004 call PlaySong - call Func_588 + call EnableLCD call FadeIn ld hl, wScreenState inc [hl] @@ -148,7 +148,7 @@ Func_c10e: ; 0xc10e and a jr z, .asm_c177 call FadeOut - call Func_576 + call DisableLCD ld a, [wd7c2] and a jr z, .asm_c173 @@ -224,7 +224,7 @@ Func_c1b1: ; 0xc1b1 Func_c1cb: ; 0c1cb call FadeOut - call Func_576 + call DisableLCD ld a, [wTitleScreenCursorSelection] ld c, a ld b, $0 @@ -243,7 +243,7 @@ Data_c1e4: ; 0xc1e4 GoToHighScoresFromTitlescreen: ; 0xc1e7 call FadeOut - call Func_576 + call DisableLCD ld a, SCREEN_HIGH_SCORES ld [wCurrentScreen], a ld a, $1 -- cgit v1.2.3