diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2020-03-02 10:43:01 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-02 10:43:01 -0500 |
| commit | 55e00e0c1377c032651d1102ab6ba750483377e4 (patch) | |
| tree | bbb0321d379422d435078ba7ce249c6a0572193a /src/union_room.c | |
| parent | ff0034d59796c31a6b16d8a27595a29250d1bb79 (diff) | |
| parent | a1995d8029d77e8768e4953e4f30cc3e3a57b419 (diff) | |
Merge pull request #274 from GriffinRichards/doc-fourisland
Document Four Island scripts, trainer_card.inc, sync trainer_card.c
Diffstat (limited to 'src/union_room.c')
| -rw-r--r-- | src/union_room.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/union_room.c b/src/union_room.c index f4169b65b..7bace05ef 100644 --- a/src/union_room.c +++ b/src/union_room.c @@ -46,6 +46,7 @@ #include "constants/cable_club.h" #include "constants/field_weather.h" #include "constants/species.h" +#include "constants/trainer_card.h" #include "constants/union_room.h" static EWRAM_DATA u8 sUnionRoomPlayerName[12] = {}; @@ -4727,9 +4728,9 @@ static void ViewURoomPartnerTrainerCard(u8 *unused, struct UnkStruct_URoom * uro ConvertIntToDecimalStringN(uroom->trainerCardStrbufs[2], trainerCard->rse.pokemonTrades, STR_CONV_MODE_LEFT_ALIGN, 5); DynamicPlaceholderTextUtil_SetPlaceholderPtr(3, uroom->trainerCardStrbufs[2]); - for (i = 0; i < 4; i++) + for (i = 0; i < TRAINER_CARD_PROFILE_LENGTH; i++) { - CopyEasyChatWord(uroom->trainerCardStrbufs[i + 3], trainerCard->rse.var_28[i]); + CopyEasyChatWord(uroom->trainerCardStrbufs[i + 3], trainerCard->rse.easyChatProfile[i]); DynamicPlaceholderTextUtil_SetPlaceholderPtr(i + 4, uroom->trainerCardStrbufs[i + 3]); } |