From a64b5cd31fdc568bf8228be94fd4af748483938b Mon Sep 17 00:00:00 2001 From: Diegoisawesome Date: Sat, 23 Dec 2017 01:16:45 -0600 Subject: [PATCH] Extract start of battle_frontier_2 --- asm/battle_frontier_2.s | 8 +- data/battle_frontier_2.s | 342 ++++++++++++++++++++++++---- data/starter_choose.s | 5 +- graphics/unknown/unknown_60F13C.pal | 19 ++ graphics/unknown/unknown_60F15C.pal | 19 ++ graphics/unknown/unknown_60F17C.pal | 35 +++ graphics/unknown/unknown_60F1BC.png | Bin 0 -> 211 bytes graphics/unknown/unknown_60F3BC.png | Bin 0 -> 115 bytes graphics/unknown/unknown_60F43C.png | Bin 0 -> 75 bytes graphics/unknown/unknown_60F53C.png | Bin 0 -> 72 bytes graphics/unknown/unknown_60F63C.png | Bin 0 -> 99 bytes graphics/unknown/unknown_60F6BC.png | Bin 0 -> 77 bytes graphics/unknown/unknown_60F7BC.png | Bin 0 -> 110 bytes graphics/unknown/unknown_60F83C.png | Bin 0 -> 82 bytes graphics/unknown/unknown_60F93C.png | Bin 0 -> 82 bytes graphics/unknown/unknown_60FA3C.png | Bin 0 -> 98 bytes graphics/unknown/unknown_61023C.bin | Bin 0 -> 256 bytes graphics/unknown/unknown_61033C.png | Bin 0 -> 78 bytes graphics/unknown/unknown_61039C.pal | 19 ++ graphics/unknown/unknown_61046C.pal | 8 + 20 files changed, 409 insertions(+), 46 deletions(-) create mode 100644 graphics/unknown/unknown_60F13C.pal create mode 100644 graphics/unknown/unknown_60F15C.pal create mode 100644 graphics/unknown/unknown_60F17C.pal create mode 100644 graphics/unknown/unknown_60F1BC.png create mode 100644 graphics/unknown/unknown_60F3BC.png create mode 100644 graphics/unknown/unknown_60F43C.png create mode 100644 graphics/unknown/unknown_60F53C.png create mode 100644 graphics/unknown/unknown_60F63C.png create mode 100644 graphics/unknown/unknown_60F6BC.png create mode 100644 graphics/unknown/unknown_60F7BC.png create mode 100644 graphics/unknown/unknown_60F83C.png create mode 100644 graphics/unknown/unknown_60F93C.png create mode 100644 graphics/unknown/unknown_60FA3C.png create mode 100644 graphics/unknown/unknown_61023C.bin create mode 100644 graphics/unknown/unknown_61033C.png create mode 100644 graphics/unknown/unknown_61039C.pal create mode 100644 graphics/unknown/unknown_61046C.pal diff --git a/asm/battle_frontier_2.s b/asm/battle_frontier_2.s index a63267e489..00af0887d4 100755 --- a/asm/battle_frontier_2.s +++ b/asm/battle_frontier_2.s @@ -11329,7 +11329,7 @@ _081A03E6: bls _081A03E6 movs r5, 0 ldr r7, =gSaveBlock2Ptr - ldr r6, =gUnknown_086109A4 + ldr r6, =gUnknown_08610970+0x34 _081A0416: ldr r0, [r7] mov r12, r0 @@ -11490,7 +11490,7 @@ _081A0540: mov r12, r1 adds r5, r3, 0 adds r5, 0xB0 - ldr r0, =gUnknown_086109A4 + ldr r0, =gUnknown_08610970+0x34 mov r8, r0 _081A0560: adds r0, r3, 0 @@ -17495,7 +17495,7 @@ _081A38A8: lsrs r3, r0, 24 movs r0, 0x58 muls r0, r3 - ldr r1, =gUnknown_086109BA + ldr r1, =gUnknown_08610970+0x4A _081A38C4: adds r0, r1 bl ConvertBattleFrontierTrainerSpeechToString @@ -17516,7 +17516,7 @@ _081A38D4: lsrs r3, r0, 27 movs r0, 0x58 muls r0, r3 - ldr r1, =gUnknown_086109BA + ldr r1, =gUnknown_08610970+0x4A adds r0, r1 bl ConvertBattleFrontierTrainerSpeechToString _081A38F8: diff --git a/data/battle_frontier_2.s b/data/battle_frontier_2.s index 74abbe788a..745612c6b5 100644 --- a/data/battle_frontier_2.s +++ b/data/battle_frontier_2.s @@ -5,117 +5,377 @@ .section .rodata + .align 2 gUnknown_0860F13C:: @ 860F13C - .incbin "baserom.gba", 0x60f13c, 0x1100 + .incbin "graphics/unknown/unknown_60F13C.gbapal" + .align 2 +gUnknown_0860F15C:: @ 860F15C + .incbin "graphics/unknown/unknown_60F15C.gbapal" + + .align 2 +gUnknown_0860F17C:: @ 860F17C + .incbin "graphics/unknown/unknown_60F17C.gbapal" + + .align 2 +gUnknown_0860F1BC:: @ 860F1BC + .incbin "graphics/unknown/unknown_60F1BC.4bpp" + + .align 2 +gUnknown_0860F3BC:: @ 860F3BC + .incbin "graphics/unknown/unknown_60F3BC.4bpp" + + .align 2 +gUnknown_0860F43C:: @ 860F43C + .incbin "graphics/unknown/unknown_60F43C.4bpp" + + .align 2 +gUnknown_0860F53C:: @ 860F53C + .incbin "graphics/unknown/unknown_60F53C.4bpp" + + .align 2 +gUnknown_0860F63C:: @ 860F63C + .incbin "graphics/unknown/unknown_60F63C.4bpp" + + .align 2 +gUnknown_0860F6BC:: @ 860F6BC + .incbin "graphics/unknown/unknown_60F6BC.4bpp" + + .align 2 +gUnknown_0860F7BC:: @ 860F7BC + .incbin "graphics/unknown/unknown_60F7BC.4bpp" + + .align 2 +gUnknown_0860F83C:: @ 860F83C + .incbin "graphics/unknown/unknown_60F83C.4bpp" + + .align 2 +gUnknown_0860F93C:: @ 860F93C + .incbin "graphics/unknown/unknown_60F93C.4bpp" + + .align 2 +gUnknown_0860FA3C:: @ 860FA3C + .incbin "graphics/unknown/unknown_60FA3C.4bpp" + + .align 2 gUnknown_0861023C:: @ 861023C - .incbin "baserom.gba", 0x61023c, 0x100 + .incbin "graphics/unknown/unknown_61023C.bin" + .align 2 gUnknown_0861033C:: @ 861033C - .incbin "baserom.gba", 0x61033c, 0x60 + .incbin "graphics/unknown/unknown_61033C.4bpp" + .align 2 gUnknown_0861039C:: @ 861039C - .incbin "baserom.gba", 0x61039c, 0x20 + .incbin "graphics/unknown/unknown_61039C.gbapal" + .align 2 gUnknown_086103BC:: @ 86103BC - .incbin "baserom.gba", 0x6103bc, 0x28 + obj_tiles gUnknown_0860F3BC, 0x0080, 0x0065 + obj_tiles gUnknown_0860F43C, 0x0100, 0x0066 + obj_tiles gUnknown_0860F53C, 0x0100, 0x0067 + obj_tiles gUnknown_0860FA3C, 0x0800, 0x006d + null_obj_tiles + .align 2 gUnknown_086103E4:: @ 86103E4 - .incbin "baserom.gba", 0x6103e4, 0x10 + obj_tiles gUnknown_085B18AC, 0x0800, 0x0064 + null_obj_tiles + .align 2 gUnknown_086103F4:: @ 86103F4 - .incbin "baserom.gba", 0x6103f4, 0x28 + obj_pal gUnknown_0860F13C, 0x0064 + obj_pal gUnknown_0860F15C, 0x0065 + obj_pal gUnknown_0860F17C, 0x0066 + obj_pal gUnknown_0861039C, 0x0067 + null_obj_pal + .align 2 gUnknown_0861041C:: @ 861041C - .incbin "baserom.gba", 0x61041c, 0xc + .4byte sub_819BCCC + .4byte sub_819BC30 + .4byte sub_819BCD0 + .align 2 gUnknown_08610428:: @ 8610428 - .incbin "baserom.gba", 0x610428, 0xc + .4byte 0x00000180, 0x00003195, 0x000021bb + .align 2 gUnknown_08610434:: @ 8610434 - .incbin "baserom.gba", 0x610434, 0x38 + window_template 0x00, 0x00, 0x02, 0x0c, 0x02, 0x0f, 0x0001 + window_template 0x00, 0x13, 0x02, 0x0b, 0x02, 0x0e, 0x0019 + window_template 0x00, 0x00, 0x0f, 0x14, 0x03, 0x0f, 0x002f + window_template 0x00, 0x16, 0x0e, 0x08, 0x06, 0x0f, 0x006b + window_template 0x00, 0x16, 0x0e, 0x08, 0x04, 0x0f, 0x009b + window_template 0x00, 0x0f, 0x00, 0x0f, 0x02, 0x0f, 0x00bb + window_template_terminator + .align 1 gUnknown_0861046C:: @ 861046C - .incbin "baserom.gba", 0x61046c, 0xa + .incbin "graphics/unknown/unknown_61046C.gbapal" gUnknown_08610476:: @ 8610476 - .incbin "baserom.gba", 0x610476, 0x3 + .byte 0x00, 0x02, 0x00 gUnknown_08610479:: @ 8610479 - .incbin "baserom.gba", 0x610479, 0x15f + .byte 0x00, 0x04, 0x00 + .align 2 +gUnknown_0861047C:: @ 861047C + .byte 0x00, 0x00, 0x00, 0x80, 0x00, 0x0c, 0x00, 0x00 + + .align 2 +gUnknown_08610484:: @ 8610484 + .byte 0x00, 0x00, 0x00, 0x40, 0x00, 0x0c, 0x00, 0x00 + + .align 2 +gUnknown_0861048C:: @ 861048C + .byte 0x00, 0x40, 0x00, 0x80, 0x00, 0x08, 0x00, 0x00 + + .align 2 +gUnknown_08610494:: @ 8610494 + .byte 0x00, 0x07, 0x00, 0xc0, 0x00, 0x00, 0x01, 0x00 + + .align 2 +gUnknown_0861049C:: @ 861049C + .2byte 0x0000, 0x0001, 0xffff, 0x0000 + + .align 2 +gUnknown_086104A4:: @ 86104A4 + .2byte 0x0000, 0x0001, 0xffff, 0x0000 + + .align 2 +gUnknown_086104AC:: @ 86104AC + .2byte 0x0000, 0x001e, 0xffff, 0x0000 + + .align 2 +gUnknown_086104B4:: @ 86104B4 + .2byte 0x0010, 0x0004, 0x0000, 0x0004, 0x0020, 0x0004, 0x0000, 0x0004, 0x0010, 0x0004, 0x0000, 0x0004, 0x0020, 0x0004, 0x0000, 0x0004 + .2byte 0x0000, 0x0020, 0x0010, 0x0008, 0x0000, 0x0008, 0x0020, 0x0008, 0x0000, 0x0008, 0x0010, 0x0008, 0x0000, 0x0008, 0x0020, 0x0008 + .2byte 0x0000, 0x0008, 0xffff, 0x0000 + + .align 2 +gUnknown_086104FC:: @ 86104FC + .4byte gUnknown_0861049C + + .align 2 +gUnknown_08610500:: @ 8610500 + .4byte gUnknown_086104A4 + + .align 2 +gUnknown_08610504:: @ 8610504 + .4byte gUnknown_086104AC + .4byte gUnknown_086104B4 + + .align 2 +gUnknown_0861050C:: @ 861050C + .2byte 0x0005, 0x0005, 0x0000, 0x0000, 0x0000, 0x0000, 0x0100, 0x0000, 0x0010, 0x0005, 0x0000, 0x0000, 0x0000, 0x0000, 0x0100, 0x0000 + .2byte 0x0020, 0x0005, 0x0000, 0x0000, 0x0000, 0x0000, 0x0100, 0x0000, 0x0040, 0x0005, 0x0000, 0x0000, 0x0000, 0x0000, 0x0100, 0x0000 + .2byte 0x0080, 0x0005, 0x0000, 0x0000, 0x0000, 0x0000, 0x0100, 0x0000, 0x0100, 0x0005, 0x0000, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000 + + .align 2 +gUnknown_0861056C:: @ 861056C + .2byte 0x0080, 0x0005, 0x0000, 0x0000, 0x0000, 0x0000, 0x0100, 0x0000, 0x0040, 0x0005, 0x0000, 0x0000, 0x0000, 0x0000, 0x0100, 0x0000 + .2byte 0x0020, 0x0005, 0x0000, 0x0000, 0x0000, 0x0000, 0x0100, 0x0000, 0x0010, 0x0005, 0x0000, 0x0000, 0x0000, 0x0000, 0x0100, 0x0000 + .2byte 0x0005, 0x0005, 0x0000, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000 + + .align 2 +gUnknown_086105BC:: @ 86105BC + .2byte 0x0100, 0x0100, 0x0000, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000 + + .align 2 +gUnknown_086105CC:: @ 86105CC + .4byte gUnknown_0861050C + .4byte gUnknown_0861056C + .4byte gUnknown_086105BC + + .align 2 gUnknown_086105D8:: @ 86105D8 - .incbin "baserom.gba", 0x6105d8, 0x18 + spr_template 0x0064, 0x0064, gUnknown_0861047C, gUnknown_08610504, NULL, gDummySpriteAffineAnimTable, sub_819A44C + .align 2 gUnknown_086105F0:: @ 86105F0 - .incbin "baserom.gba", 0x6105f0, 0x18 + spr_template 0x0065, 0x0066, gUnknown_08610484, gUnknown_086104FC, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy + .align 2 gUnknown_08610608:: @ 8610608 - .incbin "baserom.gba", 0x610608, 0x18 + spr_template 0x0066, 0x0066, gUnknown_0861048C, gUnknown_086104FC, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy + .align 2 gUnknown_08610620:: @ 8610620 - .incbin "baserom.gba", 0x610620, 0x18 + spr_template 0x0067, 0x0066, gUnknown_0861048C, gUnknown_086104FC, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy + .align 2 gUnknown_08610638:: @ 8610638 - .incbin "baserom.gba", 0x610638, 0x18 + spr_template 0x006d, 0x0067, gUnknown_08610494, gUnknown_08610500, NULL, gUnknown_086105CC, SpriteCallbackDummy + .align 2 gUnknown_08610650:: @ 8610650 - .incbin "baserom.gba", 0x610650, 0x50 + obj_tiles gUnknown_0860F3BC, 0x0080, 0x0065 + obj_tiles gUnknown_0860F43C, 0x0100, 0x0066 + obj_tiles gUnknown_0860F53C, 0x0100, 0x0067 + obj_tiles gUnknown_0860F63C, 0x0080, 0x0068 + obj_tiles gUnknown_0860F6BC, 0x0100, 0x0069 + obj_tiles gUnknown_0860F7BC, 0x0100, 0x006a + obj_tiles gUnknown_0860F83C, 0x0100, 0x006b + obj_tiles gUnknown_0860F93C, 0x0100, 0x006c + obj_tiles gUnknown_0860FA3C, 0x0800, 0x006d + null_obj_tiles + .align 2 gUnknown_086106A0:: @ 86106A0 - .incbin "baserom.gba", 0x6106a0, 0x10 + obj_tiles gUnknown_085B18AC, 0x0800, 0x0064 + null_obj_tiles + .align 2 gUnknown_086106B0:: @ 86106B0 - .incbin "baserom.gba", 0x6106b0, 0x184 + obj_pal gUnknown_0860F13C, 0x0064 + obj_pal gUnknown_0860F15C, 0x0065 + obj_pal gUnknown_0860F17C, 0x0066 + obj_pal gUnknown_0861039C, 0x0067 + null_obj_pal + .align 2 +gUnknown_086106D8:: @ 86106D8 + .byte 0x00, 0x00, 0x00, 0x80, 0x00, 0x0c, 0x00, 0x00 + + .align 2 +gUnknown_086106E0:: @ 86106E0 + .byte 0x00, 0x00, 0x00, 0x40, 0x00, 0x0c, 0x00, 0x00 + + .align 2 +gUnknown_086106E8:: @ 86106E8 + .byte 0x00, 0x40, 0x00, 0x80, 0x00, 0x08, 0x00, 0x00 + + .align 2 +gUnknown_086106F0:: @ 86106F0 + .byte 0x00, 0x07, 0x00, 0xc0, 0x00, 0x00, 0x01, 0x00 + + .align 2 +gUnknown_086106F8:: @ 86106F8 + .2byte 0x0000, 0x0001, 0xffff, 0x0000 + + .align 2 +gUnknown_08610700:: @ 8610700 + .2byte 0x0000, 0x0001, 0xffff, 0x0000 + + .align 2 +gUnknown_08610708:: @ 8610708 + .2byte 0x0000, 0x001e, 0xffff, 0x0000 + + .align 2 +gUnknown_08610710:: @ 8610710 + .2byte 0x0010, 0x0004, 0x0000, 0x0004, 0x0020, 0x0004, 0x0000, 0x0004, 0x0010, 0x0004, 0x0000, 0x0004, 0x0020, 0x0004, 0x0000, 0x0004 + .2byte 0x0000, 0x0020, 0x0010, 0x0008, 0x0000, 0x0008, 0x0020, 0x0008, 0x0000, 0x0008, 0x0010, 0x0008, 0x0000, 0x0008, 0x0020, 0x0008 + .2byte 0x0000, 0x0008, 0xffff, 0x0000 + + .align 2 +gUnknown_08610758:: @ 8610758 + .4byte gUnknown_086106F8 + + .align 2 +gUnknown_0861075C:: @ 861075C + .4byte gUnknown_08610700 + + .align 2 +gUnknown_08610760:: @ 8610760 + .4byte gUnknown_08610708 + .4byte gUnknown_08610710 + + .align 2 +gUnknown_08610768:: @ 8610768 + .2byte 0x0005, 0x0005, 0x0000, 0x0000, 0x0000, 0x0000, 0x0100, 0x0000, 0x0010, 0x0005, 0x0000, 0x0000, 0x0000, 0x0000, 0x0100, 0x0000 + .2byte 0x0020, 0x0005, 0x0000, 0x0000, 0x0000, 0x0000, 0x0100, 0x0000, 0x0040, 0x0005, 0x0000, 0x0000, 0x0000, 0x0000, 0x0100, 0x0000 + .2byte 0x0080, 0x0005, 0x0000, 0x0000, 0x0000, 0x0000, 0x0100, 0x0000, 0x0100, 0x0005, 0x0000, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000 + + .align 2 +gUnknown_086107C8:: @ 86107C8 + .2byte 0x0080, 0x0005, 0x0000, 0x0000, 0x0000, 0x0000, 0x0100, 0x0000, 0x0040, 0x0005, 0x0000, 0x0000, 0x0000, 0x0000, 0x0100, 0x0000 + .2byte 0x0020, 0x0005, 0x0000, 0x0000, 0x0000, 0x0000, 0x0100, 0x0000, 0x0010, 0x0005, 0x0000, 0x0000, 0x0000, 0x0000, 0x0100, 0x0000 + .2byte 0x0005, 0x0005, 0x0000, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000 + + .align 2 +gUnknown_08610818:: @ 8610818 + .2byte 0x0100, 0x0100, 0x0000, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000 + + .align 2 +gUnknown_08610828:: @ 8610828 + .4byte gUnknown_08610768 + .4byte gUnknown_086107C8 + .4byte gUnknown_08610818 + + .align 2 gUnknown_08610834:: @ 8610834 - .incbin "baserom.gba", 0x610834, 0x18 + spr_template 0x0064, 0x0064, gUnknown_086106D8, gUnknown_08610760, NULL, gDummySpriteAffineAnimTable, sub_819A44C + .align 2 gUnknown_0861084C:: @ 861084C - .incbin "baserom.gba", 0x61084c, 0x18 + spr_template 0x0065, 0x0066, gUnknown_086106E0, gUnknown_08610758, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy + .align 2 gUnknown_08610864:: @ 8610864 - .incbin "baserom.gba", 0x610864, 0x18 + spr_template 0x0066, 0x0066, gUnknown_086106E8, gUnknown_08610758, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy + .align 2 gUnknown_0861087C:: @ 861087C - .incbin "baserom.gba", 0x61087c, 0x18 + spr_template 0x0067, 0x0066, gUnknown_086106E8, gUnknown_08610758, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy + .align 2 gUnknown_08610894:: @ 8610894 - .incbin "baserom.gba", 0x610894, 0x18 + spr_template 0x006d, 0x0067, gUnknown_086106F0, gUnknown_0861075C, NULL, gUnknown_08610828, SpriteCallbackDummy + .align 2 gUnknown_086108AC:: @ 86108AC - .incbin "baserom.gba", 0x6108ac, 0xc + .4byte sub_819F114 + .4byte sub_819F0CC + .4byte sub_819F134 + .align 2 gUnknown_086108B8:: @ 86108B8 - .incbin "baserom.gba", 0x6108b8, 0x10 + .4byte 0x00001180, 0x00003195, 0x000001aa, 0x000021bb + .align 2 gUnknown_086108C8:: @ 86108C8 - .incbin "baserom.gba", 0x6108c8, 0x50 + window_template 0x00, 0x00, 0x02, 0x0c, 0x02, 0x0f, 0x0001 + window_template 0x02, 0x13, 0x02, 0x0b, 0x02, 0x0e, 0x0019 + window_template 0x00, 0x00, 0x0f, 0x14, 0x03, 0x0f, 0x002f + window_template 0x00, 0x15, 0x0e, 0x09, 0x06, 0x0f, 0x006b + window_template 0x00, 0x16, 0x0e, 0x08, 0x04, 0x0f, 0x00a1 + window_template 0x02, 0x15, 0x0f, 0x09, 0x05, 0x0e, 0x006b + window_template 0x02, 0x0a, 0x02, 0x04, 0x02, 0x0e, 0x00c1 + window_template 0x00, 0x13, 0x02, 0x0b, 0x02, 0x0f, 0x00c9 + window_template 0x00, 0x0f, 0x00, 0x0f, 0x02, 0x0f, 0x00df + window_template_terminator gUnknown_08610918:: @ 8610918 - .incbin "baserom.gba", 0x610918, 0xa + .byte 0x00, 0x00, 0x00, 0x00, 0xff, 0x7f, 0x00, 0x00, 0x1f, 0x00 gUnknown_08610922:: @ 8610922 - .incbin "baserom.gba", 0x610922, 0x3 + .byte 0x00, 0x02, 0x00 gUnknown_08610925:: @ 8610925 - .incbin "baserom.gba", 0x610925, 0x3 + .byte 0x00, 0x04, 0x00 + .align 2 gUnknown_08610928:: @ 8610928 - .incbin "baserom.gba", 0x610928, 0x20 + .4byte 0x00000001, sub_819F20C + .4byte 0x00000001, sub_819F20C + .4byte 0x00000001, sub_819F20C + .4byte 0x00000003, sub_819F1AC + .align 2 gUnknown_08610948:: @ 8610948 - .incbin "baserom.gba", 0x610948, 0x28 + .4byte 0x00000001, sub_819F20C + .4byte 0x00000001, sub_819F20C + .4byte 0x00000001, sub_819F20C + .4byte 0x00000002, sub_819F1DC + .4byte 0x00000003, sub_819F1AC + .align 2 @ struct, eight bytes x6 for names in different languages, then 0x28 more bytes of data gUnknown_08610970:: @ 8610970 - .incbin "baserom.gba", 0x610970, 0x34 - -gUnknown_086109A4:: @ 86109A4 - .incbin "baserom.gba", 0x6109a4, 0x16 - -gUnknown_086109BA:: @ 86109BA - .incbin "baserom.gba", 0x6109ba, 0x536 + .incbin "baserom.gba", 0x610970, 0x580 + .align 2 gUnknown_08610EF0:: @ 8610EF0 .incbin "baserom.gba", 0x610ef0, 0x100 diff --git a/data/starter_choose.s b/data/starter_choose.s index a951a89879..06bb8a3567 100644 --- a/data/starter_choose.s +++ b/data/starter_choose.s @@ -15,7 +15,10 @@ gBirchGrassTilemap:: @ 85B0C0C .incbin "baserom.gba", 0x5b0c0c, 0x1f8 gBirchHelpGfx:: @ 85B0E04 - .incbin "baserom.gba", 0x5b0e04, 0xfc8 + .incbin "baserom.gba", 0x5b0e04, 0xaa8 + +gUnknown_085B18AC:: @ 85B18AC + .incbin "baserom.gba", 0x5b18AC, 0x520 gUnknown_085B1DCC:: @ 85B1DCC .incbin "baserom.gba", 0x5b1dcc, 0x10 diff --git a/graphics/unknown/unknown_60F13C.pal b/graphics/unknown/unknown_60F13C.pal new file mode 100644 index 0000000000..1f6d1400e4 --- /dev/null +++ b/graphics/unknown/unknown_60F13C.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +148 148 164 +115 115 131 +164 90 90 +65 65 82 +213 213 123 +189 189 197 +148 148 164 +115 115 131 +213 213 222 +65 65 82 +123 123 172 +156 156 205 +0 0 0 +255 255 255 +65 65 65 diff --git a/graphics/unknown/unknown_60F15C.pal b/graphics/unknown/unknown_60F15C.pal new file mode 100644 index 0000000000..a25d0d9103 --- /dev/null +++ b/graphics/unknown/unknown_60F15C.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +230 131 98 +197 115 98 +164 90 90 +131 74 82 +213 213 123 +189 189 197 +148 148 164 +115 115 131 +255 172 180 +65 65 82 +123 123 172 +156 156 205 +0 0 0 +255 255 255 +65 65 65 diff --git a/graphics/unknown/unknown_60F17C.pal b/graphics/unknown/unknown_60F17C.pal new file mode 100644 index 0000000000..7f6b43f356 --- /dev/null +++ b/graphics/unknown/unknown_60F17C.pal @@ -0,0 +1,35 @@ +JASC-PAL +0100 +32 +0 0 0 +0 0 0 +255 0 0 +164 115 246 +238 238 238 +164 115 246 +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 +98 98 90 +246 246 246 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +131 90 41 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +213 213 213 +0 0 0 diff --git a/graphics/unknown/unknown_60F1BC.png b/graphics/unknown/unknown_60F1BC.png new file mode 100644 index 0000000000000000000000000000000000000000..185b93d57c58335da10ec86bc3c7457b8b9ea933 GIT binary patch literal 211 zcmeAS@N?(olHy`uVBq!ia0vp^3Lwk^Bp4pd2o=l-?H!QE1>tCIo{ptXROhgcK_t!|V zM$Z~1AEsZ|9)?SJaqUU56`U^P#bvlc>50Z;+0+|0?lbFt%HGS6+j+)tcR~WlwVtki JF6*2UngDXdPj~V|9@=C0fSAf Y41YQvCtm*kd^t#!r>mdKI;Vst0Iy6JN&o-= literal 0 HcmV?d00001 diff --git a/graphics/unknown/unknown_60F53C.png b/graphics/unknown/unknown_60F53C.png new file mode 100644 index 0000000000000000000000000000000000000000..65450c7b33878b2eb300b83f301e5e5b870ea32d GIT binary patch literal 72 zcmeAS@N?(olHy`uVBq!ia0vp^3P3Et0wfrw&pzJ*r1(8u9780gChzEGlW^O{z>xp? UE@P2j(;bi!Pgg&ebxsLQ00v(XeEp+6kfg4*I3_Bg-r+hoeJo`vVwR!3%kO2&yu6{1- HoD!MAs(H{KQubTPZ&R#E-oSy uYOpFHZ literal 0 HcmV?d00001 diff --git a/graphics/unknown/unknown_61039C.pal b/graphics/unknown/unknown_61039C.pal new file mode 100644 index 0000000000..89f527ce4d --- /dev/null +++ b/graphics/unknown/unknown_61039C.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +213 255 238 +213 255 238 +213 255 238 +213 255 238 +213 255 238 +213 255 238 +213 255 238 +213 255 238 +213 255 238 +213 255 238 +213 255 238 +213 255 238 +213 255 238 +213 255 238 +213 255 238 diff --git a/graphics/unknown/unknown_61046C.pal b/graphics/unknown/unknown_61046C.pal new file mode 100644 index 0000000000..40d83bc596 --- /dev/null +++ b/graphics/unknown/unknown_61046C.pal @@ -0,0 +1,8 @@ +JASC-PAL +0100 +5 +0 0 0 +0 0 0 +255 255 255 +0 0 0 +255 0 0