Future/pokecrystal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

NPC trade constants don't all just start with TRADE_

Browse Source
This commit is contained in:
Rangi
2018-01-31 21:16:57 -05:00
parent b04f41da98
commit 7d6e82ef1c
15 changed files with 109 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
maps/BlackthornEmysHouse.asm
View File

@@ -9,7 +9,7 @@ BlackthornEmysHouse_MapScripts:
Emy:
faceplayer
opentext
trade NPCTRADE_EMY
trade NPC_TRADE_EMY
waitbutton
closetext
end

24
maps/BurnedTower1F.asm
View File

@@ -281,18 +281,18 @@ BurnedTower1F_MapEvents:
db 14 ; warp events
warp_event 9, 15, 13, ECRUTEAK_CITY
warp_event 10, 15, 13, ECRUTEAK_CITY
warp_event 10, 9, 1, BURNED_TOWER_B1F
warp_event 5, 5, 1, BURNED_TOWER_B1F
warp_event 5, 6, 1, BURNED_TOWER_B1F
warp_event 4, 6, 1, BURNED_TOWER_B1F
warp_event 15, 4, 2, BURNED_TOWER_B1F
warp_event 15, 5, 2, BURNED_TOWER_B1F
warp_event 10, 7, 3, BURNED_TOWER_B1F
warp_event 5, 14, 4, BURNED_TOWER_B1F
warp_event 4, 14, 4, BURNED_TOWER_B1F
warp_event 14, 14, 5, BURNED_TOWER_B1F
warp_event 15, 14, 5, BURNED_TOWER_B1F
warp_event 7, 15, 6, BURNED_TOWER_B1F
warp_event 10, 9, 1, BURNED_TOWER_B1F
warp_event 5, 5, 1, BURNED_TOWER_B1F
warp_event 5, 6, 1, BURNED_TOWER_B1F
warp_event 4, 6, 1, BURNED_TOWER_B1F
warp_event 15, 4, 2, BURNED_TOWER_B1F
warp_event 15, 5, 2, BURNED_TOWER_B1F
warp_event 10, 7, 3, BURNED_TOWER_B1F
warp_event 5, 14, 4, BURNED_TOWER_B1F
warp_event 4, 14, 4, BURNED_TOWER_B1F
warp_event 14, 14, 5, BURNED_TOWER_B1F
warp_event 15, 14, 5, BURNED_TOWER_B1F
warp_event 7, 15, 6, BURNED_TOWER_B1F
db 1 ; coord events
coord_event 11, 9, 1, BurnedTowerRivalBattleScript

2
maps/GoldenrodDeptStore5F.asm
View File

@@ -124,7 +124,7 @@ GoldenrodDeptStore5FLassScript:
Mike:
faceplayer
opentext
trade NPCTRADE_MIKE
trade NPC_TRADE_MIKE
waitbutton
closetext
end

2
maps/OlivineTimsHouse.asm
View File

@@ -9,7 +9,7 @@ OlivineTimsHouse_MapScripts:
Tim:
faceplayer
opentext
trade NPCTRADE_TIM
trade NPC_TRADE_TIM
waitbutton
closetext
end

2
maps/PewterPokecenter1F.asm
View File

@@ -30,7 +30,7 @@ PewterPokecenter1FBugCatcherScript:
Chris:
faceplayer
opentext
trade NPCTRADE_CHRIS
trade NPC_TRADE_CHRIS
waitbutton
closetext
end

2
maps/PowerPlant.asm
View File

@@ -189,7 +189,7 @@ UnknownScript_0x188ec5:
Forest:
faceplayer
opentext
trade NPCTRADE_FOREST
trade NPC_TRADE_FOREST
waitbutton
closetext
end

2
maps/Route14.asm
View File

@@ -12,7 +12,7 @@ Route14_MapScripts:
Kim:
faceplayer
opentext
trade NPCTRADE_KIM
trade NPC_TRADE_KIM
waitbutton
closetext
end

2
maps/VioletKylesHouse.asm
View File

@@ -13,7 +13,7 @@ VioletKylesHousePokefanMScript:
Kyle:
faceplayer
opentext
trade NPCTRADE_KYLE
trade NPC_TRADE_KYLE
waitbutton
closetext
end