Move includes into object bases instead of their version wrappers.

This commit is contained in:
yenatch 2014-02-05 19:07:24 -05:00
parent 370d5f71f2
commit ddc665a31a
12 changed files with 34 additions and 24 deletions

View File

@ -1,3 +1,7 @@
INCLUDE "includes.asm"
SECTION "Credits", ROMX, BANK[CREDITS]
const_def
const SATOSHI_TAJIRI

View File

@ -1,6 +1,3 @@
INCLUDE "pokecrystal.asm"
INCLUDE "includes.asm"
SECTION "Credits", ROMX, BANK[CREDITS]
INCLUDE "engine/credits.asm"

View File

@ -1,6 +1,11 @@
INCLUDE "includes.asm"
; Event scripting commands.
SECTION "Event Scripting", ROMX, BANK[EVENTS]
Function96c56:: ; 96c56
push af
ld a, 1

View File

@ -1,7 +1,3 @@
INCLUDE "pokecrystal.asm"
INCLUDE "includes.asm"
SECTION "Event Scripting", ROMX, BANK[EVENTS]
INCLUDE "engine/scripting.asm"

View File

@ -1,3 +1,5 @@
INCLUDE "includes.asm"
SECTION "Map Headers", ROMX, BANK[MAP_HEADERS]

View File

@ -1,5 +1,3 @@
INCLUDE "pokecrystal.asm"
INCLUDE "includes.asm"
INCLUDE "maps.asm"

View File

@ -1,9 +1,18 @@
INCLUDE "includes.asm"
SECTION "Egg Moves", ROMX, BANK[EGG_MOVES]
; All instances of Charm, Steel Wing, Sweet Scent, and Lovely Kiss were
; removed from egg move lists in Crystal, because they are also TMs.
; Staryu's egg moves were removed in Crystal, because Staryu is genderless
; and can only breed with Ditto.
INCLUDE "stats/egg_move_pointers.asm"
BulbasaurEggMoves:
db LIGHT_SCREEN
db SKULL_BASH

View File

@ -1,8 +1,3 @@
INCLUDE "pokecrystal.asm"
INCLUDE "includes.asm"
SECTION "Egg Moves", ROMX, BANK[EGG_MOVES]
INCLUDE "stats/egg_move_pointers.asm"
INCLUDE "stats/egg_moves.asm"

View File

@ -1,3 +1,12 @@
INCLUDE "includes.asm"
SECTION "Evolutions and Attacks", ROMX, BANK[EVOS_ATTACKS]
INCLUDE "stats/evos_attacks_pointers.asm"
EvosAttacks::
BulbasaurEvosAttacks:

View File

@ -1,8 +1,3 @@
INCLUDE "pokecrystal.asm"
INCLUDE "includes.asm"
SECTION "Evolutions and Attacks", ROMX, BANK[EVOS_ATTACKS]
INCLUDE "stats/evos_attacks_pointers.asm"
INCLUDE "stats/evos_attacks.asm"

View File

@ -1,3 +1,5 @@
INCLUDE "includes.asm"
SECTION "Pokedex Entries 001-064", ROMX, BANK[POKEDEX_ENTRIES_1]

View File

@ -1,5 +1,3 @@
INCLUDE "pokecrystal.asm"
INCLUDE "includes.asm"
INCLUDE "stats/pokedex/entries.asm"