Leahnaya/pokeplatinum
1
0
Fork 0
mirror of https://github.com/pret/pokeplatinum.git synced 2026-04-27 00:57:12 -05:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

shop_menu/script: create generated mart ids

Browse Source
This commit is contained in:
mudskipper13 2025-02-23 19:06:23 +07:00
parent 918ca37f31
commit 008b0963b9
33 changed files with 157 additions and 106 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
asm/macros/scrcmd.inc
View File

@ -7,6 +7,10 @@
#include "generated/journal_location_events.h" #include "generated/journal_location_events.h"
#include "generated/journal_online_events.h" #include "generated/journal_online_events.h"
#include "generated/map_headers.h" #include "generated/map_headers.h"
#include "generated/mart_decor_id.h"
#include "generated/mart_frontier_id.h"
#include "generated/mart_seal_id.h"
#include "generated/mart_specialties_id.h"
#include "generated/moves.h" #include "generated/moves.h"
#include "generated/npc_trades.h" #include "generated/npc_trades.h"
#include "generated/poketch_apps.h" #include "generated/poketch_apps.h"

2
generated/mart_decor_id.txt Normal file
View File

@ -0,0 +1,2 @@
MART_DECOR_ID_VEILSTONE_4F_UP
MART_DECOR_ID_VEILSTONE_4F_DOWN

2
generated/mart_frontier_id.txt Normal file
View File

@ -0,0 +1,2 @@
MART_FRONTIER_ID_EXCHANGE_SERVICE_CORNER_UP
MART_FRONTIER_ID_EXCHANGE_SERVICE_CORNER_DOWN

7
generated/mart_seal_id.txt Normal file
View File

@ -0,0 +1,7 @@
MART_SEAL_ID_SUNYSHORE_MONDAY
MART_SEAL_ID_SUNYSHORE_TUESDAY
MART_SEAL_ID_SUNYSHORE_WEDNESDAY
MART_SEAL_ID_SUNYSHORE_THURSDAY
MART_SEAL_ID_SUNYSHORE_FRIDAY
MART_SEAL_ID_SUNYSHORE_SATURDAY
MART_SEAL_ID_SUNYSHORE_SUNDAY

20
generated/mart_specialties_id.txt Normal file
View File

@ -0,0 +1,20 @@
MART_SPECIALTIES_ID_JUBILIFE
MART_SPECIALTIES_ID_OREBURGH
MART_SPECIALTIES_ID_FLOAROMA
MART_SPECIALTIES_ID_ETERNA_MART
MART_SPECIALTIES_ID_ETERNA_HOUSE
MART_SPECIALTIES_ID_HEARTHOME
MART_SPECIALTIES_ID_SOLACEON
MART_SPECIALTIES_ID_PASTORIA
MART_SPECIALTIES_ID_VEILSTONE_1F_RIGHT
MART_SPECIALTIES_ID_VEILSTONE_1F_LEFT
MART_SPECIALTIES_ID_VEILSTONE_2F_UP
MART_SPECIALTIES_ID_VEILSTONE_2F_MID
MART_SPECIALTIES_ID_VEILSTONE_3F_UP
MART_SPECIALTIES_ID_VEILSTONE_3F_DOWN
MART_SPECIALTIES_ID_CELESTIC
MART_SPECIALTIES_ID_SNOWPOINT
MART_SPECIALTIES_ID_CANALAVE
MART_SPECIALTIES_ID_SUNYSHORE
MART_SPECIALTIES_ID_POKEMON_LEAGUE
MART_SPECIALTIES_ID_VEILSTONE_B1F

6
generated/meson.build
View File

@ -85,7 +85,11 @@ metang_generators = {
'trainer_score_events': { 'type': 'enum', 'tag': 'TrainerScoreEvent' }, 'trainer_score_events': { 'type': 'enum', 'tag': 'TrainerScoreEvent' },
'trainer_types': { 'type': 'enum', 'tag': 'TrainerType' }, 'trainer_types': { 'type': 'enum', 'tag': 'TrainerType' },
'tutor_locations': {'type': 'enum', 'tag': 'TutorLocation'}, 'tutor_locations': {'type': 'enum', 'tag': 'TutorLocation'},
'villa_furnitures': {'type': 'enum', 'tag': 'VillaFurniture'} 'villa_furnitures': {'type': 'enum', 'tag': 'VillaFurniture'},
'mart_specialties_id': {'type': 'enum', 'tag': 'MartSpecialtiesID'},
'mart_decor_id': {'type': 'enum', 'tag': 'MartDecorID'},
'mart_seal_id': {'type': 'enum', 'tag': 'MartSealID'},
'mart_frontier_id': {'type': 'enum', 'tag': 'MartFrontierId'},
} }
c_consts_generators = [] c_consts_generators = []

1
include/constants/items.h
View File

@ -96,5 +96,6 @@
#define PLUCK_EFFECT_TEMP_ACC_UP 23 #define PLUCK_EFFECT_TEMP_ACC_UP 23
#define ITEM_RETURN_ID 0xFFFF #define ITEM_RETURN_ID 0xFFFF
#define SHOP_ITEM_END (ITEM_RETURN_ID)
#endif // POKEPLATINUM_CONSTANTS_ITEMS_H #endif // POKEPLATINUM_CONSTANTS_ITEMS_H

120
include/data/mart_items.h
View File

@ -1,5 +1,9 @@
#include "constants/items.h" #include "constants/items.h"
#include "constants/seals.h" #include "constants/seals.h"
#include "generated/mart_decor_id.h"
#include "generated/mart_frontier_id.h"
#include "generated/mart_seal_id.h"
#include "generated/mart_specialties_id.h"
typedef struct { typedef struct {
u16 itemID; u16 itemID;
@ -31,21 +35,21 @@ const PokeMartCommonItem PokeMartCommonItems[] = {
const u16 JubilifeMartSpecialties[] = { const u16 JubilifeMartSpecialties[] = {
ITEM_AIR_MAIL, ITEM_AIR_MAIL,
ITEM_HEAL_BALL, ITEM_HEAL_BALL,
0xffff SHOP_ITEM_END
}; };
const u16 OreburghMartSpecialties[] = { const u16 OreburghMartSpecialties[] = {
ITEM_TUNNEL_MAIL, ITEM_TUNNEL_MAIL,
ITEM_HEAL_BALL, ITEM_HEAL_BALL,
ITEM_NET_BALL, ITEM_NET_BALL,
0xffff SHOP_ITEM_END
}; };
const u16 FloaromaMartSpecialties[] = { const u16 FloaromaMartSpecialties[] = {
ITEM_BLOOM_MAIL, ITEM_BLOOM_MAIL,
ITEM_HEAL_BALL, ITEM_HEAL_BALL,
ITEM_NET_BALL, ITEM_NET_BALL,
0xffff SHOP_ITEM_END
}; };
const u16 EternaMartSpecialties[] = { const u16 EternaMartSpecialties[] = {
@ -53,7 +57,7 @@ const u16 EternaMartSpecialties[] = {
ITEM_HEAL_BALL, ITEM_HEAL_BALL,
ITEM_NET_BALL, ITEM_NET_BALL,
ITEM_NEST_BALL, ITEM_NEST_BALL,
0xffff SHOP_ITEM_END
}; };
const u16 EternaHerbShopStock[] = { const u16 EternaHerbShopStock[] = {
@ -61,7 +65,7 @@ const u16 EternaHerbShopStock[] = {
ITEM_ENERGYPOWDER, ITEM_ENERGYPOWDER,
ITEM_ENERGY_ROOT, ITEM_ENERGY_ROOT,
ITEM_REVIVAL_HERB, ITEM_REVIVAL_HERB,
0xffff SHOP_ITEM_END
}; };
const u16 HearthomeMartSpecialties[] = { const u16 HearthomeMartSpecialties[] = {
@ -69,7 +73,7 @@ const u16 HearthomeMartSpecialties[] = {
ITEM_HEAL_BALL, ITEM_HEAL_BALL,
ITEM_NET_BALL, ITEM_NET_BALL,
ITEM_NEST_BALL, ITEM_NEST_BALL,
0xffff SHOP_ITEM_END
}; };
const u16 SolaceonMartSpecialties[] = { const u16 SolaceonMartSpecialties[] = {
@ -77,7 +81,7 @@ const u16 SolaceonMartSpecialties[] = {
ITEM_NET_BALL, ITEM_NET_BALL,
ITEM_NEST_BALL, ITEM_NEST_BALL,
ITEM_DUSK_BALL, ITEM_DUSK_BALL,
0xffff SHOP_ITEM_END
}; };
const u16 PastoriaMartSpecialties[] = { const u16 PastoriaMartSpecialties[] = {
@ -85,7 +89,7 @@ const u16 PastoriaMartSpecialties[] = {
ITEM_NEST_BALL, ITEM_NEST_BALL,
ITEM_DUSK_BALL, ITEM_DUSK_BALL,
ITEM_QUICK_BALL, ITEM_QUICK_BALL,
0xffff SHOP_ITEM_END
}; };
const u16 VeilstoneDeptStoreStock_1F_RIGHT[] = { const u16 VeilstoneDeptStoreStock_1F_RIGHT[] = {
@ -100,7 +104,7 @@ const u16 VeilstoneDeptStoreStock_1F_RIGHT[] = {
ITEM_ICE_HEAL, ITEM_ICE_HEAL,
ITEM_AWAKENING, ITEM_AWAKENING,
ITEM_FULL_HEAL, ITEM_FULL_HEAL,
0xffff SHOP_ITEM_END
}; };
const u16 VeilstoneDeptStoreStock_1F_LEFT[] = { const u16 VeilstoneDeptStoreStock_1F_LEFT[] = {
@ -116,7 +120,7 @@ const u16 VeilstoneDeptStoreStock_1F_LEFT[] = {
ITEM_FLAME_MAIL, ITEM_FLAME_MAIL,
ITEM_BUBBLE_MAIL, ITEM_BUBBLE_MAIL,
ITEM_SPACE_MAIL, ITEM_SPACE_MAIL,
0xffff SHOP_ITEM_END
}; };
const u16 VeilstoneDeptStoreStock_2F_UP[] = { const u16 VeilstoneDeptStoreStock_2F_UP[] = {
@ -128,7 +132,7 @@ const u16 VeilstoneDeptStoreStock_2F_UP[] = {
ITEM_X_ACCURACY, ITEM_X_ACCURACY,
ITEM_X_SPECIAL, ITEM_X_SPECIAL,
ITEM_X_SP__DEF, ITEM_X_SP__DEF,
0xffff SHOP_ITEM_END
}; };
const u16 VeilstoneDeptStoreStock_2F_MID[] = { const u16 VeilstoneDeptStoreStock_2F_MID[] = {
@ -138,7 +142,7 @@ const u16 VeilstoneDeptStoreStock_2F_MID[] = {
ITEM_ZINC, ITEM_ZINC,
ITEM_CARBOS, ITEM_CARBOS,
ITEM_HP_UP, ITEM_HP_UP,
0xffff SHOP_ITEM_END
}; };
const u16 VeilstoneDeptStoreStock_3F_UP[] = { const u16 VeilstoneDeptStoreStock_3F_UP[] = {
@ -149,7 +153,7 @@ const u16 VeilstoneDeptStoreStock_3F_UP[] = {
ITEM_TM33, ITEM_TM33,
ITEM_TM16, ITEM_TM16,
ITEM_TM70, ITEM_TM70,
0xffff SHOP_ITEM_END
}; };
const u16 VeilstoneDeptStoreStock_3F_DOWN[] = { const u16 VeilstoneDeptStoreStock_3F_DOWN[] = {
@ -159,7 +163,7 @@ const u16 VeilstoneDeptStoreStock_3F_DOWN[] = {
ITEM_TM22, ITEM_TM22,
ITEM_TM52, ITEM_TM52,
ITEM_TM15, ITEM_TM15,
0xffff SHOP_ITEM_END
}; };
const u16 CelesticMartSpecialties[] = { const u16 CelesticMartSpecialties[] = {
@ -167,7 +171,7 @@ const u16 CelesticMartSpecialties[] = {
ITEM_DUSK_BALL, ITEM_DUSK_BALL,
ITEM_QUICK_BALL, ITEM_QUICK_BALL,
ITEM_TIMER_BALL, ITEM_TIMER_BALL,
0xffff SHOP_ITEM_END
}; };
const u16 SnowpointMartSpecialties[] = { const u16 SnowpointMartSpecialties[] = {
@ -175,7 +179,7 @@ const u16 SnowpointMartSpecialties[] = {
ITEM_DUSK_BALL, ITEM_DUSK_BALL,
ITEM_QUICK_BALL, ITEM_QUICK_BALL,
ITEM_TIMER_BALL, ITEM_TIMER_BALL,
0xffff SHOP_ITEM_END
}; };
const u16 CanalaveMartSpecialties[] = { const u16 CanalaveMartSpecialties[] = {
@ -183,13 +187,13 @@ const u16 CanalaveMartSpecialties[] = {
ITEM_QUICK_BALL, ITEM_QUICK_BALL,
ITEM_TIMER_BALL, ITEM_TIMER_BALL,
ITEM_REPEAT_BALL, ITEM_REPEAT_BALL,
0xffff SHOP_ITEM_END
}; };
const u16 SunyshoreMartSpecialties[] = { const u16 SunyshoreMartSpecialties[] = {
ITEM_STEEL_MAIL, ITEM_STEEL_MAIL,
ITEM_LUXURY_BALL, ITEM_LUXURY_BALL,
0xffff SHOP_ITEM_END
}; };
const u16 PokemonLeagueMartSpecialties[] = { const u16 PokemonLeagueMartSpecialties[] = {
@ -201,7 +205,7 @@ const u16 PokemonLeagueMartSpecialties[] = {
ITEM_TIMER_BALL, ITEM_TIMER_BALL,
ITEM_REPEAT_BALL, ITEM_REPEAT_BALL,
ITEM_LUXURY_BALL, ITEM_LUXURY_BALL,
0xffff SHOP_ITEM_END
}; };
const u16 VeilstoneDeptStoreStock_B1F_DOWN_LEFT[] = { const u16 VeilstoneDeptStoreStock_B1F_DOWN_LEFT[] = {
@ -210,30 +214,30 @@ const u16 VeilstoneDeptStoreStock_B1F_DOWN_LEFT[] = {
ITEM_MAGO_BERRY, ITEM_MAGO_BERRY,
ITEM_AGUAV_BERRY, ITEM_AGUAV_BERRY,
ITEM_IAPAPA_BERRY, ITEM_IAPAPA_BERRY,
0xffff SHOP_ITEM_END
}; };
const u16 *PokeMartSpecialties[] = { const u16 *PokeMartSpecialties[] = {
JubilifeMartSpecialties, [MART_SPECIALTIES_ID_JUBILIFE] = JubilifeMartSpecialties,
OreburghMartSpecialties, [MART_SPECIALTIES_ID_OREBURGH] = OreburghMartSpecialties,
FloaromaMartSpecialties, [MART_SPECIALTIES_ID_FLOAROMA] = FloaromaMartSpecialties,
EternaMartSpecialties, [MART_SPECIALTIES_ID_ETERNA_MART] = EternaMartSpecialties,
EternaHerbShopStock, [MART_SPECIALTIES_ID_ETERNA_HOUSE] = EternaHerbShopStock,
HearthomeMartSpecialties, [MART_SPECIALTIES_ID_HEARTHOME] = HearthomeMartSpecialties,
SolaceonMartSpecialties, [MART_SPECIALTIES_ID_SOLACEON] = SolaceonMartSpecialties,
PastoriaMartSpecialties, [MART_SPECIALTIES_ID_PASTORIA] = PastoriaMartSpecialties,
VeilstoneDeptStoreStock_1F_RIGHT, [MART_SPECIALTIES_ID_VEILSTONE_1F_RIGHT] = VeilstoneDeptStoreStock_1F_RIGHT,
VeilstoneDeptStoreStock_1F_LEFT, [MART_SPECIALTIES_ID_VEILSTONE_1F_LEFT] = VeilstoneDeptStoreStock_1F_LEFT,
VeilstoneDeptStoreStock_2F_UP, [MART_SPECIALTIES_ID_VEILSTONE_2F_UP] = VeilstoneDeptStoreStock_2F_UP,
VeilstoneDeptStoreStock_2F_MID, [MART_SPECIALTIES_ID_VEILSTONE_2F_MID] = VeilstoneDeptStoreStock_2F_MID,
VeilstoneDeptStoreStock_3F_UP, [MART_SPECIALTIES_ID_VEILSTONE_3F_UP] = VeilstoneDeptStoreStock_3F_UP,
VeilstoneDeptStoreStock_3F_DOWN, [MART_SPECIALTIES_ID_VEILSTONE_3F_DOWN] = VeilstoneDeptStoreStock_3F_DOWN,
CelesticMartSpecialties, [MART_SPECIALTIES_ID_CELESTIC] = CelesticMartSpecialties,
SnowpointMartSpecialties, [MART_SPECIALTIES_ID_SNOWPOINT] = SnowpointMartSpecialties,
CanalaveMartSpecialties, [MART_SPECIALTIES_ID_CANALAVE] = CanalaveMartSpecialties,
SunyshoreMartSpecialties, [MART_SPECIALTIES_ID_SUNYSHORE] = SunyshoreMartSpecialties,
PokemonLeagueMartSpecialties, [MART_SPECIALTIES_ID_POKEMON_LEAGUE] = PokemonLeagueMartSpecialties,
VeilstoneDeptStoreStock_B1F_DOWN_LEFT [MART_SPECIALTIES_ID_VEILSTONE_B1F] = VeilstoneDeptStoreStock_B1F_DOWN_LEFT
}; };
const u16 VeilstoneDeptStoreStock_4F_UP[] = { const u16 VeilstoneDeptStoreStock_4F_UP[] = {
@ -242,7 +246,7 @@ const u16 VeilstoneDeptStoreStock_4F_UP[] = {
0x19, 0x19,
0x1A, 0x1A,
0x1B, 0x1B,
0xffff SHOP_ITEM_END
}; };
const u16 VeilstoneDeptStoreStock_4F_DOWN[] = { const u16 VeilstoneDeptStoreStock_4F_DOWN[] = {
@ -252,12 +256,12 @@ const u16 VeilstoneDeptStoreStock_4F_DOWN[] = {
0x77, 0x77,
0x78, 0x78,
0x79, 0x79,
0xffff SHOP_ITEM_END
}; };
const u16 *VeilstoneDeptStoreDecorationStocks[] = { const u16 *VeilstoneDeptStoreDecorationStocks[] = {
VeilstoneDeptStoreStock_4F_UP, [MART_DECOR_ID_VEILSTONE_4F_UP] = VeilstoneDeptStoreStock_4F_UP,
VeilstoneDeptStoreStock_4F_DOWN [MART_DECOR_ID_VEILSTONE_4F_DOWN] = VeilstoneDeptStoreStock_4F_DOWN
}; };
const u16 SunyshoreMarketStockMonday[] = { const u16 SunyshoreMarketStockMonday[] = {
@ -268,7 +272,7 @@ const u16 SunyshoreMarketStockMonday[] = {
LINE_SEAL_C, LINE_SEAL_C,
ELE_SEAL_B, ELE_SEAL_B,
PARTY_SEAL_D, PARTY_SEAL_D,
0xffff SHOP_ITEM_END
}; };
const u16 SunyshoreMarketStockTuesday[] = { const u16 SunyshoreMarketStockTuesday[] = {
@ -279,7 +283,7 @@ const u16 SunyshoreMarketStockTuesday[] = {
SONG_SEAL_B, SONG_SEAL_B,
LINE_SEAL_D, LINE_SEAL_D,
ELE_SEAL_C, ELE_SEAL_C,
0xffff SHOP_ITEM_END
}; };
const u16 SunyshoreMarketStockWednesday[] = { const u16 SunyshoreMarketStockWednesday[] = {
@ -290,7 +294,7 @@ const u16 SunyshoreMarketStockWednesday[] = {
SONG_SEAL_C, SONG_SEAL_C,
SMOKE_SEAL_A, SMOKE_SEAL_A,
ELE_SEAL_D, ELE_SEAL_D,
0xffff SHOP_ITEM_END
}; };
const u16 SunyshoreMarketStockThursday[] = { const u16 SunyshoreMarketStockThursday[] = {
@ -301,7 +305,7 @@ const u16 SunyshoreMarketStockThursday[] = {
SONG_SEAL_D, SONG_SEAL_D,
STAR_SEAL_E, STAR_SEAL_E,
SMOKE_SEAL_B, SMOKE_SEAL_B,
0xffff SHOP_ITEM_END
}; };
const u16 SunyshoreMarketStockFriday[] = { const u16 SunyshoreMarketStockFriday[] = {
@ -312,7 +316,7 @@ const u16 SunyshoreMarketStockFriday[] = {
HEART_SEAL_E, HEART_SEAL_E,
STAR_SEAL_F, STAR_SEAL_F,
SMOKE_SEAL_C, SMOKE_SEAL_C,
0xffff SHOP_ITEM_END
}; };
const u16 SunyshoreMarketStockSaturday[] = { const u16 SunyshoreMarketStockSaturday[] = {
@ -323,7 +327,7 @@ const u16 SunyshoreMarketStockSaturday[] = {
HEART_SEAL_F, HEART_SEAL_F,
LINE_SEAL_A, LINE_SEAL_A,
SMOKE_SEAL_D, SMOKE_SEAL_D,
0xffff SHOP_ITEM_END
}; };
const u16 SunyshoreMarketStockSunday[] = { const u16 SunyshoreMarketStockSunday[] = {
@ -334,15 +338,15 @@ const u16 SunyshoreMarketStockSunday[] = {
LINE_SEAL_B, LINE_SEAL_B,
ELE_SEAL_A, ELE_SEAL_A,
PARTY_SEAL_C, PARTY_SEAL_C,
0xffff SHOP_ITEM_END
}; };
const u16 *SunyshoreMarketDailyStocks[] = { const u16 *SunyshoreMarketDailyStocks[] = {
SunyshoreMarketStockMonday, [MART_SEAL_ID_SUNYSHORE_MONDAY] = SunyshoreMarketStockMonday,
SunyshoreMarketStockTuesday, [MART_SEAL_ID_SUNYSHORE_TUESDAY] = SunyshoreMarketStockTuesday,
SunyshoreMarketStockWednesday, [MART_SEAL_ID_SUNYSHORE_WEDNESDAY] = SunyshoreMarketStockWednesday,
SunyshoreMarketStockThursday, [MART_SEAL_ID_SUNYSHORE_THURSDAY] = SunyshoreMarketStockThursday,
SunyshoreMarketStockFriday, [MART_SEAL_ID_SUNYSHORE_FRIDAY] = SunyshoreMarketStockFriday,
SunyshoreMarketStockSaturday, [MART_SEAL_ID_SUNYSHORE_SATURDAY] = SunyshoreMarketStockSaturday,
SunyshoreMarketStockSunday [MART_SEAL_ID_SUNYSHORE_SUNDAY] = SunyshoreMarketStockSunday
}; };

4
res/field/scripts/scripts_battle_frontier.s
View File

@ -274,7 +274,7 @@ _026A:
FacePlayer FacePlayer
Message 21 Message 21
ScrCmd_035 ScrCmd_035
PokeMartFrontier 1 PokeMartFrontier MART_FRONTIER_ID_EXCHANGE_SERVICE_CORNER_DOWN
ReleaseAll ReleaseAll
End End
@ -297,7 +297,7 @@ _02A6:
FacePlayer FacePlayer
Message 23 Message 23
ScrCmd_035 ScrCmd_035
PokeMartFrontier 0 PokeMartFrontier MART_FRONTIER_ID_EXCHANGE_SERVICE_CORNER_UP
ReleaseAll ReleaseAll
End End

4
res/field/scripts/scripts_battle_park_exchange_service_corner.s
View File

@ -25,7 +25,7 @@ _0030:
FacePlayer FacePlayer
Message 15 Message 15
ScrCmd_035 ScrCmd_035
PokeMartFrontier 0 PokeMartFrontier MART_FRONTIER_ID_EXCHANGE_SERVICE_CORNER_UP
ReleaseAll ReleaseAll
End End
@ -35,7 +35,7 @@ _0044:
FacePlayer FacePlayer
Message 15 Message 15
ScrCmd_035 ScrCmd_035
PokeMartFrontier 1 PokeMartFrontier MART_FRONTIER_ID_EXCHANGE_SERVICE_CORNER_DOWN
ReleaseAll ReleaseAll
End End

2
res/field/scripts/scripts_canalave_city_mart.s
View File

@ -25,7 +25,7 @@ _0028:
FacePlayer FacePlayer
CallCommonScript 0x7E3 CallCommonScript 0x7E3
ScrCmd_035 ScrCmd_035
PokeMartSpecialties 16 PokeMartSpecialties MART_SPECIALTIES_ID_CANALAVE
ReleaseAll ReleaseAll
End End

2
res/field/scripts/scripts_celestic_town_northwest_house.s
View File

@ -36,7 +36,7 @@ _0041:
FacePlayer FacePlayer
CallCommonScript 0x7E3 CallCommonScript 0x7E3
ScrCmd_035 ScrCmd_035
PokeMartSpecialties 14 PokeMartSpecialties MART_SPECIALTIES_ID_CELESTIC
ReleaseAll ReleaseAll
End End

2
res/field/scripts/scripts_eterna_city_mart.s
View File

@ -25,7 +25,7 @@ _0028:
FacePlayer FacePlayer
CallCommonScript 0x7E3 CallCommonScript 0x7E3
ScrCmd_035 ScrCmd_035
PokeMartSpecialties 3 PokeMartSpecialties MART_SPECIALTIES_ID_ETERNA_MART
ReleaseAll ReleaseAll
End End

2
res/field/scripts/scripts_eterna_city_north_house.s
View File

@ -14,7 +14,7 @@ _000E:
FacePlayer FacePlayer
Message 0 Message 0
ScrCmd_035 ScrCmd_035
PokeMartSpecialties 4 PokeMartSpecialties MART_SPECIALTIES_ID_ETERNA_HOUSE
ReleaseAll ReleaseAll
End End

2
res/field/scripts/scripts_floaroma_town_mart.s
View File

@ -25,7 +25,7 @@ _0028:
FacePlayer FacePlayer
CallCommonScript 0x7E3 CallCommonScript 0x7E3
ScrCmd_035 ScrCmd_035
PokeMartSpecialties 2 PokeMartSpecialties MART_SPECIALTIES_ID_FLOAROMA
ReleaseAll ReleaseAll
End End

2
res/field/scripts/scripts_hearthome_city_mart.s
View File

@ -25,7 +25,7 @@ _0028:
FacePlayer FacePlayer
CallCommonScript 0x7E3 CallCommonScript 0x7E3
ScrCmd_035 ScrCmd_035
PokeMartSpecialties 5 PokeMartSpecialties MART_SPECIALTIES_ID_HEARTHOME
ReleaseAll ReleaseAll
End End

2
res/field/scripts/scripts_jubilife_city_mart.s
View File

@ -26,7 +26,7 @@ _002C:
FacePlayer FacePlayer
CallCommonScript 0x7E3 CallCommonScript 0x7E3
ScrCmd_035 ScrCmd_035
PokeMartSpecialties 0 PokeMartSpecialties MART_SPECIALTIES_ID_JUBILIFE
ReleaseAll ReleaseAll
End End

2
res/field/scripts/scripts_oreburgh_city_mart.s
View File

@ -25,7 +25,7 @@ _0028:
FacePlayer FacePlayer
CallCommonScript 0x7E3 CallCommonScript 0x7E3
ScrCmd_035 ScrCmd_035
PokeMartSpecialties 1 PokeMartSpecialties MART_SPECIALTIES_ID_OREBURGH
ReleaseAll ReleaseAll
End End

2
res/field/scripts/scripts_pastoria_city_mart.s
View File

@ -26,7 +26,7 @@ _002C:
FacePlayer FacePlayer
CallCommonScript 0x7E3 CallCommonScript 0x7E3
ScrCmd_035 ScrCmd_035
PokeMartSpecialties 7 PokeMartSpecialties MART_SPECIALTIES_ID_PASTORIA
ReleaseAll ReleaseAll
End End

2
res/field/scripts/scripts_pokemon_league_north_pokecenter_1f.s
View File

@ -113,7 +113,7 @@ _013E:
FacePlayer FacePlayer
CallCommonScript 0x7E3 CallCommonScript 0x7E3
ScrCmd_035 ScrCmd_035
PokeMartSpecialties 18 PokeMartSpecialties MART_SPECIALTIES_ID_POKEMON_LEAGUE
ReleaseAll ReleaseAll
End End

2
res/field/scripts/scripts_pokemon_league_south_pokecenter_1f.s
View File

@ -36,7 +36,7 @@ _0042:
FacePlayer FacePlayer
CallCommonScript 0x7E3 CallCommonScript 0x7E3
ScrCmd_035 ScrCmd_035
PokeMartSpecialties 18 PokeMartSpecialties MART_SPECIALTIES_ID_POKEMON_LEAGUE
ReleaseAll ReleaseAll
End End

2
res/field/scripts/scripts_snowpoint_city_mart.s
View File

@ -25,7 +25,7 @@ _0028:
FacePlayer FacePlayer
CallCommonScript 0x7E3 CallCommonScript 0x7E3
ScrCmd_035 ScrCmd_035
PokeMartSpecialties 15 PokeMartSpecialties MART_SPECIALTIES_ID_SNOWPOINT
ReleaseAll ReleaseAll
End End

2
res/field/scripts/scripts_solaceon_town_mart.s
View File

@ -25,7 +25,7 @@ _0028:
FacePlayer FacePlayer
CallCommonScript 0x7E3 CallCommonScript 0x7E3
ScrCmd_035 ScrCmd_035
PokeMartSpecialties 6 PokeMartSpecialties MART_SPECIALTIES_ID_SOLACEON
ReleaseAll ReleaseAll
End End

14
res/field/scripts/scripts_sunyshore_city.s
View File

@ -653,31 +653,31 @@ _0791:
End End
_0806: _0806:
PokeMartSeal 0 PokeMartSeal MART_SEAL_ID_SUNYSHORE_MONDAY
GoTo _084C GoTo _084C
_0810: _0810:
PokeMartSeal 1 PokeMartSeal MART_SEAL_ID_SUNYSHORE_TUESDAY
GoTo _084C GoTo _084C
_081A: _081A:
PokeMartSeal 2 PokeMartSeal MART_SEAL_ID_SUNYSHORE_WEDNESDAY
GoTo _084C GoTo _084C
_0824: _0824:
PokeMartSeal 3 PokeMartSeal MART_SEAL_ID_SUNYSHORE_THURSDAY
GoTo _084C GoTo _084C
_082E: _082E:
PokeMartSeal 4 PokeMartSeal MART_SEAL_ID_SUNYSHORE_FRIDAY
GoTo _084C GoTo _084C
_0838: _0838:
PokeMartSeal 5 PokeMartSeal MART_SEAL_ID_SUNYSHORE_SATURDAY
GoTo _084C GoTo _084C
_0842: _0842:
PokeMartSeal 6 PokeMartSeal MART_SEAL_ID_SUNYSHORE_SUNDAY
GoTo _084C GoTo _084C
_084C: _084C:

2
res/field/scripts/scripts_sunyshore_city_mart.s
View File

@ -25,7 +25,7 @@ _0028:
FacePlayer FacePlayer
CallCommonScript 0x7E3 CallCommonScript 0x7E3
ScrCmd_035 ScrCmd_035
PokeMartSpecialties 17 PokeMartSpecialties MART_SPECIALTIES_ID_SUNYSHORE
ReleaseAll ReleaseAll
End End

14
res/field/scripts/scripts_sunyshore_market.s
View File

@ -95,31 +95,31 @@ _00E4:
End End
_014B: _014B:
PokeMartSeal 0 PokeMartSeal MART_SEAL_ID_SUNYSHORE_MONDAY
Return Return
_0151: _0151:
PokeMartSeal 1 PokeMartSeal MART_SEAL_ID_SUNYSHORE_TUESDAY
Return Return
_0157: _0157:
PokeMartSeal 2 PokeMartSeal MART_SEAL_ID_SUNYSHORE_WEDNESDAY
Return Return
_015D: _015D:
PokeMartSeal 3 PokeMartSeal MART_SEAL_ID_SUNYSHORE_THURSDAY
Return Return
_0163: _0163:
PokeMartSeal 4 PokeMartSeal MART_SEAL_ID_SUNYSHORE_FRIDAY
Return Return
_0169: _0169:
PokeMartSeal 5 PokeMartSeal MART_SEAL_ID_SUNYSHORE_SATURDAY
Return Return
_016F: _016F:
PokeMartSeal 6 PokeMartSeal MART_SEAL_ID_SUNYSHORE_SUNDAY
Return Return
_0175: _0175:

2
res/field/scripts/scripts_unk_1087.s
View File

@ -22,7 +22,7 @@ _0020:
FacePlayer FacePlayer
CallCommonScript 0x7E3 CallCommonScript 0x7E3
ScrCmd_035 ScrCmd_035
PokeMartSpecialties 14 PokeMartSpecialties MART_SPECIALTIES_ID_CELESTIC
ReleaseAll ReleaseAll
End End

4
res/field/scripts/scripts_veilstone_store_1f.s
View File

@ -49,7 +49,7 @@ _005B:
FacePlayer FacePlayer
CallCommonScript 0x7E3 CallCommonScript 0x7E3
ScrCmd_035 ScrCmd_035
PokeMartSpecialties 8 PokeMartSpecialties MART_SPECIALTIES_ID_VEILSTONE_1F_RIGHT
ReleaseAll ReleaseAll
End End
@ -59,7 +59,7 @@ _0071:
FacePlayer FacePlayer
CallCommonScript 0x7E3 CallCommonScript 0x7E3
ScrCmd_035 ScrCmd_035
PokeMartSpecialties 9 PokeMartSpecialties MART_SPECIALTIES_ID_VEILSTONE_1F_LEFT
ReleaseAll ReleaseAll
End End

4
res/field/scripts/scripts_veilstone_store_2f.s
View File

@ -163,7 +163,7 @@ _0198:
FacePlayer FacePlayer
CallCommonScript 0x7E3 CallCommonScript 0x7E3
ScrCmd_035 ScrCmd_035
PokeMartSpecialties 10 PokeMartSpecialties MART_SPECIALTIES_ID_VEILSTONE_2F_UP
ReleaseAll ReleaseAll
End End
@ -173,7 +173,7 @@ _01AE:
FacePlayer FacePlayer
CallCommonScript 0x7E3 CallCommonScript 0x7E3
ScrCmd_035 ScrCmd_035
PokeMartSpecialties 11 PokeMartSpecialties MART_SPECIALTIES_ID_VEILSTONE_2F_MID
ReleaseAll ReleaseAll
End End

4
res/field/scripts/scripts_veilstone_store_3f.s
View File

@ -111,7 +111,7 @@ _0127:
FacePlayer FacePlayer
CallCommonScript 0x7E3 CallCommonScript 0x7E3
ScrCmd_035 ScrCmd_035
PokeMartSpecialties 12 PokeMartSpecialties MART_SPECIALTIES_ID_VEILSTONE_3F_UP
ReleaseAll ReleaseAll
End End
@ -121,7 +121,7 @@ _013D:
FacePlayer FacePlayer
CallCommonScript 0x7E3 CallCommonScript 0x7E3
ScrCmd_035 ScrCmd_035
PokeMartSpecialties 13 PokeMartSpecialties MART_SPECIALTIES_ID_VEILSTONE_3F_DOWN
ReleaseAll ReleaseAll
End End

4
res/field/scripts/scripts_veilstone_store_4f.s
View File

@ -111,7 +111,7 @@ _0127:
FacePlayer FacePlayer
CallCommonScript 0x7E3 CallCommonScript 0x7E3
ScrCmd_035 ScrCmd_035
PokeMartDecor 0 PokeMartDecor MART_DECOR_ID_VEILSTONE_4F_UP
ReleaseAll ReleaseAll
End End
@ -121,7 +121,7 @@ _013D:
FacePlayer FacePlayer
CallCommonScript 0x7E3 CallCommonScript 0x7E3
ScrCmd_035 ScrCmd_035
PokeMartDecor 1 PokeMartDecor MART_DECOR_ID_VEILSTONE_4F_DOWN
ReleaseAll ReleaseAll
End End

2
res/field/scripts/scripts_veilstone_store_b1f.s
View File

@ -109,7 +109,7 @@ _00E8:
FacePlayer FacePlayer
CallCommonScript 0x7E3 CallCommonScript 0x7E3
ScrCmd_035 ScrCmd_035
PokeMartSpecialties 19 PokeMartSpecialties MART_SPECIALTIES_ID_VEILSTONE_B1F
ReleaseAll ReleaseAll
End End

17
src/scrcmd_shop.c
View File

@ -4,6 +4,10 @@
#include <string.h> #include <string.h>
#include "generated/badges.h" #include "generated/badges.h"
#include "generated/mart_decor_id.h"
#include "generated/mart_frontier_id.h"
#include "generated/mart_seal_id.h"
#include "generated/mart_specialties_id.h"
#include "data/mart_items.h" #include "data/mart_items.h"
#include "overlay007/shop_menu.h" #include "overlay007/shop_menu.h"
@ -64,7 +68,7 @@ BOOL ScrCmd_PokeMartCommon(ScriptContext *ctx)
} }
} }
shopItems[i] = ITEM_RETURN_ID; shopItems[i] = SHOP_ITEM_END;
Shop_Start(ctx->task, ctx->fieldSystem, shopItems, MART_TYPE_NORMAL, FALSE); Shop_Start(ctx->task, ctx->fieldSystem, shopItems, MART_TYPE_NORMAL, FALSE);
return TRUE; return TRUE;
@ -75,7 +79,10 @@ BOOL ScrCmd_PokeMartSpecialties(ScriptContext *ctx)
u16 martID = ScriptContext_GetVar(ctx); u16 martID = ScriptContext_GetVar(ctx);
BOOL incBuyCount; BOOL incBuyCount;
if ((martID == 8) || (martID == 9) || (martID == 10) || (martID == 11) || (martID == 12) || (martID == 13) || (martID == 19)) { if ((martID == MART_SPECIALTIES_ID_VEILSTONE_1F_RIGHT) || (martID == MART_SPECIALTIES_ID_VEILSTONE_1F_LEFT)
|| (martID == MART_SPECIALTIES_ID_VEILSTONE_2F_UP) || (martID == MART_SPECIALTIES_ID_VEILSTONE_2F_MID)
|| (martID == MART_SPECIALTIES_ID_VEILSTONE_3F_UP) || (martID == MART_SPECIALTIES_ID_VEILSTONE_3F_DOWN)
|| (martID == MART_SPECIALTIES_ID_VEILSTONE_B1F)) {
incBuyCount = TRUE; incBuyCount = TRUE;
} else { } else {
incBuyCount = FALSE; incBuyCount = FALSE;
@ -91,11 +98,11 @@ BOOL ScrCmd_PokeMartDecor(ScriptContext *ctx)
u16 martID = ScriptContext_GetVar(ctx); u16 martID = ScriptContext_GetVar(ctx);
BOOL incBuyCount; BOOL incBuyCount;
if ((martID == 0) || (martID == 1)) { if ((martID == MART_DECOR_ID_VEILSTONE_4F_UP) || (martID == MART_DECOR_ID_VEILSTONE_4F_DOWN)) {
incBuyCount = TRUE; incBuyCount = TRUE;
} else { } else {
// never reached as the only two instances of // never reached as the only two instances of this command only ever sets the
// this command only sets martID to 0 and 1 // martID to either MART_DECOR_ID_VEILSTONE_4F_UP or MART_DECOR_ID_VEILSTONE_4F_DOWN
// respectively. // respectively.
incBuyCount = FALSE; incBuyCount = FALSE;
} }