1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-20 14:01:15 +00:00

Decompile Gameplay_Keep and fix all existing decompiled objects (#595)

* First batch of files

* Add missing folders back

* Fix missing folders again

* Finish fixing existing texture files

* Gameplay_Keep XML finished

* Most actor gameplay_keep undefined syms removed

* Only ~200 gkeep symbols remain

* All gkeep symbols that ZAP supports are fixed

* Cleanup, and make gkeep names more accurate

* Starting to figure out what some unknown blobs are, merge zeldaret in

* fix a few more things

* refactor gkeep

* Change how gitkeep is handled

* gkeep xml cleanup

* Gkeep finished, now just waiting up ZAP updates

* 100 link animations finished

* 150 link animations finished

* 200 link animations finished

* 250 link animations finished

* 350 link animations finished

* 400 link animations finished

* 450 link animations finished

* 500 link animations finished

* 550 link animations finished

* All Link animations finished

cannot build yet because ZAP doesn't have LinkAnimationHeader yet

* xml changes for new zap stuff

* finish gameplay_keep

* fixing existing objects

* ready for pr besides zap padding issue

* mostly ready for pr

* format all c files

* all conflicts fixed

* make changes that roman requested

* fix thing i didn't mean to change

* some animation symbols renamed

* fixed roman's stuff

* lifemeter hardcoded pointers removed

* fix issue with incorrect data in gameplay_keep

* removed unused asm

* fixed most of fig's comments

* fix all of fig's comments

* reformat files

* Update assets/xml/textures/icon_item_static.xml

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>

* Update assets/xml/textures/icon_item_static.xml

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>

* fixed stuff

* fixed most of roman's comments

* remove leading zeroes

* should build now

* git subrepo pull --force tools/ZAPD

subrepo:
  subdir:   "tools/ZAPD"
  merged:   "f84d8337b"
upstream:
  origin:   "https://github.com/zeldaret/ZAPD.git"
  branch:   "master"
  commit:   "f84d8337b"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo.git"
  commit:   "2f68596"

* all of gkeep symbols fixed

* compiler error fixed

* format files

* final changes

Co-authored-by: Zelllll <elijah@DESKTOP-NMP1I89.localdomain>
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
This commit is contained in:
Zelllll 2021-01-24 18:36:40 -06:00 committed by GitHub
parent 84195fcef6
commit 20c1f4e648
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
198 changed files with 4775 additions and 4232 deletions

View file

@ -81,171 +81,6 @@ D_02003AC0 = 0x02003AC0;
D_0201DA50 = 0x0201DA50;
D_0300AA48 = 0x0300AA48;
D_03012B20 = 0x03012B20;
D_04002040 = 0x04002040;
D_040020D0 = 0x040020D0;
D_04002160 = 0x04002160;
D_040021F0 = 0x040021F0;
D_04002280 = 0x04002280;
D_04002340 = 0x04002340;
D_04002378 = 0x04002378;
D_04002400 = 0x04002400;
D_04002408 = 0x04002408;
D_04002420 = 0x04002420;
D_04002428 = 0x04002428;
D_04002430 = 0x04002430;
D_04002468 = 0x04002468;
D_040024E8 = 0x040024E8;
D_040024F8 = 0x040024F8;
D_04002538 = 0x04002538;
D_040025F8 = 0x040025F8;
D_04002600 = 0x04002600;
D_04002608 = 0x04002608;
D_04002618 = 0x04002618;
D_04002620 = 0x04002620;
D_04002628 = 0x04002628;
D_04002630 = 0x04002630;
D_04002638 = 0x04002638;
D_04002650 = 0x04002650;
D_04002660 = 0x04002660;
D_04002668 = 0x04002668;
D_04002670 = 0x04002670;
D_04002688 = 0x04002688;
D_04002698 = 0x04002698;
D_040026A0 = 0x040026A0;
D_040026B0 = 0x040026B0;
D_040026B8 = 0x040026B8;
D_040026E8 = 0x040026E8;
D_04002700 = 0x04002700;
D_04002708 = 0x04002708;
D_04002770 = 0x04002770;
D_04002780 = 0x04002780;
D_04002788 = 0x04002788;
D_040027D0 = 0x040027D0;
D_04002830 = 0x04002830;
D_04002838 = 0x04002838;
D_04002860 = 0x04002860;
D_04002878 = 0x04002878;
D_04002908 = 0x04002908;
D_04002AC8 = 0x04002AC8;
D_04002C00 = 0x04002C00;
D_04002C08 = 0x04002C08;
D_04002C10 = 0x04002C10;
D_04002C18 = 0x04002C18;
D_04002C20 = 0x04002C20;
D_04002C28 = 0x04002C28;
D_04002C30 = 0x04002C30;
D_04002C38 = 0x04002C38;
D_04002C90 = 0x04002C90;
D_04002C98 = 0x04002C98;
D_04002CA0 = 0x04002CA0;
D_04002D28 = 0x04002D28;
D_04002D38 = 0x04002D38;
D_04002D40 = 0x04002D40;
D_04002D48 = 0x04002D48;
D_04002D68 = 0x04002D68;
D_04002D80 = 0x04002D80;
D_04002D88 = 0x04002D88;
D_04002DA0 = 0x04002DA0;
D_04002DA8 = 0x04002DA8;
D_04002DB0 = 0x04002DB0;
D_04002DB8 = 0x04002DB8;
D_04002DC0 = 0x04002DC0;
D_04002DD0 = 0x04002DD0;
D_04002DF0 = 0x04002DF0;
D_04002DF8 = 0x04002DF8;
D_04002E10 = 0x04002E10;
D_04002E48 = 0x04002E48;
D_04002E90 = 0x04002E90;
D_04002EC8 = 0x04002EC8;
D_04002F00 = 0x04002F00;
D_04002F08 = 0x04002F08;
D_04002F10 = 0x04002F10;
D_04002F28 = 0x04002F28;
D_04002F30 = 0x04002F30;
D_04002F40 = 0x04002F40;
D_04002F58 = 0x04002F58;
D_04002F60 = 0x04002F60;
D_04002F68 = 0x04002F68;
D_04002F98 = 0x04002F98;
D_04002FA0 = 0x04002FA0;
D_04002FD0 = 0x04002FD0;
D_04002FE0 = 0x04002FE0;
D_04003000 = 0x04003000;
D_04003020 = 0x04003020;
D_04003040 = 0x04003040;
D_04003048 = 0x04003048;
D_04003050 = 0x04003050;
D_04003060 = 0x04003060;
D_04003068 = 0x04003068;
D_04003070 = 0x04003070;
D_04003098 = 0x04003098;
D_040030A0 = 0x040030A0;
D_040030A8 = 0x040030A8;
D_040030E0 = 0x040030E0;
D_040030F0 = 0x040030F0;
D_040030F8 = 0x040030F8;
D_04003100 = 0x04003100;
D_04003108 = 0x04003108;
D_04003120 = 0x04003120;
D_04003128 = 0x04003128;
D_04003148 = 0x04003148;
D_04003150 = 0x04003150;
D_04003158 = 0x04003158;
D_04003160 = 0x04003160;
D_040031A0 = 0x040031A0;
D_040031A8 = 0x040031A8;
D_04003238 = 0x04003238;
D_04003298 = 0x04003298;
D_040032B0 = 0x040032B0;
D_040032B8 = 0x040032B8;
D_040032C0 = 0x040032C0;
D_040032C8 = 0x040032C8;
D_040032D0 = 0x040032D0;
D_040032D8 = 0x040032D8;
D_040032E0 = 0x040032E0;
D_040032E8 = 0x040032E8;
D_040032F0 = 0x040032F0;
D_04003300 = 0x04003300;
D_04003308 = 0x04003308;
D_04003310 = 0x04003310;
D_04003318 = 0x04003318;
D_04003320 = 0x04003320;
D_04003328 = 0x04003328;
D_04003330 = 0x04003330;
D_04003380 = 0x04003380;
D_04003390 = 0x04003390;
D_040033A0 = 0x040033A0;
D_040033B0 = 0x040033B0;
D_040033B8 = 0x040033B8;
D_040033C8 = 0x040033C8;
D_04004298 = 0x04004298;
D_04006020 = 0x04006020;
D_0400C808 = 0x0400C808;
D_0400C820 = 0x0400C820;
D_0400CB70 = 0x0400CB70;
D_04015720 = 0x04015720;
D_04015760 = 0x04015760;
D_040184B0 = 0x040184B0;
D_0401A0B0 = 0x0401A0B0;
D_0401E370 = 0x0401E370;
D_04021770 = 0x04021770;
D_0402CF30 = 0x0402CF30;
D_04033EE0 = 0x04033EE0;
D_04037730 = 0x04037730;
D_04037E30 = 0x04037E30;
D_04038F00 = 0x04038F00;
D_04038FB0 = 0x04038FB0;
D_0403B030 = 0x0403B030;
D_0403BBA0 = 0x0403BBA0;
D_0403BCD8 = 0x0403BCD8;
D_0403F070 = 0x0403F070;
D_04042440 = 0x04042440;
D_04048160 = 0x04048160;
D_04048180 = 0x04048180;
D_04049210 = 0x04049210;
D_04049AD0 = 0x04049AD0;
D_0404D1C0 = 0x0404D1C0;
D_0404D450 = 0x0404D450;
D_05001390 = 0x05001390;
D_05001390 = 0x05001390;
D_0500CA70 = 0x0500CA70;
@ -529,9 +364,6 @@ D_06002348 = 0x06002348;
D_06002E54 = 0x06002E54;
// z_bg_spot17_bakudankabe
D_06000A38 = 0x06000A38;
D_060008A0 = 0x060008A0;
D_06000960 = 0x06000960;
D_0500A880 = 0x0500A880;
// z_bg_spot00_break
@ -551,9 +383,6 @@ D_060004D0 = 0x060004D0;
D_06000040 = 0x06000040;
D_06000170 = 0x06000170;
// z_eff_ss_kirakira
D_04037880 = 0x04037880;
// z_en_hs2
D_060005C0 = 0x60005C0;
D_06006260 = 0x6006260;
@ -607,9 +436,6 @@ D_06000600 = 0x06000600;
D_06000DB8 = 0x06000DB8;
D_02002640 = 0x02002640;
// z_bg_spot09_obj
D_06008010 = 0x06008010;
// z_bg_spot15_saku
D_060003C0 = 0x060003C0;
@ -648,10 +474,6 @@ D_06009CD0 = 0x6009CD0;
// z_bg_spot01_fusya
D_06000100 = 0x06000100;
// z_eff_ss_g_ripple
D_040254B0 = 0x040254B0;
D_040244B0 = 0x040244B0;
// z_en_niw_girl
D_06009948 = 0x06009948;
D_06000378 = 0x06000378;
@ -665,9 +487,6 @@ D_01000000 = 0x01000000;
// z_shot_sun
D_02007020 = 0x02007020;
// z_eff_ss_g_splash
D_04027DF0 = 0x04027DF0;
// z_demo_geff
D_06000EA0 = 0x06000EA0;
@ -805,14 +624,6 @@ D_06001420 = 0x06001420;
D_06009A90 = 0x06009A90;
// z_en_tk
D_04051DB0 = 0x04051DB0;
D_040521B0 = 0x040521B0;
D_040525B0 = 0x040525B0;
D_040529B0 = 0x040529B0;
D_04052DB0 = 0x04052DB0;
D_040531B0 = 0x040531B0;
D_040535B0 = 0x040535B0;
D_040539B0 = 0x040539B0;
D_06001144 = 0x06001144;
D_06001FA8 = 0x06001FA8;
D_06002F84 = 0x06002F84;
@ -951,10 +762,6 @@ D_06002100 = 0x06002100;
D_06002FF0 = 0x06002FF0;
D_06015380 = 0x06015380;
// z_en_pu_box
D_06000380 = 0x06000380;
D_060006D0 = 0x060006D0;
// z_bg_pushbox
D_06000000 = 0x06000000;
D_06000350 = 0x06000350;
@ -997,9 +804,6 @@ D_0600E630 = 0x0600E630;
D_0600F03C = 0x0600F03C;
D_0600F8B8 = 0x0600F8B8;
// z_bg_spot11_oasis
D_06000870 = 0x06000870;
// z_bg_mjin
D_06000140 = 0x06000140;
D_06000330 = 0x06000330;
@ -1149,19 +953,6 @@ D_06000B04 = 0x06000B04;
D_06006C90 = 0x06006C90;
D_0200E080 = 0x0200E080;
// z_oceff_wipe4
D_04032C90 = 0x04032C90;
// z_oceff_storm
D_04032490 = 0x04032490;
D_04032890 = 0x04032890;
// z_en_door
D_0400FF78 = 0x0400FF78;
D_0400ECB8 = 0x0400ECB8;
D_0400EE00 = 0x0400EE00;
D_0400E758 = 0x0400E758;
// z_en_bx
D_060022F0 = 0x060022F0;
@ -1225,17 +1016,13 @@ D_05004350 = 0x05004350;
D_05004CD0 = 0x05004CD0;
// z_en_goroiwa
D_0400D340 = 0x0400D340;
D_060006B0 = 0x060006B0;
// z_en_heishi1
D_06005880 = 0x06005880;
D_06005C30 = 0x06005C30;
D_0600BAC8 = 0x0600BAC8;
// z_en_bom
D_04007A50 = 0x04007A50;
D_04007860 = 0x04007860;
// z_en_bombf
D_06000340 = 0x06000340;
D_06000408 = 0x06000408;
@ -1256,9 +1043,6 @@ D_06005FC8 = 0x06005FC8;
D_05002470 = 0x05002470;
D_050036F0 = 0x050036F0;
// z_eff_ss_dust
D_04010050 = 0x04010050;
// z_Bg_Spot16_Bombstone
D_06000C20 = 0x06000C20;
D_060009E0 = 0x060009E0;
@ -1294,7 +1078,6 @@ D_06000608 = 0x06000608;
D_06000454 = 0x06000454;
D_06001360 = 0x06001360;
D_06004BA0 = 0x06004BA0;
D_0404D4E0 = 0x0404D4E0;
D_060059F0 = 0x060059F0;
D_06005900 = 0x06005900;
D_06005620 = 0x06005620;
@ -1370,90 +1153,19 @@ D_06000CE0 = 0x06000CE0;
D_06000D10 = 0x06000D10;
D_06000D50 = 0x06000D50;
// z_eff_ss_blast
D_0401A0B0 = 0x0401A0B0;
// z_eff_ss_g_spk
D_04025550 = 0x04025550;
// z_eff_ss_bomb
D_0400BF80 = 0x0400BF80;
// z_eff_ss_bomb2
D_0400BF80 = 0x0400BF80;
D_0400BFE8 = 0x0400BFE8;
D_0400C040 = 0x0400C040;
// z_eff_ss_bubble
D_04055EB0 = 0x04055EB0;
D_04055DB0 = 0x04055DB0;
D_0401A160 = 0x0401A160;
// z_eff_ss_lightning
D_0402CF30 = 0x0402CF30;
// z_eff_ss_d_fire
D_060098A0 = 0x060098A0;
// z_eff_ss_g_magma
D_04024410 = 0x04024410;
// z_eff_ss_g_fire
D_0401C220 = 0x0401C220;
// z_eff_ss_g_magma2
D_06025A90 = 0x06025A90;
// z_eff_ss_dead_dd
D_01000000 = 0x01000000;
// z_eff_ss_fire_tail
D_0404D5A0 = 0x0404D5A0;
D_0404D4E0 = 0x0404D4E0;
// z_eff_ss_stone1
D_04029E90 = 0x04029E90;
// z_eff_ss_sibuki
D_04055EB0 = 0x04055EB0;
D_04055DB0 = 0x04055DB0;
D_0401A160 = 0x0401A160;
// z_eff_ss_sibuki2
D_0401E2C0 = 0x0401E2C0;
// z_eff_ss_dt_bubble
D_04055DB0 = 0x04055DB0;
D_04055EB0 = 0x04055EB0;
D_0401A160 = 0x0401A160;
// z_eff_ss_dead_db
D_04031FE0 = 0x04031FE0;
// z_eff_ss_dead_ds
D_04037730 = 0x04037730;
// z_eff_ss_ice_smoke
D_060030A0 = 0x060030A0;
D_06003158 = 0x06003158;
// z_eff_ss_hahen
D_0400C0D0 = 0x0400C0D0;
D_0400CD80 = 0x0400CD80;
// z_eff_ss_k_fire
D_0404D4E0 = 0x0404D4E0;
// z_eff_ss_en_fire
D_0404D5A0 = 0x0404D5A0;
D_0404D4E0 = 0x0404D4E0;
// z_eff_ss_ice_piece
D_04033720 = 0x04033720;
// z_eff_ss_en_ice
D_04033818 = 0x04033818;
// z_en_fhg_fire
D_0600FAA0 = 0x0600FAA0;
D_0600FCF8 = 0x0600FCF8;
@ -1484,7 +1196,6 @@ D_0600ADF8 = 0x0600ADF8;
D_06001578 = 0x06001578;
// z_en_gs
D_0404D4E0 = 0x0404D4E0;
D_06000950 = 0x06000950;
D_060009D0 = 0x060009D0;
D_06000A60 = 0x06000A60;
@ -1517,10 +1228,6 @@ D_0601E178 = 0x0601E178;
D_060203D8 = 0x060203D8;
D_060205C0 = 0x060205C0;
// z_en_insect
D_04035590 = 0x04035590;
D_040341FC = 0x040341FC;
// z_en_ishi
D_0500A3B8 = 0x0500A3B8;
D_0500A5E8 = 0x0500A5E8;
@ -1531,7 +1238,6 @@ D_060030D0 = 0x060030D0;
D_060032D8 = 0x060032D8;
// z_en_light
D_0404D4E0 = 0x0404D4E0;
D_05000440 = 0x05000440;
// z_en_okarina_Tag
@ -1559,7 +1265,6 @@ D_060054B8 = 0x060054B8;
D_06003490 = 0x06003490;
D_060043D0 = 0x060043D0;
D_06006078 = 0x06006078;
D_04049FE0 = 0x04049FE0;
D_06000AE8 = 0x06000AE8;
D_06001678 = 0x06001678;
@ -1569,16 +1274,9 @@ D_06000470 = 0x06000470;
// z_bg_haka_tubo
D_060108B8 = 0x060108B8;
D_0600FE40 = 0x0600FE40;
D_0400CD80 = 0x0400CD80;
D_040184B0 = 0x040184B0;
// z_en_elf
D_04016A48 = 0x04016A48;
D_04014BA4 = 0x04014BA4;
// z_bg_po_syokudai
D_060003A0 = 0x060003A0;
D_0404D4E0 = 0x0404D4E0;
// z_item_ocarina
D_0200F870 = 0x0200F870;
@ -1666,9 +1364,6 @@ D_06000304 = 0x06000304;
D_06005B98 = 0x06005B98;
D_060055A8 = 0x060055A8;
// z_bg_hidan_curtain
D_040184B0 = 0x040184B0;
// z_en_dy_extra
D_0601BFB0 = 0x0601BFB0;
D_0601C160 = 0x0601C160;
@ -1716,9 +1411,6 @@ D_06001A3C = 0x06001A3C;
D_0600375C = 0x0600375C;
D_06007FC0 = 0x06007FC0;
// z_obj_ice_poly
D_04033EE0 = 0x04033EE0;
// z_bg_jya_bombchuiwa
D_0600E8D0 = 0x0600E8D0;
D_060119B0 = 0x060119B0;
@ -1739,9 +1431,6 @@ D_06007928 = 0x06007928;
D_06007938 = 0x06007938;
D_06005810 = 0x06005810;
// z_en_fd_fire
D_0404D4E0 = 0x0404D4E0;
// z_en_fw
D_06007C30 = 0x06007C30;
D_06006CF8 = 0x06006CF8;
@ -1754,7 +1443,6 @@ D_0600DE80 = 0x0600DE80;
// z_en_vm
D_06003F60 = 0x06003F60;
D_06000068 = 0x06000068;
D_04031FE0 = 0x04031FE0;
D_06002728 = 0x06002728;
// z_bg_spot03_taki
@ -1766,8 +1454,6 @@ D_06000BC0 = 0x06000BC0;
D_06001580 = 0x06001580;
// z_Bg_Hidan_Fwbig
D_040173D0 = 0x040173D0;
D_04017BD0 = 0x04017BD0;
D_0600DB20 = 0x0600DB20;
// z_bg_po_event
@ -1811,8 +1497,6 @@ D_06000730 = 0x06000730;
// z_en_kusa
D_060002E0 = 0x60002E0;
D_040355E0 = 0x40355E0;
D_040356A0 = 0x40356A0;
// z_en_karebaba
D_060002B8 = 0x060002B8;
@ -1878,14 +1562,12 @@ D_06004420 = 0x06004420;
D_06004618 = 0x06004618;
// z_bg_haka_gate
D_0404D4E0 = 0x0404D4E0;
D_0600A938 = 0x0600A938;
D_0600F1B0 = 0x0600F1B0;
D_06010A10 = 0x06010A10;
D_06010C10 = 0x06010C10;
D_06010E10 = 0x06010E10;
D_060131C4 = 0x060131C4;
D_0600A938 = 0x0600A938;
// z_bg_haka_huta
D_060006B0 = 0x060006B0;
@ -1976,7 +1658,6 @@ D_06001AB0 = 0x06001AB0;
D_060025FC = 0x060025FC;
// z_bg_spot00_hanebasi
D_0404D4E0 = 0x0404D4E0;
D_060000C0 = 0x060000C0;
D_06000280 = 0x06000280;
D_06000430 = 0x06000430;
@ -2215,7 +1896,6 @@ D_06038E2C = 0x06038E2C;
D_0603A2D0 = 0x0603A2D0;
// z_boss_va
D_04055DB0 = 0x04055DB0;
D_06000024 = 0x06000024;
D_06000FA0 = 0x06000FA0;
D_06001230 = 0x06001230;
@ -2254,8 +1934,6 @@ D_06018D18 = 0x06018D18;
D_060199A0 = 0x060199A0;
// z_demo_6k
D_040101A8 = 0x040101A8;
D_04015780 = 0x04015780;
D_06001040 = 0x06001040;
D_06001190 = 0x06001190;
D_060022B0 = 0x060022B0;
@ -2320,9 +1998,6 @@ D_0601EE34 = 0x0601EE34;
D_06000900 = 0x06000900;
// z_demo_kankyo
D_01000000 = 0x01000000;
D_04010050 = 0x04010050;
D_04052DB0 = 0x04052DB0;
D_06000080 = 0x06000080;
D_06000DE0 = 0x06000DE0;
D_06007440 = 0x06007440;
@ -2353,9 +2028,6 @@ D_06002570 = 0x06002570;
D_06002760 = 0x06002760;
D_060027D8 = 0x060027D8;
// z_eff_dust
D_04037880 = 0x04037880;
// z_en_am
D_06000118 = 0x06000118;
D_06000238 = 0x06000238;
@ -2373,18 +2045,11 @@ D_06003990 = 0x06003990;
// z_en_anubice_fire
D_06003510 = 0x06003510;
// z_en_arrow
D_04004310 = 0x04004310;
D_0400436C = 0x0400436C;
D_04006010 = 0x04006010;
D_04037880 = 0x04037880;
// z_en_ba
D_06000890 = 0x06000890;
D_06001D80 = 0x06001D80;
// z_en_bb
D_0404D4E0 = 0x0404D4E0;
D_06000184 = 0x06000184;
D_06000444 = 0x06000444;
D_06001A30 = 0x06001A30;
@ -2406,9 +2071,6 @@ D_06000064 = 0x06000064;
D_060000A4 = 0x060000A4;
D_06005848 = 0x06005848;
// z_en_bom_chu
D_04007E10 = 0x04007E10;
// z_en_brob
D_06000290 = 0x06000290;
D_060015D8 = 0x060015D8;
@ -2421,7 +2083,6 @@ D_06001A70 = 0x06001A70;
D_06001000 = 0x06001000;
// z_en_bw
D_0404D4E0 = 0x0404D4E0;
D_06000228 = 0x06000228;
D_060020F0 = 0x060020F0;
D_060021A0 = 0x060021A0;
@ -2518,11 +2179,6 @@ D_06000DE0 = 0x06000DE0;
// z_en_fire_rock
D_06000DE0 = 0x06000DE0;
// z_en_fish
D_040185FC = 0x040185FC;
D_04018FE0 = 0x04018FE0;
D_0401909C = 0x0401909C;
// z_en_fr
D_05002470 = 0x05002470;
D_050036F0 = 0x050036F0;
@ -2610,7 +2266,6 @@ D_060017C0 = 0x060017C0;
D_06001960 = 0x06001960;
// z_en_honotrap
D_0404D4E0 = 0x0404D4E0;
D_05006810 = 0x05006810;
// z_en_horse
@ -2654,7 +2309,6 @@ D_0600B9A8 = 0x0600B9A8;
D_0600BA8C = 0x0600BA8C;
// z_en_kanban
D_0403C050 = 0x0403C050;
D_06000C30 = 0x06000C30;
D_06001630 = 0x06001630;
@ -2683,22 +2337,12 @@ D_06005E18 = 0x06005E18;
D_060003F4 = 0x060003F4;
D_06004F70 = 0x06004F70;
// z_en_m_thunder
D_04012570 = 0x04012570;
D_04012690 = 0x04012690;
D_04012AF0 = 0x04012AF0;
D_04012C10 = 0x04012C10;
D_04013610 = 0x04013610;
// z_en_ny
D_06001DD0 = 0x06001DD0;
D_06001EA8 = 0x06001EA8;
D_06001FC8 = 0x06001FC8;
// z_en_ossan
D_0400CDC0 = 0x0400CDC0;
D_0400CE40 = 0x0400CE40;
D_0400CF40 = 0x0400CF40;
D_060000F0 = 0x060000F0;
D_060000FC = 0x060000FC;
D_060002E4 = 0x060002E4;
@ -2853,7 +2497,6 @@ D_06004848 = 0x06004848;
// z_en_viewer
D_01000000 = 0x01000000;
D_0404D4E0 = 0x0404D4E0;
D_06000450 = 0x06000450;
D_060005B4 = 0x060005B4;
D_060008A0 = 0x060008A0;
@ -3059,12 +2702,6 @@ D_06000C50 = 0x06000C50;
// z_object_kankyo
D_01000000 = 0x01000000;
D_04010050 = 0x04010050;
D_0402CF30 = 0x0402CF30;
D_0404C160 = 0x0404C160;
D_0404D160 = 0x0404D160;
D_0404D1A8 = 0x0404D1A8;
D_04052DB0 = 0x04052DB0;
D_06005FF0 = 0x06005FF0;
D_06009620 = 0x06009620;
@ -3091,8 +2728,6 @@ D_060003D0 = 0x060003D0;
// z_obj_warp2block
D_06000980 = 0x06000980;
D_06000B30 = 0x06000B30;
// z_magic_dark
D_04032490 = 0x04032490;
// z_en_dns
D_060041A8 = 0x060041A8;