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

Update code style in some places

Browse Source
This commit is contained in:
PikalaxALT
2019-10-22 20:09:08 -04:00
parent a5521e6b69
commit 4dfc6699fe
6 changed files with 437 additions and 441 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/event_data.h
+20 -24
View File
@@ -6,6 +6,26 @@
#include "constants/flags.h" #include "constants/flags.h"
#include "constants/vars.h" #include "constants/vars.h"
extern u16 gSpecialVar_0x8000;
extern u16 gSpecialVar_0x8001;
extern u16 gSpecialVar_0x8002;
extern u16 gSpecialVar_0x8003;
extern u16 gSpecialVar_0x8004;
extern u16 gSpecialVar_0x8005;
extern u16 gSpecialVar_0x8006;
extern u16 gSpecialVar_0x8007;
extern u16 gSpecialVar_0x8008;
extern u16 gSpecialVar_0x8009;
extern u16 gSpecialVar_0x800A;
extern u16 gSpecialVar_0x800B;
extern u16 gSpecialVar_Facing;
extern u16 gSpecialVar_Result;
extern u16 gSpecialVar_LastTalked;
extern u16 gSpecialVar_MonBoxId;
extern u16 gSpecialVar_MonBoxPos;
extern u16 gSpecialVar_TextColor;
extern u16 gSpecialVar_PrevTextColor;
void InitEventData(void); void InitEventData(void);
void ClearTempFieldEventData(void); void ClearTempFieldEventData(void);
void ClearUpperFlags(void); void ClearUpperFlags(void);
@@ -38,29 +58,5 @@ void sub_806E2D0(void);
void sub_806E370(void); void sub_806E370(void);
bool32 IsNationalPokedexEnabled(void); bool32 IsNationalPokedexEnabled(void);
void sub_806E190(void); void sub_806E190(void);
extern u16 gSpecialVar_0x8000;
extern u16 gSpecialVar_0x8001;
extern u16 gSpecialVar_0x8002;
extern u16 gSpecialVar_0x8003;
extern u16 gSpecialVar_0x8004;
extern u16 gSpecialVar_0x8005;
extern u16 gSpecialVar_0x8006;
extern u16 gSpecialVar_0x8007;
extern u16 gSpecialVar_0x8008;
extern u16 gSpecialVar_0x8009;
extern u16 gSpecialVar_0x800A;
extern u16 gSpecialVar_0x800B;
extern u16 gSpecialVar_Result;
extern u16 gSpecialVar_LastTalked;
extern u16 gSpecialVar_Facing;
extern u16 gSpecialVar_MonBoxId;
extern u16 gSpecialVar_MonBoxPos;
extern u16 gSpecialVar_0x8014;
extern u16 gSpecialVar_Result;
extern u16 gSpecialVar_0x8004;
extern u16 gSpecialVar_TextColor;
extern u16 gSpecialVar_PrevTextColor;
#endif // GUARD_EVENT_DATA_H #endif // GUARD_EVENT_DATA_H
include/quest_log.h
+2 -2
View File
@@ -40,8 +40,8 @@ void sub_8112450(void);
void sub_8112364(void); void sub_8112364(void);
u8 sub_8112CAC(void); u8 sub_8112CAC(void);
void sub_81138F8(void); void sub_81138F8(void);
void *QuestLogGetFlagOrVarPtr(u8 isFlag, u16 idx); void *QuestLogGetFlagOrVarPtr(bool8 isFlag, u16 idx);
void QuestLogSetFlagOrVar(u8 isFlag, u16 idx, u16 value); void QuestLogSetFlagOrVar(bool8 isFlag, u16 idx, u16 value);
extern u8 gUnknown_203ADFA; extern u8 gUnknown_203ADFA;
src/event_data.c
+8 -8
View File
@@ -185,15 +185,15 @@ u16 *GetVarPointer(u16 idx)
default: default:
break; break;
case 1: case 1:
ptr = QuestLogGetFlagOrVarPtr(0, idx); ptr = QuestLogGetFlagOrVarPtr(FALSE, idx);
if (ptr != NULL) if (ptr != NULL)
gSaveBlock1Ptr->vars[idx - VARS_START] = *ptr; gSaveBlock1Ptr->vars[idx - VARS_START] = *ptr;
break; break;
case 2: case 2:
if (IsFlagOrVarStoredInQuestLog(idx - VARS_START, 1) == TRUE) if (IsFlagOrVarStoredInQuestLog(idx - VARS_START, TRUE) == TRUE)
{ {
gLastQuestLogStoredFlagOrVarIdx = idx - VARS_START; gLastQuestLogStoredFlagOrVarIdx = idx - VARS_START;
QuestLogSetFlagOrVar(0, idx, gSaveBlock1Ptr->vars[idx - VARS_START]); QuestLogSetFlagOrVar(FALSE, idx, gSaveBlock1Ptr->vars[idx - VARS_START]);
} }
break; break;
} }
@@ -202,9 +202,9 @@ u16 *GetVarPointer(u16 idx)
return gSpecialVars[idx - SPECIAL_VARS_START]; return gSpecialVars[idx - SPECIAL_VARS_START];
} }
static bool8 IsFlagOrVarStoredInQuestLog(u16 idx, u8 a1) static bool8 IsFlagOrVarStoredInQuestLog(u16 idx, bool8 isVar)
{ {
if (a1 == 0) if (!isVar)
{ {
if (idx < STORY_FLAGS_START) if (idx < STORY_FLAGS_START)
return FALSE; return FALSE;
@@ -256,15 +256,15 @@ u8 *GetFlagAddr(u16 idx)
default: default:
break; break;
case 1: case 1:
ptr = QuestLogGetFlagOrVarPtr(1, idx); ptr = QuestLogGetFlagOrVarPtr(TRUE, idx);
if (ptr != NULL) if (ptr != NULL)
gSaveBlock1Ptr->flags[idx >> 3] = *ptr; gSaveBlock1Ptr->flags[idx >> 3] = *ptr;
break; break;
case 2: case 2:
if (IsFlagOrVarStoredInQuestLog(idx, 0) == TRUE) if (IsFlagOrVarStoredInQuestLog(idx, FALSE) == TRUE)
{ {
gLastQuestLogStoredFlagOrVarIdx = idx; gLastQuestLogStoredFlagOrVarIdx = idx;
QuestLogSetFlagOrVar(1, idx, gSaveBlock1Ptr->flags[idx / 8]); QuestLogSetFlagOrVar(TRUE, idx, gSaveBlock1Ptr->flags[idx / 8]);
} }
break; break;
} }
src/quest_log.c
+272 -272
View File
File diff suppressed because it is too large Load Diff
src/trainer_tower.c
+23 -23
View File
@@ -47,7 +47,7 @@ struct UnkStruct_203F45C
/* 0x30 */ u16 speechLose2[6]; /* 0x30 */ u16 speechLose2[6];
/* 0x3C */ u8 battleType; /* 0x3C */ u8 battleType;
/* 0x3D */ u8 facilityClass; /* 0x3D */ u8 facilityClass;
/* 0x3E */ u8 unk_3E; /* 0x3E */ u8 gender;
}; };
struct SinglesTrainerInfo struct SinglesTrainerInfo
@@ -73,8 +73,8 @@ struct TrainerEncounterMusicPairs
}; };
static EWRAM_DATA struct UnkStruct_203F458 * sTrainerTowerState = NULL; static EWRAM_DATA struct UnkStruct_203F458 * sTrainerTowerState = NULL;
static EWRAM_DATA struct UnkStruct_203F45C * gUnknown_203F45C = NULL; static EWRAM_DATA struct UnkStruct_203F45C * sTrainerTowerOpponent = NULL;
static EWRAM_DATA u8 unused_variable = 0; static EWRAM_DATA u8 sUnused_203F460 = 0;
static void sub_815DC8C(void); // setup static void sub_815DC8C(void); // setup
static void sub_815DD2C(void); // teardown static void sub_815DD2C(void); // teardown
@@ -443,17 +443,17 @@ void sub_815D9E8(void)
u8 sub_815DA10(void) u8 sub_815DA10(void)
{ {
return gFacilityClassToTrainerClass[gUnknown_203F45C->facilityClass]; return gFacilityClassToTrainerClass[sTrainerTowerOpponent->facilityClass];
} }
void sub_815DA28(u8 *dest) void sub_815DA28(u8 *dest)
{ {
StringCopyN(dest, gUnknown_203F45C->name, 11); StringCopyN(dest, sTrainerTowerOpponent->name, 11);
} }
u8 GetTrainerTowerTrainerFrontSpriteId(void) u8 GetTrainerTowerTrainerFrontSpriteId(void)
{ {
return gFacilityClassToPicIndex[gUnknown_203F45C->facilityClass]; return gFacilityClassToPicIndex[sTrainerTowerOpponent->facilityClass];
} }
void InitTrainerTowerBattleStruct(void) void InitTrainerTowerBattleStruct(void)
@@ -462,55 +462,55 @@ void InitTrainerTowerBattleStruct(void)
s32 r9; s32 r9;
sub_815DC8C(); sub_815DC8C();
gUnknown_203F45C = AllocZeroed(sizeof(*gUnknown_203F45C)); sTrainerTowerOpponent = AllocZeroed(sizeof(*sTrainerTowerOpponent));
r10 = VarGet(VAR_0x4001); r10 = VarGet(VAR_0x4001);
StringCopyN(gUnknown_203F45C->name, sTrainerTowerState->unk_0004.floors[sTrainerTowerState->floorIdx].trainers[r10].name, 11); StringCopyN(sTrainerTowerOpponent->name, sTrainerTowerState->unk_0004.floors[sTrainerTowerState->floorIdx].trainers[r10].name, 11);
for (r9 = 0; r9 < 6; r9++) for (r9 = 0; r9 < 6; r9++)
{ {
gUnknown_203F45C->speechWin[r9] = sTrainerTowerState->unk_0004.floors[sTrainerTowerState->floorIdx].trainers[r10].speechWin[r9]; sTrainerTowerOpponent->speechWin[r9] = sTrainerTowerState->unk_0004.floors[sTrainerTowerState->floorIdx].trainers[r10].speechWin[r9];
gUnknown_203F45C->speechLose[r9] = sTrainerTowerState->unk_0004.floors[sTrainerTowerState->floorIdx].trainers[r10].speechLose[r9]; sTrainerTowerOpponent->speechLose[r9] = sTrainerTowerState->unk_0004.floors[sTrainerTowerState->floorIdx].trainers[r10].speechLose[r9];
if (sTrainerTowerState->unk_0004.floors[sTrainerTowerState->floorIdx].challengeType == 1) if (sTrainerTowerState->unk_0004.floors[sTrainerTowerState->floorIdx].challengeType == 1)
{ {
gUnknown_203F45C->speechWin2[r9] = sTrainerTowerState->unk_0004.floors[sTrainerTowerState->floorIdx].trainers[r10 + 1].speechWin[r9]; sTrainerTowerOpponent->speechWin2[r9] = sTrainerTowerState->unk_0004.floors[sTrainerTowerState->floorIdx].trainers[r10 + 1].speechWin[r9];
gUnknown_203F45C->speechLose2[r9] = sTrainerTowerState->unk_0004.floors[sTrainerTowerState->floorIdx].trainers[r10 + 1].speechLose[r9]; sTrainerTowerOpponent->speechLose2[r9] = sTrainerTowerState->unk_0004.floors[sTrainerTowerState->floorIdx].trainers[r10 + 1].speechLose[r9];
} }
} }
gUnknown_203F45C->battleType = sTrainerTowerState->unk_0004.floors[sTrainerTowerState->floorIdx].challengeType; sTrainerTowerOpponent->battleType = sTrainerTowerState->unk_0004.floors[sTrainerTowerState->floorIdx].challengeType;
gUnknown_203F45C->facilityClass = sTrainerTowerState->unk_0004.floors[sTrainerTowerState->floorIdx].trainers[r10].facilityClass; sTrainerTowerOpponent->facilityClass = sTrainerTowerState->unk_0004.floors[sTrainerTowerState->floorIdx].trainers[r10].facilityClass;
gUnknown_203F45C->unk_3E = sTrainerTowerState->unk_0004.floors[sTrainerTowerState->floorIdx].trainers[r10].gender; sTrainerTowerOpponent->gender = sTrainerTowerState->unk_0004.floors[sTrainerTowerState->floorIdx].trainers[r10].gender;
SetVBlankCounter1Ptr(&gSaveBlock1Ptr->unkArray[gSaveBlock1Ptr->unkArrayIdx].unk0); SetVBlankCounter1Ptr(&gSaveBlock1Ptr->unkArray[gSaveBlock1Ptr->unkArrayIdx].unk0);
sub_815DD2C(); sub_815DD2C();
} }
void FreeTrainerTowerBattleStruct(void) void FreeTrainerTowerBattleStruct(void)
{ {
Free(gUnknown_203F45C); Free(sTrainerTowerOpponent);
gUnknown_203F45C = NULL; sTrainerTowerOpponent = NULL;
} }
void sub_815DBF4(u8 *dest, u8 opponentIdx) void sub_815DBF4(u8 *dest, u8 opponentIdx)
// TTower_GetBeforeBattleMessage? // TTower_GetBeforeBattleMessage?
{ {
VarSet(VAR_0x4003, opponentIdx); VarSet(VAR_0x4003, opponentIdx);
TrainerTowerGetOpponentTextColor(gUnknown_203F45C->battleType, gUnknown_203F45C->facilityClass); TrainerTowerGetOpponentTextColor(sTrainerTowerOpponent->battleType, sTrainerTowerOpponent->facilityClass);
if (opponentIdx == 0) if (opponentIdx == 0)
TT_ConvertEasyChatMessageToString(gUnknown_203F45C->speechWin, dest); TT_ConvertEasyChatMessageToString(sTrainerTowerOpponent->speechWin, dest);
else else
TT_ConvertEasyChatMessageToString(gUnknown_203F45C->speechWin2, dest); TT_ConvertEasyChatMessageToString(sTrainerTowerOpponent->speechWin2, dest);
} }
void sub_815DC40(u8 *dest, u8 opponentIdx) void sub_815DC40(u8 *dest, u8 opponentIdx)
// TTower_GetAfterBattleMessage? // TTower_GetAfterBattleMessage?
{ {
VarSet(VAR_0x4003, opponentIdx); VarSet(VAR_0x4003, opponentIdx);
TrainerTowerGetOpponentTextColor(gUnknown_203F45C->battleType, gUnknown_203F45C->facilityClass); TrainerTowerGetOpponentTextColor(sTrainerTowerOpponent->battleType, sTrainerTowerOpponent->facilityClass);
if (opponentIdx == 0) if (opponentIdx == 0)
TT_ConvertEasyChatMessageToString(gUnknown_203F45C->speechLose, dest); TT_ConvertEasyChatMessageToString(sTrainerTowerOpponent->speechLose, dest);
else else
TT_ConvertEasyChatMessageToString(gUnknown_203F45C->speechLose2, dest); TT_ConvertEasyChatMessageToString(sTrainerTowerOpponent->speechLose2, dest);
} }
#ifdef NONMATCHING #ifdef NONMATCHING
src/unk_8159F40.c
+2 -2
View File
@@ -120,7 +120,7 @@ static const struct PokedudeBattlePartyInfo *const sPokedudeBattlePartyPointers[
void InitPokedudePartyAndOpponent(void) void InitPokedudePartyAndOpponent(void)
{ {
s32 i, j; s32 i, j;
struct Pokemon *mon; struct Pokemon * mon;
s32 myIdx = 0; s32 myIdx = 0;
s32 opIdx = 0; s32 opIdx = 0;
const struct PokedudeBattlePartyInfo * data; const struct PokedudeBattlePartyInfo * data;
@@ -713,7 +713,7 @@ void sub_815A540(void)
PlayerGetDestCoords(&x, &y); PlayerGetDestCoords(&x, &y);
if (!MetatileBehavior_IsSurfable(MapGridGetMetatileBehaviorAt(x, y)) && TestPlayerAvatarFlags(PLAYER_AVATAR_FLAG_SURFING)) if (!MetatileBehavior_IsSurfable(MapGridGetMetatileBehaviorAt(x, y)) && TestPlayerAvatarFlags(PLAYER_AVATAR_FLAG_SURFING))
{ {
struct MapObject *mapObject = &gMapObjects[gPlayerAvatar.mapObjectId]; struct MapObject * mapObject = &gMapObjects[gPlayerAvatar.mapObjectId];
SetPlayerAvatarTransitionFlags(0x01); SetPlayerAvatarTransitionFlags(0x01);
DestroySprite(&gSprites[mapObject->mapobj_unk_1A]); DestroySprite(&gSprites[mapObject->mapobj_unk_1A]);
} }