diff options
| -rw-r--r-- | asm/mon_markings.s | 12 | ||||
| -rw-r--r-- | data/battle_anim_813F0F4.s | 24 | ||||
| -rw-r--r-- | data/battle_message.s | 123 | ||||
| -rw-r--r-- | data/item_menu.s | 5 | ||||
| -rw-r--r-- | data/mon_markings.s | 21 | ||||
| -rw-r--r-- | data/option_menu.s | 5 | ||||
| -rw-r--r-- | data/reset_rtc_screen.s | 8 | ||||
| -rw-r--r-- | data/starter_choose.s | 16 | ||||
| -rw-r--r-- | graphics/misc/option_menu_equals_sign.png | bin | 0 -> 81 bytes | |||
| -rw-r--r-- | graphics/misc/option_menu_text.pal | 35 | ||||
| -rw-r--r-- | graphics/unknown/83764A4.pal | 7 | ||||
| -rw-r--r-- | graphics/unknown/83C170C.pal | 19 | ||||
| -rw-r--r-- | src/starter_choose.c | 4 |
13 files changed, 250 insertions, 29 deletions
diff --git a/asm/mon_markings.s b/asm/mon_markings.s index 6d5322b91..28bc116a9 100644 --- a/asm/mon_markings.s +++ b/asm/mon_markings.s @@ -560,7 +560,7 @@ sub_80F761C: @ 80F761C add r2, sp, 0x54 ldrh r2, [r2] strh r2, [r4, 0x2] - ldr r0, _080F782C @ =gUnknown_083E5214 + ldr r0, _080F782C @ =gOamData_83E5214 str r0, [r4, 0x4] ldr r0, _080F7830 @ =gSpriteAnimTable_83E52AC str r0, [r4, 0x8] @@ -640,7 +640,7 @@ _080F7718: str r0, [r4, 0x8] ldr r0, _080F7844 @ =sub_80F78CC str r0, [r4, 0x14] - ldr r0, _080F7848 @ =gUnknown_083E521C + ldr r0, _080F7848 @ =gOamData_83E521C str r0, [r4, 0x4] movs r5, 0 ldr r0, [sp, 0x58] @@ -736,14 +736,14 @@ _080F7770: _080F7820: .4byte gUnknown_020388B8 _080F7824: .4byte gPokenavConditionMenuMisc_Gfx _080F7828: .4byte gUnknown_08E966B8 -_080F782C: .4byte gUnknown_083E5214 +_080F782C: .4byte gOamData_83E5214 _080F7830: .4byte gSpriteAnimTable_83E52AC _080F7834: .4byte gDummySpriteAffineAnimTable _080F7838: .4byte nullsub_65 _080F783C: .4byte gSprites _080F7840: .4byte gSpriteAnimTable_83E5274 _080F7844: .4byte sub_80F78CC -_080F7848: .4byte gUnknown_083E521C +_080F7848: .4byte gOamData_83E521C _080F784C: .4byte SpriteCallbackDummy _080F7850: ldr r0, _080F785C @ =gUnknown_020388B8 @@ -927,7 +927,7 @@ sub_80F7960: @ 80F7960 movs r2, 0 strh r6, [r0] strh r1, [r0, 0x2] - ldr r0, _080F79E4 @ =gUnknown_083E52B4 + ldr r0, _080F79E4 @ =gOamData_83E52B4 str r0, [sp, 0x4] ldr r0, _080F79E8 @ =gSpriteAnimTable_83E533C str r0, [sp, 0x8] @@ -961,7 +961,7 @@ sub_80F7960: @ 80F7960 .align 2, 0 _080F79DC: .4byte gUnknown_083E4A14 _080F79E0: .4byte 0xffff0000 -_080F79E4: .4byte gUnknown_083E52B4 +_080F79E4: .4byte gOamData_83E52B4 _080F79E8: .4byte gSpriteAnimTable_83E533C _080F79EC: .4byte gDummySpriteAffineAnimTable _080F79F0: .4byte nullsub_65 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/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/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/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/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/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/graphics/misc/option_menu_equals_sign.png b/graphics/misc/option_menu_equals_sign.png Binary files differnew file mode 100644 index 000000000..7e56e3cc3 --- /dev/null +++ b/graphics/misc/option_menu_equals_sign.png diff --git a/graphics/misc/option_menu_text.pal b/graphics/misc/option_menu_text.pal new file mode 100644 index 000000000..5e136a7ff --- /dev/null +++ b/graphics/misc/option_menu_text.pal @@ -0,0 +1,35 @@ +JASC-PAL +0100 +32 +0 0 0 +255 139 131 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +255 49 24 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +255 255 255 +0 0 0 +255 180 82 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +197 123 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +255 255 255 diff --git a/graphics/unknown/83764A4.pal b/graphics/unknown/83764A4.pal new file mode 100644 index 000000000..b2e8a5f5f --- /dev/null +++ b/graphics/unknown/83764A4.pal @@ -0,0 +1,7 @@ +JASC-PAL +0100 +4 +0 0 0 +255 0 0 +74 74 74 +0 0 0 diff --git a/graphics/unknown/83C170C.pal b/graphics/unknown/83C170C.pal new file mode 100644 index 000000000..328b93f67 --- /dev/null +++ b/graphics/unknown/83C170C.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +98 98 115 +255 255 255 +205 205 205 +164 164 164 +123 123 123 +98 98 115 +41 57 65 +57 106 139 +41 82 115 +255 230 172 +255 197 90 +255 32 32 +106 180 213 +41 123 164 +189 156 90 +0 0 0 diff --git a/src/starter_choose.c b/src/starter_choose.c index 68e644353..9bd817cce 100644 --- a/src/starter_choose.c +++ b/src/starter_choose.c @@ -28,7 +28,7 @@ extern struct SpriteSheet gUnknown_083F77A4; extern u8 gBirchBagGrassPal[]; extern const u8 gStarterChoose_LabelCoords[][2]; extern u16 gStarterMons[]; -extern union AffineAnimCmd *gUnknown_083F778C[]; +extern union AffineAnimCmd *gSpriteAffineAnimTable_83F778C[]; extern u8 gOtherText_DoYouChoosePoke[]; extern u16 gScriptResult; extern u8 gSpeciesNames[][11]; @@ -216,7 +216,7 @@ static void Task_StarterChoose2(u8 taskId) GetStarterPokemon(gTasks[taskId].data[TD_STARTERSELECTION]), gStarterChoose_PokeballCoords[selection][0], gStarterChoose_PokeballCoords[selection][1]); - gSprites[spriteId].affineAnims = gUnknown_083F778C; + gSprites[spriteId].affineAnims = gSpriteAffineAnimTable_83F778C; gSprites[spriteId].callback = StarterPokemonSpriteAnimCallback; gTasks[taskId].data[TD_PKMN_SPRITE_ID] = spriteId; |
