Adds in scene support (#117)

* 1 scene done, Z2_SOUGEN OK

* All scenes OK

* Makefile improvements

* Use WIP ZAPD branch as submodule

* Add spawn rotation flag macro

* Fix bad merge

* Move scenes to be in their own subfolders

* Rename and restructure extracted baserom files

* Progress tracking for assets

* Add asset progress to csv

* Use master ZAPD

* Use distclean like in OOT

* Fix up a few things with the makefile

* Fix scenes not being dumped from ELF

Co-authored-by: Rozelette <Uberpanzermensch@gmail.com>
This commit is contained in:
Kenix3
2021-04-29 18:56:18 -04:00
committed by GitHub
parent e97f10a6fa
commit c40bb119e1
158 changed files with 9168 additions and 6817 deletions
+1532 -1532
View File
File diff suppressed because it is too large Load Diff
+618 -618
View File
File diff suppressed because it is too large Load Diff
+1531 -1531
View File
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
+5 -5
View File
@@ -1229,11 +1229,11 @@
0x80AC4610:"ovl_En_Bigokuta_rodata",
0x80AC4F10:"ovl_Bg_Icefloe_data",
0x80AC4F50:"ovl_Bg_Icefloe_rodata",
0x80AC5630:"385_0x00cfc450_data",
0x80AC5C20:"386_0x00cfc970_data",
0x80AC6C60:"387_0x00cfd400_data",
0x80AC8650:"388_0x00cfdf10_data",
0x80AC8AB0:"389_0x00cfe150_data",
0x80AC5630:"ovl_fbdemo_triforce_data",
0x80AC5C20:"ovl_fbdemo_wipe1_data",
0x80AC6C60:"ovl_fbdemo_wipe3_data",
0x80AC8650:"ovl_fbdemo_wipe4_data",
0x80AC8AB0:"ovl_fbdemo_wipe5_data",
0x80AC93B0:"ovl_Effect_Ss_Sbn_data",
0x80AC9D50:"ovl_Obj_Ocarinalift_data",
0x80AC9D90:"ovl_Obj_Ocarinalift_rodata",
+32 -32
View File
@@ -17,22 +17,22 @@
0x00A0EB80:("_icon_item_dungeon_staticSegmentRomEnd","UNK_TYPE","",0x4),
0x00A0F000:("_icon_item_gameover_staticSegmentRomStart","UNK_TYPE","",0x4),
0x00A12300:("_icon_item_gameover_staticSegmentRomEnd","UNK_TYPE","",0x4),
0x00A13000:("__013_0x00963540SegmentRomStart","UNK_TYPE","",0x4),
0x00A1BA00:("__013_0x00963540SegmentRomEnd","UNK_TYPE","",0x4),
0x00A1C000:("__014_0x00967260SegmentRomStart","UNK_TYPE","",0x4),
0x00A1C2E0:("__014_0x00967260SegmentRomEnd","UNK_TYPE","",0x4),
0x00A13000:("_icon_item_jpn_staticSegmentRomStart","UNK_TYPE","",0x4),
0x00A1BA00:("_icon_item_jpn_staticSegmentRomEnd","UNK_TYPE","",0x4),
0x00A1C000:("_icon_item_vtx_staticSegmentRomStart","UNK_TYPE","",0x4),
0x00A1C2E0:("_icon_item_vtx_staticSegmentRomEnd","UNK_TYPE","",0x4),
0x00A1D000:("_map_i_staticSegmentRomStart","UNK_TYPE","",0x4),
0x00A1E310:("_map_grand_staticSegmentRomStart","UNK_TYPE","",0x4),
0x00A27660:("_item_name_staticSegmentRomStart","UNK_TYPE","",0x4),
0x00A352F0:("_map_name_staticSegmentRomStart","UNK_TYPE","",0x4),
0x00A36C10:("__019_0x00980f60SegmentRomStart","UNK_TYPE","",0x4),
0x00A7BEE0:("__020_0x009c6230SegmentRomStart","UNK_TYPE","",0x4),
0x00A807A0:("__020_0x009c6230SegmentRomEnd","UNK_TYPE","",0x4),
0x00A8C000:("__022_0x009caaf0SegmentRomStart","UNK_TYPE","",0x4),
0x00A92A10:("__023_0x009d1500SegmentRomStart","UNK_TYPE","",0x4),
0x00A990E0:("__023_0x009d1500SegmentRomEnd","UNK_TYPE","",0x4),
0x00A9A000:("__024_0x009d3760SegmentRomStart","UNK_TYPE","",0x4),
0x00ABFC00:("__024_0x009d3760SegmentRomEnd","UNK_TYPE","",0x4),
0x00A36C10:("_icon_item_static_testSegmentRomStart","UNK_TYPE","",0x4),
0x00A7BEE0:("_icon_item_24_static_testSegmentRomStart","UNK_TYPE","",0x4),
0x00A807A0:("_icon_item_24_static_testSegmentRomEnd","UNK_TYPE","",0x4),
0x00A8C000:("_schedule_dma_static_testSegmentRomStart","UNK_TYPE","",0x4),
0x00A92A10:("_schedule_staticSegmentRomStart","UNK_TYPE","",0x4),
0x00A990E0:("_schedule_staticSegmentRomEnd","UNK_TYPE","",0x4),
0x00A9A000:("_story_staticSegmentRomStart","UNK_TYPE","",0x4),
0x00ABFC00:("_story_staticSegmentRomEnd","UNK_TYPE","",0x4),
0x00AC0000:("_do_action_staticSegmentRomStart","UNK_TYPE","",0x4),
0x00AC4000:("_message_staticSegmentRomStart","UNK_TYPE","",0x4),
0x00ACA000:("_message_texture_staticSegmentRomStart","UNK_TYPE","",0x4),
@@ -45,24 +45,24 @@
0x01E87DC0:("_nintendo_rogo_staticSegmentRomEnd","UNK_TYPE","",0x4),
0x01E88000:("_title_staticSegmentRomStart","UNK_TYPE","",0x4),
0x01EB9730:("_title_staticSegmentRomEnd","UNK_TYPE","",0x4),
0x01EBA000:("__1124_0x0163f490SegmentRomStart","UNK_TYPE","",0x4),
0x01EBB280:("__1124_0x0163f490SegmentRomEnd","UNK_TYPE","",0x4),
0x01EBC000:("__1125_0x0163fc10SegmentRomStart","UNK_TYPE","",0x4),
0x01EBC680:("__1125_0x0163fc10SegmentRomEnd","UNK_TYPE","",0x4),
0x01EBD000:("__1126_0x0163ffc0SegmentRomStart","UNK_TYPE","",0x4),
0x01EC8B20:("__1126_0x0163ffc0SegmentRomEnd","UNK_TYPE","",0x4),
0x01EC9000:("__1127_0x01643d50SegmentRomStart","UNK_TYPE","",0x4),
0x01EC9F30:("__1127_0x01643d50SegmentRomEnd","UNK_TYPE","",0x4),
0x01ECA000:("__1128_0x01644c80SegmentRomStart","UNK_TYPE","",0x4),
0x01ED3B00:("__1128_0x01644c80SegmentRomEnd","UNK_TYPE","",0x4),
0x01ED4000:("__1129_0x01646b60SegmentRomStart","UNK_TYPE","",0x4),
0x01EDDB00:("__1129_0x01646b60SegmentRomEnd","UNK_TYPE","",0x4),
0x01EDE000:("__1130_0x01649020SegmentRomStart","UNK_TYPE","",0x4),
0x01EE7B00:("__1130_0x01649020SegmentRomEnd","UNK_TYPE","",0x4),
0x01EE8000:("__1131_0x0164ad90SegmentRomStart","UNK_TYPE","",0x4),
0x01EF1B00:("__1131_0x0164ad90SegmentRomEnd","UNK_TYPE","",0x4),
0x01EF2000:("_vr_fine_staticSegmentRomStart","UNK_TYPE","",0x4),
0x01EFE000:("_vr_cloud_staticSegmentRomStart","UNK_TYPE","",0x4),
0x01F0A000:("_vr_pal_staticSegmentRomStart","UNK_TYPE","",0x4),
0x01F0A200:("_vr_pal_staticSegmentRomEnd","UNK_TYPE","",0x4),
0x01EBA000:("_memerrmsgSegmentRomStart","UNK_TYPE","",0x4),
0x01EBB280:("_memerrmsgSegmentRomEnd","UNK_TYPE","",0x4),
0x01EBC000:("_locerrmsgSegmentRomStart","UNK_TYPE","",0x4),
0x01EBC680:("_locerrmsgSegmentRomEnd","UNK_TYPE","",0x4),
0x01EBD000:("_parameter_staticSegmentRomStart","UNK_TYPE","",0x4),
0x01EC8B20:("_parameter_staticSegmentRomEnd","UNK_TYPE","",0x4),
0x01EC9000:("_week_staticSegmentRomStart","UNK_TYPE","",0x4),
0x01EC9F30:("_week_staticSegmentRomEnd","UNK_TYPE","",0x4),
0x01ECA000:("_daytelop_staticSegmentRomStart","UNK_TYPE","",0x4),
0x01ED3B00:("_daytelop_staticSegmentRomEnd","UNK_TYPE","",0x4),
0x01ED4000:("_ger_daytelop_staticSegmentRomStart","UNK_TYPE","",0x4),
0x01EDDB00:("_ger_daytelop_staticSegmentRomEnd","UNK_TYPE","",0x4),
0x01EDE000:("_fra_daytelop_staticSegmentRomStart","UNK_TYPE","",0x4),
0x01EE7B00:("_fra_daytelop_staticSegmentRomEnd","UNK_TYPE","",0x4),
0x01EE8000:("_spa_daytelop_staticSegmentRomStart","UNK_TYPE","",0x4),
0x01EF1B00:("_spa_daytelop_staticSegmentRomEnd","UNK_TYPE","",0x4),
0x01EF2000:("_d2_fine_staticSegmentRomStart","UNK_TYPE","",0x4),
0x01EFE000:("_d2_cloud_staticSegmentRomStart","UNK_TYPE","",0x4),
0x01F0A000:("_d2_fine_pal_staticSegmentRomStart","UNK_TYPE","",0x4),
0x01F0A200:("_d2_fine_pal_staticSegmentRomEnd","UNK_TYPE","",0x4),
}