ref: 709f495cdffbb7f70367d11804fc0053b79f74aa
parent: ff6306400b2272a863fb55edbc00c6a22f24230f
parent: ddc665a31ac203315c0359b5ef161b731c5c5eda
author: Bryan Bishop <[email protected]>
date: Thu Feb 6 15:02:27 EST 2014
Merge pull request #230 from yenatch/master the calm before the storm
--- a/compare.sh
+++ b/compare.sh
@@ -8,4 +8,4 @@
hexdump -C pokecrystal.gbc > pokecrystal.txt
-diff baserom.txt pokecrystal.txt | less
+diff -u baserom.txt pokecrystal.txt | less
--- 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
--- 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"
--- a/engine/scripting.asm
+++ b/engine/scripting.asm
@@ -1,4 +1,9 @@
+INCLUDE "includes.asm"
+
; Event scripting commands.
+
+
+SECTION "Event Scripting", ROMX, BANK[EVENTS]
Function96c56:: ; 96c56
--- 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"
+
--- a/maps.asm
+++ b/maps.asm
@@ -1,3 +1,5 @@
+INCLUDE "includes.asm"
+
SECTION "Map Headers", ROMX, BANK[MAP_HEADERS]
--- a/maps_crystal.asm
+++ b/maps_crystal.asm
@@ -1,5 +1,3 @@
INCLUDE "pokecrystal.asm"
-INCLUDE "includes.asm"
-
INCLUDE "maps.asm"
--- a/stats/egg_moves.asm
+++ b/stats/egg_moves.asm
@@ -1,8 +1,17 @@
+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
--- a/stats/egg_moves_crystal.asm
+++ b/stats/egg_moves_crystal.asm
@@ -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"
+
--- a/stats/evos_attacks.asm
+++ b/stats/evos_attacks.asm
@@ -1,3 +1,12 @@
+INCLUDE "includes.asm"
+
+
+SECTION "Evolutions and Attacks", ROMX, BANK[EVOS_ATTACKS]
+
+
+INCLUDE "stats/evos_attacks_pointers.asm"
+
+
EvosAttacks::
BulbasaurEvosAttacks:
--- a/stats/evos_attacks_crystal.asm
+++ b/stats/evos_attacks_crystal.asm
@@ -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"
+
--- a/stats/pokedex/entries.asm
+++ b/stats/pokedex/entries.asm
@@ -1,3 +1,5 @@
+INCLUDE "includes.asm"
+
SECTION "Pokedex Entries 001-064", ROMX, BANK[POKEDEX_ENTRIES_1]
--- a/stats/pokedex/entries_crystal.asm
+++ b/stats/pokedex/entries_crystal.asm
@@ -1,5 +1,3 @@
INCLUDE "pokecrystal.asm"
-INCLUDE "includes.asm"
-
INCLUDE "stats/pokedex/entries.asm"