diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2018-05-04 19:15:40 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-04 19:15:40 -0700 |
| commit | 83ea8d0cd9f8141181d09718c79b8916df945752 (patch) | |
| tree | 7487b983c8205a97832831b6b6b06cf60534f65a /include | |
| parent | cdb5e9e3143b2f1086d8bd4f02a76186c164d02a (diff) | |
| parent | 58200616d55798002046e67a656f5295834455ec (diff) | |
Merge pull request #243 from PikalaxALT/trader
Port trader from Ruby
Diffstat (limited to 'include')
| -rw-r--r-- | include/constants/decorations.h | 1 | ||||
| -rw-r--r-- | include/decoration.h | 3 | ||||
| -rw-r--r-- | include/global.h | 9 | ||||
| -rw-r--r-- | include/script_menu.h | 1 | ||||
| -rw-r--r-- | include/strings.h | 6 |
5 files changed, 16 insertions, 4 deletions
diff --git a/include/constants/decorations.h b/include/constants/decorations.h index 2e3558721..b9f626d24 100644 --- a/include/constants/decorations.h +++ b/include/constants/decorations.h @@ -122,5 +122,6 @@ #define DECOR_REGIROCK_DOLL 118 #define DECOR_REGICE_DOLL 119 #define DECOR_REGISTEEL_DOLL 120 +#define NUM_DECORATIONS DECOR_REGISTEEL_DOLL #endif // GUARD_CONSTANTS_DECORATIONS_H diff --git a/include/decoration.h b/include/decoration.h index a51d9ccce..76b2f2ec4 100644 --- a/include/decoration.h +++ b/include/decoration.h @@ -70,5 +70,8 @@ void sub_8126968(void); void sub_8126AD8(u8 taskId); void sub_8127D38(u16 mapX, u16 mapY, u16 decor); void sub_8126B2C(u8 taskId); +void sub_8127208(u8 taskId); +void sub_8127250(u8 *dest, u8 decorCat); +bool8 IsSelectedDecorInThePC(void); #endif //GUARD_DECORATION_H diff --git a/include/global.h b/include/global.h index 7a01c4175..ce9a96b6f 100644 --- a/include/global.h +++ b/include/global.h @@ -461,10 +461,11 @@ struct UnkMauvilleOldManStruct2 struct MauvilleOldManTrader { - u8 unk0; - u8 unk1[4]; - u8 unk5[4][11]; - u8 unk31; + /* 0x2E28 */ u8 id; + /* 0x2E29 */ u8 unk1[4]; + /* 0x2E2D */ u8 unk5[4][11]; + /* 0x2E59 */ bool8 alreadyTraded; + /* 0x2E5A */ u8 language[4]; }; typedef union OldMan diff --git a/include/script_menu.h b/include/script_menu.h index 717eda041..810e84dcb 100644 --- a/include/script_menu.h +++ b/include/script_menu.h @@ -9,5 +9,6 @@ bool8 ScriptMenu_YesNo(u8 var1, u8 var2); bool8 ScriptMenu_MultichoiceGrid(u8 left, u8 top, u8 multichoiceId, u8 a4, u8 columnCount); bool8 ScriptMenu_ShowPokemonPic(u16 var1, u8 var2, u8 var3); bool8 (*ScriptMenu_GetPicboxWaitFunc(void))(void); +s32 convert_pixel_width_to_tile_width(s32 pixelWidth); #endif //GUARD_SCRIPT_MENU_H diff --git a/include/strings.h b/include/strings.h index d8b76a998..f61dd5319 100644 --- a/include/strings.h +++ b/include/strings.h @@ -433,6 +433,12 @@ extern const u8 gText_TooImportantToToss[]; extern const u8 gText_ConfirmTossItems[]; extern const u8 gText_MoveVar1Where[]; +extern const u8 gText_Tristan[]; +extern const u8 gText_Philip[]; +extern const u8 gText_Dennis[]; +extern const u8 gText_Roberto[]; +extern const u8 gText_FiveMarks[]; + extern const u8 gText_TotalRecordWLD[]; extern const u8 gText_PlayersBattleResults[]; extern const u8 gText_WinLoseDraw[]; |