From b7d0ec99213873d557c37d32ec1052a8f1634637 Mon Sep 17 00:00:00 2001 From: mrshigure Date: Wed, 5 Oct 2022 16:26:03 -0700 Subject: [PATCH] [Effects] Gfx data + stars_burst (#803) * [Effects] Gfx data + stars_burst * Addressed PR comments --- include/effects.h | 16 +- include/effects_internal.h | 2 +- src/effects.c | 60 +- src/effects/aura.c | 32 +- src/effects/damage_stars.c | 8 +- src/effects/drop_leaves.c | 8 +- src/effects/dust.c | 16 +- src/effects/effect_3D.c | 8 +- src/effects/effect_46.c | 8 +- src/effects/effect_75.c | 10 +- src/effects/emote.c | 28 +- src/effects/ending_decals.c | 4 +- src/effects/energy_in_out.c | 10 +- src/effects/energy_orb_wave.c | 20 +- src/effects/energy_shockwave.c | 8 +- src/effects/explosion.c | 12 +- src/effects/falling_leaves.c | 8 +- src/effects/fire_flower.c | 24 +- src/effects/flashing_box_shockwave.c | 16 +- src/effects/floating_cloud_puff.c | 8 +- src/effects/gather_magic.c | 4 +- src/effects/gfx/aura.c | 27 + src/effects/gfx/balloon.c | 12 +- src/effects/gfx/damage_stars.c | 11 + src/effects/gfx/drop_leaves.c | 10 + src/effects/gfx/dust.c | 12 + src/effects/gfx/effect_3D.c | 6 + src/effects/gfx/effect_46.c | 6 + src/effects/gfx/effect_75.c | 22 + src/effects/gfx/emote.c | 23 + src/effects/gfx/ending_decals.c | 21 + src/effects/gfx/energy_in_out.c | 43 + src/effects/gfx/energy_orb_wave.c | 12 + src/effects/gfx/energy_shockwave.c | 8 + src/effects/gfx/explosion.c | 13 + src/effects/gfx/falling_leaves.c | 6 + src/effects/gfx/fire_flower.c | 28 + src/effects/gfx/flashing_box_shockwave.c | 19 + src/effects/gfx/floating_cloud_puff.c | 4 + src/effects/gfx/gather_magic.c | 9 + src/effects/gfx/got_item_outline.c | 16 + src/effects/gfx/green_impact.c | 7 + src/effects/gfx/landing_dust.c | 41 + src/effects/gfx/lil_oink.c | 127 +++ src/effects/gfx/music_note.c | 26 + src/effects/gfx/peach_star_beam.c | 36 +- src/effects/gfx/recover.c | 49 ++ src/effects/gfx/throw_spiny.c | 8 +- src/effects/got_item_outline.c | 12 +- src/effects/green_impact.c | 4 +- src/effects/landing_dust.c | 18 +- src/effects/lil_oink.c | 54 +- src/effects/music_note.c | 17 +- src/effects/recover.c | 29 +- src/effects/stars_burst.c | 136 ++- src/effects/walking_dust.c | 20 +- .../stars_burst/stars_burst_appendGfx.s | 248 ------ .../effects/stars_burst/stars_burst_main.s | 147 ---- .../effects/stars_burst/stars_burst_update.s | 99 --- ver/us/splat.yaml | 771 +++++++++++++++++- ver/us/undefined_syms.txt | 156 ---- 61 files changed, 1675 insertions(+), 948 deletions(-) create mode 100644 src/effects/gfx/aura.c create mode 100644 src/effects/gfx/damage_stars.c create mode 100644 src/effects/gfx/drop_leaves.c create mode 100644 src/effects/gfx/dust.c create mode 100644 src/effects/gfx/effect_3D.c create mode 100644 src/effects/gfx/effect_46.c create mode 100644 src/effects/gfx/effect_75.c create mode 100644 src/effects/gfx/emote.c create mode 100644 src/effects/gfx/ending_decals.c create mode 100644 src/effects/gfx/energy_in_out.c create mode 100644 src/effects/gfx/energy_orb_wave.c create mode 100644 src/effects/gfx/energy_shockwave.c create mode 100644 src/effects/gfx/explosion.c create mode 100644 src/effects/gfx/falling_leaves.c create mode 100644 src/effects/gfx/fire_flower.c create mode 100644 src/effects/gfx/flashing_box_shockwave.c create mode 100644 src/effects/gfx/floating_cloud_puff.c create mode 100644 src/effects/gfx/gather_magic.c create mode 100644 src/effects/gfx/got_item_outline.c create mode 100644 src/effects/gfx/green_impact.c create mode 100644 src/effects/gfx/landing_dust.c create mode 100644 src/effects/gfx/lil_oink.c create mode 100644 src/effects/gfx/music_note.c create mode 100644 src/effects/gfx/recover.c delete mode 100644 ver/us/asm/nonmatchings/effects/stars_burst/stars_burst_appendGfx.s delete mode 100644 ver/us/asm/nonmatchings/effects/stars_burst/stars_burst_main.s delete mode 100644 ver/us/asm/nonmatchings/effects/stars_burst/stars_burst_update.s diff --git a/include/effects.h b/include/effects.h index f6c840e8bc..dabbabb8d1 100644 --- a/include/effects.h +++ b/include/effects.h @@ -565,8 +565,20 @@ typedef struct FlameFXData { } FlameFXData; // size = 0x34 typedef struct StarsBurstFXData { - /* 0x00 */ char todo[0]; -} StarsBurstFXData; // size = unknown + /* 0x00 */ s32 unk_00; + /* 0x04 */ f32 unk_04; + /* 0x08 */ f32 unk_08; + /* 0x0C */ f32 unk_0C; + /* 0x10 */ f32 unk_10; + /* 0x14 */ f32 unk_14; + /* 0x18 */ f32 unk_18; + /* 0x1C */ char unk_1C[8]; + /* 0x24 */ f32 unk_24; + /* 0x28 */ f32 unk_28; + /* 0x2C */ s32 unk_2C; + /* 0x30 */ s32 unk_30; + /* 0x34 */ s32 unk_34; +} StarsBurstFXData; // size = 0x38 typedef struct StarsShimmerFXData { /* 0x00 */ char todo[0]; diff --git a/include/effects_internal.h b/include/effects_internal.h index e9dd3fdee2..29a5bc2121 100644 --- a/include/effects_internal.h +++ b/include/effects_internal.h @@ -65,7 +65,7 @@ FX_MAIN(smoke_impact_main); void damage_indicator_main(s32, f32, f32, f32, f32, f32, s32, EffectInstance**); FX_MAIN(purple_ring_main); FX_MAIN(flame_main); -FX_MAIN(stars_burst_main); +void stars_burst_main(s32, f32, f32, f32, f32, f32, s32); FX_MAIN(stars_shimmer_main); FX_MAIN(rising_bubble_main); FX_MAIN(ring_blast_main); diff --git a/src/effects.c b/src/effects.c index 7a148d97ca..efcda0a3dc 100644 --- a/src/effects.c +++ b/src/effects.c @@ -33,8 +33,8 @@ EffectTableEntry gEffectTable[] = { /* 0x03 */ {}, /* 0x04 */ {}, /* 0x05 */ {}, - /* 0x06 */ FX_ENTRY(landing_dust, _328EA0), - /* 0x07 */ FX_ENTRY(walking_dust, _328EA0), + /* 0x06 */ FX_ENTRY(landing_dust, effect_gfx_landing_dust), + /* 0x07 */ FX_ENTRY(walking_dust, effect_gfx_landing_dust), /* 0x08 */ FX_ENTRY(flower_splash, effect_gfx_flower_splash_trail), /* 0x09 */ FX_ENTRY(flower_trail, effect_gfx_flower_splash_trail), /* 0x0A */ FX_ENTRY(cloud_puff, effect_gfx_cloud_puff_trail), @@ -43,65 +43,65 @@ EffectTableEntry gEffectTable[] = { /* 0x0D */ FX_ENTRY(floating_flower, effect_gfx_floating_flower), /* 0x0E */ FX_ENTRY(snowflake, effect_gfx_snowflake), /* 0x0F */ FX_ENTRY(star, _3326A0), - /* 0x10 */ FX_ENTRY(emote, _334C70), + /* 0x10 */ FX_ENTRY(emote, effect_gfx_emote), /* 0x11 */ FX_ENTRY(sparkles, _337FC0), /* 0x12 */ FX_ENTRY(shape_spell, _339F60), /* 0x13 */ FX_ENTRY(gather_energy_pink, _33BBD0), - /* 0x14 */ FX_ENTRY(drop_leaves, _33D610), - /* 0x15 */ FX_ENTRY(dust, _33F000), + /* 0x14 */ FX_ENTRY(drop_leaves, effect_gfx_drop_leaves), + /* 0x15 */ FX_ENTRY(dust, effect_gfx_dust), /* 0x16 */ FX_ENTRY(shattering_stones, _340880), - /* 0x17 */ FX_ENTRY(smoke_ring, _328EA0), - /* 0x18 */ FX_ENTRY(damage_stars, _343040), - /* 0x19 */ FX_ENTRY(explosion, _343F70), + /* 0x17 */ FX_ENTRY(smoke_ring, effect_gfx_landing_dust), + /* 0x18 */ FX_ENTRY(damage_stars, effect_gfx_damage_stars), + /* 0x19 */ FX_ENTRY(explosion, effect_gfx_explosion), /* 0x1A */ FX_ENTRY(lens_flare, _3451E0), - /* 0x1B */ FX_ENTRY(got_item_outline, _345B40), + /* 0x1B */ FX_ENTRY(got_item_outline, effect_gfx_got_item_outline), /* 0x1C */ FX_ENTRY(spiky_white_aura, _34E770), - /* 0x1D */ FX_ENTRY(smoke_impact, _328EA0), + /* 0x1D */ FX_ENTRY(smoke_impact, effect_gfx_landing_dust), /* 0x1E */ FX_ENTRY(damage_indicator, effect_gfx_damage_indicator), /* 0x1F */ FX_ENTRY(purple_ring, _352CE0), /* 0x20 */ FX_ENTRY(flame, _353BB0), - /* 0x21 */ FX_ENTRY(stars_burst, _343040), + /* 0x21 */ FX_ENTRY(stars_burst, effect_gfx_damage_stars), /* 0x22 */ FX_ENTRY(stars_shimmer, _337FC0), /* 0x23 */ FX_ENTRY(rising_bubble, _356530), /* 0x24 */ FX_ENTRY(ring_blast, _3573A0), /* 0x25 */ FX_ENTRY(shockwave, _3593B0), - /* 0x26 */ FX_ENTRY(music_note, _35A5E0), - /* 0x27 */ FX_ENTRY(smoke_burst, _328EA0), + /* 0x26 */ FX_ENTRY(music_note, effect_gfx_music_note), + /* 0x27 */ FX_ENTRY(smoke_burst, effect_gfx_landing_dust), /* 0x28 */ FX_ENTRY(sweat, _35C550), /* 0x29 */ FX_ENTRY(sleep_bubble, effect_gfx_sleep_bubble), /* 0x2A */ {}, - /* 0x2B */ FX_ENTRY(windy_leaves, _33D610), - /* 0x2C */ FX_ENTRY(falling_leaves, _35F0E0), + /* 0x2B */ FX_ENTRY(windy_leaves, effect_gfx_drop_leaves), + /* 0x2C */ FX_ENTRY(falling_leaves, effect_gfx_falling_leaves), /* 0x2D */ FX_ENTRY(stars_spread, _360A30), /* 0x2E */ FX_ENTRY(steam_burst, _361670), /* 0x2F */ FX_ENTRY(stars_orbiting, _362C50), /* 0x30 */ FX_ENTRY(big_snowflakes, effect_gfx_big_snowflakes), /* 0x31 */ FX_ENTRY(debuff, effect_gfx_debuff), - /* 0x32 */ FX_ENTRY(green_impact, _3659B0), + /* 0x32 */ FX_ENTRY(green_impact, effect_gfx_green_impact), /* 0x33 */ FX_ENTRY(radial_shimmer, _366D60), - /* 0x34 */ FX_ENTRY(ending_decals, _36AEE0), + /* 0x34 */ FX_ENTRY(ending_decals, effect_gfx_ending_decals), /* 0x35 */ FX_ENTRY(light_rays, _36DF90), /* 0x36 */ FX_ENTRY(lightning, _36ED60), /* 0x37 */ FX_ENTRY(fire_breath, effect_gfx_fire_breath), /* 0x38 */ FX_ENTRY(shimmer_burst, _337FC0), - /* 0x39 */ FX_ENTRY(energy_shockwave, _375510), + /* 0x39 */ FX_ENTRY(energy_shockwave, effect_gfx_energy_shockwave), /* 0x3A */ FX_ENTRY(shimmer_wave, _337FC0), - /* 0x3B */ FX_ENTRY(aura, _377F80), + /* 0x3B */ FX_ENTRY(aura, effect_gfx_aura), /* 0x3C */ FX_ENTRY(bulb_glow, _37ADD0), - /* 0x3D */ FX_ENTRY_NUMBERED(3D, _37D180), + /* 0x3D */ FX_ENTRY_NUMBERED(3D, effect_gfx_effect_3D), /* 0x3E */ FX_ENTRY(blast, _37D9D0), - /* 0x3F */ FX_ENTRY(fire_flower, _3803A0), - /* 0x40 */ FX_ENTRY(recover, _381E00), + /* 0x3F */ FX_ENTRY(fire_flower, effect_gfx_fire_flower), + /* 0x40 */ FX_ENTRY(recover, effect_gfx_recover), /* 0x41 */ FX_ENTRY(disable_x, effect_gfx_disable_x), /* 0x42 */ FX_ENTRY(bombette_breaking, _37D9D0), /* 0x43 */ FX_ENTRY(firework, _38A350), /* 0x44 */ FX_ENTRY(confetti, _38BBA0), /* 0x45 */ FX_ENTRY(snowfall, _38D070), - /* 0x46 */ FX_ENTRY_NUMBERED(46, _38E990), - /* 0x47 */ FX_ENTRY(gather_magic, _38F710), + /* 0x46 */ FX_ENTRY_NUMBERED(46, effect_gfx_effect_46), + /* 0x47 */ FX_ENTRY(gather_magic, effect_gfx_gather_magic), /* 0x48 */ FX_ENTRY(attack_result_text, _3903D0), /* 0x49 */ FX_ENTRY(small_gold_sparkle, effect_gfx_small_gold_sparkle), - /* 0x4A */ FX_ENTRY(flashing_box_shockwave, _3930A0), + /* 0x4A */ FX_ENTRY(flashing_box_shockwave, effect_gfx_flashing_box_shockwave), /* 0x4B */ FX_ENTRY(balloon, effect_gfx_balloon), /* 0x4C */ FX_ENTRY(floating_rock, _3960F0), /* 0x4D */ FX_ENTRY(chomp_drop, _397040), @@ -109,7 +109,7 @@ EffectTableEntry gEffectTable[] = { /* 0x4F */ FX_ENTRY(radiating_energy_orb, _3A0D60), /* 0x50 */ FX_ENTRY(quizmo_answer, _3A2440), /* 0x51 */ FX_ENTRY(motion_blur_flame, _3A33D0), - /* 0x52 */ FX_ENTRY(energy_orb_wave, _3A4320), + /* 0x52 */ FX_ENTRY(energy_orb_wave, effect_gfx_energy_orb_wave), /* 0x53 */ FX_ENTRY(merlin_house_stars, _3A5BE0), /* 0x54 */ FX_ENTRY(quizmo_audience, _3A77A0), /* 0x55 */ FX_ENTRY(butterflies, effect_gfx_butterflies), @@ -132,9 +132,9 @@ EffectTableEntry gEffectTable[] = { /* 0x66 */ FX_ENTRY(tubba_heart_attack, _3D2580), /* 0x67 */ FX_ENTRY(whirlwind, _3D3930), /* 0x68 */ FX_ENTRY(red_impact, _3593B0), - /* 0x69 */ FX_ENTRY(floating_cloud_puff, _3D4E90), + /* 0x69 */ FX_ENTRY(floating_cloud_puff, effect_gfx_floating_cloud_puff), /* 0x6A */ {}, - /* 0x6B */ FX_ENTRY(energy_in_out, _3D5F30), + /* 0x6B */ FX_ENTRY(energy_in_out, effect_gfx_energy_in_out), /* 0x6C */ FX_ENTRY(tattle_window, _3D7040), /* 0x6D */ FX_ENTRY(shiny_flare, _3D7770), /* 0x6E */ FX_ENTRY(huff_puff_breath, _3D80C0), @@ -144,14 +144,14 @@ EffectTableEntry gEffectTable[] = { /* 0x72 */ FX_ENTRY(misc_particles, _3DEE60), /* 0x73 */ FX_ENTRY(static_status, _3E12D0), /* 0x74 */ FX_ENTRY(moving_cloud, _3E1CD0), - /* 0x75 */ FX_ENTRY_NUMBERED(75, _3E2960), + /* 0x75 */ FX_ENTRY_NUMBERED(75, effect_gfx_effect_75), /* 0x76 */ {}, /* 0x77 */ FX_ENTRY(firework_rocket, _3E5350), /* 0x78 */ FX_ENTRY(peach_star_beam, effect_gfx_peach_star_beam), /* 0x79 */ FX_ENTRY(chapter_change, _3EBE60), /* 0x7A */ FX_ENTRY(ice_shard, _3F8CC0), /* 0x7B */ FX_ENTRY(spirit_card, _3FA4B0), - /* 0x7C */ FX_ENTRY(lil_oink, _3FF250), + /* 0x7C */ FX_ENTRY(lil_oink, effect_gfx_lil_oink), /* 0x7D */ FX_ENTRY(something_rotating, _3FA4B0), /* 0x7E */ FX_ENTRY(breaking_junk, effect_gfx_breaking_junk), /* 0x7F */ FX_ENTRY(partner_buff, _404F40), diff --git a/src/effects/aura.c b/src/effects/aura.c index 34ab359420..c1e124021c 100644 --- a/src/effects/aura.c +++ b/src/effects/aura.c @@ -1,23 +1,23 @@ #include "common.h" #include "effects_internal.h" -extern Gfx D_09002000[]; -extern Gfx D_090020E8[]; -extern Gfx D_090021D0[]; -extern Gfx D_090023B0[]; -extern Gfx D_090023C8[]; -extern Gfx D_090023E0[]; -extern Gfx D_090023F8[]; -extern Gfx D_09002410[]; -extern Gfx D_09002428[]; -extern Gfx D_09002440[]; -extern Gfx D_09002458[]; +extern Gfx D_09002000_379F80[]; +extern Gfx D_090020E8_37A068[]; +extern Gfx D_090021D0_37A150[]; +extern Gfx D_090023B0_37A330[]; +extern Gfx D_090023C8_37A348[]; +extern Gfx D_090023E0_37A360[]; +extern Gfx D_090023F8_37A378[]; +extern Gfx D_09002410_37A390[]; +extern Gfx D_09002428_37A3A8[]; +extern Gfx D_09002440_37A3C0[]; +extern Gfx D_09002458_37A3D8[]; -Gfx* D_E0076E90[] = { D_090023E0, D_090023E0, D_09002440, D_09002440 }; -Gfx* D_E0076EA0[] = { D_090023F8, D_090023F8, D_09002458, D_09002458 }; -Gfx* D_E0076EB0[] = { D_090023B0, D_090023B0, D_09002410, D_09002410 }; -Gfx* D_E0076EC0[] = { D_090023C8, D_090023C8, D_09002428, D_09002428 }; -Gfx* D_E0076ED0[] = { D_09002000, D_09002000, D_090020E8, D_090021D0 }; +Gfx* D_E0076E90[] = { D_090023E0_37A360, D_090023E0_37A360, D_09002440_37A3C0, D_09002440_37A3C0 }; +Gfx* D_E0076EA0[] = { D_090023F8_37A378, D_090023F8_37A378, D_09002458_37A3D8, D_09002458_37A3D8 }; +Gfx* D_E0076EB0[] = { D_090023B0_37A330, D_090023B0_37A330, D_09002410_37A390, D_09002410_37A390 }; +Gfx* D_E0076EC0[] = { D_090023C8_37A348, D_090023C8_37A348, D_09002428_37A3A8, D_09002428_37A3A8 }; +Gfx* D_E0076ED0[] = { D_09002000_379F80, D_09002000_379F80, D_090020E8_37A068, D_090021D0_37A150 }; void aura_appendGfx(void* argEffect); void aura_init(EffectInstance* effect); diff --git a/src/effects/damage_stars.c b/src/effects/damage_stars.c index 4c182da1a6..d669d2218f 100644 --- a/src/effects/damage_stars.c +++ b/src/effects/damage_stars.c @@ -1,8 +1,8 @@ #include "common.h" #include "effects_internal.h" -extern Gfx D_090004C0[]; -extern Gfx D_090005E0[]; +extern Gfx D_090004C0_343500[]; +extern Gfx D_090005E0_343620[]; extern u8 D_E0030E90[]; void damage_stars_appendGfx(void* effect); @@ -86,7 +86,7 @@ void damage_stars_appendGfx(void* effect) { gDPPipeSync(gMasterGfxPos++); gSPSegment(gMasterGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); - gSPDisplayList(gMasterGfxPos++, D_090004C0); + gSPDisplayList(gMasterGfxPos++, D_090004C0_343500); baseIdx = (part->unk_2C - 1) * 3; baseIdx %= 36; @@ -108,7 +108,7 @@ void damage_stars_appendGfx(void* effect) { shim_guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); - gSPDisplayList(gMasterGfxPos++, D_090005E0); + gSPDisplayList(gMasterGfxPos++, D_090005E0_343620); gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); } diff --git a/src/effects/drop_leaves.c b/src/effects/drop_leaves.c index ee53fbb96a..d40f2e9689 100644 --- a/src/effects/drop_leaves.c +++ b/src/effects/drop_leaves.c @@ -1,8 +1,8 @@ #include "common.h" #include "effects_internal.h" -extern Gfx D_09001180[]; -extern Gfx D_09001230[]; +extern Gfx D_09001180_33E790[]; +extern Gfx D_09001230_33E840[]; void drop_leaves_init(EffectInstance* effect); void drop_leaves_render(EffectInstance* effect); @@ -134,7 +134,7 @@ void drop_leaves_appendGfx(void* effect) { s32 i; gSPSegment(gMasterGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); - gSPDisplayList(gMasterGfxPos++, D_09001180); + gSPDisplayList(gMasterGfxPos++, D_09001180_33E790); gDPSetPrimColor(gMasterGfxPos++, 0, 0, 20, 100, 20, part->unk_24); shim_guTranslateF(sp18, part->unk_04, part->unk_08, part->unk_0C); @@ -152,7 +152,7 @@ void drop_leaves_appendGfx(void* effect) { shim_guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); - gSPDisplayList(gMasterGfxPos++, D_09001230); + gSPDisplayList(gMasterGfxPos++, D_09001230_33E840); gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); } } diff --git a/src/effects/dust.c b/src/effects/dust.c index 6419bbd114..cdb7f18c20 100644 --- a/src/effects/dust.c +++ b/src/effects/dust.c @@ -1,11 +1,11 @@ #include "common.h" #include "effects_internal.h" -extern Gfx D_09000CC0[]; -extern Gfx D_09000D68[]; -extern Gfx D_09000E18[]; -extern Gfx D_09000E38[]; -extern Gfx D_09000E58[]; +extern Gfx D_09000CC0_33FCC0[]; +extern Gfx D_09000D68_33FD68[]; +extern Gfx D_09000E18_33FE18[]; +extern Gfx D_09000E38_33FE38[]; +extern Gfx D_09000E58_33FE58[]; void dust_init(EffectInstance* effect); void dust_render(EffectInstance* effect); @@ -135,7 +135,7 @@ void dust_appendGfx(void* effect) { s32 i; gSPSegment(gMasterGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); - gSPDisplayList(gMasterGfxPos++, part->unk_00 == 0 ? D_09000CC0 : D_09000D68); + gSPDisplayList(gMasterGfxPos++, part->unk_00 == 0 ? D_09000CC0_33FCC0 : D_09000D68_33FD68); gDPSetPrimColor(gMasterGfxPos++, 0, 0, part->unk_30, part->unk_34, part->unk_38, part->unk_18); gDPSetEnvColor(gMasterGfxPos++, part->unk_3C, part->unk_40, part->unk_44, 0); @@ -158,9 +158,9 @@ void dust_appendGfx(void* effect) { gSPMatrix(gMasterGfxPos++, matrix, G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW); if (unk_00 < 2) { - gSPDisplayList(gMasterGfxPos++, (i % 2) ? D_09000E18 : D_09000E38); + gSPDisplayList(gMasterGfxPos++, (i % 2) ? D_09000E18_33FE18 : D_09000E38_33FE38); } else { - gSPDisplayList(gMasterGfxPos++, D_09000E58); + gSPDisplayList(gMasterGfxPos++, D_09000E58_33FE58); } gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); diff --git a/src/effects/effect_3D.c b/src/effects/effect_3D.c index 0f38ec0b90..6b34a45f72 100644 --- a/src/effects/effect_3D.c +++ b/src/effects/effect_3D.c @@ -1,8 +1,8 @@ #include "common.h" #include "effects_internal.h" -extern Gfx D_09000240[]; -extern Gfx D_090002E8[]; +extern Gfx D_09000240_37D3C0[]; +extern Gfx D_090002E8_37D468[]; void fx_3D_init(EffectInstance* effect); void fx_3D_update(EffectInstance* effect); @@ -226,7 +226,7 @@ void fx_3D_appendGfx(void* effect) { gDPPipeSync(gMasterGfxPos++); gSPSegment(gMasterGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); - gSPDisplayList(gMasterGfxPos++, D_09000240); + gSPDisplayList(gMasterGfxPos++, D_09000240_37D3C0); shim_guTranslateF(sp18, part->pos.x, part->pos.y, part->pos.z); shim_guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); @@ -247,7 +247,7 @@ void fx_3D_appendGfx(void* effect) { shim_guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); - gSPDisplayList(gMasterGfxPos++, D_090002E8); + gSPDisplayList(gMasterGfxPos++, D_090002E8_37D468); gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); } diff --git a/src/effects/effect_46.c b/src/effects/effect_46.c index aba134e1b8..9594270d2c 100644 --- a/src/effects/effect_46.c +++ b/src/effects/effect_46.c @@ -1,8 +1,8 @@ #include "common.h" #include "effects_internal.h" -extern Gfx D_090003A0[]; -extern Gfx D_09000420[]; +extern Gfx D_090003A0_38ED30[]; +extern Gfx D_09000420_38EDB0[]; void fx_46_appendGfx(void* effect); @@ -96,7 +96,7 @@ void fx_46_appendGfx(void* effect) { gDPPipeSync(gMasterGfxPos++); gSPSegment(gMasterGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); - gSPDisplayList(gMasterGfxPos++, D_09000420); + gSPDisplayList(gMasterGfxPos++, D_09000420_38EDB0); shim_guTranslateF(sp20, part->unk_08, part->unk_0C, part->unk_10); shim_guRotateF(sp60, -gCameras[gCurrentCameraID].currentYaw, 0.0f, 1.0f, 0.0f); @@ -124,7 +124,7 @@ void fx_46_appendGfx(void* effect) { shim_guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); - gSPDisplayList(gMasterGfxPos++, D_090003A0); + gSPDisplayList(gMasterGfxPos++, D_090003A0_38ED30); gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); } diff --git a/src/effects/effect_75.c b/src/effects/effect_75.c index 4a4f593a88..31a00f0f2d 100644 --- a/src/effects/effect_75.c +++ b/src/effects/effect_75.c @@ -1,12 +1,12 @@ #include "common.h" #include "effects_internal.h" -extern Gfx D_09001910[]; -extern Gfx D_09001A00[]; -extern Gfx D_09001A20[]; +extern Gfx D_09001910_3E4270[]; +extern Gfx D_09001A00_3E4360[]; +extern Gfx D_09001A20_3E4380[]; -Gfx* D_E00EAA50[2] = { D_09001A00, D_09001A20 }; -Gfx* D_E00EAA58[2] = { D_09001910, NULL }; +Gfx* D_E00EAA50[2] = { D_09001A00_3E4360, D_09001A20_3E4380 }; +Gfx* D_E00EAA58[2] = { D_09001910_3E4270, NULL }; void fx_75_init(EffectInstance* effect); void fx_75_update(EffectInstance* effect); diff --git a/src/effects/emote.c b/src/effects/emote.c index c2d8630a1c..8506597c4a 100644 --- a/src/effects/emote.c +++ b/src/effects/emote.c @@ -1,20 +1,20 @@ #include "common.h" #include "effects_internal.h" -extern Gfx D_09002170[]; -extern Gfx D_09002238[]; -extern Gfx D_090022E0[]; -extern Gfx D_09002308[]; -extern Gfx D_090023B0[]; -extern Gfx D_090023D8[]; -extern Gfx D_09002480[]; -extern Gfx D_090024A8[]; -extern Gfx D_09002550[]; -extern Gfx D_09002578[]; +extern Gfx D_09002170_336DE0[]; +extern Gfx D_09002238_336EA8[]; +extern Gfx D_090022E0_336F50[]; +extern Gfx D_09002308_336F78[]; +extern Gfx D_090023B0_337020[]; +extern Gfx D_090023D8_337048[]; +extern Gfx D_09002480_3370F0[]; +extern Gfx D_090024A8_337118[]; +extern Gfx D_09002550_3371C0[]; +extern Gfx D_09002578_3371E8[]; -Gfx* D_E0020C90[] = { D_090022E0, NULL, D_090023B0, D_09002480, D_09002550 }; +Gfx* D_E0020C90[] = { D_090022E0_336F50, NULL, D_090023B0_337020, D_09002480_3370F0, D_09002550_3371C0 }; -Gfx* D_E0020CA4[] = { D_09002238, NULL, D_09002308, D_090023D8, D_090024A8 }; +Gfx* D_E0020CA4[] = { D_09002238_336EA8, NULL, D_09002308_336F78, D_090023D8_337048, D_090024A8_337118 }; s8 D_E0020CB8[40] = { 0, 0, 1, 2, 3, 5, 4, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, @@ -232,7 +232,7 @@ void emote_appendGfx(void* effect) { shim_guMtxCatF(sp58, sp18, sp18); shim_guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(gMasterGfxPos++, D_09002170) + gSPDisplayList(gMasterGfxPos++, D_09002170_336DE0) gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); } else { @@ -250,7 +250,7 @@ void emote_appendGfx(void* effect) { shim_guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); gDPSetPrimColor(gMasterGfxPos++, 0, 0, 235, 28, 0, 255); gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(gMasterGfxPos++, D_09002578); + gSPDisplayList(gMasterGfxPos++, D_09002578_3371E8); gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); } } diff --git a/src/effects/ending_decals.c b/src/effects/ending_decals.c index 57b2ead962..a5eac1bc44 100644 --- a/src/effects/ending_decals.c +++ b/src/effects/ending_decals.c @@ -1,7 +1,7 @@ #include "common.h" #include "effects_internal.h" -extern Gfx D_09001E40; +extern Gfx D_09001E40_36CD20[]; extern Gfx* D_E00685B0[]; extern Gfx* D_E00685BC[]; extern Gfx* D_E00685F4[]; @@ -147,7 +147,7 @@ void ending_decals_appendGfx(void* effect) { gDPSetPrimColor(gMasterGfxPos++, 0, 0, data->unk_24, data->unk_25, data->unk_26, alpha); gDPSetEnvColor(gMasterGfxPos++, data->unk_27, data->unk_28, data->unk_29, 0); - if (dlist2 == &D_09001E40) { + if (dlist2 == D_09001E40_36CD20) { dlist2 = D_E00685BC[unk_20 % 14]; } diff --git a/src/effects/energy_in_out.c b/src/effects/energy_in_out.c index b4928a3f7f..a820417a82 100644 --- a/src/effects/energy_in_out.c +++ b/src/effects/energy_in_out.c @@ -1,9 +1,9 @@ #include "common.h" #include "effects_internal.h" -extern Gfx D_09000200[]; -extern Gfx D_09000688[]; -extern Gfx D_09000808[]; +extern Gfx D_09000200_3D6130[]; +extern Gfx D_09000688_3D65B8[]; +extern Gfx D_09000808_3D6738[]; extern Gfx* D_E00D6E40[]; void energy_in_out_appendGfx(void* effect); @@ -108,7 +108,7 @@ void energy_in_out_appendGfx(void* effect) { gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gDPSetPrimColor(gMasterGfxPos++, 0, 0, part->unk_18, part->unk_1C, part->unk_20, unk_24); gDPSetEnvColor(gMasterGfxPos++, part->unk_28, part->unk_2C, part->unk_30, 0); - gSPDisplayList(gMasterGfxPos++, D_09000200); + gSPDisplayList(gMasterGfxPos++, D_09000200_3D6130); part++; for (i = 1; i < ((EffectInstance*)effect)->numParts; i++, part++) { @@ -119,7 +119,7 @@ void energy_in_out_appendGfx(void* effect) { shim_guRotateF(sp20, part->unk_3C, 0.0f, 0.0f, 1.0f); shim_guTranslateF(sp60, part->pos.x + unk_38, 0.0f, 0.0f); shim_guMtxCatF(sp60, sp20, sp20); - if (D_E00D6E40[unk_00] == D_09000688 || D_E00D6E40[unk_00] == D_09000808) { + if (D_E00D6E40[unk_00] == D_09000688_3D65B8 || D_E00D6E40[unk_00] == D_09000808_3D6738) { shim_guScaleF(sp60, scale, 1.0f, 1.0f); } else { shim_guScaleF(sp60, scale, scale, 1.0f); diff --git a/src/effects/energy_orb_wave.c b/src/effects/energy_orb_wave.c index 3f4cd1b034..cc8d75f077 100644 --- a/src/effects/energy_orb_wave.c +++ b/src/effects/energy_orb_wave.c @@ -1,11 +1,11 @@ #include "common.h" #include "effects_internal.h" -extern Gfx D_09001000[]; -extern Gfx D_090010A8[]; -extern Gfx D_090011D0[]; -extern Gfx D_090011F0[]; -extern Gfx D_09001210[]; +extern Gfx D_09001000_3A5320[]; +extern Gfx D_090010A8_3A53C8[]; +extern Gfx D_090011D0_3A54F0[]; +extern Gfx D_090011F0_3A5510[]; +extern Gfx D_09001210_3A5530[]; void energy_orb_wave_init(EffectInstance* effect); void energy_orb_wave_update(EffectInstance* effect); @@ -126,13 +126,13 @@ void energy_orb_wave_appendGfx(void* effect) { gDPSetAlphaDither(gMasterGfxPos++, G_AD_PATTERN); if (unk_00 < 3) { - gSPDisplayList(gMasterGfxPos++, D_09001000); + gSPDisplayList(gMasterGfxPos++, D_09001000_3A5320); shim_guRotateF(sp18, unk_14, 0.0f, 0.0f, 1.0f); shim_guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); - gSPDisplayList(gMasterGfxPos++, D_090011D0); + gSPDisplayList(gMasterGfxPos++, D_090011D0_3A54F0); gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); gDPSetColorDither(gMasterGfxPos++, G_CD_MAGICSQ); @@ -140,11 +140,11 @@ void energy_orb_wave_appendGfx(void* effect) { shim_guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); - gSPDisplayList(gMasterGfxPos++, D_090011F0); + gSPDisplayList(gMasterGfxPos++, D_090011F0_3A5510); gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); } else { - gSPDisplayList(gMasterGfxPos++, D_090010A8); - gSPDisplayList(gMasterGfxPos++, D_09001210); + gSPDisplayList(gMasterGfxPos++, D_090010A8_3A53C8); + gSPDisplayList(gMasterGfxPos++, D_09001210_3A5530); } gDPSetColorDither(gMasterGfxPos++, G_CD_DISABLE); diff --git a/src/effects/energy_shockwave.c b/src/effects/energy_shockwave.c index 6b264029f4..a29d94b151 100644 --- a/src/effects/energy_shockwave.c +++ b/src/effects/energy_shockwave.c @@ -1,8 +1,8 @@ #include "common.h" #include "effects_internal.h" -extern Gfx D_09000DC0[]; -extern Gfx D_09000E60[]; +extern Gfx D_09000DC0_3762D0[]; +extern Gfx D_09000E60_376370[]; void energy_shockwave_init(EffectInstance* effect); void energy_shockwave_update(EffectInstance* effect); @@ -146,7 +146,7 @@ void energy_shockwave_appendGfx(void* effect) { gDPPipeSync(gMasterGfxPos++); gSPSegment(gMasterGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); - gSPDisplayList(gMasterGfxPos++, D_09000E60); + gSPDisplayList(gMasterGfxPos++, D_09000E60_376370); gDPSetPrimColor(gMasterGfxPos++, 0, 0, 255, 179, 30, data->unk_24); gDPSetEnvColor(gMasterGfxPos++, data->unk_50, data->unk_51, data->unk_52, 128); @@ -164,7 +164,7 @@ void energy_shockwave_appendGfx(void* effect) { shim_guMtxF2L(sp10, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); - gSPDisplayList(gMasterGfxPos++, D_09000DC0); + gSPDisplayList(gMasterGfxPos++, D_09000DC0_3762D0); gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); gDPPipeSync(gMasterGfxPos++); } diff --git a/src/effects/explosion.c b/src/effects/explosion.c index c8ba31428a..6263e23e79 100644 --- a/src/effects/explosion.c +++ b/src/effects/explosion.c @@ -1,9 +1,9 @@ #include "common.h" #include "effects_internal.h" -extern Gfx D_09000840[]; -extern Gfx D_090008F0[]; -extern Gfx D_09000910[]; +extern Gfx D_09000840_3447B0[]; +extern Gfx D_090008F0_344860[]; +extern Gfx D_09000910_344880[]; extern Gfx* D_E00328B0[]; void explosion_appendGfx(void* effect); @@ -49,20 +49,20 @@ void explosion_appendGfx(void* effect) { gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); if (part->unk_00 != -1) { - gSPDisplayList(gMasterGfxPos++, D_09000840); + gSPDisplayList(gMasterGfxPos++, D_09000840_3447B0); shim_guScaleF(sp18, part->unk_20, part->unk_20, 1.0f); shim_guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); gDPSetPrimColor(gMasterGfxPos++, 0, 0, 255, 255, 240, part->unk_38); gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); - gSPDisplayList(gMasterGfxPos++, D_090008F0); + gSPDisplayList(gMasterGfxPos++, D_090008F0_344860); gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); } part++; - gSPDisplayList(gMasterGfxPos++, D_09000910); + gSPDisplayList(gMasterGfxPos++, D_09000910_344880); shim_guScaleF(sp18, part->unk_20, part->unk_20, part->unk_20); shim_guRotateF(sp58, part->unk_28, 0.0f, 0.0f, 1.0f); diff --git a/src/effects/falling_leaves.c b/src/effects/falling_leaves.c index 4928816494..948c7ded5c 100644 --- a/src/effects/falling_leaves.c +++ b/src/effects/falling_leaves.c @@ -1,8 +1,8 @@ #include "common.h" #include "effects_internal.h" -extern Gfx D_09001100[]; -extern Gfx D_090011B0[]; +extern Gfx D_09001100_3601E0[]; +extern Gfx D_090011B0_360290[]; void falling_leaves_init(EffectInstance* effect); void falling_leaves_render(EffectInstance* effect); @@ -129,7 +129,7 @@ void falling_leaves_appendGfx(void* effect) { s32 i; gSPSegment(gMasterGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); - gSPDisplayList(gMasterGfxPos++, D_09001100); + gSPDisplayList(gMasterGfxPos++, D_09001100_3601E0); gDPSetPrimColor(gMasterGfxPos++, 0, 0, 20, 100, 20, part->unk_24); shim_guTranslateF(sp18, part->unk_04, part->unk_08, part->unk_0C); @@ -147,7 +147,7 @@ void falling_leaves_appendGfx(void* effect) { shim_guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); - gSPDisplayList(gMasterGfxPos++, D_090011B0); + gSPDisplayList(gMasterGfxPos++, D_090011B0_360290); gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); } } diff --git a/src/effects/fire_flower.c b/src/effects/fire_flower.c index dc94d2070a..dd4d95e0ec 100644 --- a/src/effects/fire_flower.c +++ b/src/effects/fire_flower.c @@ -1,12 +1,12 @@ #include "common.h" #include "effects_internal.h" -extern char D_09000000[][0x200]; -extern Gfx D_09000D40[]; -extern Gfx D_09000DE0[]; -extern Gfx D_09000EB8[]; -extern Gfx D_09000ED8[]; -extern Gfx D_09000EF8[]; +extern char D_09000000_3803A0[][0x200]; +extern Gfx D_09000D40_3810E0[]; +extern Gfx D_09000DE0_381180[]; +extern Gfx D_09000EB8_381258[]; +extern Gfx D_09000ED8_381278[]; +extern Gfx D_09000EF8_381298[]; extern s8 D_E007EC2F[]; s32 D_E007EC30[] = { 0x323C4650, 0x5A646964 }; @@ -227,7 +227,7 @@ void fire_flower_appendGfx(void* effect) { shim_guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); - gSPDisplayList(gMasterGfxPos++, D_09000DE0); + gSPDisplayList(gMasterGfxPos++, D_09000DE0_381180); part++; for (i = 1; i < ((EffectInstance*)effect)->numParts; i++, part++) { @@ -238,7 +238,7 @@ void fire_flower_appendGfx(void* effect) { shim_guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); - gSPDisplayList(gMasterGfxPos++, part->unk_00 != 0 ? D_09000ED8 : D_09000EB8); + gSPDisplayList(gMasterGfxPos++, part->unk_00 != 0 ? D_09000ED8_381278 : D_09000EB8_381258); gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); } } @@ -246,14 +246,14 @@ void fire_flower_appendGfx(void* effect) { gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); } - gSPDisplayList(gMasterGfxPos++, D_09000D40); + gSPDisplayList(gMasterGfxPos++, D_09000D40_3810E0); gDPLoadTextureTile_4b( - gMasterGfxPos++, D_09000000[3 - unk_34], + gMasterGfxPos++, D_09000000_3803A0[3 - unk_34], G_IM_FMT_CI, 32, 0, 0, 0, 31, 31, 0, G_TX_MIRROR | G_TX_WRAP, G_TX_MIRROR | G_TX_WRAP, 5, 5, G_TX_NOLOD, G_TX_NOLOD); gDPLoadMultiTile_4b( - gMasterGfxPos++, D_09000000[2 - unk_34], + gMasterGfxPos++, D_09000000_3803A0[2 - unk_34], 0x0080, 1, G_IM_FMT_CI, 32, 0, 0, 0, 31, 31, 0, G_TX_MIRROR | G_TX_WRAP, G_TX_MIRROR | G_TX_WRAP, 5, 5, G_TX_NOLOD, G_TX_NOLOD); @@ -266,7 +266,7 @@ void fire_flower_appendGfx(void* effect) { shim_guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); - gSPDisplayList(gMasterGfxPos++, D_09000EF8); + gSPDisplayList(gMasterGfxPos++, D_09000EF8_381298); gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); } diff --git a/src/effects/flashing_box_shockwave.c b/src/effects/flashing_box_shockwave.c index 5fc3e28bbc..e0fd846e16 100644 --- a/src/effects/flashing_box_shockwave.c +++ b/src/effects/flashing_box_shockwave.c @@ -1,10 +1,10 @@ #include "common.h" #include "effects_internal.h" -extern Gfx D_09000600[]; -extern Gfx D_090008E8[]; -extern Gfx D_09000950[]; -extern Gfx D_09000FF8[]; +extern Gfx D_09000600_3936A0[]; +extern Gfx D_090008E8_393988[]; +extern Gfx D_09000950_3939F0[]; +extern Gfx D_09000FF8_394098[]; void flashing_box_shockwave_init(EffectInstance* effect); void flashing_box_shockwave_update(EffectInstance* effect); @@ -160,9 +160,9 @@ void flashing_box_shockwave_appendGfx(void* effect) { shim_guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); - gSPDisplayList(gMasterGfxPos++, D_09000600); + gSPDisplayList(gMasterGfxPos++, D_09000600_3936A0); gDPSetTileSize(gMasterGfxPos++, G_TX_RENDERTILE, unk_20 * 8, unk_20 * 8, unk_20 * 8 + 128, unk_20 * 8 + 128); - gSPDisplayList(gMasterGfxPos++, D_090008E8); + gSPDisplayList(gMasterGfxPos++, D_090008E8_393988); gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); } @@ -177,8 +177,8 @@ void flashing_box_shockwave_appendGfx(void* effect) { shim_guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); - gSPDisplayList(gMasterGfxPos++, D_09000950); - gSPDisplayList(gMasterGfxPos++, D_09000FF8); + gSPDisplayList(gMasterGfxPos++, D_09000950_3939F0); + gSPDisplayList(gMasterGfxPos++, D_09000FF8_394098); gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); } diff --git a/src/effects/floating_cloud_puff.c b/src/effects/floating_cloud_puff.c index 219fdfedc1..7e27c192de 100644 --- a/src/effects/floating_cloud_puff.c +++ b/src/effects/floating_cloud_puff.c @@ -1,8 +1,8 @@ #include "common.h" #include "effects_internal.h" -extern Gfx D_09000080[]; -extern Gfx D_09000168[]; +extern Gfx D_09000080_3D4F10[]; +extern Gfx D_09000168_3D4FF8[]; extern u8 D_E00D2500[]; extern u8 D_E00D2508[]; @@ -137,7 +137,7 @@ void floating_cloud_puff_appendGfx(void* effect) { gSPMatrix(gMasterGfxPos++, camera->unkMatrix, G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW); gDPSetPrimColor(gMasterGfxPos++, 0, 0, data->unk_18, data->unk_1C, data->unk_20, unk_24); gDPSetEnvColor(gMasterGfxPos++, data->unk_28, data->unk_2C, data->unk_30, 0); - gSPDisplayList(gMasterGfxPos++, D_09000080); - gSPDisplayList(gMasterGfxPos++, D_09000168); + gSPDisplayList(gMasterGfxPos++, D_09000080_3D4F10); + gSPDisplayList(gMasterGfxPos++, D_09000168_3D4FF8); gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); } diff --git a/src/effects/gather_magic.c b/src/effects/gather_magic.c index cdbb4ef6e4..3c7218c59a 100644 --- a/src/effects/gather_magic.c +++ b/src/effects/gather_magic.c @@ -1,7 +1,7 @@ #include "common.h" #include "effects_internal.h" -extern Gfx D_09000080[]; +extern Gfx D_09000080_38F790[]; extern Gfx* D_E008E890[]; void gather_magic_appendGfx(void* effect); @@ -167,7 +167,7 @@ void gather_magic_appendGfx(void* effect) { shim_guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(gMasterGfxPos++, D_09000080); + gSPDisplayList(gMasterGfxPos++, D_09000080_38F790); gDPSetEnvColor(gMasterGfxPos++, part->unk_3C, part->unk_40, part->unk_44, 0); part++; diff --git a/src/effects/gfx/aura.c b/src/effects/gfx/aura.c new file mode 100644 index 0000000000..15fd929709 --- /dev/null +++ b/src/effects/gfx/aura.c @@ -0,0 +1,27 @@ +#include "effects/gfx/D_09000000_377F80.png.inc.c" +#include "effects/gfx/D_09000400_378380.png.inc.c" +#include "effects/gfx/D_09000800_378780.png.inc.c" +#include "effects/gfx/D_09001000_378F80.png.inc.c" +#include "effects/gfx/D_09001800_379780.png.inc.c" + +#include "effects/gfx/D_09002000_379F80.gfx.inc.c" +#include "effects/gfx/D_090020E8_37A068.gfx.inc.c" +#include "effects/gfx/D_090021D0_37A150.gfx.inc.c" + +#include "effects/gfx/D_090022B0_37A230.vtx.inc.c" +#include "effects/gfx/D_090022D0_37A250.vtx.inc.c" +#include "effects/gfx/D_090022F0_37A270.vtx.inc.c" +#include "effects/gfx/D_09002310_37A290.vtx.inc.c" +#include "effects/gfx/D_09002330_37A2B0.vtx.inc.c" +#include "effects/gfx/D_09002350_37A2D0.vtx.inc.c" +#include "effects/gfx/D_09002370_37A2F0.vtx.inc.c" +#include "effects/gfx/D_09002390_37A310.vtx.inc.c" + +#include "effects/gfx/D_090023B0_37A330.gfx.inc.c" +#include "effects/gfx/D_090023C8_37A348.gfx.inc.c" +#include "effects/gfx/D_090023E0_37A360.gfx.inc.c" +#include "effects/gfx/D_090023F8_37A378.gfx.inc.c" +#include "effects/gfx/D_09002410_37A390.gfx.inc.c" +#include "effects/gfx/D_09002428_37A3A8.gfx.inc.c" +#include "effects/gfx/D_09002440_37A3C0.gfx.inc.c" +#include "effects/gfx/D_09002458_37A3D8.gfx.inc.c" diff --git a/src/effects/gfx/balloon.c b/src/effects/gfx/balloon.c index d55e77a32c..9874bad18f 100644 --- a/src/effects/gfx/balloon.c +++ b/src/effects/gfx/balloon.c @@ -4,25 +4,19 @@ #include "effects/gfx/D_09000200_394870.png.inc.c" #include "effects/gfx/D_09000000_394670.pal.inc.c" -u8 D_09000420_394A90[] = { - 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 -}; +u8 D_09000420_394A90[0x1E0] = {}; #include "effects/gfx/D_09000600_394C70.png.inc.c" #include "effects/gfx/D_09000800_394E70.png.inc.c" #include "effects/gfx/D_09000600_394C70.pal.inc.c" -u8 D_09000A20_395090[] = { - 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 -}; +u8 D_09000A20_395090[0x1E0] = {}; #include "effects/gfx/D_09000C00_395270.png.inc.c" #include "effects/gfx/D_09000E00_395470.png.inc.c" #include "effects/gfx/D_09000C00_395270.pal.inc.c" -u8 D_09001020_395690[] = { - 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 -}; +u8 D_09001020_395690[0x1E0] = {}; #include "effects/gfx/D_09001200_395870.vtx.inc.c" #include "effects/gfx/D_09001280_3958F0.gfx.inc.c" diff --git a/src/effects/gfx/damage_stars.c b/src/effects/gfx/damage_stars.c new file mode 100644 index 0000000000..871f21b096 --- /dev/null +++ b/src/effects/gfx/damage_stars.c @@ -0,0 +1,11 @@ +#include "effects/gfx/D_09000000_343040.png.inc.c" + +#include "effects/gfx/D_09000400_343440.vtx.inc.c" +#include "effects/gfx/D_09000440_343480.vtx.inc.c" +#include "effects/gfx/D_09000480_3434C0.vtx.inc.c" + +#include "effects/gfx/D_090004C0_343500.gfx.inc.c" +#include "effects/gfx/D_09000570_3435B0.gfx.inc.c" +#include "effects/gfx/D_090005E0_343620.gfx.inc.c" +#include "effects/gfx/D_09000600_343640.gfx.inc.c" +#include "effects/gfx/D_09000620_343660.gfx.inc.c" diff --git a/src/effects/gfx/drop_leaves.c b/src/effects/gfx/drop_leaves.c new file mode 100644 index 0000000000..b0f43db89a --- /dev/null +++ b/src/effects/gfx/drop_leaves.c @@ -0,0 +1,10 @@ +#include "effects/gfx/D_09000000_33D610.png.inc.c" + +#include "effects/gfx/D_09001000_33E610.vtx.inc.c" +#include "effects/gfx/D_09001080_33E690.vtx.inc.c" +#include "effects/gfx/D_09001100_33E710.vtx.inc.c" + +#include "effects/gfx/D_09001180_33E790.gfx.inc.c" +#include "effects/gfx/D_09001230_33E840.gfx.inc.c" +#include "effects/gfx/D_09001258_33E868.gfx.inc.c" +#include "effects/gfx/D_09001280_33E890.gfx.inc.c" diff --git a/src/effects/gfx/dust.c b/src/effects/gfx/dust.c new file mode 100644 index 0000000000..08388c1127 --- /dev/null +++ b/src/effects/gfx/dust.c @@ -0,0 +1,12 @@ +#include "effects/gfx/D_09000000_33F000.png.inc.c" +#include "effects/gfx/D_09000600_33F600.png.inc.c" + +#include "effects/gfx/D_09000C00_33FC00.vtx.inc.c" +#include "effects/gfx/D_09000C40_33FC40.vtx.inc.c" +#include "effects/gfx/D_09000C80_33FC80.vtx.inc.c" + +#include "effects/gfx/D_09000CC0_33FCC0.gfx.inc.c" +#include "effects/gfx/D_09000D68_33FD68.gfx.inc.c" +#include "effects/gfx/D_09000E18_33FE18.gfx.inc.c" +#include "effects/gfx/D_09000E38_33FE38.gfx.inc.c" +#include "effects/gfx/D_09000E58_33FE58.gfx.inc.c" diff --git a/src/effects/gfx/effect_3D.c b/src/effects/gfx/effect_3D.c new file mode 100644 index 0000000000..50053b048d --- /dev/null +++ b/src/effects/gfx/effect_3D.c @@ -0,0 +1,6 @@ +#include "effects/gfx/D_09000000_37D180.png.inc.c" + +#include "effects/gfx/D_09000200_37D380.vtx.inc.c" + +#include "effects/gfx/D_09000240_37D3C0.gfx.inc.c" +#include "effects/gfx/D_090002E8_37D468.gfx.inc.c" diff --git a/src/effects/gfx/effect_46.c b/src/effects/gfx/effect_46.c new file mode 100644 index 0000000000..16ad9b0cfb --- /dev/null +++ b/src/effects/gfx/effect_46.c @@ -0,0 +1,6 @@ +#include "effects/gfx/D_09000000_38E990.png.inc.c" + +#include "effects/gfx/D_09000200_38EB90.vtx.inc.c" + +#include "effects/gfx/D_090003A0_38ED30.gfx.inc.c" +#include "effects/gfx/D_09000420_38EDB0.gfx.inc.c" diff --git a/src/effects/gfx/effect_75.c b/src/effects/gfx/effect_75.c new file mode 100644 index 0000000000..83d4961f44 --- /dev/null +++ b/src/effects/gfx/effect_75.c @@ -0,0 +1,22 @@ +#include "common.h" + +#include "effects/gfx/D_09000000_3E2960.png.inc.c" +#include "effects/gfx/D_09000800_3E3160.png.inc.c" + +#include "effects/gfx/D_09001000_3E3960.vtx.inc.c" +#include "effects/gfx/D_09001070_3E39D0.vtx.inc.c" +#include "effects/gfx/D_09001190_3E3AF0.vtx.inc.c" +#include "effects/gfx/D_090012D0_3E3C30.vtx.inc.c" +#include "effects/gfx/D_090014D0_3E3E30.vtx.inc.c" + +#include "effects/gfx/D_090016D0_3E4030.gfx.inc.c" +#include "effects/gfx/D_09001738_3E4098.gfx.inc.c" +#include "effects/gfx/D_090017A0_3E4100.gfx.inc.c" +#include "effects/gfx/D_090018D8_3E4238.gfx.inc.c" +#include "effects/gfx/D_090018F8_3E4258.gfx.inc.c" + +u8 D_09001908_3E4268[8] = {}; + +#include "effects/gfx/D_09001910_3E4270.gfx.inc.c" +#include "effects/gfx/D_09001A00_3E4360.gfx.inc.c" +#include "effects/gfx/D_09001A20_3E4380.gfx.inc.c" diff --git a/src/effects/gfx/emote.c b/src/effects/gfx/emote.c new file mode 100644 index 0000000000..482769acb6 --- /dev/null +++ b/src/effects/gfx/emote.c @@ -0,0 +1,23 @@ +#include "effects/gfx/D_09000000_334C70.png.inc.c" +#include "effects/gfx/D_09000400_335070.png.inc.c" +#include "effects/gfx/D_09000A00_335670.png.inc.c" +#include "effects/gfx/D_09001600_336270.png.inc.c" +#include "effects/gfx/D_09001E00_336A70.png.inc.c" + +#include "effects/gfx/D_09002000_336C70.vtx.inc.c" +#include "effects/gfx/D_09002040_336CB0.vtx.inc.c" +#include "effects/gfx/D_09002080_336CF0.vtx.inc.c" +#include "effects/gfx/D_090020C0_336D30.vtx.inc.c" +#include "effects/gfx/D_09002100_336D70.vtx.inc.c" +#include "effects/gfx/D_09002140_336DB0.vtx.inc.c" + +#include "effects/gfx/D_09002170_336DE0.gfx.inc.c" +#include "effects/gfx/D_09002238_336EA8.gfx.inc.c" +#include "effects/gfx/D_090022E0_336F50.gfx.inc.c" +#include "effects/gfx/D_09002308_336F78.gfx.inc.c" +#include "effects/gfx/D_090023B0_337020.gfx.inc.c" +#include "effects/gfx/D_090023D8_337048.gfx.inc.c" +#include "effects/gfx/D_09002480_3370F0.gfx.inc.c" +#include "effects/gfx/D_090024A8_337118.gfx.inc.c" +#include "effects/gfx/D_09002550_3371C0.gfx.inc.c" +#include "effects/gfx/D_09002578_3371E8.gfx.inc.c" diff --git a/src/effects/gfx/ending_decals.c b/src/effects/gfx/ending_decals.c new file mode 100644 index 0000000000..016e88ee7c --- /dev/null +++ b/src/effects/gfx/ending_decals.c @@ -0,0 +1,21 @@ +#include "common.h" + +#include "effects/gfx/D_09000000_36AEE0.png.inc.c" +#include "effects/gfx/D_09001000_36BEE0.png.inc.c" +#include "effects/gfx/D_09001400_36C2E0.png.inc.c" +#include "effects/gfx/D_09001800_36C6E0.png.inc.c" +#include "effects/gfx/D_09001000_36BEE0.pal.inc.c" + +u8 D_09001C20_36CB00[0x1E0] = {}; + +#include "effects/gfx/D_09001E00_36CCE0.vtx.inc.c" + +#include "effects/gfx/D_09001E40_36CD20.gfx.inc.c" +#include "effects/gfx/D_09001EA8_36CD88.gfx.inc.c" +#include "effects/gfx/D_09001F10_36CDF0.gfx.inc.c" +#include "effects/gfx/D_09001F78_36CE58.gfx.inc.c" + +#include "effects/gfx/D_09002018_36CEF8.vtx.inc.c" + +#include "effects/gfx/D_09002058_36CF38.gfx.inc.c" +#include "effects/gfx/D_09002078_36CF58.gfx.inc.c" diff --git a/src/effects/gfx/energy_in_out.c b/src/effects/gfx/energy_in_out.c new file mode 100644 index 0000000000..8774d706ca --- /dev/null +++ b/src/effects/gfx/energy_in_out.c @@ -0,0 +1,43 @@ +#include "effects/gfx/D_09000000_3D5F30.png.inc.c" + +#include "effects/gfx/D_09000200_3D6130.gfx.inc.c" + +#include "effects/gfx/D_090002A8_3D61D8.vtx.inc.c" +#include "effects/gfx/D_090002E8_3D6218.vtx.inc.c" +#include "effects/gfx/D_09000328_3D6258.vtx.inc.c" +#include "effects/gfx/D_09000368_3D6298.vtx.inc.c" + +#include "effects/gfx/D_090003A8_3D62D8.gfx.inc.c" +#include "effects/gfx/D_090003C8_3D62F8.gfx.inc.c" +#include "effects/gfx/D_090003E8_3D6318.gfx.inc.c" +#include "effects/gfx/D_09000408_3D6338.gfx.inc.c" + +#include "effects/gfx/D_09000428_3D6358.vtx.inc.c" +#include "effects/gfx/D_09000468_3D6398.vtx.inc.c" +#include "effects/gfx/D_090004A8_3D63D8.vtx.inc.c" +#include "effects/gfx/D_090004E8_3D6418.vtx.inc.c" + +#include "effects/gfx/D_09000528_3D6458.gfx.inc.c" +#include "effects/gfx/D_09000540_3D6470.gfx.inc.c" +#include "effects/gfx/D_09000558_3D6488.gfx.inc.c" +#include "effects/gfx/D_09000570_3D64A0.gfx.inc.c" + +#include "effects/gfx/D_09000588_3D64B8.vtx.inc.c" +#include "effects/gfx/D_090005C8_3D64F8.vtx.inc.c" +#include "effects/gfx/D_09000608_3D6538.vtx.inc.c" +#include "effects/gfx/D_09000648_3D6578.vtx.inc.c" + +#include "effects/gfx/D_09000688_3D65B8.gfx.inc.c" +#include "effects/gfx/D_090006A8_3D65D8.gfx.inc.c" +#include "effects/gfx/D_090006C8_3D65F8.gfx.inc.c" +#include "effects/gfx/D_090006E8_3D6618.gfx.inc.c" + +#include "effects/gfx/D_09000708_3D6638.vtx.inc.c" +#include "effects/gfx/D_09000748_3D6678.vtx.inc.c" +#include "effects/gfx/D_09000788_3D66B8.vtx.inc.c" +#include "effects/gfx/D_090007C8_3D66F8.vtx.inc.c" + +#include "effects/gfx/D_09000808_3D6738.gfx.inc.c" +#include "effects/gfx/D_09000828_3D6758.gfx.inc.c" +#include "effects/gfx/D_09000848_3D6778.gfx.inc.c" +#include "effects/gfx/D_09000868_3D6798.gfx.inc.c" diff --git a/src/effects/gfx/energy_orb_wave.c b/src/effects/gfx/energy_orb_wave.c new file mode 100644 index 0000000000..7245532388 --- /dev/null +++ b/src/effects/gfx/energy_orb_wave.c @@ -0,0 +1,12 @@ +#include "effects/gfx/D_09000000_3A4320.png.inc.c" +#include "effects/gfx/D_09000800_3A4B20.png.inc.c" + +#include "effects/gfx/D_09001000_3A5320.gfx.inc.c" +#include "effects/gfx/D_090010A8_3A53C8.gfx.inc.c" + +#include "effects/gfx/D_09001150_3A5470.vtx.inc.c" +#include "effects/gfx/D_09001190_3A54B0.vtx.inc.c" + +#include "effects/gfx/D_090011D0_3A54F0.gfx.inc.c" +#include "effects/gfx/D_090011F0_3A5510.gfx.inc.c" +#include "effects/gfx/D_09001210_3A5530.gfx.inc.c" diff --git a/src/effects/gfx/energy_shockwave.c b/src/effects/gfx/energy_shockwave.c new file mode 100644 index 0000000000..b8a6209dc8 --- /dev/null +++ b/src/effects/gfx/energy_shockwave.c @@ -0,0 +1,8 @@ +#include "effects/gfx/D_09000000_375510.png.inc.c" +#include "effects/gfx/D_09000800_375D10.png.inc.c" + +#include "effects/gfx/D_09000A00_375F10.vtx.inc.c" +#include "effects/gfx/D_09000C00_376110.vtx.inc.c" + +#include "effects/gfx/D_09000DC0_3762D0.gfx.inc.c" +#include "effects/gfx/D_09000E60_376370.gfx.inc.c" diff --git a/src/effects/gfx/explosion.c b/src/effects/gfx/explosion.c new file mode 100644 index 0000000000..376e6645c8 --- /dev/null +++ b/src/effects/gfx/explosion.c @@ -0,0 +1,13 @@ +#include "effects/gfx/D_09000000_343F70.png.inc.c" +#include "effects/gfx/D_09000200_344170.png.inc.c" +#include "effects/gfx/D_09000400_344370.png.inc.c" +#include "effects/gfx/D_09000600_344570.png.inc.c" + +#include "effects/gfx/D_09000800_344770.vtx.inc.c" + +#include "effects/gfx/D_09000840_3447B0.gfx.inc.c" +#include "effects/gfx/D_090008F0_344860.gfx.inc.c" +#include "effects/gfx/D_09000910_344880.gfx.inc.c" +#include "effects/gfx/D_09000978_3448E8.gfx.inc.c" +#include "effects/gfx/D_090009D8_344948.gfx.inc.c" +#include "effects/gfx/D_09000A38_3449A8.gfx.inc.c" diff --git a/src/effects/gfx/falling_leaves.c b/src/effects/gfx/falling_leaves.c new file mode 100644 index 0000000000..4f59b5ddac --- /dev/null +++ b/src/effects/gfx/falling_leaves.c @@ -0,0 +1,6 @@ +#include "effects/gfx/D_09000000_35F0E0.png.inc.c" + +#include "effects/gfx/D_09001000_3600E0.vtx.inc.c" + +#include "effects/gfx/D_09001100_3601E0.gfx.inc.c" +#include "effects/gfx/D_090011B0_360290.gfx.inc.c" diff --git a/src/effects/gfx/fire_flower.c b/src/effects/gfx/fire_flower.c new file mode 100644 index 0000000000..1c5b79c1d6 --- /dev/null +++ b/src/effects/gfx/fire_flower.c @@ -0,0 +1,28 @@ +#include "common.h" + +#include "effects/gfx/D_09000000_3803A0.png.inc.c" +#include "effects/gfx/D_09000200_3805A0.png.inc.c" +#include "effects/gfx/D_09000400_3807A0.png.inc.c" +#include "effects/gfx/D_09000600_3809A0.png.inc.c" +#include "effects/gfx/D_09000000_3803A0.pal.inc.c" + +u8 D_09000820_380BC0[] = { + 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 +}; + +#include "effects/gfx/D_09000A00_380DA0.png.inc.c" +#include "effects/gfx/D_09000A00_380DA0.pal.inc.c" + +u8 D_09000AA0_380E40[] = { + 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 +}; + +#include "effects/gfx/D_09000C80_381020.vtx.inc.c" +#include "effects/gfx/D_09000CC0_381060.vtx.inc.c" +#include "effects/gfx/D_09000D00_3810A0.vtx.inc.c" + +#include "effects/gfx/D_09000D40_3810E0.gfx.inc.c" +#include "effects/gfx/D_09000DE0_381180.gfx.inc.c" +#include "effects/gfx/D_09000EB8_381258.gfx.inc.c" +#include "effects/gfx/D_09000ED8_381278.gfx.inc.c" +#include "effects/gfx/D_09000EF8_381298.gfx.inc.c" diff --git a/src/effects/gfx/flashing_box_shockwave.c b/src/effects/gfx/flashing_box_shockwave.c new file mode 100644 index 0000000000..771042ff63 --- /dev/null +++ b/src/effects/gfx/flashing_box_shockwave.c @@ -0,0 +1,19 @@ +#include "effects/gfx/D_09000000_3930A0.png.inc.c" +#include "effects/gfx/D_09000200_3932A0.png.inc.c" + +#include "effects/gfx/D_09000600_3936A0.gfx.inc.c" + +#include "effects/gfx/D_090006A8_393748.vtx.inc.c" +#include "effects/gfx/D_090007E8_393888.vtx.inc.c" + +#include "effects/gfx/D_090008E8_393988.gfx.inc.c" +#include "effects/gfx/D_09000950_3939F0.gfx.inc.c" + +#include "effects/gfx/D_090009F8_393A98.vtx.inc.c" +#include "effects/gfx/D_09000B18_393BB8.vtx.inc.c" +#include "effects/gfx/D_09000BB8_393C58.vtx.inc.c" +#include "effects/gfx/D_09000CF8_393D98.vtx.inc.c" +#include "effects/gfx/D_09000E18_393EB8.vtx.inc.c" +#include "effects/gfx/D_09000EB8_393F58.vtx.inc.c" + +#include "effects/gfx/D_09000FF8_394098.gfx.inc.c" diff --git a/src/effects/gfx/floating_cloud_puff.c b/src/effects/gfx/floating_cloud_puff.c new file mode 100644 index 0000000000..592ef7d291 --- /dev/null +++ b/src/effects/gfx/floating_cloud_puff.c @@ -0,0 +1,4 @@ +#include "effects/gfx/D_09000000_3D4E90.png.inc.c" +#include "effects/gfx/D_09000080_3D4F10.gfx.inc.c" +#include "effects/gfx/D_09000128_3D4FB8.vtx.inc.c" +#include "effects/gfx/D_09000168_3D4FF8.gfx.inc.c" diff --git a/src/effects/gfx/gather_magic.c b/src/effects/gfx/gather_magic.c new file mode 100644 index 0000000000..35b5fed749 --- /dev/null +++ b/src/effects/gfx/gather_magic.c @@ -0,0 +1,9 @@ +#include "effects/gfx/D_09000000_38F710.png.inc.c" + +#include "effects/gfx/D_09000080_38F790.gfx.inc.c" + +#include "effects/gfx/D_09000128_38F838.vtx.inc.c" +#include "effects/gfx/D_09000168_38F878.vtx.inc.c" + +#include "effects/gfx/D_090001A8_38F8B8.gfx.inc.c" +#include "effects/gfx/D_090001C8_38F8D8.gfx.inc.c" diff --git a/src/effects/gfx/got_item_outline.c b/src/effects/gfx/got_item_outline.c new file mode 100644 index 0000000000..d0999beb67 --- /dev/null +++ b/src/effects/gfx/got_item_outline.c @@ -0,0 +1,16 @@ +#include "effects/gfx/D_09000000_345B40.png.inc.c" +#include "effects/gfx/D_09001000_346B40.png.inc.c" +#include "effects/gfx/D_09002000_347B40.png.inc.c" +#include "effects/gfx/D_09003000_348B40.png.inc.c" +#include "effects/gfx/D_09004000_349B40.png.inc.c" +#include "effects/gfx/D_09005000_34AB40.png.inc.c" +#include "effects/gfx/D_09006000_34BB40.png.inc.c" +#include "effects/gfx/D_09007000_34CB40.png.inc.c" + +#include "effects/gfx/D_09008000_34DB40.vtx.inc.c" + +#include "effects/gfx/D_09008100_34DC40.gfx.inc.c" +#include "effects/gfx/D_09008170_34DCB0.gfx.inc.c" +#include "effects/gfx/D_09008190_34DCD0.gfx.inc.c" +#include "effects/gfx/D_090081A8_34DCE8.gfx.inc.c" +#include "effects/gfx/D_090081C0_34DD00.gfx.inc.c" diff --git a/src/effects/gfx/green_impact.c b/src/effects/gfx/green_impact.c new file mode 100644 index 0000000000..3f70146a6c --- /dev/null +++ b/src/effects/gfx/green_impact.c @@ -0,0 +1,7 @@ +#include "effects/gfx/D_09000000_3659B0.png.inc.c" +#include "effects/gfx/D_09000200_365BB0.png.inc.c" + +#include "effects/gfx/D_09000400_365DB0.vtx.inc.c" + +#include "effects/gfx/D_09000540_365EF0.gfx.inc.c" +#include "effects/gfx/D_090005A0_365F50.gfx.inc.c" diff --git a/src/effects/gfx/landing_dust.c b/src/effects/gfx/landing_dust.c new file mode 100644 index 0000000000..72a6d4c120 --- /dev/null +++ b/src/effects/gfx/landing_dust.c @@ -0,0 +1,41 @@ +#include "effects/gfx/D_09000000_328EA0.png.inc.c" +#include "effects/gfx/D_09001000_329EA0.png.inc.c" +#include "effects/gfx/D_09001840_32A6E0.png.inc.c" + +#include "effects/gfx/D_09002640_32B4E0.vtx.inc.c" +#include "effects/gfx/D_09002680_32B520.vtx.inc.c" +#include "effects/gfx/D_090026C0_32B560.vtx.inc.c" +#include "effects/gfx/D_09002700_32B5A0.vtx.inc.c" +#include "effects/gfx/D_09002740_32B5E0.vtx.inc.c" + +#include "effects/gfx/D_09002780_32B620.gfx.inc.c" +#include "effects/gfx/D_09002868_32B708.gfx.inc.c" +#include "effects/gfx/D_09002950_32B7F0.gfx.inc.c" +#include "effects/gfx/D_09002A38_32B8D8.gfx.inc.c" +#include "effects/gfx/D_09002B20_32B9C0.gfx.inc.c" +#include "effects/gfx/D_09002B40_32B9E0.gfx.inc.c" +#include "effects/gfx/D_09002B60_32BA00.gfx.inc.c" +#include "effects/gfx/D_09002B80_32BA20.gfx.inc.c" + +#include "effects/gfx/D_09002BA0_32BA40.vtx.inc.c" + +#include "effects/gfx/D_09002C60_32BB00.gfx.inc.c" + +#include "effects/gfx/D_09002C90_32BB30.png.inc.c" +#include "effects/gfx/D_09002D10_32BBB0.png.inc.c" +#include "effects/gfx/D_09002D90_32BC30.png.inc.c" +#include "effects/gfx/D_09002E10_32BCB0.png.inc.c" +#include "effects/gfx/D_09002C90_32BB30.pal.inc.c" + +#include "effects/gfx/D_09002EB0_32BD50.vtx.inc.c" + +#include "effects/gfx/D_09002EF0_32BD90.gfx.inc.c" +#include "effects/gfx/D_09002F68_32BE08.gfx.inc.c" +#include "effects/gfx/D_09002FB0_32BE50.gfx.inc.c" +#include "effects/gfx/D_09003008_32BEA8.gfx.inc.c" +#include "effects/gfx/D_09003060_32BF00.gfx.inc.c" +#include "effects/gfx/D_090030B8_32BF58.gfx.inc.c" +#include "effects/gfx/D_09003110_32BFB0.gfx.inc.c" +#include "effects/gfx/D_09003168_32C008.gfx.inc.c" +#include "effects/gfx/D_090031C0_32C060.gfx.inc.c" +#include "effects/gfx/D_09003218_32C0B8.gfx.inc.c" diff --git a/src/effects/gfx/lil_oink.c b/src/effects/gfx/lil_oink.c new file mode 100644 index 0000000000..9034abf6f3 --- /dev/null +++ b/src/effects/gfx/lil_oink.c @@ -0,0 +1,127 @@ +#include "effects/gfx/D_09000000_3FF250.vtx.inc.c" +#include "effects/gfx/D_09000080_3FF2D0.vtx.inc.c" +#include "effects/gfx/D_090000A0_3FF2F0.vtx.inc.c" +#include "effects/gfx/D_090000E0_3FF330.vtx.inc.c" +#include "effects/gfx/D_090000F0_3FF340.vtx.inc.c" +#include "effects/gfx/D_09000140_3FF390.vtx.inc.c" +#include "effects/gfx/D_09000150_3FF3A0.vtx.inc.c" +#include "effects/gfx/D_09000190_3FF3E0.vtx.inc.c" +#include "effects/gfx/D_090001E0_3FF430.vtx.inc.c" +#include "effects/gfx/D_09000230_3FF480.vtx.inc.c" +#include "effects/gfx/D_09000250_3FF4A0.vtx.inc.c" +#include "effects/gfx/D_09000270_3FF4C0.vtx.inc.c" +#include "effects/gfx/D_09000280_3FF4D0.vtx.inc.c" +#include "effects/gfx/D_09000300_3FF550.vtx.inc.c" +#include "effects/gfx/D_09000390_3FF5E0.vtx.inc.c" +#include "effects/gfx/D_09000410_3FF660.vtx.inc.c" +#include "effects/gfx/D_090004A0_3FF6F0.vtx.inc.c" +#include "effects/gfx/D_090004C0_3FF710.vtx.inc.c" +#include "effects/gfx/D_09000520_3FF770.vtx.inc.c" +#include "effects/gfx/D_09000540_3FF790.vtx.inc.c" + +#include "effects/gfx/D_090005A0_3FF7F0.gfx.inc.c" +#include "effects/gfx/D_09000790_3FF9E0.gfx.inc.c" +#include "effects/gfx/D_09000980_3FFBD0.gfx.inc.c" +#include "effects/gfx/D_09000B50_3FFDA0.gfx.inc.c" +#include "effects/gfx/D_09000B70_3FFDC0.gfx.inc.c" +#include "effects/gfx/D_09000B80_3FFDD0.gfx.inc.c" +#include "effects/gfx/D_09000B90_3FFDE0.gfx.inc.c" + +#include "effects/gfx/D_09000B98_3FFDE8.vtx.inc.c" +#include "effects/gfx/D_09000C18_3FFE68.vtx.inc.c" +#include "effects/gfx/D_09000C38_3FFE88.vtx.inc.c" +#include "effects/gfx/D_09000C78_3FFEC8.vtx.inc.c" +#include "effects/gfx/D_09000C88_3FFED8.vtx.inc.c" +#include "effects/gfx/D_09000CD8_3FFF28.vtx.inc.c" +#include "effects/gfx/D_09000CE8_3FFF38.vtx.inc.c" +#include "effects/gfx/D_09000D28_3FFF78.vtx.inc.c" +#include "effects/gfx/D_09000D78_3FFFC8.vtx.inc.c" +#include "effects/gfx/D_09000DC8_400018.vtx.inc.c" +#include "effects/gfx/D_09000DE8_400038.vtx.inc.c" +#include "effects/gfx/D_09000E08_400058.vtx.inc.c" +#include "effects/gfx/D_09000E18_400068.vtx.inc.c" +#include "effects/gfx/D_09000E48_400098.vtx.inc.c" +#include "effects/gfx/D_09000E98_4000E8.vtx.inc.c" +#include "effects/gfx/D_09000EE8_400138.vtx.inc.c" +#include "effects/gfx/D_09000F38_400188.vtx.inc.c" +#include "effects/gfx/D_09000F78_4001C8.vtx.inc.c" +#include "effects/gfx/D_09000F88_4001D8.vtx.inc.c" +#include "effects/gfx/D_09000FA8_4001F8.vtx.inc.c" +#include "effects/gfx/D_09001038_400288.vtx.inc.c" +#include "effects/gfx/D_09001058_4002A8.vtx.inc.c" +#include "effects/gfx/D_09001068_4002B8.vtx.inc.c" +#include "effects/gfx/D_090010B8_400308.vtx.inc.c" +#include "effects/gfx/D_090010F8_400348.vtx.inc.c" + +#include "effects/gfx/D_09001178_4003C8.gfx.inc.c" +#include "effects/gfx/D_09001378_4005C8.gfx.inc.c" +#include "effects/gfx/D_09001578_4007C8.gfx.inc.c" +#include "effects/gfx/D_09001758_4009A8.gfx.inc.c" +#include "effects/gfx/D_09001778_4009C8.gfx.inc.c" +#include "effects/gfx/D_09001788_4009D8.gfx.inc.c" +#include "effects/gfx/D_09001798_4009E8.gfx.inc.c" + +u8 D_090017A8_4009F8[8] = {}; + +#include "effects/gfx/D_090017B0_400A00.png.inc.c" +#include "effects/gfx/D_090017B0_400A00.pal.inc.c" + +u8 D_09001810_400A60[0x1E0] = {}; + +#include "effects/gfx/D_090019F0_400C40.png.inc.c" +#include "effects/gfx/D_090019F0_400C40.pal.inc.c" + +u8 D_09001A50_400CA0[0x1E0] = {}; + +#include "effects/gfx/D_09001C30_400E80.png.inc.c" +#include "effects/gfx/D_09001C30_400E80.pal.inc.c" + +u8 D_09001C90_400EE0[0x1E0] = {}; + +#include "effects/gfx/D_09001E70_4010C0.png.inc.c" +#include "effects/gfx/D_09001E70_4010C0.pal.inc.c" + +u8 D_09001ED0_401120[0x1E0] = {}; + +#include "effects/gfx/D_090020B0_401300.png.inc.c" +#include "effects/gfx/D_090020B0_401300.pal.inc.c" + +u8 D_09002110_401360[0x1E0] = {}; + +#include "effects/gfx/D_090022F0_401540.png.inc.c" +#include "effects/gfx/D_090022F0_401540.pal.inc.c" + +u8 D_09002350_4015A0[0x1E0] = {}; + +#include "effects/gfx/D_09002530_401780.png.inc.c" +#include "effects/gfx/D_09002530_401780.pal.inc.c" + +u8 D_09002590_4017E0[0x1E0] = {}; + +#include "effects/gfx/D_09002770_4019C0.png.inc.c" +#include "effects/gfx/D_09002770_4019C0.pal.inc.c" + +u8 D_09002890_401AE0[0x1E0] = {}; + +#include "effects/gfx/D_09002A70_401CC0.png.inc.c" +#include "effects/gfx/D_09002A70_401CC0.pal.inc.c" + +u8 D_09002B90_401DE0[0x1E0] = {}; + +#include "effects/gfx/D_09002D70_401FC0.gfx.inc.c" +#include "effects/gfx/D_09002DD8_402028.gfx.inc.c" +#include "effects/gfx/D_09002E70_4020C0.gfx.inc.c" +#include "effects/gfx/D_09002E98_4020E8.gfx.inc.c" +#include "effects/gfx/D_09002F30_402180.gfx.inc.c" +#include "effects/gfx/D_09002FC8_402218.gfx.inc.c" +#include "effects/gfx/D_09003060_4022B0.gfx.inc.c" +#include "effects/gfx/D_090030F8_402348.gfx.inc.c" +#include "effects/gfx/D_09003190_4023E0.gfx.inc.c" +#include "effects/gfx/D_09003228_402478.gfx.inc.c" +#include "effects/gfx/D_090032C0_402510.gfx.inc.c" +#include "effects/gfx/D_09003358_4025A8.gfx.inc.c" +#include "effects/gfx/D_09003370_4025C0.gfx.inc.c" +#include "effects/gfx/D_09003388_4025D8.gfx.inc.c" +#include "effects/gfx/D_090033A0_4025F0.gfx.inc.c" +#include "effects/gfx/D_090033B8_402608.gfx.inc.c" +#include "effects/gfx/D_090033D0_402620.gfx.inc.c" diff --git a/src/effects/gfx/music_note.c b/src/effects/gfx/music_note.c new file mode 100644 index 0000000000..6467379df9 --- /dev/null +++ b/src/effects/gfx/music_note.c @@ -0,0 +1,26 @@ +#include "effects/gfx/D_09000000_35A5E0.png.inc.c" +#include "effects/gfx/D_09000100_35A6E0.png.inc.c" +#include "effects/gfx/D_09000200_35A7E0.png.inc.c" +#include "effects/gfx/D_09000300_35A8E0.png.inc.c" +#include "effects/gfx/D_09000400_35A9E0.png.inc.c" +#include "effects/gfx/D_09000500_35AAE0.png.inc.c" +#include "effects/gfx/D_09000600_35ABE0.png.inc.c" + +#include "effects/gfx/D_09000700_35ACE0.png.inc.c" +#include "effects/gfx/D_09000800_35ADE0.png.inc.c" +#include "effects/gfx/D_09000900_35AEE0.png.inc.c" +#include "effects/gfx/D_09000A00_35AFE0.png.inc.c" +#include "effects/gfx/D_09000B00_35B0E0.png.inc.c" +#include "effects/gfx/D_09000C00_35B1E0.png.inc.c" +#include "effects/gfx/D_09000D00_35B2E0.png.inc.c" + +#include "effects/gfx/D_09000E00_35B3E0.vtx.inc.c" + +#include "effects/gfx/D_09000FC0_35B5A0.gfx.inc.c" +#include "effects/gfx/D_09001038_35B618.gfx.inc.c" +#include "effects/gfx/D_090010C0_35B6A0.gfx.inc.c" +#include "effects/gfx/D_09001148_35B728.gfx.inc.c" +#include "effects/gfx/D_090011D0_35B7B0.gfx.inc.c" +#include "effects/gfx/D_09001258_35B838.gfx.inc.c" +#include "effects/gfx/D_090012E0_35B8C0.gfx.inc.c" +#include "effects/gfx/D_09001368_35B948.gfx.inc.c" diff --git a/src/effects/gfx/peach_star_beam.c b/src/effects/gfx/peach_star_beam.c index cda0df55e5..ee81d3f019 100644 --- a/src/effects/gfx/peach_star_beam.c +++ b/src/effects/gfx/peach_star_beam.c @@ -15,66 +15,48 @@ #include "effects/gfx/D_090003C0_3E62F0.gfx.inc.c" #include "effects/gfx/D_090003D0_3E6300.gfx.inc.c" -u8 D_090003E0_3E6310[] = { - 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 -}; +u8 D_090003E0_3E6310[8] = {}; #include "effects/gfx/D_090003E8_3E6318.png.inc.c" #include "effects/gfx/D_090005E8_3E6518.png.inc.c" #include "effects/gfx/D_090005E8_3E6518.pal.inc.c" -u8 D_09000808_3E6738[] = { - 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 -}; +u8 D_09000808_3E6738[0x1E0] = {}; #include "effects/gfx/D_090009E8_3E6918.png.inc.c" #include "effects/gfx/D_090009E8_3E6918.pal.inc.c" -u8 D_09001208_3E7138[] = { - 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 -}; +u8 D_09001208_3E7138[0x1E0] = {}; #include "effects/gfx/D_090013E8_3E7318.png.inc.c" #include "effects/gfx/D_090013E8_3E7318.pal.inc.c" -u8 D_09001C08_3E7B38[] = { - 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 -}; +u8 D_09001C08_3E7B38[0x1E0] = {}; #include "effects/gfx/D_09001DE8_3E7D18.png.inc.c" #include "effects/gfx/D_09001DE8_3E7D18.pal.inc.c" -u8 D_09002608_3E8538[] = { - 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 -}; +u8 D_09002608_3E8538[0x1E0] = {}; #include "effects/gfx/D_090027E8_3E8718.png.inc.c" #include "effects/gfx/D_090027E8_3E8718.pal.inc.c" -u8 D_09003008_3E8F38[] = { - 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 -}; +u8 D_09003008_3E8F38[0x1E0] = {}; #include "effects/gfx/D_090031E8_3E9118.png.inc.c" #include "effects/gfx/D_090031E8_3E9118.pal.inc.c" -u8 D_09003A08_3E9938[] = { - 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 -}; +u8 D_09003A08_3E9938[0x1E0] = {}; #include "effects/gfx/D_09003BE8_3E9B18.png.inc.c" #include "effects/gfx/D_09003BE8_3E9B18.pal.inc.c" -u8 D_09004408_3EA338[] = { - 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 -}; +u8 D_09004408_3EA338[0x1E0] = {}; #include "effects/gfx/D_090045E8_3EA518.png.inc.c" #include "effects/gfx/D_090045E8_3EA518.pal.inc.c" -u8 D_09004E08_3EAD38[] = { - 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 -}; +u8 D_09004E08_3EAD38[0x1E0] = {}; #include "effects/gfx/D_09004FE8_3EAF18.gfx.inc.c" #include "effects/gfx/D_09005090_3EAFC0.gfx.inc.c" diff --git a/src/effects/gfx/recover.c b/src/effects/gfx/recover.c new file mode 100644 index 0000000000..1fba55a408 --- /dev/null +++ b/src/effects/gfx/recover.c @@ -0,0 +1,49 @@ +#include "effects/gfx/D_09000000_381E00.png.inc.c" +#include "effects/gfx/D_09000200_382000.png.inc.c" +#include "effects/gfx/D_09000400_382200.png.inc.c" +#include "effects/gfx/D_09000600_382400.png.inc.c" +#include "effects/gfx/D_09000800_382600.png.inc.c" +#include "effects/gfx/D_09000A00_382800.png.inc.c" +#include "effects/gfx/D_09000C00_382A00.png.inc.c" +#include "effects/gfx/D_09000E00_382C00.png.inc.c" +#include "effects/gfx/D_09001000_382E00.png.inc.c" +#include "effects/gfx/D_09001200_383000.png.inc.c" +#include "effects/gfx/D_09001400_383200.png.inc.c" +#include "effects/gfx/D_09001600_383400.png.inc.c" +#include "effects/gfx/D_09001800_383600.png.inc.c" +#include "effects/gfx/D_09002000_383E00.png.inc.c" +#include "effects/gfx/D_09002800_384600.png.inc.c" + +#include "effects/gfx/D_09003000_384E00.vtx.inc.c" +#include "effects/gfx/D_09003040_384E40.vtx.inc.c" +#include "effects/gfx/D_09003080_384E80.vtx.inc.c" +#include "effects/gfx/D_090030C0_384EC0.vtx.inc.c" +#include "effects/gfx/D_09003100_384F00.vtx.inc.c" +#include "effects/gfx/D_09003140_384F40.vtx.inc.c" +#include "effects/gfx/D_09003180_384F80.vtx.inc.c" +#include "effects/gfx/D_090031C0_384FC0.vtx.inc.c" + +#include "effects/gfx/D_09003200_385000.gfx.inc.c" +#include "effects/gfx/D_09003298_385098.gfx.inc.c" +#include "effects/gfx/D_09003330_385130.gfx.inc.c" +#include "effects/gfx/D_090033D0_3851D0.gfx.inc.c" +#include "effects/gfx/D_090033F0_3851F0.gfx.inc.c" +#include "effects/gfx/D_09003410_385210.gfx.inc.c" +#include "effects/gfx/D_09003430_385230.gfx.inc.c" +#include "effects/gfx/D_09003450_385250.gfx.inc.c" +#include "effects/gfx/D_09003470_385270.gfx.inc.c" +#include "effects/gfx/D_09003490_385290.gfx.inc.c" +#include "effects/gfx/D_090034B0_3852B0.gfx.inc.c" +#include "effects/gfx/D_090034D0_3852D0.gfx.inc.c" +#include "effects/gfx/D_09003540_385340.gfx.inc.c" +#include "effects/gfx/D_09003580_385380.gfx.inc.c" +#include "effects/gfx/D_090035C0_3853C0.gfx.inc.c" +#include "effects/gfx/D_09003600_385400.gfx.inc.c" +#include "effects/gfx/D_09003640_385440.gfx.inc.c" +#include "effects/gfx/D_09003680_385480.gfx.inc.c" +#include "effects/gfx/D_090036C0_3854C0.gfx.inc.c" +#include "effects/gfx/D_09003700_385500.gfx.inc.c" +#include "effects/gfx/D_09003740_385540.gfx.inc.c" +#include "effects/gfx/D_09003780_385580.gfx.inc.c" +#include "effects/gfx/D_090037C0_3855C0.gfx.inc.c" +#include "effects/gfx/D_09003800_385600.gfx.inc.c" diff --git a/src/effects/gfx/throw_spiny.c b/src/effects/gfx/throw_spiny.c index 13a59463fc..90427766c8 100644 --- a/src/effects/gfx/throw_spiny.c +++ b/src/effects/gfx/throw_spiny.c @@ -3,16 +3,12 @@ #include "effects/gfx/D_09000000_3CFAF0.png.inc.c" #include "effects/gfx/D_09000000_3CFAF0.pal.inc.c" -u8 D_09000220_3CFD10[] = { - 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 -}; +u8 D_09000220_3CFD10[0x1E0] = {}; #include "effects/gfx/D_09000400_3CFEF0.png.inc.c" #include "effects/gfx/D_09000400_3CFEF0.pal.inc.c" -u8 D_09000620_3D0110[] = { - 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 -}; +u8 D_09000620_3D0110[0x1E0] = {}; #include "effects/gfx/D_09000800_3D02F0.gfx.inc.c" #include "effects/gfx/D_090008D8_3D03C8.gfx.inc.c" diff --git a/src/effects/got_item_outline.c b/src/effects/got_item_outline.c index 5b3021e8f1..1f8b7ad7d5 100644 --- a/src/effects/got_item_outline.c +++ b/src/effects/got_item_outline.c @@ -1,9 +1,9 @@ #include "common.h" #include "effects_internal.h" -extern char D_09000000[][0x1000]; -extern char D_09004000[][0x1000]; -extern Gfx D_09008100[]; +extern char D_09000000_345B40[][0x1000]; +extern char D_09004000_349B40[][0x1000]; +extern Gfx D_09008100_34DC40[]; extern Gfx* D_E0036630[]; extern u8 D_E0036640[]; extern u8 D_E0036648[]; @@ -110,7 +110,7 @@ void got_item_outline_appendGfx(void* effect) { if (unk_18 != 0.0f) { gDPPipeSync(gMasterGfxPos++); gSPSegment(gMasterGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); - gSPDisplayList(gMasterGfxPos++, D_09008100); + gSPDisplayList(gMasterGfxPos++, D_09008100_34DC40); if (unk_00 == 0) { gDPSetPrimColor(gMasterGfxPos++, 0, 0, 255, 255, 255, data->unk_1C); @@ -138,9 +138,9 @@ void got_item_outline_appendGfx(void* effect) { char* temp; if (unk_00 == 0) { - temp = D_09000000[i]; + temp = D_09000000_345B40[i]; } else { - temp = D_09004000[i]; + temp = D_09004000_349B40[i]; } gDPSetTextureImage(gMasterGfxPos++, G_IM_FMT_IA, G_IM_SIZ_8b, 128, temp); diff --git a/src/effects/green_impact.c b/src/effects/green_impact.c index 0a8b71a5d5..fafe36c8a5 100644 --- a/src/effects/green_impact.c +++ b/src/effects/green_impact.c @@ -1,7 +1,7 @@ #include "common.h" #include "effects_internal.h" -extern Gfx D_09000540[]; +extern Gfx D_09000540_365EF0[]; extern Gfx* D_E0064A60[]; void green_impact_init(EffectInstance* effect); @@ -190,7 +190,7 @@ void green_impact_appendGfx(void* effect) { shim_guMtxCatF(sp60, sp20, sp20); shim_guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]); - dlist2 = D_09000540; + dlist2 = D_09000540_365EF0; gDPSetTileSize(gMasterGfxPos++, G_TX_RENDERTILE, 0, (s32) part->unk_3C, 252, (s32) part->unk_3C + 124); gDPSetTileSize(gMasterGfxPos++, 1, 0, (s32) part->unk_44, 124, (s32) part->unk_44 + 124); diff --git a/src/effects/landing_dust.c b/src/effects/landing_dust.c index 208a724575..4ab40b2f46 100644 --- a/src/effects/landing_dust.c +++ b/src/effects/landing_dust.c @@ -1,16 +1,16 @@ #include "common.h" #include "effects_internal.h" -extern Gfx D_09002780[]; -extern Gfx D_09002868[]; -extern Gfx D_09002950[]; -extern Gfx D_09002A38[]; -extern Gfx D_09002B20[]; -extern Gfx D_09002B40[]; -extern Gfx D_09002B60[]; +extern Gfx D_09002780_32B620[]; +extern Gfx D_09002868_32B708[]; +extern Gfx D_09002950_32B7F0[]; +extern Gfx D_09002A38_32B8D8[]; +extern Gfx D_09002B20_32B9C0[]; +extern Gfx D_09002B40_32B9E0[]; +extern Gfx D_09002B60_32BA00[]; -static Gfx* sDlists[] = { D_09002B20, D_09002B40, D_09002B60, D_09002B60, D_09002B60 }; -static Gfx* sDlists2[] = { D_09002780, D_09002868, D_09002950, D_09002A38, D_09002A38 }; +static Gfx* sDlists[] = { D_09002B20_32B9C0, D_09002B40_32B9E0, D_09002B60_32BA00, D_09002B60_32BA00, D_09002B60_32BA00 }; +static Gfx* sDlists2[] = { D_09002780_32B620, D_09002868_32B708, D_09002950_32B7F0, D_09002A38_32B8D8, D_09002A38_32B8D8 }; static s8 D_E000CC38[] = { 0x00, 0x01, 0x02, 0x1A, 0x03, 0x1B, 0x04, 0x1C, 0x05, 0x15, 0x35, 0x46, 0x46, 0x46, 0xFF, 0x00 }; diff --git a/src/effects/lil_oink.c b/src/effects/lil_oink.c index 1bd320366e..65145e51c4 100644 --- a/src/effects/lil_oink.c +++ b/src/effects/lil_oink.c @@ -6,37 +6,37 @@ void lil_oink_init(EffectInstance* effect); void lil_oink_update(EffectInstance* effect); void lil_oink_render(EffectInstance* effect); -extern Gfx D_09002D70[]; -extern Gfx D_09002DD8[]; -extern Gfx D_09002E70[]; -extern Gfx D_09002E98[]; -extern Gfx D_09002F30[]; -extern Gfx D_09002FC8[]; -extern Gfx D_09003060[]; -extern Gfx D_090030F8[]; -extern Gfx D_09003190[]; -extern Gfx D_09003228[]; -extern Gfx D_090032C0[]; -extern Gfx D_09003358[]; -extern Gfx D_09003370[]; -extern Gfx D_09003388[]; +extern Gfx D_09002D70_401FC0[]; +extern Gfx D_09002DD8_402028[]; +extern Gfx D_09002E70_4020C0[]; +extern Gfx D_09002E98_4020E8[]; +extern Gfx D_09002F30_402180[]; +extern Gfx D_09002FC8_402218[]; +extern Gfx D_09003060_4022B0[]; +extern Gfx D_090030F8_402348[]; +extern Gfx D_09003190_4023E0[]; +extern Gfx D_09003228_402478[]; +extern Gfx D_090032C0_402510[]; +extern Gfx D_09003358_4025A8[]; +extern Gfx D_09003370_4025C0[]; +extern Gfx D_09003388_4025D8[]; Gfx* D_E01146A0[] = { - D_09003358, D_09003370, D_09003388, - D_09003358, D_09003370, D_09003388, - D_09003358, D_09003370, D_09003388, - D_09003358, D_09003370, D_09003388, - D_09003358, D_09003370, D_09003388, - D_09003358, D_09003370, D_09003388, - D_09003358, D_09003370, D_09003388, - D_09003358, D_09003370, D_09003388, - D_09003358, D_09003370, D_09003388, - D_09003358, D_09003370, D_09003388 + D_09003358_4025A8, D_09003370_4025C0, D_09003388_4025D8, + D_09003358_4025A8, D_09003370_4025C0, D_09003388_4025D8, + D_09003358_4025A8, D_09003370_4025C0, D_09003388_4025D8, + D_09003358_4025A8, D_09003370_4025C0, D_09003388_4025D8, + D_09003358_4025A8, D_09003370_4025C0, D_09003388_4025D8, + D_09003358_4025A8, D_09003370_4025C0, D_09003388_4025D8, + D_09003358_4025A8, D_09003370_4025C0, D_09003388_4025D8, + D_09003358_4025A8, D_09003370_4025C0, D_09003388_4025D8, + D_09003358_4025A8, D_09003370_4025C0, D_09003388_4025D8, + D_09003358_4025A8, D_09003370_4025C0, D_09003388_4025D8 }; Gfx* D_E0114718[] = { - D_09002DD8, D_09002E70, D_09002E98, D_09002F30, D_09002FC8, D_09003060, D_090030F8, D_09003190, D_09003228, - D_090032C0 + D_09002DD8_402028, D_09002E70_4020C0, D_09002E98_4020E8, D_09002F30_402180, D_09002FC8_402218, + D_09003060_4022B0, D_090030F8_402348, D_09003190_4023E0, D_09003228_402478, D_090032C0_402510 }; s8 D_E0114740[] = { 1, 2, 1, 0 }; @@ -170,7 +170,7 @@ void lil_oink_appendGfx(void* effect) { gDPPipeSync(gMasterGfxPos++); gSPSegment(gMasterGfxPos++, 0x9, VIRTUAL_TO_PHYSICAL(eff->graphics->data)); - gSPDisplayList(gMasterGfxPos++, D_09002D70); + gSPDisplayList(gMasterGfxPos++, D_09002D70_401FC0); gSPLookAt(gMasterGfxPos++, &gDisplayContext->lookAt); for (i = 0; i < MAX_LIL_OINKS; i++) { diff --git a/src/effects/music_note.c b/src/effects/music_note.c index 2d7ba0e7c8..1a389bdcc8 100644 --- a/src/effects/music_note.c +++ b/src/effects/music_note.c @@ -6,15 +6,16 @@ void music_note_init(EffectInstance* effect); void music_note_update(EffectInstance* effect); void music_note_render(EffectInstance* effect); -extern Gfx D_09001038[]; -extern Gfx D_090010C0[]; -extern Gfx D_09001148[]; -extern Gfx D_090011D0[]; -extern Gfx D_09001258[]; -extern Gfx D_090012E0[]; -extern Gfx D_09001368[]; +extern Gfx D_09001038_35B618[]; +extern Gfx D_090010C0_35B6A0[]; +extern Gfx D_09001148_35B728[]; +extern Gfx D_090011D0_35B7B0[]; +extern Gfx D_09001258_35B838[]; +extern Gfx D_090012E0_35B8C0[]; +extern Gfx D_09001368_35B948[]; -Gfx* D_E004C660[] = { D_09001038, D_090010C0, D_09001148, D_090011D0, D_09001258, D_090012E0, D_09001368 }; +Gfx* D_E004C660[] = { D_09001038_35B618, D_090010C0_35B6A0, D_09001148_35B728, D_090011D0_35B7B0, + D_09001258_35B838, D_090012E0_35B8C0, D_09001368_35B948 }; s8 D_E004C67C[] = { 0xFE, 0xAC, 0xAC, 0xFE, 0xAC, 0xD5, 0xFE, 0xB4, 0x9A, 0xD5, 0xB4, 0xFE, 0xB4, 0xB4, 0xFE, 0xB4, 0xDD, 0xFE, 0xB4, 0xFE, 0xFE, 0xB4, 0xFE, 0xD5, 0xB4, 0xFE, 0xB4, 0xD5, 0xFE, 0xB4, 0xFE, 0xFE, 0xB4, 0xFE, 0xD5, 0xAC, }; diff --git a/src/effects/recover.c b/src/effects/recover.c index 7c9d70644a..86ba86fee7 100644 --- a/src/effects/recover.c +++ b/src/effects/recover.c @@ -3,20 +3,23 @@ void func_E0080448(EffectInstance* effect); -extern Gfx D_09003540[]; -extern Gfx D_09003580[]; -extern Gfx D_090035C0[]; -extern Gfx D_09003600[]; -extern Gfx D_09003640[]; -extern Gfx D_09003680[]; -extern Gfx D_090036C0[]; -extern Gfx D_09003700[]; -extern Gfx D_09003740[]; -extern Gfx D_09003780[]; -extern Gfx D_090037C0[]; -extern Gfx D_09003800[]; +extern Gfx D_09003540_385340[]; +extern Gfx D_09003580_385380[]; +extern Gfx D_090035C0_3853C0[]; +extern Gfx D_09003600_385400[]; +extern Gfx D_09003640_385440[]; +extern Gfx D_09003680_385480[]; +extern Gfx D_090036C0_3854C0[]; +extern Gfx D_09003700_385500[]; +extern Gfx D_09003740_385540[]; +extern Gfx D_09003780_385580[]; +extern Gfx D_090037C0_3855C0[]; +extern Gfx D_09003800_385600[]; -Gfx* D_E0080AC0[] = { D_09003540, D_09003580, D_090035C0, D_09003600, D_09003640, D_09003680, D_090036C0, D_09003700, D_09003740, D_09003780, D_090037C0, D_09003800, }; +Gfx* D_E0080AC0[] = { D_09003540_385340, D_09003580_385380, D_090035C0_3853C0, + D_09003600_385400, D_09003640_385440, D_09003680_385480, + D_090036C0_3854C0, D_09003700_385500, D_09003740_385540, + D_09003780_385580, D_090037C0_3855C0, D_09003800_385600, }; f32 D_E0080AF0[] = { 0.25f, 0.5f, 0.75f, 1.0f, 0.9f, 1.1f, 1.0f }; diff --git a/src/effects/stars_burst.c b/src/effects/stars_burst.c index 328197fabb..30ca333938 100644 --- a/src/effects/stars_burst.c +++ b/src/effects/stars_burst.c @@ -1,14 +1,105 @@ #include "common.h" #include "effects_internal.h" +extern Gfx D_090004C0_343500[]; +extern Gfx D_090005E0_343620[]; +extern u8 D_E0042780[]; + +void stars_burst_init(EffectInstance* effect); +void stars_burst_update(EffectInstance* effect); +void stars_burst_render(EffectInstance* effect); void stars_burst_appendGfx(void* effect); -INCLUDE_ASM(s32, "effects/stars_burst", stars_burst_main); +void stars_burst_main( + s32 arg0, + f32 arg1, + f32 arg2, + f32 arg3, + f32 arg4, + f32 arg5, + s32 arg6 +) { + EffectBlueprint bp; + EffectBlueprint* bpPtr = &bp; + EffectInstance* effect; + StarsBurstFXData* part; + Matrix4f unused; + s32 numParts = arg6; + f32 temp; + s32 i; -void stars_burst_init(void) { + if (arg6 != 0) { + numParts++; + + bpPtr->init = stars_burst_init; + bpPtr->update = stars_burst_update; + bpPtr->renderWorld = stars_burst_render; + bpPtr->unk_00 = 0; + bpPtr->unk_14 = NULL; + bpPtr->effectID = EFFECT_STARS_BURST; + + effect = shim_create_effect_instance(bpPtr); + effect->numParts = numParts; + part = effect->data.starsBurst = shim_general_heap_malloc(numParts * sizeof(*part)); + ASSERT(effect->data.starsBurst != NULL); + + part->unk_00 = arg0; + part->unk_04 = arg1; + part->unk_08 = arg2; + part->unk_0C = arg3; + part->unk_34 = 0; + part->unk_30 = 30; + part->unk_2C = 255; + + part++; + for (i = 1; i < numParts; i++, part++) { + temp = shim_rand_int(10) * 0.25f + 5.0f; + + part->unk_00 = arg0; + part->unk_04 = arg1; + part->unk_08 = arg2; + part->unk_0C = arg3; + part->unk_10 = shim_cos_deg(arg5 + (i & 2) * (i / 2) * 4) * shim_sin_deg(arg4); + part->unk_14 = shim_sin_deg(arg5 + (i & 2) * (i / 2) * 4); + part->unk_18 = shim_cos_deg(arg5 + (i & 2) * (i / 2) * 4) * shim_cos_deg(arg4); + part->unk_28 = temp; + part->unk_24 = temp / 10.0; + } + } } -INCLUDE_ASM(s32, "effects/stars_burst", stars_burst_update); +void stars_burst_init(EffectInstance* effect) { +} + +void stars_burst_update(EffectInstance* effect) { + StarsBurstFXData* part = effect->data.starsBurst; + s32 unk_30; + s32 i; + + part->unk_30--; + part->unk_34++; + + if (part->unk_30 < 0) { + shim_remove_effect(effect); + return; + } + + unk_30 = part->unk_30; + if (unk_30 < 10) { + part->unk_2C *= 0.8; + } + + part++; + for (i = 1; i < effect->numParts; i++, part++) { + part->unk_04 += part->unk_28 * part->unk_10; + part->unk_08 += part->unk_28 * part->unk_14; + part->unk_0C += part->unk_28 * part->unk_18; + part->unk_28 *= 0.9; + if (unk_30 < 10) { + part->unk_24 += part->unk_28 / 10.0; + } + } +} void stars_burst_render(EffectInstance* effect) { RenderTask renderTask; @@ -23,4 +114,41 @@ void stars_burst_render(EffectInstance* effect) { retTask->renderMode |= RENDER_TASK_FLAG_2; } -INCLUDE_ASM(s32, "effects/stars_burst", stars_burst_appendGfx); +void stars_burst_appendGfx(void* effect) { + StarsBurstFXData* part = ((EffectInstance*)effect)->data.starsBurst; + Gfx* dlist = D_090005E0_343620; + s32 unk_2C; + Matrix4f sp18; + Matrix4f sp58; + s32 baseIdx; + s32 i; + + gDPPipeSync(gMasterGfxPos++); + gSPSegment(gMasterGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); + gSPDisplayList(gMasterGfxPos++, D_090004C0_343500); + + unk_2C = part->unk_2C; + + baseIdx = (part->unk_34 - 1) * 3; + baseIdx %= 36; + + part++; + for (i = 1; i < ((EffectInstance*)effect)->numParts; i++, part++) { + s32 rIdx = baseIdx + i * 3; + s32 gIdx = baseIdx + 1 + i * 3; + s32 bIdx = baseIdx + 2 + i * 3; + + gDPSetPrimColor(gMasterGfxPos++, 0, 0, D_E0042780[rIdx % 36], D_E0042780[gIdx % 36], D_E0042780[bIdx % 36], unk_2C); + + shim_guTranslateF(sp18, part->unk_04, part->unk_08, part->unk_0C); + shim_guRotateF(sp58, -gCameras[gCurrentCameraID].currentYaw, 0.0f, 1.0f, 0.0f); + shim_guMtxCatF(sp58, sp18, sp18); + shim_guScaleF(sp58, part->unk_24, part->unk_24, 1.0f); + shim_guMtxCatF(sp58, sp18, sp18); + shim_guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); + + gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); + gSPDisplayList(gMasterGfxPos++, dlist); + gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); + } +} diff --git a/src/effects/walking_dust.c b/src/effects/walking_dust.c index 3e19b7324f..246215086e 100644 --- a/src/effects/walking_dust.c +++ b/src/effects/walking_dust.c @@ -7,11 +7,11 @@ s8 D_E000E670[20] = { 0, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6, 6, 7, 7, 7, -1, 0, 0, s8* D_E000E684[2] = { D_E000E660, D_E000E670 }; -extern Gfx D_09002780[]; -extern Gfx D_09002868[]; -extern Gfx D_09002950[]; -extern Gfx D_09002B20[]; -extern Gfx D_09002B40[]; +extern Gfx D_09002780_32B620[]; +extern Gfx D_09002868_32B708[]; +extern Gfx D_09002950_32B7F0[]; +extern Gfx D_09002B20_32B9C0[]; +extern Gfx D_09002B40_32B9E0[]; void walking_dust_init(EffectInstance* effect); void walking_dust_update(EffectInstance* effect); @@ -108,20 +108,20 @@ void walking_dust_appendGfx(void* effect) { s32 i; if (temp_t3 == 0) { - dlist2 = D_09002B20; + dlist2 = D_09002B20_32B9C0; } else { - dlist2 = D_09002B40; + dlist2 = D_09002B40_32B9E0; } switch (temp_t3) { case 1: - dlist = D_09002868; + dlist = D_09002868_32B708; break; default: - dlist = D_09002950; + dlist = D_09002950_32B7F0; break; case 0: - dlist = D_09002780; + dlist = D_09002780_32B620; break; } diff --git a/ver/us/asm/nonmatchings/effects/stars_burst/stars_burst_appendGfx.s b/ver/us/asm/nonmatchings/effects/stars_burst/stars_burst_appendGfx.s deleted file mode 100644 index 71ec6c34ff..0000000000 --- a/ver/us/asm/nonmatchings/effects/stars_burst/stars_burst_appendGfx.s +++ /dev/null @@ -1,248 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel stars_burst_appendGfx -/* 354B58 E00423B8 27BDFF28 */ addiu $sp, $sp, -0xd8 -/* 354B5C E00423BC 3C05DB06 */ lui $a1, 0xdb06 -/* 354B60 E00423C0 34A50024 */ ori $a1, $a1, 0x24 -/* 354B64 E00423C4 3C0638E3 */ lui $a2, 0x38e3 -/* 354B68 E00423C8 34C68E39 */ ori $a2, $a2, 0x8e39 -/* 354B6C E00423CC 3C08800A */ lui $t0, %hi(gMasterGfxPos) -/* 354B70 E00423D0 2508A66C */ addiu $t0, $t0, %lo(gMasterGfxPos) -/* 354B74 E00423D4 3C02E700 */ lui $v0, 0xe700 -/* 354B78 E00423D8 AFBF00C4 */ sw $ra, 0xc4($sp) -/* 354B7C E00423DC AFBE00C0 */ sw $fp, 0xc0($sp) -/* 354B80 E00423E0 AFB700BC */ sw $s7, 0xbc($sp) -/* 354B84 E00423E4 AFB600B8 */ sw $s6, 0xb8($sp) -/* 354B88 E00423E8 AFB500B4 */ sw $s5, 0xb4($sp) -/* 354B8C E00423EC AFB400B0 */ sw $s4, 0xb0($sp) -/* 354B90 E00423F0 AFB300AC */ sw $s3, 0xac($sp) -/* 354B94 E00423F4 AFB200A8 */ sw $s2, 0xa8($sp) -/* 354B98 E00423F8 AFB100A4 */ sw $s1, 0xa4($sp) -/* 354B9C E00423FC AFB000A0 */ sw $s0, 0xa0($sp) -/* 354BA0 E0042400 F7B600D0 */ sdc1 $f22, 0xd0($sp) -/* 354BA4 E0042404 F7B400C8 */ sdc1 $f20, 0xc8($sp) -/* 354BA8 E0042408 AFA400D8 */ sw $a0, 0xd8($sp) -/* 354BAC E004240C 8D040000 */ lw $a0, ($t0) -/* 354BB0 E0042410 8FA900D8 */ lw $t1, 0xd8($sp) -/* 354BB4 E0042414 0080182D */ daddu $v1, $a0, $zero -/* 354BB8 E0042418 8D27000C */ lw $a3, 0xc($t1) -/* 354BBC E004241C 24840008 */ addiu $a0, $a0, 8 -/* 354BC0 E0042420 AC620000 */ sw $v0, ($v1) -/* 354BC4 E0042424 AC600004 */ sw $zero, 4($v1) -/* 354BC8 E0042428 AC850000 */ sw $a1, ($a0) -/* 354BCC E004242C 8D220010 */ lw $v0, 0x10($t1) -/* 354BD0 E0042430 24150001 */ addiu $s5, $zero, 1 -/* 354BD4 E0042434 AD040000 */ sw $a0, ($t0) -/* 354BD8 E0042438 8C43001C */ lw $v1, 0x1c($v0) -/* 354BDC E004243C 3C02DE00 */ lui $v0, 0xde00 -/* 354BE0 E0042440 AC820008 */ sw $v0, 8($a0) -/* 354BE4 E0042444 3C020900 */ lui $v0, 0x900 -/* 354BE8 E0042448 244204C0 */ addiu $v0, $v0, 0x4c0 -/* 354BEC E004244C AC82000C */ sw $v0, 0xc($a0) -/* 354BF0 E0042450 3C028000 */ lui $v0, 0x8000 -/* 354BF4 E0042454 00621821 */ addu $v1, $v1, $v0 -/* 354BF8 E0042458 AC830004 */ sw $v1, 4($a0) -/* 354BFC E004245C 24830008 */ addiu $v1, $a0, 8 -/* 354C00 E0042460 8CE20034 */ lw $v0, 0x34($a3) -/* 354C04 E0042464 24840010 */ addiu $a0, $a0, 0x10 -/* 354C08 E0042468 AD030000 */ sw $v1, ($t0) -/* 354C0C E004246C 2442FFFF */ addiu $v0, $v0, -1 -/* 354C10 E0042470 02A21804 */ sllv $v1, $v0, $s5 -/* 354C14 E0042474 00629821 */ addu $s3, $v1, $v0 -/* 354C18 E0042478 02660018 */ mult $s3, $a2 -/* 354C1C E004247C AD040000 */ sw $a0, ($t0) -/* 354C20 E0042480 8CE9002C */ lw $t1, 0x2c($a3) -/* 354C24 E0042484 001317C3 */ sra $v0, $s3, 0x1f -/* 354C28 E0042488 AFA90098 */ sw $t1, 0x98($sp) -/* 354C2C E004248C 00004810 */ mfhi $t1 -/* 354C30 E0042490 000918C3 */ sra $v1, $t1, 3 -/* 354C34 E0042494 00621823 */ subu $v1, $v1, $v0 -/* 354C38 E0042498 000310C0 */ sll $v0, $v1, 3 -/* 354C3C E004249C 00431021 */ addu $v0, $v0, $v1 -/* 354C40 E00424A0 00021080 */ sll $v0, $v0, 2 -/* 354C44 E00424A4 8FA900D8 */ lw $t1, 0xd8($sp) -/* 354C48 E00424A8 02629823 */ subu $s3, $s3, $v0 -/* 354C4C E00424AC 8D220008 */ lw $v0, 8($t1) -/* 354C50 E00424B0 02A2102A */ slt $v0, $s5, $v0 -/* 354C54 E00424B4 104000A1 */ beqz $v0, .LE004273C -/* 354C58 E00424B8 24E70038 */ addiu $a3, $a3, 0x38 -/* 354C5C E00424BC 0100A02D */ daddu $s4, $t0, $zero -/* 354C60 E00424C0 3C1E38E3 */ lui $fp, 0x38e3 -/* 354C64 E00424C4 37DE8E39 */ ori $fp, $fp, 0x8e39 -/* 354C68 E00424C8 27B20058 */ addiu $s2, $sp, 0x58 -/* 354C6C E00424CC 3C090001 */ lui $t1, 1 -/* 354C70 E00424D0 35291630 */ ori $t1, $t1, 0x1630 -/* 354C74 E00424D4 24F00024 */ addiu $s0, $a3, 0x24 -/* 354C78 E00424D8 24170005 */ addiu $s7, $zero, 5 -/* 354C7C E00424DC 24160004 */ addiu $s6, $zero, 4 -/* 354C80 E00424E0 4480B000 */ mtc1 $zero, $f22 -/* 354C84 E00424E4 3C013F80 */ lui $at, 0x3f80 -/* 354C88 E00424E8 4481A000 */ mtc1 $at, $f20 -/* 354C8C E00424EC 26710003 */ addiu $s1, $s3, 3 -/* 354C90 E00424F0 AFA9009C */ sw $t1, 0x9c($sp) -.LE00424F4: -/* 354C94 E00424F4 27A40018 */ addiu $a0, $sp, 0x18 -/* 354C98 E00424F8 02773821 */ addu $a3, $s3, $s7 -/* 354C9C E00424FC 26F70003 */ addiu $s7, $s7, 3 -/* 354CA0 E0042500 02763021 */ addu $a2, $s3, $s6 -/* 354CA4 E0042504 26D60003 */ addiu $s6, $s6, 3 -/* 354CA8 E0042508 26B50001 */ addiu $s5, $s5, 1 -/* 354CAC E004250C 8E820000 */ lw $v0, ($s4) -/* 354CB0 E0042510 023E0018 */ mult $s1, $fp -/* 354CB4 E0042514 0040402D */ daddu $t0, $v0, $zero -/* 354CB8 E0042518 24420008 */ addiu $v0, $v0, 8 -/* 354CBC E004251C AE820000 */ sw $v0, ($s4) -/* 354CC0 E0042520 3C02FA00 */ lui $v0, 0xfa00 -/* 354CC4 E0042524 AD020000 */ sw $v0, ($t0) -/* 354CC8 E0042528 001117C3 */ sra $v0, $s1, 0x1f -/* 354CCC E004252C 00004810 */ mfhi $t1 -/* 354CD0 E0042530 000918C3 */ sra $v1, $t1, 3 -/* 354CD4 E0042534 00621823 */ subu $v1, $v1, $v0 -/* 354CD8 E0042538 000328C0 */ sll $a1, $v1, 3 -/* 354CDC E004253C 00A32821 */ addu $a1, $a1, $v1 -/* 354CE0 E0042540 00052880 */ sll $a1, $a1, 2 -/* 354CE4 E0042544 02252823 */ subu $a1, $s1, $a1 -/* 354CE8 E0042548 3C09E004 */ lui $t1, %hi(D_E0042780) -/* 354CEC E004254C 25292780 */ addiu $t1, $t1, %lo(D_E0042780) -/* 354CF0 E0042550 00DE0018 */ mult $a2, $fp -/* 354CF4 E0042554 00A92821 */ addu $a1, $a1, $t1 -/* 354CF8 E0042558 90A50000 */ lbu $a1, ($a1) -/* 354CFC E004255C 000617C3 */ sra $v0, $a2, 0x1f -/* 354D00 E0042560 00052E00 */ sll $a1, $a1, 0x18 -/* 354D04 E0042564 00004810 */ mfhi $t1 -/* 354D08 E0042568 000918C3 */ sra $v1, $t1, 3 -/* 354D0C E004256C 00621823 */ subu $v1, $v1, $v0 -/* 354D10 E0042570 000310C0 */ sll $v0, $v1, 3 -/* 354D14 E0042574 00431021 */ addu $v0, $v0, $v1 -/* 354D18 E0042578 00021080 */ sll $v0, $v0, 2 -/* 354D1C E004257C 00C23023 */ subu $a2, $a2, $v0 -/* 354D20 E0042580 3C09E004 */ lui $t1, %hi(D_E0042780) -/* 354D24 E0042584 25292780 */ addiu $t1, $t1, %lo(D_E0042780) -/* 354D28 E0042588 00C93021 */ addu $a2, $a2, $t1 -/* 354D2C E004258C 00FE0018 */ mult $a3, $fp -/* 354D30 E0042590 90C60000 */ lbu $a2, ($a2) -/* 354D34 E0042594 000717C3 */ sra $v0, $a3, 0x1f -/* 354D38 E0042598 00063400 */ sll $a2, $a2, 0x10 -/* 354D3C E004259C 00A62825 */ or $a1, $a1, $a2 -/* 354D40 E00425A0 00004810 */ mfhi $t1 -/* 354D44 E00425A4 000918C3 */ sra $v1, $t1, 3 -/* 354D48 E00425A8 00621823 */ subu $v1, $v1, $v0 -/* 354D4C E00425AC 000310C0 */ sll $v0, $v1, 3 -/* 354D50 E00425B0 00431021 */ addu $v0, $v0, $v1 -/* 354D54 E00425B4 00021080 */ sll $v0, $v0, 2 -/* 354D58 E00425B8 00E23823 */ subu $a3, $a3, $v0 -/* 354D5C E00425BC 3C09E004 */ lui $t1, %hi(D_E0042780) -/* 354D60 E00425C0 25292780 */ addiu $t1, $t1, %lo(D_E0042780) -/* 354D64 E00425C4 00E93821 */ addu $a3, $a3, $t1 -/* 354D68 E00425C8 90E20000 */ lbu $v0, ($a3) -/* 354D6C E00425CC 8FA90098 */ lw $t1, 0x98($sp) -/* 354D70 E00425D0 00021200 */ sll $v0, $v0, 8 -/* 354D74 E00425D4 00A22825 */ or $a1, $a1, $v0 -/* 354D78 E00425D8 312200FF */ andi $v0, $t1, 0xff -/* 354D7C E00425DC 00A22825 */ or $a1, $a1, $v0 -/* 354D80 E00425E0 AD050004 */ sw $a1, 4($t0) -/* 354D84 E00425E4 8E05FFE0 */ lw $a1, -0x20($s0) -/* 354D88 E00425E8 8E06FFE4 */ lw $a2, -0x1c($s0) -/* 354D8C E00425EC 8E07FFE8 */ lw $a3, -0x18($s0) -/* 354D90 E00425F0 0C080108 */ jal shim_guTranslateF -/* 354D94 E00425F4 26310003 */ addiu $s1, $s1, 3 -/* 354D98 E00425F8 3C09800B */ lui $t1, %hi(gCameras) -/* 354D9C E00425FC 25291D80 */ addiu $t1, $t1, %lo(gCameras) -/* 354DA0 E0042600 3C038007 */ lui $v1, %hi(gCurrentCameraID) -/* 354DA4 E0042604 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) -/* 354DA8 E0042608 4406B000 */ mfc1 $a2, $f22 -/* 354DAC E004260C 00031080 */ sll $v0, $v1, 2 -/* 354DB0 E0042610 00431021 */ addu $v0, $v0, $v1 -/* 354DB4 E0042614 00021080 */ sll $v0, $v0, 2 -/* 354DB8 E0042618 00431023 */ subu $v0, $v0, $v1 -/* 354DBC E004261C 000218C0 */ sll $v1, $v0, 3 -/* 354DC0 E0042620 00431021 */ addu $v0, $v0, $v1 -/* 354DC4 E0042624 000210C0 */ sll $v0, $v0, 3 -/* 354DC8 E0042628 00491021 */ addu $v0, $v0, $t1 -/* 354DCC E004262C C440006C */ lwc1 $f0, 0x6c($v0) -/* 354DD0 E0042630 4407A000 */ mfc1 $a3, $f20 -/* 354DD4 E0042634 46000007 */ neg.s $f0, $f0 -/* 354DD8 E0042638 44050000 */ mfc1 $a1, $f0 -/* 354DDC E004263C 0240202D */ daddu $a0, $s2, $zero -/* 354DE0 E0042640 0C080104 */ jal shim_guRotateF -/* 354DE4 E0042644 E7B60010 */ swc1 $f22, 0x10($sp) -/* 354DE8 E0042648 0240202D */ daddu $a0, $s2, $zero -/* 354DEC E004264C 27A50018 */ addiu $a1, $sp, 0x18 -/* 354DF0 E0042650 0C080114 */ jal shim_guMtxCatF -/* 354DF4 E0042654 00A0302D */ daddu $a2, $a1, $zero -/* 354DF8 E0042658 0240202D */ daddu $a0, $s2, $zero -/* 354DFC E004265C 8E050000 */ lw $a1, ($s0) -/* 354E00 E0042660 4407A000 */ mfc1 $a3, $f20 -/* 354E04 E0042664 0C080110 */ jal shim_guScaleF -/* 354E08 E0042668 00A0302D */ daddu $a2, $a1, $zero -/* 354E0C E004266C 0240202D */ daddu $a0, $s2, $zero -/* 354E10 E0042670 27A50018 */ addiu $a1, $sp, 0x18 -/* 354E14 E0042674 0C080114 */ jal shim_guMtxCatF -/* 354E18 E0042678 00A0302D */ daddu $a2, $a1, $zero -/* 354E1C E004267C 27A40018 */ addiu $a0, $sp, 0x18 -/* 354E20 E0042680 3C058007 */ lui $a1, %hi(gMatrixListPos) -/* 354E24 E0042684 94A541F0 */ lhu $a1, %lo(gMatrixListPos)($a1) -/* 354E28 E0042688 3C02800A */ lui $v0, %hi(gDisplayContext) -/* 354E2C E004268C 8C42A674 */ lw $v0, %lo(gDisplayContext)($v0) -/* 354E30 E0042690 8FA9009C */ lw $t1, 0x9c($sp) -/* 354E34 E0042694 00052980 */ sll $a1, $a1, 6 -/* 354E38 E0042698 00A92821 */ addu $a1, $a1, $t1 -/* 354E3C E004269C 0C080118 */ jal shim_guMtxF2L -/* 354E40 E00426A0 00452821 */ addu $a1, $v0, $a1 -/* 354E44 E00426A4 3C06D838 */ lui $a2, 0xd838 -/* 354E48 E00426A8 8E840000 */ lw $a0, ($s4) -/* 354E4C E00426AC 34C60002 */ ori $a2, $a2, 2 -/* 354E50 E00426B0 0080282D */ daddu $a1, $a0, $zero -/* 354E54 E00426B4 24840008 */ addiu $a0, $a0, 8 -/* 354E58 E00426B8 AE840000 */ sw $a0, ($s4) -/* 354E5C E00426BC 3C028007 */ lui $v0, %hi(gMatrixListPos) -/* 354E60 E00426C0 944241F0 */ lhu $v0, %lo(gMatrixListPos)($v0) -/* 354E64 E00426C4 3C03DA38 */ lui $v1, 0xda38 -/* 354E68 E00426C8 ACA30000 */ sw $v1, ($a1) -/* 354E6C E00426CC 8FA9009C */ lw $t1, 0x9c($sp) -/* 354E70 E00426D0 24430001 */ addiu $v1, $v0, 1 -/* 354E74 E00426D4 3042FFFF */ andi $v0, $v0, 0xffff -/* 354E78 E00426D8 00021180 */ sll $v0, $v0, 6 -/* 354E7C E00426DC 3C018007 */ lui $at, %hi(gMatrixListPos) -/* 354E80 E00426E0 A42341F0 */ sh $v1, %lo(gMatrixListPos)($at) -/* 354E84 E00426E4 3C03800A */ lui $v1, %hi(gDisplayContext) -/* 354E88 E00426E8 8C63A674 */ lw $v1, %lo(gDisplayContext)($v1) -/* 354E8C E00426EC 00491021 */ addu $v0, $v0, $t1 -/* 354E90 E00426F0 00621821 */ addu $v1, $v1, $v0 -/* 354E94 E00426F4 24820008 */ addiu $v0, $a0, 8 -/* 354E98 E00426F8 ACA30004 */ sw $v1, 4($a1) -/* 354E9C E00426FC AE820000 */ sw $v0, ($s4) -/* 354EA0 E0042700 3C02DE00 */ lui $v0, 0xde00 -/* 354EA4 E0042704 3C090900 */ lui $t1, 0x900 -/* 354EA8 E0042708 252905E0 */ addiu $t1, $t1, 0x5e0 -/* 354EAC E004270C AC820000 */ sw $v0, ($a0) -/* 354EB0 E0042710 24020040 */ addiu $v0, $zero, 0x40 -/* 354EB4 E0042714 AC890004 */ sw $t1, 4($a0) -/* 354EB8 E0042718 AC860008 */ sw $a2, 8($a0) -/* 354EBC E004271C AC82000C */ sw $v0, 0xc($a0) -/* 354EC0 E0042720 8FA900D8 */ lw $t1, 0xd8($sp) -/* 354EC4 E0042724 26100038 */ addiu $s0, $s0, 0x38 -/* 354EC8 E0042728 8D220008 */ lw $v0, 8($t1) -/* 354ECC E004272C 24840010 */ addiu $a0, $a0, 0x10 -/* 354ED0 E0042730 02A2102A */ slt $v0, $s5, $v0 -/* 354ED4 E0042734 1440FF6F */ bnez $v0, .LE00424F4 -/* 354ED8 E0042738 AE840000 */ sw $a0, ($s4) -.LE004273C: -/* 354EDC E004273C 8FBF00C4 */ lw $ra, 0xc4($sp) -/* 354EE0 E0042740 8FBE00C0 */ lw $fp, 0xc0($sp) -/* 354EE4 E0042744 8FB700BC */ lw $s7, 0xbc($sp) -/* 354EE8 E0042748 8FB600B8 */ lw $s6, 0xb8($sp) -/* 354EEC E004274C 8FB500B4 */ lw $s5, 0xb4($sp) -/* 354EF0 E0042750 8FB400B0 */ lw $s4, 0xb0($sp) -/* 354EF4 E0042754 8FB300AC */ lw $s3, 0xac($sp) -/* 354EF8 E0042758 8FB200A8 */ lw $s2, 0xa8($sp) -/* 354EFC E004275C 8FB100A4 */ lw $s1, 0xa4($sp) -/* 354F00 E0042760 8FB000A0 */ lw $s0, 0xa0($sp) -/* 354F04 E0042764 D7B600D0 */ ldc1 $f22, 0xd0($sp) -/* 354F08 E0042768 D7B400C8 */ ldc1 $f20, 0xc8($sp) -/* 354F0C E004276C 03E00008 */ jr $ra -/* 354F10 E0042770 27BD00D8 */ addiu $sp, $sp, 0xd8 -/* 354F14 E0042774 00000000 */ nop -/* 354F18 E0042778 00000000 */ nop -/* 354F1C E004277C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/effects/stars_burst/stars_burst_main.s b/ver/us/asm/nonmatchings/effects/stars_burst/stars_burst_main.s deleted file mode 100644 index 75956458cb..0000000000 --- a/ver/us/asm/nonmatchings/effects/stars_burst/stars_burst_main.s +++ /dev/null @@ -1,147 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel stars_burst_main -/* 3547A0 E0042000 27BDFF50 */ addiu $sp, $sp, -0xb0 -/* 3547A4 E0042004 F7BE00A8 */ sdc1 $f30, 0xa8($sp) -/* 3547A8 E0042008 4485F000 */ mtc1 $a1, $f30 -/* 3547AC E004200C AFB30074 */ sw $s3, 0x74($sp) -/* 3547B0 E0042010 8FB300C8 */ lw $s3, 0xc8($sp) -/* 3547B4 E0042014 AFB40078 */ sw $s4, 0x78($sp) -/* 3547B8 E0042018 0080A02D */ daddu $s4, $a0, $zero -/* 3547BC E004201C F7BC00A0 */ sdc1 $f28, 0xa0($sp) -/* 3547C0 E0042020 C7BC00C0 */ lwc1 $f28, 0xc0($sp) -/* 3547C4 E0042024 27A40010 */ addiu $a0, $sp, 0x10 -/* 3547C8 E0042028 AFBF007C */ sw $ra, 0x7c($sp) -/* 3547CC E004202C AFB20070 */ sw $s2, 0x70($sp) -/* 3547D0 E0042030 AFB1006C */ sw $s1, 0x6c($sp) -/* 3547D4 E0042034 AFB00068 */ sw $s0, 0x68($sp) -/* 3547D8 E0042038 F7BA0098 */ sdc1 $f26, 0x98($sp) -/* 3547DC E004203C F7B80090 */ sdc1 $f24, 0x90($sp) -/* 3547E0 E0042040 F7B60088 */ sdc1 $f22, 0x88($sp) -/* 3547E4 E0042044 F7B40080 */ sdc1 $f20, 0x80($sp) -/* 3547E8 E0042048 AFA600B8 */ sw $a2, 0xb8($sp) -/* 3547EC E004204C 12600069 */ beqz $s3, .LE00421F4 -/* 3547F0 E0042050 AFA700BC */ sw $a3, 0xbc($sp) -/* 3547F4 E0042054 26730001 */ addiu $s3, $s3, 1 -/* 3547F8 E0042058 3C02E004 */ lui $v0, %hi(stars_burst_init) -/* 3547FC E004205C 2442222C */ addiu $v0, $v0, %lo(stars_burst_init) -/* 354800 E0042060 AFA20018 */ sw $v0, 0x18($sp) -/* 354804 E0042064 3C02E004 */ lui $v0, %hi(stars_burst_update) -/* 354808 E0042068 24422234 */ addiu $v0, $v0, %lo(stars_burst_update) -/* 35480C E004206C AFA2001C */ sw $v0, 0x1c($sp) -/* 354810 E0042070 3C02E004 */ lui $v0, %hi(stars_burst_render) -/* 354814 E0042074 24422374 */ addiu $v0, $v0, %lo(stars_burst_render) -/* 354818 E0042078 AFA20020 */ sw $v0, 0x20($sp) -/* 35481C E004207C 24020021 */ addiu $v0, $zero, 0x21 -/* 354820 E0042080 AFA00010 */ sw $zero, 0x10($sp) -/* 354824 E0042084 AFA00024 */ sw $zero, 0x24($sp) -/* 354828 E0042088 0C080124 */ jal shim_create_effect_instance -/* 35482C E004208C AFA20014 */ sw $v0, 0x14($sp) -/* 354830 E0042090 001320C0 */ sll $a0, $s3, 3 -/* 354834 E0042094 00932023 */ subu $a0, $a0, $s3 -/* 354838 E0042098 000420C0 */ sll $a0, $a0, 3 -/* 35483C E004209C 0040802D */ daddu $s0, $v0, $zero -/* 354840 E00420A0 0C08012C */ jal shim_general_heap_malloc -/* 354844 E00420A4 AE130008 */ sw $s3, 8($s0) -/* 354848 E00420A8 0040882D */ daddu $s1, $v0, $zero -/* 35484C E00420AC 16200003 */ bnez $s1, .LE00420BC -/* 354850 E00420B0 AE11000C */ sw $s1, 0xc($s0) -.LE00420B4: -/* 354854 E00420B4 0801082D */ j .LE00420B4 -/* 354858 E00420B8 00000000 */ nop -.LE00420BC: -/* 35485C E00420BC AE340000 */ sw $s4, ($s1) -/* 354860 E00420C0 E63E0004 */ swc1 $f30, 4($s1) -/* 354864 E00420C4 C7A200B8 */ lwc1 $f2, 0xb8($sp) -/* 354868 E00420C8 2402001E */ addiu $v0, $zero, 0x1e -/* 35486C E00420CC E6220008 */ swc1 $f2, 8($s1) -/* 354870 E00420D0 C7A200BC */ lwc1 $f2, 0xbc($sp) -/* 354874 E00420D4 24120001 */ addiu $s2, $zero, 1 -/* 354878 E00420D8 AE220030 */ sw $v0, 0x30($s1) -/* 35487C E00420DC 240200FF */ addiu $v0, $zero, 0xff -/* 354880 E00420E0 AE22002C */ sw $v0, 0x2c($s1) -/* 354884 E00420E4 0253102A */ slt $v0, $s2, $s3 -/* 354888 E00420E8 AE200034 */ sw $zero, 0x34($s1) -/* 35488C E00420EC E622000C */ swc1 $f2, 0xc($s1) -/* 354890 E00420F0 10400040 */ beqz $v0, .LE00421F4 -/* 354894 E00420F4 26310038 */ addiu $s1, $s1, 0x38 -/* 354898 E00420F8 26300024 */ addiu $s0, $s1, 0x24 -/* 35489C E00420FC 3C014024 */ lui $at, 0x4024 -/* 3548A0 E0042100 4481D800 */ mtc1 $at, $f27 -/* 3548A4 E0042104 4480D000 */ mtc1 $zero, $f26 -.LE0042108: -/* 3548A8 E0042108 0C080138 */ jal shim_rand_int -/* 3548AC E004210C 2404000A */ addiu $a0, $zero, 0xa -/* 3548B0 E0042110 32440002 */ andi $a0, $s2, 2 -/* 3548B4 E0042114 00121FC2 */ srl $v1, $s2, 0x1f -/* 3548B8 E0042118 02431821 */ addu $v1, $s2, $v1 -/* 3548BC E004211C 00031843 */ sra $v1, $v1, 1 -/* 3548C0 E0042120 00830018 */ mult $a0, $v1 -/* 3548C4 E0042124 3C013E80 */ lui $at, 0x3e80 -/* 3548C8 E0042128 44811000 */ mtc1 $at, $f2 -/* 3548CC E004212C 4482A000 */ mtc1 $v0, $f20 -/* 3548D0 E0042130 00000000 */ nop -/* 3548D4 E0042134 4680A520 */ cvt.s.w $f20, $f20 -/* 3548D8 E0042138 4602A502 */ mul.s $f20, $f20, $f2 -/* 3548DC E004213C 00000000 */ nop -/* 3548E0 E0042140 AE340000 */ sw $s4, ($s1) -/* 3548E4 E0042144 E61EFFE0 */ swc1 $f30, -0x20($s0) -/* 3548E8 E0042148 C7A200C4 */ lwc1 $f2, 0xc4($sp) -/* 3548EC E004214C 00004012 */ mflo $t0 -/* 3548F0 E0042150 00081080 */ sll $v0, $t0, 2 -/* 3548F4 E0042154 4482C000 */ mtc1 $v0, $f24 -/* 3548F8 E0042158 00000000 */ nop -/* 3548FC E004215C 4680C620 */ cvt.s.w $f24, $f24 -/* 354900 E0042160 46181600 */ add.s $f24, $f2, $f24 -/* 354904 E0042164 C7A200B8 */ lwc1 $f2, 0xb8($sp) -/* 354908 E0042168 E602FFE4 */ swc1 $f2, -0x1c($s0) -/* 35490C E004216C C7A200BC */ lwc1 $f2, 0xbc($sp) -/* 354910 E0042170 E602FFE8 */ swc1 $f2, -0x18($s0) -/* 354914 E0042174 3C0140A0 */ lui $at, 0x40a0 -/* 354918 E0042178 44811000 */ mtc1 $at, $f2 -/* 35491C E004217C 4600C306 */ mov.s $f12, $f24 -/* 354920 E0042180 0C080144 */ jal shim_cos_deg -/* 354924 E0042184 4602A500 */ add.s $f20, $f20, $f2 -/* 354928 E0042188 4600E306 */ mov.s $f12, $f28 -/* 35492C E004218C 0C080140 */ jal shim_sin_deg -/* 354930 E0042190 46000586 */ mov.s $f22, $f0 -/* 354934 E0042194 4600B582 */ mul.s $f22, $f22, $f0 -/* 354938 E0042198 00000000 */ nop -/* 35493C E004219C 26520001 */ addiu $s2, $s2, 1 -/* 354940 E00421A0 26310038 */ addiu $s1, $s1, 0x38 -/* 354944 E00421A4 4600C306 */ mov.s $f12, $f24 -/* 354948 E00421A8 0C080140 */ jal shim_sin_deg -/* 35494C E00421AC E616FFEC */ swc1 $f22, -0x14($s0) -/* 354950 E00421B0 4600C306 */ mov.s $f12, $f24 -/* 354954 E00421B4 0C080144 */ jal shim_cos_deg -/* 354958 E00421B8 E600FFF0 */ swc1 $f0, -0x10($s0) -/* 35495C E00421BC 4600E306 */ mov.s $f12, $f28 -/* 354960 E00421C0 0C080144 */ jal shim_cos_deg -/* 354964 E00421C4 46000586 */ mov.s $f22, $f0 -/* 354968 E00421C8 E6140004 */ swc1 $f20, 4($s0) -/* 35496C E00421CC 4600A521 */ cvt.d.s $f20, $f20 -/* 354970 E00421D0 4600B582 */ mul.s $f22, $f22, $f0 -/* 354974 E00421D4 00000000 */ nop -/* 354978 E00421D8 463AA503 */ div.d $f20, $f20, $f26 -/* 35497C E00421DC 4620A520 */ cvt.s.d $f20, $f20 -/* 354980 E00421E0 0253102A */ slt $v0, $s2, $s3 -/* 354984 E00421E4 E6140000 */ swc1 $f20, ($s0) -/* 354988 E00421E8 E616FFF4 */ swc1 $f22, -0xc($s0) -/* 35498C E00421EC 1440FFC6 */ bnez $v0, .LE0042108 -/* 354990 E00421F0 26100038 */ addiu $s0, $s0, 0x38 -.LE00421F4: -/* 354994 E00421F4 8FBF007C */ lw $ra, 0x7c($sp) -/* 354998 E00421F8 8FB40078 */ lw $s4, 0x78($sp) -/* 35499C E00421FC 8FB30074 */ lw $s3, 0x74($sp) -/* 3549A0 E0042200 8FB20070 */ lw $s2, 0x70($sp) -/* 3549A4 E0042204 8FB1006C */ lw $s1, 0x6c($sp) -/* 3549A8 E0042208 8FB00068 */ lw $s0, 0x68($sp) -/* 3549AC E004220C D7BE00A8 */ ldc1 $f30, 0xa8($sp) -/* 3549B0 E0042210 D7BC00A0 */ ldc1 $f28, 0xa0($sp) -/* 3549B4 E0042214 D7BA0098 */ ldc1 $f26, 0x98($sp) -/* 3549B8 E0042218 D7B80090 */ ldc1 $f24, 0x90($sp) -/* 3549BC E004221C D7B60088 */ ldc1 $f22, 0x88($sp) -/* 3549C0 E0042220 D7B40080 */ ldc1 $f20, 0x80($sp) -/* 3549C4 E0042224 03E00008 */ jr $ra -/* 3549C8 E0042228 27BD00B0 */ addiu $sp, $sp, 0xb0 diff --git a/ver/us/asm/nonmatchings/effects/stars_burst/stars_burst_update.s b/ver/us/asm/nonmatchings/effects/stars_burst/stars_burst_update.s deleted file mode 100644 index c123297d9a..0000000000 --- a/ver/us/asm/nonmatchings/effects/stars_burst/stars_burst_update.s +++ /dev/null @@ -1,99 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel D_E00427B0 -.double 0.8 - -dlabel D_E00427B8 -.double 0.9 - -.section .text - -glabel stars_burst_update -/* 3549D4 E0042234 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 3549D8 E0042238 AFBF0010 */ sw $ra, 0x10($sp) -/* 3549DC E004223C 8C83000C */ lw $v1, 0xc($a0) -/* 3549E0 E0042240 8C620030 */ lw $v0, 0x30($v1) -/* 3549E4 E0042244 2442FFFF */ addiu $v0, $v0, -1 -/* 3549E8 E0042248 AC620030 */ sw $v0, 0x30($v1) -/* 3549EC E004224C 8C620034 */ lw $v0, 0x34($v1) -/* 3549F0 E0042250 8C650030 */ lw $a1, 0x30($v1) -/* 3549F4 E0042254 24420001 */ addiu $v0, $v0, 1 -/* 3549F8 E0042258 04A10005 */ bgez $a1, .LE0042270 -/* 3549FC E004225C AC620034 */ sw $v0, 0x34($v1) -/* 354A00 E0042260 0C080128 */ jal shim_remove_effect -/* 354A04 E0042264 00000000 */ nop -/* 354A08 E0042268 080108DA */ j .LE0042368 -/* 354A0C E004226C 00000000 */ nop -.LE0042270: -/* 354A10 E0042270 28A6000A */ slti $a2, $a1, 0xa -/* 354A14 E0042274 10C00009 */ beqz $a2, .LE004229C -/* 354A18 E0042278 00000000 */ nop -/* 354A1C E004227C 3C01E004 */ lui $at, %hi(D_E00427B0) -/* 354A20 E0042280 D42227B0 */ ldc1 $f2, %lo(D_E00427B0)($at) -/* 354A24 E0042284 C460002C */ lwc1 $f0, 0x2c($v1) -/* 354A28 E0042288 46800021 */ cvt.d.w $f0, $f0 -/* 354A2C E004228C 46220002 */ mul.d $f0, $f0, $f2 -/* 354A30 E0042290 00000000 */ nop -/* 354A34 E0042294 4620040D */ trunc.w.d $f16, $f0 -/* 354A38 E0042298 E470002C */ swc1 $f16, 0x2c($v1) -.LE004229C: -/* 354A3C E004229C 8C820008 */ lw $v0, 8($a0) -/* 354A40 E00422A0 24050001 */ addiu $a1, $zero, 1 -/* 354A44 E00422A4 00A2102A */ slt $v0, $a1, $v0 -/* 354A48 E00422A8 1040002F */ beqz $v0, .LE0042368 -/* 354A4C E00422AC 24630038 */ addiu $v1, $v1, 0x38 -/* 354A50 E00422B0 24630024 */ addiu $v1, $v1, 0x24 -/* 354A54 E00422B4 3C01E004 */ lui $at, %hi(D_E00427B8) -/* 354A58 E00422B8 D42E27B8 */ ldc1 $f14, %lo(D_E00427B8)($at) -/* 354A5C E00422BC 3C014024 */ lui $at, 0x4024 -/* 354A60 E00422C0 44816800 */ mtc1 $at, $f13 -/* 354A64 E00422C4 44806000 */ mtc1 $zero, $f12 -.LE00422C8: -/* 354A68 E00422C8 C4660004 */ lwc1 $f6, 4($v1) -/* 354A6C E00422CC 460031A1 */ cvt.d.s $f6, $f6 -/* 354A70 E00422D0 462E3182 */ mul.d $f6, $f6, $f14 -/* 354A74 E00422D4 00000000 */ nop -/* 354A78 E00422D8 C4620004 */ lwc1 $f2, 4($v1) -/* 354A7C E00422DC C460FFEC */ lwc1 $f0, -0x14($v1) -/* 354A80 E00422E0 46001082 */ mul.s $f2, $f2, $f0 -/* 354A84 E00422E4 00000000 */ nop -/* 354A88 E00422E8 C46A0004 */ lwc1 $f10, 4($v1) -/* 354A8C E00422EC C460FFF0 */ lwc1 $f0, -0x10($v1) -/* 354A90 E00422F0 46005282 */ mul.s $f10, $f10, $f0 -/* 354A94 E00422F4 00000000 */ nop -/* 354A98 E00422F8 C4680004 */ lwc1 $f8, 4($v1) -/* 354A9C E00422FC C460FFF4 */ lwc1 $f0, -0xc($v1) -/* 354AA0 E0042300 46004202 */ mul.s $f8, $f8, $f0 -/* 354AA4 E0042304 00000000 */ nop -/* 354AA8 E0042308 C464FFE0 */ lwc1 $f4, -0x20($v1) -/* 354AAC E004230C 46022100 */ add.s $f4, $f4, $f2 -/* 354AB0 E0042310 C462FFE4 */ lwc1 $f2, -0x1c($v1) -/* 354AB4 E0042314 460A1080 */ add.s $f2, $f2, $f10 -/* 354AB8 E0042318 C460FFE8 */ lwc1 $f0, -0x18($v1) -/* 354ABC E004231C 46080000 */ add.s $f0, $f0, $f8 -/* 354AC0 E0042320 E464FFE0 */ swc1 $f4, -0x20($v1) -/* 354AC4 E0042324 E462FFE4 */ swc1 $f2, -0x1c($v1) -/* 354AC8 E0042328 E460FFE8 */ swc1 $f0, -0x18($v1) -/* 354ACC E004232C 46203020 */ cvt.s.d $f0, $f6 -/* 354AD0 E0042330 10C00008 */ beqz $a2, .LE0042354 -/* 354AD4 E0042334 E4600004 */ swc1 $f0, 4($v1) -/* 354AD8 E0042338 46000021 */ cvt.d.s $f0, $f0 -/* 354ADC E004233C C4620000 */ lwc1 $f2, ($v1) -/* 354AE0 E0042340 462C0003 */ div.d $f0, $f0, $f12 -/* 354AE4 E0042344 460010A1 */ cvt.d.s $f2, $f2 -/* 354AE8 E0042348 46201080 */ add.d $f2, $f2, $f0 -/* 354AEC E004234C 462010A0 */ cvt.s.d $f2, $f2 -/* 354AF0 E0042350 E4620000 */ swc1 $f2, ($v1) -.LE0042354: -/* 354AF4 E0042354 24A50001 */ addiu $a1, $a1, 1 -/* 354AF8 E0042358 8C820008 */ lw $v0, 8($a0) -/* 354AFC E004235C 00A2102A */ slt $v0, $a1, $v0 -/* 354B00 E0042360 1440FFD9 */ bnez $v0, .LE00422C8 -/* 354B04 E0042364 24630038 */ addiu $v1, $v1, 0x38 -.LE0042368: -/* 354B08 E0042368 8FBF0010 */ lw $ra, 0x10($sp) -/* 354B0C E004236C 03E00008 */ jr $ra -/* 354B10 E0042370 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/splat.yaml b/ver/us/splat.yaml index 2e83a34e1e..23552cc3fa 100644 --- a/ver/us/splat.yaml +++ b/ver/us/splat.yaml @@ -2598,9 +2598,52 @@ segments: subsegments: - [0x328110, c, landing_dust] - [0x328D20] - - start: 0x328EA0 # landing_dust, walking_dust, smoke_ring, smoke_impact, smoke_burst gfx - type: bin - align: 16 + - name: effect_gfx_landing_dust + dir: effects/gfx + type: code + start: 0x328EA0 + vram: 0x09000000 + symbol_name_format: $VRAM_$ROM + subsegments: + - [0x328EA0, c, landing_dust] + - start: 0x328EA0 + type: .data + name: landing_dust + subsegments: + - [0x328EA0, i4, D_09000000_328EA0, 256, 32] + - [0x329EA0, i4, D_09001000_329EA0, 176, 24] + - [0x32A6E0, i4, D_09001840_32A6E0, 224, 32] + - [0x32B4E0, vtx, D_09002640_32B4E0] + - [0x32B520, vtx, D_09002680_32B520] + - [0x32B560, vtx, D_090026C0_32B560] + - [0x32B5A0, vtx, D_09002700_32B5A0] + - [0x32B5E0, vtx, D_09002740_32B5E0] + - [0x32B620, gfx, D_09002780_32B620] + - [0x32B708, gfx, D_09002868_32B708] + - [0x32B7F0, gfx, D_09002950_32B7F0] + - [0x32B8D8, gfx, D_09002A38_32B8D8] + - [0x32B9C0, gfx, D_09002B20_32B9C0] + - [0x32B9E0, gfx, D_09002B40_32B9E0] + - [0x32BA00, gfx, D_09002B60_32BA00] + - [0x32BA20, gfx, D_09002B80_32BA20] + - [0x32BA40, vtx, D_09002BA0_32BA40] + - [0x32BB00, gfx, D_09002C60_32BB00] + - [0x32BB30, ci4, D_09002C90_32BB30, 16, 16] + - [0x32BBB0, ci4, D_09002D10_32BBB0, 16, 16, D_09002C90_32BB30] + - [0x32BC30, ci4, D_09002D90_32BC30, 16, 16, D_09002C90_32BB30] + - [0x32BCB0, ci4, D_09002E10_32BCB0, 16, 16, D_09002C90_32BB30] + - [0x32BD30, palette, D_09002C90_32BB30] + - [0x32BD50, vtx, D_09002EB0_32BD50] + - [0x32BD90, gfx, D_09002EF0_32BD90] + - [0x32BE08, gfx, D_09002F68_32BE08] + - [0x32BE50, gfx, D_09002FB0_32BE50] + - [0x32BEA8, gfx, D_09003008_32BEA8] + - [0x32BF00, gfx, D_09003060_32BF00] + - [0x32BF58, gfx, D_090030B8_32BF58] + - [0x32BFB0, gfx, D_09003110_32BFB0] + - [0x32C008, gfx, D_09003168_32C008] + - [0x32C060, gfx, D_090031C0_32C060] + - [0x32C0B8, gfx, D_09003218_32C0B8] - name: effect_walking_dust dir: effects type: code @@ -2785,7 +2828,39 @@ segments: subsegments: - [0x333EC0, c, emote] - [0x334B50] - - [0x334C70, bin] # emote gfx + - name: effect_gfx_emote + dir: effects/gfx + type: code + start: 0x334C70 + vram: 0x09000000 + symbol_name_format: $VRAM_$ROM + subsegments: + - [0x334C70, c, emote] + - start: 0x334C70 + type: .data + name: emote + subsegments: + - [0x334C70, i4, D_09000000_334C70, 32, 64] + - [0x335070, i4, D_09000400_335070, 96, 32] + - [0x335670, i4, D_09000A00_335670, 128, 48] + - [0x336270, i4, D_09001600_336270, 128, 32] + - [0x336A70, i4, D_09001E00_336A70, 128, 8] + - [0x336C70, vtx, D_09002000_336C70] + - [0x336CB0, vtx, D_09002040_336CB0] + - [0x336CF0, vtx, D_09002080_336CF0] + - [0x336D30, vtx, D_090020C0_336D30] + - [0x336D70, vtx, D_09002100_336D70] + - [0x336DB0, vtx, D_09002140_336DB0] + - [0x336DE0, gfx, D_09002170_336DE0] + - [0x336EA8, gfx, D_09002238_336EA8] + - [0x336F50, gfx, D_090022E0_336F50] + - [0x336F78, gfx, D_09002308_336F78] + - [0x337020, gfx, D_090023B0_337020] + - [0x337048, gfx, D_090023D8_337048] + - [0x3370F0, gfx, D_09002480_3370F0] + - [0x337118, gfx, D_090024A8_337118] + - [0x3371C0, gfx, D_09002550_3371C0] + - [0x3371E8, gfx, D_09002578_3371E8] - name: effect_sparkles dir: effects type: code @@ -2821,7 +2896,27 @@ segments: subsegments: - [0x33CDF0, c, drop_leaves] - [0x33D5D0] - - [0x33D610, bin] # drop_leaves, windy_leaves gfx + - name: effect_gfx_drop_leaves + dir: effects/gfx + type: code + start: 0x33D610 + vram: 0x09000000 + symbol_name_format: $VRAM_$ROM + subsegments: + - [0x33D610, c, drop_leaves] + - start: 0x33D610 + type: .data + name: drop_leaves + subsegments: + - [0x33D610, ia8, D_09000000_33D610, 32, 128] + - [0x33E610, vtx, D_09001000_33E610] + - [0x33E690, vtx, D_09001080_33E690] + - [0x33E710, vtx, D_09001100_33E710] + - [0x33E790, gfx, D_09001180_33E790] + - [0x33E840, gfx, D_09001230_33E840] + - [0x33E868, gfx, D_09001258_33E868] + - [0x33E890, gfx, D_09001280_33E890] + - [0x33E8B8] - name: effect_dust dir: effects type: code @@ -2830,7 +2925,29 @@ segments: subsegments: - [0x33E8C0, c, dust] - [0x33EFE0] - - [0x33F000, bin] # dust gfx + - name: effect_gfx_dust + dir: effects/gfx + type: code + start: 0x33F000 + vram: 0x09000000 + symbol_name_format: $VRAM_$ROM + subsegments: + - [0x33F000, c, dust] + - start: 0x33F000 + type: .data + name: dust + subsegments: + - [0x33F000, i4, D_09000000_33F000, 32, 96] + - [0x33F600, i4, D_09000600_33F600, 32, 96] + - [0x33FC00, vtx, D_09000C00_33FC00] + - [0x33FC40, vtx, D_09000C40_33FC40] + - [0x33FC80, vtx, D_09000C80_33FC80] + - [0x33FCC0, gfx, D_09000CC0_33FCC0] + - [0x33FD68, gfx, D_09000D68_33FD68] + - [0x33FE18, gfx, D_09000E18_33FE18] + - [0x33FE38, gfx, D_09000E38_33FE38] + - [0x33FE58, gfx, D_09000E58_33FE58] + - [0x33FE78] - name: effect_shattering_stones dir: effects type: code @@ -2856,7 +2973,27 @@ segments: subsegments: - [0x342140, c, damage_stars] - [0x342FD0, data] - - [0x343040, bin] # damage_stars, stars_burst gfx + - name: effect_gfx_damage_stars + dir: effects/gfx + type: code + start: 0x343040 + vram: 0x09000000 + symbol_name_format: $VRAM_$ROM + subsegments: + - [0x343040, c, damage_stars] + - start: 0x343040 + type: .data + name: damage_stars + subsegments: + - [0x343040, i4, D_09000000_343040, 32, 64] + - [0x343440, vtx, D_09000400_343440] + - [0x343480, vtx, D_09000440_343480] + - [0x3434C0, vtx, D_09000480_3434C0] + - [0x343500, gfx, D_090004C0_343500] + - [0x3435B0, gfx, D_09000570_3435B0] + - [0x343620, gfx, D_090005E0_343620] + - [0x343640, gfx, D_09000600_343640] + - [0x343660, gfx, D_09000620_343660] - name: effect_explosion dir: effects type: code @@ -2865,7 +3002,30 @@ segments: subsegments: - [0x343680, c, explosion] - [0x343F30, data] - - [0x343F70, bin] # explosion gfx + - name: effect_gfx_explosion + dir: effects/gfx + type: code + start: 0x343F70 + vram: 0x09000000 + symbol_name_format: $VRAM_$ROM + subsegments: + - [0x343F70, c, explosion] + - start: 0x343F70 + type: .data + name: explosion + subsegments: + - [0x343F70, i4, D_09000000_343F70, 32, 32] + - [0x344170, i4, D_09000200_344170, 32, 32] + - [0x344370, i4, D_09000400_344370, 32, 32] + - [0x344570, i4, D_09000600_344570, 32, 32] + - [0x344770, vtx, D_09000800_344770] + - [0x3447B0, gfx, D_09000840_3447B0] + - [0x344860, gfx, D_090008F0_344860] + - [0x344880, gfx, D_09000910_344880] + - [0x3448E8, gfx, D_09000978_3448E8] + - [0x344948, gfx, D_090009D8_344948] + - [0x3449A8, gfx, D_09000A38_3449A8] + - [0x344A08] - name: effect_lens_flare dir: effects type: code @@ -2883,7 +3043,33 @@ segments: subsegments: - [0x3454E0, c, got_item_outline] - [0x345B10, data] - - [0x345B40, bin] # got_item_outline gfx + - name: effect_gfx_got_item_outline + dir: effects/gfx + type: code + start: 0x345B40 + vram: 0x09000000 + symbol_name_format: $VRAM_$ROM + subsegments: + - [0x345B40, c, got_item_outline] + - start: 0x345B40 + type: .data + name: got_item_outline + subsegments: + - [0x345B40, ia8, D_09000000_345B40, 128, 32] + - [0x346B40, ia8, D_09001000_346B40, 128, 32] + - [0x347B40, ia8, D_09002000_347B40, 128, 32] + - [0x348B40, ia8, D_09003000_348B40, 128, 32] + - [0x349B40, ia8, D_09004000_349B40, 128, 32] + - [0x34AB40, ia8, D_09005000_34AB40, 128, 32] + - [0x34BB40, ia8, D_09006000_34BB40, 128, 32] + - [0x34CB40, ia8, D_09007000_34CB40, 128, 32] + - [0x34DB40, vtx, D_09008000_34DB40] + - [0x34DC40, gfx, D_09008100_34DC40] + - [0x34DCB0, gfx, D_09008170_34DCB0] + - [0x34DCD0, gfx, D_09008190_34DCD0] + - [0x34DCE8, gfx, D_090081A8_34DCE8] + - [0x34DD00, gfx, D_090081C0_34DD00] + - [0x34DD18] - name: effect_spiky_white_aura dir: effects type: code @@ -3034,7 +3220,41 @@ segments: subsegments: - [0x359F20, c, music_note] - [0x35A580] - - [0x35A5E0, bin] # music_note gfx + - name: effect_gfx_music_note + dir: effects/gfx + type: code + start: 0x35A5E0 + vram: 0x09000000 + symbol_name_format: $VRAM_$ROM + subsegments: + - [0x35A5E0, c, music_note] + - start: 0x35A5E0 + type: .data + name: music_note + subsegments: + - [0x35A5E0, i8, D_09000000_35A5E0, 8, 32] + - [0x35A6E0, i8, D_09000100_35A6E0, 8, 32] + - [0x35A7E0, i8, D_09000200_35A7E0, 8, 32] + - [0x35A8E0, i8, D_09000300_35A8E0, 8, 32] + - [0x35A9E0, i8, D_09000400_35A9E0, 8, 32] + - [0x35AAE0, i8, D_09000500_35AAE0, 8, 32] + - [0x35ABE0, i8, D_09000600_35ABE0, 8, 32] + - [0x35ACE0, i4, D_09000700_35ACE0, 16, 32] + - [0x35ADE0, i4, D_09000800_35ADE0, 16, 32] + - [0x35AEE0, i4, D_09000900_35AEE0, 16, 32] + - [0x35AFE0, i4, D_09000A00_35AFE0, 16, 32] + - [0x35B0E0, i4, D_09000B00_35B0E0, 16, 32] + - [0x35B1E0, i4, D_09000C00_35B1E0, 16, 32] + - [0x35B2E0, i4, D_09000D00_35B2E0, 16, 32] + - [0x35B3E0, vtx, D_09000E00_35B3E0] + - [0x35B5A0, gfx, D_09000FC0_35B5A0] + - [0x35B618, gfx, D_09001038_35B618] + - [0x35B6A0, gfx, D_090010C0_35B6A0] + - [0x35B728, gfx, D_09001148_35B728] + - [0x35B7B0, gfx, D_090011D0_35B7B0] + - [0x35B838, gfx, D_09001258_35B838] + - [0x35B8C0, gfx, D_090012E0_35B8C0] + - [0x35B948, gfx, D_09001368_35B948] - name: effect_smoke_burst dir: effects type: code @@ -3095,7 +3315,23 @@ segments: subsegments: - [0x35E920, c, falling_leaves] - [0x35F0A0] - - [0x35F0E0, bin] # falling_leaves gfx + - name: effect_gfx_falling_leaves + dir: effects/gfx + type: code + start: 0x35F0E0 + vram: 0x09000000 + symbol_name_format: $VRAM_$ROM + subsegments: + - [0x35F0E0, c, falling_leaves] + - start: 0x35F0E0 + type: .data + name: falling_leaves + subsegments: + - [0x35F0E0, ia8, D_09000000_35F0E0, 32, 128] + - [0x3600E0, vtx, D_09001000_3600E0] + - [0x3601E0, gfx, D_09001100_3601E0] + - [0x360290, gfx, D_090011B0_360290] + - [0x3602B8] - name: effect_stars_spread dir: effects type: code @@ -3184,7 +3420,23 @@ segments: subsegments: - [0x364F10, c, green_impact] - [0x365970, data] - - [0x3659B0, bin] # green_impact gfx + - name: effect_gfx_green_impact + dir: effects/gfx + type: code + start: 0x3659B0 + vram: 0x09000000 + symbol_name_format: $VRAM_$ROM + subsegments: + - [0x3659B0, c, green_impact] + - start: 0x3659B0 + type: .data + name: green_impact + subsegments: + - [0x3659B0, i4, D_09000000_3659B0, 32, 32] + - [0x365BB0, i4, D_09000200_365BB0, 32, 32] + - [0x365DB0, vtx, D_09000400_365DB0] + - [0x365EF0, gfx, D_09000540_365EF0] + - [0x365F50, gfx, D_090005A0_365F50] - name: effect_radial_shimmer dir: effects type: code @@ -3202,7 +3454,33 @@ segments: subsegments: - [0x36A8D0, c, ending_decals] - [0x36AE80, data] - - [0x36AEE0, bin] # ending_decals gfx + - name: effect_gfx_ending_decals + dir: effects/gfx + type: code + start: 0x36AEE0 + vram: 0x09000000 + symbol_name_format: $VRAM_$ROM + subsegments: + - [0x36AEE0, c, ending_decals] + - start: 0x36AEE0 + type: .data + name: ending_decals + subsegments: + - [0x36AEE0, i8, D_09000000_36AEE0, 64, 64] + - [0x36BEE0, ci4, D_09001000_36BEE0, 64, 32] + - [0x36C2E0, ci4, D_09001400_36C2E0, 64, 32, D_09001000_36BEE0] + - [0x36C6E0, ci4, D_09001800_36C6E0, 64, 32, D_09001000_36BEE0] + - [0x36CAE0, palette, D_09001000_36BEE0] + - [0x36CB00] # padding + - [0x36CCE0, vtx, D_09001E00_36CCE0] + - [0x36CD20, gfx, D_09001E40_36CD20] + - [0x36CD88, gfx, D_09001EA8_36CD88] + - [0x36CDF0, gfx, D_09001F10_36CDF0] + - [0x36CE58, gfx, D_09001F78_36CE58] + - [0x36CEF8, vtx, D_09002018_36CEF8] + - [0x36CF38, gfx, D_09002058_36CF38] + - [0x36CF58, gfx, D_09002078_36CF58] + - [0x36D018] - name: effect_light_rays dir: effects type: code @@ -3268,7 +3546,25 @@ segments: subsegments: - [0x374E50, c, energy_shockwave] - [0x375500] - - [0x375510, bin] # energy_shockwave gfx + - name: effect_gfx_energy_shockwave + dir: effects/gfx + type: code + start: 0x375510 + vram: 0x09000000 + symbol_name_format: $VRAM_$ROM + subsegments: + - [0x375510, c, energy_shockwave] + - start: 0x375510 + type: .data + name: energy_shockwave + subsegments: + - [0x375510, i4, D_09000000_375510, 64, 64] + - [0x375D10, i4, D_09000800_375D10, 32, 32] + - [0x375F10, vtx, D_09000A00_375F10] + - [0x376110, vtx, D_09000C00_376110] + - [0x3762D0, gfx, D_09000DC0_3762D0] + - [0x376370, gfx, D_09000E60_376370] + - [0x376458] - name: effect_shimmer_wave dir: effects type: code @@ -3285,7 +3581,42 @@ segments: subsegments: - [0x377070, c, aura] - [0x377F00] - - [0x377F80, bin] # aura gfx + - name: effect_gfx_aura + dir: effects/gfx + type: code + start: 0x377F80 + vram: 0x09000000 + symbol_name_format: $VRAM_$ROM + subsegments: + - [0x377F80, c, aura] + - start: 0x377F80 + type: .data + name: aura + subsegments: + - [0x377F80, i4, D_09000000_377F80, 32, 64] + - [0x378380, i8, D_09000400_378380, 32, 32] + - [0x378780, i4, D_09000800_378780, 64, 64] + - [0x378F80, i4, D_09001000_378F80, 64, 64] + - [0x379780, i4, D_09001800_379780, 64, 64] + - [0x379F80, gfx, D_09002000_379F80] + - [0x37A068, gfx, D_090020E8_37A068] + - [0x37A150, gfx, D_090021D0_37A150] + - [0x37A230, vtx, D_090022B0_37A230] + - [0x37A250, vtx, D_090022D0_37A250] + - [0x37A270, vtx, D_090022F0_37A270] + - [0x37A290, vtx, D_09002310_37A290] + - [0x37A2B0, vtx, D_09002330_37A2B0] + - [0x37A2D0, vtx, D_09002350_37A2D0] + - [0x37A2F0, vtx, D_09002370_37A2F0] + - [0x37A310, vtx, D_09002390_37A310] + - [0x37A330, gfx, D_090023B0_37A330] + - [0x37A348, gfx, D_090023C8_37A348] + - [0x37A360, gfx, D_090023E0_37A360] + - [0x37A378, gfx, D_090023F8_37A378] + - [0x37A390, gfx, D_09002410_37A390] + - [0x37A3A8, gfx, D_09002428_37A3A8] + - [0x37A3C0, gfx, D_09002440_37A3C0] + - [0x37A3D8, gfx, D_09002458_37A3D8] - name: effect_bulb_glow dir: effects type: code @@ -3303,7 +3634,23 @@ segments: subsegments: - [0x37C540, c, effect_3D] - [0x37D140] - - [0x37D180, bin] # effect_3D gfx + - name: effect_gfx_effect_3D + dir: effects/gfx + type: code + start: 0x37D180 + vram: 0x09000000 + symbol_name_format: $VRAM_$ROM + subsegments: + - [0x37D180, c, effect_3D] + - start: 0x37D180 + type: .data + name: effect_3D + subsegments: + - [0x37D180, i4, D_09000000_37D180, 32, 32] + - [0x37D380, vtx, D_09000200_37D380] + - [0x37D3C0, gfx, D_09000240_37D3C0] + - [0x37D468, gfx, D_090002E8_37D468] + - [0x37D488] - name: effect_blast dir: effects type: code @@ -3321,7 +3668,36 @@ segments: subsegments: - [0x37F720, c, fire_flower] - [0x380350] - - [0x3803A0, bin] # fire_flower gfx + - name: effect_gfx_fire_flower + dir: effects/gfx + type: code + start: 0x3803A0 + vram: 0x09000000 + symbol_name_format: $VRAM_$ROM + subsegments: + - [0x3803A0, c, fire_flower] + - start: 0x3803A0 + type: .data + name: fire_flower + subsegments: + - [0x3803A0, ci4, D_09000000_3803A0, 32, 32] + - [0x3805A0, ci4, D_09000200_3805A0, 32, 32, D_09000000_3803A0] + - [0x3807A0, ci4, D_09000400_3807A0, 32, 32, D_09000000_3803A0] + - [0x3809A0, ci4, D_09000600_3809A0, 32, 32, D_09000000_3803A0] + - [0x380BA0, palette, D_09000000_3803A0] + - [0x380BC0] # padding + - [0x380DA0, ci4, D_09000A00_380DA0, 16, 16] + - [0x380E20, palette, D_09000A00_380DA0] + - [0x380E40] # padding + - [0x381020, vtx, D_09000C80_381020] + - [0x381060, vtx, D_09000CC0_381060] + - [0x3810A0, vtx, D_09000D00_3810A0] + - [0x3810E0, gfx, D_09000D40_3810E0] + - [0x381180, gfx, D_09000DE0_381180] + - [0x381258, gfx, D_09000EB8_381258] + - [0x381278, gfx, D_09000ED8_381278] + - [0x381298, gfx, D_09000EF8_381298] + - [0x3812B8] - name: effect_recover dir: effects type: code @@ -3330,7 +3706,65 @@ segments: subsegments: - [0x3812C0, c, recover] - [0x381D80] - - [0x381E00, bin] # recover gfx + - name: effect_gfx_recover + dir: effects/gfx + type: code + start: 0x381E00 + vram: 0x09000000 + symbol_name_format: $VRAM_$ROM + subsegments: + - [0x381E00, c, recover] + - start: 0x381E00 + type: .data + name: recover + subsegments: + - [0x381E00, i8, D_09000000_381E00, 16, 32] + - [0x382000, i8, D_09000200_382000, 16, 32] + - [0x382200, i8, D_09000400_382200, 16, 32] + - [0x382400, i8, D_09000600_382400, 16, 32] + - [0x382600, i8, D_09000800_382600, 16, 32] + - [0x382800, i8, D_09000A00_382800, 16, 32] + - [0x382A00, i8, D_09000C00_382A00, 16, 32] + - [0x382C00, i8, D_09000E00_382C00, 16, 32] + - [0x382E00, i8, D_09001000_382E00, 16, 32] + - [0x383000, i8, D_09001200_383000, 16, 32] + - [0x383200, i8, D_09001400_383200, 16, 32] + - [0x383400, i8, D_09001600_383400, 16, 32] + - [0x383600, rgba16, D_09001800_383600, 32, 32] + - [0x383E00, rgba16, D_09002000_383E00, 32, 32] + - [0x384600, rgba16, D_09002800_384600, 32, 32] + - [0x384E00, vtx, D_09003000_384E00] + - [0x384E40, vtx, D_09003040_384E40] + - [0x384E80, vtx, D_09003080_384E80] + - [0x384EC0, vtx, D_090030C0_384EC0] + - [0x384F00, vtx, D_09003100_384F00] + - [0x384F40, vtx, D_09003140_384F40] + - [0x384F80, vtx, D_09003180_384F80] + - [0x384FC0, vtx, D_090031C0_384FC0] + - [0x385000, gfx, D_09003200_385000] + - [0x385098, gfx, D_09003298_385098] + - [0x385130, gfx, D_09003330_385130] + - [0x3851D0, gfx, D_090033D0_3851D0] + - [0x3851F0, gfx, D_090033F0_3851F0] + - [0x385210, gfx, D_09003410_385210] + - [0x385230, gfx, D_09003430_385230] + - [0x385250, gfx, D_09003450_385250] + - [0x385270, gfx, D_09003470_385270] + - [0x385290, gfx, D_09003490_385290] + - [0x3852B0, gfx, D_090034B0_3852B0] + - [0x3852D0, gfx, D_090034D0_3852D0] + - [0x385340, gfx, D_09003540_385340] + - [0x385380, gfx, D_09003580_385380] + - [0x3853C0, gfx, D_090035C0_3853C0] + - [0x385400, gfx, D_09003600_385400] + - [0x385440, gfx, D_09003640_385440] + - [0x385480, gfx, D_09003680_385480] + - [0x3854C0, gfx, D_090036C0_3854C0] + - [0x385500, gfx, D_09003700_385500] + - [0x385540, gfx, D_09003740_385540] + - [0x385580, gfx, D_09003780_385580] + - [0x3855C0, gfx, D_090037C0_3855C0] + - [0x385600, gfx, D_09003800_385600] - name: effect_disable_x dir: effects type: code @@ -3430,7 +3864,22 @@ segments: subsegments: - [0x38DE00, c, effect_46] - [0x38E8F0, data] - - [0x38E990, bin] # effect_46 gfx + - name: effect_gfx_effect_46 + dir: effects/gfx + type: code + start: 0x38E990 + vram: 0x09000000 + symbol_name_format: $VRAM_$ROM + subsegments: + - [0x38E990, c, effect_46] + - start: 0x38E990 + type: .data + name: effect_46 + subsegments: + - [0x38E990, i8, D_09000000_38E990, 32, 16] + - [0x38EB90, vtx, D_09000200_38EB90] + - [0x38ED30, gfx, D_090003A0_38ED30] + - [0x38EDB0, gfx, D_09000420_38EDB0] - name: effect_gather_magic dir: effects type: code @@ -3439,7 +3888,25 @@ segments: subsegments: - [0x38EE60, c, gather_magic] - [0x38F6F0, data] - - [0x38F710, bin] # gather_magic gfx + - name: effect_gfx_gather_magic + dir: effects/gfx + type: code + start: 0x38F710 + vram: 0x09000000 + symbol_name_format: $VRAM_$ROM + subsegments: + - [0x38F710, c, gather_magic] + - start: 0x38F710 + type: .data + name: gather_magic + subsegments: + - [0x38F710, i4, D_09000000_38F710, 16, 16] + - [0x38F790, gfx, D_09000080_38F790] + - [0x38F838, vtx, D_09000128_38F838] + - [0x38F878, vtx, D_09000168_38F878] + - [0x38F8B8, gfx, D_090001A8_38F8B8] + - [0x38F8D8, gfx, D_090001C8_38F8D8] + - [0x38F8F8] - name: effect_attack_result_text dir: effects type: code @@ -3498,7 +3965,32 @@ segments: subsegments: - [0x3928D0, c, flashing_box_shockwave] - [0x393080] - - [0x3930A0, bin] # flashing_box_shockwave gfx + - name: effect_gfx_flashing_box_shockwave + dir: effects/gfx + type: code + start: 0x3930A0 + vram: 0x09000000 + symbol_name_format: $VRAM_$ROM + subsegments: + - [0x3930A0, c, flashing_box_shockwave] + - start: 0x3930A0 + type: .data + name: flashing_box_shockwave + subsegments: + - [0x3930A0, i4, D_09000000_3930A0, 32, 32] + - [0x3932A0, i8, D_09000200_3932A0, 32, 32] + - [0x3936A0, gfx, D_09000600_3936A0] + - [0x393748, vtx, D_090006A8_393748] + - [0x393888, vtx, D_090007E8_393888] + - [0x393988, gfx, D_090008E8_393988] + - [0x3939F0, gfx, D_09000950_3939F0] + - [0x393A98, vtx, D_090009F8_393A98] + - [0x393BB8, vtx, D_09000B18_393BB8] + - [0x393C58, vtx, D_09000BB8_393C58] + - [0x393D98, vtx, D_09000CF8_393D98] + - [0x393EB8, vtx, D_09000E18_393EB8] + - [0x393F58, vtx, D_09000EB8_393F58] + - [0x394098, gfx, D_09000FF8_394098] - name: effect_balloon dir: effects type: code @@ -3596,7 +4088,27 @@ segments: subsegments: - [0x3A37E0, c, energy_orb_wave] - [0x3A42B0] - - [0x3A4320, bin] # energy_orb_wave gfx + - name: effect_gfx_energy_orb_wave + dir: effects/gfx + type: code + start: 0x3A4320 + vram: 0x09000000 + symbol_name_format: $VRAM_$ROM + subsegments: + - [0x3A4320, c, energy_orb_wave] + - start: 0x3A4320 + type: .data + name: energy_orb_wave + subsegments: + - [0x3A4320, i4, D_09000000_3A4320, 64, 64] + - [0x3A4B20, i8, D_09000800_3A4B20, 64, 32] + - [0x3A5320, gfx, D_09001000_3A5320] + - [0x3A53C8, gfx, D_090010A8_3A53C8] + - [0x3A5470, vtx, D_09001150_3A5470] + - [0x3A54B0, vtx, D_09001190_3A54B0] + - [0x3A54F0, gfx, D_090011D0_3A54F0] + - [0x3A5510, gfx, D_090011F0_3A5510] + - [0x3A5530, gfx, D_09001210_3A5530] - name: effect_merlin_house_stars dir: effects type: code @@ -3895,7 +4407,23 @@ segments: subsegments: - [0x3D4970, c, floating_cloud_puff] - [0x3D4E70, data] - - [0x3D4E90, bin] # floating_cloud_puff gfx + - name: effect_gfx_floating_cloud_puff + dir: effects/gfx + type: code + start: 0x3D4E90 + vram: 0x09000000 + symbol_name_format: $VRAM_$ROM + subsegments: + - [0x3D4E90, c, floating_cloud_puff] + - start: 0x3D4E90 + type: .data + name: floating_cloud_puff + subsegments: + - [0x3D4E90, ia4, D_09000000_3D4E90, 16, 16] + - [0x3D4F10, gfx, D_09000080_3D4F10] + - [0x3D4FB8, vtx, D_09000128_3D4FB8] + - [0x3D4FF8, gfx, D_09000168_3D4FF8] + - [0x3D5018] - name: effect_energy_in_out dir: effects type: code @@ -3904,7 +4432,53 @@ segments: subsegments: - [0x3D5020, c, energy_in_out] - [0x3D5E60, data] - - [0x3D5F30, bin] # energy_in_out gfx + - name: effect_gfx_energy_in_out + dir: effects/gfx + type: code + start: 0x3D5F30 + vram: 0x09000000 + symbol_name_format: $VRAM_$ROM + subsegments: + - [0x3D5F30, c, energy_in_out] + - start: 0x3D5F30 + type: .data + name: energy_in_out + subsegments: + - [0x3D5F30, i4, D_09000000_3D5F30, 16, 64] + - [0x3D6130, gfx, D_09000200_3D6130] + - [0x3D61D8, vtx, D_090002A8_3D61D8] + - [0x3D6218, vtx, D_090002E8_3D6218] + - [0x3D6258, vtx, D_09000328_3D6258] + - [0x3D6298, vtx, D_09000368_3D6298] + - [0x3D62D8, gfx, D_090003A8_3D62D8] + - [0x3D62F8, gfx, D_090003C8_3D62F8] + - [0x3D6318, gfx, D_090003E8_3D6318] + - [0x3D6338, gfx, D_09000408_3D6338] + - [0x3D6358, vtx, D_09000428_3D6358] + - [0x3D6398, vtx, D_09000468_3D6398] + - [0x3D63D8, vtx, D_090004A8_3D63D8] + - [0x3D6418, vtx, D_090004E8_3D6418] + - [0x3D6458, gfx, D_09000528_3D6458] + - [0x3D6470, gfx, D_09000540_3D6470] + - [0x3D6488, gfx, D_09000558_3D6488] + - [0x3D64A0, gfx, D_09000570_3D64A0] + - [0x3D64B8, vtx, D_09000588_3D64B8] + - [0x3D64F8, vtx, D_090005C8_3D64F8] + - [0x3D6538, vtx, D_09000608_3D6538] + - [0x3D6578, vtx, D_09000648_3D6578] + - [0x3D65B8, gfx, D_09000688_3D65B8] + - [0x3D65D8, gfx, D_090006A8_3D65D8] + - [0x3D65F8, gfx, D_090006C8_3D65F8] + - [0x3D6618, gfx, D_090006E8_3D6618] + - [0x3D6638, vtx, D_09000708_3D6638] + - [0x3D6678, vtx, D_09000748_3D6678] + - [0x3D66B8, vtx, D_09000788_3D66B8] + - [0x3D66F8, vtx, D_090007C8_3D66F8] + - [0x3D6738, gfx, D_09000808_3D6738] + - [0x3D6758, gfx, D_09000828_3D6758] + - [0x3D6778, gfx, D_09000848_3D6778] + - [0x3D6798, gfx, D_09000868_3D6798] + - [0x3D67B8] - name: effect_tattle_window dir: effects type: code @@ -3994,7 +4568,34 @@ segments: subsegments: - [0x3E1EE0, c, effect_75] - [0x3E2930] - - [0x3E2960, bin] # effect_75 gfx + - name: effect_gfx_effect_75 + dir: effects/gfx + type: code + start: 0x3E2960 + vram: 0x09000000 + symbol_name_format: $VRAM_$ROM + subsegments: + - [0x3E2960, c, effect_75] + - start: 0x3E2960 + type: .data + name: effect_75 + subsegments: + - [0x3E2960, i4, D_09000000_3E2960, 64, 64] + - [0x3E3160, i4, D_09000800_3E3160, 64, 64] + - [0x3E3960, vtx, D_09001000_3E3960] + - [0x3E39D0, vtx, D_09001070_3E39D0] + - [0x3E3AF0, vtx, D_09001190_3E3AF0] + - [0x3E3C30, vtx, D_090012D0_3E3C30] + - [0x3E3E30, vtx, D_090014D0_3E3E30] + - [0x3E4030, gfx, D_090016D0_3E4030] + - [0x3E4098, gfx, D_09001738_3E4098] + - [0x3E4100, gfx, D_090017A0_3E4100] + - [0x3E4238, gfx, D_090018D8_3E4238] + - [0x3E4258, gfx, D_090018F8_3E4258] + - [0x3E4268] # padding + - [0x3E4270, gfx, D_09001910_3E4270] + - [0x3E4360, gfx, D_09001A00_3E4360] + - [0x3E4380, gfx, D_09001A20_3E4380] - name: effect_firework_rocket dir: effects type: code @@ -4212,9 +4813,123 @@ segments: subsegments: - [0x3FEAE0, c, lil_oink] - [0x3FF180] - - start: 0x3FF250 # lil_oink gfx - type: bin - align: 16 + - name: effect_gfx_lil_oink + dir: effects/gfx + type: code + start: 0x3FF250 + vram: 0x09000000 + symbol_name_format: $VRAM_$ROM + subsegments: + - [0x3FF250, c, lil_oink] + - start: 0x3FF250 + type: .data + name: lil_oink + subsegments: + - [0x3FF250, vtx, D_09000000_3FF250] + - [0x3FF2D0, vtx, D_09000080_3FF2D0] + - [0x3FF2F0, vtx, D_090000A0_3FF2F0] + - [0x3FF330, vtx, D_090000E0_3FF330] + - [0x3FF340, vtx, D_090000F0_3FF340] + - [0x3FF390, vtx, D_09000140_3FF390] + - [0x3FF3A0, vtx, D_09000150_3FF3A0] + - [0x3FF3E0, vtx, D_09000190_3FF3E0] + - [0x3FF430, vtx, D_090001E0_3FF430] + - [0x3FF480, vtx, D_09000230_3FF480] + - [0x3FF4A0, vtx, D_09000250_3FF4A0] + - [0x3FF4C0, vtx, D_09000270_3FF4C0] + - [0x3FF4D0, vtx, D_09000280_3FF4D0] + - [0x3FF550, vtx, D_09000300_3FF550] + - [0x3FF5E0, vtx, D_09000390_3FF5E0] + - [0x3FF660, vtx, D_09000410_3FF660] + - [0x3FF6F0, vtx, D_090004A0_3FF6F0] + - [0x3FF710, vtx, D_090004C0_3FF710] + - [0x3FF770, vtx, D_09000520_3FF770] + - [0x3FF790, vtx, D_09000540_3FF790] + - [0x3FF7F0, gfx, D_090005A0_3FF7F0] + - [0x3FF9E0, gfx, D_09000790_3FF9E0] + - [0x3FFBD0, gfx, D_09000980_3FFBD0] + - [0x3FFDA0, gfx, D_09000B50_3FFDA0] + - [0x3FFDC0, gfx, D_09000B70_3FFDC0] + - [0x3FFDD0, gfx, D_09000B80_3FFDD0] + - [0x3FFDE0, gfx, D_09000B90_3FFDE0] + - [0x3FFDE8, vtx, D_09000B98_3FFDE8] + - [0x3FFE68, vtx, D_09000C18_3FFE68] + - [0x3FFE88, vtx, D_09000C38_3FFE88] + - [0x3FFEC8, vtx, D_09000C78_3FFEC8] + - [0x3FFED8, vtx, D_09000C88_3FFED8] + - [0x3FFF28, vtx, D_09000CD8_3FFF28] + - [0x3FFF38, vtx, D_09000CE8_3FFF38] + - [0x3FFF78, vtx, D_09000D28_3FFF78] + - [0x3FFFC8, vtx, D_09000D78_3FFFC8] + - [0x400018, vtx, D_09000DC8_400018] + - [0x400038, vtx, D_09000DE8_400038] + - [0x400058, vtx, D_09000E08_400058] + - [0x400068, vtx, D_09000E18_400068] + - [0x400098, vtx, D_09000E48_400098] + - [0x4000E8, vtx, D_09000E98_4000E8] + - [0x400138, vtx, D_09000EE8_400138] + - [0x400188, vtx, D_09000F38_400188] + - [0x4001C8, vtx, D_09000F78_4001C8] + - [0x4001D8, vtx, D_09000F88_4001D8] + - [0x4001F8, vtx, D_09000FA8_4001F8] + - [0x400288, vtx, D_09001038_400288] + - [0x4002A8, vtx, D_09001058_4002A8] + - [0x4002B8, vtx, D_09001068_4002B8] + - [0x400308, vtx, D_090010B8_400308] + - [0x400348, vtx, D_090010F8_400348] + - [0x4003C8, gfx, D_09001178_4003C8] + - [0x4005C8, gfx, D_09001378_4005C8] + - [0x4007C8, gfx, D_09001578_4007C8] + - [0x4009A8, gfx, D_09001758_4009A8] + - [0x4009C8, gfx, D_09001778_4009C8] + - [0x4009D8, gfx, D_09001788_4009D8] + - [0x4009E8, gfx, D_09001798_4009E8] + - [0x4009F8] # padding + - [0x400A00, ci4, D_090017B0_400A00, 16, 8] + - [0x400A40, palette, D_090017B0_400A00] + - [0x400A60] # padding + - [0x400C40, ci4, D_090019F0_400C40, 16, 8] + - [0x400C80, palette, D_090019F0_400C40] + - [0x400CA0] # padding + - [0x400E80, ci4, D_09001C30_400E80, 16, 8] + - [0x400EC0, palette, D_09001C30_400E80] + - [0x400EE0] # padding + - [0x4010C0, ci4, D_09001E70_4010C0, 16, 8] + - [0x401100, palette, D_09001E70_4010C0] + - [0x401120] # padding + - [0x401300, ci4, D_090020B0_401300, 16, 8] + - [0x401340, palette, D_090020B0_401300] + - [0x401360] # padding + - [0x401540, ci4, D_090022F0_401540, 16, 8] + - [0x401580, palette, D_090022F0_401540] + - [0x4015A0] # padding + - [0x401780, ci4, D_09002530_401780, 16, 8] + - [0x4017C0, palette, D_09002530_401780] + - [0x4017E0] # padding + - [0x4019C0, ci4, D_09002770_4019C0, 32, 16] + - [0x401AC0, palette, D_09002770_4019C0] + - [0x401AE0] # padding + - [0x401CC0, ci4, D_09002A70_401CC0, 32, 16] + - [0x401DC0, palette, D_09002A70_401CC0] + - [0x401DE0] # padding + - [0x401FC0, gfx, D_09002D70_401FC0] + - [0x402028, gfx, D_09002DD8_402028] + - [0x4020C0, gfx, D_09002E70_4020C0] + - [0x4020E8, gfx, D_09002E98_4020E8] + - [0x402180, gfx, D_09002F30_402180] + - [0x402218, gfx, D_09002FC8_402218] + - [0x4022B0, gfx, D_09003060_4022B0] + - [0x402348, gfx, D_090030F8_402348] + - [0x4023E0, gfx, D_09003190_4023E0] + - [0x402478, gfx, D_09003228_402478] + - [0x402510, gfx, D_090032C0_402510] + - [0x4025A8, gfx, D_09003358_4025A8] + - [0x4025C0, gfx, D_09003370_4025C0] + - [0x4025D8, gfx, D_09003388_4025D8] + - [0x4025F0, gfx, D_090033A0_4025F0] + - [0x402608, gfx, D_090033B8_402608] + - [0x402620, gfx, D_090033D0_402620] + - [0x402638] - name: effect_something_rotating dir: effects type: code diff --git a/ver/us/undefined_syms.txt b/ver/us/undefined_syms.txt index 32b6a7c45a..600d8a9c3f 100644 --- a/ver/us/undefined_syms.txt +++ b/ver/us/undefined_syms.txt @@ -39,40 +39,6 @@ fx_sun_undeclared = fx_sun; D_E007EC2F = 0xE007EC2F; -// effect_lil_oink -D_09002D70 = 0x09002D70; -D_09002DD8 = 0x09002DD8; -D_09002E70 = 0x09002E70; -D_09002E98 = 0x09002E98; -D_09002F30 = 0x09002F30; -D_09002FC8 = 0x09002FC8; -D_09003060 = 0x09003060; -D_090030F8 = 0x090030F8; -D_09003190 = 0x09003190; -D_09003228 = 0x09003228; -D_090032C0 = 0x090032C0; -D_09003358 = 0x09003358; -D_09003370 = 0x09003370; -D_09003388 = 0x09003388; - -// effect_landing_dust effect_walking_dust -D_09002780 = 0x09002780; -D_09002868 = 0x09002868; -D_09002950 = 0x09002950; -D_09002A38 = 0x09002A38; -D_09002B20 = 0x09002B20; -D_09002B40 = 0x09002B40; -D_09002B60 = 0x09002B60; - -// emote -D_090022E0 = 0x090022E0; -D_09002238 = 0x09002238; -D_09002308 = 0x09002308; -D_090023D8 = 0x090023D8; -D_09002480 = 0x09002480; -D_090024A8 = 0x090024A8; -D_09002550 = 0x09002550; - // effect_attack_result_text D_09001500 = 0x09001500; D_090015A8 = 0x090015A8; @@ -87,68 +53,6 @@ D_090018F8 = 0x090018F8; D_09001918 = 0x09001918; D_09001938 = 0x09001938; -// effect_damage_stars -D_090004C0 = 0x090004C0; -D_090005E0 = 0x090005E0; - -// effect_drop_leaves -D_09001180 = 0x09001180; -D_09001230 = 0x09001230; - -// effect_dust -D_09000CC0 = 0x09000CC0; -D_09000D68 = 0x09000D68; -D_09000E18 = 0x09000E18; -D_09000E38 = 0x09000E38; -D_09000E58 = 0x09000E58; - -// effect_ending_decals -D_09001E40 = 0x09001E40; - -// effect_energy_in_out -D_09000200 = 0x09000200; -D_09000688 = 0x09000688; -D_09000808 = 0x09000808; - -// effect_energy_orb_wave -D_09001000 = 0x09001000; -D_090010A8 = 0x090010A8; -D_090011D0 = 0x090011D0; -D_090011F0 = 0x090011F0; -D_09001210 = 0x09001210; - -// effect_energy_shockwave -D_09000DC0 = 0x09000DC0; -D_09000E60 = 0x09000E60; - -// effect_explosion -D_09000840 = 0x09000840; -D_090008F0 = 0x090008F0; -D_09000910 = 0x09000910; - -// effect_falling_leaves -D_09001100 = 0x09001100; -D_090011B0 = 0x090011B0; - -// effect_fire_flower -D_09000000 = 0x09000000; -D_09000D40 = 0x09000D40; -D_09000DE0 = 0x09000DE0; -D_09000EB8 = 0x09000EB8; -D_09000ED8 = 0x09000ED8; -D_09000EF8 = 0x09000EF8; -D_09000000 = 0x09000000; - -// effect_flashing_box_shockwave -D_09000600 = 0x09000600; -D_090008E8 = 0x090008E8; -D_09000950 = 0x09000950; -D_09000FF8 = 0x09000FF8; - -// effect_floating_cloud -D_09000080 = 0x09000080; -D_09000168 = 0x09000168; - // effect_floating_rock D_09000450 = 0x09000450; @@ -158,30 +62,6 @@ D_09002020 = 0x09002020; D_09004040 = 0x09004040; D_09008BE0 = 0x09008BE0; -// effect_gather_magic -D_09000080 = 0x09000080; - -// effect_got_item_outline -D_09000000 = 0x09000000; -D_09004000 = 0x09004000; -D_09008100 = 0x09008100; - -// effect_green_impact -D_09000540 = 0x09000540; - -// effect_3D -D_09000240 = 0x09000240; -D_090002E8 = 0x090002E8; - -// effect_46 -D_090003A0 = 0x090003A0; -D_09000420 = 0x09000420; - -// effect_75 -D_09001910 = 0x09001910; -D_09001A00 = 0x09001A00; -D_09001A20 = 0x09001A20; - // effect_134 D_09000800 = 0x09000800; D_09000BA8 = 0x09000BA8; @@ -197,42 +77,6 @@ D_09000CC8 = 0x09000CC8; D_09000CE8 = 0x09000CE8; D_09000D08 = 0x09000D08; -// effect_music_note -D_09001038 = 0x09001038; -D_090010C0 = 0x090010C0; -D_09001148 = 0x09001148; -D_090011D0 = 0x090011D0; -D_09001258 = 0x09001258; -D_090012E0 = 0x090012E0; -D_09001368 = 0x09001368; - -// effect_recover -D_09003540 = 0x09003540; -D_09003580 = 0x09003580; -D_090035C0 = 0x090035C0; -D_09003600 = 0x09003600; -D_09003640 = 0x09003640; -D_09003680 = 0x09003680; -D_090036C0 = 0x090036C0; -D_09003700 = 0x09003700; -D_09003740 = 0x09003740; -D_09003780 = 0x09003780; -D_090037C0 = 0x090037C0; -D_09003800 = 0x09003800; - -// effect_aura -D_090023E0 = 0x090023E0; -D_09002440 = 0x09002440; -D_090023F8 = 0x090023F8; -D_09002458 = 0x09002458; -D_090023B0 = 0x090023B0; -D_09002410 = 0x09002410; -D_090023C8 = 0x090023C8; -D_09002428 = 0x09002428; -D_09002000 = 0x09002000; -D_090020E8 = 0x090020E8; -D_090021D0 = 0x090021D0; - // effect_bombette_breaking D_090018C0 = 0x090018C0; D_09001D00 = 0x09001D00;