aboutsummaryrefslogtreecommitdiff
path: root/main.gbasm
diff options
context:
space:
mode:
Diffstat (limited to 'main.gbasm')
-rw-r--r--main.gbasm16
1 files changed, 12 insertions, 4 deletions
diff --git a/main.gbasm b/main.gbasm
index e22d5bb..699238c 100644
--- a/main.gbasm
+++ b/main.gbasm
@@ -100,6 +100,8 @@ Entrypoint:
LD $mem_bunny_mana, A
LD A, $01
LD $mem_floor_count, A
+ CALL =Init_DemoQuest_Event
+
New_Dungeon:
LD SP, $fffe
LD HL, $mem_loaded_enemies_indices
@@ -125,10 +127,6 @@ New_Dungeon:
CALL =Dungeon_Generation
CALL =Initialize_Entities
CALL =Initialize_Objects
- CALL =Load_Tile
- CALL =Load_Map
- CALL =Load_Objects
- CALL =Reload_Entities_Tile_Data
; Reset animations
LD HL, $mem_animation_list
@@ -171,6 +169,15 @@ New_Dungeon:
LD A, $f4
LD ($9d73), A
+ CALL =Generation_Event_Execution
+
+ CALL =Reload_Entities_Tile_Data
+ CALL =Reset_Entities_Collision_Map
+
+ CALL =Load_Tile
+ CALL =Load_Map
+ CALL =Load_Objects
+
.SET_WINDOW_LCDC_E
.ENABLE_TOP_BAR
.ENABLE_VBLANK_INTERRUPTS
@@ -309,6 +316,7 @@ STAT_Entrypoint:
.INCLUDE "map/loading.gbasm"
.INCLUDE "map/generation.gbasm"
.INCLUDE "map/objects.gbasm"
+.INCLUDE "map/generationevents.gbasm"
.INCLUDE "gui.gbasm"
.INCLUDE "dialogues/utils.gbasm"
.INCLUDE "entity/utils.gbasm"