aboutsummaryrefslogtreecommitdiff
path: root/main.gbasm
diff options
context:
space:
mode:
authorAstatin <[email protected]>2024-11-15 17:43:42 +0900
committerAstatin <[email protected]>2024-11-15 17:43:42 +0900
commit1aa36f5ce5bbdbd597456efd4603b83682d27e59 (patch)
tree9469e417060ac4db2c60b8c1c6890994c18bd439 /main.gbasm
parentcfd36cc6a11923c8863b699e70b90149ad1c731a (diff)
Fix the hop map loading + animation entity + object loading
Diffstat (limited to 'main.gbasm')
-rw-r--r--main.gbasm10
1 files changed, 6 insertions, 4 deletions
diff --git a/main.gbasm b/main.gbasm
index 7c262d6..a46165a 100644
--- a/main.gbasm
+++ b/main.gbasm
@@ -111,17 +111,18 @@ VBLANK_Entrypoint:
LD A, $68
LD (HL), A
+ CALL $OAM_DMA_Transfer_routine
+ CALL =Hop_Attack_Loading_VBlank
+
LD A, $mem_current_mode
CP $enum_dungeon_mode
JR NZ, =Skip_VBlank_Dungeon_Update
- ; CALL =Display_Prepared_Block
+ CALL =Display_Prepared_Block
CALL =Display_Object
Skip_VBlank_Dungeon_Update:
- CALL =Hop_Attack_Loading_VBlank
CALL =Copy_Dialogue_Buffer
CALL =Display_dialogue_cursor
- CALL $OAM_DMA_Transfer_routine
; LYC
LD A, $09
@@ -138,10 +139,11 @@ VBLANK_Entrypoint:
CALL =Object_Interactions_Check
CALL =Entities_Actions
- ; CALL =Prepare_Scrolling_Map
+ CALL =Prepare_Scrolling_Map
Skip_Dungeon_Update:
+ CALL =Hop_Attack_Loading_Regular
CALL =Update_Animation_Steps
CALL =Check_Open_Menu_button
CALL =Move_dialogue_cursor