roulette incbins

pret · Jan 8, 2017 · 44dfc17 · 44dfc17
1 parent cb875db
commit 44dfc17
Show file tree

Hide file tree

Showing 13 changed files with 499 additions and 271 deletions.
diff --git a/asm/roulette.s b/asm/roulette.s
@@ -369,7 +369,7 @@ _081153D0:
 	movs r1, 0xC0
 	lsls r1, 19
 	bl LZ77UnCompVram
-	ldr r0, _08115434 @ =gUnknown_08E81098
+	ldr r0, _08115434 @ =gRouletteWheelTiles
 	ldr r1, _08115438 @ =0x06004000
 	bl LZ77UnCompVram
 	ldr r1, _0811543C @ =gMain
@@ -382,7 +382,7 @@ _08115424: .4byte 0x00004686
 _08115428: .4byte 0x00004401
 _0811542C: .4byte 0x0000060a
 _08115430: .4byte gUnknown_08E8096C
-_08115434: .4byte gUnknown_08E81098
+_08115434: .4byte gRouletteWheelTiles
 _08115438: .4byte 0x06004000
 _0811543C: .4byte gMain
 _08115440: .4byte 0x0000043c
@@ -3571,7 +3571,7 @@ _08116DEE:
 	cmp r3, 0x3
 	bls _08116DC8
 	movs r2, 0
-	ldr r0, _08116E54 @ =gUnknown_083F8D94
+	ldr r0, _08116E54 @ =gUnknown_083F8D90 + 0x4
 	add r0, r12
 	ldr r7, [r0]
 	ldr r4, _08116E58 @ =0x02019016
@@ -3617,7 +3617,7 @@ _08116E38:
 _08116E48: .4byte 0x02019000
 _08116E4C: .4byte gTasks
 _08116E50: .4byte gUnknown_083F8D90
-_08116E54: .4byte gUnknown_083F8D94
+_08116E54: .4byte gUnknown_083F8D90 + 0x4
 _08116E58: .4byte 0x02019016
 	thumb_func_end sub_8116D54
 
@@ -8689,10 +8689,10 @@ _081196A8:
 	cmp r5, r9
 	bcs _0811970E
 	ldr r6, _08119734 @ =0x02019000
-	ldr r7, _08119738 @ =gUnknown_083F8C0C
+	ldr r7, _08119738 @ =gUnknown_083F8C00 + 0xC
 _081196B6:
 	lsls r0, r3, 3
-	ldr r1, _0811973C @ =gUnknown_083F8D94
+	ldr r1, _0811973C @ =gUnknown_083F8D90 + 0x4
 	adds r0, r1
 	ldr r1, [r6, 0x8]
 	ldr r2, [r0]
@@ -8757,8 +8757,8 @@ _0811970E:
 	b _08119766
 	.align 2, 0
 _08119734: .4byte 0x02019000
-_08119738: .4byte gUnknown_083F8C0C
-_0811973C: .4byte gUnknown_083F8D94
+_08119738: .4byte gUnknown_083F8C00 + 0xC
+_0811973C: .4byte gUnknown_083F8D90 + 0x4
 _08119740: .4byte 0x0201901b
 _08119744:
 	ldr r0, [sp, 0x10]

diff --git a/data/graphics.s b/data/graphics.s
@@ -3401,8 +3401,8 @@ gUnknown_08E8096C:: @ 8E8096C
 	.incbin "graphics/unknown/unknown_E8096C.4bpp.lz"
 
 	.align 2
-gUnknown_08E81098:: @ 8E81098
-	.incbin "graphics/unknown/unknown_E81098.bin.lz"
+gRouletteWheelTiles:: @ 8E81098
+	.incbin "graphics/roulette/wheel.8bpp.lz"
 
 	.align 2
 gRouletteCenter_Gfx::

diff --git a/data/roulette.s b/data/roulette.s
@@ -3,44 +3,95 @@
 
 	.section .rodata
 
+	.align 1
 gUnknown_083F86BC:: @ 83F86BC
-	.incbin "baserom.gba", 0x003f86bc, 0x40
+	.incbin "graphics/roulette/83F86BC.gbapal"
 
 	.align 2
-gRouletteCenter_Pal::
-	.incbin "graphics/roulette/center.gbapal"
-
-	.incbin "baserom.gba", 0x003f871c, 0x1A0
-
 gUnknown_083F88BC:: @ 83F88BC
-	.incbin "baserom.gba", 0x003f88bc, 0x1a4
+	.incbin "graphics/roulette/83F88BC.bin.lz"
 
+	.align 2
 gUnknown_083F8A60:: @ 83F8A60
-	.incbin "baserom.gba", 0x003f8a60, 0x1a0
+	.incbin "graphics/roulette/wheel_map.bin.lz"
 
+	.align 2
 gUnknown_083F8C00:: @ 83F8C00
-	.incbin "baserom.gba", 0x003f8c00, 0xc
-
-gUnknown_083F8C0C:: @ 83F8C0C
-	.incbin "baserom.gba", 0x003f8c0c, 0x184
+	.byte 0xFF,0x00,0x00,0x07,0x07,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00
+	.byte 0x0C,0x14,0x00,0x11,0x07,0x00,0x00,0x00,0x02,0x00,0x00,0x00,0x42,0x08,0x01,0x00,0x00,0xE0,0x00,0x00
+	.byte 0x0D,0x24,0x00,0x14,0x07,0x00,0x00,0x00,0x04,0x00,0x00,0x00,0x84,0x10,0x02,0x00,0x00,0xE0,0x00,0x00
+	.byte 0x0E,0x34,0x00,0x17,0x07,0x00,0x00,0x00,0x08,0x00,0x00,0x00,0x08,0x21,0x04,0x00,0x00,0xE0,0x00,0x00
+	.byte 0x0F,0x44,0x00,0x1A,0x07,0x00,0x00,0x00,0x10,0x00,0x00,0x00,0x10,0x42,0x08,0x00,0x00,0xE0,0x00,0x00
+	.byte 0x10,0x03,0x01,0x0E,0x0A,0x00,0x0C,0x00,0x20,0x00,0x00,0x00,0xE0,0x03,0x00,0x00,0x49,0x02,0x00,0x00
+	.byte 0x00,0x1C,0x01,0x11,0x0A,0x03,0x03,0x00,0x40,0x00,0x00,0x00,0x40,0x00,0x00,0x00,0x01,0x20,0x00,0x00
+	.byte 0x09,0x2C,0x01,0x14,0x0A,0x03,0x03,0x00,0x80,0x00,0x00,0x00,0x80,0x00,0x00,0x00,0x00,0x22,0x00,0x00
+	.byte 0x06,0x3C,0x01,0x17,0x0A,0x03,0x03,0x00,0x00,0x01,0x00,0x00,0x00,0x01,0x00,0x00,0x40,0x20,0x00,0x00
+	.byte 0x03,0x4C,0x01,0x1A,0x0A,0x03,0x03,0x00,0x00,0x02,0x00,0x00,0x00,0x02,0x00,0x00,0x08,0x20,0x00,0x00
+	.byte 0x11,0x03,0x02,0x0E,0x0D,0x03,0x0F,0x00,0x00,0x04,0x00,0x00,0x00,0x7C,0x00,0x00,0x92,0x04,0x00,0x00
+	.byte 0x04,0x1C,0x02,0x11,0x0D,0x06,0x06,0x00,0x00,0x08,0x00,0x00,0x00,0x08,0x00,0x00,0x10,0x20,0x00,0x00
+	.byte 0x01,0x2C,0x02,0x14,0x0D,0x06,0x06,0x00,0x00,0x10,0x00,0x00,0x00,0x10,0x00,0x00,0x02,0x20,0x00,0x00
+	.byte 0x0A,0x3C,0x02,0x17,0x0D,0x06,0x06,0x00,0x00,0x20,0x00,0x00,0x00,0x20,0x00,0x00,0x00,0x24,0x00,0x00
+	.byte 0x07,0x4C,0x02,0x1A,0x0D,0x06,0x06,0x00,0x00,0x40,0x00,0x00,0x00,0x40,0x00,0x00,0x80,0x20,0x00,0x00
+	.byte 0x12,0x03,0x03,0x0E,0x10,0x06,0x12,0x00,0x00,0x80,0x00,0x00,0x00,0x80,0x0F,0x00,0x24,0x09,0x00,0x00
+	.byte 0x08,0x1C,0x03,0x11,0x10,0x09,0x09,0x00,0x00,0x00,0x01,0x00,0x00,0x00,0x01,0x00,0x00,0x21,0x00,0x00
+	.byte 0x05,0x2C,0x03,0x14,0x10,0x09,0x09,0x00,0x00,0x00,0x02,0x00,0x00,0x00,0x02,0x00,0x20,0x20,0x00,0x00
+	.byte 0x02,0x3C,0x03,0x17,0x10,0x09,0x09,0x00,0x00,0x00,0x04,0x00,0x00,0x00,0x04,0x00,0x04,0x20,0x00,0x00
+	.byte 0x0B,0x4C,0x03,0x1A,0x10,0x09,0x09,0x00,0x00,0x00,0x08,0x00,0x00,0x00,0x08,0x00,0x00,0x28,0x00,0x00
 
+	.align 2
 gUnknown_083F8D90:: @ 83F8D90
-	.incbin "baserom.gba", 0x003f8d90, 0x4
-
-gUnknown_083F8D94:: @ 83F8D94
-	.incbin "baserom.gba", 0x003f8d94, 0x5c
+	.byte    0,   1,   6,   0,  64,   0,   0,   0
+	.byte    1,   3,  12,   0,   0,  16,   0,   0
+	.byte    2,   5,  18,   0,   0,   0,   4,   0
+	.byte    3,   7,   9,   0,   0,   2,   0,   0
+	.byte    4,   9,  11,   0,   0,   8,   0,   0
+	.byte    5,  11,  17,   0,   0,   0,   2,   0
+	.byte    6,  13,   8,   0,   0,   1,   0,   0
+	.byte    7,  15,  14,   0,   0,  64,   0,   0
+	.byte    8,  17,  16,   0,   0,   0,   1,   0
+	.byte    9,  19,   7,   0, 128,   0,   0,   0
+	.byte   10,  21,  13,   0,   0,  32,   0,   0
+	.byte   11,  23,  19,   0,   0,   0,   8,   0
 
 gUnknown_083F8DF0:: @ 83F8DF0
-	.incbin "baserom.gba", 0x003f8df0, 0x4
+	.byte 1, 3
+	.byte 1, 6
 
+	.align 2
 gUnknown_083F8DF4:: @ 83F8DF4
-	.incbin "baserom.gba", 0x003f8df4, 0x40
+	.byte 0x01,0x3C,0x1E,0x01,0x01,0x00,0x00,0x00,0x2D,0x00,0x1E,0x00,0x01,0x00,0x00,0x00,0x4B,0x00,0x1B,0x00,0x18,0x00,0x00,0x00,0x0A,0x00,0x68,0x01,0x00,0x00,0x00,0xBF
+	.byte 0x03,0x1E,0x0F,0x01,0x00,0x00,0x00,0x00,0x4B,0x00,0x3C,0x00,0x02,0x00,0x00,0x00,0x00,0x00,0x36,0x00,0x30,0x00,0x00,0x00,0x0A,0x00,0x0E,0x01,0x00,0x00,0x80,0xBF
 
+	.align 2
 gUnknown_083F8E34:: @ 83F8E34
-	.incbin "baserom.gba", 0x003f8e34, 0x68
+	.byte 0x00,0x80,0x05,0x00,0x01,0x01,0xFF,0x48
+	.byte 0x00,0x80,0x0A,0x00,0x01,0x01,0xFF,0x48
+	.byte 0x00,0x80,0x15,0x00,0x01,0x01,0xFF,0x48
+	.byte 0x00,0x80,0x55,0x00,0x01,0x01,0xFF,0x48
+	.byte 0x00,0x80,0x5A,0x00,0x01,0x01,0xFF,0x48
+	.byte 0x00,0x80,0x65,0x00,0x01,0x01,0xFF,0x48
+	.byte 0x00,0x80,0x75,0x00,0x01,0x01,0xFF,0x48
+	.byte 0x00,0x80,0x7A,0x00,0x01,0x01,0xFF,0x48
+	.byte 0x00,0x80,0x85,0x00,0x01,0x01,0xFF,0x48
+	.byte 0x00,0x80,0x95,0x00,0x01,0x01,0xFF,0x48
+	.byte 0x00,0x80,0x9A,0x00,0x01,0x01,0xFF,0x48
+	.byte 0x00,0x80,0xA5,0x00,0x01,0x01,0xFF,0x48
+	.byte 0xD6,0x77,0x28,0x00,0x02,0x0A,0xFF,0x4E
 
+	.align 1
 gUnknown_083F8E9C:: @ 83F8E9C
-	.incbin "baserom.gba", 0x003f8e9c, 0x18
+	.2byte 0x53FF
+	.2byte 0x0101
+	.2byte 0x1E05
+	.2byte 0x4EFF
+	.2byte 0x7FFB
+	.2byte 0x0106
+	.2byte 0x1E05
+	.2byte 0x4EFF
+	.2byte 0x7F7F
+	.2byte 0x010B
+	.2byte 0x1E05
+	.2byte 0x4EFF
 
 	.align 2
 gUnknown_083F8EB4:: @ 83F8EB4
@@ -52,20 +103,32 @@ gUnknown_083F8EBC:: @ 83F8EBC
 	.4byte sub_811577C
 	.4byte sub_81157AC
 
+	.align 1
 gUnknown_083F8EC4:: @ 83F8EC4
-	.incbin "baserom.gba", 0x003f8ec4, 0x6
+	.2byte 0x2898
+	.2byte 0x1A6A
+	.2byte 0x2898
 
 gUnknown_083F8ECA:: @ 83F8ECA
-	.incbin "baserom.gba", 0x003f8eca, 0x4
+	.byte 0xFB, 0x05, 0xFF, 0x01
 
+	.align 1
 gUnknown_083F8ECE:: @ 83F8ECE
-	.incbin "baserom.gba", 0x003f8ece, 0xa
+	.2byte  0, 180
+	.2byte 90, 270
 
+	.align 2
 gUnknown_083F8ED8:: @ 83F8ED8
-	.incbin "baserom.gba", 0x003f8ed8, 0x10
+	.4byte 0x10842
+	.4byte 0x21084
+	.4byte 0x42108
+	.4byte 0x84210
 
+	.align 2
 gUnknown_083F8EE8:: @ 83F8EE8
-	.incbin "baserom.gba", 0x003f8ee8, 0xc
+	.4byte   0x3E0
+	.4byte  0x7C00
+	.4byte 0xF8000
 
 gUnknown_083F8EF4:: @ 83F8EF4
 	.byte 0, 3, 4, 6, 12
@@ -120,19 +183,19 @@ RouletteSpritePalette_12:
 
 	.align 2
 RouletteSpritePalette_13:
-	.incbin "baserom.gba", 0x003F907C, 0x20
+	.incbin "graphics/roulette/83F907C.gbapal"
 
 	.align 2
 RouletteSpritePalette_14:
-	.incbin "baserom.gba", 0x003F909C, 0x20
+	.incbin "graphics/roulette/83F909C.gbapal"
 
 	.align 2
 RouletteSpritePalette_15:
-	.incbin "baserom.gba", 0x003F90BC, 0x20
+	.incbin "graphics/roulette/83F90BC.gbapal"
 
 	.align 2
 RouletteSpritePalette_16:
-	.incbin "baserom.gba", 0x003F90DC, 0x20
+	.incbin "graphics/roulette/83F90DC.gbapal"
 
 	.align 2
 gUnknown_083F90FC:: @ 83F90FC
@@ -594,12 +657,26 @@ gSpriteAnim_83FA38C:: @ 83FA38C
 	obj_image_anim_end
 
 	.align 2
-Unknown_083FA3A0:
-	.incbin "baserom.gba", 0x003fa3a0, 0x18
-Unknown_083FA3B8:
-	.incbin "baserom.gba", 0x003fa3b8, 0x14
-Unknown_083FA3CC:
-	.incbin "baserom.gba", 0x003fa3cc, 0x8
+gSpriteAnim_83FA3A0:: @ 83FA3A0
+	obj_image_anim_frame 1, 2
+	obj_image_anim_frame 0, 4
+	obj_image_anim_frame 1, 4
+	obj_image_anim_frame 2, 4
+	obj_image_anim_frame 3, 4
+	obj_image_anim_end
+
+	.align 2
+gSpriteAnim_83FA3B8:: @ 83FA3B8
+	obj_image_anim_frame 0, 2
+	obj_image_anim_frame 1, 5
+	obj_image_anim_frame 2, 5
+	obj_image_anim_frame 3, 5
+	obj_image_anim_end
+
+	.align 2
+gSpriteAnim_83FA3CC:: @ 83FA3CC
+	obj_image_anim_frame 3, 0
+	obj_image_anim_end
 
 	.align 2
 gSpriteAnim_83FA3D4:: @ 83FA3D4
@@ -616,12 +693,10 @@ gSpriteAnimTable_83FA3E8:: @ 83FA3E8
 	.4byte gSpriteAnim_83FA378
 	.4byte gSpriteAnim_83FA38C
 	.4byte gSpriteAnim_83FA3D4
-
-	.align 2
-	.4byte Unknown_083FA3A0
-	.4byte Unknown_083FA3B8
-	.4byte Unknown_083FA3B8
-	.4byte Unknown_083FA3CC
+	.4byte gSpriteAnim_83FA3A0
+	.4byte gSpriteAnim_83FA3B8
+	.4byte gSpriteAnim_83FA3B8
+	.4byte gSpriteAnim_83FA3CC
 
 	.align 2
 gSpriteTemplate_83FA40C:: @ 83FA40C
@@ -755,8 +830,10 @@ gSpriteImageTable_83FA55C: @ 83FA55C
 	obj_frame_tiles 0x02018080, 0x100
 
 	.align 2
-gUnknown_083FA564: @ 83FA564
-	.incbin "baserom.gba", 0x003fa564, 0x18
+gSpriteAffineAnim_83FA564:: @ 83FA564
+	obj_rot_scal_anim_frame 0x80, 0x80, 0, 0
+	obj_rot_scal_anim_frame 0x2, 0x2, 0, 60
+	obj_rot_scal_anim_end
 
 	.align 2
 gSpriteAffineAnim_83FA57C:: @ 83FA57C
@@ -767,19 +844,21 @@ gSpriteAffineAnim_83FA57C:: @ 83FA57C
 	obj_rot_scal_anim_end
 
 	.align 2
-	.4byte gUnknown_083FA564
+gSpriteAffineAnimTable_83FA5A4:: @ 83FA5A4
+	.4byte gSpriteAffineAnim_83FA564
 
 	.align 2
 gSpriteAffineAnimTable_83FA5A8:: @ 83FA5A8
 	.4byte gSpriteAffineAnim_83FA57C
 
 	.align 2
-gUnknown_083FA5AC:: @ 83FA5AC
-	.incbin "baserom.gba", 0x003fa5ac, 0x10
+gSpriteAffineAnim_83FA5AC:: @ 83FA5AC
+	obj_rot_scal_anim_frame 0x100, 0x100, 0, 0
+	obj_rot_scal_anim_end
 
 	.align 2
-@ unreferenced
-	.4byte gUnknown_083FA5AC
+gSpriteAffineAnimTable_83FA5BC:: @ 83FA5BC
+	.4byte gSpriteAffineAnim_83FA5AC
 
 	.align 2
 gSpriteTemplate_83FA5C0:: @ 83FA5C0
@@ -794,24 +873,46 @@ gSpriteTemplate_83FA5F0:: @ 83FA5F0
 	spr_template 0xFFFF, 1, gOamData_83FA54C, gSpriteAnimTable_83F9ED8, gSpriteImageTable_83FA55C, gSpriteAffineAnimTable_83FA5A8, sub_8119D80
 
 gUnknown_083FA608:: @ 83FA608
-	.incbin "baserom.gba", 0x003fa608, 0x6
+	.byte 0, 1, 2, 3, 4
 
 	.align 1
 gUnknown_083FA60E:: @ 83FA60E
 	.2byte 0x74, 0x2C
 	.2byte 0x74, 0x70
 
+	.align 1
 gUnknown_083FA616:: @ 83FA616
-	.incbin "baserom.gba", 0x003fa616, 0x8
+	.2byte 256, 84
+	.2byte -16, 84
 
+	.align 1
 gUnknown_083FA61E:: @ 83FA61E
-	.incbin "baserom.gba", 0x003fa61e, 0x14
+	.2byte 0x907
+	.2byte 0x808
+	.2byte 0x709
+	.2byte 0x60A
+	.2byte 0x50B
+	.2byte 0x40C
+	.2byte 0x30D
+	.2byte 0x20E
+	.2byte 0x10F
+	.2byte  0x10
 
+	.align 1
 gUnknown_083FA632:: @ 83FA632
-	.incbin "baserom.gba", 0x003fa632, 0x18
+	.2byte  -1,  0,  1,  0
+	.2byte  -2,  0,  2,  0
+	.2byte  -3,  0,  3,  0
 
 gUnknown_083FA64A:: @ 83FA64A
 	.byte -1, 1
 
 gUnknown_083FA64C:: @ 83FA64C
-	.incbin "baserom.gba", 0x003fa64c, 0x10
+	.byte   2,  0
+	.byte   2,  0
+	.byte   2, -1
+	.byte   2, -1
+	.byte   2, -1
+	.byte   2, -1
+	.byte   2, -2
+	.byte   2, -2