diff options
| author | PikalaxALT <PikalaxALT@gmail.com> | 2015-07-19 04:58:31 -0400 |
|---|---|---|
| committer | PikalaxALT <PikalaxALT@gmail.com> | 2015-07-19 04:58:31 -0400 |
| commit | 94129b6b451fc7770ea75ffbdcbaab4967f513bd (patch) | |
| tree | 71322ce7157f3c8a98e60aeeed825a3e06799c4e /maps/Route35.asm | |
| parent | 60cd04b02300c288a01a2f78a44cb39cbe6861d1 (diff) | |
Finished the decoration attributes table
Interpretation of the Decoration Attributes table is complete.
Other changes include some more event flag and function naming, as well as a minor tweak to the person_events of every map.
Diffstat (limited to 'maps/Route35.asm')
| -rw-r--r-- | maps/Route35.asm | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/maps/Route35.asm b/maps/Route35.asm index fe3304398..5d642a89e 100644 --- a/maps/Route35.asm +++ b/maps/Route35.asm @@ -469,14 +469,14 @@ Route35_MapEventHeader: ; people-events db 11 - person_event SPRITE_YOUNGSTER, 23, 8, LEFT << 2 | $2, $0, -1, -1, (PAL_OW_GREEN << 4) | $82, 2, TrainerCamperIvan, -1 - person_event SPRITE_YOUNGSTER, 24, 12, UP << 2 | $2, $0, -1, -1, (PAL_OW_GREEN << 4) | $82, 3, TrainerCamperElliot, -1 - person_event SPRITE_LASS, 24, 11, UP << 2 | $2, $0, -1, -1, (PAL_OW_GREEN << 4) | $82, 3, TrainerPicnickerBrooke, -1 - person_event SPRITE_LASS, 30, 14, LEFT << 2 | $2, $0, -1, -1, (PAL_OW_GREEN << 4) | $82, 1, TrainerPicnickerKim, -1 - person_event SPRITE_YOUNGSTER, 32, 18, UP << 2 | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 0, TrainerBird_keeperBryan, -1 - person_event SPRITE_FISHER, 14, 6, RIGHT << 2 | $12, $0, -1, -1, (PAL_OW_RED << 4) | $82, 2, TrainerFirebreatherWalt, -1 - person_event SPRITE_BUG_CATCHER, 11, 20, UP << 2 | $2, $2, -1, -1, (PAL_OW_BROWN << 4) | $82, 3, TrainerBug_catcherArnie1, -1 - person_event SPRITE_SUPER_NERD, 14, 9, LEFT << 2 | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 2, TrainerJugglerIrwin, -1 - person_event SPRITE_OFFICER, 10, 9, UP << 2 | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, OfficerScript_0x19ca49, -1 - person_event SPRITE_FRUIT_TREE, 29, 6, DOWN << 2 | $1, $0, -1, -1, $0, 0, FruitTreeScript_0x19ca7e, -1 - person_event SPRITE_POKE_BALL, 20, 17, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x19ca7c, EVENT_ROUTE_35_TM_ROLLOUT + person_event SPRITE_YOUNGSTER, 23, 8, OW_LEFT | $2, $0, -1, -1, (PAL_OW_GREEN << 4) | $82, 2, TrainerCamperIvan, -1 + person_event SPRITE_YOUNGSTER, 24, 12, OW_UP | $2, $0, -1, -1, (PAL_OW_GREEN << 4) | $82, 3, TrainerCamperElliot, -1 + person_event SPRITE_LASS, 24, 11, OW_UP | $2, $0, -1, -1, (PAL_OW_GREEN << 4) | $82, 3, TrainerPicnickerBrooke, -1 + person_event SPRITE_LASS, 30, 14, OW_LEFT | $2, $0, -1, -1, (PAL_OW_GREEN << 4) | $82, 1, TrainerPicnickerKim, -1 + person_event SPRITE_YOUNGSTER, 32, 18, OW_UP | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 0, TrainerBird_keeperBryan, -1 + person_event SPRITE_FISHER, 14, 6, OW_RIGHT | $12, $0, -1, -1, (PAL_OW_RED << 4) | $82, 2, TrainerFirebreatherWalt, -1 + person_event SPRITE_BUG_CATCHER, 11, 20, OW_UP | $2, $2, -1, -1, (PAL_OW_BROWN << 4) | $82, 3, TrainerBug_catcherArnie1, -1 + person_event SPRITE_SUPER_NERD, 14, 9, OW_LEFT | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 2, TrainerJugglerIrwin, -1 + person_event SPRITE_OFFICER, 10, 9, OW_UP | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, OfficerScript_0x19ca49, -1 + person_event SPRITE_FRUIT_TREE, 29, 6, OW_DOWN | $1, $0, -1, -1, $0, 0, FruitTreeScript_0x19ca7e, -1 + person_event SPRITE_POKE_BALL, 20, 17, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x19ca7c, EVENT_ROUTE_35_TM_ROLLOUT |