more baserom incbins

10 files changed, 180 insertions, 16 deletions

diff --git a/data/field_tasks.s b/data/field_tasks.s
index d7de1fe16..122e089e6 100644
--- a/data/field_tasks.s
+++ b/data/field_tasks.s
@@ -15,16 +15,51 @@ gUnknown_08376364:: @ 8376364
 	.4byte PerStepCallback_806A07C
 
 gUnknown_08376384:: @ 8376384
-	.incbin "baserom.gba", 0x00376384, 0x20
+	.byte   0,  0,0x59,  2,  0,  1,0x61,  2
+	.byte   0, -1,0x59,  2,  0,  0,0x61,  2
+	.byte   0,  0,0x52,  2,  1,  0,0x53,  2
+	.byte  -1,  0,0x52,  2,  0,  0,0x53,  2
 
 gUnknown_083763A4:: @ 83763A4
-	.incbin "baserom.gba", 0x003763a4, 0x20
+	.byte   0,  0,0x5A,  2,  0,  1,0x62,  2
+	.byte   0, -1,0x5A,  2,  0,  0,0x62,  2
+	.byte   0,  0,0x54,  2,  1,  0,0x55,  2
+	.byte  -1,  0,0x54,  2,  0,  0,0x55,  2
 
 gUnknown_083763C4:: @ 83763C4
-	.incbin "baserom.gba", 0x003763c4, 0x20
+	.byte   0,  0,0x58,  2,  0,  1,0x60,  2
+	.byte   0, -1,0x58,  2,  0,  0,0x60,  2
+	.byte   0,  0,0x50,  2,  1,  0,0x51,  2
+	.byte  -1,  0,0x50,  2,  0,  0,0x51,  2
 
+	.align 1
 gUnknown_083763E4:: @ 83763E4
-	.incbin "baserom.gba", 0x003763e4, 0x34
+	.2byte      0
+	.2byte      0
+	.2byte      0
+	.2byte      0
+	.2byte      0
+	.2byte      0
+	.2byte 0x4001
+	.2byte 0x4002
+	.2byte 0x4003
+	.2byte 0x4004
+	.2byte      0
+	.2byte      0
+	.2byte 0x4005
+	.2byte 0x4006
+	.2byte 0x4007
+	.2byte      0
+	.2byte      0
+	.2byte 0x4008
+	.2byte 0x4009
+	.2byte 0x400A
+	.2byte      0
+	.2byte      0
+	.2byte      0
+	.2byte      0
+	.2byte      0
+	.2byte      0
 
 	.align 1
 gUnknown_08376418:: @ 8376418
diff --git a/data/matsuda_debug_menu.s b/data/matsuda_debug_menu.s
index b7da90fd4..d1ce9fc3d 100644
--- a/data/matsuda_debug_menu.s
+++ b/data/matsuda_debug_menu.s
@@ -50,7 +50,10 @@ Unknown_083C924E:
 	.incbin "graphics/unknown/ball.gbapal"
 
 gUnknown_083C926E:: @ 83C926E
-	.incbin "baserom.gba", 0x003c926e, 0x8
+	.byte   2,  0
+	.byte  17,  0
+	.byte   2,  2
+	.byte  17,  2
 
 gMatsudaDebugMenuContestTopLeft:: @ 83C9276
 	.byte 0, 6
@@ -61,10 +64,18 @@ gMatsudaDebugMenuContestTopLeft:: @ 83C9276
 	.byte 15, 10
 
 gUnknown_083C9282:: @ 83C9282
-	.incbin "baserom.gba", 0x003c9282, 0xc
+	.byte   7,  6
+	.byte  22,  6
+	.byte   7,  8
+	.byte  22,  8
+	.byte   7, 10
+	.byte  22, 10
 
 gUnknown_083C928E:: @ 83C928E
-	.incbin "baserom.gba", 0x003c928e, 0x8
+	.byte   2, 14
+	.byte  17, 14
+	.byte   2, 16
+	.byte  17, 16
 
 gUnknown_083C9296:: @ 83C9296
 	.byte 0x08, 0x80, 0x08, 0x80, 0x10, 0x10, 0x30, 0xA8, 0x30, 0xA8, 0x30, 0xA8, 0x08, 0x80, 0x08, 0x80, 0x10, 0x88
@@ -178,5 +189,9 @@ gMatsudaDebugMenuTextList3:: @ 83C93F0
 	.4byte MatsudaDebugMenuText_Slateport @ Hyper
 	.4byte MatsudaDebugMenuText_Lilycove @ Master
 
+@ OamData
+	.align 2
 gUnknown_083C9400:: @ 83C9400
-	.incbin "baserom.gba", 0x003c9400, 0x8
+	.2byte 0x4000
+	.2byte 0x4000
+	.2byte 0xF3FF
diff --git a/data/pokedex_cry_screen.s b/data/pokedex_cry_screen.s
index 70e356410..1eb3086e9 100644
--- a/data/pokedex_cry_screen.s
+++ b/data/pokedex_cry_screen.s
@@ -11,12 +11,15 @@ CryMeterNeedlePalette: @ 83FA65C
 CryMeterNeedleTiles: @ 83FA67C
 	.incbin "graphics/pokedex/cry_meter_needle.4bpp"
 
+	.align 1
 gUnknown_083FAE7C:: @ 83FAE7C
-	.incbin "baserom.gba", 0x003fae7c, 0xa0
+	.incbin "graphics/pokedex/cry_meter_map.bin"
 
+	.align 1
 gUnknown_083FAF1C:: @ 83FAF1C
 	.incbin "graphics/pokedex/cry_meter.gbapal"
 
+	.align 2
 gUnknown_083FAF3C:: @ 83FAF3C
 	.incbin "graphics/pokedex/cry_meter.4bpp.lz"
 
@@ -34,17 +37,52 @@ gUnknown_083FB274:: @ 83FB274
 	.align 2
 	.4byte 0x201C000
 
+	.align 1
 gUnknown_083FB6F8:: @ 83FB6F8
-	.incbin "baserom.gba", 0x003fb6f8, 0x20
+	.incbin "graphics/pokedex/83FB6F8.gbapal"
 
 gUnknown_083FB718:: @ 83FB718
-	.incbin "baserom.gba", 0x003fb718, 0x20
+	.byte 0x11
+	.byte 0x11
+	.byte 0x11
+	.byte 0x11
+	.byte 0x22
+	.byte 0x22
+	.byte 0x22
+	.byte 0x22
+	.byte 0x11
+	.byte 0x11
+	.byte 0x11
+	.byte 0x11
+	.byte 0x22
+	.byte 0x22
+	.byte 0x22
+	.byte 0x22
+	.byte 0x11
+	.byte 0x11
+	.byte 0x11
+	.byte 0x11
+	.byte 0x22
+	.byte 0x22
+	.byte 0x22
+	.byte 0x22
+	.byte 0x11
+	.byte 0x11
+	.byte 0x11
+	.byte 0x11
+	.byte 0x22
+	.byte 0x22
+	.byte 0x22
+	.byte 0x22
 
 gUnknown_083FB738:: @ 83FB738
 	.byte 0xF0, 0x0F
 
 gUnknown_083FB73A:: @ 83FB73A
-	.incbin "baserom.gba", 0x003fb73a, 0x26
+	.byte 0x0F,0x0E,0x0D,0x0C,0x0B,0x0A,0x09,0x08,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F
+	.byte 0xF0,0xE0,0xD0,0xC0,0xB0,0xA0,0x90,0x80,0x80,0x90,0xA0,0xB0,0xC0,0xD0,0xE0,0xF0
+
+	.byte 0, 0, 0, 200, 1, 2
 
 	.align 2
 gSpriteAnim_83FB760:: @ 83FB760
diff --git a/data/trainer_card.s b/data/trainer_card.s
index e73af87a2..75e0041dd 100644
--- a/data/trainer_card.s
+++ b/data/trainer_card.s
@@ -46,17 +46,17 @@ gUnknown_083B5EF8:: @ 83B5EF8
 	.4byte gMenuTrainerCard4Star_Pal
 
 gUnknown_083B5F0C:: @ 83B5F0C
-	.incbin "baserom.gba", 0x003b5f0c, 0x20
+	.incbin "graphics/trainer_card/83B5F0C.gbapal"
 
 	.align 2
 gBadgesPalette:: @ 83B5F2C
 	.incbin "graphics/trainer_card/badges.gbapal"
 
 gUnknown_083B5F4C:: @ 83B5F4C
-	.incbin "baserom.gba", 0x003b5f4c, 0x20
+	.incbin "graphics/trainer_card/83B5F4C.gbapal"
 
 gUnknown_083B5F6C:: @ 83B5F6C
-	.incbin "baserom.gba", 0x003b5f6c, 0x20
+	.incbin "graphics/trainer_card/83B5F6C.gbapal"
 
 gUnknown_083B5F8C:: @ 83B5F8C
-	.incbin "baserom.gba", 0x003b5f8c, 0x40
+	.incbin "graphics/trainer_card/83B5F8C_map.bin"
diff --git a/graphics/pokedex/83FB6F8.pal b/graphics/pokedex/83FB6F8.pal
new file mode 100644
index 000000000..969c38cbd
--- /dev/null
+++ b/graphics/pokedex/83FB6F8.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 148
+0 131 131
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+148 148 255
+156 156 255
+172 172 255
+189 189 255
+205 205 255
+222 222 255
+238 238 255
+255 255 255
diff --git a/graphics/pokedex/cry_meter_map.bin b/graphics/pokedex/cry_meter_map.bin
new file mode 100644
index 000000000..cd58849a4
--- /dev/null
+++ b/graphics/pokedex/cry_meter_map.bin
diff --git a/graphics/trainer_card/83B5F0C.pal b/graphics/trainer_card/83B5F0C.pal
new file mode 100644
index 000000000..9df82c665
--- /dev/null
+++ b/graphics/trainer_card/83B5F0C.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+230 123 139
+164 49 115
+0 0 0
+0 0 0
diff --git a/graphics/trainer_card/83B5F4C.pal b/graphics/trainer_card/83B5F4C.pal
new file mode 100644
index 000000000..485a85f79
--- /dev/null
+++ b/graphics/trainer_card/83B5F4C.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+139 98 115
+246 197 0
+205 164 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/graphics/trainer_card/83B5F6C.pal b/graphics/trainer_card/83B5F6C.pal
new file mode 100644
index 000000000..f990e1eaf
--- /dev/null
+++ b/graphics/trainer_card/83B5F6C.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+255 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+255 0 255
+255 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/graphics/trainer_card/83B5F8C_map.bin b/graphics/trainer_card/83B5F8C_map.bin
new file mode 100644
index 000000000..0cbe2035c
--- /dev/null
+++ b/graphics/trainer_card/83B5F8C_map.bin