diff options
| author | yenatch <yenatch@gmail.com> | 2017-07-17 20:46:06 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-17 20:46:06 -0400 |
| commit | 67ced1d77ec0d36cc2b6ebcbfc58ba28b357ddbb (patch) | |
| tree | 5fd7c9306f5de15095cb8de30584bbc4c6672551 /include | |
| parent | c043463631508eaef6543994fa0bdb6bc1351a7c (diff) | |
| parent | 761140fd1b3c755c1d0d564c82166ec8a9f01ea1 (diff) | |
Merge pull request #363 from drifloony/trader
decompile trader
Diffstat (limited to 'include')
| -rw-r--r-- | include/decoration.h | 3 | ||||
| -rw-r--r-- | include/decoration_inventory.h | 2 | ||||
| -rw-r--r-- | include/global.h | 11 |
3 files changed, 15 insertions, 1 deletions
diff --git a/include/decoration.h b/include/decoration.h index 0863b4338..2e72e305a 100644 --- a/include/decoration.h +++ b/include/decoration.h @@ -300,6 +300,8 @@ void sub_80FE5AC(u8); void sub_80FE604(u8); void sub_80FE728(u8); void sub_80FE758(u8); +void sub_80FE7A8(u8); +void sub_80FE7D4(u8 *, u8); void sub_80FE868(u8); void sub_80FE948(u8); void sub_80FEABC(u8, u8); @@ -307,6 +309,7 @@ void sub_80FEC94(u8); void sub_80FECB8(u8); void sub_80FECE0(u8); void sub_80FEF50(u8); +bool8 sub_80FEFA4(void); void sub_80FF394(u16, u16, u16); void sub_80FF6AC(u8); void sub_80FF960(u8); diff --git a/include/decoration_inventory.h b/include/decoration_inventory.h index afc354237..e59a23008 100644 --- a/include/decoration_inventory.h +++ b/include/decoration_inventory.h @@ -2,9 +2,11 @@ #define GUARD_DECORATION_INVENTORY_H void ClearDecorationInventories(void); +s8 sub_8133F9C(u8); u8 sub_8133FE4(u8); u8 IsThereStorageSpaceForDecoration(u8); u8 sub_8134074(u8); s8 sub_81340A8(u8); +u8 sub_8134194(u8); #endif // GUARD_DECORATION_INVENTORY_H diff --git a/include/global.h b/include/global.h index 4d20ea4fc..c29797638 100644 --- a/include/global.h +++ b/include/global.h @@ -469,10 +469,20 @@ struct UnkMauvilleOldManStruct2 u8 fillerF[0x2]; }; /*size = 0x2C*/ +struct MauvilleOldManTrader +{ + u8 unk0; + u8 unk1[4]; + u8 unk5[4][11]; + u8 unk31; +}; + typedef union OldMan { struct UnkMauvilleOldManStruct oldMan1; struct UnkMauvilleOldManStruct2 oldMan2; + struct MauvilleOldManTrader trader; + u8 filler[0x40]; } OldMan; struct Unk_SB_Access_Struct1 @@ -606,7 +616,6 @@ struct SaveBlock1 /* 0x02025734 */ /*0x2D8C*/ u8 unk2D8C[4]; /*0x2D90*/ u8 filler_2D90[0x4]; /*0x2D94*/ OldMan oldMan; - /*0x2DC0*/ u8 unk_2DC0[0x14]; /*0x2DD4*/ struct EasyChatPair easyChatPairs[5]; //Dewford trend [0] and some other stuff /*0x2DFC*/ u8 filler_2DFC[0x8]; /*0x2E04*/ SB_Struct sbStruct; |