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

Decompiled A LOT of objects (#815)

Browse source 
* .

* remove tools/ZAP2 from origin master

* object_spot04_objects

* remove accidentally added xml

* object_spot00_objects

* object_bombf ok

* object_dy_obj

* object_masterzoora

* object_mastergolon and object_masterkokirihead

* object_aob

* object_gt

* object_gt

* object_geff

* object_mag kinda

* object_gjyo_objects OK

* object_ani OK

* object_door_gerudo

* object_md and object_trap

* object_js OK

* object_goroiwa

* object_gs

* object_nwc

* object_niw

* object_ane

* object_os_anime OK

* object_d_hsblock OK

* object_fz OK

* object_ru2 OK

* fixed object_mag

* object_cow OK

* object_spot01_objects OK

* object_spot15_obj

* object_umajump OK

* object_spot18_obj

* object_spot12_obj

* fix symbols in z_item_b_heart

* object_bdan_objects & object_bowl

* object_ddan_objects

* object_owl OK

* object_spot01_matoyab.xml OK

* object_haka OK

* object_heavy_object

* object_ingate and objet_menkuri_objects

* objet_spot00_break & object_relay_objects OK

* object_spot01_matoya OK

* object_spot06_objects OK

* undefined_syms

* object_spot08_obj OK

* object_efc_doughnut & object_zg

* object_ik OK

* object_vm

* object_ei OK

* object_ds OK

* updated spec

* map_48x85_static OK

* object_zl1 & object_peehat ok

* some z_parameter naming and other undefined symbol stuff, object_yukabyun OK

* object_bubble & object_fw ok

* object_shopnuts

* restore delete file

* object_timeblock OK

* object_d_lift OK

* object_kibako2 OK

* object_mamenoki OK

* matches

* remove unused asm

* object_mag ok now

* fixed object_ani

* done for now, im tired

* object_bdan_objects fixed up

* fix bdan

* object_bombf fixed

* object_bowl fixed up

* object_cow fixed

* did more, im tired

* fixed some stuff in object_ddan_objects

* fix object_ddan_object

* object_door_gerudo fixed

* object_ds fix

* object_dy progress

* fixed great fairy

* some more

* more

* object_haka fix

* progress

* ingo_gate fixed

* object_js

* forgot collision

* object_relay_objects fixed

* object_kibako2

* object_mag fixed

* u64* to void*

* more u64* to void*

* object_mamenoki fix

* object_mastergolon & object_masterkokirihead fix

* mido is weird

* fixed build

* fix object_menkuri_objects

* add missing textures in object_menkuri_objects

* object_ms

* fixed object_peehat

* some cleanup stuff

* object_zg fix

* object_spot00_break fix

* object_niw fix

* object_nwc fixed

* object_ru2 object_rr and some of object_owl fix

* object_spot15_obj fix

* business scrub

* object_spot01_matoya fixed

* object_spot18_obj fix

* object_spot01_objects fix

* object_spot04_objects fix

* object_spot04_objects actually fixed

* object_spot12_obj fix

* object_timeblock fix

* object_spot06_objects fixed

* object_spot08_obj fix

* spot01_matoyab fix

* object_trap fix

* object_umajump fix

* object_vm fix

* z_en_niw_lady fix

* object_yukabyun fix

* object_zl1 fixed

* added offsets to object_os_anime

* object_md fix

* object_ane fix

* object_aob fix

* add palette comment

* object_spot00_objects fix

* spot00 fix

* remove unused asm

* updates

* Add TlutOffset to objects added in https://github.com/zeldaret/oot/pull/815

* Updated object_bdan_objects, ran format.sh

* Change rgb5a1 to rgba16 in my object xmls

* Addressed Anghelo's comments

* review

Co-authored-by: Lucas Shaw <lucas.shaw1123@gmail.com>
Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
Co-authored-by: Fig02 <fig02srl@gmail.com>
This commit is contained in:
Lucas Shaw 2021-08-05 08:53:58 -07:00 • committed by GitHub
parent bb4babbe15
commit 0f644b7545
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
162 changed files with 2973 additions and 1386 deletions
Download patch file Download diff file Expand all files Collapse all files

575
undefined_syms.txt
View file

@ -87,65 +87,17 @@ D_0703811C = 0x0703811C;
// z_skelanime
link_animetion_segment = 0x07000000;
// z_en_cow
D_060001CC = 0x060001CC;
D_06004010 = 0x06004010;
D_06004264 = 0x06004264;
D_06004348 = 0x06004348;
D_06004C30 = 0x06004C30;
D_06004E98 = 0x06004E98;
// z_door_toki
D_06007888 = 0x06007888;
// z_bg_spot01_idomizu
D_060007D0 = 0x060007D0;
// z_bg_spot01_objects2
D_06001A38 = 0x06001A38;
D_06001C58 = 0x06001C58;
// z_bg_spot12_gate
D_06001080 = 0x06001080;
D_060011EC = 0x060011EC;
// z_bg_spot11_bakudankabe
D_0500A880 = 0x0500A880;
// z_bg_spot12_saku
D_06002260 = 0x06002260;
D_0600238C = 0x0600238C;
// z_bg_spot15_rrbox
D_06000348 = 0x06000348;
D_06000180 = 0x06000180;
// z_Bg_spot18_basket
D_06002154 = 0x06002154;
D_060018B0 = 0x060018B0;
// z_bg_spot18_futa
D_06000368 = 0x06000368;
D_06000150 = 0x06000150;
// z_bg_spot18_shutter
D_06000534 = 0x06000534;
// z_bg_spot18_obj
D_06002FE4 = 0x06002FE4;
D_0600261C = 0x0600261C;
D_06002BC0 = 0x06002BC0;
D_06002370 = 0x06002370;
// z_bg_umajump
D_06001438 = 0x06001438;
D_06001220 = 0x06001220;
// z_item_b_heart
D_06001290 = 0x06001290;
D_06001470 = 0x06001470;
// z_bg_bdan_switch
D_06005CF8 = 0x06005CF8;
D_060061A0 = 0x060061A0;
D_06005A20 = 0x06005A20;
// z_door_ana
D_05001390 = 0x05001390;
// z_bg_elevator
D_06000360 = 0x06000360;
@ -168,10 +120,6 @@ D_0600E568 = 0x0600E568;
D_060038D0 = 0x060038D0;
D_060042D8 = 0x060042D8;
// z_bg_spot01_idosoko
D_06003B20 = 0x06003B20;
D_06003C64 = 0x06003C64;
// z_bg_mizu_uzu
D_060074EC = 0x060074EC;
@ -196,43 +144,6 @@ D_060066A8 = 0x060066A8;
D_06008D88 = 0x06008D88;
D_06006570 = 0x06006570;
// z_boss_goma
D_06000AE8 = 0x06000AE8;
D_0600193C = 0x0600193C;
D_06002360 = 0x06002360;
D_060029F0 = 0x060029F0;
D_06004318 = 0x06004318;
D_06004A20 = 0x06004A20;
D_06005330 = 0x06005330;
D_060058C0 = 0x060058C0;
D_06005F28 = 0x06005F28;
D_060066DC = 0x060066DC;
D_06006E60 = 0x06006E60;
D_0600B2FC = 0x0600B2FC;
D_0600C468 = 0x0600C468;
D_0600CCD8 = 0x0600CCD8;
D_0600F70C = 0x0600F70C;
D_06010918 = 0x06010918;
D_060113BC = 0x060113BC;
D_06012678 = 0x06012678;
D_060183A8 = 0x060183A8;
D_060185A8 = 0x060185A8;
D_060187A8 = 0x060187A8;
D_060189A8 = 0x060189A8;
D_060191A8 = 0x060191A8;
D_060193A8 = 0x060193A8;
D_06019BA8 = 0x06019BA8;
D_0601DCF8 = 0x0601DCF8;
D_0601EB4C = 0x0601EB4C;
// z_en_mag
D_06000000 = 0x06000000;
D_06019A00 = 0x06019A00;
D_0601A400 = 0x0601A400;
D_06024800 = 0x06024800;
D_06024C00 = 0x06024C00;
D_06024E40 = 0x06024E40;
// z_en_dodongo
D_06008318 = 0x06008318;
D_06004C20 = 0x06004C20;
@ -260,46 +171,8 @@ D_06008D90 = 0x06008D90;
D_060093BC = 0x060093BC;
D_06009EE0 = 0x06009EE0;
// z_en_md
D_06007FB8 = 0x06007FB8;
D_060002C8 = 0x060002C8;
// z_en_ms
D_060005EC = 0x060005EC;
D_06003DC0 = 0x06003DC0;
// z_en_zl1
D_06000438 = 0x06000438;
D_06008848 = 0x06008848;
D_06008C48 = 0x06008C48;
D_0600F5D8 = 0x0600F5D8;
D_06010B38 = 0x06010B38;
D_06011348 = 0x06011348;
D_060116E4 = 0x060116E4;
D_06011B88 = 0x06011B88;
D_06012118 = 0x06012118;
D_060132D8 = 0x060132D8;
D_060138E0 = 0x060138E0;
D_06013F10 = 0x06013F10;
D_060143A8 = 0x060143A8;
// z_bg_spot00_break
D_06000908 = 0x06000908;
D_06000AF0 = 0x06000AF0;
D_06000440 = 0x06000440;
D_06000980 = 0x06000980;
// z_bg_spot01_idohashira
D_06000420 = 0x06000420;
D_0600075C = 0x0600075C;
// z_bg_spot15_saku
D_060004D0 = 0x060004D0;
// z_door_gerudo
D_06000040 = 0x06000040;
D_06000170 = 0x06000170;
// z_bg_spot17_bakudankabe
D_0500A880 = 0x0500A880;
// z_en_hs2
D_060005C0 = 0x60005C0;
@ -340,8 +213,7 @@ D_06001CD0 = 0x06001CD0;
D_06001DA8 = 0x06001DA8;
// z_bg_gjyo_bridge
D_06000600 = 0x06000600;
D_06000DB8 = 0x06000DB8;
D_02002640 = 0x02002640;
// z_bg_spot15_saku
D_060003C0 = 0x060003C0;
@ -362,17 +234,18 @@ D_060081D0 = 0x60081D0;
D_06008D10 = 0x6008D10;
D_06009CD0 = 0x6009CD0;
// z_bg_spot01_fusya
D_06000100 = 0x06000100;
// z_en_niw_girl
D_06009948 = 0x06009948;
D_06000378 = 0x06000378;
D_06009C78 = 0x06009C78;
// z_title
D_01002720 = 0x01002720;
D_01001800 = 0x01001800;
D_01000000 = 0x01000000;
// z_demo_geff
D_06000EA0 = 0x06000EA0;
// z_shot_sun
D_02007020 = 0x02007020;
// z_demo_go
D_060029A8 = 0x060029A8;
@ -380,17 +253,26 @@ D_06004930 = 0x06004930;
D_0600E680 = 0x0600E680;
D_0600FEF0 = 0x0600FEF0;
// z_demo_gt
D_06005CB8 = 0x06005CB8;
D_060091E4 = 0x060091E4;
D_06009970 = 0x06009970;
D_06007630 = 0x06007630;
D_06004F90 = 0x06004F90;
D_06000EA0 = 0x06000EA0;
D_06009610 = 0x06009610;
D_06002910 = 0x06002910;
D_060041A0 = 0x060041A0;
D_06009B08 = 0x06009B80;
// z_demo_ik
D_0600035C = 0x0600035C;
D_06000380 = 0x06000380;
D_06000634 = 0x06000634;
D_06000660 = 0x06000660;
D_060008DC = 0x060008DC;
D_06000C6C = 0x06000C6C;
D_06000C90 = 0x06000C90;
D_06000F0C = 0x06000F0C;
D_06016BE0 = 0x06016BE0;
D_06016CD8 = 0x06016CD8;
D_06016F88 = 0x06016F88;
D_06017028 = 0x06017028;
D_06017170 = 0x06017170;
D_0601EE60 = 0x0601EE60;
D_06000F30 = 0x06000F30;
D_0601EB14 = 0x0601EB14;
D_0601EB40 = 0x0601EB40;
D_0601EE34 = 0x0601EE34;
D_06000900 = 0x06000900;
// z_demo_im
D_06000710 = 0x06000710;
@ -501,28 +383,10 @@ D_0600BE40 = 0x0600BE40;
D_0602B288 = 0x0602B288;
D_0602AFF0 = 0x0602AFF0;
// z_bg_bdan_objects
D_060038E8 = 0x060038E8;
D_06005048 = 0x06005048;
D_06005580 = 0x06005580;
D_06008CE0 = 0x06008CE0;
// z_bg_bom_guard
D_06001C40 = 0x06001C40;
// z_bg_bowl_wall
D_06001B00 = 0x06001B00;
D_06000CB8 = 0x06000CB8;
D_06000610 = 0x06000610;
D_06001390 = 0x06001390;
// z_bg_ddan_jd
D_06003CE0 = 0x06003CE0;
D_060037B8 = 0x060037B8;
// z_bg_dodoago
D_06001DDC = 0x06001DDC;
D_60013500 = 0x06001350;
// z_bg_bombwall
D_050041B0 = 0x050041B0;
D_05003FC0 = 0x05003FC0;
D_05004088 = 0x05004088;
// z_bg_dy_yoseizo
D_06008698 = 0x06008698;
@ -564,18 +428,36 @@ D_06015380 = 0x06015380;
D_06000000 = 0x06000000;
D_06000350 = 0x06000350;
// z_en_ru2
D_060004CC = 0x060004CC;
D_06000F20 = 0x06000F20;
D_060022E0 = 0x060022E0;
D_06002AE0 = 0x06002AE0;
D_0600C700 = 0x0600C700;
D_0600D3DC = 0x0600D3DC;
D_0600DCAC = 0x0600DCAC;
D_06000DE8 = 0x06000DE8;
D_0600E630 = 0x0600E630;
D_0600F03C = 0x0600F03C;
D_0600F8B8 = 0x0600F8B8;
// z_en_ru1
D_06000690 = 0x06000690;
D_06000E54 = 0x06000E54;
D_06001488 = 0x06001488;
D_06002058 = 0x06002058;
D_06002990 = 0x06002990;
D_06002EC0 = 0x06002EC0;
D_06003608 = 0x06003608;
D_06003784 = 0x06003784;
D_06004074 = 0x06004074;
D_06004350 = 0x06004350;
D_06004648 = 0x06004648;
D_06004BF0 = 0x06004BF0;
D_060063F4 = 0x060063F4;
D_06006B9C = 0x06006B9C;
D_06007534 = 0x06007534;
D_060078E4 = 0x060078E4;
D_06008100 = 0x06008100;
D_06008AA8 = 0x06008AA8;
D_06009060 = 0x06009060;
D_060097B8 = 0x060097B8;
D_06012700 = 0x06012700;
D_06012E94 = 0x06012E94;
D_06013A64 = 0x06013A64;
// z_bg_mjin
D_06000140 = 0x06000140;
D_06000330 = 0x06000330;
D_06000330_ = 0x06000330;
D_06000658 = 0x06000658;
// z_en_lightbox
D_06000B70 = 0x06000B70;
@ -684,10 +566,6 @@ D_06000194 = 0x06000194;
D_06002BF0 = 0x06002BF0;
D_06002C8C = 0x06002C8C;
// z_en_attack_niw
D_06002530 = 0x06002530;
D_060000E8 = 0x060000E8;
// z_en_hintnuts
D_06000168 = 0x06000168;
D_060014E0 = 0x060014E0;
@ -705,14 +583,32 @@ D_06003128 = 0x06003128;
D_060042AC = 0x060042AC;
D_060059B0 = 0x060059B0;
// z_en_goroiwa
D_060006B0 = 0x060006B0;
// z_obj_oshijiki
D_05004E98 = 0x05004E98;
D_05003350 = 0x05003350;
D_05003B50 = 0x05003B50;
D_05004350 = 0x05004350;
D_05004CD0 = 0x05004CD0;
// z_en_heishi1
D_06005880 = 0x06005880;
D_06005C30 = 0x06005C30;
D_0600BAC8 = 0x0600BAC8;
// z_en_bombf
D_06000340 = 0x06000340;
D_06000408 = 0x06000408;
D_06000530 = 0x06000530;
// z_en_box
D_06000128 = 0x06000128;
D_0600024C = 0x0600024C;
D_0600043C = 0x0600043C;
D_060006F0 = 0x060006F0;
D_06000AE8 = 0x06000AE8;
D_060010C0 = 0x060010C0;
D_06001678 = 0x06001678;
D_060047D8 = 0x060047D8;
D_06005FC8 = 0x06005FC8;
// z_en_butte
D_05002470 = 0x05002470;
D_050036F0 = 0x050036F0;
// z_Bg_Spot16_Bombstone
D_06000C20 = 0x06000C20;
@ -808,22 +704,6 @@ D_06004E60 = 0x06004E60;
D_06004BB4 = 0x06004BB4;
D_06009238 = 0x06009238;
// z_en_syateki_niw
D_060000E8 = 0x060000E8;
D_060023B0 = 0x060023B0;
D_06002428 = 0x06002428;
D_06002530 = 0x06002530;
// z_en_nwc
D_06000840 = 0x06000840;
D_060008B0 = 0x060008B0;
D_06000BF0 = 0x06000BF0;
D_06000C68 = 0x06000C68;
D_06000C88 = 0x06000C88;
D_06000CE0 = 0x06000CE0;
D_06000D10 = 0x06000D10;
D_06000D50 = 0x06000D50;
// z_eff_ss_g_magma2
D_06025A90 = 0x06025A90;
@ -840,35 +720,6 @@ D_0600FCF8 = 0x0600FCF8;
D_060105E0 = 0x060105E0;
D_06012160 = 0x06012160;
//z_en_fHG
D_060059A0 = 0x060059A0;
D_0600B098 = 0x0600B098;
D_0600B4C8 = 0x0600B4C8;
D_0600B9D0 = 0x0600B9D0;
D_0600C65C = 0x0600C65C;
D_0600CB1C = 0x0600CB1C;
D_0600DDB8 = 0x0600DDB8;
D_0600E8A0 = 0x0600E8A0;
// z_en_geldb
D_0600ADF8 = 0x0600ADF8;
D_0600B6D4 = 0x0600B6D4;
D_0600A458 = 0x0600A458;
D_06001390 = 0x06001390;
D_060024E8 = 0x060024E8;
D_0600A814 = 0x0600A814;
D_060003CC = 0x060003CC;
D_06000F5C = 0x06000F5C;
D_06002280 = 0x06002280;
D_06001E10 = 0x06001E10;
D_0600ADF8 = 0x0600ADF8;
D_06001578 = 0x06001578;
// z_en_gs
D_06000950 = 0x06000950;
D_060009D0 = 0x060009D0;
D_06000A60 = 0x06000A60;
// z_en_ik
D_06001C28 = 0x06001C28;
D_06002538 = 0x06002538;
@ -896,6 +747,7 @@ D_0601E178 = 0x0601E178;
D_060203D8 = 0x060203D8;
D_060205C0 = 0x060205C0;
// z_obj_dekujr
D_060030D0 = 0x060030D0;
D_060032D8 = 0x060032D8;
@ -924,9 +776,6 @@ D_06006078 = 0x06006078;
D_06000AE8 = 0x06000AE8;
D_06001678 = 0x06001678;
// z_en_rr
D_06000470 = 0x06000470;
// z_bg_haka_tubo
D_060108B8 = 0x060108B8;
D_0600FE40 = 0x0600FE40;
@ -934,9 +783,6 @@ D_0600FE40 = 0x0600FE40;
// z_bg_po_syokudai
D_060003A0 = 0x060003A0;
// z_item_ocarina
D_0200F870 = 0x0200F870;
//z_bg_ice_shutter
D_06002854 = 0x6002854;
D_06002740 = 0x6002740;
@ -948,25 +794,16 @@ D_06001000 = 0x06001000;
D_060011B8 = 0x060011B8;
D_06001040 = 0x06001040;
// z_en_yukabyun
D_06000A60 = 0x06000A60;
D_06000970 = 0x06000970;
// z_bg_jya_goroiwa
D_060006B0 = 0x060006B0;
// z_bg_haka_water
D_06001E50 = 0x06001E50;
D_06002010 = 0x06002010;
// z_en_niw_lady
D_060000F0 = 0x060000F0;
D_0600A630 = 0x0600A630;
D_060007D0 = 0x060007D0;
D_06000718 = 0x06000718;
D_06009F94 = 0x06009F94;
// z_en_js
D_0600045C = 0x0600045C;
D_06005EA0 = 0x06005EA0;
D_0600018C = 0x0600018C;
// z_bg_gnd_darkmeiro
D_0600C080 = 0x0600C080;
D_060088B0 = 0x060088B0;
@ -1021,54 +858,11 @@ D_06000498 = 0x06000498;
// z_bg_menkuri_eye
D_06002D20 = 0x06002D20;
// z_boss_ganondrof
D_06004EC0 = 0x06004EC0;
D_0600C710 = 0x0600C710;
D_06003CA4 = 0x06003CA4;
D_06001144 = 0x06001144;
D_06002684 = 0x06002684;
D_060019A4 = 0x060019A4;
D_0600D99C = 0x0600D99C;
D_0600DF80 = 0x0600DF80;
D_0600189C = 0x0600189C;
D_06001AB0 = 0x06001AB0;
D_060108D8 = 0x060108D8;
D_06000D84 = 0x06000D84;
D_0600090C = 0x0600090C;
D_0600FAC8 = 0x0600FAC8;
D_06011BCC = 0x06011BCC;
D_06010060 = 0x06010060;
D_06011F44 = 0x06011F44;
D_0601267C = 0x0601267C;
D_06003080 = 0x06003080;
D_0600EC94 = 0x0600EC94;
D_06010344 = 0x06010344;
D_060129E0 = 0x060129E0;
D_0600F48C = 0x0600F48C;
D_0600B380 = 0x0600B380;
D_06003DB0 = 0x06003DB0;
// z_en_fd
D_060079F8 = 0x060079F8;
D_06007A78 = 0x06007A78;
D_06007928 = 0x06007928;
D_06007938 = 0x06007938;
D_06005810 = 0x06005810;
// z_en_fw
D_06007C30 = 0x06007C30;
D_06006CF8 = 0x06006CF8;
// z_en_gm
D_060002B8 = 0x060002B8;
D_0600FEF0 = 0x0600FEF0;
D_0600DE80 = 0x0600DE80;
// z_en_vm
D_06003F60 = 0x06003F60;
D_06000068 = 0x06000068;
D_06002728 = 0x06002728;
// z_bg_spot03_taki
D_06000C98 = 0x06000C98;
D_06000800 = 0x06000800;
@ -1085,6 +879,43 @@ D_06006830 = 0x06006830;
D_06006D60 = 0x06006D60;
D_06007230 = 0x06007230;
// z_bg_mori_idomizu
D_060049D0 = 0x060049D0;
// z_bg_mori_hashigo
D_060037D8 = 0x060037D8;
D_060036B0 = 0x060036B0;
D_06004770 = 0x06004770;
// z_bg_mori_bigst
D_0600221C = 0x0600221C;
D_06001E50 = 0x06001E50;
// z_bg_mori_hashira4
D_06001AF8 = 0x06001AF8;
D_060089E0 = 0x060089E0;
//z_boss_dodongo
D_06003CF8 = 0x06003CF8;
D_0601B310 = 0x0601B310;
D_0600F0D8 = 0x0600F0D8;
D_030021D8 = 0x030021D8;
D_06008EEC = 0x06008EEC;
D_06017410 = 0x06017410;
D_0601CAE0 = 0x0601CAE0;
D_06008EEC = 0x06008EEC;
D_060061D4 = 0x060061D4;
D_0600DF38 = 0x0600DF38;
D_0600E848 = 0x0600E848;
D_06004E0C = 0x06004E0C;
D_060042A8 = 0x060042A8;
D_06009D10 = 0x06009D10;
D_0601D934 = 0x0601D934;
D_06002D0C = 0x06002D0C;
D_060042A8 = 0x060042A8;
D_06009D50 = 0x06009D50;
D_06009DD0 = 0x06009DD0;
D_06001074 = 0x06001074;
// z_obj_timeblock
D_06000980 = 0x06000980;
D_06000B30 = 0x06000B30;
@ -1103,12 +934,6 @@ D_06000730 = 0x06000730;
// z_en_kusa
D_060002E0 = 0x60002E0;
// z_en_niw
D_06002530 = 0x06002530;
D_060000E8 = 0x060000E8;
D_060023B0 = 0x060023B0;
D_06002428 = 0x06002428;
// z_bg_ice_turara
D_060023D0 = 0x060023D0;
D_06002594 = 0x06002594;
@ -1197,15 +1022,6 @@ D_06012BA4 = 0x06012BA4;
D_06012D30 = 0x06012D30;
D_060133EC = 0x060133EC;
// z_bg_spot06_objects
D_06000120 = 0x06000120;
D_06000470 = 0x06000470;
D_06000E10 = 0x06000E10;
D_06000EE8 = 0x06000EE8;
D_06001160 = 0x06001160;
D_06001238 = 0x06001238;
D_06002490 = 0x06002490;
// z_bg_spot07_taki
D_06000460 = 0x06000460;
D_06000BE0 = 0x06000BE0;
@ -1216,12 +1032,6 @@ D_06003210 = 0x06003210;
D_060032D8 = 0x060032D8;
D_060038FC = 0x060038FC;
// z_bg_spot08_iceblock
D_06000DE0 = 0x06000DE0;
D_06002BD0 = 0x06002BD0;
D_06002FD8 = 0x06002FD8;
D_06001904 = 0x06001904;
// z_bg_toki_hikari
D_06000880 = 0x06000880;
D_060009C0 = 0x060009C0;
@ -1230,35 +1040,6 @@ D_06007E20 = 0x06007E20;
D_06007EE0 = 0x06007EE0;
D_06008190 = 0x06008190;
// z_boss_dodongo
D_06001074 = 0x06001074;
D_06002D0C = 0x06002D0C;
D_06003CF8 = 0x06003CF8;
D_060042A8 = 0x060042A8;
D_06004E0C = 0x06004E0C;
D_060061D4 = 0x060061D4;
D_06008EEC = 0x06008EEC;
D_06009D10 = 0x06009D10;
D_06009D50 = 0x06009D50;
D_06009DD0 = 0x06009DD0;
D_0600DF38 = 0x0600DF38;
D_0600E848 = 0x0600E848;
D_0600F0D8 = 0x0600F0D8;
D_06015890 = 0x06015890;
D_06015990 = 0x06015990;
D_06015D90 = 0x06015D90;
D_06015F90 = 0x06015F90;
D_06016390 = 0x06016390;
D_06016590 = 0x06016590;
D_06016790 = 0x06016790;
D_06016990 = 0x06016990;
D_06016E10 = 0x06016E10;
D_06017210 = 0x06017210;
D_06017410 = 0x06017410;
D_0601B310 = 0x0601B310;
D_0601CAE0 = 0x0601CAE0;
D_0601D934 = 0x0601D934;
// z_boss_ganon
D_02006C18 = 0x02006C18;
D_02007418 = 0x02007418;
@ -1340,6 +1121,7 @@ D_060353C0 = 0x060353C0;
// z_boss_mo
D_06001010 = 0x06001010;
D_06000F20 = 0x06000F20;
// z_boss_tw
D_060004A4 = 0x060004A4;
@ -1542,9 +1324,6 @@ D_06001750 = 0x06001750;
D_06001958 = 0x06001958;
D_06001A70 = 0x06001A70;
// z_en_bubble
D_06001000 = 0x06001000;
// z_en_bw
D_06000228 = 0x06000228;
D_060020F0 = 0x060020F0;
@ -1598,14 +1377,6 @@ D_06000860 = 0x06000860;
D_060009D4 = 0x060009D4;
D_060020E0 = 0x060020E0;
// z_en_eiyer
D_06000288 = 0x06000288;
D_060004C4 = 0x060004C4;
D_06000704 = 0x06000704;
D_06000FC0 = 0x06000FC0;
D_060012AC = 0x060012AC;
D_06003410 = 0x06003410;
// z_en_encount2
D_06000DE0 = 0x06000DE0;
@ -1618,12 +1389,6 @@ D_06001534 = 0x06001534;
D_0600B498 = 0x0600B498;
D_060007BC = 0x060007BC;
// z_en_fz
D_060030A0 = 0x060030A0;
D_060030A8 = 0x060030A8;
D_06003158 = 0x06003158;
D_06003160 = 0x06003160;
// z_en_gb
D_0600049C = 0x0600049C;
D_0600C0B0 = 0x0600C0B0;
@ -1641,23 +1406,6 @@ D_0600A498 = 0x0600A498;
D_06008968 = 0x06008968;
D_06009ED4 = 0x06009ED4;
// z_en_ge3
D_0600A458 = 0x0600A458;
D_0600B07C = 0x0600B07C;
// z_en_geldb
D_060003CC = 0x060003CC;
D_06000F5C = 0x06000F5C;
D_06001390 = 0x06001390;
D_06001578 = 0x06001578;
D_06001E10 = 0x06001E10;
D_06002280 = 0x06002280;
D_060024E8 = 0x060024E8;
D_0600A458 = 0x0600A458;
D_0600A814 = 0x0600A814;
D_0600ADF8 = 0x0600ADF8;
D_0600B6D4 = 0x0600B6D4;
// z_en_go
D_06004930 = 0x06004930;
D_0600BD80 = 0x0600BD80;
@ -1796,22 +1544,6 @@ D_0600BFA8 = 0x0600BFA8;
D_0600DE80 = 0x0600DE80;
D_0600FEF0 = 0x0600FEF0;
// z_en_owl
D_06001168 = 0x06001168;
D_060015CC = 0x060015CC;
D_0600C0E8 = 0x0600C0E8;
D_0600C1C4 = 0x0600C1C4;
D_0600C684 = 0x0600C684;
D_0600C8A0 = 0x0600C8A0;
D_060100B0 = 0x060100B0;
// z_en_peehat
D_06000350 = 0x06000350;
D_060005C4 = 0x060005C4;
D_06000844 = 0x06000844;
D_060009C4 = 0x060009C4;
D_06001C80 = 0x06001C80;
// z_en_sa
D_02005730 = 0x02005730;
D_02010E20 = 0x02010E20;
@ -1930,12 +1662,6 @@ D_06011348 = 0x06011348;
D_060114E8 = 0x060114E8;
D_060119E8 = 0x060119E8;
// z_en_weiyer
D_06000288 = 0x06000288;
D_06000FC0 = 0x06000FC0;
D_060012AC = 0x060012AC;
D_06003410 = 0x06003410;
// z_en_wf
D_06004638 = 0x06004638;
D_06004AD0 = 0x06004AD0;
@ -2008,39 +1734,10 @@ D_01000000 = 0x01000000;
D_06005FF0 = 0x06005FF0;
D_06009620 = 0x06009620;
// z_obj_bean
D_06000090 = 0x06000090;
D_060001B0 = 0x060001B0;
D_060003F0 = 0x060003F0;
D_060005DC = 0x060005DC;
D_06000650 = 0x06000650;
// z_obj_hamishi
D_0500A3B8 = 0x0500A3B8;
D_0500A5E8 = 0x0500A5E8;
// z_obj_kibako2
D_06000960 = 0x06000960;
D_06000B70 = 0x06000B70;
D_06001000 = 0x06001000;
// z_obj_lift
D_06000140 = 0x06000140;
D_060003D0 = 0x060003D0;
// z_obj_warp2block
D_06000980 = 0x06000980;
D_06000B30 = 0x06000B30;
// z_en_dns
D_060041A8 = 0x060041A8;
D_060009A0 = 0x060009A0;
D_06004404 = 0x06004404;
// z_en_peehat
D_06001C80 = 0x06001C80;
D_060009C4 = 0x060009C4;
D_06000844 = 0x06000844;
D_060005C4 = 0x060005C4;
D_06000350 = 0x06000350;
// z_bg_haka
D_06000428 = 0x06000428;
D_060001B0 = 0x060001B0;
D_060002A8 = 0x060002A8;