pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2024-09-09 09:51:34 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #382 from surskitty/master

Browse Source 
Adding place names to the PokeMart list to match item constants.
This commit is contained in:
yenatch 2017-08-31 20:59:51 -04:00 committed by GitHub
commit ff7c82c64c
1 changed files with 68 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

136
items/marts.asm
View File

@ -1,43 +1,43 @@
Marts: ; 160a9 Marts: ; 160a9
dw Mart0 dw MartCherrygrove
dw Mart1 dw MartCherrygroveDex
dw Mart2 dw MartViolet
dw Mart3 dw MartAzalea
dw Mart4 dw MartCianwood
dw Mart5 dw MartGoldenrod2F1
dw Mart6 dw MartGoldenrod2F2
dw Mart7 dw MartGoldenrod3F
dw Mart8 dw MartGoldenrod4F
dw Mart9 dw MartGoldenrod5F1
dw Mart10 dw MartGoldenrod5F2
dw Mart11 dw MartGoldenrod5F3
dw Mart12 dw MartGoldenrod5F4
dw Mart13 dw MartOlivine
dw Mart14 dw MartEcruteak
dw Mart15 dw MartMahogany1
dw Mart16 dw MartMahogany2
dw Mart17 dw MartBlackthorn
dw Mart18 dw MartViridian
dw Mart19 dw MartPewter
dw Mart20 dw MartCerulean
dw Mart21 dw MartLavender
dw Mart22 dw MartVermilion
dw Mart23 dw MartCeladon2F1
dw Mart24 dw MartCeladon2F2
dw Mart25 dw MartCeladon3F
dw Mart26 dw MartCeladon4F
dw Mart27 dw MartCeladon5F1
dw Mart28 dw MartCeladon5F2
dw Mart29 dw MartFuchsia
dw Mart30 dw MartSaffron
dw Mart31 dw MartMtMoon
dw Mart32 dw MartIndigoPlateau
dw Mart33 dw MartUnderground
MartsEnd MartsEnd
; 160ed ; 160ed
Mart0: ; 160ed MartCherrygrove: ; 160ed
db 4 ; # items db 4 ; # items
db POTION db POTION
db ANTIDOTE db ANTIDOTE
@ -46,7 +46,7 @@ Mart0: ; 160ed
db $ff db $ff
; 160f3 ; 160f3
Mart1: ; 160f3 MartCherrygroveDex: ; 160f3
db 5 ; # items db 5 ; # items
db POKE_BALL db POKE_BALL
db POTION db POTION
@ -56,7 +56,7 @@ Mart1: ; 160f3
db $ff db $ff
; 160fa ; 160fa
Mart2: ; 160fa MartViolet: ; 160fa
db 10 ; # items db 10 ; # items
db POKE_BALL db POKE_BALL
db POTION db POTION
@ -71,7 +71,7 @@ Mart2: ; 160fa
db $ff db $ff
; 16106 ; 16106
Mart3: ; 16106 MartAzalea: ; 16106
db 9 ; # items db 9 ; # items
db CHARCOAL db CHARCOAL
db POKE_BALL db POKE_BALL
@ -85,7 +85,7 @@ Mart3: ; 16106
db $ff db $ff
; 16111 ; 16111
Mart4: ; 16111 MartCianwood: ; 16111
db 5 ; # items db 5 ; # items
db POTION db POTION
db SUPER_POTION db SUPER_POTION
@ -95,7 +95,7 @@ Mart4: ; 16111
db $ff db $ff
; 16118 ; 16118
Mart5: ; 16118 MartGoldenrod2F1: ; 16118
db 7 ; # items db 7 ; # items
db POTION db POTION
db SUPER_POTION db SUPER_POTION
@ -107,7 +107,7 @@ Mart5: ; 16118
db $ff db $ff
; 16121 ; 16121
Mart6: ; 16121 MartGoldenrod2F2: ; 16121
db 8 ; # items db 8 ; # items
db POKE_BALL db POKE_BALL
db GREAT_BALL db GREAT_BALL
@ -120,7 +120,7 @@ Mart6: ; 16121
db $ff db $ff
; 1612b ; 1612b
Mart7: ; 1612b MartGoldenrod3F: ; 1612b
db 7 ; # items db 7 ; # items
db X_SPEED db X_SPEED
db X_SPECIAL db X_SPECIAL
@ -132,7 +132,7 @@ Mart7: ; 1612b
db $ff db $ff
; 16134 ; 16134
Mart8: ; 16134 MartGoldenrod4F: ; 16134
db 5 ; # items db 5 ; # items
db PROTEIN db PROTEIN
db IRON db IRON
@ -142,7 +142,7 @@ Mart8: ; 16134
db $ff db $ff
; 1613b ; 1613b
Mart9: ; 1613b MartGoldenrod5F1: ; 1613b
db 3 ; # items db 3 ; # items
db TM_THUNDERPUNCH db TM_THUNDERPUNCH
db TM_FIRE_PUNCH db TM_FIRE_PUNCH
@ -150,7 +150,7 @@ Mart9: ; 1613b
db $ff db $ff
; 16140 ; 16140
Mart10: ; 16140 MartGoldenrod5F2: ; 16140
db 4 ; # items db 4 ; # items
db TM_THUNDERPUNCH db TM_THUNDERPUNCH
db TM_FIRE_PUNCH db TM_FIRE_PUNCH
@ -159,7 +159,7 @@ Mart10: ; 16140
db $ff db $ff
; 16146 ; 16146
Mart11: ; 16146 MartGoldenrod5F3: ; 16146
db 4 ; # items db 4 ; # items
db TM_THUNDERPUNCH db TM_THUNDERPUNCH
db TM_FIRE_PUNCH db TM_FIRE_PUNCH
@ -168,7 +168,7 @@ Mart11: ; 16146
db $ff db $ff
; 1614c ; 1614c
Mart12: ; 1614c MartGoldenrod5F4: ; 1614c
db 5 ; # items db 5 ; # items
db TM_THUNDERPUNCH db TM_THUNDERPUNCH
db TM_FIRE_PUNCH db TM_FIRE_PUNCH
@ -178,7 +178,7 @@ Mart12: ; 1614c
db $ff db $ff
; 16153 ; 16153
Mart13: ; 16153 MartOlivine: ; 16153
db 9 ; # items db 9 ; # items
db GREAT_BALL db GREAT_BALL
db SUPER_POTION db SUPER_POTION
@ -192,7 +192,7 @@ Mart13: ; 16153
db $ff db $ff
; 1615e ; 1615e
Mart14: ; 1615e MartEcruteak: ; 1615e
db 10 ; # items db 10 ; # items
db POKE_BALL db POKE_BALL
db GREAT_BALL db GREAT_BALL
@ -207,7 +207,7 @@ Mart14: ; 1615e
db $ff db $ff
; 1616a ; 1616a
Mart15: ; 1616a MartMahogany1: ; 1616a
db 4 ; # items db 4 ; # items
db TINYMUSHROOM db TINYMUSHROOM
db SLOWPOKETAIL db SLOWPOKETAIL
@ -216,7 +216,7 @@ Mart15: ; 1616a
db $ff db $ff
; 16170 ; 16170
Mart16: ; 16170 MartMahogany2: ; 16170
db 9 ; # items db 9 ; # items
db RAGECANDYBAR db RAGECANDYBAR
db GREAT_BALL db GREAT_BALL
@ -230,7 +230,7 @@ Mart16: ; 16170
db $ff db $ff
; 1617b ; 1617b
Mart17: ; 1617b MartBlackthorn: ; 1617b
db 9 ; # items db 9 ; # items
db GREAT_BALL db GREAT_BALL
db ULTRA_BALL db ULTRA_BALL
@ -244,7 +244,7 @@ Mart17: ; 1617b
db $ff db $ff
; 16186 ; 16186
Mart18: ; 16186 MartViridian: ; 16186
db 9 ; # items db 9 ; # items
db ULTRA_BALL db ULTRA_BALL
db HYPER_POTION db HYPER_POTION
@ -258,7 +258,7 @@ Mart18: ; 16186
db $ff db $ff
; 16191 ; 16191
Mart19: ; 16191 MartPewter: ; 16191
db 7 ; # items db 7 ; # items
db GREAT_BALL db GREAT_BALL
db SUPER_POTION db SUPER_POTION
@ -270,7 +270,7 @@ Mart19: ; 16191
db $ff db $ff
; 1619a ; 1619a
Mart20: ; 1619a MartCerulean: ; 1619a
db 9 ; # items db 9 ; # items
db GREAT_BALL db GREAT_BALL
db ULTRA_BALL db ULTRA_BALL
@ -284,7 +284,7 @@ Mart20: ; 1619a
db $ff db $ff
; 161a5 ; 161a5
Mart21: ; 161a5 MartLavender: ; 161a5
db 8 ; # items db 8 ; # items
db GREAT_BALL db GREAT_BALL
db POTION db POTION
@ -297,7 +297,7 @@ Mart21: ; 161a5
db $ff db $ff
; 161af ; 161af
Mart22: ; 161af MartVermilion: ; 161af
db 8 ; # items db 8 ; # items
db ULTRA_BALL db ULTRA_BALL
db SUPER_POTION db SUPER_POTION
@ -310,7 +310,7 @@ Mart22: ; 161af
db $ff db $ff
; 161b9 ; 161b9
Mart23: ; 161b9 MartCeladon2F1: ; 161b9
db 7 ; # items db 7 ; # items
db POTION db POTION
db SUPER_POTION db SUPER_POTION
@ -322,7 +322,7 @@ Mart23: ; 161b9
db $ff db $ff
; 161c2 ; 161c2
Mart24: ; 161c2 MartCeladon2F2: ; 161c2
db 10 ; # items db 10 ; # items
db POKE_BALL db POKE_BALL
db GREAT_BALL db GREAT_BALL
@ -337,7 +337,7 @@ Mart24: ; 161c2
db $ff db $ff
; 161ce ; 161ce
Mart25: ; 161ce MartCeladon3F: ; 161ce
db 5 ; # items db 5 ; # items
db TM_HIDDEN_POWER db TM_HIDDEN_POWER
db TM_SUNNY_DAY db TM_SUNNY_DAY
@ -347,7 +347,7 @@ Mart25: ; 161ce
db $ff db $ff
; 161d5 ; 161d5
Mart26: ; 161d5 MartCeladon4F: ; 161d5
db 3 ; # items db 3 ; # items
db POKE_DOLL db POKE_DOLL
db LOVELY_MAIL db LOVELY_MAIL
@ -355,7 +355,7 @@ Mart26: ; 161d5
db $ff db $ff
; 161da ; 161da
Mart27: ; 161da MartCeladon5F1: ; 161da
db 5 ; # items db 5 ; # items
db HP_UP db HP_UP
db PROTEIN db PROTEIN
@ -365,7 +365,7 @@ Mart27: ; 161da
db $ff db $ff
; 161e1 ; 161e1
Mart28: ; 161e1 MartCeladon5F2: ; 161e1
db 7 ; # items db 7 ; # items
db X_ACCURACY db X_ACCURACY
db GUARD_SPEC db GUARD_SPEC
@ -377,7 +377,7 @@ Mart28: ; 161e1
db $ff db $ff
; 161ea ; 161ea
Mart29: ; 161ea MartFuchsia: ; 161ea
db 7 ; # items db 7 ; # items
db GREAT_BALL db GREAT_BALL
db ULTRA_BALL db ULTRA_BALL
@ -389,7 +389,7 @@ Mart29: ; 161ea
db $ff db $ff
; 161f3 ; 161f3
Mart30: ; 161f3 MartSaffron: ; 161f3
db 8 ; # items db 8 ; # items
db GREAT_BALL db GREAT_BALL
db ULTRA_BALL db ULTRA_BALL
@ -402,7 +402,7 @@ Mart30: ; 161f3
db $ff db $ff
; 161fd ; 161fd
Mart31: ; 161fd MartMtMoon: ; 161fd
db 6 ; # items db 6 ; # items
db POKE_DOLL db POKE_DOLL
db FRESH_WATER db FRESH_WATER
@ -413,7 +413,7 @@ Mart31: ; 161fd
db $ff db $ff
; 16205 ; 16205
Mart32: ; 16205 MartIndigoPlateau: ; 16205
db 7 ; # items db 7 ; # items
db ULTRA_BALL db ULTRA_BALL
db MAX_REPEL db MAX_REPEL
@ -425,7 +425,7 @@ Mart32: ; 16205
db $ff db $ff
; 1620e ; 1620e
Mart33: ; 1620e MartUnderground: ; 1620e
db 4 ; # items db 4 ; # items
db ENERGYPOWDER db ENERGYPOWDER
db ENERGY_ROOT db ENERGY_ROOT