Skip to content

Commit

Permalink
sync pokefirered names
Browse files Browse the repository at this point in the history
  • Loading branch information
Zeturic committed Jan 25, 2025
1 parent 5f1db30 commit b6b06b8
Show file tree
Hide file tree
Showing 7 changed files with 18 additions and 14 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,8 @@ Temporary Items
*.stackdump
*.ss*
*.exe
*.md5

build
obj
GNUmakefile
2 changes: 1 addition & 1 deletion include/quest_log.h
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
#pragma once

void sub_8112450(void);
void SaveQuestLogData(void);
2 changes: 1 addition & 1 deletion include/save.h
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@

#define SAVE_STATUS_OK 1

u8 Save_LoadGameData(u8 saveType);
u8 LoadGameSave(u8 saveType);
2 changes: 1 addition & 1 deletion include/sound.h
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#pragma once

void PlayCry1(u16 species, s8 pan);
void PlayCry_Normal(u16 species, s8 pan);
void StopCryAndClearCrySongs(void);
7 changes: 5 additions & 2 deletions makefile
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,11 @@ all: test.gba
clean:
rm -rf build test.gba test.sym $(CLEANABLE_FILES)

md5: test.gba
@md5sum test.gba
md5: test.md5
@cat test.md5

test.md5: test.gba
md5sum "$<" > "$@"

# ------------------------------------------------------------------------------

Expand Down
7 changes: 3 additions & 4 deletions rom.ld
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@ GetGameStat = 0x08054EC4 |1;
BeginNormalPaletteFade = 0x08070588 |1;
BlendPalettes = 0x080714D4 |1;
BlendPalettesUnfaded = 0x08071510 |1;
PlayCry1 = 0x08071DF0 |1;
PlayCry_Normal = 0x08071DF0 |1;
StopCryAndClearCrySongs = 0x080721C4 |1;
CreateTask = 0x0807741C |1;
Save_LoadGameData = 0x080DA4FC |1;
LoadGameSave = 0x080DA4FC |1;
InitHallOfFameScreen = 0x080F1DDC |1;
Task_Hof_TrySaveData = 0x080F2220 |1;
Task_Hof_StartDisplayingMons = 0x080F2294 |1;
Expand All @@ -32,15 +32,14 @@ GetFontAttribute = 0x080F79D8 |1;
CreateMonPicSprite_HandleDeoxys = 0x0810C1CC |1;
CreateTopBarWindowLoadPalette = 0x0810F558 |1;
TopBarWindowPrintTwoStrings = 0x0810F650 |1;
sub_8112450 = 0x08112450 |1;
SaveQuestLogData = 0x08112450 |1;
AddTextPrinterParameterized3 = 0x0812E51C |1;
CpuSet = 0x081E3B64 |1;
__udivsi3 = 0x081E460C |1;
__umodsi3 = 0x081E4684 |1;
memcpy = 0x081E5E78 |1;
memset = 0x081E5ED8 |1;


/* -------------------------------------------------------------------------- */

gDecompressionBuffer = 0x0201C000;
Expand Down
10 changes: 5 additions & 5 deletions src/fame-hall.c
Original file line number Diff line number Diff line change
Expand Up @@ -36,14 +36,14 @@ void Task_Hof_InitTeamSaveData(u8 taskId)
u16 i;
struct HallofFameTeam* lastSavedTeam = (struct HallofFameTeam *)(gDecompressionBuffer);

sub_8112450();
SaveQuestLogData();
if (!gHasHallOfFameRecords)
{
memset(gDecompressionBuffer, 0, 0x2000);
}
else
{
if (Save_LoadGameData(SAVE_HALL_OF_FAME) != TRUE)
if (LoadGameSave(SAVE_HALL_OF_FAME) != TRUE)
memset(gDecompressionBuffer, 0, 0x2000);
}

Expand Down Expand Up @@ -115,7 +115,7 @@ void Task_Hof_PlayMonCryAndPrintInfo(u8 taskId)
if (gSprites[gTasks[taskId].data[5 + currMonId]].data[0])
{
if (currMon->species != SPECIES_EGG)
PlayCry1(currMon->species, 0);
PlayCry_Normal(currMon->species, 0);
HallOfFame_PrintMonInfo(currMon, 0, 14);
gTasks[taskId].data[3] = 120;
gTasks[taskId].func = Task_Hof_TryDisplayAnotherMon;
Expand Down Expand Up @@ -154,7 +154,7 @@ void Task_HofPC_CopySaveData(u8 taskId)
struct HallofFameTeam* savedTeams;

CreateTopBarWindowLoadPalette(0, 30, 0, 0x0C, 0x226);
if (Save_LoadGameData(SAVE_HALL_OF_FAME) != SAVE_STATUS_OK)
if (LoadGameSave(SAVE_HALL_OF_FAME) != SAVE_STATUS_OK)
{
gTasks[taskId].func = Task_HofPC_PrintDataIsCorrupted;
}
Expand Down Expand Up @@ -269,7 +269,7 @@ void Task_HofPC_PrintMonInfo(u8 taskId)
if (currMon->species != SPECIES_EGG)
{
StopCryAndClearCrySongs();
PlayCry1(currMon->species, 0);
PlayCry_Normal(currMon->species, 0);
}
HallOfFame_PrintMonInfo(currMon, 0, 14);

Expand Down

0 comments on commit b6b06b8

Please sign in to comment.