summaryrefslogtreecommitdiff
path: root/data/data2.s
diff options
context:
space:
mode:
authorYamaArashi <shadow962@live.com>2015-10-17 23:01:19 -0700
committerYamaArashi <shadow962@live.com>2015-10-17 23:01:19 -0700
commit09084cf977dcc643076a8b8cb91acb7cb75c84be (patch)
tree0ebece60934173c4368fb2ffaed0db1ae8a3338c /data/data2.s
parent147ba4adc0af42dc2a1187a939eb1d9a6c14cbb0 (diff)
battle pyramid wild pokemon
Diffstat (limited to 'data/data2.s')
-rw-r--r--data/data2.s10
1 files changed, 5 insertions, 5 deletions
diff --git a/data/data2.s b/data/data2.s
index eb7e09b55..94bc46b60 100644
--- a/data/data2.s
+++ b/data/data2.s
@@ -10636,13 +10636,13 @@ gUnknown_086126AC: ; 86126AC
.incbin "base_emerald.gba", 0x6126ac, 0x2
gUnknown_086126AE: ; 86126AE
- .incbin "base_emerald.gba", 0x6126ae, 0x782
+ .incbin "base_emerald.gba", 0x6126ae, 0x2
-gUnknown_08612E30: ; 8612E30
- .incbin "base_emerald.gba", 0x612e30, 0x7d0
+; 86126B0
+ .include "data/battle_frontier/battle_pyramid_level_50_wild_mons.s"
-gUnknown_08613600: ; 8613600
- .incbin "base_emerald.gba", 0x613600, 0x50
+; 8612E80
+ .include "data/battle_frontier/battle_pyramid_open_level_wild_mons.s"
gUnknown_08613650: ; 8613650
.incbin "base_emerald.gba", 0x613650, 0x5