diff --git a/asm/rayquaza_scene.s b/asm/rayquaza_scene.s index e6147333c..ab04d8660 100755 --- a/asm/rayquaza_scene.s +++ b/asm/rayquaza_scene.s @@ -1119,7 +1119,7 @@ sub_81D706C: @ 81D706C push {r4,lr} sub sp, 0x4 bl reset_temp_tile_data_buffers - ldr r1, =gUnknown_08DA33C0 + ldr r1, =gRaySceneClouds_Gfx movs r0, 0 str r0, [sp] movs r2, 0 @@ -1130,22 +1130,22 @@ _081D7082: lsls r0, 24 cmp r0, 0 bne _081D7082 - ldr r0, =gUnknown_08DA3988 + ldr r0, =gRaySceneClouds2_Tilemap ldr r4, =gUnknown_0203CF60 ldr r1, [r4] adds r1, 0x4 bl LZDecompressWram - ldr r0, =gUnknown_08DA3824 + ldr r0, =gRaySceneClouds1_Tilemap ldr r1, [r4] ldr r2, =0x00000804 adds r1, r2 bl LZDecompressWram - ldr r0, =gUnknown_08DA3A88 + ldr r0, =gRaySceneClouds3_Tilemap ldr r1, [r4] ldr r2, =0x00001004 adds r1, r2 bl LZDecompressWram - ldr r0, =gUnknown_08DA37E8 + ldr r0, =gRaySceneClouds_Pal movs r1, 0 movs r2, 0x40 bl LoadCompressedPalette @@ -2811,20 +2811,20 @@ sub_81D7E9C: @ 81D7E9C push {r4,lr} sub sp, 0x4 bl reset_temp_tile_data_buffers - ldr r1, =gUnknown_08DA33C0 + ldr r1, =gRaySceneClouds_Gfx movs r4, 0 str r4, [sp] movs r0, 0 movs r2, 0 movs r3, 0 bl decompress_and_copy_tile_data_to_vram - ldr r1, =gUnknown_08DA4F70 + ldr r1, =gRaySceneOvercast_Gfx str r4, [sp] movs r0, 0x1 movs r2, 0 movs r3, 0 bl decompress_and_copy_tile_data_to_vram - ldr r1, =gUnknown_08DA3C94 + ldr r1, =gRaySceneRayquaza_Gfx str r4, [sp] movs r0, 0x2 movs r2, 0 @@ -2835,22 +2835,22 @@ _081D7ED0: lsls r0, 24 cmp r0, 0 bne _081D7ED0 - ldr r0, =gUnknown_08DA3988 + ldr r0, =gRaySceneClouds2_Tilemap ldr r4, =gUnknown_0203CF60 ldr r1, [r4] adds r1, 0x4 bl LZDecompressWram - ldr r0, =gUnknown_08DA60B8 + ldr r0, =gRaySceneOvercast_Tilemap ldr r1, [r4] ldr r2, =0x00000804 adds r1, r2 bl LZDecompressWram - ldr r0, =gUnknown_08DA4DEC + ldr r0, =gRaySceneRayquaza_Tilemap ldr r1, [r4] ldr r2, =0x00001004 adds r1, r2 bl LZDecompressWram - ldr r0, =gUnknown_08DA4DA8 + ldr r0, =gRaySceneRayquaza_Pal movs r1, 0 movs r2, 0x40 bl LoadCompressedPalette @@ -3354,14 +3354,14 @@ sub_81D8358: @ 81D8358 push {r4-r7,lr} sub sp, 0xC bl reset_temp_tile_data_buffers - ldr r1, =gUnknown_08DA7528 + ldr r1, =gRaySceneRayquazaLight_Gfx movs r4, 0 str r4, [sp] movs r0, 0 movs r2, 0 movs r3, 0 bl decompress_and_copy_tile_data_to_vram - ldr r1, =gUnknown_08DA69BC + ldr r1, =gRaySceneOvercast2_Gfx str r4, [sp] movs r0, 0x1 movs r2, 0 @@ -3374,12 +3374,12 @@ _081D8380: lsrs r6, r0, 24 cmp r6, 0 bne _081D8380 - ldr r0, =gUnknown_08DA7AAC + ldr r0, =gRaySceneRayquazaLight_Tilemap ldr r5, =gUnknown_0203CF60 ldr r1, [r5] adds r1, 0x4 bl LZDecompressWram - ldr r0, =gUnknown_08DA7784 + ldr r0, =gRaySceneOvercast2_Tilemap ldr r1, [r5] ldr r4, =0x00001804 adds r1, r4 @@ -3406,7 +3406,7 @@ _081D8380: ldr r2, =0x010000d0 adds r0, r7, 0 bl CpuFastSet - ldr r0, =gUnknown_08DA7744 + ldr r0, =gRaySceneOvercast2_Pal movs r1, 0 movs r2, 0x40 bl LoadCompressedPalette @@ -3961,20 +3961,20 @@ sub_81D88D0: @ 81D88D0 push {r4,lr} sub sp, 0x4 bl reset_temp_tile_data_buffers - ldr r1, =gUnknown_08DA80BC + ldr r1, =gRaySceneRayquazaChase_Gfx movs r4, 0 str r4, [sp] movs r0, 0x1 movs r2, 0 movs r3, 0 bl decompress_and_copy_tile_data_to_vram - ldr r1, =gUnknown_08DA7EAC + ldr r1, =gRaySceneChaseStreaks_Gfx str r4, [sp] movs r0, 0x2 movs r2, 0 movs r3, 0 bl decompress_and_copy_tile_data_to_vram - ldr r1, =gUnknown_08DA7C30 + ldr r1, =gRaySceneChaseBg_Gfx str r4, [sp] movs r0, 0x3 movs r2, 0 @@ -3985,27 +3985,27 @@ _081D8904: lsls r0, 24 cmp r0, 0 bne _081D8904 - ldr r0, =gUnknown_08DA8D6C + ldr r0, =gRayChaseRayquazaChase2_Tilemap ldr r4, =gUnknown_0203CF60 ldr r1, [r4] adds r1, 0x4 bl LZDecompressWram - ldr r0, =gUnknown_08DA8B40 + ldr r0, =gRayChaseRayquazaChase_Tilemap ldr r1, [r4] ldr r2, =0x00000804 adds r1, r2 bl LZDecompressWram - ldr r0, =gUnknown_08DA7FB4 + ldr r0, =gRaySceneChaseStreaks_Tilemap ldr r1, [r4] ldr r2, =0x00001004 adds r1, r2 bl LZDecompressWram - ldr r0, =gUnknown_08DA7D6C + ldr r0, =gRaySceneChaseBg_Tilemap ldr r1, [r4] ldr r2, =0x00001804 adds r1, r2 bl LZDecompressWram - ldr r0, =gUnknown_08DA8E84 + ldr r0, =gRaySceneChase_Pal movs r1, 0 movs r2, 0x80 bl LoadCompressedPalette @@ -4407,14 +4407,14 @@ sub_81D8CC4: @ 81D8CC4 push {r4,lr} sub sp, 0x4 bl reset_temp_tile_data_buffers - ldr r1, =gUnknown_08DAAB24 + ldr r1, =gRaySceneHushRing_Gfx movs r4, 0 str r4, [sp] movs r0, 0x2 movs r2, 0 movs r3, 0 bl decompress_and_copy_tile_data_to_vram - ldr r1, =gUnknown_08DAA8B4 + ldr r1, =gRaySceneHushBg_Gfx str r4, [sp] movs r0, 0 movs r2, 0 @@ -4425,22 +4425,22 @@ _081D8CEA: lsls r0, 24 cmp r0, 0 bne _081D8CEA - ldr r0, =gUnknown_08DAAE54 + ldr r0, =gRaySceneHushRing_Tilemap ldr r4, =gUnknown_0203CF60 ldr r1, [r4] ldr r2, =0x00000804 adds r1, r2 bl LZDecompressWram - ldr r0, =gUnknown_08DAAC1C + ldr r0, =gRaySceneHushBg_Tilemap ldr r1, [r4] adds r1, 0x4 bl LZDecompressWram - ldr r0, =gUnknown_08DAAF98 + ldr r0, =gRaySceneHushRing_Map ldr r1, [r4] ldr r2, =0x00001004 adds r1, r2 bl LZDecompressWram - ldr r0, =gUnknown_08DAAFEC + ldr r0, =gRaySceneHushBg_Pal movs r1, 0 movs r2, 0x60 bl LoadCompressedPalette diff --git a/data/graphics.s b/data/graphics.s index f7ce42517..0e6ec9d38 100644 --- a/data/graphics.s +++ b/data/graphics.s @@ -3514,44 +3514,69 @@ gBagScreenFemale_Pal:: @ 8D9A5D4 gBagScreen_Gfx:: @ 8D9A620 .incbin "graphics/interface/bag_screen.4bpp.lz" + .align 2 gUnknown_08D9A88C:: @ 8D9A88C - .incbin "baserom.gba", 0xd9a88c, 0x544 + .incbin "graphics/unknown/unknown_D9A88C.bin.lz" + .align 2 +gBattleFrontierGfx_PyramidBag:: @ 8D9A9EC + .incbin "graphics/interface/bag_pyramid.4bpp.lz" + + .align 2 gUnknown_08D9ADD0:: @ 8D9ADD0 - .incbin "baserom.gba", 0xd9add0, 0x34 + .incbin "graphics/interface/bag_pyramid.gbapal.lz" @ female palette is first and male is second. + .align 2 gUnknown_08D9AE04:: @ 8D9AE04 - .incbin "baserom.gba", 0xd9ae04, 0x140 + .incbin "graphics/unknown/unknown_D9AE04.bin.lz" @ tilemap? + .align 2 gUnknown_08D9AF44:: @ 8D9AF44 - .incbin "baserom.gba", 0xd9af44, 0x78 + .incbin "graphics/unknown/unknown_D9AF44.gbapal.lz" + .align 2 +gBagSwapLineGfx:: @ 8D9AF6C + .incbin "graphics/interface/bag_swap.4bpp.lz" + + .align 2 +gBagSwapLinePal:: @ 8D9AFAC + .incbin "graphics/interface/bag_swap.gbapal.lz" + + .align 2 gBuyMenuFrame_Gfx:: @ 8D9AFBC - .incbin "baserom.gba", 0xd9afbc, 0x10c + .incbin "graphics/interface/mart_frame.4bpp.lz" + .align 2 gMenuMoneyPal:: @ 8D9B0C8 - .incbin "baserom.gba", 0xd9b0c8, 0x28 + .incbin "graphics/interface/mart_frame.gbapal.lz" + .align 2 gBuyMenuFrame_Tilemap:: @ 8D9B0F0 - .incbin "baserom.gba", 0xd9b0f0, 0x140 + .incbin "graphics/interface/mart_frame.bin.lz" + .align 2 gMenuMoneyGfx:: @ 8D9B230 - .incbin "baserom.gba", 0xd9b230, 0x84 + .incbin "graphics/interface/money.4bpp.lz" + .align 2 gMenuPokeblock_Gfx:: @ 8D9B2B4 - .incbin "baserom.gba", 0xd9b2b4, 0x1bc + .incbin "graphics/interface/pokeblock_case_frame.4bpp.lz" + .align 2 gMenuPokeblock_Pal:: @ 8D9B470 - .incbin "baserom.gba", 0xd9b470, 0x70 + .incbin "graphics/interface/pokeblock_case_frame.gbapal.lz" + .align 2 gMenuPokeblockDevice_Gfx:: @ 8D9B4E0 - .incbin "baserom.gba", 0xd9b4e0, 0x2c0 + .incbin "graphics/interface/pokeblock_device.4bpp.lz" + .align 2 gMenuPokeblockDevice_Pal:: @ 8D9B7A0 - .incbin "baserom.gba", 0xd9b7a0, 0x28 + .incbin "graphics/interface/pokeblock_device.gbapal.lz" + .align 2 gMenuPokeblock_Tilemap:: @ 8D9B7C8 - .incbin "baserom.gba", 0xd9b7c8, 0x148 + .incbin "graphics/interface/pokeblock.bin.lz" .align 2 gPokeblock_Gfx:: @@ -3613,176 +3638,236 @@ gPokeblockWhite_Pal:: gPokeblockGold_Pal:: .incbin "graphics/pokeblock/gold.gbapal.lz" + .align 2 gUnknown_08D9BA44:: @ 8D9BA44 - .incbin "baserom.gba", 0xd9ba44, 0x100 + .incbin "graphics/interface/pokeblock_feeding_bg_map.bin.lz" + .align 2 gUnknown_08D9BB44:: @ 8D9BB44 - .incbin "baserom.gba", 0xd9bb44, 0x3ac + .incbin "graphics/interface/check_berry.4bpp.lz" + .align 2 gUnknown_08D9BEF0:: @ 8D9BEF0 - .incbin "baserom.gba", 0xd9bef0, 0xa8 + .incbin "graphics/interface/check_berry.gbapal.lz" + .align 2 gUnknown_08D9BF98:: @ 8D9BF98 - .incbin "baserom.gba", 0xd9bf98, 0x1a4 + .incbin "graphics/interface/berry_tag.bin.lz" + .align 2 gUnknown_08D9C13C:: @ 8D9C13C - .incbin "baserom.gba", 0xd9c13c, 0x26c + .incbin "graphics/interface/berry_tag_title.bin.lz" + + .align 2 +gBerryCheckCircle_Gfx:: @ 8D9C24C + .incbin "graphics/interface/check_berry_circle.4bpp.lz" @ 8D9C3A8 .include "data/graphics/berries/berry_graphics.inc" -gUnknown_08DA1E78:: @ 8DA1E78 - .incbin "baserom.gba", 0xda1e78, 0xBE4 + .align 2 +gRaySceneGroudon_Gfx:: @ 8DA1E78 + .incbin "graphics/rayquaza_scene/groudon.4bpp.lz" -gUnknown_08DA2A5C:: @ 8DA2A5C - .incbin "baserom.gba", 0xDA2A5C, 0xCC + .align 2 +gRaySceneGroudon2_Gfx:: @ 8DA2A5C + .incbin "graphics/rayquaza_scene/groudon_shoulder.4bpp.lz" -gUnknown_08DA2B28:: @ 8DA2B28 - .incbin "baserom.gba", 0xDA2B28, 0x1F4 + .align 2 +gRaySceneGroudon3_Gfx:: @ 8DA2B28 + .incbin "graphics/rayquaza_scene/groudon_claw.4bpp.lz" -gUnknown_08DA2D1C:: @ 8DA2D1C - .incbin "baserom.gba", 0xDA2D1C, 0x534 + .align 2 +gRaySceneKyogre_Gfx:: @ 8DA2D1C + .incbin "graphics/rayquaza_scene/kyogre.4bpp.lz" -gUnknown_08DA3250:: @ 8DA3250 - .incbin "baserom.gba", 0xDA3250, 0x54 + .align 2 +gRaySceneKyogre2_Gfx:: @ 8DA3250 + .incbin "graphics/rayquaza_scene/kyogre_shoulder.4bpp.lz" -gUnknown_08DA32A4:: @ 8DA32A4 - .incbin "baserom.gba", 0xDA32A4, 0xCC + .align 2 +gRaySceneKyogre3_Gfx:: @ 8DA32A4 + .incbin "graphics/rayquaza_scene/kyogre_fin.4bpp.lz" -gUnknown_08DA3370:: @ 8DA3370 - .incbin "baserom.gba", 0xDA3370, 0x28 + .align 2 +gRaySceneGroudon_Pal:: @ 8DA3370 + .incbin "graphics/rayquaza_scene/groudon.gbapal.lz" -gUnknown_08DA3398:: @ 8DA3398 - .incbin "baserom.gba", 0xDA3398, 0x28 + .align 2 +gRaySceneKyogre_Pal:: @ 8DA3398 + .incbin "graphics/rayquaza_scene/kyogre.gbapal.lz" -gUnknown_08DA33C0:: @ 8DA33C0 - .incbin "baserom.gba", 0xda33c0, 0x428 + .align 2 +gRaySceneClouds_Gfx:: @ 8DA33C0 + .incbin "graphics/rayquaza_scene/clouds.4bpp.lz" -gUnknown_08DA37E8:: @ 8DA37E8 - .incbin "baserom.gba", 0xda37e8, 0x3c + .align 2 +gRaySceneClouds_Pal:: @ 8DA37E8 + .incbin "graphics/rayquaza_scene/clouds.gbapal.lz" @ pal 1 clouds, pal 2 rain -gUnknown_08DA3824:: @ 8DA3824 - .incbin "baserom.gba", 0xda3824, 0x164 + .align 2 +gRaySceneClouds1_Tilemap:: @ 8DA3824 + .incbin "graphics/rayquaza_scene/clouds1.bin.lz" -gUnknown_08DA3988:: @ 8DA3988 - .incbin "baserom.gba", 0xda3988, 0x100 + .align 2 +gRaySceneClouds2_Tilemap:: @ 8DA3988 + .incbin "graphics/rayquaza_scene/clouds2.bin.lz" -gUnknown_08DA3A88:: @ 8DA3A88 - .incbin "baserom.gba", 0xda3a88, 0x138 + .align 2 +gRaySceneClouds3_Tilemap:: @ 8DA3A88 + .incbin "graphics/rayquaza_scene/clouds3.bin.lz" -gUnknown_08DA3BC0:: @ 8DA3BC0 - .incbin "baserom.gba", 0xDA3BC0, 0xBC + .align 2 +gRaySceneSmoke_Gfx:: @ 8DA3BC0 + .incbin "graphics/rayquaza_scene/smoke.4bpp.lz" -gUnknown_08DA3C7C:: @ 8DA3C7C - .incbin "baserom.gba", 0xDA3C7C, 0x18 + .align 2 +gRaySceneSmoke_Pal:: @ 8DA3C7C + .incbin "graphics/rayquaza_scene/smoke.gbapal.lz" -gUnknown_08DA3C94:: @ 8DA3C94 - .incbin "baserom.gba", 0xda3c94, 0x1114 + .align 2 +gRaySceneRayquaza_Gfx:: @ 8DA3C94 + .incbin "graphics/rayquaza_scene/rayquaza.8bpp.lz" -gUnknown_08DA4DA8:: @ 8DA4DA8 - .incbin "baserom.gba", 0xda4da8, 0x44 + .align 2 +gRaySceneRayquaza_Pal:: @ 8DA4DA8 + .incbin "graphics/rayquaza_scene/rayquaza.gbapal.lz" -gUnknown_08DA4DEC:: @ 8DA4DEC - .incbin "baserom.gba", 0xda4dec, 0x184 + .align 2 +gRaySceneRayquaza_Tilemap:: @ 8DA4DEC + .incbin "graphics/rayquaza_scene/rayquaza.bin.lz" -gUnknown_08DA4F70:: @ 8DA4F70 - .incbin "baserom.gba", 0xda4f70, 0x1148 + .align 2 +gRaySceneOvercast_Gfx:: @ 8DA4F70 + .incbin "graphics/rayquaza_scene/overcast.4bpp.lz" @ uses pal 2 of gRaySceneRayquaza_Pal -gUnknown_08DA60B8:: @ 8DA60B8 - .incbin "baserom.gba", 0xda60b8, 0x388 + .align 2 +gRaySceneOvercast_Tilemap:: @ 8DA60B8 + .incbin "graphics/rayquaza_scene/overcast.bin.lz" -gUnknown_08DA6440:: @ 8DA6440 - .incbin "baserom.gba", 0xDA6440, 0x46C + .align 2 +gRaySceneRayquazaFly1_Gfx:: @ 8DA6440 + .incbin "graphics/rayquaza_scene/rayquaza_fly1.4bpp.lz" -gUnknown_08DA68AC:: @ 8DA68AC - .incbin "baserom.gba", 0xDA68AC, 0x110 + .align 2 +gRaySceneRayquazaTail_Gfx:: @ 8DA68AC + .incbin "graphics/rayquaza_scene/rayquaza_tail_fix.4bpp.lz" @ for some reason there are an extra 0xC bytes at the end of the original 4bpp, so in order to produce the correct lz, we have to cat the bytes at the end with a make rule. not sure why those bytes are there, it may have been a bug in Game Freak's software. -gUnknown_08DA69BC:: @ 8DA69BC - .incbin "baserom.gba", 0xda69bc, 0xb6c + .align 2 +gRaySceneOvercast2_Gfx:: @ 8DA69BC + .incbin "graphics/rayquaza_scene/overcast2.4bpp.lz" -gUnknown_08DA7528:: @ 8DA7528 - .incbin "baserom.gba", 0xda7528, 0x21c + .align 2 +gRaySceneRayquazaLight_Gfx:: @ 8DA7528 + .incbin "graphics/rayquaza_scene/rayquaza_light.4bpp.lz" @ uses pal 2 of gRaySceneOvercast2_Pal -gUnknown_08DA7744:: @ 8DA7744 - .incbin "baserom.gba", 0xda7744, 0x40 + .align 2 +gRaySceneOvercast2_Pal:: @ 8DA7744 + .incbin "graphics/rayquaza_scene/overcast2.gbapal.lz" -gUnknown_08DA7784:: @ 8DA7784 - .incbin "baserom.gba", 0xda7784, 0x328 + .align 2 +gRaySceneOvercast2_Tilemap:: @ 8DA7784 + .incbin "graphics/rayquaza_scene/overcast2.bin.lz" -gUnknown_08DA7AAC:: @ 8DA7AAC - .incbin "baserom.gba", 0xda7aac, 0x184 + .align 2 +gRaySceneRayquazaLight_Tilemap:: @ 8DA7AAC + .incbin "graphics/rayquaza_scene/rayquaza_light.bin.lz" -gUnknown_08DA7C30:: @ 8DA7C30 - .incbin "baserom.gba", 0xda7c30, 0x13c + .align 2 +gRaySceneChaseBg_Gfx:: @ 8DA7C30 + .incbin "graphics/rayquaza_scene/chase_bg.4bpp.lz" -gUnknown_08DA7D6C:: @ 8DA7D6C - .incbin "baserom.gba", 0xda7d6c, 0x140 + .align 2 +gRaySceneChaseBg_Tilemap:: @ 8DA7D6C + .incbin "graphics/rayquaza_scene/chase_bg.bin.lz" -gUnknown_08DA7EAC:: @ 8DA7EAC - .incbin "baserom.gba", 0xda7eac, 0x108 + .align 2 +gRaySceneChaseStreaks_Gfx:: @ 8DA7EAC + .incbin "graphics/rayquaza_scene/chase_streaks.4bpp.lz" -gUnknown_08DA7FB4:: @ 8DA7FB4 - .incbin "baserom.gba", 0xda7fb4, 0x108 + .align 2 +gRaySceneChaseStreaks_Tilemap:: @ 8DA7FB4 + .incbin "graphics/rayquaza_scene/chase_streaks.bin.lz" -gUnknown_08DA80BC:: @ 8DA80BC - .incbin "baserom.gba", 0xda80bc, 0xa84 + .align 2 +gRaySceneRayquazaChase_Gfx:: @ 8DA80BC + .incbin "graphics/rayquaza_scene/rayquaza_chase.4bpp.lz" -gUnknown_08DA8B40:: @ 8DA8B40 - .incbin "baserom.gba", 0xda8b40, 0x22c + .align 2 +gRayChaseRayquazaChase_Tilemap:: @ 8DA8B40 + .incbin "graphics/rayquaza_scene/rayquaza_chase.bin.lz" -gUnknown_08DA8D6C:: @ 8DA8D6C - .incbin "baserom.gba", 0xda8d6c, 0x118 + .align 2 +gRayChaseRayquazaChase2_Tilemap:: @ 8DA8D6C + .incbin "graphics/rayquaza_scene/rayquaza_chase2.bin.lz" -gUnknown_08DA8E84:: @ 8DA8E84 - .incbin "baserom.gba", 0xda8e84, 0x54 + .align 2 +gRaySceneChase_Pal:: @ 8DA8E84 + .incbin "graphics/rayquaza_scene/chase.gbapal.lz" -gUnknown_08DA8ED8:: @ 8DA8ED8 - .incbin "baserom.gba", 0xDA8ED8, 0x798 + .align 2 +gRaySceneGroudonLeft_Gfx:: @ 8DA8ED8 + .incbin "graphics/rayquaza_scene/groudon_left.4bpp.lz" -gUnknown_08DA9670:: @ 8DA9670 - .incbin "baserom.gba", 0xDA9670, 0x44 + .align 2 +gRaySceneGroudonTail_Gfx:: @ 8DA9670 + .incbin "graphics/rayquaza_scene/groudon_tail.4bpp.lz" -gUnknown_08DA96B4:: @ 8DA96B4 - .incbin "baserom.gba", 0xDA96B4, 0x248 + .align 2 +gRaySceneKyogreRight_Gfx:: @ 8DA96B4 + .incbin "graphics/rayquaza_scene/kyogre_right.4bpp.lz" -gUnknown_08DA98FC:: @ 8DA98FC - .incbin "baserom.gba", 0xDA98FC, 0xCA8 + .align 2 +gRaySceneRayquazaHover_Gfx:: @ 8DA98FC + .incbin "graphics/rayquaza_scene/rayquaza_hover.4bpp.lz" -gUnknown_08DAA5A4:: @ 8DAA5A4 - .incbin "baserom.gba", 0xDAA5A4, 0x1F0 + .align 2 +gRaySceneRayquazaFlyIn_Gfx:: @ 8DAA5A4 + .incbin "graphics/rayquaza_scene/rayquaza_flyin.4bpp.lz" -gUnknown_08DAA794:: @ 8DAA794 - .incbin "baserom.gba", 0xDAA794, 0x98 + .align 2 +gRaySceneSplash_Gfx:: @ 8DAA794 + .incbin "graphics/rayquaza_scene/splash.4bpp.lz" -gUnknown_08DAA82C:: @ 8DAA82C - .incbin "baserom.gba", 0xDAA82C, 0x28 + .align 2 +gRaySceneGroudonLeft_Pal:: @ 8DAA82C + .incbin "graphics/rayquaza_scene/groudon_left.gbapal.lz" -gUnknown_08DAA854:: @ 8DAA854 - .incbin "baserom.gba", 0xDAA854, 0x28 + .align 2 +gRaySceneKyogreRight_Pal:: @ 8DAA854 + .incbin "graphics/rayquaza_scene/kyogre_right.gbapal.lz" -gUnknown_08DAA87C:: @ 8DAA87C - .incbin "baserom.gba", 0xDAA87C, 0x28 + .align 2 +gRaySceneRayquazaHover_Pal:: @ 8DAA87C + .incbin "graphics/rayquaza_scene/rayquaza_hover.gbapal.lz" -gUnknown_08DAA8A4:: @ 8DAA8A4 - .incbin "baserom.gba", 0xDAA8A4, 0x10 + .align 2 +gRaySceneSplash_Pal:: @ 8DAA8A4 + .incbin "graphics/rayquaza_scene/splash.gbapal.lz" -gUnknown_08DAA8B4:: @ 8DAA8B4 - .incbin "baserom.gba", 0xdaa8b4, 0x270 + .align 2 +gRaySceneHushBg_Gfx:: @ 8DAA8B4 + .incbin "graphics/rayquaza_scene/hush_bg.4bpp.lz" -gUnknown_08DAAB24:: @ 8DAAB24 - .incbin "baserom.gba", 0xdaab24, 0xf8 + .align 2 +gRaySceneHushRing_Gfx:: @ 8DAAB24 + .incbin "graphics/rayquaza_scene/hush_ring.8bpp.lz" -gUnknown_08DAAC1C:: @ 8DAAC1C - .incbin "baserom.gba", 0xdaac1c, 0x238 + .align 2 +gRaySceneHushBg_Tilemap:: @ 8DAAC1C + .incbin "graphics/rayquaza_scene/hush_bg.bin.lz" -gUnknown_08DAAE54:: @ 8DAAE54 - .incbin "baserom.gba", 0xdaae54, 0x144 + .align 2 +gRaySceneHushRing_Tilemap:: @ 8DAAE54 + .incbin "graphics/rayquaza_scene/hush_ring.bin.lz" -gUnknown_08DAAF98:: @ 8DAAF98 - .incbin "baserom.gba", 0xdaaf98, 0x54 + .align 2 +gRaySceneHushRing_Map:: @ 8DAAF98 + .incbin "graphics/rayquaza_scene/hush_ring_map.bin.lz" -gUnknown_08DAAFEC:: @ 8DAAFEC - .incbin "baserom.gba", 0xdaafec, 0x6c + .align 2 +gRaySceneHushBg_Pal:: @ 8DAAFEC + .incbin "graphics/rayquaza_scene/hush_bg.gbapal.lz" @ 8DAB058 .include "data/graphics/items/item_graphics.inc" diff --git a/graphics/interface/bag_pyramid.pal b/graphics/interface/bag_pyramid.pal new file mode 100755 index 000000000..200b001b5 --- /dev/null +++ b/graphics/interface/bag_pyramid.pal @@ -0,0 +1,35 @@ +JASC-PAL +0100 +32 +115 197 164 +255 197 106 +230 172 90 +205 148 74 +180 123 65 +164 98 49 +139 74 32 +115 49 24 +90 24 8 +74 0 0 +255 222 123 +164 131 255 +213 205 255 +98 98 115 +255 255 255 +0 0 0 +115 197 164 +255 197 106 +230 172 90 +205 148 74 +180 123 65 +164 98 49 +139 74 32 +115 49 24 +90 24 8 +74 0 0 +255 222 123 +255 49 0 +255 213 172 +98 98 115 +255 255 255 +0 0 0 diff --git a/graphics/interface/bag_pyramid.png b/graphics/interface/bag_pyramid.png new file mode 100755 index 000000000..42b709057 Binary files /dev/null and b/graphics/interface/bag_pyramid.png differ diff --git a/graphics/interface/bag_swap.png b/graphics/interface/bag_swap.png new file mode 100755 index 000000000..a9bed1e8a Binary files /dev/null and b/graphics/interface/bag_swap.png differ diff --git a/graphics/interface/berry_tag.bin b/graphics/interface/berry_tag.bin new file mode 100755 index 000000000..fc809d6a7 Binary files /dev/null and b/graphics/interface/berry_tag.bin differ diff --git a/graphics/interface/berry_tag_title.bin b/graphics/interface/berry_tag_title.bin new file mode 100755 index 000000000..560eb6cfa Binary files /dev/null and b/graphics/interface/berry_tag_title.bin differ diff --git a/graphics/interface/check_berry.pal b/graphics/interface/check_berry.pal new file mode 100755 index 000000000..f4f6cb4e3 --- /dev/null +++ b/graphics/interface/check_berry.pal @@ -0,0 +1,99 @@ +JASC-PAL +0100 +96 +0 0 0 +255 255 255 +238 246 238 +222 238 230 +213 230 213 +197 230 205 +189 222 189 +172 213 180 +164 213 172 +148 156 123 +115 106 90 +90 57 65 +222 49 8 +213 106 74 +205 164 139 +213 213 213 +0 0 0 +255 255 255 +213 246 205 +172 246 156 +139 246 106 +106 213 74 +74 180 41 +41 148 8 +246 230 8 +222 197 8 +205 164 8 +189 131 8 +172 98 8 +90 82 106 +172 98 8 +0 0 172 +0 0 0 +246 246 222 +230 213 222 +222 180 222 +205 148 222 +197 123 222 +180 90 222 +172 57 222 +156 24 222 +148 0 222 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +246 246 255 +230 238 246 +213 230 246 +197 222 238 +180 213 238 +164 205 230 +148 197 230 +131 189 230 +0 0 0 +0 0 0 +0 0 0 +246 230 8 +222 197 8 +205 164 8 +189 131 8 +0 0 0 +189 131 65 +197 131 98 +222 189 131 +123 82 24 +0 0 0 +0 0 0 +180 123 123 +238 222 172 +189 131 65 +65 32 0 +255 0 0 +106 180 213 +41 123 164 +123 148 49 +246 246 246 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +230 123 139 +164 49 115 +0 0 0 +0 0 0 diff --git a/graphics/interface/check_berry.png b/graphics/interface/check_berry.png new file mode 100755 index 000000000..56fc2966b Binary files /dev/null and b/graphics/interface/check_berry.png differ diff --git a/graphics/interface/check_berry_circle.png b/graphics/interface/check_berry_circle.png new file mode 100755 index 000000000..4d66237e5 Binary files /dev/null and b/graphics/interface/check_berry_circle.png differ diff --git a/graphics/interface/mart_frame.bin b/graphics/interface/mart_frame.bin new file mode 100755 index 000000000..63156b8d5 Binary files /dev/null and b/graphics/interface/mart_frame.bin differ diff --git a/graphics/interface/mart_frame.png b/graphics/interface/mart_frame.png new file mode 100755 index 000000000..ece93b7c7 Binary files /dev/null and b/graphics/interface/mart_frame.png differ diff --git a/graphics/interface/money.png b/graphics/interface/money.png new file mode 100755 index 000000000..d11fe06d1 Binary files /dev/null and b/graphics/interface/money.png differ diff --git a/graphics/interface/pokeblock.bin b/graphics/interface/pokeblock.bin new file mode 100755 index 000000000..1719bb5a6 Binary files /dev/null and b/graphics/interface/pokeblock.bin differ diff --git a/graphics/interface/pokeblock_case_frame.pal b/graphics/interface/pokeblock_case_frame.pal new file mode 100755 index 000000000..ef58ae778 --- /dev/null +++ b/graphics/interface/pokeblock_case_frame.pal @@ -0,0 +1,99 @@ +JASC-PAL +0100 +96 +0 0 0 +123 205 189 +238 246 255 +213 230 255 +255 0 0 +115 131 238 +90 90 98 +123 180 189 +131 131 164 +0 0 0 +0 0 0 +197 197 197 +205 65 24 +255 123 90 +255 180 148 +255 255 255 +0 0 0 +0 0 0 +0 0 0 +238 246 255 +0 0 0 +0 0 0 +90 90 98 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +197 197 197 +106 139 189 +148 213 255 +180 238 255 +255 255 255 +0 0 0 +0 0 0 +0 0 0 +255 238 238 +0 0 0 +0 0 0 +90 90 98 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +197 197 197 +205 90 172 +255 156 197 +255 197 213 +255 255 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +106 180 115 +148 246 98 +205 255 139 +255 255 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +180 180 49 +246 230 49 +255 255 148 +255 255 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +148 148 139 +222 222 222 +238 238 238 +255 255 255 diff --git a/graphics/interface/pokeblock_case_frame.png b/graphics/interface/pokeblock_case_frame.png new file mode 100755 index 000000000..ffc658821 Binary files /dev/null and b/graphics/interface/pokeblock_case_frame.png differ diff --git a/graphics/interface/pokeblock_device.png b/graphics/interface/pokeblock_device.png new file mode 100755 index 000000000..65b29a8b3 Binary files /dev/null and b/graphics/interface/pokeblock_device.png differ diff --git a/graphics/interface/pokeblock_feeding_bg_map.bin b/graphics/interface/pokeblock_feeding_bg_map.bin new file mode 100755 index 000000000..9feebf8bc Binary files /dev/null and b/graphics/interface/pokeblock_feeding_bg_map.bin differ diff --git a/graphics/rayquaza_scene/chase.pal b/graphics/rayquaza_scene/chase.pal new file mode 100755 index 000000000..960724b94 --- /dev/null +++ b/graphics/rayquaza_scene/chase.pal @@ -0,0 +1,67 @@ +JASC-PAL +0100 +64 +156 156 255 +57 82 57 +65 131 65 +74 148 123 +90 189 139 +148 222 180 +98 90 106 +172 41 57 +230 74 49 +246 98 98 +197 148 98 +222 213 238 +255 255 255 +222 205 0 +255 238 0 +24 24 24 +156 156 255 +0 106 222 +57 148 230 +123 180 238 +189 222 246 +230 255 255 +255 255 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 131 148 +255 255 246 +16 98 222 +115 255 230 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 131 148 +255 255 246 +255 205 0 +255 255 148 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/rayquaza_scene/chase_bg.bin b/graphics/rayquaza_scene/chase_bg.bin new file mode 100755 index 000000000..c2daff206 Binary files /dev/null and b/graphics/rayquaza_scene/chase_bg.bin differ diff --git a/graphics/rayquaza_scene/chase_bg.png b/graphics/rayquaza_scene/chase_bg.png new file mode 100755 index 000000000..896c0b046 Binary files /dev/null and b/graphics/rayquaza_scene/chase_bg.png differ diff --git a/graphics/rayquaza_scene/chase_streaks.bin b/graphics/rayquaza_scene/chase_streaks.bin new file mode 100755 index 000000000..cabc53fec Binary files /dev/null and b/graphics/rayquaza_scene/chase_streaks.bin differ diff --git a/graphics/rayquaza_scene/chase_streaks.png b/graphics/rayquaza_scene/chase_streaks.png new file mode 100755 index 000000000..a7e216259 Binary files /dev/null and b/graphics/rayquaza_scene/chase_streaks.png differ diff --git a/graphics/rayquaza_scene/clouds.pal b/graphics/rayquaza_scene/clouds.pal new file mode 100755 index 000000000..4b1a354ce --- /dev/null +++ b/graphics/rayquaza_scene/clouds.pal @@ -0,0 +1,35 @@ +JASC-PAL +0100 +32 +164 205 180 +82 82 90 +255 0 255 +205 115 0 +156 98 16 +98 82 32 +49 65 49 +0 49 65 +24 57 65 +49 65 74 +49 49 57 +74 74 82 +98 98 106 +115 115 131 +139 148 148 +0 0 0 +32 90 115 +131 131 131 +148 148 148 +172 172 172 +197 197 197 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/rayquaza_scene/clouds.png b/graphics/rayquaza_scene/clouds.png new file mode 100755 index 000000000..a253f47cc Binary files /dev/null and b/graphics/rayquaza_scene/clouds.png differ diff --git a/graphics/rayquaza_scene/clouds1.bin b/graphics/rayquaza_scene/clouds1.bin new file mode 100755 index 000000000..57a939ad8 Binary files /dev/null and b/graphics/rayquaza_scene/clouds1.bin differ diff --git a/graphics/rayquaza_scene/clouds2.bin b/graphics/rayquaza_scene/clouds2.bin new file mode 100755 index 000000000..073c45ac7 Binary files /dev/null and b/graphics/rayquaza_scene/clouds2.bin differ diff --git a/graphics/rayquaza_scene/clouds3.bin b/graphics/rayquaza_scene/clouds3.bin new file mode 100755 index 000000000..9b9eb4611 Binary files /dev/null and b/graphics/rayquaza_scene/clouds3.bin differ diff --git a/graphics/rayquaza_scene/groudon.png b/graphics/rayquaza_scene/groudon.png new file mode 100755 index 000000000..5ac84d51a Binary files /dev/null and b/graphics/rayquaza_scene/groudon.png differ diff --git a/graphics/rayquaza_scene/groudon_claw.png b/graphics/rayquaza_scene/groudon_claw.png new file mode 100755 index 000000000..c960a9779 Binary files /dev/null and b/graphics/rayquaza_scene/groudon_claw.png differ diff --git a/graphics/rayquaza_scene/groudon_left.png b/graphics/rayquaza_scene/groudon_left.png new file mode 100755 index 000000000..582336d46 Binary files /dev/null and b/graphics/rayquaza_scene/groudon_left.png differ diff --git a/graphics/rayquaza_scene/groudon_shoulder.png b/graphics/rayquaza_scene/groudon_shoulder.png new file mode 100755 index 000000000..c4c5f08b6 Binary files /dev/null and b/graphics/rayquaza_scene/groudon_shoulder.png differ diff --git a/graphics/rayquaza_scene/groudon_tail.png b/graphics/rayquaza_scene/groudon_tail.png new file mode 100755 index 000000000..38f6a41b2 Binary files /dev/null and b/graphics/rayquaza_scene/groudon_tail.png differ diff --git a/graphics/rayquaza_scene/hush_bg.bin b/graphics/rayquaza_scene/hush_bg.bin new file mode 100755 index 000000000..b9e86b907 Binary files /dev/null and b/graphics/rayquaza_scene/hush_bg.bin differ diff --git a/graphics/rayquaza_scene/hush_bg.pal b/graphics/rayquaza_scene/hush_bg.pal new file mode 100755 index 000000000..b0b0602dd --- /dev/null +++ b/graphics/rayquaza_scene/hush_bg.pal @@ -0,0 +1,51 @@ +JASC-PAL +0100 +48 +156 156 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 164 197 +8 172 180 +24 189 156 +41 197 131 +57 205 106 +82 230 90 +115 255 82 +164 255 139 +213 255 197 +255 255 255 +0 0 0 +156 156 255 +74 74 189 +82 82 197 +90 90 197 +98 98 205 +106 106 205 +115 115 213 +131 131 213 +139 139 222 +148 148 222 +156 156 230 +164 164 230 +172 172 238 +180 180 238 +197 197 246 +0 0 0 +156 156 255 +57 82 57 +65 131 65 +74 148 123 +90 189 139 +148 222 180 +98 90 106 +172 41 57 +230 74 49 +246 98 98 +197 148 98 +222 213 238 +255 255 255 +222 205 0 +255 238 0 +24 24 24 diff --git a/graphics/rayquaza_scene/hush_bg.png b/graphics/rayquaza_scene/hush_bg.png new file mode 100755 index 000000000..7ead765b9 Binary files /dev/null and b/graphics/rayquaza_scene/hush_bg.png differ diff --git a/graphics/rayquaza_scene/hush_ring.bin b/graphics/rayquaza_scene/hush_ring.bin new file mode 100755 index 000000000..22f5530ba Binary files /dev/null and b/graphics/rayquaza_scene/hush_ring.bin differ diff --git a/graphics/rayquaza_scene/hush_ring.png b/graphics/rayquaza_scene/hush_ring.png new file mode 100755 index 000000000..93d734e03 Binary files /dev/null and b/graphics/rayquaza_scene/hush_ring.png differ diff --git a/graphics/rayquaza_scene/hush_ring_map.bin b/graphics/rayquaza_scene/hush_ring_map.bin new file mode 100755 index 000000000..812fda11d Binary files /dev/null and b/graphics/rayquaza_scene/hush_ring_map.bin differ diff --git a/graphics/rayquaza_scene/kyogre.png b/graphics/rayquaza_scene/kyogre.png new file mode 100755 index 000000000..0f2e27e4e Binary files /dev/null and b/graphics/rayquaza_scene/kyogre.png differ diff --git a/graphics/rayquaza_scene/kyogre_fin.png b/graphics/rayquaza_scene/kyogre_fin.png new file mode 100755 index 000000000..9d4f62da9 Binary files /dev/null and b/graphics/rayquaza_scene/kyogre_fin.png differ diff --git a/graphics/rayquaza_scene/kyogre_right.png b/graphics/rayquaza_scene/kyogre_right.png new file mode 100755 index 000000000..d5e1749e9 Binary files /dev/null and b/graphics/rayquaza_scene/kyogre_right.png differ diff --git a/graphics/rayquaza_scene/kyogre_shoulder.png b/graphics/rayquaza_scene/kyogre_shoulder.png new file mode 100755 index 000000000..16b221f97 Binary files /dev/null and b/graphics/rayquaza_scene/kyogre_shoulder.png differ diff --git a/graphics/rayquaza_scene/overcast.bin b/graphics/rayquaza_scene/overcast.bin new file mode 100755 index 000000000..82b9e5067 Binary files /dev/null and b/graphics/rayquaza_scene/overcast.bin differ diff --git a/graphics/rayquaza_scene/overcast.png b/graphics/rayquaza_scene/overcast.png new file mode 100755 index 000000000..4ad9be8d2 Binary files /dev/null and b/graphics/rayquaza_scene/overcast.png differ diff --git a/graphics/rayquaza_scene/overcast2.bin b/graphics/rayquaza_scene/overcast2.bin new file mode 100755 index 000000000..0c2e5ec45 Binary files /dev/null and b/graphics/rayquaza_scene/overcast2.bin differ diff --git a/graphics/rayquaza_scene/overcast2.pal b/graphics/rayquaza_scene/overcast2.pal new file mode 100755 index 000000000..6987c2cc1 --- /dev/null +++ b/graphics/rayquaza_scene/overcast2.pal @@ -0,0 +1,35 @@ +JASC-PAL +0100 +32 +164 205 180 +255 255 255 +197 197 197 +106 164 197 +98 148 172 +82 123 148 +74 106 123 +49 82 90 +139 148 148 +49 65 74 +49 49 57 +74 74 82 +98 98 106 +115 115 131 +156 164 164 +0 0 0 +164 205 180 +255 255 255 +197 255 222 +139 255 180 +82 255 148 +24 246 106 +24 205 82 +32 164 57 +41 123 41 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/rayquaza_scene/overcast2.png b/graphics/rayquaza_scene/overcast2.png new file mode 100755 index 000000000..c9dea2002 Binary files /dev/null and b/graphics/rayquaza_scene/overcast2.png differ diff --git a/graphics/rayquaza_scene/rayquaza.bin b/graphics/rayquaza_scene/rayquaza.bin new file mode 100755 index 000000000..1a6d89234 Binary files /dev/null and b/graphics/rayquaza_scene/rayquaza.bin differ diff --git a/graphics/rayquaza_scene/rayquaza.png b/graphics/rayquaza_scene/rayquaza.png new file mode 100755 index 000000000..6198b945d Binary files /dev/null and b/graphics/rayquaza_scene/rayquaza.png differ diff --git a/graphics/rayquaza_scene/rayquaza_chase.bin b/graphics/rayquaza_scene/rayquaza_chase.bin new file mode 100755 index 000000000..51307a4c1 Binary files /dev/null and b/graphics/rayquaza_scene/rayquaza_chase.bin differ diff --git a/graphics/rayquaza_scene/rayquaza_chase.png b/graphics/rayquaza_scene/rayquaza_chase.png new file mode 100755 index 000000000..154a105a8 Binary files /dev/null and b/graphics/rayquaza_scene/rayquaza_chase.png differ diff --git a/graphics/rayquaza_scene/rayquaza_chase2.bin b/graphics/rayquaza_scene/rayquaza_chase2.bin new file mode 100755 index 000000000..37416ac1b Binary files /dev/null and b/graphics/rayquaza_scene/rayquaza_chase2.bin differ diff --git a/graphics/rayquaza_scene/rayquaza_fly1.png b/graphics/rayquaza_scene/rayquaza_fly1.png new file mode 100755 index 000000000..40dd0a6e3 Binary files /dev/null and b/graphics/rayquaza_scene/rayquaza_fly1.png differ diff --git a/graphics/rayquaza_scene/rayquaza_flyin.png b/graphics/rayquaza_scene/rayquaza_flyin.png new file mode 100755 index 000000000..f1b44c104 Binary files /dev/null and b/graphics/rayquaza_scene/rayquaza_flyin.png differ diff --git a/graphics/rayquaza_scene/rayquaza_hover.png b/graphics/rayquaza_scene/rayquaza_hover.png new file mode 100755 index 000000000..269d7dd2d Binary files /dev/null and b/graphics/rayquaza_scene/rayquaza_hover.png differ diff --git a/graphics/rayquaza_scene/rayquaza_light.bin b/graphics/rayquaza_scene/rayquaza_light.bin new file mode 100755 index 000000000..97808b8b9 Binary files /dev/null and b/graphics/rayquaza_scene/rayquaza_light.bin differ diff --git a/graphics/rayquaza_scene/rayquaza_light.png b/graphics/rayquaza_scene/rayquaza_light.png new file mode 100755 index 000000000..4640149f3 Binary files /dev/null and b/graphics/rayquaza_scene/rayquaza_light.png differ diff --git a/graphics/rayquaza_scene/rayquaza_tail.png b/graphics/rayquaza_scene/rayquaza_tail.png new file mode 100755 index 000000000..7e0577df1 Binary files /dev/null and b/graphics/rayquaza_scene/rayquaza_tail.png differ diff --git a/graphics/rayquaza_scene/smoke.png b/graphics/rayquaza_scene/smoke.png new file mode 100755 index 000000000..4aaa6ae75 Binary files /dev/null and b/graphics/rayquaza_scene/smoke.png differ diff --git a/graphics/rayquaza_scene/splash.png b/graphics/rayquaza_scene/splash.png new file mode 100755 index 000000000..406af9da3 Binary files /dev/null and b/graphics/rayquaza_scene/splash.png differ diff --git a/graphics/unknown/unknown_D9A88C.bin b/graphics/unknown/unknown_D9A88C.bin new file mode 100755 index 000000000..c2ceaf139 Binary files /dev/null and b/graphics/unknown/unknown_D9A88C.bin differ diff --git a/graphics/unknown/unknown_D9AE04.bin b/graphics/unknown/unknown_D9AE04.bin new file mode 100755 index 000000000..28ad3f927 Binary files /dev/null and b/graphics/unknown/unknown_D9AE04.bin differ diff --git a/graphics/unknown/unknown_D9AF44.pal b/graphics/unknown/unknown_D9AF44.pal new file mode 100755 index 000000000..dcfdcf2ef --- /dev/null +++ b/graphics/unknown/unknown_D9AF44.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 255 205 +255 230 139 +255 32 32 +106 213 180 +41 164 123 +189 156 90 +0 0 0 diff --git a/graphics_file_rules.mk b/graphics_file_rules.mk index 86f2436a9..fb0664c00 100644 --- a/graphics_file_rules.mk +++ b/graphics_file_rules.mk @@ -12,6 +12,7 @@ btintgfxdir := graphics/battle_interface masksgfxdir := graphics/battle_anims/masks bttransgfxdir := graphics/battle_transitions typesdir := graphics/types +raydir := graphics/rayquaza_scene types := normal fight flying poison ground rock bug ghost steel mystery fire water grass electric psychic ice dragon dark contest_types := cool beauty cute smart tough @@ -372,3 +373,22 @@ $(typesdir)/move_types.gbapal: $(typesdir)/move_types_1.gbapal $(typesdir)/move_ $(menudir)/bag_screen.4bpp: $(menudir)/bag_screen.png $(GFX) $< $@ -num_tiles 53 + +$(raydir)/rayquaza.8bpp: $(raydir)/rayquaza.png + $(GFX) $< $@ -num_tiles 227 + +$(raydir)/overcast.4bpp: $(raydir)/overcast.png + $(GFX) $< $@ -num_tiles 313 + +$(raydir)/rayquaza_fly1.4bpp: $(raydir)/rayquaza_fly1.png + $(GFX) $< $@ -num_tiles 124 + +$(raydir)/rayquaza_tail_fix.4bpp: $(raydir)/rayquaza_tail.4bpp + cp $< $@ + head -c 12 /dev/zero >> $@ + +$(raydir)/chase_streaks.4bpp: $(raydir)/chase_streaks.png + $(GFX) $< $@ -num_tiles 19 + +$(raydir)/rayquaza_chase.4bpp: $(raydir)/rayquaza_chase.png + $(GFX) $< $@ -num_tiles 155 diff --git a/include/graphics.h b/include/graphics.h index 8f58a5f7e..a12fb7ab8 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -2651,28 +2651,28 @@ extern const u8 gUnknown_08DC234C[]; extern const u8 gUnknown_08DC16F4[]; // rayquaza scene gfx -extern const u8 gUnknown_08DA1E78[]; -extern const u8 gUnknown_08DA2A5C[]; -extern const u8 gUnknown_08DA2B28[]; -extern const u8 gUnknown_08DA2D1C[]; -extern const u8 gUnknown_08DA3250[]; -extern const u8 gUnknown_08DA32A4[]; -extern const u8 gUnknown_08DA3370[]; -extern const u8 gUnknown_08DA3398[]; -extern const u8 gUnknown_08DA3BC0[]; -extern const u8 gUnknown_08DA3C7C[]; -extern const u8 gUnknown_08DA4DA8[]; -extern const u8 gUnknown_08DA6440[]; -extern const u8 gUnknown_08DA68AC[]; -extern const u8 gUnknown_08DA8ED8[]; -extern const u8 gUnknown_08DA9670[]; -extern const u8 gUnknown_08DA96B4[]; -extern const u8 gUnknown_08DA98FC[]; -extern const u8 gUnknown_08DAA5A4[]; -extern const u8 gUnknown_08DAA794[]; -extern const u8 gUnknown_08DAA82C[]; -extern const u8 gUnknown_08DAA854[]; -extern const u8 gUnknown_08DAA87C[]; -extern const u8 gUnknown_08DAA8A4[]; +extern const u8 gRaySceneGroudon_Gfx[]; +extern const u8 gRaySceneGroudon2_Gfx[]; +extern const u8 gRaySceneGroudon3_Gfx[]; +extern const u8 gRaySceneKyogre_Gfx[]; +extern const u8 gRaySceneKyogre2_Gfx[]; +extern const u8 gRaySceneKyogre3_Gfx[]; +extern const u8 gRaySceneGroudon_Pal[]; +extern const u8 gRaySceneKyogre_Pal[]; +extern const u8 gRaySceneSmoke_Gfx[]; +extern const u8 gRaySceneSmoke_Pal[]; +extern const u8 gRaySceneRayquaza_Pal[]; +extern const u8 gRaySceneRayquazaFly1_Gfx[]; +extern const u8 gRaySceneRayquazaTail_Gfx[]; +extern const u8 gRaySceneGroudonLeft_Gfx[]; +extern const u8 gRaySceneGroudonTail_Gfx[]; +extern const u8 gRaySceneKyogreRight_Gfx[]; +extern const u8 gRaySceneRayquazaHover_Gfx[]; +extern const u8 gRaySceneRayquazaFlyIn_Gfx[]; +extern const u8 gRaySceneSplash_Gfx[]; +extern const u8 gRaySceneGroudonLeft_Pal[]; +extern const u8 gRaySceneKyogreRight_Pal[]; +extern const u8 gRaySceneRayquazaHover_Pal[]; +extern const u8 gRaySceneSplash_Pal[]; #endif //GUARD_GRAPHICS_H diff --git a/src/rayquaza_scene.c b/src/rayquaza_scene.c index 577294f0c..ce8747395 100644 --- a/src/rayquaza_scene.c +++ b/src/rayquaza_scene.c @@ -431,12 +431,12 @@ static const union AnimCmd *const sSpriteAnimTable_862A8BC[] = const struct CompressedSpriteSheet gUnknown_0862A8C4 = { - gUnknown_08DA1E78, 0x3000, 30505 + gRaySceneGroudon_Gfx, 0x3000, 30505 }; const struct CompressedSpritePalette gUnknown_0862A8CC = { - gUnknown_08DA3370, 30505 + gRaySceneGroudon_Pal, 30505 }; const struct SpriteTemplate gUnknown_0862A8D4 = @@ -463,7 +463,7 @@ static const union AnimCmd *const sSpriteAnimTable_862A8F4[] = const struct CompressedSpriteSheet gUnknown_0862A8F8 = { - gUnknown_08DA2A5C, 0x200, 30506 + gRaySceneGroudon2_Gfx, 0x200, 30506 }; const struct SpriteTemplate gUnknown_0862A900 = @@ -490,7 +490,7 @@ static const union AnimCmd *const sSpriteAnimTable_862A920[] = const struct CompressedSpriteSheet gUnknown_0862A924 = { - gUnknown_08DA2B28, 0x400, 30507 + gRaySceneGroudon3_Gfx, 0x400, 30507 }; const struct SpriteTemplate gUnknown_0862A92C = @@ -582,12 +582,12 @@ static const union AnimCmd *const sSpriteAnimTable_862A9B0[] = const struct CompressedSpriteSheet gUnknown_0862A9D4 = { - gUnknown_08DA2D1C, 0xF00, 30508 + gRaySceneKyogre_Gfx, 0xF00, 30508 }; const struct CompressedSpritePalette gUnknown_0862A9DC = { - gUnknown_08DA3398, 30508 + gRaySceneKyogre_Pal, 30508 }; const struct SpriteTemplate gUnknown_0862A9E4 = @@ -617,7 +617,7 @@ static const union AnimCmd *const sSpriteAnimTable_862AA10[] = const struct CompressedSpriteSheet gUnknown_0862AA14 = { - gUnknown_08DA3250, 0xC0, 30509 + gRaySceneKyogre2_Gfx, 0xC0, 30509 }; const struct SpriteTemplate gUnknown_0862AA1C = @@ -633,7 +633,7 @@ const struct SpriteTemplate gUnknown_0862AA1C = const struct CompressedSpriteSheet gUnknown_0862AA34 = { - gUnknown_08DA32A4, 0x200, 30510 + gRaySceneKyogre3_Gfx, 0x200, 30510 }; const struct SpriteTemplate gUnknown_0862AA3C = @@ -704,12 +704,12 @@ static const union AffineAnimCmd *const sSpriteAffineAnimTable_862AA8C[] = const struct CompressedSpriteSheet gUnknown_0862AA90 = { - gUnknown_08DA3BC0, 0x100, 30555 + gRaySceneSmoke_Gfx, 0x100, 30555 }; const struct CompressedSpritePalette gUnknown_0862AA98 = { - gUnknown_08DA3C7C, 30555 + gRaySceneSmoke_Pal, 30555 }; const struct SpriteTemplate gUnknown_0862AAA0 = @@ -803,17 +803,17 @@ static const union AnimCmd *const sSpriteAnimTable_862AAF8[] = const struct CompressedSpriteSheet gUnknown_0862AAFC = { - gUnknown_08DA6440, 0x1000, 30556 + gRaySceneRayquazaFly1_Gfx, 0x1000, 30556 }; const struct CompressedSpriteSheet gUnknown_0862AB04 = { - gUnknown_08DA68AC, 0x200, 30557 + gRaySceneRayquazaTail_Gfx, 0x200, 30557 }; const struct CompressedSpritePalette gUnknown_0862AB0C = { - gUnknown_08DA4DA8, 30556 + gRaySceneRayquaza_Pal, 30556 }; const struct SpriteTemplate gUnknown_0862AB14 = @@ -1017,52 +1017,52 @@ static const union AnimCmd *const sSpriteAnimTable_862AC24[] = const struct CompressedSpriteSheet gUnknown_0862AC28 = { - gUnknown_08DA8ED8, 0x1800, 30565 + gRaySceneGroudonLeft_Gfx, 0x1800, 30565 }; const struct CompressedSpriteSheet gUnknown_0862AC30 = { - gUnknown_08DA9670, 0x80, 30566 + gRaySceneGroudonTail_Gfx, 0x80, 30566 }; const struct CompressedSpriteSheet gUnknown_0862AC38 = { - gUnknown_08DA96B4, 0x600, 30568 + gRaySceneKyogreRight_Gfx, 0x600, 30568 }; const struct CompressedSpriteSheet gUnknown_0862AC40 = { - gUnknown_08DA98FC, 0x2000, 30569 + gRaySceneRayquazaHover_Gfx, 0x2000, 30569 }; const struct CompressedSpriteSheet gUnknown_0862AC48 = { - gUnknown_08DAA5A4, 0x800, 30570 + gRaySceneRayquazaFlyIn_Gfx, 0x800, 30570 }; const struct CompressedSpriteSheet gUnknown_0862AC50 = { - gUnknown_08DAA794, 0x300, 30571 + gRaySceneSplash_Gfx, 0x300, 30571 }; const struct CompressedSpritePalette gUnknown_0862AC58 = { - gUnknown_08DAA82C, 30565 + gRaySceneGroudonLeft_Pal, 30565 }; const struct CompressedSpritePalette gUnknown_0862AC60 = { - gUnknown_08DAA854, 30568 + gRaySceneKyogreRight_Pal, 30568 }; const struct CompressedSpritePalette gUnknown_0862AC68 = { - gUnknown_08DAA87C, 30569 + gRaySceneRayquazaHover_Pal, 30569 }; const struct CompressedSpritePalette gUnknown_0862AC70 = { - gUnknown_08DAA8A4, 30571 + gRaySceneSplash_Pal, 30571 }; const struct SpriteTemplate gUnknown_0862AC78 =