From e51f50f0ff9d79cd4c19fb6519183fd00445719c Mon Sep 17 00:00:00 2001
From: petrie911 <69443847+petrie911@users.noreply.github.com>
Date: Mon, 20 Sep 2021 11:51:35 -0500
Subject: Decompile z_kankyo (#956)

* working

* start color switch

* progress

* progress

* progress on bgm func

* progress

* game over matched (except the rodata meme)

* start update

* progress

* lightning docs done

* progress

* progress

* progress

* progress

* progress

* can compile at least

* suns state, progress on kankyo_update

* some new names

* progress

* progress

* progress

* new functions

* cleanup

* more matches

* another match

* now functional

* format

* better match

* hugely improved update

* cleanup/review

* remove old changes

* review2

* review3

* missed one

* review4

* change asm filenames

* update doorwarp1

* review5

* Kankyo_ -> Environment_

* format

* merge master and format functions.h

Co-authored-by: Jacob Young <jacobly0@users.noreply.github.com>
Co-authored-by: fig <fig02srl@gmail.com>
Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain>
---
 assets/xml/objects/gameplay_field_keep.xml | 5 +++--
 assets/xml/objects/gameplay_keep.xml       | 8 ++++----
 2 files changed, 7 insertions(+), 6 deletions(-)

(limited to 'assets/xml/objects')

diff --git a/assets/xml/objects/gameplay_field_keep.xml b/assets/xml/objects/gameplay_field_keep.xml
index c9a2378cb..63dbdfa04 100644
--- a/assets/xml/objects/gameplay_field_keep.xml
+++ b/assets/xml/objects/gameplay_field_keep.xml
@@ -53,8 +53,9 @@
         <Texture Name="gFieldBeehiveFragmentTex" OutName="beehive_fragment" Format="rgba16" Width="16" Height="16" Offset="0x9710"/>
         <Texture Name="gFieldSilverRockTex" OutName="silver_rock" Format="ci4" Width="64" Height="64" Offset="0x99F8"/>
         <Texture Name="gFieldSilverRockTLUT" OutName="silver_rock_palette" Format="rgba16" Width="4" Height="4" Offset="0x99D0"/>
-        <!-- Kankyo Stuff-->
-        <DList Name="gFieldDL_00CA70" Offset="0xCA70"/>
+        <Texture Name="gFieldSandstorm1Tex" OutName="sandstorm_1" Format="i8" Width="64" Height="32" Offset="0xBA70"/>
+        <Texture Name="gFieldSandstorm2Tex" OutName="sandstorm_2" Format="ia8" Width="64" Height="32" Offset="0xC270"/>
+        <DList Name="gFieldSandstormDL" Offset="0xCA70"/>
         <Blob Name="gFieldUnaccounted_00CB30" Size="0x800"/>
     </File>
 </Root>
diff --git a/assets/xml/objects/gameplay_keep.xml b/assets/xml/objects/gameplay_keep.xml
index ce960a376..41dac9a41 100644
--- a/assets/xml/objects/gameplay_keep.xml
+++ b/assets/xml/objects/gameplay_keep.xml
@@ -843,10 +843,10 @@
         <DList Name="gCuttableShrubTipDL" Offset="0x356A0"/>
         <Texture Name="gCuttableShrubLeafTFragmentTex" OutName="cuttable_shrub_leaf_fragment" Format="rgba16" Width="32" Height="32" Offset="0x35730"/>
         <Texture Name="gCuttableShrubTex" OutName="cuttanble_shrub" Format="rgba16" Width="32" Height="32" Offset="0x35F30"/>
-        <Texture Name="gBurnMark1Tex" OutName="burn_mark_1" Format="i4" Width="64" Height="64" Offset="0x36730"/>
-        <Texture Name="gBurnMark2Tex" OutName="burn_mark_2" Format="i4" Width="64" Height="64" Offset="0x36F30"/>
-        <DList Name="gEffBurnMark1DL" Offset="0x37730"/>
-        <DList Name="gEffBurnMark2DL" Offset="0x37798"/>
+        <Texture Name="gLensFlareCircleTex" OutName="lens_flare_circle" Format="i4" Width="64" Height="64" Offset="0x36730"/>
+        <Texture Name="gLensFlareRingTex" OutName="lens_flare_ring" Format="i4" Width="64" Height="64" Offset="0x36F30"/>
+        <DList Name="gLensFlareCircleDL" Offset="0x37730"/>
+        <DList Name="gLensFlareRingDL" Offset="0x37798"/>
         <DList Name="gEffSparklesDL" Offset="0x37880"/>
         <Texture Name="gEffSparklesTex" OutName="eff_sparkles" Format="i4" Width="16" Height="16" Offset="0x378E0"/>
         <Texture Name="gEffUnknown13Tex" OutName="eff_unknown_tex_13" Format="i8" Width="16" Height="32" Offset="0x37960"/>
-- 
cgit v1.2.3