diff options
Diffstat (limited to 'data')
31 files changed, 1298 insertions, 260 deletions
diff --git a/data/battle_anim_813F0F4.s b/data/battle_anim_813F0F4.s index 849fd8376..de29622ad 100644 --- a/data/battle_anim_813F0F4.s +++ b/data/battle_anim_813F0F4.s @@ -79,7 +79,7 @@ gSpriteAnimTable_840B360:: @ 840B360 .4byte gSpriteAnim_840B358 gUnknown_0840B378:: @ 840B378 - .incbin "baserom.gba", 0x0040b378, 0xc + .byte 0, 0, 0, 5, 1, 2, 2, 3, 5, 5, 4, 4 .align 2 gUnknown_0840B384:: @ 840B384 @@ -144,8 +144,28 @@ gSpriteTemplate_840B4A4:: @ 840B4A4 gSpriteTemplate_840B4BC:: @ 840B4BC spr_template 55031, 55031, gOamData_837DF24, gSpriteAnimTable_840B360, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy + .align 1 gUnknown_0840B4D4:: @ 840B4D4 - .incbin "baserom.gba", 0x0040b4d4, 0x28 + .2byte 0x7ADF + .2byte 0x7AF0 + .2byte 0x53D7 + .2byte 0x3FFF + .2byte 0x7297 + .2byte 0x67F5 + .2byte 0x7B2C + .2byte 0x2B7E + .2byte 0x431F + .2byte 0x7BDD + .2byte 0x2A3F + .2byte 0x293F + .2byte 0x0 + .2byte 0x201 + .2byte 0x403 + .2byte 0x101 + .2byte 0x100 + .2byte 0x503 + .2byte 0x506 + .2byte 0x4 .align 2 gBattleAnimSpriteTemplate_840B4FC:: @ 840B4FC diff --git a/data/battle_message.s b/data/battle_message.s index 78d7c4d95..0ad61bfc0 100644 --- a/data/battle_message.s +++ b/data/battle_message.s @@ -5,8 +5,127 @@ .include "data/text/battle_strings.inc" + .align 1 gUnknown_084016BC:: @ 84016BC - .incbin "baserom.gba", 0x004016bc, 0xec + .2byte 0xE + .2byte 0x46 + .2byte 0x4A + .2byte 0x6A + .2byte 0x6B + .2byte 0x6C + .2byte 0x6E + .2byte 0x6F + .2byte 0x79 + .2byte 0x7B + .2byte 0x7D + .2byte 0x94 + .2byte 0x96 + .2byte 0x97 + .2byte 0x9B + .2byte 0x9C + .2byte 0x9F + .2byte 0xA4 + .2byte 0xAA + .2byte 0xAD + .2byte 0xB6 + .2byte 0xBF + .2byte 0xCB + .2byte 0xCD + .2byte 0xCF + .2byte 0xD6 + .2byte 0xED + .2byte 0xF4 + .2byte 0xF5 + .2byte 0x10A + .2byte 0x10F + .2byte 0x112 + .2byte 0x113 + .2byte 0x11A + .2byte 0x125 + .2byte 0x136 + .2byte 0x13C + .2byte 0x140 + .2byte 0x149 + .2byte 0x14A + .2byte 0x14E + .2byte 0x154 + .2byte 0x0 + .2byte 0x64 + .2byte 0x69 + .2byte 0x75 + .2byte 0x85 + .2byte 0xAF + .2byte 0x10D + .2byte 0x153 + .2byte 0x0 + .2byte 0x60 + .2byte 0x61 + .2byte 0x66 + .2byte 0x68 + .2byte 0x8C + .2byte 0x90 + .2byte 0xA5 + .2byte 0xB8 + .2byte 0x10C + .2byte 0x111 + .2byte 0x118 + .2byte 0x119 + .2byte 0x129 + .2byte 0x12A + .2byte 0x12C + .2byte 0x139 + .2byte 0x15A + .2byte 0x15B + .2byte 0x0 + .2byte 0x1 + .2byte 0xA + .2byte 0xB + .2byte 0x11 + .2byte 0x13 + .2byte 0x14 + .2byte 0x15 + .2byte 0x1E + .2byte 0x23 + .2byte 0x25 + .2byte 0x27 + .2byte 0x2B + .2byte 0x2C + .2byte 0x2D + .2byte 0x2E + .2byte 0x2F + .2byte 0x40 + .2byte 0x47 + .2byte 0x51 + .2byte 0x59 + .2byte 0x5A + .2byte 0x5B + .2byte 0x5C + .2byte 0x67 + .2byte 0x76 + .2byte 0x7A + .2byte 0x80 + .2byte 0x84 + .2byte 0x8B + .2byte 0x91 + .2byte 0xA3 + .2byte 0xA9 + .2byte 0xAB + .2byte 0xAE + .2byte 0xC1 + .2byte 0xCC + .2byte 0xD5 + .2byte 0xF9 + .2byte 0xFD + .2byte 0xFF + .2byte 0x100 + .2byte 0x103 + .2byte 0x104 + .2byte 0x110 + .2byte 0x11B + .2byte 0x141 + .2byte 0x157 + .2byte 0x0 + .align 2 gUnknown_084017A8:: @ 84017A8 - .incbin "baserom.gba", 0x004017a8, 0x8 + .4byte -1, -1 diff --git a/data/decoration.s b/data/decoration.s index 6bbe52703..0ca44c847 100644 --- a/data/decoration.s +++ b/data/decoration.s @@ -261,4 +261,5 @@ gUnknown_083ECAA0:: @ 83ECAA0 .4byte sub_80FED3C @ XXX: what is this? + .align 2 .4byte 0x2000000 diff --git a/data/evolution_graphics.s b/data/evolution_graphics.s index 1704e4fdb..e362b4dba 100644 --- a/data/evolution_graphics.s +++ b/data/evolution_graphics.s @@ -38,5 +38,33 @@ gSpriteAnimTable_8416EB4:: @ 8416EB4 gSpriteTemplate_8416EB8:: @ 8416EB8 spr_template 1001, 1001, gOamData_8416EA4, gSpriteAnimTable_8416EB4, NULL, gDummySpriteAffineAnimTable, nullsub_84 + .align 1 gUnknown_08416ED0:: @ 8416ED0 - .incbin "baserom.gba", 0x00416ed0, 0x38 + .2byte 0x3C0 + .2byte 0x380 + .2byte 0x340 + .2byte 0x300 + .2byte 0x2C0 + .2byte 0x280 + .2byte 0x240 + .2byte 0x200 + .2byte 0x1C0 + .2byte 0x180 + .2byte 0x140 + .2byte 0x100 + .2byte 0xFFFC + .2byte 0x10 + .2byte 0xFFFD + .2byte 0x30 + .2byte 0xFFFE + .2byte 0x50 + .2byte 0xFFFF + .2byte 0x70 + .2byte 0x1 + .2byte 0x70 + .2byte 0x2 + .2byte 0x50 + .2byte 0x3 + .2byte 0x30 + .2byte 0x4 + .2byte 0x10 diff --git a/data/truck_scene.s b/data/field_special_scene.s index 9d3958924..9d3958924 100644 --- a/data/truck_scene.s +++ b/data/field_special_scene.s 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/item_menu.s b/data/item_menu.s index 141caa1bd..f66961b46 100644 --- a/data/item_menu.s +++ b/data/item_menu.s @@ -70,8 +70,9 @@ gUnknown_083C16FC:: @ 83C16FC .4byte sub_80A65AC .4byte sub_80A6618 + .align 1 gUnknown_083C1704:: @ 83C1704 - .incbin "baserom.gba", 0x003c1704, 0x4 + .2byte 0x41EE, 0x7FFF gUnknown_083C1708:: @ 83C1708 .byte 4, 5 @@ -81,7 +82,7 @@ gUnknown_083C170A:: @ 83C170A .align 2 gPalette_83C170C:: @ 83C170C - .incbin "baserom.gba", 0x003c170c, 0x20 + .incbin "graphics/unknown/83C170C.gbapal" .align 2 gSpriteImage_83C172C:: @ 83C172C diff --git a/data/item_use.s b/data/item_use.s index 7e03e54d8..c4ab824a5 100644 --- a/data/item_use.s +++ b/data/item_use.s @@ -3,13 +3,28 @@ .section .rodata + .align 2 gUnknown_083D613C:: @ 83D613C - .incbin "baserom.gba", 0x003d613c, 0x60 + .byte 1, 0, 1, 0, 0, 0, 0, 0 + .byte 1, 1, 1, 0, 0, 0, 0, 0 + .byte 1, 0, 1, 1, 0, 0, 0, 0 + .byte 1, 1, 1, 1, 0, 0, 0, 0 + .byte 1, 0, 1, 0, 1, 0, 0, 0 + .byte 1, 1, 1, 0, 1, 0, 0, 0 + .byte 1, 0, 1, 1, 1, 0, 0, 0 + .byte 1, 0, 1, 0, 1, 1, 0, 0 + .byte 1, 1, 1, 1, 1, 0, 0, 0 + .byte 1, 1, 1, 0, 1, 1, 0, 0 + .byte 1, 0, 1, 1, 1, 1, 0, 0 + .byte 1, 1, 1, 1, 1, 1, 0, 0 Unknown_83D619C:: - .incbin "baserom.gba", 0x003d619c, 0x20 + .string "この チケットで ふねに のりほうだい\n" + .string "はやく のってみたいな$" + Unknown_83D61BC:: - .incbin "baserom.gba", 0x003d61bc, 0x20 + .string "この チケットで ふねに のりほうだい\n" + .string "はやく のってみたいな$" .align 2 gUnknown_083D61DC:: @ 83D61DC diff --git a/data/mail.s b/data/mail.s index 6bfc29c49..f5ae7f102 100644 --- a/data/mail.s +++ b/data/mail.s @@ -173,5 +173,6 @@ gUnknown_083E57A4:: @ 83E57A4 .byte 5, 15, 15, 52 .4byte Unknown_3E5790 +@ XXX: what is this? .align 2 - .incbin "baserom.gba", 0x3e5804, 0x4 + .4byte 0x2000000 diff --git a/data/mauville_old_man.s b/data/mauville_old_man.s index 27ea5f311..dad75ebd0 100644 --- a/data/mauville_old_man.s +++ b/data/mauville_old_man.s @@ -3,8 +3,14 @@ .section .rodata + .align 1 gUnknown_083E537C:: @ 83E537C - .incbin "baserom.gba", 0x003e537c, 0xc + ec_word SISTER + ec_word EATS + ec_word SWEETS + ec_word VORACIOUS + ec_word AND + ec_word DROOLING .align 2 gUnknown_083E5388:: @ 83E5388 @@ -28,8 +34,14 @@ gUnknown_083E53A8:: @ 83E53A8 .4byte OtherText_LyingInGreenGrass .4byte OtherText_SecretBasesWonderful + .align 1 gUnknown_083E53C8:: @ 83E53C8 - .incbin "baserom.gba", 0x003e53c8, 0x18 + .2byte 0x0, 0 + .2byte 0xC, 0 + .2byte 0xD, 0 + .2byte 0x12, 0 + .2byte 0x13, 0 + .2byte 0x15, 0 .align 2 gUnknown_083E53E0:: @ 83E53E0 @@ -72,5 +84,8 @@ gUnknown_083E53E0:: @ 83E53E0 gUnknown_083E5610:: @ 83E5610 .4byte 0x131, UnknownString_81B0763, UnknownString_81B0781, UnknownString_81B0797 + .align 2 gUnknown_083E5620:: @ 83E5620 - .incbin "baserom.gba", 0x003e5620, 0xc + .4byte 0x24 + .4byte gSaveBlock1 + 0x2D94 + .4byte 0xC 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/menu_helpers.s b/data/menu_helpers.s index b4665af1f..29d42cb4b 100644 --- a/data/menu_helpers.s +++ b/data/menu_helpers.s @@ -29,7 +29,7 @@ gSpriteImage_83E5928:: @ 83E5928 .align 2 Palette_3E5948: @ 83E5948 - .incbin "baserom.gba", 0x3e5948, 0x20 + .incbin "graphics/interface/83E5948.gbapal" .align 2 gUnknown_083E5968:: @ 83E5968 diff --git a/data/mon_markings.s b/data/mon_markings.s index 710f37a51..b9ec7735f 100644 --- a/data/mon_markings.s +++ b/data/mon_markings.s @@ -11,11 +11,17 @@ gUnknown_083E49F4:: @ 83E49F4 gUnknown_083E4A14:: @ 83E4A14 .incbin "graphics/misc/mon_markings.4bpp" -gUnknown_083E5214:: @ 83E5214 - .incbin "baserom.gba", 0x003e5214, 0x8 + .align 2 +gOamData_83E5214:: @ 83E5214 + .2byte 0x0 + .2byte 0xC000 + .2byte 0x0 -gUnknown_083E521C:: @ 83E521C - .space 8 + .align 2 +gOamData_83E521C:: @ 83E521C + .2byte 0x0 + .2byte 0x0 + .2byte 0x0 .align 2 gSpriteAnim_83E5224:: @ 83E5224 @@ -95,8 +101,11 @@ gSpriteAnimTable_83E52AC:: @ 83E52AC .4byte gSpriteAnim_83E529C .4byte gSpriteAnim_83E52A4 -gUnknown_083E52B4:: @ 83E52B4 - .incbin "baserom.gba", 0x003E52B4, 0x8 + .align 2 +gOamData_83E52B4:: @ 83E52B4 + .2byte 0x4000 + .2byte 0x4000 + .2byte 0x0 .align 2 gSpriteAnim_83E52BC:: @ 83E52BC diff --git a/data/naming_screen.s b/data/naming_screen.s index c9196c66a..4e477f4b9 100644 --- a/data/naming_screen.s +++ b/data/naming_screen.s @@ -11,8 +11,9 @@ gSpriteImage_83CE094:: @ 83CE094 gSpriteImage_83CE154:: @ 83CE154 .incbin "graphics/naming_screen/pc_icon/1.4bpp" +@ XXX: what is this? .align 2 - .incbin "baserom.gba", 0x003ce214, 0x4 + .4byte 0x2000000 .align 2 gUnknown_083CE218:: @ 83CE218 @@ -39,17 +40,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 +69,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 +83,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 +115,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 +156,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 +214,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/option_menu.s b/data/option_menu.s index eaf0f82b8..cb517cc89 100644 --- a/data/option_menu.s +++ b/data/option_menu.s @@ -5,8 +5,9 @@ .align 2 gUnknown_0839F5FC:: @ 839F5FC - .incbin "baserom.gba", 0x0039f5fc, 0x40 + .incbin "graphics/misc/option_menu_text.gbapal" +@ note: this is only used in the Japanese release .align 2 gUnknown_0839F63C:: @ 839F63C - .incbin "baserom.gba", 0x0039f63c, 0x40 + .incbin "graphics/misc/option_menu_equals_sign.4bpp" diff --git a/data/player_pc.s b/data/player_pc.s index 199411221..fe46b0443 100644 --- a/data/player_pc.s +++ b/data/player_pc.s @@ -18,10 +18,10 @@ gUnknown_08406298:: @ 8406298 .4byte SecretBaseText_TurnOff, PlayerPC_TurnOff gUnknown_084062B8:: @ 84062B8 - .incbin "baserom.gba", 0x004062b8, 0x4 + .byte 0, 1, 2, 3 gUnknown_084062BC:: @ 84062BC - .incbin "baserom.gba", 0x004062bc, 0x4 + .byte 0, 1, 3 .align 2 gUnknown_084062C0:: @ 84062C0 @@ -67,8 +67,11 @@ gUnknown_0840632A:: @ 840632A gUnknown_08406330:: @ 8406330 .string "{CLEAR_TO 32}$" + .align 1 gUnknown_08406334:: @ 8406334 - .incbin "baserom.gba", 0x00406334, 0x6 + .2byte 0x5294 + .2byte 0x6B5A + .2byte 0x7FFF gUnknown_0840633A:: @ 840633A .string "{COLOR RED}{STR_VAR_1}$" diff --git a/data/pokeblock.s b/data/pokeblock.s index a200edfb6..6d0b1890d 100644 --- a/data/pokeblock.s +++ b/data/pokeblock.s @@ -4,7 +4,31 @@ .section .rodata gUnknown_083F7E28:: @ 83F7E28 - .incbin "baserom.gba", 0x003f7e28, 0x80 + .byte 0, 0, 0, 0, 0 + .byte 1, 0, 0, 0, -1 + .byte 1, 0, -1, 0, 0 + .byte 1, -1, 0, 0, 0 + .byte 1, 0, 0, -1, 0 + .byte -1, 0, 0, 0, 1 + .byte 0, 0, 0, 0, 0 + .byte 0, 0, -1, 0, 1 + .byte 0, -1, 0, 0, 1 + .byte 0, 0, 0, -1, 1 + .byte -1, 0, 1, 0, 0 + .byte 0, 0, 1, 0, -1 + .byte 0, 0, 0, 0, 0 + .byte 0, -1, 1, 0, 0 + .byte 0, 0, 1, -1, 0 + .byte -1, 1, 0, 0, 0 + .byte 0, 1, 0, 0, -1 + .byte 0, 1, -1, 0, 0 + .byte 0, 0, 0, 0, 0 + .byte 0, 1, 0, -1, 0 + .byte -1, 0, 0, 1, 0 + .byte 0, 0, 0, 1, -1 + .byte 0, 0, -1, 1, 0 + .byte 0, -1, 0, 1, 0 + .byte 0, 0, 0, 0, 0 .align 2 gUnknown_083F7EA8:: @ 83F7EA8 @@ -69,12 +93,17 @@ gSpriteAnim_83F7F3C:: @ 83F7F3C gSpriteAnimTable_83F7F44:: @ 83F7F44 .4byte gSpriteAnim_83F7F3C -Unknown_83F7F48: - .incbin "baserom.gba", 0x003f7f48, 0x28 + .align 2 +gSpriteAffineAnim_83F7F48:: @ 83F7F48 + obj_rot_scal_anim_frame 0x0, 0x0, -2, 2 + obj_rot_scal_anim_frame 0x0, 0x0, 2, 4 + obj_rot_scal_anim_frame 0x0, 0x0, -2, 4 + obj_rot_scal_anim_frame 0x0, 0x0, 2, 2 + obj_rot_scal_anim_end .align 2 -gUnknown_083F7F70:: @ 83F7F70 - .4byte Unknown_83F7F48 +gSpriteAffineAnimTable_83F7F70:: @ 83F7F70 + .4byte gSpriteAffineAnim_83F7F48 .align 2 gUnknown_083F7F74:: @ 83F7F74 @@ -89,4 +118,8 @@ gSpriteTemplate_83F7F84:: @ 83F7F84 spr_template 14800, 14800, gOamData_83F7F34, gSpriteAnimTable_83F7F44, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy gUnknown_083F7F9C:: @ 83F7F9C - .incbin "baserom.gba", 0x003f7f9c, 0x28 + .byte 1, 20, 0, 0, 0, 0, 20, 0 + .byte 2, 0, 20, 0, 0, 0, 20, 0 + .byte 3, 0, 0, 20, 0, 0, 20, 0 + .byte 4, 0, 0, 0, 20, 0, 20, 0 + .byte 5, 0, 0, 0, 0, 20, 20, 0 diff --git a/data/pokedex_area_screen.s b/data/pokedex_area_screen.s index ac24f8653..9c23f8e89 100644 --- a/data/pokedex_area_screen.s +++ b/data/pokedex_area_screen.s @@ -18,8 +18,15 @@ gUnknown_083F856E:: @ 83F856E .2byte 328, 0, 34 .2byte 412, 0, 0 + .align 1 gUnknown_083F857A:: @ 83F857A - .incbin "baserom.gba", 0x003f857a, 0x12 + .2byte 85, 2142 + .2byte 68, 2119 + .2byte 88, 0 + +@ XXX: what is this? + .align 2 + .4byte 0x2000000 .align 2 gUnknown_083F858C:: @ 83F858C diff --git a/data/pokemon_menu.s b/data/pokemon_menu.s index 1781e8df7..9e2ce2864 100644 --- a/data/pokemon_menu.s +++ b/data/pokemon_menu.s @@ -30,8 +30,23 @@ gPokemonMenuActions:: @ 839F494 .4byte gMoveNames + 13 * MOVE_SOFT_BOILED, PokemonMenu_FieldMove .4byte gMoveNames + 13 * MOVE_SWEET_SCENT, PokemonMenu_FieldMove + .align 1 gUnknown_0839F554:: @ 839F554 - .incbin "baserom.gba", 0x39f554, 0x1e + .2byte MOVE_CUT + .2byte MOVE_FLASH + .2byte MOVE_ROCK_SMASH + .2byte MOVE_STRENGTH + .2byte MOVE_SURF + .2byte MOVE_FLY + .2byte MOVE_DIVE + .2byte MOVE_WATERFALL + .2byte MOVE_TELEPORT + .2byte MOVE_DIG + .2byte MOVE_SECRET_POWER + .2byte MOVE_MILK_DRINK + .2byte MOVE_SOFT_BOILED + .2byte MOVE_SWEET_SCENT + .2byte 0xFF Unknown_39F572: @ 839F572 .byte 4, 5, 9, 0 diff --git a/data/pokemon_summary_screen.s b/data/pokemon_summary_screen.s index 31457e382..f66a28e56 100644 --- a/data/pokemon_summary_screen.s +++ b/data/pokemon_summary_screen.s @@ -185,7 +185,7 @@ gSpriteTemplate_83C11C0:: @ 83C11C0 spr_template 30002, 30002, gOamData_83C109C, gSpriteAnimTable_83C115C, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy gUnknown_083C11D8:: @ 83C11D8 - .incbin "baserom.gba", 0x003c11d8, 0x18 + .byte 0xD,0xD,0xE,0xE,0xD,0xD,0xF,0xE,0xD,0xF,0xD,0xE,0xF,0xD,0xE,0xE,0xF,0xD,0xD,0xE,0xE,0xF,0xD .align 2 gOamData_83C11F0:: @ 83C11F0 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/reset_rtc_screen.s b/data/reset_rtc_screen.s index a50f5c07b..a9a3ac847 100644 --- a/data/reset_rtc_screen.s +++ b/data/reset_rtc_screen.s @@ -5,7 +5,11 @@ .align 2 gUnknown_08376420:: @ 8376420 - .incbin "baserom.gba", 0x00376420, 0x3C + .byte 3, 0, 1, 0, 15, 39, 0, 2, 0, 0, 0, 0 + .byte 4, 0, 0, 0, 23, 0, 1, 3, 0, 0, 0, 0 + .byte 5, 0, 0, 0, 59, 0, 2, 4, 0, 0, 0, 0 + .byte 6, 0, 0, 0, 59, 0, 3, 5, 0, 0, 0, 0 + .byte 7, 0, 0, 0, 0, 0, 4, 0, 6, 0, 0, 0 .align 2 gOamData_837645C:: @ 837645C @@ -23,7 +27,7 @@ gSpriteImage_8376484:: @ 8376484 .align 2 Palette_3764A4: @ 83764A4 - .incbin "baserom.gba", 0x3764a4, 0x8 + .incbin "graphics/unknown/83764A4.gbapal" .align 2 gSpriteImageTable_83764AC:: @ 83764AC diff --git a/data/rom_8077ABC.s b/data/rom_8077ABC.s index dc9074cee..81b61228b 100644 --- a/data/rom_8077ABC.s +++ b/data/rom_8077ABC.s @@ -3,8 +3,16 @@ .section .rodata + .align 2 gUnknown_0837F578:: @ 837F578 - .incbin "baserom.gba", 0x0037f578, 0x20 + .byte 72, 80, 0, 0 + .byte 176, 40, 0, 0 + .byte 48, 40, 0, 0 + .byte 112, 80, 0, 0 + .byte 32, 80, 0, 0 + .byte 200, 40, 0, 0 + .byte 90, 88, 0, 0 + .byte 152, 32, 0, 0 @ One entry for each of the four Castform forms. @ Coords are probably front pic coords or back pic coords, but this data does not seem to be diff --git a/data/rom_8080874.s b/data/rom_8080874.s index f91dd02fc..220ec5f96 100644 --- a/data/rom_8080874.s +++ b/data/rom_8080874.s @@ -3,12 +3,13 @@ .section .rodata + .align 1 gUnknown_0839ACDC:: @ 839ACDC - .incbin "baserom.gba", 0x0039acdc, 0xc + .2byte 0xC8, 0x48, 0x38, 0x28, 0x18, 0x0 .align 2 gUnknown_0839ACE8:: @ 839ACE8 - .byte 4 + .4byte 4 .align 2 gUnknown_0839ACEC:: @ 839ACEC 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/save_failed_screen.s b/data/save_failed_screen.s index 70cc27fa8..5d22810ea 100644 --- a/data/save_failed_screen.s +++ b/data/save_failed_screen.s @@ -3,12 +3,6 @@ .section .rodata -gUnknown_08411940:: @ 8411940 - .incbin "baserom.gba", 0x00411940, 0x8 - -gUnknown_08411948:: @ 8411948 - .incbin "baserom.gba", 0x00411948, 0x18 - gSaveFailedClockPal:: @ 8411960 .incbin "graphics/misc/clock_small.gbapal" diff --git a/data/secret_base.s b/data/secret_base.s index 733259b3e..59ded8ddf 100644 --- a/data/secret_base.s +++ b/data/secret_base.s @@ -3,11 +3,65 @@ .section .rodata + .align 1 gUnknown_083D1358:: @ 83D1358 - .incbin "baserom.gba", 0x003d1358, 0x1c + .2byte 0x26, 0x36 + .2byte 0x27, 0x37 + .2byte 0x1A0, 0x1A1 + .2byte 0x1A8, 0x1A9 + .2byte 0x1B0, 0x1B1 + .2byte 0x208, 0x210 + .2byte 0x271, 0x278 gUnknown_083D1374:: @ 83D1374 - .incbin "baserom.gba", 0x003d1374, 0x60 + .byte 0, 0 + .byte 1, 3 + .byte 6, 0 + .byte 5, 9 + .byte 12, 0 + .byte 1, 3 + .byte 18, 0 + .byte 7, 13 + .byte 1, 0 + .byte 2, 3 + .byte 7, 0 + .byte 9, 2 + .byte 13, 0 + .byte 13, 4 + .byte 19, 0 + .byte 1, 2 + .byte 2, 0 + .byte 1, 3 + .byte 8, 0 + .byte 1, 2 + .byte 14, 0 + .byte 3, 15 + .byte 20, 0 + .byte 3, 14 + .byte 3, 0 + .byte 9, 3 + .byte 9, 0 + .byte 8, 7 + .byte 15, 0 + .byte 3, 6 + .byte 21, 0 + .byte 5, 9 + .byte 4, 0 + .byte 2, 3 + .byte 10, 0 + .byte 5, 6 + .byte 16, 0 + .byte 15, 3 + .byte 22, 0 + .byte 4, 10 + .byte 5, 0 + .byte 3, 3 + .byte 11, 0 + .byte 1, 2 + .byte 17, 0 + .byte 7, 8 + .byte 23, 0 + .byte 9, 6 .align 2 gUnknown_083D13D4:: @ 83D13D4 @@ -20,4 +74,4 @@ gUnknown_083D13E4:: @ 83D13E4 .4byte sub_80BCBC0 gUnknown_083D13EC:: @ 83D13EC - .incbin "baserom.gba", 0x003d13ec, 0xc + .byte 0x23,0x24,0xF,0x1F,0x21,0x2F,0xE,0x14,0x20,0x22,0x0,0x0 diff --git a/data/starter_choose.s b/data/starter_choose.s index 679f0f4d0..4c549b449 100644 --- a/data/starter_choose.s +++ b/data/starter_choose.s @@ -73,7 +73,10 @@ gOamData_83F76DC:: @ 83F76DC .align 2 gUnknown_083F76E4:: @ 83F76E4 - .incbin "baserom.gba", 0x003f76e4, 0x8 + .byte 60, 32 + .byte 120, 56 + .byte 180, 32 + .byte 0, 0 .align 2 gSpriteAnim_83F76EC:: @ 83F76EC @@ -124,8 +127,11 @@ gSpriteAnimTable_83F7750:: @ 83F7750 gSpriteAnimTable_83F7758:: @ 83F7758 .4byte gSpriteAnim_83F7744 -Unknown_83F775C: - .incbin "baserom.gba", 0x003f775c, 0x18 + .align 2 +gSpriteAffineAnim_83F775C:: @ 83F775C + obj_rot_scal_anim_frame 0x10, 0x10, 0, 0 + obj_rot_scal_anim_frame 0x10, 0x10, 0, 15 + obj_rot_scal_anim_end .align 2 gSpriteAffineAnim_83F7774:: @ 83F7774 @@ -134,8 +140,8 @@ gSpriteAffineAnim_83F7774:: @ 83F7774 obj_rot_scal_anim_end .align 2 -gUnknown_083F778C:: @ 83F778C - .4byte Unknown_83F775C +gSpriteAffineAnimTable_83F778C:: @ 83F778C + .4byte gSpriteAffineAnim_83F775C .align 2 gSpriteAffineAnimTable_83F7790:: @ 83F7790 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 diff --git a/data/title_screen.s b/data/title_screen.s index b5e791273..7c818eeb2 100644 --- a/data/title_screen.s +++ b/data/title_screen.s @@ -41,8 +41,40 @@ gUnknown_08393BF8:: @ 8393BF8 LogoShineTiles: @ 8393D14 .incbin "graphics/title_screen/logo_shine.4bpp.lz" + .align 1 gUnknown_08393E64:: @ 8393E64 - .incbin "baserom.gba", 0x00393e64, 0x40 + .2byte 0x10 + .2byte 0x110 + .2byte 0x210 + .2byte 0x310 + .2byte 0x410 + .2byte 0x510 + .2byte 0x610 + .2byte 0x710 + .2byte 0x810 + .2byte 0x910 + .2byte 0xA10 + .2byte 0xB10 + .2byte 0xC10 + .2byte 0xD10 + .2byte 0xE10 + .2byte 0xF10 + .2byte 0x100F + .2byte 0x100E + .2byte 0x100D + .2byte 0x100C + .2byte 0x100B + .2byte 0x100A + .2byte 0x1009 + .2byte 0x1008 + .2byte 0x1007 + .2byte 0x1006 + .2byte 0x1005 + .2byte 0x1004 + .2byte 0x1003 + .2byte 0x1002 + .2byte 0x1001 + .2byte 0x1000 .align 2 gOamData_8393EA4:: @ 8393EA4 diff --git a/data/trainer_card.s b/data/trainer_card.s index d7d71fb68..e73af87a2 100644 --- a/data/trainer_card.s +++ b/data/trainer_card.s @@ -7,8 +7,9 @@ gBadgesTiles:: @ 83B5AB8 .incbin "graphics/trainer_card/badges.4bpp" +@ XXX: what is this? .align 2 - .4byte 0x02000000 @ XXX + .4byte 0x2000000 .align 2 gUnknown_083B5EBC:: @ 83B5EBC |