pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2024-09-09 09:51:34 -07:00
Code Issues Packages Projects Releases Wiki Activity

Recombine the event engine objects.

Browse Source 
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.
This commit is contained in:
yenatch 2014-12-29 08:08:03 -08:00
parent 346844a613
commit 1a2784d414
6 changed files with 5 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -18,9 +18,7 @@ lib/mobile/main.o \
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 \

2
engine/events.asm
View File

@ -1120,3 +1120,5 @@ UnknownScript_0x96c4f: ; 96c4f
end
; 96c56
INCLUDE "engine/scripting.asm"
INCLUDE "engine/events_2.asm"

4
engine/events_2.asm
View File

@ -1,9 +1,5 @@
INCLUDE "includes.asm"
; More overworld event handling.
SECTION "Events 2", ROMX, BANK[EVENTS]
Function97c28:: ; 97c28
ld hl, StatusFlags2

2
engine/events_crystal.asm Normal file
View File

@ -0,0 +1,2 @@
INCLUDE "pokecrystal.asm"
INCLUDE "engine/events.asm"

6
engine/scripting.asm
View File

@ -1,11 +1,6 @@
INCLUDE "includes.asm"
; Event scripting commands.
SECTION "Event Scripting", ROMX, BANK[EVENTS]
Function96c56:: ; 96c56
push af
ld a, 1
@ -14,7 +9,6 @@ Function96c56:: ; 96c56
ret
; 96c5e
ScriptEvents:: ; 96c5e
call StartScript
.loop

3
engine/scripting_crystal.asm
View File

@ -1,3 +0,0 @@
INCLUDE "pokecrystal.asm"
INCLUDE "engine/scripting.asm"