summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--asm/m4a_1.s1
-rw-r--r--data/battle_ai_scripts.s1
-rw-r--r--data/battle_anim_scripts.s1
-rw-r--r--ld_script_modern.txt1
4 files changed, 4 insertions, 0 deletions
diff --git a/asm/m4a_1.s b/asm/m4a_1.s
index db8476382..7cb36580f 100644
--- a/asm/m4a_1.s
+++ b/asm/m4a_1.s
@@ -1909,6 +1909,7 @@ _081DDD90:
.align 2, 0 @ Don't pad with nop.
.bss
+ .align 3
gUnknown_030007B8:
.space 0x40
.size gUnknown_030007B8, .-gUnknown_030007B8
diff --git a/data/battle_ai_scripts.s b/data/battle_ai_scripts.s
index cfbef4ec2..34b7aeaad 100644
--- a/data/battle_ai_scripts.s
+++ b/data/battle_ai_scripts.s
@@ -14,6 +14,7 @@
@ To make adding these improvements easier they are commented and tagged with "Improvement in Emerald"
@ Emerald also adds a few entirely new AI commands (mostly to expand Double Battle AI), which are not included
+ .align 2
gBattleAI_ScriptsTable:: @ 81D9BF4
.4byte AI_CheckBadMove
.4byte AI_CheckViability
diff --git a/data/battle_anim_scripts.s b/data/battle_anim_scripts.s
index c6dc96bf4..a12e87e0f 100644
--- a/data/battle_anim_scripts.s
+++ b/data/battle_anim_scripts.s
@@ -44,6 +44,7 @@ gMovesWithQuietBGM:: @ 81C68EC
.2byte MOVE_GRASS_WHISTLE
.2byte 0xFFFF
+ .align 2
gBattleAnims_Moves::
.4byte Move_NONE
.4byte Move_POUND
diff --git a/ld_script_modern.txt b/ld_script_modern.txt
index 68d704109..33de4451a 100644
--- a/ld_script_modern.txt
+++ b/ld_script_modern.txt
@@ -13,6 +13,7 @@ SECTIONS {
*(ewram_data);
/* pokemon_summary_screen.o */
+ . = ALIGN(4);
gUnknown_203B140 = .; . += 0x4;
gUnknown_203B144 = .; . += 0x4;
gUnknown_203B148 = .; . += 0x10;