pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2025-01-23 09:16:20 -08:00
Code Issues Packages Projects Releases Wiki Activity

Mart constants

Browse Source
This commit is contained in:
PikalaxALT 2015-11-02 17:38:08 -05:00
parent d495087026
commit 0f37a42ad4
39 changed files with 98 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
constants/event_flags.asm
View File

@ -1817,7 +1817,7 @@
const EVENT_OLIVINE_LIGHTHOUSE_JASMINE const EVENT_OLIVINE_LIGHTHOUSE_JASMINE
const EVENT_OLIVINE_GYM_JASMINE const EVENT_OLIVINE_GYM_JASMINE
const EVENT_LAKE_OF_RAGE_LANCE const EVENT_LAKE_OF_RAGE_LANCE
const EVENT_MAHOGANY_MART_LANCE_AND_DRAGONITE const EVENT_MAHOGANY_MARTTYPE_LANCE_AND_DRAGONITE
const EVENT_TEAM_ROCKET_BASE_B2F_LANCE const EVENT_TEAM_ROCKET_BASE_B2F_LANCE
const EVENT_TEAM_ROCKET_BASE_B3F_LANCE_PASSWORDS const EVENT_TEAM_ROCKET_BASE_B3F_LANCE_PASSWORDS
const EVENT_DRAGONS_DEN_CLAIR const EVENT_DRAGONS_DEN_CLAIR
@ -1914,7 +1914,7 @@
const EVENT_OLIVINE_PORT_PASSAGE_POKEFAN_M const EVENT_OLIVINE_PORT_PASSAGE_POKEFAN_M
const EVENT_ROUTE_35_NATIONAL_PARK_GATE_YOUNGSTER const EVENT_ROUTE_35_NATIONAL_PARK_GATE_YOUNGSTER
const EVENT_LAKE_OF_RAGE_CIVILIANS const EVENT_LAKE_OF_RAGE_CIVILIANS
const EVENT_MAHOGANY_MART_OWNERS const EVENT_MAHOGANY_MARTTYPE_OWNERS
const EVENT_OLIVINE_PORT_SPRITES_BEFORE_HALL_OF_FAME const EVENT_OLIVINE_PORT_SPRITES_BEFORE_HALL_OF_FAME
const EVENT_OLIVINE_PORT_SPRITES_AFTER_HALL_OF_FAME const EVENT_OLIVINE_PORT_SPRITES_AFTER_HALL_OF_FAME
const EVENT_FAST_SHIP_PASSENGERS_FIRST_TRIP const EVENT_FAST_SHIP_PASSENGERS_FIRST_TRIP

43
constants/item_constants.asm
View File

@ -369,3 +369,46 @@ ITEMMENU_NOUSE EQU 0
ITEMMENU_CURRENT EQU 4 ITEMMENU_CURRENT EQU 4
ITEMMENU_PARTY EQU 5 ITEMMENU_PARTY EQU 5
ITEMMENU_CLOSE EQU 6 ITEMMENU_CLOSE EQU 6
const_def
const MARTTYPE_STANDARD
const MARTTYPE_BITTER
const MARTTYPE_BARGAIN
const MARTTYPE_PHARMACY
const MARTTYPE_ROOFTOP
const_def
const MART_CHERRYGROVE
const MART_CHERRYGROVE_DEX
const MART_VIOLET
const MART_AZALEA
const MART_CIANWOOD
const MART_GOLDENROD_2F_1
const MART_GOLDENROD_2F_2
const MART_GOLDENROD_3F
const MART_GOLDENROD_4F
const MART_GOLDENROD_5F_1
const MART_GOLDENROD_5F_2
const MART_GOLDENROD_5F_3
const MART_GOLDENROD_5F_4
const MART_OLIVINE
const MART_ECRUTEAK
const MART_MAHOGANY_1
const MART_MAHOGANY_2
const MART_BLACKTHORN
const MART_VIRIDIAN
const MART_PEWTER
const MART_CERULEAN
const MART_LAVENDER
const MART_VERMILION
const MART_CELADON_2F_1
const MART_CELADON_2F_2
const MART_CELADON_3F
const MART_CELADON_4F
const MART_CELADON_5F_1
const MART_CELADON_5F_2
const MART_FUCHSIA
const MART_SAFFRON
const MART_MT_MOON
const MART_INDIGO_PLATEAU
const MART_UNDERGROUND

2
constants/map_constants.asm
View File

@ -82,7 +82,7 @@ MAP_NONE EQU 0
mapgroup OLIVINE_LIGHTHOUSE_4F, 9, 10 ; 45 mapgroup OLIVINE_LIGHTHOUSE_4F, 9, 10 ; 45
mapgroup OLIVINE_LIGHTHOUSE_5F, 9, 10 ; 46 mapgroup OLIVINE_LIGHTHOUSE_5F, 9, 10 ; 46
mapgroup OLIVINE_LIGHTHOUSE_6F, 9, 10 ; 47 mapgroup OLIVINE_LIGHTHOUSE_6F, 9, 10 ; 47
mapgroup MAHOGANY_MART_1F, 4, 4 ; 48 mapgroup MAHOGANY_MARTTYPE_1F, 4, 4 ; 48
mapgroup TEAM_ROCKET_BASE_B1F, 9, 15 ; 49 mapgroup TEAM_ROCKET_BASE_B1F, 9, 15 ; 49
mapgroup TEAM_ROCKET_BASE_B2F, 9, 15 ; 50 mapgroup TEAM_ROCKET_BASE_B2F, 9, 15 ; 50
mapgroup TEAM_ROCKET_BASE_B3F, 9, 15 ; 51 mapgroup TEAM_ROCKET_BASE_B3F, 9, 15 ; 51

2
engine/map_triggers.asm
View File

@ -71,7 +71,7 @@ ENDM
trigger_def RUINS_OF_ALPH_OMANYTE_CHAMBER, wRuinsOfAlphOmanyteChamberTrigger trigger_def RUINS_OF_ALPH_OMANYTE_CHAMBER, wRuinsOfAlphOmanyteChamberTrigger
trigger_def RUINS_OF_ALPH_AERODACTYL_CHAMBER, wRuinsOfAlphAerodactylChamberTrigger trigger_def RUINS_OF_ALPH_AERODACTYL_CHAMBER, wRuinsOfAlphAerodactylChamberTrigger
trigger_def RUINS_OF_ALPH_INNER_CHAMBER, wRuinsOfAlphInnerChamberTrigger trigger_def RUINS_OF_ALPH_INNER_CHAMBER, wRuinsOfAlphInnerChamberTrigger
trigger_def MAHOGANY_MART_1F, wMahoganyMart1FTrigger trigger_def MAHOGANY_MARTTYPE_1F, wMahoganyMart1FTrigger
trigger_def TEAM_ROCKET_BASE_B1F, wTeamRocketBaseB1FTrigger trigger_def TEAM_ROCKET_BASE_B1F, wTeamRocketBaseB1FTrigger
trigger_def TEAM_ROCKET_BASE_B2F, wTeamRocketBaseB2FTrigger trigger_def TEAM_ROCKET_BASE_B2F, wTeamRocketBaseB2FTrigger
trigger_def TEAM_ROCKET_BASE_B3F, wTeamRocketBaseB3FTrigger trigger_def TEAM_ROCKET_BASE_B3F, wTeamRocketBaseB3FTrigger

4
engine/std_scripts.asm
View File

@ -489,7 +489,7 @@ InitializeEventsScript:
setevent EVENT_ILEX_FOREST_APPRENTICE setevent EVENT_ILEX_FOREST_APPRENTICE
setevent EVENT_ILEX_FOREST_FARFETCHD setevent EVENT_ILEX_FOREST_FARFETCHD
setevent EVENT_ILEX_FOREST_CHARCOAL_MASTER setevent EVENT_ILEX_FOREST_CHARCOAL_MASTER
setevent EVENT_MAHOGANY_MART_LANCE_AND_DRAGONITE setevent EVENT_MAHOGANY_MARTTYPE_LANCE_AND_DRAGONITE
setevent EVENT_TEAM_ROCKET_BASE_B2F_GRUNT_WITH_EXECUTIVE setevent EVENT_TEAM_ROCKET_BASE_B2F_GRUNT_WITH_EXECUTIVE
setevent EVENT_TEAM_ROCKET_BASE_B2F_EXECUTIVE setevent EVENT_TEAM_ROCKET_BASE_B2F_EXECUTIVE
setevent EVENT_TEAM_ROCKET_BASE_B2F_DRAGONITE setevent EVENT_TEAM_ROCKET_BASE_B2F_DRAGONITE
@ -535,7 +535,7 @@ InitializeEventsScript:
setevent EVENT_FAST_SHIP_B1F_SAILOR_RIGHT setevent EVENT_FAST_SHIP_B1F_SAILOR_RIGHT
setevent EVENT_FAST_SHIP_CABINS_NNW_NNE_NE_SAILOR setevent EVENT_FAST_SHIP_CABINS_NNW_NNE_NE_SAILOR
setevent EVENT_LAKE_OF_RAGE_CIVILIANS setevent EVENT_LAKE_OF_RAGE_CIVILIANS
setevent EVENT_MAHOGANY_MART_OWNERS setevent EVENT_MAHOGANY_MARTTYPE_OWNERS
setevent EVENT_TIN_TOWER_ROOF_HO_OH setevent EVENT_TIN_TOWER_ROOF_HO_OH
setevent EVENT_WHIRL_ISLAND_LUGIA_CHAMBER_LUGIA setevent EVENT_WHIRL_ISLAND_LUGIA_CHAMBER_LUGIA
setevent EVENT_KRISS_HOUSE_2F_CONSOLE setevent EVENT_KRISS_HOUSE_2F_CONSOLE

2
maps/AzaleaMart.asm
View File

@ -7,7 +7,7 @@ AzaleaMart_MapScriptHeader:
ClerkScript_0x18e040: ClerkScript_0x18e040:
loadfont loadfont
pokemart $0, $0003 pokemart MARTTYPE_STANDARD, MART_AZALEA
loadmovesprites loadmovesprites
end end

2
maps/BlackthornGym1F.asm
View File

@ -47,7 +47,7 @@ ClairScript_0x194e24:
setevent EVENT_BEAT_COOLTRAINERM_MIKE setevent EVENT_BEAT_COOLTRAINERM_MIKE
setevent EVENT_BEAT_COOLTRAINERF_FRAN setevent EVENT_BEAT_COOLTRAINERF_FRAN
setevent EVENT_BEAT_COOLTRAINERF_LOLA setevent EVENT_BEAT_COOLTRAINERF_LOLA
clearevent EVENT_MAHOGANY_MART_OWNERS clearevent EVENT_MAHOGANY_MARTTYPE_OWNERS
setevent EVENT_BLACKTHORN_CITY_GRAMPS_BLOCKS_DRAGONS_DEN setevent EVENT_BLACKTHORN_CITY_GRAMPS_BLOCKS_DRAGONS_DEN
clearevent EVENT_BLACKTHORN_CITY_GRAMPS_NOT_BLOCKING_DRAGONS_DEN clearevent EVENT_BLACKTHORN_CITY_GRAMPS_NOT_BLOCKING_DRAGONS_DEN
end end

2
maps/BlackthornMart.asm
View File

@ -7,7 +7,7 @@ BlackthornMart_MapScriptHeader:
ClerkScript_0x195a5d: ClerkScript_0x195a5d:
loadfont loadfont
pokemart $0, $0011 pokemart MARTTYPE_STANDARD, MART_BLACKTHORN
loadmovesprites loadmovesprites
end end

4
maps/CeladonDeptStore2F.asm
View File

@ -8,14 +8,14 @@ CeladonDeptStore2F_MapScriptHeader:
ClerkScript_0x70bad: ClerkScript_0x70bad:
faceplayer faceplayer
loadfont loadfont
pokemart $0, $0017 pokemart MARTTYPE_STANDARD, MART_CELADON_2F_1
loadmovesprites loadmovesprites
end end
ClerkScript_0x70bb5: ClerkScript_0x70bb5:
faceplayer faceplayer
loadfont loadfont
pokemart $0, $0018 pokemart MARTTYPE_STANDARD, MART_CELADON_2F_2
loadmovesprites loadmovesprites
end end

2
maps/CeladonDeptStore3F.asm
View File

@ -8,7 +8,7 @@ CeladonDeptStore3F_MapScriptHeader:
ClerkScript_0x70d29: ClerkScript_0x70d29:
faceplayer faceplayer
loadfont loadfont
pokemart $0, $0019 pokemart MARTTYPE_STANDARD, MART_CELADON_3F
loadmovesprites loadmovesprites
end end

2
maps/CeladonDeptStore4F.asm
View File

@ -8,7 +8,7 @@ CeladonDeptStore4F_MapScriptHeader:
ClerkScript_0x70f0d: ClerkScript_0x70f0d:
faceplayer faceplayer
loadfont loadfont
pokemart $0, $001a pokemart MARTTYPE_STANDARD, MART_CELADON_4F
loadmovesprites loadmovesprites
end end

4
maps/CeladonDeptStore5F.asm
View File

@ -8,14 +8,14 @@ CeladonDeptStore5F_MapScriptHeader:
ClerkScript_0x71004: ClerkScript_0x71004:
faceplayer faceplayer
loadfont loadfont
pokemart $0, $001b pokemart MARTTYPE_STANDARD, MART_CELADON_5F_1
loadmovesprites loadmovesprites
end end
ClerkScript_0x7100c: ClerkScript_0x7100c:
faceplayer faceplayer
loadfont loadfont
pokemart $0, $001c pokemart MARTTYPE_STANDARD, MART_CELADON_5F_2
loadmovesprites loadmovesprites
end end

2
maps/CeruleanMart.asm
View File

@ -7,7 +7,7 @@ CeruleanMart_MapScriptHeader:
ClerkScript_0x188ac0: ClerkScript_0x188ac0:
loadfont loadfont
pokemart $0, $0014 pokemart MARTTYPE_STANDARD, MART_CERULEAN
loadmovesprites loadmovesprites
end end

4
maps/CherrygroveMart.asm
View File

@ -9,12 +9,12 @@ ClerkScript_0x19680a:
loadfont loadfont
checkevent EVENT_GAVE_MYSTERY_EGG_TO_ELM checkevent EVENT_GAVE_MYSTERY_EGG_TO_ELM
iftrue UnknownScript_0x196817 iftrue UnknownScript_0x196817
pokemart $0, 0 pokemart MARTTYPE_STANDARD, MART_CHERRYGROVE
loadmovesprites loadmovesprites
end end
UnknownScript_0x196817: UnknownScript_0x196817:
pokemart $0, $0001 pokemart MARTTYPE_STANDARD, MART_CHERRYGROVE_DEX
loadmovesprites loadmovesprites
end end

2
maps/CianwoodPharmacy.asm
View File

@ -32,7 +32,7 @@ CianwoodPharmacist:
end end
.Mart .Mart
pokemart $3, $0004 pokemart MARTTYPE_PHARMACY, MART_CIANWOOD
loadmovesprites loadmovesprites
end end

2
maps/EcruteakMart.asm
View File

@ -7,7 +7,7 @@ EcruteakMart_MapScriptHeader:
ClerkScript_0x99c3b: ClerkScript_0x99c3b:
loadfont loadfont
pokemart $0, $000e pokemart MARTTYPE_STANDARD, MART_ECRUTEAK
loadmovesprites loadmovesprites
end end

2
maps/FuchsiaMart.asm
View File

@ -7,7 +7,7 @@ FuchsiaMart_MapScriptHeader:
ClerkScript_0x195ce8: ClerkScript_0x195ce8:
loadfont loadfont
pokemart $0, $001d pokemart MARTTYPE_STANDARD, MART_FUCHSIA
loadmovesprites loadmovesprites
end end

4
maps/GoldenrodDeptStore2F.asm
View File

@ -8,14 +8,14 @@ GoldenrodDeptStore2F_MapScriptHeader:
ClerkScript_0x55b5d: ClerkScript_0x55b5d:
faceplayer faceplayer
loadfont loadfont
pokemart $0, $0005 pokemart MARTTYPE_STANDARD, MART_GOLDENROD_2F_1
loadmovesprites loadmovesprites
end end
ClerkScript_0x55b65: ClerkScript_0x55b65:
faceplayer faceplayer
loadfont loadfont
pokemart $0, $0006 pokemart MARTTYPE_STANDARD, MART_GOLDENROD_2F_2
loadmovesprites loadmovesprites
end end

2
maps/GoldenrodDeptStore3F.asm
View File

@ -8,7 +8,7 @@ GoldenrodDeptStore3F_MapScriptHeader:
ClerkScript_0x55db8: ClerkScript_0x55db8:
faceplayer faceplayer
loadfont loadfont
pokemart $0, $0007 pokemart MARTTYPE_STANDARD, MART_GOLDENROD_3F
loadmovesprites loadmovesprites
end end

2
maps/GoldenrodDeptStore4F.asm
View File

@ -8,7 +8,7 @@ GoldenrodDeptStore4F_MapScriptHeader:
ClerkScript_0x55ee9: ClerkScript_0x55ee9:
faceplayer faceplayer
loadfont loadfont
pokemart $0, $0008 pokemart MARTTYPE_STANDARD, MART_GOLDENROD_4F
loadmovesprites loadmovesprites
end end

8
maps/GoldenrodDeptStore5F.asm
View File

@ -34,22 +34,22 @@ ClerkScript_0x5609c:
jump .onlyheadbutt jump .onlyheadbutt
.neither: .neither:
pokemart $0, $0009 pokemart MARTTYPE_STANDARD, MART_GOLDENROD_5F_1
loadmovesprites loadmovesprites
end end
.onlyheadbutt: .onlyheadbutt:
pokemart $0, $000a pokemart MARTTYPE_STANDARD, MART_GOLDENROD_5F_2
loadmovesprites loadmovesprites
end end
.onlyrocksmash: .onlyrocksmash:
pokemart $0, $000b pokemart MARTTYPE_STANDARD, MART_GOLDENROD_5F_3
loadmovesprites loadmovesprites
end end
.both: .both:
pokemart $0, $000c pokemart MARTTYPE_STANDARD, MART_GOLDENROD_5F_4
loadmovesprites loadmovesprites
end end

2
maps/GoldenrodDeptStoreRoof.asm
View File

@ -35,7 +35,7 @@ GoldenrodDeptStoreRoof_MapScriptHeader:
ClerkScript_0x5673f: ClerkScript_0x5673f:
loadfont loadfont
pokemart $4, 0 pokemart MARTTYPE_ROOFTOP, 0
loadmovesprites loadmovesprites
end end

2
maps/IndigoPlateauPokeCenter1F.asm
View File

@ -137,7 +137,7 @@ NurseScript_0x18012c:
ClerkScript_0x18012f: ClerkScript_0x18012f:
loadfont loadfont
pokemart $0, $0020 pokemart MARTTYPE_STANDARD, MART_INDIGO_PLATEAU
loadmovesprites loadmovesprites
end end

2
maps/KrissHouse2F.asm
View File

@ -70,8 +70,10 @@ KrissHouseRadio:
loadmovesprites loadmovesprites
setevent EVENT_LISTENED_TO_INITIAL_RADIO setevent EVENT_LISTENED_TO_INITIAL_RADIO
end end
.NormalRadio .NormalRadio
jumpstd radio1 jumpstd radio1
.AbbreviatedRadio .AbbreviatedRadio
loadfont loadfont
writetext KrisRadioText4 writetext KrisRadioText4

4
maps/LakeofRage.asm
View File

@ -51,9 +51,9 @@ UnknownScript_0x70035:
playsound SFX_WARP_TO playsound SFX_WARP_TO
applymovement $2, MovementData_0x70155 applymovement $2, MovementData_0x70155
disappear $2 disappear $2
clearevent EVENT_MAHOGANY_MART_LANCE_AND_DRAGONITE clearevent EVENT_MAHOGANY_MARTTYPE_LANCE_AND_DRAGONITE
setevent EVENT_DECIDED_TO_HELP_LANCE setevent EVENT_DECIDED_TO_HELP_LANCE
domaptrigger MAHOGANY_MART_1F, $1 domaptrigger MAHOGANY_MARTTYPE_1F, $1
end end
UnknownScript_0x7004e: UnknownScript_0x7004e:

2
maps/LavenderMart.asm
View File

@ -7,7 +7,7 @@ LavenderMart_MapScriptHeader:
ClerkScript_0x7eb1c: ClerkScript_0x7eb1c:
loadfont loadfont
pokemart $0, $0015 pokemart MARTTYPE_STANDARD, MART_LAVENDER
loadmovesprites loadmovesprites
end end

10
maps/MahoganyMart1F.asm
View File

@ -34,7 +34,7 @@ PharmacistScript_0x6c367:
loadfont loadfont
checkevent EVENT_DECIDED_TO_HELP_LANCE checkevent EVENT_DECIDED_TO_HELP_LANCE
iftrue UnknownScript_0x6c375 iftrue UnknownScript_0x6c375
pokemart $0, $000f pokemart MARTTYPE_STANDARD, MART_MAHOGANY_1
loadmovesprites loadmovesprites
end end
@ -106,7 +106,7 @@ UnknownScript_0x6c38f:
GrannyScript_0x6c3ee: GrannyScript_0x6c3ee:
faceplayer faceplayer
loadfont loadfont
pokemart $0, $0010 pokemart MARTTYPE_STANDARD, MART_MAHOGANY_2
loadmovesprites loadmovesprites
end end
@ -238,6 +238,6 @@ MahoganyMart1F_MapEventHeader:
db 5 db 5
person_event SPRITE_PHARMACIST, 3, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, 0, 0, PharmacistScript_0x6c367, EVENT_TEAM_ROCKET_BASE_POPULATION person_event SPRITE_PHARMACIST, 3, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, 0, 0, PharmacistScript_0x6c367, EVENT_TEAM_ROCKET_BASE_POPULATION
person_event SPRITE_BLACK_BELT, 6, 1, SPRITEMOVEDATA_03, 0, 0, -1, -1, 0, 0, 0, BlackBeltScript_0x6c37b, EVENT_TEAM_ROCKET_BASE_POPULATION person_event SPRITE_BLACK_BELT, 6, 1, SPRITEMOVEDATA_03, 0, 0, -1, -1, 0, 0, 0, BlackBeltScript_0x6c37b, EVENT_TEAM_ROCKET_BASE_POPULATION
person_event SPRITE_LANCE, 6, 4, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, 0, 0, ObjectEvent, EVENT_MAHOGANY_MART_LANCE_AND_DRAGONITE person_event SPRITE_LANCE, 6, 4, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, 0, 0, ObjectEvent, EVENT_MAHOGANY_MARTTYPE_LANCE_AND_DRAGONITE
person_event SPRITE_DRAGON, 6, 3, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, 0, 0, ObjectEvent, EVENT_MAHOGANY_MART_LANCE_AND_DRAGONITE person_event SPRITE_DRAGON, 6, 3, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, 0, 0, ObjectEvent, EVENT_MAHOGANY_MARTTYPE_LANCE_AND_DRAGONITE
person_event SPRITE_GRANNY, 3, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, 0, 0, GrannyScript_0x6c3ee, EVENT_MAHOGANY_MART_OWNERS person_event SPRITE_GRANNY, 3, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, 0, 0, GrannyScript_0x6c3ee, EVENT_MAHOGANY_MARTTYPE_OWNERS

4
maps/MahoganyTown.asm
View File

@ -248,7 +248,7 @@ MahoganyTown_MapEventHeader:
.Warps: .Warps:
db 5 db 5
warp_def $7, $b, 1, MAHOGANY_MART_1F warp_def $7, $b, 1, MAHOGANY_MARTTYPE_1F
warp_def $7, $11, 1, MAHOGANY_RED_GYARADOS_SPEECH_HOUSE warp_def $7, $11, 1, MAHOGANY_RED_GYARADOS_SPEECH_HOUSE
warp_def $d, $6, 1, MAHOGANY_GYM warp_def $d, $6, 1, MAHOGANY_GYM
warp_def $d, $f, 1, MAHOGANY_POKECENTER_1F warp_def $d, $f, 1, MAHOGANY_POKECENTER_1F
@ -271,4 +271,4 @@ MahoganyTown_MapEventHeader:
person_event SPRITE_POKEFAN_M, 8, 19, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, 0, 0, PokefanMScript_0x19002e, EVENT_MAHOGANY_TOWN_POKEFAN_M_BLOCKS_EAST person_event SPRITE_POKEFAN_M, 8, 19, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, 0, 0, PokefanMScript_0x19002e, EVENT_MAHOGANY_TOWN_POKEFAN_M_BLOCKS_EAST
person_event SPRITE_GRAMPS, 9, 6, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, 0, 0, 0, GrampsScript_0x19007e, -1 person_event SPRITE_GRAMPS, 9, 6, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, 0, 0, 0, GrampsScript_0x19007e, -1
person_event SPRITE_FISHER, 14, 6, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, FisherScript_0x190092, EVENT_MAHOGANY_TOWN_POKEFAN_M_BLOCKS_GYM person_event SPRITE_FISHER, 14, 6, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, FisherScript_0x190092, EVENT_MAHOGANY_TOWN_POKEFAN_M_BLOCKS_GYM
person_event SPRITE_LASS, 8, 12, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, 0, 0, LassScript_0x190095, EVENT_MAHOGANY_MART_OWNERS person_event SPRITE_LASS, 8, 12, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, 0, 0, LassScript_0x190095, EVENT_MAHOGANY_MARTTYPE_OWNERS

2
maps/MountMoonGiftShop.asm
View File

@ -8,7 +8,7 @@ MountMoonGiftShop_MapScriptHeader:
GrampsScript_0x771a8: GrampsScript_0x771a8:
faceplayer faceplayer
loadfont loadfont
pokemart $0, $001f pokemart MARTTYPE_STANDARD, MART_MT_MOON
loadmovesprites loadmovesprites
end end

2
maps/OlivineMart.asm
View File

@ -7,7 +7,7 @@ OlivineMart_MapScriptHeader:
ClerkScript_0x9cac7: ClerkScript_0x9cac7:
loadfont loadfont
pokemart $0, $000d pokemart MARTTYPE_STANDARD, MART_OLIVINE
loadmovesprites loadmovesprites
end end

2
maps/PewterMart.asm
View File

@ -7,7 +7,7 @@ PewterMart_MapScriptHeader:
ClerkScript_0x1a2dcb: ClerkScript_0x1a2dcb:
loadfont loadfont
pokemart $0, $0013 pokemart MARTTYPE_STANDARD, MART_PEWTER
loadmovesprites loadmovesprites
end end

2
maps/RadioTower5F.asm
View File

@ -102,7 +102,7 @@ UnknownScript_0x6006e:
setevent EVENT_GOLDENROD_CITY_ROCKET_SCOUT setevent EVENT_GOLDENROD_CITY_ROCKET_SCOUT
setevent EVENT_GOLDENROD_CITY_ROCKET_TAKEOVER setevent EVENT_GOLDENROD_CITY_ROCKET_TAKEOVER
setevent EVENT_RADIO_TOWER_ROCKET_TAKEOVER setevent EVENT_RADIO_TOWER_ROCKET_TAKEOVER
clearevent EVENT_MAHOGANY_MART_OWNERS clearevent EVENT_MAHOGANY_MARTTYPE_OWNERS
clearflag ENGINE_ROCKETS_IN_MAHOGANY clearflag ENGINE_ROCKETS_IN_MAHOGANY
clearevent EVENT_GOLDENROD_CITY_CIVILIANS clearevent EVENT_GOLDENROD_CITY_CIVILIANS
clearevent EVENT_RADIO_TOWER_CIVILIANS_AFTER clearevent EVENT_RADIO_TOWER_CIVILIANS_AFTER

2
maps/SaffronMart.asm
View File

@ -7,7 +7,7 @@ SaffronMart_MapScriptHeader:
ClerkScript_0x18a3bf: ClerkScript_0x18a3bf:
loadfont loadfont
pokemart $0, $001e pokemart MARTTYPE_STANDARD, MART_SAFFRON
loadmovesprites loadmovesprites
end end

2
maps/TeamRocketBaseB1F.asm
View File

@ -730,7 +730,7 @@ TeamRocketBaseB1F_MapEventHeader:
.Warps: .Warps:
db 4 db 4
warp_def $2, $1b, 3, MAHOGANY_MART_1F warp_def $2, $1b, 3, MAHOGANY_MARTTYPE_1F
warp_def $e, $3, 1, TEAM_ROCKET_BASE_B2F warp_def $e, $3, 1, TEAM_ROCKET_BASE_B2F
warp_def $f, $5, 4, TEAM_ROCKET_BASE_B1F warp_def $f, $5, 4, TEAM_ROCKET_BASE_B1F
warp_def $2, $19, 3, TEAM_ROCKET_BASE_B1F warp_def $2, $19, 3, TEAM_ROCKET_BASE_B1F

2
maps/VermilionMart.asm
View File

@ -7,7 +7,7 @@ VermilionMart_MapScriptHeader:
ClerkScript_0x191f7e: ClerkScript_0x191f7e:
loadfont loadfont
pokemart $0, $0016 pokemart MARTTYPE_STANDARD, MART_VERMILION
loadmovesprites loadmovesprites
end end

2
maps/VioletMart.asm
View File

@ -7,7 +7,7 @@ VioletMart_MapScriptHeader:
ClerkScript_0x68295: ClerkScript_0x68295:
loadfont loadfont
pokemart $0, $0002 pokemart MARTTYPE_STANDARD, MART_VIOLET
loadmovesprites loadmovesprites
end end

2
maps/ViridianMart.asm
View File

@ -7,7 +7,7 @@ ViridianMart_MapScriptHeader:
ClerkScript_0x9b5e7: ClerkScript_0x9b5e7:
loadfont loadfont
pokemart $0, $0012 pokemart MARTTYPE_STANDARD, MART_VIRIDIAN
loadmovesprites loadmovesprites
end end

4
maps/WarehouseEntrance.asm
View File

@ -156,7 +156,7 @@ GrannyScript_0x7c132:
jump WarehouseEntranceScript_ShopClosed jump WarehouseEntranceScript_ShopClosed
.Open: .Open:
pokemart $1, $0021 pokemart MARTTYPE_BITTER, MART_UNDERGROUND
loadmovesprites loadmovesprites
end end
@ -171,7 +171,7 @@ GrampsScript_0x7c146:
.CheckMorn: .CheckMorn:
checkmorn checkmorn
iffalse WarehouseEntranceScript_ShopClosed iffalse WarehouseEntranceScript_ShopClosed
pokemart $2, 0 pokemart MARTTYPE_BARGAIN, 0
loadmovesprites loadmovesprites
end end

2
maps/second_map_headers.asm
View File

@ -325,7 +325,7 @@
map_header_2 OlivineLighthouse4F, OLIVINE_LIGHTHOUSE_4F, $0, 0 map_header_2 OlivineLighthouse4F, OLIVINE_LIGHTHOUSE_4F, $0, 0
map_header_2 OlivineLighthouse5F, OLIVINE_LIGHTHOUSE_5F, $0, 0 map_header_2 OlivineLighthouse5F, OLIVINE_LIGHTHOUSE_5F, $0, 0
map_header_2 OlivineLighthouse6F, OLIVINE_LIGHTHOUSE_6F, $0, 0 map_header_2 OlivineLighthouse6F, OLIVINE_LIGHTHOUSE_6F, $0, 0
map_header_2 MahoganyMart1F, MAHOGANY_MART_1F, $0, 0 map_header_2 MahoganyMart1F, MAHOGANY_MARTTYPE_1F, $0, 0
map_header_2 TeamRocketBaseB1F, TEAM_ROCKET_BASE_B1F, $0, 0 map_header_2 TeamRocketBaseB1F, TEAM_ROCKET_BASE_B1F, $0, 0
map_header_2 TeamRocketBaseB2F, TEAM_ROCKET_BASE_B2F, $0, 0 map_header_2 TeamRocketBaseB2F, TEAM_ROCKET_BASE_B2F, $0, 0
map_header_2 TeamRocketBaseB3F, TEAM_ROCKET_BASE_B3F, $0, 0 map_header_2 TeamRocketBaseB3F, TEAM_ROCKET_BASE_B3F, $0, 0