diff options
| -rw-r--r-- | asm/pokeblock.s | 4 | ||||
| -rw-r--r-- | data/item_use.s | 21 | ||||
| -rw-r--r-- | data/mauville_old_man.s | 21 | ||||
| -rw-r--r-- | data/player_pc.s | 9 | ||||
| -rw-r--r-- | data/pokeblock.s | 45 | ||||
| -rw-r--r-- | data/secret_base.s | 60 |
6 files changed, 140 insertions, 20 deletions
diff --git a/asm/pokeblock.s b/asm/pokeblock.s index d39a4b3ca..55bc29dc5 100644 --- a/asm/pokeblock.s +++ b/asm/pokeblock.s @@ -2280,7 +2280,7 @@ _0810C8F2: movs r1, 0x1 orrs r0, r1 strb r0, [r4, 0x1] - ldr r0, _0810C914 @ =gUnknown_083F7F70 + ldr r0, _0810C914 @ =gSpriteAffineAnimTable_83F7F70 str r0, [r4, 0x10] adds r0, r4, 0 bl InitSpriteAffineAnim @@ -2289,7 +2289,7 @@ _0810C8F2: strh r5, [r4, 0x30] b _0810C944 .align 2, 0 -_0810C914: .4byte gUnknown_083F7F70 +_0810C914: .4byte gSpriteAffineAnimTable_83F7F70 _0810C918: ldrh r0, [r4, 0x30] adds r0, 0x1 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/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/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/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 |