Skip to content

Commit 3f98c78

Browse files
AsparagusEduardoAsparagusEduardo
authored
Added POKEMART_LIST_END to avoid users accidentally removing it (#1947)
1 parent e605ffb commit 3f98c78

File tree

23 files changed

+43
-108
lines changed

23 files changed

+43
-108
lines changed

‎asm/macros/event.inc

+7
Original file line numberDiff line numberDiff line change
@@ -1108,6 +1108,13 @@
11081108
.4byte \products
11091109
.endm
11101110

1111+
@ Used as the endpoint for a Pokemart item list
1112+
.macro pokemartlistend
1113+
.2byte ITEM_NONE
1114+
release
1115+
end
1116+
.endm
1117+
11111118
@ Opens the Pokemart system and treats the list of items as decorations.
11121119
@ Products should be a list of .2byte decoration values preceded by an .align 2
11131120
.macro pokemartdecoration products:req

‎data/maps/BattleFrontier_Mart/scripts.inc

+1-3
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,7 @@ BattleFrontier_Mart_Pokemart:
2828
.2byte ITEM_ZINC
2929
.2byte ITEM_CARBOS
3030
.2byte ITEM_HP_UP
31-
.2byte ITEM_NONE
32-
release
33-
end
31+
pokemartlistend
3432

3533
BattleFrontier_Mart_EventScript_OldMan::
3634
msgbox BattleFrontier_Mart_Text_ChaperonGrandson, MSGBOX_NPC

‎data/maps/EverGrandeCity_PokemonLeague_1F/scripts.inc

+1-3
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,7 @@ EverGrandeCity_PokemonLeague_1F_Pokemart:
4545
.2byte ITEM_FULL_HEAL
4646
.2byte ITEM_REVIVE
4747
.2byte ITEM_MAX_REPEL
48-
.2byte ITEM_NONE
49-
release
50-
end
48+
pokemartlistend
5149

5250
@ The door guards only check for FLAG_BADGE06_GET because Winonas badge is the only one that can be skipped
5351
@ Its assumed the player has the remaining badges

‎data/maps/FallarborTown_Mart/scripts.inc

+1-3
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,7 @@ FallarborTown_Mart_Pokemart:
2525
.2byte ITEM_X_DEFEND
2626
.2byte ITEM_DIRE_HIT
2727
.2byte ITEM_GUARD_SPEC
28-
.2byte ITEM_NONE
29-
release
30-
end
28+
pokemartlistend
3129

3230
FallarborTown_Mart_EventScript_Woman::
3331
msgbox FallarborTown_Mart_Text_DecidingSkittyEvolve, MSGBOX_NPC

‎data/maps/FortreeCity_DecorationShop/scripts.inc

+2-6
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,7 @@ FortreeCity_DecorationShop_PokemartDecor_Desks:
2929
.2byte DECOR_BRICK_DESK
3030
.2byte DECOR_CAMP_DESK
3131
.2byte DECOR_HARD_DESK
32-
.2byte DECOR_NONE
33-
release
34-
end
32+
pokemartlistend
3533

3634
FortreeCity_DecorationShop_EventScript_ClerkChairs::
3735
lock
@@ -53,9 +51,7 @@ FortreeCity_DecorationShop_PokemartDecor_Chairs:
5351
.2byte DECOR_BRICK_CHAIR
5452
.2byte DECOR_CAMP_CHAIR
5553
.2byte DECOR_HARD_CHAIR
56-
.2byte DECOR_NONE
57-
release
58-
end
54+
pokemartlistend
5955

6056
FortreeCity_DecorationShop_Text_MerchandiseSentToPC:
6157
.string "Merchandise you buy here is sent to\n"

‎data/maps/FortreeCity_Mart/scripts.inc

+1-3
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,7 @@ FortreeCity_Mart_Pokemart:
2323
.2byte ITEM_REVIVE
2424
.2byte ITEM_SUPER_REPEL
2525
.2byte ITEM_WOOD_MAIL
26-
.2byte ITEM_NONE
27-
release
28-
end
26+
pokemartlistend
2927

3028
FortreeCity_Mart_EventScript_Woman::
3129
msgbox FortreeCity_Mart_Text_SuperRepelBetter, MSGBOX_NPC

‎data/maps/LavaridgeTown_HerbShop/scripts.inc

+1-3
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,7 @@ LavaridgeTown_HerbShop_Pokemart:
1717
.2byte ITEM_ENERGY_ROOT
1818
.2byte ITEM_HEAL_POWDER
1919
.2byte ITEM_REVIVAL_HERB
20-
.2byte ITEM_NONE
21-
release
22-
end
20+
pokemartlistend
2321

2422
LavaridgeTown_HerbShop_EventScript_ExpertM::
2523
msgbox LavaridgeTown_HerbShop_Text_HerbalMedicineWorksButMonWillDislike, MSGBOX_NPC

‎data/maps/LavaridgeTown_Mart/scripts.inc

+1-3
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,7 @@ LavaridgeTown_Mart_Pokemart:
2222
.2byte ITEM_REVIVE
2323
.2byte ITEM_SUPER_REPEL
2424
.2byte ITEM_X_SPEED
25-
.2byte ITEM_NONE
26-
release
27-
end
25+
pokemartlistend
2826

2927
LavaridgeTown_Mart_EventScript_ExpertM::
3028
msgbox LavaridgeTown_Mart_Text_XSpeedFirstStrike, MSGBOX_NPC

‎data/maps/LilycoveCity_DepartmentStore_2F/scripts.inc

+2-6
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,7 @@ LilycoveCity_DepartmentStore_2F_Pokemart1:
3636
.2byte ITEM_ICE_HEAL
3737
.2byte ITEM_AWAKENING
3838
.2byte ITEM_FLUFFY_TAIL
39-
.2byte ITEM_NONE
40-
release
41-
end
39+
pokemartlistend
4240

4341
LilycoveCity_DepartmentStore_2F_EventScript_ClerkRight::
4442
lock
@@ -62,9 +60,7 @@ LilycoveCity_DepartmentStore_2F_Pokemart2:
6260
.2byte ITEM_MAX_REPEL
6361
.2byte ITEM_WAVE_MAIL
6462
.2byte ITEM_MECH_MAIL
65-
.2byte ITEM_NONE
66-
release
67-
end
63+
pokemartlistend
6864

6965
LilycoveCity_DepartmentStore_2F_Text_LearnToUseItemsProperly:
7066
.string "Learn to use items properly.\n"

‎data/maps/LilycoveCity_DepartmentStore_3F/scripts.inc

+2-6
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,7 @@ LilycoveCity_DepartmentStore_3F_Pokemart_Vitamins:
1919
.2byte ITEM_ZINC
2020
.2byte ITEM_CARBOS
2121
.2byte ITEM_HP_UP
22-
.2byte ITEM_NONE
23-
release
24-
end
22+
pokemartlistend
2523

2624
LilycoveCity_DepartmentStore_3F_EventScript_ClerkRight::
2725
lock
@@ -42,9 +40,7 @@ LilycoveCity_DepartmentStore_3F_Pokemart_StatBoosters:
4240
.2byte ITEM_DIRE_HIT
4341
.2byte ITEM_GUARD_SPEC
4442
.2byte ITEM_X_ACCURACY
45-
.2byte ITEM_NONE
46-
release
47-
end
43+
pokemartlistend
4844

4945
LilycoveCity_DepartmentStore_3F_EventScript_TriathleteM::
5046
msgbox LilycoveCity_DepartmentStore_3F_Text_ItemsBestForTougheningPokemon, MSGBOX_NPC

‎data/maps/LilycoveCity_DepartmentStore_4F/scripts.inc

+2-6
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,7 @@ LilycoveCity_DepartmentStore_4F_Pokemart_AttackTMs:
2929
.2byte ITEM_TM_THUNDER
3030
.2byte ITEM_TM_BLIZZARD
3131
.2byte ITEM_TM_HYPER_BEAM
32-
.2byte ITEM_NONE
33-
release
34-
end
32+
pokemartlistend
3533

3634
LilycoveCity_DepartmentStore_4F_EventScript_ClerkRight::
3735
lock
@@ -49,9 +47,7 @@ LilycoveCity_DepartmentStore_4F_Pokemart_DefenseTMs:
4947
.2byte ITEM_TM_SAFEGUARD
5048
.2byte ITEM_TM_REFLECT
5149
.2byte ITEM_TM_LIGHT_SCREEN
52-
.2byte ITEM_NONE
53-
release
54-
end
50+
pokemartlistend
5551

5652
LilycoveCity_DepartmentStore_4F_Text_AttackOrDefenseTM:
5753
.string "Hmm…\p"

‎data/maps/LilycoveCity_DepartmentStore_5F/scripts.inc

+4-12
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,7 @@ LilycoveCity_DepartmentStore_5F_Pokemart_Dolls:
4141
.2byte DECOR_SKITTY_DOLL
4242
.2byte DECOR_SWABLU_DOLL
4343
.2byte DECOR_GULPIN_DOLL
44-
.2byte DECOR_NONE
45-
release
46-
end
44+
pokemartlistend
4745

4846
LilycoveCity_DepartmentStore_5F_EventScript_ClerkMidLeft::
4947
lock
@@ -66,9 +64,7 @@ LilycoveCity_DepartmentStore_5F_Pokemart_Cushions:
6664
.2byte DECOR_GRASS_CUSHION
6765
.2byte DECOR_FIRE_CUSHION
6866
.2byte DECOR_WATER_CUSHION
69-
.2byte DECOR_NONE
70-
release
71-
end
67+
pokemartlistend
7268

7369
LilycoveCity_DepartmentStore_5F_EventScript_ClerkMidRight::
7470
lock
@@ -91,9 +87,7 @@ LilycoveCity_DepartmentStore_5F_Pokemart_Posters:
9187
.2byte DECOR_LONG_POSTER
9288
.2byte DECOR_SEA_POSTER
9389
.2byte DECOR_SKY_POSTER
94-
.2byte DECOR_NONE
95-
release
96-
end
90+
pokemartlistend
9791

9892
LilycoveCity_DepartmentStore_5F_EventScript_ClerkFarRight::
9993
lock
@@ -117,9 +111,7 @@ LilycoveCity_DepartmentStore_5F_Pokemart_Mats:
117111
.2byte DECOR_GLITTER_MAT
118112
.2byte DECOR_JUMP_MAT
119113
.2byte DECOR_SPIN_MAT
120-
.2byte DECOR_NONE
121-
release
122-
end
114+
pokemartlistend
123115

124116
LilycoveCity_DepartmentStore_5F_EventScript_PokefanF::
125117
msgbox LilycoveCity_DepartmentStore_5F_Text_PlaceFullOfCuteDolls, MSGBOX_NPC

‎data/maps/MauvilleCity_Mart/scripts.inc

+1-3
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,7 @@ MauvilleCity_Mart_Pokemart:
2525
.2byte ITEM_GUARD_SPEC
2626
.2byte ITEM_DIRE_HIT
2727
.2byte ITEM_X_ACCURACY
28-
.2byte ITEM_NONE
29-
release
30-
end
28+
pokemartlistend
3129

3230
MauvilleCity_Mart_EventScript_ExpertM::
3331
msgbox MauvilleCity_Mart_Text_ItemsToTemporarilyElevateStats, MSGBOX_NPC

‎data/maps/MossdeepCity_Mart/scripts.inc

+1-3
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,7 @@ MossdeepCity_Mart_Pokemart:
2222
.2byte ITEM_MAX_REPEL
2323
.2byte ITEM_X_ATTACK
2424
.2byte ITEM_X_DEFEND
25-
.2byte ITEM_NONE
26-
release
27-
end
25+
pokemartlistend
2826

2927
MossdeepCity_Mart_EventScript_Woman::
3028
msgbox MossdeepCity_Mart_Text_ReviveIsFantastic, MSGBOX_NPC

‎data/maps/OldaleTown_Mart/scripts.inc

+2-6
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,7 @@ OldaleTown_Mart_Pokemart_Basic:
1818
.2byte ITEM_ANTIDOTE
1919
.2byte ITEM_PARALYZE_HEAL
2020
.2byte ITEM_AWAKENING
21-
.2byte ITEM_NONE
22-
release
23-
end
21+
pokemartlistend
2422

2523
OldaleTown_Mart_ExpandedItems::
2624
pokemart OldaleTown_Mart_Pokemart_Expanded
@@ -35,9 +33,7 @@ OldaleTown_Mart_Pokemart_Expanded:
3533
.2byte ITEM_ANTIDOTE
3634
.2byte ITEM_PARALYZE_HEAL
3735
.2byte ITEM_AWAKENING
38-
.2byte ITEM_NONE
39-
release
40-
end
36+
pokemartlistend
4137

4238
OldaleTown_Mart_EventScript_Woman::
4339
lock

‎data/maps/PetalburgCity_Mart/scripts.inc

+2-6
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,7 @@ PetalburgCity_Mart_Pokemart_Basic:
2525
.2byte ITEM_X_ATTACK
2626
.2byte ITEM_X_DEFEND
2727
.2byte ITEM_ORANGE_MAIL
28-
.2byte ITEM_NONE
29-
release
30-
end
28+
pokemartlistend
3129

3230
PetalburgCity_Mart_EventScript_ExpandedItems::
3331
pokemart PetalburgCity_Mart_Pokemart_Expanded
@@ -50,9 +48,7 @@ PetalburgCity_Mart_Pokemart_Expanded:
5048
.2byte ITEM_X_ATTACK
5149
.2byte ITEM_X_DEFEND
5250
.2byte ITEM_ORANGE_MAIL
53-
.2byte ITEM_NONE
54-
release
55-
end
51+
pokemartlistend
5652

5753
PetalburgCity_Mart_EventScript_Woman::
5854
msgbox PetalburgCity_Mart_Text_WeakWillGrowStronger, MSGBOX_NPC

‎data/maps/Route104_PrettyPetalFlowerShop/scripts.inc

+1-3
Original file line numberDiff line numberDiff line change
@@ -59,9 +59,7 @@ Route104_PrettyPetalFlowerShop_Pokemart_Plants:
5959
.2byte DECOR_COLORFUL_PLANT
6060
.2byte DECOR_BIG_PLANT
6161
.2byte DECOR_GORGEOUS_PLANT
62-
.2byte DECOR_NONE
63-
release
64-
end
62+
pokemartlistend
6563

6664
Route104_PrettyPetalFlowerShop_EventScript_WailmerPailGirl::
6765
lock

‎data/maps/RustboroCity_Mart/scripts.inc

+2-6
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,7 @@ RustboroCity_Mart_Pokemart_Basic:
2828
.2byte ITEM_X_SPEED
2929
.2byte ITEM_X_ATTACK
3030
.2byte ITEM_X_DEFEND
31-
.2byte ITEM_NONE
32-
release
33-
end
31+
pokemartlistend
3432

3533
RustboroCity_Mart_EventScript_PokemartExpanded::
3634
pokemart RustboroCity_Mart_Pokemart_Expanded
@@ -52,9 +50,7 @@ RustboroCity_Mart_Pokemart_Expanded:
5250
.2byte ITEM_X_SPEED
5351
.2byte ITEM_X_ATTACK
5452
.2byte ITEM_X_DEFEND
55-
.2byte ITEM_NONE
56-
release
57-
end
53+
pokemartlistend
5854

5955
RustboroCity_Mart_EventScript_PokefanF::
6056
msgbox RustboroCity_Mart_Text_BuyingHealsInCaseOfShroomish, MSGBOX_NPC

‎data/maps/SlateportCity/scripts.inc

+4-12
Original file line numberDiff line numberDiff line change
@@ -154,9 +154,7 @@ SlateportCity_Pokemart_EnergyGuru:
154154
.2byte ITEM_ZINC
155155
.2byte ITEM_CALCIUM
156156
.2byte ITEM_HP_UP
157-
.2byte ITEM_NONE
158-
release
159-
end
157+
pokemartlistend
160158

161159
SlateportCity_EventScript_EffortRibbonWoman::
162160
lock
@@ -514,9 +512,7 @@ SlateportCity_PokemartDecor_Dolls:
514512
.2byte DECOR_AZURILL_DOLL
515513
.2byte DECOR_MARILL_DOLL
516514
.2byte DECOR_SKITTY_DOLL
517-
.2byte DECOR_NONE
518-
release
519-
end
515+
pokemartlistend
520516

521517
SlateportCity_EventScript_ComeBackWithSecretPower::
522518
msgbox gText_ComeBackWithSecretPower, MSGBOX_DEFAULT
@@ -550,9 +546,7 @@ SlateportCity_PokemartDecor:
550546
.2byte DECOR_A_NOTE_MAT
551547
.2byte DECOR_B_NOTE_MAT
552548
.2byte DECOR_C_HIGH_NOTE_MAT
553-
.2byte DECOR_NONE
554-
release
555-
end
549+
pokemartlistend
556550

557551
SlateportCity_EventScript_PowerTMClerk::
558552
lock
@@ -568,9 +562,7 @@ SlateportCity_EventScript_PowerTMClerk::
568562
SlateportCity_Pokemart_PowerTMs:
569563
.2byte ITEM_TM_HIDDEN_POWER
570564
.2byte ITEM_TM_SECRET_POWER
571-
.2byte ITEM_NONE
572-
release
573-
end
565+
pokemartlistend
574566

575567
@ Scene with Capt Sterns interview and Team Aqua announcing plans to steal Submarine
576568
SlateportCity_EventScript_CaptStern::

‎data/maps/SlateportCity_Mart/scripts.inc

+1-3
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,7 @@ SlateportCity_Mart_Pokemart:
2222
.2byte ITEM_ESCAPE_ROPE
2323
.2byte ITEM_REPEL
2424
.2byte ITEM_HARBOR_MAIL
25-
.2byte ITEM_NONE
26-
release
27-
end
25+
pokemartlistend
2826

2927
SlateportCity_Mart_EventScript_BlackBelt::
3028
msgbox SlateportCity_Mart_Text_SomeItemsOnlyAtMart, MSGBOX_NPC

‎data/maps/SootopolisCity_Mart/scripts.inc

+1-3
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,7 @@ SootopolisCity_Mart_Pokemart:
2222
.2byte ITEM_X_ATTACK
2323
.2byte ITEM_X_DEFEND
2424
.2byte ITEM_SHADOW_MAIL
25-
.2byte ITEM_NONE
26-
release
27-
end
25+
pokemartlistend
2826

2927
SootopolisCity_Mart_EventScript_FatMan::
3028
lock

‎data/maps/TrainerHill_Entrance/scripts.inc

+2-6
Original file line numberDiff line numberDiff line change
@@ -265,9 +265,7 @@ TrainerHill_Entrance_Pokemart_Basic:
265265
.2byte ITEM_DIRE_HIT
266266
.2byte ITEM_GUARD_SPEC
267267
.2byte ITEM_X_ACCURACY
268-
.2byte ITEM_NONE
269-
release
270-
end
268+
pokemartlistend
271269

272270
TrainerHill_Entrance_EventScript_ExpandedPokemart::
273271
pokemart TrainerHill_Entrance_Pokemart_Expanded
@@ -289,9 +287,7 @@ TrainerHill_Entrance_Pokemart_Expanded:
289287
.2byte ITEM_DIRE_HIT
290288
.2byte ITEM_GUARD_SPEC
291289
.2byte ITEM_X_ACCURACY
292-
.2byte ITEM_NONE
293-
release
294-
end
290+
pokemartlistend
295291

296292
TrainerHill_Entrance_Text_StillGettingReady:
297293
.string "This is the TRAINER HILL where\n"

0 commit comments

Comments
 (0)