From d6ba46339ff56bbd61323c3cc8673bb8a2dbb90d Mon Sep 17 00:00:00 2001 From: aayushpathakbihari <165358790+aayushpathakbihari@users.noreply.github.com> Date: Fri, 29 Mar 2024 11:17:25 +0530 Subject: [PATCH 1/7] Update items.h --- src/data/items.h | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/data/items.h b/src/data/items.h index 0a5f7a82..003eb8b5 100644 --- a/src/data/items.h +++ b/src/data/items.h @@ -18,7 +18,7 @@ const struct Item gItems[] = { .name = _("Master Ball"), .itemId = ITEM_MASTER_BALL, - .price = 0, + .price = 1, .description = sMasterBallDesc, .pocket = POCKET_POKE_BALLS, .type = 1, @@ -607,7 +607,7 @@ const struct Item gItems[] = .name = _("Full Restore"), #endif .itemId = ITEM_FULL_RESTORE, - .price = 3000, + .price = 1, .holdEffectParam = 255, .description = sFullRestoreDesc, .pocket = POCKET_MEDICINE, @@ -719,7 +719,7 @@ const struct Item gItems[] = .name = _("Max Revive"), #endif .itemId = ITEM_MAX_REVIVE, - .price = 4000, + .price = 1, .description = sMaxReviveDesc, .pocket = POCKET_MEDICINE, .type = 1, @@ -938,7 +938,7 @@ const struct Item gItems[] = .name = _("Max Elixir"), #endif .itemId = ITEM_MAX_ELIXIR, - .price = 4500, + .price = 1, .holdEffectParam = 255, .description = sMaxElixirDesc, .pocket = POCKET_MEDICINE, @@ -1334,7 +1334,7 @@ const struct Item gItems[] = .name = _("Rare Candy"), #endif .itemId = ITEM_RARE_CANDY, - .price = 9800, + .price = 1, .description = sRareCandyDesc, .pocket = POCKET_POWER_UP, .type = 1, @@ -1624,7 +1624,7 @@ const struct Item gItems[] = .name = _("Ability Capsule"), #endif .itemId = ITEM_ABILITY_CAPSULE, - .price = 10000, + .price = 1, .holdEffectParam = 0, .description = sAbilityCapsuleDesc, .pocket = POCKET_POWER_UP, @@ -1641,7 +1641,7 @@ const struct Item gItems[] = .name = _("Ability Patch"), #endif .itemId = ITEM_ABILITY_PATCH, - .price = 100, + .price = 1, .holdEffectParam = 0, .description = sAbilityPatchDesc, .pocket = POCKET_POWER_UP, From b2e0cb3d106487aa3ebe7878f286d77c2eb9af76 Mon Sep 17 00:00:00 2001 From: aayushpathakbihari <165358790+aayushpathakbihari@users.noreply.github.com> Date: Fri, 29 Mar 2024 11:50:03 +0530 Subject: [PATCH 2/7] Update scripts.pory --- data/maps/PetalburgCity_Mart/scripts.pory | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/maps/PetalburgCity_Mart/scripts.pory b/data/maps/PetalburgCity_Mart/scripts.pory index fc67bff6..dc4e751b 100644 --- a/data/maps/PetalburgCity_Mart/scripts.pory +++ b/data/maps/PetalburgCity_Mart/scripts.pory @@ -25,7 +25,7 @@ PetalburgCity_Mart_Pokemart_Basic: @ 8207D8C .2byte ITEM_X_SPEED .2byte ITEM_X_ATTACK .2byte ITEM_X_DEFENSE - .2byte ITEM_ORANGE_MAIL + .2byte ITEM_MASTER_BALL .2byte ITEM_NONE release end From 80b119fc31e450b905296fceb7de0d9382d373cb Mon Sep 17 00:00:00 2001 From: aayushpathakbihari <165358790+aayushpathakbihari@users.noreply.github.com> Date: Fri, 29 Mar 2024 12:43:24 +0530 Subject: [PATCH 3/7] Update items.h --- src/data/items.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/data/items.h b/src/data/items.h index 003eb8b5..46b04a08 100644 --- a/src/data/items.h +++ b/src/data/items.h @@ -1607,7 +1607,7 @@ const struct Item gItems[] = .name = _("Max Repel"), #endif .itemId = ITEM_MAX_REPEL, - .price = 700, + .price = 1, .holdEffectParam = 250, .description = sMaxRepelDesc, .pocket = POCKET_ITEMS, From 9d9ff16555e450bc15a2ac94dc2a1b57159a39fb Mon Sep 17 00:00:00 2001 From: aayushpathakbihari <165358790+aayushpathakbihari@users.noreply.github.com> Date: Fri, 29 Mar 2024 12:48:56 +0530 Subject: [PATCH 4/7] Update scripts.pory --- data/maps/PetalburgCity_Mart/scripts.pory | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/data/maps/PetalburgCity_Mart/scripts.pory b/data/maps/PetalburgCity_Mart/scripts.pory index dc4e751b..bda1100e 100644 --- a/data/maps/PetalburgCity_Mart/scripts.pory +++ b/data/maps/PetalburgCity_Mart/scripts.pory @@ -15,11 +15,11 @@ PetalburgCity_Mart_EventScript_Clerk:: @ 8207D69 .align 2 PetalburgCity_Mart_Pokemart_Basic: @ 8207D8C - .2byte ITEM_POKE_BALL - .2byte ITEM_POTION - .2byte ITEM_ANTIDOTE - .2byte ITEM_PARALYZE_HEAL - .2byte ITEM_AWAKENING + .2byte ITEM_MASTER_BALL + .2byte ITEM_FULL_RESTORE + .2byte ITEM_RARE_CANDY + .2byte ITEM_ABILITY_CAPSULE + .2byte ITEM_ABILITY_PATCH .2byte ITEM_ESCAPE_ROPE .2byte ITEM_REPEL .2byte ITEM_X_SPEED From d14259f7a21f860eb99b79431029389c5e3c428e Mon Sep 17 00:00:00 2001 From: aayushpathakbihari <165358790+aayushpathakbihari@users.noreply.github.com> Date: Fri, 29 Mar 2024 12:51:50 +0530 Subject: [PATCH 5/7] Update scripts.pory --- data/maps/RustboroCity_Mart/scripts.pory | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/data/maps/RustboroCity_Mart/scripts.pory b/data/maps/RustboroCity_Mart/scripts.pory index 16a4a5ba..b81d40dd 100644 --- a/data/maps/RustboroCity_Mart/scripts.pory +++ b/data/maps/RustboroCity_Mart/scripts.pory @@ -23,9 +23,9 @@ RustboroCity_Mart_EventScript_Clerk2:: @ 8214F06 end RustboroCity_Mart_Pokemart_Basic: @ 8214F30 - .2byte ITEM_REPEAT_BALL - .2byte ITEM_TIMER_BALL - .2byte ITEM_NET_BALL + .2byte ITEM_MAX_REPEL + .2byte ITEM_MAX_REVIVE + .2byte ITEM_MAX_ELIXIR .2byte ITEM_ORANGE_MAIL .2byte ITEM_NONE release From 754173faf4f2209cbb7ff192ec4a6728c582d46f Mon Sep 17 00:00:00 2001 From: aayushpathakbihari <165358790+aayushpathakbihari@users.noreply.github.com> Date: Fri, 29 Mar 2024 13:02:48 +0530 Subject: [PATCH 6/7] Update pkmn_center_jack.inc --- data/scripts/pkmn_center_jack.inc | 33 ------------------------------- 1 file changed, 33 deletions(-) diff --git a/data/scripts/pkmn_center_jack.inc b/data/scripts/pkmn_center_jack.inc index ceccb29e..0c27f987 100644 --- a/data/scripts/pkmn_center_jack.inc +++ b/data/scripts/pkmn_center_jack.inc @@ -315,17 +315,6 @@ Common_EventScript_PkmnCenterJack_MoveReminder_CantTeachEgg:: @ 8201444 //------------------------------------------------------------------------------ //Egg Move Tutor //------------------------------------------------------------------------------ -Common_EventScript_PkmnCenterJack_EggMoveTutor_Price:: - goto_if_unset FLAG_RECEIVED_BADGE_06 Common_EventScript_PkmnCenterJack_NoEnoughBadges - msgbox gText_PkmnCenterJack_Teach_Egg_Moves, MSGBOX_YESNO - compare VAR_RESULT, NO - goto_if_eq Common_EventScript_PkmnCenterJack_MoveReminder_ComeBackAnytime - checkmoney 3000, 0 - compare VAR_RESULT, FALSE - goto_if_eq EverGrandeCity_PokemonLeague_1F_EventScript_Power_Candy_no_Money - goto Common_EventScript_PkmnCenterJack_EggMoveTutor_ChooseMon - end - Common_EventScript_PkmnCenterJack_EggMoveTutor_ChooseMon:: @ 82013D6 msgbox Common_PkmnCenterJack_Text_TutorWhichMon, MSGBOX_DEFAULT special ChooseMonForEggTutor @@ -363,17 +352,6 @@ Common_EventScript_PkmnCenterJack_EggMoveTutor_CantTeachEgg:: @ 8201444 //------------------------------------------------------------------------------ //Tm Move Tutor //------------------------------------------------------------------------------ -Common_EventScript_PkmnCenterJack_TmMoveTutor_Price:: - goto_if_unset FLAG_RECEIVED_BADGE_08 Common_EventScript_PkmnCenterJack_NoEnoughBadges - msgbox gText_PkmnCenterJack_Teach_TM_Moves, MSGBOX_YESNO - compare VAR_RESULT, NO - goto_if_eq Common_EventScript_PkmnCenterJack_MoveReminder_ComeBackAnytime - checkmoney 6000, 0 - compare VAR_RESULT, FALSE - goto_if_eq EverGrandeCity_PokemonLeague_1F_EventScript_Power_Candy_no_Money - goto Common_EventScript_PkmnCenterJack_TmMoveTutor_ChooseMon - end - Common_EventScript_PkmnCenterJack_TmMoveTutor_ChooseMon:: @ 82013D6 msgbox Common_PkmnCenterJack_Text_TutorWhichMon, MSGBOX_DEFAULT special ChooseMonForTMTutor @@ -411,17 +389,6 @@ Common_EventScript_PkmnCenterJack_TMMMoveTutor_CantTeachEgg:: @ 8201444 //------------------------------------------------------------------------------ //Move Tutor //------------------------------------------------------------------------------ -Common_EventScript_PkmnCenterJack_TutorMoveTutor_Price:: - goto_if_unset FLAG_RECEIVED_BADGE_07 Common_EventScript_PkmnCenterJack_NoEnoughBadges - msgbox gText_PkmnCenterJack_Teach_Tutor_Moves, MSGBOX_YESNO - compare VAR_RESULT, NO - goto_if_eq Common_EventScript_PkmnCenterJack_MoveReminder_ComeBackAnytime - checkmoney 4500, 0 - compare VAR_RESULT, FALSE - goto_if_eq EverGrandeCity_PokemonLeague_1F_EventScript_Power_Candy_no_Money - goto Common_EventScript_PkmnCenterJack_TutorMoveTutor_ChooseMon - end - Common_EventScript_PkmnCenterJack_TutorMoveTutor_ChooseMon:: @ 82013D6 msgbox Common_PkmnCenterJack_Text_TutorWhichMon, MSGBOX_DEFAULT special ChooseMonForNewMoveTutor From a4f7213238f5e1f74b3c16d3901614456b900421 Mon Sep 17 00:00:00 2001 From: aayushpathakbihari <165358790+aayushpathakbihari@users.noreply.github.com> Date: Fri, 29 Mar 2024 13:45:11 +0530 Subject: [PATCH 7/7] Update pkmn_center_jack.inc --- data/scripts/pkmn_center_jack.inc | 3 --- 1 file changed, 3 deletions(-) diff --git a/data/scripts/pkmn_center_jack.inc b/data/scripts/pkmn_center_jack.inc index 0c27f987..44196fad 100644 --- a/data/scripts/pkmn_center_jack.inc +++ b/data/scripts/pkmn_center_jack.inc @@ -335,7 +335,6 @@ Common_EventScript_PkmnCenterJack_MoveReminder_ChooseEggMove:: @ 820140C waitstate compare VAR_0x8004, 0 goto_if_eq Common_EventScript_PkmnCenterJack_EggMoveTutor_ChooseMon - removemoney 3000, 0 goto Common_EventScript_PkmnCenterJack_MoveReminder_ComeBackAnytime end @@ -372,7 +371,6 @@ Common_EventScript_PkmnCenterJack_TmMoveTutor_ChooseTmMove:: @ 820140C waitstate compare VAR_0x8004, 0 goto_if_eq Common_EventScript_PkmnCenterJack_TmMoveTutor_ChooseMon - removemoney 6000, 0 goto Common_EventScript_PkmnCenterJack_MoveReminder_ComeBackAnytime end @@ -409,7 +407,6 @@ Common_EventScript_PkmnCenterJack_MoveReminder_ChooseTutorMove:: @ 820140C waitstate compare VAR_0x8004, 0 goto_if_eq Common_EventScript_PkmnCenterJack_TutorMoveTutor_ChooseMon - removemoney 4500, 0 goto Common_EventScript_PkmnCenterJack_MoveReminder_ComeBackAnytime end