diff options
| author | Cleverking2003 <30466983+Cleverking2003@users.noreply.github.com> | 2020-07-02 22:44:49 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-02 22:44:49 +0300 |
| commit | 30694cdc38e8824d56f6e6b89da9753b01ccb17b (patch) | |
| tree | 6b3eba63186be3ad51f0a36ef15970282260a07c /arm9/src | |
| parent | 43866e9cb9e829f33a549b2d56cf3f70e1f98d52 (diff) | |
| parent | 99ada0fe1010c1530e4d799c4fdf264c9301d701 (diff) | |
Merge pull request #210 from PikalaxALT/pikalax_work
misc naming and cleanup
Diffstat (limited to 'arm9/src')
| -rw-r--r-- | arm9/src/pokemon.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/arm9/src/pokemon.c b/arm9/src/pokemon.c index 39739474..e56faac3 100644 --- a/arm9/src/pokemon.c +++ b/arm9/src/pokemon.c @@ -1870,16 +1870,16 @@ int GetPersonalAttr(struct BaseStats * baseStats, enum BaseStat attr) case BASE_FLIP: ret = baseStats->flip; break; - case BASE_UNKNOWN_29: + case BASE_TMHM_1: ret = (int)baseStats->unk1C; break; - case BASE_UNKNOWN_30: + case BASE_TMHM_2: ret = (int)baseStats->unk20; break; - case BASE_UNKNOWN_31: + case BASE_TMHM_3: ret = (int)baseStats->unk24; break; - case BASE_UNKNOWN_32: + case BASE_TMHM_4: ret = (int)baseStats->unk28; break; } @@ -3397,22 +3397,22 @@ BOOL FUN_0206A16C(u16 species, int forme, u32 a2) if (a2 < 32) { r4 = 1ul << a2; - r2 = BASE_UNKNOWN_29; + r2 = BASE_TMHM_1; } else if (a2 < 64) { r4 = 1ul << (a2 - 32); - r2 = BASE_UNKNOWN_30; + r2 = BASE_TMHM_2; } else if (a2 < 96) { r4 = 1ul << (a2 - 64); - r2 = BASE_UNKNOWN_31; + r2 = BASE_TMHM_3; } else { r4 = 1ul << (a2 - 96); - r2 = BASE_UNKNOWN_32; + r2 = BASE_TMHM_4; } return !!(GetMonBaseStat_HandleFormeConversion(species, forme, r2) & r4); } |