Merge pull request #130 from DizzyEggg/decompile_pokeball

Decompile pokeball

3 files changed, 102 insertions, 17 deletions

diff --git a/data/graphics.s b/data/graphics.s
index 72daf144f..06c4b9e18 100644
--- a/data/graphics.s
+++ b/data/graphics.s
@@ -16,12 +16,108 @@ gUnknown_08C00524:: @ 8C00524
 	.incbin "baserom.gba", 0xc00c10, 0xa34
 
 gUnknown_08C01644:: @ 8C01644
-	.incbin "baserom.gba", 0xc01644, 0xE0
+	.incbin "baserom.gba", 0xc01644, 0xe0
 
 gUnknown_08C01724:: @ 8C01724
-	.incbin "baserom.gba", 0xc01724, 0xBDC
+	.incbin "baserom.gba", 0xc01724, 0x18
+	
+	.align 2
+gInterfaceGfx_PokeBall::
+	.incbin "graphics/interface/ball/poke.4bpp.lz" @ 0xBC
+
+	.align 2
+gInterfacePal_PokeBall::
+	.incbin "graphics/interface/ball/poke.gbapal.lz"
+
+	.align 2
+gInterfaceGfx_GreatBall::
+	.incbin "graphics/interface/ball/great.4bpp.lz" @ 0xBC
+
+	.align 2
+gInterfacePal_GreatBall::
+	.incbin "graphics/interface/ball/great.gbapal.lz"
+
+	.align 2
+gInterfaceGfx_SafariBall::
+	.incbin "graphics/interface/ball/safari.4bpp.lz" @ 0xBC
+
+	.align 2
+gInterfacePal_SafariBall::
+	.incbin "graphics/interface/ball/safari.gbapal.lz"
+
+	.align 2
+gInterfaceGfx_UltraBall::
+	.incbin "baserom.gba", 0xC019E0, 0xB4
+
+	.align 2
+gInterfacePal_UltraBall::
+	.incbin "baserom.gba", 0xC01A94, 0x20
+
+	.align 2
+gInterfaceGfx_MasterBall::
+	.incbin "graphics/interface/ball/master.4bpp.lz" @ 0xBC
+
+	.align 2
+gInterfacePal_MasterBall::
+	.incbin "graphics/interface/ball/master.gbapal.lz"
+
+	.align 2
+gInterfaceGfx_NetBall::
+	.incbin "graphics/interface/ball/net.4bpp.lz" @ 0xBC
+
+	.align 2
+gInterfacePal_NetBall::
+	.incbin "graphics/interface/ball/net.gbapal.lz"
+
+	.align 2
+gInterfaceGfx_DiveBall::
+	.incbin "graphics/interface/ball/dive.4bpp.lz" @ 0xBC
+
+	.align 2
+gInterfacePal_DiveBall::
+	.incbin "graphics/interface/ball/dive.gbapal.lz"
+
+	.align 2
+gInterfaceGfx_NestBall::
+	.incbin "graphics/interface/ball/nest.4bpp.lz" @ 0xBC
+
+	.align 2
+gInterfacePal_NestBall::
+	.incbin "graphics/interface/ball/nest.gbapal.lz"
+
+	.align 2
+gInterfaceGfx_RepeatBall::
+	.incbin "graphics/interface/ball/repeat.4bpp.lz" @ 0xBC
+
+	.align 2
+gInterfacePal_RepeatBall::
+	.incbin "graphics/interface/ball/repeat.gbapal.lz"
+
+	.align 2
+gInterfaceGfx_TimerBall::
+	.incbin "graphics/interface/ball/timer.4bpp.lz" @ 0xBC
+
+	.align 2
+gInterfacePal_TimerBall::
+	.incbin "graphics/interface/ball/timer.gbapal.lz"
+
+	.align 2
+gInterfaceGfx_LuxuryBall::
+	.incbin "graphics/interface/ball/luxury.4bpp.lz" @ 0xBC
+
+	.align 2
+gInterfacePal_LuxuryBall::
+	.incbin "graphics/interface/ball/luxury.gbapal.lz"
+
+	.align 2
+gInterfaceGfx_PremierBall::
+	.incbin "graphics/interface/ball/premier.4bpp.lz" @ 0xBC
+
+	.align 2
+gInterfacePal_PremierBall::
+	.incbin "graphics/interface/ball/premier.gbapal.lz"
 
-gUnknown_08C02300:: @ 8C02300
+gOpenPokeballGfx:: @ 8C02300
 	.incbin "baserom.gba", 0xc02300, 0x7c
 
 gUnknown_08C0237C:: @ 8C0237C
diff --git a/data/pokeball.s b/data/pokeball.s
deleted file mode 100644
index 4e7b4315a..000000000
--- a/data/pokeball.s
+++ /dev/null
@@ -1,14 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-	.align 2, 0
-
-gUnknown_0832C400:: @ 832C400
-	.incbin "baserom.gba", 0x32c400, 0x60
-
-gUnknown_0832C460:: @ 832C460
-	.incbin "baserom.gba", 0x32c460, 0x128
-
-gUnknown_0832C588:: @ 832C588
-	.incbin "baserom.gba", 0x32c588, 0x138
diff --git a/data/trade.s b/data/trade.s
index 3150269b0..b392fbc24 100644
--- a/data/trade.s
+++ b/data/trade.s
@@ -3,6 +3,9 @@
 
     .section .rodata
     .align 2, 0
+	
+gUnknown_0832C6A8:: @ 832C6A8
+	.incbin "baserom.gba", 0x32C6A8, 0x18
 
 gUnknown_0832C6C0:: @ 832C6C0
 	.incbin "baserom.gba", 0x32c6c0, 0x1fe