diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2018-01-31 21:16:57 -0500 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2018-01-31 21:16:57 -0500 |
| commit | 7d6e82ef1c8c3eccdc630e85af1d687eaa612ad6 (patch) | |
| tree | 0d911d62e313e22825273421466cda2d9308cbd4 /maps | |
| parent | b04f41da98c9457c1200fdfe1c49ab20af86e3fa (diff) | |
NPC trade constants don't all just start with TRADE_
Diffstat (limited to 'maps')
| -rw-r--r-- | maps/BlackthornEmysHouse.asm | 2 | ||||
| -rw-r--r-- | maps/BurnedTower1F.asm | 24 | ||||
| -rw-r--r-- | maps/GoldenrodDeptStore5F.asm | 2 | ||||
| -rw-r--r-- | maps/OlivineTimsHouse.asm | 2 | ||||
| -rw-r--r-- | maps/PewterPokecenter1F.asm | 2 | ||||
| -rw-r--r-- | maps/PowerPlant.asm | 2 | ||||
| -rw-r--r-- | maps/Route14.asm | 2 | ||||
| -rw-r--r-- | maps/VioletKylesHouse.asm | 2 |
8 files changed, 19 insertions, 19 deletions
diff --git a/maps/BlackthornEmysHouse.asm b/maps/BlackthornEmysHouse.asm index 8e9d9af23..956a8944b 100644 --- a/maps/BlackthornEmysHouse.asm +++ b/maps/BlackthornEmysHouse.asm @@ -9,7 +9,7 @@ BlackthornEmysHouse_MapScripts: Emy: faceplayer opentext - trade NPCTRADE_EMY + trade NPC_TRADE_EMY waitbutton closetext end diff --git a/maps/BurnedTower1F.asm b/maps/BurnedTower1F.asm index 4c8f5e912..02b959381 100644 --- a/maps/BurnedTower1F.asm +++ b/maps/BurnedTower1F.asm @@ -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 diff --git a/maps/GoldenrodDeptStore5F.asm b/maps/GoldenrodDeptStore5F.asm index 31f5c0e3f..4572e53a6 100644 --- a/maps/GoldenrodDeptStore5F.asm +++ b/maps/GoldenrodDeptStore5F.asm @@ -124,7 +124,7 @@ GoldenrodDeptStore5FLassScript: Mike: faceplayer opentext - trade NPCTRADE_MIKE + trade NPC_TRADE_MIKE waitbutton closetext end diff --git a/maps/OlivineTimsHouse.asm b/maps/OlivineTimsHouse.asm index 83ce60ddc..0b9381cc0 100644 --- a/maps/OlivineTimsHouse.asm +++ b/maps/OlivineTimsHouse.asm @@ -9,7 +9,7 @@ OlivineTimsHouse_MapScripts: Tim: faceplayer opentext - trade NPCTRADE_TIM + trade NPC_TRADE_TIM waitbutton closetext end diff --git a/maps/PewterPokecenter1F.asm b/maps/PewterPokecenter1F.asm index 83a065116..c3d73a0ab 100644 --- a/maps/PewterPokecenter1F.asm +++ b/maps/PewterPokecenter1F.asm @@ -30,7 +30,7 @@ PewterPokecenter1FBugCatcherScript: Chris: faceplayer opentext - trade NPCTRADE_CHRIS + trade NPC_TRADE_CHRIS waitbutton closetext end diff --git a/maps/PowerPlant.asm b/maps/PowerPlant.asm index c5305e61f..1ecdc7656 100644 --- a/maps/PowerPlant.asm +++ b/maps/PowerPlant.asm @@ -189,7 +189,7 @@ UnknownScript_0x188ec5: Forest: faceplayer opentext - trade NPCTRADE_FOREST + trade NPC_TRADE_FOREST waitbutton closetext end diff --git a/maps/Route14.asm b/maps/Route14.asm index ab862d46a..6d04456b0 100644 --- a/maps/Route14.asm +++ b/maps/Route14.asm @@ -12,7 +12,7 @@ Route14_MapScripts: Kim: faceplayer opentext - trade NPCTRADE_KIM + trade NPC_TRADE_KIM waitbutton closetext end diff --git a/maps/VioletKylesHouse.asm b/maps/VioletKylesHouse.asm index 288b8cbb2..09078a49f 100644 --- a/maps/VioletKylesHouse.asm +++ b/maps/VioletKylesHouse.asm @@ -13,7 +13,7 @@ VioletKylesHousePokefanMScript: Kyle: faceplayer opentext - trade NPCTRADE_KYLE + trade NPC_TRADE_KYLE waitbutton closetext end |