diff options
| author | Astatin <[email protected]> | 2025-03-18 20:02:28 +0900 |
|---|---|---|
| committer | Astatin <[email protected]> | 2025-03-18 20:02:28 +0900 |
| commit | 22f57d7e37626b81c045d7b9090dec47d3784bcc (patch) | |
| tree | 906df5527de1bf0963733b1abd8e25de190a44c8 | |
| parent | 579e73311319868d8b186e3442098358d839b3b3 (diff) | |
Fix RET instead of RETI from interrupt
| -rw-r--r-- | dialogues/demo_quest.gbasm | 2 | ||||
| -rw-r--r-- | dialogues/text.gbasm | 4 | ||||
| -rw-r--r-- | dialogues/text.gbtxt | 3 | ||||
| -rw-r--r-- | entity/init.gbasm | 5 | ||||
| -rw-r--r-- | main.gbasm | 2 | ||||
| -rw-r--r-- | map/generationevents.gbasm | 2 |
6 files changed, 14 insertions, 4 deletions
diff --git a/dialogues/demo_quest.gbasm b/dialogues/demo_quest.gbasm index 20e630d..abc462e 100644 --- a/dialogues/demo_quest.gbasm +++ b/dialogues/demo_quest.gbasm @@ -5,7 +5,7 @@ Demo_quest_bunny: .END Demo_quest_init: -.TEXTB =Bunny_Header_Text =Dialogue_2_1b +.TEXTB =Unknown_Header_Text =Dialogue_2_1b .TEXT =Dialogue_2_2t =Empty .TEXT =Dialogue_2_3t =Dialogue_2_3b .TEXT =Dialogue_2_4t =Dialogue_2_4b diff --git a/dialogues/text.gbasm b/dialogues/text.gbasm index c64f37b..eaefa13 100644 --- a/dialogues/text.gbasm +++ b/dialogues/text.gbasm @@ -2,6 +2,8 @@ Empty: .DB , 0xff Bunny_Header_Text: .DB 0x8b, 0x9e, 0x97, 0x97, 0xa2, 0xaa, 0xff +Unknown_Header_Text: +.DB 0xa6, 0xa6, 0xa6, 0xaa, 0xff Dialogue_1_1b: .DB 0x91, 0x8e, 0x95, 0x95, 0x98, 0x0, 0xa5, 0xff Dialogue_1_2t: @@ -11,7 +13,7 @@ Dialogue_1_2b: Dialogue_1_3t: .DB 0xa0, 0x98, 0x9e, 0x95, 0x8d, 0x0, 0xa2, 0x98, 0x9e, 0x0, 0x91, 0x8e, 0x95, 0x99, 0x0, 0x96, 0x8e, 0xa6, 0xff Dialogue_2_1b: -.DB 0x91, 0x8e, 0x95, 0x99, 0x0, 0xa5, 0xff +.DB 0x91, 0x8e, 0x95, 0x99, 0x0, 0xa5, 0xa5, 0xa5, 0xff Dialogue_2_2t: .DB 0xa4, 0xa4, 0xa4, 0xff Dialogue_2_3t: diff --git a/dialogues/text.gbtxt b/dialogues/text.gbtxt index cb8c619..ce9a261 100644 --- a/dialogues/text.gbtxt +++ b/dialogues/text.gbtxt @@ -1,5 +1,6 @@ Empty: Bunny_Header_Text: Bunny: +Unknown_Header_Text: ???: Dialogue_1_1b: Hello ! @@ -10,7 +11,7 @@ Dialogue_1_2b: dungeon. Dialogue_1_3t: Would you help me? -Dialogue_2_1b: Help ! +Dialogue_2_1b: Help !!! Dialogue_2_2t: ... diff --git a/entity/init.gbasm b/entity/init.gbasm index 5d5676a..ce9294f 100644 --- a/entity/init.gbasm +++ b/entity/init.gbasm @@ -95,6 +95,8 @@ Initialize_Entities: LD A, $ff LD $mem_bunny_current_room_idx, A + LD A, $00 + LD $tmp_var_3, A CALL =Initialize_Enemy CALL =Initialize_Enemy CALL =Initialize_Enemy @@ -319,6 +321,9 @@ Respawn_Entities: CP $05 RET NC + LD A, $00 + LD $tmp_var_3, A + CALL =RNG_Step AND $0f CP $00 @@ -260,7 +260,7 @@ VBLANK_Entrypoint: LD $mem_loop_frame_timer, A .ENABLE_VBLANK_INTERRUPTS - RET + RETI STAT_Entrypoint: PUSH AF diff --git a/map/generationevents.gbasm b/map/generationevents.gbasm index 482c00e..430b3fe 100644 --- a/map/generationevents.gbasm +++ b/map/generationevents.gbasm @@ -61,6 +61,8 @@ Generation_Event_Jump_Table: LD $mem_loaded_special_entity_index, A CALL =FindFreeEntity + LD A, $01 + LD $tmp_var_3, A LD A, $07 CALL =Initialize_Entity RET |