From 53ceea717daa019ba31f25805100ab0761b1ca6f Mon Sep 17 00:00:00 2001 From: Roman971 <32455037+Roman971@users.noreply.github.com> Date: Wed, 27 May 2020 00:09:00 +0200 Subject: [PATCH] Properly align asm & data (+ minor fixes) (#165) * Add .align 4 directives to all data/ files (+ minor alignment fixes) * Use .balign for everything and fix typo --- asm/PreRender.s | 4 +-- asm/__osDisableInt.s | 4 +-- asm/__osGetCause.s | 4 +-- asm/__osGetFpcCsr.s | 4 +-- asm/__osGetSR.s | 4 +-- asm/__osProbeTLB.s | 4 +-- asm/__osRestoreInt.s | 4 +-- asm/__osSetCompare.s | 4 +-- asm/__osSetFpcCsr.s | 4 +-- asm/__osSetSR.s | 4 +-- asm/__osSetWatchLo.s | 4 +-- asm/bcmp.s | 4 +-- asm/bcopy.s | 4 +-- asm/bzero.s | 4 +-- asm/code_800BB0A0.s | 4 +-- asm/code_800BB570.s | 4 +-- asm/code_800C3C20.s | 4 +-- asm/code_800D71F0.s | 4 +-- asm/code_800D7CD0.s | 4 +-- asm/code_800DACC0.s | 4 +-- asm/code_800DDE20.s | 4 +-- asm/code_800E11F0.s | 4 +-- asm/code_800E88C0.s | 4 +-- asm/code_800E9340.s | 4 +-- asm/code_800EC960.s | 4 +-- asm/code_800F7260.s | 4 +-- asm/code_800F9280.s | 4 +-- asm/code_800FCD40.s | 4 +-- asm/code_80100040.s | 4 +-- asm/code_801014C0.s | 4 +-- asm/code_80101910.s | 4 +-- asm/code_80101EB0.s | 4 +-- asm/code_80102420.s | 4 +-- asm/code_80102FA0.s | 4 +-- asm/code_80103010.s | 4 +-- asm/code_801041E0.s | 4 +-- asm/code_80104450.s | 4 +-- asm/code_80104810.s | 4 +-- asm/code_80104C80.s | 4 +-- asm/code_80104D00.s | 4 +-- asm/code_80104D60.s | 4 +-- asm/code_80104F40.s | 4 +-- asm/code_80105250.s | 4 +-- asm/code_80105CF0.s | 4 +-- asm/code_80106550.s | 4 +-- asm/entry.s | 2 +- asm/exceptasm.s | 4 +-- asm/guMtxF2L.s | 4 +-- asm/guMtxIdent.s | 4 +-- asm/guMtxIdentF.s | 4 +-- asm/guNormalize.s | 4 +-- asm/guScale.s | 4 +-- asm/guTranslate.s | 4 +-- asm/ipl3.s | 2 +- asm/jpegdecoder.s | 4 +-- asm/libm.s | 4 +-- asm/osGetCount.s | 4 +-- asm/osInvalDCache.s | 4 +-- asm/osInvalICache.s | 4 +-- asm/osMapTLBRdb.s | 4 +-- asm/osSetIntMask.s | 4 +-- asm/osUnmapTLBAll.s | 4 +-- asm/osWritebackDCache.s | 4 +-- asm/osWritebackDCacheAll.s | 4 +-- .../data/ovl_map_mark_data/z_map_mark_data.s | 2 +- asm/yaz0_old.s | 4 +-- data/PreRender.rodata.s | 4 +-- data/code_8006EA30.data.s | 4 ++- data/code_800BB0A0.rodata.s | 4 +-- data/code_800BB570.bss.s | 4 ++- data/code_800BB570.data.s | 4 ++- data/code_800BB570.rodata.s | 4 +-- data/code_800C3C20.data.s | 4 ++- data/code_800D2E30.data.s | 4 ++- data/code_800D7CD0.data.s | 4 ++- data/code_800D7CD0.rodata.s | 4 +-- data/code_800DACC0.bss.s | 4 ++- data/code_800DACC0.data.s | 4 ++- data/code_800DACC0.rodata.s | 4 +-- data/code_800DDE20.rodata.s | 4 +-- data/code_800E11F0.data.s | 4 ++- data/code_800E11F0.rodata.s | 6 ++-- data/code_800E88C0.data.s | 4 ++- data/code_800E88C0.rodata.s | 4 +-- data/code_800E9340.rodata.s | 4 +-- data/code_800EC960.data.s | 4 ++- data/code_800EC960.rodata.s | 4 +-- data/code_800F7260.data.s | 4 ++- data/code_800F7260.rodata.s | 4 +-- data/code_800F9280.data.s | 4 ++- data/code_800F9280.rodata.s | 6 ++-- data/code_801014C0.bss.s | 4 ++- data/code_80101910.bss.s | 4 ++- data/code_80102420.data.s | 4 ++- data/code_80105CF0.data.s | 4 ++- data/code_80106550.rodata.s | 4 +-- data/code_80110450.rodata.s | 4 +-- data/db_camera.bss.s | 4 ++- data/db_camera.data.s | 4 ++- data/db_camera.rodata.s | 4 +-- data/fault.bss.s | 4 ++- data/fault_drawer.bss.s | 4 ++- data/flg_set.bss.s | 4 ++- data/flg_set.data.s | 4 ++- data/jpegdecoder.bss.s | 4 ++- data/osSetIntMask.rodata.s | 2 +- data/overlays/actors/z_arms_hook.data.s | 4 ++- data/overlays/actors/z_arms_hook.reloc.s | 8 +++-- data/overlays/actors/z_bg_bombwall.data.s | 4 ++- data/overlays/actors/z_bg_bombwall.reloc.s | 8 +++-- data/overlays/actors/z_bg_bowl_wall.data.s | 4 ++- data/overlays/actors/z_bg_bowl_wall.reloc.s | 8 +++-- data/overlays/actors/z_bg_breakwall.data.s | 4 ++- data/overlays/actors/z_bg_breakwall.reloc.s | 8 +++-- data/overlays/actors/z_bg_ddan_jd.data.s | 4 ++- data/overlays/actors/z_bg_ddan_jd.reloc.s | 8 +++-- data/overlays/actors/z_bg_dodoago.bss.s | 6 ++-- data/overlays/actors/z_bg_dodoago.data.s | 4 ++- data/overlays/actors/z_bg_dodoago.reloc.s | 8 +++-- data/overlays/actors/z_bg_dy_yoseizo.data.s | 2 +- data/overlays/actors/z_bg_dy_yoseizo.reloc.s | 8 +++-- data/overlays/actors/z_bg_ganon_otyuka.data.s | 4 ++- .../overlays/actors/z_bg_ganon_otyuka.reloc.s | 8 +++-- .../overlays/actors/z_bg_gnd_darkmeiro.data.s | 4 ++- .../actors/z_bg_gnd_darkmeiro.reloc.s | 8 +++-- .../overlays/actors/z_bg_gnd_firemeiro.data.s | 4 ++- .../actors/z_bg_gnd_firemeiro.reloc.s | 8 +++-- data/overlays/actors/z_bg_gnd_iceblock.bss.s | 6 ++-- data/overlays/actors/z_bg_gnd_iceblock.data.s | 4 ++- .../overlays/actors/z_bg_gnd_iceblock.reloc.s | 8 +++-- .../actors/z_bg_gnd_iceblock.rodata.s | 4 ++- .../overlays/actors/z_bg_gnd_soulmeiro.data.s | 4 ++- .../actors/z_bg_gnd_soulmeiro.reloc.s | 8 +++-- data/overlays/actors/z_bg_haka.data.s | 4 ++- data/overlays/actors/z_bg_haka.reloc.s | 8 +++-- data/overlays/actors/z_bg_haka_gate.bss.s | 6 ++-- data/overlays/actors/z_bg_haka_gate.data.s | 4 ++- data/overlays/actors/z_bg_haka_gate.reloc.s | 8 +++-- data/overlays/actors/z_bg_haka_huta.data.s | 4 ++- data/overlays/actors/z_bg_haka_huta.reloc.s | 8 +++-- .../overlays/actors/z_bg_haka_meganebg.data.s | 4 ++- .../actors/z_bg_haka_meganebg.reloc.s | 8 +++-- data/overlays/actors/z_bg_haka_sgami.data.s | 4 ++- data/overlays/actors/z_bg_haka_sgami.reloc.s | 8 +++-- data/overlays/actors/z_bg_haka_ship.data.s | 4 ++- data/overlays/actors/z_bg_haka_ship.reloc.s | 8 +++-- data/overlays/actors/z_bg_haka_trap.data.s | 4 ++- data/overlays/actors/z_bg_haka_trap.reloc.s | 8 +++-- data/overlays/actors/z_bg_haka_tubo.data.s | 4 ++- data/overlays/actors/z_bg_haka_tubo.reloc.s | 8 +++-- data/overlays/actors/z_bg_haka_water.data.s | 4 ++- data/overlays/actors/z_bg_haka_water.reloc.s | 8 +++-- data/overlays/actors/z_bg_haka_zou.data.s | 4 ++- data/overlays/actors/z_bg_haka_zou.reloc.s | 8 +++-- data/overlays/actors/z_bg_heavy_block.data.s | 4 ++- data/overlays/actors/z_bg_heavy_block.reloc.s | 8 +++-- .../overlays/actors/z_bg_hidan_curtain.data.s | 4 ++- .../actors/z_bg_hidan_curtain.reloc.s | 8 +++-- data/overlays/actors/z_bg_hidan_dalm.data.s | 4 ++- data/overlays/actors/z_bg_hidan_dalm.reloc.s | 8 +++-- data/overlays/actors/z_bg_hidan_fwbig.data.s | 4 ++- data/overlays/actors/z_bg_hidan_fwbig.reloc.s | 8 +++-- .../overlays/actors/z_bg_hidan_hamstep.data.s | 4 ++- .../actors/z_bg_hidan_hamstep.reloc.s | 8 +++-- data/overlays/actors/z_bg_hidan_hrock.data.s | 4 ++- data/overlays/actors/z_bg_hidan_hrock.reloc.s | 8 +++-- .../actors/z_bg_hidan_kowarerukabe.data.s | 4 ++- .../actors/z_bg_hidan_kowarerukabe.reloc.s | 8 +++-- data/overlays/actors/z_bg_hidan_rock.data.s | 4 ++- data/overlays/actors/z_bg_hidan_rock.reloc.s | 8 +++-- .../actors/z_bg_hidan_rsekizou.data.s | 4 ++- .../actors/z_bg_hidan_rsekizou.reloc.s | 8 +++-- .../overlays/actors/z_bg_hidan_sekizou.data.s | 4 ++- .../actors/z_bg_hidan_sekizou.reloc.s | 8 +++-- data/overlays/actors/z_bg_hidan_sima.data.s | 4 ++- data/overlays/actors/z_bg_hidan_sima.reloc.s | 8 +++-- data/overlays/actors/z_bg_ice_objects.data.s | 4 ++- data/overlays/actors/z_bg_ice_objects.reloc.s | 8 +++-- data/overlays/actors/z_bg_ice_shelter.data.s | 4 ++- data/overlays/actors/z_bg_ice_shelter.reloc.s | 8 +++-- data/overlays/actors/z_bg_ice_shutter.data.s | 4 ++- data/overlays/actors/z_bg_ice_shutter.reloc.s | 8 +++-- data/overlays/actors/z_bg_ice_turara.data.s | 4 ++- data/overlays/actors/z_bg_ice_turara.reloc.s | 8 +++-- data/overlays/actors/z_bg_ingate.data.s | 4 ++- data/overlays/actors/z_bg_ingate.reloc.s | 8 +++-- data/overlays/actors/z_bg_jya_1flift.data.s | 4 ++- data/overlays/actors/z_bg_jya_1flift.reloc.s | 8 +++-- .../overlays/actors/z_bg_jya_bigmirror.data.s | 4 ++- .../actors/z_bg_jya_bigmirror.reloc.s | 8 +++-- data/overlays/actors/z_bg_jya_block.data.s | 4 ++- data/overlays/actors/z_bg_jya_block.reloc.s | 8 +++-- .../actors/z_bg_jya_bombchuiwa.data.s | 4 ++- .../actors/z_bg_jya_bombchuiwa.reloc.s | 8 +++-- data/overlays/actors/z_bg_jya_bombiwa.data.s | 4 ++- data/overlays/actors/z_bg_jya_bombiwa.reloc.s | 8 +++-- data/overlays/actors/z_bg_jya_cobra.data.s | 4 ++- data/overlays/actors/z_bg_jya_cobra.reloc.s | 8 +++-- data/overlays/actors/z_bg_jya_goroiwa.data.s | 4 ++- data/overlays/actors/z_bg_jya_goroiwa.reloc.s | 8 +++-- .../overlays/actors/z_bg_jya_haheniron.data.s | 4 ++- .../actors/z_bg_jya_haheniron.reloc.s | 8 +++-- data/overlays/actors/z_bg_jya_ironobj.data.s | 2 +- data/overlays/actors/z_bg_jya_ironobj.reloc.s | 8 +++-- data/overlays/actors/z_bg_jya_lift.data.s | 4 ++- data/overlays/actors/z_bg_jya_lift.reloc.s | 8 +++-- data/overlays/actors/z_bg_jya_megami.data.s | 4 ++- data/overlays/actors/z_bg_jya_megami.reloc.s | 8 +++-- .../actors/z_bg_jya_zurerukabe.data.s | 4 ++- .../actors/z_bg_jya_zurerukabe.reloc.s | 8 +++-- data/overlays/actors/z_bg_menkuri_eye.bss.s | 6 ++-- data/overlays/actors/z_bg_menkuri_eye.data.s | 4 ++- data/overlays/actors/z_bg_menkuri_eye.reloc.s | 8 +++-- data/overlays/actors/z_bg_mizu_bwall.data.s | 4 ++- data/overlays/actors/z_bg_mizu_bwall.reloc.s | 8 +++-- data/overlays/actors/z_bg_mizu_movebg.bss.s | 6 ++-- data/overlays/actors/z_bg_mizu_movebg.data.s | 4 ++- data/overlays/actors/z_bg_mizu_movebg.reloc.s | 8 +++-- data/overlays/actors/z_bg_mizu_shutter.data.s | 4 ++- .../overlays/actors/z_bg_mizu_shutter.reloc.s | 8 +++-- data/overlays/actors/z_bg_mizu_water.data.s | 4 ++- data/overlays/actors/z_bg_mizu_water.reloc.s | 8 +++-- data/overlays/actors/z_bg_mori_bigst.data.s | 4 ++- data/overlays/actors/z_bg_mori_bigst.reloc.s | 8 +++-- .../overlays/actors/z_bg_mori_elevator.data.s | 4 ++- .../actors/z_bg_mori_elevator.reloc.s | 8 +++-- data/overlays/actors/z_bg_mori_hashigo.data.s | 4 ++- .../overlays/actors/z_bg_mori_hashigo.reloc.s | 8 +++-- data/overlays/actors/z_bg_mori_hashira4.bss.s | 6 ++-- .../overlays/actors/z_bg_mori_hashira4.data.s | 4 ++- .../actors/z_bg_mori_hashira4.reloc.s | 8 +++-- data/overlays/actors/z_bg_mori_hineri.data.s | 4 ++- data/overlays/actors/z_bg_mori_hineri.reloc.s | 8 +++-- data/overlays/actors/z_bg_mori_idomizu.data.s | 4 ++- .../overlays/actors/z_bg_mori_idomizu.reloc.s | 8 +++-- .../actors/z_bg_mori_kaitenkabe.data.s | 4 ++- .../actors/z_bg_mori_kaitenkabe.reloc.s | 8 +++-- .../actors/z_bg_mori_rakkatenjo.data.s | 4 ++- .../actors/z_bg_mori_rakkatenjo.reloc.s | 8 +++-- data/overlays/actors/z_bg_po_event.bss.s | 6 ++-- data/overlays/actors/z_bg_po_event.data.s | 4 ++- data/overlays/actors/z_bg_po_event.reloc.s | 8 +++-- data/overlays/actors/z_bg_po_syokudai.data.s | 4 ++- data/overlays/actors/z_bg_po_syokudai.reloc.s | 8 +++-- .../overlays/actors/z_bg_relay_objects.data.s | 4 ++- .../actors/z_bg_relay_objects.reloc.s | 8 +++-- .../actors/z_bg_spot00_hanebasi.data.s | 4 ++- .../actors/z_bg_spot00_hanebasi.reloc.s | 8 +++-- .../actors/z_bg_spot01_idohashira.data.s | 4 ++- .../actors/z_bg_spot01_idohashira.reloc.s | 8 +++-- .../actors/z_bg_spot01_idomizu.data.s | 4 ++- .../actors/z_bg_spot01_idomizu.reloc.s | 8 +++-- .../actors/z_bg_spot01_objects2.data.s | 4 ++- .../actors/z_bg_spot01_objects2.reloc.s | 8 +++-- .../actors/z_bg_spot02_objects.data.s | 4 ++- .../actors/z_bg_spot02_objects.reloc.s | 8 +++-- data/overlays/actors/z_bg_spot03_taki.data.s | 4 ++- data/overlays/actors/z_bg_spot03_taki.reloc.s | 8 +++-- .../actors/z_bg_spot06_objects.data.s | 4 ++- .../actors/z_bg_spot06_objects.reloc.s | 8 +++-- data/overlays/actors/z_bg_spot07_taki.data.s | 4 ++- data/overlays/actors/z_bg_spot07_taki.reloc.s | 8 +++-- .../actors/z_bg_spot08_bakudankabe.data.s | 4 ++- .../actors/z_bg_spot08_bakudankabe.reloc.s | 8 +++-- .../actors/z_bg_spot08_iceblock.data.s | 4 ++- .../actors/z_bg_spot08_iceblock.reloc.s | 8 +++-- .../actors/z_bg_spot08_iceblock.rodata.s | 4 ++- .../actors/z_bg_spot11_bakudankabe.data.s | 4 ++- .../actors/z_bg_spot11_bakudankabe.reloc.s | 8 +++-- data/overlays/actors/z_bg_spot11_oasis.data.s | 4 ++- .../overlays/actors/z_bg_spot11_oasis.reloc.s | 8 +++-- data/overlays/actors/z_bg_spot15_rrbox.data.s | 4 ++- .../overlays/actors/z_bg_spot15_rrbox.reloc.s | 8 +++-- data/overlays/actors/z_bg_spot15_saku.reloc.s | 8 +++-- .../actors/z_bg_spot16_bombstone.data.s | 4 ++- .../actors/z_bg_spot16_bombstone.reloc.s | 8 +++-- .../actors/z_bg_spot16_doughnut.data.s | 4 ++- .../actors/z_bg_spot16_doughnut.reloc.s | 8 +++-- .../actors/z_bg_spot17_bakudankabe.data.s | 4 ++- .../actors/z_bg_spot17_bakudankabe.reloc.s | 8 +++-- .../overlays/actors/z_bg_spot18_basket.data.s | 4 ++- .../actors/z_bg_spot18_basket.reloc.s | 8 +++-- data/overlays/actors/z_bg_spot18_obj.data.s | 4 ++- data/overlays/actors/z_bg_spot18_obj.reloc.s | 8 +++-- .../actors/z_bg_spot18_shutter.data.s | 4 ++- .../actors/z_bg_spot18_shutter.reloc.s | 8 +++-- data/overlays/actors/z_bg_sst_floor.data.s | 2 +- data/overlays/actors/z_bg_sst_floor.reloc.s | 8 +++-- data/overlays/actors/z_bg_toki_hikari.data.s | 4 ++- data/overlays/actors/z_bg_toki_hikari.reloc.s | 8 +++-- data/overlays/actors/z_bg_treemouth.data.s | 4 ++- data/overlays/actors/z_bg_treemouth.reloc.s | 8 +++-- data/overlays/actors/z_bg_vb_sima.data.s | 4 ++- data/overlays/actors/z_bg_vb_sima.reloc.s | 8 +++-- data/overlays/actors/z_bg_ydan_hasi.data.s | 4 ++- data/overlays/actors/z_bg_ydan_hasi.reloc.s | 8 +++-- data/overlays/actors/z_bg_ydan_maruta.data.s | 4 ++- data/overlays/actors/z_bg_ydan_maruta.reloc.s | 8 +++-- data/overlays/actors/z_bg_ydan_sp.data.s | 4 ++- data/overlays/actors/z_bg_ydan_sp.reloc.s | 8 +++-- data/overlays/actors/z_boss_dodongo.data.s | 4 ++- data/overlays/actors/z_boss_dodongo.reloc.s | 8 +++-- data/overlays/actors/z_boss_fd.data.s | 4 ++- data/overlays/actors/z_boss_fd.reloc.s | 8 +++-- data/overlays/actors/z_boss_fd2.data.s | 4 ++- data/overlays/actors/z_boss_fd2.reloc.s | 8 +++-- data/overlays/actors/z_boss_ganon.bss.s | 6 ++-- data/overlays/actors/z_boss_ganon.data.s | 4 ++- data/overlays/actors/z_boss_ganon.reloc.s | 8 +++-- data/overlays/actors/z_boss_ganon.rodata.s | 4 ++- data/overlays/actors/z_boss_ganon2.bss.s | 6 ++-- data/overlays/actors/z_boss_ganon2.data.s | 4 ++- data/overlays/actors/z_boss_ganon2.reloc.s | 8 +++-- data/overlays/actors/z_boss_ganondrof.data.s | 4 ++- data/overlays/actors/z_boss_ganondrof.reloc.s | 8 +++-- .../overlays/actors/z_boss_ganondrof.rodata.s | 4 ++- data/overlays/actors/z_boss_goma.data.s | 4 ++- data/overlays/actors/z_boss_goma.reloc.s | 8 +++-- data/overlays/actors/z_boss_mo.bss.s | 6 ++-- data/overlays/actors/z_boss_mo.data.s | 4 ++- data/overlays/actors/z_boss_mo.reloc.s | 8 +++-- data/overlays/actors/z_boss_sst.bss.s | 6 ++-- data/overlays/actors/z_boss_sst.data.s | 4 ++- data/overlays/actors/z_boss_sst.reloc.s | 8 +++-- data/overlays/actors/z_boss_tw.bss.s | 6 ++-- data/overlays/actors/z_boss_tw.data.s | 4 ++- data/overlays/actors/z_boss_tw.reloc.s | 8 +++-- data/overlays/actors/z_boss_va.bss.s | 6 ++-- data/overlays/actors/z_boss_va.data.s | 4 ++- data/overlays/actors/z_boss_va.reloc.s | 8 +++-- data/overlays/actors/z_demo_6k.data.s | 4 ++- data/overlays/actors/z_demo_6k.reloc.s | 8 +++-- data/overlays/actors/z_demo_du.data.s | 2 +- data/overlays/actors/z_demo_du.reloc.s | 8 +++-- data/overlays/actors/z_demo_ec.data.s | 4 ++- data/overlays/actors/z_demo_ec.reloc.s | 8 +++-- data/overlays/actors/z_demo_effect.data.s | 4 ++- data/overlays/actors/z_demo_effect.reloc.s | 8 +++-- data/overlays/actors/z_demo_ext.data.s | 4 ++- data/overlays/actors/z_demo_ext.reloc.s | 8 +++-- data/overlays/actors/z_demo_gj.data.s | 4 ++- data/overlays/actors/z_demo_gj.reloc.s | 8 +++-- data/overlays/actors/z_demo_go.reloc.s | 8 +++-- data/overlays/actors/z_demo_gt.data.s | 4 ++- data/overlays/actors/z_demo_gt.reloc.s | 8 +++-- data/overlays/actors/z_demo_ik.data.s | 4 ++- data/overlays/actors/z_demo_ik.reloc.s | 8 +++-- data/overlays/actors/z_demo_im.data.s | 4 ++- data/overlays/actors/z_demo_im.reloc.s | 8 +++-- data/overlays/actors/z_demo_kankyo.bss.s | 6 ++-- data/overlays/actors/z_demo_kankyo.data.s | 4 ++- data/overlays/actors/z_demo_kankyo.reloc.s | 8 +++-- data/overlays/actors/z_demo_kekkai.data.s | 4 ++- data/overlays/actors/z_demo_kekkai.reloc.s | 8 +++-- data/overlays/actors/z_demo_sa.data.s | 4 ++- data/overlays/actors/z_demo_sa.reloc.s | 8 +++-- data/overlays/actors/z_demo_shd.data.s | 4 ++- data/overlays/actors/z_demo_shd.reloc.s | 8 +++-- data/overlays/actors/z_demo_tre_lgt.data.s | 4 ++- data/overlays/actors/z_demo_tre_lgt.reloc.s | 8 +++-- data/overlays/actors/z_demo_tre_lgt.rodata.s | 4 ++- data/overlays/actors/z_door_gerudo.data.s | 4 ++- data/overlays/actors/z_door_gerudo.reloc.s | 8 +++-- data/overlays/actors/z_door_killer.data.s | 4 ++- data/overlays/actors/z_door_killer.reloc.s | 8 +++-- data/overlays/actors/z_door_shutter.data.s | 4 ++- data/overlays/actors/z_door_shutter.reloc.s | 8 +++-- data/overlays/actors/z_door_warp1.bss.s | 6 ++-- data/overlays/actors/z_door_warp1.data.s | 4 ++- data/overlays/actors/z_door_warp1.reloc.s | 8 +++-- data/overlays/actors/z_door_warp1.rodata.s | 4 ++- data/overlays/actors/z_efc_erupc.data.s | 4 ++- data/overlays/actors/z_efc_erupc.reloc.s | 8 +++-- data/overlays/actors/z_eff_dust.data.s | 4 ++- data/overlays/actors/z_eff_dust.reloc.s | 8 +++-- data/overlays/actors/z_elf_msg.data.s | 4 ++- data/overlays/actors/z_elf_msg.reloc.s | 8 +++-- data/overlays/actors/z_elf_msg2.data.s | 4 ++- data/overlays/actors/z_elf_msg2.reloc.s | 8 +++-- data/overlays/actors/z_en_am.data.s | 4 ++- data/overlays/actors/z_en_am.reloc.s | 8 +++-- data/overlays/actors/z_en_anubice.data.s | 4 ++- data/overlays/actors/z_en_anubice.reloc.s | 8 +++-- data/overlays/actors/z_en_anubice_fire.data.s | 4 ++- .../overlays/actors/z_en_anubice_fire.reloc.s | 8 +++-- data/overlays/actors/z_en_arrow.data.s | 4 ++- data/overlays/actors/z_en_arrow.reloc.s | 8 +++-- data/overlays/actors/z_en_attack_niw.data.s | 4 ++- data/overlays/actors/z_en_attack_niw.reloc.s | 8 +++-- data/overlays/actors/z_en_ba.data.s | 4 ++- data/overlays/actors/z_en_ba.reloc.s | 8 +++-- data/overlays/actors/z_en_bb.data.s | 4 ++- data/overlays/actors/z_en_bb.reloc.s | 8 +++-- data/overlays/actors/z_en_bdfire.data.s | 4 ++- data/overlays/actors/z_en_bdfire.reloc.s | 8 +++-- data/overlays/actors/z_en_bigokuta.data.s | 4 ++- data/overlays/actors/z_en_bigokuta.reloc.s | 8 +++-- data/overlays/actors/z_en_bili.data.s | 4 ++- data/overlays/actors/z_en_bili.reloc.s | 8 +++-- data/overlays/actors/z_en_bird.reloc.s | 3 ++ data/overlays/actors/z_en_blkobj.data.s | 4 ++- data/overlays/actors/z_en_blkobj.reloc.s | 8 +++-- data/overlays/actors/z_en_bom.data.s | 4 ++- data/overlays/actors/z_en_bom.reloc.s | 8 +++-- data/overlays/actors/z_en_bom_bowl_man.data.s | 4 ++- .../overlays/actors/z_en_bom_bowl_man.reloc.s | 8 +++-- data/overlays/actors/z_en_bom_bowl_pit.data.s | 4 ++- .../overlays/actors/z_en_bom_bowl_pit.reloc.s | 8 +++-- data/overlays/actors/z_en_bom_chu.data.s | 4 ++- data/overlays/actors/z_en_bom_chu.reloc.s | 8 +++-- data/overlays/actors/z_en_bombf.data.s | 4 ++- data/overlays/actors/z_en_bombf.reloc.s | 8 +++-- data/overlays/actors/z_en_box.bss.s | 6 ++-- data/overlays/actors/z_en_box.data.s | 4 ++- data/overlays/actors/z_en_box.reloc.s | 8 +++-- data/overlays/actors/z_en_brob.data.s | 4 ++- data/overlays/actors/z_en_brob.reloc.s | 8 +++-- data/overlays/actors/z_en_bubble.data.s | 4 ++- data/overlays/actors/z_en_bubble.reloc.s | 8 +++-- data/overlays/actors/z_en_butte.data.s | 4 ++- data/overlays/actors/z_en_butte.reloc.s | 8 +++-- data/overlays/actors/z_en_bw.data.s | 4 ++- data/overlays/actors/z_en_bw.reloc.s | 8 +++-- data/overlays/actors/z_en_bx.data.s | 4 ++- data/overlays/actors/z_en_bx.reloc.s | 8 +++-- data/overlays/actors/z_en_changer.data.s | 4 ++- data/overlays/actors/z_en_changer.reloc.s | 8 +++-- data/overlays/actors/z_en_clear_tag.bss.s | 6 ++-- data/overlays/actors/z_en_clear_tag.data.s | 4 ++- data/overlays/actors/z_en_clear_tag.reloc.s | 8 +++-- data/overlays/actors/z_en_crow.data.s | 4 ++- data/overlays/actors/z_en_crow.reloc.s | 8 +++-- data/overlays/actors/z_en_cs.data.s | 4 ++- data/overlays/actors/z_en_cs.reloc.s | 8 +++-- data/overlays/actors/z_en_daiku.data.s | 4 ++- data/overlays/actors/z_en_daiku.reloc.s | 8 +++-- .../actors/z_en_daiku_kakariko.data.s | 4 ++- .../actors/z_en_daiku_kakariko.reloc.s | 8 +++-- data/overlays/actors/z_en_dekubaba.data.s | 4 ++- data/overlays/actors/z_en_dekubaba.reloc.s | 8 +++-- data/overlays/actors/z_en_dekunuts.data.s | 4 ++- data/overlays/actors/z_en_dekunuts.reloc.s | 8 +++-- data/overlays/actors/z_en_dh.data.s | 4 ++- data/overlays/actors/z_en_dh.reloc.s | 8 +++-- data/overlays/actors/z_en_diving_game.data.s | 4 ++- data/overlays/actors/z_en_diving_game.reloc.s | 8 +++-- data/overlays/actors/z_en_dns.data.s | 4 ++- data/overlays/actors/z_en_dns.reloc.s | 8 +++-- data/overlays/actors/z_en_dnt_demo.data.s | 4 ++- data/overlays/actors/z_en_dnt_demo.reloc.s | 8 +++-- data/overlays/actors/z_en_dnt_jiji.data.s | 4 ++- data/overlays/actors/z_en_dnt_jiji.reloc.s | 8 +++-- data/overlays/actors/z_en_dnt_nomal.data.s | 4 ++- data/overlays/actors/z_en_dnt_nomal.reloc.s | 8 +++-- data/overlays/actors/z_en_dodojr.data.s | 4 ++- data/overlays/actors/z_en_dodojr.reloc.s | 8 +++-- data/overlays/actors/z_en_dodongo.data.s | 4 ++- data/overlays/actors/z_en_dodongo.reloc.s | 8 +++-- data/overlays/actors/z_en_door.data.s | 4 ++- data/overlays/actors/z_en_door.reloc.s | 8 +++-- data/overlays/actors/z_en_du.data.s | 4 ++- data/overlays/actors/z_en_du.reloc.s | 8 +++-- data/overlays/actors/z_en_dy_extra.data.s | 4 ++- data/overlays/actors/z_en_dy_extra.reloc.s | 8 +++-- data/overlays/actors/z_en_eiyer.data.s | 4 ++- data/overlays/actors/z_en_eiyer.reloc.s | 8 +++-- data/overlays/actors/z_en_elf.data.s | 4 ++- data/overlays/actors/z_en_elf.reloc.s | 8 +++-- data/overlays/actors/z_en_elf.rodata.s | 4 ++- data/overlays/actors/z_en_encount1.data.s | 4 ++- data/overlays/actors/z_en_encount1.reloc.s | 8 +++-- data/overlays/actors/z_en_encount2.data.s | 4 ++- data/overlays/actors/z_en_encount2.reloc.s | 8 +++-- data/overlays/actors/z_en_ex_item.data.s | 4 ++- data/overlays/actors/z_en_ex_item.reloc.s | 8 +++-- data/overlays/actors/z_en_ex_ruppy.data.s | 4 ++- data/overlays/actors/z_en_ex_ruppy.reloc.s | 8 +++-- data/overlays/actors/z_en_fd.data.s | 4 ++- data/overlays/actors/z_en_fd.reloc.s | 8 +++-- data/overlays/actors/z_en_fd_fire.data.s | 4 ++- data/overlays/actors/z_en_fd_fire.reloc.s | 8 +++-- data/overlays/actors/z_en_fhg.data.s | 4 ++- data/overlays/actors/z_en_fhg.reloc.s | 8 +++-- data/overlays/actors/z_en_fhg_fire.data.s | 4 ++- data/overlays/actors/z_en_fhg_fire.reloc.s | 8 +++-- data/overlays/actors/z_en_fire_rock.data.s | 4 ++- data/overlays/actors/z_en_fire_rock.reloc.s | 8 +++-- data/overlays/actors/z_en_firefly.data.s | 4 ++- data/overlays/actors/z_en_firefly.reloc.s | 8 +++-- data/overlays/actors/z_en_fish.data.s | 4 ++- data/overlays/actors/z_en_fish.reloc.s | 8 +++-- data/overlays/actors/z_en_fr.data.s | 4 ++- data/overlays/actors/z_en_fr.reloc.s | 8 +++-- data/overlays/actors/z_en_fw.data.s | 4 ++- data/overlays/actors/z_en_fw.reloc.s | 8 +++-- data/overlays/actors/z_en_fz.data.s | 4 ++- data/overlays/actors/z_en_fz.reloc.s | 8 +++-- data/overlays/actors/z_en_g_switch.data.s | 4 ++- data/overlays/actors/z_en_g_switch.reloc.s | 8 +++-- data/overlays/actors/z_en_ganon_mant.data.s | 4 ++- data/overlays/actors/z_en_ganon_mant.reloc.s | 8 +++-- data/overlays/actors/z_en_ganon_organ.data.s | 2 +- data/overlays/actors/z_en_ganon_organ.reloc.s | 8 +++-- data/overlays/actors/z_en_gb.data.s | 4 ++- data/overlays/actors/z_en_gb.reloc.s | 8 +++-- data/overlays/actors/z_en_gb.rodata.s | 4 ++- data/overlays/actors/z_en_ge1.data.s | 4 ++- data/overlays/actors/z_en_ge1.reloc.s | 8 +++-- data/overlays/actors/z_en_ge2.data.s | 4 ++- data/overlays/actors/z_en_ge2.reloc.s | 8 +++-- data/overlays/actors/z_en_ge3.data.s | 4 ++- data/overlays/actors/z_en_ge3.reloc.s | 8 +++-- data/overlays/actors/z_en_geldb.data.s | 4 ++- data/overlays/actors/z_en_geldb.reloc.s | 8 +++-- data/overlays/actors/z_en_girla.data.s | 4 ++- data/overlays/actors/z_en_girla.reloc.s | 8 +++-- data/overlays/actors/z_en_gm.data.s | 4 ++- data/overlays/actors/z_en_gm.reloc.s | 8 +++-- data/overlays/actors/z_en_go.data.s | 4 ++- data/overlays/actors/z_en_go.reloc.s | 8 +++-- data/overlays/actors/z_en_go.rodata.s | 4 ++- data/overlays/actors/z_en_go2.data.s | 4 ++- data/overlays/actors/z_en_go2.reloc.s | 8 +++-- data/overlays/actors/z_en_go2.rodata.s | 4 ++- data/overlays/actors/z_en_goma.data.s | 4 ++- data/overlays/actors/z_en_goma.reloc.s | 8 +++-- data/overlays/actors/z_en_goroiwa.data.s | 4 ++- data/overlays/actors/z_en_goroiwa.reloc.s | 8 +++-- data/overlays/actors/z_en_gs.data.s | 4 ++- data/overlays/actors/z_en_gs.reloc.s | 8 +++-- data/overlays/actors/z_en_hata.data.s | 4 ++- data/overlays/actors/z_en_hata.reloc.s | 8 +++-- data/overlays/actors/z_en_heishi1.data.s | 4 ++- data/overlays/actors/z_en_heishi1.reloc.s | 8 +++-- data/overlays/actors/z_en_heishi2.reloc.s | 8 +++-- data/overlays/actors/z_en_heishi4.data.s | 4 ++- data/overlays/actors/z_en_heishi4.reloc.s | 8 +++-- data/overlays/actors/z_en_holl.data.s | 4 ++- data/overlays/actors/z_en_holl.reloc.s | 8 +++-- data/overlays/actors/z_en_honotrap.data.s | 4 ++- data/overlays/actors/z_en_honotrap.reloc.s | 8 +++-- data/overlays/actors/z_en_horse.data.s | 4 ++- data/overlays/actors/z_en_horse.reloc.s | 8 +++-- .../actors/z_en_horse_game_check.data.s | 4 ++- .../actors/z_en_horse_game_check.reloc.s | 8 +++-- data/overlays/actors/z_en_horse_ganon.reloc.s | 8 +++-- .../actors/z_en_horse_link_child.data.s | 4 ++- .../actors/z_en_horse_link_child.reloc.s | 8 +++-- data/overlays/actors/z_en_horse_normal.data.s | 4 ++- .../overlays/actors/z_en_horse_normal.reloc.s | 8 +++-- data/overlays/actors/z_en_horse_zelda.data.s | 4 ++- data/overlays/actors/z_en_horse_zelda.reloc.s | 8 +++-- data/overlays/actors/z_en_hs.data.s | 4 ++- data/overlays/actors/z_en_hs.reloc.s | 8 +++-- data/overlays/actors/z_en_hs2.data.s | 4 ++- data/overlays/actors/z_en_hs2.reloc.s | 8 +++-- data/overlays/actors/z_en_hy.data.s | 4 ++- data/overlays/actors/z_en_hy.reloc.s | 8 +++-- data/overlays/actors/z_en_ice_hono.data.s | 4 ++- data/overlays/actors/z_en_ice_hono.reloc.s | 8 +++-- data/overlays/actors/z_en_ik.bss.s | 6 ++-- data/overlays/actors/z_en_ik.data.s | 4 ++- data/overlays/actors/z_en_ik.reloc.s | 8 +++-- data/overlays/actors/z_en_in.data.s | 4 ++- data/overlays/actors/z_en_in.reloc.s | 8 +++-- data/overlays/actors/z_en_insect.data.s | 4 ++- data/overlays/actors/z_en_insect.reloc.s | 8 +++-- data/overlays/actors/z_en_ishi.data.s | 4 ++- data/overlays/actors/z_en_ishi.reloc.s | 8 +++-- data/overlays/actors/z_en_jj.data.s | 4 ++- data/overlays/actors/z_en_jj.reloc.s | 8 +++-- data/overlays/actors/z_en_js.data.s | 4 ++- data/overlays/actors/z_en_js.reloc.s | 8 +++-- data/overlays/actors/z_en_jsjutan.bss.s | 6 ++-- data/overlays/actors/z_en_jsjutan.data.s | 4 ++- data/overlays/actors/z_en_jsjutan.reloc.s | 8 +++-- data/overlays/actors/z_en_kakasi.data.s | 4 ++- data/overlays/actors/z_en_kakasi.reloc.s | 8 +++-- data/overlays/actors/z_en_kakasi2.data.s | 4 ++- data/overlays/actors/z_en_kakasi2.reloc.s | 8 +++-- data/overlays/actors/z_en_kakasi3.data.s | 4 ++- data/overlays/actors/z_en_kakasi3.reloc.s | 8 +++-- data/overlays/actors/z_en_kanban.data.s | 4 ++- data/overlays/actors/z_en_kanban.reloc.s | 8 +++-- data/overlays/actors/z_en_karebaba.data.s | 4 ++- data/overlays/actors/z_en_karebaba.reloc.s | 8 +++-- data/overlays/actors/z_en_ko.data.s | 4 ++- data/overlays/actors/z_en_ko.reloc.s | 8 +++-- data/overlays/actors/z_en_ko.rodata.s | 4 ++- data/overlays/actors/z_en_kusa.data.s | 4 ++- data/overlays/actors/z_en_kusa.reloc.s | 8 +++-- data/overlays/actors/z_en_kz.data.s | 4 ++- data/overlays/actors/z_en_kz.reloc.s | 8 +++-- data/overlays/actors/z_en_light.data.s | 4 ++- data/overlays/actors/z_en_light.reloc.s | 8 +++-- data/overlays/actors/z_en_m_thunder.data.s | 4 ++- data/overlays/actors/z_en_m_thunder.reloc.s | 8 +++-- data/overlays/actors/z_en_mag.data.s | 4 ++- data/overlays/actors/z_en_mag.reloc.s | 8 +++-- data/overlays/actors/z_en_mb.data.s | 4 ++- data/overlays/actors/z_en_mb.reloc.s | 8 +++-- data/overlays/actors/z_en_md.data.s | 4 ++- data/overlays/actors/z_en_md.reloc.s | 8 +++-- data/overlays/actors/z_en_mk.data.s | 4 ++- data/overlays/actors/z_en_mk.reloc.s | 8 +++-- data/overlays/actors/z_en_mm.data.s | 4 ++- data/overlays/actors/z_en_mm.reloc.s | 8 +++-- data/overlays/actors/z_en_mm2.data.s | 4 ++- data/overlays/actors/z_en_mm2.reloc.s | 8 +++-- data/overlays/actors/z_en_mu.data.s | 4 ++- data/overlays/actors/z_en_mu.reloc.s | 8 +++-- data/overlays/actors/z_en_nb.data.s | 4 ++- data/overlays/actors/z_en_nb.reloc.s | 8 +++-- data/overlays/actors/z_en_niw.data.s | 4 ++- data/overlays/actors/z_en_niw.reloc.s | 8 +++-- data/overlays/actors/z_en_niw.rodata.s | 32 ++----------------- data/overlays/actors/z_en_niw_girl.data.s | 4 ++- data/overlays/actors/z_en_niw_girl.reloc.s | 8 +++-- data/overlays/actors/z_en_niw_lady.data.s | 4 ++- data/overlays/actors/z_en_niw_lady.reloc.s | 8 +++-- data/overlays/actors/z_en_nwc.data.s | 4 ++- data/overlays/actors/z_en_nwc.reloc.s | 8 +++-- data/overlays/actors/z_en_ny.data.s | 4 ++- data/overlays/actors/z_en_ny.reloc.s | 8 +++-- data/overlays/actors/z_en_okarina_tag.data.s | 4 ++- data/overlays/actors/z_en_okarina_tag.reloc.s | 8 +++-- data/overlays/actors/z_en_okuta.data.s | 4 ++- data/overlays/actors/z_en_okuta.reloc.s | 8 +++-- data/overlays/actors/z_en_ossan.data.s | 4 ++- data/overlays/actors/z_en_ossan.reloc.s | 8 +++-- data/overlays/actors/z_en_owl.data.s | 4 ++- data/overlays/actors/z_en_owl.reloc.s | 8 +++-- data/overlays/actors/z_en_part.data.s | 4 ++- data/overlays/actors/z_en_part.reloc.s | 8 +++-- data/overlays/actors/z_en_peehat.data.s | 4 ++- data/overlays/actors/z_en_peehat.reloc.s | 8 +++-- data/overlays/actors/z_en_po_desert.data.s | 4 ++- data/overlays/actors/z_en_po_desert.reloc.s | 8 +++-- data/overlays/actors/z_en_po_field.bss.s | 6 ++-- data/overlays/actors/z_en_po_field.data.s | 4 ++- data/overlays/actors/z_en_po_field.reloc.s | 8 +++-- data/overlays/actors/z_en_po_relay.data.s | 4 ++- data/overlays/actors/z_en_po_relay.reloc.s | 8 +++-- data/overlays/actors/z_en_po_sisters.data.s | 4 ++- data/overlays/actors/z_en_po_sisters.reloc.s | 8 +++-- data/overlays/actors/z_en_poh.data.s | 4 ++- data/overlays/actors/z_en_poh.reloc.s | 8 +++-- data/overlays/actors/z_en_rd.data.s | 4 ++- data/overlays/actors/z_en_rd.reloc.s | 8 +++-- data/overlays/actors/z_en_reeba.data.s | 4 ++- data/overlays/actors/z_en_reeba.reloc.s | 8 +++-- data/overlays/actors/z_en_river_sound.data.s | 4 ++- data/overlays/actors/z_en_river_sound.reloc.s | 8 +++-- data/overlays/actors/z_en_rl.data.s | 4 ++- data/overlays/actors/z_en_rl.reloc.s | 8 +++-- data/overlays/actors/z_en_rr.data.s | 4 ++- data/overlays/actors/z_en_rr.reloc.s | 8 +++-- data/overlays/actors/z_en_sa.data.s | 4 ++- data/overlays/actors/z_en_sa.reloc.s | 8 +++-- data/overlays/actors/z_en_sda.bss.s | 6 ++-- data/overlays/actors/z_en_sda.data.s | 4 ++- data/overlays/actors/z_en_sda.reloc.s | 8 +++-- data/overlays/actors/z_en_shopnuts.data.s | 4 ++- data/overlays/actors/z_en_shopnuts.reloc.s | 8 +++-- data/overlays/actors/z_en_si.data.s | 4 ++- data/overlays/actors/z_en_si.reloc.s | 8 +++-- data/overlays/actors/z_en_siofuki.data.s | 4 ++- data/overlays/actors/z_en_siofuki.reloc.s | 8 +++-- data/overlays/actors/z_en_skb.data.s | 4 ++- data/overlays/actors/z_en_skb.reloc.s | 8 +++-- data/overlays/actors/z_en_skj.bss.s | 6 ++-- data/overlays/actors/z_en_skj.data.s | 4 ++- data/overlays/actors/z_en_skj.reloc.s | 8 +++-- data/overlays/actors/z_en_skj.rodata.s | 4 ++- data/overlays/actors/z_en_ssh.data.s | 4 ++- data/overlays/actors/z_en_ssh.reloc.s | 8 +++-- data/overlays/actors/z_en_st.data.s | 4 ++- data/overlays/actors/z_en_st.reloc.s | 8 +++-- data/overlays/actors/z_en_sth.data.s | 4 ++- data/overlays/actors/z_en_sth.reloc.s | 8 +++-- data/overlays/actors/z_en_stream.data.s | 4 ++- data/overlays/actors/z_en_stream.reloc.s | 8 +++-- data/overlays/actors/z_en_sw.bss.s | 6 ++-- data/overlays/actors/z_en_sw.data.s | 4 ++- data/overlays/actors/z_en_sw.reloc.s | 8 +++-- data/overlays/actors/z_en_syateki_itm.data.s | 4 ++- data/overlays/actors/z_en_syateki_itm.reloc.s | 8 +++-- data/overlays/actors/z_en_syateki_man.data.s | 4 ++- data/overlays/actors/z_en_syateki_man.reloc.s | 8 +++-- data/overlays/actors/z_en_syateki_niw.data.s | 4 ++- data/overlays/actors/z_en_syateki_niw.reloc.s | 8 +++-- data/overlays/actors/z_en_ta.data.s | 4 ++- data/overlays/actors/z_en_ta.reloc.s | 8 +++-- data/overlays/actors/z_en_takara_man.data.s | 4 ++- data/overlays/actors/z_en_takara_man.reloc.s | 8 +++-- data/overlays/actors/z_en_test.data.s | 4 ++- data/overlays/actors/z_en_test.reloc.s | 8 +++-- data/overlays/actors/z_en_tg.data.s | 4 ++- data/overlays/actors/z_en_tg.reloc.s | 8 +++-- data/overlays/actors/z_en_tite.data.s | 4 ++- data/overlays/actors/z_en_tite.reloc.s | 8 +++-- data/overlays/actors/z_en_torch2.bss.s | 6 ++-- data/overlays/actors/z_en_torch2.data.s | 4 ++- data/overlays/actors/z_en_torch2.reloc.s | 8 +++-- data/overlays/actors/z_en_toryo.data.s | 4 ++- data/overlays/actors/z_en_toryo.reloc.s | 8 +++-- data/overlays/actors/z_en_tp.data.s | 4 ++- data/overlays/actors/z_en_tp.reloc.s | 8 +++-- data/overlays/actors/z_en_tr.data.s | 4 ++- data/overlays/actors/z_en_tr.reloc.s | 8 +++-- data/overlays/actors/z_en_trap.data.s | 4 ++- data/overlays/actors/z_en_trap.reloc.s | 8 +++-- data/overlays/actors/z_en_tubo_trap.reloc.s | 3 ++ data/overlays/actors/z_en_vali.data.s | 4 ++- data/overlays/actors/z_en_vali.reloc.s | 8 +++-- data/overlays/actors/z_en_vb_ball.data.s | 4 ++- data/overlays/actors/z_en_vb_ball.reloc.s | 8 +++-- data/overlays/actors/z_en_viewer.bss.s | 6 ++-- data/overlays/actors/z_en_viewer.data.s | 4 ++- data/overlays/actors/z_en_viewer.reloc.s | 8 +++-- data/overlays/actors/z_en_vm.data.s | 4 ++- data/overlays/actors/z_en_vm.reloc.s | 8 +++-- data/overlays/actors/z_en_wall_tubo.data.s | 4 ++- data/overlays/actors/z_en_wall_tubo.reloc.s | 8 +++-- data/overlays/actors/z_en_weather_tag.data.s | 4 ++- data/overlays/actors/z_en_weather_tag.reloc.s | 8 +++-- data/overlays/actors/z_en_weiyer.data.s | 4 ++- data/overlays/actors/z_en_weiyer.reloc.s | 8 +++-- data/overlays/actors/z_en_wf.data.s | 4 ++- data/overlays/actors/z_en_wf.reloc.s | 8 +++-- data/overlays/actors/z_en_wonder_item.bss.s | 6 ++-- data/overlays/actors/z_en_wonder_item.data.s | 4 ++- data/overlays/actors/z_en_wonder_item.reloc.s | 8 +++-- data/overlays/actors/z_en_wonder_talk.data.s | 4 ++- data/overlays/actors/z_en_wonder_talk.reloc.s | 8 +++-- data/overlays/actors/z_en_wonder_talk2.data.s | 4 ++- .../overlays/actors/z_en_wonder_talk2.reloc.s | 8 +++-- data/overlays/actors/z_en_wood02.bss.s | 6 ++-- data/overlays/actors/z_en_wood02.data.s | 4 ++- data/overlays/actors/z_en_wood02.reloc.s | 8 +++-- data/overlays/actors/z_en_xc.bss.s | 6 ++-- data/overlays/actors/z_en_xc.data.s | 4 ++- data/overlays/actors/z_en_xc.reloc.s | 8 +++-- .../overlays/actors/z_en_yabusame_mark.data.s | 4 ++- .../actors/z_en_yabusame_mark.reloc.s | 8 +++-- data/overlays/actors/z_en_yukabyun.data.s | 4 ++- data/overlays/actors/z_en_yukabyun.reloc.s | 8 +++-- data/overlays/actors/z_en_zf.bss.s | 6 ++-- data/overlays/actors/z_en_zf.data.s | 4 ++- data/overlays/actors/z_en_zf.reloc.s | 8 +++-- data/overlays/actors/z_en_zl1.data.s | 4 ++- data/overlays/actors/z_en_zl1.reloc.s | 8 +++-- data/overlays/actors/z_en_zl2.data.s | 4 ++- data/overlays/actors/z_en_zl2.reloc.s | 8 +++-- data/overlays/actors/z_en_zl3.data.s | 4 ++- data/overlays/actors/z_en_zl3.reloc.s | 8 +++-- data/overlays/actors/z_en_zl4.data.s | 4 ++- data/overlays/actors/z_en_zl4.reloc.s | 8 +++-- data/overlays/actors/z_en_zo.data.s | 4 ++- data/overlays/actors/z_en_zo.reloc.s | 8 +++-- data/overlays/actors/z_end_title.data.s | 4 ++- data/overlays/actors/z_end_title.reloc.s | 8 +++-- data/overlays/actors/z_fishing.bss.s | 6 ++-- data/overlays/actors/z_fishing.data.s | 4 ++- data/overlays/actors/z_fishing.reloc.s | 8 +++-- data/overlays/actors/z_item_b_heart.data.s | 4 ++- data/overlays/actors/z_item_b_heart.reloc.s | 8 +++-- data/overlays/actors/z_item_etcetera.data.s | 4 ++- data/overlays/actors/z_item_etcetera.reloc.s | 8 +++-- data/overlays/actors/z_item_ocarina.data.s | 4 ++- data/overlays/actors/z_item_ocarina.reloc.s | 8 +++-- data/overlays/actors/z_item_shield.data.s | 4 ++- data/overlays/actors/z_item_shield.reloc.s | 8 +++-- data/overlays/actors/z_kaleido_scope.bss.s | 6 ++-- data/overlays/actors/z_kaleido_scope.data.s | 4 ++- data/overlays/actors/z_kaleido_scope.reloc.s | 8 +++-- data/overlays/actors/z_kaleido_scope.rodata.s | 12 +++++-- data/overlays/actors/z_magic_dark.data.s | 4 ++- data/overlays/actors/z_magic_dark.reloc.s | 8 +++-- data/overlays/actors/z_magic_fire.data.s | 4 ++- data/overlays/actors/z_magic_fire.reloc.s | 8 +++-- data/overlays/actors/z_mir_ray.data.s | 4 ++- data/overlays/actors/z_mir_ray.reloc.s | 8 +++-- data/overlays/actors/z_obj_bean.data.s | 4 ++- data/overlays/actors/z_obj_bean.reloc.s | 8 +++-- data/overlays/actors/z_obj_dekujr.data.s | 4 ++- data/overlays/actors/z_obj_dekujr.reloc.s | 8 +++-- data/overlays/actors/z_obj_hamishi.data.s | 4 ++- data/overlays/actors/z_obj_hamishi.reloc.s | 8 +++-- data/overlays/actors/z_obj_hana.data.s | 4 ++- data/overlays/actors/z_obj_hana.reloc.s | 8 +++-- data/overlays/actors/z_obj_hsblock.data.s | 4 ++- data/overlays/actors/z_obj_hsblock.reloc.s | 8 +++-- data/overlays/actors/z_obj_ice_poly.data.s | 4 ++- data/overlays/actors/z_obj_ice_poly.reloc.s | 8 +++-- data/overlays/actors/z_obj_kibako.data.s | 4 ++- data/overlays/actors/z_obj_kibako.reloc.s | 8 +++-- data/overlays/actors/z_obj_kibako2.data.s | 4 ++- data/overlays/actors/z_obj_kibako2.reloc.s | 8 +++-- data/overlays/actors/z_obj_lift.data.s | 4 ++- data/overlays/actors/z_obj_lift.reloc.s | 8 +++-- data/overlays/actors/z_obj_lightswitch.data.s | 4 ++- .../overlays/actors/z_obj_lightswitch.reloc.s | 8 +++-- .../overlays/actors/z_obj_makeoshihiki.data.s | 4 ++- .../actors/z_obj_makeoshihiki.reloc.s | 8 +++-- data/overlays/actors/z_obj_mure.data.s | 4 ++- data/overlays/actors/z_obj_mure.reloc.s | 8 +++-- data/overlays/actors/z_obj_mure2.data.s | 4 ++- data/overlays/actors/z_obj_mure2.reloc.s | 8 +++-- data/overlays/actors/z_obj_mure3.data.s | 4 ++- data/overlays/actors/z_obj_mure3.reloc.s | 8 +++-- data/overlays/actors/z_obj_oshihiki.data.s | 4 ++- data/overlays/actors/z_obj_oshihiki.reloc.s | 8 +++-- data/overlays/actors/z_obj_oshihiki.rodata.s | 6 ++-- data/overlays/actors/z_obj_switch.data.s | 4 ++- data/overlays/actors/z_obj_switch.reloc.s | 8 +++-- data/overlays/actors/z_obj_syokudai.bss.s | 6 ++-- data/overlays/actors/z_obj_syokudai.data.s | 4 ++- data/overlays/actors/z_obj_syokudai.reloc.s | 8 +++-- data/overlays/actors/z_obj_timeblock.data.s | 4 ++- data/overlays/actors/z_obj_timeblock.reloc.s | 8 +++-- data/overlays/actors/z_obj_tsubo.data.s | 4 ++- data/overlays/actors/z_obj_tsubo.reloc.s | 8 +++-- data/overlays/actors/z_obj_warp2block.data.s | 4 ++- data/overlays/actors/z_obj_warp2block.reloc.s | 8 +++-- data/overlays/actors/z_object_kankyo.data.s | 4 ++- data/overlays/actors/z_object_kankyo.reloc.s | 8 +++-- data/overlays/actors/z_object_kankyo.rodata.s | 4 ++- data/overlays/actors/z_player.bss.s | 6 ++-- data/overlays/actors/z_player.data.s | 4 ++- data/overlays/actors/z_player.reloc.s | 8 +++-- data/overlays/actors/z_shot_sun.data.s | 4 ++- data/overlays/actors/z_shot_sun.reloc.s | 8 +++-- data/overlays/effects/z_eff_ss_blast.data.s | 4 ++- data/overlays/effects/z_eff_ss_blast.reloc.s | 8 +++-- data/overlays/effects/z_eff_ss_blast.rodata.s | 4 ++- data/overlays/effects/z_eff_ss_bomb.data.s | 4 ++- data/overlays/effects/z_eff_ss_bomb.reloc.s | 8 +++-- data/overlays/effects/z_eff_ss_bomb.rodata.s | 4 ++- data/overlays/effects/z_eff_ss_bomb2.data.s | 4 ++- data/overlays/effects/z_eff_ss_bomb2.reloc.s | 8 +++-- data/overlays/effects/z_eff_ss_bomb2.rodata.s | 4 ++- data/overlays/effects/z_eff_ss_bubble.data.s | 4 ++- data/overlays/effects/z_eff_ss_bubble.reloc.s | 8 +++-- .../overlays/effects/z_eff_ss_bubble.rodata.s | 4 ++- data/overlays/effects/z_eff_ss_d_fire.data.s | 4 ++- data/overlays/effects/z_eff_ss_d_fire.reloc.s | 8 +++-- .../overlays/effects/z_eff_ss_d_fire.rodata.s | 4 ++- data/overlays/effects/z_eff_ss_dead_db.data.s | 4 ++- .../overlays/effects/z_eff_ss_dead_db.reloc.s | 8 +++-- .../effects/z_eff_ss_dead_db.rodata.s | 4 ++- data/overlays/effects/z_eff_ss_dead_dd.data.s | 4 ++- .../overlays/effects/z_eff_ss_dead_dd.reloc.s | 8 +++-- .../effects/z_eff_ss_dead_dd.rodata.s | 4 ++- data/overlays/effects/z_eff_ss_dead_ds.data.s | 4 ++- .../overlays/effects/z_eff_ss_dead_ds.reloc.s | 8 +++-- .../effects/z_eff_ss_dead_ds.rodata.s | 4 ++- .../effects/z_eff_ss_dead_sound.data.s | 4 ++- .../effects/z_eff_ss_dead_sound.reloc.s | 8 +++-- .../effects/z_eff_ss_dead_sound.rodata.s | 4 ++- .../effects/z_eff_ss_dt_bubble.data.s | 4 ++- .../effects/z_eff_ss_dt_bubble.reloc.s | 8 +++-- .../effects/z_eff_ss_dt_bubble.rodata.s | 4 ++- data/overlays/effects/z_eff_ss_dust.data.s | 4 ++- data/overlays/effects/z_eff_ss_dust.reloc.s | 8 +++-- data/overlays/effects/z_eff_ss_dust.rodata.s | 4 ++- data/overlays/effects/z_eff_ss_en_fire.data.s | 4 ++- .../overlays/effects/z_eff_ss_en_fire.reloc.s | 8 +++-- .../effects/z_eff_ss_en_fire.rodata.s | 4 ++- data/overlays/effects/z_eff_ss_en_ice.data.s | 4 ++- data/overlays/effects/z_eff_ss_en_ice.reloc.s | 8 +++-- .../overlays/effects/z_eff_ss_en_ice.rodata.s | 4 ++- data/overlays/effects/z_eff_ss_extra.data.s | 4 ++- data/overlays/effects/z_eff_ss_extra.reloc.s | 8 +++-- data/overlays/effects/z_eff_ss_extra.rodata.s | 7 ++-- data/overlays/effects/z_eff_ss_fcircle.data.s | 4 ++- .../overlays/effects/z_eff_ss_fcircle.reloc.s | 8 +++-- .../effects/z_eff_ss_fcircle.rodata.s | 4 ++- .../effects/z_eff_ss_fhg_flash.data.s | 4 ++- .../effects/z_eff_ss_fhg_flash.reloc.s | 8 +++-- .../effects/z_eff_ss_fhg_flash.rodata.s | 4 ++- .../effects/z_eff_ss_fire_tail.data.s | 4 ++- .../effects/z_eff_ss_fire_tail.reloc.s | 8 +++-- .../effects/z_eff_ss_fire_tail.rodata.s | 4 ++- data/overlays/effects/z_eff_ss_g_fire.data.s | 4 ++- data/overlays/effects/z_eff_ss_g_fire.reloc.s | 8 +++-- data/overlays/effects/z_eff_ss_g_magma.data.s | 4 ++- .../overlays/effects/z_eff_ss_g_magma.reloc.s | 8 +++-- .../overlays/effects/z_eff_ss_g_magma2.data.s | 4 ++- .../effects/z_eff_ss_g_magma2.reloc.s | 8 +++-- .../effects/z_eff_ss_g_magma2.rodata.s | 6 ++-- .../overlays/effects/z_eff_ss_g_ripple.data.s | 4 ++- .../effects/z_eff_ss_g_ripple.reloc.s | 8 +++-- .../effects/z_eff_ss_g_ripple.rodata.s | 4 ++- data/overlays/effects/z_eff_ss_g_spk.data.s | 4 ++- data/overlays/effects/z_eff_ss_g_spk.reloc.s | 8 +++-- data/overlays/effects/z_eff_ss_g_spk.rodata.s | 4 ++- .../overlays/effects/z_eff_ss_g_splash.data.s | 4 ++- .../effects/z_eff_ss_g_splash.reloc.s | 8 +++-- .../effects/z_eff_ss_g_splash.rodata.s | 4 ++- data/overlays/effects/z_eff_ss_hahen.data.s | 4 ++- data/overlays/effects/z_eff_ss_hahen.reloc.s | 8 +++-- data/overlays/effects/z_eff_ss_hahen.rodata.s | 4 ++- data/overlays/effects/z_eff_ss_hitmark.data.s | 4 ++- .../overlays/effects/z_eff_ss_hitmark.reloc.s | 8 +++-- .../effects/z_eff_ss_hitmark.rodata.s | 4 ++- .../effects/z_eff_ss_ice_piece.data.s | 4 ++- .../effects/z_eff_ss_ice_piece.reloc.s | 8 +++-- .../effects/z_eff_ss_ice_piece.rodata.s | 4 ++- .../effects/z_eff_ss_ice_smoke.data.s | 4 ++- .../effects/z_eff_ss_ice_smoke.reloc.s | 8 +++-- .../effects/z_eff_ss_ice_smoke.rodata.s | 4 ++- data/overlays/effects/z_eff_ss_k_fire.data.s | 4 ++- data/overlays/effects/z_eff_ss_k_fire.reloc.s | 8 +++-- .../overlays/effects/z_eff_ss_k_fire.rodata.s | 4 ++- data/overlays/effects/z_eff_ss_kakera.data.s | 4 ++- data/overlays/effects/z_eff_ss_kakera.reloc.s | 8 +++-- .../overlays/effects/z_eff_ss_kakera.rodata.s | 4 ++- .../overlays/effects/z_eff_ss_kirakira.data.s | 4 ++- .../effects/z_eff_ss_kirakira.reloc.s | 8 +++-- .../effects/z_eff_ss_kirakira.rodata.s | 4 ++- .../effects/z_eff_ss_lightning.data.s | 4 ++- .../effects/z_eff_ss_lightning.reloc.s | 8 +++-- .../effects/z_eff_ss_lightning.rodata.s | 4 ++- data/overlays/effects/z_eff_ss_sibuki.data.s | 4 ++- data/overlays/effects/z_eff_ss_sibuki.reloc.s | 8 +++-- .../overlays/effects/z_eff_ss_sibuki.rodata.s | 4 ++- data/overlays/effects/z_eff_ss_sibuki2.data.s | 4 ++- .../overlays/effects/z_eff_ss_sibuki2.reloc.s | 8 +++-- .../effects/z_eff_ss_sibuki2.rodata.s | 6 ++-- .../effects/z_eff_ss_solder_srch_ball.data.s | 4 ++- .../effects/z_eff_ss_solder_srch_ball.reloc.s | 8 +++-- data/overlays/effects/z_eff_ss_stick.data.s | 4 ++- data/overlays/effects/z_eff_ss_stick.reloc.s | 8 +++-- data/overlays/effects/z_eff_ss_stick.rodata.s | 4 ++- data/overlays/effects/z_eff_ss_stone1.data.s | 4 ++- data/overlays/effects/z_eff_ss_stone1.reloc.s | 8 +++-- .../overlays/effects/z_eff_ss_stone1.rodata.s | 4 ++- data/overlays/gamestates/z_file_choose.bss.s | 6 ++-- data/overlays/gamestates/z_file_choose.data.s | 4 ++- .../overlays/gamestates/z_file_choose.reloc.s | 8 +++-- .../gamestates/z_file_choose.rodata.s | 10 +++--- data/overlays/gamestates/z_select.data.s | 4 ++- data/overlays/gamestates/z_select.reloc.s | 8 +++-- data/overlays/gamestates/z_select.rodata.s | 4 ++- data/rsp.rodata.s | 4 +-- data/rsp.text.s | 2 +- data/rsp_boot.text.s | 2 +- data/sins.data.s | 4 ++- data/sys_ucode.data.s | 4 ++- data/z_bgcheck.bss.s | 4 ++- data/z_bgcheck.data.s | 4 ++- data/z_bgcheck.rodata.s | 4 +-- data/z_camera.bss.s | 4 ++- data/z_camera.data.s | 4 ++- data/z_collision_check.bss.s | 4 ++- data/z_effect_soft_sprite_old_init.data.s | 4 ++- data/z_en_a_keep.data.s | 4 ++- data/z_en_item00.bss.s | 4 ++- data/z_en_item00.data.s | 4 ++- data/z_kankyo.bss.s | 4 ++- data/z_kankyo.data.s | 4 ++- data/z_kankyo.rodata.s | 4 +-- data/z_lifemeter.data.s | 4 ++- data/z_lights.bss.s | 4 ++- data/z_lights.data.s | 4 ++- data/z_map_data.data.s | 4 ++- data/z_message_PAL.bss.s | 4 ++- data/z_message_PAL.rodata.s | 4 +-- data/z_onepointdemo.data.s | 4 ++- data/z_player_lib.bss.s | 4 ++- data/z_player_lib.data.s | 4 ++- data/z_skin.bss.s | 4 ++- data/z_skin_matrix.data.s | 4 ++- data/z_sram.data.s | 4 ++- data/z_sram.rodata.s | 4 +-- data/z_text.data.s | 4 ++- data/z_vr_box.data.s | 4 ++- tools/reformat_data_files.py | 2 +- 979 files changed, 3631 insertions(+), 1894 deletions(-) diff --git a/asm/PreRender.s b/asm/PreRender.s index 361dd51880..6f33a6dbf2 100644 --- a/asm/PreRender.s +++ b/asm/PreRender.s @@ -3,11 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.set gp=64 # allow use of 64-bit general purposee registers +.set gp=64 # allow use of 64-bit general purpose registers .section .text -.align 4 +.balign 16 glabel func_800C0E70 /* B38010 800C0E70 AC850008 */ sw $a1, 8($a0) diff --git a/asm/__osDisableInt.s b/asm/__osDisableInt.s index 6e1cf4d131..b3ec3e6304 100644 --- a/asm/__osDisableInt.s +++ b/asm/__osDisableInt.s @@ -3,11 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.set gp=64 # allow use of 64-bit general purposee registers +.set gp=64 # allow use of 64-bit general purpose registers .section .text -.align 4 +.balign 16 glabel __osDisableInt /* 007E80 80007280 3C0A8001 */ lui $t2, %hi(__OSGlobalIntMask) # $t2, 0x8001 diff --git a/asm/__osGetCause.s b/asm/__osGetCause.s index 7dc255fccc..b09caa0178 100644 --- a/asm/__osGetCause.s +++ b/asm/__osGetCause.s @@ -3,11 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.set gp=64 # allow use of 64-bit general purposee registers +.set gp=64 # allow use of 64-bit general purpose registers .section .text -.align 4 +.balign 16 glabel __osGetCause /* 008790 80007B90 40026800 */ mfc0 $v0, $13 diff --git a/asm/__osGetFpcCsr.s b/asm/__osGetFpcCsr.s index 0d15b53034..f3581d77e6 100644 --- a/asm/__osGetFpcCsr.s +++ b/asm/__osGetFpcCsr.s @@ -3,11 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.set gp=64 # allow use of 64-bit general purposee registers +.set gp=64 # allow use of 64-bit general purpose registers .section .text -.align 4 +.balign 16 glabel __osGetFpcCsr /* 008680 80007A80 4442F800 */ cfc1 $v0, $31 diff --git a/asm/__osGetSR.s b/asm/__osGetSR.s index 84e57fc1fa..1eb0414250 100644 --- a/asm/__osGetSR.s +++ b/asm/__osGetSR.s @@ -3,11 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.set gp=64 # allow use of 64-bit general purposee registers +.set gp=64 # allow use of 64-bit general purpose registers .section .text -.align 4 +.balign 16 glabel __osGetSR /* 0052B0 800046B0 40026000 */ mfc0 $v0, $12 diff --git a/asm/__osProbeTLB.s b/asm/__osProbeTLB.s index d938e9cf8d..ea1dc097ff 100644 --- a/asm/__osProbeTLB.s +++ b/asm/__osProbeTLB.s @@ -3,11 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.set gp=64 # allow use of 64-bit general purposee registers +.set gp=64 # allow use of 64-bit general purpose registers .section .text -.align 4 +.balign 16 glabel __osProbeTLB /* 005C40 80005040 40085000 */ mfc0 $t0, $10 diff --git a/asm/__osRestoreInt.s b/asm/__osRestoreInt.s index b32a92e7ed..9a08a319f9 100644 --- a/asm/__osRestoreInt.s +++ b/asm/__osRestoreInt.s @@ -3,11 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.set gp=64 # allow use of 64-bit general purposee registers +.set gp=64 # allow use of 64-bit general purpose registers .section .text -.align 4 +.balign 16 glabel __osRestoreInt /* 007EF0 800072F0 40086000 */ mfc0 $t0, $12 diff --git a/asm/__osSetCompare.s b/asm/__osSetCompare.s index abf6a2045b..aabc65c3ec 100644 --- a/asm/__osSetCompare.s +++ b/asm/__osSetCompare.s @@ -3,11 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.set gp=64 # allow use of 64-bit general purposee registers +.set gp=64 # allow use of 64-bit general purpose registers .section .text -.align 4 +.balign 16 glabel __osSetCompare /* 007B00 80006F00 40845800 */ mtc0 $a0, $11 diff --git a/asm/__osSetFpcCsr.s b/asm/__osSetFpcCsr.s index 47df46710f..5f4570a696 100644 --- a/asm/__osSetFpcCsr.s +++ b/asm/__osSetFpcCsr.s @@ -3,11 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.set gp=64 # allow use of 64-bit general purposee registers +.set gp=64 # allow use of 64-bit general purpose registers .section .text -.align 4 +.balign 16 glabel __osSetFpcCsr /* 008670 80007A70 4442F800 */ cfc1 $v0, $31 diff --git a/asm/__osSetSR.s b/asm/__osSetSR.s index 0e9024f1a4..3a5e3e814e 100644 --- a/asm/__osSetSR.s +++ b/asm/__osSetSR.s @@ -3,11 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.set gp=64 # allow use of 64-bit general purposee registers +.set gp=64 # allow use of 64-bit general purpose registers .section .text -.align 4 +.balign 16 glabel __osSetSR /* 0052A0 800046A0 40846000 */ mtc0 $a0, $12 diff --git a/asm/__osSetWatchLo.s b/asm/__osSetWatchLo.s index 0f1bd10ed6..5e56598208 100644 --- a/asm/__osSetWatchLo.s +++ b/asm/__osSetWatchLo.s @@ -3,11 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.set gp=64 # allow use of 64-bit general purposee registers +.set gp=64 # allow use of 64-bit general purpose registers .section .text -.align 4 +.balign 16 glabel __osSetWatchLo /* 009F10 80009310 40849000 */ mtc0 $a0, $18 diff --git a/asm/bcmp.s b/asm/bcmp.s index a0f1c8d9ce..7e57bdf85c 100644 --- a/asm/bcmp.s +++ b/asm/bcmp.s @@ -3,11 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.set gp=64 # allow use of 64-bit general purposee registers +.set gp=64 # allow use of 64-bit general purpose registers .section .text -.align 4 +.balign 16 glabel bcmp /* 0074C0 800068C0 28C10010 */ slti $at, $a2, 0x10 diff --git a/asm/bcopy.s b/asm/bcopy.s index 36254d5f26..80f29dd5d4 100644 --- a/asm/bcopy.s +++ b/asm/bcopy.s @@ -3,11 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.set gp=64 # allow use of 64-bit general purposee registers +.set gp=64 # allow use of 64-bit general purpose registers .section .text -.align 4 +.balign 16 glabel bcopy /* 007B10 80006F10 10C0001A */ beqz $a2, ret diff --git a/asm/bzero.s b/asm/bzero.s index 7477d3bffd..9f116d49f0 100644 --- a/asm/bzero.s +++ b/asm/bzero.s @@ -3,11 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.set gp=64 # allow use of 64-bit general purposee registers +.set gp=64 # allow use of 64-bit general purpose registers .section .text -.align 4 +.balign 16 glabel bzero /* 005050 80004450 28A1000C */ slti $at, $a1, 0xc diff --git a/asm/code_800BB0A0.s b/asm/code_800BB0A0.s index 665582da17..99c4db3070 100644 --- a/asm/code_800BB0A0.s +++ b/asm/code_800BB0A0.s @@ -3,11 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.set gp=64 # allow use of 64-bit general purposee registers +.set gp=64 # allow use of 64-bit general purpose registers .section .text -.align 4 +.balign 16 glabel func_800BB0A0 /* B32240 800BB0A0 3C013F80 */ li $at, 0x3F800000 # 0.000000 diff --git a/asm/code_800BB570.s b/asm/code_800BB570.s index 547dbf3ff1..6cd5d8b77b 100644 --- a/asm/code_800BB570.s +++ b/asm/code_800BB570.s @@ -3,11 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.set gp=64 # allow use of 64-bit general purposee registers +.set gp=64 # allow use of 64-bit general purpose registers .section .text -.align 4 +.balign 16 glabel func_800BB570 /* B32710 800BB570 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/code_800C3C20.s b/asm/code_800C3C20.s index c346d93fdd..88cedee490 100644 --- a/asm/code_800C3C20.s +++ b/asm/code_800C3C20.s @@ -3,11 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.set gp=64 # allow use of 64-bit general purposee registers +.set gp=64 # allow use of 64-bit general purpose registers .section .text -.align 4 +.balign 16 glabel func_800C3C20 /* B3ADC0 800C3C20 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/code_800D71F0.s b/asm/code_800D71F0.s index f0a1fc7869..0f7195f73a 100644 --- a/asm/code_800D71F0.s +++ b/asm/code_800D71F0.s @@ -3,11 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.set gp=64 # allow use of 64-bit general purposee registers +.set gp=64 # allow use of 64-bit general purpose registers .section .text -.align 4 +.balign 16 glabel func_800D71F0 /* B4E390 800D71F0 34018800 */ li $at, 34816 diff --git a/asm/code_800D7CD0.s b/asm/code_800D7CD0.s index 05bf7d92f5..69c79bc513 100644 --- a/asm/code_800D7CD0.s +++ b/asm/code_800D7CD0.s @@ -3,11 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.set gp=64 # allow use of 64-bit general purposee registers +.set gp=64 # allow use of 64-bit general purpose registers .section .text -.align 4 +.balign 16 glabel func_800D7CD0 /* B4EE70 800D7CD0 00057100 */ sll $t6, $a1, 4 diff --git a/asm/code_800DACC0.s b/asm/code_800DACC0.s index 6575eec9ab..370ed7e447 100644 --- a/asm/code_800DACC0.s +++ b/asm/code_800DACC0.s @@ -3,11 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.set gp=64 # allow use of 64-bit general purposee registers +.set gp=64 # allow use of 64-bit general purpose registers .section .text -.align 4 +.balign 16 /* B51E50 800DACB0 00000000 */ nop /* B51E54 800DACB4 00000000 */ nop diff --git a/asm/code_800DDE20.s b/asm/code_800DDE20.s index d7f875ab9e..ef4848b61a 100644 --- a/asm/code_800DDE20.s +++ b/asm/code_800DDE20.s @@ -3,11 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.set gp=64 # allow use of 64-bit general purposee registers +.set gp=64 # allow use of 64-bit general purpose registers .section .text -.align 4 +.balign 16 glabel func_800DDE20 /* B54FC0 800DDE20 3C014380 */ li $at, 0x43800000 # 0.000000 diff --git a/asm/code_800E11F0.s b/asm/code_800E11F0.s index 100e375774..f99de7610a 100644 --- a/asm/code_800E11F0.s +++ b/asm/code_800E11F0.s @@ -3,11 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.set gp=64 # allow use of 64-bit general purposee registers +.set gp=64 # allow use of 64-bit general purpose registers .section .text -.align 4 +.balign 16 glabel func_800E11F0 /* B58390 800E11F0 3C068017 */ lui $a2, %hi(gAudioContext) # $a2, 0x8017 diff --git a/asm/code_800E88C0.s b/asm/code_800E88C0.s index 8646726a68..af9c64bd78 100644 --- a/asm/code_800E88C0.s +++ b/asm/code_800E88C0.s @@ -3,11 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.set gp=64 # allow use of 64-bit general purposee registers +.set gp=64 # allow use of 64-bit general purpose registers .section .text -.align 4 +.balign 16 glabel func_800E88C0 /* B5FA60 800E88C0 8C820000 */ lw $v0, ($a0) diff --git a/asm/code_800E9340.s b/asm/code_800E9340.s index 036317aceb..68c36842dc 100644 --- a/asm/code_800E9340.s +++ b/asm/code_800E9340.s @@ -3,11 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.set gp=64 # allow use of 64-bit general purposee registers +.set gp=64 # allow use of 64-bit general purpose registers .section .text -.align 4 +.balign 16 glabel func_800E9340 /* B604E0 800E9340 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/code_800EC960.s b/asm/code_800EC960.s index b5bdb4fb7d..dfc621a3c9 100644 --- a/asm/code_800EC960.s +++ b/asm/code_800EC960.s @@ -3,11 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.set gp=64 # allow use of 64-bit general purposee registers +.set gp=64 # allow use of 64-bit general purpose registers .section .text -.align 4 +.balign 16 glabel func_800EC960 /* B63B00 800EC960 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/code_800F7260.s b/asm/code_800F7260.s index c7cd7d6c30..744f3ec587 100644 --- a/asm/code_800F7260.s +++ b/asm/code_800F7260.s @@ -3,11 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.set gp=64 # allow use of 64-bit general purposee registers +.set gp=64 # allow use of 64-bit general purpose registers .section .text -.align 4 +.balign 16 glabel func_800F7260 /* B6E400 800F7260 AFA40000 */ sw $a0, ($sp) diff --git a/asm/code_800F9280.s b/asm/code_800F9280.s index f13b20db82..ec3786fc2e 100644 --- a/asm/code_800F9280.s +++ b/asm/code_800F9280.s @@ -3,11 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.set gp=64 # allow use of 64-bit general purposee registers +.set gp=64 # allow use of 64-bit general purpose registers .section .text -.align 4 +.balign 16 glabel func_800F9280 /* B70420 800F9280 27BDFFC8 */ addiu $sp, $sp, -0x38 diff --git a/asm/code_800FCD40.s b/asm/code_800FCD40.s index afe483f1a2..323bf09a31 100644 --- a/asm/code_800FCD40.s +++ b/asm/code_800FCD40.s @@ -3,11 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.set gp=64 # allow use of 64-bit general purposee registers +.set gp=64 # allow use of 64-bit general purpose registers .section .text -.align 4 +.balign 16 glabel func_800FCD40 /* B73EE0 800FCD40 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/code_80100040.s b/asm/code_80100040.s index 32f1aa84d2..5cb60712ab 100644 --- a/asm/code_80100040.s +++ b/asm/code_80100040.s @@ -3,11 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.set gp=64 # allow use of 64-bit general purposee registers +.set gp=64 # allow use of 64-bit general purpose registers .section .text -.align 4 +.balign 16 glabel func_80100040 /* B771E0 80100040 27BDFEB0 */ addiu $sp, $sp, -0x150 diff --git a/asm/code_801014C0.s b/asm/code_801014C0.s index 4fdae38e27..bf1c8c53b7 100644 --- a/asm/code_801014C0.s +++ b/asm/code_801014C0.s @@ -3,11 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.set gp=64 # allow use of 64-bit general purposee registers +.set gp=64 # allow use of 64-bit general purpose registers .section .text -.align 4 +.balign 16 glabel func_801014C0 /* B78660 801014C0 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/code_80101910.s b/asm/code_80101910.s index 7b281fee36..fc5b9add08 100644 --- a/asm/code_80101910.s +++ b/asm/code_80101910.s @@ -3,11 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.set gp=64 # allow use of 64-bit general purposee registers +.set gp=64 # allow use of 64-bit general purpose registers .section .text -.align 4 +.balign 16 glabel func_80101910 /* B78AB0 80101910 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/code_80101EB0.s b/asm/code_80101EB0.s index 460d280835..22d4a3d684 100644 --- a/asm/code_80101EB0.s +++ b/asm/code_80101EB0.s @@ -3,11 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.set gp=64 # allow use of 64-bit general purposee registers +.set gp=64 # allow use of 64-bit general purpose registers .section .text -.align 4 +.balign 16 glabel func_80101EB0 /* B79050 80101EB0 27BDFD68 */ addiu $sp, $sp, -0x298 diff --git a/asm/code_80102420.s b/asm/code_80102420.s index 64a8f61c94..dfbf3cb295 100644 --- a/asm/code_80102420.s +++ b/asm/code_80102420.s @@ -3,11 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.set gp=64 # allow use of 64-bit general purposee registers +.set gp=64 # allow use of 64-bit general purpose registers .section .text -.align 4 +.balign 16 glabel func_80102420 /* B795C0 80102420 00001825 */ move $v1, $zero diff --git a/asm/code_80102FA0.s b/asm/code_80102FA0.s index 2c2c2383e5..66ffb28d9b 100644 --- a/asm/code_80102FA0.s +++ b/asm/code_80102FA0.s @@ -3,11 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.set gp=64 # allow use of 64-bit general purposee registers +.set gp=64 # allow use of 64-bit general purpose registers .section .text -.align 4 +.balign 16 glabel func_80102FA0 /* B7A140 80102FA0 3C013780 */ li $at, 0x37800000 # 0.000000 diff --git a/asm/code_80103010.s b/asm/code_80103010.s index a90638b457..8c793d47a7 100644 --- a/asm/code_80103010.s +++ b/asm/code_80103010.s @@ -3,11 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.set gp=64 # allow use of 64-bit general purposee registers +.set gp=64 # allow use of 64-bit general purpose registers .section .text -.align 4 +.balign 16 glabel func_80103010 /* B7A1B0 80103010 27BDFF88 */ addiu $sp, $sp, -0x78 diff --git a/asm/code_801041E0.s b/asm/code_801041E0.s index 8e7944688c..15decd0153 100644 --- a/asm/code_801041E0.s +++ b/asm/code_801041E0.s @@ -3,11 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.set gp=64 # allow use of 64-bit general purposee registers +.set gp=64 # allow use of 64-bit general purpose registers .section .text -.align 4 +.balign 16 glabel func_801041E0 /* B7B380 801041E0 27BDFE90 */ addiu $sp, $sp, -0x170 diff --git a/asm/code_80104450.s b/asm/code_80104450.s index cd0b2e7ec6..1b7042222f 100644 --- a/asm/code_80104450.s +++ b/asm/code_80104450.s @@ -3,11 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.set gp=64 # allow use of 64-bit general purposee registers +.set gp=64 # allow use of 64-bit general purpose registers .section .text -.align 4 +.balign 16 glabel func_80104450 /* B7B5F0 80104450 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/code_80104810.s b/asm/code_80104810.s index ac479bf19c..2ae200f477 100644 --- a/asm/code_80104810.s +++ b/asm/code_80104810.s @@ -3,11 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.set gp=64 # allow use of 64-bit general purposee registers +.set gp=64 # allow use of 64-bit general purpose registers .section .text -.align 4 +.balign 16 glabel func_80104810 /* B7B9B0 80104810 27BDFF90 */ addiu $sp, $sp, -0x70 diff --git a/asm/code_80104C80.s b/asm/code_80104C80.s index e638966eac..0fb8e08ef7 100644 --- a/asm/code_80104C80.s +++ b/asm/code_80104C80.s @@ -3,11 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.set gp=64 # allow use of 64-bit general purposee registers +.set gp=64 # allow use of 64-bit general purpose registers .section .text -.align 4 +.balign 16 glabel func_80104C80 /* B7BE20 80104C80 27BDFFA8 */ addiu $sp, $sp, -0x58 diff --git a/asm/code_80104D00.s b/asm/code_80104D00.s index fd63faf3b1..245cffb443 100644 --- a/asm/code_80104D00.s +++ b/asm/code_80104D00.s @@ -3,11 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.set gp=64 # allow use of 64-bit general purposee registers +.set gp=64 # allow use of 64-bit general purpose registers .section .text -.align 4 +.balign 16 glabel func_80104D00 /* B7BEA0 80104D00 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/code_80104D60.s b/asm/code_80104D60.s index 8025725089..3bcfa57919 100644 --- a/asm/code_80104D60.s +++ b/asm/code_80104D60.s @@ -3,11 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.set gp=64 # allow use of 64-bit general purposee registers +.set gp=64 # allow use of 64-bit general purpose registers .section .text -.align 4 +.balign 16 glabel func_80104D60 /* B7BF00 80104D60 27BDFEA0 */ addiu $sp, $sp, -0x160 diff --git a/asm/code_80104F40.s b/asm/code_80104F40.s index d97e884369..969663a2e8 100644 --- a/asm/code_80104F40.s +++ b/asm/code_80104F40.s @@ -3,11 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.set gp=64 # allow use of 64-bit general purposee registers +.set gp=64 # allow use of 64-bit general purpose registers .section .text -.align 4 +.balign 16 glabel func_80104F40 /* B7C0E0 80104F40 27BDFF90 */ addiu $sp, $sp, -0x70 diff --git a/asm/code_80105250.s b/asm/code_80105250.s index b3eee820be..ef3cce4284 100644 --- a/asm/code_80105250.s +++ b/asm/code_80105250.s @@ -3,11 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.set gp=64 # allow use of 64-bit general purposee registers +.set gp=64 # allow use of 64-bit general purpose registers .section .text -.align 4 +.balign 16 glabel func_80105250 /* B7C3F0 80105250 27BDFB38 */ addiu $sp, $sp, -0x4c8 diff --git a/asm/code_80105CF0.s b/asm/code_80105CF0.s index f7ad730e0a..1d59931d6a 100644 --- a/asm/code_80105CF0.s +++ b/asm/code_80105CF0.s @@ -3,11 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.set gp=64 # allow use of 64-bit general purposee registers +.set gp=64 # allow use of 64-bit general purpose registers .section .text -.align 4 +.balign 16 glabel func_80105CF0 /* B7CE90 80105CF0 27BDFF98 */ addiu $sp, $sp, -0x68 diff --git a/asm/code_80106550.s b/asm/code_80106550.s index 77e20b76c3..f58a4c92a6 100644 --- a/asm/code_80106550.s +++ b/asm/code_80106550.s @@ -3,11 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.set gp=64 # allow use of 64-bit general purposee registers +.set gp=64 # allow use of 64-bit general purpose registers .section .text -.align 4 +.balign 16 glabel __d_to_ll /* B7D6F0 80106550 46206109 */ trunc.l.d $f4, $f12 diff --git a/asm/entry.s b/asm/entry.s index f2cb1c3d6f..1931e91d24 100644 --- a/asm/entry.s +++ b/asm/entry.s @@ -3,7 +3,7 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.set gp=64 # allow use of 64-bit general purposee registers +.set gp=64 # allow use of 64-bit general purpose registers .section .text diff --git a/asm/exceptasm.s b/asm/exceptasm.s index c81bdeed24..4bcad4d425 100644 --- a/asm/exceptasm.s +++ b/asm/exceptasm.s @@ -3,7 +3,7 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.set gp=64 # allow use of 64-bit general purposee registers +.set gp=64 # allow use of 64-bit general purpose registers .section .data @@ -67,7 +67,7 @@ glabel __osIntTable .section .text -.align 4 +.balign 16 glabel __osExceptionPreamble /* 0045D0 800039D0 3C1A8000 */ lui $k0, %hi(__osException) # $k0, 0x8000 diff --git a/asm/guMtxF2L.s b/asm/guMtxF2L.s index 01fd6d1bee..1590dbb505 100644 --- a/asm/guMtxF2L.s +++ b/asm/guMtxF2L.s @@ -3,11 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.set gp=64 # allow use of 64-bit general purposee registers +.set gp=64 # allow use of 64-bit general purpose registers .section .text -.align 4 +.balign 16 /* B7D670 801064D0 00000000 */ nop /* B7D674 801064D4 00000000 */ nop diff --git a/asm/guMtxIdent.s b/asm/guMtxIdent.s index 82f35856ed..ec69b0d39b 100644 --- a/asm/guMtxIdent.s +++ b/asm/guMtxIdent.s @@ -3,11 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.set gp=64 # allow use of 64-bit general purposee registers +.set gp=64 # allow use of 64-bit general purpose registers .section .text -.align 4 +.balign 16 glabel guMtxIdent /* B7AD00 80103B60 20080001 */ addi $t0, $zero, 1 diff --git a/asm/guMtxIdentF.s b/asm/guMtxIdentF.s index 993ed27ab1..5eb2d80109 100644 --- a/asm/guMtxIdentF.s +++ b/asm/guMtxIdentF.s @@ -3,11 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.set gp=64 # allow use of 64-bit general purposee registers +.set gp=64 # allow use of 64-bit general purpose registers .section .text -.align 4 +.balign 16 ## Handwritten ASM diff --git a/asm/guNormalize.s b/asm/guNormalize.s index 7f43407d0f..a2a702ad43 100644 --- a/asm/guNormalize.s +++ b/asm/guNormalize.s @@ -3,11 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.set gp=64 # allow use of 64-bit general purposee registers +.set gp=64 # allow use of 64-bit general purpose registers .section .text -.align 4 +.balign 16 /* B7B2F0 80104150 00000000 */ nop /* B7B2F4 80104154 00000000 */ nop diff --git a/asm/guScale.s b/asm/guScale.s index 856b8d31ac..89d1393ee7 100644 --- a/asm/guScale.s +++ b/asm/guScale.s @@ -3,11 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.set gp=64 # allow use of 64-bit general purposee registers +.set gp=64 # allow use of 64-bit general purpose registers .section .text -.align 4 +.balign 16 glabel guScale /* B77380 801001E0 3C014780 */ li $at, 0x47800000 # 0.000000 diff --git a/asm/guTranslate.s b/asm/guTranslate.s index 9d0887fe1e..ef0d103299 100644 --- a/asm/guTranslate.s +++ b/asm/guTranslate.s @@ -3,11 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.set gp=64 # allow use of 64-bit general purposee registers +.set gp=64 # allow use of 64-bit general purpose registers .section .text -.align 4 +.balign 16 /* B7CDB0 80105C10 00000000 */ nop /* B7CDB4 80105C14 00000000 */ nop diff --git a/asm/ipl3.s b/asm/ipl3.s index 179b55e946..e864b10879 100644 --- a/asm/ipl3.s +++ b/asm/ipl3.s @@ -3,7 +3,7 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.set gp=64 # allow use of 64-bit general purposee registers +.set gp=64 # allow use of 64-bit general purpose registers .section .text diff --git a/asm/jpegdecoder.s b/asm/jpegdecoder.s index 4b2cc5b29b..88604ee3d8 100644 --- a/asm/jpegdecoder.s +++ b/asm/jpegdecoder.s @@ -3,11 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.set gp=64 # allow use of 64-bit general purposee registers +.set gp=64 # allow use of 64-bit general purpose registers .section .text -.align 4 +.balign 16 glabel func_800FFA50 /* B76BF0 800FFA50 27BDFF98 */ addiu $sp, $sp, -0x68 diff --git a/asm/libm.s b/asm/libm.s index b2a5ef9164..91b31fcd80 100644 --- a/asm/libm.s +++ b/asm/libm.s @@ -3,11 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.set gp=64 # allow use of 64-bit general purposee registers +.set gp=64 # allow use of 64-bit general purpose registers .section .text -.align 4 +.balign 16 glabel __ull_rshift /* 004310 80003710 AFA40000 */ sw $a0, ($sp) diff --git a/asm/osGetCount.s b/asm/osGetCount.s index 7017c44665..1bf90fada3 100644 --- a/asm/osGetCount.s +++ b/asm/osGetCount.s @@ -3,11 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.set gp=64 # allow use of 64-bit general purposee registers +.set gp=64 # allow use of 64-bit general purpose registers .section .text -.align 4 +.balign 16 glabel osGetCount /* 007AA0 80006EA0 40024800 */ mfc0 $v0, $9 diff --git a/asm/osInvalDCache.s b/asm/osInvalDCache.s index 0e84a0f770..06ce7df15c 100644 --- a/asm/osInvalDCache.s +++ b/asm/osInvalDCache.s @@ -3,11 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.set gp=64 # allow use of 64-bit general purposee registers +.set gp=64 # allow use of 64-bit general purpose registers .section .text -.align 4 +.balign 16 glabel osInvalDCache /* 006E00 80006200 18A0001F */ blez $a1, .L80006280 diff --git a/asm/osInvalICache.s b/asm/osInvalICache.s index baed514651..ad774bbd49 100644 --- a/asm/osInvalICache.s +++ b/asm/osInvalICache.s @@ -3,11 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.set gp=64 # allow use of 64-bit general purposee registers +.set gp=64 # allow use of 64-bit general purpose registers .section .text -.align 4 +.balign 16 glabel osInvalICache /* 006D50 80006150 18A00011 */ blez $a1, .L80006198 diff --git a/asm/osMapTLBRdb.s b/asm/osMapTLBRdb.s index 96a2d21d78..5375f7beaa 100644 --- a/asm/osMapTLBRdb.s +++ b/asm/osMapTLBRdb.s @@ -3,11 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.set gp=64 # allow use of 64-bit general purposee registers +.set gp=64 # allow use of 64-bit general purpose registers .section .text -.align 4 +.balign 16 glabel osMapTLBRdb /* 0086E0 80007AE0 40085000 */ mfc0 $t0, $10 diff --git a/asm/osSetIntMask.s b/asm/osSetIntMask.s index 7653e3172f..232549d61f 100644 --- a/asm/osSetIntMask.s +++ b/asm/osSetIntMask.s @@ -3,11 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.set gp=64 # allow use of 64-bit general purposee registers +.set gp=64 # allow use of 64-bit general purpose registers .section .text -.align 4 +.balign 16 glabel osSetIntMask /* 005B40 80004F40 400C6000 */ mfc0 $t4, $12 diff --git a/asm/osUnmapTLBAll.s b/asm/osUnmapTLBAll.s index 754c2887c4..3a216642a8 100644 --- a/asm/osUnmapTLBAll.s +++ b/asm/osUnmapTLBAll.s @@ -3,11 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.set gp=64 # allow use of 64-bit general purposee registers +.set gp=64 # allow use of 64-bit general purpose registers .section .text -.align 4 +.balign 16 glabel osUnmapTLBAll /* 006BC0 80005FC0 40085000 */ mfc0 $t0, $10 diff --git a/asm/osWritebackDCache.s b/asm/osWritebackDCache.s index c6737e0ef4..f59c6e6ae6 100644 --- a/asm/osWritebackDCache.s +++ b/asm/osWritebackDCache.s @@ -3,11 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.set gp=64 # allow use of 64-bit general purposee registers +.set gp=64 # allow use of 64-bit general purpose registers .section .text -.align 4 +.balign 16 glabel osWritebackDCache /* 0052C0 800046C0 18A00011 */ blez $a1, .L80004708 diff --git a/asm/osWritebackDCacheAll.s b/asm/osWritebackDCacheAll.s index 1306cc8f3a..a3976b395a 100644 --- a/asm/osWritebackDCacheAll.s +++ b/asm/osWritebackDCacheAll.s @@ -3,11 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.set gp=64 # allow use of 64-bit general purposee registers +.set gp=64 # allow use of 64-bit general purpose registers .section .text -.align 4 +.balign 16 glabel osWritebackDCacheAll /* B7D630 80106490 3C088000 */ lui $t0, %hi(D_80000010) # $t0, 0x8000 diff --git a/asm/overlays/data/ovl_map_mark_data/z_map_mark_data.s b/asm/overlays/data/ovl_map_mark_data/z_map_mark_data.s index 1835309ae3..ba3f0054ad 100644 --- a/asm/overlays/data/ovl_map_mark_data/z_map_mark_data.s +++ b/asm/overlays/data/ovl_map_mark_data/z_map_mark_data.s @@ -3,7 +3,7 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.set gp=64 # allow use of 64-bit general purposee registers +.set gp=64 # allow use of 64-bit general purpose registers .section .data diff --git a/asm/yaz0_old.s b/asm/yaz0_old.s index af5c50743e..f6587d6825 100644 --- a/asm/yaz0_old.s +++ b/asm/yaz0_old.s @@ -3,11 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.set gp=64 # allow use of 64-bit general purposee registers +.set gp=64 # allow use of 64-bit general purpose registers .section .text -.align 4 +.balign 16 glabel Yaz0_Old_Decompress /* 0031B0 800025B0 8C870008 */ lw $a3, 8($a0) diff --git a/data/PreRender.rodata.s b/data/PreRender.rodata.s index e9eac9136c..046c7f0b89 100644 --- a/data/PreRender.rodata.s +++ b/data/PreRender.rodata.s @@ -3,11 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.set gp=64 # allow use of 64-bit general purposee registers +.set gp=64 # allow use of 64-bit general purpose registers .section .rodata -.align 4 +.balign 16 glabel D_80144A20 .asciz "this" diff --git a/data/code_8006EA30.data.s b/data/code_8006EA30.data.s index 20ab8837fc..5a03ec6068 100644 --- a/data/code_8006EA30.data.s +++ b/data/code_8006EA30.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.set gp=64 # allow use of 64-bit general purposee registers +.set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel D_8011FAA0 .incbin "baserom.z64", 0xB96C40, 0x8 diff --git a/data/code_800BB0A0.rodata.s b/data/code_800BB0A0.rodata.s index fb5035443c..1382a9c8c0 100644 --- a/data/code_800BB0A0.rodata.s +++ b/data/code_800BB0A0.rodata.s @@ -3,11 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.set gp=64 # allow use of 64-bit general purposee registers +.set gp=64 # allow use of 64-bit general purpose registers .section .rodata -.align 4 +.balign 16 glabel D_80143CE0 .float 0.666666686 diff --git a/data/code_800BB570.bss.s b/data/code_800BB570.bss.s index 70a6084e0e..2afeb86c2f 100644 --- a/data/code_800BB570.bss.s +++ b/data/code_800BB570.bss.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.set gp=64 # allow use of 64-bit general purposee registers +.set gp=64 # allow use of 64-bit general purpose registers .section .bss +.balign 16 + glabel D_801612F0 .space 0x68 diff --git a/data/code_800BB570.data.s b/data/code_800BB570.data.s index 47091d2669..fd8d222a8f 100644 --- a/data/code_800BB570.data.s +++ b/data/code_800BB570.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.set gp=64 # allow use of 64-bit general purposee registers +.set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel D_8012D180 .incbin "baserom.z64", 0xBA4320, 0x4 diff --git a/data/code_800BB570.rodata.s b/data/code_800BB570.rodata.s index 50c86cc14c..990c8b7936 100644 --- a/data/code_800BB570.rodata.s +++ b/data/code_800BB570.rodata.s @@ -3,11 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.set gp=64 # allow use of 64-bit general purposee registers +.set gp=64 # allow use of 64-bit general purpose registers .section .rodata -.align 4 +.balign 16 glabel D_80143CF0 .asciz "mempak: find '%c' (%d)\n" diff --git a/data/code_800C3C20.data.s b/data/code_800C3C20.data.s index 5d3c3247de..a4457386ab 100644 --- a/data/code_800C3C20.data.s +++ b/data/code_800C3C20.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.set gp=64 # allow use of 64-bit general purposee registers +.set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel D_8012D200 .incbin "baserom.z64", 0xBA43A0, 0x7 diff --git a/data/code_800D2E30.data.s b/data/code_800D2E30.data.s index 5178609a8e..bf01aed6db 100644 --- a/data/code_800D2E30.data.s +++ b/data/code_800D2E30.data.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.set gp=64 # allow use of 64-bit general purposee registers +.set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel D_8012DBB0 .incbin "baserom.z64", 0xBA4D50, 0x10 diff --git a/data/code_800D7CD0.data.s b/data/code_800D7CD0.data.s index 14aadde67f..f2d869d0a1 100644 --- a/data/code_800D7CD0.data.s +++ b/data/code_800D7CD0.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.set gp=64 # allow use of 64-bit general purposee registers +.set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel D_8012DCA0 .incbin "baserom.z64", 0xBA4E40, 0x58 diff --git a/data/code_800D7CD0.rodata.s b/data/code_800D7CD0.rodata.s index 65983c97d7..f9edd58705 100644 --- a/data/code_800D7CD0.rodata.s +++ b/data/code_800D7CD0.rodata.s @@ -3,11 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.set gp=64 # allow use of 64-bit general purposee registers +.set gp=64 # allow use of 64-bit general purpose registers .section .rodata -.align 4 +.balign 16 glabel D_801479A0 .asciz "G_ZBUFFER" diff --git a/data/code_800DACC0.bss.s b/data/code_800DACC0.bss.s index 4470787f46..2816d24dc9 100644 --- a/data/code_800DACC0.bss.s +++ b/data/code_800DACC0.bss.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.set gp=64 # allow use of 64-bit general purposee registers +.set gp=64 # allow use of 64-bit general purpose registers .section .bss +.balign 16 + glabel D_8016B6E0 .space 0x18 diff --git a/data/code_800DACC0.data.s b/data/code_800DACC0.data.s index ac47bd8fed..e48616f020 100644 --- a/data/code_800DACC0.data.s +++ b/data/code_800DACC0.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.set gp=64 # allow use of 64-bit general purposee registers +.set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel gWaveSamples .incbin "baserom.z64", 0xBA6230, 0x8 diff --git a/data/code_800DACC0.rodata.s b/data/code_800DACC0.rodata.s index 3c71707768..1676297507 100644 --- a/data/code_800DACC0.rodata.s +++ b/data/code_800DACC0.rodata.s @@ -3,11 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.set gp=64 # allow use of 64-bit general purposee registers +.set gp=64 # allow use of 64-bit general purpose registers .section .rodata -.align 4 +.balign 16 glabel jtbl_801493D0 .word L800DCCE4 diff --git a/data/code_800DDE20.rodata.s b/data/code_800DDE20.rodata.s index 99b55d54d6..4edf64a10c 100644 --- a/data/code_800DDE20.rodata.s +++ b/data/code_800DDE20.rodata.s @@ -3,11 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.set gp=64 # allow use of 64-bit general purposee registers +.set gp=64 # allow use of 64-bit general purpose registers .section .rodata -.align 4 +.balign 16 glabel D_801493F0 .float 0.33 diff --git a/data/code_800E11F0.data.s b/data/code_800E11F0.data.s index d0bf3cfe65..2cf54e8960 100644 --- a/data/code_800E11F0.data.s +++ b/data/code_800E11F0.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.set gp=64 # allow use of 64-bit general purposee registers +.set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel D_801304D0 .incbin "baserom.z64", 0xBA7670, 0x4 diff --git a/data/code_800E11F0.rodata.s b/data/code_800E11F0.rodata.s index c18ad7519e..70eae68cfb 100644 --- a/data/code_800E11F0.rodata.s +++ b/data/code_800E11F0.rodata.s @@ -3,11 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.set gp=64 # allow use of 64-bit general purposee registers +.set gp=64 # allow use of 64-bit general purpose registers .section .rodata -.align 4 +.balign 16 glabel D_80149420 .asciz "SUPERDMA" @@ -52,7 +52,7 @@ glabel D_80149484 glabel D_80149488 .float 16.713 -.align 4 # file split? +.balign 16 # file split? glabel jtbl_80149490 .word L800E58AC diff --git a/data/code_800E88C0.data.s b/data/code_800E88C0.data.s index 4909e78193..56231eb2d1 100644 --- a/data/code_800E88C0.data.s +++ b/data/code_800E88C0.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.set gp=64 # allow use of 64-bit general purposee registers +.set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel D_80130510 .incbin "baserom.z64", 0xBA76B0, 0x4 diff --git a/data/code_800E88C0.rodata.s b/data/code_800E88C0.rodata.s index e94d88d977..5464029ca7 100644 --- a/data/code_800E88C0.rodata.s +++ b/data/code_800E88C0.rodata.s @@ -3,11 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.set gp=64 # allow use of 64-bit general purposee registers +.set gp=64 # allow use of 64-bit general purpose registers .section .rodata -.align 4 +.balign 16 glabel jtbl_801495F0 .word L800E9034 diff --git a/data/code_800E9340.rodata.s b/data/code_800E9340.rodata.s index 8268b1a24d..383e0afaaa 100644 --- a/data/code_800E9340.rodata.s +++ b/data/code_800E9340.rodata.s @@ -3,11 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.set gp=64 # allow use of 64-bit general purposee registers +.set gp=64 # allow use of 64-bit general purpose registers .section .rodata -.align 4 +.balign 16 glabel jtbl_80149620 .word L800E9530 diff --git a/data/code_800EC960.data.s b/data/code_800EC960.data.s index 9d857d5c95..a011aa59cb 100644 --- a/data/code_800EC960.data.s +++ b/data/code_800EC960.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.set gp=64 # allow use of 64-bit general purposee registers +.set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel D_80130570 .incbin "baserom.z64", 0xBA7710, 0x8 diff --git a/data/code_800EC960.rodata.s b/data/code_800EC960.rodata.s index 30877b2deb..07608b48a4 100644 --- a/data/code_800EC960.rodata.s +++ b/data/code_800EC960.rodata.s @@ -3,11 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.set gp=64 # allow use of 64-bit general purposee registers +.set gp=64 # allow use of 64-bit general purpose registers .section .rodata -.align 4 +.balign 16 glabel D_80149C60 .asciz "AUDIO : Ocarina Control Assign Normal\n" diff --git a/data/code_800F7260.data.s b/data/code_800F7260.data.s index b7fe2015aa..19449a1088 100644 --- a/data/code_800F7260.data.s +++ b/data/code_800F7260.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.set gp=64 # allow use of 64-bit general purposee registers +.set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel D_80133340 .incbin "baserom.z64", 0xBAA4E0, 0x4 diff --git a/data/code_800F7260.rodata.s b/data/code_800F7260.rodata.s index 25a3ff4ab6..0f6e4b43aa 100644 --- a/data/code_800F7260.rodata.s +++ b/data/code_800F7260.rodata.s @@ -3,11 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.set gp=64 # allow use of 64-bit general purposee registers +.set gp=64 # allow use of 64-bit general purpose registers .section .rodata -.align 4 +.balign 16 glabel jtbl_8014A620 .word L800F7534 diff --git a/data/code_800F9280.data.s b/data/code_800F9280.data.s index 7e73ce5bd3..cbd438aa19 100644 --- a/data/code_800F9280.data.s +++ b/data/code_800F9280.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.set gp=64 # allow use of 64-bit general purposee registers +.set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel D_80133400 .incbin "baserom.z64", 0xBAA5A0, 0x4 diff --git a/data/code_800F9280.rodata.s b/data/code_800F9280.rodata.s index 58832396b7..382efb8ece 100644 --- a/data/code_800F9280.rodata.s +++ b/data/code_800F9280.rodata.s @@ -3,11 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.set gp=64 # allow use of 64-bit general purposee registers +.set gp=64 # allow use of 64-bit general purpose registers .section .rodata -.align 4 +.balign 16 glabel jtbl_8014A640 .word L800F9588 @@ -44,7 +44,7 @@ glabel jtbl_8014A680 .word L800FACD4 .word L800FAC3C -.align 4 # file split? const data below used in multiple files +.balign 16 # file split? const data below used in multiple files glabel D_8014A6C0 .half 0x1C00 diff --git a/data/code_801014C0.bss.s b/data/code_801014C0.bss.s index f1d4dcbecb..2a66a0234f 100644 --- a/data/code_801014C0.bss.s +++ b/data/code_801014C0.bss.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.set gp=64 # allow use of 64-bit general purposee registers +.set gp=64 # allow use of 64-bit general purpose registers .section .bss +.balign 16 + glabel D_80175860 .space 0x100 diff --git a/data/code_80101910.bss.s b/data/code_80101910.bss.s index 7d318937cf..13828642c0 100644 --- a/data/code_80101910.bss.s +++ b/data/code_80101910.bss.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.set gp=64 # allow use of 64-bit general purposee registers +.set gp=64 # allow use of 64-bit general purpose registers .section .bss +.balign 16 + glabel pifMempakBuf .space 0x40 diff --git a/data/code_80102420.data.s b/data/code_80102420.data.s index 5d6d6d65cc..70477b5f13 100644 --- a/data/code_80102420.data.s +++ b/data/code_80102420.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.set gp=64 # allow use of 64-bit general purposee registers +.set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel D_80134CF0 .incbin "baserom.z64", 0xBABE90, 0x4 diff --git a/data/code_80105CF0.data.s b/data/code_80105CF0.data.s index f5fd432195..9a09722391 100644 --- a/data/code_80105CF0.data.s +++ b/data/code_80105CF0.data.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.set gp=64 # allow use of 64-bit general purposee registers +.set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel D_80134D20 .incbin "baserom.z64", 0xBABEC0, 0x10 diff --git a/data/code_80106550.rodata.s b/data/code_80106550.rodata.s index 1034b44837..68d63ae836 100644 --- a/data/code_80106550.rodata.s +++ b/data/code_80106550.rodata.s @@ -3,11 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.set gp=64 # allow use of 64-bit general purposee registers +.set gp=64 # allow use of 64-bit general purpose registers .section .rodata -.align 4 +.balign 16 glabel D_8014B2E0 .double -0 diff --git a/data/code_80110450.rodata.s b/data/code_80110450.rodata.s index dfaeb6757a..53aecbf2ff 100644 --- a/data/code_80110450.rodata.s +++ b/data/code_80110450.rodata.s @@ -3,11 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.set gp=64 # allow use of 64-bit general purposee registers +.set gp=64 # allow use of 64-bit general purpose registers .section .rodata -.align 4 +.balign 16 glabel jtbl_80154CF0 .word L80110520 diff --git a/data/db_camera.bss.s b/data/db_camera.bss.s index 60403e76dd..577f0ae963 100644 --- a/data/db_camera.bss.s +++ b/data/db_camera.bss.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.set gp=64 # allow use of 64-bit general purposee registers +.set gp=64 # allow use of 64-bit general purpose registers .section .bss +.balign 16 + glabel D_80161100 .space 0x4 diff --git a/data/db_camera.data.s b/data/db_camera.data.s index 9cc8653f0c..77af5102e9 100644 --- a/data/db_camera.data.s +++ b/data/db_camera.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.set gp=64 # allow use of 64-bit general purposee registers +.set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel D_8012CED0 .incbin "baserom.z64", 0xBA4070, 0x4 diff --git a/data/db_camera.rodata.s b/data/db_camera.rodata.s index 942a5117d2..365a69063c 100644 --- a/data/db_camera.rodata.s +++ b/data/db_camera.rodata.s @@ -3,11 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.set gp=64 # allow use of 64-bit general purposee registers +.set gp=64 # allow use of 64-bit general purpose registers .section .rodata -.align 4 +.balign 16 glabel D_80143100 .asciz "shrink_window_setval(%d)\n" diff --git a/data/fault.bss.s b/data/fault.bss.s index d3ec544d07..bda55d9b97 100644 --- a/data/fault.bss.s +++ b/data/fault.bss.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.set gp=64 # allow use of 64-bit general purposee registers +.set gp=64 # allow use of 64-bit general purpose registers .section .bss +.balign 16 + glabel sFaultStructPtr .space 4 diff --git a/data/fault_drawer.bss.s b/data/fault_drawer.bss.s index 166498788f..a52c82649e 100644 --- a/data/fault_drawer.bss.s +++ b/data/fault_drawer.bss.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.set gp=64 # allow use of 64-bit general purposee registers +.set gp=64 # allow use of 64-bit general purpose registers .section .bss +.balign 16 + glabel sFaultDrawerStruct .space 0x3C diff --git a/data/flg_set.bss.s b/data/flg_set.bss.s index 0d8eb3c7fc..9cc6fdae83 100644 --- a/data/flg_set.bss.s +++ b/data/flg_set.bss.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.set gp=64 # allow use of 64-bit general purposee registers +.set gp=64 # allow use of 64-bit general purpose registers .section .bss +.balign 16 + glabel D_8015BB90 .space 0x10 diff --git a/data/flg_set.data.s b/data/flg_set.data.s index aa3e1b647a..81ef5f1b85 100644 --- a/data/flg_set.data.s +++ b/data/flg_set.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.set gp=64 # allow use of 64-bit general purposee registers +.set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel D_80115DC0 .incbin "baserom.z64", 0xB8CF60, 0x1A8 diff --git a/data/jpegdecoder.bss.s b/data/jpegdecoder.bss.s index 5bc8a50fd0..9380ed1638 100644 --- a/data/jpegdecoder.bss.s +++ b/data/jpegdecoder.bss.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.set gp=64 # allow use of 64-bit general purposee registers +.set gp=64 # allow use of 64-bit general purpose registers .section .bss +.balign 16 + glabel D_80175660 .space 0x4 diff --git a/data/osSetIntMask.rodata.s b/data/osSetIntMask.rodata.s index de5ce1c956..38b73ebfa7 100644 --- a/data/osSetIntMask.rodata.s +++ b/data/osSetIntMask.rodata.s @@ -3,7 +3,7 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.set gp=64 # allow use of 64-bit general purposee registers +.set gp=64 # allow use of 64-bit general purpose registers .section .rodata diff --git a/data/overlays/actors/z_arms_hook.data.s b/data/overlays/actors/z_arms_hook.data.s index 21c968deec..e45f30bea0 100644 --- a/data/overlays/actors/z_arms_hook.data.s +++ b/data/overlays/actors/z_arms_hook.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel Arms_Hook_InitVars .word 0x00660700, 0x00000030, 0x00140000, 0x00000218 .word ArmsHook_Init diff --git a/data/overlays/actors/z_arms_hook.reloc.s b/data/overlays/actors/z_arms_hook.reloc.s index 2874de18d1..d439138c87 100644 --- a/data/overlays/actors/z_arms_hook.reloc.s +++ b/data/overlays/actors/z_arms_hook.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_80865C20 -.incbin "baserom/ovl_Arms_Hook", 0xD20, 0x000000F0 +.balign 16 + +glabel D_80865C20 + .incbin "baserom/ovl_Arms_Hook", 0xD20, 0x000000F0 diff --git a/data/overlays/actors/z_bg_bombwall.data.s b/data/overlays/actors/z_bg_bombwall.data.s index 2927fcf723..cbf6c35679 100644 --- a/data/overlays/actors/z_bg_bombwall.data.s +++ b/data/overlays/actors/z_bg_bombwall.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel D_8086EF20 .word 0x00000000, 0x00000000, 0x00000000, 0x40000048, 0x00000000, 0x00010000, 0xC28C0000, 0x43300000, 0x00000000, 0xC28C0000, 0xC0800000, 0x00000000, 0x00000000, 0xC0800000, 0x41F00000, 0x00000000, 0x00000000, 0x00000000, 0x40000048, 0x00000000, 0x00010000, 0x428C0000, 0x43300000, 0x00000000, 0xC28C0000, 0x43300000, 0x00000000, 0x00000000, 0xC0800000, 0x41F00000, 0x00000000, 0x00000000, 0x00000000, 0x40000048, 0x00000000, 0x00010000, 0x428C0000, 0xC0800000, 0x00000000, 0x428C0000, 0x43300000, 0x00000000, 0x00000000, 0xC0800000, 0x41F00000 glabel D_8086EFD4 diff --git a/data/overlays/actors/z_bg_bombwall.reloc.s b/data/overlays/actors/z_bg_bombwall.reloc.s index 700f94a760..e8f86243ea 100644 --- a/data/overlays/actors/z_bg_bombwall.reloc.s +++ b/data/overlays/actors/z_bg_bombwall.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_8086F0C0 -.incbin "baserom/ovl_Bg_Bombwall", 0x8F0, 0x000000A0 +.balign 16 + +glabel D_8086F0C0 + .incbin "baserom/ovl_Bg_Bombwall", 0x8F0, 0x000000A0 diff --git a/data/overlays/actors/z_bg_bowl_wall.data.s b/data/overlays/actors/z_bg_bowl_wall.data.s index 7027f25c78..48c805b3bf 100644 --- a/data/overlays/actors/z_bg_bowl_wall.data.s +++ b/data/overlays/actors/z_bg_bowl_wall.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel Bg_Bowl_Wall_InitVars .word 0x01BD0600, 0x00000030, 0x01780000, 0x00000188 .word BgBowlWall_Init diff --git a/data/overlays/actors/z_bg_bowl_wall.reloc.s b/data/overlays/actors/z_bg_bowl_wall.reloc.s index dc48ff2aa8..f745c50645 100644 --- a/data/overlays/actors/z_bg_bowl_wall.reloc.s +++ b/data/overlays/actors/z_bg_bowl_wall.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_8086FB20 -.incbin "baserom/ovl_Bg_Bowl_Wall", 0x9C0, 0x000000C0 +.balign 16 + +glabel D_8086FB20 + .incbin "baserom/ovl_Bg_Bowl_Wall", 0x9C0, 0x000000C0 diff --git a/data/overlays/actors/z_bg_breakwall.data.s b/data/overlays/actors/z_bg_breakwall.data.s index 441882a5f0..96cde1ec2a 100644 --- a/data/overlays/actors/z_bg_breakwall.data.s +++ b/data/overlays/actors/z_bg_breakwall.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel Bg_Breakwall_InitVars .word 0x00590100, 0x00000010, 0x00010000, 0x000001F0 .word BgBreakwall_Init diff --git a/data/overlays/actors/z_bg_breakwall.reloc.s b/data/overlays/actors/z_bg_breakwall.reloc.s index 90025f3911..da85092503 100644 --- a/data/overlays/actors/z_bg_breakwall.reloc.s +++ b/data/overlays/actors/z_bg_breakwall.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_808709C0 -.incbin "baserom/ovl_Bg_Breakwall", 0xDE0, 0x000000F0 +.balign 16 + +glabel D_808709C0 + .incbin "baserom/ovl_Bg_Breakwall", 0xDE0, 0x000000F0 diff --git a/data/overlays/actors/z_bg_ddan_jd.data.s b/data/overlays/actors/z_bg_ddan_jd.data.s index 4e3f3bdedf..f2367896cc 100644 --- a/data/overlays/actors/z_bg_ddan_jd.data.s +++ b/data/overlays/actors/z_bg_ddan_jd.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel Bg_Ddan_Jd_InitVars .word 0x00580100, 0x00000030, 0x002B0000, 0x00000170 .word BgDdanJd_Init diff --git a/data/overlays/actors/z_bg_ddan_jd.reloc.s b/data/overlays/actors/z_bg_ddan_jd.reloc.s index 03937abb70..22bc0ce77f 100644 --- a/data/overlays/actors/z_bg_ddan_jd.reloc.s +++ b/data/overlays/actors/z_bg_ddan_jd.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_80871090 -.incbin "baserom/ovl_Bg_Ddan_Jd", 0x5E0, 0x00000060 +.balign 16 + +glabel D_80871090 + .incbin "baserom/ovl_Bg_Ddan_Jd", 0x5E0, 0x00000060 diff --git a/data/overlays/actors/z_bg_dodoago.bss.s b/data/overlays/actors/z_bg_dodoago.bss.s index dcefb96c38..73e825df10 100644 --- a/data/overlays/actors/z_bg_dodoago.bss.s +++ b/data/overlays/actors/z_bg_dodoago.bss.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers -.bss +.section .bss + +.balign 16 glabel D_808727C0 .space 0x64 diff --git a/data/overlays/actors/z_bg_dodoago.data.s b/data/overlays/actors/z_bg_dodoago.data.s index 05d0e49229..694b87f231 100644 --- a/data/overlays/actors/z_bg_dodoago.data.s +++ b/data/overlays/actors/z_bg_dodoago.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel Bg_Dodoago_InitVars .word 0x003F0100, 0x00000000, 0x002B0000, 0x00000250 .word BgDodoago_Init diff --git a/data/overlays/actors/z_bg_dodoago.reloc.s b/data/overlays/actors/z_bg_dodoago.reloc.s index 280f600e63..bda0598ec7 100644 --- a/data/overlays/actors/z_bg_dodoago.reloc.s +++ b/data/overlays/actors/z_bg_dodoago.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_80872690 -.incbin "baserom/ovl_Bg_Dodoago", 0xC90, 0x00000130 +.balign 16 + +glabel D_80872690 + .incbin "baserom/ovl_Bg_Dodoago", 0xC90, 0x00000130 diff --git a/data/overlays/actors/z_bg_dy_yoseizo.data.s b/data/overlays/actors/z_bg_dy_yoseizo.data.s index d3eecb1dee..5022dea094 100644 --- a/data/overlays/actors/z_bg_dy_yoseizo.data.s +++ b/data/overlays/actors/z_bg_dy_yoseizo.data.s @@ -3,7 +3,7 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data diff --git a/data/overlays/actors/z_bg_dy_yoseizo.reloc.s b/data/overlays/actors/z_bg_dy_yoseizo.reloc.s index a319192c8e..ded20df03b 100644 --- a/data/overlays/actors/z_bg_dy_yoseizo.reloc.s +++ b/data/overlays/actors/z_bg_dy_yoseizo.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_808756D0 -.incbin "baserom/ovl_Bg_Dy_Yoseizo", 0x2EA0, 0x00000250 +.balign 16 + +glabel D_808756D0 + .incbin "baserom/ovl_Bg_Dy_Yoseizo", 0x2EA0, 0x00000250 diff --git a/data/overlays/actors/z_bg_ganon_otyuka.data.s b/data/overlays/actors/z_bg_ganon_otyuka.data.s index 03a0233e6f..37fa56eaba 100644 --- a/data/overlays/actors/z_bg_ganon_otyuka.data.s +++ b/data/overlays/actors/z_bg_ganon_otyuka.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel Bg_Ganon_Otyuka_InitVars .word 0x01060600, 0x00000030, 0x00E10000, 0x0000018C .word BgGanonOtyuka_Init diff --git a/data/overlays/actors/z_bg_ganon_otyuka.reloc.s b/data/overlays/actors/z_bg_ganon_otyuka.reloc.s index a9f77b1632..cb63185c9b 100644 --- a/data/overlays/actors/z_bg_ganon_otyuka.reloc.s +++ b/data/overlays/actors/z_bg_ganon_otyuka.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_80877FC0 -.incbin "baserom/ovl_Bg_Ganon_Otyuka", 0x26A0, 0x000001A0 +.balign 16 + +glabel D_80877FC0 + .incbin "baserom/ovl_Bg_Ganon_Otyuka", 0x26A0, 0x000001A0 diff --git a/data/overlays/actors/z_bg_gnd_darkmeiro.data.s b/data/overlays/actors/z_bg_gnd_darkmeiro.data.s index 8bce25b8ed..f2a8cf260b 100644 --- a/data/overlays/actors/z_bg_gnd_darkmeiro.data.s +++ b/data/overlays/actors/z_bg_gnd_darkmeiro.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel Bg_Gnd_Darkmeiro_InitVars .word 0x01B40600, 0x00000030, 0x01790000, 0x00000170 .word BgGndDarkmeiro_Init diff --git a/data/overlays/actors/z_bg_gnd_darkmeiro.reloc.s b/data/overlays/actors/z_bg_gnd_darkmeiro.reloc.s index 223aa19648..e558702734 100644 --- a/data/overlays/actors/z_bg_gnd_darkmeiro.reloc.s +++ b/data/overlays/actors/z_bg_gnd_darkmeiro.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_80879440 -.incbin "baserom/ovl_Bg_Gnd_Darkmeiro", 0x810, 0x00000080 +.balign 16 + +glabel D_80879440 + .incbin "baserom/ovl_Bg_Gnd_Darkmeiro", 0x810, 0x00000080 diff --git a/data/overlays/actors/z_bg_gnd_firemeiro.data.s b/data/overlays/actors/z_bg_gnd_firemeiro.data.s index 95ec6453f3..84e35660ce 100644 --- a/data/overlays/actors/z_bg_gnd_firemeiro.data.s +++ b/data/overlays/actors/z_bg_gnd_firemeiro.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel Bg_Gnd_Firemeiro_InitVars .word 0x01B30600, 0x00000030, 0x01790000, 0x00000178 .word BgGndFiremeiro_Init diff --git a/data/overlays/actors/z_bg_gnd_firemeiro.reloc.s b/data/overlays/actors/z_bg_gnd_firemeiro.reloc.s index 3fa6ad51c1..5a87cefb37 100644 --- a/data/overlays/actors/z_bg_gnd_firemeiro.reloc.s +++ b/data/overlays/actors/z_bg_gnd_firemeiro.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_80879A30 -.incbin "baserom/ovl_Bg_Gnd_Firemeiro", 0x570, 0x00000070 +.balign 16 + +glabel D_80879A30 + .incbin "baserom/ovl_Bg_Gnd_Firemeiro", 0x570, 0x00000070 diff --git a/data/overlays/actors/z_bg_gnd_iceblock.bss.s b/data/overlays/actors/z_bg_gnd_iceblock.bss.s index fec780886d..a7e4a47379 100644 --- a/data/overlays/actors/z_bg_gnd_iceblock.bss.s +++ b/data/overlays/actors/z_bg_gnd_iceblock.bss.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers -.bss +.section .bss + +.balign 16 glabel D_8087AC40 .space 0x01 diff --git a/data/overlays/actors/z_bg_gnd_iceblock.data.s b/data/overlays/actors/z_bg_gnd_iceblock.data.s index 23a3f51c8e..a1c773cadf 100644 --- a/data/overlays/actors/z_bg_gnd_iceblock.data.s +++ b/data/overlays/actors/z_bg_gnd_iceblock.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel Bg_Gnd_Iceblock_InitVars .word 0x01B70600, 0x00000030, 0x01790000, 0x00000174 .word BgGndIceblock_Init diff --git a/data/overlays/actors/z_bg_gnd_iceblock.reloc.s b/data/overlays/actors/z_bg_gnd_iceblock.reloc.s index 8528e5a085..dac819280e 100644 --- a/data/overlays/actors/z_bg_gnd_iceblock.reloc.s +++ b/data/overlays/actors/z_bg_gnd_iceblock.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_8087A920 -.incbin "baserom/ovl_Bg_Gnd_Iceblock", 0xE80, 0x00000320 +.balign 16 + +glabel D_8087A920 + .incbin "baserom/ovl_Bg_Gnd_Iceblock", 0xE80, 0x00000320 diff --git a/data/overlays/actors/z_bg_gnd_iceblock.rodata.s b/data/overlays/actors/z_bg_gnd_iceblock.rodata.s index 708ec4d7db..5f1efb0c7b 100644 --- a/data/overlays/actors/z_bg_gnd_iceblock.rodata.s +++ b/data/overlays/actors/z_bg_gnd_iceblock.rodata.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata +.balign 16 + glabel D_8087A790 .asciz "../z_bg_gnd_iceblock.c" .balign 4 diff --git a/data/overlays/actors/z_bg_gnd_soulmeiro.data.s b/data/overlays/actors/z_bg_gnd_soulmeiro.data.s index 7f4f91bd4b..59f2ffd49d 100644 --- a/data/overlays/actors/z_bg_gnd_soulmeiro.data.s +++ b/data/overlays/actors/z_bg_gnd_soulmeiro.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel Bg_Gnd_Soulmeiro_InitVars .word 0x01B50600, 0x00000000, 0x01790000, 0x000001A0 .word BgGndSoulmeiro_Init diff --git a/data/overlays/actors/z_bg_gnd_soulmeiro.reloc.s b/data/overlays/actors/z_bg_gnd_soulmeiro.reloc.s index 009bf5bc0a..a94c171f0d 100644 --- a/data/overlays/actors/z_bg_gnd_soulmeiro.reloc.s +++ b/data/overlays/actors/z_bg_gnd_soulmeiro.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_8087B5F0 -.incbin "baserom/ovl_Bg_Gnd_Soulmeiro", 0x830, 0x000000C0 +.balign 16 + +glabel D_8087B5F0 + .incbin "baserom/ovl_Bg_Gnd_Soulmeiro", 0x830, 0x000000C0 diff --git a/data/overlays/actors/z_bg_haka.data.s b/data/overlays/actors/z_bg_haka.data.s index 2e406aa9b3..9ab31598a8 100644 --- a/data/overlays/actors/z_bg_haka.data.s +++ b/data/overlays/actors/z_bg_haka.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel Bg_Haka_InitVars .word 0x009D0100, 0x00000000, 0x00A20000, 0x00000168 .word BgHaka_Init diff --git a/data/overlays/actors/z_bg_haka.reloc.s b/data/overlays/actors/z_bg_haka.reloc.s index 67ebda0ff3..17765db9fb 100644 --- a/data/overlays/actors/z_bg_haka.reloc.s +++ b/data/overlays/actors/z_bg_haka.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_8087BD50 -.incbin "baserom/ovl_Bg_Haka", 0x6A0, 0x000000A0 +.balign 16 + +glabel D_8087BD50 + .incbin "baserom/ovl_Bg_Haka", 0x6A0, 0x000000A0 diff --git a/data/overlays/actors/z_bg_haka_gate.bss.s b/data/overlays/actors/z_bg_haka_gate.bss.s index e1229a5355..807597b01d 100644 --- a/data/overlays/actors/z_bg_haka_gate.bss.s +++ b/data/overlays/actors/z_bg_haka_gate.bss.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers -.bss +.section .bss + +.balign 16 glabel D_8087CFB0 .space 0x10 diff --git a/data/overlays/actors/z_bg_haka_gate.data.s b/data/overlays/actors/z_bg_haka_gate.data.s index 404e444d22..b5376ff0d1 100644 --- a/data/overlays/actors/z_bg_haka_gate.data.s +++ b/data/overlays/actors/z_bg_haka_gate.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel D_8087CCD0 .word 0x01000000 glabel D_8087CCD4 diff --git a/data/overlays/actors/z_bg_haka_gate.reloc.s b/data/overlays/actors/z_bg_haka_gate.reloc.s index c07fde9951..ebf7bf5a0d 100644 --- a/data/overlays/actors/z_bg_haka_gate.reloc.s +++ b/data/overlays/actors/z_bg_haka_gate.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_8087CDC0 -.incbin "baserom/ovl_Bg_Haka_Gate", 0xFD0, 0x000001F0 +.balign 16 + +glabel D_8087CDC0 + .incbin "baserom/ovl_Bg_Haka_Gate", 0xFD0, 0x000001F0 diff --git a/data/overlays/actors/z_bg_haka_huta.data.s b/data/overlays/actors/z_bg_haka_huta.data.s index d9bd3dd9ac..ae305b14a0 100644 --- a/data/overlays/actors/z_bg_haka_huta.data.s +++ b/data/overlays/actors/z_bg_haka_huta.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel Bg_Haka_Huta_InitVars .word 0x00BD0100, 0x00000010, 0x008D0000, 0x0000016C .word BgHakaHuta_Init diff --git a/data/overlays/actors/z_bg_haka_huta.reloc.s b/data/overlays/actors/z_bg_haka_huta.reloc.s index 1f7852e18e..4f41584822 100644 --- a/data/overlays/actors/z_bg_haka_huta.reloc.s +++ b/data/overlays/actors/z_bg_haka_huta.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_8087D980 -.incbin "baserom/ovl_Bg_Haka_Huta", 0x9C0, 0x000000C0 +.balign 16 + +glabel D_8087D980 + .incbin "baserom/ovl_Bg_Haka_Huta", 0x9C0, 0x000000C0 diff --git a/data/overlays/actors/z_bg_haka_meganebg.data.s b/data/overlays/actors/z_bg_haka_meganebg.data.s index 6b607ac2f4..78ebb831fa 100644 --- a/data/overlays/actors/z_bg_haka_meganebg.data.s +++ b/data/overlays/actors/z_bg_haka_meganebg.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel Bg_Haka_MeganeBG_InitVars .word 0x00AF0100, 0x00000000, 0x00690000, 0x0000016C .word BgHakaMeganeBG_Init diff --git a/data/overlays/actors/z_bg_haka_meganebg.reloc.s b/data/overlays/actors/z_bg_haka_meganebg.reloc.s index f886eda0ec..f88d610fd2 100644 --- a/data/overlays/actors/z_bg_haka_meganebg.reloc.s +++ b/data/overlays/actors/z_bg_haka_meganebg.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_8087E430 -.incbin "baserom/ovl_Bg_Haka_MeganeBG", 0x600, 0x000000B0 +.balign 16 + +glabel D_8087E430 + .incbin "baserom/ovl_Bg_Haka_MeganeBG", 0x600, 0x000000B0 diff --git a/data/overlays/actors/z_bg_haka_sgami.data.s b/data/overlays/actors/z_bg_haka_sgami.data.s index a9fcb70fee..65dbaf3fcd 100644 --- a/data/overlays/actors/z_bg_haka_sgami.data.s +++ b/data/overlays/actors/z_bg_haka_sgami.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel Bg_Haka_Sgami_InitVars .word 0x00B10600, 0x00000011, 0x00010000, 0x00000338 .word BgHakaSgami_Init diff --git a/data/overlays/actors/z_bg_haka_sgami.reloc.s b/data/overlays/actors/z_bg_haka_sgami.reloc.s index 344cfb6949..dda249c7c8 100644 --- a/data/overlays/actors/z_bg_haka_sgami.reloc.s +++ b/data/overlays/actors/z_bg_haka_sgami.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_8087EFF0 -.incbin "baserom/ovl_Bg_Haka_Sgami", 0xB10, 0x00000110 +.balign 16 + +glabel D_8087EFF0 + .incbin "baserom/ovl_Bg_Haka_Sgami", 0xB10, 0x00000110 diff --git a/data/overlays/actors/z_bg_haka_ship.data.s b/data/overlays/actors/z_bg_haka_ship.data.s index 4c1841f8ae..8a5012ef70 100644 --- a/data/overlays/actors/z_bg_haka_ship.data.s +++ b/data/overlays/actors/z_bg_haka_ship.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel Bg_Haka_Ship_InitVars .word 0x00B00100, 0x00000030, 0x00690000, 0x00000178 .word BgHakaShip_Init diff --git a/data/overlays/actors/z_bg_haka_ship.reloc.s b/data/overlays/actors/z_bg_haka_ship.reloc.s index fb9fca0489..649f68b77c 100644 --- a/data/overlays/actors/z_bg_haka_ship.reloc.s +++ b/data/overlays/actors/z_bg_haka_ship.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_8087FBA0 -.incbin "baserom/ovl_Bg_Haka_Ship", 0xAA0, 0x00000100 +.balign 16 + +glabel D_8087FBA0 + .incbin "baserom/ovl_Bg_Haka_Ship", 0xAA0, 0x00000100 diff --git a/data/overlays/actors/z_bg_haka_trap.data.s b/data/overlays/actors/z_bg_haka_trap.data.s index eea4e8706c..b91f96020b 100644 --- a/data/overlays/actors/z_bg_haka_trap.data.s +++ b/data/overlays/actors/z_bg_haka_trap.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel D_80880F30 .word 0x00000000 glabel Bg_Haka_Trap_InitVars diff --git a/data/overlays/actors/z_bg_haka_trap.reloc.s b/data/overlays/actors/z_bg_haka_trap.reloc.s index f8f00d8954..757e300bc8 100644 --- a/data/overlays/actors/z_bg_haka_trap.reloc.s +++ b/data/overlays/actors/z_bg_haka_trap.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_80881070 -.incbin "baserom/ovl_Bg_Haka_Trap", 0x13D0, 0x000001E0 +.balign 16 + +glabel D_80881070 + .incbin "baserom/ovl_Bg_Haka_Trap", 0x13D0, 0x000001E0 diff --git a/data/overlays/actors/z_bg_haka_tubo.data.s b/data/overlays/actors/z_bg_haka_tubo.data.s index 58bb2cd500..e97cd1eb12 100644 --- a/data/overlays/actors/z_bg_haka_tubo.data.s +++ b/data/overlays/actors/z_bg_haka_tubo.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel Bg_Haka_Tubo_InitVars .word 0x00BB0100, 0x00000010, 0x00690000, 0x00000204 .word BgHakaTubo_Init diff --git a/data/overlays/actors/z_bg_haka_tubo.reloc.s b/data/overlays/actors/z_bg_haka_tubo.reloc.s index edf49048af..978a460799 100644 --- a/data/overlays/actors/z_bg_haka_tubo.reloc.s +++ b/data/overlays/actors/z_bg_haka_tubo.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_80881C30 -.incbin "baserom/ovl_Bg_Haka_Tubo", 0x9E0, 0x000000D0 +.balign 16 + +glabel D_80881C30 + .incbin "baserom/ovl_Bg_Haka_Tubo", 0x9E0, 0x000000D0 diff --git a/data/overlays/actors/z_bg_haka_water.data.s b/data/overlays/actors/z_bg_haka_water.data.s index 8846dcdb3c..0449616902 100644 --- a/data/overlays/actors/z_bg_haka_water.data.s +++ b/data/overlays/actors/z_bg_haka_water.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel Bg_Haka_Water_InitVars .word 0x00D70600, 0x00000030, 0x008D0000, 0x00000154 .word BgHakaWater_Init diff --git a/data/overlays/actors/z_bg_haka_water.reloc.s b/data/overlays/actors/z_bg_haka_water.reloc.s index b0d322b1dd..bb6f3fbadb 100644 --- a/data/overlays/actors/z_bg_haka_water.reloc.s +++ b/data/overlays/actors/z_bg_haka_water.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_80882530 -.incbin "baserom/ovl_Bg_Haka_Water", 0x830, 0x00000090 +.balign 16 + +glabel D_80882530 + .incbin "baserom/ovl_Bg_Haka_Water", 0x830, 0x00000090 diff --git a/data/overlays/actors/z_bg_haka_zou.data.s b/data/overlays/actors/z_bg_haka_zou.data.s index 4b681494fc..67e92d53ed 100644 --- a/data/overlays/actors/z_bg_haka_zou.data.s +++ b/data/overlays/actors/z_bg_haka_zou.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel D_808835F0 .word 0x0A000900, 0x20010000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000000, 0x00010000, 0x0005003C, 0x00000000, 0x00000000 glabel D_8088361C diff --git a/data/overlays/actors/z_bg_haka_zou.reloc.s b/data/overlays/actors/z_bg_haka_zou.reloc.s index af61148325..9d2a97cc0a 100644 --- a/data/overlays/actors/z_bg_haka_zou.reloc.s +++ b/data/overlays/actors/z_bg_haka_zou.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_80883680 -.incbin "baserom/ovl_Bg_Haka_Zou", 0x10C0, 0x00000110 +.balign 16 + +glabel D_80883680 + .incbin "baserom/ovl_Bg_Haka_Zou", 0x10C0, 0x00000110 diff --git a/data/overlays/actors/z_bg_heavy_block.data.s b/data/overlays/actors/z_bg_heavy_block.data.s index e98efc549e..e1d5ee7a71 100644 --- a/data/overlays/actors/z_bg_heavy_block.data.s +++ b/data/overlays/actors/z_bg_heavy_block.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel Bg_Heavy_Block_InitVars .word 0x00920100, 0x00000000, 0x009A0000, 0x00000178 .word BgHeavyBlock_Init diff --git a/data/overlays/actors/z_bg_heavy_block.reloc.s b/data/overlays/actors/z_bg_heavy_block.reloc.s index 7f3958a6d3..d9b6ee8b02 100644 --- a/data/overlays/actors/z_bg_heavy_block.reloc.s +++ b/data/overlays/actors/z_bg_heavy_block.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_80884FE0 -.incbin "baserom/ovl_Bg_Heavy_Block", 0x1850, 0x000001C0 +.balign 16 + +glabel D_80884FE0 + .incbin "baserom/ovl_Bg_Heavy_Block", 0x1850, 0x000001C0 diff --git a/data/overlays/actors/z_bg_hidan_curtain.data.s b/data/overlays/actors/z_bg_hidan_curtain.data.s index b1a9d2a079..dfbc64dd14 100644 --- a/data/overlays/actors/z_bg_hidan_curtain.data.s +++ b/data/overlays/actors/z_bg_hidan_curtain.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel D_80885B70 .word 0x0A110009, 0x20010000, 0x00000000, 0x20000000, 0x01040000, 0xFFCFFFFF, 0x00000000, 0x19000100, 0x00510090, 0x00000000, 0x00000000 glabel D_80885B9C diff --git a/data/overlays/actors/z_bg_hidan_curtain.reloc.s b/data/overlays/actors/z_bg_hidan_curtain.reloc.s index cc1fc0f257..1d334e0b9d 100644 --- a/data/overlays/actors/z_bg_hidan_curtain.reloc.s +++ b/data/overlays/actors/z_bg_hidan_curtain.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_80885D20 -.incbin "baserom/ovl_Bg_Hidan_Curtain", 0xB80, 0x00000100 +.balign 16 + +glabel D_80885D20 + .incbin "baserom/ovl_Bg_Hidan_Curtain", 0xB80, 0x00000100 diff --git a/data/overlays/actors/z_bg_hidan_dalm.data.s b/data/overlays/actors/z_bg_hidan_dalm.data.s index 2a34c9fd21..c432413ba1 100644 --- a/data/overlays/actors/z_bg_hidan_dalm.data.s +++ b/data/overlays/actors/z_bg_hidan_dalm.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel Bg_Hidan_Dalm_InitVars .word 0x00400100, 0x00000000, 0x002C0000, 0x000002FC .word BgHidanDalm_Init diff --git a/data/overlays/actors/z_bg_hidan_dalm.reloc.s b/data/overlays/actors/z_bg_hidan_dalm.reloc.s index b51fd6545b..bfb2b337c2 100644 --- a/data/overlays/actors/z_bg_hidan_dalm.reloc.s +++ b/data/overlays/actors/z_bg_hidan_dalm.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_808865C0 -.incbin "baserom/ovl_Bg_Hidan_Dalm", 0x7A0, 0x000000A0 +.balign 16 + +glabel D_808865C0 + .incbin "baserom/ovl_Bg_Hidan_Dalm", 0x7A0, 0x000000A0 diff --git a/data/overlays/actors/z_bg_hidan_fwbig.data.s b/data/overlays/actors/z_bg_hidan_fwbig.data.s index de83ac56e9..aba00708e5 100644 --- a/data/overlays/actors/z_bg_hidan_fwbig.data.s +++ b/data/overlays/actors/z_bg_hidan_fwbig.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel Bg_Hidan_Fwbig_InitVars .word 0x008D0600, 0x00000010, 0x002C0000, 0x000001A0 .word BgHidanFwbig_Init diff --git a/data/overlays/actors/z_bg_hidan_fwbig.reloc.s b/data/overlays/actors/z_bg_hidan_fwbig.reloc.s index c16c76ebd2..c728a380f1 100644 --- a/data/overlays/actors/z_bg_hidan_fwbig.reloc.s +++ b/data/overlays/actors/z_bg_hidan_fwbig.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_80887F60 -.incbin "baserom/ovl_Bg_Hidan_Fwbig", 0xC70, 0x000000E0 +.balign 16 + +glabel D_80887F60 + .incbin "baserom/ovl_Bg_Hidan_Fwbig", 0xC70, 0x000000E0 diff --git a/data/overlays/actors/z_bg_hidan_hamstep.data.s b/data/overlays/actors/z_bg_hidan_hamstep.data.s index 6ad8aa662a..bdb4a3ecfa 100644 --- a/data/overlays/actors/z_bg_hidan_hamstep.data.s +++ b/data/overlays/actors/z_bg_hidan_hamstep.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel D_80888D70 .word 0xC1A00000, 0xC2F00000, 0xC35C0000, 0xC3A00000, 0xC3D20000 glabel D_80888D84 diff --git a/data/overlays/actors/z_bg_hidan_hamstep.reloc.s b/data/overlays/actors/z_bg_hidan_hamstep.reloc.s index bf49506199..4c027ab18e 100644 --- a/data/overlays/actors/z_bg_hidan_hamstep.reloc.s +++ b/data/overlays/actors/z_bg_hidan_hamstep.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_80888FE0 -.incbin "baserom/ovl_Bg_Hidan_Hamstep", 0xFA0, 0x00000150 +.balign 16 + +glabel D_80888FE0 + .incbin "baserom/ovl_Bg_Hidan_Hamstep", 0xFA0, 0x00000150 diff --git a/data/overlays/actors/z_bg_hidan_hrock.data.s b/data/overlays/actors/z_bg_hidan_hrock.data.s index 85d06e4204..9f285b8cfe 100644 --- a/data/overlays/actors/z_bg_hidan_hrock.data.s +++ b/data/overlays/actors/z_bg_hidan_hrock.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel Bg_Hidan_Hrock_InitVars .word 0x00410100, 0x00000000, 0x002C0000, 0x00000244 .word BgHidanHrock_Init diff --git a/data/overlays/actors/z_bg_hidan_hrock.reloc.s b/data/overlays/actors/z_bg_hidan_hrock.reloc.s index 2cba2307f0..d95194bc67 100644 --- a/data/overlays/actors/z_bg_hidan_hrock.reloc.s +++ b/data/overlays/actors/z_bg_hidan_hrock.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_808898D0 -.incbin "baserom/ovl_Bg_Hidan_Hrock", 0x7A0, 0x00000090 +.balign 16 + +glabel D_808898D0 + .incbin "baserom/ovl_Bg_Hidan_Hrock", 0x7A0, 0x00000090 diff --git a/data/overlays/actors/z_bg_hidan_kowarerukabe.data.s b/data/overlays/actors/z_bg_hidan_kowarerukabe.data.s index dcd058a65e..2c13329613 100644 --- a/data/overlays/actors/z_bg_hidan_kowarerukabe.data.s +++ b/data/overlays/actors/z_bg_hidan_kowarerukabe.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel Bg_Hidan_Kowarerukabe_InitVars .word 0x00CF0100, 0x00000000, 0x002C0000, 0x000001C4 .word BgHidanKowarerukabe_Init diff --git a/data/overlays/actors/z_bg_hidan_kowarerukabe.reloc.s b/data/overlays/actors/z_bg_hidan_kowarerukabe.reloc.s index ce05b5c4a6..0f52c08f96 100644 --- a/data/overlays/actors/z_bg_hidan_kowarerukabe.reloc.s +++ b/data/overlays/actors/z_bg_hidan_kowarerukabe.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_8088AFA0 -.incbin "baserom/ovl_Bg_Hidan_Kowarerukabe", 0xF80, 0x000000E0 +.balign 16 + +glabel D_8088AFA0 + .incbin "baserom/ovl_Bg_Hidan_Kowarerukabe", 0xF80, 0x000000E0 diff --git a/data/overlays/actors/z_bg_hidan_rock.data.s b/data/overlays/actors/z_bg_hidan_rock.data.s index 60df62d623..79c9e543c0 100644 --- a/data/overlays/actors/z_bg_hidan_rock.data.s +++ b/data/overlays/actors/z_bg_hidan_rock.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel D_8088BF60 .word 0x454EE000, 0x42F00000 glabel D_8088BF68 diff --git a/data/overlays/actors/z_bg_hidan_rock.reloc.s b/data/overlays/actors/z_bg_hidan_rock.reloc.s index 2eecf24536..49b95f6583 100644 --- a/data/overlays/actors/z_bg_hidan_rock.reloc.s +++ b/data/overlays/actors/z_bg_hidan_rock.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_8088C060 -.incbin "baserom/ovl_Bg_Hidan_Rock", 0xFE0, 0x000001A0 +.balign 16 + +glabel D_8088C060 + .incbin "baserom/ovl_Bg_Hidan_Rock", 0xFE0, 0x000001A0 diff --git a/data/overlays/actors/z_bg_hidan_rsekizou.data.s b/data/overlays/actors/z_bg_hidan_rsekizou.data.s index 789681d320..ef37c3926d 100644 --- a/data/overlays/actors/z_bg_hidan_rsekizou.data.s +++ b/data/overlays/actors/z_bg_hidan_rsekizou.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel Bg_Hidan_Rsekizou_InitVars .word 0x00440100, 0x00000000, 0x002C0000, 0x00000308 .word BgHidanRsekizou_Init diff --git a/data/overlays/actors/z_bg_hidan_rsekizou.reloc.s b/data/overlays/actors/z_bg_hidan_rsekizou.reloc.s index 7a36aba08a..41f29a69cc 100644 --- a/data/overlays/actors/z_bg_hidan_rsekizou.reloc.s +++ b/data/overlays/actors/z_bg_hidan_rsekizou.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_8088CE20 -.incbin "baserom/ovl_Bg_Hidan_Rsekizou", 0xC20, 0x000000A0 +.balign 16 + +glabel D_8088CE20 + .incbin "baserom/ovl_Bg_Hidan_Rsekizou", 0xC20, 0x000000A0 diff --git a/data/overlays/actors/z_bg_hidan_sekizou.data.s b/data/overlays/actors/z_bg_hidan_sekizou.data.s index b1ed9dabae..9408e1882d 100644 --- a/data/overlays/actors/z_bg_hidan_sekizou.data.s +++ b/data/overlays/actors/z_bg_hidan_sekizou.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel Bg_Hidan_Sekizou_InitVars .word 0x00450100, 0x00000000, 0x002C0000, 0x00000314 .word BgHidanSekizou_Init diff --git a/data/overlays/actors/z_bg_hidan_sekizou.reloc.s b/data/overlays/actors/z_bg_hidan_sekizou.reloc.s index 9ab98fa3cb..4cbae23bf7 100644 --- a/data/overlays/actors/z_bg_hidan_sekizou.reloc.s +++ b/data/overlays/actors/z_bg_hidan_sekizou.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_8088E310 -.incbin "baserom/ovl_Bg_Hidan_Sekizou", 0x1450, 0x000000C0 +.balign 16 + +glabel D_8088E310 + .incbin "baserom/ovl_Bg_Hidan_Sekizou", 0x1450, 0x000000C0 diff --git a/data/overlays/actors/z_bg_hidan_sima.data.s b/data/overlays/actors/z_bg_hidan_sima.data.s index ebedc8db61..dc28b84a34 100644 --- a/data/overlays/actors/z_bg_hidan_sima.data.s +++ b/data/overlays/actors/z_bg_hidan_sima.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel Bg_Hidan_Sima_InitVars .word 0x00460100, 0x00000000, 0x002C0000, 0x0000020C .word BgHidanSima_Init diff --git a/data/overlays/actors/z_bg_hidan_sima.reloc.s b/data/overlays/actors/z_bg_hidan_sima.reloc.s index c3315fa8a6..c3eb646625 100644 --- a/data/overlays/actors/z_bg_hidan_sima.reloc.s +++ b/data/overlays/actors/z_bg_hidan_sima.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_8088F2C0 -.incbin "baserom/ovl_Bg_Hidan_Sima", 0xEF0, 0x00000100 +.balign 16 + +glabel D_8088F2C0 + .incbin "baserom/ovl_Bg_Hidan_Sima", 0xEF0, 0x00000100 diff --git a/data/overlays/actors/z_bg_ice_objects.data.s b/data/overlays/actors/z_bg_ice_objects.data.s index fa7a4c9c17..db560d39d5 100644 --- a/data/overlays/actors/z_bg_ice_objects.data.s +++ b/data/overlays/actors/z_bg_ice_objects.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel D_80890490 .word 0xFAFAFAFF glabel D_80890494 diff --git a/data/overlays/actors/z_bg_ice_objects.reloc.s b/data/overlays/actors/z_bg_ice_objects.reloc.s index 0f682b40b9..0a6f24f804 100644 --- a/data/overlays/actors/z_bg_ice_objects.reloc.s +++ b/data/overlays/actors/z_bg_ice_objects.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_80890540 -.incbin "baserom/ovl_Bg_Ice_Objects", 0xD30, 0x00000200 +.balign 16 + +glabel D_80890540 + .incbin "baserom/ovl_Bg_Ice_Objects", 0xD30, 0x00000200 diff --git a/data/overlays/actors/z_bg_ice_shelter.data.s b/data/overlays/actors/z_bg_ice_shelter.data.s index cd053897fd..e3b6aece8f 100644 --- a/data/overlays/actors/z_bg_ice_shelter.data.s +++ b/data/overlays/actors/z_bg_ice_shelter.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel Bg_Ice_Shelter_InitVars .word 0x00EF0100, 0x00000000, 0x006B0000, 0x00000204 .word BgIceShelter_Init diff --git a/data/overlays/actors/z_bg_ice_shelter.reloc.s b/data/overlays/actors/z_bg_ice_shelter.reloc.s index 4c10c0a857..11d55fdf86 100644 --- a/data/overlays/actors/z_bg_ice_shelter.reloc.s +++ b/data/overlays/actors/z_bg_ice_shelter.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_80891910 -.incbin "baserom/ovl_Bg_Ice_Shelter", 0x11D0, 0x000001B0 +.balign 16 + +glabel D_80891910 + .incbin "baserom/ovl_Bg_Ice_Shelter", 0x11D0, 0x000001B0 diff --git a/data/overlays/actors/z_bg_ice_shutter.data.s b/data/overlays/actors/z_bg_ice_shutter.data.s index d444fa5bed..1a5a44b9ab 100644 --- a/data/overlays/actors/z_bg_ice_shutter.data.s +++ b/data/overlays/actors/z_bg_ice_shutter.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel Bg_Ice_Shutter_InitVars .word 0x01C80600, 0x00000010, 0x006B0000, 0x00000168 .word BgIceShutter_Init diff --git a/data/overlays/actors/z_bg_ice_shutter.reloc.s b/data/overlays/actors/z_bg_ice_shutter.reloc.s index 556c197601..9cb99b4780 100644 --- a/data/overlays/actors/z_bg_ice_shutter.reloc.s +++ b/data/overlays/actors/z_bg_ice_shutter.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_80891EC0 -.incbin "baserom/ovl_Bg_Ice_Shutter", 0x400, 0x00000060 +.balign 16 + +glabel D_80891EC0 + .incbin "baserom/ovl_Bg_Ice_Shutter", 0x400, 0x00000060 diff --git a/data/overlays/actors/z_bg_ice_turara.data.s b/data/overlays/actors/z_bg_ice_turara.data.s index e9fbd6f551..8149d52864 100644 --- a/data/overlays/actors/z_bg_ice_turara.data.s +++ b/data/overlays/actors/z_bg_ice_turara.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel D_80892620 .word 0x0A110900, 0x20010000, 0x00000000, 0xFFCFFFFF, 0x00040000, 0x4FC007CA, 0x00000000, 0x01010000, 0x000D0078, 0x00000000, 0x00000000 glabel Bg_Ice_Turara_InitVars diff --git a/data/overlays/actors/z_bg_ice_turara.reloc.s b/data/overlays/actors/z_bg_ice_turara.reloc.s index 3b6648d0df..8889cf2fa4 100644 --- a/data/overlays/actors/z_bg_ice_turara.reloc.s +++ b/data/overlays/actors/z_bg_ice_turara.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_808926A0 -.incbin "baserom/ovl_Bg_Ice_Turara", 0x780, 0x000000A0 +.balign 16 + +glabel D_808926A0 + .incbin "baserom/ovl_Bg_Ice_Turara", 0x780, 0x000000A0 diff --git a/data/overlays/actors/z_bg_ingate.data.s b/data/overlays/actors/z_bg_ingate.data.s index 031c9b93ef..27c3af5296 100644 --- a/data/overlays/actors/z_bg_ingate.data.s +++ b/data/overlays/actors/z_bg_ingate.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel Bg_Ingate_InitVars .word 0x01400600, 0x00000000, 0x01290000, 0x00000168 .word BgIngate_Init diff --git a/data/overlays/actors/z_bg_ingate.reloc.s b/data/overlays/actors/z_bg_ingate.reloc.s index 14d0fdd9c0..1cf6f1b9eb 100644 --- a/data/overlays/actors/z_bg_ingate.reloc.s +++ b/data/overlays/actors/z_bg_ingate.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_80892AF0 -.incbin "baserom/ovl_Bg_Ingate", 0x3B0, 0x00000070 +.balign 16 + +glabel D_80892AF0 + .incbin "baserom/ovl_Bg_Ingate", 0x3B0, 0x00000070 diff --git a/data/overlays/actors/z_bg_jya_1flift.data.s b/data/overlays/actors/z_bg_jya_1flift.data.s index 4da48a246d..955bb633dd 100644 --- a/data/overlays/actors/z_bg_jya_1flift.data.s +++ b/data/overlays/actors/z_bg_jya_1flift.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel D_808930E0 .word 0x00000000 glabel Bg_Jya_1flift_InitVars diff --git a/data/overlays/actors/z_bg_jya_1flift.reloc.s b/data/overlays/actors/z_bg_jya_1flift.reloc.s index 279806deda..7414843f71 100644 --- a/data/overlays/actors/z_bg_jya_1flift.reloc.s +++ b/data/overlays/actors/z_bg_jya_1flift.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_808931D0 -.incbin "baserom/ovl_Bg_Jya_1flift", 0x670, 0x000000F0 +.balign 16 + +glabel D_808931D0 + .incbin "baserom/ovl_Bg_Jya_1flift", 0x670, 0x000000F0 diff --git a/data/overlays/actors/z_bg_jya_bigmirror.data.s b/data/overlays/actors/z_bg_jya_bigmirror.data.s index d8852726d8..cfab2f4688 100644 --- a/data/overlays/actors/z_bg_jya_bigmirror.data.s +++ b/data/overlays/actors/z_bg_jya_bigmirror.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel D_80893ED0 .word 0x00000000 glabel Bg_Jya_Bigmirror_InitVars diff --git a/data/overlays/actors/z_bg_jya_bigmirror.reloc.s b/data/overlays/actors/z_bg_jya_bigmirror.reloc.s index 4106d14818..bf578fa9aa 100644 --- a/data/overlays/actors/z_bg_jya_bigmirror.reloc.s +++ b/data/overlays/actors/z_bg_jya_bigmirror.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_808940A0 -.incbin "baserom/ovl_Bg_Jya_Bigmirror", 0x9C0, 0x00000100 +.balign 16 + +glabel D_808940A0 + .incbin "baserom/ovl_Bg_Jya_Bigmirror", 0x9C0, 0x00000100 diff --git a/data/overlays/actors/z_bg_jya_block.data.s b/data/overlays/actors/z_bg_jya_block.data.s index 1715d3adb6..58bf32963b 100644 --- a/data/overlays/actors/z_bg_jya_block.data.s +++ b/data/overlays/actors/z_bg_jya_block.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel Bg_Jya_Block_InitVars .word 0x01D50600, 0x00000000, 0x00030000, 0x00000164 .word BgJyaBlock_Init diff --git a/data/overlays/actors/z_bg_jya_block.reloc.s b/data/overlays/actors/z_bg_jya_block.reloc.s index 1a1768cd7e..af6ff86789 100644 --- a/data/overlays/actors/z_bg_jya_block.reloc.s +++ b/data/overlays/actors/z_bg_jya_block.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_80894450 -.incbin "baserom/ovl_Bg_Jya_Block", 0x2B0, 0x00000050 +.balign 16 + +glabel D_80894450 + .incbin "baserom/ovl_Bg_Jya_Block", 0x2B0, 0x00000050 diff --git a/data/overlays/actors/z_bg_jya_bombchuiwa.data.s b/data/overlays/actors/z_bg_jya_bombchuiwa.data.s index fd3cf40476..6af07457d1 100644 --- a/data/overlays/actors/z_bg_jya_bombchuiwa.data.s +++ b/data/overlays/actors/z_bg_jya_bombchuiwa.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel Bg_Jya_Bombchuiwa_InitVars .word 0x01590100, 0x00000001, 0x00F10000, 0x000001B8 .word BgJyaBombchuiwa_Init diff --git a/data/overlays/actors/z_bg_jya_bombchuiwa.reloc.s b/data/overlays/actors/z_bg_jya_bombchuiwa.reloc.s index dfe66a0da6..559ab95818 100644 --- a/data/overlays/actors/z_bg_jya_bombchuiwa.reloc.s +++ b/data/overlays/actors/z_bg_jya_bombchuiwa.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_808950B0 -.incbin "baserom/ovl_Bg_Jya_Bombchuiwa", 0xC10, 0x000000F0 +.balign 16 + +glabel D_808950B0 + .incbin "baserom/ovl_Bg_Jya_Bombchuiwa", 0xC10, 0x000000F0 diff --git a/data/overlays/actors/z_bg_jya_bombiwa.data.s b/data/overlays/actors/z_bg_jya_bombiwa.data.s index 729404c32e..9af99f3fc3 100644 --- a/data/overlays/actors/z_bg_jya_bombiwa.data.s +++ b/data/overlays/actors/z_bg_jya_bombiwa.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel Bg_Jya_Bombiwa_InitVars .word 0x015B0100, 0x00000000, 0x00F10000, 0x000001C8 .word BgJyaBombiwa_Init diff --git a/data/overlays/actors/z_bg_jya_bombiwa.reloc.s b/data/overlays/actors/z_bg_jya_bombiwa.reloc.s index 4376a6094b..f594f23d92 100644 --- a/data/overlays/actors/z_bg_jya_bombiwa.reloc.s +++ b/data/overlays/actors/z_bg_jya_bombiwa.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_80895860 -.incbin "baserom/ovl_Bg_Jya_Bombiwa", 0x6C0, 0x00000090 +.balign 16 + +glabel D_80895860 + .incbin "baserom/ovl_Bg_Jya_Bombiwa", 0x6C0, 0x00000090 diff --git a/data/overlays/actors/z_bg_jya_cobra.data.s b/data/overlays/actors/z_bg_jya_cobra.data.s index 5e9df155b2..33b05c9865 100644 --- a/data/overlays/actors/z_bg_jya_cobra.data.s +++ b/data/overlays/actors/z_bg_jya_cobra.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel D_80897270 .word 0xFCE00000, 0xFCE00000, 0x00000800, 0xFFFFFFFF, 0x03200000, 0xFCE00000, 0x08000800, 0xFFFFFFFF, 0x03200000, 0x03200000, 0x08000000, 0xFFFFFFFF, 0xFCE00000, 0x03200000, 0x00000000, 0xFFFFFFFF glabel D_808972B0 diff --git a/data/overlays/actors/z_bg_jya_cobra.reloc.s b/data/overlays/actors/z_bg_jya_cobra.reloc.s index 543039aa28..8c3f2fd6b1 100644 --- a/data/overlays/actors/z_bg_jya_cobra.reloc.s +++ b/data/overlays/actors/z_bg_jya_cobra.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_80897750 -.incbin "baserom/ovl_Bg_Jya_Cobra", 0x1E60, 0x00000220 +.balign 16 + +glabel D_80897750 + .incbin "baserom/ovl_Bg_Jya_Cobra", 0x1E60, 0x00000220 diff --git a/data/overlays/actors/z_bg_jya_goroiwa.data.s b/data/overlays/actors/z_bg_jya_goroiwa.data.s index f358b5c8b7..f805f74c28 100644 --- a/data/overlays/actors/z_bg_jya_goroiwa.data.s +++ b/data/overlays/actors/z_bg_jya_goroiwa.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel Bg_Jya_Goroiwa_InitVars .word 0x00F90600, 0x00000010, 0x011F0000, 0x000001BC .word BgJyaGoroiwa_Init diff --git a/data/overlays/actors/z_bg_jya_goroiwa.reloc.s b/data/overlays/actors/z_bg_jya_goroiwa.reloc.s index 68787854f1..a6567baf6c 100644 --- a/data/overlays/actors/z_bg_jya_goroiwa.reloc.s +++ b/data/overlays/actors/z_bg_jya_goroiwa.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_80897FF0 -.incbin "baserom/ovl_Bg_Jya_Goroiwa", 0x680, 0x000000D0 +.balign 16 + +glabel D_80897FF0 + .incbin "baserom/ovl_Bg_Jya_Goroiwa", 0x680, 0x000000D0 diff --git a/data/overlays/actors/z_bg_jya_haheniron.data.s b/data/overlays/actors/z_bg_jya_haheniron.data.s index aadc1261ae..be69740303 100644 --- a/data/overlays/actors/z_bg_jya_haheniron.data.s +++ b/data/overlays/actors/z_bg_jya_haheniron.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel Bg_Jya_Haheniron_InitVars .word 0x018F0600, 0x00000010, 0x016C0000, 0x000001B4 .word BgJyaHaheniron_Init diff --git a/data/overlays/actors/z_bg_jya_haheniron.reloc.s b/data/overlays/actors/z_bg_jya_haheniron.reloc.s index 36c21c7146..0151ae55b4 100644 --- a/data/overlays/actors/z_bg_jya_haheniron.reloc.s +++ b/data/overlays/actors/z_bg_jya_haheniron.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_808987E0 -.incbin "baserom/ovl_Bg_Jya_Haheniron", 0x720, 0x000000C0 +.balign 16 + +glabel D_808987E0 + .incbin "baserom/ovl_Bg_Jya_Haheniron", 0x720, 0x000000C0 diff --git a/data/overlays/actors/z_bg_jya_ironobj.data.s b/data/overlays/actors/z_bg_jya_ironobj.data.s index f58b21e135..541da48f78 100644 --- a/data/overlays/actors/z_bg_jya_ironobj.data.s +++ b/data/overlays/actors/z_bg_jya_ironobj.data.s @@ -3,7 +3,7 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data diff --git a/data/overlays/actors/z_bg_jya_ironobj.reloc.s b/data/overlays/actors/z_bg_jya_ironobj.reloc.s index 4934020de2..607e3f54d9 100644 --- a/data/overlays/actors/z_bg_jya_ironobj.reloc.s +++ b/data/overlays/actors/z_bg_jya_ironobj.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_80899620 -.incbin "baserom/ovl_Bg_Jya_Ironobj", 0xD80, 0x00000120 +.balign 16 + +glabel D_80899620 + .incbin "baserom/ovl_Bg_Jya_Ironobj", 0xD80, 0x00000120 diff --git a/data/overlays/actors/z_bg_jya_lift.data.s b/data/overlays/actors/z_bg_jya_lift.data.s index e7b8926eda..4ea818532e 100644 --- a/data/overlays/actors/z_bg_jya_lift.data.s +++ b/data/overlays/actors/z_bg_jya_lift.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel D_8089A020 .word 0x00000000 glabel Bg_Jya_Lift_InitVars diff --git a/data/overlays/actors/z_bg_jya_lift.reloc.s b/data/overlays/actors/z_bg_jya_lift.reloc.s index 4a14889d6f..9646c69d27 100644 --- a/data/overlays/actors/z_bg_jya_lift.reloc.s +++ b/data/overlays/actors/z_bg_jya_lift.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_8089A090 -.incbin "baserom/ovl_Bg_Jya_Lift", 0x4F0, 0x000000A0 +.balign 16 + +glabel D_8089A090 + .incbin "baserom/ovl_Bg_Jya_Lift", 0x4F0, 0x000000A0 diff --git a/data/overlays/actors/z_bg_jya_megami.data.s b/data/overlays/actors/z_bg_jya_megami.data.s index b49dcacf28..9f048c6147 100644 --- a/data/overlays/actors/z_bg_jya_megami.data.s +++ b/data/overlays/actors/z_bg_jya_megami.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel Bg_Jya_Megami_InitVars .word 0x01560100, 0x00000000, 0x00F10000, 0x0000033C .word BgJyaMegami_Init diff --git a/data/overlays/actors/z_bg_jya_megami.reloc.s b/data/overlays/actors/z_bg_jya_megami.reloc.s index d786ec6035..a4dee2e813 100644 --- a/data/overlays/actors/z_bg_jya_megami.reloc.s +++ b/data/overlays/actors/z_bg_jya_megami.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_8089B2D0 -.incbin "baserom/ovl_Bg_Jya_Megami", 0x11A0, 0x00000170 +.balign 16 + +glabel D_8089B2D0 + .incbin "baserom/ovl_Bg_Jya_Megami", 0x11A0, 0x00000170 diff --git a/data/overlays/actors/z_bg_jya_zurerukabe.data.s b/data/overlays/actors/z_bg_jya_zurerukabe.data.s index a11c75d038..ba98bdc3d4 100644 --- a/data/overlays/actors/z_bg_jya_zurerukabe.data.s +++ b/data/overlays/actors/z_bg_jya_zurerukabe.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel D_8089B9C0 .word 0x00000000, 0x00000000, 0x00000000, 0x00000000 glabel Bg_Jya_Zurerukabe_InitVars diff --git a/data/overlays/actors/z_bg_jya_zurerukabe.reloc.s b/data/overlays/actors/z_bg_jya_zurerukabe.reloc.s index 4d9d7b15a0..10232b23a2 100644 --- a/data/overlays/actors/z_bg_jya_zurerukabe.reloc.s +++ b/data/overlays/actors/z_bg_jya_zurerukabe.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_8089BB50 -.incbin "baserom/ovl_Bg_Jya_Zurerukabe", 0x710, 0x00000120 +.balign 16 + +glabel D_8089BB50 + .incbin "baserom/ovl_Bg_Jya_Zurerukabe", 0x710, 0x00000120 diff --git a/data/overlays/actors/z_bg_menkuri_eye.bss.s b/data/overlays/actors/z_bg_menkuri_eye.bss.s index c6d253194e..3d6882b94d 100644 --- a/data/overlays/actors/z_bg_menkuri_eye.bss.s +++ b/data/overlays/actors/z_bg_menkuri_eye.bss.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers -.bss +.section .bss + +.balign 16 glabel D_8089C1A0 .space 0x10 diff --git a/data/overlays/actors/z_bg_menkuri_eye.data.s b/data/overlays/actors/z_bg_menkuri_eye.data.s index 32ce60d485..5970d94f50 100644 --- a/data/overlays/actors/z_bg_menkuri_eye.data.s +++ b/data/overlays/actors/z_bg_menkuri_eye.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel Bg_Menkuri_Eye_InitVars .word 0x00620100, 0x00000020, 0x004D0000, 0x000001B0 .word BgMenkuriEye_Init diff --git a/data/overlays/actors/z_bg_menkuri_eye.reloc.s b/data/overlays/actors/z_bg_menkuri_eye.reloc.s index f5d664b271..213cb4106c 100644 --- a/data/overlays/actors/z_bg_menkuri_eye.reloc.s +++ b/data/overlays/actors/z_bg_menkuri_eye.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_8089C120 -.incbin "baserom/ovl_Bg_Menkuri_Eye", 0x4B0, 0x00000080 +.balign 16 + +glabel D_8089C120 + .incbin "baserom/ovl_Bg_Menkuri_Eye", 0x4B0, 0x00000080 diff --git a/data/overlays/actors/z_bg_mizu_bwall.data.s b/data/overlays/actors/z_bg_mizu_bwall.data.s index d6f5101566..65fdd54f3f 100644 --- a/data/overlays/actors/z_bg_mizu_bwall.data.s +++ b/data/overlays/actors/z_bg_mizu_bwall.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel Bg_Mizu_Bwall_InitVars .word 0x01BA0100, 0x00000010, 0x00590000, 0x000002BC .word BgMizuBwall_Init diff --git a/data/overlays/actors/z_bg_mizu_bwall.reloc.s b/data/overlays/actors/z_bg_mizu_bwall.reloc.s index 3294d6379c..d6d19255e0 100644 --- a/data/overlays/actors/z_bg_mizu_bwall.reloc.s +++ b/data/overlays/actors/z_bg_mizu_bwall.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_8089DA80 -.incbin "baserom/ovl_Bg_Mizu_Bwall", 0x1600, 0x000001B0 +.balign 16 + +glabel D_8089DA80 + .incbin "baserom/ovl_Bg_Mizu_Bwall", 0x1600, 0x000001B0 diff --git a/data/overlays/actors/z_bg_mizu_movebg.bss.s b/data/overlays/actors/z_bg_mizu_movebg.bss.s index e302bc25c1..c834016af8 100644 --- a/data/overlays/actors/z_bg_mizu_movebg.bss.s +++ b/data/overlays/actors/z_bg_mizu_movebg.bss.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers -.bss +.section .bss + +.balign 16 glabel D_8089EE40 .space 0x10 diff --git a/data/overlays/actors/z_bg_mizu_movebg.data.s b/data/overlays/actors/z_bg_mizu_movebg.data.s index 5482336d16..6a64e460ec 100644 --- a/data/overlays/actors/z_bg_mizu_movebg.data.s +++ b/data/overlays/actors/z_bg_mizu_movebg.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel Bg_Mizu_Movebg_InitVars .word 0x00640100, 0x00000010, 0x00590000, 0x00000188 .word BgMizuMovebg_Init diff --git a/data/overlays/actors/z_bg_mizu_movebg.reloc.s b/data/overlays/actors/z_bg_mizu_movebg.reloc.s index 6486daf00a..fdd447c61a 100644 --- a/data/overlays/actors/z_bg_mizu_movebg.reloc.s +++ b/data/overlays/actors/z_bg_mizu_movebg.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_8089EC90 -.incbin "baserom/ovl_Bg_Mizu_Movebg", 0x1060, 0x000001B0 +.balign 16 + +glabel D_8089EC90 + .incbin "baserom/ovl_Bg_Mizu_Movebg", 0x1060, 0x000001B0 diff --git a/data/overlays/actors/z_bg_mizu_shutter.data.s b/data/overlays/actors/z_bg_mizu_shutter.data.s index c538bb8f6c..463d342a65 100644 --- a/data/overlays/actors/z_bg_mizu_shutter.data.s +++ b/data/overlays/actors/z_bg_mizu_shutter.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel Bg_Mizu_Shutter_InitVars .word 0x01BB0600, 0x00000010, 0x00590000, 0x00000190 .word BgMizuShutter_Init diff --git a/data/overlays/actors/z_bg_mizu_shutter.reloc.s b/data/overlays/actors/z_bg_mizu_shutter.reloc.s index 872d6846c3..41c8de50aa 100644 --- a/data/overlays/actors/z_bg_mizu_shutter.reloc.s +++ b/data/overlays/actors/z_bg_mizu_shutter.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_8089F5F0 -.incbin "baserom/ovl_Bg_Mizu_Shutter", 0x7A0, 0x000000F0 +.balign 16 + +glabel D_8089F5F0 + .incbin "baserom/ovl_Bg_Mizu_Shutter", 0x7A0, 0x000000F0 diff --git a/data/overlays/actors/z_bg_mizu_water.data.s b/data/overlays/actors/z_bg_mizu_water.data.s index bed2937d98..0adc3b63de 100644 --- a/data/overlays/actors/z_bg_mizu_water.data.s +++ b/data/overlays/actors/z_bg_mizu_water.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel D_808A0510 .word 0x00000000 glabel D_808A0514 diff --git a/data/overlays/actors/z_bg_mizu_water.reloc.s b/data/overlays/actors/z_bg_mizu_water.reloc.s index 83f4b69774..9f5ea8caa6 100644 --- a/data/overlays/actors/z_bg_mizu_water.reloc.s +++ b/data/overlays/actors/z_bg_mizu_water.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_808A0640 -.incbin "baserom/ovl_Bg_Mizu_Water", 0xD90, 0x00000140 +.balign 16 + +glabel D_808A0640 + .incbin "baserom/ovl_Bg_Mizu_Water", 0xD90, 0x00000140 diff --git a/data/overlays/actors/z_bg_mori_bigst.data.s b/data/overlays/actors/z_bg_mori_bigst.data.s index 811f7484ea..d3eca92e46 100644 --- a/data/overlays/actors/z_bg_mori_bigst.data.s +++ b/data/overlays/actors/z_bg_mori_bigst.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel Bg_Mori_Bigst_InitVars .word 0x00860100, 0x00000010, 0x00720000, 0x0000016C .word BgMoriBigst_Init diff --git a/data/overlays/actors/z_bg_mori_bigst.reloc.s b/data/overlays/actors/z_bg_mori_bigst.reloc.s index 5018747f58..838fda448f 100644 --- a/data/overlays/actors/z_bg_mori_bigst.reloc.s +++ b/data/overlays/actors/z_bg_mori_bigst.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_808A16D0 -.incbin "baserom/ovl_Bg_Mori_Bigst", 0xB10, 0x00000130 +.balign 16 + +glabel D_808A16D0 + .incbin "baserom/ovl_Bg_Mori_Bigst", 0xB10, 0x00000130 diff --git a/data/overlays/actors/z_bg_mori_elevator.data.s b/data/overlays/actors/z_bg_mori_elevator.data.s index b901717216..a4c9f7342c 100644 --- a/data/overlays/actors/z_bg_mori_elevator.data.s +++ b/data/overlays/actors/z_bg_mori_elevator.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel D_808A2210 .word 0x00000000 glabel Bg_Mori_Elevator_InitVars diff --git a/data/overlays/actors/z_bg_mori_elevator.reloc.s b/data/overlays/actors/z_bg_mori_elevator.reloc.s index 136563fcc8..16e97d92d3 100644 --- a/data/overlays/actors/z_bg_mori_elevator.reloc.s +++ b/data/overlays/actors/z_bg_mori_elevator.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_808A23E0 -.incbin "baserom/ovl_Bg_Mori_Elevator", 0xBE0, 0x00000180 +.balign 16 + +glabel D_808A23E0 + .incbin "baserom/ovl_Bg_Mori_Elevator", 0xBE0, 0x00000180 diff --git a/data/overlays/actors/z_bg_mori_hashigo.data.s b/data/overlays/actors/z_bg_mori_hashigo.data.s index d47caff016..fffa486f42 100644 --- a/data/overlays/actors/z_bg_mori_hashigo.data.s +++ b/data/overlays/actors/z_bg_mori_hashigo.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel Bg_Mori_Hashigo_InitVars .word 0x00E20100, 0x00000000, 0x00720000, 0x000001D0 .word BgMoriHashigo_Init diff --git a/data/overlays/actors/z_bg_mori_hashigo.reloc.s b/data/overlays/actors/z_bg_mori_hashigo.reloc.s index e6ccbc2f7b..a629692844 100644 --- a/data/overlays/actors/z_bg_mori_hashigo.reloc.s +++ b/data/overlays/actors/z_bg_mori_hashigo.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_808A2F70 -.incbin "baserom/ovl_Bg_Mori_Hashigo", 0xA10, 0x000000F0 +.balign 16 + +glabel D_808A2F70 + .incbin "baserom/ovl_Bg_Mori_Hashigo", 0xA10, 0x000000F0 diff --git a/data/overlays/actors/z_bg_mori_hashira4.bss.s b/data/overlays/actors/z_bg_mori_hashira4.bss.s index c6c63197d5..7adb98b07a 100644 --- a/data/overlays/actors/z_bg_mori_hashira4.bss.s +++ b/data/overlays/actors/z_bg_mori_hashira4.bss.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers -.bss +.section .bss + +.balign 16 glabel D_808A37C0 .space 0x10 diff --git a/data/overlays/actors/z_bg_mori_hashira4.data.s b/data/overlays/actors/z_bg_mori_hashira4.data.s index b8cc509cff..d56b0c18cd 100644 --- a/data/overlays/actors/z_bg_mori_hashira4.data.s +++ b/data/overlays/actors/z_bg_mori_hashira4.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel Bg_Mori_Hashira4_InitVars .word 0x00E30100, 0x00000010, 0x00720000, 0x0000016C .word BgMoriHashira4_Init diff --git a/data/overlays/actors/z_bg_mori_hashira4.reloc.s b/data/overlays/actors/z_bg_mori_hashira4.reloc.s index 3c84b51394..5b20e6a168 100644 --- a/data/overlays/actors/z_bg_mori_hashira4.reloc.s +++ b/data/overlays/actors/z_bg_mori_hashira4.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_808A36F0 -.incbin "baserom/ovl_Bg_Mori_Hashira4", 0x690, 0x000000D0 +.balign 16 + +glabel D_808A36F0 + .incbin "baserom/ovl_Bg_Mori_Hashira4", 0x690, 0x000000D0 diff --git a/data/overlays/actors/z_bg_mori_hineri.data.s b/data/overlays/actors/z_bg_mori_hineri.data.s index 1b6785a535..477eda7b58 100644 --- a/data/overlays/actors/z_bg_mori_hineri.data.s +++ b/data/overlays/actors/z_bg_mori_hineri.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel D_808A43E0 .word 0xFFFF0000 glabel Bg_Mori_Hineri_InitVars diff --git a/data/overlays/actors/z_bg_mori_hineri.reloc.s b/data/overlays/actors/z_bg_mori_hineri.reloc.s index e6b33fef34..4866844adc 100644 --- a/data/overlays/actors/z_bg_mori_hineri.reloc.s +++ b/data/overlays/actors/z_bg_mori_hineri.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_808A44F0 -.incbin "baserom/ovl_Bg_Mori_Hineri", 0xD20, 0x00000150 +.balign 16 + +glabel D_808A44F0 + .incbin "baserom/ovl_Bg_Mori_Hineri", 0xD20, 0x00000150 diff --git a/data/overlays/actors/z_bg_mori_idomizu.data.s b/data/overlays/actors/z_bg_mori_idomizu.data.s index a91025d969..58b71614dd 100644 --- a/data/overlays/actors/z_bg_mori_idomizu.data.s +++ b/data/overlays/actors/z_bg_mori_idomizu.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel D_808A4C10 .word 0x00000000 glabel Bg_Mori_Idomizu_InitVars diff --git a/data/overlays/actors/z_bg_mori_idomizu.reloc.s b/data/overlays/actors/z_bg_mori_idomizu.reloc.s index 514ebfc58a..2947b7304a 100644 --- a/data/overlays/actors/z_bg_mori_idomizu.reloc.s +++ b/data/overlays/actors/z_bg_mori_idomizu.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_808A4D00 -.incbin "baserom/ovl_Bg_Mori_Idomizu", 0x6C0, 0x000000C0 +.balign 16 + +glabel D_808A4D00 + .incbin "baserom/ovl_Bg_Mori_Idomizu", 0x6C0, 0x000000C0 diff --git a/data/overlays/actors/z_bg_mori_kaitenkabe.data.s b/data/overlays/actors/z_bg_mori_kaitenkabe.data.s index 1ade6ac89b..8b4ebfb1d1 100644 --- a/data/overlays/actors/z_bg_mori_kaitenkabe.data.s +++ b/data/overlays/actors/z_bg_mori_kaitenkabe.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel Bg_Mori_Kaitenkabe_InitVars .word 0x00880100, 0x00000000, 0x00720000, 0x00000188 .word BgMoriKaitenkabe_Init diff --git a/data/overlays/actors/z_bg_mori_kaitenkabe.reloc.s b/data/overlays/actors/z_bg_mori_kaitenkabe.reloc.s index 83f4186afb..dd3f94e069 100644 --- a/data/overlays/actors/z_bg_mori_kaitenkabe.reloc.s +++ b/data/overlays/actors/z_bg_mori_kaitenkabe.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_808A54C0 -.incbin "baserom/ovl_Bg_Mori_Kaitenkabe", 0x700, 0x000000B0 +.balign 16 + +glabel D_808A54C0 + .incbin "baserom/ovl_Bg_Mori_Kaitenkabe", 0x700, 0x000000B0 diff --git a/data/overlays/actors/z_bg_mori_rakkatenjo.data.s b/data/overlays/actors/z_bg_mori_rakkatenjo.data.s index 839f15cf1d..c866292ab7 100644 --- a/data/overlays/actors/z_bg_mori_rakkatenjo.data.s +++ b/data/overlays/actors/z_bg_mori_rakkatenjo.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel D_808A5E60 .word 0x00000000 glabel Bg_Mori_Rakkatenjo_InitVars diff --git a/data/overlays/actors/z_bg_mori_rakkatenjo.reloc.s b/data/overlays/actors/z_bg_mori_rakkatenjo.reloc.s index 2cf0ef76c6..f17e449ced 100644 --- a/data/overlays/actors/z_bg_mori_rakkatenjo.reloc.s +++ b/data/overlays/actors/z_bg_mori_rakkatenjo.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_808A6090 -.incbin "baserom/ovl_Bg_Mori_Rakkatenjo", 0xB20, 0x00000180 +.balign 16 + +glabel D_808A6090 + .incbin "baserom/ovl_Bg_Mori_Rakkatenjo", 0xB20, 0x00000180 diff --git a/data/overlays/actors/z_bg_po_event.bss.s b/data/overlays/actors/z_bg_po_event.bss.s index b02152bca5..b41e9ace57 100644 --- a/data/overlays/actors/z_bg_po_event.bss.s +++ b/data/overlays/actors/z_bg_po_event.bss.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers -.bss +.section .bss + +.balign 16 glabel D_808A80A0 .space 0x10 diff --git a/data/overlays/actors/z_bg_po_event.data.s b/data/overlays/actors/z_bg_po_event.data.s index 594b7ceb1e..04f8558c4c 100644 --- a/data/overlays/actors/z_bg_po_event.data.s +++ b/data/overlays/actors/z_bg_po_event.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel Bg_Po_Event_InitVars .word 0x00930100, 0x00000000, 0x00990000, 0x00000248 .word BgPoEvent_Init diff --git a/data/overlays/actors/z_bg_po_event.reloc.s b/data/overlays/actors/z_bg_po_event.reloc.s index d00c9a2ca9..b8d1f42901 100644 --- a/data/overlays/actors/z_bg_po_event.reloc.s +++ b/data/overlays/actors/z_bg_po_event.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_808A7E10 -.incbin "baserom/ovl_Bg_Po_Event", 0x1C00, 0x00000290 +.balign 16 + +glabel D_808A7E10 + .incbin "baserom/ovl_Bg_Po_Event", 0x1C00, 0x00000290 diff --git a/data/overlays/actors/z_bg_po_syokudai.data.s b/data/overlays/actors/z_bg_po_syokudai.data.s index e636415bab..a84bfc6f8e 100644 --- a/data/overlays/actors/z_bg_po_syokudai.data.s +++ b/data/overlays/actors/z_bg_po_syokudai.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel D_808A8960 .word 0x09000D39, 0x20010000, 0x00000000, 0x00000000, 0x00000000, 0xFFCFFFFF, 0x00000000, 0x00010100, 0x000C003C, 0x00000000, 0x00000000 glabel D_808A898C diff --git a/data/overlays/actors/z_bg_po_syokudai.reloc.s b/data/overlays/actors/z_bg_po_syokudai.reloc.s index b57713f801..53e7b48eb3 100644 --- a/data/overlays/actors/z_bg_po_syokudai.reloc.s +++ b/data/overlays/actors/z_bg_po_syokudai.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_808A8A50 -.incbin "baserom/ovl_Bg_Po_Syokudai", 0x9A0, 0x00000090 +.balign 16 + +glabel D_808A8A50 + .incbin "baserom/ovl_Bg_Po_Syokudai", 0x9A0, 0x00000090 diff --git a/data/overlays/actors/z_bg_relay_objects.data.s b/data/overlays/actors/z_bg_relay_objects.data.s index 7d5e5c6d1f..0ac275d5e8 100644 --- a/data/overlays/actors/z_bg_relay_objects.data.s +++ b/data/overlays/actors/z_bg_relay_objects.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel Bg_Relay_Objects_InitVars .word 0x01230100, 0x00000010, 0x006C0000, 0x0000016C .word BgRelayObjects_Init diff --git a/data/overlays/actors/z_bg_relay_objects.reloc.s b/data/overlays/actors/z_bg_relay_objects.reloc.s index 385ac668fb..9acbdd5d69 100644 --- a/data/overlays/actors/z_bg_relay_objects.reloc.s +++ b/data/overlays/actors/z_bg_relay_objects.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_808A9520 -.incbin "baserom/ovl_Bg_Relay_Objects", 0x6D0, 0x000000C0 +.balign 16 + +glabel D_808A9520 + .incbin "baserom/ovl_Bg_Relay_Objects", 0x6D0, 0x000000C0 diff --git a/data/overlays/actors/z_bg_spot00_hanebasi.data.s b/data/overlays/actors/z_bg_spot00_hanebasi.data.s index a4cc4ae7f0..40cb3654d0 100644 --- a/data/overlays/actors/z_bg_spot00_hanebasi.data.s +++ b/data/overlays/actors/z_bg_spot00_hanebasi.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel Bg_Spot00_Hanebasi_InitVars .word 0x004A0100, 0x00000010, 0x002F0000, 0x00000180 .word BgSpot00Hanebasi_Init diff --git a/data/overlays/actors/z_bg_spot00_hanebasi.reloc.s b/data/overlays/actors/z_bg_spot00_hanebasi.reloc.s index 1f0aced131..ab058daa6d 100644 --- a/data/overlays/actors/z_bg_spot00_hanebasi.reloc.s +++ b/data/overlays/actors/z_bg_spot00_hanebasi.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_808AA8A0 -.incbin "baserom/ovl_Bg_Spot00_Hanebasi", 0x1120, 0x00000120 +.balign 16 + +glabel D_808AA8A0 + .incbin "baserom/ovl_Bg_Spot00_Hanebasi", 0x1120, 0x00000120 diff --git a/data/overlays/actors/z_bg_spot01_idohashira.data.s b/data/overlays/actors/z_bg_spot01_idohashira.data.s index 54fec7f766..90ca4c7bf3 100644 --- a/data/overlays/actors/z_bg_spot01_idohashira.data.s +++ b/data/overlays/actors/z_bg_spot01_idohashira.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel D_808AB830 .word func_808AB504 .word func_808AB510 diff --git a/data/overlays/actors/z_bg_spot01_idohashira.reloc.s b/data/overlays/actors/z_bg_spot01_idohashira.reloc.s index 2608a065b0..044c4164b2 100644 --- a/data/overlays/actors/z_bg_spot01_idohashira.reloc.s +++ b/data/overlays/actors/z_bg_spot01_idohashira.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_808AB9E0 -.incbin "baserom/ovl_Bg_Spot01_Idohashira", 0xD00, 0x00000100 +.balign 16 + +glabel D_808AB9E0 + .incbin "baserom/ovl_Bg_Spot01_Idohashira", 0xD00, 0x00000100 diff --git a/data/overlays/actors/z_bg_spot01_idomizu.data.s b/data/overlays/actors/z_bg_spot01_idomizu.data.s index e3673cd4b8..2566b7f595 100644 --- a/data/overlays/actors/z_bg_spot01_idomizu.data.s +++ b/data/overlays/actors/z_bg_spot01_idomizu.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel Bg_Spot01_Idomizu_InitVars .word 0x01040100, 0x00000020, 0x00F90000, 0x00000158 .word BgSpot01Idomizu_Init diff --git a/data/overlays/actors/z_bg_spot01_idomizu.reloc.s b/data/overlays/actors/z_bg_spot01_idomizu.reloc.s index d284bf5f46..707ab0d961 100644 --- a/data/overlays/actors/z_bg_spot01_idomizu.reloc.s +++ b/data/overlays/actors/z_bg_spot01_idomizu.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_808ABE20 -.incbin "baserom/ovl_Bg_Spot01_Idomizu", 0x340, 0x00000060 +.balign 16 + +glabel D_808ABE20 + .incbin "baserom/ovl_Bg_Spot01_Idomizu", 0x340, 0x00000060 diff --git a/data/overlays/actors/z_bg_spot01_objects2.data.s b/data/overlays/actors/z_bg_spot01_objects2.data.s index 1c16ef877e..96cf1dbe05 100644 --- a/data/overlays/actors/z_bg_spot01_objects2.data.s +++ b/data/overlays/actors/z_bg_spot01_objects2.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel Bg_Spot01_Objects2_InitVars .word 0x019D0100, 0x00000010, 0x00010000, 0x00000180 .word BgSpot01Objects2_Init diff --git a/data/overlays/actors/z_bg_spot01_objects2.reloc.s b/data/overlays/actors/z_bg_spot01_objects2.reloc.s index 8954a609e6..8bab4f37c5 100644 --- a/data/overlays/actors/z_bg_spot01_objects2.reloc.s +++ b/data/overlays/actors/z_bg_spot01_objects2.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_808AC5C0 -.incbin "baserom/ovl_Bg_Spot01_Objects2", 0x480, 0x000000A0 +.balign 16 + +glabel D_808AC5C0 + .incbin "baserom/ovl_Bg_Spot01_Objects2", 0x480, 0x000000A0 diff --git a/data/overlays/actors/z_bg_spot02_objects.data.s b/data/overlays/actors/z_bg_spot02_objects.data.s index 9d1108a9d8..a60ff97783 100644 --- a/data/overlays/actors/z_bg_spot02_objects.data.s +++ b/data/overlays/actors/z_bg_spot02_objects.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel D_808AD850 .word 0x060096B0, 0x0600A2B0, 0x0600AEB0, 0x0600BAB0, 0x0600C6B0, 0x0600D2B0, 0x0600DEB0, 0x0600EAB0, 0x0600F6B0, 0x060102B0, 0x06010EB0, 0x06011AB0 glabel Bg_Spot02_Objects_InitVars diff --git a/data/overlays/actors/z_bg_spot02_objects.reloc.s b/data/overlays/actors/z_bg_spot02_objects.reloc.s index 83920c3d35..49f0dcbea4 100644 --- a/data/overlays/actors/z_bg_spot02_objects.reloc.s +++ b/data/overlays/actors/z_bg_spot02_objects.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_808AD9A0 -.incbin "baserom/ovl_Bg_Spot02_Objects", 0x1340, 0x00000140 +.balign 16 + +glabel D_808AD9A0 + .incbin "baserom/ovl_Bg_Spot02_Objects", 0x1340, 0x00000140 diff --git a/data/overlays/actors/z_bg_spot03_taki.data.s b/data/overlays/actors/z_bg_spot03_taki.data.s index c9c7a29583..743ff36899 100644 --- a/data/overlays/actors/z_bg_spot03_taki.data.s +++ b/data/overlays/actors/z_bg_spot03_taki.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel Bg_Spot03_Taki_InitVars .word 0x011F0100, 0x00000030, 0x01120000, 0x00000178 .word BgSpot03Taki_Init diff --git a/data/overlays/actors/z_bg_spot03_taki.reloc.s b/data/overlays/actors/z_bg_spot03_taki.reloc.s index b73591e15a..0dc2bc79d6 100644 --- a/data/overlays/actors/z_bg_spot03_taki.reloc.s +++ b/data/overlays/actors/z_bg_spot03_taki.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_808AE410 -.incbin "baserom/ovl_Bg_Spot03_Taki", 0x930, 0x00000060 +.balign 16 + +glabel D_808AE410 + .incbin "baserom/ovl_Bg_Spot03_Taki", 0x930, 0x00000060 diff --git a/data/overlays/actors/z_bg_spot06_objects.data.s b/data/overlays/actors/z_bg_spot06_objects.data.s index 256b2ce0ab..c3e3df8a3e 100644 --- a/data/overlays/actors/z_bg_spot06_objects.data.s +++ b/data/overlays/actors/z_bg_spot06_objects.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel Bg_Spot06_Objects_InitVars .word 0x00D50600, 0x00000200, 0x006A0000, 0x000001D0 .word BgSpot06Objects_Init diff --git a/data/overlays/actors/z_bg_spot06_objects.reloc.s b/data/overlays/actors/z_bg_spot06_objects.reloc.s index 5ace263f31..283f5b3315 100644 --- a/data/overlays/actors/z_bg_spot06_objects.reloc.s +++ b/data/overlays/actors/z_bg_spot06_objects.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_808AFA50 -.incbin "baserom/ovl_Bg_Spot06_Objects", 0x12D0, 0x000001E0 +.balign 16 + +glabel D_808AFA50 + .incbin "baserom/ovl_Bg_Spot06_Objects", 0x12D0, 0x000001E0 diff --git a/data/overlays/actors/z_bg_spot07_taki.data.s b/data/overlays/actors/z_bg_spot07_taki.data.s index 3308422aac..275ceca177 100644 --- a/data/overlays/actors/z_bg_spot07_taki.data.s +++ b/data/overlays/actors/z_bg_spot07_taki.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel Bg_Spot07_Taki_InitVars .word 0x01200100, 0x00000030, 0x01130000, 0x00000168 .word BgSpot07Taki_Init diff --git a/data/overlays/actors/z_bg_spot07_taki.reloc.s b/data/overlays/actors/z_bg_spot07_taki.reloc.s index 38fbb96e0b..a14931ba9e 100644 --- a/data/overlays/actors/z_bg_spot07_taki.reloc.s +++ b/data/overlays/actors/z_bg_spot07_taki.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_808B0270 -.incbin "baserom/ovl_Bg_Spot07_Taki", 0x640, 0x00000060 +.balign 16 + +glabel D_808B0270 + .incbin "baserom/ovl_Bg_Spot07_Taki", 0x640, 0x00000060 diff --git a/data/overlays/actors/z_bg_spot08_bakudankabe.data.s b/data/overlays/actors/z_bg_spot08_bakudankabe.data.s index 3d5d5bc8a4..7d3cd9a4a7 100644 --- a/data/overlays/actors/z_bg_spot08_bakudankabe.data.s +++ b/data/overlays/actors/z_bg_spot08_bakudankabe.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel Bg_Spot08_Bakudankabe_InitVars .word 0x01A80100, 0x00400000, 0x00740000, 0x00000244 .word BgSpot08Bakudankabe_Init diff --git a/data/overlays/actors/z_bg_spot08_bakudankabe.reloc.s b/data/overlays/actors/z_bg_spot08_bakudankabe.reloc.s index 7b660919fe..78699f2d91 100644 --- a/data/overlays/actors/z_bg_spot08_bakudankabe.reloc.s +++ b/data/overlays/actors/z_bg_spot08_bakudankabe.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_808B08F0 -.incbin "baserom/ovl_Bg_Spot08_Bakudankabe", 0x620, 0x00000070 +.balign 16 + +glabel D_808B08F0 + .incbin "baserom/ovl_Bg_Spot08_Bakudankabe", 0x620, 0x00000070 diff --git a/data/overlays/actors/z_bg_spot08_iceblock.data.s b/data/overlays/actors/z_bg_spot08_iceblock.data.s index 52e0772415..4416f9d41b 100644 --- a/data/overlays/actors/z_bg_spot08_iceblock.data.s +++ b/data/overlays/actors/z_bg_spot08_iceblock.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel Bg_Spot08_Iceblock_InitVars .word 0x00D10100, 0x00000000, 0x00740000, 0x0000019C .word BgSpot08Iceblock_Init diff --git a/data/overlays/actors/z_bg_spot08_iceblock.reloc.s b/data/overlays/actors/z_bg_spot08_iceblock.reloc.s index 5418010753..0d357829ca 100644 --- a/data/overlays/actors/z_bg_spot08_iceblock.reloc.s +++ b/data/overlays/actors/z_bg_spot08_iceblock.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_808B18B0 -.incbin "baserom/ovl_Bg_Spot08_Iceblock", 0xF50, 0x00000230 +.balign 16 + +glabel D_808B18B0 + .incbin "baserom/ovl_Bg_Spot08_Iceblock", 0xF50, 0x00000230 diff --git a/data/overlays/actors/z_bg_spot08_iceblock.rodata.s b/data/overlays/actors/z_bg_spot08_iceblock.rodata.s index c567806fe7..ff3cbaae0a 100644 --- a/data/overlays/actors/z_bg_spot08_iceblock.rodata.s +++ b/data/overlays/actors/z_bg_spot08_iceblock.rodata.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata +.balign 16 + glabel D_808B1710 .asciz "Warning : move BG 登録失敗(%s %d)(name %d)(arg_data 0x%04x)\n" .balign 4 diff --git a/data/overlays/actors/z_bg_spot11_bakudankabe.data.s b/data/overlays/actors/z_bg_spot11_bakudankabe.data.s index c2ec36b422..94e56ecfaa 100644 --- a/data/overlays/actors/z_bg_spot11_bakudankabe.data.s +++ b/data/overlays/actors/z_bg_spot11_bakudankabe.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel Bg_Spot11_Bakudankabe_InitVars .word 0x019F0100, 0x00000030, 0x016F0000, 0x000001B0 .word BgSpot11Bakudankabe_Init diff --git a/data/overlays/actors/z_bg_spot11_bakudankabe.reloc.s b/data/overlays/actors/z_bg_spot11_bakudankabe.reloc.s index 159634c0ea..9205222923 100644 --- a/data/overlays/actors/z_bg_spot11_bakudankabe.reloc.s +++ b/data/overlays/actors/z_bg_spot11_bakudankabe.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_808B2780 -.incbin "baserom/ovl_Bg_Spot11_Bakudankabe", 0x600, 0x00000070 +.balign 16 + +glabel D_808B2780 + .incbin "baserom/ovl_Bg_Spot11_Bakudankabe", 0x600, 0x00000070 diff --git a/data/overlays/actors/z_bg_spot11_oasis.data.s b/data/overlays/actors/z_bg_spot11_oasis.data.s index 8b1139a6e9..feb404c96c 100644 --- a/data/overlays/actors/z_bg_spot11_oasis.data.s +++ b/data/overlays/actors/z_bg_spot11_oasis.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel Bg_Spot11_Oasis_InitVars .word 0x01C20100, 0x00000010, 0x016F0000, 0x00000154 .word BgSpot11Oasis_Init diff --git a/data/overlays/actors/z_bg_spot11_oasis.reloc.s b/data/overlays/actors/z_bg_spot11_oasis.reloc.s index 8b6fe79dc3..fe759a6d7d 100644 --- a/data/overlays/actors/z_bg_spot11_oasis.reloc.s +++ b/data/overlays/actors/z_bg_spot11_oasis.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_808B2ED0 -.incbin "baserom/ovl_Bg_Spot11_Oasis", 0x6E0, 0x000000C0 +.balign 16 + +glabel D_808B2ED0 + .incbin "baserom/ovl_Bg_Spot11_Oasis", 0x6E0, 0x000000C0 diff --git a/data/overlays/actors/z_bg_spot15_rrbox.data.s b/data/overlays/actors/z_bg_spot15_rrbox.data.s index e15f6071a3..62927bed7f 100644 --- a/data/overlays/actors/z_bg_spot15_rrbox.data.s +++ b/data/overlays/actors/z_bg_spot15_rrbox.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel D_808B4590 .word 0x00000000 glabel Bg_Spot15_Rrbox_InitVars diff --git a/data/overlays/actors/z_bg_spot15_rrbox.reloc.s b/data/overlays/actors/z_bg_spot15_rrbox.reloc.s index 4067f2bc19..cab1a65dce 100644 --- a/data/overlays/actors/z_bg_spot15_rrbox.reloc.s +++ b/data/overlays/actors/z_bg_spot15_rrbox.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_808B4710 -.incbin "baserom/ovl_Bg_Spot15_Rrbox", 0xDB0, 0x00000140 +.balign 16 + +glabel D_808B4710 + .incbin "baserom/ovl_Bg_Spot15_Rrbox", 0xDB0, 0x00000140 diff --git a/data/overlays/actors/z_bg_spot15_saku.reloc.s b/data/overlays/actors/z_bg_spot15_saku.reloc.s index bc0854870f..b504bbe200 100644 --- a/data/overlays/actors/z_bg_spot15_saku.reloc.s +++ b/data/overlays/actors/z_bg_spot15_saku.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_808B4BB0 -.incbin "baserom/ovl_Bg_Spot15_Saku", 0x360, 0x00000080 +.balign 16 + +glabel D_808B4BB0 + .incbin "baserom/ovl_Bg_Spot15_Saku", 0x360, 0x00000080 diff --git a/data/overlays/actors/z_bg_spot16_bombstone.data.s b/data/overlays/actors/z_bg_spot16_bombstone.data.s index 00b56dec7b..bd80e9b054 100644 --- a/data/overlays/actors/z_bg_spot16_bombstone.data.s +++ b/data/overlays/actors/z_bg_spot16_bombstone.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel D_808B5DD0 .word 0x00000000 glabel D_808B5DD4 diff --git a/data/overlays/actors/z_bg_spot16_bombstone.reloc.s b/data/overlays/actors/z_bg_spot16_bombstone.reloc.s index f7de211b26..43b1ea5275 100644 --- a/data/overlays/actors/z_bg_spot16_bombstone.reloc.s +++ b/data/overlays/actors/z_bg_spot16_bombstone.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_808B6270 -.incbin "baserom/ovl_Bg_Spot16_Bombstone", 0x1640, 0x000001D0 +.balign 16 + +glabel D_808B6270 + .incbin "baserom/ovl_Bg_Spot16_Bombstone", 0x1640, 0x000001D0 diff --git a/data/overlays/actors/z_bg_spot16_doughnut.data.s b/data/overlays/actors/z_bg_spot16_doughnut.data.s index 99a70e152c..b8ed653f1c 100644 --- a/data/overlays/actors/z_bg_spot16_doughnut.data.s +++ b/data/overlays/actors/z_bg_spot16_doughnut.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel Bg_Spot16_Doughnut_InitVars .word 0x00E50600, 0x00000000, 0x017A0000, 0x00000154 .word BgSpot16Doughnut_Init diff --git a/data/overlays/actors/z_bg_spot16_doughnut.reloc.s b/data/overlays/actors/z_bg_spot16_doughnut.reloc.s index 2e698611d6..f730dd9727 100644 --- a/data/overlays/actors/z_bg_spot16_doughnut.reloc.s +++ b/data/overlays/actors/z_bg_spot16_doughnut.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_808B6B20 -.incbin "baserom/ovl_Bg_Spot16_Doughnut", 0x6E0, 0x000000A0 +.balign 16 + +glabel D_808B6B20 + .incbin "baserom/ovl_Bg_Spot16_Doughnut", 0x6E0, 0x000000A0 diff --git a/data/overlays/actors/z_bg_spot17_bakudankabe.data.s b/data/overlays/actors/z_bg_spot17_bakudankabe.data.s index 119628eaae..fb9f510ca7 100644 --- a/data/overlays/actors/z_bg_spot17_bakudankabe.data.s +++ b/data/overlays/actors/z_bg_spot17_bakudankabe.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel Bg_Spot17_Bakudankabe_InitVars .word 0x01A90100, 0x00000000, 0x00B10000, 0x00000164 .word BgSpot17Bakudankabe_Init diff --git a/data/overlays/actors/z_bg_spot17_bakudankabe.reloc.s b/data/overlays/actors/z_bg_spot17_bakudankabe.reloc.s index 286a0b45cb..1c9d94aed4 100644 --- a/data/overlays/actors/z_bg_spot17_bakudankabe.reloc.s +++ b/data/overlays/actors/z_bg_spot17_bakudankabe.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_808B7380 -.incbin "baserom/ovl_Bg_Spot17_Bakudankabe", 0x7C0, 0x00000080 +.balign 16 + +glabel D_808B7380 + .incbin "baserom/ovl_Bg_Spot17_Bakudankabe", 0x7C0, 0x00000080 diff --git a/data/overlays/actors/z_bg_spot18_basket.data.s b/data/overlays/actors/z_bg_spot18_basket.data.s index fd979bce17..a81a3abdb8 100644 --- a/data/overlays/actors/z_bg_spot18_basket.data.s +++ b/data/overlays/actors/z_bg_spot18_basket.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel Bg_Spot18_Basket_InitVars .word 0x015C0600, 0x00000010, 0x00AF0000, 0x0000021C .word BgSpot18Basket_Init diff --git a/data/overlays/actors/z_bg_spot18_basket.reloc.s b/data/overlays/actors/z_bg_spot18_basket.reloc.s index 2563b5a49a..3d22805e12 100644 --- a/data/overlays/actors/z_bg_spot18_basket.reloc.s +++ b/data/overlays/actors/z_bg_spot18_basket.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_808B8650 -.incbin "baserom/ovl_Bg_Spot18_Basket", 0xF40, 0x00000130 +.balign 16 + +glabel D_808B8650 + .incbin "baserom/ovl_Bg_Spot18_Basket", 0xF40, 0x00000130 diff --git a/data/overlays/actors/z_bg_spot18_obj.data.s b/data/overlays/actors/z_bg_spot18_obj.data.s index 915851a803..8100ff9b36 100644 --- a/data/overlays/actors/z_bg_spot18_obj.data.s +++ b/data/overlays/actors/z_bg_spot18_obj.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel Bg_Spot18_Obj_InitVars .word 0x00B90100, 0x00000000, 0x00AF0000, 0x0000016C .word BgSpot18Obj_Init diff --git a/data/overlays/actors/z_bg_spot18_obj.reloc.s b/data/overlays/actors/z_bg_spot18_obj.reloc.s index 9181af6747..097bbc8607 100644 --- a/data/overlays/actors/z_bg_spot18_obj.reloc.s +++ b/data/overlays/actors/z_bg_spot18_obj.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_808B9290 -.incbin "baserom/ovl_Bg_Spot18_Obj", 0x980, 0x00000140 +.balign 16 + +glabel D_808B9290 + .incbin "baserom/ovl_Bg_Spot18_Obj", 0x980, 0x00000140 diff --git a/data/overlays/actors/z_bg_spot18_shutter.data.s b/data/overlays/actors/z_bg_spot18_shutter.data.s index 48a72637d8..740733c40f 100644 --- a/data/overlays/actors/z_bg_spot18_shutter.data.s +++ b/data/overlays/actors/z_bg_spot18_shutter.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel Bg_Spot18_Shutter_InitVars .word 0x01C40600, 0x00000030, 0x00AF0000, 0x00000168 .word BgSpot18Shutter_Init diff --git a/data/overlays/actors/z_bg_spot18_shutter.reloc.s b/data/overlays/actors/z_bg_spot18_shutter.reloc.s index 0f70437b5b..8e0a9bd514 100644 --- a/data/overlays/actors/z_bg_spot18_shutter.reloc.s +++ b/data/overlays/actors/z_bg_spot18_shutter.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_808B9880 -.incbin "baserom/ovl_Bg_Spot18_Shutter", 0x4B0, 0x00000090 +.balign 16 + +glabel D_808B9880 + .incbin "baserom/ovl_Bg_Spot18_Shutter", 0x4B0, 0x00000090 diff --git a/data/overlays/actors/z_bg_sst_floor.data.s b/data/overlays/actors/z_bg_sst_floor.data.s index b2a1e1f840..b35fb03afd 100644 --- a/data/overlays/actors/z_bg_sst_floor.data.s +++ b/data/overlays/actors/z_bg_sst_floor.data.s @@ -3,7 +3,7 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data diff --git a/data/overlays/actors/z_bg_sst_floor.reloc.s b/data/overlays/actors/z_bg_sst_floor.reloc.s index 86d27c3b65..5df173429f 100644 --- a/data/overlays/actors/z_bg_sst_floor.reloc.s +++ b/data/overlays/actors/z_bg_sst_floor.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_808B9E90 -.incbin "baserom/ovl_Bg_Sst_Floor", 0x580, 0x00000070 +.balign 16 + +glabel D_808B9E90 + .incbin "baserom/ovl_Bg_Sst_Floor", 0x580, 0x00000070 diff --git a/data/overlays/actors/z_bg_toki_hikari.data.s b/data/overlays/actors/z_bg_toki_hikari.data.s index 1119f2020b..496d66c784 100644 --- a/data/overlays/actors/z_bg_toki_hikari.data.s +++ b/data/overlays/actors/z_bg_toki_hikari.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel Bg_Toki_Hikari_InitVars .word 0x006A0100, 0x00000020, 0x005E0000, 0x00000154 .word BgTokiHikari_Init diff --git a/data/overlays/actors/z_bg_toki_hikari.reloc.s b/data/overlays/actors/z_bg_toki_hikari.reloc.s index 475d3da058..3cb0b44708 100644 --- a/data/overlays/actors/z_bg_toki_hikari.reloc.s +++ b/data/overlays/actors/z_bg_toki_hikari.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_808BAD70 -.incbin "baserom/ovl_Bg_Toki_Hikari", 0xE70, 0x000000D0 +.balign 16 + +glabel D_808BAD70 + .incbin "baserom/ovl_Bg_Toki_Hikari", 0xE70, 0x000000D0 diff --git a/data/overlays/actors/z_bg_treemouth.data.s b/data/overlays/actors/z_bg_treemouth.data.s index 422e39c1b4..06b74c911b 100644 --- a/data/overlays/actors/z_bg_treemouth.data.s +++ b/data/overlays/actors/z_bg_treemouth.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel D_808BCE20 .word 0x0000000C, 0x00000BB8, 0x00000015, 0x00000001, 0x00010000, 0x0BB80000, 0x00000000, 0x00000000, 0x0000000F, 0xFFFFFFDE, 0x00000000, 0x0000000F, 0xFFFFFFDE, 0x00000000, 0x00000000, 0x00000000, 0x0000000A, 0x00000002, 0x00020000, 0x002154B2, 0x00000000, 0x00000A36, 0x00000000, 0xFFFFFE3D, 0x00000AF8, 0x00000000, 0xFFFFFDD1, 0x40BC1F08, 0x00000000, 0xC0BC1F08, 0x00040021, 0x002A5945, 0x00000000, 0x00000AF8, 0x00000000, 0xFFFFFDD1, 0x00000B29, 0x00000000, 0xFFFFFDAE, 0x40AE38E4, 0x00000000, 0xC0AE38E4, 0x00000001, 0x00010000, 0x04430000, 0x00000000, 0x423CCCC1, 0x0AC1002E, 0xFE9E59A8, 0x00000000, 0x423CCCC1, 0x0AC1002E, 0xFE9E20B8, 0x00000000, 0x423CCCC1, 0x0AC1002E, 0xFE9E0000, 0x00000000, 0x423CCCC1, 0x0AC1002E, 0xFE9E6430, 0xFF000000, 0x423CCCC1, 0x0AC1002E, 0xFE9E0000, 0x00000001, 0x0001003C, 0x04F70000, 0x00000000, 0x423CCCC1, 0x0AC1002E, 0xFE9E20BA, 0x00000000, 0x423CCCC1, 0x0AC1002E, 0xFE9E44B8, 0x00000000, 0x423CCCC1, 0x0AC1002E, 0xFE9E8080, 0x00000000, 0x423CCCC1, 0x0A910043, 0xFED22D9A, 0x00000000, 0x423CCCC1, 0x0A24007F, 0xFF3D005E, 0x00000000, 0x423CCCC1, 0x0A24007F, 0xFF3DFFFF, 0x00000000, 0x423CCCC1, 0x0A24007F, 0xFF3D0000, 0x00000000, 0x423CCCC1, 0x0A24007F, 0xFF3D5B80, 0xFF000000, 0x423CCCC1, 0x0A24007F, 0xFF3D7805, 0x00000002, 0x00010000, 0x04600000, 0x0000001E, 0x423CCCC1, 0x0AE40017, 0xFE3B20BA, 0x0000001E, 0x423CCCC1, 0x0AE30017, 0xFE3B44B8, 0x000003E8, 0x423CCCC1, 0x0AE30017, 0xFE3B8080, 0x0000001E, 0x423CCCC1, 0x0AE30017, 0xFE3B2D9A, 0xFF00001E, 0x423CCCC1, 0x0AE30017, 0xFE3B005E, 0x00000002, 0x0001003C, 0x05140000, 0x0000001E, 0x423CCCC1, 0x0AE40017, 0xFE3B20BA, 0x0000001E, 0x423CCCC1, 0x0AE30017, 0xFE3B44B8, 0x0000001E, 0x423CCCC1, 0x0AE30017, 0xFE3B8080, 0x0000001E, 0x423CCCC1, 0x0AD90048, 0xFE862D9A, 0x0000001E, 0x423CCCC1, 0x0A71007F, 0xFEF5005E, 0x0000001E, 0x423CCCC1, 0x0A71007F, 0xFEF5FFFF, 0x000003E8, 0x423CCCC1, 0x0A71007F, 0xFEF50000, 0x0000001E, 0x423CCCC1, 0x0A71007F, 0xFEF55B80, 0xFF00001E, 0x423CCCC1, 0x0A71007F, 0xFEF57805, 0x00000013, 0x00000004, 0xFFFF0000, 0x0028FFFF, 0xFFFFFFFF, 0x107D0028, 0x003C0000, 0xFFFFFFFF, 0xFFFF003C, 0x00A0FFFF, 0xFFFFFFFF, 0x101500A0, 0x00AA0000, 0xFFFFFFFF, 0x00000003, 0x00000001, 0x000C00B4, 0x00C80000, 0x00000000, 0x00000000, 0xFFFFFFF7, 0xFFFFFFDB, 0x00000000, 0xFFFFFFF7, 0xFFFFFFDB, 0x00000000, 0x00000000, 0x00000000, 0x0000002E, 0x00000001, 0x00010000, 0x0BB80000, 0x00000000, 0x00000000, 0xFFFFFFD7, 0xFFFFFFE4, 0x00000000, 0xFFFFFFD7, 0xFFFFFFE4, 0x00000000, 0x00000000, 0x00000000, 0x0000003E, 0x00000004, 0x00010000, 0x00010000, 0x00000000, 0x00000A6C, 0x0000002E, 0xFFFFFE16, 0x00000A6C, 0x0000002E, 0xFFFFFE16, 0x00000000, 0x00000000, 0x00000000, 0x00040001, 0x00325479, 0x00000000, 0x00000A6C, 0x0000002E, 0xFFFFFE16, 0x00000B4A, 0x0000002B, 0xFFFFFD9C, 0x4090FAC7, 0xBD7AC688, 0xC090FAC7, 0x00040032, 0x0064505C, 0x00000000, 0x00000B4A, 0x0000002B, 0xFFFFFD9C, 0x00000C25, 0x00000079, 0xFFFFFD3F, 0x408C28F6, 0x3FC7AE14, 0xC08C28F6, 0x00010064, 0x08240000, 0x00000000, 0x00000C25, 0x00000079, 0xFFFFFD3F, 0x00000C25, 0x00000079, 0xFFFFFD3F, 0x00000000, 0x00000000, 0x00000000, 0x00000056, 0x00000001, 0x004C008C, 0x008D0000, 0x00000000, 0x00000000, 0xFFFFFFBA, 0x00000094, 0x00000000, 0xFFFFFFBA, 0x00000094, 0x00000000, 0x00000000, 0x00000000, 0x0000007C, 0x00000001, 0x00040000, 0x00140000, 0x00000000, 0xFFFFFFA2, 0x00000000, 0x00000027, 0xFFFFFFA2, 0x00000000, 0x00000027, 0x00000000, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000000 glabel D_808BD2A0 diff --git a/data/overlays/actors/z_bg_treemouth.reloc.s b/data/overlays/actors/z_bg_treemouth.reloc.s index eca831b331..0f278102ac 100644 --- a/data/overlays/actors/z_bg_treemouth.reloc.s +++ b/data/overlays/actors/z_bg_treemouth.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_808BDA60 -.incbin "baserom/ovl_Bg_Treemouth", 0x1560, 0x00000180 +.balign 16 + +glabel D_808BDA60 + .incbin "baserom/ovl_Bg_Treemouth", 0x1560, 0x00000180 diff --git a/data/overlays/actors/z_bg_vb_sima.data.s b/data/overlays/actors/z_bg_vb_sima.data.s index aee8eeb490..f59db52de6 100644 --- a/data/overlays/actors/z_bg_vb_sima.data.s +++ b/data/overlays/actors/z_bg_vb_sima.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel Bg_Vb_Sima_InitVars .word 0x00AC0100, 0x00000000, 0x009C0000, 0x0000017C .word BgVbSima_Init diff --git a/data/overlays/actors/z_bg_vb_sima.reloc.s b/data/overlays/actors/z_bg_vb_sima.reloc.s index f412790ffe..2aacad565d 100644 --- a/data/overlays/actors/z_bg_vb_sima.reloc.s +++ b/data/overlays/actors/z_bg_vb_sima.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_808BE470 -.incbin "baserom/ovl_Bg_Vb_Sima", 0x710, 0x00000090 +.balign 16 + +glabel D_808BE470 + .incbin "baserom/ovl_Bg_Vb_Sima", 0x710, 0x00000090 diff --git a/data/overlays/actors/z_bg_ydan_hasi.data.s b/data/overlays/actors/z_bg_ydan_hasi.data.s index 6c2746fdce..3721c79c87 100644 --- a/data/overlays/actors/z_bg_ydan_hasi.data.s +++ b/data/overlays/actors/z_bg_ydan_hasi.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel Bg_Ydan_Hasi_InitVars .word 0x00500100, 0x00000030, 0x00360000, 0x0000016C .word BgYdanHasi_Init diff --git a/data/overlays/actors/z_bg_ydan_hasi.reloc.s b/data/overlays/actors/z_bg_ydan_hasi.reloc.s index 35b1edeca1..f3646e086b 100644 --- a/data/overlays/actors/z_bg_ydan_hasi.reloc.s +++ b/data/overlays/actors/z_bg_ydan_hasi.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_808BEC80 -.incbin "baserom/ovl_Bg_Ydan_Hasi", 0x780, 0x000000C0 +.balign 16 + +glabel D_808BEC80 + .incbin "baserom/ovl_Bg_Ydan_Hasi", 0x780, 0x000000C0 diff --git a/data/overlays/actors/z_bg_ydan_maruta.data.s b/data/overlays/actors/z_bg_ydan_maruta.data.s index 51ab4def9c..cd70fd7631 100644 --- a/data/overlays/actors/z_bg_ydan_maruta.data.s +++ b/data/overlays/actors/z_bg_ydan_maruta.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel Bg_Ydan_Maruta_InitVars .word 0x00510600, 0x00000000, 0x00360000, 0x00000244 .word BgYdanMaruta_Init diff --git a/data/overlays/actors/z_bg_ydan_maruta.reloc.s b/data/overlays/actors/z_bg_ydan_maruta.reloc.s index 0325d6a05b..c9b5242c8a 100644 --- a/data/overlays/actors/z_bg_ydan_maruta.reloc.s +++ b/data/overlays/actors/z_bg_ydan_maruta.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_808BF390 -.incbin "baserom/ovl_Bg_Ydan_Maruta", 0x650, 0x00000080 +.balign 16 + +glabel D_808BF390 + .incbin "baserom/ovl_Bg_Ydan_Maruta", 0x650, 0x00000080 diff --git a/data/overlays/actors/z_bg_ydan_sp.data.s b/data/overlays/actors/z_bg_ydan_sp.data.s index 77547fd2ff..80ae658a74 100644 --- a/data/overlays/actors/z_bg_ydan_sp.data.s +++ b/data/overlays/actors/z_bg_ydan_sp.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel Bg_Ydan_Sp_InitVars .word 0x000F0100, 0x00000000, 0x00360000, 0x00000248 .word BgYdanSp_Init diff --git a/data/overlays/actors/z_bg_ydan_sp.reloc.s b/data/overlays/actors/z_bg_ydan_sp.reloc.s index e80bfc8611..adfdd95c4f 100644 --- a/data/overlays/actors/z_bg_ydan_sp.reloc.s +++ b/data/overlays/actors/z_bg_ydan_sp.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_808C0AA0 -.incbin "baserom/ovl_Bg_Ydan_Sp", 0x1690, 0x00000180 +.balign 16 + +glabel D_808C0AA0 + .incbin "baserom/ovl_Bg_Ydan_Sp", 0x1690, 0x00000180 diff --git a/data/overlays/actors/z_boss_dodongo.data.s b/data/overlays/actors/z_boss_dodongo.data.s index b52b39cfe8..85730ae315 100644 --- a/data/overlays/actors/z_boss_dodongo.data.s +++ b/data/overlays/actors/z_boss_dodongo.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel Boss_Dodongo_InitVars .word 0x00120900, 0x00000035, 0x00190000, 0x00001820 .word BossDodongo_Init diff --git a/data/overlays/actors/z_boss_dodongo.reloc.s b/data/overlays/actors/z_boss_dodongo.reloc.s index 1908714f05..1a6ed2c004 100644 --- a/data/overlays/actors/z_boss_dodongo.reloc.s +++ b/data/overlays/actors/z_boss_dodongo.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_808CA7E0 -.incbin "baserom/ovl_Boss_Dodongo", 0x9650, 0x000005E0 +.balign 16 + +glabel D_808CA7E0 + .incbin "baserom/ovl_Boss_Dodongo", 0x9650, 0x000005E0 diff --git a/data/overlays/actors/z_boss_fd.data.s b/data/overlays/actors/z_boss_fd.data.s index 17236e2e1f..e74177bc7b 100644 --- a/data/overlays/actors/z_boss_fd.data.s +++ b/data/overlays/actors/z_boss_fd.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel Boss_Fd_InitVars .word 0x00960900, 0x00000035, 0x009C0000, 0x000043A0 .word BossFd_Init diff --git a/data/overlays/actors/z_boss_fd.reloc.s b/data/overlays/actors/z_boss_fd.reloc.s index 11ed0e2396..7ab439f7da 100644 --- a/data/overlays/actors/z_boss_fd.reloc.s +++ b/data/overlays/actors/z_boss_fd.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_808D1FE0 -.incbin "baserom/ovl_Boss_Fd", 0x7220, 0x00000690 +.balign 16 + +glabel D_808D1FE0 + .incbin "baserom/ovl_Boss_Fd", 0x7220, 0x00000690 diff --git a/data/overlays/actors/z_boss_fd2.data.s b/data/overlays/actors/z_boss_fd2.data.s index 8b3fc83b88..aa1a35ac48 100644 --- a/data/overlays/actors/z_boss_fd2.data.s +++ b/data/overlays/actors/z_boss_fd2.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel Boss_Fd2_InitVars .word 0x00A20900, 0x00000035, 0x00A50000, 0x0000167C .word BossFd2_Init diff --git a/data/overlays/actors/z_boss_fd2.reloc.s b/data/overlays/actors/z_boss_fd2.reloc.s index b17dfd3ab5..c5c217b8e5 100644 --- a/data/overlays/actors/z_boss_fd2.reloc.s +++ b/data/overlays/actors/z_boss_fd2.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_808D64F0 -.incbin "baserom/ovl_Boss_Fd2", 0x3E80, 0x00000380 +.balign 16 + +glabel D_808D64F0 + .incbin "baserom/ovl_Boss_Fd2", 0x3E80, 0x00000380 diff --git a/data/overlays/actors/z_boss_ganon.bss.s b/data/overlays/actors/z_boss_ganon.bss.s index bc8c962489..cbe4b43915 100644 --- a/data/overlays/actors/z_boss_ganon.bss.s +++ b/data/overlays/actors/z_boss_ganon.bss.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers -.bss +.section .bss + +.balign 16 glabel D_808F93C0 .space 0x04 diff --git a/data/overlays/actors/z_boss_ganon.data.s b/data/overlays/actors/z_boss_ganon.data.s index 74890468fd..b3325dcff5 100644 --- a/data/overlays/actors/z_boss_ganon.data.s +++ b/data/overlays/actors/z_boss_ganon.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel Boss_Ganon_InitVars .word 0x00E80900, 0x00000035, 0x00E10000, 0x0000071C .word BossGanon_Init diff --git a/data/overlays/actors/z_boss_ganon.reloc.s b/data/overlays/actors/z_boss_ganon.reloc.s index 0c66a4d9fb..bae4ab4120 100644 --- a/data/overlays/actors/z_boss_ganon.reloc.s +++ b/data/overlays/actors/z_boss_ganon.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_808F8280 -.incbin "baserom/ovl_Boss_Ganon", 0x21A10, 0x00001140 +.balign 16 + +glabel D_808F8280 + .incbin "baserom/ovl_Boss_Ganon", 0x21A10, 0x00001140 diff --git a/data/overlays/actors/z_boss_ganon.rodata.s b/data/overlays/actors/z_boss_ganon.rodata.s index 2a20fda612..1b95d46320 100644 --- a/data/overlays/actors/z_boss_ganon.rodata.s +++ b/data/overlays/actors/z_boss_ganon.rodata.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata +.balign 16 + glabel D_808F7A50 .asciz "../z_boss_ganon.c" .balign 4 diff --git a/data/overlays/actors/z_boss_ganon2.bss.s b/data/overlays/actors/z_boss_ganon2.bss.s index b0abf1b39c..0a9ce07f1f 100644 --- a/data/overlays/actors/z_boss_ganon2.bss.s +++ b/data/overlays/actors/z_boss_ganon2.bss.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers -.bss +.section .bss + +.balign 16 glabel D_8090EB20 .space 0x0C diff --git a/data/overlays/actors/z_boss_ganon2.data.s b/data/overlays/actors/z_boss_ganon2.data.s index 03739b33c5..13abc52602 100644 --- a/data/overlays/actors/z_boss_ganon2.data.s +++ b/data/overlays/actors/z_boss_ganon2.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel Boss_Ganon2_InitVars .word 0x017A0900, 0x00000035, 0x01530000, 0x000008E4 .word BossGanon2_Init diff --git a/data/overlays/actors/z_boss_ganon2.reloc.s b/data/overlays/actors/z_boss_ganon2.reloc.s index 018f422198..12805eff78 100644 --- a/data/overlays/actors/z_boss_ganon2.reloc.s +++ b/data/overlays/actors/z_boss_ganon2.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_8090DDA0 -.incbin "baserom/ovl_Boss_Ganon2", 0x10E60, 0x00000D80 +.balign 16 + +glabel D_8090DDA0 + .incbin "baserom/ovl_Boss_Ganon2", 0x10E60, 0x00000D80 diff --git a/data/overlays/actors/z_boss_ganondrof.data.s b/data/overlays/actors/z_boss_ganondrof.data.s index d5cfa1ebef..a56e5fa5a0 100644 --- a/data/overlays/actors/z_boss_ganondrof.data.s +++ b/data/overlays/actors/z_boss_ganondrof.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel Boss_Ganondrof_InitVars .word 0x00520900, 0x00000035, 0x00370000, 0x00000578 .word BossGanondrof_Init diff --git a/data/overlays/actors/z_boss_ganondrof.reloc.s b/data/overlays/actors/z_boss_ganondrof.reloc.s index eb6d12e744..d7392b3279 100644 --- a/data/overlays/actors/z_boss_ganondrof.reloc.s +++ b/data/overlays/actors/z_boss_ganondrof.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_80915520 -.incbin "baserom/ovl_Boss_Ganondrof", 0x4EE0, 0x000004F0 +.balign 16 + +glabel D_80915520 + .incbin "baserom/ovl_Boss_Ganondrof", 0x4EE0, 0x000004F0 diff --git a/data/overlays/actors/z_boss_ganondrof.rodata.s b/data/overlays/actors/z_boss_ganondrof.rodata.s index d5a4eb9423..e6ef053b78 100644 --- a/data/overlays/actors/z_boss_ganondrof.rodata.s +++ b/data/overlays/actors/z_boss_ganondrof.rodata.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata +.balign 16 + glabel D_80915140 .word 0x4454310A, 0x00000000 glabel D_80915148 diff --git a/data/overlays/actors/z_boss_goma.data.s b/data/overlays/actors/z_boss_goma.data.s index 42b3c6f2e2..63d777bb5b 100644 --- a/data/overlays/actors/z_boss_goma.data.s +++ b/data/overlays/actors/z_boss_goma.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel Boss_Goma_InitVars .word 0x00280900, 0x00000035, 0x001C0000, 0x00000B1C .word BossGoma_Init diff --git a/data/overlays/actors/z_boss_goma.reloc.s b/data/overlays/actors/z_boss_goma.reloc.s index 65b3809b96..abfee11161 100644 --- a/data/overlays/actors/z_boss_goma.reloc.s +++ b/data/overlays/actors/z_boss_goma.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_8091B610 -.incbin "baserom/ovl_Boss_Goma", 0x5C00, 0x000004F0 +.balign 16 + +glabel D_8091B610 + .incbin "baserom/ovl_Boss_Goma", 0x5C00, 0x000004F0 diff --git a/data/overlays/actors/z_boss_mo.bss.s b/data/overlays/actors/z_boss_mo.bss.s index 2807150b99..bde08c4d47 100644 --- a/data/overlays/actors/z_boss_mo.bss.s +++ b/data/overlays/actors/z_boss_mo.bss.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers -.bss +.section .bss + +.balign 16 glabel D_80927AC0 .space 0x4B00 diff --git a/data/overlays/actors/z_boss_mo.data.s b/data/overlays/actors/z_boss_mo.data.s index 4a412b70ab..12458b0377 100644 --- a/data/overlays/actors/z_boss_mo.data.s +++ b/data/overlays/actors/z_boss_mo.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel Boss_Mo_InitVars .word 0x00C40900, 0x00000035, 0x00B40000, 0x0000158C .word BossMo_Init diff --git a/data/overlays/actors/z_boss_mo.reloc.s b/data/overlays/actors/z_boss_mo.reloc.s index 00ab26840d..8dca733f49 100644 --- a/data/overlays/actors/z_boss_mo.reloc.s +++ b/data/overlays/actors/z_boss_mo.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_80926EC0 -.incbin "baserom/ovl_Boss_Mo", 0xB3C0, 0x00000C00 +.balign 16 + +glabel D_80926EC0 + .incbin "baserom/ovl_Boss_Mo", 0xB3C0, 0x00000C00 diff --git a/data/overlays/actors/z_boss_sst.bss.s b/data/overlays/actors/z_boss_sst.bss.s index 901cc0c3fe..3af3071322 100644 --- a/data/overlays/actors/z_boss_sst.bss.s +++ b/data/overlays/actors/z_boss_sst.bss.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers -.bss +.section .bss + +.balign 16 glabel D_80938C90 .space 0x08 diff --git a/data/overlays/actors/z_boss_sst.data.s b/data/overlays/actors/z_boss_sst.data.s index a31deb2583..b1e821ae71 100644 --- a/data/overlays/actors/z_boss_sst.data.s +++ b/data/overlays/actors/z_boss_sst.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel D_80936990 .word 0xE7000000, 0x00000000, 0xFC71FE04, 0x5FFEFDF8, 0xDF000000, 0x00000000 glabel D_809369A8 diff --git a/data/overlays/actors/z_boss_sst.reloc.s b/data/overlays/actors/z_boss_sst.reloc.s index 94ce489127..c6df37dbdd 100644 --- a/data/overlays/actors/z_boss_sst.reloc.s +++ b/data/overlays/actors/z_boss_sst.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_80937A80 -.incbin "baserom/ovl_Boss_Sst", 0xB4B0, 0x00001210 +.balign 16 + +glabel D_80937A80 + .incbin "baserom/ovl_Boss_Sst", 0xB4B0, 0x00001210 diff --git a/data/overlays/actors/z_boss_tw.bss.s b/data/overlays/actors/z_boss_tw.bss.s index 76eaec779a..d73aba0d07 100644 --- a/data/overlays/actors/z_boss_tw.bss.s +++ b/data/overlays/actors/z_boss_tw.bss.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers -.bss +.section .bss + +.balign 16 glabel D_8094C840 .space 0x01 diff --git a/data/overlays/actors/z_boss_tw.data.s b/data/overlays/actors/z_boss_tw.data.s index 2f20365126..b5dfc3298a 100644 --- a/data/overlays/actors/z_boss_tw.data.s +++ b/data/overlays/actors/z_boss_tw.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel Boss_Tw_InitVars .word 0x00DC0900, 0x00000035, 0x00D30000, 0x000006B4 .word BossTw_Init diff --git a/data/overlays/actors/z_boss_tw.reloc.s b/data/overlays/actors/z_boss_tw.reloc.s index 2cd37b91cd..0fba020f20 100644 --- a/data/overlays/actors/z_boss_tw.reloc.s +++ b/data/overlays/actors/z_boss_tw.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_8094B230 -.incbin "baserom/ovl_Boss_Tw", 0x12560, 0x00001610 +.balign 16 + +glabel D_8094B230 + .incbin "baserom/ovl_Boss_Tw", 0x12560, 0x00001610 diff --git a/data/overlays/actors/z_boss_va.bss.s b/data/overlays/actors/z_boss_va.bss.s index 6bcf6ba003..6db838fc17 100644 --- a/data/overlays/actors/z_boss_va.bss.s +++ b/data/overlays/actors/z_boss_va.bss.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers -.bss +.section .bss + +.balign 16 glabel D_8095DF50 .space 0x8980 diff --git a/data/overlays/actors/z_boss_va.data.s b/data/overlays/actors/z_boss_va.data.s index 7f477d4d7a..f4e18eeeca 100644 --- a/data/overlays/actors/z_boss_va.data.s +++ b/data/overlays/actors/z_boss_va.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel Boss_Va_InitVars .word 0x00BA0900, 0x00000035, 0x008C0000, 0x000003B8 .word BossVa_Init diff --git a/data/overlays/actors/z_boss_va.reloc.s b/data/overlays/actors/z_boss_va.reloc.s index 188bf2f70c..8575381213 100644 --- a/data/overlays/actors/z_boss_va.reloc.s +++ b/data/overlays/actors/z_boss_va.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_8095C960 -.incbin "baserom/ovl_Boss_Va", 0xD6A0, 0x000015F0 +.balign 16 + +glabel D_8095C960 + .incbin "baserom/ovl_Boss_Va", 0xD6A0, 0x000015F0 diff --git a/data/overlays/actors/z_demo_6k.data.s b/data/overlays/actors/z_demo_6k.data.s index 8259b8a3c8..8a6a0692a5 100644 --- a/data/overlays/actors/z_demo_6k.data.s +++ b/data/overlays/actors/z_demo_6k.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel Demo_6K_InitVars .word 0x00F50600, 0x00000010, 0x00010000, 0x00000294 .word Demo6K_Init diff --git a/data/overlays/actors/z_demo_6k.reloc.s b/data/overlays/actors/z_demo_6k.reloc.s index 03daa41537..1d1ef220cb 100644 --- a/data/overlays/actors/z_demo_6k.reloc.s +++ b/data/overlays/actors/z_demo_6k.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_80969660 -.incbin "baserom/ovl_Demo_6K", 0x2D10, 0x00000470 +.balign 16 + +glabel D_80969660 + .incbin "baserom/ovl_Demo_6K", 0x2D10, 0x00000470 diff --git a/data/overlays/actors/z_demo_du.data.s b/data/overlays/actors/z_demo_du.data.s index 842926ebff..9eebb10b50 100644 --- a/data/overlays/actors/z_demo_du.data.s +++ b/data/overlays/actors/z_demo_du.data.s @@ -3,7 +3,7 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data diff --git a/data/overlays/actors/z_demo_du.reloc.s b/data/overlays/actors/z_demo_du.reloc.s index 57d90bbc1e..440dabdcba 100644 --- a/data/overlays/actors/z_demo_du.reloc.s +++ b/data/overlays/actors/z_demo_du.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_8096D0F0 -.incbin "baserom/ovl_Demo_Du", 0x3620, 0x000003C0 +.balign 16 + +glabel D_8096D0F0 + .incbin "baserom/ovl_Demo_Du", 0x3620, 0x000003C0 diff --git a/data/overlays/actors/z_demo_ec.data.s b/data/overlays/actors/z_demo_ec.data.s index e7c5e25bcc..2c0b7ef27f 100644 --- a/data/overlays/actors/z_demo_ec.data.s +++ b/data/overlays/actors/z_demo_ec.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel D_80970350 .word 0x00C00088, 0x013300FC, 0x00FD010C, 0x01070115, 0x010D0121, 0x01220122, 0x01220122, 0x00FC00FD, 0x01160116, 0x011600FE, 0x00FF00FB, 0x00130013, 0x00130110, 0x0159013E, 0x015B0165, 0x00C900C9, 0x00C900C9, 0x00D00000 glabel D_80970398 diff --git a/data/overlays/actors/z_demo_ec.reloc.s b/data/overlays/actors/z_demo_ec.reloc.s index 148477c68a..70d0c8bdb4 100644 --- a/data/overlays/actors/z_demo_ec.reloc.s +++ b/data/overlays/actors/z_demo_ec.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_80970810 -.incbin "baserom/ovl_Demo_Ec", 0x3360, 0x00000740 +.balign 16 + +glabel D_80970810 + .incbin "baserom/ovl_Demo_Ec", 0x3360, 0x00000740 diff --git a/data/overlays/actors/z_demo_effect.data.s b/data/overlays/actors/z_demo_effect.data.s index 87d13be5c3..a9a8b02c09 100644 --- a/data/overlays/actors/z_demo_effect.data.s +++ b/data/overlays/actors/z_demo_effect.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel Demo_Effect_InitVars .word 0x008B0100, 0x00000030, 0x00010000, 0x000001A0 .word DemoEffect_Init diff --git a/data/overlays/actors/z_demo_effect.reloc.s b/data/overlays/actors/z_demo_effect.reloc.s index e77d42d171..6efd357cea 100644 --- a/data/overlays/actors/z_demo_effect.reloc.s +++ b/data/overlays/actors/z_demo_effect.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_80976D90 -.incbin "baserom/ovl_Demo_Effect", 0x5E40, 0x00000600 +.balign 16 + +glabel D_80976D90 + .incbin "baserom/ovl_Demo_Effect", 0x5E40, 0x00000600 diff --git a/data/overlays/actors/z_demo_ext.data.s b/data/overlays/actors/z_demo_ext.data.s index 34a2841899..714827ad8f 100644 --- a/data/overlays/actors/z_demo_ext.data.s +++ b/data/overlays/actors/z_demo_ext.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel D_80977C70 .word func_80977854 .word func_80977874 diff --git a/data/overlays/actors/z_demo_ext.reloc.s b/data/overlays/actors/z_demo_ext.reloc.s index 9d003f2a7c..b847d7b18a 100644 --- a/data/overlays/actors/z_demo_ext.reloc.s +++ b/data/overlays/actors/z_demo_ext.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_80977D90 -.incbin "baserom/ovl_Demo_Ext", 0xA00, 0x000000B0 +.balign 16 + +glabel D_80977D90 + .incbin "baserom/ovl_Demo_Ext", 0xA00, 0x000000B0 diff --git a/data/overlays/actors/z_demo_gj.data.s b/data/overlays/actors/z_demo_gj.data.s index ad72bacf13..141edc3b3a 100644 --- a/data/overlays/actors/z_demo_gj.data.s +++ b/data/overlays/actors/z_demo_gj.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel D_8097BDE0 .word 0x00000900, 0x01000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000000, 0x00010000, 0x001E0064, 0x00000000, 0x00000000 glabel D_8097BE0C diff --git a/data/overlays/actors/z_demo_gj.reloc.s b/data/overlays/actors/z_demo_gj.reloc.s index 3781771f1e..3bccf1ff71 100644 --- a/data/overlays/actors/z_demo_gj.reloc.s +++ b/data/overlays/actors/z_demo_gj.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_8097C280 -.incbin "baserom/ovl_Demo_Gj", 0x3950, 0x000005F0 +.balign 16 + +glabel D_8097C280 + .incbin "baserom/ovl_Demo_Gj", 0x3950, 0x000005F0 diff --git a/data/overlays/actors/z_demo_go.reloc.s b/data/overlays/actors/z_demo_go.reloc.s index 4c2be35d18..af767502ad 100644 --- a/data/overlays/actors/z_demo_go.reloc.s +++ b/data/overlays/actors/z_demo_go.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_8097D540 -.incbin "baserom/ovl_Demo_Go", 0xCD0, 0x00000130 +.balign 16 + +glabel D_8097D540 + .incbin "baserom/ovl_Demo_Go", 0xCD0, 0x00000130 diff --git a/data/overlays/actors/z_demo_gt.data.s b/data/overlays/actors/z_demo_gt.data.s index 53cfcc0beb..af4398591e 100644 --- a/data/overlays/actors/z_demo_gt.data.s +++ b/data/overlays/actors/z_demo_gt.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel D_809825C0 .word 0x64506400 glabel D_809825C4 diff --git a/data/overlays/actors/z_demo_gt.reloc.s b/data/overlays/actors/z_demo_gt.reloc.s index 6a1d01aac6..60ff4f68b1 100644 --- a/data/overlays/actors/z_demo_gt.reloc.s +++ b/data/overlays/actors/z_demo_gt.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_80982BC0 -.incbin "baserom/ovl_Demo_Gt", 0x5550, 0x00000740 +.balign 16 + +glabel D_80982BC0 + .incbin "baserom/ovl_Demo_Gt", 0x5550, 0x00000740 diff --git a/data/overlays/actors/z_demo_ik.data.s b/data/overlays/actors/z_demo_ik.data.s index 0a757585cf..d8f7b880ba 100644 --- a/data/overlays/actors/z_demo_ik.data.s +++ b/data/overlays/actors/z_demo_ik.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel D_809846D0 .word 0x00000000, 0x00000000, 0x00000000 glabel D_809846DC diff --git a/data/overlays/actors/z_demo_ik.reloc.s b/data/overlays/actors/z_demo_ik.reloc.s index 992b308940..9e837f7086 100644 --- a/data/overlays/actors/z_demo_ik.reloc.s +++ b/data/overlays/actors/z_demo_ik.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_80984A00 -.incbin "baserom/ovl_Demo_Ik", 0x1700, 0x000001E0 +.balign 16 + +glabel D_80984A00 + .incbin "baserom/ovl_Demo_Ik", 0x1700, 0x000001E0 diff --git a/data/overlays/actors/z_demo_im.data.s b/data/overlays/actors/z_demo_im.data.s index 9107b2b413..14a5ec92fd 100644 --- a/data/overlays/actors/z_demo_im.data.s +++ b/data/overlays/actors/z_demo_im.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel D_80987830 .word 0x06007210, 0x06007D50, 0x06008150 glabel D_8098783C diff --git a/data/overlays/actors/z_demo_im.reloc.s b/data/overlays/actors/z_demo_im.reloc.s index 35235b6372..d9930249dc 100644 --- a/data/overlays/actors/z_demo_im.reloc.s +++ b/data/overlays/actors/z_demo_im.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_80988A20 -.incbin "baserom/ovl_Demo_Im", 0x3E40, 0x00000460 +.balign 16 + +glabel D_80988A20 + .incbin "baserom/ovl_Demo_Im", 0x3E40, 0x00000460 diff --git a/data/overlays/actors/z_demo_kankyo.bss.s b/data/overlays/actors/z_demo_kankyo.bss.s index 16fe23c629..b7dbe6bf46 100644 --- a/data/overlays/actors/z_demo_kankyo.bss.s +++ b/data/overlays/actors/z_demo_kankyo.bss.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers -.bss +.section .bss + +.balign 16 glabel D_8098CF80 .space 0x02 diff --git a/data/overlays/actors/z_demo_kankyo.data.s b/data/overlays/actors/z_demo_kankyo.data.s index d38598d442..69c5e43c9e 100644 --- a/data/overlays/actors/z_demo_kankyo.data.s +++ b/data/overlays/actors/z_demo_kankyo.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel D_8098B910 .word 0x00000002, 0x000000A4, 0x00000005, 0x00010000, 0x00870000, 0x00000000, 0x42714CA7, 0x001F004F, 0x003B010F, 0x00000000, 0x42714CA7, 0x001F004E, 0x003C0120, 0x00000000, 0x42714CA7, 0x0020004E, 0x003C0131, 0x00000000, 0x42714CA7, 0x001E004F, 0x003B01F4, 0x00000000, 0x42714CA7, 0x001E004E, 0x003C01F6, 0x00000000, 0x42714CA7, 0x001E004E, 0x003C0207, 0xFF000000, 0x42714CA7, 0x001E004E, 0x003C0000, 0x00000006, 0x00010000, 0x00A40000, 0x0000001E, 0x42714CA7, 0x000B0032, 0x0017010F, 0x0000001E, 0x42714CA7, 0x000B0030, 0x00160120, 0x00000007, 0x42714CA7, 0x000B0030, 0x00160131, 0x00000007, 0x42714CA7, 0x00390065, 0x001501F4, 0x0000001E, 0x42714CA7, 0x00390065, 0x001501F6, 0x0000001E, 0x42714CA7, 0x00390065, 0x00150207, 0xFF00001E, 0x42714CA7, 0x00390065, 0x00150000, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000 glabel D_8098BA20 diff --git a/data/overlays/actors/z_demo_kankyo.reloc.s b/data/overlays/actors/z_demo_kankyo.reloc.s index 6a3e269f9a..427c0db769 100644 --- a/data/overlays/actors/z_demo_kankyo.reloc.s +++ b/data/overlays/actors/z_demo_kankyo.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_8098CB60 -.incbin "baserom/ovl_Demo_Kankyo", 0x3CE0, 0x00000420 +.balign 16 + +glabel D_8098CB60 + .incbin "baserom/ovl_Demo_Kankyo", 0x3CE0, 0x00000420 diff --git a/data/overlays/actors/z_demo_kekkai.data.s b/data/overlays/actors/z_demo_kekkai.data.s index 01c6e7ffb4..839a12e89a 100644 --- a/data/overlays/actors/z_demo_kekkai.data.s +++ b/data/overlays/actors/z_demo_kekkai.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel Demo_Kekkai_InitVars .word 0x01A70700, 0x00000030, 0x01790000, 0x000001FC .word DemoKekkai_Init diff --git a/data/overlays/actors/z_demo_kekkai.reloc.s b/data/overlays/actors/z_demo_kekkai.reloc.s index faf76a2bb5..cd21de6284 100644 --- a/data/overlays/actors/z_demo_kekkai.reloc.s +++ b/data/overlays/actors/z_demo_kekkai.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_8098E2D0 -.incbin "baserom/ovl_Demo_Kekkai", 0x1300, 0x00000190 +.balign 16 + +glabel D_8098E2D0 + .incbin "baserom/ovl_Demo_Kekkai", 0x1300, 0x00000190 diff --git a/data/overlays/actors/z_demo_sa.data.s b/data/overlays/actors/z_demo_sa.data.s index 88f40fa68d..fabbaba005 100644 --- a/data/overlays/actors/z_demo_sa.data.s +++ b/data/overlays/actors/z_demo_sa.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel D_809900E0 .word 0x06002F48, 0x06003C48, 0x06003848, 0x06004848, 0x06004E48 glabel D_809900F4 diff --git a/data/overlays/actors/z_demo_sa.reloc.s b/data/overlays/actors/z_demo_sa.reloc.s index 50990013b6..91224b1087 100644 --- a/data/overlays/actors/z_demo_sa.reloc.s +++ b/data/overlays/actors/z_demo_sa.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_80990F40 -.incbin "baserom/ovl_Demo_Sa", 0x2AE0, 0x000002F0 +.balign 16 + +glabel D_80990F40 + .incbin "baserom/ovl_Demo_Sa", 0x2AE0, 0x000002F0 diff --git a/data/overlays/actors/z_demo_shd.data.s b/data/overlays/actors/z_demo_shd.data.s index 4297c693b7..b21e93bbe2 100644 --- a/data/overlays/actors/z_demo_shd.data.s +++ b/data/overlays/actors/z_demo_shd.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel Demo_Shd_InitVars .word 0x01190700, 0x00000030, 0x00010000, 0x00000154 .word DemoShd_Init diff --git a/data/overlays/actors/z_demo_shd.reloc.s b/data/overlays/actors/z_demo_shd.reloc.s index 7c4472aa1d..f437d3ef9f 100644 --- a/data/overlays/actors/z_demo_shd.reloc.s +++ b/data/overlays/actors/z_demo_shd.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_80993630 -.incbin "baserom/ovl_Demo_Shd", 0x2400, 0x00000090 +.balign 16 + +glabel D_80993630 + .incbin "baserom/ovl_Demo_Shd", 0x2400, 0x00000090 diff --git a/data/overlays/actors/z_demo_tre_lgt.data.s b/data/overlays/actors/z_demo_tre_lgt.data.s index 3a15186b8b..c9ab54a6ed 100644 --- a/data/overlays/actors/z_demo_tre_lgt.data.s +++ b/data/overlays/actors/z_demo_tre_lgt.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel D_80993D70 .word 0x3F800000, 0x43080000, 0x433E0000, 0x42200000, 0x3F800000, 0x43080000, 0x435C0000, 0x42480000 glabel Demo_Tre_Lgt_InitVars diff --git a/data/overlays/actors/z_demo_tre_lgt.reloc.s b/data/overlays/actors/z_demo_tre_lgt.reloc.s index 1c77c4f707..a8b729040b 100644 --- a/data/overlays/actors/z_demo_tre_lgt.reloc.s +++ b/data/overlays/actors/z_demo_tre_lgt.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_80993E60 -.incbin "baserom/ovl_Demo_Tre_Lgt", 0x7A0, 0x00000090 +.balign 16 + +glabel D_80993E60 + .incbin "baserom/ovl_Demo_Tre_Lgt", 0x7A0, 0x00000090 diff --git a/data/overlays/actors/z_demo_tre_lgt.rodata.s b/data/overlays/actors/z_demo_tre_lgt.rodata.s index 56caae7203..c0bea1eecf 100644 --- a/data/overlays/actors/z_demo_tre_lgt.rodata.s +++ b/data/overlays/actors/z_demo_tre_lgt.rodata.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata +.balign 16 + glabel D_80993DC0 .word 0x44656D6F, 0x5F547265, 0x5F4C6774, 0x5F416374, 0x6F725F63, 0x7428293B, 0xA5B3A5F3, 0xA5B9A5C8, 0xA5E9A5AF, 0xA5C8BCBA, 0xC7D40A00, 0x31000000, 0x2E2E2F7A, 0x5F64656D, 0x6F5F7472, 0x655F6C67, 0x742E6300 glabel D_80993E04 diff --git a/data/overlays/actors/z_door_gerudo.data.s b/data/overlays/actors/z_door_gerudo.data.s index 4939178c13..3eafdc1938 100644 --- a/data/overlays/actors/z_door_gerudo.data.s +++ b/data/overlays/actors/z_door_gerudo.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel Door_Gerudo_InitVars .word 0x01720700, 0x00000000, 0x014B0000, 0x0000016C .word DoorGerudo_Init diff --git a/data/overlays/actors/z_door_gerudo.reloc.s b/data/overlays/actors/z_door_gerudo.reloc.s index ac496ed55e..5da0d28b41 100644 --- a/data/overlays/actors/z_door_gerudo.reloc.s +++ b/data/overlays/actors/z_door_gerudo.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_80994BD0 -.incbin "baserom/ovl_Door_Gerudo", 0x5F0, 0x00000080 +.balign 16 + +glabel D_80994BD0 + .incbin "baserom/ovl_Door_Gerudo", 0x5F0, 0x00000080 diff --git a/data/overlays/actors/z_door_killer.data.s b/data/overlays/actors/z_door_killer.data.s index c393bdf373..35e4ce8d5d 100644 --- a/data/overlays/actors/z_door_killer.data.s +++ b/data/overlays/actors/z_door_killer.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel Door_Killer_InitVars .word 0x01C10100, 0x00000010, 0x018E0000, 0x00000284 .word DoorKiller_Init diff --git a/data/overlays/actors/z_door_killer.reloc.s b/data/overlays/actors/z_door_killer.reloc.s index 9fbad487bb..59e6c6eebc 100644 --- a/data/overlays/actors/z_door_killer.reloc.s +++ b/data/overlays/actors/z_door_killer.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_80996100 -.incbin "baserom/ovl_Door_Killer", 0x14B0, 0x000001A0 +.balign 16 + +glabel D_80996100 + .incbin "baserom/ovl_Door_Killer", 0x14B0, 0x000001A0 diff --git a/data/overlays/actors/z_door_shutter.data.s b/data/overlays/actors/z_door_shutter.data.s index 8f0e0e9b85..322aa459ec 100644 --- a/data/overlays/actors/z_door_shutter.data.s +++ b/data/overlays/actors/z_door_shutter.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel Door_Shutter_InitVars .word 0x002E0A00, 0x00000010, 0x00010000, 0x00000178 .word DoorShutter_Init diff --git a/data/overlays/actors/z_door_shutter.reloc.s b/data/overlays/actors/z_door_shutter.reloc.s index 216d22816b..438c9faca1 100644 --- a/data/overlays/actors/z_door_shutter.reloc.s +++ b/data/overlays/actors/z_door_shutter.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_809983C0 -.incbin "baserom/ovl_Door_Shutter", 0x2120, 0x00000260 +.balign 16 + +glabel D_809983C0 + .incbin "baserom/ovl_Door_Shutter", 0x2120, 0x00000260 diff --git a/data/overlays/actors/z_door_warp1.bss.s b/data/overlays/actors/z_door_warp1.bss.s index 39b6433f7b..572aa3cfd3 100644 --- a/data/overlays/actors/z_door_warp1.bss.s +++ b/data/overlays/actors/z_door_warp1.bss.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers -.bss +.section .bss + +.balign 16 glabel D_8099CCA0 .space 0x02 diff --git a/data/overlays/actors/z_door_warp1.data.s b/data/overlays/actors/z_door_warp1.data.s index 3b766acf12..178d80ab67 100644 --- a/data/overlays/actors/z_door_warp1.data.s +++ b/data/overlays/actors/z_door_warp1.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel Door_Warp1_InitVars .word 0x005D0700, 0x00000000, 0x00480000, 0x000001F0 .word DoorWarp1_Init diff --git a/data/overlays/actors/z_door_warp1.reloc.s b/data/overlays/actors/z_door_warp1.reloc.s index bc081eac06..0b39239d2e 100644 --- a/data/overlays/actors/z_door_warp1.reloc.s +++ b/data/overlays/actors/z_door_warp1.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_8099C830 -.incbin "baserom/ovl_Door_Warp1", 0x40B0, 0x00000470 +.balign 16 + +glabel D_8099C830 + .incbin "baserom/ovl_Door_Warp1", 0x40B0, 0x00000470 diff --git a/data/overlays/actors/z_door_warp1.rodata.s b/data/overlays/actors/z_door_warp1.rodata.s index c7ed8694cd..9aea47700e 100644 --- a/data/overlays/actors/z_door_warp1.rodata.s +++ b/data/overlays/actors/z_door_warp1.rodata.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata +.balign 16 + glabel D_8099C5B0 .asciz "\nBOSSWARP arg_data=[%d]" .balign 4 diff --git a/data/overlays/actors/z_efc_erupc.data.s b/data/overlays/actors/z_efc_erupc.data.s index c12ae420e7..22b0a721af 100644 --- a/data/overlays/actors/z_efc_erupc.data.s +++ b/data/overlays/actors/z_efc_erupc.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel Efc_Erupc_InitVars .word 0x01760700, 0x00000030, 0x014D0000, 0x000018CC .word EfcErupc_Init diff --git a/data/overlays/actors/z_efc_erupc.reloc.s b/data/overlays/actors/z_efc_erupc.reloc.s index 93f41c7a0d..cb53721f2a 100644 --- a/data/overlays/actors/z_efc_erupc.reloc.s +++ b/data/overlays/actors/z_efc_erupc.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_8099D830 -.incbin "baserom/ovl_Efc_Erupc", 0xB80, 0x000000A0 +.balign 16 + +glabel D_8099D830 + .incbin "baserom/ovl_Efc_Erupc", 0xB80, 0x000000A0 diff --git a/data/overlays/actors/z_eff_dust.data.s b/data/overlays/actors/z_eff_dust.data.s index e1b0de6ec3..6cbb55f5b0 100644 --- a/data/overlays/actors/z_eff_dust.data.s +++ b/data/overlays/actors/z_eff_dust.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel Eff_Dust_InitVars .word 0x01010400, 0x00000030, 0x00010000, 0x00000568 .word EffDust_Init diff --git a/data/overlays/actors/z_eff_dust.reloc.s b/data/overlays/actors/z_eff_dust.reloc.s index 5608445769..c6bbe39464 100644 --- a/data/overlays/actors/z_eff_dust.reloc.s +++ b/data/overlays/actors/z_eff_dust.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_8099EC30 -.incbin "baserom/ovl_Eff_Dust", 0x1360, 0x00000180 +.balign 16 + +glabel D_8099EC30 + .incbin "baserom/ovl_Eff_Dust", 0x1360, 0x00000180 diff --git a/data/overlays/actors/z_elf_msg.data.s b/data/overlays/actors/z_elf_msg.data.s index 18525a0cac..bf6847350c 100644 --- a/data/overlays/actors/z_elf_msg.data.s +++ b/data/overlays/actors/z_elf_msg.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel Elf_Msg_InitVars .word 0x011B0700, 0x00000010, 0x00010000, 0x00000150 .word ElfMsg_Init diff --git a/data/overlays/actors/z_elf_msg.reloc.s b/data/overlays/actors/z_elf_msg.reloc.s index 0d3e9adcb2..24472ce289 100644 --- a/data/overlays/actors/z_elf_msg.reloc.s +++ b/data/overlays/actors/z_elf_msg.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_809AD600 -.incbin "baserom/ovl_Elf_Msg", 0xAE0, 0x00000100 +.balign 16 + +glabel D_809AD600 + .incbin "baserom/ovl_Elf_Msg", 0xAE0, 0x00000100 diff --git a/data/overlays/actors/z_elf_msg2.data.s b/data/overlays/actors/z_elf_msg2.data.s index 92c8a3e4e9..839ab0fa57 100644 --- a/data/overlays/actors/z_elf_msg2.data.s +++ b/data/overlays/actors/z_elf_msg2.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel Elf_Msg2_InitVars .word 0x01730100, 0x00000010, 0x00010000, 0x00000150 .word ElfMsg2_Init diff --git a/data/overlays/actors/z_elf_msg2.reloc.s b/data/overlays/actors/z_elf_msg2.reloc.s index 75bfd4a71a..38abf7accd 100644 --- a/data/overlays/actors/z_elf_msg2.reloc.s +++ b/data/overlays/actors/z_elf_msg2.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_809ADE20 -.incbin "baserom/ovl_Elf_Msg2", 0x720, 0x00000100 +.balign 16 + +glabel D_809ADE20 + .incbin "baserom/ovl_Elf_Msg2", 0x720, 0x00000100 diff --git a/data/overlays/actors/z_en_am.data.s b/data/overlays/actors/z_en_am.data.s index 70ef869c46..ceeeae6894 100644 --- a/data/overlays/actors/z_en_am.data.s +++ b/data/overlays/actors/z_en_am.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel En_Am_InitVars .word 0x00540500, 0x04000015, 0x00380000, 0x0000038C .word EnAm_Init diff --git a/data/overlays/actors/z_en_am.reloc.s b/data/overlays/actors/z_en_am.reloc.s index 5adedfbcf7..bf1061d504 100644 --- a/data/overlays/actors/z_en_am.reloc.s +++ b/data/overlays/actors/z_en_am.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_809B0190 -.incbin "baserom/ovl_En_Am", 0x2270, 0x000001E0 +.balign 16 + +glabel D_809B0190 + .incbin "baserom/ovl_En_Am", 0x2270, 0x000001E0 diff --git a/data/overlays/actors/z_en_anubice.data.s b/data/overlays/actors/z_en_anubice.data.s index 12cc04a7dd..927031dfaa 100644 --- a/data/overlays/actors/z_en_anubice.data.s +++ b/data/overlays/actors/z_en_anubice.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel En_Anubice_InitVars .word 0x00E00500, 0x00000015, 0x00D60000, 0x00000314 .word EnAnubice_Init diff --git a/data/overlays/actors/z_en_anubice.reloc.s b/data/overlays/actors/z_en_anubice.reloc.s index 239e9ccc59..564d65701e 100644 --- a/data/overlays/actors/z_en_anubice.reloc.s +++ b/data/overlays/actors/z_en_anubice.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_809B2440 -.incbin "baserom/ovl_En_Anubice", 0x1320, 0x00000160 +.balign 16 + +glabel D_809B2440 + .incbin "baserom/ovl_En_Anubice", 0x1320, 0x00000160 diff --git a/data/overlays/actors/z_en_anubice_fire.data.s b/data/overlays/actors/z_en_anubice_fire.data.s index 459efcb152..7f462903bc 100644 --- a/data/overlays/actors/z_en_anubice_fire.data.s +++ b/data/overlays/actors/z_en_anubice_fire.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel En_Anubice_Fire_InitVars .word 0x00E10500, 0x00000010, 0x00D60000, 0x000001F4 .word EnAnubiceFire_Init diff --git a/data/overlays/actors/z_en_anubice_fire.reloc.s b/data/overlays/actors/z_en_anubice_fire.reloc.s index 8381942352..6b730bf176 100644 --- a/data/overlays/actors/z_en_anubice_fire.reloc.s +++ b/data/overlays/actors/z_en_anubice_fire.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_809B3300 -.incbin "baserom/ovl_En_Anubice_Fire", 0xD60, 0x00000100 +.balign 16 + +glabel D_809B3300 + .incbin "baserom/ovl_En_Anubice_Fire", 0xD60, 0x00000100 diff --git a/data/overlays/actors/z_en_arrow.data.s b/data/overlays/actors/z_en_arrow.data.s index 15c3b98412..ae7e3bc392 100644 --- a/data/overlays/actors/z_en_arrow.data.s +++ b/data/overlays/actors/z_en_arrow.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel En_Arrow_InitVars .word 0x00160700, 0x00000030, 0x00010000, 0x00000260 .word EnArrow_Init diff --git a/data/overlays/actors/z_en_arrow.reloc.s b/data/overlays/actors/z_en_arrow.reloc.s index 5681266c23..9b038aa743 100644 --- a/data/overlays/actors/z_en_arrow.reloc.s +++ b/data/overlays/actors/z_en_arrow.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_809B4F70 -.incbin "baserom/ovl_En_Arrow", 0x1650, 0x00000190 +.balign 16 + +glabel D_809B4F70 + .incbin "baserom/ovl_En_Arrow", 0x1650, 0x00000190 diff --git a/data/overlays/actors/z_en_attack_niw.data.s b/data/overlays/actors/z_en_attack_niw.data.s index f060e9a9c0..afb399c2bc 100644 --- a/data/overlays/actors/z_en_attack_niw.data.s +++ b/data/overlays/actors/z_en_attack_niw.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel En_Attack_Niw_InitVars .word 0x01440500, 0x00000010, 0x00130000, 0x000002E8 .word EnAttackNiw_Init diff --git a/data/overlays/actors/z_en_attack_niw.reloc.s b/data/overlays/actors/z_en_attack_niw.reloc.s index b69a60e50a..b66f34bc91 100644 --- a/data/overlays/actors/z_en_attack_niw.reloc.s +++ b/data/overlays/actors/z_en_attack_niw.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_809B6200 -.incbin "baserom/ovl_En_Attack_Niw", 0x1100, 0x00000150 +.balign 16 + +glabel D_809B6200 + .incbin "baserom/ovl_En_Attack_Niw", 0x1100, 0x00000150 diff --git a/data/overlays/actors/z_en_ba.data.s b/data/overlays/actors/z_en_ba.data.s index 87142be41f..3a528c4afc 100644 --- a/data/overlays/actors/z_en_ba.data.s +++ b/data/overlays/actors/z_en_ba.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel En_Ba_InitVars .word 0x00DE0500, 0x00000015, 0x00D50000, 0x000003C0 .word EnBa_Init diff --git a/data/overlays/actors/z_en_ba.reloc.s b/data/overlays/actors/z_en_ba.reloc.s index d1ded33db6..0a92e1a4e1 100644 --- a/data/overlays/actors/z_en_ba.reloc.s +++ b/data/overlays/actors/z_en_ba.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_809B8190 -.incbin "baserom/ovl_En_Ba", 0x1E40, 0x00000150 +.balign 16 + +glabel D_809B8190 + .incbin "baserom/ovl_En_Ba", 0x1E40, 0x00000150 diff --git a/data/overlays/actors/z_en_bb.data.s b/data/overlays/actors/z_en_bb.data.s index 73812e7c4d..ffc55785ce 100644 --- a/data/overlays/actors/z_en_bb.data.s +++ b/data/overlays/actors/z_en_bb.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel D_809BBA80 .word 0xF00201A2, 0xF0E2A2F0, 0x010204E2, 0xC4B40000, 0x00609383, 0xA0A00104, 0x02020804, 0x6000A400 glabel D_809BBAA0 diff --git a/data/overlays/actors/z_en_bb.reloc.s b/data/overlays/actors/z_en_bb.reloc.s index 8d578658c0..4867002ac9 100644 --- a/data/overlays/actors/z_en_bb.reloc.s +++ b/data/overlays/actors/z_en_bb.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_809BBD10 -.incbin "baserom/ovl_En_Bb", 0x3A30, 0x00000320 +.balign 16 + +glabel D_809BBD10 + .incbin "baserom/ovl_En_Bb", 0x3A30, 0x00000320 diff --git a/data/overlays/actors/z_en_bdfire.data.s b/data/overlays/actors/z_en_bdfire.data.s index 54ec471de1..6f7e52fb60 100644 --- a/data/overlays/actors/z_en_bdfire.data.s +++ b/data/overlays/actors/z_en_bdfire.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel En_Bdfire_InitVars .word 0x00000500, 0x00000030, 0x00190000, 0x000001E4 .word EnBdfire_Init diff --git a/data/overlays/actors/z_en_bdfire.reloc.s b/data/overlays/actors/z_en_bdfire.reloc.s index 77362b2f90..ae602b8600 100644 --- a/data/overlays/actors/z_en_bdfire.reloc.s +++ b/data/overlays/actors/z_en_bdfire.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_809BCBA0 -.incbin "baserom/ovl_En_Bdfire", 0xB70, 0x000000C0 +.balign 16 + +glabel D_809BCBA0 + .incbin "baserom/ovl_En_Bdfire", 0xB70, 0x000000C0 diff --git a/data/overlays/actors/z_en_bigokuta.data.s b/data/overlays/actors/z_en_bigokuta.data.s index 1e819a2d0e..3add6103db 100644 --- a/data/overlays/actors/z_en_bigokuta.data.s +++ b/data/overlays/actors/z_en_bigokuta.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel D_809BF3A0 .word 0xFFFFFFFF glabel D_809BF3A4 diff --git a/data/overlays/actors/z_en_bigokuta.reloc.s b/data/overlays/actors/z_en_bigokuta.reloc.s index 4fba18034c..4515107e30 100644 --- a/data/overlays/actors/z_en_bigokuta.reloc.s +++ b/data/overlays/actors/z_en_bigokuta.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_809BF5A0 -.incbin "baserom/ovl_En_Bigokuta", 0x2940, 0x00000300 +.balign 16 + +glabel D_809BF5A0 + .incbin "baserom/ovl_En_Bigokuta", 0x2940, 0x00000300 diff --git a/data/overlays/actors/z_en_bili.data.s b/data/overlays/actors/z_en_bili.data.s index 7175101683..d29b51042d 100644 --- a/data/overlays/actors/z_en_bili.data.s +++ b/data/overlays/actors/z_en_bili.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel En_Bili_InitVars .word 0x00340500, 0x00005005, 0x00210000, 0x00000220 .word EnBili_Init diff --git a/data/overlays/actors/z_en_bili.reloc.s b/data/overlays/actors/z_en_bili.reloc.s index 26b3fe767f..6de7c15e81 100644 --- a/data/overlays/actors/z_en_bili.reloc.s +++ b/data/overlays/actors/z_en_bili.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_809C1800 -.incbin "baserom/ovl_En_Bili", 0x1F60, 0x000003B0 +.balign 16 + +glabel D_809C1800 + .incbin "baserom/ovl_En_Bili", 0x1F60, 0x000003B0 diff --git a/data/overlays/actors/z_en_bird.reloc.s b/data/overlays/actors/z_en_bird.reloc.s index a03ce29373..fc04c7d552 100644 --- a/data/overlays/actors/z_en_bird.reloc.s +++ b/data/overlays/actors/z_en_bird.reloc.s @@ -1,3 +1,6 @@ .section .rodata + +.balign 16 + D_809C2000: .incbin "baserom/ovl_En_Bird", 0x450, 0x00000060 diff --git a/data/overlays/actors/z_en_blkobj.data.s b/data/overlays/actors/z_en_blkobj.data.s index 8dece29488..fd5859c1b7 100644 --- a/data/overlays/actors/z_en_blkobj.data.s +++ b/data/overlays/actors/z_en_blkobj.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel En_Blkobj_InitVars .word 0x01360600, 0x00000030, 0x01250000, 0x0000016C .word EnBlkobj_Init diff --git a/data/overlays/actors/z_en_blkobj.reloc.s b/data/overlays/actors/z_en_blkobj.reloc.s index c794a931e0..9582dccfeb 100644 --- a/data/overlays/actors/z_en_blkobj.reloc.s +++ b/data/overlays/actors/z_en_blkobj.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_809C2620 -.incbin "baserom/ovl_En_Blkobj", 0x5C0, 0x000000B0 +.balign 16 + +glabel D_809C2620 + .incbin "baserom/ovl_En_Blkobj", 0x5C0, 0x000000B0 diff --git a/data/overlays/actors/z_en_bom.data.s b/data/overlays/actors/z_en_bom.data.s index 6a7c04f88f..32cd764bfe 100644 --- a/data/overlays/actors/z_en_bom.data.s +++ b/data/overlays/actors/z_en_bom.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel En_Bom_InitVars .word 0x00100300, 0x00000030, 0x00010000, 0x00000208 .word EnBom_Init diff --git a/data/overlays/actors/z_en_bom.reloc.s b/data/overlays/actors/z_en_bom.reloc.s index 66df8976b8..2efedc28f8 100644 --- a/data/overlays/actors/z_en_bom.reloc.s +++ b/data/overlays/actors/z_en_bom.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_809C3530 -.incbin "baserom/ovl_En_Bom", 0xE60, 0x00000100 +.balign 16 + +glabel D_809C3530 + .incbin "baserom/ovl_En_Bom", 0xE60, 0x00000100 diff --git a/data/overlays/actors/z_en_bom_bowl_man.data.s b/data/overlays/actors/z_en_bom_bowl_man.data.s index c6f35a7fdb..02475bbf3f 100644 --- a/data/overlays/actors/z_en_bom_bowl_man.data.s +++ b/data/overlays/actors/z_en_bom_bowl_man.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel En_Bom_Bowl_Man_InitVars .word 0x014B0400, 0x08000039, 0x01600000, 0x00000264 .word EnBomBowlMan_Init diff --git a/data/overlays/actors/z_en_bom_bowl_man.reloc.s b/data/overlays/actors/z_en_bom_bowl_man.reloc.s index fdeddacf6b..e196a9b0e2 100644 --- a/data/overlays/actors/z_en_bom_bowl_man.reloc.s +++ b/data/overlays/actors/z_en_bom_bowl_man.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_809C4C90 -.incbin "baserom/ovl_En_Bom_Bowl_Man", 0x1660, 0x000001B0 +.balign 16 + +glabel D_809C4C90 + .incbin "baserom/ovl_En_Bom_Bowl_Man", 0x1660, 0x000001B0 diff --git a/data/overlays/actors/z_en_bom_bowl_pit.data.s b/data/overlays/actors/z_en_bom_bowl_pit.data.s index 6fbe1ead2e..ad270a6a30 100644 --- a/data/overlays/actors/z_en_bom_bowl_pit.data.s +++ b/data/overlays/actors/z_en_bom_bowl_pit.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel D_809C56E0 .word 0x00000033, 0x0000003E, 0x00000003, 0x00000065, 0x00000055 glabel En_Bom_Bowl_Pit_InitVars diff --git a/data/overlays/actors/z_en_bom_bowl_pit.reloc.s b/data/overlays/actors/z_en_bom_bowl_pit.reloc.s index 4ca629ab5b..925690445c 100644 --- a/data/overlays/actors/z_en_bom_bowl_pit.reloc.s +++ b/data/overlays/actors/z_en_bom_bowl_pit.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_809C5790 -.incbin "baserom/ovl_En_Bom_Bowl_Pit", 0x950, 0x000000A0 +.balign 16 + +glabel D_809C5790 + .incbin "baserom/ovl_En_Bom_Bowl_Pit", 0x950, 0x000000A0 diff --git a/data/overlays/actors/z_en_bom_chu.data.s b/data/overlays/actors/z_en_bom_chu.data.s index 7b975dd418..20e6780fec 100644 --- a/data/overlays/actors/z_en_bom_chu.data.s +++ b/data/overlays/actors/z_en_bom_chu.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel En_Bom_Chu_InitVars .word 0x00DA0300, 0x00000010, 0x00010000, 0x000001E4 .word EnBomChu_Init diff --git a/data/overlays/actors/z_en_bom_chu.reloc.s b/data/overlays/actors/z_en_bom_chu.reloc.s index 837e393356..f2d57a58de 100644 --- a/data/overlays/actors/z_en_bom_chu.reloc.s +++ b/data/overlays/actors/z_en_bom_chu.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_809C6DF0 -.incbin "baserom/ovl_En_Bom_Chu", 0x15C0, 0x00000170 +.balign 16 + +glabel D_809C6DF0 + .incbin "baserom/ovl_En_Bom_Chu", 0x15C0, 0x00000170 diff --git a/data/overlays/actors/z_en_bombf.data.s b/data/overlays/actors/z_en_bombf.data.s index 2bc611f2d8..4fa22d834c 100644 --- a/data/overlays/actors/z_en_bombf.data.s +++ b/data/overlays/actors/z_en_bombf.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel En_Bombf_InitVars .word 0x004C0600, 0x00000011, 0x00310000, 0x00000210 .word EnBombf_Init diff --git a/data/overlays/actors/z_en_bombf.reloc.s b/data/overlays/actors/z_en_bombf.reloc.s index 3b74e88096..df79ad64a1 100644 --- a/data/overlays/actors/z_en_bombf.reloc.s +++ b/data/overlays/actors/z_en_bombf.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_809C8370 -.incbin "baserom/ovl_En_Bombf", 0x1410, 0x00000110 +.balign 16 + +glabel D_809C8370 + .incbin "baserom/ovl_En_Bombf", 0x1410, 0x00000110 diff --git a/data/overlays/actors/z_en_box.bss.s b/data/overlays/actors/z_en_box.bss.s index d3fcb9210c..512b90734b 100644 --- a/data/overlays/actors/z_en_box.bss.s +++ b/data/overlays/actors/z_en_box.bss.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers -.bss +.section .bss + +.balign 16 glabel D_809CAB00 .space 0x10 diff --git a/data/overlays/actors/z_en_box.data.s b/data/overlays/actors/z_en_box.data.s index 948b665498..484c5815f0 100644 --- a/data/overlays/actors/z_en_box.data.s +++ b/data/overlays/actors/z_en_box.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel En_Box_InitVars .word 0x000A0B00, 0x00000000, 0x000E0000, 0x000001FC .word EnBox_Init diff --git a/data/overlays/actors/z_en_box.reloc.s b/data/overlays/actors/z_en_box.reloc.s index e6ca513dab..f339529c8f 100644 --- a/data/overlays/actors/z_en_box.reloc.s +++ b/data/overlays/actors/z_en_box.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_809CA920 -.incbin "baserom/ovl_En_Box", 0x1B60, 0x000001E0 +.balign 16 + +glabel D_809CA920 + .incbin "baserom/ovl_En_Box", 0x1B60, 0x000001E0 diff --git a/data/overlays/actors/z_en_brob.data.s b/data/overlays/actors/z_en_brob.data.s index 966ebdf4e1..d847e8cea3 100644 --- a/data/overlays/actors/z_en_brob.data.s +++ b/data/overlays/actors/z_en_brob.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel En_Brob_InitVars .word 0x00B60500, 0x00000005, 0x00AC0000, 0x000002C0 .word EnBrob_Init diff --git a/data/overlays/actors/z_en_brob.reloc.s b/data/overlays/actors/z_en_brob.reloc.s index 6e9861735c..e57a51c3ba 100644 --- a/data/overlays/actors/z_en_brob.reloc.s +++ b/data/overlays/actors/z_en_brob.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_809CBAE0 -.incbin "baserom/ovl_En_Brob", 0xFD0, 0x00000120 +.balign 16 + +glabel D_809CBAE0 + .incbin "baserom/ovl_En_Brob", 0xFD0, 0x00000120 diff --git a/data/overlays/actors/z_en_bubble.data.s b/data/overlays/actors/z_en_bubble.data.s index f6606d4c15..06f9b1f72a 100644 --- a/data/overlays/actors/z_en_bubble.data.s +++ b/data/overlays/actors/z_en_bubble.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel En_Bubble_InitVars .word 0x002D0500, 0x00000001, 0x00120000, 0x00000260 .word EnBubble_Init diff --git a/data/overlays/actors/z_en_bubble.reloc.s b/data/overlays/actors/z_en_bubble.reloc.s index e035748775..70a481b50b 100644 --- a/data/overlays/actors/z_en_bubble.reloc.s +++ b/data/overlays/actors/z_en_bubble.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_809CCF20 -.incbin "baserom/ovl_En_Bubble", 0x1320, 0x00000150 +.balign 16 + +glabel D_809CCF20 + .incbin "baserom/ovl_En_Bubble", 0x1320, 0x00000150 diff --git a/data/overlays/actors/z_en_butte.data.s b/data/overlays/actors/z_en_butte.data.s index 76013796f0..d0dd040174 100644 --- a/data/overlays/actors/z_en_butte.data.s +++ b/data/overlays/actors/z_en_butte.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel D_809CE2F0 .word 0x00000000, 0x00000000, 0x00000000, 0xFFCFFFFF, 0x00000000, 0x00000100, 0x00000000, 0x00000000, 0x00050064 glabel D_809CE314 diff --git a/data/overlays/actors/z_en_butte.reloc.s b/data/overlays/actors/z_en_butte.reloc.s index 524203edd8..fd3e5d57c0 100644 --- a/data/overlays/actors/z_en_butte.reloc.s +++ b/data/overlays/actors/z_en_butte.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_809CE4D0 -.incbin "baserom/ovl_En_Butte", 0x1460, 0x00000210 +.balign 16 + +glabel D_809CE4D0 + .incbin "baserom/ovl_En_Butte", 0x1460, 0x00000210 diff --git a/data/overlays/actors/z_en_bw.data.s b/data/overlays/actors/z_en_bw.data.s index e25b1890f4..68d9e93275 100644 --- a/data/overlays/actors/z_en_bw.data.s +++ b/data/overlays/actors/z_en_bw.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel En_Bw_InitVars .word 0x00380500, 0x00000015, 0x00250000, 0x0000032C .word EnBw_Init diff --git a/data/overlays/actors/z_en_bw.reloc.s b/data/overlays/actors/z_en_bw.reloc.s index 2b8a9bb0dc..efc58f153c 100644 --- a/data/overlays/actors/z_en_bw.reloc.s +++ b/data/overlays/actors/z_en_bw.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_809D16F0 -.incbin "baserom/ovl_En_Bw", 0x3010, 0x000003F0 +.balign 16 + +glabel D_809D16F0 + .incbin "baserom/ovl_En_Bw", 0x3010, 0x000003F0 diff --git a/data/overlays/actors/z_en_bx.data.s b/data/overlays/actors/z_en_bx.data.s index c4d5eec86c..dbf57d2420 100644 --- a/data/overlays/actors/z_en_bx.data.s +++ b/data/overlays/actors/z_en_bx.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel En_Bx_InitVars .word 0x00DF0500, 0x00000010, 0x00D50000, 0x00000298 .word EnBx_Init diff --git a/data/overlays/actors/z_en_bx.reloc.s b/data/overlays/actors/z_en_bx.reloc.s index 4a88c879a9..b27e2a7dfb 100644 --- a/data/overlays/actors/z_en_bx.reloc.s +++ b/data/overlays/actors/z_en_bx.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_809D25C0 -.incbin "baserom/ovl_En_Bx", 0xAE0, 0x000000D0 +.balign 16 + +glabel D_809D25C0 + .incbin "baserom/ovl_En_Bx", 0xAE0, 0x000000D0 diff --git a/data/overlays/actors/z_en_changer.data.s b/data/overlays/actors/z_en_changer.data.s index e31997bb40..60b3c223b1 100644 --- a/data/overlays/actors/z_en_changer.data.s +++ b/data/overlays/actors/z_en_changer.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel En_Changer_InitVars .word 0x01550600, 0x00000000, 0x00010000, 0x0000016C .word EnChanger_Init diff --git a/data/overlays/actors/z_en_changer.reloc.s b/data/overlays/actors/z_en_changer.reloc.s index 1c870eef32..cd0f368a7d 100644 --- a/data/overlays/actors/z_en_changer.reloc.s +++ b/data/overlays/actors/z_en_changer.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_809D3460 -.incbin "baserom/ovl_En_Changer", 0xDD0, 0x00000150 +.balign 16 + +glabel D_809D3460 + .incbin "baserom/ovl_En_Changer", 0xDD0, 0x00000150 diff --git a/data/overlays/actors/z_en_clear_tag.bss.s b/data/overlays/actors/z_en_clear_tag.bss.s index b98ef99f21..fc5f893987 100644 --- a/data/overlays/actors/z_en_clear_tag.bss.s +++ b/data/overlays/actors/z_en_clear_tag.bss.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers -.bss +.section .bss + +.balign 16 glabel D_809DC3D0 .space 0x2A30 diff --git a/data/overlays/actors/z_en_clear_tag.data.s b/data/overlays/actors/z_en_clear_tag.data.s index e8ff063c2b..076d4fb836 100644 --- a/data/overlays/actors/z_en_clear_tag.data.s +++ b/data/overlays/actors/z_en_clear_tag.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel En_Clear_Tag_InitVars .word 0x013B0900, 0x00000035, 0x00010000, 0x00000204 .word EnClearTag_Init diff --git a/data/overlays/actors/z_en_clear_tag.reloc.s b/data/overlays/actors/z_en_clear_tag.reloc.s index 780d59c2b6..4771b74676 100644 --- a/data/overlays/actors/z_en_clear_tag.reloc.s +++ b/data/overlays/actors/z_en_clear_tag.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_809DC140 -.incbin "baserom/ovl_En_Clear_Tag", 0x8B90, 0x00000290 +.balign 16 + +glabel D_809DC140 + .incbin "baserom/ovl_En_Clear_Tag", 0x8B90, 0x00000290 diff --git a/data/overlays/actors/z_en_crow.data.s b/data/overlays/actors/z_en_crow.data.s index 21ca3cd345..b77c35577d 100644 --- a/data/overlays/actors/z_en_crow.data.s +++ b/data/overlays/actors/z_en_crow.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel D_809E1640 .word 0x00000000, 0x00000000, 0x00000000 glabel En_Crow_InitVars diff --git a/data/overlays/actors/z_en_crow.reloc.s b/data/overlays/actors/z_en_crow.reloc.s index 32db84ede2..a78be03ec7 100644 --- a/data/overlays/actors/z_en_crow.reloc.s +++ b/data/overlays/actors/z_en_crow.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_809E1730 -.incbin "baserom/ovl_En_Crow", 0x14F0, 0x00000180 +.balign 16 + +glabel D_809E1730 + .incbin "baserom/ovl_En_Crow", 0x14F0, 0x00000180 diff --git a/data/overlays/actors/z_en_cs.data.s b/data/overlays/actors/z_en_cs.data.s index 1e5a89df11..80c334366d 100644 --- a/data/overlays/actors/z_en_cs.data.s +++ b/data/overlays/actors/z_en_cs.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel En_Cs_InitVars .word 0x016C0400, 0x00000009, 0x01450000, 0x00000344 .word EnCs_Init diff --git a/data/overlays/actors/z_en_cs.reloc.s b/data/overlays/actors/z_en_cs.reloc.s index 72aedfcd65..0a135ddf34 100644 --- a/data/overlays/actors/z_en_cs.reloc.s +++ b/data/overlays/actors/z_en_cs.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_809E29E0 -.incbin "baserom/ovl_En_Cs", 0x1130, 0x00000150 +.balign 16 + +glabel D_809E29E0 + .incbin "baserom/ovl_En_Cs", 0x1130, 0x00000150 diff --git a/data/overlays/actors/z_en_daiku.data.s b/data/overlays/actors/z_en_daiku.data.s index 85eed39ba1..869ab15344 100644 --- a/data/overlays/actors/z_en_daiku.data.s +++ b/data/overlays/actors/z_en_daiku.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel En_Daiku_InitVars .word 0x01330400, 0x00000019, 0x01220000, 0x0000034C .word EnDaiku_Init diff --git a/data/overlays/actors/z_en_daiku.reloc.s b/data/overlays/actors/z_en_daiku.reloc.s index d188033568..03cac17ca4 100644 --- a/data/overlays/actors/z_en_daiku.reloc.s +++ b/data/overlays/actors/z_en_daiku.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_809E41D0 -.incbin "baserom/ovl_En_Daiku", 0x16A0, 0x00000150 +.balign 16 + +glabel D_809E41D0 + .incbin "baserom/ovl_En_Daiku", 0x16A0, 0x00000150 diff --git a/data/overlays/actors/z_en_daiku_kakariko.data.s b/data/overlays/actors/z_en_daiku_kakariko.data.s index 6455ac55f3..b166990f1c 100644 --- a/data/overlays/actors/z_en_daiku_kakariko.data.s +++ b/data/overlays/actors/z_en_daiku_kakariko.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel En_Daiku_Kakariko_InitVars .word 0x01BC0400, 0x00000019, 0x01220000, 0x00000308 .word EnDaikuKakariko_Init diff --git a/data/overlays/actors/z_en_daiku_kakariko.reloc.s b/data/overlays/actors/z_en_daiku_kakariko.reloc.s index f8f84f5614..269a6bbfb8 100644 --- a/data/overlays/actors/z_en_daiku_kakariko.reloc.s +++ b/data/overlays/actors/z_en_daiku_kakariko.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_809E5640 -.incbin "baserom/ovl_En_Daiku_Kakariko", 0x1320, 0x00000190 +.balign 16 + +glabel D_809E5640 + .incbin "baserom/ovl_En_Daiku_Kakariko", 0x1320, 0x00000190 diff --git a/data/overlays/actors/z_en_dekubaba.data.s b/data/overlays/actors/z_en_dekubaba.data.s index 100a4cb81c..e5e741e51c 100644 --- a/data/overlays/actors/z_en_dekubaba.data.s +++ b/data/overlays/actors/z_en_dekubaba.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel D_809E8EA0 .word 0x00000000, 0x00000000, 0x00000000 glabel En_Dekubaba_InitVars diff --git a/data/overlays/actors/z_en_dekubaba.reloc.s b/data/overlays/actors/z_en_dekubaba.reloc.s index 3a6c7e5d27..e36861ad06 100644 --- a/data/overlays/actors/z_en_dekubaba.reloc.s +++ b/data/overlays/actors/z_en_dekubaba.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_809E91E0 -.incbin "baserom/ovl_En_Dekubaba", 0x3A10, 0x00000380 +.balign 16 + +glabel D_809E91E0 + .incbin "baserom/ovl_En_Dekubaba", 0x3A10, 0x00000380 diff --git a/data/overlays/actors/z_en_dekunuts.data.s b/data/overlays/actors/z_en_dekunuts.data.s index 29d8018742..6e1f29f7a9 100644 --- a/data/overlays/actors/z_en_dekunuts.data.s +++ b/data/overlays/actors/z_en_dekunuts.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel En_Dekunuts_InitVars .word 0x00600500, 0x00000005, 0x004A0000, 0x00000314 .word EnDekunuts_Init diff --git a/data/overlays/actors/z_en_dekunuts.reloc.s b/data/overlays/actors/z_en_dekunuts.reloc.s index b0f6b2f055..2e2920ac27 100644 --- a/data/overlays/actors/z_en_dekunuts.reloc.s +++ b/data/overlays/actors/z_en_dekunuts.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_809EABE0 -.incbin "baserom/ovl_En_Dekunuts", 0x1680, 0x00000160 +.balign 16 + +glabel D_809EABE0 + .incbin "baserom/ovl_En_Dekunuts", 0x1680, 0x00000160 diff --git a/data/overlays/actors/z_en_dh.data.s b/data/overlays/actors/z_en_dh.data.s index d32f0d2a99..68ec603d3a 100644 --- a/data/overlays/actors/z_en_dh.data.s +++ b/data/overlays/actors/z_en_dh.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel En_Dh_InitVars .word 0x00A40500, 0x00000415, 0x00A60000, 0x00000324 .word EnDh_Init diff --git a/data/overlays/actors/z_en_dh.reloc.s b/data/overlays/actors/z_en_dh.reloc.s index 0bd7dcba90..cb214c635d 100644 --- a/data/overlays/actors/z_en_dh.reloc.s +++ b/data/overlays/actors/z_en_dh.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_809EC6F0 -.incbin "baserom/ovl_En_Dh", 0x19B0, 0x00000190 +.balign 16 + +glabel D_809EC6F0 + .incbin "baserom/ovl_En_Dh", 0x19B0, 0x00000190 diff --git a/data/overlays/actors/z_en_diving_game.data.s b/data/overlays/actors/z_en_diving_game.data.s index b7afc473a0..fc835a8674 100644 --- a/data/overlays/actors/z_en_diving_game.data.s +++ b/data/overlays/actors/z_en_diving_game.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel En_Diving_Game_InitVars .word 0x01240400, 0x00000019, 0x00FE0000, 0x00000398 .word EnDivingGame_Init diff --git a/data/overlays/actors/z_en_diving_game.reloc.s b/data/overlays/actors/z_en_diving_game.reloc.s index 67ddb3db3a..25651654fd 100644 --- a/data/overlays/actors/z_en_diving_game.reloc.s +++ b/data/overlays/actors/z_en_diving_game.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_809EF1D0 -.incbin "baserom/ovl_En_Diving_Game", 0x1960, 0x00000180 +.balign 16 + +glabel D_809EF1D0 + .incbin "baserom/ovl_En_Diving_Game", 0x1960, 0x00000180 diff --git a/data/overlays/actors/z_en_dns.data.s b/data/overlays/actors/z_en_dns.data.s index 4be8f61853..399592d52d 100644 --- a/data/overlays/actors/z_en_dns.data.s +++ b/data/overlays/actors/z_en_dns.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel En_Dns_InitVars .word 0x011A0100, 0x00000009, 0x01680000, 0x000002C8 .word EnDns_Init diff --git a/data/overlays/actors/z_en_dns.reloc.s b/data/overlays/actors/z_en_dns.reloc.s index 7070d209d4..664cc221e0 100644 --- a/data/overlays/actors/z_en_dns.reloc.s +++ b/data/overlays/actors/z_en_dns.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_809F0710 -.incbin "baserom/ovl_En_Dns", 0x13C0, 0x000001D0 +.balign 16 + +glabel D_809F0710 + .incbin "baserom/ovl_En_Dns", 0x13C0, 0x000001D0 diff --git a/data/overlays/actors/z_en_dnt_demo.data.s b/data/overlays/actors/z_en_dnt_demo.data.s index 45b974823c..3ba27cf6da 100644 --- a/data/overlays/actors/z_en_dnt_demo.data.s +++ b/data/overlays/actors/z_en_dnt_demo.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel En_Dnt_Demo_InitVars .word 0x01A10600, 0x00000000, 0x00010000, 0x00000200 .word EnDntDemo_Init diff --git a/data/overlays/actors/z_en_dnt_demo.reloc.s b/data/overlays/actors/z_en_dnt_demo.reloc.s index 3a478e7923..ab46efa265 100644 --- a/data/overlays/actors/z_en_dnt_demo.reloc.s +++ b/data/overlays/actors/z_en_dnt_demo.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_809F19B0 -.incbin "baserom/ovl_En_Dnt_Demo", 0x10D0, 0x00000130 +.balign 16 + +glabel D_809F19B0 + .incbin "baserom/ovl_En_Dnt_Demo", 0x10D0, 0x00000130 diff --git a/data/overlays/actors/z_en_dnt_jiji.data.s b/data/overlays/actors/z_en_dnt_jiji.data.s index 73c625fa22..55da4e5472 100644 --- a/data/overlays/actors/z_en_dnt_jiji.data.s +++ b/data/overlays/actors/z_en_dnt_jiji.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel En_Dnt_Jiji_InitVars .word 0x01A20400, 0x00000019, 0x01710000, 0x000002A8 .word EnDntJiji_Init diff --git a/data/overlays/actors/z_en_dnt_jiji.reloc.s b/data/overlays/actors/z_en_dnt_jiji.reloc.s index 2e179520ae..ca697e19df 100644 --- a/data/overlays/actors/z_en_dnt_jiji.reloc.s +++ b/data/overlays/actors/z_en_dnt_jiji.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_809F3100 -.incbin "baserom/ovl_En_Dnt_Jiji", 0x1620, 0x000001C0 +.balign 16 + +glabel D_809F3100 + .incbin "baserom/ovl_En_Dnt_Jiji", 0x1620, 0x000001C0 diff --git a/data/overlays/actors/z_en_dnt_nomal.data.s b/data/overlays/actors/z_en_dnt_nomal.data.s index c8f1ee5333..12ad307427 100644 --- a/data/overlays/actors/z_en_dnt_nomal.data.s +++ b/data/overlays/actors/z_en_dnt_nomal.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel En_Dnt_Nomal_InitVars .word 0x01A30600, 0x00000030, 0x00010000, 0x00000360 .word EnDntNomal_Init diff --git a/data/overlays/actors/z_en_dnt_nomal.reloc.s b/data/overlays/actors/z_en_dnt_nomal.reloc.s index 4619a81802..aa76c61441 100644 --- a/data/overlays/actors/z_en_dnt_nomal.reloc.s +++ b/data/overlays/actors/z_en_dnt_nomal.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_809F6090 -.incbin "baserom/ovl_En_Dnt_Nomal", 0x2DD0, 0x00000330 +.balign 16 + +glabel D_809F6090 + .incbin "baserom/ovl_En_Dnt_Nomal", 0x2DD0, 0x00000330 diff --git a/data/overlays/actors/z_en_dodojr.data.s b/data/overlays/actors/z_en_dodojr.data.s index 4fd5a967ae..3ccf6fc73f 100644 --- a/data/overlays/actors/z_en_dodojr.data.s +++ b/data/overlays/actors/z_en_dodojr.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel En_Dodojr_InitVars .word 0x002F0500, 0x00000005, 0x001F0000, 0x000002C0 .word EnDodojr_Init diff --git a/data/overlays/actors/z_en_dodojr.reloc.s b/data/overlays/actors/z_en_dodojr.reloc.s index 27f72ba1c2..6941af72dd 100644 --- a/data/overlays/actors/z_en_dodojr.reloc.s +++ b/data/overlays/actors/z_en_dodojr.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_809F7FA0 -.incbin "baserom/ovl_En_Dodojr", 0x1BE0, 0x000002B0 +.balign 16 + +glabel D_809F7FA0 + .incbin "baserom/ovl_En_Dodojr", 0x1BE0, 0x000002B0 diff --git a/data/overlays/actors/z_en_dodongo.data.s b/data/overlays/actors/z_en_dodongo.data.s index 53bc7d8ece..b3ac0551a1 100644 --- a/data/overlays/actors/z_en_dodongo.data.s +++ b/data/overlays/actors/z_en_dodongo.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel En_Dodongo_InitVars .word 0x00120500, 0x00000015, 0x000C0000, 0x00000728 .word EnDodongo_Init diff --git a/data/overlays/actors/z_en_dodongo.reloc.s b/data/overlays/actors/z_en_dodongo.reloc.s index 75142c4bb3..a772aaac01 100644 --- a/data/overlays/actors/z_en_dodongo.reloc.s +++ b/data/overlays/actors/z_en_dodongo.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_809FAC80 -.incbin "baserom/ovl_En_Dodongo", 0x2A30, 0x00000350 +.balign 16 + +glabel D_809FAC80 + .incbin "baserom/ovl_En_Dodongo", 0x2A30, 0x00000350 diff --git a/data/overlays/actors/z_en_door.data.s b/data/overlays/actors/z_en_door.data.s index 78cc4b0556..b0d964b104 100644 --- a/data/overlays/actors/z_en_door.data.s +++ b/data/overlays/actors/z_en_door.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel En_Door_InitVars .word 0x00090A00, 0x00000010, 0x00010000, 0x000001D8 .word EnDoor_Init diff --git a/data/overlays/actors/z_en_door.reloc.s b/data/overlays/actors/z_en_door.reloc.s index 06f257a3b3..677db12150 100644 --- a/data/overlays/actors/z_en_door.reloc.s +++ b/data/overlays/actors/z_en_door.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_809FCF40 -.incbin "baserom/ovl_En_Door", 0xD70, 0x000000F0 +.balign 16 + +glabel D_809FCF40 + .incbin "baserom/ovl_En_Door", 0xD70, 0x000000F0 diff --git a/data/overlays/actors/z_en_du.data.s b/data/overlays/actors/z_en_du.data.s index 5914c997d2..5423aac4ce 100644 --- a/data/overlays/actors/z_en_du.data.s +++ b/data/overlays/actors/z_en_du.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel En_Du_InitVars .word 0x00980400, 0x02000009, 0x009D0000, 0x0000021C .word EnDu_Init diff --git a/data/overlays/actors/z_en_du.reloc.s b/data/overlays/actors/z_en_du.reloc.s index 26f688a54b..9f197bec60 100644 --- a/data/overlays/actors/z_en_du.reloc.s +++ b/data/overlays/actors/z_en_du.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_809FF4A0 -.incbin "baserom/ovl_En_Du", 0x1870, 0x00000250 +.balign 16 + +glabel D_809FF4A0 + .incbin "baserom/ovl_En_Du", 0x1870, 0x00000250 diff --git a/data/overlays/actors/z_en_dy_extra.data.s b/data/overlays/actors/z_en_dy_extra.data.s index 2fb9449a40..3d7c68b6c1 100644 --- a/data/overlays/actors/z_en_dy_extra.data.s +++ b/data/overlays/actors/z_en_dy_extra.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel En_Dy_Extra_InitVars .word 0x01840600, 0x00000030, 0x000A0000, 0x00000174 .word EnDyExtra_Init diff --git a/data/overlays/actors/z_en_dy_extra.reloc.s b/data/overlays/actors/z_en_dy_extra.reloc.s index 8638008298..0a9d1e120a 100644 --- a/data/overlays/actors/z_en_dy_extra.reloc.s +++ b/data/overlays/actors/z_en_dy_extra.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_809FFCF0 -.incbin "baserom/ovl_En_Dy_Extra", 0x600, 0x000000A0 +.balign 16 + +glabel D_809FFCF0 + .incbin "baserom/ovl_En_Dy_Extra", 0x600, 0x000000A0 diff --git a/data/overlays/actors/z_en_eiyer.data.s b/data/overlays/actors/z_en_eiyer.data.s index f20a9b8d79..2939d470ea 100644 --- a/data/overlays/actors/z_en_eiyer.data.s +++ b/data/overlays/actors/z_en_eiyer.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel En_Eiyer_InitVars .word 0x003A0500, 0x00000005, 0x00260000, 0x000002D4 .word EnEiyer_Init diff --git a/data/overlays/actors/z_en_eiyer.reloc.s b/data/overlays/actors/z_en_eiyer.reloc.s index a7d88ee8d9..c56b1acfdd 100644 --- a/data/overlays/actors/z_en_eiyer.reloc.s +++ b/data/overlays/actors/z_en_eiyer.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_80A01A20 -.incbin "baserom/ovl_En_Eiyer", 0x1A80, 0x00000210 +.balign 16 + +glabel D_80A01A20 + .incbin "baserom/ovl_En_Eiyer", 0x1A80, 0x00000210 diff --git a/data/overlays/actors/z_en_elf.data.s b/data/overlays/actors/z_en_elf.data.s index 94dd41984e..12a7c7cc5e 100644 --- a/data/overlays/actors/z_en_elf.data.s +++ b/data/overlays/actors/z_en_elf.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel En_Elf_InitVars .word 0x00180700, 0x02000030, 0x00010000, 0x000002D0 .word EnElf_Init diff --git a/data/overlays/actors/z_en_elf.reloc.s b/data/overlays/actors/z_en_elf.reloc.s index 4a6daa8925..773dd4d859 100644 --- a/data/overlays/actors/z_en_elf.reloc.s +++ b/data/overlays/actors/z_en_elf.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_80A06240 -.incbin "baserom/ovl_En_Elf", 0x4610, 0x000004E0 +.balign 16 + +glabel D_80A06240 + .incbin "baserom/ovl_En_Elf", 0x4610, 0x000004E0 diff --git a/data/overlays/actors/z_en_elf.rodata.s b/data/overlays/actors/z_en_elf.rodata.s index 866ff128e5..00123ee659 100644 --- a/data/overlays/actors/z_en_elf.rodata.s +++ b/data/overlays/actors/z_en_elf.rodata.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata +.balign 16 + glabel D_80A060B0 .asciz "0" .balign 4 diff --git a/data/overlays/actors/z_en_encount1.data.s b/data/overlays/actors/z_en_encount1.data.s index 587a907929..0449c3fb5a 100644 --- a/data/overlays/actors/z_en_encount1.data.s +++ b/data/overlays/actors/z_en_encount1.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel D_80A07450 .word 0x00002710, 0x71488EB8, 0xD8F00000 glabel D_80A0745C diff --git a/data/overlays/actors/z_en_encount1.reloc.s b/data/overlays/actors/z_en_encount1.reloc.s index f32543e50e..3eb19577bc 100644 --- a/data/overlays/actors/z_en_encount1.reloc.s +++ b/data/overlays/actors/z_en_encount1.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_80A07870 -.incbin "baserom/ovl_En_Encount1", 0x1150, 0x00000120 +.balign 16 + +glabel D_80A07870 + .incbin "baserom/ovl_En_Encount1", 0x1150, 0x00000120 diff --git a/data/overlays/actors/z_en_encount2.data.s b/data/overlays/actors/z_en_encount2.data.s index 01c5eacae7..43c83b27e6 100644 --- a/data/overlays/actors/z_en_encount2.data.s +++ b/data/overlays/actors/z_en_encount2.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel En_Encount2_InitVars .word 0x00B40500, 0x00000030, 0x00920000, 0x00000A20 .word EnEncount2_Init diff --git a/data/overlays/actors/z_en_encount2.reloc.s b/data/overlays/actors/z_en_encount2.reloc.s index 25e1103b23..aced89d21a 100644 --- a/data/overlays/actors/z_en_encount2.reloc.s +++ b/data/overlays/actors/z_en_encount2.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_80A08D80 -.incbin "baserom/ovl_En_Encount2", 0x13F0, 0x00000120 +.balign 16 + +glabel D_80A08D80 + .incbin "baserom/ovl_En_Encount2", 0x13F0, 0x00000120 diff --git a/data/overlays/actors/z_en_ex_item.data.s b/data/overlays/actors/z_en_ex_item.data.s index cbffe64623..e4d8e8d1b1 100644 --- a/data/overlays/actors/z_en_ex_item.data.s +++ b/data/overlays/actors/z_en_ex_item.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel En_Ex_Item_InitVars .word 0x01680600, 0x00000030, 0x00010000, 0x00000184 .word EnExItem_Init diff --git a/data/overlays/actors/z_en_ex_item.reloc.s b/data/overlays/actors/z_en_ex_item.reloc.s index 5c27f73546..cfd096bb9f 100644 --- a/data/overlays/actors/z_en_ex_item.reloc.s +++ b/data/overlays/actors/z_en_ex_item.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_80A0A180 -.incbin "baserom/ovl_En_Ex_Item", 0x12E0, 0x00000290 +.balign 16 + +glabel D_80A0A180 + .incbin "baserom/ovl_En_Ex_Item", 0x12E0, 0x00000290 diff --git a/data/overlays/actors/z_en_ex_ruppy.data.s b/data/overlays/actors/z_en_ex_ruppy.data.s index 3e02d39008..b1b2891c5a 100644 --- a/data/overlays/actors/z_en_ex_ruppy.data.s +++ b/data/overlays/actors/z_en_ex_ruppy.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel D_80A0B320 .word 0x00000001, 0x00020013, 0x00140000, 0x00010005, 0x001401F4, 0x00320000 glabel En_Ex_Ruppy_InitVars diff --git a/data/overlays/actors/z_en_ex_ruppy.reloc.s b/data/overlays/actors/z_en_ex_ruppy.reloc.s index 7676eeca30..d23cbbe9c6 100644 --- a/data/overlays/actors/z_en_ex_ruppy.reloc.s +++ b/data/overlays/actors/z_en_ex_ruppy.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_80A0B550 -.incbin "baserom/ovl_En_Ex_Ruppy", 0x1140, 0x00000170 +.balign 16 + +glabel D_80A0B550 + .incbin "baserom/ovl_En_Ex_Ruppy", 0x1140, 0x00000170 diff --git a/data/overlays/actors/z_en_fd.data.s b/data/overlays/actors/z_en_fd.data.s index 13eb7d5529..a60ce7f48f 100644 --- a/data/overlays/actors/z_en_fd.data.s +++ b/data/overlays/actors/z_en_fd.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel En_Fd_InitVars .word 0x00990500, 0x00000215, 0x009E0000, 0x000031E0 .word EnFd_Init diff --git a/data/overlays/actors/z_en_fd.reloc.s b/data/overlays/actors/z_en_fd.reloc.s index af304e169f..a2ac29c1d5 100644 --- a/data/overlays/actors/z_en_fd.reloc.s +++ b/data/overlays/actors/z_en_fd.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_80A0E1F0 -.incbin "baserom/ovl_En_Fd", 0x2B30, 0x000002C0 +.balign 16 + +glabel D_80A0E1F0 + .incbin "baserom/ovl_En_Fd", 0x2B30, 0x000002C0 diff --git a/data/overlays/actors/z_en_fd_fire.data.s b/data/overlays/actors/z_en_fd_fire.data.s index 4360ea1c27..2466d30fc9 100644 --- a/data/overlays/actors/z_en_fd_fire.data.s +++ b/data/overlays/actors/z_en_fd_fire.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel En_Fd_Fire_InitVars .word 0x00A30500, 0x00000015, 0x00030000, 0x000001AC .word EnFdFire_Init diff --git a/data/overlays/actors/z_en_fd_fire.reloc.s b/data/overlays/actors/z_en_fd_fire.reloc.s index a0b5bb62b9..157e8cf480 100644 --- a/data/overlays/actors/z_en_fd_fire.reloc.s +++ b/data/overlays/actors/z_en_fd_fire.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_80A0F150 -.incbin "baserom/ovl_En_Fd_Fire", 0xCA0, 0x00000110 +.balign 16 + +glabel D_80A0F150 + .incbin "baserom/ovl_En_Fd_Fire", 0xCA0, 0x00000110 diff --git a/data/overlays/actors/z_en_fhg.data.s b/data/overlays/actors/z_en_fhg.data.s index cb68acfc0e..cecc08f90e 100644 --- a/data/overlays/actors/z_en_fhg.data.s +++ b/data/overlays/actors/z_en_fhg.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel En_fHG_InitVars .word 0x00670100, 0x00000010, 0x005A0000, 0x00000294 .word EnfHG_Init diff --git a/data/overlays/actors/z_en_fhg.reloc.s b/data/overlays/actors/z_en_fhg.reloc.s index 43404bb98a..eaef94a85d 100644 --- a/data/overlays/actors/z_en_fhg.reloc.s +++ b/data/overlays/actors/z_en_fhg.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_80B65460 -.incbin "baserom/ovl_En_fHG", 0x2AA0, 0x000002C0 +.balign 16 + +glabel D_80B65460 + .incbin "baserom/ovl_En_fHG", 0x2AA0, 0x000002C0 diff --git a/data/overlays/actors/z_en_fhg_fire.data.s b/data/overlays/actors/z_en_fhg_fire.data.s index cb4b0dac0b..d769465875 100644 --- a/data/overlays/actors/z_en_fhg_fire.data.s +++ b/data/overlays/actors/z_en_fhg_fire.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel En_Fhg_Fire_InitVars .word 0x00000900, 0x00000030, 0x005A0000, 0x00000204 .word EnFhgFire_Init diff --git a/data/overlays/actors/z_en_fhg_fire.reloc.s b/data/overlays/actors/z_en_fhg_fire.reloc.s index 7930327e1d..ca6377ea15 100644 --- a/data/overlays/actors/z_en_fhg_fire.reloc.s +++ b/data/overlays/actors/z_en_fhg_fire.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_80A11A10 -.incbin "baserom/ovl_En_Fhg_Fire", 0x27B0, 0x00000210 +.balign 16 + +glabel D_80A11A10 + .incbin "baserom/ovl_En_Fhg_Fire", 0x27B0, 0x00000210 diff --git a/data/overlays/actors/z_en_fire_rock.data.s b/data/overlays/actors/z_en_fire_rock.data.s index 558af6ad18..70d634350f 100644 --- a/data/overlays/actors/z_en_fire_rock.data.s +++ b/data/overlays/actors/z_en_fire_rock.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel En_Fire_Rock_InitVars .word 0x00B50500, 0x00000030, 0x00920000, 0x000001E0 .word EnFireRock_Init diff --git a/data/overlays/actors/z_en_fire_rock.reloc.s b/data/overlays/actors/z_en_fire_rock.reloc.s index 0c9362f0f4..12d60f1f41 100644 --- a/data/overlays/actors/z_en_fire_rock.reloc.s +++ b/data/overlays/actors/z_en_fire_rock.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_80A12EF0 -.incbin "baserom/ovl_En_Fire_Rock", 0x12D0, 0x00000180 +.balign 16 + +glabel D_80A12EF0 + .incbin "baserom/ovl_En_Fire_Rock", 0x12D0, 0x00000180 diff --git a/data/overlays/actors/z_en_firefly.data.s b/data/overlays/actors/z_en_firefly.data.s index c281a68b59..8e467fe113 100644 --- a/data/overlays/actors/z_en_firefly.data.s +++ b/data/overlays/actors/z_en_firefly.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel En_Firefly_InitVars .word 0x00130500, 0x00005005, 0x000D0000, 0x00000374 .word EnFirefly_Init diff --git a/data/overlays/actors/z_en_firefly.reloc.s b/data/overlays/actors/z_en_firefly.reloc.s index 8017c0e978..bce4bfd827 100644 --- a/data/overlays/actors/z_en_firefly.reloc.s +++ b/data/overlays/actors/z_en_firefly.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_80A15050 -.incbin "baserom/ovl_En_Firefly", 0x1FE0, 0x00000230 +.balign 16 + +glabel D_80A15050 + .incbin "baserom/ovl_En_Firefly", 0x1FE0, 0x00000230 diff --git a/data/overlays/actors/z_en_fish.data.s b/data/overlays/actors/z_en_fish.data.s index cc59f9e9df..5e7ea544c7 100644 --- a/data/overlays/actors/z_en_fish.data.s +++ b/data/overlays/actors/z_en_fish.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel D_80A17010 .word 0x00000000 glabel D_80A17014 diff --git a/data/overlays/actors/z_en_fish.reloc.s b/data/overlays/actors/z_en_fish.reloc.s index a43062fe80..b4b0c6fc2a 100644 --- a/data/overlays/actors/z_en_fish.reloc.s +++ b/data/overlays/actors/z_en_fish.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_80A17200 -.incbin "baserom/ovl_En_Fish", 0x1F80, 0x00000310 +.balign 16 + +glabel D_80A17200 + .incbin "baserom/ovl_En_Fish", 0x1F80, 0x00000310 diff --git a/data/overlays/actors/z_en_fr.data.s b/data/overlays/actors/z_en_fr.data.s index cc4eabbfd7..bb1b72b971 100644 --- a/data/overlays/actors/z_en_fr.data.s +++ b/data/overlays/actors/z_en_fr.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel D_80A1CFF0 .word 0x00000000 glabel D_80A1CFF4 diff --git a/data/overlays/actors/z_en_fr.reloc.s b/data/overlays/actors/z_en_fr.reloc.s index 26226abffa..06d34cf56d 100644 --- a/data/overlays/actors/z_en_fr.reloc.s +++ b/data/overlays/actors/z_en_fr.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_80A1D310 -.incbin "baserom/ovl_En_Fr", 0x2970, 0x00000500 +.balign 16 + +glabel D_80A1D310 + .incbin "baserom/ovl_En_Fr", 0x2970, 0x00000500 diff --git a/data/overlays/actors/z_en_fw.data.s b/data/overlays/actors/z_en_fw.data.s index 9a9894379d..39c0e13d31 100644 --- a/data/overlays/actors/z_en_fw.data.s +++ b/data/overlays/actors/z_en_fw.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel En_Fw_InitVars .word 0x00AB0500, 0x00000215, 0x009E0000, 0x00000700 .word EnFw_Init diff --git a/data/overlays/actors/z_en_fw.reloc.s b/data/overlays/actors/z_en_fw.reloc.s index 66cf3f03e4..3ab54d03b7 100644 --- a/data/overlays/actors/z_en_fw.reloc.s +++ b/data/overlays/actors/z_en_fw.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_80A1FC90 -.incbin "baserom/ovl_En_Fw", 0x16F0, 0x00000130 +.balign 16 + +glabel D_80A1FC90 + .incbin "baserom/ovl_En_Fw", 0x16F0, 0x00000130 diff --git a/data/overlays/actors/z_en_fz.data.s b/data/overlays/actors/z_en_fz.data.s index 8331ba0737..8ba44e7ba2 100644 --- a/data/overlays/actors/z_en_fz.data.s +++ b/data/overlays/actors/z_en_fz.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel En_Fz_InitVars .word 0x01210500, 0x00000415, 0x01140000, 0x00000BD4 .word EnFz_Init diff --git a/data/overlays/actors/z_en_fz.reloc.s b/data/overlays/actors/z_en_fz.reloc.s index 0870637302..51653421d5 100644 --- a/data/overlays/actors/z_en_fz.reloc.s +++ b/data/overlays/actors/z_en_fz.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_80A21CF0 -.incbin "baserom/ovl_En_Fz", 0x1F30, 0x000001D0 +.balign 16 + +glabel D_80A21CF0 + .incbin "baserom/ovl_En_Fz", 0x1F30, 0x000001D0 diff --git a/data/overlays/actors/z_en_g_switch.data.s b/data/overlays/actors/z_en_g_switch.data.s index 7697347320..e2bd419244 100644 --- a/data/overlays/actors/z_en_g_switch.data.s +++ b/data/overlays/actors/z_en_g_switch.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel D_80A236E0 .word 0x00000000 glabel D_80A236E4 diff --git a/data/overlays/actors/z_en_g_switch.reloc.s b/data/overlays/actors/z_en_g_switch.reloc.s index cbdbb227b9..0abbc582f8 100644 --- a/data/overlays/actors/z_en_g_switch.reloc.s +++ b/data/overlays/actors/z_en_g_switch.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_80A23B30 -.incbin "baserom/ovl_En_G_Switch", 0x1C70, 0x00000230 +.balign 16 + +glabel D_80A23B30 + .incbin "baserom/ovl_En_G_Switch", 0x1C70, 0x00000230 diff --git a/data/overlays/actors/z_en_ganon_mant.data.s b/data/overlays/actors/z_en_ganon_mant.data.s index c1ab54b0a4..bb979c6c7e 100644 --- a/data/overlays/actors/z_en_ganon_mant.data.s +++ b/data/overlays/actors/z_en_ganon_mant.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel En_Ganon_Mant_InitVars .word 0x016F0900, 0x00000030, 0x00010000, 0x00001708 .word EnGanonMant_Init diff --git a/data/overlays/actors/z_en_ganon_mant.reloc.s b/data/overlays/actors/z_en_ganon_mant.reloc.s index 59bba98919..feaf8da7af 100644 --- a/data/overlays/actors/z_en_ganon_mant.reloc.s +++ b/data/overlays/actors/z_en_ganon_mant.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_80A27EF0 -.incbin "baserom/ovl_En_Ganon_Mant", 0x4190, 0x00000110 +.balign 16 + +glabel D_80A27EF0 + .incbin "baserom/ovl_En_Ganon_Mant", 0x4190, 0x00000110 diff --git a/data/overlays/actors/z_en_ganon_organ.data.s b/data/overlays/actors/z_en_ganon_organ.data.s index b257cbdc69..035d54f291 100644 --- a/data/overlays/actors/z_en_ganon_organ.data.s +++ b/data/overlays/actors/z_en_ganon_organ.data.s @@ -3,7 +3,7 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data diff --git a/data/overlays/actors/z_en_ganon_organ.reloc.s b/data/overlays/actors/z_en_ganon_organ.reloc.s index 1b4633622e..0fbf495b2e 100644 --- a/data/overlays/actors/z_en_ganon_organ.reloc.s +++ b/data/overlays/actors/z_en_ganon_organ.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_80A2F000 -.incbin "baserom/ovl_En_Ganon_Organ", 0x7000, 0x00000180 +.balign 16 + +glabel D_80A2F000 + .incbin "baserom/ovl_En_Ganon_Organ", 0x7000, 0x00000180 diff --git a/data/overlays/actors/z_en_gb.data.s b/data/overlays/actors/z_en_gb.data.s index 522c26970d..0853e41b5d 100644 --- a/data/overlays/actors/z_en_gb.data.s +++ b/data/overlays/actors/z_en_gb.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel En_Gb_InitVars .word 0x01B80400, 0x00000009, 0x01890000, 0x00000438 .word EnGb_Init diff --git a/data/overlays/actors/z_en_gb.reloc.s b/data/overlays/actors/z_en_gb.reloc.s index 2657cbfcce..044be76859 100644 --- a/data/overlays/actors/z_en_gb.reloc.s +++ b/data/overlays/actors/z_en_gb.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_80A30810 -.incbin "baserom/ovl_En_Gb", 0x1690, 0x00000160 +.balign 16 + +glabel D_80A30810 + .incbin "baserom/ovl_En_Gb", 0x1690, 0x00000160 diff --git a/data/overlays/actors/z_en_gb.rodata.s b/data/overlays/actors/z_en_gb.rodata.s index 8204907cc6..8b52b46064 100644 --- a/data/overlays/actors/z_en_gb.rodata.s +++ b/data/overlays/actors/z_en_gb.rodata.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata +.balign 16 + glabel D_80A307A0 .asciz "../z_en_gb.c" .balign 4 diff --git a/data/overlays/actors/z_en_ge1.data.s b/data/overlays/actors/z_en_ge1.data.s index 2f53ea7364..48dfeefe3a 100644 --- a/data/overlays/actors/z_en_ge1.data.s +++ b/data/overlays/actors/z_en_ge1.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel En_Ge1_InitVars .word 0x01380400, 0x00000009, 0x01160000, 0x000002BC .word EnGe1_Init diff --git a/data/overlays/actors/z_en_ge1.reloc.s b/data/overlays/actors/z_en_ge1.reloc.s index 046b45b327..cdacb0fd96 100644 --- a/data/overlays/actors/z_en_ge1.reloc.s +++ b/data/overlays/actors/z_en_ge1.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_80A328D0 -.incbin "baserom/ovl_En_Ge1", 0x1F60, 0x00000300 +.balign 16 + +glabel D_80A328D0 + .incbin "baserom/ovl_En_Ge1", 0x1F60, 0x00000300 diff --git a/data/overlays/actors/z_en_ge2.data.s b/data/overlays/actors/z_en_ge2.data.s index 5f8c1c41ce..192c1a9b22 100644 --- a/data/overlays/actors/z_en_ge2.data.s +++ b/data/overlays/actors/z_en_ge2.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel En_Ge2_InitVars .word 0x01860400, 0x00000019, 0x01670000, 0x0000030C .word EnGe2_Init diff --git a/data/overlays/actors/z_en_ge2.reloc.s b/data/overlays/actors/z_en_ge2.reloc.s index 848341210c..70829d6c15 100644 --- a/data/overlays/actors/z_en_ge2.reloc.s +++ b/data/overlays/actors/z_en_ge2.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_80A34440 -.incbin "baserom/ovl_En_Ge2", 0x1870, 0x000001E0 +.balign 16 + +glabel D_80A34440 + .incbin "baserom/ovl_En_Ge2", 0x1870, 0x000001E0 diff --git a/data/overlays/actors/z_en_ge3.data.s b/data/overlays/actors/z_en_ge3.data.s index f7b1fdbff7..4cdd41abd3 100644 --- a/data/overlays/actors/z_en_ge3.data.s +++ b/data/overlays/actors/z_en_ge3.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel En_Ge3_InitVars .word 0x01D00400, 0x00000019, 0x01690000, 0x00000314 .word EnGe3_Init diff --git a/data/overlays/actors/z_en_ge3.reloc.s b/data/overlays/actors/z_en_ge3.reloc.s index 33958d49aa..70a8f96e37 100644 --- a/data/overlays/actors/z_en_ge3.reloc.s +++ b/data/overlays/actors/z_en_ge3.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_80A35220 -.incbin "baserom/ovl_En_Ge3", 0xC00, 0x000000F0 +.balign 16 + +glabel D_80A35220 + .incbin "baserom/ovl_En_Ge3", 0xC00, 0x000000F0 diff --git a/data/overlays/actors/z_en_geldb.data.s b/data/overlays/actors/z_en_geldb.data.s index 2e0b363098..eb4fa15de5 100644 --- a/data/overlays/actors/z_en_geldb.data.s +++ b/data/overlays/actors/z_en_geldb.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel En_GeldB_InitVars .word 0x01970500, 0x00000015, 0x01690000, 0x000004E4 .word EnGeldB_Init diff --git a/data/overlays/actors/z_en_geldb.reloc.s b/data/overlays/actors/z_en_geldb.reloc.s index 9d85f492eb..aabd82e5a9 100644 --- a/data/overlays/actors/z_en_geldb.reloc.s +++ b/data/overlays/actors/z_en_geldb.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_80A3A2E0 -.incbin "baserom/ovl_En_GeldB", 0x4FD0, 0x00000470 +.balign 16 + +glabel D_80A3A2E0 + .incbin "baserom/ovl_En_GeldB", 0x4FD0, 0x00000470 diff --git a/data/overlays/actors/z_en_girla.data.s b/data/overlays/actors/z_en_girla.data.s index a9f30e441c..abd9751b8e 100644 --- a/data/overlays/actors/z_en_girla.data.s +++ b/data/overlays/actors/z_en_girla.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel En_GirlA_InitVars .word 0x00040600, 0x00000019, 0x00010000, 0x000001D4 .word EnGirlA_Init diff --git a/data/overlays/actors/z_en_girla.reloc.s b/data/overlays/actors/z_en_girla.reloc.s index 2bdfd2d6a2..3d571a1e2d 100644 --- a/data/overlays/actors/z_en_girla.reloc.s +++ b/data/overlays/actors/z_en_girla.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_80A3D150 -.incbin "baserom/ovl_En_GirlA", 0x2A00, 0x00000590 +.balign 16 + +glabel D_80A3D150 + .incbin "baserom/ovl_En_GirlA", 0x2A00, 0x00000590 diff --git a/data/overlays/actors/z_en_gm.data.s b/data/overlays/actors/z_en_gm.data.s index acff08c1c7..cde400712b 100644 --- a/data/overlays/actors/z_en_gm.data.s +++ b/data/overlays/actors/z_en_gm.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel En_Gm_InitVars .word 0x013D0400, 0x00000019, 0x00C90000, 0x000002D0 .word EnGm_Init diff --git a/data/overlays/actors/z_en_gm.reloc.s b/data/overlays/actors/z_en_gm.reloc.s index 00a72c1e55..6c22f1a5ba 100644 --- a/data/overlays/actors/z_en_gm.reloc.s +++ b/data/overlays/actors/z_en_gm.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_80A3E440 -.incbin "baserom/ovl_En_Gm", 0xD60, 0x00000130 +.balign 16 + +glabel D_80A3E440 + .incbin "baserom/ovl_En_Gm", 0xD60, 0x00000130 diff --git a/data/overlays/actors/z_en_go.data.s b/data/overlays/actors/z_en_go.data.s index f6e76265bb..c228d57452 100644 --- a/data/overlays/actors/z_en_go.data.s +++ b/data/overlays/actors/z_en_go.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel En_Go_InitVars .word 0x01520400, 0x00000039, 0x00C90000, 0x000006C8 .word EnGo_Init diff --git a/data/overlays/actors/z_en_go.reloc.s b/data/overlays/actors/z_en_go.reloc.s index d704b7d5c4..d5725ad277 100644 --- a/data/overlays/actors/z_en_go.reloc.s +++ b/data/overlays/actors/z_en_go.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_80A422E0 -.incbin "baserom/ovl_En_Go", 0x3D70, 0x00000A50 +.balign 16 + +glabel D_80A422E0 + .incbin "baserom/ovl_En_Go", 0x3D70, 0x00000A50 diff --git a/data/overlays/actors/z_en_go.rodata.s b/data/overlays/actors/z_en_go.rodata.s index 9f197e0ce5..db17029471 100644 --- a/data/overlays/actors/z_en_go.rodata.s +++ b/data/overlays/actors/z_en_go.rodata.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata +.balign 16 + glabel D_80A41C00 .asciz "../z_en_go.c" .balign 4 diff --git a/data/overlays/actors/z_en_go2.data.s b/data/overlays/actors/z_en_go2.data.s index 1413fd28bd..d9c22e6e89 100644 --- a/data/overlays/actors/z_en_go2.data.s +++ b/data/overlays/actors/z_en_go2.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel D_80A480D0 .word 0x040539B0, 0x040535B0, 0x040531B0, 0x04052DB0, 0x040529B0, 0x040525B0, 0x040521B0, 0x04051DB0 glabel D_80A480F0 diff --git a/data/overlays/actors/z_en_go2.reloc.s b/data/overlays/actors/z_en_go2.reloc.s index aa95be7c21..721d7674c5 100644 --- a/data/overlays/actors/z_en_go2.reloc.s +++ b/data/overlays/actors/z_en_go2.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_80A487E0 -.incbin "baserom/ovl_En_Go2", 0x5AB0, 0x000006E0 +.balign 16 + +glabel D_80A487E0 + .incbin "baserom/ovl_En_Go2", 0x5AB0, 0x000006E0 diff --git a/data/overlays/actors/z_en_go2.rodata.s b/data/overlays/actors/z_en_go2.rodata.s index e8a1010df7..3bb89e318e 100644 --- a/data/overlays/actors/z_en_go2.rodata.s +++ b/data/overlays/actors/z_en_go2.rodata.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata +.balign 16 + glabel D_80A48590 .asciz "../z_en_go2_eff.c" .balign 4 diff --git a/data/overlays/actors/z_en_goma.data.s b/data/overlays/actors/z_en_goma.data.s index 41b5a33e6e..4c57adfb1a 100644 --- a/data/overlays/actors/z_en_goma.data.s +++ b/data/overlays/actors/z_en_goma.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel En_Goma_InitVars .word 0x00280500, 0x00000035, 0x001E0000, 0x000003A4 .word EnGoma_Init diff --git a/data/overlays/actors/z_en_goma.reloc.s b/data/overlays/actors/z_en_goma.reloc.s index 789691a073..d3738fbd68 100644 --- a/data/overlays/actors/z_en_goma.reloc.s +++ b/data/overlays/actors/z_en_goma.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_80A4B990 -.incbin "baserom/ovl_En_Goma", 0x2AD0, 0x00000310 +.balign 16 + +glabel D_80A4B990 + .incbin "baserom/ovl_En_Goma", 0x2AD0, 0x00000310 diff --git a/data/overlays/actors/z_en_goroiwa.data.s b/data/overlays/actors/z_en_goroiwa.data.s index b492053b3b..74188d16d9 100644 --- a/data/overlays/actors/z_en_goroiwa.data.s +++ b/data/overlays/actors/z_en_goroiwa.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel En_Goroiwa_InitVars .word 0x01300600, 0x00000010, 0x011F0000, 0x000001D4 .word EnGoroiwa_Init diff --git a/data/overlays/actors/z_en_goroiwa.reloc.s b/data/overlays/actors/z_en_goroiwa.reloc.s index aefa8699fd..463ebef53f 100644 --- a/data/overlays/actors/z_en_goroiwa.reloc.s +++ b/data/overlays/actors/z_en_goroiwa.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_80A4E0B0 -.incbin "baserom/ovl_En_Goroiwa", 0x2410, 0x00000270 +.balign 16 + +glabel D_80A4E0B0 + .incbin "baserom/ovl_En_Goroiwa", 0x2410, 0x00000270 diff --git a/data/overlays/actors/z_en_gs.data.s b/data/overlays/actors/z_en_gs.data.s index e5f5eb7607..6e5bde282a 100644 --- a/data/overlays/actors/z_en_gs.data.s +++ b/data/overlays/actors/z_en_gs.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel En_Gs_InitVars .word 0x01B90600, 0x02000009, 0x01880000, 0x00000208 .word EnGs_Init diff --git a/data/overlays/actors/z_en_gs.reloc.s b/data/overlays/actors/z_en_gs.reloc.s index 1075937894..333e0c577e 100644 --- a/data/overlays/actors/z_en_gs.reloc.s +++ b/data/overlays/actors/z_en_gs.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_80A4FF60 -.incbin "baserom/ovl_En_Gs", 0x1C40, 0x000002C0 +.balign 16 + +glabel D_80A4FF60 + .incbin "baserom/ovl_En_Gs", 0x1C40, 0x000002C0 diff --git a/data/overlays/actors/z_en_hata.data.s b/data/overlays/actors/z_en_hata.data.s index 6cad53e59f..c41e363ad8 100644 --- a/data/overlays/actors/z_en_hata.data.s +++ b/data/overlays/actors/z_en_hata.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel En_Hata_InitVars .word 0x00260600, 0x00000000, 0x00760000, 0x0000027C .word EnHata_Init diff --git a/data/overlays/actors/z_en_hata.reloc.s b/data/overlays/actors/z_en_hata.reloc.s index da4fe033e7..748cd0e680 100644 --- a/data/overlays/actors/z_en_hata.reloc.s +++ b/data/overlays/actors/z_en_hata.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_80A51270 -.incbin "baserom/ovl_En_Hata", 0x520, 0x00000060 +.balign 16 + +glabel D_80A51270 + .incbin "baserom/ovl_En_Hata", 0x520, 0x00000060 diff --git a/data/overlays/actors/z_en_heishi1.data.s b/data/overlays/actors/z_en_heishi1.data.s index 2fbc3b05a6..611f5d845f 100644 --- a/data/overlays/actors/z_en_heishi1.data.s +++ b/data/overlays/actors/z_en_heishi1.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel D_80A527A0 .word 0x00000000 glabel En_Heishi1_InitVars diff --git a/data/overlays/actors/z_en_heishi1.reloc.s b/data/overlays/actors/z_en_heishi1.reloc.s index abb6696b51..b111ac72a6 100644 --- a/data/overlays/actors/z_en_heishi1.reloc.s +++ b/data/overlays/actors/z_en_heishi1.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_80A52C50 -.incbin "baserom/ovl_En_Heishi1", 0x1980, 0x00000250 +.balign 16 + +glabel D_80A52C50 + .incbin "baserom/ovl_En_Heishi1", 0x1980, 0x00000250 diff --git a/data/overlays/actors/z_en_heishi2.reloc.s b/data/overlays/actors/z_en_heishi2.reloc.s index b39002edad..46d4b241d2 100644 --- a/data/overlays/actors/z_en_heishi2.reloc.s +++ b/data/overlays/actors/z_en_heishi2.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_80A55310 -.incbin "baserom/ovl_En_Heishi2", 0x2470, 0x00000330 +.balign 16 + +glabel D_80A55310 + .incbin "baserom/ovl_En_Heishi2", 0x2470, 0x00000330 diff --git a/data/overlays/actors/z_en_heishi4.data.s b/data/overlays/actors/z_en_heishi4.data.s index 5b03a66b88..b51a355f3f 100644 --- a/data/overlays/actors/z_en_heishi4.data.s +++ b/data/overlays/actors/z_en_heishi4.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel En_Heishi4_InitVars .word 0x01780400, 0x00000009, 0x00970000, 0x00000308 .word EnHeishi4_Init diff --git a/data/overlays/actors/z_en_heishi4.reloc.s b/data/overlays/actors/z_en_heishi4.reloc.s index 926e12d5c2..355a318aa5 100644 --- a/data/overlays/actors/z_en_heishi4.reloc.s +++ b/data/overlays/actors/z_en_heishi4.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_80A570A0 -.incbin "baserom/ovl_En_Heishi4", 0xFD0, 0x00000160 +.balign 16 + +glabel D_80A570A0 + .incbin "baserom/ovl_En_Heishi4", 0xFD0, 0x00000160 diff --git a/data/overlays/actors/z_en_holl.data.s b/data/overlays/actors/z_en_holl.data.s index 6783542002..3f1498ac20 100644 --- a/data/overlays/actors/z_en_holl.data.s +++ b/data/overlays/actors/z_en_holl.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel En_Holl_InitVars .word 0x00230A00, 0x00000010, 0x00010000, 0x00000154 .word EnHoll_Init diff --git a/data/overlays/actors/z_en_holl.reloc.s b/data/overlays/actors/z_en_holl.reloc.s index 657e98a2b3..e37bbab8f4 100644 --- a/data/overlays/actors/z_en_holl.reloc.s +++ b/data/overlays/actors/z_en_holl.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_80A59B30 -.incbin "baserom/ovl_En_Holl", 0xF20, 0x00000100 +.balign 16 + +glabel D_80A59B30 + .incbin "baserom/ovl_En_Holl", 0xF20, 0x00000100 diff --git a/data/overlays/actors/z_en_honotrap.data.s b/data/overlays/actors/z_en_honotrap.data.s index f026da755a..9ed43fd79e 100644 --- a/data/overlays/actors/z_en_honotrap.data.s +++ b/data/overlays/actors/z_en_honotrap.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel En_Honotrap_InitVars .word 0x011C0600, 0x00000010, 0x00030000, 0x00000244 .word EnHonotrap_Init diff --git a/data/overlays/actors/z_en_honotrap.reloc.s b/data/overlays/actors/z_en_honotrap.reloc.s index 04fb70a00a..49748da240 100644 --- a/data/overlays/actors/z_en_honotrap.reloc.s +++ b/data/overlays/actors/z_en_honotrap.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_80A5B150 -.incbin "baserom/ovl_En_Honotrap", 0x1520, 0x000001A0 +.balign 16 + +glabel D_80A5B150 + .incbin "baserom/ovl_En_Honotrap", 0x1520, 0x000001A0 diff --git a/data/overlays/actors/z_en_horse.data.s b/data/overlays/actors/z_en_horse.data.s index 35ad7c8756..9b785c1009 100644 --- a/data/overlays/actors/z_en_horse.data.s +++ b/data/overlays/actors/z_en_horse.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel D_80A65E10 .word 0x06006D50, 0x06005584, 0x06004DEC, 0x06003CEC, 0x060075F0, 0x060032B0, 0x06001E2C, 0x06002470, 0x06002C38 glabel D_80A65E34 diff --git a/data/overlays/actors/z_en_horse.reloc.s b/data/overlays/actors/z_en_horse.reloc.s index 5fb9d42fdf..576b451c3f 100644 --- a/data/overlays/actors/z_en_horse.reloc.s +++ b/data/overlays/actors/z_en_horse.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_80A669E0 -.incbin "baserom/ovl_En_Horse", 0xB6F0, 0x00000B70 +.balign 16 + +glabel D_80A669E0 + .incbin "baserom/ovl_En_Horse", 0xB6F0, 0x00000B70 diff --git a/data/overlays/actors/z_en_horse_game_check.data.s b/data/overlays/actors/z_en_horse_game_check.data.s index 1e7077b06e..a5483cfc88 100644 --- a/data/overlays/actors/z_en_horse_game_check.data.s +++ b/data/overlays/actors/z_en_horse_game_check.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel En_Horse_Game_Check_InitVars .word 0x00DB0100, 0x00000010, 0x00010000, 0x000001A4 .word EnHorseGameCheck_Init diff --git a/data/overlays/actors/z_en_horse_game_check.reloc.s b/data/overlays/actors/z_en_horse_game_check.reloc.s index 7beede8bc8..39fc186220 100644 --- a/data/overlays/actors/z_en_horse_game_check.reloc.s +++ b/data/overlays/actors/z_en_horse_game_check.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_80A68580 -.incbin "baserom/ovl_En_Horse_Game_Check", 0x1030, 0x000000E0 +.balign 16 + +glabel D_80A68580 + .incbin "baserom/ovl_En_Horse_Game_Check", 0x1030, 0x000000E0 diff --git a/data/overlays/actors/z_en_horse_ganon.reloc.s b/data/overlays/actors/z_en_horse_ganon.reloc.s index b52649898c..97187dfe8a 100644 --- a/data/overlays/actors/z_en_horse_ganon.reloc.s +++ b/data/overlays/actors/z_en_horse_ganon.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_80A692E0 -.incbin "baserom/ovl_En_Horse_Ganon", 0xC80, 0x000000F0 +.balign 16 + +glabel D_80A692E0 + .incbin "baserom/ovl_En_Horse_Ganon", 0xC80, 0x000000F0 diff --git a/data/overlays/actors/z_en_horse_link_child.data.s b/data/overlays/actors/z_en_horse_link_child.data.s index 1d791539f3..dcdc1ea6ee 100644 --- a/data/overlays/actors/z_en_horse_link_child.data.s +++ b/data/overlays/actors/z_en_horse_link_child.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel En_Horse_Link_Child_InitVars .word 0x009A0100, 0x02000010, 0x00A00000, 0x000002A4 .word EnHorseLinkChild_Init diff --git a/data/overlays/actors/z_en_horse_link_child.reloc.s b/data/overlays/actors/z_en_horse_link_child.reloc.s index 3d1c02bbf5..edda1c1ce9 100644 --- a/data/overlays/actors/z_en_horse_link_child.reloc.s +++ b/data/overlays/actors/z_en_horse_link_child.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_80A6B000 -.incbin "baserom/ovl_En_Horse_Link_Child", 0x1C30, 0x00000250 +.balign 16 + +glabel D_80A6B000 + .incbin "baserom/ovl_En_Horse_Link_Child", 0x1C30, 0x00000250 diff --git a/data/overlays/actors/z_en_horse_normal.data.s b/data/overlays/actors/z_en_horse_normal.data.s index fa01222543..e64cbf9290 100644 --- a/data/overlays/actors/z_en_horse_normal.data.s +++ b/data/overlays/actors/z_en_horse_normal.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel En_Horse_Normal_InitVars .word 0x003C0100, 0x00000000, 0x00270000, 0x00000328 .word EnHorseNormal_Init diff --git a/data/overlays/actors/z_en_horse_normal.reloc.s b/data/overlays/actors/z_en_horse_normal.reloc.s index 4df9faef93..15e44ed031 100644 --- a/data/overlays/actors/z_en_horse_normal.reloc.s +++ b/data/overlays/actors/z_en_horse_normal.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_80A6D600 -.incbin "baserom/ovl_En_Horse_Normal", 0x23B0, 0x000002D0 +.balign 16 + +glabel D_80A6D600 + .incbin "baserom/ovl_En_Horse_Normal", 0x23B0, 0x000002D0 diff --git a/data/overlays/actors/z_en_horse_zelda.data.s b/data/overlays/actors/z_en_horse_zelda.data.s index bf4479a396..920ad01ec3 100644 --- a/data/overlays/actors/z_en_horse_zelda.data.s +++ b/data/overlays/actors/z_en_horse_zelda.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel En_Horse_Zelda_InitVars .word 0x005B0100, 0x00000010, 0x00460000, 0x000002A8 .word EnHorseZelda_Init diff --git a/data/overlays/actors/z_en_horse_zelda.reloc.s b/data/overlays/actors/z_en_horse_zelda.reloc.s index fc270382b0..368348db13 100644 --- a/data/overlays/actors/z_en_horse_zelda.reloc.s +++ b/data/overlays/actors/z_en_horse_zelda.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_80A6E2D0 -.incbin "baserom/ovl_En_Horse_Zelda", 0xA00, 0x000000D0 +.balign 16 + +glabel D_80A6E2D0 + .incbin "baserom/ovl_En_Horse_Zelda", 0xA00, 0x000000D0 diff --git a/data/overlays/actors/z_en_hs.data.s b/data/overlays/actors/z_en_hs.data.s index 25f3f9b5a1..48da53fc8c 100644 --- a/data/overlays/actors/z_en_hs.data.s +++ b/data/overlays/actors/z_en_hs.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel En_Hs_InitVars .word 0x013F0400, 0x00000009, 0x01280000, 0x000002B0 .word EnHs_Init diff --git a/data/overlays/actors/z_en_hs.reloc.s b/data/overlays/actors/z_en_hs.reloc.s index 45de7a4364..20b4da47b3 100644 --- a/data/overlays/actors/z_en_hs.reloc.s +++ b/data/overlays/actors/z_en_hs.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_80A6EE80 -.incbin "baserom/ovl_En_Hs", 0xAE0, 0x00000120 +.balign 16 + +glabel D_80A6EE80 + .incbin "baserom/ovl_En_Hs", 0xAE0, 0x00000120 diff --git a/data/overlays/actors/z_en_hs2.data.s b/data/overlays/actors/z_en_hs2.data.s index 0d83b6b131..43daa8c3e7 100644 --- a/data/overlays/actors/z_en_hs2.data.s +++ b/data/overlays/actors/z_en_hs2.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel En_Hs2_InitVars .word 0x01A60400, 0x00000009, 0x01280000, 0x000002B0 .word EnHs2_Init diff --git a/data/overlays/actors/z_en_hs2.reloc.s b/data/overlays/actors/z_en_hs2.reloc.s index eaa00158d2..4d8dde3762 100644 --- a/data/overlays/actors/z_en_hs2.reloc.s +++ b/data/overlays/actors/z_en_hs2.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_80A6F520 -.incbin "baserom/ovl_En_Hs2", 0x580, 0x00000090 +.balign 16 + +glabel D_80A6F520 + .incbin "baserom/ovl_En_Hs2", 0x580, 0x00000090 diff --git a/data/overlays/actors/z_en_hy.data.s b/data/overlays/actors/z_en_hy.data.s index a1627e86c2..6a044e2501 100644 --- a/data/overlays/actors/z_en_hy.data.s +++ b/data/overlays/actors/z_en_hy.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel En_Hy_InitVars .word 0x016E0400, 0x00000019, 0x00010000, 0x00000334 .word EnHy_Init diff --git a/data/overlays/actors/z_en_hy.reloc.s b/data/overlays/actors/z_en_hy.reloc.s index e5d4fedc1f..819fca69b9 100644 --- a/data/overlays/actors/z_en_hy.reloc.s +++ b/data/overlays/actors/z_en_hy.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_80A72AF0 -.incbin "baserom/ovl_En_Hy", 0x3540, 0x00000500 +.balign 16 + +glabel D_80A72AF0 + .incbin "baserom/ovl_En_Hy", 0x3540, 0x00000500 diff --git a/data/overlays/actors/z_en_ice_hono.data.s b/data/overlays/actors/z_en_ice_hono.data.s index f95cc252c1..f813a9458a 100644 --- a/data/overlays/actors/z_en_ice_hono.data.s +++ b/data/overlays/actors/z_en_ice_hono.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel En_Ice_Hono_InitVars .word 0x00F00700, 0x00000000, 0x00010000, 0x000001BC .word EnIceHono_Init diff --git a/data/overlays/actors/z_en_ice_hono.reloc.s b/data/overlays/actors/z_en_ice_hono.reloc.s index 33ffe94aae..a4c4c8cdb4 100644 --- a/data/overlays/actors/z_en_ice_hono.reloc.s +++ b/data/overlays/actors/z_en_ice_hono.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_80A74180 -.incbin "baserom/ovl_En_Ice_Hono", 0x1190, 0x00000190 +.balign 16 + +glabel D_80A74180 + .incbin "baserom/ovl_En_Ice_Hono", 0x1190, 0x00000190 diff --git a/data/overlays/actors/z_en_ik.bss.s b/data/overlays/actors/z_en_ik.bss.s index 2803d618f1..11e3e66f0c 100644 --- a/data/overlays/actors/z_en_ik.bss.s +++ b/data/overlays/actors/z_en_ik.bss.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers -.bss +.section .bss + +.balign 16 glabel D_80A78FA0 .space 0x10 diff --git a/data/overlays/actors/z_en_ik.data.s b/data/overlays/actors/z_en_ik.data.s index cf12b34f89..6c5051eba8 100644 --- a/data/overlays/actors/z_en_ik.data.s +++ b/data/overlays/actors/z_en_ik.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel D_80A78340 .word 0x0A000939, 0x20010000, 0x00000000, 0x00000000, 0x00000000, 0xFFCFFFFF, 0x00000000, 0x00050100, 0x00190050, 0x00000000, 0x00000000 glabel D_80A7836C diff --git a/data/overlays/actors/z_en_ik.reloc.s b/data/overlays/actors/z_en_ik.reloc.s index a1e6c30dee..e1d4a256e8 100644 --- a/data/overlays/actors/z_en_ik.reloc.s +++ b/data/overlays/actors/z_en_ik.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_80A78A80 -.incbin "baserom/ovl_En_Ik", 0x4770, 0x00000520 +.balign 16 + +glabel D_80A78A80 + .incbin "baserom/ovl_En_Ik", 0x4770, 0x00000520 diff --git a/data/overlays/actors/z_en_in.data.s b/data/overlays/actors/z_en_in.data.s index 816b379bb1..1158dc9df4 100644 --- a/data/overlays/actors/z_en_in.data.s +++ b/data/overlays/actors/z_en_in.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel En_In_InitVars .word 0x00CB0400, 0x00000019, 0x00C00000, 0x000003A8 .word EnIn_Init diff --git a/data/overlays/actors/z_en_in.reloc.s b/data/overlays/actors/z_en_in.reloc.s index c966351df7..fb211f73c2 100644 --- a/data/overlays/actors/z_en_in.reloc.s +++ b/data/overlays/actors/z_en_in.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_80A7BB00 -.incbin "baserom/ovl_En_In", 0x2B50, 0x00000320 +.balign 16 + +glabel D_80A7BB00 + .incbin "baserom/ovl_En_In", 0x2B50, 0x00000320 diff --git a/data/overlays/actors/z_en_insect.data.s b/data/overlays/actors/z_en_insect.data.s index 0f7821e575..6e68f44780 100644 --- a/data/overlays/actors/z_en_insect.data.s +++ b/data/overlays/actors/z_en_insect.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel D_80A7DEB0 .word 0x00000000 glabel D_80A7DEB4 diff --git a/data/overlays/actors/z_en_insect.reloc.s b/data/overlays/actors/z_en_insect.reloc.s index 27129423d6..a825ed25d7 100644 --- a/data/overlays/actors/z_en_insect.reloc.s +++ b/data/overlays/actors/z_en_insect.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_80A7E0B0 -.incbin "baserom/ovl_En_Insect", 0x2290, 0x000003B0 +.balign 16 + +glabel D_80A7E0B0 + .incbin "baserom/ovl_En_Insect", 0x2290, 0x000003B0 diff --git a/data/overlays/actors/z_en_ishi.data.s b/data/overlays/actors/z_en_ishi.data.s index c9a2ea93ca..ca0ec20ffc 100644 --- a/data/overlays/actors/z_en_ishi.data.s +++ b/data/overlays/actors/z_en_ishi.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel D_80A7F9F0 .word 0x00000000 glabel D_80A7F9F4 diff --git a/data/overlays/actors/z_en_ishi.reloc.s b/data/overlays/actors/z_en_ishi.reloc.s index a6dc1967a2..c3dae904ba 100644 --- a/data/overlays/actors/z_en_ishi.reloc.s +++ b/data/overlays/actors/z_en_ishi.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_80A87480 -.incbin "baserom/ovl_En_Ishi", 0x9020, 0x00000200 +.balign 16 + +glabel D_80A87480 + .incbin "baserom/ovl_En_Ishi", 0x9020, 0x00000200 diff --git a/data/overlays/actors/z_en_jj.data.s b/data/overlays/actors/z_en_jj.data.s index 3615d2a6f1..b3af822e43 100644 --- a/data/overlays/actors/z_en_jj.data.s +++ b/data/overlays/actors/z_en_jj.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel En_Jj_InitVars .word 0x005A0700, 0x00000030, 0x00400000, 0x00000314 .word EnJj_Init diff --git a/data/overlays/actors/z_en_jj.reloc.s b/data/overlays/actors/z_en_jj.reloc.s index 7f30ac8d7c..a9a413cfab 100644 --- a/data/overlays/actors/z_en_jj.reloc.s +++ b/data/overlays/actors/z_en_jj.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_80A88D40 -.incbin "baserom/ovl_En_Jj", 0x1540, 0x000000D0 +.balign 16 + +glabel D_80A88D40 + .incbin "baserom/ovl_En_Jj", 0x1540, 0x000000D0 diff --git a/data/overlays/actors/z_en_js.data.s b/data/overlays/actors/z_en_js.data.s index 6a8842eaef..d037dc48f0 100644 --- a/data/overlays/actors/z_en_js.data.s +++ b/data/overlays/actors/z_en_js.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel En_Js_InitVars .word 0x016A0400, 0x00000009, 0x01440000, 0x00000290 .word EnJs_Init diff --git a/data/overlays/actors/z_en_js.reloc.s b/data/overlays/actors/z_en_js.reloc.s index e0c7603172..ddfa38a4a4 100644 --- a/data/overlays/actors/z_en_js.reloc.s +++ b/data/overlays/actors/z_en_js.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_80A896F0 -.incbin "baserom/ovl_En_Js", 0x8E0, 0x000000B0 +.balign 16 + +glabel D_80A896F0 + .incbin "baserom/ovl_En_Js", 0x8E0, 0x000000B0 diff --git a/data/overlays/actors/z_en_jsjutan.bss.s b/data/overlays/actors/z_en_jsjutan.bss.s index 74379300fa..d0a19ff6e3 100644 --- a/data/overlays/actors/z_en_jsjutan.bss.s +++ b/data/overlays/actors/z_en_jsjutan.bss.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers -.bss +.section .bss + +.balign 16 glabel D_80A8E610 .space 0x800 diff --git a/data/overlays/actors/z_en_jsjutan.data.s b/data/overlays/actors/z_en_jsjutan.data.s index 8ff38a9a0a..b290295b44 100644 --- a/data/overlays/actors/z_en_jsjutan.data.s +++ b/data/overlays/actors/z_en_jsjutan.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel En_Jsjutan_InitVars .word 0x016B0400, 0x00000009, 0x00010000, 0x00000178 .word EnJsjutan_Init diff --git a/data/overlays/actors/z_en_jsjutan.reloc.s b/data/overlays/actors/z_en_jsjutan.reloc.s index 64ff8a19d5..845f2a10ed 100644 --- a/data/overlays/actors/z_en_jsjutan.reloc.s +++ b/data/overlays/actors/z_en_jsjutan.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_80A8E4B0 -.incbin "baserom/ovl_En_Jsjutan", 0x4D10, 0x00000160 +.balign 16 + +glabel D_80A8E4B0 + .incbin "baserom/ovl_En_Jsjutan", 0x4D10, 0x00000160 diff --git a/data/overlays/actors/z_en_kakasi.data.s b/data/overlays/actors/z_en_kakasi.data.s index 8b53c17fb3..aef12a0d13 100644 --- a/data/overlays/actors/z_en_kakasi.data.s +++ b/data/overlays/actors/z_en_kakasi.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel D_80A8FDE0 .word 0x0A000039, 0x20010000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00040100, 0x00140046, 0x00000000, 0x00000000 glabel En_Kakasi_InitVars diff --git a/data/overlays/actors/z_en_kakasi.reloc.s b/data/overlays/actors/z_en_kakasi.reloc.s index 37832c3236..8f1179d229 100644 --- a/data/overlays/actors/z_en_kakasi.reloc.s +++ b/data/overlays/actors/z_en_kakasi.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_80A8FF10 -.incbin "baserom/ovl_En_Kakasi", 0xDA0, 0x00000100 +.balign 16 + +glabel D_80A8FF10 + .incbin "baserom/ovl_En_Kakasi", 0xDA0, 0x00000100 diff --git a/data/overlays/actors/z_en_kakasi2.data.s b/data/overlays/actors/z_en_kakasi2.data.s index 555b298303..ea940b5c0d 100644 --- a/data/overlays/actors/z_en_kakasi2.data.s +++ b/data/overlays/actors/z_en_kakasi2.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel D_80A909A0 .word 0x0A000939, 0x20010000, 0x00000000, 0xFFCFFFFF, 0x00000000, 0xFFCFFFFF, 0x00000000, 0x00050100, 0x00140046, 0x00000000, 0x00000000 glabel En_Kakasi2_InitVars diff --git a/data/overlays/actors/z_en_kakasi2.reloc.s b/data/overlays/actors/z_en_kakasi2.reloc.s index 4163a6a044..ffe0e8db0e 100644 --- a/data/overlays/actors/z_en_kakasi2.reloc.s +++ b/data/overlays/actors/z_en_kakasi2.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_80A90C20 -.incbin "baserom/ovl_En_Kakasi2", 0xC10, 0x00000100 +.balign 16 + +glabel D_80A90C20 + .incbin "baserom/ovl_En_Kakasi2", 0xC10, 0x00000100 diff --git a/data/overlays/actors/z_en_kakasi3.data.s b/data/overlays/actors/z_en_kakasi3.data.s index f3a28d2021..ebd367bcb0 100644 --- a/data/overlays/actors/z_en_kakasi3.data.s +++ b/data/overlays/actors/z_en_kakasi3.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel D_80A91D10 .word 0x0A000939, 0x20010000, 0x00000000, 0xFFCFFFFF, 0x00000000, 0xFFCFFFFF, 0x00000000, 0x00050100, 0x00140046, 0x00000000, 0x00000000 glabel En_Kakasi3_InitVars diff --git a/data/overlays/actors/z_en_kakasi3.reloc.s b/data/overlays/actors/z_en_kakasi3.reloc.s index 0fb3643bcf..b3e019ccdb 100644 --- a/data/overlays/actors/z_en_kakasi3.reloc.s +++ b/data/overlays/actors/z_en_kakasi3.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_80A91E60 -.incbin "baserom/ovl_En_Kakasi3", 0x1140, 0x00000140 +.balign 16 + +glabel D_80A91E60 + .incbin "baserom/ovl_En_Kakasi3", 0x1140, 0x00000140 diff --git a/data/overlays/actors/z_en_kanban.data.s b/data/overlays/actors/z_en_kanban.data.s index 02e460f8da..b1ece5d452 100644 --- a/data/overlays/actors/z_en_kanban.data.s +++ b/data/overlays/actors/z_en_kanban.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel En_Kanban_InitVars .word 0x01410600, 0x00000019, 0x012F0000, 0x000001EC .word EnKanban_Init diff --git a/data/overlays/actors/z_en_kanban.reloc.s b/data/overlays/actors/z_en_kanban.reloc.s index e89eb9fbe1..448011fd89 100644 --- a/data/overlays/actors/z_en_kanban.reloc.s +++ b/data/overlays/actors/z_en_kanban.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_80A95140 -.incbin "baserom/ovl_En_Kanban", 0x31A0, 0x00000210 +.balign 16 + +glabel D_80A95140 + .incbin "baserom/ovl_En_Kanban", 0x31A0, 0x00000210 diff --git a/data/overlays/actors/z_en_karebaba.data.s b/data/overlays/actors/z_en_karebaba.data.s index e41bdbd23a..ed3446926d 100644 --- a/data/overlays/actors/z_en_karebaba.data.s +++ b/data/overlays/actors/z_en_karebaba.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel En_Karebaba_InitVars .word 0x00C70500, 0x00000005, 0x00390000, 0x00000290 .word EnKarebaba_Init diff --git a/data/overlays/actors/z_en_karebaba.reloc.s b/data/overlays/actors/z_en_karebaba.reloc.s index 3f8af99717..e04d8bb408 100644 --- a/data/overlays/actors/z_en_karebaba.reloc.s +++ b/data/overlays/actors/z_en_karebaba.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_80A96B80 -.incbin "baserom/ovl_En_Karebaba", 0x1830, 0x00000230 +.balign 16 + +glabel D_80A96B80 + .incbin "baserom/ovl_En_Karebaba", 0x1830, 0x00000230 diff --git a/data/overlays/actors/z_en_ko.data.s b/data/overlays/actors/z_en_ko.data.s index 7e6605a7ab..ce0e448550 100644 --- a/data/overlays/actors/z_en_ko.data.s +++ b/data/overlays/actors/z_en_ko.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel En_Ko_InitVars .word 0x01630400, 0x00000019, 0x00010000, 0x00000324 .word EnKo_Init diff --git a/data/overlays/actors/z_en_ko.reloc.s b/data/overlays/actors/z_en_ko.reloc.s index e6ba64513a..77dcc181d6 100644 --- a/data/overlays/actors/z_en_ko.reloc.s +++ b/data/overlays/actors/z_en_ko.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_80A9A9E0 -.incbin "baserom/ovl_En_Ko", 0x3C30, 0x000005C0 +.balign 16 + +glabel D_80A9A9E0 + .incbin "baserom/ovl_En_Ko", 0x3C30, 0x000005C0 diff --git a/data/overlays/actors/z_en_ko.rodata.s b/data/overlays/actors/z_en_ko.rodata.s index b683cd5f26..0d21468e99 100644 --- a/data/overlays/actors/z_en_ko.rodata.s +++ b/data/overlays/actors/z_en_ko.rodata.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata +.balign 16 + glabel D_80A9A780 .asciz " アングルＺ->(%d)\n" .balign 4 diff --git a/data/overlays/actors/z_en_kusa.data.s b/data/overlays/actors/z_en_kusa.data.s index 2f8bfa6330..615a7629b5 100644 --- a/data/overlays/actors/z_en_kusa.data.s +++ b/data/overlays/actors/z_en_kusa.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel D_80A9C1D0 .word 0x00000000 glabel D_80A9C1D4 diff --git a/data/overlays/actors/z_en_kusa.reloc.s b/data/overlays/actors/z_en_kusa.reloc.s index f8555a4ebc..9a85f7908e 100644 --- a/data/overlays/actors/z_en_kusa.reloc.s +++ b/data/overlays/actors/z_en_kusa.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_80A9C340 -.incbin "baserom/ovl_En_Kusa", 0x13A0, 0x00000210 +.balign 16 + +glabel D_80A9C340 + .incbin "baserom/ovl_En_Kusa", 0x13A0, 0x00000210 diff --git a/data/overlays/actors/z_en_kz.data.s b/data/overlays/actors/z_en_kz.data.s index b61a0991fd..22d1f76a0c 100644 --- a/data/overlays/actors/z_en_kz.data.s +++ b/data/overlays/actors/z_en_kz.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel En_Kz_InitVars .word 0x01640400, 0x00000009, 0x00FF0000, 0x000002D8 .word EnKz_Init diff --git a/data/overlays/actors/z_en_kz.reloc.s b/data/overlays/actors/z_en_kz.reloc.s index 7af3785a1d..fd7f72243e 100644 --- a/data/overlays/actors/z_en_kz.reloc.s +++ b/data/overlays/actors/z_en_kz.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_80A9D9D0 -.incbin "baserom/ovl_En_Kz", 0x1480, 0x00000170 +.balign 16 + +glabel D_80A9D9D0 + .incbin "baserom/ovl_En_Kz", 0x1480, 0x00000170 diff --git a/data/overlays/actors/z_en_light.data.s b/data/overlays/actors/z_en_light.data.s index 7da7f314ea..d64d8a47b2 100644 --- a/data/overlays/actors/z_en_light.data.s +++ b/data/overlays/actors/z_en_light.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel En_Light_InitVars .word 0x00080700, 0x00000000, 0x00010000, 0x00000164 .word EnLight_Init diff --git a/data/overlays/actors/z_en_light.reloc.s b/data/overlays/actors/z_en_light.reloc.s index 674c56adbc..d54e1afaf4 100644 --- a/data/overlays/actors/z_en_light.reloc.s +++ b/data/overlays/actors/z_en_light.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_80A9E920 -.incbin "baserom/ovl_En_Light", 0xDE0, 0x000000B0 +.balign 16 + +glabel D_80A9E920 + .incbin "baserom/ovl_En_Light", 0xDE0, 0x000000B0 diff --git a/data/overlays/actors/z_en_m_thunder.data.s b/data/overlays/actors/z_en_m_thunder.data.s index c42a53d7e6..4f2aab6404 100644 --- a/data/overlays/actors/z_en_m_thunder.data.s +++ b/data/overlays/actors/z_en_m_thunder.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel En_M_Thunder_InitVars .word 0x00570700, 0x00000000, 0x00010000, 0x000001CC .word EnMThunder_Init diff --git a/data/overlays/actors/z_en_m_thunder.reloc.s b/data/overlays/actors/z_en_m_thunder.reloc.s index 40f4a52676..e578ca8dbb 100644 --- a/data/overlays/actors/z_en_m_thunder.reloc.s +++ b/data/overlays/actors/z_en_m_thunder.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_80AA0530 -.incbin "baserom/ovl_En_M_Thunder", 0x1550, 0x00000160 +.balign 16 + +glabel D_80AA0530 + .incbin "baserom/ovl_En_M_Thunder", 0x1550, 0x00000160 diff --git a/data/overlays/actors/z_en_mag.data.s b/data/overlays/actors/z_en_mag.data.s index faf0772b13..89fd339ab2 100644 --- a/data/overlays/actors/z_en_mag.data.s +++ b/data/overlays/actors/z_en_mag.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel En_Mag_InitVars .word 0x01710600, 0x00000030, 0x014A0000, 0x0000E328 .word EnMag_Init diff --git a/data/overlays/actors/z_en_mag.reloc.s b/data/overlays/actors/z_en_mag.reloc.s index 5c00df56a4..4a6e6e2928 100644 --- a/data/overlays/actors/z_en_mag.reloc.s +++ b/data/overlays/actors/z_en_mag.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_80AA5F40 -.incbin "baserom/ovl_En_Mag", 0x2440, 0x00000110 +.balign 16 + +glabel D_80AA5F40 + .incbin "baserom/ovl_En_Mag", 0x2440, 0x00000110 diff --git a/data/overlays/actors/z_en_mb.data.s b/data/overlays/actors/z_en_mb.data.s index b62c336746..f294c97b5c 100644 --- a/data/overlays/actors/z_en_mb.data.s +++ b/data/overlays/actors/z_en_mb.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel En_Mb_InitVars .word 0x004B0500, 0x00000015, 0x00300000, 0x0000050C .word EnMb_Init diff --git a/data/overlays/actors/z_en_mb.reloc.s b/data/overlays/actors/z_en_mb.reloc.s index 31f8833297..9d2482dba4 100644 --- a/data/overlays/actors/z_en_mb.reloc.s +++ b/data/overlays/actors/z_en_mb.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_80AA9F00 -.incbin "baserom/ovl_En_Mb", 0x3EB0, 0x00000350 +.balign 16 + +glabel D_80AA9F00 + .incbin "baserom/ovl_En_Mb", 0x3EB0, 0x00000350 diff --git a/data/overlays/actors/z_en_md.data.s b/data/overlays/actors/z_en_md.data.s index dcce07c54c..7df6878e72 100644 --- a/data/overlays/actors/z_en_md.data.s +++ b/data/overlays/actors/z_en_md.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel En_Md_InitVars .word 0x016D0400, 0x02000019, 0x00FB0000, 0x00000324 .word EnMd_Init diff --git a/data/overlays/actors/z_en_md.reloc.s b/data/overlays/actors/z_en_md.reloc.s index f8b07f90b0..b62098aeb1 100644 --- a/data/overlays/actors/z_en_md.reloc.s +++ b/data/overlays/actors/z_en_md.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_80AAC5A0 -.incbin "baserom/ovl_En_Md", 0x2350, 0x00000360 +.balign 16 + +glabel D_80AAC5A0 + .incbin "baserom/ovl_En_Md", 0x2350, 0x00000360 diff --git a/data/overlays/actors/z_en_mk.data.s b/data/overlays/actors/z_en_mk.data.s index 3efa5a4e67..834fa7f19b 100644 --- a/data/overlays/actors/z_en_mk.data.s +++ b/data/overlays/actors/z_en_mk.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel En_Mk_InitVars .word 0x014A0400, 0x00000019, 0x01320000, 0x00000288 .word EnMk_Init diff --git a/data/overlays/actors/z_en_mk.reloc.s b/data/overlays/actors/z_en_mk.reloc.s index f24bb739f3..95e713957b 100644 --- a/data/overlays/actors/z_en_mk.reloc.s +++ b/data/overlays/actors/z_en_mk.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_80AAD670 -.incbin "baserom/ovl_En_Mk", 0xD70, 0x00000100 +.balign 16 + +glabel D_80AAD670 + .incbin "baserom/ovl_En_Mk", 0xD70, 0x00000100 diff --git a/data/overlays/actors/z_en_mm.data.s b/data/overlays/actors/z_en_mm.data.s index ec5a8af476..91312ba0d9 100644 --- a/data/overlays/actors/z_en_mm.data.s +++ b/data/overlays/actors/z_en_mm.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel En_Mm_InitVars .word 0x01620400, 0x00000019, 0x013C0000, 0x00000320 .word EnMm_Init diff --git a/data/overlays/actors/z_en_mm.reloc.s b/data/overlays/actors/z_en_mm.reloc.s index ddd75fff8f..e17bb9e99d 100644 --- a/data/overlays/actors/z_en_mm.reloc.s +++ b/data/overlays/actors/z_en_mm.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_80AAECA0 -.incbin "baserom/ovl_En_Mm", 0x1530, 0x000001B0 +.balign 16 + +glabel D_80AAECA0 + .incbin "baserom/ovl_En_Mm", 0x1530, 0x000001B0 diff --git a/data/overlays/actors/z_en_mm2.data.s b/data/overlays/actors/z_en_mm2.data.s index c3946476da..49891a9e94 100644 --- a/data/overlays/actors/z_en_mm2.data.s +++ b/data/overlays/actors/z_en_mm2.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel En_Mm2_InitVars .word 0x01D40400, 0x00000019, 0x013C0000, 0x000002BC .word EnMm2_Init diff --git a/data/overlays/actors/z_en_mm2.reloc.s b/data/overlays/actors/z_en_mm2.reloc.s index 92c9af1d59..6c7f59ea0e 100644 --- a/data/overlays/actors/z_en_mm2.reloc.s +++ b/data/overlays/actors/z_en_mm2.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_80AAFC10 -.incbin "baserom/ovl_En_Mm2", 0xDC0, 0x00000110 +.balign 16 + +glabel D_80AAFC10 + .incbin "baserom/ovl_En_Mm2", 0xDC0, 0x00000110 diff --git a/data/overlays/actors/z_en_mu.data.s b/data/overlays/actors/z_en_mu.data.s index 735e6c48a1..3aa16920df 100644 --- a/data/overlays/actors/z_en_mu.data.s +++ b/data/overlays/actors/z_en_mu.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel D_80AB0BD0 .word 0x0A000039, 0x20010000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000100, 0x00640046, 0x00000000, 0x00000000 glabel D_80AB0BFC diff --git a/data/overlays/actors/z_en_mu.reloc.s b/data/overlays/actors/z_en_mu.reloc.s index 71d7aa48b6..a88ae1770a 100644 --- a/data/overlays/actors/z_en_mu.reloc.s +++ b/data/overlays/actors/z_en_mu.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_80AB0CC0 -.incbin "baserom/ovl_En_Mu", 0x8A0, 0x000000D0 +.balign 16 + +glabel D_80AB0CC0 + .incbin "baserom/ovl_En_Mu", 0x8A0, 0x000000D0 diff --git a/data/overlays/actors/z_en_nb.data.s b/data/overlays/actors/z_en_nb.data.s index 486e7f813d..361eb593c5 100644 --- a/data/overlays/actors/z_en_nb.data.s +++ b/data/overlays/actors/z_en_nb.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel D_80AB42E0 .word 0x00000009, 0x01000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000100, 0x00190050, 0x00000000, 0x00000000 glabel D_80AB430C diff --git a/data/overlays/actors/z_en_nb.reloc.s b/data/overlays/actors/z_en_nb.reloc.s index ee1a3f300a..cd54c9f702 100644 --- a/data/overlays/actors/z_en_nb.reloc.s +++ b/data/overlays/actors/z_en_nb.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_80AB5260 -.incbin "baserom/ovl_En_Nb", 0x44D0, 0x00000520 +.balign 16 + +glabel D_80AB5260 + .incbin "baserom/ovl_En_Nb", 0x44D0, 0x00000520 diff --git a/data/overlays/actors/z_en_niw.data.s b/data/overlays/actors/z_en_niw.data.s index 492909cd41..9f0af35112 100644 --- a/data/overlays/actors/z_en_niw.data.s +++ b/data/overlays/actors/z_en_niw.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel D_80AB85E0 .word 0x00000000 glabel En_Niw_InitVars diff --git a/data/overlays/actors/z_en_niw.reloc.s b/data/overlays/actors/z_en_niw.reloc.s index d16bb3afa0..2146bab749 100644 --- a/data/overlays/actors/z_en_niw.reloc.s +++ b/data/overlays/actors/z_en_niw.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_80AB8B20 -.incbin "baserom/ovl_En_Niw", 0x33A0, 0x00000460 +.balign 16 + +glabel D_80AB8B20 + .incbin "baserom/ovl_En_Niw", 0x33A0, 0x00000460 diff --git a/data/overlays/actors/z_en_niw.rodata.s b/data/overlays/actors/z_en_niw.rodata.s index 43114ed212..58b87513da 100644 --- a/data/overlays/actors/z_en_niw.rodata.s +++ b/data/overlays/actors/z_en_niw.rodata.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata +.balign 16 + glabel D_80AB8720 .asciz "☆☆☆☆☆ もういてる原 Ver.1 ☆☆☆☆☆ \n" .balign 4 @@ -19,14 +21,10 @@ glabel D_80AB8788 .asciz " 通常鶏index %d\n" .balign 4 -.balign 4 - glabel D_80AB87A4 .asciz "☆☆☆☆☆ どんな奴？ ☆☆☆☆☆ %d\n" .balign 4 -.balign 4 - glabel D_80AB87D4 .asciz "\n\n" .balign 4 @@ -39,68 +37,46 @@ glabel D_80AB87DC .asciz " ☆☆☆☆☆ 発生できず ☆☆☆☆☆ \n" .balign 4 -.balign 4 - glabel D_80AB880C .asciz "☆☆☆☆☆ 上下？ ☆☆☆☆☆ %f\n" .balign 4 -.balign 4 - glabel D_80AB8838 .asciz "☆☆☆☆☆ 範囲外Ｘ！ ☆☆☆☆☆ %f\n" .balign 4 -.balign 4 - glabel D_80AB8868 .asciz "☆☆☆☆☆ 範囲外Ｙ！ ☆☆☆☆☆ %f\n" .balign 4 -.balign 4 - glabel D_80AB8898 .asciz "☆☆☆☆☆ 範囲外Ｚ！ ☆☆☆☆☆ %f\n" .balign 4 -.balign 4 - glabel D_80AB88C8 .asciz "☆☆☆☆☆ セットＸ！ ☆☆☆☆☆ %f\n" .balign 4 -.balign 4 - glabel D_80AB88F8 .asciz "☆☆☆☆☆ セットＹ！ ☆☆☆☆☆ %f\n" .balign 4 -.balign 4 - glabel D_80AB8928 .asciz "☆☆☆☆☆ セットＺ！ ☆☆☆☆☆ %f\n" .balign 4 -.balign 4 - glabel D_80AB8958 .asciz "☆☆☆☆☆ 修整後Ｘ！ ☆☆☆☆☆ %f\n" .balign 4 -.balign 4 - glabel D_80AB8988 .asciz "☆☆☆☆☆ 修整後Ｙ！ ☆☆☆☆☆ %f\n" .balign 4 -.balign 4 - glabel D_80AB89B8 .asciz "☆☆☆☆☆ 修整後Ｚ！ ☆☆☆☆☆ %f\n" .balign 4 -.balign 4 - glabel D_80AB89E8 .asciz "\n\n" .balign 4 @@ -113,8 +89,6 @@ glabel D_80AB89F0 .asciz "☆☆☆☆☆ ぶくぶく ☆☆☆☆☆ \n" .balign 4 -.balign 4 - glabel D_80AB8A1C .asciz "\n\n" .balign 4 diff --git a/data/overlays/actors/z_en_niw_girl.data.s b/data/overlays/actors/z_en_niw_girl.data.s index 5840a6a62d..2b4271a25e 100644 --- a/data/overlays/actors/z_en_niw_girl.data.s +++ b/data/overlays/actors/z_en_niw_girl.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel En_Niw_Girl_InitVars .word 0x019A0400, 0x00000019, 0x016A0000, 0x000002FC .word EnNiwGirl_Init diff --git a/data/overlays/actors/z_en_niw_girl.reloc.s b/data/overlays/actors/z_en_niw_girl.reloc.s index 4b197df082..69c505c816 100644 --- a/data/overlays/actors/z_en_niw_girl.reloc.s +++ b/data/overlays/actors/z_en_niw_girl.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_80AB9B40 -.incbin "baserom/ovl_En_Niw_Girl", 0xBC0, 0x00000100 +.balign 16 + +glabel D_80AB9B40 + .incbin "baserom/ovl_En_Niw_Girl", 0xBC0, 0x00000100 diff --git a/data/overlays/actors/z_en_niw_lady.data.s b/data/overlays/actors/z_en_niw_lady.data.s index eaf0dc9954..0b887d0885 100644 --- a/data/overlays/actors/z_en_niw_lady.data.s +++ b/data/overlays/actors/z_en_niw_lady.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel En_Niw_Lady_InitVars .word 0x013C0400, 0x00000019, 0x01100000, 0x000002FC .word EnNiwLady_Init diff --git a/data/overlays/actors/z_en_niw_lady.reloc.s b/data/overlays/actors/z_en_niw_lady.reloc.s index fc2331c261..d945be5bdb 100644 --- a/data/overlays/actors/z_en_niw_lady.reloc.s +++ b/data/overlays/actors/z_en_niw_lady.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_80ABB7C0 -.incbin "baserom/ovl_En_Niw_Lady", 0x1B80, 0x00000290 +.balign 16 + +glabel D_80ABB7C0 + .incbin "baserom/ovl_En_Niw_Lady", 0x1B80, 0x00000290 diff --git a/data/overlays/actors/z_en_nwc.data.s b/data/overlays/actors/z_en_nwc.data.s index 3c9536daf5..828ac1d3d5 100644 --- a/data/overlays/actors/z_en_nwc.data.s +++ b/data/overlays/actors/z_en_nwc.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel En_Nwc_InitVars .word 0x01350600, 0x00000030, 0x01240000, 0x00000734 .word EnNwc_Init diff --git a/data/overlays/actors/z_en_nwc.reloc.s b/data/overlays/actors/z_en_nwc.reloc.s index 612894791c..9f2a328054 100644 --- a/data/overlays/actors/z_en_nwc.reloc.s +++ b/data/overlays/actors/z_en_nwc.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_80ABCB10 -.incbin "baserom/ovl_En_Nwc", 0xA30, 0x000000A0 +.balign 16 + +glabel D_80ABCB10 + .incbin "baserom/ovl_En_Nwc", 0xA30, 0x000000A0 diff --git a/data/overlays/actors/z_en_ny.data.s b/data/overlays/actors/z_en_ny.data.s index f15152ed82..07eb2a9886 100644 --- a/data/overlays/actors/z_en_ny.data.s +++ b/data/overlays/actors/z_en_ny.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel En_Ny_InitVars .word 0x00EC0500, 0x00000005, 0x00E50000, 0x000002B8 .word EnNy_Init diff --git a/data/overlays/actors/z_en_ny.reloc.s b/data/overlays/actors/z_en_ny.reloc.s index 504d0f5830..0503963d1e 100644 --- a/data/overlays/actors/z_en_ny.reloc.s +++ b/data/overlays/actors/z_en_ny.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_80ABE4F0 -.incbin "baserom/ovl_En_Ny", 0x1940, 0x000001B0 +.balign 16 + +glabel D_80ABE4F0 + .incbin "baserom/ovl_En_Ny", 0x1940, 0x000001B0 diff --git a/data/overlays/actors/z_en_okarina_tag.data.s b/data/overlays/actors/z_en_okarina_tag.data.s index ba4fd98c3b..c8197660db 100644 --- a/data/overlays/actors/z_en_okarina_tag.data.s +++ b/data/overlays/actors/z_en_okarina_tag.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel D_80ABF9D0 .word 0x00000004, 0x00000168, 0x000003E8, 0x00000001, 0x002A00C8, 0x00C900C9, 0x00000001, 0x00010000, 0x014B0000, 0x00000000, 0x42700000, 0x0C1C00C9, 0xFF9C3235, 0x00000000, 0x42700000, 0x0C1C00C9, 0xFF9C3336, 0x00000000, 0x42700000, 0x0C1C00C9, 0xFF9C392C, 0x00000000, 0x42700000, 0x0C6A00C9, 0x00712C20, 0x00000000, 0x42700000, 0x0C6A00C9, 0x00713235, 0x00000000, 0x42700000, 0x0C6A00C9, 0x00713238, 0x00000000, 0x42700000, 0x0C6A00C9, 0x00713639, 0xFF000000, 0x42700000, 0x0C6A00C9, 0x00712C20, 0x00000002, 0x00010000, 0x01680000, 0x0000001E, 0x42700000, 0x0BEE0089, 0xFFC03235, 0x0000001E, 0x42700000, 0x0BEE0089, 0xFFC03336, 0x0000005A, 0x42700000, 0x0BEE0089, 0xFFC0392C, 0x0000005A, 0x42700000, 0x0C2E008E, 0x00602C20, 0x0000001E, 0x42700000, 0x0C2E008E, 0x00603235, 0x0000001E, 0x42700000, 0x0C2E008E, 0x00603238, 0x0000001E, 0x42700000, 0x0C2E008E, 0x00603639, 0xFF00001E, 0x42700000, 0x0C2E008E, 0x00602C20, 0x00000003, 0x00000001, 0x0013001E, 0x001F0000, 0x00000000, 0xFFFFFFFE, 0x00000000, 0x00000002, 0xFFFFFFFE, 0x00000000, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000000 glabel D_80ABFB40 diff --git a/data/overlays/actors/z_en_okarina_tag.reloc.s b/data/overlays/actors/z_en_okarina_tag.reloc.s index 0dee22a8c4..c1568fcc80 100644 --- a/data/overlays/actors/z_en_okarina_tag.reloc.s +++ b/data/overlays/actors/z_en_okarina_tag.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_80AC0530 -.incbin "baserom/ovl_En_Okarina_Tag", 0x1810, 0x00000130 +.balign 16 + +glabel D_80AC0530 + .incbin "baserom/ovl_En_Okarina_Tag", 0x1810, 0x00000130 diff --git a/data/overlays/actors/z_en_okuta.data.s b/data/overlays/actors/z_en_okuta.data.s index 780f164389..6c4d667087 100644 --- a/data/overlays/actors/z_en_okuta.data.s +++ b/data/overlays/actors/z_en_okuta.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel En_Okuta_InitVars .word 0x000E0500, 0x00000005, 0x00070000, 0x000003BC .word EnOkuta_Init diff --git a/data/overlays/actors/z_en_okuta.reloc.s b/data/overlays/actors/z_en_okuta.reloc.s index aac1e863b6..78387cf237 100644 --- a/data/overlays/actors/z_en_okuta.reloc.s +++ b/data/overlays/actors/z_en_okuta.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_80AC2990 -.incbin "baserom/ovl_En_Okuta", 0x2330, 0x00000310 +.balign 16 + +glabel D_80AC2990 + .incbin "baserom/ovl_En_Okuta", 0x2330, 0x00000310 diff --git a/data/overlays/actors/z_en_ossan.data.s b/data/overlays/actors/z_en_ossan.data.s index a4c19580bc..ffdbbc6ab8 100644 --- a/data/overlays/actors/z_en_ossan.data.s +++ b/data/overlays/actors/z_en_ossan.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel En_Ossan_InitVars .word 0x003D0400, 0x00000019, 0x00010000, 0x000002D8 .word EnOssan_Init diff --git a/data/overlays/actors/z_en_ossan.reloc.s b/data/overlays/actors/z_en_ossan.reloc.s index d70d61eb0e..c1a8a98fd6 100644 --- a/data/overlays/actors/z_en_ossan.reloc.s +++ b/data/overlays/actors/z_en_ossan.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_80AC9620 -.incbin "baserom/ovl_En_Ossan", 0x6980, 0x00000900 +.balign 16 + +glabel D_80AC9620 + .incbin "baserom/ovl_En_Ossan", 0x6980, 0x00000900 diff --git a/data/overlays/actors/z_en_owl.data.s b/data/overlays/actors/z_en_owl.data.s index bafc33534f..0ae8bb2f0c 100644 --- a/data/overlays/actors/z_en_owl.data.s +++ b/data/overlays/actors/z_en_owl.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel En_Owl_InitVars .word 0x014D0400, 0x00000019, 0x01310000, 0x00000414 .word EnOwl_Init diff --git a/data/overlays/actors/z_en_owl.reloc.s b/data/overlays/actors/z_en_owl.reloc.s index 65a2adf9df..6590b3ca3c 100644 --- a/data/overlays/actors/z_en_owl.reloc.s +++ b/data/overlays/actors/z_en_owl.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_80ACD870 -.incbin "baserom/ovl_En_Owl", 0x3950, 0x00000560 +.balign 16 + +glabel D_80ACD870 + .incbin "baserom/ovl_En_Owl", 0x3950, 0x00000560 diff --git a/data/overlays/actors/z_en_part.data.s b/data/overlays/actors/z_en_part.data.s index 9fd2f37c7b..6c62159fed 100644 --- a/data/overlays/actors/z_en_part.data.s +++ b/data/overlays/actors/z_en_part.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel En_Part_InitVars .word 0x00070700, 0x00000010, 0x00010000, 0x0000015C .word EnPart_Init diff --git a/data/overlays/actors/z_en_part.reloc.s b/data/overlays/actors/z_en_part.reloc.s index d3cc34531f..d9871aa86e 100644 --- a/data/overlays/actors/z_en_part.reloc.s +++ b/data/overlays/actors/z_en_part.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_80ACF2F0 -.incbin "baserom/ovl_En_Part", 0x1520, 0x000001B0 +.balign 16 + +glabel D_80ACF2F0 + .incbin "baserom/ovl_En_Part", 0x1520, 0x000001B0 diff --git a/data/overlays/actors/z_en_peehat.data.s b/data/overlays/actors/z_en_peehat.data.s index e51751cdf3..5d83481e71 100644 --- a/data/overlays/actors/z_en_peehat.data.s +++ b/data/overlays/actors/z_en_peehat.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel En_Peehat_InitVars .word 0x001D0500, 0x01000015, 0x00180000, 0x0000042C .word EnPeehat_Init diff --git a/data/overlays/actors/z_en_peehat.reloc.s b/data/overlays/actors/z_en_peehat.reloc.s index 52d703e4f6..f0c796e2d6 100644 --- a/data/overlays/actors/z_en_peehat.reloc.s +++ b/data/overlays/actors/z_en_peehat.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_80AD2990 -.incbin "baserom/ovl_En_Peehat", 0x34F0, 0x00000320 +.balign 16 + +glabel D_80AD2990 + .incbin "baserom/ovl_En_Peehat", 0x34F0, 0x00000320 diff --git a/data/overlays/actors/z_en_po_desert.data.s b/data/overlays/actors/z_en_po_desert.data.s index 12721c8fda..a9fff98abe 100644 --- a/data/overlays/actors/z_en_po_desert.data.s +++ b/data/overlays/actors/z_en_po_desert.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel En_Po_Desert_InitVars .word 0x01BF0100, 0x00001090, 0x006D0000, 0x00000284 .word EnPoDesert_Init diff --git a/data/overlays/actors/z_en_po_desert.reloc.s b/data/overlays/actors/z_en_po_desert.reloc.s index dbb6d1f397..61a4e5f905 100644 --- a/data/overlays/actors/z_en_po_desert.reloc.s +++ b/data/overlays/actors/z_en_po_desert.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_80AD3A40 -.incbin "baserom/ovl_En_Po_Desert", 0xD90, 0x000000C0 +.balign 16 + +glabel D_80AD3A40 + .incbin "baserom/ovl_En_Po_Desert", 0xD90, 0x000000C0 diff --git a/data/overlays/actors/z_en_po_field.bss.s b/data/overlays/actors/z_en_po_field.bss.s index ed423baf70..2d2221c1ca 100644 --- a/data/overlays/actors/z_en_po_field.bss.s +++ b/data/overlays/actors/z_en_po_field.bss.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers -.bss +.section .bss + +.balign 16 glabel D_80AD76B0 .space 0x40 diff --git a/data/overlays/actors/z_en_po_field.data.s b/data/overlays/actors/z_en_po_field.data.s index c7861a24fc..ef817e0d84 100644 --- a/data/overlays/actors/z_en_po_field.data.s +++ b/data/overlays/actors/z_en_po_field.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel En_Po_Field_InitVars .word 0x01750500, 0x00001035, 0x006D0000, 0x000002DC .word EnPoField_Init diff --git a/data/overlays/actors/z_en_po_field.reloc.s b/data/overlays/actors/z_en_po_field.reloc.s index 1f8a6043bc..f3f09daeac 100644 --- a/data/overlays/actors/z_en_po_field.reloc.s +++ b/data/overlays/actors/z_en_po_field.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_80AD72B0 -.incbin "baserom/ovl_En_Po_Field", 0x37B0, 0x00000400 +.balign 16 + +glabel D_80AD72B0 + .incbin "baserom/ovl_En_Po_Field", 0x37B0, 0x00000400 diff --git a/data/overlays/actors/z_en_po_relay.data.s b/data/overlays/actors/z_en_po_relay.data.s index 63af6fe64f..f9b82a21c9 100644 --- a/data/overlays/actors/z_en_po_relay.data.s +++ b/data/overlays/actors/z_en_po_relay.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel D_80AD8C30 .byte 0xFF, 0xC4 glabel D_80AD8C32 diff --git a/data/overlays/actors/z_en_po_relay.reloc.s b/data/overlays/actors/z_en_po_relay.reloc.s index 2d09f55e75..50070d22e3 100644 --- a/data/overlays/actors/z_en_po_relay.reloc.s +++ b/data/overlays/actors/z_en_po_relay.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_80AD8E10 -.incbin "baserom/ovl_En_Po_Relay", 0x16D0, 0x00000180 +.balign 16 + +glabel D_80AD8E10 + .incbin "baserom/ovl_En_Po_Relay", 0x16D0, 0x00000180 diff --git a/data/overlays/actors/z_en_po_sisters.data.s b/data/overlays/actors/z_en_po_sisters.data.s index 8b1628aaec..a11f0e1eb6 100644 --- a/data/overlays/actors/z_en_po_sisters.data.s +++ b/data/overlays/actors/z_en_po_sisters.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel D_80ADD6F0 .word 0xFFAAFFFF, 0xFFC800FF, 0x00AAFFFF, 0xAAFF00FF glabel D_80ADD700 diff --git a/data/overlays/actors/z_en_po_sisters.reloc.s b/data/overlays/actors/z_en_po_sisters.reloc.s index b3a5f4077f..2475779cab 100644 --- a/data/overlays/actors/z_en_po_sisters.reloc.s +++ b/data/overlays/actors/z_en_po_sisters.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_80ADD8D0 -.incbin "baserom/ovl_En_Po_Sisters", 0x4940, 0x00000480 +.balign 16 + +glabel D_80ADD8D0 + .incbin "baserom/ovl_En_Po_Sisters", 0x4940, 0x00000480 diff --git a/data/overlays/actors/z_en_poh.data.s b/data/overlays/actors/z_en_poh.data.s index 4b74f824ba..c20cca7103 100644 --- a/data/overlays/actors/z_en_poh.data.s +++ b/data/overlays/actors/z_en_poh.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel D_80AE1A50 .word 0x00000000 glabel En_Poh_InitVars diff --git a/data/overlays/actors/z_en_poh.reloc.s b/data/overlays/actors/z_en_poh.reloc.s index d41af9862d..77c0213b4b 100644 --- a/data/overlays/actors/z_en_poh.reloc.s +++ b/data/overlays/actors/z_en_poh.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_80AE1C80 -.incbin "baserom/ovl_En_Poh", 0x3F30, 0x00000440 +.balign 16 + +glabel D_80AE1C80 + .incbin "baserom/ovl_En_Poh", 0x3F30, 0x00000440 diff --git a/data/overlays/actors/z_en_rd.data.s b/data/overlays/actors/z_en_rd.data.s index 529087697e..05e3242629 100644 --- a/data/overlays/actors/z_en_rd.data.s +++ b/data/overlays/actors/z_en_rd.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel En_Rd_InitVars .word 0x00900500, 0x00000415, 0x00980000, 0x0000036C .word EnRd_Init diff --git a/data/overlays/actors/z_en_rd.reloc.s b/data/overlays/actors/z_en_rd.reloc.s index 43a2600e6d..64046ef1d6 100644 --- a/data/overlays/actors/z_en_rd.reloc.s +++ b/data/overlays/actors/z_en_rd.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_80AE4A30 -.incbin "baserom/ovl_En_Rd", 0x2630, 0x000002A0 +.balign 16 + +glabel D_80AE4A30 + .incbin "baserom/ovl_En_Rd", 0x2630, 0x000002A0 diff --git a/data/overlays/actors/z_en_reeba.data.s b/data/overlays/actors/z_en_reeba.data.s index 1fde773769..792d506794 100644 --- a/data/overlays/actors/z_en_reeba.data.s +++ b/data/overlays/actors/z_en_reeba.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel D_80AE6560 .word 0x00E2E1E2, 0xC1E2E2D2, 0xE1E4E6E2, 0x34E2E2E2, 0xE2003400, 0x0000E2E8, 0xE4E2E8E4, 0x10000000 glabel En_Reeba_InitVars diff --git a/data/overlays/actors/z_en_reeba.reloc.s b/data/overlays/actors/z_en_reeba.reloc.s index 4fa03a9b2d..a53486d489 100644 --- a/data/overlays/actors/z_en_reeba.reloc.s +++ b/data/overlays/actors/z_en_reeba.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_80AE66F0 -.incbin "baserom/ovl_En_Reeba", 0x1A20, 0x00000240 +.balign 16 + +glabel D_80AE66F0 + .incbin "baserom/ovl_En_Reeba", 0x1A20, 0x00000240 diff --git a/data/overlays/actors/z_en_river_sound.data.s b/data/overlays/actors/z_en_river_sound.data.s index 92bd381c6f..d556df9774 100644 --- a/data/overlays/actors/z_en_river_sound.data.s +++ b/data/overlays/actors/z_en_river_sound.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel En_River_Sound_InitVars .word 0x003B0100, 0x00000030, 0x00010000, 0x00000150 .word EnRiverSound_Init diff --git a/data/overlays/actors/z_en_river_sound.reloc.s b/data/overlays/actors/z_en_river_sound.reloc.s index 27be5c39e3..76b737b9e4 100644 --- a/data/overlays/actors/z_en_river_sound.reloc.s +++ b/data/overlays/actors/z_en_river_sound.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_80AE7240 -.incbin "baserom/ovl_En_River_Sound", 0x910, 0x00000070 +.balign 16 + +glabel D_80AE7240 + .incbin "baserom/ovl_En_River_Sound", 0x910, 0x00000070 diff --git a/data/overlays/actors/z_en_rl.data.s b/data/overlays/actors/z_en_rl.data.s index 9646c77261..a8f61cbc66 100644 --- a/data/overlays/actors/z_en_rl.data.s +++ b/data/overlays/actors/z_en_rl.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel D_80AE81A0 .word 0x06003620, 0x06003960, 0x06003B60 glabel D_80AE81AC diff --git a/data/overlays/actors/z_en_rl.reloc.s b/data/overlays/actors/z_en_rl.reloc.s index 7d0800ad46..9d32cd0465 100644 --- a/data/overlays/actors/z_en_rl.reloc.s +++ b/data/overlays/actors/z_en_rl.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_80AE82E0 -.incbin "baserom/ovl_En_Rl", 0x1030, 0x00000160 +.balign 16 + +glabel D_80AE82E0 + .incbin "baserom/ovl_En_Rl", 0x1030, 0x00000160 diff --git a/data/overlays/actors/z_en_rr.data.s b/data/overlays/actors/z_en_rr.data.s index 0ad42d18c2..943525d79b 100644 --- a/data/overlays/actors/z_en_rr.data.s +++ b/data/overlays/actors/z_en_rr.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel En_Rr_InitVars .word 0x00DD0500, 0x00000435, 0x00D40000, 0x000023C4 .word EnRr_Init diff --git a/data/overlays/actors/z_en_rr.reloc.s b/data/overlays/actors/z_en_rr.reloc.s index 35c263f445..4856147d4b 100644 --- a/data/overlays/actors/z_en_rr.reloc.s +++ b/data/overlays/actors/z_en_rr.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_80AEA940 -.incbin "baserom/ovl_En_Rr", 0x2500, 0x000002D0 +.balign 16 + +glabel D_80AEA940 + .incbin "baserom/ovl_En_Rr", 0x2500, 0x000002D0 diff --git a/data/overlays/actors/z_en_sa.data.s b/data/overlays/actors/z_en_sa.data.s index 43e990a2fa..04d9131841 100644 --- a/data/overlays/actors/z_en_sa.data.s +++ b/data/overlays/actors/z_en_sa.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel En_Sa_InitVars .word 0x01460400, 0x02000019, 0x00BC0000, 0x000002EC .word EnSa_Init diff --git a/data/overlays/actors/z_en_sa.reloc.s b/data/overlays/actors/z_en_sa.reloc.s index d8cc714e3f..710d1cf897 100644 --- a/data/overlays/actors/z_en_sa.reloc.s +++ b/data/overlays/actors/z_en_sa.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_80AF7520 -.incbin "baserom/ovl_En_Sa", 0x1FC0, 0x000002D0 +.balign 16 + +glabel D_80AF7520 + .incbin "baserom/ovl_En_Sa", 0x1FC0, 0x000002D0 diff --git a/data/overlays/actors/z_en_sda.bss.s b/data/overlays/actors/z_en_sda.bss.s index 5607254632..8d179c8349 100644 --- a/data/overlays/actors/z_en_sda.bss.s +++ b/data/overlays/actors/z_en_sda.bss.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers -.bss +.section .bss + +.balign 16 glabel D_80AFA660 .space 0xC0 diff --git a/data/overlays/actors/z_en_sda.data.s b/data/overlays/actors/z_en_sda.data.s index 7745b3593e..b64d320443 100644 --- a/data/overlays/actors/z_en_sda.data.s +++ b/data/overlays/actors/z_en_sda.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel En_Sda_InitVars .word 0x013A0900, 0x00000030, 0x00010000, 0x0000014C .word EnSda_Init diff --git a/data/overlays/actors/z_en_sda.reloc.s b/data/overlays/actors/z_en_sda.reloc.s index b56856baab..3842c0ddbc 100644 --- a/data/overlays/actors/z_en_sda.reloc.s +++ b/data/overlays/actors/z_en_sda.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_80AFA510 -.incbin "baserom/ovl_En_Sda", 0x16F0, 0x00000150 +.balign 16 + +glabel D_80AFA510 + .incbin "baserom/ovl_En_Sda", 0x16F0, 0x00000150 diff --git a/data/overlays/actors/z_en_shopnuts.data.s b/data/overlays/actors/z_en_shopnuts.data.s index 3200653b6c..00d58bfc81 100644 --- a/data/overlays/actors/z_en_shopnuts.data.s +++ b/data/overlays/actors/z_en_shopnuts.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel En_Shopnuts_InitVars .word 0x01950500, 0x00000005, 0x01680000, 0x000002BC .word EnShopnuts_Init diff --git a/data/overlays/actors/z_en_shopnuts.reloc.s b/data/overlays/actors/z_en_shopnuts.reloc.s index 628999021e..91ad6389a7 100644 --- a/data/overlays/actors/z_en_shopnuts.reloc.s +++ b/data/overlays/actors/z_en_shopnuts.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_80AFB570 -.incbin "baserom/ovl_En_Shopnuts", 0xE50, 0x00000120 +.balign 16 + +glabel D_80AFB570 + .incbin "baserom/ovl_En_Shopnuts", 0xE50, 0x00000120 diff --git a/data/overlays/actors/z_en_si.data.s b/data/overlays/actors/z_en_si.data.s index 593c885d4e..d8db0a05cd 100644 --- a/data/overlays/actors/z_en_si.data.s +++ b/data/overlays/actors/z_en_si.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel D_80AFBAB0 .word 0x0A00093D, 0x10010000, 0x00000000, 0x00000000, 0x00000000, 0x00000090, 0x00000000, 0x00050100, 0x00140012, 0x00020000, 0x00000000 glabel D_80AFBADC diff --git a/data/overlays/actors/z_en_si.reloc.s b/data/overlays/actors/z_en_si.reloc.s index d917f60d80..dcf4893fac 100644 --- a/data/overlays/actors/z_en_si.reloc.s +++ b/data/overlays/actors/z_en_si.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_80AFBB10 -.incbin "baserom/ovl_En_Si", 0x480, 0x00000070 +.balign 16 + +glabel D_80AFBB10 + .incbin "baserom/ovl_En_Si", 0x480, 0x00000070 diff --git a/data/overlays/actors/z_en_siofuki.data.s b/data/overlays/actors/z_en_siofuki.data.s index 21884f7ed4..418f016830 100644 --- a/data/overlays/actors/z_en_siofuki.data.s +++ b/data/overlays/actors/z_en_siofuki.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel En_Siofuki_InitVars .word 0x015F0100, 0x00000030, 0x013A0000, 0x000001A0 .word EnSiofuki_Init diff --git a/data/overlays/actors/z_en_siofuki.reloc.s b/data/overlays/actors/z_en_siofuki.reloc.s index 718a0f4e65..11bf3afaf3 100644 --- a/data/overlays/actors/z_en_siofuki.reloc.s +++ b/data/overlays/actors/z_en_siofuki.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_80AFC880 -.incbin "baserom/ovl_En_Siofuki", 0xD00, 0x00000120 +.balign 16 + +glabel D_80AFC880 + .incbin "baserom/ovl_En_Siofuki", 0xD00, 0x00000120 diff --git a/data/overlays/actors/z_en_skb.data.s b/data/overlays/actors/z_en_skb.data.s index be86b3057f..44c8847a7b 100644 --- a/data/overlays/actors/z_en_skb.data.s +++ b/data/overlays/actors/z_en_skb.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel D_80AFE020 .word 0x00000000, 0xFFCFFFFF, 0x00040000, 0x00000000, 0x00000000, 0x01000000, 0x0F000000, 0x00000000, 0x000A0064, 0x00000000, 0x00000000, 0x00000000, 0xFFCFFFFF, 0x00000000, 0x00050100, 0x01000000, 0x00000000, 0x00140064 glabel D_80AFE068 diff --git a/data/overlays/actors/z_en_skb.reloc.s b/data/overlays/actors/z_en_skb.reloc.s index 1d448e6919..7703bec458 100644 --- a/data/overlays/actors/z_en_skb.reloc.s +++ b/data/overlays/actors/z_en_skb.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_80AFE130 -.incbin "baserom/ovl_En_Skb", 0x1790, 0x00000180 +.balign 16 + +glabel D_80AFE130 + .incbin "baserom/ovl_En_Skb", 0x1790, 0x00000180 diff --git a/data/overlays/actors/z_en_skj.bss.s b/data/overlays/actors/z_en_skj.bss.s index 3278c5782d..ad042b503f 100644 --- a/data/overlays/actors/z_en_skj.bss.s +++ b/data/overlays/actors/z_en_skj.bss.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers -.bss +.section .bss + +.balign 16 glabel D_80B01EA0 .space 0x10 diff --git a/data/overlays/actors/z_en_skj.data.s b/data/overlays/actors/z_en_skj.data.s index 836f54f335..b13f59f8cd 100644 --- a/data/overlays/actors/z_en_skj.data.s +++ b/data/overlays/actors/z_en_skj.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel D_80B01640 .word 0x00000000 glabel D_80B01644 diff --git a/data/overlays/actors/z_en_skj.reloc.s b/data/overlays/actors/z_en_skj.reloc.s index 534d914bbc..0c8c9c5cb3 100644 --- a/data/overlays/actors/z_en_skj.reloc.s +++ b/data/overlays/actors/z_en_skj.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_80B01910 -.incbin "baserom/ovl_En_Skj", 0x3660, 0x00000590 +.balign 16 + +glabel D_80B01910 + .incbin "baserom/ovl_En_Skj", 0x3660, 0x00000590 diff --git a/data/overlays/actors/z_en_skj.rodata.s b/data/overlays/actors/z_en_skj.rodata.s index 02691c6258..6470d467f9 100644 --- a/data/overlays/actors/z_en_skj.rodata.s +++ b/data/overlays/actors/z_en_skj.rodata.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata +.balign 16 + glabel D_80B017D0 .asciz "Player_X : %f\n" .balign 4 diff --git a/data/overlays/actors/z_en_ssh.data.s b/data/overlays/actors/z_en_ssh.data.s index c0024b0f08..01aa5d2a17 100644 --- a/data/overlays/actors/z_en_ssh.data.s +++ b/data/overlays/actors/z_en_ssh.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel D_80B043C0 .word 0xFFFF0000, 0x00000000, 0x00000400, 0xFFFFFFFF, 0x00010000, 0x00000000, 0x04000400, 0xFFFFFFFF, 0x00010064, 0x00000000, 0x04000000, 0xFFFFFFFF, 0xFFFF0064, 0x00000000, 0x00000000, 0xFFFFFFFF, 0xE7000000, 0x00000000, 0xD7000000, 0x00000000, 0xFCFFFFFF, 0xFFFFFEFB, 0xE200001C, 0xC8112078, 0xD9F1FBFF, 0x00000000, 0xFA000000, 0xFFFFFFFF, 0x01004008 .word D_80B043C0 diff --git a/data/overlays/actors/z_en_ssh.reloc.s b/data/overlays/actors/z_en_ssh.reloc.s index 492bd59e2d..4e16c4947b 100644 --- a/data/overlays/actors/z_en_ssh.reloc.s +++ b/data/overlays/actors/z_en_ssh.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_80B04610 -.incbin "baserom/ovl_En_Ssh", 0x23A0, 0x00000280 +.balign 16 + +glabel D_80B04610 + .incbin "baserom/ovl_En_Ssh", 0x23A0, 0x00000280 diff --git a/data/overlays/actors/z_en_st.data.s b/data/overlays/actors/z_en_st.data.s index d6a93b8c8b..697cd1499e 100644 --- a/data/overlays/actors/z_en_st.data.s +++ b/data/overlays/actors/z_en_st.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel D_80B06F40 .word 0xFFFF0000, 0x00000000, 0x00000400, 0xFFFFFFFF, 0x00010000, 0x00000000, 0x04000400, 0xFFFFFFFF, 0x00010064, 0x00000000, 0x04000000, 0xFFFFFFFF, 0xFFFF0064, 0x00000000, 0x00000000, 0xFFFFFFFF, 0xE7000000, 0x00000000, 0xD7000000, 0x00000000, 0xFCFFFFFF, 0xFFFFFEFB, 0xE200001C, 0xC8112078, 0xD9F1FBFF, 0x00000000, 0xFA000000, 0xFFFFFFFF, 0x01004008 .word D_80B06F40 diff --git a/data/overlays/actors/z_en_st.reloc.s b/data/overlays/actors/z_en_st.reloc.s index 611fb51cfe..a6998d4e5a 100644 --- a/data/overlays/actors/z_en_st.reloc.s +++ b/data/overlays/actors/z_en_st.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_80B07240 -.incbin "baserom/ovl_En_St", 0x29B0, 0x00000300 +.balign 16 + +glabel D_80B07240 + .incbin "baserom/ovl_En_St", 0x29B0, 0x00000300 diff --git a/data/overlays/actors/z_en_sth.data.s b/data/overlays/actors/z_en_sth.data.s index 70d89192e5..2f59b54276 100644 --- a/data/overlays/actors/z_en_sth.data.s +++ b/data/overlays/actors/z_en_sth.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel En_Sth_InitVars .word 0x01890400, 0x00000019, 0x00010000, 0x000002BC .word EnSth_Init diff --git a/data/overlays/actors/z_en_sth.reloc.s b/data/overlays/actors/z_en_sth.reloc.s index aa14c3f3aa..63b0fdc3cd 100644 --- a/data/overlays/actors/z_en_sth.reloc.s +++ b/data/overlays/actors/z_en_sth.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_80B0B590 -.incbin "baserom/ovl_En_Sth", 0x4050, 0x00000210 +.balign 16 + +glabel D_80B0B590 + .incbin "baserom/ovl_En_Sth", 0x4050, 0x00000210 diff --git a/data/overlays/actors/z_en_stream.data.s b/data/overlays/actors/z_en_stream.data.s index 98982d6d7e..0f8efa42a9 100644 --- a/data/overlays/actors/z_en_stream.data.s +++ b/data/overlays/actors/z_en_stream.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel En_Stream_InitVars .word 0x01600100, 0x00000010, 0x013B0000, 0x00000158 .word EnStream_Init diff --git a/data/overlays/actors/z_en_stream.reloc.s b/data/overlays/actors/z_en_stream.reloc.s index 7fa678c110..528f9246de 100644 --- a/data/overlays/actors/z_en_stream.reloc.s +++ b/data/overlays/actors/z_en_stream.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_80B0BD20 -.incbin "baserom/ovl_En_Stream", 0x580, 0x00000090 +.balign 16 + +glabel D_80B0BD20 + .incbin "baserom/ovl_En_Stream", 0x580, 0x00000090 diff --git a/data/overlays/actors/z_en_sw.bss.s b/data/overlays/actors/z_en_sw.bss.s index 992a934b69..3f272959ed 100644 --- a/data/overlays/actors/z_en_sw.bss.s +++ b/data/overlays/actors/z_en_sw.bss.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers -.bss +.section .bss + +.balign 16 glabel D_80B0F630 .space 0x80 diff --git a/data/overlays/actors/z_en_sw.data.s b/data/overlays/actors/z_en_sw.data.s index 212b6ad26c..bb491ab3d5 100644 --- a/data/overlays/actors/z_en_sw.data.s +++ b/data/overlays/actors/z_en_sw.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel En_Sw_InitVars .word 0x00950400, 0x00000015, 0x00240000, 0x000004D8 .word EnSw_Init diff --git a/data/overlays/actors/z_en_sw.reloc.s b/data/overlays/actors/z_en_sw.reloc.s index 559cb42607..9fbcd51cdd 100644 --- a/data/overlays/actors/z_en_sw.reloc.s +++ b/data/overlays/actors/z_en_sw.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_80B0F2C0 -.incbin "baserom/ovl_En_Sw", 0x3510, 0x00000370 +.balign 16 + +glabel D_80B0F2C0 + .incbin "baserom/ovl_En_Sw", 0x3510, 0x00000370 diff --git a/data/overlays/actors/z_en_syateki_itm.data.s b/data/overlays/actors/z_en_syateki_itm.data.s index fa71ba288b..2238b7b691 100644 --- a/data/overlays/actors/z_en_syateki_itm.data.s +++ b/data/overlays/actors/z_en_syateki_itm.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel En_Syateki_Itm_InitVars .word 0x00C00600, 0x00000010, 0x00010000, 0x000001D8 .word EnSyatekiItm_Init diff --git a/data/overlays/actors/z_en_syateki_itm.reloc.s b/data/overlays/actors/z_en_syateki_itm.reloc.s index cd8f7a8443..4876cb396f 100644 --- a/data/overlays/actors/z_en_syateki_itm.reloc.s +++ b/data/overlays/actors/z_en_syateki_itm.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_80B10690 -.incbin "baserom/ovl_En_Syateki_Itm", 0xFE0, 0x000001E0 +.balign 16 + +glabel D_80B10690 + .incbin "baserom/ovl_En_Syateki_Itm", 0xFE0, 0x000001E0 diff --git a/data/overlays/actors/z_en_syateki_man.data.s b/data/overlays/actors/z_en_syateki_man.data.s index cc90646a11..80d21cdb0e 100644 --- a/data/overlays/actors/z_en_syateki_man.data.s +++ b/data/overlays/actors/z_en_syateki_man.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel En_Syateki_Man_InitVars .word 0x00C10400, 0x08000019, 0x005B0000, 0x0000022C .word EnSyatekiMan_Init diff --git a/data/overlays/actors/z_en_syateki_man.reloc.s b/data/overlays/actors/z_en_syateki_man.reloc.s index 4cd4f12bd3..8c644b3228 100644 --- a/data/overlays/actors/z_en_syateki_man.reloc.s +++ b/data/overlays/actors/z_en_syateki_man.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_80B117A0 -.incbin "baserom/ovl_En_Syateki_Man", 0xF30, 0x00000150 +.balign 16 + +glabel D_80B117A0 + .incbin "baserom/ovl_En_Syateki_Man", 0xF30, 0x00000150 diff --git a/data/overlays/actors/z_en_syateki_niw.data.s b/data/overlays/actors/z_en_syateki_niw.data.s index ba531d784c..125f24ea6b 100644 --- a/data/overlays/actors/z_en_syateki_niw.data.s +++ b/data/overlays/actors/z_en_syateki_niw.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel En_Syateki_Niw_InitVars .word 0x01430600, 0x00000010, 0x00130000, 0x00000460 .word EnSyatekiNiw_Init diff --git a/data/overlays/actors/z_en_syateki_niw.reloc.s b/data/overlays/actors/z_en_syateki_niw.reloc.s index 2e103bb68d..a790c4b58e 100644 --- a/data/overlays/actors/z_en_syateki_niw.reloc.s +++ b/data/overlays/actors/z_en_syateki_niw.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_80B13840 -.incbin "baserom/ovl_En_Syateki_Niw", 0x1F50, 0x00000260 +.balign 16 + +glabel D_80B13840 + .incbin "baserom/ovl_En_Syateki_Niw", 0x1F50, 0x00000260 diff --git a/data/overlays/actors/z_en_ta.data.s b/data/overlays/actors/z_en_ta.data.s index 8359cd314a..8e6829d032 100644 --- a/data/overlays/actors/z_en_ta.data.s +++ b/data/overlays/actors/z_en_ta.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel En_Ta_InitVars .word 0x00840400, 0x00000009, 0x00880000, 0x000002E8 .word EnTa_Init diff --git a/data/overlays/actors/z_en_ta.reloc.s b/data/overlays/actors/z_en_ta.reloc.s index 95797148e2..bafe214aa0 100644 --- a/data/overlays/actors/z_en_ta.reloc.s +++ b/data/overlays/actors/z_en_ta.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_80B16F70 -.incbin "baserom/ovl_En_Ta", 0x34D0, 0x000005F0 +.balign 16 + +glabel D_80B16F70 + .incbin "baserom/ovl_En_Ta", 0x34D0, 0x000005F0 diff --git a/data/overlays/actors/z_en_takara_man.data.s b/data/overlays/actors/z_en_takara_man.data.s index 3c64b79c32..fb0e2176c1 100644 --- a/data/overlays/actors/z_en_takara_man.data.s +++ b/data/overlays/actors/z_en_takara_man.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel En_Takara_Man_InitVars .word 0x017C0400, 0x08000039, 0x01550000, 0x00000238 .word EnTakaraMan_Init diff --git a/data/overlays/actors/z_en_takara_man.reloc.s b/data/overlays/actors/z_en_takara_man.reloc.s index d94a4a032c..5056106645 100644 --- a/data/overlays/actors/z_en_takara_man.reloc.s +++ b/data/overlays/actors/z_en_takara_man.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_80B17E70 -.incbin "baserom/ovl_En_Takara_Man", 0x910, 0x000000C0 +.balign 16 + +glabel D_80B17E70 + .incbin "baserom/ovl_En_Takara_Man", 0x910, 0x000000C0 diff --git a/data/overlays/actors/z_en_test.data.s b/data/overlays/actors/z_en_test.data.s index 70084e42a6..4dd0970ac3 100644 --- a/data/overlays/actors/z_en_test.data.s +++ b/data/overlays/actors/z_en_test.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel D_80864510 .word 0x00000000, 0x01010101, 0x01010101, 0x01010101, 0x01010101, 0x01010101, 0x01010101, 0x01010101, 0x01010101, 0x01010100, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 glabel En_Test_InitVars diff --git a/data/overlays/actors/z_en_test.reloc.s b/data/overlays/actors/z_en_test.reloc.s index 10263be3dd..675e841df7 100644 --- a/data/overlays/actors/z_en_test.reloc.s +++ b/data/overlays/actors/z_en_test.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_808648C0 -.incbin "baserom/ovl_En_Test", 0x5270, 0x00000640 +.balign 16 + +glabel D_808648C0 + .incbin "baserom/ovl_En_Test", 0x5270, 0x00000640 diff --git a/data/overlays/actors/z_en_tg.data.s b/data/overlays/actors/z_en_tg.data.s index 3968afa18a..cfcbfb034f 100644 --- a/data/overlays/actors/z_en_tg.data.s +++ b/data/overlays/actors/z_en_tg.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel D_80B18910 .word 0x0A000039, 0x20010000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000100, 0x00140040, 0x00000000, 0x00000000 glabel D_80B1893C diff --git a/data/overlays/actors/z_en_tg.reloc.s b/data/overlays/actors/z_en_tg.reloc.s index 9748a46e2b..4c03e48d26 100644 --- a/data/overlays/actors/z_en_tg.reloc.s +++ b/data/overlays/actors/z_en_tg.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_80B189D0 -.incbin "baserom/ovl_En_Tg", 0x670, 0x000000B0 +.balign 16 + +glabel D_80B189D0 + .incbin "baserom/ovl_En_Tg", 0x670, 0x000000B0 diff --git a/data/overlays/actors/z_en_tite.data.s b/data/overlays/actors/z_en_tite.data.s index 4112a64152..4080814738 100644 --- a/data/overlays/actors/z_en_tite.data.s +++ b/data/overlays/actors/z_en_tite.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel En_Tite_InitVars .word 0x001B0500, 0x00000015, 0x00160000, 0x00000378 .word EnTite_Init diff --git a/data/overlays/actors/z_en_tite.reloc.s b/data/overlays/actors/z_en_tite.reloc.s index d05518833f..1cc377d647 100644 --- a/data/overlays/actors/z_en_tite.reloc.s +++ b/data/overlays/actors/z_en_tite.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_80B1B750 -.incbin "baserom/ovl_En_Tite", 0x2CD0, 0x000001B0 +.balign 16 + +glabel D_80B1B750 + .incbin "baserom/ovl_En_Tite", 0x2CD0, 0x000001B0 diff --git a/data/overlays/actors/z_en_torch2.bss.s b/data/overlays/actors/z_en_torch2.bss.s index 077608c6af..f3ac2eebf1 100644 --- a/data/overlays/actors/z_en_torch2.bss.s +++ b/data/overlays/actors/z_en_torch2.bss.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers -.bss +.section .bss + +.balign 16 glabel D_80B20130 .space 0x02 diff --git a/data/overlays/actors/z_en_torch2.data.s b/data/overlays/actors/z_en_torch2.data.s index 79e11c4b82..c5c79120fa 100644 --- a/data/overlays/actors/z_en_torch2.data.s +++ b/data/overlays/actors/z_en_torch2.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel En_Torch2_InitVars .word 0x00330900, 0x00000035, 0x00200000, 0x00000A94 .word EnTorch2_Init diff --git a/data/overlays/actors/z_en_torch2.reloc.s b/data/overlays/actors/z_en_torch2.reloc.s index 506bbf012b..c1a9ba4f19 100644 --- a/data/overlays/actors/z_en_torch2.reloc.s +++ b/data/overlays/actors/z_en_torch2.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_80B1FA80 -.incbin "baserom/ovl_En_Torch2", 0x2100, 0x000006B0 +.balign 16 + +glabel D_80B1FA80 + .incbin "baserom/ovl_En_Torch2", 0x2100, 0x000006B0 diff --git a/data/overlays/actors/z_en_toryo.data.s b/data/overlays/actors/z_en_toryo.data.s index 54b19a47f8..5740feca2f 100644 --- a/data/overlays/actors/z_en_toryo.data.s +++ b/data/overlays/actors/z_en_toryo.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel En_Toryo_InitVars .word 0x01320400, 0x00000009, 0x01210000, 0x000002E0 .word EnToryo_Init diff --git a/data/overlays/actors/z_en_toryo.reloc.s b/data/overlays/actors/z_en_toryo.reloc.s index 44f21537bb..3358312964 100644 --- a/data/overlays/actors/z_en_toryo.reloc.s +++ b/data/overlays/actors/z_en_toryo.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_80B20CE0 -.incbin "baserom/ovl_En_Toryo", 0xB70, 0x00000100 +.balign 16 + +glabel D_80B20CE0 + .incbin "baserom/ovl_En_Toryo", 0xB70, 0x00000100 diff --git a/data/overlays/actors/z_en_tp.data.s b/data/overlays/actors/z_en_tp.data.s index 5d3ae5454d..a83c9a08cf 100644 --- a/data/overlays/actors/z_en_tp.data.s +++ b/data/overlays/actors/z_en_tp.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel En_Tp_InitVars .word 0x00350500, 0x00000000, 0x00220000, 0x000001D8 .word EnTp_Init diff --git a/data/overlays/actors/z_en_tp.reloc.s b/data/overlays/actors/z_en_tp.reloc.s index fc498a460e..90fae686f9 100644 --- a/data/overlays/actors/z_en_tp.reloc.s +++ b/data/overlays/actors/z_en_tp.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_80B22BA0 -.incbin "baserom/ovl_En_Tp", 0x1DC0, 0x00000150 +.balign 16 + +glabel D_80B22BA0 + .incbin "baserom/ovl_En_Tp", 0x1DC0, 0x00000150 diff --git a/data/overlays/actors/z_en_tr.data.s b/data/overlays/actors/z_en_tr.data.s index 9c1bb56037..aa4c73bdf5 100644 --- a/data/overlays/actors/z_en_tr.data.s +++ b/data/overlays/actors/z_en_tr.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel En_Tr_InitVars .word 0x00CC0400, 0x00000010, 0x00C10000, 0x000002E8 .word EnTr_Init diff --git a/data/overlays/actors/z_en_tr.reloc.s b/data/overlays/actors/z_en_tr.reloc.s index bdce69323e..a32437789e 100644 --- a/data/overlays/actors/z_en_tr.reloc.s +++ b/data/overlays/actors/z_en_tr.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_80B24460 -.incbin "baserom/ovl_En_Tr", 0x1770, 0x00000200 +.balign 16 + +glabel D_80B24460 + .incbin "baserom/ovl_En_Tr", 0x1770, 0x00000200 diff --git a/data/overlays/actors/z_en_trap.data.s b/data/overlays/actors/z_en_trap.data.s index a35b7af424..5a8e3b9918 100644 --- a/data/overlays/actors/z_en_trap.data.s +++ b/data/overlays/actors/z_en_trap.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel En_Trap_InitVars .word 0x00800100, 0x00000010, 0x00850000, 0x000001EC .word EnTrap_Init diff --git a/data/overlays/actors/z_en_trap.reloc.s b/data/overlays/actors/z_en_trap.reloc.s index bf2e9707e6..cb18bc783e 100644 --- a/data/overlays/actors/z_en_trap.reloc.s +++ b/data/overlays/actors/z_en_trap.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_80B25880 -.incbin "baserom/ovl_En_Trap", 0x1220, 0x00000070 +.balign 16 + +glabel D_80B25880 + .incbin "baserom/ovl_En_Trap", 0x1220, 0x00000070 diff --git a/data/overlays/actors/z_en_tubo_trap.reloc.s b/data/overlays/actors/z_en_tubo_trap.reloc.s index 7725613f89..30b0dde60a 100644 --- a/data/overlays/actors/z_en_tubo_trap.reloc.s +++ b/data/overlays/actors/z_en_tubo_trap.reloc.s @@ -1,3 +1,6 @@ .section .rodata + +.balign 16 + D_80B265E0: .incbin "baserom/ovl_En_Tubo_Trap", 0xCF0, 0x000000D0 diff --git a/data/overlays/actors/z_en_vali.data.s b/data/overlays/actors/z_en_vali.data.s index ba5b4e7707..082e90205f 100644 --- a/data/overlays/actors/z_en_vali.data.s +++ b/data/overlays/actors/z_en_vali.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel En_Vali_InitVars .word 0x00630500, 0x00001015, 0x00560000, 0x00000448 .word EnVali_Init diff --git a/data/overlays/actors/z_en_vali.reloc.s b/data/overlays/actors/z_en_vali.reloc.s index ead6418efc..ae9b9cec41 100644 --- a/data/overlays/actors/z_en_vali.reloc.s +++ b/data/overlays/actors/z_en_vali.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_80B28B00 -.incbin "baserom/ovl_En_Vali", 0x2450, 0x000003B0 +.balign 16 + +glabel D_80B28B00 + .incbin "baserom/ovl_En_Vali", 0x2450, 0x000003B0 diff --git a/data/overlays/actors/z_en_vb_ball.data.s b/data/overlays/actors/z_en_vb_ball.data.s index 76e0e46f4c..f04604e810 100644 --- a/data/overlays/actors/z_en_vb_ball.data.s +++ b/data/overlays/actors/z_en_vb_ball.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel En_Vb_Ball_InitVars .word 0x00000900, 0x00000030, 0x009C0000, 0x000001B4 .word EnVbBall_Init diff --git a/data/overlays/actors/z_en_vb_ball.reloc.s b/data/overlays/actors/z_en_vb_ball.reloc.s index 16673ad5de..7ea70c5215 100644 --- a/data/overlays/actors/z_en_vb_ball.reloc.s +++ b/data/overlays/actors/z_en_vb_ball.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_80B2A110 -.incbin "baserom/ovl_En_Vb_Ball", 0x1170, 0x000000F0 +.balign 16 + +glabel D_80B2A110 + .incbin "baserom/ovl_En_Vb_Ball", 0x1170, 0x000000F0 diff --git a/data/overlays/actors/z_en_viewer.bss.s b/data/overlays/actors/z_en_viewer.bss.s index 8da5a87a9e..16f902f7d2 100644 --- a/data/overlays/actors/z_en_viewer.bss.s +++ b/data/overlays/actors/z_en_viewer.bss.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers -.bss +.section .bss + +.balign 16 glabel D_80B2D440 .space 0x08 diff --git a/data/overlays/actors/z_en_viewer.data.s b/data/overlays/actors/z_en_viewer.data.s index 70c7a9fb17..2e85f17beb 100644 --- a/data/overlays/actors/z_en_viewer.data.s +++ b/data/overlays/actors/z_en_viewer.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel D_80B2CEC0 .word 0x00000000 glabel En_Viewer_InitVars diff --git a/data/overlays/actors/z_en_viewer.reloc.s b/data/overlays/actors/z_en_viewer.reloc.s index 63c51d9bbb..5933845977 100644 --- a/data/overlays/actors/z_en_viewer.reloc.s +++ b/data/overlays/actors/z_en_viewer.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_80B2D1D0 -.incbin "baserom/ovl_En_Viewer", 0x2FD0, 0x00000270 +.balign 16 + +glabel D_80B2D1D0 + .incbin "baserom/ovl_En_Viewer", 0x2FD0, 0x00000270 diff --git a/data/overlays/actors/z_en_vm.data.s b/data/overlays/actors/z_en_vm.data.s index c91b8aecd0..d360c80714 100644 --- a/data/overlays/actors/z_en_vm.data.s +++ b/data/overlays/actors/z_en_vm.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel En_Vm_InitVars .word 0x008A0500, 0x00000011, 0x008B0000, 0x000003B4 .word EnVm_Init diff --git a/data/overlays/actors/z_en_vm.reloc.s b/data/overlays/actors/z_en_vm.reloc.s index fb1f7646af..9e50e45b76 100644 --- a/data/overlays/actors/z_en_vm.reloc.s +++ b/data/overlays/actors/z_en_vm.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_80B2EC40 -.incbin "baserom/ovl_En_Vm", 0x17E0, 0x000001B0 +.balign 16 + +glabel D_80B2EC40 + .incbin "baserom/ovl_En_Vm", 0x17E0, 0x000001B0 diff --git a/data/overlays/actors/z_en_wall_tubo.data.s b/data/overlays/actors/z_en_wall_tubo.data.s index c958eb2c4b..cba0de8957 100644 --- a/data/overlays/actors/z_en_wall_tubo.data.s +++ b/data/overlays/actors/z_en_wall_tubo.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel En_Wall_Tubo_InitVars .word 0x01BE0600, 0x00000010, 0x00010000, 0x00000170 .word EnWallTubo_Init diff --git a/data/overlays/actors/z_en_wall_tubo.reloc.s b/data/overlays/actors/z_en_wall_tubo.reloc.s index d73334a14f..1c2d9badb0 100644 --- a/data/overlays/actors/z_en_wall_tubo.reloc.s +++ b/data/overlays/actors/z_en_wall_tubo.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_80B2F480 -.incbin "baserom/ovl_En_Wall_Tubo", 0x690, 0x000000A0 +.balign 16 + +glabel D_80B2F480 + .incbin "baserom/ovl_En_Wall_Tubo", 0x690, 0x000000A0 diff --git a/data/overlays/actors/z_en_weather_tag.data.s b/data/overlays/actors/z_en_weather_tag.data.s index 01ac85bd90..e3be38f014 100644 --- a/data/overlays/actors/z_en_weather_tag.data.s +++ b/data/overlays/actors/z_en_weather_tag.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel En_Weather_Tag_InitVars .word 0x01650600, 0x00000010, 0x00010000, 0x00000154 .word EnWeatherTag_Init diff --git a/data/overlays/actors/z_en_weather_tag.reloc.s b/data/overlays/actors/z_en_weather_tag.reloc.s index 9aeae9a59c..37cecf2efa 100644 --- a/data/overlays/actors/z_en_weather_tag.reloc.s +++ b/data/overlays/actors/z_en_weather_tag.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_80B32080 -.incbin "baserom/ovl_En_Weather_Tag", 0x1060, 0x00000210 +.balign 16 + +glabel D_80B32080 + .incbin "baserom/ovl_En_Weather_Tag", 0x1060, 0x00000210 diff --git a/data/overlays/actors/z_en_weiyer.data.s b/data/overlays/actors/z_en_weiyer.data.s index bbf40401c0..69fb231d43 100644 --- a/data/overlays/actors/z_en_weiyer.data.s +++ b/data/overlays/actors/z_en_weiyer.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel En_Weiyer_InitVars .word 0x018C0500, 0x00000005, 0x00260000, 0x000002D0 .word EnWeiyer_Init diff --git a/data/overlays/actors/z_en_weiyer.reloc.s b/data/overlays/actors/z_en_weiyer.reloc.s index 7bef59cd0e..ea056d09d0 100644 --- a/data/overlays/actors/z_en_weiyer.reloc.s +++ b/data/overlays/actors/z_en_weiyer.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_80B33B30 -.incbin "baserom/ovl_En_Weiyer", 0x18A0, 0x00000180 +.balign 16 + +glabel D_80B33B30 + .incbin "baserom/ovl_En_Weiyer", 0x18A0, 0x00000180 diff --git a/data/overlays/actors/z_en_wf.data.s b/data/overlays/actors/z_en_wf.data.s index 3ea37fdfc3..32c8f10d61 100644 --- a/data/overlays/actors/z_en_wf.data.s +++ b/data/overlays/actors/z_en_wf.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel D_80B37990 .word 0x00000000, 0xFFCFFFFF, 0x00040000, 0x00000000, 0x00000000, 0x01000000, 0x0F000000, 0x00000000, 0x000F0064, 0x00000000, 0xFFCFFFFF, 0x00040000, 0x00000000, 0x00000000, 0x01000000, 0x15000000, 0x00000000, 0x000F0064, 0x01000000, 0x00000000, 0x00000000, 0xFFC1FFFF, 0x00000000, 0x00050100, 0x11000320, 0x00000000, 0x00190064, 0x01000000, 0x00000000, 0x00000000, 0xFFC1FFFF, 0x00000000, 0x00050100, 0x0C000000, 0x00000000, 0x001E0064 glabel D_80B37A20 diff --git a/data/overlays/actors/z_en_wf.reloc.s b/data/overlays/actors/z_en_wf.reloc.s index 4980c3271a..7431ec0bb6 100644 --- a/data/overlays/actors/z_en_wf.reloc.s +++ b/data/overlays/actors/z_en_wf.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_80B37C60 -.incbin "baserom/ovl_En_Wf", 0x3FB0, 0x00000400 +.balign 16 + +glabel D_80B37C60 + .incbin "baserom/ovl_En_Wf", 0x3FB0, 0x00000400 diff --git a/data/overlays/actors/z_en_wonder_item.bss.s b/data/overlays/actors/z_en_wonder_item.bss.s index 748185b14f..4180296aa0 100644 --- a/data/overlays/actors/z_en_wonder_item.bss.s +++ b/data/overlays/actors/z_en_wonder_item.bss.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers -.bss +.section .bss + +.balign 16 glabel D_80B39010 .space 0x70 diff --git a/data/overlays/actors/z_en_wonder_item.data.s b/data/overlays/actors/z_en_wonder_item.data.s index 41ead45e97..b1ad436f98 100644 --- a/data/overlays/actors/z_en_wonder_item.data.s +++ b/data/overlays/actors/z_en_wonder_item.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel D_80B38D40 .word 0x0A000900, 0x20010000, 0x00000000, 0x00000000, 0x00000000, 0xFFCFFFFF, 0x00000000, 0x00010000, 0x0014001E, 0x00000000, 0x00000000 glabel En_Wonder_Item_InitVars diff --git a/data/overlays/actors/z_en_wonder_item.reloc.s b/data/overlays/actors/z_en_wonder_item.reloc.s index 498f25304a..b59e7c81d4 100644 --- a/data/overlays/actors/z_en_wonder_item.reloc.s +++ b/data/overlays/actors/z_en_wonder_item.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_80B38F00 -.incbin "baserom/ovl_En_Wonder_Item", 0xEA0, 0x00000110 +.balign 16 + +glabel D_80B38F00 + .incbin "baserom/ovl_En_Wonder_Item", 0xEA0, 0x00000110 diff --git a/data/overlays/actors/z_en_wonder_talk.data.s b/data/overlays/actors/z_en_wonder_talk.data.s index e87918cdea..d90eca8403 100644 --- a/data/overlays/actors/z_en_wonder_talk.data.s +++ b/data/overlays/actors/z_en_wonder_talk.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel En_Wonder_Talk_InitVars .word 0x01470600, 0x08000009, 0x00010000, 0x00000168 .word EnWonderTalk_Init diff --git a/data/overlays/actors/z_en_wonder_talk.reloc.s b/data/overlays/actors/z_en_wonder_talk.reloc.s index 68feb33cbf..08dddf0e75 100644 --- a/data/overlays/actors/z_en_wonder_talk.reloc.s +++ b/data/overlays/actors/z_en_wonder_talk.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_80B39D90 -.incbin "baserom/ovl_En_Wonder_Talk", 0xCA0, 0x00000140 +.balign 16 + +glabel D_80B39D90 + .incbin "baserom/ovl_En_Wonder_Talk", 0xCA0, 0x00000140 diff --git a/data/overlays/actors/z_en_wonder_talk2.data.s b/data/overlays/actors/z_en_wonder_talk2.data.s index 8dcb4a328e..61c3f1bf39 100644 --- a/data/overlays/actors/z_en_wonder_talk2.data.s +++ b/data/overlays/actors/z_en_wonder_talk2.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel En_Wonder_Talk2_InitVars .word 0x01850700, 0x08000009, 0x00010000, 0x00000170 .word EnWonderTalk2_Init diff --git a/data/overlays/actors/z_en_wonder_talk2.reloc.s b/data/overlays/actors/z_en_wonder_talk2.reloc.s index 988515bfed..63a9b801b7 100644 --- a/data/overlays/actors/z_en_wonder_talk2.reloc.s +++ b/data/overlays/actors/z_en_wonder_talk2.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_80B3ADE0 -.incbin "baserom/ovl_En_Wonder_Talk2", 0xF10, 0x00000190 +.balign 16 + +glabel D_80B3ADE0 + .incbin "baserom/ovl_En_Wonder_Talk2", 0xF10, 0x00000190 diff --git a/data/overlays/actors/z_en_wood02.bss.s b/data/overlays/actors/z_en_wood02.bss.s index e989fbe1d5..af06b3f8b0 100644 --- a/data/overlays/actors/z_en_wood02.bss.s +++ b/data/overlays/actors/z_en_wood02.bss.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers -.bss +.section .bss + +.balign 16 glabel D_80B3C1D0 .space 0x04 diff --git a/data/overlays/actors/z_en_wood02.data.s b/data/overlays/actors/z_en_wood02.data.s index e9116e4ee0..3f9d8b470c 100644 --- a/data/overlays/actors/z_en_wood02.data.s +++ b/data/overlays/actors/z_en_wood02.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel En_Wood02_InitVars .word 0x00770600, 0x00000000, 0x007C0000, 0x000001A4 .word EnWood02_Init diff --git a/data/overlays/actors/z_en_wood02.reloc.s b/data/overlays/actors/z_en_wood02.reloc.s index d966ffb0f9..1b1c4228bf 100644 --- a/data/overlays/actors/z_en_wood02.reloc.s +++ b/data/overlays/actors/z_en_wood02.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_80B3C070 -.incbin "baserom/ovl_En_Wood02", 0x1100, 0x00000160 +.balign 16 + +glabel D_80B3C070 + .incbin "baserom/ovl_En_Wood02", 0x1100, 0x00000160 diff --git a/data/overlays/actors/z_en_xc.bss.s b/data/overlays/actors/z_en_xc.bss.s index 546549cbc4..0a2b1fb1a3 100644 --- a/data/overlays/actors/z_en_xc.bss.s +++ b/data/overlays/actors/z_en_xc.bss.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers -.bss +.section .bss + +.balign 16 glabel D_80B42D90 .space 0x10 diff --git a/data/overlays/actors/z_en_xc.data.s b/data/overlays/actors/z_en_xc.data.s index 35c8d1bf05..fb8f19d098 100644 --- a/data/overlays/actors/z_en_xc.data.s +++ b/data/overlays/actors/z_en_xc.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel D_80B41D40 .word 0x00000009, 0x01000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000100, 0x00190050, 0x00000000, 0x00000000 glabel D_80B41D6C diff --git a/data/overlays/actors/z_en_xc.reloc.s b/data/overlays/actors/z_en_xc.reloc.s index bd0d9c21d5..a84a2bd137 100644 --- a/data/overlays/actors/z_en_xc.reloc.s +++ b/data/overlays/actors/z_en_xc.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_80B422E0 -.incbin "baserom/ovl_En_Xc", 0x6100, 0x00000AB0 +.balign 16 + +glabel D_80B422E0 + .incbin "baserom/ovl_En_Xc", 0x6100, 0x00000AB0 diff --git a/data/overlays/actors/z_en_yabusame_mark.data.s b/data/overlays/actors/z_en_yabusame_mark.data.s index e4a052ad87..0f41e5e119 100644 --- a/data/overlays/actors/z_en_yabusame_mark.data.s +++ b/data/overlays/actors/z_en_yabusame_mark.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel D_80B434F0 .word 0x0A000900, 0x20030000, 0x00000000, 0x00000000, 0x00000000, 0x0001F824, 0x00000000, 0x00010000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 glabel En_Yabusame_Mark_InitVars diff --git a/data/overlays/actors/z_en_yabusame_mark.reloc.s b/data/overlays/actors/z_en_yabusame_mark.reloc.s index 8105a88860..5314ae7904 100644 --- a/data/overlays/actors/z_en_yabusame_mark.reloc.s +++ b/data/overlays/actors/z_en_yabusame_mark.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_80B438C0 -.incbin "baserom/ovl_En_Yabusame_Mark", 0xB00, 0x00000100 +.balign 16 + +glabel D_80B438C0 + .incbin "baserom/ovl_En_Yabusame_Mark", 0xB00, 0x00000100 diff --git a/data/overlays/actors/z_en_yukabyun.data.s b/data/overlays/actors/z_en_yukabyun.data.s index e91ce1e683..faa33990d9 100644 --- a/data/overlays/actors/z_en_yukabyun.data.s +++ b/data/overlays/actors/z_en_yukabyun.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel En_Yukabyun_InitVars .word 0x006B0500, 0x00000010, 0x005F0000, 0x000001A0 .word EnYukabyun_Init diff --git a/data/overlays/actors/z_en_yukabyun.reloc.s b/data/overlays/actors/z_en_yukabyun.reloc.s index 80e2e79d6a..625f9e6d48 100644 --- a/data/overlays/actors/z_en_yukabyun.reloc.s +++ b/data/overlays/actors/z_en_yukabyun.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_80B43FB0 -.incbin "baserom/ovl_En_Yukabyun", 0x5F0, 0x000000A0 +.balign 16 + +glabel D_80B43FB0 + .incbin "baserom/ovl_En_Yukabyun", 0x5F0, 0x000000A0 diff --git a/data/overlays/actors/z_en_zf.bss.s b/data/overlays/actors/z_en_zf.bss.s index 9dec5fa8bc..bf54a73ffa 100644 --- a/data/overlays/actors/z_en_zf.bss.s +++ b/data/overlays/actors/z_en_zf.bss.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers -.bss +.section .bss + +.balign 16 glabel D_80B4AB30 .space 0x10 diff --git a/data/overlays/actors/z_en_zf.data.s b/data/overlays/actors/z_en_zf.data.s index 7eb28e0e02..6ebc70dc87 100644 --- a/data/overlays/actors/z_en_zf.data.s +++ b/data/overlays/actors/z_en_zf.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel D_80B4A090 .word 0x455E8000, 0x42C80000, 0xC4BDA000, 0x45462000, 0x42C80000, 0xC4DCE000, 0x4545D000, 0x42C80000, 0xC50A9000, 0x455EB000, 0x42C80000, 0xC5185000, 0x4576A000, 0x42C80000, 0xC50A9000, 0x45766000, 0x42C80000, 0xC4DCA000, 0x4532D000, 0x42C80000, 0xC515A000, 0x452D8000, 0x42C80000, 0xC4F86000, 0x458D7800, 0x4404C000, 0xC48F4000, 0x458AD000, 0x4404C000, 0xC4AFA000, 0x45825000, 0x4404C000, 0xC4AE6000, 0x457BE000, 0x4404C000, 0xC4914000, 0x457AA000, 0x4404C000, 0xC45CC000, 0x45857000, 0x4404C000, 0xC44A8000, 0x458D4000, 0x4404C000, 0xC45C0000, 0x45852000, 0x4404C000, 0xC4816000, 0x4594A800, 0x4404C000, 0xC48F4000, 0x4570A000, 0x4404C000, 0xC45CC000, 0x4588E000, 0x4404C000, 0xC42C8000, 0x45832800, 0x4404C000, 0xC4218000, 0x457E6000, 0x4404C000, 0xC4C4E000, 0x4575A000, 0x4404C000, 0xC4D52000, 0x456C4000, 0x4404C000, 0xC4E56000, 0x455E8000, 0x4404C000, 0xC4F82000 glabel D_80B4A1B0 diff --git a/data/overlays/actors/z_en_zf.reloc.s b/data/overlays/actors/z_en_zf.reloc.s index aac13a46fa..3419422d61 100644 --- a/data/overlays/actors/z_en_zf.reloc.s +++ b/data/overlays/actors/z_en_zf.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_80B4A450 -.incbin "baserom/ovl_En_Zf", 0x6400, 0x000006E0 +.balign 16 + +glabel D_80B4A450 + .incbin "baserom/ovl_En_Zf", 0x6400, 0x000006E0 diff --git a/data/overlays/actors/z_en_zl1.data.s b/data/overlays/actors/z_en_zl1.data.s index 4e021a8350..2179e628b6 100644 --- a/data/overlays/actors/z_en_zl1.data.s +++ b/data/overlays/actors/z_en_zl1.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel D_80B4C5D0 .word 0x0000001C, 0x00000BB8, 0x0000000A, 0x00000003, 0x00050190, 0x04BB0000, 0xC0000000, 0xFFFFFE5A, 0x00000054, 0x00000001, 0xFFFFFE5A, 0x00000054, 0x00000001, 0x0F6484E4, 0x00000000, 0x00000001, 0x000104BB, 0x04D90000, 0xC0000000, 0xFFFFFE5A, 0x00000054, 0x00000001, 0xFFFFFE1D, 0x00000054, 0x00000000, 0x0F6484E4, 0x00000000, 0x00000001, 0x002904D9, 0x051F0000, 0xC0000000, 0xFFFFFE1D, 0x00000054, 0x00000000, 0xFFFFFE1D, 0x00000054, 0x00000000, 0x0F6484E4, 0x00000000, 0x00000001, 0x00000012, 0x00000001, 0x00070492, 0x05247477, 0x00000000, 0xFFFFFE1B, 0x00000054, 0x00000000, 0xFFFFFE2B, 0x00000055, 0xFFFFFFC9, 0x3DE07038, 0x3BE07038, 0xBDE07038, 0x00000049, 0x00000001, 0x00010000, 0x0BB80000, 0x00000000, 0x00000000, 0xFFFFFFE8, 0x00000003, 0x00000000, 0xFFFFFFE8, 0x00000003, 0x00000000, 0x00000000, 0x00000000, 0x00000010, 0x00000003, 0x000904C4, 0x051E8000, 0x00000000, 0xFFFFFC86, 0x0000005A, 0x00000096, 0xFFFFFC86, 0x0000005A, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000A051E, 0x05A90000, 0x00000000, 0xFFFFFC86, 0x0000005A, 0x00000000, 0xFFFFFC86, 0x0000005A, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000405A9, 0x05B10000, 0x00000000, 0xFFFFFC86, 0x0000005A, 0x00000000, 0xFFFFFC86, 0x0000005A, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000003, 0x00000001, 0x000C05B4, 0x05B50000, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000002, 0xFFFFFFFF, 0x00000000, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x0000001D, 0x00000001, 0x0002014A, 0x02FB0000, 0x00000000, 0xFFFFFB1E, 0x00000096, 0x00000000, 0xFFFFFB1E, 0x00000096, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000002D, 0x00000001, 0x000100C8, 0x00E700E7, 0x0000002D, 0x00000001, 0x000500E6, 0x010F010F, 0x0000002D, 0x00000001, 0x0001035C, 0x03660366, 0x0000002D, 0x00000001, 0x0005036B, 0x03840384, 0x00000001, 0x00010000, 0x014B0000, 0x00000000, 0x42733334, 0xFE410080, 0x00012031, 0x00000000, 0x42733334, 0xFE410080, 0x00013533, 0x00000000, 0x42733334, 0xFE410080, 0x00013833, 0x00000000, 0x42733334, 0xFE410080, 0x00012C20, 0x00000000, 0x42733334, 0xFE780091, 0x00012032, 0x00000000, 0x42733334, 0xFEC200A8, 0x00013533, 0x00000000, 0x42733334, 0xFF2200C6, 0x00013639, 0x00000000, 0x42733334, 0xFF6E00DD, 0x0001392C, 0x00000000, 0x42733334, 0xFF7C00DE, 0x00012032, 0x00000000, 0x42733334, 0xFFBE010B, 0x00013632, 0x00000000, 0x42733334, 0xFFBE010B, 0x00013639, 0x00000000, 0x42733334, 0xFFBE010B, 0x0001392C, 0x00000000, 0x42733334, 0xFFBE010B, 0x00012031, 0x00000000, 0x42733334, 0xFFBE010B, 0x00013533, 0xFF000000, 0x42733334, 0xFFBE010B, 0x00013336, 0x00000001, 0x000100E6, 0x065F0000, 0x00000000, 0x42700000, 0xFB3C01BD, 0x00182031, 0x00000000, 0x42700000, 0xFB3C01BD, 0x00183533, 0x00000000, 0x42700000, 0xFB3C01BD, 0x00183833, 0x00000000, 0x42700000, 0xFB3C01BD, 0x00182C20, 0x00000000, 0x42700000, 0xFB3C01BD, 0x00182032, 0x00000000, 0x42700000, 0xFB3C01BD, 0x00183533, 0x00000000, 0x42700000, 0xFB3C01BD, 0x00183639, 0x00000000, 0x42700000, 0xFB3C01BD, 0x0018392C, 0x00000000, 0x42700000, 0xFB3C01BD, 0x00182032, 0x00000000, 0x42700000, 0xFB3C0103, 0x00183632, 0x00000000, 0x42700000, 0xFB3C00BD, 0x00183639, 0x00000000, 0x42700000, 0xFB9100C6, 0x0051392C, 0x00000000, 0x42700000, 0xFB940077, 0x00542031, 0x00000000, 0x42726667, 0xFB510089, 0x00243533, 0x00000000, 0x42726667, 0xFB3E007F, 0x00163336, 0x00000000, 0x42726667, 0xFB3E007F, 0x0016332C, 0x00000000, 0x42726667, 0xFB3E007F, 0x00162032, 0x00000000, 0x42726667, 0xFB3E007F, 0x00163231, 0x00000000, 0x42726667, 0xFB3E007F, 0x00163232, 0x00000000, 0x42726667, 0xFB3E007F, 0x0016392C, 0x00000000, 0x42726667, 0xFB3E007F, 0x00162034, 0x00000000, 0x42726667, 0xFB3E007F, 0x00163331, 0x00000000, 0x42726667, 0xFB3E007F, 0x00163434, 0x00000000, 0x42726667, 0xFB3E007F, 0x0016312C, 0x00000000, 0x42726667, 0xFB3E007F, 0x00162032, 0x00000000, 0x42726667, 0xFB3E007F, 0x00163136, 0x00000000, 0x42726667, 0xFB3E007F, 0x00163336, 0x00000000, 0x42726667, 0xFB3E007F, 0x0016332C, 0x00000000, 0x42726667, 0xFB3E007F, 0x0016200A, 0x00000000, 0x42726667, 0xFB3E007F, 0x00163136, 0xFF000000, 0x42726667, 0xFB3E007F, 0x00163336, 0x00000001, 0x0001032A, 0x04110000, 0x00000000, 0x42726668, 0xFB3E007F, 0x00162031, 0x00000000, 0x42726668, 0xFB3E007F, 0x00163533, 0x00000000, 0x42726668, 0xFB3E007F, 0x00163833, 0x00000000, 0x42726668, 0xFB3E0058, 0x00152C20, 0x00000000, 0x42726668, 0xFB48FFCC, 0x00172032, 0x00000000, 0x42726668, 0xFB4FFF8E, 0x001A3533, 0x00000000, 0x42726668, 0xFB4FFF8E, 0x001A3639, 0x00000000, 0x42726668, 0xFB4FFF8E, 0x001A392C, 0x00000000, 0x42726668, 0xFB4FFF8E, 0x001A2032, 0x00000000, 0x42726668, 0xFB4FFF8E, 0x001A3632, 0xFF000000, 0x42726668, 0xFB4FFF8E, 0x001A3639, 0x00000001, 0x00010366, 0x04ED0000, 0x00000000, 0x42A08C84, 0xFFC500A0, 0x01402031, 0x00000000, 0x42704C78, 0xFFC500A0, 0x01403533, 0x00000000, 0x42704C78, 0xFFC500A0, 0x01403833, 0x00000000, 0x42704C78, 0xFFC500A0, 0x01402C20, 0x00000000, 0x42704C78, 0xFF8D0094, 0x00F92032, 0x00000000, 0x42704C78, 0xFF42007E, 0x00C03533, 0x00000000, 0x42704C78, 0xFEE20069, 0x00873639, 0x00000000, 0x42704C78, 0xFE9B006C, 0x0057392C, 0x00000000, 0x42704C78, 0xFE760068, 0x00352032, 0x00000000, 0x42704C78, 0xFE760068, 0x00353632, 0x00000000, 0x42704C78, 0xFE760068, 0x00353639, 0x00000000, 0x42704C78, 0xFE760068, 0x0035392C, 0x00000000, 0x42704C78, 0xFE760068, 0x00352031, 0xFF000000, 0x42704C78, 0xFE760068, 0x00353533, 0x00000001, 0x00010488, 0x05790000, 0x00000000, 0x42700000, 0xFE3500AF, 0x00502031, 0x00000000, 0x42700000, 0xFE3500AF, 0x00503533, 0x00000000, 0x42700000, 0xFE3500AF, 0x00503833, 0x00000000, 0x42700000, 0xFE3500AF, 0x00502C20, 0x00000000, 0x42700000, 0xFE3500AF, 0x00502032, 0x00000000, 0x42700000, 0xFE3500AF, 0x00503533, 0x00000000, 0x42700000, 0xFE3500AF, 0x00503639, 0x00000000, 0x42700000, 0xFE3500AF, 0x0050392C, 0xFF000000, 0x42700000, 0xFE3500AF, 0x00502032, 0x00000001, 0x000104EC, 0x05830000, 0x00000000, 0x4234CCBE, 0xFE330085, 0x00002031, 0x00000000, 0x4234CCBE, 0xFE330085, 0x00003533, 0x00000000, 0x4234CCBE, 0xFE330085, 0x00003833, 0x00000000, 0x4234CCBE, 0xFE330085, 0x00002C20, 0x00000000, 0x4234CCBE, 0xFE330085, 0x00002032, 0xFF000000, 0x4234CCBE, 0xFE330085, 0x00003533, 0x00000001, 0x00010528, 0x05FB0000, 0x00000000, 0x412FFF56, 0xFE18007C, 0xFFFA2031, 0x00000000, 0x412FFF56, 0xFE18007C, 0xFFFA3533, 0x00000000, 0x412FFF56, 0xFE18007C, 0xFFFA3833, 0x00000000, 0x412FFF56, 0xFE18007C, 0xFFFA2C20, 0x00000000, 0x412FFF56, 0xFE18007C, 0xFFFA2032, 0x00000000, 0x412FFF56, 0xFE18007C, 0xFFFA3533, 0x00000000, 0x412FFF56, 0xFE18007C, 0xFFFA3639, 0xFF000000, 0x412FFF56, 0xFE18007C, 0xFFFA392C, 0x00000002, 0x00010000, 0x01680000, 0x0000001E, 0x42726667, 0xFE06006E, 0x00012031, 0x0000001E, 0x42733334, 0xFE06006E, 0x00013533, 0x0000001E, 0x42733334, 0xFE06006E, 0x00013833, 0x0000001E, 0x42733334, 0xFE06006E, 0x00012C20, 0x00000019, 0x42733334, 0xFE3D007F, 0x00012032, 0x00000019, 0x42733334, 0xFE840095, 0x00013533, 0x00000014, 0x42733334, 0xFEDD00B1, 0x00013639, 0x00000014, 0x42733334, 0xFF2000D2, 0x0001392C, 0x00000014, 0x42733334, 0xFF2B00E6, 0x00012032, 0x00000014, 0x42733334, 0xFF710123, 0x00013632, 0x00000014, 0x42733334, 0xFF790134, 0x00013639, 0x00000014, 0x42733334, 0xFF81013F, 0x0001392C, 0x00000014, 0x42733334, 0xFF880146, 0x00012031, 0x00000014, 0x42733334, 0xFF880146, 0x00013533, 0xFF00001E, 0x42733334, 0xFF880146, 0x00013336, 0x00000002, 0x000100E6, 0x06AE0000, 0x0000001E, 0x42700000, 0xFB22019D, 0x00052031, 0x0000001E, 0x42700000, 0xFB22019D, 0x00053533, 0x0000001E, 0x42700000, 0xFB22019D, 0x00053833, 0x0000001E, 0x42700000, 0xFB22019D, 0x00052C20, 0x0000001E, 0x42700000, 0xFB22019D, 0x00052032, 0x0000001E, 0x42700000, 0xFB22019D, 0x00053533, 0x0000001E, 0x42700000, 0xFB22019D, 0x00053639, 0x0000001E, 0x42700000, 0xFB22019D, 0x0005392C, 0x0000001E, 0x42700000, 0xFB22019D, 0x00052032, 0x0000001E, 0x42700000, 0xFB2300E3, 0x00053632, 0x0000001E, 0x42700000, 0xFB23009E, 0x00053639, 0x0000001E, 0x42700000, 0xFB6400B2, 0x0032392C, 0x00000050, 0x42700000, 0xFB660083, 0x00332031, 0x00000050, 0x42726667, 0xFB280092, 0x00063533, 0x0000001E, 0x42726667, 0xFB1B0099, 0xFFFD3336, 0x0000001E, 0x42726667, 0xFB1B0099, 0xFFFD332C, 0x0000001E, 0x42726667, 0xFB1B0099, 0xFFFD2032, 0x0000001E, 0x42726667, 0xFB1B0099, 0xFFFD3231, 0x0000001E, 0x42726667, 0xFB1B0099, 0xFFFD3232, 0x0000001E, 0x42726667, 0xFB1C0098, 0xFFFE392C, 0x0000001E, 0x42726667, 0xFB1C0098, 0xFFFE2034, 0x00000050, 0x42726667, 0xFB1C0098, 0xFFFE3331, 0x00000050, 0x42726667, 0xFB1C0098, 0xFFFE3434, 0x00000050, 0x42726667, 0xFB1C0098, 0xFFFE312C, 0x00000050, 0x42726667, 0xFB1D0097, 0xFFFF2032, 0x00000050, 0x42726667, 0xFB1D0097, 0xFFFF3136, 0x00000050, 0x42726667, 0xFB1D0097, 0xFFFF3336, 0x00000050, 0x42726667, 0xFB1D0097, 0xFFFF332C, 0x00000050, 0x42726667, 0xFB1D0097, 0xFFFF200A, 0x0000001E, 0x42726667, 0xFB1D0097, 0xFFFF3136, 0xFF000050, 0x42726667, 0xFB1D0097, 0xFFFF3336, 0x00000002, 0x0001032A, 0x042E0000, 0x0000001E, 0x42726668, 0xFB1D0097, 0xFFFF2031, 0x0000001E, 0x42726668, 0xFB1D0097, 0xFFFF3533, 0x00000014, 0x42726668, 0xFB1E0096, 0x00003833, 0x0000000A, 0x42726668, 0xFB27007D, 0x00052C20, 0x0000000A, 0x42726668, 0xFB36FFF3, 0x000A2032, 0x0000000A, 0x42726668, 0xFB3EFFB7, 0x001A3533, 0x0000001E, 0x42726668, 0xFB3EFFB7, 0x001A3639, 0x0000001E, 0x42726668, 0xFB3EFFB7, 0x001A392C, 0x0000001E, 0x42726668, 0xFB3EFFB7, 0x001A2032, 0x0000001E, 0x42726668, 0xFB3EFFB7, 0x001A3632, 0xFF00001E, 0x42726668, 0xFB3EFFB7, 0x001A3639, 0x00000002, 0x00010366, 0x050A0000, 0x0000001E, 0x42704C78, 0xFFD300F0, 0x00F12031, 0x0000001E, 0x42704C78, 0xFFD300F0, 0x00F13533, 0x0000001E, 0x42704C78, 0xFFC800DB, 0x00E03833, 0x0000001E, 0x42704C78, 0xFFAB00B7, 0x00D42C20, 0x0000001E, 0x42704C78, 0xFF340086, 0x00B72032, 0x0000001E, 0x42704C78, 0xFEE80074, 0x007D3533, 0x0000001E, 0x42704C78, 0xFE880068, 0x00453639, 0x0000001E, 0x42704C78, 0xFE48006B, 0x000D392C, 0x0000001E, 0x42704C78, 0xFE2D006E, 0xFFE72032, 0x0000001E, 0x42704C78, 0xFE2D006E, 0xFFE73632, 0x0000001E, 0x42704C78, 0xFE2D006E, 0xFFE73639, 0x0000001E, 0x42704C78, 0xFE2D006E, 0xFFE7392C, 0x0000001E, 0x42704C78, 0xFE2D006E, 0xFFE72031, 0xFF00001E, 0x42704C78, 0xFE2D006E, 0xFFE73533, 0x00000002, 0x00010488, 0x05960000, 0x0000001E, 0x42700000, 0xFE38008A, 0x00102031, 0x0000001E, 0x42700000, 0xFE38008A, 0x00103533, 0x0000001E, 0x42700000, 0xFE38008A, 0x00103833, 0x0000001E, 0x42700000, 0xFE38008A, 0x00102C20, 0x0000001E, 0x42700000, 0xFE38008A, 0x00102032, 0x0000001E, 0x42700000, 0xFE38008A, 0x00103533, 0x0000001E, 0x42700000, 0xFE38008A, 0x00103639, 0x0000001E, 0x42700000, 0xFE38008A, 0x0010392C, 0xFF00001E, 0x42700000, 0xFE38008A, 0x00102032, 0x00000002, 0x000104EC, 0x05A00000, 0x0000001E, 0x4234CCBE, 0xFDE90085, 0x00002031, 0x0000001E, 0x4234CCBE, 0xFDE90085, 0x00003533, 0x0000001E, 0x4234CCBE, 0xFDE90085, 0x00003833, 0x0000001E, 0x4234CCBE, 0xFDE90085, 0x00002C20, 0x0000001E, 0x4234CCBE, 0xFDE90085, 0x00002032, 0xFF00001E, 0x4234CCBE, 0xFDE90085, 0x00003533, 0x00000002, 0x00010528, 0x06180000, 0x0000001E, 0x412FFF56, 0xFABB007C, 0xFFFA2031, 0x0000001E, 0x412FFF56, 0xFABB007C, 0xFFFA3533, 0x0000001E, 0x412FFF56, 0xFABB007C, 0xFFFA3833, 0x0000001E, 0x412FFF56, 0xFABB007C, 0xFFFA2C20, 0x0000001E, 0x412FFF56, 0xFABB007C, 0xFFFA2032, 0x0000001E, 0x412FFF56, 0xFABB007C, 0xFFFA3533, 0x0000001E, 0x412FFF56, 0xFABB007C, 0xFFFA3639, 0xFF00001E, 0x412FFF56, 0xFABB007C, 0xFFFA392C, 0x00000013, 0x0000000A, 0xFFFF0000, 0x0032FFFF, 0xFFFFFFFF, 0x70350032, 0x00BE0000, 0xFFFFFFFF, 0xFFFF00BE, 0x012CFFFF, 0xFFFFFFFF, 0x7036012C, 0x03200000, 0xFFFFFFFF, 0xFFFF0320, 0x03CAFFFF, 0xFFFFFFFF, 0x703703CA, 0x047E0000, 0xFFFF7038, 0xFFFF047E, 0x04A6FFFF, 0xFFFFFFFF, 0x700504A6, 0x04B00000, 0xFFFF700B, 0xFFFF04B0, 0x053CFFFF, 0xFFFFFFFF, 0x7009053C, 0x058C0000, 0xFFFFFFFF, 0x00000056, 0x00000001, 0x004E00E6, 0x00E70000, 0x00000000, 0x00000003, 0x00000000, 0x00000000, 0x00000003, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000056, 0x00000001, 0x002A0366, 0x03670000, 0x00000000, 0xFFFFFFFE, 0x00000000, 0xFFFFFFFD, 0xFFFFFFFE, 0x00000000, 0xFFFFFFFD, 0x00000000, 0x00000000, 0x00000000, 0x00000057, 0x00000001, 0x0001006E, 0x006F0000, 0x00000000, 0xFFFFFFFE, 0x00000000, 0x00000001, 0xFFFFFFFE, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000000, 0xC3DC0000, 0x42EA0000, 0x00000000, 0xC3F50000, 0x42F00000, 0x00000000, 0x0000002D, 0xC3F20000, 0x42F40000, 0xC1E80000, 0xC3F00000, 0x42E80000, 0x41900000, 0x00000050, 0xC3CE8000, 0x43080000, 0xC2900000, 0xC3C98000, 0x430D0000, 0xC2B20000, 0x00000019, 0xC3E30000, 0x42F00000, 0x00000000, 0xC3D90000, 0x42F20000, 0x00000000, 0x00000014, 0xC3E30000, 0x42F00000, 0x00000000, 0xC3D70000, 0x42CE0000, 0xC2140000, 0x00000014, 0xC3E30000, 0x42D20000, 0x42480000, 0xC3E28000, 0x42D20000, 0x42840000, 0x0000003C, 0xC3FA8000, 0x42F40000, 0x00000000, 0xC3E08000, 0x42EE0000, 0x00000000, 0x0000002D, 0xC3E70000, 0x42F20000, 0x00000000, 0xC3D18000, 0x42FA0000, 0x00000000, 0x00000014, 0xC409C000, 0x42EE0000, 0x40E00000, 0xC412C000, 0x42E60000, 0x41600000, 0x00000014, 0xC3F48000, 0x43010000, 0x00000000, 0xC3EB0000, 0x43000000, 0x00000000, 0x00000028, 0xC4034000, 0x42FC0000, 0x00000000, 0xC3FE8000, 0x42FC0000, 0x00000000, 0x0000000A, 0xC3F58000, 0x42F00000, 0xC0E00000, 0xC3FE8000, 0x42E60000, 0xC0E00000, 0x0000004B, 0xC3F28000, 0x42F00000, 0xC2280000, 0xC3F20000, 0x42F00000, 0x41200000, 0x0000002D glabel D_80B4D72C diff --git a/data/overlays/actors/z_en_zl1.reloc.s b/data/overlays/actors/z_en_zl1.reloc.s index f27927a2af..7b08c0cbba 100644 --- a/data/overlays/actors/z_en_zl1.reloc.s +++ b/data/overlays/actors/z_en_zl1.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_80B4E790 -.incbin "baserom/ovl_En_Zl1", 0x3C50, 0x00000200 +.balign 16 + +glabel D_80B4E790 + .incbin "baserom/ovl_En_Zl1", 0x3C50, 0x00000200 diff --git a/data/overlays/actors/z_en_zl2.data.s b/data/overlays/actors/z_en_zl2.data.s index be017fda40..10da87e82f 100644 --- a/data/overlays/actors/z_en_zl2.data.s +++ b/data/overlays/actors/z_en_zl2.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel D_80B52810 .word 0x060030C8, 0x06003C48, 0x06004048, 0x06004548, 0x06004948, 0x06004D48, 0x06005148, 0x06005D48, 0x06006148 glabel D_80B52834 diff --git a/data/overlays/actors/z_en_zl2.reloc.s b/data/overlays/actors/z_en_zl2.reloc.s index f06b4323c2..efeebb81ed 100644 --- a/data/overlays/actors/z_en_zl2.reloc.s +++ b/data/overlays/actors/z_en_zl2.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_80B52C70 -.incbin "baserom/ovl_En_Zl2", 0x42E0, 0x00000740 +.balign 16 + +glabel D_80B52C70 + .incbin "baserom/ovl_En_Zl2", 0x42E0, 0x00000740 diff --git a/data/overlays/actors/z_en_zl3.data.s b/data/overlays/actors/z_en_zl3.data.s index dd06ee83ba..a0cc2edcb0 100644 --- a/data/overlays/actors/z_en_zl3.data.s +++ b/data/overlays/actors/z_en_zl3.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel D_80B5A410 .word 0x00000009, 0x01000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000100, 0x00190050, 0x00000000, 0x00000000 glabel D_80B5A43C diff --git a/data/overlays/actors/z_en_zl3.reloc.s b/data/overlays/actors/z_en_zl3.reloc.s index 5ca3dcc3fd..79d912f326 100644 --- a/data/overlays/actors/z_en_zl3.reloc.s +++ b/data/overlays/actors/z_en_zl3.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_80B5ABA0 -.incbin "baserom/ovl_En_Zl3", 0x77F0, 0x00000C10 +.balign 16 + +glabel D_80B5ABA0 + .incbin "baserom/ovl_En_Zl3", 0x77F0, 0x00000C10 diff --git a/data/overlays/actors/z_en_zl4.data.s b/data/overlays/actors/z_en_zl4.data.s index aa0a39d9cf..6b655313fd 100644 --- a/data/overlays/actors/z_en_zl4.data.s +++ b/data/overlays/actors/z_en_zl4.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel En_Zl4_InitVars .word 0x01D30400, 0x00000019, 0x01910000, 0x000002F0 .word EnZl4_Init diff --git a/data/overlays/actors/z_en_zl4.reloc.s b/data/overlays/actors/z_en_zl4.reloc.s index 27365967ae..4e8450df2f 100644 --- a/data/overlays/actors/z_en_zl4.reloc.s +++ b/data/overlays/actors/z_en_zl4.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_80B5FD20 -.incbin "baserom/ovl_En_Zl4", 0x4570, 0x00000500 +.balign 16 + +glabel D_80B5FD20 + .incbin "baserom/ovl_En_Zl4", 0x4570, 0x00000500 diff --git a/data/overlays/actors/z_en_zo.data.s b/data/overlays/actors/z_en_zo.data.s index 2c47f380c6..1998c04d40 100644 --- a/data/overlays/actors/z_en_zo.data.s +++ b/data/overlays/actors/z_en_zo.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel D_80B62450 .word 0x00000000, 0x00000000, 0x00000000 glabel D_80B6245C diff --git a/data/overlays/actors/z_en_zo.reloc.s b/data/overlays/actors/z_en_zo.reloc.s index ca1b82098e..1e01156bfb 100644 --- a/data/overlays/actors/z_en_zo.reloc.s +++ b/data/overlays/actors/z_en_zo.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_80B62720 -.incbin "baserom/ovl_En_Zo", 0x2500, 0x000002A0 +.balign 16 + +glabel D_80B62720 + .incbin "baserom/ovl_En_Zo", 0x2500, 0x000002A0 diff --git a/data/overlays/actors/z_end_title.data.s b/data/overlays/actors/z_end_title.data.s index 304d95b827..4aa538cd3f 100644 --- a/data/overlays/actors/z_end_title.data.s +++ b/data/overlays/actors/z_end_title.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel End_Title_InitVars .word 0x017F0700, 0x00000030, 0x00010000, 0x00000150 .word EndTitle_Init diff --git a/data/overlays/actors/z_end_title.reloc.s b/data/overlays/actors/z_end_title.reloc.s index 23f720946c..b5928be9de 100644 --- a/data/overlays/actors/z_end_title.reloc.s +++ b/data/overlays/actors/z_end_title.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_80B698F0 -.incbin "baserom/ovl_End_Title", 0x41D0, 0x000000B0 +.balign 16 + +glabel D_80B698F0 + .incbin "baserom/ovl_End_Title", 0x41D0, 0x000000B0 diff --git a/data/overlays/actors/z_fishing.bss.s b/data/overlays/actors/z_fishing.bss.s index 5e6d937370..a9dcf6c9de 100644 --- a/data/overlays/actors/z_fishing.bss.s +++ b/data/overlays/actors/z_fishing.bss.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers -.bss +.section .bss + +.balign 16 glabel D_80B7E070 .space 0x04 diff --git a/data/overlays/actors/z_fishing.data.s b/data/overlays/actors/z_fishing.data.s index bdfe11d4bc..ebd2c4c786 100644 --- a/data/overlays/actors/z_fishing.data.s +++ b/data/overlays/actors/z_fishing.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel Fishing_InitVars .word 0x00FE0400, 0x00000010, 0x015B0000, 0x00000550 .word Fishing_Init diff --git a/data/overlays/actors/z_fishing.reloc.s b/data/overlays/actors/z_fishing.reloc.s index 9de745c504..454b442314 100644 --- a/data/overlays/actors/z_fishing.reloc.s +++ b/data/overlays/actors/z_fishing.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_80B7B8F0 -.incbin "baserom/ovl_Fishing", 0x11F50, 0x00002780 +.balign 16 + +glabel D_80B7B8F0 + .incbin "baserom/ovl_Fishing", 0x11F50, 0x00002780 diff --git a/data/overlays/actors/z_item_b_heart.data.s b/data/overlays/actors/z_item_b_heart.data.s index fb0c6090bc..f3054437e4 100644 --- a/data/overlays/actors/z_item_b_heart.data.s +++ b/data/overlays/actors/z_item_b_heart.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel Item_B_Heart_InitVars .word 0x005F0800, 0x00000000, 0x00BD0000, 0x0000016C .word ItemBHeart_Init diff --git a/data/overlays/actors/z_item_b_heart.reloc.s b/data/overlays/actors/z_item_b_heart.reloc.s index 8517e59ca5..57dd351323 100644 --- a/data/overlays/actors/z_item_b_heart.reloc.s +++ b/data/overlays/actors/z_item_b_heart.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_80B85590 -.incbin "baserom/ovl_Item_B_Heart", 0x440, 0x00000060 +.balign 16 + +glabel D_80B85590 + .incbin "baserom/ovl_Item_B_Heart", 0x440, 0x00000060 diff --git a/data/overlays/actors/z_item_etcetera.data.s b/data/overlays/actors/z_item_etcetera.data.s index f4d78b05d4..85d7e2b5f1 100644 --- a/data/overlays/actors/z_item_etcetera.data.s +++ b/data/overlays/actors/z_item_etcetera.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel Item_Etcetera_InitVars .word 0x010F0600, 0x00000010, 0x00010000, 0x00000160 .word ItemEtcetera_Init diff --git a/data/overlays/actors/z_item_etcetera.reloc.s b/data/overlays/actors/z_item_etcetera.reloc.s index 4348c34330..9522b4c60e 100644 --- a/data/overlays/actors/z_item_etcetera.reloc.s +++ b/data/overlays/actors/z_item_etcetera.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_80B85E70 -.incbin "baserom/ovl_Item_Etcetera", 0x880, 0x00000170 +.balign 16 + +glabel D_80B85E70 + .incbin "baserom/ovl_Item_Etcetera", 0x880, 0x00000170 diff --git a/data/overlays/actors/z_item_ocarina.data.s b/data/overlays/actors/z_item_ocarina.data.s index ebe774026b..a8763f708d 100644 --- a/data/overlays/actors/z_item_ocarina.data.s +++ b/data/overlays/actors/z_item_ocarina.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel Item_Ocarina_InitVars .word 0x00F10700, 0x00000010, 0x00DE0000, 0x00000154 .word ItemOcarina_Init diff --git a/data/overlays/actors/z_item_ocarina.reloc.s b/data/overlays/actors/z_item_ocarina.reloc.s index 7b113c2387..f119fd3584 100644 --- a/data/overlays/actors/z_item_ocarina.reloc.s +++ b/data/overlays/actors/z_item_ocarina.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_80B86850 -.incbin "baserom/ovl_Item_Ocarina", 0x720, 0x000000D0 +.balign 16 + +glabel D_80B86850 + .incbin "baserom/ovl_Item_Ocarina", 0x720, 0x000000D0 diff --git a/data/overlays/actors/z_item_shield.data.s b/data/overlays/actors/z_item_shield.data.s index c2c6c680ec..38481669ec 100644 --- a/data/overlays/actors/z_item_shield.data.s +++ b/data/overlays/actors/z_item_shield.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel D_80B871A0 .word 0x0A000939, 0x10010000, 0x00000000, 0x00000000, 0x00000000, 0x00000004, 0x00000000, 0x00010100, 0x000F000F, 0x00000000, 0x00000000 glabel Item_Shield_InitVars diff --git a/data/overlays/actors/z_item_shield.reloc.s b/data/overlays/actors/z_item_shield.reloc.s index 3d904818ac..c4942cfe75 100644 --- a/data/overlays/actors/z_item_shield.reloc.s +++ b/data/overlays/actors/z_item_shield.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_80B872F0 -.incbin "baserom/ovl_Item_Shield", 0x9D0, 0x000000E0 +.balign 16 + +glabel D_80B872F0 + .incbin "baserom/ovl_Item_Shield", 0x9D0, 0x000000E0 diff --git a/data/overlays/actors/z_kaleido_scope.bss.s b/data/overlays/actors/z_kaleido_scope.bss.s index 5501759d0e..8ad4b4baa3 100644 --- a/data/overlays/actors/z_kaleido_scope.bss.s +++ b/data/overlays/actors/z_kaleido_scope.bss.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers -.bss +.section .bss + +.balign 16 glabel D_808321A0 .space 0x02 diff --git a/data/overlays/actors/z_kaleido_scope.data.s b/data/overlays/actors/z_kaleido_scope.data.s index 57393e9ddd..4e50de50ae 100644 --- a/data/overlays/actors/z_kaleido_scope.data.s +++ b/data/overlays/actors/z_kaleido_scope.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel D_8082A070 .word 0x00FF0000, 0x000000FF, 0x00FF0046, 0x00000096, 0x00FF0046, 0x00000096, 0x00FF0000, 0x000000FF glabel D_8082A090 diff --git a/data/overlays/actors/z_kaleido_scope.reloc.s b/data/overlays/actors/z_kaleido_scope.reloc.s index 16f4fceb73..19acdaaff5 100644 --- a/data/overlays/actors/z_kaleido_scope.reloc.s +++ b/data/overlays/actors/z_kaleido_scope.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_80830690 -.incbin "baserom/ovl_kaleido_scope", 0x1CE70, 0x00001B10 +.balign 16 + +glabel D_80830690 + .incbin "baserom/ovl_kaleido_scope", 0x1CE70, 0x00001B10 diff --git a/data/overlays/actors/z_kaleido_scope.rodata.s b/data/overlays/actors/z_kaleido_scope.rodata.s index 5acec788a3..0c30abfebb 100644 --- a/data/overlays/actors/z_kaleido_scope.rodata.s +++ b/data/overlays/actors/z_kaleido_scope.rodata.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata +.balign 16 + glabel D_8082F420 .asciz "../z_kaleido_collect.c" .balign 4 @@ -32,9 +34,11 @@ glabel D_8082F484 .balign 4 glabel D_8082F4A0 - .asciz "../z_kaleido_collect.c\x00\x00\x00\x00\x00\x00\x00\x00" + .asciz "../z_kaleido_collect.c" .balign 4 +.balign 16 + glabel D_8082F4C0 .word 0x25730000 glabel D_8082F4C4 @@ -248,9 +252,11 @@ glabel D_8082FA28 .balign 4 glabel D_8082FA40 - .asciz "../z_kaleido_map_PAL.c\x00\x00\x00\x00\x00\x00" + .asciz "../z_kaleido_map_PAL.c" .balign 4 +.balign 16 + glabel D_8082FA60 .asciz "../z_kaleido_scope_PAL.c" .balign 4 diff --git a/data/overlays/actors/z_magic_dark.data.s b/data/overlays/actors/z_magic_dark.data.s index f0d7804613..217b11cb68 100644 --- a/data/overlays/actors/z_magic_dark.data.s +++ b/data/overlays/actors/z_magic_dark.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel Magic_Dark_InitVars .word 0x00F40700, 0x02000010, 0x00010000, 0x00000164 .word MagicDark_Init diff --git a/data/overlays/actors/z_magic_dark.reloc.s b/data/overlays/actors/z_magic_dark.reloc.s index cbe290599a..0020832a63 100644 --- a/data/overlays/actors/z_magic_dark.reloc.s +++ b/data/overlays/actors/z_magic_dark.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_80B88C10 -.incbin "baserom/ovl_Magic_Dark", 0x1840, 0x00000160 +.balign 16 + +glabel D_80B88C10 + .incbin "baserom/ovl_Magic_Dark", 0x1840, 0x00000160 diff --git a/data/overlays/actors/z_magic_fire.data.s b/data/overlays/actors/z_magic_fire.data.s index af85383af6..bc07d9fa84 100644 --- a/data/overlays/actors/z_magic_fire.data.s +++ b/data/overlays/actors/z_magic_fire.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel Magic_Fire_InitVars .word 0x009F0700, 0x02000010, 0x00010000, 0x000001AC .word MagicFire_Init diff --git a/data/overlays/actors/z_magic_fire.reloc.s b/data/overlays/actors/z_magic_fire.reloc.s index 327e09ee6c..9ac73822c2 100644 --- a/data/overlays/actors/z_magic_fire.reloc.s +++ b/data/overlays/actors/z_magic_fire.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_80B8B020 -.incbin "baserom/ovl_Magic_Fire", 0x22B0, 0x000000E0 +.balign 16 + +glabel D_80B8B020 + .incbin "baserom/ovl_Magic_Fire", 0x22B0, 0x000000E0 diff --git a/data/overlays/actors/z_mir_ray.data.s b/data/overlays/actors/z_mir_ray.data.s index 65928fc4ee..048d6c0df7 100644 --- a/data/overlays/actors/z_mir_ray.data.s +++ b/data/overlays/actors/z_mir_ray.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel Mir_Ray_InitVars .word 0x00B70700, 0x00000030, 0x00AB0000, 0x000002B0 .word MirRay_Init diff --git a/data/overlays/actors/z_mir_ray.reloc.s b/data/overlays/actors/z_mir_ray.reloc.s index 2a5b711777..40a40dedff 100644 --- a/data/overlays/actors/z_mir_ray.reloc.s +++ b/data/overlays/actors/z_mir_ray.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_80B8E940 -.incbin "baserom/ovl_Mir_Ray", 0x18F0, 0x00000140 +.balign 16 + +glabel D_80B8E940 + .incbin "baserom/ovl_Mir_Ray", 0x18F0, 0x00000140 diff --git a/data/overlays/actors/z_obj_bean.data.s b/data/overlays/actors/z_obj_bean.data.s index 80342734ea..7b76afa386 100644 --- a/data/overlays/actors/z_obj_bean.data.s +++ b/data/overlays/actors/z_obj_bean.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel D_80B90E30 .word 0x00000000 glabel Obj_Bean_InitVars diff --git a/data/overlays/actors/z_obj_bean.reloc.s b/data/overlays/actors/z_obj_bean.reloc.s index e3044d0c75..18b02c4ecc 100644 --- a/data/overlays/actors/z_obj_bean.reloc.s +++ b/data/overlays/actors/z_obj_bean.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_80B91080 -.incbin "baserom/ovl_Obj_Bean", 0x2600, 0x000003E0 +.balign 16 + +glabel D_80B91080 + .incbin "baserom/ovl_Obj_Bean", 0x2600, 0x000003E0 diff --git a/data/overlays/actors/z_obj_dekujr.data.s b/data/overlays/actors/z_obj_dekujr.data.s index 87ca3dd88b..2326d09081 100644 --- a/data/overlays/actors/z_obj_dekujr.data.s +++ b/data/overlays/actors/z_obj_dekujr.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel Obj_Dekujr_InitVars .word 0x00D30400, 0x00000009, 0x00CC0000, 0x000001A4 .word ObjDekujr_Init diff --git a/data/overlays/actors/z_obj_dekujr.reloc.s b/data/overlays/actors/z_obj_dekujr.reloc.s index 54a97be5d7..a8e00206df 100644 --- a/data/overlays/actors/z_obj_dekujr.reloc.s +++ b/data/overlays/actors/z_obj_dekujr.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_80B92A90 -.incbin "baserom/ovl_Obj_Dekujr", 0x670, 0x00000070 +.balign 16 + +glabel D_80B92A90 + .incbin "baserom/ovl_Obj_Dekujr", 0x670, 0x00000070 diff --git a/data/overlays/actors/z_obj_hamishi.data.s b/data/overlays/actors/z_obj_hamishi.data.s index 70c96b6f96..b2713fd20a 100644 --- a/data/overlays/actors/z_obj_hamishi.data.s +++ b/data/overlays/actors/z_obj_hamishi.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel Obj_Hamishi_InitVars .word 0x01D20600, 0x00000000, 0x00020000, 0x000001A8 .word ObjHamishi_Init diff --git a/data/overlays/actors/z_obj_hamishi.reloc.s b/data/overlays/actors/z_obj_hamishi.reloc.s index 57bd8d97ff..557a162ea5 100644 --- a/data/overlays/actors/z_obj_hamishi.reloc.s +++ b/data/overlays/actors/z_obj_hamishi.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_80B937F0 -.incbin "baserom/ovl_Obj_Hamishi", 0x860, 0x00000070 +.balign 16 + +glabel D_80B937F0 + .incbin "baserom/ovl_Obj_Hamishi", 0x860, 0x00000070 diff --git a/data/overlays/actors/z_obj_hana.data.s b/data/overlays/actors/z_obj_hana.data.s index ae593d48c3..3522d7b9a8 100644 --- a/data/overlays/actors/z_obj_hana.data.s +++ b/data/overlays/actors/z_obj_hana.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel Obj_Hana_InitVars .word 0x014F0600, 0x00000000, 0x00020000, 0x00000198 .word ObjHana_Init diff --git a/data/overlays/actors/z_obj_hana.reloc.s b/data/overlays/actors/z_obj_hana.reloc.s index f3e882f5b6..1b82ef9223 100644 --- a/data/overlays/actors/z_obj_hana.reloc.s +++ b/data/overlays/actors/z_obj_hana.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_80B93AF0 -.incbin "baserom/ovl_Obj_Hana", 0x290, 0x00000070 +.balign 16 + +glabel D_80B93AF0 + .incbin "baserom/ovl_Obj_Hana", 0x290, 0x00000070 diff --git a/data/overlays/actors/z_obj_hsblock.data.s b/data/overlays/actors/z_obj_hsblock.data.s index c3a54681ac..6ace7c5a83 100644 --- a/data/overlays/actors/z_obj_hsblock.data.s +++ b/data/overlays/actors/z_obj_hsblock.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel Obj_Hsblock_InitVars .word 0x012D0100, 0x00000000, 0x011C0000, 0x00000168 .word ObjHsblock_Init diff --git a/data/overlays/actors/z_obj_hsblock.reloc.s b/data/overlays/actors/z_obj_hsblock.reloc.s index 020c52ef7c..88f61f96f3 100644 --- a/data/overlays/actors/z_obj_hsblock.reloc.s +++ b/data/overlays/actors/z_obj_hsblock.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_80B941A0 -.incbin "baserom/ovl_Obj_Hsblock", 0x640, 0x000000C0 +.balign 16 + +glabel D_80B941A0 + .incbin "baserom/ovl_Obj_Hsblock", 0x640, 0x000000C0 diff --git a/data/overlays/actors/z_obj_ice_poly.data.s b/data/overlays/actors/z_obj_ice_poly.data.s index 11ef520dcd..0c320db3e5 100644 --- a/data/overlays/actors/z_obj_ice_poly.data.s +++ b/data/overlays/actors/z_obj_ice_poly.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel Obj_Ice_Poly_InitVars .word 0x011E0600, 0x00000010, 0x00010000, 0x000001EC .word ObjIcePoly_Init diff --git a/data/overlays/actors/z_obj_ice_poly.reloc.s b/data/overlays/actors/z_obj_ice_poly.reloc.s index b930423b7c..090305a5c9 100644 --- a/data/overlays/actors/z_obj_ice_poly.reloc.s +++ b/data/overlays/actors/z_obj_ice_poly.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_80B94BF0 -.incbin "baserom/ovl_Obj_Ice_Poly", 0x990, 0x000000B0 +.balign 16 + +glabel D_80B94BF0 + .incbin "baserom/ovl_Obj_Ice_Poly", 0x990, 0x000000B0 diff --git a/data/overlays/actors/z_obj_kibako.data.s b/data/overlays/actors/z_obj_kibako.data.s index d08e204714..a37418a32f 100644 --- a/data/overlays/actors/z_obj_kibako.data.s +++ b/data/overlays/actors/z_obj_kibako.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel Obj_Kibako_InitVars .word 0x01100600, 0x04000010, 0x00030000, 0x0000019C .word ObjKibako_Init diff --git a/data/overlays/actors/z_obj_kibako.reloc.s b/data/overlays/actors/z_obj_kibako.reloc.s index 407d6fb35e..d036b02e68 100644 --- a/data/overlays/actors/z_obj_kibako.reloc.s +++ b/data/overlays/actors/z_obj_kibako.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_80B958F0 -.incbin "baserom/ovl_Obj_Kibako", 0xC50, 0x000000E0 +.balign 16 + +glabel D_80B958F0 + .incbin "baserom/ovl_Obj_Kibako", 0xC50, 0x000000E0 diff --git a/data/overlays/actors/z_obj_kibako2.data.s b/data/overlays/actors/z_obj_kibako2.data.s index 3ce941bca6..5e60a99568 100644 --- a/data/overlays/actors/z_obj_kibako2.data.s +++ b/data/overlays/actors/z_obj_kibako2.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel Obj_Kibako2_InitVars .word 0x01A00100, 0x00000000, 0x01700000, 0x000001B8 .word ObjKibako2_Init diff --git a/data/overlays/actors/z_obj_kibako2.reloc.s b/data/overlays/actors/z_obj_kibako2.reloc.s index 79a8e9bf53..1a23a07cde 100644 --- a/data/overlays/actors/z_obj_kibako2.reloc.s +++ b/data/overlays/actors/z_obj_kibako2.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_80B96050 -.incbin "baserom/ovl_Obj_Kibako2", 0x680, 0x00000080 +.balign 16 + +glabel D_80B96050 + .incbin "baserom/ovl_Obj_Kibako2", 0x680, 0x00000080 diff --git a/data/overlays/actors/z_obj_lift.data.s b/data/overlays/actors/z_obj_lift.data.s index 4b63843575..882f07264e 100644 --- a/data/overlays/actors/z_obj_lift.data.s +++ b/data/overlays/actors/z_obj_lift.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel Obj_Lift_InitVars .word 0x012C0100, 0x00000010, 0x011D0000, 0x00000170 .word ObjLift_Init diff --git a/data/overlays/actors/z_obj_lift.reloc.s b/data/overlays/actors/z_obj_lift.reloc.s index 642f3fe74e..b22164f79b 100644 --- a/data/overlays/actors/z_obj_lift.reloc.s +++ b/data/overlays/actors/z_obj_lift.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_80B96AB0 -.incbin "baserom/ovl_Obj_Lift", 0x9E0, 0x000000F0 +.balign 16 + +glabel D_80B96AB0 + .incbin "baserom/ovl_Obj_Lift", 0x9E0, 0x000000F0 diff --git a/data/overlays/actors/z_obj_lightswitch.data.s b/data/overlays/actors/z_obj_lightswitch.data.s index a637c0b279..ad18762e1e 100644 --- a/data/overlays/actors/z_obj_lightswitch.data.s +++ b/data/overlays/actors/z_obj_lightswitch.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel Obj_Lightswitch_InitVars .word 0x01500000, 0x00000010, 0x012A0000, 0x000001C4 .word ObjLightswitch_Init diff --git a/data/overlays/actors/z_obj_lightswitch.reloc.s b/data/overlays/actors/z_obj_lightswitch.reloc.s index 95d264860f..12e9744480 100644 --- a/data/overlays/actors/z_obj_lightswitch.reloc.s +++ b/data/overlays/actors/z_obj_lightswitch.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_80B98100 -.incbin "baserom/ovl_Obj_Lightswitch", 0x1560, 0x00000170 +.balign 16 + +glabel D_80B98100 + .incbin "baserom/ovl_Obj_Lightswitch", 0x1560, 0x00000170 diff --git a/data/overlays/actors/z_obj_makeoshihiki.data.s b/data/overlays/actors/z_obj_makeoshihiki.data.s index 1b7de5122b..680b414049 100644 --- a/data/overlays/actors/z_obj_makeoshihiki.data.s +++ b/data/overlays/actors/z_obj_makeoshihiki.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel Obj_Makeoshihiki_InitVars .word 0x017D0600, 0x00000020, 0x00030000, 0x0000014C .word ObjMakeoshihiki_Init diff --git a/data/overlays/actors/z_obj_makeoshihiki.reloc.s b/data/overlays/actors/z_obj_makeoshihiki.reloc.s index c41caa1771..4faa6ebc6f 100644 --- a/data/overlays/actors/z_obj_makeoshihiki.reloc.s +++ b/data/overlays/actors/z_obj_makeoshihiki.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_80B98A10 -.incbin "baserom/ovl_Obj_Makeoshihiki", 0x500, 0x00000090 +.balign 16 + +glabel D_80B98A10 + .incbin "baserom/ovl_Obj_Makeoshihiki", 0x500, 0x00000090 diff --git a/data/overlays/actors/z_obj_mure.data.s b/data/overlays/actors/z_obj_mure.data.s index 423a60ff2c..085c96846a 100644 --- a/data/overlays/actors/z_obj_mure.data.s +++ b/data/overlays/actors/z_obj_mure.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel Obj_Mure_InitVars .word 0x00940700, 0x00000000, 0x00010000, 0x000001AC .word ObjMure_Init diff --git a/data/overlays/actors/z_obj_mure.reloc.s b/data/overlays/actors/z_obj_mure.reloc.s index 8bfb621f49..8b5eaab21e 100644 --- a/data/overlays/actors/z_obj_mure.reloc.s +++ b/data/overlays/actors/z_obj_mure.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_80B99D60 -.incbin "baserom/ovl_Obj_Mure", 0x12C0, 0x000001E0 +.balign 16 + +glabel D_80B99D60 + .incbin "baserom/ovl_Obj_Mure", 0x12C0, 0x000001E0 diff --git a/data/overlays/actors/z_obj_mure2.data.s b/data/overlays/actors/z_obj_mure2.data.s index 7c8ae021c4..e7b9dc6280 100644 --- a/data/overlays/actors/z_obj_mure2.data.s +++ b/data/overlays/actors/z_obj_mure2.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel Obj_Mure2_InitVars .word 0x01510600, 0x00000000, 0x00010000, 0x00000188 .word ObjMure2_Init diff --git a/data/overlays/actors/z_obj_mure2.reloc.s b/data/overlays/actors/z_obj_mure2.reloc.s index 97272da830..5503744ff5 100644 --- a/data/overlays/actors/z_obj_mure2.reloc.s +++ b/data/overlays/actors/z_obj_mure2.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_80B9A8D0 -.incbin "baserom/ovl_Obj_Mure2", 0x990, 0x00000100 +.balign 16 + +glabel D_80B9A8D0 + .incbin "baserom/ovl_Obj_Mure2", 0x990, 0x00000100 diff --git a/data/overlays/actors/z_obj_mure3.data.s b/data/overlays/actors/z_obj_mure3.data.s index c0f8a4163a..04f3fd3f80 100644 --- a/data/overlays/actors/z_obj_mure3.data.s +++ b/data/overlays/actors/z_obj_mure3.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel Obj_Mure3_InitVars .word 0x01AB0100, 0x00000000, 0x00010000, 0x00000170 .word ObjMure3_Init diff --git a/data/overlays/actors/z_obj_mure3.reloc.s b/data/overlays/actors/z_obj_mure3.reloc.s index 561b3988f1..3adc0f19c2 100644 --- a/data/overlays/actors/z_obj_mure3.reloc.s +++ b/data/overlays/actors/z_obj_mure3.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_80B9B0F0 -.incbin "baserom/ovl_Obj_Mure3", 0x720, 0x00000090 +.balign 16 + +glabel D_80B9B0F0 + .incbin "baserom/ovl_Obj_Mure3", 0x720, 0x00000090 diff --git a/data/overlays/actors/z_obj_oshihiki.data.s b/data/overlays/actors/z_obj_oshihiki.data.s index e365004970..f58d816d9d 100644 --- a/data/overlays/actors/z_obj_oshihiki.data.s +++ b/data/overlays/actors/z_obj_oshihiki.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel Obj_Oshihiki_InitVars .word 0x00FF0600, 0x00000010, 0x00030000, 0x000001D4 .word ObjOshihiki_Init diff --git a/data/overlays/actors/z_obj_oshihiki.reloc.s b/data/overlays/actors/z_obj_oshihiki.reloc.s index 042fd8105e..18565daf4a 100644 --- a/data/overlays/actors/z_obj_oshihiki.reloc.s +++ b/data/overlays/actors/z_obj_oshihiki.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_80B9CD50 -.incbin "baserom/ovl_Obj_Oshihiki", 0x1BD0, 0x00000280 +.balign 16 + +glabel D_80B9CD50 + .incbin "baserom/ovl_Obj_Oshihiki", 0x1BD0, 0x00000280 diff --git a/data/overlays/actors/z_obj_oshihiki.rodata.s b/data/overlays/actors/z_obj_oshihiki.rodata.s index a34ced2590..22bda05a9e 100644 --- a/data/overlays/actors/z_obj_oshihiki.rodata.s +++ b/data/overlays/actors/z_obj_oshihiki.rodata.s @@ -3,16 +3,16 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata +.balign 16 + glabel D_80B9CAF0 .asciz "Warning : move BG 登録失敗(%s %d)(name %d)(arg_data 0x%04x)\n" .balign 4 -.balign 4 - glabel D_80B9CB30 .asciz "../z_obj_oshihiki.c" .balign 4 diff --git a/data/overlays/actors/z_obj_switch.data.s b/data/overlays/actors/z_obj_switch.data.s index 5192619d6d..18c80e121f 100644 --- a/data/overlays/actors/z_obj_switch.data.s +++ b/data/overlays/actors/z_obj_switch.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel Obj_Switch_InitVars .word 0x012A0000, 0x00000010, 0x00030000, 0x00000258 .word ObjSwitch_Init diff --git a/data/overlays/actors/z_obj_switch.reloc.s b/data/overlays/actors/z_obj_switch.reloc.s index efb35da39e..9f6a1a60c3 100644 --- a/data/overlays/actors/z_obj_switch.reloc.s +++ b/data/overlays/actors/z_obj_switch.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_80B9EFA0 -.incbin "baserom/ovl_Obj_Switch", 0x1D90, 0x00000310 +.balign 16 + +glabel D_80B9EFA0 + .incbin "baserom/ovl_Obj_Switch", 0x1D90, 0x00000310 diff --git a/data/overlays/actors/z_obj_syokudai.bss.s b/data/overlays/actors/z_obj_syokudai.bss.s index fbd4e81001..0c89d1df66 100644 --- a/data/overlays/actors/z_obj_syokudai.bss.s +++ b/data/overlays/actors/z_obj_syokudai.bss.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers -.bss +.section .bss + +.balign 16 glabel D_80B9FF90 .space 0x10 diff --git a/data/overlays/actors/z_obj_syokudai.data.s b/data/overlays/actors/z_obj_syokudai.data.s index 083e1f3d6f..756162ae81 100644 --- a/data/overlays/actors/z_obj_syokudai.data.s +++ b/data/overlays/actors/z_obj_syokudai.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel Obj_Syokudai_InitVars .word 0x005E0600, 0x00000410, 0x00A40000, 0x000001FC .word ObjSyokudai_Init diff --git a/data/overlays/actors/z_obj_syokudai.reloc.s b/data/overlays/actors/z_obj_syokudai.reloc.s index d2c044db63..74ba6b7083 100644 --- a/data/overlays/actors/z_obj_syokudai.reloc.s +++ b/data/overlays/actors/z_obj_syokudai.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_80B9FEF0 -.incbin "baserom/ovl_Obj_Syokudai", 0xC40, 0x000000A0 +.balign 16 + +glabel D_80B9FEF0 + .incbin "baserom/ovl_Obj_Syokudai", 0xC40, 0x000000A0 diff --git a/data/overlays/actors/z_obj_timeblock.data.s b/data/overlays/actors/z_obj_timeblock.data.s index dd2274dd4b..45611cd49e 100644 --- a/data/overlays/actors/z_obj_timeblock.data.s +++ b/data/overlays/actors/z_obj_timeblock.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel Obj_Timeblock_InitVars .word 0x01D10700, 0x0A000011, 0x01900000, 0x0000017C .word ObjTimeblock_Init diff --git a/data/overlays/actors/z_obj_timeblock.reloc.s b/data/overlays/actors/z_obj_timeblock.reloc.s index 4e539edf71..435a0c339a 100644 --- a/data/overlays/actors/z_obj_timeblock.reloc.s +++ b/data/overlays/actors/z_obj_timeblock.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_80BA0C50 -.incbin "baserom/ovl_Obj_Timeblock", 0xCB0, 0x00000110 +.balign 16 + +glabel D_80BA0C50 + .incbin "baserom/ovl_Obj_Timeblock", 0xCB0, 0x00000110 diff --git a/data/overlays/actors/z_obj_tsubo.data.s b/data/overlays/actors/z_obj_tsubo.data.s index 63a50d84da..c8f825031a 100644 --- a/data/overlays/actors/z_obj_tsubo.data.s +++ b/data/overlays/actors/z_obj_tsubo.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel D_80BA1B50 .word 0x00000000 glabel D_80BA1B54 diff --git a/data/overlays/actors/z_obj_tsubo.reloc.s b/data/overlays/actors/z_obj_tsubo.reloc.s index a80e5e001b..39e400c3ac 100644 --- a/data/overlays/actors/z_obj_tsubo.reloc.s +++ b/data/overlays/actors/z_obj_tsubo.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_80BA1C70 -.incbin "baserom/ovl_Obj_Tsubo", 0xF10, 0x00000180 +.balign 16 + +glabel D_80BA1C70 + .incbin "baserom/ovl_Obj_Tsubo", 0xF10, 0x00000180 diff --git a/data/overlays/actors/z_obj_warp2block.data.s b/data/overlays/actors/z_obj_warp2block.data.s index 83a924d760..1369a17978 100644 --- a/data/overlays/actors/z_obj_warp2block.data.s +++ b/data/overlays/actors/z_obj_warp2block.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel Obj_Warp2block_InitVars .word 0x01D60700, 0x0A000011, 0x01900000, 0x00000178 .word ObjWarp2block_Init diff --git a/data/overlays/actors/z_obj_warp2block.reloc.s b/data/overlays/actors/z_obj_warp2block.reloc.s index 5666f42569..1446050532 100644 --- a/data/overlays/actors/z_obj_warp2block.reloc.s +++ b/data/overlays/actors/z_obj_warp2block.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_80BA29A0 -.incbin "baserom/ovl_Obj_Warp2block", 0xBB0, 0x00000100 +.balign 16 + +glabel D_80BA29A0 + .incbin "baserom/ovl_Obj_Warp2block", 0xBB0, 0x00000100 diff --git a/data/overlays/actors/z_object_kankyo.data.s b/data/overlays/actors/z_object_kankyo.data.s index 71a9909b16..5c1f0e417c 100644 --- a/data/overlays/actors/z_object_kankyo.data.s +++ b/data/overlays/actors/z_object_kankyo.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel D_80BA58E0 .word 0x04029F30, 0x0402A530, 0x0402AB30, 0x0402B130, 0x0402B730, 0x0402BD30, 0x0402C330, 0x0402C930 glabel D_80BA5900 diff --git a/data/overlays/actors/z_object_kankyo.reloc.s b/data/overlays/actors/z_object_kankyo.reloc.s index 404c7a83e0..99d279d8e0 100644 --- a/data/overlays/actors/z_object_kankyo.reloc.s +++ b/data/overlays/actors/z_object_kankyo.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_80BA5CE0 -.incbin "baserom/ovl_Object_Kankyo", 0x3240, 0x00000390 +.balign 16 + +glabel D_80BA5CE0 + .incbin "baserom/ovl_Object_Kankyo", 0x3240, 0x00000390 diff --git a/data/overlays/actors/z_object_kankyo.rodata.s b/data/overlays/actors/z_object_kankyo.rodata.s index d76810a954..b282e5fbf9 100644 --- a/data/overlays/actors/z_object_kankyo.rodata.s +++ b/data/overlays/actors/z_object_kankyo.rodata.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata +.balign 16 + glabel D_80BA5A40 .asciz "../z_object_kankyo.c" .balign 4 diff --git a/data/overlays/actors/z_player.bss.s b/data/overlays/actors/z_player.bss.s index 33018f8079..ea7619f5c6 100644 --- a/data/overlays/actors/z_player.bss.s +++ b/data/overlays/actors/z_player.bss.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers -.bss +.section .bss + +.balign 16 glabel D_80858AA0 .space 0x04 diff --git a/data/overlays/actors/z_player.data.s b/data/overlays/actors/z_player.data.s index e174924252..cce1d1ed43 100644 --- a/data/overlays/actors/z_player.data.s +++ b/data/overlays/actors/z_player.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel D_80853410 .word 0x00000000, 0x00000000, 0x00000101, 0x01010101, 0x01010101, 0x01010000 glabel D_80853428 diff --git a/data/overlays/actors/z_player.reloc.s b/data/overlays/actors/z_player.reloc.s index 792ff1c7a4..0059d9ad15 100644 --- a/data/overlays/actors/z_player.reloc.s +++ b/data/overlays/actors/z_player.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_80855550 -.incbin "baserom/ovl_player_actor", 0x23340, 0x00003550 +.balign 16 + +glabel D_80855550 + .incbin "baserom/ovl_player_actor", 0x23340, 0x00003550 diff --git a/data/overlays/actors/z_shot_sun.data.s b/data/overlays/actors/z_shot_sun.data.s index 23175212f9..cebdba817c 100644 --- a/data/overlays/actors/z_shot_sun.data.s +++ b/data/overlays/actors/z_shot_sun.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel Shot_Sun_InitVars .word 0x01830600, 0x00000009, 0x00010000, 0x000001A8 .word ShotSun_Init diff --git a/data/overlays/actors/z_shot_sun.reloc.s b/data/overlays/actors/z_shot_sun.reloc.s index 859667d84e..0de446d0e9 100644 --- a/data/overlays/actors/z_shot_sun.reloc.s +++ b/data/overlays/actors/z_shot_sun.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_80BAE380 -.incbin "baserom/ovl_Shot_Sun", 0x6C0, 0x00000080 +.balign 16 + +glabel D_80BAE380 + .incbin "baserom/ovl_Shot_Sun", 0x6C0, 0x00000080 diff --git a/data/overlays/effects/z_eff_ss_blast.data.s b/data/overlays/effects/z_eff_ss_blast.data.s index e0fdf6a4e2..45af52bf5a 100644 --- a/data/overlays/effects/z_eff_ss_blast.data.s +++ b/data/overlays/effects/z_eff_ss_blast.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel Effect_Ss_Blast_InitVars .word 0x00000004 .word func_8099EDB0 diff --git a/data/overlays/effects/z_eff_ss_blast.reloc.s b/data/overlays/effects/z_eff_ss_blast.reloc.s index d12578abe5..279b3c8509 100644 --- a/data/overlays/effects/z_eff_ss_blast.reloc.s +++ b/data/overlays/effects/z_eff_ss_blast.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_8099F160 -.incbin "baserom/ovl_Effect_Ss_Blast", 0x3B0, 0x00000050 +.balign 16 + +glabel D_8099F160 + .incbin "baserom/ovl_Effect_Ss_Blast", 0x3B0, 0x00000050 diff --git a/data/overlays/effects/z_eff_ss_blast.rodata.s b/data/overlays/effects/z_eff_ss_blast.rodata.s index 1092f656ba..c496d63106 100644 --- a/data/overlays/effects/z_eff_ss_blast.rodata.s +++ b/data/overlays/effects/z_eff_ss_blast.rodata.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata +.balign 16 + glabel D_8099F120 .asciz "../z_eff_ss_blast.c" .balign 4 diff --git a/data/overlays/effects/z_eff_ss_bomb.data.s b/data/overlays/effects/z_eff_ss_bomb.data.s index 8b15ef69f9..64f1d0f519 100644 --- a/data/overlays/effects/z_eff_ss_bomb.data.s +++ b/data/overlays/effects/z_eff_ss_bomb.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel Effect_Ss_Bomb_InitVars .word 0x00000002 .word func_8099F1B0 diff --git a/data/overlays/effects/z_eff_ss_bomb.reloc.s b/data/overlays/effects/z_eff_ss_bomb.reloc.s index a66f3282ee..cf862e5f5c 100644 --- a/data/overlays/effects/z_eff_ss_bomb.reloc.s +++ b/data/overlays/effects/z_eff_ss_bomb.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_8099F5E0 -.incbin "baserom/ovl_Effect_Ss_Bomb", 0x430, 0x00000070 +.balign 16 + +glabel D_8099F5E0 + .incbin "baserom/ovl_Effect_Ss_Bomb", 0x430, 0x00000070 diff --git a/data/overlays/effects/z_eff_ss_bomb.rodata.s b/data/overlays/effects/z_eff_ss_bomb.rodata.s index 39d39c12ed..d013650f1b 100644 --- a/data/overlays/effects/z_eff_ss_bomb.rodata.s +++ b/data/overlays/effects/z_eff_ss_bomb.rodata.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata +.balign 16 + glabel D_8099F5A0 .asciz "../z_eff_ss_bomb.c" .balign 4 diff --git a/data/overlays/effects/z_eff_ss_bomb2.data.s b/data/overlays/effects/z_eff_ss_bomb2.data.s index e57eb341e1..1e24f9b702 100644 --- a/data/overlays/effects/z_eff_ss_bomb2.data.s +++ b/data/overlays/effects/z_eff_ss_bomb2.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel Effect_Ss_Bomb2_InitVars .word 0x00000003 .word func_8099F650 diff --git a/data/overlays/effects/z_eff_ss_bomb2.reloc.s b/data/overlays/effects/z_eff_ss_bomb2.reloc.s index 7890a6ecf9..45c5106718 100644 --- a/data/overlays/effects/z_eff_ss_bomb2.reloc.s +++ b/data/overlays/effects/z_eff_ss_bomb2.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_8099FFA0 -.incbin "baserom/ovl_Effect_Ss_Bomb2", 0x950, 0x000000A0 +.balign 16 + +glabel D_8099FFA0 + .incbin "baserom/ovl_Effect_Ss_Bomb2", 0x950, 0x000000A0 diff --git a/data/overlays/effects/z_eff_ss_bomb2.rodata.s b/data/overlays/effects/z_eff_ss_bomb2.rodata.s index 324d53a947..517da63a50 100644 --- a/data/overlays/effects/z_eff_ss_bomb2.rodata.s +++ b/data/overlays/effects/z_eff_ss_bomb2.rodata.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata +.balign 16 + glabel D_8099FF20 .asciz "../z_eff_ss_bomb2.c" .balign 4 diff --git a/data/overlays/effects/z_eff_ss_bubble.data.s b/data/overlays/effects/z_eff_ss_bubble.data.s index 5677463f4a..fdc641c1de 100644 --- a/data/overlays/effects/z_eff_ss_bubble.data.s +++ b/data/overlays/effects/z_eff_ss_bubble.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel Effect_Ss_Bubble_InitVars .word 0x00000007 .word func_809A0040 diff --git a/data/overlays/effects/z_eff_ss_bubble.reloc.s b/data/overlays/effects/z_eff_ss_bubble.reloc.s index cea549dbd3..5da411ceb3 100644 --- a/data/overlays/effects/z_eff_ss_bubble.reloc.s +++ b/data/overlays/effects/z_eff_ss_bubble.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_809A04F0 -.incbin "baserom/ovl_Effect_Ss_Bubble", 0x4B0, 0x00000060 +.balign 16 + +glabel D_809A04F0 + .incbin "baserom/ovl_Effect_Ss_Bubble", 0x4B0, 0x00000060 diff --git a/data/overlays/effects/z_eff_ss_bubble.rodata.s b/data/overlays/effects/z_eff_ss_bubble.rodata.s index 3671510328..75054a7a4a 100644 --- a/data/overlays/effects/z_eff_ss_bubble.rodata.s +++ b/data/overlays/effects/z_eff_ss_bubble.rodata.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata +.balign 16 + glabel D_809A04A0 .asciz "../z_eff_ss_bubble.c" .balign 4 diff --git a/data/overlays/effects/z_eff_ss_d_fire.data.s b/data/overlays/effects/z_eff_ss_d_fire.data.s index fa6e584abe..5e9b035cd7 100644 --- a/data/overlays/effects/z_eff_ss_d_fire.data.s +++ b/data/overlays/effects/z_eff_ss_d_fire.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel Effect_Ss_D_Fire_InitVars .word 0x00000006 .word func_809A0550 diff --git a/data/overlays/effects/z_eff_ss_d_fire.reloc.s b/data/overlays/effects/z_eff_ss_d_fire.reloc.s index 25d5d4cd9a..4479ecd3dc 100644 --- a/data/overlays/effects/z_eff_ss_d_fire.reloc.s +++ b/data/overlays/effects/z_eff_ss_d_fire.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_809A0A50 -.incbin "baserom/ovl_Effect_Ss_D_Fire", 0x500, 0x00000050 +.balign 16 + +glabel D_809A0A50 + .incbin "baserom/ovl_Effect_Ss_D_Fire", 0x500, 0x00000050 diff --git a/data/overlays/effects/z_eff_ss_d_fire.rodata.s b/data/overlays/effects/z_eff_ss_d_fire.rodata.s index 54f2a5eda8..b4305acaf7 100644 --- a/data/overlays/effects/z_eff_ss_d_fire.rodata.s +++ b/data/overlays/effects/z_eff_ss_d_fire.rodata.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata +.balign 16 + glabel D_809A0A10 .asciz "../z_eff_ss_d_fire.c" .balign 4 diff --git a/data/overlays/effects/z_eff_ss_dead_db.data.s b/data/overlays/effects/z_eff_ss_dead_db.data.s index 1f675a54e9..628de45c7f 100644 --- a/data/overlays/effects/z_eff_ss_dead_db.data.s +++ b/data/overlays/effects/z_eff_ss_dead_db.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel Effect_Ss_Dead_Db_InitVars .word 0x00000020 .word func_809A0AA0 diff --git a/data/overlays/effects/z_eff_ss_dead_db.reloc.s b/data/overlays/effects/z_eff_ss_dead_db.reloc.s index af0fc95e5b..af9e010776 100644 --- a/data/overlays/effects/z_eff_ss_dead_db.reloc.s +++ b/data/overlays/effects/z_eff_ss_dead_db.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_809A0F90 -.incbin "baserom/ovl_Effect_Ss_Dead_Db", 0x4F0, 0x00000050 +.balign 16 + +glabel D_809A0F90 + .incbin "baserom/ovl_Effect_Ss_Dead_Db", 0x4F0, 0x00000050 diff --git a/data/overlays/effects/z_eff_ss_dead_db.rodata.s b/data/overlays/effects/z_eff_ss_dead_db.rodata.s index 1b6a80f3bb..eed46bbe71 100644 --- a/data/overlays/effects/z_eff_ss_dead_db.rodata.s +++ b/data/overlays/effects/z_eff_ss_dead_db.rodata.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata +.balign 16 + glabel D_809A0F50 .asciz "../z_eff_ss_dead_db.c" .balign 4 diff --git a/data/overlays/effects/z_eff_ss_dead_dd.data.s b/data/overlays/effects/z_eff_ss_dead_dd.data.s index f6213a1b5a..358e8fa5cc 100644 --- a/data/overlays/effects/z_eff_ss_dead_dd.data.s +++ b/data/overlays/effects/z_eff_ss_dead_dd.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel Effect_Ss_Dead_Dd_InitVars .word 0x00000021 .word func_809A0FE0 diff --git a/data/overlays/effects/z_eff_ss_dead_dd.reloc.s b/data/overlays/effects/z_eff_ss_dead_dd.reloc.s index bc2f0b373b..bd3353e9dc 100644 --- a/data/overlays/effects/z_eff_ss_dead_dd.reloc.s +++ b/data/overlays/effects/z_eff_ss_dead_dd.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_809A15B0 -.incbin "baserom/ovl_Effect_Ss_Dead_Dd", 0x5D0, 0x00000060 +.balign 16 + +glabel D_809A15B0 + .incbin "baserom/ovl_Effect_Ss_Dead_Dd", 0x5D0, 0x00000060 diff --git a/data/overlays/effects/z_eff_ss_dead_dd.rodata.s b/data/overlays/effects/z_eff_ss_dead_dd.rodata.s index 827fa6328c..645921dd4c 100644 --- a/data/overlays/effects/z_eff_ss_dead_dd.rodata.s +++ b/data/overlays/effects/z_eff_ss_dead_dd.rodata.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata +.balign 16 + glabel D_809A1550 .asciz "Effect_SS_Dd_disp_mode():mode_swが変です。\n" .balign 4 diff --git a/data/overlays/effects/z_eff_ss_dead_ds.data.s b/data/overlays/effects/z_eff_ss_dead_ds.data.s index 8fcc353930..03b0ff9193 100644 --- a/data/overlays/effects/z_eff_ss_dead_ds.data.s +++ b/data/overlays/effects/z_eff_ss_dead_ds.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel Effect_Ss_Dead_Ds_InitVars .word 0x00000022 .word func_809A1610 diff --git a/data/overlays/effects/z_eff_ss_dead_ds.reloc.s b/data/overlays/effects/z_eff_ss_dead_ds.reloc.s index 11f08e9f3c..67dbc3c2c2 100644 --- a/data/overlays/effects/z_eff_ss_dead_ds.reloc.s +++ b/data/overlays/effects/z_eff_ss_dead_ds.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_809A1AD0 -.incbin "baserom/ovl_Effect_Ss_Dead_Ds", 0x4C0, 0x00000060 +.balign 16 + +glabel D_809A1AD0 + .incbin "baserom/ovl_Effect_Ss_Dead_Ds", 0x4C0, 0x00000060 diff --git a/data/overlays/effects/z_eff_ss_dead_ds.rodata.s b/data/overlays/effects/z_eff_ss_dead_ds.rodata.s index 012c10d779..939c1df355 100644 --- a/data/overlays/effects/z_eff_ss_dead_ds.rodata.s +++ b/data/overlays/effects/z_eff_ss_dead_ds.rodata.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata +.balign 16 + glabel D_809A1A80 .asciz "../z_eff_ss_dead_ds.c" .balign 4 diff --git a/data/overlays/effects/z_eff_ss_dead_sound.data.s b/data/overlays/effects/z_eff_ss_dead_sound.data.s index a26237c46f..93c1ac18cb 100644 --- a/data/overlays/effects/z_eff_ss_dead_sound.data.s +++ b/data/overlays/effects/z_eff_ss_dead_sound.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel Effect_Ss_Dead_Sound_InitVars .word 0x00000023 .word func_809A1B30 diff --git a/data/overlays/effects/z_eff_ss_dead_sound.reloc.s b/data/overlays/effects/z_eff_ss_dead_sound.reloc.s index ab3da79ce5..382d36897b 100644 --- a/data/overlays/effects/z_eff_ss_dead_sound.reloc.s +++ b/data/overlays/effects/z_eff_ss_dead_sound.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_809A1C80 -.incbin "baserom/ovl_Effect_Ss_Dead_Sound", 0x150, 0x00000030 +.balign 16 + +glabel D_809A1C80 + .incbin "baserom/ovl_Effect_Ss_Dead_Sound", 0x150, 0x00000030 diff --git a/data/overlays/effects/z_eff_ss_dead_sound.rodata.s b/data/overlays/effects/z_eff_ss_dead_sound.rodata.s index bf8a68d627..4a0babbd80 100644 --- a/data/overlays/effects/z_eff_ss_dead_sound.rodata.s +++ b/data/overlays/effects/z_eff_ss_dead_sound.rodata.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata +.balign 16 + glabel D_809A1C60 .word 0xA5B3A5F3, 0xA5B9A5C8, 0xA5E9A5AF, 0xA5BFA1BC, 0x330A0000, 0x00000000, 0x00000000, 0x00000000 diff --git a/data/overlays/effects/z_eff_ss_dt_bubble.data.s b/data/overlays/effects/z_eff_ss_dt_bubble.data.s index 77f0c860e1..8e87d192e8 100644 --- a/data/overlays/effects/z_eff_ss_dt_bubble.data.s +++ b/data/overlays/effects/z_eff_ss_dt_bubble.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel D_809A2200 .word 0xFFFF64FF, 0x96FFFFFF, 0x64FFFFFF glabel D_809A220C diff --git a/data/overlays/effects/z_eff_ss_dt_bubble.reloc.s b/data/overlays/effects/z_eff_ss_dt_bubble.reloc.s index 38686a8bf5..dae0596d8f 100644 --- a/data/overlays/effects/z_eff_ss_dt_bubble.reloc.s +++ b/data/overlays/effects/z_eff_ss_dt_bubble.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_809A2270 -.incbin "baserom/ovl_Effect_Ss_Dt_Bubble", 0x5C0, 0x00000060 +.balign 16 + +glabel D_809A2270 + .incbin "baserom/ovl_Effect_Ss_Dt_Bubble", 0x5C0, 0x00000060 diff --git a/data/overlays/effects/z_eff_ss_dt_bubble.rodata.s b/data/overlays/effects/z_eff_ss_dt_bubble.rodata.s index 6a4e792cf0..8738e69277 100644 --- a/data/overlays/effects/z_eff_ss_dt_bubble.rodata.s +++ b/data/overlays/effects/z_eff_ss_dt_bubble.rodata.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata +.balign 16 + glabel D_809A2220 .asciz "../z_eff_ss_dt_bubble.c" .balign 4 diff --git a/data/overlays/effects/z_eff_ss_dust.data.s b/data/overlays/effects/z_eff_ss_dust.data.s index 8d51302985..d9b7e2e2b1 100644 --- a/data/overlays/effects/z_eff_ss_dust.data.s +++ b/data/overlays/effects/z_eff_ss_dust.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel Effect_Ss_Dust_InitVars .word 0x00000000 .word func_809A22D0 diff --git a/data/overlays/effects/z_eff_ss_dust.reloc.s b/data/overlays/effects/z_eff_ss_dust.reloc.s index a0ce2263e5..c9abde0266 100644 --- a/data/overlays/effects/z_eff_ss_dust.reloc.s +++ b/data/overlays/effects/z_eff_ss_dust.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_809A2AC0 -.incbin "baserom/ovl_Effect_Ss_Dust", 0x7F0, 0x000000A0 +.balign 16 + +glabel D_809A2AC0 + .incbin "baserom/ovl_Effect_Ss_Dust", 0x7F0, 0x000000A0 diff --git a/data/overlays/effects/z_eff_ss_dust.rodata.s b/data/overlays/effects/z_eff_ss_dust.rodata.s index 50032f5b19..6a370f565a 100644 --- a/data/overlays/effects/z_eff_ss_dust.rodata.s +++ b/data/overlays/effects/z_eff_ss_dust.rodata.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata +.balign 16 + glabel D_809A2A70 .asciz "../z_eff_ss_dust.c" .balign 4 diff --git a/data/overlays/effects/z_eff_ss_en_fire.data.s b/data/overlays/effects/z_eff_ss_en_fire.data.s index 0d4dcc72c4..9783bfa4d9 100644 --- a/data/overlays/effects/z_eff_ss_en_fire.data.s +++ b/data/overlays/effects/z_eff_ss_en_fire.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel Effect_Ss_En_Fire_InitVars .word 0x0000001D .word func_809A2B60 diff --git a/data/overlays/effects/z_eff_ss_en_fire.reloc.s b/data/overlays/effects/z_eff_ss_en_fire.reloc.s index 8cac6b33e2..6e8e54ff0d 100644 --- a/data/overlays/effects/z_eff_ss_en_fire.reloc.s +++ b/data/overlays/effects/z_eff_ss_en_fire.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_809A32B0 -.incbin "baserom/ovl_Effect_Ss_En_Fire", 0x750, 0x00000080 +.balign 16 + +glabel D_809A32B0 + .incbin "baserom/ovl_Effect_Ss_En_Fire", 0x750, 0x00000080 diff --git a/data/overlays/effects/z_eff_ss_en_fire.rodata.s b/data/overlays/effects/z_eff_ss_en_fire.rodata.s index 2180876e15..251a1c67de 100644 --- a/data/overlays/effects/z_eff_ss_en_fire.rodata.s +++ b/data/overlays/effects/z_eff_ss_en_fire.rodata.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata +.balign 16 + glabel D_809A3260 .asciz "../z_eff_en_fire.c" .balign 4 diff --git a/data/overlays/effects/z_eff_ss_en_ice.data.s b/data/overlays/effects/z_eff_ss_en_ice.data.s index 6262da6b29..6ccdadda2d 100644 --- a/data/overlays/effects/z_eff_ss_en_ice.data.s +++ b/data/overlays/effects/z_eff_ss_en_ice.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel Effect_Ss_En_Ice_InitVars .word 0x0000001B .word func_809A3330 diff --git a/data/overlays/effects/z_eff_ss_en_ice.reloc.s b/data/overlays/effects/z_eff_ss_en_ice.reloc.s index 285ae25dea..5ffdcd5b08 100644 --- a/data/overlays/effects/z_eff_ss_en_ice.reloc.s +++ b/data/overlays/effects/z_eff_ss_en_ice.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_809A3C30 -.incbin "baserom/ovl_Effect_Ss_En_Ice", 0x900, 0x00000090 +.balign 16 + +glabel D_809A3C30 + .incbin "baserom/ovl_Effect_Ss_En_Ice", 0x900, 0x00000090 diff --git a/data/overlays/effects/z_eff_ss_en_ice.rodata.s b/data/overlays/effects/z_eff_ss_en_ice.rodata.s index 0eae2d7dec..fbf302ebec 100644 --- a/data/overlays/effects/z_eff_ss_en_ice.rodata.s +++ b/data/overlays/effects/z_eff_ss_en_ice.rodata.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata +.balign 16 + glabel D_809A3BA0 .asciz "Effect_Ss_En_Ice_ct():pid->mode_swがエラーです。\n" .balign 4 diff --git a/data/overlays/effects/z_eff_ss_extra.data.s b/data/overlays/effects/z_eff_ss_extra.data.s index 221de5c80f..e077d6abd2 100644 --- a/data/overlays/effects/z_eff_ss_extra.data.s +++ b/data/overlays/effects/z_eff_ss_extra.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel D_809A4060 .word 0x001E003C, 0x00640000 glabel Effect_Ss_Extra_InitVars diff --git a/data/overlays/effects/z_eff_ss_extra.reloc.s b/data/overlays/effects/z_eff_ss_extra.reloc.s index 9d99d64a77..7d93ae68cf 100644 --- a/data/overlays/effects/z_eff_ss_extra.reloc.s +++ b/data/overlays/effects/z_eff_ss_extra.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_809A40C0 -.incbin "baserom/ovl_Effect_Ss_Extra", 0x400, 0x00000060 +.balign 16 + +glabel D_809A40C0 + .incbin "baserom/ovl_Effect_Ss_Extra", 0x400, 0x00000060 diff --git a/data/overlays/effects/z_eff_ss_extra.rodata.s b/data/overlays/effects/z_eff_ss_extra.rodata.s index af1c1f240d..c861de87cd 100644 --- a/data/overlays/effects/z_eff_ss_extra.rodata.s +++ b/data/overlays/effects/z_eff_ss_extra.rodata.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata +.balign 16 + glabel D_809A4080 .asciz "../z_eff_ss_extra.c" .balign 4 @@ -18,6 +20,3 @@ glabel D_809A4094 glabel D_809A40A8 .asciz "../z_eff_ss_extra.c" .balign 4 - -.balign 8 - diff --git a/data/overlays/effects/z_eff_ss_fcircle.data.s b/data/overlays/effects/z_eff_ss_fcircle.data.s index 4118b10002..2f0f0010b4 100644 --- a/data/overlays/effects/z_eff_ss_fcircle.data.s +++ b/data/overlays/effects/z_eff_ss_fcircle.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel Effect_Ss_Fcircle_InitVars .word 0x0000001F .word func_809A4120 diff --git a/data/overlays/effects/z_eff_ss_fcircle.reloc.s b/data/overlays/effects/z_eff_ss_fcircle.reloc.s index 1184dd168c..1f7246cf5e 100644 --- a/data/overlays/effects/z_eff_ss_fcircle.reloc.s +++ b/data/overlays/effects/z_eff_ss_fcircle.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_809A45F0 -.incbin "baserom/ovl_Effect_Ss_Fcircle", 0x4D0, 0x00000070 +.balign 16 + +glabel D_809A45F0 + .incbin "baserom/ovl_Effect_Ss_Fcircle", 0x4D0, 0x00000070 diff --git a/data/overlays/effects/z_eff_ss_fcircle.rodata.s b/data/overlays/effects/z_eff_ss_fcircle.rodata.s index 639c42d811..5a811f817f 100644 --- a/data/overlays/effects/z_eff_ss_fcircle.rodata.s +++ b/data/overlays/effects/z_eff_ss_fcircle.rodata.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata +.balign 16 + glabel D_809A45A0 .asciz "../z_eff_fcircle.c" .balign 4 diff --git a/data/overlays/effects/z_eff_ss_fhg_flash.data.s b/data/overlays/effects/z_eff_ss_fhg_flash.data.s index 4ec6c5452a..2c9ac388bc 100644 --- a/data/overlays/effects/z_eff_ss_fhg_flash.data.s +++ b/data/overlays/effects/z_eff_ss_fhg_flash.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel Effect_Ss_Fhg_Flash_InitVars .word 0x00000016 .word func_809A4660 diff --git a/data/overlays/effects/z_eff_ss_fhg_flash.reloc.s b/data/overlays/effects/z_eff_ss_fhg_flash.reloc.s index d44d7bd293..b266d841ce 100644 --- a/data/overlays/effects/z_eff_ss_fhg_flash.reloc.s +++ b/data/overlays/effects/z_eff_ss_fhg_flash.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_809A5660 -.incbin "baserom/ovl_Effect_Ss_Fhg_Flash", 0x1000, 0x000000E0 +.balign 16 + +glabel D_809A5660 + .incbin "baserom/ovl_Effect_Ss_Fhg_Flash", 0x1000, 0x000000E0 diff --git a/data/overlays/effects/z_eff_ss_fhg_flash.rodata.s b/data/overlays/effects/z_eff_ss_fhg_flash.rodata.s index 8cee9f2230..f5a3c63645 100644 --- a/data/overlays/effects/z_eff_ss_fhg_flash.rodata.s +++ b/data/overlays/effects/z_eff_ss_fhg_flash.rodata.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata +.balign 16 + glabel D_809A5580 .asciz "Effect_Ss_Fhg_Flash_ct():pffd->modeエラー\n" .balign 4 diff --git a/data/overlays/effects/z_eff_ss_fire_tail.data.s b/data/overlays/effects/z_eff_ss_fire_tail.data.s index 8007467c54..e8d1274dea 100644 --- a/data/overlays/effects/z_eff_ss_fire_tail.data.s +++ b/data/overlays/effects/z_eff_ss_fire_tail.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel Effect_Ss_Fire_Tail_InitVars .word 0x0000001C .word func_809A5740 diff --git a/data/overlays/effects/z_eff_ss_fire_tail.reloc.s b/data/overlays/effects/z_eff_ss_fire_tail.reloc.s index 9e6a14dfbf..c8832ba4cf 100644 --- a/data/overlays/effects/z_eff_ss_fire_tail.reloc.s +++ b/data/overlays/effects/z_eff_ss_fire_tail.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_809A5E50 -.incbin "baserom/ovl_Effect_Ss_Fire_Tail", 0x710, 0x00000080 +.balign 16 + +glabel D_809A5E50 + .incbin "baserom/ovl_Effect_Ss_Fire_Tail", 0x710, 0x00000080 diff --git a/data/overlays/effects/z_eff_ss_fire_tail.rodata.s b/data/overlays/effects/z_eff_ss_fire_tail.rodata.s index 4f7701af31..1e51fb8237 100644 --- a/data/overlays/effects/z_eff_ss_fire_tail.rodata.s +++ b/data/overlays/effects/z_eff_ss_fire_tail.rodata.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata +.balign 16 + glabel D_809A5DE0 .asciz "../z_eff_fire_tail.c" .balign 4 diff --git a/data/overlays/effects/z_eff_ss_g_fire.data.s b/data/overlays/effects/z_eff_ss_g_fire.data.s index 1707e6616c..6844605910 100644 --- a/data/overlays/effects/z_eff_ss_g_fire.data.s +++ b/data/overlays/effects/z_eff_ss_g_fire.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel Effect_Ss_G_Fire_InitVars .word 0x0000000C .word func_809A5ED0 diff --git a/data/overlays/effects/z_eff_ss_g_fire.reloc.s b/data/overlays/effects/z_eff_ss_g_fire.reloc.s index 3c4b6a119f..2d0af7ea11 100644 --- a/data/overlays/effects/z_eff_ss_g_fire.reloc.s +++ b/data/overlays/effects/z_eff_ss_g_fire.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_809A6110 -.incbin "baserom/ovl_Effect_Ss_G_Fire", 0x240, 0x00000040 +.balign 16 + +glabel D_809A6110 + .incbin "baserom/ovl_Effect_Ss_G_Fire", 0x240, 0x00000040 diff --git a/data/overlays/effects/z_eff_ss_g_magma.data.s b/data/overlays/effects/z_eff_ss_g_magma.data.s index ff86c635f3..a64651a949 100644 --- a/data/overlays/effects/z_eff_ss_g_magma.data.s +++ b/data/overlays/effects/z_eff_ss_g_magma.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel Effect_Ss_G_Magma_InitVars .word 0x0000000B .word func_809A6150 diff --git a/data/overlays/effects/z_eff_ss_g_magma.reloc.s b/data/overlays/effects/z_eff_ss_g_magma.reloc.s index c2c6b6fcfb..ad7820f784 100644 --- a/data/overlays/effects/z_eff_ss_g_magma.reloc.s +++ b/data/overlays/effects/z_eff_ss_g_magma.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_809A6360 -.incbin "baserom/ovl_Effect_Ss_G_Magma", 0x210, 0x00000040 +.balign 16 + +glabel D_809A6360 + .incbin "baserom/ovl_Effect_Ss_G_Magma", 0x210, 0x00000040 diff --git a/data/overlays/effects/z_eff_ss_g_magma2.data.s b/data/overlays/effects/z_eff_ss_g_magma2.data.s index 47067cd553..5b20588e9b 100644 --- a/data/overlays/effects/z_eff_ss_g_magma2.data.s +++ b/data/overlays/effects/z_eff_ss_g_magma2.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel D_809A6860 .word 0x0602E4E0, 0x0602E8E0, 0x0602ECE0, 0x0602F0E0, 0x0602F4E0, 0x0602F8E0, 0x0602FCE0, 0x060300E0, 0x060304E0, 0x060308E0, 0x060308E0, 0x060308E0, 0x060308E0 glabel Effect_Ss_G_Magma2_InitVars diff --git a/data/overlays/effects/z_eff_ss_g_magma2.reloc.s b/data/overlays/effects/z_eff_ss_g_magma2.reloc.s index f13a2be19c..3d2dca49be 100644 --- a/data/overlays/effects/z_eff_ss_g_magma2.reloc.s +++ b/data/overlays/effects/z_eff_ss_g_magma2.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_809A6900 -.incbin "baserom/ovl_Effect_Ss_G_Magma2", 0x560, 0x00000060 +.balign 16 + +glabel D_809A6900 + .incbin "baserom/ovl_Effect_Ss_G_Magma2", 0x560, 0x00000060 diff --git a/data/overlays/effects/z_eff_ss_g_magma2.rodata.s b/data/overlays/effects/z_eff_ss_g_magma2.rodata.s index eff7e85a5b..1332b2716c 100644 --- a/data/overlays/effects/z_eff_ss_g_magma2.rodata.s +++ b/data/overlays/effects/z_eff_ss_g_magma2.rodata.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata +.balign 16 + glabel D_809A68B0 .asciz "../z_eff_ss_g_magma2.c" .balign 4 @@ -19,5 +21,3 @@ glabel D_809A68E0 .asciz "../z_eff_ss_g_magma2.c" .balign 4 -.align 4 - diff --git a/data/overlays/effects/z_eff_ss_g_ripple.data.s b/data/overlays/effects/z_eff_ss_g_ripple.data.s index 8e97d19f1b..2a87f3fab0 100644 --- a/data/overlays/effects/z_eff_ss_g_ripple.data.s +++ b/data/overlays/effects/z_eff_ss_g_ripple.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel Effect_Ss_G_Ripple_InitVars .word 0x00000009 .word func_809A6960 diff --git a/data/overlays/effects/z_eff_ss_g_ripple.reloc.s b/data/overlays/effects/z_eff_ss_g_ripple.reloc.s index 4e581a2746..783db03584 100644 --- a/data/overlays/effects/z_eff_ss_g_ripple.reloc.s +++ b/data/overlays/effects/z_eff_ss_g_ripple.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_809A6EE0 -.incbin "baserom/ovl_Effect_Ss_G_Ripple", 0x580, 0x00000050 +.balign 16 + +glabel D_809A6EE0 + .incbin "baserom/ovl_Effect_Ss_G_Ripple", 0x580, 0x00000050 diff --git a/data/overlays/effects/z_eff_ss_g_ripple.rodata.s b/data/overlays/effects/z_eff_ss_g_ripple.rodata.s index 35cd96e7d0..08da7740b0 100644 --- a/data/overlays/effects/z_eff_ss_g_ripple.rodata.s +++ b/data/overlays/effects/z_eff_ss_g_ripple.rodata.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata +.balign 16 + glabel D_809A6EA0 .asciz "../z_eff_ss_g_ripple.c" .balign 4 diff --git a/data/overlays/effects/z_eff_ss_g_spk.data.s b/data/overlays/effects/z_eff_ss_g_spk.data.s index 3d43bde520..c147e97a86 100644 --- a/data/overlays/effects/z_eff_ss_g_spk.data.s +++ b/data/overlays/effects/z_eff_ss_g_spk.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel Effect_Ss_G_Spk_InitVars .word 0x00000005 .word func_809A6F30 diff --git a/data/overlays/effects/z_eff_ss_g_spk.reloc.s b/data/overlays/effects/z_eff_ss_g_spk.reloc.s index d466d78dd0..fa7362c957 100644 --- a/data/overlays/effects/z_eff_ss_g_spk.reloc.s +++ b/data/overlays/effects/z_eff_ss_g_spk.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_809A74E0 -.incbin "baserom/ovl_Effect_Ss_G_Spk", 0x5B0, 0x00000060 +.balign 16 + +glabel D_809A74E0 + .incbin "baserom/ovl_Effect_Ss_G_Spk", 0x5B0, 0x00000060 diff --git a/data/overlays/effects/z_eff_ss_g_spk.rodata.s b/data/overlays/effects/z_eff_ss_g_spk.rodata.s index df4b1840e0..631c4fa5dd 100644 --- a/data/overlays/effects/z_eff_ss_g_spk.rodata.s +++ b/data/overlays/effects/z_eff_ss_g_spk.rodata.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata +.balign 16 + glabel D_809A74B0 .asciz "../z_eff_ss_g_spk.c" .balign 4 diff --git a/data/overlays/effects/z_eff_ss_g_splash.data.s b/data/overlays/effects/z_eff_ss_g_splash.data.s index 9813e35c29..f04898f6ab 100644 --- a/data/overlays/effects/z_eff_ss_g_splash.data.s +++ b/data/overlays/effects/z_eff_ss_g_splash.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel Effect_Ss_G_Splash_InitVars .word 0x0000000A .word func_809A7540 diff --git a/data/overlays/effects/z_eff_ss_g_splash.reloc.s b/data/overlays/effects/z_eff_ss_g_splash.reloc.s index 72a14ebf8a..855d7be3a7 100644 --- a/data/overlays/effects/z_eff_ss_g_splash.reloc.s +++ b/data/overlays/effects/z_eff_ss_g_splash.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_809A7990 -.incbin "baserom/ovl_Effect_Ss_G_Splash", 0x450, 0x00000060 +.balign 16 + +glabel D_809A7990 + .incbin "baserom/ovl_Effect_Ss_G_Splash", 0x450, 0x00000060 diff --git a/data/overlays/effects/z_eff_ss_g_splash.rodata.s b/data/overlays/effects/z_eff_ss_g_splash.rodata.s index a9a13d9680..88d8045924 100644 --- a/data/overlays/effects/z_eff_ss_g_splash.rodata.s +++ b/data/overlays/effects/z_eff_ss_g_splash.rodata.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata +.balign 16 + glabel D_809A7980 .word 0x3B03126F, 0x00000000, 0x00000000, 0x00000000 diff --git a/data/overlays/effects/z_eff_ss_hahen.data.s b/data/overlays/effects/z_eff_ss_hahen.data.s index 59ee50a7ac..83edae146b 100644 --- a/data/overlays/effects/z_eff_ss_hahen.data.s +++ b/data/overlays/effects/z_eff_ss_hahen.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel Effect_Ss_Hahen_InitVars .word 0x0000000F .word func_809A7A60 diff --git a/data/overlays/effects/z_eff_ss_hahen.reloc.s b/data/overlays/effects/z_eff_ss_hahen.reloc.s index cfa4936fbe..e6a27d65f5 100644 --- a/data/overlays/effects/z_eff_ss_hahen.reloc.s +++ b/data/overlays/effects/z_eff_ss_hahen.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_809A80B0 -.incbin "baserom/ovl_Effect_Ss_Hahen", 0x6C0, 0x000000A0 +.balign 16 + +glabel D_809A80B0 + .incbin "baserom/ovl_Effect_Ss_Hahen", 0x6C0, 0x000000A0 diff --git a/data/overlays/effects/z_eff_ss_hahen.rodata.s b/data/overlays/effects/z_eff_ss_hahen.rodata.s index c77962e8e4..da566d777a 100644 --- a/data/overlays/effects/z_eff_ss_hahen.rodata.s +++ b/data/overlays/effects/z_eff_ss_hahen.rodata.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata +.balign 16 + glabel D_809A8020 .asciz "../z_eff_hahen.c" .balign 4 diff --git a/data/overlays/effects/z_eff_ss_hitmark.data.s b/data/overlays/effects/z_eff_ss_hitmark.data.s index 2507fc920f..90d42903e2 100644 --- a/data/overlays/effects/z_eff_ss_hitmark.data.s +++ b/data/overlays/effects/z_eff_ss_hitmark.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel D_809A85B0 .word 0xFFFFFFFF, 0xFF00FFFF, 0xFFFF0000, 0xFFC864C8, 0x96009664, 0x00643200, 0xFFFFFFFF, 0x0000FFFF, 0x00FF0000, 0xFFFFFF00, 0xFFC8FFFF, 0xFF9600FF glabel D_809A85E0 diff --git a/data/overlays/effects/z_eff_ss_hitmark.reloc.s b/data/overlays/effects/z_eff_ss_hitmark.reloc.s index 78ca8678b2..13a73ffbab 100644 --- a/data/overlays/effects/z_eff_ss_hitmark.reloc.s +++ b/data/overlays/effects/z_eff_ss_hitmark.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_809A86A0 -.incbin "baserom/ovl_Effect_Ss_HitMark", 0x550, 0x00000060 +.balign 16 + +glabel D_809A86A0 + .incbin "baserom/ovl_Effect_Ss_HitMark", 0x550, 0x00000060 diff --git a/data/overlays/effects/z_eff_ss_hitmark.rodata.s b/data/overlays/effects/z_eff_ss_hitmark.rodata.s index 3f5b771639..e162768549 100644 --- a/data/overlays/effects/z_eff_ss_hitmark.rodata.s +++ b/data/overlays/effects/z_eff_ss_hitmark.rodata.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata +.balign 16 + glabel D_809A8670 .asciz "../z_eff_ss_hitmark.c" .balign 4 diff --git a/data/overlays/effects/z_eff_ss_ice_piece.data.s b/data/overlays/effects/z_eff_ss_ice_piece.data.s index 3d09ff0421..8434d8990d 100644 --- a/data/overlays/effects/z_eff_ss_ice_piece.data.s +++ b/data/overlays/effects/z_eff_ss_ice_piece.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel Effect_Ss_Ice_Piece_InitVars .word 0x0000001A .word func_809A8700 diff --git a/data/overlays/effects/z_eff_ss_ice_piece.reloc.s b/data/overlays/effects/z_eff_ss_ice_piece.reloc.s index ca21f657ad..43494b116f 100644 --- a/data/overlays/effects/z_eff_ss_ice_piece.reloc.s +++ b/data/overlays/effects/z_eff_ss_ice_piece.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_809A8B80 -.incbin "baserom/ovl_Effect_Ss_Ice_Piece", 0x480, 0x00000070 +.balign 16 + +glabel D_809A8B80 + .incbin "baserom/ovl_Effect_Ss_Ice_Piece", 0x480, 0x00000070 diff --git a/data/overlays/effects/z_eff_ss_ice_piece.rodata.s b/data/overlays/effects/z_eff_ss_ice_piece.rodata.s index d65789ebd8..17719ba40f 100644 --- a/data/overlays/effects/z_eff_ss_ice_piece.rodata.s +++ b/data/overlays/effects/z_eff_ss_ice_piece.rodata.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata +.balign 16 + glabel D_809A8B20 .asciz "../z_eff_ice_piece.c" .balign 4 diff --git a/data/overlays/effects/z_eff_ss_ice_smoke.data.s b/data/overlays/effects/z_eff_ss_ice_smoke.data.s index 29eb737b04..3a4f33a40b 100644 --- a/data/overlays/effects/z_eff_ss_ice_smoke.data.s +++ b/data/overlays/effects/z_eff_ss_ice_smoke.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel Effect_Ss_Ice_Smoke_InitVars .word 0x00000024 .word func_809A8BF0 diff --git a/data/overlays/effects/z_eff_ss_ice_smoke.reloc.s b/data/overlays/effects/z_eff_ss_ice_smoke.reloc.s index cbd751b5c5..4cbcda2a76 100644 --- a/data/overlays/effects/z_eff_ss_ice_smoke.reloc.s +++ b/data/overlays/effects/z_eff_ss_ice_smoke.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_809A9150 -.incbin "baserom/ovl_Effect_Ss_Ice_Smoke", 0x560, 0x00000060 +.balign 16 + +glabel D_809A9150 + .incbin "baserom/ovl_Effect_Ss_Ice_Smoke", 0x560, 0x00000060 diff --git a/data/overlays/effects/z_eff_ss_ice_smoke.rodata.s b/data/overlays/effects/z_eff_ss_ice_smoke.rodata.s index e0401fcccd..565333b5d9 100644 --- a/data/overlays/effects/z_eff_ss_ice_smoke.rodata.s +++ b/data/overlays/effects/z_eff_ss_ice_smoke.rodata.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata +.balign 16 + glabel D_809A90C0 .asciz "Effect_SS_Ice_Smoke_ct():バンク Object_Bank_Fzが有りません。\n" .balign 4 diff --git a/data/overlays/effects/z_eff_ss_k_fire.data.s b/data/overlays/effects/z_eff_ss_k_fire.data.s index d9552621e9..82ed8d9767 100644 --- a/data/overlays/effects/z_eff_ss_k_fire.data.s +++ b/data/overlays/effects/z_eff_ss_k_fire.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel Effect_Ss_K_Fire_InitVars .word 0x00000017 .word func_809A91B0 diff --git a/data/overlays/effects/z_eff_ss_k_fire.reloc.s b/data/overlays/effects/z_eff_ss_k_fire.reloc.s index c7ef708dc5..3f18a5d5ff 100644 --- a/data/overlays/effects/z_eff_ss_k_fire.reloc.s +++ b/data/overlays/effects/z_eff_ss_k_fire.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_809A9620 -.incbin "baserom/ovl_Effect_Ss_K_Fire", 0x470, 0x00000060 +.balign 16 + +glabel D_809A9620 + .incbin "baserom/ovl_Effect_Ss_K_Fire", 0x470, 0x00000060 diff --git a/data/overlays/effects/z_eff_ss_k_fire.rodata.s b/data/overlays/effects/z_eff_ss_k_fire.rodata.s index 7f226336ac..e6cfe92b7e 100644 --- a/data/overlays/effects/z_eff_ss_k_fire.rodata.s +++ b/data/overlays/effects/z_eff_ss_k_fire.rodata.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata +.balign 16 + glabel D_809A95D0 .asciz "../z_eff_k_fire.c" .balign 4 diff --git a/data/overlays/effects/z_eff_ss_kakera.data.s b/data/overlays/effects/z_eff_ss_kakera.data.s index a2f114bdda..e51514ebe5 100644 --- a/data/overlays/effects/z_eff_ss_kakera.data.s +++ b/data/overlays/effects/z_eff_ss_kakera.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel Effect_Ss_Kakera_InitVars .word 0x00000019 .word func_809A9680 diff --git a/data/overlays/effects/z_eff_ss_kakera.reloc.s b/data/overlays/effects/z_eff_ss_kakera.reloc.s index 88bdb80ae0..92610c3213 100644 --- a/data/overlays/effects/z_eff_ss_kakera.reloc.s +++ b/data/overlays/effects/z_eff_ss_kakera.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_809AA690 -.incbin "baserom/ovl_Effect_Ss_Kakera", 0x1010, 0x00000180 +.balign 16 + +glabel D_809AA690 + .incbin "baserom/ovl_Effect_Ss_Kakera", 0x1010, 0x00000180 diff --git a/data/overlays/effects/z_eff_ss_kakera.rodata.s b/data/overlays/effects/z_eff_ss_kakera.rodata.s index 44b033629e..bcf1b7ec4c 100644 --- a/data/overlays/effects/z_eff_ss_kakera.rodata.s +++ b/data/overlays/effects/z_eff_ss_kakera.rodata.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata +.balign 16 + glabel D_809AA5C0 .asciz "shape_modelがNULL\n" .balign 4 diff --git a/data/overlays/effects/z_eff_ss_kirakira.data.s b/data/overlays/effects/z_eff_ss_kirakira.data.s index 7492b1de28..2ffa724234 100644 --- a/data/overlays/effects/z_eff_ss_kirakira.data.s +++ b/data/overlays/effects/z_eff_ss_kirakira.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel Effect_Ss_KiraKira_InitVars .word 0x00000001 .word func_809AA810 diff --git a/data/overlays/effects/z_eff_ss_kirakira.reloc.s b/data/overlays/effects/z_eff_ss_kirakira.reloc.s index bbf52abcea..9fa05317d4 100644 --- a/data/overlays/effects/z_eff_ss_kirakira.reloc.s +++ b/data/overlays/effects/z_eff_ss_kirakira.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_809AAE60 -.incbin "baserom/ovl_Effect_Ss_KiraKira", 0x650, 0x00000090 +.balign 16 + +glabel D_809AAE60 + .incbin "baserom/ovl_Effect_Ss_KiraKira", 0x650, 0x00000090 diff --git a/data/overlays/effects/z_eff_ss_kirakira.rodata.s b/data/overlays/effects/z_eff_ss_kirakira.rodata.s index b3a74fbd3c..76e70a27cc 100644 --- a/data/overlays/effects/z_eff_ss_kirakira.rodata.s +++ b/data/overlays/effects/z_eff_ss_kirakira.rodata.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata +.balign 16 + glabel D_809AAE10 .asciz "../z_eff_ss_kirakira.c" .balign 4 diff --git a/data/overlays/effects/z_eff_ss_lightning.data.s b/data/overlays/effects/z_eff_ss_lightning.data.s index 7d418b4ec9..7cf3ce0d51 100644 --- a/data/overlays/effects/z_eff_ss_lightning.data.s +++ b/data/overlays/effects/z_eff_ss_lightning.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel Effect_Ss_Lightning_InitVars .word 0x0000000D .word func_809AAEF0 diff --git a/data/overlays/effects/z_eff_ss_lightning.reloc.s b/data/overlays/effects/z_eff_ss_lightning.reloc.s index 226e7c3be2..64f555269f 100644 --- a/data/overlays/effects/z_eff_ss_lightning.reloc.s +++ b/data/overlays/effects/z_eff_ss_lightning.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_809AB5B0 -.incbin "baserom/ovl_Effect_Ss_Lightning", 0x6C0, 0x00000080 +.balign 16 + +glabel D_809AB5B0 + .incbin "baserom/ovl_Effect_Ss_Lightning", 0x6C0, 0x00000080 diff --git a/data/overlays/effects/z_eff_ss_lightning.rodata.s b/data/overlays/effects/z_eff_ss_lightning.rodata.s index 13dbb795a8..834860b12c 100644 --- a/data/overlays/effects/z_eff_ss_lightning.rodata.s +++ b/data/overlays/effects/z_eff_ss_lightning.rodata.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata +.balign 16 + glabel D_809AB560 .asciz "../z_eff_ss_lightning.c" .balign 4 diff --git a/data/overlays/effects/z_eff_ss_sibuki.data.s b/data/overlays/effects/z_eff_ss_sibuki.data.s index 6ee021cb3f..637b529564 100644 --- a/data/overlays/effects/z_eff_ss_sibuki.data.s +++ b/data/overlays/effects/z_eff_ss_sibuki.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel Effect_Ss_Sibuki_InitVars .word 0x00000011 .word func_809AB630 diff --git a/data/overlays/effects/z_eff_ss_sibuki.reloc.s b/data/overlays/effects/z_eff_ss_sibuki.reloc.s index de9dade37b..556b219a2a 100644 --- a/data/overlays/effects/z_eff_ss_sibuki.reloc.s +++ b/data/overlays/effects/z_eff_ss_sibuki.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_809ABCF0 -.incbin "baserom/ovl_Effect_Ss_Sibuki", 0x6C0, 0x00000070 +.balign 16 + +glabel D_809ABCF0 + .incbin "baserom/ovl_Effect_Ss_Sibuki", 0x6C0, 0x00000070 diff --git a/data/overlays/effects/z_eff_ss_sibuki.rodata.s b/data/overlays/effects/z_eff_ss_sibuki.rodata.s index f485094909..b15045a350 100644 --- a/data/overlays/effects/z_eff_ss_sibuki.rodata.s +++ b/data/overlays/effects/z_eff_ss_sibuki.rodata.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata +.balign 16 + glabel D_809ABC90 .asciz "../z_eff_ss_sibuki.c" .balign 4 diff --git a/data/overlays/effects/z_eff_ss_sibuki2.data.s b/data/overlays/effects/z_eff_ss_sibuki2.data.s index 165eac4aef..27c6577225 100644 --- a/data/overlays/effects/z_eff_ss_sibuki2.data.s +++ b/data/overlays/effects/z_eff_ss_sibuki2.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel Effect_Ss_Sibuki2_InitVars .word 0x00000012 .word func_809ABD60 diff --git a/data/overlays/effects/z_eff_ss_sibuki2.reloc.s b/data/overlays/effects/z_eff_ss_sibuki2.reloc.s index 887b39f923..01c44cbd90 100644 --- a/data/overlays/effects/z_eff_ss_sibuki2.reloc.s +++ b/data/overlays/effects/z_eff_ss_sibuki2.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_809AC0E0 -.incbin "baserom/ovl_Effect_Ss_Sibuki2", 0x380, 0x00000050 +.balign 16 + +glabel D_809AC0E0 + .incbin "baserom/ovl_Effect_Ss_Sibuki2", 0x380, 0x00000050 diff --git a/data/overlays/effects/z_eff_ss_sibuki2.rodata.s b/data/overlays/effects/z_eff_ss_sibuki2.rodata.s index bc2e88007e..87f724feaf 100644 --- a/data/overlays/effects/z_eff_ss_sibuki2.rodata.s +++ b/data/overlays/effects/z_eff_ss_sibuki2.rodata.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata +.balign 16 + glabel D_809AC090 .asciz "../z_eff_ss_sibuki2.c" .balign 4 @@ -19,5 +21,3 @@ glabel D_809AC0C0 .asciz "../z_eff_ss_sibuki2.c" .balign 4 -.align 4 - diff --git a/data/overlays/effects/z_eff_ss_solder_srch_ball.data.s b/data/overlays/effects/z_eff_ss_solder_srch_ball.data.s index 0d7b858daf..6ad0673731 100644 --- a/data/overlays/effects/z_eff_ss_solder_srch_ball.data.s +++ b/data/overlays/effects/z_eff_ss_solder_srch_ball.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel Effect_Ss_Solder_Srch_Ball_InitVars .word 0x00000018 .word func_809AC130 diff --git a/data/overlays/effects/z_eff_ss_solder_srch_ball.reloc.s b/data/overlays/effects/z_eff_ss_solder_srch_ball.reloc.s index 85625c01ba..d3063d3caa 100644 --- a/data/overlays/effects/z_eff_ss_solder_srch_ball.reloc.s +++ b/data/overlays/effects/z_eff_ss_solder_srch_ball.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_809AC2A0 -.incbin "baserom/ovl_Effect_Ss_Solder_Srch_Ball", 0x170, 0x00000030 +.balign 16 + +glabel D_809AC2A0 + .incbin "baserom/ovl_Effect_Ss_Solder_Srch_Ball", 0x170, 0x00000030 diff --git a/data/overlays/effects/z_eff_ss_stick.data.s b/data/overlays/effects/z_eff_ss_stick.data.s index 6edf7c6952..3ce23d5297 100644 --- a/data/overlays/effects/z_eff_ss_stick.data.s +++ b/data/overlays/effects/z_eff_ss_stick.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel Effect_Ss_Stick_InitVars .word 0x00000010 .word func_809AC2D0 diff --git a/data/overlays/effects/z_eff_ss_stick.reloc.s b/data/overlays/effects/z_eff_ss_stick.reloc.s index 56be02aca4..d1b87e18ab 100644 --- a/data/overlays/effects/z_eff_ss_stick.reloc.s +++ b/data/overlays/effects/z_eff_ss_stick.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_809AC690 -.incbin "baserom/ovl_Effect_Ss_Stick", 0x3C0, 0x00000070 +.balign 16 + +glabel D_809AC690 + .incbin "baserom/ovl_Effect_Ss_Stick", 0x3C0, 0x00000070 diff --git a/data/overlays/effects/z_eff_ss_stick.rodata.s b/data/overlays/effects/z_eff_ss_stick.rodata.s index 17a0806425..2b22311573 100644 --- a/data/overlays/effects/z_eff_ss_stick.rodata.s +++ b/data/overlays/effects/z_eff_ss_stick.rodata.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata +.balign 16 + glabel D_809AC640 .asciz "../z_eff_ss_stick.c" .balign 4 diff --git a/data/overlays/effects/z_eff_ss_stone1.data.s b/data/overlays/effects/z_eff_ss_stone1.data.s index 40c52437a7..88317d27dd 100644 --- a/data/overlays/effects/z_eff_ss_stone1.data.s +++ b/data/overlays/effects/z_eff_ss_stone1.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel Effect_Ss_Stone1_InitVars .word 0x00000014 .word func_809AC700 diff --git a/data/overlays/effects/z_eff_ss_stone1.reloc.s b/data/overlays/effects/z_eff_ss_stone1.reloc.s index bf0d1ce3c7..f77948a10d 100644 --- a/data/overlays/effects/z_eff_ss_stone1.reloc.s +++ b/data/overlays/effects/z_eff_ss_stone1.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_809ACAC0 -.incbin "baserom/ovl_Effect_Ss_Stone1", 0x3C0, 0x00000060 +.balign 16 + +glabel D_809ACAC0 + .incbin "baserom/ovl_Effect_Ss_Stone1", 0x3C0, 0x00000060 diff --git a/data/overlays/effects/z_eff_ss_stone1.rodata.s b/data/overlays/effects/z_eff_ss_stone1.rodata.s index f268c783a9..845f15c4d3 100644 --- a/data/overlays/effects/z_eff_ss_stone1.rodata.s +++ b/data/overlays/effects/z_eff_ss_stone1.rodata.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata +.balign 16 + glabel D_809ACA70 .asciz "../z_eff_ss_stone1.c" .balign 4 diff --git a/data/overlays/gamestates/z_file_choose.bss.s b/data/overlays/gamestates/z_file_choose.bss.s index 8a5f1b36f1..0b5fd668f8 100644 --- a/data/overlays/gamestates/z_file_choose.bss.s +++ b/data/overlays/gamestates/z_file_choose.bss.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers -.bss +.section .bss + +.balign 16 glabel D_80813800 .space 0x10 diff --git a/data/overlays/gamestates/z_file_choose.data.s b/data/overlays/gamestates/z_file_choose.data.s index f9c79da835..b8bbacc0a1 100644 --- a/data/overlays/gamestates/z_file_choose.data.s +++ b/data/overlays/gamestates/z_file_choose.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel D_80811BB0 .word 0xFFA20048, 0x00000000, 0x00000000, 0xFFFFFFFF, 0xFFDA0048, 0x00000000, 0x07000000, 0xFFFFFFFF, 0xFFA20038, 0x00000000, 0x00000200, 0xFFFFFFFF, 0xFFDA0038, 0x00000000, 0x07000200, 0xFFFFFFFF, 0xFFA0FFD0, 0x00000000, 0x00000000, 0xFFFFFFFF, 0xFFCCFFD0, 0x00000000, 0x05800000, 0xFFFFFFFF, 0xFFA0FFC0, 0x00000000, 0x00000200, 0xFFFFFFFF, 0xFFCCFFC0, 0x00000000, 0x05800200, 0xFFFFFFFF, 0xFFD0FFD0, 0x00000000, 0x00000000, 0xFFFFFFFF, 0xFFFCFFD0, 0x00000000, 0x05800000, 0xFFFFFFFF, 0xFFD0FFC0, 0x00000000, 0x00000200, 0xFFFFFFFF, 0xFFFCFFC0, 0x00000000, 0x05800200, 0xFFFFFFFF, 0x0000FFD0, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x001CFFD0, 0x00000000, 0x03800000, 0xFFFFFFFF, 0x0000FFC0, 0x00000000, 0x00000200, 0xFFFFFFFF, 0x001CFFC0, 0x00000000, 0x03800200, 0xFFFFFFFF, 0x0020FFD0, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x003CFFD0, 0x00000000, 0x03800000, 0xFFFFFFFF, 0x0020FFC0, 0x00000000, 0x00000200, 0xFFFFFFFF, 0x003CFFC0, 0x00000000, 0x03800200, 0xFFFFFFFF, 0x0040FFD0, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x006CFFD0, 0x00000000, 0x05800000, 0xFFFFFFFF, 0x0040FFC0, 0x00000000, 0x00000200, 0xFFFFFFFF, 0x006CFFC0, 0x00000000, 0x05800200, 0xFFFFFFFF glabel D_80811D30 diff --git a/data/overlays/gamestates/z_file_choose.reloc.s b/data/overlays/gamestates/z_file_choose.reloc.s index 1270f64ac2..6bc99a11f7 100644 --- a/data/overlays/gamestates/z_file_choose.reloc.s +++ b/data/overlays/gamestates/z_file_choose.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_80813020 -.incbin "baserom/ovl_file_choose", 0xF2E0, 0x000007E0 +.balign 16 + +glabel D_80813020 + .incbin "baserom/ovl_file_choose", 0xF2E0, 0x000007E0 diff --git a/data/overlays/gamestates/z_file_choose.rodata.s b/data/overlays/gamestates/z_file_choose.rodata.s index 168c55dff4..50933d6e09 100644 --- a/data/overlays/gamestates/z_file_choose.rodata.s +++ b/data/overlays/gamestates/z_file_choose.rodata.s @@ -3,15 +3,17 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata +.balign 16 + glabel D_80812A60 - .asciz "connect_alpha=%d decision_alpha[%d]=%d\n\x00\x00\x00\x00" + .asciz "connect_alpha=%d decision_alpha[%d]=%d\n" .balign 4 -.balign 4 +.balign 16 glabel D_80812A90 .asciz "../z_file_nameset_PAL.c" @@ -121,7 +123,7 @@ glabel D_80812CE8 .float 0.4 .balign 4 -.align 4 +.balign 16 glabel D_80812CF0 .word 0xA3D3A3F2, 0xA3E1A3ED, 0x20A3D3A3, 0xF4A3E1A3, 0xF2A3F4A8, 0xA1A3CCA3, 0xEFA3E1A3, 0xE42020A1, 0xD5A1D5A1, 0xD5A1D5A1, 0xD5202000 diff --git a/data/overlays/gamestates/z_select.data.s b/data/overlays/gamestates/z_select.data.s index 9052260360..6c8e98f750 100644 --- a/data/overlays/gamestates/z_select.data.s +++ b/data/overlays/gamestates/z_select.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel D_80801FC0 .word D_80802608 .word func_80800BAC diff --git a/data/overlays/gamestates/z_select.reloc.s b/data/overlays/gamestates/z_select.reloc.s index 6cb5453723..fee13f5e8e 100644 --- a/data/overlays/gamestates/z_select.reloc.s +++ b/data/overlays/gamestates/z_select.reloc.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata -glabel D_80803620 -.incbin "baserom/ovl_select", 0x2A90, 0x000005D0 +.balign 16 + +glabel D_80803620 + .incbin "baserom/ovl_select", 0x2A90, 0x000005D0 diff --git a/data/overlays/gamestates/z_select.rodata.s b/data/overlays/gamestates/z_select.rodata.s index b2c7169e8c..a318d08deb 100644 --- a/data/overlays/gamestates/z_select.rodata.s +++ b/data/overlays/gamestates/z_select.rodata.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers + .set gp=64 # allow use of 64-bit general purpose registers .section .rodata +.balign 16 + glabel D_808025E0 .asciz "" .balign 4 diff --git a/data/rsp.rodata.s b/data/rsp.rodata.s index adee9500c5..e8cc01a536 100644 --- a/data/rsp.rodata.s +++ b/data/rsp.rodata.s @@ -3,11 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.set gp=64 # allow use of 64-bit general purposee registers +.set gp=64 # allow use of 64-bit general purpose registers .section .rodata -.align 4 +.balign 16 glabel D_801550D0 .incbin "baserom.z64", 0xBCC270, 0x270 diff --git a/data/rsp.text.s b/data/rsp.text.s index b6c8746b01..7fe0235d0a 100644 --- a/data/rsp.text.s +++ b/data/rsp.text.s @@ -3,7 +3,7 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.set gp=64 # allow use of 64-bit general purposee registers +.set gp=64 # allow use of 64-bit general purpose registers .section .text diff --git a/data/rsp_boot.text.s b/data/rsp_boot.text.s index 7fdb114d55..f9495dcac8 100644 --- a/data/rsp_boot.text.s +++ b/data/rsp_boot.text.s @@ -3,7 +3,7 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.set gp=64 # allow use of 64-bit general purposee registers +.set gp=64 # allow use of 64-bit general purpose registers .section .text diff --git a/data/sins.data.s b/data/sins.data.s index 9407b2f982..6f9b74f2ee 100644 --- a/data/sins.data.s +++ b/data/sins.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.set gp=64 # allow use of 64-bit general purposee registers +.set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel D_801344D0 .incbin "baserom.z64", 0xBAB670, 0x7FE diff --git a/data/sys_ucode.data.s b/data/sys_ucode.data.s index af32c258da..6d034b2710 100644 --- a/data/sys_ucode.data.s +++ b/data/sys_ucode.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.set gp=64 # allow use of 64-bit general purposee registers +.set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel D_8012DBA0 .incbin "baserom.z64", 0xBA4D40, 0x4 diff --git a/data/z_bgcheck.bss.s b/data/z_bgcheck.bss.s index 963c1aa35d..ad6470d13f 100644 --- a/data/z_bgcheck.bss.s +++ b/data/z_bgcheck.bss.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.set gp=64 # allow use of 64-bit general purposee registers +.set gp=64 # allow use of 64-bit general purpose registers .section .bss +.balign 16 + glabel D_8015BC30 .space 0xC diff --git a/data/z_bgcheck.data.s b/data/z_bgcheck.data.s index 54e542a0f5..9ada1a902f 100644 --- a/data/z_bgcheck.data.s +++ b/data/z_bgcheck.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.set gp=64 # allow use of 64-bit general purposee registers +.set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel D_80119D90 .incbin "baserom.z64", 0xB90F30, 0x80 diff --git a/data/z_bgcheck.rodata.s b/data/z_bgcheck.rodata.s index 6dcfe36e26..5ee0e8fe1e 100644 --- a/data/z_bgcheck.rodata.s +++ b/data/z_bgcheck.rodata.s @@ -3,11 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.set gp=64 # allow use of 64-bit general purposee registers +.set gp=64 # allow use of 64-bit general purpose registers .section .rodata -.align 4 +.balign 16 glabel D_80138670 .asciz "\x1b[31m" diff --git a/data/z_camera.bss.s b/data/z_camera.bss.s index 01e63c3913..8d56a9a4b2 100644 --- a/data/z_camera.bss.s +++ b/data/z_camera.bss.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.set gp=64 # allow use of 64-bit general purposee registers +.set gp=64 # allow use of 64-bit general purpose registers .section .bss +.balign 16 + glabel D_8015BD50 .space 0x4 diff --git a/data/z_camera.data.s b/data/z_camera.data.s index 0f4bc2c709..ab6f11db8f 100644 --- a/data/z_camera.data.s +++ b/data/z_camera.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.set gp=64 # allow use of 64-bit general purposee registers +.set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel D_80119EE0 .incbin "baserom.z64", 0xB91080, 0x6C diff --git a/data/z_collision_check.bss.s b/data/z_collision_check.bss.s index 63dbcad337..a45df86591 100644 --- a/data/z_collision_check.bss.s +++ b/data/z_collision_check.bss.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.set gp=64 # allow use of 64-bit general purposee registers +.set gp=64 # allow use of 64-bit general purpose registers .section .bss +.balign 16 + glabel D_8015CF00 .space 0x4 diff --git a/data/z_effect_soft_sprite_old_init.data.s b/data/z_effect_soft_sprite_old_init.data.s index 93fc257715..fed42cd7b9 100644 --- a/data/z_effect_soft_sprite_old_init.data.s +++ b/data/z_effect_soft_sprite_old_init.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.set gp=64 # allow use of 64-bit general purposee registers +.set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel D_801158C0 .incbin "baserom.z64", 0xB8CA60, 0xC diff --git a/data/z_en_a_keep.data.s b/data/z_en_a_keep.data.s index 0f489541cf..f68f8a28ef 100644 --- a/data/z_en_a_keep.data.s +++ b/data/z_en_a_keep.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.set gp=64 # allow use of 64-bit general purposee registers +.set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel D_80115440 .incbin "baserom.z64", 0xB8C5E0, 0x2C diff --git a/data/z_en_item00.bss.s b/data/z_en_item00.bss.s index a438f1b3e8..5a3fc376b0 100644 --- a/data/z_en_item00.bss.s +++ b/data/z_en_item00.bss.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.set gp=64 # allow use of 64-bit general purposee registers +.set gp=64 # allow use of 64-bit general purpose registers .section .bss +.balign 16 + glabel D_80157D90 glabel D_80157D90_ .space 0x4 diff --git a/data/z_en_item00.data.s b/data/z_en_item00.data.s index 17132f281a..94200188da 100644 --- a/data/z_en_item00.data.s +++ b/data/z_en_item00.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.set gp=64 # allow use of 64-bit general purposee registers +.set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel D_801154E0 .incbin "baserom.z64", 0xB8C680, 0x2C diff --git a/data/z_kankyo.bss.s b/data/z_kankyo.bss.s index 7946f98e61..37c15ab9b3 100644 --- a/data/z_kankyo.bss.s +++ b/data/z_kankyo.bss.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.set gp=64 # allow use of 64-bit general purposee registers +.set gp=64 # allow use of 64-bit general purpose registers .section .bss +.balign 16 + glabel D_8015FCF0 .space 0x8 diff --git a/data/z_kankyo.data.s b/data/z_kankyo.data.s index 02809bc8b5..1948c96360 100644 --- a/data/z_kankyo.data.s +++ b/data/z_kankyo.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.set gp=64 # allow use of 64-bit general purposee registers +.set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel D_8011FAF0 .incbin "baserom.z64", 0xB96C90, 0x40 diff --git a/data/z_kankyo.rodata.s b/data/z_kankyo.rodata.s index ed24848ea6..4abbf38de0 100644 --- a/data/z_kankyo.rodata.s +++ b/data/z_kankyo.rodata.s @@ -3,11 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.set gp=64 # allow use of 64-bit general purposee registers +.set gp=64 # allow use of 64-bit general purpose registers .section .rodata -.align 4 +.balign 16 glabel D_8013C240 .asciz "\x1b[43;30m\n\nフィールド常駐以外、太陽設定！よって強制解除！\n\x1b[m" diff --git a/data/z_lifemeter.data.s b/data/z_lifemeter.data.s index 81988ac363..fc841b6176 100644 --- a/data/z_lifemeter.data.s +++ b/data/z_lifemeter.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.set gp=64 # allow use of 64-bit general purposee registers +.set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel D_8011FF10 .incbin "baserom.z64", 0xB970B0, 0x2 diff --git a/data/z_lights.bss.s b/data/z_lights.bss.s index 52ea54b131..10a48f9ad4 100644 --- a/data/z_lights.bss.s +++ b/data/z_lights.bss.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.set gp=64 # allow use of 64-bit general purposee registers +.set gp=64 # allow use of 64-bit general purpose registers .section .bss +.balign 16 + glabel sLightsList .space 0x8 diff --git a/data/z_lights.data.s b/data/z_lights.data.s index b71813e21d..ad3e0c02b5 100644 --- a/data/z_lights.data.s +++ b/data/z_lights.data.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.set gp=64 # allow use of 64-bit general purposee registers +.set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel D_80120030 .incbin "baserom.z64", 0xB971D0, 0x10 diff --git a/data/z_map_data.data.s b/data/z_map_data.data.s index 44823cd702..977248eb5f 100644 --- a/data/z_map_data.data.s +++ b/data/z_map_data.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.set gp=64 # allow use of 64-bit general purposee registers +.set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel D_80123A70 .incbin "baserom.z64", 0xB9AC10, 0xA0 diff --git a/data/z_message_PAL.bss.s b/data/z_message_PAL.bss.s index fb26076544..1fe2b7304d 100644 --- a/data/z_message_PAL.bss.s +++ b/data/z_message_PAL.bss.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.set gp=64 # allow use of 64-bit general purposee registers +.set gp=64 # allow use of 64-bit general purpose registers .section .bss +.balign 16 + glabel D_801759A0 .space 0x4 diff --git a/data/z_message_PAL.rodata.s b/data/z_message_PAL.rodata.s index 7a88858552..5e5740e9ac 100644 --- a/data/z_message_PAL.rodata.s +++ b/data/z_message_PAL.rodata.s @@ -3,11 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.set gp=64 # allow use of 64-bit general purposee registers +.set gp=64 # allow use of 64-bit general purpose registers .section .rodata -.align 4 +.balign 16 glabel D_8014B2F0 .incbin "baserom.z64", 0xBC2490, 0x4 diff --git a/data/z_onepointdemo.data.s b/data/z_onepointdemo.data.s index 5e4da67290..3c5dff2e7e 100644 --- a/data/z_onepointdemo.data.s +++ b/data/z_onepointdemo.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.set gp=64 # allow use of 64-bit general purposee registers +.set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel D_80120130 .incbin "baserom.z64", 0xB972D0, 0x4 diff --git a/data/z_player_lib.bss.s b/data/z_player_lib.bss.s index 1b8e02a942..745b547f09 100644 --- a/data/z_player_lib.bss.s +++ b/data/z_player_lib.bss.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.set gp=64 # allow use of 64-bit general purposee registers +.set gp=64 # allow use of 64-bit general purpose registers .section .bss +.balign 16 + glabel D_80160000 .space 0x1 diff --git a/data/z_player_lib.data.s b/data/z_player_lib.data.s index d78c3edad0..0c86ddf5ef 100644 --- a/data/z_player_lib.data.s +++ b/data/z_player_lib.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.set gp=64 # allow use of 64-bit general purposee registers +.set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel D_80125B70 .incbin "baserom.z64", 0xB9CD10, 0x8 diff --git a/data/z_skin.bss.s b/data/z_skin.bss.s index 3d2ddfd701..281b6ff2b7 100644 --- a/data/z_skin.bss.s +++ b/data/z_skin.bss.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.set gp=64 # allow use of 64-bit general purposee registers +.set gp=64 # allow use of 64-bit general purpose registers .section .bss +.balign 16 + glabel D_801600C0 .space 0x404 diff --git a/data/z_skin_matrix.data.s b/data/z_skin_matrix.data.s index 3b7f085eac..3d6088f15b 100644 --- a/data/z_skin_matrix.data.s +++ b/data/z_skin_matrix.data.s @@ -3,9 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.set gp=64 # allow use of 64-bit general purposee registers +.set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel D_8012A4A0 .incbin "baserom.z64", 0xBA1640, 0x40 diff --git a/data/z_sram.data.s b/data/z_sram.data.s index 31c9a6b2cd..3b45c99342 100644 --- a/data/z_sram.data.s +++ b/data/z_sram.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.set gp=64 # allow use of 64-bit general purposee registers +.set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel D_8012A4E0 .incbin "baserom.z64", 0xBA1680, 0x6 diff --git a/data/z_sram.rodata.s b/data/z_sram.rodata.s index 7f18949169..0abc912efc 100644 --- a/data/z_sram.rodata.s +++ b/data/z_sram.rodata.s @@ -3,11 +3,11 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.set gp=64 # allow use of 64-bit general purposee registers +.set gp=64 # allow use of 64-bit general purpose registers .section .rodata -.align 4 +.balign 16 glabel D_80140850 .asciz "個人Ｆｉｌｅ作成\n" diff --git a/data/z_text.data.s b/data/z_text.data.s index 55419e9474..3e6a88fcb6 100644 --- a/data/z_text.data.s +++ b/data/z_text.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.set gp=64 # allow use of 64-bit general purposee registers +.set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + # temporary file name, rename to something more appropriate when decompiled glabel gLetterTLUT diff --git a/data/z_vr_box.data.s b/data/z_vr_box.data.s index 75ec1979a5..92c30ab5c3 100644 --- a/data/z_vr_box.data.s +++ b/data/z_vr_box.data.s @@ -3,10 +3,12 @@ # assembler directives .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.set gp=64 # allow use of 64-bit general purposee registers +.set gp=64 # allow use of 64-bit general purpose registers .section .data +.balign 16 + glabel D_8012AC90 .incbin "baserom.z64", 0xBA1E30, 0x10 diff --git a/tools/reformat_data_files.py b/tools/reformat_data_files.py index eec8813280..2220868d7d 100644 --- a/tools/reformat_data_files.py +++ b/tools/reformat_data_files.py @@ -63,7 +63,7 @@ def handle_word_l(match): def main(): - preamble = ".include \"macro.inc\"\n\n # assembler directives\n .set noat # allow manual use of $at\n .set noreorder # don't insert nops after branches\n .set gp=64 # allow use of 64-bit general purposee registers\n\n" + preamble = ".include \"macro.inc\"\n\n # assembler directives\n .set noat # allow manual use of $at\n .set noreorder # don't insert nops after branches\n .set gp=64 # allow use of 64-bit general purpose registers\n\n" for root, dirs, files in os.walk(data_dir): for file in files: