Merge branch 'master' of https://github.com/pret/pokeemerald into doc-confetti

2020-07-08 15:45:31 -04:00
parent 8b462f3f6c 8b80b417e2
commit 431c60c92c
109 changed files with 7618 additions and 6664 deletions
--- a/include/global.h
+++ b/include/global.h
@@ -974,7 +974,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;