summaryrefslogtreecommitdiff
path: root/src/battle
diff options
context:
space:
mode:
authorCameron Hall <cameronghall@cox.net>2018-01-17 13:11:10 -0600
committerCameron Hall <cameronghall@cox.net>2018-01-17 13:11:10 -0600
commit6903b3626aed4e5521243b4517c43fed3c4d0ff5 (patch)
tree34f75e24e1ef9d5c12c5a0f1e0210f67110d301d /src/battle
parentd79f440b8d4c5af26a98011719807b05745533e1 (diff)
resolve some undefined references
Diffstat (limited to 'src/battle')
-rw-r--r--src/battle/battle_2.c90
1 files changed, 45 insertions, 45 deletions
diff --git a/src/battle/battle_2.c b/src/battle/battle_2.c
index 5700d1b7e..78fc35ba5 100644
--- a/src/battle/battle_2.c
+++ b/src/battle/battle_2.c
@@ -275,7 +275,7 @@ void InitBattle(void)
" bl sub_80895F8\n"
" ldr r4, ._10 + 32\n"
" add r0, r4, #0\n"
- " bl SetUpWindowConfig\n"
+ " bl Text_LoadWindowTemplate\n"
" bl ResetPaletteFade\n"
" ldr r0, ._10 + 36\n"
" mov r1, #0x0\n"
@@ -306,13 +306,13 @@ void InitBattle(void)
"._7:\n"
" ldr r0, ._10 + 76\n"
" add r1, r4, #0\n"
- " bl InitWindowFromConfig\n"
+ " bl Text_InitWindowWithTemplate\n"
" ldr r0, ._10 + 80\n"
" ldr r1, ._10 + 84\n"
- " bl InitWindowFromConfig\n"
+ " bl Text_InitWindowWithTemplate\n"
" ldr r0, ._10 + 88\n"
" ldr r1, ._10 + 92\n"
- " bl InitWindowFromConfig\n"
+ " bl Text_InitWindowWithTemplate\n"
" bl sub_800D6D4\n"
" bl sub_800DAB8\n"
" bl ResetSpriteData\n"
@@ -348,7 +348,7 @@ void InitBattle(void)
" .word gWindowConfig_81E6C58\n"
" .word gUnknown_030042A4\n"
" .word gUnknown_030042A0\n"
- " .word gUnknown_030042C0\n"
+ " .word gBattle_BG1_X\n"
" .word gUnknown_030041B4\n"
" .word gUnknown_03004288\n"
" .word gUnknown_03004280\n"
@@ -3274,10 +3274,10 @@ void debug_sub_80108B8()
" bl remove_some_task\n"
" ldr r4, ._507 + 84\n"
" add r0, r4, #0\n"
- " bl SetUpWindowConfig\n"
+ " bl Text_LoadWindowTemplate\n"
" ldr r0, ._507 + 88\n"
" add r1, r4, #0\n"
- " bl InitWindowFromConfig\n"
+ " bl Text_InitWindowWithTemplate\n"
" ldr r0, ._507 + 92\n"
" strb r5, [r0]\n"
" ldr r0, ._507 + 96\n"
@@ -3334,7 +3334,7 @@ void debug_sub_80108B8()
" .word 0x4000200\n"
" .word gUnknown_030042A4\n"
" .word gUnknown_030042A0\n"
- " .word gUnknown_030042C0\n"
+ " .word gBattle_BG1_X\n"
" .word gUnknown_030041B4\n"
" .word gUnknown_03004288\n"
" .word gUnknown_03004280\n"
@@ -3987,7 +3987,7 @@ void debug_sub_8010CAC()
" .align 2, 0\n"
"._581:\n"
" .word gUnknown_Debug_03004360\n"
- " .word gUnknown_030042C0\n"
+ " .word gBattle_BG1_X\n"
" .word gUnknown_Debug_030043A4\n"
" .word gMain\n"
" .word gUnknown_Debug_030043A0\n"
@@ -4043,7 +4043,7 @@ void debug_sub_8010CAC()
" .align 2, 0\n"
"._587:\n"
" .word gUnknown_Debug_03004360\n"
- " .word gUnknown_030042C0\n"
+ " .word gBattle_BG1_X\n"
" .word gUnknown_Debug_030043A4\n"
" .word gMain\n"
" .word gUnknown_Debug_030043A0\n"
@@ -5839,7 +5839,7 @@ void debug_sub_8011D40()
" .word 0x80000800\n"
" .word gUnknown_030042A4\n"
" .word gUnknown_030042A0\n"
- " .word gUnknown_030042C0\n"
+ " .word gBattle_BG1_X\n"
" .word gUnknown_030041B4\n"
" .word gUnknown_03004288\n"
" .word gUnknown_03004280\n"
@@ -5912,7 +5912,7 @@ void debug_sub_8011DD4()
" .word 0x9803\n"
" .word gUnknown_030042A4\n"
" .word gUnknown_030042A0\n"
- " .word gUnknown_030042C0\n"
+ " .word gBattle_BG1_X\n"
" .word gUnknown_030041B4\n"
" .word gUnknown_03004288\n"
" .word gUnknown_03004280\n"
@@ -6061,7 +6061,7 @@ void debug_sub_8011EA0()
" add r1, r6, #0\n"
" ldr r2, [sp, #0x4]\n"
" mov r3, r8\n"
- " bl InitWindow\n"
+ " bl Text_InitWindow\n"
" ldr r0, ._823 + 8\n"
" bl sub_8002F44\n"
" ldr r1, ._823 + 12\n"
@@ -6090,7 +6090,7 @@ void debug_sub_8011EA0()
" str r0, [sp]\n"
" ldr r0, ._823 + 8\n"
" add r1, r6, #0\n"
- " bl InitWindow\n"
+ " bl Text_InitWindow\n"
" ldr r0, ._823 + 8\n"
" bl sub_8002F44\n"
" mov r0, #0xff\n"
@@ -6113,7 +6113,7 @@ void debug_sub_8011EA0()
" add r1, r6, #0\n"
" ldr r2, [sp, #0x4]\n"
" mov r3, r8\n"
- " bl InitWindow\n"
+ " bl Text_InitWindow\n"
" ldr r0, ._823 + 8\n"
" bl sub_8002F44\n"
" b ._848\n"
@@ -6171,7 +6171,7 @@ void debug_sub_8011EA0()
" str r0, [sp]\n"
" add r0, r6, #0\n"
" mov r1, sl\n"
- " bl InitWindow\n"
+ " bl Text_InitWindow\n"
" add r0, r6, #0\n"
" bl sub_8002F44\n"
" lsl r4, r7, #0x1\n"
@@ -6199,7 +6199,7 @@ void debug_sub_8011EA0()
" str r0, [sp]\n"
" add r0, r6, #0\n"
" mov r1, sl\n"
- " bl InitWindow\n"
+ " bl Text_InitWindow\n"
" add r0, r6, #0\n"
" bl sub_8002F44\n"
" mov r0, #0xff\n"
@@ -6250,7 +6250,7 @@ void debug_sub_8011EA0()
" ldrb r0, [r4]\n"
" str r0, [sp]\n"
" add r0, r6, #0\n"
- " bl InitWindow\n"
+ " bl Text_InitWindow\n"
" add r0, r6, #0\n"
" bl sub_8002F44\n"
" b ._848\n"
@@ -6282,7 +6282,7 @@ void debug_sub_8011EA0()
" str r0, [sp]\n"
" add r0, r5, #0\n"
" add r1, r6, #0\n"
- " bl InitWindow\n"
+ " bl Text_InitWindow\n"
" add r0, r5, #0\n"
" bl sub_8002F44\n"
" mov r4, #0x0\n"
@@ -6364,7 +6364,7 @@ void debug_sub_8011EA0()
" str r0, [sp]\n"
" add r0, r5, #0\n"
" add r1, r6, #0\n"
- " bl InitWindow\n"
+ " bl Text_InitWindow\n"
" add r0, r5, #0\n"
" bl sub_8002F44\n"
" b ._848\n"
@@ -6406,7 +6406,7 @@ void debug_sub_8011EA0()
" str r0, [sp]\n"
" add r0, r5, #0\n"
" add r1, r6, #0\n"
- " bl InitWindow\n"
+ " bl Text_InitWindow\n"
" add r0, r5, #0\n"
" bl sub_8002F44\n"
"._848:\n"
@@ -6476,7 +6476,7 @@ void debug_sub_8012294()
" str r0, [sp]\n"
" mov r0, sl\n"
" mov r1, r9\n"
- " bl InitWindow\n"
+ " bl Text_InitWindow\n"
" mov r0, sl\n"
" bl sub_8002F44\n"
" ldrb r4, [r7]\n"
@@ -6513,7 +6513,7 @@ void debug_sub_8012294()
" str r0, [sp]\n"
" mov r0, sl\n"
" mov r1, r9\n"
- " bl InitWindow\n"
+ " bl Text_InitWindow\n"
" mov r0, sl\n"
" bl sub_8002F44\n"
" mov r0, #0xff\n"
@@ -6553,7 +6553,7 @@ void debug_sub_8012294()
" str r0, [sp]\n"
" mov r0, sl\n"
" mov r1, r9\n"
- " bl InitWindow\n"
+ " bl Text_InitWindow\n"
" mov r0, sl\n"
" bl sub_8002F44\n"
"._853:\n"
@@ -6614,7 +6614,7 @@ void debug_sub_80123D8()
" mov r1, r8\n"
" mov r2, sl\n"
" add r3, r7, #0\n"
- " bl InitWindow\n"
+ " bl Text_InitWindow\n"
" add r0, r4, #0\n"
" bl sub_8002F44\n"
" lsl r5, r5, #0x1\n"
@@ -6646,7 +6646,7 @@ void debug_sub_80123D8()
" mov r1, r8\n"
" mov r2, sl\n"
" add r3, r7, #0\n"
- " bl InitWindow\n"
+ " bl Text_InitWindow\n"
" add r0, r4, #0\n"
" bl sub_8002F44\n"
" mov r0, #0x0\n"
@@ -6661,7 +6661,7 @@ void debug_sub_80123D8()
" add r0, r4, #0\n"
" mov r1, r8\n"
" mov r3, sl\n"
- " bl InitWindow\n"
+ " bl Text_InitWindow\n"
" add r0, r4, #0\n"
" bl sub_8002F44\n"
" ldr r1, ._858 + 12\n"
@@ -6691,7 +6691,7 @@ void debug_sub_80123D8()
" mov r1, r8\n"
" mov r2, r9\n"
" mov r3, sl\n"
- " bl InitWindow\n"
+ " bl Text_InitWindow\n"
" add r0, r4, #0\n"
" bl sub_8002F44\n"
" b ._857\n"
@@ -6718,7 +6718,7 @@ void debug_sub_80123D8()
" str r0, [sp]\n"
" add r0, r5, #0\n"
" add r1, r6, #0\n"
- " bl InitWindow\n"
+ " bl Text_InitWindow\n"
" add r0, r5, #0\n"
" bl sub_8002F44\n"
" ldrh r2, [r4, #0x6]\n"
@@ -6727,7 +6727,7 @@ void debug_sub_80123D8()
" str r0, [sp]\n"
" add r0, r5, #0\n"
" add r1, r6, #0\n"
- " bl InitWindow\n"
+ " bl Text_InitWindow\n"
" add r0, r5, #0\n"
" bl sub_8002F44\n"
"._857:\n"
@@ -6781,7 +6781,7 @@ void debug_sub_8012540()
" str r0, [sp]\n"
" add r0, r4, #0\n"
" add r1, r5, #0\n"
- " bl InitWindow\n"
+ " bl Text_InitWindow\n"
" add r0, r4, #0\n"
" bl sub_8002F44\n"
" add sp, sp, #0x4\n"
@@ -6998,7 +6998,7 @@ void debug_sub_8012688()
" strh r5, [r0]\n"
" ldr r4, ._873 + 16\n"
" add r0, r4, #0\n"
- " bl SetUpWindowConfig\n"
+ " bl Text_LoadWindowTemplate\n"
" bl ResetPaletteFade\n"
" ldr r0, ._873 + 20\n"
" strh r5, [r0]\n"
@@ -7033,7 +7033,7 @@ void debug_sub_8012688()
" strh r0, [r6]\n"
" ldr r0, ._873 + 64\n"
" add r1, r4, #0\n"
- " bl InitWindowFromConfig\n"
+ " bl Text_InitWindowWithTemplate\n"
" ldrh r2, [r6]\n"
" lsl r0, r2, #0x3\n"
" ldr r1, ._873 + 68\n"
@@ -7133,7 +7133,7 @@ void debug_sub_8012688()
" .word gWindowConfig_81E6C58\n"
" .word gUnknown_030042A4\n"
" .word gUnknown_030042A0\n"
- " .word gUnknown_030042C0\n"
+ " .word gBattle_BG1_X\n"
" .word gUnknown_030041B4\n"
" .word gUnknown_03004288\n"
" .word gUnknown_03004280\n"
@@ -7211,7 +7211,7 @@ void debug_sub_80128B4()
" add r1, r4, #0\n"
" mov r2, #0x90\n"
" mov r3, #0x2\n"
- " bl InitWindow\n"
+ " bl Text_InitWindow\n"
" add r0, r5, #0\n"
" bl sub_8002F44\n"
" ldr r6, ._878 + 8\n"
@@ -7237,7 +7237,7 @@ void debug_sub_80128B4()
" add r1, r4, #0\n"
" mov r2, #0x90\n"
" mov r3, #0x2\n"
- " bl InitWindow\n"
+ " bl Text_InitWindow\n"
" add r0, r5, #0\n"
" bl sub_8002F44\n"
" add sp, sp, #0x4\n"
@@ -7282,7 +7282,7 @@ void debug_sub_8012938()
" add r1, r4, #0\n"
" mov r2, #0xa2\n"
" mov r3, #0x2\n"
- " bl InitWindow\n"
+ " bl Text_InitWindow\n"
" add r0, r6, #0\n"
" bl sub_8002F44\n"
" ldr r1, ._880 + 8\n"
@@ -7306,7 +7306,7 @@ void debug_sub_8012938()
" add r1, r4, #0\n"
" mov r2, #0xa2\n"
" mov r3, #0x2\n"
- " bl InitWindow\n"
+ " bl Text_InitWindow\n"
" add r0, r6, #0\n"
" bl sub_8002F44\n"
" ldr r2, ._880 + 20\n"
@@ -7622,7 +7622,7 @@ void debug_sub_8012B70()
" str r0, [sp]\n"
" add r0, r5, #0\n"
" mov r3, #0x1a\n"
- " bl InitWindow\n"
+ " bl Text_InitWindow\n"
" add r0, r5, #0\n"
" bl sub_8002F44\n"
" strh r6, [r4, #0xe]\n"
@@ -7668,7 +7668,7 @@ void debug_sub_8012C08()
" add r1, r5, #0\n"
" mov r2, #0x90\n"
" mov r3, #0x2\n"
- " bl InitWindow\n"
+ " bl Text_InitWindow\n"
" add r0, r7, #0\n"
" bl sub_8002F44\n"
" mov r0, #0x0\n"
@@ -7680,7 +7680,7 @@ void debug_sub_8012C08()
" add r1, r5, #0\n"
" mov r2, #0xa2\n"
" mov r3, #0x2\n"
- " bl InitWindow\n"
+ " bl Text_InitWindow\n"
" add r0, r7, #0\n"
" bl sub_8002F44\n"
" mov r0, #0x0\n"
@@ -7705,7 +7705,7 @@ void debug_sub_8012C08()
" add r0, r7, #0\n"
" mov r2, #0x90\n"
" mov r3, #0x2\n"
- " bl InitWindow\n"
+ " bl Text_InitWindow\n"
" b ._904\n"
"._906:\n"
" .align 2, 0\n"
@@ -7728,7 +7728,7 @@ void debug_sub_8012C08()
" add r0, r7, #0\n"
" mov r2, #0x90\n"
" mov r3, #0x2\n"
- " bl InitWindow\n"
+ " bl Text_InitWindow\n"
"._904:\n"
" add r5, r4, #0\n"
" ldr r4, ._907 + 8\n"
@@ -7741,7 +7741,7 @@ void debug_sub_8012C08()
" str r0, [sp]\n"
" add r0, r4, #0\n"
" mov r3, #0x1a\n"
- " bl InitWindow\n"
+ " bl Text_InitWindow\n"
" add r0, r4, #0\n"
" bl sub_8002F44\n"
" ldr r1, ._907\n"
@@ -7816,7 +7816,7 @@ void debug_sub_8012D10()
" str r0, [sp]\n"
" add r0, r4, #0\n"
" mov r3, #0x13\n"
- " bl InitWindow\n"
+ " bl Text_InitWindow\n"
" add r0, r4, #0\n"
" bl sub_8002F44\n"
" ldr r1, ._920 + 8\n"