summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
Diffstat (limited to 'data')
-rw-r--r--data/graphics.s4
-rw-r--r--data/menu_cursor.s262
-rw-r--r--data/naming_screen.s98
-rw-r--r--data/pokenav.s457
-rw-r--r--data/roulette.s207
-rw-r--r--data/text/credits.inc51
6 files changed, 874 insertions, 205 deletions
diff --git a/data/graphics.s b/data/graphics.s
index f597b1248..5111c4b99 100644
--- 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/menu_cursor.s b/data/menu_cursor.s
index 80d7e1210..0e12c519c 100644
--- a/data/menu_cursor.s
+++ b/data/menu_cursor.s
@@ -161,68 +161,172 @@ gSpriteTemplate_842F2B0:: @ 842F2B0
spr_template 65521, 0xFFFF, gOamData_842F12C, gSpriteAnimTable_842F13C, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
.align 2
-Unknown_842F2C8: @ 842F2C8
- .incbin "baserom.gba", 0x0042f2c8, 0x10
-Unknown_842F2D8: @ 842F2D8
- .incbin "baserom.gba", 0x0042f2d8, 0x18
-Unknown_842F2F0: @ 842F2F0
- .incbin "baserom.gba", 0x0042f2f0, 0x20
-Unknown_842F310: @ 842F310
- .incbin "baserom.gba", 0x0042f310, 0x18
-Unknown_842F328: @ 842F328
- .incbin "baserom.gba", 0x0042f328, 0x18
-Unknown_842F340: @ 842F340
- .incbin "baserom.gba", 0x0042f340, 0x20
-Unknown_842F360: @ 842F360
- .incbin "baserom.gba", 0x0042f360, 0x20
-Unknown_842F380: @ 842F380
- .incbin "baserom.gba", 0x0042f380, 0x20
-Unknown_842F3A0: @ 842F3A0
- .incbin "baserom.gba", 0x0042f3a0, 0x20
-Unknown_842F3C0: @ 842F3C0
- .incbin "baserom.gba", 0x0042f3c0, 0x28
-Unknown_842F3E8: @ 842F3E8
- .incbin "baserom.gba", 0x0042f3e8, 0x28
-Unknown_842F410: @ 842F410
- .incbin "baserom.gba", 0x0042f410, 0x28
-Unknown_842F438: @ 842F438
- .incbin "baserom.gba", 0x0042f438, 0x28
-Unknown_842F460: @ 842F460
- .incbin "baserom.gba", 0x0042f460, 0x30
-Unknown_842F490: @ 842F490
- .incbin "baserom.gba", 0x0042f490, 0x30
-Unknown_842F4C0: @ 842F4C0
- .incbin "baserom.gba", 0x0042f4c0, 0x30
-Unknown_842F4F0: @ 842F4F0
- .incbin "baserom.gba", 0x0042f4f0, 0x30
-Unknown_842F520: @ 842F520
- .incbin "baserom.gba", 0x0042f520, 0x38
-Unknown_842F558: @ 842F558
- .incbin "baserom.gba", 0x0042f558, 0x18
-
- .4byte Unknown_842F2C8
- .4byte Unknown_842F2C8
- .4byte Unknown_842F2D8
- .4byte Unknown_842F2F0
- .4byte Unknown_842F310
- .4byte Unknown_842F328
- .4byte Unknown_842F340
- .4byte Unknown_842F360
- .4byte Unknown_842F380
- .4byte Unknown_842F3A0
- .4byte Unknown_842F3C0
- .4byte Unknown_842F3E8
- .4byte Unknown_842F410
- .4byte Unknown_842F438
- .4byte Unknown_842F460
- .4byte Unknown_842F490
- .4byte Unknown_842F4C0
- .4byte Unknown_842F4F0
- .4byte Unknown_842F520
+gSubspriteTable_842F2C8:: @ 842F2C8
+ subsprite -1, 0, 0, 0, 8x16
+ subsprite 1, 0, 0, 4, 8x16
+
+ .align 2
+gSubspriteTable_842F2D8:: @ 842F2D8
+ subsprite -1, 0, 0, 0, 8x16
+ subsprite 1, 0, 0, 2, 8x16
+ subsprite 9, 0, 0, 4, 8x16
+
+ .align 2
+gSubspriteTable_842F2F0:: @ 842F2F0
+ subsprite -1, 0, 0, 0, 8x16
+ subsprite 1, 0, 0, 2, 8x16
+ subsprite 9, 0, 0, 2, 8x16
+ subsprite 17, 0, 0, 4, 8x16
+
+ .align 2
+gSubspriteTable_842F310:: @ 842F310
+ subsprite -1, 0, 0, 0, 8x16
+ subsprite 1, 0, 0, 6, 32x16
+ subsprite 25, 0, 0, 4, 8x16
+
+ .align 2
+gSubspriteTable_842F328:: @ 842F328
+ subsprite -1, 0, 0, 0, 8x16
+ subsprite 1, 0, 0, 6, 32x16
+ subsprite 33, 0, 0, 4, 8x16
+
+ .align 2
+gSubspriteTable_842F340:: @ 842F340
+ subsprite -1, 0, 0, 0, 8x16
+ subsprite 1, 0, 0, 2, 8x16
+ subsprite 9, 0, 0, 6, 32x16
+ subsprite 41, 0, 0, 4, 8x16
+
+ .align 2
+gSubspriteTable_842F360:: @ 842F360
+ subsprite -1, 0, 0, 0, 8x16
+ subsprite 1, 0, 0, 6, 32x16
+ subsprite 17, 0, 0, 6, 32x16
+ subsprite 49, 0, 0, 4, 8x16
+
+ .align 2
+gSubspriteTable_842F380:: @ 842F380
+ subsprite -1, 0, 0, 0, 8x16
+ subsprite 1, 0, 0, 6, 32x16
+ subsprite 25, 0, 0, 6, 32x16
+ subsprite 57, 0, 0, 4, 8x16
+
+ .align 2
+gSubspriteTable_842F3A0:: @ 842F3A0
+ subsprite -1, 0, 0, 0, 8x16
+ subsprite 1, 0, 0, 6, 32x16
+ subsprite 33, 0, 0, 6, 32x16
+ subsprite 65, 0, 0, 4, 8x16
+
+ .align 2
+gSubspriteTable_842F3C0:: @ 842F3C0
+ subsprite -1, 0, 0, 0, 8x16
+ subsprite 1, 0, 0, 2, 8x16
+ subsprite 9, 0, 0, 6, 32x16
+ subsprite 41, 0, 0, 6, 32x16
+ subsprite 73, 0, 0, 4, 8x16
+
+ .align 2
+gSubspriteTable_842F3E8:: @ 842F3E8
+ subsprite -1, 0, 0, 0, 8x16
+ subsprite 1, 0, 0, 6, 32x16
+ subsprite 33, 0, 0, 6, 32x16
+ subsprite 49, 0, 0, 6, 32x16
+ subsprite 81, 0, 0, 4, 8x16
+
+ .align 2
+gSubspriteTable_842F410:: @ 842F410
+ subsprite -1, 0, 0, 0, 8x16
+ subsprite 1, 0, 0, 6, 32x16
+ subsprite 33, 0, 0, 6, 32x16
+ subsprite 57, 0, 0, 6, 32x16
+ subsprite 89, 0, 0, 4, 8x16
+
+ .align 2
+gSubspriteTable_842F438:: @ 842F438
+ subsprite -1, 0, 0, 0, 8x16
+ subsprite 1, 0, 0, 6, 32x16
+ subsprite 33, 0, 0, 6, 32x16
+ subsprite 65, 0, 0, 6, 32x16
+ subsprite 97, 0, 0, 4, 8x16
+
+ .align 2
+gSubspriteTable_842F460:: @ 842F460
+ subsprite -1, 0, 0, 0, 8x16
+ subsprite 1, 0, 0, 2, 8x16
+ subsprite 9, 0, 0, 6, 32x16
+ subsprite 41, 0, 0, 6, 32x16
+ subsprite 73, 0, 0, 6, 32x16
+ subsprite 105, 0, 0, 4, 8x16
+
+ .align 2
+gSubspriteTable_842F490:: @ 842F490
+ subsprite -1, 0, 0, 0, 8x16
+ subsprite 1, 0, 0, 6, 32x16
+ subsprite 33, 0, 0, 6, 32x16
+ subsprite 65, 0, 0, 6, 32x16
+ subsprite 81, 0, 0, 6, 32x16
+ subsprite 113, 0, 0, 4, 8x16
+
+ .align 2
+gSubspriteTable_842F4C0:: @ 842F4C0
+ subsprite -1, 0, 0, 0, 8x16
+ subsprite 1, 0, 0, 6, 32x16
+ subsprite 33, 0, 0, 6, 32x16
+ subsprite 65, 0, 0, 6, 32x16
+ subsprite 89, 0, 0, 6, 32x16
+ subsprite 121, 0, 0, 4, 8x16
+
+ .align 2
+gSubspriteTable_842F4F0:: @ 842F4F0
+ subsprite -1, 0, 0, 0, 8x16
+ subsprite 1, 0, 0, 6, 32x16
+ subsprite 33, 0, 0, 6, 32x16
+ subsprite 65, 0, 0, 6, 32x16
+ subsprite 97, 0, 0, 6, 32x16
+ subsprite 129, 0, 0, 4, 8x16
+
+ .align 2
+gSubspriteTable_842F520:: @ 842F520
+ subsprite -1, 0, 0, 0, 8x16
+ subsprite 1, 0, 0, 2, 8x16
+ subsprite 9, 0, 0, 6, 32x16
+ subsprite 41, 0, 0, 6, 32x16
+ subsprite 73, 0, 0, 6, 32x16
+ subsprite 105, 0, 0, 6, 32x16
+ subsprite 137, 0, 0, 4, 8x16
+
+ .align 2
+gSubspriteTable_842F558:: @ 842F558
+ subsprite -1, 0, 0, 0, 8x16
+ subsprite 7, 0, 0, 6, 32x16
+ subsprite 35, 0, 0, 4, 8x16
+
+ .align 2
+gUnknown_0842F570:: @ 842F570
+ .4byte gSubspriteTable_842F2C8
+ .4byte gSubspriteTable_842F2C8
+ .4byte gSubspriteTable_842F2D8
+ .4byte gSubspriteTable_842F2F0
+ .4byte gSubspriteTable_842F310
+ .4byte gSubspriteTable_842F328
+ .4byte gSubspriteTable_842F340
+ .4byte gSubspriteTable_842F360
+ .4byte gSubspriteTable_842F380
+ .4byte gSubspriteTable_842F3A0
+ .4byte gSubspriteTable_842F3C0
+ .4byte gSubspriteTable_842F3E8
+ .4byte gSubspriteTable_842F410
+ .4byte gSubspriteTable_842F438
+ .4byte gSubspriteTable_842F460
+ .4byte gSubspriteTable_842F490
+ .4byte gSubspriteTable_842F4C0
+ .4byte gSubspriteTable_842F4F0
+ .4byte gSubspriteTable_842F520
.align 2
gUnknown_0842F5BC:: @ 842F5BC
- .4byte Unknown_842F558
+ .4byte gSubspriteTable_842F558
.align 2
gSubspriteTables_842F5C0:: @ 842F5C0
@@ -260,26 +364,26 @@ gSubspriteTables_842F5C0:: @ 842F5C0
.4byte 31, gMenuCursorSubsprites
.align 2
-gUnknown_0842F6C0:: @ 842F6C0
- .4byte 0x2, Unknown_842F2C8
- .4byte 0x2, Unknown_842F2C8
- .4byte 0x3, Unknown_842F2D8
- .4byte 0x4, Unknown_842F2F0
- .4byte 0x3, Unknown_842F310
- .4byte 0x3, Unknown_842F328
- .4byte 0x4, Unknown_842F340
- .4byte 0x4, Unknown_842F360
- .4byte 0x4, Unknown_842F380
- .4byte 0x4, Unknown_842F3A0
- .4byte 0x5, Unknown_842F3C0
- .4byte 0x5, Unknown_842F3E8
- .4byte 0x5, Unknown_842F410
- .4byte 0x5, Unknown_842F438
- .4byte 0x6, Unknown_842F460
- .4byte 0x6, Unknown_842F490
- .4byte 0x6, Unknown_842F4C0
- .4byte 0x6, Unknown_842F4F0
- .4byte 0x7, Unknown_842F520
+gSubspriteTables_842F6C0:: @ 842F6C0
+ .4byte 2, gSubspriteTable_842F2C8
+ .4byte 2, gSubspriteTable_842F2C8
+ .4byte 3, gSubspriteTable_842F2D8
+ .4byte 4, gSubspriteTable_842F2F0
+ .4byte 3, gSubspriteTable_842F310
+ .4byte 3, gSubspriteTable_842F328
+ .4byte 4, gSubspriteTable_842F340
+ .4byte 4, gSubspriteTable_842F360
+ .4byte 4, gSubspriteTable_842F380
+ .4byte 4, gSubspriteTable_842F3A0
+ .4byte 5, gSubspriteTable_842F3C0
+ .4byte 5, gSubspriteTable_842F3E8
+ .4byte 5, gSubspriteTable_842F410
+ .4byte 5, gSubspriteTable_842F438
+ .4byte 6, gSubspriteTable_842F460
+ .4byte 6, gSubspriteTable_842F490
+ .4byte 6, gSubspriteTable_842F4C0
+ .4byte 6, gSubspriteTable_842F4F0
+ .4byte 7, gSubspriteTable_842F520
.align 2
gUnknown_0842F758:: @ 842F758
diff --git a/data/naming_screen.s b/data/naming_screen.s
index c9196c66a..22998e7d7 100644
--- a/data/naming_screen.s
+++ b/data/naming_screen.s
@@ -11,8 +11,8 @@ gSpriteImage_83CE094:: @ 83CE094
gSpriteImage_83CE154:: @ 83CE154
.incbin "graphics/naming_screen/pc_icon/1.4bpp"
- .align 2
- .incbin "baserom.gba", 0x003ce214, 0x4
+@ XXX: what is this?
+ .4byte 0x2000000
.align 2
gUnknown_083CE218:: @ 83CE218
@@ -39,17 +39,21 @@ gUnknown_083CE250:: @ 83CE250
.4byte sub_80B626C
.4byte sub_80B6274
+ .align 1
gUnknown_083CE258:: @ 83CE258
- .incbin "baserom.gba", 0x003ce258, 0xa
+ .2byte 0, 0, 0, -1, 1
+ .align 1
gUnknown_083CE262:: @ 83CE262
- .incbin "baserom.gba", 0x003ce262, 0xa
+ .2byte 0, -1, 1, 0, 0
+ .align 1
gUnknown_083CE26C:: @ 83CE26C
- .incbin "baserom.gba", 0x003ce26c, 0x8
+ .2byte 0, 1, 1, 2
+ .align 1
gUnknown_083CE274:: @ 83CE274
- .incbin "baserom.gba", 0x003ce274, 0x8
+ .2byte 0, 0, 3, 0
.align 2
gUnknown_083CE27C:: @ 83CE27C
@@ -64,10 +68,12 @@ gUnknown_083CE28C:: @ 83CE28C
.4byte 0x02000004
gUnknown_083CE294:: @ 83CE294
- .incbin "baserom.gba", 0x003ce294, 0x1b
+ .byte 1, 3, 5, 8, 10, 12, 14, 17, 19
+ .byte 1, 3, 5, 8, 10, 12, 14, 17, 19
+ .byte 1, 4, 7, 10, 13, 16, 16, 16, 19
gUnknown_083CE2AF:: @ 83CE2AF
- .incbin "baserom.gba", 0x003ce2af, 0x5
+ .byte 1, 2, 3
.align 2
gUnknown_083CE2B4:: @ 83CE2B4
@@ -76,17 +82,21 @@ gUnknown_083CE2B4:: @ 83CE2B4
.4byte sub_80B6B9C
.4byte sub_80B6C08
+ .align 1
gUnknown_083CE2C4:: @ 83CE2C4
- .incbin "baserom.gba", 0x003ce2c4, 0x6
+ .2byte 1, 3, 2
+ .align 1
gUnknown_083CE2CA:: @ 83CE2CA
- .incbin "baserom.gba", 0x003ce2ca, 0x6
+ .2byte 4, 6, 5
+ .align 1
gUnknown_083CE2D0:: @ 83CE2D0
- .incbin "baserom.gba", 0x003ce2d0, 0x8
+ .2byte 0, -4, -2, -1
+ .align 1
gUnknown_083CE2D8:: @ 83CE2D8
- .incbin "baserom.gba", 0x003ce2d8, 0x8
+ .2byte 2, 3, 2, 1
.align 2
gUnknown_083CE2E0:: @ 83CE2E0
@@ -104,8 +114,10 @@ gUnknown_083CE2F0:: @ 83CE2F0
.4byte sub_80B7670
.4byte sub_80B7660
+ .align 2
gUnknown_083CE308:: @ 83CE308
- .incbin "baserom.gba", 0x003ce308, 0x8
+ .4byte VRAM + 0xE000
+ .4byte VRAM + 0xE800
.align 2
gUnknown_083CE310:: @ 83CE310
@@ -143,9 +155,8 @@ gUnknown_083CE368:: @ 83CE368
.4byte nullsub_62
.4byte sub_80B7924
- .align 2
gUnknown_083CE370:: @ 83CE370
- .incbin "baserom.gba", 0x003ce370, 0x4
+ .string "♂$"
.align 2
Unknown_83CE374:
@@ -202,38 +213,59 @@ gOamData_83CE4A8:: @ 83CE4A8
.2byte 0x0000
.align 2
-Unknown_3CE4B0:: @ 83CE4B0
- .incbin "baserom.gba", 0x3ce4b0, 0x50
+gSubspriteTable_83CE4B0:: @ 83CE4B0
+ subsprite -20, -16, 1, 0, 32x8
+ subsprite 12, -16, 1, 4, 8x8
+ subsprite -20, -8, 1, 5, 32x8
+ subsprite 12, -8, 1, 9, 8x8
+ subsprite -20, 0, 1, 10, 32x8
+ subsprite 12, 0, 1, 14, 8x8
+ subsprite -20, 8, 1, 15, 32x8
+ subsprite 12, 8, 1, 19, 8x8
+
+@ unreferenced
+ .align 2
+gSubspriteTable_83CE4F0:: @ 83CE4F0
+ subsprite -12, -4, 1, 0, 8x8
+ subsprite 4, -4, 1, 1, 8x8
.align 2
-Unknown_3CE500:: @ 83CE500
- .incbin "baserom.gba", 0x3ce500, 0x10
+gSubspriteTable_83CE500:: @ 83CE500
+ subsprite -12, -4, 1, 0, 16x8
+ subsprite 4, -4, 1, 2, 8x8
.align 2
-Unknown_3CE510:: @ 83CE510
- .incbin "baserom.gba", 0x3ce510, 0x30
+gSubspriteTable_83CE510:: @ 83CE510
+ subsprite -20, -12, 1, 0, 32x8
+ subsprite 12, -12, 1, 4, 8x8
+ subsprite -20, -4, 1, 5, 32x8
+ subsprite 12, -4, 1, 9, 8x8
+ subsprite -20, 4, 1, 10, 32x8
+ subsprite 12, 4, 1, 14, 8x8
.align 2
-Unknown_3CE540:: @ 83CE540
- .incbin "baserom.gba", 0x3ce540, 0x18
+gSubspriteTable_83CE540:: @ 83CE540
+ subsprite -8, -12, 3, 0, 16x8
+ subsprite -8, -4, 3, 2, 16x8
+ subsprite -8, 4, 3, 4, 16x8
.align 2
-gUnknown_083CE558:: @ 83CE558
- .4byte 0x8, Unknown_3CE4B0
+gSubspriteTables_83CE558:: @ 83CE558
+ .4byte 8, gSubspriteTable_83CE4B0
.align 2
-gUnknown_083CE560:: @ 83CE560
- .4byte 0x2, Unknown_3CE500
- .4byte 0x2, Unknown_3CE500
- .4byte 0x2, Unknown_3CE500
+gSubspriteTables_83CE560:: @ 83CE560
+ .4byte 2, gSubspriteTable_83CE500
+ .4byte 2, gSubspriteTable_83CE500
+ .4byte 2, gSubspriteTable_83CE500
.align 2
-gUnknown_083CE578:: @ 83CE578
- .4byte 0x6, Unknown_3CE510
+gSubspriteTables_83CE578:: @ 83CE578
+ .4byte 6, gSubspriteTable_83CE510
.align 2
-gUnknown_083CE580:: @ 83CE580
- .4byte 0x3, Unknown_3CE540
+gSubspriteTables_83CE580:: @ 83CE580
+ .4byte 3, gSubspriteTable_83CE540
.align 2
gSpriteImageTable_83CE588:: @ 83CE588
diff --git a/data/pokenav.s b/data/pokenav.s
index 4d95526a3..3ea704c03 100644
--- a/data/pokenav.s
+++ b/data/pokenav.s
@@ -3,59 +3,81 @@
.section .rodata
+ .align 2
gUnknown_083DFEC4:: @ 83DFEC4
- .incbin "baserom.gba", 0x003dfec4, 0x4
+ .4byte 0x2000000
+ .align 2
gUnknown_083DFEC8:: @ 83DFEC8
- .4byte 0x02039360
+ .4byte gTileBuffer
+ .align 1
gUnknown_083DFECC:: @ 83DFECC
- .incbin "baserom.gba", 0x003dfecc, 0x20
+ .incbin "graphics/pokenav/83DFECC.gbapal"
+ .align 1
gUnknown_083DFEEC:: @ 83DFEEC
- .incbin "baserom.gba", 0x003dfeec, 0xa0
+ .incbin "graphics/pokenav/83DFEEC.4bpp"
+ .align 2
gUnknown_083DFF8C:: @ 83DFF8C
- .incbin "baserom.gba", 0x003dff8c, 0xb0
+ .incbin "graphics/pokenav/83DFF8C.bin.lz"
+ .align 1
gUnknown_083E003C:: @ 83E003C
- .incbin "baserom.gba", 0x003e003c, 0x20
+ .incbin "graphics/pokenav/83E003C.gbapal"
+ .align 1
gUnknown_083E005C:: @ 83E005C
- .incbin "baserom.gba", 0x003e005c, 0x20
+ .incbin "graphics/pokenav/83E005C.4bpp"
+ .align 2
gUnknown_083E007C:: @ 83E007C
- .incbin "baserom.gba", 0x003e007c, 0xa8
+ .incbin "graphics/pokenav/83E007C.bin.lz"
+ .align 1
gUnknown_083E0124:: @ 83E0124
- .incbin "baserom.gba", 0x003e0124, 0x20
+ .incbin "graphics/pokenav/83E0124_pal.bin"
+ .align 1
gUnknown_083E0144:: @ 83E0144
- .incbin "baserom.gba", 0x003e0144, 0x68
+ .incbin "graphics/pokenav/83E0144_pal.bin"
+
+ .align 1
+ .incbin "graphics/pokenav/83E0164.bin"
+ .align 1
gUnknown_083E01AC:: @ 83E01AC
- .incbin "baserom.gba", 0x003e01ac, 0x48
+ .incbin "graphics/pokenav/83E01AC.bin"
+ .align 1
gUnknown_083E01F4:: @ 83E01F4
- .incbin "baserom.gba", 0x003e01f4, 0x60
+ .incbin "graphics/pokenav/83E01F4.bin"
+ .align 1
gUnknown_083E0254:: @ 83E0254
- .incbin "baserom.gba", 0x003e0254, 0x20
+ .incbin "graphics/pokenav/83E0254.gbapal"
+ .align 1
gUnknown_083E0274:: @ 83E0274
- .incbin "baserom.gba", 0x003e0274, 0x20
+ .incbin "graphics/pokenav/83E0274.gbapal"
.align 2
gPokenavConditionSearch2_Pal:: @ 83E0294
.incbin "graphics/pokenav/condition_search2.gbapal"
+ .align 1
gUnknown_083E02B4:: @ 83E02B4
- .incbin "baserom.gba", 0x003e02b4, 0x60
+ .incbin "graphics/pokenav/83E02B4.gbapal"
+ .align 1
+ .incbin "graphics/pokenav/83E02D4.bin"
+
+ .align 1
gUnknown_083E0314:: @ 83E0314
- .incbin "baserom.gba", 0x003e0314, 0x20
+ .incbin "graphics/pokenav/83E0314.gbapal"
- .align 2
+ .align 1
gUnknown_083E0334:: @ 83E0334
.incbin "graphics/pokenav/trainereyes_misc_pal.bin" @ the original bytes have an "FF FF" instance which is incompatible with gbagfx to produce the bytes needed to match the original ROM, so I am forced to include it as a .bin until the lowest bit is properly handled or a better workaround is produced
@@ -63,14 +85,20 @@ gUnknown_083E0334:: @ 83E0334
gUnknown_083E0354:: @ 83E0354
.incbin "graphics/pokenav/trainereyes_misc.4bpp.lz"
+ .align 1
gUnknown_083E039C:: @ 83E039C
- .incbin "baserom.gba", 0x003e039c, 0x4
+ .2byte 0x4280, 0x4282
+ .align 1
gUnknown_083E03A0:: @ 83E03A0
- .incbin "baserom.gba", 0x003e03a0, 0x8
+ .2byte 0x4000, 0x4000, 0x4281, 0x4283
+ .align 1
gUnknown_083E03A8:: @ 83E03A8
- .incbin "baserom.gba", 0x003e03a8, 0x64
+ .incbin "graphics/pokenav/83E03A8.gbapal"
+
+ .align 1
+ .incbin "graphics/pokenav/83E03C8.bin"
gUnknown_083E040C:: @ 83E040C
.incbin "graphics/misc/ribbons_half.4bpp.lz"
@@ -248,7 +276,7 @@ gPokenavPokeballTiles::
.align 2
gUnknown_083E3780: @ 83E3780
- .incbin "baserom.gba", 0x3e3780, 0x20
+ .incbin "graphics/pokenav/83E3780.4bpp"
.align 2
gPokenavSparkle_Pal::
@@ -262,8 +290,9 @@ gPokenavSparkle_Gfx::
gPokenavUpDownArrows_Gfx::
.incbin "graphics/pokenav/arrows.4bpp"
-gUnknown_083E3BC0::
- .incbin "baserom.gba", 0x003E3BC0, 0x20
+ .align 2
+gUnknown_083E3BC0:: @ 83E3BC0
+ .incbin "graphics/pokenav/83E3BC0.bin"
.align 2
gTiles_083E3BE0::
@@ -289,11 +318,28 @@ PokenavBlueLightPalette:
PokenavBlueLightTiles:
.incbin "graphics/pokenav/blue_light.4bpp"
+ .align 2
Palette_3E42D8: @ 83E42D8
- .incbin "baserom.gba", 0x3e42d8, 0x20
+ .incbin "graphics/pokenav/83E42D8.gbapal"
+ .align 1
gUnknown_083E42F8:: @ 83E42F8
- .incbin "baserom.gba", 0x003e42f8, 0x20
+ .2byte 0x408
+ .2byte 0x408
+ .2byte 0x507
+ .2byte 0x507
+ .2byte 0x606
+ .2byte 0x606
+ .2byte 0x805
+ .2byte 0x805
+ .2byte 0xA04
+ .2byte 0xA04
+ .2byte 0xC03
+ .2byte 0xC03
+ .2byte 0xE02
+ .2byte 0xE02
+ .2byte 0x1000
+ .2byte 0x1000
.align 2
gOamData_83E4318:: @ 83E4318
@@ -448,11 +494,14 @@ gSpriteAnimTable_83E43E0:: @ 83E43E0
.4byte gSpriteAnim_83E43D0
.4byte gSpriteAnim_83E43D8
-Unknown_83E4440:
- .incbin "baserom.gba", 0x003e4440, 0x10
+ .align 2
+gSpriteAffineAnim_83E4440:: @ 83E4440
+ obj_rot_scal_anim_frame 0x10, 0x10, 0, 16
+ obj_rot_scal_anim_end
-gUnknown_083E4450:: @ 83E4450
- .4byte Unknown_83E4440
+ .align 2
+gSpriteAffineAnimTable_83E4450:: @ 83E4450
+ .4byte gSpriteAffineAnim_83E4440
.align 2
gSpriteTemplate_83E4454:: @ 83E4454
@@ -553,14 +602,15 @@ gOamData_83E4560:: @ 83E4560
.align 2
gUnknown_083E4568:: @ 83E4568
- .incbin "baserom.gba", 0x003e4568, 0x8
+ obj_tiles NULL, 0x800, 6
.align 2
gSpriteTemplate_83E4570:: @ 83E4570
spr_template 6, 6, gOamData_83E4560, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80F2E00
+ .align 2
gUnknown_083E4588:: @ 83E4588
- .incbin "baserom.gba", 0x003e4588, 0x8
+ obj_pal NULL, 6
.align 2
gUnknown_083E4590:: @ 83E4590
@@ -645,11 +695,44 @@ gUnknown_083E4648:: @ 83E4648
gSpriteTemplate_83E4660:: @ 83E4660
spr_template 3, 4, gOamData_83E4608, gSpriteAnimTable_83E4620, NULL, gDummySpriteAffineAnimTable, sub_80F3328
+ .align 1
gUnknown_083E4678:: @ 83E4678
- .incbin "baserom.gba", 0x003e4678, 0x20
+ .incbin "graphics/pokenav/83E4678.gbapal"
+ .align 2
gUnknown_083E4698:: @ 83E4698
- .incbin "baserom.gba", 0x003e4698, 0x80
+ .2byte 0, 0
+ .2byte 1, 0
+ .2byte 2, 0
+ .2byte 3, 0
+ .2byte 4, 0
+ .2byte 1, 1
+ .2byte 2, 1
+ .2byte 3, 1
+ .2byte 4, 1
+ .2byte 1, 2
+ .2byte 2, 2
+ .2byte 3, 2
+ .2byte 4, 2
+ .2byte 1, 3
+ .2byte 2, 3
+ .2byte 3, 3
+ .2byte 4, 3
+ .2byte 1, 4
+ .2byte 2, 4
+ .2byte 3, 4
+ .2byte 4, 4
+ .2byte 5, 0
+ .2byte 6, 0
+ .2byte 7, 1
+ .2byte 8, 2
+ .2byte 9, 1
+ .2byte 9, 3
+ .2byte 9, 4
+ .2byte 10, 3
+ .2byte 10, 4
+ .2byte 11, 0
+ .2byte 11, 1
.align 2
gOamData_83E4718:: @ 83E4718
@@ -692,8 +775,18 @@ gUnknown_083E4784:: @ 83E4784
gUnknown_083E478C:: @ 83E478C
obj_pal gPokenavSparkle_Pal, 0x000f
+ .align 2
gUnknown_083E4794:: @ 83E4794
- .incbin "baserom.gba", 0x003e4794, 0x28
+ .2byte 0, -35
+ .2byte 20, -28
+ .2byte 33, -10
+ .2byte 33, 10
+ .2byte 20, 28
+ .2byte 0, 35
+ .2byte -20, 28
+ .2byte -33, 10
+ .2byte -33, -10
+ .2byte -20, -28
.align 2
gOamData_83E47BC:: @ 83E47BC
@@ -773,13 +866,301 @@ gSpriteTemplate_83E4878:: @ 83E4878
spr_template 26, 18, gOamData_83E4870, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
gUnknown_083E4890:: @ 83E4890
- .incbin "baserom.gba", 0x003e4890, 0x100
+ .byte 4
+ .byte 5
+ .byte 6
+ .byte 7
+ .byte 8
+ .byte 9
+ .byte 9
+ .byte 10
+ .byte 10
+ .byte 11
+ .byte 11
+ .byte 12
+ .byte 12
+ .byte 13
+ .byte 13
+ .byte 13
+ .byte 13
+ .byte 14
+ .byte 14
+ .byte 14
+ .byte 14
+ .byte 15
+ .byte 15
+ .byte 15
+ .byte 15
+ .byte 16
+ .byte 16
+ .byte 16
+ .byte 16
+ .byte 16
+ .byte 16
+ .byte 17
+ .byte 17
+ .byte 17
+ .byte 17
+ .byte 17
+ .byte 17
+ .byte 18
+ .byte 18
+ .byte 18
+ .byte 18
+ .byte 18
+ .byte 18
+ .byte 19
+ .byte 19
+ .byte 19
+ .byte 19
+ .byte 19
+ .byte 19
+ .byte 19
+ .byte 19
+ .byte 20
+ .byte 20
+ .byte 20
+ .byte 20
+ .byte 20
+ .byte 20
+ .byte 20
+ .byte 20
+ .byte 21
+ .byte 21
+ .byte 21
+ .byte 21
+ .byte 21
+ .byte 21
+ .byte 21
+ .byte 21
+ .byte 22
+ .byte 22
+ .byte 22
+ .byte 22
+ .byte 22
+ .byte 22
+ .byte 22
+ .byte 22
+ .byte 22
+ .byte 22
+ .byte 23
+ .byte 23
+ .byte 23
+ .byte 23
+ .byte 23
+ .byte 23
+ .byte 23
+ .byte 23
+ .byte 23
+ .byte 23
+ .byte 24
+ .byte 24
+ .byte 24
+ .byte 24
+ .byte 24
+ .byte 24
+ .byte 24
+ .byte 24
+ .byte 24
+ .byte 24
+ .byte 25
+ .byte 25
+ .byte 25
+ .byte 25
+ .byte 25
+ .byte 25
+ .byte 25
+ .byte 25
+ .byte 25
+ .byte 25
+ .byte 25
+ .byte 25
+ .byte 26
+ .byte 26
+ .byte 26
+ .byte 26
+ .byte 26
+ .byte 26
+ .byte 26
+ .byte 26
+ .byte 26
+ .byte 26
+ .byte 26
+ .byte 26
+ .byte 27
+ .byte 27
+ .byte 27
+ .byte 27
+ .byte 27
+ .byte 27
+ .byte 27
+ .byte 27
+ .byte 27
+ .byte 27
+ .byte 27
+ .byte 27
+ .byte 27
+ .byte 27
+ .byte 28
+ .byte 28
+ .byte 28
+ .byte 28
+ .byte 28
+ .byte 28
+ .byte 28
+ .byte 28
+ .byte 28
+ .byte 28
+ .byte 28
+ .byte 28
+ .byte 28
+ .byte 28
+ .byte 29
+ .byte 29
+ .byte 29
+ .byte 29
+ .byte 29
+ .byte 29
+ .byte 29
+ .byte 29
+ .byte 29
+ .byte 29
+ .byte 29
+ .byte 29
+ .byte 29
+ .byte 29
+ .byte 29
+ .byte 29
+ .byte 30
+ .byte 30
+ .byte 30
+ .byte 30
+ .byte 30
+ .byte 30
+ .byte 30
+ .byte 30
+ .byte 30
+ .byte 30
+ .byte 30
+ .byte 30
+ .byte 30
+ .byte 30
+ .byte 30
+ .byte 30
+ .byte 31
+ .byte 31
+ .byte 31
+ .byte 31
+ .byte 31
+ .byte 31
+ .byte 31
+ .byte 31
+ .byte 31
+ .byte 31
+ .byte 31
+ .byte 31
+ .byte 31
+ .byte 31
+ .byte 31
+ .byte 31
+ .byte 31
+ .byte 32
+ .byte 32
+ .byte 32
+ .byte 32
+ .byte 32
+ .byte 32
+ .byte 32
+ .byte 32
+ .byte 32
+ .byte 32
+ .byte 32
+ .byte 32
+ .byte 32
+ .byte 32
+ .byte 32
+ .byte 32
+ .byte 32
+ .byte 32
+ .byte 33
+ .byte 33
+ .byte 33
+ .byte 33
+ .byte 33
+ .byte 33
+ .byte 33
+ .byte 33
+ .byte 33
+ .byte 33
+ .byte 33
+ .byte 33
+ .byte 33
+ .byte 33
+ .byte 33
+ .byte 33
+ .byte 33
+ .byte 33
+ .byte 33
+ .byte 34
+ .byte 34
+ .byte 34
+ .byte 34
+ .byte 34
+ .byte 34
+ .byte 34
+ .byte 34
+ .byte 34
+ .byte 34
+ .byte 34
+ .byte 34
+ .byte 34
+ .byte 34
+ .byte 34
+ .byte 34
+ .byte 34
+ .byte 34
+ .byte 34
+ .byte 34
+ .byte 35
+ .align 2
gUnknown_083E4990:: @ 83E4990
- .incbin "baserom.gba", 0x003e4990, 0xc
+ .4byte REG_WIN0H
+ .4byte ((DMA_ENABLE | DMA_START_HBLANK | DMA_32BIT | DMA_REPEAT | DMA_DEST_RELOAD) << 16) | 1
+ .4byte 1
+ .align 1
gUnknown_083E499C:: @ 83E499C
- .incbin "baserom.gba", 0x003e499c, 0x24
+ .2byte 0x43
+ .2byte 0x32
+ .2byte 0x33
+ .2byte 0x34
+ .2byte 0x35
+ .2byte 0x36
+ .2byte 0x44
+ .2byte 0x45
+ .2byte 0x46
+ .2byte 0x47
+ .2byte 0x48
+ .2byte 0x49
+ .2byte 0x4A
+ .2byte 0x4B
+ .2byte 0x4C
+ .2byte 0x4D
+ .2byte 0x4E
+ .align 2
gUnknown_083E49C0:: @ 83E49C0
- .incbin "baserom.gba", 0x003e49c0, 0x34
+ .2byte 0x109, 0xA
+ .2byte 0x10A, 0x2
+ .2byte 0x10B, 0x9
+ .2byte 0x10C, 0x3
+ .2byte 0x10D, 0x7
+ .2byte 0x10E, 0xB
+ .2byte 0x10F, 0xD
+ .2byte 0x110, 0xE
+ .2byte 0x105, 0xF
+ .2byte 0x106, 0xF
+ .2byte 0x107, 0xF
+ .2byte 0x108, 0xF
+ .2byte 0x14F, 0xF
diff --git a/data/roulette.s b/data/roulette.s
index 9f6c8ac15..27dd712b5 100644
--- 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
diff --git a/data/text/credits.inc b/data/text/credits.inc
index 2f7aa5478..29abccf91 100644
--- a/data/text/credits.inc
+++ b/data/text/credits.inc
@@ -703,256 +703,307 @@ gCreditsEntryPointerTable:: @ 840C5F0
.4byte CreditsCredits
.4byte CreditsTerminator
.4byte CreditsTerminator
+
.4byte CreditsTerminator
.4byte CreditsDirector
.4byte CreditsMasuda
.4byte CreditsTerminator
.4byte CreditsTerminator
+
.4byte CreditsTerminator
.4byte CreditsArtDirector
.4byte CreditsSugimori
.4byte CreditsTerminator
.4byte CreditsTerminator
+
.4byte CreditsTerminator
.4byte CreditsBattleDirector
.4byte CreditsMorimoto
.4byte CreditsTerminator
.4byte CreditsTerminator
+
.4byte CreditsTerminator
.4byte CreditsMainProgrammer
.4byte CreditsTetsuyaWatanabe
.4byte CreditsTerminator
.4byte CreditsTerminator
+
.4byte CreditsBattleSystemProgrammer
.4byte CreditsSogabe
.4byte CreditsFieldSystemProgrammer
.4byte CreditsTamada
.4byte CreditsTerminator
+
.4byte CreditsProgrammers
.4byte CreditsMori
.4byte CreditsKagaya
.4byte CreditsMatsuda
.4byte CreditsTerminator
+
.4byte CreditsProgrammers
.4byte CreditsHiroyukiNakamura
.4byte CreditsTaya
.4byte CreditsNohara
.4byte CreditsTerminator
+
.4byte CreditsProgrammers
.4byte CreditsTomomichiOhta
.4byte CreditsIwasawa
.4byte CreditsTakenoriOhta
.4byte CreditsTerminator
+
.4byte CreditsTerminator
.4byte CreditsMainGraphicDesigner
.4byte CreditsYoshida
.4byte CreditsTerminator
.4byte CreditsTerminator
+
.4byte CreditsPOKeMONGraphicDesigners
.4byte CreditsSugimori
.4byte CreditsYoshida
.4byte CreditsTerminator
.4byte CreditsTerminator
+
.4byte CreditsPOKeMONGraphicDesigners
.4byte CreditsFujiwara
.4byte CreditsSatoshiOhta
.4byte CreditsIwashita
.4byte CreditsTerminator
+
.4byte CreditsPOKeMONGraphicDesigners
.4byte CreditsTomita
.4byte CreditsUnno
.4byte CreditsEo
.4byte CreditsTerminator
+
.4byte CreditsPOKeMONDesigners
.4byte CreditsMorimoto
.4byte CreditsOkutani
.4byte CreditsNishida
.4byte CreditsTerminator
+
.4byte CreditsPOKeMONDesigners
.4byte CreditsSaito
.4byte CreditsYoshikawa
.4byte CreditsTerminator
.4byte CreditsTerminator
+
.4byte CreditsMusicComposition
.4byte CreditsIchinose
.4byte CreditsAoki
.4byte CreditsMasuda
.4byte CreditsTerminator
+
.4byte CreditsTerminator
.4byte CreditsSoundEffectsPOKeMONVoices
.4byte CreditsAoki
.4byte CreditsTerminator
.4byte CreditsTerminator
+
.4byte CreditsGameDesigners
.4byte CreditsMasuda
.4byte CreditsMorimoto
.4byte CreditsNishino
.4byte CreditsTerminator
+
.4byte CreditsGameDesigners
.4byte CreditsMatsushima
.4byte CreditsTetsujiOhta
.4byte CreditsSato
.4byte CreditsKawachimaru
+
.4byte CreditsGameDesigners
.4byte CreditsShimoyamada
.4byte CreditsOhmori
.4byte CreditsTakahashi
.4byte CreditsTerminator
+
.4byte CreditsPlotScenario
.4byte CreditsMasuda
.4byte CreditsTomisawa
.4byte CreditsNishino
.4byte CreditsTerminator
+
.4byte CreditsGameScenario
.4byte CreditsToshinobuMatsumiya
.4byte CreditsTomisawa
.4byte CreditsTerminator
.4byte CreditsTerminator
+
.4byte CreditsScriptDesigners
.4byte CreditsNohara
.4byte CreditsTetsujiOhta
.4byte CreditsTomomichiOhta
.4byte CreditsTerminator
+
.4byte CreditsMapDesigners
.4byte CreditsOhmori
.4byte CreditsTetsujiOhta
.4byte CreditsNishino
.4byte CreditsTerminator
+
.4byte CreditsMapDataDesigners
.4byte CreditsTetsujiOhta
.4byte CreditsTakahashi
.4byte CreditsTerminator
.4byte CreditsTerminator
+
.4byte CreditsParametricDesigners
.4byte CreditsNishino
.4byte CreditsMorimoto
.4byte CreditsTetsujiOhta
.4byte CreditsShimoyamada
+
.4byte CreditsTerminator
.4byte CreditsPOKeDEXText
.4byte CreditsMatsushima
.4byte CreditsTerminator
.4byte CreditsTerminator
+
.4byte CreditsEnvironmentToolProgrammers
.4byte CreditsSogabe
.4byte CreditsTamada
.4byte CreditsHiroyukiNakamura
.4byte CreditsMori
+
.4byte CreditsProductTesting
.4byte CreditsSuperMarioClub
.4byte CreditsTada
.4byte CreditsOhnishi
.4byte CreditsOkamura
+
.4byte CreditsSpecialThanks
.4byte CreditsTominaga
.4byte CreditsYoshiroTajiri
.4byte CreditsSasaki
.4byte CreditsTerminator
+
.4byte CreditsSpecialThanks
.4byte CreditsHamano
.4byte CreditsChieMatsumiya
.4byte CreditsShinozaki
.4byte CreditsFujii
+
.4byte CreditsSpecialThanks
.4byte CreditsSuyama
.4byte CreditsMitsuhara
.4byte CreditsKomura
.4byte CreditsOhashi
+
.4byte CreditsSpecialThanks
.4byte CreditsTakizawa
.4byte CreditsTakada
.4byte CreditsKondo
.4byte CreditsMashima
+
.4byte CreditsInformationSupervisors
.4byte CreditsEnomoto
.4byte CreditsTerada
.4byte CreditsSakurai
.4byte CreditsSagawa
+
.4byte CreditsCoordinators
.4byte CreditsKyokoWatanabe
.4byte CreditsNakano
.4byte CreditsTerminator
.4byte CreditsTerminator
+
.4byte CreditsTaskManagers
.4byte CreditsYamagami
.4byte CreditsNomoto
.4byte CreditsTerminator
.4byte CreditsTerminator
+
.4byte CreditsProducers
.4byte CreditsJinnai
.4byte CreditsIzushi
.4byte CreditsTsuru
.4byte CreditsTerminator
+
.4byte CreditsTerminator
.4byte CreditsExecutiveDirector
.4byte CreditsSatoshiTajiri
.4byte CreditsTerminator
.4byte CreditsTerminator
+
.4byte CreditsTerminator
.4byte CreditsExecutiveProducers
.4byte CreditsIwata
.4byte CreditsTerminator
.4byte CreditsTerminator
+
.4byte CreditsTerminator
.4byte CreditsExecutiveProducers
.4byte CreditsIshihara
.4byte CreditsTerminator
.4byte CreditsTerminator
+
.4byte CreditsEnglishVersionCoordinators
.4byte CreditsHiroNakamura
.4byte CreditsMcMahill
.4byte CreditsTerminator
.4byte CreditsTerminator
+
.4byte CreditsTerminator
.4byte CreditsTranslator
.4byte CreditsOgasawara
.4byte CreditsTerminator
.4byte CreditsTerminator
+
.4byte CreditsProgrammers
.4byte CreditsMurakawa
.4byte CreditsYamamoto
.4byte CreditsFunakoshi
.4byte CreditsKinashi
+
.4byte CreditsGraphicDesigners
.4byte CreditsYamamoto
.4byte CreditsKinashi
.4byte CreditsTerminator
.4byte CreditsTerminator
+
.4byte CreditsProductSupport
.4byte CreditsNakamichi
.4byte CreditsHara
.4byte CreditsTerminator
.4byte CreditsTerminator
+
.4byte CreditsTerminator
.4byte CreditsArtwork
.4byte CreditsOkada
.4byte CreditsTerminator
.4byte CreditsTerminator
+
.4byte CreditsTerminator
.4byte CreditsTextEditor
.4byte CreditsLillygren
.4byte CreditsTerminator
.4byte CreditsTerminator
+
.4byte CreditsNOAProductTesting
.4byte CreditsHertzog
.4byte CreditsRidgeway
.4byte CreditsTerminator
.4byte CreditsTerminator
+
.4byte CreditsBrailleCodeCheck
.4byte CreditsNFotB
.4byte CreditsMaurer
.4byte CreditsJapanBrailleLibrary
.4byte CreditsEBU
+
.4byte CreditsBrailleCodeCheck
.4byte CreditsABA
.4byte CreditsRNZFotB
.4byte CreditsTerminator
.4byte CreditsTerminator
+
.4byte CreditsSpecialThanks
.4byte CreditsFord
.4byte CreditsBarlow
.4byte CreditsUesugi
.4byte CreditsUyama
+
.4byte CreditsSpecialThanks
.4byte CreditsHowitt
.4byte CreditsTilden
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-08 03:25:23 +0000