diff options
author | PikalaxALT <pikalaxalt@gmail.com> | 2019-07-13 19:51:30 -0400 |
---|---|---|
committer | PikalaxALT <pikalaxalt@gmail.com> | 2019-07-13 19:51:30 -0400 |
commit | 97b4bb41b7c3b719df97bc8ff60ba9c267d1dd6e (patch) | |
tree | a9465a07413132f14c28aa385f8706454ed386fb | |
parent | 40c3cf3da7d431bec3cf1bb87356c1c634fdc172 (diff) |
Name functions in battle_records.c
-rw-r--r-- | asm/cable_club.s | 2 | ||||
-rw-r--r-- | data/maps/SevenIsland_TrainerTower_Lobby/scripts.inc | 2 | ||||
-rw-r--r-- | data/specials.inc | 2 | ||||
-rw-r--r-- | data/strings.s | 10 | ||||
-rw-r--r-- | include/strings.h | 10 | ||||
-rw-r--r-- | include/trainer_tower.h | 2 | ||||
-rw-r--r-- | src/battle_records.c | 206 | ||||
-rw-r--r-- | src/trainer_tower.c | 4 | ||||
-rw-r--r-- | sym_ewram.txt | 3 |
9 files changed, 116 insertions, 125 deletions
diff --git a/asm/cable_club.s b/asm/cable_club.s index abc51ce29..28cbfc49c 100644 --- a/asm/cable_club.s +++ b/asm/cable_club.s @@ -1935,7 +1935,7 @@ sub_8081668: @ 8081668 ldrb r0, [r0] movs r5, 0x1 eors r0, r5 - bl sub_80CD98C + bl TryRecordLinkBattleOutcome ldr r0, _080816C0 @ =gWirelessCommType ldrb r0, [r0] cmp r0, 0 diff --git a/data/maps/SevenIsland_TrainerTower_Lobby/scripts.inc b/data/maps/SevenIsland_TrainerTower_Lobby/scripts.inc index 0b6b930c7..5acb601dc 100644 --- a/data/maps/SevenIsland_TrainerTower_Lobby/scripts.inc +++ b/data/maps/SevenIsland_TrainerTower_Lobby/scripts.inc @@ -223,7 +223,7 @@ SevenIsland_TrainerTower_Lobby_EventScript_164AD8:: @ 8164AD8 lockall fadescreen 1 setvar VAR_0x8004, 1 - special sub_80CD228 + special Special_BattleRecords waitstate releaseall end diff --git a/data/specials.inc b/data/specials.inc index 4c7ad327d..dcd996bbc 100644 --- a/data/specials.inc +++ b/data/specials.inc @@ -205,7 +205,7 @@ gSpecials:: @ 815FD60 def_special ScriptHatchMon def_special EggHatch def_special sub_8046EAC - def_special sub_80CD228 + def_special Special_BattleRecords def_special IsEnoughForCostInVar0x8005 def_special SubtractMoneyFromVar0x8005 def_special ExecuteWhiteOut diff --git a/data/strings.s b/data/strings.s index 3e56bfe50..e1804aae0 100644 --- a/data/strings.s +++ b/data/strings.s @@ -1814,19 +1814,19 @@ gUnknown_8418152:: @ 0x8418152 gUnknown_8418163:: @ 0x8418163 .string "PP UP{CLEAR_TO 0x65}{SMALL}3,000$" -gUnknown_8418174:: @ 8418174 +gString_BattleRecords_PlayersBattleResults:: @ 8418174 .string "{PLAYER}'s BATTLE RESULTS$" -gUnknown_8418188:: @ 8418188 +gString_BattleRecords_TotalRecord:: @ 8418188 .string "TOTAL RECORD W:{STR_VAR_1} L:{STR_VAR_2} D:{STR_VAR_3}$" -gUnknown_84181A4:: @ 84181A4 +gString_BattleRecords_ColumnHeaders:: @ 84181A4 .string "WIN{CLEAR_TO 0x30}LOSE{CLEAR_TO 0x60}DRAW$" -gUnknown_84181B6:: @ 84181B6 +gString_BattleRecords_7Dashes:: @ 84181B6 .string "-------$" -gUnknown_84181BE:: @ 84181BE +gString_BattleRecords_4Dashes:: @ 84181BE .string "----$" gFameCheckerText_FameCheckerWillBeClosed:: @ 84181C3 diff --git a/include/strings.h b/include/strings.h index d7ba606f9..1bd53d4a5 100644 --- a/include/strings.h +++ b/include/strings.h @@ -186,10 +186,10 @@ extern const u8 gUnknown_841B68F[]; extern const u8 gUnknown_841B698[]; // battle_records -extern const u8 gUnknown_8418174[]; -extern const u8 gUnknown_8418188[]; -extern const u8 gUnknown_84181A4[]; -extern const u8 gUnknown_84181B6[]; -extern const u8 gUnknown_84181BE[]; +extern const u8 gString_BattleRecords_PlayersBattleResults[]; +extern const u8 gString_BattleRecords_TotalRecord[]; +extern const u8 gString_BattleRecords_ColumnHeaders[]; +extern const u8 gString_BattleRecords_7Dashes[]; +extern const u8 gString_BattleRecords_4Dashes[]; #endif //GUARD_STRINGS_H diff --git a/include/trainer_tower.h b/include/trainer_tower.h index bbc0b2faf..b9c16d958 100644 --- a/include/trainer_tower.h +++ b/include/trainer_tower.h @@ -1,6 +1,6 @@ #ifndef GUARD_TRAINER_TOWER_H #define GUARD_TRAINER_TOWER_H -void sub_815EC8C(void); +void PrintTrainerTowerRecords(void); #endif //GUARD_TRAINER_TOWER_H diff --git a/src/battle_records.c b/src/battle_records.c index 04d282b1d..7a7e74bf4 100644 --- a/src/battle_records.c +++ b/src/battle_records.c @@ -24,37 +24,29 @@ #include "constants/songs.h" #include "constants/maps.h" -struct LinkBattleRecordState -{ - u16 unk_00; - u16 unk_02; - u8 filler_04[92]; -}; - -EWRAM_DATA struct LinkBattleRecordState gUnknown_2039638[10] = {}; -EWRAM_DATA u16 * gUnknown_2039A1C = NULL; - -void sub_80CD240(void); -void sub_80CD38C(void); -void sub_80CD3A0(void); -void sub_80CD3B8(u8 taskId); -void sub_80CD3E8(u8 taskId); -void sub_80CD428(u8 taskId); -void sub_80CD460(u8 taskId); -void sub_80CD4A4(u8 winddowId); -void sub_80CD4D0(void); -void sub_80CD608(void); -void sub_80CD628(void); -void sub_80CD638(void); -void sub_80CDBE4(void); -void sub_80CDCB4(u8 windowId); -void sub_80CDCD0(u8 bgId); - -const u16 gUnknown_83F6388[] = INCBIN_U16("graphics/battle_records/bg_tiles.4bpp"); -const u16 gUnknown_83F6448[] = INCBIN_U16("graphics/battle_records/palette.gbapal"); -const u16 gUnknown_83F6468[] = INCBIN_U16("graphics/battle_records/tilemap.bin"); - -const struct WindowTemplate gUnknown_83F6C68[] = { +static EWRAM_DATA u16 * sBg3TilemapBuffer_p = NULL; + +static void MainCB2_SetUp(void); +static void VBlankCB(void); +static void MainCB2(void); +static void Task_WaitFadeIn(u8 taskId); +static void Task_WaitButton(u8 taskId); +static void Task_FadeOut(u8 taskId); +static void Task_DestroyAndReturnToField(u8 taskId); +static void ClearWindowCommitAndRemove(u8 winddowId); +static void ResetGpu(void); +static void StopAllRunningTasks(void); +static void EnableDisplay(void); +static void ResetBGPos(void); +static void PrintBattleRecords(void); +static void CommitWindow(u8 windowId); +static void LoadFrameGfxOnBg(u8 bgId); + +static const u16 sTiles[] = INCBIN_U16("graphics/battle_records/bg_tiles.4bpp"); +static const u16 sPalette[] = INCBIN_U16("graphics/battle_records/palette.gbapal"); +static const u16 sTilemap[] = INCBIN_U16("graphics/battle_records/tilemap.bin"); + +static const struct WindowTemplate sWindowTemplates[] = { { .bg = 0, .tilemapLeft = 2, @@ -66,11 +58,11 @@ const struct WindowTemplate gUnknown_83F6C68[] = { }, DUMMY_WIN_TEMPLATE }; -const struct TextColor gUnknown_83F6C78 = { +static const struct TextColor sTextColor = { 0, 2, 3 }; -const struct BgTemplate gUnknown_83F6C7C[2] = { +static const struct BgTemplate sBgTemplates[2] = { { .bg = 0, .charBaseIndex = 0, @@ -90,41 +82,41 @@ const struct BgTemplate gUnknown_83F6C7C[2] = { } }; -u8 *const gUnknown_83F6C84[3] = { +static u8 *const sStringVars[3] = { gStringVar1, gStringVar2, gStringVar3 }; -void sub_80CD228(void) +void Special_BattleRecords(void) { SetVBlankCallback(NULL); - SetMainCallback2(sub_80CD240); + SetMainCallback2(MainCB2_SetUp); } -void sub_80CD240(void) +static void MainCB2_SetUp(void) { switch (gMain.state) { case 0: SetVBlankCallback(NULL); - sub_80CD4D0(); + ResetGpu(); gMain.state++; break; case 1: - sub_80CD608(); + StopAllRunningTasks(); gMain.state++; break; case 2: - gUnknown_2039A1C = AllocZeroed(0x800); + sBg3TilemapBuffer_p = AllocZeroed(0x800); ResetBgsAndClearDma3BusyFlags(0); - InitBgsFromTemplates(0, gUnknown_83F6C7C, NELEMS(gUnknown_83F6C7C)); - SetBgTilemapBuffer(3, gUnknown_2039A1C); - sub_80CD638(); + InitBgsFromTemplates(0, sBgTemplates, NELEMS(sBgTemplates)); + SetBgTilemapBuffer(3, sBg3TilemapBuffer_p); + ResetBGPos(); gMain.state++; break; case 3: - sub_80CDCD0(3); + LoadFrameGfxOnBg(3); LoadPalette(stdpal_get(0), 0xF0, 0x20); gMain.state++; break; @@ -138,7 +130,7 @@ void sub_80CD240(void) } break; case 5: - InitWindows(gUnknown_83F6C68); + InitWindows(sWindowTemplates); DeactivateAllTextPrinters(); gMain.state++; break; @@ -147,27 +139,27 @@ void sub_80CD240(void) gMain.state++; break; case 7: - sub_80CD628(); - SetVBlankCallback(sub_80CD38C); + EnableDisplay(); + SetVBlankCallback(VBlankCB); if (gSpecialVar_0x8004) - sub_815EC8C(); + PrintTrainerTowerRecords(); else - sub_80CDBE4(); - CreateTask(sub_80CD3B8, 8); - SetMainCallback2(sub_80CD3A0); + PrintBattleRecords(); + CreateTask(Task_WaitFadeIn, 8); + SetMainCallback2(MainCB2); gMain.state = 0; break; } } -void sub_80CD38C(void) +static void VBlankCB(void) { LoadOam(); ProcessSpriteCopyRequests(); TransferPlttBuffer(); } -void sub_80CD3A0(void) +static void MainCB2(void) { RunTasks(); AnimateSprites(); @@ -175,42 +167,42 @@ void sub_80CD3A0(void) UpdatePaletteFade(); } -void sub_80CD3B8(u8 taskId) +static void Task_WaitFadeIn(u8 taskId) { if (!gPaletteFade.active) - gTasks[taskId].func = sub_80CD3E8; + gTasks[taskId].func = Task_WaitButton; } -void sub_80CD3E8(u8 taskId) +static void Task_WaitButton(u8 taskId) { struct Task * task = &gTasks[taskId]; if (JOY_NEW(A_BUTTON) || JOY_NEW(B_BUTTON)) { PlaySE(SE_SELECT); - task->func = sub_80CD428; + task->func = Task_FadeOut; } } -void sub_80CD428(u8 taskId) +static void Task_FadeOut(u8 taskId) { BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB_BLACK); - gTasks[taskId].func = sub_80CD460; + gTasks[taskId].func = Task_DestroyAndReturnToField; } -void sub_80CD460(u8 taskId) +static void Task_DestroyAndReturnToField(u8 taskId) { if (!gPaletteFade.active) { SetMainCallback2(CB2_ReturnToFieldContinueScriptPlayMapMusic); - Free(gUnknown_2039A1C); - sub_80CD4A4(0); + Free(sBg3TilemapBuffer_p); + ClearWindowCommitAndRemove(0); FreeAllWindowBuffers(); DestroyTask(taskId); } } -void sub_80CD4A4(u8 windowId) +static void ClearWindowCommitAndRemove(u8 windowId) { FillWindowPixelBuffer(windowId, PIXEL_FILL(0)); ClearWindowTilemap(windowId); @@ -218,7 +210,7 @@ void sub_80CD4A4(u8 windowId) RemoveWindow(windowId); } -void sub_80CD4D0(void) +static void ResetGpu(void) { { void * dest = (void *)VRAM; @@ -260,7 +252,7 @@ void sub_80CD4D0(void) SetGpuReg(REG_OFFSET_BLDY, 0); } -void sub_80CD608(void) +static void StopAllRunningTasks(void) { ScanlineEffect_Stop(); ResetTasks(); @@ -270,12 +262,12 @@ void sub_80CD608(void) FreeAllSpritePalettes(); } -void sub_80CD628(void) +static void EnableDisplay(void) { SetGpuReg(REG_OFFSET_DISPCNT, DISPCNT_MODE_0 | DISPCNT_OBJ_1D_MAP | DISPCNT_BG0_ON | DISPCNT_BG3_ON); } -void sub_80CD638(void) +static void ResetBGPos(void) { ChangeBgX(0, 0, 0); ChangeBgY(0, 0, 0); @@ -287,7 +279,7 @@ void sub_80CD638(void) ChangeBgY(3, 0, 0); } -void InitLinkBattleRecord(struct LinkBattleRecord * record) +static void InitLinkBattleRecord(struct LinkBattleRecord * record) { CpuFill16(0, record, sizeof(*record)); record->name[0] = EOS; @@ -297,7 +289,7 @@ void InitLinkBattleRecord(struct LinkBattleRecord * record) record->draws = 0; } -void InitLinkBattleRecords_(struct LinkBattleRecords * records) +static void InitLinkBattleRecords_(struct LinkBattleRecords * records) { s32 i; @@ -308,12 +300,12 @@ void InitLinkBattleRecords_(struct LinkBattleRecords * records) SetGameStat(GAME_STAT_LINK_BATTLE_DRAWS, 0); } -s32 GetLinkBattleRecordTotalBattles(struct LinkBattleRecord * record) +static s32 GetLinkBattleRecordTotalBattles(struct LinkBattleRecord * record) { return record->wins + record->losses + record->draws; } -s32 sub_80CD704(struct LinkBattleRecords * records, const u8 * name, u16 trainerId) +static s32 IndexOfOpponentLinkBattleRecord(struct LinkBattleRecords * records, const u8 * name, u16 trainerId) { s32 i; @@ -326,7 +318,7 @@ s32 sub_80CD704(struct LinkBattleRecords * records, const u8 * name, u16 trainer return LINK_B_RECORDS_COUNT; } -void SortLinkBattleRecords(struct LinkBattleRecords * records) +static void SortLinkBattleRecords(struct LinkBattleRecords * records) { struct LinkBattleRecord tmp; s32 i; @@ -346,7 +338,7 @@ void SortLinkBattleRecords(struct LinkBattleRecords * records) } } -void UpdateLinkBattleRecord(struct LinkBattleRecord * record, s32 outcome) +static void UpdateLinkBattleRecord(struct LinkBattleRecord * record, s32 outcome) { switch (outcome) { @@ -368,7 +360,7 @@ void UpdateLinkBattleRecord(struct LinkBattleRecord * record, s32 outcome) } } -void UpdateLinkBattleGameStats(s32 outcome) +static void UpdateLinkBattleGameStats(s32 outcome) { u8 statId; @@ -391,7 +383,7 @@ void UpdateLinkBattleGameStats(s32 outcome) IncrementGameStat(statId); } -void sub_80CD854(struct LinkBattleRecords * records, const u8 * name, u16 trainerId, s32 outcome, u32 language) +static void AddOpponentLinkBattleRecord(struct LinkBattleRecords * records, const u8 * name, u16 trainerId, s32 outcome, u32 language) { u8 namebuf[OT_NAME_LENGTH + 1]; s32 i; @@ -407,7 +399,7 @@ void sub_80CD854(struct LinkBattleRecords * records, const u8 * name, u16 traine StringCopy(namebuf, name); UpdateLinkBattleGameStats(outcome); SortLinkBattleRecords(records); - i = sub_80CD704(records, namebuf, trainerId); + i = IndexOfOpponentLinkBattleRecord(records, namebuf, trainerId); if (i == LINK_B_RECORDS_COUNT) { i = LINK_B_RECORDS_COUNT - 1; @@ -425,7 +417,7 @@ void InitLinkBattleRecords(void) InitLinkBattleRecords_(&gSaveBlock2Ptr->linkBattleRecords); } -void sub_80CD8F8(s32 battlerId) +static void IncTrainerCardWinCount(s32 battlerId) { u16 *wins = &gTrainerCards[battlerId].linkBattleWins; (*wins)++; @@ -433,7 +425,7 @@ void sub_80CD8F8(s32 battlerId) *wins = 9999; } -void sub_80CD924(s32 battlerId) +static void IncTrainerCardLossCount(s32 battlerId) { u16 *losses = &gTrainerCards[battlerId].linkBattleLosses; (*losses)++; @@ -441,31 +433,31 @@ void sub_80CD924(s32 battlerId) *losses = 9999; } -void sub_80CD950(s32 battlerId) +static void UpdateBattleOutcomeOnTrainerCards(s32 battlerId) { switch (gBattleOutcome) { case B_OUTCOME_WON: - sub_80CD8F8(battlerId ^ 1); - sub_80CD924(battlerId); + IncTrainerCardWinCount(battlerId ^ 1); + IncTrainerCardLossCount(battlerId); break; case B_OUTCOME_LOST: - sub_80CD924(battlerId ^ 1); - sub_80CD8F8(battlerId); + IncTrainerCardLossCount(battlerId ^ 1); + IncTrainerCardWinCount(battlerId); break; } } -void sub_80CD98C(s32 battlerId) +void TryRecordLinkBattleOutcome(s32 battlerId) { if (gSaveBlock1Ptr->location.mapGroup != MAP_GROUP(UNKNOWN_MAP_00_04) || gSaveBlock1Ptr->location.mapNum != MAP_NUM(UNKNOWN_MAP_00_04)) { - sub_80CD950(battlerId); - sub_80CD854(&gSaveBlock2Ptr->linkBattleRecords, gTrainerCards[battlerId].playerName, gTrainerCards[battlerId].trainerId, gBattleOutcome, gLinkPlayers[battlerId].language); + UpdateBattleOutcomeOnTrainerCards(battlerId); + AddOpponentLinkBattleRecord(&gSaveBlock2Ptr->linkBattleRecords, gTrainerCards[battlerId].playerName, gTrainerCards[battlerId].trainerId, gBattleOutcome, gLinkPlayers[battlerId].language); } } -void sub_80CD9F4(struct LinkBattleRecords * records) +static void PrintTotalRecord(struct LinkBattleRecords * records) { u32 nwins = GetGameStat(GAME_STAT_LINK_BATTLE_WINS); u32 nlosses = GetGameStat(GAME_STAT_LINK_BATTLE_LOSSES); @@ -486,9 +478,9 @@ void sub_80CD9F4(struct LinkBattleRecords * records) ConvertIntToDecimalStringN(gStringVar2, nlosses, STR_CONV_MODE_LEFT_ALIGN, 4); ConvertIntToDecimalStringN(gStringVar3, ndraws, STR_CONV_MODE_LEFT_ALIGN, 4); - for (i = 0; i < NELEMS(gUnknown_83F6C84); i++) + for (i = 0; i < NELEMS(sStringVars); i++) { - strvar = gUnknown_83F6C84[i]; + strvar = sStringVars[i]; foundEnd = FALSE; for (j = 0; j < 4; j++) { @@ -501,18 +493,18 @@ void sub_80CD9F4(struct LinkBattleRecords * records) *strvar = 0xFF; } - StringExpandPlaceholders(gStringVar4, gUnknown_8418188); - AddTextPrinterParameterized4(0, 2, 12, 24, 0, 2, &gUnknown_83F6C78, 0, gStringVar4); + StringExpandPlaceholders(gStringVar4, gString_BattleRecords_TotalRecord); + AddTextPrinterParameterized4(0, 2, 12, 24, 0, 2, &sTextColor, 0, gStringVar4); } -void sub_80CDAD0(struct LinkBattleRecord * record, u8 y) +static void PrintOpponentBattleRecord(struct LinkBattleRecord * record, u8 y) { u8 i = 0; s32 x; if (record->wins == 0 && record->losses == 0 && record->draws == 0) { - AddTextPrinterParameterized4(0, 2, 0, y, 0, 2, &gUnknown_83F6C78, 0, gUnknown_84181B6); + AddTextPrinterParameterized4(0, 2, 0, y, 0, 2, &sTextColor, 0, gString_BattleRecords_7Dashes); for (i = 0; i < 3; i++) { if (i == 0) @@ -521,7 +513,7 @@ void sub_80CDAD0(struct LinkBattleRecord * record, u8 y) x = 0x84; else x = 0xB4; - AddTextPrinterParameterized4(0, 2, x, y, 0, 2, &gUnknown_83F6C78, 0, gUnknown_84181BE); + AddTextPrinterParameterized4(0, 2, x, y, 0, 2, &sTextColor, 0, gString_BattleRecords_4Dashes); } } else @@ -549,36 +541,36 @@ void sub_80CDAD0(struct LinkBattleRecord * record, u8 y) x = 0xB4; ConvertIntToDecimalStringN(gStringVar1, record->draws, STR_CONV_MODE_RIGHT_ALIGN, 4); } - AddTextPrinterParameterized4(0, 2, x, y, 0, 2, &gUnknown_83F6C78, 0, gStringVar1); + AddTextPrinterParameterized4(0, 2, x, y, 0, 2, &sTextColor, 0, gStringVar1); } } } -void sub_80CDBE4(void) +static void PrintBattleRecords(void) { u32 left; s32 i; FillWindowPixelRect(0, PIXEL_FILL(0), 0, 0, 0xD8, 0x90); - StringExpandPlaceholders(gStringVar4, gUnknown_8418174); + StringExpandPlaceholders(gStringVar4, gString_BattleRecords_PlayersBattleResults); left = 0xD0 - GetStringWidth(2, gStringVar4, -1); - AddTextPrinterParameterized4(0, 2, left / 2, 4, 0, 2, &gUnknown_83F6C78, 0, gStringVar4); - sub_80CD9F4(&gSaveBlock2Ptr->linkBattleRecords); - AddTextPrinterParameterized4(0, 2, 0x54, 0x30, 0, 2, &gUnknown_83F6C78, 0, gUnknown_84181A4); + AddTextPrinterParameterized4(0, 2, left / 2, 4, 0, 2, &sTextColor, 0, gStringVar4); + PrintTotalRecord(&gSaveBlock2Ptr->linkBattleRecords); + AddTextPrinterParameterized4(0, 2, 0x54, 0x30, 0, 2, &sTextColor, 0, gString_BattleRecords_ColumnHeaders); for (i = 0; i < LINK_B_RECORDS_COUNT; i++) - sub_80CDAD0(&gSaveBlock2Ptr->linkBattleRecords.entries[i], 0x3D + 14 * i); - sub_80CDCB4(0); + PrintOpponentBattleRecord(&gSaveBlock2Ptr->linkBattleRecords.entries[i], 0x3D + 14 * i); + CommitWindow(0); } -void sub_80CDCB4(u8 windowId) +static void CommitWindow(u8 windowId) { PutWindowTilemap(windowId); CopyWindowToVram(windowId, 3); } -void sub_80CDCD0(u8 bg) +static void LoadFrameGfxOnBg(u8 bg) { - LoadBgTiles(bg, gUnknown_83F6388, 0xC0, 0); - CopyToBgTilemapBufferRect(bg, gUnknown_83F6468, 0, 0, 32, 32); - LoadPalette(gUnknown_83F6448, 0, 0x20); + LoadBgTiles(bg, sTiles, 0xC0, 0); + CopyToBgTilemapBufferRect(bg, sTilemap, 0, 0, 32, 32); + LoadPalette(sPalette, 0, 0x20); } diff --git a/src/trainer_tower.c b/src/trainer_tower.c index 65d825dfe..ceb4c1616 100644 --- a/src/trainer_tower.c +++ b/src/trainer_tower.c @@ -13,7 +13,7 @@ #include "random.h" #include "cereader_tool.h" #include "easy_chat.h" -#include "text.h" +#include "text.h"sub_815EC8C #include "battle_setup.h" #include "battle_transition.h" #include "battle.h" @@ -1425,7 +1425,7 @@ void sub_815EC0C(void) } } -void sub_815EC8C(void) +void PrintTrainerTowerRecords(void) { s32 i; u8 windowId = 0; diff --git a/sym_ewram.txt b/sym_ewram.txt index a13a9fe9a..7afc083e9 100644 --- a/sym_ewram.txt +++ b/sym_ewram.txt @@ -1061,8 +1061,7 @@ gUnknown_2039A1A: @ 2039A1A gUnknown_2039A1B: @ 2039A1B .space 0x1 -gUnknown_2039A1C: @ 2039A1C - .space 0x4 + .include "src/battle_records.o" gUnknown_2039A20: @ 2039A20 .space 0x4 |