Game-Decompilation/mm
1
0
Fork 0
mirror of https://github.com/zeldaret/mm.git synced 2024-11-27 14:51:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

General Cleanup 12 (#1139)

Browse Source 
* undefined syms

* fire footprint outnames

* material/model DLs

* iceblock

* enHorse

* const ActorInit

* Remove some &

* flash

* KusaBushTypeDL

* gWarpTagGoronTrialBaseCollider -> gWarpTagGoronTrialBaseCol

* iceblock col
This commit is contained in:
Derek Hensley 2022-10-28 09:58:27 -07:00 committed by GitHub
parent c6ec00f0dd
commit f191044a05
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
35 changed files with 147 additions and 525 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
assets/xml/objects/gameplay_dangeon_keep.xml
View File

@ -88,6 +88,6 @@
<DList Name="gWarpTagGoronTrialBaseDL" Offset="0x21EF0" />
<Texture Name="gWarpTagRainbowTex" OutName="warptag_rainbow" Format="rgba32" Width="32" Height="32" Offset="0x21FF8" />
<TextureAnimation Name="gWarpTagRainbowTexAnim" Offset="0x23008" />
<Collision Name="gWarpTagGoronTrialBaseCollider" Offset="0x2324C" />
<Collision Name="gWarpTagGoronTrialBaseCol" Offset="0x2324C" />
</File>
</Root>

4
assets/xml/objects/gameplay_field_keep.xml
View File

@ -40,8 +40,8 @@
<DList Name="gameplay_field_keep_DL_006760" Offset="0x6760" />
<Texture Name="gameplay_field_keep_Tex_006810" OutName="tex_006810" Format="rgba16" Width="32" Height="32" Offset="0x6810" />
<Texture Name="gameplay_field_keep_Tex_007010" OutName="tex_007010" Format="rgba16" Width="32" Height="32" Offset="0x7010" />
<DList Name="gKusaBushType1" Offset="0x78A0" />
<DList Name="gKusaBushType2" Offset="0x7938" />
<DList Name="gKusaBushType1DL" Offset="0x78A0" />
<DList Name="gKusaBushType2DL" Offset="0x7938" />
<Texture Name="gameplay_field_keep_Tex_0079D0" OutName="tex_0079D0" Format="i8" Width="64" Height="32" Offset="0x79D0" />
<Texture Name="gameplay_field_keep_Tex_0081D0" OutName="tex_0081D0" Format="ia8" Width="64" Height="32" Offset="0x81D0" />
<DList Name="gameplay_field_keep_DL_0089D0" Offset="0x89D0" />

38
assets/xml/objects/gameplay_keep.xml
View File

@ -932,16 +932,16 @@
<Animation Name="gameplay_keep_Anim_022FF0" Offset="0x22FF0" />
<Collision Name="gDoorCol" Offset="0x23100" />
<DList Name="gEffDustDL" Offset="0x23130" />
<DList Name="gOwlStatueWhiteFlashDL" Offset="0x23210" />
<DList Name="gameplay_keep_DL_023288" Offset="0x23288" />
<DList Name="gLightOrb1DL" Offset="0x23348" />
<DList Name="gLightOrb2DL" Offset="0x233B8" />
<DList Name="gLightOrbVtxDL" Offset="0x23428" />
<DList Name="gElectricSparkDL" Offset="0x23480" />
<DList Name="gElectricSparkVtxDL" Offset="0x234F0" />
<Texture Name="gLightOrbTex" OutName="light_orb" Format="i8" Width="64" Height="64" Offset="0x23508" />
<DList Name="gEffFlash1DL" Offset="0x23210" />
<DList Name="gEffFlash2DL" Offset="0x23288" />
<DList Name="gLightOrbMaterial1DL" Offset="0x23348" />
<DList Name="gLightOrbMaterial2DL" Offset="0x233B8" />
<DList Name="gLightOrbModelDL" Offset="0x23428" />
<DList Name="gElectricSparkMaterialDL" Offset="0x23480" />
<DList Name="gElectricSparkModelDL" Offset="0x234F0" />
<Texture Name="gFlashTex" OutName="flash" Format="i8" Width="64" Height="64" Offset="0x23508" />
<!-- EnMThunder (Spin Attack and Sword Beams)-->
<!-- EnMThunder (Spin Attack and Sword Beams) -->
<!-- Spin Attack -->
<Texture Name="gSpinAttack1Tex" OutName="spin_attack_1" Format="i8" Width="64" Height="32" Offset="0x24510" />
<Texture Name="gSpinAttack2Tex" OutName="spin_attack_2" Format="i8" Width="64" Height="32" Offset="0x24D10" />
@ -1039,14 +1039,14 @@
<Texture Name="gEffShockwaveTex" OutName="eff_shockwave" Format="i8" Width="64" Height="64" Offset="0x2F100" />
<DList Name="gEffShockwaveDL" Offset="0x30100" />
<DList Name="gEffBubbleDL" Offset="0x301B0" />
<Texture Name="gEffFireFootprint1Tex" OutName="tex_030270" Format="ia8" Width="32" Height="32" Offset="0x30270" />
<Texture Name="gEffFireFootprint2Tex" OutName="tex_030670" Format="ia8" Width="32" Height="32" Offset="0x30670" />
<Texture Name="gEffFireFootprint3Tex" OutName="tex_030A70" Format="ia8" Width="32" Height="32" Offset="0x30A70" />
<Texture Name="gEffFireFootprint4Tex" OutName="tex_030E70" Format="ia8" Width="32" Height="32" Offset="0x30E70" />
<Texture Name="gEffFireFootprint5Tex" OutName="tex_031270" Format="ia8" Width="32" Height="32" Offset="0x31270" />
<Texture Name="gEffFireFootprint6Tex" OutName="tex_031670" Format="ia8" Width="32" Height="32" Offset="0x31670" />
<Texture Name="gEffFireFootprint7Tex" OutName="tex_031A70" Format="ia8" Width="32" Height="32" Offset="0x31A70" />
<Texture Name="gEffFireFootprint8Tex" OutName="tex_031E70" Format="ia8" Width="32" Height="32" Offset="0x31E70" />
<Texture Name="gEffFireFootprint1Tex" OutName="eff_fire_footprint_1" Format="ia8" Width="32" Height="32" Offset="0x30270" />
<Texture Name="gEffFireFootprint2Tex" OutName="eff_fire_footprint_2" Format="ia8" Width="32" Height="32" Offset="0x30670" />
<Texture Name="gEffFireFootprint3Tex" OutName="eff_fire_footprint_3" Format="ia8" Width="32" Height="32" Offset="0x30A70" />
<Texture Name="gEffFireFootprint4Tex" OutName="eff_fire_footprint_4" Format="ia8" Width="32" Height="32" Offset="0x30E70" />
<Texture Name="gEffFireFootprint5Tex" OutName="eff_fire_footprint_5" Format="ia8" Width="32" Height="32" Offset="0x31270" />
<Texture Name="gEffFireFootprint6Tex" OutName="eff_fire_footprint_6" Format="ia8" Width="32" Height="32" Offset="0x31670" />
<Texture Name="gEffFireFootprint7Tex" OutName="eff_fire_footprint_7" Format="ia8" Width="32" Height="32" Offset="0x31A70" />
<Texture Name="gEffFireFootprint8Tex" OutName="eff_fire_footprint_8" Format="ia8" Width="32" Height="32" Offset="0x31E70" />
<DList Name="gEffFireFootprintDL" Offset="0x32270" />
<Texture Name="gameplay_keep_Tex_032310" OutName="tex_032310" Format="rgba32" Width="16" Height="64" Offset="0x32310" />
<Texture Name="gEffHitmarkWhiteMetal1Tex" OutName="eff_hitmark_white_metal_1" Format="i4" Width="32" Height="24" Offset="0x33310" />
@ -1154,8 +1154,8 @@
<DList Name="gEffIceFragment3DL" Offset="0x50D10" />
<Texture Name="gEffIceSmokeTex" OutName="eff_ice_smoke" Format="i4" Width="32" Height="32" Offset="0x50E80" />
<DList Name="gEffIceSmokeDL" Offset="0x510B0" />
<DList Name="gFrozenSteamDL" Offset="0x51180" />
<DList Name="gFrozenSteamVtxDL" Offset="0x51238" />
<DList Name="gFrozenSteamMaterialDL" Offset="0x51180" />
<DList Name="gFrozenSteamModelDL" Offset="0x51238" />
<Animation Name="gameplay_keep_Anim_05140C" Offset="0x5140C" />
<DList Name="gameplay_keep_DL_051420" Offset="0x51420" />
<DList Name="gameplay_keep_DL_0514C0" Offset="0x514C0" />

6
assets/xml/objects/object_bigslime.xml
View File

@ -101,12 +101,12 @@
<Texture Name="gBigslimeShockwave2Tex" OutName="bigslime_shockwave_2" Format="i4" Width="16" Height="16" Offset="0x10428" />
<Blob Name="object_bigslime_zeroes_Blob_0104A8" Size="0x88" Offset="0x104A8" />
<DList Name="gBigslimeNormalDL" Offset="0x10530" />
<DList Name="gBigslimeNormalMaterialDL" Offset="0x10530" />
<!-- Reads vtx from segment 9 set by sBigslimeDynamicVtx -->
<DList Name="gBigslimeVtxDL" Offset="0x105E8" />
<DList Name="gBigslimeModelDL" Offset="0x105E8" />
<!-- Reads vtx from segment 9 set by sBigslimeTargetVtx -->
<DList Name="gBigslimeFrozenVtxDL" Offset="0x10B80" />
<DList Name="gBigslimeFrozenMaterialDL" Offset="0x10B80" />
<TextureAnimation Name="gBigslimeFrozenTexAnim" Offset="0x10C48" />
<DList Name="gMinislimeFrozenDL" Offset="0x10DB0" />

48
assets/xml/objects/object_fish.xml
View File

@ -43,17 +43,17 @@
<Texture Name="object_fish_Tex_0030E0" OutName="tex_0030E0" Format="i4" Width="16" Height="16" Offset="0x30E0" />
<DList Name="gFishingStreamSplashDL" Offset="0x3230" />
<Texture Name="object_fish_Tex_003320" OutName="tex_003320" Format="ia8" Width="16" Height="16" Offset="0x3320" />
<DList Name="gFishingBubbleSetupDL" Offset="0x3460" />
<DList Name="gFishingBubbleVtxDL" Offset="0x34C0" />
<DList Name="gFishingBubbleMaterialDL" Offset="0x3460" />
<DList Name="gFishingBubbleModelDL" Offset="0x34C0" />
<Texture Name="object_fish_Tex_0034E0" OutName="tex_0034E0" Format="i8" Width="16" Height="16" Offset="0x34E0" />
<DList Name="gFishingDustSplashSetupDL" Offset="0x3610" />
<DList Name="gFishingDustSplashVtxDL" Offset="0x3680" />
<DList Name="gFishingDustSplashMaterialDL" Offset="0x3610" />
<DList Name="gFishingDustSplashModelDL" Offset="0x3680" />
<DList Name="object_fish_DL_0036E0" Offset="0x36E0" />
<DList Name="gFishingLineVtxDL" Offset="0x3710" />
<DList Name="gFishingRainDropVtxDL" Offset="0x3760" />
<DList Name="gFishingLineModelDL" Offset="0x3710" />
<DList Name="gFishingRainDropModelDL" Offset="0x3760" />
<Texture Name="object_fish_Tex_003778" OutName="tex_003778" Format="rgba16" Width="16" Height="16" Offset="0x3778" />
<DList Name="gFishingRainSplashSetupDL" Offset="0x39A8" />
<DList Name="gFishingRainSplashVtxDL" Offset="0x3A18" />
<DList Name="gFishingRainSplashMaterialDL" Offset="0x39A8" />
<DList Name="gFishingRainSplashModelDL" Offset="0x3A18" />
<Animation Name="gFishingOwnerAnim" Offset="0x453C" />
<DList Name="object_fish_DL_006F60" Offset="0x6F60" />
<DList Name="gFishingOwnerHairDL" Offset="0x7350" />
@ -74,11 +74,11 @@
<Limb Name="object_fish_Standardlimb_0085C0" Type="Standard" EnumName="OBJECT_FISH_2_LIMB_07" Offset="0x85C0" />
<Limb Name="object_fish_Standardlimb_0085CC" Type="Standard" EnumName="OBJECT_FISH_2_LIMB_08" Offset="0x85CC" />
<Skeleton Name="gFishingOwnerSkel" Type="Flex" LimbType="Standard" LimbNone="OBJECT_FISH_2_LIMB_NONE" LimbMax="OBJECT_FISH_2_LIMB_MAX" EnumName="ObjectFish2Limb" Offset="0x85F8" />
<DList Name="gFishingRippleSetupDL" Offset="0x8610" />
<DList Name="gFishingRippleVtxDL" Offset="0x8678" />
<DList Name="gFishingRippleMaterialDL" Offset="0x8610" />
<DList Name="gFishingRippleModelDL" Offset="0x8678" />
<Texture Name="object_fish_Tex_008690" OutName="tex_008690" Format="i4" Width="32" Height="32" Offset="0x8690" />
<DList Name="gFishingWaterDustSetupDL" Offset="0x88C0" />
<DList Name="gFishingWaterDustVtxDL" Offset="0x8970" />
<DList Name="gFishingWaterDustMaterialDL" Offset="0x88C0" />
<DList Name="gFishingWaterDustModelDL" Offset="0x8970" />
<Texture Name="object_fish_TLUT_008990" OutName="tlut_008990" Format="rgba16" Width="16" Height="16" Offset="0x8990" />
<Texture Name="object_fish_Tex_008B90" OutName="tex_008B90" Format="ci8" Width="8" Height="8" Offset="0x8B90" />
<Texture Name="object_fish_Tex_008BD0" OutName="tex_008BD0" Format="ci8" Width="16" Height="16" Offset="0x8BD0" />
@ -95,11 +95,11 @@
<Texture Name="object_fish_Tex_00A790" OutName="tex_00A790" Format="ci8" Width="8" Height="16" Offset="0xA790" />
<Texture Name="object_fish_Tex_00A810" OutName="tex_00A810" Format="ci8" Width="16" Height="16" Offset="0xA810" />
<Texture Name="object_fish_Tex_00A910" OutName="tex_00A910" Format="ia8" Width="64" Height="64" Offset="0xA910" />
<DList Name="gFishingSinkingLureSegmentSetupDL" Offset="0xB950" />
<DList Name="gFishingSinkingLureSegmentVtxDL" Offset="0xB9C0" />
<DList Name="gFishingSinkingLureSegmentMaterialDL" Offset="0xB950" />
<DList Name="gFishingSinkingLureSegmentModelDL" Offset="0xB9C0" />
<Texture Name="object_fish_Tex_00B9E0" OutName="tex_00B9E0" Format="rgba16" Width="64" Height="16" Offset="0xB9E0" />
<DList Name="gFishingGroupFishSetupDL" Offset="0xC220" />
<DList Name="gFishingGroupFishVtxDL" Offset="0xC298" />
<DList Name="gFishingGroupFishMaterialDL" Offset="0xC220" />
<DList Name="gFishingGroupFishModelDL" Offset="0xC298" />
<DList Name="object_fish_DL_00C650" Offset="0xC650" />
<Texture Name="object_fish_Tex_00C780" OutName="tex_00C780" Format="rgba16" Width="32" Height="32" Offset="0xC780" />
<Animation Name="gFishingLoachAnim" Offset="0xCFE0" />
@ -144,15 +144,15 @@
<DList Name="gFishingLureFloatDL" Offset="0x121F0" />
<Texture Name="object_fish_Tex_0122E0" OutName="tex_0122E0" Format="rgba16" Width="32" Height="32" Offset="0x122E0" />
<Texture Name="object_fish_Tex_012AE0" OutName="tex_012AE0" Format="rgba16" Width="32" Height="32" Offset="0x12AE0" />
<DList Name="gFishingLilyPadSetupDL" Offset="0x13330" />
<DList Name="gFishingLilyPadVtxDL" Offset="0x133B0" />
<DList Name="gFishingRockSetupDL" Offset="0x13590" />
<DList Name="gFishingRockVtxDL" Offset="0x13610" />
<DList Name="gFishingLilyPadMaterialDL" Offset="0x13330" />
<DList Name="gFishingLilyPadModelDL" Offset="0x133B0" />
<DList Name="gFishingRockMaterialDL" Offset="0x13590" />
<DList Name="gFishingRockModelDL" Offset="0x13610" />
<Texture Name="object_fish_Tex_013660" OutName="tex_013660" Format="rgba16" Width="32" Height="32" Offset="0x13660" />
<DList Name="gFishingWoodPostSetupDL" Offset="0x13F50" />
<DList Name="gFishingWoodPostVtxDL" Offset="0x13FD0" />
<DList Name="gFishingReedSetupDL" Offset="0x14030" />
<DList Name="gFishingReedVtxDL" Offset="0x140B0" />
<DList Name="gFishingWoodPostMaterialDL" Offset="0x13F50" />
<DList Name="gFishingWoodPostModelDL" Offset="0x13FD0" />
<DList Name="gFishingReedMaterialDL" Offset="0x14030" />
<DList Name="gFishingReedModelDL" Offset="0x140B0" />
<Texture Name="object_fish_Tex_0140D0" OutName="tex_0140D0" Format="rgba16" Width="16" Height="16" Offset="0x140D0" />
<Texture Name="object_fish_Tex_0142D0" OutName="tex_0142D0" Format="rgba16" Width="32" Height="32" Offset="0x142D0" />
<Texture Name="object_fish_Tex_014AD0" OutName="tex_014AD0" Format="i8" Width="32" Height="32" Offset="0x14AD0" />

6
assets/xml/objects/object_ice_block.xml
View File

@ -5,7 +5,7 @@
<DList Name="gIceBlockCubeEndDL" Offset="0x310" />
<!-- this TexAnim is for the cube surface -->
<TextureAnimation Name="gIceBlockCubeSublimatingAirTexAnim" Offset="0x328" />
<Collision Name="gIceBlockDynaColHeader" Offset="0x438" />
<Collision Name="gIceBlockCol" Offset="0x438" />
<!-- IceArrow Freezes Octarock into a floating Iceberg platform -->
<DList Name="gIceBlockIceBergDL" Offset="0x7F0" />
@ -21,8 +21,8 @@
<!-- These two appear to be identical (but different hash) -->
<!-- first is used in CubeDL and ShardDL -->
<Texture Name="gIceBlockIceTex1" OutName="ice_texture_1" Format="i4" Width="64" Height="64" Offset="0xAE0" />
<Texture Name="gIceBlockIce1Tex" OutName="iceblock_ice_1" Format="i4" Width="64" Height="64" Offset="0xAE0" />
<!-- second is used in CubeDL and IceBergDL -->
<Texture Name="gIceBlockIceTex2" OutName="ice_texture_2" Format="i4" Width="64" Height="64" Offset="0x12E0" />
<Texture Name="gIceBlockIce2Tex" OutName="iceblock_ice_2" Format="i4" Width="64" Height="64" Offset="0x12E0" />
</File>
</Root>

14
src/code/z_actor.c
View File

@ -4545,7 +4545,7 @@ void Actor_DrawDamageEffects(PlayState* play, Actor* actor, Vec3f limbPos[], s16
gDPSetColorDither(POLY_XLU_DISP++, G_CD_BAYER);
gDPSetAlphaDither(POLY_XLU_DISP++, G_AD_PATTERN);
gSPDisplayList(POLY_XLU_DISP++, gFrozenSteamDL);
gSPDisplayList(POLY_XLU_DISP++, gFrozenSteamMaterialDL);
alpha = effectAlpha * 100.0f;
if (alpha > 100.0f) {
@ -4568,7 +4568,7 @@ void Actor_DrawDamageEffects(PlayState* play, Actor* actor, Vec3f limbPos[], s16
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(play->state.gfxCtx),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, gFrozenSteamVtxDL);
gSPDisplayList(POLY_XLU_DISP++, gFrozenSteamModelDL);
}
break;
@ -4627,7 +4627,7 @@ void Actor_DrawDamageEffects(PlayState* play, Actor* actor, Vec3f limbPos[], s16
lightOrbsScale = ((KREG(19) * 0.01f) + 4.0f) * effectScale;
gSPDisplayList(POLY_XLU_DISP++, gLightOrb1DL);
gSPDisplayList(POLY_XLU_DISP++, gLightOrbMaterial1DL);
alpha = effectAlpha * 255.0f;
if (alpha > 255.0f) {
@ -4658,7 +4658,7 @@ void Actor_DrawDamageEffects(PlayState* play, Actor* actor, Vec3f limbPos[], s16
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(play->state.gfxCtx),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, gLightOrbVtxDL);
gSPDisplayList(POLY_XLU_DISP++, gLightOrbModelDL);
}
break;
@ -4676,7 +4676,7 @@ void Actor_DrawDamageEffects(PlayState* play, Actor* actor, Vec3f limbPos[], s16
gSPSegment(POLY_XLU_DISP++, 0x08,
Lib_SegmentedToVirtual(sElectricSparkTextures[play->gameplayFrames % 4]));
gSPDisplayList(POLY_XLU_DISP++, gElectricSparkDL);
gSPDisplayList(POLY_XLU_DISP++, gElectricSparkMaterialDL);
gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, (u8)(sREG(16) + 255), (u8)(sREG(17) + 255), (u8)(sREG(18) + 150),
(u8)(sREG(19) + 255));
@ -4698,7 +4698,7 @@ void Actor_DrawDamageEffects(PlayState* play, Actor* actor, Vec3f limbPos[], s16
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(play->state.gfxCtx),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, gElectricSparkVtxDL);
gSPDisplayList(POLY_XLU_DISP++, gElectricSparkModelDL);
// second electric spark
Matrix_RotateXFApply(Rand_ZeroFloat(2 * M_PI));
@ -4710,7 +4710,7 @@ void Actor_DrawDamageEffects(PlayState* play, Actor* actor, Vec3f limbPos[], s16
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(play->state.gfxCtx),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, gElectricSparkVtxDL);
gSPDisplayList(POLY_XLU_DISP++, gElectricSparkModelDL);
}
break;

2
src/overlays/actors/ovl_Bg_Dblue_Movebg/z_bg_dblue_movebg.c
View File

@ -812,7 +812,7 @@ void BgDblueMovebg_Draw(Actor* thisx, PlayState* play2) {
CLOSE_DISPS(play->state.gfxCtx);
if ((this->unk_160 == 8) && (this->unk_172 & 0x20)) {
AnimatedMat_Draw(play, Lib_SegmentedToVirtual(&gGreatBayTempleObjectWaterwheelSplashTexAnim));
AnimatedMat_Draw(play, Lib_SegmentedToVirtual(gGreatBayTempleObjectWaterwheelSplashTexAnim));
OPEN_DISPS(play->state.gfxCtx);

4
src/overlays/actors/ovl_Bg_Ikana_Mirror/z_bg_ikana_mirror.c
View File

@ -257,8 +257,8 @@ void BgIkanaMirror_Init(Actor* thisx, PlayState* play2) {
}
BgIkanaMirror_SetQuadVertices(this);
this->lightAbsorptionTexScroll = Lib_SegmentedToVirtual(&gStoneTowerTempleMirrorLightAbsorptionTexAnim);
this->lightEmissionTexScroll = Lib_SegmentedToVirtual(&gStoneTowerTempleMirrorLightEmissionTexAnim);
this->lightAbsorptionTexScroll = Lib_SegmentedToVirtual(gStoneTowerTempleMirrorLightAbsorptionTexAnim);
this->lightEmissionTexScroll = Lib_SegmentedToVirtual(gStoneTowerTempleMirrorLightEmissionTexAnim);
BgIkanaMirror_SetupWait(this);
}

4
src/overlays/actors/ovl_Boss_02/z_boss_02.c
View File

@ -1578,7 +1578,7 @@ void Boss02_DrawEffects(PlayState* play) {
for (i = 0, flag = false; i < ARRAY_COUNT(sEffects); i++, effect++) {
if (effect->type == TWINMOLD_EFFECT_FLASH) {
if (!flag) { //! @bug - dev forgot to set flag to 1, should only apply to first entry?
gSPDisplayList(POLY_XLU_DISP++, gLightOrb1DL);
gSPDisplayList(POLY_XLU_DISP++, gLightOrbMaterial1DL);
gDPSetEnvColor(POLY_XLU_DISP++, 255, 0, 0, 128);
}
@ -1589,7 +1589,7 @@ void Boss02_DrawEffects(PlayState* play) {
Matrix_Scale(effect->scale * D_809DF5B0, effect->scale * D_809DF5B0, 1.0f, MTXMODE_APPLY);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, gLightOrbVtxDL);
gSPDisplayList(POLY_XLU_DISP++, gLightOrbModelDL);
}
}

4
src/overlays/actors/ovl_Boss_06/z_boss_06.c
View File

@ -641,7 +641,7 @@ void Boss06_Draw(Actor* thisx, PlayState* play2) {
Matrix_Translate(this->actor.world.pos.x + this->unk_1B0, this->actor.world.pos.y + 84.0f + this->unk_1B4,
(this->actor.world.pos.z - 2.0f) + spE0, MTXMODE_NEW);
gSPDisplayList(POLY_XLU_DISP++, gLightOrb1DL);
gSPDisplayList(POLY_XLU_DISP++, gLightOrbMaterial1DL);
gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 255, 255, (u8)((140.0f * sp68) + 115.0f), temp_s2);
gDPSetEnvColor(POLY_XLU_DISP++, 255, 205, (u8)((100.0f * sp68) + 65.0f), 128);
@ -649,7 +649,7 @@ void Boss06_Draw(Actor* thisx, PlayState* play2) {
Matrix_RotateZS(play->gameplayFrames * 64, MTXMODE_APPLY);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, gLightOrbVtxDL);
gSPDisplayList(POLY_XLU_DISP++, gLightOrbModelDL);
}
CLOSE_DISPS(play->state.gfxCtx);

4
src/overlays/actors/ovl_Demo_Effect/z_demo_effect.c
View File

@ -309,13 +309,13 @@ void func_808CE078(Actor* thisx, PlayState* play2) {
Matrix_RotateZS(zRot, MTXMODE_APPLY);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, gameplay_keep_DL_023288);
gSPDisplayList(POLY_XLU_DISP++, gEffFlash2DL);
Matrix_Pop();
Matrix_RotateZS(-zRot, MTXMODE_APPLY);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, gameplay_keep_DL_023288);
gSPDisplayList(POLY_XLU_DISP++, gEffFlash2DL);
CLOSE_DISPS(play->state.gfxCtx);

4
src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.c
View File

@ -639,7 +639,7 @@ void DemoKankyo_DrawMoonAndGiant(Actor* thisx, PlayState* play2) {
break;
}
gSPDisplayList(POLY_XLU_DISP++, &gLightOrb1DL);
gSPDisplayList(POLY_XLU_DISP++, gLightOrbMaterial1DL);
Matrix_Mult(&play->billboardMtxF, MTXMODE_APPLY);
@ -651,7 +651,7 @@ void DemoKankyo_DrawMoonAndGiant(Actor* thisx, PlayState* play2) {
if (this->actor.params == DEMO_KANKYO_TYPE_GIANTS) {
gSPDisplayList(POLY_XLU_DISP++, gBubbleDL);
} else {
gSPDisplayList(POLY_XLU_DISP++, gLightOrbVtxDL);
gSPDisplayList(POLY_XLU_DISP++, gLightOrbModelDL);
}
}
}

16
src/overlays/actors/ovl_Dm_Char01/z_dm_char01.c
View File

@ -406,18 +406,18 @@ void DmChar01_Draw(Actor* thisx, PlayState* play) {
case DMCHAR01_0:
switch (this->unk_34C) {
case 0:
AnimatedMat_Draw(play, Lib_SegmentedToVirtual(&gWoodfallSceneryPoisonWaterTexAnim));
AnimatedMat_Draw(play, Lib_SegmentedToVirtual(gWoodfallSceneryPoisonWaterTexAnim));
Gfx_DrawDListOpa(play, gWoodfallSceneryPoisonWaterDL);
break;
case 1:
if (gSaveContext.sceneLayer == 1) {
AnimatedMat_Draw(play, Lib_SegmentedToVirtual(&gWoodfallSceneryPurifiedWaterTexAnim));
AnimatedMat_Draw(play, Lib_SegmentedToVirtual(gWoodfallSceneryPurifiedWaterTexAnim));
Gfx_DrawDListOpa(play, gWoodfallSceneryFloorDL);
Gfx_DrawDListXlu(play, gWoodfallSceneryPurifiedWaterDL);
Matrix_Translate(0.0f, 10.0f, 0.0f, MTXMODE_APPLY);
}
AnimatedMat_Draw(play, Lib_SegmentedToVirtual(&gWoodfallSceneryDynamicPoisonWaterTexAnim));
AnimatedMat_Draw(play, Lib_SegmentedToVirtual(gWoodfallSceneryDynamicPoisonWaterTexAnim));
OPEN_DISPS(play->state.gfxCtx);
@ -451,7 +451,7 @@ void DmChar01_Draw(Actor* thisx, PlayState* play) {
break;
case 2:
AnimatedMat_Draw(play, Lib_SegmentedToVirtual(&gWoodfallSceneryPurifiedWaterTexAnim));
AnimatedMat_Draw(play, Lib_SegmentedToVirtual(gWoodfallSceneryPurifiedWaterTexAnim));
Gfx_DrawDListOpa(play, gWoodfallSceneryFloorDL);
Gfx_DrawDListXlu(play, gWoodfallSceneryPurifiedWaterDL);
break;
@ -461,23 +461,23 @@ void DmChar01_Draw(Actor* thisx, PlayState* play) {
case DMCHAR01_1:
switch (this->unk_34C) {
case 0:
AnimatedMat_Draw(play, Lib_SegmentedToVirtual(&gWoodfallSceneryPoisonWallsTexAnim));
AnimatedMat_Draw(play, Lib_SegmentedToVirtual(gWoodfallSceneryPoisonWallsTexAnim));
Gfx_DrawDListOpa(play, gWoodfallSceneryPoisonWallsDL);
break;
case 1:
AnimatedMat_Draw(play, Lib_SegmentedToVirtual(&gWoodfallSceneryPurifiedWallsTexAnim));
AnimatedMat_Draw(play, Lib_SegmentedToVirtual(gWoodfallSceneryPurifiedWallsTexAnim));
Gfx_DrawDListOpa(play, gWoodfallSceneryPurifiedWallsDL);
break;
}
break;
case DMCHAR01_2:
AnimatedMat_Draw(play, Lib_SegmentedToVirtual(&gWoodfallSceneryTempleTexAnim));
AnimatedMat_Draw(play, Lib_SegmentedToVirtual(gWoodfallSceneryTempleTexAnim));
Gfx_DrawDListOpa(play, gWoodfallSceneryTempleDL);
if ((this->unk_34C != 0) && ((u8)this->unk_348 != 0)) {
AnimatedMat_Draw(play, Lib_SegmentedToVirtual(&gWoodfallSceneryWaterFlowingOverTempleTexAnim));
AnimatedMat_Draw(play, Lib_SegmentedToVirtual(gWoodfallSceneryWaterFlowingOverTempleTexAnim));
OPEN_DISPS(play->state.gfxCtx);

22
src/overlays/actors/ovl_En_Bigslime/z_en_bigslime.c
View File

@ -368,9 +368,9 @@ void EnBigslime_Init(Actor* thisx, PlayState* play2) {
}
}
this->minislimeFrozenTexAnim = Lib_SegmentedToVirtual(&gMinislimeFrozenTexAnim);
this->bigslimeFrozenTexAnim = Lib_SegmentedToVirtual(&gBigslimeFrozenTexAnim);
this->iceShardTexAnim = Lib_SegmentedToVirtual(&gBigslimeIceShardTexAnim);
this->minislimeFrozenTexAnim = Lib_SegmentedToVirtual(gMinislimeFrozenTexAnim);
this->bigslimeFrozenTexAnim = Lib_SegmentedToVirtual(gBigslimeFrozenTexAnim);
this->iceShardTexAnim = Lib_SegmentedToVirtual(gBigslimeIceShardTexAnim);
this->actor.world.pos.y = GBT_ROOM_5_MIN_Y;
this->actor.flags &= ~ACTOR_FLAG_1;
this->actor.shape.shadowAlpha = 255;
@ -2986,16 +2986,16 @@ void EnBigslime_DrawBigslime(Actor* thisx, PlayState* play) {
// Draw Bigslime
gSPSegment(POLY_XLU_DISP++, 0x09, sBigslimeDynamicVtx[this->dynamicVtxState]);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, &gBigslimeNormalDL);
gSPDisplayList(POLY_XLU_DISP++, &gBigslimeVtxDL);
gSPDisplayList(POLY_XLU_DISP++, gBigslimeNormalMaterialDL);
gSPDisplayList(POLY_XLU_DISP++, gBigslimeModelDL);
// Draw frozen Bigslime
if ((this->actionFunc == EnBigslime_Freeze) || (this->actionFunc == EnBigslime_FrozenGround) ||
(this->actionFunc == EnBigslime_FrozenFall) || (this->actionFunc == EnBigslime_Melt)) {
AnimatedMat_Draw(play, this->bigslimeFrozenTexAnim);
gSPSegment(POLY_XLU_DISP++, 0x09, sBigslimeTargetVtx);
gSPDisplayList(POLY_XLU_DISP++, &gBigslimeFrozenVtxDL);
gSPDisplayList(POLY_XLU_DISP++, &gBigslimeVtxDL);
gSPDisplayList(POLY_XLU_DISP++, gBigslimeFrozenMaterialDL);
gSPDisplayList(POLY_XLU_DISP++, gBigslimeModelDL);
}
// Draw bubbles inside Bigslime
@ -3014,7 +3014,7 @@ void EnBigslime_DrawBigslime(Actor* thisx, PlayState* play) {
billboardMtxF->zw =
dynamicVtx->n.ob[2] * this->actor.scale.z * bubblesInfoPtr->scaleVtx + this->actor.world.pos.z;
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, &gBigslimeBubbleDL);
gSPDisplayList(POLY_XLU_DISP++, gBigslimeBubbleDL);
}
}
CLOSE_DISPS(play->state.gfxCtx);
@ -3133,12 +3133,12 @@ void EnBigslime_DrawShatteringEffects(EnBigslime* this, PlayState* play) {
Matrix_Translate(this->frozenPos.x, this->frozenPos.y, this->frozenPos.z, MTXMODE_NEW);
Matrix_Scale(this->shockwaveScale, this->shockwaveScale, this->shockwaveScale, MTXMODE_APPLY);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, &gBigslimeShockwaveDL);
gSPDisplayList(POLY_XLU_DISP++, gBigslimeShockwaveDL);
}
// Draw Ice Shards
AnimatedMat_Draw(play, this->iceShardTexAnim);
gSPDisplayList(POLY_XLU_DISP++, &gBigslimeIceShardDL);
gSPDisplayList(POLY_XLU_DISP++, gBigslimeIceShardDL);
for (i = 0; i < BIGSLIME_NUM_ICE_SHARD; i++) {
iceShardEffect = &this->iceShardEffect[i];
@ -3147,7 +3147,7 @@ void EnBigslime_DrawShatteringEffects(EnBigslime* this, PlayState* play) {
&iceShardEffect->rot);
Matrix_Scale(iceShardEffect->scale, iceShardEffect->scale, iceShardEffect->scale, MTXMODE_APPLY);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, &gBigslimeIceShardVtxDL);
gSPDisplayList(POLY_XLU_DISP++, gBigslimeIceShardVtxDL);
}
}

2
src/overlays/actors/ovl_En_Box/z_en_box.c
View File

@ -146,7 +146,7 @@ void func_80867C8C(func_80867BDC_a0* arg0, PlayState* play) {
func_8012C2DC(play->state.gfxCtx);
Matrix_Mult(&play->billboardMtxF, MTXMODE_APPLY);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, gOwlStatueWhiteFlashDL);
gSPDisplayList(POLY_XLU_DISP++, gEffFlash1DL);
}
Matrix_Pop();
gSPMatrix(POLY_XLU_DISP++, &gIdentityMtx, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);

2
src/overlays/actors/ovl_En_Butte/z_en_butte.c
View File

@ -155,7 +155,7 @@ void func_8091C178(EnButte* this, PlayState* play) {
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gDPSetPrimColor(POLY_XLU_DISP++, 0x80, 0x80, 200, 200, 180, sp48);
gDPSetEnvColor(POLY_XLU_DISP++, 200, 200, 210, 255);
gSPDisplayList(POLY_XLU_DISP++, gOwlStatueWhiteFlashDL);
gSPDisplayList(POLY_XLU_DISP++, gEffFlash1DL);
CLOSE_DISPS(play->state.gfxCtx);
}

60
src/overlays/actors/ovl_En_Fishing/z_en_fishing.c
View File

@ -1158,7 +1158,7 @@ void EnFishing_DrawEffects(FishingEffect* effect, PlayState* play) {
for (i = 0; i < 100; i++) {
if (effect->type == FS_EFF_RIPPLE) {
if (flag == 0) {
gSPDisplayList(POLY_XLU_DISP++, gFishingRippleSetupDL);
gSPDisplayList(POLY_XLU_DISP++, gFishingRippleMaterialDL);
gDPSetEnvColor(POLY_XLU_DISP++, 155, 155, 155, 0);
flag++;
}
@ -1170,7 +1170,7 @@ void EnFishing_DrawEffects(FishingEffect* effect, PlayState* play) {
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, gFishingRippleVtxDL);
gSPDisplayList(POLY_XLU_DISP++, gFishingRippleModelDL);
}
effect++;
}
@ -1180,7 +1180,7 @@ void EnFishing_DrawEffects(FishingEffect* effect, PlayState* play) {
for (i = 0; i < 100; i++) {
if (effect->type == FS_EFF_DUST_SPLASH) {
if (flag == 0) {
gSPDisplayList(POLY_XLU_DISP++, gFishingDustSplashSetupDL);
gSPDisplayList(POLY_XLU_DISP++, gFishingDustSplashMaterialDL);
gDPSetEnvColor(POLY_XLU_DISP++, 200, 200, 200, 0);
flag++;
}
@ -1193,7 +1193,7 @@ void EnFishing_DrawEffects(FishingEffect* effect, PlayState* play) {
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, gFishingDustSplashVtxDL);
gSPDisplayList(POLY_XLU_DISP++, gFishingDustSplashModelDL);
}
effect++;
}
@ -1203,7 +1203,7 @@ void EnFishing_DrawEffects(FishingEffect* effect, PlayState* play) {
for (i = 0; i < 100; i++) {
if (effect->type == FS_EFF_WATER_DUST) {
if (flag == 0) {
gSPDisplayList(POLY_OPA_DISP++, gFishingWaterDustSetupDL);
gSPDisplayList(POLY_OPA_DISP++, gFishingWaterDustMaterialDL);
gDPSetEnvColor(POLY_OPA_DISP++, 40, 90, 80, 128);
flag++;
}
@ -1220,7 +1220,7 @@ void EnFishing_DrawEffects(FishingEffect* effect, PlayState* play) {
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_OPA_DISP++, gFishingWaterDustVtxDL);
gSPDisplayList(POLY_OPA_DISP++, gFishingWaterDustModelDL);
}
effect++;
}
@ -1230,7 +1230,7 @@ void EnFishing_DrawEffects(FishingEffect* effect, PlayState* play) {
for (i = 0; i < 100; i++) {
if (effect->type == FS_EFF_BUBBLE) {
if (flag == 0) {
gSPDisplayList(POLY_XLU_DISP++, gFishingBubbleSetupDL);
gSPDisplayList(POLY_XLU_DISP++, gFishingBubbleMaterialDL);
gDPSetEnvColor(POLY_XLU_DISP++, 150, 150, 150, 0);
gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 255, 255, 255, 255);
flag++;
@ -1242,7 +1242,7 @@ void EnFishing_DrawEffects(FishingEffect* effect, PlayState* play) {
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, gFishingBubbleVtxDL);
gSPDisplayList(POLY_XLU_DISP++, gFishingBubbleModelDL);
}
effect++;
}
@ -1266,7 +1266,7 @@ void EnFishing_DrawEffects(FishingEffect* effect, PlayState* play) {
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, gFishingRainDropVtxDL);
gSPDisplayList(POLY_XLU_DISP++, gFishingRainDropModelDL);
}
effect++;
}
@ -1278,7 +1278,7 @@ void EnFishing_DrawEffects(FishingEffect* effect, PlayState* play) {
for (i = 30; i < EFFECT_COUNT; i++) {
if (effect->type == FS_EFF_RAIN_RIPPLE) {
if (flag == 0) {
gSPDisplayList(POLY_XLU_DISP++, gFishingRippleSetupDL);
gSPDisplayList(POLY_XLU_DISP++, gFishingRippleMaterialDL);
gDPSetEnvColor(POLY_XLU_DISP++, 155, 155, 155, 0);
gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 255, 255, 255, 130);
flag++;
@ -1289,7 +1289,7 @@ void EnFishing_DrawEffects(FishingEffect* effect, PlayState* play) {
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, gFishingRippleVtxDL);
gSPDisplayList(POLY_XLU_DISP++, gFishingRippleModelDL);
}
effect++;
}
@ -1299,7 +1299,7 @@ void EnFishing_DrawEffects(FishingEffect* effect, PlayState* play) {
for (i = 30; i < EFFECT_COUNT; i++) {
if (effect->type == FS_EFF_RAIN_SPLASH) {
if (flag == 0) {
gSPDisplayList(POLY_XLU_DISP++, gFishingRainSplashSetupDL);
gSPDisplayList(POLY_XLU_DISP++, gFishingRainSplashMaterialDL);
gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 255, 255, 255, KREG(19) + 80);
flag++;
}
@ -1317,7 +1317,7 @@ void EnFishing_DrawEffects(FishingEffect* effect, PlayState* play) {
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, gFishingRainSplashVtxDL);
gSPDisplayList(POLY_XLU_DISP++, gFishingRainSplashModelDL);
}
effect++;
}
@ -1710,7 +1710,7 @@ void EnFishing_DrawSinkingLure(PlayState* play) {
if (sLurePos.y < WATER_SURFACE_Y(play)) {
func_8012C28C(play->state.gfxCtx);
gSPDisplayList(POLY_OPA_DISP++, gFishingSinkingLureSegmentSetupDL);
gSPDisplayList(POLY_OPA_DISP++, gFishingSinkingLureSegmentMaterialDL);
for (i = SINKING_LURE_SEG_COUNT - 1; i >= 0; i--) {
if ((i + D_80911F20) < SINKING_LURE_SEG_COUNT) {
@ -1721,13 +1721,13 @@ void EnFishing_DrawSinkingLure(PlayState* play) {
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(play->state.gfxCtx),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_OPA_DISP++, gFishingSinkingLureSegmentVtxDL);
gSPDisplayList(POLY_OPA_DISP++, gFishingSinkingLureSegmentModelDL);
}
}
} else {
func_8012C2DC(play->state.gfxCtx);
gSPDisplayList(POLY_XLU_DISP++, gFishingSinkingLureSegmentSetupDL);
gSPDisplayList(POLY_XLU_DISP++, gFishingSinkingLureSegmentMaterialDL);
for (i = SINKING_LURE_SEG_COUNT - 1; i >= 0; i--) {
if ((i + D_80911F20) < SINKING_LURE_SEG_COUNT) {
@ -1738,7 +1738,7 @@ void EnFishing_DrawSinkingLure(PlayState* play) {
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(play->state.gfxCtx),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, gFishingSinkingLureSegmentVtxDL);
gSPDisplayList(POLY_XLU_DISP++, gFishingSinkingLureSegmentModelDL);
}
}
}
@ -1850,7 +1850,7 @@ void EnFishing_DrawLureAndLine(PlayState* play, Vec3f* linePos, Vec3f* lineRot)
Matrix_Scale(D_809101C8, 1.0f, dist, MTXMODE_APPLY);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, gFishingLineVtxDL);
gSPDisplayList(POLY_XLU_DISP++, gFishingLineModelDL);
} else {
for (i = spB4; i < LINE_SEG_COUNT - 1; i++) {
if ((i == LINE_SEG_COUNT - 3) && (D_80917206 == 0) && (D_8090CD14 == 3)) {
@ -1878,7 +1878,7 @@ void EnFishing_DrawLureAndLine(PlayState* play, Vec3f* linePos, Vec3f* lineRot)
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(play->state.gfxCtx),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, gFishingLineVtxDL);
gSPDisplayList(POLY_XLU_DISP++, gFishingLineModelDL);
break;
}
@ -1888,7 +1888,7 @@ void EnFishing_DrawLureAndLine(PlayState* play, Vec3f* linePos, Vec3f* lineRot)
Matrix_Scale(D_809101C8, 1.0f, 0.005f, MTXMODE_APPLY);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, gFishingLineVtxDL);
gSPDisplayList(POLY_XLU_DISP++, gFishingLineModelDL);
}
}
@ -4351,7 +4351,7 @@ void EnFishing_DrawPondProps(PlayState* play) {
for (i = 0; i < POND_PROP_COUNT; i++) {
if (prop->type == FS_PROP_REED) {
if (flag == 0) {
gSPDisplayList(POLY_XLU_DISP++, gFishingReedSetupDL);
gSPDisplayList(POLY_XLU_DISP++, gFishingReedMaterialDL);
flag++;
}
@ -4364,7 +4364,7 @@ void EnFishing_DrawPondProps(PlayState* play) {
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(play->state.gfxCtx),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, gFishingReedVtxDL);
gSPDisplayList(POLY_XLU_DISP++, gFishingReedModelDL);
}
}
@ -4376,7 +4376,7 @@ void EnFishing_DrawPondProps(PlayState* play) {
for (i = 0; i < POND_PROP_COUNT; i++) {
if (prop->type == FS_PROP_WOOD_POST) {
if (flag == 0) {
gSPDisplayList(POLY_OPA_DISP++, gFishingWoodPostSetupDL);
gSPDisplayList(POLY_OPA_DISP++, gFishingWoodPostMaterialDL);
flag++;
}
@ -4386,7 +4386,7 @@ void EnFishing_DrawPondProps(PlayState* play) {
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(play->state.gfxCtx),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_OPA_DISP++, gFishingWoodPostVtxDL);
gSPDisplayList(POLY_OPA_DISP++, gFishingWoodPostModelDL);
}
}
@ -4398,7 +4398,7 @@ void EnFishing_DrawPondProps(PlayState* play) {
for (i = 0; i < POND_PROP_COUNT; i++) {
if (prop->type == FS_PROP_LILY_PAD) {
if (flag == 0) {
gSPDisplayList(POLY_XLU_DISP++, gFishingLilyPadSetupDL);
gSPDisplayList(POLY_XLU_DISP++, gFishingLilyPadMaterialDL);
flag++;
}
@ -4411,7 +4411,7 @@ void EnFishing_DrawPondProps(PlayState* play) {
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(play->state.gfxCtx),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, gFishingLilyPadVtxDL);
gSPDisplayList(POLY_XLU_DISP++, gFishingLilyPadModelDL);
}
}
@ -4423,7 +4423,7 @@ void EnFishing_DrawPondProps(PlayState* play) {
for (i = 0; i < POND_PROP_COUNT; i++) {
if (prop->type == FS_PROP_ROCK) {
if (flag == 0) {
gSPDisplayList(POLY_OPA_DISP++, gFishingRockSetupDL);
gSPDisplayList(POLY_OPA_DISP++, gFishingRockMaterialDL);
flag++;
}
@ -4434,7 +4434,7 @@ void EnFishing_DrawPondProps(PlayState* play) {
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(play->state.gfxCtx),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_OPA_DISP++, gFishingRockVtxDL);
gSPDisplayList(POLY_OPA_DISP++, gFishingRockModelDL);
}
}
@ -4650,7 +4650,7 @@ void EnFishing_DrawGroupFishes(PlayState* play) {
for (i = 0; i < GROUP_FISH_COUNT; i++) {
if (fish->type != FS_GROUP_FISH_NONE) {
if (flag == 0) {
gSPDisplayList(POLY_OPA_DISP++, gFishingGroupFishSetupDL);
gSPDisplayList(POLY_OPA_DISP++, gFishingGroupFishMaterialDL);
gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, 155, 155, 155, 255);
flag++;
}
@ -4663,7 +4663,7 @@ void EnFishing_DrawGroupFishes(PlayState* play) {
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(play->state.gfxCtx),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_OPA_DISP++, gFishingGroupFishVtxDL);
gSPDisplayList(POLY_OPA_DISP++, gFishingGroupFishModelDL);
}
}
fish++;

4
src/overlays/actors/ovl_En_Fz/z_en_fz.c
View File

@ -1003,7 +1003,7 @@ void func_80934464(EnFz* this, PlayState* play) {
gDPPipeSync(POLY_XLU_DISP++);
if (flag == 0) {
gSPDisplayList(POLY_XLU_DISP++, gFrozenSteamDL);
gSPDisplayList(POLY_XLU_DISP++, gFrozenSteamMaterialDL);
flag++;
}
@ -1017,7 +1017,7 @@ void func_80934464(EnFz* this, PlayState* play) {
Matrix_Scale(ptr->unk_30, ptr->unk_30, 1.0f, MTXMODE_APPLY);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, gFrozenSteamVtxDL);
gSPDisplayList(POLY_XLU_DISP++, gFrozenSteamModelDL);
}
}

6
src/overlays/actors/ovl_En_Gg/z_en_gg.c
View File

@ -530,7 +530,7 @@ void func_80B35C84(EnGgStruct* ptr, PlayState* play) {
Matrix_Mult(&play->billboardMtxF, MTXMODE_APPLY);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, gOwlStatueWhiteFlashDL);
gSPDisplayList(POLY_XLU_DISP++, gEffFlash1DL);
}
Matrix_Pop();
@ -554,7 +554,7 @@ void func_80B35C84(EnGgStruct* ptr, PlayState* play) {
Matrix_Mult(&play->billboardMtxF, MTXMODE_APPLY);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, gOwlStatueWhiteFlashDL);
gSPDisplayList(POLY_XLU_DISP++, gEffFlash1DL);
}
Matrix_Pop();
@ -607,7 +607,7 @@ void func_80B3610C(EnGgStruct* ptr, PlayState* play) {
Matrix_Mult(&play->billboardMtxF, MTXMODE_APPLY);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, gOwlStatueWhiteFlashDL);
gSPDisplayList(POLY_XLU_DISP++, gEffFlash1DL);
}
Matrix_Pop();

2
src/overlays/actors/ovl_En_Hg/z_en_hg.c
View File

@ -47,7 +47,7 @@ typedef enum {
/* 3 */ HG_CS_SONG_OF_HEALING,
} HgCsIndex;
const ActorInit En_Hg_InitVars = {
ActorInit En_Hg_InitVars = {
ACTOR_EN_HG,
ACTORCAT_PROP,
FLAGS,

2
src/overlays/actors/ovl_En_Hgo/z_en_hgo.c
View File

@ -48,7 +48,7 @@ typedef enum {
/* 6 */ HGO_ANIM_TOSS,
} HgoAnimation;
const ActorInit En_Hgo_InitVars = {
ActorInit En_Hgo_InitVars = {
ACTOR_EN_HGO,
ACTORCAT_NPC,
FLAGS,

4
src/overlays/actors/ovl_En_Horse/z_en_horse.c
View File

@ -793,7 +793,7 @@ void EnHorse_Init(Actor* thisx, PlayState* play2) {
}
if (((play->sceneId == SCENE_KOEPONARACE) && (GET_RACE_FLAGS == 1)) ||
((gSaveContext.save.entrance == ENTRANCE(ROMANI_RANCH, 0)) && Cutscene_GetSceneLayer(play))) {
((gSaveContext.save.entrance == ENTRANCE(ROMANI_RANCH, 0)) && (Cutscene_GetSceneLayer(play) != 0))) {
this->stateFlags |= ENHORSE_FLAG_25;
}
@ -1569,7 +1569,7 @@ void EnHorse_Stopping(EnHorse* this, PlayState* play) {
if ((this->stateFlags & ENHORSE_STOPPING_NEIGH_SOUND) && (this->skin.skelAnime.curFrame > 29.0f)) {
this->actor.speedXZ = 0.0f;
if ((Rand_ZeroOne() > 0.5f) &&
((gSaveContext.save.entrance != ENTRANCE(ROMANI_RANCH, 0)) || !Cutscene_GetSceneLayer(play))) {
((gSaveContext.save.entrance != ENTRANCE(ROMANI_RANCH, 0)) || (Cutscene_GetSceneLayer(play) == 0))) {
if (this->stateFlags & ENHORSE_DRAW) {
if (this->type == HORSE_TYPE_2) {
Audio_PlaySfxAtPos(&this->unk_218, NA_SE_EV_KID_HORSE_NEIGH);

2
src/overlays/actors/ovl_En_Invadepoh/z_en_invadepoh.c
View File

@ -4525,7 +4525,7 @@ void func_80B4E3F0(Actor* thisx, PlayState* play) {
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gDPSetPrimColor(POLY_XLU_DISP++, 0xFF, 0x80, 255, 255, 0, 180);
gDPSetEnvColor(POLY_XLU_DISP++, 255, 50, 0, 0);
gSPDisplayList(POLY_XLU_DISP++, gOwlStatueWhiteFlashDL);
gSPDisplayList(POLY_XLU_DISP++, gEffFlash1DL);
if (func_80B456A8(play, &sp5C)) {
func_800F9824(play, &play->envCtx, &play->view, play->state.gfxCtx, sp5C, 20.0f, 9.0f, 0, 0);
}

4
src/overlays/actors/ovl_En_Kusa/z_en_kusa.c
View File

@ -699,7 +699,7 @@ void EnKusa_DrawBush(Actor* thisx, PlayState* play2) {
EnKusa_ApplySway(&D_80936AD8[this->kusaMtxIdx]);
}
Gfx_DrawDListOpa(play, gKusaBushType1);
Gfx_DrawDListOpa(play, gKusaBushType1DL);
} else if (this->actor.projectedPos.z < 1300.0f) {
s32 alpha;
@ -711,7 +711,7 @@ void EnKusa_DrawBush(Actor* thisx, PlayState* play2) {
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 255, 255, 255, alpha);
gSPDisplayList(POLY_XLU_DISP++, gKusaBushType2);
gSPDisplayList(POLY_XLU_DISP++, gKusaBushType2DL);
CLOSE_DISPS(play->state.gfxCtx);
}

8
src/overlays/actors/ovl_En_Kusa2/z_en_kusa2.c
View File

@ -1343,7 +1343,7 @@ void func_80A5E80C(PlayState* play, s32 arg1) {
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 255, 255, 255, arg1);
gSPDisplayList(POLY_XLU_DISP++, gKusaBushType2);
gSPDisplayList(POLY_XLU_DISP++, gKusaBushType2DL);
CLOSE_DISPS(play->state.gfxCtx);
}
@ -1356,7 +1356,7 @@ void EnKusa2_Draw(Actor* thisx, PlayState* play) {
(this->actor.projectedPos.z < 400.0f)) {
func_80A5B954(&D_80A60908[this->unk_1CE], 0.0015f);
}
Gfx_DrawDListOpa(play, gKusaBushType1);
Gfx_DrawDListOpa(play, gKusaBushType1DL);
} else if (this->actor.projectedPos.z < 1300.0f) {
func_80A5E80C(play, (1300.0f - this->actor.projectedPos.z) * 2.55f);
}
@ -1370,14 +1370,14 @@ void func_80A5E9B4(Actor* thisx, PlayState* play) {
sp18.z = thisx->shape.rot.z + D_80A5EAFC.z;
Matrix_SetTranslateRotateYXZ(thisx->world.pos.x, thisx->world.pos.y, thisx->world.pos.z, &sp18);
Matrix_Scale(thisx->scale.x, thisx->scale.y, thisx->scale.z, MTXMODE_APPLY);
Gfx_DrawDListOpa(play, gKusaBushType1);
Gfx_DrawDListOpa(play, gKusaBushType1DL);
}
void func_80A5EA48(Actor* thisx, PlayState* play) {
EnKusa2* this = THIS;
if (this->unk_1CF == 0xFF) {
Gfx_DrawDListOpa(play, gKusaBushType1);
Gfx_DrawDListOpa(play, gKusaBushType1DL);
} else {
func_80A5E80C(play, this->unk_1CF);
}

2
src/overlays/actors/ovl_En_Test6/z_en_test6.c
View File

@ -1272,7 +1272,7 @@ void func_80A939E8(EnTest6* this, PlayState* play2) {
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(play->state.gfxCtx),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, gOwlStatueWhiteFlashDL);
gSPDisplayList(POLY_XLU_DISP++, gEffFlash1DL);
}
}
Lights_PointSetPosition(&this->lights[0].info, player->actor.world.pos.x, player->actor.world.pos.y - 10.0f,

4
src/overlays/actors/ovl_En_Warp_tag/z_en_warp_tag.c
View File

@ -84,7 +84,7 @@ void EnWarpTag_CheckDungeonKeepObject(EnWarptag* this, PlayState* play) {
if (Object_IsLoaded(&play->objectCtx, this->dangeonKeepObject)) {
this->actionFunc = EnWarpTag_WaitForPlayer;
DynaPolyActor_Init(&this->dyna, 0x1);
DynaPolyActor_LoadMesh(play, &this->dyna, &gWarpTagGoronTrialBaseCollider);
DynaPolyActor_LoadMesh(play, &this->dyna, &gWarpTagGoronTrialBaseCol);
this->dyna.actor.objBankIndex = this->dangeonKeepObject;
this->dyna.actor.draw = EnWarpTag_Draw;
}
@ -264,7 +264,7 @@ void EnWarpTag_Draw(Actor* thisx, PlayState* play) {
OPEN_DISPS(play->state.gfxCtx);
func_8012C28C(play->state.gfxCtx);
AnimatedMat_Draw(play, Lib_SegmentedToVirtual(&gWarpTagRainbowTexAnim));
AnimatedMat_Draw(play, Lib_SegmentedToVirtual(gWarpTagRainbowTexAnim));
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_OPA_DISP++, gWarpTagGoronTrialBaseDL);

2
src/overlays/actors/ovl_En_Wiz/z_en_wiz.c
View File

@ -1519,7 +1519,7 @@ void EnWiz_Draw(Actor* thisx, PlayState* play) {
if (this->fightState == EN_WIZ_FIGHT_STATE_FIRST_PHASE) {
Matrix_Push();
AnimatedMat_Draw(play, Lib_SegmentedToVirtual(&gWizrobePlatformLightTexAnim));
AnimatedMat_Draw(play, Lib_SegmentedToVirtual(gWizrobePlatformLightTexAnim));
Matrix_Translate(this->platformLightPos.x, this->platformLightPos.y, this->platformLightPos.z, MTXMODE_NEW);
Matrix_Scale(0.01f, 0.01f, 0.01f, MTXMODE_APPLY);
gDPPipeSync(POLY_XLU_DISP++);

2
src/overlays/actors/ovl_En_Wiz_Brock/z_en_wiz_brock.c
View File

@ -121,7 +121,7 @@ void EnWizBrock_Draw(Actor* thisx, PlayState* play) {
if (this->platformType != EN_WIZ_BROCK_PLATFORM_TYPE_INACTIVE) {
OPEN_DISPS(play->state.gfxCtx);
AnimatedMat_Draw(play, Lib_SegmentedToVirtual(&gWizrobePlatformCenterTexAnim));
AnimatedMat_Draw(play, Lib_SegmentedToVirtual(gWizrobePlatformCenterTexAnim));
gDPPipeSync(POLY_XLU_DISP++);
gDPSetPrimColor(POLY_XLU_DISP++, 0x80, 0x80, 255, 255, 255, 255);
if (this->platformType == EN_WIZ_BROCK_PLATFORM_TYPE_FIRE) {

2
src/overlays/actors/ovl_Obj_Grass_Carry/z_obj_grass_carry.c
View File

@ -356,5 +356,5 @@ void ObjGrassCarry_Update(Actor* thisx, PlayState* play) {
}
void func_809ABB7C(Actor* this, PlayState* play) {
Gfx_DrawDListOpa(play, gKusaBushType1);
Gfx_DrawDListOpa(play, gKusaBushType1DL);
}

2
src/overlays/actors/ovl_Obj_Iceblock/z_obj_iceblock.c
View File

@ -921,7 +921,7 @@ void ObjIceblock_Init(Actor* thisx, PlayState* play) {
}
DynaPolyActor_Init(&this->dyna, 1);
DynaPolyActor_LoadMesh(play, &this->dyna, &gIceBlockDynaColHeader);
DynaPolyActor_LoadMesh(play, &this->dyna, &gIceBlockCol);
func_800C62BC(play, &play->colCtx.dyna, this->dyna.bgId);
Collider_InitCylinder(play, &this->collider);
Collider_SetCylinder(play, &this->collider, &this->dyna.actor, &sCylinderInit);

2
src/overlays/actors/ovl_Obj_Switch/z_obj_switch.c
View File

@ -411,7 +411,7 @@ void ObjSwitch_Init(Actor* thisx, PlayState* play) {
}
}
if (type == OBJSWITCH_TYPE_CRYSTAL) {
sCrystalSwitchAnimatedMat = Lib_SegmentedToVirtual(&gCrystalSwitchTexAnim);
sCrystalSwitchAnimatedMat = Lib_SegmentedToVirtual(gCrystalSwitchTexAnim);
}
if (OBJ_SWITCH_IS_FROZEN(&this->dyna.actor)) {
ObjSwitch_EyeSwitchFrozenInit(this);

4
src/overlays/actors/ovl_Obj_Warpstone/z_obj_warpstone.c
View File

@ -181,11 +181,11 @@ void ObjWarpstone_Draw(Actor* thisx, PlayState* play2) {
gDPSetEnvColor(POLY_XLU_DISP++, 100, 200, 0, 255);
Matrix_RotateZF((((play->gameplayFrames * 1500) & 0xFFFF) * M_PI) / 0x8000, MTXMODE_APPLY);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, gOwlStatueWhiteFlashDL);
gSPDisplayList(POLY_XLU_DISP++, gEffFlash1DL);
Matrix_Pop();
Matrix_RotateZF((~((play->gameplayFrames * 1200) & 0xFFFF) * M_PI) / 0x8000, MTXMODE_APPLY);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, gOwlStatueWhiteFlashDL);
gSPDisplayList(POLY_XLU_DISP++, gEffFlash1DL);
CLOSE_DISPS(play->state.gfxCtx);
}
}

378
undefined_syms.txt
View File

@ -564,68 +564,14 @@ D_06004240 = 0x06004240;
D_06003B08 = 0x06003B08;
D_06003E80 = 0x06003E80;
// ovl_Bg_Fire_Wall
D_06000040 = 0x06000040;
// ovl_Bg_Fu_Mizu
D_06002FC0 = 0x06002FC0;
D_060037D8 = 0x060037D8;
D_060037F8 = 0x060037F8;
// ovl_Bg_Haka_Bombwall
D_06001680 = 0x06001680;
// ovl_Bg_Hakugin_Bombwall
D_06009830 = 0x06009830;
// ovl_Bg_Hakugin_Elvpole
D_0600ACB8 = 0x0600ACB8;
D_0600BF40 = 0x0600BF40;
// ovl_Bg_Ikana_Bombwall
D_06000288 = 0x06000288;
// ovl_Bg_Ikana_Mirror
D_060014B0 = 0x060014B0;
D_06001678 = 0x06001678;
D_06001880 = 0x06001880;
D_06001AD8 = 0x06001AD8;
D_06001E18 = 0x06001E18;
D_06002358 = 0x06002358;
// ovl_Bg_Kin2_Bombwall
D_06000128 = 0x06000128;
D_060002C0 = 0x060002C0;
D_06000360 = 0x06000360;
D_06000490 = 0x06000490;
// ovl_Bg_Kin2_Picture
D_06000658 = 0x06000658;
D_06000798 = 0x06000798;
// ovl_Bg_Last_Bwall
D_06000098 = 0x06000098;
// ovl_Bg_Sinkai_Kabe
D_06000048 = 0x06000048;
// ovl_Bg_Umajump
D_06001220 = 0x06001220;
D_06001438 = 0x06001438;
D_06001558 = 0x06001558;
// ovl_Boss_01
D_06000C44 = 0x06000C44;
@ -677,14 +623,6 @@ D_06006E50 = 0x06006E50;
D_06007488 = 0x06007488;
D_06007908 = 0x06007908;
// ovl_Boss_06
D_06018BD0 = 0x06018BD0;
D_06018CF0 = 0x06018CF0;
D_06018DE0 = 0x06018DE0;
D_06019360 = 0x06019360;
D_060193B0 = 0x060193B0;
// ovl_Boss_07
D_06000194 = 0x06000194;
@ -779,86 +717,17 @@ D_0600B5A0 = 0x0600B5A0;
D_06010C40 = 0x06010C40;
D_060129F0 = 0x060129F0;
// ovl_Demo_Tre_Lgt
D_06007D78 = 0x06007D78;
// ovl_Dm_Ah
D_06009E70 = 0x06009E70;
// ovl_Dm_Al
D_0600A0D8 = 0x0600A0D8;
// ovl_Dm_Bal
D_060005FC = 0x060005FC;
D_06001804 = 0x06001804;
D_0600A6D0 = 0x0600A6D0;
// ovl_Dm_Char02
D_0600AD68 = 0x0600AD68;
// ovl_Dm_Char03
D_06020550 = 0x06020550;
// ovl_Dm_Char06
D_060013A8 = 0x060013A8;
D_06006868 = 0x06006868;
// ovl_Dm_Char08
D_06002328 = 0x06002328;
D_06002470 = 0x06002470;
D_06004E70 = 0x06004E70;
D_0600E748 = 0x0600E748;
// ovl_Dm_Char09
D_0600005C = 0x0600005C;
D_06001398 = 0x06001398;
// ovl_Dm_Tsg
D_06002D30 = 0x06002D30;
D_06011458 = 0x06011458;
// ovl_Dm_Zl
D_0600DE08 = 0x0600DE08;
D_0600E038 = 0x0600E038;
// ovl_Door_Warp1
D_06003230 = 0x06003230;
D_060044D8 = 0x060044D8;
D_06004690 = 0x06004690;
D_060057D8 = 0x060057D8;
D_060058C8 = 0x060058C8;
D_06007238 = 0x06007238;
// ovl_Eff_Kamejima_Wave
D_06000000 = 0x06000000;
D_06000140 = 0x06000140;
D_06001AF0 = 0x06001AF0;
// ovl_Eff_Stk
D_06008920 = 0x06008920;
D_06008A38 = 0x06008A38;
D_06009F60 = 0x06009F60;
// ovl_Eff_Zoraband
D_06000180 = 0x06000180;
D_060002A8 = 0x060002A8;
D_06000F38 = 0x06000F38;
// ovl_En_An
D_06000308 = 0x06000308;
@ -872,25 +741,6 @@ D_06012618 = 0x06012618;
D_0600B380 = 0x0600B380;
// ovl_En_Ani
D_060007FC = 0x060007FC;
D_06000C14 = 0x06000C14;
D_060011CC = 0x060011CC;
D_06001D48 = 0x06001D48;
D_060027A0 = 0x060027A0;
D_060028A0 = 0x060028A0;
D_06009220 = 0x06009220;
D_06009D34 = 0x06009D34;
// ovl_En_Az
D_06007438 = 0x06007438;
D_0600C94C = 0x0600C94C;
D_06017990 = 0x06017990;
D_0601ABF0 = 0x0601ABF0;
D_0601AD00 = 0x0601AD00;
// ovl_En_Bal
D_060005FC = 0x060005FC;
@ -900,48 +750,6 @@ D_0600B604 = 0x0600B604;
D_0600CB78 = 0x0600CB78;
D_0600D530 = 0x0600D530;
// ovl_En_Bat
D_060000A0 = 0x060000A0;
D_060000C8 = 0x060000C8;
// ovl_En_Bee
D_0600005C = 0x0600005C;
D_06001398 = 0x06001398;
// ovl_En_Bh
D_06000074 = 0x06000074;
D_06001E60 = 0x06001E60;
// ovl_En_Bombal
D_06000A00 = 0x06000A00;
D_06000D78 = 0x06000D78;
// ovl_En_Bombers2
D_060064B8 = 0x060064B8;
D_0600F82C = 0x0600F82C;
// ovl_En_Bomjimb
D_060064B8 = 0x060064B8;
D_0600F82C = 0x0600F82C;
// ovl_En_Box
D_0600043C = 0x0600043C;
D_060006F0 = 0x060006F0;
D_06000A50 = 0x06000A50;
D_06000DB0 = 0x06000DB0;
D_060012E8 = 0x060012E8;
D_06001850 = 0x06001850;
D_06001D58 = 0x06001D58;
D_060066A0 = 0x060066A0;
D_060080E8 = 0x060080E8;
// ovl_En_Bsb
D_06000C50 = 0x06000C50;
@ -949,15 +757,6 @@ D_06004894 = 0x06004894;
D_060086BC = 0x060086BC;
D_0600C3E0 = 0x0600C3E0;
// ovl_En_Bubble
D_06001000 = 0x06001000;
// ovl_En_Crow
D_060000F0 = 0x060000F0;
D_060010C0 = 0x060010C0;
// ovl_En_Death
D_06000E64 = 0x06000E64;
@ -989,20 +788,10 @@ D_06001828 = 0x06001828;
D_06002A40 = 0x06002A40;
D_06003070 = 0x06003070;
// ovl_En_Demo_heishi
D_06003BFC = 0x06003BFC;
D_0600D640 = 0x0600D640;
// ovl_En_Dnh
D_06002950 = 0x06002950;
// ovl_En_Ds2n
D_06008038 = 0x06008038;
D_06008170 = 0x06008170;
// ovl_En_Dt
D_0600112C = 0x0600112C;
@ -1034,26 +823,6 @@ D_060009A0 = 0x060009A0;
D_06010240 = 0x06010240;
// ovl_En_Fall2
D_06005EF4 = 0x06005EF4;
D_06005F10 = 0x06005F10;
D_06008840 = 0x06008840;
D_06008898 = 0x06008898;
// ovl_En_Famos
D_060000F8 = 0x060000F8;
D_06003D38 = 0x06003D38;
D_06003DC8 = 0x06003DC8;
// ovl_En_Fishing
D_060029C0 = 0x060029C0;
D_0600007C = 0x0600007C;
D_0600CFE0 = 0x0600CFE0;
D_06011058 = 0x06011058;
// ovl_En_Ge2
D_0600030C = 0x0600030C;
@ -1069,12 +838,6 @@ D_0600A344 = 0x0600A344;
D_06001EFC = 0x06001EFC;
D_0600A808 = 0x0600A808;
// ovl_En_Hgo
D_0600B644 = 0x0600B644;
D_0600F248 = 0x0600F248;
D_06012A58 = 0x06012A58;
// ovl_En_Invadepoh_Demo
D_06000080 = 0x06000080;
@ -1091,15 +854,6 @@ D_06012FC8 = 0x06012FC8;
D_06013928 = 0x06013928;
D_06016588 = 0x06016588;
// ovl_En_Js
D_06010880 = 0x06010880;
D_06010CD8 = 0x06010CD8;
D_060164B8 = 0x060164B8;
D_06016F58 = 0x06016F58;
D_0601764C = 0x0601764C;
D_06017E98 = 0x06017E98;
// ovl_En_Jso
D_060081F4 = 0x060081F4;
@ -1116,11 +870,6 @@ D_060081F4 = 0x060081F4;
D_060058B8 = 0x060058B8;
D_0600D828 = 0x0600D828;
// ovl_En_Kanban
D_06000C30 = 0x06000C30;
D_06001630 = 0x06001630;
// ovl_En_Kitan
D_06000CE8 = 0x06000CE8;
@ -1187,22 +936,6 @@ D_06021E34 = 0x06021E34;
D_06022728 = 0x06022728;
D_06022CAC = 0x06022CAC;
// ovl_En_Lift_Nuts
D_060029E8 = 0x060029E8;
D_0600AC70 = 0x0600AC70;
// ovl_En_Mag
D_06000000 = 0x06000000;
D_06009000 = 0x06009000;
D_06009680 = 0x06009680;
D_06009D00 = 0x06009D00;
D_06010F40 = 0x06010F40;
D_06011740 = 0x06011740;
D_06011BC0 = 0x06011BC0;
D_06011E48 = 0x06011E48;
// ovl_En_Mnk
D_06003584 = 0x06003584;
@ -1214,17 +947,6 @@ D_060105DC = 0x060105DC;
D_06019B88 = 0x06019B88;
D_0601D518 = 0x0601D518;
// ovl_En_Neo_Reeba
D_060001E4 = 0x060001E4;
D_06001EE8 = 0x06001EE8;
// ovl_En_Nwc
D_060000E8 = 0x060000E8;
D_060002E8 = 0x060002E8;
D_06002530 = 0x06002530;
// ovl_En_Okuta
D_0600044C = 0x0600044C;
@ -1236,16 +958,6 @@ D_06003EE4 = 0x06003EE4;
D_06004204 = 0x06004204;
D_0600466C = 0x0600466C;
// ovl_En_Osn
D_060192A0 = 0x060192A0;
D_060201BC = 0x060201BC;
D_060202F0 = 0x060202F0;
// ovl_En_Paper
D_0600D5A0 = 0x0600D5A0;
// ovl_En_Po_Composer
D_0600188C = 0x0600188C;
@ -1255,26 +967,6 @@ D_06006F38 = 0x06006F38;
D_06006FD8 = 0x06006FD8;
D_06009930 = 0x06009930;
// ovl_En_Pr2
D_06003904 = 0x06003904;
D_06004188 = 0x06004188;
D_06004340 = 0x06004340;
// ovl_En_Pst
D_06001A80 = 0x06001A80;
// ovl_En_Ru
D_0600C700 = 0x0600C700;
// ovl_En_Rz
D_06003A20 = 0x06003A20;
D_0600D768 = 0x0600D768;
D_0600D8D8 = 0x0600D8D8;
// ovl_En_Slime
D_060004C0 = 0x060004C0;
@ -1291,28 +983,11 @@ D_06001AA0 = 0x06001AA0;
D_06000304 = 0x06000304;
// ovl_En_Sth2
D_060031F8 = 0x060031F8;
// ovl_En_Stone_heishi
D_06000630 = 0x06000630;
D_06000768 = 0x06000768;
D_06003BFC = 0x06003BFC;
D_0600D640 = 0x0600D640;
// ovl_En_Stop_heishi
D_06006C18 = 0x06006C18;
D_0600D640 = 0x0600D640;
// ovl_En_S_Goro
D_060091A8 = 0x060091A8;
D_06011AC8 = 0x06011AC8;
D_06012DE0 = 0x06012DE0;
// ovl_En_Takaraya
D_06000968 = 0x06000968;
@ -1322,45 +997,17 @@ D_06009890 = 0x06009890;
D_0600A280 = 0x0600A280;
D_0600AD98 = 0x0600AD98;
// ovl_En_Tanron2
D_06003450 = 0x06003450;
D_060034C8 = 0x060034C8;
D_06004510 = 0x06004510;
D_06004550 = 0x06004550;
// ovl_En_Tanron4
D_06000168 = 0x06000168;
D_06000E68 = 0x06000E68;
// ovl_En_Test3
D_0600CB60 = 0x0600CB60;
D_0600EDD0 = 0x0600EDD0;
D_0600F7EC = 0x0600F7EC;
// ovl_En_Tg
D_0600B0A0 = 0x0600B0A0;
D_0600B0E0 = 0x0600B0E0;
D_0600B2B0 = 0x0600B2B0;
// ovl_En_Trt
D_0600FEF0 = 0x0600FEF0;
D_06000A44 = 0x06000A44;
// ovl_En_Tru
D_0601A820 = 0x0601A820;
D_0601A830 = 0x0601A830;
// ovl_En_Twig
D_060014C8 = 0x060014C8;
D_06001C38 = 0x06001C38;
// ovl_En_Wdhand
D_060000F4 = 0x060000F4;
@ -1381,22 +1028,6 @@ D_06000D94 = 0x06000D94;
D_06007650 = 0x06007650;
D_0600D658 = 0x0600D658;
// ovl_Mir_Ray3
D_06000168 = 0x06000168;
D_060003F8 = 0x060003F8;
D_060004B0 = 0x060004B0;
// ovl_Obj_Danpeilift
D_06000180 = 0x06000180;
D_06000BA0 = 0x06000BA0;
// ovl_Obj_Lift
D_06000D10 = 0x06000D10;
D_06000F00 = 0x06000F00;
// ovl_Obj_Mine
D_06000030 = 0x06000030;
@ -1408,15 +1039,6 @@ D_06002188 = 0x06002188;
D_06000B70 = 0x06000B70;
D_06000D60 = 0x06000D60;
// ovl_Obj_Taru
D_06000420 = 0x06000420;
D_06000FC8 = 0x06000FC8;
D_06001040 = 0x06001040;
D_06001100 = 0x06001100;
D_06001140 = 0x06001140;
D_06001CB0 = 0x06001CB0;
// ovl_player_actor
D_06008860 = 0x06008860;