Merge branch 'master' of github.com:pret/pokeemerald

1 files changed, 229 insertions, 73 deletions

diff --git a/data/graphics.s b/data/graphics.s
index e135a63e3..ff1034587 100644
--- a/data/graphics.s
+++ b/data/graphics.s
@@ -20,7 +20,7 @@ gUnknown_08C01644:: @ 8C01644
 
 gUnknown_08C01724:: @ 8C01724
 	.incbin "baserom.gba", 0xc01724, 0x18
-	
+
 	.align 2
 gInterfaceGfx_PokeBall::
 	.incbin "graphics/interface/ball/poke.4bpp.lz" @ 0xBC
@@ -126,23 +126,23 @@ gBlankGfxCompressed:: @ 8C0237C
 gUnknown_08C093F0:: @ 8C093F0
 	.incbin "baserom.gba", 0xc093f0, 0x87ac
 
-    .align 2
+	.align 2
 gBattleInterface_BallStatusBarPal:: @ 8C11B9C
 	.incbin "graphics/battle_interface/ball_status_bar.gbapal"
 
-    .align 2
+	.align 2
 gBattleInterface_BallDisplayPal:: @ 8C11BBC
 	.incbin "graphics/battle_interface/ball_display.gbapal"
 
-    .align 2
+	.align 2
 gHealthboxElementsGfxTable:: @ 8C11BDC
 	.incbin "baserom.gba", 0xc11bdc, 0x840
 
-    .align 2
+	.align 2
 gBattleInterface_BallDisplayGfx:: @ 8C1241C
 	.incbin "graphics/battle_interface/ball_display.4bpp"
 
-    .align 2
+	.align 2
 gUnknown_08C1249C:: @ 8C1249C
 	.incbin "baserom.gba", 0xc1249c, 0x49f4
 
@@ -268,28 +268,28 @@ gSubstituteDollGfx:: @ 8C2CEE0
 
 gSubstituteDollTilemap:: @ 8C2D120
 	.incbin "baserom.gba", 0xc2d120, 552
-    
+
 gUnknown_08C2D348:: @ 8C2D348
 	.incbin "baserom.gba", 0xC2D348, 196
-    
+
 gUnknown_08C2D40C:: @ 8C2D40C
 	.incbin "baserom.gba", 0xC2D40C, 28
-    
+
 gContestConfetti_Gfx:: @ 8C2D428
 	.incbin "baserom.gba", 0xC2D428, 288
-    
+
 gContestConfetti_Pal:: @ 8C2D548
 	.incbin "baserom.gba", 0xC2D548, 40
-    
+
 gUnknown_08C2D570:: @ 8C2D570
 	.incbin "baserom.gba", 0xC2D570, 316
-    
+
 gUnknown_08C2D6AC:: @ 8C2D6AC
 	.incbin "baserom.gba", 0xC2D6AC, 36
-    
+
 gUnknown_08C2D6D0:: @ 8C2D6D0
 	.incbin "baserom.gba", 0xC2D6D0, 40
-    
+
 gUnknown_08C2D6F8:: @ 8C2D6F8
 	.incbin "baserom.gba", 0xC2D6F8, 40
 
@@ -851,10 +851,31 @@ gUnknown_08D96AB4:: @ 8D96AB4
 	.incbin "baserom.gba", 0xd96ab4, 0xec
 
 gUnknown_08D96BA0:: @ 8D96BA0
-	.incbin "baserom.gba", 0xd96ba0, 0xfe4
+	 .incbin "baserom.gba", 0xd96ba0, 0x138
+
+gUnknown_08D96CD8:: @ 8D96CD8
+	 .incbin "baserom.gba", 0xd96cd8, 0x294
+
+gUnknown_08D96F6C:: @ 8D96F6C
+	 .incbin "baserom.gba", 0xd96f6c, 0x24
+
+gUnknown_08D96F90:: @ 8D96F90
+	 .incbin "baserom.gba", 0xd96f90, 0x1F8
+
+gUnknown_08D97188:: @ 8D97188
+	 .incbin "baserom.gba", 0xd97188, 0x28
+
+gUnknown_08D971B0:: @ 8D971B0
+	 .incbin "baserom.gba", 0xd971b0, 0x9D4
 
 gUnknown_08D97B84:: @ 8D97B84
-	.incbin "baserom.gba", 0xd97b84, 0x188
+	 .incbin "baserom.gba", 0xd97b84, 0x68
+
+gUnknown_08D97BEC:: @ 8D97BEC
+	 .incbin "baserom.gba", 0xd97bec, 0x108
+
+gUnknown_08D97CF4:: @ 8D97CF4
+	 .incbin "baserom.gba", 0xd97cf4, 0x18
 
 gUnknown_08D97D0C:: @ 8D97D0C
 	.incbin "baserom.gba", 0xd97d0c, 0x830
@@ -906,25 +927,25 @@ gMenuMoneyPal:: @ 8D9B0C8
 
 gBuyMenuFrame_Tilemap:: @ 8D9B0F0
 	.incbin "baserom.gba", 0xd9b0f0, 0x140
-    
+
 gMenuMoneyGfx:: @ 8D9B230
-    .incbin "baserom.gba", 0xd9b230, 0x84
+	.incbin "baserom.gba", 0xd9b230, 0x84
 
 gMenuPokeblock_Gfx:: @ 8D9B2B4
 	.incbin "baserom.gba", 0xd9b2b4, 0x1bc
 
 gMenuPokeblock_Pal:: @ 8D9B470
 	.incbin "baserom.gba", 0xd9b470, 0x70
-	
+
 gMenuPokeblockDevice_Gfx:: @ 8D9B4E0
 	.incbin "baserom.gba", 0xd9b4e0, 0x2c0
-	
+
 gMenuPokeblockDevice_Pal:: @ 8D9B7A0
 	.incbin "baserom.gba", 0xd9b7a0, 0x28
 
 gMenuPokeblock_Tilemap:: @ 8D9B7C8
 	.incbin "baserom.gba", 0xd9b7c8, 0x148
-	
+
 	.align 2
 gPokeblock_Gfx::
 	.incbin "graphics/pokeblock/pokeblock.4bpp.lz"
@@ -1003,8 +1024,29 @@ gUnknown_08D9C13C:: @ 8D9C13C
 @ 8D9C3A8
 	.include "data/graphics/berries/berry_graphics.inc"
 
-@ 8DA1E78
-	.incbin "baserom.gba", 0xda1e78, 0x1548
+gUnknown_08DA1E78:: @ 8DA1E78
+	.incbin "baserom.gba", 0xda1e78, 0xBE4
+
+gUnknown_08DA2A5C:: @ 8DA2A5C
+	.incbin "baserom.gba", 0xDA2A5C, 0xCC
+
+gUnknown_08DA2B28:: @ 8DA2B28
+	.incbin "baserom.gba", 0xDA2B28, 0x1F4
+
+gUnknown_08DA2D1C:: @ 8DA2D1C
+	.incbin "baserom.gba", 0xDA2D1C, 0x534
+
+gUnknown_08DA3250:: @ 8DA3250
+	.incbin "baserom.gba", 0xDA3250, 0x54
+
+gUnknown_08DA32A4:: @ 8DA32A4
+	.incbin "baserom.gba", 0xDA32A4, 0xCC
+
+gUnknown_08DA3370:: @ 8DA3370
+	.incbin "baserom.gba", 0xDA3370, 0x28
+
+gUnknown_08DA3398:: @ 8DA3398
+	.incbin "baserom.gba", 0xDA3398, 0x28
 
 gUnknown_08DA33C0:: @ 8DA33C0
 	.incbin "baserom.gba", 0xda33c0, 0x428
@@ -1019,7 +1061,13 @@ gUnknown_08DA3988:: @ 8DA3988
 	.incbin "baserom.gba", 0xda3988, 0x100
 
 gUnknown_08DA3A88:: @ 8DA3A88
-	.incbin "baserom.gba", 0xda3a88, 0x20c
+	.incbin "baserom.gba", 0xda3a88, 0x138
+
+gUnknown_08DA3BC0:: @ 8DA3BC0
+	.incbin "baserom.gba", 0xDA3BC0, 0xBC
+
+gUnknown_08DA3C7C:: @ 8DA3C7C
+	.incbin "baserom.gba", 0xDA3C7C, 0x18
 
 gUnknown_08DA3C94:: @ 8DA3C94
 	.incbin "baserom.gba", 0xda3c94, 0x1114
@@ -1034,7 +1082,13 @@ gUnknown_08DA4F70:: @ 8DA4F70
 	.incbin "baserom.gba", 0xda4f70, 0x1148
 
 gUnknown_08DA60B8:: @ 8DA60B8
-	.incbin "baserom.gba", 0xda60b8, 0x904
+	.incbin "baserom.gba", 0xda60b8, 0x388
+
+gUnknown_08DA6440:: @ 8DA6440
+	.incbin "baserom.gba", 0xDA6440, 0x46C
+
+gUnknown_08DA68AC:: @ 8DA68AC
+	.incbin "baserom.gba", 0xDA68AC, 0x110
 
 gUnknown_08DA69BC:: @ 8DA69BC
 	.incbin "baserom.gba", 0xda69bc, 0xb6c
@@ -1073,7 +1127,37 @@ gUnknown_08DA8D6C:: @ 8DA8D6C
 	.incbin "baserom.gba", 0xda8d6c, 0x118
 
 gUnknown_08DA8E84:: @ 8DA8E84
-	.incbin "baserom.gba", 0xda8e84, 0x1a30
+	.incbin "baserom.gba", 0xda8e84, 0x54
+
+gUnknown_08DA8ED8:: @ 8DA8ED8
+	.incbin "baserom.gba", 0xDA8ED8, 0x798
+
+gUnknown_08DA9670:: @ 8DA9670
+	.incbin "baserom.gba", 0xDA9670, 0x44
+
+gUnknown_08DA96B4:: @ 8DA96B4
+	.incbin "baserom.gba", 0xDA96B4, 0x248
+
+gUnknown_08DA98FC:: @ 8DA98FC
+	.incbin "baserom.gba", 0xDA98FC, 0xCA8
+
+gUnknown_08DAA5A4:: @ 8DAA5A4
+	.incbin "baserom.gba", 0xDAA5A4, 0x1F0
+
+gUnknown_08DAA794:: @ 8DAA794
+	.incbin "baserom.gba", 0xDAA794, 0x98
+
+gUnknown_08DAA82C:: @ 8DAA82C
+	.incbin "baserom.gba", 0xDAA82C, 0x28
+
+gUnknown_08DAA854:: @ 8DAA854
+	.incbin "baserom.gba", 0xDAA854, 0x28
+
+gUnknown_08DAA87C:: @ 8DAA87C
+	.incbin "baserom.gba", 0xDAA87C, 0x28
+
+gUnknown_08DAA8A4:: @ 8DAA8A4
+	.incbin "baserom.gba", 0xDAA8A4, 0x10
 
 gUnknown_08DAA8B4:: @ 8DAA8B4
 	.incbin "baserom.gba", 0xdaa8b4, 0x270
@@ -1100,7 +1184,7 @@ gUnknown_08DAAFEC:: @ 8DAAFEC
 	.include "data/graphics/decorations/decoration_graphics.inc"
 
 @ 8DBA14C
-    .incbin "baserom.gba", 0xdba14c, 0x3cc
+	.incbin "baserom.gba", 0xdba14c, 0x3cc
 
 gUnknown_08DBA518:: @ 8DBA518
 	.incbin "baserom.gba", 0xdba518, 0x80
@@ -1268,10 +1352,25 @@ gUnknown_08DC0754:: @ 8DC0754
 	.incbin "baserom.gba", 0xdc0754, 0x440
 
 gUnknown_08DC0B94:: @ 8DC0B94
-	.incbin "baserom.gba", 0xdc0b94, 0xb62
+	 .incbin "baserom.gba", 0xdc0b94, 0x800
+
+gUnknown_08DC1394:: @ 8DC1394
+	 .incbin "baserom.gba", 0xdc1394, 0x2E0
+
+gUnknown_08DC1674:: @ 8DC1674
+	 .incbin "baserom.gba", 0xdc1674, 0x20
+
+gUnknown_08DC1694:: @ 8DC1694
+	 .incbin "baserom.gba", 0xdc1694, 0x20
+
+gUnknown_08DC16B4:: @ 8DC16B4
+	 .incbin "baserom.gba", 0xdc16b4, 0x20
+
+gUnknown_08DC16D4:: @ 8DC16D4
+	 .incbin "baserom.gba", 0xdc16d4, 0x20
 
-gUnknown_08DC16F6:: @ 8DC16F6
-	.incbin "baserom.gba", 0xdc16f6, 0x60
+gUnknown_08DC16F4:: @ 8DC16F4
+	 .incbin "baserom.gba", 0xdc16f4, 0x62
 
 gUnknown_08DC1756:: @ 8DC1756
 	.incbin "baserom.gba", 0xdc1756, 0x60
@@ -1283,7 +1382,10 @@ gUnknown_08DC1876:: @ 8DC1876
 	.incbin "baserom.gba", 0xdc1876, 0xbe
 
 gUnknown_08DC1934:: @ 8DC1934
-	.incbin "baserom.gba", 0xdc1934, 0x10d4
+	.incbin "baserom.gba", 0xdc1934, 0xA18
+
+gUnknown_08DC234C:: @ 8DC234C
+	.incbin "baserom.gba", 0xDC234C, 0x6BC
 
 gUnknown_08DC2A08:: @ 8DC2A08
 	.incbin "baserom.gba", 0xdc2a08, 0x114
@@ -1416,7 +1518,43 @@ gUnknown_08DC7D84:: @ 8DC7D84
 	.incbin "baserom.gba", 0xdc7d84, 0x17c
 
 gUnknown_08DC7F00:: @ 8DC7F00
-	.incbin "baserom.gba", 0xdc7f00, 0x11c0
+	 .incbin "baserom.gba", 0xdc7f00, 0xA0
+
+gUnknown_08DC7FA0:: @ 8DC7FA0
+	 .incbin "baserom.gba", 0xdc7fa0, 0x13C
+
+gUnknown_08DC80DC:: @ 8DC80DC
+	 .incbin "baserom.gba", 0xdc80dc, 0x12C
+
+gUnknown_08DC8208:: @ 8DC8208
+	 .incbin "baserom.gba", 0xdc8208, 0x184
+
+gUnknown_08DC838C:: @ 8DC838C
+	 .incbin "baserom.gba", 0xdc838c, 0x120
+
+gUnknown_08DC84AC:: @ 8DC84AC
+	 .incbin "baserom.gba", 0xdc84ac, 0x1A0
+
+gUnknown_08DC864C:: @ 8DC864C
+	 .incbin "baserom.gba", 0xdc864c, 0x1AC
+
+gUnknown_08DC87F8:: @ 8DC87F8
+	 .incbin "baserom.gba", 0xdc87f8, 0x2AC
+
+gUnknown_08DC8AA4:: @ 8DC8AA4
+	 .incbin "baserom.gba", 0xdc8aa4, 0x170
+
+gUnknown_08DC8C14:: @ 8DC8C14
+	 .incbin "baserom.gba", 0xdc8c14, 0x13C
+
+gUnknown_08DC8D50:: @ 8DC8D50
+	 .incbin "baserom.gba", 0xdc8d50, 0x114
+
+gUnknown_08DC8E64:: @ 8DC8E64
+	 .incbin "baserom.gba", 0xdc8e64, 0x100
+
+gUnknown_08DC8F64:: @ 8DC8F64
+	 .incbin "baserom.gba", 0xdc8f64, 0x15C
 
 gUnknown_08DC90C0:: @ 8DC90C0
 	.incbin "baserom.gba", 0xdc90c0, 0x20
@@ -1428,50 +1566,53 @@ gUnknown_08DC9130:: @ 8DC9130
 	.incbin "baserom.gba", 0xdc9130, 0xb8
 
 gUnknown_08DC91E8:: @ 8DC91E8
-	.incbin "baserom.gba", 0xdc91e8, 0x420
+	 .incbin "baserom.gba", 0xdc91e8, 0x20
+
+gUnknown_08DC9208:: @ 8DC9208
+	 .incbin "baserom.gba", 0xdc9208, 0x400
 
 gUnknown_08DC9608:: @ 8DC9608
 	.incbin "baserom.gba", 0xdc9608, 0x20
 
 gUnknown_08DC9628:: @ 8DC9628
 	.incbin "baserom.gba", 0xdc9628, 0x320
-    
+
 gBerryBlenderMiscPalette:: @ 8DCAB88
 	.incbin "graphics/berry_blender/misc.gbapal"
-    
+
 gBerryBlenderArrowPalette:: @ 8DC9948
 	.incbin "graphics/berry_blender/arrow.gbapal"
 
 gUnknown_8DC9988:: @ 8DC9988
-    .incbin "baserom.gba", 0xdc9988, 0x200
-    
+	.incbin "baserom.gba", 0xdc9988, 0x200
+
 	.align 2
 gBerryBlenderMarubatsuTiles:: @ 8DC9B88
 	.incbin "graphics/berry_blender/marubatsu.4bpp"
-    
+
 	.align 2
 gBerryBlenderParticlesTiles:: @ 8E90818
 	.incbin "graphics/berry_blender/particles.4bpp"
-    
+
 	.space 0x120
 
 	.align 2
 gBerryBlenderCountdownNumbersTiles:: @ 8DC9F88
 	.incbin "graphics/berry_blender/countdown_numbers.4bpp"
-    
+
 	.align 2
 gBerryBlenderStartTiles:: @ 8DCA588
 	.incbin "graphics/berry_blender/start.4bpp"
-    
-    .space 0x200
-    
+
+	.space 0x200
+
    .align 2
 gBerryBlenderArrowTiles:: @ 8DCAB88
 	.incbin "graphics/berry_blender/arrow.4bpp"
 
 gUnknown_08DCB388:: @ 8DCB388
 	.incbin "baserom.gba", 0xdcb388, 0xA28
-    
+
 gUnknown_08DCBDB0:: @ 8DCBDB0
 	.incbin "baserom.gba", 0xdcbdb0, 0x20
 
@@ -1494,10 +1635,19 @@ gUnknown_08DCC648:: @ 8DCC648
 	.incbin "baserom.gba", 0xdcc648, 0x2c0
 
 gUnknown_08DCC908:: @ 8DCC908
-	.incbin "baserom.gba", 0xdcc908, 0x2b0
+	 .incbin "baserom.gba", 0xdcc908, 0x290
+
+gUnknown_08DCCB98:: @ 8DCCB98
+	 .incbin "baserom.gba", 0xdccb98, 0x20
 
 gUnknown_08DCCBB8:: @ 8DCCBB8
-	.incbin "baserom.gba", 0xdccbb8, 0x3a4
+	 .incbin "baserom.gba", 0xdccbb8, 0x184
+
+gUnknown_08DCCD3C:: @ 8DCCD3C
+	 .incbin "baserom.gba", 0xdccd3c, 0x20
+
+gUnknown_08DCCD5C:: @ 8DCCD5C
+	 .incbin "baserom.gba", 0xdccd5c, 0x200
 
 gUnknown_08DCCF5C:: @ 8DCCF5C
 	.incbin "baserom.gba", 0xdccf5c, 0x20
@@ -1524,22 +1674,28 @@ gUnknown_08DCEC70:: @ 8DCEC70
 	.incbin "baserom.gba", 0xdcec70, 0x13e0
 
 gUnknown_08DD0050:: @ 8DD0050
-	.incbin "baserom.gba", 0xdd0050, 0x1a68
+	 .incbin "baserom.gba", 0xdd0050, 0x1A08
+
+gUnknown_08DD1A58:: @ 8DD1A58
+	 .incbin "baserom.gba", 0xdd1a58, 0x60
 
 gUnknown_08DD1AB8:: @ 8DD1AB8
-	.incbin "baserom.gba", 0xdd1ab8, 0x4c0
+	 .incbin "baserom.gba", 0xdd1ab8, 0x4C0
 
 gUnknown_08DD1F78:: @ 8DD1F78
-	.incbin "baserom.gba", 0xdd1f78, 0x98
+	 .incbin "baserom.gba", 0xdd1f78, 0x98
 
 gUnknown_08DD2010:: @ 8DD2010
-	.incbin "baserom.gba", 0xdd2010, 0x1a0
+	 .incbin "baserom.gba", 0xdd2010, 0x1A0
 
 gUnknown_08DD21B0:: @ 8DD21B0
-	.incbin "baserom.gba", 0xdd21b0, 0xdc
+	 .incbin "baserom.gba", 0xdd21b0, 0xDC
 
 gUnknown_08DD228C:: @ 8DD228C
-	.incbin "baserom.gba", 0xdd228c, 0x1e0
+	 .incbin "baserom.gba", 0xdd228c, 0x180
+
+gUnknown_08DD240C:: @ 8DD240C
+	 .incbin "baserom.gba", 0xdd240c, 0x60
 
 gUnknown_08DD246C:: @ 8DD246C
 	.incbin "baserom.gba", 0xdd246c, 0x674
@@ -1582,7 +1738,7 @@ gUnknown_08DD46E0:: @ 8DD46E0
 
 gUnknown_08DD47A0:: @ 8DD47A0
 	.incbin "baserom.gba", 0xdd47a0, 0xc0
-	
+
 gUnknown_08DD4860:: @ 8DD4860
 	.incbin "baserom.gba", 0xdd4860, 0x20
 
@@ -1604,7 +1760,7 @@ gUnknown_08DD4BF0:: @ 8DD4BF0
 gUnknown_08DD4C4C:: @ 8DD4C4C
 	.incbin "baserom.gba", 0xdd4c4c, 0xac
 
-    .align 2
+	.align 2
 gUnknown_08DD4CF8:: @ 8DD4CF8
 	.incbin "graphics/interface/unk_change_case.4bpp.lz"
 
@@ -1638,61 +1794,61 @@ gUnknown_08DD7300:: @ 8DD7300
 	.incbin "baserom.gba", 0xdd7300, 0x60
 
 gUnknown_08DD7360:: @ 8DD7360
-        .incbin "baserom.gba", 0xdd7360, 0x1420
+	.incbin "baserom.gba", 0xdd7360, 0x1420
 
 gUnknown_08DD8780:: @ 8DD8780
-        .incbin "baserom.gba", 0xdd8780, 0x40
+	.incbin "baserom.gba", 0xdd8780, 0x40
 
 gUnknown_08DD87C0:: @ 8DD87C0
-        .incbin "baserom.gba", 0xdd87c0, 0x720
+	.incbin "baserom.gba", 0xdd87c0, 0x720
 
 gUnknown_08DD8EE0:: @ 8DD8EE0
-        .incbin "baserom.gba", 0xdd8ee0, 0x1a0
+	.incbin "baserom.gba", 0xdd8ee0, 0x1a0
 
 gUnknown_08DD9080:: @ 8DD9080
-        .incbin "baserom.gba", 0xdd9080, 0x60
+	.incbin "baserom.gba", 0xdd9080, 0x60
 
 gUnknown_08DD90E0:: @ 8DD90E0
-        .incbin "baserom.gba", 0xdd90e0, 0x638
+	.incbin "baserom.gba", 0xdd90e0, 0x638
 
 gUnknown_08DD9718:: @ 8DD9718
-        .incbin "baserom.gba", 0xdd9718, 0x15c
+	.incbin "baserom.gba", 0xdd9718, 0x15c
 
 gUnknown_08DD9874:: @ 8DD9874
-        .incbin "baserom.gba", 0xdd9874, 0x40
+	.incbin "baserom.gba", 0xdd9874, 0x40
 
 gUnknown_08DD98B4:: @ 8DD98B4
-        .incbin "baserom.gba", 0xdd98b4, 0x5a4
+	.incbin "baserom.gba", 0xdd98b4, 0x5a4
 
 gUnknown_08DD9E58:: @ 8DD9E58
-        .incbin "baserom.gba", 0xdd9e58, 0x194
+	.incbin "baserom.gba", 0xdd9e58, 0x194
 
 gUnknown_08DD9FEC:: @ 8DD9FEC
-        .incbin "baserom.gba", 0xdd9fec, 0x40
+	.incbin "baserom.gba", 0xdd9fec, 0x40
 
 gUnknown_08DDA02C:: @ 8DDA02C
-        .incbin "baserom.gba", 0xdda02c, 0x610
+	.incbin "baserom.gba", 0xdda02c, 0x610
 
 gUnknown_08DDA63C:: @ 8DDA63C
-        .incbin "baserom.gba", 0xdda63c, 0x1c4
+	.incbin "baserom.gba", 0xdda63c, 0x1c4
 
 gUnknown_08DDA800:: @ 8DDA800
-        .incbin "baserom.gba", 0xdda800, 0x40
+	.incbin "baserom.gba", 0xdda800, 0x40
 
 gUnknown_08DDA840:: @ 8DDA840
-        .incbin "baserom.gba", 0xdda840, 0x600
+	.incbin "baserom.gba", 0xdda840, 0x600
 
 gUnknown_08DDAE40:: @ 8DDAE40
-        .incbin "baserom.gba", 0xddae40, 0x1a0
+	.incbin "baserom.gba", 0xddae40, 0x1a0
 
 gUnknown_08DDAFE0:: @ 8DDAFE0
-        .incbin "baserom.gba", 0xddafe0, 0x40
+	.incbin "baserom.gba", 0xddafe0, 0x40
 
 gUnknown_08DDB020:: @ 8DDB020
-        .incbin "baserom.gba", 0xddb020, 0x2a4
+	.incbin "baserom.gba", 0xddb020, 0x2a4
 
 gUnknown_08DDB2C4:: @ 8DDB2C4
-        .incbin "baserom.gba", 0xddb2c4, 0x120
+	.incbin "baserom.gba", 0xddb2c4, 0x120
 
 gUnknown_08DDB3E4:: @ 8DDB3E4
 	.incbin "baserom.gba", 0xddb3e4, 0x80