summaryrefslogtreecommitdiff
path: root/data/data2.s
diff options
context:
space:
mode:
authorYamaArashi <shadow962@live.com>2015-10-25 22:56:06 -0700
committerYamaArashi <shadow962@live.com>2015-10-25 22:56:06 -0700
commit832b0b525f9d142b6280f93ca8d511b54fe12880 (patch)
tree0cb492985dbfc73628de338cc9aab9dee4a575c2 /data/data2.s
parent269cda7ac933e5418313a0c2b4c8b149d7f816ee (diff)
wild pokemon data
- Thanks to Sanqui for many Ruby/Sapphire names. https://github.com/Sanqui/romhacking/blob/master/pokemon/location-area-names
Diffstat (limited to 'data/data2.s')
-rw-r--r--data/data2.s8
1 files changed, 5 insertions, 3 deletions
diff --git a/data/data2.s b/data/data2.s
index 59ea0efc5..dfafefe0d 100644
--- a/data/data2.s
+++ b/data/data2.s
@@ -3393,10 +3393,12 @@ gUnknown_085507B4: ; 85507B4
.incbin "base_emerald.gba", 0x5507b4, 0x18
gUnknown_085507CC: ; 85507CC
- .incbin "base_emerald.gba", 0x5507cc, 0x257c
+ .incbin "base_emerald.gba", 0x5507cc, 0x18
-gUnknown_08552D48: ; 8552D48
- .incbin "base_emerald.gba", 0x552d48, 0xb4c
+; 85507E4
+ .include "data/wild_mons.s"
+
+ .incbin "base_emerald.gba", 0x55370c, 0x188
gUnknown_08553894: ; 8553894
.incbin "base_emerald.gba", 0x553894, 0x180