mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-08 07:20:16 +00:00
Code Issues Projects Releases Wiki Activity

Scene cleanups (#1002)

Browse source 
* remove fake match

* u32 segment -> void* and add symbols to sEntranceCutsceneTable

* rename some symbols

* remove if1

* add the last missing symbol

* add symbols for almost all extrence textures

* finish adding the symbols

* Remove comment

* spelling fix

* Fig's and Dragorn's fixes

* add symbols to unkknown array

* format

* romans fixes
This commit is contained in:
louist103 2021-11-08 21:15:37 -05:00 • committed by GitHub
parent 781d497264
commit 0b18419489
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
44 changed files with 281 additions and 107 deletions
Download patch file Download diff file Expand all files Collapse all files

2
assets/xml/scenes/dungeons/Bmori1.xml
View file

@ -1,5 +1,7 @@
<Root>
<File Name="Bmori1_scene" Segment="2">
<Texture Name="gForestTempleDayEntranceTex" OutName="day_entrance" Format="ia16" Width="8" Height="128" Offset="0x14D90"/>
<Texture Name="gForestTempleNightEntranceTex" OutName="night_entrance" Format="ia16" Width="8" Height="128" Offset="0x14590"/>
<Scene Name="Bmori1_scene" Offset="0x0"/>
</File>
<File Name="Bmori1_room_0" Segment="3">

2
assets/xml/scenes/dungeons/MIZUsin.xml
View file

@ -1,5 +1,7 @@
<Root>
<File Name="MIZUsin_scene" Segment="2">
<Texture Name="gWaterTempleDayEntranceTex" OutName="day_entrance" Format="ia16" Width="8" Height="64" Offset="0x14C30"/>
<Texture Name="gWaterTempleNightEntranceTex" OutName="night_entrance" Format="ia16" Width="8" Height="64" Offset="0x15830"/>
<Scene Name="MIZUsin_scene" Offset="0x0"/>
</File>
<File Name="MIZUsin_room_0" Segment="3">

1
assets/xml/scenes/dungeons/bdan.xml
View file

@ -1,5 +1,6 @@
<Root>
<File Name="bdan_scene" Segment="2">
<Cutscene Name="gJabuJabuIntroCs" Offset="0x15600"/>
<Scene Name="bdan_scene" Offset="0x0"/>
</File>
<File Name="bdan_room_0" Segment="3">

13
assets/xml/scenes/dungeons/ddan.xml
View file

@ -1,5 +1,18 @@
<Root>
<File Name="ddan_scene" Segment="2">
<Texture Name="gDCDayEntranceTex" OutName="day_entrance" Format="ci8" Width="32" Height="64" Offset="0x12378" TlutOffset="0x11D70"/>
<Texture Name="gDCNightEntranceTex" OutName="night_entrance" Format="ci8" Width="32" Height="64" Offset="0x13378" TlutOffset="0x11D70"/>
<!-- these need to have TLUTs extract from room 0 at 0x11290-->
<Texture Name="gDCLavaFloor1Tex" OutName="Lava_floor_1" Format="ci8" Width="32" Height="32" Offset="0x11F78" />
<Texture Name="gDCLavaFloor2Tex" OutName="Lava_floor_2" Format="ci8" Width="32" Height="32" Offset="0x14778" />
<Texture Name="gDCLavaFloor3Tex" OutName="Lava_floor_3" Format="ci8" Width="32" Height="32" Offset="0x14378" />
<Texture Name="gDCLavaFloor4Tex" OutName="Lava_floor_4" Format="ci8" Width="32" Height="32" Offset="0x13F78" />
<Texture Name="gDCLavaFloor5Tex" OutName="Lava_floor_5" Format="ci8" Width="32" Height="32" Offset="0x14B78" />
<Texture Name="gDCLavaFloor6Tex" OutName="Lava_floor_6" Format="ci8" Width="32" Height="32" Offset="0x13B78" />
<Texture Name="gDCLavaFloor7Tex" OutName="Lava_floor_7" Format="ci8" Width="32" Height="32" Offset="0x12F78" />
<Texture Name="gDCLavaFloor8Tex" OutName="Lava_floor_8" Format="ci8" Width="32" Height="32" Offset="0x12B78" />
<Cutscene Name="gDcOpeningCs" Offset="0x14F80"/>
<Scene Name="ddan_scene" Offset="0x0"/>
</File>

1
assets/xml/scenes/dungeons/ganon_tou.xml
View file

@ -1,6 +1,7 @@
<Root>
<File Name="ganon_tou_scene" Segment="2">
<Cutscene Name="gRainbowBridgeCs" Offset="0x2640"/>
<Cutscene Name="gGanonsCastleIntroCs" Offset="0x4280"/>
<Scene Name="ganon_tou_scene" Offset="0x0"/>
</File>
<File Name="ganon_tou_room_0" Segment="3">

2
assets/xml/scenes/dungeons/gerudoway.xml
View file

@ -1,5 +1,7 @@
<Root>
<File Name="gerudoway_scene" Segment="2">
<Texture Name="gThievesHideoutNightEntranceTex" OutName="night_entrance" Format="ia16" Width="128" Height="4" Offset="0xB920"/>
<Texture Name="gThievesHideoutDayEntranceTex" OutName="day_entrance" Format="ia16" Width="128" Height="4" Offset="0xBD20"/>
<Scene Name="gerudoway_scene" Offset="0x0"/>
</File>
<File Name="gerudoway_room_0" Segment="3">

3
assets/xml/scenes/dungeons/ice_doukutu.xml
View file

@ -1,7 +1,8 @@
<Root>
<File Name="ice_doukutu_scene" Segment="2">
<Cutscene Name="gIceCavernSerenadeCs" Offset="0x330"/>
<Texture Name="gIceCavernNightEntranceTex" OutName="night_entrance" Format="ia16" Width="64" Height="4" Offset="0xF8C0"/>
<Texture Name="gIceCavernDayEntranceTex" OutName="day_entrance" Format="ia16" Width="64" Height="4" Offset="0xFAC0"/>
<Scene Name="ice_doukutu_scene" Offset="0x0"/>
</File>
<File Name="ice_doukutu_room_0" Segment="3">

3
assets/xml/scenes/dungeons/jyasinboss.xml
View file

@ -1,6 +1,7 @@
<Root>
<File Name="jyasinboss_scene" Segment="2">
<Cutscene Name="gNabooruKnuckleDefeatCs" Offset="0x3F80"/>
<Cutscene Name="gSpiritBossNabooruKnuckleIntroCs" Offset="0x2BB0"/>
<Cutscene Name="gSpiritBossNabooruKnuckleDefeatCs" Offset="0x3F80"/>
<Scene Name="jyasinboss_scene" Offset="0x0"/>
</File>
<File Name="jyasinboss_room_0" Segment="3">

2
assets/xml/scenes/dungeons/jyasinzou.xml
View file

@ -1,5 +1,7 @@
<Root>
<File Name="jyasinzou_scene" Segment="2">
<Texture Name="gSpiritTempleDayEntranceTex" OutName="day_entrance" Format="ia16" Width="8" Height="128" Offset="0x18920"/>
<Texture Name="gSpiritTempleNightEntranceTex" OutName="night_entrance" Format="ia16" Width="8" Height="128" Offset="0x18020"/>
<Scene Name="jyasinzou_scene" Offset="0x0"/>
</File>
<File Name="jyasinzou_room_0" Segment="3">

2
assets/xml/scenes/dungeons/men.xml
View file

@ -1,5 +1,7 @@
<Root>
<File Name="men_scene" Segment="2">
<Texture Name="gGTGDayEntranceTex" OutName="day_entrance" Format="ia16" Width="8" Height="128" Offset="0xF8C0"/>
<Texture Name="gGTGNightEntranceTex" OutName="night_entrance" Format="ia16" Width="8" Height="128" Offset="0x100C0"/>
<Scene Name="men_scene" Offset="0x0"/>
</File>
<File Name="men_room_0" Segment="3">

4
assets/xml/scenes/dungeons/ydan.xml
View file

@ -1,5 +1,9 @@
<Root>
<File Name="ydan_scene" Segment="2">
<Cutscene Name="gDekuTreeIntroCs" Offset="0xB650"/>
<Texture Name="gYdanTex_00BA18" Format="rgba16" Width="32" Height="64" Offset="0xBA18"/>
<Texture Name="gYdanTex_00CA18" Format="rgba16" Width="32" Height="64" Offset="0xCA18"/>
<Scene Name="ydan_scene" Offset="0x0"/>
</File>
<File Name="ydan_room_0" Segment="3">

7
assets/xml/scenes/indoors/miharigoya.xml
View file

@ -1,8 +1,9 @@
<Root>
<File Name="miharigoya_scene" Segment="2">
<Blob Name="gMiharigoyaBlob_001350" Offset="0x1350" Size="0x2000"/>
<Blob Name="gMiharigoyaBlob_003550" Offset="0x3550" Size="0x1000"/>
<Blob Name="gMiharigoyaBlob_006550" Offset="0x6550" Size="0x1000"/>
<Texture Name="gGuardHouseOutSideView2NightTex" OutName="view_2_night" Format="rgba16" Width="64" Height="32" Offset="0x1350" />
<Texture Name="gGuardHouseOutSideView2DayTex" OutName="view_2_day" Format="rgba16" Width="64" Height="32" Offset="0x2350" />
<Texture Name="gGuardHouseOutSideView1NightTex" OutName="view_1_night" Format="rgba16" Width="64" Height="32" Offset="0x3550" />
<Texture Name="gGuardHouseOutSideView1DayTex" OutName="view_1_day" Format="rgba16" Width="64" Height="32" Offset="0x6550" />
<Scene Name="miharigoya_scene" Offset="0x0"/>
</File>
<File Name="miharigoya_room_0" Segment="3">

5
assets/xml/scenes/indoors/tokinoma.xml
View file

@ -1,7 +1,8 @@
<Root>
<File Name="tokinoma_scene" Segment="2">
<Cutscene Name="gFirstAdultCs" Offset="0x46F0"/>
<Cutscene Name="gPreludeCs" Offset="0x6D20"/>
<Cutscene Name="gTempleOfTimeFirstAdultCs" Offset="0x46F0"/>
<Cutscene Name="gTempleOfTimePreludeCs" Offset="0x6D20"/>
<Cutscene Name="gTempleOfTimeIntroCs" Offset="0xCE00"/>
<Scene Name="tokinoma_scene" Offset="0x0"/>
</File>
<File Name="tokinoma_room_0" Segment="3">

3
assets/xml/scenes/misc/hakaana_ouke.xml
View file

@ -1,6 +1,7 @@
<Root>
<File Name="hakaana_ouke_scene" Segment="2">
<Cutscene Name="gSunSongTeachCs" Offset="0x24A0"/>
<Cutscene Name="gSunSongGraveSunSongTeachCs" Offset="0x24A0"/>
<Cutscene Name="gSunSongGraveSunSongTeachPart2Cs" Offset="0x28E0"/>
<Scene Name="hakaana_ouke_scene" Offset="0x0"/>
</File>
<File Name="hakaana_ouke_room_0" Segment="3">

2
assets/xml/scenes/overworld/souko.xml
View file

@ -1,5 +1,7 @@
<Root>
<File Name="souko_scene" Segment="2">
<Texture Name="gLonLonHouseDayEntranceTex" OutName="day_entrance" Format="ia16" Width="64" Height="4" Offset="0x5210"/>
<Texture Name="gLonLonHouseNightEntranceTex" OutName="night_entrance" Format="ia16" Width="64" Height="4" Offset="0x5010"/>
<Scene Name="souko_scene" Offset="0x0"/>
</File>
<File Name="souko_room_0" Segment="3">

8
assets/xml/scenes/overworld/spot00.xml
View file

@ -1,6 +1,12 @@
<Root>
<File Name="spot00_scene" Segment="2">
<Cutscene Name="gZeldaSongOfTimeCs" Offset="0xF870"/>
<Cutscene Name="gHyruleFieldGetOoTCs" Offset="0xBB80"/>
<Cutscene Name="gHyruleFieldZeldaSongOfTimeCs" Offset="0xF870"/>
<Cutscene Name="gHyruleFieldEastEponaJumpCs" Offset="0xFF00"/>
<Cutscene Name="gHyruleFieldIntroCs" Offset="0x13AA0"/>
<Cutscene Name="gHyruleFieldSouthEponaJumpCs" Offset="0xF9E0"/>
<Cutscene Name="gHyruleFieldWestEponaJumpCs" Offset="0x10550"/>
<Cutscene Name="gHyruleFieldGateEponaJumpCs" Offset="0x10B30"/>
<Scene Name="spot00_scene" Offset="0x0"/>
<Texture Name="spot00_scene_Tex_02A198" Format="ia8" Width="8" Height="16" Offset="0x2A198"/>
</File>

3
assets/xml/scenes/overworld/spot01.xml
View file

@ -1,5 +1,8 @@
<Root>
<File Name="spot01_scene" Segment="2">
<Cutscene Name="gKakarikoVillageIntroCs" Offset="0xA540"/>
<Texture Name="gKakarikoVillageDayWindowTex" OutName="day_window" Format="rgba16" Width="32" Height="64" Offset="0x15B50"/>
<Texture Name="gKakarikoVillageNightWindowTex" OutName="night_window" Format="rgba16" Width="32" Height="64" Offset="0x16B50"/>
<Scene Name="spot01_scene" Offset="0x0"/>
</File>
<File Name="spot01_room_0" Segment="3">

1
assets/xml/scenes/overworld/spot02.xml
View file

@ -6,6 +6,7 @@
<Cutscene Name="spot02_sceneCutsceneData0x003C80" Offset="0x3C80"/>
<Cutscene Name="spot02_scene_Cs_005020" Offset="0x5020"/>
<Cutscene Name="gGraveyardIntroCs" Offset="0x70C0"/>
</File>
<File Name="spot02_room_0" Segment="3">
<DList Name="gSpot02DL_0026D0" Offset="0x26D0"/>

2
assets/xml/scenes/overworld/spot04.xml
View file

@ -3,7 +3,7 @@
<Path Name="gSpot04Path_000314" Offset="0x314"/>
<Path Name="gSpot04Path_00031C" Offset="0x31C"/>
<Path Name="gSpot04Path_00D730" Offset="0xD730"/>
<Cutscene Name="gKokiriForestDekuSproutCs" Offset="0xC9D0"/>
<Cutscene Name="gSpot04Cs_10E20" Offset="0x10E20"/>
<Scene Name="spot04_scene" Offset="0x0"/>

3
assets/xml/scenes/overworld/spot06.xml
View file

@ -1,8 +1,9 @@
<Root>
<File Name="spot06_scene" Segment="2">
<Cutscene Name="gFireArrowsCS" Offset="0x7020"/>
<Cutscene Name="gLakeHyliaFireArrowsCS" Offset="0x7020"/>
<Cutscene Name="gLakeHyliaOwlCs" Offset="0x1B0C0"/>
<Path Name="gSpot06Path_00776C" Offset="0x776C"/>
<Cutscene Name="gLakeHyliaIntroCs" Offset="0x7A30"/>
<Scene Name="spot06_scene" Offset="0x0"/>
</File>
<File Name="spot06_room_0" Segment="3">

3
assets/xml/scenes/overworld/spot07.xml
View file

@ -1,5 +1,8 @@
<Root>
<File Name="spot07_scene" Segment="2">
<Cutscene Name="gZorasDomainIntroCs" Offset="0x3D70"/>
<Texture Name="gZorasDomainDayEntranceTex" OutName="day_entrance" Format="ia8" Width="8" Height="8" Offset="0x8F98"/>
<Texture Name="gZorasDomainNightEntranceTex" OutName="night_entrance" Format="ia8" Width="8" Height="8" Offset="0x8FD8"/>
<Scene Name="spot07_scene" Offset="0x0"/>
</File>
<File Name="spot07_room_0" Segment="3">

1
assets/xml/scenes/overworld/spot08.xml
View file

@ -1,5 +1,6 @@
<Root>
<File Name="spot08_scene" Segment="2">
<Cutscene Name="gZorasFountainIntroCs" Offset="0x4A80"/>
<Scene Name="spot08_scene" Offset="0x0"/>
</File>
<File Name="spot08_room_0" Segment="3">

2
assets/xml/scenes/overworld/spot09.xml
View file

@ -2,7 +2,7 @@
<File Name="spot09_scene" Segment="2">
<Cutscene Name="gGerudoValleyBridgeJumpFieldFortressCs" Offset="0x2AC0"/>
<Cutscene Name="gGerudoValleyBridgeJumpFortressToFieldCs" Offset="0x230"/>
<Cutscene Name="gGerudoValleyIntroCs" Offset="0x31E0"/>
<Path Name="gSpot09Path_002F60" Offset="0x2F60"/>
<Path Name="gSpot09Path_002F68" Offset="0x2F68"/>

1
assets/xml/scenes/overworld/spot11.xml
View file

@ -1,5 +1,6 @@
<Root>
<File Name="spot11_scene" Segment="2">
<Cutscene Name="gDesertColossusIntroCs" Offset="0x7990"/>
<Scene Name="spot11_scene" Offset="0x0"/>
</File>
<File Name="spot11_room_0" Segment="3">

6
assets/xml/scenes/overworld/spot12.xml
View file

@ -1,7 +1,9 @@
<Root>
<File Name="spot12_scene" Segment="2">
<Cutscene Name="gSpot12Cs_006490" Offset="0x6490"/>
<Cutscene Name="gGerudoFortressFirstCaptureCs" Offset="0x55C0"/>
<Cutscene Name="gGerudoFortressIntroCs" Offset="0x6490"/>
<Texture Name="gSpot12_009678Tex" Format="rgba16" Width="64" Height="32" Offset="0x9678"/>
<Texture Name="gSpot12_00DE78Tex" Format="rgba16" Width="64" Height="32" Offset="0xDE78"/>
<Scene Name="spot12_scene" Offset="0x0"/>
</File>
<File Name="spot12_room_0" Segment="3">

1
assets/xml/scenes/overworld/spot15.xml
View file

@ -1,5 +1,6 @@
<Root>
<File Name="spot15_scene" Segment="2">
<Cutscene Name="gHyruleCastleIntroCs" Offset="0x3F40"/>
<Scene Name="spot15_scene" Offset="0x0"/>
</File>
<File Name="spot15_room_0" Segment="3">

3
assets/xml/scenes/overworld/spot16.xml
View file

@ -1,6 +1,7 @@
<Root>
<File Name="spot16_scene" Segment="2">
<Cutscene Name="gDmtOwlCs" Offset="0x1E6A0"/>
<Cutscene Name="gDMTOwlCs" Offset="0x1E6A0"/>
<Cutscene Name="gDMTIntroCs" Offset="0x7EA0"/>
<Scene Name="spot16_scene" Offset="0x0"/>
<Texture Name="spot16_scene_Tex_01AE98" Format="i4" Width="64" Height="64" Offset="0x1AE98"/>
</File>

3
assets/xml/scenes/overworld/spot17.xml
View file

@ -1,6 +1,7 @@
<Root>
<File Name="spot17_scene" Segment="2">
<Cutscene Name="gBoleroCs" Offset="0x45D0"/>
<Cutscene Name="gDeathMountainCraterBoleroCs" Offset="0x45D0"/>
<Cutscene Name="gDeathMountainCraterIntroCs" Offset="0x76D0"/>
<Scene Name="spot17_scene" Offset="0x0"/>
</File>
<File Name="spot17_room_0" Segment="3">

4
assets/xml/scenes/overworld/spot18.xml
View file

@ -3,7 +3,9 @@
<Cutscene Name="gGoronCityDaruniaCorrectCs" Offset="0x59E0"/>
<Cutscene Name="gGoronCityDarunia01Cs" Offset="0x6930"/>
<Cutscene Name="gGoronCityDaruniaWrongCs" Offset="0x7DE0"/>
<Cutscene Name="gGoronCityIntroCs" Offset="0x8400"/>
<Texture Name="gGoronCityNightEntranceTex" OutName="night_entrance" Format="ia8" Width="8" Height="8" Offset="0x8FC8"/>
<Texture Name="gGoronCityDayEntranceTex" OutName="day_entrance" Format="ia8" Width="8" Height="8" Offset="0x9808"/>
<Scene Name="spot18_scene" Offset="0x0"/>
</File>
<File Name="spot18_room_0" Segment="3">

3
assets/xml/scenes/overworld/spot20.xml
View file

@ -1,5 +1,8 @@
<Root>
<File Name="spot20_scene" Segment="2">
<Cutscene Name="gLonLonRanchIntroCs" Offset="0x5BD0"/>
<Texture Name="gLonLonRanchDayWindowTex" OutName="day_window" Format="rgba16" Width="32" Height="64" Offset="0x81E0"/>
<Texture Name="gLonLonRangeNightWindowsTex" OutName="night_window" Format="rgba16" Width="32" Height="64" Offset="0xFBE0"/>
<Scene Name="spot20_scene" Offset="0x0"/>
</File>
<File Name="spot20_room_0" Segment="3">