diff options
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | engine/events.asm | 4 | ||||
| -rw-r--r-- | engine/events_2.asm | 4 | ||||
| -rw-r--r-- | engine/scripting_crystal.asm | 5 | ||||
| -rw-r--r-- | main.asm | 4 |
5 files changed, 14 insertions, 5 deletions
@@ -6,7 +6,7 @@ PYTHON := python TEXTFILES := $(shell find ./ -type f -name '*.asm' | grep -v globals.asm) TEXTQUEUE := -CRYSTAL_OBJS := wram.o main.o stats/egg_moves_crystal.o stats/evos_attacks_crystal.o +CRYSTAL_OBJS := wram.o main.o engine/events.o engine/scripting_crystal.o engine/events_2.o stats/egg_moves_crystal.o stats/evos_attacks_crystal.o OBJS := $(CRYSTAL_OBJS) ROMS := pokecrystal.gbc diff --git a/engine/events.asm b/engine/events.asm index 569f5b8c9..d1b651f91 100644 --- a/engine/events.asm +++ b/engine/events.asm @@ -1,3 +1,7 @@ +INCLUDE "includes.asm" + +SECTION "events", ROMX, BANK[$25] + Function966b0: ; 966b0 xor a ld [$d432], a diff --git a/engine/events_2.asm b/engine/events_2.asm index accfdd451..88b924bd7 100644 --- a/engine/events_2.asm +++ b/engine/events_2.asm @@ -1,5 +1,9 @@ +INCLUDE "includes.asm" + ; More overworld event handling. +SECTION "events2", ROMX, BANK[$25] + Function97c28: ; 97c28 ld hl, StatusFlags2 res 1, [hl] diff --git a/engine/scripting_crystal.asm b/engine/scripting_crystal.asm new file mode 100644 index 000000000..5a7468bda --- /dev/null +++ b/engine/scripting_crystal.asm @@ -0,0 +1,5 @@ +INCLUDE "pokecrystal.asm" +INCLUDE "includes.asm" + +SECTION "scripting", ROMX, BANK[$25] +INCLUDE "engine/scripting.asm" @@ -85545,10 +85545,6 @@ SECTION "bank25",ROMX,BANK[$25] INCLUDE "maps/map_headers.asm" INCLUDE "maps/second_map_headers.asm" -INCLUDE "engine/events.asm" -INCLUDE "engine/scripting.asm" -INCLUDE "engine/events_2.asm" - SECTION "bank26",ROMX,BANK[$26] |