diff --git a/asm/fossil_specials.s b/asm/fossil_specials.s index 6883743ec5..7956f814a4 100755 --- a/asm/fossil_specials.s +++ b/asm/fossil_specials.s @@ -657,7 +657,7 @@ _081BF0B4: ldr r0, [r0] ldr r1, [r0] movs r5, 0 - ldr r2, =gUnknown_08617C44 + ldr r2, =gRootFossil_Gfx _081BF0BE: adds r0, r5, r2 ldrb r0, [r0] diff --git a/data/fossil_special_fldeff_groundshake.s b/data/fossil_special_fldeff_groundshake.s index 8f968d4094..8fa546ce83 100644 --- a/data/fossil_special_fldeff_groundshake.s +++ b/data/fossil_special_fldeff_groundshake.s @@ -3,32 +3,96 @@ .section .rodata + .align 2 gUnknown_08617274:: @ 8617274 - .incbin "baserom.gba", 0x617274, 0x920 + .space 0x20 + .incbin "graphics/misc/mirage_tower.4bpp" + .align 2 gUnknown_08617B94:: @ 8617B94 - .incbin "baserom.gba", 0x617b94, 0xb0 + .incbin "graphics/misc/mirage_tower.bin" -gUnknown_08617C44:: @ 8617C44 - .incbin "baserom.gba", 0x617c44, 0x120 + .align 2 +gRootFossil_Pal:: @ 8617C24 + .incbin "graphics/misc/fossil.gbapal" + .align 2 +gRootFossil_Gfx:: @ 8617C44 + .incbin "graphics/misc/fossil.4bpp" + + .align 2 +gMirageTowerCrumbles_Gfx:: @ 8617CC4 + .incbin "graphics/misc/mirage_tower_crumbles.4bpp" + + .align 2 +gMirageTowerCrumbles_Palette:: @ 8617D44 + .incbin "graphics/misc/mirage_tower_crumbles.gbapal" + + .align 1 gUnknown_08617D64:: @ 8617D64 - .incbin "baserom.gba", 0x617d64, 0x30 + .2byte 0x0000, 0x000a, 0x0041, 0x0011, 0x0003, 0x0032, 0xfff4, 0x0000, 0x004b, 0x000a, 0x000f, 0x005a, 0x0007, 0x0008, 0x0041, 0xffee + .2byte 0x0005, 0x004b, 0x0016, 0xfff6, 0x0037, 0xffe8, 0xfffc, 0x0041 + .align 2 gUnknown_08617D94:: @ 8617D94 - .incbin "baserom.gba", 0x617d94, 0x10 + obj_tiles gMirageTowerCrumbles_Gfx, 0x0080, 0x0fa0 + null_obj_tiles + .align 2 gUnknown_08617DA4:: @ 8617DA4 - .incbin "baserom.gba", 0x617da4, 0x5c + .byte 0x12, 0x35, 0x51, 0x02, 0x13, 0x35, 0x51, 0x02, 0x14, 0x35, 0x51, 0x02, 0x12, 0x36, 0x51, 0x02, 0x13, 0x36, 0x51, 0x02, 0x14, 0x36, 0x51, 0x02, 0x12, 0x37, 0x51, 0x02, 0x13, 0x37, 0x51, 0x02 + .byte 0x14, 0x37, 0x51, 0x02, 0x12, 0x38, 0x51, 0x02, 0x13, 0x38, 0x51, 0x02, 0x14, 0x38, 0x51, 0x02, 0x12, 0x39, 0x59, 0x02, 0x13, 0x39, 0x59, 0x02, 0x14, 0x39, 0x59, 0x02, 0x12, 0x3a, 0x21, 0x01 + .byte 0x13, 0x3a, 0x21, 0x01, 0x14, 0x3a, 0x21, 0x01 + .align 2 +gSpriteAnim_8617DEC:: @ 8617DEC + .2byte 0x0000, 0x0001, 0xffff, 0x0000 + + .align 2 +gOamData_8617DF4:: @ 8617DF4 + .2byte 0x0000, 0x4000, 0x3000, 0x0000 + + .align 2 +gSpriteAnimTable_8617DFC:: @ 8617DFC + .4byte gSpriteAnim_8617DEC + + .align 2 gUnknown_08617E00:: @ 8617E00 - .incbin "baserom.gba", 0x617e00, 0x18 + spr_template 0xffff, 0xffff, gOamData_8617DF4, gSpriteAnimTable_8617DFC, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy + .align 2 gUnknown_08617E18:: @ 8617E18 - .incbin "baserom.gba", 0x617e18, 0x1c + .byte 0x3b, 0x43, 0x61, 0x00, 0x0f, 0x05, 0xff, 0x9b + .align 2 +gSpriteAnim_8617E20:: @ 8617E20 + .2byte 0x0000, 0x000c, 0xfffe, 0x0000 + + .align 2 +gSpriteAnimTable_8617E28:: @ 8617E28 + .4byte gSpriteAnim_8617E20 + + .align 2 +gUnknown_08617E2C:: @ 8617E2C + .2byte 0x0000, 0x0000, 0x0000, 0x0000 + + .align 2 gUnknown_08617E34:: @ 8617E34 - .incbin "baserom.gba", 0x617e34, 0x2c + spr_template 0x0fa0, 0xffff, gUnknown_08617E2C, gSpriteAnimTable_8617E28, NULL, gDummySpriteAffineAnimTable, sub_81BEAD8 + .align 2 +gSpriteAnim_8617E4C:: @ 8617E4C + .2byte 0x0000, 0x000c, 0xfffe, 0x0000 + + .align 2 +gSpriteAnim_8617E54:: @ 8617E54 + .4byte gSpriteAnim_8617E4C + + .align 2 +gOamData_8617E58:: @ 8617E58 + .2byte 0x0000, 0x4000, 0x0000, 0x0000 + + .align 2 gUnknown_08617E60:: @ 8617E60 - .incbin "baserom.gba", 0x617e60, 0x18 + spr_template 0x0fa0, 0xffff, gOamData_8617E58, gSpriteAnim_8617E54, NULL, gDummySpriteAffineAnimTable, sub_81BEAD8 + diff --git a/graphics/misc/fossil.png b/graphics/misc/fossil.png new file mode 100644 index 0000000000..f92649e987 Binary files /dev/null and b/graphics/misc/fossil.png differ diff --git a/graphics/misc/mirage_tower.bin b/graphics/misc/mirage_tower.bin new file mode 100644 index 0000000000..85f2883876 Binary files /dev/null and b/graphics/misc/mirage_tower.bin differ diff --git a/graphics/misc/mirage_tower.png b/graphics/misc/mirage_tower.png new file mode 100644 index 0000000000..69ac6a51e0 Binary files /dev/null and b/graphics/misc/mirage_tower.png differ diff --git a/graphics/misc/mirage_tower_crumbles.png b/graphics/misc/mirage_tower_crumbles.png new file mode 100644 index 0000000000..27e5daed07 Binary files /dev/null and b/graphics/misc/mirage_tower_crumbles.png differ