summaryrefslogtreecommitdiff
path: root/maps/Route2.asm
diff options
context:
space:
mode:
Diffstat (limited to 'maps/Route2.asm')
-rw-r--r--maps/Route2.asm28
1 files changed, 14 insertions, 14 deletions
diff --git a/maps/Route2.asm b/maps/Route2.asm
index 4b35a30f2..f9929d677 100644
--- a/maps/Route2.asm
+++ b/maps/Route2.asm
@@ -209,20 +209,20 @@ Route2_MapEventHeader:
; signposts
db 6
- signpost 51, 7, $0, MapRoute2Signpost0Script
- signpost 9, 11, $0, MapRoute2Signpost1Script
- signpost 23, 7, $7, MapRoute2SignpostItem2
- signpost 14, 4, $7, MapRoute2SignpostItem3
- signpost 27, 4, $7, MapRoute2SignpostItem4
- signpost 30, 11, $7, MapRoute2SignpostItem5
+ signpost 51, 7, SIGNPOST_READ, MapRoute2Signpost0Script
+ signpost 9, 11, SIGNPOST_READ, MapRoute2Signpost1Script
+ signpost 23, 7, SIGNPOST_ITEMIFSET, MapRoute2SignpostItem2
+ signpost 14, 4, SIGNPOST_ITEMIFSET, MapRoute2SignpostItem3
+ signpost 27, 4, SIGNPOST_ITEMIFSET, MapRoute2SignpostItem4
+ signpost 30, 11, SIGNPOST_ITEMIFSET, MapRoute2SignpostItem5
; people-events
db 8
- person_event SPRITE_BUG_CATCHER, 49, 14, $8, $0, 255, 255, $b2, 5, TrainerBug_catcherRob, -1
- person_event SPRITE_BUG_CATCHER, 8, 10, $1f, $0, 255, 255, $b2, 3, TrainerBug_catcherEd, -1
- person_event SPRITE_BUG_CATCHER, 44, 4, $9, $0, 255, 255, $b2, 3, TrainerBug_catcherDoug, -1
- person_event SPRITE_POKE_BALL, 33, 4, $1, $0, 255, 255, $1, 0, ItemFragment_0x1ac2fe, EVENT_783
- person_event SPRITE_POKE_BALL, 27, 6, $1, $0, 255, 255, $1, 0, ItemFragment_0x1ac300, EVENT_784
- person_event SPRITE_POKE_BALL, 6, 23, $1, $0, 255, 255, $1, 0, ItemFragment_0x1ac302, EVENT_785
- person_event SPRITE_POKE_BALL, 54, 18, $1, $0, 255, 255, $1, 0, ItemFragment_0x1ac304, EVENT_786
- person_event SPRITE_FRUIT_TREE, 18, 14, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x1ac306, -1
+ person_event SPRITE_BUG_CATCHER, 49, 14, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_BROWN << 4) | $82, 5, TrainerBug_catcherRob, -1
+ person_event SPRITE_BUG_CATCHER, 8, 10, RIGHT << 2 | $13, $0, -1, -1, (PAL_OW_BROWN << 4) | $82, 3, TrainerBug_catcherEd, -1
+ person_event SPRITE_BUG_CATCHER, 44, 4, LEFT << 2 | $1, $0, -1, -1, (PAL_OW_BROWN << 4) | $82, 3, TrainerBug_catcherDoug, -1
+ person_event SPRITE_POKE_BALL, 33, 4, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x1ac2fe, EVENT_783
+ person_event SPRITE_POKE_BALL, 27, 6, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x1ac300, EVENT_784
+ person_event SPRITE_POKE_BALL, 6, 23, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x1ac302, EVENT_785
+ person_event SPRITE_POKE_BALL, 54, 18, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x1ac304, EVENT_786
+ person_event SPRITE_FRUIT_TREE, 18, 14, DOWN << 2 | $1, $0, -1, -1, $0, 0, FruitTreeScript_0x1ac306, -1