diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-07-08 16:03:32 -0400 |
|---|---|---|
| committer | GriffinR <griffin.g.richards@gmail.com> | 2020-07-08 16:03:32 -0400 |
| commit | beeb673ba16e02cacadb2de0ee3608d2106ed14a (patch) | |
| tree | 8924e783fc8af67286cf45abcef95c065a3fd223 /include/global.h | |
| parent | 2ed1f7c6f92abe93d86b921709576b82970f0848 (diff) | |
| parent | ebade7affb31d5bcdc17cdcd3895758010ee6f66 (diff) | |
Merge branch 'master' of https://github.com/pret/pokeemerald into add-flagvarsave
Diffstat (limited to 'include/global.h')
| -rw-r--r-- | include/global.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/global.h b/include/global.h index 2083d7166..9612a25f0 100644 --- a/include/global.h +++ b/include/global.h @@ -965,7 +965,7 @@ struct SaveBlock1 /*0x2E20*/ u8 additionalPhrases[8]; // bitfield for 33 additional phrases in easy chat system /*0x2E28*/ OldMan oldMan; /*0x2e64*/ struct EasyChatPair easyChatPairs[5]; //Dewford trend [0] and some other stuff - /*0x2e90*/ struct ContestWinner contestWinners[13]; // 0 - 5 used in contest hall, 6 - 7 unused?, 8 - 12 museum + /*0x2e90*/ struct ContestWinner contestWinners[NUM_CONTEST_WINNERS]; // see CONTEST_WINNER_* /*0x3030*/ struct DayCare daycare; /*0x3150*/ struct LinkBattleRecords linkBattleRecords; /*0x31A8*/ u8 giftRibbons[52]; @@ -979,7 +979,7 @@ struct SaveBlock1 /*0x3B24*/ u8 seen2[DEX_FLAGS_NO]; /*0x3B58*/ LilycoveLady lilycoveLady; /*0x3B98*/ struct TrainerNameRecord trainerNameRecords[20]; - /*0x3C88*/ u8 unk3C88[10][21]; + /*0x3C88*/ u8 registeredTexts[UNION_ROOM_KB_ROW_COUNT][21]; /*0x3D5A*/ u8 filler3D5A[0xA]; /*0x3D64*/ struct SaveTrainerHill trainerHill; /*0x3D70*/ struct WaldaPhrase waldaPhrase; |