summaryrefslogtreecommitdiff
path: root/data/data2b.s
diff options
context:
space:
mode:
authorDiegoisawesome <diego@domoreaweso.me>2017-10-06 01:57:52 -0500
committerDiegoisawesome <diego@domoreaweso.me>2017-10-06 01:57:52 -0500
commitd5e7ddddb7f744a2be6410fdf7a333b4010ed478 (patch)
tree7d53b136afca9c063b8d86b5852d9eef597ccce2 /data/data2b.s
parentf41709d3225b5acbeb163ba2e4acc7deec48c0f0 (diff)
Extract baseroms from data2c
Diffstat (limited to 'data/data2b.s')
-rw-r--r--data/data2b.s34
1 files changed, 33 insertions, 1 deletions
diff --git a/data/data2b.s b/data/data2b.s
index 02ef511bf..0d964fcf5 100644
--- a/data/data2b.s
+++ b/data/data2b.s
@@ -23,14 +23,23 @@ gUnknown_082FF3A8:: @ 82FF3A8
.byte 0x00, 0x88, 0x00, 0x02, 0x00, 0x08, 0x00, 0x00
.byte 0x00, 0x90, 0x00, 0x02, 0x00, 0x08, 0x00, 0x00
.byte 0x00, 0x98, 0x00, 0x02, 0x00, 0x08, 0x00, 0x00
+
+ .align 2
+gUnknown_082FF3C8:: @ 82FF3C8
.byte 0x00, 0xa0, 0x00, 0x02, 0x00, 0x08, 0x00, 0x00
.byte 0x00, 0xa8, 0x00, 0x02, 0x00, 0x08, 0x00, 0x00
.byte 0x00, 0xb0, 0x00, 0x02, 0x00, 0x08, 0x00, 0x00
.byte 0x00, 0xb8, 0x00, 0x02, 0x00, 0x08, 0x00, 0x00
+
+ .align 2
+gUnknown_082FF3E8:: @ 82FF3E8
.byte 0x00, 0xc0, 0x00, 0x02, 0x00, 0x08, 0x00, 0x00
.byte 0x00, 0xc8, 0x00, 0x02, 0x00, 0x08, 0x00, 0x00
.byte 0x00, 0xd0, 0x00, 0x02, 0x00, 0x08, 0x00, 0x00
.byte 0x00, 0xd8, 0x00, 0x02, 0x00, 0x08, 0x00, 0x00
+
+ .align 2
+gUnknown_082FF408:: @ 82FF408
.byte 0x00, 0xe0, 0x00, 0x02, 0x00, 0x08, 0x00, 0x00
.byte 0x00, 0xe8, 0x00, 0x02, 0x00, 0x08, 0x00, 0x00
.byte 0x00, 0xf0, 0x00, 0x02, 0x00, 0x08, 0x00, 0x00
@@ -42,32 +51,53 @@ gUnknown_082FF428:: @ 82FF428
obj_frame_tiles gTrainerBackPic_Brendan + 0x0800, 0x0800
obj_frame_tiles gTrainerBackPic_Brendan + 0x1000, 0x0800
obj_frame_tiles gTrainerBackPic_Brendan + 0x1800, 0x0800
+
+ .align 2
+gUnknown_082FF448:: @ 82FF448
obj_frame_tiles gTrainerBackPic_May, 0x0800
obj_frame_tiles gTrainerBackPic_May + 0x0800, 0x0800
obj_frame_tiles gTrainerBackPic_May + 0x1000, 0x0800
obj_frame_tiles gTrainerBackPic_May + 0x1800, 0x0800
+
+ .align 2
+gUnknown_082FF468:: @ 82FF468
obj_frame_tiles gTrainerBackPic_Red, 0x0800
obj_frame_tiles gTrainerBackPic_Red + 0x0800, 0x0800
obj_frame_tiles gTrainerBackPic_Red + 0x1000, 0x0800
obj_frame_tiles gTrainerBackPic_Red + 0x1800, 0x0800
obj_frame_tiles gTrainerBackPic_Red + 0x2000, 0x0800
+
+ .align 2
+gUnknown_082FF490:: @ 82FF490
obj_frame_tiles gTrainerBackPic_Leaf, 0x0800
obj_frame_tiles gTrainerBackPic_Leaf + 0x0800, 0x0800
obj_frame_tiles gTrainerBackPic_Leaf + 0x1000, 0x0800
obj_frame_tiles gTrainerBackPic_Leaf + 0x1800, 0x0800
obj_frame_tiles gTrainerBackPic_Leaf + 0x2000, 0x0800
+
+ .align 2
+gUnknown_082FF4B8:: @ 82FF4B8
obj_frame_tiles gTrainerBackPic_RubySapphireBrendan, 0x0800
obj_frame_tiles gTrainerBackPic_RubySapphireBrendan + 0x0800, 0x0800
obj_frame_tiles gTrainerBackPic_RubySapphireBrendan + 0x1000, 0x0800
obj_frame_tiles gTrainerBackPic_RubySapphireBrendan + 0x1800, 0x0800
+
+ .align 2
+gUnknown_082FF4D8:: @ 82FF4D8
obj_frame_tiles gTrainerBackPic_RubySapphireMay, 0x0800
obj_frame_tiles gTrainerBackPic_RubySapphireMay + 0x0800, 0x0800
obj_frame_tiles gTrainerBackPic_RubySapphireMay + 0x1000, 0x0800
obj_frame_tiles gTrainerBackPic_RubySapphireMay + 0x1800, 0x0800
+
+ .align 2
+gUnknown_082FF4F8:: @ 82FF4F8
obj_frame_tiles gTrainerBackPic_Wally, 0x0800
obj_frame_tiles gTrainerBackPic_Wally + 0x0800, 0x0800
obj_frame_tiles gTrainerBackPic_Wally + 0x1000, 0x0800
obj_frame_tiles gTrainerBackPic_Wally + 0x1800, 0x0800
+
+ .align 2
+gUnknown_082FF518:: @ 82FF518
obj_frame_tiles gTrainerBackPic_Steven, 0x0800
obj_frame_tiles gTrainerBackPic_Steven + 0x0800, 0x0800
obj_frame_tiles gTrainerBackPic_Steven + 0x1000, 0x0800
@@ -4478,7 +4508,9 @@ gUnknown_08305D0C:: @ 8305D0C
@ 8305DCC
.include "data/enemy_mon_elevation.inc"
- .incbin "baserom.gba", 0x305f68, 0x3b44
+ .incbin "baserom.gba", 0x305f68, 0x2d54
+
+ .incbin "baserom.gba", 0x308cbc, 0xdf0
gUnknown_08309AAC:: @ 8309AAC
.incbin "baserom.gba", 0x309aac, 0x6e0