diff options
| author | Bryan Bishop <kanzure@gmail.com> | 2014-02-06 20:02:27 -0600 |
|---|---|---|
| committer | Bryan Bishop <kanzure@gmail.com> | 2014-02-06 20:02:27 -0600 |
| commit | 709f495cdffbb7f70367d11804fc0053b79f74aa (patch) | |
| tree | 5e9407cc74146a31e5ce2200568333aa51b532c7 /engine | |
| parent | ff6306400b2272a863fb55edbc00c6a22f24230f (diff) | |
| parent | ddc665a31ac203315c0359b5ef161b731c5c5eda (diff) | |
Merge pull request #230 from yenatch/master
the calm before the storm
Diffstat (limited to 'engine')
| -rw-r--r-- | engine/credits.asm | 4 | ||||
| -rw-r--r-- | engine/credits_crystal.asm | 3 | ||||
| -rw-r--r-- | engine/scripting.asm | 5 | ||||
| -rw-r--r-- | engine/scripting_crystal.asm | 6 |
4 files changed, 10 insertions, 8 deletions
diff --git a/engine/credits.asm b/engine/credits.asm index fabd409da..42144c5d2 100644 --- a/engine/credits.asm +++ b/engine/credits.asm @@ -1,3 +1,7 @@ +INCLUDE "includes.asm" + + +SECTION "Credits", ROMX, BANK[CREDITS] const_def const SATOSHI_TAJIRI diff --git a/engine/credits_crystal.asm b/engine/credits_crystal.asm index 76dc86319..f417985e9 100644 --- a/engine/credits_crystal.asm +++ b/engine/credits_crystal.asm @@ -1,6 +1,3 @@ INCLUDE "pokecrystal.asm" -INCLUDE "includes.asm" - -SECTION "Credits", ROMX, BANK[CREDITS] INCLUDE "engine/credits.asm" diff --git a/engine/scripting.asm b/engine/scripting.asm index 5f1612677..06ca48d66 100644 --- a/engine/scripting.asm +++ b/engine/scripting.asm @@ -1,6 +1,11 @@ +INCLUDE "includes.asm" + ; Event scripting commands. +SECTION "Event Scripting", ROMX, BANK[EVENTS] + + Function96c56:: ; 96c56 push af ld a, 1 diff --git a/engine/scripting_crystal.asm b/engine/scripting_crystal.asm index 6d80455a0..8df277248 100644 --- a/engine/scripting_crystal.asm +++ b/engine/scripting_crystal.asm @@ -1,7 +1,3 @@ INCLUDE "pokecrystal.asm" -INCLUDE "includes.asm" - - -SECTION "Event Scripting", ROMX, BANK[EVENTS] - INCLUDE "engine/scripting.asm" + |