summaryrefslogtreecommitdiff
path: root/src/battle
diff options
context:
space:
mode:
Diffstat (limited to 'src/battle')
-rw-r--r--src/battle/battle_2.c140
-rw-r--r--src/battle/battle_ai.c2
-rw-r--r--src/battle/battle_interface.c6
3 files changed, 74 insertions, 74 deletions
diff --git a/src/battle/battle_2.c b/src/battle/battle_2.c
index 78fc35ba5..454b47e08 100644
--- a/src/battle/battle_2.c
+++ b/src/battle/battle_2.c
@@ -220,7 +220,7 @@ void InitBattle(void)
" lsl r1, r1, #0x13\n"
" ldr r2, ._10\n"
" mov r0, sp\n"
- " bl gScriptFuncs_End+0x3cb4\n"
+ " bl gMysteryEventScriptCmdTableEnd+0x3cb4\n"
" ldr r0, ._10 + 4\n"
" strh r4, [r0]\n"
" sub r0, r0, #0xc\n"
@@ -347,13 +347,13 @@ void InitBattle(void)
" .word 0xff10\n"
" .word gWindowConfig_81E6C58\n"
" .word gUnknown_030042A4\n"
- " .word gUnknown_030042A0\n"
+ " .word gBattle_BG0_Y\n"
" .word gBattle_BG1_X\n"
- " .word gUnknown_030041B4\n"
- " .word gUnknown_03004288\n"
- " .word gUnknown_03004280\n"
- " .word gUnknown_030041B0\n"
- " .word gUnknown_030041B8\n"
+ " .word gBattle_BG1_Y\n"
+ " .word gBattle_BG2_X\n"
+ " .word gBattle_BG2_Y\n"
+ " .word gBattle_BG3_X\n"
+ " .word gBattle_BG3_Y\n"
" .word gUnknown_02023A14+0x50\n"
" .word gBattleTerrain\n"
" .word gUnknown_03004210\n"
@@ -907,7 +907,7 @@ void sub_800EC9C()
" ldr r2, ._116 + 4\n"
" add r1, r1, r2\n"
" mov r2, #0xc8\n"
- " bl gScriptFuncs_End+0x5bc4\n"
+ " bl gMysteryEventScriptCmdTableEnd+0x5bc4\n"
" b ._129\n"
"._117:\n"
" .align 2, 0\n"
@@ -946,7 +946,7 @@ void sub_800EC9C()
" ldr r2, ._126 + 4\n"
" add r1, r1, r2\n"
" mov r2, #0xc8\n"
- " bl gScriptFuncs_End+0x5bc4\n"
+ " bl gMysteryEventScriptCmdTableEnd+0x5bc4\n"
" b ._129\n"
"._127:\n"
" .align 2, 0\n"
@@ -982,7 +982,7 @@ void sub_800EC9C()
" add r1, r1, r0\n"
" add r0, r4, #0\n"
" mov r2, #0xc8\n"
- " bl gScriptFuncs_End+0x5bc4\n"
+ " bl gMysteryEventScriptCmdTableEnd+0x5bc4\n"
" ldr r1, ._134 + 8\n"
" add r0, r4, r1\n"
" bl shedinja_something\n"
@@ -1407,7 +1407,7 @@ void sub_800F104()
" add r1, r1, r0\n"
" ldr r0, ._177 + 4\n"
" mov r2, #0x60\n"
- " bl gScriptFuncs_End+0x5bc4\n"
+ " bl gMysteryEventScriptCmdTableEnd+0x5bc4\n"
"._174:\n"
" add r7, r7, #0x1c\n"
" add r4, r4, #0x1\n"
@@ -1781,7 +1781,7 @@ void sub_800F298()
" ldr r1, ._239 + 4\n"
" mov r2, #0x96\n"
" lsl r2, r2, #0x1\n"
- " bl gScriptFuncs_End+0x5bc4\n"
+ " bl gMysteryEventScriptCmdTableEnd+0x5bc4\n"
" ldr r0, ._239 + 8\n"
" mov r1, #0x0\n"
" bl CreateTask\n"
@@ -2018,7 +2018,7 @@ void sub_800F298()
"._283:\n"
" add r1, r5, #0\n"
" mov r2, #0xc8\n"
- " bl gScriptFuncs_End+0x5bc4\n"
+ " bl gMysteryEventScriptCmdTableEnd+0x5bc4\n"
" b ._291\n"
"._293:\n"
" .align 2, 0\n"
@@ -2028,7 +2028,7 @@ void sub_800F298()
" ldr r0, ._296\n"
" add r1, r5, #0\n"
" mov r2, #0xc8\n"
- " bl gScriptFuncs_End+0x5bc4\n"
+ " bl gMysteryEventScriptCmdTableEnd+0x5bc4\n"
"._291:\n"
" mov r0, #0x80\n"
" lsl r0, r0, #0x1\n"
@@ -2185,7 +2185,7 @@ void sub_800F298()
"._333:\n"
" add r1, r5, #0\n"
" mov r2, #0x64\n"
- " bl gScriptFuncs_End+0x5bc4\n"
+ " bl gMysteryEventScriptCmdTableEnd+0x5bc4\n"
" b ._341\n"
"._343:\n"
" .align 2, 0\n"
@@ -2195,7 +2195,7 @@ void sub_800F298()
" ldr r0, ._346\n"
" add r1, r5, #0\n"
" mov r2, #0x64\n"
- " bl gScriptFuncs_End+0x5bc4\n"
+ " bl gMysteryEventScriptCmdTableEnd+0x5bc4\n"
"._341:\n"
" mov r0, #0x80\n"
" lsl r0, r0, #0x1\n"
@@ -2627,7 +2627,7 @@ void BattleMainCB2(void)
" str r0, [r4]\n"
" bl ZeroEnemyPartyMons\n"
" mov r0, #0x5a\n"
- " bl gScriptFuncs_End+0x148c\n"
+ " bl gMysteryEventScriptCmdTableEnd+0x148c\n"
" ldr r0, ._358 + 24\n"
" ldrh r1, [r0]\n"
" mov r0, #0x2\n"
@@ -3197,7 +3197,7 @@ void debug_sub_80108B8()
asm(
" push {r4, r5, lr}\n"
" add sp, sp, #0xfffffffc\n"
- " bl gScriptFuncs_End+0x19f4\n"
+ " bl gMysteryEventScriptCmdTableEnd+0x19f4\n"
" mov r0, #0x0\n"
" bl SetHBlankCallback\n"
" mov r0, #0x0\n"
@@ -3264,7 +3264,7 @@ void debug_sub_80108B8()
" ldr r1, ._507 + 72\n"
" add r0, r4, #0\n"
" bl LZDecompressVram\n"
- " bl gScriptFuncs_End+0x1a70\n"
+ " bl gMysteryEventScriptCmdTableEnd+0x1a70\n"
" ldr r0, ._507 + 76\n"
" bl SetVBlankCallback\n"
" ldr r0, ._507 + 80\n"
@@ -3333,13 +3333,13 @@ void debug_sub_80108B8()
" .word 0x85006000\n"
" .word 0x4000200\n"
" .word gUnknown_030042A4\n"
- " .word gUnknown_030042A0\n"
+ " .word gBattle_BG0_Y\n"
" .word gBattle_BG1_X\n"
- " .word gUnknown_030041B4\n"
- " .word gUnknown_03004288\n"
- " .word gUnknown_03004280\n"
- " .word gUnknown_030041B0\n"
- " .word gUnknown_030041B8\n"
+ " .word gBattle_BG1_Y\n"
+ " .word gBattle_BG2_X\n"
+ " .word gBattle_BG2_Y\n"
+ " .word gBattle_BG3_X\n"
+ " .word gBattle_BG3_Y\n"
" .word 0x1f09\n"
" .word 0x4801\n"
" .word 0x4000050\n"
@@ -3860,7 +3860,7 @@ void debug_sub_8010CAC()
" strb r0, [r3, #0x15]\n"
" lsl r0, r0, #0x1f\n"
" lsr r0, r0, #0x1f\n"
- " bl gScriptFuncs_End+0x2aa0\n"
+ " bl gMysteryEventScriptCmdTableEnd+0x2aa0\n"
" bl debug_nullsub_3\n"
"._559:\n"
" ldr r4, ._565 + 12\n"
@@ -4774,7 +4774,7 @@ void debug_sub_8011498()
" lsl r4, r4, #0x1\n"
" mov r0, r9\n"
" mov r1, #0x5\n"
- " bl gScriptFuncs_End+0x4358\n"
+ " bl gMysteryEventScriptCmdTableEnd+0x4358\n"
" lsl r0, r0, #0x18\n"
" lsr r0, r0, #0x15\n"
" add r4, r4, r0\n"
@@ -4830,7 +4830,7 @@ void debug_sub_8011498()
" lsl r4, r4, #0x1\n"
" mov r0, r9\n"
" mov r1, #0x5\n"
- " bl gScriptFuncs_End+0x4358\n"
+ " bl gMysteryEventScriptCmdTableEnd+0x4358\n"
" lsl r0, r0, #0x18\n"
" lsr r0, r0, #0x15\n"
" add r4, r4, r0\n"
@@ -4886,7 +4886,7 @@ void debug_sub_8011498()
" lsl r4, r4, #0x1\n"
" mov r0, r9\n"
" mov r1, #0x5\n"
- " bl gScriptFuncs_End+0x4358\n"
+ " bl gMysteryEventScriptCmdTableEnd+0x4358\n"
" lsl r0, r0, #0x18\n"
" lsr r0, r0, #0x15\n"
" add r4, r4, r0\n"
@@ -4929,7 +4929,7 @@ void debug_sub_8011498()
" lsl r4, r5, #0x1\n"
" mov r0, r9\n"
" mov r1, #0x5\n"
- " bl gScriptFuncs_End+0x4358\n"
+ " bl gMysteryEventScriptCmdTableEnd+0x4358\n"
" lsl r0, r0, #0x18\n"
" lsr r0, r0, #0x15\n"
" add r4, r4, r0\n"
@@ -4965,7 +4965,7 @@ void debug_sub_8011498()
" lsl r4, r4, #0x1\n"
" mov r0, r9\n"
" mov r1, #0x5\n"
- " bl gScriptFuncs_End+0x4358\n"
+ " bl gMysteryEventScriptCmdTableEnd+0x4358\n"
" lsl r0, r0, #0x18\n"
" lsr r0, r0, #0x15\n"
" add r4, r4, r0\n"
@@ -5002,7 +5002,7 @@ void debug_sub_8011498()
" lsl r4, r5, #0x1\n"
" mov r0, r9\n"
" mov r1, #0x5\n"
- " bl gScriptFuncs_End+0x4358\n"
+ " bl gMysteryEventScriptCmdTableEnd+0x4358\n"
" lsl r0, r0, #0x18\n"
" lsr r0, r0, #0x15\n"
" add r4, r4, r0\n"
@@ -5200,7 +5200,7 @@ void debug_sub_801174C()
"._713:\n"
" add r0, r7, #0\n"
" mov r1, #0x5\n"
- " bl gScriptFuncs_End+0x3d30\n"
+ " bl gMysteryEventScriptCmdTableEnd+0x3d30\n"
" mov r3, #0x64\n"
" mul r0, r0, r3\n"
" ldr r1, ._719\n"
@@ -5223,7 +5223,7 @@ void debug_sub_801174C()
"._699:\n"
" add r0, r7, #0\n"
" mov r1, #0x5\n"
- " bl gScriptFuncs_End+0x3d30\n"
+ " bl gMysteryEventScriptCmdTableEnd+0x3d30\n"
" mov r2, #0x64\n"
" add r1, r0, #0\n"
" mul r1, r1, r2\n"
@@ -5282,7 +5282,7 @@ void debug_sub_801174C()
" str r0, [sp, #0xc]\n"
" add r0, r7, #0\n"
" mov r1, #0x5\n"
- " bl gScriptFuncs_End+0x3d30\n"
+ " bl gMysteryEventScriptCmdTableEnd+0x3d30\n"
" mov r3, #0x64\n"
" mul r0, r0, r3\n"
" ldr r1, ._726\n"
@@ -5355,7 +5355,7 @@ void debug_sub_801174C()
"._735:\n"
" add r0, r7, #0\n"
" mov r1, #0x5\n"
- " bl gScriptFuncs_End+0x3d30\n"
+ " bl gMysteryEventScriptCmdTableEnd+0x3d30\n"
" mov r2, #0x64\n"
" mul r0, r0, r2\n"
" ldr r1, ._741\n"
@@ -5382,7 +5382,7 @@ void debug_sub_801174C()
"._721:\n"
" add r0, r7, #0\n"
" mov r1, #0x5\n"
- " bl gScriptFuncs_End+0x3d30\n"
+ " bl gMysteryEventScriptCmdTableEnd+0x3d30\n"
" mov r2, #0x64\n"
" add r1, r0, #0\n"
" mul r1, r1, r2\n"
@@ -5441,7 +5441,7 @@ void debug_sub_801174C()
" str r0, [sp, #0xc]\n"
" add r0, r7, #0\n"
" mov r1, #0x5\n"
- " bl gScriptFuncs_End+0x3d30\n"
+ " bl gMysteryEventScriptCmdTableEnd+0x3d30\n"
" mov r2, #0x64\n"
" mul r0, r0, r2\n"
" ldr r1, ._750\n"
@@ -5460,7 +5460,7 @@ void debug_sub_801174C()
" ble ._743 @cond_branch\n"
" add r0, r7, #0\n"
" mov r1, #0x5\n"
- " bl gScriptFuncs_End+0x3d30\n"
+ " bl gMysteryEventScriptCmdTableEnd+0x3d30\n"
" mov r3, #0x64\n"
" mul r0, r0, r3\n"
" ldr r1, ._750\n"
@@ -5838,13 +5838,13 @@ void debug_sub_8011D40()
" .word 0x6004000\n"
" .word 0x80000800\n"
" .word gUnknown_030042A4\n"
- " .word gUnknown_030042A0\n"
+ " .word gBattle_BG0_Y\n"
" .word gBattle_BG1_X\n"
- " .word gUnknown_030041B4\n"
- " .word gUnknown_03004288\n"
- " .word gUnknown_03004280\n"
- " .word gUnknown_030041B0\n"
- " .word gUnknown_030041B8\n"
+ " .word gBattle_BG1_Y\n"
+ " .word gBattle_BG2_X\n"
+ " .word gBattle_BG2_Y\n"
+ " .word gBattle_BG3_X\n"
+ " .word gBattle_BG3_Y\n"
"\n"
);
}
@@ -5911,13 +5911,13 @@ void debug_sub_8011DD4()
" .word 0x4000008\n"
" .word 0x9803\n"
" .word gUnknown_030042A4\n"
- " .word gUnknown_030042A0\n"
+ " .word gBattle_BG0_Y\n"
" .word gBattle_BG1_X\n"
- " .word gUnknown_030041B4\n"
- " .word gUnknown_03004288\n"
- " .word gUnknown_03004280\n"
- " .word gUnknown_030041B0\n"
- " .word gUnknown_030041B8\n"
+ " .word gBattle_BG1_Y\n"
+ " .word gBattle_BG2_X\n"
+ " .word gBattle_BG2_Y\n"
+ " .word gBattle_BG3_X\n"
+ " .word gBattle_BG3_Y\n"
"\n"
);
}
@@ -6483,7 +6483,7 @@ void debug_sub_8012294()
" lsl r4, r4, #0x1\n"
" add r0, r5, #0\n"
" mov r1, #0x5\n"
- " bl gScriptFuncs_End+0x4358\n"
+ " bl gMysteryEventScriptCmdTableEnd+0x4358\n"
" add r5, r0, #0\n"
" lsl r5, r5, #0x18\n"
" lsr r5, r5, #0x15\n"
@@ -7102,7 +7102,7 @@ void debug_sub_8012688()
" bl SetHBlankCallback\n"
" ldr r0, ._873 + 100\n"
" bl SetVBlankCallback\n"
- " bl gScriptFuncs_End+0x14f4\n"
+ " bl gMysteryEventScriptCmdTableEnd+0x14f4\n"
" ldr r0, ._873 + 104\n"
" mov r1, #0x0\n"
" bl CreateTask\n"
@@ -7132,13 +7132,13 @@ void debug_sub_8012688()
" .word 0x400004c\n"
" .word gWindowConfig_81E6C58\n"
" .word gUnknown_030042A4\n"
- " .word gUnknown_030042A0\n"
+ " .word gBattle_BG0_Y\n"
" .word gBattle_BG1_X\n"
- " .word gUnknown_030041B4\n"
- " .word gUnknown_03004288\n"
- " .word gUnknown_03004280\n"
- " .word gUnknown_030041B0\n"
- " .word gUnknown_030041B8\n"
+ " .word gBattle_BG1_Y\n"
+ " .word gBattle_BG2_X\n"
+ " .word gBattle_BG2_Y\n"
+ " .word gBattle_BG3_X\n"
+ " .word gBattle_BG3_Y\n"
" .word gBattleTerrain\n"
" .word gReservedSpritePaletteCount\n"
" .word gCurrentMove\n"
@@ -7764,7 +7764,7 @@ void debug_sub_8012C08()
" .word gTasks\n"
" .word UnkDebug0+0x432\n"
" .word gUnknown_03004210\n"
- " .word gUnknown_08400D7A\n"
+ " .word BattleText_YesNo\n"
"\n"
);
}
@@ -8484,7 +8484,7 @@ void debug_sub_8013240()
{
asm(
" push {lr}\n"
- " bl gScriptFuncs_End+0x2fec\n"
+ " bl gMysteryEventScriptCmdTableEnd+0x2fec\n"
" lsl r0, r0, #0x10\n"
" cmp r0, #0\n"
" beq ._1068 @cond_branch\n"
@@ -8519,7 +8519,7 @@ void debug_sub_8013258()
" lsr r4, r0, #0x10\n"
" add r0, r4, #0\n"
" add r1, r6, #0\n"
- " bl gScriptFuncs_End+0x2f60\n"
+ " bl gMysteryEventScriptCmdTableEnd+0x2f60\n"
" cmp r0, #0\n"
" bne ._1071 @cond_branch\n"
" mov r0, #0x80\n"
@@ -8555,13 +8555,13 @@ void debug_sub_8013294()
" lsl r0, r0, #0x18\n"
" cmp r0, #0\n"
" bne ._1076 @cond_branch\n"
- " bl gScriptFuncs_End+0x19f4\n"
+ " bl gMysteryEventScriptCmdTableEnd+0x19f4\n"
" add r0, r4, #0\n"
" add r1, r5, #0\n"
" add r2, r6, #0\n"
" bl debug_sub_8013258\n"
" add r4, r0, #0\n"
- " bl gScriptFuncs_End+0x1a70\n"
+ " bl gMysteryEventScriptCmdTableEnd+0x1a70\n"
" add r0, r4, #0\n"
" b ._1077\n"
"._1076:\n"
@@ -8591,7 +8591,7 @@ void debug_sub_80132C8()
" mov r1, #0x0\n"
" add r2, r5, #0\n"
" add r3, r6, #0\n"
- " bl gScriptFuncs_End+0x2d64\n"
+ " bl gMysteryEventScriptCmdTableEnd+0x2d64\n"
"._1078:\n"
" pop {r4, r5, r6}\n"
" pop {r0}\n"
@@ -9066,7 +9066,7 @@ void debug_sub_80139E4()
"._1193:\n"
" ldr r0, ._1198 + 12\n"
" ldr r0, [r0]\n"
- " bl gScriptFuncs_End+0x3cf4\n"
+ " bl gMysteryEventScriptCmdTableEnd+0x3cf4\n"
" ldr r1, ._1198 + 4\n"
" mov r0, #0x0\n"
" strb r0, [r1]\n"
@@ -9081,7 +9081,7 @@ void debug_sub_80139E4()
" lsl r0, r0, #0x2\n"
" add r0, r0, r5\n"
" ldr r0, [r0]\n"
- " bl gScriptFuncs_End+0x3cf4\n"
+ " bl gMysteryEventScriptCmdTableEnd+0x3cf4\n"
" ldrb r0, [r4]\n"
" add r0, r0, #0x1\n"
" strb r0, [r4]\n"
@@ -9103,7 +9103,7 @@ void debug_sub_80139E4()
"._1192:\n"
" ldr r0, ._1202\n"
" ldr r0, [r0]\n"
- " bl gScriptFuncs_End+0x3cf4\n"
+ " bl gMysteryEventScriptCmdTableEnd+0x3cf4\n"
" ldr r1, ._1202 + 4\n"
" strb r4, [r1]\n"
" ldr r0, ._1202 + 8\n"
@@ -9117,7 +9117,7 @@ void debug_sub_80139E4()
" lsl r0, r0, #0x2\n"
" add r0, r0, r5\n"
" ldr r0, [r0]\n"
- " bl gScriptFuncs_End+0x3cf4\n"
+ " bl gMysteryEventScriptCmdTableEnd+0x3cf4\n"
" ldrb r0, [r4]\n"
" add r0, r0, #0x1\n"
" strb r0, [r4]\n"
@@ -9349,7 +9349,7 @@ void sub_8010874()
" mov r0, #0x64\n"
" mul r0, r0, r1\n"
" ldr r1, ._1215 + 160\n"
- " bl gScriptFuncs_End+0x3d30\n"
+ " bl gMysteryEventScriptCmdTableEnd+0x3d30\n"
" ldr r2, ._1215 + 164\n"
" add r1, r4, r2\n"
" strb r0, [r1]\n"
diff --git a/src/battle/battle_ai.c b/src/battle/battle_ai.c
index 938d0fde1..ffc9281e4 100644
--- a/src/battle/battle_ai.c
+++ b/src/battle/battle_ai.c
@@ -318,7 +318,7 @@ void BattleAI_SetupAIData()
" ldrb r0, [r3]\n"
" mov r1, #0x0\n"
" mov r2, #0xff\n"
- " bl sub_8015A98\n"
+ " bl CheckMoveLimitations\n"
" lsl r0, r0, #0x18\n"
" lsr r7, r0, #0x18\n"
" mov r4, #0x0\n"
diff --git a/src/battle/battle_interface.c b/src/battle/battle_interface.c
index b19547d52..1b6240159 100644
--- a/src/battle/battle_interface.c
+++ b/src/battle/battle_interface.c
@@ -1405,7 +1405,7 @@ void sub_804454C()
" add r1, r1, r0\n"
" mov r0, sp\n"
" ldr r2, ._150 + 36\n"
- " bl gScriptFuncs_End+0x3cb4\n"
+ " bl gMysteryEventScriptCmdTableEnd+0x3cb4\n"
" ldrb r4, [r5]\n"
" ldrh r0, [r7]\n"
" mov r1, sl\n"
@@ -1467,7 +1467,7 @@ void sub_804454C()
" ldr r2, ._153 + 4\n"
" add r1, r1, r2\n"
" ldr r2, ._153 + 8\n"
- " bl gScriptFuncs_End+0x3cb4\n"
+ " bl gMysteryEventScriptCmdTableEnd+0x3cb4\n"
" b ._163\n"
"._154:\n"
" .align 2, 0\n"
@@ -1521,7 +1521,7 @@ void sub_804454C()
" add r1, r1, r6\n"
" mov r0, sp\n"
" ldr r2, ._161 + 4\n"
- " bl gScriptFuncs_End+0x3cb4\n"
+ " bl gMysteryEventScriptCmdTableEnd+0x3cb4\n"
" ldrb r4, [r5]\n"
" ldrh r0, [r7]\n"
" mov r1, sl\n"
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-12 01:10:57 +0000