diff options
Diffstat (limited to 'world/map/npc/001-1')
| -rw-r--r-- | world/map/npc/001-1/_warps.txt | 4 | ||||
| -rw-r--r-- | world/map/npc/001-1/bleacher.txt | 6 | ||||
| -rw-r--r-- | world/map/npc/001-1/vincent.txt | 2 |
3 files changed, 10 insertions, 2 deletions
diff --git a/world/map/npc/001-1/_warps.txt b/world/map/npc/001-1/_warps.txt index a15050cf..d113ba85 100644 --- a/world/map/npc/001-1/_warps.txt +++ b/world/map/npc/001-1/_warps.txt @@ -4,5 +4,5 @@ 001-1.gat,44,87|warp|To Sandstorm Desert|3,-1,002-1.gat,58,14 001-1.gat,44,20|warp|To North Tulimshar|3,-1,021-1.gat,55,145 001-1.gat,125,21|warp|To North Tulimshar|0,-1,021-1.gat,136,146 -001-1.gat,32,71|warp|To Tulimshar Indoor|-1,-1,001-2.gat,25,34 -001-1.gat,75,41|warp|To Tulimshar Indoor|-1,-1,001-2.gat,71,72 +001-1.gat,32,70|warp|To Tulimshar Indoor|-1,-1,001-2.gat,25,34 +001-1.gat,75,40|warp|To Tulimshar Indoor|-1,-1,001-2.gat,71,72 diff --git a/world/map/npc/001-1/bleacher.txt b/world/map/npc/001-1/bleacher.txt index e6fada9c..baed6f2e 100644 --- a/world/map/npc/001-1/bleacher.txt +++ b/world/map/npc/001-1/bleacher.txt @@ -22,6 +22,7 @@ L_bleach_menu: menu "Cotton shirt.", L_cottonshirt, + "Contributor shirt.", L_contributor, "V-Neck sweater.", L_vneck, "Turtleneck sweater.", L_tneck, "Cotton shorts.", L_shorts, @@ -44,6 +45,11 @@ L_bleach_menu: "Cotton cloth.", L_cotton_cloth, "Nevermind.", L_Close; +L_contributor: + set @normal, 1178; + set @dyeBase, 5131; + goto L_choose_color; + L_cottonshirt: set @normal, 1202; set @dyeBase, 2050; diff --git a/world/map/npc/001-1/vincent.txt b/world/map/npc/001-1/vincent.txt index 46d67e48..7f46ac44 100644 --- a/world/map/npc/001-1/vincent.txt +++ b/world/map/npc/001-1/vincent.txt @@ -4,6 +4,8 @@ { // This NPC previously used the variable TMW_Quest callfunc "ClearVarTMW_Quest"; + set @halloween_npc_id, $@halloween_npc_vincent; + callfunc "TrickOrTreat"; set @state, ((QUEST_SouthTulimshar & NIBBLE_2_MASK) >> NIBBLE_2_SHIFT); |