mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-07-18 22:04:54 +00:00
Code Issues Projects Releases Wiki Activity

Implement the scene table with defines (#1128)

Browse source 
* Implement scene table with a single define

* Format z_scene_table.c

* Apply review suggestions

* Reorder arguments in DEFINE_SCENE
* Use ROM_INFO for the scene table
* Change "Debug only" to "Debug-only"

* Apply more review suggestions

* Use NULL for 'none' rom addresses
* Remove scene declarations from segment_symbols.h
This commit is contained in:
Roman971 2022-02-01 20:36:09 +01:00 • committed by GitHub
parent aecd883bbc
commit cd1d08d34f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 148 additions and 398 deletions
Download patch file Download diff file Expand all files Collapse all files

170
include/segment_symbols.h
View file

@ -72,64 +72,6 @@ DECLARE_OVERLAY_SEGMENT(kaleido_scope)
DECLARE_OVERLAY_SEGMENT(player_actor)
DECLARE_OVERLAY_SEGMENT(map_mark_data)
DECLARE_ROM_SEGMENT(g_pn_01)
DECLARE_ROM_SEGMENT(g_pn_02)
DECLARE_ROM_SEGMENT(g_pn_03)
DECLARE_ROM_SEGMENT(g_pn_04)
DECLARE_ROM_SEGMENT(g_pn_05)
DECLARE_ROM_SEGMENT(g_pn_06)
DECLARE_ROM_SEGMENT(g_pn_07)
DECLARE_ROM_SEGMENT(g_pn_08)
DECLARE_ROM_SEGMENT(g_pn_09)
DECLARE_ROM_SEGMENT(g_pn_10)
DECLARE_ROM_SEGMENT(g_pn_11)
DECLARE_ROM_SEGMENT(g_pn_12)
DECLARE_ROM_SEGMENT(g_pn_13)
DECLARE_ROM_SEGMENT(g_pn_14)
DECLARE_ROM_SEGMENT(g_pn_15)
DECLARE_ROM_SEGMENT(g_pn_16)
DECLARE_ROM_SEGMENT(g_pn_17)
DECLARE_ROM_SEGMENT(g_pn_18)
DECLARE_ROM_SEGMENT(g_pn_19)
DECLARE_ROM_SEGMENT(g_pn_20)
DECLARE_ROM_SEGMENT(g_pn_21)
DECLARE_ROM_SEGMENT(g_pn_22)
DECLARE_ROM_SEGMENT(g_pn_23)
DECLARE_ROM_SEGMENT(g_pn_24)
DECLARE_ROM_SEGMENT(g_pn_25)
DECLARE_ROM_SEGMENT(g_pn_26)
DECLARE_ROM_SEGMENT(g_pn_27)
DECLARE_ROM_SEGMENT(g_pn_28)
DECLARE_ROM_SEGMENT(g_pn_29)
DECLARE_ROM_SEGMENT(g_pn_30)
DECLARE_ROM_SEGMENT(g_pn_31)
DECLARE_ROM_SEGMENT(g_pn_32)
DECLARE_ROM_SEGMENT(g_pn_33)
DECLARE_ROM_SEGMENT(g_pn_34)
DECLARE_ROM_SEGMENT(g_pn_35)
DECLARE_ROM_SEGMENT(g_pn_36)
DECLARE_ROM_SEGMENT(g_pn_37)
DECLARE_ROM_SEGMENT(g_pn_38)
DECLARE_ROM_SEGMENT(g_pn_39)
DECLARE_ROM_SEGMENT(g_pn_40)
DECLARE_ROM_SEGMENT(g_pn_41)
DECLARE_ROM_SEGMENT(g_pn_42)
DECLARE_ROM_SEGMENT(g_pn_43)
DECLARE_ROM_SEGMENT(g_pn_44)
DECLARE_ROM_SEGMENT(g_pn_45)
DECLARE_ROM_SEGMENT(g_pn_46)
DECLARE_ROM_SEGMENT(g_pn_47)
DECLARE_ROM_SEGMENT(g_pn_48)
DECLARE_ROM_SEGMENT(g_pn_49)
DECLARE_ROM_SEGMENT(g_pn_50)
DECLARE_ROM_SEGMENT(g_pn_51)
DECLARE_ROM_SEGMENT(g_pn_52)
DECLARE_ROM_SEGMENT(g_pn_53)
DECLARE_ROM_SEGMENT(g_pn_54)
DECLARE_ROM_SEGMENT(g_pn_55)
DECLARE_ROM_SEGMENT(g_pn_56)
DECLARE_ROM_SEGMENT(g_pn_57)
DECLARE_ROM_SEGMENT(z_select_static)
DECLARE_ROM_SEGMENT(nintendo_rogo_static)
DECLARE_ROM_SEGMENT(title_static)
@ -201,8 +143,6 @@ DECLARE_ROM_SEGMENT(vr_FCVR_pal_static)
DECLARE_ROM_SEGMENT(elf_message_field)
DECLARE_ROM_SEGMENT(elf_message_ydan)
// SCENES AND ROOMS
DECLARE_ROM_SEGMENT(ydan_scene)
DECLARE_ROM_SEGMENT(ydan_room_0)
DECLARE_ROM_SEGMENT(ydan_room_1)
DECLARE_ROM_SEGMENT(ydan_room_2)
@ -216,7 +156,6 @@ DECLARE_ROM_SEGMENT(ydan_room_9)
DECLARE_ROM_SEGMENT(ydan_room_10)
DECLARE_ROM_SEGMENT(ydan_room_11)
DECLARE_ROM_SEGMENT(ddan_scene)
DECLARE_ROM_SEGMENT(ddan_room_0)
DECLARE_ROM_SEGMENT(ddan_room_1)
DECLARE_ROM_SEGMENT(ddan_room_2)
@ -235,7 +174,6 @@ DECLARE_ROM_SEGMENT(ddan_room_14)
DECLARE_ROM_SEGMENT(ddan_room_15)
DECLARE_ROM_SEGMENT(ddan_room_16)
DECLARE_ROM_SEGMENT(bdan_scene)
DECLARE_ROM_SEGMENT(bdan_room_0)
DECLARE_ROM_SEGMENT(bdan_room_1)
DECLARE_ROM_SEGMENT(bdan_room_2)
@ -253,7 +191,6 @@ DECLARE_ROM_SEGMENT(bdan_room_13)
DECLARE_ROM_SEGMENT(bdan_room_14)
DECLARE_ROM_SEGMENT(bdan_room_15)
DECLARE_ROM_SEGMENT(Bmori1_scene)
DECLARE_ROM_SEGMENT(Bmori1_room_0)
DECLARE_ROM_SEGMENT(Bmori1_room_1)
DECLARE_ROM_SEGMENT(Bmori1_room_2)
@ -278,7 +215,6 @@ DECLARE_ROM_SEGMENT(Bmori1_room_20)
DECLARE_ROM_SEGMENT(Bmori1_room_21)
DECLARE_ROM_SEGMENT(Bmori1_room_22)
DECLARE_ROM_SEGMENT(HIDAN_scene)
DECLARE_ROM_SEGMENT(HIDAN_room_0)
DECLARE_ROM_SEGMENT(HIDAN_room_1)
DECLARE_ROM_SEGMENT(HIDAN_room_2)
@ -307,7 +243,6 @@ DECLARE_ROM_SEGMENT(HIDAN_room_24)
DECLARE_ROM_SEGMENT(HIDAN_room_25)
DECLARE_ROM_SEGMENT(HIDAN_room_26)
DECLARE_ROM_SEGMENT(MIZUsin_scene)
DECLARE_ROM_SEGMENT(MIZUsin_room_0)
DECLARE_ROM_SEGMENT(MIZUsin_room_1)
DECLARE_ROM_SEGMENT(MIZUsin_room_2)
@ -332,7 +267,6 @@ DECLARE_ROM_SEGMENT(MIZUsin_room_20)
DECLARE_ROM_SEGMENT(MIZUsin_room_21)
DECLARE_ROM_SEGMENT(MIZUsin_room_22)
DECLARE_ROM_SEGMENT(jyasinzou_scene)
DECLARE_ROM_SEGMENT(jyasinzou_room_0)
DECLARE_ROM_SEGMENT(jyasinzou_room_1)
DECLARE_ROM_SEGMENT(jyasinzou_room_2)
@ -363,7 +297,6 @@ DECLARE_ROM_SEGMENT(jyasinzou_room_26)
DECLARE_ROM_SEGMENT(jyasinzou_room_27)
DECLARE_ROM_SEGMENT(jyasinzou_room_28)
DECLARE_ROM_SEGMENT(HAKAdan_scene)
DECLARE_ROM_SEGMENT(HAKAdan_room_0)
DECLARE_ROM_SEGMENT(HAKAdan_room_1)
DECLARE_ROM_SEGMENT(HAKAdan_room_2)
@ -388,7 +321,6 @@ DECLARE_ROM_SEGMENT(HAKAdan_room_20)
DECLARE_ROM_SEGMENT(HAKAdan_room_21)
DECLARE_ROM_SEGMENT(HAKAdan_room_22)
DECLARE_ROM_SEGMENT(HAKAdanCH_scene)
DECLARE_ROM_SEGMENT(HAKAdanCH_room_0)
DECLARE_ROM_SEGMENT(HAKAdanCH_room_1)
DECLARE_ROM_SEGMENT(HAKAdanCH_room_2)
@ -397,7 +329,6 @@ DECLARE_ROM_SEGMENT(HAKAdanCH_room_4)
DECLARE_ROM_SEGMENT(HAKAdanCH_room_5)
DECLARE_ROM_SEGMENT(HAKAdanCH_room_6)
DECLARE_ROM_SEGMENT(ice_doukutu_scene)
DECLARE_ROM_SEGMENT(ice_doukutu_room_0)
DECLARE_ROM_SEGMENT(ice_doukutu_room_1)
DECLARE_ROM_SEGMENT(ice_doukutu_room_2)
@ -411,7 +342,6 @@ DECLARE_ROM_SEGMENT(ice_doukutu_room_9)
DECLARE_ROM_SEGMENT(ice_doukutu_room_10)
DECLARE_ROM_SEGMENT(ice_doukutu_room_11)
DECLARE_ROM_SEGMENT(ganon_scene)
DECLARE_ROM_SEGMENT(ganon_room_0)
DECLARE_ROM_SEGMENT(ganon_room_1)
DECLARE_ROM_SEGMENT(ganon_room_2)
@ -423,7 +353,6 @@ DECLARE_ROM_SEGMENT(ganon_room_7)
DECLARE_ROM_SEGMENT(ganon_room_8)
DECLARE_ROM_SEGMENT(ganon_room_9)
DECLARE_ROM_SEGMENT(men_scene)
DECLARE_ROM_SEGMENT(men_room_0)
DECLARE_ROM_SEGMENT(men_room_1)
DECLARE_ROM_SEGMENT(men_room_2)
@ -436,7 +365,6 @@ DECLARE_ROM_SEGMENT(men_room_8)
DECLARE_ROM_SEGMENT(men_room_9)
DECLARE_ROM_SEGMENT(men_room_10)
DECLARE_ROM_SEGMENT(gerudoway_scene)
DECLARE_ROM_SEGMENT(gerudoway_room_0)
DECLARE_ROM_SEGMENT(gerudoway_room_1)
DECLARE_ROM_SEGMENT(gerudoway_room_2)
@ -444,7 +372,6 @@ DECLARE_ROM_SEGMENT(gerudoway_room_3)
DECLARE_ROM_SEGMENT(gerudoway_room_4)
DECLARE_ROM_SEGMENT(gerudoway_room_5)
DECLARE_ROM_SEGMENT(ganontika_scene)
DECLARE_ROM_SEGMENT(ganontika_room_0)
DECLARE_ROM_SEGMENT(ganontika_room_1)
DECLARE_ROM_SEGMENT(ganontika_room_2)
@ -466,18 +393,15 @@ DECLARE_ROM_SEGMENT(ganontika_room_17)
DECLARE_ROM_SEGMENT(ganontika_room_18)
DECLARE_ROM_SEGMENT(ganontika_room_19)
DECLARE_ROM_SEGMENT(ganon_sonogo_scene)
DECLARE_ROM_SEGMENT(ganon_sonogo_room_0)
DECLARE_ROM_SEGMENT(ganon_sonogo_room_1)
DECLARE_ROM_SEGMENT(ganon_sonogo_room_2)
DECLARE_ROM_SEGMENT(ganon_sonogo_room_3)
DECLARE_ROM_SEGMENT(ganon_sonogo_room_4)
DECLARE_ROM_SEGMENT(ganontikasonogo_scene)
DECLARE_ROM_SEGMENT(ganontikasonogo_room_0)
DECLARE_ROM_SEGMENT(ganontikasonogo_room_1)
DECLARE_ROM_SEGMENT(takaraya_scene)
DECLARE_ROM_SEGMENT(takaraya_room_0)
DECLARE_ROM_SEGMENT(takaraya_room_1)
DECLARE_ROM_SEGMENT(takaraya_room_2)
@ -486,152 +410,106 @@ DECLARE_ROM_SEGMENT(takaraya_room_4)
DECLARE_ROM_SEGMENT(takaraya_room_5)
DECLARE_ROM_SEGMENT(takaraya_room_6)
DECLARE_ROM_SEGMENT(ydan_boss_scene)
DECLARE_ROM_SEGMENT(ydan_boss_room_0)
DECLARE_ROM_SEGMENT(ydan_boss_room_1)
DECLARE_ROM_SEGMENT(ddan_boss_scene)
DECLARE_ROM_SEGMENT(ddan_boss_room_0)
DECLARE_ROM_SEGMENT(ddan_boss_room_1)
DECLARE_ROM_SEGMENT(bdan_boss_scene)
DECLARE_ROM_SEGMENT(bdan_boss_room_0)
DECLARE_ROM_SEGMENT(bdan_boss_room_1)
DECLARE_ROM_SEGMENT(moribossroom_scene)
DECLARE_ROM_SEGMENT(moribossroom_room_0)
DECLARE_ROM_SEGMENT(moribossroom_room_1)
DECLARE_ROM_SEGMENT(FIRE_bs_scene)
DECLARE_ROM_SEGMENT(FIRE_bs_room_0)
DECLARE_ROM_SEGMENT(FIRE_bs_room_1)
DECLARE_ROM_SEGMENT(MIZUsin_bs_scene)
DECLARE_ROM_SEGMENT(MIZUsin_bs_room_0)
DECLARE_ROM_SEGMENT(MIZUsin_bs_room_1)
DECLARE_ROM_SEGMENT(jyasinboss_scene)
DECLARE_ROM_SEGMENT(jyasinboss_room_0)
DECLARE_ROM_SEGMENT(jyasinboss_room_1)
DECLARE_ROM_SEGMENT(jyasinboss_room_2)
DECLARE_ROM_SEGMENT(jyasinboss_room_3)
DECLARE_ROM_SEGMENT(HAKAdan_bs_scene)
DECLARE_ROM_SEGMENT(HAKAdan_bs_room_0)
DECLARE_ROM_SEGMENT(HAKAdan_bs_room_1)
DECLARE_ROM_SEGMENT(ganon_boss_scene)
DECLARE_ROM_SEGMENT(ganon_boss_room_0)
DECLARE_ROM_SEGMENT(ganon_final_scene)
DECLARE_ROM_SEGMENT(ganon_final_room_0)
DECLARE_ROM_SEGMENT(entra_scene)
DECLARE_ROM_SEGMENT(entra_room_0)
DECLARE_ROM_SEGMENT(entra_n_scene)
DECLARE_ROM_SEGMENT(entra_n_room_0)
DECLARE_ROM_SEGMENT(enrui_scene)
DECLARE_ROM_SEGMENT(enrui_room_0)
DECLARE_ROM_SEGMENT(market_alley_scene)
DECLARE_ROM_SEGMENT(market_alley_room_0)
DECLARE_ROM_SEGMENT(market_alley_n_scene)
DECLARE_ROM_SEGMENT(market_alley_n_room_0)
DECLARE_ROM_SEGMENT(market_day_scene)
DECLARE_ROM_SEGMENT(market_day_room_0)
DECLARE_ROM_SEGMENT(market_night_scene)
DECLARE_ROM_SEGMENT(market_night_room_0)
DECLARE_ROM_SEGMENT(market_ruins_scene)
DECLARE_ROM_SEGMENT(market_ruins_room_0)
DECLARE_ROM_SEGMENT(shrine_scene)
DECLARE_ROM_SEGMENT(shrine_room_0)
DECLARE_ROM_SEGMENT(shrine_n_scene)
DECLARE_ROM_SEGMENT(shrine_n_room_0)
DECLARE_ROM_SEGMENT(shrine_r_scene)
DECLARE_ROM_SEGMENT(shrine_r_room_0)
DECLARE_ROM_SEGMENT(kokiri_home_scene)
DECLARE_ROM_SEGMENT(kokiri_home_room_0)
DECLARE_ROM_SEGMENT(kokiri_home3_scene)
DECLARE_ROM_SEGMENT(kokiri_home3_room_0)
DECLARE_ROM_SEGMENT(kokiri_home4_scene)
DECLARE_ROM_SEGMENT(kokiri_home4_room_0)
DECLARE_ROM_SEGMENT(kokiri_home5_scene)
DECLARE_ROM_SEGMENT(kokiri_home5_room_0)
DECLARE_ROM_SEGMENT(kakariko_scene)
DECLARE_ROM_SEGMENT(kakariko_room_0)
DECLARE_ROM_SEGMENT(kakariko3_scene)
DECLARE_ROM_SEGMENT(kakariko3_room_0)
DECLARE_ROM_SEGMENT(shop1_scene)
DECLARE_ROM_SEGMENT(shop1_room_0)
DECLARE_ROM_SEGMENT(kokiri_shop_scene)
DECLARE_ROM_SEGMENT(kokiri_shop_room_0)
DECLARE_ROM_SEGMENT(golon_scene)
DECLARE_ROM_SEGMENT(golon_room_0)
DECLARE_ROM_SEGMENT(zoora_scene)
DECLARE_ROM_SEGMENT(zoora_room_0)
DECLARE_ROM_SEGMENT(drag_scene)
DECLARE_ROM_SEGMENT(drag_room_0)
DECLARE_ROM_SEGMENT(alley_shop_scene)
DECLARE_ROM_SEGMENT(alley_shop_room_0)
DECLARE_ROM_SEGMENT(night_shop_scene)
DECLARE_ROM_SEGMENT(night_shop_room_0)
DECLARE_ROM_SEGMENT(face_shop_scene)
DECLARE_ROM_SEGMENT(face_shop_room_0)
DECLARE_ROM_SEGMENT(link_home_scene)
DECLARE_ROM_SEGMENT(link_home_room_0)
DECLARE_ROM_SEGMENT(impa_scene)
DECLARE_ROM_SEGMENT(impa_room_0)
DECLARE_ROM_SEGMENT(malon_stable_scene)
DECLARE_ROM_SEGMENT(malon_stable_room_0)
DECLARE_ROM_SEGMENT(labo_scene)
DECLARE_ROM_SEGMENT(labo_room_0)
DECLARE_ROM_SEGMENT(hylia_labo_scene)
DECLARE_ROM_SEGMENT(hylia_labo_room_0)
DECLARE_ROM_SEGMENT(tent_scene)
DECLARE_ROM_SEGMENT(tent_room_0)
DECLARE_ROM_SEGMENT(hut_scene)
DECLARE_ROM_SEGMENT(hut_room_0)
DECLARE_ROM_SEGMENT(daiyousei_izumi_scene)
DECLARE_ROM_SEGMENT(daiyousei_izumi_room_0)
DECLARE_ROM_SEGMENT(yousei_izumi_tate_scene)
DECLARE_ROM_SEGMENT(yousei_izumi_tate_room_0)
DECLARE_ROM_SEGMENT(yousei_izumi_yoko_scene)
DECLARE_ROM_SEGMENT(yousei_izumi_yoko_room_0)
DECLARE_ROM_SEGMENT(kakusiana_scene)
DECLARE_ROM_SEGMENT(kakusiana_room_0)
DECLARE_ROM_SEGMENT(kakusiana_room_1)
DECLARE_ROM_SEGMENT(kakusiana_room_2)
@ -647,37 +525,27 @@ DECLARE_ROM_SEGMENT(kakusiana_room_11)
DECLARE_ROM_SEGMENT(kakusiana_room_12)
DECLARE_ROM_SEGMENT(kakusiana_room_13)
DECLARE_ROM_SEGMENT(hakaana_scene)
DECLARE_ROM_SEGMENT(hakaana_room_0)
DECLARE_ROM_SEGMENT(hakaana2_scene)
DECLARE_ROM_SEGMENT(hakaana2_room_0)
DECLARE_ROM_SEGMENT(hakaana_ouke_scene)
DECLARE_ROM_SEGMENT(hakaana_ouke_room_0)
DECLARE_ROM_SEGMENT(hakaana_ouke_room_1)
DECLARE_ROM_SEGMENT(hakaana_ouke_room_2)
DECLARE_ROM_SEGMENT(syatekijyou_scene)
DECLARE_ROM_SEGMENT(syatekijyou_room_0)
DECLARE_ROM_SEGMENT(tokinoma_scene)
DECLARE_ROM_SEGMENT(tokinoma_room_0)
DECLARE_ROM_SEGMENT(tokinoma_room_1)
DECLARE_ROM_SEGMENT(kenjyanoma_scene)
DECLARE_ROM_SEGMENT(kenjyanoma_room_0)
DECLARE_ROM_SEGMENT(hairal_niwa_scene)
DECLARE_ROM_SEGMENT(hairal_niwa_room_0)
DECLARE_ROM_SEGMENT(hairal_niwa_n_scene)
DECLARE_ROM_SEGMENT(hairal_niwa_n_room_0)
DECLARE_ROM_SEGMENT(hiral_demo_scene)
DECLARE_ROM_SEGMENT(hiral_demo_room_0)
DECLARE_ROM_SEGMENT(hakasitarelay_scene)
DECLARE_ROM_SEGMENT(hakasitarelay_room_0)
DECLARE_ROM_SEGMENT(hakasitarelay_room_1)
DECLARE_ROM_SEGMENT(hakasitarelay_room_2)
@ -686,68 +554,49 @@ DECLARE_ROM_SEGMENT(hakasitarelay_room_4)
DECLARE_ROM_SEGMENT(hakasitarelay_room_5)
DECLARE_ROM_SEGMENT(hakasitarelay_room_6)
DECLARE_ROM_SEGMENT(turibori_scene)
DECLARE_ROM_SEGMENT(turibori_room_0)
DECLARE_ROM_SEGMENT(nakaniwa_scene)
DECLARE_ROM_SEGMENT(nakaniwa_room_0)
DECLARE_ROM_SEGMENT(bowling_scene)
DECLARE_ROM_SEGMENT(bowling_room_0)
DECLARE_ROM_SEGMENT(souko_scene)
DECLARE_ROM_SEGMENT(souko_room_0)
DECLARE_ROM_SEGMENT(souko_room_1)
DECLARE_ROM_SEGMENT(souko_room_2)
DECLARE_ROM_SEGMENT(miharigoya_scene)
DECLARE_ROM_SEGMENT(miharigoya_room_0)
DECLARE_ROM_SEGMENT(mahouya_scene)
DECLARE_ROM_SEGMENT(mahouya_room_0)
DECLARE_ROM_SEGMENT(ganon_demo_scene)
DECLARE_ROM_SEGMENT(ganon_demo_room_0)
DECLARE_ROM_SEGMENT(kinsuta_scene)
DECLARE_ROM_SEGMENT(kinsuta_room_0)
DECLARE_ROM_SEGMENT(spot00_scene)
DECLARE_ROM_SEGMENT(spot00_room_0)
DECLARE_ROM_SEGMENT(spot01_scene)
DECLARE_ROM_SEGMENT(spot01_room_0)
DECLARE_ROM_SEGMENT(spot02_scene)
DECLARE_ROM_SEGMENT(spot02_room_0)
DECLARE_ROM_SEGMENT(spot02_room_1)
DECLARE_ROM_SEGMENT(spot03_scene)
DECLARE_ROM_SEGMENT(spot03_room_0)
DECLARE_ROM_SEGMENT(spot03_room_1)
DECLARE_ROM_SEGMENT(spot04_scene)
DECLARE_ROM_SEGMENT(spot04_room_0)
DECLARE_ROM_SEGMENT(spot04_room_1)
DECLARE_ROM_SEGMENT(spot04_room_2)
DECLARE_ROM_SEGMENT(spot05_scene)
DECLARE_ROM_SEGMENT(spot05_room_0)
DECLARE_ROM_SEGMENT(spot06_scene)
DECLARE_ROM_SEGMENT(spot06_room_0)
DECLARE_ROM_SEGMENT(spot07_scene)
DECLARE_ROM_SEGMENT(spot07_room_0)
DECLARE_ROM_SEGMENT(spot07_room_1)
DECLARE_ROM_SEGMENT(spot08_scene)
DECLARE_ROM_SEGMENT(spot08_room_0)
DECLARE_ROM_SEGMENT(spot09_scene)
DECLARE_ROM_SEGMENT(spot09_room_0)
DECLARE_ROM_SEGMENT(spot10_scene)
DECLARE_ROM_SEGMENT(spot10_room_0)
DECLARE_ROM_SEGMENT(spot10_room_1)
DECLARE_ROM_SEGMENT(spot10_room_2)
@ -759,69 +608,50 @@ DECLARE_ROM_SEGMENT(spot10_room_7)
DECLARE_ROM_SEGMENT(spot10_room_8)
DECLARE_ROM_SEGMENT(spot10_room_9)
DECLARE_ROM_SEGMENT(spot11_scene)
DECLARE_ROM_SEGMENT(spot11_room_0)
DECLARE_ROM_SEGMENT(spot12_scene)
DECLARE_ROM_SEGMENT(spot12_room_0)
DECLARE_ROM_SEGMENT(spot12_room_1)
DECLARE_ROM_SEGMENT(spot13_scene)
DECLARE_ROM_SEGMENT(spot13_room_0)
DECLARE_ROM_SEGMENT(spot13_room_1)
DECLARE_ROM_SEGMENT(spot15_scene)
DECLARE_ROM_SEGMENT(spot15_room_0)
DECLARE_ROM_SEGMENT(spot16_scene)
DECLARE_ROM_SEGMENT(spot16_room_0)
DECLARE_ROM_SEGMENT(spot17_scene)
DECLARE_ROM_SEGMENT(spot17_room_0)
DECLARE_ROM_SEGMENT(spot17_room_1)
DECLARE_ROM_SEGMENT(spot18_scene)
DECLARE_ROM_SEGMENT(spot18_room_0)
DECLARE_ROM_SEGMENT(spot18_room_1)
DECLARE_ROM_SEGMENT(spot18_room_2)
DECLARE_ROM_SEGMENT(spot18_room_3)
DECLARE_ROM_SEGMENT(spot20_scene)
DECLARE_ROM_SEGMENT(spot20_room_0)
DECLARE_ROM_SEGMENT(ganon_tou_scene)
DECLARE_ROM_SEGMENT(ganon_tou_room_0)
DECLARE_ROM_SEGMENT(test01_scene)
DECLARE_ROM_SEGMENT(test01_room_0)
DECLARE_ROM_SEGMENT(besitu_scene)
DECLARE_ROM_SEGMENT(besitu_room_0)
DECLARE_ROM_SEGMENT(depth_test_scene)
DECLARE_ROM_SEGMENT(depth_test_room_0)
DECLARE_ROM_SEGMENT(syotes_scene)
DECLARE_ROM_SEGMENT(syotes_room_0)
DECLARE_ROM_SEGMENT(syotes2_scene)
DECLARE_ROM_SEGMENT(syotes2_room_0)
DECLARE_ROM_SEGMENT(sutaru_scene)
DECLARE_ROM_SEGMENT(sutaru_room_0)
DECLARE_ROM_SEGMENT(hairal_niwa2_scene)
DECLARE_ROM_SEGMENT(hairal_niwa2_room_0)
DECLARE_ROM_SEGMENT(sasatest_scene)
DECLARE_ROM_SEGMENT(sasatest_room_0)
DECLARE_ROM_SEGMENT(testroom_scene)
DECLARE_ROM_SEGMENT(testroom_room_0)
DECLARE_ROM_SEGMENT(testroom_room_1)
DECLARE_ROM_SEGMENT(testroom_room_2)
DECLARE_ROM_SEGMENT(testroom_room_3)
DECLARE_ROM_SEGMENT(testroom_room_4)
#endif