mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-07-03 06:24:30 +00:00
Code Issues Projects Releases Wiki Activity

All 110 scenes decompiled. (#175)

Browse source 
* Auto stash before rebase of "upstream/master"

* A large number of scenes have been decompiled.

* Fixed makefile

* Decompiled around 40 scenes.

* Removed old file

* Updated to newer version of ZAP2

* Finished matching remaining scenes.

* Added back ZAP2

* Removed old commented out spec lines

Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
This commit is contained in:
Nicholas Estelami 2020-05-29 17:59:10 -04:00 • committed by GitHub
parent ac97807762
commit 6d4558542a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 83 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

61
spec
View file

@ -142,28 +142,24 @@ endseg
beginseg
name "icon_item_static"
romalign 0x1000
//include "build/baserom/icon_item_static.o"
include "build/assets/textures/icon_item_static/icon_item_static.o"
endseg
beginseg
name "icon_item_24_static"
romalign 0x1000
//include "build/baserom/icon_item_24_static.o"
include "build/assets/textures/icon_item_24_static/icon_item_24_static.o"
endseg
beginseg
name "icon_item_field_static"
romalign 0x1000
//include "build/baserom/icon_item_field_static.o"
include "build/assets/textures/icon_item_field_static/icon_item_field_static.o"
endseg
beginseg
name "icon_item_dungeon_static"
romalign 0x1000
//include "build/baserom/icon_item_dungeon_static.o"
include "build/assets/textures/icon_item_dungeon_static/icon_item_dungeon_static.o"
endseg
@ -8510,13 +8506,15 @@ endseg
beginseg
name "syotes_scene"
romalign 0x1000
include "build/baserom/syotes_scene.o"
include "build/scenes/test_levels/syotes/syotes_scene.o"
address SEGMENT_SCENE
endseg
beginseg
name "syotes_room_0"
romalign 0x1000
include "build/baserom/syotes_room_0.o"
include "build/scenes/test_levels/syotes/syotes_room_0.o"
address SEGMENT_ROOM
endseg
beginseg
@ -8935,32 +8933,36 @@ endseg
beginseg
name "spot18_room_3"
romalign 0x1000
include "build/scenes/overworld/spot18/spot18_room_3.o"
include "build/scenes/overworld/spot18/spot18_room_3.o"
address SEGMENT_ROOM
endseg
beginseg
name "market_day_scene"
romalign 0x1000
include "build/baserom/market_day_scene.o"
include "build/scenes/misc/market_day/market_day_scene.o"
address SEGMENT_SCENE
endseg
beginseg
name "market_day_room_0"
romalign 0x1000
include "build/baserom/market_day_room_0.o"
include "build/scenes/misc/market_day/market_day_room_0.o"
address SEGMENT_ROOM
endseg
beginseg
name "market_night_scene"
romalign 0x1000
include "build/baserom/market_night_scene.o"
include "build/scenes/misc/market_night/market_night_scene.o"
address SEGMENT_SCENE
endseg
beginseg
name "market_night_room_0"
romalign 0x1000
include "build/baserom/market_night_room_0.o"
include "build/scenes/misc/market_night/market_night_room_0.o"
address SEGMENT_ROOM
endseg
beginseg
@ -9316,9 +9318,8 @@ endseg
beginseg
name "market_alley_room_0"
romalign 0x1000
include "build/baserom/market_alley_room_0.o"
//include "build/scenes/misc/market_alley/market_alley_room_0.o"
//address SEGMENT_ROOM
include "build/scenes/misc/market_alley/market_alley_room_0.o"
address SEGMENT_ROOM
endseg
beginseg
@ -9387,9 +9388,8 @@ endseg
beginseg
name "market_alley_n_room_0"
romalign 0x1000
include "build/baserom/market_alley_n_room_0.o"
//include "build/scenes/misc/market_alley_n/market_alley_n_room_0.o"
//address SEGMENT_ROOM
include "build/scenes/misc/market_alley_n/market_alley_n_room_0.o"
address SEGMENT_ROOM
endseg
beginseg
@ -9941,25 +9941,29 @@ endseg
beginseg
name "kakariko3_scene"
romalign 0x1000
include "build/baserom/kakariko3_scene.o"
include "build/scenes/misc/kakariko3/kakariko3_scene.o"
address SEGMENT_SCENE
endseg
beginseg
name "kakariko3_room_0"
romalign 0x1000
include "build/baserom/kakariko3_room_0.o"
include "build/scenes/misc/kakariko3/kakariko3_room_0.o"
address SEGMENT_ROOM
endseg
beginseg
name "hairal_niwa2_scene"
romalign 0x1000
include "build/baserom/hairal_niwa2_scene.o"
include "build/scenes/indoors/hairal_niwa2/hairal_niwa2_scene.o"
address SEGMENT_SCENE
endseg
beginseg
name "hairal_niwa2_room_0"
romalign 0x1000
include "build/baserom/hairal_niwa2_room_0.o"
include "build/scenes/indoors/hairal_niwa2/hairal_niwa2_room_0.o"
address SEGMENT_ROOM
endseg
beginseg
@ -10028,9 +10032,8 @@ endseg
beginseg
name "shrine_room_0"
romalign 0x1000
include "build/baserom/shrine_room_0.o"
//include "build/scenes/misc/shrine/shrine_room_0.o"
//address SEGMENT_ROOM
include "build/scenes/misc/shrine/shrine_room_0.o"
address SEGMENT_ROOM
endseg
beginseg
@ -10057,9 +10060,8 @@ endseg
beginseg
name "shrine_n_room_0"
romalign 0x1000
include "build/baserom/shrine_n_room_0.o"
//include "build/scenes/misc/shrine_n/shrine_n_room_0.o"
//address SEGMENT_ROOM
include "build/scenes/misc/shrine_n/shrine_n_room_0.o"
address SEGMENT_ROOM
endseg
beginseg
@ -10072,9 +10074,8 @@ endseg
beginseg
name "shrine_r_room_0"
romalign 0x1000
include "build/baserom/shrine_r_room_0.o"
//include "build/scenes/misc/shrine_r/shrine_r_room_0.o"
//address SEGMENT_ROOM
include "build/scenes/misc/shrine_r/shrine_r_room_0.o"
address SEGMENT_ROOM
endseg
beginseg