diff options
| author | Astatin <[email protected]> | 2025-03-25 19:01:47 +0900 |
|---|---|---|
| committer | Astatin <[email protected]> | 2025-03-25 19:01:47 +0900 |
| commit | fb8e853fd0c6660696e762f67877b4d24a9f4c22 (patch) | |
| tree | 4c2c69bd5e13bebfe02534541e4adcf2b67f335f /playerattacks | |
| parent | 2df3daa5128a27381fe5208fa4eac59ab10bdd9c (diff) | |
Separate modes VBlank functions
Diffstat (limited to 'playerattacks')
| -rw-r--r-- | playerattacks/earcoptr.gbasm | 1 | ||||
| -rw-r--r-- | playerattacks/freeze.gbasm | 2 | ||||
| -rw-r--r-- | playerattacks/heal.gbasm | 1 | ||||
| -rw-r--r-- | playerattacks/hop.gbasm | 15 |
4 files changed, 17 insertions, 2 deletions
diff --git a/playerattacks/earcoptr.gbasm b/playerattacks/earcoptr.gbasm index d17d88b..ef6a4b5 100644 --- a/playerattacks/earcoptr.gbasm +++ b/playerattacks/earcoptr.gbasm @@ -9,6 +9,7 @@ Earcoptr_Attack_Loading_VBlank: LD A, $enum_dungeon_mode LD $mem_current_mode, A LD $mem_requested_mode, A + CALL =Update_VBlank_Handler LD A, $mem_map_loading_flags SET 3, A LD $mem_map_loading_flags, A diff --git a/playerattacks/freeze.gbasm b/playerattacks/freeze.gbasm index e7aefa7..80e3ca1 100644 --- a/playerattacks/freeze.gbasm +++ b/playerattacks/freeze.gbasm @@ -37,6 +37,8 @@ Freeze_Attack_Loading_VBlank: LD A, $enum_dungeon_mode LD $mem_current_mode, A LD $mem_requested_mode, A + CALL =Update_VBlank_Handler + LD A, $mem_map_loading_flags SET 3, A LD $mem_map_loading_flags, A diff --git a/playerattacks/heal.gbasm b/playerattacks/heal.gbasm index 72f83fe..2cc7b10 100644 --- a/playerattacks/heal.gbasm +++ b/playerattacks/heal.gbasm @@ -24,6 +24,7 @@ Heal_Attack: LD A, $enum_dungeon_mode LD $mem_requested_mode, A LD $mem_current_mode, A + CALL =Update_VBlank_Handler .CLOSE_DIALOGUE diff --git a/playerattacks/hop.gbasm b/playerattacks/hop.gbasm index 8aa445b..ac89acd 100644 --- a/playerattacks/hop.gbasm +++ b/playerattacks/hop.gbasm @@ -87,12 +87,19 @@ Hop_Attack_Loading_VBlank: INC A AND $0f LD $mem_loading_step, A + RET + + +Hop_Attack_Loading_Regular: + LD A, $mem_loading_step CP $00 - RET NZ + JR NZ, =.preload_tiles LD A, $enum_dungeon_mode LD $mem_current_mode, A LD $mem_requested_mode, A + CALL =Update_VBlank_Handler + CALL =Fix_Bunny_screen LD A, $mem_bunny_direction OR $38 LD $mem_bunny_direction, A @@ -104,7 +111,11 @@ Hop_Attack_Loading_VBlank: LD $mem_bunny_flags, A RET -Hop_Attack_Loading_Regular: + + .preload_tiles: + LD A, $mem_current_mode + CP $enum_loading_mode + RET NZ CALL =Preload_Map_Hop LD A, $mem_prepared_block_tile |