From 0ecea6b62635f2753a2a7344d55b1d6b36f56449 Mon Sep 17 00:00:00 2001
From: rozlette <uberpanzermensch@gmail.com>
Date: Fri, 27 Sep 2019 00:09:51 -0500
Subject: [PATCH] Add ovl_En_Fishing. Get rid of most hard-coded offsets in
 linker script.

---
 codescript.txt      | 1307 +++++++++++++++++++++++--------------------
 include/functions.h |   42 ++
 include/variables.h |  405 ++++++++++++++
 tables/files.py     |    1 +
 undef.txt           |   99 ++++
 5 files changed, 1239 insertions(+), 615 deletions(-)

diff --git a/codescript.txt b/codescript.txt
index a04eea34d..b3eeee9dd 100644
--- a/codescript.txt
+++ b/codescript.txt
@@ -193,8 +193,9 @@ SECTIONS
         build/asm/boot_0x800968F0.o(.text)
         build/asm/boot_0x80096930.o(.text)
     }
+    . += 0xC5C0;
 
-    code 0x800A5AC0:
+    code :
     {
         build/src/code/code_0x800A5AC0.o(.text)
         build/asm/z_en_item00.o(.text)
@@ -333,3076 +334,3152 @@ SECTIONS
         build/asm/ovl_title_0x80800000.o(.text)
     }
 
-    ovl_select 0x80800910:
+    ovl_select :
     {
         build/asm/ovl_select_0x80800910.o(.text)
     }
 
-    ovl_opening 0x80803DF0:
+    ovl_opening :
     {
         build/asm/ovl_opening_0x80803DF0.o(.text)
     }
 
-    ovl_file_choose 0x80804010:
+    ovl_file_choose :
     {
         build/asm/ovl_file_choose_0x80804010.o(.text)
         build/asm/ovl_file_choose_0x80807940.o(.text)
         build/asm/ovl_file_choose_0x8080BC20.o(.text)
+        . += 0x30;
     }
 
-    ovl_daytelop 0x80814EB0:
+    ovl_daytelop :
     {
         build/asm/ovl_daytelop_0x80814EB0.o(.text)
     }
 
-    ovl_kaleido_scope 0x808160a0:
+    ovl_kaleido_scope :
     {
         build/asm/ovl_kaleido_scope_0x808160A0.o(.text)
         build/asm/ovl_kaleido_scope_0x8081D240.o(.text)
         build/asm/ovl_kaleido_scope_0x8081FF80.o(.text)
+        . += 0x40;
     }
 
-    ovl_Player_Actor 0x8082da90:
+    ovl_Player_Actor :
     {
         build/asm/ovl_Player_Actor_0x8082DA90.o(.text)
+        . += 0x80;
     }
 
-    ovl_En_Test 0x80862B70:
+    ovl_En_Test :
     {
         build/asm/ovl_En_Test_0x80862B70.o(.text)
     }
 
-    ovl_En_GirlA 0x80863870:
+    ovl_En_GirlA :
     {
         build/asm/ovl_En_GirlA_0x80863870.o(.text)
     }
 
-    ovl_En_Part 0x80865370:
+    ovl_En_Part :
     {
         build/asm/ovl_En_Part_0x80865370.o(.text)
     }
 
-    ovl_En_Light 0x80865990:
+    ovl_En_Light :
     {
         build/asm/ovl_En_Light_0x80865990.o(.text)
     }
 
-    ovl_En_Door 0x80866800:
+    ovl_En_Door :
     {
         build/asm/ovl_En_Door_0x80866800.o(.text)
+        . += 0x10;
     }
 
-    ovl_En_Box 0x80867BD0:
+    ovl_En_Box :
     {
         build/asm/ovl_En_Box_0x80867BD0.o(.text)
     }
 
-    ovl_En_Pametfrog 0x80869D90:
+    ovl_En_Pametfrog :
     {
         build/asm/ovl_En_Pametfrog_0x80869D90.o(.text)
     }
 
-    ovl_En_Okuta 0x8086DE20:
+    ovl_En_Okuta :
     {
         build/asm/ovl_En_Okuta_0x8086DE20.o(.text)
     }
 
-    ovl_En_Bom 0x80870DB0:
+    ovl_En_Bom :
     {
         build/asm/ovl_En_Bom_0x80870DB0.o(.text)
+        . += 0x1C0;
     }
 
-    ovl_En_Wallmas 0x80874810:
+    ovl_En_Wallmas :
     {
         build/asm/ovl_En_Wallmas_0x80874810.o(.text)
     }
 
-    ovl_En_Dodongo 0x80876670:
+    ovl_En_Dodongo :
     {
         build/asm/ovl_En_Dodongo_0x80876670.o(.text)
     }
 
-    ovl_En_Firefly 0x808796F0:
+    ovl_En_Firefly :
     {
         build/asm/ovl_En_Firefly_0x808796F0.o(.text)
     }
 
-    ovl_En_Horse 0x8087B730:
+    ovl_En_Horse :
     {
         build/asm/ovl_En_Horse_0x8087B730.o(.text)
     }
 
-    ovl_En_Arrow 0x8088A240:
+    ovl_En_Arrow :
     {
         build/asm/ovl_En_Arrow_0x8088A240.o(.text)
     }
 
-    ovl_En_Elf 0x8088C510:
+    ovl_En_Elf :
     {
         build/asm/ovl_En_Elf_0x8088C510.o(.text)
     }
 
-    ovl_En_Niw 0x80891060:
+    ovl_En_Niw :
     {
         build/asm/ovl_En_Niw_0x80891060.o(.text)
     }
 
-    ovl_En_Tite 0x808937F0:
+    ovl_En_Tite :
     {
         build/asm/ovl_En_Tite_0x808937F0.o(.text)
     }
 
-    ovl_En_Peehat 0x80896F30:
+    ovl_En_Peehat :
     {
         build/asm/ovl_En_Peehat_0x80896F30.o(.text)
     }
 
-    ovl_En_Holl 0x80899960:
+    ovl_En_Holl :
     {
         build/asm/ovl_En_Holl_0x80899960.o(.text)
     }
 
-    ovl_En_Dinofos 0x8089A6E0:
+    ovl_En_Dinofos :
     {
         build/asm/ovl_En_Dinofos_0x8089A6E0.o(.text)
     }
 
-    ovl_En_Hata 0x8089E8E0:
+    ovl_En_Hata :
     {
         build/asm/ovl_En_Hata_0x8089E8E0.o(.text)
     }
 
-    ovl_En_Zl1 0x8089ED90:
+    ovl_En_Zl1 :
     {
         build/asm/ovl_En_Zl1_0x8089ED90.o(.text)
     }
 
-    ovl_En_Viewer 0x8089EE20:
+    ovl_En_Viewer :
     {
         build/asm/ovl_En_Viewer_0x8089EE20.o(.text)
+        . += 0x10;
     }
 
-    ovl_En_Bubble 0x8089F4E0:
+    ovl_En_Bubble :
     {
         build/asm/ovl_En_Bubble_0x8089F4E0.o(.text)
     }
 
-    ovl_Door_Shutter 0x808A08F0:
+    ovl_Door_Shutter :
     {
         build/asm/ovl_Door_Shutter_0x808A08F0.o(.text)
     }
 
-    ovl_En_Boom 0x808A24D0:
+    ovl_En_Boom :
     {
         build/asm/ovl_En_Boom_0x808A24D0.o(.text)
     }
 
-    ovl_En_Torch2 0x808A31B0:
+    ovl_En_Torch2 :
     {
         build/asm/ovl_En_Torch2_0x808A31B0.o(.text)
     }
 
-    ovl_En_Minifrog 0x808A3670:
+    ovl_En_Minifrog :
     {
         build/asm/ovl_En_Minifrog_0x808A3670.o(.text)
     }
 
-    ovl_En_St 0x808A5050:
+    ovl_En_St :
     {
         build/asm/ovl_En_St_0x808A5050.o(.text)
     }
 
-    ovl_Obj_Wturn 0x808A7930:
+    ovl_Obj_Wturn :
     {
         build/asm/ovl_Obj_Wturn_0x808A7930.o(.text)
     }
 
-    ovl_En_River_Sound 0x808A7E30:
+    ovl_En_River_Sound :
     {
         build/asm/ovl_En_River_Sound_0x808A7E30.o(.text)
     }
 
-    ovl_En_Ossan 0x808A80A0:
+    ovl_En_Ossan :
     {
         build/asm/ovl_En_Ossan_0x808A80A0.o(.text)
     }
 
-    ovl_En_Famos 0x808AC920:
+    ovl_En_Famos :
     {
         build/asm/ovl_En_Famos_0x808AC920.o(.text)
     }
 
-    ovl_En_Bombf 0x808AE8C0:
+    ovl_En_Bombf :
     {
         build/asm/ovl_En_Bombf_0x808AE8C0.o(.text)
     }
 
-    ovl_En_Am 0x808AFCD0:
+    ovl_En_Am :
     {
         build/asm/ovl_En_Am_0x808AFCD0.o(.text)
     }
 
-    ovl_En_Dekubaba 0x808B1330:
+    ovl_En_Dekubaba :
     {
         build/asm/ovl_En_Dekubaba_0x808B1330.o(.text)
     }
 
-    ovl_En_M_Fire1 0x808B5230:
+    ovl_En_M_Fire1 :
     {
         build/asm/ovl_En_M_Fire1_0x808B5230.o(.text)
     }
 
-    ovl_En_M_Thunder 0x808B53C0:
+    ovl_En_M_Thunder :
     {
         build/asm/ovl_En_M_Thunder_0x808B53C0.o(.text)
     }
 
-    ovl_Bg_Breakwall 0x808B7360:
+    ovl_Bg_Breakwall :
     {
         build/asm/ovl_Bg_Breakwall_0x808B7360.o(.text)
     }
 
-    ovl_Door_Warp1 0x808B8490:
+    ovl_Door_Warp1 :
     {
         build/asm/ovl_Door_Warp1_0x808B8490.o(.text)
+        . += 0x10;
     }
 
-    ovl_Obj_Syokudai 0x808BC010:
+    ovl_Obj_Syokudai :
     {
         build/asm/ovl_Obj_Syokudai_0x808BC010.o(.text)
+        . += 0x10;
     }
 
-    ovl_Item_B_Heart 0x808BCDF0:
+    ovl_Item_B_Heart :
     {
         build/asm/ovl_Item_B_Heart_0x808BCDF0.o(.text)
     }
 
-    ovl_En_Dekunuts 0x808BD1E0:
+    ovl_En_Dekunuts :
     {
         build/asm/ovl_En_Dekunuts_0x808BD1E0.o(.text)
     }
 
-    ovl_En_Bbfall 0x808BF220:
+    ovl_En_Bbfall :
     {
         build/asm/ovl_En_Bbfall_0x808BF220.o(.text)
     }
 
-    ovl_Arms_Hook 0x808C1030:
+    ovl_Arms_Hook :
     {
         build/asm/ovl_Arms_Hook_0x808C1030.o(.text)
     }
 
-    ovl_En_Bb 0x808C1D40:
+    ovl_En_Bb :
     {
         build/asm/ovl_En_Bb_0x808C1D40.o(.text)
     }
 
-    ovl_Bg_Keikoku_Spr 0x808C3A50:
+    ovl_Bg_Keikoku_Spr :
     {
         build/asm/ovl_Bg_Keikoku_Spr_0x808C3A50.o(.text)
     }
 
-    ovl_En_Wood02 0x808C3C00:
+    ovl_En_Wood02 :
     {
         build/asm/ovl_En_Wood02_0x808C3C00.o(.text)
+        . += 0x10;
     }
 
-    ovl_En_Death 0x808C4F80:
+    ovl_En_Death :
     {
         build/asm/ovl_En_Death_0x808C4F80.o(.text)
     }
 
-    ovl_En_Minideath 0x808CA0B0:
+    ovl_En_Minideath :
     {
         build/asm/ovl_En_Minideath_0x808CA0B0.o(.text)
+        . += 0x10;
     }
 
-    ovl_En_Vm 0x808CC260:
+    ovl_En_Vm :
     {
         build/asm/ovl_En_Vm_0x808CC260.o(.text)
     }
 
-    ovl_Demo_Effect 0x808CD740:
+    ovl_Demo_Effect :
     {
         build/asm/ovl_Demo_Effect_0x808CD740.o(.text)
     }
 
-    ovl_Demo_Kankyo 0x808CE450:
+    ovl_Demo_Kankyo :
     {
         build/asm/ovl_Demo_Kankyo_0x808CE450.o(.text)
     }
 
-    ovl_En_Floormas 0x808D0680:
+    ovl_En_Floormas :
     {
         build/asm/ovl_En_Floormas_0x808D0680.o(.text)
     }
 
-    ovl_En_Rd 0x808D3E20:
+    ovl_En_Rd :
     {
         build/asm/ovl_En_Rd_0x808D3E20.o(.text)
     }
 
-    ovl_Bg_F40_Flift 0x808D7550:
+    ovl_Bg_F40_Flift :
     {
         build/asm/ovl_Bg_F40_Flift_0x808D7550.o(.text)
     }
 
-    ovl_En_Sw 0x808D8940:
+    . += 0x1070; /* TODO we are skipping a file that we don't currently disassemble */
+
+    ovl_En_Sw :
     {
         build/asm/ovl_En_Sw_0x808D8940.o(.text)
     }
 
-    ovl_Object_Kankyo 0x808DBE80:
+    ovl_Object_Kankyo :
     {
         build/asm/ovl_Object_Kankyo_0x808DBE80.o(.text)
+        . += 0x10;
     }
 
-    ovl_En_Horse_Link_Child 0x808DE5C0:
+    ovl_En_Horse_Link_Child :
     {
         build/asm/ovl_En_Horse_Link_Child_0x808DE5C0.o(.text)
     }
 
-    ovl_Door_Ana 0x808E01A0:
+    ovl_Door_Ana :
     {
         build/asm/ovl_Door_Ana_0x808E01A0.o(.text)
     }
 
-    ovl_En_Encount1 0x808E0830:
+    ovl_En_Encount1 :
     {
         build/asm/ovl_En_Encount1_0x808E0830.o(.text)
     }
 
-    ovl_Demo_Tre_Lgt 0x808E0E40:
+    ovl_Demo_Tre_Lgt :
     {
         build/asm/ovl_Demo_Tre_Lgt_0x808E0E40.o(.text)
     }
 
-    ovl_En_Encount2 0x808E1560:
+    ovl_En_Encount2 :
     {
         build/asm/ovl_En_Encount2_0x808E1560.o(.text)
     }
 
-    ovl_En_Fire_Rock 0x808E1FE0:
+    ovl_En_Fire_Rock :
     {
         build/asm/ovl_En_Fire_Rock_0x808E1FE0.o(.text)
     }
 
-    ovl_Bg_Ctower_Rot 0x808E2070:
+    ovl_Bg_Ctower_Rot :
     {
         build/asm/ovl_Bg_Ctower_Rot_0x808E2070.o(.text)
     }
 
-    ovl_Mir_Ray 0x808E2600:
+    ovl_Mir_Ray :
     {
         build/asm/ovl_Mir_Ray_0x808E2600.o(.text)
     }
 
-    ovl_En_Sb 0x808E3EF0:
+    ovl_En_Sb :
     {
         build/asm/ovl_En_Sb_0x808E3EF0.o(.text)
     }
 
-    ovl_En_Bigslime 0x808E4FC0:
+    ovl_En_Bigslime :
     {
         build/asm/ovl_En_Bigslime_0x808E4FC0.o(.text)
     }
 
-    ovl_En_Karebaba 0x808F1200:
+    ovl_En_Karebaba :
     {
         build/asm/ovl_En_Karebaba_0x808F1200.o(.text)
     }
 
-    ovl_En_In 0x808F30B0:
+    ovl_En_In :
     {
         build/asm/ovl_En_In_0x808F30B0.o(.text)
     }
 
-    ovl_En_Bom_Chu 0x808F74B0:
+    ovl_En_Bom_Chu :
     {
         build/asm/ovl_En_Bom_Chu_0x808F74B0.o(.text)
     }
 
-    ovl_En_Horse_Game_Check 0x808F8AA0:
+    ovl_En_Horse_Game_Check :
     {
         build/asm/ovl_En_Horse_Game_Check_0x808F8AA0.o(.text)
     }
 
-    ovl_En_Rr 0x808F9E00:
+    ovl_En_Rr :
     {
         build/asm/ovl_En_Rr_0x808F9E00.o(.text)
     }
 
-    ovl_En_Fr 0x808FC550:
+    ovl_En_Fr :
     {
         build/asm/ovl_En_Fr_0x808FC550.o(.text)
     }
 
-    ovl_Obj_Oshihiki 0x80917290:
+    ovl_En_Fishing :
+    {
+        build/asm/ovl_En_Fishing_0x808FC6C0.o(.text)
+        . += 0x70E0;
+    }
+
+    ovl_Obj_Oshihiki :
     {
         build/asm/ovl_Obj_Oshihiki_0x80917290.o(.text)
     }
 
-    ovl_Eff_Dust 0x80918B40:
+    ovl_Eff_Dust :
     {
         build/asm/ovl_Eff_Dust_0x80918B40.o(.text)
     }
 
-    ovl_Bg_Umajump 0x80919F30:
+    ovl_Bg_Umajump :
     {
         build/asm/ovl_Bg_Umajump_0x80919F30.o(.text)
     }
 
-    ovl_En_Insect 0x8091A8A0:
+    ovl_En_Insect :
     {
         build/asm/ovl_En_Insect_0x8091A8A0.o(.text)
     }
 
-    ovl_En_Butte 0x8091C0A0:
+    ovl_En_Butte :
     {
         build/asm/ovl_En_Butte_0x8091C0A0.o(.text)
     }
 
-    ovl_En_Fish 0x8091D630:
+    ovl_En_Fish :
     {
         build/asm/ovl_En_Fish_0x8091D630.o(.text)
     }
 
-    ovl_Item_Etcetera 0x8091FEF0:
+    ovl_Item_Etcetera :
     {
         build/asm/ovl_Item_Etcetera_0x8091FEF0.o(.text)
     }
 
-    ovl_Arrow_Fire 0x80920340:
+    ovl_Arrow_Fire :
     {
         build/asm/ovl_Arrow_Fire_0x80920340.o(.text)
+        . += 0x10;
     }
 
-    ovl_Arrow_Ice 0x80922430:
+    ovl_Arrow_Ice :
     {
         build/asm/ovl_Arrow_Ice_0x80922430.o(.text)
+        . += 0x10;
     }
 
-    ovl_Arrow_Light 0x80924300:
+    ovl_Arrow_Light :
     {
         build/asm/ovl_Arrow_Light_0x80924300.o(.text)
+        . += 0x10;
     }
 
-    ovl_Obj_Kibako 0x809261B0:
+    ovl_Obj_Kibako :
     {
         build/asm/ovl_Obj_Kibako_0x809261B0.o(.text)
     }
 
-    ovl_Obj_Tsubo 0x809275C0:
+    ovl_Obj_Tsubo :
     {
         build/asm/ovl_Obj_Tsubo_0x809275C0.o(.text)
     }
 
-    ovl_En_Ik 0x80929910:
+    ovl_En_Ik :
     {
         build/asm/ovl_En_Ik_0x80929910.o(.text)
     }
 
-    ovl_Demo_Shd 0x8092C530:
+    ovl_Demo_Shd :
     {
         build/asm/ovl_Demo_Shd_0x8092C530.o(.text)
     }
 
-    ovl_En_Dns 0x8092C5C0:
+    ovl_En_Dns :
     {
         build/asm/ovl_En_Dns_0x8092C5C0.o(.text)
     }
 
-    ovl_Elf_Msg 0x8092DF90:
+    ovl_Elf_Msg :
     {
         build/asm/ovl_Elf_Msg_0x8092DF90.o(.text)
     }
 
-    ovl_En_Honotrap 0x8092E510:
+    ovl_En_Honotrap :
     {
         build/asm/ovl_En_Honotrap_0x8092E510.o(.text)
     }
 
-    ovl_En_Tubo_Trap 0x809307E0:
+    ovl_En_Tubo_Trap :
     {
         build/asm/ovl_En_Tubo_Trap_0x809307E0.o(.text)
     }
 
-    ovl_Obj_Ice_Poly 0x80931560:
+    ovl_Obj_Ice_Poly :
     {
         build/asm/ovl_Obj_Ice_Poly_0x80931560.o(.text)
     }
 
-    ovl_En_Fz 0x80932490:
+    ovl_En_Fz :
     {
         build/asm/ovl_En_Fz_0x80932490.o(.text)
     }
 
-    ovl_En_Kusa 0x809349E0:
+    ovl_En_Kusa :
     {
         build/asm/ovl_En_Kusa_0x809349E0.o(.text)
+        . += 0x220;
     }
 
-    ovl_Obj_Bean 0x80936CF0:
+    ovl_Obj_Bean :
     {
         build/asm/ovl_Obj_Bean_0x80936CF0.o(.text)
     }
 
-    ovl_Obj_Bombiwa 0x809393B0:
+    ovl_Obj_Bombiwa :
     {
         build/asm/ovl_Obj_Bombiwa_0x809393B0.o(.text)
     }
 
-    ovl_Obj_Switch 0x8093ABD0:
+    ovl_Obj_Switch :
     {
         build/asm/ovl_Obj_Switch_0x8093ABD0.o(.text)
+        . += 0x10;
     }
 
-    ovl_Obj_Lift 0x8093D3C0:
+    ovl_Obj_Lift :
     {
         build/asm/ovl_Obj_Lift_0x8093D3C0.o(.text)
     }
 
-    ovl_Obj_Hsblock 0x8093DEA0:
+    ovl_Obj_Hsblock :
     {
         build/asm/ovl_Obj_Hsblock_0x8093DEA0.o(.text)
     }
 
-    ovl_En_Okarina_Tag 0x8093E420:
+    ovl_En_Okarina_Tag :
     {
         build/asm/ovl_En_Okarina_Tag_0x8093E420.o(.text)
     }
 
-    ovl_En_Goroiwa 0x8093E8A0:
+    ovl_En_Goroiwa :
     {
         build/asm/ovl_En_Goroiwa_0x8093E8A0.o(.text)
     }
 
-    ovl_En_Daiku 0x809434B0:
+    ovl_En_Daiku :
     {
         build/asm/ovl_En_Daiku_0x809434B0.o(.text)
     }
 
-    ovl_En_Nwc 0x809441E0:
+    ovl_En_Nwc :
     {
         build/asm/ovl_En_Nwc_0x809441E0.o(.text)
     }
 
-    ovl_Item_Inbox 0x809454F0:
+    ovl_Item_Inbox :
     {
         build/asm/ovl_Item_Inbox_0x809454F0.o(.text)
     }
 
-    ovl_En_Ge1 0x80945650:
+    ovl_En_Ge1 :
     {
         build/asm/ovl_En_Ge1_0x80945650.o(.text)
     }
 
-    ovl_Obj_Blockstop 0x809466A0:
+    ovl_Obj_Blockstop :
     {
         build/asm/ovl_Obj_Blockstop_0x809466A0.o(.text)
     }
 
-    ovl_En_Sda 0x809468D0:
+    ovl_En_Sda :
     {
         build/asm/ovl_En_Sda_0x809468D0.o(.text)
+        . += 0xC0;
     }
 
-    ovl_En_Clear_Tag 0x80947F60:
+    ovl_En_Clear_Tag :
     {
         build/asm/ovl_En_Clear_Tag_0x80947F60.o(.text)
     }
 
-    ovl_En_Gm 0x8094DEE0:
+    ovl_En_Gm :
     {
         build/asm/ovl_En_Gm_0x8094DEE0.o(.text)
     }
 
-    ovl_En_Ms 0x80952620:
+    ovl_En_Ms :
     {
         build/asm/ovl_En_Ms_0x80952620.o(.text)
     }
 
-    ovl_En_Hs 0x80952C50:
+    ovl_En_Hs :
     {
         build/asm/ovl_En_Hs_0x80952C50.o(.text)
     }
 
-    ovl_Bg_Ingate 0x80953A90:
+    ovl_Bg_Ingate :
     {
         build/asm/ovl_Bg_Ingate_0x80953A90.o(.text)
     }
 
-    ovl_En_Kanban 0x80954960:
+    ovl_En_Kanban :
     {
         build/asm/ovl_En_Kanban_0x80954960.o(.text)
     }
 
-    ovl_En_Attack_Niw 0x809580C0:
+    ovl_En_Attack_Niw :
     {
         build/asm/ovl_En_Attack_Niw_0x809580C0.o(.text)
     }
 
-    ovl_En_Mk 0x809592E0:
+    ovl_En_Mk :
     {
         build/asm/ovl_En_Mk_0x809592E0.o(.text)
     }
 
-    ovl_En_Owl 0x8095A510:
+    ovl_En_Owl :
     {
         build/asm/ovl_En_Owl_0x8095A510.o(.text)
     }
 
-    ovl_En_Ishi 0x8095D6E0:
+    ovl_En_Ishi :
     {
         build/asm/ovl_En_Ishi_0x8095D6E0.o(.text)
     }
 
-    ovl_Obj_Hana 0x8095FB10:
+    ovl_Obj_Hana :
     {
         build/asm/ovl_Obj_Hana_0x8095FB10.o(.text)
     }
 
-    ovl_Obj_Lightswitch 0x8095FBF0:
+    ovl_Obj_Lightswitch :
     {
         build/asm/ovl_Obj_Lightswitch_0x8095FBF0.o(.text)
     }
 
-    ovl_Obj_Mure2 0x80960CF0:
+    ovl_Obj_Mure2 :
     {
         build/asm/ovl_Obj_Mure2_0x80960CF0.o(.text)
     }
 
-    ovl_En_Fu 0x809616E0:
+    ovl_En_Fu :
     {
         build/asm/ovl_En_Fu_0x809616E0.o(.text)
     }
 
-    ovl_En_Stream 0x80965650:
+    ovl_En_Stream :
     {
         build/asm/ovl_En_Stream_0x80965650.o(.text)
     }
 
-    ovl_En_Mm 0x80965BB0:
+    ovl_En_Mm :
     {
         build/asm/ovl_En_Mm_0x80965BB0.o(.text)
     }
 
-    ovl_En_Weather_Tag 0x80966410:
+    ovl_En_Weather_Tag :
     {
         build/asm/ovl_En_Weather_Tag_0x80966410.o(.text)
     }
 
-    ovl_En_Ani 0x809679D0:
+    ovl_En_Ani :
     {
         build/asm/ovl_En_Ani_0x809679D0.o(.text)
     }
 
-    ovl_En_Js 0x809687B0:
+    ovl_En_Js :
     {
         build/asm/ovl_En_Js_0x809687B0.o(.text)
     }
 
-    ovl_En_Okarina_Effect 0x8096B0A0:
+    ovl_En_Okarina_Effect :
     {
         build/asm/ovl_En_Okarina_Effect_0x8096B0A0.o(.text)
     }
 
-    ovl_En_Mag 0x8096B310:
+    ovl_En_Mag :
     {
         build/asm/ovl_En_Mag_0x8096B310.o(.text)
     }
 
-    ovl_Elf_Msg2 0x8096EC40:
+    ovl_Elf_Msg2 :
     {
         build/asm/ovl_Elf_Msg2_0x8096EC40.o(.text)
     }
 
-    ovl_Bg_F40_Swlift 0x8096F160:
+    ovl_Bg_F40_Swlift :
     {
         build/asm/ovl_Bg_F40_Swlift_0x8096F160.o(.text)
+        . += 0x10;
     }
 
-    ovl_En_Kakasi 0x8096F5E0:
+    ovl_En_Kakasi :
     {
         build/asm/ovl_En_Kakasi_0x8096F5E0.o(.text)
     }
 
-    ovl_Obj_Makeoshihiki 0x80972350:
+    ovl_Obj_Makeoshihiki :
     {
         build/asm/ovl_Obj_Makeoshihiki_0x80972350.o(.text)
     }
 
-    ovl_Oceff_Spot 0x80972680:
+    ovl_Oceff_Spot :
     {
         build/asm/ovl_Oceff_Spot_0x80972680.o(.text)
     }
 
-    ovl_En_Torch 0x80973550:
+    ovl_En_Torch :
     {
         build/asm/ovl_En_Torch_0x80973550.o(.text)
     }
 
-    ovl_Shot_Sun 0x80973640:
+    ovl_Shot_Sun :
     {
         build/asm/ovl_Shot_Sun_0x80973640.o(.text)
     }
 
-    ovl_Obj_Roomtimer 0x80973C50:
+    ovl_Obj_Roomtimer :
     {
         build/asm/ovl_Obj_Roomtimer_0x80973C50.o(.text)
     }
 
-    ovl_En_Ssh 0x80973EF0:
+    ovl_En_Ssh :
     {
         build/asm/ovl_En_Ssh_0x80973EF0.o(.text)
     }
 
-    ovl_Oceff_Wipe 0x809764B0:
+    ovl_Oceff_Wipe :
     {
         build/asm/ovl_Oceff_Wipe_0x809764B0.o(.text)
+        . += 0x10;
     }
 
-    ovl_Effect_Ss_Dust 0x80977210:
+    ovl_Effect_Ss_Dust :
     {
         build/asm/ovl_Effect_Ss_Dust_0x80977210.o(.text)
     }
 
-    ovl_Effect_Ss_Kirakira 0x80977A00:
+    ovl_Effect_Ss_Kirakira :
     {
         build/asm/ovl_Effect_Ss_Kirakira_0x80977A00.o(.text)
     }
 
-    ovl_Effect_Ss_Bomb2 0x80978070:
+    ovl_Effect_Ss_Bomb2 :
     {
         build/asm/ovl_Effect_Ss_Bomb2_0x80978070.o(.text)
     }
 
-    ovl_Effect_Ss_Blast 0x809788D0:
+    ovl_Effect_Ss_Blast :
     {
         build/asm/ovl_Effect_Ss_Blast_0x809788D0.o(.text)
     }
 
-    ovl_Effect_Ss_G_Spk 0x80978C30:
+    ovl_Effect_Ss_G_Spk :
     {
         build/asm/ovl_Effect_Ss_G_Spk_0x80978C30.o(.text)
     }
 
-    ovl_Effect_Ss_D_Fire 0x809791B0:
+    ovl_Effect_Ss_D_Fire :
     {
         build/asm/ovl_Effect_Ss_D_Fire_0x809791B0.o(.text)
     }
 
-    ovl_Effect_Ss_Bubble 0x809795C0:
+    ovl_Effect_Ss_Bubble :
     {
         build/asm/ovl_Effect_Ss_Bubble_0x809795C0.o(.text)
     }
 
-    ovl_Effect_Ss_G_Ripple 0x80979B30:
+    ovl_Effect_Ss_G_Ripple :
     {
         build/asm/ovl_Effect_Ss_G_Ripple_0x80979B30.o(.text)
     }
 
-    ovl_Effect_Ss_G_Splash 0x8097A050:
+    ovl_Effect_Ss_G_Splash :
     {
         build/asm/ovl_Effect_Ss_G_Splash_0x8097A050.o(.text)
     }
 
-    ovl_Effect_Ss_G_Fire 0x8097A470:
+    ovl_Effect_Ss_G_Fire :
     {
         build/asm/ovl_Effect_Ss_G_Fire_0x8097A470.o(.text)
     }
 
-    ovl_Effect_Ss_Lightning 0x8097A680:
+    ovl_Effect_Ss_Lightning :
     {
         build/asm/ovl_Effect_Ss_Lightning_0x8097A680.o(.text)
     }
 
-    ovl_Effect_Ss_Dt_Bubble 0x8097AD60:
+    ovl_Effect_Ss_Dt_Bubble :
     {
         build/asm/ovl_Effect_Ss_Dt_Bubble_0x8097AD60.o(.text)
     }
 
-    ovl_Effect_Ss_Hahen 0x8097B270:
+    ovl_Effect_Ss_Hahen :
     {
         build/asm/ovl_Effect_Ss_Hahen_0x8097B270.o(.text)
     }
 
-    ovl_Effect_Ss_Stick 0x8097B810:
+    ovl_Effect_Ss_Stick :
     {
         build/asm/ovl_Effect_Ss_Stick_0x8097B810.o(.text)
     }
 
-    ovl_Effect_Ss_Sibuki 0x8097BAD0:
+    ovl_Effect_Ss_Sibuki :
     {
         build/asm/ovl_Effect_Ss_Sibuki_0x8097BAD0.o(.text)
     }
 
-    ovl_Effect_Ss_Stone1 0x8097C130:
+    ovl_Effect_Ss_Stone1 :
     {
         build/asm/ovl_Effect_Ss_Stone1_0x8097C130.o(.text)
     }
 
-    ovl_Effect_Ss_Hitmark 0x8097C490:
+    ovl_Effect_Ss_Hitmark :
     {
         build/asm/ovl_Effect_Ss_Hitmark_0x8097C490.o(.text)
     }
 
-    ovl_Effect_Ss_Fhg_Flash 0x8097C990:
+    ovl_Effect_Ss_Fhg_Flash :
     {
         build/asm/ovl_Effect_Ss_Fhg_Flash_0x8097C990.o(.text)
     }
 
-    ovl_Effect_Ss_K_Fire 0x8097D410:
+    ovl_Effect_Ss_K_Fire :
     {
         build/asm/ovl_Effect_Ss_K_Fire_0x8097D410.o(.text)
     }
 
-    ovl_Effect_Ss_Solder_Srch_Ball 0x8097D850:
+    ovl_Effect_Ss_Solder_Srch_Ball :
     {
         build/asm/ovl_Effect_Ss_Solder_Srch_Ball_0x8097D850.o(.text)
     }
 
-    ovl_Effect_Ss_Kakera 0x8097DCA0:
+    ovl_Effect_Ss_Kakera :
     {
         build/asm/ovl_Effect_Ss_Kakera_0x8097DCA0.o(.text)
     }
 
-    ovl_Effect_Ss_Ice_Piece 0x8097ECD0:
+    ovl_Effect_Ss_Ice_Piece :
     {
         build/asm/ovl_Effect_Ss_Ice_Piece_0x8097ECD0.o(.text)
     }
 
-    ovl_Effect_Ss_En_Ice 0x8097F0D0:
+    ovl_Effect_Ss_En_Ice :
     {
         build/asm/ovl_Effect_Ss_En_Ice_0x8097F0D0.o(.text)
     }
 
-    ovl_Effect_Ss_Fire_Tail 0x8097F880:
+    ovl_Effect_Ss_Fire_Tail :
     {
         build/asm/ovl_Effect_Ss_Fire_Tail_0x8097F880.o(.text)
     }
 
-    ovl_Effect_Ss_En_Fire 0x8097FF60:
+    ovl_Effect_Ss_En_Fire :
     {
         build/asm/ovl_Effect_Ss_En_Fire_0x8097FF60.o(.text)
     }
 
-    ovl_Effect_Ss_Extra 0x809805D0:
+    ovl_Effect_Ss_Extra :
     {
         build/asm/ovl_Effect_Ss_Extra_0x809805D0.o(.text)
     }
 
-    ovl_Effect_Ss_Dead_Db 0x80980940:
+    ovl_Effect_Ss_Dead_Db :
     {
         build/asm/ovl_Effect_Ss_Dead_Db_0x80980940.o(.text)
     }
 
-    ovl_Effect_Ss_Dead_Dd 0x80980D50:
+    ovl_Effect_Ss_Dead_Dd :
     {
         build/asm/ovl_Effect_Ss_Dead_Dd_0x80980D50.o(.text)
     }
 
-    ovl_Effect_Ss_Dead_Ds 0x809812E0:
+    ovl_Effect_Ss_Dead_Ds :
     {
         build/asm/ovl_Effect_Ss_Dead_Ds_0x809812E0.o(.text)
     }
 
-    ovl_Oceff_Storm 0x80981760:
+    ovl_Oceff_Storm :
     {
         build/asm/ovl_Oceff_Storm_0x80981760.o(.text)
     }
 
-    ovl_Obj_Demo 0x80983520:
+    ovl_Obj_Demo :
     {
         build/asm/ovl_Obj_Demo_0x80983520.o(.text)
     }
 
-    ovl_En_Minislime 0x809838F0:
+    ovl_En_Minislime :
     {
         build/asm/ovl_En_Minislime_0x809838F0.o(.text)
     }
 
-    ovl_En_Nutsball 0x80985C40:
+    ovl_En_Nutsball :
     {
         build/asm/ovl_En_Nutsball_0x80985C40.o(.text)
     }
 
-    ovl_Oceff_Wipe2 0x80986270:
+    ovl_Oceff_Wipe2 :
     {
         build/asm/ovl_Oceff_Wipe2_0x80986270.o(.text)
+        . += 0x10;
     }
 
-    ovl_Oceff_Wipe3 0x809879E0:
+    ovl_Oceff_Wipe3 :
     {
         build/asm/ovl_Oceff_Wipe3_0x809879E0.o(.text)
+        . += 0x10;
     }
 
-    ovl_En_Dg 0x80989140:
+    ovl_En_Dg :
     {
         build/asm/ovl_En_Dg_0x80989140.o(.text)
     }
 
-    ovl_En_Si 0x8098CA20:
+    ovl_En_Si :
     {
         build/asm/ovl_En_Si_0x8098CA20.o(.text)
     }
 
-    ovl_Obj_Comb 0x8098CE40:
+    ovl_Obj_Comb :
     {
         build/asm/ovl_Obj_Comb_0x8098CE40.o(.text)
     }
 
-    ovl_Obj_Kibako2 0x8098E5C0:
+    ovl_Obj_Kibako2 :
     {
         build/asm/ovl_Obj_Kibako2_0x8098E5C0.o(.text)
     }
 
-    ovl_En_Hs2 0x8098EF60:
+    ovl_En_Hs2 :
     {
         build/asm/ovl_En_Hs2_0x8098EF60.o(.text)
     }
 
-    ovl_Obj_Mure3 0x8098F040:
+    ovl_Obj_Mure3 :
     {
         build/asm/ovl_Obj_Mure3_0x8098F040.o(.text)
     }
 
-    ovl_En_Tg 0x8098F800:
+    ovl_En_Tg :
     {
         build/asm/ovl_En_Tg_0x8098F800.o(.text)
     }
 
-    ovl_En_Wf 0x80990310:
+    ovl_En_Wf :
     {
         build/asm/ovl_En_Wf_0x80990310.o(.text)
     }
 
-    ovl_En_Skb 0x809947B0:
+    ovl_En_Skb :
     {
         build/asm/ovl_En_Skb_0x809947B0.o(.text)
     }
 
-    ovl_En_Gs 0x80997A90:
+    ovl_En_Gs :
     {
         build/asm/ovl_En_Gs_0x80997A90.o(.text)
     }
 
-    ovl_Obj_Sound 0x8099A920:
+    ovl_Obj_Sound :
     {
         build/asm/ovl_Obj_Sound_0x8099A920.o(.text)
     }
 
-    ovl_En_Crow 0x8099AB30:
+    ovl_En_Crow :
     {
         build/asm/ovl_En_Crow_0x8099AB30.o(.text)
     }
 
-    ovl_En_Cow 0x8099C290:
+    ovl_En_Cow :
     {
         build/asm/ovl_En_Cow_0x8099C290.o(.text)
     }
 
-    ovl_Oceff_Wipe4 0x8099D780:
+    ovl_Oceff_Wipe4 :
     {
         build/asm/ovl_Oceff_Wipe4_0x8099D780.o(.text)
+        . += 0x10;
     }
 
-    ovl_En_Zo 0x8099E790:
+    ovl_En_Zo :
     {
         build/asm/ovl_En_Zo_0x8099E790.o(.text)
     }
 
-    ovl_Effect_Ss_Ice_Smoke 0x8099F730:
+    ovl_Effect_Ss_Ice_Smoke :
     {
         build/asm/ovl_Effect_Ss_Ice_Smoke_0x8099F730.o(.text)
     }
 
-    ovl_Obj_Makekinsuta 0x8099FA40:
+    ovl_Obj_Makekinsuta :
     {
         build/asm/ovl_Obj_Makekinsuta_0x8099FA40.o(.text)
     }
 
-    ovl_En_Ge3 0x8099FEB0:
+    ovl_En_Ge3 :
     {
         build/asm/ovl_En_Ge3_0x8099FEB0.o(.text)
     }
 
-    ovl_Obj_Hamishi 0x809A0F20:
+    ovl_Obj_Hamishi :
     {
         build/asm/ovl_Obj_Hamishi_0x809A0F20.o(.text)
     }
 
-    ovl_En_Zl4 0x809A1BB0:
+    ovl_En_Zl4 :
     {
         build/asm/ovl_En_Zl4_0x809A1BB0.o(.text)
     }
 
-    ovl_En_Mm2 0x809A2030:
+    ovl_En_Mm2 :
     {
         build/asm/ovl_En_Mm2_0x809A2030.o(.text)
     }
 
-    ovl_Door_Spiral 0x809A2B60:
+    ovl_Door_Spiral :
     {
         build/asm/ovl_Door_Spiral_0x809A2B60.o(.text)
     }
 
-    ovl_Obj_Pzlblock 0x809A33E0:
+    ovl_Obj_Pzlblock :
     {
         build/asm/ovl_Obj_Pzlblock_0x809A33E0.o(.text)
     }
 
-    ovl_Obj_Toge 0x809A41C0:
+    ovl_Obj_Toge :
     {
         build/asm/ovl_Obj_Toge_0x809A41C0.o(.text)
     }
 
-    ovl_Obj_Armos 0x809A4E00:
+    ovl_Obj_Armos :
     {
         build/asm/ovl_Obj_Armos_0x809A4E00.o(.text)
     }
 
-    ovl_Obj_Boyo 0x809A5D10:
+    ovl_Obj_Boyo :
     {
         build/asm/ovl_Obj_Boyo_0x809A5D10.o(.text)
     }
 
-    ovl_En_Grasshopper 0x809A6280:
+    ovl_En_Grasshopper :
     {
         build/asm/ovl_En_Grasshopper_0x809A6280.o(.text)
     }
 
-    ovl_Obj_Grass 0x809A9110:
+    ovl_Obj_Grass :
     {
         build/asm/ovl_Obj_Grass_0x809A9110.o(.text)
+        . += 0xC0;
     }
 
-    ovl_Obj_Grass_Carry 0x809AAE60:
+    ovl_Obj_Grass_Carry :
     {
         build/asm/ovl_Obj_Grass_Carry_0x809AAE60.o(.text)
     }
 
-    ovl_Obj_Grass_Unit 0x809ABDE0:
+    ovl_Obj_Grass_Unit :
     {
         build/asm/ovl_Obj_Grass_Unit_0x809ABDE0.o(.text)
     }
 
-    ovl_Bg_Fire_Wall 0x809AC4B0:
+    ovl_Bg_Fire_Wall :
     {
         build/asm/ovl_Bg_Fire_Wall_0x809AC4B0.o(.text)
     }
 
-    ovl_En_Bu 0x809ACD90:
+    ovl_En_Bu :
     {
         build/asm/ovl_En_Bu_0x809ACD90.o(.text)
     }
 
-    ovl_En_Encount3 0x809ACF40:
+    ovl_En_Encount3 :
     {
         build/asm/ovl_En_Encount3_0x809ACF40.o(.text)
     }
 
-    ovl_En_Jso 0x809AD8E0:
+    ovl_En_Jso :
     {
         build/asm/ovl_En_Jso_0x809AD8E0.o(.text)
     }
 
-    ovl_Obj_Chikuwa 0x809B1550:
+    ovl_Obj_Chikuwa :
     {
         build/asm/ovl_Obj_Chikuwa_0x809B1550.o(.text)
     }
 
-    ovl_En_Knight 0x809B20F0:
+    ovl_En_Knight :
     {
         build/asm/ovl_En_Knight_0x809B20F0.o(.text)
+        . += 0x1790;
     }
 
-    ovl_En_Warp_tag 0x809C0760:
+    ovl_En_Warp_tag :
     {
         build/asm/ovl_En_Warp_tag_0x809C0760.o(.text)
     }
 
-    ovl_En_Aob_01 0x809C10B0:
+    ovl_En_Aob_01 :
     {
         build/asm/ovl_En_Aob_01_0x809C10B0.o(.text)
     }
 
-    ovl_En_Boj_01 0x809C3D80:
+    ovl_En_Boj_01 :
     {
         build/asm/ovl_En_Boj_01_0x809C3D80.o(.text)
     }
 
-    ovl_En_Boj_02 0x809C3E10:
+    ovl_En_Boj_02 :
     {
         build/asm/ovl_En_Boj_02_0x809C3E10.o(.text)
     }
 
-    ovl_En_Boj_03 0x809C3EA0:
+    ovl_En_Boj_03 :
     {
         build/asm/ovl_En_Boj_03_0x809C3EA0.o(.text)
     }
 
-    ovl_En_Encount4 0x809C3F30:
+    ovl_En_Encount4 :
     {
         build/asm/ovl_En_Encount4_0x809C3F30.o(.text)
     }
 
-    ovl_En_Bom_Bowl_Man 0x809C4790:
+    ovl_En_Bom_Bowl_Man :
     {
         build/asm/ovl_En_Bom_Bowl_Man_0x809C4790.o(.text)
     }
 
-    ovl_En_Syateki_Man 0x809C64C0:
+    ovl_En_Syateki_Man :
     {
         build/asm/ovl_En_Syateki_Man_0x809C64C0.o(.text)
     }
 
-    ovl_Bg_Icicle 0x809C9A60:
+    ovl_Bg_Icicle :
     {
         build/asm/ovl_Bg_Icicle_0x809C9A60.o(.text)
     }
 
-    ovl_En_Syateki_Crow 0x809CA3F0:
+    ovl_En_Syateki_Crow :
     {
         build/asm/ovl_En_Syateki_Crow_0x809CA3F0.o(.text)
     }
 
-    ovl_En_Boj_04 0x809CB200:
+    ovl_En_Boj_04 :
     {
         build/asm/ovl_En_Boj_04_0x809CB200.o(.text)
     }
 
-    ovl_En_Cne_01 0x809CB290:
+    ovl_En_Cne_01 :
     {
         build/asm/ovl_En_Cne_01_0x809CB290.o(.text)
     }
 
-    ovl_En_Bba_01 0x809CC060:
+    ovl_En_Bba_01 :
     {
         build/asm/ovl_En_Bba_01_0x809CC060.o(.text)
     }
 
-    ovl_En_Bji_01 0x809CCDE0:
+    ovl_En_Bji_01 :
     {
         build/asm/ovl_En_Bji_01_0x809CCDE0.o(.text)
     }
 
-    ovl_Bg_Spdweb 0x809CDEC0:
+    ovl_Bg_Spdweb :
     {
         build/asm/ovl_Bg_Spdweb_0x809CDEC0.o(.text)
     }
 
-    ovl_En_Mt_tag 0x809CF350:
+    ovl_En_Mt_tag :
     {
         build/asm/ovl_En_Mt_tag_0x809CF350.o(.text)
     }
 
-    ovl_Boss_01 0x809D0530:
+    ovl_Boss_01 :
     {
         build/asm/ovl_Boss_01_0x809D0530.o(.text)
+        . += 0x17C0;
     }
 
-    ovl_Boss_02 0x809DA1D0:
+    ovl_Boss_02 :
     {
         build/asm/ovl_Boss_02_0x809DA1D0.o(.text)
+        . += 0x2340;
     }
 
-    ovl_Boss_03 0x809E2760:
+    ovl_Boss_03 :
     {
         build/asm/ovl_Boss_03_0x809E2760.o(.text)
+        . += 0x2800;
     }
 
-    ovl_Boss_04 0x809EC040:
+    ovl_Boss_04 :
     {
         build/asm/ovl_Boss_04_0x809EC040.o(.text)
+        . += 0x10;
     }
 
-    ovl_Boss_05 0x809EE4E0:
+    ovl_Boss_05 :
     {
         build/asm/ovl_Boss_05_0x809EE4E0.o(.text)
+        . += 0x10;
     }
 
-    ovl_Boss_06 0x809F2120:
+    ovl_Boss_06 :
     {
         build/asm/ovl_Boss_06_0x809F2120.o(.text)
+        . += 0x610;
     }
 
-    ovl_Boss_07 0x809F4980:
+    ovl_Boss_07 :
     {
         build/asm/ovl_Boss_07_0x809F4980.o(.text)
+        . += 0xE60;
     }
 
-    ovl_Bg_Dy_Yoseizo 0x80A0A8A0:
+    ovl_Bg_Dy_Yoseizo :
     {
         build/asm/ovl_Bg_Dy_Yoseizo_0x80A0A8A0.o(.text)
     }
 
-    ovl_En_Boj_05 0x80A0C780:
+    ovl_En_Boj_05 :
     {
         build/asm/ovl_En_Boj_05_0x80A0C780.o(.text)
     }
 
-    ovl_En_Sob1 0x80A0C810:
+    ovl_En_Sob1 :
     {
         build/asm/ovl_En_Sob1_0x80A0C810.o(.text)
     }
 
-    ovl_En_Go 0x80A10FD0:
+    ovl_En_Go :
     {
         build/asm/ovl_En_Go_0x80A10FD0.o(.text)
     }
 
-    ovl_En_Raf 0x80A16D40:
+    ovl_En_Raf :
     {
         build/asm/ovl_En_Raf_0x80A16D40.o(.text)
     }
 
-    ovl_Obj_Funen 0x80A19740:
+    ovl_Obj_Funen :
     {
         build/asm/ovl_Obj_Funen_0x80A19740.o(.text)
     }
 
-    ovl_Obj_Raillift 0x80A19910:
+    ovl_Obj_Raillift :
     {
         build/asm/ovl_Obj_Raillift_0x80A19910.o(.text)
     }
 
-    ovl_Bg_Numa_Hana 0x80A1A500:
+    ovl_Bg_Numa_Hana :
     {
         build/asm/ovl_Bg_Numa_Hana_0x80A1A500.o(.text)
     }
 
-    ovl_Obj_Flowerpot 0x80A1B3D0:
+    ovl_Obj_Flowerpot :
     {
         build/asm/ovl_Obj_Flowerpot_0x80A1B3D0.o(.text)
+        . += 0x220;
     }
 
-    ovl_Obj_Spinyroll 0x80A1DA50:
+    ovl_Obj_Spinyroll :
     {
         build/asm/ovl_Obj_Spinyroll_0x80A1DA50.o(.text)
     }
 
-    ovl_Dm_Hina 0x80A1F410:
+    ovl_Dm_Hina :
     {
         build/asm/ovl_Dm_Hina_0x80A1F410.o(.text)
     }
 
-    ovl_En_Syateki_Wf 0x80A1FE50:
+    ovl_En_Syateki_Wf :
     {
         build/asm/ovl_En_Syateki_Wf_0x80A1FE50.o(.text)
     }
 
-    ovl_Obj_Skateblock 0x80A21150:
+    ovl_Obj_Skateblock :
     {
         build/asm/ovl_Obj_Skateblock_0x80A21150.o(.text)
     }
 
-    ovl_Effect_En_Ice_Block 0x80A22D40:
+    ovl_Effect_En_Ice_Block :
     {
         build/asm/ovl_Effect_En_Ice_Block_0x80A22D40.o(.text)
     }
 
-    ovl_Obj_Iceblock 0x80A23090:
+    ovl_Obj_Iceblock :
     {
         build/asm/ovl_Obj_Iceblock_0x80A23090.o(.text)
     }
 
-    ovl_En_Bigpamet 0x80A27520:
+    ovl_En_Bigpamet :
     {
         build/asm/ovl_En_Bigpamet_0x80A27520.o(.text)
     }
 
-    ovl_Bg_Dblue_Movebg 0x80A29A80:
+    ovl_Bg_Dblue_Movebg :
     {
         build/asm/ovl_Bg_Dblue_Movebg_0x80A29A80.o(.text)
+        . += 0x10;
     }
 
-    ovl_En_Syateki_Dekunuts 0x80A2BC00:
+    ovl_En_Syateki_Dekunuts :
     {
         build/asm/ovl_En_Syateki_Dekunuts_0x80A2BC00.o(.text)
     }
 
-    ovl_Elf_Msg3 0x80A2CD10:
+    ovl_Elf_Msg3 :
     {
         build/asm/ovl_Elf_Msg3_0x80A2CD10.o(.text)
     }
 
-    ovl_En_Fg 0x80A2D280:
+    ovl_En_Fg :
     {
         build/asm/ovl_En_Fg_0x80A2D280.o(.text)
     }
 
-    ovl_Dm_Ravine 0x80A2E7A0:
+    ovl_Dm_Ravine :
     {
         build/asm/ovl_Dm_Ravine_0x80A2E7A0.o(.text)
     }
 
-    ovl_Dm_Sa 0x80A2E960:
+    ovl_Dm_Sa :
     {
         build/asm/ovl_Dm_Sa_0x80A2E960.o(.text)
     }
 
-    ovl_En_Slime 0x80A2EDA0:
+    ovl_En_Slime :
     {
         build/asm/ovl_En_Slime_0x80A2EDA0.o(.text)
+        . += 0x10;
     }
 
-    ovl_En_Pr 0x80A32210:
+    ovl_En_Pr :
     {
         build/asm/ovl_En_Pr_0x80A32210.o(.text)
     }
 
-    ovl_Obj_Toudai 0x80A33B00:
+    ovl_Obj_Toudai :
     {
         build/asm/ovl_Obj_Toudai_0x80A33B00.o(.text)
     }
 
-    ovl_Obj_Entotu 0x80A34700:
+    ovl_Obj_Entotu :
     {
         build/asm/ovl_Obj_Entotu_0x80A34700.o(.text)
     }
 
-    ovl_Obj_Bell 0x80A35510:
+    ovl_Obj_Bell :
     {
         build/asm/ovl_Obj_Bell_0x80A35510.o(.text)
     }
 
-    ovl_En_Syateki_Okuta 0x80A35FF0:
+    ovl_En_Syateki_Okuta :
     {
         build/asm/ovl_En_Syateki_Okuta_0x80A35FF0.o(.text)
     }
 
-    ovl_Obj_Shutter 0x80A37ED0:
+    ovl_Obj_Shutter :
     {
         build/asm/ovl_Obj_Shutter_0x80A37ED0.o(.text)
     }
 
-    ovl_Dm_Zl 0x80A38190:
+    ovl_Dm_Zl :
     {
         build/asm/ovl_Dm_Zl_0x80A38190.o(.text)
     }
 
-    ovl_En_Ru 0x80A389A0:
+    ovl_En_Ru :
     {
         build/asm/ovl_En_Ru_0x80A389A0.o(.text)
     }
 
-    ovl_En_Elfgrp 0x80A396B0:
+    ovl_En_Elfgrp :
     {
         build/asm/ovl_En_Elfgrp_0x80A396B0.o(.text)
     }
 
-    ovl_Dm_Tsg 0x80A3AC60:
+    ovl_Dm_Tsg :
     {
         build/asm/ovl_Dm_Tsg_0x80A3AC60.o(.text)
     }
 
-    ovl_En_Baguo 0x80A3B080:
+    ovl_En_Baguo :
     {
         build/asm/ovl_En_Baguo_0x80A3B080.o(.text)
     }
 
-    ovl_Obj_Vspinyroll 0x80A3C4E0:
+    ovl_Obj_Vspinyroll :
     {
         build/asm/ovl_Obj_Vspinyroll_0x80A3C4E0.o(.text)
     }
 
-    ovl_Obj_Smork 0x80A3D680:
+    ovl_Obj_Smork :
     {
         build/asm/ovl_Obj_Smork_0x80A3D680.o(.text)
     }
 
-    ovl_En_Test2 0x80A3E390:
+    ovl_En_Test2 :
     {
         build/asm/ovl_En_Test2_0x80A3E390.o(.text)
     }
 
-    ovl_En_Test3 0x80A3E7E0:
+    ovl_En_Test3 :
     {
         build/asm/ovl_En_Test3_0x80A3E7E0.o(.text)
+        . += 0x50;
     }
 
-    ovl_En_Test4 0x80A41D70:
+    ovl_En_Test4 :
     {
         build/asm/ovl_En_Test4_0x80A41D70.o(.text)
+        . += 0x10;
     }
 
-    ovl_En_Bat 0x80A434E0:
+    ovl_En_Bat :
     {
         build/asm/ovl_En_Bat_0x80A434E0.o(.text)
+        . += 0x10;
     }
 
-    ovl_En_Sekihi 0x80A44C80:
+    ovl_En_Sekihi :
     {
         build/asm/ovl_En_Sekihi_0x80A44C80.o(.text)
     }
 
-    ovl_En_Wiz 0x80A45360:
+    ovl_En_Wiz :
     {
         build/asm/ovl_En_Wiz_0x80A45360.o(.text)
     }
 
-    ovl_En_Wiz_Brock 0x80A48FE0:
+    ovl_En_Wiz_Brock :
     {
         build/asm/ovl_En_Wiz_Brock_0x80A48FE0.o(.text)
     }
 
-    ovl_En_Wiz_Fire 0x80A496A0:
+    ovl_En_Wiz_Fire :
     {
         build/asm/ovl_En_Wiz_Fire_0x80A496A0.o(.text)
     }
 
-    ovl_Eff_Change 0x80A4C490:
+    ovl_Eff_Change :
     {
         build/asm/ovl_Eff_Change_0x80A4C490.o(.text)
     }
 
-    ovl_Dm_Statue 0x80A4C9B0:
+    ovl_Dm_Statue :
     {
         build/asm/ovl_Dm_Statue_0x80A4C9B0.o(.text)
     }
 
-    ovl_Obj_Fireshield 0x80A4CA90:
+    ovl_Obj_Fireshield :
     {
         build/asm/ovl_Obj_Fireshield_0x80A4CA90.o(.text)
     }
 
-    ovl_Bg_Ladder 0x80A4D9F0:
+    ovl_Bg_Ladder :
     {
         build/asm/ovl_Bg_Ladder_0x80A4D9F0.o(.text)
     }
 
-    ovl_En_Mkk 0x80A4DED0:
+    ovl_En_Mkk :
     {
         build/asm/ovl_En_Mkk_0x80A4DED0.o(.text)
     }
 
-    ovl_Demo_Getitem 0x80A4FA40:
+    ovl_Demo_Getitem :
     {
         build/asm/ovl_Demo_Getitem_0x80A4FA40.o(.text)
     }
 
-    ovl_En_Dnb 0x80A4FDD0:
+    ovl_En_Dnb :
     {
         build/asm/ovl_En_Dnb_0x80A4FDD0.o(.text)
     }
 
-    ovl_En_Dnh 0x80A50D40:
+    ovl_En_Dnh :
     {
         build/asm/ovl_En_Dnh_0x80A50D40.o(.text)
     }
 
-    ovl_En_Dnk 0x80A514F0:
+    ovl_En_Dnk :
     {
         build/asm/ovl_En_Dnk_0x80A514F0.o(.text)
     }
 
-    ovl_En_Dnq 0x80A52530:
+    ovl_En_Dnq :
     {
         build/asm/ovl_En_Dnq_0x80A52530.o(.text)
     }
 
-    ovl_Bg_Keikoku_Saku 0x80A537D0:
+    ovl_Bg_Keikoku_Saku :
     {
         build/asm/ovl_Bg_Keikoku_Saku_0x80A537D0.o(.text)
     }
 
-    ovl_Obj_Hugebombiwa 0x80A53BE0:
+    ovl_Obj_Hugebombiwa :
     {
         build/asm/ovl_Obj_Hugebombiwa_0x80A53BE0.o(.text)
     }
 
-    ovl_En_Firefly2 0x80A560C0:
+    ovl_En_Firefly2 :
     {
         build/asm/ovl_En_Firefly2_0x80A560C0.o(.text)
     }
 
-    ovl_En_Rat 0x80A56150:
+    ovl_En_Rat :
     {
         build/asm/ovl_En_Rat_0x80A56150.o(.text)
     }
 
-    ovl_En_Water_Effect 0x80A587A0:
+    ovl_En_Water_Effect :
     {
         build/asm/ovl_En_Water_Effect_0x80A587A0.o(.text)
     }
 
-    ovl_En_Kusa2 0x80A5B160:
+    ovl_En_Kusa2 :
     {
         build/asm/ovl_En_Kusa2_0x80A5B160.o(.text)
+        . += 0x1960;
     }
 
-    ovl_Bg_Spout_Fire 0x80A60B20:
+    ovl_Bg_Spout_Fire :
     {
         build/asm/ovl_Bg_Spout_Fire_0x80A60B20.o(.text)
     }
 
-    ovl_En_Dy_Extra 0x80A612B0:
+    ovl_En_Dy_Extra :
     {
         build/asm/ovl_En_Dy_Extra_0x80A612B0.o(.text)
     }
 
-    ovl_En_Bal 0x80A61810:
+    ovl_En_Bal :
     {
         build/asm/ovl_En_Bal_0x80A61810.o(.text)
     }
 
-    ovl_En_Ginko_Man 0x80A644A0:
+    ovl_En_Ginko_Man :
     {
         build/asm/ovl_En_Ginko_Man_0x80A644A0.o(.text)
     }
 
-    ovl_En_Warp_Uzu 0x80A66180:
+    ovl_En_Warp_Uzu :
     {
         build/asm/ovl_En_Warp_Uzu_0x80A66180.o(.text)
     }
 
-    ovl_Obj_Driftice 0x80A66570:
+    ovl_Obj_Driftice :
     {
         build/asm/ovl_Obj_Driftice_0x80A66570.o(.text)
     }
 
-    ovl_En_Look_Nuts 0x80A678B0:
+    ovl_En_Look_Nuts :
     {
         build/asm/ovl_En_Look_Nuts_0x80A678B0.o(.text)
     }
 
-    ovl_En_Mushi2 0x80A687A0:
+    ovl_En_Mushi2 :
     {
         build/asm/ovl_En_Mushi2_0x80A687A0.o(.text)
     }
 
-    ovl_En_Fall 0x80A6BF90:
+    ovl_En_Fall :
     {
         build/asm/ovl_En_Fall_0x80A6BF90.o(.text)
+        . += 0x710;
     }
 
-    ovl_En_Mm3 0x80A6F0A0:
+    ovl_En_Mm3 :
     {
         build/asm/ovl_En_Mm3_0x80A6F0A0.o(.text)
     }
 
-    ovl_Bg_Crace_Movebg 0x80A706F0:
+    ovl_Bg_Crace_Movebg :
     {
         build/asm/ovl_Bg_Crace_Movebg_0x80A706F0.o(.text)
+        . += 0x20;
     }
 
-    ovl_En_Dno 0x80A711D0:
+    ovl_En_Dno :
     {
         build/asm/ovl_En_Dno_0x80A711D0.o(.text)
     }
 
-    ovl_En_Pr2 0x80A73FA0:
+    ovl_En_Pr2 :
     {
         build/asm/ovl_En_Pr2_0x80A73FA0.o(.text)
     }
 
-    ovl_En_Prz 0x80A75DC0:
+    ovl_En_Prz :
     {
         build/asm/ovl_En_Prz_0x80A75DC0.o(.text)
     }
 
-    ovl_En_Jso2 0x80A773C0:
+    ovl_En_Jso2 :
     {
         build/asm/ovl_En_Jso2_0x80A773C0.o(.text)
     }
 
-    ovl_Obj_Etcetera 0x80A7BC70:
+    ovl_Obj_Etcetera :
     {
         build/asm/ovl_Obj_Etcetera_0x80A7BC70.o(.text)
     }
 
-    ovl_En_Egol 0x80A7C990:
+    ovl_En_Egol :
     {
         build/asm/ovl_En_Egol_0x80A7C990.o(.text)
     }
 
-    ovl_Obj_Mine 0x80A811D0:
+    ovl_Obj_Mine :
     {
         build/asm/ovl_Obj_Mine_0x80A811D0.o(.text)
+        . += 0x300;
     }
 
-    ovl_Obj_Purify 0x80A84CD0:
+    ovl_Obj_Purify :
     {
         build/asm/ovl_Obj_Purify_0x80A84CD0.o(.text)
     }
 
-    ovl_En_Tru 0x80A85620:
+    ovl_En_Tru :
     {
         build/asm/ovl_En_Tru_0x80A85620.o(.text)
     }
 
-    ovl_En_Trt 0x80A8B770:
+    ovl_En_Trt :
     {
         build/asm/ovl_En_Trt_0x80A8B770.o(.text)
     }
 
-    ovl_En_Test5 0x80A903B0:
+    ovl_En_Test5 :
     {
         build/asm/ovl_En_Test5_0x80A903B0.o(.text)
     }
 
-    ovl_En_Test6 0x80A90730:
+    ovl_En_Test6 :
     {
         build/asm/ovl_En_Test6_0x80A90730.o(.text)
+        . += 0x120;
     }
 
-    ovl_En_Az 0x80A94A30:
+    ovl_En_Az :
     {
         build/asm/ovl_En_Az_0x80A94A30.o(.text)
+        . += 0x20;
     }
 
-    ovl_En_Estone 0x80A99EA0:
+    ovl_En_Estone :
     {
         build/asm/ovl_En_Estone_0x80A99EA0.o(.text)
     }
 
-    ovl_Bg_Hakugin_Post 0x80A9ACD0:
+    ovl_Bg_Hakugin_Post :
     {
         build/asm/ovl_Bg_Hakugin_Post_0x80A9ACD0.o(.text)
+        . += 0x1B90;
     }
 
-    ovl_Dm_Opstage 0x80A9F950:
+    ovl_Dm_Opstage :
     {
         build/asm/ovl_Dm_Opstage_0x80A9F950.o(.text)
     }
 
-    ovl_Dm_Stk 0x80A9FDB0:
+    ovl_Dm_Stk :
     {
         build/asm/ovl_Dm_Stk_0x80A9FDB0.o(.text)
     }
 
-    ovl_Dm_Char00 0x80AA5580:
+    ovl_Dm_Char00 :
     {
         build/asm/ovl_Dm_Char00_0x80AA5580.o(.text)
     }
 
-    ovl_Dm_Char01 0x80AA81E0:
+    ovl_Dm_Char01 :
     {
         build/asm/ovl_Dm_Char01_0x80AA81E0.o(.text)
+        . += 0x10;
     }
 
-    ovl_Dm_Char02 0x80AAAE30:
+    ovl_Dm_Char02 :
     {
         build/asm/ovl_Dm_Char02_0x80AAAE30.o(.text)
     }
 
-    ovl_Dm_Char03 0x80AAB4A0:
+    ovl_Dm_Char03 :
     {
         build/asm/ovl_Dm_Char03_0x80AAB4A0.o(.text)
     }
 
-    ovl_Dm_Char04 0x80AABC40:
+    ovl_Dm_Char04 :
     {
         build/asm/ovl_Dm_Char04_0x80AABC40.o(.text)
     }
 
-    ovl_Dm_Char05 0x80AAC5A0:
+    ovl_Dm_Char05 :
     {
         build/asm/ovl_Dm_Char05_0x80AAC5A0.o(.text)
     }
 
-    ovl_Dm_Char06 0x80AAE680:
+    ovl_Dm_Char06 :
     {
         build/asm/ovl_Dm_Char06_0x80AAE680.o(.text)
     }
 
-    ovl_Dm_Char07 0x80AAE9C0:
+    ovl_Dm_Char07 :
     {
         build/asm/ovl_Dm_Char07_0x80AAE9C0.o(.text)
     }
 
-    ovl_Dm_Char08 0x80AAF050:
+    ovl_Dm_Char08 :
     {
         build/asm/ovl_Dm_Char08_0x80AAF050.o(.text)
     }
 
-    ovl_Dm_Char09 0x80AB1E10:
+    ovl_Dm_Char09 :
     {
         build/asm/ovl_Dm_Char09_0x80AB1E10.o(.text)
     }
 
-    ovl_Obj_Tokeidai 0x80AB2790:
+    ovl_Obj_Tokeidai :
     {
         build/asm/ovl_Obj_Tokeidai_0x80AB2790.o(.text)
     }
 
-    ovl_En_Mnk 0x80AB4D10:
+    ovl_En_Mnk :
     {
         build/asm/ovl_En_Mnk_0x80AB4D10.o(.text)
     }
 
-    ovl_En_Egblock 0x80ABA7A0:
+    ovl_En_Egblock :
     {
         build/asm/ovl_En_Egblock_0x80ABA7A0.o(.text)
     }
 
-    ovl_En_Guard_Nuts 0x80ABB0E0:
+    ovl_En_Guard_Nuts :
     {
         build/asm/ovl_En_Guard_Nuts_0x80ABB0E0.o(.text)
     }
 
-    ovl_Bg_Hakugin_Bombwall 0x80ABBFC0:
+    ovl_Bg_Hakugin_Bombwall :
     {
         build/asm/ovl_Bg_Hakugin_Bombwall_0x80ABBFC0.o(.text)
     }
 
-    ovl_Obj_Tokei_Tobira 0x80ABD1D0:
+    ovl_Obj_Tokei_Tobira :
     {
         build/asm/ovl_Obj_Tokei_Tobira_0x80ABD1D0.o(.text)
     }
 
-    ovl_Bg_Hakugin_Elvpole 0x80ABD830:
+    ovl_Bg_Hakugin_Elvpole :
     {
         build/asm/ovl_Bg_Hakugin_Elvpole_0x80ABD830.o(.text)
     }
 
-    ovl_En_Ma4 0x80ABDCA0:
+    ovl_En_Ma4 :
     {
         build/asm/ovl_En_Ma4_0x80ABDCA0.o(.text)
     }
 
-    ovl_En_Twig 0x80AC0830:
+    ovl_En_Twig :
     {
         build/asm/ovl_En_Twig_0x80AC0830.o(.text)
+        . += 0x40;
     }
 
-    ovl_En_Po_Fusen 0x80AC1270:
+    ovl_En_Po_Fusen :
     {
         build/asm/ovl_En_Po_Fusen_0x80AC1270.o(.text)
     }
 
-    ovl_En_Door_Etc 0x80AC1ED0:
+    ovl_En_Door_Etc :
     {
         build/asm/ovl_En_Door_Etc_0x80AC1ED0.o(.text)
     }
 
-    ovl_En_Bigokuta 0x80AC26F0:
+    ovl_En_Bigokuta :
     {
         build/asm/ovl_En_Bigokuta_0x80AC26F0.o(.text)
     }
 
-    ovl_Bg_Icefloe 0x80AC48F0:
+    ovl_Bg_Icefloe :
     {
         build/asm/ovl_Bg_Icefloe_0x80AC48F0.o(.text)
+        . += 0x10;
     }
 
-    f385_0x00cfc450 0x80AC5070:
+    f385_0x00cfc450 :
     {
         build/asm/385_0x00cfc450_0x80AC5070.o(.text)
     }
 
-    f386_0x00cfc970 0x80AC57B0:
+    f386_0x00cfc970 :
     {
         build/asm/386_0x00cfc970_0x80AC57B0.o(.text)
     }
 
-    f387_0x00cfd400 0x80AC6740:
+    f387_0x00cfd400 :
     {
         build/asm/387_0x00cfd400_0x80AC6740.o(.text)
     }
 
-    f388_0x00cfdf10 0x80AC8430:
+    f388_0x00cfdf10 :
     {
         build/asm/388_0x00cfdf10_0x80AC8430.o(.text)
     }
 
-    f389_0x00cfe150 0x80AC86F0:
+    f389_0x00cfe150 :
     {
         build/asm/389_0x00cfe150_0x80AC86F0.o(.text)
     }
 
-    ovl_Effect_Ss_Sbn 0x80AC8B50:
+    ovl_Effect_Ss_Sbn :
     {
         build/asm/ovl_Effect_Ss_Sbn_0x80AC8B50.o(.text)
     }
 
-    ovl_Obj_Ocarinalift 0x80AC94C0:
+    ovl_Obj_Ocarinalift :
     {
         build/asm/ovl_Obj_Ocarinalift_0x80AC94C0.o(.text)
     }
 
-    ovl_En_Time_Tag 0x80AC9EA0:
+    ovl_En_Time_Tag :
     {
         build/asm/ovl_En_Time_Tag_0x80AC9EA0.o(.text)
     }
 
-    ovl_Bg_Open_Shutter 0x80ACAB10:
+    ovl_Bg_Open_Shutter :
     {
         build/asm/ovl_Bg_Open_Shutter_0x80ACAB10.o(.text)
     }
 
-    ovl_Bg_Open_Spot 0x80ACB1E0:
+    ovl_Bg_Open_Spot :
     {
         build/asm/ovl_Bg_Open_Spot_0x80ACB1E0.o(.text)
     }
 
-    ovl_Bg_Fu_Kaiten 0x80ACB400:
+    ovl_Bg_Fu_Kaiten :
     {
         build/asm/ovl_Bg_Fu_Kaiten_0x80ACB400.o(.text)
     }
 
-    ovl_Obj_Aqua 0x80ACB6A0:
+    ovl_Obj_Aqua :
     {
         build/asm/ovl_Obj_Aqua_0x80ACB6A0.o(.text)
     }
 
-    ovl_En_Elforg 0x80ACC470:
+    ovl_En_Elforg :
     {
         build/asm/ovl_En_Elforg_0x80ACC470.o(.text)
     }
 
-    ovl_En_Elfbub 0x80ACDCD0:
+    ovl_En_Elfbub :
     {
         build/asm/ovl_En_Elfbub_0x80ACDCD0.o(.text)
     }
 
-    ovl_En_Fu_Mato 0x80ACE330:
+    ovl_En_Fu_Mato :
     {
         build/asm/ovl_En_Fu_Mato_0x80ACE330.o(.text)
     }
 
-    ovl_En_Fu_Kago 0x80ACF780:
+    ovl_En_Fu_Kago :
     {
         build/asm/ovl_En_Fu_Kago_0x80ACF780.o(.text)
     }
 
-    ovl_En_Osn 0x80AD0830:
+    ovl_En_Osn :
     {
         build/asm/ovl_En_Osn_0x80AD0830.o(.text)
     }
 
-    ovl_Bg_Ctower_Gear 0x80AD2B70:
+    ovl_Bg_Ctower_Gear :
     {
         build/asm/ovl_Bg_Ctower_Gear_0x80AD2B70.o(.text)
     }
 
-    ovl_En_Trt2 0x80AD3380:
+    ovl_En_Trt2 :
     {
         build/asm/ovl_En_Trt2_0x80AD3380.o(.text)
     }
 
-    ovl_Obj_Tokei_Step 0x80AD5BB0:
+    ovl_Obj_Tokei_Step :
     {
         build/asm/ovl_Obj_Tokei_Step_0x80AD5BB0.o(.text)
     }
 
-    ovl_Bg_Lotus 0x80AD6760:
+    ovl_Bg_Lotus :
     {
         build/asm/ovl_Bg_Lotus_0x80AD6760.o(.text)
     }
 
-    ovl_En_Kame 0x80AD6DD0:
+    ovl_En_Kame :
     {
         build/asm/ovl_En_Kame_0x80AD6DD0.o(.text)
     }
 
-    ovl_Obj_Takaraya_Wall 0x80AD9240:
+    ovl_Obj_Takaraya_Wall :
     {
         build/asm/ovl_Obj_Takaraya_Wall_0x80AD9240.o(.text)
+        . += 0x6A0;
     }
 
-    ovl_Bg_Fu_Mizu 0x80ADAAF0:
+    ovl_Bg_Fu_Mizu :
     {
         build/asm/ovl_Bg_Fu_Mizu_0x80ADAAF0.o(.text)
     }
 
-    ovl_En_Sellnuts 0x80ADADD0:
+    ovl_En_Sellnuts :
     {
         build/asm/ovl_En_Sellnuts_0x80ADADD0.o(.text)
     }
 
-    ovl_Bg_Dkjail_Ivy 0x80ADE230:
+    ovl_Bg_Dkjail_Ivy :
     {
         build/asm/ovl_Bg_Dkjail_Ivy_0x80ADE230.o(.text)
     }
 
-    ovl_Obj_Visiblock 0x80ADEA70:
+    ovl_Obj_Visiblock :
     {
         build/asm/ovl_Obj_Visiblock_0x80ADEA70.o(.text)
     }
 
-    ovl_En_Takaraya 0x80ADEB90:
+    ovl_En_Takaraya :
     {
         build/asm/ovl_En_Takaraya_0x80ADEB90.o(.text)
     }
 
-    ovl_En_Tsn 0x80ADFCA0:
+    ovl_En_Tsn :
     {
         build/asm/ovl_En_Tsn_0x80ADFCA0.o(.text)
     }
 
-    ovl_En_Ds2n 0x80AE1650:
+    ovl_En_Ds2n :
     {
         build/asm/ovl_En_Ds2n_0x80AE1650.o(.text)
     }
 
-    ovl_En_Fsn 0x80AE1B70:
+    ovl_En_Fsn :
     {
         build/asm/ovl_En_Fsn_0x80AE1B70.o(.text)
     }
 
-    ovl_En_Shn 0x80AE6130:
+    ovl_En_Shn :
     {
         build/asm/ovl_En_Shn_0x80AE6130.o(.text)
     }
 
-    ovl_En_Stop_heishi 0x80AE73A0:
+    ovl_En_Stop_heishi :
     {
         build/asm/ovl_En_Stop_heishi_0x80AE73A0.o(.text)
     }
 
-    ovl_Obj_Bigicicle 0x80AE8B70:
+    ovl_Obj_Bigicicle :
     {
         build/asm/ovl_Obj_Bigicicle_0x80AE8B70.o(.text)
     }
 
-    ovl_En_Lift_Nuts 0x80AE9A20:
+    ovl_En_Lift_Nuts :
     {
         build/asm/ovl_En_Lift_Nuts_0x80AE9A20.o(.text)
     }
 
-    ovl_En_Tk 0x80AEC460:
+    ovl_En_Tk :
     {
         build/asm/ovl_En_Tk_0x80AEC460.o(.text)
+        . += 0x10;
     }
 
-    ovl_Bg_Market_Step 0x80AF0060:
+    ovl_Bg_Market_Step :
     {
         build/asm/ovl_Bg_Market_Step_0x80AF0060.o(.text)
     }
 
-    ovl_Obj_Lupygamelift 0x80AF0170:
+    ovl_Obj_Lupygamelift :
     {
         build/asm/ovl_Obj_Lupygamelift_0x80AF0170.o(.text)
     }
 
-    ovl_En_Test7 0x80AF0820:
+    ovl_En_Test7 :
     {
         build/asm/ovl_En_Test7_0x80AF0820.o(.text)
+        . += 0x60;
     }
 
-    ovl_Obj_Lightblock 0x80AF3910:
+    ovl_Obj_Lightblock :
     {
         build/asm/ovl_Obj_Lightblock_0x80AF3910.o(.text)
     }
 
-    ovl_Mir_Ray2 0x80AF3F70:
+    ovl_Mir_Ray2 :
     {
         build/asm/ovl_Mir_Ray2_0x80AF3F70.o(.text)
     }
 
-    ovl_En_Wdhand 0x80AF43F0:
+    ovl_En_Wdhand :
     {
         build/asm/ovl_En_Wdhand_0x80AF43F0.o(.text)
     }
 
-    ovl_En_Gamelupy 0x80AF6760:
+    ovl_En_Gamelupy :
     {
         build/asm/ovl_En_Gamelupy_0x80AF6760.o(.text)
     }
 
-    ovl_Bg_Danpei_Movebg 0x80AF6DE0:
+    ovl_Bg_Danpei_Movebg :
     {
         build/asm/ovl_Bg_Danpei_Movebg_0x80AF6DE0.o(.text)
     }
 
-    ovl_En_Snowwd 0x80AF7640:
+    ovl_En_Snowwd :
     {
         build/asm/ovl_En_Snowwd_0x80AF7640.o(.text)
     }
 
-    ovl_En_Pm 0x80AF7B40:
+    ovl_En_Pm :
     {
         build/asm/ovl_En_Pm_0x80AF7B40.o(.text)
     }
 
-    ovl_En_Gakufu 0x80AFC960:
+    ovl_En_Gakufu :
     {
         build/asm/ovl_En_Gakufu_0x80AFC960.o(.text)
     }
 
-    ovl_Elf_Msg4 0x80AFD380:
+    ovl_Elf_Msg4 :
     {
         build/asm/ovl_Elf_Msg4_0x80AFD380.o(.text)
     }
 
-    ovl_Elf_Msg5 0x80AFD990:
+    ovl_Elf_Msg5 :
     {
         build/asm/ovl_Elf_Msg5_0x80AFD990.o(.text)
     }
 
-    ovl_En_Col_Man 0x80AFDC40:
+    ovl_En_Col_Man :
     {
         build/asm/ovl_En_Col_Man_0x80AFDC40.o(.text)
     }
 
-    ovl_En_Talk_Gibud 0x80AFE8A0:
+    ovl_En_Talk_Gibud :
     {
         build/asm/ovl_En_Talk_Gibud_0x80AFE8A0.o(.text)
     }
 
-    ovl_En_Giant 0x80B01990:
+    ovl_En_Giant :
     {
         build/asm/ovl_En_Giant_0x80B01990.o(.text)
     }
 
-    ovl_Obj_Snowball 0x80B02CD0:
+    ovl_Obj_Snowball :
     {
         build/asm/ovl_Obj_Snowball_0x80B02CD0.o(.text)
     }
 
-    ovl_Boss_Hakugin 0x80B05290:
+    ovl_Boss_Hakugin :
     {
         build/asm/ovl_Boss_Hakugin_0x80B05290.o(.text)
     }
 
-    ovl_En_Gb2 0x80B0F5E0:
+    ovl_En_Gb2 :
     {
         build/asm/ovl_En_Gb2_0x80B0F5E0.o(.text)
     }
 
-    ovl_En_Onpuman 0x80B11E60:
+    ovl_En_Onpuman :
     {
         build/asm/ovl_En_Onpuman_0x80B11E60.o(.text)
     }
 
-    ovl_Bg_Tobira01 0x80B12430:
+    ovl_Bg_Tobira01 :
     {
         build/asm/ovl_Bg_Tobira01_0x80B12430.o(.text)
     }
 
-    ovl_En_Tag_Obj 0x80B12870:
+    ovl_En_Tag_Obj :
     {
         build/asm/ovl_En_Tag_Obj_0x80B12870.o(.text)
     }
 
-    ovl_Obj_Dhouse 0x80B12980:
+    ovl_Obj_Dhouse :
     {
         build/asm/ovl_Obj_Dhouse_0x80B12980.o(.text)
     }
 
-    ovl_Obj_Hakaisi 0x80B14180:
+    ovl_Obj_Hakaisi :
     {
         build/asm/ovl_Obj_Hakaisi_0x80B14180.o(.text)
     }
 
-    ovl_Bg_Hakugin_Switch 0x80B15790:
+    ovl_Bg_Hakugin_Switch :
     {
         build/asm/ovl_Bg_Hakugin_Switch_0x80B15790.o(.text)
+        . += 0x10;
     }
 
-    ovl_En_Snowman 0x80B16B00:
+    ovl_En_Snowman :
     {
         build/asm/ovl_En_Snowman_0x80B16B00.o(.text)
     }
 
-    ovl_TG_Sw 0x80B19F60:
+    ovl_TG_Sw :
     {
         build/asm/ovl_TG_Sw_0x80B19F60.o(.text)
     }
 
-    ovl_En_Po_Sisters 0x80B1A3B0:
+    ovl_En_Po_Sisters :
     {
         build/asm/ovl_En_Po_Sisters_0x80B1A3B0.o(.text)
     }
 
-    ovl_En_Pp 0x80B1DEB0:
+    ovl_En_Pp :
     {
         build/asm/ovl_En_Pp_0x80B1DEB0.o(.text)
     }
 
-    ovl_En_Hakurock 0x80B21B00:
+    ovl_En_Hakurock :
     {
         build/asm/ovl_En_Hakurock_0x80B21B00.o(.text)
     }
 
-    ovl_En_Hanabi 0x80B22C00:
+    ovl_En_Hanabi :
     {
         build/asm/ovl_En_Hanabi_0x80B22C00.o(.text)
     }
 
-    ovl_Obj_Dowsing 0x80B23D50:
+    ovl_Obj_Dowsing :
     {
         build/asm/ovl_Obj_Dowsing_0x80B23D50.o(.text)
     }
 
-    ovl_Obj_Wind 0x80B23ED0:
+    ovl_Obj_Wind :
     {
         build/asm/ovl_Obj_Wind_0x80B23ED0.o(.text)
     }
 
-    ovl_En_Racedog 0x80B24630:
+    ovl_En_Racedog :
     {
         build/asm/ovl_En_Racedog_0x80B24630.o(.text)
     }
 
-    ovl_En_Kendo_Js 0x80B262A0:
+    ovl_En_Kendo_Js :
     {
         build/asm/ovl_En_Kendo_Js_0x80B262A0.o(.text)
     }
 
-    ovl_Bg_Botihasira 0x80B28080:
+    ovl_Bg_Botihasira :
     {
         build/asm/ovl_Bg_Botihasira_0x80B28080.o(.text)
     }
 
-    ovl_En_Fish2 0x80B28370:
+    ovl_En_Fish2 :
     {
         build/asm/ovl_En_Fish2_0x80B28370.o(.text)
     }
 
-    ovl_En_Pst 0x80B2B830:
+    ovl_En_Pst :
     {
         build/asm/ovl_En_Pst_0x80B2B830.o(.text)
     }
 
-    ovl_En_Poh 0x80B2C6F0:
+    ovl_En_Poh :
     {
         build/asm/ovl_En_Poh_0x80B2C6F0.o(.text)
     }
 
-    ovl_Obj_Spidertent 0x80B2FB10:
+    ovl_Obj_Spidertent :
     {
         build/asm/ovl_Obj_Spidertent_0x80B2FB10.o(.text)
     }
 
-    ovl_En_Zoraegg 0x80B31590:
+    ovl_En_Zoraegg :
     {
         build/asm/ovl_En_Zoraegg_0x80B31590.o(.text)
     }
 
-    ovl_En_Kbt 0x80B33D30:
+    ovl_En_Kbt :
     {
         build/asm/ovl_En_Kbt_0x80B33D30.o(.text)
     }
 
-    ovl_En_Gg 0x80B34F70:
+    ovl_En_Gg :
     {
         build/asm/ovl_En_Gg_0x80B34F70.o(.text)
     }
 
-    ovl_En_Maruta 0x80B37080:
+    ovl_En_Maruta :
     {
         build/asm/ovl_En_Maruta_0x80B37080.o(.text)
     }
 
-    ovl_Obj_Snowball2 0x80B38E20:
+    ovl_Obj_Snowball2 :
     {
         build/asm/ovl_Obj_Snowball2_0x80B38E20.o(.text)
     }
 
-    ovl_En_Gg2 0x80B3AC50:
+    ovl_En_Gg2 :
     {
         build/asm/ovl_En_Gg2_0x80B3AC50.o(.text)
     }
 
-    ovl_Obj_Ghaka 0x80B3C260:
+    ovl_Obj_Ghaka :
     {
         build/asm/ovl_Obj_Ghaka_0x80B3C260.o(.text)
     }
 
-    ovl_En_Dnp 0x80B3CA20:
+    ovl_En_Dnp :
     {
         build/asm/ovl_En_Dnp_0x80B3CA20.o(.text)
     }
 
-    ovl_En_Dai 0x80B3DFF0:
+    ovl_En_Dai :
     {
         build/asm/ovl_En_Dai_0x80B3DFF0.o(.text)
     }
 
-    ovl_Bg_Goron_Oyu 0x80B40080:
+    ovl_Bg_Goron_Oyu :
     {
         build/asm/ovl_Bg_Goron_Oyu_0x80B40080.o(.text)
     }
 
-    ovl_En_Kgy 0x80B40800:
+    ovl_En_Kgy :
     {
         build/asm/ovl_En_Kgy_0x80B40800.o(.text)
     }
 
-    ovl_En_Invadepoh 0x80B439B0:
+    ovl_En_Invadepoh :
     {
         build/asm/ovl_En_Invadepoh_0x80B439B0.o(.text)
+        . += 0x170;
     }
 
-    ovl_En_Gk 0x80B50410:
+    ovl_En_Gk :
     {
         build/asm/ovl_En_Gk_0x80B50410.o(.text)
     }
 
-    ovl_En_An 0x80B53840:
+    ovl_En_An :
     {
         build/asm/ovl_En_An_0x80B53840.o(.text)
     }
 
-    ovl_En_Bee 0x80B5A720:
+    ovl_En_Bee :
     {
         build/asm/ovl_En_Bee_0x80B5A720.o(.text)
     }
 
-    ovl_En_Ot 0x80B5B2E0:
+    ovl_En_Ot :
     {
         build/asm/ovl_En_Ot_0x80B5B2E0.o(.text)
+        . += 0x10;
     }
 
-    ovl_En_Dragon 0x80B5E890:
+    ovl_En_Dragon :
     {
         build/asm/ovl_En_Dragon_0x80B5E890.o(.text)
     }
 
-    ovl_Obj_Dora 0x80B60AD0:
+    ovl_Obj_Dora :
     {
         build/asm/ovl_Obj_Dora_0x80B60AD0.o(.text)
     }
 
-    ovl_En_Bigpo 0x80B615E0:
+    ovl_En_Bigpo :
     {
         build/asm/ovl_En_Bigpo_0x80B615E0.o(.text)
     }
 
-    ovl_Obj_Kendo_Kanban 0x80B654C0:
+    ovl_Obj_Kendo_Kanban :
     {
         build/asm/ovl_Obj_Kendo_Kanban_0x80B654C0.o(.text)
     }
 
-    ovl_Obj_Hariko 0x80B66A20:
+    ovl_Obj_Hariko :
     {
         build/asm/ovl_Obj_Hariko_0x80B66A20.o(.text)
     }
 
-    ovl_En_Sth 0x80B66D30:
+    ovl_En_Sth :
     {
         build/asm/ovl_En_Sth_0x80B66D30.o(.text)
     }
 
-    ovl_Bg_Sinkai_Kabe 0x80B6D660:
+    ovl_Bg_Sinkai_Kabe :
     {
         build/asm/ovl_Bg_Sinkai_Kabe_0x80B6D660.o(.text)
     }
 
-    ovl_Bg_Haka_Curtain 0x80B6DBE0:
+    ovl_Bg_Haka_Curtain :
     {
         build/asm/ovl_Bg_Haka_Curtain_0x80B6DBE0.o(.text)
     }
 
-    ovl_Bg_Kin2_Bombwall 0x80B6E020:
+    ovl_Bg_Kin2_Bombwall :
     {
         build/asm/ovl_Bg_Kin2_Bombwall_0x80B6E020.o(.text)
     }
 
-    ovl_Bg_Kin2_Fence 0x80B6E820:
+    ovl_Bg_Kin2_Fence :
     {
         build/asm/ovl_Bg_Kin2_Fence_0x80B6E820.o(.text)
     }
 
-    ovl_Bg_Kin2_Picture 0x80B6EFA0:
+    ovl_Bg_Kin2_Picture :
     {
         build/asm/ovl_Bg_Kin2_Picture_0x80B6EFA0.o(.text)
     }
 
-    ovl_Bg_Kin2_Shelf 0x80B6FB30:
+    ovl_Bg_Kin2_Shelf :
     {
         build/asm/ovl_Bg_Kin2_Shelf_0x80B6FB30.o(.text)
     }
 
-    ovl_En_Rail_Skb 0x80B708C0:
+    ovl_En_Rail_Skb :
     {
         build/asm/ovl_En_Rail_Skb_0x80B708C0.o(.text)
     }
 
-    ovl_En_Jg 0x80B73A90:
+    ovl_En_Jg :
     {
         build/asm/ovl_En_Jg_0x80B73A90.o(.text)
     }
 
-    ovl_En_Tru_Mt 0x80B76030:
+    ovl_En_Tru_Mt :
     {
         build/asm/ovl_En_Tru_Mt_0x80B76030.o(.text)
     }
 
-    ovl_Obj_Um 0x80B77770:
+    ovl_Obj_Um :
     {
         build/asm/ovl_Obj_Um_0x80B77770.o(.text)
     }
 
-    ovl_En_Neo_Reeba 0x80B7C890:
+    ovl_En_Neo_Reeba :
     {
         build/asm/ovl_En_Neo_Reeba_0x80B7C890.o(.text)
     }
 
-    ovl_Bg_Mbar_Chair 0x80B7E930:
+    ovl_Bg_Mbar_Chair :
     {
         build/asm/ovl_Bg_Mbar_Chair_0x80B7E930.o(.text)
     }
 
-    ovl_Bg_Ikana_Block 0x80B7EA60:
+    ovl_Bg_Ikana_Block :
     {
         build/asm/ovl_Bg_Ikana_Block_0x80B7EA60.o(.text)
     }
 
-    ovl_Bg_Ikana_Mirror 0x80B7F730:
+    ovl_Bg_Ikana_Mirror :
     {
         build/asm/ovl_Bg_Ikana_Mirror_0x80B7F730.o(.text)
     }
 
-    ovl_Bg_Ikana_Rotaryroom 0x80B802E0:
+    ovl_Bg_Ikana_Rotaryroom :
     {
         build/asm/ovl_Bg_Ikana_Rotaryroom_0x80B802E0.o(.text)
     }
 
-    ovl_Bg_Dblue_Balance 0x80B823B0:
+    ovl_Bg_Dblue_Balance :
     {
         build/asm/ovl_Bg_Dblue_Balance_0x80B823B0.o(.text)
+        . += 0x10;
     }
 
-    ovl_Bg_Dblue_Waterfall 0x80B83C80:
+    ovl_Bg_Dblue_Waterfall :
     {
         build/asm/ovl_Bg_Dblue_Waterfall_0x80B83C80.o(.text)
     }
 
-    ovl_En_Kaizoku 0x80B85590:
+    ovl_En_Kaizoku :
     {
         build/asm/ovl_En_Kaizoku_0x80B85590.o(.text)
     }
 
-    ovl_En_Ge2 0x80B8B2D0:
+    ovl_En_Ge2 :
     {
         build/asm/ovl_En_Ge2_0x80B8B2D0.o(.text)
     }
 
-    ovl_En_Ma_Yts 0x80B8D030:
+    ovl_En_Ma_Yts :
     {
         build/asm/ovl_En_Ma_Yts_0x80B8D030.o(.text)
     }
 
-    ovl_En_Ma_Yto 0x80B8E520:
+    ovl_En_Ma_Yto :
     {
         build/asm/ovl_En_Ma_Yto_0x80B8E520.o(.text)
     }
 
-    ovl_Obj_Tokei_Turret 0x80B91CC0:
+    ovl_Obj_Tokei_Turret :
     {
         build/asm/ovl_Obj_Tokei_Turret_0x80B91CC0.o(.text)
     }
 
-    ovl_Bg_Dblue_Elevator 0x80B91F20:
+    ovl_Bg_Dblue_Elevator :
     {
         build/asm/ovl_Bg_Dblue_Elevator_0x80B91F20.o(.text)
     }
 
-    ovl_Obj_Warpstone 0x80B92B10:
+    ovl_Obj_Warpstone :
     {
         build/asm/ovl_Obj_Warpstone_0x80B92B10.o(.text)
     }
 
-    ovl_En_Zog 0x80B93310:
+    ovl_En_Zog :
     {
         build/asm/ovl_En_Zog_0x80B93310.o(.text)
+        . += 0x10;
     }
 
-    ovl_Obj_Rotlift 0x80B95E20:
+    ovl_Obj_Rotlift :
     {
         build/asm/ovl_Obj_Rotlift_0x80B95E20.o(.text)
     }
 
-    ovl_Obj_Jg_Gakki 0x80B961E0:
+    ovl_Obj_Jg_Gakki :
     {
         build/asm/ovl_Obj_Jg_Gakki_0x80B961E0.o(.text)
     }
 
-    ovl_Bg_Inibs_Movebg 0x80B96410:
+    ovl_Bg_Inibs_Movebg :
     {
         build/asm/ovl_Bg_Inibs_Movebg_0x80B96410.o(.text)
     }
 
-    ovl_En_Zot 0x80B965D0:
+    ovl_En_Zot :
     {
         build/asm/ovl_En_Zot_0x80B965D0.o(.text)
     }
 
-    ovl_Obj_Tree 0x80B9A0B0:
+    ovl_Obj_Tree :
     {
         build/asm/ovl_Obj_Tree_0x80B9A0B0.o(.text)
     }
 
-    ovl_Obj_Y2lift 0x80B9A650:
+    ovl_Obj_Y2lift :
     {
         build/asm/ovl_Obj_Y2lift_0x80B9A650.o(.text)
     }
 
-    ovl_Obj_Y2shutter 0x80B9A980:
+    ovl_Obj_Y2shutter :
     {
         build/asm/ovl_Obj_Y2shutter_0x80B9A980.o(.text)
     }
 
-    ovl_Obj_Boat 0x80B9AF50:
+    ovl_Obj_Boat :
     {
         build/asm/ovl_Obj_Boat_0x80B9AF50.o(.text)
     }
 
-    ovl_Obj_Taru 0x80B9B6E0:
+    ovl_Obj_Taru :
     {
         build/asm/ovl_Obj_Taru_0x80B9B6E0.o(.text)
     }
 
-    ovl_Obj_Hunsui 0x80B9C450:
+    ovl_Obj_Hunsui :
     {
         build/asm/ovl_Obj_Hunsui_0x80B9C450.o(.text)
+        . += 0x10;
     }
 
-    ovl_En_Jc_Mato 0x80B9DEE0:
+    ovl_En_Jc_Mato :
     {
         build/asm/ovl_En_Jc_Mato_0x80B9DEE0.o(.text)
     }
 
-    ovl_Mir_Ray3 0x80B9E2C0:
+    ovl_Mir_Ray3 :
     {
         build/asm/ovl_Mir_Ray3_0x80B9E2C0.o(.text)
     }
 
-    ovl_En_Zob 0x80B9F570:
+    ovl_En_Zob :
     {
         build/asm/ovl_En_Zob_0x80B9F570.o(.text)
     }
 
-    ovl_Elf_Msg6 0x80BA15A0:
+    ovl_Elf_Msg6 :
     {
         build/asm/ovl_Elf_Msg6_0x80BA15A0.o(.text)
     }
 
-    ovl_Obj_Nozoki 0x80BA2420:
+    ovl_Obj_Nozoki :
     {
         build/asm/ovl_Obj_Nozoki_0x80BA2420.o(.text)
+        . += 0x10;
     }
 
-    ovl_En_Toto 0x80BA36C0:
+    ovl_En_Toto :
     {
         build/asm/ovl_En_Toto_0x80BA36C0.o(.text)
     }
 
-    ovl_En_Railgibud 0x80BA5400:
+    ovl_En_Railgibud :
     {
         build/asm/ovl_En_Railgibud_0x80BA5400.o(.text)
     }
 
-    ovl_En_Baba 0x80BA8820:
+    ovl_En_Baba :
     {
         build/asm/ovl_En_Baba_0x80BA8820.o(.text)
     }
 
-    ovl_En_Suttari 0x80BAA6D0:
+    ovl_En_Suttari :
     {
         build/asm/ovl_En_Suttari_0x80BAA6D0.o(.text)
     }
 
-    ovl_En_Zod 0x80BAEF70:
+    ovl_En_Zod :
     {
         build/asm/ovl_En_Zod_0x80BAEF70.o(.text)
     }
 
-    ovl_En_Kujiya 0x80BB08E0:
+    ovl_En_Kujiya :
     {
         build/asm/ovl_En_Kujiya_0x80BB08E0.o(.text)
     }
 
-    ovl_En_Geg 0x80BB16D0:
+    ovl_En_Geg :
     {
         build/asm/ovl_En_Geg_0x80BB16D0.o(.text)
     }
 
-    ovl_Obj_Kinoko 0x80BB4700:
+    ovl_Obj_Kinoko :
     {
         build/asm/ovl_Obj_Kinoko_0x80BB4700.o(.text)
     }
 
-    ovl_Obj_Yasi 0x80BB4AF0:
+    ovl_Obj_Yasi :
     {
         build/asm/ovl_Obj_Yasi_0x80BB4AF0.o(.text)
     }
 
-    ovl_En_Tanron1 0x80BB4E00:
+    ovl_En_Tanron1 :
     {
         build/asm/ovl_En_Tanron1_0x80BB4E00.o(.text)
     }
 
-    ovl_En_Tanron2 0x80BB67D0:
+    ovl_En_Tanron2 :
     {
         build/asm/ovl_En_Tanron2_0x80BB67D0.o(.text)
+        . += 0x150;
     }
 
-    ovl_En_Tanron3 0x80BB85A0:
+    ovl_En_Tanron3 :
     {
         build/asm/ovl_En_Tanron3_0x80BB85A0.o(.text)
     }
 
-    ovl_Obj_Chan 0x80BB98E0:
+    ovl_Obj_Chan :
     {
         build/asm/ovl_Obj_Chan_0x80BB98E0.o(.text)
+        . += 0x10;
     }
 
-    ovl_En_Zos 0x80BBACA0:
+    ovl_En_Zos :
     {
         build/asm/ovl_En_Zos_0x80BBACA0.o(.text)
     }
 
-    ovl_En_S_Goro 0x80BBCA80:
+    ovl_En_S_Goro :
     {
         build/asm/ovl_En_S_Goro_0x80BBCA80.o(.text)
     }
 
-    ovl_En_Nb 0x80BBFDB0:
+    ovl_En_Nb :
     {
         build/asm/ovl_En_Nb_0x80BBFDB0.o(.text)
     }
 
-    ovl_En_Ja 0x80BC1900:
+    ovl_En_Ja :
     {
         build/asm/ovl_En_Ja_0x80BC1900.o(.text)
     }
 
-    ovl_Bg_F40_Block 0x80BC3980:
+    ovl_Bg_F40_Block :
     {
         build/asm/ovl_Bg_F40_Block_0x80BC3980.o(.text)
     }
 
-    ovl_Bg_F40_Switch 0x80BC47B0:
+    ovl_Bg_F40_Switch :
     {
         build/asm/ovl_Bg_F40_Switch_0x80BC47B0.o(.text)
+        . += 0x10;
     }
 
-    ovl_En_Po_Composer 0x80BC4F30:
+    ovl_En_Po_Composer :
     {
         build/asm/ovl_En_Po_Composer_0x80BC4F30.o(.text)
     }
 
-    ovl_En_Guruguru 0x80BC6BF0:
+    ovl_En_Guruguru :
     {
         build/asm/ovl_En_Guruguru_0x80BC6BF0.o(.text)
     }
 
-    ovl_Oceff_Wipe5 0x80BC7AD0:
+    ovl_Oceff_Wipe5 :
     {
         build/asm/ovl_Oceff_Wipe5_0x80BC7AD0.o(.text)
+        . += 0x10;
     }
 
-    ovl_En_Stone_heishi 0x80BC9270:
+    ovl_En_Stone_heishi :
     {
         build/asm/ovl_En_Stone_heishi_0x80BC9270.o(.text)
     }
 
-    ovl_Oceff_Wipe6 0x80BCA5A0:
+    ovl_Oceff_Wipe6 :
     {
         build/asm/ovl_Oceff_Wipe6_0x80BCA5A0.o(.text)
     }
 
-    ovl_En_Scopenuts 0x80BCABF0:
+    ovl_En_Scopenuts :
     {
         build/asm/ovl_En_Scopenuts_0x80BCABF0.o(.text)
     }
 
-    ovl_En_Scopecrow 0x80BCD000:
+    ovl_En_Scopecrow :
     {
         build/asm/ovl_En_Scopecrow_0x80BCD000.o(.text)
     }
 
-    ovl_Oceff_Wipe7 0x80BCDCB0:
+    ovl_Oceff_Wipe7 :
     {
         build/asm/ovl_Oceff_Wipe7_0x80BCDCB0.o(.text)
+        . += 0x10;
     }
 
-    ovl_Eff_Kamejima_Wave 0x80BCEB20:
+    ovl_Eff_Kamejima_Wave :
     {
         build/asm/ovl_Eff_Kamejima_Wave_0x80BCEB20.o(.text)
+        . += 0x10;
     }
 
-    ovl_En_Hg 0x80BCF1D0:
+    ovl_En_Hg :
     {
         build/asm/ovl_En_Hg_0x80BCF1D0.o(.text)
     }
 
-    ovl_En_Hgo 0x80BD02B0:
+    ovl_En_Hgo :
     {
         build/asm/ovl_En_Hgo_0x80BD02B0.o(.text)
     }
 
-    ovl_En_Zov 0x80BD11E0:
+    ovl_En_Zov :
     {
         build/asm/ovl_En_Zov_0x80BD11E0.o(.text)
     }
 
-    ovl_En_Ah 0x80BD2A30:
+    ovl_En_Ah :
     {
         build/asm/ovl_En_Ah_0x80BD2A30.o(.text)
     }
 
-    ovl_Obj_Hgdoor 0x80BD4090:
+    ovl_Obj_Hgdoor :
     {
         build/asm/ovl_Obj_Hgdoor_0x80BD4090.o(.text)
     }
 
-    ovl_Bg_Ikana_Bombwall 0x80BD4720:
+    ovl_Bg_Ikana_Bombwall :
     {
         build/asm/ovl_Bg_Ikana_Bombwall_0x80BD4720.o(.text)
     }
 
-    ovl_Bg_Ikana_Ray 0x80BD53C0:
+    ovl_Bg_Ikana_Ray :
     {
         build/asm/ovl_Bg_Ikana_Ray_0x80BD53C0.o(.text)
     }
 
-    ovl_Bg_Ikana_Shutter 0x80BD5690:
+    ovl_Bg_Ikana_Shutter :
     {
         build/asm/ovl_Bg_Ikana_Shutter_0x80BD5690.o(.text)
     }
 
-    ovl_Bg_Haka_Bombwall 0x80BD5E00:
+    ovl_Bg_Haka_Bombwall :
     {
         build/asm/ovl_Bg_Haka_Bombwall_0x80BD5E00.o(.text)
     }
 
-    ovl_Bg_Haka_Tomb 0x80BD6580:
+    ovl_Bg_Haka_Tomb :
     {
         build/asm/ovl_Bg_Haka_Tomb_0x80BD6580.o(.text)
     }
 
-    ovl_En_Sc_Ruppe 0x80BD6910:
+    ovl_En_Sc_Ruppe :
     {
         build/asm/ovl_En_Sc_Ruppe_0x80BD6910.o(.text)
     }
 
-    ovl_Bg_Iknv_Doukutu 0x80BD6F10:
+    ovl_Bg_Iknv_Doukutu :
     {
         build/asm/ovl_Bg_Iknv_Doukutu_0x80BD6F10.o(.text)
     }
 
-    ovl_Bg_Iknv_Obj 0x80BD7AB0:
+    ovl_Bg_Iknv_Obj :
     {
         build/asm/ovl_Bg_Iknv_Obj_0x80BD7AB0.o(.text)
     }
 
-    ovl_En_Pamera 0x80BD82B0:
+    ovl_En_Pamera :
     {
         build/asm/ovl_En_Pamera_0x80BD82B0.o(.text)
     }
 
-    ovl_Obj_HsStump 0x80BDAA30:
+    ovl_Obj_HsStump :
     {
         build/asm/ovl_Obj_HsStump_0x80BDAA30.o(.text)
     }
 
-    ovl_En_Hidden_Nuts 0x80BDB040:
+    ovl_En_Hidden_Nuts :
     {
         build/asm/ovl_En_Hidden_Nuts_0x80BDB040.o(.text)
     }
 
-    ovl_En_Zow 0x80BDC270:
+    ovl_En_Zow :
     {
         build/asm/ovl_En_Zow_0x80BDC270.o(.text)
     }
 
-    ovl_En_Talk 0x80BDDFE0:
+    ovl_En_Talk :
     {
         build/asm/ovl_En_Talk_0x80BDDFE0.o(.text)
     }
 
-    ovl_En_Al 0x80BDE1A0:
+    ovl_En_Al :
     {
         build/asm/ovl_En_Al_0x80BDE1A0.o(.text)
     }
 
-    ovl_En_Tab 0x80BE04E0:
+    ovl_En_Tab :
     {
         build/asm/ovl_En_Tab_0x80BE04E0.o(.text)
     }
 
-    ovl_En_Nimotsu 0x80BE1C80:
+    ovl_En_Nimotsu :
     {
         build/asm/ovl_En_Nimotsu_0x80BE1C80.o(.text)
     }
 
-    ovl_En_Hit_Tag 0x80BE2030:
+    ovl_En_Hit_Tag :
     {
         build/asm/ovl_En_Hit_Tag_0x80BE2030.o(.text)
     }
 
-    ovl_En_Ruppecrow 0x80BE2260:
+    ovl_En_Ruppecrow :
     {
         build/asm/ovl_En_Ruppecrow_0x80BE2260.o(.text)
     }
 
-    ovl_En_Tanron4 0x80BE3B80:
+    ovl_En_Tanron4 :
     {
         build/asm/ovl_En_Tanron4_0x80BE3B80.o(.text)
     }
 
-    ovl_En_Tanron5 0x80BE4930:
+    ovl_En_Tanron5 :
     {
         build/asm/ovl_En_Tanron5_0x80BE4930.o(.text)
     }
 
-    ovl_En_Tanron6 0x80BE6040:
+    ovl_En_Tanron6 :
     {
         build/asm/ovl_En_Tanron6_0x80BE6040.o(.text)
     }
 
-    ovl_En_Daiku2 0x80BE61D0:
+    ovl_En_Daiku2 :
     {
         build/asm/ovl_En_Daiku2_0x80BE61D0.o(.text)
     }
 
-    ovl_En_Muto 0x80BE7B00:
+    ovl_En_Muto :
     {
         build/asm/ovl_En_Muto_0x80BE7B00.o(.text)
     }
 
-    ovl_En_Baisen 0x80BE84F0:
+    ovl_En_Baisen :
     {
         build/asm/ovl_En_Baisen_0x80BE84F0.o(.text)
     }
 
-    ovl_En_Heishi 0x80BE8F20:
+    ovl_En_Heishi :
     {
         build/asm/ovl_En_Heishi_0x80BE8F20.o(.text)
     }
 
-    ovl_En_Demo_heishi 0x80BE9510:
+    ovl_En_Demo_heishi :
     {
         build/asm/ovl_En_Demo_heishi_0x80BE9510.o(.text)
     }
 
-    ovl_En_Dt 0x80BE9B20:
+    ovl_En_Dt :
     {
         build/asm/ovl_En_Dt_0x80BE9B20.o(.text)
     }
 
-    ovl_En_Cha 0x80BEB520:
+    ovl_En_Cha :
     {
         build/asm/ovl_En_Cha_0x80BEB520.o(.text)
     }
 
-    ovl_Obj_Dinner 0x80BEB940:
+    ovl_Obj_Dinner :
     {
         build/asm/ovl_Obj_Dinner_0x80BEB940.o(.text)
     }
 
-    ovl_Eff_Lastday 0x80BEBAC0:
+    ovl_Eff_Lastday :
     {
         build/asm/ovl_Eff_Lastday_0x80BEBAC0.o(.text)
     }
 
-    ovl_Bg_Ikana_Dharma 0x80BEC240:
+    ovl_Bg_Ikana_Dharma :
     {
         build/asm/ovl_Bg_Ikana_Dharma_0x80BEC240.o(.text)
+        . += 0x10;
     }
 
-    ovl_En_Akindonuts 0x80BECBE0:
+    ovl_En_Akindonuts :
     {
         build/asm/ovl_En_Akindonuts_0x80BECBE0.o(.text)
     }
 
-    ovl_Eff_Stk 0x80BF0D90:
+    ovl_Eff_Stk :
     {
         build/asm/ovl_Eff_Stk_0x80BF0D90.o(.text)
     }
 
-    ovl_En_Ig 0x80BF1150:
+    ovl_En_Ig :
     {
         build/asm/ovl_En_Ig_0x80BF1150.o(.text)
     }
 
-    ovl_En_Rg 0x80BF3920:
+    ovl_En_Rg :
     {
         build/asm/ovl_En_Rg_0x80BF3920.o(.text)
+        . += 0x10;
     }
 
-    ovl_En_Osk 0x80BF5C20:
+    ovl_En_Osk :
     {
         build/asm/ovl_En_Osk_0x80BF5C20.o(.text)
     }
 
-    ovl_En_Sth2 0x80BF74E0:
+    ovl_En_Sth2 :
     {
         build/asm/ovl_En_Sth2_0x80BF74E0.o(.text)
     }
 
-    ovl_En_Yb 0x80BFA100:
+    ovl_En_Yb :
     {
         build/asm/ovl_En_Yb_0x80BFA100.o(.text)
     }
 
-    ovl_En_Rz 0x80BFB480:
+    ovl_En_Rz :
     {
         build/asm/ovl_En_Rz_0x80BFB480.o(.text)
     }
 
-    ovl_En_Scopecoin 0x80BFCFA0:
+    ovl_En_Scopecoin :
     {
         build/asm/ovl_En_Scopecoin_0x80BFCFA0.o(.text)
     }
 
-    ovl_En_Bjt 0x80BFD2E0:
+    ovl_En_Bjt :
     {
         build/asm/ovl_En_Bjt_0x80BFD2E0.o(.text)
     }
 
-    ovl_En_Bomjima 0x80BFE170:
+    ovl_En_Bomjima :
     {
         build/asm/ovl_En_Bomjima_0x80BFE170.o(.text)
     }
 
-    ovl_En_Bomjimb 0x80C00EA0:
+    ovl_En_Bomjimb :
     {
         build/asm/ovl_En_Bomjimb_0x80C00EA0.o(.text)
     }
 
-    ovl_En_Bombers 0x80C03530:
+    ovl_En_Bombers :
     {
         build/asm/ovl_En_Bombers_0x80C03530.o(.text)
     }
 
-    ovl_En_Bombers2 0x80C04930:
+    ovl_En_Bombers2 :
     {
         build/asm/ovl_En_Bombers2_0x80C04930.o(.text)
     }
 
-    ovl_En_Bombal 0x80C05A70:
+    ovl_En_Bombal :
     {
         build/asm/ovl_En_Bombal_0x80C05A70.o(.text)
     }
 
-    ovl_Obj_Moon_Stone 0x80C06510:
+    ovl_Obj_Moon_Stone :
     {
         build/asm/ovl_Obj_Moon_Stone_0x80C06510.o(.text)
     }
 
-    ovl_Obj_Mu_Pict 0x80C06AA0:
+    ovl_Obj_Mu_Pict :
     {
         build/asm/ovl_Obj_Mu_Pict_0x80C06AA0.o(.text)
     }
 
-    ovl_Bg_Ikninside 0x80C07110:
+    ovl_Bg_Ikninside :
     {
         build/asm/ovl_Bg_Ikninside_0x80C07110.o(.text)
     }
 
-    ovl_Eff_Zoraband 0x80C07740:
+    ovl_Eff_Zoraband :
     {
         build/asm/ovl_Eff_Zoraband_0x80C07740.o(.text)
     }
 
-    ovl_Obj_Kepn_Koya 0x80C07B20:
+    ovl_Obj_Kepn_Koya :
     {
         build/asm/ovl_Obj_Kepn_Koya_0x80C07B20.o(.text)
     }
 
-    ovl_Obj_Usiyane 0x80C07C80:
+    ovl_Obj_Usiyane :
     {
         build/asm/ovl_Obj_Usiyane_0x80C07C80.o(.text)
     }
 
-    ovl_En_Nnh 0x80C08760:
+    ovl_En_Nnh :
     {
         build/asm/ovl_En_Nnh_0x80C08760.o(.text)
     }
 
-    ovl_Obj_Kzsaku 0x80C08A80:
+    ovl_Obj_Kzsaku :
     {
         build/asm/ovl_Obj_Kzsaku_0x80C08A80.o(.text)
     }
 
-    ovl_Obj_Milk_Bin 0x80C08E40:
+    ovl_Obj_Milk_Bin :
     {
         build/asm/ovl_Obj_Milk_Bin_0x80C08E40.o(.text)
     }
 
-    ovl_En_Kitan 0x80C090D0:
+    ovl_En_Kitan :
     {
         build/asm/ovl_En_Kitan_0x80C090D0.o(.text)
     }
 
-    ovl_Bg_Astr_Bombwall 0x80C09ED0:
+    ovl_Bg_Astr_Bombwall :
     {
         build/asm/ovl_Bg_Astr_Bombwall_0x80C09ED0.o(.text)
     }
 
-    ovl_Bg_Iknin_Susceil 0x80C0A740:
+    ovl_Bg_Iknin_Susceil :
     {
         build/asm/ovl_Bg_Iknin_Susceil_0x80C0A740.o(.text)
     }
 
-    ovl_En_Bsb 0x80C0B290:
+    ovl_En_Bsb :
     {
         build/asm/ovl_En_Bsb_0x80C0B290.o(.text)
     }
 
-    ovl_En_Recepgirl 0x80C0FFD0:
+    ovl_En_Recepgirl :
     {
         build/asm/ovl_En_Recepgirl_0x80C0FFD0.o(.text)
     }
 
-    ovl_En_Thiefbird 0x80C10770:
+    ovl_En_Thiefbird :
     {
         build/asm/ovl_En_Thiefbird_0x80C10770.o(.text)
+        . += 0x10;
     }
 
-    ovl_En_Jgame_Tsn 0x80C13930:
+    ovl_En_Jgame_Tsn :
     {
         build/asm/ovl_En_Jgame_Tsn_0x80C13930.o(.text)
     }
 
-    ovl_Obj_Jgame_Light 0x80C152F0:
+    ovl_Obj_Jgame_Light :
     {
         build/asm/ovl_Obj_Jgame_Light_0x80C152F0.o(.text)
     }
 
-    ovl_Obj_Yado 0x80C161E0:
+    ovl_Obj_Yado :
     {
         build/asm/ovl_Obj_Yado_0x80C161E0.o(.text)
+        . += 0x10;
     }
 
-    ovl_Demo_Syoten 0x80C16480:
+    ovl_Demo_Syoten :
     {
         build/asm/ovl_Demo_Syoten_0x80C16480.o(.text)
     }
 
-    ovl_Demo_Moonend 0x80C17A10:
+    ovl_Demo_Moonend :
     {
         build/asm/ovl_Demo_Moonend_0x80C17A10.o(.text)
     }
 
-    ovl_Bg_Lbfshot 0x80C18120:
+    ovl_Bg_Lbfshot :
     {
         build/asm/ovl_Bg_Lbfshot_0x80C18120.o(.text)
     }
 
-    ovl_Bg_Last_Bwall 0x80C18240:
+    ovl_Bg_Last_Bwall :
     {
         build/asm/ovl_Bg_Last_Bwall_0x80C18240.o(.text)
     }
 
-    ovl_En_And 0x80C18B90:
+    ovl_En_And :
     {
         build/asm/ovl_En_And_0x80C18B90.o(.text)
     }
 
-    ovl_En_Invadepoh_Demo 0x80C192A0:
+    ovl_En_Invadepoh_Demo :
     {
         build/asm/ovl_En_Invadepoh_Demo_0x80C192A0.o(.text)
+        . += 0x80;
     }
 
-    ovl_Obj_Danpeilift 0x80C1ADC0:
+    ovl_Obj_Danpeilift :
     {
         build/asm/ovl_Obj_Danpeilift_0x80C1ADC0.o(.text)
     }
 
-    ovl_En_Fall2 0x80C1B640:
+    ovl_En_Fall2 :
     {
         build/asm/ovl_En_Fall2_0x80C1B640.o(.text)
     }
 
-    ovl_Dm_Al 0x80C1BD90:
+    ovl_Dm_Al :
     {
         build/asm/ovl_Dm_Al_0x80C1BD90.o(.text)
     }
 
-    ovl_Dm_An 0x80C1C410:
+    ovl_Dm_An :
     {
         build/asm/ovl_Dm_An_0x80C1C410.o(.text)
     }
 
-    ovl_Dm_Ah 0x80C1D410:
+    ovl_Dm_Ah :
     {
         build/asm/ovl_Dm_Ah_0x80C1D410.o(.text)
     }
 
-    ovl_Dm_Nb 0x80C1DED0:
+    ovl_Dm_Nb :
     {
         build/asm/ovl_Dm_Nb_0x80C1DED0.o(.text)
     }
 
-    ovl_En_Drs 0x80C1E290:
+    ovl_En_Drs :
     {
         build/asm/ovl_En_Drs_0x80C1E290.o(.text)
     }
 
-    ovl_En_Ending_Hero 0x80C1E690:
+    ovl_En_Ending_Hero :
     {
         build/asm/ovl_En_Ending_Hero_0x80C1E690.o(.text)
     }
 
-    ovl_Dm_Bal 0x80C1E9E0:
+    ovl_Dm_Bal :
     {
         build/asm/ovl_Dm_Bal_0x80C1E9E0.o(.text)
     }
 
-    ovl_En_Paper 0x80C1F3D0:
+    ovl_En_Paper :
     {
         build/asm/ovl_En_Paper_0x80C1F3D0.o(.text)
     }
 
-    ovl_En_Hint_Skb 0x80C1FCF0:
+    ovl_En_Hint_Skb :
     {
         build/asm/ovl_En_Hint_Skb_0x80C1FCF0.o(.text)
     }
 
-    ovl_Dm_Tag 0x80C22350:
+    ovl_Dm_Tag :
     {
         build/asm/ovl_Dm_Tag_0x80C22350.o(.text)
     }
 
-    ovl_En_Bh 0x80C22D40:
+    ovl_En_Bh :
     {
         build/asm/ovl_En_Bh_0x80C22D40.o(.text)
     }
 
-    ovl_En_Ending_Hero2 0x80C23230:
+    ovl_En_Ending_Hero2 :
     {
         build/asm/ovl_En_Ending_Hero2_0x80C23230.o(.text)
     }
 
-    ovl_En_Ending_Hero3 0x80C23460:
+    ovl_En_Ending_Hero3 :
     {
         build/asm/ovl_En_Ending_Hero3_0x80C23460.o(.text)
     }
 
-    ovl_En_Ending_Hero4 0x80C23690:
+    ovl_En_Ending_Hero4 :
     {
         build/asm/ovl_En_Ending_Hero4_0x80C23690.o(.text)
     }
 
-    ovl_En_Ending_Hero5 0x80C238C0:
+    ovl_En_Ending_Hero5 :
     {
         build/asm/ovl_En_Ending_Hero5_0x80C238C0.o(.text)
     }
 
-    ovl_En_Ending_Hero6 0x80C23C90:
+    ovl_En_Ending_Hero6 :
     {
         build/asm/ovl_En_Ending_Hero6_0x80C23C90.o(.text)
     }
 
-    ovl_Dm_Gm 0x80C24360:
+    ovl_Dm_Gm :
     {
         build/asm/ovl_Dm_Gm_0x80C24360.o(.text)
     }
 
-    ovl_Obj_Swprize 0x80C25360:
+    ovl_Obj_Swprize :
     {
         build/asm/ovl_Obj_Swprize_0x80C25360.o(.text)
     }
 
-    ovl_En_Invisible_Ruppe 0x80C258A0:
+    ovl_En_Invisible_Ruppe :
     {
         build/asm/ovl_En_Invisible_Ruppe_0x80C258A0.o(.text)
     }
 
-    ovl_Obj_Ending 0x80C25BC0:
+    ovl_Obj_Ending :
     {
         build/asm/ovl_Obj_Ending_0x80C25BC0.o(.text)
     }
 
-    ovl_En_Rsn 0x80C25D40:
+    ovl_En_Rsn :
     {
         build/asm/ovl_En_Rsn_0x80C25D40.o(.text)
     }
diff --git a/include/functions.h b/include/functions.h
index 731f144bf..16cb75b15 100644
--- a/include/functions.h
+++ b/include/functions.h
@@ -6706,6 +6706,48 @@ UNK_RET func_808FBD54(UNK_ARGS); // func_808FBD54
 UNK_RET func_808FC550(UNK_ARGS); // func_808FC550
 UNK_RET func_808FC5AC(UNK_ARGS); // func_808FC5AC
 UNK_RET func_808FC5BC(UNK_ARGS); // func_808FC5BC
+// UNK_RET func_808FC6C0(UNK_ARGS);
+// UNK_RET func_808FC770(UNK_ARGS);
+// UNK_RET func_808FC790(UNK_ARGS);
+// UNK_RET func_808FC8B8(UNK_ARGS);
+// UNK_RET func_808FC964(UNK_ARGS);
+// UNK_RET func_808FCABC(UNK_ARGS);
+// UNK_RET func_808FCC0C(UNK_ARGS);
+// UNK_RET func_808FCDBC(UNK_ARGS);
+// UNK_RET func_808FCF60(UNK_ARGS);
+// UNK_RET func_808FD054(UNK_ARGS);
+// UNK_RET func_808FDCDC(UNK_ARGS);
+// UNK_RET func_808FE3F8(UNK_ARGS);
+// UNK_RET func_808FEE1C(UNK_ARGS);
+// UNK_RET func_808FEF70(UNK_ARGS);
+// UNK_RET func_808FF064(UNK_ARGS);
+// UNK_RET func_808FF5E0(UNK_ARGS);
+// UNK_RET func_808FF750(UNK_ARGS);
+// UNK_RET func_808FFC44(UNK_ARGS);
+// UNK_RET func_808FFF3C(UNK_ARGS);
+// UNK_RET func_80900228(UNK_ARGS);
+// UNK_RET func_80900A04(UNK_ARGS);
+// UNK_RET func_80901480(UNK_ARGS);
+// UNK_RET func_809033F0(UNK_ARGS);
+// UNK_RET func_809036BC(UNK_ARGS);
+// UNK_RET func_809038A4(UNK_ARGS);
+// UNK_RET func_80903C60(UNK_ARGS);
+// UNK_RET func_80903E20(UNK_ARGS);
+// UNK_RET func_80908554(UNK_ARGS);
+// UNK_RET func_80908674(UNK_ARGS);
+// UNK_RET func_809086B4(UNK_ARGS);
+// UNK_RET func_80908734(UNK_ARGS);
+// UNK_RET func_809089B8(UNK_ARGS);
+// UNK_RET func_80908A64(UNK_ARGS);
+// UNK_RET func_80908B4C(UNK_ARGS);
+// UNK_RET func_80908E08(UNK_ARGS);
+// UNK_RET func_80909234(UNK_ARGS);
+// UNK_RET func_80909AD0(UNK_ARGS);
+// UNK_RET func_80909CC0(UNK_ARGS);
+// UNK_RET func_8090AB6C(UNK_ARGS);
+// UNK_RET func_8090C884(UNK_ARGS);
+// UNK_RET func_8090C8BC(UNK_ARGS);
+// UNK_RET func_8090C96C(UNK_ARGS);
 UNK_RET func_80917290(UNK_ARGS); // func_80917290
 UNK_RET func_809172E4(UNK_ARGS); // func_809172E4
 UNK_RET func_8091734C(UNK_ARGS); // func_8091734C
diff --git a/include/variables.h b/include/variables.h
index af40d2b16..4c72dffa7 100644
--- a/include/variables.h
+++ b/include/variables.h
@@ -188,6 +188,7 @@
 //extern UNK_TYPE D_00016C4E;
 //extern UNK_TYPE D_00016C50;
 //extern UNK_TYPE D_00016C5C;
+//extern UNK_TYPE D_00016C66;
 //extern UNK_TYPE D_00016C68;
 //extern UNK_TYPE D_00016C6E;
 //extern UNK_TYPE D_00016CEC;
@@ -241,6 +242,7 @@
 //extern UNK_TYPE D_000170C7;
 //extern UNK_TYPE D_000170E0;
 //extern UNK_TYPE D_000170E4;
+//extern UNK_TYPE D_000170E5;
 //extern UNK_TYPE D_000170E6;
 //extern UNK_TYPE D_000170E7;
 //extern UNK_TYPE D_000170E8;
@@ -479,6 +481,7 @@ extern UNK_TYPE D_06002D30; // D_06002D30
 //extern UNK_TYPE D_3CFFED40;
 //extern UNK_TYPE D_3E7FDDD0;
 //extern UNK_TYPE D_3EBF9330;
+//extern UNK_TYPE D_3EFFD880;
 //extern UNK_TYPE D_3EFFF764;
 //extern UNK_TYPE D_3F7FCDC0;
 //extern UNK_TYPE D_3F7FCE80;
@@ -495,6 +498,7 @@ extern UNK_TYPE D_06002D30; // D_06002D30
 //extern UNK_TYPE D_403F8BAC;
 //extern UNK_TYPE D_407F83D0;
 //extern UNK_TYPE D_411FDAA0;
+//extern UNK_TYPE D_411FDBFC;
 //extern UNK_TYPE D_412022F0;
 //extern UNK_TYPE D_41204208;
 //extern UNK_TYPE D_412060B8;
@@ -4503,6 +4507,7 @@ extern u8 D_801EF677; // D_801EF677
 //extern UNK_TYPE D_801F054C;
 //extern UNK_TYPE D_801F054E;
 //extern UNK_TYPE D_801F0550;
+//extern UNK_TYPE D_801F0554;
 //extern UNK_TYPE D_801F0558;
 //extern UNK_TYPE D_801F055C;
 //extern UNK_TYPE D_801F0560;
@@ -8004,6 +8009,406 @@ extern f32 D_808637D0; // D_808637D0
 //extern UNK_TYPE D_808FC2A4;
 //extern UNK_TYPE D_808FC2A8;
 //extern UNK_TYPE D_808FC670;
+//extern UNK_TYPE D_8090CCB0;
+//extern UNK_TYPE D_8090CCD0;
+//extern UNK_TYPE D_8090CCD4;
+//extern UNK_TYPE D_8090CCD8;
+//extern UNK_TYPE D_8090CCDC;
+//extern UNK_TYPE D_8090CCE4;
+//extern UNK_TYPE D_8090CCE8;
+//extern UNK_TYPE D_8090CCEC;
+//extern UNK_TYPE D_8090CCF0;
+//extern UNK_TYPE D_8090CCF4;
+//extern UNK_TYPE D_8090CCF8;
+//extern UNK_TYPE D_8090CCFC;
+//extern UNK_TYPE D_8090CD00;
+//extern UNK_TYPE D_8090CD04;
+//extern UNK_TYPE D_8090CD08;
+//extern UNK_TYPE D_8090CD0C;
+//extern UNK_TYPE D_8090CD10;
+//extern UNK_TYPE D_8090CD14;
+//extern UNK_TYPE D_8090CD18;
+//extern UNK_TYPE D_8090CD1C;
+//extern UNK_TYPE D_8090CD24;
+//extern UNK_TYPE D_8090CD28;
+//extern UNK_TYPE D_8090CD2C;
+//extern UNK_TYPE D_8090CD30;
+//extern UNK_TYPE D_8090CD34;
+//extern UNK_TYPE D_8090CD38;
+//extern UNK_TYPE D_8090CD3C;
+//extern UNK_TYPE D_8090CD40;
+//extern UNK_TYPE D_8090CD44;
+//extern UNK_TYPE D_8090CD48;
+//extern UNK_TYPE D_8090CD4C;
+//extern UNK_TYPE D_8090CD50;
+//extern UNK_TYPE D_8090CD54;
+//extern UNK_TYPE D_8090CD58;
+//extern UNK_TYPE D_8090CD80;
+//extern UNK_TYPE D_8090CD88;
+//extern UNK_TYPE D_8090CD8C;
+//extern UNK_TYPE D_8090CF08;
+//extern UNK_TYPE D_8090CF18;
+//extern UNK_TYPE D_8090CF1C;
+//extern UNK_TYPE D_8090CF34;
+//extern UNK_TYPE D_8090CF40;
+//extern UNK_TYPE D_8090CF4C;
+//extern UNK_TYPE D_8090CF58;
+//extern UNK_TYPE D_8090D3C0;
+//extern UNK_TYPE D_8090D4D0;
+//extern UNK_TYPE D_8090D4D8;
+//extern UNK_TYPE D_8090D4E4;
+//extern UNK_TYPE D_8090D4F0;
+//extern UNK_TYPE D_8090D4FC;
+//extern UNK_TYPE D_8090D508;
+//extern UNK_TYPE D_8090D558;
+//extern UNK_TYPE D_8090D5B0;
+//extern UNK_TYPE D_8090D608;
+//extern UNK_TYPE D_8090D614;
+//extern UNK_TYPE D_8090D620;
+//extern UNK_TYPE D_8090D62C;
+//extern UNK_TYPE D_8090D638;
+//extern UNK_TYPE D_8090D650;
+//extern UNK_TYPE D_8090D65C;
+//extern UNK_TYPE D_8090D674;
+//extern UNK_TYPE D_8090D684;
+//extern UNK_TYPE D_8090D688;
+//extern UNK_TYPE D_8090D68C;
+//extern UNK_TYPE D_8090D690;
+//extern UNK_TYPE D_8090D694;
+//extern UNK_TYPE D_8090D69C;
+//extern UNK_TYPE D_8090D6A0;
+//extern UNK_TYPE D_8090D6A8;
+//extern UNK_TYPE D_8090D6AC;
+//extern UNK_TYPE D_8090D6B0;
+//extern UNK_TYPE D_8090D6B4;
+//extern UNK_TYPE D_8090D6B8;
+//extern UNK_TYPE D_8090D6BC;
+//extern UNK_TYPE D_8090D6C0;
+//extern UNK_TYPE D_8090D6C4;
+//extern UNK_TYPE D_8090D6C8;
+//extern UNK_TYPE D_8090D6CC;
+//extern UNK_TYPE D_8090D6D0;
+//extern UNK_TYPE D_8090D6D4;
+//extern UNK_TYPE D_8090D6D8;
+//extern UNK_TYPE D_8090D6DC;
+//extern UNK_TYPE D_8090D6E4;
+//extern UNK_TYPE D_8090D6E8;
+//extern UNK_TYPE D_8090D6EC;
+//extern UNK_TYPE D_8090D6F0;
+//extern UNK_TYPE D_8090D6F4;
+//extern UNK_TYPE D_8090D6FC;
+//extern UNK_TYPE D_8090D700;
+//extern UNK_TYPE D_8090D704;
+//extern UNK_TYPE D_8090D708;
+//extern UNK_TYPE D_8090D70C;
+//extern UNK_TYPE D_8090D714;
+//extern UNK_TYPE D_8090D71C;
+//extern UNK_TYPE D_8090D720;
+//extern UNK_TYPE D_8090D724;
+//extern UNK_TYPE D_8090D728;
+//extern UNK_TYPE D_8090D72C;
+//extern UNK_TYPE D_8090D734;
+//extern UNK_TYPE D_8090D738;
+//extern UNK_TYPE D_8090D73C;
+//extern UNK_TYPE D_8090D740;
+//extern UNK_TYPE D_8090D748;
+//extern UNK_TYPE D_8090D74C;
+//extern UNK_TYPE D_8090D754;
+//extern UNK_TYPE D_8090D758;
+//extern UNK_TYPE D_8090D764;
+//extern UNK_TYPE D_8090D76C;
+//extern UNK_TYPE D_8090D770;
+//extern UNK_TYPE D_8090D774;
+//extern UNK_TYPE D_8090D778;
+//extern UNK_TYPE D_8090D77C;
+//extern UNK_TYPE D_8090D780;
+//extern UNK_TYPE D_8090D784;
+//extern UNK_TYPE D_8090D788;
+//extern UNK_TYPE D_8090D78C;
+//extern UNK_TYPE D_8090D790;
+//extern UNK_TYPE D_8090D798;
+//extern UNK_TYPE D_8090D79C;
+//extern UNK_TYPE D_8090D7A0;
+//extern UNK_TYPE D_8090D7A4;
+//extern UNK_TYPE D_8090D7A8;
+//extern UNK_TYPE D_8090D7AC;
+//extern UNK_TYPE D_8090D7B0;
+//extern UNK_TYPE D_8090D7B4;
+//extern UNK_TYPE D_8090D7B8;
+//extern UNK_TYPE D_8090D7BC;
+//extern UNK_TYPE D_8090D7C0;
+//extern UNK_TYPE D_8090D7C4;
+//extern UNK_TYPE D_8090D7E0;
+//extern UNK_TYPE D_8090D7E4;
+//extern UNK_TYPE D_8090D7E8;
+//extern UNK_TYPE D_8090D7EC;
+//extern UNK_TYPE D_8090D7F0;
+//extern UNK_TYPE D_8090D7F4;
+//extern UNK_TYPE D_8090D7F8;
+//extern UNK_TYPE D_8090D7FC;
+//extern UNK_TYPE D_8090D800;
+//extern UNK_TYPE D_8090D804;
+//extern UNK_TYPE D_8090D808;
+//extern UNK_TYPE D_8090D810;
+//extern UNK_TYPE D_8090D814;
+//extern UNK_TYPE D_8090D818;
+//extern UNK_TYPE D_8090D81C;
+//extern UNK_TYPE D_8090D820;
+//extern UNK_TYPE D_8090D824;
+//extern UNK_TYPE D_8090D828;
+//extern UNK_TYPE D_8090D82C;
+//extern UNK_TYPE D_8090D830;
+//extern UNK_TYPE D_8090D834;
+//extern UNK_TYPE D_8090D838;
+//extern UNK_TYPE D_8090D83C;
+//extern UNK_TYPE D_8090D840;
+//extern UNK_TYPE D_8090D844;
+//extern UNK_TYPE D_8090D848;
+//extern UNK_TYPE D_8090D84C;
+//extern UNK_TYPE D_8090D850;
+//extern UNK_TYPE D_8090D854;
+//extern UNK_TYPE D_8090D858;
+//extern UNK_TYPE D_8090D85C;
+//extern UNK_TYPE D_8090D860;
+//extern UNK_TYPE D_8090D864;
+//extern UNK_TYPE D_8090D868;
+//extern UNK_TYPE D_8090D86C;
+//extern UNK_TYPE D_8090D870;
+//extern UNK_TYPE D_8090D874;
+//extern UNK_TYPE D_8090D87C;
+//extern UNK_TYPE D_8090D884;
+//extern UNK_TYPE D_8090D88C;
+//extern UNK_TYPE D_8090D890;
+//extern UNK_TYPE D_8090D894;
+//extern UNK_TYPE D_8090D898;
+//extern UNK_TYPE D_8090D89C;
+//extern UNK_TYPE D_8090D8A0;
+//extern UNK_TYPE D_8090D8A4;
+//extern UNK_TYPE D_8090D8A8;
+//extern UNK_TYPE D_8090D8AC;
+//extern UNK_TYPE D_8090D8B4;
+//extern UNK_TYPE D_8090D8B8;
+//extern UNK_TYPE D_8090D8BC;
+//extern UNK_TYPE D_8090D8C4;
+//extern UNK_TYPE D_8090D8C8;
+//extern UNK_TYPE D_8090D8CC;
+//extern UNK_TYPE D_8090D8D0;
+//extern UNK_TYPE D_8090D964;
+//extern UNK_TYPE D_8090D968;
+//extern UNK_TYPE D_8090D96C;
+//extern UNK_TYPE D_8090D970;
+//extern UNK_TYPE D_8090D974;
+//extern UNK_TYPE D_8090D978;
+//extern UNK_TYPE D_8090D97C;
+//extern UNK_TYPE D_8090D980;
+//extern UNK_TYPE D_8090D984;
+//extern UNK_TYPE D_8090D988;
+//extern UNK_TYPE D_8090D98C;
+//extern UNK_TYPE D_8090D990;
+//extern UNK_TYPE D_8090D994;
+//extern UNK_TYPE D_8090D998;
+//extern UNK_TYPE D_8090D99C;
+//extern UNK_TYPE D_8090D9A0;
+//extern UNK_TYPE D_8090D9A4;
+//extern UNK_TYPE D_8090D9A8;
+//extern UNK_TYPE D_8090D9AC;
+//extern UNK_TYPE D_8090D9B0;
+//extern UNK_TYPE D_8090D9B4;
+//extern UNK_TYPE D_8090D9B8;
+//extern UNK_TYPE D_8090D9BC;
+//extern UNK_TYPE D_8090D9C0;
+//extern UNK_TYPE D_8090D9C4;
+//extern UNK_TYPE D_8090D9C8;
+//extern UNK_TYPE D_8090D9CC;
+//extern UNK_TYPE D_8090D9D0;
+//extern UNK_TYPE D_8090D9D4;
+//extern UNK_TYPE D_8090D9D8;
+//extern UNK_TYPE D_8090D9DC;
+//extern UNK_TYPE D_8090D9E0;
+//extern UNK_TYPE D_8090D9E4;
+//extern UNK_TYPE D_8090D9E8;
+//extern UNK_TYPE D_8090D9EC;
+//extern UNK_TYPE D_8090D9F0;
+//extern UNK_TYPE D_8090D9F4;
+//extern UNK_TYPE D_8090D9F8;
+//extern UNK_TYPE D_8090DA00;
+//extern UNK_TYPE D_8090DA04;
+//extern UNK_TYPE D_8090DA08;
+//extern UNK_TYPE D_8090DA0C;
+//extern UNK_TYPE D_8090DA10;
+//extern UNK_TYPE D_8090DA14;
+//extern UNK_TYPE D_8090DA18;
+//extern UNK_TYPE D_8090DA1C;
+//extern UNK_TYPE D_8090DA20;
+//extern UNK_TYPE D_8090DA24;
+//extern UNK_TYPE D_8090DA28;
+//extern UNK_TYPE D_8090DA2C;
+//extern UNK_TYPE D_8090DA30;
+//extern UNK_TYPE D_8090DA34;
+//extern UNK_TYPE D_8090DA38;
+//extern UNK_TYPE D_8090DA3C;
+//extern UNK_TYPE D_8090DA40;
+//extern UNK_TYPE D_8090DA44;
+//extern UNK_TYPE D_8090DA48;
+//extern UNK_TYPE D_8090DA4C;
+//extern UNK_TYPE D_8090DA50;
+//extern UNK_TYPE D_8090DA54;
+//extern UNK_TYPE D_8090DA58;
+//extern UNK_TYPE D_8090DA5C;
+//extern UNK_TYPE D_8090DA60;
+//extern UNK_TYPE D_8090DA64;
+//extern UNK_TYPE D_8090DA68;
+//extern UNK_TYPE D_8090DA6C;
+//extern UNK_TYPE D_8090DA70;
+//extern UNK_TYPE D_8090DA74;
+//extern UNK_TYPE D_8090DA78;
+//extern UNK_TYPE D_8090DA80;
+//extern UNK_TYPE D_8090DA84;
+//extern UNK_TYPE D_8090DA88;
+//extern UNK_TYPE D_8090DA8C;
+//extern UNK_TYPE D_8090DA90;
+//extern UNK_TYPE D_8090DA94;
+//extern UNK_TYPE D_8090DA98;
+//extern UNK_TYPE D_8090DA9C;
+//extern UNK_TYPE D_8090DAA0;
+//extern UNK_TYPE D_8090DAA4;
+//extern UNK_TYPE D_8090DAA8;
+//extern UNK_TYPE D_8090DAAC;
+//extern UNK_TYPE D_8090DAB0;
+//extern UNK_TYPE D_8090DAB4;
+//extern UNK_TYPE D_8090DAB8;
+//extern UNK_TYPE D_8090DABC;
+//extern UNK_TYPE D_8090DAC4;
+//extern UNK_TYPE D_8090DAC8;
+//extern UNK_TYPE D_8090DACC;
+//extern UNK_TYPE D_8090DAD4;
+//extern UNK_TYPE D_8090DAD8;
+//extern UNK_TYPE D_8090DAE0;
+//extern UNK_TYPE D_8090DAE4;
+//extern UNK_TYPE D_8090DAE8;
+//extern UNK_TYPE D_8090DAEC;
+//extern UNK_TYPE D_8090DAF0;
+//extern UNK_TYPE D_8090DAF4;
+//extern UNK_TYPE D_8090DAF8;
+//extern UNK_TYPE D_8090DB64;
+//extern UNK_TYPE D_8090DB68;
+//extern UNK_TYPE D_8090DB6C;
+//extern UNK_TYPE D_8090DB70;
+//extern UNK_TYPE D_8090DBCC;
+//extern UNK_TYPE D_8090DBD0;
+//extern UNK_TYPE D_8090DBD4;
+//extern UNK_TYPE D_8090DBD8;
+//extern UNK_TYPE D_8090DBDC;
+//extern UNK_TYPE D_8090DBE0;
+//extern UNK_TYPE D_8090DBE4;
+//extern UNK_TYPE D_8090DBE8;
+//extern UNK_TYPE D_8090DBEC;
+//extern UNK_TYPE D_8090DBF0;
+//extern UNK_TYPE D_8090DBF8;
+//extern UNK_TYPE D_8090DC00;
+//extern UNK_TYPE D_8090DC04;
+//extern UNK_TYPE D_8090DC08;
+//extern UNK_TYPE D_8090DC0C;
+//extern UNK_TYPE D_8090DC10;
+//extern UNK_TYPE D_8090DC14;
+//extern UNK_TYPE D_8090DC18;
+//extern UNK_TYPE D_8090DC1C;
+//extern UNK_TYPE D_8090DC20;
+//extern UNK_TYPE D_8090DC24;
+//extern UNK_TYPE D_809101B0;
+//extern UNK_TYPE D_809101B4;
+//extern UNK_TYPE D_809101B8;
+//extern UNK_TYPE D_809101BC;
+//extern UNK_TYPE D_809101C0;
+//extern UNK_TYPE D_809101C4;
+//extern UNK_TYPE D_809101C8;
+//extern UNK_TYPE D_809101CC;
+//extern UNK_TYPE D_809101D0;
+//extern UNK_TYPE D_809101D8;
+//extern UNK_TYPE D_809101E8;
+//extern UNK_TYPE D_80910B3C;
+//extern UNK_TYPE D_80910B40;
+//extern UNK_TYPE D_80910B44;
+//extern UNK_TYPE D_80910B48;
+//extern UNK_TYPE D_809114A8;
+//extern UNK_TYPE D_80911E08;
+//extern UNK_TYPE D_80911E14;
+//extern UNK_TYPE D_80911E20;
+//extern UNK_TYPE D_80911E28;
+//extern UNK_TYPE D_80911E30;
+//extern UNK_TYPE D_80911F20;
+//extern UNK_TYPE D_80911F24;
+//extern UNK_TYPE D_80911F28;
+//extern UNK_TYPE D_80911F2C;
+//extern UNK_TYPE D_80911F30;
+//extern UNK_TYPE D_80911F38;
+//extern UNK_TYPE D_80911F3C;
+//extern UNK_TYPE D_80911F40;
+//extern UNK_TYPE D_80911F44;
+//extern UNK_TYPE D_80911F48;
+//extern UNK_TYPE D_80911F4C;
+//extern UNK_TYPE D_80911F50;
+//extern UNK_TYPE D_80911F58;
+//extern UNK_TYPE D_80911F64;
+//extern UNK_TYPE D_80911F68;
+//extern UNK_TYPE D_80911F6C;
+//extern UNK_TYPE D_80911F70;
+//extern UNK_TYPE D_80911F78;
+//extern UNK_TYPE D_80914048;
+//extern UNK_TYPE D_80915128;
+//extern UNK_TYPE D_8091512C;
+//extern UNK_TYPE D_80915130;
+//extern UNK_TYPE D_809171B8;
+//extern UNK_TYPE D_809171C4;
+//extern UNK_TYPE D_809171C8;
+//extern UNK_TYPE D_809171C9;
+//extern UNK_TYPE D_809171CA;
+//extern UNK_TYPE D_809171CB;
+//extern UNK_TYPE D_809171CC;
+//extern UNK_TYPE D_809171D0;
+//extern UNK_TYPE D_809171D1;
+//extern UNK_TYPE D_809171D2;
+//extern UNK_TYPE D_809171D4;
+//extern UNK_TYPE D_809171D6;
+//extern UNK_TYPE D_809171D8;
+//extern UNK_TYPE D_809171DA;
+//extern UNK_TYPE D_809171DC;
+//extern UNK_TYPE D_809171E0;
+//extern UNK_TYPE D_809171EC;
+//extern UNK_TYPE D_809171EE;
+//extern UNK_TYPE D_809171F0;
+//extern UNK_TYPE D_809171F2;
+//extern UNK_TYPE D_809171F4;
+//extern UNK_TYPE D_809171F6;
+//extern UNK_TYPE D_809171F8;
+//extern UNK_TYPE D_809171FC;
+//extern UNK_TYPE D_809171FE;
+//extern UNK_TYPE D_80917200;
+//extern UNK_TYPE D_80917202;
+//extern UNK_TYPE D_80917204;
+//extern UNK_TYPE D_80917206;
+//extern UNK_TYPE D_80917208;
+//extern UNK_TYPE D_8091720C;
+//extern UNK_TYPE D_80917210;
+//extern UNK_TYPE D_80917218;
+//extern UNK_TYPE D_80917228;
+//extern UNK_TYPE D_8091722C;
+//extern UNK_TYPE D_80917238;
+//extern UNK_TYPE D_8091723C;
+//extern UNK_TYPE D_80917248;
+//extern UNK_TYPE D_80917254;
+//extern UNK_TYPE D_80917258;
+//extern UNK_TYPE D_8091725C;
+//extern UNK_TYPE D_80917260;
+//extern UNK_TYPE D_80917264;
+//extern UNK_TYPE D_80917266;
+//extern UNK_TYPE D_80917268;
+//extern UNK_TYPE D_8091726C;
+//extern UNK_TYPE D_80917270;
+//extern UNK_TYPE D_80917272;
+//extern UNK_TYPE D_80917274;
+//extern UNK_TYPE D_80917278;
+//extern UNK_TYPE D_8091727C;
 //extern UNK_TYPE D_80918830;
 //extern UNK_TYPE D_80918850;
 //extern UNK_TYPE D_80918868;
diff --git a/tables/files.py b/tables/files.py
index ae0f23d8d..e7cf9e4c4 100644
--- a/tables/files.py
+++ b/tables/files.py
@@ -85,6 +85,7 @@
     ('decomp/ovl_En_Horse_Game_Check', 'ovl_En_Horse_Game_Check', 0x808F8AA0, ((0x808F9B00, 0x808F9DFF),)),
     ('decomp/ovl_En_Rr', 'ovl_En_Rr', 0x808F9E00, ((0x808FC130, 0x808FC54F),)),
     ('decomp/ovl_En_Fr', 'ovl_En_Fr', 0x808FC550, ((0x808FC670, 0x808FC6BF),)),
+    ('decomp/ovl_En_Fishing', 'ovl_En_Fishing', 0x808FC6C0, ((0x8090CCB0, 0x809101AF),)),
     ('decomp/ovl_Obj_Oshihiki', 'ovl_Obj_Oshihiki', 0x80917290, ((0x80918830, 0x80918B3F),)),
     ('decomp/ovl_Eff_Dust', 'ovl_Eff_Dust', 0x80918B40, ((0x80919D90, 0x80919F2F),)),
     ('decomp/ovl_Bg_Umajump', 'ovl_Bg_Umajump', 0x80919F30, ((0x8091A7F0, 0x8091A89F),)),
diff --git a/undef.txt b/undef.txt
index f8c78a119..6e5f73d5d 100644
--- a/undef.txt
+++ b/undef.txt
@@ -178,6 +178,7 @@ D_00016C48 = 0x00016C48;
 D_00016C4E = 0x00016C4E;
 D_00016C50 = 0x00016C50;
 D_00016C5C = 0x00016C5C;
+D_00016C66 = 0x00016C66;
 D_00016C68 = 0x00016C68;
 D_00016C6E = 0x00016C6E;
 D_00016CEC = 0x00016CEC;
@@ -231,6 +232,7 @@ D_000170C6 = 0x000170C6;
 D_000170C7 = 0x000170C7;
 D_000170E0 = 0x000170E0;
 D_000170E4 = 0x000170E4;
+D_000170E5 = 0x000170E5;
 D_000170E6 = 0x000170E6;
 D_000170E7 = 0x000170E7;
 D_000170E8 = 0x000170E8;
@@ -469,6 +471,7 @@ D_11111111 = 0x11111111;
 D_3CFFED40 = 0x3CFFED40;
 D_3E7FDDD0 = 0x3E7FDDD0;
 D_3EBF9330 = 0x3EBF9330;
+D_3EFFD880 = 0x3EFFD880;
 D_3EFFF764 = 0x3EFFF764;
 D_3F7FCDC0 = 0x3F7FCDC0;
 D_3F7FCE80 = 0x3F7FCE80;
@@ -485,6 +488,7 @@ D_3F9FE9B4 = 0x3F9FE9B4;
 D_403F8BAC = 0x403F8BAC;
 D_407F83D0 = 0x407F83D0;
 D_411FDAA0 = 0x411FDAA0;
+D_411FDBFC = 0x411FDBFC;
 D_412022F0 = 0x412022F0;
 D_41204208 = 0x41204208;
 D_412060B8 = 0x412060B8;
@@ -833,6 +837,7 @@ D_801F0544 = 0x801F0544;
 D_801F054C = 0x801F054C;
 D_801F054E = 0x801F054E;
 D_801F0550 = 0x801F0550;
+D_801F0554 = 0x801F0554;
 D_801F0558 = 0x801F0558;
 D_801F055C = 0x801F055C;
 D_801F0560 = 0x801F0560;
@@ -1656,6 +1661,100 @@ D_808CC254 = 0x808CC254;
 D_808CC258 = 0x808CC258;
 D_808CC25C = 0x808CC25C;
 D_808DE5B0 = 0x808DE5B0;
+D_809101B0 = 0x809101B0;
+D_809101B4 = 0x809101B4;
+D_809101B8 = 0x809101B8;
+D_809101BC = 0x809101BC;
+D_809101C0 = 0x809101C0;
+D_809101C4 = 0x809101C4;
+D_809101C8 = 0x809101C8;
+D_809101CC = 0x809101CC;
+D_809101D0 = 0x809101D0;
+D_809101D8 = 0x809101D8;
+D_809101E8 = 0x809101E8;
+D_80910B3C = 0x80910B3C;
+D_80910B40 = 0x80910B40;
+D_80910B44 = 0x80910B44;
+D_80910B48 = 0x80910B48;
+D_809114A8 = 0x809114A8;
+D_80911E08 = 0x80911E08;
+D_80911E14 = 0x80911E14;
+D_80911E20 = 0x80911E20;
+D_80911E28 = 0x80911E28;
+D_80911E30 = 0x80911E30;
+D_80911F20 = 0x80911F20;
+D_80911F24 = 0x80911F24;
+D_80911F28 = 0x80911F28;
+D_80911F2C = 0x80911F2C;
+D_80911F30 = 0x80911F30;
+D_80911F38 = 0x80911F38;
+D_80911F3C = 0x80911F3C;
+D_80911F40 = 0x80911F40;
+D_80911F44 = 0x80911F44;
+D_80911F48 = 0x80911F48;
+D_80911F4C = 0x80911F4C;
+D_80911F50 = 0x80911F50;
+D_80911F58 = 0x80911F58;
+D_80911F64 = 0x80911F64;
+D_80911F68 = 0x80911F68;
+D_80911F6C = 0x80911F6C;
+D_80911F70 = 0x80911F70;
+D_80911F78 = 0x80911F78;
+D_80914048 = 0x80914048;
+D_80915128 = 0x80915128;
+D_8091512C = 0x8091512C;
+D_80915130 = 0x80915130;
+D_809171B8 = 0x809171B8;
+D_809171C4 = 0x809171C4;
+D_809171C8 = 0x809171C8;
+D_809171C9 = 0x809171C9;
+D_809171CA = 0x809171CA;
+D_809171CB = 0x809171CB;
+D_809171CC = 0x809171CC;
+D_809171D0 = 0x809171D0;
+D_809171D1 = 0x809171D1;
+D_809171D2 = 0x809171D2;
+D_809171D4 = 0x809171D4;
+D_809171D6 = 0x809171D6;
+D_809171D8 = 0x809171D8;
+D_809171DA = 0x809171DA;
+D_809171DC = 0x809171DC;
+D_809171E0 = 0x809171E0;
+D_809171EC = 0x809171EC;
+D_809171EE = 0x809171EE;
+D_809171F0 = 0x809171F0;
+D_809171F2 = 0x809171F2;
+D_809171F4 = 0x809171F4;
+D_809171F6 = 0x809171F6;
+D_809171F8 = 0x809171F8;
+D_809171FC = 0x809171FC;
+D_809171FE = 0x809171FE;
+D_80917200 = 0x80917200;
+D_80917202 = 0x80917202;
+D_80917204 = 0x80917204;
+D_80917206 = 0x80917206;
+D_80917208 = 0x80917208;
+D_8091720C = 0x8091720C;
+D_80917210 = 0x80917210;
+D_80917218 = 0x80917218;
+D_80917228 = 0x80917228;
+D_8091722C = 0x8091722C;
+D_80917238 = 0x80917238;
+D_8091723C = 0x8091723C;
+D_80917248 = 0x80917248;
+D_80917254 = 0x80917254;
+D_80917258 = 0x80917258;
+D_8091725C = 0x8091725C;
+D_80917260 = 0x80917260;
+D_80917264 = 0x80917264;
+D_80917266 = 0x80917266;
+D_80917268 = 0x80917268;
+D_8091726C = 0x8091726C;
+D_80917270 = 0x80917270;
+D_80917272 = 0x80917272;
+D_80917274 = 0x80917274;
+D_80917278 = 0x80917278;
+D_8091727C = 0x8091727C;
 D_80936AD0 = 0x80936AD0;
 D_80936AD8 = 0x80936AD8;
 D_80936CD8 = 0x80936CD8;