diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2021-03-11 15:11:53 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-11 15:11:53 -0500 |
| commit | 1c03a923b7282645fc528d8b2d9ad82c0a8f23ae (patch) | |
| tree | a87d4011197b316fe9246e71aa7a7c154e68ca00 /src | |
| parent | 651b59d63162152626203e8a86d3bb0f003f7daa (diff) | |
| parent | a7233dcd0cfd77c06a7ccc8d2da4448e08108c90 (diff) | |
Merge pull request #399 from Deokishisu/patch-1000
Fix Typos / Use Box Constants / Name an Unknown
Diffstat (limited to 'src')
| -rw-r--r-- | src/field_player_avatar.c | 22 | ||||
| -rw-r--r-- | src/pokemon.c | 4 |
2 files changed, 12 insertions, 14 deletions
diff --git a/src/field_player_avatar.c b/src/field_player_avatar.c index 9d2cb5620..d86811ca8 100644 --- a/src/field_player_avatar.c +++ b/src/field_player_avatar.c @@ -1125,7 +1125,7 @@ void StopPlayerAvatar(void) } } -static const u8 sPlayerAvatarGfxIds[][2] = { +static const u8 sPlayerAvatarGfxIds[][GENDER_COUNT] = { {OBJ_EVENT_GFX_RED_NORMAL, OBJ_EVENT_GFX_GREEN_NORMAL}, {OBJ_EVENT_GFX_RED_BIKE, OBJ_EVENT_GFX_GREEN_BIKE}, {OBJ_EVENT_GFX_RED_SURF, OBJ_EVENT_GFX_GREEN_SURF}, @@ -1230,15 +1230,13 @@ void SetPlayerAvatarStateMask(u8 flags) gPlayerAvatar.flags |= flags; } -static const u8 gUnknown_835B882[][3][2] = { - // Male - { +static const u8 sPlayerAvatarGfxToStateFlag[][3][GENDER_COUNT] = { + [MALE] = { {OBJ_EVENT_GFX_RED_NORMAL, PLAYER_AVATAR_FLAG_ON_FOOT}, {OBJ_EVENT_GFX_RED_BIKE, PLAYER_AVATAR_FLAG_MACH_BIKE}, {OBJ_EVENT_GFX_RED_SURF, PLAYER_AVATAR_FLAG_SURFING}, }, - // Female - { + [FEMALE] = { {OBJ_EVENT_GFX_GREEN_NORMAL, PLAYER_AVATAR_FLAG_ON_FOOT}, {OBJ_EVENT_GFX_GREEN_BIKE, PLAYER_AVATAR_FLAG_MACH_BIKE}, {OBJ_EVENT_GFX_GREEN_SURF, PLAYER_AVATAR_FLAG_SURFING}, @@ -1249,10 +1247,10 @@ u8 GetPlayerAvatarStateTransitionByGraphicsId(u8 graphicsId, u8 gender) { u8 i; - for (i = 0; i < NELEMS(*gUnknown_835B882); i++) + for (i = 0; i < NELEMS(*sPlayerAvatarGfxToStateFlag); i++) { - if (gUnknown_835B882[gender][i][0] == graphicsId) - return gUnknown_835B882[gender][i][1]; + if (sPlayerAvatarGfxToStateFlag[gender][i][0] == graphicsId) + return sPlayerAvatarGfxToStateFlag[gender][i][1]; } return 1; } @@ -1262,10 +1260,10 @@ u8 GetPlayerAvatarGraphicsIdByCurrentState(void) u8 i; u8 r5 = gPlayerAvatar.flags; - for (i = 0; i < NELEMS(*gUnknown_835B882); i++) + for (i = 0; i < NELEMS(*sPlayerAvatarGfxToStateFlag); i++) { - if (gUnknown_835B882[gPlayerAvatar.gender][i][1] & r5) - return gUnknown_835B882[gPlayerAvatar.gender][i][0]; + if (sPlayerAvatarGfxToStateFlag[gPlayerAvatar.gender][i][1] & r5) + return sPlayerAvatarGfxToStateFlag[gPlayerAvatar.gender][i][0]; } return 0; } diff --git a/src/pokemon.c b/src/pokemon.c index f58aee9b3..b523c4cb9 100644 --- a/src/pokemon.c +++ b/src/pokemon.c @@ -3799,8 +3799,8 @@ static bool8 IsPokemonStorageFull(void) { s32 i, j; - for (i = 0; i < 14; i++) - for (j = 0; j < 30; j++) + for (i = 0; i < TOTAL_BOXES_COUNT; i++) + for (j = 0; j < IN_BOX_COUNT; j++) if (GetBoxMonDataAt(i, j, MON_DATA_SPECIES) == SPECIES_NONE) return FALSE; |