Skip to content

Update items.h #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
aayushpathakbihari wants to merge 7 commits into
base: main
Choose a base branch
from
Open

Update items.h #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
d6ba463
Update items.h
aayushpathakbihari Mar 29, 2024
b2e0cb3
Update scripts.pory
aayushpathakbihari Mar 29, 2024
80b119f
Update items.h
aayushpathakbihari Mar 29, 2024
9d9ff16
Update scripts.pory
aayushpathakbihari Mar 29, 2024
d14259f
Update scripts.pory
aayushpathakbihari Mar 29, 2024
754173f
Update pkmn_center_jack.inc
aayushpathakbihari Mar 29, 2024
a4f7213
Update pkmn_center_jack.inc
aayushpathakbihari Mar 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions data/maps/PetalburgCity_Mart/scripts.pory
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,17 +15,17 @@ 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
.2byte ITEM_X_ATTACK
.2byte ITEM_X_DEFENSE
.2byte ITEM_ORANGE_MAIL
.2byte ITEM_MASTER_BALL
.2byte ITEM_NONE
release
end
Expand Down
6 changes: 3 additions & 3 deletions data/maps/RustboroCity_Mart/scripts.pory
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
36 changes: 0 additions & 36 deletions data/scripts/pkmn_center_jack.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -346,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

Expand All @@ -363,17 +351,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
Expand All @@ -394,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

Expand All @@ -411,17 +387,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
Expand All @@ -442,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

Expand Down
16 changes: 8 additions & 8 deletions src/data/items.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand All @@ -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,
Expand All @@ -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,
Expand Down