diff options
| author | Seth Barberee <seth.barberee@gmail.com> | 2021-09-23 22:49:43 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-24 00:49:43 -0500 |
| commit | 0d3b11e81a215875fc533db17895613c47a4da73 (patch) | |
| tree | d392a83755f1b7631c241c100c9e778d96ef5527 /src/pokemon_mid.c | |
| parent | 8237e29a164211eb2ec4cd161eb4183cc1947fee (diff) | |
Data work and decomp some mail/pelipper board (#54)
* data work and decomp some mail/pelipper board
* resuce -> rescue
* label more data
Diffstat (limited to 'src/pokemon_mid.c')
| -rw-r--r-- | src/pokemon_mid.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/pokemon_mid.c b/src/pokemon_mid.c index 0af12d0..2c875ef 100644 --- a/src/pokemon_mid.c +++ b/src/pokemon_mid.c @@ -198,7 +198,7 @@ bool8 IsPokemonRenamed(struct PokemonStruct* pokemon) { char* species = GetMonSpecies(pokemon->speciesNum); s32 i; CopyStringtoBuffer(species_name, species); - for (i = 0; i < 10; i++) { + for (i = 0; i < POKEMON_NAME_LENGTH; i++) { if (pokemon->name[i] != species_name[i]) { return FALSE; } @@ -216,7 +216,7 @@ bool8 ComparePokemonNames(s16 a1, s16 a2) { u8* name2 = gRecruitedPokemonRef->pokemon[index2].name; s32 i; - for (i = 0; i < 10; i++) { + for (i = 0; i < POKEMON_NAME_LENGTH; i++) { s32 c1 = ReturnIntFromChar(*name1); s32 c2 = ReturnIntFromChar(*name2); if (c1 > c2) { @@ -544,7 +544,7 @@ void xxx_pokemonstruct_to_pokemon2_808DE50(struct PokemonStruct2 * a1, struct Po a1->unk18 = pokemon->unk1C; sub_8093F50(&a1->unk1C, &pokemon->unk2C); - for (i = 0; i < 10; i++) { + for (i = 0; i < POKEMON_NAME_LENGTH; i++) { a1->name[i] = pokemon->name[i]; } @@ -595,7 +595,7 @@ void xxx_pokemon2_to_pokemonstruct_808DF44(struct PokemonStruct* pokemon, struct pokemon->unk1C = a2->unk18; sub_8093FA8(pokemon->unk2C, a2->unk1C); - for (i = 0; i < 10; i++) { + for (i = 0; i < POKEMON_NAME_LENGTH; i++) { pokemon->name[i] = a2->name[i]; } |