Game-Decompilation/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2024-11-23 05:49:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix miscategorized scenes (#1946)

Browse Source 
* Fix miscategorized scenes

* Sort includes
This commit is contained in:
cadmic 2024-04-18 19:21:34 -07:00 committed by GitHub
parent 30eb05321d
commit 9cbd57d329
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
7 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
assets/xml/scenes/overworld/souko.xml → assets/xml/scenes/indoors/souko.xml
View File

0
assets/xml/scenes/overworld/entra.xml → assets/xml/scenes/misc/entra.xml
View File

0
assets/xml/scenes/dungeons/ganon_tou.xml → assets/xml/scenes/overworld/ganon_tou.xml
View File

16
spec
View File

@ -10499,7 +10499,7 @@ beginseg
name "entra_scene"
compress
romalign 0x1000
include "$(BUILD_DIR)/assets/scenes/overworld/entra/entra_scene.o"
include "$(BUILD_DIR)/assets/scenes/misc/entra/entra_scene.o"
number 2
endseg
@ -10507,7 +10507,7 @@ beginseg
name "entra_room_0"
compress
romalign 0x1000
include "$(BUILD_DIR)/assets/scenes/overworld/entra/entra_room_0.o"
include "$(BUILD_DIR)/assets/scenes/misc/entra/entra_room_0.o"
number 3
endseg
@ -10587,7 +10587,7 @@ beginseg
name "ganon_tou_scene"
compress
romalign 0x1000
include "$(BUILD_DIR)/assets/scenes/dungeons/ganon_tou/ganon_tou_scene.o"
include "$(BUILD_DIR)/assets/scenes/overworld/ganon_tou/ganon_tou_scene.o"
number 2
endseg
@ -10595,7 +10595,7 @@ beginseg
name "ganon_tou_room_0"
compress
romalign 0x1000
include "$(BUILD_DIR)/assets/scenes/dungeons/ganon_tou/ganon_tou_room_0.o"
include "$(BUILD_DIR)/assets/scenes/overworld/ganon_tou/ganon_tou_room_0.o"
number 3
endseg
@ -11651,7 +11651,7 @@ beginseg
name "souko_scene"
compress
romalign 0x1000
include "$(BUILD_DIR)/assets/scenes/overworld/souko/souko_scene.o"
include "$(BUILD_DIR)/assets/scenes/indoors/souko/souko_scene.o"
number 2
endseg
@ -11659,7 +11659,7 @@ beginseg
name "souko_room_0"
compress
romalign 0x1000
include "$(BUILD_DIR)/assets/scenes/overworld/souko/souko_room_0.o"
include "$(BUILD_DIR)/assets/scenes/indoors/souko/souko_room_0.o"
number 3
endseg
@ -11667,7 +11667,7 @@ beginseg
name "souko_room_1"
compress
romalign 0x1000
include "$(BUILD_DIR)/assets/scenes/overworld/souko/souko_room_1.o"
include "$(BUILD_DIR)/assets/scenes/indoors/souko/souko_room_1.o"
number 3
endseg
@ -11675,7 +11675,7 @@ beginseg
name "souko_room_2"
compress
romalign 0x1000
include "$(BUILD_DIR)/assets/scenes/overworld/souko/souko_room_2.o"
include "$(BUILD_DIR)/assets/scenes/indoors/souko/souko_room_2.o"
number 3
endseg

3
src/code/z_demo.c
View File

@ -3,6 +3,8 @@
#include "z64camera.h"
#include "assets/scenes/indoors/tokinoma/tokinoma_scene.h"
#include "assets/scenes/overworld/ganon_tou/ganon_tou_scene.h"
#include "assets/scenes/overworld/spot00/spot00_scene.h"
#include "assets/scenes/overworld/spot01/spot01_scene.h"
#include "assets/scenes/overworld/spot02/spot02_scene.h"
@ -24,7 +26,6 @@
#include "assets/scenes/dungeons/ddan/ddan_scene.h"
#include "assets/scenes/dungeons/ydan/ydan_scene.h"
#include "assets/scenes/dungeons/ganontika/ganontika_scene.h"
#include "assets/scenes/dungeons/ganon_tou/ganon_tou_scene.h"
#include "assets/scenes/dungeons/jyasinboss/jyasinboss_scene.h"
#include "assets/scenes/dungeons/ice_doukutu/ice_doukutu_scene.h"

13
src/code/z_scene_table.c
View File

@ -1,6 +1,9 @@
#include "global.h"
#include "quake.h"
#include "assets/scenes/indoors/miharigoya/miharigoya_scene.h"
#include "assets/scenes/indoors/souko/souko_scene.h"
#include "assets/scenes/overworld/spot00/spot00_scene.h"
#include "assets/scenes/overworld/spot00/spot00_room_0.h"
#include "assets/scenes/overworld/spot01/spot01_scene.h"
@ -10,17 +13,15 @@
#include "assets/scenes/overworld/spot16/spot16_room_0.h"
#include "assets/scenes/overworld/spot18/spot18_scene.h"
#include "assets/scenes/overworld/spot20/spot20_scene.h"
#include "assets/scenes/overworld/souko/souko_scene.h"
#include "assets/scenes/dungeons/men/men_scene.h"
#include "assets/scenes/dungeons/ddan/ddan_scene.h"
#include "assets/scenes/dungeons/ydan/ydan_scene.h"
#include "assets/scenes/dungeons/Bmori1/Bmori1_scene.h"
#include "assets/scenes/dungeons/MIZUsin/MIZUsin_scene.h"
#include "assets/scenes/dungeons/ddan/ddan_scene.h"
#include "assets/scenes/dungeons/gerudoway/gerudoway_scene.h"
#include "assets/scenes/dungeons/jyasinzou/jyasinzou_scene.h"
#include "assets/scenes/indoors/miharigoya/miharigoya_scene.h"
#include "assets/scenes/dungeons/ice_doukutu/ice_doukutu_scene.h"
#include "assets/scenes/dungeons/jyasinzou/jyasinzou_scene.h"
#include "assets/scenes/dungeons/men/men_scene.h"
#include "assets/scenes/dungeons/ydan/ydan_scene.h"
#include "overlays/actors/ovl_Bg_Dodoago/z_bg_dodoago.h"

2
src/overlays/actors/ovl_Bg_Gjyo_Bridge/z_bg_gjyo_bridge.c
View File

@ -6,7 +6,7 @@
#include "z_bg_gjyo_bridge.h"
#include "assets/objects/object_gjyo_objects/object_gjyo_objects.h"
#include "assets/scenes/dungeons/ganon_tou/ganon_tou_scene.h"
#include "assets/scenes/overworld/ganon_tou/ganon_tou_scene.h"
#define FLAGS 0