resolve more undefined references

7 files changed, 21 insertions, 15 deletions

diff --git a/src/battle/battle_2.c b/src/battle/battle_2.c
index bedcb0bb6..6d2045604 100644
--- a/src/battle/battle_2.c
+++ b/src/battle/battle_2.c
@@ -9473,16 +9473,16 @@ void sub_8010874()
         "._1215:\n"
         "	.word	gUnknown_02024C4C\n"
         "	.word	gLastHitByType\n"
-        "	.word	gMoveHitWith\n"
+        "	.word	gLastLandedMoves\n"
         "	.word	gLastUsedMove\n"
         "	.word	gDisableStructs\n"
         "	.word	gUnknown_02024C2C\n"
-        "	.word	gLockedMove\n"
+        "	.word	gLockedMoves\n"
         "	.word	gStatuses3\n"
         "	.word	gUnknown_02024C70\n"
         "	.word	gUnknown_02024C5C\n"
         "	.word	+0x2017100\n"
-        "	.word	gSideTimer\n"
+        "	.word	gSideTimers\n"
         "	.word	gSideAffecting\n"
         "	.word	gBankAttacker\n"
         "	.word	gBankTarget\n"
diff --git a/src/engine/mystery_event_menu.c b/src/engine/mystery_event_menu.c
index 8f280dc18..656e774c5 100644
--- a/src/engine/mystery_event_menu.c
+++ b/src/engine/mystery_event_menu.c
@@ -465,7 +465,7 @@ void debug_sub_815D04C()
         "	add	r1, r1, r0\n"
         "	ldr	r0, ._133 + 8\n"
         "	ldr	r1, [r1]\n"
-        "	bl	gScriptFuncs_End+0x3cf8\n"
+        "	bl	gMysteryEventScriptCmdTableEnd+0x3cf8\n"
         "	ldr	r0, ._133 + 12\n"
         "	add	r1, r6, r0\n"
         "	ldrb	r0, [r1]\n"
diff --git a/src/field/battle_tower.c b/src/field/battle_tower.c
index ab2a818a7..41d5ae9d1 100644
--- a/src/field/battle_tower.c
+++ b/src/field/battle_tower.c
@@ -259,7 +259,7 @@ static void SaveCurrentWinStreak(void);
 static void sub_8135CFC(void);
 static void CheckMonBattleTowerBanlist(u16, u16, u16, u8, u8, u16 *, u16 *, u8 *);
 static void ClearEReaderTrainer(struct BattleTowerEReaderTrainer *);
-static void SetEReaderTrainerChecksum(struct BattleTowerEReaderTrainer *ereaderTrainer);
+void SetEReaderTrainerChecksum(struct BattleTowerEReaderTrainer *ereaderTrainer);
 static void SetBattleTowerRecordChecksum(struct BattleTowerRecord *);
 static void ClearBattleTowerRecord(struct BattleTowerRecord *);
 
diff --git a/src/field/trader.c b/src/field/trader.c
index b4732ab15..2801df322 100644
--- a/src/field/trader.c
+++ b/src/field/trader.c
@@ -108,7 +108,7 @@ void CreateAvailableDecorationsMenu(u8 taskId)
         {
             if (trader->unk1[i] > DECOR_REGISTEEL_DOLL)
             {
-                Menu_PrintText(gOtherText_FiveQuestionsAndSlash, 1, numDecorations * 2 + 2);
+                Menu_PrintText(gOtherText_FiveQuestions, 1, numDecorations * 2 + 2);
             }
             else
             {
diff --git a/src/pokemon/pokemon_summary_screen.c b/src/pokemon/pokemon_summary_screen.c
index 7b40918e9..0102b7526 100644
--- a/src/pokemon/pokemon_summary_screen.c
+++ b/src/pokemon/pokemon_summary_screen.c
@@ -2576,14 +2576,14 @@ static void sub_809FC34(struct Pokemon *mon)
         buffer = gStringVar1;
         buffer = sub_80A1E58(buffer, 13);
         buffer = StringCopy(buffer, gOtherText_OriginalTrainer);
-        buffer = StringCopy(buffer, gOtherText_FiveQuestionsAndSlash);
+        buffer = StringCopy(buffer, gOtherText_FiveQuestions);
         buffer[0] = EXT_CTRL_CODE_BEGIN;
         buffer[1] = 0x13;
         buffer[2] = 0x4E;
         buffer[3] = EOS;
         Menu_PrintText(gStringVar1, 11, 4);
 
-        sub_80A1EF8(gOtherText_FiveQuestionsAndSlash, 13, 193, 32, 1);
+        sub_80A1EF8(gOtherText_FiveQuestions, 13, 193, 32, 1);
         sub_80A198C(9, 120, 48, 0);
 
         friendship = GetMonData(mon, MON_DATA_FRIENDSHIP);
diff --git a/src/rom3.c b/src/rom3.c
index efaa1d97f..34746c1a8 100644
--- a/src/rom3.c
+++ b/src/rom3.c
@@ -101,9 +101,9 @@ void setup_poochyena_battle(void)
 #if DEBUG
     if (gUnknown_02023A14_50 & 0x80)
     {
-        ewram[0x160fd] = 0;
-        ewram[0x160fe] = 0;
-        ewram[0x160ff] = 0;
+        gSharedMem[0x160fd] = 0;
+        gSharedMem[0x160fe] = 0;
+        gSharedMem[0x160ff] = 0;
         ((u32 *) gBattleBuffersTransferData)[64]++;
     }
 #endif
diff --git a/src/strings.c b/src/strings.c
index 06bbadb8f..0f599db72 100644
--- a/src/strings.c
+++ b/src/strings.c
@@ -173,7 +173,8 @@ const u8 gOtherText_None[] = _("NONE");
 
 const u8 gOtherText_ThreeQuestions2[] = _("???");
 
-const u8 gOtherText_FiveQuestionsAndSlash[] = _("?????$/");
+const u8 gOtherText_FiveQuestions[] = _("?????");
+const u8 gOtherText_Slash[] = _("/");
 
 const u8 gOtherText_OneDash[] = _("-");
 const u8 gOtherText_TwoDashes[] = _("--");
@@ -267,7 +268,9 @@ const u8 gContestStatsText_Spicy[] = _("SPICY");
 const u8 gContestStatsText_Dry[] = _("DRY");
 const u8 gContestStatsText_Sweet[] = _("SWEET");
 const u8 gContestStatsText_Bitter[] = _("BITTER");
-const u8 gContestStatsText_Sour[] = _("SOUR$TASTY$FEEL"); // tasty is unused, feel might not be
+const u8 gContestStatsText_Sour[] = _("SOUR");
+const u8 gContestStatsText_Tasty[] = _("TASTY");
+const u8 gContestStatsText_Feel[] = _("FEEL");
 
 const u8 gContestStatsText_StowCase[] = _("Stow CASE.");
 const u8 gContestStatsText_ThrowAwayPrompt[] = _("Throw away this\n{STR_VAR_1}?");
@@ -1096,7 +1099,8 @@ const u8 gOtherText_None[] = _("KEINES");
 
 const u8 gOtherText_ThreeQuestions2[] = _("???");
 
-const u8 gOtherText_FiveQuestionsAndSlash[] = _("?????$/");
+const u8 gOtherText_FiveQuestions[] = _("?????");
+const u8 gOtherText_Slash[] = _("/");
 
 const u8 gOtherText_OneDash[] = _("-");
 const u8 gOtherText_TwoDashes[] = _("--");
@@ -1190,7 +1194,9 @@ const u8 gContestStatsText_Spicy[] = _("SCHARF");
 const u8 gContestStatsText_Dry[] = _("TROCKEN");
 const u8 gContestStatsText_Sweet[] = _("SÜSS");
 const u8 gContestStatsText_Bitter[] = _("BITTER");
-const u8 gContestStatsText_Sour[] = _("SAUER$LECKER$WÜRZE");
+const u8 gContestStatsText_Sour[] = _("SAUER");
+const u8 gContestStatsText_Tasty[] = _("LECKER");
+const u8 gContestStatsText_Feel[] = _("WÜRZE");
 
 const u8 gContestStatsText_StowCase[] = _("BOX verstauen.");
 const u8 gContestStatsText_ThrowAwayPrompt[] = _("{STR_VAR_1}\nwegwerfen?");