izzy/2ship2harkinian-Android
0
0
Fork 0
mirror of https://github.com/izzy2lost/2ship2harkinian-Android.git synced 2026-06-19 01:20:08 -07:00
Code Issues 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 13:58:27 -03:00
committed by GitHub
parent c6ec00f0dd
commit f191044a05
35 changed files with 147 additions and 525 deletions
Download Patch File Download Diff File Expand all files Collapse all files
assets/xml/objects/gameplay_dangeon_keep.xml
+1 -1
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>
assets/xml/objects/gameplay_field_keep.xml
+2 -2
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" />
assets/xml/objects/gameplay_keep.xml
+19 -19
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" />
assets/xml/objects/object_bigslime.xml
+3 -3
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" />
assets/xml/objects/object_fish.xml
+24 -24
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" />
assets/xml/objects/object_ice_block.xml
+3 -3
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>
src/code/z_actor.c
+7 -7
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;
src/overlays/actors/ovl_Bg_Dblue_Movebg/z_bg_dblue_movebg.c
+1 -1
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);
src/overlays/actors/ovl_Bg_Ikana_Mirror/z_bg_ikana_mirror.c
+2 -2
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);
}
src/overlays/actors/ovl_Boss_02/z_boss_02.c
+2 -2
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);
}
}
src/overlays/actors/ovl_Boss_06/z_boss_06.c
+2 -2
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);
src/overlays/actors/ovl_Demo_Effect/z_demo_effect.c
+2 -2
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);
src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.c
+2 -2
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);
}
}
}
src/overlays/actors/ovl_Dm_Char01/z_dm_char01.c
+8 -8
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);
src/overlays/actors/ovl_En_Bigslime/z_en_bigslime.c
+11 -11
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);
}
}
src/overlays/actors/ovl_En_Box/z_en_box.c
+1 -1
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);
src/overlays/actors/ovl_En_Butte/z_en_butte.c
+1 -1
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);
}
src/overlays/actors/ovl_En_Fishing/z_en_fishing.c
+30 -30
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++;
src/overlays/actors/ovl_En_Fz/z_en_fz.c
+2 -2
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);
}
}
src/overlays/actors/ovl_En_Gg/z_en_gg.c
+3 -3
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();

Some files were not shown because too many files have changed in this diff Show More