dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix formatting.

Browse Source
This commit is contained in:
ultima-soul
2019-10-06 09:13:15 -07:00
parent d84e9bed58
commit d4ba74fb34
5 changed files with 53 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/new_game.h
-3
View File
@@ -2,12 +2,9 @@
#define GUARD_NEW_GAME_H #define GUARD_NEW_GAME_H
void SetTrainerId(u32 trainerId, u8 *dst); void SetTrainerId(u32 trainerId, u8 *dst);
u32 ReadUnalignedWord(u8* dataPtr);
void CopyTrainerId(u8 *dst, u8 *src); void CopyTrainerId(u8 *dst, u8 *src);
void NewGameInitData(void); void NewGameInitData(void);
void ResetMenuAndMonGlobals(void); void ResetMenuAndMonGlobals(void);
void Sav2_ClearSetDefault(void); void Sav2_ClearSetDefault(void);
void ResetMiniGamesResults(void);
void sub_808447C(void);
#endif // GUARD_NEW_GAME_H #endif // GUARD_NEW_GAME_H
src/new_game.c
+8 -13
View File
@@ -33,7 +33,7 @@
extern const u8 EventScript_ResetAllMapFlags[]; extern const u8 EventScript_ResetAllMapFlags[];
// this file's functions // this file's functions
void ResetMiniGamesResults(void); static void ResetMiniGamesResults(void);
// EWRAM vars // EWRAM vars
EWRAM_DATA bool8 gDifferentSaveFile = FALSE; EWRAM_DATA bool8 gDifferentSaveFile = FALSE;
@@ -53,13 +53,13 @@ void CopyTrainerId(u8 *dst, u8 *src)
dst[i] = src[i]; dst[i] = src[i];
} }
/*static*/ void InitPlayerTrainerId(void) static void InitPlayerTrainerId(void)
{ {
u32 trainerId = (Random() << 0x10) | GetGeneratedTrainerIdLower(); u32 trainerId = (Random() << 0x10) | GetGeneratedTrainerIdLower();
SetTrainerId(trainerId, gSaveBlock2Ptr->playerTrainerId); SetTrainerId(trainerId, gSaveBlock2Ptr->playerTrainerId);
} }
/*static*/ void SetDefaultOptions(void) static void SetDefaultOptions(void)
{ {
gSaveBlock2Ptr->optionsTextSpeed = OPTIONS_TEXT_SPEED_MID; gSaveBlock2Ptr->optionsTextSpeed = OPTIONS_TEXT_SPEED_MID;
gSaveBlock2Ptr->optionsWindowFrameType = 0; gSaveBlock2Ptr->optionsWindowFrameType = 0;
@@ -70,18 +70,18 @@ void CopyTrainerId(u8 *dst, u8 *src)
gSaveBlock2Ptr->optionsButtonMode = OPTIONS_BUTTON_MODE_NORMAL; gSaveBlock2Ptr->optionsButtonMode = OPTIONS_BUTTON_MODE_NORMAL;
} }
/*static*/ void ClearPokedexFlags(void) static void ClearPokedexFlags(void)
{ {
memset(&gSaveBlock2Ptr->pokedex.owned, 0, sizeof(gSaveBlock2Ptr->pokedex.owned)); memset(&gSaveBlock2Ptr->pokedex.owned, 0, sizeof(gSaveBlock2Ptr->pokedex.owned));
memset(&gSaveBlock2Ptr->pokedex.seen, 0, sizeof(gSaveBlock2Ptr->pokedex.seen)); memset(&gSaveBlock2Ptr->pokedex.seen, 0, sizeof(gSaveBlock2Ptr->pokedex.seen));
} }
/*static*/ void sub_80549D4(void) static void sub_80549D4(void)
{ {
CpuFill32(0, &gSaveBlock2Ptr->field_B0, (u32) &gSaveBlock2Ptr->mapView - (u32) &gSaveBlock2Ptr->field_B0); CpuFill32(0, &gSaveBlock2Ptr->field_B0, (u32) &gSaveBlock2Ptr->mapView - (u32) &gSaveBlock2Ptr->field_B0);
} }
/*static*/ void WarpToPlayersRoom(void) static void WarpToPlayersRoom(void)
{ {
SetWarpDestination(MAP_GROUP(PALLET_TOWN_PLAYERS_HOUSE_2F), MAP_NUM(PALLET_TOWN_PLAYERS_HOUSE_2F), -1, 6, 6); SetWarpDestination(MAP_GROUP(PALLET_TOWN_PLAYERS_HOUSE_2F), MAP_NUM(PALLET_TOWN_PLAYERS_HOUSE_2F), -1, 6, 6);
WarpIntoMap(); WarpIntoMap();
@@ -109,6 +109,7 @@ void ResetMenuAndMonGlobals(void)
void NewGameInitData(void) void NewGameInitData(void)
{ {
u8 rivalName[PLAYER_NAME_LENGTH]; u8 rivalName[PLAYER_NAME_LENGTH];
StringCopy(rivalName, gSaveBlock1Ptr->rivalName); StringCopy(rivalName, gSaveBlock1Ptr->rivalName);
gDifferentSaveFile = 1; gDifferentSaveFile = 1;
gSaveBlock2Ptr->encryptionKey = 0; gSaveBlock2Ptr->encryptionKey = 0;
@@ -152,7 +153,7 @@ void NewGameInitData(void)
sub_815EE0C(); sub_815EE0C();
} }
/*static*/ void ResetMiniGamesResults(void) static void ResetMiniGamesResults(void)
{ {
CpuFill16(0, &gSaveBlock2Ptr->berryCrush, sizeof(struct BerryCrush)); CpuFill16(0, &gSaveBlock2Ptr->berryCrush, sizeof(struct BerryCrush));
SetBerryPowder(&gSaveBlock2Ptr->berryCrush.berryPowderAmount, 0); SetBerryPowder(&gSaveBlock2Ptr->berryCrush.berryPowderAmount, 0);
@@ -160,9 +161,3 @@ void NewGameInitData(void)
CpuFill16(0, &gSaveBlock2Ptr->berryPick, sizeof(struct BerryPickingResults)); CpuFill16(0, &gSaveBlock2Ptr->berryPick, sizeof(struct BerryPickingResults));
} }