summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--include/strings.h2
-rw-r--r--src/battle/battle_2.c6
-rw-r--r--src/engine/mystery_event_menu.c2
-rw-r--r--src/field/battle_tower.c2
-rw-r--r--src/field/trader.c2
-rw-r--r--src/pokemon/pokemon_summary_screen.c4
-rw-r--r--src/rom3.c6
-rw-r--r--src/strings.c14
-rw-r--r--undefined.txt115
9 files changed, 23 insertions, 130 deletions
diff --git a/include/strings.h b/include/strings.h
index fe9cfc6ba..91c5c5344 100644
--- a/include/strings.h
+++ b/include/strings.h
@@ -164,7 +164,7 @@ extern const u8 gOtherText_None[];
extern const u8 gOtherText_ThreeQuestions2[];
-extern const u8 gOtherText_FiveQuestionsAndSlash[];
+extern const u8 gOtherText_FiveQuestions[];
extern const u8 gOtherText_OneDash[];
extern const u8 gOtherText_TwoDashes[];
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?");
diff --git a/undefined.txt b/undefined.txt
index 4fcd0398e..bd7c98f0f 100644
--- a/undefined.txt
+++ b/undefined.txt
@@ -1,142 +1,29 @@
(.text+0x120): undefined reference to `gUnknown_02023A14_50'
(.text+0x124): undefined reference to `ewram'
-(.text+0x76): undefined reference to `dp12_8087EA4'
-(.text+0xb8): undefined reference to `sub_80895F8'
-(.text+0xf6): undefined reference to `GetBattleTerrain'
-(.text+0x160): undefined reference to `gUnknown_030042C4'
-(.text+0x164): undefined reference to `gUnknown_03004240'
-(.text+0x168): undefined reference to `gUnknown_03004DE0'
-(.text+0x8a8): undefined reference to `sub_800F808'
-(.text+0x10e0): undefined reference to `sub_800F808'
-(.text+0x1150): undefined reference to `gScriptResult'
-(.text+0x115c): undefined reference to `gUnknown_03004DC0'
-(.text+0x11b6): undefined reference to `sub_800374C'
-(.text+0x1d2c): undefined reference to `sub_800D238'
-(.text+0x1d5c): undefined reference to `remove_some_task'
-(.text+0x2188): undefined reference to `gUnknown_03005E94'
-(.text+0x321e): undefined reference to `sub_8089668'
-(.text+0x3c78): undefined reference to `sub_800374C'
-(.text+0x5164): undefined reference to `gUnknown_02024C44'
(.text+0x5168): undefined reference to `gMoveHitWith'
(.text+0x5178): undefined reference to `gLockedMove'
(.text+0x518c): undefined reference to `gSideTimer'
-(.text+0x235e): undefined reference to `sub_80593F4'
(.text+0x4c): undefined reference to `gUnknown_Debug_03004BC0'
(.text+0x39c): undefined reference to `gUnknown_Debug_03004BC0'
(.text+0x4d0): undefined reference to `gUnknown_Debug_03004BC0'
(.text+0x660): undefined reference to `gUnknown_Debug_03004BC0'
(.text+0xd4c): undefined reference to `gUnknown_Debug_03004BC0'
-(.text+0xae8): undefined reference to `MenuZeroFillScreen'
-(.text+0xc88): undefined reference to `MenuZeroFillScreen'
-(.text+0xd4): undefined reference to `gUnknown_03004DE0'
-(.text+0x1f0): undefined reference to `sub_8136088'
-(.text+0x58): undefined reference to `PrintMenuItemsReordered'
-(.text+0x25c): undefined reference to `sub_804B790'
-(.text+0x28a): undefined reference to `ClearSaveData'
-(.text+0x6f2): undefined reference to `PrintMenuItemsReordered'
-(.text+0xac0): undefined reference to `GetNationalPokedexFlag'
-(.text+0xac8): undefined reference to `GetNationalPokedexFlag'
-(.text+0xb06): undefined reference to `GetNationalPokedexFlag'
-(.text+0xb0e): undefined reference to `GetNationalPokedexFlag'
-(.text+0xbc6): undefined reference to `sub_8053570'
-(.text+0xe24): undefined reference to `sWildEncountersDisabled'
-(.text+0xe4c): undefined reference to `sWildEncountersDisabled'
-(.text+0xec6): undefined reference to `unref_sub_8082C2C'
-(.text+0xf00): undefined reference to `sub_8082C0C'
-(.text+0x101c): undefined reference to `gSafariZoneStepCounter'
-(.text+0x1034): undefined reference to `gSafariZoneStepCounter'
-(.text+0x10cc): undefined reference to `gSafariZoneStepCounter'
-(.text+0x1da0): undefined reference to `gScriptResult'
+(.text+0x1f0): undefined reference to `SetEReaderTrainerChecksum'
(.text+0x25c8): undefined reference to `gUnknown_Debug_03004BD0'
-(.text+0x25ec): undefined reference to `ProcessMenuInputNoWrap_'
(.text+0x2608): undefined reference to `gUnknown_Debug_03004BD0'
(.text+0x2628): undefined reference to `gUnknown_Debug_03004BD0'
-(.text+0x16aa): undefined reference to `MenuFillWindowRectWithBlankTile'
-(.text+0x1708): undefined reference to `MenuZeroFillScreen'
-(.text+0x1714): undefined reference to `MenuFillWindowRectWithBlankTile'
-(.text+0x173c): undefined reference to `gUnknown_0202F7E8'
-(.text+0xd0): undefined reference to `PrintHex'
-(.text+0xde): undefined reference to `PrintHex'
-(.text+0xfc): undefined reference to `PrintHex'
-(.text+0x10e): undefined reference to `PrintHex'
-(.text+0x12e): undefined reference to `PrintHex'
-src/engine/cable_club.o:(.text+0x13c): more undefined references to `PrintHex' follow
-(.text+0x270): undefined reference to `gScriptResult'
(.text+0x12ac): undefined reference to `unk_3004E98'
(.text+0x12e4): undefined reference to `unk_3004E94'
-(.text+0x2274): undefined reference to `gScriptResult'
-(.text+0x22ac): undefined reference to `gScriptResult'
-(.text+0x228): undefined reference to `sub_810F424'
-(.text+0x2c2): undefined reference to `ProcessMenuInputNoWrap_'
-(.text+0x712): undefined reference to `sub_80BFB54'
-(.text+0x44): undefined reference to `sub_80EB3FC'
-(.text+0x5a): undefined reference to `sub_80EB3FC'
-(.text+0x318): undefined reference to `GetCurrentMauvilleOldMan'
-(.text+0x6e0): undefined reference to `gScriptResult'
-(.text+0x6f8): undefined reference to `trainer_flag_set'
-(.text+0x708): undefined reference to `trainer_flag_set'
-(.text+0x710): undefined reference to `trainer_flag_set'
-(.text+0x716): undefined reference to `trainer_flag_set'
-(.text+0x71e): undefined reference to `trainer_flag_set'
-src/debug/taya_debug_window.o:(.text+0x724): more undefined references to `trainer_flag_set' follow
(.text+0x11b4): undefined reference to `unk_2038790'
(.text+0x11cc): undefined reference to `unk_2038794'
(.text+0x11d0): undefined reference to `unk_2038798'
(.text+0x1210): undefined reference to `unk_2038798'
(.text+0x1230): undefined reference to `unk_2038794'
(.text_8098A38+0x40b4): undefined reference to `unk_2038790'
-(.text+0x238): undefined reference to `sub_80FC074'
-(.text+0xda): undefined reference to `remove_some_task'
-(.text+0x13a): undefined reference to `sub_80A3520'
-(.text+0x15a): undefined reference to `SetUpWindowConfig'
-(.text+0x204): undefined reference to `gUnknown_03000701'
-(.text+0x22c): undefined reference to `sub_80A3AC0'
-(.text+0x230): undefined reference to `sub_80A3D08'
-(.text+0x268): undefined reference to `gUnknown_02038559'
-(.text+0x270): undefined reference to `gUnknown_03005D24'
-(.text+0x2c0): undefined reference to `gUnknown_03005D10'
-(.text+0x2c4): undefined reference to `gUnknown_02038559'
-(.text+0x2c8): undefined reference to `gUnknown_03005D24'
(.text+0x6c0): undefined reference to `gUnknown_Debug_083EBC68'
-(.text+0x93a): undefined reference to `GetFieldObjectScriptPointerForComparison'
-(.text+0x948): undefined reference to `BerryTreeScript'
-(.text+0xca): undefined reference to `remove_some_task'
-(.text+0x72c): undefined reference to `gPokedexEntries'
(.text+0x1398): undefined reference to `gUnknown_02023A14_50'
(.text+0x1410): undefined reference to `gUnknown_02023A14_50'
-(.text+0x1f4e): undefined reference to `GetNationalPokedexFlag'
-(.text+0x1f56): undefined reference to `GetNationalPokedexFlag'
-(.text+0x380e): undefined reference to `sub_8091738'
-(.text+0x3b40): undefined reference to `species_and_otid_get_pal'
-(.text+0x3b66): undefined reference to `species_and_otid_get_pal'
-(.text+0x46a8): undefined reference to `species_and_otid_get_pal'
-(.text+0x46ce): undefined reference to `species_and_otid_get_pal'
-(.text+0x80): undefined reference to `gScriptResult'
-(.text+0x122): undefined reference to `sub_80F7A6C'
-(.text+0x144): undefined reference to `sub_80F7A98'
-(.text+0x14a): undefined reference to `sub_80F7A7C'
-(.text+0x150): undefined reference to `sub_80F7A88'
-(.text+0x44): undefined reference to `gUnknown_03000748'
-(.text+0x123c): undefined reference to `remove_some_task'
-(.text+0x74): undefined reference to `gUnknown_083E79C0'
-(.text+0x170): undefined reference to `sub_80FC69C'
-(.text+0x25e): undefined reference to `sub_80FC074'
-(.text+0x284): undefined reference to `sub_80FC228'
-(.text+0xa28): undefined reference to `sub_81027A0'
-(.text+0xae0): undefined reference to `StripExtCtrlCodes'
-(.text+0xb2c): undefined reference to `gSaveSectionLocations'
-(.text+0xb38): undefined reference to `gHallOfFameSaveSectionLocations'
-(.text+0x228): undefined reference to `gFlashSectors'
-(.text+0x2a0): undefined reference to `gFlashSectors'
-(.text+0x2a4): undefined reference to `gFlashSectors'
-(.text+0x400): undefined reference to `gFlashSectors'
-(.text+0x584): undefined reference to `gFlashSectors'
-src/engine/mystery_event_menu.o:(.text+0x574): more undefined references to `gFlashSectors' follow
(.text+0x5f4): undefined reference to `gScriptFuncs_End'
-(.text+0x614): undefined reference to `gFlashSectors'
-(.text+0x868): undefined reference to `MenuFillWindowRectWithBlankTile'
-(.text+0xd52): undefined reference to `FeebasSeedRng'
-(.text+0xd76): undefined reference to `FeebasRandom'
(.text+0x17c0): undefined reference to `gOtherText_FiveQuestions'
(.text+0x1ac0): undefined reference to `gContestStatsText_Tasty'
(.text+0x1c74): undefined reference to `gOtherText_Slash'
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-31 13:52:45 +0000