Merge branch 'master' into decomp_battle2

asm/battle_anim.s

@@ -449,10 +449,10 @@ ma00_load_graphics: @ 80A3D24
 	lsls r0, 8
 	orrs r4, r0
 	lsls r5, r4, 3
-	ldr r0, =gUnknown_085112C4
+	ldr r0, =gUnknown_085112B4 + 0x10
 	adds r0, r5, r0
 	bl LoadCompressedObjectPicUsingHeap
-	ldr r0, =gUnknown_08511BCC
+	ldr r0, =gUnknown_08511A34 + 0x198
 	adds r5, r0
 	adds r0, r5, 0
 	bl LoadCompressedObjectPaletteUsingHeap

asm/librfu.s

@@ -2762,7 +2762,7 @@ sub_82E424C: @ 82E424C
 	b _082E4266
 	.align 2, 0
 _082E4254: .4byte gUnknown_089A324C
-_082E4258: .4byte gUnknown_030000F0
+_082E4258: .4byte gDma3Requests + 0xE0
 	thumb_func_end sub_82E424C
 
 	thumb_func_start sub_82E425C
@@ -2810,7 +2810,7 @@ _082E4274:
 	movs r0, 0
 	b _082E42BE
 	.align 2, 0
-_082E42B0: .4byte gUnknown_030000FA
+_082E42B0: .4byte gDma3Requests + 0xEA
 _082E42B4: .4byte gUnknown_03007890
 _082E42B8: .4byte gUnknown_03007894
 _082E42BC:

asm/rom4.s

@@ -3640,7 +3640,7 @@ VBlankCB_Field: @ 8086390
 	bl sub_80BA0A8
 	bl FieldUpdateBgTilemapScroll
 	bl TransferPlttBuffer
-	bl sub_80A09D0
+	bl TransferTilesetAnimsBuffer
 	pop {r0}
 	bx r0
 	thumb_func_end VBlankCB_Field

asm/unk_text_util_2.s

@@ -1,583 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.syntax unified
-
-	.text
-
-	thumb_func_start Font6Func
-@ int Font6Func(struct TextPrinter *x)
-Font6Func: @ 81BA250
-	push {r4-r6,lr}
-	adds r6, r0, 0
-	adds r4, r6, 0
-	adds r4, 0x14
-	ldrb r0, [r6, 0x1C]
-	cmp r0, 0x6
-	bls _081BA260
-	b _081BA660
-_081BA260:
-	lsls r0, 2
-	ldr r1, =_081BA270
-	adds r0, r1
-	ldr r0, [r0]
-	mov pc, r0
-	.pool
-	.align 2, 0
-_081BA270:
-	.4byte _081BA28C
-	.4byte _081BA554
-	.4byte _081BA566
-	.4byte _081BA590
-	.4byte _081BA5C8
-	.4byte _081BA63C
-	.4byte _081BA64E
-_081BA28C:
-	ldr r2, =gMain
-	ldrh r1, [r2, 0x2C]
-	movs r0, 0x3
-	ands r0, r1
-	cmp r0, 0
-	beq _081BA2A6
-	ldrb r1, [r4]
-	movs r0, 0x10
-	ands r0, r1
-	cmp r0, 0
-	beq _081BA2A6
-	movs r0, 0
-	strb r0, [r6, 0x1E]
-_081BA2A6:
-	ldrb r1, [r6, 0x1E]
-	cmp r1, 0
-	beq _081BA2E8
-	ldrb r0, [r6, 0x1D]
-	cmp r0, 0
-	beq _081BA2E8
-	subs r0, r1, 0x1
-	strb r0, [r6, 0x1E]
-	ldr r0, =gTextFlags
-	ldrb r1, [r0]
-	movs r0, 0x1
-	ands r0, r1
-	cmp r0, 0
-	bne _081BA2C4
-	b _081BA50E
-_081BA2C4:
-	ldrh r1, [r2, 0x2E]
-	movs r0, 0x3
-	ands r0, r1
-	cmp r0, 0
-	bne _081BA2D0
-	b _081BA50E
-_081BA2D0:
-	ldrb r0, [r4]
-	movs r1, 0x10
-	orrs r0, r1
-	strb r0, [r4]
-	movs r0, 0
-	strb r0, [r6, 0x1E]
-	b _081BA50E
-	.pool
-_081BA2E8:
-	ldr r2, =gTextFlags
-	ldrb r1, [r2]
-	movs r0, 0x4
-	ands r0, r1
-	cmp r0, 0
-	beq _081BA2FC
-	movs r0, 0x3
-	b _081BA2FE
-	.pool
-_081BA2FC:
-	ldrb r0, [r6, 0x1D]
-_081BA2FE:
-	strb r0, [r6, 0x1E]
-	ldr r0, [r6]
-	ldrb r3, [r0]
-	adds r0, 0x1
-	str r0, [r6]
-	adds r0, r3, 0
-	subs r0, 0xF8
-	cmp r0, 0x7
-	bls _081BA312
-	b _081BA52E
-_081BA312:
-	lsls r0, 2
-	ldr r1, =_081BA320
-	adds r0, r1
-	ldr r0, [r0]
-	mov pc, r0
-	.pool
-	.align 2, 0
-_081BA320:
-	.4byte _081BA524
-	.4byte _081BA512
-	.4byte _081BA504
-	.4byte _081BA500
-	.4byte _081BA36E
-	.4byte _081BA368
-	.4byte _081BA340
-	.4byte _081BA660
-_081BA340:
-	ldrb r0, [r6, 0x6]
-	strb r0, [r6, 0x8]
-	ldrb r1, [r6, 0x5]
-	ldr r0, =gFonts
-	ldr r2, [r0]
-	lsls r0, r1, 1
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r2
-	ldrb r1, [r6, 0xB]
-	ldrb r0, [r0, 0x5]
-	adds r1, r0
-	ldrb r0, [r6, 0x9]
-	adds r0, r1
-	strb r0, [r6, 0x9]
-_081BA35E:
-	movs r0, 0x2
-	b _081BA662
-	.pool
-_081BA368:
-	ldr r0, [r6]
-	adds r0, 0x1
-	b _081BA4C4
-_081BA36E:
-	ldr r0, [r6]
-	ldrb r3, [r0]
-	adds r0, 0x1
-	str r0, [r6]
-	subs r0, r3, 0x1
-	cmp r0, 0xF
-	bls _081BA37E
-	b _081BA52E
-_081BA37E:
-	lsls r0, 2
-	ldr r1, =_081BA38C
-	adds r0, r1
-	ldr r0, [r0]
-	mov pc, r0
-	.pool
-	.align 2, 0
-_081BA38C:
-	.4byte _081BA3CC
-	.4byte _081BA3EE
-	.4byte _081BA412
-	.4byte _081BA42C
-	.4byte _081BA478
-	.4byte _081BA47E
-	.4byte _081BA35E
-	.4byte _081BA498
-	.4byte _081BA4A8
-	.4byte _081BA4BC
-	.4byte _081BA4C0
-	.4byte _081BA4C8
-	.4byte _081BA4D2
-	.4byte _081BA4DE
-	.4byte _081BA4EE
-	.4byte _081BA4C0
-_081BA3CC:
-	ldr r2, [r6]
-	ldrb r1, [r2]
-	lsls r1, 4
-	ldrb r3, [r6, 0xC]
-	movs r0, 0xF
-	ands r0, r3
-	orrs r0, r1
-	strb r0, [r6, 0xC]
-	adds r2, 0x1
-	str r2, [r6]
-	lsls r0, 24
-	lsrs r0, 28
-	ldrb r2, [r6, 0xD]
-	lsls r1, r2, 28
-	lsrs r1, 28
-	lsrs r2, 4
-	b _081BA472
-_081BA3EE:
-	ldr r1, [r6]
-	ldrb r2, [r1]
-	movs r0, 0xF
-	ands r0, r2
-	ldrb r3, [r6, 0xD]
-	movs r2, 0x10
-	negs r2, r2
-	ands r2, r3
-	orrs r2, r0
-	strb r2, [r6, 0xD]
-	adds r1, 0x1
-	str r1, [r6]
-	ldrb r0, [r6, 0xC]
-	lsrs r0, 4
-	lsls r1, r2, 28
-	lsrs r1, 28
-	lsrs r2, 4
-	b _081BA472
-_081BA412:
-	ldr r1, [r6]
-	ldrb r0, [r1]
-	lsls r0, 4
-	ldrb r3, [r6, 0xD]
-	movs r2, 0xF
-	ands r2, r3
-	orrs r2, r0
-	strb r2, [r6, 0xD]
-	adds r1, 0x1
-	str r1, [r6]
-	ldrb r0, [r6, 0xC]
-	lsrs r0, 4
-	b _081BA46A
-_081BA42C:
-	ldr r3, [r6]
-	ldrb r1, [r3]
-	lsls r1, 4
-	ldrb r4, [r6, 0xC]
-	movs r2, 0xF
-	adds r0, r2, 0
-	ands r0, r4
-	orrs r0, r1
-	strb r0, [r6, 0xC]
-	adds r5, r3, 0x1
-	str r5, [r6]
-	ldrb r3, [r3, 0x1]
-	adds r1, r2, 0
-	ands r1, r3
-	ldrb r4, [r6, 0xD]
-	movs r3, 0x10
-	negs r3, r3
-	ands r3, r4
-	orrs r3, r1
-	strb r3, [r6, 0xD]
-	adds r4, r5, 0x1
-	str r4, [r6]
-	ldrb r1, [r5, 0x1]
-	lsls r1, 4
-	ands r2, r3
-	orrs r2, r1
-	strb r2, [r6, 0xD]
-	adds r4, 0x1
-	str r4, [r6]
-	lsls r0, 24
-	lsrs r0, 28
-_081BA46A:
-	lsls r1, r2, 28
-	lsrs r1, 28
-	lsls r2, 24
-	lsrs r2, 28
-_081BA472:
-	bl GenerateFontHalfRowLookupTable
-	b _081BA35E
-_081BA478:
-	ldr r0, [r6]
-	adds r0, 0x1
-	b _081BA4C4
-_081BA47E:
-	ldr r0, [r6]
-	ldrb r0, [r0]
-	movs r1, 0xF
-	ands r1, r0
-	ldrb r2, [r4]
-	movs r0, 0x10
-	negs r0, r0
-	ands r0, r2
-	orrs r0, r1
-	strb r0, [r4]
-	ldr r0, [r6]
-	adds r0, 0x1
-	b _081BA4C4
-_081BA498:
-	ldr r0, [r6]
-	ldrb r1, [r0]
-	strb r1, [r6, 0x1E]
-	adds r0, 0x1
-	str r0, [r6]
-	movs r0, 0x6
-	strb r0, [r6, 0x1C]
-	b _081BA35E
-_081BA4A8:
-	movs r0, 0x1
-	strb r0, [r6, 0x1C]
-	ldrb r1, [r2]
-	movs r0, 0x4
-	ands r0, r1
-	cmp r0, 0
-	beq _081BA50E
-	movs r0, 0
-	strb r0, [r4, 0x2]
-	b _081BA50E
-_081BA4BC:
-	movs r0, 0x5
-	b _081BA64A
-_081BA4C0:
-	ldr r0, [r6]
-	adds r0, 0x2
-_081BA4C4:
-	str r0, [r6]
-	b _081BA35E
-_081BA4C8:
-	ldr r1, [r6]
-	adds r0, r1, 0x1
-	str r0, [r6]
-	ldrb r3, [r1, 0x1]
-	b _081BA52E
-_081BA4D2:
-	ldr r1, [r6]
-	ldrb r0, [r1]
-	ldrb r2, [r6, 0x6]
-	adds r0, r2
-	strb r0, [r6, 0x8]
-	b _081BA4E8
-_081BA4DE:
-	ldr r1, [r6]
-	ldrb r0, [r1]
-	ldrb r2, [r6, 0x7]
-	adds r0, r2
-	strb r0, [r6, 0x9]
-_081BA4E8:
-	adds r1, 0x1
-	str r1, [r6]
-	b _081BA35E
-_081BA4EE:
-	ldrb r0, [r6, 0x4]
-	ldrb r2, [r6, 0xD]
-	lsls r2, 28
-	lsrs r1, r2, 4
-	orrs r1, r2
-	lsrs r1, 24
-	bl FillWindowPixelBuffer
-	b _081BA35E
-_081BA500:
-	movs r0, 0x2
-	b _081BA506
-_081BA504:
-	movs r0, 0x3
-_081BA506:
-	strb r0, [r6, 0x1C]
-	adds r0, r6, 0
-	bl TextPrinterInitDownArrowCounters
-_081BA50E:
-	movs r0, 0x3
-	b _081BA662
-_081BA512:
-	ldr r0, [r6]
-	ldrb r3, [r0]
-	movs r2, 0x80
-	lsls r2, 1
-	adds r1, r2, 0
-	orrs r3, r1
-	adds r0, 0x1
-	str r0, [r6]
-	b _081BA52E
-_081BA524:
-	ldr r0, [r6]
-	adds r0, 0x1
-	str r0, [r6]
-	movs r0, 0
-	b _081BA662
-_081BA52E:
-	adds r0, r3, 0
-	bl DecompressGlyphFont6
-	adds r0, r6, 0
-	bl CopyGlyphToWindow
-	ldr r0, =gUnknown_03002F90
-	adds r0, 0x80
-	ldrb r1, [r6, 0xA]
-	ldrb r0, [r0]
-	adds r1, r0
-	ldrb r0, [r6, 0x8]
-	adds r0, r1
-	strb r0, [r6, 0x8]
-	movs r0, 0
-	b _081BA662
-	.pool
-_081BA554:
-	adds r0, r6, 0
-	bl TextPrinterWait
-	lsls r0, 16
-	cmp r0, 0
-	beq _081BA50E
-	movs r0, 0
-	strb r0, [r6, 0x1C]
-	b _081BA50E
-_081BA566:
-	adds r0, r6, 0
-	bl TextPrinterWaitWithDownArrow
-	lsls r0, 16
-	cmp r0, 0
-	beq _081BA50E
-	ldrb r0, [r6, 0x4]
-	ldrb r2, [r6, 0xD]
-	lsls r2, 28
-	lsrs r1, r2, 4
-	orrs r1, r2
-	lsrs r1, 24
-	bl FillWindowPixelBuffer
-	ldrb r0, [r6, 0x6]
-	movs r1, 0
-	strb r0, [r6, 0x8]
-	ldrb r0, [r6, 0x7]
-	strb r0, [r6, 0x9]
-	strb r1, [r6, 0x1C]
-	b _081BA50E
-_081BA590:
-	adds r0, r6, 0
-	bl TextPrinterWaitWithDownArrow
-	lsls r0, 16
-	cmp r0, 0
-	beq _081BA50E
-	adds r0, r6, 0
-	bl TextPrinterClearDownArrow
-	ldrb r1, [r6, 0x5]
-	ldr r0, =gFonts
-	ldr r2, [r0]
-	lsls r0, r1, 1
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r2
-	ldrb r1, [r6, 0xB]
-	ldrb r0, [r0, 0x5]
-	adds r1, r0
-	strb r1, [r6, 0x1F]
-	ldrb r0, [r6, 0x6]
-	strb r0, [r6, 0x8]
-	movs r0, 0x4
-	strb r0, [r6, 0x1C]
-	b _081BA50E
-	.pool
-_081BA5C8:
-	ldrb r2, [r6, 0x1F]
-	cmp r2, 0
-	beq _081BA638
-	ldr r4, =gUnknown_08616124
-	ldr r5, =gSaveBlock2Ptr
-	ldr r0, [r5]
-	ldrb r0, [r0, 0x14]
-	lsls r1, r0, 29
-	lsrs r0, r1, 29
-	adds r0, r4
-	ldrb r0, [r0]
-	cmp r2, r0
-	bcs _081BA604
-	ldrb r0, [r6, 0x4]
-	ldrb r1, [r6, 0xD]
-	lsls r1, 28
-	lsrs r3, r1, 4
-	orrs r3, r1
-	lsrs r3, 24
-	movs r1, 0
-	bl ScrollWindow
-	movs r0, 0
-	strb r0, [r6, 0x1F]
-	b _081BA62E
-	.pool
-_081BA604:
-	ldrb r0, [r6, 0x4]
-	lsrs r1, 29
-	adds r1, r4
-	ldrb r2, [r1]
-	ldrb r1, [r6, 0xD]
-	lsls r1, 28
-	lsrs r3, r1, 4
-	orrs r3, r1
-	lsrs r3, 24
-	movs r1, 0
-	bl ScrollWindow
-	ldr r0, [r5]
-	ldrb r0, [r0, 0x14]
-	lsls r0, 29
-	lsrs r0, 29
-	adds r0, r4
-	ldrb r1, [r6, 0x1F]
-	ldrb r0, [r0]
-	subs r1, r0
-	strb r1, [r6, 0x1F]
-_081BA62E:
-	ldrb r0, [r6, 0x4]
-	movs r1, 0x2
-	bl CopyWindowToVram
-	b _081BA50E
-_081BA638:
-	strb r2, [r6, 0x1C]
-	b _081BA50E
-_081BA63C:
-	bl IsSEPlaying
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0
-	beq _081BA64A
-	b _081BA50E
-_081BA64A:
-	strb r0, [r6, 0x1C]
-	b _081BA50E
-_081BA64E:
-	ldrb r0, [r6, 0x1E]
-	adds r1, r0, 0
-	cmp r1, 0
-	beq _081BA65C
-	subs r0, 0x1
-	strb r0, [r6, 0x1E]
-	b _081BA50E
-_081BA65C:
-	strb r1, [r6, 0x1C]
-	b _081BA50E
-_081BA660:
-	movs r0, 0x1
-_081BA662:
-	pop {r4-r6}
-	pop {r1}
-	bx r1
-	thumb_func_end Font6Func
-
-	thumb_func_start DecompressGlyphFont6
-DecompressGlyphFont6: @ 81BA668
-	push {r4,r5,lr}
-	lsls r0, 16
-	lsrs r2, r0, 19
-	lsls r2, 9
-	movs r1, 0xE0
-	lsls r1, 11
-	ands r1, r0
-	lsrs r1, 11
-	ldr r0, =gFont6BrailleGlyphs
-	adds r1, r0
-	adds r5, r2, r1
-	ldr r4, =gUnknown_03002F90
-	adds r0, r5, 0
-	adds r1, r4, 0
-	bl DecompressGlyphTile
-	adds r0, r5, 0
-	adds r0, 0x10
-	adds r1, r4, 0
-	adds r1, 0x20
-	bl DecompressGlyphTile
-	movs r1, 0x80
-	lsls r1, 1
-	adds r0, r5, r1
-	adds r1, r4, 0
-	adds r1, 0x40
-	bl DecompressGlyphTile
-	movs r1, 0x88
-	lsls r1, 1
-	adds r0, r5, r1
-	adds r1, r4, 0
-	adds r1, 0x60
-	bl DecompressGlyphTile
-	adds r0, r4, 0
-	adds r0, 0x80
-	movs r1, 0x10
-	strb r1, [r0]
-	adds r0, 0x1
-	strb r1, [r0]
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end DecompressGlyphFont6
-
-	thumb_func_start GetGlyphWidthFont6
-GetGlyphWidthFont6: @ 81BA6CC
-	movs r0, 0x10
-	bx lr
-	thumb_func_end GetGlyphWidthFont6
-
-	.align 2, 0 @ Don't pad with nop.

asmdiff.sh

@@ -0,0 +1,7 @@
+#!/bin/bash
+
+OBJDUMP="$DEVKITARM/bin/arm-none-eabi-objdump -D -bbinary -marmv4t -Mforce-thumb"
+OPTIONS="--start-address=$(($1)) --stop-address=$(($1 + $2))"
+$OBJDUMP $OPTIONS baserom.gba > baserom.dump
+$OBJDUMP $OPTIONS pokeemerald.gba > pokeemerald.dump
+diff baserom.dump pokeemerald.dump

data/graphics.s

@@ -365,7 +365,19 @@ gUnknown_08D85600:: @ 8D85600
 	.incbin "baserom.gba", 0xd85600, 0x20
 
 gUnknown_08D85620:: @ 8D85620
-	.incbin "baserom.gba", 0xd85620, 0xa8
+	.incbin "baserom.gba", 0xd85620, 0x20
+
+gUnknown_08D85640:: @ 8D85640
+	.incbin "baserom.gba", 0xd85640, 0x20
+
+gUnknown_08D85660:: @ 8D85660
+	.incbin "baserom.gba", 0xd85660, 0x20
+
+gUnknown_08D85680:: @ 8D85680
+	.incbin "baserom.gba", 0xd85680, 0x20
+
+gUnknown_08D856A0:: @ 8D856A0
+	.incbin "baserom.gba", 0xd856a0, 0x28
 
 gUnknown_08D856C8:: @ 8D856C8
 	.incbin "baserom.gba", 0xd856c8, 0xe0

data/palette.s

@@ -1,18 +0,0 @@
-    .include "asm/macros.inc"
-    .include "constants/constants.inc"
-
-    .section .rodata
-    .align 2, 0
-
-gUnknown_0852487C:: @ 852487C
-	.incbin "baserom.gba", 0x52487c, 0x10
-
-gDummyPaletteStructTemplate:: @ 852488C
-	.2byte 0xFFFF
-	.space 9
-	.byte 0x20
-	.space 4
-
-	.align 2
-gUnknown_0852489C:: @ 852489C
-	.incbin "baserom.gba", 0x52489c, 0x20

data/start_menu.s

@@ -26,4 +26,4 @@ gUnknown_085105AC:: @ 85105AC
 	.incbin "baserom.gba", 0x5105ac, 0x10
 
 gUnknown_085105BC:: @ 85105BC
-	.incbin "baserom.gba", 0x5105bc, 0x1a8
+	.incbin "baserom.gba", 0x5105bc, 0x8

data/tileset.s

@@ -1,116 +0,0 @@
-    .include "asm/macros.inc"
-    .include "constants/constants.inc"
-
-    .section .rodata
-    .align 2, 0
-
-gUnknown_08510764:: @ 8510764
-	.incbin "baserom.gba", 0x510764, 0xb60
-
-gUnknown_085112C4:: @ 85112C4
-	.incbin "baserom.gba", 0x5112c4, 0x908
-
-gUnknown_08511BCC:: @ 8511BCC
-	.incbin "baserom.gba", 0x511bcc, 0x9a8
-
-gUnknown_08512574:: @ 8512574
-	.incbin "baserom.gba", 0x512574, 0x8e0
-
-gUnknown_08512E54:: @ 8512E54
-	.incbin "baserom.gba", 0x512e54, 0x320
-
-gUnknown_08513174:: @ 8513174
-	.incbin "baserom.gba", 0x513174, 0x510
-
-gUnknown_08513684:: @ 8513684
-	.incbin "baserom.gba", 0x513684, 0x210
-
-gUnknown_08513894:: @ 8513894
-	.incbin "baserom.gba", 0x513894, 0xb50
-
-gUnknown_085143E4:: @ 85143E4
-	.incbin "baserom.gba", 0x5143e4, 0x210
-
-gUnknown_085145F4:: @ 85145F4
-	.incbin "baserom.gba", 0x5145f4, 0x810
-
-gUnknown_08514E04:: @ 8514E04
-	.incbin "baserom.gba", 0x514e04, 0x540
-
-gUnknown_08515344:: @ 8515344
-	.incbin "baserom.gba", 0x515344, 0x20
-
-gUnknown_08515364:: @ 8515364
-	.incbin "baserom.gba", 0x515364, 0x20
-
-gUnknown_08515384:: @ 8515384
-	.incbin "baserom.gba", 0x515384, 0x30
-
-gUnknown_085153B4:: @ 85153B4
-	.incbin "baserom.gba", 0x5153b4, 0x30
-
-gUnknown_085153E4:: @ 85153E4
-	.incbin "baserom.gba", 0x5153e4, 0x10
-
-gUnknown_085153F4:: @ 85153F4
-	.incbin "baserom.gba", 0x5153f4, 0x410
-
-gUnknown_08515804:: @ 8515804
-	.incbin "baserom.gba", 0x515804, 0x20
-
-gUnknown_08515824:: @ 8515824
-	.incbin "baserom.gba", 0x515824, 0x140
-
-gUnknown_08515964:: @ 8515964
-	.incbin "baserom.gba", 0x515964, 0x428
-
-gUnknown_08515D8C:: @ 8515D8C
-	.incbin "baserom.gba", 0x515d8c, 0x430
-
-gUnknown_085161BC:: @ 85161BC
-	.incbin "baserom.gba", 0x5161bc, 0x20
-
-gUnknown_085161DC:: @ 85161DC
-	.incbin "baserom.gba", 0x5161dc, 0x320
-
-gUnknown_085164FC:: @ 85164FC
-	.incbin "baserom.gba", 0x5164fc, 0x310
-
-gUnknown_0851680C:: @ 851680C
-	.incbin "baserom.gba", 0x51680c, 0x310
-
-gUnknown_08516B1C:: @ 8516B1C
-	.incbin "baserom.gba", 0x516b1c, 0x210
-
-gUnknown_08516D2C:: @ 8516D2C
-	.incbin "baserom.gba", 0x516d2c, 0x110
-
-gUnknown_08516E3C:: @ 8516E3C
-	.incbin "baserom.gba", 0x516e3c, 0xc08
-
-gUnknown_08517A44:: @ 8517A44
-	.incbin "baserom.gba", 0x517a44, 0xc
-
-gUnknown_08517A50:: @ 8517A50
-	.incbin "baserom.gba", 0x517a50, 0x1ac
-
-gUnknown_08517BFC:: @ 8517BFC
-	.incbin "baserom.gba", 0x517bfc, 0x10
-
-gUnknown_08517C0C:: @ 8517C0C
-	.incbin "baserom.gba", 0x517c0c, 0x428
-
-gUnknown_08518034:: @ 8518034
-	.incbin "baserom.gba", 0x518034, 0x268
-
-gUnknown_0851829C:: @ 851829C
-	.incbin "baserom.gba", 0x51829c, 0x8028
-
-gUnknown_085202C4:: @ 85202C4
-	.incbin "baserom.gba", 0x5202c4, 0x45a0
-
-gUnknown_08524864:: @ 8524864
-	.incbin "baserom.gba", 0x524864, 0xc
-
-gUnknown_08524870:: @ 8524870
-	.incbin "baserom.gba", 0x524870, 0xc