Skip to content
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

Add shop items depending on badge amount #6035

Open
wants to merge 5 commits into
base: upcoming
Choose a base branch
from
+1,404 −1,166
Open

Add shop items depending on badge amount #6035

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
cfab235
Added initial support for Bagde based items in Pokemon Marts
HunarPG Jan 16, 2025
a8c74a3
Made the changes request by Alex to change u8 and u16 constants to u32
HunarPG Jan 16, 2025
4c60d2d
Reverted stuff to make vanilla emerald mart not use this fxeature by …
HunarPG Jan 16, 2025
bf34bdc
Set badge based mart items to ORAS
HunarPG Jan 17, 2025
0b520cd
Removed Oldale mart using this feature which was enabled for testing
HunarPG Jan 17, 2025
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
1 change: 0 additions & 1 deletion data/event_scripts.s
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -708,7 +708,6 @@ Common_ShowEasyChatScreen::

Common_EventScript_ReadyPetalburgGymForBattle::
clearflag FLAG_HIDE_PETALBURG_GYM_GREETER
setflag FLAG_PETALBURG_MART_EXPANDED_ITEMS
return

Common_EventScript_BufferTrendyPhrase::
Expand Down
13 changes: 1 addition & 12 deletions data/maps/EverGrandeCity_PokemonLeague_1F/scripts.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,22 +31,11 @@ EverGrandeCity_PokemonLeague_1F_EventScript_Clerk::
faceplayer
message gText_HowMayIServeYou
waitmessage
pokemart EverGrandeCity_PokemonLeague_1F_Pokemart
pokemart 0
msgbox gText_PleaseComeAgain, MSGBOX_DEFAULT
release
end

.align 2
EverGrandeCity_PokemonLeague_1F_Pokemart:
.2byte ITEM_ULTRA_BALL
.2byte ITEM_HYPER_POTION
.2byte ITEM_MAX_POTION
.2byte ITEM_FULL_RESTORE
.2byte ITEM_FULL_HEAL
.2byte ITEM_REVIVE
.2byte ITEM_MAX_REPEL
pokemartlistend

@ The door guards only check for FLAG_BADGE06_GET because Winonas badge is the only one that can be skipped
@ Its assumed the player has the remaining badges
EverGrandeCity_PokemonLeague_1F_EventScript_DoorGuard::
Expand Down
18 changes: 1 addition & 17 deletions data/maps/FallarborTown_Mart/scripts.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,27 +6,11 @@ FallarborTown_Mart_EventScript_Clerk::
faceplayer
message gText_HowMayIServeYou
waitmessage
pokemart FallarborTown_Mart_Pokemart
pokemart 0
msgbox gText_PleaseComeAgain, MSGBOX_DEFAULT
release
end

.align 2
FallarborTown_Mart_Pokemart:
.2byte ITEM_GREAT_BALL
.2byte ITEM_SUPER_POTION
.2byte ITEM_ANTIDOTE
.2byte ITEM_PARALYZE_HEAL
.2byte ITEM_ESCAPE_ROPE
.2byte ITEM_SUPER_REPEL
.2byte ITEM_X_SP_ATK
.2byte ITEM_X_SPEED
.2byte ITEM_X_ATTACK
.2byte ITEM_X_DEFENSE
.2byte ITEM_DIRE_HIT
.2byte ITEM_GUARD_SPEC
pokemartlistend

FallarborTown_Mart_EventScript_Woman::
msgbox FallarborTown_Mart_Text_DecidingSkittyEvolve, MSGBOX_NPC
end
Expand Down
16 changes: 1 addition & 15 deletions data/maps/FortreeCity_Mart/scripts.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,25 +6,11 @@ FortreeCity_Mart_EventScript_Clerk::
faceplayer
message gText_HowMayIServeYou
waitmessage
pokemart FortreeCity_Mart_Pokemart
pokemart 0
msgbox gText_PleaseComeAgain, MSGBOX_DEFAULT
release
end

.align 2
FortreeCity_Mart_Pokemart:
.2byte ITEM_GREAT_BALL
.2byte ITEM_ULTRA_BALL
.2byte ITEM_SUPER_POTION
.2byte ITEM_HYPER_POTION
.2byte ITEM_ANTIDOTE
.2byte ITEM_PARALYZE_HEAL
.2byte ITEM_AWAKENING
.2byte ITEM_REVIVE
.2byte ITEM_SUPER_REPEL
.2byte ITEM_WOOD_MAIL
pokemartlistend

FortreeCity_Mart_EventScript_Woman::
msgbox FortreeCity_Mart_Text_SuperRepelBetter, MSGBOX_NPC
end
Expand Down
15 changes: 1 addition & 14 deletions data/maps/LavaridgeTown_Mart/scripts.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,24 +6,11 @@ LavaridgeTown_Mart_EventScript_Clerk::
faceplayer
message gText_HowMayIServeYou
waitmessage
pokemart LavaridgeTown_Mart_Pokemart
pokemart 0
msgbox gText_PleaseComeAgain, MSGBOX_DEFAULT
release
end

.align 2
LavaridgeTown_Mart_Pokemart:
.2byte ITEM_GREAT_BALL
.2byte ITEM_SUPER_POTION
.2byte ITEM_ANTIDOTE
.2byte ITEM_PARALYZE_HEAL
.2byte ITEM_AWAKENING
.2byte ITEM_BURN_HEAL
.2byte ITEM_REVIVE
.2byte ITEM_SUPER_REPEL
.2byte ITEM_X_SPEED
pokemartlistend

LavaridgeTown_Mart_EventScript_ExpertM::
msgbox LavaridgeTown_Mart_Text_XSpeedFirstStrike, MSGBOX_NPC
end
Expand Down
18 changes: 1 addition & 17 deletions data/maps/MauvilleCity_Mart/scripts.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,27 +6,11 @@ MauvilleCity_Mart_EventScript_Clerk::
faceplayer
message gText_HowMayIServeYou
waitmessage
pokemart MauvilleCity_Mart_Pokemart
pokemart 0
msgbox gText_PleaseComeAgain, MSGBOX_DEFAULT
release
end

.align 2
MauvilleCity_Mart_Pokemart:
.2byte ITEM_POKE_BALL
.2byte ITEM_GREAT_BALL
.2byte ITEM_SUPER_POTION
.2byte ITEM_ANTIDOTE
.2byte ITEM_PARALYZE_HEAL
.2byte ITEM_AWAKENING
.2byte ITEM_X_SPEED
.2byte ITEM_X_ATTACK
.2byte ITEM_X_DEFENSE
.2byte ITEM_GUARD_SPEC
.2byte ITEM_DIRE_HIT
.2byte ITEM_X_ACCURACY
pokemartlistend

MauvilleCity_Mart_EventScript_ExpertM::
msgbox MauvilleCity_Mart_Text_ItemsToTemporarilyElevateStats, MSGBOX_NPC
end
Expand Down
15 changes: 1 addition & 14 deletions data/maps/MossdeepCity_Mart/scripts.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,24 +6,11 @@ MossdeepCity_Mart_EventScript_Clerk::
faceplayer
message gText_HowMayIServeYou
waitmessage
pokemart MossdeepCity_Mart_Pokemart
pokemart 0
msgbox gText_PleaseComeAgain, MSGBOX_DEFAULT
release
end

.align 2
MossdeepCity_Mart_Pokemart:
.2byte ITEM_ULTRA_BALL
.2byte ITEM_NET_BALL
.2byte ITEM_DIVE_BALL
.2byte ITEM_HYPER_POTION
.2byte ITEM_FULL_HEAL
.2byte ITEM_REVIVE
.2byte ITEM_MAX_REPEL
.2byte ITEM_X_ATTACK
.2byte ITEM_X_DEFENSE
pokemartlistend

MossdeepCity_Mart_EventScript_Woman::
msgbox MossdeepCity_Mart_Text_ReviveIsFantastic, MSGBOX_NPC
end
Expand Down
11 changes: 1 addition & 10 deletions data/maps/OldaleTown_Mart/scripts.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,20 +21,11 @@ OldaleTown_Mart_Pokemart_Basic:
pokemartlistend

OldaleTown_Mart_ExpandedItems::
pokemart OldaleTown_Mart_Pokemart_Expanded
pokemart 0
msgbox gText_PleaseComeAgain, MSGBOX_DEFAULT
release
end

.align 2
OldaleTown_Mart_Pokemart_Expanded:
.2byte ITEM_POKE_BALL
.2byte ITEM_POTION
.2byte ITEM_ANTIDOTE
.2byte ITEM_PARALYZE_HEAL
.2byte ITEM_AWAKENING
pokemartlistend

OldaleTown_Mart_EventScript_Woman::
lock
faceplayer
Expand Down
41 changes: 1 addition & 40 deletions data/maps/PetalburgCity_Mart/scripts.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,50 +6,11 @@ PetalburgCity_Mart_EventScript_Clerk::
faceplayer
message gText_HowMayIServeYou
waitmessage
goto_if_set FLAG_PETALBURG_MART_EXPANDED_ITEMS, PetalburgCity_Mart_EventScript_ExpandedItems
pokemart PetalburgCity_Mart_Pokemart_Basic
pokemart 0
msgbox gText_PleaseComeAgain, MSGBOX_DEFAULT
release
end

.align 2
PetalburgCity_Mart_Pokemart_Basic:
.2byte ITEM_POKE_BALL
.2byte ITEM_POTION
.2byte ITEM_ANTIDOTE
.2byte ITEM_PARALYZE_HEAL
.2byte ITEM_AWAKENING
.2byte ITEM_ESCAPE_ROPE
.2byte ITEM_REPEL
.2byte ITEM_X_SPEED
.2byte ITEM_X_ATTACK
.2byte ITEM_X_DEFENSE
.2byte ITEM_ORANGE_MAIL
pokemartlistend

PetalburgCity_Mart_EventScript_ExpandedItems::
pokemart PetalburgCity_Mart_Pokemart_Expanded
msgbox gText_PleaseComeAgain, MSGBOX_DEFAULT
release
end

.align 2
PetalburgCity_Mart_Pokemart_Expanded:
.2byte ITEM_POKE_BALL
.2byte ITEM_GREAT_BALL
.2byte ITEM_POTION
.2byte ITEM_SUPER_POTION
.2byte ITEM_ANTIDOTE
.2byte ITEM_PARALYZE_HEAL
.2byte ITEM_AWAKENING
.2byte ITEM_ESCAPE_ROPE
.2byte ITEM_REPEL
.2byte ITEM_X_SPEED
.2byte ITEM_X_ATTACK
.2byte ITEM_X_DEFENSE
.2byte ITEM_ORANGE_MAIL
pokemartlistend

PetalburgCity_Mart_EventScript_Woman::
msgbox PetalburgCity_Mart_Text_WeakWillGrowStronger, MSGBOX_NPC
end
Expand Down
43 changes: 1 addition & 42 deletions data/maps/RustboroCity_Mart/scripts.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,52 +6,11 @@ RustboroCity_Mart_EventScript_Clerk::
faceplayer
message gText_HowMayIServeYou
waitmessage
goto_if_unset FLAG_MET_DEVON_EMPLOYEE, RustboroCity_Mart_EventScript_PokemartBasic
goto_if_set FLAG_MET_DEVON_EMPLOYEE, RustboroCity_Mart_EventScript_PokemartExpanded
end

RustboroCity_Mart_EventScript_PokemartBasic::
pokemart RustboroCity_Mart_Pokemart_Basic
msgbox gText_PleaseComeAgain, MSGBOX_DEFAULT
release
end

.align 2
RustboroCity_Mart_Pokemart_Basic:
.2byte ITEM_POKE_BALL
.2byte ITEM_POTION
.2byte ITEM_SUPER_POTION
.2byte ITEM_ANTIDOTE
.2byte ITEM_PARALYZE_HEAL
.2byte ITEM_ESCAPE_ROPE
.2byte ITEM_REPEL
.2byte ITEM_X_SPEED
.2byte ITEM_X_ATTACK
.2byte ITEM_X_DEFENSE
pokemartlistend

RustboroCity_Mart_EventScript_PokemartExpanded::
pokemart RustboroCity_Mart_Pokemart_Expanded
pokemart 0
msgbox gText_PleaseComeAgain, MSGBOX_DEFAULT
release
end

.align 2
RustboroCity_Mart_Pokemart_Expanded:
.2byte ITEM_POKE_BALL
.2byte ITEM_TIMER_BALL
.2byte ITEM_REPEAT_BALL
.2byte ITEM_POTION
.2byte ITEM_SUPER_POTION
.2byte ITEM_ANTIDOTE
.2byte ITEM_PARALYZE_HEAL
.2byte ITEM_ESCAPE_ROPE
.2byte ITEM_REPEL
.2byte ITEM_X_SPEED
.2byte ITEM_X_ATTACK
.2byte ITEM_X_DEFENSE
pokemartlistend

RustboroCity_Mart_EventScript_PokefanF::
msgbox RustboroCity_Mart_Text_BuyingHealsInCaseOfShroomish, MSGBOX_NPC
end
Expand Down
15 changes: 1 addition & 14 deletions data/maps/SlateportCity_Mart/scripts.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,24 +6,11 @@ SlateportCity_Mart_EventScript_Clerk::
faceplayer
message gText_HowMayIServeYou
waitmessage
pokemart SlateportCity_Mart_Pokemart
pokemart 0
msgbox gText_PleaseComeAgain, MSGBOX_DEFAULT
release
end

.align 2
SlateportCity_Mart_Pokemart:
.2byte ITEM_POKE_BALL
.2byte ITEM_GREAT_BALL
.2byte ITEM_POTION
.2byte ITEM_SUPER_POTION
.2byte ITEM_ANTIDOTE
.2byte ITEM_PARALYZE_HEAL
.2byte ITEM_ESCAPE_ROPE
.2byte ITEM_REPEL
.2byte ITEM_HARBOR_MAIL
pokemartlistend

SlateportCity_Mart_EventScript_BlackBelt::
msgbox SlateportCity_Mart_Text_SomeItemsOnlyAtMart, MSGBOX_NPC
end
Expand Down
15 changes: 1 addition & 14 deletions data/maps/SootopolisCity_Mart/scripts.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,24 +6,11 @@ SootopolisCity_Mart_EventScript_Clerk::
faceplayer
message gText_HowMayIServeYou
waitmessage
pokemart SootopolisCity_Mart_Pokemart
pokemart 0
msgbox gText_PleaseComeAgain, MSGBOX_DEFAULT
release
end

.align 2
SootopolisCity_Mart_Pokemart:
.2byte ITEM_ULTRA_BALL
.2byte ITEM_HYPER_POTION
.2byte ITEM_MAX_POTION
.2byte ITEM_FULL_HEAL
.2byte ITEM_REVIVE
.2byte ITEM_MAX_REPEL
.2byte ITEM_X_ATTACK
.2byte ITEM_X_DEFENSE
.2byte ITEM_SHADOW_MAIL
pokemartlistend

SootopolisCity_Mart_EventScript_FatMan::
lock
faceplayer
Expand Down
40 changes: 1 addition & 39 deletions data/maps/TrainerHill_Entrance/scripts.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,49 +248,11 @@ TrainerHill_Entrance_EventScript_Clerk::
faceplayer
message gText_HowMayIServeYou
waitmessage
goto_if_set FLAG_SYS_GAME_CLEAR, TrainerHill_Entrance_EventScript_ExpandedPokemart
pokemart TrainerHill_Entrance_Pokemart_Basic
pokemart 0
msgbox gText_PleaseComeAgain, MSGBOX_DEFAULT
release
end

.align 2
TrainerHill_Entrance_Pokemart_Basic:
.2byte ITEM_SUPER_POTION
.2byte ITEM_ANTIDOTE
.2byte ITEM_PARALYZE_HEAL
.2byte ITEM_AWAKENING
.2byte ITEM_X_SPEED
.2byte ITEM_X_SP_ATK
.2byte ITEM_X_ATTACK
.2byte ITEM_X_DEFENSE
.2byte ITEM_DIRE_HIT
.2byte ITEM_GUARD_SPEC
.2byte ITEM_X_ACCURACY
pokemartlistend

TrainerHill_Entrance_EventScript_ExpandedPokemart::
pokemart TrainerHill_Entrance_Pokemart_Expanded
msgbox gText_PleaseComeAgain, MSGBOX_DEFAULT
release
end

.align 2
TrainerHill_Entrance_Pokemart_Expanded:
.2byte ITEM_HYPER_POTION
.2byte ITEM_MAX_POTION
.2byte ITEM_FULL_RESTORE
.2byte ITEM_FULL_HEAL
.2byte ITEM_REVIVE
.2byte ITEM_X_SPEED
.2byte ITEM_X_SP_ATK
.2byte ITEM_X_ATTACK
.2byte ITEM_X_DEFENSE
.2byte ITEM_DIRE_HIT
.2byte ITEM_GUARD_SPEC
.2byte ITEM_X_ACCURACY
pokemartlistend

TrainerHill_Entrance_Text_StillGettingReady:
.string "This is the TRAINER HILL where\n"
.string "you may enjoy tag battles with many\l"
Expand Down
Loading
Loading