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

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

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

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

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

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

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

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

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

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

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

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

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

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

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
 

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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
 

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

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

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