EnFirefly OK and mostly documented (#194)

* Data imported, 8/30 functions done

* OK

* Delete ASM references, add SFX

* Named functions

* more naming

* Type the nop ActorFunc correctly

* A couple more bits of documentation

* Sorted object_script

* Merge remote-tracking branch 'upstream/master' into Firefly

* format

* Update other includes

* Review suggestions

* Review changes; named Actor_Noop

* Format

2 files changed, 310 insertions, 295 deletions

diff --git a/linker_scripts/code_script.txt b/linker_scripts/code_script.txt
index 0157765ac..cfb4bf1af 100644
--- a/linker_scripts/code_script.txt
+++ b/linker_scripts/code_script.txt
@@ -985,9 +985,9 @@ SECTIONS
     ovl_En_Firefly : AT(RomLocation)
     {
         build/src/overlays/actors/ovl_En_Firefly/z_en_firefly.o(.text)
-        build/asm/overlays/ovl_En_Firefly_data.o(.data)
+        build/src/overlays/actors/ovl_En_Firefly/z_en_firefly.o(.data)
         build/src/overlays/actors/ovl_En_Firefly/z_en_firefly.o(.rodata)
-        build/asm/overlays/ovl_En_Firefly_rodata.o(.rodata)
+        build/src/overlays/actors/ovl_En_Firefly/z_en_firefly_overlay.o(.ovl)
     }
     SegmentEnd = .;
     SegmentSize = SegmentEnd - SegmentStart;
diff --git a/linker_scripts/object_script.txt b/linker_scripts/object_script.txt
index b935b2b06..50edca586 100644
--- a/linker_scripts/object_script.txt
+++ b/linker_scripts/object_script.txt
@@ -1,4 +1,6 @@
-/* gameplay_keep */
+/* KEEPS */
+
+/* gameplay_keep (segment 04) */
 D_040008D0 = 0x040008D0;
 D_0400DEA8 = 0x0400DEA8;
 D_0400E2A8 = 0x0400E2A8;
@@ -37,180 +39,133 @@ D_0408EFE0 = 0x0408EFE0;
 D_0408F3E0 = 0x0408F3E0;
 D_0408F7E0 = 0x0408F7E0;
 
-/* gameplay_dangeon_keep */
+/* gameplay_dangeon_keep (segment 05) */
 D_05018090 = 0x05018090;
 D_05017EA0 = 0x05017EA0;
 D_0501D980 = 0x0501D980;
 D_050219E0 = 0x050219E0;
 
-/* gameplay_field_keep */ 
+/* gameplay_field_keep (segment 05) */ 
 D_05000C40 = 0x05000C40;
 
-object_ikana_obj_001100 = 0x06001100;
-object_ikana_obj_001228 = 0x06001228;
 
-object_fu_kaiten_0005D0 = 0x060005D0;
-object_fu_kaiten_002D30 = 0x06002D30;
+/* CODE */
+
+/* z_en_item00 */
+D_06001290 = 0x06001290;
+D_06001470 = 0x06001470;
 
+/* z_rcp */
 D_0E000048 = 0x0E000048;
 D_0E000088 = 0x0E000088;
 D_0E000140 = 0x0E000140;
 D_0E0001C8 = 0x0E0001C8;
 D_0E0002C8 = 0x0E0002C8;
 
-D_06000500 = 0x06000500;
 
-/* z_en_item00 */
-D_06001290 = 0x06001290;
-D_06001470 = 0x06001470;
+/* OVERLAYS */
 
-/* z_en_nnh */
-D_06001510 = 0x06001510;
+/* z_arms_hook */
+D_0601D960 = 0x0601D960;
 
-/* obj_hsstump */
-D_060003B8 = 0x060003B8;
-D_060011B0 = 0x060011B0;
+/* z_bg_ctower_gear */
+D_06010828 = 0x06010828;
+D_06015F30 = 0x06015F30;
+D_060160A0 = 0x060160A0;
+D_06016E70 = 0x06016E70;
+D_06017018 = 0x06017018;
+D_06018118 = 0x06018118;
+D_06018588 = 0x06018588;
 
-/* en_encount2 */
-D_06000A00 = 0x6000A00;
-D_06000D78 = 0x6000D78;
-D_06002420 = 0x6002420;
+/* z_bg_ctower_rot */
+D_060129D0 = 0x060129D0;
+D_06012DA0 = 0x06012DA0;
+D_060142E8 = 0x060142E8;
+D_06017220 = 0x06017220;
+D_06017410 = 0x06017410;
+D_060174E0 = 0x060174E0;
+D_06017650 = 0x06017650;
 
-/* bg_haka_curtain */
+/* z_bg_fu_kaiten */
+object_fu_kaiten_0005D0 = 0x060005D0;
+object_fu_kaiten_002D30 = 0x06002D30;
+
+/* z_bg_haka_curtain */
 D_06001410 = 0x06001410;
 D_06001588 = 0x06001588;
 
-/* obj_hana */
-D_06000500 = 0x06000500;
+/* z_bg_haka_tomb */
+D_060007B0 = 0x060007B0;
+D_06000EE8 = 0x06000EE8;
 
-/* obj_dinner */
-D_060011E0 = 0x060011E0;
+/* z_bg_icicle */
+D_060000D0 = 0x060000D0;
+D_06000294 = 0x06000294;
 
-/* bg_mbar */
-D_06000288 = 0x06000288;
-D_060019B4 = 0x060019B4;
+/* z_bg_ikana_ray */
+object_ikana_obj_001100 = 0x06001100;
+object_ikana_obj_001228 = 0x06001228;
 
-/* dm_nb */
-D_06000990 = 0x06000990;
-D_06008C40 = 0x06008C40;
+/* z_bg_ikana_shutter */
+D_06000F28 = 0x06000F28;
+D_06000CE8 = 0x06000CE8;
 
-/* z_en_ending_hero5 */
-D_0600A850 = 0x0600A850;
-D_06002FA0 = 0x06002FA0;
-D_060070C0 = 0x060070C0;
-D_06006FB0 = 0x06006FB0;
-D_06006E80 = 0x06006E80;
-D_06006D70 = 0x06006D70;
-D_0600A390 = 0x0600A390;
+/* z_bg_iknin_susceil */
+D_0600CBAC = 0x0600CBAC;
+D_0600C670 = 0x0600C670;
+D_0600C308 = 0x0600C308;
 
-/* z_bg_market_step */
-D_0601F050 = 0x0601F050;
-D_06018DA0 = 0x06018DA0;
-D_0601EF10 = 0x0601EF10;
-D_06018C60 = 0x06018C60;
+/* z_bg_iknv_obj */
+D_060119D4 = 0x060119D4;
+D_06012CA4 = 0x06012CA4;
+D_06011880 = 0x06011880;
+D_060129C8 = 0x060129C8;
+D_06013058 = 0x06013058;
 
-/* z_en_rsn */
-D_06009220 = 0x06009220;
-D_06009120 = 0x06009120;
-D_06005458 = 0x06005458;
-D_0600788C = 0x0600788C;
+/* z_bg_keikoku_spr */
+D_06000100 = 0x06000100;
+D_060001F8 = 0x060001F8;
+D_06000300 = 0x06000300;
+D_060003F8 = 0x060003F8;
+D_06000500 = 0x06000500;
+D_060005F8 = 0x060005F8;
 
-/* z_en_toto */
-D_06000C80 = 0x06000C80;
-D_06001324 = 0x06001324;
-D_060016A4 = 0x060016A4;
-D_06001DF0 = 0x06001DF0;
-D_060022C8 = 0x060022C8;
-D_060028B8 = 0x060028B8;
-D_06002F20 = 0x06002F20;
-D_06003AA8 = 0x06003AA8;
-D_06008AE8 = 0x06008AE8;
-D_0600A068 = 0x0600A068;
-D_0600A468 = 0x0600A468;
-D_0600A978 = 0x0600A978;
-D_0600B3E0 = 0x0600B3E0;
-D_0600B894 = 0x0600B894;
-D_0600BC08 = 0x0600BC08;
-D_0600C880 = 0x0600C880;
+/* z_bg_kin2_fence */
+D_06000828 = 0x06000828;
+D_06000908 = 0x06000908;
 
-/* en_ginko_man */
-object_ginko_skeleton            = 0x0600C240;
-object_ginko_limb15_dlist        = 0x0600B1D8; 
-object_ginko_sitting_anim        = 0x060043F0;
-object_ginko_stamp_reach_anim    = 0x06004F40;
-object_ginko_floorsmacking_anim  = 0x060008C0;
-object_ginko_amazed_anim         = 0x06004A7C;
-object_ginko_advertising_anim    = 0x06000AC4;
+/* z_bg_ladder */
+D_060000A0 = 0x060000A0;
+D_060001D8 = 0x060001D8;
+D_060002D0 = 0x060002D0;
+D_06000408 = 0x06000408;
+D_06000500 = 0x06000500;
+D_06000638 = 0x06000638;
+D_06000730 = 0x06000730;
+D_06000868 = 0x06000868;
 
 /* z_bg_lbfshot */
 D_060014D8 = 0x060014D8;
 D_06000228 = 0x06000228;
 
-/* en_ending_hero4 */
-D_0600D640 = 0x0600D640;
-D_06002A84 = 0x06002A84;
-
-/* en_ending_hero3 */
-D_06007150 = 0x06007150;
-D_06000E50 = 0x06000E50;
-
-/* en_ending_hero2 */
-D_06007908 = 0x06007908;
-D_060011C0 = 0x060011C0;
-
-/* en_pametfrog */
-D_06000994 = 0x06000994;
-D_06001B08 = 0x06001B08;
-D_06001E14 = 0x06001E14;
-D_06001F20 = 0x06001F20;
-D_060030E4 = 0x060030E4;
-D_0600347C = 0x0600347C;
-D_060039C4 = 0x060039C4;
-D_06003F28 = 0x06003F28;
-D_06004298 = 0x06004298;
-D_06004680 = 0x06004680;
-D_06004894 = 0x06004894;
-D_06004D50 = 0x06004D50;
-D_060050B8 = 0x060050B8;
-D_060052EC = 0x060052EC;
-D_06005694 = 0x06005694;
-D_06005D54 = 0x06005D54;
-D_060066B4 = 0x060066B4;
-D_060070C4 = 0x060070C4;
-D_0600DF98 = 0x0600DF98;
-D_0600F990 = 0x0600F990;
-D_0600F048 = 0x0600F048;
-
-/* z_bg_haka_tomb */
-D_060007B0 = 0x060007B0;
-D_06000EE8 = 0x06000EE8;
+/* z_bg_lotus */
+D_06000A20 = 0x06000A20;
+D_06000040 = 0x06000040;
 
-/* z_en_dy_extra */
-D_0600DD40 = 0x0600DD40;
-D_0600DEF0 = 0x0600DEF0;
 
-/* arms_hook */
-D_0601D960 = 0x0601D960;
-
-/* z_obj_boyo */
-D_06000300 = 0x06000300;
-D_06000E88 = 0x06000E88;
+/* z_bg_market_step */
+D_0601F050 = 0x0601F050;
+D_06018DA0 = 0x06018DA0;
+D_0601EF10 = 0x0601EF10;
+D_06018C60 = 0x06018C60;
 
-/* en_ending_hero */
-D_0600B0CC = 0x0600B0CC;
-D_06000BE0 = 0x06000BE0;
-D_06007350 = 0x06007350;
-D_06009590 = 0x06009590;
-D_06009F90 = 0x06009F90;
-D_0600A790 = 0x0600A790;
-D_0600AB90 = 0x0600AB90;
-D_06007750 = 0x06007750;
-D_0600A390 = 0x0600A390;
-D_0600A490 = 0x0600A490;
+/* z_bg_mbar */
+D_06000288 = 0x06000288;
+D_060019B4 = 0x060019B4;
 
-/* en_niw */
-D_06002530 = 0x06002530;
-D_060000E8 = 0x060000E8;
+/* z_bg_tobira01 */
+D_060011C0 = 0x060011C0;
+D_06000088 = 0x06000088;
 
 /* dm_char07 */
 D_06000100 = 0x06000100;
@@ -231,67 +186,107 @@ D_06007918 = 0x06007918;
 D_060105F8 = 0x060105F8;
 D_06010D68 = 0x06010D68;
 
-/* obj_lightswitch */
-D_06000C20 = 0x6000C20; 
-D_06000420 = 0x6000420; 
-D_06001420 = 0x6001420;
+/* z_dm_nb */
+D_06000990 = 0x06000990;
+D_06008C40 = 0x06008C40;
 
-/* z_bg_iknv_obj */
-D_060119D4 = 0x060119D4;
-D_06012CA4 = 0x06012CA4;
-D_06011880 = 0x06011880;
-D_060129C8 = 0x060129C8;
-D_06013058 = 0x06013058;
+/* z_dm_sa */
+D_06013328 = 0x06013328;
+D_0600CC94 = 0x0600CC94;
 
-/* z_obj_kepn_koya */
-D_0600805C = 0x0600805C;
-D_06003478 = 0x06003478;
+/* z_dm_statue */
+D_06001788 = 0x06001788;
+D_06000520 = 0x06000520;
 
-/* en_po_fusen */
-D_06000040 = 0x06000040;
-D_060024F0 = 0x060024F0;
 
-/* z_bg_iknin_susceil */
-D_0600CBAC = 0x0600CBAC;
-D_0600C670 = 0x0600C670;
-D_0600C308 = 0x0600C308;
+/* z_door_spiral */
+/* these are symbols from other objects based on the type of door */
+D_06000590 = 0x06000590;
+D_060007A8 = 0x060007A8;
+D_06000EA0 = 0x06000EA0;
+D_060012C0 = 0x060012C0;
+D_060014C8 = 0x060014C8;
+D_06002110 = 0x06002110;
+D_06004448 = 0x06004448;
+D_060051B8 = 0x060051B8;
+D_06006128 = 0x06006128;
+D_06009278 = 0x06009278;
+D_06012B70 = 0x06012B70;
+D_06013EA8 = 0x06013EA8;
 
-/* z_bg_keikoku_spr */
-D_06000100 = 0x06000100;
-D_060001F8 = 0x060001F8;
-D_06000300 = 0x06000300;
-D_060003F8 = 0x060003F8;
-D_06000500 = 0x06000500;
-D_060005F8 = 0x060005F8;
+/* z_eff_dust */
+D_04054A90 = 0x04054A90;
 
-/* z_dm_sa */
-D_06013328 = 0x06013328;
-D_0600CC94 = 0x0600CC94;
+/* z_en_cha */
+D_06000710 = 0x06000710;
+D_06000958 = 0x06000958;
 
-/* z_bg_kin2_fence */
-D_06000828 = 0x06000828;
-D_06000908 = 0x06000908;
+/* z_en_dy_extra */
+D_0600DD40 = 0x0600DD40;
+D_0600DEF0 = 0x0600DEF0;
 
-/* bg_ikana_shutter */
-D_06000F28 = 0x06000F28;
-D_06000CE8 = 0x06000CE8;
+/* z_en_encount2 */
+D_06000A00 = 0x6000A00;
+D_06000D78 = 0x6000D78;
+D_06002420 = 0x6002420;
 
-/* z_obj_hgdoor */
-D_06001D10 = 0x06001D10;
-D_060018C0 = 0x060018C0;
-D_06001AB0 = 0x06001AB0;
-D_06001BA8 = 0x06001BA8;
-D_06001670 = 0x06001670;
-D_06001768 = 0x06001768;
+/* z_en_ending_hero */
+D_0600B0CC = 0x0600B0CC;
+D_06000BE0 = 0x06000BE0;
+D_06007350 = 0x06007350;
+D_06009590 = 0x06009590;
+D_06009F90 = 0x06009F90;
+D_0600A790 = 0x0600A790;
+D_0600AB90 = 0x0600AB90;
+D_06007750 = 0x06007750;
+D_0600A390 = 0x0600A390;
+D_0600A490 = 0x0600A490;
 
-/* obj_funen */
-D_060000D0 = 0x060000D0;
+/* z_en_ending_hero2 */
+D_06007908 = 0x06007908;
+D_060011C0 = 0x060011C0;
 
-/* item_b_heart */
-D_06001290 = 0x06001290;
-D_06001470 = 0x06001470;
+/* z_en_ending_hero3 */
+D_06007150 = 0x06007150;
+D_06000E50 = 0x06000E50;
+
+/* z_en_ending_hero4 */
+D_0600D640 = 0x0600D640;
+D_06002A84 = 0x06002A84;
 
-/* en_in */
+/* z_en_ending_hero5 */
+D_0600A850 = 0x0600A850;
+D_06002FA0 = 0x06002FA0;
+D_060070C0 = 0x060070C0;
+D_06006FB0 = 0x06006FB0;
+D_06006E80 = 0x06006E80;
+D_06006D70 = 0x06006D70;
+D_0600A390 = 0x0600A390;
+
+/* z_en_fg */
+D_06001534 = 0x06001534;
+D_060011C0 = 0x060011C0;
+D_060007BC = 0x060007BC;
+D_060059A0 = 0x060059A0;
+D_0600B328 = 0x0600B328;
+D_0600B338 = 0x0600B338;
+D_0600B538 = 0x0600B538;
+
+/* z_en_firefly */
+D_060018B8 = 0x060018B8;
+D_0600017C = 0x0600017C;
+D_06001678 = 0x06001678;
+
+/* z_en_ginko_man */
+object_ginko_skeleton            = 0x0600C240;
+object_ginko_limb15_dlist        = 0x0600B1D8; 
+object_ginko_sitting_anim        = 0x060043F0;
+object_ginko_stamp_reach_anim    = 0x06004F40;
+object_ginko_floorsmacking_anim  = 0x060008C0;
+object_ginko_amazed_anim         = 0x06004A7C;
+object_ginko_advertising_anim    = 0x06000AC4;
+
+/* z_en_in */
 D_06014EA8 = 0x06014EA8;
 D_06015E38 = 0x06015E38;
 D_06016484 = 0x06016484;
@@ -340,67 +335,8 @@ D_06012A78 = 0x06012A78;
 D_060137A0 = 0x060137A0;
 D_06014860 = 0x06014860;
 
-/* z_dm_statue */
-D_06001788 = 0x06001788;
-D_06000520 = 0x06000520;
-
-/* door_spiral */
-/* these are symbols from other objects based on the type of door */
-D_06000590 = 0x06000590;
-D_060007A8 = 0x060007A8;
-D_06000EA0 = 0x06000EA0;
-D_060012C0 = 0x060012C0;
-D_060014C8 = 0x060014C8;
-D_06002110 = 0x06002110;
-D_06004448 = 0x06004448;
-D_060051B8 = 0x060051B8;
-D_06006128 = 0x06006128;
-D_06009278 = 0x06009278;
-D_06012B70 = 0x06012B70;
-D_06013EA8 = 0x06013EA8;
-
-/* z_eff_dust */
-D_04054A90 = 0x04054A90;
-
-/* z_obj_visiblock */
-D_06000AD0 = 0x06000AD0;
-D_06000140 = 0x06000140;
-
-/* en_minifrog */
-D_060007BC = 0x060007BC;
-D_06001534 = 0x06001534;
-D_060059A0 = 0x060059A0;
-D_06005BA0 = 0x06005BA0;
-D_0600B538 = 0x0600B538;
-
-/* bg_lotus */
-D_06000A20 = 0x06000A20;
-D_06000040 = 0x06000040;
-
-/* obj_tokei_step */
-D_06000088 = 0x06000088;
-D_06000968 = 0x06000968;
-
-/* z_bg_ctower_gear */
-D_06010828 = 0x06010828;
-D_06015F30 = 0x06015F30;
-D_060160A0 = 0x060160A0;
-D_06016E70 = 0x06016E70;
-D_06017018 = 0x06017018;
-D_06018118 = 0x06018118;
-D_06018588 = 0x06018588;
-
-/* z_bg_ctower_rot */
-D_060129D0 = 0x060129D0;
-D_06012DA0 = 0x06012DA0;
-D_060142E8 = 0x060142E8;
-D_06017220 = 0x06017220;
-D_06017410 = 0x06017410;
-D_060174E0 = 0x060174E0;
-D_06017650 = 0x06017650;
-
-/* z_en_warp_uzu */ 
-D_06000EC0 = 0x06000EC0;
+/* z_en_jc_mato */
+D_06000390 = 0x06000390;
 
 /* z_en_ma_yts */
 D_06009E58 = 0x06009E58;
@@ -440,48 +376,60 @@ D_06010FC8 = 0x06010FC8;
 D_060117C8 = 0x060117C8;
 D_06011FC8 = 0x06011FC8;
 
-/* en_cha */
-D_06000710 = 0x06000710;
-D_06000958 = 0x06000958;
-
-/* z_obj_milk_bin */
-D_060004B0 = 0x060004B0;
+/* z_en_minifrog */
+D_060007BC = 0x060007BC;
+D_06001534 = 0x06001534;
+D_060059A0 = 0x060059A0;
+D_06005BA0 = 0x06005BA0;
+D_0600B538 = 0x0600B538;
 
-/* z_en_jc_mato */
-D_06000390 = 0x06000390;
+/* en_niw */
+D_06002530 = 0x06002530;
+D_060000E8 = 0x060000E8;
 
+/* z_en_nnh */
+D_06001510 = 0x06001510;
 
-/* z_bg_tobira01 */
-D_060011C0 = 0x060011C0;
-D_06000088 = 0x06000088;
+/* z_en_pametfrog */
+D_06000994 = 0x06000994;
+D_06001B08 = 0x06001B08;
+D_06001E14 = 0x06001E14;
+D_06001F20 = 0x06001F20;
+D_060030E4 = 0x060030E4;
+D_0600347C = 0x0600347C;
+D_060039C4 = 0x060039C4;
+D_06003F28 = 0x06003F28;
+D_06004298 = 0x06004298;
+D_06004680 = 0x06004680;
+D_06004894 = 0x06004894;
+D_06004D50 = 0x06004D50;
+D_060050B8 = 0x060050B8;
+D_060052EC = 0x060052EC;
+D_06005694 = 0x06005694;
+D_06005D54 = 0x06005D54;
+D_060066B4 = 0x060066B4;
+D_060070C4 = 0x060070C4;
+D_0600DF98 = 0x0600DF98;
+D_0600F990 = 0x0600F990;
+D_0600F048 = 0x0600F048;
 
-/* obj_bell */
-D_06001BA8 = 0x06001BA8;
-D_06000840 = 0x06000840;
-D_06000570 = 0x06000570;
-D_06000698 = 0x06000698;
-D_060008D0 = 0x060008D0;
-D_06000960 = 0x06000960;
-D_060007A8 = 0x060007A8;
+/* z_en_po_fusen */
+D_06000040 = 0x06000040;
+D_060024F0 = 0x060024F0;
 
-/* z_en_fg */
-D_06001534 = 0x06001534;
-D_060011C0 = 0x060011C0;
-D_060007BC = 0x060007BC;
-D_060059A0 = 0x060059A0;
-D_0600B328 = 0x0600B328;
-D_0600B338 = 0x0600B338;
-D_0600B538 = 0x0600B538;
+/* z_en_rsn */
+D_06009220 = 0x06009220;
+D_06009120 = 0x06009120;
+D_06005458 = 0x06005458;
+D_0600788C = 0x0600788C;
 
-/* z_bg_ladder */
-D_060000A0 = 0x060000A0;
-D_060001D8 = 0x060001D8;
-D_060002D0 = 0x060002D0;
-D_06000408 = 0x06000408;
-D_06000500 = 0x06000500;
-D_06000638 = 0x06000638;
-D_06000730 = 0x06000730;
-D_06000868 = 0x06000868;
+/* z_en_sb */
+D_06000194 = 0x06000194;
+D_0600004C = 0x0600004C;
+D_06000124 = 0x06000124;
+D_06002C8C = 0x06002C8C;
+D_060000B4 = 0x060000B4;
+D_06002BF0 = 0x06002BF0;
 
 /* z_en_torch2 */
 D_0401C430 = 0x0401C430;
@@ -489,30 +437,97 @@ D_04048DF0 = 0x04048DF0;
 D_04057B10 = 0x04057B10;
 D_04089070 = 0x04089070;
 
-/* z_obj_moon_stone */
-D_06001C60 = 0x06001C60;
-D_06000D78 = 0x06000D78;
+/* z_en_toto */
 D_06000C80 = 0x06000C80;
+D_06001324 = 0x06001324;
+D_060016A4 = 0x060016A4;
+D_06001DF0 = 0x06001DF0;
+D_060022C8 = 0x060022C8;
+D_060028B8 = 0x060028B8;
+D_06002F20 = 0x06002F20;
+D_06003AA8 = 0x06003AA8;
+D_06008AE8 = 0x06008AE8;
+D_0600A068 = 0x0600A068;
+D_0600A468 = 0x0600A468;
+D_0600A978 = 0x0600A978;
+D_0600B3E0 = 0x0600B3E0;
+D_0600B894 = 0x0600B894;
+D_0600BC08 = 0x0600BC08;
+D_0600C880 = 0x0600C880;
 
-/* z_bg_icicle */
+/* z_en_warp_uzu */ 
+D_06000EC0 = 0x06000EC0;
+
+/* z_item_b_heart */
+D_06001290 = 0x06001290;
+D_06001470 = 0x06001470;
+
+/* z_obj_bell */
+D_06001BA8 = 0x06001BA8;
+D_06000840 = 0x06000840;
+D_06000570 = 0x06000570;
+D_06000698 = 0x06000698;
+D_060008D0 = 0x060008D0;
+D_06000960 = 0x06000960;
+D_060007A8 = 0x060007A8;
+
+/* z_obj_boyo */
+D_06000300 = 0x06000300;
+D_06000E88 = 0x06000E88;
+
+/* z_obj_dinner */
+D_060011E0 = 0x060011E0;
+
+/* z_obj_funen */
 D_060000D0 = 0x060000D0;
-D_06000294 = 0x06000294;
 
 /* z_obj_ghaka */
 D_06001A20 = 0x06001A20;
 D_06001980 = 0x06001980;
 D_06003CD0 = 0x06003CD0;
 
+/* z_obj_hana */
+D_06000500 = 0x06000500;
+
+/* z_obj_hgdoor */
+D_06001D10 = 0x06001D10;
+D_060018C0 = 0x060018C0;
+D_06001AB0 = 0x06001AB0;
+D_06001BA8 = 0x06001BA8;
+D_06001670 = 0x06001670;
+D_06001768 = 0x06001768;
+
+/* z_obj_hsstump */
+D_060003B8 = 0x060003B8;
+D_060011B0 = 0x060011B0;
+
+/* z_obj_kepn_koya */
+D_0600805C = 0x0600805C;
+D_06003478 = 0x06003478;
+
 /* z_obj_kibako */
 D_05007890 = 0x05007890;
 D_05007980 = 0x05007980;
 D_06001180 = 0x06001180;
 D_06001A70 = 0x06001A70;
 
-/* z_en_sb */
-D_06000194 = 0x06000194;
-D_0600004C = 0x0600004C;
-D_06000124 = 0x06000124;
-D_06002C8C = 0x06002C8C;
-D_060000B4 = 0x060000B4;
-D_06002BF0 = 0x06002BF0;
\ No newline at end of file
+/* z_obj_lightswitch */
+D_06000C20 = 0x6000C20; 
+D_06000420 = 0x6000420; 
+D_06001420 = 0x6001420;
+
+/* z_obj_milk_bin */
+D_060004B0 = 0x060004B0;
+
+/* z_obj_moon_stone */
+D_06001C60 = 0x06001C60;
+D_06000D78 = 0x06000D78;
+D_06000C80 = 0x06000C80;
+
+/* z_obj_tokei_step */
+D_06000088 = 0x06000088;
+D_06000968 = 0x06000968;
+
+/* z_obj_visiblock */
+D_06000AD0 = 0x06000AD0;
+D_06000140 = 0x06000140;