ref: 1a2784d4142572487fdf10a44aa4752de287e89f
parent: 346844a61328943cd5fffb0a6b7934b97a4fc0cb
author: yenatch <[email protected]>
date: Mon Dec 29 03:08:03 EST 2014
Recombine the event engine objects. They must be in the same bank to work, and defining sections with static banks should only be used to produce an identical rom. They were only split in the first place to minimize the amount of code tahat needed to be rebuilt based on a single constant, which in retrospect was meaningless.
--- a/Makefile
+++ b/Makefile
@@ -18,9 +18,7 @@
home.o \
audio.o \
maps_crystal.o \
-engine/events.o \
-engine/scripting_crystal.o \
-engine/events_2.o \
+engine/events_crystal.o \
engine/credits_crystal.o \
data/egg_moves_crystal.o \
data/evos_attacks_crystal.o \
--- a/engine/events.asm
+++ b/engine/events.asm
@@ -1120,3 +1120,5 @@
end
; 96c56
+INCLUDE "engine/scripting.asm"
+INCLUDE "engine/events_2.asm"
--- a/engine/events_2.asm
+++ b/engine/events_2.asm
@@ -1,9 +1,5 @@
-INCLUDE "includes.asm"
-
-
; More overworld event handling.
-SECTION "Events 2", ROMX, BANK[EVENTS]
Function97c28:: ; 97c28
ld hl, StatusFlags2
--- /dev/null
+++ b/engine/events_crystal.asm
@@ -1,0 +1,2 @@
+INCLUDE "pokecrystal.asm"
+INCLUDE "engine/events.asm"
--- a/engine/scripting.asm
+++ b/engine/scripting.asm
@@ -1,11 +1,6 @@
-INCLUDE "includes.asm"
-
; Event scripting commands.
-SECTION "Event Scripting", ROMX, BANK[EVENTS]
-
-
Function96c56:: ; 96c56
push af
ld a, 1
@@ -13,7 +8,6 @@
pop af
ret
; 96c5e
-
ScriptEvents:: ; 96c5e
call StartScript
--- a/engine/scripting_crystal.asm
+++ /dev/null
@@ -1,3 +1,0 @@
-INCLUDE "pokecrystal.asm"
-INCLUDE "engine/scripting.asm"
-