ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-12-26 03:34:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix some names

Browse Source
This commit is contained in:
Phlosioneer 2019-02-18 01:33:41 -05:00
parent 986d3d8b2f
commit 93e9b9fe5d
7 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common_syms/pokedex.txt
View File

@ -1,2 +1,2 @@
gUnusedU8 gUnusedPokedexU8
gUnknown_030060B4 gUnknown_030060B4

2
include/global.h
View File

@ -446,7 +446,7 @@ struct SaveBlock2
/*0x90*/ u8 filler_90[0x8]; /*0x90*/ u8 filler_90[0x8];
/*0x98*/ struct Time localTimeOffset; /*0x98*/ struct Time localTimeOffset;
/*0xA0*/ struct Time lastBerryTreeUpdate; /*0xA0*/ struct Time lastBerryTreeUpdate;
/*0xA8*/ u32 unusedFlagField; // Written to, but never read. /*0xA8*/ u32 field_A8; // Written to, but never read.
/*0xAC*/ u32 encryptionKey; /*0xAC*/ u32 encryptionKey;
/*0xB0*/ struct PlayersApprentice playerApprentice; /*0xB0*/ struct PlayersApprentice playerApprentice;
/*0xDC*/ struct Apprentice apprentices[4]; // From record mixing. /*0xDC*/ struct Apprentice apprentices[4]; // From record mixing.

2
include/pokedex.h
View File

@ -1,7 +1,7 @@
#ifndef GUARD_POKEDEX_H #ifndef GUARD_POKEDEX_H
#define GUARD_POKEDEX_H #define GUARD_POKEDEX_H
extern u8 gUnusedU8; extern u8 gUnusedPokedexU8;
extern void (*gUnknown_030060B4)(void); extern void (*gUnknown_030060B4)(void);
#define HOENN_DEX_COUNT 202 #define HOENN_DEX_COUNT 202

10
src/link_rfu.c
View File

@ -2376,18 +2376,18 @@ void RecordMixTrainerNames(void)
s32 i; s32 i;
s32 j; s32 j;
s32 nextSpace; s32 nextSpace;
s32 connectedTrainerRecordIndecies[5]; s32 connectedTrainerRecordIndicies[5];
struct TrainerNameRecord *newRecords = calloc(20, sizeof(struct TrainerNameRecord)); struct TrainerNameRecord *newRecords = calloc(20, sizeof(struct TrainerNameRecord));
// Check if we already have a record saved for connected trainers. // Check if we already have a record saved for connected trainers.
for (i = 0; i < GetLinkPlayerCount(); i++) for (i = 0; i < GetLinkPlayerCount(); i++)
{ {
connectedTrainerRecordIndecies[i] = -1; connectedTrainerRecordIndicies[i] = -1;
for (j = 0; j < 20; j++) for (j = 0; j < 20; j++)
{ {
if ((u16)gLinkPlayers[i].trainerId == gSaveBlock1Ptr->trainerNameRecords[j].trainerId && StringCompare(gLinkPlayers[i].name, gSaveBlock1Ptr->trainerNameRecords[j].trainerName) == 0) if ((u16)gLinkPlayers[i].trainerId == gSaveBlock1Ptr->trainerNameRecords[j].trainerId && StringCompare(gLinkPlayers[i].name, gSaveBlock1Ptr->trainerNameRecords[j].trainerName) == 0)
{ {
connectedTrainerRecordIndecies[i] = j; connectedTrainerRecordIndicies[i] = j;
} }
} }
} }
@ -2401,9 +2401,9 @@ void RecordMixTrainerNames(void)
CopyTrainerRecord(&newRecords[nextSpace], (u16)gLinkPlayers[i].trainerId, gLinkPlayers[i].name); CopyTrainerRecord(&newRecords[nextSpace], (u16)gLinkPlayers[i].trainerId, gLinkPlayers[i].name);
// If we already had a record for this trainer, wipe it so that the next step doesn't duplicate it. // If we already had a record for this trainer, wipe it so that the next step doesn't duplicate it.
if (connectedTrainerRecordIndecies[i] >= 0) if (connectedTrainerRecordIndicies[i] >= 0)
{ {
memset(gSaveBlock1Ptr->trainerNameRecords[connectedTrainerRecordIndecies[i]].trainerName, 0, 8); memset(gSaveBlock1Ptr->trainerNameRecords[connectedTrainerRecordIndicies[i]].trainerName, 0, 8);
} }
nextSpace++; nextSpace++;
} }

4
src/new_game.c
View File

@ -106,7 +106,7 @@ static void SetDefaultOptions(void)
static void ClearPokedexFlags(void) static void ClearPokedexFlags(void)
{ {
gUnusedU8 = 0; gUnusedPokedexU8 = 0;
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));
} }
@ -164,7 +164,7 @@ void NewGameInitData(void)
ClearSav1(); ClearSav1();
ClearMailData(); ClearMailData();
gSaveBlock2Ptr->specialSaveWarpFlags = 0; gSaveBlock2Ptr->specialSaveWarpFlags = 0;
gSaveBlock2Ptr->unusedFlagField = 0; gSaveBlock2Ptr->field_A8 = 0;
InitPlayerTrainerId(); InitPlayerTrainerId();
PlayTimeCounter_Reset(); PlayTimeCounter_Reset();
ClearPokedexFlags(); ClearPokedexFlags();

4
src/pokedex.c
View File

@ -38,7 +38,7 @@ static EWRAM_DATA struct PokedexListItem *sPokedexListItem = NULL;
// IWRAM common // IWRAM common
// This is written to, but never read. // This is written to, but never read.
u8 gUnusedU8; u8 gUnusedPokedexU8;
void (*gUnknown_030060B4)(void); void (*gUnknown_030060B4)(void);
struct PokedexOption struct PokedexOption
@ -1226,7 +1226,7 @@ void ResetPokedex(void)
gUnknown_02039B50 = 0; gUnknown_02039B50 = 0;
gUnknown_02039B52 = 64; gUnknown_02039B52 = 64;
gUnusedU8 = 0; gUnusedPokedexU8 = 0;
gSaveBlock2Ptr->pokedex.mode = DEX_MODE_HOENN; gSaveBlock2Ptr->pokedex.mode = DEX_MODE_HOENN;
gSaveBlock2Ptr->pokedex.order = 0; gSaveBlock2Ptr->pokedex.order = 0;
gSaveBlock2Ptr->pokedex.nationalMagic = 0; gSaveBlock2Ptr->pokedex.nationalMagic = 0;

14
src/save_location.c
View File

@ -120,13 +120,13 @@ void TrySetMapSaveWarpStatus(void)
void sub_81AFDA0(void) void sub_81AFDA0(void)
{ {
gSaveBlock2Ptr->unusedFlagField |= 0x8000; gSaveBlock2Ptr->field_A8 |= 0x8000;
gSaveBlock2Ptr->unusedFlagField |= 0x1; gSaveBlock2Ptr->field_A8 |= 0x1;
gSaveBlock2Ptr->unusedFlagField |= 0x2; gSaveBlock2Ptr->field_A8 |= 0x2;
gSaveBlock2Ptr->unusedFlagField |= 0x4; gSaveBlock2Ptr->field_A8 |= 0x4;
gSaveBlock2Ptr->unusedFlagField |= 0x10; gSaveBlock2Ptr->field_A8 |= 0x10;
gSaveBlock2Ptr->unusedFlagField |= 0x20; gSaveBlock2Ptr->field_A8 |= 0x20;
gSaveBlock2Ptr->unusedFlagField |= 0x8; gSaveBlock2Ptr->field_A8 |= 0x8;
} }
void sub_81AFDD0(void) void sub_81AFDD0(void)