diff --git a/asm/macros/scrcmd.inc b/asm/macros/scrcmd.inc index b286252789..55caebe46f 100644 --- a/asm/macros/scrcmd.inc +++ b/asm/macros/scrcmd.inc @@ -21,6 +21,7 @@ #include "generated/sdat.h" #include "generated/signpost_commands.h" #include "generated/signpost_types.h" +#include "generated/trainer_score_events.h" #include "generated/trainers.h" #include "constants/forms.h" #include "constants/honey_tree.h" @@ -4295,12 +4296,12 @@ .short \arg3 .endm - .macro ScrCmd_2F5 arg0, arg1, arg2, arg3 + .macro BufferNumberPaddingDigits templateArg, value, paddingMode, maxDigits .short 757 - .byte \arg0 - .long \arg1 - .byte \arg2 - .byte \arg3 + .byte \templateArg + .long \value + .byte \paddingMode + .byte \maxDigits .endm .macro ScrCmd_2F6 arg0, arg1, arg2 @@ -4417,9 +4418,9 @@ .short 777 .endm - .macro ScrCmd_30A arg0 + .macro IncrementTrainerScore scoreID .short 778 - .short \arg0 + .short \scoreID .endm .macro ScrCmd_30B diff --git a/generated/meson.build b/generated/meson.build index db86a5e17f..02ea7ca301 100644 --- a/generated/meson.build +++ b/generated/meson.build @@ -84,6 +84,7 @@ metang_generators = { 'shadow_sizes': { 'type': 'enum', 'tag': 'ShadowSize' }, 'species': { 'type': 'enum', 'tag': 'Species' }, 'species_data_params': { 'type': 'enum', 'tag': 'SpeciesDataParam' }, + 'string_padding_mode': { 'type': 'enum', 'tag': 'PaddingMode' }, 'text_banks': { 'type': 'enum', 'tag': 'TextBank' }, 'trainers': { 'type': 'enum', 'tag': 'TrainerID' }, 'trainer_classes': { 'type': 'enum', 'tag': 'TrainerClass' }, diff --git a/generated/string_padding_mode.txt b/generated/string_padding_mode.txt new file mode 100644 index 0000000000..3d255e7811 --- /dev/null +++ b/generated/string_padding_mode.txt @@ -0,0 +1,4 @@ +# Control codes for how to pad numeric strings. +PADDING_MODE_NONE # Do not pad the string. Effectively left-justification. +PADDING_MODE_SPACES # Right-justify the string, padding with spaces. +PADDING_MODE_ZEROES # Right-justify the string, padding with zeroes. \ No newline at end of file diff --git a/generated/vars_flags.txt b/generated/vars_flags.txt index 4349c3c15e..b819a05f0b 100644 --- a/generated/vars_flags.txt +++ b/generated/vars_flags.txt @@ -2453,26 +2453,27 @@ FLAG_ALT_MUSIC_ROWANS_LAB FLAG_ON_CYCLING_ROAD FLAG_ALT_MUSIC_PAL_PARK FLAG_FORCE_BIKING_IN_GATE -FLAG_VILLA_FURNITURE_UNK_00 -FLAG_VILLA_FURNITURE_UNK_01 -FLAG_VILLA_FURNITURE_UNK_02 -FLAG_VILLA_FURNITURE_UNK_03 -FLAG_VILLA_FURNITURE_UNK_04 -FLAG_VILLA_FURNITURE_UNK_05 -FLAG_VILLA_FURNITURE_UNK_06 -FLAG_VILLA_FURNITURE_UNK_07 -FLAG_VILLA_FURNITURE_UNK_08 -FLAG_VILLA_FURNITURE_UNK_09 -FLAG_VILLA_FURNITURE_UNK_10 -FLAG_VILLA_FURNITURE_UNK_11 -FLAG_VILLA_FURNITURE_UNK_12 -FLAG_VILLA_FURNITURE_UNK_13 -FLAG_VILLA_FURNITURE_UNK_14 -FLAG_VILLA_FURNITURE_UNK_15 -FLAG_VILLA_FURNITURE_UNK_16 -FLAG_VILLA_FURNITURE_UNK_17 -FLAG_VILLA_FURNITURE_UNK_18 -FLAG_VILLA_FURNITURE_UNK_19 +FLAG_VILLA_FURNITURE_START +FLAG_VILLA_FURNITURE_TABLE = FLAG_VILLA_FURNITURE_START +FLAG_VILLA_FURNITURE_BIG_SOFA +FLAG_VILLA_FURNITURE_SMALL_SOFA +FLAG_VILLA_FURNITURE_BED +FLAG_VILLA_FURNITURE_NIGHT_TABLE +FLAG_VILLA_FURNITURE_TV +FLAG_VILLA_FURNITURE_AUDIO_SYSTEM +FLAG_VILLA_FURNITURE_BOOKSHELF +FLAG_VILLA_FURNITURE_RACK +FLAG_VILLA_FURNITURE_HOUSEPLANT +FLAG_VILLA_FURNITURE_PC_DESK +FLAG_VILLA_FURNITURE_MUSIC_BOX +FLAG_VILLA_FURNITURE_POKEMON_BUST +FLAG_VILLA_FURNITURE_POKEMON_BUST_SILVER +FLAG_VILLA_FURNITURE_PIANO +FLAG_VILLA_FURNITURE_GUEST_SET +FLAG_VILLA_FURNITURE_WALL_CLOCK +FLAG_VILLA_FURNITURE_MASTERPIECE +FLAG_VILLA_FURNITURE_TEA_SET +FLAG_VILLA_FURNITURE_CHANDELIER FLAG_VILLA_VISITOR_INSIDE FLAG_VILLA_VISITOR_OUTSIDE FLAG_DISTORTION_WORLD_PUZZLE_FINISHED diff --git a/generated/villa_furnitures.txt b/generated/villa_furnitures.txt index 64bee0f5e1..09c371b2fa 100644 --- a/generated/villa_furnitures.txt +++ b/generated/villa_furnitures.txt @@ -1,21 +1,21 @@ -VILLA_FURNITURE_UNK_00 -VILLA_FURNITURE_UNK_01 -VILLA_FURNITURE_UNK_02 -VILLA_FURNITURE_UNK_03 -VILLA_FURNITURE_UNK_04 -VILLA_FURNITURE_UNK_05 -VILLA_FURNITURE_UNK_06 -VILLA_FURNITURE_UNK_07 -VILLA_FURNITURE_UNK_08 -VILLA_FURNITURE_UNK_09 -VILLA_FURNITURE_UNK_10 -VILLA_FURNITURE_UNK_11 -VILLA_FURNITURE_UNK_12 -VILLA_FURNITURE_UNK_13 -VILLA_FURNITURE_UNK_14 -VILLA_FURNITURE_UNK_15 -VILLA_FURNITURE_UNK_16 -VILLA_FURNITURE_UNK_17 -VILLA_FURNITURE_UNK_18 -VILLA_FURNITURE_UNK_19 +VILLA_FURNITURE_TABLE +VILLA_FURNITURE_BIG_SOFA +VILLA_FURNITURE_SMALL_SOFA +VILLA_FURNITURE_BED +VILLA_FURNITURE_NIGHT_TABLE +VILLA_FURNITURE_TV +VILLA_FURNITURE_AUDIO_SYSTEM +VILLA_FURNITURE_BOOKSHELF +VILLA_FURNITURE_RACK +VILLA_FURNITURE_HOUSEPLANT +VILLA_FURNITURE_PC_DESK +VILLA_FURNITURE_MUSIC_BOX +VILLA_FURNITURE_POKEMON_BUST +VILLA_FURNITURE_POKEMON_BUST_SILVER +VILLA_FURNITURE_PIANO +VILLA_FURNITURE_GUEST_SET +VILLA_FURNITURE_WALL_CLOCK +VILLA_FURNITURE_MASTERPIECE +VILLA_FURNITURE_TEA_SET +VILLA_FURNITURE_CHANDELIER VILLA_FURNITURE_MAX diff --git a/include/strbuf.h b/include/strbuf.h index e1ccc6c1a3..2399705eb2 100644 --- a/include/strbuf.h +++ b/include/strbuf.h @@ -24,19 +24,7 @@ typedef struct Strbuf { charcode_t data[1]; } Strbuf; -/** - * Control codes for how to pad numeric strings. - */ -enum PaddingMode { - /// Do not pad the string. Effectively left-justification. - PADDING_MODE_NONE, - - /// Right-justify the string, padding with spaces. - PADDING_MODE_SPACES, - - /// Right-justify the string, padding with zeroes. - PADDING_MODE_ZEROES, -}; +#include "generated/string_padding_mode.h" /** * Control codes for which charset to use when formatting a string. diff --git a/include/unk_020474B8.h b/include/unk_020474B8.h index 34424b02ca..64cb4a0b1c 100644 --- a/include/unk_020474B8.h +++ b/include/unk_020474B8.h @@ -15,7 +15,7 @@ BOOL ScrCmd_BufferTMHMMoveName(ScriptContext *ctx); BOOL ScrCmd_BufferMoveName(ScriptContext *ctx); BOOL ScrCmd_BufferNumber(ScriptContext *ctx); BOOL ScrCmd_280(ScriptContext *param0); -BOOL ScrCmd_2F5(ScriptContext *param0); +BOOL ScrCmd_BufferNumberPaddingDigits(ScriptContext *ctx); BOOL ScrCmd_BufferPartyMonNickname(ScriptContext *ctx); BOOL ScrCmd_251(ScriptContext *param0); BOOL ScrCmd_BufferPoketchAppName(ScriptContext *ctx); diff --git a/include/unk_0205DFC4.h b/include/unk_0205DFC4.h index 7c7a387080..67b3e8a679 100644 --- a/include/unk_0205DFC4.h +++ b/include/unk_0205DFC4.h @@ -6,7 +6,7 @@ #include "field_task.h" #include "savedata.h" -u16 sub_0205DFC4(u32 param0); +u16 GetNumberDigitCount(u32 number); u16 Item_IsTMHM(u16 item); u16 sub_0205E078(u16 param0, u16 param1); u16 sub_0205E0E4(u16 param0, u16 param1); diff --git a/res/field/scripts/scripts_battle_arcade.s b/res/field/scripts/scripts_battle_arcade.s index 55bd251cd3..6593491eb1 100644 --- a/res/field/scripts/scripts_battle_arcade.s +++ b/res/field/scripts/scripts_battle_arcade.s @@ -476,7 +476,7 @@ _0700: End _073C: - ScrCmd_30A 41 + IncrementTrainerScore TRAINER_SCORE_EVENT_UNK_41 Return _0742: diff --git a/res/field/scripts/scripts_battle_castle.s b/res/field/scripts/scripts_battle_castle.s index 4f12137fd7..99e48d59d9 100644 --- a/res/field/scripts/scripts_battle_castle.s +++ b/res/field/scripts/scripts_battle_castle.s @@ -471,7 +471,7 @@ _06EC: End _0728: - ScrCmd_30A 39 + IncrementTrainerScore TRAINER_SCORE_EVENT_UNK_39 Return _072E: diff --git a/res/field/scripts/scripts_battle_factory.s b/res/field/scripts/scripts_battle_factory.s index 68eb0051a5..9045f1f4af 100644 --- a/res/field/scripts/scripts_battle_factory.s +++ b/res/field/scripts/scripts_battle_factory.s @@ -428,7 +428,7 @@ _05FA: End _0636: - ScrCmd_30A 38 + IncrementTrainerScore TRAINER_SCORE_EVENT_UNK_38 Return _063C: diff --git a/res/field/scripts/scripts_battle_hall.s b/res/field/scripts/scripts_battle_hall.s index 65af1683d2..a07f15e11e 100644 --- a/res/field/scripts/scripts_battle_hall.s +++ b/res/field/scripts/scripts_battle_hall.s @@ -598,7 +598,7 @@ _08FC: End _0938: - ScrCmd_30A 40 + IncrementTrainerScore TRAINER_SCORE_EVENT_UNK_40 Return _093E: diff --git a/res/field/scripts/scripts_common.s b/res/field/scripts/scripts_common.s index 7d7689ac28..31b9c7824e 100644 --- a/res/field/scripts/scripts_common.s +++ b/res/field/scripts/scripts_common.s @@ -1713,7 +1713,7 @@ _16AA: GoToIfNe VAR_BATTLE_ARCADE_PRINT_STATE, 4, _1706 GoToIfNe VAR_BATTLE_TOWER_PRINT_STATE, 4, _1706 SetFlag FLAG_UNK_0x0089 - ScrCmd_30A 42 + IncrementTrainerScore TRAINER_SCORE_EVENT_UNK_42 GoTo _1706 End diff --git a/res/field/scripts/scripts_villa.s b/res/field/scripts/scripts_villa.s index 4feb4dd6a9..6a3a3100df 100644 --- a/res/field/scripts/scripts_villa.s +++ b/res/field/scripts/scripts_villa.s @@ -1,5 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/villa.h" +#include "generated/string_padding_mode.h" .data @@ -774,7 +775,7 @@ _0AC3: Return _0AC8: - GoToIfUnset FLAG_VILLA_FURNITURE_UNK_18, _0AB4 + GoToIfUnset FLAG_VILLA_FURNITURE_TEA_SET, _0AB4 Message 96 Return @@ -976,7 +977,7 @@ _0D03: _0D14: PlayFanfare SEQ_SE_CONFIRM LockAll - GoToIfSet FLAG_VILLA_FURNITURE_UNK_11, _0D63 + GoToIfSet FLAG_VILLA_FURNITURE_MUSIC_BOX, _0D63 Message 107 GoTo _0E5D End @@ -1105,19 +1106,19 @@ _0E65: LockAll SetVar VAR_UNK_0x40A1, 1 ShowMoney 21, 1 - Message 0 + Message Villa_Text_TheOriginalOwnersFurnitureIsGone InitLocalTextListMenu 1, 1, 0, VAR_0x8002 AddListMenuEntry 189, 0 ShowListMenu GoToIfNe VAR_0x8002, 0, _0EA7 - Call _0F7C + Call Villa_BuyFurniture CloseMessage Call _1092 ReleaseAll End _0EA7: - Message 1 + Message Villa_Text_GoAheadOrderATableFromThisOrderForm WaitABXPadPress CloseMessage HideMoney @@ -1129,12 +1130,12 @@ _0EB4: LockAll FacePlayer ShowMoney 21, 1 - Message 1 + Message Villa_Text_GoAheadOrderATableFromThisOrderForm InitLocalTextListMenu 1, 1, 0, VAR_0x8002 AddListMenuEntry 189, 0 ShowListMenu GoToIfNe VAR_0x8002, 0, _1478 - Call _0F7C + Call Villa_BuyFurniture CloseMessage Call _1092 ReleaseAll @@ -1165,28 +1166,28 @@ _0EF6: ShowListMenuSetWidth 18 Return -_0F7C: +Villa_BuyFurniture: PlayFanfare SEQ_SE_DP_REGI - CallIfEq VAR_0x8002, 0, _2079 - CallIfEq VAR_0x8002, 1, _208D - CallIfEq VAR_0x8002, 2, _20A1 - CallIfEq VAR_0x8002, 3, _20B5 - CallIfEq VAR_0x8002, 4, _20C9 - CallIfEq VAR_0x8002, 5, _20DD - CallIfEq VAR_0x8002, 6, _20F1 - CallIfEq VAR_0x8002, 7, _2105 - CallIfEq VAR_0x8002, 8, _2119 - CallIfEq VAR_0x8002, 9, _212D - CallIfEq VAR_0x8002, 10, _2141 - CallIfEq VAR_0x8002, 11, _2155 - CallIfEq VAR_0x8002, 12, _2169 - CallIfEq VAR_0x8002, 13, _217D - CallIfEq VAR_0x8002, 14, _2191 - CallIfEq VAR_0x8002, 15, _21A5 - CallIfEq VAR_0x8002, 16, _21B9 - CallIfEq VAR_0x8002, 17, _21CD - CallIfEq VAR_0x8002, 18, _21E1 - CallIfEq VAR_0x8002, 19, _21F5 + CallIfEq VAR_0x8002, 0, Villa_BuyFurniture_Table + CallIfEq VAR_0x8002, 1, Villa_BuyFurniture_BigSofa + CallIfEq VAR_0x8002, 2, Villa_BuyFurniture_SmallSofa + CallIfEq VAR_0x8002, 3, Villa_BuyFurniture_Bed + CallIfEq VAR_0x8002, 4, Villa_BuyFurniture_NightTable + CallIfEq VAR_0x8002, 5, Villa_BuyFurniture_TV + CallIfEq VAR_0x8002, 6, Villa_BuyFurniture_AudioSystem + CallIfEq VAR_0x8002, 7, Villa_BuyFurniture_Bookshelf + CallIfEq VAR_0x8002, 8, Villa_BuyFurniture_Rack + CallIfEq VAR_0x8002, 9, Villa_BuyFurniture_Houseplant + CallIfEq VAR_0x8002, 10, Villa_BuyFurniture_PCDesk + CallIfEq VAR_0x8002, 11, Villa_BuyFurniture_MusicBox + CallIfEq VAR_0x8002, 12, Villa_BuyFurniture_PokemonBust + CallIfEq VAR_0x8002, 13, Villa_BuyFurniture_PokemonBustSilver + CallIfEq VAR_0x8002, 14, Villa_BuyFurniture_Piano + CallIfEq VAR_0x8002, 15, Villa_BuyFurniture_GuestSet + CallIfEq VAR_0x8002, 16, Villa_BuyFurniture_WallClock + CallIfEq VAR_0x8002, 17, Villa_BuyFurniture_Masterpiece + CallIfEq VAR_0x8002, 18, Villa_BuyFurniture_TeaSet + CallIfEq VAR_0x8002, 19, Villa_BuyFurniture_Chandelier UpdateMoneyDisplay WaitFanfare SEQ_SE_DP_REGI HideMoney @@ -1449,7 +1450,7 @@ _1468: EndMovement _1478: - Message 1 + Message Villa_Text_GoAheadOrderATableFromThisOrderForm WaitABXPadPress CloseMessage HideMoney @@ -1457,7 +1458,7 @@ _1478: End _1485: - Message 3 + Message Villa_Text_ThankYouForWaitingImDeliveringYourOrder_WeHopeYoullKeepOrdering CloseMessage FadeScreen 6, 1, 0, 0 WaitFadeScreen @@ -1508,9 +1509,9 @@ _14FC: .byte 0 _1514: - Call _18F8 - GoToIfEq VAR_RESULT, 1, _155E - Message 7 + Call Villa_CheckIfHasAllFurniture + GoToIfEq VAR_RESULT, TRUE, Villa_DeliveryGuy_HasAllFurniture + Message Villa_Text_ThankYouForWaitingImDeliveringYourOrder GoTo _1532 End @@ -1525,9 +1526,9 @@ _1532: Call _15B0 Return -_155E: - ScrCmd_30A 49 - Message 8 +Villa_DeliveryGuy_HasAllFurniture: + IncrementTrainerScore TRAINER_SCORE_EVENT_UNK_49 + Message Villa_Text_ThankYouForWaitingImDeliveringYourOrder_AlsoAndIHateToSayThisBut GoTo _1532 End @@ -1551,7 +1552,7 @@ _15F3: LockAll ApplyMovement 14, _1614 WaitMovement - Message 2 + Message Villa_Text_WhoaWhoaDontGoYet CloseMessage ApplyMovement LOCALID_PLAYER, _161C WaitMovement @@ -1574,13 +1575,13 @@ _1624: ShowMoney 21, 1 BufferPlayerName 1 Message 119 - Call _18F8 - GoToIfEq VAR_RESULT, 1, _1651 + Call Villa_CheckIfHasAllFurniture + GoToIfEq VAR_RESULT, TRUE, _1651 GoTo _165C End _1651: - Message 124 + Message Villa_Text_ThisIsTheListOfPurchasedFurniture GoTo _1667 End @@ -1613,32 +1614,32 @@ _1667: CallIfEq VAR_0x8002, 18, _1F8F CallIfEq VAR_0x8002, 19, _1F9C GoToIfEq VAR_0x8002, -2, _18DE - GoToIfEq VAR_0x8003, 0, _18C8 + GoToIfEq VAR_0x8003, FALSE, _18C8 Message 121 ShowYesNoMenu VAR_RESULT GoToIfEq VAR_RESULT, MENU_NO, _18DE - CallIfEq VAR_0x8002, 0, _1FB1 - CallIfEq VAR_0x8002, 1, _1FBB - CallIfEq VAR_0x8002, 2, _1FC5 - CallIfEq VAR_0x8002, 3, _1FCF - CallIfEq VAR_0x8002, 4, _1FD9 - CallIfEq VAR_0x8002, 5, _1FE3 - CallIfEq VAR_0x8002, 6, _1FED - CallIfEq VAR_0x8002, 7, _1FF7 - CallIfEq VAR_0x8002, 8, _2001 - CallIfEq VAR_0x8002, 9, _200B - CallIfEq VAR_0x8002, 10, _2015 - CallIfEq VAR_0x8002, 11, _201F - CallIfEq VAR_0x8002, 12, _2029 - CallIfEq VAR_0x8002, 13, _2033 - CallIfEq VAR_0x8002, 14, _203D - CallIfEq VAR_0x8002, 15, _2047 - CallIfEq VAR_0x8002, 16, _2051 - CallIfEq VAR_0x8002, 17, _205B - CallIfEq VAR_0x8002, 18, _2065 - CallIfEq VAR_0x8002, 19, _206F - GoToIfEq VAR_0x8003, 0, _18D3 - Call _0F7C + CallIfEq VAR_0x8002, 0, Villa_CheckMoney_Table + CallIfEq VAR_0x8002, 1, Villa_CheckMoney_BigSofa + CallIfEq VAR_0x8002, 2, Villa_CheckMoney_SmallSofa + CallIfEq VAR_0x8002, 3, Villa_CheckMoney_Bed + CallIfEq VAR_0x8002, 4, Villa_CheckMoney_NightTable + CallIfEq VAR_0x8002, 5, Villa_CheckMoney_TV + CallIfEq VAR_0x8002, 6, Villa_CheckMoney_AudioSystem + CallIfEq VAR_0x8002, 7, Villa_CheckMoney_Bookshelf + CallIfEq VAR_0x8002, 8, Villa_CheckMoney_Rack + CallIfEq VAR_0x8002, 9, Villa_CheckMoney_Houseplant + CallIfEq VAR_0x8002, 10, Villa_CheckMoney_PCDesk + CallIfEq VAR_0x8002, 11, Villa_CheckMoney_MusicBox + CallIfEq VAR_0x8002, 12, Villa_CheckMoney_PokemonBust + CallIfEq VAR_0x8002, 13, Villa_CheckMoney_PokemonBustSilver + CallIfEq VAR_0x8002, 14, Villa_CheckMoney_Piano + CallIfEq VAR_0x8002, 15, Villa_CheckMoney_GuestSet + CallIfEq VAR_0x8002, 16, Villa_CheckMoney_WallClock + CallIfEq VAR_0x8002, 17, Villa_CheckMoney_Masterpiece + CallIfEq VAR_0x8002, 18, Villa_CheckMoney_TeaSet + CallIfEq VAR_0x8002, 19, Villa_CheckMoney_Chandelier + GoToIfEq VAR_0x8003, FALSE, _18D3 + Call Villa_BuyFurniture CloseMessage Call _1092 ReleaseAll @@ -1669,168 +1670,168 @@ _18F0: ReleaseAll End -_18F8: - GoToIfUnset FLAG_VILLA_FURNITURE_UNK_00, _19DC - GoToIfUnset FLAG_VILLA_FURNITURE_UNK_01, _19DC - GoToIfUnset FLAG_VILLA_FURNITURE_UNK_02, _19DC - GoToIfUnset FLAG_VILLA_FURNITURE_UNK_03, _19DC - GoToIfUnset FLAG_VILLA_FURNITURE_UNK_04, _19DC - GoToIfUnset FLAG_VILLA_FURNITURE_UNK_05, _19DC - GoToIfUnset FLAG_VILLA_FURNITURE_UNK_06, _19DC - GoToIfUnset FLAG_VILLA_FURNITURE_UNK_07, _19DC - GoToIfUnset FLAG_VILLA_FURNITURE_UNK_08, _19DC - GoToIfUnset FLAG_VILLA_FURNITURE_UNK_09, _19DC - GoToIfUnset FLAG_VILLA_FURNITURE_UNK_10, _19DC - GoToIfUnset FLAG_VILLA_FURNITURE_UNK_11, _19DC - GoToIfUnset FLAG_VILLA_FURNITURE_UNK_12, _19DC - GoToIfUnset FLAG_VILLA_FURNITURE_UNK_13, _19DC - GoToIfUnset FLAG_VILLA_FURNITURE_UNK_14, _19DC - GoToIfUnset FLAG_VILLA_FURNITURE_UNK_15, _19DC - GoToIfUnset FLAG_VILLA_FURNITURE_UNK_16, _19DC - GoToIfUnset FLAG_VILLA_FURNITURE_UNK_17, _19DC - GoToIfUnset FLAG_VILLA_FURNITURE_UNK_18, _19DC - GoToIfUnset FLAG_VILLA_FURNITURE_UNK_19, _19DC - SetVar VAR_RESULT, 1 +Villa_CheckIfHasAllFurniture: + GoToIfUnset FLAG_VILLA_FURNITURE_TABLE, Villa_DoesntHaveAllFurniture + GoToIfUnset FLAG_VILLA_FURNITURE_BIG_SOFA, Villa_DoesntHaveAllFurniture + GoToIfUnset FLAG_VILLA_FURNITURE_SMALL_SOFA, Villa_DoesntHaveAllFurniture + GoToIfUnset FLAG_VILLA_FURNITURE_BED, Villa_DoesntHaveAllFurniture + GoToIfUnset FLAG_VILLA_FURNITURE_NIGHT_TABLE, Villa_DoesntHaveAllFurniture + GoToIfUnset FLAG_VILLA_FURNITURE_TV, Villa_DoesntHaveAllFurniture + GoToIfUnset FLAG_VILLA_FURNITURE_AUDIO_SYSTEM, Villa_DoesntHaveAllFurniture + GoToIfUnset FLAG_VILLA_FURNITURE_BOOKSHELF, Villa_DoesntHaveAllFurniture + GoToIfUnset FLAG_VILLA_FURNITURE_RACK, Villa_DoesntHaveAllFurniture + GoToIfUnset FLAG_VILLA_FURNITURE_HOUSEPLANT, Villa_DoesntHaveAllFurniture + GoToIfUnset FLAG_VILLA_FURNITURE_PC_DESK, Villa_DoesntHaveAllFurniture + GoToIfUnset FLAG_VILLA_FURNITURE_MUSIC_BOX, Villa_DoesntHaveAllFurniture + GoToIfUnset FLAG_VILLA_FURNITURE_POKEMON_BUST, Villa_DoesntHaveAllFurniture + GoToIfUnset FLAG_VILLA_FURNITURE_POKEMON_BUST_SILVER, Villa_DoesntHaveAllFurniture + GoToIfUnset FLAG_VILLA_FURNITURE_PIANO, Villa_DoesntHaveAllFurniture + GoToIfUnset FLAG_VILLA_FURNITURE_GUEST_SET, Villa_DoesntHaveAllFurniture + GoToIfUnset FLAG_VILLA_FURNITURE_WALL_CLOCK, Villa_DoesntHaveAllFurniture + GoToIfUnset FLAG_VILLA_FURNITURE_MASTERPIECE, Villa_DoesntHaveAllFurniture + GoToIfUnset FLAG_VILLA_FURNITURE_TEA_SET, Villa_DoesntHaveAllFurniture + GoToIfUnset FLAG_VILLA_FURNITURE_CHANDELIER, Villa_DoesntHaveAllFurniture + SetVar VAR_RESULT, TRUE Return -_19DC: - SetVar VAR_RESULT, 0 +Villa_DoesntHaveAllFurniture: + SetVar VAR_RESULT, FALSE Return _19E4: - ScrCmd_2F5 0, 0, 1, 6 - CallIfUnset FLAG_VILLA_FURNITURE_UNK_00, _1D15 - CallIfSet FLAG_VILLA_FURNITURE_UNK_00, _1D1F + BufferNumberPaddingDigits 0, 0, PADDING_MODE_SPACES, 6 + CallIfUnset FLAG_VILLA_FURNITURE_TABLE, _1D15 + CallIfSet FLAG_VILLA_FURNITURE_TABLE, _1D1F Return _1A05: - ScrCmd_2F5 0, 120000, 1, 6 - CallIfUnset FLAG_VILLA_FURNITURE_UNK_01, _1D29 - CallIfSet FLAG_VILLA_FURNITURE_UNK_01, _1D33 + BufferNumberPaddingDigits 0, 120000, PADDING_MODE_SPACES, 6 + CallIfUnset FLAG_VILLA_FURNITURE_BIG_SOFA, _1D29 + CallIfSet FLAG_VILLA_FURNITURE_BIG_SOFA, _1D33 Return _1A26: - ScrCmd_2F5 0, 90000, 1, 6 - CallIfUnset FLAG_VILLA_FURNITURE_UNK_02, _1D3D - CallIfSet FLAG_VILLA_FURNITURE_UNK_02, _1D47 + BufferNumberPaddingDigits 0, 90000, PADDING_MODE_SPACES, 6 + CallIfUnset FLAG_VILLA_FURNITURE_SMALL_SOFA, _1D3D + CallIfSet FLAG_VILLA_FURNITURE_SMALL_SOFA, _1D47 Return _1A47: - ScrCmd_2F5 0, 187000, 1, 6 - CallIfUnset FLAG_VILLA_FURNITURE_UNK_03, _1D51 - CallIfSet FLAG_VILLA_FURNITURE_UNK_03, _1D5B + BufferNumberPaddingDigits 0, 187000, PADDING_MODE_SPACES, 6 + CallIfUnset FLAG_VILLA_FURNITURE_BED, _1D51 + CallIfSet FLAG_VILLA_FURNITURE_BED, _1D5B Return _1A68: - ScrCmd_2F5 0, 58000, 1, 6 - CallIfUnset FLAG_VILLA_FURNITURE_UNK_04, _1D65 - CallIfSet FLAG_VILLA_FURNITURE_UNK_04, _1D6F + BufferNumberPaddingDigits 0, 58000, PADDING_MODE_SPACES, 6 + CallIfUnset FLAG_VILLA_FURNITURE_NIGHT_TABLE, _1D65 + CallIfSet FLAG_VILLA_FURNITURE_NIGHT_TABLE, _1D6F Return _1A89: - ScrCmd_2F5 0, 220000, 1, 6 - CallIfUnset FLAG_VILLA_FURNITURE_UNK_05, _1D79 - CallIfSet FLAG_VILLA_FURNITURE_UNK_05, _1D83 + BufferNumberPaddingDigits 0, 220000, PADDING_MODE_SPACES, 6 + CallIfUnset FLAG_VILLA_FURNITURE_TV, _1D79 + CallIfSet FLAG_VILLA_FURNITURE_TV, _1D83 Return _1AAA: - ScrCmd_2F5 0, 160000, 1, 6 - CallIfUnset FLAG_VILLA_FURNITURE_UNK_06, _1D8D - CallIfSet FLAG_VILLA_FURNITURE_UNK_06, _1D97 + BufferNumberPaddingDigits 0, 160000, PADDING_MODE_SPACES, 6 + CallIfUnset FLAG_VILLA_FURNITURE_AUDIO_SYSTEM, _1D8D + CallIfSet FLAG_VILLA_FURNITURE_AUDIO_SYSTEM, _1D97 Return _1ACB: - ScrCmd_2F5 0, 150000, 1, 6 - CallIfUnset FLAG_VILLA_FURNITURE_UNK_07, _1DA1 - CallIfSet FLAG_VILLA_FURNITURE_UNK_07, _1DAB + BufferNumberPaddingDigits 0, 150000, PADDING_MODE_SPACES, 6 + CallIfUnset FLAG_VILLA_FURNITURE_BOOKSHELF, _1DA1 + CallIfSet FLAG_VILLA_FURNITURE_BOOKSHELF, _1DAB Return _1AEC: - ScrCmd_2F5 0, 127000, 1, 6 - CallIfUnset FLAG_VILLA_FURNITURE_UNK_08, _1DB5 - CallIfSet FLAG_VILLA_FURNITURE_UNK_08, _1DBF + BufferNumberPaddingDigits 0, 127000, PADDING_MODE_SPACES, 6 + CallIfUnset FLAG_VILLA_FURNITURE_RACK, _1DB5 + CallIfSet FLAG_VILLA_FURNITURE_RACK, _1DBF Return _1B0D: - ScrCmd_2F5 0, 120000, 1, 6 - CallIfUnset FLAG_VILLA_FURNITURE_UNK_09, _1DC9 - CallIfSet FLAG_VILLA_FURNITURE_UNK_09, _1DD3 + BufferNumberPaddingDigits 0, 120000, PADDING_MODE_SPACES, 6 + CallIfUnset FLAG_VILLA_FURNITURE_HOUSEPLANT, _1DC9 + CallIfSet FLAG_VILLA_FURNITURE_HOUSEPLANT, _1DD3 Return _1B2E: - ScrCmd_2F5 0, 168000, 1, 6 - CallIfUnset FLAG_VILLA_FURNITURE_UNK_10, _1DDD - CallIfSet FLAG_VILLA_FURNITURE_UNK_10, _1DE7 + BufferNumberPaddingDigits 0, 168000, PADDING_MODE_SPACES, 6 + CallIfUnset FLAG_VILLA_FURNITURE_PC_DESK, _1DDD + CallIfSet FLAG_VILLA_FURNITURE_PC_DESK, _1DE7 Return _1B4F: - GoToIfUnset FLAG_VILLA_FURNITURE_UNK_08, _1D13 - ScrCmd_2F5 0, 25300, 1, 6 - CallIfUnset FLAG_VILLA_FURNITURE_UNK_11, _1DF1 - CallIfSet FLAG_VILLA_FURNITURE_UNK_11, _1DFB + GoToIfUnset FLAG_VILLA_FURNITURE_RACK, _1D13 + BufferNumberPaddingDigits 0, 25300, PADDING_MODE_SPACES, 6 + CallIfUnset FLAG_VILLA_FURNITURE_MUSIC_BOX, _1DF1 + CallIfSet FLAG_VILLA_FURNITURE_MUSIC_BOX, _1DFB Return _1B7B: ScrCmd_30F 13, VAR_RESULT GoToIfEq VAR_RESULT, 0, _1D13 - ScrCmd_2F5 0, 150000, 1, 6 - CallIfUnset FLAG_VILLA_FURNITURE_UNK_12, _1E05 - CallIfSet FLAG_VILLA_FURNITURE_UNK_12, _1E0F + BufferNumberPaddingDigits 0, 150000, PADDING_MODE_SPACES, 6 + CallIfUnset FLAG_VILLA_FURNITURE_POKEMON_BUST, _1E05 + CallIfSet FLAG_VILLA_FURNITURE_POKEMON_BUST, _1E0F Return _1BAF: ScrCmd_30F 14, VAR_RESULT GoToIfEq VAR_RESULT, 0, _1D13 - ScrCmd_2F5 0, 150000, 1, 6 - CallIfUnset FLAG_VILLA_FURNITURE_UNK_13, _1E19 - CallIfSet FLAG_VILLA_FURNITURE_UNK_13, _1E23 + BufferNumberPaddingDigits 0, 150000, PADDING_MODE_SPACES, 6 + CallIfUnset FLAG_VILLA_FURNITURE_POKEMON_BUST_SILVER, _1E19 + CallIfSet FLAG_VILLA_FURNITURE_POKEMON_BUST_SILVER, _1E23 Return _1BE3: ScrCmd_30F 15, VAR_RESULT GoToIfEq VAR_RESULT, 0, _1D13 - ScrCmd_2F5 0, 146700, 1, 6 - CallIfUnset FLAG_VILLA_FURNITURE_UNK_14, _1E2D - CallIfSet FLAG_VILLA_FURNITURE_UNK_14, _1E37 + BufferNumberPaddingDigits 0, 146700, PADDING_MODE_SPACES, 6 + CallIfUnset FLAG_VILLA_FURNITURE_PIANO, _1E2D + CallIfSet FLAG_VILLA_FURNITURE_PIANO, _1E37 Return _1C17: ScrCmd_30F 16, VAR_RESULT GoToIfEq VAR_RESULT, 0, _1D13 - ScrCmd_2F5 0, 208000, 1, 6 - CallIfUnset FLAG_VILLA_FURNITURE_UNK_15, _1E41 - CallIfSet FLAG_VILLA_FURNITURE_UNK_15, _1E4B + BufferNumberPaddingDigits 0, 208000, PADDING_MODE_SPACES, 6 + CallIfUnset FLAG_VILLA_FURNITURE_GUEST_SET, _1E41 + CallIfSet FLAG_VILLA_FURNITURE_GUEST_SET, _1E4B Return _1C4B: ScrCmd_30F 17, VAR_RESULT GoToIfEq VAR_RESULT, 0, _1D13 - ScrCmd_2F5 0, 52000, 1, 6 - CallIfUnset FLAG_VILLA_FURNITURE_UNK_16, _1E55 - CallIfSet FLAG_VILLA_FURNITURE_UNK_16, _1E5F + BufferNumberPaddingDigits 0, 52000, PADDING_MODE_SPACES, 6 + CallIfUnset FLAG_VILLA_FURNITURE_WALL_CLOCK, _1E55 + CallIfSet FLAG_VILLA_FURNITURE_WALL_CLOCK, _1E5F Return _1C7F: ScrCmd_30F 18, VAR_RESULT GoToIfEq VAR_RESULT, 0, _1D13 - ScrCmd_2F5 0, 140000, 1, 6 - CallIfUnset FLAG_VILLA_FURNITURE_UNK_17, _1E69 - CallIfSet FLAG_VILLA_FURNITURE_UNK_17, _1E73 + BufferNumberPaddingDigits 0, 140000, PADDING_MODE_SPACES, 6 + CallIfUnset FLAG_VILLA_FURNITURE_MASTERPIECE, _1E69 + CallIfSet FLAG_VILLA_FURNITURE_MASTERPIECE, _1E73 Return _1CB3: - GoToIfUnset FLAG_VILLA_FURNITURE_UNK_15, _1D13 - ScrCmd_2F5 0, 108000, 1, 6 - CallIfUnset FLAG_VILLA_FURNITURE_UNK_18, _1E7D - CallIfSet FLAG_VILLA_FURNITURE_UNK_18, _1E87 + GoToIfUnset FLAG_VILLA_FURNITURE_GUEST_SET, _1D13 + BufferNumberPaddingDigits 0, 108000, PADDING_MODE_SPACES, 6 + CallIfUnset FLAG_VILLA_FURNITURE_TEA_SET, _1E7D + CallIfSet FLAG_VILLA_FURNITURE_TEA_SET, _1E87 Return _1CDF: ScrCmd_30F 20, VAR_RESULT GoToIfEq VAR_RESULT, 0, _1D13 - ScrCmd_2F5 0, 120000, 1, 6 - CallIfUnset FLAG_VILLA_FURNITURE_UNK_19, _1E91 - CallIfSet FLAG_VILLA_FURNITURE_UNK_19, _1E9B + BufferNumberPaddingDigits 0, 120000, PADDING_MODE_SPACES, 6 + CallIfUnset FLAG_VILLA_FURNITURE_CHANDELIER, _1E91 + CallIfSet FLAG_VILLA_FURNITURE_CHANDELIER, _1E9B Return _1D13: @@ -1997,287 +1998,287 @@ _1E9B: Return _1EA5: - GoToIfSet FLAG_VILLA_FURNITURE_UNK_00, _1FA9 + GoToIfSet FLAG_VILLA_FURNITURE_TABLE, _1FA9 Return _1EB2: - GoToIfSet FLAG_VILLA_FURNITURE_UNK_01, _1FA9 + GoToIfSet FLAG_VILLA_FURNITURE_BIG_SOFA, _1FA9 Return _1EBF: - GoToIfSet FLAG_VILLA_FURNITURE_UNK_02, _1FA9 + GoToIfSet FLAG_VILLA_FURNITURE_SMALL_SOFA, _1FA9 Return _1ECC: - GoToIfSet FLAG_VILLA_FURNITURE_UNK_03, _1FA9 + GoToIfSet FLAG_VILLA_FURNITURE_BED, _1FA9 Return _1ED9: - GoToIfSet FLAG_VILLA_FURNITURE_UNK_04, _1FA9 + GoToIfSet FLAG_VILLA_FURNITURE_NIGHT_TABLE, _1FA9 Return _1EE6: - GoToIfSet FLAG_VILLA_FURNITURE_UNK_05, _1FA9 + GoToIfSet FLAG_VILLA_FURNITURE_TV, _1FA9 Return _1EF3: - GoToIfSet FLAG_VILLA_FURNITURE_UNK_06, _1FA9 + GoToIfSet FLAG_VILLA_FURNITURE_AUDIO_SYSTEM, _1FA9 Return _1F00: - GoToIfSet FLAG_VILLA_FURNITURE_UNK_07, _1FA9 + GoToIfSet FLAG_VILLA_FURNITURE_BOOKSHELF, _1FA9 Return _1F0D: - GoToIfSet FLAG_VILLA_FURNITURE_UNK_08, _1FA9 + GoToIfSet FLAG_VILLA_FURNITURE_RACK, _1FA9 Return _1F1A: - GoToIfSet FLAG_VILLA_FURNITURE_UNK_09, _1FA9 + GoToIfSet FLAG_VILLA_FURNITURE_HOUSEPLANT, _1FA9 Return _1F27: - GoToIfSet FLAG_VILLA_FURNITURE_UNK_10, _1FA9 + GoToIfSet FLAG_VILLA_FURNITURE_PC_DESK, _1FA9 Return _1F34: - GoToIfSet FLAG_VILLA_FURNITURE_UNK_11, _1FA9 + GoToIfSet FLAG_VILLA_FURNITURE_MUSIC_BOX, _1FA9 Return _1F41: - GoToIfSet FLAG_VILLA_FURNITURE_UNK_12, _1FA9 + GoToIfSet FLAG_VILLA_FURNITURE_POKEMON_BUST, _1FA9 Return _1F4E: - GoToIfSet FLAG_VILLA_FURNITURE_UNK_13, _1FA9 + GoToIfSet FLAG_VILLA_FURNITURE_POKEMON_BUST_SILVER, _1FA9 Return _1F5B: - GoToIfSet FLAG_VILLA_FURNITURE_UNK_14, _1FA9 + GoToIfSet FLAG_VILLA_FURNITURE_PIANO, _1FA9 Return _1F68: - GoToIfSet FLAG_VILLA_FURNITURE_UNK_15, _1FA9 + GoToIfSet FLAG_VILLA_FURNITURE_GUEST_SET, _1FA9 Return _1F75: - GoToIfSet FLAG_VILLA_FURNITURE_UNK_16, _1FA9 + GoToIfSet FLAG_VILLA_FURNITURE_WALL_CLOCK, _1FA9 Return _1F82: - GoToIfSet FLAG_VILLA_FURNITURE_UNK_17, _1FA9 + GoToIfSet FLAG_VILLA_FURNITURE_MASTERPIECE, _1FA9 Return _1F8F: - GoToIfSet FLAG_VILLA_FURNITURE_UNK_18, _1FA9 + GoToIfSet FLAG_VILLA_FURNITURE_TEA_SET, _1FA9 Return _1F9C: - GoToIfSet FLAG_VILLA_FURNITURE_UNK_19, _1FA9 + GoToIfSet FLAG_VILLA_FURNITURE_CHANDELIER, _1FA9 Return _1FA9: SetVar VAR_0x8003, 0 Return -_1FB1: +Villa_CheckMoney_Table: CheckMoney VAR_0x8003, 0 Return -_1FBB: +Villa_CheckMoney_BigSofa: CheckMoney VAR_0x8003, 120000 Return -_1FC5: +Villa_CheckMoney_SmallSofa: CheckMoney VAR_0x8003, 90000 Return -_1FCF: +Villa_CheckMoney_Bed: CheckMoney VAR_0x8003, 187000 Return -_1FD9: +Villa_CheckMoney_NightTable: CheckMoney VAR_0x8003, 58000 Return -_1FE3: +Villa_CheckMoney_TV: CheckMoney VAR_0x8003, 220000 Return -_1FED: +Villa_CheckMoney_AudioSystem: CheckMoney VAR_0x8003, 160000 Return -_1FF7: +Villa_CheckMoney_Bookshelf: CheckMoney VAR_0x8003, 150000 Return -_2001: +Villa_CheckMoney_Rack: CheckMoney VAR_0x8003, 127000 Return -_200B: +Villa_CheckMoney_Houseplant: CheckMoney VAR_0x8003, 120000 Return -_2015: +Villa_CheckMoney_PCDesk: CheckMoney VAR_0x8003, 168000 Return -_201F: +Villa_CheckMoney_MusicBox: CheckMoney VAR_0x8003, 25300 Return -_2029: +Villa_CheckMoney_PokemonBust: CheckMoney VAR_0x8003, 150000 Return -_2033: +Villa_CheckMoney_PokemonBustSilver: CheckMoney VAR_0x8003, 150000 Return -_203D: +Villa_CheckMoney_Piano: CheckMoney VAR_0x8003, 146700 Return -_2047: +Villa_CheckMoney_GuestSet: CheckMoney VAR_0x8003, 208000 Return -_2051: +Villa_CheckMoney_WallClock: CheckMoney VAR_0x8003, 52000 Return -_205B: +Villa_CheckMoney_Masterpiece: CheckMoney VAR_0x8003, 140000 Return -_2065: +Villa_CheckMoney_TeaSet: CheckMoney VAR_0x8003, 108000 Return -_206F: +Villa_CheckMoney_Chandelier: CheckMoney VAR_0x8003, 120000 Return -_2079: +Villa_BuyFurniture_Table: AddToGameRecordBigValue RECORD_MONEY_SPENT, 0 RemoveMoney 0 - SetFlag FLAG_VILLA_FURNITURE_UNK_00 + SetFlag FLAG_VILLA_FURNITURE_TABLE Return -_208D: +Villa_BuyFurniture_BigSofa: AddToGameRecordBigValue RECORD_MONEY_SPENT, 120000 RemoveMoney 120000 - SetFlag FLAG_VILLA_FURNITURE_UNK_01 + SetFlag FLAG_VILLA_FURNITURE_BIG_SOFA Return -_20A1: +Villa_BuyFurniture_SmallSofa: AddToGameRecordBigValue RECORD_MONEY_SPENT, 90000 RemoveMoney 90000 - SetFlag FLAG_VILLA_FURNITURE_UNK_02 + SetFlag FLAG_VILLA_FURNITURE_SMALL_SOFA Return -_20B5: +Villa_BuyFurniture_Bed: AddToGameRecordBigValue RECORD_MONEY_SPENT, 187000 RemoveMoney 187000 - SetFlag FLAG_VILLA_FURNITURE_UNK_03 + SetFlag FLAG_VILLA_FURNITURE_BED Return -_20C9: +Villa_BuyFurniture_NightTable: AddToGameRecordBigValue RECORD_MONEY_SPENT, 58000 RemoveMoney 58000 - SetFlag FLAG_VILLA_FURNITURE_UNK_04 + SetFlag FLAG_VILLA_FURNITURE_NIGHT_TABLE Return -_20DD: +Villa_BuyFurniture_TV: AddToGameRecordBigValue RECORD_MONEY_SPENT, 220000 RemoveMoney 220000 - SetFlag FLAG_VILLA_FURNITURE_UNK_05 + SetFlag FLAG_VILLA_FURNITURE_TV Return -_20F1: +Villa_BuyFurniture_AudioSystem: AddToGameRecordBigValue RECORD_MONEY_SPENT, 160000 RemoveMoney 160000 - SetFlag FLAG_VILLA_FURNITURE_UNK_06 + SetFlag FLAG_VILLA_FURNITURE_AUDIO_SYSTEM Return -_2105: +Villa_BuyFurniture_Bookshelf: AddToGameRecordBigValue RECORD_MONEY_SPENT, 150000 RemoveMoney 150000 - SetFlag FLAG_VILLA_FURNITURE_UNK_07 + SetFlag FLAG_VILLA_FURNITURE_BOOKSHELF Return -_2119: +Villa_BuyFurniture_Rack: AddToGameRecordBigValue RECORD_MONEY_SPENT, 127000 RemoveMoney 127000 - SetFlag FLAG_VILLA_FURNITURE_UNK_08 + SetFlag FLAG_VILLA_FURNITURE_RACK Return -_212D: +Villa_BuyFurniture_Houseplant: AddToGameRecordBigValue RECORD_MONEY_SPENT, 120000 RemoveMoney 120000 - SetFlag FLAG_VILLA_FURNITURE_UNK_09 + SetFlag FLAG_VILLA_FURNITURE_HOUSEPLANT Return -_2141: +Villa_BuyFurniture_PCDesk: AddToGameRecordBigValue RECORD_MONEY_SPENT, 168000 RemoveMoney 168000 - SetFlag FLAG_VILLA_FURNITURE_UNK_10 + SetFlag FLAG_VILLA_FURNITURE_PC_DESK Return -_2155: +Villa_BuyFurniture_MusicBox: AddToGameRecordBigValue RECORD_MONEY_SPENT, 25300 RemoveMoney 25300 - SetFlag FLAG_VILLA_FURNITURE_UNK_11 + SetFlag FLAG_VILLA_FURNITURE_MUSIC_BOX Return -_2169: +Villa_BuyFurniture_PokemonBust: AddToGameRecordBigValue RECORD_MONEY_SPENT, 150000 RemoveMoney 150000 - SetFlag FLAG_VILLA_FURNITURE_UNK_12 + SetFlag FLAG_VILLA_FURNITURE_POKEMON_BUST Return -_217D: +Villa_BuyFurniture_PokemonBustSilver: AddToGameRecordBigValue RECORD_MONEY_SPENT, 150000 RemoveMoney 150000 - SetFlag FLAG_VILLA_FURNITURE_UNK_13 + SetFlag FLAG_VILLA_FURNITURE_POKEMON_BUST_SILVER Return -_2191: +Villa_BuyFurniture_Piano: AddToGameRecordBigValue RECORD_MONEY_SPENT, 146700 RemoveMoney 146700 - SetFlag FLAG_VILLA_FURNITURE_UNK_14 + SetFlag FLAG_VILLA_FURNITURE_PIANO Return -_21A5: +Villa_BuyFurniture_GuestSet: AddToGameRecordBigValue RECORD_MONEY_SPENT, 208000 RemoveMoney 208000 - SetFlag FLAG_VILLA_FURNITURE_UNK_15 + SetFlag FLAG_VILLA_FURNITURE_GUEST_SET Return -_21B9: +Villa_BuyFurniture_WallClock: AddToGameRecordBigValue RECORD_MONEY_SPENT, 52000 RemoveMoney 52000 - SetFlag FLAG_VILLA_FURNITURE_UNK_16 + SetFlag FLAG_VILLA_FURNITURE_WALL_CLOCK Return -_21CD: +Villa_BuyFurniture_Masterpiece: AddToGameRecordBigValue RECORD_MONEY_SPENT, 140000 RemoveMoney 140000 - SetFlag FLAG_VILLA_FURNITURE_UNK_17 + SetFlag FLAG_VILLA_FURNITURE_MASTERPIECE Return -_21E1: +Villa_BuyFurniture_TeaSet: AddToGameRecordBigValue RECORD_MONEY_SPENT, 108000 RemoveMoney 108000 - SetFlag FLAG_VILLA_FURNITURE_UNK_18 + SetFlag FLAG_VILLA_FURNITURE_TEA_SET Return -_21F5: +Villa_BuyFurniture_Chandelier: AddToGameRecordBigValue RECORD_MONEY_SPENT, 120000 RemoveMoney 120000 - SetFlag FLAG_VILLA_FURNITURE_UNK_19 + SetFlag FLAG_VILLA_FURNITURE_CHANDELIER Return _2209: diff --git a/res/text/villa.gmm b/res/text/villa.gmm index 4f5384986f..25a8e9ee46 100644 --- a/res/text/villa.gmm +++ b/res/text/villa.gmm @@ -1,19 +1,19 @@ - + used The original owner’s furniture is gone,\nand I didn’t buy any.\rSo, yeah, I know, it’s barren.\nStill, not bad, eh?\rBut anyway, I feel kind of bad just\nimposing the place on you for nothing.\rI’ll tell you what, order a Table from\nthis order form.\rThat’ll do as my thanks to you! - + used Go ahead, order a Table from this\norder form! - + used Whoa, whoa!\nDon’t go yet!\rNot until you order a Table from this\norder form!\r - + used Thank you for waiting!\nI’m delivering your order!\rWe hope you’ll keep ordering quality\nfurnishings from us!\r @@ -31,11 +31,11 @@ XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX - + used Thank you for waiting!\nI’m delivering your order!\r - + used Thank you for waiting!\nI’m delivering your order!\rAlso, and I hate to say this, but...\nWell, the truth of the matter is...\rWe’re completely out of furniture that\nwe could sell you...\rThank you so very, very much for your\nlong-standing patronage and support!\r @@ -501,7 +501,7 @@ used You don’t have enough money. - + used This is the list of purchased furniture. diff --git a/src/overlay005/ov5_021F8370.c b/src/overlay005/ov5_021F8370.c index 9f8fc86dd7..8f2ec28e31 100644 --- a/src/overlay005/ov5_021F8370.c +++ b/src/overlay005/ov5_021F8370.c @@ -29,7 +29,7 @@ typedef struct { } UnkStruct_ov5_021F83D4; typedef struct { - u16 unk_00; + u16 furniture; u16 unk_02; VecFx32 unk_04; UnkStruct_ov5_021F83D4 unk_10; @@ -52,8 +52,8 @@ struct UnkStruct_ov5_021F8480_t { UnkStruct_ov5_021F8480_sub1 unk_08[23]; }; -static void ov5_021F8480(UnkStruct_ov5_021F8480 *param0, const u32 param1); -static BOOL ov5_021F8508(FieldSystem *fieldSystem, u32 param1); +static void ov5_021F8480(UnkStruct_ov5_021F8480 *param0, const enum VillaFurniture furniture); +static BOOL FieldSystem_OwnsVillaFurniture(FieldSystem *fieldSystem, enum VillaFurniture furniture); static BOOL ov5_021F851C(int param0, int param1, const UnkStruct_ov5_0220192C *param2, FieldSystem *fieldSystem); static const UnkStruct_ov5_0220192C Unk_ov5_0220192C[23]; @@ -79,11 +79,9 @@ void Villa_DynamicMapFeaturesInit(FieldSystem *fieldSystem) fieldSystem->unk_04->dynamicMapFeaturesData = v3; { - int v4; - - for (v4 = 0; v4 < 20; v4++) { - if (ov5_021F8508(fieldSystem, v4) == 1) { - ov5_021F8480(v3, v4); + for (int i = 0; i < VILLA_FURNITURE_MAX; i++) { + if (FieldSystem_OwnsVillaFurniture(fieldSystem, i) == TRUE) { + ov5_021F8480(v3, i); } } } @@ -125,7 +123,7 @@ BOOL ov5_021F8410(FieldSystem *fieldSystem, const int param1, const int param2, for (v1 = 0; v1 < 23; v1++, v3++) { if (ov5_021F851C(param1, param2, v3, fieldSystem) == 1) { - const UnkStruct_ov5_022018DC *v4 = &Unk_ov5_022018DC[v3->unk_00]; + const UnkStruct_ov5_022018DC *v4 = &Unk_ov5_022018DC[v3->furniture]; if (v4->unk_00 == 10100) { if (param3 != 0) { @@ -142,17 +140,17 @@ BOOL ov5_021F8410(FieldSystem *fieldSystem, const int param1, const int param2, return 0; } -static void ov5_021F8480(UnkStruct_ov5_021F8480 *param0, const u32 param1) +static void ov5_021F8480(UnkStruct_ov5_021F8480 *param0, const enum VillaFurniture furniture) { int v0, v1; UnkStruct_ov5_021F8480_sub1 *v2; VecFx32 v3 = { 0, 0, 0 }; - int v4 = Unk_ov5_0220188C[param1]; + int v4 = Unk_ov5_0220188C[furniture]; const UnkStruct_ov5_0220192C *v5 = Unk_ov5_0220192C; FieldSystem *fieldSystem = param0->fieldSystem; for (v0 = 0; v0 < 23; v0++, v5++) { - if (v5->unk_00 == param1) { + if (v5->furniture == furniture) { v1 = 0; v2 = param0->unk_08; @@ -172,16 +170,16 @@ static void ov5_021F8480(UnkStruct_ov5_021F8480 *param0, const u32 param1) } } -static BOOL ov5_021F8508(FieldSystem *fieldSystem, u32 param1) +static BOOL FieldSystem_OwnsVillaFurniture(FieldSystem *fieldSystem, enum VillaFurniture furniture) { - return SystemFlag_HandleOwnsVillaFurniture(SaveData_GetVarsFlags(fieldSystem->saveData), HANDLE_FLAG_CHECK, param1); + return SystemFlag_HandleOwnsVillaFurniture(SaveData_GetVarsFlags(fieldSystem->saveData), HANDLE_FLAG_CHECK, furniture); } static BOOL ov5_021F851C(int param0, int param1, const UnkStruct_ov5_0220192C *param2, FieldSystem *fieldSystem) { const UnkStruct_ov5_021F83D4 *v0 = ¶m2->unk_10; - if ((param2->unk_02 == 1) && (ov5_021F8508(fieldSystem, param2->unk_00) == 1)) { + if ((param2->unk_02 == 1) && (FieldSystem_OwnsVillaFurniture(fieldSystem, param2->furniture) == TRUE)) { if ((param1 >= v0->unk_02) && (param1 <= v0->unk_06) && (param0 >= v0->unk_00) && (param0 <= v0->unk_04)) { return 1; } diff --git a/src/scrcmd.c b/src/scrcmd.c index 95e48e8695..2a9f469b2a 100644 --- a/src/scrcmd.c +++ b/src/scrcmd.c @@ -728,7 +728,7 @@ static BOOL ScrCmd_2F7(ScriptContext *ctx); static BOOL ScrCmd_2FB(ScriptContext *ctx); static BOOL ScrCmd_2FC(ScriptContext *ctx); static BOOL ScrCmd_GetRotomFormsInSave(ScriptContext *ctx); -static BOOL ScrCmd_30A(ScriptContext *ctx); +static BOOL ScrCmd_IncrementTrainerScore(ScriptContext *ctx); static BOOL ScrCmd_311(ScriptContext *ctx); static BOOL ScrCmd_312(ScriptContext *ctx); static BOOL ScrCmd_31F(ScriptContext *ctx); @@ -1524,7 +1524,7 @@ const ScrCmdFunc Unk_020EAC58[] = { ScrCmd_InitPersistedMapFeaturesForDistortionWorld, ScrCmd_2F3, ScrCmd_2F4, - ScrCmd_2F5, + ScrCmd_BufferNumberPaddingDigits, ScrCmd_2F6, ScrCmd_2F7, ScrCmd_SetScene22, @@ -1545,7 +1545,7 @@ const ScrCmdFunc Unk_020EAC58[] = { ScrCmd_307, ScrCmd_308, ScrCmd_309, - ScrCmd_30A, + ScrCmd_IncrementTrainerScore, ScrCmd_30B, ScrCmd_30C, ScrCmd_30D, @@ -8085,12 +8085,12 @@ static u32 SaveData_GetRotomFormsInSave(SaveData *saveData) return rotomForms; } -static BOOL ScrCmd_30A(ScriptContext *ctx) +static BOOL ScrCmd_IncrementTrainerScore(ScriptContext *ctx) { - u16 v0 = ScriptContext_ReadHalfWord(ctx); + u16 scoreID = ScriptContext_ReadHalfWord(ctx); - GameRecords_IncrementTrainerScore(SaveData_GetGameRecords(ctx->fieldSystem->saveData), v0); - return 0; + GameRecords_IncrementTrainerScore(SaveData_GetGameRecords(ctx->fieldSystem->saveData), scoreID); + return FALSE; } static BOOL ScrCmd_311(ScriptContext *ctx) diff --git a/src/system_flags.c b/src/system_flags.c index f784688423..250cd823b5 100644 --- a/src/system_flags.c +++ b/src/system_flags.c @@ -493,7 +493,7 @@ void SystemFlag_SetConnectedToWiFi(VarsFlags *varsFlags) BOOL SystemFlag_HandleOwnsVillaFurniture(VarsFlags *varsFlags, enum HandleFlagOp op, enum VillaFurniture furniture) { GF_ASSERT(furniture < VILLA_FURNITURE_MAX); - return HandleFlag(varsFlags, op, FLAG_VILLA_FURNITURE_UNK_00 + furniture); + return HandleFlag(varsFlags, op, FLAG_VILLA_FURNITURE_START + furniture); } void SystemFlag_ClearVillaVisitorInside(VarsFlags *varsFlags) diff --git a/src/unk_020474B8.c b/src/unk_020474B8.c index 4c66851ccf..4e90a7a83d 100644 --- a/src/unk_020474B8.c +++ b/src/unk_020474B8.c @@ -151,7 +151,7 @@ BOOL ScrCmd_BufferNumber(ScriptContext *ctx) u8 templateArg = ScriptContext_ReadByte(ctx); u16 number = ScriptContext_GetVar(ctx); - StringTemplate_SetNumber(*strTemplate, templateArg, number, sub_0205DFC4(number), PADDING_MODE_SPACES, CHARSET_MODE_EN); + StringTemplate_SetNumber(*strTemplate, templateArg, number, GetNumberDigitCount(number), PADDING_MODE_SPACES, CHARSET_MODE_EN); return FALSE; } @@ -165,28 +165,28 @@ BOOL ScrCmd_280(ScriptContext *param0) u8 v5 = ScriptContext_ReadByte(param0); if (v4 == 0) { - v5 = sub_0205DFC4(v3); + v5 = GetNumberDigitCount(v3); } StringTemplate_SetNumber(*v1, v2, v3, v5, v4, 1); return 0; } -BOOL ScrCmd_2F5(ScriptContext *param0) +BOOL ScrCmd_BufferNumberPaddingDigits(ScriptContext *ctx) { - FieldSystem *fieldSystem = param0->fieldSystem; - StringTemplate **v1 = FieldSystem_GetScriptMemberPtr(fieldSystem, SCRIPT_MANAGER_STR_TEMPLATE); - u8 v2 = ScriptContext_ReadByte(param0); - u32 v3 = ScriptContext_ReadWord(param0); - u8 v4 = ScriptContext_ReadByte(param0); - u8 v5 = ScriptContext_ReadByte(param0); + FieldSystem *fieldSystem = ctx->fieldSystem; + StringTemplate **strTemplate = FieldSystem_GetScriptMemberPtr(fieldSystem, SCRIPT_MANAGER_STR_TEMPLATE); + u8 templateArg = ScriptContext_ReadByte(ctx); + u32 value = ScriptContext_ReadWord(ctx); + u8 paddingMode = ScriptContext_ReadByte(ctx); + u8 maxDigits = ScriptContext_ReadByte(ctx); - if (v4 == 0) { - v5 = sub_0205DFC4(v3); + if (paddingMode == PADDING_MODE_NONE) { + maxDigits = GetNumberDigitCount(value); } - StringTemplate_SetNumber(*v1, v2, v3, v5, v4, 1); - return 0; + StringTemplate_SetNumber(*strTemplate, templateArg, value, maxDigits, paddingMode, 1); + return FALSE; } BOOL ScrCmd_BufferPartyMonNickname(ScriptContext *ctx) diff --git a/src/unk_0204F13C.c b/src/unk_0204F13C.c index 53f0a38f12..8574a617ac 100644 --- a/src/unk_0204F13C.c +++ b/src/unk_0204F13C.c @@ -555,7 +555,7 @@ BOOL ScrCmd_324(ScriptContext *param0) Heap_FreeToHeap(v2); } - StringTemplate_SetNumber(*v10, v11, v4, sub_0205DFC4(v4), 1, 1); + StringTemplate_SetNumber(*v10, v11, v4, GetNumberDigitCount(v4), 1, 1); v7 = 0; v6 = 0; @@ -592,11 +592,11 @@ BOOL ScrCmd_324(ScriptContext *param0) } } - StringTemplate_SetNumber(*v10, v12, Unk_020EC078[v6].unk_00, sub_0205DFC4(Unk_020EC078[v6].unk_00), 1, 1); + StringTemplate_SetNumber(*v10, v12, Unk_020EC078[v6].unk_00, GetNumberDigitCount(Unk_020EC078[v6].unk_00), 1, 1); - StringTemplate_SetNumber(*v10, v13, Unk_020EC078[*v15].unk_00, sub_0205DFC4(Unk_020EC078[*v15].unk_00), 1, 1); + StringTemplate_SetNumber(*v10, v13, Unk_020EC078[*v15].unk_00, GetNumberDigitCount(Unk_020EC078[*v15].unk_00), 1, 1); - StringTemplate_SetNumber(*v10, v14, v7, sub_0205DFC4(v7), 1, 1); + StringTemplate_SetNumber(*v10, v14, v7, GetNumberDigitCount(v7), 1, 1); return 0; } diff --git a/src/unk_0205DFC4.c b/src/unk_0205DFC4.c index ebaeeb499d..cd210a3ddb 100644 --- a/src/unk_0205DFC4.c +++ b/src/unk_0205DFC4.c @@ -37,7 +37,6 @@ typedef struct { u8 unk_09; } UnkStruct_0205E3AC; -u16 sub_0205DFC4(u32 param0); u16 sub_0205E078(u16 param0, u16 param1); u16 sub_0205E0E4(u16 param0, u16 param1); int sub_0205E430(u8 param0, u8 param1); @@ -63,23 +62,23 @@ int sub_0205E728(u8 param0); int sub_0205E750(u8 param0); int sub_0205E790(u8 param0); -u16 sub_0205DFC4(u32 param0) +u16 GetNumberDigitCount(u32 number) { - if (param0 / 10 == 0) { + if (number / 10 == 0) { return 1; - } else if (param0 / 100 == 0) { + } else if (number / 100 == 0) { return 2; - } else if (param0 / 1000 == 0) { + } else if (number / 1000 == 0) { return 3; - } else if (param0 / 10000 == 0) { + } else if (number / 10000 == 0) { return 4; - } else if (param0 / 100000 == 0) { + } else if (number / 100000 == 0) { return 5; - } else if (param0 / 1000000 == 0) { + } else if (number / 1000000 == 0) { return 6; - } else if (param0 / 10000000 == 0) { + } else if (number / 10000000 == 0) { return 7; - } else if (param0 / 100000000 == 0) { + } else if (number / 100000000 == 0) { return 8; } diff --git a/subprojects/metang.wrap b/subprojects/metang.wrap index f49a5c5b20..eee1f86a6a 100644 --- a/subprojects/metang.wrap +++ b/subprojects/metang.wrap @@ -1,6 +1,6 @@ [wrap-git] url = https://github.com/lhearachel/metang.git -revision = v0.1.1-python +revision = v0.2.0-python depth = 1 [provide]