summaryrefslogtreecommitdiff
path: root/stats
diff options
context:
space:
mode:
authorBryan Bishop <kanzure@gmail.com>2013-12-07 00:50:26 -0800
committerBryan Bishop <kanzure@gmail.com>2013-12-07 00:50:26 -0800
commit0fdbdb43a794358b5ed484114486e2992d520338 (patch)
treeb7e05b39d6cf9eb08eb856a576bf0cc614b45372 /stats
parent112de1c1726669d4e36db015622f74f78dbf2a66 (diff)
parentb4968a9ab7dbe596354351d06458598805d37445 (diff)
Merge pull request #217 from yenatch/more-objects
compile and link multiple objects
Diffstat (limited to 'stats')
-rw-r--r--stats/egg_move_pointers.asm1
-rw-r--r--stats/egg_moves_crystal.asm6
-rw-r--r--stats/evos_attacks_crystal.asm6
-rw-r--r--stats/evos_attacks_pointers.asm1
4 files changed, 14 insertions, 0 deletions
diff --git a/stats/egg_move_pointers.asm b/stats/egg_move_pointers.asm
index 27558ddef..76b9f1a92 100644
--- a/stats/egg_move_pointers.asm
+++ b/stats/egg_move_pointers.asm
@@ -1,3 +1,4 @@
+EggMovePointers: ; 0x23b11
dw BulbasaurEggMoves
dw NoEggMoves
dw NoEggMoves
diff --git a/stats/egg_moves_crystal.asm b/stats/egg_moves_crystal.asm
new file mode 100644
index 000000000..ea9414231
--- /dev/null
+++ b/stats/egg_moves_crystal.asm
@@ -0,0 +1,6 @@
+INCLUDE "pokecrystal.asm"
+INCLUDE "includes.asm"
+
+SECTION "eggmoves", ROMX, BANK[$8]
+INCLUDE "stats/egg_move_pointers.asm"
+INCLUDE "stats/egg_moves.asm"
diff --git a/stats/evos_attacks_crystal.asm b/stats/evos_attacks_crystal.asm
new file mode 100644
index 000000000..1c57e7912
--- /dev/null
+++ b/stats/evos_attacks_crystal.asm
@@ -0,0 +1,6 @@
+INCLUDE "pokecrystal.asm"
+INCLUDE "includes.asm"
+
+SECTION "evosattacks", ROMx, BANK[$10]
+INCLUDE "stats/evos_attacks_pointers.asm"
+INCLUDE "stats/evos_attacks.asm"
diff --git a/stats/evos_attacks_pointers.asm b/stats/evos_attacks_pointers.asm
index 287e7a0d0..6ecd74893 100644
--- a/stats/evos_attacks_pointers.asm
+++ b/stats/evos_attacks_pointers.asm
@@ -2,6 +2,7 @@
; These are grouped together since they're both checked at level-up.
+EvosAttacksPointers: ; 0x425b1
dw BulbasaurEvosAttacks
dw IvysaurEvosAttacks
dw VenusaurEvosAttacks