diff options
Diffstat (limited to 'maps/AzaleaTown.asm')
| -rw-r--r-- | maps/AzaleaTown.asm | 69 |
1 files changed, 34 insertions, 35 deletions
diff --git a/maps/AzaleaTown.asm b/maps/AzaleaTown.asm index 788c9bb9a..c77258a31 100644 --- a/maps/AzaleaTown.asm +++ b/maps/AzaleaTown.asm @@ -1,5 +1,5 @@ AzaleaTown_MapScriptHeader: - ; trigger count +.MapTriggers: db 3 ; triggers @@ -7,7 +7,7 @@ AzaleaTown_MapScriptHeader: dw .Trigger2, $0000 dw .Trigger3, $0000 - ; callback count +.MapCallbacks: db 1 ; callbacks @@ -29,7 +29,7 @@ AzaleaTown_MapScriptHeader: UnknownScript_0x198018: moveperson $b, $b, $b spriteface $0, RIGHT - showemote $0, $0, 15 + showemote EMOTE_SHOCK, $0, 15 special Functionc48f pause 15 appear $b @@ -39,7 +39,7 @@ UnknownScript_0x198018: UnknownScript_0x198034: spriteface $0, RIGHT - showemote $0, $0, 15 + showemote EMOTE_SHOCK, $0, 15 special Functionc48f pause 15 appear $b @@ -51,7 +51,7 @@ UnknownScript_0x198049: writetext UnknownText_0x19814d closetext loadmovesprites - setevent EVENT_6BF + setevent EVENT_RIVAL_AZALEA_TOWN checkevent EVENT_GOT_TOTODILE_FROM_ELM iftrue UnknownScript_0x198071 checkevent EVENT_GOT_CHIKORITA_FROM_ELM @@ -158,8 +158,8 @@ UnknownScript_0x1980e5: verbosegiveitem GS_BALL, 1 spriteface $d, LEFT setflag ENGINE_HAVE_EXAMINED_GS_BALL - clearevent EVENT_6ED - setevent EVENT_6EB + clearevent EVENT_ILEX_FOREST_LASS + setevent EVENT_ROUTE_34_ILEX_FOREST_GATE_LASS dotrigger $0 loadmovesprites end @@ -201,8 +201,7 @@ WhiteApricornTree: fruittree $14 MapAzaleaTownSignpostItem8: - dw $00b1 - db FULL_HEAL + dwb EVENT_AZALEA_TOWN_HIDDEN_FULL_HEAL, FULL_HEAL MovementData_0x198134: @@ -451,7 +450,7 @@ AzaleaTown_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 8 warp_def $9, $f, 1, GROUP_AZALEA_POKECENTER_1F, MAP_AZALEA_POKECENTER_1F warp_def $d, $15, 1, GROUP_CHARCOAL_KILN, MAP_CHARCOAL_KILN @@ -462,35 +461,35 @@ AzaleaTown_MapEventHeader: warp_def $a, $2, 3, GROUP_ILEX_FOREST_AZALEA_GATE, MAP_ILEX_FOREST_AZALEA_GATE warp_def $b, $2, 4, GROUP_ILEX_FOREST_AZALEA_GATE, MAP_ILEX_FOREST_AZALEA_GATE - ; xy triggers +.XYTriggers: db 3 xy_trigger 1, $a, $5, $0, UnknownScript_0x198018, $0, $0 xy_trigger 1, $b, $5, $0, UnknownScript_0x198034, $0, $0 xy_trigger 2, $6, $9, $0, UnknownScript_0x1980e5, $0, $0 - ; signposts +.Signposts: db 9 - signpost 9, 19, $0, AzaleaTownSign - signpost 9, 10, $0, KurtsHouseSign - signpost 15, 14, $0, AzaleaGymSign - signpost 7, 29, $0, SlowpokeWellSign - signpost 13, 19, $0, CharcoalKilnSign - signpost 9, 16, $0, AzaleaTownPokeCenterSign - signpost 5, 22, $0, AzaleaTownMartSign - signpost 9, 3, $0, AzaleaTownIlextForestSign - signpost 6, 31, $7, MapAzaleaTownSignpostItem8 - - ; people-events + signpost 9, 19, SIGNPOST_READ, AzaleaTownSign + signpost 9, 10, SIGNPOST_READ, KurtsHouseSign + signpost 15, 14, SIGNPOST_READ, AzaleaGymSign + signpost 7, 29, SIGNPOST_READ, SlowpokeWellSign + signpost 13, 19, SIGNPOST_READ, CharcoalKilnSign + signpost 9, 16, SIGNPOST_READ, AzaleaTownPokeCenterSign + signpost 5, 22, SIGNPOST_READ, AzaleaTownMartSign + signpost 9, 3, SIGNPOST_READ, AzaleaTownIlextForestSign + signpost 6, 31, SIGNPOST_ITEM, MapAzaleaTownSignpostItem8 + +.PersonEvents: db 12 - person_event SPRITE_AZALEA_ROCKET, 13, 35, $6, $0, 255, 255, $0, 0, AzaleaRocketScript_0x1980ab, EVENT_6FA - person_event SPRITE_GRAMPS, 13, 25, $2, $21, 255, 255, $0, 0, GrampsScript_0x1980b1, -1 - person_event SPRITE_TEACHER, 17, 19, $4, $20, 255, 255, $90, 0, TeacherScript_0x1980c5, -1 - person_event SPRITE_YOUNGSTER, 13, 11, $5, $1, 255, 255, $a0, 0, YoungsterScript_0x1980c8, -1 - person_event SPRITE_SLOWPOKE, 21, 12, $1, $0, 255, 255, $0, 0, SlowpokeScript_0x1980cb, EVENT_6F9 - person_event SPRITE_SLOWPOKE, 13, 22, $1, $0, 255, 255, $0, 0, SlowpokeScript_0x1980cb, EVENT_6F9 - person_event SPRITE_SLOWPOKE, 13, 33, $1, $0, 255, 255, $0, 0, SlowpokeScript_0x1980cb, EVENT_6F9 - person_event SPRITE_SLOWPOKE, 19, 19, $1, $0, 255, 255, $0, 0, SlowpokeScript_0x1980cb, EVENT_6F9 - person_event SPRITE_FRUIT_TREE, 6, 12, $1, $0, 255, 255, $0, 0, WhiteApricornTree, -1 - person_event SPRITE_AZALEA_ROCKET, 14, 15, $8, $0, 255, 255, $0, 0, ObjectEvent, EVENT_6BF - person_event SPRITE_AZALEA_ROCKET, 20, 14, $6, $0, 255, 255, $0, 0, AzaleaRocketScript_0x1980ae, EVENT_6FC - person_event SPRITE_KURT_OUTSIDE, 9, 10, $8, $0, 255, 255, $0, 0, KurtOutsideScript_0x19810c, EVENT_7A4 + person_event SPRITE_AZALEA_ROCKET, 13, 35, OW_UP | $2, $0, -1, -1, $0, 0, AzaleaRocketScript_0x1980ab, EVENT_AZALEA_TOWN_SLOWPOKETAIL_ROCKET + person_event SPRITE_GRAMPS, 13, 25, OW_DOWN | $2, $21, -1, -1, $0, 0, GrampsScript_0x1980b1, -1 + person_event SPRITE_TEACHER, 17, 19, OW_UP | $0, $20, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, TeacherScript_0x1980c5, -1 + person_event SPRITE_YOUNGSTER, 13, 11, OW_UP | $1, $1, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, YoungsterScript_0x1980c8, -1 + person_event SPRITE_SLOWPOKE, 21, 12, OW_DOWN | $1, $0, -1, -1, $0, 0, SlowpokeScript_0x1980cb, EVENT_AZALEA_TOWN_SLOWPOKES + person_event SPRITE_SLOWPOKE, 13, 22, OW_DOWN | $1, $0, -1, -1, $0, 0, SlowpokeScript_0x1980cb, EVENT_AZALEA_TOWN_SLOWPOKES + person_event SPRITE_SLOWPOKE, 13, 33, OW_DOWN | $1, $0, -1, -1, $0, 0, SlowpokeScript_0x1980cb, EVENT_AZALEA_TOWN_SLOWPOKES + person_event SPRITE_SLOWPOKE, 19, 19, OW_DOWN | $1, $0, -1, -1, $0, 0, SlowpokeScript_0x1980cb, EVENT_AZALEA_TOWN_SLOWPOKES + person_event SPRITE_FRUIT_TREE, 6, 12, OW_DOWN | $1, $0, -1, -1, $0, 0, WhiteApricornTree, -1 + person_event SPRITE_AZALEA_ROCKET, 14, 15, OW_LEFT | $0, $0, -1, -1, $0, 0, ObjectEvent, EVENT_RIVAL_AZALEA_TOWN + person_event SPRITE_AZALEA_ROCKET, 20, 14, OW_UP | $2, $0, -1, -1, $0, 0, AzaleaRocketScript_0x1980ae, EVENT_SLOWPOKE_WELL_ROCKETS + person_event SPRITE_KURT_OUTSIDE, 9, 10, OW_LEFT | $0, $0, -1, -1, $0, 0, KurtOutsideScript_0x19810c, EVENT_AZALEA_TOWN_KURT |