diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/global.h | 26 | ||||
| -rw-r--r-- | include/global.tv.h | 4 | ||||
| -rw-r--r-- | include/link.h | 1 | ||||
| -rw-r--r-- | include/overworld.h | 2 |
4 files changed, 19 insertions, 14 deletions
diff --git a/include/global.h b/include/global.h index f3ec9ce33..2c0418a78 100644 --- a/include/global.h +++ b/include/global.h @@ -214,7 +214,9 @@ struct SaveBlock2 /*0xAC*/ u32 encryptionKey; // TODO: fix and verify labels - /*0xB0*/ u8 field_B0[316]; + /*0xB0*/ u8 field_B0[0x54]; + /*0x104*/ u16 unk_104[1]; + /*0x106*/ u8 filler_106[0xe6]; /*0x1EC*/ struct BerryCrush berryCrush; /*0x1FC*/ struct PokemonJumpResults pokeJump; /*0x20C*/ struct BerryPickingResults berryPick; @@ -367,14 +369,14 @@ struct MailStruct struct UnkMauvilleOldManStruct { - u8 unk_2D94; - u8 unk_2D95; - /*0x2D96*/ u16 mauvilleOldMan_ecArray[6]; - /*0x2DA2*/ u16 mauvilleOldMan_ecArray2[6]; - /*0x2DAE*/ u8 playerName[8]; - /*0x2DB6*/ u8 filler_2DB6[0x3]; - /*0x2DB9*/ u8 playerTrainerId[4]; - u8 unk_2DBD; + u8 unk_2E28; + u8 unk_2E29; + /*0x2E2A*/ u16 mauvilleOldMan_ecArray[6]; + /*0x2E36*/ u16 mauvilleOldMan_ecArray2[6]; + /*0x2E42*/ u8 playerName[8]; + /*0x2E4A*/ u8 filler_2E4A[0x3]; + /*0x2E4B*/ u8 playerTrainerId[4]; + u8 unk_2E4F; }; /*size = 0x2C*/ struct UnkMauvilleOldManStruct2 @@ -507,8 +509,8 @@ struct LilycoveLadyQuiz /*0x000*/ u8 id; /*0x001*/ u8 phase; /*0x002*/ u16 unk_002[9]; - /*0x014*/ u16 unk_014; - /*0x016*/ u16 unk_016; + /*0x014*/ u16 unk_014[1]; + /*0x016*/ u16 unk_016[1]; /*0x018*/ u8 playerName[8]; /*0x020*/ u16 playerTrainerId[4]; /*0x028*/ u16 itemId; @@ -543,7 +545,7 @@ struct LilycoveLadyContest /*0x00e*/ u8 language; }; -typedef union // TODO +typedef union // 3b58 { struct LilycoveLadyQuiz quiz; struct LilycoveLadyFavour favour; diff --git a/include/global.tv.h b/include/global.tv.h index 5f65aa8e0..97ac54660 100644 --- a/include/global.tv.h +++ b/include/global.tv.h @@ -91,7 +91,7 @@ typedef union // size = 0x24 /*0x0E*/ u8 pokemonNameLanguage; /*0x0F*/ u8 filler_0F[1]; /*0x10*/ u8 nickname[8]; - /*0x18*/ u8 filler_18[4]; + /*0x18*/ u16 words18[2]; /*0x1C*/ u16 words[4]; } fanclubOpinions; @@ -99,7 +99,7 @@ typedef union // size = 0x24 struct { /*0x00*/ u8 kind; /*0x01*/ bool8 active; - /*0x02*/ u8 pad02[4]; + /*0x02*/ u16 words[2]; /*0x06*/ u16 var06; /*0x08*/ u8 pad_08[3]; /*0x0b*/ u8 string_0b[12]; diff --git a/include/link.h b/include/link.h index ccde9818c..db13efbe8 100644 --- a/include/link.h +++ b/include/link.h @@ -193,5 +193,6 @@ void sub_8011BD0(void); u8 sub_800ABAC(void); u8 sub_800ABBC(void); void sub_800AC34(void); +u16 *sub_801B058(void); #endif // GUARD_LINK_H diff --git a/include/overworld.h b/include/overworld.h index ea3d27319..43ddc2dec 100644 --- a/include/overworld.h +++ b/include/overworld.h @@ -67,5 +67,7 @@ void warp1_set_2(s8 mapGroup, s8 mapNum, s8 warpNum); void c2_load_new_map(void); void copy_saved_warp2_bank_and_enter_x_to_warp1(u8 unused); void mapldr_default(void); +void overworld_free_bg_tilemaps(void); +void sub_80861B0(void); #endif //GUARD_ROM4_H |