diff --git a/yamls/us/main.yaml b/yamls/us/main.yaml
index 10920354..45c355a5 100644
--- a/yamls/us/main.yaml
+++ b/yamls/us/main.yaml
@@ -8,9 +8,240 @@
       - [0x1050, textbin]
       - [0x1270, textbin]
       - [0x3440, asm] #func_80002840
-#      - [0x35A8, asm]
+      - [0x3A80, asm]
+      - [0x41D0, asm]
+      - [0x4650, asm]
+      - [0x5A20, asm]
+      - [0x7B20, asm]
+      - [0x7D30, asm]
+      - [0x7FC0, asm, 7FC0]
+      - [0x8CC0, asm]
+      - [0xC870, asm]
+      - [0xF0A0, asm]
+      - [0x12490, asm]
+      - [0x14AA0, asm]
+      - [0x17650, asm]
+      - [0x1EB50, asm]
+      - [0x1FA60, asm]
+      - [0x1FA70, asm]
+      - [0x1FB10, asm]
+      - [0x205E0, asm]
+      - [0x206B0, asm]
+      - [0x20A60, asm]
+      - [0x20F80, asm]
+      - [0x211E0, asm]
+      - [0x21320, asm]
+      - [0x21470, asm]
+      - [0x21520, asm]
+      - [0x21B40, asm]
+      - [0x21DD0, asm]
+      - [0x222C0, asm]
+      - [0x22340, asm]
+      - [0x223F0, asm]
+      - [0x22500, asm]
+      - [0x225A0, asm]
+      - [0x226C0, asm]
+      - [0x22730, asm]
+      - [0x228F0, asm]
+      - [0x22920, asm]
+      - [0x22990, asm]
+      - [0x22A00, asm]
+      - [0x22D90, asm]
+      - [0x22DA0, asm]
+      - [0x22EF0, asm]
+      - [0x233A0, asm]
+      - [0x23680, asm]
+      - [0x23C00, asm]
+      - [0x23C90, asm]
+      - [0x23FC0, asm]
+      - [0x23FD0, asm]
+      - [0x240B0, asm]
+      - [0x243B0, asm]
+      - [0x24BC0, asm]
+      - [0x24C60, asm]
+      - [0x25920, asm]
+      - [0x25950, asm]
+      - [0x25960, asm]
+      - [0x25BB0, asm]
+      - [0x25C90, asm]
+      - [0x25CA0, asm]
+      - [0x25D50, asm]
+      - [0x25D60, asm]
+      - [0x25E10, asm]
+      - [0x25F10, asm]
+      - [0x27040, asm]
+      - [0x278D0, asm]
+      - [0x27B40, asm]
+      - [0x27CC0, asm]
+      - [0x27E00, asm]
+      - [0x27E10, asm]
+      - [0x27E20, asm]
+      - [0x281B0, asm]
+      - [0x28230, asm]
+      - [0x28270, asm]
+      - [0x28300, asm]
+      - [0x28330, asm]
+      - [0x28800, asm]
+      - [0x28820, asm]
+      - [0x28830, asm]
+      - [0x28B90, asm]
+      - [0x28C90, asm]
+      - [0x29060, asm]
+      - [0x297B0, asm]
+      - [0x297D0, asm]
+      - [0x29880, asm]
+      - [0x298E0, asm]
+      - [0x29940, asm]
+      - [0x299E0, asm]
+      - [0x29C80, asm]
+      - [0x2A740, asm]
+      - [0x2A7A0, asm]
+      - [0x2AAB0, asm]
+      - [0x2AD80, asm]
+      - [0x2AE10, asm]
+      - [0x2B690, asm]
+      - [0x2B830, asm]
+      - [0x2B940, asm]
+      - [0x2BA00, asm]
+      - [0x2BA10, asm]
+      - [0x2BA70, asm]
+      - [0x2BAC0, asm]
+      - [0x2BB60, asm]
+      - [0x2BBB0, asm]
+      - [0x2BD40, asm]
+      - [0x2BD50, asm]
+      - [0x2BDF0, asm]
+      - [0x2C700, asm]
+      - [0x2D300, asm]
+      - [0x2DF00, asm]
+      - [0x2E9E0, asm]
+      - [0x2EDE0, asm]
+      - [0x2EE30, asm]
+      - [0x36930, asm]
+      - [0x43AC0, asm]
+      - [0x43E80, asm]
+      - [0x496C0, asm]
+      - [0x52730, asm]
+      - [0x59780, asm]
+      - [0x5A2C0, asm]
+      - [0x6B3B0, asm]
+      - [0x77E40, asm]
+      - [0x84F70, asm]
+      - [0x85530, asm]
+      - [0x97F80, asm]
+      - [0x9A580, asm]
+      - [0xA24B0, asm]
+      - [0xA48A0, asm]
+      - [0xA4B50, asm]
+      - [0xB99D0, asm]
+      - [0xBB360, asm]
+      - [0xBD360, asm]
+      - [0xC3430, asm]
       - [0xC3EE0, data]
-      - [0xC8E40, rodata]
+      - [0xC8E40, rodata, 7FC0]
+      - [0xC9220, rodata]
+      - [0xC9260, rodata]
+      - [0xC92C0, rodata]
+      - [0xC92F0, rodata]
+      - [0xC9320, rodata]
+      - [0xC99D0, rodata]
+      - [0xC9F10, rodata]
+      - [0xC9F40, rodata]
+      - [0xC9F90, rodata]
+      - [0xC9FE0, rodata]
+      - [0xCA0E0, rodata]
+      - [0xCA150, rodata]
+      - [0xCA170, rodata]
+      - [0xCA180, rodata]
+      - [0xCA1E0, rodata]
+      - [0xCA650, rodata]
+      - [0xCA690, rodata]
+      - [0xCA7C0, rodata]
+      - [0xCA830, rodata]
+      - [0xCAB00, rodata]
+      - [0xCAB10, rodata]
+      - [0xCAB20, rodata]
+      - [0xCABD0, rodata]
+      - [0xCABE0, rodata]
+      - [0xCAC10, rodata]
+      - [0xCAC30, rodata]
+      - [0xCAC50, rodata]
+      - [0xCAC80, rodata]
+      - [0xCAD90, rodata]
+      - [0xCAE20, rodata]
+      - [0xCAE90, rodata]
+      - [0xCAFB0, rodata]
+      - [0xD05B0, rodata]
+      - [0xD08C0, rodata]
+      - [0xD0910, rodata]
+      - [0xD09A0, rodata]
+      - [0xD0B80, rodata]
+      - [0xD0B90, rodata]
+      - [0xD0C00, rodata]
+      - [0xD0C30, rodata]
+      - [0xD20E0, rodata]
+      - [0xD2550, rodata]
+      - [0xD2570, rodata]
+      - [0xD25E0, rodata]
+      - [0xD2900, rodata]
+      - [0xD2D30, rodata]
+      - [0xD2D90, rodata]
+      - [0xD2DA0, rodata]
+      - [0xD2F20, rodata]
+      - [0xD31D0, rodata]
+      - [0xD3460, rodata]
+      - [0xD3C00, rodata]
+      - [0xD3C40, rodata]
+      - [0xD3DB0, rodata]
+      - [0xD3E40, rodata]
+      - [0xD3ED0, rodata]
+      - [0xD3FF0, rodata]
+      - [0xD4110, rodata]
+      - [0xD41A0, rodata]
+      - [0xD42C0, rodata]
+      - [0xD4350, rodata]
+      - [0xD4620, rodata]
+      - [0xD46B0, rodata]
+      - [0xD4740, rodata]
+      - [0xD47D0, rodata]
+      - [0xD48F0, rodata]
+      - [0xD4980, rodata]
+      - [0xD4A10, rodata]
+      - [0xD4AA0, rodata]
+      - [0xD4B30, rodata]
+      - [0xD4BC0, rodata]
+      - [0xD4C50, rodata]
+      - [0xD4E90, rodata]
+      - [0xD4F20, rodata]
+      - [0xD4FB0, rodata]
+      - [0xD5040, rodata]
+      - [0xD50D0, rodata]
+      - [0xD5280, rodata]
+      - [0xD5310, rodata]
+      - [0xD53A0, rodata]
+      - [0xD5670, rodata]
+      - [0xD5680, rodata]
+      - [0xD5690, rodata]
+      - [0xD5910, rodata]
+      - [0xD5CF0, rodata]
+      - [0xD61F0, rodata]
+      - [0xD69A0, rodata]
+      - [0xD6C20, rodata]
+      - [0xD8320, rodata]
+      - [0xD8DE0, rodata]
+      - [0xD8DF0, rodata]
+      - [0xD8ED0, rodata]
+      - [0xD8EE0, rodata]
+      - [0xD97F0, rodata]
+      - [0xD9E50, rodata]
+      - [0xDA030, rodata]
+      - [0xDC620, rodata]
+      - [0xDD330, rodata]
+      - [0xDDD30, rodata]
+      - [0xDDD60, rodata]
+      - [0xDDD70, rodata]
+      - [0xDDD80, rodata]
+      - [0xDDE80, rodata]
       - { start: 0xDE480, type: bss, vram: 0x800DD880 }
 
   - name: unkbin