diff options
Diffstat (limited to 'maps')
389 files changed, 6787 insertions, 12208 deletions
diff --git a/maps/AzaleaGym.asm b/maps/AzaleaGym.asm index df0034df8..263995d6d 100644 --- a/maps/AzaleaGym.asm +++ b/maps/AzaleaGym.asm @@ -1,8 +1,8 @@ AzaleaGym_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 BugsyScript_0x18ec1e: @@ -61,23 +61,7 @@ AzaleaGymTriggerRockets: jumpstd radiotowerrockets TrainerTwinsAmyandmay1: - ; bit/flag number - dw EVENT_BEAT_TWINS_AMY_AND_MAY - - ; trainer group && trainer id - db TWINS, AMYANDMAY1 - - ; text when seen - dw TwinsAmyandmay1SeenText - - ; text when trainer beaten - dw TwinsAmyandmay1BeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw TwinsAmyandmay1Script + trainer EVENT_BEAT_TWINS_AMY_AND_MAY, TWINS, AMYANDMAY1, TwinsAmyandmay1SeenText, TwinsAmyandmay1BeatenText, $0000, TwinsAmyandmay1Script TwinsAmyandmay1Script: talkaftercancel @@ -88,23 +72,7 @@ TwinsAmyandmay1Script: end TrainerTwinsAmyandmay2: - ; bit/flag number - dw EVENT_BEAT_TWINS_AMY_AND_MAY - - ; trainer group && trainer id - db TWINS, AMYANDMAY2 - - ; text when seen - dw TwinsAmyandmay2SeenText - - ; text when trainer beaten - dw TwinsAmyandmay2BeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw TwinsAmyandmay2Script + trainer EVENT_BEAT_TWINS_AMY_AND_MAY, TWINS, AMYANDMAY2, TwinsAmyandmay2SeenText, TwinsAmyandmay2BeatenText, $0000, TwinsAmyandmay2Script TwinsAmyandmay2Script: talkaftercancel @@ -115,23 +83,7 @@ TwinsAmyandmay2Script: end TrainerBug_catcherBug_catcher_benny: - ; bit/flag number - dw EVENT_BEAT_BUG_CATCHER_BENNY - - ; trainer group && trainer id - db BUG_CATCHER, BUG_CATCHER_BENNY - - ; text when seen - dw Bug_catcherBug_catcher_bennySeenText - - ; text when trainer beaten - dw Bug_catcherBug_catcher_bennyBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw Bug_catcherBug_catcher_bennyScript + trainer EVENT_BEAT_BUG_CATCHER_BENNY, BUG_CATCHER, BUG_CATCHER_BENNY, Bug_catcherBug_catcher_bennySeenText, Bug_catcherBug_catcher_bennyBeatenText, $0000, Bug_catcherBug_catcher_bennyScript Bug_catcherBug_catcher_bennyScript: talkaftercancel @@ -142,23 +94,7 @@ Bug_catcherBug_catcher_bennyScript: end TrainerBug_catcherAl: - ; bit/flag number - dw EVENT_BEAT_BUG_CATCHER_AL - - ; trainer group && trainer id - db BUG_CATCHER, AL - - ; text when seen - dw Bug_catcherAlSeenText - - ; text when trainer beaten - dw Bug_catcherAlBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw Bug_catcherAlScript + trainer EVENT_BEAT_BUG_CATCHER_AL, BUG_CATCHER, AL, Bug_catcherAlSeenText, Bug_catcherAlBeatenText, $0000, Bug_catcherAlScript Bug_catcherAlScript: talkaftercancel @@ -169,23 +105,7 @@ Bug_catcherAlScript: end TrainerBug_catcherJosh: - ; bit/flag number - dw EVENT_BEAT_BUG_CATCHER_JOSH - - ; trainer group && trainer id - db BUG_CATCHER, JOSH - - ; text when seen - dw Bug_catcherJoshSeenText - - ; text when trainer beaten - dw Bug_catcherJoshBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw Bug_catcherJoshScript + trainer EVENT_BEAT_BUG_CATCHER_JOSH, BUG_CATCHER, JOSH, Bug_catcherJoshSeenText, Bug_catcherJoshBeatenText, $0000, Bug_catcherJoshScript Bug_catcherJoshScript: talkaftercancel @@ -436,25 +356,25 @@ AzaleaGym_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $f, $4, 5, GROUP_AZALEA_TOWN, MAP_AZALEA_TOWN warp_def $f, $5, 5, GROUP_AZALEA_TOWN, MAP_AZALEA_TOWN - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 2 - signpost 13, 3, $0, AzaleaGymStatue - signpost 13, 6, $0, AzaleaGymStatue + signpost 13, 3, SIGNPOST_READ, AzaleaGymStatue + signpost 13, 6, SIGNPOST_READ, AzaleaGymStatue - ; people-events +.PersonEvents: db 7 - person_event SPRITE_BUGSY, 11, 9, $3, $0, 255, 255, $a0, 0, BugsyScript_0x18ec1e, -1 - person_event SPRITE_BUG_CATCHER, 7, 9, $a, $0, 255, 255, $b2, 2, TrainerBug_catcherBug_catcher_benny, -1 - person_event SPRITE_BUG_CATCHER, 12, 12, $6, $0, 255, 255, $b2, 3, TrainerBug_catcherAl, -1 - person_event SPRITE_BUG_CATCHER, 6, 4, $6, $0, 255, 255, $b2, 3, TrainerBug_catcherJosh, -1 - person_event SPRITE_TWIN, 14, 8, $6, $0, 255, 255, $82, 1, TrainerTwinsAmyandmay1, -1 - person_event SPRITE_TWIN, 14, 9, $6, $0, 255, 255, $82, 1, TrainerTwinsAmyandmay2, -1 - person_event SPRITE_GYM_GUY, 17, 11, $6, $0, 255, 255, $80, 0, AzaleaGymGuyScript, -1 + person_event SPRITE_BUGSY, 11, 9, OW_DOWN | $3, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, BugsyScript_0x18ec1e, -1 + person_event SPRITE_BUG_CATCHER, 7, 9, OW_LEFT | $2, $0, -1, -1, (PAL_OW_BROWN << 4) | $82, 2, TrainerBug_catcherBug_catcher_benny, -1 + person_event SPRITE_BUG_CATCHER, 12, 12, OW_UP | $2, $0, -1, -1, (PAL_OW_BROWN << 4) | $82, 3, TrainerBug_catcherAl, -1 + person_event SPRITE_BUG_CATCHER, 6, 4, OW_UP | $2, $0, -1, -1, (PAL_OW_BROWN << 4) | $82, 3, TrainerBug_catcherJosh, -1 + person_event SPRITE_TWIN, 14, 8, OW_UP | $2, $0, -1, -1, (PAL_OW_RED << 4) | $82, 1, TrainerTwinsAmyandmay1, -1 + person_event SPRITE_TWIN, 14, 9, OW_UP | $2, $0, -1, -1, (PAL_OW_RED << 4) | $82, 1, TrainerTwinsAmyandmay2, -1 + person_event SPRITE_GYM_GUY, 17, 11, OW_UP | $2, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, AzaleaGymGuyScript, -1 diff --git a/maps/AzaleaMart.asm b/maps/AzaleaMart.asm index bf5decd73..ab03d588f 100644 --- a/maps/AzaleaMart.asm +++ b/maps/AzaleaMart.asm @@ -1,8 +1,8 @@ AzaleaMart_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 ClerkScript_0x18e040: @@ -44,19 +44,19 @@ AzaleaMart_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $7, $2, 3, GROUP_AZALEA_TOWN, MAP_AZALEA_TOWN warp_def $7, $3, 3, GROUP_AZALEA_TOWN, MAP_AZALEA_TOWN - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 3 - person_event SPRITE_CLERK, 7, 5, $9, $0, 255, 255, $0, 0, ClerkScript_0x18e040, -1 - person_event SPRITE_COOLTRAINER_M, 9, 6, $7, $0, 255, 255, $0, 0, CooltrainerMScript_0x18e047, -1 - person_event SPRITE_BUG_CATCHER, 6, 11, $5, $2, 255, 255, $80, 0, BugCatcherScript_0x18e04a, -1 + person_event SPRITE_CLERK, 7, 5, OW_LEFT | $1, $0, -1, -1, $0, 0, ClerkScript_0x18e040, -1 + person_event SPRITE_COOLTRAINER_M, 9, 6, OW_UP | $3, $0, -1, -1, $0, 0, CooltrainerMScript_0x18e047, -1 + person_event SPRITE_BUG_CATCHER, 6, 11, OW_UP | $1, $2, -1, -1, (PAL_OW_RED << 4) | $80, 0, BugCatcherScript_0x18e04a, -1 diff --git a/maps/AzaleaPokeCenter1F.asm b/maps/AzaleaPokeCenter1F.asm index 10ce076dc..344d258d7 100644 --- a/maps/AzaleaPokeCenter1F.asm +++ b/maps/AzaleaPokeCenter1F.asm @@ -1,11 +1,11 @@ AzaleaPokeCenter1F_MapScriptHeader: - ; trigger count +.MapTriggers: db 1 ; triggers dw UnknownScript_0x18db27, $0000 - ; callback count +.MapCallbacks: db 0 UnknownScript_0x18db27: @@ -76,21 +76,21 @@ AzaleaPokeCenter1F_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 3 warp_def $7, $3, 1, GROUP_AZALEA_TOWN, MAP_AZALEA_TOWN warp_def $7, $4, 1, GROUP_AZALEA_TOWN, MAP_AZALEA_TOWN warp_def $7, $0, 1, GROUP_POKECENTER_2F, MAP_POKECENTER_2F - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 4 - person_event SPRITE_NURSE, 5, 7, $6, $0, 255, 255, $0, 0, NurseScript_0x18db28, -1 - person_event SPRITE_GENTLEMAN, 10, 13, $4, $10, 255, 255, $0, 0, GentlemanScript_0x18db2b, -1 - person_event SPRITE_FISHING_GURU, 5, 10, $6, $0, 255, 255, $0, 0, FishingGuruScript_0x18db2e, -1 - person_event SPRITE_POKEFAN_F, 8, 5, $2, $21, 255, 255, $0, 0, PokefanFScript_0x18db31, -1 + person_event SPRITE_NURSE, 5, 7, OW_UP | $2, $0, -1, -1, $0, 0, NurseScript_0x18db28, -1 + person_event SPRITE_GENTLEMAN, 10, 13, OW_UP | $0, $10, -1, -1, $0, 0, GentlemanScript_0x18db2b, -1 + person_event SPRITE_FISHING_GURU, 5, 10, OW_UP | $2, $0, -1, -1, $0, 0, FishingGuruScript_0x18db2e, -1 + person_event SPRITE_POKEFAN_F, 8, 5, OW_DOWN | $2, $21, -1, -1, $0, 0, PokefanFScript_0x18db31, -1 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 diff --git a/maps/BattleTower1F.asm b/maps/BattleTower1F.asm index 02ee0fb06..fa5247b77 100644 --- a/maps/BattleTower1F.asm +++ b/maps/BattleTower1F.asm @@ -1,12 +1,12 @@ BattleTower1F_MapScriptHeader: - ; trigger count +.MapTriggers: db 2 ; triggers dw UnknownScript_0x9e39d, $0000 dw UnknownScript_0x9e3d3, $0000 - ; callback count +.MapCallbacks: db 0 UnknownScript_0x9e39d: @@ -79,7 +79,7 @@ UnknownScript_0x9e40f: yesorno iffalse UnknownScript_0x9e3fc dotrigger $0 - special Function29e66 + special Special_TryQuickSave iffalse UnknownScript_0x9e3fc dotrigger $1 writebyte $1 @@ -168,7 +168,7 @@ UnknownScript_0x9e4be: writetext UnknownText_0x9ef1f yesorno iffalse UnknownScript_0x9e3fc - special Function29e66 + special Special_TryQuickSave iffalse UnknownScript_0x9e3fc writebyte $1 special Function170687 @@ -207,7 +207,7 @@ UnknownScript_0x9e515: yesorno iffalse UnknownScript_0x9e3fc dotrigger $0 - special Function29e66 + special Special_TryQuickSave iffalse UnknownScript_0x9e3fc dotrigger $1 writebyte $6 @@ -795,23 +795,23 @@ BattleTower1F_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 3 warp_def $9, $7, 3, GROUP_BATTLE_TOWER_OUTSIDE, MAP_BATTLE_TOWER_OUTSIDE warp_def $9, $8, 4, GROUP_BATTLE_TOWER_OUTSIDE, MAP_BATTLE_TOWER_OUTSIDE warp_def $0, $7, 1, GROUP_BATTLE_TOWER_ELEVATOR, MAP_BATTLE_TOWER_ELEVATOR - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 1 - signpost 6, 6, $0, MapBattleTower1FSignpost0Script + signpost 6, 6, SIGNPOST_READ, MapBattleTower1FSignpost0Script - ; people-events +.PersonEvents: db 5 - person_event SPRITE_RECEPTIONIST, 10, 11, $6, $0, 255, 255, $0, 0, ReceptionistScript_0x9e3e2, -1 - person_event SPRITE_YOUNGSTER, 13, 18, $9, $0, 255, 255, $b0, 0, YoungsterScript_0x9e55d, -1 - person_event SPRITE_COOLTRAINER_F, 13, 8, $5, $1, 255, 255, $80, 0, CooltrainerFScript_0x9e568, -1 - person_event SPRITE_BUG_CATCHER, 7, 5, $2, $11, 255, 255, $90, 0, BugCatcherScript_0x9e56b, -1 - person_event SPRITE_GRANNY, 7, 18, $4, $10, 255, 255, $0, 0, GrannyScript_0x9e56e, -1 + person_event SPRITE_RECEPTIONIST, 10, 11, OW_UP | $2, $0, -1, -1, $0, 0, ReceptionistScript_0x9e3e2, -1 + person_event SPRITE_YOUNGSTER, 13, 18, OW_LEFT | $1, $0, -1, -1, (PAL_OW_BROWN << 4) | $80, 0, YoungsterScript_0x9e55d, -1 + person_event SPRITE_COOLTRAINER_F, 13, 8, OW_UP | $1, $1, -1, -1, (PAL_OW_RED << 4) | $80, 0, CooltrainerFScript_0x9e568, -1 + person_event SPRITE_BUG_CATCHER, 7, 5, OW_DOWN | $2, $11, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, BugCatcherScript_0x9e56b, -1 + person_event SPRITE_GRANNY, 7, 18, OW_UP | $0, $10, -1, -1, $0, 0, GrannyScript_0x9e56e, -1 diff --git a/maps/BattleTowerBattleRoom.asm b/maps/BattleTowerBattleRoom.asm index 4c78d8871..82753c221 100644 --- a/maps/BattleTowerBattleRoom.asm +++ b/maps/BattleTowerBattleRoom.asm @@ -1,12 +1,12 @@ BattleTowerBattleRoom_MapScriptHeader: - ; trigger count +.MapTriggers: db 2 ; triggers dw UnknownScript_0x9f419, $0000 dw UnknownScript_0x9f420, $0000 - ; callback count +.MapCallbacks: db 0 UnknownScript_0x9f419: @@ -31,7 +31,7 @@ UnknownScript_0x9f425: keeptextopen loadmovesprites special Function170215 - special Function8c084 + special FadeBlackBGMap reloadmap if_not_equal $0, UnknownScript_0x9f4c2 copybytetovar wcf64 @@ -46,10 +46,10 @@ UnknownScript_0x9f425: closetext loadmovesprites playmusic MUSIC_HEAL - special Function8c084 - special Function1047eb + special FadeBlackBGMap + special LoadMapPalettes pause 60 - special Function8c079 + special FadeInBGMap special RestartMapMusic loadfont writetext UnknownText_0x9eebc @@ -73,7 +73,7 @@ UnknownScript_0x9f483: special Function170687 playsound SFX_SAVE waitbutton - special Function8c084 + special FadeBlackBGMap special Reset UnknownScript_0x9f4a3: writetext UnknownText_0x9efbf @@ -84,14 +84,14 @@ UnknownScript_0x9f4a3: writebyte $6 special Function170687 loadmovesprites - special Function8c084 + special FadeBlackBGMap warpfacing $1, GROUP_BATTLE_TOWER_1F, MAP_BATTLE_TOWER_1F, $7, $7 loadfont jump UnknownScript_0x9e4b0 UnknownScript_0x9f4c2: pause 60 - special Function8c092 + special Special_BattleTowerFade warpfacing $1, GROUP_BATTLE_TOWER_1F, MAP_BATTLE_TOWER_1F, $7, $7 writebyte $4 special Function170687 @@ -103,7 +103,7 @@ UnknownScript_0x9f4c2: UnknownScript_0x9f4d9: pause 60 - special Function8c092 + special Special_BattleTowerFade warpfacing $1, GROUP_BATTLE_TOWER_1F, MAP_BATTLE_TOWER_1F, $7, $7 BattleTowerBattleRoomScript_0x9f4e4: loadfont @@ -142,18 +142,18 @@ BattleTowerBattleRoom_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $7, $3, 4, GROUP_BATTLE_TOWER_HALLWAY, MAP_BATTLE_TOWER_HALLWAY warp_def $7, $4, 4, GROUP_BATTLE_TOWER_HALLWAY, MAP_BATTLE_TOWER_HALLWAY - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 2 - person_event SPRITE_YOUNGSTER, 4, 8, $6, $0, 255, 255, $0, 0, ObjectEvent, EVENT_791 - person_event SPRITE_RECEPTIONIST, 10, 5, $9, $0, 255, 255, $0, 0, ObjectEvent, -1 + person_event SPRITE_YOUNGSTER, 4, 8, OW_UP | $2, $0, -1, -1, $0, 0, ObjectEvent, EVENT_BATTLE_TOWER_BATTLE_ROOM_YOUNGSTER + person_event SPRITE_RECEPTIONIST, 10, 5, OW_LEFT | $1, $0, -1, -1, $0, 0, ObjectEvent, -1 diff --git a/maps/BattleTowerElevator.asm b/maps/BattleTowerElevator.asm index b8763f8e0..dafc0b3ff 100644 --- a/maps/BattleTowerElevator.asm +++ b/maps/BattleTowerElevator.asm @@ -1,12 +1,12 @@ BattleTowerElevator_MapScriptHeader: - ; trigger count +.MapTriggers: db 2 ; triggers dw UnknownScript_0x9f562, $0000 dw UnknownScript_0x9f567, $0000 - ; callback count +.MapCallbacks: db 0 UnknownScript_0x9f562: @@ -47,17 +47,17 @@ BattleTowerElevator_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $3, $1, 1, GROUP_BATTLE_TOWER_HALLWAY, MAP_BATTLE_TOWER_HALLWAY warp_def $3, $2, 1, GROUP_BATTLE_TOWER_HALLWAY, MAP_BATTLE_TOWER_HALLWAY - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 1 - person_event SPRITE_RECEPTIONIST, 6, 5, $9, $0, 255, 255, $0, 0, MovementData_0x9f58f, -1 + person_event SPRITE_RECEPTIONIST, 6, 5, OW_LEFT | $1, $0, -1, -1, $0, 0, MovementData_0x9f58f, -1 diff --git a/maps/BattleTowerHallway.asm b/maps/BattleTowerHallway.asm index b68971451..311f8cc0f 100644 --- a/maps/BattleTowerHallway.asm +++ b/maps/BattleTowerHallway.asm @@ -1,12 +1,12 @@ BattleTowerHallway_MapScriptHeader: - ; trigger count +.MapTriggers: db 2 ; triggers dw UnknownScript_0x9f5bb, $0000 dw UnknownScript_0x9f5c0, $0000 - ; callback count +.MapCallbacks: db 0 UnknownScript_0x9f5bb: @@ -79,7 +79,7 @@ BattleTowerHallway_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 6 warp_def $1, $b, 1, GROUP_BATTLE_TOWER_ELEVATOR, MAP_BATTLE_TOWER_ELEVATOR warp_def $0, $5, 1, GROUP_BATTLE_TOWER_BATTLE_ROOM, MAP_BATTLE_TOWER_BATTLE_ROOM @@ -88,12 +88,12 @@ BattleTowerHallway_MapEventHeader: warp_def $0, $d, 1, GROUP_BATTLE_TOWER_BATTLE_ROOM, MAP_BATTLE_TOWER_BATTLE_ROOM warp_def $0, $f, 1, GROUP_BATTLE_TOWER_BATTLE_ROOM, MAP_BATTLE_TOWER_BATTLE_ROOM - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 1 - person_event SPRITE_RECEPTIONIST, 6, 15, $6, $0, 255, 255, $0, 0, BattleTowerHallway_MapEventHeader, -1 + person_event SPRITE_RECEPTIONIST, 6, 15, OW_UP | $2, $0, -1, -1, $0, 0, BattleTowerHallway_MapEventHeader, -1 diff --git a/maps/BattleTowerOutside.asm b/maps/BattleTowerOutside.asm index 8ab5aee94..fe6374fe9 100644 --- a/maps/BattleTowerOutside.asm +++ b/maps/BattleTowerOutside.asm @@ -1,8 +1,8 @@ BattleTowerOutside_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 2 ; callbacks @@ -13,7 +13,7 @@ BattleTowerOutside_MapScriptHeader: return .Callback2 - clearevent EVENT_7CF + clearevent EVENT_BATTLE_TOWER_OUTSIDE_SAILOR return StandingYoungsterScript_0x9f85f: @@ -126,23 +126,23 @@ BattleTowerOutside_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 4 warp_def $15, $8, 3, GROUP_ROUTE_40_BATTLE_TOWER_GATE, MAP_ROUTE_40_BATTLE_TOWER_GATE warp_def $15, $9, 4, GROUP_ROUTE_40_BATTLE_TOWER_GATE, MAP_ROUTE_40_BATTLE_TOWER_GATE warp_def $9, $8, 1, GROUP_BATTLE_TOWER_1F, MAP_BATTLE_TOWER_1F warp_def $9, $9, 2, GROUP_BATTLE_TOWER_1F, MAP_BATTLE_TOWER_1F - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 1 - signpost 10, 10, $0, MapBattleTowerOutsideSignpost0Script + signpost 10, 10, SIGNPOST_READ, MapBattleTowerOutsideSignpost0Script - ; people-events +.PersonEvents: db 4 - person_event SPRITE_STANDING_YOUNGSTER, 16, 10, $7, $0, 255, 255, $80, 0, StandingYoungsterScript_0x9f85f, -1 - person_event SPRITE_BUENA, 15, 17, $2, $11, 255, 255, $a0, 0, BuenaScript_0x9f862, -1 - person_event SPRITE_SAILOR, 22, 16, $5, $1, 255, 255, $0, 0, SailorScript_0x9f865, EVENT_7CF - person_event SPRITE_LASS, 28, 16, $3, $0, 255, 255, $a0, 0, ObjectEvent, -1 + person_event SPRITE_STANDING_YOUNGSTER, 16, 10, OW_UP | $3, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, StandingYoungsterScript_0x9f85f, -1 + person_event SPRITE_BUENA, 15, 17, OW_DOWN | $2, $11, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, BuenaScript_0x9f862, -1 + person_event SPRITE_SAILOR, 22, 16, OW_UP | $1, $1, -1, -1, $0, 0, SailorScript_0x9f865, EVENT_BATTLE_TOWER_OUTSIDE_SAILOR + person_event SPRITE_LASS, 28, 16, OW_DOWN | $3, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, ObjectEvent, -1 diff --git a/maps/BillsHouse.asm b/maps/BillsHouse.asm index 1cb348887..80c57851b 100644 --- a/maps/BillsHouse.asm +++ b/maps/BillsHouse.asm @@ -1,14 +1,14 @@ BillsHouse_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 GrampsScript_0x189538: faceplayer loadfont - checkevent EVENT_000 + checkevent EVENT_GAVE_KURT_APRICORNS iftrue UnknownScript_0x1896ba checkevent EVENT_GOT_THUNDERSTONE_FROM_BILLS_GRANDPA iftrue UnknownScript_0x1896c0 @@ -120,7 +120,7 @@ UnknownScript_0x18963b: verbosegiveitem EVERSTONE, 1 iffalse UnknownScript_0x1896cc setevent EVENT_GOT_EVERSTONE_FROM_BILLS_GRANDPA - setevent EVENT_000 + setevent EVENT_GAVE_KURT_APRICORNS loadmovesprites end @@ -131,7 +131,7 @@ UnknownScript_0x189652: verbosegiveitem LEAF_STONE, 1 iffalse UnknownScript_0x1896cc setevent EVENT_GOT_LEAF_STONE_FROM_BILLS_GRANDPA - setevent EVENT_000 + setevent EVENT_GAVE_KURT_APRICORNS loadmovesprites end @@ -142,7 +142,7 @@ UnknownScript_0x189669: verbosegiveitem WATER_STONE, 1 iffalse UnknownScript_0x1896cc setevent EVENT_GOT_WATER_STONE_FROM_BILLS_GRANDPA - setevent EVENT_000 + setevent EVENT_GAVE_KURT_APRICORNS loadmovesprites end @@ -153,7 +153,7 @@ UnknownScript_0x189680: verbosegiveitem FIRE_STONE, 1 iffalse UnknownScript_0x1896cc setevent EVENT_GOT_FIRE_STONE_FROM_BILLS_GRANDPA - setevent EVENT_000 + setevent EVENT_GAVE_KURT_APRICORNS loadmovesprites end @@ -354,17 +354,17 @@ BillsHouse_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $7, $2, 1, GROUP_ROUTE_25, MAP_ROUTE_25 warp_def $7, $3, 1, GROUP_ROUTE_25, MAP_ROUTE_25 - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 1 - person_event SPRITE_GRAMPS, 7, 6, $7, $20, 255, 255, $90, 0, GrampsScript_0x189538, -1 + person_event SPRITE_GRAMPS, 7, 6, OW_UP | $3, $20, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, GrampsScript_0x189538, -1 diff --git a/maps/BlackthornCity.asm b/maps/BlackthornCity.asm index c1d872e06..acf85e29e 100644 --- a/maps/BlackthornCity.asm +++ b/maps/BlackthornCity.asm @@ -1,8 +1,8 @@ BlackthornCity_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 2 ; callbacks @@ -307,7 +307,7 @@ BlackthornCity_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 8 warp_def $b, $12, 1, GROUP_BLACKTHORN_GYM_1F, MAP_BLACKTHORN_GYM_1F warp_def $15, $d, 1, GROUP_BLACKTHORN_DRAGON_SPEECH_HOUSE, MAP_BLACKTHORN_DRAGON_SPEECH_HOUSE @@ -318,27 +318,27 @@ BlackthornCity_MapEventHeader: warp_def $9, $24, 2, GROUP_ICE_PATH_1F, MAP_ICE_PATH_1F warp_def $1, $14, 1, GROUP_DRAGONS_DEN_1F, MAP_DRAGONS_DEN_1F - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 7 - signpost 24, 34, $0, BlackthornCitySign - signpost 13, 17, $0, BlackthornGymSign - signpost 31, 7, $0, MoveDeletersHouseSign - signpost 3, 21, $0, DragonDensSign - signpost 25, 5, $0, BlackthornCityTrainerTips - signpost 29, 16, $0, BlackthornCityMartSign - signpost 29, 22, $0, BlackthornCityPokeCenterSign - - ; people-events + signpost 24, 34, SIGNPOST_READ, BlackthornCitySign + signpost 13, 17, SIGNPOST_READ, BlackthornGymSign + signpost 31, 7, SIGNPOST_READ, MoveDeletersHouseSign + signpost 3, 21, SIGNPOST_READ, DragonDensSign + signpost 25, 5, SIGNPOST_READ, BlackthornCityTrainerTips + signpost 29, 16, SIGNPOST_READ, BlackthornCityMartSign + signpost 29, 22, SIGNPOST_READ, BlackthornCityPokeCenterSign + +.PersonEvents: db 9 - person_event SPRITE_SUPER_NERD, 16, 22, $6, $0, 255, 255, $80, 0, SuperNerdScript_0x1a46e8, EVENT_6E3 - person_event SPRITE_SUPER_NERD, 16, 23, $6, $0, 255, 255, $80, 0, SuperNerdScript_0x1a46e8, EVENT_6E4 - person_event SPRITE_GRAMPS, 6, 24, $6, $0, 255, 255, $0, 0, GrampsScript_0x1a4708, EVENT_74C - person_event SPRITE_GRAMPS, 6, 25, $8, $0, 255, 255, $0, 0, GrampsScript_0x1a470b, EVENT_74D - person_event SPRITE_BLACK_BELT, 35, 28, $5, $1, 255, 255, $90, 0, BlackBeltScript_0x1a470e, -1 - person_event SPRITE_COOLTRAINER_F, 29, 13, $5, $2, 255, 255, $80, 0, CooltrainerFScript_0x1a4722, -1 - person_event SPRITE_YOUNGSTER, 19, 17, $5, $1, 255, 255, $0, 0, YoungsterScript_0x1a4725, -1 - person_event SPRITE_YOUNGSTER, 24, 26, $6, $0, 255, 255, $0, 0, SantosScript, EVENT_75D - person_event SPRITE_COOLTRAINER_F, 23, 39, $7, $0, 255, 255, $a0, 0, CooltrainerFScript_0x1a4728, -1 + person_event SPRITE_SUPER_NERD, 16, 22, OW_UP | $2, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, SuperNerdScript_0x1a46e8, EVENT_BLACKTHORN_CITY_SUPER_NERD_BLOCKS_GYM + person_event SPRITE_SUPER_NERD, 16, 23, OW_UP | $2, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, SuperNerdScript_0x1a46e8, EVENT_BLACKTHORN_CITY_SUPER_NERD_DOES_NOT_BLOCK_GYM + person_event SPRITE_GRAMPS, 6, 24, OW_UP | $2, $0, -1, -1, $0, 0, GrampsScript_0x1a4708, EVENT_BLACKTHORN_CITY_GRAMPS_BLOCKS_DRAGONS_DEN + person_event SPRITE_GRAMPS, 6, 25, OW_LEFT | $0, $0, -1, -1, $0, 0, GrampsScript_0x1a470b, EVENT_BLACKTHORN_CITY_GRAMPS_NOT_BLOCKING_DRAGONS_DEN + person_event SPRITE_BLACK_BELT, 35, 28, OW_UP | $1, $1, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, BlackBeltScript_0x1a470e, -1 + person_event SPRITE_COOLTRAINER_F, 29, 13, OW_UP | $1, $2, -1, -1, (PAL_OW_RED << 4) | $80, 0, CooltrainerFScript_0x1a4722, -1 + person_event SPRITE_YOUNGSTER, 19, 17, OW_UP | $1, $1, -1, -1, $0, 0, YoungsterScript_0x1a4725, -1 + person_event SPRITE_YOUNGSTER, 24, 26, OW_UP | $2, $0, -1, -1, $0, 0, SantosScript, EVENT_BLACKTHORN_CITY_SANTOS_OF_SATURDAY + person_event SPRITE_COOLTRAINER_F, 23, 39, OW_UP | $3, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, CooltrainerFScript_0x1a4728, -1 diff --git a/maps/BlackthornDodrioTradeHouse.asm b/maps/BlackthornDodrioTradeHouse.asm index aae8f3962..a841b0ec2 100644 --- a/maps/BlackthornDodrioTradeHouse.asm +++ b/maps/BlackthornDodrioTradeHouse.asm @@ -1,8 +1,8 @@ BlackthornDodrioTradeHouse_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 Emy: @@ -20,19 +20,19 @@ BlackthornDodrioTradeHouse_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $7, $2, 3, GROUP_BLACKTHORN_CITY, MAP_BLACKTHORN_CITY warp_def $7, $3, 3, GROUP_BLACKTHORN_CITY, MAP_BLACKTHORN_CITY - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 2 - signpost 1, 0, $0, EmysHouseBookshelf - signpost 1, 1, $0, EmysHouseBookshelf + signpost 1, 0, SIGNPOST_READ, EmysHouseBookshelf + signpost 1, 1, SIGNPOST_READ, EmysHouseBookshelf - ; people-events +.PersonEvents: db 1 - person_event SPRITE_LASS, 7, 6, $3, $0, 255, 255, $a0, 0, Emy, -1 + person_event SPRITE_LASS, 7, 6, OW_DOWN | $3, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, Emy, -1 diff --git a/maps/BlackthornDragonSpeechHouse.asm b/maps/BlackthornDragonSpeechHouse.asm index 83fa1fab3..75ea0894f 100644 --- a/maps/BlackthornDragonSpeechHouse.asm +++ b/maps/BlackthornDragonSpeechHouse.asm @@ -1,8 +1,8 @@ BlackthornDragonSpeechHouse_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 GrannyScript_0x195949: @@ -45,18 +45,18 @@ BlackthornDragonSpeechHouse_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $7, $2, 2, GROUP_BLACKTHORN_CITY, MAP_BLACKTHORN_CITY warp_def $7, $3, 2, GROUP_BLACKTHORN_CITY, MAP_BLACKTHORN_CITY - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 2 - person_event SPRITE_GRANNY, 7, 6, $3, $0, 255, 255, $0, 0, GrannyScript_0x195949, -1 - person_event SPRITE_EKANS, 9, 9, $16, $0, 255, 255, $90, 0, EkansScript_0x19594c, -1 + person_event SPRITE_GRANNY, 7, 6, OW_DOWN | $3, $0, -1, -1, $0, 0, GrannyScript_0x195949, -1 + person_event SPRITE_EKANS, 9, 9, OW_UP | $12, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, EkansScript_0x19594c, -1 diff --git a/maps/BlackthornGym1F.asm b/maps/BlackthornGym1F.asm index d68012d35..27701ded6 100644 --- a/maps/BlackthornGym1F.asm +++ b/maps/BlackthornGym1F.asm @@ -1,8 +1,8 @@ BlackthornGym1F_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 1 ; callbacks @@ -47,9 +47,9 @@ ClairScript_0x194e24: setevent EVENT_BEAT_COOLTRAINERM_MIKE setevent EVENT_BEAT_COOLTRAINERF_FRAN setevent EVENT_BEAT_COOLTRAINERF_LOLA - clearevent EVENT_736 - setevent EVENT_74C - clearevent EVENT_74D + clearevent EVENT_MAHOGANY_MART_OWNERS + setevent EVENT_BLACKTHORN_CITY_GRAMPS_BLOCKS_DRAGONS_DEN + clearevent EVENT_BLACKTHORN_CITY_GRAMPS_NOT_BLOCKING_DRAGONS_DEN end .FightDone writetext UnknownText_0x195162 @@ -87,23 +87,7 @@ UnknownScript_0x194e94: end TrainerCooltrainermPaul: - ; bit/flag number - dw EVENT_BEAT_COOLTRAINERM_PAUL - - ; trainer group && trainer id - db COOLTRAINERM, PAUL - - ; text when seen - dw CooltrainermPaulSeenText - - ; text when trainer beaten - dw CooltrainermPaulBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw CooltrainermPaulScript + trainer EVENT_BEAT_COOLTRAINERM_PAUL, COOLTRAINERM, PAUL, CooltrainermPaulSeenText, CooltrainermPaulBeatenText, $0000, CooltrainermPaulScript CooltrainermPaulScript: talkaftercancel @@ -114,23 +98,7 @@ CooltrainermPaulScript: end TrainerCooltrainermMike: - ; bit/flag number - dw EVENT_BEAT_COOLTRAINERM_MIKE - - ; trainer group && trainer id - db COOLTRAINERM, MIKE - - ; text when seen - dw CooltrainermMikeSeenText - - ; text when trainer beaten - dw CooltrainermMikeBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw CooltrainermMikeScript + trainer EVENT_BEAT_COOLTRAINERM_MIKE, COOLTRAINERM, MIKE, CooltrainermMikeSeenText, CooltrainermMikeBeatenText, $0000, CooltrainermMikeScript CooltrainermMikeScript: talkaftercancel @@ -141,23 +109,7 @@ CooltrainermMikeScript: end TrainerCooltrainerfLola: - ; bit/flag number - dw EVENT_BEAT_COOLTRAINERF_LOLA - - ; trainer group && trainer id - db COOLTRAINERF, LOLA - - ; text when seen - dw CooltrainerfLolaSeenText - - ; text when trainer beaten - dw CooltrainerfLolaBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw CooltrainerfLolaScript + trainer EVENT_BEAT_COOLTRAINERF_LOLA, COOLTRAINERF, LOLA, CooltrainerfLolaSeenText, CooltrainerfLolaBeatenText, $0000, CooltrainerfLolaScript CooltrainerfLolaScript: talkaftercancel @@ -432,7 +384,7 @@ BlackthornGym1F_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 7 warp_def $11, $4, 1, GROUP_BLACKTHORN_CITY, MAP_BLACKTHORN_CITY warp_def $11, $5, 1, GROUP_BLACKTHORN_CITY, MAP_BLACKTHORN_CITY @@ -442,18 +394,18 @@ BlackthornGym1F_MapEventHeader: warp_def $7, $7, 4, GROUP_BLACKTHORN_GYM_2F, MAP_BLACKTHORN_GYM_2F warp_def $6, $7, 5, GROUP_BLACKTHORN_GYM_2F, MAP_BLACKTHORN_GYM_2F - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 2 - signpost 15, 3, $0, BlackthornGymStatue - signpost 15, 6, $0, BlackthornGymStatue + signpost 15, 3, SIGNPOST_READ, BlackthornGymStatue + signpost 15, 6, SIGNPOST_READ, BlackthornGymStatue - ; people-events +.PersonEvents: db 5 - person_event SPRITE_CLAIR, 7, 9, $6, $0, 255, 255, $90, 0, ClairScript_0x194e24, -1 - person_event SPRITE_COOLTRAINER_M, 10, 10, $6, $0, 255, 255, $82, 3, TrainerCooltrainermMike, -1 - person_event SPRITE_COOLTRAINER_M, 18, 5, $6, $0, 255, 255, $82, 3, TrainerCooltrainermPaul, -1 - person_event SPRITE_COOLTRAINER_F, 6, 13, $6, $0, 255, 255, $82, 1, TrainerCooltrainerfLola, -1 - person_event SPRITE_GYM_GUY, 19, 11, $6, $0, 255, 255, $80, 0, BlackthornGymGuyScript, -1 + person_event SPRITE_CLAIR, 7, 9, OW_UP | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, ClairScript_0x194e24, -1 + person_event SPRITE_COOLTRAINER_M, 10, 10, OW_UP | $2, $0, -1, -1, (PAL_OW_RED << 4) | $82, 3, TrainerCooltrainermMike, -1 + person_event SPRITE_COOLTRAINER_M, 18, 5, OW_UP | $2, $0, -1, -1, (PAL_OW_RED << 4) | $82, 3, TrainerCooltrainermPaul, -1 + person_event SPRITE_COOLTRAINER_F, 6, 13, OW_UP | $2, $0, -1, -1, (PAL_OW_RED << 4) | $82, 1, TrainerCooltrainerfLola, -1 + person_event SPRITE_GYM_GUY, 19, 11, OW_UP | $2, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, BlackthornGymGuyScript, -1 diff --git a/maps/BlackthornGym2F.asm b/maps/BlackthornGym2F.asm index f5e2a0c28..0286367e3 100644 --- a/maps/BlackthornGym2F.asm +++ b/maps/BlackthornGym2F.asm @@ -1,8 +1,8 @@ BlackthornGym2F_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 1 ; callbacks @@ -59,23 +59,7 @@ BlackthornGymBoulder: jumpstd strengthboulder TrainerCooltrainermCody: - ; bit/flag number - dw EVENT_BEAT_COOLTRAINERM_CODY - - ; trainer group && trainer id - db COOLTRAINERM, CODY - - ; text when seen - dw CooltrainermCodySeenText - - ; text when trainer beaten - dw CooltrainermCodyBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw CooltrainermCodyScript + trainer EVENT_BEAT_COOLTRAINERM_CODY, COOLTRAINERM, CODY, CooltrainermCodySeenText, CooltrainermCodyBeatenText, $0000, CooltrainermCodyScript CooltrainermCodyScript: talkaftercancel @@ -86,23 +70,7 @@ CooltrainermCodyScript: end TrainerCooltrainerfFran: - ; bit/flag number - dw EVENT_BEAT_COOLTRAINERF_FRAN - - ; trainer group && trainer id - db COOLTRAINERF, FRAN - - ; text when seen - dw CooltrainerfFranSeenText - - ; text when trainer beaten - dw CooltrainerfFranBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw CooltrainerfFranScript + trainer EVENT_BEAT_COOLTRAINERF_FRAN, COOLTRAINERF, FRAN, CooltrainerfFranSeenText, CooltrainerfFranBeatenText, $0000, CooltrainerfFranScript CooltrainerfFranScript: talkaftercancel @@ -161,7 +129,7 @@ BlackthornGym2F_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 5 warp_def $7, $1, 3, GROUP_BLACKTHORN_GYM_1F, MAP_BLACKTHORN_GYM_1F warp_def $9, $7, 4, GROUP_BLACKTHORN_GYM_1F, MAP_BLACKTHORN_GYM_1F @@ -169,19 +137,19 @@ BlackthornGym2F_MapEventHeader: warp_def $7, $8, 6, GROUP_BLACKTHORN_GYM_1F, MAP_BLACKTHORN_GYM_1F warp_def $3, $8, 7, GROUP_BLACKTHORN_GYM_1F, MAP_BLACKTHORN_GYM_1F - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 8 - person_event SPRITE_COOLTRAINER_M, 5, 8, $9, $0, 255, 255, $82, 1, TrainerCooltrainermCody, -1 - person_event SPRITE_COOLTRAINER_F, 15, 8, $8, $0, 255, 255, $82, 1, TrainerCooltrainerfFran, -1 - person_event SPRITE_BOULDER, 6, 12, $19, $0, 255, 255, $0, 0, BlackthornGymBoulder, EVENT_BOULDER_IN_BLACKTHORN_GYM_1 - person_event SPRITE_BOULDER, 7, 6, $19, $0, 255, 255, $0, 0, BlackthornGymBoulder, EVENT_BOULDER_IN_BLACKTHORN_GYM_2 - person_event SPRITE_BOULDER, 20, 10, $19, $0, 255, 255, $0, 0, BlackthornGymBoulder, EVENT_BOULDER_IN_BLACKTHORN_GYM_3 - person_event SPRITE_BOULDER, 7, 7, $19, $0, 255, 255, $0, 0, BlackthornGymBoulder, -1 - person_event SPRITE_BOULDER, 5, 10, $19, $0, 255, 255, $0, 0, BlackthornGymBoulder, -1 - person_event SPRITE_BOULDER, 18, 12, $19, $0, 255, 255, $0, 0, BlackthornGymBoulder, -1 + person_event SPRITE_COOLTRAINER_M, 5, 8, OW_LEFT | $1, $0, -1, -1, (PAL_OW_RED << 4) | $82, 1, TrainerCooltrainermCody, -1 + person_event SPRITE_COOLTRAINER_F, 15, 8, OW_LEFT | $0, $0, -1, -1, (PAL_OW_RED << 4) | $82, 1, TrainerCooltrainerfFran, -1 + person_event SPRITE_BOULDER, 6, 12, OW_LEFT | $11, $0, -1, -1, $0, 0, BlackthornGymBoulder, EVENT_BOULDER_IN_BLACKTHORN_GYM_1 + person_event SPRITE_BOULDER, 7, 6, OW_LEFT | $11, $0, -1, -1, $0, 0, BlackthornGymBoulder, EVENT_BOULDER_IN_BLACKTHORN_GYM_2 + person_event SPRITE_BOULDER, 20, 10, OW_LEFT | $11, $0, -1, -1, $0, 0, BlackthornGymBoulder, EVENT_BOULDER_IN_BLACKTHORN_GYM_3 + person_event SPRITE_BOULDER, 7, 7, OW_LEFT | $11, $0, -1, -1, $0, 0, BlackthornGymBoulder, -1 + person_event SPRITE_BOULDER, 5, 10, OW_LEFT | $11, $0, -1, -1, $0, 0, BlackthornGymBoulder, -1 + person_event SPRITE_BOULDER, 18, 12, OW_LEFT | $11, $0, -1, -1, $0, 0, BlackthornGymBoulder, -1 diff --git a/maps/BlackthornMart.asm b/maps/BlackthornMart.asm index 357e1dee0..784e97203 100644 --- a/maps/BlackthornMart.asm +++ b/maps/BlackthornMart.asm @@ -1,8 +1,8 @@ BlackthornMart_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 ClerkScript_0x195a5d: @@ -45,19 +45,19 @@ BlackthornMart_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $7, $2, 4, GROUP_BLACKTHORN_CITY, MAP_BLACKTHORN_CITY warp_def $7, $3, 4, GROUP_BLACKTHORN_CITY, MAP_BLACKTHORN_CITY - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 3 - person_event SPRITE_CLERK, 7, 5, $9, $0, 255, 255, $0, 0, ClerkScript_0x195a5d, -1 - person_event SPRITE_COOLTRAINER_M, 10, 11, $5, $2, 255, 255, $0, 0, CooltrainerMScript_0x195a64, -1 - person_event SPRITE_BLACK_BELT, 6, 9, $6, $0, 255, 255, $a0, 0, BlackBeltScript_0x195a67, -1 + person_event SPRITE_CLERK, 7, 5, OW_LEFT | $1, $0, -1, -1, $0, 0, ClerkScript_0x195a5d, -1 + person_event SPRITE_COOLTRAINER_M, 10, 11, OW_UP | $1, $2, -1, -1, $0, 0, CooltrainerMScript_0x195a64, -1 + person_event SPRITE_BLACK_BELT, 6, 9, OW_UP | $2, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, BlackBeltScript_0x195a67, -1 diff --git a/maps/BlackthornPokeCenter1F.asm b/maps/BlackthornPokeCenter1F.asm index a56939915..1f766c544 100644 --- a/maps/BlackthornPokeCenter1F.asm +++ b/maps/BlackthornPokeCenter1F.asm @@ -1,8 +1,8 @@ BlackthornPokeCenter1F_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 NurseScript_0x195b79: @@ -47,21 +47,21 @@ BlackthornPokeCenter1F_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 3 warp_def $7, $3, 5, GROUP_BLACKTHORN_CITY, MAP_BLACKTHORN_CITY warp_def $7, $4, 5, GROUP_BLACKTHORN_CITY, MAP_BLACKTHORN_CITY warp_def $7, $0, 1, GROUP_POKECENTER_2F, MAP_POKECENTER_2F - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 4 - person_event SPRITE_NURSE, 5, 7, $6, $0, 255, 255, $0, 0, NurseScript_0x195b79, -1 - person_event SPRITE_GENTLEMAN, 7, 9, $6, $0, 255, 255, $0, 0, GentlemanScript_0x195b7c, -1 - person_event SPRITE_TWIN, 8, 5, $3, $0, 255, 255, $a0, 0, TwinScript_0x195b7f, -1 - person_event SPRITE_COOLTRAINER_M, 10, 11, $5, $1, 255, 255, $80, 0, CooltrainerMScript_0x195b82, -1 + person_event SPRITE_NURSE, 5, 7, OW_UP | $2, $0, -1, -1, $0, 0, NurseScript_0x195b79, -1 + person_event SPRITE_GENTLEMAN, 7, 9, OW_UP | $2, $0, -1, -1, $0, 0, GentlemanScript_0x195b7c, -1 + person_event SPRITE_TWIN, 8, 5, OW_DOWN | $3, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, TwinScript_0x195b7f, -1 + person_event SPRITE_COOLTRAINER_M, 10, 11, OW_UP | $1, $1, -1, -1, (PAL_OW_RED << 4) | $80, 0, CooltrainerMScript_0x195b82, -1 diff --git a/maps/BluesHouse.asm b/maps/BluesHouse.asm index a27796ec5..c4ed75fe3 100644 --- a/maps/BluesHouse.asm +++ b/maps/BluesHouse.asm @@ -1,8 +1,8 @@ BluesHouse_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 DaisyScript_0x19b0d0: @@ -30,10 +30,10 @@ UnknownScript_0x19b0de: writetext UnknownText_0x19b266 closetext loadmovesprites - special Function8c084 + special FadeBlackBGMap playmusic MUSIC_HEAL pause 60 - special Function8c079 + special FadeInBGMap special RestartMapMusic loadfont writetext UnknownText_0x19b296 @@ -145,17 +145,17 @@ BluesHouse_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $7, $2, 2, GROUP_PALLET_TOWN, MAP_PALLET_TOWN warp_def $7, $3, 2, GROUP_PALLET_TOWN, MAP_PALLET_TOWN - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 1 - person_event SPRITE_DAISY, 7, 6, $3, $0, 255, 255, $0, 0, DaisyScript_0x19b0d0, -1 + person_event SPRITE_DAISY, 7, 6, OW_DOWN | $3, $0, -1, -1, $0, 0, DaisyScript_0x19b0d0, -1 diff --git a/maps/BrunosRoom.asm b/maps/BrunosRoom.asm index 18ecdbb68..d5c1be4ac 100644 --- a/maps/BrunosRoom.asm +++ b/maps/BrunosRoom.asm @@ -1,12 +1,12 @@ BrunosRoom_MapScriptHeader: - ; trigger count +.MapTriggers: db 2 ; triggers dw UnknownScript_0x180993, $0000 dw UnknownScript_0x180997, $0000 - ; callback count +.MapCallbacks: db 1 ; callbacks @@ -21,7 +21,7 @@ UnknownScript_0x180997: end UnknownScript_0x180998: - checkevent EVENT_KOGAS_ROOM_ENTRANCE_CLOSED + checkevent EVENT_BRUNOS_ROOM_ENTRANCE_CLOSED iffalse UnknownScript_0x1809a2 changeblock $4, $e, $2a UnknownScript_0x1809a2: @@ -40,7 +40,7 @@ UnknownScript_0x1809ad: reloadmappart loadmovesprites dotrigger $1 - setevent EVENT_KOGAS_ROOM_ENTRANCE_CLOSED + setevent EVENT_BRUNOS_ROOM_ENTRANCE_CLOSED waitbutton end @@ -130,19 +130,19 @@ BrunosRoom_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 4 warp_def $11, $4, 3, GROUP_KOGAS_ROOM, MAP_KOGAS_ROOM warp_def $11, $5, 4, GROUP_KOGAS_ROOM, MAP_KOGAS_ROOM warp_def $2, $4, 1, GROUP_KARENS_ROOM, MAP_KARENS_ROOM warp_def $2, $5, 2, GROUP_KARENS_ROOM, MAP_KARENS_ROOM - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 1 - person_event SPRITE_BRUNO, 11, 9, $6, $0, 255, 255, $b0, 0, BrunoScript_0x1809c5, -1 + person_event SPRITE_BRUNO, 11, 9, OW_UP | $2, $0, -1, -1, (PAL_OW_BROWN << 4) | $80, 0, BrunoScript_0x1809c5, -1 diff --git a/maps/BurnedTower1F.asm b/maps/BurnedTower1F.asm index b6a447a11..b1e0dc278 100644 --- a/maps/BurnedTower1F.asm +++ b/maps/BurnedTower1F.asm @@ -1,5 +1,5 @@ BurnedTower1F_MapScriptHeader: - ; trigger count +.MapTriggers: db 3 ; triggers @@ -7,7 +7,7 @@ BurnedTower1F_MapScriptHeader: dw UnknownScript_0x185bf6, $0000 dw UnknownScript_0x185bf7, $0000 - ; callback count +.MapCallbacks: db 1 ; callbacks @@ -37,7 +37,7 @@ UnknownScript_0x185bf8: UnknownScript_0x185c0d: spriteface $3, DOWN - showemote $0, $3, 15 + showemote EMOTE_SHOCK, $3, 15 applymovement $3, MovementData_0x185cd3 loadfont writetext UnknownText_0x185ecc @@ -48,7 +48,7 @@ UnknownScript_0x185c0d: end UnknownScript_0x185c25: - showemote $0, $4, 15 + showemote EMOTE_SHOCK, $4, 15 special Functionc48f pause 15 spriteface $4, RIGHT @@ -97,11 +97,11 @@ UnknownScript_0x185c80: closetext loadmovesprites dotrigger $2 - setevent EVENT_6C5 + setevent EVENT_RIVAL_BURNED_TOWER special Functionc48f pause 15 earthquake 50 - showemote $0, $0, 15 + showemote EMOTE_SHOCK, $0, 15 playsound SFX_ENTER_DOOR waitbutton changeblock $a, $8, $25 @@ -109,7 +109,7 @@ UnknownScript_0x185c80: pause 15 applymovement $0, MovementData_0x185cd1 playsound SFX_KINESIS - showemote $0, $4, 20 + showemote EMOTE_SHOCK, $4, 20 loadfont writetext UnknownText_0x185e75 closetext @@ -129,13 +129,11 @@ BurnedTower1FRock: jumpstd smashrock MapBurnedTower1FSignpostItem0: - dw $0080 - db ETHER + dwb EVENT_BURNED_TOWER_1F_HIDDEN_ETHER, ETHER MapBurnedTower1FSignpostItem1: - dw $00ff - db ULTRA_BALL + dwb EVENT_BURNED_TOWER_1F_HIDDEN_ULTRA_BALL, ULTRA_BALL ItemFragment_0x185ccb: @@ -283,7 +281,7 @@ BurnedTower1F_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 14 warp_def $f, $9, 13, GROUP_ECRUTEAK_CITY, MAP_ECRUTEAK_CITY warp_def $f, $a, 13, GROUP_ECRUTEAK_CITY, MAP_ECRUTEAK_CITY @@ -300,19 +298,19 @@ BurnedTower1F_MapEventHeader: warp_def $e, $f, 5, GROUP_BURNED_TOWER_B1F, MAP_BURNED_TOWER_B1F warp_def $f, $7, 6, GROUP_BURNED_TOWER_B1F, MAP_BURNED_TOWER_B1F - ; xy triggers +.XYTriggers: db 1 xy_trigger 1, $9, $b, $0, UnknownScript_0x185c25, $0, $0 - ; signposts +.Signposts: db 2 - signpost 7, 8, $7, MapBurnedTower1FSignpostItem0 - signpost 11, 13, $7, MapBurnedTower1FSignpostItem1 + signpost 7, 8, SIGNPOST_ITEM, MapBurnedTower1FSignpostItem0 + signpost 11, 13, SIGNPOST_ITEM, MapBurnedTower1FSignpostItem1 - ; people-events +.PersonEvents: db 5 - person_event SPRITE_ROCK, 8, 19, $18, $0, 255, 255, $0, 0, BurnedTower1FRock, -1 - person_event SPRITE_SUPER_NERD, 16, 16, $3, $0, 255, 255, $90, 0, SuperNerdScript_0x185cbc, EVENT_765 - person_event SPRITE_SILVER, 13, 12, $8, $0, 255, 255, $2, 3, ObjectEvent, EVENT_6C5 - person_event SPRITE_MORTY, 18, 18, $2, $11, 255, 255, $b0, 0, MortyScript_0x185cbf, EVENT_764 - person_event SPRITE_POKE_BALL, 6, 18, $1, $0, 255, 255, $1, 0, ItemFragment_0x185ccb, EVENT_656 + person_event SPRITE_ROCK, 8, 19, OW_LEFT | $10, $0, -1, -1, $0, 0, BurnedTower1FRock, -1 + person_event SPRITE_SUPER_NERD, 16, 16, OW_DOWN | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, SuperNerdScript_0x185cbc, EVENT_BURNED_TOWER_1F_EUSINE + person_event SPRITE_SILVER, 13, 12, OW_LEFT | $0, $0, -1, -1, $2, 3, ObjectEvent, EVENT_RIVAL_BURNED_TOWER + person_event SPRITE_MORTY, 18, 18, OW_DOWN | $2, $11, -1, -1, (PAL_OW_BROWN << 4) | $80, 0, MortyScript_0x185cbf, EVENT_BURNED_TOWER_MORTY + person_event SPRITE_POKE_BALL, 6, 18, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x185ccb, EVENT_BURNED_TOWER_1F_HP_UP diff --git a/maps/BurnedTowerB1F.asm b/maps/BurnedTowerB1F.asm index 2db890d51..0b88c21c5 100644 --- a/maps/BurnedTowerB1F.asm +++ b/maps/BurnedTowerB1F.asm @@ -1,12 +1,12 @@ BurnedTowerB1F_MapScriptHeader: - ; trigger count +.MapTriggers: db 2 ; triggers dw UnknownScript_0x18615e, $0000 dw UnknownScript_0x18615f, $0000 - ; callback count +.MapCallbacks: db 1 ; callbacks @@ -81,10 +81,10 @@ UnknownScript_0x18616b: domaptrigger GROUP_ECRUTEAK_GYM, MAP_ECRUTEAK_GYM, $1 domaptrigger GROUP_CIANWOOD_CITY, MAP_CIANWOOD_CITY, $1 clearevent EVENT_SAW_SUICUNE_AT_CIANWOOD_CITY - setevent EVENT_7A8 - clearevent EVENT_7A9 - setevent EVENT_764 - setevent EVENT_765 + setevent EVENT_ECRUTEAK_GYM_GRAMPS + clearevent EVENT_ECRUTEAK_CITY_GRAMPS + setevent EVENT_BURNED_TOWER_MORTY + setevent EVENT_BURNED_TOWER_1F_EUSINE appear $a refreshscreen $0 changeblock $6, $e, $1b @@ -233,7 +233,7 @@ BurnedTowerB1F_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 6 warp_def $9, $a, 3, GROUP_BURNED_TOWER_1F, MAP_BURNED_TOWER_1F warp_def $7, $11, 7, GROUP_BURNED_TOWER_1F, MAP_BURNED_TOWER_1F @@ -242,21 +242,21 @@ BurnedTowerB1F_MapEventHeader: warp_def $e, $11, 12, GROUP_BURNED_TOWER_1F, MAP_BURNED_TOWER_1F warp_def $f, $7, 14, GROUP_BURNED_TOWER_1F, MAP_BURNED_TOWER_1F - ; xy triggers +.XYTriggers: db 1 xy_trigger 0, $6, $a, $0, UnknownScript_0x18616b, $0, $0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 9 - person_event SPRITE_BOULDER, 12, 21, $19, $0, 255, 255, $0, 0, BurnedTowerB1FBoulder, -1 - person_event SPRITE_RAIKOU, 7, 11, $16, $0, 255, 255, $b0, 0, ObjectEvent, EVENT_74A - person_event SPRITE_ENTEI, 7, 16, $16, $0, 255, 255, $80, 0, ObjectEvent, EVENT_74A - person_event SPRITE_SUICUNE, 8, 14, $16, $0, 255, 255, $90, 0, ObjectEvent, EVENT_74A - person_event SPRITE_RAIKOU, 7, 11, $6, $0, 255, 255, $d0, 0, ObjectEvent, EVENT_74B - person_event SPRITE_ENTEI, 7, 16, $6, $0, 255, 255, $d0, 0, ObjectEvent, EVENT_74B - person_event SPRITE_SUICUNE, 8, 14, $6, $0, 255, 255, $d0, 0, ObjectEvent, EVENT_74B - person_event SPRITE_POKE_BALL, 8, 20, $1, $0, 255, 255, $1, 0, ItemFragment_0x186231, EVENT_657 - person_event SPRITE_SUPER_NERD, 16, 14, $7, $0, 255, 255, $90, 0, SuperNerdScript_0x186212, EVENT_EUSINE_IN_BURNED_TOWER + person_event SPRITE_BOULDER, 12, 21, OW_LEFT | $11, $0, -1, -1, $0, 0, BurnedTowerB1FBoulder, -1 + person_event SPRITE_RAIKOU, 7, 11, OW_UP | $12, $0, -1, -1, (PAL_OW_BROWN << 4) | $80, 0, ObjectEvent, EVENT_BURNED_TOWER_B1F_BEASTS_1 + person_event SPRITE_ENTEI, 7, 16, OW_UP | $12, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, ObjectEvent, EVENT_BURNED_TOWER_B1F_BEASTS_1 + person_event SPRITE_SUICUNE, 8, 14, OW_UP | $12, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, ObjectEvent, EVENT_BURNED_TOWER_B1F_BEASTS_1 + person_event SPRITE_RAIKOU, 7, 11, OW_UP | $2, $0, -1, -1, (PAL_OW_SILVER << 4) | $80, 0, ObjectEvent, EVENT_BURNED_TOWER_B1F_BEASTS_2 + person_event SPRITE_ENTEI, 7, 16, OW_UP | $2, $0, -1, -1, (PAL_OW_SILVER << 4) | $80, 0, ObjectEvent, EVENT_BURNED_TOWER_B1F_BEASTS_2 + person_event SPRITE_SUICUNE, 8, 14, OW_UP | $2, $0, -1, -1, (PAL_OW_SILVER << 4) | $80, 0, ObjectEvent, EVENT_BURNED_TOWER_B1F_BEASTS_2 + person_event SPRITE_POKE_BALL, 8, 20, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x186231, EVENT_BURNED_TOWER_B1F_TM_ENDURE + person_event SPRITE_SUPER_NERD, 16, 14, OW_UP | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, SuperNerdScript_0x186212, EVENT_EUSINE_IN_BURNED_TOWER diff --git a/maps/CeladonCafe.asm b/maps/CeladonCafe.asm index 277ac39fd..63e8a4f92 100644 --- a/maps/CeladonCafe.asm +++ b/maps/CeladonCafe.asm @@ -1,8 +1,8 @@ CeladonCafe_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 SuperNerdScript_0x73049: @@ -204,23 +204,23 @@ CeladonCafe_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $7, $6, 9, GROUP_CELADON_CITY, MAP_CELADON_CITY warp_def $7, $7, 9, GROUP_CELADON_CITY, MAP_CELADON_CITY - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 2 - signpost 0, 5, $0, EatathonContestPoster - signpost 1, 7, $0, CeladonCafeTrashcan + signpost 0, 5, SIGNPOST_READ, EatathonContestPoster + signpost 1, 7, SIGNPOST_READ, CeladonCafeTrashcan - ; people-events +.PersonEvents: db 5 - person_event SPRITE_SUPER_NERD, 7, 13, $8, $0, 255, 255, $b0, 0, SuperNerdScript_0x73049, -1 - person_event SPRITE_FISHER, 10, 8, $8, $0, 255, 255, $0, 0, FisherScript_0x73051, -1 - person_event SPRITE_FISHER, 11, 5, $9, $0, 255, 255, $a0, 0, FisherScript_0x73062, -1 - person_event SPRITE_FISHER, 6, 5, $9, $0, 255, 255, $0, 0, FisherScript_0x73073, -1 - person_event SPRITE_TEACHER, 7, 8, $8, $0, 255, 255, $0, 0, TeacherScript_0x73084, -1 + person_event SPRITE_SUPER_NERD, 7, 13, OW_LEFT | $0, $0, -1, -1, (PAL_OW_BROWN << 4) | $80, 0, SuperNerdScript_0x73049, -1 + person_event SPRITE_FISHER, 10, 8, OW_LEFT | $0, $0, -1, -1, $0, 0, FisherScript_0x73051, -1 + person_event SPRITE_FISHER, 11, 5, OW_LEFT | $1, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, FisherScript_0x73062, -1 + person_event SPRITE_FISHER, 6, 5, OW_LEFT | $1, $0, -1, -1, $0, 0, FisherScript_0x73073, -1 + person_event SPRITE_TEACHER, 7, 8, OW_LEFT | $0, $0, -1, -1, $0, 0, TeacherScript_0x73084, -1 diff --git a/maps/CeladonCity.asm b/maps/CeladonCity.asm index 3f1aedd0f..1d595b448 100644 --- a/maps/CeladonCity.asm +++ b/maps/CeladonCity.asm @@ -1,8 +1,8 @@ CeladonCity_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 1 ; callbacks @@ -66,8 +66,7 @@ CeladonCityPokeCenterSign: jumpstd pokecentersign MapCeladonCitySignpostItem7: - dw $00fd - db PP_UP + dwb EVENT_CELADON_CITY_HIDDEN_PP_UP, PP_UP UnknownText_0x1a9f7d: text "This POLIWRATH is" @@ -230,7 +229,7 @@ CeladonCity_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 9 warp_def $9, $4, 1, GROUP_CELADON_DEPT_STORE_1F, MAP_CELADON_DEPT_STORE_1F warp_def $9, $10, 1, GROUP_CELADON_MANSION_1F, MAP_CELADON_MANSION_1F @@ -242,28 +241,28 @@ CeladonCity_MapEventHeader: warp_def $1d, $a, 1, GROUP_CELADON_GYM, MAP_CELADON_GYM warp_def $1d, $19, 1, GROUP_CELADON_CAFE, MAP_CELADON_CAFE - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 8 - signpost 21, 23, $0, CeladonCitySign - signpost 31, 11, $0, CeladonGymSign - signpost 9, 6, $0, CeladonCityDeptStoreSign - signpost 9, 13, $0, CeladonCityMansionSign - signpost 21, 19, $0, CeladonCityGameCornerSign - signpost 21, 29, $0, CeladonCityTrainerTips - signpost 9, 30, $0, CeladonCityPokeCenterSign - signpost 21, 37, $7, MapCeladonCitySignpostItem7 - - ; people-events + signpost 21, 23, SIGNPOST_READ, CeladonCitySign + signpost 31, 11, SIGNPOST_READ, CeladonGymSign + signpost 9, 6, SIGNPOST_READ, CeladonCityDeptStoreSign + signpost 9, 13, SIGNPOST_READ, CeladonCityMansionSign + signpost 21, 19, SIGNPOST_READ, CeladonCityGameCornerSign + signpost 21, 29, SIGNPOST_READ, CeladonCityTrainerTips + signpost 9, 30, SIGNPOST_READ, CeladonCityPokeCenterSign + signpost 21, 37, SIGNPOST_ITEM, MapCeladonCitySignpostItem7 + +.PersonEvents: db 9 - person_event SPRITE_FISHER, 15, 30, $9, $0, 255, 255, $a0, 0, FisherScript_0x1a9f43, -1 - person_event SPRITE_POLIWAG, 15, 31, $16, $0, 255, 255, $90, 0, CeladonCityPoliwrath, -1 - person_event SPRITE_TEACHER, 28, 24, $5, $2, 255, 255, $80, 0, TeacherScript_0x1a9f50, -1 - person_event SPRITE_GRAMPS, 20, 18, $6, $0, 255, 255, $b0, 0, GrampsScript_0x1a9f53, -1 - person_event SPRITE_GRAMPS, 35, 12, $7, $0, 255, 255, $80, 0, GrampsScript_0x1a9f56, -1 - person_event SPRITE_YOUNGSTER, 17, 22, $5, $2, 255, 255, $90, 0, YoungsterScript_0x1a9f59, -1 - person_event SPRITE_YOUNGSTER, 37, 28, $7, $0, 255, 255, $a0, 0, YoungsterScript_0x1a9f5c, -1 - person_event SPRITE_TEACHER, 18, 10, $2, $22, 255, 255, $a0, 0, TeacherScript_0x1a9f5f, -1 - person_event SPRITE_LASS, 26, 11, $4, $20, 255, 255, $80, 0, LassScript_0x1a9f62, -1 + person_event SPRITE_FISHER, 15, 30, OW_LEFT | $1, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, FisherScript_0x1a9f43, -1 + person_event SPRITE_POLIWAG, 15, 31, OW_UP | $12, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, CeladonCityPoliwrath, -1 + person_event SPRITE_TEACHER, 28, 24, OW_UP | $1, $2, -1, -1, (PAL_OW_RED << 4) | $80, 0, TeacherScript_0x1a9f50, -1 + person_event SPRITE_GRAMPS, 20, 18, OW_UP | $2, $0, -1, -1, (PAL_OW_BROWN << 4) | $80, 0, GrampsScript_0x1a9f53, -1 + person_event SPRITE_GRAMPS, 35, 12, OW_UP | $3, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, GrampsScript_0x1a9f56, -1 + person_event SPRITE_YOUNGSTER, 17, 22, OW_UP | $1, $2, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, YoungsterScript_0x1a9f59, -1 + person_event SPRITE_YOUNGSTER, 37, 28, OW_UP | $3, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, YoungsterScript_0x1a9f5c, -1 + person_event SPRITE_TEACHER, 18, 10, OW_DOWN | $2, $22, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, TeacherScript_0x1a9f5f, -1 + person_event SPRITE_LASS, 26, 11, OW_UP | $0, $20, -1, -1, (PAL_OW_RED << 4) | $80, 0, LassScript_0x1a9f62, -1 diff --git a/maps/CeladonDeptStore1F.asm b/maps/CeladonDeptStore1F.asm index 083d0ea40..fb3b38222 100644 --- a/maps/CeladonDeptStore1F.asm +++ b/maps/CeladonDeptStore1F.asm @@ -1,8 +1,8 @@ CeladonDeptStore1F_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 ReceptionistScript_0x709e0: @@ -72,23 +72,23 @@ CeladonDeptStore1F_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 4 warp_def $7, $7, 1, GROUP_CELADON_CITY, MAP_CELADON_CITY warp_def $7, $8, 1, GROUP_CELADON_CITY, MAP_CELADON_CITY warp_def $0, $f, 2, GROUP_CELADON_DEPT_STORE_2F, MAP_CELADON_DEPT_STORE_2F warp_def $0, $2, 1, GROUP_CELADON_DEPT_STORE_ELEVATOR, MAP_CELADON_DEPT_STORE_ELEVATOR - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 2 - signpost 0, 14, $0, CeladonDeptStore1FDirectory - signpost 0, 3, $0, CeladonDeptStore1FElevatorButton + signpost 0, 14, SIGNPOST_READ, CeladonDeptStore1FDirectory + signpost 0, 3, SIGNPOST_READ, CeladonDeptStore1FElevatorButton - ; people-events +.PersonEvents: db 3 - person_event SPRITE_RECEPTIONIST, 5, 14, $6, $0, 255, 255, $80, 0, ReceptionistScript_0x709e0, -1 - person_event SPRITE_GENTLEMAN, 8, 15, $2, $11, 255, 255, $0, 0, GentlemanScript_0x709e3, -1 - person_event SPRITE_TEACHER, 7, 9, $5, $1, 255, 255, $a0, 0, TeacherScript_0x709e6, -1 + person_event SPRITE_RECEPTIONIST, 5, 14, OW_UP | $2, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, ReceptionistScript_0x709e0, -1 + person_event SPRITE_GENTLEMAN, 8, 15, OW_DOWN | $2, $11, -1, -1, $0, 0, GentlemanScript_0x709e3, -1 + person_event SPRITE_TEACHER, 7, 9, OW_UP | $1, $1, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, TeacherScript_0x709e6, -1 diff --git a/maps/CeladonDeptStore2F.asm b/maps/CeladonDeptStore2F.asm index 2db6848ff..46954a03e 100644 --- a/maps/CeladonDeptStore2F.asm +++ b/maps/CeladonDeptStore2F.asm @@ -1,8 +1,8 @@ CeladonDeptStore2F_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 ClerkScript_0x70bad: @@ -66,23 +66,23 @@ CeladonDeptStore2F_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 3 warp_def $0, $c, 1, GROUP_CELADON_DEPT_STORE_3F, MAP_CELADON_DEPT_STORE_3F warp_def $0, $f, 3, GROUP_CELADON_DEPT_STORE_1F, MAP_CELADON_DEPT_STORE_1F warp_def $0, $2, 1, GROUP_CELADON_DEPT_STORE_ELEVATOR, MAP_CELADON_DEPT_STORE_ELEVATOR - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 2 - signpost 0, 14, $0, CeladonDeptStore2FDirectory - signpost 0, 3, $0, CeladonDeptStore2FElevatorButton + signpost 0, 14, SIGNPOST_READ, CeladonDeptStore2FDirectory + signpost 0, 3, SIGNPOST_READ, CeladonDeptStore2FElevatorButton - ; people-events +.PersonEvents: db 4 - person_event SPRITE_CLERK, 9, 17, $7, $0, 255, 255, $90, 0, ClerkScript_0x70bad, -1 - person_event SPRITE_CLERK, 9, 18, $7, $0, 255, 255, $90, 0, ClerkScript_0x70bb5, -1 - person_event SPRITE_POKEFAN_M, 6, 9, $7, $0, 255, 255, $80, 0, PokefanMScript_0x70bbd, -1 - person_event SPRITE_YOUNGSTER, 6, 10, $8, $0, 255, 255, $a0, 0, YoungsterScript_0x70bc0, -1 + person_event SPRITE_CLERK, 9, 17, OW_UP | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, ClerkScript_0x70bad, -1 + person_event SPRITE_CLERK, 9, 18, OW_UP | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, ClerkScript_0x70bb5, -1 + person_event SPRITE_POKEFAN_M, 6, 9, OW_UP | $3, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, PokefanMScript_0x70bbd, -1 + person_event SPRITE_YOUNGSTER, 6, 10, OW_LEFT | $0, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, YoungsterScript_0x70bc0, -1 diff --git a/maps/CeladonDeptStore3F.asm b/maps/CeladonDeptStore3F.asm index fef442854..d1db6e1e3 100644 --- a/maps/CeladonDeptStore3F.asm +++ b/maps/CeladonDeptStore3F.asm @@ -1,8 +1,8 @@ CeladonDeptStore3F_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 ClerkScript_0x70d29: @@ -91,24 +91,24 @@ CeladonDeptStore3F_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 3 warp_def $0, $c, 1, GROUP_CELADON_DEPT_STORE_2F, MAP_CELADON_DEPT_STORE_2F warp_def $0, $f, 2, GROUP_CELADON_DEPT_STORE_4F, MAP_CELADON_DEPT_STORE_4F warp_def $0, $2, 1, GROUP_CELADON_DEPT_STORE_ELEVATOR, MAP_CELADON_DEPT_STORE_ELEVATOR - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 2 - signpost 0, 14, $0, CeladonDeptStore3FDirectory - signpost 0, 3, $0, CeladonDeptStore3FElevatorButton + signpost 0, 14, SIGNPOST_READ, CeladonDeptStore3FDirectory + signpost 0, 3, SIGNPOST_READ, CeladonDeptStore3FElevatorButton - ; people-events +.PersonEvents: db 5 - person_event SPRITE_CLERK, 5, 11, $6, $0, 255, 255, $90, 0, ClerkScript_0x70d29, -1 - person_event SPRITE_YOUNGSTER, 8, 10, $4, $10, 255, 255, $a0, 0, YoungsterScript_0x70d31, -1 - person_event SPRITE_GAMEBOY_KID, 5, 13, $6, $0, 255, 255, $80, 0, GameboyKidScript_0x70d34, -1 - person_event SPRITE_GAMEBOY_KID, 5, 14, $6, $0, 255, 255, $90, 0, GameboyKidScript_0x70d3f, -1 - person_event SPRITE_SUPER_NERD, 8, 17, $2, $11, 255, 255, $80, 0, SuperNerdScript_0x70d4a, -1 + person_event SPRITE_CLERK, 5, 11, OW_UP | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, ClerkScript_0x70d29, -1 + person_event SPRITE_YOUNGSTER, 8, 10, OW_UP | $0, $10, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, YoungsterScript_0x70d31, -1 + person_event SPRITE_GAMEBOY_KID, 5, 13, OW_UP | $2, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, GameboyKidScript_0x70d34, -1 + person_event SPRITE_GAMEBOY_KID, 5, 14, OW_UP | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, GameboyKidScript_0x70d3f, -1 + person_event SPRITE_SUPER_NERD, 8, 17, OW_DOWN | $2, $11, -1, -1, (PAL_OW_RED << 4) | $80, 0, SuperNerdScript_0x70d4a, -1 diff --git a/maps/CeladonDeptStore4F.asm b/maps/CeladonDeptStore4F.asm index ac8aeef06..873942e48 100644 --- a/maps/CeladonDeptStore4F.asm +++ b/maps/CeladonDeptStore4F.asm @@ -1,8 +1,8 @@ CeladonDeptStore4F_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 ClerkScript_0x70f0d: @@ -49,22 +49,22 @@ CeladonDeptStore4F_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 3 warp_def $0, $c, 1, GROUP_CELADON_DEPT_STORE_5F, MAP_CELADON_DEPT_STORE_5F warp_def $0, $f, 2, GROUP_CELADON_DEPT_STORE_3F, MAP_CELADON_DEPT_STORE_3F warp_def $0, $2, 1, GROUP_CELADON_DEPT_STORE_ELEVATOR, MAP_CELADON_DEPT_STORE_ELEVATOR - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 2 - signpost 0, 14, $0, CeladonDeptStore4FDirectory - signpost 0, 3, $0, CeladonDeptStore4FElevatorButton + signpost 0, 14, SIGNPOST_READ, CeladonDeptStore4FDirectory + signpost 0, 3, SIGNPOST_READ, CeladonDeptStore4FElevatorButton - ; people-events +.PersonEvents: db 3 - person_event SPRITE_CLERK, 9, 17, $7, $0, 255, 255, $90, 0, ClerkScript_0x70f0d, -1 - person_event SPRITE_SUPER_NERD, 10, 11, $5, $1, 255, 255, $a0, 0, SuperNerdScript_0x70f15, -1 - person_event SPRITE_YOUNGSTER, 6, 12, $7, $0, 255, 255, $0, 0, YoungsterScript_0x70f18, -1 + person_event SPRITE_CLERK, 9, 17, OW_UP | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, ClerkScript_0x70f0d, -1 + person_event SPRITE_SUPER_NERD, 10, 11, OW_UP | $1, $1, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, SuperNerdScript_0x70f15, -1 + person_event SPRITE_YOUNGSTER, 6, 12, OW_UP | $3, $0, -1, -1, $0, 0, YoungsterScript_0x70f18, -1 diff --git a/maps/CeladonDeptStore5F.asm b/maps/CeladonDeptStore5F.asm index 99fb79d95..e21fc4f39 100644 --- a/maps/CeladonDeptStore5F.asm +++ b/maps/CeladonDeptStore5F.asm @@ -1,8 +1,8 @@ CeladonDeptStore5F_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 ClerkScript_0x71004: @@ -68,24 +68,24 @@ CeladonDeptStore5F_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 3 warp_def $0, $c, 1, GROUP_CELADON_DEPT_STORE_4F, MAP_CELADON_DEPT_STORE_4F warp_def $0, $f, 1, GROUP_CELADON_DEPT_STORE_6F, MAP_CELADON_DEPT_STORE_6F warp_def $0, $2, 1, GROUP_CELADON_DEPT_STORE_ELEVATOR, MAP_CELADON_DEPT_STORE_ELEVATOR - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 2 - signpost 0, 14, $0, CeladonDeptStore5FDirectory - signpost 0, 3, $0, CeladonDeptStore5FElevatorButton + signpost 0, 14, SIGNPOST_READ, CeladonDeptStore5FDirectory + signpost 0, 3, SIGNPOST_READ, CeladonDeptStore5FElevatorButton - ; people-events +.PersonEvents: db 5 - person_event SPRITE_CLERK, 9, 11, $7, $0, 255, 255, $90, 0, ClerkScript_0x71004, -1 - person_event SPRITE_CLERK, 9, 12, $7, $0, 255, 255, $90, 0, ClerkScript_0x7100c, -1 - person_event SPRITE_GENTLEMAN, 9, 17, $2, $11, 255, 255, $80, 0, GentlemanScript_0x71014, -1 - person_event SPRITE_SAILOR, 8, 7, $2, $11, 255, 255, $90, 0, SailorScript_0x71017, -1 - person_event SPRITE_TEACHER, 11, 5, $9, $0, 255, 255, $a0, 0, TeacherScript_0x7101a, -1 + person_event SPRITE_CLERK, 9, 11, OW_UP | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, ClerkScript_0x71004, -1 + person_event SPRITE_CLERK, 9, 12, OW_UP | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, ClerkScript_0x7100c, -1 + person_event SPRITE_GENTLEMAN, 9, 17, OW_DOWN | $2, $11, -1, -1, (PAL_OW_RED << 4) | $80, 0, GentlemanScript_0x71014, -1 + person_event SPRITE_SAILOR, 8, 7, OW_DOWN | $2, $11, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, SailorScript_0x71017, -1 + person_event SPRITE_TEACHER, 11, 5, OW_LEFT | $1, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, TeacherScript_0x7101a, -1 diff --git a/maps/CeladonDeptStore6F.asm b/maps/CeladonDeptStore6F.asm index d3405b873..b708bb1b0 100644 --- a/maps/CeladonDeptStore6F.asm +++ b/maps/CeladonDeptStore6F.asm @@ -1,8 +1,8 @@ CeladonDeptStore6F_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 1 ; callbacks @@ -149,24 +149,24 @@ CeladonDeptStore6F_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $0, $f, 2, GROUP_CELADON_DEPT_STORE_5F, MAP_CELADON_DEPT_STORE_5F warp_def $0, $2, 1, GROUP_CELADON_DEPT_STORE_ELEVATOR, MAP_CELADON_DEPT_STORE_ELEVATOR - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 6 - signpost 0, 14, $0, CeladonDeptStore6FDirectory - signpost 0, 3, $0, CeladonDeptStore1FElevatorButton - signpost 1, 8, $1, CeladonVendingMachine - signpost 1, 9, $1, CeladonVendingMachine - signpost 1, 10, $1, CeladonVendingMachine - signpost 1, 11, $1, CeladonVendingMachine - - ; people-events + signpost 0, 14, SIGNPOST_READ, CeladonDeptStore6FDirectory + signpost 0, 3, SIGNPOST_READ, CeladonDeptStore1FElevatorButton + signpost 1, 8, SIGNPOST_UP, CeladonVendingMachine + signpost 1, 9, SIGNPOST_UP, CeladonVendingMachine + signpost 1, 10, SIGNPOST_UP, CeladonVendingMachine + signpost 1, 11, SIGNPOST_UP, CeladonVendingMachine + +.PersonEvents: db 2 - person_event SPRITE_SUPER_NERD, 6, 13, $7, $0, 255, 255, $0, 0, SuperNerdScript_0x7117a, -1 - person_event SPRITE_YOUNGSTER, 9, 16, $2, $12, 255, 255, $80, 0, YoungsterScript_0x7117d, -1 + person_event SPRITE_SUPER_NERD, 6, 13, OW_UP | $3, $0, -1, -1, $0, 0, SuperNerdScript_0x7117a, -1 + person_event SPRITE_YOUNGSTER, 9, 16, OW_DOWN | $2, $12, -1, -1, (PAL_OW_RED << 4) | $80, 0, YoungsterScript_0x7117d, -1 diff --git a/maps/CeladonDeptStoreElevator.asm b/maps/CeladonDeptStoreElevator.asm index b23dcf91c..81b696418 100644 --- a/maps/CeladonDeptStoreElevator.asm +++ b/maps/CeladonDeptStoreElevator.asm @@ -1,8 +1,8 @@ CeladonDeptStoreElevator_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 MapCeladonDeptStoreElevatorSignpost0Script: @@ -33,17 +33,17 @@ CeladonDeptStoreElevator_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $3, $1, 255, GROUP_CELADON_DEPT_STORE_1F, MAP_CELADON_DEPT_STORE_1F warp_def $3, $2, 255, GROUP_CELADON_DEPT_STORE_1F, MAP_CELADON_DEPT_STORE_1F - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 1 - signpost 0, 3, $0, MapCeladonDeptStoreElevatorSignpost0Script + signpost 0, 3, SIGNPOST_READ, MapCeladonDeptStoreElevatorSignpost0Script - ; people-events +.PersonEvents: db 0 diff --git a/maps/CeladonGameCorner.asm b/maps/CeladonGameCorner.asm index 3b01e2c39..c117a60e7 100644 --- a/maps/CeladonGameCorner.asm +++ b/maps/CeladonGameCorner.asm @@ -1,8 +1,8 @@ CeladonGameCorner_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 ClerkScript_0x7211d: @@ -104,20 +104,20 @@ MapCeladonGameCornerSignpost35Script: if_equal $0, MapCeladonGameCornerSignpost16Script refreshscreen $0 writebyte $0 - special Functionc373 + special Special_SlotMachine loadmovesprites end MapCeladonGameCornerSignpost16Script: refreshscreen $0 writebyte $1 - special Functionc373 + special Special_SlotMachine loadmovesprites end MapCeladonGameCornerSignpost11Script: refreshscreen $0 - special Functionc380 + special Special_CardFlip loadmovesprites end @@ -128,7 +128,7 @@ MapCeladonGameCornerSignpost9Script: loadfont writetext UnknownText_0x72567 closetext - special Functionc380 + special Special_CardFlip loadmovesprites end @@ -274,63 +274,63 @@ CeladonGameCorner_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $d, $e, 6, GROUP_CELADON_CITY, MAP_CELADON_CITY warp_def $d, $f, 6, GROUP_CELADON_CITY, MAP_CELADON_CITY - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 38 - signpost 6, 1, $0, MapCeladonGameCornerSignpost11Script - signpost 7, 1, $0, MapCeladonGameCornerSignpost11Script - signpost 8, 1, $0, MapCeladonGameCornerSignpost11Script - signpost 9, 1, $0, MapCeladonGameCornerSignpost11Script - signpost 10, 1, $0, MapCeladonGameCornerSignpost11Script - signpost 11, 1, $4, MapCeladonGameCornerSignpost11Script - signpost 6, 6, $0, MapCeladonGameCornerSignpost11Script - signpost 7, 6, $0, MapCeladonGameCornerSignpost11Script - signpost 8, 6, $0, MapCeladonGameCornerSignpost11Script - signpost 9, 6, $0, MapCeladonGameCornerSignpost9Script - signpost 10, 6, $0, MapCeladonGameCornerSignpost11Script - signpost 11, 6, $3, MapCeladonGameCornerSignpost11Script - signpost 6, 7, $0, MapCeladonGameCornerSignpost35Script - signpost 7, 7, $0, MapCeladonGameCornerSignpost35Script - signpost 8, 7, $0, MapCeladonGameCornerSignpost35Script - signpost 9, 7, $0, MapCeladonGameCornerSignpost35Script - signpost 10, 7, $0, MapCeladonGameCornerSignpost16Script - signpost 11, 7, $4, MapCeladonGameCornerSignpost35Script - signpost 6, 12, $0, MapCeladonGameCornerSignpost35Script - signpost 7, 12, $0, MapCeladonGameCornerSignpost35Script - signpost 8, 12, $0, MapCeladonGameCornerSignpost35Script - signpost 9, 12, $0, MapCeladonGameCornerSignpost35Script - signpost 10, 12, $0, MapCeladonGameCornerSignpost35Script - signpost 11, 12, $3, MapCeladonGameCornerSignpost35Script - signpost 6, 13, $0, MapCeladonGameCornerSignpost35Script - signpost 7, 13, $0, MapCeladonGameCornerSignpost35Script - signpost 8, 13, $0, MapCeladonGameCornerSignpost35Script - signpost 9, 13, $0, MapCeladonGameCornerSignpost35Script - signpost 10, 13, $0, MapCeladonGameCornerSignpost35Script - signpost 11, 13, $4, MapCeladonGameCornerSignpost35Script - signpost 6, 18, $0, MapCeladonGameCornerSignpost35Script - signpost 7, 18, $0, MapCeladonGameCornerSignpost35Script - signpost 8, 18, $0, MapCeladonGameCornerSignpost32Script - signpost 9, 18, $0, MapCeladonGameCornerSignpost35Script - signpost 10, 18, $0, MapCeladonGameCornerSignpost35Script - signpost 11, 18, $3, MapCeladonGameCornerSignpost35Script - signpost 0, 15, $0, MapCeladonGameCornerSignpost36Script - signpost 0, 9, $0, MapCeladonGameCornerSignpost37Script - - ; people-events + signpost 6, 1, SIGNPOST_READ, MapCeladonGameCornerSignpost11Script + signpost 7, 1, SIGNPOST_READ, MapCeladonGameCornerSignpost11Script + signpost 8, 1, SIGNPOST_READ, MapCeladonGameCornerSignpost11Script + signpost 9, 1, SIGNPOST_READ, MapCeladonGameCornerSignpost11Script + signpost 10, 1, SIGNPOST_READ, MapCeladonGameCornerSignpost11Script + signpost 11, 1, SIGNPOST_LEFT, MapCeladonGameCornerSignpost11Script + signpost 6, 6, SIGNPOST_READ, MapCeladonGameCornerSignpost11Script + signpost 7, 6, SIGNPOST_READ, MapCeladonGameCornerSignpost11Script + signpost 8, 6, SIGNPOST_READ, MapCeladonGameCornerSignpost11Script + signpost 9, 6, SIGNPOST_READ, MapCeladonGameCornerSignpost9Script + signpost 10, 6, SIGNPOST_READ, MapCeladonGameCornerSignpost11Script + signpost 11, 6, SIGNPOST_RIGHT, MapCeladonGameCornerSignpost11Script + signpost 6, 7, SIGNPOST_READ, MapCeladonGameCornerSignpost35Script + signpost 7, 7, SIGNPOST_READ, MapCeladonGameCornerSignpost35Script + signpost 8, 7, SIGNPOST_READ, MapCeladonGameCornerSignpost35Script + signpost 9, 7, SIGNPOST_READ, MapCeladonGameCornerSignpost35Script + signpost 10, 7, SIGNPOST_READ, MapCeladonGameCornerSignpost16Script + signpost 11, 7, SIGNPOST_LEFT, MapCeladonGameCornerSignpost35Script + signpost 6, 12, SIGNPOST_READ, MapCeladonGameCornerSignpost35Script + signpost 7, 12, SIGNPOST_READ, MapCeladonGameCornerSignpost35Script + signpost 8, 12, SIGNPOST_READ, MapCeladonGameCornerSignpost35Script + signpost 9, 12, SIGNPOST_READ, MapCeladonGameCornerSignpost35Script + signpost 10, 12, SIGNPOST_READ, MapCeladonGameCornerSignpost35Script + signpost 11, 12, SIGNPOST_RIGHT, MapCeladonGameCornerSignpost35Script + signpost 6, 13, SIGNPOST_READ, MapCeladonGameCornerSignpost35Script + signpost 7, 13, SIGNPOST_READ, MapCeladonGameCornerSignpost35Script + signpost 8, 13, SIGNPOST_READ, MapCeladonGameCornerSignpost35Script + signpost 9, 13, SIGNPOST_READ, MapCeladonGameCornerSignpost35Script + signpost 10, 13, SIGNPOST_READ, MapCeladonGameCornerSignpost35Script + signpost 11, 13, SIGNPOST_LEFT, MapCeladonGameCornerSignpost35Script + signpost 6, 18, SIGNPOST_READ, MapCeladonGameCornerSignpost35Script + signpost 7, 18, SIGNPOST_READ, MapCeladonGameCornerSignpost35Script + signpost 8, 18, SIGNPOST_READ, MapCeladonGameCornerSignpost32Script + signpost 9, 18, SIGNPOST_READ, MapCeladonGameCornerSignpost35Script + signpost 10, 18, SIGNPOST_READ, MapCeladonGameCornerSignpost35Script + signpost 11, 18, SIGNPOST_RIGHT, MapCeladonGameCornerSignpost35Script + signpost 0, 15, SIGNPOST_READ, MapCeladonGameCornerSignpost36Script + signpost 0, 9, SIGNPOST_READ, MapCeladonGameCornerSignpost37Script + +.PersonEvents: db 9 - person_event SPRITE_CLERK, 6, 9, $6, $0, 255, 255, $a0, 0, ClerkScript_0x7211d, -1 - person_event SPRITE_RECEPTIONIST, 6, 7, $6, $0, 255, 255, $a0, 0, ReceptionistScript_0x72120, -1 - person_event SPRITE_POKEFAN_M, 14, 18, $8, $0, 255, 255, $80, 0, PokefanMScript_0x72123, -1 - person_event SPRITE_TEACHER, 11, 21, $9, $0, 255, 255, $90, 0, TeacherScript_0x7212e, -1 - person_event SPRITE_FISHING_GURU, 11, 15, $9, $0, 255, 255, $a0, 0, FishingGuruScript_0x72139, -1 - person_event SPRITE_FISHER, 14, 12, $8, $0, 255, 2, $80, 0, FisherScript_0x72144, -1 - person_event SPRITE_FISHER, 14, 12, $8, $0, 255, 4, $80, 0, FisherScript_0x72144, -1 - person_event SPRITE_GYM_GUY, 7, 15, $6, $0, 255, 255, $80, 0, CeladonGymGuyScript, -1 - person_event SPRITE_GRAMPS, 12, 6, $8, $0, 255, 255, $a0, 0, GrampsScript_0x72190, -1 + person_event SPRITE_CLERK, 6, 9, OW_UP | $2, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, ClerkScript_0x7211d, -1 + person_event SPRITE_RECEPTIONIST, 6, 7, OW_UP | $2, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, ReceptionistScript_0x72120, -1 + person_event SPRITE_POKEFAN_M, 14, 18, OW_LEFT | $0, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, PokefanMScript_0x72123, -1 + person_event SPRITE_TEACHER, 11, 21, OW_LEFT | $1, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, TeacherScript_0x7212e, -1 + person_event SPRITE_FISHING_GURU, 11, 15, OW_LEFT | $1, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, FishingGuruScript_0x72139, -1 + person_event SPRITE_FISHER, 14, 12, OW_LEFT | $0, $0, -1, 2, (PAL_OW_RED << 4) | $80, 0, FisherScript_0x72144, -1 + person_event SPRITE_FISHER, 14, 12, OW_LEFT | $0, $0, -1, 4, (PAL_OW_RED << 4) | $80, 0, FisherScript_0x72144, -1 + person_event SPRITE_GYM_GUY, 7, 15, OW_UP | $2, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, CeladonGymGuyScript, -1 + person_event SPRITE_GRAMPS, 12, 6, OW_LEFT | $0, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, GrampsScript_0x72190, -1 diff --git a/maps/CeladonGameCornerPrizeRoom.asm b/maps/CeladonGameCornerPrizeRoom.asm index 3a296f0dc..adf3b2b61 100644 --- a/maps/CeladonGameCornerPrizeRoom.asm +++ b/maps/CeladonGameCornerPrizeRoom.asm @@ -1,8 +1,8 @@ CeladonGameCornerPrizeRoom_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 GentlemanScript_0x726e9: @@ -146,7 +146,7 @@ UnknownScript_0x727ed: writetext UnknownText_0x729ad closetext writebyte PIKACHU - special Functionc230 + special Special_GameCornerPrizeMonCheckDex givepoke PIKACHU, 25, 0, 0 takecoins 2222 jump UnknownScript_0x727d3 @@ -164,7 +164,7 @@ UnknownScript_0x7281b: writetext UnknownText_0x729ad closetext writebyte PORYGON - special Functionc230 + special Special_GameCornerPrizeMonCheckDex givepoke PORYGON, 15, 0, 0 takecoins 5555 jump UnknownScript_0x727d3 @@ -182,7 +182,7 @@ UnknownScript_0x72849: writetext UnknownText_0x729ad closetext writebyte LARVITAR - special Functionc230 + special Special_GameCornerPrizeMonCheckDex givepoke LARVITAR, 40, 0, 0 takecoins 8888 jump UnknownScript_0x727d3 @@ -269,20 +269,20 @@ CeladonGameCornerPrizeRoom_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $5, $2, 7, GROUP_CELADON_CITY, MAP_CELADON_CITY warp_def $5, $3, 7, GROUP_CELADON_CITY, MAP_CELADON_CITY - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 2 - signpost 1, 2, $0, MapCeladonGameCornerPrizeRoomSignpost0Script - signpost 1, 4, $0, MapCeladonGameCornerPrizeRoomSignpost1Script + signpost 1, 2, SIGNPOST_READ, MapCeladonGameCornerPrizeRoomSignpost0Script + signpost 1, 4, SIGNPOST_READ, MapCeladonGameCornerPrizeRoomSignpost1Script - ; people-events +.PersonEvents: db 2 - person_event SPRITE_GENTLEMAN, 6, 4, $6, $0, 255, 255, $80, 0, GentlemanScript_0x726e9, -1 - person_event SPRITE_PHARMACIST, 8, 8, $4, $10, 255, 255, $a0, 0, PharmacistScript_0x726ec, -1 + person_event SPRITE_GENTLEMAN, 6, 4, OW_UP | $2, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, GentlemanScript_0x726e9, -1 + person_event SPRITE_PHARMACIST, 8, 8, OW_UP | $0, $10, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, PharmacistScript_0x726ec, -1 diff --git a/maps/CeladonGym.asm b/maps/CeladonGym.asm index 55b122e95..018506a81 100644 --- a/maps/CeladonGym.asm +++ b/maps/CeladonGym.asm @@ -1,8 +1,8 @@ CeladonGym_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 ErikaScript_0x72a6a: @@ -42,23 +42,7 @@ UnknownScript_0x72aae: end TrainerLassMichelle: - ; bit/flag number - dw EVENT_BEAT_LASS_MICHELLE - - ; trainer group && trainer id - db LASS, MICHELLE - - ; text when seen - dw LassMichelleSeenText - - ; text when trainer beaten - dw LassMichelleBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw LassMichelleScript + trainer EVENT_BEAT_LASS_MICHELLE, LASS, MICHELLE, LassMichelleSeenText, LassMichelleBeatenText, $0000, LassMichelleScript LassMichelleScript: talkaftercancel @@ -69,23 +53,7 @@ LassMichelleScript: end TrainerPicnickerTanya: - ; bit/flag number - dw EVENT_BEAT_PICNICKER_TANYA - - ; trainer group && trainer id - db PICNICKER, TANYA - - ; text when seen - dw PicnickerTanyaSeenText - - ; text when trainer beaten - dw PicnickerTanyaBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw PicnickerTanyaScript + trainer EVENT_BEAT_PICNICKER_TANYA, PICNICKER, TANYA, PicnickerTanyaSeenText, PicnickerTanyaBeatenText, $0000, PicnickerTanyaScript PicnickerTanyaScript: talkaftercancel @@ -96,23 +64,7 @@ PicnickerTanyaScript: end TrainerBeautyJulia: - ; bit/flag number - dw EVENT_BEAT_BEAUTY_JULIA - - ; trainer group && trainer id - db BEAUTY, JULIA - - ; text when seen - dw BeautyJuliaSeenText - - ; text when trainer beaten - dw BeautyJuliaBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw BeautyJuliaScript + trainer EVENT_BEAT_BEAUTY_JULIA, BEAUTY, JULIA, BeautyJuliaSeenText, BeautyJuliaBeatenText, $0000, BeautyJuliaScript BeautyJuliaScript: talkaftercancel @@ -123,23 +75,7 @@ BeautyJuliaScript: end TrainerTwinsJoandzoe1: - ; bit/flag number - dw EVENT_BEAT_TWINS_JO_AND_ZOE - - ; trainer group && trainer id - db TWINS, JOANDZOE1 - - ; text when seen - dw TwinsJoandzoe1SeenText - - ; text when trainer beaten - dw TwinsJoandzoe1BeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw TwinsJoandzoe1Script + trainer EVENT_BEAT_TWINS_JO_AND_ZOE, TWINS, JOANDZOE1, TwinsJoandzoe1SeenText, TwinsJoandzoe1BeatenText, $0000, TwinsJoandzoe1Script TwinsJoandzoe1Script: talkaftercancel @@ -150,23 +86,7 @@ TwinsJoandzoe1Script: end TrainerTwinsJoandzoe2: - ; bit/flag number - dw EVENT_BEAT_TWINS_JO_AND_ZOE - - ; trainer group && trainer id - db TWINS, JOANDZOE2 - - ; text when seen - dw TwinsJoandzoe2SeenText - - ; text when trainer beaten - dw TwinsJoandzoe2BeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw TwinsJoandzoe2Script + trainer EVENT_BEAT_TWINS_JO_AND_ZOE, TWINS, JOANDZOE2, TwinsJoandzoe2SeenText, TwinsJoandzoe2BeatenText, $0000, TwinsJoandzoe2Script TwinsJoandzoe2Script: talkaftercancel @@ -343,24 +263,24 @@ CeladonGym_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $11, $4, 8, GROUP_CELADON_CITY, MAP_CELADON_CITY warp_def $11, $5, 8, GROUP_CELADON_CITY, MAP_CELADON_CITY - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 2 - signpost 15, 3, $0, CeladonGymStatue - signpost 15, 6, $0, CeladonGymStatue + signpost 15, 3, SIGNPOST_READ, CeladonGymStatue + signpost 15, 6, SIGNPOST_READ, CeladonGymStatue - ; people-events +.PersonEvents: db 6 - person_event SPRITE_ERIKA, 7, 9, $6, $0, 255, 255, $a0, 0, ErikaScript_0x72a6a, -1 - person_event SPRITE_LASS, 12, 11, $8, $0, 255, 255, $92, 2, TrainerLassMichelle, -1 - person_event SPRITE_LASS, 12, 6, $9, $0, 255, 255, $a2, 2, TrainerPicnickerTanya, -1 - person_event SPRITE_BUENA, 9, 7, $9, $0, 255, 255, $92, 2, TrainerBeautyJulia, -1 - person_event SPRITE_TWIN, 14, 8, $6, $0, 255, 255, $82, 1, TrainerTwinsJoandzoe1, -1 - person_event SPRITE_TWIN, 14, 9, $6, $0, 255, 255, $82, 1, TrainerTwinsJoandzoe2, -1 + person_event SPRITE_ERIKA, 7, 9, OW_UP | $2, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, ErikaScript_0x72a6a, -1 + person_event SPRITE_LASS, 12, 11, OW_LEFT | $0, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 2, TrainerLassMichelle, -1 + person_event SPRITE_LASS, 12, 6, OW_LEFT | $1, $0, -1, -1, (PAL_OW_GREEN << 4) | $82, 2, TrainerPicnickerTanya, -1 + person_event SPRITE_BUENA, 9, 7, OW_LEFT | $1, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 2, TrainerBeautyJulia, -1 + person_event SPRITE_TWIN, 14, 8, OW_UP | $2, $0, -1, -1, (PAL_OW_RED << 4) | $82, 1, TrainerTwinsJoandzoe1, -1 + person_event SPRITE_TWIN, 14, 9, OW_UP | $2, $0, -1, -1, (PAL_OW_RED << 4) | $82, 1, TrainerTwinsJoandzoe2, -1 diff --git a/maps/CeladonMansion1F.asm b/maps/CeladonMansion1F.asm index 4760e6155..f7d0836d0 100644 --- a/maps/CeladonMansion1F.asm +++ b/maps/CeladonMansion1F.asm @@ -1,8 +1,8 @@ CeladonMansion1F_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 CeladonMansionManager: @@ -72,7 +72,7 @@ CeladonMansion1F_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 5 warp_def $9, $6, 2, GROUP_CELADON_CITY, MAP_CELADON_CITY warp_def $9, $7, 2, GROUP_CELADON_CITY, MAP_CELADON_CITY @@ -80,18 +80,18 @@ CeladonMansion1F_MapEventHeader: warp_def $0, $0, 1, GROUP_CELADON_MANSION_2F, MAP_CELADON_MANSION_2F warp_def $0, $7, 4, GROUP_CELADON_MANSION_2F, MAP_CELADON_MANSION_2F - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 3 - signpost 8, 5, $1, CeladonMansionManagersSuiteSign - signpost 3, 0, $0, CeladonMansion1fBookshelf - signpost 3, 2, $0, CeladonMansion1fBookshelf + signpost 8, 5, SIGNPOST_UP, CeladonMansionManagersSuiteSign + signpost 3, 0, SIGNPOST_READ, CeladonMansion1fBookshelf + signpost 3, 2, SIGNPOST_READ, CeladonMansion1fBookshelf - ; people-events +.PersonEvents: db 4 - person_event SPRITE_GRANNY, 9, 5, $3, $0, 255, 255, $0, 0, CeladonMansionManager, -1 - person_event SPRITE_GROWLITHE, 10, 6, $16, $0, 255, 255, $0, 0, CeladonMansion1FMeowth, -1 - person_event SPRITE_CLEFAIRY, 8, 7, $16, $0, 255, 255, $0, 0, CeladonMansion1FClefairy, -1 - person_event SPRITE_GROWLITHE, 8, 8, $16, $2, 255, 255, $90, 0, CeladonMansion1FNidoranF, -1 + person_event SPRITE_GRANNY, 9, 5, OW_DOWN | $3, $0, -1, -1, $0, 0, CeladonMansionManager, -1 + person_event SPRITE_GROWLITHE, 10, 6, OW_UP | $12, $0, -1, -1, $0, 0, CeladonMansion1FMeowth, -1 + person_event SPRITE_CLEFAIRY, 8, 7, OW_UP | $12, $0, -1, -1, $0, 0, CeladonMansion1FClefairy, -1 + person_event SPRITE_GROWLITHE, 8, 8, OW_UP | $12, $2, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, CeladonMansion1FNidoranF, -1 diff --git a/maps/CeladonMansion2F.asm b/maps/CeladonMansion2F.asm index e20c6ce89..cdbdc9ab3 100644 --- a/maps/CeladonMansion2F.asm +++ b/maps/CeladonMansion2F.asm @@ -1,8 +1,8 @@ CeladonMansion2F_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 CeladonMansion2FComputer: @@ -53,21 +53,21 @@ CeladonMansion2F_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 4 warp_def $0, $0, 4, GROUP_CELADON_MANSION_1F, MAP_CELADON_MANSION_1F warp_def $0, $1, 2, GROUP_CELADON_MANSION_3F, MAP_CELADON_MANSION_3F warp_def $0, $6, 3, GROUP_CELADON_MANSION_3F, MAP_CELADON_MANSION_3F warp_def $0, $7, 5, GROUP_CELADON_MANSION_1F, MAP_CELADON_MANSION_1F - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 3 - signpost 3, 0, $0, CeladonMansion2FComputer - signpost 8, 5, $1, CeladonMansion2FSign - signpost 3, 2, $0, CeladonMansion2FBookshelf + signpost 3, 0, SIGNPOST_READ, CeladonMansion2FComputer + signpost 8, 5, SIGNPOST_UP, CeladonMansion2FSign + signpost 3, 2, SIGNPOST_READ, CeladonMansion2FBookshelf - ; people-events +.PersonEvents: db 0 diff --git a/maps/CeladonMansion3F.asm b/maps/CeladonMansion3F.asm index 7c0cf85eb..05064d7cd 100644 --- a/maps/CeladonMansion3F.asm +++ b/maps/CeladonMansion3F.asm @@ -1,8 +1,8 @@ CeladonMansion3F_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 CooltrainerMScript_0x71670: @@ -187,26 +187,26 @@ CeladonMansion3F_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 4 warp_def $0, $0, 1, GROUP_CELADON_MANSION_ROOF, MAP_CELADON_MANSION_ROOF warp_def $0, $1, 2, GROUP_CELADON_MANSION_2F, MAP_CELADON_MANSION_2F warp_def $0, $6, 3, GROUP_CELADON_MANSION_2F, MAP_CELADON_MANSION_2F warp_def $0, $7, 2, GROUP_CELADON_MANSION_ROOF, MAP_CELADON_MANSION_ROOF - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 4 - signpost 8, 5, $1, MapCeladonMansion3FSignpost0Script - signpost 3, 4, $1, MapCeladonMansion3FSignpost1Script - signpost 6, 1, $1, MapCeladonMansion3FSignpost2Script - signpost 3, 1, $1, MapCeladonMansion3FSignpost3Script + signpost 8, 5, SIGNPOST_UP, MapCeladonMansion3FSignpost0Script + signpost 3, 4, SIGNPOST_UP, MapCeladonMansion3FSignpost1Script + signpost 6, 1, SIGNPOST_UP, MapCeladonMansion3FSignpost2Script + signpost 3, 1, SIGNPOST_UP, MapCeladonMansion3FSignpost3Script - ; people-events +.PersonEvents: db 4 - person_event SPRITE_COOLTRAINER_M, 10, 7, $3, $0, 255, 255, $80, 0, CooltrainerMScript_0x71670, -1 - person_event SPRITE_GYM_GUY, 8, 7, $7, $0, 255, 255, $90, 0, GymGuyScript_0x71696, -1 - person_event SPRITE_SUPER_NERD, 11, 4, $7, $0, 255, 255, $90, 0, SuperNerdScript_0x716bc, -1 - person_event SPRITE_FISHER, 8, 4, $7, $2, 255, 255, $80, 0, FisherScript_0x716bf, -1 + person_event SPRITE_COOLTRAINER_M, 10, 7, OW_DOWN | $3, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, CooltrainerMScript_0x71670, -1 + person_event SPRITE_GYM_GUY, 8, 7, OW_UP | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, GymGuyScript_0x71696, -1 + person_event SPRITE_SUPER_NERD, 11, 4, OW_UP | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, SuperNerdScript_0x716bc, -1 + person_event SPRITE_FISHER, 8, 4, OW_UP | $3, $2, -1, -1, (PAL_OW_RED << 4) | $80, 0, FisherScript_0x716bf, -1 diff --git a/maps/CeladonMansionRoof.asm b/maps/CeladonMansionRoof.asm index cc7d1ddcb..f3f0952c3 100644 --- a/maps/CeladonMansionRoof.asm +++ b/maps/CeladonMansionRoof.asm @@ -1,8 +1,8 @@ CeladonMansionRoof_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 FisherScript_0x71a39: @@ -34,19 +34,19 @@ CeladonMansionRoof_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 3 warp_def $1, $1, 1, GROUP_CELADON_MANSION_3F, MAP_CELADON_MANSION_3F warp_def $1, $6, 4, GROUP_CELADON_MANSION_3F, MAP_CELADON_MANSION_3F warp_def $5, $2, 1, GROUP_CELADON_MANSION_ROOF_HOUSE, MAP_CELADON_MANSION_ROOF_HOUSE - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 1 - signpost 1, 6, $4, MapCeladonMansionRoofSignpost0Script + signpost 1, 6, SIGNPOST_LEFT, MapCeladonMansionRoofSignpost0Script - ; people-events +.PersonEvents: db 1 - person_event SPRITE_FISHER, 9, 11, $4, $10, 255, 255, $90, 0, FisherScript_0x71a39, -1 + person_event SPRITE_FISHER, 9, 11, OW_UP | $0, $10, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, FisherScript_0x71a39, -1 diff --git a/maps/CeladonMansionRoofHouse.asm b/maps/CeladonMansionRoofHouse.asm index e02041794..ff08f5f46 100644 --- a/maps/CeladonMansionRoofHouse.asm +++ b/maps/CeladonMansionRoofHouse.asm @@ -1,8 +1,8 @@ CeladonMansionRoofHouse_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 PharmacistScript_0x71afd: @@ -117,17 +117,17 @@ CeladonMansionRoofHouse_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $7, $2, 3, GROUP_CELADON_MANSION_ROOF, MAP_CELADON_MANSION_ROOF warp_def $7, $3, 3, GROUP_CELADON_MANSION_ROOF, MAP_CELADON_MANSION_ROOF - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 1 - person_event SPRITE_PHARMACIST, 6, 7, $6, $20, 255, 255, $a0, 0, PharmacistScript_0x71afd, -1 + person_event SPRITE_PHARMACIST, 6, 7, OW_UP | $2, $20, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, PharmacistScript_0x71afd, -1 diff --git a/maps/CeladonPokeCenter1F.asm b/maps/CeladonPokeCenter1F.asm index ef0c091bb..ea509bc72 100644 --- a/maps/CeladonPokeCenter1F.asm +++ b/maps/CeladonPokeCenter1F.asm @@ -1,8 +1,8 @@ CeladonPokeCenter1F_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 NurseScript_0x71e22: @@ -142,22 +142,22 @@ CeladonPokeCenter1F_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 3 warp_def $7, $3, 5, GROUP_CELADON_CITY, MAP_CELADON_CITY warp_def $7, $4, 5, GROUP_CELADON_CITY, MAP_CELADON_CITY warp_def $7, $0, 1, GROUP_POKECENTER_2F, MAP_POKECENTER_2F - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 5 - person_event SPRITE_NURSE, 5, 7, $6, $0, 255, 255, $0, 0, NurseScript_0x71e22, -1 - person_event SPRITE_GENTLEMAN, 9, 5, $5, $1, 255, 255, $0, 0, GentlemanScript_0x71e25, -1 - person_event SPRITE_PHARMACIST, 7, 4, $6, $0, 255, 255, $80, 0, PharmacistScript_0x71e2b, -1 - person_event SPRITE_COOLTRAINER_F, 10, 12, $5, $1, 255, 255, $a0, 0, CooltrainerFScript_0x71e28, -1 - person_event SPRITE_SUPER_NERD, 7, 8, $6, $0, 255, 255, $90, 0, SuperNerdScript_0x71e2e, EVENT_SET_WHEN_FOUGHT_HO_OH + person_event SPRITE_NURSE, 5, 7, OW_UP | $2, $0, -1, -1, $0, 0, NurseScript_0x71e22, -1 + person_event SPRITE_GENTLEMAN, 9, 5, OW_UP | $1, $1, -1, -1, $0, 0, GentlemanScript_0x71e25, -1 + person_event SPRITE_PHARMACIST, 7, 4, OW_UP | $2, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, PharmacistScript_0x71e2b, -1 + person_event SPRITE_COOLTRAINER_F, 10, 12, OW_UP | $1, $1, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, CooltrainerFScript_0x71e28, -1 + person_event SPRITE_SUPER_NERD, 7, 8, OW_UP | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, SuperNerdScript_0x71e2e, EVENT_SET_WHEN_FOUGHT_HO_OH diff --git a/maps/CeladonPokeCenter2FBeta.asm b/maps/CeladonPokeCenter2FBeta.asm index 77c3b8b31..94ccc840c 100644 --- a/maps/CeladonPokeCenter2FBeta.asm +++ b/maps/CeladonPokeCenter2FBeta.asm @@ -1,23 +1,23 @@ CeladonPokeCenter2FBeta_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 CeladonPokeCenter2FBeta_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 1 warp_def $7, $0, 3, GROUP_CELADON_POKECENTER_1F, MAP_CELADON_POKECENTER_1F - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 0 diff --git a/maps/CeruleanCity.asm b/maps/CeruleanCity.asm index 8c00721ec..7d78ab042 100644 --- a/maps/CeruleanCity.asm +++ b/maps/CeruleanCity.asm @@ -1,8 +1,8 @@ CeruleanCity_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 1 ; callbacks @@ -108,7 +108,7 @@ UnknownScript_0x184072: waitbutton playsound SFX_TRANSACTION waitbutton - showemote $0, $7, 15 + showemote EMOTE_SHOCK, $7, 15 spriteface $7, LEFT loadfont writetext UnknownText_0x1842ee @@ -141,8 +141,7 @@ CeruleanCityMartSign: jumpstd martsign MapCeruleanCitySignpostItem8: - dw EVENT_FOUND_BERSERK_GENE_IN_CERULEAN_CITY - db BERSERK_GENE + dwb EVENT_FOUND_BERSERK_GENE_IN_CERULEAN_CITY, BERSERK_GENE UnknownText_0x1840bc: text "KANTO's POWER" @@ -274,7 +273,7 @@ CeruleanCity_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 6 warp_def $f, $7, 1, GROUP_CERULEAN_GYM_BADGE_SPEECH_HOUSE, MAP_CERULEAN_GYM_BADGE_SPEECH_HOUSE warp_def $11, $1c, 1, GROUP_CERULEAN_POLICE_STATION, MAP_CERULEAN_POLICE_STATION @@ -283,26 +282,26 @@ CeruleanCity_MapEventHeader: warp_def $17, $1e, 1, GROUP_CERULEAN_GYM, MAP_CERULEAN_GYM warp_def $1d, $19, 2, GROUP_CERULEAN_MART, MAP_CERULEAN_MART - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 9 - signpost 23, 23, $0, CeruleanCitySign - signpost 25, 27, $0, CeruleanGymSign - signpost 29, 11, $0, CeruleanBikeShopSign - signpost 17, 25, $0, CeruleanPoliceSign - signpost 7, 23, $0, CeruleanCapeSign - signpost 29, 14, $0, CeruleanLockedDoor - signpost 21, 20, $0, CeruleanCityPokeCenterSign - signpost 29, 26, $0, CeruleanCityMartSign - signpost 12, 2, $7, MapCeruleanCitySignpostItem8 - - ; people-events + signpost 23, 23, SIGNPOST_READ, CeruleanCitySign + signpost 25, 27, SIGNPOST_READ, CeruleanGymSign + signpost 29, 11, SIGNPOST_READ, CeruleanBikeShopSign + signpost 17, 25, SIGNPOST_READ, CeruleanPoliceSign + signpost 7, 23, SIGNPOST_READ, CeruleanCapeSign + signpost 29, 14, SIGNPOST_READ, CeruleanLockedDoor + signpost 21, 20, SIGNPOST_READ, CeruleanCityPokeCenterSign + signpost 29, 26, SIGNPOST_READ, CeruleanCityMartSign + signpost 12, 2, SIGNPOST_ITEM, MapCeruleanCitySignpostItem8 + +.PersonEvents: db 6 - person_event SPRITE_COOLTRAINER_M, 27, 19, $2, $22, 255, 255, $90, 0, CooltrainerMScript_0x184009, -1 - person_event SPRITE_SUPER_NERD, 19, 27, $2, $11, 255, 255, $90, 0, SuperNerdScript_0x18401d, -1 - person_event SPRITE_SLOWPOKE, 28, 24, $1, $0, 255, 255, $0, 0, CeruleanCitySlowbro, -1 - person_event SPRITE_COOLTRAINER_F, 28, 25, $8, $0, 255, 255, $a0, 0, CooltrainerFScript_0x18402a, -1 - person_event SPRITE_FISHER, 30, 34, $5, $1, 255, 255, $80, 0, FisherScript_0x18404a, -1 - person_event SPRITE_YOUNGSTER, 16, 10, $3, $1, 255, 255, $80, 0, YoungsterScript_0x184064, -1 + person_event SPRITE_COOLTRAINER_M, 27, 19, OW_DOWN | $2, $22, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, CooltrainerMScript_0x184009, -1 + person_event SPRITE_SUPER_NERD, 19, 27, OW_DOWN | $2, $11, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, SuperNerdScript_0x18401d, -1 + person_event SPRITE_SLOWPOKE, 28, 24, OW_DOWN | $1, $0, -1, -1, $0, 0, CeruleanCitySlowbro, -1 + person_event SPRITE_COOLTRAINER_F, 28, 25, OW_LEFT | $0, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, CooltrainerFScript_0x18402a, -1 + person_event SPRITE_FISHER, 30, 34, OW_UP | $1, $1, -1, -1, (PAL_OW_RED << 4) | $80, 0, FisherScript_0x18404a, -1 + person_event SPRITE_YOUNGSTER, 16, 10, OW_DOWN | $3, $1, -1, -1, (PAL_OW_RED << 4) | $80, 0, YoungsterScript_0x184064, -1 diff --git a/maps/CeruleanGym.asm b/maps/CeruleanGym.asm index aaada87fb..e92abbb99 100644 --- a/maps/CeruleanGym.asm +++ b/maps/CeruleanGym.asm @@ -1,12 +1,12 @@ CeruleanGym_MapScriptHeader: - ; trigger count +.MapTriggers: db 2 ; triggers dw UnknownScript_0x1883d9, $0000 dw UnknownScript_0x1883da, $0000 - ; callback count +.MapCallbacks: db 0 UnknownScript_0x1883d9: @@ -25,7 +25,7 @@ UnknownScript_0x1883de: writetext UnknownText_0x1884fb closetext loadmovesprites - showemote $0, $2, 15 + showemote EMOTE_SHOCK, $2, 15 applymovement $2, MovementData_0x1884f7 loadfont writetext UnknownText_0x188574 @@ -40,8 +40,8 @@ UnknownScript_0x1883de: playsound SFX_EXIT_BUILDING disappear $2 setevent EVENT_MET_ROCKET_GRUNT_AT_CERULEAN_GYM - clearevent EVENT_76C - clearevent EVENT_76E + clearevent EVENT_ROUTE_24_ROCKET + clearevent EVENT_ROUTE_25_MISTY_BOYFRIEND dotrigger $0 domaptrigger GROUP_ROUTE_25, MAP_ROUTE_25, $1 domaptrigger GROUP_POWER_PLANT, MAP_POWER_PLANT, $0 @@ -80,23 +80,7 @@ MistyScript_0x188432: end TrainerSwimmerfDiana: - ; bit/flag number - dw EVENT_BEAT_SWIMMERF_DIANA - - ; trainer group && trainer id - db SWIMMERF, DIANA - - ; text when seen - dw SwimmerfDianaSeenText - - ; text when trainer beaten - dw SwimmerfDianaBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw SwimmerfDianaScript + trainer EVENT_BEAT_SWIMMERF_DIANA, SWIMMERF, DIANA, SwimmerfDianaSeenText, SwimmerfDianaBeatenText, $0000, SwimmerfDianaScript SwimmerfDianaScript: talkaftercancel @@ -107,23 +91,7 @@ SwimmerfDianaScript: end TrainerSwimmerfBriana: - ; bit/flag number - dw EVENT_BEAT_SWIMMERF_BRIANA - - ; trainer group && trainer id - db SWIMMERF, BRIANA - - ; text when seen - dw SwimmerfBrianaSeenText - - ; text when trainer beaten - dw SwimmerfBrianaBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw SwimmerfBrianaScript + trainer EVENT_BEAT_SWIMMERF_BRIANA, SWIMMERF, BRIANA, SwimmerfBrianaSeenText, SwimmerfBrianaBeatenText, $0000, SwimmerfBrianaScript SwimmerfBrianaScript: talkaftercancel @@ -134,23 +102,7 @@ SwimmerfBrianaScript: end TrainerSwimmermParker: - ; bit/flag number - dw EVENT_BEAT_SWIMMERM_PARKER - - ; trainer group && trainer id - db SWIMMERM, PARKER - - ; text when seen - dw SwimmermParkerSeenText - - ; text when trainer beaten - dw SwimmermParkerBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw SwimmermParkerScript + trainer EVENT_BEAT_SWIMMERM_PARKER, SWIMMERM, PARKER, SwimmermParkerSeenText, SwimmermParkerBeatenText, $0000, SwimmermParkerScript SwimmermParkerScript: talkaftercancel @@ -177,8 +129,7 @@ CeruleanGymGuyScript: end MapCeruleanGymSignpostItem0: - dw $00fb - db MACHINE_PART + dwb EVENT_FOUND_MACHINE_PART_IN_CERULEAN_GYM, MACHINE_PART CeruleanGymStatue1: @@ -410,25 +361,25 @@ CeruleanGym_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $f, $4, 5, GROUP_CERULEAN_CITY, MAP_CERULEAN_CITY warp_def $f, $5, 5, GROUP_CERULEAN_CITY, MAP_CERULEAN_CITY - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 3 - signpost 8, 3, $7, MapCeruleanGymSignpostItem0 - signpost 13, 2, $0, CeruleanGymStatue1 - signpost 13, 6, $0, CeruleanGymStatue2 + signpost 8, 3, SIGNPOST_ITEM, MapCeruleanGymSignpostItem0 + signpost 13, 2, SIGNPOST_READ, CeruleanGymStatue1 + signpost 13, 6, SIGNPOST_READ, CeruleanGymStatue2 - ; people-events +.PersonEvents: db 6 - person_event SPRITE_ROCKET, 14, 8, $6, $0, 255, 255, $0, 0, ObjectEvent, EVENT_76D - person_event SPRITE_MISTY, 7, 9, $6, $0, 255, 255, $80, 0, MistyScript_0x188432, EVENT_TRAINERS_IN_CERULEAN_GYM - person_event SPRITE_SWIMMER_GIRL, 10, 8, $9, $0, 255, 255, $a2, 3, TrainerSwimmerfDiana, EVENT_TRAINERS_IN_CERULEAN_GYM - person_event SPRITE_SWIMMER_GIRL, 13, 5, $9, $0, 255, 255, $a2, 1, TrainerSwimmerfBriana, EVENT_TRAINERS_IN_CERULEAN_GYM - person_event SPRITE_SWIMMER_GUY, 13, 12, $8, $0, 255, 255, $82, 3, TrainerSwimmermParker, EVENT_TRAINERS_IN_CERULEAN_GYM - person_event SPRITE_GYM_GUY, 17, 11, $6, $0, 255, 255, $90, 0, CeruleanGymGuyScript, EVENT_TRAINERS_IN_CERULEAN_GYM + person_event SPRITE_ROCKET, 14, 8, OW_UP | $2, $0, -1, -1, $0, 0, ObjectEvent, EVENT_CERULEAN_GYM_ROCKET + person_event SPRITE_MISTY, 7, 9, OW_UP | $2, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, MistyScript_0x188432, EVENT_TRAINERS_IN_CERULEAN_GYM + person_event SPRITE_SWIMMER_GIRL, 10, 8, OW_LEFT | $1, $0, -1, -1, (PAL_OW_GREEN << 4) | $82, 3, TrainerSwimmerfDiana, EVENT_TRAINERS_IN_CERULEAN_GYM + person_event SPRITE_SWIMMER_GIRL, 13, 5, OW_LEFT | $1, $0, -1, -1, (PAL_OW_GREEN << 4) | $82, 1, TrainerSwimmerfBriana, EVENT_TRAINERS_IN_CERULEAN_GYM + person_event SPRITE_SWIMMER_GUY, 13, 12, OW_LEFT | $0, $0, -1, -1, (PAL_OW_RED << 4) | $82, 3, TrainerSwimmermParker, EVENT_TRAINERS_IN_CERULEAN_GYM + person_event SPRITE_GYM_GUY, 17, 11, OW_UP | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, CeruleanGymGuyScript, EVENT_TRAINERS_IN_CERULEAN_GYM diff --git a/maps/CeruleanGymBadgeSpeechHouse.asm b/maps/CeruleanGymBadgeSpeechHouse.asm index 96aefdb4d..bef69683b 100644 --- a/maps/CeruleanGymBadgeSpeechHouse.asm +++ b/maps/CeruleanGymBadgeSpeechHouse.asm @@ -1,8 +1,8 @@ CeruleanGymBadgeSpeechHouse_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 PokefanMScript_0x188002: @@ -17,17 +17,17 @@ CeruleanGymBadgeSpeechHouse_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $7, $2, 1, GROUP_CERULEAN_CITY, MAP_CERULEAN_CITY warp_def $7, $3, 1, GROUP_CERULEAN_CITY, MAP_CERULEAN_CITY - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 1 - person_event SPRITE_POKEFAN_M, 7, 6, $9, $0, 255, 255, $0, 0, PokefanMScript_0x188002, -1 + person_event SPRITE_POKEFAN_M, 7, 6, OW_LEFT | $1, $0, -1, -1, $0, 0, PokefanMScript_0x188002, -1 diff --git a/maps/CeruleanMart.asm b/maps/CeruleanMart.asm index 16771b679..d634b999c 100644 --- a/maps/CeruleanMart.asm +++ b/maps/CeruleanMart.asm @@ -1,8 +1,8 @@ CeruleanMart_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 ClerkScript_0x188ac0: @@ -44,19 +44,19 @@ CeruleanMart_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $7, $2, 6, GROUP_CERULEAN_CITY, MAP_CERULEAN_CITY warp_def $7, $3, 6, GROUP_CERULEAN_CITY, MAP_CERULEAN_CITY - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 3 - person_event SPRITE_CLERK, 7, 5, $9, $0, 255, 255, $0, 0, ClerkScript_0x188ac0, -1 - person_event SPRITE_COOLTRAINER_M, 10, 5, $6, $0, 255, 255, $a0, 0, CooltrainerMScript_0x188ac7, -1 - person_event SPRITE_COOLTRAINER_F, 6, 11, $5, $2, 255, 255, $80, 0, CooltrainerFScript_0x188aca, -1 + person_event SPRITE_CLERK, 7, 5, OW_LEFT | $1, $0, -1, -1, $0, 0, ClerkScript_0x188ac0, -1 + person_event SPRITE_COOLTRAINER_M, 10, 5, OW_UP | $2, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, CooltrainerMScript_0x188ac7, -1 + person_event SPRITE_COOLTRAINER_F, 6, 11, OW_UP | $1, $2, -1, -1, (PAL_OW_RED << 4) | $80, 0, CooltrainerFScript_0x188aca, -1 diff --git a/maps/CeruleanPokeCenter1F.asm b/maps/CeruleanPokeCenter1F.asm index 3121f62b5..77b9adeae 100644 --- a/maps/CeruleanPokeCenter1F.asm +++ b/maps/CeruleanPokeCenter1F.asm @@ -1,8 +1,8 @@ CeruleanPokeCenter1F_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 NurseScript_0x18820f: @@ -61,20 +61,20 @@ CeruleanPokeCenter1F_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 3 warp_def $7, $3, 4, GROUP_CERULEAN_CITY, MAP_CERULEAN_CITY warp_def $7, $4, 4, GROUP_CERULEAN_CITY, MAP_CERULEAN_CITY warp_def $7, $0, 1, GROUP_POKECENTER_2F, MAP_POKECENTER_2F - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 3 - person_event SPRITE_NURSE, 5, 7, $6, $0, 255, 255, $0, 0, NurseScript_0x18820f, -1 - person_event SPRITE_SUPER_NERD, 8, 12, $5, $1, 255, 255, $0, 0, SuperNerdScript_0x188212, -1 - person_event SPRITE_GYM_GUY, 9, 5, $2, $11, 255, 255, $a0, 0, GymGuyScript_0x18821e, -1 + person_event SPRITE_NURSE, 5, 7, OW_UP | $2, $0, -1, -1, $0, 0, NurseScript_0x18820f, -1 + person_event SPRITE_SUPER_NERD, 8, 12, OW_UP | $1, $1, -1, -1, $0, 0, SuperNerdScript_0x188212, -1 + person_event SPRITE_GYM_GUY, 9, 5, OW_DOWN | $2, $11, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, GymGuyScript_0x18821e, -1 diff --git a/maps/CeruleanPokeCenter2FBeta.asm b/maps/CeruleanPokeCenter2FBeta.asm index a738e74e2..6678e73c6 100644 --- a/maps/CeruleanPokeCenter2FBeta.asm +++ b/maps/CeruleanPokeCenter2FBeta.asm @@ -1,23 +1,23 @@ CeruleanPokeCenter2FBeta_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 CeruleanPokeCenter2FBeta_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 1 warp_def $7, $0, 1, GROUP_CERULEAN_POKECENTER_1F, MAP_CERULEAN_POKECENTER_1F - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 0 diff --git a/maps/CeruleanPoliceStation.asm b/maps/CeruleanPoliceStation.asm index e0b393949..d0bdc7999 100644 --- a/maps/CeruleanPoliceStation.asm +++ b/maps/CeruleanPoliceStation.asm @@ -1,8 +1,8 @@ CeruleanPoliceStation_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 FishingGuruScript_0x18804a: @@ -42,19 +42,19 @@ CeruleanPoliceStation_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $7, $2, 2, GROUP_CERULEAN_CITY, MAP_CERULEAN_CITY warp_def $7, $3, 2, GROUP_CERULEAN_CITY, MAP_CERULEAN_CITY - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 3 - person_event SPRITE_FISHING_GURU, 5, 9, $7, $0, 255, 255, $a0, 0, FishingGuruScript_0x18804a, -1 - person_event SPRITE_POKEFAN_F, 8, 9, $8, $0, 255, 255, $90, 0, PokefanFScript_0x18804d, -1 - person_event SPRITE_DIGLETT, 9, 7, $16, $0, 255, 255, $b0, 0, DiglettScript_0x188050, -1 + person_event SPRITE_FISHING_GURU, 5, 9, OW_UP | $3, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, FishingGuruScript_0x18804a, -1 + person_event SPRITE_POKEFAN_F, 8, 9, OW_LEFT | $0, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, PokefanFScript_0x18804d, -1 + person_event SPRITE_DIGLETT, 9, 7, OW_UP | $12, $0, -1, -1, (PAL_OW_BROWN << 4) | $80, 0, DiglettScript_0x188050, -1 diff --git a/maps/CeruleanTradeSpeechHouse.asm b/maps/CeruleanTradeSpeechHouse.asm index 21f019e7e..b0451d91c 100644 --- a/maps/CeruleanTradeSpeechHouse.asm +++ b/maps/CeruleanTradeSpeechHouse.asm @@ -1,8 +1,8 @@ CeruleanTradeSpeechHouse_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 GrannyScript_0x188133: @@ -51,20 +51,20 @@ CeruleanTradeSpeechHouse_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $7, $2, 3, GROUP_CERULEAN_CITY, MAP_CERULEAN_CITY warp_def $7, $3, 3, GROUP_CERULEAN_CITY, MAP_CERULEAN_CITY - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 4 - person_event SPRITE_GRANNY, 8, 6, $9, $0, 255, 255, $90, 0, GrannyScript_0x188133, -1 - person_event SPRITE_GRAMPS, 6, 5, $2, $0, 255, 255, $a0, 0, GrampsScript_0x188136, -1 - person_event SPRITE_RHYDON, 6, 9, $16, $0, 255, 255, $b0, 0, RhydonScript_0x188139, -1 - person_event SPRITE_ZUBAT, 10, 9, $16, $0, 255, 255, $0, 0, ZubatScript_0x188143, -1 + person_event SPRITE_GRANNY, 8, 6, OW_LEFT | $1, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, GrannyScript_0x188133, -1 + person_event SPRITE_GRAMPS, 6, 5, OW_DOWN | $2, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, GrampsScript_0x188136, -1 + person_event SPRITE_RHYDON, 6, 9, OW_UP | $12, $0, -1, -1, (PAL_OW_BROWN << 4) | $80, 0, RhydonScript_0x188139, -1 + person_event SPRITE_ZUBAT, 10, 9, OW_UP | $12, $0, -1, -1, $0, 0, ZubatScript_0x188143, -1 diff --git a/maps/CharcoalKiln.asm b/maps/CharcoalKiln.asm index cd167320f..5b9698ca7 100644 --- a/maps/CharcoalKiln.asm +++ b/maps/CharcoalKiln.asm @@ -1,8 +1,8 @@ CharcoalKiln_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 CharcoalKilnBoss: @@ -147,22 +147,22 @@ CharcoalKiln_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $7, $2, 2, GROUP_AZALEA_TOWN, MAP_AZALEA_TOWN warp_def $7, $3, 2, GROUP_AZALEA_TOWN, MAP_AZALEA_TOWN - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 3 - signpost 1, 0, $0, CharcoalKilnBookshelf - signpost 1, 1, $0, CharcoalKilnBookshelf - signpost 1, 7, $0, CharcoalKilnRadio + signpost 1, 0, SIGNPOST_READ, CharcoalKilnBookshelf + signpost 1, 1, SIGNPOST_READ, CharcoalKilnBookshelf + signpost 1, 7, SIGNPOST_READ, CharcoalKilnRadio - ; people-events +.PersonEvents: db 3 - person_event SPRITE_BLACK_BELT, 7, 6, $3, $0, 255, 255, $0, 0, CharcoalKilnBoss, EVENT_6F7 - person_event SPRITE_YOUNGSTER, 7, 9, $2, $11, 255, 255, $0, 0, CharcoalKilnApprentice, EVENT_6F6 - person_event SPRITE_MOLTRES, 10, 9, $16, $22, 255, 255, $b0, 0, CharcoalKilnFarfetchd, EVENT_6F5 + person_event SPRITE_BLACK_BELT, 7, 6, OW_DOWN | $3, $0, -1, -1, $0, 0, CharcoalKilnBoss, EVENT_CHARCOAL_KILN_BOSS + person_event SPRITE_YOUNGSTER, 7, 9, OW_DOWN | $2, $11, -1, -1, $0, 0, CharcoalKilnApprentice, EVENT_CHARCOAL_KILN_APPRENTICE + person_event SPRITE_MOLTRES, 10, 9, OW_UP | $12, $22, -1, -1, (PAL_OW_BROWN << 4) | $80, 0, CharcoalKilnFarfetchd, EVENT_CHARCOAL_KILN_FARFETCH_D diff --git a/maps/CherrygroveCity.asm b/maps/CherrygroveCity.asm index d10dbabea..bd8168dbc 100644 --- a/maps/CherrygroveCity.asm +++ b/maps/CherrygroveCity.asm @@ -1,12 +1,12 @@ CherrygroveCity_MapScriptHeader: - ; trigger count +.MapTriggers: db 2 ; triggers dw .Trigger1, $0000 dw .Trigger2, $0000 - ; callback count +.MapCallbacks: db 1 ; callbacks @@ -102,7 +102,7 @@ UnknownScript_0x19c0aa: UnknownScript_0x19c0ae: spriteface $0, RIGHT - showemote $0, $0, 15 + showemote EMOTE_SHOCK, $0, 15 special Functionc48f pause 15 appear $3 @@ -548,7 +548,7 @@ CherrygroveCity_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 5 warp_def $3, $17, 2, GROUP_CHERRYGROVE_MART, MAP_CHERRYGROVE_MART warp_def $3, $1d, 1, GROUP_CHERRYGROVE_POKECENTER_1F, MAP_CHERRYGROVE_POKECENTER_1F @@ -556,22 +556,22 @@ CherrygroveCity_MapEventHeader: warp_def $9, $19, 1, GROUP_GUIDE_GENTS_HOUSE, MAP_GUIDE_GENTS_HOUSE warp_def $b, $1f, 1, GROUP_CHERRYGROVE_EVOLUTION_SPEECH_HOUSE, MAP_CHERRYGROVE_EVOLUTION_SPEECH_HOUSE - ; xy triggers +.XYTriggers: db 2 xy_trigger 1, $6, $21, $0, UnknownScript_0x19c0ae, $0, $0 xy_trigger 1, $7, $21, $0, UnknownScript_0x19c0aa, $0, $0 - ; signposts +.Signposts: db 4 - signpost 8, 30, $0, CherrygroveCitySign - signpost 9, 23, $0, GuideGentsHouseSign - signpost 3, 24, $0, CherrygroveCityMartSign - signpost 3, 30, $0, CherrygroveCityPokeCenterSign + signpost 8, 30, SIGNPOST_READ, CherrygroveCitySign + signpost 9, 23, SIGNPOST_READ, GuideGentsHouseSign + signpost 3, 24, SIGNPOST_READ, CherrygroveCityMartSign + signpost 3, 30, SIGNPOST_READ, CherrygroveCityPokeCenterSign - ; people-events +.PersonEvents: db 5 - person_event SPRITE_GRAMPS, 10, 36, $6, $0, 255, 255, $0, 0, CherrygroveCityGuideGent, EVENT_6FE - person_event SPRITE_SILVER, 10, 43, $3, $0, 255, 255, $0, 0, ObjectEvent, EVENT_6BE - person_event SPRITE_TEACHER, 16, 31, $5, $1, 255, 255, $90, 0, TeacherScript_0x19c146, -1 - person_event SPRITE_YOUNGSTER, 11, 27, $5, $1, 255, 255, $80, 0, YoungsterScript_0x19c15a, -1 - person_event SPRITE_FISHER, 16, 11, $9, $0, 255, 255, $a0, 0, MysticWaterGuy, -1 + person_event SPRITE_GRAMPS, 10, 36, OW_UP | $2, $0, -1, -1, $0, 0, CherrygroveCityGuideGent, EVENT_GUIDE_GENT_IN_HIS_HOUSE + person_event SPRITE_SILVER, 10, 43, OW_DOWN | $3, $0, -1, -1, $0, 0, ObjectEvent, EVENT_RIVAL_CHERRYGROVE_CITY + person_event SPRITE_TEACHER, 16, 31, OW_UP | $1, $1, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, TeacherScript_0x19c146, -1 + person_event SPRITE_YOUNGSTER, 11, 27, OW_UP | $1, $1, -1, -1, (PAL_OW_RED << 4) | $80, 0, YoungsterScript_0x19c15a, -1 + person_event SPRITE_FISHER, 16, 11, OW_LEFT | $1, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, MysticWaterGuy, -1 diff --git a/maps/CherrygroveEvolutionSpeechHouse.asm b/maps/CherrygroveEvolutionSpeechHouse.asm index c437819e2..7d7e17f0e 100644 --- a/maps/CherrygroveEvolutionSpeechHouse.asm +++ b/maps/CherrygroveEvolutionSpeechHouse.asm @@ -1,8 +1,8 @@ CherrygroveEvolutionSpeechHouse_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 YoungsterScript_0x196cb2: @@ -41,20 +41,20 @@ CherrygroveEvolutionSpeechHouse_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $7, $2, 5, GROUP_CHERRYGROVE_CITY, MAP_CHERRYGROVE_CITY warp_def $7, $3, 5, GROUP_CHERRYGROVE_CITY, MAP_CHERRYGROVE_CITY - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 2 - signpost 1, 0, $0, CherrygroveEvolutionSpeechHouseBookshelf - signpost 1, 1, $0, CherrygroveEvolutionSpeechHouseBookshelf + signpost 1, 0, SIGNPOST_READ, CherrygroveEvolutionSpeechHouseBookshelf + signpost 1, 1, SIGNPOST_READ, CherrygroveEvolutionSpeechHouseBookshelf - ; people-events +.PersonEvents: db 2 - person_event SPRITE_LASS, 9, 7, $8, $0, 255, 255, $a0, 0, LassScript_0x196cb9, -1 - person_event SPRITE_YOUNGSTER, 9, 6, $9, $0, 255, 255, $80, 0, YoungsterScript_0x196cb2, -1 + person_event SPRITE_LASS, 9, 7, OW_LEFT | $0, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, LassScript_0x196cb9, -1 + person_event SPRITE_YOUNGSTER, 9, 6, OW_LEFT | $1, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, YoungsterScript_0x196cb2, -1 diff --git a/maps/CherrygroveGymSpeechHouse.asm b/maps/CherrygroveGymSpeechHouse.asm index d542a42bc..f95fe3396 100644 --- a/maps/CherrygroveGymSpeechHouse.asm +++ b/maps/CherrygroveGymSpeechHouse.asm @@ -1,8 +1,8 @@ CherrygroveGymSpeechHouse_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 PokefanMScript_0x196ae1: @@ -44,20 +44,20 @@ CherrygroveGymSpeechHouse_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $7, $2, 3, GROUP_CHERRYGROVE_CITY, MAP_CHERRYGROVE_CITY warp_def $7, $3, 3, GROUP_CHERRYGROVE_CITY, MAP_CHERRYGROVE_CITY - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 2 - signpost 1, 0, $0, CherrygroveGymSpeechHouseBookshelf - signpost 1, 1, $0, CherrygroveGymSpeechHouseBookshelf + signpost 1, 0, SIGNPOST_READ, CherrygroveGymSpeechHouseBookshelf + signpost 1, 1, SIGNPOST_READ, CherrygroveGymSpeechHouseBookshelf - ; people-events +.PersonEvents: db 2 - person_event SPRITE_POKEFAN_M, 7, 6, $6, $0, 255, 255, $0, 0, PokefanMScript_0x196ae1, -1 - person_event SPRITE_BUG_CATCHER, 9, 9, $5, $1, 255, 255, $80, 0, BugCatcherScript_0x196ae4, -1 + person_event SPRITE_POKEFAN_M, 7, 6, OW_UP | $2, $0, -1, -1, $0, 0, PokefanMScript_0x196ae1, -1 + person_event SPRITE_BUG_CATCHER, 9, 9, OW_UP | $1, $1, -1, -1, (PAL_OW_RED << 4) | $80, 0, BugCatcherScript_0x196ae4, -1 diff --git a/maps/CherrygroveMart.asm b/maps/CherrygroveMart.asm index 79d62d6a2..56f613467 100644 --- a/maps/CherrygroveMart.asm +++ b/maps/CherrygroveMart.asm @@ -1,8 +1,8 @@ CherrygroveMart_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 ClerkScript_0x19680a: @@ -70,19 +70,19 @@ CherrygroveMart_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $7, $2, 1, GROUP_CHERRYGROVE_CITY, MAP_CHERRYGROVE_CITY warp_def $7, $3, 1, GROUP_CHERRYGROVE_CITY, MAP_CHERRYGROVE_CITY - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 3 - person_event SPRITE_CLERK, 7, 5, $9, $0, 255, 255, $0, 0, ClerkScript_0x19680a, -1 - person_event SPRITE_COOLTRAINER_M, 10, 11, $5, $2, 255, 255, $0, 0, CooltrainerMScript_0x19681d, -1 - person_event SPRITE_YOUNGSTER, 9, 6, $6, $0, 255, 255, $80, 0, YoungsterScript_0x196831, -1 + person_event SPRITE_CLERK, 7, 5, OW_LEFT | $1, $0, -1, -1, $0, 0, ClerkScript_0x19680a, -1 + person_event SPRITE_COOLTRAINER_M, 10, 11, OW_UP | $1, $2, -1, -1, $0, 0, CooltrainerMScript_0x19681d, -1 + person_event SPRITE_YOUNGSTER, 9, 6, OW_UP | $2, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, YoungsterScript_0x196831, -1 diff --git a/maps/CherrygrovePokeCenter1F.asm b/maps/CherrygrovePokeCenter1F.asm index e9152d616..4827f1440 100644 --- a/maps/CherrygrovePokeCenter1F.asm +++ b/maps/CherrygrovePokeCenter1F.asm @@ -1,8 +1,8 @@ CherrygrovePokeCenter1F_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 NurseScript_0x19696d: @@ -66,21 +66,21 @@ CherrygrovePokeCenter1F_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 3 warp_def $7, $3, 2, GROUP_CHERRYGROVE_CITY, MAP_CHERRYGROVE_CITY warp_def $7, $4, 2, GROUP_CHERRYGROVE_CITY, MAP_CHERRYGROVE_CITY warp_def $7, $0, 1, GROUP_POKECENTER_2F, MAP_POKECENTER_2F - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 4 - person_event SPRITE_NURSE, 5, 7, $6, $0, 255, 255, $0, 0, NurseScript_0x19696d, -1 - person_event SPRITE_FISHER, 7, 6, $7, $0, 255, 255, $80, 0, FisherScript_0x196970, -1 - person_event SPRITE_GENTLEMAN, 10, 12, $7, $0, 255, 255, $0, 0, GentlemanScript_0x196973, -1 - person_event SPRITE_TEACHER, 10, 5, $9, $0, 255, 255, $a0, 0, TeacherScript_0x196976, -1 + person_event SPRITE_NURSE, 5, 7, OW_UP | $2, $0, -1, -1, $0, 0, NurseScript_0x19696d, -1 + person_event SPRITE_FISHER, 7, 6, OW_UP | $3, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, FisherScript_0x196970, -1 + person_event SPRITE_GENTLEMAN, 10, 12, OW_UP | $3, $0, -1, -1, $0, 0, GentlemanScript_0x196973, -1 + person_event SPRITE_TEACHER, 10, 5, OW_LEFT | $1, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, TeacherScript_0x196976, -1 diff --git a/maps/CianwoodCity.asm b/maps/CianwoodCity.asm index 4a75fdb8a..c54521f0c 100644 --- a/maps/CianwoodCity.asm +++ b/maps/CianwoodCity.asm @@ -1,12 +1,12 @@ CianwoodCity_MapScriptHeader: - ; trigger count +.MapTriggers: db 2 ; triggers dw .Trigger1, $0000 dw .Trigger2, $0000 - ; callback count +.MapCallbacks: db 1 ; callbacks @@ -29,7 +29,7 @@ UnknownScript_0x1a001d: UnknownScript_0x1a001e: spriteface $0, UP - showemote $0, $0, 15 + showemote EMOTE_SHOCK, $0, 15 pause 15 playsound SFX_WARP_FROM applymovement $d, MovementData_0x1a00da @@ -135,12 +135,10 @@ CianwoodCityRock: jumpstd smashrock MapCianwoodCitySignpostItem6: - dw $00b2 - db REVIVE + dwb EVENT_CIANWOOD_CITY_HIDDEN_REVIVE, REVIVE MapCianwoodCitySignpostItem7: - dw $00b3 - db MAX_ETHER + dwb EVENT_CIANWOOD_CITY_HIDDEN_MAX_ETHER, MAX_ETHER MovementData_0x1a00da: db $39 ; movement @@ -376,7 +374,7 @@ CianwoodCity_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 7 warp_def $29, $11, 1, GROUP_MANIAS_HOUSE, MAP_MANIAS_HOUSE warp_def $2b, $8, 1, GROUP_CIANWOOD_GYM, MAP_CIANWOOD_GYM @@ -386,32 +384,32 @@ CianwoodCity_MapEventHeader: warp_def $25, $f, 1, GROUP_CIANWOOD_LUGIA_SPEECH_HOUSE, MAP_CIANWOOD_LUGIA_SPEECH_HOUSE warp_def $11, $5, 1, GROUP_POKE_SEERS_HOUSE, MAP_POKE_SEERS_HOUSE - ; xy triggers +.XYTriggers: db 1 xy_trigger 1, $10, $b, $0, UnknownScript_0x1a001e, $0, $0 - ; signposts +.Signposts: db 8 - signpost 34, 20, $0, CianwoodCitySign - signpost 45, 7, $0, CianwoodGymSign - signpost 43, 24, $0, CianwoodPokeCenterSign - signpost 47, 19, $0, CianwoodPharmacySign - signpost 32, 8, $0, CianwoodPhotoStudioSign - signpost 24, 8, $0, CianwoodPokeSeerSign - signpost 19, 4, $7, MapCianwoodCitySignpostItem6 - signpost 29, 5, $7, MapCianwoodCitySignpostItem7 - - ; people-events + signpost 34, 20, SIGNPOST_READ, CianwoodCitySign + signpost 45, 7, SIGNPOST_READ, CianwoodGymSign + signpost 43, 24, SIGNPOST_READ, CianwoodPokeCenterSign + signpost 47, 19, SIGNPOST_READ, CianwoodPharmacySign + signpost 32, 8, SIGNPOST_READ, CianwoodPhotoStudioSign + signpost 24, 8, SIGNPOST_READ, CianwoodPokeSeerSign + signpost 19, 4, SIGNPOST_ITEM, MapCianwoodCitySignpostItem6 + signpost 29, 5, SIGNPOST_ITEM, MapCianwoodCitySignpostItem7 + +.PersonEvents: db 12 - person_event SPRITE_STANDING_YOUNGSTER, 41, 25, $3, $0, 255, 255, $a0, 0, StandingYoungsterScript_0x1a00b3, -1 - person_event SPRITE_POKEFAN_M, 37, 21, $5, $1, 255, 255, $0, 0, PokefanMScript_0x1a00b6, -1 - person_event SPRITE_LASS, 46, 18, $4, $20, 255, 255, $0, 0, LassScript_0x1a00b9, -1 - person_event SPRITE_ROCK, 20, 12, $18, $0, 255, 255, $0, 0, CianwoodCityRock, -1 - person_event SPRITE_ROCK, 21, 13, $18, $0, 255, 255, $0, 0, CianwoodCityRock, -1 - person_event SPRITE_ROCK, 29, 8, $18, $0, 255, 255, $0, 0, CianwoodCityRock, -1 - person_event SPRITE_ROCK, 33, 9, $18, $0, 255, 255, $0, 0, CianwoodCityRock, -1 - person_event SPRITE_ROCK, 31, 14, $18, $0, 255, 255, $0, 0, CianwoodCityRock, -1 - person_event SPRITE_ROCK, 23, 8, $18, $0, 255, 255, $0, 0, CianwoodCityRock, -1 - person_event SPRITE_POKEFAN_F, 50, 14, $5, $1, 255, 255, $0, 0, PokefanFScript_0x1a0084, -1 - person_event SPRITE_SUPER_NERD, 25, 15, $7, $0, 255, 255, $90, 0, ObjectEvent, EVENT_7AD - person_event SPRITE_SUICUNE, 18, 14, $1, $0, 255, 255, $90, 0, ObjectEvent, EVENT_SAW_SUICUNE_AT_CIANWOOD_CITY + person_event SPRITE_STANDING_YOUNGSTER, 41, 25, OW_DOWN | $3, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, StandingYoungsterScript_0x1a00b3, -1 + person_event SPRITE_POKEFAN_M, 37, 21, OW_UP | $1, $1, -1, -1, $0, 0, PokefanMScript_0x1a00b6, -1 + person_event SPRITE_LASS, 46, 18, OW_UP | $0, $20, -1, -1, $0, 0, LassScript_0x1a00b9, -1 + person_event SPRITE_ROCK, 20, 12, OW_LEFT | $10, $0, -1, -1, $0, 0, CianwoodCityRock, -1 + person_event SPRITE_ROCK, 21, 13, OW_LEFT | $10, $0, -1, -1, $0, 0, CianwoodCityRock, -1 + person_event SPRITE_ROCK, 29, 8, OW_LEFT | $10, $0, -1, -1, $0, 0, CianwoodCityRock, -1 + person_event SPRITE_ROCK, 33, 9, OW_LEFT | $10, $0, -1, -1, $0, 0, CianwoodCityRock, -1 + person_event SPRITE_ROCK, 31, 14, OW_LEFT | $10, $0, -1, -1, $0, 0, CianwoodCityRock, -1 + person_event SPRITE_ROCK, 23, 8, OW_LEFT | $10, $0, -1, -1, $0, 0, CianwoodCityRock, -1 + person_event SPRITE_POKEFAN_F, 50, 14, OW_UP | $1, $1, -1, -1, $0, 0, PokefanFScript_0x1a0084, -1 + person_event SPRITE_SUPER_NERD, 25, 15, OW_UP | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, ObjectEvent, EVENT_CIANWOOD_CITY_EUSINE + person_event SPRITE_SUICUNE, 18, 14, OW_DOWN | $1, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, ObjectEvent, EVENT_SAW_SUICUNE_AT_CIANWOOD_CITY diff --git a/maps/CianwoodCityPhotoStudio.asm b/maps/CianwoodCityPhotoStudio.asm index 054a1aaa5..98dae6883 100644 --- a/maps/CianwoodCityPhotoStudio.asm +++ b/maps/CianwoodCityPhotoStudio.asm @@ -1,8 +1,8 @@ CianwoodCityPhotoStudio_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 FishingGuruScript_0x9e0e0: @@ -49,17 +49,17 @@ CianwoodCityPhotoStudio_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $7, $2, 5, GROUP_CIANWOOD_CITY, MAP_CIANWOOD_CITY warp_def $7, $3, 5, GROUP_CIANWOOD_CITY, MAP_CIANWOOD_CITY - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 1 - person_event SPRITE_FISHING_GURU, 7, 6, $6, $0, 255, 255, $80, 0, FishingGuruScript_0x9e0e0, -1 + person_event SPRITE_FISHING_GURU, 7, 6, OW_UP | $2, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, FishingGuruScript_0x9e0e0, -1 diff --git a/maps/CianwoodGym.asm b/maps/CianwoodGym.asm index 249d3ca6f..245a550d8 100644 --- a/maps/CianwoodGym.asm +++ b/maps/CianwoodGym.asm @@ -1,8 +1,8 @@ CianwoodGym_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 ChuckScript_0x9d60f: @@ -76,23 +76,7 @@ CianwoodGymTriggerRockets: jumpstd radiotowerrockets TrainerBlackbeltYoshi: - ; bit/flag number - dw EVENT_BEAT_BLACKBELT_YOSHI - - ; trainer group && trainer id - db BLACKBELT_T, YOSHI - - ; text when seen - dw BlackbeltYoshiSeenText - - ; text when trainer beaten - dw BlackbeltYoshiBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw BlackbeltYoshiScript + trainer EVENT_BEAT_BLACKBELT_YOSHI, BLACKBELT_T, YOSHI, BlackbeltYoshiSeenText, BlackbeltYoshiBeatenText, $0000, BlackbeltYoshiScript BlackbeltYoshiScript: talkaftercancel @@ -103,23 +87,7 @@ BlackbeltYoshiScript: end TrainerBlackbeltLao: - ; bit/flag number - dw EVENT_BEAT_BLACKBELT_LAO - - ; trainer group && trainer id - db BLACKBELT_T, LAO - - ; text when seen - dw BlackbeltLaoSeenText - - ; text when trainer beaten - dw BlackbeltLaoBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw BlackbeltLaoScript + trainer EVENT_BEAT_BLACKBELT_LAO, BLACKBELT_T, LAO, BlackbeltLaoSeenText, BlackbeltLaoBeatenText, $0000, BlackbeltLaoScript BlackbeltLaoScript: talkaftercancel @@ -130,23 +98,7 @@ BlackbeltLaoScript: end TrainerBlackbeltNob: - ; bit/flag number - dw EVENT_BEAT_BLACKBELT_NOB - - ; trainer group && trainer id - db BLACKBELT_T, NOB - - ; text when seen - dw BlackbeltNobSeenText - - ; text when trainer beaten - dw BlackbeltNobBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw BlackbeltNobScript + trainer EVENT_BEAT_BLACKBELT_NOB, BLACKBELT_T, NOB, BlackbeltNobSeenText, BlackbeltNobBeatenText, $0000, BlackbeltNobScript BlackbeltNobScript: talkaftercancel @@ -157,23 +109,7 @@ BlackbeltNobScript: end TrainerBlackbeltLung: - ; bit/flag number - dw EVENT_BEAT_BLACKBELT_LUNG - - ; trainer group && trainer id - db BLACKBELT_T, LUNG - - ; text when seen - dw BlackbeltLungSeenText - - ; text when trainer beaten - dw BlackbeltLungBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw BlackbeltLungScript + trainer EVENT_BEAT_BLACKBELT_LUNG, BLACKBELT_T, LUNG, BlackbeltLungSeenText, BlackbeltLungBeatenText, $0000, BlackbeltLungScript BlackbeltLungScript: talkaftercancel @@ -362,27 +298,27 @@ CianwoodGym_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $11, $4, 2, GROUP_CIANWOOD_CITY, MAP_CIANWOOD_CITY warp_def $11, $5, 2, GROUP_CIANWOOD_CITY, MAP_CIANWOOD_CITY - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 2 - signpost 15, 3, $0, CianwoodGymStatue - signpost 15, 6, $0, CianwoodGymStatue + signpost 15, 3, SIGNPOST_READ, CianwoodGymStatue + signpost 15, 6, SIGNPOST_READ, CianwoodGymStatue - ; people-events +.PersonEvents: db 9 - person_event SPRITE_CHUCK, 5, 8, $6, $0, 255, 255, $b0, 0, ChuckScript_0x9d60f, -1 - person_event SPRITE_BLACK_BELT, 16, 6, $9, $0, 255, 255, $b2, 3, TrainerBlackbeltYoshi, -1 - person_event SPRITE_BLACK_BELT, 16, 11, $8, $0, 255, 255, $b2, 3, TrainerBlackbeltLao, -1 - person_event SPRITE_BLACK_BELT, 13, 7, $9, $0, 255, 255, $b2, 2, TrainerBlackbeltNob, -1 - person_event SPRITE_BLACK_BELT, 9, 9, $8, $0, 255, 255, $b2, 1, TrainerBlackbeltLung, -1 - person_event SPRITE_BOULDER, 5, 9, $19, $0, 255, 255, $0, 0, CianwoodGymBoulder, -1 - person_event SPRITE_BOULDER, 11, 7, $19, $0, 255, 255, $0, 0, CianwoodGymBoulder, -1 - person_event SPRITE_BOULDER, 11, 8, $19, $0, 255, 255, $0, 0, CianwoodGymBoulder, -1 - person_event SPRITE_BOULDER, 11, 9, $19, $0, 255, 255, $0, 0, CianwoodGymBoulder, -1 + person_event SPRITE_CHUCK, 5, 8, OW_UP | $2, $0, -1, -1, (PAL_OW_BROWN << 4) | $80, 0, ChuckScript_0x9d60f, -1 + person_event SPRITE_BLACK_BELT, 16, 6, OW_LEFT | $1, $0, -1, -1, (PAL_OW_BROWN << 4) | $82, 3, TrainerBlackbeltYoshi, -1 + person_event SPRITE_BLACK_BELT, 16, 11, OW_LEFT | $0, $0, -1, -1, (PAL_OW_BROWN << 4) | $82, 3, TrainerBlackbeltLao, -1 + person_event SPRITE_BLACK_BELT, 13, 7, OW_LEFT | $1, $0, -1, -1, (PAL_OW_BROWN << 4) | $82, 2, TrainerBlackbeltNob, -1 + person_event SPRITE_BLACK_BELT, 9, 9, OW_LEFT | $0, $0, -1, -1, (PAL_OW_BROWN << 4) | $82, 1, TrainerBlackbeltLung, -1 + person_event SPRITE_BOULDER, 5, 9, OW_LEFT | $11, $0, -1, -1, $0, 0, CianwoodGymBoulder, -1 + person_event SPRITE_BOULDER, 11, 7, OW_LEFT | $11, $0, -1, -1, $0, 0, CianwoodGymBoulder, -1 + person_event SPRITE_BOULDER, 11, 8, OW_LEFT | $11, $0, -1, -1, $0, 0, CianwoodGymBoulder, -1 + person_event SPRITE_BOULDER, 11, 9, OW_LEFT | $11, $0, -1, -1, $0, 0, CianwoodGymBoulder, -1 diff --git a/maps/CianwoodLugiaSpeechHouse.asm b/maps/CianwoodLugiaSpeechHouse.asm index 37f0dc306..c6621f9aa 100644 --- a/maps/CianwoodLugiaSpeechHouse.asm +++ b/maps/CianwoodLugiaSpeechHouse.asm @@ -1,8 +1,8 @@ CianwoodLugiaSpeechHouse_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 TeacherScript_0x9e1b0: @@ -60,21 +60,21 @@ CianwoodLugiaSpeechHouse_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $7, $2, 6, GROUP_CIANWOOD_CITY, MAP_CIANWOOD_CITY warp_def $7, $3, 6, GROUP_CIANWOOD_CITY, MAP_CIANWOOD_CITY - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 2 - signpost 1, 0, $0, CianwoodLugiaSpeechHouseBookshelf - signpost 1, 1, $0, CianwoodLugiaSpeechHouseBookshelf + signpost 1, 0, SIGNPOST_READ, CianwoodLugiaSpeechHouseBookshelf + signpost 1, 1, SIGNPOST_READ, CianwoodLugiaSpeechHouseBookshelf - ; people-events +.PersonEvents: db 3 - person_event SPRITE_TEACHER, 8, 6, $6, $0, 255, 255, $0, 0, TeacherScript_0x9e1b0, -1 - person_event SPRITE_LASS, 9, 10, $5, $1, 255, 255, $a0, 0, LassScript_0x9e1b3, -1 - person_event SPRITE_TWIN, 6, 4, $7, $0, 255, 255, $90, 0, TwinScript_0x9e1b6, -1 + person_event SPRITE_TEACHER, 8, 6, OW_UP | $2, $0, -1, -1, $0, 0, TeacherScript_0x9e1b0, -1 + person_event SPRITE_LASS, 9, 10, OW_UP | $1, $1, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, LassScript_0x9e1b3, -1 + person_event SPRITE_TWIN, 6, 4, OW_UP | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, TwinScript_0x9e1b6, -1 diff --git a/maps/CianwoodPharmacy.asm b/maps/CianwoodPharmacy.asm index 7c8a9d415..210708780 100644 --- a/maps/CianwoodPharmacy.asm +++ b/maps/CianwoodPharmacy.asm @@ -1,11 +1,11 @@ CianwoodPharmacy_MapScriptHeader: - ; trigger count +.MapTriggers: db 1 ; triggers dw CianwoodPharmacyTrigger, $0000 - ; callback count +.MapCallbacks: db 0 CianwoodPharmacyTrigger: @@ -75,19 +75,19 @@ CianwoodPharmacy_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $7, $2, 4, GROUP_CIANWOOD_CITY, MAP_CIANWOOD_CITY warp_def $7, $3, 4, GROUP_CIANWOOD_CITY, MAP_CIANWOOD_CITY - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 2 - signpost 1, 0, $0, CianwoodPharmacyBookshelf - signpost 1, 1, $0, CianwoodPharmacyBookshelf + signpost 1, 0, SIGNPOST_READ, CianwoodPharmacyBookshelf + signpost 1, 1, SIGNPOST_READ, CianwoodPharmacyBookshelf - ; people-events +.PersonEvents: db 1 - person_event SPRITE_PHARMACIST, 7, 6, $6, $0, 255, 255, $80, 0, CianwoodPharmacist, -1 + person_event SPRITE_PHARMACIST, 7, 6, OW_UP | $2, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, CianwoodPharmacist, -1 diff --git a/maps/CianwoodPokeCenter1F.asm b/maps/CianwoodPokeCenter1F.asm index 889034366..65d38670c 100644 --- a/maps/CianwoodPokeCenter1F.asm +++ b/maps/CianwoodPokeCenter1F.asm @@ -1,8 +1,8 @@ CianwoodPokeCenter1F_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 NurseScript_0x9dbcf: @@ -129,21 +129,21 @@ CianwoodPokeCenter1F_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 3 warp_def $7, $3, 3, GROUP_CIANWOOD_CITY, MAP_CIANWOOD_CITY warp_def $7, $4, 3, GROUP_CIANWOOD_CITY, MAP_CIANWOOD_CITY warp_def $7, $0, 1, GROUP_POKECENTER_2F, MAP_POKECENTER_2F - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 4 - person_event SPRITE_NURSE, 5, 7, $6, $0, 255, 255, $0, 0, NurseScript_0x9dbcf, -1 - person_event SPRITE_LASS, 9, 5, $4, $10, 255, 255, $a0, 0, LassScript_0x9dbd2, -1 - person_event SPRITE_GYM_GUY, 7, 9, $6, $0, 255, 255, $80, 0, CianwoodGymGuyScript, -1 - person_event SPRITE_SUPER_NERD, 10, 12, $5, $1, 255, 255, $90, 0, SuperNerdScript_0x9dbea, -1 + person_event SPRITE_NURSE, 5, 7, OW_UP | $2, $0, -1, -1, $0, 0, NurseScript_0x9dbcf, -1 + person_event SPRITE_LASS, 9, 5, OW_UP | $0, $10, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, LassScript_0x9dbd2, -1 + person_event SPRITE_GYM_GUY, 7, 9, OW_UP | $2, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, CianwoodGymGuyScript, -1 + person_event SPRITE_SUPER_NERD, 10, 12, OW_UP | $1, $1, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, SuperNerdScript_0x9dbea, -1 diff --git a/maps/CinnabarIsland.asm b/maps/CinnabarIsland.asm index 1a5c8663b..6b5132a8b 100644 --- a/maps/CinnabarIsland.asm +++ b/maps/CinnabarIsland.asm @@ -1,8 +1,8 @@ CinnabarIsland_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 1 ; callbacks @@ -21,7 +21,7 @@ CinnabarIslandBlue: playsound SFX_WARP_TO applymovement $2, CinnabarIslandBlueTeleport disappear $2 - clearevent EVENT_776 + clearevent EVENT_VIRIDIAN_GYM_BLUE end CinnabarIslandGymSign: @@ -34,8 +34,7 @@ CinnabarIslandPokeCenterSign: jumpstd pokecentersign MapCinnabarIslandSignpostItem3: - dw $00fe - db RARE_CANDY + dwb EVENT_CINNABAR_ISLAND_HIDDEN_RARE_CANDY, RARE_CANDY CinnabarIslandBlueTeleport: teleport_from @@ -131,20 +130,20 @@ CinnabarIsland_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 1 warp_def $b, $b, 1, GROUP_CINNABAR_POKECENTER_1F, MAP_CINNABAR_POKECENTER_1F - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 4 - signpost 11, 12, $0, CinnabarIslandPokeCenterSign - signpost 11, 9, $0, CinnabarIslandGymSign - signpost 7, 7, $0, CinnabarIslandSign - signpost 1, 9, $7, MapCinnabarIslandSignpostItem3 + signpost 11, 12, SIGNPOST_READ, CinnabarIslandPokeCenterSign + signpost 11, 9, SIGNPOST_READ, CinnabarIslandGymSign + signpost 7, 7, SIGNPOST_READ, CinnabarIslandSign + signpost 1, 9, SIGNPOST_ITEM, MapCinnabarIslandSignpostItem3 - ; people-events +.PersonEvents: db 1 - person_event SPRITE_BLUE, 10, 13, $3, $0, 255, 255, $0, 0, CinnabarIslandBlue, EVENT_BLUE_IN_CINNABAR + person_event SPRITE_BLUE, 10, 13, OW_DOWN | $3, $0, -1, -1, $0, 0, CinnabarIslandBlue, EVENT_BLUE_IN_CINNABAR diff --git a/maps/CinnabarPokeCenter1F.asm b/maps/CinnabarPokeCenter1F.asm index 26dfd69af..1eea0d2f5 100644 --- a/maps/CinnabarPokeCenter1F.asm +++ b/maps/CinnabarPokeCenter1F.asm @@ -1,8 +1,8 @@ CinnabarPokeCenter1F_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 NurseScript_0x1ab32c: @@ -33,20 +33,20 @@ CinnabarPokeCenter1F_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 3 warp_def $7, $3, 1, GROUP_CINNABAR_ISLAND, MAP_CINNABAR_ISLAND warp_def $7, $4, 1, GROUP_CINNABAR_ISLAND, MAP_CINNABAR_ISLAND warp_def $7, $0, 1, GROUP_POKECENTER_2F, MAP_POKECENTER_2F - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 3 - person_event SPRITE_NURSE, 5, 7, $6, $0, 255, 255, $0, 0, NurseScript_0x1ab32c, -1 - person_event SPRITE_COOLTRAINER_F, 10, 11, $5, $2, 255, 255, $80, 0, CooltrainerFScript_0x1ab32f, -1 - person_event SPRITE_FISHER, 8, 6, $6, $0, 255, 255, $a0, 0, FisherScript_0x1ab332, -1 + person_event SPRITE_NURSE, 5, 7, OW_UP | $2, $0, -1, -1, $0, 0, NurseScript_0x1ab32c, -1 + person_event SPRITE_COOLTRAINER_F, 10, 11, OW_UP | $1, $2, -1, -1, (PAL_OW_RED << 4) | $80, 0, CooltrainerFScript_0x1ab32f, -1 + person_event SPRITE_FISHER, 8, 6, OW_UP | $2, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, FisherScript_0x1ab332, -1 diff --git a/maps/CinnabarPokeCenter2FBeta.asm b/maps/CinnabarPokeCenter2FBeta.asm index d614d2b65..13243c78a 100644 --- a/maps/CinnabarPokeCenter2FBeta.asm +++ b/maps/CinnabarPokeCenter2FBeta.asm @@ -1,23 +1,23 @@ CinnabarPokeCenter2FBeta_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 CinnabarPokeCenter2FBeta_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 1 warp_def $7, $0, 3, GROUP_CINNABAR_POKECENTER_1F, MAP_CINNABAR_POKECENTER_1F - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 0 diff --git a/maps/Colosseum.asm b/maps/Colosseum.asm index 1eeaae128..a23704d74 100644 --- a/maps/Colosseum.asm +++ b/maps/Colosseum.asm @@ -1,65 +1,65 @@ Colosseum_MapScriptHeader: - ; trigger count +.MapTriggers: db 3 ; triggers - dw UnknownScript_0x193471, $0000 - dw UnknownScript_0x193475, $0000 - dw UnknownScript_0x193476, $0000 + dw .Trigger1, $0000 + dw .Trigger2, $0000 + dw .Trigger3, $0000 - ; callback count +.MapCallbacks: db 2 ; callbacks - dbw 2, UnknownScript_0x193477 + dbw 2, ColosseumScript_SetWhichChris - dbw 5, UnknownScript_0x193487 + dbw 5, ColosseumScript_InitializeCB -UnknownScript_0x193471: - priorityjump UnknownScript_0x19348c +.Trigger1: + priorityjump ColosseumScript_Initialize end -UnknownScript_0x193475: +.Trigger2: end -UnknownScript_0x193476: +.Trigger3: end -UnknownScript_0x193477: - special Function29f47 - iffalse UnknownScript_0x193482 +ColosseumScript_SetWhichChris: + special Special_CableClubCheckWhichChris + iffalse .Chris2 disappear $3 appear $2 return -UnknownScript_0x193482: +.Chris2: disappear $2 appear $3 return -UnknownScript_0x193487: +ColosseumScript_InitializeCB: domaptrigger GROUP_POKECENTER_2F, MAP_POKECENTER_2F, $2 return -UnknownScript_0x19348c: +ColosseumScript_Initialize: dotrigger $1 domaptrigger GROUP_POKECENTER_2F, MAP_POKECENTER_2F, $2 end MapColosseumSignpost1Script: - special Function29ed9 + special Special_Colosseum newloadmap $f8 end ChrisScript_0x193499: loadfont - writetext UnknownText_0x1934a0 + writetext .FriendReadyText closetext loadmovesprites end -UnknownText_0x1934a0: +.FriendReadyText: text "Your friend is" line "ready." done @@ -68,20 +68,20 @@ Colosseum_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $7, $4, 3, GROUP_POKECENTER_2F, MAP_POKECENTER_2F warp_def $7, $5, 3, GROUP_POKECENTER_2F, MAP_POKECENTER_2F - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 2 - signpost 4, 4, $3, MapColosseumSignpost1Script - signpost 4, 5, $4, MapColosseumSignpost1Script + signpost 4, 4, SIGNPOST_RIGHT, MapColosseumSignpost1Script + signpost 4, 5, SIGNPOST_LEFT, MapColosseumSignpost1Script - ; people-events +.PersonEvents: db 2 - person_event SPRITE_CHRIS, 8, 7, $9, $0, 255, 255, $0, 0, ChrisScript_0x193499, EVENT_000 - person_event SPRITE_CHRIS, 8, 10, $8, $0, 255, 255, $0, 0, ChrisScript_0x193499, EVENT_001 + person_event SPRITE_CHRIS, 8, 7, OW_LEFT | $1, $0, -1, -1, $0, 0, ChrisScript_0x193499, EVENT_GAVE_KURT_APRICORNS + person_event SPRITE_CHRIS, 8, 10, OW_LEFT | $0, $0, -1, -1, $0, 0, ChrisScript_0x193499, EVENT_RECEIVED_BALLS_FROM_KURT diff --git a/maps/CopycatsHouse1F.asm b/maps/CopycatsHouse1F.asm index 719619420..475d1aa2c 100644 --- a/maps/CopycatsHouse1F.asm +++ b/maps/CopycatsHouse1F.asm @@ -1,8 +1,8 @@ CopycatsHouse1F_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 PokefanMScript_0x18ad13: @@ -71,20 +71,20 @@ CopycatsHouse1F_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 3 warp_def $7, $2, 8, GROUP_SAFFRON_CITY, MAP_SAFFRON_CITY warp_def $7, $3, 8, GROUP_SAFFRON_CITY, MAP_SAFFRON_CITY warp_def $0, $2, 1, GROUP_COPYCATS_HOUSE_2F, MAP_COPYCATS_HOUSE_2F - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 3 - person_event SPRITE_POKEFAN_M, 7, 6, $6, $0, 255, 255, $0, 0, PokefanMScript_0x18ad13, -1 - person_event SPRITE_POKEFAN_F, 8, 9, $8, $0, 255, 255, $a0, 0, PokefanFScript_0x18ad16, -1 - person_event SPRITE_CLEFAIRY, 10, 10, $16, $0, 255, 255, $0, 0, ClefairyScript_0x18ad2a, -1 + person_event SPRITE_POKEFAN_M, 7, 6, OW_UP | $2, $0, -1, -1, $0, 0, PokefanMScript_0x18ad13, -1 + person_event SPRITE_POKEFAN_F, 8, 9, OW_LEFT | $0, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, PokefanFScript_0x18ad16, -1 + person_event SPRITE_CLEFAIRY, 10, 10, OW_UP | $12, $0, -1, -1, $0, 0, ClefairyScript_0x18ad2a, -1 diff --git a/maps/CopycatsHouse2F.asm b/maps/CopycatsHouse2F.asm index caa96bf15..3d71a10ce 100644 --- a/maps/CopycatsHouse2F.asm +++ b/maps/CopycatsHouse2F.asm @@ -1,8 +1,8 @@ CopycatsHouse2F_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 1 ; callbacks @@ -33,15 +33,15 @@ Copycat: iftrue .Part1 applymovement $2, MovementData_0x18afd0 faceplayer - variablesprite $b, $1 + variablesprite SPRITE_COPYCAT, SPRITE_CHRIS jump .Part2 .Part1 applymovement $7, MovementData_0x18afd0 faceplayer - variablesprite $b, $60 + variablesprite SPRITE_COPYCAT, SPRITE_KRIS .Part2 - special Function14209 + special RunCallback_04 checkevent EVENT_RETURNED_MACHINE_PART iftrue .Part7 loadfont @@ -64,8 +64,8 @@ Copycat: applymovement $7, MovementData_0x18afd0 .Part6 faceplayer - variablesprite $b, $28 - special Function14209 + variablesprite SPRITE_COPYCAT, SPRITE_LASS + special RunCallback_04 loadfont writetext UnknownText_0x18b028 closetext @@ -93,8 +93,8 @@ Copycat: applymovement $7, MovementData_0x18afd0 .Part11 faceplayer - variablesprite $b, $28 - special Function14209 + variablesprite SPRITE_COPYCAT, SPRITE_LASS + special RunCallback_04 loadfont writetext UnknownText_0x18b116 closetext @@ -108,7 +108,7 @@ Copycat: keeptextopen takeitem LOST_ITEM, 1 setevent EVENT_RETURNED_LOST_ITEM_TO_COPYCAT - clearevent EVENT_773 + clearevent EVENT_COPYCATS_HOUSE_2F_DOLL jump .Part14 .Part13 @@ -129,15 +129,15 @@ Copycat: iftrue .Part16 applymovement $2, MovementData_0x18afd0 faceplayer - variablesprite $b, $1 + variablesprite SPRITE_COPYCAT, SPRITE_CHRIS jump .Part17 .Part16 applymovement $7, MovementData_0x18afd0 faceplayer - variablesprite $b, $60 + variablesprite SPRITE_COPYCAT, SPRITE_KRIS .Part17 - special Function14209 + special RunCallback_04 loadfont checkflag ENGINE_PLAYER_IS_FEMALE iftrue .Part18 @@ -158,8 +158,8 @@ Copycat: applymovement $7, MovementData_0x18afd0 .Part21 faceplayer - variablesprite $b, $28 - special Function14209 + variablesprite SPRITE_COPYCAT, SPRITE_LASS + special RunCallback_04 loadfont writetext UnknownText_0x18b2f5 closetext @@ -359,23 +359,23 @@ CopycatsHouse2F_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 1 warp_def $0, $3, 3, GROUP_COPYCATS_HOUSE_1F, MAP_COPYCATS_HOUSE_1F - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 2 - signpost 1, 0, $0, CopycatsHouse2FBookshelf - signpost 1, 1, $0, CopycatsHouse2FBookshelf + signpost 1, 0, SIGNPOST_READ, CopycatsHouse2FBookshelf + signpost 1, 1, SIGNPOST_READ, CopycatsHouse2FBookshelf - ; people-events +.PersonEvents: db 6 - person_event SPRITE_COPYCAT, 7, 8, $8, $0, 255, 255, $80, 0, Copycat, EVENT_6EE - person_event SPRITE_MOLTRES, 8, 10, $16, $0, 255, 255, $b0, 0, CopycatsDodrio, -1 - person_event SPRITE_FAIRY, 5, 10, $6, $0, 255, 255, $80, 0, CopycatsHouse2FDoll, EVENT_773 - person_event SPRITE_MONSTER, 5, 6, $6, $0, 255, 255, $a0, 0, CopycatsHouse2FDoll, -1 - person_event SPRITE_BIRD, 5, 11, $6, $0, 255, 255, $90, 0, CopycatsHouse2FDoll, -1 - person_event SPRITE_COPYCAT, 7, 8, $8, $0, 255, 255, $90, 0, Copycat, EVENT_6EF + person_event SPRITE_COPYCAT, 7, 8, OW_LEFT | $0, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, Copycat, EVENT_COPYCAT_1 + person_event SPRITE_MOLTRES, 8, 10, OW_UP | $12, $0, -1, -1, (PAL_OW_BROWN << 4) | $80, 0, CopycatsDodrio, -1 + person_event SPRITE_FAIRY, 5, 10, OW_UP | $2, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, CopycatsHouse2FDoll, EVENT_COPYCATS_HOUSE_2F_DOLL + person_event SPRITE_MONSTER, 5, 6, OW_UP | $2, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, CopycatsHouse2FDoll, -1 + person_event SPRITE_BIRD, 5, 11, OW_UP | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, CopycatsHouse2FDoll, -1 + person_event SPRITE_COPYCAT, 7, 8, OW_LEFT | $0, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, Copycat, EVENT_COPYCAT_2 diff --git a/maps/DanceTheatre.asm b/maps/DanceTheatre.asm index 0f1e99069..af863699e 100644 --- a/maps/DanceTheatre.asm +++ b/maps/DanceTheatre.asm @@ -1,28 +1,12 @@ DanceTheatre_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 TrainerKimono_girlNaoko2: - ; bit/flag number - dw EVENT_BEAT_KIMONO_GIRL_NAOKO - - ; trainer group && trainer id - db KIMONO_GIRL, NAOKO2 - - ; text when seen - dw Kimono_girlNaoko2SeenText - - ; text when trainer beaten - dw Kimono_girlNaoko2BeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw Kimono_girlNaoko2Script + trainer EVENT_BEAT_KIMONO_GIRL_NAOKO, KIMONO_GIRL, NAOKO2, Kimono_girlNaoko2SeenText, Kimono_girlNaoko2BeatenText, $0000, Kimono_girlNaoko2Script Kimono_girlNaoko2Script: talkaftercancel @@ -33,23 +17,7 @@ Kimono_girlNaoko2Script: end TrainerKimono_girlSayo: - ; bit/flag number - dw EVENT_BEAT_KIMONO_GIRL_SAYO - - ; trainer group && trainer id - db KIMONO_GIRL, SAYO - - ; text when seen - dw Kimono_girlSayoSeenText - - ; text when trainer beaten - dw Kimono_girlSayoBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw Kimono_girlSayoScript + trainer EVENT_BEAT_KIMONO_GIRL_SAYO, KIMONO_GIRL, SAYO, Kimono_girlSayoSeenText, Kimono_girlSayoBeatenText, $0000, Kimono_girlSayoScript Kimono_girlSayoScript: talkaftercancel @@ -60,23 +28,7 @@ Kimono_girlSayoScript: end TrainerKimono_girlZuki: - ; bit/flag number - dw EVENT_BEAT_KIMONO_GIRL_ZUKI - - ; trainer group && trainer id - db KIMONO_GIRL, ZUKI - - ; text when seen - dw Kimono_girlZukiSeenText - - ; text when trainer beaten - dw Kimono_girlZukiBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw Kimono_girlZukiScript + trainer EVENT_BEAT_KIMONO_GIRL_ZUKI, KIMONO_GIRL, ZUKI, Kimono_girlZukiSeenText, Kimono_girlZukiBeatenText, $0000, Kimono_girlZukiScript Kimono_girlZukiScript: talkaftercancel @@ -87,23 +39,7 @@ Kimono_girlZukiScript: end TrainerKimono_girlKuni: - ; bit/flag number - dw EVENT_BEAT_KIMONO_GIRL_KUNI - - ; trainer group && trainer id - db KIMONO_GIRL, KUNI - - ; text when seen - dw Kimono_girlKuniSeenText - - ; text when trainer beaten - dw Kimono_girlKuniBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw Kimono_girlKuniScript + trainer EVENT_BEAT_KIMONO_GIRL_KUNI, KIMONO_GIRL, KUNI, Kimono_girlKuniSeenText, Kimono_girlKuniBeatenText, $0000, Kimono_girlKuniScript Kimono_girlKuniScript: talkaftercancel @@ -114,23 +50,7 @@ Kimono_girlKuniScript: end TrainerKimono_girlMiki: - ; bit/flag number - dw EVENT_BEAT_KIMONO_GIRL_MIKI - - ; trainer group && trainer id - db KIMONO_GIRL, MIKI - - ; text when seen - dw Kimono_girlMikiSeenText - - ; text when trainer beaten - dw Kimono_girlMikiBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw Kimono_girlMikiScript + trainer EVENT_BEAT_KIMONO_GIRL_MIKI, KIMONO_GIRL, MIKI, Kimono_girlMikiSeenText, Kimono_girlMikiBeatenText, $0000, Kimono_girlMikiScript Kimono_girlMikiScript: talkaftercancel @@ -410,27 +330,27 @@ DanceTheatre_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $d, $5, 8, GROUP_ECRUTEAK_CITY, MAP_ECRUTEAK_CITY warp_def $d, $6, 8, GROUP_ECRUTEAK_CITY, MAP_ECRUTEAK_CITY - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 2 - signpost 6, 5, $1, MapDanceTheatreSignpost1Script - signpost 6, 6, $1, MapDanceTheatreSignpost1Script + signpost 6, 5, SIGNPOST_UP, MapDanceTheatreSignpost1Script + signpost 6, 6, SIGNPOST_UP, MapDanceTheatreSignpost1Script - ; people-events +.PersonEvents: db 9 - person_event SPRITE_KIMONO_GIRL, 6, 4, $1e, $0, 255, 255, $a2, 0, TrainerKimono_girlNaoko2, -1 - person_event SPRITE_KIMONO_GIRL, 5, 6, $a, $0, 255, 255, $92, 0, TrainerKimono_girlSayo, -1 - person_event SPRITE_KIMONO_GIRL, 6, 10, $3, $0, 255, 255, $82, 0, TrainerKimono_girlZuki, -1 - person_event SPRITE_KIMONO_GIRL, 5, 13, $a, $0, 255, 255, $92, 0, TrainerKimono_girlKuni, -1 - person_event SPRITE_KIMONO_GIRL, 6, 15, $1f, $0, 255, 255, $a2, 0, TrainerKimono_girlMiki, -1 - person_event SPRITE_GENTLEMAN, 14, 11, $7, $0, 255, 255, $0, 0, GentlemanScript_0x994c6, -1 - person_event SPRITE_RHYDON, 12, 10, $16, $0, 255, 255, $90, 0, RhydonScript_0x9951b, -1 - person_event SPRITE_COOLTRAINER_M, 14, 14, $8, $0, 255, 255, $80, 0, CooltrainerMScript_0x99525, -1 - person_event SPRITE_GRANNY, 10, 7, $7, $0, 255, 255, $0, 0, GrannyScript_0x99528, -1 + person_event SPRITE_KIMONO_GIRL, 6, 4, OW_RIGHT | $12, $0, -1, -1, (PAL_OW_GREEN << 4) | $82, 0, TrainerKimono_girlNaoko2, -1 + person_event SPRITE_KIMONO_GIRL, 5, 6, OW_LEFT | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 0, TrainerKimono_girlSayo, -1 + person_event SPRITE_KIMONO_GIRL, 6, 10, OW_DOWN | $3, $0, -1, -1, (PAL_OW_RED << 4) | $82, 0, TrainerKimono_girlZuki, -1 + person_event SPRITE_KIMONO_GIRL, 5, 13, OW_LEFT | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 0, TrainerKimono_girlKuni, -1 + person_event SPRITE_KIMONO_GIRL, 6, 15, OW_RIGHT | $13, $0, -1, -1, (PAL_OW_GREEN << 4) | $82, 0, TrainerKimono_girlMiki, -1 + person_event SPRITE_GENTLEMAN, 14, 11, OW_UP | $3, $0, -1, -1, $0, 0, GentlemanScript_0x994c6, -1 + person_event SPRITE_RHYDON, 12, 10, OW_UP | $12, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, RhydonScript_0x9951b, -1 + person_event SPRITE_COOLTRAINER_M, 14, 14, OW_LEFT | $0, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, CooltrainerMScript_0x99525, -1 + person_event SPRITE_GRANNY, 10, 7, OW_UP | $3, $0, -1, -1, $0, 0, GrannyScript_0x99528, -1 diff --git a/maps/DarkCaveBlackthornEntrance.asm b/maps/DarkCaveBlackthornEntrance.asm index fc890387e..6fcbec599 100644 --- a/maps/DarkCaveBlackthornEntrance.asm +++ b/maps/DarkCaveBlackthornEntrance.asm @@ -1,8 +1,8 @@ DarkCaveBlackthornEntrance_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 PharmacistScript_0x18c720: @@ -60,19 +60,19 @@ DarkCaveBlackthornEntrance_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $3, $17, 1, GROUP_ROUTE_45, MAP_ROUTE_45 warp_def $19, $3, 2, GROUP_DARK_CAVE_VIOLET_ENTRANCE, MAP_DARK_CAVE_VIOLET_ENTRANCE - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 3 - person_event SPRITE_PHARMACIST, 7, 11, $3, $0, 255, 255, $0, 0, PharmacistScript_0x18c720, -1 - person_event SPRITE_POKE_BALL, 28, 25, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c73b, EVENT_6A1 - person_event SPRITE_POKE_BALL, 26, 11, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c73d, EVENT_6A2 + person_event SPRITE_PHARMACIST, 7, 11, OW_DOWN | $3, $0, -1, -1, $0, 0, PharmacistScript_0x18c720, -1 + person_event SPRITE_POKE_BALL, 28, 25, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x18c73b, EVENT_DARK_CAVE_BLACKTHORN_ENTRANCE_REVIVE + person_event SPRITE_POKE_BALL, 26, 11, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x18c73d, EVENT_DARK_CAVE_BLACKTHORN_ENTRANCE_TM_SNORE diff --git a/maps/DarkCaveVioletEntrance.asm b/maps/DarkCaveVioletEntrance.asm index 59c558cbd..4eeec3c3e 100644 --- a/maps/DarkCaveVioletEntrance.asm +++ b/maps/DarkCaveVioletEntrance.asm @@ -1,8 +1,8 @@ DarkCaveVioletEntrance_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 ItemFragment_0x18c68e: @@ -21,34 +21,33 @@ DarkCaveVioletEntranceRock: jumpstd smashrock MapDarkCaveVioletEntranceSignpostItem0: - dw $009d - db ELIXER + dwb EVENT_DARK_CAVE_VIOLET_ENTRANCE_HIDDEN_ELIXER, ELIXER DarkCaveVioletEntrance_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 3 warp_def $f, $3, 3, GROUP_ROUTE_31, MAP_ROUTE_31 warp_def $1, $11, 2, GROUP_DARK_CAVE_BLACKTHORN_ENTRANCE, MAP_DARK_CAVE_BLACKTHORN_ENTRANCE warp_def $21, $23, 3, GROUP_ROUTE_46, MAP_ROUTE_46 - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 1 - signpost 3, 26, $7, MapDarkCaveVioletEntranceSignpostItem0 + signpost 3, 26, SIGNPOST_ITEM, MapDarkCaveVioletEntranceSignpostItem0 - ; people-events +.PersonEvents: db 8 - person_event SPRITE_POKE_BALL, 12, 10, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c68e, EVENT_69E - person_event SPRITE_ROCK, 18, 20, $18, $0, 255, 255, $0, 0, DarkCaveVioletEntranceRock, -1 - person_event SPRITE_ROCK, 10, 31, $18, $0, 255, 255, $0, 0, DarkCaveVioletEntranceRock, -1 - person_event SPRITE_ROCK, 18, 11, $18, $0, 255, 255, $0, 0, DarkCaveVioletEntranceRock, -1 - person_event SPRITE_ROCK, 35, 40, $18, $0, 255, 255, $0, 0, DarkCaveVioletEntranceRock, -1 - person_event SPRITE_POKE_BALL, 26, 40, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c690, EVENT_69F - person_event SPRITE_POKE_BALL, 13, 39, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c692, EVENT_6A0 - person_event SPRITE_POKE_BALL, 32, 34, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c694, EVENT_7CE + person_event SPRITE_POKE_BALL, 12, 10, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x18c68e, EVENT_DARK_CAVE_VIOLET_ENTRANCE_POTION + person_event SPRITE_ROCK, 18, 20, OW_LEFT | $10, $0, -1, -1, $0, 0, DarkCaveVioletEntranceRock, -1 + person_event SPRITE_ROCK, 10, 31, OW_LEFT | $10, $0, -1, -1, $0, 0, DarkCaveVioletEntranceRock, -1 + person_event SPRITE_ROCK, 18, 11, OW_LEFT | $10, $0, -1, -1, $0, 0, DarkCaveVioletEntranceRock, -1 + person_event SPRITE_ROCK, 35, 40, OW_LEFT | $10, $0, -1, -1, $0, 0, DarkCaveVioletEntranceRock, -1 + person_event SPRITE_POKE_BALL, 26, 40, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x18c690, EVENT_DARK_CAVE_VIOLET_ENTRANCE_FULL_HEAL + person_event SPRITE_POKE_BALL, 13, 39, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x18c692, EVENT_DARK_CAVE_VIOLET_ENTRANCE_HYPER_POTION + person_event SPRITE_POKE_BALL, 32, 34, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x18c694, EVENT_DARK_CAVE_VIOLET_ENTRANCE_DIRE_HIT diff --git a/maps/DayCare.asm b/maps/DayCare.asm index ad4904800..1f81580f2 100644 --- a/maps/DayCare.asm +++ b/maps/DayCare.asm @@ -1,8 +1,8 @@ DayCare_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 1 ; callbacks @@ -12,13 +12,13 @@ DayCare_MapScriptHeader: UnknownScript_0x62f7b: checkflag ENGINE_DAYCARE_MONS_ARE_COMPATIBLE iftrue UnknownScript_0x62f88 - clearevent EVENT_6E5 - setevent EVENT_6E6 + clearevent EVENT_DAYCARE_MAN_IN_DAYCARE + setevent EVENT_DAYCARE_MAN_ON_ROUTE_34 return UnknownScript_0x62f88: - setevent EVENT_6E5 - clearevent EVENT_6E6 + setevent EVENT_DAYCARE_MAN_IN_DAYCARE + clearevent EVENT_DAYCARE_MAN_ON_ROUTE_34 return GrampsScript_0x62f8f: @@ -50,7 +50,7 @@ UnknownScript_0x62fb6: end UnknownScript_0x62fbd: - special Function166d6 + special Special_DayCareMan closetext loadmovesprites end @@ -60,7 +60,7 @@ GrannyScript_0x62fc3: loadfont checkflag ENGINE_DAYCARE_MONS_ARE_COMPATIBLE iftrue UnknownScript_0x62fd1 - special Function1672a + special Special_DayCareLady closetext loadmovesprites end @@ -158,22 +158,22 @@ DayCare_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 4 warp_def $5, $0, 3, GROUP_ROUTE_34, MAP_ROUTE_34 warp_def $6, $0, 4, GROUP_ROUTE_34, MAP_ROUTE_34 warp_def $7, $2, 5, GROUP_ROUTE_34, MAP_ROUTE_34 warp_def $7, $3, 5, GROUP_ROUTE_34, MAP_ROUTE_34 - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 2 - signpost 1, 0, $0, DayCareBookshelf - signpost 1, 1, $0, DayCareBookshelf + signpost 1, 0, SIGNPOST_READ, DayCareBookshelf + signpost 1, 1, SIGNPOST_READ, DayCareBookshelf - ; people-events +.PersonEvents: db 2 - person_event SPRITE_GRAMPS, 7, 6, $9, $0, 255, 255, $0, 0, GrampsScript_0x62f8f, EVENT_6E5 - person_event SPRITE_GRANNY, 7, 9, $8, $0, 255, 255, $80, 0, GrannyScript_0x62fc3, -1 + person_event SPRITE_GRAMPS, 7, 6, OW_LEFT | $1, $0, -1, -1, $0, 0, GrampsScript_0x62f8f, EVENT_DAYCARE_MAN_IN_DAYCARE + person_event SPRITE_GRANNY, 7, 9, OW_LEFT | $0, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, GrannyScript_0x62fc3, -1 diff --git a/maps/DiglettsCave.asm b/maps/DiglettsCave.asm index 539d336fe..65e44d06e 100644 --- a/maps/DiglettsCave.asm +++ b/maps/DiglettsCave.asm @@ -1,16 +1,15 @@ DiglettsCave_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 PokefanMScript_0x74002: jumptextfaceplayer UnknownText_0x74008 MapDiglettsCaveSignpostItem0: - dw $00e4 - db MAX_REVIVE + dwb EVENT_DIGLETTS_CAVE_HIDDEN_MAX_REVIVE, MAX_REVIVE UnknownText_0x74008: @@ -25,7 +24,7 @@ DiglettsCave_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 6 warp_def $21, $3, 10, GROUP_VERMILION_CITY, MAP_VERMILION_CITY warp_def $1f, $5, 5, GROUP_DIGLETTS_CAVE, MAP_DIGLETTS_CAVE @@ -34,13 +33,13 @@ DiglettsCave_MapEventHeader: warp_def $21, $11, 2, GROUP_DIGLETTS_CAVE, MAP_DIGLETTS_CAVE warp_def $3, $3, 4, GROUP_DIGLETTS_CAVE, MAP_DIGLETTS_CAVE - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 1 - signpost 11, 6, $7, MapDiglettsCaveSignpostItem0 + signpost 11, 6, SIGNPOST_ITEM, MapDiglettsCaveSignpostItem0 - ; people-events +.PersonEvents: db 1 - person_event SPRITE_POKEFAN_M, 35, 7, $6, $0, 255, 255, $0, 0, PokefanMScript_0x74002, -1 + person_event SPRITE_POKEFAN_M, 35, 7, OW_UP | $2, $0, -1, -1, $0, 0, PokefanMScript_0x74002, -1 diff --git a/maps/DragonShrine.asm b/maps/DragonShrine.asm index 5cde05b25..0136c24bc 100644 --- a/maps/DragonShrine.asm +++ b/maps/DragonShrine.asm @@ -1,93 +1,93 @@ DragonShrine_MapScriptHeader: - ; trigger count +.MapTriggers: db 2 ; triggers - dw UnknownScript_0x18d01e, $0000 - dw UnknownScript_0x18d022, $0000 + dw .Trigger1, $0000 + dw .Trigger2, $0000 - ; callback count +.MapCallbacks: db 0 -UnknownScript_0x18d01e: - priorityjump UnknownScript_0x18d023 +.Trigger1: + priorityjump DragonShrineTestScript end -UnknownScript_0x18d022: +.Trigger2: end -UnknownScript_0x18d023: +DragonShrineTestScript: applymovement $0, MovementData_0x18d2bf applymovement $2, MovementData_0x18d2c7 loadfont writetext UnknownText_0x18d2ea keeptextopen -UnknownScript_0x18d030: - setevent EVENT_001 +.Question1: + setevent EVENT_RECEIVED_BALLS_FROM_KURT writetext UnknownText_0x18d3bc keeptextopen loadmenudata MenuDataHeader_0x18d215 interpretmenu2 writebackup - if_equal $1, UnknownScript_0x18d0a9 - if_equal $2, UnknownScript_0x18d0cb - if_equal $3, UnknownScript_0x18d0a9 + if_equal $1, .RightAnswer + if_equal $2, .WrongAnswer + if_equal $3, .RightAnswer end -UnknownScript_0x18d049: - setevent EVENT_002 +.Question2: + setevent EVENT_DRAGON_SHRINE_QUESTION_2 writetext UnknownText_0x18d3d3 keeptextopen loadmenudata MenuDataHeader_0x18d234 interpretmenu2 writebackup - if_equal $1, UnknownScript_0x18d0a9 - if_equal $2, UnknownScript_0x18d0a9 - if_equal $3, UnknownScript_0x18d0cb -UnknownScript_0x18d061: - setevent EVENT_003 + if_equal $1, .RightAnswer + if_equal $2, .RightAnswer + if_equal $3, .WrongAnswer +.Question3: + setevent EVENT_DRAGON_SHRINE_QUESTION_3 writetext UnknownText_0x18d3f3 keeptextopen loadmenudata MenuDataHeader_0x18d258 interpretmenu2 writebackup - if_equal $1, UnknownScript_0x18d0cb - if_equal $2, UnknownScript_0x18d0a9 - if_equal $3, UnknownScript_0x18d0a9 -UnknownScript_0x18d079: - setevent EVENT_004 + if_equal $1, .WrongAnswer + if_equal $2, .RightAnswer + if_equal $3, .RightAnswer +.Question4: + setevent EVENT_DRAGON_SHRINE_QUESTION_4 writetext UnknownText_0x18d420 keeptextopen loadmenudata MenuDataHeader_0x18d283 interpretmenu2 writebackup - if_equal $1, UnknownScript_0x18d0a9 - if_equal $2, UnknownScript_0x18d0cb - if_equal $3, UnknownScript_0x18d0a9 -UnknownScript_0x18d091: - setevent EVENT_005 + if_equal $1, .RightAnswer + if_equal $2, .WrongAnswer + if_equal $3, .RightAnswer +.Question5: + setevent EVENT_DRAGON_SHRINE_QUESTION_5 writetext UnknownText_0x18d44a keeptextopen loadmenudata MenuDataHeader_0x18d2a5 interpretmenu2 writebackup - if_equal $1, UnknownScript_0x18d0cb - if_equal $2, UnknownScript_0x18d0a9 - if_equal $3, UnknownScript_0x18d0cb -UnknownScript_0x18d0a9: - checkevent EVENT_005 - iftrue UnknownScript_0x18d100 + if_equal $1, .WrongAnswer + if_equal $2, .RightAnswer + if_equal $3, .WrongAnswer +.RightAnswer: + checkevent EVENT_DRAGON_SHRINE_QUESTION_5 + iftrue .PassedTheTest writetext UnknownText_0x18d82d keeptextopen - checkevent EVENT_004 - iftrue UnknownScript_0x18d091 - checkevent EVENT_003 - iftrue UnknownScript_0x18d079 - checkevent EVENT_002 - iftrue UnknownScript_0x18d061 - checkevent EVENT_001 - iftrue UnknownScript_0x18d049 -UnknownScript_0x18d0cb: + checkevent EVENT_DRAGON_SHRINE_QUESTION_4 + iftrue .Question5 + checkevent EVENT_DRAGON_SHRINE_QUESTION_3 + iftrue .Question4 + checkevent EVENT_DRAGON_SHRINE_QUESTION_2 + iftrue .Question3 + checkevent EVENT_RECEIVED_BALLS_FROM_KURT + iftrue .Question2 +.WrongAnswer: loadmovesprites spriteface $2, LEFT loadfont @@ -101,22 +101,22 @@ UnknownScript_0x18d0cb: loadmovesprites setevent EVENT_ANSWERED_DRAGON_MASTER_QUIZ_WRONG loadfont - checkevent EVENT_005 - iftrue UnknownScript_0x18d091 - checkevent EVENT_004 - iftrue UnknownScript_0x18d079 - checkevent EVENT_003 - iftrue UnknownScript_0x18d061 - checkevent EVENT_002 - iftrue UnknownScript_0x18d049 - checkevent EVENT_001 - iftrue UnknownScript_0x18d030 -UnknownScript_0x18d100: + checkevent EVENT_DRAGON_SHRINE_QUESTION_5 + iftrue .Question5 + checkevent EVENT_DRAGON_SHRINE_QUESTION_4 + iftrue .Question4 + checkevent EVENT_DRAGON_SHRINE_QUESTION_3 + iftrue .Question3 + checkevent EVENT_DRAGON_SHRINE_QUESTION_2 + iftrue .Question2 + checkevent EVENT_RECEIVED_BALLS_FROM_KURT + iftrue .Question1 +.PassedTheTest: writetext UnknownText_0x18d47c closetext loadmovesprites playsound SFX_ENTER_DOOR - showemote $0, $0, 15 + showemote EMOTE_SHOCK, $0, 15 playmusic MUSIC_CLAIR appear $5 waitbutton @@ -147,7 +147,7 @@ UnknownScript_0x18d100: writetext UnknownText_0x18d520 closetext loadmovesprites - showemote $0, $5, 15 + showemote EMOTE_SHOCK, $5, 15 loadfont writetext UnknownText_0x18d9ae closetext @@ -160,7 +160,7 @@ UnknownScript_0x18d100: playsound SFX_GET_BADGE waitbutton special RestartMapMusic - specialphonecall $8 + specialphonecall ELMCALL_MASTERBALL dotrigger $1 domaptrigger GROUP_DRAGONS_DEN_B1F, MAP_DRAGONS_DEN_B1F, $1 writetext UnknownText_0x18d9f2 @@ -184,30 +184,30 @@ UnknownScript_0x18d100: playsound SFX_ENTER_DOOR disappear $5 waitbutton - setevent EVENT_000 + setevent EVENT_GAVE_KURT_APRICORNS end ElderScript_0x18d1a5: faceplayer loadfont - checkevent EVENT_000 - iftrue UnknownScript_0x18d1f9 - checkevent EVENT_006 - iftrue UnknownScript_0x18d1ff + checkevent EVENT_GAVE_KURT_APRICORNS + iftrue .DontGiveDratiniYet + checkevent EVENT_JUST_RECEIVED_DRATINI + iftrue .ReceivedDratini checkevent EVENT_GOT_DRATINI - iffalse UnknownScript_0x18d1c5 + iffalse .GiveDratini checkevent EVENT_BEAT_RIVAL_IN_MT_MOON - iftrue UnknownScript_0x18d1f3 + iftrue .BeatRivalInMtMoon writetext UnknownText_0x18d724 closetext loadmovesprites end -UnknownScript_0x18d1c5: +.GiveDratini: writetext UnknownText_0x18d604 closetext checkcode VAR_PARTYCOUNT - if_equal $6, UnknownScript_0x18d1ed + if_equal 6, .PartyFull writetext UnknownText_0x18d697 playsound SFX_CAUGHT_MON waitbutton @@ -215,31 +215,31 @@ UnknownScript_0x18d1c5: checkevent EVENT_ANSWERED_DRAGON_MASTER_QUIZ_WRONG special SpecialDratini setevent EVENT_GOT_DRATINI - setevent EVENT_006 + setevent EVENT_JUST_RECEIVED_DRATINI writetext UnknownText_0x18d6ca closetext loadmovesprites end -UnknownScript_0x18d1ed: +.PartyFull: writetext UnknownText_0x18d6ac closetext loadmovesprites end -UnknownScript_0x18d1f3: +.BeatRivalInMtMoon: writetext UnknownText_0x18d782 closetext loadmovesprites end -UnknownScript_0x18d1f9: +.DontGiveDratiniYet: writetext UnknownText_0x18d5e5 closetext loadmovesprites end -UnknownScript_0x18d1ff: +.ReceivedDratini: writetext UnknownText_0x18d6ca closetext loadmovesprites @@ -668,20 +668,20 @@ DragonShrine_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $9, $4, 2, GROUP_DRAGONS_DEN_B1F, MAP_DRAGONS_DEN_B1F warp_def $9, $5, 2, GROUP_DRAGONS_DEN_B1F, MAP_DRAGONS_DEN_B1F - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 4 - person_event SPRITE_ELDER, 5, 9, $6, $0, 255, 255, $0, 0, ElderScript_0x18d1a5, EVENT_000 - person_event SPRITE_ELDER, 8, 6, $9, $0, 255, 255, $0, 0, ElderScript_0x18d205, EVENT_000 - person_event SPRITE_ELDER, 8, 11, $8, $0, 255, 255, $0, 0, ElderScript_0x18d20d, EVENT_000 - person_event SPRITE_CLAIR, 12, 8, $7, $0, 255, 255, $90, 0, ObjectEvent, EVENT_790 + person_event SPRITE_ELDER, 5, 9, OW_UP | $2, $0, -1, -1, $0, 0, ElderScript_0x18d1a5, EVENT_GAVE_KURT_APRICORNS + person_event SPRITE_ELDER, 8, 6, OW_LEFT | $1, $0, -1, -1, $0, 0, ElderScript_0x18d205, EVENT_GAVE_KURT_APRICORNS + person_event SPRITE_ELDER, 8, 11, OW_LEFT | $0, $0, -1, -1, $0, 0, ElderScript_0x18d20d, EVENT_GAVE_KURT_APRICORNS + person_event SPRITE_CLAIR, 12, 8, OW_UP | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, ObjectEvent, EVENT_DRAGON_SHRINE_CLAIR diff --git a/maps/DragonsDen1F.asm b/maps/DragonsDen1F.asm index 22a4d86f3..de37ae8c8 100644 --- a/maps/DragonsDen1F.asm +++ b/maps/DragonsDen1F.asm @@ -1,26 +1,26 @@ DragonsDen1F_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 DragonsDen1F_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 4 warp_def $5, $3, 8, GROUP_BLACKTHORN_CITY, MAP_BLACKTHORN_CITY warp_def $3, $3, 4, GROUP_DRAGONS_DEN_1F, MAP_DRAGONS_DEN_1F warp_def $f, $5, 1, GROUP_DRAGONS_DEN_B1F, MAP_DRAGONS_DEN_B1F warp_def $d, $5, 2, GROUP_DRAGONS_DEN_1F, MAP_DRAGONS_DEN_1F - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 0 diff --git a/maps/DragonsDenB1F.asm b/maps/DragonsDenB1F.asm index 4261c1f97..5e2f2f71d 100644 --- a/maps/DragonsDenB1F.asm +++ b/maps/DragonsDenB1F.asm @@ -1,12 +1,12 @@ DragonsDenB1F_MapScriptHeader: - ; trigger count +.MapTriggers: db 2 ; triggers dw UnknownScript_0x18c89d, $0000 dw UnknownScript_0x18c89e, $0000 - ; callback count +.MapCallbacks: db 1 ; callbacks @@ -42,7 +42,7 @@ UnknownScript_0x18c8b8: writetext UnknownText_0x18c9b8 pause 30 loadmovesprites - showemote $0, $0, 15 + showemote EMOTE_SHOCK, $0, 15 spriteface $0, LEFT playmusic MUSIC_CLAIR applymovement $3, MovementData_0x18c9ae @@ -78,23 +78,7 @@ UnknownScript_0x18c8f9: end TrainerCooltrainermDarin: - ; bit/flag number - dw EVENT_BEAT_COOLTRAINERM_DARIN - - ; trainer group && trainer id - db COOLTRAINERM, DARIN - - ; text when seen - dw CooltrainermDarinSeenText - - ; text when trainer beaten - dw CooltrainermDarinBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw CooltrainermDarinScript + trainer EVENT_BEAT_COOLTRAINERM_DARIN, COOLTRAINERM, DARIN, CooltrainermDarinSeenText, CooltrainermDarinBeatenText, $0000, CooltrainermDarinScript CooltrainermDarinScript: talkaftercancel @@ -105,23 +89,7 @@ CooltrainermDarinScript: end TrainerCooltrainerfCara: - ; bit/flag number - dw EVENT_BEAT_COOLTRAINERF_CARA - - ; trainer group && trainer id - db COOLTRAINERF, CARA - - ; text when seen - dw CooltrainerfCaraSeenText - - ; text when trainer beaten - dw CooltrainerfCaraBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw CooltrainerfCaraScript + trainer EVENT_BEAT_COOLTRAINERF_CARA, COOLTRAINERF, CARA, CooltrainerfCaraSeenText, CooltrainerfCaraBeatenText, $0000, CooltrainerfCaraScript CooltrainerfCaraScript: talkaftercancel @@ -132,23 +100,7 @@ CooltrainerfCaraScript: end TrainerTwinsLeaandpia1: - ; bit/flag number - dw EVENT_BEAT_TWINS_LEA_AND_PIA - - ; trainer group && trainer id - db TWINS, LEAANDPIA1 - - ; text when seen - dw TwinsLeaandpia1SeenText - - ; text when trainer beaten - dw TwinsLeaandpia1BeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw TwinsLeaandpia1Script + trainer EVENT_BEAT_TWINS_LEA_AND_PIA, TWINS, LEAANDPIA1, TwinsLeaandpia1SeenText, TwinsLeaandpia1BeatenText, $0000, TwinsLeaandpia1Script TwinsLeaandpia1Script: talkaftercancel @@ -159,23 +111,7 @@ TwinsLeaandpia1Script: end TrainerTwinsLeaandpia2: - ; bit/flag number - dw EVENT_BEAT_TWINS_LEA_AND_PIA - - ; trainer group && trainer id - db TWINS, LEAANDPIA1 - - ; text when seen - dw TwinsLeaandpia2SeenText - - ; text when trainer beaten - dw TwinsLeaandpia2BeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw TwinsLeaandpia2Script + trainer EVENT_BEAT_TWINS_LEA_AND_PIA, TWINS, LEAANDPIA1, TwinsLeaandpia2SeenText, TwinsLeaandpia2BeatenText, $0000, TwinsLeaandpia2Script TwinsLeaandpia2Script: talkaftercancel @@ -212,12 +148,12 @@ SilverScript_0x18c97e: playmusic MUSIC_RIVAL_ENCOUNTER faceplayer loadfont - checkevent EVENT_000 + checkevent EVENT_GAVE_KURT_APRICORNS iftrue UnknownScript_0x18c995 writetext UnknownText_0x18cc83 closetext loadmovesprites - setevent EVENT_000 + setevent EVENT_GAVE_KURT_APRICORNS special RestartMapMusic end @@ -238,16 +174,13 @@ ItemFragment_0x18c9a3: db MAX_ELIXER, 1 MapDragonsDenB1FSignpostItem1: - dw $00a0 - db REVIVE + dwb EVENT_DRAGONS_DEN_B1F_HIDDEN_REVIVE, REVIVE MapDragonsDenB1FSignpostItem2: - dw $00a1 - db MAX_POTION + dwb EVENT_DRAGONS_DEN_B1F_HIDDEN_MAX_POTION, MAX_POTION MapDragonsDenB1FSignpostItem3: - dw $00a2 - db MAX_ELIXER + dwb EVENT_DRAGONS_DEN_B1F_HIDDEN_MAX_ELIXER, MAX_ELIXER MovementData_0x18c9ae: slow_step_right @@ -468,30 +401,30 @@ DragonsDenB1F_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $3, $14, 3, GROUP_DRAGONS_DEN_1F, MAP_DRAGONS_DEN_1F warp_def $1d, $13, 1, GROUP_DRAGON_SHRINE, MAP_DRAGON_SHRINE - ; xy triggers +.XYTriggers: db 1 xy_trigger 1, $1e, $13, $0, UnknownScript_0x18c8b8, $0, $0 - ; signposts +.Signposts: db 4 - signpost 24, 18, $0, MapDragonsDenB1FSignpost0Script - signpost 29, 33, $7, MapDragonsDenB1FSignpostItem1 - signpost 17, 21, $7, MapDragonsDenB1FSignpostItem2 - signpost 15, 31, $7, MapDragonsDenB1FSignpostItem3 + signpost 24, 18, SIGNPOST_READ, MapDragonsDenB1FSignpost0Script + signpost 29, 33, SIGNPOST_ITEM, MapDragonsDenB1FSignpostItem1 + signpost 17, 21, SIGNPOST_ITEM, MapDragonsDenB1FSignpostItem2 + signpost 15, 31, SIGNPOST_ITEM, MapDragonsDenB1FSignpostItem3 - ; people-events +.PersonEvents: db 9 - person_event SPRITE_POKE_BALL, 20, 39, $1, $0, 255, 255, $0, 0, PokeBallScript_0x18c95a, EVENT_6A8 - person_event SPRITE_CLAIR, 34, 18, $7, $0, 255, 255, $90, 0, ObjectEvent, EVENT_6D8 - person_event SPRITE_SILVER, 27, 24, $2, $22, 255, 255, $0, 0, SilverScript_0x18c97e, EVENT_6C6 - person_event SPRITE_COOLTRAINER_M, 12, 24, $7, $0, 255, 255, $82, 4, TrainerCooltrainermDarin, -1 - person_event SPRITE_COOLTRAINER_F, 12, 12, $6, $0, 255, 255, $82, 3, TrainerCooltrainerfCara, -1 - person_event SPRITE_TWIN, 21, 8, $9, $0, 255, 255, $82, 1, TrainerTwinsLeaandpia1, -1 - person_event SPRITE_TWIN, 22, 8, $9, $0, 255, 255, $82, 1, TrainerTwinsLeaandpia2, -1 - person_event SPRITE_POKE_BALL, 8, 34, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c9a1, EVENT_7BF - person_event SPRITE_POKE_BALL, 24, 9, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c9a3, EVENT_7C0 + person_event SPRITE_POKE_BALL, 20, 39, OW_DOWN | $1, $0, -1, -1, $0, 0, PokeBallScript_0x18c95a, EVENT_DRAGONS_DEN_B1F_DRAGON_FANG + person_event SPRITE_CLAIR, 34, 18, OW_UP | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, ObjectEvent, EVENT_DRAGONS_DEN_CLAIR + person_event SPRITE_SILVER, 27, 24, OW_DOWN | $2, $22, -1, -1, $0, 0, SilverScript_0x18c97e, EVENT_RIVAL_DRAGONS_DEN + person_event SPRITE_COOLTRAINER_M, 12, 24, OW_UP | $3, $0, -1, -1, (PAL_OW_RED << 4) | $82, 4, TrainerCooltrainermDarin, -1 + person_event SPRITE_COOLTRAINER_F, 12, 12, OW_UP | $2, $0, -1, -1, (PAL_OW_RED << 4) | $82, 3, TrainerCooltrainerfCara, -1 + person_event SPRITE_TWIN, 21, 8, OW_LEFT | $1, $0, -1, -1, (PAL_OW_RED << 4) | $82, 1, TrainerTwinsLeaandpia1, -1 + person_event SPRITE_TWIN, 22, 8, OW_LEFT | $1, $0, -1, -1, (PAL_OW_RED << 4) | $82, 1, TrainerTwinsLeaandpia2, -1 + person_event SPRITE_POKE_BALL, 8, 34, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x18c9a1, EVENT_DRAGONS_DEN_B1F_CALCIUM + person_event SPRITE_POKE_BALL, 24, 9, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x18c9a3, EVENT_DRAGONS_DEN_B1F_MAX_ELIXER diff --git a/maps/EarlsPokemonAcademy.asm b/maps/EarlsPokemonAcademy.asm index a3538d3eb..f91725c5e 100644 --- a/maps/EarlsPokemonAcademy.asm +++ b/maps/EarlsPokemonAcademy.asm @@ -1,8 +1,8 @@ EarlsPokemonAcademy_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 AcademyEarl: @@ -408,26 +408,26 @@ EarlsPokemonAcademy_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $f, $3, 3, GROUP_VIOLET_CITY, MAP_VIOLET_CITY warp_def $f, $4, 3, GROUP_VIOLET_CITY, MAP_VIOLET_CITY - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 4 - signpost 1, 0, $0, AcademyBookshelf - signpost 1, 1, $0, AcademyBookshelf - signpost 0, 3, $0, AcademyBlackboard - signpost 0, 4, $0, AcademyBlackboard + signpost 1, 0, SIGNPOST_READ, AcademyBookshelf + signpost 1, 1, SIGNPOST_READ, AcademyBookshelf + signpost 0, 3, SIGNPOST_READ, AcademyBlackboard + signpost 0, 4, SIGNPOST_READ, AcademyBlackboard - ; people-events +.PersonEvents: db 6 - person_event SPRITE_FISHER, 6, 8, $6, $0, 255, 255, $a0, 0, AcademyEarl, EVENT_6CB - person_event SPRITE_YOUNGSTER, 9, 6, $7, $0, 255, 255, $80, 0, YoungsterScript_0x68a83, -1 - person_event SPRITE_GAMEBOY_KID, 15, 7, $6, $0, 255, 255, $0, 0, GameboyKidScript_0x68a86, -1 - person_event SPRITE_GAMEBOY_KID, 15, 8, $8, $0, 255, 255, $80, 0, GameboyKidScript_0x68a91, -1 - person_event SPRITE_YOUNGSTER, 11, 8, $7, $0, 255, 255, $0, 0, YoungsterScript_0x68a9c, -1 - person_event SPRITE_POKEDEX, 8, 6, $1, $0, 255, 255, $0, 0, AcademyNotebook, -1 + person_event SPRITE_FISHER, 6, 8, OW_UP | $2, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, AcademyEarl, EVENT_EARLS_ACADEMY_EARL + person_event SPRITE_YOUNGSTER, 9, 6, OW_UP | $3, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, YoungsterScript_0x68a83, -1 + person_event SPRITE_GAMEBOY_KID, 15, 7, OW_UP | $2, $0, -1, -1, $0, 0, GameboyKidScript_0x68a86, -1 + person_event SPRITE_GAMEBOY_KID, 15, 8, OW_LEFT | $0, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, GameboyKidScript_0x68a91, -1 + person_event SPRITE_YOUNGSTER, 11, 8, OW_UP | $3, $0, -1, -1, $0, 0, YoungsterScript_0x68a9c, -1 + person_event SPRITE_POKEDEX, 8, 6, OW_DOWN | $1, $0, -1, -1, $0, 0, AcademyNotebook, -1 diff --git a/maps/EcruteakCity.asm b/maps/EcruteakCity.asm index d7cbf3234..542b23c7b 100644 --- a/maps/EcruteakCity.asm +++ b/maps/EcruteakCity.asm @@ -1,8 +1,8 @@ EcruteakCity_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 1 ; callbacks @@ -81,8 +81,7 @@ EcruteakCityMartSign: jumpstd martsign MapEcruteakCitySignpostItem7: - dw $00b4 - db HYPER_POTION + dwb EVENT_ECRUTEAK_CITY_HIDDEN_HYPER_POTION, HYPER_POTION UnusedMissingDaughterText: ; This text is neither used nor referenced in the final game. @@ -257,7 +256,7 @@ EcruteakCity_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 15 warp_def $1a, $23, 1, GROUP_ROUTE_42_ECRUTEAK_GATE, MAP_ROUTE_42_ECRUTEAK_GATE warp_def $1b, $23, 2, GROUP_ROUTE_42_ECRUTEAK_GATE, MAP_ROUTE_42_ECRUTEAK_GATE @@ -275,26 +274,26 @@ EcruteakCity_MapEventHeader: warp_def $12, $0, 3, GROUP_ROUTE_38_ECRUTEAK_GATE, MAP_ROUTE_38_ECRUTEAK_GATE warp_def $13, $0, 4, GROUP_ROUTE_38_ECRUTEAK_GATE, MAP_ROUTE_38_ECRUTEAK_GATE - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 8 - signpost 21, 15, $0, EcruteakCitySign - signpost 10, 38, $0, TinTowerSign - signpost 28, 8, $0, EcruteakGymSign - signpost 21, 21, $0, EcruteakDanceTheaterSign - signpost 10, 2, $0, BurnedTowerSign - signpost 27, 24, $0, EcruteakCityPokeCenterSign - signpost 21, 30, $0, EcruteakCityMartSign - signpost 14, 23, $7, MapEcruteakCitySignpostItem7 - - ; people-events + signpost 21, 15, SIGNPOST_READ, EcruteakCitySign + signpost 10, 38, SIGNPOST_READ, TinTowerSign + signpost 28, 8, SIGNPOST_READ, EcruteakGymSign + signpost 21, 21, SIGNPOST_READ, EcruteakDanceTheaterSign + signpost 10, 2, SIGNPOST_READ, BurnedTowerSign + signpost 27, 24, SIGNPOST_READ, EcruteakCityPokeCenterSign + signpost 21, 30, SIGNPOST_READ, EcruteakCityMartSign + signpost 14, 23, SIGNPOST_ITEM, MapEcruteakCitySignpostItem7 + +.PersonEvents: db 7 - person_event SPRITE_GRAMPS, 19, 22, $2, $11, 255, 255, $0, 0, GrampsScript_0x1a4009, -1 - person_event SPRITE_GRAMPS, 25, 24, $3, $0, 255, 255, $0, 0, GrampsScript_0x1a400c, -1 - person_event SPRITE_LASS, 33, 25, $5, $2, 255, 255, $90, 0, LassScript_0x1a4012, -1 - person_event SPRITE_LASS, 13, 7, $7, $0, 255, 255, $0, 0, LassScript_0x1a4015, -1 - person_event SPRITE_FISHER, 26, 13, $5, $1, 255, 255, $a0, 0, FisherScript_0x1a4029, -1 - person_event SPRITE_YOUNGSTER, 18, 14, $2, $11, 255, 255, $80, 0, YoungsterScript_0x1a403d, -1 - person_event SPRITE_GRAMPS, 11, 7, $2, $11, 255, 255, $a0, 0, GrampsScript_0x1a400f, EVENT_7A9 + person_event SPRITE_GRAMPS, 19, 22, OW_DOWN | $2, $11, -1, -1, $0, 0, GrampsScript_0x1a4009, -1 + person_event SPRITE_GRAMPS, 25, 24, OW_DOWN | $3, $0, -1, -1, $0, 0, GrampsScript_0x1a400c, -1 + person_event SPRITE_LASS, 33, 25, OW_UP | $1, $2, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, LassScript_0x1a4012, -1 + person_event SPRITE_LASS, 13, 7, OW_UP | $3, $0, -1, -1, $0, 0, LassScript_0x1a4015, -1 + person_event SPRITE_FISHER, 26, 13, OW_UP | $1, $1, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, FisherScript_0x1a4029, -1 + person_event SPRITE_YOUNGSTER, 18, 14, OW_DOWN | $2, $11, -1, -1, (PAL_OW_RED << 4) | $80, 0, YoungsterScript_0x1a403d, -1 + person_event SPRITE_GRAMPS, 11, 7, OW_DOWN | $2, $11, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, GrampsScript_0x1a400f, EVENT_ECRUTEAK_CITY_GRAMPS diff --git a/maps/EcruteakGym.asm b/maps/EcruteakGym.asm index 1655f9c65..f6c46f587 100644 --- a/maps/EcruteakGym.asm +++ b/maps/EcruteakGym.asm @@ -1,12 +1,12 @@ EcruteakGym_MapScriptHeader: - ; trigger count +.MapTriggers: db 2 ; triggers dw UnknownScript_0x99d53, $0000 dw UnknownScript_0x99d57, $0000 - ; callback count +.MapCallbacks: db 0 UnknownScript_0x99d53: @@ -37,8 +37,8 @@ MortyScript_0x99d58: checkcode VAR_BADGES scall EcruteakGymTriggerRockets domaptrigger GROUP_ECRUTEAK_HOUSE, MAP_ECRUTEAK_HOUSE, $1 - setevent EVENT_766 - setevent EVENT_RANG_CLEAR_BELL + setevent EVENT_RANG_CLEAR_BELL_1 + setevent EVENT_RANG_CLEAR_BELL_2 .FightDone checkevent EVENT_GOT_TM30_SHADOW_BALL iftrue UnknownScript_0x99db1 @@ -84,30 +84,14 @@ UnknownScript_0x99dc6: follow $0, $8 applymovement $0, MovementData_0x99e5f stopfollow - special Function8c084 + special FadeBlackBGMap playsound SFX_ENTER_DOOR waitbutton warp GROUP_ECRUTEAK_CITY, MAP_ECRUTEAK_CITY, $6, $1b end TrainerSageJeffrey: - ; bit/flag number - dw EVENT_BEAT_SAGE_JEFFREY - - ; trainer group && trainer id - db SAGE, JEFFREY - - ; text when seen - dw SageJeffreySeenText - - ; text when trainer beaten - dw SageJeffreyBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw SageJeffreyScript + trainer EVENT_BEAT_SAGE_JEFFREY, SAGE, JEFFREY, SageJeffreySeenText, SageJeffreyBeatenText, $0000, SageJeffreyScript SageJeffreyScript: talkaftercancel @@ -118,23 +102,7 @@ SageJeffreyScript: end TrainerSagePing: - ; bit/flag number - dw EVENT_BEAT_SAGE_PING - - ; trainer group && trainer id - db SAGE, PING - - ; text when seen - dw SagePingSeenText - - ; text when trainer beaten - dw SagePingBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw SagePingScript + trainer EVENT_BEAT_SAGE_PING, SAGE, PING, SagePingSeenText, SagePingBeatenText, $0000, SagePingScript SagePingScript: talkaftercancel @@ -145,23 +113,7 @@ SagePingScript: end TrainerMediumMartha: - ; bit/flag number - dw EVENT_BEAT_MEDIUM_MARTHA - - ; trainer group && trainer id - db MEDIUM, MARTHA - - ; text when seen - dw MediumMarthaSeenText - - ; text when trainer beaten - dw MediumMarthaBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw MediumMarthaScript + trainer EVENT_BEAT_MEDIUM_MARTHA, MEDIUM, MARTHA, MediumMarthaSeenText, MediumMarthaBeatenText, $0000, MediumMarthaScript MediumMarthaScript: talkaftercancel @@ -172,23 +124,7 @@ MediumMarthaScript: end TrainerMediumGrace: - ; bit/flag number - dw EVENT_BEAT_MEDIUM_GRACE - - ; trainer group && trainer id - db MEDIUM, GRACE - - ; text when seen - dw MediumGraceSeenText - - ; text when trainer beaten - dw MediumGraceBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw MediumGraceScript + trainer EVENT_BEAT_MEDIUM_GRACE, MEDIUM, GRACE, MediumGraceSeenText, MediumGraceBeatenText, $0000, MediumGraceScript MediumGraceScript: talkaftercancel @@ -447,7 +383,7 @@ EcruteakGym_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 33 warp_def $11, $4, 10, GROUP_ECRUTEAK_CITY, MAP_ECRUTEAK_CITY warp_def $11, $5, 10, GROUP_ECRUTEAK_CITY, MAP_ECRUTEAK_CITY @@ -483,20 +419,20 @@ EcruteakGym_MapEventHeader: warp_def $c, $7, 3, GROUP_ECRUTEAK_GYM, MAP_ECRUTEAK_GYM warp_def $d, $7, 3, GROUP_ECRUTEAK_GYM, MAP_ECRUTEAK_GYM - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 2 - signpost 15, 3, $0, EcruteakGymStatue - signpost 15, 6, $0, EcruteakGymStatue + signpost 15, 3, SIGNPOST_READ, EcruteakGymStatue + signpost 15, 6, SIGNPOST_READ, EcruteakGymStatue - ; people-events +.PersonEvents: db 7 - person_event SPRITE_MORTY, 5, 9, $6, $0, 255, 255, $b0, 0, MortyScript_0x99d58, -1 - person_event SPRITE_SAGE, 11, 6, $9, $0, 255, 255, $92, 1, TrainerSageJeffrey, -1 - person_event SPRITE_SAGE, 17, 7, $9, $0, 255, 255, $92, 3, TrainerSagePing, -1 - person_event SPRITE_GRANNY, 9, 11, $8, $0, 255, 255, $b2, 1, TrainerMediumMartha, -1 - person_event SPRITE_GRANNY, 13, 11, $8, $0, 255, 255, $b2, 1, TrainerMediumGrace, -1 - person_event SPRITE_GYM_GUY, 19, 11, $6, $0, 255, 255, $80, 0, EcruteakGymGuyScript, -1 - person_event SPRITE_GRAMPS, 18, 8, $6, $0, 255, 255, $a0, 0, ObjectEvent, EVENT_7A8 + person_event SPRITE_MORTY, 5, 9, OW_UP | $2, $0, -1, -1, (PAL_OW_BROWN << 4) | $80, 0, MortyScript_0x99d58, -1 + person_event SPRITE_SAGE, 11, 6, OW_LEFT | $1, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 1, TrainerSageJeffrey, -1 + person_event SPRITE_SAGE, 17, 7, OW_LEFT | $1, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 3, TrainerSagePing, -1 + person_event SPRITE_GRANNY, 9, 11, OW_LEFT | $0, $0, -1, -1, (PAL_OW_BROWN << 4) | $82, 1, TrainerMediumMartha, -1 + person_event SPRITE_GRANNY, 13, 11, OW_LEFT | $0, $0, -1, -1, (PAL_OW_BROWN << 4) | $82, 1, TrainerMediumGrace, -1 + person_event SPRITE_GYM_GUY, 19, 11, OW_UP | $2, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, EcruteakGymGuyScript, -1 + person_event SPRITE_GRAMPS, 18, 8, OW_UP | $2, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, ObjectEvent, EVENT_ECRUTEAK_GYM_GRAMPS diff --git a/maps/EcruteakHouse.asm b/maps/EcruteakHouse.asm index 31e2f6d42..314394cf7 100644 --- a/maps/EcruteakHouse.asm +++ b/maps/EcruteakHouse.asm @@ -1,50 +1,50 @@ EcruteakHouse_MapScriptHeader: - ; trigger count +.MapTriggers: db 2 ; triggers - dw UnknownScript_0x9800d, $0000 - dw UnknownScript_0x9800e, $0000 + dw .Trigger1, $0000 + dw .Trigger2, $0000 - ; callback count +.MapCallbacks: db 1 ; callbacks - dbw 2, UnknownScript_0x9800f + dbw 2, .InitializeSages -UnknownScript_0x9800d: +.Trigger1: end -UnknownScript_0x9800e: +.Trigger2: end -UnknownScript_0x9800f: +.InitializeSages: checkevent EVENT_FOUGHT_SUICUNE - iftrue UnknownScript_0x98033 + iftrue .DontBlockTower checkevent EVENT_KOJI_ALLOWS_YOU_PASSAGE_TO_TIN_TOWER - iftrue UnknownScript_0x98033 + iftrue .DontBlockTower checkevent EVENT_CLEARED_RADIO_TOWER - iftrue UnknownScript_0x98022 + iftrue .BlockTower return -UnknownScript_0x98022: - clearevent EVENT_766 - setevent EVENT_RANG_CLEAR_BELL - setevent EVENT_7B1 +.BlockTower: + clearevent EVENT_RANG_CLEAR_BELL_1 + setevent EVENT_RANG_CLEAR_BELL_2 + setevent EVENT_ECRUTEAK_HOUSE_WANDERING_SAGE checkitem CLEAR_BELL - iftrue UnknownScript_0x98032 + iftrue .NoClearBell dotrigger $0 -UnknownScript_0x98032: +.NoClearBell: return -UnknownScript_0x98033: - clearevent EVENT_7B1 +.DontBlockTower: + clearevent EVENT_ECRUTEAK_HOUSE_WANDERING_SAGE return -UnknownScript_0x98037: - checkevent EVENT_RANG_CLEAR_BELL - iftrue UnknownScript_0x98061 +EcruteakHouse_XYTrigger1: + checkevent EVENT_RANG_CLEAR_BELL_2 + iftrue EcruteakHouse_XYTrigger_DontMove applymovement $3, MovementData_0x980c7 moveperson $2, $4, $6 appear $2 @@ -52,9 +52,9 @@ UnknownScript_0x98037: disappear $3 end -UnknownScript_0x9804c: - checkevent EVENT_766 - iftrue UnknownScript_0x98061 +EcruteakHouse_XYTrigger2: + checkevent EVENT_RANG_CLEAR_BELL_1 + iftrue EcruteakHouse_XYTrigger_DontMove applymovement $2, MovementData_0x980cc moveperson $3, $5, $6 appear $3 @@ -62,56 +62,56 @@ UnknownScript_0x9804c: disappear $2 end -UnknownScript_0x98061: +EcruteakHouse_XYTrigger_DontMove: end SageScript_0x98062: faceplayer loadfont checkevent EVENT_CLEARED_RADIO_TOWER - iftrue UnknownScript_0x9807c + iftrue .CheckForClearBell checkflag ENGINE_FOGBADGE - iftrue UnknownScript_0x98076 + iftrue .BlockPassage_GotFogBadge writetext UnknownText_0x980d1 closetext loadmovesprites end -UnknownScript_0x98076: +.BlockPassage_GotFogBadge: writetext UnknownText_0x98131 closetext loadmovesprites end -UnknownScript_0x9807c: +.CheckForClearBell: checkevent EVENT_KOJI_ALLOWS_YOU_PASSAGE_TO_TIN_TOWER - iftrue UnknownScript_0x980a4 - checkevent EVENT_000 - iftrue UnknownScript_0x980aa + iftrue .AllowedThrough + checkevent EVENT_GAVE_KURT_APRICORNS + iftrue .Event000 checkitem CLEAR_BELL - iftrue UnknownScript_0x98093 + iftrue .RingClearBell writetext UnknownText_0x981a4 closetext loadmovesprites end -UnknownScript_0x98093: +.RingClearBell: writetext UnknownText_0x98250 closetext loadmovesprites dotrigger $1 - setevent EVENT_RANG_CLEAR_BELL - clearevent EVENT_766 - setevent EVENT_000 + setevent EVENT_RANG_CLEAR_BELL_2 + clearevent EVENT_RANG_CLEAR_BELL_1 + setevent EVENT_GAVE_KURT_APRICORNS end -UnknownScript_0x980a4: +.AllowedThrough: writetext UnknownText_0x9837e closetext loadmovesprites end -UnknownScript_0x980aa: +.Event000: writetext UnknownText_0x98391 closetext loadmovesprites @@ -121,13 +121,13 @@ SageScript_0x980b0: faceplayer loadfont checkevent EVENT_GOT_CLEAR_BELL - iftrue UnknownScript_0x980be + iftrue .GotClearBell writetext UnknownText_0x9840b closetext loadmovesprites end -UnknownScript_0x980be: +.GotClearBell: writetext UnknownText_0x9846f closetext loadmovesprites @@ -280,7 +280,7 @@ EcruteakHouse_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 5 warp_def $11, $4, 3, GROUP_ECRUTEAK_CITY, MAP_ECRUTEAK_CITY warp_def $11, $5, 3, GROUP_ECRUTEAK_CITY, MAP_ECRUTEAK_CITY @@ -288,17 +288,17 @@ EcruteakHouse_MapEventHeader: warp_def $f, $11, 3, GROUP_ECRUTEAK_HOUSE, MAP_ECRUTEAK_HOUSE warp_def $3, $11, 3, GROUP_WISE_TRIOS_ROOM, MAP_WISE_TRIOS_ROOM - ; xy triggers +.XYTriggers: db 2 - xy_trigger 0, $7, $4, $0, UnknownScript_0x98037, $0, $0 - xy_trigger 0, $7, $5, $0, UnknownScript_0x9804c, $0, $0 + xy_trigger 0, $7, $4, $0, EcruteakHouse_XYTrigger1, $0, $0 + xy_trigger 0, $7, $5, $0, EcruteakHouse_XYTrigger2, $0, $0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 4 - person_event SPRITE_SAGE, 10, 8, $6, $0, 255, 255, $0, 0, SageScript_0x98062, EVENT_766 - person_event SPRITE_SAGE, 10, 9, $6, $0, 255, 255, $0, 0, SageScript_0x98062, EVENT_RANG_CLEAR_BELL - person_event SPRITE_SAGE, 13, 10, $2, $11, 255, 255, $0, 0, SageScript_0x980b0, EVENT_7B1 - person_event SPRITE_GRAMPS, 15, 7, $2, $11, 255, 255, $0, 0, GrampsScript_0x980c4, EVENT_7B1 + person_event SPRITE_SAGE, 10, 8, OW_UP | $2, $0, -1, -1, $0, 0, SageScript_0x98062, EVENT_RANG_CLEAR_BELL_1 + person_event SPRITE_SAGE, 10, 9, OW_UP | $2, $0, -1, -1, $0, 0, SageScript_0x98062, EVENT_RANG_CLEAR_BELL_2 + person_event SPRITE_SAGE, 13, 10, OW_DOWN | $2, $11, -1, -1, $0, 0, SageScript_0x980b0, EVENT_ECRUTEAK_HOUSE_WANDERING_SAGE + person_event SPRITE_GRAMPS, 15, 7, OW_DOWN | $2, $11, -1, -1, $0, 0, GrampsScript_0x980c4, EVENT_ECRUTEAK_HOUSE_WANDERING_SAGE diff --git a/maps/EcruteakItemfinderHouse.asm b/maps/EcruteakItemfinderHouse.asm index ddbb1c7fd..358abdf13 100644 --- a/maps/EcruteakItemfinderHouse.asm +++ b/maps/EcruteakItemfinderHouse.asm @@ -1,8 +1,8 @@ EcruteakItemfinderHouse_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 CooltrainerMScript_0x9a5fb: @@ -162,19 +162,19 @@ EcruteakItemfinderHouse_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $7, $3, 11, GROUP_ECRUTEAK_CITY, MAP_ECRUTEAK_CITY warp_def $7, $4, 11, GROUP_ECRUTEAK_CITY, MAP_ECRUTEAK_CITY - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 1 - signpost 1, 2, $0, ItemFinderHouseRadio + signpost 1, 2, SIGNPOST_READ, ItemFinderHouseRadio - ; people-events +.PersonEvents: db 2 - person_event SPRITE_COOLTRAINER_M, 7, 6, $6, $0, 255, 255, $80, 0, CooltrainerMScript_0x9a5fb, -1 - person_event SPRITE_POKEDEX, 7, 7, $1, $0, 255, 255, $0, 0, PokedexScript_0x9a620, -1 + person_event SPRITE_COOLTRAINER_M, 7, 6, OW_UP | $2, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, CooltrainerMScript_0x9a5fb, -1 + person_event SPRITE_POKEDEX, 7, 7, OW_DOWN | $1, $0, -1, -1, $0, 0, PokedexScript_0x9a620, -1 diff --git a/maps/EcruteakLugiaSpeechHouse.asm b/maps/EcruteakLugiaSpeechHouse.asm index 039f24f41..be6623449 100644 --- a/maps/EcruteakLugiaSpeechHouse.asm +++ b/maps/EcruteakLugiaSpeechHouse.asm @@ -1,8 +1,8 @@ EcruteakLugiaSpeechHouse_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 GrampsScript_0x99334: @@ -44,19 +44,19 @@ EcruteakLugiaSpeechHouse_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $7, $3, 7, GROUP_ECRUTEAK_CITY, MAP_ECRUTEAK_CITY warp_def $7, $4, 7, GROUP_ECRUTEAK_CITY, MAP_ECRUTEAK_CITY - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 1 - signpost 1, 2, $0, LugiaSpeechHouseRadio + signpost 1, 2, SIGNPOST_READ, LugiaSpeechHouseRadio - ; people-events +.PersonEvents: db 2 - person_event SPRITE_GRAMPS, 7, 6, $3, $0, 255, 255, $0, 0, GrampsScript_0x99334, -1 - person_event SPRITE_YOUNGSTER, 8, 9, $8, $0, 255, 255, $0, 0, YoungsterScript_0x99337, -1 + person_event SPRITE_GRAMPS, 7, 6, OW_DOWN | $3, $0, -1, -1, $0, 0, GrampsScript_0x99334, -1 + person_event SPRITE_YOUNGSTER, 8, 9, OW_LEFT | $0, $0, -1, -1, $0, 0, YoungsterScript_0x99337, -1 diff --git a/maps/EcruteakMart.asm b/maps/EcruteakMart.asm index 2da460581..63fd8ed48 100644 --- a/maps/EcruteakMart.asm +++ b/maps/EcruteakMart.asm @@ -1,8 +1,8 @@ EcruteakMart_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 ClerkScript_0x99c3b: @@ -44,19 +44,19 @@ EcruteakMart_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $7, $2, 9, GROUP_ECRUTEAK_CITY, MAP_ECRUTEAK_CITY warp_def $7, $3, 9, GROUP_ECRUTEAK_CITY, MAP_ECRUTEAK_CITY - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 3 - person_event SPRITE_CLERK, 7, 5, $9, $0, 255, 255, $0, 0, ClerkScript_0x99c3b, -1 - person_event SPRITE_SUPER_NERD, 6, 9, $5, $1, 255, 255, $a0, 0, SuperNerdScript_0x99c42, -1 - person_event SPRITE_GRANNY, 10, 10, $7, $0, 255, 255, $0, 0, GrannyScript_0x99c45, -1 + person_event SPRITE_CLERK, 7, 5, OW_LEFT | $1, $0, -1, -1, $0, 0, ClerkScript_0x99c3b, -1 + person_event SPRITE_SUPER_NERD, 6, 9, OW_UP | $1, $1, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, SuperNerdScript_0x99c42, -1 + person_event SPRITE_GRANNY, 10, 10, OW_UP | $3, $0, -1, -1, $0, 0, GrannyScript_0x99c45, -1 diff --git a/maps/EcruteakPokeCenter1F.asm b/maps/EcruteakPokeCenter1F.asm index 6b9919469..68057be2c 100644 --- a/maps/EcruteakPokeCenter1F.asm +++ b/maps/EcruteakPokeCenter1F.asm @@ -1,12 +1,12 @@ EcruteakPokeCenter1F_MapScriptHeader: - ; trigger count +.MapTriggers: db 2 ; triggers dw UnknownScript_0x98e5f, $0000 dw UnknownScript_0x98e63, $0000 - ; callback count +.MapCallbacks: db 0 UnknownScript_0x98e5f: @@ -205,22 +205,22 @@ EcruteakPokeCenter1F_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 3 warp_def $7, $3, 6, GROUP_ECRUTEAK_CITY, MAP_ECRUTEAK_CITY warp_def $7, $4, 6, GROUP_ECRUTEAK_CITY, MAP_ECRUTEAK_CITY warp_def $7, $0, 1, GROUP_POKECENTER_2F, MAP_POKECENTER_2F - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 5 - person_event SPRITE_NURSE, 5, 7, $6, $0, 255, 255, $0, 0, NurseScript_0x98eb0, -1 - person_event SPRITE_POKEFAN_M, 10, 11, $a, $0, 255, 255, $0, 0, PokefanMScript_0x98eb3, -1 - person_event SPRITE_COOLTRAINER_F, 8, 5, $3, $0, 255, 255, $0, 0, CooltrainerFScript_0x98ebf, -1 - person_event SPRITE_GYM_GUY, 5, 11, $6, $0, 255, 255, $a0, 0, GymGuyScript_0x98ec2, -1 - person_event SPRITE_BILL, 11, 4, $9, $0, 255, 255, $0, 0, ObjectEvent, EVENT_713 + person_event SPRITE_NURSE, 5, 7, OW_UP | $2, $0, -1, -1, $0, 0, NurseScript_0x98eb0, -1 + person_event SPRITE_POKEFAN_M, 10, 11, OW_LEFT | $2, $0, -1, -1, $0, 0, PokefanMScript_0x98eb3, -1 + person_event SPRITE_COOLTRAINER_F, 8, 5, OW_DOWN | $3, $0, -1, -1, $0, 0, CooltrainerFScript_0x98ebf, -1 + person_event SPRITE_GYM_GUY, 5, 11, OW_UP | $2, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, GymGuyScript_0x98ec2, -1 + person_event SPRITE_BILL, 11, 4, OW_LEFT | $1, $0, -1, -1, $0, 0, ObjectEvent, EVENT_ECRUTEAK_POKE_CENTER_BILL diff --git a/maps/ElmsHouse.asm b/maps/ElmsHouse.asm index d47a725d8..ff0c971a7 100644 --- a/maps/ElmsHouse.asm +++ b/maps/ElmsHouse.asm @@ -1,8 +1,8 @@ ElmsHouse_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 ElmsWife: @@ -83,21 +83,21 @@ ElmsHouse_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $7, $2, 4, GROUP_NEW_BARK_TOWN, MAP_NEW_BARK_TOWN warp_def $7, $3, 4, GROUP_NEW_BARK_TOWN, MAP_NEW_BARK_TOWN - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 3 - signpost 1, 0, $0, ElmsHousePC - signpost 1, 6, $0, ElmsHouseBookshelf - signpost 1, 7, $0, ElmsHouseBookshelf + signpost 1, 0, SIGNPOST_READ, ElmsHousePC + signpost 1, 6, SIGNPOST_READ, ElmsHouseBookshelf + signpost 1, 7, SIGNPOST_READ, ElmsHouseBookshelf - ; people-events +.PersonEvents: db 2 - person_event SPRITE_TEACHER, 9, 5, $4, $10, 255, 255, $a0, 0, ElmsWife, -1 - person_event SPRITE_BUG_CATCHER, 8, 9, $7, $0, 255, 255, $0, 0, ElmsSon, -1 + person_event SPRITE_TEACHER, 9, 5, OW_UP | $0, $10, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, ElmsWife, -1 + person_event SPRITE_BUG_CATCHER, 8, 9, OW_UP | $3, $0, -1, -1, $0, 0, ElmsSon, -1 diff --git a/maps/ElmsLab.asm b/maps/ElmsLab.asm index e2368ab0d..d6c242e4a 100644 --- a/maps/ElmsLab.asm +++ b/maps/ElmsLab.asm @@ -1,5 +1,5 @@ ElmsLab_MapScriptHeader: - ; trigger count +.MapTriggers: db 6 ; triggers @@ -10,15 +10,15 @@ ElmsLab_MapScriptHeader: dw UnknownScript_0x78b81, $0000 dw UnknownScript_0x78b82, $0000 - ; callback count +.MapCallbacks: db 1 ; callbacks - dbw 2, UnknownScript_0x78b83 + dbw 2, ElmsLab_PutElmAtLaptop UnknownScript_0x78b7a: - priorityjump UnknownScript_0x78b8c + priorityjump ElmsLab_AutowalkUpToElm end UnknownScript_0x78b7e: @@ -36,50 +36,50 @@ UnknownScript_0x78b81: UnknownScript_0x78b82: end -UnknownScript_0x78b83: +ElmsLab_PutElmAtLaptop: checktriggers - iftrue UnknownScript_0x78b8b + iftrue .Skip moveperson $2, $3, $4 -UnknownScript_0x78b8b: +.Skip: return -UnknownScript_0x78b8c: - applymovement $0, MovementData_0x78f67 - showemote $0, $2, 15 +ElmsLab_AutowalkUpToElm: + applymovement $0, ElmsLab_WalkUpToElmMovement + showemote EMOTE_SHOCK, $2, 15 spriteface $2, RIGHT loadfont - writetext UnknownText_0x78fb6 -UnknownScript_0x78b9b: + writetext ElmText_Intro +ElmsLab_RefuseLoop: yesorno - iftrue UnknownScript_0x78ba5 - writetext UnknownText_0x7911a - jump UnknownScript_0x78b9b + iftrue ElmsLab_ElmGetsEmail + writetext ElmText_Refused + jump ElmsLab_RefuseLoop -UnknownScript_0x78ba5: - writetext UnknownText_0x790fa +ElmsLab_ElmGetsEmail: + writetext ElmText_Accepted keeptextopen - writetext UnknownText_0x7913a + writetext ElmText_ResearchAmbitions closetext loadmovesprites playsound SFX_GLASS_TING pause 30 - showemote $0, $2, 10 + showemote EMOTE_SHOCK, $2, 10 spriteface $2, DOWN loadfont - writetext UnknownText_0x791ae + writetext ElmText_GotAnEmail closetext loadmovesprites loadfont spriteface $2, RIGHT - writetext UnknownText_0x791df + writetext ElmText_MissionFromMrPokemon closetext loadmovesprites - applymovement $2, MovementData_0x78fa0 + applymovement $2, ElmsLab_ElmToDefaultPositionMovement1 spriteface $0, UP - applymovement $2, MovementData_0x78fa2 + applymovement $2, ElmsLab_ElmToDefaultPositionMovement2 spriteface $0, RIGHT loadfont - writetext UnknownText_0x792ff + writetext ElmText_ChooseAPokemon closetext dotrigger $1 loadmovesprites @@ -89,21 +89,21 @@ ProfElmScript: faceplayer loadfont checkevent EVENT_GOT_SS_TICKET_FROM_ELM - iftrue UnknownScript_0x78bee + iftrue ElmCheckMasterBall checkevent EVENT_BEAT_ELITE_FOUR iftrue ElmGiveTicketScript -UnknownScript_0x78bee: +ElmCheckMasterBall: checkevent EVENT_GOT_MASTER_BALL_FROM_ELM - iftrue UnknownScript_0x78bfa + iftrue ElmCheckEverstone checkflag ENGINE_RISINGBADGE iftrue ElmGiveMasterBallScript -UnknownScript_0x78bfa: +ElmCheckEverstone: checkevent EVENT_GOT_EVERSTONE_FROM_ELM - iftrue UnknownScript_0x78e16 + iftrue ElmScript_CallYou checkevent EVENT_SHOWED_TOGEPI_TO_ELM - iftrue UnknownScript_0x78e03 + iftrue ElmGiveEverstoneScript checkevent EVENT_TOLD_ELM_ABOUT_TOGEPI_OVER_THE_PHONE - iffalse UnknownScript_0x78c35 + iffalse ElmCheckTogepiEgg writebyte TOGEPI special Functionc284 iftrue ShowElmTogepiScript @@ -115,21 +115,21 @@ UnknownScript_0x78bfa: loadmovesprites end -UnknownScript_0x78c22: +ElmEggHatchedScript: writebyte TOGEPI special Functionc284 iftrue ShowElmTogepiScript writebyte TOGETIC special Functionc284 iftrue ShowElmTogepiScript - jump UnknownScript_0x78c41 + jump ElmCheckGotEggAgain -UnknownScript_0x78c35: +ElmCheckTogepiEgg: checkevent EVENT_GOT_TOGEPI_EGG_FROM_ELMS_AIDE - iffalse UnknownScript_0x78c41 + iffalse ElmCheckGotEggAgain checkevent EVENT_TOGEPI_HATCHED - iftrue UnknownScript_0x78c22 -UnknownScript_0x78c41: + iftrue ElmEggHatchedScript +ElmCheckGotEggAgain: checkevent EVENT_GOT_TOGEPI_EGG_FROM_ELMS_AIDE ; why are we checking it again? iftrue ElmWaitingEggHatchScript checkflag ENGINE_ZEPHYRBADGE @@ -140,7 +140,7 @@ UnknownScript_0x78c41: iftrue ElmAfterTheftScript checkevent EVENT_GOT_A_POKEMON_FROM_ELM iftrue ElmDescribesMrPokemonScript - writetext UnknownText_0x79375 + writetext ElmText_LetYourMonBattleIt closetext loadmovesprites end @@ -252,7 +252,7 @@ ElmDirectionsScript: writetext ElmDirectionsText1 closetext loadmovesprites - addcellnum $4 + addcellnum PHONE_ELM loadfont writetext GotElmsNumberText playsound SFX_REGISTER_PHONE_NUMBER @@ -270,7 +270,7 @@ ElmDirectionsScript: closetext loadmovesprites setevent EVENT_GOT_A_POKEMON_FROM_ELM - setevent EVENT_6BE + setevent EVENT_RIVAL_CHERRYGROVE_CITY dotrigger $5 domaptrigger GROUP_NEW_BARK_TOWN, MAP_NEW_BARK_TOWN, $1 end @@ -300,15 +300,15 @@ ElmsLabHealingMachine: .CanHeal writetext ElmsLabHealingMachineText2 yesorno - iftrue UnknownScript_0x78d8a + iftrue ElmsLabHealingMachine_HealParty loadmovesprites end -UnknownScript_0x78d8a: - special Function1060a2 +ElmsLabHealingMachine_HealParty: + special Mobile_HealParty special HealParty playmusic MUSIC_NONE - writebyte $1 + writebyte 1 ; Machine is in Elm's Lab special HealMachineAnim pause 30 special RestartMapMusic @@ -339,8 +339,8 @@ ElmAfterTheftScript: setevent EVENT_GAVE_MYSTERY_EGG_TO_ELM setflag ENGINE_BUG_CONTEST_ON domaptrigger GROUP_ROUTE_29, MAP_ROUTE_29, $1 - clearevent EVENT_715 - setevent EVENT_714 + clearevent EVENT_ROUTE_30_YOUNGSTER_JOEY + setevent EVENT_ROUTE_30_BATTLE writetext ElmAfterTheftText6 closetext loadmovesprites @@ -369,28 +369,28 @@ ShowElmTogepiScript: writetext ShowElmTogepiText1 closetext loadmovesprites - showemote $0, $2, 15 + showemote EMOTE_SHOCK, $2, 15 setevent EVENT_SHOWED_TOGEPI_TO_ELM loadfont writetext ShowElmTogepiText2 keeptextopen writetext ShowElmTogepiText3 keeptextopen -UnknownScript_0x78e03: +ElmGiveEverstoneScript: writetext ElmGiveEverstoneText1 keeptextopen verbosegiveitem EVERSTONE, 1 - iffalse UnknownScript_0x78e1a + iffalse ElmScript_NoRoomForEverstone writetext ElmGiveEverstoneText2 closetext loadmovesprites setevent EVENT_GOT_EVERSTONE_FROM_ELM end -UnknownScript_0x78e16: - writetext UnknownText_0x79c37 +ElmScript_CallYou: + writetext ElmText_CallYou closetext -UnknownScript_0x78e1a: +ElmScript_NoRoomForEverstone: loadmovesprites end @@ -419,95 +419,95 @@ ElmGiveTicketScript: ElmJumpBackScript1: loadmovesprites checkcode VAR_FACING - if_equal $0, UnknownScript_0x78e6d - if_equal $1, UnknownScript_0x78e67 - if_equal $2, UnknownScript_0x78e73 - if_equal $3, UnknownScript_0x78e79 + if_equal DOWN, ElmJumpDownScript + if_equal UP, ElmJumpUpScript + if_equal LEFT, ElmJumpLeftScript + if_equal RIGHT, ElmJumpRightScript end ElmJumpBackScript2: loadmovesprites checkcode VAR_FACING - if_equal $0, UnknownScript_0x78e67 - if_equal $1, UnknownScript_0x78e6d - if_equal $2, UnknownScript_0x78e79 - if_equal $3, UnknownScript_0x78e73 + if_equal DOWN, ElmJumpUpScript + if_equal UP, ElmJumpDownScript + if_equal LEFT, ElmJumpRightScript + if_equal RIGHT, ElmJumpLeftScript end -UnknownScript_0x78e67: - applymovement $2, MovementData_0x78f90 +ElmJumpUpScript: + applymovement $2, ElmJumpUpMovement loadfont end -UnknownScript_0x78e6d: - applymovement $2, MovementData_0x78f94 +ElmJumpDownScript: + applymovement $2, ElmJumpDownMovement loadfont end -UnknownScript_0x78e73: - applymovement $2, MovementData_0x78f98 +ElmJumpLeftScript: + applymovement $2, ElmJumpLeftMovement loadfont end -UnknownScript_0x78e79: - applymovement $2, MovementData_0x78f9c +ElmJumpRightScript: + applymovement $2, ElmJumpRightMovement loadfont end -UnknownScript_0x78e7f: - applymovement $3, MovementData_0x78f7e +AideScript_WalkPotions1: + applymovement $3, AideWalksRight1 spriteface $0, DOWN - scall UnknownScript_0x78e9d - applymovement $3, MovementData_0x78f87 + scall AideScript_GivePotions + applymovement $3, AideWalksLeft1 end -UnknownScript_0x78e8e: - applymovement $3, MovementData_0x78f82 +AideScript_WalkPotions2: + applymovement $3, AideWalksRight2 spriteface $0, DOWN - scall UnknownScript_0x78e9d - applymovement $3, MovementData_0x78f8b + scall AideScript_GivePotions + applymovement $3, AideWalksLeft2 end -UnknownScript_0x78e9d: +AideScript_GivePotions: loadfont - writetext UnknownText_0x79f38 + writetext AideText_GiveYouPotions keeptextopen verbosegiveitem POTION, 1 - writetext UnknownText_0x79f65 + writetext AideText_AlwaysBusy closetext loadmovesprites dotrigger $2 end -UnknownScript_0x78ead: - applymovement $3, MovementData_0x78f7e +AideScript_WalkBalls1: + applymovement $3, AideWalksRight1 spriteface $0, DOWN - scall UnknownScript_0x78ecb - applymovement $3, MovementData_0x78f87 + scall AideScript_GiveYouBalls + applymovement $3, AideWalksLeft1 end -UnknownScript_0x78ebc: - applymovement $3, MovementData_0x78f82 +AideScript_WalkBalls2: + applymovement $3, AideWalksRight2 spriteface $0, DOWN - scall UnknownScript_0x78ecb - applymovement $3, MovementData_0x78f8b + scall AideScript_GiveYouBalls + applymovement $3, AideWalksLeft2 end -UnknownScript_0x78ecb: +AideScript_GiveYouBalls: loadfont - writetext UnknownText_0x7a078 + writetext AideText_GiveYouBalls keeptextopen itemtotext POKE_BALL, $1 - scall UnknownScript_0x78ee2 + scall AideScript_ReceiveTheBalls giveitem POKE_BALL, $5 - writetext UnknownText_0x7a09a + writetext AideText_ExplainBalls keeptextopen itemnotify loadmovesprites dotrigger $2 end -UnknownScript_0x78ee2: +AideScript_ReceiveTheBalls: jumpstd receiveitem end @@ -515,49 +515,49 @@ ElmsAideScript: faceplayer loadfont checkevent EVENT_GOT_TOGEPI_EGG_FROM_ELMS_AIDE - iftrue UnknownScript_0x78f0c + iftrue AideScript_AfterTheft checkevent EVENT_GAVE_MYSTERY_EGG_TO_ELM - iftrue UnknownScript_0x78f06 + iftrue AideScript_ExplainBalls checkevent EVENT_GOT_MYSTERY_EGG_FROM_MR_POKEMON - iftrue UnknownScript_0x78f00 - writetext UnknownText_0x79f65 + iftrue AideScript_TheftTestimony + writetext AideText_AlwaysBusy closetext loadmovesprites end -UnknownScript_0x78f00: - writetext UnknownText_0x79f95 +AideScript_TheftTestimony: + writetext AideText_TheftTestimony closetext loadmovesprites end -UnknownScript_0x78f06: - writetext UnknownText_0x7a09a +AideScript_ExplainBalls: + writetext AideText_ExplainBalls closetext loadmovesprites end -UnknownScript_0x78f0c: - writetext UnknownText_0x79c65 +AideScript_AfterTheft: + writetext AideText_AfterTheft closetext loadmovesprites end -UnknownScript_0x78f12: - applymovement $0, MovementData_0x78f72 +MeetCopScript2: + applymovement $0, MeetCopScript2_StepLeft MeetCopScript: - applymovement $0, MovementData_0x78f74 + applymovement $0, MeetCopScript_WalkUp CopScript: spriteface $7, LEFT loadfont - writetext UnknownText_0x7a0f0 + writetext ElmsLabOfficerText1 keeptextopen special SpecialNameRival - writetext UnknownText_0x7a1c0 + writetext ElmsLabOfficerText2 closetext loadmovesprites - applymovement $7, MovementData_0x78f78 + applymovement $7, OfficerLeavesMovement disappear $7 dotrigger $2 end @@ -607,7 +607,7 @@ ElmsLabTrashcan2: ElmsLabBookshelf: jumpstd difficultbookshelf -MovementData_0x78f67: +ElmsLab_WalkUpToElmMovement: step_up step_up step_up @@ -622,17 +622,17 @@ MovementData_0x78f70: step_up step_end -MovementData_0x78f72: +MeetCopScript2_StepLeft: step_left step_end -MovementData_0x78f74: +MeetCopScript_WalkUp: step_up step_up turn_head_right step_end -MovementData_0x78f78: +OfficerLeavesMovement: step_down step_down step_down @@ -640,61 +640,61 @@ MovementData_0x78f78: step_down step_end -MovementData_0x78f7e: +AideWalksRight1: step_right step_right turn_head_up step_end -MovementData_0x78f82: +AideWalksRight2: step_right step_right step_right turn_head_up step_end -MovementData_0x78f87: +AideWalksLeft1: step_left step_left turn_head_down step_end -MovementData_0x78f8b: +AideWalksLeft2: step_left step_left step_left turn_head_down step_end -MovementData_0x78f90: +ElmJumpUpMovement: fix_facing big_step_up remove_fixed_facing step_end -MovementData_0x78f94: +ElmJumpDownMovement: fix_facing big_step_down remove_fixed_facing step_end -MovementData_0x78f98: +ElmJumpLeftMovement: fix_facing big_step_left remove_fixed_facing step_end -MovementData_0x78f9c: +ElmJumpRightMovement: fix_facing big_step_right remove_fixed_facing step_end -MovementData_0x78fa0: +ElmsLab_ElmToDefaultPositionMovement1: step_up step_end -MovementData_0x78fa2: +ElmsLab_ElmToDefaultPositionMovement2: step_right step_right step_up @@ -722,7 +722,7 @@ AfterChikoritaMovement: turn_head_up step_end -UnknownText_0x78fb6: +ElmText_Intro: text "ELM: <PLAY_G>!" line "There you are!" @@ -761,19 +761,19 @@ UnknownText_0x78fb6: line "caught." done -UnknownText_0x790fa: +ElmText_Accepted: text "Thanks, <PLAY_G>!" para "You're a great" line "help!" done -UnknownText_0x7911a: +ElmText_Refused: text "But… Please, I" line "need your help!" done -UnknownText_0x7913a: +ElmText_ResearchAmbitions: text "When I announce my" line "findings, I'm sure" @@ -787,7 +787,7 @@ UnknownText_0x7913a: line "it!" done -UnknownText_0x791ae: +ElmText_GotAnEmail: text "Oh, hey! I got an" line "e-mail!" @@ -797,7 +797,7 @@ UnknownText_0x791ae: para "Okay…" done -UnknownText_0x791df: +ElmText_MissionFromMrPokemon: text "Hey, listen." para "I have an acquain-" @@ -830,7 +830,7 @@ UnknownText_0x791df: line "go in our place?" done -UnknownText_0x792ff: +ElmText_ChooseAPokemon: text "I want you to" line "raise one of the" @@ -844,7 +844,7 @@ UnknownText_0x792ff: para "Go on. Pick one!" done -UnknownText_0x79375: +ElmText_LetYourMonBattleIt: text "If a wild #MON" line "appears, let your" cont "#MON battle it!" @@ -1125,13 +1125,13 @@ ElmGiveEverstoneText2: cont "to evolve." done -UnknownText_0x79c37: +ElmText_CallYou: text "ELM: <PLAY_G>, I'll" line "call you if any-" cont "thing comes up." done -UnknownText_0x79c65: +AideText_AfterTheft: text "…sigh… That" line "stolen #MON." @@ -1208,25 +1208,25 @@ ElmGiveTicketText2: line "PROF.OAK in KANTO!" done -UnknownText_0x79f0b: +ElmsLabSignpostText_Egg: text "It's the #MON" line "EGG being studied" cont "by PROF.ELM." done -UnknownText_0x79f38: +AideText_GiveYouPotions: text "<PLAY_G>, I want" line "you to have this" cont "for your errand." done -UnknownText_0x79f65: +AideText_AlwaysBusy: text "There are only two" line "of us, so we're" cont "always busy." done -UnknownText_0x79f95: +AideText_TheftTestimony: text "There was a loud" line "noise outside…" @@ -1251,14 +1251,14 @@ UnknownText_0x79f95: line "itself." done -UnknownText_0x7a078: +AideText_GiveYouBalls: text "<PLAY_G>!" para "Use these on your" line "#DEX quest!" done -UnknownText_0x7a09a: +AideText_ExplainBalls: text "To add to your" line "#DEX, you have" cont "to catch #MON." @@ -1268,7 +1268,7 @@ UnknownText_0x7a09a: cont "to get them." done -UnknownText_0x7a0f0: +ElmsLabOfficerText1: text "I heard a #MON" line "was stolen here…" @@ -1289,7 +1289,7 @@ UnknownText_0x7a0f0: line "get his name?" done -UnknownText_0x7a1c0: +ElmsLabOfficerText2: text "OK! So <RIVAL>" line "was his name." @@ -1371,46 +1371,46 @@ ElmsLab_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $b, $4, 1, GROUP_NEW_BARK_TOWN, MAP_NEW_BARK_TOWN warp_def $b, $5, 1, GROUP_NEW_BARK_TOWN, MAP_NEW_BARK_TOWN - ; xy triggers +.XYTriggers: db 8 xy_trigger 1, $6, $4, $0, LabTryToLeaveScript, $0, $0 xy_trigger 1, $6, $5, $0, LabTryToLeaveScript, $0, $0 xy_trigger 3, $5, $4, $0, MeetCopScript, $0, $0 - xy_trigger 3, $5, $5, $0, UnknownScript_0x78f12, $0, $0 - xy_trigger 5, $8, $4, $0, UnknownScript_0x78e7f, $0, $0 - xy_trigger 5, $8, $5, $0, UnknownScript_0x78e8e, $0, $0 - xy_trigger 6, $8, $4, $0, UnknownScript_0x78ead, $0, $0 - xy_trigger 6, $8, $5, $0, UnknownScript_0x78ebc, $0, $0 + xy_trigger 3, $5, $5, $0, MeetCopScript2, $0, $0 + xy_trigger 5, $8, $4, $0, AideScript_WalkPotions1, $0, $0 + xy_trigger 5, $8, $5, $0, AideScript_WalkPotions2, $0, $0 + xy_trigger 6, $8, $4, $0, AideScript_WalkBalls1, $0, $0 + xy_trigger 6, $8, $5, $0, AideScript_WalkBalls2, $0, $0 - ; signposts +.Signposts: db 16 - signpost 1, 2, $0, ElmsLabHealingMachine - signpost 1, 6, $0, ElmsLabBookshelf - signpost 1, 7, $0, ElmsLabBookshelf - signpost 1, 8, $0, ElmsLabBookshelf - signpost 1, 9, $0, ElmsLabBookshelf - signpost 7, 0, $0, ElmsLabTravelTip1 - signpost 7, 1, $0, ElmsLabTravelTip2 - signpost 7, 2, $0, ElmsLabTravelTip3 - signpost 7, 3, $0, ElmsLabTravelTip4 - signpost 7, 6, $0, ElmsLabBookshelf - signpost 7, 7, $0, ElmsLabBookshelf - signpost 7, 8, $0, ElmsLabBookshelf - signpost 7, 9, $0, ElmsLabBookshelf - signpost 3, 9, $0, ElmsLabTrashcan - signpost 0, 5, $0, ElmsLabWindow - signpost 5, 3, $2, ElmsLabPC - - ; people-events + signpost 1, 2, SIGNPOST_READ, ElmsLabHealingMachine + signpost 1, 6, SIGNPOST_READ, ElmsLabBookshelf + signpost 1, 7, SIGNPOST_READ, ElmsLabBookshelf + signpost 1, 8, SIGNPOST_READ, ElmsLabBookshelf + signpost 1, 9, SIGNPOST_READ, ElmsLabBookshelf + signpost 7, 0, SIGNPOST_READ, ElmsLabTravelTip1 + signpost 7, 1, SIGNPOST_READ, ElmsLabTravelTip2 + signpost 7, 2, SIGNPOST_READ, ElmsLabTravelTip3 + signpost 7, 3, SIGNPOST_READ, ElmsLabTravelTip4 + signpost 7, 6, SIGNPOST_READ, ElmsLabBookshelf + signpost 7, 7, SIGNPOST_READ, ElmsLabBookshelf + signpost 7, 8, SIGNPOST_READ, ElmsLabBookshelf + signpost 7, 9, SIGNPOST_READ, ElmsLabBookshelf + signpost 3, 9, SIGNPOST_READ, ElmsLabTrashcan + signpost 0, 5, SIGNPOST_READ, ElmsLabWindow + signpost 5, 3, SIGNPOST_DOWN, ElmsLabPC + +.PersonEvents: db 6 - person_event SPRITE_ELM, 6, 9, $6, $0, 255, 255, $0, 0, ProfElmScript, -1 - person_event SPRITE_SCIENTIST, 13, 6, $3, $0, 255, 255, $90, 0, ElmsAideScript, EVENT_ELMS_AIDE_IN_LAB - person_event SPRITE_POKE_BALL, 7, 10, $1, $0, 255, 255, $0, 0, CyndaquilPokeBallScript, EVENT_640 - person_event SPRITE_POKE_BALL, 7, 11, $1, $0, 255, 255, $0, 0, TotodilePokeBallScript, EVENT_641 - person_event SPRITE_POKE_BALL, 7, 12, $1, $0, 255, 255, $0, 0, ChikoritaPokeBallScript, EVENT_642 - person_event SPRITE_OFFICER, 7, 9, $7, $0, 255, 255, $90, 0, CopScript, EVENT_702 + person_event SPRITE_ELM, 6, 9, OW_UP | $2, $0, -1, -1, $0, 0, ProfElmScript, -1 + person_event SPRITE_SCIENTIST, 13, 6, OW_DOWN | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, ElmsAideScript, EVENT_ELMS_AIDE_IN_LAB + person_event SPRITE_POKE_BALL, 7, 10, OW_DOWN | $1, $0, -1, -1, $0, 0, CyndaquilPokeBallScript, EVENT_CYNDAQUIL_POKEBALL_IN_ELMS_LAB + person_event SPRITE_POKE_BALL, 7, 11, OW_DOWN | $1, $0, -1, -1, $0, 0, TotodilePokeBallScript, EVENT_TOTODILE_POKEBALL_IN_ELMS_LAB + person_event SPRITE_POKE_BALL, 7, 12, OW_DOWN | $1, $0, -1, -1, $0, 0, ChikoritaPokeBallScript, EVENT_CHIKORITA_POKEBALL_IN_ELMS_LAB + person_event SPRITE_OFFICER, 7, 9, OW_UP | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, CopScript, EVENT_COP_IN_ELMS_LAB diff --git a/maps/FastShip1F.asm b/maps/FastShip1F.asm index 45ac8bd38..16ff3d059 100644 --- a/maps/FastShip1F.asm +++ b/maps/FastShip1F.asm @@ -1,26 +1,26 @@ FastShip1F_MapScriptHeader: - ; trigger count +.MapTriggers: db 3 ; triggers - dw UnknownScript_0x75135, $0000 - dw UnknownScript_0x75136, $0000 - dw UnknownScript_0x7513a, $0000 + dw .Trigger1, $0000 + dw .Trigger2, $0000 + dw .Trigger3, $0000 - ; callback count +.MapCallbacks: db 0 -UnknownScript_0x75135: +.Trigger1: end -UnknownScript_0x75136: - priorityjump UnknownScript_0x7513b +.Trigger2: + priorityjump .PriorityJump2 end -UnknownScript_0x7513a: +.Trigger3: end -UnknownScript_0x7513b: +.PriorityJump2: applymovement $2, MovementData_0x7520e applymovement $0, MovementData_0x75217 applymovement $2, MovementData_0x75211 @@ -28,21 +28,21 @@ UnknownScript_0x7513b: playsound SFX_BOAT earthquake 30 blackoutmod GROUP_FAST_SHIP_CABINS_SW_SSW_NW, MAP_FAST_SHIP_CABINS_SW_SSW_NW - clearevent EVENT_031 - checkevent EVENT_030 - iftrue UnknownScript_0x7515d + clearevent EVENT_FAST_SHIP_HAS_ARRIVED + checkevent EVENT_FAST_SHIP_FIRST_TIME + iftrue .Vermilion dotrigger $2 end -UnknownScript_0x7515d: +.Vermilion: dotrigger $0 end SailorScript_0x75160: faceplayer loadfont - checkevent EVENT_031 - iftrue UnknownScript_0x7517a + checkevent EVENT_FAST_SHIP_HAS_ARRIVED + iftrue .Arrived checkevent EVENT_FAST_SHIP_DESTINATION_OLIVINE iftrue .Olivine writetext UnknownText_0x7523b @@ -56,42 +56,42 @@ SailorScript_0x75160: loadmovesprites end -UnknownScript_0x7517a: +.Arrived: checkevent EVENT_FAST_SHIP_DESTINATION_OLIVINE - iftrue .Olivine + iftrue ._Olivine writetext UnknownText_0x754be closetext loadmovesprites - scall UnknownScript_0x751b8 + scall .LetThePlayerOut playsound SFX_EXIT_BUILDING - special Function8c084 + special FadeBlackBGMap waitbutton - setevent EVENT_72B + setevent EVENT_VERMILION_PORT_SAILOR_AT_GANGWAY domaptrigger GROUP_VERMILION_PORT, MAP_VERMILION_PORT, $1 warp GROUP_VERMILION_PORT, MAP_VERMILION_PORT, $7, $11 end -.Olivine +._Olivine writetext UnknownText_0x7548d closetext loadmovesprites - scall UnknownScript_0x751b8 + scall .LetThePlayerOut playsound SFX_EXIT_BUILDING - special Function8c084 + special FadeBlackBGMap waitbutton - setevent EVENT_72A + setevent EVENT_OLIVINE_PORT_SAILOR_AT_GANGWAY domaptrigger GROUP_OLIVINE_PORT, MAP_OLIVINE_PORT, $1 warp GROUP_OLIVINE_PORT, MAP_OLIVINE_PORT, $7, $17 end -UnknownScript_0x751b8: +.LetThePlayerOut: checkcode VAR_FACING - if_equal $3, UnknownScript_0x751c7 + if_equal RIGHT, .YouAreFacingRight applymovement $2, MovementData_0x7520e applymovement $0, MovementData_0x75235 end -UnknownScript_0x751c7: +.YouAreFacingRight: applymovement $2, MovementData_0x75214 applymovement $0, MovementData_0x75238 end @@ -99,14 +99,14 @@ UnknownScript_0x751c7: SailorScript_0x751d0: faceplayer loadfont - checkevent EVENT_030 - iftrue UnknownScript_0x751de + checkevent EVENT_FAST_SHIP_FIRST_TIME + iftrue .Vermilion writetext UnknownText_0x752f9 closetext loadmovesprites end -UnknownScript_0x751de: +.Vermilion: writetext UnknownText_0x7534f closetext loadmovesprites @@ -285,7 +285,7 @@ FastShip1F_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 12 warp_def $1, $19, 255, GROUP_FAST_SHIP_1F, MAP_FAST_SHIP_1F warp_def $8, $1b, 1, GROUP_FAST_SHIP_CABINS_NNW_NNE_NE, MAP_FAST_SHIP_CABINS_NNW_NNE_NE @@ -300,17 +300,17 @@ FastShip1F_MapEventHeader: warp_def $c, $6, 1, GROUP_FAST_SHIP_B1F, MAP_FAST_SHIP_B1F warp_def $e, $1e, 2, GROUP_FAST_SHIP_B1F, MAP_FAST_SHIP_B1F - ; xy triggers +.XYTriggers: db 2 xy_trigger 2, $6, $18, $0, UnknownScript_0x751eb, $0, $0 xy_trigger 2, $6, $19, $0, UnknownScript_0x751e7, $0, $0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 4 - person_event SPRITE_SAILOR, 6, 29, $6, $0, 255, 255, $0, 0, SailorScript_0x75160, -1 - person_event SPRITE_SAILOR, 11, 18, $9, $0, 255, 255, $0, 0, SailorScript_0x751d0, -1 - person_event SPRITE_SAILOR, 21, 26, $5, $2, 255, 255, $0, 0, SailorScript_0x751e4, -1 - person_event SPRITE_GENTLEMAN, 10, 23, $9, $0, 255, 255, $0, 0, ObjectEvent, EVENT_72C + person_event SPRITE_SAILOR, 6, 29, OW_UP | $2, $0, -1, -1, $0, 0, SailorScript_0x75160, -1 + person_event SPRITE_SAILOR, 11, 18, OW_LEFT | $1, $0, -1, -1, $0, 0, SailorScript_0x751d0, -1 + person_event SPRITE_SAILOR, 21, 26, OW_UP | $1, $2, -1, -1, $0, 0, SailorScript_0x751e4, -1 + person_event SPRITE_GENTLEMAN, 10, 23, OW_LEFT | $1, $0, -1, -1, $0, 0, ObjectEvent, EVENT_FAST_SHIP_1F_GENTLEMAN diff --git a/maps/FastShipB1F.asm b/maps/FastShipB1F.asm index b33d9ff16..9c821933a 100644 --- a/maps/FastShipB1F.asm +++ b/maps/FastShipB1F.asm @@ -1,12 +1,12 @@ FastShipB1F_MapScriptHeader: - ; trigger count +.MapTriggers: db 2 ; triggers dw UnknownScript_0x7673a, $0000 dw UnknownScript_0x7673b, $0000 - ; callback count +.MapCallbacks: db 0 UnknownScript_0x7673a: @@ -16,7 +16,7 @@ UnknownScript_0x7673b: end UnknownScript_0x7673c: - checkevent EVENT_72F + checkevent EVENT_FAST_SHIP_B1F_SAILOR_RIGHT iftrue UnknownScript_0x76766 applymovement $3, MovementData_0x76876 moveperson $2, $1e, $6 @@ -26,7 +26,7 @@ UnknownScript_0x7673c: end UnknownScript_0x76751: - checkevent EVENT_72E + checkevent EVENT_FAST_SHIP_B1F_SAILOR_LEFT iftrue UnknownScript_0x76766 applymovement $2, MovementData_0x76871 moveperson $3, $1f, $6 @@ -41,17 +41,17 @@ UnknownScript_0x76766: SailorScript_0x76767: faceplayer loadfont - checkevent EVENT_030 + checkevent EVENT_FAST_SHIP_FIRST_TIME iftrue UnknownScript_0x767a0 - checkevent EVENT_033 + checkevent EVENT_FAST_SHIP_LAZY_SAILOR iftrue UnknownScript_0x7678d - checkevent EVENT_034 + checkevent EVENT_FAST_SHIP_INFORMED_ABOUT_LAZY_SAILOR iftrue UnknownScript_0x76787 writetext UnknownText_0x7687b closetext loadmovesprites - setevent EVENT_034 - clearevent EVENT_72D + setevent EVENT_FAST_SHIP_INFORMED_ABOUT_LAZY_SAILOR + clearevent EVENT_FAST_SHIP_CABINS_NNW_NNE_NE_SAILOR end UnknownScript_0x76787: @@ -62,7 +62,7 @@ UnknownScript_0x76787: UnknownScript_0x7678d: writetext UnknownText_0x7692e - checkevent EVENT_032 + checkevent EVENT_FAST_SHIP_FOUND_GIRL iffalse UnknownScript_0x76799 closetext loadmovesprites @@ -82,23 +82,7 @@ UnknownScript_0x767a0: end TrainerSailorJeff: - ; bit/flag number - dw EVENT_BEAT_SAILOR_JEFF - - ; trainer group && trainer id - db SAILOR, JEFF - - ; text when seen - dw SailorJeffSeenText - - ; text when trainer beaten - dw SailorJeffBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw SailorJeffScript + trainer EVENT_BEAT_SAILOR_JEFF, SAILOR, JEFF, SailorJeffSeenText, SailorJeffBeatenText, $0000, SailorJeffScript SailorJeffScript: talkaftercancel @@ -109,23 +93,7 @@ SailorJeffScript: end TrainerPicnickerDebra: - ; bit/flag number - dw EVENT_BEAT_PICNICKER_DEBRA - - ; trainer group && trainer id - db PICNICKER, DEBRA - - ; text when seen - dw PicnickerDebraSeenText - - ; text when trainer beaten - dw PicnickerDebraBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw PicnickerDebraScript + trainer EVENT_BEAT_PICNICKER_DEBRA, PICNICKER, DEBRA, PicnickerDebraSeenText, PicnickerDebraBeatenText, $0000, PicnickerDebraScript PicnickerDebraScript: talkaftercancel @@ -136,23 +104,7 @@ PicnickerDebraScript: end TrainerJugglerFritz: - ; bit/flag number - dw EVENT_BEAT_JUGGLER_FRITZ - - ; trainer group && trainer id - db JUGGLER, FRITZ - - ; text when seen - dw JugglerFritzSeenText - - ; text when trainer beaten - dw JugglerFritzBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw JugglerFritzScript + trainer EVENT_BEAT_JUGGLER_FRITZ, JUGGLER, FRITZ, JugglerFritzSeenText, JugglerFritzBeatenText, $0000, JugglerFritzScript JugglerFritzScript: talkaftercancel @@ -163,23 +115,7 @@ JugglerFritzScript: end TrainerSailorGarrett: - ; bit/flag number - dw EVENT_BEAT_SAILOR_GARRETT - - ; trainer group && trainer id - db SAILOR, GARRETT - - ; text when seen - dw SailorGarrettSeenText - - ; text when trainer beaten - dw SailorGarrettBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw SailorGarrettScript + trainer EVENT_BEAT_SAILOR_GARRETT, SAILOR, GARRETT, SailorGarrettSeenText, SailorGarrettBeatenText, $0000, SailorGarrettScript SailorGarrettScript: talkaftercancel @@ -190,23 +126,7 @@ SailorGarrettScript: end TrainerFisherJonah: - ; bit/flag number - dw EVENT_BEAT_FISHER_JONAH - - ; trainer group && trainer id - db FISHER, JONAH - - ; text when seen - dw FisherJonahSeenText - - ; text when trainer beaten - dw FisherJonahBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw FisherJonahScript + trainer EVENT_BEAT_FISHER_JONAH, FISHER, JONAH, FisherJonahSeenText, FisherJonahBeatenText, $0000, FisherJonahScript FisherJonahScript: talkaftercancel @@ -217,23 +137,7 @@ FisherJonahScript: end TrainerBlackbeltWai: - ; bit/flag number - dw EVENT_BEAT_BLACKBELT_WAI - - ; trainer group && trainer id - db BLACKBELT_T, WAI - - ; text when seen - dw BlackbeltWaiSeenText - - ; text when trainer beaten - dw BlackbeltWaiBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw BlackbeltWaiScript + trainer EVENT_BEAT_BLACKBELT_WAI, BLACKBELT_T, WAI, BlackbeltWaiSeenText, BlackbeltWaiBeatenText, $0000, BlackbeltWaiScript BlackbeltWaiScript: talkaftercancel @@ -244,23 +148,7 @@ BlackbeltWaiScript: end TrainerSailorKenneth: - ; bit/flag number - dw EVENT_BEAT_SAILOR_KENNETH - - ; trainer group && trainer id - db SAILOR, KENNETH - - ; text when seen - dw SailorKennethSeenText - - ; text when trainer beaten - dw SailorKennethBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw SailorKennethScript + trainer EVENT_BEAT_SAILOR_KENNETH, SAILOR, KENNETH, SailorKennethSeenText, SailorKennethBeatenText, $0000, SailorKennethScript SailorKennethScript: talkaftercancel @@ -271,23 +159,7 @@ SailorKennethScript: end TrainerTeacherShirley: - ; bit/flag number - dw EVENT_BEAT_TEACHER_SHIRLEY - - ; trainer group && trainer id - db TEACHER, SHIRLEY - - ; text when seen - dw TeacherShirleySeenText - - ; text when trainer beaten - dw TeacherShirleyBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw TeacherShirleyScript + trainer EVENT_BEAT_TEACHER_SHIRLEY, TEACHER, SHIRLEY, TeacherShirleySeenText, TeacherShirleyBeatenText, $0000, TeacherShirleyScript TeacherShirleyScript: talkaftercancel @@ -298,23 +170,7 @@ TeacherShirleyScript: end TrainerSchoolboyNate: - ; bit/flag number - dw EVENT_BEAT_SCHOOLBOY_NATE - - ; trainer group && trainer id - db SCHOOLBOY, NATE - - ; text when seen - dw SchoolboyNateSeenText - - ; text when trainer beaten - dw SchoolboyNateBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw SchoolboyNateScript + trainer EVENT_BEAT_SCHOOLBOY_NATE, SCHOOLBOY, NATE, SchoolboyNateSeenText, SchoolboyNateBeatenText, $0000, SchoolboyNateScript SchoolboyNateScript: talkaftercancel @@ -325,23 +181,7 @@ SchoolboyNateScript: end TrainerSchoolboyRicky: - ; bit/flag number - dw EVENT_BEAT_SCHOOLBOY_RICKY - - ; trainer group && trainer id - db SCHOOLBOY, RICKY - - ; text when seen - dw SchoolboyRickySeenText - - ; text when trainer beaten - dw SchoolboyRickyBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw SchoolboyRickyScript + trainer EVENT_BEAT_SCHOOLBOY_RICKY, SCHOOLBOY, RICKY, SchoolboyRickySeenText, SchoolboyRickyBeatenText, $0000, SchoolboyRickyScript SchoolboyRickyScript: talkaftercancel @@ -600,31 +440,31 @@ FastShipB1F_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $b, $5, 11, GROUP_FAST_SHIP_1F, MAP_FAST_SHIP_1F warp_def $d, $1f, 12, GROUP_FAST_SHIP_1F, MAP_FAST_SHIP_1F - ; xy triggers +.XYTriggers: db 2 xy_trigger 0, $7, $1e, $0, UnknownScript_0x7673c, $0, $0 xy_trigger 0, $7, $1f, $0, UnknownScript_0x76751, $0, $0 - ; signposts +.Signposts: db 1 - signpost 9, 27, $0, FashShipB1FTrashcan + signpost 9, 27, SIGNPOST_READ, FashShipB1FTrashcan - ; people-events +.PersonEvents: db 12 - person_event SPRITE_SAILOR, 10, 34, $6, $0, 255, 255, $90, 0, SailorScript_0x76767, EVENT_72E - person_event SPRITE_SAILOR, 10, 35, $6, $0, 255, 255, $90, 0, SailorScript_0x76767, EVENT_72F - person_event SPRITE_SAILOR, 15, 13, $7, $0, 255, 255, $92, 3, TrainerSailorJeff, EVENT_739 - person_event SPRITE_LASS, 8, 10, $7, $0, 255, 255, $a2, 1, TrainerPicnickerDebra, EVENT_739 - person_event SPRITE_SUPER_NERD, 13, 30, $9, $0, 255, 255, $92, 1, TrainerJugglerFritz, EVENT_739 - person_event SPRITE_SAILOR, 8, 21, $9, $0, 255, 255, $92, 4, TrainerSailorGarrett, EVENT_73A - person_event SPRITE_FISHER, 12, 29, $7, $0, 255, 255, $a2, 3, TrainerFisherJonah, EVENT_73A - person_event SPRITE_BLACK_BELT, 15, 19, $1f, $0, 255, 255, $b2, 3, TrainerBlackbeltWai, EVENT_73A - person_event SPRITE_SAILOR, 8, 27, $9, $0, 255, 255, $92, 4, TrainerSailorKenneth, EVENT_73B - person_event SPRITE_TEACHER, 15, 13, $7, $0, 255, 255, $82, 3, TrainerTeacherShirley, EVENT_73B - person_event SPRITE_YOUNGSTER, 13, 18, $3, $0, 255, 255, $92, 1, TrainerSchoolboyNate, EVENT_73B - person_event SPRITE_YOUNGSTER, 15, 18, $a, $0, 255, 255, $92, 1, TrainerSchoolboyRicky, EVENT_73B + person_event SPRITE_SAILOR, 10, 34, OW_UP | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, SailorScript_0x76767, EVENT_FAST_SHIP_B1F_SAILOR_LEFT + person_event SPRITE_SAILOR, 10, 35, OW_UP | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, SailorScript_0x76767, EVENT_FAST_SHIP_B1F_SAILOR_RIGHT + person_event SPRITE_SAILOR, 15, 13, OW_UP | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 3, TrainerSailorJeff, EVENT_FAST_SHIP_PASSENGERS_FIRST_TRIP + person_event SPRITE_LASS, 8, 10, OW_UP | $3, $0, -1, -1, (PAL_OW_GREEN << 4) | $82, 1, TrainerPicnickerDebra, EVENT_FAST_SHIP_PASSENGERS_FIRST_TRIP + person_event SPRITE_SUPER_NERD, 13, 30, OW_LEFT | $1, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 1, TrainerJugglerFritz, EVENT_FAST_SHIP_PASSENGERS_FIRST_TRIP + person_event SPRITE_SAILOR, 8, 21, OW_LEFT | $1, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 4, TrainerSailorGarrett, EVENT_FAST_SHIP_PASSENGERS_EASTBOUND + person_event SPRITE_FISHER, 12, 29, OW_UP | $3, $0, -1, -1, (PAL_OW_GREEN << 4) | $82, 3, TrainerFisherJonah, EVENT_FAST_SHIP_PASSENGERS_EASTBOUND + person_event SPRITE_BLACK_BELT, 15, 19, OW_RIGHT | $13, $0, -1, -1, (PAL_OW_BROWN << 4) | $82, 3, TrainerBlackbeltWai, EVENT_FAST_SHIP_PASSENGERS_EASTBOUND + person_event SPRITE_SAILOR, 8, 27, OW_LEFT | $1, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 4, TrainerSailorKenneth, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND + person_event SPRITE_TEACHER, 15, 13, OW_UP | $3, $0, -1, -1, (PAL_OW_RED << 4) | $82, 3, TrainerTeacherShirley, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND + person_event SPRITE_YOUNGSTER, 13, 18, OW_DOWN | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 1, TrainerSchoolboyNate, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND + person_event SPRITE_YOUNGSTER, 15, 18, OW_LEFT | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 1, TrainerSchoolboyRicky, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND diff --git a/maps/FastShipCabins_NNW_NNE_NE.asm b/maps/FastShipCabins_NNW_NNE_NE.asm index baea1925d..979ede647 100644 --- a/maps/FastShipCabins_NNW_NNE_NE.asm +++ b/maps/FastShipCabins_NNW_NNE_NE.asm @@ -1,28 +1,12 @@ FastShipCabins_NNW_NNE_NE_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 TrainerCooltrainermSean: - ; bit/flag number - dw EVENT_BEAT_COOLTRAINERM_SEAN - - ; trainer group && trainer id - db COOLTRAINERM, SEAN - - ; text when seen - dw CooltrainermSeanSeenText - - ; text when trainer beaten - dw CooltrainermSeanBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw CooltrainermSeanScript + trainer EVENT_BEAT_COOLTRAINERM_SEAN, COOLTRAINERM, SEAN, CooltrainermSeanSeenText, CooltrainermSeanBeatenText, $0000, CooltrainermSeanScript CooltrainermSeanScript: talkaftercancel @@ -33,23 +17,7 @@ CooltrainermSeanScript: end TrainerCooltrainerfCarol: - ; bit/flag number - dw EVENT_BEAT_COOLTRAINERF_CAROL - - ; trainer group && trainer id - db COOLTRAINERF, CAROL - - ; text when seen - dw CooltrainerfCarolSeenText - - ; text when trainer beaten - dw CooltrainerfCarolBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw CooltrainerfCarolScript + trainer EVENT_BEAT_COOLTRAINERF_CAROL, COOLTRAINERF, CAROL, CooltrainerfCarolSeenText, CooltrainerfCarolBeatenText, $0000, CooltrainerfCarolScript CooltrainerfCarolScript: talkaftercancel @@ -60,23 +28,7 @@ CooltrainerfCarolScript: end TrainerPokemaniacEthan: - ; bit/flag number - dw EVENT_BEAT_POKEMANIAC_ETHAN - - ; trainer group && trainer id - db POKEMANIAC, ETHAN - - ; text when seen - dw PokemaniacEthanSeenText - - ; text when trainer beaten - dw PokemaniacEthanBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw PokemaniacEthanScript + trainer EVENT_BEAT_POKEMANIAC_ETHAN, POKEMANIAC, ETHAN, PokemaniacEthanSeenText, PokemaniacEthanBeatenText, $0000, PokemaniacEthanScript PokemaniacEthanScript: talkaftercancel @@ -87,23 +39,7 @@ PokemaniacEthanScript: end TrainerHikerNoland: - ; bit/flag number - dw EVENT_BEAT_HIKER_NOLAND - - ; trainer group && trainer id - db HIKER, NOLAND - - ; text when seen - dw HikerNolandSeenText - - ; text when trainer beaten - dw HikerNolandBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw HikerNolandScript + trainer EVENT_BEAT_HIKER_NOLAND, HIKER, NOLAND, HikerNolandSeenText, HikerNolandBeatenText, $0000, HikerNolandScript HikerNolandScript: talkaftercancel @@ -114,23 +50,7 @@ HikerNolandScript: end TrainerGentlemanEdward: - ; bit/flag number - dw EVENT_BEAT_GENTLEMAN_EDWARD - - ; trainer group && trainer id - db GENTLEMAN, EDWARD - - ; text when seen - dw GentlemanEdwardSeenText - - ; text when trainer beaten - dw GentlemanEdwardBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw GentlemanEdwardScript + trainer EVENT_BEAT_GENTLEMAN_EDWARD, GENTLEMAN, EDWARD, GentlemanEdwardSeenText, GentlemanEdwardBeatenText, $0000, GentlemanEdwardScript GentlemanEdwardScript: talkaftercancel @@ -141,23 +61,7 @@ GentlemanEdwardScript: end TrainerBurglarCorey: - ; bit/flag number - dw EVENT_BEAT_BURGLAR_COREY - - ; trainer group && trainer id - db BURGLAR, COREY - - ; text when seen - dw BurglarCoreySeenText - - ; text when trainer beaten - dw BurglarCoreyBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw BurglarCoreyScript + trainer EVENT_BEAT_BURGLAR_COREY, BURGLAR, COREY, BurglarCoreySeenText, BurglarCoreyBeatenText, $0000, BurglarCoreyScript BurglarCoreyScript: talkaftercancel @@ -184,7 +88,7 @@ SailorScript_0x755f1: writetext UnknownText_0x758b1 closetext loadmovesprites - setevent EVENT_033 + setevent EVENT_FAST_SHIP_LAZY_SAILOR domaptrigger GROUP_FAST_SHIP_B1F, MAP_FAST_SHIP_B1F, $1 checkcode VAR_FACING if_equal $3, UnknownScript_0x75629 @@ -357,27 +261,27 @@ FastShipCabins_NNW_NNE_NE_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 3 warp_def $0, $2, 2, GROUP_FAST_SHIP_1F, MAP_FAST_SHIP_1F warp_def $c, $2, 3, GROUP_FAST_SHIP_1F, MAP_FAST_SHIP_1F warp_def $18, $2, 4, GROUP_FAST_SHIP_1F, MAP_FAST_SHIP_1F - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 3 - signpost 13, 6, $0, FastShipCabins_NNW_NNE_NETrashcan - signpost 19, 7, $0, FastShipCabins_NNW_NNE_NETrashcan - signpost 31, 7, $0, FastShipCabins_NNW_NNE_NETrashcan + signpost 13, 6, SIGNPOST_READ, FastShipCabins_NNW_NNE_NETrashcan + signpost 19, 7, SIGNPOST_READ, FastShipCabins_NNW_NNE_NETrashcan + signpost 31, 7, SIGNPOST_READ, FastShipCabins_NNW_NNE_NETrashcan - ; people-events +.PersonEvents: db 7 - person_event SPRITE_COOLTRAINER_M, 7, 8, $a, $0, 255, 255, $82, 2, TrainerCooltrainermSean, EVENT_73A - person_event SPRITE_COOLTRAINER_F, 9, 5, $7, $0, 255, 255, $82, 3, TrainerCooltrainerfCarol, EVENT_73A - person_event SPRITE_SUPER_NERD, 9, 5, $7, $0, 255, 255, $92, 3, TrainerPokemaniacEthan, EVENT_73B - person_event SPRITE_POKEFAN_M, 21, 8, $7, $0, 255, 255, $b2, 3, TrainerHikerNoland, EVENT_739 - person_event SPRITE_SAILOR, 30, 8, $3, $0, 255, 255, $90, 0, SailorScript_0x755f1, EVENT_72D - person_event SPRITE_GENTLEMAN, 34, 11, $3, $0, 255, 255, $92, 1, TrainerGentlemanEdward, EVENT_73A - person_event SPRITE_PHARMACIST, 34, 6, $7, $0, 255, 255, $a2, 4, TrainerBurglarCorey, EVENT_73B + person_event SPRITE_COOLTRAINER_M, 7, 8, OW_LEFT | $2, $0, -1, -1, (PAL_OW_RED << 4) | $82, 2, TrainerCooltrainermSean, EVENT_FAST_SHIP_PASSENGERS_EASTBOUND + person_event SPRITE_COOLTRAINER_F, 9, 5, OW_UP | $3, $0, -1, -1, (PAL_OW_RED << 4) | $82, 3, TrainerCooltrainerfCarol, EVENT_FAST_SHIP_PASSENGERS_EASTBOUND + person_event SPRITE_SUPER_NERD, 9, 5, OW_UP | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 3, TrainerPokemaniacEthan, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND + person_event SPRITE_POKEFAN_M, 21, 8, OW_UP | $3, $0, -1, -1, (PAL_OW_BROWN << 4) | $82, 3, TrainerHikerNoland, EVENT_FAST_SHIP_PASSENGERS_FIRST_TRIP + person_event SPRITE_SAILOR, 30, 8, OW_DOWN | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, SailorScript_0x755f1, EVENT_FAST_SHIP_CABINS_NNW_NNE_NE_SAILOR + person_event SPRITE_GENTLEMAN, 34, 11, OW_DOWN | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 1, TrainerGentlemanEdward, EVENT_FAST_SHIP_PASSENGERS_EASTBOUND + person_event SPRITE_PHARMACIST, 34, 6, OW_UP | $3, $0, -1, -1, (PAL_OW_GREEN << 4) | $82, 4, TrainerBurglarCorey, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND diff --git a/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm b/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm index 5e9eb09d9..5376c64cd 100644 --- a/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm +++ b/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm @@ -1,8 +1,8 @@ FastShipCabins_SE_SSE_CaptainsCabin_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 UnknownScript_0x75ea6: @@ -11,7 +11,7 @@ UnknownScript_0x75ea6: CaptainScript_0x75ea7: faceplayer loadfont - checkevent EVENT_030 + checkevent EVENT_FAST_SHIP_FIRST_TIME iftrue UnknownScript_0x75eb5 writetext UnknownText_0x76012 closetext @@ -35,17 +35,17 @@ TwinScript_0x75ebb: writetext UnknownText_0x7621f closetext loadmovesprites - special Function8c0b6 - special Functiond91 + special Special_FadeBlackQuickly + special Special_ReloadSpritesNoPalettes disappear $5 applymovement $0, MovementData_0x76004 moveperson $4, $3, $13 appear $4 spriteface $0, UP spriteface $4, UP - special Function8c0ab + special Special_FadeInQuickly spriteface $3, DOWN - showemote $0, $3, 15 + showemote EMOTE_SHOCK, $3, 15 applymovement $4, MovementData_0x7600c spriteface $3, RIGHT checkflag ENGINE_PLAYER_IS_FEMALE @@ -67,7 +67,7 @@ UnknownScript_0x75f09: loadfont writetext UnknownText_0x76143 keeptextopen - setevent EVENT_72B + setevent EVENT_VERMILION_PORT_SAILOR_AT_GANGWAY domaptrigger GROUP_FAST_SHIP_1F, MAP_FAST_SHIP_1F, $0 jump UnknownScript_0x75f37 @@ -76,7 +76,7 @@ GentlemanScript_0x75f1f: loadfont checkevent EVENT_GOT_METAL_COAT_FROM_GRANDPA_ON_SS_AQUA iftrue UnknownScript_0x75f67 - checkevent EVENT_732 + checkevent EVENT_FAST_SHIP_CABINS_SE_SSE_CAPTAINS_CABIN_TWIN_2 iftrue UnknownScript_0x75f58 writetext UnknownText_0x760ae closetext @@ -98,8 +98,8 @@ UnknownScript_0x75f44: loadfont writetext UnknownText_0x76645 closetext - setevent EVENT_031 - setevent EVENT_032 + setevent EVENT_FAST_SHIP_HAS_ARRIVED + setevent EVENT_FAST_SHIP_FOUND_GIRL loadmovesprites end @@ -128,23 +128,7 @@ TwinScript_0x75f6d: end TrainerPokefanmColin: - ; bit/flag number - dw EVENT_BEAT_POKEFANM_COLIN - - ; trainer group && trainer id - db POKEFANM, COLIN - - ; text when seen - dw PokefanmColinSeenText - - ; text when trainer beaten - dw PokefanmColinBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw PokefanmColinScript + trainer EVENT_BEAT_POKEFANM_COLIN, POKEFANM, COLIN, PokefanmColinSeenText, PokefanmColinBeatenText, $0000, PokefanmColinScript PokefanmColinScript: talkaftercancel @@ -155,23 +139,7 @@ PokefanmColinScript: end TrainerTwinsMegandpeg1: - ; bit/flag number - dw EVENT_BEAT_TWINS_MEG_AND_PEG - - ; trainer group && trainer id - db TWINS, MEGANDPEG1 - - ; text when seen - dw TwinsMegandpeg1SeenText - - ; text when trainer beaten - dw TwinsMegandpeg1BeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw TwinsMegandpeg1Script + trainer EVENT_BEAT_TWINS_MEG_AND_PEG, TWINS, MEGANDPEG1, TwinsMegandpeg1SeenText, TwinsMegandpeg1BeatenText, $0000, TwinsMegandpeg1Script TwinsMegandpeg1Script: talkaftercancel @@ -182,23 +150,7 @@ TwinsMegandpeg1Script: end TrainerTwinsMegandpeg2: - ; bit/flag number - dw EVENT_BEAT_TWINS_MEG_AND_PEG - - ; trainer group && trainer id - db TWINS, MEGANDPEG2 - - ; text when seen - dw TwinsMegandpeg2SeenText - - ; text when trainer beaten - dw TwinsMegandpeg2BeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw TwinsMegandpeg2Script + trainer EVENT_BEAT_TWINS_MEG_AND_PEG, TWINS, MEGANDPEG2, TwinsMegandpeg2SeenText, TwinsMegandpeg2BeatenText, $0000, TwinsMegandpeg2Script TwinsMegandpeg2Script: talkaftercancel @@ -209,23 +161,7 @@ TwinsMegandpeg2Script: end TrainerPsychicRodney: - ; bit/flag number - dw EVENT_BEAT_PSYCHIC_RODNEY - - ; trainer group && trainer id - db PSYCHIC_T, RODNEY - - ; text when seen - dw PsychicRodneySeenText - - ; text when trainer beaten - dw PsychicRodneyBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw PsychicRodneyScript + trainer EVENT_BEAT_PSYCHIC_RODNEY, PSYCHIC_T, RODNEY, PsychicRodneySeenText, PsychicRodneyBeatenText, $0000, PsychicRodneyScript PsychicRodneyScript: talkaftercancel @@ -236,23 +172,7 @@ PsychicRodneyScript: end TrainerPokefanmJeremy: - ; bit/flag number - dw EVENT_BEAT_POKEFANM_JEREMY - - ; trainer group && trainer id - db POKEFANM, JEREMY - - ; text when seen - dw PokefanmJeremySeenText - - ; text when trainer beaten - dw PokefanmJeremyBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw PokefanmJeremyScript + trainer EVENT_BEAT_POKEFANM_JEREMY, POKEFANM, JEREMY, PokefanmJeremySeenText, PokefanmJeremyBeatenText, $0000, PokefanmJeremyScript PokefanmJeremyScript: talkaftercancel @@ -263,23 +183,7 @@ PokefanmJeremyScript: end TrainerPokefanfGeorgia: - ; bit/flag number - dw EVENT_BEAT_POKEFANF_GEORGIA - - ; trainer group && trainer id - db POKEFANF, GEORGIA - - ; text when seen - dw PokefanfGeorgiaSeenText - - ; text when trainer beaten - dw PokefanfGeorgiaBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw PokefanfGeorgiaScript + trainer EVENT_BEAT_POKEFANF_GEORGIA, POKEFANF, GEORGIA, PokefanfGeorgiaSeenText, PokefanfGeorgiaBeatenText, $0000, PokefanfGeorgiaScript PokefanfGeorgiaScript: talkaftercancel @@ -290,23 +194,7 @@ PokefanfGeorgiaScript: end TrainerSupernerdShawn: - ; bit/flag number - dw EVENT_BEAT_SUPER_NERD_SHAWN - - ; trainer group && trainer id - db SUPER_NERD, SHAWN - - ; text when seen - dw SupernerdShawnSeenText - - ; text when trainer beaten - dw SupernerdShawnBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw SupernerdShawnScript + trainer EVENT_BEAT_SUPER_NERD_SHAWN, SUPER_NERD, SHAWN, SupernerdShawnSeenText, SupernerdShawnBeatenText, $0000, SupernerdShawnScript SupernerdShawnScript: talkaftercancel @@ -565,7 +453,7 @@ FastShipCabins_SE_SSE_CaptainsCabin_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 6 warp_def $7, $2, 8, GROUP_FAST_SHIP_1F, MAP_FAST_SHIP_1F warp_def $7, $3, 8, GROUP_FAST_SHIP_1F, MAP_FAST_SHIP_1F @@ -574,23 +462,23 @@ FastShipCabins_SE_SSE_CaptainsCabin_MapEventHeader: warp_def $21, $2, 10, GROUP_FAST_SHIP_1F, MAP_FAST_SHIP_1F warp_def $21, $3, 10, GROUP_FAST_SHIP_1F, MAP_FAST_SHIP_1F - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 1 - signpost 25, 4, $0, FastShipCaptainsCabinTrashcan + signpost 25, 4, SIGNPOST_READ, FastShipCaptainsCabinTrashcan - ; people-events +.PersonEvents: db 11 - person_event SPRITE_CAPTAIN, 29, 7, $6, $0, 255, 255, $90, 0, CaptainScript_0x75ea7, -1 - person_event SPRITE_GENTLEMAN, 21, 6, $9, $0, 255, 255, $90, 0, GentlemanScript_0x75f1f, EVENT_730 - person_event SPRITE_TWIN, 21, 7, $a, $0, 255, 255, $0, 0, TwinScript_0x75f6d, EVENT_731 - person_event SPRITE_TWIN, 29, 6, $a, $0, 255, 255, $0, 0, TwinScript_0x75ebb, EVENT_732 - person_event SPRITE_POKEFAN_M, 10, 9, $8, $0, 255, 255, $82, 5, TrainerPokefanmColin, EVENT_739 - person_event SPRITE_TWIN, 8, 6, $6, $0, 255, 255, $82, 1, TrainerTwinsMegandpeg1, EVENT_739 - person_event SPRITE_TWIN, 8, 7, $6, $0, 255, 255, $82, 1, TrainerTwinsMegandpeg2, EVENT_739 - person_event SPRITE_SUPER_NERD, 9, 9, $8, $0, 255, 255, $92, 5, TrainerPsychicRodney, EVENT_73A - person_event SPRITE_POKEFAN_M, 7, 6, $6, $0, 255, 255, $82, 3, TrainerPokefanmJeremy, EVENT_73B - person_event SPRITE_POKEFAN_F, 9, 9, $9, $0, 255, 255, $82, 1, TrainerPokefanfGeorgia, EVENT_73B - person_event SPRITE_SUPER_NERD, 19, 5, $3, $0, 255, 255, $b2, 2, TrainerSupernerdShawn, EVENT_73A + person_event SPRITE_CAPTAIN, 29, 7, OW_UP | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, CaptainScript_0x75ea7, -1 + person_event SPRITE_GENTLEMAN, 21, 6, OW_LEFT | $1, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, GentlemanScript_0x75f1f, EVENT_FAST_SHIP_CABINS_SE_SSE_GENTLEMAN + person_event SPRITE_TWIN, 21, 7, OW_LEFT | $2, $0, -1, -1, $0, 0, TwinScript_0x75f6d, EVENT_FAST_SHIP_CABINS_SE_SSE_CAPTAINS_CABIN_TWIN_1 + person_event SPRITE_TWIN, 29, 6, OW_LEFT | $2, $0, -1, -1, $0, 0, TwinScript_0x75ebb, EVENT_FAST_SHIP_CABINS_SE_SSE_CAPTAINS_CABIN_TWIN_2 + person_event SPRITE_POKEFAN_M, 10, 9, OW_LEFT | $0, $0, -1, -1, (PAL_OW_RED << 4) | $82, 5, TrainerPokefanmColin, EVENT_FAST_SHIP_PASSENGERS_FIRST_TRIP + person_event SPRITE_TWIN, 8, 6, OW_UP | $2, $0, -1, -1, (PAL_OW_RED << 4) | $82, 1, TrainerTwinsMegandpeg1, EVENT_FAST_SHIP_PASSENGERS_FIRST_TRIP + person_event SPRITE_TWIN, 8, 7, OW_UP | $2, $0, -1, -1, (PAL_OW_RED << 4) | $82, 1, TrainerTwinsMegandpeg2, EVENT_FAST_SHIP_PASSENGERS_FIRST_TRIP + person_event SPRITE_SUPER_NERD, 9, 9, OW_LEFT | $0, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 5, TrainerPsychicRodney, EVENT_FAST_SHIP_PASSENGERS_EASTBOUND + person_event SPRITE_POKEFAN_M, 7, 6, OW_UP | $2, $0, -1, -1, (PAL_OW_RED << 4) | $82, 3, TrainerPokefanmJeremy, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND + person_event SPRITE_POKEFAN_F, 9, 9, OW_LEFT | $1, $0, -1, -1, (PAL_OW_RED << 4) | $82, 1, TrainerPokefanfGeorgia, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND + person_event SPRITE_SUPER_NERD, 19, 5, OW_DOWN | $3, $0, -1, -1, (PAL_OW_BROWN << 4) | $82, 2, TrainerSupernerdShawn, EVENT_FAST_SHIP_PASSENGERS_EASTBOUND diff --git a/maps/FastShipCabins_SW_SSW_NW.asm b/maps/FastShipCabins_SW_SSW_NW.asm index 5c3b58a4a..5b62f4b09 100644 --- a/maps/FastShipCabins_SW_SSW_NW.asm +++ b/maps/FastShipCabins_SW_SSW_NW.asm @@ -1,28 +1,12 @@ FastShipCabins_SW_SSW_NW_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 TrainerFirebreatherLyle: - ; bit/flag number - dw EVENT_BEAT_FIREBREATHER_LYLE - - ; trainer group && trainer id - db FIREBREATHER, LYLE - - ; text when seen - dw FirebreatherLyleSeenText - - ; text when trainer beaten - dw FirebreatherLyleBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw FirebreatherLyleScript + trainer EVENT_BEAT_FIREBREATHER_LYLE, FIREBREATHER, LYLE, FirebreatherLyleSeenText, FirebreatherLyleBeatenText, $0000, FirebreatherLyleScript FirebreatherLyleScript: talkaftercancel @@ -33,23 +17,7 @@ FirebreatherLyleScript: end TrainerBug_catcherKen: - ; bit/flag number - dw EVENT_BEAT_BUG_CATCHER_KEN - - ; trainer group && trainer id - db BUG_CATCHER, KEN - - ; text when seen - dw Bug_catcherKenSeenText - - ; text when trainer beaten - dw Bug_catcherKenBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw Bug_catcherKenScript + trainer EVENT_BEAT_BUG_CATCHER_KEN, BUG_CATCHER, KEN, Bug_catcherKenSeenText, Bug_catcherKenBeatenText, $0000, Bug_catcherKenScript Bug_catcherKenScript: talkaftercancel @@ -60,23 +28,7 @@ Bug_catcherKenScript: end TrainerBeautyCassie: - ; bit/flag number - dw EVENT_BEAT_BEAUTY_CASSIE - - ; trainer group && trainer id - db BEAUTY, CASSIE - - ; text when seen - dw BeautyCassieSeenText - - ; text when trainer beaten - dw BeautyCassieBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw BeautyCassieScript + trainer EVENT_BEAT_BEAUTY_CASSIE, BEAUTY, CASSIE, BeautyCassieSeenText, BeautyCassieBeatenText, $0000, BeautyCassieScript BeautyCassieScript: talkaftercancel @@ -87,23 +39,7 @@ BeautyCassieScript: end TrainerGuitaristClyde: - ; bit/flag number - dw EVENT_BEAT_GUITARIST_CLYDE - - ; trainer group && trainer id - db GUITARIST, CLYDE - - ; text when seen - dw GuitaristClydeSeenText - - ; text when trainer beaten - dw GuitaristClydeBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw GuitaristClydeScript + trainer EVENT_BEAT_GUITARIST_CLYDE, GUITARIST, CLYDE, GuitaristClydeSeenText, GuitaristClydeBeatenText, $0000, GuitaristClydeScript GuitaristClydeScript: talkaftercancel @@ -127,23 +63,23 @@ FastShipBed: writetext FastShipBedText1 closetext loadmovesprites - special Function8c0b6 - special Functiond91 - special Function1060a2 + special Special_FadeBlackQuickly + special Special_ReloadSpritesNoPalettes + special Mobile_HealParty special HealParty playmusic MUSIC_HEAL pause 60 special RestartMapMusic - special Function8c0ab + special Special_FadeInQuickly loadfont writetext FastShipBedText2 closetext loadmovesprites - checkevent EVENT_031 + checkevent EVENT_FAST_SHIP_HAS_ARRIVED iftrue UnknownScript_0x75ae1 - checkevent EVENT_032 + checkevent EVENT_FAST_SHIP_FOUND_GIRL iftrue UnknownScript_0x75ae2 - checkevent EVENT_030 + checkevent EVENT_FAST_SHIP_FIRST_TIME iftrue UnknownScript_0x75ae2 UnknownScript_0x75ae1: end @@ -157,7 +93,7 @@ UnknownScript_0x75ae2: writetext FastShipArrivedVermilionText closetext loadmovesprites - setevent EVENT_031 + setevent EVENT_FAST_SHIP_HAS_ARRIVED end UnknownScript_0x75af7: @@ -165,7 +101,7 @@ UnknownScript_0x75af7: writetext FastShipArrivedOlivineText closetext loadmovesprites - setevent EVENT_031 + setevent EVENT_FAST_SHIP_HAS_ARRIVED end FastShipCabinsNorthwestCabinTrashcan: @@ -284,7 +220,7 @@ FastShipCabins_SW_SSW_NW_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 5 warp_def $0, $2, 5, GROUP_FAST_SHIP_1F, MAP_FAST_SHIP_1F warp_def $13, $2, 6, GROUP_FAST_SHIP_1F, MAP_FAST_SHIP_1F @@ -292,18 +228,18 @@ FastShipCabins_SW_SSW_NW_MapEventHeader: warp_def $1f, $2, 7, GROUP_FAST_SHIP_1F, MAP_FAST_SHIP_1F warp_def $1f, $3, 7, GROUP_FAST_SHIP_1F, MAP_FAST_SHIP_1F - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 3 - signpost 1, 7, $0, FastShipBed - signpost 2, 7, $0, FastShipBed - signpost 7, 7, $0, FastShipCabinsNorthwestCabinTrashcan + signpost 1, 7, SIGNPOST_READ, FastShipBed + signpost 2, 7, SIGNPOST_READ, FastShipBed + signpost 7, 7, SIGNPOST_READ, FastShipCabinsNorthwestCabinTrashcan - ; people-events +.PersonEvents: db 4 - person_event SPRITE_FISHER, 19, 5, $1e, $0, 255, 255, $82, 2, TrainerFirebreatherLyle, EVENT_739 - person_event SPRITE_BUG_CATCHER, 19, 10, $a, $0, 255, 255, $b2, 2, TrainerBug_catcherKen, EVENT_73B - person_event SPRITE_BUENA, 30, 5, $a, $0, 255, 255, $92, 3, TrainerBeautyCassie, EVENT_73A - person_event SPRITE_ROCKER, 32, 7, $1e, $0, 255, 255, $82, 2, TrainerGuitaristClyde, EVENT_73B + person_event SPRITE_FISHER, 19, 5, OW_RIGHT | $12, $0, -1, -1, (PAL_OW_RED << 4) | $82, 2, TrainerFirebreatherLyle, EVENT_FAST_SHIP_PASSENGERS_FIRST_TRIP + person_event SPRITE_BUG_CATCHER, 19, 10, OW_LEFT | $2, $0, -1, -1, (PAL_OW_BROWN << 4) | $82, 2, TrainerBug_catcherKen, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND + person_event SPRITE_BUENA, 30, 5, OW_LEFT | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 3, TrainerBeautyCassie, EVENT_FAST_SHIP_PASSENGERS_EASTBOUND + person_event SPRITE_ROCKER, 32, 7, OW_RIGHT | $12, $0, -1, -1, (PAL_OW_RED << 4) | $82, 2, TrainerGuitaristClyde, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND diff --git a/maps/FightingDojo.asm b/maps/FightingDojo.asm index 34c909c06..ce0515e79 100644 --- a/maps/FightingDojo.asm +++ b/maps/FightingDojo.asm @@ -1,8 +1,8 @@ FightingDojo_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 BlackBeltScript_0x189b61: @@ -42,20 +42,20 @@ FightingDojo_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $b, $4, 1, GROUP_SAFFRON_CITY, MAP_SAFFRON_CITY warp_def $b, $5, 1, GROUP_SAFFRON_CITY, MAP_SAFFRON_CITY - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 2 - signpost 0, 4, $0, MapFightingDojoSignpost0Script - signpost 0, 5, $0, MapFightingDojoSignpost1Script + signpost 0, 4, SIGNPOST_READ, MapFightingDojoSignpost0Script + signpost 0, 5, SIGNPOST_READ, MapFightingDojoSignpost1Script - ; people-events +.PersonEvents: db 2 - person_event SPRITE_BLACK_BELT, 8, 8, $6, $0, 255, 255, $90, 0, BlackBeltScript_0x189b61, -1 - person_event SPRITE_POKE_BALL, 5, 7, $1, $0, 255, 255, $1, 0, ItemFragment_0x189b6a, EVENT_PICKED_UP_FOCUS_BAND + person_event SPRITE_BLACK_BELT, 8, 8, OW_UP | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, BlackBeltScript_0x189b61, -1 + person_event SPRITE_POKE_BALL, 5, 7, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x189b6a, EVENT_PICKED_UP_FOCUS_BAND diff --git a/maps/FuchsiaBillSpeechHouse.asm b/maps/FuchsiaBillSpeechHouse.asm index 27c4faefb..ae31a356e 100644 --- a/maps/FuchsiaBillSpeechHouse.asm +++ b/maps/FuchsiaBillSpeechHouse.asm @@ -1,8 +1,8 @@ FuchsiaBillSpeechHouse_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 PokefanFScript_0x1963bd: @@ -27,18 +27,18 @@ FuchsiaBillSpeechHouse_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $7, $2, 4, GROUP_FUCHSIA_CITY, MAP_FUCHSIA_CITY warp_def $7, $3, 4, GROUP_FUCHSIA_CITY, MAP_FUCHSIA_CITY - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 2 - person_event SPRITE_POKEFAN_F, 7, 6, $9, $0, 255, 255, $80, 0, PokefanFScript_0x1963bd, -1 - person_event SPRITE_YOUNGSTER, 8, 10, $4, $10, 255, 255, $0, 0, YoungsterScript_0x1963c0, -1 + person_event SPRITE_POKEFAN_F, 7, 6, OW_LEFT | $1, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, PokefanFScript_0x1963bd, -1 + person_event SPRITE_YOUNGSTER, 8, 10, OW_UP | $0, $10, -1, -1, $0, 0, YoungsterScript_0x1963c0, -1 diff --git a/maps/FuchsiaCity.asm b/maps/FuchsiaCity.asm index 90694e6e7..7dcb20190 100644 --- a/maps/FuchsiaCity.asm +++ b/maps/FuchsiaCity.asm @@ -1,8 +1,8 @@ FuchsiaCity_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 1 ; callbacks @@ -124,7 +124,7 @@ FuchsiaCity_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 11 warp_def $d, $5, 2, GROUP_FUCHSIA_MART, MAP_FUCHSIA_MART warp_def $d, $16, 1, GROUP_SAFARI_ZONE_MAIN_OFFICE, MAP_SAFARI_ZONE_MAIN_OFFICE @@ -138,23 +138,23 @@ FuchsiaCity_MapEventHeader: warp_def $23, $7, 1, GROUP_ROUTE_19___FUCHSIA_GATE, MAP_ROUTE_19___FUCHSIA_GATE warp_def $23, $8, 2, GROUP_ROUTE_19___FUCHSIA_GATE, MAP_ROUTE_19___FUCHSIA_GATE - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 8 - signpost 15, 21, $0, FuchsiaCitySign - signpost 29, 5, $0, FuchsiaGymSign - signpost 15, 25, $0, SafariZoneOfficeSign - signpost 29, 27, $0, WardensHomeSign - signpost 5, 17, $0, SafariZoneClosedSign - signpost 15, 13, $0, NoLitteringSign - signpost 27, 20, $0, FuchsiaCityPokeCenterSign - signpost 13, 6, $0, FuchsiaCityMartSign - - ; people-events + signpost 15, 21, SIGNPOST_READ, FuchsiaCitySign + signpost 29, 5, SIGNPOST_READ, FuchsiaGymSign + signpost 15, 25, SIGNPOST_READ, SafariZoneOfficeSign + signpost 29, 27, SIGNPOST_READ, WardensHomeSign + signpost 5, 17, SIGNPOST_READ, SafariZoneClosedSign + signpost 15, 13, SIGNPOST_READ, NoLitteringSign + signpost 27, 20, SIGNPOST_READ, FuchsiaCityPokeCenterSign + signpost 13, 6, SIGNPOST_READ, FuchsiaCityMartSign + +.PersonEvents: db 4 - person_event SPRITE_YOUNGSTER, 22, 27, $2, $11, 255, 255, $a0, 0, YoungsterScript_0x194b22, -1 - person_event SPRITE_POKEFAN_M, 12, 17, $2, $11, 255, 255, $b0, 0, PokefanMScript_0x194b25, -1 - person_event SPRITE_TEACHER, 18, 20, $2, $11, 255, 255, $80, 0, TeacherScript_0x194b28, -1 - person_event SPRITE_FRUIT_TREE, 5, 12, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x194b43, -1 + person_event SPRITE_YOUNGSTER, 22, 27, OW_DOWN | $2, $11, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, YoungsterScript_0x194b22, -1 + person_event SPRITE_POKEFAN_M, 12, 17, OW_DOWN | $2, $11, -1, -1, (PAL_OW_BROWN << 4) | $80, 0, PokefanMScript_0x194b25, -1 + person_event SPRITE_TEACHER, 18, 20, OW_DOWN | $2, $11, -1, -1, (PAL_OW_RED << 4) | $80, 0, TeacherScript_0x194b28, -1 + person_event SPRITE_FRUIT_TREE, 5, 12, OW_DOWN | $1, $0, -1, -1, $0, 0, FruitTreeScript_0x194b43, -1 diff --git a/maps/FuchsiaGym.asm b/maps/FuchsiaGym.asm index acc1c3898..16363b003 100644 --- a/maps/FuchsiaGym.asm +++ b/maps/FuchsiaGym.asm @@ -1,8 +1,8 @@ FuchsiaGym_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 JanineScript_0x195db9: @@ -23,11 +23,11 @@ JanineScript_0x195db9: setevent EVENT_BEAT_LASS_LINDA setevent EVENT_BEAT_PICNICKER_CINDY setevent EVENT_BEAT_CAMPER_BARRY - variablesprite $7, $28 - variablesprite $8, $28 - variablesprite $9, $28 - variablesprite $a, $27 - special Function14209 + variablesprite SPRITE_FUCHSIA_GYM_1, SPRITE_LASS + variablesprite SPRITE_FUCHSIA_GYM_2, SPRITE_LASS + variablesprite SPRITE_FUCHSIA_GYM_3, SPRITE_LASS + variablesprite SPRITE_FUCHSIA_GYM_4, SPRITE_YOUNGSTER + special RunCallback_04 loadfont writetext UnknownText_0x195feb playsound SFX_GET_BADGE @@ -56,8 +56,8 @@ FuschiaGym1Script_0x195e1b: iftrue UnknownScript_0x195e2c applymovement $3, MovementData_0x195f27 faceplayer - variablesprite $7, $28 - special Function14209 + variablesprite SPRITE_FUCHSIA_GYM_1, SPRITE_LASS + special RunCallback_04 UnknownScript_0x195e2c: faceplayer loadfont @@ -75,7 +75,7 @@ UnknownScript_0x195e2c: end UnknownScript_0x195e4a: - variablesprite $7, $a + variablesprite SPRITE_FUCHSIA_GYM_1, SPRITE_JANINE returnafterbattle end @@ -90,8 +90,8 @@ FuschiaGym2Script_0x195e55: iftrue UnknownScript_0x195e66 applymovement $4, MovementData_0x195f27 faceplayer - variablesprite $8, $28 - special Function14209 + variablesprite SPRITE_FUCHSIA_GYM_2, SPRITE_LASS + special RunCallback_04 UnknownScript_0x195e66: faceplayer loadfont @@ -109,7 +109,7 @@ UnknownScript_0x195e66: end UnknownScript_0x195e84: - variablesprite $8, $a + variablesprite SPRITE_FUCHSIA_GYM_2, SPRITE_JANINE returnafterbattle end @@ -124,8 +124,8 @@ FuschiaGym3Script_0x195e8f: iftrue UnknownScript_0x195ea0 applymovement $5, MovementData_0x195f27 faceplayer - variablesprite $9, $28 - special Function14209 + variablesprite SPRITE_FUCHSIA_GYM_3, SPRITE_LASS + special RunCallback_04 UnknownScript_0x195ea0: faceplayer loadfont @@ -143,7 +143,7 @@ UnknownScript_0x195ea0: end UnknownScript_0x195ebe: - variablesprite $9, $a + variablesprite SPRITE_FUCHSIA_GYM_3, SPRITE_JANINE returnafterbattle end @@ -158,8 +158,8 @@ FuschiaGym4Script_0x195ec9: iftrue UnknownScript_0x195eda applymovement $6, MovementData_0x195f27 faceplayer - variablesprite $a, $27 - special Function14209 + variablesprite SPRITE_FUCHSIA_GYM_4, SPRITE_YOUNGSTER + special RunCallback_04 UnknownScript_0x195eda: faceplayer loadfont @@ -177,7 +177,7 @@ UnknownScript_0x195eda: end UnknownScript_0x195ef8: - variablesprite $a, $a + variablesprite SPRITE_FUCHSIA_GYM_4, SPRITE_JANINE returnafterbattle end @@ -376,24 +376,24 @@ FuchsiaGym_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $11, $4, 3, GROUP_FUCHSIA_CITY, MAP_FUCHSIA_CITY warp_def $11, $5, 3, GROUP_FUCHSIA_CITY, MAP_FUCHSIA_CITY - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 2 - signpost 15, 3, $0, FuchsiaGymStatue - signpost 15, 6, $0, FuchsiaGymStatue + signpost 15, 3, SIGNPOST_READ, FuchsiaGymStatue + signpost 15, 6, SIGNPOST_READ, FuchsiaGymStatue - ; people-events +.PersonEvents: db 6 - person_event SPRITE_JANINE, 14, 5, $3, $0, 255, 255, $90, 0, JanineScript_0x195db9, -1 - person_event SPRITE_FUSCHIA_GYM_1, 11, 9, $a, $0, 255, 255, $90, 0, FuschiaGym1Script_0x195e1b, -1 - person_event SPRITE_FUSCHIA_GYM_2, 15, 9, $a, $0, 255, 255, $90, 0, FuschiaGym2Script_0x195e55, -1 - person_event SPRITE_FUSCHIA_GYM_3, 8, 13, $a, $0, 255, 255, $90, 0, FuschiaGym3Script_0x195e8f, -1 - person_event SPRITE_FUSCHIA_GYM_4, 6, 8, $a, $0, 255, 255, $90, 0, FuschiaGym4Script_0x195ec9, -1 - person_event SPRITE_GYM_GUY, 19, 11, $6, $0, 255, 255, $90, 0, FuchsiaGymGuyScript, -1 + person_event SPRITE_JANINE, 14, 5, OW_DOWN | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, JanineScript_0x195db9, -1 + person_event SPRITE_FUCHSIA_GYM_1, 11, 9, OW_LEFT | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, FuschiaGym1Script_0x195e1b, -1 + person_event SPRITE_FUCHSIA_GYM_2, 15, 9, OW_LEFT | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, FuschiaGym2Script_0x195e55, -1 + person_event SPRITE_FUCHSIA_GYM_3, 8, 13, OW_LEFT | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, FuschiaGym3Script_0x195e8f, -1 + person_event SPRITE_FUCHSIA_GYM_4, 6, 8, OW_LEFT | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, FuschiaGym4Script_0x195ec9, -1 + person_event SPRITE_GYM_GUY, 19, 11, OW_UP | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, FuchsiaGymGuyScript, -1 diff --git a/maps/FuchsiaMart.asm b/maps/FuchsiaMart.asm index 739fff138..6102bcb35 100644 --- a/maps/FuchsiaMart.asm +++ b/maps/FuchsiaMart.asm @@ -1,8 +1,8 @@ FuchsiaMart_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 ClerkScript_0x195ce8: @@ -36,19 +36,19 @@ FuchsiaMart_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $7, $2, 1, GROUP_FUCHSIA_CITY, MAP_FUCHSIA_CITY warp_def $7, $3, 1, GROUP_FUCHSIA_CITY, MAP_FUCHSIA_CITY - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 3 - person_event SPRITE_CLERK, 7, 5, $9, $0, 255, 255, $0, 0, ClerkScript_0x195ce8, -1 - person_event SPRITE_FISHER, 6, 7, $8, $0, 255, 255, $80, 0, FisherScript_0x195cef, -1 - person_event SPRITE_COOLTRAINER_F, 10, 11, $5, $2, 255, 255, $a0, 0, CooltrainerFScript_0x195cf2, -1 + person_event SPRITE_CLERK, 7, 5, OW_LEFT | $1, $0, -1, -1, $0, 0, ClerkScript_0x195ce8, -1 + person_event SPRITE_FISHER, 6, 7, OW_LEFT | $0, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, FisherScript_0x195cef, -1 + person_event SPRITE_COOLTRAINER_F, 10, 11, OW_UP | $1, $2, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, CooltrainerFScript_0x195cf2, -1 diff --git a/maps/FuchsiaPokeCenter1F.asm b/maps/FuchsiaPokeCenter1F.asm index 389ea1130..4dda55a23 100644 --- a/maps/FuchsiaPokeCenter1F.asm +++ b/maps/FuchsiaPokeCenter1F.asm @@ -1,11 +1,11 @@ FuchsiaPokeCenter1F_MapScriptHeader: - ; trigger count +.MapTriggers: db 1 ; triggers dw UnknownScript_0x196458, $0000 - ; callback count +.MapCallbacks: db 0 UnknownScript_0x196458: @@ -28,16 +28,16 @@ JanineImpersonatorScript_0x196462: loadmovesprites applymovement $5, MovementData_0x196486 faceplayer - variablesprite $c, $a - special Function14209 + variablesprite SPRITE_JANINE_IMPERSONATOR, SPRITE_JANINE + special RunCallback_04 loadfont writetext UnknownText_0x19654e closetext loadmovesprites applymovement $5, MovementData_0x196486 faceplayer - variablesprite $c, $28 - special Function14209 + variablesprite SPRITE_JANINE_IMPERSONATOR, SPRITE_LASS + special RunCallback_04 end MovementData_0x196486: @@ -88,21 +88,21 @@ FuchsiaPokeCenter1F_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 3 warp_def $7, $3, 5, GROUP_FUCHSIA_CITY, MAP_FUCHSIA_CITY warp_def $7, $4, 5, GROUP_FUCHSIA_CITY, MAP_FUCHSIA_CITY warp_def $7, $0, 1, GROUP_POKECENTER_2F, MAP_POKECENTER_2F - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 4 - person_event SPRITE_NURSE, 5, 7, $6, $0, 255, 255, $a0, 0, NurseScript_0x196459, -1 - person_event SPRITE_COOLTRAINER_M, 8, 12, $5, $1, 255, 255, $0, 0, CooltrainerMScript_0x19645c, -1 - person_event SPRITE_COOLTRAINER_F, 8, 5, $5, $1, 255, 255, $0, 0, CooltrainerFScript_0x19645f, -1 - person_event SPRITE_JANINE_IMPERSONATOR, 7, 9, $6, $0, 255, 255, $90, 0, JanineImpersonatorScript_0x196462, -1 + person_event SPRITE_NURSE, 5, 7, OW_UP | $2, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, NurseScript_0x196459, -1 + person_event SPRITE_COOLTRAINER_M, 8, 12, OW_UP | $1, $1, -1, -1, $0, 0, CooltrainerMScript_0x19645c, -1 + person_event SPRITE_COOLTRAINER_F, 8, 5, OW_UP | $1, $1, -1, -1, $0, 0, CooltrainerFScript_0x19645f, -1 + person_event SPRITE_JANINE_IMPERSONATOR, 7, 9, OW_UP | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, JanineImpersonatorScript_0x196462, -1 diff --git a/maps/FuchsiaPokeCenter2FBeta.asm b/maps/FuchsiaPokeCenter2FBeta.asm index 20649cd68..20ab0c4b7 100644 --- a/maps/FuchsiaPokeCenter2FBeta.asm +++ b/maps/FuchsiaPokeCenter2FBeta.asm @@ -1,23 +1,23 @@ FuchsiaPokeCenter2FBeta_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 FuchsiaPokeCenter2FBeta_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 1 warp_def $7, $0, 3, GROUP_FUCHSIA_POKECENTER_1F, MAP_FUCHSIA_POKECENTER_1F - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 0 diff --git a/maps/GoldenrodBikeShop.asm b/maps/GoldenrodBikeShop.asm index f0d33c782..909b07788 100644 --- a/maps/GoldenrodBikeShop.asm +++ b/maps/GoldenrodBikeShop.asm @@ -1,8 +1,8 @@ GoldenrodBikeShop_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 UnknownScript_0x5474f: @@ -103,26 +103,26 @@ GoldenrodBikeShop_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $7, $2, 2, GROUP_GOLDENROD_CITY, MAP_GOLDENROD_CITY warp_def $7, $3, 2, GROUP_GOLDENROD_CITY, MAP_GOLDENROD_CITY - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 9 - signpost 2, 1, $0, MapGoldenrodBikeShopSignpost8Script - signpost 3, 0, $0, MapGoldenrodBikeShopSignpost8Script - signpost 3, 1, $0, MapGoldenrodBikeShopSignpost8Script - signpost 5, 0, $0, MapGoldenrodBikeShopSignpost8Script - signpost 5, 1, $0, MapGoldenrodBikeShopSignpost8Script - signpost 6, 0, $0, MapGoldenrodBikeShopSignpost8Script - signpost 6, 1, $0, MapGoldenrodBikeShopSignpost8Script - signpost 6, 6, $0, MapGoldenrodBikeShopSignpost8Script - signpost 6, 7, $0, MapGoldenrodBikeShopSignpost8Script - - ; people-events + signpost 2, 1, SIGNPOST_READ, MapGoldenrodBikeShopSignpost8Script + signpost 3, 0, SIGNPOST_READ, MapGoldenrodBikeShopSignpost8Script + signpost 3, 1, SIGNPOST_READ, MapGoldenrodBikeShopSignpost8Script + signpost 5, 0, SIGNPOST_READ, MapGoldenrodBikeShopSignpost8Script + signpost 5, 1, SIGNPOST_READ, MapGoldenrodBikeShopSignpost8Script + signpost 6, 0, SIGNPOST_READ, MapGoldenrodBikeShopSignpost8Script + signpost 6, 1, SIGNPOST_READ, MapGoldenrodBikeShopSignpost8Script + signpost 6, 6, SIGNPOST_READ, MapGoldenrodBikeShopSignpost8Script + signpost 6, 7, SIGNPOST_READ, MapGoldenrodBikeShopSignpost8Script + +.PersonEvents: db 1 - person_event SPRITE_CLERK, 6, 11, $8, $0, 255, 255, $80, 0, ClerkScript_0x54750, -1 + person_event SPRITE_CLERK, 6, 11, OW_LEFT | $0, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, ClerkScript_0x54750, -1 diff --git a/maps/GoldenrodBillsHouse.asm b/maps/GoldenrodBillsHouse.asm index 91be3b95e..d442cf482 100644 --- a/maps/GoldenrodBillsHouse.asm +++ b/maps/GoldenrodBillsHouse.asm @@ -1,8 +1,8 @@ GoldenrodBillsHouse_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 BillsHouseBill: @@ -65,14 +65,14 @@ UnknownScript_0x54c33: BillsSister: faceplayer loadfont - checkcellnum $3 + checkcellnum PHONE_BILL iftrue UnknownScript_0x54c58 writetext UnknownText_0x54f9e - askforphonenumber $3 + askforphonenumber PHONE_BILL if_equal $1, UnknownScript_0x54c64 if_equal $2, UnknownScript_0x54c5e waitbutton - addcellnum $3 + addcellnum PHONE_BILL writetext UnknownText_0x54fd9 playsound SFX_REGISTER_PHONE_NUMBER waitbutton @@ -241,22 +241,22 @@ GoldenrodBillsHouse_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $7, $2, 4, GROUP_GOLDENROD_CITY, MAP_GOLDENROD_CITY warp_def $7, $3, 4, GROUP_GOLDENROD_CITY, MAP_GOLDENROD_CITY - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 3 - signpost 1, 0, $0, BillsHouseBookshelf2 - signpost 1, 1, $0, BillsHouseBookshelf1 - signpost 1, 7, $0, BillsHouseRadio + signpost 1, 0, SIGNPOST_READ, BillsHouseBookshelf2 + signpost 1, 1, SIGNPOST_READ, BillsHouseBookshelf1 + signpost 1, 7, SIGNPOST_READ, BillsHouseRadio - ; people-events +.PersonEvents: db 3 - person_event SPRITE_BILL, 7, 6, $9, $0, 255, 255, $0, 0, BillsHouseBill, EVENT_MET_BILL - person_event SPRITE_POKEFAN_F, 7, 9, $6, $0, 255, 255, $0, 0, BillsMom, -1 - person_event SPRITE_TWIN, 8, 9, $2, $11, 255, 255, $a0, 0, BillsSister, -1 + person_event SPRITE_BILL, 7, 6, OW_LEFT | $1, $0, -1, -1, $0, 0, BillsHouseBill, EVENT_MET_BILL + person_event SPRITE_POKEFAN_F, 7, 9, OW_UP | $2, $0, -1, -1, $0, 0, BillsMom, -1 + person_event SPRITE_TWIN, 8, 9, OW_DOWN | $2, $11, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, BillsSister, -1 diff --git a/maps/GoldenrodCity.asm b/maps/GoldenrodCity.asm index 7384c16f2..20c70eb0e 100644 --- a/maps/GoldenrodCity.asm +++ b/maps/GoldenrodCity.asm @@ -1,8 +1,8 @@ GoldenrodCity_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 2 ; callbacks @@ -11,7 +11,7 @@ GoldenrodCity_MapScriptHeader: .FlyPointAndFloria setflag ENGINE_FLYPOINT_GOLDENROD - setflag ENGINE_16 + setflag ENGINE_FLORIA checkevent EVENT_MET_FLORIA iftrue .FloriaDone clearevent EVENT_FLORIA_AT_SUDOWOODO @@ -31,7 +31,7 @@ GoldenrodCity_MapScriptHeader: return .MoveTutorAppear - checkflag ENGINE_5E + checkflag ENGINE_DAILY_MOVE_TUTOR iftrue .MoveTutorDone appear $10 .MoveTutorDone @@ -42,52 +42,52 @@ MoveTutor: loadfont writetext UnknownText_0x199042 yesorno - iffalse UnknownScript_0x19899a + iffalse .Refused special Function24b25 writetext UnknownText_0x199090 yesorno - iffalse UnknownScript_0x1989a0 + iffalse .Refused2 checkcoins 4000 - if_equal $2, UnknownScript_0x1989dd + if_equal $2, .NotEnoughMoney writetext UnknownText_0x1990ce - loadmenudata MenuDataHeader_0x198967 + loadmenudata .MoveMenuDataHeader interpretmenu2 writebackup - if_equal $1, UnknownScript_0x19893a - if_equal $2, UnknownScript_0x198949 - if_equal $3, UnknownScript_0x198958 - jump UnknownScript_0x1989d7 + if_equal $1, .Flamethrower + if_equal $2, .Thunderbolt + if_equal $3, .IceBeam + jump .Incompatible -UnknownScript_0x19893a: +.Flamethrower: writebyte $1 writetext UnknownText_0x1991cf special Function4925b - if_equal $0, UnknownScript_0x1989a6 - jump UnknownScript_0x1989d7 + if_equal $0, .TeachMove + jump .Incompatible -UnknownScript_0x198949: +.Thunderbolt: writebyte $2 writetext UnknownText_0x1991cf special Function4925b - if_equal $0, UnknownScript_0x1989a6 - jump UnknownScript_0x1989d7 + if_equal $0, .TeachMove + jump .Incompatible -UnknownScript_0x198958: +.IceBeam: writebyte $3 writetext UnknownText_0x1991cf special Function4925b - if_equal $0, UnknownScript_0x1989a6 - jump UnknownScript_0x1989d7 + if_equal $0, .TeachMove + jump .Incompatible -MenuDataHeader_0x198967: +.MoveMenuDataHeader: db $40 ; flags db 02, 00 ; start coords db 11, 15 ; end coords - dw MenuData2_0x19896f + dw .MenuData2 db 1 ; default option -MenuData2_0x19896f: +.MenuData2: db $80 ; flags db 4 ; items db "FLAMETHROWER@" @@ -96,19 +96,19 @@ MenuData2_0x19896f: db "CANCEL@" -UnknownScript_0x19899a: +.Refused: writetext UnknownText_0x1990b4 closetext loadmovesprites end -UnknownScript_0x1989a0: +.Refused2: writetext UnknownText_0x199107 closetext loadmovesprites end -UnknownScript_0x1989a6: +.TeachMove: writetext UnknownText_0x19913a keeptextopen takecoins 4000 @@ -119,27 +119,27 @@ UnknownScript_0x1989a6: closetext loadmovesprites checkcode VAR_FACING - if_equal $2, UnknownScript_0x1989c6 + if_equal $2, .WalkAroundPlayer applymovement $10, MovementData_0x198a5f - jump UnknownScript_0x1989ca + jump .GoInside -UnknownScript_0x1989c6: +.WalkAroundPlayer: applymovement $10, MovementData_0x198a63 -UnknownScript_0x1989ca: +.GoInside: playsound SFX_ENTER_DOOR disappear $10 - clearevent EVENT_76B - setflag ENGINE_5E + clearevent EVENT_GOLDENROD_GAME_CORNER_MOVE_TUTOR + setflag ENGINE_DAILY_MOVE_TUTOR waitbutton end -UnknownScript_0x1989d7: +.Incompatible: writetext UnknownText_0x1991a4 closetext loadmovesprites end -UnknownScript_0x1989dd: +.NotEnoughMoney: writetext UnknownText_0x1991ac closetext loadmovesprites @@ -155,13 +155,13 @@ CooltrainerFScript_0x1989e9: faceplayer loadfont checkevent EVENT_CLEARED_RADIO_TOWER - iftrue UnknownScript_0x1989f7 + iftrue .ClearedRadioTower writetext UnknownText_0x198ae6 closetext loadmovesprites end -UnknownScript_0x1989f7: +.ClearedRadioTower: writetext UnknownText_0x198b2d closetext loadmovesprites @@ -171,13 +171,13 @@ CooltrainerFScript_0x1989fd: faceplayer loadfont checkflag ENGINE_RADIO_CARD - iftrue UnknownScript_0x198a0b + iftrue .GotRadioCard writetext UnknownText_0x198b73 closetext loadmovesprites end -UnknownScript_0x198a0b: +.GotRadioCard: writetext UnknownText_0x198c14 closetext loadmovesprites @@ -543,7 +543,7 @@ GoldenrodCity_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 15 warp_def $7, $18, 1, GROUP_GOLDENROD_GYM, MAP_GOLDENROD_GYM warp_def $1d, $1d, 1, GROUP_GOLDENROD_BIKE_SHOP, MAP_GOLDENROD_BIKE_SHOP @@ -561,38 +561,38 @@ GoldenrodCity_MapEventHeader: warp_def $1d, $b, 5, GROUP_UNDERGROUND_PATH_SWITCH_ROOM_ENTRANCES, MAP_UNDERGROUND_PATH_SWITCH_ROOM_ENTRANCES warp_def $1b, $f, 1, GROUP_GOLDENROD_POKECENTER_1F, MAP_GOLDENROD_POKECENTER_1F - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 12 - signpost 14, 10, $0, GoldenrodCityStationSign - signpost 17, 4, $0, GoldenrodCityRadioTowerSign - signpost 27, 26, $0, GoldenrodDeptStoreSign - signpost 9, 26, $0, GoldenrodGymSign - signpost 18, 22, $0, GoldenrodCitySign - signpost 30, 28, $0, GoldenrodCityBikeShopSign - signpost 22, 16, $0, GoldenrodCityGameCornerSign - signpost 7, 12, $0, GoldenrodCityNameRaterSign - signpost 6, 8, $0, GoldenrodCityUndergroundSignNorth - signpost 30, 12, $0, GoldenrodCityUndergroundSignSouth - signpost 27, 16, $1, GoldenrodCityPokeCenterSign - signpost 6, 30, $0, GoldenrodCityFlowerShopSign - - ; people-events + signpost 14, 10, SIGNPOST_READ, GoldenrodCityStationSign + signpost 17, 4, SIGNPOST_READ, GoldenrodCityRadioTowerSign + signpost 27, 26, SIGNPOST_READ, GoldenrodDeptStoreSign + signpost 9, 26, SIGNPOST_READ, GoldenrodGymSign + signpost 18, 22, SIGNPOST_READ, GoldenrodCitySign + signpost 30, 28, SIGNPOST_READ, GoldenrodCityBikeShopSign + signpost 22, 16, SIGNPOST_READ, GoldenrodCityGameCornerSign + signpost 7, 12, SIGNPOST_READ, GoldenrodCityNameRaterSign + signpost 6, 8, SIGNPOST_READ, GoldenrodCityUndergroundSignNorth + signpost 30, 12, SIGNPOST_READ, GoldenrodCityUndergroundSignSouth + signpost 27, 16, SIGNPOST_UP, GoldenrodCityPokeCenterSign + signpost 6, 30, SIGNPOST_READ, GoldenrodCityFlowerShopSign + +.PersonEvents: db 15 - person_event SPRITE_POKEFAN_M, 22, 11, $7, $0, 255, 255, $0, 0, PokefanMScript_0x1989e3, EVENT_6CF - person_event SPRITE_YOUNGSTER, 21, 34, $2, $11, 255, 255, $0, 0, YoungsterScript_0x1989e6, EVENT_6CF - person_event SPRITE_COOLTRAINER_F, 20, 16, $8, $0, 255, 255, $a0, 0, CooltrainerFScript_0x1989e9, EVENT_6CF - person_event SPRITE_COOLTRAINER_F, 30, 24, $2, $21, 255, 255, $0, 0, CooltrainerFScript_0x1989fd, EVENT_6CF - person_event SPRITE_YOUNGSTER, 21, 23, $2, $11, 255, 255, $80, 0, YoungsterScript_0x198a11, EVENT_6CF - person_event SPRITE_LASS, 14, 21, $5, $2, 255, 255, $a0, 0, LassScript_0x198a14, EVENT_6CF - person_event SPRITE_GRAMPS, 31, 15, $5, $1, 255, 255, $0, 0, GrampsScript_0x198a17, EVENT_6CF - person_event SPRITE_ROCKET, 20, 8, $7, $0, 255, 255, $0, 0, RocketScript_0x198a1a, EVENT_6CC - person_event SPRITE_ROCKET, 24, 32, $7, $0, 255, 255, $0, 0, RocketScript_0x198a29, EVENT_6CD - person_event SPRITE_ROCKET, 19, 12, $6, $0, 255, 255, $0, 0, RocketScript_0x198a2c, EVENT_6CD - person_event SPRITE_ROCKET, 27, 20, $9, $0, 255, 255, $0, 0, RocketScript_0x198a2f, EVENT_6CE - person_event SPRITE_ROCKET, 24, 33, $7, $0, 255, 255, $0, 0, RocketScript_0x198a32, EVENT_6CE - person_event SPRITE_ROCKET, 11, 33, $6, $0, 255, 255, $0, 0, RocketScript_0x198a35, EVENT_6CE - person_event SPRITE_ROCKET, 14, 35, $8, $0, 255, 255, $0, 0, RocketScript_0x198a38, EVENT_6CE - person_event SPRITE_POKEFAN_M, 26, 16, $3, $0, 255, 255, $80, 0, MoveTutor, EVENT_76A + person_event SPRITE_POKEFAN_M, 22, 11, OW_UP | $3, $0, -1, -1, $0, 0, PokefanMScript_0x1989e3, EVENT_GOLDENROD_CITY_CIVILIANS + person_event SPRITE_YOUNGSTER, 21, 34, OW_DOWN | $2, $11, -1, -1, $0, 0, YoungsterScript_0x1989e6, EVENT_GOLDENROD_CITY_CIVILIANS + person_event SPRITE_COOLTRAINER_F, 20, 16, OW_LEFT | $0, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, CooltrainerFScript_0x1989e9, EVENT_GOLDENROD_CITY_CIVILIANS + person_event SPRITE_COOLTRAINER_F, 30, 24, OW_DOWN | $2, $21, -1, -1, $0, 0, CooltrainerFScript_0x1989fd, EVENT_GOLDENROD_CITY_CIVILIANS + person_event SPRITE_YOUNGSTER, 21, 23, OW_DOWN | $2, $11, -1, -1, (PAL_OW_RED << 4) | $80, 0, YoungsterScript_0x198a11, EVENT_GOLDENROD_CITY_CIVILIANS + person_event SPRITE_LASS, 14, 21, OW_UP | $1, $2, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, LassScript_0x198a14, EVENT_GOLDENROD_CITY_CIVILIANS + person_event SPRITE_GRAMPS, 31, 15, OW_UP | $1, $1, -1, -1, $0, 0, GrampsScript_0x198a17, EVENT_GOLDENROD_CITY_CIVILIANS + person_event SPRITE_ROCKET, 20, 8, OW_UP | $3, $0, -1, -1, $0, 0, RocketScript_0x198a1a, EVENT_GOLDENROD_CITY_ROCKET_SCOUT + person_event SPRITE_ROCKET, 24, 32, OW_UP | $3, $0, -1, -1, $0, 0, RocketScript_0x198a29, EVENT_GOLDENROD_CITY_ROCKET_TAKEOVER + person_event SPRITE_ROCKET, 19, 12, OW_UP | $2, $0, -1, -1, $0, 0, RocketScript_0x198a2c, EVENT_GOLDENROD_CITY_ROCKET_TAKEOVER + person_event SPRITE_ROCKET, 27, 20, OW_LEFT | $1, $0, -1, -1, $0, 0, RocketScript_0x198a2f, EVENT_RADIO_TOWER_ROCKET_TAKEOVER + person_event SPRITE_ROCKET, 24, 33, OW_UP | $3, $0, -1, -1, $0, 0, RocketScript_0x198a32, EVENT_RADIO_TOWER_ROCKET_TAKEOVER + person_event SPRITE_ROCKET, 11, 33, OW_UP | $2, $0, -1, -1, $0, 0, RocketScript_0x198a35, EVENT_RADIO_TOWER_ROCKET_TAKEOVER + person_event SPRITE_ROCKET, 14, 35, OW_LEFT | $0, $0, -1, -1, $0, 0, RocketScript_0x198a38, EVENT_RADIO_TOWER_ROCKET_TAKEOVER + person_event SPRITE_POKEFAN_M, 26, 16, OW_DOWN | $3, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, MoveTutor, EVENT_GOLDENROD_CITY_MOVE_TUTOR diff --git a/maps/GoldenrodDeptStore1F.asm b/maps/GoldenrodDeptStore1F.asm index b4989b651..06a9f823e 100644 --- a/maps/GoldenrodDeptStore1F.asm +++ b/maps/GoldenrodDeptStore1F.asm @@ -1,8 +1,8 @@ GoldenrodDeptStore1F_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 ReceptionistScript_0x55981: @@ -76,24 +76,24 @@ GoldenrodDeptStore1F_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 4 warp_def $7, $7, 9, GROUP_GOLDENROD_CITY, MAP_GOLDENROD_CITY warp_def $7, $8, 9, GROUP_GOLDENROD_CITY, MAP_GOLDENROD_CITY warp_def $0, $f, 2, GROUP_GOLDENROD_DEPT_STORE_2F, MAP_GOLDENROD_DEPT_STORE_2F warp_def $0, $2, 1, GROUP_GOLDENROD_DEPT_STORE_ELEVATOR, MAP_GOLDENROD_DEPT_STORE_ELEVATOR - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 2 - signpost 0, 14, $0, GoldenrodDeptStore1FDirectory - signpost 0, 3, $0, GoldenrodDeptStore1FElevatorButton + signpost 0, 14, SIGNPOST_READ, GoldenrodDeptStore1FDirectory + signpost 0, 3, SIGNPOST_READ, GoldenrodDeptStore1FElevatorButton - ; people-events +.PersonEvents: db 4 - person_event SPRITE_RECEPTIONIST, 5, 14, $6, $0, 255, 255, $0, 0, ReceptionistScript_0x55981, -1 - person_event SPRITE_POKEFAN_F, 8, 9, $6, $0, 255, 255, $0, 0, PokefanFScript_0x55987, -1 - person_event SPRITE_BUG_CATCHER, 9, 9, $5, $1, 255, 255, $a0, 0, BugCatcherScript_0x5598a, -1 - person_event SPRITE_GENTLEMAN, 9, 15, $2, $11, 255, 255, $0, 0, GentlemanScript_0x55984, -1 + person_event SPRITE_RECEPTIONIST, 5, 14, OW_UP | $2, $0, -1, -1, $0, 0, ReceptionistScript_0x55981, -1 + person_event SPRITE_POKEFAN_F, 8, 9, OW_UP | $2, $0, -1, -1, $0, 0, PokefanFScript_0x55987, -1 + person_event SPRITE_BUG_CATCHER, 9, 9, OW_UP | $1, $1, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, BugCatcherScript_0x5598a, -1 + person_event SPRITE_GENTLEMAN, 9, 15, OW_DOWN | $2, $11, -1, -1, $0, 0, GentlemanScript_0x55984, -1 diff --git a/maps/GoldenrodDeptStore2F.asm b/maps/GoldenrodDeptStore2F.asm index fed8d27e2..be84a789f 100644 --- a/maps/GoldenrodDeptStore2F.asm +++ b/maps/GoldenrodDeptStore2F.asm @@ -1,8 +1,8 @@ GoldenrodDeptStore2F_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 ClerkScript_0x55b5d: @@ -97,24 +97,24 @@ GoldenrodDeptStore2F_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 3 warp_def $0, $c, 1, GROUP_GOLDENROD_DEPT_STORE_3F, MAP_GOLDENROD_DEPT_STORE_3F warp_def $0, $f, 3, GROUP_GOLDENROD_DEPT_STORE_1F, MAP_GOLDENROD_DEPT_STORE_1F warp_def $0, $2, 1, GROUP_GOLDENROD_DEPT_STORE_ELEVATOR, MAP_GOLDENROD_DEPT_STORE_ELEVATOR - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 2 - signpost 0, 14, $0, GoldenrodDeptStore2FDirectory - signpost 0, 3, $0, GoldenrodDeptStore2FElevatorButton + signpost 0, 14, SIGNPOST_READ, GoldenrodDeptStore2FDirectory + signpost 0, 3, SIGNPOST_READ, GoldenrodDeptStore2FElevatorButton - ; people-events +.PersonEvents: db 5 - person_event SPRITE_CLERK, 9, 17, $7, $0, 255, 255, $0, 0, ClerkScript_0x55b5d, -1 - person_event SPRITE_CLERK, 10, 17, $8, $0, 255, 255, $0, 0, ClerkScript_0x55b65, -1 - person_event SPRITE_YOUNGSTER, 10, 13, $4, $10, 255, 255, $0, 0, YoungsterScript_0x55b6d, -1 - person_event SPRITE_COOLTRAINER_F, 6, 10, $5, $2, 255, 255, $80, 0, CooltrainerFScript_0x55b70, -1 - person_event SPRITE_GENTLEMAN, 10, 6, $3, $0, 255, 255, $0, 0, GentlemanScript_0x55b73, -1 + person_event SPRITE_CLERK, 9, 17, OW_UP | $3, $0, -1, -1, $0, 0, ClerkScript_0x55b5d, -1 + person_event SPRITE_CLERK, 10, 17, OW_LEFT | $0, $0, -1, -1, $0, 0, ClerkScript_0x55b65, -1 + person_event SPRITE_YOUNGSTER, 10, 13, OW_UP | $0, $10, -1, -1, $0, 0, YoungsterScript_0x55b6d, -1 + person_event SPRITE_COOLTRAINER_F, 6, 10, OW_UP | $1, $2, -1, -1, (PAL_OW_RED << 4) | $80, 0, CooltrainerFScript_0x55b70, -1 + person_event SPRITE_GENTLEMAN, 10, 6, OW_DOWN | $3, $0, -1, -1, $0, 0, GentlemanScript_0x55b73, -1 diff --git a/maps/GoldenrodDeptStore3F.asm b/maps/GoldenrodDeptStore3F.asm index 8a3b7dce2..b21371879 100644 --- a/maps/GoldenrodDeptStore3F.asm +++ b/maps/GoldenrodDeptStore3F.asm @@ -1,8 +1,8 @@ GoldenrodDeptStore3F_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 ClerkScript_0x55db8: @@ -55,22 +55,22 @@ GoldenrodDeptStore3F_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 3 warp_def $0, $c, 1, GROUP_GOLDENROD_DEPT_STORE_2F, MAP_GOLDENROD_DEPT_STORE_2F warp_def $0, $f, 2, GROUP_GOLDENROD_DEPT_STORE_4F, MAP_GOLDENROD_DEPT_STORE_4F warp_def $0, $2, 1, GROUP_GOLDENROD_DEPT_STORE_ELEVATOR, MAP_GOLDENROD_DEPT_STORE_ELEVATOR - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 2 - signpost 0, 14, $0, GoldenrodDeptStore3FDirectory - signpost 0, 3, $0, GoldenrodDeptStore3FElevatorButton + signpost 0, 14, SIGNPOST_READ, GoldenrodDeptStore3FDirectory + signpost 0, 3, SIGNPOST_READ, GoldenrodDeptStore3FElevatorButton - ; people-events +.PersonEvents: db 3 - person_event SPRITE_CLERK, 5, 10, $6, $0, 255, 255, $0, 0, ClerkScript_0x55db8, -1 - person_event SPRITE_SUPER_NERD, 9, 16, $a, $10, 255, 255, $80, 0, SuperNerdScript_0x55dc0, -1 - person_event SPRITE_ROCKER, 9, 6, $4, $10, 255, 255, $0, 0, RockerScript_0x55dc3, -1 + person_event SPRITE_CLERK, 5, 10, OW_UP | $2, $0, -1, -1, $0, 0, ClerkScript_0x55db8, -1 + person_event SPRITE_SUPER_NERD, 9, 16, OW_LEFT | $2, $10, -1, -1, (PAL_OW_RED << 4) | $80, 0, SuperNerdScript_0x55dc0, -1 + person_event SPRITE_ROCKER, 9, 6, OW_UP | $0, $10, -1, -1, $0, 0, RockerScript_0x55dc3, -1 diff --git a/maps/GoldenrodDeptStore4F.asm b/maps/GoldenrodDeptStore4F.asm index 3005a16c0..0606fa4bd 100644 --- a/maps/GoldenrodDeptStore4F.asm +++ b/maps/GoldenrodDeptStore4F.asm @@ -1,8 +1,8 @@ GoldenrodDeptStore4F_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 ClerkScript_0x55ee9: @@ -75,23 +75,23 @@ GoldenrodDeptStore4F_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 3 warp_def $0, $c, 1, GROUP_GOLDENROD_DEPT_STORE_5F, MAP_GOLDENROD_DEPT_STORE_5F warp_def $0, $f, 2, GROUP_GOLDENROD_DEPT_STORE_3F, MAP_GOLDENROD_DEPT_STORE_3F warp_def $0, $2, 1, GROUP_GOLDENROD_DEPT_STORE_ELEVATOR, MAP_GOLDENROD_DEPT_STORE_ELEVATOR - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 2 - signpost 0, 14, $0, GoldenrodDeptStore4FDirectory - signpost 0, 3, $0, GoldenrodDeptStore4FElevatorButton + signpost 0, 14, SIGNPOST_READ, GoldenrodDeptStore4FDirectory + signpost 0, 3, SIGNPOST_READ, GoldenrodDeptStore4FElevatorButton - ; people-events +.PersonEvents: db 4 - person_event SPRITE_CLERK, 9, 17, $7, $0, 255, 255, $0, 0, ClerkScript_0x55ee9, -1 - person_event SPRITE_COOLTRAINER_M, 11, 15, $9, $0, 255, 255, $0, 0, CooltrainerMScript_0x55ef1, -1 - person_event SPRITE_BUG_CATCHER, 6, 11, $5, $1, 255, 255, $0, 0, BugCatcherScript_0x55ef4, -1 - person_event SPRITE_GAMEBOY_KID, 5, 9, $6, $0, 255, 255, $0, 0, GameboyKidScript_0x55ef7, -1 + person_event SPRITE_CLERK, 9, 17, OW_UP | $3, $0, -1, -1, $0, 0, ClerkScript_0x55ee9, -1 + person_event SPRITE_COOLTRAINER_M, 11, 15, OW_LEFT | $1, $0, -1, -1, $0, 0, CooltrainerMScript_0x55ef1, -1 + person_event SPRITE_BUG_CATCHER, 6, 11, OW_UP | $1, $1, -1, -1, $0, 0, BugCatcherScript_0x55ef4, -1 + person_event SPRITE_GAMEBOY_KID, 5, 9, OW_UP | $2, $0, -1, -1, $0, 0, GameboyKidScript_0x55ef7, -1 diff --git a/maps/GoldenrodDeptStore5F.asm b/maps/GoldenrodDeptStore5F.asm index a551e86ad..834b82614 100644 --- a/maps/GoldenrodDeptStore5F.asm +++ b/maps/GoldenrodDeptStore5F.asm @@ -1,21 +1,21 @@ GoldenrodDeptStore5F_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 1 ; callbacks - dbw 2, UnknownScript_0x56090 + dbw 2, .CheckIfSunday -UnknownScript_0x56090: +.CheckIfSunday: checkcode VAR_WEEKDAY - if_equal SUNDAY, UnknownScript_0x56099 + if_equal SUNDAY, .yes disappear $7 return -UnknownScript_0x56099: +.yes: appear $7 return @@ -23,32 +23,32 @@ ClerkScript_0x5609c: faceplayer loadfont checkevent EVENT_GOT_TM02_HEADBUTT - iftrue UnknownScript_0x560ad + iftrue .headbutt checkevent EVENT_GOT_TM08_ROCK_SMASH - iftrue UnknownScript_0x560c2 - jump UnknownScript_0x560b6 + iftrue .onlyrocksmash + jump .neither -UnknownScript_0x560ad: +.headbutt: checkevent EVENT_GOT_TM08_ROCK_SMASH - iftrue UnknownScript_0x560c8 - jump UnknownScript_0x560bc + iftrue .both + jump .onlyheadbutt -UnknownScript_0x560b6: +.neither: pokemart $0, $0009 loadmovesprites end -UnknownScript_0x560bc: +.onlyheadbutt: pokemart $0, $000a loadmovesprites end -UnknownScript_0x560c2: +.onlyrocksmash: pokemart $0, $000b loadmovesprites end -UnknownScript_0x560c8: +.both: pokemart $0, $000c loadmovesprites end @@ -57,44 +57,44 @@ ReceptionistScript_0x560ce: faceplayer loadfont checkcode VAR_WEEKDAY - if_not_equal SUNDAY, UnknownScript_0x56112 + if_not_equal SUNDAY, .EventIsOver checkflag ENGINE_GOLDENROD_MALL_5F_HAPPINESS_EVENT - iftrue UnknownScript_0x56112 - special Function718d + iftrue .EventIsOver + special GetFirstPokemonHappiness writetext UnknownText_0x56143 keeptextopen - if_greater_than $95, UnknownScript_0x560ee - if_greater_than $31, UnknownScript_0x560fd - jump UnknownScript_0x56103 + if_greater_than $95, .VeryHappy + if_greater_than $31, .SomewhatHappy + jump .NotVeryHappy -UnknownScript_0x560ee: +.VeryHappy: writetext UnknownText_0x5615a keeptextopen verbosegiveitem TM_RETURN, 1 - iffalse UnknownScript_0x56116 + iffalse .Done setflag ENGINE_GOLDENROD_MALL_5F_HAPPINESS_EVENT loadmovesprites end -UnknownScript_0x560fd: +.SomewhatHappy: writetext UnknownText_0x561a6 closetext loadmovesprites end -UnknownScript_0x56103: +.NotVeryHappy: writetext UnknownText_0x561d8 keeptextopen verbosegiveitem TM_FRUSTRATION, 1 - iffalse UnknownScript_0x56116 + iffalse .Done setflag ENGINE_GOLDENROD_MALL_5F_HAPPINESS_EVENT loadmovesprites end -UnknownScript_0x56112: +.EventIsOver: writetext UnknownText_0x56202 closetext -UnknownScript_0x56116: +.Done: loadmovesprites end @@ -102,14 +102,14 @@ TwinScript_0x56118: faceplayer loadfont special SpecialGameboyCheck - if_not_equal $2, UnknownScript_0x5612a + if_not_equal $2, .NotGBC ; This is a dummy check from Gold and Silver. In normal gameplay, this would not be checked. writetext UnknownText_0x56241 closetext loadmovesprites - special Function1050b9 + special Special_UnlockMysteryGift end -UnknownScript_0x5612a: +.NotGBC: writetext UnknownText_0x56279 closetext loadmovesprites @@ -216,25 +216,25 @@ GoldenrodDeptStore5F_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 3 warp_def $0, $c, 1, GROUP_GOLDENROD_DEPT_STORE_4F, MAP_GOLDENROD_DEPT_STORE_4F warp_def $0, $f, 1, GROUP_GOLDENROD_DEPT_STORE_6F, MAP_GOLDENROD_DEPT_STORE_6F warp_def $0, $2, 1, GROUP_GOLDENROD_DEPT_STORE_ELEVATOR, MAP_GOLDENROD_DEPT_STORE_ELEVATOR - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 2 - signpost 0, 14, $0, GoldenrodDeptStore5FDirectory - signpost 0, 3, $0, GoldenrodDeptStore5FElevatorButton + signpost 0, 14, SIGNPOST_READ, GoldenrodDeptStore5FDirectory + signpost 0, 3, SIGNPOST_READ, GoldenrodDeptStore5FElevatorButton - ; people-events +.PersonEvents: db 6 - person_event SPRITE_CLERK, 9, 12, $7, $0, 255, 255, $0, 0, ClerkScript_0x5609c, -1 - person_event SPRITE_LASS, 10, 7, $2, $11, 255, 255, $0, 0, LassScript_0x56130, -1 - person_event SPRITE_COOLTRAINER_M, 7, 10, $3, $0, 255, 255, $0, 0, CooltrainerMScript_0x56133, -1 - person_event SPRITE_POKEFAN_M, 9, 17, $2, $22, 255, 255, $0, 0, PokefanMScript_0x5613a, -1 - person_event SPRITE_TWIN, 5, 13, $6, $0, 255, 255, $a0, 0, TwinScript_0x56118, -1 - person_event SPRITE_RECEPTIONIST, 9, 11, $7, $0, 255, 255, $80, 0, ReceptionistScript_0x560ce, EVENT_763 + person_event SPRITE_CLERK, 9, 12, OW_UP | $3, $0, -1, -1, $0, 0, ClerkScript_0x5609c, -1 + person_event SPRITE_LASS, 10, 7, OW_DOWN | $2, $11, -1, -1, $0, 0, LassScript_0x56130, -1 + person_event SPRITE_COOLTRAINER_M, 7, 10, OW_DOWN | $3, $0, -1, -1, $0, 0, CooltrainerMScript_0x56133, -1 + person_event SPRITE_POKEFAN_M, 9, 17, OW_DOWN | $2, $22, -1, -1, $0, 0, PokefanMScript_0x5613a, -1 + person_event SPRITE_TWIN, 5, 13, OW_UP | $2, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, TwinScript_0x56118, -1 + person_event SPRITE_RECEPTIONIST, 9, 11, OW_UP | $3, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, ReceptionistScript_0x560ce, EVENT_GOLDENROD_DEPT_STORE_5F_HAPPINESS_EVENT_LADY diff --git a/maps/GoldenrodDeptStore6F.asm b/maps/GoldenrodDeptStore6F.asm index d04bf62a5..588746745 100644 --- a/maps/GoldenrodDeptStore6F.asm +++ b/maps/GoldenrodDeptStore6F.asm @@ -1,8 +1,8 @@ GoldenrodDeptStore6F_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 GoldenrodVendingMachine: @@ -149,25 +149,25 @@ GoldenrodDeptStore6F_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 3 warp_def $0, $f, 2, GROUP_GOLDENROD_DEPT_STORE_5F, MAP_GOLDENROD_DEPT_STORE_5F warp_def $0, $2, 1, GROUP_GOLDENROD_DEPT_STORE_ELEVATOR, MAP_GOLDENROD_DEPT_STORE_ELEVATOR warp_def $0, $d, 1, GROUP_GOLDENROD_DEPT_STORE_ROOF, MAP_GOLDENROD_DEPT_STORE_ROOF - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 6 - signpost 0, 14, $0, GoldenrodDeptStore6FDirectory - signpost 0, 3, $0, GoldenrodDeptStore6FElevatorButton - signpost 1, 8, $1, GoldenrodVendingMachine - signpost 1, 9, $1, GoldenrodVendingMachine - signpost 1, 10, $1, GoldenrodVendingMachine - signpost 1, 11, $1, GoldenrodVendingMachine - - ; people-events + signpost 0, 14, SIGNPOST_READ, GoldenrodDeptStore6FDirectory + signpost 0, 3, SIGNPOST_READ, GoldenrodDeptStore6FElevatorButton + signpost 1, 8, SIGNPOST_UP, GoldenrodVendingMachine + signpost 1, 9, SIGNPOST_UP, GoldenrodVendingMachine + signpost 1, 10, SIGNPOST_UP, GoldenrodVendingMachine + signpost 1, 11, SIGNPOST_UP, GoldenrodVendingMachine + +.PersonEvents: db 2 - person_event SPRITE_LASS, 6, 14, $5, $1, 255, 255, $a0, 0, LassScript_0x564bf, -1 - person_event SPRITE_SUPER_NERD, 6, 12, $7, $0, 255, 255, $80, 0, SuperNerdScript_0x564c2, -1 + person_event SPRITE_LASS, 6, 14, OW_UP | $1, $1, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, LassScript_0x564bf, -1 + person_event SPRITE_SUPER_NERD, 6, 12, OW_UP | $3, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, SuperNerdScript_0x564c2, -1 diff --git a/maps/GoldenrodDeptStoreB1F.asm b/maps/GoldenrodDeptStoreB1F.asm index 1d8f9d6d7..d80feb513 100644 --- a/maps/GoldenrodDeptStoreB1F.asm +++ b/maps/GoldenrodDeptStoreB1F.asm @@ -1,8 +1,8 @@ GoldenrodDeptStoreB1F_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 2 ; callbacks @@ -12,7 +12,7 @@ GoldenrodDeptStoreB1F_MapScriptHeader: dbw 5, UnknownScript_0x7d7ac UnknownScript_0x7d781: - checkevent EVENT_04A + checkevent EVENT_RECEIVED_CARD_KEY iftrue UnknownScript_0x7d78a jump UnknownScript_0x7d791 @@ -107,25 +107,25 @@ GoldenrodDeptStoreB1F_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 3 warp_def $2, $11, 3, GROUP_UNDERGROUND_WAREHOUSE, MAP_UNDERGROUND_WAREHOUSE warp_def $4, $9, 1, GROUP_GOLDENROD_DEPT_STORE_ELEVATOR, MAP_GOLDENROD_DEPT_STORE_ELEVATOR warp_def $4, $a, 2, GROUP_GOLDENROD_DEPT_STORE_ELEVATOR, MAP_GOLDENROD_DEPT_STORE_ELEVATOR - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 8 - person_event SPRITE_POKE_BALL, 19, 14, $1, $0, 255, 255, $1, 0, ItemFragment_0x7d7c3, EVENT_675 - person_event SPRITE_POKE_BALL, 6, 18, $1, $0, 255, 255, $1, 0, ItemFragment_0x7d7c5, EVENT_676 - person_event SPRITE_POKE_BALL, 7, 10, $1, $0, 255, 255, $1, 0, ItemFragment_0x7d7c7, EVENT_677 - person_event SPRITE_POKE_BALL, 19, 19, $1, $0, 255, 255, $1, 0, ItemFragment_0x7d7c9, EVENT_678 - person_event SPRITE_BLACK_BELT, 14, 13, $4, $10, 255, 255, $a0, 0, BlackBeltScript_0x7d7b0, -1 - person_event SPRITE_BLACK_BELT, 12, 8, $3, $0, 255, 255, $80, 0, BlackBeltScript_0x7d7b3, -1 - person_event SPRITE_BLACK_BELT, 17, 10, $5, $1, 255, 255, $90, 0, BlackBeltScript_0x7d7b6, -1 - person_event SPRITE_MACHOP, 11, 11, $16, $0, 255, 255, $90, 0, MachopScript_0x7d7b9, -1 + person_event SPRITE_POKE_BALL, 19, 14, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x7d7c3, EVENT_GOLDENROD_DEPT_STORE_B1F_ETHER + person_event SPRITE_POKE_BALL, 6, 18, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x7d7c5, EVENT_GOLDENROD_DEPT_STORE_B1F_AMULET_COIN + person_event SPRITE_POKE_BALL, 7, 10, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x7d7c7, EVENT_GOLDENROD_DEPT_STORE_B1F_BURN_HEAL + person_event SPRITE_POKE_BALL, 19, 19, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x7d7c9, EVENT_GOLDENROD_DEPT_STORE_B1F_ULTRA_BALL + person_event SPRITE_BLACK_BELT, 14, 13, OW_UP | $0, $10, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, BlackBeltScript_0x7d7b0, -1 + person_event SPRITE_BLACK_BELT, 12, 8, OW_DOWN | $3, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, BlackBeltScript_0x7d7b3, -1 + person_event SPRITE_BLACK_BELT, 17, 10, OW_UP | $1, $1, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, BlackBeltScript_0x7d7b6, -1 + person_event SPRITE_MACHOP, 11, 11, OW_UP | $12, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, MachopScript_0x7d7b9, -1 diff --git a/maps/GoldenrodDeptStoreElevator.asm b/maps/GoldenrodDeptStoreElevator.asm index 040e82e37..8a7b85375 100644 --- a/maps/GoldenrodDeptStoreElevator.asm +++ b/maps/GoldenrodDeptStoreElevator.asm @@ -1,8 +1,8 @@ GoldenrodDeptStoreElevator_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 MapGoldenrodDeptStoreElevatorSignpost0Script: @@ -60,17 +60,17 @@ GoldenrodDeptStoreElevator_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $3, $1, 255, GROUP_GOLDENROD_DEPT_STORE_1F, MAP_GOLDENROD_DEPT_STORE_1F warp_def $3, $2, 255, GROUP_GOLDENROD_DEPT_STORE_1F, MAP_GOLDENROD_DEPT_STORE_1F - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 1 - signpost 0, 3, $0, MapGoldenrodDeptStoreElevatorSignpost0Script + signpost 0, 3, SIGNPOST_READ, MapGoldenrodDeptStoreElevatorSignpost0Script - ; people-events +.PersonEvents: db 0 diff --git a/maps/GoldenrodDeptStoreRoof.asm b/maps/GoldenrodDeptStoreRoof.asm index 6f015ae7c..ba80f2773 100644 --- a/maps/GoldenrodDeptStoreRoof.asm +++ b/maps/GoldenrodDeptStoreRoof.asm @@ -1,36 +1,36 @@ GoldenrodDeptStoreRoof_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 2 ; callbacks - dbw 1, UnknownScript_0x5671b + dbw 1, .CheckSaleChangeBlock - dbw 2, UnknownScript_0x5672b + dbw 2, .CheckSaleChangeClerk -UnknownScript_0x5671b: +.CheckSaleChangeBlock: checkflag ENGINE_GOLDENROD_DEPT_STORE_SALE_IS_ON - iftrue UnknownScript_0x56722 + iftrue .ChangeBlock return -UnknownScript_0x56722: +.ChangeBlock: changeblock $0, $2, $3f changeblock $0, $4, $f return -UnknownScript_0x5672b: +.CheckSaleChangeClerk: checkflag ENGINE_GOLDENROD_DEPT_STORE_SALE_IS_ON - iftrue UnknownScript_0x56738 - setevent EVENT_6F0 - clearevent EVENT_6F1 + iftrue .ChangeClerk + setevent EVENT_GOLDENROD_SALE_OFF + clearevent EVENT_GOLDENROD_SALE_ON return -UnknownScript_0x56738: - clearevent EVENT_6F0 - setevent EVENT_6F1 +.ChangeClerk: + clearevent EVENT_GOLDENROD_SALE_OFF + setevent EVENT_GOLDENROD_SALE_ON return ClerkScript_0x5673f: @@ -209,27 +209,27 @@ GoldenrodDeptStoreRoof_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 1 warp_def $1, $d, 3, GROUP_GOLDENROD_DEPT_STORE_6F, MAP_GOLDENROD_DEPT_STORE_6F - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 4 - signpost 3, 15, $3, MapGoldenrodDeptStoreRoofSignpost0Script - signpost 5, 15, $3, MapGoldenrodDeptStoreRoofSignpost1Script - signpost 6, 15, $3, MapGoldenrodDeptStoreRoofSignpost2Script - signpost 0, 3, $1, MapGoldenrodDeptStoreRoofSignpost3Script + signpost 3, 15, SIGNPOST_RIGHT, MapGoldenrodDeptStoreRoofSignpost0Script + signpost 5, 15, SIGNPOST_RIGHT, MapGoldenrodDeptStoreRoofSignpost1Script + signpost 6, 15, SIGNPOST_RIGHT, MapGoldenrodDeptStoreRoofSignpost2Script + signpost 0, 3, SIGNPOST_UP, MapGoldenrodDeptStoreRoofSignpost3Script - ; people-events +.PersonEvents: db 8 - person_event SPRITE_CLERK, 8, 5, $9, $0, 255, 255, $0, 0, ClerkScript_0x5673f, EVENT_6F0 - person_event SPRITE_POKEFAN_F, 7, 14, $5, $1, 255, 255, $80, 0, PokefanFScript_0x56746, -1 - person_event SPRITE_FISHER, 5, 6, $7, $0, 255, 255, $90, 0, FisherScript_0x56749, -1 - person_event SPRITE_TWIN, 8, 7, $2, $11, 255, 255, $a0, 0, TwinScript_0x56754, EVENT_6F1 - person_event SPRITE_SUPER_NERD, 10, 18, $9, $0, 255, 255, $a0, 0, SuperNerdScript_0x56757, EVENT_6F1 - person_event SPRITE_POKEFAN_M, 4, 11, $5, $1, 255, 255, $0, 0, PokefanMScript_0x5676a, EVENT_6F0 - person_event SPRITE_TEACHER, 7, 9, $2, $11, 255, 255, $a0, 0, TeacherScript_0x5676d, EVENT_6F0 - person_event SPRITE_BUG_CATCHER, 10, 5, $7, $0, 255, 255, $80, 0, BugCatcherScript_0x56770, EVENT_6F0 + person_event SPRITE_CLERK, 8, 5, OW_LEFT | $1, $0, -1, -1, $0, 0, ClerkScript_0x5673f, EVENT_GOLDENROD_SALE_OFF + person_event SPRITE_POKEFAN_F, 7, 14, OW_UP | $1, $1, -1, -1, (PAL_OW_RED << 4) | $80, 0, PokefanFScript_0x56746, -1 + person_event SPRITE_FISHER, 5, 6, OW_UP | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, FisherScript_0x56749, -1 + person_event SPRITE_TWIN, 8, 7, OW_DOWN | $2, $11, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, TwinScript_0x56754, EVENT_GOLDENROD_SALE_ON + person_event SPRITE_SUPER_NERD, 10, 18, OW_LEFT | $1, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, SuperNerdScript_0x56757, EVENT_GOLDENROD_SALE_ON + person_event SPRITE_POKEFAN_M, 4, 11, OW_UP | $1, $1, -1, -1, $0, 0, PokefanMScript_0x5676a, EVENT_GOLDENROD_SALE_OFF + person_event SPRITE_TEACHER, 7, 9, OW_DOWN | $2, $11, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, TeacherScript_0x5676d, EVENT_GOLDENROD_SALE_OFF + person_event SPRITE_BUG_CATCHER, 10, 5, OW_UP | $3, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, BugCatcherScript_0x56770, EVENT_GOLDENROD_SALE_OFF diff --git a/maps/GoldenrodFlowerShop.asm b/maps/GoldenrodFlowerShop.asm index 1d27d4200..08f6dc3c9 100644 --- a/maps/GoldenrodFlowerShop.asm +++ b/maps/GoldenrodFlowerShop.asm @@ -1,8 +1,8 @@ GoldenrodFlowerShop_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 TeacherScript_0x5535d: @@ -12,7 +12,7 @@ TeacherScript_0x5535d: iftrue UnknownScript_0x55399 checkevent EVENT_MET_FLORIA iffalse UnknownScript_0x5539f - checkevent EVENT_0BA + checkevent EVENT_TALKED_TO_FLORIA_AT_FLOWER_SHOP iffalse UnknownScript_0x5538f checkflag ENGINE_PLAINBADGE iffalse UnknownScript_0x5539c @@ -24,7 +24,7 @@ TeacherScript_0x5535d: setevent EVENT_GOT_SQUIRTBOTTLE loadmovesprites setevent EVENT_FLORIA_AT_SUDOWOODO - clearevent EVENT_768 + clearevent EVENT_FLORIA_AT_FLOWER_SHOP end UnknownScript_0x5538f: @@ -54,8 +54,8 @@ LassScript_0x553a2: writetext UnknownText_0x55561 closetext loadmovesprites - setevent EVENT_0BA - setevent EVENT_768 + setevent EVENT_TALKED_TO_FLORIA_AT_FLOWER_SHOP + setevent EVENT_FLORIA_AT_FLOWER_SHOP clearevent EVENT_FLORIA_AT_SUDOWOODO end @@ -159,18 +159,18 @@ GoldenrodFlowerShop_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $7, $2, 6, GROUP_GOLDENROD_CITY, MAP_GOLDENROD_CITY warp_def $7, $3, 6, GROUP_GOLDENROD_CITY, MAP_GOLDENROD_CITY - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 2 - person_event SPRITE_TEACHER, 8, 6, $9, $0, 255, 255, $0, 0, TeacherScript_0x5535d, -1 - person_event SPRITE_LASS, 10, 9, $2, $11, 255, 255, $90, 0, LassScript_0x553a2, EVENT_768 + person_event SPRITE_TEACHER, 8, 6, OW_LEFT | $1, $0, -1, -1, $0, 0, TeacherScript_0x5535d, -1 + person_event SPRITE_LASS, 10, 9, OW_DOWN | $2, $11, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, LassScript_0x553a2, EVENT_FLORIA_AT_FLOWER_SHOP diff --git a/maps/GoldenrodGameCorner.asm b/maps/GoldenrodGameCorner.asm index 102fdd8b6..898b292d5 100644 --- a/maps/GoldenrodGameCorner.asm +++ b/maps/GoldenrodGameCorner.asm @@ -1,8 +1,8 @@ GoldenrodGameCorner_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 1 ; callbacks @@ -22,7 +22,7 @@ UnknownScript_0x56c0e: return UnknownScript_0x56c11: - checkflag ENGINE_5E + checkflag ENGINE_DAILY_MOVE_TUTOR iftrue UnknownScript_0x56c19 disappear $d UnknownScript_0x56c19: ;0x56c19 @@ -175,7 +175,7 @@ UnknownScript_0x56d26: writetext UnknownText_0x56ebd closetext writebyte ABRA - special Functionc230 + special Special_GameCornerPrizeMonCheckDex givepoke ABRA, 5, 0, 0 takecoins 100 jump UnknownScript_0x56d0c @@ -193,7 +193,7 @@ UnknownScript_0x56d54: writetext UnknownText_0x56ebd closetext writebyte CUBONE - special Functionc230 + special Special_GameCornerPrizeMonCheckDex givepoke CUBONE, 15, 0, 0 takecoins 800 jump UnknownScript_0x56d0c @@ -211,7 +211,7 @@ UnknownScript_0x56d82: writetext UnknownText_0x56ebd closetext writebyte WOBBUFFET - special Functionc230 + special Special_GameCornerPrizeMonCheckDex givepoke WOBBUFFET, 15, 0, 0 takecoins 1500 jump UnknownScript_0x56d0c @@ -292,20 +292,20 @@ MapGoldenrodGameCornerSignpost17Script: if_equal $0, MapGoldenrodGameCornerSignpost7Script refreshscreen $0 writebyte $0 - special Functionc373 + special Special_SlotMachine loadmovesprites end MapGoldenrodGameCornerSignpost7Script: refreshscreen $0 writebyte $1 - special Functionc373 + special Special_SlotMachine loadmovesprites end MapGoldenrodGameCornerSignpost29Script: refreshscreen $0 - special Functionc380 + special Special_CardFlip loadmovesprites end @@ -435,59 +435,59 @@ GoldenrodGameCorner_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $d, $2, 10, GROUP_GOLDENROD_CITY, MAP_GOLDENROD_CITY warp_def $d, $3, 10, GROUP_GOLDENROD_CITY, MAP_GOLDENROD_CITY - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 31 - signpost 6, 6, $0, MapGoldenrodGameCornerSignpost17Script - signpost 7, 6, $0, MapGoldenrodGameCornerSignpost17Script - signpost 8, 6, $0, MapGoldenrodGameCornerSignpost17Script - signpost 9, 6, $0, MapGoldenrodGameCornerSignpost17Script - signpost 10, 6, $0, MapGoldenrodGameCornerSignpost17Script - signpost 11, 6, $3, MapGoldenrodGameCornerSignpost17Script - signpost 6, 7, $0, MapGoldenrodGameCornerSignpost17Script - signpost 7, 7, $0, MapGoldenrodGameCornerSignpost7Script - signpost 8, 7, $0, MapGoldenrodGameCornerSignpost17Script - signpost 9, 7, $0, MapGoldenrodGameCornerSignpost17Script - signpost 10, 7, $0, MapGoldenrodGameCornerSignpost17Script - signpost 11, 7, $4, MapGoldenrodGameCornerSignpost17Script - signpost 6, 12, $0, MapGoldenrodGameCornerSignpost17Script - signpost 7, 12, $0, MapGoldenrodGameCornerSignpost17Script - signpost 8, 12, $0, MapGoldenrodGameCornerSignpost17Script - signpost 9, 12, $0, MapGoldenrodGameCornerSignpost17Script - signpost 10, 12, $0, MapGoldenrodGameCornerSignpost17Script - signpost 11, 12, $3, MapGoldenrodGameCornerSignpost17Script - signpost 6, 13, $0, MapGoldenrodGameCornerSignpost29Script - signpost 7, 13, $0, MapGoldenrodGameCornerSignpost29Script - signpost 8, 13, $0, MapGoldenrodGameCornerSignpost29Script - signpost 9, 13, $0, MapGoldenrodGameCornerSignpost29Script - signpost 10, 13, $0, MapGoldenrodGameCornerSignpost29Script - signpost 11, 13, $4, MapGoldenrodGameCornerSignpost29Script - signpost 6, 18, $0, MapGoldenrodGameCornerSignpost29Script - signpost 7, 18, $0, MapGoldenrodGameCornerSignpost29Script - signpost 8, 18, $0, MapGoldenrodGameCornerSignpost29Script - signpost 9, 18, $0, MapGoldenrodGameCornerSignpost29Script - signpost 10, 18, $0, MapGoldenrodGameCornerSignpost29Script - signpost 11, 18, $3, MapGoldenrodGameCornerSignpost29Script - signpost 1, 12, $4, MapGoldenrodGameCornerSignpost30Script - - ; people-events + signpost 6, 6, SIGNPOST_READ, MapGoldenrodGameCornerSignpost17Script + signpost 7, 6, SIGNPOST_READ, MapGoldenrodGameCornerSignpost17Script + signpost 8, 6, SIGNPOST_READ, MapGoldenrodGameCornerSignpost17Script + signpost 9, 6, SIGNPOST_READ, MapGoldenrodGameCornerSignpost17Script + signpost 10, 6, SIGNPOST_READ, MapGoldenrodGameCornerSignpost17Script + signpost 11, 6, SIGNPOST_RIGHT, MapGoldenrodGameCornerSignpost17Script + signpost 6, 7, SIGNPOST_READ, MapGoldenrodGameCornerSignpost17Script + signpost 7, 7, SIGNPOST_READ, MapGoldenrodGameCornerSignpost7Script + signpost 8, 7, SIGNPOST_READ, MapGoldenrodGameCornerSignpost17Script + signpost 9, 7, SIGNPOST_READ, MapGoldenrodGameCornerSignpost17Script + signpost 10, 7, SIGNPOST_READ, MapGoldenrodGameCornerSignpost17Script + signpost 11, 7, SIGNPOST_LEFT, MapGoldenrodGameCornerSignpost17Script + signpost 6, 12, SIGNPOST_READ, MapGoldenrodGameCornerSignpost17Script + signpost 7, 12, SIGNPOST_READ, MapGoldenrodGameCornerSignpost17Script + signpost 8, 12, SIGNPOST_READ, MapGoldenrodGameCornerSignpost17Script + signpost 9, 12, SIGNPOST_READ, MapGoldenrodGameCornerSignpost17Script + signpost 10, 12, SIGNPOST_READ, MapGoldenrodGameCornerSignpost17Script + signpost 11, 12, SIGNPOST_RIGHT, MapGoldenrodGameCornerSignpost17Script + signpost 6, 13, SIGNPOST_READ, MapGoldenrodGameCornerSignpost29Script + signpost 7, 13, SIGNPOST_READ, MapGoldenrodGameCornerSignpost29Script + signpost 8, 13, SIGNPOST_READ, MapGoldenrodGameCornerSignpost29Script + signpost 9, 13, SIGNPOST_READ, MapGoldenrodGameCornerSignpost29Script + signpost 10, 13, SIGNPOST_READ, MapGoldenrodGameCornerSignpost29Script + signpost 11, 13, SIGNPOST_LEFT, MapGoldenrodGameCornerSignpost29Script + signpost 6, 18, SIGNPOST_READ, MapGoldenrodGameCornerSignpost29Script + signpost 7, 18, SIGNPOST_READ, MapGoldenrodGameCornerSignpost29Script + signpost 8, 18, SIGNPOST_READ, MapGoldenrodGameCornerSignpost29Script + signpost 9, 18, SIGNPOST_READ, MapGoldenrodGameCornerSignpost29Script + signpost 10, 18, SIGNPOST_READ, MapGoldenrodGameCornerSignpost29Script + signpost 11, 18, SIGNPOST_RIGHT, MapGoldenrodGameCornerSignpost29Script + signpost 1, 12, SIGNPOST_LEFT, MapGoldenrodGameCornerSignpost30Script + +.PersonEvents: db 12 - person_event SPRITE_CLERK, 6, 7, $6, $0, 255, 255, $80, 0, ClerkScript_0x56c25, -1 - person_event SPRITE_RECEPTIONIST, 6, 20, $6, $0, 255, 255, $80, 0, ReceptionistScript_0x56c28, -1 - person_event SPRITE_RECEPTIONIST, 6, 22, $6, $0, 255, 255, $80, 0, ReceptionistScript_0x56d01, -1 - person_event SPRITE_PHARMACIST, 11, 12, $8, $0, 255, 2, $90, 0, PharmacistScript_0x56df1, -1 - person_event SPRITE_PHARMACIST, 11, 12, $8, $0, 255, 4, $90, 0, PharmacistScript_0x56df1, -1 - person_event SPRITE_POKEFAN_M, 14, 15, $9, $0, 255, 255, $b0, 0, PokefanMScript_0x56dfc, -1 - person_event SPRITE_COOLTRAINER_M, 12, 18, $8, $0, 255, 255, $90, 0, CooltrainerMScript_0x56e07, -1 - person_event SPRITE_POKEFAN_F, 10, 21, $9, $0, 255, 255, $80, 0, PokefanFScript_0x56e12, -1 - person_event SPRITE_COOLTRAINER_F, 7, 14, $2, $12, 255, 255, $a0, 0, CooltrainerFScript_0x56e1d, -1 - person_event SPRITE_GENTLEMAN, 14, 9, $9, $0, 255, 255, $90, 0, GentlemanScript_0x56e20, -1 - person_event SPRITE_POKEFAN_M, 13, 6, $2, $11, 255, 255, $b0, 0, PokefanMScript_0x56e2b, -1 - person_event SPRITE_POKEFAN_M, 14, 21, $9, $0, 255, 255, $80, 0, PokefanMScript_0x56c1a, EVENT_76B + person_event SPRITE_CLERK, 6, 7, OW_UP | $2, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, ClerkScript_0x56c25, -1 + person_event SPRITE_RECEPTIONIST, 6, 20, OW_UP | $2, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, ReceptionistScript_0x56c28, -1 + person_event SPRITE_RECEPTIONIST, 6, 22, OW_UP | $2, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, ReceptionistScript_0x56d01, -1 + person_event SPRITE_PHARMACIST, 11, 12, OW_LEFT | $0, $0, -1, 2, (PAL_OW_BLUE << 4) | $80, 0, PharmacistScript_0x56df1, -1 + person_event SPRITE_PHARMACIST, 11, 12, OW_LEFT | $0, $0, -1, 4, (PAL_OW_BLUE << 4) | $80, 0, PharmacistScript_0x56df1, -1 + person_event SPRITE_POKEFAN_M, 14, 15, OW_LEFT | $1, $0, -1, -1, (PAL_OW_BROWN << 4) | $80, 0, PokefanMScript_0x56dfc, -1 + person_event SPRITE_COOLTRAINER_M, 12, 18, OW_LEFT | $0, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, CooltrainerMScript_0x56e07, -1 + person_event SPRITE_POKEFAN_F, 10, 21, OW_LEFT | $1, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, PokefanFScript_0x56e12, -1 + person_event SPRITE_COOLTRAINER_F, 7, 14, OW_DOWN | $2, $12, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, CooltrainerFScript_0x56e1d, -1 + person_event SPRITE_GENTLEMAN, 14, 9, OW_LEFT | $1, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, GentlemanScript_0x56e20, -1 + person_event SPRITE_POKEFAN_M, 13, 6, OW_DOWN | $2, $11, -1, -1, (PAL_OW_BROWN << 4) | $80, 0, PokefanMScript_0x56e2b, -1 + person_event SPRITE_POKEFAN_M, 14, 21, OW_LEFT | $1, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, PokefanMScript_0x56c1a, EVENT_GOLDENROD_GAME_CORNER_MOVE_TUTOR diff --git a/maps/GoldenrodGym.asm b/maps/GoldenrodGym.asm index 6195a7c5f..3504c3f4a 100644 --- a/maps/GoldenrodGym.asm +++ b/maps/GoldenrodGym.asm @@ -1,12 +1,12 @@ GoldenrodGym_MapScriptHeader: - ; trigger count +.MapTriggers: db 2 ; triggers dw UnknownScript_0x5400a, $0000 dw UnknownScript_0x5400b, $0000 - ; callback count +.MapCallbacks: db 0 UnknownScript_0x5400a: @@ -87,23 +87,7 @@ GoldenrodGymTriggerRockets: jumpstd radiotowerrockets TrainerLassCarrie: - ; bit/flag number - dw EVENT_BEAT_LASS_CARRIE - - ; trainer group && trainer id - db LASS, CARRIE - - ; text when seen - dw LassCarrieSeenText - - ; text when trainer beaten - dw LassCarrieBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw LassCarrieScript + trainer EVENT_BEAT_LASS_CARRIE, LASS, CARRIE, LassCarrieSeenText, LassCarrieBeatenText, $0000, LassCarrieScript LassCarrieScript: talkaftercancel @@ -114,7 +98,7 @@ LassCarrieScript: end WhitneyCriesScript: - showemote $0, $4, 15 + showemote EMOTE_SHOCK, $4, 15 applymovement $4, BridgetWalksUpMovement spriteface $0, DOWN loadfont @@ -127,23 +111,7 @@ WhitneyCriesScript: end TrainerLassBridget: - ; bit/flag number - dw EVENT_BEAT_LASS_BRIDGET - - ; trainer group && trainer id - db LASS, BRIDGET - - ; text when seen - dw LassBridgetSeenText - - ; text when trainer beaten - dw LassBridgetBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw LassBridgetScript + trainer EVENT_BEAT_LASS_BRIDGET, LASS, BRIDGET, LassBridgetSeenText, LassBridgetBeatenText, $0000, LassBridgetScript LassBridgetScript: talkaftercancel @@ -154,23 +122,7 @@ LassBridgetScript: end TrainerBeautyVictoria: - ; bit/flag number - dw EVENT_BEAT_BEAUTY_VICTORIA - - ; trainer group && trainer id - db BEAUTY, VICTORIA - - ; text when seen - dw BeautyVictoriaSeenText - - ; text when trainer beaten - dw BeautyVictoriaBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw BeautyVictoriaScript + trainer EVENT_BEAT_BEAUTY_VICTORIA, BEAUTY, VICTORIA, BeautyVictoriaSeenText, BeautyVictoriaBeatenText, $0000, BeautyVictoriaScript BeautyVictoriaScript: talkaftercancel @@ -181,23 +133,7 @@ BeautyVictoriaScript: end TrainerBeautySamantha: - ; bit/flag number - dw EVENT_BEAT_BEAUTY_SAMANTHA - - ; trainer group && trainer id - db BEAUTY, SAMANTHA - - ; text when seen - dw BeautySamanthaSeenText - - ; text when trainer beaten - dw BeautySamanthaBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw BeautySamanthaScript + trainer EVENT_BEAT_BEAUTY_SAMANTHA, BEAUTY, SAMANTHA, BeautySamanthaSeenText, BeautySamanthaBeatenText, $0000, BeautySamanthaScript BeautySamanthaScript: talkaftercancel @@ -441,25 +377,25 @@ GoldenrodGym_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $11, $2, 1, GROUP_GOLDENROD_CITY, MAP_GOLDENROD_CITY warp_def $11, $3, 1, GROUP_GOLDENROD_CITY, MAP_GOLDENROD_CITY - ; xy triggers +.XYTriggers: db 1 xy_trigger 1, $5, $8, $0, WhitneyCriesScript, $0, $0 - ; signposts +.Signposts: db 2 - signpost 15, 1, $0, GoldenrodGymStatue - signpost 15, 4, $0, GoldenrodGymStatue + signpost 15, 1, SIGNPOST_READ, GoldenrodGymStatue + signpost 15, 4, SIGNPOST_READ, GoldenrodGymStatue - ; people-events +.PersonEvents: db 6 - person_event SPRITE_WHITNEY, 7, 12, $6, $0, 255, 255, $80, 0, WhitneyScript_0x5400c, -1 - person_event SPRITE_LASS, 17, 13, $9, $0, 255, 255, $92, 4, TrainerLassCarrie, -1 - person_event SPRITE_LASS, 10, 13, $8, $0, 255, 255, $92, 1, TrainerLassBridget, -1 - person_event SPRITE_BUENA, 6, 4, $6, $0, 255, 255, $92, 3, TrainerBeautyVictoria, -1 - person_event SPRITE_BUENA, 9, 23, $6, $0, 255, 255, $92, 3, TrainerBeautySamantha, -1 - person_event SPRITE_GYM_GUY, 19, 9, $6, $0, 255, 255, $80, 0, GoldenrodGymGuyScript, -1 + person_event SPRITE_WHITNEY, 7, 12, OW_UP | $2, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, WhitneyScript_0x5400c, -1 + person_event SPRITE_LASS, 17, 13, OW_LEFT | $1, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 4, TrainerLassCarrie, -1 + person_event SPRITE_LASS, 10, 13, OW_LEFT | $0, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 1, TrainerLassBridget, -1 + person_event SPRITE_BUENA, 6, 4, OW_UP | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 3, TrainerBeautyVictoria, -1 + person_event SPRITE_BUENA, 9, 23, OW_UP | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 3, TrainerBeautySamantha, -1 + person_event SPRITE_GYM_GUY, 19, 9, OW_UP | $2, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, GoldenrodGymGuyScript, -1 diff --git a/maps/GoldenrodHappinessRater.asm b/maps/GoldenrodHappinessRater.asm index 4a8b442bb..74bcf5b51 100644 --- a/maps/GoldenrodHappinessRater.asm +++ b/maps/GoldenrodHappinessRater.asm @@ -1,14 +1,14 @@ GoldenrodHappinessRater_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 TeacherScript_0x54953: faceplayer loadfont - special Function718d + special GetFirstPokemonHappiness writetext UnknownText_0x549a3 keeptextopen if_greater_than $f9, UnknownScript_0x54973 @@ -135,22 +135,22 @@ GoldenrodHappinessRater_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $7, $2, 3, GROUP_GOLDENROD_CITY, MAP_GOLDENROD_CITY warp_def $7, $3, 3, GROUP_GOLDENROD_CITY, MAP_GOLDENROD_CITY - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 3 - signpost 1, 0, $0, HappinessRatersHouseBookshelf - signpost 1, 1, $0, HappinessRatersHouseBookshelf - signpost 1, 7, $0, HappinessRatersHouseRadio + signpost 1, 0, SIGNPOST_READ, HappinessRatersHouseBookshelf + signpost 1, 1, SIGNPOST_READ, HappinessRatersHouseBookshelf + signpost 1, 7, SIGNPOST_READ, HappinessRatersHouseRadio - ; people-events +.PersonEvents: db 3 - person_event SPRITE_TEACHER, 8, 6, $6, $0, 255, 255, $90, 0, TeacherScript_0x54953, -1 - person_event SPRITE_POKEFAN_M, 7, 9, $8, $0, 255, 255, $0, 0, PokefanMScript_0x54997, -1 - person_event SPRITE_TWIN, 10, 9, $5, $1, 255, 255, $a0, 0, TwinScript_0x5499a, -1 + person_event SPRITE_TEACHER, 8, 6, OW_UP | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, TeacherScript_0x54953, -1 + person_event SPRITE_POKEFAN_M, 7, 9, OW_LEFT | $0, $0, -1, -1, $0, 0, PokefanMScript_0x54997, -1 + person_event SPRITE_TWIN, 10, 9, OW_UP | $1, $1, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, TwinScript_0x5499a, -1 diff --git a/maps/GoldenrodMagnetTrainStation.asm b/maps/GoldenrodMagnetTrainStation.asm index f65d258f8..339bc55ee 100644 --- a/maps/GoldenrodMagnetTrainStation.asm +++ b/maps/GoldenrodMagnetTrainStation.asm @@ -1,11 +1,11 @@ GoldenrodMagnetTrainStation_MapScriptHeader: - ; trigger count +.MapTriggers: db 1 ; triggers dw UnknownScript_0x550eb, $0000 - ; callback count +.MapCallbacks: db 0 UnknownScript_0x550eb: @@ -33,7 +33,7 @@ UnknownScript_0x550fa: applymovement $2, MovementData_0x55146 applymovement $0, MovementData_0x5514f writebyte $0 - special Function8cc04 + special Special_MagnetTrain warpcheck newloadmap $f9 applymovement $0, MovementData_0x55122 @@ -166,21 +166,21 @@ GoldenrodMagnetTrainStation_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 4 warp_def $11, $8, 5, GROUP_GOLDENROD_CITY, MAP_GOLDENROD_CITY warp_def $11, $9, 5, GROUP_GOLDENROD_CITY, MAP_GOLDENROD_CITY warp_def $5, $6, 4, GROUP_SAFFRON_TRAIN_STATION, MAP_SAFFRON_TRAIN_STATION warp_def $5, $b, 3, GROUP_SAFFRON_TRAIN_STATION, MAP_SAFFRON_TRAIN_STATION - ; xy triggers +.XYTriggers: db 1 xy_trigger 0, $6, $b, $0, UnknownScript_0x55130, $0, $0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 2 - person_event SPRITE_OFFICER, 13, 13, $6, $0, 255, 255, $0, 0, OfficerScript_0x550ec, -1 - person_event SPRITE_GENTLEMAN, 18, 15, $2, $22, 255, 255, $0, 0, GentlemanScript_0x55143, EVENT_749 + person_event SPRITE_OFFICER, 13, 13, OW_UP | $2, $0, -1, -1, $0, 0, OfficerScript_0x550ec, -1 + person_event SPRITE_GENTLEMAN, 18, 15, OW_DOWN | $2, $22, -1, -1, $0, 0, GentlemanScript_0x55143, EVENT_GOLDENROD_TRAIN_STATION_GENTLEMAN diff --git a/maps/GoldenrodNameRatersHouse.asm b/maps/GoldenrodNameRatersHouse.asm index 4f7129328..587e052d2 100644 --- a/maps/GoldenrodNameRatersHouse.asm +++ b/maps/GoldenrodNameRatersHouse.asm @@ -1,8 +1,8 @@ GoldenrodNameRatersHouse_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 GentlemanScript_0x5577c: @@ -25,20 +25,20 @@ GoldenrodNameRatersHouse_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $7, $2, 8, GROUP_GOLDENROD_CITY, MAP_GOLDENROD_CITY warp_def $7, $3, 8, GROUP_GOLDENROD_CITY, MAP_GOLDENROD_CITY - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 3 - signpost 1, 0, $0, GoldenrodNameRatersHouseBookshelf - signpost 1, 1, $0, GoldenrodNameRatersHouseBookshelf - signpost 1, 7, $0, GoldenrodNameRatersHouseRadio + signpost 1, 0, SIGNPOST_READ, GoldenrodNameRatersHouseBookshelf + signpost 1, 1, SIGNPOST_READ, GoldenrodNameRatersHouseBookshelf + signpost 1, 7, SIGNPOST_READ, GoldenrodNameRatersHouseRadio - ; people-events +.PersonEvents: db 1 - person_event SPRITE_GENTLEMAN, 8, 6, $6, $2, 255, 255, $0, 0, GentlemanScript_0x5577c, -1 + person_event SPRITE_GENTLEMAN, 8, 6, OW_UP | $2, $2, -1, -1, $0, 0, GentlemanScript_0x5577c, -1 diff --git a/maps/GoldenrodPPSpeechHouse.asm b/maps/GoldenrodPPSpeechHouse.asm index 869b882df..d41659542 100644 --- a/maps/GoldenrodPPSpeechHouse.asm +++ b/maps/GoldenrodPPSpeechHouse.asm @@ -1,8 +1,8 @@ GoldenrodPPSpeechHouse_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 FisherScript_0x5564a: @@ -51,21 +51,21 @@ GoldenrodPPSpeechHouse_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $7, $2, 7, GROUP_GOLDENROD_CITY, MAP_GOLDENROD_CITY warp_def $7, $3, 7, GROUP_GOLDENROD_CITY, MAP_GOLDENROD_CITY - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 3 - signpost 1, 0, $0, GoldenrodPPSpeechHouseBookshelf1 - signpost 1, 1, $0, GoldenrodPPSpeechHouseBookshelf2 - signpost 1, 7, $0, GoldenrodPPSpeechHouseRadio + signpost 1, 0, SIGNPOST_READ, GoldenrodPPSpeechHouseBookshelf1 + signpost 1, 1, SIGNPOST_READ, GoldenrodPPSpeechHouseBookshelf2 + signpost 1, 7, SIGNPOST_READ, GoldenrodPPSpeechHouseRadio - ; people-events +.PersonEvents: db 2 - person_event SPRITE_FISHER, 8, 6, $4, $10, 255, 255, $a0, 0, FisherScript_0x5564a, -1 - person_event SPRITE_LASS, 7, 9, $8, $10, 255, 255, $0, 0, LassScript_0x5564d, -1 + person_event SPRITE_FISHER, 8, 6, OW_UP | $0, $10, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, FisherScript_0x5564a, -1 + person_event SPRITE_LASS, 7, 9, OW_LEFT | $0, $10, -1, -1, $0, 0, LassScript_0x5564d, -1 diff --git a/maps/GoldenrodPokeCenter1F.asm b/maps/GoldenrodPokeCenter1F.asm index 04c944702..c74f59265 100644 --- a/maps/GoldenrodPokeCenter1F.asm +++ b/maps/GoldenrodPokeCenter1F.asm @@ -1,8 +1,8 @@ GoldenrodPokeCenter1F_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 NurseScript_0x60f91: @@ -801,25 +801,25 @@ GoldenrodPokeCenter1F_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 4 warp_def $7, $3, 15, GROUP_GOLDENROD_CITY, MAP_GOLDENROD_CITY warp_def $7, $4, 15, GROUP_GOLDENROD_CITY, MAP_GOLDENROD_CITY warp_def $6, $0, 1, GROUP_GOLDENROD_POKECOM_CENTER_2F_MOBILE, MAP_GOLDENROD_POKECOM_CENTER_2F_MOBILE warp_def $7, $0, 1, GROUP_POKECENTER_2F, MAP_POKECENTER_2F - ; xy triggers +.XYTriggers: db 2 xy_trigger 0, $7, $3, $0, UnknownScript_0x60f94, $0, $0 xy_trigger 0, $7, $4, $0, UnknownScript_0x60fd9, $0, $0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 5 - person_event SPRITE_NURSE, 5, 7, $6, $0, 255, 255, $0, 0, NurseScript_0x60f91, -1 - person_event SPRITE_LINK_RECEPTIONIST, 12, 20, $6, $0, 255, 255, $90, 0, ObjectEvent, -1 - person_event SPRITE_GAMEBOY_KID, 5, 10, $6, $0, 255, 255, $a0, 0, GameboyKidScript_0x6101e, -1 - person_event SPRITE_LASS, 8, 5, $5, $1, 255, 255, $0, 0, LassScript_0x61021, -1 - person_event SPRITE_POKEFAN_F, 9, 11, $6, $0, 255, 255, $b0, 0, PokefanFScript_0x61024, -1 + person_event SPRITE_NURSE, 5, 7, OW_UP | $2, $0, -1, -1, $0, 0, NurseScript_0x60f91, -1 + person_event SPRITE_LINK_RECEPTIONIST, 12, 20, OW_UP | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, ObjectEvent, -1 + person_event SPRITE_GAMEBOY_KID, 5, 10, OW_UP | $2, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, GameboyKidScript_0x6101e, -1 + person_event SPRITE_LASS, 8, 5, OW_UP | $1, $1, -1, -1, $0, 0, LassScript_0x61021, -1 + person_event SPRITE_POKEFAN_F, 9, 11, OW_UP | $2, $0, -1, -1, (PAL_OW_BROWN << 4) | $80, 0, PokefanFScript_0x61024, -1 diff --git a/maps/GoldenrodPokeComCenter2FMobile.asm b/maps/GoldenrodPokeComCenter2FMobile.asm index 2179dab30..44da9ca7b 100644 --- a/maps/GoldenrodPokeComCenter2FMobile.asm +++ b/maps/GoldenrodPokeComCenter2FMobile.asm @@ -1,8 +1,8 @@ GoldenrodPokeComCenter2FMobile_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 ScientistScript_0x625d1: @@ -99,8 +99,8 @@ MenuDataHeader_0x6264c: MenuData2_0x62654: db $80 ; flags db 3 ; items - db "でんわ",$1f,"つかうとき@" ; Use phone - db "でんわ",$4a,"つながらないとき@" ; Don't use phone + db "でんわ", $1f,"つかうとき@" ; Use phone + db "でんわ", $4a,"つながらないとき@" ; Don't use phone db "やめる@" ; QUIT @@ -267,22 +267,22 @@ GoldenrodPokeComCenter2FMobile_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $1f, $0, 3, GROUP_GOLDENROD_POKECENTER_1F, MAP_GOLDENROD_POKECENTER_1F warp_def $1f, $1, 3, GROUP_GOLDENROD_POKECENTER_1F, MAP_GOLDENROD_POKECENTER_1F - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 3 - signpost 26, 6, $1, MapGoldenrodPokeComCenter2FMobileSignpost0Script - signpost 28, 6, $1, MapGoldenrodPokeComCenter2FMobileSignpost1Script - signpost 26, 3, $1, MapGoldenrodPokeComCenter2FMobileSignpost2Script + signpost 26, 6, SIGNPOST_UP, MapGoldenrodPokeComCenter2FMobileSignpost0Script + signpost 28, 6, SIGNPOST_UP, MapGoldenrodPokeComCenter2FMobileSignpost1Script + signpost 26, 3, SIGNPOST_UP, MapGoldenrodPokeComCenter2FMobileSignpost2Script - ; people-events +.PersonEvents: db 3 - person_event SPRITE_SCIENTIST, 32, 8, $4, $10, 255, 255, $80, 0, ScientistScript_0x625d1, -1 - person_event SPRITE_SCIENTIST, 31, 11, $7, $0, 255, 255, $90, 0, ScientistScript_0x625d4, -1 - person_event SPRITE_SCIENTIST, 33, 11, $7, $0, 255, 255, $a0, 0, ScientistScript_0x625d7, -1 + person_event SPRITE_SCIENTIST, 32, 8, OW_UP | $0, $10, -1, -1, (PAL_OW_RED << 4) | $80, 0, ScientistScript_0x625d1, -1 + person_event SPRITE_SCIENTIST, 31, 11, OW_UP | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, ScientistScript_0x625d4, -1 + person_event SPRITE_SCIENTIST, 33, 11, OW_UP | $3, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, ScientistScript_0x625d7, -1 diff --git a/maps/GuideGentsHouse.asm b/maps/GuideGentsHouse.asm index e0bb35286..cf35df9ba 100644 --- a/maps/GuideGentsHouse.asm +++ b/maps/GuideGentsHouse.asm @@ -1,8 +1,8 @@ GuideGentsHouse_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 GuideGentsHouseGuideGent: @@ -28,19 +28,19 @@ GuideGentsHouse_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $7, $2, 4, GROUP_CHERRYGROVE_CITY, MAP_CHERRYGROVE_CITY warp_def $7, $3, 4, GROUP_CHERRYGROVE_CITY, MAP_CHERRYGROVE_CITY - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 2 - signpost 1, 0, $0, GuideGentsHouseBookshelf - signpost 1, 1, $0, GuideGentsHouseBookshelf + signpost 1, 0, SIGNPOST_READ, GuideGentsHouseBookshelf + signpost 1, 1, SIGNPOST_READ, GuideGentsHouseBookshelf - ; people-events +.PersonEvents: db 1 - person_event SPRITE_GRAMPS, 7, 6, $9, $0, 255, 255, $0, 0, GuideGentsHouseGuideGent, EVENT_GUIDE_GENT_VISIBLE_IN_CHERRYGROVE + person_event SPRITE_GRAMPS, 7, 6, OW_LEFT | $1, $0, -1, -1, $0, 0, GuideGentsHouseGuideGent, EVENT_GUIDE_GENT_VISIBLE_IN_CHERRYGROVE diff --git a/maps/HallOfFame.asm b/maps/HallOfFame.asm index 6050cef09..91595fa04 100644 --- a/maps/HallOfFame.asm +++ b/maps/HallOfFame.asm @@ -1,52 +1,52 @@ HallOfFame_MapScriptHeader: - ; trigger count +.MapTriggers: db 2 ; triggers - dw UnknownScript_0x18144f, $0000 - dw UnknownScript_0x181453, $0000 + dw .Trigger1, $0000 + dw .Trigger2, $0000 - ; callback count +.MapCallbacks: db 0 -UnknownScript_0x18144f: - priorityjump UnknownScript_0x181454 +.Trigger1: + priorityjump HallOfFameScript end -UnknownScript_0x181453: +.Trigger2: end -UnknownScript_0x181454: +HallOfFameScript: follow $2, $0 - applymovement $2, MovementData_0x181499 + applymovement $2, HallOfFame_WalkUpWithLance stopfollow spriteface $0, RIGHT loadfont - writetext UnknownText_0x1814a6 + writetext HallOfFame_LanceText closetext loadmovesprites spriteface $2, UP - applymovement $0, MovementData_0x1814a4 + applymovement $0, HallOfFame_SlowlyApproachMachine dotrigger $1 pause 15 - writebyte $2 + writebyte 2 ; Machine is in the Hall of Fame special HealMachineAnim setevent EVENT_BEAT_ELITE_FOUR setevent EVENT_TELEPORT_GUY setevent EVENT_RIVAL_SPROUT_TOWER clearevent EVENT_RED_IN_MT_SILVER - setevent EVENT_737 - clearevent EVENT_738 + setevent EVENT_OLIVINE_PORT_SPRITES_BEFORE_HALL_OF_FAME + clearevent EVENT_OLIVINE_PORT_SPRITES_AFTER_HALL_OF_FAME domaptrigger GROUP_SPROUT_TOWER_3F, MAP_SPROUT_TOWER_3F, $1 special HealParty checkevent EVENT_GOT_SS_TICKET_FROM_ELM - iftrue UnknownScript_0x181497 - specialphonecall $5 -UnknownScript_0x181497: + iftrue .SkipPhoneCall + specialphonecall ELMCALL_SSTICKET +.SkipPhoneCall: halloffame end -MovementData_0x181499: +HallOfFame_WalkUpWithLance: step_up step_up step_up @@ -59,11 +59,11 @@ MovementData_0x181499: turn_head_left step_end -MovementData_0x1814a4: +HallOfFame_SlowlyApproachMachine: slow_step_up step_end -UnknownText_0x1814a6: +HallOfFame_LanceText: text "LANCE: It's been a" line "long time since I" cont "last came here." @@ -113,17 +113,17 @@ HallOfFame_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $d, $4, 3, GROUP_LANCES_ROOM, MAP_LANCES_ROOM warp_def $d, $5, 4, GROUP_LANCES_ROOM, MAP_LANCES_ROOM - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 1 - person_event SPRITE_LANCE, 16, 8, $7, $0, 255, 255, $0, 0, ObjectEvent, -1 + person_event SPRITE_LANCE, 16, 8, OW_UP | $3, $0, -1, -1, PAL_OW_RED << 4 | $0, 0, ObjectEvent, -1 diff --git a/maps/IcePath1F.asm b/maps/IcePath1F.asm index 9ed1bb265..c233edeba 100644 --- a/maps/IcePath1F.asm +++ b/maps/IcePath1F.asm @@ -1,8 +1,8 @@ IcePath1F_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 ItemFragment_0x7e472: @@ -18,21 +18,21 @@ IcePath1F_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 4 warp_def $13, $4, 1, GROUP_ROUTE_44, MAP_ROUTE_44 warp_def $1b, $24, 7, GROUP_BLACKTHORN_CITY, MAP_BLACKTHORN_CITY warp_def $5, $25, 1, GROUP_ICE_PATH_B1F, MAP_ICE_PATH_B1F warp_def $d, $25, 7, GROUP_ICE_PATH_B1F, MAP_ICE_PATH_B1F - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 3 - person_event SPRITE_POKE_BALL, 11, 35, $1, $0, 255, 255, $1, 0, ItemFragment_0x7e472, EVENT_688 - person_event SPRITE_POKE_BALL, 27, 36, $1, $0, 255, 255, $1, 0, ItemFragment_0x7e474, EVENT_689 - person_event SPRITE_POKE_BALL, 13, 39, $1, $0, 255, 255, $1, 0, ItemFragment_0x7e476, EVENT_7BE + person_event SPRITE_POKE_BALL, 11, 35, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x7e472, EVENT_GOT_HM07_WATERFALL + person_event SPRITE_POKE_BALL, 27, 36, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x7e474, EVENT_ICE_PATH_1F_PP_UP + person_event SPRITE_POKE_BALL, 13, 39, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x7e476, EVENT_ICE_PATH_1F_PROTEIN diff --git a/maps/IcePathB1F.asm b/maps/IcePathB1F.asm index 90f574d36..06a9d9ee8 100644 --- a/maps/IcePathB1F.asm +++ b/maps/IcePathB1F.asm @@ -1,8 +1,8 @@ IcePathB1F_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 1 ; callbacks @@ -34,22 +34,22 @@ StoneTable_0x7e4c7: UnknownScript_0x7e4d8: disappear 2 - clearevent EVENT_BOULDER_IN_ICE_PATH_1 + clearevent EVENT_BOULDER_IN_ICE_PATH_1A jump UnknownScript_0x7e4f8 UnknownScript_0x7e4e0: disappear 3 - clearevent EVENT_BOULDER_IN_ICE_PATH_2 + clearevent EVENT_BOULDER_IN_ICE_PATH_2A jump UnknownScript_0x7e4f8 UnknownScript_0x7e4e8: disappear 4 - clearevent EVENT_BOULDER_IN_ICE_PATH_3 + clearevent EVENT_BOULDER_IN_ICE_PATH_3A jump UnknownScript_0x7e4f8 UnknownScript_0x7e4f0: disappear 5 - clearevent EVENT_BOULDER_IN_ICE_PATH_4 + clearevent EVENT_BOULDER_IN_ICE_PATH_4A jump UnknownScript_0x7e4f8 UnknownScript_0x7e4f8: @@ -74,8 +74,7 @@ ItemFragment_0x7e50d: db IRON, 1 MapIcePathB1FSignpostItem0: - dw $0094 - db MAX_POTION + dwb EVENT_ICE_PATH_B1F_HIDDEN_MAX_POTION, MAX_POTION UnknownText_0x7e512: @@ -88,7 +87,7 @@ IcePathB1F_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 8 warp_def $f, $3, 3, GROUP_ICE_PATH_1F, MAP_ICE_PATH_1F warp_def $3, $11, 1, GROUP_ICE_PATH_B2F_MAHOGANY_SIDE, MAP_ICE_PATH_B2F_MAHOGANY_SIDE @@ -99,17 +98,17 @@ IcePathB1F_MapEventHeader: warp_def $19, $5, 4, GROUP_ICE_PATH_1F, MAP_ICE_PATH_1F warp_def $1b, $b, 1, GROUP_ICE_PATH_B2F_BLACKTHORN_SIDE, MAP_ICE_PATH_B2F_BLACKTHORN_SIDE - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 1 - signpost 30, 17, $7, MapIcePathB1FSignpostItem0 + signpost 30, 17, SIGNPOST_ITEM, MapIcePathB1FSignpostItem0 - ; people-events +.PersonEvents: db 5 - person_event SPRITE_BOULDER, 11, 15, $19, $0, 255, 255, $0, 0, IcePathB1FBoulder, EVENT_709 - person_event SPRITE_BOULDER, 12, 11, $19, $0, 255, 255, $0, 0, IcePathB1FBoulder, EVENT_70A - person_event SPRITE_BOULDER, 13, 12, $19, $0, 255, 255, $0, 0, IcePathB1FBoulder, EVENT_70B - person_event SPRITE_BOULDER, 11, 21, $19, $0, 255, 255, $0, 0, IcePathB1FBoulder, EVENT_70C - person_event SPRITE_POKE_BALL, 39, 9, $1, $0, 255, 255, $1, 0, ItemFragment_0x7e50d, EVENT_68A + person_event SPRITE_BOULDER, 11, 15, OW_LEFT | $11, $0, -1, -1, $0, 0, IcePathB1FBoulder, EVENT_BOULDER_IN_ICE_PATH_1 + person_event SPRITE_BOULDER, 12, 11, OW_LEFT | $11, $0, -1, -1, $0, 0, IcePathB1FBoulder, EVENT_BOULDER_IN_ICE_PATH_2 + person_event SPRITE_BOULDER, 13, 12, OW_LEFT | $11, $0, -1, -1, $0, 0, IcePathB1FBoulder, EVENT_BOULDER_IN_ICE_PATH_3 + person_event SPRITE_BOULDER, 11, 21, OW_LEFT | $11, $0, -1, -1, $0, 0, IcePathB1FBoulder, EVENT_BOULDER_IN_ICE_PATH_4 + person_event SPRITE_POKE_BALL, 39, 9, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x7e50d, EVENT_ICE_PATH_B1F_IRON diff --git a/maps/IcePathB2FBlackthornSide.asm b/maps/IcePathB2FBlackthornSide.asm index b7643ab56..cc2d35fed 100644 --- a/maps/IcePathB2FBlackthornSide.asm +++ b/maps/IcePathB2FBlackthornSide.asm @@ -1,34 +1,33 @@ IcePathB2FBlackthornSide_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 ItemFragment_0x7e646: db TM_REST, 1 MapIcePathB2FBlackthornSideSignpostItem0: - dw $0096 - db ICE_HEAL + dwb EVENT_ICE_PATH_B2F_BLACKTHORN_SIDE_HIDDEN_ICE_HEAL, ICE_HEAL IcePathB2FBlackthornSide_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $f, $3, 8, GROUP_ICE_PATH_B1F, MAP_ICE_PATH_B1F warp_def $3, $3, 2, GROUP_ICE_PATH_B3F, MAP_ICE_PATH_B3F - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 1 - signpost 10, 2, $7, MapIcePathB2FBlackthornSideSignpostItem0 + signpost 10, 2, SIGNPOST_ITEM, MapIcePathB2FBlackthornSideSignpostItem0 - ; people-events +.PersonEvents: db 1 - person_event SPRITE_POKE_BALL, 20, 12, $1, $0, 255, 255, $1, 0, ItemFragment_0x7e646, EVENT_68D + person_event SPRITE_POKE_BALL, 20, 12, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x7e646, EVENT_ICE_PATH_B2F_BLACKTHORN_SIDE_TM_REST diff --git a/maps/IcePathB2FMahoganySide.asm b/maps/IcePathB2FMahoganySide.asm index 1f6c826d3..925021077 100644 --- a/maps/IcePathB2FMahoganySide.asm +++ b/maps/IcePathB2FMahoganySide.asm @@ -1,8 +1,8 @@ IcePathB2FMahoganySide_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 BoulderScript_0x7e5a3: @@ -15,8 +15,7 @@ ItemFragment_0x7e5a8: db MAX_POTION, 1 MapIcePathB2FMahoganySideSignpostItem0: - dw $0095 - db CARBOS + dwb EVENT_ICE_PATH_B2F_MAHOGANY_SIDE_HIDDEN_CARBOS, CARBOS UnknownText_0x7e5ad: @@ -28,7 +27,7 @@ IcePathB2FMahoganySide_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 6 warp_def $1, $11, 2, GROUP_ICE_PATH_B1F, MAP_ICE_PATH_B1F warp_def $b, $9, 1, GROUP_ICE_PATH_B3F, MAP_ICE_PATH_B3F @@ -37,18 +36,18 @@ IcePathB2FMahoganySide_MapEventHeader: warp_def $c, $4, 5, GROUP_ICE_PATH_B1F, MAP_ICE_PATH_B1F warp_def $c, $c, 6, GROUP_ICE_PATH_B1F, MAP_ICE_PATH_B1F - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 1 - signpost 17, 0, $7, MapIcePathB2FMahoganySideSignpostItem0 + signpost 17, 0, SIGNPOST_ITEM, MapIcePathB2FMahoganySideSignpostItem0 - ; people-events +.PersonEvents: db 6 - person_event SPRITE_BOULDER, 7, 15, $1, $0, 255, 255, $0, 0, BoulderScript_0x7e5a3, EVENT_BOULDER_IN_ICE_PATH_1 - person_event SPRITE_BOULDER, 11, 8, $1, $0, 255, 255, $0, 0, BoulderScript_0x7e5a3, EVENT_BOULDER_IN_ICE_PATH_2 - person_event SPRITE_BOULDER, 16, 7, $1, $0, 255, 255, $0, 0, BoulderScript_0x7e5a3, EVENT_BOULDER_IN_ICE_PATH_3 - person_event SPRITE_BOULDER, 17, 16, $1, $0, 255, 255, $0, 0, BoulderScript_0x7e5a3, EVENT_BOULDER_IN_ICE_PATH_4 - person_event SPRITE_POKE_BALL, 13, 12, $1, $0, 255, 255, $1, 0, ItemFragment_0x7e5a6, EVENT_68B - person_event SPRITE_POKE_BALL, 6, 4, $1, $0, 255, 255, $1, 0, ItemFragment_0x7e5a8, EVENT_68C + person_event SPRITE_BOULDER, 7, 15, OW_DOWN | $1, $0, -1, -1, $0, 0, BoulderScript_0x7e5a3, EVENT_BOULDER_IN_ICE_PATH_1A + person_event SPRITE_BOULDER, 11, 8, OW_DOWN | $1, $0, -1, -1, $0, 0, BoulderScript_0x7e5a3, EVENT_BOULDER_IN_ICE_PATH_2A + person_event SPRITE_BOULDER, 16, 7, OW_DOWN | $1, $0, -1, -1, $0, 0, BoulderScript_0x7e5a3, EVENT_BOULDER_IN_ICE_PATH_3A + person_event SPRITE_BOULDER, 17, 16, OW_DOWN | $1, $0, -1, -1, $0, 0, BoulderScript_0x7e5a3, EVENT_BOULDER_IN_ICE_PATH_4A + person_event SPRITE_POKE_BALL, 13, 12, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x7e5a6, EVENT_ICE_PATH_B2F_MAHOGANY_SIDE_FULL_HEAL + person_event SPRITE_POKE_BALL, 6, 4, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x7e5a8, EVENT_ICE_PATH_B2F_MAHOGANY_SIDE_MAX_POTION diff --git a/maps/IcePathB3F.asm b/maps/IcePathB3F.asm index d1c1450af..e03b38d16 100644 --- a/maps/IcePathB3F.asm +++ b/maps/IcePathB3F.asm @@ -1,8 +1,8 @@ IcePathB3F_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 ItemFragment_0x7e66f: @@ -15,18 +15,18 @@ IcePathB3F_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $5, $3, 2, GROUP_ICE_PATH_B2F_MAHOGANY_SIDE, MAP_ICE_PATH_B2F_MAHOGANY_SIDE warp_def $5, $f, 2, GROUP_ICE_PATH_B2F_BLACKTHORN_SIDE, MAP_ICE_PATH_B2F_BLACKTHORN_SIDE - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 2 - person_event SPRITE_POKE_BALL, 11, 9, $1, $0, 255, 255, $1, 0, ItemFragment_0x7e66f, EVENT_68E - person_event SPRITE_ROCK, 10, 10, $18, $0, 255, 255, $0, 0, IcePathB3FRock, -1 + person_event SPRITE_POKE_BALL, 11, 9, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x7e66f, EVENT_ICE_PATH_B3F_NEVERMELTICE + person_event SPRITE_ROCK, 10, 10, OW_LEFT | $10, $0, -1, -1, $0, 0, IcePathB3FRock, -1 diff --git a/maps/IlexForest.asm b/maps/IlexForest.asm index 79d8f55b8..aa4535afb 100644 --- a/maps/IlexForest.asm +++ b/maps/IlexForest.asm @@ -1,8 +1,8 @@ IlexForest_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 1 ; callbacks @@ -293,7 +293,7 @@ UnknownScript_0x6ed50: appear $2 loadvar FarfetchdPosition, $a appear $4 - setevent EVENT_6F7 + setevent EVENT_CHARCOAL_KILN_BOSS setevent EVENT_HERDED_FARFETCHD end @@ -344,12 +344,12 @@ BlackBeltScript_0x6edae: writetext UnknownText_0x6f141 closetext loadmovesprites - setevent EVENT_6E9 - setevent EVENT_6F3 - setevent EVENT_6F4 - clearevent EVENT_6F5 - clearevent EVENT_6F6 - clearevent EVENT_6F7 + setevent EVENT_ILEX_FOREST_FARFETCHD + setevent EVENT_ILEX_FOREST_APPRENTICE + setevent EVENT_ILEX_FOREST_CHARCOAL_MASTER + clearevent EVENT_CHARCOAL_KILN_FARFETCH_D + clearevent EVENT_CHARCOAL_KILN_APPRENTICE + clearevent EVENT_CHARCOAL_KILN_BOSS end UnknownScript_0x6edd8: @@ -376,23 +376,7 @@ UnknownScript_0x6edf7: end TrainerBug_catcherWayne: - ; bit/flag number - dw EVENT_BEAT_BUG_CATCHER_WAYNE - - ; trainer group && trainer id - db BUG_CATCHER, WAYNE - - ; text when seen - dw Bug_catcherWayneSeenText - - ; text when trainer beaten - dw Bug_catcherWayneBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw Bug_catcherWayneScript + trainer EVENT_BEAT_BUG_CATCHER_WAYNE, BUG_CATCHER, WAYNE, Bug_catcherWayneSeenText, Bug_catcherWayneBeatenText, $0000, Bug_catcherWayneScript Bug_catcherWayneScript: talkaftercancel @@ -418,18 +402,15 @@ ItemFragment_0x6ee16: db ETHER, 1 MapIlexForestSignpostItem1: - dw $0088 - db ETHER + dwb EVENT_ILEX_FOREST_HIDDEN_ETHER, ETHER MapIlexForestSignpostItem2: - dw $0089 - db SUPER_POTION + dwb EVENT_ILEX_FOREST_HIDDEN_SUPER_POTION, SUPER_POTION MapIlexForestSignpostItem3: - dw $008a - db FULL_HEAL + dwb EVENT_ILEX_FOREST_HIDDEN_FULL_HEAL, FULL_HEAL IlexForestBoulder: ; unused @@ -460,14 +441,14 @@ UnknownScript_0x6ee38: UnknownScript_0x6ee42: takeitem GS_BALL, 1 clearevent EVENT_FOREST_IS_RESTLESS - setevent EVENT_7A4 + setevent EVENT_AZALEA_TOWN_KURT disappear $8 - clearevent EVENT_6EB + clearevent EVENT_ROUTE_34_ILEX_FOREST_GATE_LASS writetext UnknownText_0x6f43b closetext loadmovesprites pause 20 - showemote $0, $0, 20 + showemote EMOTE_SHOCK, $0, 20 special Functionc48f applymovement $0, MovementData_0x6ef58 pause 30 @@ -950,33 +931,33 @@ IlexForest_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 3 warp_def $5, $1, 3, GROUP_ROUTE_34_ILEX_FOREST_GATE, MAP_ROUTE_34_ILEX_FOREST_GATE warp_def $2a, $3, 1, GROUP_ILEX_FOREST_AZALEA_GATE, MAP_ILEX_FOREST_AZALEA_GATE warp_def $2b, $3, 2, GROUP_ILEX_FOREST_AZALEA_GATE, MAP_ILEX_FOREST_AZALEA_GATE - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 5 - signpost 17, 3, $0, MapIlexForestSignpost0Script - signpost 7, 11, $7, MapIlexForestSignpostItem1 - signpost 14, 22, $7, MapIlexForestSignpostItem2 - signpost 17, 1, $7, MapIlexForestSignpostItem3 - signpost 22, 8, $1, MapIlexForestSignpost4Script + signpost 17, 3, SIGNPOST_READ, MapIlexForestSignpost0Script + signpost 7, 11, SIGNPOST_ITEM, MapIlexForestSignpostItem1 + signpost 14, 22, SIGNPOST_ITEM, MapIlexForestSignpostItem2 + signpost 17, 1, SIGNPOST_ITEM, MapIlexForestSignpostItem3 + signpost 22, 8, SIGNPOST_UP, MapIlexForestSignpost4Script - ; people-events +.PersonEvents: db 11 - person_event SPRITE_BIRD, 35, 18, $3, $0, 255, 255, $b0, 0, BirdScript_0x6eb8f, EVENT_6E9 - person_event SPRITE_YOUNGSTER, 32, 11, $6, $0, 255, 255, $a0, 0, YoungsterScript_0x6eb7b, EVENT_6F3 - person_event SPRITE_BLACK_BELT, 32, 9, $9, $0, 255, 255, $0, 0, BlackBeltScript_0x6edae, EVENT_6F4 - person_event SPRITE_ROCKER, 18, 19, $9, $0, 255, 255, $0, 0, RockerScript_0x6edde, -1 - person_event SPRITE_POKE_BALL, 36, 24, $1, $0, 255, 255, $1, 0, ItemFragment_0x6ee10, EVENT_671 - person_event SPRITE_KURT, 33, 12, $7, $0, 255, 255, $0, 0, ObjectEvent, EVENT_7A5 - person_event SPRITE_LASS, 28, 7, $9, $0, 255, 255, $a0, 0, LassScript_0x6ee0d, EVENT_6ED - person_event SPRITE_YOUNGSTER, 5, 16, $7, $0, 255, 255, $a2, 0, TrainerBug_catcherWayne, -1 - person_event SPRITE_POKE_BALL, 21, 13, $1, $0, 255, 255, $1, 0, ItemFragment_0x6ee12, EVENT_7B9 - person_event SPRITE_POKE_BALL, 11, 21, $1, $0, 255, 255, $1, 0, ItemFragment_0x6ee14, EVENT_7BA - person_event SPRITE_POKE_BALL, 5, 31, $1, $0, 255, 255, $1, 0, ItemFragment_0x6ee16, EVENT_7BB + person_event SPRITE_BIRD, 35, 18, OW_DOWN | $3, $0, -1, -1, (PAL_OW_BROWN << 4) | $80, 0, BirdScript_0x6eb8f, EVENT_ILEX_FOREST_FARFETCHD + person_event SPRITE_YOUNGSTER, 32, 11, OW_UP | $2, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, YoungsterScript_0x6eb7b, EVENT_ILEX_FOREST_APPRENTICE + person_event SPRITE_BLACK_BELT, 32, 9, OW_LEFT | $1, $0, -1, -1, $0, 0, BlackBeltScript_0x6edae, EVENT_ILEX_FOREST_CHARCOAL_MASTER + person_event SPRITE_ROCKER, 18, 19, OW_LEFT | $1, $0, -1, -1, $0, 0, RockerScript_0x6edde, -1 + person_event SPRITE_POKE_BALL, 36, 24, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x6ee10, EVENT_ILEX_FOREST_REVIVE + person_event SPRITE_KURT, 33, 12, OW_UP | $3, $0, -1, -1, $0, 0, ObjectEvent, EVENT_ILEX_FOREST_KURT + person_event SPRITE_LASS, 28, 7, OW_LEFT | $1, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, LassScript_0x6ee0d, EVENT_ILEX_FOREST_LASS + person_event SPRITE_YOUNGSTER, 5, 16, OW_UP | $3, $0, -1, -1, (PAL_OW_GREEN << 4) | $82, 0, TrainerBug_catcherWayne, -1 + person_event SPRITE_POKE_BALL, 21, 13, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x6ee12, EVENT_ILEX_FOREST_X_ATTACK + person_event SPRITE_POKE_BALL, 11, 21, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x6ee14, EVENT_ILEX_FOREST_ANTIDOTE + person_event SPRITE_POKE_BALL, 5, 31, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x6ee16, EVENT_ILEX_FOREST_ETHER diff --git a/maps/IlexForestAzaleaGate.asm b/maps/IlexForestAzaleaGate.asm index 1554f4e57..68ac4631f 100644 --- a/maps/IlexForestAzaleaGate.asm +++ b/maps/IlexForestAzaleaGate.asm @@ -1,8 +1,8 @@ IlexForestAzaleaGate_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 OfficerScript_0x62c7a: @@ -30,20 +30,20 @@ IlexForestAzaleaGate_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 4 warp_def $4, $0, 2, GROUP_ILEX_FOREST, MAP_ILEX_FOREST warp_def $5, $0, 3, GROUP_ILEX_FOREST, MAP_ILEX_FOREST warp_def $4, $9, 7, GROUP_AZALEA_TOWN, MAP_AZALEA_TOWN warp_def $5, $9, 8, GROUP_AZALEA_TOWN, MAP_AZALEA_TOWN - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 2 - person_event SPRITE_OFFICER, 6, 9, $6, $0, 255, 255, $80, 0, OfficerScript_0x62c7a, -1 - person_event SPRITE_GRANNY, 7, 5, $6, $0, 255, 255, $b0, 0, GrannyScript_0x62c7d, -1 + person_event SPRITE_OFFICER, 6, 9, OW_UP | $2, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, OfficerScript_0x62c7a, -1 + person_event SPRITE_GRANNY, 7, 5, OW_UP | $2, $0, -1, -1, (PAL_OW_BROWN << 4) | $80, 0, GrannyScript_0x62c7d, -1 diff --git a/maps/IndigoPlateauPokeCenter1F.asm b/maps/IndigoPlateauPokeCenter1F.asm index 03013b174..1e91d6319 100644 --- a/maps/IndigoPlateauPokeCenter1F.asm +++ b/maps/IndigoPlateauPokeCenter1F.asm @@ -1,11 +1,11 @@ IndigoPlateauPokeCenter1F_MapScriptHeader: - ; trigger count +.MapTriggers: db 1 ; triggers dw UnknownScript_0x180009, $0000 - ; callback count +.MapCallbacks: db 1 ; callbacks @@ -22,22 +22,22 @@ UnknownScript_0x18000a: domaptrigger GROUP_KARENS_ROOM, MAP_KARENS_ROOM, $0 domaptrigger GROUP_LANCES_ROOM, MAP_LANCES_ROOM, $0 domaptrigger GROUP_HALL_OF_FAME, MAP_HALL_OF_FAME, $0 - clearevent EVENT_309 - clearevent EVENT_WILLS_ROOM_EXIT_OPEN clearevent EVENT_WILLS_ROOM_ENTRANCE_CLOSED - clearevent EVENT_KOGAS_ROOM_EXIT_OPEN + clearevent EVENT_WILLS_ROOM_EXIT_OPEN clearevent EVENT_KOGAS_ROOM_ENTRANCE_CLOSED + clearevent EVENT_KOGAS_ROOM_EXIT_OPEN + clearevent EVENT_BRUNOS_ROOM_ENTRANCE_CLOSED clearevent EVENT_BRUNOS_ROOM_EXIT_OPEN clearevent EVENT_KARENS_ROOM_ENTRANCE_CLOSED clearevent EVENT_KARENS_ROOM_EXIT_OPEN clearevent EVENT_LANCES_ROOM_ENTRANCE_CLOSED - clearevent EVENT_312 + clearevent EVENT_LANCES_ROOM_EXIT_OPEN clearevent EVENT_BEAT_ELITE_4_WILL clearevent EVENT_BEAT_ELITE_4_KOGA clearevent EVENT_BEAT_ELITE_4_BRUNO clearevent EVENT_BEAT_ELITE_4_KAREN clearevent EVENT_BEAT_CHAMPION_LANCE - setevent EVENT_75F + setevent EVENT_LANCES_ROOM_OAK_AND_MARY return UnknownScript_0x180053: @@ -54,7 +54,7 @@ UnknownScript_0x180053: moveperson $5, $11, $9 appear $5 spriteface $0, DOWN - showemote $0, $0, 15 + showemote EMOTE_SHOCK, $0, 15 special Functionc48f pause 15 applymovement $5, MovementData_0x180164 @@ -75,7 +75,7 @@ UnknownScript_0x180094: if_equal SATURDAY, UnknownScript_0x18012b appear $5 spriteface $0, DOWN - showemote $0, $0, 15 + showemote EMOTE_SHOCK, $0, 15 special Functionc48f pause 15 applymovement $5, MovementData_0x18016b @@ -86,7 +86,7 @@ UnknownScript_0x1800ce: writetext UnknownText_0x1801f5 closetext loadmovesprites - setevent EVENT_77B + setevent EVENT_INDIGO_PLATEAU_POKECENTER_RIVAL checkevent EVENT_GOT_TOTODILE_FROM_ELM iftrue UnknownScript_0x1800f3 checkevent EVENT_GOT_CHIKORITA_FROM_ELM @@ -154,7 +154,7 @@ TeleportGuyScript: closetext loadmovesprites playsound SFX_WARP_TO - special Function8c084 + special FadeBlackBGMap waitbutton warp GROUP_NEW_BARK_TOWN, MAP_NEW_BARK_TOWN, $d, $6 end @@ -302,26 +302,26 @@ IndigoPlateauPokeCenter1F_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 4 warp_def $d, $5, 1, GROUP_ROUTE_23, MAP_ROUTE_23 warp_def $d, $6, 2, GROUP_ROUTE_23, MAP_ROUTE_23 warp_def $d, $0, 1, GROUP_POKECENTER_2F, MAP_POKECENTER_2F warp_def $3, $e, 1, GROUP_WILLS_ROOM, MAP_WILLS_ROOM - ; xy triggers +.XYTriggers: db 2 xy_trigger 0, $4, $10, $0, UnknownScript_0x180053, $0, $0 xy_trigger 0, $4, $11, $0, UnknownScript_0x180094, $0, $0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 6 - person_event SPRITE_NURSE, 11, 7, $6, $0, 255, 255, $0, 0, NurseScript_0x18012c, -1 - person_event SPRITE_CLERK, 11, 15, $6, $0, 255, 255, $0, 0, ClerkScript_0x18012f, -1 - person_event SPRITE_COOLTRAINER_M, 15, 15, $2, $22, 255, 255, $0, 0, CooltrainerMScript_0x180136, -1 - person_event SPRITE_SILVER, 13, 20, $7, $0, 255, 255, $0, 0, ObjectEvent, EVENT_77B - person_event SPRITE_GRAMPS, 13, 5, $6, $0, 255, 255, $90, 0, TeleportGuyScript, EVENT_TELEPORT_GUY - person_event SPRITE_JYNX, 13, 4, $16, $0, 255, 255, $b0, 0, AbraScript, EVENT_TELEPORT_GUY + person_event SPRITE_NURSE, 11, 7, OW_UP | $2, $0, -1, -1, $0, 0, NurseScript_0x18012c, -1 + person_event SPRITE_CLERK, 11, 15, OW_UP | $2, $0, -1, -1, $0, 0, ClerkScript_0x18012f, -1 + person_event SPRITE_COOLTRAINER_M, 15, 15, OW_DOWN | $2, $22, -1, -1, $0, 0, CooltrainerMScript_0x180136, -1 + person_event SPRITE_SILVER, 13, 20, OW_UP | $3, $0, -1, -1, $0, 0, ObjectEvent, EVENT_INDIGO_PLATEAU_POKECENTER_RIVAL + person_event SPRITE_GRAMPS, 13, 5, OW_UP | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, TeleportGuyScript, EVENT_TELEPORT_GUY + person_event SPRITE_JYNX, 13, 4, OW_UP | $12, $0, -1, -1, (PAL_OW_BROWN << 4) | $80, 0, AbraScript, EVENT_TELEPORT_GUY diff --git a/maps/KarensRoom.asm b/maps/KarensRoom.asm index e26e802dc..3e0f761e8 100644 --- a/maps/KarensRoom.asm +++ b/maps/KarensRoom.asm @@ -1,12 +1,12 @@ KarensRoom_MapScriptHeader: - ; trigger count +.MapTriggers: db 2 ; triggers dw UnknownScript_0x180bbc, $0000 dw UnknownScript_0x180bc0, $0000 - ; callback count +.MapCallbacks: db 1 ; callbacks @@ -138,19 +138,19 @@ KarensRoom_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 4 warp_def $11, $4, 3, GROUP_BRUNOS_ROOM, MAP_BRUNOS_ROOM warp_def $11, $5, 4, GROUP_BRUNOS_ROOM, MAP_BRUNOS_ROOM warp_def $2, $4, 1, GROUP_LANCES_ROOM, MAP_LANCES_ROOM warp_def $2, $5, 2, GROUP_LANCES_ROOM, MAP_LANCES_ROOM - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 1 - person_event SPRITE_KAREN, 11, 9, $6, $0, 255, 255, $80, 0, KarenScript_0x180bee, -1 + person_event SPRITE_KAREN, 11, 9, OW_UP | $2, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, KarenScript_0x180bee, -1 diff --git a/maps/KogasRoom.asm b/maps/KogasRoom.asm index 38f29c379..957d4dc6c 100644 --- a/maps/KogasRoom.asm +++ b/maps/KogasRoom.asm @@ -1,12 +1,12 @@ KogasRoom_MapScriptHeader: - ; trigger count +.MapTriggers: db 2 ; triggers dw UnknownScript_0x180728, $0000 dw UnknownScript_0x18072c, $0000 - ; callback count +.MapCallbacks: db 1 ; callbacks @@ -21,7 +21,7 @@ UnknownScript_0x18072c: end UnknownScript_0x18072d: - checkevent EVENT_WILLS_ROOM_ENTRANCE_CLOSED + checkevent EVENT_KOGAS_ROOM_ENTRANCE_CLOSED iffalse UnknownScript_0x180737 changeblock $4, $e, $2a UnknownScript_0x180737: @@ -40,7 +40,7 @@ UnknownScript_0x180742: reloadmappart loadmovesprites dotrigger $1 - setevent EVENT_WILLS_ROOM_ENTRANCE_CLOSED + setevent EVENT_KOGAS_ROOM_ENTRANCE_CLOSED waitbutton end @@ -135,19 +135,19 @@ KogasRoom_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 4 warp_def $11, $4, 2, GROUP_WILLS_ROOM, MAP_WILLS_ROOM warp_def $11, $5, 3, GROUP_WILLS_ROOM, MAP_WILLS_ROOM warp_def $2, $4, 1, GROUP_BRUNOS_ROOM, MAP_BRUNOS_ROOM warp_def $2, $5, 2, GROUP_BRUNOS_ROOM, MAP_BRUNOS_ROOM - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 1 - person_event SPRITE_KOGA, 11, 9, $6, $0, 255, 255, $90, 0, KogaScript_0x18075a, -1 + person_event SPRITE_KOGA, 11, 9, OW_UP | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, KogaScript_0x18075a, -1 diff --git a/maps/KrissHouse1F.asm b/maps/KrissHouse1F.asm index eb0e121fb..e18a0b073 100644 --- a/maps/KrissHouse1F.asm +++ b/maps/KrissHouse1F.asm @@ -1,12 +1,12 @@ KrissHouse1F_MapScriptHeader: - ; trigger count +.MapTriggers: db 2 ; triggers dw UnknownScript_0x7a4d6, $0000 dw UnknownScript_0x7a4d7, $0000 - ; callback count +.MapCallbacks: db 0 UnknownScript_0x7a4d6: @@ -16,13 +16,13 @@ UnknownScript_0x7a4d7: end UnknownScript_0x7a4d8: - setevent EVENT_000 + setevent EVENT_GAVE_KURT_APRICORNS UnknownScript_0x7a4db: playmusic MUSIC_MOM - showemote $0, $2, 15 + showemote EMOTE_SHOCK, $2, 15 spriteface $0, LEFT - checkevent EVENT_000 + checkevent EVENT_GAVE_KURT_APRICORNS iffalse UnknownScript_0x7a4f2 applymovement $2, MovementData_0x7a5fc jump UnknownScript_0x7a4f6 @@ -39,11 +39,11 @@ UnknownScript_0x7a4f6: setflag ENGINE_PHONE_CARD addcellnum $1 dotrigger $1 - setevent EVENT_6C7 - clearevent EVENT_6C8 + setevent EVENT_KRISS_HOUSE_MOM_1 + clearevent EVENT_KRISS_HOUSE_MOM_2 writetext UnknownText_0x7a6bd keeptextopen - special Function90913 + special Special_SetDayOfWeek UnknownScript_0x7a519: writetext UnknownText_0x7a742 yesorno @@ -77,9 +77,9 @@ UnknownScript_0x7a549: writetext UnknownText_0x7a850 closetext loadmovesprites - checkevent EVENT_000 + checkevent EVENT_GAVE_KURT_APRICORNS iftrue UnknownScript_0x7a55d - checkevent EVENT_001 + checkevent EVENT_RECEIVED_BALLS_FROM_KURT iffalse UnknownScript_0x7a564 jump UnknownScript_0x7a56b @@ -109,11 +109,11 @@ UnknownScript_0x7a57e: MomScript_0x7a582: faceplayer - setevent EVENT_001 + setevent EVENT_RECEIVED_BALLS_FROM_KURT checktriggers iffalse UnknownScript_0x7a572 loadfont - checkevent EVENT_076 + checkevent EVENT_FIRST_TIME_BANKING_WITH_MOM iftrue UnknownScript_0x7a5af checkevent EVENT_TALKED_TO_MOM_AFTER_MYSTERY_EGG_QUEST iftrue UnknownScript_0x7a5b8 @@ -139,10 +139,10 @@ UnknownScript_0x7a5af: end UnknownScript_0x7a5b5: - setevent EVENT_076 + setevent EVENT_FIRST_TIME_BANKING_WITH_MOM UnknownScript_0x7a5b8: setevent EVENT_TALKED_TO_MOM_AFTER_MYSTERY_EGG_QUEST - special Function16218 + special Special_BankOfMom closetext loadmovesprites end @@ -384,28 +384,28 @@ KrissHouse1F_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 3 warp_def $7, $6, 2, GROUP_NEW_BARK_TOWN, MAP_NEW_BARK_TOWN warp_def $7, $7, 2, GROUP_NEW_BARK_TOWN, MAP_NEW_BARK_TOWN warp_def $0, $9, 1, GROUP_KRISS_HOUSE_2F, MAP_KRISS_HOUSE_2F - ; xy triggers +.XYTriggers: db 2 xy_trigger 0, $4, $8, $0, UnknownScript_0x7a4d8, $0, $0 xy_trigger 0, $4, $9, $0, UnknownScript_0x7a4db, $0, $0 - ; signposts +.Signposts: db 4 - signpost 1, 0, $0, StoveScript - signpost 1, 1, $0, SinkScript - signpost 1, 2, $0, FridgeScript - signpost 1, 4, $0, TVScript + signpost 1, 0, SIGNPOST_READ, StoveScript + signpost 1, 1, SIGNPOST_READ, SinkScript + signpost 1, 2, SIGNPOST_READ, FridgeScript + signpost 1, 4, SIGNPOST_READ, TVScript - ; people-events +.PersonEvents: db 5 - person_event SPRITE_MOM, 8, 11, $8, $0, 255, 255, $0, 0, MomScript_0x7a582, EVENT_6C7 - person_event SPRITE_MOM, 6, 6, $7, $0, 255, 1, $0, 0, MomScript_0x7a582, EVENT_6C8 - person_event SPRITE_MOM, 8, 11, $8, $0, 255, 2, $0, 0, MomScript_0x7a582, EVENT_6C8 - person_event SPRITE_MOM, 6, 4, $7, $0, 255, 4, $0, 0, MomScript_0x7a582, EVENT_6C8 - person_event SPRITE_POKEFAN_F, 8, 8, $9, $0, 255, 255, $80, 0, NeighborScript, EVENT_792 + person_event SPRITE_MOM, 8, 11, OW_LEFT | $0, $0, -1, -1, $0, 0, MomScript_0x7a582, EVENT_KRISS_HOUSE_MOM_1 + person_event SPRITE_MOM, 6, 6, OW_UP | $3, $0, -1, 1, $0, 0, MomScript_0x7a582, EVENT_KRISS_HOUSE_MOM_2 + person_event SPRITE_MOM, 8, 11, OW_LEFT | $0, $0, -1, 2, $0, 0, MomScript_0x7a582, EVENT_KRISS_HOUSE_MOM_2 + person_event SPRITE_MOM, 6, 4, OW_UP | $3, $0, -1, 4, $0, 0, MomScript_0x7a582, EVENT_KRISS_HOUSE_MOM_2 + person_event SPRITE_POKEFAN_F, 8, 8, OW_LEFT | $1, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, NeighborScript, EVENT_KRISS_HOUSE_1F_NEIGHBOR diff --git a/maps/KrissHouse2F.asm b/maps/KrissHouse2F.asm index ff0ea80c3..b3f66669d 100644 --- a/maps/KrissHouse2F.asm +++ b/maps/KrissHouse2F.asm @@ -1,32 +1,32 @@ KrissHouse2F_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 2 ; callbacks - dbw 5, UnknownScript_0x7abb4 + dbw 5, .InitializeRoom - dbw 1, UnknownScript_0x7abc5 + dbw 1, .SetSpawn -UnknownScript_0x7abb3: +.Null: end -UnknownScript_0x7abb4: - special Function27043 - setevent EVENT_007 - checkevent EVENT_036 - iftrue UnknownScript_0x7abc4 +.InitializeRoom: + special ToggleDecorationsVisibility + setevent EVENT_IN_YOUR_ROOM + checkevent EVENT_INITIALIZED_EVENTS + iftrue .SkipInizialization jumpstd initializeevents return -UnknownScript_0x7abc4: +.SkipInizialization: return -UnknownScript_0x7abc5: - special Function26feb +.SetSpawn: + special ToggleMaptileDecorations return @@ -46,7 +46,7 @@ GameConsole: describedecoration $4 KrissHousePoster: - dw $02cc ; event + dw EVENT_KRISS_ROOM_POSTER ; event dw .Script .Script describedecoration $0 @@ -84,7 +84,7 @@ KrissHouseBookshelf: KrissHousePC: loadfont - special Functionc2e7 + special Special_KrissHousePC iftrue .Warp loadmovesprites end @@ -116,23 +116,23 @@ KrissHouse2F_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 1 warp_def $0, $7, 3, GROUP_KRISS_HOUSE_1F, MAP_KRISS_HOUSE_1F - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 4 - signpost 1, 2, $1, KrissHousePC - signpost 1, 3, $0, KrissHouseRadio - signpost 1, 5, $0, KrissHouseBookshelf - signpost 0, 6, $5, KrissHousePoster + signpost 1, 2, SIGNPOST_UP, KrissHousePC + signpost 1, 3, SIGNPOST_READ, KrissHouseRadio + signpost 1, 5, SIGNPOST_READ, KrissHouseBookshelf + signpost 0, 6, SIGNPOST_IFSET, KrissHousePoster - ; people-events +.PersonEvents: db 4 - person_event SPRITE_CONSOLE, 6, 8, $1, $0, 255, 255, $0, 0, GameConsole, EVENT_741 - person_event SPRITE_DOLL_1, 8, 8, $1, $0, 255, 255, $0, 0, Doll1, EVENT_742 - person_event SPRITE_DOLL_2, 8, 9, $1, $0, 255, 255, $0, 0, Doll2, EVENT_743 - person_event SPRITE_BIG_DOLL, 5, 4, $21, $0, 255, 255, $0, 0, BigDoll, EVENT_744 + person_event SPRITE_CONSOLE, 6, 8, OW_DOWN | $1, $0, -1, -1, $0, 0, GameConsole, EVENT_KRISS_HOUSE_2F_CONSOLE + person_event SPRITE_DOLL_1, 8, 8, OW_DOWN | $1, $0, -1, -1, $0, 0, Doll1, EVENT_KRISS_HOUSE_2F_DOLL_1 + person_event SPRITE_DOLL_2, 8, 9, OW_DOWN | $1, $0, -1, -1, $0, 0, Doll2, EVENT_KRISS_HOUSE_2F_DOLL_2 + person_event SPRITE_BIG_DOLL, 5, 4, OW_DOWN | $21, $0, -1, -1, $0, 0, BigDoll, EVENT_KRISS_HOUSE_2F_BIG_DOLL diff --git a/maps/KrissNeighborsHouse.asm b/maps/KrissNeighborsHouse.asm index 081652ed2..33277c655 100644 --- a/maps/KrissNeighborsHouse.asm +++ b/maps/KrissNeighborsHouse.asm @@ -1,8 +1,8 @@ KrissNeighborsHouse_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 KrissNeighborsDaughter: @@ -98,21 +98,21 @@ KrissNeighborsHouse_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $7, $2, 3, GROUP_NEW_BARK_TOWN, MAP_NEW_BARK_TOWN warp_def $7, $3, 3, GROUP_NEW_BARK_TOWN, MAP_NEW_BARK_TOWN - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 3 - signpost 1, 0, $0, KrissNeighborsHouseBookshelf - signpost 1, 1, $0, KrissNeighborsHouseBookshelf - signpost 1, 7, $0, KrissNeighborsHouseRadio + signpost 1, 0, SIGNPOST_READ, KrissNeighborsHouseBookshelf + signpost 1, 1, SIGNPOST_READ, KrissNeighborsHouseBookshelf + signpost 1, 7, SIGNPOST_READ, KrissNeighborsHouseRadio - ; people-events +.PersonEvents: db 2 - person_event SPRITE_COOLTRAINER_F, 7, 6, $9, $0, 255, 255, $80, 0, KrissNeighborsDaughter, -1 - person_event SPRITE_POKEFAN_F, 7, 9, $8, $0, 255, 255, $80, 0, KrissNeighbor, EVENT_793 + person_event SPRITE_COOLTRAINER_F, 7, 6, OW_LEFT | $1, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, KrissNeighborsDaughter, -1 + person_event SPRITE_POKEFAN_F, 7, 9, OW_LEFT | $0, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, KrissNeighbor, EVENT_KRISS_NEIGHBORS_HOUSE_NEIGHBOR diff --git a/maps/KurtsHouse.asm b/maps/KurtsHouse.asm index 43479f6e4..ab800684a 100644 --- a/maps/KurtsHouse.asm +++ b/maps/KurtsHouse.asm @@ -1,8 +1,8 @@ KurtsHouse_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 1 ; callbacks @@ -33,17 +33,17 @@ UnknownScript_0x18e177: KurtScript_0x18e178: faceplayer loadfont - checkevent EVENT_035 - iftrue UnknownScript_0x18e1cc + checkevent EVENT_KURT_GAVE_YOU_LURE_BALL + iftrue .GotLureBall checkevent EVENT_CLEARED_SLOWPOKE_WELL - iftrue UnknownScript_0x18e1bf + iftrue .ClearedSlowpokeWell writetext UnknownText_0x18e473 closetext loadmovesprites special Functionc48f - setevent EVENT_6FA + setevent EVENT_AZALEA_TOWN_SLOWPOKETAIL_ROCKET checkcode VAR_FACING - if_equal $1, UnknownScript_0x18e1ab + if_equal UP, .RunAround spriteface $0, DOWN playsound SFX_FLY applymovement $2, MovementData_0x18e466 @@ -53,7 +53,7 @@ KurtScript_0x18e178: special RestartMapMusic end -UnknownScript_0x18e1ab: +.RunAround: spriteface $0, DOWN playsound SFX_FLY applymovement $2, MovementData_0x18e46c @@ -63,211 +63,205 @@ UnknownScript_0x18e1ab: special RestartMapMusic end -UnknownScript_0x18e1bf: +.ClearedSlowpokeWell: writetext UnknownText_0x18e615 keeptextopen verbosegiveitem LURE_BALL, 1 - iffalse UnknownScript_0x18e2b2 - setevent EVENT_035 -UnknownScript_0x18e1cc: - checkevent EVENT_000 - iftrue UnknownScript_0x18e29f - checkevent EVENT_258 - iftrue UnknownScript_0x18e2b4 - checkevent EVENT_259 - iftrue UnknownScript_0x18e2ca - checkevent EVENT_25A - iftrue UnknownScript_0x18e2e0 - checkevent EVENT_25B - iftrue UnknownScript_0x18e2f6 - checkevent EVENT_25C - iftrue UnknownScript_0x18e30c - checkevent EVENT_25D - iftrue UnknownScript_0x18e322 - checkevent EVENT_25E - iftrue UnknownScript_0x18e338 + iffalse .NoRoomForBall + setevent EVENT_KURT_GAVE_YOU_LURE_BALL +.GotLureBall: + checkevent EVENT_GAVE_KURT_APRICORNS + iftrue .WaitForApricorns + checkevent EVENT_GAVE_KURT_RED_APRICORN + iftrue .GiveLevelBall + checkevent EVENT_GAVE_KURT_BLU_APRICORN + iftrue .GiveLureBall + checkevent EVENT_GAVE_KURT_YLW_APRICORN + iftrue .GiveMoonBall + checkevent EVENT_GAVE_KURT_GRN_APRICORN + iftrue .GiveFriendBall + checkevent EVENT_GAVE_KURT_WHT_APRICORN + iftrue .GiveFastBall + checkevent EVENT_GAVE_KURT_BLK_APRICORN + iftrue .GiveHeavyBall + checkevent EVENT_GAVE_KURT_PNK_APRICORN + iftrue .GiveLoveBall checkevent EVENT_CAN_GIVE_GS_BALL_TO_KURT - iftrue UnknownScript_0x18e34e -UnknownScript_0x18e202: - checkevent EVENT_001 - iftrue UnknownScript_0x18e212 - checkevent EVENT_002 - iftrue UnknownScript_0x18e212 + iftrue .CanGiveGSBallToKurt +.NoGSBall: + checkevent EVENT_RECEIVED_BALLS_FROM_KURT + iftrue .CheckApricorns + checkevent EVENT_DRAGON_SHRINE_QUESTION_2 + iftrue .CheckApricorns writetext UnknownText_0x18e6c9 closetext -UnknownScript_0x18e212: +.CheckApricorns: checkitem RED_APRICORN - iftrue UnknownScript_0x18e249 + iftrue .AskApricorn checkitem BLU_APRICORN - iftrue UnknownScript_0x18e249 + iftrue .AskApricorn checkitem YLW_APRICORN - iftrue UnknownScript_0x18e249 + iftrue .AskApricorn checkitem GRN_APRICORN - iftrue UnknownScript_0x18e249 + iftrue .AskApricorn checkitem WHT_APRICORN - iftrue UnknownScript_0x18e249 + iftrue .AskApricorn checkitem BLK_APRICORN - iftrue UnknownScript_0x18e249 + iftrue .AskApricorn checkitem PNK_APRICORN - iftrue UnknownScript_0x18e249 - checkevent EVENT_001 - iftrue UnknownScript_0x18e2ae - checkevent EVENT_002 - iftrue UnknownScript_0x18e243 + iftrue .AskApricorn + checkevent EVENT_RECEIVED_BALLS_FROM_KURT + iftrue .ThatTurnedOutGreat + checkevent EVENT_DRAGON_SHRINE_QUESTION_2 + iftrue .IMakeBallsFromApricorns loadmovesprites end -UnknownScript_0x18e243: +.IMakeBallsFromApricorns: writetext UnknownText_0x18e6c9 closetext loadmovesprites end -UnknownScript_0x18e249: +.AskApricorn: writetext UnknownText_0x18e736 keeptextopen - setevent EVENT_002 + setevent EVENT_DRAGON_SHRINE_QUESTION_2 special Function88018 - if_equal $0, UnknownScript_0x18e2a5 - if_equal $59, UnknownScript_0x18e275 - if_equal $5c, UnknownScript_0x18e27b - if_equal $5d, UnknownScript_0x18e281 - if_equal $61, UnknownScript_0x18e287 - if_equal $63, UnknownScript_0x18e28d - if_equal $65, UnknownScript_0x18e293 - setevent EVENT_258 - jump UnknownScript_0x18e299 - -UnknownScript_0x18e275: - setevent EVENT_259 - jump UnknownScript_0x18e299 - -UnknownScript_0x18e27b: - setevent EVENT_25A - jump UnknownScript_0x18e299 - -UnknownScript_0x18e281: - setevent EVENT_25B - jump UnknownScript_0x18e299 - -UnknownScript_0x18e287: - setevent EVENT_25C - jump UnknownScript_0x18e299 - -UnknownScript_0x18e28d: - setevent EVENT_25D - jump UnknownScript_0x18e299 - -UnknownScript_0x18e293: - setevent EVENT_25E - jump UnknownScript_0x18e299 - -UnknownScript_0x18e299: - setevent EVENT_000 + if_equal $0, .Cancel + if_equal BLU_APRICORN, .Blu + if_equal YLW_APRICORN, .Ylw + if_equal GRN_APRICORN, .Grn + if_equal WHT_APRICORN, .Wht + if_equal BLK_APRICORN, .Blk + if_equal PNK_APRICORN, .Pnk +; .Red + setevent EVENT_GAVE_KURT_RED_APRICORN + jump .GaveKurtApricorns + +.Blu: + setevent EVENT_GAVE_KURT_BLU_APRICORN + jump .GaveKurtApricorns + +.Ylw: + setevent EVENT_GAVE_KURT_YLW_APRICORN + jump .GaveKurtApricorns + +.Grn: + setevent EVENT_GAVE_KURT_GRN_APRICORN + jump .GaveKurtApricorns + +.Wht: + setevent EVENT_GAVE_KURT_WHT_APRICORN + jump .GaveKurtApricorns + +.Blk: + setevent EVENT_GAVE_KURT_BLK_APRICORN + jump .GaveKurtApricorns + +.Pnk: + setevent EVENT_GAVE_KURT_PNK_APRICORN + jump .GaveKurtApricorns + +.GaveKurtApricorns: + setevent EVENT_GAVE_KURT_APRICORNS setflag ENGINE_KURT_MAKING_BALLS -UnknownScript_0x18e29f: +.WaitForApricorns: writetext UnknownText_0x18e779 closetext loadmovesprites end -UnknownScript_0x18e2a5: +.Cancel: writetext UnknownText_0x18e7bc closetext loadmovesprites end -UnknownScript_0x18e2ab: - setevent EVENT_001 -UnknownScript_0x18e2ae: +._ThatTurnedOutGreat: + setevent EVENT_RECEIVED_BALLS_FROM_KURT +.ThatTurnedOutGreat: writetext UnknownText_0x18e82a closetext -UnknownScript_0x18e2b2: +.NoRoomForBall: loadmovesprites end -UnknownScript_0x18e2b4: +.GiveLevelBall: checkflag ENGINE_KURT_MAKING_BALLS - iftrue UnknownScript_0x18e3c5 + iftrue KurtMakingBallsScript writetext UnknownText_0x18e7fb keeptextopen verbosegiveitem2 LEVEL_BALL, $16 - iffalse UnknownScript_0x18e2b2 -UnknownScript_0x18e2c4: - clearevent EVENT_258 - jump UnknownScript_0x18e2ab + iffalse .NoRoomForBall + clearevent EVENT_GAVE_KURT_RED_APRICORN + jump ._ThatTurnedOutGreat -UnknownScript_0x18e2ca: +.GiveLureBall: checkflag ENGINE_KURT_MAKING_BALLS - iftrue UnknownScript_0x18e3c5 + iftrue KurtMakingBallsScript writetext UnknownText_0x18e7fb keeptextopen verbosegiveitem2 LURE_BALL, $16 - iffalse UnknownScript_0x18e2b2 -UnknownScript_0x18e2da: - clearevent EVENT_259 - jump UnknownScript_0x18e2ab + iffalse .NoRoomForBall + clearevent EVENT_GAVE_KURT_BLU_APRICORN + jump ._ThatTurnedOutGreat -UnknownScript_0x18e2e0: +.GiveMoonBall: checkflag ENGINE_KURT_MAKING_BALLS - iftrue UnknownScript_0x18e3c5 + iftrue KurtMakingBallsScript writetext UnknownText_0x18e7fb keeptextopen verbosegiveitem2 MOON_BALL, $16 - iffalse UnknownScript_0x18e2b2 -UnknownScript_0x18e2f0: - clearevent EVENT_25A - jump UnknownScript_0x18e2ab + iffalse .NoRoomForBall + clearevent EVENT_GAVE_KURT_YLW_APRICORN + jump ._ThatTurnedOutGreat -UnknownScript_0x18e2f6: +.GiveFriendBall: checkflag ENGINE_KURT_MAKING_BALLS - iftrue UnknownScript_0x18e3c5 + iftrue KurtMakingBallsScript writetext UnknownText_0x18e7fb keeptextopen verbosegiveitem2 FRIEND_BALL, $16 - iffalse UnknownScript_0x18e2b2 -UnknownScript_0x18e306: - clearevent EVENT_25B - jump UnknownScript_0x18e2ab + iffalse .NoRoomForBall + clearevent EVENT_GAVE_KURT_GRN_APRICORN + jump ._ThatTurnedOutGreat -UnknownScript_0x18e30c: +.GiveFastBall: checkflag ENGINE_KURT_MAKING_BALLS - iftrue UnknownScript_0x18e3c5 + iftrue KurtMakingBallsScript writetext UnknownText_0x18e7fb keeptextopen verbosegiveitem2 FAST_BALL, $16 - iffalse UnknownScript_0x18e2b2 -UnknownScript_0x18e31c: - clearevent EVENT_25C - jump UnknownScript_0x18e2ab + iffalse .NoRoomForBall + clearevent EVENT_GAVE_KURT_WHT_APRICORN + jump ._ThatTurnedOutGreat -UnknownScript_0x18e322: +.GiveHeavyBall: checkflag ENGINE_KURT_MAKING_BALLS - iftrue UnknownScript_0x18e3c5 + iftrue KurtMakingBallsScript writetext UnknownText_0x18e7fb keeptextopen verbosegiveitem2 HEAVY_BALL, $16 - iffalse UnknownScript_0x18e2b2 -UnknownScript_0x18e332: - clearevent EVENT_25D - jump UnknownScript_0x18e2ab + iffalse .NoRoomForBall + clearevent EVENT_GAVE_KURT_BLK_APRICORN + jump ._ThatTurnedOutGreat -UnknownScript_0x18e338: +.GiveLoveBall: checkflag ENGINE_KURT_MAKING_BALLS - iftrue UnknownScript_0x18e3c5 + iftrue KurtMakingBallsScript writetext UnknownText_0x18e7fb keeptextopen verbosegiveitem2 LOVE_BALL, $16 - iffalse UnknownScript_0x18e2b2 -UnknownScript_0x18e348: - clearevent EVENT_25E - jump UnknownScript_0x18e2ab + iffalse .NoRoomForBall + clearevent EVENT_GAVE_KURT_PNK_APRICORN + jump ._ThatTurnedOutGreat -UnknownScript_0x18e34e: +.CanGiveGSBallToKurt: checkevent EVENT_GAVE_GS_BALL_TO_KURT - iftrue UnknownScript_0x18e368 + iftrue .GaveGSBallToKurt checkitem GS_BALL - iffalse UnknownScript_0x18e202 + iffalse .NoGSBall writetext UnknownText_0x18e8ab closetext loadmovesprites @@ -276,9 +270,9 @@ UnknownScript_0x18e34e: setflag ENGINE_KURT_MAKING_BALLS end -UnknownScript_0x18e368: +.GaveGSBallToKurt: checkflag ENGINE_KURT_MAKING_BALLS - iffalse UnknownScript_0x18e378 + iffalse .NotMakingBalls writetext UnknownText_0x18e934 closetext writetext UnknownText_0x18e949 @@ -286,7 +280,7 @@ UnknownScript_0x18e368: loadmovesprites end -UnknownScript_0x18e378: +.NotMakingBalls: writetext UnknownText_0x18e95c closetext loadmovesprites @@ -295,22 +289,22 @@ UnknownScript_0x18e378: clearevent EVENT_GAVE_GS_BALL_TO_KURT special Functionc48f pause 20 - showemote $0, $2, 30 + showemote EMOTE_SHOCK, $2, 30 checkcode VAR_FACING - if_equal $1, UnknownScript_0x18e3a2 + if_equal UP, .GSBallRunAround spriteface $0, DOWN playsound SFX_FLY applymovement $2, MovementData_0x18e466 - jump UnknownScript_0x18e3ac + jump .KurtHasLeftTheBuilding -UnknownScript_0x18e3a2: +.GSBallRunAround: spriteface $0, DOWN playsound SFX_FLY applymovement $2, MovementData_0x18e46c -UnknownScript_0x18e3ac: +.KurtHasLeftTheBuilding: playsound SFX_EXIT_BUILDING disappear $2 - clearevent EVENT_7A4 + clearevent EVENT_AZALEA_TOWN_KURT waitbutton special RestartMapMusic domaptrigger GROUP_AZALEA_TOWN, MAP_AZALEA_TOWN, $2 @@ -320,17 +314,17 @@ KurtScript_0x18e3bd: faceplayer loadfont checkevent EVENT_GAVE_GS_BALL_TO_KURT - iftrue UnknownScript_0x18e3e0 -UnknownScript_0x18e3c5: + iftrue KurtScript_ImCheckingItNow +KurtMakingBallsScript: checkevent EVENT_BUGGING_KURT_TOO_MUCH - iffalse UnknownScript_0x18e3d4 + iffalse Script_FirstTimeBuggingKurt writetext UnknownText_0x18e7d8 closetext loadmovesprites spriteface $5, UP end -UnknownScript_0x18e3d4: +Script_FirstTimeBuggingKurt: writetext UnknownText_0x18e863 closetext loadmovesprites @@ -338,7 +332,7 @@ UnknownScript_0x18e3d4: setevent EVENT_BUGGING_KURT_TOO_MUCH end -UnknownScript_0x18e3e0: +KurtScript_ImCheckingItNow: writetext UnknownText_0x18e934 closetext spriteface $5, UP @@ -349,17 +343,17 @@ UnknownScript_0x18e3e0: KurtsGranddaughter1: faceplayer - checkevent EVENT_000 + checkevent EVENT_GAVE_KURT_APRICORNS iftrue KurtsGranddaughter2Subscript - checkevent EVENT_001 + checkevent EVENT_RECEIVED_BALLS_FROM_KURT iftrue KurtsGranddaughterFunScript checkevent EVENT_FOREST_IS_RESTLESS iftrue .Lonely - checkevent EVENT_030 + checkevent EVENT_FAST_SHIP_FIRST_TIME iftrue .Dad checkevent EVENT_CLEARED_SLOWPOKE_WELL iftrue .SlowpokeBack - checkevent EVENT_6FA + checkevent EVENT_AZALEA_TOWN_SLOWPOKETAIL_ROCKET iftrue .Lonely loadfont writetext KurtsGranddaughterSlowpokeGoneText @@ -682,28 +676,28 @@ KurtsHouse_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $7, $3, 4, GROUP_AZALEA_TOWN, MAP_AZALEA_TOWN warp_def $7, $4, 4, GROUP_AZALEA_TOWN, MAP_AZALEA_TOWN - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 7 - signpost 1, 6, $0, KurtsHouseRadio - signpost 0, 8, $0, KurtsHouseOakPhoto - signpost 0, 9, $0, KurtsHouseOakPhoto - signpost 1, 5, $0, KurtsHouseBookshelf - signpost 1, 2, $0, KurtsHouseBookshelf - signpost 1, 3, $0, KurtsHouseBookshelf - signpost 1, 4, $0, KurtsHouseCelebiStatue - - ; people-events + signpost 1, 6, SIGNPOST_READ, KurtsHouseRadio + signpost 0, 8, SIGNPOST_READ, KurtsHouseOakPhoto + signpost 0, 9, SIGNPOST_READ, KurtsHouseOakPhoto + signpost 1, 5, SIGNPOST_READ, KurtsHouseBookshelf + signpost 1, 2, SIGNPOST_READ, KurtsHouseBookshelf + signpost 1, 3, SIGNPOST_READ, KurtsHouseBookshelf + signpost 1, 4, SIGNPOST_READ, KurtsHouseCelebiStatue + +.PersonEvents: db 5 - person_event SPRITE_KURT, 6, 7, $6, $0, 255, 255, $0, 0, KurtScript_0x18e178, EVENT_73E - person_event SPRITE_TWIN, 7, 9, $3, $0, 255, 255, $0, 0, KurtsGranddaughter1, EVENT_78C - person_event SPRITE_SLOWPOKE, 7, 10, $1, $0, 255, 255, $0, 0, KurtsHouseSlowpoke, EVENT_6FD - person_event SPRITE_KURT, 7, 18, $7, $0, 255, 255, $0, 0, KurtScript_0x18e3bd, EVENT_73F - person_event SPRITE_TWIN, 8, 15, $9, $0, 255, 255, $0, 0, KurtsGranddaughter2, EVENT_78D + person_event SPRITE_KURT, 6, 7, OW_UP | $2, $0, -1, -1, $0, 0, KurtScript_0x18e178, EVENT_KURTS_HOUSE_KURT_1 + person_event SPRITE_TWIN, 7, 9, OW_DOWN | $3, $0, -1, -1, $0, 0, KurtsGranddaughter1, EVENT_KURTS_HOUSE_GRANDDAUGHTER_1 + person_event SPRITE_SLOWPOKE, 7, 10, OW_DOWN | $1, $0, -1, -1, $0, 0, KurtsHouseSlowpoke, EVENT_KURTS_HOUSE_SLOWPOKE + person_event SPRITE_KURT, 7, 18, OW_UP | $3, $0, -1, -1, $0, 0, KurtScript_0x18e3bd, EVENT_KURTS_HOUSE_KURT_2 + person_event SPRITE_TWIN, 8, 15, OW_LEFT | $1, $0, -1, -1, $0, 0, KurtsGranddaughter2, EVENT_KURTS_HOUSE_GRANDDAUGHTER_2 diff --git a/maps/LakeofRage.asm b/maps/LakeofRage.asm index 0e8c4c184..48415c105 100644 --- a/maps/LakeofRage.asm +++ b/maps/LakeofRage.asm @@ -1,12 +1,12 @@ LakeofRage_MapScriptHeader: - ; trigger count +.MapTriggers: db 2 ; triggers dw .Trigger1, $0000 dw .Trigger2, $0000 - ; callback count +.MapCallbacks: db 2 ; callbacks @@ -51,7 +51,7 @@ UnknownScript_0x70035: playsound SFX_WARP_TO applymovement $2, MovementData_0x70155 disappear $2 - clearevent EVENT_6D5 + clearevent EVENT_MAHOGANY_MART_LANCE_AND_DRAGONITE setevent EVENT_DECIDED_TO_HELP_LANCE domaptrigger GROUP_MAHOGANY_MART_1F, MAP_MAHOGANY_MART_1F, $1 end @@ -132,28 +132,12 @@ MapLakeofRageSignpost1Script: UnknownScript_0x700b8: keeptextopen - special Functionfbcd2 + special Special_MagikarpHouseSign loadmovesprites end TrainerFisherAndre: - ; bit/flag number - dw EVENT_BEAT_FISHER_ANDRE - - ; trainer group && trainer id - db FISHER, ANDRE - - ; text when seen - dw FisherAndreSeenText - - ; text when trainer beaten - dw FisherAndreBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw FisherAndreScript + trainer EVENT_BEAT_FISHER_ANDRE, FISHER, ANDRE, FisherAndreSeenText, FisherAndreBeatenText, $0000, FisherAndreScript FisherAndreScript: talkaftercancel @@ -164,23 +148,7 @@ FisherAndreScript: end TrainerFisherRaymond: - ; bit/flag number - dw EVENT_BEAT_FISHER_RAYMOND - - ; trainer group && trainer id - db FISHER, RAYMOND - - ; text when seen - dw FisherRaymondSeenText - - ; text when trainer beaten - dw FisherRaymondBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw FisherRaymondScript + trainer EVENT_BEAT_FISHER_RAYMOND, FISHER, RAYMOND, FisherRaymondSeenText, FisherRaymondBeatenText, $0000, FisherRaymondScript FisherRaymondScript: talkaftercancel @@ -191,23 +159,7 @@ FisherRaymondScript: end TrainerCooltrainermAaron: - ; bit/flag number - dw EVENT_BEAT_COOLTRAINERM_AARON - - ; trainer group && trainer id - db COOLTRAINERM, AARON - - ; text when seen - dw CooltrainermAaronSeenText - - ; text when trainer beaten - dw CooltrainermAaronBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw CooltrainermAaronScript + trainer EVENT_BEAT_COOLTRAINERM_AARON, COOLTRAINERM, AARON, CooltrainermAaronSeenText, CooltrainermAaronBeatenText, $0000, CooltrainermAaronScript CooltrainermAaronScript: talkaftercancel @@ -218,23 +170,7 @@ CooltrainermAaronScript: end TrainerCooltrainerfLois: - ; bit/flag number - dw EVENT_BEAT_COOLTRAINERF_LOIS - - ; trainer group && trainer id - db COOLTRAINERF, LOIS - - ; text when seen - dw CooltrainerfLoisSeenText - - ; text when trainer beaten - dw CooltrainerfLoisBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw CooltrainerfLoisScript + trainer EVENT_BEAT_COOLTRAINERF_LOIS, COOLTRAINERF, LOIS, CooltrainerfLoisSeenText, CooltrainerfLoisBeatenText, $0000, CooltrainerfLoisScript CooltrainerfLoisScript: talkaftercancel @@ -287,18 +223,15 @@ ItemFragment_0x7014a: db TM_DETECT, 1 MapLakeofRageSignpostItem2: - dw $00b5 - db FULL_RESTORE + dwb EVENT_LAKE_OF_RAGE_HIDDEN_FULL_RESTORE, FULL_RESTORE MapLakeofRageSignpostItem3: - dw $00b6 - db RARE_CANDY + dwb EVENT_LAKE_OF_RAGE_HIDDEN_RARE_CANDY, RARE_CANDY MapLakeofRageSignpostItem4: - dw $00b7 - db MAX_POTION + dwb EVENT_LAKE_OF_RAGE_HIDDEN_MAX_POTION, MAX_POTION MovementData_0x70155: @@ -558,33 +491,33 @@ LakeofRage_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $3, $7, 1, GROUP_LAKE_OF_RAGE_HIDDEN_POWER_HOUSE, MAP_LAKE_OF_RAGE_HIDDEN_POWER_HOUSE warp_def $1f, $1b, 1, GROUP_LAKE_OF_RAGE_MAGIKARP_HOUSE, MAP_LAKE_OF_RAGE_MAGIKARP_HOUSE - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 5 - signpost 27, 21, $0, MapLakeofRageSignpost0Script - signpost 31, 25, $0, MapLakeofRageSignpost1Script - signpost 28, 11, $7, MapLakeofRageSignpostItem2 - signpost 4, 4, $7, MapLakeofRageSignpostItem3 - signpost 5, 35, $7, MapLakeofRageSignpostItem4 + signpost 27, 21, SIGNPOST_READ, MapLakeofRageSignpost0Script + signpost 31, 25, SIGNPOST_READ, MapLakeofRageSignpost1Script + signpost 28, 11, SIGNPOST_ITEM, MapLakeofRageSignpostItem2 + signpost 4, 4, SIGNPOST_ITEM, MapLakeofRageSignpostItem3 + signpost 5, 35, SIGNPOST_ITEM, MapLakeofRageSignpostItem4 - ; people-events +.PersonEvents: db 12 - person_event SPRITE_LANCE, 32, 25, $7, $0, 255, 255, $0, 0, LanceScript_0x70022, EVENT_6D4 - person_event SPRITE_GRAMPS, 30, 24, $7, $0, 255, 255, $0, 0, GrampsScript_0x7008e, -1 - person_event SPRITE_SUPER_NERD, 17, 40, $8, $0, 255, 255, $0, 0, SuperNerdScript_0x700a2, -1 - person_event SPRITE_COOLTRAINER_F, 33, 29, $5, $1, 255, 255, $0, 0, CooltrainerFScript_0x700a5, -1 - person_event SPRITE_FISHER, 27, 34, $8, $0, 255, 255, $92, 1, TrainerFisherAndre, EVENT_735 - person_event SPRITE_FISHER, 30, 28, $7, $0, 255, 255, $92, 1, TrainerFisherRaymond, EVENT_735 - person_event SPRITE_COOLTRAINER_M, 19, 8, $9, $0, 255, 255, $82, 1, TrainerCooltrainermAaron, EVENT_735 - person_event SPRITE_COOLTRAINER_F, 11, 40, $8, $0, 255, 255, $82, 0, TrainerCooltrainerfLois, EVENT_735 - person_event SPRITE_GYARADOS, 26, 22, $16, $0, 255, 255, $80, 0, GyaradosScript_0x70063, EVENT_751 - person_event SPRITE_SUPER_NERD, 8, 8, $6, $0, 255, 255, $0, 0, WesleyScript, EVENT_75C - person_event SPRITE_POKE_BALL, 14, 11, $1, $0, 255, 255, $1, 0, ItemFragment_0x70148, EVENT_645 - person_event SPRITE_POKE_BALL, 6, 39, $1, $0, 255, 255, $1, 0, ItemFragment_0x7014a, EVENT_646 + person_event SPRITE_LANCE, 32, 25, OW_UP | $3, $0, -1, -1, $0, 0, LanceScript_0x70022, EVENT_LAKE_OF_RAGE_LANCE + person_event SPRITE_GRAMPS, 30, 24, OW_UP | $3, $0, -1, -1, $0, 0, GrampsScript_0x7008e, -1 + person_event SPRITE_SUPER_NERD, 17, 40, OW_LEFT | $0, $0, -1, -1, $0, 0, SuperNerdScript_0x700a2, -1 + person_event SPRITE_COOLTRAINER_F, 33, 29, OW_UP | $1, $1, -1, -1, $0, 0, CooltrainerFScript_0x700a5, -1 + person_event SPRITE_FISHER, 27, 34, OW_LEFT | $0, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 1, TrainerFisherAndre, EVENT_LAKE_OF_RAGE_CIVILIANS + person_event SPRITE_FISHER, 30, 28, OW_UP | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 1, TrainerFisherRaymond, EVENT_LAKE_OF_RAGE_CIVILIANS + person_event SPRITE_COOLTRAINER_M, 19, 8, OW_LEFT | $1, $0, -1, -1, (PAL_OW_RED << 4) | $82, 1, TrainerCooltrainermAaron, EVENT_LAKE_OF_RAGE_CIVILIANS + person_event SPRITE_COOLTRAINER_F, 11, 40, OW_LEFT | $0, $0, -1, -1, (PAL_OW_RED << 4) | $82, 0, TrainerCooltrainerfLois, EVENT_LAKE_OF_RAGE_CIVILIANS + person_event SPRITE_GYARADOS, 26, 22, OW_UP | $12, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, GyaradosScript_0x70063, EVENT_LAKE_OF_RAGE_RED_GYARADOS + person_event SPRITE_SUPER_NERD, 8, 8, OW_UP | $2, $0, -1, -1, $0, 0, WesleyScript, EVENT_LAKE_OF_RAGE_WESLEY_OF_WEDNESDAY + person_event SPRITE_POKE_BALL, 14, 11, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x70148, EVENT_LAKE_OF_RAGE_ELIXER + person_event SPRITE_POKE_BALL, 6, 39, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x7014a, EVENT_LAKE_OF_RAGE_TM_DETECT diff --git a/maps/LakeofRageHiddenPowerHouse.asm b/maps/LakeofRageHiddenPowerHouse.asm index a36d8d424..927b0f50f 100644 --- a/maps/LakeofRageHiddenPowerHouse.asm +++ b/maps/LakeofRageHiddenPowerHouse.asm @@ -1,8 +1,8 @@ LakeofRageHiddenPowerHouse_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 HiddenPowerGuy: @@ -68,19 +68,19 @@ LakeofRageHiddenPowerHouse_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $7, $2, 1, GROUP_LAKE_OF_RAGE, MAP_LAKE_OF_RAGE warp_def $7, $3, 1, GROUP_LAKE_OF_RAGE, MAP_LAKE_OF_RAGE - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 2 - signpost 1, 0, $0, HiddenPowerHouseBookshelf - signpost 1, 1, $0, HiddenPowerHouseBookshelf + signpost 1, 0, SIGNPOST_READ, HiddenPowerHouseBookshelf + signpost 1, 1, SIGNPOST_READ, HiddenPowerHouseBookshelf - ; people-events +.PersonEvents: db 1 - person_event SPRITE_FISHER, 7, 6, $3, $0, 255, 255, $0, 0, HiddenPowerGuy, -1 + person_event SPRITE_FISHER, 7, 6, OW_DOWN | $3, $0, -1, -1, $0, 0, HiddenPowerGuy, -1 diff --git a/maps/LakeofRageMagikarpHouse.asm b/maps/LakeofRageMagikarpHouse.asm index f3195d981..849641d3d 100644 --- a/maps/LakeofRageMagikarpHouse.asm +++ b/maps/LakeofRageMagikarpHouse.asm @@ -1,25 +1,25 @@ LakeofRageMagikarpHouse_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 FishingGuruScript_0x19a6ae: faceplayer loadfont - checkevent EVENT_03A + checkevent EVENT_LAKE_OF_RAGE_ELIXIR_ON_STANDBY iftrue UnknownScript_0x19a6fe - checkevent EVENT_039 + checkevent EVENT_LAKE_OF_RAGE_ASKED_FOR_MAGIKARP iftrue UnknownScript_0x19a6e0 checkevent EVENT_CLEARED_ROCKET_HIDEOUT iftrue UnknownScript_0x19a6d7 - checkevent EVENT_038 + checkevent EVENT_LAKE_OF_RAGE_EXPLAINED_WEIRD_MAGIKARP iftrue UnknownScript_0x19a6d1 writetext UnknownText_0x19a72e closetext loadmovesprites - setevent EVENT_038 + setevent EVENT_LAKE_OF_RAGE_EXPLAINED_WEIRD_MAGIKARP end UnknownScript_0x19a6d1: @@ -32,7 +32,7 @@ UnknownScript_0x19a6d7: writetext UnknownText_0x19a890 closetext loadmovesprites - setevent EVENT_039 + setevent EVENT_LAKE_OF_RAGE_ASKED_FOR_MAGIKARP end UnknownScript_0x19a6e0: @@ -41,7 +41,7 @@ UnknownScript_0x19a6e0: iffalse UnknownScript_0x19a6d7 writetext UnknownText_0x19a93e closetext - special Functionfbb32 + special Special_CheckMagikarpLength if_equal $0, UnknownScript_0x19a71c if_equal $1, UnknownScript_0x19a722 if_equal $2, UnknownScript_0x19a716 @@ -55,12 +55,12 @@ UnknownScript_0x19a6fe: writetext UnknownText_0x19a9c3 closetext loadmovesprites - clearevent EVENT_03A + clearevent EVENT_LAKE_OF_RAGE_ELIXIR_ON_STANDBY end UnknownScript_0x19a711: loadmovesprites - setevent EVENT_03A + setevent EVENT_LAKE_OF_RAGE_ELIXIR_ON_STANDBY end UnknownScript_0x19a716: @@ -206,19 +206,19 @@ LakeofRageMagikarpHouse_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $7, $2, 2, GROUP_LAKE_OF_RAGE, MAP_LAKE_OF_RAGE warp_def $7, $3, 2, GROUP_LAKE_OF_RAGE, MAP_LAKE_OF_RAGE - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 2 - signpost 1, 0, $0, MagikarpHouseBookshelf - signpost 1, 1, $0, MagikarpHouseBookshelf + signpost 1, 0, SIGNPOST_READ, MagikarpHouseBookshelf + signpost 1, 1, SIGNPOST_READ, MagikarpHouseBookshelf - ; people-events +.PersonEvents: db 1 - person_event SPRITE_FISHING_GURU, 7, 6, $3, $0, 255, 255, $0, 0, FishingGuruScript_0x19a6ae, -1 + person_event SPRITE_FISHING_GURU, 7, 6, OW_DOWN | $3, $0, -1, -1, $0, 0, FishingGuruScript_0x19a6ae, -1 diff --git a/maps/LancesRoom.asm b/maps/LancesRoom.asm index b489a60d4..adb731ceb 100644 --- a/maps/LancesRoom.asm +++ b/maps/LancesRoom.asm @@ -1,12 +1,12 @@ LancesRoom_MapScriptHeader: - ; trigger count +.MapTriggers: db 2 ; triggers dw UnknownScript_0x180e39, $0000 dw UnknownScript_0x180e3d, $0000 - ; callback count +.MapCallbacks: db 1 ; callbacks @@ -25,7 +25,7 @@ UnknownScript_0x180e3e: iffalse UnknownScript_0x180e48 changeblock $4, $16, $34 UnknownScript_0x180e48: - checkevent EVENT_312 + checkevent EVENT_LANCES_ROOM_EXIT_OPEN iffalse UnknownScript_0x180e52 changeblock $4, $0, $b UnknownScript_0x180e52: @@ -75,7 +75,7 @@ LanceScript_0x180e7b: setevent EVENT_LANCES_ROOM_ENTRANCE_CLOSED musicfadeout MUSIC_BEAUTY_ENCOUNTER, $10 pause 30 - showemote $0, $2, 15 + showemote EMOTE_SHOCK, $2, 15 spriteface $2, DOWN pause 10 spriteface $0, DOWN @@ -119,13 +119,13 @@ LanceScript_0x180e7b: playsound SFX_EXIT_BUILDING disappear $0 applymovement $3, MovementData_0x180f57 - showemote $0, $3, 15 + showemote EMOTE_SHOCK, $3, 15 loadfont writetext UnknownText_0x1813c5 pause 30 loadmovesprites applymovement $3, MovementData_0x180f5b - special Function8c084 + special FadeBlackBGMap pause 15 warpfacing $1, GROUP_HALL_OF_FAME, MAP_HALL_OF_FAME, $4, $d end @@ -341,23 +341,23 @@ LancesRoom_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 4 warp_def $17, $4, 3, GROUP_KARENS_ROOM, MAP_KARENS_ROOM warp_def $17, $5, 4, GROUP_KARENS_ROOM, MAP_KARENS_ROOM warp_def $1, $4, 1, GROUP_HALL_OF_FAME, MAP_HALL_OF_FAME warp_def $1, $5, 2, GROUP_HALL_OF_FAME, MAP_HALL_OF_FAME - ; xy triggers +.XYTriggers: db 2 xy_trigger 1, $5, $4, $0, UnknownScript_0x180e6a, $0, $0 xy_trigger 1, $5, $5, $0, UnknownScript_0x180e74, $0, $0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 3 - person_event SPRITE_LANCE, 7, 9, $6, $0, 255, 255, $0, 0, LanceScript_0x180e7b, -1 - person_event SPRITE_TEACHER, 11, 8, $7, $0, 255, 255, $a0, 0, ObjectEvent, EVENT_75F - person_event SPRITE_OAK, 11, 8, $7, $0, 255, 255, $0, 0, ObjectEvent, EVENT_75F + person_event SPRITE_LANCE, 7, 9, OW_UP | $2, $0, -1, -1, $0, 0, LanceScript_0x180e7b, -1 + person_event SPRITE_TEACHER, 11, 8, OW_UP | $3, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, ObjectEvent, EVENT_LANCES_ROOM_OAK_AND_MARY + person_event SPRITE_OAK, 11, 8, OW_UP | $3, $0, -1, -1, $0, 0, ObjectEvent, EVENT_LANCES_ROOM_OAK_AND_MARY diff --git a/maps/LavRadioTower1F.asm b/maps/LavRadioTower1F.asm index 9a6a77116..ac7b6fc58 100644 --- a/maps/LavRadioTower1F.asm +++ b/maps/LavRadioTower1F.asm @@ -1,8 +1,8 @@ LavRadioTower1F_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 ReceptionistScript_0x7ee63: @@ -218,23 +218,23 @@ LavRadioTower1F_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $7, $2, 7, GROUP_LAVENDER_TOWN, MAP_LAVENDER_TOWN warp_def $7, $3, 7, GROUP_LAVENDER_TOWN, MAP_LAVENDER_TOWN - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 2 - signpost 0, 11, $0, MapLavRadioTower1FSignpost0Script - signpost 0, 5, $0, MapLavRadioTower1FSignpost1Script + signpost 0, 11, SIGNPOST_READ, MapLavRadioTower1FSignpost0Script + signpost 0, 5, SIGNPOST_READ, MapLavRadioTower1FSignpost1Script - ; people-events +.PersonEvents: db 5 - person_event SPRITE_RECEPTIONIST, 10, 10, $7, $0, 255, 255, $a0, 0, ReceptionistScript_0x7ee63, -1 - person_event SPRITE_OFFICER, 5, 19, $6, $0, 255, 255, $a0, 0, OfficerScript_0x7ee66, -1 - person_event SPRITE_SUPER_NERD, 7, 5, $2, $11, 255, 255, $80, 0, SuperNerdScript_0x7ee69, -1 - person_event SPRITE_GENTLEMAN, 5, 13, $7, $0, 255, 255, $0, 0, GentlemanScript_0x7ee6c, -1 - person_event SPRITE_SUPER_NERD, 10, 18, $9, $0, 255, 255, $0, 0, SuperNerdScript_0x7eea2, -1 + person_event SPRITE_RECEPTIONIST, 10, 10, OW_UP | $3, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, ReceptionistScript_0x7ee63, -1 + person_event SPRITE_OFFICER, 5, 19, OW_UP | $2, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, OfficerScript_0x7ee66, -1 + person_event SPRITE_SUPER_NERD, 7, 5, OW_DOWN | $2, $11, -1, -1, (PAL_OW_RED << 4) | $80, 0, SuperNerdScript_0x7ee69, -1 + person_event SPRITE_GENTLEMAN, 5, 13, OW_UP | $3, $0, -1, -1, $0, 0, GentlemanScript_0x7ee6c, -1 + person_event SPRITE_SUPER_NERD, 10, 18, OW_LEFT | $1, $0, -1, -1, $0, 0, SuperNerdScript_0x7eea2, -1 diff --git a/maps/LavenderMart.asm b/maps/LavenderMart.asm index 9d2c2f36b..5e67cd923 100644 --- a/maps/LavenderMart.asm +++ b/maps/LavenderMart.asm @@ -1,8 +1,8 @@ LavenderMart_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 ClerkScript_0x7eb1c: @@ -46,19 +46,19 @@ LavenderMart_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $7, $2, 5, GROUP_LAVENDER_TOWN, MAP_LAVENDER_TOWN warp_def $7, $3, 5, GROUP_LAVENDER_TOWN, MAP_LAVENDER_TOWN - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 3 - person_event SPRITE_CLERK, 7, 5, $9, $0, 255, 255, $0, 0, ClerkScript_0x7eb1c, -1 - person_event SPRITE_POKEFAN_M, 10, 10, $5, $2, 255, 255, $80, 0, PokefanMScript_0x7eb23, -1 - person_event SPRITE_ROCKER, 6, 13, $3, $0, 255, 255, $0, 0, RockerScript_0x7eb26, -1 + person_event SPRITE_CLERK, 7, 5, OW_LEFT | $1, $0, -1, -1, $0, 0, ClerkScript_0x7eb1c, -1 + person_event SPRITE_POKEFAN_M, 10, 10, OW_UP | $1, $2, -1, -1, (PAL_OW_RED << 4) | $80, 0, PokefanMScript_0x7eb23, -1 + person_event SPRITE_ROCKER, 6, 13, OW_DOWN | $3, $0, -1, -1, $0, 0, RockerScript_0x7eb26, -1 diff --git a/maps/LavenderNameRater.asm b/maps/LavenderNameRater.asm index 0c1871af2..ac813572a 100644 --- a/maps/LavenderNameRater.asm +++ b/maps/LavenderNameRater.asm @@ -1,11 +1,11 @@ LavenderNameRater_MapScriptHeader: - ; trigger count +.MapTriggers: db 1 ; triggers dw UnknownScript_0x7eaf1, $0000 - ; callback count +.MapCallbacks: db 0 UnknownScript_0x7eaf1: @@ -27,17 +27,17 @@ LavenderNameRater_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $7, $2, 4, GROUP_LAVENDER_TOWN, MAP_LAVENDER_TOWN warp_def $7, $3, 4, GROUP_LAVENDER_TOWN, MAP_LAVENDER_TOWN - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 1 - person_event SPRITE_GENTLEMAN, 7, 6, $6, $0, 255, 255, $80, 0, LavenderNameRater, -1 + person_event SPRITE_GENTLEMAN, 7, 6, OW_UP | $2, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, LavenderNameRater, -1 diff --git a/maps/LavenderPokeCenter1F.asm b/maps/LavenderPokeCenter1F.asm index b225df217..716cf4254 100644 --- a/maps/LavenderPokeCenter1F.asm +++ b/maps/LavenderPokeCenter1F.asm @@ -1,8 +1,8 @@ LavenderPokeCenter1F_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 NurseScript_0x7e6a0: @@ -78,21 +78,21 @@ LavenderPokeCenter1F_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 3 warp_def $7, $3, 1, GROUP_LAVENDER_TOWN, MAP_LAVENDER_TOWN warp_def $7, $4, 1, GROUP_LAVENDER_TOWN, MAP_LAVENDER_TOWN warp_def $7, $0, 1, GROUP_POKECENTER_2F, MAP_POKECENTER_2F - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 4 - person_event SPRITE_NURSE, 5, 7, $6, $0, 255, 255, $0, 0, NurseScript_0x7e6a0, -1 - person_event SPRITE_GENTLEMAN, 10, 11, $5, $1, 255, 255, $0, 0, GentlemanScript_0x7e6a3, -1 - person_event SPRITE_TEACHER, 7, 9, $6, $0, 255, 255, $a0, 0, TeacherScript_0x7e6a6, -1 - person_event SPRITE_YOUNGSTER, 9, 5, $4, $10, 255, 255, $80, 0, YoungsterScript_0x7e6a9, -1 + person_event SPRITE_NURSE, 5, 7, OW_UP | $2, $0, -1, -1, $0, 0, NurseScript_0x7e6a0, -1 + person_event SPRITE_GENTLEMAN, 10, 11, OW_UP | $1, $1, -1, -1, $0, 0, GentlemanScript_0x7e6a3, -1 + person_event SPRITE_TEACHER, 7, 9, OW_UP | $2, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, TeacherScript_0x7e6a6, -1 + person_event SPRITE_YOUNGSTER, 9, 5, OW_UP | $0, $10, -1, -1, (PAL_OW_RED << 4) | $80, 0, YoungsterScript_0x7e6a9, -1 diff --git a/maps/LavenderPokeCenter2FBeta.asm b/maps/LavenderPokeCenter2FBeta.asm index daf796b44..3f8caf8f9 100644 --- a/maps/LavenderPokeCenter2FBeta.asm +++ b/maps/LavenderPokeCenter2FBeta.asm @@ -1,23 +1,23 @@ LavenderPokeCenter2FBeta_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 LavenderPokeCenter2FBeta_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 1 warp_def $7, $0, 3, GROUP_LAVENDER_POKECENTER_1F, MAP_LAVENDER_POKECENTER_1F - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 0 diff --git a/maps/LavenderTown.asm b/maps/LavenderTown.asm index 77f452e9a..5ad9f91fe 100644 --- a/maps/LavenderTown.asm +++ b/maps/LavenderTown.asm @@ -1,8 +1,8 @@ LavenderTown_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 1 ; callbacks @@ -105,7 +105,7 @@ LavenderTown_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 7 warp_def $5, $5, 1, GROUP_LAVENDER_POKECENTER_1F, MAP_LAVENDER_POKECENTER_1F warp_def $9, $5, 1, GROUP_MR_FUJIS_HOUSE, MAP_MR_FUJIS_HOUSE @@ -115,21 +115,21 @@ LavenderTown_MapEventHeader: warp_def $b, $d, 1, GROUP_SOUL_HOUSE, MAP_SOUL_HOUSE warp_def $5, $e, 1, GROUP_LAV_RADIO_TOWER_1F, MAP_LAV_RADIO_TOWER_1F - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 6 - signpost 3, 11, $0, LavenderTownSign - signpost 7, 15, $0, KantoRadioStationSign - signpost 9, 3, $0, VolunteerPokemonHouseSign - signpost 13, 15, $0, SoulHouseSign - signpost 5, 6, $0, LavenderPokeCenterSignText - signpost 5, 2, $0, LavenderMartSignText - - ; people-events + signpost 3, 11, SIGNPOST_READ, LavenderTownSign + signpost 7, 15, SIGNPOST_READ, KantoRadioStationSign + signpost 9, 3, SIGNPOST_READ, VolunteerPokemonHouseSign + signpost 13, 15, SIGNPOST_READ, SoulHouseSign + signpost 5, 6, SIGNPOST_READ, LavenderPokeCenterSignText + signpost 5, 2, SIGNPOST_READ, LavenderMartSignText + +.PersonEvents: db 4 - person_event SPRITE_POKEFAN_M, 11, 16, $5, $1, 255, 255, $80, 0, PokefanMScript_0x1ad6e4, -1 - person_event SPRITE_TEACHER, 19, 6, $5, $1, 255, 255, $90, 0, TeacherScript_0x1ad6e7, -1 - person_event SPRITE_GRAMPS, 16, 18, $7, $0, 255, 255, $0, 0, GrampsScript_0x1ad6ea, -1 - person_event SPRITE_YOUNGSTER, 15, 10, $5, $1, 255, 255, $a0, 1, YoungsterScript_0x1ad6ed, -1 + person_event SPRITE_POKEFAN_M, 11, 16, OW_UP | $1, $1, -1, -1, (PAL_OW_RED << 4) | $80, 0, PokefanMScript_0x1ad6e4, -1 + person_event SPRITE_TEACHER, 19, 6, OW_UP | $1, $1, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, TeacherScript_0x1ad6e7, -1 + person_event SPRITE_GRAMPS, 16, 18, OW_UP | $3, $0, -1, -1, $0, 0, GrampsScript_0x1ad6ea, -1 + person_event SPRITE_YOUNGSTER, 15, 10, OW_UP | $1, $1, -1, -1, (PAL_OW_GREEN << 4) | $80, 1, YoungsterScript_0x1ad6ed, -1 diff --git a/maps/LavenderTownSpeechHouse.asm b/maps/LavenderTownSpeechHouse.asm index 4ad666c16..78af1d47c 100644 --- a/maps/LavenderTownSpeechHouse.asm +++ b/maps/LavenderTownSpeechHouse.asm @@ -1,8 +1,8 @@ LavenderTownSpeechHouse_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 PokefanFScript_0x7ea47: @@ -29,19 +29,19 @@ LavenderTownSpeechHouse_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $7, $2, 3, GROUP_LAVENDER_TOWN, MAP_LAVENDER_TOWN warp_def $7, $3, 3, GROUP_LAVENDER_TOWN, MAP_LAVENDER_TOWN - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 2 - signpost 1, 0, $0, LavenderTownSpeechHouseBookshelf - signpost 1, 1, $0, LavenderTownSpeechHouseBookshelf + signpost 1, 0, SIGNPOST_READ, LavenderTownSpeechHouseBookshelf + signpost 1, 1, SIGNPOST_READ, LavenderTownSpeechHouseBookshelf - ; people-events +.PersonEvents: db 1 - person_event SPRITE_POKEFAN_F, 7, 6, $7, $0, 255, 255, $90, 0, PokefanFScript_0x7ea47, -1 + person_event SPRITE_POKEFAN_F, 7, 6, OW_UP | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, PokefanFScript_0x7ea47, -1 diff --git a/maps/MahoganyGym.asm b/maps/MahoganyGym.asm index 2ea65951a..4ceb6f660 100644 --- a/maps/MahoganyGym.asm +++ b/maps/MahoganyGym.asm @@ -1,8 +1,8 @@ MahoganyGym_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 PryceScript_0x199a9e: @@ -62,23 +62,7 @@ MahoganyGymTriggerRockets: jumpstd radiotowerrockets TrainerSkierRoxanne: - ; bit/flag number - dw EVENT_BEAT_SKIER_ROXANNE - - ; trainer group && trainer id - db SKIER, ROXANNE - - ; text when seen - dw SkierRoxanneSeenText - - ; text when trainer beaten - dw SkierRoxanneBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw SkierRoxanneScript + trainer EVENT_BEAT_SKIER_ROXANNE, SKIER, ROXANNE, SkierRoxanneSeenText, SkierRoxanneBeatenText, $0000, SkierRoxanneScript SkierRoxanneScript: talkaftercancel @@ -89,23 +73,7 @@ SkierRoxanneScript: end TrainerSkierClarissa: - ; bit/flag number - dw EVENT_BEAT_SKIER_CLARISSA - - ; trainer group && trainer id - db SKIER, CLARISSA - - ; text when seen - dw SkierClarissaSeenText - - ; text when trainer beaten - dw SkierClarissaBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw SkierClarissaScript + trainer EVENT_BEAT_SKIER_CLARISSA, SKIER, CLARISSA, SkierClarissaSeenText, SkierClarissaBeatenText, $0000, SkierClarissaScript SkierClarissaScript: talkaftercancel @@ -116,23 +84,7 @@ SkierClarissaScript: end TrainerBoarderRonald: - ; bit/flag number - dw EVENT_BEAT_BOARDER_RONALD - - ; trainer group && trainer id - db BOARDER, RONALD - - ; text when seen - dw BoarderRonaldSeenText - - ; text when trainer beaten - dw BoarderRonaldBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw BoarderRonaldScript + trainer EVENT_BEAT_BOARDER_RONALD, BOARDER, RONALD, BoarderRonaldSeenText, BoarderRonaldBeatenText, $0000, BoarderRonaldScript BoarderRonaldScript: talkaftercancel @@ -143,23 +95,7 @@ BoarderRonaldScript: end TrainerBoarderBrad: - ; bit/flag number - dw EVENT_BEAT_BOARDER_BRAD - - ; trainer group && trainer id - db BOARDER, BRAD - - ; text when seen - dw BoarderBradSeenText - - ; text when trainer beaten - dw BoarderBradBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw BoarderBradScript + trainer EVENT_BEAT_BOARDER_BRAD, BOARDER, BRAD, BoarderBradSeenText, BoarderBradBeatenText, $0000, BoarderBradScript BoarderBradScript: talkaftercancel @@ -170,23 +106,7 @@ BoarderBradScript: end TrainerBoarderDouglas: - ; bit/flag number - dw EVENT_BEAT_BOARDER_DOUGLAS - - ; trainer group && trainer id - db BOARDER, DOUGLAS - - ; text when seen - dw BoarderDouglasSeenText - - ; text when trainer beaten - dw BoarderDouglasBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw BoarderDouglasScript + trainer EVENT_BEAT_BOARDER_DOUGLAS, BOARDER, DOUGLAS, BoarderDouglasSeenText, BoarderDouglasBeatenText, $0000, BoarderDouglasScript BoarderDouglasScript: talkaftercancel @@ -447,25 +367,25 @@ MahoganyGym_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $11, $4, 3, GROUP_MAHOGANY_TOWN, MAP_MAHOGANY_TOWN warp_def $11, $5, 3, GROUP_MAHOGANY_TOWN, MAP_MAHOGANY_TOWN - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 2 - signpost 15, 3, $0, MahoganyGymStatue - signpost 15, 6, $0, MahoganyGymStatue + signpost 15, 3, SIGNPOST_READ, MahoganyGymStatue + signpost 15, 6, SIGNPOST_READ, MahoganyGymStatue - ; people-events +.PersonEvents: db 7 - person_event SPRITE_PRYCE, 7, 9, $6, $0, 255, 255, $b0, 0, PryceScript_0x199a9e, -1 - person_event SPRITE_BUENA, 10, 8, $6, $0, 255, 255, $82, 1, TrainerSkierRoxanne, -1 - person_event SPRITE_ROCKER, 21, 4, $7, $0, 255, 255, $92, 1, TrainerBoarderRonald, -1 - person_event SPRITE_BUENA, 21, 13, $7, $0, 255, 255, $82, 1, TrainerSkierClarissa, -1 - person_event SPRITE_ROCKER, 13, 9, $6, $0, 255, 255, $92, 1, TrainerBoarderBrad, -1 - person_event SPRITE_ROCKER, 8, 6, $a, $0, 255, 255, $92, 1, TrainerBoarderDouglas, -1 - person_event SPRITE_GYM_GUY, 19, 11, $6, $0, 255, 255, $80, 0, MahoganyGymGuyScript, -1 + person_event SPRITE_PRYCE, 7, 9, OW_UP | $2, $0, -1, -1, (PAL_OW_BROWN << 4) | $80, 0, PryceScript_0x199a9e, -1 + person_event SPRITE_BUENA, 10, 8, OW_UP | $2, $0, -1, -1, (PAL_OW_RED << 4) | $82, 1, TrainerSkierRoxanne, -1 + person_event SPRITE_ROCKER, 21, 4, OW_UP | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 1, TrainerBoarderRonald, -1 + person_event SPRITE_BUENA, 21, 13, OW_UP | $3, $0, -1, -1, (PAL_OW_RED << 4) | $82, 1, TrainerSkierClarissa, -1 + person_event SPRITE_ROCKER, 13, 9, OW_UP | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 1, TrainerBoarderBrad, -1 + person_event SPRITE_ROCKER, 8, 6, OW_LEFT | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 1, TrainerBoarderDouglas, -1 + person_event SPRITE_GYM_GUY, 19, 11, OW_UP | $2, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, MahoganyGymGuyScript, -1 diff --git a/maps/MahoganyMart1F.asm b/maps/MahoganyMart1F.asm index e74d77437..9a725f422 100644 --- a/maps/MahoganyMart1F.asm +++ b/maps/MahoganyMart1F.asm @@ -1,12 +1,12 @@ MahoganyMart1F_MapScriptHeader: - ; trigger count +.MapTriggers: db 2 ; triggers dw UnknownScript_0x6c356, $0000 dw UnknownScript_0x6c357, $0000 - ; callback count +.MapCallbacks: db 1 ; callbacks @@ -85,7 +85,7 @@ UnknownScript_0x6c38f: loadfont writetext UnknownText_0x6c59e closetext - showemote $0, $2, 10 + showemote EMOTE_SHOCK, $2, 10 playsound SFX_UNKNOWN_2A changeblock $6, $2, $1e reloadmappart @@ -222,22 +222,22 @@ MahoganyMart1F_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 3 warp_def $7, $3, 1, GROUP_MAHOGANY_TOWN, MAP_MAHOGANY_TOWN warp_def $7, $4, 1, GROUP_MAHOGANY_TOWN, MAP_MAHOGANY_TOWN warp_def $3, $7, 1, GROUP_TEAM_ROCKET_BASE_B1F, MAP_TEAM_ROCKET_BASE_B1F - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 5 - person_event SPRITE_PHARMACIST, 7, 8, $6, $0, 255, 255, $0, 0, PharmacistScript_0x6c367, EVENT_6DA - person_event SPRITE_BLACK_BELT, 10, 5, $3, $0, 255, 255, $0, 0, BlackBeltScript_0x6c37b, EVENT_6DA - person_event SPRITE_LANCE, 10, 8, $8, $0, 255, 255, $0, 0, ObjectEvent, EVENT_6D5 - person_event SPRITE_DRAGON, 10, 7, $8, $0, 255, 255, $0, 0, ObjectEvent, EVENT_6D5 - person_event SPRITE_GRANNY, 7, 5, $9, $0, 255, 255, $0, 0, GrannyScript_0x6c3ee, EVENT_736 + person_event SPRITE_PHARMACIST, 7, 8, OW_UP | $2, $0, -1, -1, $0, 0, PharmacistScript_0x6c367, EVENT_TEAM_ROCKET_BASE_POPULATION + person_event SPRITE_BLACK_BELT, 10, 5, OW_DOWN | $3, $0, -1, -1, $0, 0, BlackBeltScript_0x6c37b, EVENT_TEAM_ROCKET_BASE_POPULATION + person_event SPRITE_LANCE, 10, 8, OW_LEFT | $0, $0, -1, -1, $0, 0, ObjectEvent, EVENT_MAHOGANY_MART_LANCE_AND_DRAGONITE + person_event SPRITE_DRAGON, 10, 7, OW_LEFT | $0, $0, -1, -1, $0, 0, ObjectEvent, EVENT_MAHOGANY_MART_LANCE_AND_DRAGONITE + person_event SPRITE_GRANNY, 7, 5, OW_LEFT | $1, $0, -1, -1, $0, 0, GrannyScript_0x6c3ee, EVENT_MAHOGANY_MART_OWNERS diff --git a/maps/MahoganyPokeCenter1F.asm b/maps/MahoganyPokeCenter1F.asm index 750287e4f..8a5374fb0 100644 --- a/maps/MahoganyPokeCenter1F.asm +++ b/maps/MahoganyPokeCenter1F.asm @@ -1,8 +1,8 @@ MahoganyPokeCenter1F_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 NurseScript_0x19a356: @@ -51,21 +51,21 @@ MahoganyPokeCenter1F_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 3 warp_def $7, $3, 4, GROUP_MAHOGANY_TOWN, MAP_MAHOGANY_TOWN warp_def $7, $4, 4, GROUP_MAHOGANY_TOWN, MAP_MAHOGANY_TOWN warp_def $7, $0, 1, GROUP_POKECENTER_2F, MAP_POKECENTER_2F - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 4 - person_event SPRITE_NURSE, 5, 7, $6, $0, 255, 255, $0, 0, NurseScript_0x19a356, -1 - person_event SPRITE_POKEFAN_M, 6, 11, $2, $11, 255, 255, $80, 0, PokefanMScript_0x19a359, -1 - person_event SPRITE_YOUNGSTER, 7, 5, $9, $0, 255, 255, $a0, 0, YoungsterScript_0x19a35c, -1 - person_event SPRITE_COOLTRAINER_F, 7, 6, $8, $0, 255, 255, $0, 0, CooltrainerFScript_0x19a35f, -1 + person_event SPRITE_NURSE, 5, 7, OW_UP | $2, $0, -1, -1, $0, 0, NurseScript_0x19a356, -1 + person_event SPRITE_POKEFAN_M, 6, 11, OW_DOWN | $2, $11, -1, -1, (PAL_OW_RED << 4) | $80, 0, PokefanMScript_0x19a359, -1 + person_event SPRITE_YOUNGSTER, 7, 5, OW_LEFT | $1, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, YoungsterScript_0x19a35c, -1 + person_event SPRITE_COOLTRAINER_F, 7, 6, OW_LEFT | $0, $0, -1, -1, $0, 0, CooltrainerFScript_0x19a35f, -1 diff --git a/maps/MahoganyRedGyaradosSpeechHouse.asm b/maps/MahoganyRedGyaradosSpeechHouse.asm index dfc0fc30e..347b64441 100644 --- a/maps/MahoganyRedGyaradosSpeechHouse.asm +++ b/maps/MahoganyRedGyaradosSpeechHouse.asm @@ -1,8 +1,8 @@ MahoganyRedGyaradosSpeechHouse_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 BlackBeltScript_0x19997f: @@ -60,18 +60,18 @@ MahoganyRedGyaradosSpeechHouse_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $7, $2, 2, GROUP_MAHOGANY_TOWN, MAP_MAHOGANY_TOWN warp_def $7, $3, 2, GROUP_MAHOGANY_TOWN, MAP_MAHOGANY_TOWN - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 2 - person_event SPRITE_BLACK_BELT, 7, 6, $9, $0, 255, 255, $0, 0, BlackBeltScript_0x19997f, -1 - person_event SPRITE_TEACHER, 9, 10, $4, $10, 255, 255, $90, 0, TeacherScript_0x199982, -1 + person_event SPRITE_BLACK_BELT, 7, 6, OW_LEFT | $1, $0, -1, -1, $0, 0, BlackBeltScript_0x19997f, -1 + person_event SPRITE_TEACHER, 9, 10, OW_UP | $0, $10, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, TeacherScript_0x199982, -1 diff --git a/maps/MahoganyTown.asm b/maps/MahoganyTown.asm index f3d9f7457..d48596bd3 100644 --- a/maps/MahoganyTown.asm +++ b/maps/MahoganyTown.asm @@ -1,12 +1,12 @@ MahoganyTown_MapScriptHeader: - ; trigger count +.MapTriggers: db 2 ; triggers dw .Trigger1, $0000 dw .Trigger2, $0000 - ; callback count +.MapCallbacks: db 1 ; callbacks @@ -23,7 +23,7 @@ MahoganyTown_MapScriptHeader: return UnknownScript_0x190013: - showemote $0, $2, 15 + showemote EMOTE_SHOCK, $2, 15 applymovement $2, MovementData_0x1900a9 follow $0, $2 applymovement $0, MovementData_0x1900a7 @@ -246,7 +246,7 @@ MahoganyTown_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 5 warp_def $7, $b, 1, GROUP_MAHOGANY_MART_1F, MAP_MAHOGANY_MART_1F warp_def $7, $11, 1, GROUP_MAHOGANY_RED_GYARADOS_SPEECH_HOUSE, MAP_MAHOGANY_RED_GYARADOS_SPEECH_HOUSE @@ -254,21 +254,21 @@ MahoganyTown_MapEventHeader: warp_def $d, $f, 1, GROUP_MAHOGANY_POKECENTER_1F, MAP_MAHOGANY_POKECENTER_1F warp_def $1, $9, 3, GROUP_ROUTE_43_MAHOGANY_GATE, MAP_ROUTE_43_MAHOGANY_GATE - ; xy triggers +.XYTriggers: db 2 xy_trigger 0, $8, $13, $0, UnknownScript_0x190013, $0, $0 xy_trigger 0, $9, $13, $0, UnknownScript_0x190013, $0, $0 - ; signposts +.Signposts: db 4 - signpost 5, 1, $0, MahoganyTownSign - signpost 7, 9, $0, MahoganyTownRagecandybarSign - signpost 13, 3, $0, MahoganyGymSign - signpost 13, 16, $0, MahoganyTownPokeCenterSign + signpost 5, 1, SIGNPOST_READ, MahoganyTownSign + signpost 7, 9, SIGNPOST_READ, MahoganyTownRagecandybarSign + signpost 13, 3, SIGNPOST_READ, MahoganyGymSign + signpost 13, 16, SIGNPOST_READ, MahoganyTownPokeCenterSign - ; people-events +.PersonEvents: db 4 - person_event SPRITE_POKEFAN_M, 12, 23, $6, $0, 255, 255, $0, 0, PokefanMScript_0x19002e, EVENT_756 - person_event SPRITE_GRAMPS, 13, 10, $5, $1, 255, 255, $0, 0, GrampsScript_0x19007e, -1 - person_event SPRITE_FISHER, 18, 10, $6, $0, 255, 255, $a0, 0, FisherScript_0x190092, EVENT_757 - person_event SPRITE_LASS, 12, 16, $6, $0, 255, 255, $0, 0, LassScript_0x190095, EVENT_736 + person_event SPRITE_POKEFAN_M, 12, 23, OW_UP | $2, $0, -1, -1, $0, 0, PokefanMScript_0x19002e, EVENT_MAHOGANY_TOWN_POKEFAN_M_BLOCKS_EAST + person_event SPRITE_GRAMPS, 13, 10, OW_UP | $1, $1, -1, -1, $0, 0, GrampsScript_0x19007e, -1 + person_event SPRITE_FISHER, 18, 10, OW_UP | $2, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, FisherScript_0x190092, EVENT_MAHOGANY_TOWN_POKEFAN_M_BLOCKS_GYM + person_event SPRITE_LASS, 12, 16, OW_UP | $2, $0, -1, -1, $0, 0, LassScript_0x190095, EVENT_MAHOGANY_MART_OWNERS diff --git a/maps/ManiasHouse.asm b/maps/ManiasHouse.asm index c2b33f088..4353733db 100644 --- a/maps/ManiasHouse.asm +++ b/maps/ManiasHouse.asm @@ -1,8 +1,8 @@ ManiasHouse_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 RockerScript_0x9d278: @@ -199,17 +199,17 @@ ManiasHouse_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $7, $2, 1, GROUP_CIANWOOD_CITY, MAP_CIANWOOD_CITY warp_def $7, $3, 1, GROUP_CIANWOOD_CITY, MAP_CIANWOOD_CITY - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 1 - person_event SPRITE_ROCKER, 8, 6, $3, $0, 255, 255, $0, 0, RockerScript_0x9d278, -1 + person_event SPRITE_ROCKER, 8, 6, OW_DOWN | $3, $0, -1, -1, $0, 0, RockerScript_0x9d278, -1 diff --git a/maps/MobileBattleRoom.asm b/maps/MobileBattleRoom.asm index b0ef957be..e721f5dfa 100644 --- a/maps/MobileBattleRoom.asm +++ b/maps/MobileBattleRoom.asm @@ -1,22 +1,22 @@ MobileBattleRoom_MapScriptHeader: - ; trigger count +.MapTriggers: db 2 ; triggers - dw UnknownScript_0x1935ce, $0000 - dw UnknownScript_0x1935d2, $0000 + dw .Trigger1, $0000 + dw .Trigger2, $0000 - ; callback count +.MapCallbacks: db 0 -UnknownScript_0x1935ce: - priorityjump UnknownScript_0x1935d3 +.Trigger1: + priorityjump MobileBattleRoom_Initialize end -UnknownScript_0x1935d2: +.Trigger2: end -UnknownScript_0x1935d3: +MobileBattleRoom_Initialize: dotrigger $1 domaptrigger GROUP_POKECENTER_2F, MAP_POKECENTER_2F, $5 end @@ -24,45 +24,45 @@ UnknownScript_0x1935d3: MapMobileBattleRoomSignpost0Script: refreshscreen $0 special Function1037c2 - if_equal $1, UnknownScript_0x193619 + if_equal $1, .one special Function1037eb - iffalse UnknownScript_0x193624 - if_equal $1, UnknownScript_0x1935f4 - if_equal $2, UnknownScript_0x19360d - jump UnknownScript_0x193624 + iffalse .false + if_equal $1, .one_ + if_equal $2, .two_ + jump .false -UnknownScript_0x1935f4: - writetext UnknownText_0x193644 +.one_: + writetext MobileBattleRoom_HealText pause 20 loadmovesprites - special Function8c084 + special FadeBlackBGMap playmusic MUSIC_HEAL - special Function1047eb + special LoadMapPalettes pause 60 - special Function8c079 + special FadeInBGMap special RestartMapMusic refreshscreen $0 -UnknownScript_0x19360d: - special Function1060a2 +.two_: + special Mobile_HealParty special HealParty special Function10383c - iftrue UnknownScript_0x193624 -UnknownScript_0x193619: + iftrue .false +.one: special Function10387b - writetext UnknownText_0x193626 + writetext MobileBattleRoom_EstablishingCommsText closetext reloadmappart special Function101225 -UnknownScript_0x193624: +.false: loadmovesprites end -UnknownText_0x193626: +MobileBattleRoom_EstablishingCommsText: text "Establishing" line "communications…" done -UnknownText_0x193644: +MobileBattleRoom_HealText: text "Your #MON will" line "be fully healed" cont "before battle." @@ -72,17 +72,17 @@ MobileBattleRoom_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $7, $4, 6, GROUP_POKECENTER_2F, MAP_POKECENTER_2F warp_def $7, $5, 6, GROUP_POKECENTER_2F, MAP_POKECENTER_2F - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 1 - signpost 2, 4, $1, MapMobileBattleRoomSignpost0Script + signpost 2, 4, SIGNPOST_UP, MapMobileBattleRoomSignpost0Script - ; people-events +.PersonEvents: db 0 diff --git a/maps/MobileTradeRoomMobile.asm b/maps/MobileTradeRoomMobile.asm index 18da1ad0f..8bea1200e 100644 --- a/maps/MobileTradeRoomMobile.asm +++ b/maps/MobileTradeRoomMobile.asm @@ -1,22 +1,22 @@ MobileTradeRoomMobile_MapScriptHeader: - ; trigger count +.MapTriggers: db 2 ; triggers - dw UnknownScript_0x193576, $0000 - dw UnknownScript_0x19357a, $0000 + dw .Trigger1, $0000 + dw .Trigger2, $0000 - ; callback count +.MapCallbacks: db 0 -UnknownScript_0x193576: - priorityjump UnknownScript_0x19357b +.Trigger1: + priorityjump MobileTradeRoomMobile_Initialize end -UnknownScript_0x19357a: +.Trigger2: end -UnknownScript_0x19357b: +MobileTradeRoomMobile_Initialize: dotrigger $1 domaptrigger GROUP_POKECENTER_2F, MAP_POKECENTER_2F, $4 end @@ -24,14 +24,14 @@ UnknownScript_0x19357b: MapMobileTradeRoomMobileSignpost0Script: refreshscreen $0 special Function1037c2 - writetext UnknownText_0x193591 + writetext MobileTradeRoomMobile_EstablishingCommsText closetext reloadmappart special Function101231 loadmovesprites end -UnknownText_0x193591: +MobileTradeRoomMobile_EstablishingCommsText: text "Establishing" line "communications…" done @@ -40,17 +40,17 @@ MobileTradeRoomMobile_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $7, $4, 5, GROUP_POKECENTER_2F, MAP_POKECENTER_2F warp_def $7, $5, 5, GROUP_POKECENTER_2F, MAP_POKECENTER_2F - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 1 - signpost 2, 4, $1, MapMobileTradeRoomMobileSignpost0Script + signpost 2, 4, SIGNPOST_UP, MapMobileTradeRoomMobileSignpost0Script - ; people-events +.PersonEvents: db 0 diff --git a/maps/MountMoon.asm b/maps/MountMoon.asm index 4e1701e17..94ef24277 100644 --- a/maps/MountMoon.asm +++ b/maps/MountMoon.asm @@ -1,12 +1,12 @@ MountMoon_MapScriptHeader: - ; trigger count +.MapTriggers: db 2 ; triggers dw UnknownScript_0x74089, $0000 dw UnknownScript_0x7408d, $0000 - ; callback count +.MapCallbacks: db 0 UnknownScript_0x74089: @@ -18,7 +18,7 @@ UnknownScript_0x7408d: UnknownScript_0x7408e: spriteface $0, RIGHT - showemote $0, $0, 15 + showemote EMOTE_SHOCK, $0, 15 special Functionc48f pause 15 applymovement $2, MovementData_0x740f9 @@ -163,7 +163,7 @@ MountMoon_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 8 warp_def $3, $3, 1, GROUP_ROUTE_3, MAP_ROUTE_3 warp_def $f, $f, 1, GROUP_ROUTE_4, MAP_ROUTE_4 @@ -174,12 +174,12 @@ MountMoon_MapEventHeader: warp_def $3, $19, 3, GROUP_MOUNT_MOON, MAP_MOUNT_MOON warp_def $d, $19, 4, GROUP_MOUNT_MOON, MAP_MOUNT_MOON - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 1 - person_event SPRITE_SILVER, 7, 11, $8, $0, 255, 255, $0, 0, ObjectEvent, EVENT_77A + person_event SPRITE_SILVER, 7, 11, OW_LEFT | $0, $0, -1, -1, $0, 0, ObjectEvent, EVENT_MT_MOON_RIVAL diff --git a/maps/MountMoonGiftShop.asm b/maps/MountMoonGiftShop.asm index e7a14fce1..673cbde08 100644 --- a/maps/MountMoonGiftShop.asm +++ b/maps/MountMoonGiftShop.asm @@ -1,8 +1,8 @@ MountMoonGiftShop_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 GrampsScript_0x771a8: @@ -25,20 +25,20 @@ MountMoonGiftShop_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $7, $3, 3, GROUP_MOUNT_MOON_SQUARE, MAP_MOUNT_MOON_SQUARE warp_def $7, $4, 3, GROUP_MOUNT_MOON_SQUARE, MAP_MOUNT_MOON_SQUARE - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 4 - person_event SPRITE_GRAMPS, 7, 8, $6, $0, 255, 1, $0, 0, GrampsScript_0x771a8, -1 - person_event SPRITE_GRAMPS, 6, 5, $9, $0, 255, 2, $0, 0, GrampsScript_0x771a8, -1 - person_event SPRITE_LASS, 10, 5, $5, $1, 255, 1, $0, 0, LassScript_0x771b0, -1 - person_event SPRITE_LASS, 8, 9, $4, $10, 255, 2, $0, 0, LassScript_0x771b0, -1 + person_event SPRITE_GRAMPS, 7, 8, OW_UP | $2, $0, -1, 1, $0, 0, GrampsScript_0x771a8, -1 + person_event SPRITE_GRAMPS, 6, 5, OW_LEFT | $1, $0, -1, 2, $0, 0, GrampsScript_0x771a8, -1 + person_event SPRITE_LASS, 10, 5, OW_UP | $1, $1, -1, 1, $0, 0, LassScript_0x771b0, -1 + person_event SPRITE_LASS, 8, 9, OW_UP | $0, $10, -1, 2, $0, 0, LassScript_0x771b0, -1 diff --git a/maps/MountMoonSquare.asm b/maps/MountMoonSquare.asm index cd424a320..111b1284b 100644 --- a/maps/MountMoonSquare.asm +++ b/maps/MountMoonSquare.asm @@ -1,11 +1,11 @@ MountMoonSquare_MapScriptHeader: - ; trigger count +.MapTriggers: db 1 ; triggers dw UnknownScript_0x77092, $0000 - ; callback count +.MapCallbacks: db 2 ; callbacks @@ -18,7 +18,7 @@ UnknownScript_0x77092: end UnknownScript_0x77093: - setevent EVENT_0EC + setevent EVENT_MOUNT_MOON_SQUARE_HIDDEN_MOON_STONE return UnknownScript_0x77097: @@ -27,11 +27,11 @@ UnknownScript_0x77097: UnknownScript_0x7709a: checkflag ENGINE_MT_MOON_SQUARE_CLEFAIRY - iftrue UnknownScript_0x77117 + iftrue .NoDancing checkcode VAR_WEEKDAY - if_not_equal MONDAY, UnknownScript_0x77117 + if_not_equal MONDAY, .NoDancing checknite - iffalse UnknownScript_0x77117 + iffalse .NoDancing appear $2 appear $3 applymovement $0, MovementData_0x77121 @@ -59,7 +59,7 @@ UnknownScript_0x7709a: stopfollow spriteface $2, DOWN pause 10 - showemote $0, $2, 15 + showemote EMOTE_SHOCK, $2, 15 spriteface $2, DOWN cry CLEFAIRY pause 15 @@ -68,16 +68,15 @@ UnknownScript_0x7709a: disappear $2 disappear $3 stopfollow - clearevent EVENT_0EC + clearevent EVENT_MOUNT_MOON_SQUARE_HIDDEN_MOON_STONE setflag ENGINE_MT_MOON_SQUARE_CLEFAIRY end -UnknownScript_0x77117: +.NoDancing: end MapMountMoonSquareSignpostItem0: - dw $00ec - db MOON_STONE + dwb EVENT_MOUNT_MOON_SQUARE_HIDDEN_MOON_STONE, MOON_STONE MapMountMoonSquareSignpost1Script: @@ -139,23 +138,23 @@ MountMoonSquare_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 3 warp_def $5, $14, 5, GROUP_MOUNT_MOON, MAP_MOUNT_MOON warp_def $b, $16, 6, GROUP_MOUNT_MOON, MAP_MOUNT_MOON warp_def $7, $d, 1, GROUP_MOUNT_MOON_GIFT_SHOP, MAP_MOUNT_MOON_GIFT_SHOP - ; xy triggers +.XYTriggers: db 1 xy_trigger 0, $b, $7, $0, UnknownScript_0x7709a, $0, $0 - ; signposts +.Signposts: db 2 - signpost 7, 7, $7, MapMountMoonSquareSignpostItem0 - signpost 7, 17, $0, MapMountMoonSquareSignpost1Script + signpost 7, 7, SIGNPOST_ITEM, MapMountMoonSquareSignpostItem0 + signpost 7, 17, SIGNPOST_READ, MapMountMoonSquareSignpost1Script - ; people-events +.PersonEvents: db 3 - person_event SPRITE_FAIRY, 10, 10, $6, $0, 255, 255, $0, 0, ObjectEvent, EVENT_779 - person_event SPRITE_FAIRY, 10, 11, $6, $0, 255, 255, $0, 0, ObjectEvent, EVENT_779 - person_event SPRITE_ROCK, 11, 11, $18, $0, 255, 255, $0, 0, MtMoonSquareRock, EVENT_778 + person_event SPRITE_FAIRY, 10, 10, OW_UP | $2, $0, -1, -1, $0, 0, ObjectEvent, EVENT_MT_MOON_SQUARE_CLEFAIRY + person_event SPRITE_FAIRY, 10, 11, OW_UP | $2, $0, -1, -1, $0, 0, ObjectEvent, EVENT_MT_MOON_SQUARE_CLEFAIRY + person_event SPRITE_ROCK, 11, 11, OW_LEFT | $10, $0, -1, -1, $0, 0, MtMoonSquareRock, EVENT_MT_MOON_SQUARE_ROCK diff --git a/maps/MountMortar1FInside.asm b/maps/MountMortar1FInside.asm index f95b5d66b..2f8def0ae 100644 --- a/maps/MountMortar1FInside.asm +++ b/maps/MountMortar1FInside.asm @@ -1,28 +1,12 @@ MountMortar1FInside_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 TrainerPokemaniacMiller: - ; bit/flag number - dw EVENT_BEAT_POKEMANIAC_MILLER - - ; trainer group && trainer id - db POKEMANIAC, MILLER - - ; text when seen - dw PokemaniacMillerSeenText - - ; text when trainer beaten - dw PokemaniacMillerBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw PokemaniacMillerScript + trainer EVENT_BEAT_POKEMANIAC_MILLER, POKEMANIAC, MILLER, PokemaniacMillerSeenText, PokemaniacMillerBeatenText, $0000, PokemaniacMillerScript PokemaniacMillerScript: talkaftercancel @@ -33,23 +17,7 @@ PokemaniacMillerScript: end TrainerSupernerdMarkus: - ; bit/flag number - dw EVENT_BEAT_SUPER_NERD_MARKUS - - ; trainer group && trainer id - db SUPER_NERD, MARKUS - - ; text when seen - dw SupernerdMarkusSeenText - - ; text when trainer beaten - dw SupernerdMarkusBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw SupernerdMarkusScript + trainer EVENT_BEAT_SUPER_NERD_MARKUS, SUPER_NERD, MARKUS, SupernerdMarkusSeenText, SupernerdMarkusBeatenText, $0000, SupernerdMarkusScript SupernerdMarkusScript: talkaftercancel @@ -84,8 +52,7 @@ ItemFragment_0x7de88: db ULTRA_BALL, 1 MapMountMortar1FInsideSignpostItem0: - dw $0091 - db MAX_REPEL + dwb EVENT_MOUNT_MORTAR_1F_INSIDE_HIDDEN_MAX_REPEL, MAX_REPEL PokemaniacMillerSeenText: @@ -142,7 +109,7 @@ MountMortar1FInside_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 6 warp_def $2f, $b, 5, GROUP_MOUNT_MORTAR_1F_OUTSIDE, MAP_MOUNT_MORTAR_1F_OUTSIDE warp_def $2f, $1d, 6, GROUP_MOUNT_MORTAR_1F_OUTSIDE, MAP_MOUNT_MORTAR_1F_OUTSIDE @@ -151,22 +118,22 @@ MountMortar1FInside_MapEventHeader: warp_def $13, $3, 1, GROUP_MOUNT_MORTAR_B1F, MAP_MOUNT_MORTAR_B1F warp_def $9, $9, 2, GROUP_MOUNT_MORTAR_2F_INSIDE, MAP_MOUNT_MORTAR_2F_INSIDE - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 1 - signpost 11, 30, $7, MapMountMortar1FInsideSignpostItem0 + signpost 11, 30, SIGNPOST_ITEM, MapMountMortar1FInsideSignpostItem0 - ; people-events +.PersonEvents: db 10 - person_event SPRITE_BOULDER, 47, 25, $19, $0, 255, 255, $0, 0, MountMortar1FBoulder, -1 - person_event SPRITE_POKE_BALL, 42, 39, $1, $0, 255, 255, $1, 0, ItemFragment_0x7de7c, EVENT_67D - person_event SPRITE_POKE_BALL, 14, 20, $1, $0, 255, 255, $1, 0, ItemFragment_0x7de7e, EVENT_67E - person_event SPRITE_POKE_BALL, 31, 14, $1, $0, 255, 255, $1, 0, ItemFragment_0x7de80, EVENT_67F - person_event SPRITE_POKE_BALL, 24, 26, $1, $0, 255, 255, $1, 0, ItemFragment_0x7de82, EVENT_7A6 - person_event SPRITE_POKE_BALL, 23, 39, $1, $0, 255, 255, $1, 0, ItemFragment_0x7de84, EVENT_7A7 - person_event SPRITE_SUPER_NERD, 47, 37, $8, $0, 255, 255, $92, 3, TrainerPokemaniacMiller, -1 - person_event SPRITE_SUPER_NERD, 32, 28, $a, $0, 255, 255, $b2, 3, TrainerSupernerdMarkus, -1 - person_event SPRITE_POKE_BALL, 20, 12, $1, $0, 255, 255, $1, 0, ItemFragment_0x7de86, EVENT_7C8 - person_event SPRITE_POKE_BALL, 21, 21, $1, $0, 255, 255, $1, 0, ItemFragment_0x7de88, EVENT_7C9 + person_event SPRITE_BOULDER, 47, 25, OW_LEFT | $11, $0, -1, -1, $0, 0, MountMortar1FBoulder, -1 + person_event SPRITE_POKE_BALL, 42, 39, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x7de7c, EVENT_MOUNT_MORTAR_1F_INSIDE_ESCAPE_ROPE + person_event SPRITE_POKE_BALL, 14, 20, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x7de7e, EVENT_MOUNT_MORTAR_1F_INSIDE_MAX_REVIVE + person_event SPRITE_POKE_BALL, 31, 14, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x7de80, EVENT_MOUNT_MORTAR_1F_INSIDE_HYPER_POTION + person_event SPRITE_POKE_BALL, 24, 26, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x7de82, EVENT_MOUNT_MORTAR_1F_INSIDE_MAX_POTION + person_event SPRITE_POKE_BALL, 23, 39, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x7de84, EVENT_MOUNT_MORTAR_1F_INSIDE_NUGGET + person_event SPRITE_SUPER_NERD, 47, 37, OW_LEFT | $0, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 3, TrainerPokemaniacMiller, -1 + person_event SPRITE_SUPER_NERD, 32, 28, OW_LEFT | $2, $0, -1, -1, (PAL_OW_BROWN << 4) | $82, 3, TrainerSupernerdMarkus, -1 + person_event SPRITE_POKE_BALL, 20, 12, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x7de86, EVENT_MOUNT_MORTAR_1F_INSIDE_IRON + person_event SPRITE_POKE_BALL, 21, 21, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x7de88, EVENT_MOUNT_MORTAR_1F_INSIDE_ULTRA_BALL diff --git a/maps/MountMortar1FOutside.asm b/maps/MountMortar1FOutside.asm index 838a2bbf2..81d95b2c8 100644 --- a/maps/MountMortar1FOutside.asm +++ b/maps/MountMortar1FOutside.asm @@ -1,8 +1,8 @@ MountMortar1FOutside_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 ItemFragment_0x7ddf6: @@ -12,15 +12,14 @@ ItemFragment_0x7ddf8: db REVIVE, 1 MapMountMortar1FOutsideSignpostItem0: - dw $0090 - db HYPER_POTION + dwb EVENT_MOUNT_MORTAR_1F_OUTSIDE_HIDDEN_HYPER_POTION, HYPER_POTION MountMortar1FOutside_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 9 warp_def $21, $3, 3, GROUP_ROUTE_42, MAP_ROUTE_42 warp_def $21, $11, 4, GROUP_ROUTE_42, MAP_ROUTE_42 @@ -32,14 +31,14 @@ MountMortar1FOutside_MapEventHeader: warp_def $d, $7, 3, GROUP_MOUNT_MORTAR_1F_INSIDE, MAP_MOUNT_MORTAR_1F_INSIDE warp_def $d, $21, 4, GROUP_MOUNT_MORTAR_1F_INSIDE, MAP_MOUNT_MORTAR_1F_INSIDE - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 1 - signpost 22, 25, $7, MapMountMortar1FOutsideSignpostItem0 + signpost 22, 25, SIGNPOST_ITEM, MapMountMortar1FOutsideSignpostItem0 - ; people-events +.PersonEvents: db 2 - person_event SPRITE_POKE_BALL, 19, 17, $1, $0, 255, 255, $1, 0, ItemFragment_0x7ddf6, EVENT_67B - person_event SPRITE_POKE_BALL, 22, 35, $1, $0, 255, 255, $1, 0, ItemFragment_0x7ddf8, EVENT_67C + person_event SPRITE_POKE_BALL, 19, 17, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x7ddf6, EVENT_MOUNT_MORTAR_1F_OUTSIDE_ETHER + person_event SPRITE_POKE_BALL, 22, 35, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x7ddf8, EVENT_MOUNT_MORTAR_1F_OUTSIDE_REVIVE diff --git a/maps/MountMortar2FInside.asm b/maps/MountMortar2FInside.asm index 378d90e1b..cbd8589a7 100644 --- a/maps/MountMortar2FInside.asm +++ b/maps/MountMortar2FInside.asm @@ -1,28 +1,12 @@ MountMortar2FInside_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 TrainerSupernerdHugh: - ; bit/flag number - dw EVENT_BEAT_SUPER_NERD_HUGH - - ; trainer group && trainer id - db SUPER_NERD, HUGH - - ; text when seen - dw SupernerdHughSeenText - - ; text when trainer beaten - dw SupernerdHughBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw SupernerdHughScript + trainer EVENT_BEAT_SUPER_NERD_HUGH, SUPER_NERD, HUGH, SupernerdHughSeenText, SupernerdHughBeatenText, $0000, SupernerdHughScript SupernerdHughScript: talkaftercancel @@ -51,8 +35,7 @@ ItemFragment_0x7e0e8: db ESCAPE_ROPE, 1 MapMountMortar2FInsideSignpostItem0: - dw $0092 - db FULL_RESTORE + dwb EVENT_MOUNT_MORTAR_2F_INSIDE_HIDDEN_FULL_RESTORE, FULL_RESTORE SupernerdHughSeenText: @@ -79,24 +62,24 @@ MountMortar2FInside_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $21, $11, 4, GROUP_MOUNT_MORTAR_1F_OUTSIDE, MAP_MOUNT_MORTAR_1F_OUTSIDE warp_def $5, $3, 6, GROUP_MOUNT_MORTAR_1F_INSIDE, MAP_MOUNT_MORTAR_1F_INSIDE - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 1 - signpost 8, 24, $7, MapMountMortar2FInsideSignpostItem0 + signpost 8, 24, SIGNPOST_ITEM, MapMountMortar2FInsideSignpostItem0 - ; people-events +.PersonEvents: db 7 - person_event SPRITE_POKE_BALL, 26, 32, $1, $0, 255, 255, $1, 0, ItemFragment_0x7e0de, EVENT_680 - person_event SPRITE_POKE_BALL, 37, 6, $1, $0, 255, 255, $1, 0, ItemFragment_0x7e0e0, EVENT_681 - person_event SPRITE_POKE_BALL, 21, 23, $1, $0, 255, 255, $1, 0, ItemFragment_0x7e0e2, EVENT_682 - person_event SPRITE_POKE_BALL, 9, 20, $1, $0, 255, 255, $1, 0, ItemFragment_0x7e0e4, EVENT_683 - person_event SPRITE_POKE_BALL, 15, 13, $1, $0, 255, 255, $1, 0, ItemFragment_0x7e0e6, EVENT_684 - person_event SPRITE_POKE_BALL, 9, 32, $1, $0, 255, 255, $1, 0, ItemFragment_0x7e0e8, EVENT_685 - person_event SPRITE_SUPER_NERD, 30, 17, $a, $0, 255, 255, $b2, 2, TrainerSupernerdHugh, -1 + person_event SPRITE_POKE_BALL, 26, 32, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x7e0de, EVENT_MOUNT_MORTAR_2F_INSIDE_MAX_POTION + person_event SPRITE_POKE_BALL, 37, 6, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x7e0e0, EVENT_MOUNT_MORTAR_2F_INSIDE_RARE_CANDY + person_event SPRITE_POKE_BALL, 21, 23, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x7e0e2, EVENT_MOUNT_MORTAR_2F_INSIDE_TM_DEFENSE_CURL + person_event SPRITE_POKE_BALL, 9, 20, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x7e0e4, EVENT_MOUNT_MORTAR_2F_INSIDE_DRAGON_SCALE + person_event SPRITE_POKE_BALL, 15, 13, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x7e0e6, EVENT_MOUNT_MORTAR_2F_INSIDE_ELIXER + person_event SPRITE_POKE_BALL, 9, 32, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x7e0e8, EVENT_MOUNT_MORTAR_2F_INSIDE_ESCAPE_ROPE + person_event SPRITE_SUPER_NERD, 30, 17, OW_LEFT | $2, $0, -1, -1, (PAL_OW_BROWN << 4) | $82, 2, TrainerSupernerdHugh, -1 diff --git a/maps/MountMortarB1F.asm b/maps/MountMortarB1F.asm index 6aae2afd0..e64b8566a 100644 --- a/maps/MountMortarB1F.asm +++ b/maps/MountMortarB1F.asm @@ -1,8 +1,8 @@ MountMortarB1F_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 BlackBeltScript_0x7e1f6: @@ -63,8 +63,7 @@ ItemFragment_0x7e248: db PP_UP, 1 MapMountMortarB1FSignpostItem0: - dw $0093 - db MAX_REVIVE + dwb EVENT_MOUNT_MORTAR_B1F_HIDDEN_MAX_REVIVE, MAX_REVIVE UnknownText_0x7e24d: @@ -131,24 +130,24 @@ MountMortarB1F_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $3, $3, 5, GROUP_MOUNT_MORTAR_1F_INSIDE, MAP_MOUNT_MORTAR_1F_INSIDE warp_def $1d, $13, 7, GROUP_MOUNT_MORTAR_1F_OUTSIDE, MAP_MOUNT_MORTAR_1F_OUTSIDE - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 1 - signpost 6, 4, $7, MapMountMortarB1FSignpostItem0 + signpost 6, 4, SIGNPOST_ITEM, MapMountMortarB1FSignpostItem0 - ; people-events +.PersonEvents: db 7 - person_event SPRITE_POKE_BALL, 16, 33, $1, $0, 255, 255, $1, 0, ItemFragment_0x7e240, EVENT_686 - person_event SPRITE_POKE_BALL, 20, 8, $1, $0, 255, 255, $1, 0, ItemFragment_0x7e242, EVENT_687 - person_event SPRITE_BOULDER, 14, 13, $19, $0, 255, 255, $0, 0, MountMortarB1FBoulder, -1 - person_event SPRITE_BLACK_BELT, 8, 20, $6, $0, 255, 255, $b0, 0, BlackBeltScript_0x7e1f6, -1 - person_event SPRITE_POKE_BALL, 28, 38, $1, $0, 255, 255, $1, 0, ItemFragment_0x7e244, EVENT_7CA - person_event SPRITE_POKE_BALL, 7, 36, $1, $0, 255, 255, $1, 0, ItemFragment_0x7e246, EVENT_7CB - person_event SPRITE_POKE_BALL, 30, 25, $1, $0, 255, 255, $1, 0, ItemFragment_0x7e248, EVENT_7CC + person_event SPRITE_POKE_BALL, 16, 33, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x7e240, EVENT_MOUNT_MORTAR_B1F_HYPER_POTION + person_event SPRITE_POKE_BALL, 20, 8, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x7e242, EVENT_MOUNT_MORTAR_B1F_CARBOS + person_event SPRITE_BOULDER, 14, 13, OW_LEFT | $11, $0, -1, -1, $0, 0, MountMortarB1FBoulder, -1 + person_event SPRITE_BLACK_BELT, 8, 20, OW_UP | $2, $0, -1, -1, (PAL_OW_BROWN << 4) | $80, 0, BlackBeltScript_0x7e1f6, -1 + person_event SPRITE_POKE_BALL, 28, 38, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x7e244, EVENT_MOUNT_MORTAR_B1F_FULL_RESTORE + person_event SPRITE_POKE_BALL, 7, 36, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x7e246, EVENT_MOUNT_MORTAR_B1F_MAX_ETHER + person_event SPRITE_POKE_BALL, 30, 25, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x7e248, EVENT_MOUNT_MORTAR_B1F_PP_UP diff --git a/maps/MoveDeletersHouse.asm b/maps/MoveDeletersHouse.asm index 1212fd579..693a42090 100644 --- a/maps/MoveDeletersHouse.asm +++ b/maps/MoveDeletersHouse.asm @@ -1,8 +1,8 @@ MoveDeletersHouse_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 MoveDeleter: @@ -20,19 +20,19 @@ MoveDeletersHouse_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $7, $2, 6, GROUP_BLACKTHORN_CITY, MAP_BLACKTHORN_CITY warp_def $7, $3, 6, GROUP_BLACKTHORN_CITY, MAP_BLACKTHORN_CITY - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 2 - signpost 1, 0, $0, MoveDeletersHouseBookshelf - signpost 1, 1, $0, MoveDeletersHouseBookshelf + signpost 1, 0, SIGNPOST_READ, MoveDeletersHouseBookshelf + signpost 1, 1, SIGNPOST_READ, MoveDeletersHouseBookshelf - ; people-events +.PersonEvents: db 1 - person_event SPRITE_SUPER_NERD, 7, 6, $6, $0, 255, 255, $0, 0, MoveDeleter, -1 + person_event SPRITE_SUPER_NERD, 7, 6, OW_UP | $2, $0, -1, -1, $0, 0, MoveDeleter, -1 diff --git a/maps/MrFujisHouse.asm b/maps/MrFujisHouse.asm index 7923cc77c..ad6fd7526 100644 --- a/maps/MrFujisHouse.asm +++ b/maps/MrFujisHouse.asm @@ -1,8 +1,8 @@ MrFujisHouse_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 SuperNerdScript_0x7e8ca: @@ -76,23 +76,23 @@ MrFujisHouse_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $7, $2, 2, GROUP_LAVENDER_TOWN, MAP_LAVENDER_TOWN warp_def $7, $3, 2, GROUP_LAVENDER_TOWN, MAP_LAVENDER_TOWN - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 2 - signpost 1, 0, $0, MrFujisHouseBookshelf - signpost 1, 1, $0, MrFujisHouseBookshelf + signpost 1, 0, SIGNPOST_READ, MrFujisHouseBookshelf + signpost 1, 1, SIGNPOST_READ, MrFujisHouseBookshelf - ; people-events +.PersonEvents: db 5 - person_event SPRITE_SUPER_NERD, 5, 8, $6, $0, 255, 255, $a0, 0, SuperNerdScript_0x7e8ca, -1 - person_event SPRITE_LASS, 8, 7, $2, $11, 255, 255, $0, 0, LassScript_0x7e8cd, -1 - person_event SPRITE_RHYDON, 8, 11, $16, $0, 255, 255, $0, 0, MrFujisPsyduck, -1 - person_event SPRITE_GROWLITHE, 9, 9, $16, $0, 255, 255, $90, 0, MrFujisNidorino, -1 - person_event SPRITE_MOLTRES, 7, 5, $16, $0, 255, 255, $b0, 0, MrFujisPidgey, -1 + person_event SPRITE_SUPER_NERD, 5, 8, OW_UP | $2, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, SuperNerdScript_0x7e8ca, -1 + person_event SPRITE_LASS, 8, 7, OW_DOWN | $2, $11, -1, -1, $0, 0, LassScript_0x7e8cd, -1 + person_event SPRITE_RHYDON, 8, 11, OW_UP | $12, $0, -1, -1, $0, 0, MrFujisPsyduck, -1 + person_event SPRITE_GROWLITHE, 9, 9, OW_UP | $12, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, MrFujisNidorino, -1 + person_event SPRITE_MOLTRES, 7, 5, OW_UP | $12, $0, -1, -1, (PAL_OW_BROWN << 4) | $80, 0, MrFujisPidgey, -1 diff --git a/maps/MrPokemonsHouse.asm b/maps/MrPokemonsHouse.asm index f8a758907..3a45cf125 100644 --- a/maps/MrPokemonsHouse.asm +++ b/maps/MrPokemonsHouse.asm @@ -1,12 +1,12 @@ MrPokemonsHouse_MapScriptHeader: - ; trigger count +.MapTriggers: db 2 ; triggers dw UnknownScript_0x196e51, $0000 dw UnknownScript_0x196e55, $0000 - ; callback count +.MapCallbacks: db 0 UnknownScript_0x196e51: @@ -17,7 +17,7 @@ UnknownScript_0x196e55: end UnknownScript_0x196e56: - showemote $0, $2, 15 + showemote EMOTE_SHOCK, $2, 15 spriteface $2, DOWN loadfont writetext UnknownText_0x196f66 @@ -108,39 +108,39 @@ UnknownScript_0x196ec9: writetext UnknownText_0x1970ed closetext loadmovesprites - special Function8c0b6 - special Functiond91 + special Special_FadeBlackQuickly + special Special_ReloadSpritesNoPalettes playmusic MUSIC_HEAL - special Function1060a2 + special Mobile_HealParty special HealParty pause 60 - special Function8c0ab + special Special_FadeInQuickly special RestartMapMusic loadfont writetext UnknownText_0x197134 closetext loadmovesprites - setevent EVENT_6BD - setevent EVENT_792 - clearevent EVENT_793 + setevent EVENT_RIVAL_NEW_BARK_TOWN + setevent EVENT_KRISS_HOUSE_1F_NEIGHBOR + clearevent EVENT_KRISS_NEIGHBORS_HOUSE_NEIGHBOR dotrigger $1 domaptrigger GROUP_CHERRYGROVE_CITY, MAP_CHERRYGROVE_CITY, $1 domaptrigger GROUP_ELMS_LAB, MAP_ELMS_LAB, $3 - specialphonecall $2 - clearevent EVENT_702 + specialphonecall ELMCALL_ROBBED + clearevent EVENT_COP_IN_ELMS_LAB checkevent EVENT_GOT_TOTODILE_FROM_ELM iftrue UnknownScript_0x196f49 checkevent EVENT_GOT_CHIKORITA_FROM_ELM iftrue UnknownScript_0x196f4d - setevent EVENT_641 + setevent EVENT_TOTODILE_POKEBALL_IN_ELMS_LAB end UnknownScript_0x196f49: - setevent EVENT_642 + setevent EVENT_CHIKORITA_POKEBALL_IN_ELMS_LAB end UnknownScript_0x196f4d: - setevent EVENT_640 + setevent EVENT_CYNDAQUIL_POKEBALL_IN_ELMS_LAB end MapMrPokemonsHouseSignpost1Script: @@ -374,23 +374,23 @@ MrPokemonsHouse_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $7, $2, 2, GROUP_ROUTE_30, MAP_ROUTE_30 warp_def $7, $3, 2, GROUP_ROUTE_30, MAP_ROUTE_30 - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 5 - signpost 1, 0, $0, MapMrPokemonsHouseSignpost1Script - signpost 1, 1, $0, MapMrPokemonsHouseSignpost1Script - signpost 1, 6, $0, MapMrPokemonsHouseSignpost3Script - signpost 1, 7, $0, MapMrPokemonsHouseSignpost3Script - signpost 4, 6, $0, MapMrPokemonsHouseSignpost4Script + signpost 1, 0, SIGNPOST_READ, MapMrPokemonsHouseSignpost1Script + signpost 1, 1, SIGNPOST_READ, MapMrPokemonsHouseSignpost1Script + signpost 1, 6, SIGNPOST_READ, MapMrPokemonsHouseSignpost3Script + signpost 1, 7, SIGNPOST_READ, MapMrPokemonsHouseSignpost3Script + signpost 4, 6, SIGNPOST_READ, MapMrPokemonsHouseSignpost4Script - ; people-events +.PersonEvents: db 2 - person_event SPRITE_GENTLEMAN, 9, 7, $9, $0, 255, 255, $0, 0, GentlemanScript_0x196e97, -1 - person_event SPRITE_OAK, 9, 10, $7, $0, 255, 255, $0, 0, ObjectEvent, EVENT_6C9 + person_event SPRITE_GENTLEMAN, 9, 7, OW_LEFT | $1, $0, -1, -1, $0, 0, GentlemanScript_0x196e97, -1 + person_event SPRITE_OAK, 9, 10, OW_UP | $3, $0, -1, -1, $0, 0, ObjectEvent, EVENT_MR_POKEMONS_HOUSE_OAK diff --git a/maps/MrPsychicsHouse.asm b/maps/MrPsychicsHouse.asm index 0a4c811aa..182d7f30c 100644 --- a/maps/MrPsychicsHouse.asm +++ b/maps/MrPsychicsHouse.asm @@ -1,8 +1,8 @@ MrPsychicsHouse_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 MrPsychic: @@ -48,19 +48,19 @@ MrPsychicsHouse_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $7, $2, 5, GROUP_SAFFRON_CITY, MAP_SAFFRON_CITY warp_def $7, $3, 5, GROUP_SAFFRON_CITY, MAP_SAFFRON_CITY - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 2 - signpost 1, 0, $0, MrPsychicsHouseBookshelf - signpost 1, 1, $0, MrPsychicsHouseBookshelf + signpost 1, 0, SIGNPOST_READ, MrPsychicsHouseBookshelf + signpost 1, 1, SIGNPOST_READ, MrPsychicsHouseBookshelf - ; people-events +.PersonEvents: db 1 - person_event SPRITE_FISHING_GURU, 7, 9, $8, $0, 255, 255, $a0, 0, MrPsychic, -1 + person_event SPRITE_FISHING_GURU, 7, 9, OW_LEFT | $0, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, MrPsychic, -1 diff --git a/maps/NationalPark.asm b/maps/NationalPark.asm index dd9f350a1..d352d5ec3 100644 --- a/maps/NationalPark.asm +++ b/maps/NationalPark.asm @@ -1,8 +1,8 @@ NationalPark_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 LassScript_0x5c002: @@ -56,31 +56,15 @@ GameboyKidScript_0x5c037: end TrainerSchoolboyJack1: - ; bit/flag number - dw EVENT_BEAT_SCHOOLBOY_JACK - - ; trainer group && trainer id - db SCHOOLBOY, JACK1 - - ; text when seen - dw SchoolboyJack1SeenText - - ; text when trainer beaten - dw SchoolboyJack1BeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw SchoolboyJack1Script + trainer EVENT_BEAT_SCHOOLBOY_JACK, SCHOOLBOY, JACK1, SchoolboyJack1SeenText, SchoolboyJack1BeatenText, $0000, SchoolboyJack1Script SchoolboyJack1Script: - writecode VAR_CALLERID, $5 + writecode VAR_CALLERID, PHONE_SCHOOLBOY_JACK talkaftercancel loadfont checkflag ENGINE_JACK iftrue UnknownScript_0x5c088 - checkcellnum $5 + checkcellnum PHONE_SCHOOLBOY_JACK iftrue UnknownScript_0x5c108 checkevent EVENT_JACK_ASKED_FOR_PHONE_NUMBER iftrue UnknownScript_0x5c071 @@ -93,7 +77,7 @@ SchoolboyJack1Script: UnknownScript_0x5c071: scall UnknownScript_0x5c100 UnknownScript_0x5c074: - askforphonenumber $5 + askforphonenumber PHONE_SCHOOLBOY_JACK if_equal $1, UnknownScript_0x5c110 if_equal $2, UnknownScript_0x5c10c trainertotext SCHOOLBOY, JACK1, $0 @@ -189,23 +173,7 @@ UnknownScript_0x5c114: end TrainerPokefanmWilliam: - ; bit/flag number - dw EVENT_BEAT_POKEFANM_WILLIAM - - ; trainer group && trainer id - db POKEFANM, WILLIAM - - ; text when seen - dw PokefanmWilliamSeenText - - ; text when trainer beaten - dw PokefanmWilliamBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw PokefanmWilliamScript + trainer EVENT_BEAT_POKEFANM_WILLIAM, POKEFANM, WILLIAM, PokefanmWilliamSeenText, PokefanmWilliamBeatenText, $0000, PokefanmWilliamScript PokefanmWilliamScript: talkaftercancel @@ -216,31 +184,15 @@ PokefanmWilliamScript: end TrainerPokefanfBeverly1: - ; bit/flag number - dw EVENT_BEAT_POKEFANF_BEVERLY - - ; trainer group && trainer id - db POKEFANF, BEVERLY1 - - ; text when seen - dw PokefanfBeverly1SeenText - - ; text when trainer beaten - dw PokefanfBeverly1BeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw PokefanfBeverly1Script + trainer EVENT_BEAT_POKEFANF_BEVERLY, POKEFANF, BEVERLY1, PokefanfBeverly1SeenText, PokefanfBeverly1BeatenText, $0000, PokefanfBeverly1Script PokefanfBeverly1Script: - writecode VAR_CALLERID, $6 + writecode VAR_CALLERID, PHONE_POKEFAN_BEVERLY talkaftercancel loadfont checkflag ENGINE_BEVERLY_HAS_NUGGET iftrue UnknownScript_0x5c177 - checkcellnum $6 + checkcellnum PHONE_POKEFAN_BEVERLY iftrue UnknownScript_0x5c19b checkpoke MARILL iffalse UnknownScript_0x5c189 @@ -255,7 +207,7 @@ PokefanfBeverly1Script: UnknownScript_0x5c160: scall UnknownScript_0x5c193 UnknownScript_0x5c163: - askforphonenumber $6 + askforphonenumber PHONE_POKEFAN_BEVERLY if_equal $1, UnknownScript_0x5c1a3 if_equal $2, UnknownScript_0x5c19f trainertotext POKEFANF, BEVERLY1, $0 @@ -311,23 +263,7 @@ UnknownScript_0x5c1ab: end TrainerLassKrise: - ; bit/flag number - dw EVENT_BEAT_LASS_KRISE - - ; trainer group && trainer id - db LASS, KRISE - - ; text when seen - dw LassKriseSeenText - - ; text when trainer beaten - dw LassKriseBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw LassKriseScript + trainer EVENT_BEAT_LASS_KRISE, LASS, KRISE, LassKriseSeenText, LassKriseBeatenText, $0000, LassKriseScript LassKriseScript: talkaftercancel @@ -353,8 +289,7 @@ ItemFragment_0x5c1ce: db TM_DIG, 1 MapNationalParkSignpostItem2: - dw $0084 - db FULL_HEAL + dwb EVENT_NATIONAL_PARK_HIDDEN_FULL_HEAL, FULL_HEAL UnknownText_0x5c1d3: @@ -567,36 +502,36 @@ NationalPark_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 4 warp_def $12, $21, 1, GROUP_ROUTE_36_NATIONAL_PARK_GATE, MAP_ROUTE_36_NATIONAL_PARK_GATE warp_def $13, $21, 2, GROUP_ROUTE_36_NATIONAL_PARK_GATE, MAP_ROUTE_36_NATIONAL_PARK_GATE warp_def $2f, $a, 1, GROUP_ROUTE_35_NATIONAL_PARK_GATE, MAP_ROUTE_35_NATIONAL_PARK_GATE warp_def $2f, $b, 2, GROUP_ROUTE_35_NATIONAL_PARK_GATE, MAP_ROUTE_35_NATIONAL_PARK_GATE - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 4 - signpost 44, 14, $0, MapNationalParkSignpost0Script - signpost 31, 27, $0, MapNationalParkSignpost1Script - signpost 47, 6, $7, MapNationalParkSignpostItem2 - signpost 4, 12, $0, MapNationalParkSignpost3Script + signpost 44, 14, SIGNPOST_READ, MapNationalParkSignpost0Script + signpost 31, 27, SIGNPOST_READ, MapNationalParkSignpost1Script + signpost 47, 6, SIGNPOST_ITEM, MapNationalParkSignpostItem2 + signpost 4, 12, SIGNPOST_READ, MapNationalParkSignpost3Script - ; people-events +.PersonEvents: db 14 - person_event SPRITE_LASS, 28, 19, $5, $1, 255, 255, $a0, 0, LassScript_0x5c002, -1 - person_event SPRITE_POKEFAN_F, 8, 18, $6, $0, 255, 255, $0, 0, PokefanFScript_0x5c005, -1 - person_event SPRITE_TEACHER, 44, 31, $6, $0, 255, 255, $a0, 0, TeacherScript_0x5c008, -1 - person_event SPRITE_YOUNGSTER, 45, 15, $8, $0, 255, 255, $0, 0, YoungsterScript_0x5c023, -1 - person_event SPRITE_YOUNGSTER, 45, 14, $6, $0, 255, 255, $80, 0, YoungsterScript_0x5c026, -1 - person_event SPRITE_TEACHER, 45, 21, $2, $21, 255, 255, $0, 0, TeacherScript_0x5c029, -1 - person_event SPRITE_GROWLITHE, 44, 30, $16, $0, 255, 255, $0, 0, GrowlitheScript_0x5c02c, -1 - person_event SPRITE_YOUNGSTER, 27, 31, $a, $0, 255, 255, $92, 3, TrainerSchoolboyJack1, -1 - person_event SPRITE_POKEFAN_F, 33, 22, $a, $0, 255, 255, $82, 2, TrainerPokefanfBeverly1, -1 - person_event SPRITE_POKEFAN_M, 13, 20, $a, $0, 255, 255, $82, 2, TrainerPokefanmWilliam, -1 - person_event SPRITE_LASS, 18, 12, $a, $0, 255, 255, $92, 3, TrainerLassKrise, -1 - person_event SPRITE_POKE_BALL, 16, 39, $1, $0, 255, 255, $1, 0, ItemFragment_0x5c1cc, EVENT_658 - person_event SPRITE_GAMEBOY_KID, 10, 30, $6, $0, 255, 255, $0, 0, GameboyKidScript_0x5c037, -1 - person_event SPRITE_POKE_BALL, 47, 5, $1, $0, 255, 255, $1, 0, ItemFragment_0x5c1ce, EVENT_659 + person_event SPRITE_LASS, 28, 19, OW_UP | $1, $1, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, LassScript_0x5c002, -1 + person_event SPRITE_POKEFAN_F, 8, 18, OW_UP | $2, $0, -1, -1, $0, 0, PokefanFScript_0x5c005, -1 + person_event SPRITE_TEACHER, 44, 31, OW_UP | $2, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, TeacherScript_0x5c008, -1 + person_event SPRITE_YOUNGSTER, 45, 15, OW_LEFT | $0, $0, -1, -1, $0, 0, YoungsterScript_0x5c023, -1 + person_event SPRITE_YOUNGSTER, 45, 14, OW_UP | $2, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, YoungsterScript_0x5c026, -1 + person_event SPRITE_TEACHER, 45, 21, OW_DOWN | $2, $21, -1, -1, $0, 0, TeacherScript_0x5c029, -1 + person_event SPRITE_GROWLITHE, 44, 30, OW_UP | $12, $0, -1, -1, $0, 0, GrowlitheScript_0x5c02c, -1 + person_event SPRITE_YOUNGSTER, 27, 31, OW_LEFT | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 3, TrainerSchoolboyJack1, -1 + person_event SPRITE_POKEFAN_F, 33, 22, OW_LEFT | $2, $0, -1, -1, (PAL_OW_RED << 4) | $82, 2, TrainerPokefanfBeverly1, -1 + person_event SPRITE_POKEFAN_M, 13, 20, OW_LEFT | $2, $0, -1, -1, (PAL_OW_RED << 4) | $82, 2, TrainerPokefanmWilliam, -1 + person_event SPRITE_LASS, 18, 12, OW_LEFT | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 3, TrainerLassKrise, -1 + person_event SPRITE_POKE_BALL, 16, 39, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x5c1cc, EVENT_NATIONAL_PARK_PARLYZ_HEAL + person_event SPRITE_GAMEBOY_KID, 10, 30, OW_UP | $2, $0, -1, -1, $0, 0, GameboyKidScript_0x5c037, -1 + person_event SPRITE_POKE_BALL, 47, 5, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x5c1ce, EVENT_NATIONAL_PARK_TM_DIG diff --git a/maps/NationalParkBugContest.asm b/maps/NationalParkBugContest.asm index 990a26a99..fb31d0bbd 100644 --- a/maps/NationalParkBugContest.asm +++ b/maps/NationalParkBugContest.asm @@ -1,8 +1,8 @@ NationalParkBugContest_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 YoungsterScript_0x5c8ec: @@ -101,8 +101,7 @@ ItemFragment_0x5c947: db TM_DIG, 1 MapNationalParkBugContestSignpostItem2: - dw $0084 - db FULL_HEAL + dwb EVENT_NATIONAL_PARK_HIDDEN_FULL_HEAL, FULL_HEAL UnknownText_0x5c94c: @@ -212,34 +211,34 @@ NationalParkBugContest_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 4 warp_def $12, $21, 1, GROUP_ROUTE_36_NATIONAL_PARK_GATE, MAP_ROUTE_36_NATIONAL_PARK_GATE warp_def $13, $21, 1, GROUP_ROUTE_36_NATIONAL_PARK_GATE, MAP_ROUTE_36_NATIONAL_PARK_GATE warp_def $2f, $a, 1, GROUP_ROUTE_35_NATIONAL_PARK_GATE, MAP_ROUTE_35_NATIONAL_PARK_GATE warp_def $2f, $b, 1, GROUP_ROUTE_35_NATIONAL_PARK_GATE, MAP_ROUTE_35_NATIONAL_PARK_GATE - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 4 - signpost 44, 14, $0, MapNationalParkBugContestSignpost0Script - signpost 31, 27, $0, MapNationalParkBugContestSignpost1Script - signpost 47, 6, $7, MapNationalParkBugContestSignpostItem2 - signpost 4, 12, $0, MapNationalParkBugContestSignpost3Script + signpost 44, 14, SIGNPOST_READ, MapNationalParkBugContestSignpost0Script + signpost 31, 27, SIGNPOST_READ, MapNationalParkBugContestSignpost1Script + signpost 47, 6, SIGNPOST_ITEM, MapNationalParkBugContestSignpostItem2 + signpost 4, 12, SIGNPOST_READ, MapNationalParkBugContestSignpost3Script - ; people-events +.PersonEvents: db 12 - person_event SPRITE_YOUNGSTER, 33, 23, $2, $22, 255, 255, $80, 0, YoungsterScript_0x5c8ec, EVENT_716 - person_event SPRITE_YOUNGSTER, 26, 32, $2, $22, 255, 255, $a0, 0, YoungsterScript_0x5c8f4, EVENT_717 - person_event SPRITE_ROCKER, 22, 13, $7, $0, 255, 255, $90, 0, RockerScript_0x5c8fc, EVENT_718 - person_event SPRITE_POKEFAN_M, 17, 11, $4, $1, 255, 255, $b0, 0, PokefanMScript_0x5c904, EVENT_719 - person_event SPRITE_YOUNGSTER, 13, 27, $3, $0, 255, 255, $80, 0, YoungsterScript_0x5c90c, EVENT_71A - person_event SPRITE_YOUNGSTER, 17, 31, $2, $33, 255, 255, $a0, 0, YoungsterScript_0x5c914, EVENT_71B - person_event SPRITE_LASS, 27, 11, $5, $2, 255, 255, $90, 0, LassScript_0x5c91c, EVENT_71C - person_event SPRITE_YOUNGSTER, 31, 15, $2, $11, 255, 255, $80, 0, YoungsterScript_0x5c924, EVENT_71D - person_event SPRITE_YOUNGSTER, 12, 20, $2, $11, 255, 255, $a0, 0, YoungsterScript_0x5c92c, EVENT_71E - person_event SPRITE_YOUNGSTER, 38, 21, $2, $33, 255, 255, $90, 0, YoungsterScript_0x5c934, EVENT_71F - person_event SPRITE_POKE_BALL, 16, 39, $1, $0, 255, 255, $1, 0, ItemFragment_0x5c945, EVENT_658 - person_event SPRITE_POKE_BALL, 47, 5, $1, $0, 255, 255, $1, 0, ItemFragment_0x5c947, EVENT_659 + person_event SPRITE_YOUNGSTER, 33, 23, OW_DOWN | $2, $22, -1, -1, (PAL_OW_RED << 4) | $80, 0, YoungsterScript_0x5c8ec, EVENT_BUG_CATCHING_CONTESTANT_1A + person_event SPRITE_YOUNGSTER, 26, 32, OW_DOWN | $2, $22, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, YoungsterScript_0x5c8f4, EVENT_BUG_CATCHING_CONTESTANT_2A + person_event SPRITE_ROCKER, 22, 13, OW_UP | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, RockerScript_0x5c8fc, EVENT_BUG_CATCHING_CONTESTANT_3A + person_event SPRITE_POKEFAN_M, 17, 11, OW_UP | $0, $1, -1, -1, (PAL_OW_BROWN << 4) | $80, 0, PokefanMScript_0x5c904, EVENT_BUG_CATCHING_CONTESTANT_4A + person_event SPRITE_YOUNGSTER, 13, 27, OW_DOWN | $3, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, YoungsterScript_0x5c90c, EVENT_BUG_CATCHING_CONTESTANT_5A + person_event SPRITE_YOUNGSTER, 17, 31, OW_DOWN | $2, $33, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, YoungsterScript_0x5c914, EVENT_BUG_CATCHING_CONTESTANT_6A + person_event SPRITE_LASS, 27, 11, OW_UP | $1, $2, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, LassScript_0x5c91c, EVENT_BUG_CATCHING_CONTESTANT_7A + person_event SPRITE_YOUNGSTER, 31, 15, OW_DOWN | $2, $11, -1, -1, (PAL_OW_RED << 4) | $80, 0, YoungsterScript_0x5c924, EVENT_BUG_CATCHING_CONTESTANT_8A + person_event SPRITE_YOUNGSTER, 12, 20, OW_DOWN | $2, $11, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, YoungsterScript_0x5c92c, EVENT_BUG_CATCHING_CONTESTANT_9A + person_event SPRITE_YOUNGSTER, 38, 21, OW_DOWN | $2, $33, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, YoungsterScript_0x5c934, EVENT_BUG_CATCHING_CONTESTANT_10A + person_event SPRITE_POKE_BALL, 16, 39, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x5c945, EVENT_NATIONAL_PARK_PARLYZ_HEAL + person_event SPRITE_POKE_BALL, 47, 5, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x5c947, EVENT_NATIONAL_PARK_TM_DIG diff --git a/maps/NewBarkTown.asm b/maps/NewBarkTown.asm index 0723dcf73..9513b4104 100644 --- a/maps/NewBarkTown.asm +++ b/maps/NewBarkTown.asm @@ -1,12 +1,12 @@ NewBarkTown_MapScriptHeader: - ; trigger count +.MapTriggers: db 2 ; triggers dw .Trigger1, $0000 dw .Trigger2, $0000 - ; callback count +.MapCallbacks: db 1 ; callbacks @@ -20,7 +20,7 @@ NewBarkTown_MapScriptHeader: .FlyPoint setflag ENGINE_FLYPOINT_NEW_BARK - clearevent EVENT_076 + clearevent EVENT_FIRST_TIME_BANKING_WITH_MOM return UnknownScript_0x1a8016: @@ -284,27 +284,27 @@ NewBarkTown_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 4 warp_def $3, $6, 1, GROUP_ELMS_LAB, MAP_ELMS_LAB warp_def $5, $d, 1, GROUP_KRISS_HOUSE_1F, MAP_KRISS_HOUSE_1F warp_def $b, $3, 1, GROUP_KRISS_NEIGHBORS_HOUSE, MAP_KRISS_NEIGHBORS_HOUSE warp_def $d, $b, 1, GROUP_ELMS_HOUSE, MAP_ELMS_HOUSE - ; xy triggers +.XYTriggers: db 2 xy_trigger 0, $8, $1, $0, UnknownScript_0x1a8016, $0, $0 xy_trigger 0, $9, $1, $0, UnknownScript_0x1a8041, $0, $0 - ; signposts +.Signposts: db 4 - signpost 8, 8, $0, MapNewBarkTownSignpost0Script - signpost 5, 11, $0, MapNewBarkTownSignpost1Script - signpost 3, 3, $0, MapNewBarkTownSignpost2Script - signpost 13, 9, $0, MapNewBarkTownSignpost3Script + signpost 8, 8, SIGNPOST_READ, MapNewBarkTownSignpost0Script + signpost 5, 11, SIGNPOST_READ, MapNewBarkTownSignpost1Script + signpost 3, 3, SIGNPOST_READ, MapNewBarkTownSignpost2Script + signpost 13, 9, SIGNPOST_READ, MapNewBarkTownSignpost3Script - ; people-events +.PersonEvents: db 3 - person_event SPRITE_TEACHER, 12, 10, $3, $1, 255, 255, $0, 0, TeacherScript_0x1a806f, -1 - person_event SPRITE_FISHER, 13, 16, $4, $10, 255, 255, $a0, 0, FisherScript_0x1a809b, -1 - person_event SPRITE_SILVER, 6, 7, $9, $0, 255, 255, $0, 0, SilverScript_0x1a809e, EVENT_6BD + person_event SPRITE_TEACHER, 12, 10, OW_DOWN | $3, $1, -1, -1, $0, 0, TeacherScript_0x1a806f, -1 + person_event SPRITE_FISHER, 13, 16, OW_UP | $0, $10, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, FisherScript_0x1a809b, -1 + person_event SPRITE_SILVER, 6, 7, OW_LEFT | $1, $0, -1, -1, $0, 0, SilverScript_0x1a809e, EVENT_RIVAL_NEW_BARK_TOWN diff --git a/maps/OaksLab.asm b/maps/OaksLab.asm index 2552601cb..7f78384a9 100644 --- a/maps/OaksLab.asm +++ b/maps/OaksLab.asm @@ -1,8 +1,8 @@ OaksLab_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 UnknownScript_0x19b3c7: @@ -254,36 +254,36 @@ OaksLab_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $b, $4, 3, GROUP_PALLET_TOWN, MAP_PALLET_TOWN warp_def $b, $5, 3, GROUP_PALLET_TOWN, MAP_PALLET_TOWN - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 16 - signpost 1, 6, $0, OaksLabBookshelf - signpost 1, 7, $0, OaksLabBookshelf - signpost 1, 8, $0, OaksLabBookshelf - signpost 1, 9, $0, OaksLabBookshelf - signpost 7, 0, $0, OaksLabBookshelf - signpost 7, 1, $0, OaksLabBookshelf - signpost 7, 2, $0, OaksLabBookshelf - signpost 7, 3, $0, OaksLabBookshelf - signpost 7, 6, $0, OaksLabBookshelf - signpost 7, 7, $0, OaksLabBookshelf - signpost 7, 8, $0, OaksLabBookshelf - signpost 7, 9, $0, OaksLabBookshelf - signpost 0, 4, $0, OaksLabPoster1 - signpost 0, 5, $0, OaksLabPoster2 - signpost 3, 9, $0, OaksLabTrashcan - signpost 1, 0, $0, OaksLabPC - - ; people-events + signpost 1, 6, SIGNPOST_READ, OaksLabBookshelf + signpost 1, 7, SIGNPOST_READ, OaksLabBookshelf + signpost 1, 8, SIGNPOST_READ, OaksLabBookshelf + signpost 1, 9, SIGNPOST_READ, OaksLabBookshelf + signpost 7, 0, SIGNPOST_READ, OaksLabBookshelf + signpost 7, 1, SIGNPOST_READ, OaksLabBookshelf + signpost 7, 2, SIGNPOST_READ, OaksLabBookshelf + signpost 7, 3, SIGNPOST_READ, OaksLabBookshelf + signpost 7, 6, SIGNPOST_READ, OaksLabBookshelf + signpost 7, 7, SIGNPOST_READ, OaksLabBookshelf + signpost 7, 8, SIGNPOST_READ, OaksLabBookshelf + signpost 7, 9, SIGNPOST_READ, OaksLabBookshelf + signpost 0, 4, SIGNPOST_READ, OaksLabPoster1 + signpost 0, 5, SIGNPOST_READ, OaksLabPoster2 + signpost 3, 9, SIGNPOST_READ, OaksLabTrashcan + signpost 1, 0, SIGNPOST_READ, OaksLabPC + +.PersonEvents: db 4 - person_event SPRITE_OAK, 6, 8, $6, $0, 255, 255, $0, 0, Oak, -1 - person_event SPRITE_SCIENTIST, 12, 5, $5, $1, 255, 255, $90, 0, ScientistScript_0x19b40f, -1 - person_event SPRITE_SCIENTIST, 13, 12, $4, $10, 255, 255, $90, 0, ScientistScript_0x19b412, -1 - person_event SPRITE_SCIENTIST, 8, 5, $2, $11, 255, 255, $90, 0, ScientistScript_0x19b415, -1 + person_event SPRITE_OAK, 6, 8, OW_UP | $2, $0, -1, -1, $0, 0, Oak, -1 + person_event SPRITE_SCIENTIST, 12, 5, OW_UP | $1, $1, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, ScientistScript_0x19b40f, -1 + person_event SPRITE_SCIENTIST, 13, 12, OW_UP | $0, $10, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, ScientistScript_0x19b412, -1 + person_event SPRITE_SCIENTIST, 8, 5, OW_DOWN | $2, $11, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, ScientistScript_0x19b415, -1 diff --git a/maps/OlivineCafe.asm b/maps/OlivineCafe.asm index 8630bc424..31bcb3a96 100644 --- a/maps/OlivineCafe.asm +++ b/maps/OlivineCafe.asm @@ -1,8 +1,8 @@ OlivineCafe_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 SailorScript_0x9c8c1: @@ -77,19 +77,19 @@ OlivineCafe_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $7, $2, 7, GROUP_OLIVINE_CITY, MAP_OLIVINE_CITY warp_def $7, $3, 7, GROUP_OLIVINE_CITY, MAP_OLIVINE_CITY - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 3 - person_event SPRITE_SAILOR, 7, 8, $8, $0, 255, 255, $0, 0, SailorScript_0x9c8c1, -1 - person_event SPRITE_FISHING_GURU, 7, 11, $4, $10, 255, 255, $0, 0, FishingGuruScript_0x9c8d9, -1 - person_event SPRITE_SAILOR, 10, 10, $7, $0, 255, 255, $0, 0, SailorScript_0x9c8dc, -1 + person_event SPRITE_SAILOR, 7, 8, OW_LEFT | $0, $0, -1, -1, $0, 0, SailorScript_0x9c8c1, -1 + person_event SPRITE_FISHING_GURU, 7, 11, OW_UP | $0, $10, -1, -1, $0, 0, FishingGuruScript_0x9c8d9, -1 + person_event SPRITE_SAILOR, 10, 10, OW_UP | $3, $0, -1, -1, $0, 0, SailorScript_0x9c8dc, -1 diff --git a/maps/OlivineCity.asm b/maps/OlivineCity.asm index 302bc8730..5dc18c99f 100644 --- a/maps/OlivineCity.asm +++ b/maps/OlivineCity.asm @@ -1,12 +1,12 @@ OlivineCity_MapScriptHeader: - ; trigger count +.MapTriggers: db 2 ; triggers dw .Trigger1, $0000 dw .Trigger2, $0000 - ; callback count +.MapCallbacks: db 1 ; callbacks @@ -24,7 +24,7 @@ OlivineCity_MapScriptHeader: UnknownScript_0x1a8833: spriteface $0, LEFT - showemote $0, $0, 15 + showemote EMOTE_SHOCK, $0, 15 special Functionc48f pause 15 playsound SFX_ENTER_DOOR @@ -42,13 +42,13 @@ UnknownScript_0x1a8833: dotrigger $1 disappear $5 special RestartMapMusic - variablesprite $5, $31 - special Function14209 + variablesprite SPRITE_OLIVINE_RIVAL, SPRITE_SWIMMER_GUY + special RunCallback_04 end UnknownScript_0x1a886b: spriteface $0, LEFT - showemote $0, $0, 15 + showemote EMOTE_SHOCK, $0, 15 special Functionc48f pause 15 playsound SFX_ENTER_DOOR @@ -66,8 +66,8 @@ UnknownScript_0x1a886b: disappear $5 dotrigger $1 special RestartMapMusic - variablesprite $5, $31 - special Function14209 + variablesprite SPRITE_OLIVINE_RIVAL, SPRITE_SWIMMER_GUY + special RunCallback_04 end SailorScript_0x1a88a3: @@ -289,7 +289,7 @@ OlivineCity_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 11 warp_def $15, $d, 1, GROUP_OLIVINE_POKECENTER_1F, MAP_OLIVINE_POKECENTER_1F warp_def $b, $a, 1, GROUP_OLIVINE_GYM, MAP_OLIVINE_GYM @@ -303,24 +303,24 @@ OlivineCity_MapEventHeader: warp_def $1b, $13, 1, GROUP_OLIVINE_PORT_PASSAGE, MAP_OLIVINE_PORT_PASSAGE warp_def $1b, $14, 2, GROUP_OLIVINE_PORT_PASSAGE, MAP_OLIVINE_PORT_PASSAGE - ; xy triggers +.XYTriggers: db 2 xy_trigger 0, $c, $d, $0, UnknownScript_0x1a8833, $0, $0 xy_trigger 0, $d, $d, $0, UnknownScript_0x1a886b, $0, $0 - ; signposts +.Signposts: db 7 - signpost 11, 17, $0, OlivineCitySign - signpost 24, 20, $0, OlivineCityPortSign - signpost 11, 7, $0, OlivineGymSign - signpost 28, 30, $0, OlivineLighthouseSign - signpost 23, 3, $0, OlivineCityBattleTowerSign - signpost 21, 14, $0, OlivineCityPokeCenterSign - signpost 17, 20, $0, OlivineCityMartSign - - ; people-events + signpost 11, 17, SIGNPOST_READ, OlivineCitySign + signpost 24, 20, SIGNPOST_READ, OlivineCityPortSign + signpost 11, 7, SIGNPOST_READ, OlivineGymSign + signpost 28, 30, SIGNPOST_READ, OlivineLighthouseSign + signpost 23, 3, SIGNPOST_READ, OlivineCityBattleTowerSign + signpost 21, 14, SIGNPOST_READ, OlivineCityPokeCenterSign + signpost 17, 20, SIGNPOST_READ, OlivineCityMartSign + +.PersonEvents: db 4 - person_event SPRITE_SAILOR, 31, 30, $4, $10, 255, 255, $0, 0, SailorScript_0x1a88a3, -1 - person_event SPRITE_STANDING_YOUNGSTER, 17, 24, $3, $0, 255, 255, $80, 0, StandingYoungsterScript_0x1a88a6, -1 - person_event SPRITE_SAILOR, 25, 21, $2, $11, 255, 255, $0, 0, SailorScript_0x1a88ba, -1 - person_event SPRITE_OLIVINE_RIVAL, 15, 14, $6, $0, 255, 255, $0, 0, ObjectEvent, EVENT_6C3 + person_event SPRITE_SAILOR, 31, 30, OW_UP | $0, $10, -1, -1, $0, 0, SailorScript_0x1a88a3, -1 + person_event SPRITE_STANDING_YOUNGSTER, 17, 24, OW_DOWN | $3, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, StandingYoungsterScript_0x1a88a6, -1 + person_event SPRITE_SAILOR, 25, 21, OW_DOWN | $2, $11, -1, -1, $0, 0, SailorScript_0x1a88ba, -1 + person_event SPRITE_OLIVINE_RIVAL, 15, 14, OW_UP | $2, $0, -1, -1, $0, 0, ObjectEvent, EVENT_RIVAL_OLIVINE_CITY diff --git a/maps/OlivineGoodRodHouse.asm b/maps/OlivineGoodRodHouse.asm index b001caf4b..676c074fc 100644 --- a/maps/OlivineGoodRodHouse.asm +++ b/maps/OlivineGoodRodHouse.asm @@ -1,8 +1,8 @@ OlivineGoodRodHouse_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 GoodRodGuru: @@ -83,17 +83,17 @@ OlivineGoodRodHouse_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $7, $2, 6, GROUP_OLIVINE_CITY, MAP_OLIVINE_CITY warp_def $7, $3, 6, GROUP_OLIVINE_CITY, MAP_OLIVINE_CITY - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 1 - person_event SPRITE_FISHING_GURU, 7, 6, $6, $0, 255, 255, $a0, 0, GoodRodGuru, -1 + person_event SPRITE_FISHING_GURU, 7, 6, OW_UP | $2, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, GoodRodGuru, -1 diff --git a/maps/OlivineGym.asm b/maps/OlivineGym.asm index d5bea3769..b1195f8dd 100644 --- a/maps/OlivineGym.asm +++ b/maps/OlivineGym.asm @@ -1,8 +1,8 @@ OlivineGym_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 JasmineScript_0x9c12f: @@ -197,20 +197,20 @@ OlivineGym_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $f, $4, 2, GROUP_OLIVINE_CITY, MAP_OLIVINE_CITY warp_def $f, $5, 2, GROUP_OLIVINE_CITY, MAP_OLIVINE_CITY - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 2 - signpost 13, 3, $0, OlivineGymStatue - signpost 13, 6, $0, OlivineGymStatue + signpost 13, 3, SIGNPOST_READ, OlivineGymStatue + signpost 13, 6, SIGNPOST_READ, OlivineGymStatue - ; people-events +.PersonEvents: db 2 - person_event SPRITE_JASMINE, 7, 9, $6, $0, 255, 255, $80, 0, JasmineScript_0x9c12f, EVENT_6D3 - person_event SPRITE_GYM_GUY, 17, 11, $6, $0, 255, 255, $80, 0, OlivineGymGuyScript, -1 + person_event SPRITE_JASMINE, 7, 9, OW_UP | $2, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, JasmineScript_0x9c12f, EVENT_OLIVINE_GYM_JASMINE + person_event SPRITE_GYM_GUY, 17, 11, OW_UP | $2, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, OlivineGymGuyScript, -1 diff --git a/maps/OlivineHouseBeta.asm b/maps/OlivineHouseBeta.asm index fa11a91a4..9cfac68a2 100644 --- a/maps/OlivineHouseBeta.asm +++ b/maps/OlivineHouseBeta.asm @@ -1,8 +1,8 @@ OlivineHouseBeta_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 TeacherScript_0x9c58f: @@ -39,20 +39,20 @@ OlivineHouseBeta_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $7, $2, 4, GROUP_OLIVINE_CITY, MAP_OLIVINE_CITY warp_def $7, $3, 4, GROUP_OLIVINE_CITY, MAP_OLIVINE_CITY - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 2 - signpost 1, 0, $0, OlivineHouseBetaBookshelf1 - signpost 1, 1, $0, OlivineHouseBetaBookshelf2 + signpost 1, 0, SIGNPOST_READ, OlivineHouseBetaBookshelf1 + signpost 1, 1, SIGNPOST_READ, OlivineHouseBetaBookshelf2 - ; people-events +.PersonEvents: db 2 - person_event SPRITE_TEACHER, 7, 6, $3, $0, 255, 255, $0, 0, TeacherScript_0x9c58f, -1 - person_event SPRITE_RHYDON, 8, 10, $4, $20, 255, 255, $0, 0, RhydonScript_0x9c592, -1 + person_event SPRITE_TEACHER, 7, 6, OW_DOWN | $3, $0, -1, -1, $0, 0, TeacherScript_0x9c58f, -1 + person_event SPRITE_RHYDON, 8, 10, OW_UP | $0, $20, -1, -1, $0, 0, RhydonScript_0x9c592, -1 diff --git a/maps/OlivineLighthouse1F.asm b/maps/OlivineLighthouse1F.asm index 093292b1a..d63d7b039 100644 --- a/maps/OlivineLighthouse1F.asm +++ b/maps/OlivineLighthouse1F.asm @@ -1,8 +1,8 @@ OlivineLighthouse1F_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 SailorScript_0x5ae67: @@ -36,7 +36,7 @@ OlivineLighthouse1F_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 5 warp_def $11, $a, 9, GROUP_OLIVINE_CITY, MAP_OLIVINE_CITY warp_def $11, $b, 9, GROUP_OLIVINE_CITY, MAP_OLIVINE_CITY @@ -44,13 +44,13 @@ OlivineLighthouse1F_MapEventHeader: warp_def $d, $10, 3, GROUP_OLIVINE_LIGHTHOUSE_2F, MAP_OLIVINE_LIGHTHOUSE_2F warp_def $d, $11, 4, GROUP_OLIVINE_LIGHTHOUSE_2F, MAP_OLIVINE_LIGHTHOUSE_2F - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 2 - person_event SPRITE_SAILOR, 6, 12, $6, $0, 255, 255, $0, 0, SailorScript_0x5ae67, -1 - person_event SPRITE_POKEFAN_F, 13, 20, $4, $20, 255, 255, $0, 0, PokefanFScript_0x5ae6a, -1 + person_event SPRITE_SAILOR, 6, 12, OW_UP | $2, $0, -1, -1, $0, 0, SailorScript_0x5ae67, -1 + person_event SPRITE_POKEFAN_F, 13, 20, OW_UP | $0, $20, -1, -1, $0, 0, PokefanFScript_0x5ae6a, -1 diff --git a/maps/OlivineLighthouse2F.asm b/maps/OlivineLighthouse2F.asm index 09b7f7db3..2fd90734b 100644 --- a/maps/OlivineLighthouse2F.asm +++ b/maps/OlivineLighthouse2F.asm @@ -1,28 +1,12 @@ OlivineLighthouse2F_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 TrainerGentlemanAlfred: - ; bit/flag number - dw EVENT_BEAT_GENTLEMAN_ALFRED - - ; trainer group && trainer id - db GENTLEMAN, ALFRED - - ; text when seen - dw GentlemanAlfredSeenText - - ; text when trainer beaten - dw GentlemanAlfredBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw GentlemanAlfredScript + trainer EVENT_BEAT_GENTLEMAN_ALFRED, GENTLEMAN, ALFRED, GentlemanAlfredSeenText, GentlemanAlfredBeatenText, $0000, GentlemanAlfredScript GentlemanAlfredScript: talkaftercancel @@ -33,31 +17,15 @@ GentlemanAlfredScript: end TrainerSailorHuey1: - ; bit/flag number - dw EVENT_BEAT_SAILOR_HUEY - - ; trainer group && trainer id - db SAILOR, HUEY1 - - ; text when seen - dw SailorHuey1SeenText - - ; text when trainer beaten - dw SailorHuey1BeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw SailorHuey1Script + trainer EVENT_BEAT_SAILOR_HUEY, SAILOR, HUEY1, SailorHuey1SeenText, SailorHuey1BeatenText, $0000, SailorHuey1Script SailorHuey1Script: - writecode VAR_CALLERID, $7 + writecode VAR_CALLERID, PHONE_SAILOR_HUEY talkaftercancel loadfont checkflag ENGINE_HUEY iftrue UnknownScript_0x5afc7 - checkcellnum $7 + checkcellnum PHONE_SAILOR_HUEY iftrue UnknownScript_0x5b05f checkevent EVENT_HUEY_ASKED_FOR_PHONE_NUMBER iftrue UnknownScript_0x5afb0 @@ -68,7 +36,7 @@ SailorHuey1Script: UnknownScript_0x5afb0: scall UnknownScript_0x5b057 UnknownScript_0x5afb3: - askforphonenumber $7 + askforphonenumber PHONE_SAILOR_HUEY if_equal $1, UnknownScript_0x5b067 if_equal $2, UnknownScript_0x5b063 trainertotext SAILOR, HUEY1, $0 @@ -236,7 +204,7 @@ OlivineLighthouse2F_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 6 warp_def $b, $3, 3, GROUP_OLIVINE_LIGHTHOUSE_1F, MAP_OLIVINE_LIGHTHOUSE_1F warp_def $3, $5, 2, GROUP_OLIVINE_LIGHTHOUSE_3F, MAP_OLIVINE_LIGHTHOUSE_3F @@ -245,13 +213,13 @@ OlivineLighthouse2F_MapEventHeader: warp_def $b, $10, 4, GROUP_OLIVINE_LIGHTHOUSE_3F, MAP_OLIVINE_LIGHTHOUSE_3F warp_def $b, $11, 5, GROUP_OLIVINE_LIGHTHOUSE_3F, MAP_OLIVINE_LIGHTHOUSE_3F - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 2 - person_event SPRITE_SAILOR, 7, 13, $9, $0, 255, 255, $92, 3, TrainerSailorHuey1, -1 - person_event SPRITE_GENTLEMAN, 12, 21, $8, $0, 255, 255, $92, 3, TrainerGentlemanAlfred, -1 + person_event SPRITE_SAILOR, 7, 13, OW_LEFT | $1, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 3, TrainerSailorHuey1, -1 + person_event SPRITE_GENTLEMAN, 12, 21, OW_LEFT | $0, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 3, TrainerGentlemanAlfred, -1 diff --git a/maps/OlivineLighthouse3F.asm b/maps/OlivineLighthouse3F.asm index 81f718406..e3603d91b 100644 --- a/maps/OlivineLighthouse3F.asm +++ b/maps/OlivineLighthouse3F.asm @@ -1,28 +1,12 @@ OlivineLighthouse3F_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 TrainerBird_keeperTheo: - ; bit/flag number - dw EVENT_BEAT_BIRD_KEEPER_THEO - - ; trainer group && trainer id - db BIRD_KEEPER, THEO - - ; text when seen - dw Bird_keeperTheoSeenText - - ; text when trainer beaten - dw Bird_keeperTheoBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw Bird_keeperTheoScript + trainer EVENT_BEAT_BIRD_KEEPER_THEO, BIRD_KEEPER, THEO, Bird_keeperTheoSeenText, Bird_keeperTheoBeatenText, $0000, Bird_keeperTheoScript Bird_keeperTheoScript: talkaftercancel @@ -33,23 +17,7 @@ Bird_keeperTheoScript: end TrainerGentlemanPreston: - ; bit/flag number - dw EVENT_BEAT_GENTLEMAN_PRESTON - - ; trainer group && trainer id - db GENTLEMAN, PRESTON - - ; text when seen - dw GentlemanPrestonSeenText - - ; text when trainer beaten - dw GentlemanPrestonBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw GentlemanPrestonScript + trainer EVENT_BEAT_GENTLEMAN_PRESTON, GENTLEMAN, PRESTON, GentlemanPrestonSeenText, GentlemanPrestonBeatenText, $0000, GentlemanPrestonScript GentlemanPrestonScript: talkaftercancel @@ -60,23 +28,7 @@ GentlemanPrestonScript: end TrainerSailorTerrell: - ; bit/flag number - dw EVENT_BEAT_SAILOR_TERRELL - - ; trainer group && trainer id - db SAILOR, TERRELL - - ; text when seen - dw SailorTerrellSeenText - - ; text when trainer beaten - dw SailorTerrellBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw SailorTerrellScript + trainer EVENT_BEAT_SAILOR_TERRELL, SAILOR, TERRELL, SailorTerrellSeenText, SailorTerrellBeatenText, $0000, SailorTerrellScript SailorTerrellScript: talkaftercancel @@ -158,7 +110,7 @@ OlivineLighthouse3F_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 9 warp_def $3, $d, 1, GROUP_OLIVINE_LIGHTHOUSE_4F, MAP_OLIVINE_LIGHTHOUSE_4F warp_def $3, $5, 2, GROUP_OLIVINE_LIGHTHOUSE_2F, MAP_OLIVINE_LIGHTHOUSE_2F @@ -170,15 +122,15 @@ OlivineLighthouse3F_MapEventHeader: warp_def $3, $8, 7, GROUP_OLIVINE_LIGHTHOUSE_4F, MAP_OLIVINE_LIGHTHOUSE_4F warp_def $3, $9, 8, GROUP_OLIVINE_LIGHTHOUSE_4F, MAP_OLIVINE_LIGHTHOUSE_4F - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 4 - person_event SPRITE_SAILOR, 6, 13, $6, $0, 255, 255, $92, 1, TrainerSailorTerrell, -1 - person_event SPRITE_GENTLEMAN, 9, 17, $9, $0, 255, 255, $92, 4, TrainerGentlemanPreston, -1 - person_event SPRITE_YOUNGSTER, 13, 7, $7, $0, 255, 255, $92, 3, TrainerBird_keeperTheo, -1 - person_event SPRITE_POKE_BALL, 6, 12, $1, $0, 255, 255, $1, 0, ItemFragment_0x5b279, EVENT_664 + person_event SPRITE_SAILOR, 6, 13, OW_UP | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 1, TrainerSailorTerrell, -1 + person_event SPRITE_GENTLEMAN, 9, 17, OW_LEFT | $1, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 4, TrainerGentlemanPreston, -1 + person_event SPRITE_YOUNGSTER, 13, 7, OW_UP | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 3, TrainerBird_keeperTheo, -1 + person_event SPRITE_POKE_BALL, 6, 12, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x5b279, EVENT_OLIVINE_LIGHTHOUSE_3F_ETHER diff --git a/maps/OlivineLighthouse4F.asm b/maps/OlivineLighthouse4F.asm index 497917a69..4b62a34bd 100644 --- a/maps/OlivineLighthouse4F.asm +++ b/maps/OlivineLighthouse4F.asm @@ -1,28 +1,12 @@ OlivineLighthouse4F_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 TrainerLassConnie: - ; bit/flag number - dw EVENT_BEAT_LASS_CONNIE - - ; trainer group && trainer id - db LASS, CONNIE1 - - ; text when seen - dw LassConnie1SeenText - - ; text when trainer beaten - dw LassConnie1BeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw LassConnie1Script + trainer EVENT_BEAT_LASS_CONNIE, LASS, CONNIE1, LassConnie1SeenText, LassConnie1BeatenText, $0000, LassConnie1Script LassConnie1Script: talkaftercancel @@ -33,23 +17,7 @@ LassConnie1Script: end TrainerSailorKent: - ; bit/flag number - dw EVENT_BEAT_SAILOR_KENT - - ; trainer group && trainer id - db SAILOR, KENT - - ; text when seen - dw SailorKentSeenText - - ; text when trainer beaten - dw SailorKentBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw SailorKentScript + trainer EVENT_BEAT_SAILOR_KENT, SAILOR, KENT, SailorKentSeenText, SailorKentBeatenText, $0000, SailorKentScript SailorKentScript: talkaftercancel @@ -113,7 +81,7 @@ OlivineLighthouse4F_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 10 warp_def $3, $d, 1, GROUP_OLIVINE_LIGHTHOUSE_3F, MAP_OLIVINE_LIGHTHOUSE_3F warp_def $5, $3, 2, GROUP_OLIVINE_LIGHTHOUSE_5F, MAP_OLIVINE_LIGHTHOUSE_5F @@ -126,13 +94,13 @@ OlivineLighthouse4F_MapEventHeader: warp_def $7, $10, 4, GROUP_OLIVINE_LIGHTHOUSE_5F, MAP_OLIVINE_LIGHTHOUSE_5F warp_def $7, $11, 5, GROUP_OLIVINE_LIGHTHOUSE_5F, MAP_OLIVINE_LIGHTHOUSE_5F - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 2 - person_event SPRITE_SAILOR, 18, 11, $8, $0, 255, 255, $92, 3, TrainerSailorKent, -1 - person_event SPRITE_LASS, 6, 15, $6, $0, 255, 255, $92, 1, TrainerLassConnie, -1 + person_event SPRITE_SAILOR, 18, 11, OW_LEFT | $0, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 3, TrainerSailorKent, -1 + person_event SPRITE_LASS, 6, 15, OW_UP | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 1, TrainerLassConnie, -1 diff --git a/maps/OlivineLighthouse5F.asm b/maps/OlivineLighthouse5F.asm index 3d667716f..7bc8285c5 100644 --- a/maps/OlivineLighthouse5F.asm +++ b/maps/OlivineLighthouse5F.asm @@ -1,28 +1,12 @@ OlivineLighthouse5F_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 TrainerBird_keeperDenis: - ; bit/flag number - dw EVENT_BEAT_BIRD_KEEPER_DENIS - - ; trainer group && trainer id - db BIRD_KEEPER, DENIS - - ; text when seen - dw Bird_keeperDenisSeenText - - ; text when trainer beaten - dw Bird_keeperDenisBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw Bird_keeperDenisScript + trainer EVENT_BEAT_BIRD_KEEPER_DENIS, BIRD_KEEPER, DENIS, Bird_keeperDenisSeenText, Bird_keeperDenisBeatenText, $0000, Bird_keeperDenisScript Bird_keeperDenisScript: talkaftercancel @@ -33,23 +17,7 @@ Bird_keeperDenisScript: end TrainerSailorErnest: - ; bit/flag number - dw EVENT_BEAT_SAILOR_ERNEST - - ; trainer group && trainer id - db SAILOR, ERNEST - - ; text when seen - dw SailorErnestSeenText - - ; text when trainer beaten - dw SailorErnestBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw SailorErnestScript + trainer EVENT_BEAT_SAILOR_ERNEST, SAILOR, ERNEST, SailorErnestSeenText, SailorErnestBeatenText, $0000, SailorErnestScript SailorErnestScript: talkaftercancel @@ -69,8 +37,7 @@ ItemFragment_0x609ae: db TM_SWAGGER, 1 MapOlivineLighthouse5FSignpostItem0: - dw $0085 - db HYPER_POTION + dwb EVENT_OLIVINE_LIGHTHOUSE_5F_HIDDEN_HYPER_POTION, HYPER_POTION SailorErnestSeenText: @@ -121,7 +88,7 @@ OlivineLighthouse5F_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 7 warp_def $f, $9, 1, GROUP_OLIVINE_LIGHTHOUSE_6F, MAP_OLIVINE_LIGHTHOUSE_6F warp_def $5, $3, 2, GROUP_OLIVINE_LIGHTHOUSE_4F, MAP_OLIVINE_LIGHTHOUSE_4F @@ -131,17 +98,17 @@ OlivineLighthouse5F_MapEventHeader: warp_def $5, $10, 2, GROUP_OLIVINE_LIGHTHOUSE_6F, MAP_OLIVINE_LIGHTHOUSE_6F warp_def $5, $11, 3, GROUP_OLIVINE_LIGHTHOUSE_6F, MAP_OLIVINE_LIGHTHOUSE_6F - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 1 - signpost 13, 3, $7, MapOlivineLighthouse5FSignpostItem0 + signpost 13, 3, SIGNPOST_ITEM, MapOlivineLighthouse5FSignpostItem0 - ; people-events +.PersonEvents: db 5 - person_event SPRITE_SAILOR, 15, 12, $a, $0, 255, 255, $92, 3, TrainerSailorErnest, -1 - person_event SPRITE_YOUNGSTER, 7, 12, $8, $0, 255, 255, $92, 4, TrainerBird_keeperDenis, -1 - person_event SPRITE_POKE_BALL, 16, 19, $1, $0, 255, 255, $1, 0, ItemFragment_0x609aa, EVENT_665 - person_event SPRITE_POKE_BALL, 19, 10, $1, $0, 255, 255, $1, 0, ItemFragment_0x609ac, EVENT_666 - person_event SPRITE_POKE_BALL, 17, 6, $1, $0, 255, 255, $1, 0, ItemFragment_0x609ae, EVENT_667 + person_event SPRITE_SAILOR, 15, 12, OW_LEFT | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 3, TrainerSailorErnest, -1 + person_event SPRITE_YOUNGSTER, 7, 12, OW_LEFT | $0, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 4, TrainerBird_keeperDenis, -1 + person_event SPRITE_POKE_BALL, 16, 19, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x609aa, EVENT_OLIVINE_LIGHTHOUSE_5F_RARE_CANDY + person_event SPRITE_POKE_BALL, 19, 10, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x609ac, EVENT_OLIVINE_LIGHTHOUSE_5F_SUPER_REPEL + person_event SPRITE_POKE_BALL, 17, 6, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x609ae, EVENT_OLIVINE_LIGHTHOUSE_5F_TM_SWAGGER diff --git a/maps/OlivineLighthouse6F.asm b/maps/OlivineLighthouse6F.asm index 2705159d3..bdb351af7 100644 --- a/maps/OlivineLighthouse6F.asm +++ b/maps/OlivineLighthouse6F.asm @@ -1,8 +1,8 @@ OlivineLighthouse6F_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 JasmineScript_0x60b91: @@ -42,9 +42,9 @@ UnknownScript_0x60bab: loadmovesprites special RestartMapMusic cry AMPHAROS - special Function8c084 + special FadeBlackBGMap pause 10 - special Function8c079 + special FadeInBGMap loadfont writetext UnknownText_0x60f3d closetext @@ -63,7 +63,7 @@ UnknownScript_0x60bab: closetext loadmovesprites setevent EVENT_JASMINE_RETURNED_TO_GYM - clearevent EVENT_6D3 + clearevent EVENT_OLIVINE_GYM_JASMINE checkcode VAR_FACING if_equal $0, UnknownScript_0x60c17 if_equal $3, UnknownScript_0x60c1e @@ -116,10 +116,10 @@ UnknownScript_0x60c51: cry AMPHAROS closetext loadmovesprites - special Function8c084 - special Function8c079 - special Function8c084 - special Function8c079 + special FadeBlackBGMap + special FadeInBGMap + special FadeBlackBGMap + special FadeInBGMap end ItemFragment_0x60c66: @@ -256,20 +256,20 @@ OlivineLighthouse6F_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 3 warp_def $f, $9, 1, GROUP_OLIVINE_LIGHTHOUSE_5F, MAP_OLIVINE_LIGHTHOUSE_5F warp_def $5, $10, 6, GROUP_OLIVINE_LIGHTHOUSE_5F, MAP_OLIVINE_LIGHTHOUSE_5F warp_def $5, $11, 7, GROUP_OLIVINE_LIGHTHOUSE_5F, MAP_OLIVINE_LIGHTHOUSE_5F - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 3 - person_event SPRITE_JASMINE, 12, 12, $6, $0, 255, 255, $80, 0, JasmineScript_0x60b91, EVENT_6D2 - person_event SPRITE_MONSTER, 12, 13, $6, $0, 255, 255, $b0, 0, MonsterScript_0x60c3a, -1 - person_event SPRITE_POKE_BALL, 8, 7, $1, $0, 255, 255, $1, 0, ItemFragment_0x60c66, EVENT_668 + person_event SPRITE_JASMINE, 12, 12, OW_UP | $2, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, JasmineScript_0x60b91, EVENT_OLIVINE_LIGHTHOUSE_JASMINE + person_event SPRITE_MONSTER, 12, 13, OW_UP | $2, $0, -1, -1, (PAL_OW_BROWN << 4) | $80, 0, MonsterScript_0x60c3a, -1 + person_event SPRITE_POKE_BALL, 8, 7, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x60c66, EVENT_OLIVINE_LIGHTHOUSE_6F_SUPER_POTION diff --git a/maps/OlivineMart.asm b/maps/OlivineMart.asm index 8bcca8c3f..f8910aceb 100644 --- a/maps/OlivineMart.asm +++ b/maps/OlivineMart.asm @@ -1,8 +1,8 @@ OlivineMart_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 ClerkScript_0x9cac7: @@ -44,19 +44,19 @@ OlivineMart_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $7, $2, 8, GROUP_OLIVINE_CITY, MAP_OLIVINE_CITY warp_def $7, $3, 8, GROUP_OLIVINE_CITY, MAP_OLIVINE_CITY - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 3 - person_event SPRITE_CLERK, 7, 5, $9, $0, 255, 255, $0, 0, ClerkScript_0x9cac7, -1 - person_event SPRITE_COOLTRAINER_F, 6, 10, $5, $2, 255, 255, $a0, 0, CooltrainerFScript_0x9cace, -1 - person_event SPRITE_LASS, 10, 5, $8, $0, 255, 255, $0, 0, LassScript_0x9cad1, -1 + person_event SPRITE_CLERK, 7, 5, OW_LEFT | $1, $0, -1, -1, $0, 0, ClerkScript_0x9cac7, -1 + person_event SPRITE_COOLTRAINER_F, 6, 10, OW_UP | $1, $2, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, CooltrainerFScript_0x9cace, -1 + person_event SPRITE_LASS, 10, 5, OW_LEFT | $0, $0, -1, -1, $0, 0, LassScript_0x9cad1, -1 diff --git a/maps/OlivinePokeCenter1F.asm b/maps/OlivinePokeCenter1F.asm index 714d73e78..8c45a40c8 100644 --- a/maps/OlivinePokeCenter1F.asm +++ b/maps/OlivinePokeCenter1F.asm @@ -1,8 +1,8 @@ OlivinePokeCenter1F_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 NurseScript_0x9c002: @@ -45,21 +45,21 @@ OlivinePokeCenter1F_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 3 warp_def $7, $3, 1, GROUP_OLIVINE_CITY, MAP_OLIVINE_CITY warp_def $7, $4, 1, GROUP_OLIVINE_CITY, MAP_OLIVINE_CITY warp_def $7, $0, 1, GROUP_POKECENTER_2F, MAP_POKECENTER_2F - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 4 - person_event SPRITE_NURSE, 5, 7, $6, $0, 255, 255, $0, 0, NurseScript_0x9c002, -1 - person_event SPRITE_FISHING_GURU, 8, 12, $5, $1, 255, 255, $0, 0, FishingGuruScript_0x9c005, -1 - person_event SPRITE_FISHER, 7, 6, $6, $0, 255, 255, $a0, 0, FisherScript_0x9c008, -1 - person_event SPRITE_TEACHER, 5, 11, $6, $0, 255, 255, $0, 0, TeacherScript_0x9c00b, -1 + person_event SPRITE_NURSE, 5, 7, OW_UP | $2, $0, -1, -1, $0, 0, NurseScript_0x9c002, -1 + person_event SPRITE_FISHING_GURU, 8, 12, OW_UP | $1, $1, -1, -1, $0, 0, FishingGuruScript_0x9c005, -1 + person_event SPRITE_FISHER, 7, 6, OW_UP | $2, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, FisherScript_0x9c008, -1 + person_event SPRITE_TEACHER, 5, 11, OW_UP | $2, $0, -1, -1, $0, 0, TeacherScript_0x9c00b, -1 diff --git a/maps/OlivinePort.asm b/maps/OlivinePort.asm index aac3ba7c4..e68aa1edd 100644 --- a/maps/OlivinePort.asm +++ b/maps/OlivinePort.asm @@ -1,12 +1,12 @@ OlivinePort_MapScriptHeader: - ; trigger count +.MapTriggers: db 2 ; triggers dw UnknownScript_0x748ac, $0000 dw UnknownScript_0x748ad, $0000 - ; callback count +.MapCallbacks: db 0 UnknownScript_0x748ac: @@ -20,14 +20,14 @@ UnknownScript_0x748b1: applymovement $0, MovementData_0x74a32 appear $2 dotrigger $0 - setevent EVENT_000 + setevent EVENT_GAVE_KURT_APRICORNS blackoutmod GROUP_OLIVINE_CITY, MAP_OLIVINE_CITY end SailorScript_0x748c0: faceplayer loadfont - checkevent EVENT_000 + checkevent EVENT_GAVE_KURT_APRICORNS iftrue UnknownScript_0x74919 writetext UnknownText_0x74a55 closetext @@ -39,12 +39,12 @@ SailorScript_0x748c0: waitbutton applymovement $0, MovementData_0x74a30 playsound SFX_EXIT_BUILDING - special Function8c084 + special FadeBlackBGMap waitbutton - checkevent EVENT_030 + checkevent EVENT_FAST_SHIP_FIRST_TIME iffalse UnknownScript_0x7490a - clearevent EVENT_73A - setevent EVENT_73B + clearevent EVENT_FAST_SHIP_PASSENGERS_EASTBOUND + setevent EVENT_FAST_SHIP_PASSENGERS_WESTBOUND clearevent EVENT_BEAT_COOLTRAINERM_SEAN clearevent EVENT_BEAT_COOLTRAINERF_CAROL clearevent EVENT_BEAT_GENTLEMAN_EDWARD @@ -69,13 +69,13 @@ UnknownScript_0x74919: UnknownScript_0x7491f: spriteface $4, RIGHT - checkevent EVENT_000 + checkevent EVENT_GAVE_KURT_APRICORNS iftrue UnknownScript_0x7498b - checkevent EVENT_001 + checkevent EVENT_RECEIVED_BALLS_FROM_KURT iftrue UnknownScript_0x7498b spriteface $0, LEFT loadfont - checkevent EVENT_030 + checkevent EVENT_FAST_SHIP_FIRST_TIME iffalse UnknownScript_0x7494e checkcode VAR_WEEKDAY if_equal SUNDAY, UnknownScript_0x74977 @@ -94,7 +94,7 @@ UnknownScript_0x7494e: writetext UnknownText_0x74b11 closetext loadmovesprites - setevent EVENT_001 + setevent EVENT_RECEIVED_BALLS_FROM_KURT applymovement $0, MovementData_0x74a37 jump SailorScript_0x748c0 @@ -138,9 +138,9 @@ UnknownScript_0x74992: SailorScript_0x7499c: faceplayer loadfont - checkevent EVENT_000 + checkevent EVENT_GAVE_KURT_APRICORNS iftrue UnknownScript_0x74919 - checkevent EVENT_030 + checkevent EVENT_FAST_SHIP_FIRST_TIME iffalse UnknownScript_0x749c0 checkcode VAR_WEEKDAY if_equal SUNDAY, UnknownScript_0x749f2 @@ -159,7 +159,7 @@ UnknownScript_0x749c0: writetext UnknownText_0x74b11 closetext loadmovesprites - setevent EVENT_001 + setevent EVENT_RECEIVED_BALLS_FROM_KURT checkcode VAR_FACING if_equal $3, UnknownScript_0x749e5 applymovement $0, MovementData_0x74a3f @@ -227,8 +227,7 @@ CooltrainerFScript_0x74a22: end MapOlivinePortSignpostItem0: - dw $00ea - db PROTEIN + dwb EVENT_OLIVINE_PORT_HIDDEN_PROTEIN, PROTEIN MovementData_0x74a30: @@ -383,25 +382,25 @@ OlivinePort_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $7, $b, 5, GROUP_OLIVINE_PORT_PASSAGE, MAP_OLIVINE_PORT_PASSAGE warp_def $17, $7, 1, GROUP_FAST_SHIP_1F, MAP_FAST_SHIP_1F - ; xy triggers +.XYTriggers: db 1 xy_trigger 0, $f, $7, $0, UnknownScript_0x7491f, $0, $0 - ; signposts +.Signposts: db 1 - signpost 22, 1, $7, MapOlivinePortSignpostItem0 + signpost 22, 1, SIGNPOST_ITEM, MapOlivinePortSignpostItem0 - ; people-events +.PersonEvents: db 7 - person_event SPRITE_SAILOR, 27, 11, $7, $0, 255, 255, $0, 0, SailorScript_0x748c0, EVENT_72A - person_event SPRITE_SAILOR, 19, 11, $7, $0, 255, 255, $0, 0, SailorScript_0x749fe, EVENT_737 - person_event SPRITE_SAILOR, 19, 10, $9, $0, 255, 255, $0, 0, SailorScript_0x7499c, EVENT_738 - person_event SPRITE_FISHING_GURU, 18, 8, $7, $0, 255, 255, $0, 0, FishingGuruScript_0x74a01, EVENT_737 - person_event SPRITE_FISHING_GURU, 18, 17, $7, $0, 255, 255, $0, 0, FishingGuruScript_0x74a0c, EVENT_737 - person_event SPRITE_YOUNGSTER, 19, 8, $6, $0, 255, 255, $0, 0, YoungsterScript_0x74a17, EVENT_738 - person_event SPRITE_COOLTRAINER_F, 19, 15, $6, $0, 255, 255, $0, 0, CooltrainerFScript_0x74a22, EVENT_738 + person_event SPRITE_SAILOR, 27, 11, OW_UP | $3, $0, -1, -1, $0, 0, SailorScript_0x748c0, EVENT_OLIVINE_PORT_SAILOR_AT_GANGWAY + person_event SPRITE_SAILOR, 19, 11, OW_UP | $3, $0, -1, -1, $0, 0, SailorScript_0x749fe, EVENT_OLIVINE_PORT_SPRITES_BEFORE_HALL_OF_FAME + person_event SPRITE_SAILOR, 19, 10, OW_LEFT | $1, $0, -1, -1, $0, 0, SailorScript_0x7499c, EVENT_OLIVINE_PORT_SPRITES_AFTER_HALL_OF_FAME + person_event SPRITE_FISHING_GURU, 18, 8, OW_UP | $3, $0, -1, -1, $0, 0, FishingGuruScript_0x74a01, EVENT_OLIVINE_PORT_SPRITES_BEFORE_HALL_OF_FAME + person_event SPRITE_FISHING_GURU, 18, 17, OW_UP | $3, $0, -1, -1, $0, 0, FishingGuruScript_0x74a0c, EVENT_OLIVINE_PORT_SPRITES_BEFORE_HALL_OF_FAME + person_event SPRITE_YOUNGSTER, 19, 8, OW_UP | $2, $0, -1, -1, $0, 0, YoungsterScript_0x74a17, EVENT_OLIVINE_PORT_SPRITES_AFTER_HALL_OF_FAME + person_event SPRITE_COOLTRAINER_F, 19, 15, OW_UP | $2, $0, -1, -1, $0, 0, CooltrainerFScript_0x74a22, EVENT_OLIVINE_PORT_SPRITES_AFTER_HALL_OF_FAME diff --git a/maps/OlivinePortPassage.asm b/maps/OlivinePortPassage.asm index 8c9ad1538..22a0a322f 100644 --- a/maps/OlivinePortPassage.asm +++ b/maps/OlivinePortPassage.asm @@ -1,8 +1,8 @@ OlivinePortPassage_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 PokefanMScript_0x76fac: @@ -20,7 +20,7 @@ OlivinePortPassage_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 5 warp_def $0, $f, 10, GROUP_OLIVINE_CITY, MAP_OLIVINE_CITY warp_def $0, $10, 11, GROUP_OLIVINE_CITY, MAP_OLIVINE_CITY @@ -28,12 +28,12 @@ OlivinePortPassage_MapEventHeader: warp_def $2, $3, 3, GROUP_OLIVINE_PORT_PASSAGE, MAP_OLIVINE_PORT_PASSAGE warp_def $e, $3, 1, GROUP_OLIVINE_PORT, MAP_OLIVINE_PORT - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 1 - person_event SPRITE_POKEFAN_M, 5, 21, $8, $0, 255, 255, $0, 0, PokefanMScript_0x76fac, EVENT_733 + person_event SPRITE_POKEFAN_M, 5, 21, OW_LEFT | $0, $0, -1, -1, $0, 0, PokefanMScript_0x76fac, EVENT_OLIVINE_PORT_PASSAGE_POKEFAN_M diff --git a/maps/OlivinePunishmentSpeechHouse.asm b/maps/OlivinePunishmentSpeechHouse.asm index 8628ef005..9d9c784e1 100644 --- a/maps/OlivinePunishmentSpeechHouse.asm +++ b/maps/OlivinePunishmentSpeechHouse.asm @@ -1,8 +1,8 @@ OlivinePunishmentSpeechHouse_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 OlivinePunishmentSpeechHouseDad: @@ -39,20 +39,20 @@ OlivinePunishmentSpeechHouse_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $7, $2, 5, GROUP_OLIVINE_CITY, MAP_OLIVINE_CITY warp_def $7, $3, 5, GROUP_OLIVINE_CITY, MAP_OLIVINE_CITY - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 2 - signpost 1, 0, $0, OlivinePunishmentSpeechHouseBookshelf1 - signpost 1, 1, $0, OlivinePunishmentSpeechHouseBookshelf2 + signpost 1, 0, SIGNPOST_READ, OlivinePunishmentSpeechHouseBookshelf1 + signpost 1, 1, SIGNPOST_READ, OlivinePunishmentSpeechHouseBookshelf2 - ; people-events +.PersonEvents: db 2 - person_event SPRITE_POKEFAN_M, 6, 5, $3, $0, 255, 255, $0, 0, OlivinePunishmentSpeechHouseDad, -1 - person_event SPRITE_LASS, 9, 9, $5, $2, 255, 255, $0, 0, OlivinePunishmentSpeechHouseDaughter, -1 + person_event SPRITE_POKEFAN_M, 6, 5, OW_DOWN | $3, $0, -1, -1, $0, 0, OlivinePunishmentSpeechHouseDad, -1 + person_event SPRITE_LASS, 9, 9, OW_UP | $1, $2, -1, -1, $0, 0, OlivinePunishmentSpeechHouseDaughter, -1 diff --git a/maps/OlivineVoltorbHouse.asm b/maps/OlivineVoltorbHouse.asm index afa61ee12..4fc047470 100644 --- a/maps/OlivineVoltorbHouse.asm +++ b/maps/OlivineVoltorbHouse.asm @@ -1,8 +1,8 @@ OlivineVoltorbHouse_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 Tim: @@ -20,19 +20,19 @@ OlivineVoltorbHouse_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $7, $2, 3, GROUP_OLIVINE_CITY, MAP_OLIVINE_CITY warp_def $7, $3, 3, GROUP_OLIVINE_CITY, MAP_OLIVINE_CITY - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 2 - signpost 1, 0, $0, TimsHouseBookshelf - signpost 1, 1, $0, TimsHouseBookshelf + signpost 1, 0, SIGNPOST_READ, TimsHouseBookshelf + signpost 1, 1, SIGNPOST_READ, TimsHouseBookshelf - ; people-events +.PersonEvents: db 1 - person_event SPRITE_FISHING_GURU, 7, 6, $3, $0, 255, 255, $80, 0, Tim, -1 + person_event SPRITE_FISHING_GURU, 7, 6, OW_DOWN | $3, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, Tim, -1 diff --git a/maps/PalletTown.asm b/maps/PalletTown.asm index 7e152f5de..c6a64db89 100644 --- a/maps/PalletTown.asm +++ b/maps/PalletTown.asm @@ -1,8 +1,8 @@ PalletTown_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 1 ; callbacks @@ -71,23 +71,23 @@ PalletTown_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 3 warp_def $5, $5, 1, GROUP_REDS_HOUSE_1F, MAP_REDS_HOUSE_1F warp_def $5, $d, 1, GROUP_BLUES_HOUSE, MAP_BLUES_HOUSE warp_def $b, $c, 1, GROUP_OAKS_LAB, MAP_OAKS_LAB - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 4 - signpost 9, 7, $0, PalletTownSign - signpost 5, 3, $0, RedsHouseSign - signpost 13, 13, $0, OaksLabSign - signpost 5, 11, $0, BluesHouseSign + signpost 9, 7, SIGNPOST_READ, PalletTownSign + signpost 5, 3, SIGNPOST_READ, RedsHouseSign + signpost 13, 13, SIGNPOST_READ, OaksLabSign + signpost 5, 11, SIGNPOST_READ, BluesHouseSign - ; people-events +.PersonEvents: db 2 - person_event SPRITE_TEACHER, 12, 7, $2, $22, 255, 255, $0, 0, TeacherScript_0x1ac6d5, -1 - person_event SPRITE_FISHER, 18, 16, $5, $2, 255, 255, $a0, 0, FisherScript_0x1ac6d8, -1 + person_event SPRITE_TEACHER, 12, 7, OW_DOWN | $2, $22, -1, -1, $0, 0, TeacherScript_0x1ac6d5, -1 + person_event SPRITE_FISHER, 18, 16, OW_UP | $1, $2, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, FisherScript_0x1ac6d8, -1 diff --git a/maps/PewterCity.asm b/maps/PewterCity.asm index 1ee798544..3537949a5 100644 --- a/maps/PewterCity.asm +++ b/maps/PewterCity.asm @@ -1,8 +1,8 @@ PewterCity_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 1 ; callbacks @@ -151,7 +151,7 @@ PewterCity_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 5 warp_def $d, $1d, 1, GROUP_PEWTER_NIDORAN_SPEECH_HOUSE, MAP_PEWTER_NIDORAN_SPEECH_HOUSE warp_def $11, $10, 1, GROUP_PEWTER_GYM, MAP_PEWTER_GYM @@ -159,23 +159,23 @@ PewterCity_MapEventHeader: warp_def $19, $d, 1, GROUP_PEWTER_POKECENTER_1F, MAP_PEWTER_POKECENTER_1F warp_def $1d, $7, 1, GROUP_PEWTER_SNOOZE_SPEECH_HOUSE, MAP_PEWTER_SNOOZE_SPEECH_HOUSE - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 7 - signpost 23, 25, $0, PewterCitySign - signpost 17, 11, $0, PewterGymSign - signpost 9, 15, $0, PewterMuseumSign - signpost 19, 33, $0, PewterCityMtMoonGiftShopSign - signpost 29, 19, $0, PewterCityWelcomeSign - signpost 25, 14, $0, PewterCityPokeCenterSign - signpost 17, 24, $0, PewterCityMartSign - - ; people-events + signpost 23, 25, SIGNPOST_READ, PewterCitySign + signpost 17, 11, SIGNPOST_READ, PewterGymSign + signpost 9, 15, SIGNPOST_READ, PewterMuseumSign + signpost 19, 33, SIGNPOST_READ, PewterCityMtMoonGiftShopSign + signpost 29, 19, SIGNPOST_READ, PewterCityWelcomeSign + signpost 25, 14, SIGNPOST_READ, PewterCityPokeCenterSign + signpost 17, 24, SIGNPOST_READ, PewterCityMartSign + +.PersonEvents: db 5 - person_event SPRITE_COOLTRAINER_F, 15, 23, $2, $22, 255, 255, $a0, 0, CooltrainerFScript_0x18c009, -1 - person_event SPRITE_BUG_CATCHER, 33, 18, $2, $22, 255, 255, $80, 0, BugCatcherScript_0x18c00c, -1 - person_event SPRITE_GRAMPS, 21, 33, $5, $2, 255, 255, $90, 0, GrampsScript_0x18c00f, -1 - person_event SPRITE_FRUIT_TREE, 7, 36, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x18c03e, -1 - person_event SPRITE_FRUIT_TREE, 7, 34, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x18c040, -1 + person_event SPRITE_COOLTRAINER_F, 15, 23, OW_DOWN | $2, $22, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, CooltrainerFScript_0x18c009, -1 + person_event SPRITE_BUG_CATCHER, 33, 18, OW_DOWN | $2, $22, -1, -1, (PAL_OW_RED << 4) | $80, 0, BugCatcherScript_0x18c00c, -1 + person_event SPRITE_GRAMPS, 21, 33, OW_UP | $1, $2, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, GrampsScript_0x18c00f, -1 + person_event SPRITE_FRUIT_TREE, 7, 36, OW_DOWN | $1, $0, -1, -1, $0, 0, FruitTreeScript_0x18c03e, -1 + person_event SPRITE_FRUIT_TREE, 7, 34, OW_DOWN | $1, $0, -1, -1, $0, 0, FruitTreeScript_0x18c040, -1 diff --git a/maps/PewterGym.asm b/maps/PewterGym.asm index 4844a22b2..7737c0a64 100644 --- a/maps/PewterGym.asm +++ b/maps/PewterGym.asm @@ -1,8 +1,8 @@ PewterGym_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 BrockScript_0x1a2864: @@ -36,23 +36,7 @@ BrockScript_0x1a2864: end TrainerCamperJerry: - ; bit/flag number - dw EVENT_BEAT_CAMPER_JERRY - - ; trainer group && trainer id - db CAMPER, JERRY - - ; text when seen - dw CamperJerrySeenText - - ; text when trainer beaten - dw CamperJerryBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw CamperJerryScript + trainer EVENT_BEAT_CAMPER_JERRY, CAMPER, JERRY, CamperJerrySeenText, CamperJerryBeatenText, $0000, CamperJerryScript CamperJerryScript: talkaftercancel @@ -223,21 +207,21 @@ PewterGym_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $d, $4, 2, GROUP_PEWTER_CITY, MAP_PEWTER_CITY warp_def $d, $5, 2, GROUP_PEWTER_CITY, MAP_PEWTER_CITY - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 2 - signpost 11, 2, $0, PewterGymStatue - signpost 11, 7, $0, PewterGymStatue + signpost 11, 2, SIGNPOST_READ, PewterGymStatue + signpost 11, 7, SIGNPOST_READ, PewterGymStatue - ; people-events +.PersonEvents: db 3 - person_event SPRITE_BROCK, 5, 9, $6, $0, 255, 255, $b0, 0, BrockScript_0x1a2864, -1 - person_event SPRITE_YOUNGSTER, 9, 6, $9, $0, 255, 255, $a2, 3, TrainerCamperJerry, -1 - person_event SPRITE_GYM_GUY, 15, 10, $6, $0, 255, 255, $90, 1, PewterGymGuyScript, -1 + person_event SPRITE_BROCK, 5, 9, OW_UP | $2, $0, -1, -1, (PAL_OW_BROWN << 4) | $80, 0, BrockScript_0x1a2864, -1 + person_event SPRITE_YOUNGSTER, 9, 6, OW_LEFT | $1, $0, -1, -1, (PAL_OW_GREEN << 4) | $82, 3, TrainerCamperJerry, -1 + person_event SPRITE_GYM_GUY, 15, 10, OW_UP | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 1, PewterGymGuyScript, -1 diff --git a/maps/PewterMart.asm b/maps/PewterMart.asm index b086900a1..b5f172010 100644 --- a/maps/PewterMart.asm +++ b/maps/PewterMart.asm @@ -1,8 +1,8 @@ PewterMart_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 ClerkScript_0x1a2dcb: @@ -44,19 +44,19 @@ PewterMart_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $7, $2, 3, GROUP_PEWTER_CITY, MAP_PEWTER_CITY warp_def $7, $3, 3, GROUP_PEWTER_CITY, MAP_PEWTER_CITY - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 3 - person_event SPRITE_CLERK, 7, 5, $9, $0, 255, 255, $0, 0, ClerkScript_0x1a2dcb, -1 - person_event SPRITE_YOUNGSTER, 6, 13, $5, $2, 255, 255, $0, 0, YoungsterScript_0x1a2dd2, -1 - person_event SPRITE_SUPER_NERD, 10, 10, $3, $0, 255, 255, $80, 0, SuperNerdScript_0x1a2dd5, -1 + person_event SPRITE_CLERK, 7, 5, OW_LEFT | $1, $0, -1, -1, $0, 0, ClerkScript_0x1a2dcb, -1 + person_event SPRITE_YOUNGSTER, 6, 13, OW_UP | $1, $2, -1, -1, $0, 0, YoungsterScript_0x1a2dd2, -1 + person_event SPRITE_SUPER_NERD, 10, 10, OW_DOWN | $3, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, SuperNerdScript_0x1a2dd5, -1 diff --git a/maps/PewterNidoranSpeechHouse.asm b/maps/PewterNidoranSpeechHouse.asm index 29a599206..a81ded4fa 100644 --- a/maps/PewterNidoranSpeechHouse.asm +++ b/maps/PewterNidoranSpeechHouse.asm @@ -1,8 +1,8 @@ PewterNidoranSpeechHouse_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 SuperNerdScript_0x1a2807: @@ -28,18 +28,18 @@ PewterNidoranSpeechHouse_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $7, $2, 1, GROUP_PEWTER_CITY, MAP_PEWTER_CITY warp_def $7, $3, 1, GROUP_PEWTER_CITY, MAP_PEWTER_CITY - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 2 - person_event SPRITE_SUPER_NERD, 9, 7, $9, $0, 255, 255, $a0, 0, SuperNerdScript_0x1a2807, -1 - person_event SPRITE_GROWLITHE, 9, 8, $16, $0, 255, 255, $90, 0, GrowlitheScript_0x1a280a, -1 + person_event SPRITE_SUPER_NERD, 9, 7, OW_LEFT | $1, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, SuperNerdScript_0x1a2807, -1 + person_event SPRITE_GROWLITHE, 9, 8, OW_UP | $12, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, GrowlitheScript_0x1a280a, -1 diff --git a/maps/PewterPokeCEnter2FBeta.asm b/maps/PewterPokeCEnter2FBeta.asm index 51202764f..5756d3d8d 100644 --- a/maps/PewterPokeCEnter2FBeta.asm +++ b/maps/PewterPokeCEnter2FBeta.asm @@ -1,23 +1,23 @@ PewterPokeCEnter2FBeta_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 PewterPokeCEnter2FBeta_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 1 warp_def $7, $0, 3, GROUP_PEWTER_POKECENTER_1F, MAP_PEWTER_POKECENTER_1F - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 0 diff --git a/maps/PewterPokeCenter1F.asm b/maps/PewterPokeCenter1F.asm index 1415ad5dc..b55fd7c44 100644 --- a/maps/PewterPokeCenter1F.asm +++ b/maps/PewterPokeCenter1F.asm @@ -1,8 +1,8 @@ PewterPokeCenter1F_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 NurseScript_0x1a2ee7: @@ -64,22 +64,22 @@ PewterPokeCenter1F_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 3 warp_def $7, $3, 4, GROUP_PEWTER_CITY, MAP_PEWTER_CITY warp_def $7, $4, 4, GROUP_PEWTER_CITY, MAP_PEWTER_CITY warp_def $7, $0, 1, GROUP_POKECENTER_2F, MAP_POKECENTER_2F - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 5 - person_event SPRITE_NURSE, 5, 7, $6, $0, 255, 255, $0, 0, NurseScript_0x1a2ee7, -1 - person_event SPRITE_TEACHER, 10, 12, $6, $0, 255, 255, $a0, 0, TeacherScript_0x1a2eea, -1 - person_event SPRITE_JIGGLYPUFF, 7, 5, $16, $0, 255, 255, $0, 0, JigglypuffScript_0x1a2eed, -1 - person_event SPRITE_BUG_CATCHER, 7, 6, $6, $0, 255, 255, $90, 0, BugCatcherScript_0x1a2ef7, -1 - person_event SPRITE_POKEFAN_M, 6, 11, $6, $0, 255, 255, $80, 0, PokefanMScript_0x1a2efa, -1 + person_event SPRITE_NURSE, 5, 7, OW_UP | $2, $0, -1, -1, $0, 0, NurseScript_0x1a2ee7, -1 + person_event SPRITE_TEACHER, 10, 12, OW_UP | $2, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, TeacherScript_0x1a2eea, -1 + person_event SPRITE_JIGGLYPUFF, 7, 5, OW_UP | $12, $0, -1, -1, $0, 0, JigglypuffScript_0x1a2eed, -1 + person_event SPRITE_BUG_CATCHER, 7, 6, OW_UP | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, BugCatcherScript_0x1a2ef7, -1 + person_event SPRITE_POKEFAN_M, 6, 11, OW_UP | $2, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, PokefanMScript_0x1a2efa, -1 diff --git a/maps/PewterSnoozeSpeechHouse.asm b/maps/PewterSnoozeSpeechHouse.asm index b5ce7c400..72821d4b6 100644 --- a/maps/PewterSnoozeSpeechHouse.asm +++ b/maps/PewterSnoozeSpeechHouse.asm @@ -1,8 +1,8 @@ PewterSnoozeSpeechHouse_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 GrampsScript_0x1a3059: @@ -21,19 +21,19 @@ PewterSnoozeSpeechHouse_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $7, $2, 5, GROUP_PEWTER_CITY, MAP_PEWTER_CITY warp_def $7, $3, 5, GROUP_PEWTER_CITY, MAP_PEWTER_CITY - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 2 - signpost 1, 0, $0, PewterSnoozeSpeechHouseBookshelf - signpost 1, 1, $0, PewterSnoozeSpeechHouseBookshelf + signpost 1, 0, SIGNPOST_READ, PewterSnoozeSpeechHouseBookshelf + signpost 1, 1, SIGNPOST_READ, PewterSnoozeSpeechHouseBookshelf - ; people-events +.PersonEvents: db 1 - person_event SPRITE_GRAMPS, 7, 9, $8, $0, 255, 255, $90, 0, GrampsScript_0x1a3059, -1 + person_event SPRITE_GRAMPS, 7, 9, OW_LEFT | $0, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, GrampsScript_0x1a3059, -1 diff --git a/maps/PokeCenter2F.asm b/maps/PokeCenter2F.asm index 60f7310b0..ed4636921 100644 --- a/maps/PokeCenter2F.asm +++ b/maps/PokeCenter2F.asm @@ -1,432 +1,432 @@ PokeCenter2F_MapScriptHeader: - ; trigger count +.MapTriggers: db 6 ; triggers - dw UnknownScript_0x19285f, $0000 - dw UnknownScript_0x192873, $0000 - dw UnknownScript_0x192877, $0000 - dw UnknownScript_0x19287b, $0000 - dw UnknownScript_0x19287f, $0000 - dw UnknownScript_0x192883, $0000 - - ; callback count + dw .Trigger1, $0000 + dw .Trigger2, $0000 + dw .Trigger3, $0000 + dw .Trigger4, $0000 + dw .Trigger5, $0000 + dw .Trigger6, $0000 + +.MapCallbacks: db 0 -UnknownScript_0x19285f: - special Functionc2f6 - if_equal $0, UnknownScript_0x192872 - clearevent EVENT_711 - checkevent EVENT_001 - iftrue UnknownScript_0x192872 - priorityjump UnknownScript_0x192887 +.Trigger1: + special Special_CheckMysteryGift + if_equal $0, .Trigger1Done + clearevent EVENT_MYSTERY_GIFT_DELIVERY_GUY + checkevent EVENT_RECEIVED_BALLS_FROM_KURT + iftrue .Trigger1Done + priorityjump PokeCenter2F_AppearMysteryGiftDeliveryGuy -UnknownScript_0x192872: +.Trigger1Done: end -UnknownScript_0x192873: - priorityjump UnknownScript_0x192ab6 +.Trigger2: + priorityjump Script_LeftCableTradeCenter end -UnknownScript_0x192877: - priorityjump UnknownScript_0x192add +.Trigger3: + priorityjump Script_LeftCableColosseum end -UnknownScript_0x19287b: - priorityjump UnknownScript_0x192c4e +.Trigger4: + priorityjump Script_LeftTimeCapsule end -UnknownScript_0x19287f: - priorityjump UnknownScript_0x192ac3 +.Trigger5: + priorityjump Script_LeftMobileTradeRoom end -UnknownScript_0x192883: - priorityjump UnknownScript_0x192aea +.Trigger6: + priorityjump Script_LeftMobileBattleRoom end -UnknownScript_0x192887: +PokeCenter2F_AppearMysteryGiftDeliveryGuy: appear $5 - setevent EVENT_001 + setevent EVENT_RECEIVED_BALLS_FROM_KURT end -UnknownScript_0x19288d: +Script_TradeCenterClosed: faceplayer loadfont - writetext UnknownText_0x19312f + writetext Text_TradeRoomClosed closetext loadmovesprites end -UnknownScript_0x192895: +Script_BattleRoomClosed: faceplayer loadfont - writetext UnknownText_0x19315f + writetext Text_BattleRoomClosed closetext loadmovesprites end -LinkReceptionistScript_0x19289d: +LinkReceptionistScript_Trade: checkevent EVENT_GAVE_MYSTERY_EGG_TO_ELM - iffalse UnknownScript_0x19288d + iffalse Script_TradeCenterClosed loadfont - writetext UnknownText_0x192e3a + writetext Text_TradeReceptionistIntro yesorno - iffalse UnknownScript_0x19291d + iffalse .Cancel special Function10630f - iffalse UnknownScript_0x1928be - writetext UnknownText_0x192d7e + iffalse .NoMobile + writetext Text_TradeReceptionistMobile special Function103612 - iffalse UnknownScript_0x19291d - if_equal $1, UnknownScript_0x19291f -UnknownScript_0x1928be: - special Function29ce8 - writetext UnknownText_0x192f67 - special Function29d11 - iffalse UnknownScript_0x1928f6 - writetext UnknownText_0x192f34 + iffalse .Cancel + if_equal $1, .Mobile +.NoMobile: + special Special_SetBitsForLinkTradeRequest + writetext Text_PleaseWait + special Special_WaitForLinkedFriend + iffalse .FriendNotReady + writetext Text_MustSaveGame yesorno - iffalse UnknownScript_0x192917 - special Function29e66 - iffalse UnknownScript_0x192917 - writetext UnknownText_0x192f67 - special Function29d92 - iffalse UnknownScript_0x192911 + iffalse .DidNotSave + special Special_TryQuickSave + iffalse .DidNotSave + writetext Text_PleaseWait + special Special_CheckLinkTimeout + iffalse .LinkTimedOut copybytetovar wcf51 - iffalse UnknownScript_0x1928fe - special Function29e82 - iffalse UnknownScript_0x192909 - writetext UnknownText_0x19306b + iffalse .LinkedToFirstGen + special Special_CheckBothSelectedSameRoom + iffalse .IncompatibleRooms + writetext Text_PleaseComeIn2 closetext loadmovesprites - scall UnknownScript_0x192b04 + scall PokeCenter2F_CheckGender warpcheck end -UnknownScript_0x1928f6: - special Function29c92 - writetext UnknownText_0x192f19 +.FriendNotReady: + special Special_AbortLink + writetext Text_FriendNotReady loadmovesprites end -UnknownScript_0x1928fe: - special Function29efa - writetext UnknownText_0x193029 - special Function29eee +.LinkedToFirstGen: + special Special_FailedLinkToPast + writetext Text_CantLinkToThePast + special Special_CloseLink loadmovesprites end -UnknownScript_0x192909: - writetext UnknownText_0x19304a - special Function29eee +.IncompatibleRooms: + writetext Text_IncompatibleRooms + special Special_CloseLink loadmovesprites end -UnknownScript_0x192911: - writetext UnknownText_0x192f75 - jump UnknownScript_0x19291a +.LinkTimedOut: + writetext Text_LinkTimedOut + jump .AbortLink -UnknownScript_0x192917: - writetext UnknownText_0x192fd1 -UnknownScript_0x19291a: - special Function29c92 -UnknownScript_0x19291d: +.DidNotSave: + writetext Text_PleaseComeAgain +.AbortLink: + special Special_AbortLink +.Cancel: loadmovesprites end -UnknownScript_0x19291f: - scall UnknownScript_0x19292b - iftrue UnknownScript_0x19292a - scall UnknownScript_0x19294a +.Mobile: + scall .Mobile_TrySave + iftrue .Mobile_Abort + scall BattleTradeMobile_WalkIn warpcheck end -UnknownScript_0x19292a: +.Mobile_Abort: end -UnknownScript_0x19292b: - writetext UnknownText_0x192f34 +.Mobile_TrySave: + writetext Text_MustSaveGame yesorno - iffalse UnknownScript_0x192943 - special Function29e66 - iffalse UnknownScript_0x192943 + iffalse .Mobile_DidNotSave + special Special_TryQuickSave + iffalse .Mobile_DidNotSave special Function1011f1 - writetext UnknownText_0x19306b + writetext Text_PleaseComeIn2 closetext loadmovesprites writebyte $0 end -UnknownScript_0x192943: - writetext UnknownText_0x192fd1 +.Mobile_DidNotSave: + writetext Text_PleaseComeAgain loadmovesprites writebyte $1 end -UnknownScript_0x19294a: +BattleTradeMobile_WalkIn: applymovement2 MovementData_0x192cce applymovement $0, MovementData_0x192ce7 end -LinkReceptionistScript_0x192952: +LinkReceptionistScript_Battle: checkevent EVENT_GAVE_MYSTERY_EGG_TO_ELM - iffalse UnknownScript_0x192895 + iffalse Script_BattleRoomClosed loadfont - writetext UnknownText_0x192de0 + writetext Text_BattleReceptionistIntro yesorno - iffalse UnknownScript_0x1929d2 + iffalse .Cancel special Function10630f - iffalse UnknownScript_0x192973 - writetext UnknownText_0x192d39 + iffalse .NoMobile + writetext Text_BattleReceptionistMobile special Function103612 - iffalse UnknownScript_0x1929d2 - if_equal $1, UnknownScript_0x1929d4 -UnknownScript_0x192973: - special Function29cf1 - writetext UnknownText_0x192f67 - special Function29d11 - iffalse UnknownScript_0x1929ab - writetext UnknownText_0x192f34 + iffalse .Cancel + if_equal $1, .Mobile +.NoMobile: + special Special_SetBitsForBattleRequest + writetext Text_PleaseWait + special Special_WaitForLinkedFriend + iffalse .FriendNotReady + writetext Text_MustSaveGame yesorno - iffalse UnknownScript_0x1929cc - special Function29e66 - iffalse UnknownScript_0x1929cc - writetext UnknownText_0x192f67 - special Function29d92 - iffalse UnknownScript_0x1929c6 + iffalse .DidNotSave + special Special_TryQuickSave + iffalse .DidNotSave + writetext Text_PleaseWait + special Special_CheckLinkTimeout + iffalse .LinkTimedOut copybytetovar wcf51 - iffalse UnknownScript_0x1929b3 - special Function29e82 - iffalse UnknownScript_0x1929be - writetext UnknownText_0x19306b + iffalse .LinkedToFirstGen + special Special_CheckBothSelectedSameRoom + iffalse .IncompatibleRooms + writetext Text_PleaseComeIn2 closetext loadmovesprites - scall UnknownScript_0x192b04 + scall PokeCenter2F_CheckGender warpcheck end -UnknownScript_0x1929ab: - special Function29c92 - writetext UnknownText_0x192f19 +.FriendNotReady: + special Special_AbortLink + writetext Text_FriendNotReady loadmovesprites end -UnknownScript_0x1929b3: - special Function29efa - writetext UnknownText_0x193029 - special Function29eee +.LinkedToFirstGen: + special Special_FailedLinkToPast + writetext Text_CantLinkToThePast + special Special_CloseLink loadmovesprites end -UnknownScript_0x1929be: - writetext UnknownText_0x19304a - special Function29eee +.IncompatibleRooms: + writetext Text_IncompatibleRooms + special Special_CloseLink loadmovesprites end -UnknownScript_0x1929c6: - writetext UnknownText_0x192f75 - jump UnknownScript_0x1929cf +.LinkTimedOut: + writetext Text_LinkTimedOut + jump .AbortLink -UnknownScript_0x1929cc: - writetext UnknownText_0x192fd1 -UnknownScript_0x1929cf: - special Function29c92 -UnknownScript_0x1929d2: +.DidNotSave: + writetext Text_PleaseComeAgain +.AbortLink: + special Special_AbortLink +.Cancel: loadmovesprites end -UnknownScript_0x1929d4: - scall UnknownScript_0x192a05 - iffalse UnknownScript_0x1929e5 - scall UnknownScript_0x1929e6 - iftrue UnknownScript_0x1929e5 - scall UnknownScript_0x19294a +.Mobile: + scall .SelectThreeMons + iffalse .Mobile_Abort + scall .Mobile_TrySave + iftrue .Mobile_Abort + scall BattleTradeMobile_WalkIn warpcheck end -UnknownScript_0x1929e5: +.Mobile_Abort: end -UnknownScript_0x1929e6: - writetext UnknownText_0x192f34 +.Mobile_TrySave: + writetext Text_MustSaveGame yesorno - iffalse UnknownScript_0x1929fe + iffalse .Mobile_DidNotSave special Function103780 - iffalse UnknownScript_0x1929fe + iffalse .Mobile_DidNotSave special Function1011f1 - writetext UnknownText_0x19306b + writetext Text_PleaseComeIn2 closetext loadmovesprites writebyte $0 end -UnknownScript_0x1929fe: - writetext UnknownText_0x192fd1 +.Mobile_DidNotSave: + writetext Text_PleaseComeAgain loadmovesprites writebyte $1 end -UnknownScript_0x192a05: - special Function10366e - iffalse UnknownScript_0x192a1e - if_equal $1, UnknownScript_0x192a22 - if_equal $2, UnknownScript_0x192a22 - if_equal $3, UnknownScript_0x192a1a - jump UnknownScript_0x192a1e +.SelectThreeMons: + special Mobile_SelectThreeMons + iffalse .Mobile_DidNotSelect + if_equal $1, .Mobile_OK + if_equal $2, .Mobile_OK + if_equal $3, .Mobile_InvalidParty + jump .Mobile_DidNotSelect -UnknownScript_0x192a1a: - writetext UnknownText_0x1932bc +.Mobile_InvalidParty: + writetext Text_BrokeStadiumRules closetext -UnknownScript_0x192a1e: +.Mobile_DidNotSelect: loadmovesprites writebyte $0 end -UnknownScript_0x192a22: +.Mobile_OK: writebyte $1 end -UnknownScript_0x192a25: +Script_TimeCapsuleClosed: faceplayer loadfont - writetext UnknownText_0x193100 + writetext Text_TimeCapsuleClosed closetext loadmovesprites end -LinkReceptionistScript_0x192a2d: +LinkReceptionistScript_TimeCapsule: checkevent EVENT_MET_BILL - iftrue UnknownScript_0x192a25 + iftrue Script_TimeCapsuleClosed checkflag ENGINE_TIME_CAPSULE - iftrue UnknownScript_0x192a25 - special Function29cfa + iftrue Script_TimeCapsuleClosed + special Special_SetBitsForTimeCapsuleRequest faceplayer loadfont - writetext UnknownText_0x192e9f + writetext Text_TimeCapsuleRecptionistIntro yesorno - iffalse UnknownScript_0x192aa2 - special Function29bfb - if_equal $1, UnknownScript_0x192aa7 - if_equal $2, UnknownScript_0x192aac - if_equal $3, UnknownScript_0x192ab1 - writetext UnknownText_0x192f67 - special Function29d11 - iffalse UnknownScript_0x192a91 - writetext UnknownText_0x192f34 + iffalse .Cancel + special Special_CheckTimeCapsuleCompatibility + if_equal $1, .MonTooNew + if_equal $2, .MonMoveTooNew + if_equal $3, .MonHasMail + writetext Text_PleaseWait + special Special_WaitForLinkedFriend + iffalse .FriendNotReady + writetext Text_MustSaveGame yesorno - iffalse UnknownScript_0x192a9f - special Function29e66 - iffalse UnknownScript_0x192a9f - writetext UnknownText_0x192f67 - special Function29d92 - iffalse UnknownScript_0x192a99 + iffalse .DidNotSave + special Special_TryQuickSave + iffalse .DidNotSave + writetext Text_PleaseWait + special Special_CheckLinkTimeout + iffalse .LinkTimedOut copybytetovar wcf51 - iffalse UnknownScript_0x192a84 - special Function29e82 - writetext UnknownText_0x19304a - special Function29eee + iffalse .OK + special Special_CheckBothSelectedSameRoom + writetext Text_IncompatibleRooms + special Special_CloseLink loadmovesprites end -UnknownScript_0x192a84: - special Function29c7b - writetext UnknownText_0x19306b +.OK: + special Special_EnterTimeCapsule + writetext Text_PleaseComeIn2 closetext loadmovesprites - scall UnknownScript_0x192bc4 + scall TimeCapsuleScript_CheckPlayerGender warpcheck end -UnknownScript_0x192a91: - special Function29c92 - writetext UnknownText_0x192f19 +.FriendNotReady: + special Special_AbortLink + writetext Text_FriendNotReady loadmovesprites end -UnknownScript_0x192a99: - writetext UnknownText_0x192f75 - jump UnknownScript_0x192aa2 +.LinkTimedOut: + writetext Text_LinkTimedOut + jump .Cancel -UnknownScript_0x192a9f: - writetext UnknownText_0x192fd1 -UnknownScript_0x192aa2: - special Function29c92 +.DidNotSave: + writetext Text_PleaseComeAgain +.Cancel: + special Special_AbortLink loadmovesprites end -UnknownScript_0x192aa7: - writetext UnknownText_0x19308b +.MonTooNew: + writetext Text_RejectNewMon loadmovesprites end -UnknownScript_0x192aac: - writetext UnknownText_0x1930a8 +.MonMoveTooNew: + writetext Text_RejectMonWithNewMove loadmovesprites end -UnknownScript_0x192ab1: - writetext UnknownText_0x1930cf +.MonHasMail: + writetext Text_RejectMonWithMail loadmovesprites end -UnknownScript_0x192ab6: - special Function29c92 - scall UnknownScript_0x192b50 +Script_LeftCableTradeCenter: + special Special_AbortLink + scall Script_CleanUpFemaleFlagAfterTrade dotrigger $0 domaptrigger GROUP_TRADE_CENTER, MAP_TRADE_CENTER, $0 end -UnknownScript_0x192ac3: +Script_LeftMobileTradeRoom: special Function101220 - scall UnknownScript_0x192ad0 + scall Script_WalkOutOfMobileTradeRoom dotrigger $0 domaptrigger GROUP_MOBILE_TRADE_ROOM_MOBILE, MAP_MOBILE_TRADE_ROOM_MOBILE, $0 end -UnknownScript_0x192ad0: +Script_WalkOutOfMobileTradeRoom: applymovement $2, MovementData_0x192d0b applymovement $0, MovementData_0x192d0f applymovement $2, MovementData_0x192d14 end -UnknownScript_0x192add: - special Function29c92 - scall UnknownScript_0x192b8a +Script_LeftCableColosseum: + special Special_AbortLink + scall Script_CleanUpFemaleFlagAfterBattle dotrigger $0 domaptrigger GROUP_COLOSSEUM, MAP_COLOSSEUM, $0 end -UnknownScript_0x192aea: +Script_LeftMobileBattleRoom: special Function101220 - scall UnknownScript_0x192af7 + scall Script_WalkOutOfMobileBattleRoom dotrigger $0 domaptrigger GROUP_MOBILE_BATTLE_ROOM, MAP_MOBILE_BATTLE_ROOM, $0 end -UnknownScript_0x192af7: +Script_WalkOutOfMobileBattleRoom: applymovement $3, MovementData_0x192d0b applymovement $0, MovementData_0x192d0f applymovement $3, MovementData_0x192d14 end -UnknownScript_0x192b04: +PokeCenter2F_CheckGender: checkflag ENGINE_PLAYER_IS_FEMALE - iftrue UnknownScript_0x192b12 + iftrue .Female applymovement2 MovementData_0x192cca applymovement $0, MovementData_0x192cde end -UnknownScript_0x192b12: +.Female: applymovement2 MovementData_0x192cd8 applymovement $0, MovementData_0x192ce2 loadfont - writetext UnknownText_0x193266 + writetext Text_OhPleaseWait closetext loadmovesprites applymovement2 MovementData_0x192cdc spriteface $0, LEFT loadfont - writetext UnknownText_0x193278 + writetext Text_ChangeTheLook closetext loadmovesprites playsound SFX_TINGLE @@ -435,24 +435,24 @@ UnknownScript_0x192b12: special Functionc225 applymovement $0, MovementData_0x192d1c setflag ENGINE_KRIS_IN_CABLE_CLUB - special Functione4a + special Special_ReplaceKrisSprite loadfont - writetext UnknownText_0x19329a + writetext Text_LikeTheLook closetext loadmovesprites - showemote $0, $0, 15 + showemote EMOTE_SHOCK, $0, 15 applymovement $0, MovementData_0x192ce5 end -UnknownScript_0x192b50: +Script_CleanUpFemaleFlagAfterTrade: checkflag ENGINE_KRIS_IN_CABLE_CLUB - iftrue UnknownScript_0x192b63 + iftrue .Female applymovement $2, MovementData_0x192d04 applymovement $0, MovementData_0x192cf5 applymovement $2, MovementData_0x192cfe end -UnknownScript_0x192b63: +.Female: applymovement $2, MovementData_0x192d04 applymovement $0, MovementData_0x192d28 clearflag ENGINE_KRIS_IN_CABLE_CLUB @@ -461,20 +461,20 @@ UnknownScript_0x192b63: writebyte $90 special Functionc225 applymovement $0, MovementData_0x192d1c - special Functione4a + special Special_ReplaceKrisSprite applymovement $0, MovementData_0x192d2a applymovement $2, MovementData_0x192cfe end -UnknownScript_0x192b8a: +Script_CleanUpFemaleFlagAfterBattle: checkflag ENGINE_KRIS_IN_CABLE_CLUB - iftrue UnknownScript_0x192b9d + iftrue .Female applymovement $3, MovementData_0x192d04 applymovement $0, MovementData_0x192cf5 applymovement $3, MovementData_0x192cfe end -UnknownScript_0x192b9d: +.Female: applymovement $3, MovementData_0x192d04 applymovement $0, MovementData_0x192d28 clearflag ENGINE_KRIS_IN_CABLE_CLUB @@ -483,58 +483,58 @@ UnknownScript_0x192b9d: writebyte $90 special Functionc225 applymovement $0, MovementData_0x192d1c - special Functione4a + special Special_ReplaceKrisSprite applymovement $0, MovementData_0x192d2a applymovement $3, MovementData_0x192cfe end -UnknownScript_0x192bc4: +TimeCapsuleScript_CheckPlayerGender: checkflag ENGINE_PLAYER_IS_FEMALE - iftrue UnknownScript_0x192bec + iftrue .Female checkcode VAR_FACING - if_equal $2, UnknownScript_0x192bdc - if_equal $3, UnknownScript_0x192be4 + if_equal LEFT, .MaleFacingLeft + if_equal RIGHT, .MaleFacingRight applymovement2 MovementData_0x192cd2 applymovement $0, MovementData_0x192cec end -UnknownScript_0x192bdc: +.MaleFacingLeft: applymovement2 MovementData_0x192cd2 applymovement $0, MovementData_0x192cef end -UnknownScript_0x192be4: +.MaleFacingRight: applymovement2 MovementData_0x192cd5 applymovement $0, MovementData_0x192cf2 end -UnknownScript_0x192bec: +.Female: checkcode VAR_FACING - if_equal $3, UnknownScript_0x192c00 - if_equal $2, UnknownScript_0x192c0a + if_equal RIGHT, .FemaleFacingRight + if_equal LEFT, .FemaleFacingLeft applymovement2 MovementData_0x192d33 applymovement $0, MovementData_0x192d2d - jump UnknownScript_0x192c11 + jump .FemaleContinue -UnknownScript_0x192c00: +.FemaleFacingRight: applymovement2 MovementData_0x192d36 applymovement $0, MovementData_0x192d2f - jump UnknownScript_0x192c11 + jump .FemaleContinue -UnknownScript_0x192c0a: +.FemaleFacingLeft: applymovement2 MovementData_0x192d33 applymovement $0, MovementData_0x192d31 -UnknownScript_0x192c11: +.FemaleContinue: loadfont - writetext UnknownText_0x193266 + writetext Text_OhPleaseWait closetext loadmovesprites checkcode VAR_FACING - if_not_equal $1, UnknownScript_0x192c20 + if_not_equal UP, .FemaleChangeApperance spriteface $0, LEFT -UnknownScript_0x192c20: +.FemaleChangeApperance: loadfont - writetext UnknownText_0x193278 + writetext Text_ChangeTheLook closetext loadmovesprites playsound SFX_TINGLE @@ -544,25 +544,25 @@ UnknownScript_0x192c20: applymovement $0, MovementData_0x192d22 faceperson $0, $4 setflag ENGINE_KRIS_IN_CABLE_CLUB - special Functione4a + special Special_ReplaceKrisSprite loadfont - writetext UnknownText_0x19329a + writetext Text_LikeTheLook closetext loadmovesprites - showemote $0, $0, 15 + showemote EMOTE_SHOCK, $0, 15 applymovement $0, MovementData_0x192d2d end -UnknownScript_0x192c4e: - special Function29c92 +Script_LeftTimeCapsule: + special Special_AbortLink checkflag ENGINE_KRIS_IN_CABLE_CLUB - iftrue UnknownScript_0x192c66 + iftrue .Female applymovement $4, MovementData_0x192d08 applymovement $0, MovementData_0x192cf9 applymovement $4, MovementData_0x192d01 - jump UnknownScript_0x192c8c + jump .Done -UnknownScript_0x192c66: +.Female: applymovement $4, MovementData_0x192d08 applymovement $0, MovementData_0x192cfc clearflag ENGINE_KRIS_IN_CABLE_CLUB @@ -571,10 +571,10 @@ UnknownScript_0x192c66: writebyte $90 special Functionc225 applymovement $0, MovementData_0x192d1c - special Functione4a + special Special_ReplaceKrisSprite applymovement $0, MovementData_0x192cfc applymovement $4, MovementData_0x192d01 -UnknownScript_0x192c8c: +.Done: dotrigger $0 domaptrigger GROUP_TIME_CAPSULE, MAP_TIME_CAPSULE, $0 end @@ -588,32 +588,32 @@ MapPokeCenter2FSignpost0Script: OfficerScript_0x192c9a: faceplayer loadfont - checkevent EVENT_711 - iftrue UnknownScript_0x192cb8 - writetext UnknownText_0x193190 + checkevent EVENT_MYSTERY_GIFT_DELIVERY_GUY + iftrue .AlreadyGotGift + writetext Text_MysteryGiftDeliveryGuy_Intro yesorno - iffalse UnknownScript_0x192cc4 - writetext UnknownText_0x1931c4 + iffalse .RefusedGift + writetext Text_MysteryGiftDeliveryGuy_HereYouGo keeptextopen waitbutton - special Functionc309 - iffalse UnknownScript_0x192cbe + special Special_GetMysteryGiftItem + iffalse .BagIsFull itemnotify - setevent EVENT_711 -UnknownScript_0x192cb8: - writetext UnknownText_0x1931d2 + setevent EVENT_MYSTERY_GIFT_DELIVERY_GUY +.AlreadyGotGift: + writetext Text_MysteryGiftDeliveryGuy_Outro closetext loadmovesprites end -UnknownScript_0x192cbe: - writetext UnknownText_0x1931ef +.BagIsFull: + writetext Text_MysteryGiftDeliveryGuy_NoRoom closetext loadmovesprites end -UnknownScript_0x192cc4: - writetext UnknownText_0x19324d +.RefusedGift: + writetext Text_MysteryGiftDeliveryGuy_SaidNo closetext loadmovesprites end @@ -795,7 +795,7 @@ MovementData_0x192d36: turn_head_left step_end -UnknownText_0x192d39: +Text_BattleReceptionistMobile: text "Would you like to" line "battle over a GAME" @@ -803,7 +803,7 @@ UnknownText_0x192d39: line "mobile phone?" done -UnknownText_0x192d7e: +Text_TradeReceptionistMobile: text "Would you like to" line "trade over a GAME" @@ -811,12 +811,12 @@ UnknownText_0x192d7e: line "mobile phone?" done -UnknownText_0x192dc2: +Text_ThisWayToMobileRoom: text "This way to the" line "MOBILE ROOM." done -UnknownText_0x192de0: +Text_BattleReceptionistIntro: text "Welcome to CABLE" line "CLUB COLOSSEUM." @@ -827,7 +827,7 @@ UnknownText_0x192de0: line "battle?" done -UnknownText_0x192e3a: +Text_TradeReceptionistIntro: text "Welcome to CABLE" line "TRADE CENTER." @@ -839,7 +839,7 @@ UnknownText_0x192e3a: line "trade?" done -UnknownText_0x192e9f: +Text_TimeCapsuleRecptionistIntro: text "Welcome to CABLE" line "CLUB TIME CAPSULE." @@ -851,22 +851,22 @@ UnknownText_0x192e9f: line "trade across time?" done -UnknownText_0x192f19: +Text_FriendNotReady: text "Your friend is not" line "ready." prompt -UnknownText_0x192f34: +Text_MustSaveGame: text "Before opening the" line "link, you must" cont "save your game." done -UnknownText_0x192f67: +Text_PleaseWait: text "Please wait." done -UnknownText_0x192f75: +Text_LinkTimedOut: text "The link has been" line "closed because of" cont "inactivity." @@ -876,46 +876,46 @@ UnknownText_0x192f75: cont "come again." prompt -UnknownText_0x192fd1: +Text_PleaseComeAgain: text "Please come again." prompt -UnknownText_0x192fe5: +Text_PleaseComeIn: text "Please come in." prompt -UnknownText_0x192ff6: +Text_TemporaryStagingInLinkRoom: text "We'll put you in" line "the link room for" cont "the time being." done -UnknownText_0x193029: +Text_CantLinkToThePast: text "You can't link to" line "the past here." prompt -UnknownText_0x19304a: +Text_IncompatibleRooms: text "Incompatible rooms" line "were chosen." prompt -UnknownText_0x19306b: +Text_PleaseComeIn2: text "Please come in." done -UnknownText_0x19307c: +Text_PleaseEnter: text "Please enter." prompt -UnknownText_0x19308b: +Text_RejectNewMon: text "Sorry--@" text_from_ram StringBuffer1 text "" line "can't be taken." prompt -UnknownText_0x1930a8: +Text_RejectMonWithNewMove: text "You can't take the" line "@" text_from_ram StringBuffer1 @@ -925,7 +925,7 @@ UnknownText_0x1930a8: text "." prompt -UnknownText_0x1930cf: +Text_RejectMonWithMail: text "You can't take the" line "@" text_from_ram StringBuffer1 @@ -933,25 +933,25 @@ UnknownText_0x1930cf: cont "has MAIL with you." prompt -UnknownText_0x193100: +Text_TimeCapsuleClosed: text "I'm sorry--the" line "TIME CAPSULE is" cont "being adjusted." done -UnknownText_0x19312f: +Text_TradeRoomClosed: text "I'm sorry--the" line "TRADE MACHINE is" cont "being adjusted." done -UnknownText_0x19315f: +Text_BattleRoomClosed: text "I'm sorry--the" line "BATTLE MACHINE is" cont "being adjusted." done -UnknownText_0x193190: +Text_MysteryGiftDeliveryGuy_Intro: text "Hello! You're" line "<PLAYER>, right?" @@ -959,16 +959,16 @@ UnknownText_0x193190: line "thing for you." done -UnknownText_0x1931c4: +Text_MysteryGiftDeliveryGuy_HereYouGo: text "Here you go!" done -UnknownText_0x1931d2: +Text_MysteryGiftDeliveryGuy_Outro: text "We hope to serve" line "you again." done -UnknownText_0x1931ef: +Text_MysteryGiftDeliveryGuy_NoRoom: text "Oh, you have no" line "space for this." @@ -979,26 +979,26 @@ UnknownText_0x1931ef: line "to pick it up." done -UnknownText_0x19324d: +Text_MysteryGiftDeliveryGuy_SaidNo: text "No? That's very" line "strange…" done -UnknownText_0x193266: +Text_OhPleaseWait: text "Oh, please wait." done -UnknownText_0x193278: +Text_ChangeTheLook: text "We need to change" line "the look here…" done -UnknownText_0x19329a: +Text_LikeTheLook: text "How does this" line "style look to you?" done -UnknownText_0x1932bc: +Text_BrokeStadiumRules: text "Excuse me!" para "For STADIUM rules," @@ -1022,25 +1022,25 @@ PokeCenter2F_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 6 - warp_def $7, $0, 255, GROUP_POKECENTER_2F, MAP_POKECENTER_2F + warp_def $7, $0, -1, GROUP_POKECENTER_2F, MAP_POKECENTER_2F warp_def $0, $5, 1, GROUP_TRADE_CENTER, MAP_TRADE_CENTER warp_def $0, $9, 1, GROUP_COLOSSEUM, MAP_COLOSSEUM warp_def $2, $d, 1, GROUP_TIME_CAPSULE, MAP_TIME_CAPSULE warp_def $0, $6, 1, GROUP_MOBILE_TRADE_ROOM_MOBILE, MAP_MOBILE_TRADE_ROOM_MOBILE warp_def $0, $a, 1, GROUP_MOBILE_BATTLE_ROOM, MAP_MOBILE_BATTLE_ROOM - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 1 - signpost 3, 7, $0, MapPokeCenter2FSignpost0Script + signpost 3, 7, SIGNPOST_READ, MapPokeCenter2FSignpost0Script - ; people-events +.PersonEvents: db 4 - person_event SPRITE_LINK_RECEPTIONIST, 6, 9, $6, $0, 255, 255, $a0, 0, LinkReceptionistScript_0x19289d, -1 - person_event SPRITE_LINK_RECEPTIONIST, 6, 13, $6, $0, 255, 255, $a0, 0, LinkReceptionistScript_0x192952, -1 - person_event SPRITE_LINK_RECEPTIONIST, 7, 17, $6, $0, 255, 255, $a0, 0, LinkReceptionistScript_0x192a2d, -1 - person_event SPRITE_OFFICER, 5, 5, $6, $0, 255, 255, $0, 0, OfficerScript_0x192c9a, EVENT_711 + person_event SPRITE_LINK_RECEPTIONIST, 6, 9, OW_UP | $2, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, LinkReceptionistScript_Trade, -1 + person_event SPRITE_LINK_RECEPTIONIST, 6, 13, OW_UP | $2, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, LinkReceptionistScript_Battle, -1 + person_event SPRITE_LINK_RECEPTIONIST, 7, 17, OW_UP | $2, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, LinkReceptionistScript_TimeCapsule, -1 + person_event SPRITE_OFFICER, 5, 5, OW_UP | $2, $0, -1, -1, $0, 0, OfficerScript_0x192c9a, EVENT_MYSTERY_GIFT_DELIVERY_GUY diff --git a/maps/PokeSeersHouse.asm b/maps/PokeSeersHouse.asm index d02a50549..0d4a288a0 100644 --- a/maps/PokeSeersHouse.asm +++ b/maps/PokeSeersHouse.asm @@ -1,8 +1,8 @@ PokeSeersHouse_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 SeerScript: @@ -17,17 +17,17 @@ PokeSeersHouse_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $7, $2, 7, GROUP_CIANWOOD_CITY, MAP_CIANWOOD_CITY warp_def $7, $3, 7, GROUP_CIANWOOD_CITY, MAP_CIANWOOD_CITY - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 1 - person_event SPRITE_GRANNY, 7, 6, $6, $0, 255, 255, $80, 0, SeerScript, -1 + person_event SPRITE_GRANNY, 7, 6, OW_UP | $2, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, SeerScript, -1 diff --git a/maps/PokemonFanClub.asm b/maps/PokemonFanClub.asm index 79a58e025..c88c6bdc0 100644 --- a/maps/PokemonFanClub.asm +++ b/maps/PokemonFanClub.asm @@ -1,8 +1,8 @@ PokemonFanClub_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 GentlemanScript_0x1917e9: @@ -292,24 +292,24 @@ PokemonFanClub_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $7, $2, 3, GROUP_VERMILION_CITY, MAP_VERMILION_CITY warp_def $7, $3, 3, GROUP_VERMILION_CITY, MAP_VERMILION_CITY - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 2 - signpost 0, 7, $0, MapPokemonFanClubSignpost0Script - signpost 0, 9, $0, MapPokemonFanClubSignpost1Script + signpost 0, 7, SIGNPOST_READ, MapPokemonFanClubSignpost0Script + signpost 0, 9, SIGNPOST_READ, MapPokemonFanClubSignpost1Script - ; people-events +.PersonEvents: db 6 - person_event SPRITE_GENTLEMAN, 5, 7, $6, $0, 255, 255, $0, 0, GentlemanScript_0x1917e9, -1 - person_event SPRITE_RECEPTIONIST, 5, 8, $6, $0, 255, 255, $a0, 0, ReceptionistScript_0x191821, -1 - person_event SPRITE_FISHER, 7, 6, $9, $0, 255, 255, $0, 0, FisherScript_0x191824, -1 - person_event SPRITE_TEACHER, 6, 11, $8, $0, 255, 255, $0, 0, TeacherScript_0x19186b, -1 - person_event SPRITE_FAIRY, 8, 6, $6, $0, 255, 255, $0, 0, FairyScript_0x19186e, EVENT_774 - person_event SPRITE_ODDISH, 7, 11, $16, $0, 255, 255, $a0, 0, OddishScript_0x191871, -1 + person_event SPRITE_GENTLEMAN, 5, 7, OW_UP | $2, $0, -1, -1, $0, 0, GentlemanScript_0x1917e9, -1 + person_event SPRITE_RECEPTIONIST, 5, 8, OW_UP | $2, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, ReceptionistScript_0x191821, -1 + person_event SPRITE_FISHER, 7, 6, OW_LEFT | $1, $0, -1, -1, $0, 0, FisherScript_0x191824, -1 + person_event SPRITE_TEACHER, 6, 11, OW_LEFT | $0, $0, -1, -1, $0, 0, TeacherScript_0x19186b, -1 + person_event SPRITE_FAIRY, 8, 6, OW_UP | $2, $0, -1, -1, $0, 0, FairyScript_0x19186e, EVENT_VERMILION_FAN_CLUB_DOLL + person_event SPRITE_ODDISH, 7, 11, OW_UP | $12, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, OddishScript_0x191871, -1 diff --git a/maps/PowerPlant.asm b/maps/PowerPlant.asm index 0ee68c71d..ee45ddcf1 100644 --- a/maps/PowerPlant.asm +++ b/maps/PowerPlant.asm @@ -1,12 +1,12 @@ PowerPlant_MapScriptHeader: - ; trigger count +.MapTriggers: db 2 ; triggers dw UnknownScript_0x188dc3, $0000 dw UnknownScript_0x188dc4, $0000 - ; callback count +.MapCallbacks: db 0 UnknownScript_0x188dc3: @@ -17,7 +17,7 @@ UnknownScript_0x188dc4: UnknownScript_0x188dc5: playsound SFX_CALL - showemote $0, $2, 15 + showemote EMOTE_SHOCK, $2, 15 waitbutton pause 30 applymovement $2, MovementData_0x188ed5 @@ -139,7 +139,7 @@ PowerPlantManager: closetext loadmovesprites setevent EVENT_MET_MANAGER_AT_POWER_PLANT - clearevent EVENT_76D + clearevent EVENT_CERULEAN_GYM_ROCKET clearevent EVENT_FOUND_MACHINE_PART_IN_CERULEAN_GYM domaptrigger GROUP_CERULEAN_GYM, MAP_CERULEAN_GYM, $1 dotrigger $1 @@ -156,11 +156,11 @@ UnknownScript_0x188e93: keeptextopen takeitem MACHINE_PART, 1 setevent EVENT_RETURNED_MACHINE_PART - clearevent EVENT_772 - setevent EVENT_771 - setevent EVENT_76C + clearevent EVENT_SAFFRON_TRAIN_STATION_POPULATION + setevent EVENT_ROUTE_5_6_POKEFAN_M_BLOCKS_UNDERGROUND_PATH + setevent EVENT_ROUTE_24_ROCKET setevent EVENT_RESTORED_POWER_TO_KANTO - clearevent EVENT_749 + clearevent EVENT_GOLDENROD_TRAIN_STATION_GENTLEMAN UnknownScript_0x188eac: checkevent EVENT_GOT_TM07_ZAP_CANNON iftrue UnknownScript_0x188ec5 @@ -385,26 +385,26 @@ PowerPlant_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $11, $2, 2, GROUP_ROUTE_10_NORTH, MAP_ROUTE_10_NORTH warp_def $11, $3, 2, GROUP_ROUTE_10_NORTH, MAP_ROUTE_10_NORTH - ; xy triggers +.XYTriggers: db 1 xy_trigger 1, $c, $5, $0, UnknownScript_0x188dc5, $0, $0 - ; signposts +.Signposts: db 2 - signpost 1, 0, $0, PowerPlantBookshelf - signpost 1, 1, $0, PowerPlantBookshelf + signpost 1, 0, SIGNPOST_READ, PowerPlantBookshelf + signpost 1, 1, SIGNPOST_READ, PowerPlantBookshelf - ; people-events +.PersonEvents: db 7 - person_event SPRITE_OFFICER, 18, 8, $6, $0, 255, 255, $a0, 0, OfficerScript_0x188df5, -1 - person_event SPRITE_GYM_GUY, 13, 6, $3, $0, 255, 255, $90, 0, GymGuyScript_0x188e15, -1 - person_event SPRITE_GYM_GUY, 15, 10, $7, $0, 255, 255, $90, 0, GymGuyScript_0x188e29, -1 - person_event SPRITE_OFFICER, 7, 13, $8, $0, 255, 255, $a0, 0, OfficerScript_0x188e3d, -1 - person_event SPRITE_GYM_GUY, 6, 11, $5, $1, 255, 255, $90, 0, GymGuyScript_0x188e51, -1 - person_event SPRITE_FISHER, 14, 18, $7, $0, 255, 255, $80, 0, PowerPlantManager, -1 - person_event SPRITE_GYM_GUY, 9, 9, $7, $0, 255, 255, $90, 0, GymGuyScript_0x188ecb, -1 + person_event SPRITE_OFFICER, 18, 8, OW_UP | $2, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, OfficerScript_0x188df5, -1 + person_event SPRITE_GYM_GUY, 13, 6, OW_DOWN | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, GymGuyScript_0x188e15, -1 + person_event SPRITE_GYM_GUY, 15, 10, OW_UP | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, GymGuyScript_0x188e29, -1 + person_event SPRITE_OFFICER, 7, 13, OW_LEFT | $0, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, OfficerScript_0x188e3d, -1 + person_event SPRITE_GYM_GUY, 6, 11, OW_UP | $1, $1, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, GymGuyScript_0x188e51, -1 + person_event SPRITE_FISHER, 14, 18, OW_UP | $3, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, PowerPlantManager, -1 + person_event SPRITE_GYM_GUY, 9, 9, OW_UP | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, GymGuyScript_0x188ecb, -1 diff --git a/maps/RadioTower1F.asm b/maps/RadioTower1F.asm index a51b48c13..27e9e8391 100644 --- a/maps/RadioTower1F.asm +++ b/maps/RadioTower1F.asm @@ -1,8 +1,8 @@ RadioTower1F_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 ReceptionistScript_0x5cd29: @@ -178,23 +178,7 @@ YoungsterScript_0x5ce54: jumptextfaceplayer UnknownText_0x5d4ac TrainerGruntM3: - ; bit/flag number - dw EVENT_BEAT_ROCKET_GRUNTM_3 - - ; trainer group && trainer id - db GRUNTM, 3 - - ; text when seen - dw GruntM3SeenText - - ; text when trainer beaten - dw GruntM3BeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw GruntM3Script + trainer EVENT_BEAT_ROCKET_GRUNTM_3, GRUNTM, 3, GruntM3SeenText, GruntM3BeatenText, $0000, GruntM3Script GruntM3Script: talkaftercancel @@ -484,25 +468,25 @@ RadioTower1F_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 3 warp_def $7, $2, 11, GROUP_GOLDENROD_CITY, MAP_GOLDENROD_CITY warp_def $7, $3, 11, GROUP_GOLDENROD_CITY, MAP_GOLDENROD_CITY warp_def $0, $f, 2, GROUP_RADIO_TOWER_2F, MAP_RADIO_TOWER_2F - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 2 - signpost 0, 3, $0, MapRadioTower1FSignpost0Script - signpost 0, 13, $0, MapRadioTower1FSignpost1Script + signpost 0, 3, SIGNPOST_READ, MapRadioTower1FSignpost0Script + signpost 0, 13, SIGNPOST_READ, MapRadioTower1FSignpost1Script - ; people-events +.PersonEvents: db 6 - person_event SPRITE_RECEPTIONIST, 10, 9, $8, $0, 255, 255, $80, 0, ReceptionistScript_0x5cd29, -1 - person_event SPRITE_LASS, 8, 20, $8, $0, 255, 255, $80, 0, LassScript_0x5ce51, EVENT_6CF - person_event SPRITE_YOUNGSTER, 8, 19, $9, $0, 255, 255, $90, 0, YoungsterScript_0x5ce54, EVENT_6CF - person_event SPRITE_ROCKET, 5, 18, $6, $0, 255, 255, $2, 3, TrainerGruntM3, EVENT_6CE - person_event SPRITE_GENTLEMAN, 10, 12, $7, $0, 255, 255, $90, 0, GentlemanScript_0x5cd3d, EVENT_6CF - person_event SPRITE_COOLTRAINER_F, 10, 16, $7, $0, 255, 255, $a0, 0, CooltrainerFScript_0x5cdd5, EVENT_6CF + person_event SPRITE_RECEPTIONIST, 10, 9, OW_LEFT | $0, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, ReceptionistScript_0x5cd29, -1 + person_event SPRITE_LASS, 8, 20, OW_LEFT | $0, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, LassScript_0x5ce51, EVENT_GOLDENROD_CITY_CIVILIANS + person_event SPRITE_YOUNGSTER, 8, 19, OW_LEFT | $1, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, YoungsterScript_0x5ce54, EVENT_GOLDENROD_CITY_CIVILIANS + person_event SPRITE_ROCKET, 5, 18, OW_UP | $2, $0, -1, -1, $2, 3, TrainerGruntM3, EVENT_RADIO_TOWER_ROCKET_TAKEOVER + person_event SPRITE_GENTLEMAN, 10, 12, OW_UP | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, GentlemanScript_0x5cd3d, EVENT_GOLDENROD_CITY_CIVILIANS + person_event SPRITE_COOLTRAINER_F, 10, 16, OW_UP | $3, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, CooltrainerFScript_0x5cdd5, EVENT_GOLDENROD_CITY_CIVILIANS diff --git a/maps/RadioTower2F.asm b/maps/RadioTower2F.asm index f0933aae1..e5ec9dfee 100644 --- a/maps/RadioTower2F.asm +++ b/maps/RadioTower2F.asm @@ -1,8 +1,8 @@ RadioTower2F_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 UnknownScript_0x5d6fd: @@ -42,23 +42,7 @@ BlackBeltScript_0x5d722: jumptextfaceplayer UnknownText_0x5da44 TrainerGruntM4: - ; bit/flag number - dw EVENT_BEAT_ROCKET_GRUNTM_4 - - ; trainer group && trainer id - db GRUNTM, 4 - - ; text when seen - dw GruntM4SeenText - - ; text when trainer beaten - dw GruntM4BeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw GruntM4Script + trainer EVENT_BEAT_ROCKET_GRUNTM_4, GRUNTM, 4, GruntM4SeenText, GruntM4BeatenText, $0000, GruntM4Script GruntM4Script: talkaftercancel @@ -69,23 +53,7 @@ GruntM4Script: end TrainerGruntM5: - ; bit/flag number - dw EVENT_BEAT_ROCKET_GRUNTM_5 - - ; trainer group && trainer id - db GRUNTM, 5 - - ; text when seen - dw GruntM5SeenText - - ; text when trainer beaten - dw GruntM5BeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw GruntM5Script + trainer EVENT_BEAT_ROCKET_GRUNTM_5, GRUNTM, 5, GruntM5SeenText, GruntM5BeatenText, $0000, GruntM5Script GruntM5Script: talkaftercancel @@ -96,23 +64,7 @@ GruntM5Script: end TrainerGruntM6: - ; bit/flag number - dw EVENT_BEAT_ROCKET_GRUNTM_6 - - ; trainer group && trainer id - db GRUNTM, 6 - - ; text when seen - dw GruntM6SeenText - - ; text when trainer beaten - dw GruntM6BeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw GruntM6Script + trainer EVENT_BEAT_ROCKET_GRUNTM_6, GRUNTM, 6, GruntM6SeenText, GruntM6BeatenText, $0000, GruntM6Script GruntM6Script: talkaftercancel @@ -123,23 +75,7 @@ GruntM6Script: end TrainerGruntF2: - ; bit/flag number - dw EVENT_BEAT_ROCKET_GRUNTF_2 - - ; trainer group && trainer id - db GRUNTF, 2 - - ; text when seen - dw GruntF2SeenText - - ; text when trainer beaten - dw GruntF2BeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw GruntF2Script + trainer EVENT_BEAT_ROCKET_GRUNTF_2, GRUNTF, 2, GruntF2SeenText, GruntF2BeatenText, $0000, GruntF2Script GruntF2Script: talkaftercancel @@ -156,16 +92,16 @@ Buena: iftrue UnknownScript_0x5d865 checkevent EVENT_MET_BUENA iffalse UnknownScript_0x5d800 - checkflag ENGINE_60 + checkflag ENGINE_BUENAS_PASSWORD_2 iftrue UnknownScript_0x5d82f checkcode VAR_HOUR - if_less_than $12, UnknownScript_0x5d893 - checkflag ENGINE_5F + if_less_than 18, UnknownScript_0x5d893 + checkflag ENGINE_BUENAS_PASSWORD iffalse UnknownScript_0x5d80a checkitem BLUE_CARD iffalse UnknownScript_0x5d86b checkcode VAR_BLUECARDBALANCE - if_equal $1e, UnknownScript_0x5d87f + if_equal 30, UnknownScript_0x5d87f playmusic MUSIC_BUENAS_PASSWORD writetext UnknownText_0x5de35 special Function4ae12 @@ -197,7 +133,7 @@ UnknownScript_0x5d7be: writevarcode VAR_BLUECARDBALANCE waitbutton playsound SFX_TRANSACTION - setflag ENGINE_60 + setflag ENGINE_BUENAS_PASSWORD_2 pause 20 spriteface $b, RIGHT loadfont @@ -220,7 +156,7 @@ UnknownScript_0x5d80a: writetext UnknownText_0x5de10 closetext loadmovesprites - checkcellnum $25 + checkcellnum PHONE_BUENA iftrue UnknownScript_0x5d81a checkevent EVENT_BUENA_OFFERED_HER_PHONE_NUMBER iftrue UnknownScript_0x5d8cc @@ -242,7 +178,7 @@ UnknownScript_0x5d82f: writetext UnknownText_0x5df6c closetext loadmovesprites - checkcellnum $25 + checkcellnum PHONE_BUENA iftrue UnknownScript_0x5d83f checkevent EVENT_BUENA_OFFERED_HER_PHONE_NUMBER iftrue UnknownScript_0x5d8cc @@ -252,7 +188,7 @@ UnknownScript_0x5d83f: end UnknownScript_0x5d845: - setflag ENGINE_60 + setflag ENGINE_BUENAS_PASSWORD_2 loadfont writetext UnknownText_0x5e01c closetext @@ -279,7 +215,7 @@ UnknownScript_0x5d86b: writetext UnknownText_0x5e192 closetext loadmovesprites - checkcellnum $25 + checkcellnum PHONE_BUENA iftrue UnknownScript_0x5d87b checkevent EVENT_BUENA_OFFERED_HER_PHONE_NUMBER_NO_BLUE_CARD iftrue UnknownScript_0x5d8cc @@ -291,7 +227,7 @@ UnknownScript_0x5d87f: writetext UnknownText_0x5e0f1 closetext loadmovesprites - checkcellnum $25 + checkcellnum PHONE_BUENA iftrue UnknownScript_0x5d88f checkevent EVENT_BUENA_OFFERED_HER_PHONE_NUMBER_NO_BLUE_CARD iftrue UnknownScript_0x5d8cc @@ -303,7 +239,7 @@ UnknownScript_0x5d893: writetext UnknownText_0x5e131 closetext loadmovesprites - checkcellnum $25 + checkcellnum PHONE_BUENA iftrue UnknownScript_0x5d8a3 checkevent EVENT_BUENA_OFFERED_HER_PHONE_NUMBER iftrue UnknownScript_0x5d8cc @@ -311,7 +247,7 @@ UnknownScript_0x5d8a3: end UnknownScript_0x5d8a4: - checkcellnum $25 + checkcellnum PHONE_BUENA iftrue UnknownScript_0x5d8fe pause 20 spriteface $b, DOWN @@ -320,7 +256,7 @@ UnknownScript_0x5d8a4: pause 15 checkevent EVENT_BUENA_OFFERED_HER_PHONE_NUMBER_NO_BLUE_CARD iftrue UnknownScript_0x5d8cc - showemote $0, $b, 15 + showemote EMOTE_SHOCK, $b, 15 setevent EVENT_BUENA_OFFERED_HER_PHONE_NUMBER_NO_BLUE_CARD setevent EVENT_BUENA_OFFERED_HER_PHONE_NUMBER loadfont @@ -331,7 +267,7 @@ UnknownScript_0x5d8cc: loadfont writetext UnknownText_0x5e2bf UnknownScript_0x5d8d0: - askforphonenumber $25 + askforphonenumber PHONE_BUENA if_equal $1, UnknownScript_0x5d8f6 if_equal $2, UnknownScript_0x5d8ed writetext UnknownText_0x5e2f3 @@ -342,7 +278,7 @@ UnknownScript_0x5d8d0: closetext loadmovesprites spriteface $b, RIGHT - addcellnum $25 + addcellnum PHONE_BUENA end UnknownScript_0x5d8ed: @@ -765,33 +701,33 @@ RadioTower2F_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $0, $0, 1, GROUP_RADIO_TOWER_3F, MAP_RADIO_TOWER_3F warp_def $0, $f, 3, GROUP_RADIO_TOWER_1F, MAP_RADIO_TOWER_1F - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 6 - signpost 0, 3, $0, MapRadioTower2FSignpost0Script - signpost 0, 5, $0, MapRadioTower2FSignpost1Script - signpost 1, 9, $0, RadioTower2FBookshelf - signpost 1, 10, $0, RadioTower2FBookshelf - signpost 1, 11, $0, RadioTower2FBookshelf - signpost 0, 13, $0, MapRadioTower2FSignpost5Script - - ; people-events + signpost 0, 3, SIGNPOST_READ, MapRadioTower2FSignpost0Script + signpost 0, 5, SIGNPOST_READ, MapRadioTower2FSignpost1Script + signpost 1, 9, SIGNPOST_READ, RadioTower2FBookshelf + signpost 1, 10, SIGNPOST_READ, RadioTower2FBookshelf + signpost 1, 11, SIGNPOST_READ, RadioTower2FBookshelf + signpost 0, 13, SIGNPOST_READ, MapRadioTower2FSignpost5Script + +.PersonEvents: db 11 - person_event SPRITE_SUPER_NERD, 10, 10, $8, $0, 255, 255, $a0, 0, SuperNerdScript_0x5d6fe, EVENT_6CF - person_event SPRITE_TEACHER, 6, 21, $5, $1, 255, 255, $80, 0, TeacherScript_0x5d701, -1 - person_event SPRITE_ROCKET, 8, 5, $7, $0, 255, 255, $2, 3, TrainerGruntM4, EVENT_6CE - person_event SPRITE_ROCKET, 8, 12, $6, $0, 255, 255, $2, 3, TrainerGruntM5, EVENT_6CE - person_event SPRITE_ROCKET, 5, 8, $6, $0, 255, 255, $2, 2, TrainerGruntM6, EVENT_6CE - person_event SPRITE_ROCKET_GIRL, 9, 14, $7, $0, 255, 255, $82, 3, TrainerGruntF2, EVENT_6CE - person_event SPRITE_BLACK_BELT, 5, 4, $6, $0, 255, 255, $0, 0, BlackBeltScript_0x5d71f, EVENT_6D1 - person_event SPRITE_BLACK_BELT, 5, 5, $6, $0, 255, 255, $0, 0, BlackBeltScript_0x5d722, EVENT_6D0 - person_event SPRITE_JIGGLYPUFF, 5, 16, $16, $0, 255, 255, $0, 0, JigglypuffScript_0x5d715, -1 - person_event SPRITE_BUENA, 9, 18, $9, $0, 255, 255, $80, 0, Buena, -1 - person_event SPRITE_RECEPTIONIST, 11, 16, $9, $0, 255, 255, $a0, 0, ReceptionistScript_0x5d8ff, EVENT_6CF + person_event SPRITE_SUPER_NERD, 10, 10, OW_LEFT | $0, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, SuperNerdScript_0x5d6fe, EVENT_GOLDENROD_CITY_CIVILIANS + person_event SPRITE_TEACHER, 6, 21, OW_UP | $1, $1, -1, -1, (PAL_OW_RED << 4) | $80, 0, TeacherScript_0x5d701, -1 + person_event SPRITE_ROCKET, 8, 5, OW_UP | $3, $0, -1, -1, $2, 3, TrainerGruntM4, EVENT_RADIO_TOWER_ROCKET_TAKEOVER + person_event SPRITE_ROCKET, 8, 12, OW_UP | $2, $0, -1, -1, $2, 3, TrainerGruntM5, EVENT_RADIO_TOWER_ROCKET_TAKEOVER + person_event SPRITE_ROCKET, 5, 8, OW_UP | $2, $0, -1, -1, $2, 2, TrainerGruntM6, EVENT_RADIO_TOWER_ROCKET_TAKEOVER + person_event SPRITE_ROCKET_GIRL, 9, 14, OW_UP | $3, $0, -1, -1, (PAL_OW_RED << 4) | $82, 3, TrainerGruntF2, EVENT_RADIO_TOWER_ROCKET_TAKEOVER + person_event SPRITE_BLACK_BELT, 5, 4, OW_UP | $2, $0, -1, -1, $0, 0, BlackBeltScript_0x5d71f, EVENT_RADIO_TOWER_BLACKBELT_BLOCKS_STAIRS + person_event SPRITE_BLACK_BELT, 5, 5, OW_UP | $2, $0, -1, -1, $0, 0, BlackBeltScript_0x5d722, EVENT_RADIO_TOWER_CIVILIANS_AFTER + person_event SPRITE_JIGGLYPUFF, 5, 16, OW_UP | $12, $0, -1, -1, $0, 0, JigglypuffScript_0x5d715, -1 + person_event SPRITE_BUENA, 9, 18, OW_LEFT | $1, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, Buena, -1 + person_event SPRITE_RECEPTIONIST, 11, 16, OW_LEFT | $1, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, ReceptionistScript_0x5d8ff, EVENT_GOLDENROD_CITY_CIVILIANS diff --git a/maps/RadioTower3F.asm b/maps/RadioTower3F.asm index f504583e1..17abebca7 100644 --- a/maps/RadioTower3F.asm +++ b/maps/RadioTower3F.asm @@ -1,8 +1,8 @@ RadioTower3F_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 1 ; callbacks @@ -77,23 +77,7 @@ UnknownScript_0x5e5a1: end TrainerGruntM7: - ; bit/flag number - dw EVENT_BEAT_ROCKET_GRUNTM_7 - - ; trainer group && trainer id - db GRUNTM, 7 - - ; text when seen - dw GruntM7SeenText - - ; text when trainer beaten - dw GruntM7BeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw GruntM7Script + trainer EVENT_BEAT_ROCKET_GRUNTM_7, GRUNTM, 7, GruntM7SeenText, GruntM7BeatenText, $0000, GruntM7Script GruntM7Script: talkaftercancel @@ -104,23 +88,7 @@ GruntM7Script: end TrainerGruntM8: - ; bit/flag number - dw EVENT_BEAT_ROCKET_GRUNTM_8 - - ; trainer group && trainer id - db GRUNTM, 8 - - ; text when seen - dw GruntM8SeenText - - ; text when trainer beaten - dw GruntM8BeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw GruntM8Script + trainer EVENT_BEAT_ROCKET_GRUNTM_8, GRUNTM, 8, GruntM8SeenText, GruntM8BeatenText, $0000, GruntM8Script GruntM8Script: talkaftercancel @@ -131,23 +99,7 @@ GruntM8Script: end TrainerGruntM9: - ; bit/flag number - dw EVENT_BEAT_ROCKET_GRUNTM_9 - - ; trainer group && trainer id - db GRUNTM, 9 - - ; text when seen - dw GruntM9SeenText - - ; text when trainer beaten - dw GruntM9BeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw GruntM9Script + trainer EVENT_BEAT_ROCKET_GRUNTM_9, GRUNTM, 9, GruntM9SeenText, GruntM9BeatenText, $0000, GruntM9Script GruntM9Script: talkaftercancel @@ -158,23 +110,7 @@ GruntM9Script: end TrainerScientistMarc: - ; bit/flag number - dw EVENT_BEAT_SCIENTIST_MARC - - ; trainer group && trainer id - db SCIENTIST, MARC - - ; text when seen - dw ScientistMarcSeenText - - ; text when trainer beaten - dw ScientistMarcBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw ScientistMarcScript + trainer EVENT_BEAT_SCIENTIST_MARC, SCIENTIST, MARC, ScientistMarcSeenText, ScientistMarcBeatenText, $0000, ScientistMarcScript ScientistMarcScript: talkaftercancel @@ -390,27 +326,27 @@ RadioTower3F_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 3 warp_def $0, $0, 1, GROUP_RADIO_TOWER_2F, MAP_RADIO_TOWER_2F warp_def $0, $7, 2, GROUP_RADIO_TOWER_4F, MAP_RADIO_TOWER_4F warp_def $0, $11, 4, GROUP_RADIO_TOWER_4F, MAP_RADIO_TOWER_4F - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 3 - signpost 0, 3, $0, MapRadioTower3FSignpost0Script - signpost 0, 9, $0, MapRadioTower3FSignpost1Script - signpost 2, 14, $1, MapRadioTower3FSignpost2Script + signpost 0, 3, SIGNPOST_READ, MapRadioTower3FSignpost0Script + signpost 0, 9, SIGNPOST_READ, MapRadioTower3FSignpost1Script + signpost 2, 14, SIGNPOST_UP, MapRadioTower3FSignpost2Script - ; people-events +.PersonEvents: db 7 - person_event SPRITE_SUPER_NERD, 8, 11, $7, $0, 255, 255, $90, 0, SuperNerdScript_0x5e553, EVENT_6D0 - person_event SPRITE_GYM_GUY, 8, 7, $a, $0, 255, 255, $80, 0, GymGuyScript_0x5e556, -1 - person_event SPRITE_COOLTRAINER_F, 7, 15, $2, $11, 255, 255, $a0, 0, CooltrainerFScript_0x5e56a, -1 - person_event SPRITE_ROCKET, 5, 9, $9, $0, 255, 255, $2, 2, TrainerGruntM7, EVENT_6CE - person_event SPRITE_ROCKET, 6, 10, $6, $0, 255, 255, $2, 3, TrainerGruntM8, EVENT_6CE - person_event SPRITE_ROCKET, 10, 20, $7, $0, 255, 255, $2, 3, TrainerGruntM9, EVENT_6CE - person_event SPRITE_SCIENTIST, 10, 13, $7, $0, 255, 255, $92, 5, TrainerScientistMarc, EVENT_6CE + person_event SPRITE_SUPER_NERD, 8, 11, OW_UP | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, SuperNerdScript_0x5e553, EVENT_RADIO_TOWER_CIVILIANS_AFTER + person_event SPRITE_GYM_GUY, 8, 7, OW_LEFT | $2, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, GymGuyScript_0x5e556, -1 + person_event SPRITE_COOLTRAINER_F, 7, 15, OW_DOWN | $2, $11, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, CooltrainerFScript_0x5e56a, -1 + person_event SPRITE_ROCKET, 5, 9, OW_LEFT | $1, $0, -1, -1, $2, 2, TrainerGruntM7, EVENT_RADIO_TOWER_ROCKET_TAKEOVER + person_event SPRITE_ROCKET, 6, 10, OW_UP | $2, $0, -1, -1, $2, 3, TrainerGruntM8, EVENT_RADIO_TOWER_ROCKET_TAKEOVER + person_event SPRITE_ROCKET, 10, 20, OW_UP | $3, $0, -1, -1, $2, 3, TrainerGruntM9, EVENT_RADIO_TOWER_ROCKET_TAKEOVER + person_event SPRITE_SCIENTIST, 10, 13, OW_UP | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 5, TrainerScientistMarc, EVENT_RADIO_TOWER_ROCKET_TAKEOVER diff --git a/maps/RadioTower4F.asm b/maps/RadioTower4F.asm index 0bcddf8bb..4981214bf 100644 --- a/maps/RadioTower4F.asm +++ b/maps/RadioTower4F.asm @@ -1,8 +1,8 @@ RadioTower4F_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 FisherScript_0x5eb82: @@ -47,23 +47,7 @@ GrowlitheScript_0x5ebb2: end TrainerGruntM10: - ; bit/flag number - dw EVENT_BEAT_ROCKET_GRUNTM_10 - - ; trainer group && trainer id - db GRUNTM, 10 - - ; text when seen - dw GruntM10SeenText - - ; text when trainer beaten - dw GruntM10BeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw GruntM10Script + trainer EVENT_BEAT_ROCKET_GRUNTM_10, GRUNTM, 10, GruntM10SeenText, GruntM10BeatenText, $0000, GruntM10Script GruntM10Script: talkaftercancel @@ -74,23 +58,7 @@ GruntM10Script: end TrainerExecutivem2: - ; bit/flag number - dw EVENT_BEAT_ROCKET_EXECUTIVEM_2 - - ; trainer group && trainer id - db EXECUTIVEM, 2 - - ; text when seen - dw Executivem2SeenText - - ; text when trainer beaten - dw Executivem2BeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw Executivem2Script + trainer EVENT_BEAT_ROCKET_EXECUTIVEM_2, EXECUTIVEM, 2, Executivem2SeenText, Executivem2BeatenText, $0000, Executivem2Script Executivem2Script: talkaftercancel @@ -101,23 +69,7 @@ Executivem2Script: end TrainerGruntF4: - ; bit/flag number - dw EVENT_BEAT_ROCKET_GRUNTF_4 - - ; trainer group && trainer id - db GRUNTF, 4 - - ; text when seen - dw GruntF4SeenText - - ; text when trainer beaten - dw GruntF4BeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw GruntF4Script + trainer EVENT_BEAT_ROCKET_GRUNTF_4, GRUNTF, 4, GruntF4SeenText, GruntF4BeatenText, $0000, GruntF4Script GruntF4Script: talkaftercancel @@ -128,23 +80,7 @@ GruntF4Script: end TrainerScientistRich: - ; bit/flag number - dw EVENT_BEAT_SCIENTIST_RICH - - ; trainer group && trainer id - db SCIENTIST, RICH - - ; text when seen - dw ScientistRichSeenText - - ; text when trainer beaten - dw ScientistRichBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw ScientistRichScript + trainer EVENT_BEAT_SCIENTIST_RICH, SCIENTIST, RICH, ScientistRichSeenText, ScientistRichBeatenText, $0000, ScientistRichScript ScientistRichScript: talkaftercancel @@ -304,27 +240,27 @@ RadioTower4F_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 4 warp_def $0, $0, 1, GROUP_RADIO_TOWER_5F, MAP_RADIO_TOWER_5F warp_def $0, $9, 2, GROUP_RADIO_TOWER_3F, MAP_RADIO_TOWER_3F warp_def $0, $c, 2, GROUP_RADIO_TOWER_5F, MAP_RADIO_TOWER_5F warp_def $0, $11, 3, GROUP_RADIO_TOWER_3F, MAP_RADIO_TOWER_3F - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 2 - signpost 0, 7, $0, MapRadioTower4FSignpost0Script - signpost 0, 15, $0, MapRadioTower4FSignpost1Script + signpost 0, 7, SIGNPOST_READ, MapRadioTower4FSignpost0Script + signpost 0, 15, SIGNPOST_READ, MapRadioTower4FSignpost1Script - ; people-events +.PersonEvents: db 7 - person_event SPRITE_FISHER, 8, 10, $7, $0, 255, 255, $80, 0, FisherScript_0x5eb82, EVENT_6D0 - person_event SPRITE_TEACHER, 10, 18, $3, $0, 255, 255, $a0, 0, TeacherScript_0x5eb85, -1 - person_event SPRITE_GROWLITHE, 11, 16, $16, $0, 255, 255, $80, 0, GrowlitheScript_0x5ebb2, -1 - person_event SPRITE_ROCKET, 10, 9, $1f, $0, 255, 255, $2, 3, TrainerGruntM10, EVENT_6CE - person_event SPRITE_ROCKET, 5, 18, $8, $2, 255, 255, $2, 2, TrainerExecutivem2, EVENT_6CE - person_event SPRITE_ROCKET_GIRL, 8, 16, $9, $0, 255, 255, $82, 1, TrainerGruntF4, EVENT_6CE - person_event SPRITE_SCIENTIST, 6, 8, $8, $0, 255, 255, $92, 4, TrainerScientistRich, EVENT_6CE + person_event SPRITE_FISHER, 8, 10, OW_UP | $3, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, FisherScript_0x5eb82, EVENT_RADIO_TOWER_CIVILIANS_AFTER + person_event SPRITE_TEACHER, 10, 18, OW_DOWN | $3, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, TeacherScript_0x5eb85, -1 + person_event SPRITE_GROWLITHE, 11, 16, OW_UP | $12, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, GrowlitheScript_0x5ebb2, -1 + person_event SPRITE_ROCKET, 10, 9, OW_RIGHT | $13, $0, -1, -1, $2, 3, TrainerGruntM10, EVENT_RADIO_TOWER_ROCKET_TAKEOVER + person_event SPRITE_ROCKET, 5, 18, OW_LEFT | $0, $2, -1, -1, $2, 2, TrainerExecutivem2, EVENT_RADIO_TOWER_ROCKET_TAKEOVER + person_event SPRITE_ROCKET_GIRL, 8, 16, OW_LEFT | $1, $0, -1, -1, (PAL_OW_RED << 4) | $82, 1, TrainerGruntF4, EVENT_RADIO_TOWER_ROCKET_TAKEOVER + person_event SPRITE_SCIENTIST, 6, 8, OW_LEFT | $0, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 4, TrainerScientistRich, EVENT_RADIO_TOWER_ROCKET_TAKEOVER diff --git a/maps/RadioTower5F.asm b/maps/RadioTower5F.asm index 1811692a5..b435e6a80 100644 --- a/maps/RadioTower5F.asm +++ b/maps/RadioTower5F.asm @@ -1,5 +1,5 @@ RadioTower5F_MapScriptHeader: - ; trigger count +.MapTriggers: db 3 ; triggers @@ -7,7 +7,7 @@ RadioTower5F_MapScriptHeader: dw UnknownScript_0x6000f, $0000 dw UnknownScript_0x60010, $0000 - ; callback count +.MapCallbacks: db 0 UnknownScript_0x6000e: @@ -21,7 +21,7 @@ UnknownScript_0x60010: UnknownScript_0x60011: spriteface $2, UP - showemote $0, $2, 15 + showemote EMOTE_SHOCK, $2, 15 loadfont writetext UnknownText_0x60128 closetext @@ -63,23 +63,7 @@ UnknownScript_0x60054: end TrainerExecutivef1: - ; bit/flag number - dw EVENT_BEAT_ROCKET_EXECUTIVEF_1 - - ; trainer group && trainer id - db EXECUTIVEF, 1 - - ; text when seen - dw Executivef1SeenText - - ; text when trainer beaten - dw Executivef1BeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw Executivef1Script + trainer EVENT_BEAT_ROCKET_EXECUTIVEF_1, EXECUTIVEF, 1, Executivef1SeenText, Executivef1BeatenText, $0000, Executivef1Script Executivef1Script: talkaftercancel @@ -106,24 +90,24 @@ UnknownScript_0x6006e: writetext UnknownText_0x6050e closetext loadmovesprites - special Function8c0b6 - special Functiond91 + special Special_FadeBlackQuickly + special Special_ReloadSpritesNoPalettes disappear $3 disappear $4 pause 15 - special Function8c0ab + special Special_FadeInQuickly setevent EVENT_BEAT_ROCKET_EXECUTIVEM_1 setevent EVENT_CLEARED_RADIO_TOWER clearflag ENGINE_ROCKETS_IN_RADIO_TOWER - setevent EVENT_6CC - setevent EVENT_6CD - setevent EVENT_6CE - clearevent EVENT_736 + setevent EVENT_GOLDENROD_CITY_ROCKET_SCOUT + setevent EVENT_GOLDENROD_CITY_ROCKET_TAKEOVER + setevent EVENT_RADIO_TOWER_ROCKET_TAKEOVER + clearevent EVENT_MAHOGANY_MART_OWNERS clearflag ENGINE_ROCKETS_IN_MAHOGANY - clearevent EVENT_6CF - clearevent EVENT_6D0 - setevent EVENT_6E3 - clearevent EVENT_6E4 + clearevent EVENT_GOLDENROD_CITY_CIVILIANS + clearevent EVENT_RADIO_TOWER_CIVILIANS_AFTER + setevent EVENT_BLACKTHORN_CITY_SUPER_NERD_BLOCKS_GYM + clearevent EVENT_BLACKTHORN_CITY_SUPER_NERD_DOES_NOT_BLOCK_GYM special PlayMapMusic disappear $2 moveperson $2, $c, $0 @@ -140,7 +124,7 @@ UnknownScript_0x6006e: dotrigger $2 domaptrigger GROUP_ECRUTEAK_HOUSE, MAP_ECRUTEAK_HOUSE, $0 setevent EVENT_GOT_CLEAR_BELL - setevent EVENT_761 + setevent EVENT_TEAM_ROCKET_DISBANDED jump UnknownScript_0x600f1 UnknownScript_0x600f1: @@ -435,28 +419,28 @@ RadioTower5F_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $0, $0, 1, GROUP_RADIO_TOWER_4F, MAP_RADIO_TOWER_4F warp_def $0, $c, 3, GROUP_RADIO_TOWER_4F, MAP_RADIO_TOWER_4F - ; xy triggers +.XYTriggers: db 2 xy_trigger 0, $3, $0, $0, UnknownScript_0x60011, $0, $0 xy_trigger 1, $5, $10, $0, UnknownScript_0x6006e, $0, $0 - ; signposts +.Signposts: db 5 - signpost 0, 3, $0, MapRadioTower5FSignpost0Script - signpost 0, 11, $0, MapRadioTower5FSignpost2Script - signpost 0, 15, $0, MapRadioTower5FSignpost2Script - signpost 1, 16, $0, RadioTower5FBookshelf - signpost 1, 17, $0, RadioTower5FBookshelf + signpost 0, 3, SIGNPOST_READ, MapRadioTower5FSignpost0Script + signpost 0, 11, SIGNPOST_READ, MapRadioTower5FSignpost2Script + signpost 0, 15, SIGNPOST_READ, MapRadioTower5FSignpost2Script + signpost 1, 16, SIGNPOST_READ, RadioTower5FBookshelf + signpost 1, 17, SIGNPOST_READ, RadioTower5FBookshelf - ; people-events +.PersonEvents: db 5 - person_event SPRITE_GENTLEMAN, 10, 7, $3, $0, 255, 255, $0, 0, Director, -1 - person_event SPRITE_ROCKET, 9, 17, $8, $0, 255, 255, $0, 0, ObjectEvent, EVENT_6CE - person_event SPRITE_ROCKET_GIRL, 6, 21, $8, $0, 255, 255, $82, 1, TrainerExecutivef1, EVENT_6CE - person_event SPRITE_ROCKER, 9, 17, $8, $0, 255, 255, $80, 0, Ben, EVENT_6D0 - person_event SPRITE_POKE_BALL, 9, 12, $1, $0, 255, 255, $1, 0, ItemFragment_0x600fe, EVENT_7CD + person_event SPRITE_GENTLEMAN, 10, 7, OW_DOWN | $3, $0, -1, -1, $0, 0, Director, -1 + person_event SPRITE_ROCKET, 9, 17, OW_LEFT | $0, $0, -1, -1, $0, 0, ObjectEvent, EVENT_RADIO_TOWER_ROCKET_TAKEOVER + person_event SPRITE_ROCKET_GIRL, 6, 21, OW_LEFT | $0, $0, -1, -1, (PAL_OW_RED << 4) | $82, 1, TrainerExecutivef1, EVENT_RADIO_TOWER_ROCKET_TAKEOVER + person_event SPRITE_ROCKER, 9, 17, OW_LEFT | $0, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, Ben, EVENT_RADIO_TOWER_CIVILIANS_AFTER + person_event SPRITE_POKE_BALL, 9, 12, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x600fe, EVENT_RADIO_TOWER_5F_ULTRA_BALL diff --git a/maps/RedsHouse1F.asm b/maps/RedsHouse1F.asm index 80f5ecf59..3de913163 100644 --- a/maps/RedsHouse1F.asm +++ b/maps/RedsHouse1F.asm @@ -1,11 +1,11 @@ RedsHouse1F_MapScriptHeader: - ; trigger count +.MapTriggers: db 1 ; triggers dw .Trigger, $0000 - ; callback count +.MapCallbacks: db 0 .Trigger @@ -77,21 +77,21 @@ RedsHouse1F_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 3 warp_def $7, $2, 1, GROUP_PALLET_TOWN, MAP_PALLET_TOWN warp_def $7, $3, 1, GROUP_PALLET_TOWN, MAP_PALLET_TOWN warp_def $0, $7, 1, GROUP_REDS_HOUSE_2F, MAP_REDS_HOUSE_2F - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 3 - signpost 1, 0, $0, RedsHouse1FBookshelf - signpost 1, 1, $0, RedsHouse1FBookshelf - signpost 1, 2, $0, RedsHouse1FTV + signpost 1, 0, SIGNPOST_READ, RedsHouse1FBookshelf + signpost 1, 1, SIGNPOST_READ, RedsHouse1FBookshelf + signpost 1, 2, SIGNPOST_READ, RedsHouse1FTV - ; people-events +.PersonEvents: db 1 - person_event SPRITE_REDS_MOM, 7, 9, $8, $0, 255, 255, $0, 0, RedsMom, -1 + person_event SPRITE_REDS_MOM, 7, 9, OW_LEFT | $0, $0, -1, -1, $0, 0, RedsMom, -1 diff --git a/maps/RedsHouse2F.asm b/maps/RedsHouse2F.asm index 0a6e90281..895288e0a 100644 --- a/maps/RedsHouse2F.asm +++ b/maps/RedsHouse2F.asm @@ -1,8 +1,8 @@ RedsHouse2F_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 MapRedsHouse2FSignpost0Script: @@ -29,17 +29,17 @@ RedsHouse2F_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 1 warp_def $0, $7, 3, GROUP_REDS_HOUSE_1F, MAP_REDS_HOUSE_1F - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 2 - signpost 5, 3, $0, MapRedsHouse2FSignpost0Script - signpost 1, 0, $0, MapRedsHouse2FSignpost1Script + signpost 5, 3, SIGNPOST_READ, MapRedsHouse2FSignpost0Script + signpost 1, 0, SIGNPOST_READ, MapRedsHouse2FSignpost1Script - ; people-events +.PersonEvents: db 0 diff --git a/maps/RockTunnel1F.asm b/maps/RockTunnel1F.asm index 5082a7626..3eeeb7a18 100644 --- a/maps/RockTunnel1F.asm +++ b/maps/RockTunnel1F.asm @@ -1,8 +1,8 @@ RockTunnel1F_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 ItemFragment_0x743b5: @@ -12,20 +12,18 @@ ItemFragment_0x743b7: db TM_STEEL_WING, 1 MapRockTunnel1FSignpostItem0: - dw $00e7 - db X_ACCURACY + dwb EVENT_ROCK_TUNNEL_1F_HIDDEN_X_ACCURACY, X_ACCURACY MapRockTunnel1FSignpostItem1: - dw $00e8 - db X_DEFEND + dwb EVENT_ROCK_TUNNEL_1F_HIDDEN_X_DEFEND, X_DEFEND RockTunnel1F_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 6 warp_def $3, $f, 1, GROUP_ROUTE_9, MAP_ROUTE_9 warp_def $19, $b, 1, GROUP_ROUTE_10_SOUTH, MAP_ROUTE_10_SOUTH @@ -34,15 +32,15 @@ RockTunnel1F_MapEventHeader: warp_def $3, $1b, 4, GROUP_ROCK_TUNNEL_B1F, MAP_ROCK_TUNNEL_B1F warp_def $d, $1b, 1, GROUP_ROCK_TUNNEL_B1F, MAP_ROCK_TUNNEL_B1F - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 2 - signpost 4, 24, $7, MapRockTunnel1FSignpostItem0 - signpost 15, 21, $7, MapRockTunnel1FSignpostItem1 + signpost 4, 24, SIGNPOST_ITEM, MapRockTunnel1FSignpostItem0 + signpost 15, 21, SIGNPOST_ITEM, MapRockTunnel1FSignpostItem1 - ; people-events +.PersonEvents: db 2 - person_event SPRITE_POKE_BALL, 22, 8, $1, $0, 255, 255, $1, 0, ItemFragment_0x743b5, EVENT_77E - person_event SPRITE_POKE_BALL, 19, 14, $1, $0, 255, 255, $1, 0, ItemFragment_0x743b7, EVENT_77F + person_event SPRITE_POKE_BALL, 22, 8, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x743b5, EVENT_ROCK_TUNNEL_1F_ELIXER + person_event SPRITE_POKE_BALL, 19, 14, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x743b7, EVENT_ROCK_TUNNEL_1F_TM_STEEL_WING diff --git a/maps/RockTunnelB1F.asm b/maps/RockTunnelB1F.asm index f59302e7b..74b1aac1a 100644 --- a/maps/RockTunnelB1F.asm +++ b/maps/RockTunnelB1F.asm @@ -1,8 +1,8 @@ RockTunnelB1F_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 ItemFragment_0x74409: @@ -15,30 +15,29 @@ ItemFragment_0x7440d: db REVIVE, 1 MapRockTunnelB1FSignpostItem0: - dw $00e9 - db MAX_POTION + dwb EVENT_ROCK_TUNNEL_B1F_HIDDEN_MAX_POTION, MAX_POTION RockTunnelB1F_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 4 warp_def $3, $3, 6, GROUP_ROCK_TUNNEL_1F, MAP_ROCK_TUNNEL_1F warp_def $9, $11, 4, GROUP_ROCK_TUNNEL_1F, MAP_ROCK_TUNNEL_1F warp_def $3, $17, 3, GROUP_ROCK_TUNNEL_1F, MAP_ROCK_TUNNEL_1F warp_def $17, $19, 5, GROUP_ROCK_TUNNEL_1F, MAP_ROCK_TUNNEL_1F - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 1 - signpost 14, 4, $7, MapRockTunnelB1FSignpostItem0 + signpost 14, 4, SIGNPOST_ITEM, MapRockTunnelB1FSignpostItem0 - ; people-events +.PersonEvents: db 3 - person_event SPRITE_POKE_BALL, 29, 11, $1, $0, 255, 255, $1, 0, ItemFragment_0x74409, EVENT_780 - person_event SPRITE_POKE_BALL, 21, 10, $1, $0, 255, 255, $1, 0, ItemFragment_0x7440b, EVENT_781 - person_event SPRITE_POKE_BALL, 6, 19, $1, $0, 255, 255, $1, 0, ItemFragment_0x7440d, EVENT_782 + person_event SPRITE_POKE_BALL, 29, 11, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x74409, EVENT_ROCK_TUNNEL_B1F_IRON + person_event SPRITE_POKE_BALL, 21, 10, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x7440b, EVENT_ROCK_TUNNEL_B1F_PP_UP + person_event SPRITE_POKE_BALL, 6, 19, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x7440d, EVENT_ROCK_TUNNEL_B1F_REVIVE diff --git a/maps/Route1.asm b/maps/Route1.asm index 6167b9eef..b6a76b7b6 100644 --- a/maps/Route1.asm +++ b/maps/Route1.asm @@ -1,28 +1,12 @@ Route1_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 TrainerSchoolboyDanny: - ; bit/flag number - dw EVENT_BEAT_SCHOOLBOY_DANNY - - ; trainer group && trainer id - db SCHOOLBOY, DANNY - - ; text when seen - dw SchoolboyDannySeenText - - ; text when trainer beaten - dw SchoolboyDannyBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw SchoolboyDannyScript + trainer EVENT_BEAT_SCHOOLBOY_DANNY, SCHOOLBOY, DANNY, SchoolboyDannySeenText, SchoolboyDannyBeatenText, $0000, SchoolboyDannyScript SchoolboyDannyScript: talkaftercancel @@ -33,23 +17,7 @@ SchoolboyDannyScript: end TrainerCooltrainerfQuinn: - ; bit/flag number - dw EVENT_BEAT_COOLTRAINERF_QUINN - - ; trainer group && trainer id - db COOLTRAINERF, QUINN - - ; text when seen - dw CooltrainerfQuinnSeenText - - ; text when trainer beaten - dw CooltrainerfQuinnBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw CooltrainerfQuinnScript + trainer EVENT_BEAT_COOLTRAINERF_QUINN, COOLTRAINERF, QUINN, CooltrainerfQuinnSeenText, CooltrainerfQuinnBeatenText, $0000, CooltrainerfQuinnScript CooltrainerfQuinnScript: talkaftercancel @@ -111,18 +79,18 @@ Route1_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 0 - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 1 - signpost 27, 7, $0, MapRoute1Signpost0Script + signpost 27, 7, SIGNPOST_READ, MapRoute1Signpost0Script - ; people-events +.PersonEvents: db 3 - person_event SPRITE_YOUNGSTER, 16, 8, $9, $0, 255, 255, $92, 4, TrainerSchoolboyDanny, -1 - person_event SPRITE_COOLTRAINER_F, 29, 13, $a, $0, 255, 255, $82, 2, TrainerCooltrainerfQuinn, -1 - person_event SPRITE_FRUIT_TREE, 11, 7, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x1ac581, -1 + person_event SPRITE_YOUNGSTER, 16, 8, OW_LEFT | $1, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 4, TrainerSchoolboyDanny, -1 + person_event SPRITE_COOLTRAINER_F, 29, 13, OW_LEFT | $2, $0, -1, -1, (PAL_OW_RED << 4) | $82, 2, TrainerCooltrainerfQuinn, -1 + person_event SPRITE_FRUIT_TREE, 11, 7, OW_DOWN | $1, $0, -1, -1, $0, 0, FruitTreeScript_0x1ac581, -1 diff --git a/maps/Route10North.asm b/maps/Route10North.asm index bf120445a..a8a1eb85a 100644 --- a/maps/Route10North.asm +++ b/maps/Route10North.asm @@ -1,8 +1,8 @@ Route10North_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 PowerPlantSign: @@ -19,18 +19,18 @@ Route10North_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $1, $b, 1, GROUP_ROUTE_10_POKECENTER_1F, MAP_ROUTE_10_POKECENTER_1F warp_def $9, $3, 1, GROUP_POWER_PLANT, MAP_POWER_PLANT - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 2 - signpost 11, 5, $0, PowerPlantSign - signpost 1, 12, $0, Route10PokeCenterSign + signpost 11, 5, SIGNPOST_READ, PowerPlantSign + signpost 1, 12, SIGNPOST_READ, Route10PokeCenterSign - ; people-events +.PersonEvents: db 0 diff --git a/maps/Route10PokeCenter1F.asm b/maps/Route10PokeCenter1F.asm index fba6dc384..20a17a426 100644 --- a/maps/Route10PokeCenter1F.asm +++ b/maps/Route10PokeCenter1F.asm @@ -1,8 +1,8 @@ Route10PokeCenter1F_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 NurseScript_0x188bd4: @@ -78,21 +78,21 @@ Route10PokeCenter1F_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 3 warp_def $7, $3, 1, GROUP_ROUTE_10_NORTH, MAP_ROUTE_10_NORTH warp_def $7, $4, 1, GROUP_ROUTE_10_NORTH, MAP_ROUTE_10_NORTH warp_def $7, $0, 1, GROUP_POKECENTER_2F, MAP_POKECENTER_2F - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 4 - person_event SPRITE_NURSE, 5, 7, $6, $0, 255, 255, $0, 0, NurseScript_0x188bd4, -1 - person_event SPRITE_GENTLEMAN, 10, 11, $5, $1, 255, 255, $80, 0, GentlemanScript_0x188bd7, -1 - person_event SPRITE_GYM_GUY, 6, 11, $3, $0, 255, 255, $a0, 0, GymGuyScript_0x188bda, -1 - person_event SPRITE_COOLTRAINER_F, 7, 5, $6, $0, 255, 255, $0, 0, CooltrainerFScript_0x188bee, -1 + person_event SPRITE_NURSE, 5, 7, OW_UP | $2, $0, -1, -1, $0, 0, NurseScript_0x188bd4, -1 + person_event SPRITE_GENTLEMAN, 10, 11, OW_UP | $1, $1, -1, -1, (PAL_OW_RED << 4) | $80, 0, GentlemanScript_0x188bd7, -1 + person_event SPRITE_GYM_GUY, 6, 11, OW_DOWN | $3, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, GymGuyScript_0x188bda, -1 + person_event SPRITE_COOLTRAINER_F, 7, 5, OW_UP | $2, $0, -1, -1, $0, 0, CooltrainerFScript_0x188bee, -1 diff --git a/maps/Route10PokeCenter2FBeta.asm b/maps/Route10PokeCenter2FBeta.asm index 33e4a3bf1..92257396a 100644 --- a/maps/Route10PokeCenter2FBeta.asm +++ b/maps/Route10PokeCenter2FBeta.asm @@ -1,23 +1,23 @@ Route10PokeCenter2FBeta_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 Route10PokeCenter2FBeta_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 1 warp_def $7, $0, 3, GROUP_ROUTE_10_POKECENTER_1F, MAP_ROUTE_10_POKECENTER_1F - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 0 diff --git a/maps/Route10South.asm b/maps/Route10South.asm index 96c37b4e4..764a8b715 100644 --- a/maps/Route10South.asm +++ b/maps/Route10South.asm @@ -1,28 +1,12 @@ Route10South_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 TrainerHikerJim: - ; bit/flag number - dw EVENT_BEAT_HIKER_JIM - - ; trainer group && trainer id - db HIKER, JIM - - ; text when seen - dw HikerJimSeenText - - ; text when trainer beaten - dw HikerJimBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw HikerJimScript + trainer EVENT_BEAT_HIKER_JIM, HIKER, JIM, HikerJimSeenText, HikerJimBeatenText, $0000, HikerJimScript HikerJimScript: talkaftercancel @@ -33,23 +17,7 @@ HikerJimScript: end TrainerPokefanmRobert: - ; bit/flag number - dw EVENT_BEAT_POKEFANM_ROBERT - - ; trainer group && trainer id - db POKEFANM, ROBERT - - ; text when seen - dw PokefanmRobertSeenText - - ; text when trainer beaten - dw PokefanmRobertBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw PokefanmRobertScript + trainer EVENT_BEAT_POKEFANM_ROBERT, POKEFANM, ROBERT, PokefanmRobertSeenText, PokefanmRobertBeatenText, $0000, PokefanmRobertScript PokefanmRobertScript: talkaftercancel @@ -107,18 +75,18 @@ Route10South_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 1 warp_def $1, $6, 2, GROUP_ROCK_TUNNEL_1F, MAP_ROCK_TUNNEL_1F - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 1 - signpost 3, 5, $0, MapRoute10SouthSignpost0Script + signpost 3, 5, SIGNPOST_READ, MapRoute10SouthSignpost0Script - ; people-events +.PersonEvents: db 2 - person_event SPRITE_POKEFAN_M, 7, 21, $8, $0, 255, 255, $b2, 3, TrainerHikerJim, -1 - person_event SPRITE_POKEFAN_M, 14, 12, $a, $0, 255, 255, $82, 3, TrainerPokefanmRobert, -1 + person_event SPRITE_POKEFAN_M, 7, 21, OW_LEFT | $0, $0, -1, -1, (PAL_OW_BROWN << 4) | $82, 3, TrainerHikerJim, -1 + person_event SPRITE_POKEFAN_M, 14, 12, OW_LEFT | $2, $0, -1, -1, (PAL_OW_RED << 4) | $82, 3, TrainerPokefanmRobert, -1 diff --git a/maps/Route11.asm b/maps/Route11.asm index f18707d0b..7b15b0d97 100644 --- a/maps/Route11.asm +++ b/maps/Route11.asm @@ -1,28 +1,12 @@ Route11_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 TrainerYoungsterOwen: - ; bit/flag number - dw EVENT_BEAT_YOUNGSTER_OWEN - - ; trainer group && trainer id - db YOUNGSTER, OWEN - - ; text when seen - dw YoungsterOwenSeenText - - ; text when trainer beaten - dw YoungsterOwenBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw YoungsterOwenScript + trainer EVENT_BEAT_YOUNGSTER_OWEN, YOUNGSTER, OWEN, YoungsterOwenSeenText, YoungsterOwenBeatenText, $0000, YoungsterOwenScript YoungsterOwenScript: talkaftercancel @@ -33,23 +17,7 @@ YoungsterOwenScript: end TrainerYoungsterJason: - ; bit/flag number - dw EVENT_BEAT_YOUNGSTER_JASON - - ; trainer group && trainer id - db YOUNGSTER, JASON - - ; text when seen - dw YoungsterJasonSeenText - - ; text when trainer beaten - dw YoungsterJasonBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw YoungsterJasonScript + trainer EVENT_BEAT_YOUNGSTER_JASON, YOUNGSTER, JASON, YoungsterJasonSeenText, YoungsterJasonBeatenText, $0000, YoungsterJasonScript YoungsterJasonScript: talkaftercancel @@ -60,23 +28,7 @@ YoungsterJasonScript: end TrainerPsychicHerman: - ; bit/flag number - dw EVENT_BEAT_PSYCHIC_HERMAN - - ; trainer group && trainer id - db PSYCHIC_T, HERMAN - - ; text when seen - dw PsychicHermanSeenText - - ; text when trainer beaten - dw PsychicHermanBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw PsychicHermanScript + trainer EVENT_BEAT_PSYCHIC_HERMAN, PSYCHIC_T, HERMAN, PsychicHermanSeenText, PsychicHermanBeatenText, $0000, PsychicHermanScript PsychicHermanScript: talkaftercancel @@ -87,23 +39,7 @@ PsychicHermanScript: end TrainerPsychicFidel: - ; bit/flag number - dw EVENT_BEAT_PSYCHIC_FIDEL - - ; trainer group && trainer id - db PSYCHIC_T, FIDEL - - ; text when seen - dw PsychicFidelSeenText - - ; text when trainer beaten - dw PsychicFidelBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw PsychicFidelScript + trainer EVENT_BEAT_PSYCHIC_FIDEL, PSYCHIC_T, FIDEL, PsychicFidelSeenText, PsychicFidelBeatenText, $0000, PsychicFidelScript PsychicFidelScript: talkaftercancel @@ -120,8 +56,7 @@ FruitTreeScript_0x68055: fruittree $18 MapRoute11SignpostItem1: - dw $00f5 - db REVIVE + dwb EVENT_ROUTE_11_HIDDEN_REVIVE, REVIVE YoungsterOwenSeenText: @@ -208,21 +143,21 @@ Route11_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 0 - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 2 - signpost 7, 3, $0, MapRoute11Signpost0Script - signpost 5, 32, $7, MapRoute11SignpostItem1 + signpost 7, 3, SIGNPOST_READ, MapRoute11Signpost0Script + signpost 5, 32, SIGNPOST_ITEM, MapRoute11SignpostItem1 - ; people-events +.PersonEvents: db 5 - person_event SPRITE_YOUNGSTER, 18, 26, $a, $0, 255, 255, $92, 3, TrainerYoungsterOwen, -1 - person_event SPRITE_YOUNGSTER, 8, 24, $6, $0, 255, 255, $92, 3, TrainerYoungsterJason, -1 - person_event SPRITE_YOUNGSTER, 11, 32, $6, $0, 255, 255, $92, 1, TrainerPsychicHerman, -1 - person_event SPRITE_YOUNGSTER, 10, 12, $a, $0, 255, 255, $92, 3, TrainerPsychicFidel, -1 - person_event SPRITE_FRUIT_TREE, 6, 36, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x68055, -1 + person_event SPRITE_YOUNGSTER, 18, 26, OW_LEFT | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 3, TrainerYoungsterOwen, -1 + person_event SPRITE_YOUNGSTER, 8, 24, OW_UP | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 3, TrainerYoungsterJason, -1 + person_event SPRITE_YOUNGSTER, 11, 32, OW_UP | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 1, TrainerPsychicHerman, -1 + person_event SPRITE_YOUNGSTER, 10, 12, OW_LEFT | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 3, TrainerPsychicFidel, -1 + person_event SPRITE_FRUIT_TREE, 6, 36, OW_DOWN | $1, $0, -1, -1, $0, 0, FruitTreeScript_0x68055, -1 diff --git a/maps/Route12.asm b/maps/Route12.asm index 7500bad90..8a481791c 100644 --- a/maps/Route12.asm +++ b/maps/Route12.asm @@ -1,28 +1,12 @@ Route12_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 TrainerFisherKyle: - ; bit/flag number - dw EVENT_BEAT_FISHER_KYLE - - ; trainer group && trainer id - db FISHER, KYLE - - ; text when seen - dw FisherKyleSeenText - - ; text when trainer beaten - dw FisherKyleBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw FisherKyleScript + trainer EVENT_BEAT_FISHER_KYLE, FISHER, KYLE, FisherKyleSeenText, FisherKyleBeatenText, $0000, FisherKyleScript FisherKyleScript: talkaftercancel @@ -33,23 +17,7 @@ FisherKyleScript: end TrainerFisherMartin: - ; bit/flag number - dw EVENT_BEAT_FISHER_MARTIN - - ; trainer group && trainer id - db FISHER, MARTIN - - ; text when seen - dw FisherMartinSeenText - - ; text when trainer beaten - dw FisherMartinBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw FisherMartinScript + trainer EVENT_BEAT_FISHER_MARTIN, FISHER, MARTIN, FisherMartinSeenText, FisherMartinBeatenText, $0000, FisherMartinScript FisherMartinScript: talkaftercancel @@ -60,23 +28,7 @@ FisherMartinScript: end TrainerFisherStephen: - ; bit/flag number - dw EVENT_BEAT_FISHER_STEPHEN - - ; trainer group && trainer id - db FISHER, STEPHEN - - ; text when seen - dw FisherStephenSeenText - - ; text when trainer beaten - dw FisherStephenBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw FisherStephenScript + trainer EVENT_BEAT_FISHER_STEPHEN, FISHER, STEPHEN, FisherStephenSeenText, FisherStephenBeatenText, $0000, FisherStephenScript FisherStephenScript: talkaftercancel @@ -87,23 +39,7 @@ FisherStephenScript: end TrainerFisherBarney: - ; bit/flag number - dw EVENT_BEAT_FISHER_BARNEY - - ; trainer group && trainer id - db FISHER, BARNEY - - ; text when seen - dw FisherBarneySeenText - - ; text when trainer beaten - dw FisherBarneyBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw FisherBarneyScript + trainer EVENT_BEAT_FISHER_BARNEY, FISHER, BARNEY, FisherBarneySeenText, FisherBarneyBeatenText, $0000, FisherBarneyScript FisherBarneyScript: talkaftercancel @@ -126,8 +62,7 @@ ItemFragment_0x1a700d: db NUGGET, 1 MapRoute12SignpostItem2: - dw $00f3 - db ELIXER + dwb EVENT_ROUTE_12_HIDDEN_ELIXER, ELIXER FisherMartinSeenText: @@ -228,24 +163,24 @@ Route12_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 1 warp_def $21, $b, 1, GROUP_ROUTE_12_SUPER_ROD_HOUSE, MAP_ROUTE_12_SUPER_ROD_HOUSE - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 3 - signpost 27, 11, $0, MapRoute12Signpost0Script - signpost 9, 13, $0, MapRoute12Signpost1Script - signpost 13, 14, $7, MapRoute12SignpostItem2 + signpost 27, 11, SIGNPOST_READ, MapRoute12Signpost0Script + signpost 9, 13, SIGNPOST_READ, MapRoute12Signpost1Script + signpost 13, 14, SIGNPOST_ITEM, MapRoute12SignpostItem2 - ; people-events +.PersonEvents: db 6 - person_event SPRITE_FISHER, 17, 9, $a, $0, 255, 255, $a2, 1, TrainerFisherMartin, -1 - person_event SPRITE_FISHER, 27, 18, $6, $0, 255, 255, $a2, 1, TrainerFisherStephen, -1 - person_event SPRITE_FISHER, 42, 14, $8, $0, 255, 255, $a2, 5, TrainerFisherBarney, -1 - person_event SPRITE_FISHER, 11, 10, $9, $0, 255, 255, $a2, 3, TrainerFisherKyle, -1 - person_event SPRITE_POKE_BALL, 47, 9, $1, $0, 255, 255, $1, 0, ItemFragment_0x1a700b, EVENT_788 - person_event SPRITE_POKE_BALL, 55, 9, $1, $0, 255, 255, $1, 0, ItemFragment_0x1a700d, EVENT_789 + person_event SPRITE_FISHER, 17, 9, OW_LEFT | $2, $0, -1, -1, (PAL_OW_GREEN << 4) | $82, 1, TrainerFisherMartin, -1 + person_event SPRITE_FISHER, 27, 18, OW_UP | $2, $0, -1, -1, (PAL_OW_GREEN << 4) | $82, 1, TrainerFisherStephen, -1 + person_event SPRITE_FISHER, 42, 14, OW_LEFT | $0, $0, -1, -1, (PAL_OW_GREEN << 4) | $82, 5, TrainerFisherBarney, -1 + person_event SPRITE_FISHER, 11, 10, OW_LEFT | $1, $0, -1, -1, (PAL_OW_GREEN << 4) | $82, 3, TrainerFisherKyle, -1 + person_event SPRITE_POKE_BALL, 47, 9, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x1a700b, EVENT_ROUTE_12_CALCIUM + person_event SPRITE_POKE_BALL, 55, 9, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x1a700d, EVENT_ROUTE_12_NUGGET diff --git a/maps/Route12SuperRodHouse.asm b/maps/Route12SuperRodHouse.asm index 81675c921..2b84b5b46 100644 --- a/maps/Route12SuperRodHouse.asm +++ b/maps/Route12SuperRodHouse.asm @@ -1,8 +1,8 @@ Route12SuperRodHouse_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 FishingGuruScript_0x7f484: @@ -80,17 +80,17 @@ Route12SuperRodHouse_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $7, $2, 1, GROUP_ROUTE_12, MAP_ROUTE_12 warp_def $7, $3, 1, GROUP_ROUTE_12, MAP_ROUTE_12 - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 1 - person_event SPRITE_FISHING_GURU, 7, 9, $6, $0, 255, 255, $80, 0, FishingGuruScript_0x7f484, -1 + person_event SPRITE_FISHING_GURU, 7, 9, OW_UP | $2, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, FishingGuruScript_0x7f484, -1 diff --git a/maps/Route13.asm b/maps/Route13.asm index 842580f78..a2a52fd76 100644 --- a/maps/Route13.asm +++ b/maps/Route13.asm @@ -1,28 +1,12 @@ Route13_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 TrainerPokefanmAlex: - ; bit/flag number - dw EVENT_BEAT_POKEFANM_ALEX - - ; trainer group && trainer id - db POKEFANM, ALEX - - ; text when seen - dw PokefanmAlexSeenText - - ; text when trainer beaten - dw PokefanmAlexBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw PokefanmAlexScript + trainer EVENT_BEAT_POKEFANM_ALEX, POKEFANM, ALEX, PokefanmAlexSeenText, PokefanmAlexBeatenText, $0000, PokefanmAlexScript PokefanmAlexScript: talkaftercancel @@ -33,23 +17,7 @@ PokefanmAlexScript: end TrainerPokefanmJoshua: - ; bit/flag number - dw EVENT_BEAT_POKEFANM_JOSHUA - - ; trainer group && trainer id - db POKEFANM, JOSHUA - - ; text when seen - dw PokefanmJoshuaSeenText - - ; text when trainer beaten - dw PokefanmJoshuaBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw PokefanmJoshuaScript + trainer EVENT_BEAT_POKEFANM_JOSHUA, POKEFANM, JOSHUA, PokefanmJoshuaSeenText, PokefanmJoshuaBeatenText, $0000, PokefanmJoshuaScript PokefanmJoshuaScript: talkaftercancel @@ -60,23 +28,7 @@ PokefanmJoshuaScript: end TrainerBird_keeperPerry: - ; bit/flag number - dw EVENT_BEAT_BIRD_KEEPER_PERRY - - ; trainer group && trainer id - db BIRD_KEEPER, PERRY - - ; text when seen - dw Bird_keeperPerrySeenText - - ; text when trainer beaten - dw Bird_keeperPerryBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw Bird_keeperPerryScript + trainer EVENT_BEAT_BIRD_KEEPER_PERRY, BIRD_KEEPER, PERRY, Bird_keeperPerrySeenText, Bird_keeperPerryBeatenText, $0000, Bird_keeperPerryScript Bird_keeperPerryScript: talkaftercancel @@ -87,23 +39,7 @@ Bird_keeperPerryScript: end TrainerBird_keeperBret: - ; bit/flag number - dw EVENT_BEAT_BIRD_KEEPER_BRET - - ; trainer group && trainer id - db BIRD_KEEPER, BRET - - ; text when seen - dw Bird_keeperBretSeenText - - ; text when trainer beaten - dw Bird_keeperBretBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw Bird_keeperBretScript + trainer EVENT_BEAT_BIRD_KEEPER_BRET, BIRD_KEEPER, BRET, Bird_keeperBretSeenText, Bird_keeperBretBeatenText, $0000, Bird_keeperBretScript Bird_keeperBretScript: talkaftercancel @@ -114,23 +50,7 @@ Bird_keeperBretScript: end TrainerHikerKenny: - ; bit/flag number - dw EVENT_BEAT_HIKER_KENNY - - ; trainer group && trainer id - db HIKER, KENNY - - ; text when seen - dw HikerKennySeenText - - ; text when trainer beaten - dw HikerKennyBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw HikerKennyScript + trainer EVENT_BEAT_HIKER_KENNY, HIKER, KENNY, HikerKennySeenText, HikerKennyBeatenText, $0000, HikerKennyScript HikerKennyScript: talkaftercancel @@ -150,8 +70,7 @@ MapRoute13Signpost2Script: jumptext UnknownText_0x1a277d MapRoute13SignpostItem3: - dw $00f4 - db CALCIUM + dwb EVENT_ROUTE_13_HIDDEN_CALCIUM, CALCIUM PokefanmAlexSeenText: @@ -270,23 +189,23 @@ Route13_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 0 - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 4 - signpost 13, 29, $0, MapRoute13Signpost0Script - signpost 11, 41, $0, MapRoute13Signpost1Script - signpost 13, 17, $0, MapRoute13Signpost2Script - signpost 13, 30, $7, MapRoute13SignpostItem3 + signpost 13, 29, SIGNPOST_READ, MapRoute13Signpost0Script + signpost 11, 41, SIGNPOST_READ, MapRoute13Signpost1Script + signpost 13, 17, SIGNPOST_READ, MapRoute13Signpost2Script + signpost 13, 30, SIGNPOST_ITEM, MapRoute13SignpostItem3 - ; people-events +.PersonEvents: db 5 - person_event SPRITE_YOUNGSTER, 10, 46, $6, $0, 255, 255, $92, 2, TrainerBird_keeperPerry, -1 - person_event SPRITE_YOUNGSTER, 10, 47, $6, $0, 255, 255, $92, 2, TrainerBird_keeperBret, -1 - person_event SPRITE_POKEFAN_M, 12, 36, $8, $0, 255, 255, $82, 3, TrainerPokefanmJoshua, -1 - person_event SPRITE_POKEFAN_M, 14, 18, $8, $0, 255, 255, $82, 4, TrainerHikerKenny, -1 - person_event SPRITE_POKEFAN_M, 10, 29, $9, $0, 255, 255, $82, 4, TrainerPokefanmAlex, -1 + person_event SPRITE_YOUNGSTER, 10, 46, OW_UP | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 2, TrainerBird_keeperPerry, -1 + person_event SPRITE_YOUNGSTER, 10, 47, OW_UP | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 2, TrainerBird_keeperBret, -1 + person_event SPRITE_POKEFAN_M, 12, 36, OW_LEFT | $0, $0, -1, -1, (PAL_OW_RED << 4) | $82, 3, TrainerPokefanmJoshua, -1 + person_event SPRITE_POKEFAN_M, 14, 18, OW_LEFT | $0, $0, -1, -1, (PAL_OW_RED << 4) | $82, 4, TrainerHikerKenny, -1 + person_event SPRITE_POKEFAN_M, 10, 29, OW_LEFT | $1, $0, -1, -1, (PAL_OW_RED << 4) | $82, 4, TrainerPokefanmAlex, -1 diff --git a/maps/Route14.asm b/maps/Route14.asm index 1db2b2738..782c1257b 100644 --- a/maps/Route14.asm +++ b/maps/Route14.asm @@ -1,8 +1,8 @@ Route14_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 TeacherScript_0x1ad47f: @@ -14,23 +14,7 @@ TeacherScript_0x1ad47f: end TrainerPokefanmCarter: - ; bit/flag number - dw EVENT_BEAT_POKEFANM_CARTER - - ; trainer group && trainer id - db POKEFANM, CARTER - - ; text when seen - dw PokefanmCarterSeenText - - ; text when trainer beaten - dw PokefanmCarterBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw PokefanmCarterScript + trainer EVENT_BEAT_POKEFANM_CARTER, POKEFANM, CARTER, PokefanmCarterSeenText, PokefanmCarterBeatenText, $0000, PokefanmCarterScript PokefanmCarterScript: talkaftercancel @@ -41,23 +25,7 @@ PokefanmCarterScript: end TrainerBird_keeperRoy: - ; bit/flag number - dw EVENT_BEAT_BIRD_KEEPER_ROY - - ; trainer group && trainer id - db BIRD_KEEPER, ROY - - ; text when seen - dw Bird_keeperRoySeenText - - ; text when trainer beaten - dw Bird_keeperRoyBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw Bird_keeperRoyScript + trainer EVENT_BEAT_BIRD_KEEPER_ROY, BIRD_KEEPER, ROY, Bird_keeperRoySeenText, Bird_keeperRoyBeatenText, $0000, Bird_keeperRoyScript Bird_keeperRoyScript: talkaftercancel @@ -68,23 +36,7 @@ Bird_keeperRoyScript: end TrainerPokefanmTrevor: - ; bit/flag number - dw EVENT_BEAT_POKEFANM_TREVOR - - ; trainer group && trainer id - db POKEFANM, TREVOR - - ; text when seen - dw PokefanmTrevorSeenText - - ; text when trainer beaten - dw PokefanmTrevorBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw PokefanmTrevorScript + trainer EVENT_BEAT_POKEFANM_TREVOR, POKEFANM, TREVOR, PokefanmTrevorSeenText, PokefanmTrevorBeatenText, $0000, PokefanmTrevorScript PokefanmTrevorScript: talkaftercancel @@ -161,18 +113,18 @@ Route14_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 0 - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 4 - person_event SPRITE_POKEFAN_M, 19, 15, $9, $0, 255, 255, $82, 3, TrainerPokefanmCarter, -1 - person_event SPRITE_YOUNGSTER, 31, 15, $a, $0, 255, 255, $92, 3, TrainerBird_keeperRoy, -1 - person_event SPRITE_POKEFAN_M, 15, 10, $a, $0, 255, 255, $82, 3, TrainerPokefanmTrevor, -1 - person_event SPRITE_TEACHER, 9, 11, $5, $1, 255, 255, $a0, 4, TeacherScript_0x1ad47f, -1 + person_event SPRITE_POKEFAN_M, 19, 15, OW_LEFT | $1, $0, -1, -1, (PAL_OW_RED << 4) | $82, 3, TrainerPokefanmCarter, -1 + person_event SPRITE_YOUNGSTER, 31, 15, OW_LEFT | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 3, TrainerBird_keeperRoy, -1 + person_event SPRITE_POKEFAN_M, 15, 10, OW_LEFT | $2, $0, -1, -1, (PAL_OW_RED << 4) | $82, 3, TrainerPokefanmTrevor, -1 + person_event SPRITE_TEACHER, 9, 11, OW_UP | $1, $1, -1, -1, (PAL_OW_GREEN << 4) | $80, 4, TeacherScript_0x1ad47f, -1 diff --git a/maps/Route15.asm b/maps/Route15.asm index 6626ae41c..b9d37bb28 100644 --- a/maps/Route15.asm +++ b/maps/Route15.asm @@ -1,28 +1,12 @@ Route15_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 TrainerTeacherColette: - ; bit/flag number - dw EVENT_BEAT_TEACHER_COLETTE - - ; trainer group && trainer id - db TEACHER, COLETTE - - ; text when seen - dw TeacherColetteSeenText - - ; text when trainer beaten - dw TeacherColetteBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw TeacherColetteScript + trainer EVENT_BEAT_TEACHER_COLETTE, TEACHER, COLETTE, TeacherColetteSeenText, TeacherColetteBeatenText, $0000, TeacherColetteScript TeacherColetteScript: talkaftercancel @@ -33,23 +17,7 @@ TeacherColetteScript: end TrainerTeacherHillary: - ; bit/flag number - dw EVENT_BEAT_TEACHER_HILLARY - - ; trainer group && trainer id - db TEACHER, HILLARY - - ; text when seen - dw TeacherHillarySeenText - - ; text when trainer beaten - dw TeacherHillaryBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw TeacherHillaryScript + trainer EVENT_BEAT_TEACHER_HILLARY, TEACHER, HILLARY, TeacherHillarySeenText, TeacherHillaryBeatenText, $0000, TeacherHillaryScript TeacherHillaryScript: talkaftercancel @@ -60,23 +28,7 @@ TeacherHillaryScript: end TrainerSchoolboyKipp: - ; bit/flag number - dw EVENT_BEAT_SCHOOLBOY_KIP - - ; trainer group && trainer id - db SCHOOLBOY, KIPP - - ; text when seen - dw SchoolboyKippSeenText - - ; text when trainer beaten - dw SchoolboyKippBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw SchoolboyKippScript + trainer EVENT_BEAT_SCHOOLBOY_KIP, SCHOOLBOY, KIPP, SchoolboyKippSeenText, SchoolboyKippBeatenText, $0000, SchoolboyKippScript SchoolboyKippScript: talkaftercancel @@ -87,23 +39,7 @@ SchoolboyKippScript: end TrainerSchoolboyTommy: - ; bit/flag number - dw EVENT_BEAT_SCHOOLBOY_TOMMY - - ; trainer group && trainer id - db SCHOOLBOY, TOMMY - - ; text when seen - dw SchoolboyTommySeenText - - ; text when trainer beaten - dw SchoolboyTommyBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw SchoolboyTommyScript + trainer EVENT_BEAT_SCHOOLBOY_TOMMY, SCHOOLBOY, TOMMY, SchoolboyTommySeenText, SchoolboyTommyBeatenText, $0000, SchoolboyTommyScript SchoolboyTommyScript: talkaftercancel @@ -114,23 +50,7 @@ SchoolboyTommyScript: end TrainerSchoolboyJohnny: - ; bit/flag number - dw EVENT_BEAT_SCHOOLBOY_JOHNNY - - ; trainer group && trainer id - db SCHOOLBOY, JOHNNY - - ; text when seen - dw SchoolboyJohnnySeenText - - ; text when trainer beaten - dw SchoolboyJohnnyBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw SchoolboyJohnnyScript + trainer EVENT_BEAT_SCHOOLBOY_JOHNNY, SCHOOLBOY, JOHNNY, SchoolboyJohnnySeenText, SchoolboyJohnnyBeatenText, $0000, SchoolboyJohnnyScript SchoolboyJohnnyScript: talkaftercancel @@ -141,23 +61,7 @@ SchoolboyJohnnyScript: end TrainerSchoolboyBilly: - ; bit/flag number - dw EVENT_BEAT_SCHOOLBOY_BILLY - - ; trainer group && trainer id - db SCHOOLBOY, BILLY - - ; text when seen - dw SchoolboyBillySeenText - - ; text when trainer beaten - dw SchoolboyBillyBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw SchoolboyBillyScript + trainer EVENT_BEAT_SCHOOLBOY_BILLY, SCHOOLBOY, BILLY, SchoolboyBillySeenText, SchoolboyBillyBeatenText, $0000, SchoolboyBillyScript SchoolboyBillyScript: talkaftercancel @@ -292,24 +196,24 @@ Route15_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $4, $2, 3, GROUP_ROUTE_15_FUCHSIA_GATE, MAP_ROUTE_15_FUCHSIA_GATE warp_def $5, $2, 4, GROUP_ROUTE_15_FUCHSIA_GATE, MAP_ROUTE_15_FUCHSIA_GATE - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 1 - signpost 9, 19, $0, MapRoute15Signpost0Script + signpost 9, 19, SIGNPOST_READ, MapRoute15Signpost0Script - ; people-events +.PersonEvents: db 7 - person_event SPRITE_YOUNGSTER, 14, 14, $9, $0, 255, 255, $92, 4, TrainerSchoolboyKipp, -1 - person_event SPRITE_YOUNGSTER, 17, 19, $7, $0, 255, 255, $92, 3, TrainerSchoolboyTommy, -1 - person_event SPRITE_YOUNGSTER, 14, 37, $6, $0, 255, 255, $92, 3, TrainerSchoolboyJohnny, -1 - person_event SPRITE_YOUNGSTER, 14, 31, $6, $0, 255, 255, $92, 3, TrainerSchoolboyBilly, -1 - person_event SPRITE_TEACHER, 16, 34, $7, $0, 255, 255, $82, 4, TrainerTeacherColette, -1 - person_event SPRITE_TEACHER, 14, 24, $a, $0, 255, 255, $82, 3, TrainerTeacherHillary, -1 - person_event SPRITE_POKE_BALL, 9, 16, $1, $0, 255, 255, $1, 0, ItemFragment_0x1aa5e4, EVENT_78A + person_event SPRITE_YOUNGSTER, 14, 14, OW_LEFT | $1, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 4, TrainerSchoolboyKipp, -1 + person_event SPRITE_YOUNGSTER, 17, 19, OW_UP | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 3, TrainerSchoolboyTommy, -1 + person_event SPRITE_YOUNGSTER, 14, 37, OW_UP | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 3, TrainerSchoolboyJohnny, -1 + person_event SPRITE_YOUNGSTER, 14, 31, OW_UP | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 3, TrainerSchoolboyBilly, -1 + person_event SPRITE_TEACHER, 16, 34, OW_UP | $3, $0, -1, -1, (PAL_OW_RED << 4) | $82, 4, TrainerTeacherColette, -1 + person_event SPRITE_TEACHER, 14, 24, OW_LEFT | $2, $0, -1, -1, (PAL_OW_RED << 4) | $82, 3, TrainerTeacherHillary, -1 + person_event SPRITE_POKE_BALL, 9, 16, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x1aa5e4, EVENT_ROUTE_15_PP_UP diff --git a/maps/Route15FuchsiaGate.asm b/maps/Route15FuchsiaGate.asm index c29e3d558..a5ff662fb 100644 --- a/maps/Route15FuchsiaGate.asm +++ b/maps/Route15FuchsiaGate.asm @@ -1,8 +1,8 @@ Route15FuchsiaGate_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 OfficerScript_0x19679e: @@ -20,19 +20,19 @@ Route15FuchsiaGate_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 4 warp_def $4, $0, 8, GROUP_FUCHSIA_CITY, MAP_FUCHSIA_CITY warp_def $5, $0, 9, GROUP_FUCHSIA_CITY, MAP_FUCHSIA_CITY warp_def $4, $9, 1, GROUP_ROUTE_15, MAP_ROUTE_15 warp_def $5, $9, 2, GROUP_ROUTE_15, MAP_ROUTE_15 - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 1 - person_event SPRITE_OFFICER, 6, 9, $6, $0, 255, 255, $90, 0, OfficerScript_0x19679e, -1 + person_event SPRITE_OFFICER, 6, 9, OW_UP | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, OfficerScript_0x19679e, -1 diff --git a/maps/Route16.asm b/maps/Route16.asm index 80dd4a4cd..1f8306bc9 100644 --- a/maps/Route16.asm +++ b/maps/Route16.asm @@ -1,8 +1,8 @@ Route16_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 1 ; callbacks @@ -35,7 +35,7 @@ Route16_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 5 warp_def $1, $3, 1, GROUP_ROUTE_16_FUCHSIA_SPEECH_HOUSE, MAP_ROUTE_16_FUCHSIA_SPEECH_HOUSE warp_def $6, $e, 3, GROUP_ROUTE_16_GATE, MAP_ROUTE_16_GATE @@ -43,12 +43,12 @@ Route16_MapEventHeader: warp_def $6, $9, 1, GROUP_ROUTE_16_GATE, MAP_ROUTE_16_GATE warp_def $7, $9, 2, GROUP_ROUTE_16_GATE, MAP_ROUTE_16_GATE - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 1 - signpost 5, 5, $0, MapRoute16Signpost0Script + signpost 5, 5, SIGNPOST_READ, MapRoute16Signpost0Script - ; people-events +.PersonEvents: db 0 diff --git a/maps/Route16FuchsiaSpeechHouse.asm b/maps/Route16FuchsiaSpeechHouse.asm index 261c0af0d..7fcfdc58b 100644 --- a/maps/Route16FuchsiaSpeechHouse.asm +++ b/maps/Route16FuchsiaSpeechHouse.asm @@ -1,8 +1,8 @@ Route16FuchsiaSpeechHouse_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 SuperNerdScript_0x73373: @@ -23,19 +23,19 @@ Route16FuchsiaSpeechHouse_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $7, $2, 1, GROUP_ROUTE_16, MAP_ROUTE_16 warp_def $7, $3, 1, GROUP_ROUTE_16, MAP_ROUTE_16 - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 2 - signpost 1, 0, $0, Route16FuchsiaSpeechHouseBookshelf - signpost 1, 1, $0, Route16FuchsiaSpeechHouseBookshelf + signpost 1, 0, SIGNPOST_READ, Route16FuchsiaSpeechHouseBookshelf + signpost 1, 1, SIGNPOST_READ, Route16FuchsiaSpeechHouseBookshelf - ; people-events +.PersonEvents: db 1 - person_event SPRITE_SUPER_NERD, 7, 6, $6, $0, 255, 255, $a0, 0, SuperNerdScript_0x73373, -1 + person_event SPRITE_SUPER_NERD, 7, 6, OW_UP | $2, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, SuperNerdScript_0x73373, -1 diff --git a/maps/Route16Gate.asm b/maps/Route16Gate.asm index 98ba1ccf5..ba38719db 100644 --- a/maps/Route16Gate.asm +++ b/maps/Route16Gate.asm @@ -1,11 +1,11 @@ Route16Gate_MapScriptHeader: - ; trigger count +.MapTriggers: db 1 ; triggers dw UnknownScript_0x733e9, $0000 - ; callback count +.MapCallbacks: db 0 UnknownScript_0x733e9: @@ -20,7 +20,7 @@ UnknownScript_0x733ed: end UnknownScript_0x733f3: - showemote $0, $2, 15 + showemote EMOTE_SHOCK, $2, 15 spriteface $0, UP loadfont writetext UnknownText_0x73496 @@ -63,21 +63,21 @@ Route16Gate_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 4 warp_def $4, $0, 4, GROUP_ROUTE_16, MAP_ROUTE_16 warp_def $5, $0, 5, GROUP_ROUTE_16, MAP_ROUTE_16 warp_def $4, $9, 2, GROUP_ROUTE_16, MAP_ROUTE_16 warp_def $5, $9, 3, GROUP_ROUTE_16, MAP_ROUTE_16 - ; xy triggers +.XYTriggers: db 2 xy_trigger 0, $4, $5, $0, UnknownScript_0x733ed, $0, $0 xy_trigger 0, $5, $5, $0, UnknownScript_0x733ed, $0, $0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 1 - person_event SPRITE_OFFICER, 6, 9, $6, $0, 255, 255, $90, 0, OfficerScript_0x733ea, -1 + person_event SPRITE_OFFICER, 6, 9, OW_UP | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, OfficerScript_0x733ea, -1 diff --git a/maps/Route17.asm b/maps/Route17.asm index f3d24c2b3..b9d7747e0 100644 --- a/maps/Route17.asm +++ b/maps/Route17.asm @@ -1,8 +1,8 @@ Route17_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 1 ; callbacks @@ -15,23 +15,7 @@ UnknownScript_0x1ad0ab: return TrainerBikerCharles: - ; bit/flag number - dw EVENT_BEAT_BIKER_CHARLES - - ; trainer group && trainer id - db BIKER, CHARLES - - ; text when seen - dw BikerCharlesSeenText - - ; text when trainer beaten - dw BikerCharlesBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw BikerCharlesScript + trainer EVENT_BEAT_BIKER_CHARLES, BIKER, CHARLES, BikerCharlesSeenText, BikerCharlesBeatenText, $0000, BikerCharlesScript BikerCharlesScript: talkaftercancel @@ -42,23 +26,7 @@ BikerCharlesScript: end TrainerBikerRiley: - ; bit/flag number - dw EVENT_BEAT_BIKER_RILEY - - ; trainer group && trainer id - db BIKER, RILEY - - ; text when seen - dw BikerRileySeenText - - ; text when trainer beaten - dw BikerRileyBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw BikerRileyScript + trainer EVENT_BEAT_BIKER_RILEY, BIKER, RILEY, BikerRileySeenText, BikerRileyBeatenText, $0000, BikerRileyScript BikerRileyScript: talkaftercancel @@ -69,23 +37,7 @@ BikerRileyScript: end TrainerBikerJoel: - ; bit/flag number - dw EVENT_BEAT_BIKER_JOEL - - ; trainer group && trainer id - db BIKER, JOEL - - ; text when seen - dw BikerJoelSeenText - - ; text when trainer beaten - dw BikerJoelBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw BikerJoelScript + trainer EVENT_BEAT_BIKER_JOEL, BIKER, JOEL, BikerJoelSeenText, BikerJoelBeatenText, $0000, BikerJoelScript BikerJoelScript: talkaftercancel @@ -96,23 +48,7 @@ BikerJoelScript: end TrainerBikerGlenn: - ; bit/flag number - dw EVENT_BEAT_BIKER_GLENN - - ; trainer group && trainer id - db BIKER, GLENN - - ; text when seen - dw BikerGlennSeenText - - ; text when trainer beaten - dw BikerGlennBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw BikerGlennScript + trainer EVENT_BEAT_BIKER_GLENN, BIKER, GLENN, BikerGlennSeenText, BikerGlennBeatenText, $0000, BikerGlennScript BikerGlennScript: talkaftercancel @@ -123,13 +59,11 @@ BikerGlennScript: end MapRoute17SignpostItem0: - dw $00f6 - db MAX_ETHER + dwb EVENT_ROUTE_17_HIDDEN_MAX_ETHER, MAX_ETHER MapRoute17SignpostItem1: - dw $00f7 - db MAX_ELIXER + dwb EVENT_ROUTE_17_HIDDEN_MAX_ELIXER, MAX_ELIXER BikerRileySeenText: @@ -201,22 +135,22 @@ Route17_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $52, $11, 1, GROUP_ROUTE_17_18_GATE, MAP_ROUTE_17_18_GATE warp_def $53, $11, 2, GROUP_ROUTE_17_18_GATE, MAP_ROUTE_17_18_GATE - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 2 - signpost 54, 9, $7, MapRoute17SignpostItem0 - signpost 77, 8, $7, MapRoute17SignpostItem1 + signpost 54, 9, SIGNPOST_ITEM, MapRoute17SignpostItem0 + signpost 77, 8, SIGNPOST_ITEM, MapRoute17SignpostItem1 - ; people-events +.PersonEvents: db 4 - person_event SPRITE_BIKER, 21, 8, $a, $0, 255, 255, $b2, 4, TrainerBikerRiley, -1 - person_event SPRITE_BIKER, 72, 13, $6, $0, 255, 255, $b2, 1, TrainerBikerJoel, -1 - person_event SPRITE_BIKER, 57, 7, $a, $0, 255, 255, $b2, 3, TrainerBikerGlenn, -1 - person_event SPRITE_BIKER, 84, 10, $9, $0, 255, 255, $b2, 4, TrainerBikerCharles, -1 + person_event SPRITE_BIKER, 21, 8, OW_LEFT | $2, $0, -1, -1, (PAL_OW_BROWN << 4) | $82, 4, TrainerBikerRiley, -1 + person_event SPRITE_BIKER, 72, 13, OW_UP | $2, $0, -1, -1, (PAL_OW_BROWN << 4) | $82, 1, TrainerBikerJoel, -1 + person_event SPRITE_BIKER, 57, 7, OW_LEFT | $2, $0, -1, -1, (PAL_OW_BROWN << 4) | $82, 3, TrainerBikerGlenn, -1 + person_event SPRITE_BIKER, 84, 10, OW_LEFT | $1, $0, -1, -1, (PAL_OW_BROWN << 4) | $82, 4, TrainerBikerCharles, -1 diff --git a/maps/Route1718Gate.asm b/maps/Route1718Gate.asm index 1a89d8951..a44a09dc3 100644 --- a/maps/Route1718Gate.asm +++ b/maps/Route1718Gate.asm @@ -1,11 +1,11 @@ Route1718Gate_MapScriptHeader: - ; trigger count +.MapTriggers: db 1 ; triggers dw UnknownScript_0x7360d, $0000 - ; callback count +.MapCallbacks: db 0 UnknownScript_0x7360d: @@ -20,7 +20,7 @@ UnknownScript_0x73611: end UnknownScript_0x73617: - showemote $0, $2, 15 + showemote EMOTE_SHOCK, $2, 15 spriteface $0, UP loadfont writetext UnknownText_0x7364d @@ -54,21 +54,21 @@ Route1718Gate_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 4 warp_def $4, $0, 1, GROUP_ROUTE_17, MAP_ROUTE_17 warp_def $5, $0, 2, GROUP_ROUTE_17, MAP_ROUTE_17 warp_def $4, $9, 1, GROUP_ROUTE_18, MAP_ROUTE_18 warp_def $5, $9, 2, GROUP_ROUTE_18, MAP_ROUTE_18 - ; xy triggers +.XYTriggers: db 2 xy_trigger 0, $4, $5, $0, UnknownScript_0x73611, $0, $0 xy_trigger 0, $5, $5, $0, UnknownScript_0x73611, $0, $0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 1 - person_event SPRITE_OFFICER, 6, 9, $6, $0, 255, 255, $90, 0, OfficerScript_0x7360e, -1 + person_event SPRITE_OFFICER, 6, 9, OW_UP | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, OfficerScript_0x7360e, -1 diff --git a/maps/Route18.asm b/maps/Route18.asm index 5724f0535..fb3eea1e7 100644 --- a/maps/Route18.asm +++ b/maps/Route18.asm @@ -1,28 +1,12 @@ Route18_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 TrainerBird_keeperBoris: - ; bit/flag number - dw EVENT_BEAT_BIRD_KEEPER_BORIS - - ; trainer group && trainer id - db BIRD_KEEPER, BORIS - - ; text when seen - dw Bird_keeperBorisSeenText - - ; text when trainer beaten - dw Bird_keeperBorisBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw Bird_keeperBorisScript + trainer EVENT_BEAT_BIRD_KEEPER_BORIS, BIRD_KEEPER, BORIS, Bird_keeperBorisSeenText, Bird_keeperBorisBeatenText, $0000, Bird_keeperBorisScript Bird_keeperBorisScript: talkaftercancel @@ -33,23 +17,7 @@ Bird_keeperBorisScript: end TrainerBird_keeperBob: - ; bit/flag number - dw EVENT_BEAT_BIRD_KEEPER_BOB - - ; trainer group && trainer id - db BIRD_KEEPER, BOB - - ; text when seen - dw Bird_keeperBobSeenText - - ; text when trainer beaten - dw Bird_keeperBobBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw Bird_keeperBobScript + trainer EVENT_BEAT_BIRD_KEEPER_BOB, BIRD_KEEPER, BOB, Bird_keeperBobSeenText, Bird_keeperBobBeatenText, $0000, Bird_keeperBobScript Bird_keeperBobScript: talkaftercancel @@ -109,19 +77,19 @@ Route18_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $6, $2, 3, GROUP_ROUTE_17_18_GATE, MAP_ROUTE_17_18_GATE warp_def $7, $2, 4, GROUP_ROUTE_17_18_GATE, MAP_ROUTE_17_18_GATE - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 1 - signpost 5, 9, $0, MapRoute18Signpost0Script + signpost 5, 9, SIGNPOST_READ, MapRoute18Signpost0Script - ; people-events +.PersonEvents: db 2 - person_event SPRITE_YOUNGSTER, 16, 13, $a, $0, 255, 255, $92, 3, TrainerBird_keeperBoris, -1 - person_event SPRITE_YOUNGSTER, 10, 17, $6, $0, 255, 255, $92, 3, TrainerBird_keeperBob, -1 + person_event SPRITE_YOUNGSTER, 16, 13, OW_LEFT | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 3, TrainerBird_keeperBoris, -1 + person_event SPRITE_YOUNGSTER, 10, 17, OW_UP | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 3, TrainerBird_keeperBob, -1 diff --git a/maps/Route19.asm b/maps/Route19.asm index 184486610..0ec9be135 100644 --- a/maps/Route19.asm +++ b/maps/Route19.asm @@ -1,8 +1,8 @@ Route19_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 1 ; callbacks @@ -22,23 +22,7 @@ Route19_MapScriptHeader: return TrainerSwimmerfDawn: - ; bit/flag number - dw EVENT_BEAT_SWIMMERF_DAWN - - ; trainer group && trainer id - db SWIMMERF, DAWN - - ; text when seen - dw SwimmerfDawnSeenText - - ; text when trainer beaten - dw SwimmerfDawnBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw SwimmerfDawnScript + trainer EVENT_BEAT_SWIMMERF_DAWN, SWIMMERF, DAWN, SwimmerfDawnSeenText, SwimmerfDawnBeatenText, $0000, SwimmerfDawnScript SwimmerfDawnScript: talkaftercancel @@ -49,23 +33,7 @@ SwimmerfDawnScript: end TrainerSwimmermHarold: - ; bit/flag number - dw EVENT_BEAT_SWIMMERM_HAROLD - - ; trainer group && trainer id - db SWIMMERM, HAROLD - - ; text when seen - dw SwimmermHaroldSeenText - - ; text when trainer beaten - dw SwimmermHaroldBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw SwimmermHaroldScript + trainer EVENT_BEAT_SWIMMERM_HAROLD, SWIMMERM, HAROLD, SwimmermHaroldSeenText, SwimmermHaroldBeatenText, $0000, SwimmermHaroldScript SwimmermHaroldScript: talkaftercancel @@ -76,23 +44,7 @@ SwimmermHaroldScript: end TrainerSwimmermJerome: - ; bit/flag number - dw EVENT_BEAT_SWIMMERM_JEROME - - ; trainer group && trainer id - db SWIMMERM, JEROME - - ; text when seen - dw SwimmermJeromeSeenText - - ; text when trainer beaten - dw SwimmermJeromeBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw SwimmermJeromeScript + trainer EVENT_BEAT_SWIMMERM_JEROME, SWIMMERM, JEROME, SwimmermJeromeSeenText, SwimmermJeromeBeatenText, $0000, SwimmermJeromeScript SwimmermJeromeScript: talkaftercancel @@ -103,23 +55,7 @@ SwimmermJeromeScript: end TrainerSwimmermTucker: - ; bit/flag number - dw EVENT_BEAT_SWIMMERM_TUCKER - - ; trainer group && trainer id - db SWIMMERM, TUCKER - - ; text when seen - dw SwimmermTuckerSeenText - - ; text when trainer beaten - dw SwimmermTuckerBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw SwimmermTuckerScript + trainer EVENT_BEAT_SWIMMERM_TUCKER, SWIMMERM, TUCKER, SwimmermTuckerSeenText, SwimmermTuckerBeatenText, $0000, SwimmermTuckerScript SwimmermTuckerScript: talkaftercancel @@ -297,23 +233,23 @@ Route19_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 1 warp_def $3, $7, 3, GROUP_ROUTE_19___FUCHSIA_GATE, MAP_ROUTE_19___FUCHSIA_GATE - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 2 - signpost 13, 11, $0, MapRoute19Signpost0Script - signpost 1, 11, $0, MapRoute19Signpost1Script + signpost 13, 11, SIGNPOST_READ, MapRoute19Signpost0Script + signpost 1, 11, SIGNPOST_READ, MapRoute19Signpost1Script - ; people-events +.PersonEvents: db 6 - person_event SPRITE_SWIMMER_GIRL, 27, 13, $8, $0, 255, 255, $a2, 0, TrainerSwimmerfDawn, -1 - person_event SPRITE_SWIMMER_GUY, 32, 17, $a, $0, 255, 255, $82, 3, TrainerSwimmermHarold, -1 - person_event SPRITE_SWIMMER_GUY, 21, 15, $a, $0, 255, 255, $82, 3, TrainerSwimmermJerome, -1 - person_event SPRITE_SWIMMER_GUY, 27, 12, $7, $0, 255, 255, $82, 0, TrainerSwimmermTucker, -1 - person_event SPRITE_FISHER, 9, 13, $6, $0, 255, 255, $80, 1, FisherScript_0x19ea4d, -1 - person_event SPRITE_FISHER, 9, 15, $5, $1, 255, 255, $90, 1, FisherScript_0x19ea61, -1 + person_event SPRITE_SWIMMER_GIRL, 27, 13, OW_LEFT | $0, $0, -1, -1, (PAL_OW_GREEN << 4) | $82, 0, TrainerSwimmerfDawn, -1 + person_event SPRITE_SWIMMER_GUY, 32, 17, OW_LEFT | $2, $0, -1, -1, (PAL_OW_RED << 4) | $82, 3, TrainerSwimmermHarold, -1 + person_event SPRITE_SWIMMER_GUY, 21, 15, OW_LEFT | $2, $0, -1, -1, (PAL_OW_RED << 4) | $82, 3, TrainerSwimmermJerome, -1 + person_event SPRITE_SWIMMER_GUY, 27, 12, OW_UP | $3, $0, -1, -1, (PAL_OW_RED << 4) | $82, 0, TrainerSwimmermTucker, -1 + person_event SPRITE_FISHER, 9, 13, OW_UP | $2, $0, -1, -1, (PAL_OW_RED << 4) | $80, 1, FisherScript_0x19ea4d, -1 + person_event SPRITE_FISHER, 9, 15, OW_UP | $1, $1, -1, -1, (PAL_OW_BLUE << 4) | $80, 1, FisherScript_0x19ea61, -1 diff --git a/maps/Route19FuchsiaGate.asm b/maps/Route19FuchsiaGate.asm index b6b913376..83559633e 100644 --- a/maps/Route19FuchsiaGate.asm +++ b/maps/Route19FuchsiaGate.asm @@ -1,8 +1,8 @@ Route19FuchsiaGate_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 OfficerScript_0x1ab3f6: @@ -46,19 +46,19 @@ Route19FuchsiaGate_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 4 warp_def $0, $4, 10, GROUP_FUCHSIA_CITY, MAP_FUCHSIA_CITY warp_def $0, $5, 11, GROUP_FUCHSIA_CITY, MAP_FUCHSIA_CITY warp_def $7, $4, 1, GROUP_ROUTE_19, MAP_ROUTE_19 warp_def $7, $5, 1, GROUP_ROUTE_19, MAP_ROUTE_19 - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 1 - person_event SPRITE_OFFICER, 8, 4, $9, $0, 255, 255, $90, 0, OfficerScript_0x1ab3f6, -1 + person_event SPRITE_OFFICER, 8, 4, OW_LEFT | $1, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, OfficerScript_0x1ab3f6, -1 diff --git a/maps/Route2.asm b/maps/Route2.asm index 4b35a30f2..2fb81e3f8 100644 --- a/maps/Route2.asm +++ b/maps/Route2.asm @@ -1,28 +1,12 @@ Route2_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 TrainerBug_catcherRob: - ; bit/flag number - dw EVENT_BEAT_BUG_CATCHER_ROB - - ; trainer group && trainer id - db BUG_CATCHER, ROB - - ; text when seen - dw Bug_catcherRobSeenText - - ; text when trainer beaten - dw Bug_catcherRobBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw Bug_catcherRobScript + trainer EVENT_BEAT_BUG_CATCHER_ROB, BUG_CATCHER, ROB, Bug_catcherRobSeenText, Bug_catcherRobBeatenText, $0000, Bug_catcherRobScript Bug_catcherRobScript: talkaftercancel @@ -33,23 +17,7 @@ Bug_catcherRobScript: end TrainerBug_catcherEd: - ; bit/flag number - dw EVENT_BEAT_BUG_CATCHER_ED - - ; trainer group && trainer id - db BUG_CATCHER, ED - - ; text when seen - dw Bug_catcherEdSeenText - - ; text when trainer beaten - dw Bug_catcherEdBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw Bug_catcherEdScript + trainer EVENT_BEAT_BUG_CATCHER_ED, BUG_CATCHER, ED, Bug_catcherEdSeenText, Bug_catcherEdBeatenText, $0000, Bug_catcherEdScript Bug_catcherEdScript: talkaftercancel @@ -60,23 +28,7 @@ Bug_catcherEdScript: end TrainerBug_catcherDoug: - ; bit/flag number - dw EVENT_BEAT_BUG_CATCHER_DOUG - - ; trainer group && trainer id - db BUG_CATCHER, DOUG - - ; text when seen - dw Bug_catcherDougSeenText - - ; text when trainer beaten - dw Bug_catcherDougBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw Bug_catcherDougScript + trainer EVENT_BEAT_BUG_CATCHER_DOUG, BUG_CATCHER, DOUG, Bug_catcherDougSeenText, Bug_catcherDougBeatenText, $0000, Bug_catcherDougScript Bug_catcherDougScript: talkaftercancel @@ -108,24 +60,16 @@ FruitTreeScript_0x1ac306: fruittree $19 MapRoute2SignpostItem2: - dw $00ed - db MAX_ETHER - + dwb EVENT_ROUTE_2_HIDDEN_MAX_ETHER, MAX_ETHER MapRoute2SignpostItem3: - dw $00ee - db FULL_HEAL - + dwb EVENT_ROUTE_2_HIDDEN_FULL_HEAL, FULL_HEAL MapRoute2SignpostItem4: - dw $00ef - db FULL_RESTORE - + dwb EVENT_ROUTE_2_HIDDEN_FULL_RESTORE, FULL_RESTORE MapRoute2SignpostItem5: - dw $00f0 - db REVIVE - + dwb EVENT_ROUTE_2_HIDDEN_REVIVE, REVIVE Bug_catcherRobSeenText: text "My bug #MON are" @@ -196,7 +140,7 @@ Route2_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 5 warp_def $f, $f, 1, GROUP_ROUTE_2_NUGGET_SPEECH_HOUSE, MAP_ROUTE_2_NUGGET_SPEECH_HOUSE warp_def $1f, $f, 3, GROUP_ROUTE_2_GATE, MAP_ROUTE_2_GATE @@ -204,25 +148,25 @@ Route2_MapEventHeader: warp_def $1b, $11, 2, GROUP_ROUTE_2_GATE, MAP_ROUTE_2_GATE warp_def $7, $c, 3, GROUP_DIGLETTS_CAVE, MAP_DIGLETTS_CAVE - ; xy triggers +.XYTriggers: db 0 - ; signposts +.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 - - ; people-events + signpost 51, 7, SIGNPOST_READ, MapRoute2Signpost0Script + signpost 9, 11, SIGNPOST_READ, MapRoute2Signpost1Script + signpost 23, 7, SIGNPOST_ITEM, MapRoute2SignpostItem2 + signpost 14, 4, SIGNPOST_ITEM, MapRoute2SignpostItem3 + signpost 27, 4, SIGNPOST_ITEM, MapRoute2SignpostItem4 + signpost 30, 11, SIGNPOST_ITEM, MapRoute2SignpostItem5 + +.PersonEvents: 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, OW_LEFT | $0, $0, -1, -1, (PAL_OW_BROWN << 4) | $82, 5, TrainerBug_catcherRob, -1 + person_event SPRITE_BUG_CATCHER, 8, 10, OW_RIGHT | $13, $0, -1, -1, (PAL_OW_BROWN << 4) | $82, 3, TrainerBug_catcherEd, -1 + person_event SPRITE_BUG_CATCHER, 44, 4, OW_LEFT | $1, $0, -1, -1, (PAL_OW_BROWN << 4) | $82, 3, TrainerBug_catcherDoug, -1 + person_event SPRITE_POKE_BALL, 33, 4, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x1ac2fe, EVENT_ROUTE_2_DIRE_HIT + person_event SPRITE_POKE_BALL, 27, 6, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x1ac300, EVENT_ROUTE_2_MAX_POTION + person_event SPRITE_POKE_BALL, 6, 23, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x1ac302, EVENT_ROUTE_2_CARBOS + person_event SPRITE_POKE_BALL, 54, 18, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x1ac304, EVENT_ROUTE_2_ELIXER + person_event SPRITE_FRUIT_TREE, 18, 14, OW_DOWN | $1, $0, -1, -1, $0, 0, FruitTreeScript_0x1ac306, -1 diff --git a/maps/Route20.asm b/maps/Route20.asm index 8846fb7ce..4f90a042f 100644 --- a/maps/Route20.asm +++ b/maps/Route20.asm @@ -1,8 +1,8 @@ Route20_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 1 ; callbacks @@ -14,23 +14,7 @@ Route20_MapScriptHeader: return TrainerSwimmerfNicole: - ; bit/flag number - dw EVENT_BEAT_SWIMMERF_NICOLE - - ; trainer group && trainer id - db SWIMMERF, NICOLE - - ; text when seen - dw SwimmerfNicoleSeenText - - ; text when trainer beaten - dw SwimmerfNicoleBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw SwimmerfNicoleScript + trainer EVENT_BEAT_SWIMMERF_NICOLE, SWIMMERF, NICOLE, SwimmerfNicoleSeenText, SwimmerfNicoleBeatenText, $0000, SwimmerfNicoleScript SwimmerfNicoleScript: talkaftercancel @@ -41,23 +25,7 @@ SwimmerfNicoleScript: end TrainerSwimmerfLori: - ; bit/flag number - dw EVENT_BEAT_SWIMMERF_LORI - - ; trainer group && trainer id - db SWIMMERF, LORI - - ; text when seen - dw SwimmerfLoriSeenText - - ; text when trainer beaten - dw SwimmerfLoriBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw SwimmerfLoriScript + trainer EVENT_BEAT_SWIMMERF_LORI, SWIMMERF, LORI, SwimmerfLoriSeenText, SwimmerfLoriBeatenText, $0000, SwimmerfLoriScript SwimmerfLoriScript: talkaftercancel @@ -68,23 +36,7 @@ SwimmerfLoriScript: end TrainerSwimmermCameron: - ; bit/flag number - dw EVENT_BEAT_SWIMMERM_CAMERON - - ; trainer group && trainer id - db SWIMMERM, CAMERON - - ; text when seen - dw SwimmermCameronSeenText - - ; text when trainer beaten - dw SwimmermCameronBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw SwimmermCameronScript + trainer EVENT_BEAT_SWIMMERM_CAMERON, SWIMMERM, CAMERON, SwimmermCameronSeenText, SwimmermCameronBeatenText, $0000, SwimmermCameronScript SwimmermCameronScript: talkaftercancel @@ -162,19 +114,19 @@ Route20_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 1 warp_def $7, $26, 1, GROUP_SEAFOAM_GYM, MAP_SEAFOAM_GYM - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 1 - signpost 11, 37, $0, MapRoute20Signpost0Script + signpost 11, 37, SIGNPOST_READ, MapRoute20Signpost0Script - ; people-events +.PersonEvents: db 3 - person_event SPRITE_SWIMMER_GIRL, 12, 56, $a, $0, 255, 255, $a2, 3, TrainerSwimmerfNicole, -1 - person_event SPRITE_SWIMMER_GIRL, 17, 49, $a, $0, 255, 255, $a2, 3, TrainerSwimmerfLori, -1 - person_event SPRITE_SWIMMER_GUY, 17, 16, $a, $0, 255, 255, $82, 3, TrainerSwimmermCameron, -1 + person_event SPRITE_SWIMMER_GIRL, 12, 56, OW_LEFT | $2, $0, -1, -1, (PAL_OW_GREEN << 4) | $82, 3, TrainerSwimmerfNicole, -1 + person_event SPRITE_SWIMMER_GIRL, 17, 49, OW_LEFT | $2, $0, -1, -1, (PAL_OW_GREEN << 4) | $82, 3, TrainerSwimmerfLori, -1 + person_event SPRITE_SWIMMER_GUY, 17, 16, OW_LEFT | $2, $0, -1, -1, (PAL_OW_RED << 4) | $82, 3, TrainerSwimmermCameron, -1 diff --git a/maps/Route21.asm b/maps/Route21.asm index fe96e5bce..2d7f18b21 100644 --- a/maps/Route21.asm +++ b/maps/Route21.asm @@ -1,28 +1,12 @@ Route21_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 TrainerSwimmermSeth: - ; bit/flag number - dw EVENT_BEAT_SWIMMERM_SETH - - ; trainer group && trainer id - db SWIMMERM, SETH - - ; text when seen - dw SwimmermSethSeenText - - ; text when trainer beaten - dw SwimmermSethBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw SwimmermSethScript + trainer EVENT_BEAT_SWIMMERM_SETH, SWIMMERM, SETH, SwimmermSethSeenText, SwimmermSethBeatenText, $0000, SwimmermSethScript SwimmermSethScript: talkaftercancel @@ -33,23 +17,7 @@ SwimmermSethScript: end TrainerSwimmerfNikki: - ; bit/flag number - dw EVENT_BEAT_SWIMMERF_NIKKI - - ; trainer group && trainer id - db SWIMMERF, NIKKI - - ; text when seen - dw SwimmerfNikkiSeenText - - ; text when trainer beaten - dw SwimmerfNikkiBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw SwimmerfNikkiScript + trainer EVENT_BEAT_SWIMMERF_NIKKI, SWIMMERF, NIKKI, SwimmerfNikkiSeenText, SwimmerfNikkiBeatenText, $0000, SwimmerfNikkiScript SwimmerfNikkiScript: talkaftercancel @@ -60,23 +28,7 @@ SwimmerfNikkiScript: end TrainerFisherArnold: - ; bit/flag number - dw EVENT_BEAT_FISHER_ARNOLD - - ; trainer group && trainer id - db FISHER, ARNOLD - - ; text when seen - dw FisherArnoldSeenText - - ; text when trainer beaten - dw FisherArnoldBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw FisherArnoldScript + trainer EVENT_BEAT_FISHER_ARNOLD, FISHER, ARNOLD, FisherArnoldSeenText, FisherArnoldBeatenText, $0000, FisherArnoldScript FisherArnoldScript: talkaftercancel @@ -136,17 +88,17 @@ Route21_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 0 - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 3 - person_event SPRITE_SWIMMER_GIRL, 20, 15, $a, $0, 255, 255, $a2, 3, TrainerSwimmerfNikki, -1 - person_event SPRITE_SWIMMER_GUY, 34, 6, $9, $0, 255, 255, $82, 4, TrainerSwimmermSeth, -1 - person_event SPRITE_FISHER, 26, 18, $7, $0, 255, 255, $a2, 1, TrainerFisherArnold, -1 + person_event SPRITE_SWIMMER_GIRL, 20, 15, OW_LEFT | $2, $0, -1, -1, (PAL_OW_GREEN << 4) | $82, 3, TrainerSwimmerfNikki, -1 + person_event SPRITE_SWIMMER_GUY, 34, 6, OW_LEFT | $1, $0, -1, -1, (PAL_OW_RED << 4) | $82, 4, TrainerSwimmermSeth, -1 + person_event SPRITE_FISHER, 26, 18, OW_UP | $3, $0, -1, -1, (PAL_OW_GREEN << 4) | $82, 1, TrainerFisherArnold, -1 diff --git a/maps/Route22.asm b/maps/Route22.asm index 699cbd342..60d82f4f0 100644 --- a/maps/Route22.asm +++ b/maps/Route22.asm @@ -1,8 +1,8 @@ Route22_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 MapRoute22Signpost0Script: @@ -19,16 +19,16 @@ Route22_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 1 warp_def $5, $d, 1, GROUP_VICTORY_ROAD_GATE, MAP_VICTORY_ROAD_GATE - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 1 - signpost 7, 15, $0, MapRoute22Signpost0Script + signpost 7, 15, SIGNPOST_READ, MapRoute22Signpost0Script - ; people-events +.PersonEvents: db 0 diff --git a/maps/Route23.asm b/maps/Route23.asm index 81304151e..900b8186e 100644 --- a/maps/Route23.asm +++ b/maps/Route23.asm @@ -1,8 +1,8 @@ Route23_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 1 ; callbacks @@ -28,19 +28,19 @@ Route23_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 4 warp_def $5, $9, 1, GROUP_INDIGO_PLATEAU_POKECENTER_1F, MAP_INDIGO_PLATEAU_POKECENTER_1F warp_def $5, $a, 2, GROUP_INDIGO_PLATEAU_POKECENTER_1F, MAP_INDIGO_PLATEAU_POKECENTER_1F warp_def $d, $9, 10, GROUP_VICTORY_ROAD, MAP_VICTORY_ROAD warp_def $d, $a, 10, GROUP_VICTORY_ROAD, MAP_VICTORY_ROAD - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 1 - signpost 7, 11, $0, IndigoPlateauSign + signpost 7, 11, SIGNPOST_READ, IndigoPlateauSign - ; people-events +.PersonEvents: db 0 diff --git a/maps/Route24.asm b/maps/Route24.asm index e02b1cff3..4275c53a5 100644 --- a/maps/Route24.asm +++ b/maps/Route24.asm @@ -1,8 +1,8 @@ Route24_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 RocketScript_0x1adbfa: @@ -12,7 +12,7 @@ RocketScript_0x1adbfa: writetext UnknownText_0x1adc2e closetext loadmovesprites - winlosstext UnknownText_0x1add67, $ffff + winlosstext UnknownText_0x1add67, -1 loadtrainer GRUNTM, 31 startbattle reloadmapmusic @@ -25,11 +25,11 @@ RocketScript_0x1adbfa: writetext UnknownText_0x1adee1 closetext loadmovesprites - special Function8c0b6 - special Functiond91 + special Special_FadeBlackQuickly + special Special_ReloadSpritesNoPalettes disappear $2 pause 25 - special Function8c0ab + special Special_FadeInQuickly playmapmusic end @@ -119,15 +119,15 @@ Route24_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 0 - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 1 - person_event SPRITE_ROCKET, 11, 12, $3, $0, 255, 255, $0, 0, RocketScript_0x1adbfa, EVENT_76C + person_event SPRITE_ROCKET, 11, 12, OW_DOWN | $3, $0, -1, -1, $0, 0, RocketScript_0x1adbfa, EVENT_ROUTE_24_ROCKET diff --git a/maps/Route25.asm b/maps/Route25.asm index 662dbb7e0..0a1803b0a 100644 --- a/maps/Route25.asm +++ b/maps/Route25.asm @@ -1,12 +1,12 @@ Route25_MapScriptHeader: - ; trigger count +.MapTriggers: db 2 ; triggers dw UnknownScript_0x19ee9e, $0000 dw UnknownScript_0x19ee9f, $0000 - ; callback count +.MapCallbacks: db 0 UnknownScript_0x19ee9e: @@ -18,7 +18,7 @@ UnknownScript_0x19ee9f: UnknownScript_0x19eea0: showemote $4, $2, 15 pause 30 - showemote $0, $3, 10 + showemote EMOTE_SHOCK, $3, 10 spriteface $2, DOWN applymovement $3, MovementData_0x19efe8 disappear $3 @@ -44,7 +44,7 @@ UnknownScript_0x19eea0: UnknownScript_0x19eee0: showemote $4, $2, 15 pause 30 - showemote $0, $3, 10 + showemote EMOTE_SHOCK, $3, 10 spriteface $2, DOWN applymovement $3, MovementData_0x19efea disappear $3 @@ -68,23 +68,7 @@ UnknownScript_0x19eee0: end TrainerSchoolboyDudley: - ; bit/flag number - dw EVENT_BEAT_SCHOOLBOY_DUDLEY - - ; trainer group && trainer id - db SCHOOLBOY, DUDLEY - - ; text when seen - dw SchoolboyDudleySeenText - - ; text when trainer beaten - dw SchoolboyDudleyBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw SchoolboyDudleyScript + trainer EVENT_BEAT_SCHOOLBOY_DUDLEY, SCHOOLBOY, DUDLEY, SchoolboyDudleySeenText, SchoolboyDudleyBeatenText, $0000, SchoolboyDudleyScript SchoolboyDudleyScript: talkaftercancel @@ -95,23 +79,7 @@ SchoolboyDudleyScript: end TrainerLassEllen: - ; bit/flag number - dw EVENT_BEAT_LASS_ELLEN - - ; trainer group && trainer id - db LASS, ELLEN - - ; text when seen - dw LassEllenSeenText - - ; text when trainer beaten - dw LassEllenBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw LassEllenScript + trainer EVENT_BEAT_LASS_ELLEN, LASS, ELLEN, LassEllenSeenText, LassEllenBeatenText, $0000, LassEllenScript LassEllenScript: talkaftercancel @@ -122,23 +90,7 @@ LassEllenScript: end TrainerSchoolboyJoe: - ; bit/flag number - dw EVENT_BEAT_SCHOOLBOY_JOE - - ; trainer group && trainer id - db SCHOOLBOY, JOE - - ; text when seen - dw SchoolboyJoeSeenText - - ; text when trainer beaten - dw SchoolboyJoeBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw SchoolboyJoeScript + trainer EVENT_BEAT_SCHOOLBOY_JOE, SCHOOLBOY, JOE, SchoolboyJoeSeenText, SchoolboyJoeBeatenText, $0000, SchoolboyJoeScript SchoolboyJoeScript: talkaftercancel @@ -149,23 +101,7 @@ SchoolboyJoeScript: end TrainerLassLaura: - ; bit/flag number - dw EVENT_BEAT_LASS_LAURA - - ; trainer group && trainer id - db LASS, LAURA - - ; text when seen - dw LassLauraSeenText - - ; text when trainer beaten - dw LassLauraBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw LassLauraScript + trainer EVENT_BEAT_LASS_LAURA, LASS, LAURA, LassLauraSeenText, LassLauraBeatenText, $0000, LassLauraScript LassLauraScript: talkaftercancel @@ -176,23 +112,7 @@ LassLauraScript: end TrainerCamperLloyd: - ; bit/flag number - dw EVENT_BEAT_CAMPER_LLOYD - - ; trainer group && trainer id - db CAMPER, LLOYD - - ; text when seen - dw CamperLloydSeenText - - ; text when trainer beaten - dw CamperLloydBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw CamperLloydScript + trainer EVENT_BEAT_CAMPER_LLOYD, CAMPER, LLOYD, CamperLloydSeenText, CamperLloydBeatenText, $0000, CamperLloydScript CamperLloydScript: talkaftercancel @@ -203,23 +123,7 @@ CamperLloydScript: end TrainerLassShannon: - ; bit/flag number - dw EVENT_BEAT_LASS_SHANNON - - ; trainer group && trainer id - db LASS, SHANNON - - ; text when seen - dw LassShannonSeenText - - ; text when trainer beaten - dw LassShannonBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw LassShannonScript + trainer EVENT_BEAT_LASS_SHANNON, LASS, SHANNON, LassShannonSeenText, LassShannonBeatenText, $0000, LassShannonScript LassShannonScript: talkaftercancel @@ -230,23 +134,7 @@ LassShannonScript: end TrainerSupernerdPat: - ; bit/flag number - dw EVENT_BEAT_SUPER_NERD_PAT - - ; trainer group && trainer id - db SUPER_NERD, PAT - - ; text when seen - dw SupernerdPatSeenText - - ; text when trainer beaten - dw SupernerdPatBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw SupernerdPatScript + trainer EVENT_BEAT_SUPER_NERD_PAT, SUPER_NERD, PAT, SupernerdPatSeenText, SupernerdPatBeatenText, $0000, SupernerdPatScript SupernerdPatScript: talkaftercancel @@ -292,8 +180,7 @@ ItemFragment_0x19efe3: db PROTEIN, 1 MapRoute25SignpostItem1: - dw $00f8 - db POTION + dwb EVENT_ROUTE_25_HIDDEN_POTION, POTION MovementData_0x19efe8: @@ -536,30 +423,30 @@ Route25_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 1 warp_def $5, $2f, 1, GROUP_BILLS_HOUSE, MAP_BILLS_HOUSE - ; xy triggers +.XYTriggers: db 2 xy_trigger 1, $6, $2a, $0, UnknownScript_0x19eea0, $0, $0 xy_trigger 1, $7, $2a, $0, UnknownScript_0x19eee0, $0, $0 - ; signposts +.Signposts: db 2 - signpost 5, 45, $0, MapRoute25Signpost0Script - signpost 5, 4, $7, MapRoute25SignpostItem1 + signpost 5, 45, SIGNPOST_READ, MapRoute25Signpost0Script + signpost 5, 4, SIGNPOST_ITEM, MapRoute25SignpostItem1 - ; people-events +.PersonEvents: db 11 - person_event SPRITE_MISTY, 13, 50, $8, $0, 255, 255, $80, 0, ObjectEvent, EVENT_76E - person_event SPRITE_COOLTRAINER_M, 14, 50, $8, $0, 255, 255, $a0, 0, ObjectEvent, EVENT_76E - person_event SPRITE_YOUNGSTER, 12, 16, $6, $0, 255, 255, $92, 3, TrainerSchoolboyDudley, -1 - person_event SPRITE_LASS, 15, 20, $7, $0, 255, 255, $92, 3, TrainerLassEllen, -1 - person_event SPRITE_YOUNGSTER, 12, 25, $6, $0, 255, 255, $92, 1, TrainerSchoolboyJoe, -1 - person_event SPRITE_LASS, 10, 26, $9, $0, 255, 255, $92, 3, TrainerLassLaura, -1 - person_event SPRITE_YOUNGSTER, 8, 29, $6, $0, 255, 255, $a2, 2, TrainerCamperLloyd, -1 - person_event SPRITE_LASS, 15, 32, $7, $0, 255, 255, $92, 1, TrainerLassShannon, -1 - person_event SPRITE_SUPER_NERD, 11, 35, $6, $0, 255, 255, $b2, 1, TrainerSupernerdPat, -1 - person_event SPRITE_COOLTRAINER_M, 12, 41, $8, $0, 255, 255, $80, 0, CooltrainerMScript_0x19efac, -1 - person_event SPRITE_POKE_BALL, 8, 36, $1, $0, 255, 255, $1, 0, ItemFragment_0x19efe3, EVENT_78B + person_event SPRITE_MISTY, 13, 50, OW_LEFT | $0, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, ObjectEvent, EVENT_ROUTE_25_MISTY_BOYFRIEND + person_event SPRITE_COOLTRAINER_M, 14, 50, OW_LEFT | $0, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, ObjectEvent, EVENT_ROUTE_25_MISTY_BOYFRIEND + person_event SPRITE_YOUNGSTER, 12, 16, OW_UP | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 3, TrainerSchoolboyDudley, -1 + person_event SPRITE_LASS, 15, 20, OW_UP | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 3, TrainerLassEllen, -1 + person_event SPRITE_YOUNGSTER, 12, 25, OW_UP | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 1, TrainerSchoolboyJoe, -1 + person_event SPRITE_LASS, 10, 26, OW_LEFT | $1, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 3, TrainerLassLaura, -1 + person_event SPRITE_YOUNGSTER, 8, 29, OW_UP | $2, $0, -1, -1, (PAL_OW_GREEN << 4) | $82, 2, TrainerCamperLloyd, -1 + person_event SPRITE_LASS, 15, 32, OW_UP | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 1, TrainerLassShannon, -1 + person_event SPRITE_SUPER_NERD, 11, 35, OW_UP | $2, $0, -1, -1, (PAL_OW_BROWN << 4) | $82, 1, TrainerSupernerdPat, -1 + person_event SPRITE_COOLTRAINER_M, 12, 41, OW_LEFT | $0, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, CooltrainerMScript_0x19efac, -1 + person_event SPRITE_POKE_BALL, 8, 36, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x19efe3, EVENT_ROUTE_25_PROTEIN diff --git a/maps/Route26.asm b/maps/Route26.asm index 9daa11e14..b6f5ebab6 100644 --- a/maps/Route26.asm +++ b/maps/Route26.asm @@ -1,28 +1,12 @@ Route26_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 TrainerCooltrainermJake: - ; bit/flag number - dw EVENT_BEAT_COOLTRAINERM_JAKE - - ; trainer group && trainer id - db COOLTRAINERM, JAKE - - ; text when seen - dw CooltrainermJakeSeenText - - ; text when trainer beaten - dw CooltrainermJakeBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw CooltrainermJakeScript + trainer EVENT_BEAT_COOLTRAINERM_JAKE, COOLTRAINERM, JAKE, CooltrainermJakeSeenText, CooltrainermJakeBeatenText, $0000, CooltrainermJakeScript CooltrainermJakeScript: talkaftercancel @@ -33,31 +17,15 @@ CooltrainermJakeScript: end TrainerCooltrainermGaven3: - ; bit/flag number - dw EVENT_BEAT_COOLTRAINERM_GAVEN - - ; trainer group && trainer id - db COOLTRAINERM, GAVEN3 - - ; text when seen - dw CooltrainermGaven3SeenText - - ; text when trainer beaten - dw CooltrainermGaven3BeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw CooltrainermGaven3Script + trainer EVENT_BEAT_COOLTRAINERM_GAVEN, COOLTRAINERM, GAVEN3, CooltrainermGaven3SeenText, CooltrainermGaven3BeatenText, $0000, CooltrainermGaven3Script CooltrainermGaven3Script: - writecode VAR_CALLERID, $b + writecode VAR_CALLERID, PHONE_COOLTRAINERM_GAVEN talkaftercancel loadfont checkflag ENGINE_GAVEN iftrue UnknownScript_0x1a4d79 - checkcellnum $b + checkcellnum PHONE_COOLTRAINERM_GAVEN iftrue UnknownScript_0x1a4dcb checkevent EVENT_GAVEN_ASKED_FOR_PHONE_NUMBER iftrue UnknownScript_0x1a4d62 @@ -70,7 +38,7 @@ CooltrainermGaven3Script: UnknownScript_0x1a4d62: scall UnknownScript_0x1a4dc3 UnknownScript_0x1a4d65: - askforphonenumber $b + askforphonenumber PHONE_COOLTRAINERM_GAVEN if_equal $1, UnknownScript_0x1a4dd3 if_equal $2, UnknownScript_0x1a4dcf trainertotext COOLTRAINERM, GAVEN3, $0 @@ -142,23 +110,7 @@ UnknownScript_0x1a4dd7: end TrainerCooltrainerfJoyce: - ; bit/flag number - dw EVENT_BEAT_COOLTRAINERF_JOYCE - - ; trainer group && trainer id - db COOLTRAINERF, JOYCE - - ; text when seen - dw CooltrainerfJoyceSeenText - - ; text when trainer beaten - dw CooltrainerfJoyceBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw CooltrainerfJoyceScript + trainer EVENT_BEAT_COOLTRAINERF_JOYCE, COOLTRAINERF, JOYCE, CooltrainerfJoyceSeenText, CooltrainerfJoyceBeatenText, $0000, CooltrainerfJoyceScript CooltrainerfJoyceScript: talkaftercancel @@ -169,31 +121,15 @@ CooltrainerfJoyceScript: end TrainerCooltrainerfBeth1: - ; bit/flag number - dw EVENT_BEAT_COOLTRAINERF_BETH - - ; trainer group && trainer id - db COOLTRAINERF, BETH1 - - ; text when seen - dw CooltrainerfBeth1SeenText - - ; text when trainer beaten - dw CooltrainerfBeth1BeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw CooltrainerfBeth1Script + trainer EVENT_BEAT_COOLTRAINERF_BETH, COOLTRAINERF, BETH1, CooltrainerfBeth1SeenText, CooltrainerfBeth1BeatenText, $0000, CooltrainerfBeth1Script CooltrainerfBeth1Script: - writecode VAR_CALLERID, $c + writecode VAR_CALLERID, PHONE_COOLTRAINERF_BETH talkaftercancel loadfont checkflag ENGINE_BETH iftrue UnknownScript_0x1a4e35 - checkcellnum $c + checkcellnum PHONE_COOLTRAINERF_BETH iftrue UnknownScript_0x1a4e87 checkevent EVENT_BETH_ASKED_FOR_PHONE_NUMBER iftrue UnknownScript_0x1a4e1e @@ -206,7 +142,7 @@ CooltrainerfBeth1Script: UnknownScript_0x1a4e1e: scall UnknownScript_0x1a4e7f UnknownScript_0x1a4e21: - askforphonenumber $c + askforphonenumber PHONE_COOLTRAINERF_BETH if_equal $1, UnknownScript_0x1a4e8f if_equal $2, UnknownScript_0x1a4e8b trainertotext COOLTRAINERF, BETH1, $0 @@ -278,23 +214,7 @@ UnknownScript_0x1a4e93: end TrainerPsychicRichard: - ; bit/flag number - dw EVENT_BEAT_PSYCHIC_RICHARD - - ; trainer group && trainer id - db PSYCHIC_T, RICHARD - - ; text when seen - dw PsychicRichardSeenText - - ; text when trainer beaten - dw PsychicRichardBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw PsychicRichardScript + trainer EVENT_BEAT_PSYCHIC_RICHARD, PSYCHIC_T, RICHARD, PsychicRichardSeenText, PsychicRichardBeatenText, $0000, PsychicRichardScript PsychicRichardScript: talkaftercancel @@ -305,23 +225,7 @@ PsychicRichardScript: end TrainerFisherScott: - ; bit/flag number - dw EVENT_BEAT_FISHER_SCOTT - - ; trainer group && trainer id - db FISHER, SCOTT - - ; text when seen - dw FisherScottSeenText - - ; text when trainer beaten - dw FisherScottBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw FisherScottScript + trainer EVENT_BEAT_FISHER_SCOTT, FISHER, SCOTT, FisherScottSeenText, FisherScottBeatenText, $0000, FisherScottScript FisherScottScript: talkaftercancel @@ -502,26 +406,26 @@ Route26_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 3 warp_def $5, $7, 3, GROUP_VICTORY_ROAD_GATE, MAP_VICTORY_ROAD_GATE warp_def $39, $f, 1, GROUP_ROUTE_26_HEAL_SPEECH_HOUSE, MAP_ROUTE_26_HEAL_SPEECH_HOUSE warp_def $47, $5, 1, GROUP_ROUTE_26_DAY_OF_WEEK_SIBLINGS_HOUSE, MAP_ROUTE_26_DAY_OF_WEEK_SIBLINGS_HOUSE - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 1 - signpost 6, 8, $0, MapRoute26Signpost0Script + signpost 6, 8, SIGNPOST_READ, MapRoute26Signpost0Script - ; people-events +.PersonEvents: db 8 - person_event SPRITE_COOLTRAINER_M, 28, 18, $8, $0, 255, 255, $82, 2, TrainerCooltrainermJake, -1 - person_event SPRITE_COOLTRAINER_M, 42, 13, $8, $0, 255, 255, $82, 3, TrainerCooltrainermGaven3, -1 - person_event SPRITE_COOLTRAINER_F, 60, 14, $a, $0, 255, 255, $82, 3, TrainerCooltrainerfJoyce, -1 - person_event SPRITE_COOLTRAINER_F, 12, 9, $9, $0, 255, 255, $82, 4, TrainerCooltrainerfBeth1, -1 - person_event SPRITE_YOUNGSTER, 83, 17, $9, $0, 255, 255, $92, 2, TrainerPsychicRichard, -1 - person_event SPRITE_FISHER, 96, 14, $6, $0, 255, 255, $a2, 3, TrainerFisherScott, -1 - person_event SPRITE_FRUIT_TREE, 58, 18, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x1a4ec2, -1 - person_event SPRITE_POKE_BALL, 19, 13, $1, $0, 255, 255, $1, 0, ItemFragment_0x1a4ec4, EVENT_6AA + person_event SPRITE_COOLTRAINER_M, 28, 18, OW_LEFT | $0, $0, -1, -1, (PAL_OW_RED << 4) | $82, 2, TrainerCooltrainermJake, -1 + person_event SPRITE_COOLTRAINER_M, 42, 13, OW_LEFT | $0, $0, -1, -1, (PAL_OW_RED << 4) | $82, 3, TrainerCooltrainermGaven3, -1 + person_event SPRITE_COOLTRAINER_F, 60, 14, OW_LEFT | $2, $0, -1, -1, (PAL_OW_RED << 4) | $82, 3, TrainerCooltrainerfJoyce, -1 + person_event SPRITE_COOLTRAINER_F, 12, 9, OW_LEFT | $1, $0, -1, -1, (PAL_OW_RED << 4) | $82, 4, TrainerCooltrainerfBeth1, -1 + person_event SPRITE_YOUNGSTER, 83, 17, OW_LEFT | $1, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 2, TrainerPsychicRichard, -1 + person_event SPRITE_FISHER, 96, 14, OW_UP | $2, $0, -1, -1, (PAL_OW_GREEN << 4) | $82, 3, TrainerFisherScott, -1 + person_event SPRITE_FRUIT_TREE, 58, 18, OW_DOWN | $1, $0, -1, -1, $0, 0, FruitTreeScript_0x1a4ec2, -1 + person_event SPRITE_POKE_BALL, 19, 13, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x1a4ec4, EVENT_ROUTE_26_MAX_ELIXER diff --git a/maps/Route26DayofWeekSiblingsHouse.asm b/maps/Route26DayofWeekSiblingsHouse.asm index fdae9b3a8..10260ba7c 100644 --- a/maps/Route26DayofWeekSiblingsHouse.asm +++ b/maps/Route26DayofWeekSiblingsHouse.asm @@ -1,8 +1,8 @@ Route26DayofWeekSiblingsHouse_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 PokedexScript_0x7b1e4: @@ -71,17 +71,17 @@ Route26DayofWeekSiblingsHouse_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $7, $2, 3, GROUP_ROUTE_26, MAP_ROUTE_26 warp_def $7, $3, 3, GROUP_ROUTE_26, MAP_ROUTE_26 - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 1 - person_event SPRITE_POKEDEX, 7, 7, $1, $0, 255, 255, $0, 0, PokedexScript_0x7b1e4, -1 + person_event SPRITE_POKEDEX, 7, 7, OW_DOWN | $1, $0, -1, -1, $0, 0, PokedexScript_0x7b1e4, -1 diff --git a/maps/Route26HealSpeechHouse.asm b/maps/Route26HealSpeechHouse.asm index ac31d6055..267802ef4 100644 --- a/maps/Route26HealSpeechHouse.asm +++ b/maps/Route26HealSpeechHouse.asm @@ -1,8 +1,8 @@ Route26HealSpeechHouse_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 TeacherScript_0x7b125: @@ -11,13 +11,13 @@ TeacherScript_0x7b125: writetext UnknownText_0x7b14d closetext loadmovesprites - special Function8c0b6 - special Functiond91 - special Function1060a2 + special Special_FadeBlackQuickly + special Special_ReloadSpritesNoPalettes + special Mobile_HealParty playmusic MUSIC_HEAL special HealParty pause 60 - special Function8c0ab + special Special_FadeInQuickly special RestartMapMusic loadfont writetext UnknownText_0x7b18b @@ -49,19 +49,19 @@ Route26HealSpeechHouse_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $7, $2, 2, GROUP_ROUTE_26, MAP_ROUTE_26 warp_def $7, $3, 2, GROUP_ROUTE_26, MAP_ROUTE_26 - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 2 - signpost 1, 0, $0, Route26HealHouseBookshelf - signpost 1, 1, $0, Route26HealHouseBookshelf + signpost 1, 0, SIGNPOST_READ, Route26HealHouseBookshelf + signpost 1, 1, SIGNPOST_READ, Route26HealHouseBookshelf - ; people-events +.PersonEvents: db 1 - person_event SPRITE_TEACHER, 7, 6, $6, $0, 255, 255, $90, 0, TeacherScript_0x7b125, -1 + person_event SPRITE_TEACHER, 7, 6, OW_UP | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, TeacherScript_0x7b125, -1 diff --git a/maps/Route27.asm b/maps/Route27.asm index 7ccdb3625..9d6f7dca6 100644 --- a/maps/Route27.asm +++ b/maps/Route27.asm @@ -1,12 +1,12 @@ Route27_MapScriptHeader: - ; trigger count +.MapTriggers: db 2 ; triggers dw UnknownScript_0x1a0871, $0000 dw UnknownScript_0x1a0872, $0000 - ; callback count +.MapCallbacks: db 0 UnknownScript_0x1a0871: @@ -17,13 +17,13 @@ UnknownScript_0x1a0872: UnknownScript_0x1a0873: spriteface $a, LEFT - showemote $0, $a, 15 + showemote EMOTE_SHOCK, $a, 15 applymovement $a, MovementData_0x1a0a66 jump UnknownScript_0x1a088c UnknownScript_0x1a0881: spriteface $a, LEFT - showemote $0, $a, 15 + showemote EMOTE_SHOCK, $a, 15 applymovement $a, MovementData_0x1a0a69 UnknownScript_0x1a088c: spriteface $0, RIGHT @@ -40,23 +40,7 @@ FisherScript_0x1a089c: jumptextfaceplayer UnknownText_0x1a0a71 TrainerPsychicGilbert: - ; bit/flag number - dw EVENT_BEAT_PSYCHIC_GILBERT - - ; trainer group && trainer id - db PSYCHIC_T, GILBERT - - ; text when seen - dw PsychicGilbertSeenText - - ; text when trainer beaten - dw PsychicGilbertBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw PsychicGilbertScript + trainer EVENT_BEAT_PSYCHIC_GILBERT, PSYCHIC_T, GILBERT, PsychicGilbertSeenText, PsychicGilbertBeatenText, $0000, PsychicGilbertScript PsychicGilbertScript: talkaftercancel @@ -67,33 +51,17 @@ PsychicGilbertScript: end TrainerBird_keeperJose2: - ; bit/flag number - dw EVENT_BEAT_BIRD_KEEPER_JOSE - - ; trainer group && trainer id - db BIRD_KEEPER, JOSE2 - - ; text when seen - dw Bird_keeperJose2SeenText - - ; text when trainer beaten - dw Bird_keeperJose2BeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw Bird_keeperJose2Script + trainer EVENT_BEAT_BIRD_KEEPER_JOSE2, BIRD_KEEPER, JOSE2, Bird_keeperJose2SeenText, Bird_keeperJose2BeatenText, $0000, Bird_keeperJose2Script Bird_keeperJose2Script: - writecode VAR_CALLERID, $d + writecode VAR_CALLERID, PHONE_BIRDKEEPER_JOSE talkaftercancel loadfont checkflag ENGINE_JOSE iftrue UnknownScript_0x1a08ff checkflag ENGINE_JOSE_HAS_STAR_PIECE iftrue UnknownScript_0x1a0945 - checkcellnum $d + checkcellnum PHONE_BIRDKEEPER_JOSE iftrue UnknownScript_0x1a0963 checkevent EVENT_JOSE_ASKED_FOR_PHONE_NUMBER iftrue UnknownScript_0x1a08e8 @@ -106,7 +74,7 @@ Bird_keeperJose2Script: UnknownScript_0x1a08e8: scall UnknownScript_0x1a095b UnknownScript_0x1a08eb: - askforphonenumber $d + askforphonenumber PHONE_BIRDKEEPER_JOSE if_equal $1, UnknownScript_0x1a096b if_equal $2, UnknownScript_0x1a0967 trainertotext BIRD_KEEPER, JOSE2, $0 @@ -196,23 +164,7 @@ UnknownScript_0x1a0977: end TrainerCooltrainermBlake: - ; bit/flag number - dw EVENT_BEAT_COOLTRAINERM_BLAKE - - ; trainer group && trainer id - db COOLTRAINERM, BLAKE - - ; text when seen - dw CooltrainermBlakeSeenText - - ; text when trainer beaten - dw CooltrainermBlakeBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw CooltrainermBlakeScript + trainer EVENT_BEAT_COOLTRAINERM_BLAKE, COOLTRAINERM, BLAKE, CooltrainermBlakeSeenText, CooltrainermBlakeBeatenText, $0000, CooltrainermBlakeScript CooltrainermBlakeScript: talkaftercancel @@ -223,23 +175,7 @@ CooltrainermBlakeScript: end TrainerCooltrainermBrian: - ; bit/flag number - dw EVENT_BEAT_COOLTRAINERM_BRIAN - - ; trainer group && trainer id - db COOLTRAINERM, BRIAN - - ; text when seen - dw CooltrainermBrianSeenText - - ; text when trainer beaten - dw CooltrainermBrianBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw CooltrainermBrianScript + trainer EVENT_BEAT_COOLTRAINERM_BRIAN, COOLTRAINERM, BRIAN, CooltrainermBrianSeenText, CooltrainermBrianBeatenText, $0000, CooltrainermBrianScript CooltrainermBrianScript: talkaftercancel @@ -250,31 +186,15 @@ CooltrainermBrianScript: end TrainerCooltrainerfReena: - ; bit/flag number - dw EVENT_BEAT_COOLTRAINERF_REENA - - ; trainer group && trainer id - db COOLTRAINERF, REENA1 - - ; text when seen - dw CooltrainerfReena1SeenText - - ; text when trainer beaten - dw CooltrainerfReena1BeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw CooltrainerfReena1Script + trainer EVENT_BEAT_COOLTRAINERF_REENA, COOLTRAINERF, REENA1, CooltrainerfReena1SeenText, CooltrainerfReena1BeatenText, $0000, CooltrainerfReena1Script CooltrainerfReena1Script: - writecode VAR_CALLERID, $e + writecode VAR_CALLERID, PHONE_COOLTRAINERF_REENA talkaftercancel loadfont checkflag ENGINE_REENA iftrue UnknownScript_0x1a09e9 - checkcellnum $e + checkcellnum PHONE_COOLTRAINERF_REENA iftrue UnknownScript_0x1a0a3b checkevent EVENT_REENA_ASKED_FOR_PHONE_NUMBER iftrue UnknownScript_0x1a09d2 @@ -287,7 +207,7 @@ CooltrainerfReena1Script: UnknownScript_0x1a09d2: scall UnknownScript_0x1a0a33 UnknownScript_0x1a09d5: - askforphonenumber $e + askforphonenumber PHONE_COOLTRAINERF_REENA if_equal $1, UnknownScript_0x1a0a43 if_equal $2, UnknownScript_0x1a0a3f trainertotext COOLTRAINERF, REENA1, $0 @@ -359,23 +279,7 @@ UnknownScript_0x1a0a47: end TrainerCooltrainerfMegan: - ; bit/flag number - dw EVENT_BEAT_COOLTRAINERF_MEGAN - - ; trainer group && trainer id - db COOLTRAINERF, MEGAN - - ; text when seen - dw CooltrainerfMeganSeenText - - ; text when trainer beaten - dw CooltrainerfMeganBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw CooltrainerfMeganScript + trainer EVENT_BEAT_COOLTRAINERF_MEGAN, COOLTRAINERF, MEGAN, CooltrainerfMeganSeenText, CooltrainerfMeganBeatenText, $0000, CooltrainerfMeganScript CooltrainerfMeganScript: talkaftercancel @@ -558,29 +462,29 @@ Route27_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 3 warp_def $7, $21, 1, GROUP_ROUTE_27_SANDSTORM_HOUSE, MAP_ROUTE_27_SANDSTORM_HOUSE warp_def $5, $1a, 1, GROUP_TOHJO_FALLS, MAP_TOHJO_FALLS warp_def $5, $24, 2, GROUP_TOHJO_FALLS, MAP_TOHJO_FALLS - ; xy triggers +.XYTriggers: db 2 xy_trigger 0, $a, $12, $0, UnknownScript_0x1a0873, $0, $0 xy_trigger 0, $a, $13, $0, UnknownScript_0x1a0881, $0, $0 - ; signposts +.Signposts: db 1 - signpost 7, 25, $0, MapRoute27Signpost0Script + signpost 7, 25, SIGNPOST_READ, MapRoute27Signpost0Script - ; people-events +.PersonEvents: db 9 - person_event SPRITE_COOLTRAINER_M, 11, 52, $7, $0, 255, 255, $82, 3, TrainerCooltrainermBlake, -1 - person_event SPRITE_COOLTRAINER_M, 10, 62, $9, $0, 255, 255, $82, 4, TrainerCooltrainermBrian, -1 - person_event SPRITE_COOLTRAINER_F, 14, 76, $7, $0, 255, 255, $82, 4, TrainerCooltrainerfReena, -1 - person_event SPRITE_COOLTRAINER_F, 10, 41, $1f, $0, 255, 255, $82, 2, TrainerCooltrainerfMegan, -1 - person_event SPRITE_YOUNGSTER, 11, 69, $8, $0, 255, 255, $92, 3, TrainerPsychicGilbert, -1 - person_event SPRITE_YOUNGSTER, 17, 62, $9, $0, 255, 255, $92, 3, TrainerBird_keeperJose2, -1 - person_event SPRITE_POKE_BALL, 16, 64, $1, $0, 255, 255, $1, 0, ItemFragment_0x1a0a62, EVENT_6AB - person_event SPRITE_POKE_BALL, 16, 57, $1, $0, 255, 255, $1, 0, ItemFragment_0x1a0a64, EVENT_6AC - person_event SPRITE_FISHER, 14, 25, $3, $0, 255, 255, $0, 3, FisherScript_0x1a089c, -1 + person_event SPRITE_COOLTRAINER_M, 11, 52, OW_UP | $3, $0, -1, -1, (PAL_OW_RED << 4) | $82, 3, TrainerCooltrainermBlake, -1 + person_event SPRITE_COOLTRAINER_M, 10, 62, OW_LEFT | $1, $0, -1, -1, (PAL_OW_RED << 4) | $82, 4, TrainerCooltrainermBrian, -1 + person_event SPRITE_COOLTRAINER_F, 14, 76, OW_UP | $3, $0, -1, -1, (PAL_OW_RED << 4) | $82, 4, TrainerCooltrainerfReena, -1 + person_event SPRITE_COOLTRAINER_F, 10, 41, OW_RIGHT | $13, $0, -1, -1, (PAL_OW_RED << 4) | $82, 2, TrainerCooltrainerfMegan, -1 + person_event SPRITE_YOUNGSTER, 11, 69, OW_LEFT | $0, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 3, TrainerPsychicGilbert, -1 + person_event SPRITE_YOUNGSTER, 17, 62, OW_LEFT | $1, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 3, TrainerBird_keeperJose2, -1 + person_event SPRITE_POKE_BALL, 16, 64, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x1a0a62, EVENT_ROUTE_27_TM_SOLARBEAM + person_event SPRITE_POKE_BALL, 16, 57, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x1a0a64, EVENT_ROUTE_27_RARE_CANDY + person_event SPRITE_FISHER, 14, 25, OW_DOWN | $3, $0, -1, -1, $0, 3, FisherScript_0x1a089c, -1 diff --git a/maps/Route27SandstormHouse.asm b/maps/Route27SandstormHouse.asm index 6e2bec168..0b05f0ec4 100644 --- a/maps/Route27SandstormHouse.asm +++ b/maps/Route27SandstormHouse.asm @@ -1,8 +1,8 @@ Route27SandstormHouse_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 SandstormHouseWoman: @@ -10,7 +10,7 @@ SandstormHouseWoman: loadfont checkevent EVENT_GOT_TM37_SANDSTORM iftrue .AlreadyGotItem - special Function718d + special GetFirstPokemonHappiness writetext SandstormHouseWomanText1 keeptextopen if_greater_than $95, .Loyal @@ -94,19 +94,19 @@ Route27SandstormHouse_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $7, $2, 1, GROUP_ROUTE_27, MAP_ROUTE_27 warp_def $7, $3, 1, GROUP_ROUTE_27, MAP_ROUTE_27 - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 2 - signpost 1, 0, $0, SandstormHouseBookshelf - signpost 1, 1, $0, SandstormHouseBookshelf + signpost 1, 0, SIGNPOST_READ, SandstormHouseBookshelf + signpost 1, 1, SIGNPOST_READ, SandstormHouseBookshelf - ; people-events +.PersonEvents: db 1 - person_event SPRITE_GRANNY, 8, 6, $6, $0, 255, 255, $0, 0, SandstormHouseWoman, -1 + person_event SPRITE_GRANNY, 8, 6, OW_UP | $2, $0, -1, -1, $0, 0, SandstormHouseWoman, -1 diff --git a/maps/Route28.asm b/maps/Route28.asm index 3671a6f02..b32d030f0 100644 --- a/maps/Route28.asm +++ b/maps/Route28.asm @@ -1,16 +1,15 @@ Route28_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 MapRoute28Signpost0Script: jumptext UnknownText_0x1a5413 MapRoute28SignpostItem1: - dw $00a3 - db RARE_CANDY + dwb EVENT_ROUTE_28_HIDDEN_RARE_CANDY, RARE_CANDY UnknownText_0x1a5413: @@ -21,18 +20,18 @@ Route28_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $3, $7, 1, GROUP_ROUTE_28_FAMOUS_SPEECH_HOUSE, MAP_ROUTE_28_FAMOUS_SPEECH_HOUSE warp_def $5, $21, 7, GROUP_VICTORY_ROAD_GATE, MAP_VICTORY_ROAD_GATE - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 2 - signpost 5, 31, $0, MapRoute28Signpost0Script - signpost 2, 25, $7, MapRoute28SignpostItem1 + signpost 5, 31, SIGNPOST_READ, MapRoute28Signpost0Script + signpost 2, 25, SIGNPOST_ITEM, MapRoute28SignpostItem1 - ; people-events +.PersonEvents: db 0 diff --git a/maps/Route28FamousSpeechHouse.asm b/maps/Route28FamousSpeechHouse.asm index a95d08063..ed9db8957 100644 --- a/maps/Route28FamousSpeechHouse.asm +++ b/maps/Route28FamousSpeechHouse.asm @@ -1,11 +1,11 @@ Route28FamousSpeechHouse_MapScriptHeader: - ; trigger count +.MapTriggers: db 1 ; triggers dw .Trigger, $0000 - ; callback count +.MapCallbacks: db 0 .Trigger @@ -72,20 +72,20 @@ Route28FamousSpeechHouse_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $7, $2, 1, GROUP_ROUTE_28, MAP_ROUTE_28 warp_def $7, $3, 1, GROUP_ROUTE_28, MAP_ROUTE_28 - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 2 - signpost 1, 0, $0, CelebrityHouseBookshelf - signpost 1, 1, $0, CelebrityHouseBookshelf + signpost 1, 0, SIGNPOST_READ, CelebrityHouseBookshelf + signpost 1, 1, SIGNPOST_READ, CelebrityHouseBookshelf - ; people-events +.PersonEvents: db 2 - person_event SPRITE_COOLTRAINER_F, 7, 6, $6, $0, 255, 255, $a0, 0, Celebrity, -1 - person_event SPRITE_MOLTRES, 9, 10, $16, $0, 255, 255, $b0, 0, CelebritysFearow, -1 + person_event SPRITE_COOLTRAINER_F, 7, 6, OW_UP | $2, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, Celebrity, -1 + person_event SPRITE_MOLTRES, 9, 10, OW_UP | $12, $0, -1, -1, (PAL_OW_BROWN << 4) | $80, 0, CelebritysFearow, -1 diff --git a/maps/Route29.asm b/maps/Route29.asm index 2b5879136..8d5afd5fe 100644 --- a/maps/Route29.asm +++ b/maps/Route29.asm @@ -1,12 +1,12 @@ Route29_MapScriptHeader: - ; trigger count +.MapTriggers: db 2 ; triggers dw UnknownScript_0x1a0f59, $0000 dw UnknownScript_0x1a0f5a, $0000 - ; callback count +.MapCallbacks: db 1 ; callbacks @@ -35,7 +35,7 @@ TuscanyCallback: UnknownScript_0x1a0f6d: spriteface $2, UP - showemote $0, $2, 15 + showemote EMOTE_SHOCK, $2, 15 applymovement $2, MovementData_0x1a108d spriteface $0, LEFT setevent EVENT_DUDE_TALKED_TO_YOU @@ -60,7 +60,7 @@ UnknownScript_0x1a0f6d: UnknownScript_0x1a0fa3: spriteface $2, UP - showemote $0, $2, 15 + showemote EMOTE_SHOCK, $2, 15 applymovement $2, MovementData_0x1a1094 spriteface $0, LEFT setevent EVENT_DUDE_TALKED_TO_YOU @@ -414,27 +414,27 @@ Route29_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 1 warp_def $1, $1b, 3, GROUP_ROUTE_29_46_GATE, MAP_ROUTE_29_46_GATE - ; xy triggers +.XYTriggers: db 2 xy_trigger 1, $8, $35, $0, UnknownScript_0x1a0f6d, $0, $0 xy_trigger 1, $9, $35, $0, UnknownScript_0x1a0fa3, $0, $0 - ; signposts +.Signposts: db 2 - signpost 7, 51, $0, MapRoute29Signpost0Script - signpost 5, 3, $0, MapRoute29Signpost1Script + signpost 7, 51, SIGNPOST_READ, MapRoute29Signpost0Script + signpost 5, 3, SIGNPOST_READ, MapRoute29Signpost1Script - ; people-events +.PersonEvents: db 8 - person_event SPRITE_COOLTRAINER_M, 16, 54, $3, $0, 255, 255, $80, 0, CooltrainerMScript_0x1a0ff1, -1 - person_event SPRITE_YOUNGSTER, 20, 31, $4, $10, 255, 255, $a0, 0, YoungsterScript_0x1a1028, -1 - person_event SPRITE_TEACHER, 15, 19, $5, $1, 255, 255, $a0, 0, TeacherScript_0x1a102b, -1 - person_event SPRITE_FRUIT_TREE, 6, 16, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x1a1089, -1 - person_event SPRITE_FISHER, 7, 29, $7, $0, 255, 255, $90, 0, FisherScript_0x1a102e, -1 - person_event SPRITE_COOLTRAINER_M, 8, 17, $6, $0, 255, 255, $80, 0, CooltrainerMScript_0x1a1031, -1 - person_event SPRITE_TEACHER, 16, 33, $3, $0, 255, 255, $0, 0, TuscanyScript, EVENT_759 - person_event SPRITE_POKE_BALL, 6, 52, $1, $0, 255, 255, $1, 0, ItemFragment_0x1a108b, EVENT_6AD + person_event SPRITE_COOLTRAINER_M, 16, 54, OW_DOWN | $3, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, CooltrainerMScript_0x1a0ff1, -1 + person_event SPRITE_YOUNGSTER, 20, 31, OW_UP | $0, $10, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, YoungsterScript_0x1a1028, -1 + person_event SPRITE_TEACHER, 15, 19, OW_UP | $1, $1, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, TeacherScript_0x1a102b, -1 + person_event SPRITE_FRUIT_TREE, 6, 16, OW_DOWN | $1, $0, -1, -1, $0, 0, FruitTreeScript_0x1a1089, -1 + person_event SPRITE_FISHER, 7, 29, OW_UP | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, FisherScript_0x1a102e, -1 + person_event SPRITE_COOLTRAINER_M, 8, 17, OW_UP | $2, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, CooltrainerMScript_0x1a1031, -1 + person_event SPRITE_TEACHER, 16, 33, OW_DOWN | $3, $0, -1, -1, $0, 0, TuscanyScript, EVENT_ROUTE_29_TUSCANY_OF_TUESDAY + person_event SPRITE_POKE_BALL, 6, 52, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x1a108b, EVENT_ROUTE_29_POTION diff --git a/maps/Route2946Gate.asm b/maps/Route2946Gate.asm index b0aafb185..aeb67342a 100644 --- a/maps/Route2946Gate.asm +++ b/maps/Route2946Gate.asm @@ -1,8 +1,8 @@ Route2946Gate_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 OfficerScript_0x7b5bb: @@ -36,20 +36,20 @@ Route2946Gate_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 4 warp_def $0, $4, 1, GROUP_ROUTE_46, MAP_ROUTE_46 warp_def $0, $5, 2, GROUP_ROUTE_46, MAP_ROUTE_46 warp_def $7, $4, 1, GROUP_ROUTE_29, MAP_ROUTE_29 warp_def $7, $5, 1, GROUP_ROUTE_29, MAP_ROUTE_29 - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 2 - person_event SPRITE_OFFICER, 8, 4, $9, $0, 255, 255, $80, 0, OfficerScript_0x7b5bb, -1 - person_event SPRITE_YOUNGSTER, 8, 10, $4, $10, 255, 255, $a0, 0, YoungsterScript_0x7b5be, -1 + person_event SPRITE_OFFICER, 8, 4, OW_LEFT | $1, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, OfficerScript_0x7b5bb, -1 + person_event SPRITE_YOUNGSTER, 8, 10, OW_UP | $0, $10, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, YoungsterScript_0x7b5be, -1 diff --git a/maps/Route2Gate.asm b/maps/Route2Gate.asm index a7d74403d..8a92a2cf6 100644 --- a/maps/Route2Gate.asm +++ b/maps/Route2Gate.asm @@ -1,8 +1,8 @@ Route2Gate_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 ScientistScript_0x9b952: @@ -26,19 +26,19 @@ Route2Gate_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 4 warp_def $0, $4, 3, GROUP_ROUTE_2, MAP_ROUTE_2 warp_def $0, $5, 4, GROUP_ROUTE_2, MAP_ROUTE_2 warp_def $7, $4, 2, GROUP_ROUTE_2, MAP_ROUTE_2 warp_def $7, $5, 2, GROUP_ROUTE_2, MAP_ROUTE_2 - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 1 - person_event SPRITE_SCIENTIST, 8, 10, $4, $20, 255, 255, $90, 0, ScientistScript_0x9b952, -1 + person_event SPRITE_SCIENTIST, 8, 10, OW_UP | $0, $20, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, ScientistScript_0x9b952, -1 diff --git a/maps/Route2NuggetSpeechHouse.asm b/maps/Route2NuggetSpeechHouse.asm index 9ce3a5330..54e7f4433 100644 --- a/maps/Route2NuggetSpeechHouse.asm +++ b/maps/Route2NuggetSpeechHouse.asm @@ -1,8 +1,8 @@ Route2NuggetSpeechHouse_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 FisherScript_0x9b847: @@ -53,17 +53,17 @@ Route2NuggetSpeechHouse_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $7, $2, 1, GROUP_ROUTE_2, MAP_ROUTE_2 warp_def $7, $3, 1, GROUP_ROUTE_2, MAP_ROUTE_2 - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 1 - person_event SPRITE_FISHER, 8, 6, $4, $20, 255, 255, $90, 0, FisherScript_0x9b847, -1 + person_event SPRITE_FISHER, 8, 6, OW_UP | $0, $20, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, FisherScript_0x9b847, -1 diff --git a/maps/Route3.asm b/maps/Route3.asm index e9b310003..7db9dc951 100644 --- a/maps/Route3.asm +++ b/maps/Route3.asm @@ -1,28 +1,12 @@ Route3_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 TrainerFirebreatherOtis: - ; bit/flag number - dw EVENT_BEAT_FIREBREATHER_OTIS - - ; trainer group && trainer id - db FIREBREATHER, OTIS - - ; text when seen - dw FirebreatherOtisSeenText - - ; text when trainer beaten - dw FirebreatherOtisBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw FirebreatherOtisScript + trainer EVENT_BEAT_FIREBREATHER_OTIS, FIREBREATHER, OTIS, FirebreatherOtisSeenText, FirebreatherOtisBeatenText, $0000, FirebreatherOtisScript FirebreatherOtisScript: talkaftercancel @@ -33,23 +17,7 @@ FirebreatherOtisScript: end TrainerYoungsterWarren: - ; bit/flag number - dw EVENT_BEAT_YOUNGSTER_WARREN - - ; trainer group && trainer id - db YOUNGSTER, WARREN - - ; text when seen - dw YoungsterWarrenSeenText - - ; text when trainer beaten - dw YoungsterWarrenBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw YoungsterWarrenScript + trainer EVENT_BEAT_YOUNGSTER_WARREN, YOUNGSTER, WARREN, YoungsterWarrenSeenText, YoungsterWarrenBeatenText, $0000, YoungsterWarrenScript YoungsterWarrenScript: talkaftercancel @@ -60,23 +28,7 @@ YoungsterWarrenScript: end TrainerYoungsterJimmy: - ; bit/flag number - dw EVENT_BEAT_YOUNGSTER_JIMMY - - ; trainer group && trainer id - db YOUNGSTER, JIMMY - - ; text when seen - dw YoungsterJimmySeenText - - ; text when trainer beaten - dw YoungsterJimmyBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw YoungsterJimmyScript + trainer EVENT_BEAT_YOUNGSTER_JIMMY, YOUNGSTER, JIMMY, YoungsterJimmySeenText, YoungsterJimmyBeatenText, $0000, YoungsterJimmyScript YoungsterJimmyScript: talkaftercancel @@ -87,23 +39,7 @@ YoungsterJimmyScript: end TrainerFirebreatherBurt: - ; bit/flag number - dw EVENT_BEAT_FIREBREATHER_BURT - - ; trainer group && trainer id - db FIREBREATHER, BURT - - ; text when seen - dw FirebreatherBurtSeenText - - ; text when trainer beaten - dw FirebreatherBurtBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw FirebreatherBurtScript + trainer EVENT_BEAT_FIREBREATHER_BURT, FIREBREATHER, BURT, FirebreatherBurtSeenText, FirebreatherBurtBeatenText, $0000, FirebreatherBurtScript FirebreatherBurtScript: talkaftercancel @@ -194,20 +130,20 @@ Route3_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 1 warp_def $1, $34, 1, GROUP_MOUNT_MOON, MAP_MOUNT_MOON - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 1 - signpost 13, 49, $0, MapRoute3Signpost0Script + signpost 13, 49, SIGNPOST_READ, MapRoute3Signpost0Script - ; people-events +.PersonEvents: db 4 - person_event SPRITE_FISHER, 16, 30, $7, $0, 255, 255, $82, 2, TrainerFirebreatherOtis, -1 - person_event SPRITE_YOUNGSTER, 11, 14, $8, $0, 255, 255, $92, 3, TrainerYoungsterWarren, -1 - person_event SPRITE_YOUNGSTER, 7, 20, $a, $0, 255, 255, $92, 1, TrainerYoungsterJimmy, -1 - person_event SPRITE_FISHER, 9, 53, $a, $0, 255, 255, $82, 3, TrainerFirebreatherBurt, -1 + person_event SPRITE_FISHER, 16, 30, OW_UP | $3, $0, -1, -1, (PAL_OW_RED << 4) | $82, 2, TrainerFirebreatherOtis, -1 + person_event SPRITE_YOUNGSTER, 11, 14, OW_LEFT | $0, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 3, TrainerYoungsterWarren, -1 + person_event SPRITE_YOUNGSTER, 7, 20, OW_LEFT | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 1, TrainerYoungsterJimmy, -1 + person_event SPRITE_FISHER, 9, 53, OW_LEFT | $2, $0, -1, -1, (PAL_OW_RED << 4) | $82, 3, TrainerFirebreatherBurt, -1 diff --git a/maps/Route30.asm b/maps/Route30.asm index 7b6e4a770..5a7223183 100644 --- a/maps/Route30.asm +++ b/maps/Route30.asm @@ -1,8 +1,8 @@ Route30_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 YoungsterScript_0x1a1673: @@ -26,31 +26,15 @@ YoungsterScript_0x1a1673: end TrainerYoungsterJoey: - ; bit/flag number - dw EVENT_BEAT_YOUNGSTER_JOEY - - ; trainer group && trainer id - db YOUNGSTER, JOEY1 - - ; text when seen - dw YoungsterJoey1SeenText - - ; text when trainer beaten - dw YoungsterJoey1BeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw YoungsterJoey1Script + trainer EVENT_BEAT_YOUNGSTER_JOEY, YOUNGSTER, JOEY1, YoungsterJoey1SeenText, YoungsterJoey1BeatenText, $0000, YoungsterJoey1Script YoungsterJoey1Script: - writecode VAR_CALLERID, $f + writecode VAR_CALLERID, PHONE_YOUNGSTER_JOEY talkaftercancel loadfont checkflag ENGINE_JOEY iftrue UnknownScript_0x1a16e0 - checkcellnum $f + checkcellnum PHONE_YOUNGSTER_JOEY iftrue UnknownScript_0x1a178f checkevent EVENT_JOEY_ASKED_FOR_PHONE_NUMBER iftrue UnknownScript_0x1a16c9 @@ -63,7 +47,7 @@ YoungsterJoey1Script: UnknownScript_0x1a16c9: scall UnknownScript_0x1a1787 UnknownScript_0x1a16cc: - askforphonenumber $f + askforphonenumber PHONE_YOUNGSTER_JOEY if_equal $1, UnknownScript_0x1a1797 if_equal $2, UnknownScript_0x1a1793 trainertotext YOUNGSTER, JOEY1, $0 @@ -189,23 +173,7 @@ UnknownScript_0x1a17a6: end TrainerYoungsterMikey: - ; bit/flag number - dw EVENT_BEAT_YOUNGSTER_MIKEY - - ; trainer group && trainer id - db YOUNGSTER, MIKEY - - ; text when seen - dw YoungsterMikeySeenText - - ; text when trainer beaten - dw YoungsterMikeyBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw YoungsterMikeyScript + trainer EVENT_BEAT_YOUNGSTER_MIKEY, YOUNGSTER, MIKEY, YoungsterMikeySeenText, YoungsterMikeyBeatenText, $0000, YoungsterMikeyScript YoungsterMikeyScript: talkaftercancel @@ -216,23 +184,7 @@ YoungsterMikeyScript: end TrainerBug_catcherDon: - ; bit/flag number - dw EVENT_BEAT_BUG_CATCHER_DON - - ; trainer group && trainer id - db BUG_CATCHER, DON - - ; text when seen - dw Bug_catcherDonSeenText - - ; text when trainer beaten - dw Bug_catcherDonBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw Bug_catcherDonScript + trainer EVENT_BEAT_BUG_CATCHER_DON, BUG_CATCHER, DON, Bug_catcherDonSeenText, Bug_catcherDonBeatenText, $0000, Bug_catcherDonScript Bug_catcherDonScript: talkaftercancel @@ -283,8 +235,7 @@ FruitTreeScript_0x1a17f9: fruittree $5 MapRoute30SignpostItem4: - dw $00a4 - db POTION + dwb EVENT_ROUTE_30_HIDDEN_POTION, POTION MovementData_0x1a17fe: @@ -447,32 +398,32 @@ Route30_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $27, $7, 1, GROUP_ROUTE_30_BERRY_SPEECH_HOUSE, MAP_ROUTE_30_BERRY_SPEECH_HOUSE warp_def $5, $11, 1, GROUP_MR_POKEMONS_HOUSE, MAP_MR_POKEMONS_HOUSE - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 5 - signpost 43, 9, $0, MapRoute30Signpost0Script - signpost 29, 13, $0, MapRoute30Signpost1Script - signpost 5, 15, $0, MapRoute30Signpost2Script - signpost 21, 3, $0, MapRoute30Signpost3Script - signpost 9, 14, $7, MapRoute30SignpostItem4 + signpost 43, 9, SIGNPOST_READ, MapRoute30Signpost0Script + signpost 29, 13, SIGNPOST_READ, MapRoute30Signpost1Script + signpost 5, 15, SIGNPOST_READ, MapRoute30Signpost2Script + signpost 21, 3, SIGNPOST_READ, MapRoute30Signpost3Script + signpost 9, 14, SIGNPOST_ITEM, MapRoute30SignpostItem4 - ; people-events +.PersonEvents: db 11 - person_event SPRITE_YOUNGSTER, 30, 9, $7, $0, 255, 255, $90, 0, YoungsterScript_0x1a1673, EVENT_714 - person_event SPRITE_YOUNGSTER, 32, 6, $9, $0, 255, 255, $92, 3, TrainerYoungsterJoey, EVENT_715 - person_event SPRITE_YOUNGSTER, 27, 9, $6, $0, 255, 255, $92, 1, TrainerYoungsterMikey, -1 - person_event SPRITE_BUG_CATCHER, 11, 5, $6, $0, 255, 255, $b2, 3, TrainerBug_catcherDon, -1 - person_event SPRITE_YOUNGSTER, 34, 11, $5, $1, 255, 255, $80, 0, YoungsterScript_0x1a17d2, -1 - person_event SPRITE_MONSTER, 28, 9, $6, $0, 255, 255, $80, 0, ObjectEvent, EVENT_714 - person_event SPRITE_MONSTER, 29, 9, $7, $0, 255, 255, $90, 0, ObjectEvent, EVENT_714 - person_event SPRITE_FRUIT_TREE, 43, 9, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x1a17f7, -1 - person_event SPRITE_FRUIT_TREE, 9, 15, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x1a17f9, -1 - person_event SPRITE_COOLTRAINER_F, 17, 6, $6, $0, 255, 255, $0, 0, CooltrainerFScript_0x1a17e6, -1 - person_event SPRITE_POKE_BALL, 39, 12, $1, $0, 255, 255, $1, 0, ItemFragment_0x1a17f5, EVENT_7B8 + person_event SPRITE_YOUNGSTER, 30, 9, OW_UP | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, YoungsterScript_0x1a1673, EVENT_ROUTE_30_BATTLE + person_event SPRITE_YOUNGSTER, 32, 6, OW_LEFT | $1, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 3, TrainerYoungsterJoey, EVENT_ROUTE_30_YOUNGSTER_JOEY + person_event SPRITE_YOUNGSTER, 27, 9, OW_UP | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 1, TrainerYoungsterMikey, -1 + person_event SPRITE_BUG_CATCHER, 11, 5, OW_UP | $2, $0, -1, -1, (PAL_OW_BROWN << 4) | $82, 3, TrainerBug_catcherDon, -1 + person_event SPRITE_YOUNGSTER, 34, 11, OW_UP | $1, $1, -1, -1, (PAL_OW_RED << 4) | $80, 0, YoungsterScript_0x1a17d2, -1 + person_event SPRITE_MONSTER, 28, 9, OW_UP | $2, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, ObjectEvent, EVENT_ROUTE_30_BATTLE + person_event SPRITE_MONSTER, 29, 9, OW_UP | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, ObjectEvent, EVENT_ROUTE_30_BATTLE + person_event SPRITE_FRUIT_TREE, 43, 9, OW_DOWN | $1, $0, -1, -1, $0, 0, FruitTreeScript_0x1a17f7, -1 + person_event SPRITE_FRUIT_TREE, 9, 15, OW_DOWN | $1, $0, -1, -1, $0, 0, FruitTreeScript_0x1a17f9, -1 + person_event SPRITE_COOLTRAINER_F, 17, 6, OW_UP | $2, $0, -1, -1, $0, 0, CooltrainerFScript_0x1a17e6, -1 + person_event SPRITE_POKE_BALL, 39, 12, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x1a17f5, EVENT_ROUTE_30_ANTIDOTE diff --git a/maps/Route30BerrySpeechHouse.asm b/maps/Route30BerrySpeechHouse.asm index e17bd15e2..23af447b0 100644 --- a/maps/Route30BerrySpeechHouse.asm +++ b/maps/Route30BerrySpeechHouse.asm @@ -1,8 +1,8 @@ Route30BerrySpeechHouse_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 PokefanMScript_0x196d64: @@ -47,19 +47,19 @@ Route30BerrySpeechHouse_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $7, $2, 1, GROUP_ROUTE_30, MAP_ROUTE_30 warp_def $7, $3, 1, GROUP_ROUTE_30, MAP_ROUTE_30 - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 2 - signpost 1, 0, $0, Route30BerrySpeechHouseBookshelf - signpost 1, 1, $0, Route30BerrySpeechHouseBookshelf + signpost 1, 0, SIGNPOST_READ, Route30BerrySpeechHouseBookshelf + signpost 1, 1, SIGNPOST_READ, Route30BerrySpeechHouseBookshelf - ; people-events +.PersonEvents: db 1 - person_event SPRITE_POKEFAN_M, 7, 6, $6, $0, 255, 255, $b0, 0, PokefanMScript_0x196d64, -1 + person_event SPRITE_POKEFAN_M, 7, 6, OW_UP | $2, $0, -1, -1, (PAL_OW_BROWN << 4) | $80, 0, PokefanMScript_0x196d64, -1 diff --git a/maps/Route31.asm b/maps/Route31.asm index 0845048c7..1b48dfc24 100644 --- a/maps/Route31.asm +++ b/maps/Route31.asm @@ -1,8 +1,8 @@ Route31_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 1 ; callbacks @@ -15,37 +15,21 @@ UnknownScript_0x1a543c: return UnknownScript_0x1a5443: - specialphonecall $7 + specialphonecall MOMCALL_WORRIED return TrainerBug_catcherWade1: - ; bit/flag number - dw EVENT_BEAT_BUG_CATCHER_WADE - - ; trainer group && trainer id - db BUG_CATCHER, WADE1 - - ; text when seen - dw Bug_catcherWade1SeenText - - ; text when trainer beaten - dw Bug_catcherWade1BeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw Bug_catcherWade1Script + trainer EVENT_BEAT_BUG_CATCHER_WADE, BUG_CATCHER, WADE1, Bug_catcherWade1SeenText, Bug_catcherWade1BeatenText, $0000, Bug_catcherWade1Script Bug_catcherWade1Script: - writecode VAR_CALLERID, $10 + writecode VAR_CALLERID, PHONE_BUG_CATCHER_WADE talkaftercancel loadfont checkflag ENGINE_WADE iftrue UnknownScript_0x1a5493 checkflag ENGINE_WADE_HAS_ITEM iftrue UnknownScript_0x1a5507 - checkcellnum $10 + checkcellnum PHONE_BUG_CATCHER_WADE iftrue UnknownScript_0x1a5558 checkevent EVENT_WADE_ASKED_FOR_PHONE_NUMBER iftrue UnknownScript_0x1a547c @@ -58,7 +42,7 @@ Bug_catcherWade1Script: UnknownScript_0x1a547c: scall UnknownScript_0x1a5550 UnknownScript_0x1a547f: - askforphonenumber $10 + askforphonenumber PHONE_BUG_CATCHER_WADE if_equal $1, UnknownScript_0x1a5560 if_equal $2, UnknownScript_0x1a555c trainertotext BUG_CATCHER, WADE1, $0 @@ -252,7 +236,7 @@ UnknownScript_0x1a55c7: end ReceivedSpearowMailText: - db "DARK CAVE leads",$4E + db "DARK CAVE leads", $4E db "to another road@" YoungsterScript_0x1a55ed: @@ -430,26 +414,26 @@ Route31_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 3 warp_def $6, $4, 3, GROUP_ROUTE_31_VIOLET_GATE, MAP_ROUTE_31_VIOLET_GATE warp_def $7, $4, 4, GROUP_ROUTE_31_VIOLET_GATE, MAP_ROUTE_31_VIOLET_GATE warp_def $5, $22, 1, GROUP_DARK_CAVE_VIOLET_ENTRANCE, MAP_DARK_CAVE_VIOLET_ENTRANCE - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 2 - signpost 5, 7, $0, MapRoute31Signpost0Script - signpost 5, 31, $0, MapRoute31Signpost1Script + signpost 5, 7, SIGNPOST_READ, MapRoute31Signpost0Script + signpost 5, 31, SIGNPOST_READ, MapRoute31Signpost1Script - ; people-events +.PersonEvents: db 7 - person_event SPRITE_FISHER, 11, 21, $6, $0, 255, 255, $0, 0, FisherScript_0x1a5570, -1 - person_event SPRITE_YOUNGSTER, 9, 13, $2, $11, 255, 255, $0, 0, YoungsterScript_0x1a55ed, -1 - person_event SPRITE_BUG_CATCHER, 17, 25, $8, $0, 255, 255, $b2, 5, TrainerBug_catcherWade1, -1 - person_event SPRITE_COOLTRAINER_M, 12, 37, $2, $11, 255, 255, $0, 0, CooltrainerMScript_0x1a55f6, -1 - person_event SPRITE_FRUIT_TREE, 11, 20, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x1a55f9, -1 - person_event SPRITE_POKE_BALL, 9, 33, $1, $0, 255, 255, $1, 0, ItemFragment_0x1a55fb, EVENT_6AE - person_event SPRITE_POKE_BALL, 19, 23, $1, $0, 255, 255, $1, 0, ItemFragment_0x1a55fd, EVENT_6AF + person_event SPRITE_FISHER, 11, 21, OW_UP | $2, $0, -1, -1, $0, 0, FisherScript_0x1a5570, -1 + person_event SPRITE_YOUNGSTER, 9, 13, OW_DOWN | $2, $11, -1, -1, $0, 0, YoungsterScript_0x1a55ed, -1 + person_event SPRITE_BUG_CATCHER, 17, 25, OW_LEFT | $0, $0, -1, -1, (PAL_OW_BROWN << 4) | $82, 5, TrainerBug_catcherWade1, -1 + person_event SPRITE_COOLTRAINER_M, 12, 37, OW_DOWN | $2, $11, -1, -1, $0, 0, CooltrainerMScript_0x1a55f6, -1 + person_event SPRITE_FRUIT_TREE, 11, 20, OW_DOWN | $1, $0, -1, -1, $0, 0, FruitTreeScript_0x1a55f9, -1 + person_event SPRITE_POKE_BALL, 9, 33, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x1a55fb, EVENT_ROUTE_31_POTION + person_event SPRITE_POKE_BALL, 19, 23, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x1a55fd, EVENT_ROUTE_31_POKE_BALL diff --git a/maps/Route31VioletGate.asm b/maps/Route31VioletGate.asm index a2a2974ff..032b0f141 100644 --- a/maps/Route31VioletGate.asm +++ b/maps/Route31VioletGate.asm @@ -1,8 +1,8 @@ Route31VioletGate_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 OfficerScript_0x197634: @@ -27,20 +27,20 @@ Route31VioletGate_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 4 warp_def $4, $0, 8, GROUP_VIOLET_CITY, MAP_VIOLET_CITY warp_def $5, $0, 9, GROUP_VIOLET_CITY, MAP_VIOLET_CITY warp_def $4, $9, 1, GROUP_ROUTE_31, MAP_ROUTE_31 warp_def $5, $9, 2, GROUP_ROUTE_31, MAP_ROUTE_31 - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 2 - person_event SPRITE_OFFICER, 6, 9, $6, $0, 255, 255, $80, 0, OfficerScript_0x197634, -1 - person_event SPRITE_COOLTRAINER_F, 6, 5, $3, $0, 255, 255, $90, 0, CooltrainerFScript_0x197637, -1 + person_event SPRITE_OFFICER, 6, 9, OW_UP | $2, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, OfficerScript_0x197634, -1 + person_event SPRITE_COOLTRAINER_F, 6, 5, OW_DOWN | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, CooltrainerFScript_0x197637, -1 diff --git a/maps/Route32.asm b/maps/Route32.asm index 0ef0f9fab..2a832897c 100644 --- a/maps/Route32.asm +++ b/maps/Route32.asm @@ -1,5 +1,5 @@ Route32_MapScriptHeader: - ; trigger count +.MapTriggers: db 3 ; triggers @@ -7,7 +7,7 @@ Route32_MapScriptHeader: dw UnknownScript_0x190461, $0000 dw UnknownScript_0x190462, $0000 - ; callback count +.MapCallbacks: db 1 ; callbacks @@ -133,23 +133,7 @@ UnknownScript_0x190503: end TrainerCamperRoland: - ; bit/flag number - dw EVENT_BEAT_CAMPER_ROLAND - - ; trainer group && trainer id - db CAMPER, ROLAND - - ; text when seen - dw CamperRolandSeenText - - ; text when trainer beaten - dw CamperRolandBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw CamperRolandScript + trainer EVENT_BEAT_CAMPER_ROLAND, CAMPER, ROLAND, CamperRolandSeenText, CamperRolandBeatenText, $0000, CamperRolandScript CamperRolandScript: talkaftercancel @@ -160,23 +144,7 @@ CamperRolandScript: end TrainerFisherJustin: - ; bit/flag number - dw EVENT_BEAT_FISHER_JUSTIN - - ; trainer group && trainer id - db FISHER, JUSTIN - - ; text when seen - dw FisherJustinSeenText - - ; text when trainer beaten - dw FisherJustinBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw FisherJustinScript + trainer EVENT_BEAT_FISHER_JUSTIN, FISHER, JUSTIN, FisherJustinSeenText, FisherJustinBeatenText, $0000, FisherJustinScript FisherJustinScript: talkaftercancel @@ -187,33 +155,17 @@ FisherJustinScript: end TrainerFisherRalph1: - ; bit/flag number - dw EVENT_BEAT_FISHER_RALPH - - ; trainer group && trainer id - db FISHER, RALPH1 - - ; text when seen - dw FisherRalph1SeenText - - ; text when trainer beaten - dw FisherRalph1BeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw FisherRalph1Script + trainer EVENT_BEAT_FISHER_RALPH, FISHER, RALPH1, FisherRalph1SeenText, FisherRalph1BeatenText, $0000, FisherRalph1Script FisherRalph1Script: - writecode VAR_CALLERID, $11 + writecode VAR_CALLERID, PHONE_FISHER_RALPH talkaftercancel loadfont checkflag ENGINE_RALPH iftrue UnknownScript_0x19057d checkflag ENGINE_SPECIAL_WILDDATA iftrue UnknownScript_0x1905f1 - checkcellnum $11 + checkcellnum PHONE_FISHER_RALPH iftrue UnknownScript_0x190603 checkevent EVENT_RALPH_ASKED_FOR_PHONE_NUMBER iftrue UnknownScript_0x190566 @@ -226,7 +178,7 @@ FisherRalph1Script: UnknownScript_0x190566: scall UnknownScript_0x1905fb UnknownScript_0x190569: - askforphonenumber $11 + askforphonenumber PHONE_FISHER_RALPH if_equal $1, UnknownScript_0x19060b if_equal $2, UnknownScript_0x190607 trainertotext FISHER, RALPH1, $0 @@ -328,23 +280,7 @@ UnknownScript_0x19060f: end TrainerFisherHenry: - ; bit/flag number - dw EVENT_BEAT_FISHER_HENRY - - ; trainer group && trainer id - db FISHER, HENRY - - ; text when seen - dw FisherHenrySeenText - - ; text when trainer beaten - dw FisherHenryBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw FisherHenryScript + trainer EVENT_BEAT_FISHER_HENRY, FISHER, HENRY, FisherHenrySeenText, FisherHenryBeatenText, $0000, FisherHenryScript FisherHenryScript: talkaftercancel @@ -355,31 +291,15 @@ FisherHenryScript: end TrainerPicnickerLiz1: - ; bit/flag number - dw EVENT_BEAT_PICNICKER_LIZ - - ; trainer group && trainer id - db PICNICKER, LIZ1 - - ; text when seen - dw PicnickerLiz1SeenText - - ; text when trainer beaten - dw PicnickerLiz1BeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw PicnickerLiz1Script + trainer EVENT_BEAT_PICNICKER_LIZ, PICNICKER, LIZ1, PicnickerLiz1SeenText, PicnickerLiz1BeatenText, $0000, PicnickerLiz1Script PicnickerLiz1Script: - writecode VAR_CALLERID, $12 + writecode VAR_CALLERID, PHONE_PICNICKER_LIZ talkaftercancel loadfont checkflag ENGINE_LIZ iftrue UnknownScript_0x19066d - checkcellnum $12 + checkcellnum PHONE_PICNICKER_LIZ iftrue UnknownScript_0x1906ed checkevent EVENT_LIZ_ASKED_FOR_PHONE_NUMBER iftrue UnknownScript_0x190656 @@ -392,7 +312,7 @@ PicnickerLiz1Script: UnknownScript_0x190656: scall UnknownScript_0x1906e5 UnknownScript_0x190659: - askforphonenumber $12 + askforphonenumber PHONE_PICNICKER_LIZ if_equal $1, UnknownScript_0x1906f5 if_equal $2, UnknownScript_0x1906f1 trainertotext PICNICKER, LIZ1, $0 @@ -488,23 +408,7 @@ UnknownScript_0x1906f9: end TrainerYoungsterAlbert: - ; bit/flag number - dw EVENT_BEAT_YOUNGSTER_ALBERT - - ; trainer group && trainer id - db YOUNGSTER, ALBERT - - ; text when seen - dw YoungsterAlbertSeenText - - ; text when trainer beaten - dw YoungsterAlbertBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw YoungsterAlbertScript + trainer EVENT_BEAT_YOUNGSTER_ALBERT, YOUNGSTER, ALBERT, YoungsterAlbertSeenText, YoungsterAlbertBeatenText, $0000, YoungsterAlbertScript YoungsterAlbertScript: talkaftercancel @@ -515,23 +419,7 @@ YoungsterAlbertScript: end TrainerYoungsterGordon: - ; bit/flag number - dw EVENT_BEAT_YOUNGSTER_GORDON - - ; trainer group && trainer id - db YOUNGSTER, GORDON - - ; text when seen - dw YoungsterGordonSeenText - - ; text when trainer beaten - dw YoungsterGordonBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw YoungsterGordonScript + trainer EVENT_BEAT_YOUNGSTER_GORDON, YOUNGSTER, GORDON, YoungsterGordonSeenText, YoungsterGordonBeatenText, $0000, YoungsterGordonScript YoungsterGordonScript: talkaftercancel @@ -542,23 +430,7 @@ YoungsterGordonScript: end TrainerBird_keeperPeter: - ; bit/flag number - dw EVENT_BEAT_BIRD_KEEPER_PETER - - ; trainer group && trainer id - db BIRD_KEEPER, PETER - - ; text when seen - dw Bird_keeperPeterSeenText - - ; text when trainer beaten - dw Bird_keeperPeterBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw Bird_keeperPeterScript + trainer EVENT_BEAT_BIRD_KEEPER_PETER, BIRD_KEEPER, PETER, Bird_keeperPeterSeenText, Bird_keeperPeterBeatenText, $0000, Bird_keeperPeterScript Bird_keeperPeterScript: talkaftercancel @@ -623,13 +495,11 @@ Route32PokeCenterSign: jumpstd pokecentersign MapRoute32SignpostItem4: - dw $00a5 - db GREAT_BALL + dwb EVENT_ROUTE_32_HIDDEN_GREAT_BALL, GREAT_BALL MapRoute32SignpostItem5: - dw $00a6 - db SUPER_POTION + dwb EVENT_ROUTE_32_HIDDEN_SUPER_POTION, SUPER_POTION MovementData_0x190789: @@ -1053,40 +923,40 @@ Route32_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 4 warp_def $49, $b, 1, GROUP_ROUTE_32_POKECENTER_1F, MAP_ROUTE_32_POKECENTER_1F warp_def $2, $4, 3, GROUP_ROUTE_32_RUINS_OF_ALPH_GATE, MAP_ROUTE_32_RUINS_OF_ALPH_GATE warp_def $3, $4, 4, GROUP_ROUTE_32_RUINS_OF_ALPH_GATE, MAP_ROUTE_32_RUINS_OF_ALPH_GATE warp_def $4f, $6, 4, GROUP_UNION_CAVE_1F, MAP_UNION_CAVE_1F - ; xy triggers +.XYTriggers: db 2 xy_trigger 0, $8, $12, $0, UnknownScript_0x1904ab, $0, $0 xy_trigger 1, $47, $7, $0, UnknownScript_0x1904e9, $0, $0 - ; signposts +.Signposts: db 6 - signpost 5, 13, $0, Route32Sign - signpost 1, 9, $0, Route32RuinsSign - signpost 84, 10, $0, Route32UnionCaveSign - signpost 73, 12, $0, Route32PokeCenterSign - signpost 67, 12, $7, MapRoute32SignpostItem4 - signpost 40, 11, $7, MapRoute32SignpostItem5 - - ; people-events + signpost 5, 13, SIGNPOST_READ, Route32Sign + signpost 1, 9, SIGNPOST_READ, Route32RuinsSign + signpost 84, 10, SIGNPOST_READ, Route32UnionCaveSign + signpost 73, 12, SIGNPOST_READ, Route32PokeCenterSign + signpost 67, 12, SIGNPOST_ITEM, MapRoute32SignpostItem4 + signpost 40, 11, SIGNPOST_ITEM, MapRoute32SignpostItem5 + +.PersonEvents: db 14 - person_event SPRITE_FISHER, 53, 12, $6, $0, 255, 255, $a2, 1, TrainerFisherJustin, -1 - person_event SPRITE_FISHER, 60, 16, $7, $0, 255, 255, $a2, 3, TrainerFisherRalph1, -1 - person_event SPRITE_FISHER, 52, 10, $8, $0, 255, 255, $a2, 1, TrainerFisherHenry, -1 - person_event SPRITE_YOUNGSTER, 26, 16, $9, $0, 255, 255, $92, 3, TrainerYoungsterAlbert, -1 - person_event SPRITE_YOUNGSTER, 67, 8, $a, $0, 255, 255, $92, 3, TrainerYoungsterGordon, -1 - person_event SPRITE_YOUNGSTER, 49, 7, $7, $0, 255, 255, $a2, 3, TrainerCamperRoland, -1 - person_event SPRITE_LASS, 34, 14, $8, $0, 255, 255, $a2, 1, TrainerPicnickerLiz1, -1 - person_event SPRITE_COOLTRAINER_M, 12, 23, $8, $0, 255, 255, $0, 0, CooltrainerMScript_0x19046f, -1 - person_event SPRITE_YOUNGSTER, 86, 15, $7, $0, 255, 255, $92, 3, TrainerBird_keeperPeter, -1 - person_event SPRITE_FISHER, 74, 11, $6, $0, 255, 255, $0, 0, FisherScript_0x1904f2, EVENT_6FC - person_event SPRITE_POKE_BALL, 57, 10, $1, $0, 255, 255, $1, 0, ItemFragment_0x190773, EVENT_6B0 - person_event SPRITE_FISHER, 17, 19, $9, $0, 255, 255, $0, 0, FisherScript_0x1904ce, -1 - person_event SPRITE_LASS, 71, 16, $8, $0, 255, 255, $0, 0, FriedaScript, EVENT_758 - person_event SPRITE_POKE_BALL, 34, 7, $1, $0, 255, 255, $1, 0, ItemFragment_0x190775, EVENT_6B1 + person_event SPRITE_FISHER, 53, 12, OW_UP | $2, $0, -1, -1, (PAL_OW_GREEN << 4) | $82, 1, TrainerFisherJustin, -1 + person_event SPRITE_FISHER, 60, 16, OW_UP | $3, $0, -1, -1, (PAL_OW_GREEN << 4) | $82, 3, TrainerFisherRalph1, -1 + person_event SPRITE_FISHER, 52, 10, OW_LEFT | $0, $0, -1, -1, (PAL_OW_GREEN << 4) | $82, 1, TrainerFisherHenry, -1 + person_event SPRITE_YOUNGSTER, 26, 16, OW_LEFT | $1, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 3, TrainerYoungsterAlbert, -1 + person_event SPRITE_YOUNGSTER, 67, 8, OW_LEFT | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 3, TrainerYoungsterGordon, -1 + person_event SPRITE_YOUNGSTER, 49, 7, OW_UP | $3, $0, -1, -1, (PAL_OW_GREEN << 4) | $82, 3, TrainerCamperRoland, -1 + person_event SPRITE_LASS, 34, 14, OW_LEFT | $0, $0, -1, -1, (PAL_OW_GREEN << 4) | $82, 1, TrainerPicnickerLiz1, -1 + person_event SPRITE_COOLTRAINER_M, 12, 23, OW_LEFT | $0, $0, -1, -1, $0, 0, CooltrainerMScript_0x19046f, -1 + person_event SPRITE_YOUNGSTER, 86, 15, OW_UP | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 3, TrainerBird_keeperPeter, -1 + person_event SPRITE_FISHER, 74, 11, OW_UP | $2, $0, -1, -1, $0, 0, FisherScript_0x1904f2, EVENT_SLOWPOKE_WELL_ROCKETS + person_event SPRITE_POKE_BALL, 57, 10, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x190773, EVENT_ROUTE_32_GREAT_BALL + person_event SPRITE_FISHER, 17, 19, OW_LEFT | $1, $0, -1, -1, $0, 0, FisherScript_0x1904ce, -1 + person_event SPRITE_LASS, 71, 16, OW_LEFT | $0, $0, -1, -1, $0, 0, FriedaScript, EVENT_ROUTE_32_FRIEDA_OF_FRIDAY + person_event SPRITE_POKE_BALL, 34, 7, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x190775, EVENT_ROUTE_32_REPEL diff --git a/maps/Route32PokeCenter1F.asm b/maps/Route32PokeCenter1F.asm index 979f99b3b..a12d8e06e 100644 --- a/maps/Route32PokeCenter1F.asm +++ b/maps/Route32PokeCenter1F.asm @@ -1,8 +1,8 @@ Route32PokeCenter1F_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 NurseScript_0x69b52: @@ -93,20 +93,20 @@ Route32PokeCenter1F_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 3 warp_def $7, $3, 1, GROUP_ROUTE_32, MAP_ROUTE_32 warp_def $7, $4, 1, GROUP_ROUTE_32, MAP_ROUTE_32 warp_def $7, $0, 1, GROUP_POKECENTER_2F, MAP_POKECENTER_2F - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 3 - person_event SPRITE_NURSE, 5, 7, $6, $0, 255, 255, $0, 0, NurseScript_0x69b52, -1 - person_event SPRITE_FISHING_GURU, 8, 5, $6, $0, 255, 255, $a0, 0, FishingGuruScript_0x69b55, -1 - person_event SPRITE_COOLTRAINER_F, 6, 10, $6, $0, 255, 255, $80, 0, CooltrainerFScript_0x69b80, -1 + person_event SPRITE_NURSE, 5, 7, OW_UP | $2, $0, -1, -1, $0, 0, NurseScript_0x69b52, -1 + person_event SPRITE_FISHING_GURU, 8, 5, OW_UP | $2, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, FishingGuruScript_0x69b55, -1 + person_event SPRITE_COOLTRAINER_F, 6, 10, OW_UP | $2, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, CooltrainerFScript_0x69b80, -1 diff --git a/maps/Route32RuinsofAlphGate.asm b/maps/Route32RuinsofAlphGate.asm index 6b3605435..57ffd34bd 100644 --- a/maps/Route32RuinsofAlphGate.asm +++ b/maps/Route32RuinsofAlphGate.asm @@ -1,8 +1,8 @@ Route32RuinsofAlphGate_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 OfficerScript_0x69a2d: @@ -45,21 +45,21 @@ Route32RuinsofAlphGate_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 4 warp_def $4, $0, 10, GROUP_RUINS_OF_ALPH_OUTSIDE, MAP_RUINS_OF_ALPH_OUTSIDE warp_def $5, $0, 11, GROUP_RUINS_OF_ALPH_OUTSIDE, MAP_RUINS_OF_ALPH_OUTSIDE warp_def $4, $9, 2, GROUP_ROUTE_32, MAP_ROUTE_32 warp_def $5, $9, 3, GROUP_ROUTE_32, MAP_ROUTE_32 - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 3 - person_event SPRITE_OFFICER, 6, 9, $6, $0, 255, 255, $80, 0, OfficerScript_0x69a2d, -1 - person_event SPRITE_POKEFAN_M, 6, 12, $4, $10, 255, 255, $b0, 0, PokefanMScript_0x69a30, -1 - person_event SPRITE_YOUNGSTER, 10, 5, $7, $0, 255, 255, $a0, 0, YoungsterScript_0x69a33, -1 + person_event SPRITE_OFFICER, 6, 9, OW_UP | $2, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, OfficerScript_0x69a2d, -1 + person_event SPRITE_POKEFAN_M, 6, 12, OW_UP | $0, $10, -1, -1, (PAL_OW_BROWN << 4) | $80, 0, PokefanMScript_0x69a30, -1 + person_event SPRITE_YOUNGSTER, 10, 5, OW_UP | $3, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, YoungsterScript_0x69a33, -1 diff --git a/maps/Route33.asm b/maps/Route33.asm index 3554f4189..f71be809c 100644 --- a/maps/Route33.asm +++ b/maps/Route33.asm @@ -1,41 +1,25 @@ Route33_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 LassScript_0x1ac002: jumptextfaceplayer UnknownText_0x1ac1e7 TrainerHikerAnthony: - ; bit/flag number - dw EVENT_BEAT_HIKER_ANTHONY - - ; trainer group && trainer id - db HIKER, ANTHONY2 - - ; text when seen - dw HikerAnthony2SeenText - - ; text when trainer beaten - dw HikerAnthony2BeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw HikerAnthony2Script + trainer EVENT_BEAT_HIKER_ANTHONY, HIKER, ANTHONY2, HikerAnthony2SeenText, HikerAnthony2BeatenText, $0000, HikerAnthony2Script HikerAnthony2Script: - writecode VAR_CALLERID, $13 + writecode VAR_CALLERID, PHONE_HIKER_ANTHONY talkaftercancel loadfont checkflag ENGINE_ANTHONY iftrue UnknownScript_0x1ac051 checkflag ENGINE_DUNSPARCE_SWARM iftrue UnknownScript_0x1ac0c5 - checkcellnum $13 + checkcellnum PHONE_HIKER_ANTHONY iftrue UnknownScript_0x1ac0d7 checkevent EVENT_ANTHONY_ASKED_FOR_PHONE_NUMBER iftrue UnknownScript_0x1ac03a @@ -48,7 +32,7 @@ HikerAnthony2Script: UnknownScript_0x1ac03a: scall UnknownScript_0x1ac0cf UnknownScript_0x1ac03d: - askforphonenumber $13 + askforphonenumber PHONE_HIKER_ANTHONY if_equal $1, UnknownScript_0x1ac0df if_equal $2, UnknownScript_0x1ac0db trainertotext HIKER, ANTHONY2, $0 @@ -209,19 +193,19 @@ Route33_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 1 warp_def $9, $b, 3, GROUP_UNION_CAVE_1F, MAP_UNION_CAVE_1F - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 1 - signpost 11, 11, $0, MapRoute33Signpost0Script + signpost 11, 11, SIGNPOST_READ, MapRoute33Signpost0Script - ; people-events +.PersonEvents: db 3 - person_event SPRITE_POKEFAN_M, 17, 10, $a, $0, 255, 255, $b2, 2, TrainerHikerAnthony, -1 - person_event SPRITE_LASS, 20, 17, $2, $11, 255, 255, $90, 0, LassScript_0x1ac002, -1 - person_event SPRITE_FRUIT_TREE, 20, 18, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x1ac0ea, -1 + person_event SPRITE_POKEFAN_M, 17, 10, OW_LEFT | $2, $0, -1, -1, (PAL_OW_BROWN << 4) | $82, 2, TrainerHikerAnthony, -1 + person_event SPRITE_LASS, 20, 17, OW_DOWN | $2, $11, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, LassScript_0x1ac002, -1 + person_event SPRITE_FRUIT_TREE, 20, 18, OW_DOWN | $1, $0, -1, -1, $0, 0, FruitTreeScript_0x1ac0ea, -1 diff --git a/maps/Route34.asm b/maps/Route34.asm index 035d16bc4..9ed7261bd 100644 --- a/maps/Route34.asm +++ b/maps/Route34.asm @@ -1,8 +1,8 @@ Route34_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 1 ; callbacks @@ -12,39 +12,39 @@ Route34_MapScriptHeader: UnknownScript_0x78005: checkflag ENGINE_DAYCARE_MONS_ARE_COMPATIBLE iftrue UnknownScript_0x78014 - clearevent EVENT_6E5 - setevent EVENT_6E6 + clearevent EVENT_DAYCARE_MAN_IN_DAYCARE + setevent EVENT_DAYCARE_MAN_ON_ROUTE_34 jump UnknownScript_0x7801d UnknownScript_0x78014: - setevent EVENT_6E5 - clearevent EVENT_6E6 + setevent EVENT_DAYCARE_MAN_IN_DAYCARE + clearevent EVENT_DAYCARE_MAN_ON_ROUTE_34 jump UnknownScript_0x7801d UnknownScript_0x7801d: checkflag ENGINE_DAYCARE_MAN_HAS_MON iffalse UnknownScript_0x78029 - clearevent EVENT_6E7 + clearevent EVENT_DAYCARE_MON_1 jump UnknownScript_0x7802f UnknownScript_0x78029: - setevent EVENT_6E7 + setevent EVENT_DAYCARE_MON_1 jump UnknownScript_0x7802f UnknownScript_0x7802f: checkflag ENGINE_DAYCARE_LADY_HAS_MON iffalse UnknownScript_0x78039 - clearevent EVENT_6E8 + clearevent EVENT_DAYCARE_MON_2 return UnknownScript_0x78039: - setevent EVENT_6E8 + setevent EVENT_DAYCARE_MON_2 return GrampsScript_0x7803d: faceplayer loadfont - special Function16936 + special Special_DayCareManOutside closetext loadmovesprites if_equal $1, UnknownScript_0x7805a @@ -76,33 +76,17 @@ DaycareMon2Script_0x7806b: end TrainerCamperTodd1: - ; bit/flag number - dw EVENT_BEAT_CAMPER_TODD - - ; trainer group && trainer id - db CAMPER, TODD1 - - ; text when seen - dw CamperTodd1SeenText - - ; text when trainer beaten - dw CamperTodd1BeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw CamperTodd1Script + trainer EVENT_BEAT_CAMPER_TODD, CAMPER, TODD1, CamperTodd1SeenText, CamperTodd1BeatenText, $0000, CamperTodd1Script CamperTodd1Script: - writecode VAR_CALLERID, $14 + writecode VAR_CALLERID, PHONE_CAMPER_TODD talkaftercancel loadfont checkflag ENGINE_TODD iftrue UnknownScript_0x780bd checkflag ENGINE_GOLDENROD_DEPT_STORE_SALE_IS_ON iftrue UnknownScript_0x78131 - checkcellnum $14 + checkcellnum PHONE_CAMPER_TODD iftrue UnknownScript_0x78143 checkevent EVENT_TODD_ASKED_FOR_PHONE_NUMBER iftrue UnknownScript_0x780a6 @@ -115,7 +99,7 @@ CamperTodd1Script: UnknownScript_0x780a6: scall UnknownScript_0x7813b UnknownScript_0x780a9: - askforphonenumber $14 + askforphonenumber PHONE_CAMPER_TODD if_equal $1, UnknownScript_0x7814b if_equal $2, UnknownScript_0x78147 trainertotext CAMPER, TODD1, $0 @@ -217,33 +201,17 @@ UnknownScript_0x7814f: end TrainerPicnickerGina1: - ; bit/flag number - dw EVENT_BEAT_PICNICKER_GINA - - ; trainer group && trainer id - db PICNICKER, GINA1 - - ; text when seen - dw PicnickerGina1SeenText - - ; text when trainer beaten - dw PicnickerGina1BeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw PicnickerGina1Script + trainer EVENT_BEAT_PICNICKER_GINA, PICNICKER, GINA1, PicnickerGina1SeenText, PicnickerGina1BeatenText, $0000, PicnickerGina1Script PicnickerGina1Script: - writecode VAR_CALLERID, $15 + writecode VAR_CALLERID, PHONE_PICNICKER_GINA talkaftercancel loadfont checkflag ENGINE_GINA iftrue UnknownScript_0x7819f checkflag ENGINE_GINA_HAS_LEAF_STONE iftrue UnknownScript_0x78213 - checkcellnum $15 + checkcellnum PHONE_PICNICKER_GINA iftrue UnknownScript_0x78234 checkevent EVENT_GINA_ASKED_FOR_PHONE_NUMBER iftrue UnknownScript_0x78188 @@ -256,7 +224,7 @@ PicnickerGina1Script: UnknownScript_0x78188: scall UnknownScript_0x7822c UnknownScript_0x7818b: - askforphonenumber $15 + askforphonenumber PHONE_PICNICKER_GINA if_equal $1, UnknownScript_0x7823c if_equal $2, UnknownScript_0x78238 trainertotext PICNICKER, GINA1, $0 @@ -328,7 +296,7 @@ UnknownScript_0x78213: verbosegiveitem LEAF_STONE, 1 iffalse UnknownScript_0x78225 clearflag ENGINE_GINA_HAS_LEAF_STONE - setevent EVENT_100 + setevent EVENT_GINA_GAVE_LEAF_STONE jump UnknownScript_0x78234 UnknownScript_0x78225: @@ -402,23 +370,7 @@ UnknownScript_0x78276: end TrainerYoungsterSamuel: - ; bit/flag number - dw EVENT_BEAT_YOUNGSTER_SAMUEL - - ; trainer group && trainer id - db YOUNGSTER, SAMUEL - - ; text when seen - dw YoungsterSamuelSeenText - - ; text when trainer beaten - dw YoungsterSamuelBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw YoungsterSamuelScript + trainer EVENT_BEAT_YOUNGSTER_SAMUEL, YOUNGSTER, SAMUEL, YoungsterSamuelSeenText, YoungsterSamuelBeatenText, $0000, YoungsterSamuelScript YoungsterSamuelScript: talkaftercancel @@ -429,23 +381,7 @@ YoungsterSamuelScript: end TrainerYoungsterIan: - ; bit/flag number - dw EVENT_BEAT_YOUNGSTER_IAN - - ; trainer group && trainer id - db YOUNGSTER, IAN - - ; text when seen - dw YoungsterIanSeenText - - ; text when trainer beaten - dw YoungsterIanBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw YoungsterIanScript + trainer EVENT_BEAT_YOUNGSTER_IAN, YOUNGSTER, IAN, YoungsterIanSeenText, YoungsterIanBeatenText, $0000, YoungsterIanScript YoungsterIanScript: talkaftercancel @@ -456,23 +392,7 @@ YoungsterIanScript: end TrainerPokefanmBrandon: - ; bit/flag number - dw EVENT_BEAT_POKEFANM_BRANDON - - ; trainer group && trainer id - db POKEFANM, BRANDON - - ; text when seen - dw PokefanmBrandonSeenText - - ; text when trainer beaten - dw PokefanmBrandonBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw PokefanmBrandonScript + trainer EVENT_BEAT_POKEFANM_BRANDON, POKEFANM, BRANDON, PokefanmBrandonSeenText, PokefanmBrandonBeatenText, $0000, PokefanmBrandonScript PokefanmBrandonScript: talkaftercancel @@ -483,23 +403,7 @@ PokefanmBrandonScript: end TrainerCooltrainerfIrene: - ; bit/flag number - dw EVENT_BEAT_COOLTRAINERF_IRENE - - ; trainer group && trainer id - db COOLTRAINERF, IRENE - - ; text when seen - dw CooltrainerfIreneSeenText - - ; text when trainer beaten - dw CooltrainerfIreneBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw CooltrainerfIreneScript + trainer EVENT_BEAT_COOLTRAINERF_IRENE, COOLTRAINERF, IRENE, CooltrainerfIreneSeenText, CooltrainerfIreneBeatenText, $0000, CooltrainerfIreneScript CooltrainerfIreneScript: talkaftercancel @@ -518,23 +422,7 @@ UnknownScript_0x782d2: end TrainerCooltrainerfJenn: - ; bit/flag number - dw EVENT_BEAT_COOLTRAINERF_JENN - - ; trainer group && trainer id - db COOLTRAINERF, JENN - - ; text when seen - dw CooltrainerfJennSeenText - - ; text when trainer beaten - dw CooltrainerfJennBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw CooltrainerfJennScript + trainer EVENT_BEAT_COOLTRAINERF_JENN, COOLTRAINERF, JENN, CooltrainerfJennSeenText, CooltrainerfJennBeatenText, $0000, CooltrainerfJennScript CooltrainerfJennScript: talkaftercancel @@ -553,23 +441,7 @@ UnknownScript_0x782f2: end TrainerCooltrainerfKate: - ; bit/flag number - dw EVENT_BEAT_COOLTRAINERF_KATE - - ; trainer group && trainer id - db COOLTRAINERF, KATE - - ; text when seen - dw CooltrainerfKateSeenText - - ; text when trainer beaten - dw CooltrainerfKateBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw CooltrainerfKateScript + trainer EVENT_BEAT_COOLTRAINERF_KATE, COOLTRAINERF, KATE, CooltrainerfKateSeenText, CooltrainerfKateBeatenText, $0000, CooltrainerfKateScript CooltrainerfKateScript: talkaftercancel @@ -604,13 +476,11 @@ ItemFragment_0x7832b: db NUGGET, 1 MapRoute34SignpostItem3: - dw $00a7 - db RARE_CANDY + dwb EVENT_ROUTE_34_HIDDEN_RARE_CANDY, RARE_CANDY MapRoute34SignpostItem4: - dw $00a8 - db SUPER_POTION + dwb EVENT_ROUTE_34_HIDDEN_SUPER_POTION, SUPER_POTION MovementData_0x78333: @@ -884,37 +754,37 @@ Route34_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 5 warp_def $25, $d, 1, GROUP_ROUTE_34_ILEX_FOREST_GATE, MAP_ROUTE_34_ILEX_FOREST_GATE warp_def $25, $e, 2, GROUP_ROUTE_34_ILEX_FOREST_GATE, MAP_ROUTE_34_ILEX_FOREST_GATE - warp_def $e, $b, 1, GROUP_DAY_CARE, MAP_DAY_CARE - warp_def $f, $b, 2, GROUP_DAY_CARE, MAP_DAY_CARE - warp_def $f, $d, 3, GROUP_DAY_CARE, MAP_DAY_CARE + warp_def $e, $b, 1, GROUP_DAYCARE, MAP_DAYCARE + warp_def $f, $b, 2, GROUP_DAYCARE, MAP_DAYCARE + warp_def $f, $d, 3, GROUP_DAYCARE, MAP_DAYCARE - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 5 - signpost 6, 12, $0, MapRoute34Signpost0Script - signpost 33, 13, $0, MapRoute34Signpost1Script - signpost 13, 10, $0, MapRoute34Signpost2Script - signpost 32, 8, $7, MapRoute34SignpostItem3 - signpost 19, 17, $7, MapRoute34SignpostItem4 + signpost 6, 12, SIGNPOST_READ, MapRoute34Signpost0Script + signpost 33, 13, SIGNPOST_READ, MapRoute34Signpost1Script + signpost 13, 10, SIGNPOST_READ, MapRoute34Signpost2Script + signpost 32, 8, SIGNPOST_ITEM, MapRoute34SignpostItem3 + signpost 19, 17, SIGNPOST_ITEM, MapRoute34SignpostItem4 - ; people-events +.PersonEvents: db 13 - person_event SPRITE_YOUNGSTER, 11, 17, $8, $0, 255, 255, $a2, 5, TrainerCamperTodd1, -1 - person_event SPRITE_YOUNGSTER, 36, 19, $6, $0, 255, 255, $92, 3, TrainerYoungsterSamuel, -1 - person_event SPRITE_YOUNGSTER, 24, 15, $6, $0, 255, 255, $92, 3, TrainerYoungsterIan, -1 - person_event SPRITE_LASS, 30, 14, $9, $0, 255, 255, $a2, 3, TrainerPicnickerGina1, -1 - person_event SPRITE_OFFICER, 15, 13, $6, $0, 255, 255, $90, 0, OfficerScript_0x7824c, -1 - person_event SPRITE_POKEFAN_M, 32, 22, $1e, $0, 255, 255, $82, 3, TrainerPokefanmBrandon, -1 - person_event SPRITE_GRAMPS, 20, 19, $6, $0, 255, 255, $0, 0, GrampsScript_0x7803d, EVENT_6E6 - person_event SPRITE_DAYCARE_MON_1, 22, 18, $16, $22, 255, 255, $0, 0, DaycareMon1Script_0x78065, EVENT_6E7 - person_event SPRITE_DAYCARE_MON_2, 23, 21, $16, $22, 255, 255, $0, 0, DaycareMon2Script_0x7806b, EVENT_6E8 - person_event SPRITE_COOLTRAINER_F, 52, 15, $8, $0, 255, 255, $82, 5, TrainerCooltrainerfIrene, -1 - person_event SPRITE_COOLTRAINER_F, 52, 7, $9, $0, 255, 255, $82, 3, TrainerCooltrainerfJenn, -1 - person_event SPRITE_COOLTRAINER_F, 55, 10, $7, $0, 255, 255, $82, 2, TrainerCooltrainerfKate, -1 - person_event SPRITE_POKE_BALL, 34, 11, $1, $0, 255, 255, $1, 0, ItemFragment_0x7832b, EVENT_7BC + person_event SPRITE_YOUNGSTER, 11, 17, OW_LEFT | $0, $0, -1, -1, (PAL_OW_GREEN << 4) | $82, 5, TrainerCamperTodd1, -1 + person_event SPRITE_YOUNGSTER, 36, 19, OW_UP | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 3, TrainerYoungsterSamuel, -1 + person_event SPRITE_YOUNGSTER, 24, 15, OW_UP | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 3, TrainerYoungsterIan, -1 + person_event SPRITE_LASS, 30, 14, OW_LEFT | $1, $0, -1, -1, (PAL_OW_GREEN << 4) | $82, 3, TrainerPicnickerGina1, -1 + person_event SPRITE_OFFICER, 15, 13, OW_UP | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, OfficerScript_0x7824c, -1 + person_event SPRITE_POKEFAN_M, 32, 22, OW_RIGHT | $12, $0, -1, -1, (PAL_OW_RED << 4) | $82, 3, TrainerPokefanmBrandon, -1 + person_event SPRITE_GRAMPS, 20, 19, OW_UP | $2, $0, -1, -1, $0, 0, GrampsScript_0x7803d, EVENT_DAYCARE_MAN_ON_ROUTE_34 + person_event SPRITE_DAYCARE_MON_1, 22, 18, OW_UP | $12, $22, -1, -1, $0, 0, DaycareMon1Script_0x78065, EVENT_DAYCARE_MON_1 + person_event SPRITE_DAYCARE_MON_2, 23, 21, OW_UP | $12, $22, -1, -1, $0, 0, DaycareMon2Script_0x7806b, EVENT_DAYCARE_MON_2 + person_event SPRITE_COOLTRAINER_F, 52, 15, OW_LEFT | $0, $0, -1, -1, (PAL_OW_RED << 4) | $82, 5, TrainerCooltrainerfIrene, -1 + person_event SPRITE_COOLTRAINER_F, 52, 7, OW_LEFT | $1, $0, -1, -1, (PAL_OW_RED << 4) | $82, 3, TrainerCooltrainerfJenn, -1 + person_event SPRITE_COOLTRAINER_F, 55, 10, OW_UP | $3, $0, -1, -1, (PAL_OW_RED << 4) | $82, 2, TrainerCooltrainerfKate, -1 + person_event SPRITE_POKE_BALL, 34, 11, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x7832b, EVENT_ROUTE_34_NUGGET diff --git a/maps/Route34IlexForestGate.asm b/maps/Route34IlexForestGate.asm index 51e160e08..8b55d58d5 100644 --- a/maps/Route34IlexForestGate.asm +++ b/maps/Route34IlexForestGate.asm @@ -1,8 +1,8 @@ Route34IlexForestGate_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 1 ; callbacks @@ -24,7 +24,7 @@ UnknownScript_0x62d38: UnknownScript_0x62d3d: checkevent EVENT_FOREST_IS_RESTLESS iffalse UnknownScript_0x62d62 - showemote $0, $5, 20 + showemote EMOTE_SHOCK, $5, 20 spriteface $5, LEFT spriteface $0, RIGHT follow $0, $5 @@ -136,23 +136,23 @@ Route34IlexForestGate_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 4 warp_def $0, $4, 1, GROUP_ROUTE_34, MAP_ROUTE_34 warp_def $0, $5, 2, GROUP_ROUTE_34, MAP_ROUTE_34 warp_def $7, $4, 1, GROUP_ILEX_FOREST, MAP_ILEX_FOREST warp_def $7, $5, 1, GROUP_ILEX_FOREST, MAP_ILEX_FOREST - ; xy triggers +.XYTriggers: db 1 xy_trigger 0, $7, $4, $0, UnknownScript_0x62d3d, $0, $0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 4 - person_event SPRITE_TEACHER, 7, 13, $8, $0, 255, 255, $90, 0, TeacherScript_0x62d63, EVENT_6EA - person_event SPRITE_BUTTERFREE, 8, 13, $16, $0, 255, 255, $80, 0, ButterfreeScript_0x62d8a, -1 - person_event SPRITE_LASS, 8, 7, $4, $10, 255, 255, $a0, 0, LassScript_0x62d94, EVENT_6EB - person_event SPRITE_TEACHER, 11, 9, $7, $0, 255, 255, $90, 0, TeacherScript_0x62d63, EVENT_6EC + person_event SPRITE_TEACHER, 7, 13, OW_LEFT | $0, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, TeacherScript_0x62d63, EVENT_ROUTE_34_ILEX_FOREST_GATE_TEACHER_BEHIND_COUNTER + person_event SPRITE_BUTTERFREE, 8, 13, OW_UP | $12, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, ButterfreeScript_0x62d8a, -1 + person_event SPRITE_LASS, 8, 7, OW_UP | $0, $10, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, LassScript_0x62d94, EVENT_ROUTE_34_ILEX_FOREST_GATE_LASS + person_event SPRITE_TEACHER, 11, 9, OW_UP | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, TeacherScript_0x62d63, EVENT_ROUTE_34_ILEX_FOREST_GATE_TEACHER_IN_WALKWAY diff --git a/maps/Route35.asm b/maps/Route35.asm index d66302c29..c2a483730 100644 --- a/maps/Route35.asm +++ b/maps/Route35.asm @@ -1,28 +1,12 @@ Route35_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 TrainerBird_keeperBryan: - ; bit/flag number - dw EVENT_BEAT_BIRD_KEEPER_BRYAN - - ; trainer group && trainer id - db BIRD_KEEPER, BRYAN - - ; text when seen - dw Bird_keeperBryanSeenText - - ; text when trainer beaten - dw Bird_keeperBryanBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw Bird_keeperBryanScript + trainer EVENT_BEAT_BIRD_KEEPER_BRYAN, BIRD_KEEPER, BRYAN, Bird_keeperBryanSeenText, Bird_keeperBryanBeatenText, $0000, Bird_keeperBryanScript Bird_keeperBryanScript: talkaftercancel @@ -33,29 +17,13 @@ Bird_keeperBryanScript: end TrainerJugglerIrwin: - ; bit/flag number - dw EVENT_BEAT_JUGGLER_IRWIN - - ; trainer group && trainer id - db JUGGLER, IRWIN1 - - ; text when seen - dw JugglerIrwin1SeenText - - ; text when trainer beaten - dw JugglerIrwin1BeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw JugglerIrwin1Script + trainer EVENT_BEAT_JUGGLER_IRWIN, JUGGLER, IRWIN1, JugglerIrwin1SeenText, JugglerIrwin1BeatenText, $0000, JugglerIrwin1Script JugglerIrwin1Script: - writecode VAR_CALLERID, $16 + writecode VAR_CALLERID, PHONE_JUGGLER_IRWIN talkaftercancel loadfont - checkcellnum $16 + checkcellnum PHONE_JUGGLER_IRWIN iftrue UnknownScript_0x19c90f checkevent EVENT_IRWIN_ASKED_FOR_PHONE_NUMBER iftrue UnknownScript_0x19c8ec @@ -68,7 +36,7 @@ JugglerIrwin1Script: UnknownScript_0x19c8ec: scall UnknownScript_0x19c907 UnknownScript_0x19c8ef: - askforphonenumber $16 + askforphonenumber PHONE_JUGGLER_IRWIN if_equal $1, UnknownScript_0x19c917 if_equal $2, UnknownScript_0x19c913 trainertotext JUGGLER, IRWIN1, $0 @@ -104,23 +72,7 @@ UnknownScript_0x19c91b: end TrainerCamperIvan: - ; bit/flag number - dw EVENT_BEAT_CAMPER_IVAN - - ; trainer group && trainer id - db CAMPER, IVAN - - ; text when seen - dw CamperIvanSeenText - - ; text when trainer beaten - dw CamperIvanBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw CamperIvanScript + trainer EVENT_BEAT_CAMPER_IVAN, CAMPER, IVAN, CamperIvanSeenText, CamperIvanBeatenText, $0000, CamperIvanScript CamperIvanScript: talkaftercancel @@ -131,23 +83,7 @@ CamperIvanScript: end TrainerCamperElliot: - ; bit/flag number - dw EVENT_BEAT_CAMPER_ELLIOT - - ; trainer group && trainer id - db CAMPER, ELLIOT - - ; text when seen - dw CamperElliotSeenText - - ; text when trainer beaten - dw CamperElliotBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw CamperElliotScript + trainer EVENT_BEAT_CAMPER_ELLIOT, CAMPER, ELLIOT, CamperElliotSeenText, CamperElliotBeatenText, $0000, CamperElliotScript CamperElliotScript: talkaftercancel @@ -158,23 +94,7 @@ CamperElliotScript: end TrainerPicnickerBrooke: - ; bit/flag number - dw EVENT_BEAT_PICNICKER_BROOKE - - ; trainer group && trainer id - db PICNICKER, BROOKE - - ; text when seen - dw PicnickerBrookeSeenText - - ; text when trainer beaten - dw PicnickerBrookeBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw PicnickerBrookeScript + trainer EVENT_BEAT_PICNICKER_BROOKE, PICNICKER, BROOKE, PicnickerBrookeSeenText, PicnickerBrookeBeatenText, $0000, PicnickerBrookeScript PicnickerBrookeScript: talkaftercancel @@ -185,23 +105,7 @@ PicnickerBrookeScript: end TrainerPicnickerKim: - ; bit/flag number - dw EVENT_BEAT_PICNICKER_KIM - - ; trainer group && trainer id - db PICNICKER, KIM - - ; text when seen - dw PicnickerKimSeenText - - ; text when trainer beaten - dw PicnickerKimBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw PicnickerKimScript + trainer EVENT_BEAT_PICNICKER_KIM, PICNICKER, KIM, PicnickerKimSeenText, PicnickerKimBeatenText, $0000, PicnickerKimScript PicnickerKimScript: talkaftercancel @@ -212,33 +116,17 @@ PicnickerKimScript: end TrainerBug_catcherArnie1: - ; bit/flag number - dw EVENT_BEAT_BUG_CATCHER_ARNIE - - ; trainer group && trainer id - db BUG_CATCHER, ARNIE1 - - ; text when seen - dw Bug_catcherArnie1SeenText - - ; text when trainer beaten - dw Bug_catcherArnie1BeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw Bug_catcherArnie1Script + trainer EVENT_BEAT_BUG_CATCHER_ARNIE, BUG_CATCHER, ARNIE1, Bug_catcherArnie1SeenText, Bug_catcherArnie1BeatenText, $0000, Bug_catcherArnie1Script Bug_catcherArnie1Script: - writecode VAR_CALLERID, $17 + writecode VAR_CALLERID, PHONE_BUG_CATCHER_ARNIE talkaftercancel loadfont checkflag ENGINE_ARNIE iftrue UnknownScript_0x19c9bb checkflag ENGINE_YANMA_SWARM iftrue UnknownScript_0x19ca2f - checkcellnum $17 + checkcellnum PHONE_BUG_CATCHER_ARNIE iftrue UnknownScript_0x19c90f checkevent EVENT_ARNIE_ASKED_FOR_PHONE_NUMBER iftrue UnknownScript_0x19c9a4 @@ -251,7 +139,7 @@ Bug_catcherArnie1Script: UnknownScript_0x19c9a4: scall UnknownScript_0x19c907 UnknownScript_0x19c9a7: - askforphonenumber $17 + askforphonenumber PHONE_BUG_CATCHER_ARNIE if_equal $1, UnknownScript_0x19c917 if_equal $2, UnknownScript_0x19c913 trainertotext BUG_CATCHER, ARNIE1, $0 @@ -325,23 +213,7 @@ UnknownScript_0x19ca2f: end TrainerFirebreatherWalt: - ; bit/flag number - dw EVENT_BEAT_FIREBREATHER_WALT - - ; trainer group && trainer id - db FIREBREATHER, WALT - - ; text when seen - dw FirebreatherWaltSeenText - - ; text when trainer beaten - dw FirebreatherWaltBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw FirebreatherWaltScript + trainer EVENT_BEAT_FIREBREATHER_WALT, FIREBREATHER, WALT, FirebreatherWaltSeenText, FirebreatherWaltBeatenText, $0000, FirebreatherWaltScript FirebreatherWaltScript: talkaftercancel @@ -581,30 +453,30 @@ Route35_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 3 warp_def $21, $9, 1, GROUP_ROUTE_35_GOLDENROD_GATE, MAP_ROUTE_35_GOLDENROD_GATE warp_def $21, $a, 2, GROUP_ROUTE_35_GOLDENROD_GATE, MAP_ROUTE_35_GOLDENROD_GATE warp_def $5, $3, 3, GROUP_ROUTE_35_NATIONAL_PARK_GATE, MAP_ROUTE_35_NATIONAL_PARK_GATE - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 2 - signpost 7, 1, $0, MapRoute35Signpost1Script - signpost 31, 11, $0, MapRoute35Signpost1Script + signpost 7, 1, SIGNPOST_READ, MapRoute35Signpost1Script + signpost 31, 11, SIGNPOST_READ, MapRoute35Signpost1Script - ; people-events +.PersonEvents: db 11 - person_event SPRITE_YOUNGSTER, 23, 8, $a, $0, 255, 255, $a2, 2, TrainerCamperIvan, -1 - person_event SPRITE_YOUNGSTER, 24, 12, $6, $0, 255, 255, $a2, 3, TrainerCamperElliot, -1 - person_event SPRITE_LASS, 24, 11, $6, $0, 255, 255, $a2, 3, TrainerPicnickerBrooke, -1 - person_event SPRITE_LASS, 30, 14, $a, $0, 255, 255, $a2, 1, TrainerPicnickerKim, -1 - person_event SPRITE_YOUNGSTER, 32, 18, $6, $0, 255, 255, $92, 0, TrainerBird_keeperBryan, -1 - person_event SPRITE_FISHER, 14, 6, $1e, $0, 255, 255, $82, 2, TrainerFirebreatherWalt, -1 - person_event SPRITE_BUG_CATCHER, 11, 20, $6, $2, 255, 255, $b2, 3, TrainerBug_catcherArnie1, -1 - person_event SPRITE_SUPER_NERD, 14, 9, $a, $0, 255, 255, $92, 2, TrainerJugglerIrwin, -1 - person_event SPRITE_OFFICER, 10, 9, $6, $0, 255, 255, $90, 0, OfficerScript_0x19ca49, -1 - person_event SPRITE_FRUIT_TREE, 29, 6, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x19ca7e, -1 - person_event SPRITE_POKE_BALL, 20, 17, $1, $0, 255, 255, $1, 0, ItemFragment_0x19ca7c, EVENT_6B2 + 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 diff --git a/maps/Route35Goldenrodgate.asm b/maps/Route35Goldenrodgate.asm index c510f82db..192e2673d 100644 --- a/maps/Route35Goldenrodgate.asm +++ b/maps/Route35Goldenrodgate.asm @@ -1,8 +1,8 @@ Route35Goldenrodgate_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 OfficerScript_0x69d37: @@ -194,21 +194,21 @@ Route35Goldenrodgate_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 4 warp_def $0, $4, 1, GROUP_ROUTE_35, MAP_ROUTE_35 warp_def $0, $5, 2, GROUP_ROUTE_35, MAP_ROUTE_35 warp_def $7, $4, 12, GROUP_GOLDENROD_CITY, MAP_GOLDENROD_CITY warp_def $7, $5, 12, GROUP_GOLDENROD_CITY, MAP_GOLDENROD_CITY - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 3 - person_event SPRITE_OFFICER, 8, 4, $9, $0, 255, 255, $80, 0, OfficerScript_0x69d37, -1 - person_event SPRITE_POKEFAN_F, 8, 10, $4, $10, 255, 255, $90, 0, PokefanFScript_0x69dc6, -1 - person_event SPRITE_FISHER, 6, 7, $3, $0, 255, 255, $a0, 0, FisherScript_0x69dda, -1 + person_event SPRITE_OFFICER, 8, 4, OW_LEFT | $1, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, OfficerScript_0x69d37, -1 + person_event SPRITE_POKEFAN_F, 8, 10, OW_UP | $0, $10, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, PokefanFScript_0x69dc6, -1 + person_event SPRITE_FISHER, 6, 7, OW_DOWN | $3, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, FisherScript_0x69dda, -1 diff --git a/maps/Route35NationalParkgate.asm b/maps/Route35NationalParkgate.asm index 0f454c405..2d166ebe0 100644 --- a/maps/Route35NationalParkgate.asm +++ b/maps/Route35NationalParkgate.asm @@ -1,60 +1,60 @@ Route35NationalParkgate_MapScriptHeader: - ; trigger count +.MapTriggers: db 3 ; triggers - dw UnknownScript_0x6a19d, $0000 - dw UnknownScript_0x6a19e, $0000 - dw UnknownScript_0x6a19f, $0000 + dw Route35NationalParkgate_Trigger1, $0000 + dw Route35NationalParkgate_Trigger2, $0000 + dw Route35NationalParkgate_Trigger3, $0000 - ; callback count +.MapCallbacks: db 2 ; callbacks - dbw 5, UnknownScript_0x6a1a3 + dbw 5, Route35NationalParkgate_CheckIfStillInContest - dbw 2, UnknownScript_0x6a1af + dbw 2, Route35NationalParkgate_CheckIfContestDay -UnknownScript_0x6a19d: +Route35NationalParkgate_Trigger1: end -UnknownScript_0x6a19e: +Route35NationalParkgate_Trigger2: end -UnknownScript_0x6a19f: - priorityjump UnknownScript_0x6a1d1 +Route35NationalParkgate_Trigger3: + priorityjump Route35NationalParkGate_LeavingContestEarly end -UnknownScript_0x6a1a3: +Route35NationalParkgate_CheckIfStillInContest: checkflag ENGINE_BUG_CONTEST_TIMER - iftrue UnknownScript_0x6a1ac + iftrue Route35NationalParkgate_Yes dotrigger $0 return -UnknownScript_0x6a1ac: +Route35NationalParkgate_Yes: dotrigger $2 return -UnknownScript_0x6a1af: +Route35NationalParkgate_CheckIfContestDay: checkcode VAR_WEEKDAY - if_equal TUESDAY, UnknownScript_0x6a1ca - if_equal THURSDAY, UnknownScript_0x6a1ca - if_equal SATURDAY, UnknownScript_0x6a1ca + if_equal TUESDAY, Route35NationalParkgate_IsContestDay + if_equal THURSDAY, Route35NationalParkgate_IsContestDay + if_equal SATURDAY, Route35NationalParkgate_IsContestDay checkflag ENGINE_BUG_CONTEST_TIMER - iftrue UnknownScript_0x6a1ac + iftrue Route35NationalParkgate_Yes disappear $2 appear $3 appear $4 return -UnknownScript_0x6a1ca: +Route35NationalParkgate_IsContestDay: appear $2 disappear $3 disappear $4 return -UnknownScript_0x6a1d1: +Route35NationalParkGate_LeavingContestEarly: applymovement $0, MovementData_0x6a2e2 spriteface $2, RIGHT loadfont @@ -63,42 +63,42 @@ UnknownScript_0x6a1d1: RAM2MEM $0 writetext UnknownText_0x6a79a yesorno - iffalse UnknownScript_0x6a1ee + iffalse Route35NationalParkgate_GoBackIn writetext UnknownText_0x6a7db closetext loadmovesprites jumpstd bugcontestresultswarp -UnknownScript_0x6a1ee: +Route35NationalParkgate_GoBackIn: writetext UnknownText_0x6a823 closetext loadmovesprites - scall UnknownScript_0x6a261 + scall Route35NationalParkgate_EnterContest playsound SFX_ENTER_DOOR - special Function8c084 + special FadeBlackBGMap waitbutton warpfacing $1, GROUP_NATIONAL_PARK_BUG_CONTEST, MAP_NATIONAL_PARK_BUG_CONTEST, $a, $2f end OfficerScript_0x6a204: checkcode VAR_WEEKDAY - if_equal SUNDAY, UnknownScript_0x6a2c7 - if_equal MONDAY, UnknownScript_0x6a2c7 - if_equal WEDNESDAY, UnknownScript_0x6a2c7 - if_equal FRIDAY, UnknownScript_0x6a2c7 + if_equal SUNDAY, Route35NationalParkgate_NoContestToday + if_equal MONDAY, Route35NationalParkgate_NoContestToday + if_equal WEDNESDAY, Route35NationalParkgate_NoContestToday + if_equal FRIDAY, Route35NationalParkgate_NoContestToday faceplayer loadfont - checkflag ENGINE_51 - iftrue UnknownScript_0x6a2c1 - scall UnknownScript_0x6a2de + checkflag ENGINE_DAILY_BUG_CONTEST + iftrue Route35NationalParkgate_ContestIsOver + scall Route35NationalParkgate_GetDayOfWeek writetext UnknownText_0x6a2eb yesorno - iffalse UnknownScript_0x6a2a3 + iffalse Route35NationalParkgate_DeclinedToParticipate checkcode VAR_PARTYCOUNT - if_greater_than $1, UnknownScript_0x6a271 - special Function13a12 - clearevent EVENT_308 -UnknownScript_0x6a234: + if_greater_than $1, Route35NationalParkgate_LeaveTheRestBehind + special CheckFirstMonFainted + clearevent EVENT_LEFT_MONS_WITH_CONTEST_OFFICER +Route35NationalParkgate_OkayToProceed: setflag ENGINE_BUG_CONTEST_TIMER special PlayMapMusic writetext UnknownText_0x6a39d @@ -109,92 +109,92 @@ UnknownScript_0x6a234: writetext UnknownText_0x6a3e2 closetext loadmovesprites - special Function135db - scall UnknownScript_0x6a261 + special Special_GiveParkBalls + scall Route35NationalParkgate_EnterContest playsound SFX_ENTER_DOOR - special Function8c084 + special FadeBlackBGMap waitbutton - special Function139a8 + special Special_SelectRandomBugContestContestants warpfacing $1, GROUP_NATIONAL_PARK_BUG_CONTEST, MAP_NATIONAL_PARK_BUG_CONTEST, $a, $2f end -UnknownScript_0x6a261: +Route35NationalParkgate_EnterContest: checkcode VAR_FACING - if_equal $2, UnknownScript_0x6a26c + if_equal LEFT, Route35NationalParkgate_FacingLeft applymovement $0, MovementData_0x6a2e5 end -UnknownScript_0x6a26c: +Route35NationalParkgate_FacingLeft: applymovement $0, MovementData_0x6a2e9 end -UnknownScript_0x6a271: +Route35NationalParkgate_LeaveTheRestBehind: checkcode VAR_PARTYCOUNT - if_less_than $6, UnknownScript_0x6a27d + if_less_than 6, Route35NationalParkgate_LessThanFullParty checkcode VAR_BOXSPACE - if_equal $0, UnknownScript_0x6a2b5 + if_equal 0, Route35NationalParkgate_NoRoomInBox -UnknownScript_0x6a27d: ; 6a27d +Route35NationalParkgate_LessThanFullParty: ; 6a27d special Function71ac - if_equal $1, UnknownScript_0x6a2bb + if_equal $1, Route35NationalParkgate_FirstMonIsEgg writetext UnknownText_0x6a4c6 yesorno - iffalse UnknownScript_0x6a2a9 - special Function13a12 - iftrue UnknownScript_0x6a2af - setevent EVENT_308 + iffalse Route35NationalParkgate_DeclinedToLeaveMonsBehind + special CheckFirstMonFainted + iftrue Route35NationalParkgate_FirstMonIsFainted + setevent EVENT_LEFT_MONS_WITH_CONTEST_OFFICER writetext UnknownText_0x6a537 keeptextopen writetext UnknownText_0x6a56b playsound SFX_GOT_SAFARI_BALLS waitbutton keeptextopen - jump UnknownScript_0x6a234 + jump Route35NationalParkgate_OkayToProceed -UnknownScript_0x6a2a3: +Route35NationalParkgate_DeclinedToParticipate: writetext UnknownText_0x6a5dc closetext loadmovesprites end -UnknownScript_0x6a2a9: +Route35NationalParkgate_DeclinedToLeaveMonsBehind: writetext UnknownText_0x6a597 closetext loadmovesprites end -UnknownScript_0x6a2af: +Route35NationalParkgate_FirstMonIsFainted: writetext UnknownText_0x6a608 closetext loadmovesprites end -UnknownScript_0x6a2b5: +Route35NationalParkgate_NoRoomInBox: writetext UnknownText_0x6a67c closetext loadmovesprites end -UnknownScript_0x6a2bb: +Route35NationalParkgate_FirstMonIsEgg: writetext UnknownText_0x6a71f closetext loadmovesprites end -UnknownScript_0x6a2c1: +Route35NationalParkgate_ContestIsOver: writetext UnknownText_0x6a84f closetext loadmovesprites end -UnknownScript_0x6a2c7: +Route35NationalParkgate_NoContestToday: jumptextfaceplayer UnknownText_0x6a894 OfficerScript_0x6a2ca: faceplayer loadfont - checkflag ENGINE_51 - iftrue UnknownScript_0x6a2c1 + checkflag ENGINE_DAILY_BUG_CONTEST + iftrue Route35NationalParkgate_ContestIsOver writetext UnknownText_0x6a894 closetext loadmovesprites @@ -206,7 +206,7 @@ YoungsterScript_0x6a2d8: MapRoute36NationalParkgateSignpost0Script: jumptext UnknownText_0x6a90e -UnknownScript_0x6a2de: +Route35NationalParkgate_GetDayOfWeek: jumpstd daytotext end @@ -442,22 +442,22 @@ Route35NationalParkgate_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 4 warp_def $0, $3, 3, GROUP_NATIONAL_PARK, MAP_NATIONAL_PARK warp_def $0, $4, 4, GROUP_NATIONAL_PARK, MAP_NATIONAL_PARK warp_def $7, $3, 3, GROUP_ROUTE_35, MAP_ROUTE_35 warp_def $7, $4, 3, GROUP_ROUTE_35, MAP_ROUTE_35 - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 1 - signpost 0, 5, $0, MapRoute36NationalParkgateSignpost0Script + signpost 0, 5, SIGNPOST_READ, MapRoute36NationalParkgateSignpost0Script - ; people-events +.PersonEvents: db 3 - person_event SPRITE_OFFICER, 5, 6, $6, $0, 255, 255, $a0, 0, OfficerScript_0x6a204, EVENT_745 - person_event SPRITE_YOUNGSTER, 9, 10, $2, $11, 255, 255, $80, 0, YoungsterScript_0x6a2d8, EVENT_734 - person_event SPRITE_OFFICER, 7, 4, $9, $0, 255, 255, $a0, 0, OfficerScript_0x6a2ca, EVENT_746 + person_event SPRITE_OFFICER, 5, 6, OW_UP | $2, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, OfficerScript_0x6a204, EVENT_ROUTE_35_NATIONAL_PARK_GATE_OFFICER_CONTEST_DAY + person_event SPRITE_YOUNGSTER, 9, 10, OW_DOWN | $2, $11, -1, -1, (PAL_OW_RED << 4) | $80, 0, YoungsterScript_0x6a2d8, EVENT_ROUTE_35_NATIONAL_PARK_GATE_YOUNGSTER + person_event SPRITE_OFFICER, 7, 4, OW_LEFT | $1, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, OfficerScript_0x6a2ca, EVENT_ROUTE_35_NATIONAL_PARK_GATE_OFFICER_NOT_CONTEST_DAY diff --git a/maps/Route36.asm b/maps/Route36.asm index 94847c31d..517971e15 100644 --- a/maps/Route36.asm +++ b/maps/Route36.asm @@ -1,12 +1,12 @@ Route36_MapScriptHeader: - ; trigger count +.MapTriggers: db 2 ; triggers dw UnknownScript_0x19400d, $0000 dw UnknownScript_0x19400e, $0000 - ; callback count +.MapCallbacks: db 1 ; callbacks @@ -30,7 +30,7 @@ ArthurCallback: return UnknownScript_0x19401b: - showemote $0, $0, 15 + showemote EMOTE_SHOCK, $0, 15 pause 15 playsound SFX_WARP_FROM spriteface $0, UP @@ -76,7 +76,7 @@ WateredWeirdTreeScript:: setevent EVENT_FOUGHT_SUDOWOODO if_equal $2, UnknownScript_0x19407b disappear $4 - variablesprite $4, $26 + variablesprite SPRITE_WEIRD_TREE, SPRITE_TWIN returnafterbattle end @@ -88,21 +88,21 @@ UnknownScript_0x19407b: returnafterbattle applymovement $4, MovementData_0x19424b disappear $4 - variablesprite $4, $26 - special Function14209 + variablesprite SPRITE_WEIRD_TREE, SPRITE_TWIN + special RunCallback_04 special Function14168 end LassScript_0x19408c: faceplayer loadfont - checkevent EVENT_0BA + checkevent EVENT_TALKED_TO_FLORIA_AT_FLOWER_SHOP iftrue UnknownScript_0x1940b3 setevent EVENT_MET_FLORIA writetext UnknownText_0x1942f1 closetext loadmovesprites - clearevent EVENT_768 + clearevent EVENT_FLORIA_AT_FLOWER_SHOP checkcode VAR_FACING if_equal $1, UnknownScript_0x1940ac applymovement $9, MovementData_0x19424e @@ -162,33 +162,17 @@ UnknownScript_0x1940ee: end TrainerSchoolboyAlan1: - ; bit/flag number - dw EVENT_BEAT_SCHOOLBOY_ALAN - - ; trainer group && trainer id - db SCHOOLBOY, ALAN1 - - ; text when seen - dw SchoolboyAlan1SeenText - - ; text when trainer beaten - dw SchoolboyAlan1BeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw SchoolboyAlan1Script + trainer EVENT_BEAT_SCHOOLBOY_ALAN, SCHOOLBOY, ALAN1, SchoolboyAlan1SeenText, SchoolboyAlan1BeatenText, $0000, SchoolboyAlan1Script SchoolboyAlan1Script: - writecode VAR_CALLERID, $18 + writecode VAR_CALLERID, PHONE_SCHOOLBOY_ALAN talkaftercancel loadfont checkflag ENGINE_ALAN iftrue UnknownScript_0x194140 checkflag ENGINE_ALAN_HAS_FIRE_STONE iftrue UnknownScript_0x1941b4 - checkcellnum $18 + checkcellnum PHONE_SCHOOLBOY_ALAN iftrue UnknownScript_0x1941d5 checkevent EVENT_ALAN_ASKED_FOR_PHONE_NUMBER iftrue UnknownScript_0x194129 @@ -201,7 +185,7 @@ SchoolboyAlan1Script: UnknownScript_0x194129: scall UnknownScript_0x1941cd UnknownScript_0x19412c: - askforphonenumber $18 + askforphonenumber PHONE_SCHOOLBOY_ALAN if_equal $1, UnknownScript_0x1941dd if_equal $2, UnknownScript_0x1941d9 trainertotext SCHOOLBOY, ALAN1, $0 @@ -273,7 +257,7 @@ UnknownScript_0x1941b4: verbosegiveitem FIRE_STONE, 1 iffalse UnknownScript_0x1941c6 clearflag ENGINE_ALAN_HAS_FIRE_STONE - setevent EVENT_101 + setevent EVENT_ALAN_GAVE_FIRE_STONE jump UnknownScript_0x1941d5 UnknownScript_0x1941c6: @@ -316,23 +300,7 @@ UnknownScript_0x1941e9: end TrainerPsychicMark: - ; bit/flag number - dw EVENT_BEAT_PSYCHIC_MARK - - ; trainer group && trainer id - db PSYCHIC_T, MARK - - ; text when seen - dw PsychicMarkSeenText - - ; text when trainer beaten - dw PsychicMarkBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw PsychicMarkScript + trainer EVENT_BEAT_PSYCHIC_MARK, PSYCHIC_T, MARK, PsychicMarkSeenText, PsychicMarkBeatenText, $0000, PsychicMarkScript PsychicMarkScript: talkaftercancel @@ -690,33 +658,33 @@ Route36_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 4 warp_def $8, $12, 3, GROUP_ROUTE_36_NATIONAL_PARK_GATE, MAP_ROUTE_36_NATIONAL_PARK_GATE warp_def $9, $12, 4, GROUP_ROUTE_36_NATIONAL_PARK_GATE, MAP_ROUTE_36_NATIONAL_PARK_GATE warp_def $d, $2f, 1, GROUP_ROUTE_36_RUINS_OF_ALPH_GATE, MAP_ROUTE_36_RUINS_OF_ALPH_GATE warp_def $d, $30, 2, GROUP_ROUTE_36_RUINS_OF_ALPH_GATE, MAP_ROUTE_36_RUINS_OF_ALPH_GATE - ; xy triggers +.XYTriggers: db 2 xy_trigger 1, $7, $14, $0, UnknownScript_0x19401b, $0, $0 xy_trigger 1, $7, $16, $0, UnknownScript_0x19401b, $0, $0 - ; signposts +.Signposts: db 4 - signpost 1, 29, $0, MapRoute36Signpost0Script - signpost 11, 45, $0, MapRoute36Signpost1Script - signpost 7, 55, $0, MapRoute36Signpost2Script - signpost 7, 21, $0, MapRoute36Signpost3Script + signpost 1, 29, SIGNPOST_READ, MapRoute36Signpost0Script + signpost 11, 45, SIGNPOST_READ, MapRoute36Signpost1Script + signpost 7, 55, SIGNPOST_READ, MapRoute36Signpost2Script + signpost 7, 21, SIGNPOST_READ, MapRoute36Signpost3Script - ; people-events +.PersonEvents: db 9 - person_event SPRITE_YOUNGSTER, 17, 24, $9, $0, 255, 255, $92, 3, TrainerPsychicMark, -1 - person_event SPRITE_YOUNGSTER, 18, 35, $8, $0, 255, 255, $92, 5, TrainerSchoolboyAlan1, -1 - person_event SPRITE_WEIRD_TREE, 13, 39, $17, $0, 255, 255, $0, 0, WeirdTreeScript_0x19403c, EVENT_6F8 - person_event SPRITE_LASS, 12, 55, $5, $2, 255, 255, $0, 0, LassScript_0x1940e0, -1 - person_event SPRITE_FISHER, 13, 48, $8, $0, 255, 255, $0, 0, FisherScript_0x1940b9, -1 - person_event SPRITE_FRUIT_TREE, 8, 25, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x194247, -1 - person_event SPRITE_YOUNGSTER, 10, 50, $2, $11, 255, 255, $0, 0, ArthurScript, EVENT_75A - person_event SPRITE_LASS, 16, 37, $6, $0, 255, 255, $90, 0, LassScript_0x19408c, EVENT_FLORIA_AT_SUDOWOODO - person_event SPRITE_SUICUNE, 10, 25, $1, $0, 255, 255, $90, 0, ObjectEvent, EVENT_SAW_SUICUNE_ON_ROUTE_36 + person_event SPRITE_YOUNGSTER, 17, 24, OW_LEFT | $1, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 3, TrainerPsychicMark, -1 + person_event SPRITE_YOUNGSTER, 18, 35, OW_LEFT | $0, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 5, TrainerSchoolboyAlan1, -1 + person_event SPRITE_WEIRD_TREE, 13, 39, OW_UP | $13, $0, -1, -1, $0, 0, WeirdTreeScript_0x19403c, EVENT_ROUTE_36_SUDOWOODO + person_event SPRITE_LASS, 12, 55, OW_UP | $1, $2, -1, -1, $0, 0, LassScript_0x1940e0, -1 + person_event SPRITE_FISHER, 13, 48, OW_LEFT | $0, $0, -1, -1, $0, 0, FisherScript_0x1940b9, -1 + person_event SPRITE_FRUIT_TREE, 8, 25, OW_DOWN | $1, $0, -1, -1, $0, 0, FruitTreeScript_0x194247, -1 + person_event SPRITE_YOUNGSTER, 10, 50, OW_DOWN | $2, $11, -1, -1, $0, 0, ArthurScript, EVENT_ROUTE_36_ARTHUR_OF_THURSDAY + person_event SPRITE_LASS, 16, 37, OW_UP | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, LassScript_0x19408c, EVENT_FLORIA_AT_SUDOWOODO + person_event SPRITE_SUICUNE, 10, 25, OW_DOWN | $1, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, ObjectEvent, EVENT_SAW_SUICUNE_ON_ROUTE_36 diff --git a/maps/Route36NationalParkgate.asm b/maps/Route36NationalParkgate.asm index d7fe698a7..49a869255 100644 --- a/maps/Route36NationalParkgate.asm +++ b/maps/Route36NationalParkgate.asm @@ -1,5 +1,5 @@ Route36NationalParkgate_MapScriptHeader: - ; trigger count +.MapTriggers: db 3 ; triggers @@ -7,7 +7,7 @@ Route36NationalParkgate_MapScriptHeader: dw UnknownScript_0x6ab12, $0000 dw UnknownScript_0x6ab13, $0000 - ; callback count +.MapCallbacks: db 2 ; callbacks @@ -37,7 +37,7 @@ UnknownScript_0x6ab20: return UnknownScript_0x6ab23: - checkevent EVENT_2D2 + checkevent EVENT_WARPED_FROM_ROUTE_35_NATIONAL_PARK_GATE iftrue UnknownScript_0x6ab46 checkcode VAR_WEEKDAY if_equal TUESDAY, UnknownScript_0x6ab42 @@ -67,14 +67,14 @@ UnknownScript_0x6ab47: writetext UnknownText_0x6b2c5 closetext loadmovesprites - special Function8c0b6 - special Functiond91 + special Special_FadeBlackQuickly + special Special_ReloadSpritesNoPalettes scall UnknownScript_0x6ab8c disappear $2 appear $d applymovement $0, MovementData_0x6add1 pause 15 - special Function8c0ab + special Special_FadeInQuickly jumpstd bugcontestresults UnknownScript_0x6ab76: @@ -83,53 +83,53 @@ UnknownScript_0x6ab76: loadmovesprites spriteface $0, LEFT playsound SFX_EXIT_BUILDING - special Function8c084 + special FadeBlackBGMap waitbutton warpfacing $2, GROUP_NATIONAL_PARK_BUG_CONTEST, MAP_NATIONAL_PARK_BUG_CONTEST, $21, $12 end UnknownScript_0x6ab8c: - checkevent EVENT_716 + checkevent EVENT_BUG_CATCHING_CONTESTANT_1A iftrue UnknownScript_0x6ab94 appear $3 UnknownScript_0x6ab94: - checkevent EVENT_717 + checkevent EVENT_BUG_CATCHING_CONTESTANT_2A iftrue UnknownScript_0x6ab9c appear $4 UnknownScript_0x6ab9c: - checkevent EVENT_718 + checkevent EVENT_BUG_CATCHING_CONTESTANT_3A iftrue UnknownScript_0x6aba4 appear $5 UnknownScript_0x6aba4: - checkevent EVENT_719 + checkevent EVENT_BUG_CATCHING_CONTESTANT_4A iftrue UnknownScript_0x6abac appear $6 UnknownScript_0x6abac: - checkevent EVENT_71A + checkevent EVENT_BUG_CATCHING_CONTESTANT_5A iftrue UnknownScript_0x6abb4 appear $7 UnknownScript_0x6abb4: - checkevent EVENT_71B + checkevent EVENT_BUG_CATCHING_CONTESTANT_6A iftrue UnknownScript_0x6abbc appear $8 UnknownScript_0x6abbc: - checkevent EVENT_71C + checkevent EVENT_BUG_CATCHING_CONTESTANT_7A iftrue UnknownScript_0x6abc4 appear $9 UnknownScript_0x6abc4: - checkevent EVENT_71D + checkevent EVENT_BUG_CATCHING_CONTESTANT_8A iftrue UnknownScript_0x6abcc appear $a UnknownScript_0x6abcc: - checkevent EVENT_71E + checkevent EVENT_BUG_CATCHING_CONTESTANT_9A iftrue UnknownScript_0x6abd4 appear $b UnknownScript_0x6abd4: - checkevent EVENT_71F + checkevent EVENT_BUG_CATCHING_CONTESTANT_10A iftrue UnknownScript_0x6abdc appear $c UnknownScript_0x6abdc: - special Function1ad2 + special DrawOnMap end OfficerScript_0x6abe0: @@ -140,7 +140,7 @@ OfficerScript_0x6abe0: if_equal FRIDAY, UnknownScript_0x6acf1 faceplayer loadfont - checkflag ENGINE_51 + checkflag ENGINE_DAILY_BUG_CONTEST iftrue UnknownScript_0x6ac91 scall UnknownScript_0x6ad02 writetext UnknownText_0x6add5 @@ -148,8 +148,8 @@ OfficerScript_0x6abe0: iffalse UnknownScript_0x6ac73 checkcode VAR_PARTYCOUNT if_greater_than $1, UnknownScript_0x6ac41 - special Function13a12 - clearevent EVENT_308 + special CheckFirstMonFainted + clearevent EVENT_LEFT_MONS_WITH_CONTEST_OFFICER UnknownScript_0x6ac10: setflag ENGINE_BUG_CONTEST_TIMER special PlayMapMusic @@ -163,12 +163,12 @@ UnknownScript_0x6ac10: closetext loadmovesprites setflag ENGINE_BUG_CONTEST_TIMER - special Function135db + special Special_GiveParkBalls spriteface $0, LEFT playsound SFX_EXIT_BUILDING - special Function8c084 + special FadeBlackBGMap waitbutton - special Function139a8 + special Special_SelectRandomBugContestContestants warpfacing $2, GROUP_NATIONAL_PARK_BUG_CONTEST, MAP_NATIONAL_PARK_BUG_CONTEST, $21, $12 end @@ -183,9 +183,9 @@ UnknownScript_0x6ac4d: writetext UnknownText_0x6afb0 yesorno iffalse UnknownScript_0x6ac79 - special Function13a12 + special CheckFirstMonFainted iftrue UnknownScript_0x6ac7f - setevent EVENT_308 + setevent EVENT_LEFT_MONS_WITH_CONTEST_OFFICER writetext UnknownText_0x6b021 keeptextopen writetext UnknownText_0x6b055 @@ -225,13 +225,13 @@ UnknownScript_0x6ac8b: end UnknownScript_0x6ac91: - checkevent EVENT_313 + checkevent EVENT_CONTEST_OFFICER_HAS_SUN_STONE iftrue UnknownScript_0x6acaf - checkevent EVENT_314 + checkevent EVENT_CONTEST_OFFICER_HAS_EVERSTONE iftrue UnknownScript_0x6acbe - checkevent EVENT_315 + checkevent EVENT_CONTEST_OFFICER_HAS_GOLD_BERRY iftrue UnknownScript_0x6accd - checkevent EVENT_316 + checkevent EVENT_CONTEST_OFFICER_HAS_BERRY iftrue UnknownScript_0x6acdc writetext UnknownText_0x6b32b closetext @@ -243,7 +243,7 @@ UnknownScript_0x6acaf: keeptextopen verbosegiveitem SUN_STONE, 1 iffalse UnknownScript_0x6aceb - clearevent EVENT_313 + clearevent EVENT_CONTEST_OFFICER_HAS_SUN_STONE loadmovesprites end @@ -252,7 +252,7 @@ UnknownScript_0x6acbe: keeptextopen verbosegiveitem EVERSTONE, 1 iffalse UnknownScript_0x6aceb - clearevent EVENT_314 + clearevent EVENT_CONTEST_OFFICER_HAS_EVERSTONE loadmovesprites end @@ -261,7 +261,7 @@ UnknownScript_0x6accd: keeptextopen verbosegiveitem GOLD_BERRY, 1 iffalse UnknownScript_0x6aceb - clearevent EVENT_315 + clearevent EVENT_CONTEST_OFFICER_HAS_GOLD_BERRY loadmovesprites end @@ -270,7 +270,7 @@ UnknownScript_0x6acdc: keeptextopen verbosegiveitem BERRY, 1 iffalse UnknownScript_0x6aceb - clearevent EVENT_316 + clearevent EVENT_CONTEST_OFFICER_HAS_BERRY loadmovesprites end @@ -286,7 +286,7 @@ UnknownScript_0x6acf1: OfficerScript_0x6acf4: faceplayer loadfont - checkflag ENGINE_51 + checkflag ENGINE_DAILY_BUG_CONTEST iftrue UnknownScript_0x6ac91 writetext UnknownText_0x6b370 closetext @@ -300,7 +300,7 @@ UnknownScript_0x6ad02: YoungsterScript_0x6ad06: faceplayer loadfont - checkevent EVENT_000 + checkevent EVENT_GAVE_KURT_APRICORNS iffalse UnknownScript_0x6ad14 writetext UnknownText_0x6b399 closetext @@ -316,7 +316,7 @@ UnknownScript_0x6ad14: YoungsterScript_0x6ad1a: faceplayer loadfont - checkevent EVENT_000 + checkevent EVENT_GAVE_KURT_APRICORNS iffalse UnknownScript_0x6ad28 writetext UnknownText_0x6b40f closetext @@ -332,7 +332,7 @@ UnknownScript_0x6ad28: RockerScript_0x6ad2e: faceplayer loadfont - checkevent EVENT_000 + checkevent EVENT_GAVE_KURT_APRICORNS iffalse UnknownScript_0x6ad3c writetext UnknownText_0x6b462 closetext @@ -348,7 +348,7 @@ UnknownScript_0x6ad3c: PokefanMScript_0x6ad42: faceplayer loadfont - checkevent EVENT_000 + checkevent EVENT_GAVE_KURT_APRICORNS iffalse UnknownScript_0x6ad50 writetext UnknownText_0x6b4da closetext @@ -364,7 +364,7 @@ UnknownScript_0x6ad50: YoungsterScript_0x6ad56: faceplayer loadfont - checkevent EVENT_000 + checkevent EVENT_GAVE_KURT_APRICORNS iffalse UnknownScript_0x6ad64 writetext UnknownText_0x6b54e closetext @@ -380,7 +380,7 @@ UnknownScript_0x6ad64: YoungsterScript_0x6ad6a: faceplayer loadfont - checkevent EVENT_000 + checkevent EVENT_GAVE_KURT_APRICORNS iffalse UnknownScript_0x6ad78 writetext UnknownText_0x6b5b0 closetext @@ -396,7 +396,7 @@ UnknownScript_0x6ad78: LassScript_0x6ad7e: faceplayer loadfont - checkevent EVENT_000 + checkevent EVENT_GAVE_KURT_APRICORNS iffalse UnknownScript_0x6ad8c writetext UnknownText_0x6b64b closetext @@ -412,7 +412,7 @@ UnknownScript_0x6ad8c: YoungsterScript_0x6ad92: faceplayer loadfont - checkevent EVENT_000 + checkevent EVENT_GAVE_KURT_APRICORNS iffalse UnknownScript_0x6ada0 writetext UnknownText_0x6b6b8 closetext @@ -428,7 +428,7 @@ UnknownScript_0x6ada0: YoungsterScript_0x6ada6: faceplayer loadfont - checkevent EVENT_000 + checkevent EVENT_GAVE_KURT_APRICORNS iffalse UnknownScript_0x6adb4 writetext UnknownText_0x6b71b closetext @@ -444,7 +444,7 @@ UnknownScript_0x6adb4: YoungsterScript_0x6adba: faceplayer loadfont - checkevent EVENT_000 + checkevent EVENT_GAVE_KURT_APRICORNS iffalse UnknownScript_0x6adc8 writetext UnknownText_0x6b76f closetext @@ -846,31 +846,31 @@ Route36NationalParkgate_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 4 warp_def $4, $0, 1, GROUP_NATIONAL_PARK, MAP_NATIONAL_PARK warp_def $5, $0, 2, GROUP_NATIONAL_PARK, MAP_NATIONAL_PARK warp_def $4, $9, 1, GROUP_ROUTE_36, MAP_ROUTE_36 warp_def $5, $9, 2, GROUP_ROUTE_36, MAP_ROUTE_36 - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 1 - signpost 0, 6, $0, MapRoute36NationalParkgateSignpost0Script + signpost 0, 6, SIGNPOST_READ, MapRoute36NationalParkgateSignpost0Script - ; people-events +.PersonEvents: db 12 - person_event SPRITE_OFFICER, 7, 4, $6, $0, 255, 255, $a0, 0, OfficerScript_0x6abe0, EVENT_747 - person_event SPRITE_YOUNGSTER, 9, 6, $7, $0, 255, 255, $80, 0, YoungsterScript_0x6ad06, EVENT_720 - person_event SPRITE_YOUNGSTER, 9, 8, $7, $0, 255, 255, $a0, 0, YoungsterScript_0x6ad1a, EVENT_721 - person_event SPRITE_ROCKER, 10, 6, $7, $0, 255, 255, $90, 0, RockerScript_0x6ad2e, EVENT_722 - person_event SPRITE_POKEFAN_M, 9, 10, $7, $0, 255, 255, $b0, 0, PokefanMScript_0x6ad42, EVENT_723 - person_event SPRITE_YOUNGSTER, 11, 6, $7, $0, 255, 255, $80, 0, YoungsterScript_0x6ad56, EVENT_724 - person_event SPRITE_YOUNGSTER, 10, 9, $7, $0, 255, 255, $a0, 0, YoungsterScript_0x6ad6a, EVENT_725 - person_event SPRITE_LASS, 10, 7, $7, $0, 255, 255, $90, 0, LassScript_0x6ad7e, EVENT_726 - person_event SPRITE_YOUNGSTER, 11, 8, $7, $0, 255, 255, $80, 0, YoungsterScript_0x6ad92, EVENT_727 - person_event SPRITE_YOUNGSTER, 11, 10, $7, $0, 255, 255, $a0, 0, YoungsterScript_0x6ada6, EVENT_728 - person_event SPRITE_YOUNGSTER, 10, 10, $7, $0, 255, 255, $90, 0, YoungsterScript_0x6adba, EVENT_729 - person_event SPRITE_OFFICER, 6, 7, $6, $0, 255, 255, $a0, 0, OfficerScript_0x6acf4, EVENT_748 + person_event SPRITE_OFFICER, 7, 4, OW_UP | $2, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, OfficerScript_0x6abe0, EVENT_ROUTE_36_NATIONAL_PARK_GATE_OFFICER_CONTEST_DAY + person_event SPRITE_YOUNGSTER, 9, 6, OW_UP | $3, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, YoungsterScript_0x6ad06, EVENT_BUG_CATCHING_CONTESTANT_1B + person_event SPRITE_YOUNGSTER, 9, 8, OW_UP | $3, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, YoungsterScript_0x6ad1a, EVENT_BUG_CATCHING_CONTESTANT_2B + person_event SPRITE_ROCKER, 10, 6, OW_UP | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, RockerScript_0x6ad2e, EVENT_BUG_CATCHING_CONTESTANT_3B + person_event SPRITE_POKEFAN_M, 9, 10, OW_UP | $3, $0, -1, -1, (PAL_OW_BROWN << 4) | $80, 0, PokefanMScript_0x6ad42, EVENT_BUG_CATCHING_CONTESTANT_4B + person_event SPRITE_YOUNGSTER, 11, 6, OW_UP | $3, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, YoungsterScript_0x6ad56, EVENT_BUG_CATCHING_CONTESTANT_5B + person_event SPRITE_YOUNGSTER, 10, 9, OW_UP | $3, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, YoungsterScript_0x6ad6a, EVENT_BUG_CATCHING_CONTESTANT_6B + person_event SPRITE_LASS, 10, 7, OW_UP | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, LassScript_0x6ad7e, EVENT_BUG_CATCHING_CONTESTANT_7B + person_event SPRITE_YOUNGSTER, 11, 8, OW_UP | $3, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, YoungsterScript_0x6ad92, EVENT_BUG_CATCHING_CONTESTANT_8B + person_event SPRITE_YOUNGSTER, 11, 10, OW_UP | $3, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, YoungsterScript_0x6ada6, EVENT_BUG_CATCHING_CONTESTANT_9B + person_event SPRITE_YOUNGSTER, 10, 10, OW_UP | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, YoungsterScript_0x6adba, EVENT_BUG_CATCHING_CONTESTANT_10B + person_event SPRITE_OFFICER, 6, 7, OW_UP | $2, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, OfficerScript_0x6acf4, EVENT_ROUTE_36_NATIONAL_PARK_GATE_OFFICER_NOT_CONTEST_DAY diff --git a/maps/Route36RuinsofAlphgate.asm b/maps/Route36RuinsofAlphgate.asm index 7afba4134..4854e7f8b 100644 --- a/maps/Route36RuinsofAlphgate.asm +++ b/maps/Route36RuinsofAlphgate.asm @@ -1,8 +1,8 @@ Route36RuinsofAlphgate_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 OfficerScript_0x6aa1a: @@ -34,20 +34,20 @@ Route36RuinsofAlphgate_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 4 warp_def $0, $4, 3, GROUP_ROUTE_36, MAP_ROUTE_36 warp_def $0, $5, 4, GROUP_ROUTE_36, MAP_ROUTE_36 warp_def $7, $4, 9, GROUP_RUINS_OF_ALPH_OUTSIDE, MAP_RUINS_OF_ALPH_OUTSIDE warp_def $7, $5, 9, GROUP_RUINS_OF_ALPH_OUTSIDE, MAP_RUINS_OF_ALPH_OUTSIDE - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 2 - person_event SPRITE_OFFICER, 8, 4, $9, $0, 255, 255, $80, 0, OfficerScript_0x6aa1a, -1 - person_event SPRITE_GRAMPS, 9, 11, $2, $21, 255, 255, $b0, 0, GrampsScript_0x6aa1d, -1 + person_event SPRITE_OFFICER, 8, 4, OW_LEFT | $1, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, OfficerScript_0x6aa1a, -1 + person_event SPRITE_GRAMPS, 9, 11, OW_DOWN | $2, $21, -1, -1, (PAL_OW_BROWN << 4) | $80, 0, GrampsScript_0x6aa1d, -1 diff --git a/maps/Route37.asm b/maps/Route37.asm index d1a0369b9..9ad9576b1 100644 --- a/maps/Route37.asm +++ b/maps/Route37.asm @@ -1,8 +1,8 @@ Route37_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 1 ; callbacks @@ -20,23 +20,7 @@ SunnyCallback: return TrainerTwinsAnnandanne1: - ; bit/flag number - dw EVENT_BEAT_TWINS_ANN_AND_ANNE - - ; trainer group && trainer id - db TWINS, ANNANDANNE1 - - ; text when seen - dw TwinsAnnandanne1SeenText - - ; text when trainer beaten - dw TwinsAnnandanne1BeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw TwinsAnnandanne1Script + trainer EVENT_BEAT_TWINS_ANN_AND_ANNE, TWINS, ANNANDANNE1, TwinsAnnandanne1SeenText, TwinsAnnandanne1BeatenText, $0000, TwinsAnnandanne1Script TwinsAnnandanne1Script: talkaftercancel @@ -47,23 +31,7 @@ TwinsAnnandanne1Script: end TrainerTwinsAnnandanne2: - ; bit/flag number - dw EVENT_BEAT_TWINS_ANN_AND_ANNE - - ; trainer group && trainer id - db TWINS, ANNANDANNE2 - - ; text when seen - dw TwinsAnnandanne2SeenText - - ; text when trainer beaten - dw TwinsAnnandanne2BeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw TwinsAnnandanne2Script + trainer EVENT_BEAT_TWINS_ANN_AND_ANNE, TWINS, ANNANDANNE2, TwinsAnnandanne2SeenText, TwinsAnnandanne2BeatenText, $0000, TwinsAnnandanne2Script TwinsAnnandanne2Script: talkaftercancel @@ -74,23 +42,7 @@ TwinsAnnandanne2Script: end TrainerPsychicGreg: - ; bit/flag number - dw EVENT_BEAT_PSYCHIC_GREG - - ; trainer group && trainer id - db PSYCHIC_T, GREG - - ; text when seen - dw PsychicGregSeenText - - ; text when trainer beaten - dw PsychicGregBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw PsychicGregScript + trainer EVENT_BEAT_PSYCHIC_GREG, PSYCHIC_T, GREG, PsychicGregSeenText, PsychicGregBeatenText, $0000, PsychicGregScript PsychicGregScript: talkaftercancel @@ -156,8 +108,7 @@ FruitTreeScript_0x1a8e0d: fruittree $13 MapRoute37SignpostItem1: - dw $00a9 - db ETHER + dwb EVENT_ROUTE_37_HIDDEN_ETHER, ETHER TwinsAnnandanne1SeenText: @@ -285,23 +236,23 @@ Route37_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 0 - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 2 - signpost 3, 5, $0, MapRoute37Signpost0Script - signpost 2, 4, $7, MapRoute37SignpostItem1 + signpost 3, 5, SIGNPOST_READ, MapRoute37Signpost0Script + signpost 2, 4, SIGNPOST_ITEM, MapRoute37SignpostItem1 - ; people-events +.PersonEvents: db 7 - person_event SPRITE_WEIRD_TREE, 16, 10, $6, $0, 255, 255, $82, 1, TrainerTwinsAnnandanne1, -1 - person_event SPRITE_WEIRD_TREE, 16, 11, $6, $0, 255, 255, $82, 1, TrainerTwinsAnnandanne2, -1 - person_event SPRITE_YOUNGSTER, 10, 10, $a, $0, 255, 255, $92, 1, TrainerPsychicGreg, -1 - person_event SPRITE_FRUIT_TREE, 9, 17, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x1a8e09, -1 - person_event SPRITE_BUG_CATCHER, 12, 20, $2, $11, 255, 255, $0, 0, SunnyScript, EVENT_75B - person_event SPRITE_FRUIT_TREE, 9, 20, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x1a8e0b, -1 - person_event SPRITE_FRUIT_TREE, 11, 19, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x1a8e0d, -1 + person_event SPRITE_WEIRD_TREE, 16, 10, OW_UP | $2, $0, -1, -1, (PAL_OW_RED << 4) | $82, 1, TrainerTwinsAnnandanne1, -1 + person_event SPRITE_WEIRD_TREE, 16, 11, OW_UP | $2, $0, -1, -1, (PAL_OW_RED << 4) | $82, 1, TrainerTwinsAnnandanne2, -1 + person_event SPRITE_YOUNGSTER, 10, 10, OW_LEFT | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 1, TrainerPsychicGreg, -1 + person_event SPRITE_FRUIT_TREE, 9, 17, OW_DOWN | $1, $0, -1, -1, $0, 0, FruitTreeScript_0x1a8e09, -1 + person_event SPRITE_BUG_CATCHER, 12, 20, OW_DOWN | $2, $11, -1, -1, $0, 0, SunnyScript, EVENT_ROUTE_37_SUNNY_OF_SUNDAY + person_event SPRITE_FRUIT_TREE, 9, 20, OW_DOWN | $1, $0, -1, -1, $0, 0, FruitTreeScript_0x1a8e0b, -1 + person_event SPRITE_FRUIT_TREE, 11, 19, OW_DOWN | $1, $0, -1, -1, $0, 0, FruitTreeScript_0x1a8e0d, -1 diff --git a/maps/Route38.asm b/maps/Route38.asm index d7f61b22b..47b35d3bc 100644 --- a/maps/Route38.asm +++ b/maps/Route38.asm @@ -1,28 +1,12 @@ Route38_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 TrainerBird_keeperToby: - ; bit/flag number - dw EVENT_BEAT_BIRD_KEEPER_TOBY - - ; trainer group && trainer id - db BIRD_KEEPER, TOBY - - ; text when seen - dw Bird_keeperTobySeenText - - ; text when trainer beaten - dw Bird_keeperTobyBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw Bird_keeperTobyScript + trainer EVENT_BEAT_BIRD_KEEPER_TOBY, BIRD_KEEPER, TOBY, Bird_keeperTobySeenText, Bird_keeperTobyBeatenText, $0000, Bird_keeperTobyScript Bird_keeperTobyScript: talkaftercancel @@ -33,23 +17,7 @@ Bird_keeperTobyScript: end TrainerSailorHarry: - ; bit/flag number - dw EVENT_BEAT_SAILOR_HARRY - - ; trainer group && trainer id - db SAILOR, HARRY - - ; text when seen - dw SailorHarrySeenText - - ; text when trainer beaten - dw SailorHarryBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw SailorHarryScript + trainer EVENT_BEAT_SAILOR_HARRY, SAILOR, HARRY, SailorHarrySeenText, SailorHarryBeatenText, $0000, SailorHarryScript SailorHarryScript: talkaftercancel @@ -60,33 +28,17 @@ SailorHarryScript: end TrainerLassDana1: - ; bit/flag number - dw EVENT_BEAT_LASS_DANA - - ; trainer group && trainer id - db LASS, DANA1 - - ; text when seen - dw LassDana1SeenText - - ; text when trainer beaten - dw LassDana1BeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw LassDana1Script + trainer EVENT_BEAT_LASS_DANA, LASS, DANA1, LassDana1SeenText, LassDana1BeatenText, $0000, LassDana1Script LassDana1Script: - writecode VAR_CALLERID, $1a + writecode VAR_CALLERID, PHONE_LASS_DANA talkaftercancel loadfont checkflag ENGINE_DANA iftrue UnknownScript_0x1a1d82 - checkflag ENGINE_LIZ_HAS_THUNDERSTONE + checkflag ENGINE_DANA_HAS_THUNDERSTONE iftrue UnknownScript_0x1a1df6 - checkcellnum $1a + checkcellnum PHONE_LASS_DANA iftrue UnknownScript_0x1a1e17 checkevent EVENT_DANA_ASKED_FOR_PHONE_NUMBER iftrue UnknownScript_0x1a1d6b @@ -99,7 +51,7 @@ LassDana1Script: UnknownScript_0x1a1d6b: scall UnknownScript_0x1a1e0f UnknownScript_0x1a1d6e: - askforphonenumber $1a + askforphonenumber PHONE_LASS_DANA if_equal $1, UnknownScript_0x1a1e1f if_equal $2, UnknownScript_0x1a1e1b trainertotext LASS, DANA1, $0 @@ -170,8 +122,8 @@ UnknownScript_0x1a1df6: scall UnknownScript_0x1a1e27 verbosegiveitem THUNDERSTONE, 1 iffalse UnknownScript_0x1a1e08 - clearflag ENGINE_LIZ_HAS_THUNDERSTONE - setevent EVENT_102 + clearflag ENGINE_DANA_HAS_THUNDERSTONE + setevent EVENT_DANA_GAVE_THUNDERSTONE jump UnknownScript_0x1a1e17 UnknownScript_0x1a1e08: @@ -214,31 +166,15 @@ UnknownScript_0x1a1e2b: end TrainerSchoolboyChad1: - ; bit/flag number - dw EVENT_BEAT_SCHOOLBOY_CHAD - - ; trainer group && trainer id - db SCHOOLBOY, CHAD1 - - ; text when seen - dw SchoolboyChad1SeenText - - ; text when trainer beaten - dw SchoolboyChad1BeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw SchoolboyChad1Script + trainer EVENT_BEAT_SCHOOLBOY_CHAD, SCHOOLBOY, CHAD1, SchoolboyChad1SeenText, SchoolboyChad1BeatenText, $0000, SchoolboyChad1Script SchoolboyChad1Script: - writecode VAR_CALLERID, $1b + writecode VAR_CALLERID, PHONE_SCHOOLBOY_CHAD talkaftercancel loadfont checkflag ENGINE_CHAD iftrue UnknownScript_0x1a1e75 - checkcellnum $1b + checkcellnum PHONE_SCHOOLBOY_CHAD iftrue UnknownScript_0x1a1ef5 checkevent EVENT_CHAD_ASKED_FOR_PHONE_NUMBER iftrue UnknownScript_0x1a1e5e @@ -251,7 +187,7 @@ SchoolboyChad1Script: UnknownScript_0x1a1e5e: scall UnknownScript_0x1a1eed UnknownScript_0x1a1e61: - askforphonenumber $1b + askforphonenumber PHONE_SCHOOLBOY_CHAD if_equal $1, UnknownScript_0x1a1efd if_equal $2, UnknownScript_0x1a1ef9 trainertotext SCHOOLBOY, CHAD1, $0 @@ -347,23 +283,7 @@ UnknownScript_0x1a1f01: end TrainerBeautyValerie: - ; bit/flag number - dw EVENT_BEAT_BEAUTY_VALERIE - - ; trainer group && trainer id - db BEAUTY, VALERIE - - ; text when seen - dw BeautyValerieSeenText - - ; text when trainer beaten - dw BeautyValerieBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw BeautyValerieScript + trainer EVENT_BEAT_BEAUTY_VALERIE, BEAUTY, VALERIE, BeautyValerieSeenText, BeautyValerieBeatenText, $0000, BeautyValerieScript BeautyValerieScript: talkaftercancel @@ -374,23 +294,7 @@ BeautyValerieScript: end TrainerBeautyOlivia: - ; bit/flag number - dw EVENT_BEAT_BEAUTY_OLIVIA - - ; trainer group && trainer id - db BEAUTY, OLIVIA - - ; text when seen - dw BeautyOliviaSeenText - - ; text when trainer beaten - dw BeautyOliviaBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw BeautyOliviaScript + trainer EVENT_BEAT_BEAUTY_OLIVIA, BEAUTY, OLIVIA, BeautyOliviaSeenText, BeautyOliviaBeatenText, $0000, BeautyOliviaScript BeautyOliviaScript: talkaftercancel @@ -563,25 +467,25 @@ Route38_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $8, $23, 1, GROUP_ROUTE_38_ECRUTEAK_GATE, MAP_ROUTE_38_ECRUTEAK_GATE warp_def $9, $23, 2, GROUP_ROUTE_38_ECRUTEAK_GATE, MAP_ROUTE_38_ECRUTEAK_GATE - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 2 - signpost 7, 33, $0, MapRoute38Signpost0Script - signpost 13, 5, $0, MapRoute38Signpost1Script + signpost 7, 33, SIGNPOST_READ, MapRoute38Signpost0Script + signpost 13, 5, SIGNPOST_READ, MapRoute38Signpost1Script - ; people-events +.PersonEvents: db 7 - person_event SPRITE_STANDING_YOUNGSTER, 5, 8, $9, $0, 255, 255, $92, 1, TrainerSchoolboyChad1, -1 - person_event SPRITE_LASS, 7, 19, $a, $0, 255, 255, $92, 2, TrainerLassDana1, -1 - person_event SPRITE_STANDING_YOUNGSTER, 19, 16, $a, $0, 255, 255, $92, 1, TrainerBird_keeperToby, -1 - person_event SPRITE_BUENA, 13, 23, $6, $0, 255, 255, $92, 1, TrainerBeautyValerie, -1 - person_event SPRITE_SAILOR, 9, 28, $1e, $0, 255, 255, $92, 2, TrainerSailorHarry, -1 - person_event SPRITE_FRUIT_TREE, 14, 16, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x1a1f33, -1 - person_event SPRITE_BUENA, 12, 9, $a, $0, 255, 255, $92, 1, TrainerBeautyOlivia, -1 + person_event SPRITE_STANDING_YOUNGSTER, 5, 8, OW_LEFT | $1, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 1, TrainerSchoolboyChad1, -1 + person_event SPRITE_LASS, 7, 19, OW_LEFT | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 2, TrainerLassDana1, -1 + person_event SPRITE_STANDING_YOUNGSTER, 19, 16, OW_LEFT | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 1, TrainerBird_keeperToby, -1 + person_event SPRITE_BUENA, 13, 23, OW_UP | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 1, TrainerBeautyValerie, -1 + person_event SPRITE_SAILOR, 9, 28, OW_RIGHT | $12, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 2, TrainerSailorHarry, -1 + person_event SPRITE_FRUIT_TREE, 14, 16, OW_DOWN | $1, $0, -1, -1, $0, 0, FruitTreeScript_0x1a1f33, -1 + person_event SPRITE_BUENA, 12, 9, OW_LEFT | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 1, TrainerBeautyOlivia, -1 diff --git a/maps/Route38EcruteakGate.asm b/maps/Route38EcruteakGate.asm index c0ead38aa..f5cf4d418 100644 --- a/maps/Route38EcruteakGate.asm +++ b/maps/Route38EcruteakGate.asm @@ -1,8 +1,8 @@ Route38EcruteakGate_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 OfficerScript_0x9cbd7: @@ -25,19 +25,19 @@ Route38EcruteakGate_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 4 warp_def $4, $0, 1, GROUP_ROUTE_38, MAP_ROUTE_38 warp_def $5, $0, 2, GROUP_ROUTE_38, MAP_ROUTE_38 warp_def $4, $9, 14, GROUP_ECRUTEAK_CITY, MAP_ECRUTEAK_CITY warp_def $5, $9, 15, GROUP_ECRUTEAK_CITY, MAP_ECRUTEAK_CITY - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 1 - person_event SPRITE_OFFICER, 6, 9, $6, $0, 255, 255, $80, 0, OfficerScript_0x9cbd7, -1 + person_event SPRITE_OFFICER, 6, 9, OW_UP | $2, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, OfficerScript_0x9cbd7, -1 diff --git a/maps/Route39.asm b/maps/Route39.asm index dc416a395..76a2b4c55 100644 --- a/maps/Route39.asm +++ b/maps/Route39.asm @@ -1,8 +1,8 @@ Route39_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 TaurosScript_0x1a5af5: @@ -14,31 +14,15 @@ TaurosScript_0x1a5af5: end TrainerPokefanmDerek1: - ; bit/flag number - dw EVENT_BEAT_POKEFANM_DEREK - - ; trainer group && trainer id - db POKEFANM, DEREK1 - - ; text when seen - dw PokefanmDerek1SeenText - - ; text when trainer beaten - dw PokefanmDerek1BeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw PokefanmDerek1Script + trainer EVENT_BEAT_POKEFANM_DEREK, POKEFANM, DEREK1, PokefanmDerek1SeenText, PokefanmDerek1BeatenText, $0000, PokefanmDerek1Script PokefanmDerek1Script: - writecode VAR_CALLERID, $1c + writecode VAR_CALLERID, PHONE_POKEFANM_DEREK talkaftercancel loadfont checkflag ENGINE_DEREK_HAS_NUGGET iftrue UnknownScript_0x1a5b4a - checkcellnum $1c + checkcellnum PHONE_POKEFANM_DEREK iftrue UnknownScript_0x1a5b6e checkpoke PIKACHU iffalse UnknownScript_0x1a5b5c @@ -53,7 +37,7 @@ PokefanmDerek1Script: UnknownScript_0x1a5b33: scall UnknownScript_0x1a5b66 UnknownScript_0x1a5b36: - askforphonenumber $1c + askforphonenumber PHONE_POKEFANM_DEREK if_equal $1, UnknownScript_0x1a5b76 if_equal $2, UnknownScript_0x1a5b72 trainertotext POKEFANM, DEREK1, $0 @@ -109,23 +93,7 @@ UnknownScript_0x1a5b7e: end TrainerPokefanfRuth: - ; bit/flag number - dw EVENT_BEAT_POKEFANF_RUTH - - ; trainer group && trainer id - db POKEFANF, RUTH - - ; text when seen - dw PokefanfRuthSeenText - - ; text when trainer beaten - dw PokefanfRuthBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw PokefanfRuthScript + trainer EVENT_BEAT_POKEFANF_RUTH, POKEFANF, RUTH, PokefanfRuthSeenText, PokefanfRuthBeatenText, $0000, PokefanfRuthScript PokefanfRuthScript: talkaftercancel @@ -136,23 +104,7 @@ PokefanfRuthScript: end TrainerSailorEugene: - ; bit/flag number - dw EVENT_BEAT_SAILOR_EUGENE - - ; trainer group && trainer id - db SAILOR, EUGENE - - ; text when seen - dw SailorEugeneSeenText - - ; text when trainer beaten - dw SailorEugeneBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw SailorEugeneScript + trainer EVENT_BEAT_SAILOR_EUGENE, SAILOR, EUGENE, SailorEugeneSeenText, SailorEugeneBeatenText, $0000, SailorEugeneScript SailorEugeneScript: talkaftercancel @@ -163,23 +115,7 @@ SailorEugeneScript: end TrainerPsychicNorman: - ; bit/flag number - dw EVENT_BEAT_PSYCHIC_NORMAN - - ; trainer group && trainer id - db PSYCHIC_T, NORMAN - - ; text when seen - dw PsychicNormanSeenText - - ; text when trainer beaten - dw PsychicNormanBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw PsychicNormanScript + trainer EVENT_BEAT_PSYCHIC_NORMAN, PSYCHIC_T, NORMAN, PsychicNormanSeenText, PsychicNormanBeatenText, $0000, PsychicNormanScript PsychicNormanScript: talkaftercancel @@ -232,8 +168,7 @@ FruitTreeScript_0x1a5bf4: fruittree $f MapRoute39SignpostItem3: - dw $00aa - db NUGGET + dwb EVENT_ROUTE_39_HIDDEN_NUGGET, NUGGET UnknownText_0x1a5bf9: @@ -401,30 +336,30 @@ Route39_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $3, $1, 1, GROUP_ROUTE_39_BARN, MAP_ROUTE_39_BARN warp_def $3, $5, 1, GROUP_ROUTE_39_FARMHOUSE, MAP_ROUTE_39_FARMHOUSE - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 4 - signpost 31, 5, $0, MapRoute39Signpost0Script - signpost 5, 9, $0, MapRoute39Signpost1Script - signpost 7, 15, $0, MapRoute39Signpost2Script - signpost 13, 5, $7, MapRoute39SignpostItem3 + signpost 31, 5, SIGNPOST_READ, MapRoute39Signpost0Script + signpost 5, 9, SIGNPOST_READ, MapRoute39Signpost1Script + signpost 7, 15, SIGNPOST_READ, MapRoute39Signpost2Script + signpost 13, 5, SIGNPOST_ITEM, MapRoute39SignpostItem3 - ; people-events +.PersonEvents: db 10 - person_event SPRITE_SAILOR, 33, 17, $8, $0, 255, 255, $92, 5, TrainerSailorEugene, -1 - person_event SPRITE_POKEFAN_M, 26, 14, $7, $0, 255, 255, $82, 4, TrainerPokefanmDerek1, -1 - person_event SPRITE_POKEFAN_F, 23, 15, $9, $0, 255, 255, $82, 4, TrainerPokefanfRuth, -1 - person_event SPRITE_TAUROS, 16, 7, $16, $0, 255, 255, $0, 0, TaurosScript_0x1a5af5, -1 - person_event SPRITE_TAUROS, 15, 10, $16, $0, 255, 255, $0, 0, TaurosScript_0x1a5af5, -1 - person_event SPRITE_TAUROS, 19, 8, $16, $0, 255, 255, $0, 0, TaurosScript_0x1a5af5, -1 - person_event SPRITE_TAUROS, 17, 12, $16, $0, 255, 255, $0, 0, TaurosScript_0x1a5af5, -1 - person_event SPRITE_STANDING_YOUNGSTER, 11, 17, $a, $0, 255, 255, $92, 1, TrainerPsychicNorman, -1 - person_event SPRITE_FRUIT_TREE, 7, 13, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x1a5bf4, -1 - person_event SPRITE_POKEFAN_F, 26, 8, $6, $0, 255, 255, $80, 0, PokefanFScript_0x1a5bbe, -1 + person_event SPRITE_SAILOR, 33, 17, OW_LEFT | $0, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 5, TrainerSailorEugene, -1 + person_event SPRITE_POKEFAN_M, 26, 14, OW_UP | $3, $0, -1, -1, (PAL_OW_RED << 4) | $82, 4, TrainerPokefanmDerek1, -1 + person_event SPRITE_POKEFAN_F, 23, 15, OW_LEFT | $1, $0, -1, -1, (PAL_OW_RED << 4) | $82, 4, TrainerPokefanfRuth, -1 + person_event SPRITE_TAUROS, 16, 7, OW_UP | $12, $0, -1, -1, $0, 0, TaurosScript_0x1a5af5, -1 + person_event SPRITE_TAUROS, 15, 10, OW_UP | $12, $0, -1, -1, $0, 0, TaurosScript_0x1a5af5, -1 + person_event SPRITE_TAUROS, 19, 8, OW_UP | $12, $0, -1, -1, $0, 0, TaurosScript_0x1a5af5, -1 + person_event SPRITE_TAUROS, 17, 12, OW_UP | $12, $0, -1, -1, $0, 0, TaurosScript_0x1a5af5, -1 + person_event SPRITE_STANDING_YOUNGSTER, 11, 17, OW_LEFT | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 1, TrainerPsychicNorman, -1 + person_event SPRITE_FRUIT_TREE, 7, 13, OW_DOWN | $1, $0, -1, -1, $0, 0, FruitTreeScript_0x1a5bf4, -1 + person_event SPRITE_POKEFAN_F, 26, 8, OW_UP | $2, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, PokefanFScript_0x1a5bbe, -1 diff --git a/maps/Route39Barn.asm b/maps/Route39Barn.asm index 305b49f47..11cab1d7f 100644 --- a/maps/Route39Barn.asm +++ b/maps/Route39Barn.asm @@ -1,8 +1,8 @@ Route39Barn_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 TwinScript_0x9cc76: @@ -187,19 +187,19 @@ Route39Barn_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $7, $3, 1, GROUP_ROUTE_39, MAP_ROUTE_39 warp_def $7, $4, 1, GROUP_ROUTE_39, MAP_ROUTE_39 - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 3 - person_event SPRITE_TWIN, 7, 6, $9, $0, 255, 255, $0, 0, TwinScript_0x9cc76, -1 - person_event SPRITE_TWIN, 7, 8, $8, $0, 255, 255, $a0, 0, TwinScript_0x9cc90, -1 - person_event SPRITE_TAUROS, 7, 7, $16, $0, 255, 255, $0, 0, TaurosScript_0x9ccaa, -1 + person_event SPRITE_TWIN, 7, 6, OW_LEFT | $1, $0, -1, -1, $0, 0, TwinScript_0x9cc76, -1 + person_event SPRITE_TWIN, 7, 8, OW_LEFT | $0, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, TwinScript_0x9cc90, -1 + person_event SPRITE_TAUROS, 7, 7, OW_UP | $12, $0, -1, -1, $0, 0, TaurosScript_0x9ccaa, -1 diff --git a/maps/Route39Farmhouse.asm b/maps/Route39Farmhouse.asm index c068cb65c..2e43e5635 100644 --- a/maps/Route39Farmhouse.asm +++ b/maps/Route39Farmhouse.asm @@ -1,8 +1,8 @@ Route39Farmhouse_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 PokefanMScript_0x9ceb4: @@ -192,20 +192,20 @@ Route39Farmhouse_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $7, $2, 2, GROUP_ROUTE_39, MAP_ROUTE_39 warp_def $7, $3, 2, GROUP_ROUTE_39, MAP_ROUTE_39 - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 2 - signpost 1, 0, $0, FarmhouseBookshelf - signpost 1, 1, $0, FarmhouseBookshelf + signpost 1, 0, SIGNPOST_READ, FarmhouseBookshelf + signpost 1, 1, SIGNPOST_READ, FarmhouseBookshelf - ; people-events +.PersonEvents: db 2 - person_event SPRITE_POKEFAN_M, 6, 7, $6, $0, 255, 255, $90, 0, PokefanMScript_0x9ceb4, -1 - person_event SPRITE_POKEFAN_F, 8, 9, $8, $0, 255, 255, $b0, 0, PokefanFScript_0x9cf0e, -1 + person_event SPRITE_POKEFAN_M, 6, 7, OW_UP | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, PokefanMScript_0x9ceb4, -1 + person_event SPRITE_POKEFAN_F, 8, 9, OW_LEFT | $0, $0, -1, -1, (PAL_OW_BROWN << 4) | $80, 0, PokefanFScript_0x9cf0e, -1 diff --git a/maps/Route4.asm b/maps/Route4.asm index cb5069682..df00a04c0 100644 --- a/maps/Route4.asm +++ b/maps/Route4.asm @@ -1,28 +1,12 @@ Route4_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 TrainerBird_keeperHank: - ; bit/flag number - dw EVENT_BEAT_BIRD_KEEPER_HANK - - ; trainer group && trainer id - db BIRD_KEEPER, HANK - - ; text when seen - dw Bird_keeperHankSeenText - - ; text when trainer beaten - dw Bird_keeperHankBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw Bird_keeperHankScript + trainer EVENT_BEAT_BIRD_KEEPER_HANK, BIRD_KEEPER, HANK, Bird_keeperHankSeenText, Bird_keeperHankBeatenText, $0000, Bird_keeperHankScript Bird_keeperHankScript: talkaftercancel @@ -33,23 +17,7 @@ Bird_keeperHankScript: end TrainerPicnickerHope: - ; bit/flag number - dw EVENT_BEAT_PICNICKER_HOPE - - ; trainer group && trainer id - db PICNICKER, HOPE - - ; text when seen - dw PicnickerHopeSeenText - - ; text when trainer beaten - dw PicnickerHopeBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw PicnickerHopeScript + trainer EVENT_BEAT_PICNICKER_HOPE, PICNICKER, HOPE, PicnickerHopeSeenText, PicnickerHopeBeatenText, $0000, PicnickerHopeScript PicnickerHopeScript: talkaftercancel @@ -60,23 +28,7 @@ PicnickerHopeScript: end TrainerPicnickerSharon: - ; bit/flag number - dw EVENT_BEAT_PICNICKER_SHARON - - ; trainer group && trainer id - db PICNICKER, SHARON - - ; text when seen - dw PicnickerSharonSeenText - - ; text when trainer beaten - dw PicnickerSharonBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw PicnickerSharonScript + trainer EVENT_BEAT_PICNICKER_SHARON, PICNICKER, SHARON, PicnickerSharonSeenText, PicnickerSharonBeatenText, $0000, PicnickerSharonScript PicnickerSharonScript: talkaftercancel @@ -93,8 +45,7 @@ ItemFragment_0x1ae20f: db HP_UP, 1 MapRoute4SignpostItem1: - dw $00f1 - db ULTRA_BALL + dwb EVENT_ROUTE_4_HIDDEN_ULTRA_BALL, ULTRA_BALL Bird_keeperHankSeenText: @@ -168,21 +119,21 @@ Route4_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 1 warp_def $5, $2, 2, GROUP_MOUNT_MOON, MAP_MOUNT_MOON - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 2 - signpost 7, 3, $0, MapRoute4Signpost0Script - signpost 3, 10, $7, MapRoute4SignpostItem1 + signpost 7, 3, SIGNPOST_READ, MapRoute4Signpost0Script + signpost 3, 10, SIGNPOST_ITEM, MapRoute4SignpostItem1 - ; people-events +.PersonEvents: db 4 - person_event SPRITE_YOUNGSTER, 13, 21, $6, $0, 255, 255, $92, 3, TrainerBird_keeperHank, -1 - person_event SPRITE_LASS, 12, 13, $8, $0, 255, 255, $a2, 4, TrainerPicnickerHope, -1 - person_event SPRITE_LASS, 10, 25, $9, $0, 255, 255, $a2, 4, TrainerPicnickerSharon, -1 - person_event SPRITE_POKE_BALL, 7, 30, $1, $0, 255, 255, $1, 0, ItemFragment_0x1ae20f, EVENT_787 + person_event SPRITE_YOUNGSTER, 13, 21, OW_UP | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 3, TrainerBird_keeperHank, -1 + person_event SPRITE_LASS, 12, 13, OW_LEFT | $0, $0, -1, -1, (PAL_OW_GREEN << 4) | $82, 4, TrainerPicnickerHope, -1 + person_event SPRITE_LASS, 10, 25, OW_LEFT | $1, $0, -1, -1, (PAL_OW_GREEN << 4) | $82, 4, TrainerPicnickerSharon, -1 + person_event SPRITE_POKE_BALL, 7, 30, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x1ae20f, EVENT_ROUTE_4_HP_UP diff --git a/maps/Route40.asm b/maps/Route40.asm index 9f8d5ea4e..6fd99ee3a 100644 --- a/maps/Route40.asm +++ b/maps/Route40.asm @@ -1,8 +1,8 @@ Route40_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 1 ; callbacks @@ -10,7 +10,7 @@ Route40_MapScriptHeader: dbw 2, MonicaCallback MonicaCallback: - clearevent EVENT_7CF + clearevent EVENT_BATTLE_TOWER_OUTSIDE_SAILOR checkcode VAR_WEEKDAY if_equal MONDAY, .MonicaAppears disappear $a @@ -21,23 +21,7 @@ MonicaCallback: return TrainerSwimmerfElaine: - ; bit/flag number - dw EVENT_BEAT_SWIMMERF_ELAINE - - ; trainer group && trainer id - db SWIMMERF, ELAINE - - ; text when seen - dw SwimmerfElaineSeenText - - ; text when trainer beaten - dw SwimmerfElaineBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw SwimmerfElaineScript + trainer EVENT_BEAT_SWIMMERF_ELAINE, SWIMMERF, ELAINE, SwimmerfElaineSeenText, SwimmerfElaineBeatenText, $0000, SwimmerfElaineScript SwimmerfElaineScript: talkaftercancel @@ -48,23 +32,7 @@ SwimmerfElaineScript: end TrainerSwimmerfPaula: - ; bit/flag number - dw EVENT_BEAT_SWIMMERF_PAULA - - ; trainer group && trainer id - db SWIMMERF, PAULA - - ; text when seen - dw SwimmerfPaulaSeenText - - ; text when trainer beaten - dw SwimmerfPaulaBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw SwimmerfPaulaScript + trainer EVENT_BEAT_SWIMMERF_PAULA, SWIMMERF, PAULA, SwimmerfPaulaSeenText, SwimmerfPaulaBeatenText, $0000, SwimmerfPaulaScript SwimmerfPaulaScript: talkaftercancel @@ -75,23 +43,7 @@ SwimmerfPaulaScript: end TrainerSwimmermSimon: - ; bit/flag number - dw EVENT_BEAT_SWIMMERM_SIMON - - ; trainer group && trainer id - db SWIMMERM, SIMON - - ; text when seen - dw SwimmermSimonSeenText - - ; text when trainer beaten - dw SwimmermSimonBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw SwimmermSimonScript + trainer EVENT_BEAT_SWIMMERM_SIMON, SWIMMERM, SIMON, SwimmermSimonSeenText, SwimmermSimonBeatenText, $0000, SwimmermSimonScript SwimmermSimonScript: talkaftercancel @@ -102,23 +54,7 @@ SwimmermSimonScript: end TrainerSwimmermRandall: - ; bit/flag number - dw EVENT_BEAT_SWIMMERM_RANDALL - - ; trainer group && trainer id - db SWIMMERM, RANDALL - - ; text when seen - dw SwimmermRandallSeenText - - ; text when trainer beaten - dw SwimmermRandallBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw SwimmermRandallScript + trainer EVENT_BEAT_SWIMMERM_RANDALL, SWIMMERM, RANDALL, SwimmermRandallSeenText, SwimmermRandallBeatenText, $0000, SwimmermRandallScript SwimmermRandallScript: talkaftercancel @@ -188,8 +124,7 @@ Route40Rock: jumpstd smashrock MapRoute40SignpostItem1: - dw $00ab - db HYPER_POTION + dwb EVENT_ROUTE_40_HIDDEN_HYPER_POTION, HYPER_POTION MovementData_0x1a621c: step_right @@ -395,29 +330,29 @@ Route40_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 1 warp_def $5, $9, 1, GROUP_ROUTE_40_BATTLE_TOWER_GATE, MAP_ROUTE_40_BATTLE_TOWER_GATE - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 2 - signpost 10, 14, $0, MapRoute40Signpost0Script - signpost 8, 7, $7, MapRoute40SignpostItem1 + signpost 10, 14, SIGNPOST_READ, MapRoute40Signpost0Script + signpost 8, 7, SIGNPOST_ITEM, MapRoute40SignpostItem1 - ; people-events +.PersonEvents: db 12 - person_event SPRITE_OLIVINE_RIVAL, 19, 18, $9, $0, 255, 255, $82, 4, TrainerSwimmermSimon, -1 - person_event SPRITE_OLIVINE_RIVAL, 34, 22, $8, $0, 255, 255, $82, 5, TrainerSwimmermRandall, -1 - person_event SPRITE_SWIMMER_GIRL, 23, 7, $9, $0, 255, 255, $a2, 4, TrainerSwimmerfElaine, -1 - person_event SPRITE_SWIMMER_GIRL, 29, 14, $1f, $0, 255, 255, $a2, 3, TrainerSwimmerfPaula, -1 - person_event SPRITE_ROCK, 15, 11, $18, $0, 255, 255, $0, 0, Route40Rock, -1 - person_event SPRITE_ROCK, 13, 10, $18, $0, 255, 255, $0, 0, Route40Rock, -1 - person_event SPRITE_ROCK, 12, 11, $18, $0, 255, 255, $0, 0, Route40Rock, -1 - person_event SPRITE_LASS, 17, 15, $6, $0, 255, 255, $0, 0, LassScript_0x1a61c4, -1 - person_event SPRITE_BUENA, 14, 12, $3, $0, 255, 255, $0, 0, MonicaScript, EVENT_75E - person_event SPRITE_POKEFAN_M, 10, 11, $9, $0, 255, 255, $0, 0, PokefanMScript_0x1a61c7, -1 - person_event SPRITE_LASS, 8, 17, $3, $0, 255, 255, $a0, 0, LassScript_0x1a61d3, -1 - person_event SPRITE_STANDING_YOUNGSTER, 13, 20, $3, $0, 255, 255, $90, 0, StandingYoungsterScript_0x1a61d6, EVENT_7CF + person_event SPRITE_OLIVINE_RIVAL, 19, 18, OW_LEFT | $1, $0, -1, -1, (PAL_OW_RED << 4) | $82, 4, TrainerSwimmermSimon, -1 + person_event SPRITE_OLIVINE_RIVAL, 34, 22, OW_LEFT | $0, $0, -1, -1, (PAL_OW_RED << 4) | $82, 5, TrainerSwimmermRandall, -1 + person_event SPRITE_SWIMMER_GIRL, 23, 7, OW_LEFT | $1, $0, -1, -1, (PAL_OW_GREEN << 4) | $82, 4, TrainerSwimmerfElaine, -1 + person_event SPRITE_SWIMMER_GIRL, 29, 14, OW_RIGHT | $13, $0, -1, -1, (PAL_OW_GREEN << 4) | $82, 3, TrainerSwimmerfPaula, -1 + person_event SPRITE_ROCK, 15, 11, OW_LEFT | $10, $0, -1, -1, $0, 0, Route40Rock, -1 + person_event SPRITE_ROCK, 13, 10, OW_LEFT | $10, $0, -1, -1, $0, 0, Route40Rock, -1 + person_event SPRITE_ROCK, 12, 11, OW_LEFT | $10, $0, -1, -1, $0, 0, Route40Rock, -1 + person_event SPRITE_LASS, 17, 15, OW_UP | $2, $0, -1, -1, $0, 0, LassScript_0x1a61c4, -1 + person_event SPRITE_BUENA, 14, 12, OW_DOWN | $3, $0, -1, -1, $0, 0, MonicaScript, EVENT_ROUTE_40_MONICA_OF_MONDAY + person_event SPRITE_POKEFAN_M, 10, 11, OW_LEFT | $1, $0, -1, -1, $0, 0, PokefanMScript_0x1a61c7, -1 + person_event SPRITE_LASS, 8, 17, OW_DOWN | $3, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, LassScript_0x1a61d3, -1 + person_event SPRITE_STANDING_YOUNGSTER, 13, 20, OW_DOWN | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, StandingYoungsterScript_0x1a61d6, EVENT_BATTLE_TOWER_OUTSIDE_SAILOR diff --git a/maps/Route40BattleTowerGate.asm b/maps/Route40BattleTowerGate.asm index 4f0d33d0b..f5905a9ba 100644 --- a/maps/Route40BattleTowerGate.asm +++ b/maps/Route40BattleTowerGate.asm @@ -1,8 +1,8 @@ Route40BattleTowerGate_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 1 ; callbacks @@ -10,7 +10,7 @@ Route40BattleTowerGate_MapScriptHeader: dbw 2, UnknownScript_0x9f665 UnknownScript_0x9f665: - clearevent EVENT_7CF + clearevent EVENT_BATTLE_TOWER_OUTSIDE_SAILOR return RockerScript_0x9f669: @@ -73,20 +73,20 @@ Route40BattleTowerGate_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 4 warp_def $7, $4, 1, GROUP_ROUTE_40, MAP_ROUTE_40 warp_def $7, $5, 1, GROUP_ROUTE_40, MAP_ROUTE_40 warp_def $0, $4, 1, GROUP_BATTLE_TOWER_OUTSIDE, MAP_BATTLE_TOWER_OUTSIDE warp_def $0, $5, 2, GROUP_BATTLE_TOWER_OUTSIDE, MAP_BATTLE_TOWER_OUTSIDE - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 2 - person_event SPRITE_ROCKER, 7, 7, $3, $0, 255, 255, $a0, 0, RockerScript_0x9f669, EVENT_7CF - person_event SPRITE_TWIN, 9, 11, $4, $10, 255, 255, $80, 0, TwinScript_0x9f66c, -1 + person_event SPRITE_ROCKER, 7, 7, OW_DOWN | $3, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, RockerScript_0x9f669, EVENT_BATTLE_TOWER_OUTSIDE_SAILOR + person_event SPRITE_TWIN, 9, 11, OW_UP | $0, $10, -1, -1, (PAL_OW_RED << 4) | $80, 0, TwinScript_0x9f66c, -1 diff --git a/maps/Route41.asm b/maps/Route41.asm index 1c626decb..a2fc0a74c 100644 --- a/maps/Route41.asm +++ b/maps/Route41.asm @@ -1,28 +1,12 @@ Route41_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 TrainerSwimmerfKaylee: - ; bit/flag number - dw EVENT_BEAT_SWIMMERF_KAYLEE - - ; trainer group && trainer id - db SWIMMERF, KAYLEE - - ; text when seen - dw SwimmerfKayleeSeenText - - ; text when trainer beaten - dw SwimmerfKayleeBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw SwimmerfKayleeScript + trainer EVENT_BEAT_SWIMMERF_KAYLEE, SWIMMERF, KAYLEE, SwimmerfKayleeSeenText, SwimmerfKayleeBeatenText, $0000, SwimmerfKayleeScript SwimmerfKayleeScript: talkaftercancel @@ -33,23 +17,7 @@ SwimmerfKayleeScript: end TrainerSwimmerfSusie: - ; bit/flag number - dw EVENT_BEAT_SWIMMERF_SUSIE - - ; trainer group && trainer id - db SWIMMERF, SUSIE - - ; text when seen - dw SwimmerfSusieSeenText - - ; text when trainer beaten - dw SwimmerfSusieBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw SwimmerfSusieScript + trainer EVENT_BEAT_SWIMMERF_SUSIE, SWIMMERF, SUSIE, SwimmerfSusieSeenText, SwimmerfSusieBeatenText, $0000, SwimmerfSusieScript SwimmerfSusieScript: talkaftercancel @@ -60,23 +28,7 @@ SwimmerfSusieScript: end TrainerSwimmerfDenise: - ; bit/flag number - dw EVENT_BEAT_SWIMMERF_DENISE - - ; trainer group && trainer id - db SWIMMERF, DENISE - - ; text when seen - dw SwimmerfDeniseSeenText - - ; text when trainer beaten - dw SwimmerfDeniseBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw SwimmerfDeniseScript + trainer EVENT_BEAT_SWIMMERF_DENISE, SWIMMERF, DENISE, SwimmerfDeniseSeenText, SwimmerfDeniseBeatenText, $0000, SwimmerfDeniseScript SwimmerfDeniseScript: talkaftercancel @@ -87,23 +39,7 @@ SwimmerfDeniseScript: end TrainerSwimmerfKara: - ; bit/flag number - dw EVENT_BEAT_SWIMMERF_KARA - - ; trainer group && trainer id - db SWIMMERF, KARA - - ; text when seen - dw SwimmerfKaraSeenText - - ; text when trainer beaten - dw SwimmerfKaraBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw SwimmerfKaraScript + trainer EVENT_BEAT_SWIMMERF_KARA, SWIMMERF, KARA, SwimmerfKaraSeenText, SwimmerfKaraBeatenText, $0000, SwimmerfKaraScript SwimmerfKaraScript: talkaftercancel @@ -114,23 +50,7 @@ SwimmerfKaraScript: end TrainerSwimmerfWendy: - ; bit/flag number - dw EVENT_BEAT_SWIMMERF_WENDY - - ; trainer group && trainer id - db SWIMMERF, WENDY - - ; text when seen - dw SwimmerfWendySeenText - - ; text when trainer beaten - dw SwimmerfWendyBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw SwimmerfWendyScript + trainer EVENT_BEAT_SWIMMERF_WENDY, SWIMMERF, WENDY, SwimmerfWendySeenText, SwimmerfWendyBeatenText, $0000, SwimmerfWendyScript SwimmerfWendyScript: talkaftercancel @@ -141,23 +61,7 @@ SwimmerfWendyScript: end TrainerSwimmermCharlie: - ; bit/flag number - dw EVENT_BEAT_SWIMMERM_CHARLIE - - ; trainer group && trainer id - db SWIMMERM, CHARLIE - - ; text when seen - dw SwimmermCharlieSeenText - - ; text when trainer beaten - dw SwimmermCharlieBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw SwimmermCharlieScript + trainer EVENT_BEAT_SWIMMERM_CHARLIE, SWIMMERM, CHARLIE, SwimmermCharlieSeenText, SwimmermCharlieBeatenText, $0000, SwimmermCharlieScript SwimmermCharlieScript: talkaftercancel @@ -168,23 +72,7 @@ SwimmermCharlieScript: end TrainerSwimmermGeorge: - ; bit/flag number - dw EVENT_BEAT_SWIMMERM_GEORGE - - ; trainer group && trainer id - db SWIMMERM, GEORGE - - ; text when seen - dw SwimmermGeorgeSeenText - - ; text when trainer beaten - dw SwimmermGeorgeBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw SwimmermGeorgeScript + trainer EVENT_BEAT_SWIMMERM_GEORGE, SWIMMERM, GEORGE, SwimmermGeorgeSeenText, SwimmermGeorgeBeatenText, $0000, SwimmermGeorgeScript SwimmermGeorgeScript: talkaftercancel @@ -195,23 +83,7 @@ SwimmermGeorgeScript: end TrainerSwimmermBerke: - ; bit/flag number - dw EVENT_BEAT_SWIMMERM_BERKE - - ; trainer group && trainer id - db SWIMMERM, BERKE - - ; text when seen - dw SwimmermBerkeSeenText - - ; text when trainer beaten - dw SwimmermBerkeBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw SwimmermBerkeScript + trainer EVENT_BEAT_SWIMMERM_BERKE, SWIMMERM, BERKE, SwimmermBerkeSeenText, SwimmermBerkeBeatenText, $0000, SwimmermBerkeScript SwimmermBerkeScript: talkaftercancel @@ -222,23 +94,7 @@ SwimmermBerkeScript: end TrainerSwimmermKirk: - ; bit/flag number - dw EVENT_BEAT_SWIMMERM_KIRK - - ; trainer group && trainer id - db SWIMMERM, KIRK - - ; text when seen - dw SwimmermKirkSeenText - - ; text when trainer beaten - dw SwimmermKirkBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw SwimmermKirkScript + trainer EVENT_BEAT_SWIMMERM_KIRK, SWIMMERM, KIRK, SwimmermKirkSeenText, SwimmermKirkBeatenText, $0000, SwimmermKirkScript SwimmermKirkScript: talkaftercancel @@ -249,23 +105,7 @@ SwimmermKirkScript: end TrainerSwimmermMathew: - ; bit/flag number - dw EVENT_BEAT_SWIMMERM_MATHEW - - ; trainer group && trainer id - db SWIMMERM, MATHEW - - ; text when seen - dw SwimmermMathewSeenText - - ; text when trainer beaten - dw SwimmermMathewBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw SwimmermMathewScript + trainer EVENT_BEAT_SWIMMERM_MATHEW, SWIMMERM, MATHEW, SwimmermMathewSeenText, SwimmermMathewBeatenText, $0000, SwimmermMathewScript SwimmermMathewScript: talkaftercancel @@ -280,8 +120,7 @@ Route41Rock: jumpstd smashrock MapRoute41SignpostItem0: - dw $00ac - db MAX_ETHER + dwb EVENT_ROUTE_41_HIDDEN_MAX_ETHER, MAX_ETHER SwimmermCharlieSeenText: text "The water's warm" @@ -494,29 +333,29 @@ Route41_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 4 warp_def $11, $c, 1, GROUP_WHIRL_ISLAND_NW, MAP_WHIRL_ISLAND_NW warp_def $13, $24, 1, GROUP_WHIRL_ISLAND_NE, MAP_WHIRL_ISLAND_NE warp_def $25, $c, 1, GROUP_WHIRL_ISLAND_SW, MAP_WHIRL_ISLAND_SW warp_def $2d, $24, 1, GROUP_WHIRL_ISLAND_SE, MAP_WHIRL_ISLAND_SE - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 1 - signpost 35, 9, $7, MapRoute41SignpostItem0 + signpost 35, 9, SIGNPOST_ITEM, MapRoute41SignpostItem0 - ; people-events +.PersonEvents: db 10 - person_event SPRITE_OLIVINE_RIVAL, 10, 36, $a, $0, 255, 255, $82, 3, TrainerSwimmermCharlie, -1 - person_event SPRITE_OLIVINE_RIVAL, 12, 50, $a, $0, 255, 255, $82, 3, TrainerSwimmermGeorge, -1 - person_event SPRITE_OLIVINE_RIVAL, 30, 24, $1e, $0, 255, 255, $82, 3, TrainerSwimmermBerke, -1 - person_event SPRITE_OLIVINE_RIVAL, 34, 36, $1f, $0, 255, 255, $82, 3, TrainerSwimmermKirk, -1 - person_event SPRITE_OLIVINE_RIVAL, 50, 23, $1e, $0, 255, 255, $82, 3, TrainerSwimmermMathew, -1 - person_event SPRITE_SWIMMER_GIRL, 8, 21, $a, $0, 255, 255, $a2, 3, TrainerSwimmerfKaylee, -1 - person_event SPRITE_SWIMMER_GIRL, 23, 27, $7, $0, 255, 255, $a2, 3, TrainerSwimmerfSusie, -1 - person_event SPRITE_SWIMMER_GIRL, 38, 31, $8, $0, 255, 255, $a2, 3, TrainerSwimmerfDenise, -1 - person_event SPRITE_SWIMMER_GIRL, 32, 48, $9, $0, 255, 255, $a2, 4, TrainerSwimmerfKara, -1 - person_event SPRITE_SWIMMER_GIRL, 54, 13, $a, $0, 255, 255, $a2, 2, TrainerSwimmerfWendy, -1 + person_event SPRITE_OLIVINE_RIVAL, 10, 36, OW_LEFT | $2, $0, -1, -1, (PAL_OW_RED << 4) | $82, 3, TrainerSwimmermCharlie, -1 + person_event SPRITE_OLIVINE_RIVAL, 12, 50, OW_LEFT | $2, $0, -1, -1, (PAL_OW_RED << 4) | $82, 3, TrainerSwimmermGeorge, -1 + person_event SPRITE_OLIVINE_RIVAL, 30, 24, OW_RIGHT | $12, $0, -1, -1, (PAL_OW_RED << 4) | $82, 3, TrainerSwimmermBerke, -1 + person_event SPRITE_OLIVINE_RIVAL, 34, 36, OW_RIGHT | $13, $0, -1, -1, (PAL_OW_RED << 4) | $82, 3, TrainerSwimmermKirk, -1 + person_event SPRITE_OLIVINE_RIVAL, 50, 23, OW_RIGHT | $12, $0, -1, -1, (PAL_OW_RED << 4) | $82, 3, TrainerSwimmermMathew, -1 + person_event SPRITE_SWIMMER_GIRL, 8, 21, OW_LEFT | $2, $0, -1, -1, (PAL_OW_GREEN << 4) | $82, 3, TrainerSwimmerfKaylee, -1 + person_event SPRITE_SWIMMER_GIRL, 23, 27, OW_UP | $3, $0, -1, -1, (PAL_OW_GREEN << 4) | $82, 3, TrainerSwimmerfSusie, -1 + person_event SPRITE_SWIMMER_GIRL, 38, 31, OW_LEFT | $0, $0, -1, -1, (PAL_OW_GREEN << 4) | $82, 3, TrainerSwimmerfDenise, -1 + person_event SPRITE_SWIMMER_GIRL, 32, 48, OW_LEFT | $1, $0, -1, -1, (PAL_OW_GREEN << 4) | $82, 4, TrainerSwimmerfKara, -1 + person_event SPRITE_SWIMMER_GIRL, 54, 13, OW_LEFT | $2, $0, -1, -1, (PAL_OW_GREEN << 4) | $82, 2, TrainerSwimmerfWendy, -1 diff --git a/maps/Route42.asm b/maps/Route42.asm index 0e8aa15b5..2ca42a7dc 100644 --- a/maps/Route42.asm +++ b/maps/Route42.asm @@ -1,12 +1,12 @@ Route42_MapScriptHeader: - ; trigger count +.MapTriggers: db 2 ; triggers dw UnknownScript_0x1a9216, $0000 dw UnknownScript_0x1a9217, $0000 - ; callback count +.MapCallbacks: db 0 UnknownScript_0x1a9216: @@ -16,7 +16,7 @@ UnknownScript_0x1a9217: end UnknownScript_0x1a9218: - showemote $0, $0, 15 + showemote EMOTE_SHOCK, $0, 15 pause 15 playsound SFX_WARP_FROM applymovement $a, MovementData_0x1a9356 @@ -28,33 +28,17 @@ UnknownScript_0x1a9218: end TrainerFisherTully1: - ; bit/flag number - dw EVENT_BEAT_FISHER_TULLY - - ; trainer group && trainer id - db FISHER, TULLY1 - - ; text when seen - dw FisherTully1SeenText - - ; text when trainer beaten - dw FisherTully1BeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw FisherTully1Script + trainer EVENT_BEAT_FISHER_TULLY, FISHER, TULLY1, FisherTully1SeenText, FisherTully1BeatenText, $0000, FisherTully1Script FisherTully1Script: - writecode VAR_CALLERID, $1d + writecode VAR_CALLERID, PHONE_FISHER_TULLY talkaftercancel loadfont checkflag ENGINE_TULLY iftrue UnknownScript_0x1a927f checkflag ENGINE_TULLY_HAS_WATER_STONE iftrue UnknownScript_0x1a92dc - checkcellnum $1d + checkcellnum PHONE_FISHER_TULLY iftrue UnknownScript_0x1a92fd checkevent EVENT_TULLY_ASKED_FOR_PHONE_NUMBER iftrue UnknownScript_0x1a9268 @@ -67,7 +51,7 @@ FisherTully1Script: UnknownScript_0x1a9268: scall UnknownScript_0x1a92f5 UnknownScript_0x1a926b: - askforphonenumber $1d + askforphonenumber PHONE_FISHER_TULLY if_equal $1, UnknownScript_0x1a9305 if_equal $2, UnknownScript_0x1a9301 trainertotext FISHER, TULLY1, $0 @@ -127,7 +111,7 @@ UnknownScript_0x1a92dc: verbosegiveitem WATER_STONE, 1 iffalse UnknownScript_0x1a92ee clearflag ENGINE_TULLY_HAS_WATER_STONE - setevent EVENT_103 + setevent EVENT_TULLY_GAVE_WATER_STONE jump UnknownScript_0x1a92fd UnknownScript_0x1a92ee: @@ -170,23 +154,7 @@ UnknownScript_0x1a9311: end TrainerPokemaniacShane: - ; bit/flag number - dw EVENT_BEAT_POKEMANIAC_SHANE - - ; trainer group && trainer id - db POKEMANIAC, SHANE - - ; text when seen - dw PokemaniacShaneSeenText - - ; text when trainer beaten - dw PokemaniacShaneBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw PokemaniacShaneScript + trainer EVENT_BEAT_POKEMANIAC_SHANE, POKEMANIAC, SHANE, PokemaniacShaneSeenText, PokemaniacShaneBeatenText, $0000, PokemaniacShaneScript PokemaniacShaneScript: talkaftercancel @@ -197,23 +165,7 @@ PokemaniacShaneScript: end TrainerHikerBenjamin: - ; bit/flag number - dw EVENT_BEAT_HIKER_BENJAMIN - - ; trainer group && trainer id - db HIKER, BENJAMIN - - ; text when seen - dw HikerBenjaminSeenText - - ; text when trainer beaten - dw HikerBenjaminBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw HikerBenjaminScript + trainer EVENT_BEAT_HIKER_BENJAMIN, HIKER, BENJAMIN, HikerBenjaminSeenText, HikerBenjaminBeatenText, $0000, HikerBenjaminScript HikerBenjaminScript: talkaftercancel @@ -251,8 +203,7 @@ FruitTreeScript_0x1a9351: fruittree $17 MapRoute42SignpostItem4: - dw $00ad - db MAX_POTION + dwb EVENT_ROUTE_42_HIDDEN_MAX_POTION, MAX_POTION MovementData_0x1a9356: @@ -363,7 +314,7 @@ Route42_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 5 warp_def $8, $0, 3, GROUP_ROUTE_42_ECRUTEAK_GATE, MAP_ROUTE_42_ECRUTEAK_GATE warp_def $9, $0, 4, GROUP_ROUTE_42_ECRUTEAK_GATE, MAP_ROUTE_42_ECRUTEAK_GATE @@ -371,26 +322,26 @@ Route42_MapEventHeader: warp_def $9, $1c, 2, GROUP_MOUNT_MORTAR_1F_OUTSIDE, MAP_MOUNT_MORTAR_1F_OUTSIDE warp_def $7, $2e, 3, GROUP_MOUNT_MORTAR_1F_OUTSIDE, MAP_MOUNT_MORTAR_1F_OUTSIDE - ; xy triggers +.XYTriggers: db 1 xy_trigger 1, $e, $18, $0, UnknownScript_0x1a9218, $0, $0 - ; signposts +.Signposts: db 5 - signpost 10, 4, $0, MapRoute42Signpost0Script - signpost 5, 7, $0, MapRoute42Signpost1Script - signpost 9, 45, $0, MapRoute42Signpost2Script - signpost 8, 54, $0, MapRoute42Signpost3Script - signpost 11, 16, $7, MapRoute42SignpostItem4 + signpost 10, 4, SIGNPOST_READ, MapRoute42Signpost0Script + signpost 5, 7, SIGNPOST_READ, MapRoute42Signpost1Script + signpost 9, 45, SIGNPOST_READ, MapRoute42Signpost2Script + signpost 8, 54, SIGNPOST_READ, MapRoute42Signpost3Script + signpost 11, 16, SIGNPOST_ITEM, MapRoute42SignpostItem4 - ; people-events +.PersonEvents: db 9 - person_event SPRITE_FISHER, 14, 44, $8, $0, 255, 255, $a2, 1, TrainerFisherTully1, -1 - person_event SPRITE_POKEFAN_M, 13, 55, $a, $0, 255, 255, $b2, 3, TrainerHikerBenjamin, -1 - person_event SPRITE_SUPER_NERD, 12, 51, $6, $0, 255, 255, $92, 3, TrainerPokemaniacShane, -1 - person_event SPRITE_FRUIT_TREE, 20, 31, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x1a934d, -1 - person_event SPRITE_FRUIT_TREE, 20, 32, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x1a934f, -1 - person_event SPRITE_FRUIT_TREE, 20, 33, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x1a9351, -1 - person_event SPRITE_POKE_BALL, 8, 10, $1, $0, 255, 255, $1, 0, ItemFragment_0x1a9349, EVENT_6B3 - person_event SPRITE_POKE_BALL, 12, 37, $1, $0, 255, 255, $1, 0, ItemFragment_0x1a934b, EVENT_6B4 - person_event SPRITE_SUICUNE, 20, 30, $1, $0, 255, 255, $90, 0, ObjectEvent, EVENT_SAW_SUICUNE_ON_ROUTE_42 + person_event SPRITE_FISHER, 14, 44, OW_LEFT | $0, $0, -1, -1, (PAL_OW_GREEN << 4) | $82, 1, TrainerFisherTully1, -1 + person_event SPRITE_POKEFAN_M, 13, 55, OW_LEFT | $2, $0, -1, -1, (PAL_OW_BROWN << 4) | $82, 3, TrainerHikerBenjamin, -1 + person_event SPRITE_SUPER_NERD, 12, 51, OW_UP | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 3, TrainerPokemaniacShane, -1 + person_event SPRITE_FRUIT_TREE, 20, 31, OW_DOWN | $1, $0, -1, -1, $0, 0, FruitTreeScript_0x1a934d, -1 + person_event SPRITE_FRUIT_TREE, 20, 32, OW_DOWN | $1, $0, -1, -1, $0, 0, FruitTreeScript_0x1a934f, -1 + person_event SPRITE_FRUIT_TREE, 20, 33, OW_DOWN | $1, $0, -1, -1, $0, 0, FruitTreeScript_0x1a9351, -1 + person_event SPRITE_POKE_BALL, 8, 10, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x1a9349, EVENT_ROUTE_42_ULTRA_BALL + person_event SPRITE_POKE_BALL, 12, 37, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x1a934b, EVENT_ROUTE_42_SUPER_POTION + person_event SPRITE_SUICUNE, 20, 30, OW_DOWN | $1, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, ObjectEvent, EVENT_SAW_SUICUNE_ON_ROUTE_42 diff --git a/maps/Route42EcruteakGate.asm b/maps/Route42EcruteakGate.asm index 49223e042..4158ab230 100644 --- a/maps/Route42EcruteakGate.asm +++ b/maps/Route42EcruteakGate.asm @@ -1,8 +1,8 @@ Route42EcruteakGate_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 OfficerScript_0x19a4b5: @@ -20,19 +20,19 @@ Route42EcruteakGate_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 4 warp_def $4, $0, 1, GROUP_ECRUTEAK_CITY, MAP_ECRUTEAK_CITY warp_def $5, $0, 2, GROUP_ECRUTEAK_CITY, MAP_ECRUTEAK_CITY warp_def $4, $9, 1, GROUP_ROUTE_42, MAP_ROUTE_42 warp_def $5, $9, 2, GROUP_ROUTE_42, MAP_ROUTE_42 - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 1 - person_event SPRITE_OFFICER, 6, 9, $6, $0, 255, 255, $80, 0, OfficerScript_0x19a4b5, -1 + person_event SPRITE_OFFICER, 6, 9, OW_UP | $2, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, OfficerScript_0x19a4b5, -1 diff --git a/maps/Route43.asm b/maps/Route43.asm index f0f69247a..85799e520 100644 --- a/maps/Route43.asm +++ b/maps/Route43.asm @@ -1,8 +1,8 @@ Route43_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 1 ; callbacks @@ -20,23 +20,7 @@ UnknownScript_0x19d05c: return TrainerCamperSpencer: - ; bit/flag number - dw EVENT_BEAT_CAMPER_SPENCER - - ; trainer group && trainer id - db CAMPER, SPENCER - - ; text when seen - dw CamperSpencerSeenText - - ; text when trainer beaten - dw CamperSpencerBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw CamperSpencerScript + trainer EVENT_BEAT_CAMPER_SPENCER, CAMPER, SPENCER, CamperSpencerSeenText, CamperSpencerBeatenText, $0000, CamperSpencerScript CamperSpencerScript: talkaftercancel @@ -47,23 +31,7 @@ CamperSpencerScript: end TrainerPokemaniacBen: - ; bit/flag number - dw EVENT_BEAT_POKEMANIAC_BEN - - ; trainer group && trainer id - db POKEMANIAC, BEN - - ; text when seen - dw PokemaniacBenSeenText - - ; text when trainer beaten - dw PokemaniacBenBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw PokemaniacBenScript + trainer EVENT_BEAT_POKEMANIAC_BEN, POKEMANIAC, BEN, PokemaniacBenSeenText, PokemaniacBenBeatenText, $0000, PokemaniacBenScript PokemaniacBenScript: talkaftercancel @@ -74,31 +42,15 @@ PokemaniacBenScript: end TrainerPokemaniacBrent1: - ; bit/flag number - dw EVENT_BEAT_POKEMANIAC_BRENT - - ; trainer group && trainer id - db POKEMANIAC, BRENT1 - - ; text when seen - dw PokemaniacBrent1SeenText - - ; text when trainer beaten - dw PokemaniacBrent1BeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw PokemaniacBrent1Script + trainer EVENT_BEAT_POKEMANIAC_BRENT, POKEMANIAC, BRENT1, PokemaniacBrent1SeenText, PokemaniacBrent1BeatenText, $0000, PokemaniacBrent1Script PokemaniacBrent1Script: - writecode VAR_CALLERID, $1e + writecode VAR_CALLERID, PHONE_POKEMANIAC_BRENT talkaftercancel loadfont checkflag ENGINE_BRENT iftrue UnknownScript_0x19d0cf - checkcellnum $1e + checkcellnum PHONE_POKEMANIAC_BRENT iftrue UnknownScript_0x19d138 checkevent EVENT_BRENT_ASKED_FOR_PHONE_NUMBER iftrue UnknownScript_0x19d0b8 @@ -111,7 +63,7 @@ PokemaniacBrent1Script: UnknownScript_0x19d0b8: scall UnknownScript_0x19d130 UnknownScript_0x19d0bb: - askforphonenumber $1e + askforphonenumber PHONE_POKEMANIAC_BRENT if_equal $1, UnknownScript_0x19d140 if_equal $2, UnknownScript_0x19d13c trainertotext POKEMANIAC, BRENT1, $0 @@ -195,23 +147,7 @@ UnknownScript_0x19d144: end TrainerPokemaniacRon: - ; bit/flag number - dw EVENT_BEAT_POKEMANIAC_RON - - ; trainer group && trainer id - db POKEMANIAC, RON - - ; text when seen - dw PokemaniacRonSeenText - - ; text when trainer beaten - dw PokemaniacRonBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw PokemaniacRonScript + trainer EVENT_BEAT_POKEMANIAC_RON, POKEMANIAC, RON, PokemaniacRonSeenText, PokemaniacRonBeatenText, $0000, PokemaniacRonScript PokemaniacRonScript: talkaftercancel @@ -222,23 +158,7 @@ PokemaniacRonScript: end TrainerFisherMarvin: - ; bit/flag number - dw EVENT_BEAT_FISHER_MARVIN - - ; trainer group && trainer id - db FISHER, MARVIN - - ; text when seen - dw FisherMarvinSeenText - - ; text when trainer beaten - dw FisherMarvinBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw FisherMarvinScript + trainer EVENT_BEAT_FISHER_MARVIN, FISHER, MARVIN, FisherMarvinSeenText, FisherMarvinBeatenText, $0000, FisherMarvinScript FisherMarvinScript: talkaftercancel @@ -249,33 +169,17 @@ FisherMarvinScript: end TrainerPicnickerTiffany3: - ; bit/flag number - dw EVENT_BEAT_PICNICKER_TIFFANY - - ; trainer group && trainer id - db PICNICKER, TIFFANY3 - - ; text when seen - dw PicnickerTiffany3SeenText - - ; text when trainer beaten - dw PicnickerTiffany3BeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw PicnickerTiffany3Script + trainer EVENT_BEAT_PICNICKER_TIFFANY, PICNICKER, TIFFANY3, PicnickerTiffany3SeenText, PicnickerTiffany3BeatenText, $0000, PicnickerTiffany3Script PicnickerTiffany3Script: - writecode VAR_CALLERID, $1f + writecode VAR_CALLERID, PHONE_PICNICKER_TIFFANY talkaftercancel loadfont checkflag ENGINE_TIFFANY iftrue UnknownScript_0x19d1c1 checkflag ENGINE_TIFFANY_HAS_PINK_BOW iftrue UnknownScript_0x19d21e - checkcellnum $1f + checkcellnum PHONE_PICNICKER_TIFFANY iftrue UnknownScript_0x19d245 checkpoke CLEFAIRY iffalse UnknownScript_0x19d233 @@ -290,7 +194,7 @@ PicnickerTiffany3Script: UnknownScript_0x19d1aa: scall UnknownScript_0x19d23d UnknownScript_0x19d1ad: - askforphonenumber $1f + askforphonenumber PHONE_PICNICKER_TIFFANY if_equal $1, UnknownScript_0x19d24d if_equal $2, UnknownScript_0x19d249 trainertotext PICNICKER, TIFFANY3, $0 @@ -350,7 +254,7 @@ UnknownScript_0x19d21e: verbosegiveitem PINK_BOW, 1 iffalse UnknownScript_0x19d230 clearflag ENGINE_TIFFANY_HAS_PINK_BOW - setevent EVENT_104 + setevent EVENT_TIFFANY_GAVE_PINK_BOW jump UnknownScript_0x19d245 UnknownScript_0x19d230: @@ -593,7 +497,7 @@ Route43_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 5 warp_def $33, $9, 1, GROUP_ROUTE_43_MAHOGANY_GATE, MAP_ROUTE_43_MAHOGANY_GATE warp_def $33, $a, 2, GROUP_ROUTE_43_MAHOGANY_GATE, MAP_ROUTE_43_MAHOGANY_GATE @@ -601,22 +505,22 @@ Route43_MapEventHeader: warp_def $1f, $11, 1, GROUP_ROUTE_43_GATE, MAP_ROUTE_43_GATE warp_def $1f, $12, 2, GROUP_ROUTE_43_GATE, MAP_ROUTE_43_GATE - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 3 - signpost 3, 13, $0, MapRoute43Signpost0Script - signpost 49, 11, $0, MapRoute43Signpost1Script - signpost 38, 16, $0, MapRoute43Signpost2Script + signpost 3, 13, SIGNPOST_READ, MapRoute43Signpost0Script + signpost 49, 11, SIGNPOST_READ, MapRoute43Signpost1Script + signpost 38, 16, SIGNPOST_READ, MapRoute43Signpost2Script - ; people-events +.PersonEvents: db 8 - person_event SPRITE_SUPER_NERD, 9, 17, $8, $0, 255, 255, $92, 2, TrainerPokemaniacBen, -1 - person_event SPRITE_SUPER_NERD, 24, 17, $a, $0, 255, 255, $92, 3, TrainerPokemaniacBrent1, -1 - person_event SPRITE_SUPER_NERD, 11, 18, $6, $0, 255, 255, $92, 2, TrainerPokemaniacRon, -1 - person_event SPRITE_FISHER, 20, 8, $9, $0, 255, 255, $a2, 4, TrainerFisherMarvin, -1 - person_event SPRITE_LASS, 29, 13, $6, $0, 255, 255, $a2, 2, TrainerPicnickerTiffany3, -1 - person_event SPRITE_YOUNGSTER, 44, 17, $a, $0, 255, 255, $a2, 3, TrainerCamperSpencer, -1 - person_event SPRITE_FRUIT_TREE, 30, 5, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x19d266, -1 - person_event SPRITE_POKE_BALL, 36, 16, $1, $0, 255, 255, $1, 0, ItemFragment_0x19d268, EVENT_6B5 + person_event SPRITE_SUPER_NERD, 9, 17, OW_LEFT | $0, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 2, TrainerPokemaniacBen, -1 + person_event SPRITE_SUPER_NERD, 24, 17, OW_LEFT | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 3, TrainerPokemaniacBrent1, -1 + person_event SPRITE_SUPER_NERD, 11, 18, OW_UP | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 2, TrainerPokemaniacRon, -1 + person_event SPRITE_FISHER, 20, 8, OW_LEFT | $1, $0, -1, -1, (PAL_OW_GREEN << 4) | $82, 4, TrainerFisherMarvin, -1 + person_event SPRITE_LASS, 29, 13, OW_UP | $2, $0, -1, -1, (PAL_OW_GREEN << 4) | $82, 2, TrainerPicnickerTiffany3, -1 + person_event SPRITE_YOUNGSTER, 44, 17, OW_LEFT | $2, $0, -1, -1, (PAL_OW_GREEN << 4) | $82, 3, TrainerCamperSpencer, -1 + person_event SPRITE_FRUIT_TREE, 30, 5, OW_DOWN | $1, $0, -1, -1, $0, 0, FruitTreeScript_0x19d266, -1 + person_event SPRITE_POKE_BALL, 36, 16, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x19d268, EVENT_ROUTE_43_MAX_ETHER diff --git a/maps/Route43Gate.asm b/maps/Route43Gate.asm index 9067119ce..4ab30615a 100644 --- a/maps/Route43Gate.asm +++ b/maps/Route43Gate.asm @@ -1,12 +1,12 @@ Route43Gate_MapScriptHeader: - ; trigger count +.MapTriggers: db 2 ; triggers dw UnknownScript_0x19abc5, $0000 dw UnknownScript_0x19abc9, $0000 - ; callback count +.MapCallbacks: db 1 ; callbacks @@ -40,10 +40,10 @@ UnknownScript_0x19abda: UnknownScript_0x19abea: applymovement $0, MovementData_0x19aca2 - showemote $0, $4, 15 + showemote EMOTE_SHOCK, $4, 15 applymovement $4, MovementData_0x19acbb spriteface $3, UP - showemote $0, $3, 15 + showemote EMOTE_SHOCK, $3, 15 applymovement $3, MovementData_0x19aca4 loadfont writetext UnknownText_0x19acd2 @@ -72,10 +72,10 @@ UnknownScript_0x19ac28: end UnknownScript_0x19ac38: - showemote $0, $3, 15 + showemote EMOTE_SHOCK, $3, 15 applymovement $3, MovementData_0x19acaf spriteface $4, DOWN - showemote $0, $4, 15 + showemote EMOTE_SHOCK, $4, 15 applymovement $4, MovementData_0x19acc7 loadfont writetext UnknownText_0x19acd2 @@ -249,21 +249,21 @@ Route43Gate_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 4 warp_def $0, $4, 4, GROUP_ROUTE_43, MAP_ROUTE_43 warp_def $0, $5, 5, GROUP_ROUTE_43, MAP_ROUTE_43 warp_def $7, $4, 3, GROUP_ROUTE_43, MAP_ROUTE_43 warp_def $7, $5, 3, GROUP_ROUTE_43, MAP_ROUTE_43 - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 3 - person_event SPRITE_OFFICER, 8, 4, $9, $0, 255, 255, $80, 0, OfficerScript_0x19ac85, EVENT_735 - person_event SPRITE_ROCKET, 8, 6, $6, $0, 255, 255, $0, 0, RocketScript_0x19ac82, EVENT_6DC - person_event SPRITE_ROCKET, 8, 11, $7, $0, 255, 255, $0, 0, RocketScript_0x19ac82, EVENT_6DC + person_event SPRITE_OFFICER, 8, 4, OW_LEFT | $1, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, OfficerScript_0x19ac85, EVENT_LAKE_OF_RAGE_CIVILIANS + person_event SPRITE_ROCKET, 8, 6, OW_UP | $2, $0, -1, -1, $0, 0, RocketScript_0x19ac82, EVENT_ROUTE_43_GATE_ROCKETS + person_event SPRITE_ROCKET, 8, 11, OW_UP | $3, $0, -1, -1, $0, 0, RocketScript_0x19ac82, EVENT_ROUTE_43_GATE_ROCKETS diff --git a/maps/Route43MahoganyGate.asm b/maps/Route43MahoganyGate.asm index 183f7a461..8ef780243 100644 --- a/maps/Route43MahoganyGate.asm +++ b/maps/Route43MahoganyGate.asm @@ -1,8 +1,8 @@ Route43MahoganyGate_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 OfficerScript_0x19ab0b: @@ -39,19 +39,19 @@ Route43MahoganyGate_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 4 warp_def $0, $4, 1, GROUP_ROUTE_43, MAP_ROUTE_43 warp_def $0, $5, 2, GROUP_ROUTE_43, MAP_ROUTE_43 warp_def $7, $4, 5, GROUP_MAHOGANY_TOWN, MAP_MAHOGANY_TOWN warp_def $7, $5, 5, GROUP_MAHOGANY_TOWN, MAP_MAHOGANY_TOWN - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 1 - person_event SPRITE_OFFICER, 8, 4, $9, $0, 255, 255, $80, 0, OfficerScript_0x19ab0b, -1 + person_event SPRITE_OFFICER, 8, 4, OW_LEFT | $1, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, OfficerScript_0x19ab0b, -1 diff --git a/maps/Route44.asm b/maps/Route44.asm index b8209fc07..86c54a885 100644 --- a/maps/Route44.asm +++ b/maps/Route44.asm @@ -1,36 +1,20 @@ Route44_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 TrainerBird_keeperVance1: - ; bit/flag number - dw EVENT_BEAT_BIRD_KEEPER_VANCE - - ; trainer group && trainer id - db BIRD_KEEPER, VANCE1 - - ; text when seen - dw Bird_keeperVance1SeenText - - ; text when trainer beaten - dw Bird_keeperVance1BeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw Bird_keeperVance1Script + trainer EVENT_BEAT_BIRD_KEEPER_VANCE, BIRD_KEEPER, VANCE1, Bird_keeperVance1SeenText, Bird_keeperVance1BeatenText, $0000, Bird_keeperVance1Script Bird_keeperVance1Script: - writecode VAR_CALLERID, $20 + writecode VAR_CALLERID, PHONE_BIRDKEEPER_VANCE talkaftercancel loadfont checkflag ENGINE_VANCE iftrue UnknownScript_0x19d86a - checkcellnum $20 + checkcellnum PHONE_BIRDKEEPER_VANCE iftrue UnknownScript_0x19d8eb checkevent EVENT_VANCE_ASKED_FOR_PHONE_NUMBER iftrue UnknownScript_0x19d853 @@ -43,7 +27,7 @@ Bird_keeperVance1Script: UnknownScript_0x19d853: scall UnknownScript_0x19d8e3 UnknownScript_0x19d856: - askforphonenumber $20 + askforphonenumber PHONE_BIRDKEEPER_VANCE if_equal $1, UnknownScript_0x19d8f3 if_equal $2, UnknownScript_0x19d8ef trainertotext BIRD_KEEPER, VANCE1, $0 @@ -153,23 +137,7 @@ UnknownScript_0x19d90a: end TrainerPsychicPhil: - ; bit/flag number - dw EVENT_BEAT_PSYCHIC_PHIL - - ; trainer group && trainer id - db PSYCHIC_T, PHIL - - ; text when seen - dw PsychicPhilSeenText - - ; text when trainer beaten - dw PsychicPhilBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw PsychicPhilScript + trainer EVENT_BEAT_PSYCHIC_PHIL, PSYCHIC_T, PHIL, PsychicPhilSeenText, PsychicPhilBeatenText, $0000, PsychicPhilScript PsychicPhilScript: talkaftercancel @@ -180,33 +148,17 @@ PsychicPhilScript: end TrainerFisherWilton1: - ; bit/flag number - dw EVENT_BEAT_FISHER_WILTON - - ; trainer group && trainer id - db FISHER, WILTON1 - - ; text when seen - dw FisherWilton1SeenText - - ; text when trainer beaten - dw FisherWilton1BeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw FisherWilton1Script + trainer EVENT_BEAT_FISHER_WILTON, FISHER, WILTON1, FisherWilton1SeenText, FisherWilton1BeatenText, $0000, FisherWilton1Script FisherWilton1Script: - writecode VAR_CALLERID, $21 + writecode VAR_CALLERID, PHONE_FISHER_WILTON talkaftercancel loadfont checkflag ENGINE_WILTON iftrue UnknownScript_0x19d96e checkflag ENGINE_WILTON_HAS_ITEM iftrue UnknownScript_0x19d9b4 - checkcellnum $21 + checkcellnum PHONE_FISHER_WILTON iftrue UnknownScript_0x19d8eb checkevent EVENT_WILTON_ASKED_FOR_PHONE_NUMBER iftrue UnknownScript_0x19d957 @@ -219,7 +171,7 @@ FisherWilton1Script: UnknownScript_0x19d957: scall UnknownScript_0x19d8e3 UnknownScript_0x19d95a: - askforphonenumber $21 + askforphonenumber PHONE_FISHER_WILTON if_equal $1, UnknownScript_0x19d8f3 if_equal $2, UnknownScript_0x19d8ef trainertotext FISHER, WILTON1, $0 @@ -291,23 +243,7 @@ UnknownScript_0x19d9e7: jump UnknownScript_0x19d8ff TrainerFisherEdgar: - ; bit/flag number - dw EVENT_BEAT_FISHER_EDGAR - - ; trainer group && trainer id - db FISHER, EDGAR - - ; text when seen - dw FisherEdgarSeenText - - ; text when trainer beaten - dw FisherEdgarBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw FisherEdgarScript + trainer EVENT_BEAT_FISHER_EDGAR, FISHER, EDGAR, FisherEdgarSeenText, FisherEdgarBeatenText, $0000, FisherEdgarScript FisherEdgarScript: talkaftercancel @@ -318,23 +254,7 @@ FisherEdgarScript: end TrainerCooltrainerfCybil: - ; bit/flag number - dw EVENT_BEAT_COOLTRAINERF_CYBIL - - ; trainer group && trainer id - db COOLTRAINERF, CYBIL - - ; text when seen - dw CooltrainerfCybilSeenText - - ; text when trainer beaten - dw CooltrainerfCybilBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw CooltrainerfCybilScript + trainer EVENT_BEAT_COOLTRAINERF_CYBIL, COOLTRAINERF, CYBIL, CooltrainerfCybilSeenText, CooltrainerfCybilBeatenText, $0000, CooltrainerfCybilScript CooltrainerfCybilScript: talkaftercancel @@ -345,23 +265,7 @@ CooltrainerfCybilScript: end TrainerPokemaniacZach: - ; bit/flag number - dw EVENT_BEAT_POKEMANIAC_ZACH - - ; trainer group && trainer id - db POKEMANIAC, ZACH - - ; text when seen - dw PokemaniacZachSeenText - - ; text when trainer beaten - dw PokemaniacZachBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw PokemaniacZachScript + trainer EVENT_BEAT_POKEMANIAC_ZACH, POKEMANIAC, ZACH, PokemaniacZachSeenText, PokemaniacZachBeatenText, $0000, PokemaniacZachScript PokemaniacZachScript: talkaftercancel @@ -372,23 +276,7 @@ PokemaniacZachScript: end TrainerCooltrainermAllen: - ; bit/flag number - dw EVENT_BEAT_COOLTRAINERM_ALLEN - - ; trainer group && trainer id - db COOLTRAINERM, ALLEN - - ; text when seen - dw CooltrainermAllenSeenText - - ; text when trainer beaten - dw CooltrainermAllenBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw CooltrainermAllenScript + trainer EVENT_BEAT_COOLTRAINERM_ALLEN, COOLTRAINERM, ALLEN, CooltrainermAllenSeenText, CooltrainermAllenBeatenText, $0000, CooltrainermAllenScript CooltrainermAllenScript: talkaftercancel @@ -417,8 +305,7 @@ ItemFragment_0x19da46: db MAX_REPEL, 1 MapRoute44SignpostItem2: - dw $00ae - db ELIXER + dwb EVENT_ROUTE_44_HIDDEN_ELIXER, ELIXER FisherWilton1SeenText: @@ -611,29 +498,29 @@ Route44_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 1 warp_def $7, $38, 1, GROUP_ICE_PATH_1F, MAP_ICE_PATH_1F - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 3 - signpost 7, 53, $0, MapRoute44Signpost0Script - signpost 10, 6, $0, MapRoute44Signpost1Script - signpost 9, 32, $7, MapRoute44SignpostItem2 + signpost 7, 53, SIGNPOST_READ, MapRoute44Signpost0Script + signpost 10, 6, SIGNPOST_READ, MapRoute44Signpost1Script + signpost 9, 32, SIGNPOST_ITEM, MapRoute44SignpostItem2 - ; people-events +.PersonEvents: db 11 - person_event SPRITE_FISHER, 7, 39, $6, $0, 255, 255, $a2, 1, TrainerFisherWilton1, -1 - person_event SPRITE_FISHER, 17, 23, $9, $0, 255, 255, $a2, 1, TrainerFisherEdgar, -1 - person_event SPRITE_YOUNGSTER, 13, 14, $1f, $0, 255, 255, $92, 3, TrainerPsychicPhil, -1 - person_event SPRITE_SUPER_NERD, 6, 47, $1f, $0, 255, 255, $a2, 3, TrainerPokemaniacZach, -1 - person_event SPRITE_YOUNGSTER, 9, 55, $6, $0, 255, 255, $a2, 2, TrainerBird_keeperVance1, -1 - person_event SPRITE_COOLTRAINER_M, 19, 45, $8, $0, 255, 255, $82, 5, TrainerCooltrainermAllen, -1 - person_event SPRITE_COOLTRAINER_F, 18, 35, $8, $0, 255, 255, $82, 5, TrainerCooltrainerfCybil, -1 - person_event SPRITE_FRUIT_TREE, 9, 13, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x19da40, -1 - person_event SPRITE_POKE_BALL, 12, 34, $1, $0, 255, 255, $1, 0, ItemFragment_0x19da42, EVENT_6B6 - person_event SPRITE_POKE_BALL, 8, 49, $1, $0, 255, 255, $1, 0, ItemFragment_0x19da44, EVENT_6B7 - person_event SPRITE_POKE_BALL, 13, 18, $1, $0, 255, 255, $1, 0, ItemFragment_0x19da46, EVENT_7BD + person_event SPRITE_FISHER, 7, 39, OW_UP | $2, $0, -1, -1, (PAL_OW_GREEN << 4) | $82, 1, TrainerFisherWilton1, -1 + person_event SPRITE_FISHER, 17, 23, OW_LEFT | $1, $0, -1, -1, (PAL_OW_GREEN << 4) | $82, 1, TrainerFisherEdgar, -1 + person_event SPRITE_YOUNGSTER, 13, 14, OW_RIGHT | $13, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 3, TrainerPsychicPhil, -1 + person_event SPRITE_SUPER_NERD, 6, 47, OW_RIGHT | $13, $0, -1, -1, (PAL_OW_GREEN << 4) | $82, 3, TrainerPokemaniacZach, -1 + person_event SPRITE_YOUNGSTER, 9, 55, OW_UP | $2, $0, -1, -1, (PAL_OW_GREEN << 4) | $82, 2, TrainerBird_keeperVance1, -1 + person_event SPRITE_COOLTRAINER_M, 19, 45, OW_LEFT | $0, $0, -1, -1, (PAL_OW_RED << 4) | $82, 5, TrainerCooltrainermAllen, -1 + person_event SPRITE_COOLTRAINER_F, 18, 35, OW_LEFT | $0, $0, -1, -1, (PAL_OW_RED << 4) | $82, 5, TrainerCooltrainerfCybil, -1 + person_event SPRITE_FRUIT_TREE, 9, 13, OW_DOWN | $1, $0, -1, -1, $0, 0, FruitTreeScript_0x19da40, -1 + person_event SPRITE_POKE_BALL, 12, 34, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x19da42, EVENT_ROUTE_44_MAX_REVIVE + person_event SPRITE_POKE_BALL, 8, 49, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x19da44, EVENT_ROUTE_44_ULTRA_BALL + person_event SPRITE_POKE_BALL, 13, 18, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x19da46, EVENT_ROUTE_44_MAX_REPEL diff --git a/maps/Route45.asm b/maps/Route45.asm index 71a9ed5e2..160fd7090 100644 --- a/maps/Route45.asm +++ b/maps/Route45.asm @@ -1,34 +1,18 @@ Route45_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 TrainerBlackbeltKenji: - ; bit/flag number - dw EVENT_BEAT_BLACKBELT_KENJI - - ; trainer group && trainer id - db BLACKBELT_T, KENJI3 - - ; text when seen - dw BlackbeltKenji3SeenText - - ; text when trainer beaten - dw BlackbeltKenji3BeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw BlackbeltKenji3Script + trainer EVENT_BEAT_BLACKBELT_KENJI, BLACKBELT_T, KENJI3, BlackbeltKenji3SeenText, BlackbeltKenji3BeatenText, $0000, BlackbeltKenji3Script BlackbeltKenji3Script: - writecode VAR_CALLERID, $22 + writecode VAR_CALLERID, PHONE_BLACKBELT_KENJI talkaftercancel loadfont - checkcellnum $22 + checkcellnum PHONE_BLACKBELT_KENJI iftrue UnknownScript_0x19e0e4 checkevent EVENT_KENJI_ASKED_FOR_PHONE_NUMBER iftrue UnknownScript_0x19e0cd @@ -42,7 +26,7 @@ BlackbeltKenji3Script: UnknownScript_0x19e0cd: scall UnknownScript_0x19e11f UnknownScript_0x19e0d0: - askforphonenumber $22 + askforphonenumber PHONE_BLACKBELT_KENJI if_equal $1, UnknownScript_0x19e12f if_equal $2, UnknownScript_0x19e12b trainertotext BLACKBELT_T, KENJI3, $0 @@ -56,12 +40,12 @@ UnknownScript_0x19e0e4: iftrue UnknownScript_0x19e10c checknite iftrue UnknownScript_0x19e112 - checkevent EVENT_26A + checkevent EVENT_KENJI_ON_BREAK iffalse UnknownScript_0x19e127 scall UnknownScript_0x19e137 verbosegiveitem PP_UP, 1 iffalse UnknownScript_0x19e118 - clearevent EVENT_26A + clearevent EVENT_KENJI_ON_BREAK special Function11485 jump UnknownScript_0x19e127 @@ -126,23 +110,7 @@ UnknownScript_0x19e146: end TrainerHikerErik: - ; bit/flag number - dw EVENT_BEAT_HIKER_ERIK - - ; trainer group && trainer id - db HIKER, ERIK - - ; text when seen - dw HikerErikSeenText - - ; text when trainer beaten - dw HikerErikBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw HikerErikScript + trainer EVENT_BEAT_HIKER_ERIK, HIKER, ERIK, HikerErikSeenText, HikerErikBeatenText, $0000, HikerErikScript HikerErikScript: talkaftercancel @@ -153,23 +121,7 @@ HikerErikScript: end TrainerHikerMichael: - ; bit/flag number - dw EVENT_BEAT_HIKER_MICHAEL - - ; trainer group && trainer id - db HIKER, MICHAEL - - ; text when seen - dw HikerMichaelSeenText - - ; text when trainer beaten - dw HikerMichaelBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw HikerMichaelScript + trainer EVENT_BEAT_HIKER_MICHAEL, HIKER, MICHAEL, HikerMichaelSeenText, HikerMichaelBeatenText, $0000, HikerMichaelScript HikerMichaelScript: talkaftercancel @@ -180,31 +132,15 @@ HikerMichaelScript: end TrainerHikerParry: - ; bit/flag number - dw EVENT_BEAT_HIKER_PARRY - - ; trainer group && trainer id - db HIKER, PARRY3 - - ; text when seen - dw HikerParry3SeenText - - ; text when trainer beaten - dw HikerParry3BeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw HikerParry3Script + trainer EVENT_BEAT_HIKER_PARRY, HIKER, PARRY3, HikerParry3SeenText, HikerParry3BeatenText, $0000, HikerParry3Script HikerParry3Script: - writecode VAR_CALLERID, $23 + writecode VAR_CALLERID, PHONE_HIKER_PARRY talkaftercancel loadfont checkflag ENGINE_PARRY iftrue UnknownScript_0x19e1b8 - checkcellnum $23 + checkcellnum PHONE_HIKER_PARRY iftrue UnknownScript_0x19e127 checkevent EVENT_PARRY_ASKED_FOR_PHONE_NUMBER iftrue UnknownScript_0x19e1a1 @@ -217,7 +153,7 @@ HikerParry3Script: UnknownScript_0x19e1a1: scall UnknownScript_0x19e11f UnknownScript_0x19e1a4: - askforphonenumber $23 + askforphonenumber PHONE_HIKER_PARRY if_equal $1, UnknownScript_0x19e12f if_equal $2, UnknownScript_0x19e12b trainertotext HIKER, PARRY1, $0 @@ -282,23 +218,7 @@ UnknownScript_0x19e219: jump UnknownScript_0x19e127 TrainerHikerTimothy: - ; bit/flag number - dw EVENT_BEAT_HIKER_TIMOTHY - - ; trainer group && trainer id - db HIKER, TIMOTHY - - ; text when seen - dw HikerTimothySeenText - - ; text when trainer beaten - dw HikerTimothyBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw HikerTimothyScript + trainer EVENT_BEAT_HIKER_TIMOTHY, HIKER, TIMOTHY, HikerTimothySeenText, HikerTimothyBeatenText, $0000, HikerTimothyScript HikerTimothyScript: talkaftercancel @@ -309,23 +229,7 @@ HikerTimothyScript: end TrainerCooltrainermRyan: - ; bit/flag number - dw EVENT_BEAT_COOLTRAINERM_RYAN - - ; trainer group && trainer id - db COOLTRAINERM, RYAN - - ; text when seen - dw CooltrainermRyanSeenText - - ; text when trainer beaten - dw CooltrainermRyanBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw CooltrainermRyanScript + trainer EVENT_BEAT_COOLTRAINERM_RYAN, COOLTRAINERM, RYAN, CooltrainermRyanSeenText, CooltrainermRyanBeatenText, $0000, CooltrainermRyanScript CooltrainermRyanScript: talkaftercancel @@ -336,23 +240,7 @@ CooltrainermRyanScript: end TrainerCooltrainerfKelly: - ; bit/flag number - dw EVENT_BEAT_COOLTRAINERF_KELLY - - ; trainer group && trainer id - db COOLTRAINERF, KELLY - - ; text when seen - dw CooltrainerfKellySeenText - - ; text when trainer beaten - dw CooltrainerfKellyBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw CooltrainerfKellyScript + trainer EVENT_BEAT_COOLTRAINERF_KELLY, COOLTRAINERF, KELLY, CooltrainerfKellySeenText, CooltrainerfKellyBeatenText, $0000, CooltrainerfKellyScript CooltrainerfKellyScript: talkaftercancel @@ -409,8 +297,7 @@ ItemFragment_0x19e29c: db MAX_POTION, 1 MapRoute45SignpostItem1: - dw $00af - db PP_UP + dwb EVENT_ROUTE_45_HIDDEN_PP_UP, PP_UP HikerErikSeenText: @@ -634,30 +521,30 @@ Route45_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 1 warp_def $5, $2, 1, GROUP_DARK_CAVE_BLACKTHORN_ENTRANCE, MAP_DARK_CAVE_BLACKTHORN_ENTRANCE - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 2 - signpost 4, 10, $0, MapRoute45Signpost0Script - signpost 80, 13, $7, MapRoute45SignpostItem1 + signpost 4, 10, SIGNPOST_READ, MapRoute45Signpost0Script + signpost 80, 13, SIGNPOST_ITEM, MapRoute45SignpostItem1 - ; people-events +.PersonEvents: db 13 - person_event SPRITE_POKEFAN_M, 20, 14, $9, $0, 255, 255, $b2, 1, TrainerHikerErik, -1 - person_event SPRITE_POKEFAN_M, 69, 19, $9, $0, 255, 255, $b2, 2, TrainerHikerMichael, -1 - person_event SPRITE_POKEFAN_M, 32, 9, $7, $0, 255, 255, $b2, 2, TrainerHikerParry, -1 - person_event SPRITE_POKEFAN_M, 69, 13, $8, $0, 255, 255, $b2, 1, TrainerHikerTimothy, -1 - person_event SPRITE_BLACK_BELT, 54, 15, $a, $0, 255, 255, $b2, 2, TrainerBlackbeltKenji, -1 - person_event SPRITE_COOLTRAINER_M, 22, 21, $8, $0, 255, 255, $82, 1, TrainerCooltrainermRyan, -1 - person_event SPRITE_COOLTRAINER_F, 40, 9, $a, $0, 255, 255, $82, 3, TrainerCooltrainerfKelly, -1 - person_event SPRITE_FRUIT_TREE, 86, 20, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x19e294, -1 - person_event SPRITE_POKE_BALL, 55, 10, $1, $0, 255, 255, $1, 0, ItemFragment_0x19e296, EVENT_6B8 - person_event SPRITE_POKE_BALL, 70, 9, $1, $0, 255, 255, $1, 0, ItemFragment_0x19e298, EVENT_6B9 - person_event SPRITE_POKE_BALL, 24, 10, $1, $0, 255, 255, $1, 0, ItemFragment_0x19e29a, EVENT_6BA - person_event SPRITE_POKE_BALL, 37, 11, $1, $0, 255, 255, $1, 0, ItemFragment_0x19e29c, EVENT_6BB - person_event SPRITE_YOUNGSTER, 74, 8, $3, $0, 255, 255, $a0, 0, YoungsterScript_0x19e269, -1 + person_event SPRITE_POKEFAN_M, 20, 14, OW_LEFT | $1, $0, -1, -1, (PAL_OW_BROWN << 4) | $82, 1, TrainerHikerErik, -1 + person_event SPRITE_POKEFAN_M, 69, 19, OW_LEFT | $1, $0, -1, -1, (PAL_OW_BROWN << 4) | $82, 2, TrainerHikerMichael, -1 + person_event SPRITE_POKEFAN_M, 32, 9, OW_UP | $3, $0, -1, -1, (PAL_OW_BROWN << 4) | $82, 2, TrainerHikerParry, -1 + person_event SPRITE_POKEFAN_M, 69, 13, OW_LEFT | $0, $0, -1, -1, (PAL_OW_BROWN << 4) | $82, 1, TrainerHikerTimothy, -1 + person_event SPRITE_BLACK_BELT, 54, 15, OW_LEFT | $2, $0, -1, -1, (PAL_OW_BROWN << 4) | $82, 2, TrainerBlackbeltKenji, -1 + person_event SPRITE_COOLTRAINER_M, 22, 21, OW_LEFT | $0, $0, -1, -1, (PAL_OW_RED << 4) | $82, 1, TrainerCooltrainermRyan, -1 + person_event SPRITE_COOLTRAINER_F, 40, 9, OW_LEFT | $2, $0, -1, -1, (PAL_OW_RED << 4) | $82, 3, TrainerCooltrainerfKelly, -1 + person_event SPRITE_FRUIT_TREE, 86, 20, OW_DOWN | $1, $0, -1, -1, $0, 0, FruitTreeScript_0x19e294, -1 + person_event SPRITE_POKE_BALL, 55, 10, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x19e296, EVENT_ROUTE_45_NUGGET + person_event SPRITE_POKE_BALL, 70, 9, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x19e298, EVENT_ROUTE_45_REVIVE + person_event SPRITE_POKE_BALL, 24, 10, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x19e29a, EVENT_ROUTE_45_ELIXER + person_event SPRITE_POKE_BALL, 37, 11, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x19e29c, EVENT_ROUTE_45_MAX_POTION + person_event SPRITE_YOUNGSTER, 74, 8, OW_DOWN | $3, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, YoungsterScript_0x19e269, -1 diff --git a/maps/Route46.asm b/maps/Route46.asm index 28e7fc957..58cd08645 100644 --- a/maps/Route46.asm +++ b/maps/Route46.asm @@ -1,28 +1,12 @@ Route46_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 TrainerCamperTed: - ; bit/flag number - dw EVENT_BEAT_CAMPER_TED - - ; trainer group && trainer id - db CAMPER, TED - - ; text when seen - dw CamperTedSeenText - - ; text when trainer beaten - dw CamperTedBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw CamperTedScript + trainer EVENT_BEAT_CAMPER_TED, CAMPER, TED, CamperTedSeenText, CamperTedBeatenText, $0000, CamperTedScript CamperTedScript: talkaftercancel @@ -33,31 +17,15 @@ CamperTedScript: end TrainerPicnickerErin1: - ; bit/flag number - dw EVENT_BEAT_PICNICKER_ERIN - - ; trainer group && trainer id - db PICNICKER, ERIN1 - - ; text when seen - dw PicnickerErin1SeenText - - ; text when trainer beaten - dw PicnickerErin1BeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw PicnickerErin1Script + trainer EVENT_BEAT_PICNICKER_ERIN, PICNICKER, ERIN1, PicnickerErin1SeenText, PicnickerErin1BeatenText, $0000, PicnickerErin1Script PicnickerErin1Script: - writecode VAR_CALLERID, $24 + writecode VAR_CALLERID, PHONE_PICNICKER_ERIN talkaftercancel loadfont checkflag ENGINE_ERIN iftrue UnknownScript_0x1a96da - checkcellnum $24 + checkcellnum PHONE_PICNICKER_ERIN iftrue UnknownScript_0x1a975b checkevent EVENT_ERIN_ASKED_FOR_PHONE_NUMBER iftrue UnknownScript_0x1a96c3 @@ -70,7 +38,7 @@ PicnickerErin1Script: UnknownScript_0x1a96c3: scall UnknownScript_0x1a9753 UnknownScript_0x1a96c6: - askforphonenumber $24 + askforphonenumber PHONE_PICNICKER_ERIN if_equal $1, UnknownScript_0x1a9763 if_equal $2, UnknownScript_0x1a975f trainertotext PICNICKER, ERIN1, $0 @@ -172,23 +140,7 @@ UnknownScript_0x1a9772: end TrainerHikerBailey: - ; bit/flag number - dw EVENT_BEAT_HIKER_BAILEY - - ; trainer group && trainer id - db HIKER, BAILEY - - ; text when seen - dw HikerBaileySeenText - - ; text when trainer beaten - dw HikerBaileyBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw HikerBaileyScript + trainer EVENT_BEAT_HIKER_BAILEY, HIKER, BAILEY, HikerBaileySeenText, HikerBaileyBeatenText, $0000, HikerBaileyScript HikerBaileyScript: talkaftercancel @@ -294,24 +246,24 @@ Route46_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 3 warp_def $21, $7, 1, GROUP_ROUTE_29_46_GATE, MAP_ROUTE_29_46_GATE warp_def $21, $8, 2, GROUP_ROUTE_29_46_GATE, MAP_ROUTE_29_46_GATE warp_def $5, $e, 3, GROUP_DARK_CAVE_VIOLET_ENTRANCE, MAP_DARK_CAVE_VIOLET_ENTRANCE - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 1 - signpost 27, 9, $0, MapRoute46Signpost0Script + signpost 27, 9, SIGNPOST_READ, MapRoute46Signpost0Script - ; people-events +.PersonEvents: db 6 - person_event SPRITE_POKEFAN_M, 23, 16, $8, $0, 255, 255, $b2, 2, TrainerHikerBailey, -1 - person_event SPRITE_YOUNGSTER, 18, 8, $7, $0, 255, 255, $a2, 2, TrainerCamperTed, -1 - person_event SPRITE_LASS, 17, 6, $6, $0, 255, 255, $a2, 2, TrainerPicnickerErin1, -1 - person_event SPRITE_FRUIT_TREE, 9, 11, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x1a978f, -1 - person_event SPRITE_FRUIT_TREE, 10, 12, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x1a9791, -1 - person_event SPRITE_POKE_BALL, 19, 5, $1, $0, 255, 255, $1, 0, ItemFragment_0x1a978d, EVENT_6BC + person_event SPRITE_POKEFAN_M, 23, 16, OW_LEFT | $0, $0, -1, -1, (PAL_OW_BROWN << 4) | $82, 2, TrainerHikerBailey, -1 + person_event SPRITE_YOUNGSTER, 18, 8, OW_UP | $3, $0, -1, -1, (PAL_OW_GREEN << 4) | $82, 2, TrainerCamperTed, -1 + person_event SPRITE_LASS, 17, 6, OW_UP | $2, $0, -1, -1, (PAL_OW_GREEN << 4) | $82, 2, TrainerPicnickerErin1, -1 + person_event SPRITE_FRUIT_TREE, 9, 11, OW_DOWN | $1, $0, -1, -1, $0, 0, FruitTreeScript_0x1a978f, -1 + person_event SPRITE_FRUIT_TREE, 10, 12, OW_DOWN | $1, $0, -1, -1, $0, 0, FruitTreeScript_0x1a9791, -1 + person_event SPRITE_POKE_BALL, 19, 5, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x1a978d, EVENT_ROUTE_46_X_SPEED diff --git a/maps/Route5.asm b/maps/Route5.asm index c8b429505..e1413523a 100644 --- a/maps/Route5.asm +++ b/maps/Route5.asm @@ -1,8 +1,8 @@ Route5_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 PokefanMScript_0x1adb19: @@ -40,21 +40,21 @@ Route5_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 4 warp_def $f, $11, 1, GROUP_ROUTE_5_UNDERGROUND_ENTRANCE, MAP_ROUTE_5_UNDERGROUND_ENTRANCE warp_def $11, $8, 1, GROUP_ROUTE_5_SAFFRON_CITY_GATE, MAP_ROUTE_5_SAFFRON_CITY_GATE warp_def $11, $9, 2, GROUP_ROUTE_5_SAFFRON_CITY_GATE, MAP_ROUTE_5_SAFFRON_CITY_GATE warp_def $b, $a, 1, GROUP_ROUTE_5_CLEANSE_TAG_SPEECH_HOUSE, MAP_ROUTE_5_CLEANSE_TAG_SPEECH_HOUSE - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 2 - signpost 17, 17, $0, MapRoute5Signpost0Script - signpost 11, 10, $0, MapRoute5Signpost1Script + signpost 17, 17, SIGNPOST_READ, MapRoute5Signpost0Script + signpost 11, 10, SIGNPOST_READ, MapRoute5Signpost1Script - ; people-events +.PersonEvents: db 1 - person_event SPRITE_POKEFAN_M, 20, 21, $6, $0, 255, 255, $80, 0, PokefanMScript_0x1adb19, EVENT_771 + person_event SPRITE_POKEFAN_M, 20, 21, OW_UP | $2, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, PokefanMScript_0x1adb19, EVENT_ROUTE_5_6_POKEFAN_M_BLOCKS_UNDERGROUND_PATH diff --git a/maps/Route5CleanseTagSpeechHouse.asm b/maps/Route5CleanseTagSpeechHouse.asm index c32ab7162..8c65f57d9 100644 --- a/maps/Route5CleanseTagSpeechHouse.asm +++ b/maps/Route5CleanseTagSpeechHouse.asm @@ -1,8 +1,8 @@ Route5CleanseTagSpeechHouse_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 GrannyScript_0x18b634: @@ -60,20 +60,20 @@ Route5CleanseTagSpeechHouse_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $7, $2, 4, GROUP_ROUTE_5, MAP_ROUTE_5 warp_def $7, $3, 4, GROUP_ROUTE_5, MAP_ROUTE_5 - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 2 - signpost 1, 0, $0, HouseForSaleBookshelf - signpost 1, 1, $0, HouseForSaleBookshelf + signpost 1, 0, SIGNPOST_READ, HouseForSaleBookshelf + signpost 1, 1, SIGNPOST_READ, HouseForSaleBookshelf - ; people-events +.PersonEvents: db 2 - person_event SPRITE_GRANNY, 9, 6, $1f, $0, 255, 255, $b0, 0, GrannyScript_0x18b634, -1 - person_event SPRITE_TEACHER, 7, 9, $8, $0, 255, 255, $80, 0, TeacherScript_0x18b64f, -1 + person_event SPRITE_GRANNY, 9, 6, OW_RIGHT | $13, $0, -1, -1, (PAL_OW_BROWN << 4) | $80, 0, GrannyScript_0x18b634, -1 + person_event SPRITE_TEACHER, 7, 9, OW_LEFT | $0, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, TeacherScript_0x18b64f, -1 diff --git a/maps/Route5SaffronCityGate.asm b/maps/Route5SaffronCityGate.asm index 005250c65..92392edc0 100644 --- a/maps/Route5SaffronCityGate.asm +++ b/maps/Route5SaffronCityGate.asm @@ -1,8 +1,8 @@ Route5SaffronCityGate_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 OfficerScript_0x18b5b9: @@ -21,19 +21,19 @@ Route5SaffronCityGate_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 4 warp_def $0, $4, 2, GROUP_ROUTE_5, MAP_ROUTE_5 warp_def $0, $5, 3, GROUP_ROUTE_5, MAP_ROUTE_5 warp_def $7, $4, 9, GROUP_SAFFRON_CITY, MAP_SAFFRON_CITY warp_def $7, $5, 9, GROUP_SAFFRON_CITY, MAP_SAFFRON_CITY - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 1 - person_event SPRITE_OFFICER, 8, 4, $9, $0, 255, 255, $90, 0, OfficerScript_0x18b5b9, -1 + person_event SPRITE_OFFICER, 8, 4, OW_LEFT | $1, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, OfficerScript_0x18b5b9, -1 diff --git a/maps/Route5UndergroundEntrance.asm b/maps/Route5UndergroundEntrance.asm index fce246121..a56946e23 100644 --- a/maps/Route5UndergroundEntrance.asm +++ b/maps/Route5UndergroundEntrance.asm @@ -1,8 +1,8 @@ Route5UndergroundEntrance_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 TeacherScript_0x18b555: @@ -20,18 +20,18 @@ Route5UndergroundEntrance_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 3 warp_def $7, $3, 1, GROUP_ROUTE_5, MAP_ROUTE_5 warp_def $7, $4, 1, GROUP_ROUTE_5, MAP_ROUTE_5 warp_def $3, $4, 1, GROUP_UNDERGROUND, MAP_UNDERGROUND - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 1 - person_event SPRITE_TEACHER, 6, 6, $2, $11, 255, 255, $a0, 0, TeacherScript_0x18b555, -1 + person_event SPRITE_TEACHER, 6, 6, OW_DOWN | $2, $11, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, TeacherScript_0x18b555, -1 diff --git a/maps/Route6.asm b/maps/Route6.asm index 0b6787dd5..06e2f0c7c 100644 --- a/maps/Route6.asm +++ b/maps/Route6.asm @@ -1,28 +1,12 @@ Route6_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 TrainerPokefanmRex: - ; bit/flag number - dw EVENT_BEAT_POKEFANM_REX - - ; trainer group && trainer id - db POKEFANM, REX - - ; text when seen - dw PokefanmRexSeenText - - ; text when trainer beaten - dw PokefanmRexBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw PokefanmRexScript + trainer EVENT_BEAT_POKEFANM_REX, POKEFANM, REX, PokefanmRexSeenText, PokefanmRexBeatenText, $0000, PokefanmRexScript PokefanmRexScript: talkaftercancel @@ -33,23 +17,7 @@ PokefanmRexScript: end TrainerPokefanmAllan: - ; bit/flag number - dw EVENT_BEAT_POKEFANM_ALLAN - - ; trainer group && trainer id - db POKEFANM, ALLAN - - ; text when seen - dw PokefanmAllanSeenText - - ; text when trainer beaten - dw PokefanmAllanBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw PokefanmAllanScript + trainer EVENT_BEAT_POKEFANM_ALLAN, POKEFANM, ALLAN, PokefanmAllanSeenText, PokefanmAllanBeatenText, $0000, PokefanmAllanScript PokefanmAllanScript: talkaftercancel @@ -122,20 +90,20 @@ Route6_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $3, $11, 1, GROUP_ROUTE_6_UNDERGROUND_ENTRANCE, MAP_ROUTE_6_UNDERGROUND_ENTRANCE warp_def $1, $6, 3, GROUP_ROUTE_6_SAFFRON_GATE, MAP_ROUTE_6_SAFFRON_GATE - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 1 - signpost 5, 19, $0, MapRoute6Signpost0Script + signpost 5, 19, SIGNPOST_READ, MapRoute6Signpost0Script - ; people-events +.PersonEvents: db 3 - person_event SPRITE_POKEFAN_M, 8, 21, $6, $0, 255, 255, $b0, 2, PokefanMScript_0x1ad951, EVENT_771 - person_event SPRITE_POKEFAN_M, 16, 13, $9, $0, 255, 255, $82, 0, TrainerPokefanmRex, -1 - person_event SPRITE_POKEFAN_M, 16, 14, $8, $0, 255, 255, $82, 0, TrainerPokefanmAllan, -1 + person_event SPRITE_POKEFAN_M, 8, 21, OW_UP | $2, $0, -1, -1, (PAL_OW_BROWN << 4) | $80, 2, PokefanMScript_0x1ad951, EVENT_ROUTE_5_6_POKEFAN_M_BLOCKS_UNDERGROUND_PATH + person_event SPRITE_POKEFAN_M, 16, 13, OW_LEFT | $1, $0, -1, -1, (PAL_OW_RED << 4) | $82, 0, TrainerPokefanmRex, -1 + person_event SPRITE_POKEFAN_M, 16, 14, OW_LEFT | $0, $0, -1, -1, (PAL_OW_RED << 4) | $82, 0, TrainerPokefanmAllan, -1 diff --git a/maps/Route6SaffronGate.asm b/maps/Route6SaffronGate.asm index 9a0fb3bee..33d8b5029 100644 --- a/maps/Route6SaffronGate.asm +++ b/maps/Route6SaffronGate.asm @@ -1,11 +1,11 @@ Route6SaffronGate_MapScriptHeader: - ; trigger count +.MapTriggers: db 1 ; triggers dw UnknownScript_0x1926e9, $0000 - ; callback count +.MapCallbacks: db 0 UnknownScript_0x1926e9: @@ -60,19 +60,19 @@ Route6SaffronGate_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 4 warp_def $0, $4, 12, GROUP_SAFFRON_CITY, MAP_SAFFRON_CITY warp_def $0, $5, 13, GROUP_SAFFRON_CITY, MAP_SAFFRON_CITY warp_def $7, $4, 2, GROUP_ROUTE_6, MAP_ROUTE_6 warp_def $7, $5, 2, GROUP_ROUTE_6, MAP_ROUTE_6 - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 1 - person_event SPRITE_OFFICER, 8, 4, $9, $0, 255, 255, $90, 0, OfficerScript_0x1926ea, -1 + person_event SPRITE_OFFICER, 8, 4, OW_LEFT | $1, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, OfficerScript_0x1926ea, -1 diff --git a/maps/Route6UndergroundEntrance.asm b/maps/Route6UndergroundEntrance.asm index 9359f3fca..56b52d2cc 100644 --- a/maps/Route6UndergroundEntrance.asm +++ b/maps/Route6UndergroundEntrance.asm @@ -1,25 +1,25 @@ Route6UndergroundEntrance_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 Route6UndergroundEntrance_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 3 warp_def $7, $3, 1, GROUP_ROUTE_6, MAP_ROUTE_6 warp_def $7, $4, 1, GROUP_ROUTE_6, MAP_ROUTE_6 warp_def $3, $4, 2, GROUP_UNDERGROUND, MAP_UNDERGROUND - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 0 diff --git a/maps/Route7.asm b/maps/Route7.asm index ea86ffb32..8953a3c25 100644 --- a/maps/Route7.asm +++ b/maps/Route7.asm @@ -1,8 +1,8 @@ Route7_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 MapRoute7Signpost0Script: @@ -38,18 +38,18 @@ Route7_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $6, $f, 1, GROUP_ROUTE_7_SAFFRON_GATE, MAP_ROUTE_7_SAFFRON_GATE warp_def $7, $f, 2, GROUP_ROUTE_7_SAFFRON_GATE, MAP_ROUTE_7_SAFFRON_GATE - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 2 - signpost 11, 5, $0, MapRoute7Signpost0Script - signpost 9, 6, $0, MapRoute7Signpost1Script + signpost 11, 5, SIGNPOST_READ, MapRoute7Signpost0Script + signpost 9, 6, SIGNPOST_READ, MapRoute7Signpost1Script - ; people-events +.PersonEvents: db 0 diff --git a/maps/Route7SaffronGate.asm b/maps/Route7SaffronGate.asm index 51166b707..f1e209da1 100644 --- a/maps/Route7SaffronGate.asm +++ b/maps/Route7SaffronGate.asm @@ -1,8 +1,8 @@ Route7SaffronGate_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 OfficerScript_0x73518: @@ -46,19 +46,19 @@ Route7SaffronGate_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 4 warp_def $4, $0, 1, GROUP_ROUTE_7, MAP_ROUTE_7 warp_def $5, $0, 2, GROUP_ROUTE_7, MAP_ROUTE_7 warp_def $4, $9, 10, GROUP_SAFFRON_CITY, MAP_SAFFRON_CITY warp_def $5, $9, 11, GROUP_SAFFRON_CITY, MAP_SAFFRON_CITY - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 1 - person_event SPRITE_OFFICER, 6, 9, $6, $0, 255, 255, $90, 0, OfficerScript_0x73518, -1 + person_event SPRITE_OFFICER, 6, 9, OW_UP | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, OfficerScript_0x73518, -1 diff --git a/maps/Route8.asm b/maps/Route8.asm index c0bf7e8a2..f8fd07184 100644 --- a/maps/Route8.asm +++ b/maps/Route8.asm @@ -1,28 +1,12 @@ Route8_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 TrainerBikerDwayne: - ; bit/flag number - dw EVENT_BEAT_BIKER_DWAYNE - - ; trainer group && trainer id - db BIKER, DWAYNE - - ; text when seen - dw BikerDwayneSeenText - - ; text when trainer beaten - dw BikerDwayneBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw BikerDwayneScript + trainer EVENT_BEAT_BIKER_DWAYNE, BIKER, DWAYNE, BikerDwayneSeenText, BikerDwayneBeatenText, $0000, BikerDwayneScript BikerDwayneScript: talkaftercancel @@ -33,23 +17,7 @@ BikerDwayneScript: end TrainerBikerHarris: - ; bit/flag number - dw EVENT_BEAT_BIKER_HARRIS - - ; trainer group && trainer id - db BIKER, HARRIS - - ; text when seen - dw BikerHarrisSeenText - - ; text when trainer beaten - dw BikerHarrisBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw BikerHarrisScript + trainer EVENT_BEAT_BIKER_HARRIS, BIKER, HARRIS, BikerHarrisSeenText, BikerHarrisBeatenText, $0000, BikerHarrisScript BikerHarrisScript: talkaftercancel @@ -60,23 +28,7 @@ BikerHarrisScript: end TrainerBikerZeke: - ; bit/flag number - dw EVENT_BEAT_BIKER_ZEKE - - ; trainer group && trainer id - db BIKER, ZEKE - - ; text when seen - dw BikerZekeSeenText - - ; text when trainer beaten - dw BikerZekeBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw BikerZekeScript + trainer EVENT_BEAT_BIKER_ZEKE, BIKER, ZEKE, BikerZekeSeenText, BikerZekeBeatenText, $0000, BikerZekeScript BikerZekeScript: talkaftercancel @@ -87,23 +39,7 @@ BikerZekeScript: end TrainerSupernerdSam: - ; bit/flag number - dw EVENT_BEAT_SUPER_NERD_SAM - - ; trainer group && trainer id - db SUPER_NERD, SAM - - ; text when seen - dw SupernerdSamSeenText - - ; text when trainer beaten - dw SupernerdSamBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw SupernerdSamScript + trainer EVENT_BEAT_SUPER_NERD_SAM, SUPER_NERD, SAM, SupernerdSamSeenText, SupernerdSamBeatenText, $0000, SupernerdSamScript SupernerdSamScript: talkaftercancel @@ -114,23 +50,7 @@ SupernerdSamScript: end TrainerSupernerdTom: - ; bit/flag number - dw EVENT_BEAT_SUPER_NERD_TOM - - ; trainer group && trainer id - db SUPER_NERD, TOM - - ; text when seen - dw SupernerdTomSeenText - - ; text when trainer beaten - dw SupernerdTomBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw SupernerdTomScript + trainer EVENT_BEAT_SUPER_NERD_TOM, SUPER_NERD, TOM, SupernerdTomSeenText, SupernerdTomBeatenText, $0000, SupernerdTomScript SupernerdTomScript: talkaftercancel @@ -248,24 +168,24 @@ Route8_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $4, $4, 3, GROUP_ROUTE_8_SAFFRON_GATE, MAP_ROUTE_8_SAFFRON_GATE warp_def $5, $4, 4, GROUP_ROUTE_8_SAFFRON_GATE, MAP_ROUTE_8_SAFFRON_GATE - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 2 - signpost 7, 11, $0, MapRoute8Signpost0Script - signpost 5, 10, $0, MapRoute8Signpost1Script + signpost 7, 11, SIGNPOST_READ, MapRoute8Signpost0Script + signpost 5, 10, SIGNPOST_READ, MapRoute8Signpost1Script - ; people-events +.PersonEvents: db 6 - person_event SPRITE_BIKER, 12, 14, $8, $0, 255, 255, $82, 5, TrainerBikerDwayne, -1 - person_event SPRITE_BIKER, 13, 14, $8, $0, 255, 255, $a2, 5, TrainerBikerHarris, -1 - person_event SPRITE_BIKER, 14, 14, $8, $0, 255, 255, $92, 5, TrainerBikerZeke, -1 - person_event SPRITE_SUPER_NERD, 6, 27, $6, $0, 255, 255, $b2, 3, TrainerSupernerdSam, -1 - person_event SPRITE_SUPER_NERD, 16, 35, $a, $0, 255, 255, $b2, 4, TrainerSupernerdTom, -1 - person_event SPRITE_FRUIT_TREE, 9, 37, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x6c06c, -1 + person_event SPRITE_BIKER, 12, 14, OW_LEFT | $0, $0, -1, -1, (PAL_OW_RED << 4) | $82, 5, TrainerBikerDwayne, -1 + person_event SPRITE_BIKER, 13, 14, OW_LEFT | $0, $0, -1, -1, (PAL_OW_GREEN << 4) | $82, 5, TrainerBikerHarris, -1 + person_event SPRITE_BIKER, 14, 14, OW_LEFT | $0, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 5, TrainerBikerZeke, -1 + person_event SPRITE_SUPER_NERD, 6, 27, OW_UP | $2, $0, -1, -1, (PAL_OW_BROWN << 4) | $82, 3, TrainerSupernerdSam, -1 + person_event SPRITE_SUPER_NERD, 16, 35, OW_LEFT | $2, $0, -1, -1, (PAL_OW_BROWN << 4) | $82, 4, TrainerSupernerdTom, -1 + person_event SPRITE_FRUIT_TREE, 9, 37, OW_DOWN | $1, $0, -1, -1, $0, 0, FruitTreeScript_0x6c06c, -1 diff --git a/maps/Route8SaffronGate.asm b/maps/Route8SaffronGate.asm index a19d8ad5e..aa9cb7ca9 100644 --- a/maps/Route8SaffronGate.asm +++ b/maps/Route8SaffronGate.asm @@ -1,8 +1,8 @@ Route8SaffronGate_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 OfficerScript_0x7f416: @@ -20,19 +20,19 @@ Route8SaffronGate_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 4 warp_def $4, $0, 14, GROUP_SAFFRON_CITY, MAP_SAFFRON_CITY warp_def $5, $0, 15, GROUP_SAFFRON_CITY, MAP_SAFFRON_CITY warp_def $4, $9, 1, GROUP_ROUTE_8, MAP_ROUTE_8 warp_def $5, $9, 2, GROUP_ROUTE_8, MAP_ROUTE_8 - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 1 - person_event SPRITE_OFFICER, 6, 9, $6, $0, 255, 255, $90, 0, OfficerScript_0x7f416, -1 + person_event SPRITE_OFFICER, 6, 9, OW_UP | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, OfficerScript_0x7f416, -1 diff --git a/maps/Route9.asm b/maps/Route9.asm index 47738a798..dbf5ad79a 100644 --- a/maps/Route9.asm +++ b/maps/Route9.asm @@ -1,28 +1,12 @@ Route9_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 TrainerCamperDean: - ; bit/flag number - dw EVENT_BEAT_CAMPER_DEAN - - ; trainer group && trainer id - db CAMPER, DEAN - - ; text when seen - dw CamperDeanSeenText - - ; text when trainer beaten - dw CamperDeanBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw CamperDeanScript + trainer EVENT_BEAT_CAMPER_DEAN, CAMPER, DEAN, CamperDeanSeenText, CamperDeanBeatenText, $0000, CamperDeanScript CamperDeanScript: talkaftercancel @@ -33,23 +17,7 @@ CamperDeanScript: end TrainerPicnickerHeidi: - ; bit/flag number - dw EVENT_BEAT_PICNICKER_HEIDI - - ; trainer group && trainer id - db PICNICKER, HEIDI - - ; text when seen - dw PicnickerHeidiSeenText - - ; text when trainer beaten - dw PicnickerHeidiBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw PicnickerHeidiScript + trainer EVENT_BEAT_PICNICKER_HEIDI, PICNICKER, HEIDI, PicnickerHeidiSeenText, PicnickerHeidiBeatenText, $0000, PicnickerHeidiScript PicnickerHeidiScript: talkaftercancel @@ -60,23 +28,7 @@ PicnickerHeidiScript: end TrainerCamperSid: - ; bit/flag number - dw EVENT_BEAT_CAMPER_SID - - ; trainer group && trainer id - db CAMPER, SID - - ; text when seen - dw CamperSidSeenText - - ; text when trainer beaten - dw CamperSidBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw CamperSidScript + trainer EVENT_BEAT_CAMPER_SID, CAMPER, SID, CamperSidSeenText, CamperSidBeatenText, $0000, CamperSidScript CamperSidScript: talkaftercancel @@ -87,23 +39,7 @@ CamperSidScript: end TrainerPicnickerEdna: - ; bit/flag number - dw EVENT_BEAT_PICNICKER_EDNA - - ; trainer group && trainer id - db PICNICKER, EDNA - - ; text when seen - dw PicnickerEdnaSeenText - - ; text when trainer beaten - dw PicnickerEdnaBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw PicnickerEdnaScript + trainer EVENT_BEAT_PICNICKER_EDNA, PICNICKER, EDNA, PicnickerEdnaSeenText, PicnickerEdnaBeatenText, $0000, PicnickerEdnaScript PicnickerEdnaScript: talkaftercancel @@ -114,23 +50,7 @@ PicnickerEdnaScript: end TrainerHikerTim: - ; bit/flag number - dw EVENT_BEAT_HIKER_TIM - - ; trainer group && trainer id - db HIKER, TIM - - ; text when seen - dw HikerTimSeenText - - ; text when trainer beaten - dw HikerTimBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw HikerTimScript + trainer EVENT_BEAT_HIKER_TIM, HIKER, TIM, HikerTimSeenText, HikerTimBeatenText, $0000, HikerTimScript HikerTimScript: talkaftercancel @@ -141,23 +61,7 @@ HikerTimScript: end TrainerHikerSidney: - ; bit/flag number - dw EVENT_BEAT_HIKER_SIDNEY - - ; trainer group && trainer id - db HIKER, SIDNEY - - ; text when seen - dw HikerSidneySeenText - - ; text when trainer beaten - dw HikerSidneyBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw HikerSidneyScript + trainer EVENT_BEAT_HIKER_SIDNEY, HIKER, SIDNEY, HikerSidneySeenText, HikerSidneyBeatenText, $0000, HikerSidneyScript HikerSidneyScript: talkaftercancel @@ -171,8 +75,7 @@ MapRoute9Signpost0Script: jumptext UnknownText_0x1ab2a2 MapRoute9SignpostItem1: - dw $00f2 - db ETHER + dwb EVENT_ROUTE_9_HIDDEN_ETHER, ETHER CamperDeanSeenText: @@ -299,23 +202,23 @@ Route9_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 1 warp_def $f, $30, 1, GROUP_ROCK_TUNNEL_1F, MAP_ROCK_TUNNEL_1F - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 2 - signpost 7, 15, $0, MapRoute9Signpost0Script - signpost 15, 41, $7, MapRoute9SignpostItem1 + signpost 7, 15, SIGNPOST_READ, MapRoute9Signpost0Script + signpost 15, 41, SIGNPOST_ITEM, MapRoute9SignpostItem1 - ; people-events +.PersonEvents: db 6 - person_event SPRITE_YOUNGSTER, 15, 27, $8, $0, 255, 255, $a2, 3, TrainerCamperDean, -1 - person_event SPRITE_LASS, 12, 43, $a, $0, 255, 255, $a2, 3, TrainerPicnickerHeidi, -1 - person_event SPRITE_YOUNGSTER, 8, 15, $a, $0, 255, 255, $a2, 5, TrainerCamperSid, -1 - person_event SPRITE_LASS, 19, 16, $7, $0, 255, 255, $a2, 1, TrainerPicnickerEdna, -1 - person_event SPRITE_POKEFAN_M, 7, 32, $9, $0, 255, 255, $b2, 2, TrainerHikerTim, -1 - person_event SPRITE_POKEFAN_M, 19, 40, $9, $0, 255, 255, $b2, 4, TrainerHikerSidney, -1 + person_event SPRITE_YOUNGSTER, 15, 27, OW_LEFT | $0, $0, -1, -1, (PAL_OW_GREEN << 4) | $82, 3, TrainerCamperDean, -1 + person_event SPRITE_LASS, 12, 43, OW_LEFT | $2, $0, -1, -1, (PAL_OW_GREEN << 4) | $82, 3, TrainerPicnickerHeidi, -1 + person_event SPRITE_YOUNGSTER, 8, 15, OW_LEFT | $2, $0, -1, -1, (PAL_OW_GREEN << 4) | $82, 5, TrainerCamperSid, -1 + person_event SPRITE_LASS, 19, 16, OW_UP | $3, $0, -1, -1, (PAL_OW_GREEN << 4) | $82, 1, TrainerPicnickerEdna, -1 + person_event SPRITE_POKEFAN_M, 7, 32, OW_LEFT | $1, $0, -1, -1, (PAL_OW_BROWN << 4) | $82, 2, TrainerHikerTim, -1 + person_event SPRITE_POKEFAN_M, 19, 40, OW_LEFT | $1, $0, -1, -1, (PAL_OW_BROWN << 4) | $82, 4, TrainerHikerSidney, -1 diff --git a/maps/RuinsofAlphAerodactylChamber.asm b/maps/RuinsofAlphAerodactylChamber.asm index d9fd82bd4..aebf46743 100644 --- a/maps/RuinsofAlphAerodactylChamber.asm +++ b/maps/RuinsofAlphAerodactylChamber.asm @@ -1,12 +1,12 @@ RuinsofAlphAerodactylChamber_MapScriptHeader: - ; trigger count +.MapTriggers: db 2 ; triggers dw UnknownScript_0x58dad, $0000 dw UnknownScript_0x58db8, $0000 - ; callback count +.MapCallbacks: db 1 ; callbacks @@ -30,7 +30,7 @@ UnknownScript_0x58db9: iftrue UnknownScript_0x58dc3 changeblock $4, $0, $2e UnknownScript_0x58dc3: - checkevent EVENT_2A3 + checkevent EVENT_SOLVED_AERODACTYL_PUZZLE iffalse UnknownScript_0x58dca return @@ -42,7 +42,7 @@ UnknownScript_0x58dca: UnknownScript_0x58dd3: pause 30 earthquake 30 - showemote $0, $0, 20 + showemote EMOTE_SHOCK, $0, 20 pause 30 playsound SFX_STRENGTH changeblock $4, $0, $30 @@ -55,18 +55,18 @@ UnknownScript_0x58dd3: MapRuinsofAlphAerodactylChamberSignpost2Script: refreshscreen $0 writebyte $2 - special Functionc360 + special Special_UnownPuzzle loadmovesprites iftrue UnknownScript_0x58df7 end UnknownScript_0x58df7: - setevent EVENT_705 - setevent EVENT_2A3 + setevent EVENT_RUINS_OF_ALPH_INNER_CHAMBER_TOURISTS + setevent EVENT_SOLVED_AERODACTYL_PUZZLE setflag ENGINE_UNLOCKED_UNOWNS_3 domaptrigger GROUP_RUINS_OF_ALPH_INNER_CHAMBER, MAP_RUINS_OF_ALPH_INNER_CHAMBER, $1 earthquake 30 - showemote $0, $0, 15 + showemote EMOTE_SHOCK, $0, 15 changeblock $2, $2, $18 changeblock $4, $2, $19 reloadmappart @@ -89,7 +89,7 @@ MapRuinsofAlphAerodactylChamberSignpost4Script: loadfont writetext UnknownText_0x58e4f writebyte $1 - special Function8ae68 + special Special_DisplayUnownWords loadmovesprites end @@ -99,7 +99,7 @@ MapRuinsofAlphAerodactylChamberSignpost5Script: loadfont writetext UnknownText_0x58e81 writebyte $1 - special Function8ae68 + special Special_DisplayUnownWords loadmovesprites end @@ -152,7 +152,7 @@ RuinsofAlphAerodactylChamber_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 5 warp_def $9, $3, 4, GROUP_RUINS_OF_ALPH_OUTSIDE, MAP_RUINS_OF_ALPH_OUTSIDE warp_def $9, $4, 4, GROUP_RUINS_OF_ALPH_OUTSIDE, MAP_RUINS_OF_ALPH_OUTSIDE @@ -160,17 +160,17 @@ RuinsofAlphAerodactylChamber_MapEventHeader: warp_def $3, $4, 9, GROUP_RUINS_OF_ALPH_INNER_CHAMBER, MAP_RUINS_OF_ALPH_INNER_CHAMBER warp_def $0, $4, 1, GROUP_RUINS_OF_ALPH_AERODACTYL_ITEM_ROOM, MAP_RUINS_OF_ALPH_AERODACTYL_ITEM_ROOM - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 6 - signpost 3, 2, $0, MapRuinsofAlphAerodactylChamberSignpost1Script - signpost 3, 5, $0, MapRuinsofAlphAerodactylChamberSignpost1Script - signpost 2, 3, $1, MapRuinsofAlphAerodactylChamberSignpost2Script - signpost 2, 4, $1, MapRuinsofAlphAerodactylChamberSignpost3Script - signpost 0, 3, $1, MapRuinsofAlphAerodactylChamberSignpost4Script - signpost 0, 4, $1, MapRuinsofAlphAerodactylChamberSignpost5Script - - ; people-events + signpost 3, 2, SIGNPOST_READ, MapRuinsofAlphAerodactylChamberSignpost1Script + signpost 3, 5, SIGNPOST_READ, MapRuinsofAlphAerodactylChamberSignpost1Script + signpost 2, 3, SIGNPOST_UP, MapRuinsofAlphAerodactylChamberSignpost2Script + signpost 2, 4, SIGNPOST_UP, MapRuinsofAlphAerodactylChamberSignpost3Script + signpost 0, 3, SIGNPOST_UP, MapRuinsofAlphAerodactylChamberSignpost4Script + signpost 0, 4, SIGNPOST_UP, MapRuinsofAlphAerodactylChamberSignpost5Script + +.PersonEvents: db 0 diff --git a/maps/RuinsofAlphAerodactylItemRoom.asm b/maps/RuinsofAlphAerodactylItemRoom.asm index e93f8a438..1eb5ece90 100644 --- a/maps/RuinsofAlphAerodactylItemRoom.asm +++ b/maps/RuinsofAlphAerodactylItemRoom.asm @@ -1,8 +1,8 @@ RuinsofAlphAerodactylItemRoom_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 ItemFragment_0x59ab6: @@ -30,24 +30,24 @@ RuinsofAlphAerodactylItemRoom_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 4 warp_def $9, $3, 5, GROUP_RUINS_OF_ALPH_AERODACTYL_CHAMBER, MAP_RUINS_OF_ALPH_AERODACTYL_CHAMBER warp_def $9, $4, 5, GROUP_RUINS_OF_ALPH_AERODACTYL_CHAMBER, MAP_RUINS_OF_ALPH_AERODACTYL_CHAMBER warp_def $1, $3, 1, GROUP_RUINS_OF_ALPH_AERODACTYL_WORD_ROOM, MAP_RUINS_OF_ALPH_AERODACTYL_WORD_ROOM warp_def $1, $4, 2, GROUP_RUINS_OF_ALPH_AERODACTYL_WORD_ROOM, MAP_RUINS_OF_ALPH_AERODACTYL_WORD_ROOM - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 2 - signpost 1, 2, $0, MapRuinsofAlphAerodactylItemRoomSignpost1Script - signpost 1, 5, $0, MapRuinsofAlphAerodactylItemRoomSignpost1Script + signpost 1, 2, SIGNPOST_READ, MapRuinsofAlphAerodactylItemRoomSignpost1Script + signpost 1, 5, SIGNPOST_READ, MapRuinsofAlphAerodactylItemRoomSignpost1Script - ; people-events +.PersonEvents: db 4 - person_event SPRITE_POKE_BALL, 10, 6, $1, $0, 255, 255, $1, 0, ItemFragment_0x59ab6, EVENT_PICKED_UP_GOLD_BERRY_FROM_AERODACTYL_ITEM_ROOM - person_event SPRITE_POKE_BALL, 10, 9, $1, $0, 255, 255, $1, 0, ItemFragment_0x59ab8, EVENT_PICKED_UP_MOON_STONE_FROM_AERODACTYL_ITEM_ROOM - person_event SPRITE_POKE_BALL, 8, 6, $1, $0, 255, 255, $1, 0, ItemFragment_0x59aba, EVENT_PICKED_UP_HEAL_POWDER_FROM_AERODACTYL_ITEM_ROOM - person_event SPRITE_POKE_BALL, 8, 9, $1, $0, 255, 255, $1, 0, ItemFragment_0x59abc, EVENT_PICKED_UP_ENERGY_ROOT_FROM_AERODACTYL_ITEM_ROOM + person_event SPRITE_POKE_BALL, 10, 6, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x59ab6, EVENT_PICKED_UP_GOLD_BERRY_FROM_AERODACTYL_ITEM_ROOM + person_event SPRITE_POKE_BALL, 10, 9, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x59ab8, EVENT_PICKED_UP_MOON_STONE_FROM_AERODACTYL_ITEM_ROOM + person_event SPRITE_POKE_BALL, 8, 6, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x59aba, EVENT_PICKED_UP_HEAL_POWDER_FROM_AERODACTYL_ITEM_ROOM + person_event SPRITE_POKE_BALL, 8, 9, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x59abc, EVENT_PICKED_UP_ENERGY_ROOT_FROM_AERODACTYL_ITEM_ROOM diff --git a/maps/RuinsofAlphAerodactylWordRoom.asm b/maps/RuinsofAlphAerodactylWordRoom.asm index 447bdca02..29d56222e 100644 --- a/maps/RuinsofAlphAerodactylWordRoom.asm +++ b/maps/RuinsofAlphAerodactylWordRoom.asm @@ -1,25 +1,25 @@ RuinsofAlphAerodactylWordRoom_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 RuinsofAlphAerodactylWordRoom_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 3 warp_def $5, $9, 3, GROUP_RUINS_OF_ALPH_AERODACTYL_ITEM_ROOM, MAP_RUINS_OF_ALPH_AERODACTYL_ITEM_ROOM warp_def $5, $a, 4, GROUP_RUINS_OF_ALPH_AERODACTYL_ITEM_ROOM, MAP_RUINS_OF_ALPH_AERODACTYL_ITEM_ROOM warp_def $b, $11, 8, GROUP_RUINS_OF_ALPH_INNER_CHAMBER, MAP_RUINS_OF_ALPH_INNER_CHAMBER - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 0 diff --git a/maps/RuinsofAlphHoOhChamber.asm b/maps/RuinsofAlphHoOhChamber.asm index ec375ecb6..b75262481 100644 --- a/maps/RuinsofAlphHoOhChamber.asm +++ b/maps/RuinsofAlphHoOhChamber.asm @@ -1,12 +1,12 @@ RuinsofAlphHoOhChamber_MapScriptHeader: - ; trigger count +.MapTriggers: db 2 ; triggers dw UnknownScript_0x5856d, $0000 dw UnknownScript_0x5857b, $0000 - ; callback count +.MapCallbacks: db 1 ; callbacks @@ -31,7 +31,7 @@ UnknownScript_0x5857c: iftrue UnknownScript_0x58586 changeblock $4, $0, $2e UnknownScript_0x58586: - checkevent EVENT_2A0 + checkevent EVENT_SOLVED_HO_OH_PUZZLE iffalse UnknownScript_0x5858d return @@ -43,7 +43,7 @@ UnknownScript_0x5858d: UnknownScript_0x58596: pause 30 earthquake 30 - showemote $0, $0, 20 + showemote EMOTE_SHOCK, $0, 20 pause 30 playsound SFX_STRENGTH changeblock $4, $0, $30 @@ -56,18 +56,18 @@ UnknownScript_0x58596: MapRuinsofAlphHoOhChamberSignpost2Script: refreshscreen $0 writebyte $3 - special Functionc360 + special Special_UnownPuzzle loadmovesprites iftrue UnknownScript_0x585ba end UnknownScript_0x585ba: - setevent EVENT_705 - setevent EVENT_2A0 + setevent EVENT_RUINS_OF_ALPH_INNER_CHAMBER_TOURISTS + setevent EVENT_SOLVED_HO_OH_PUZZLE setflag ENGINE_UNLOCKED_UNOWNS_4 domaptrigger GROUP_RUINS_OF_ALPH_INNER_CHAMBER, MAP_RUINS_OF_ALPH_INNER_CHAMBER, $1 earthquake 30 - showemote $0, $0, 15 + showemote EMOTE_SHOCK, $0, 15 changeblock $2, $2, $18 changeblock $4, $2, $19 reloadmappart @@ -90,7 +90,7 @@ MapRuinsofAlphHoOhChamberSignpost4Script: loadfont writetext UnknownText_0x58612 writebyte $3 - special Function8ae68 + special Special_DisplayUnownWords loadmovesprites end @@ -100,7 +100,7 @@ MapRuinsofAlphHoOhChamberSignpost5Script: loadfont writetext UnknownText_0x58644 writebyte $3 - special Function8ae68 + special Special_DisplayUnownWords loadmovesprites end @@ -153,7 +153,7 @@ RuinsofAlphHoOhChamber_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 5 warp_def $9, $3, 1, GROUP_RUINS_OF_ALPH_OUTSIDE, MAP_RUINS_OF_ALPH_OUTSIDE warp_def $9, $4, 1, GROUP_RUINS_OF_ALPH_OUTSIDE, MAP_RUINS_OF_ALPH_OUTSIDE @@ -161,17 +161,17 @@ RuinsofAlphHoOhChamber_MapEventHeader: warp_def $3, $4, 3, GROUP_RUINS_OF_ALPH_INNER_CHAMBER, MAP_RUINS_OF_ALPH_INNER_CHAMBER warp_def $0, $4, 1, GROUP_RUINS_OF_ALPH_HO_OH_ITEM_ROOM, MAP_RUINS_OF_ALPH_HO_OH_ITEM_ROOM - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 6 - signpost 3, 2, $0, MapRuinsofAlphHoOhChamberSignpost1Script - signpost 3, 5, $0, MapRuinsofAlphHoOhChamberSignpost1Script - signpost 2, 3, $1, MapRuinsofAlphHoOhChamberSignpost2Script - signpost 2, 4, $1, MapRuinsofAlphHoOhChamberSignpost3Script - signpost 0, 3, $1, MapRuinsofAlphHoOhChamberSignpost4Script - signpost 0, 4, $1, MapRuinsofAlphHoOhChamberSignpost5Script - - ; people-events + signpost 3, 2, SIGNPOST_READ, MapRuinsofAlphHoOhChamberSignpost1Script + signpost 3, 5, SIGNPOST_READ, MapRuinsofAlphHoOhChamberSignpost1Script + signpost 2, 3, SIGNPOST_UP, MapRuinsofAlphHoOhChamberSignpost2Script + signpost 2, 4, SIGNPOST_UP, MapRuinsofAlphHoOhChamberSignpost3Script + signpost 0, 3, SIGNPOST_UP, MapRuinsofAlphHoOhChamberSignpost4Script + signpost 0, 4, SIGNPOST_UP, MapRuinsofAlphHoOhChamberSignpost5Script + +.PersonEvents: db 0 diff --git a/maps/RuinsofAlphHoOhItemRoom.asm b/maps/RuinsofAlphHoOhItemRoom.asm index c3e2e1657..70476bbde 100644 --- a/maps/RuinsofAlphHoOhItemRoom.asm +++ b/maps/RuinsofAlphHoOhItemRoom.asm @@ -1,8 +1,8 @@ RuinsofAlphHoOhItemRoom_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 ItemFragment_0x59918: @@ -30,24 +30,24 @@ RuinsofAlphHoOhItemRoom_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 4 warp_def $9, $3, 5, GROUP_RUINS_OF_ALPH_HO_OH_CHAMBER, MAP_RUINS_OF_ALPH_HO_OH_CHAMBER warp_def $9, $4, 5, GROUP_RUINS_OF_ALPH_HO_OH_CHAMBER, MAP_RUINS_OF_ALPH_HO_OH_CHAMBER warp_def $1, $3, 1, GROUP_RUINS_OF_ALPH_HO_OH_WORD_ROOM, MAP_RUINS_OF_ALPH_HO_OH_WORD_ROOM warp_def $1, $4, 2, GROUP_RUINS_OF_ALPH_HO_OH_WORD_ROOM, MAP_RUINS_OF_ALPH_HO_OH_WORD_ROOM - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 2 - signpost 1, 2, $0, MapRuinsofAlphHoOhItemRoomSignpost1Script - signpost 1, 5, $0, MapRuinsofAlphHoOhItemRoomSignpost1Script + signpost 1, 2, SIGNPOST_READ, MapRuinsofAlphHoOhItemRoomSignpost1Script + signpost 1, 5, SIGNPOST_READ, MapRuinsofAlphHoOhItemRoomSignpost1Script - ; people-events +.PersonEvents: db 4 - person_event SPRITE_POKE_BALL, 10, 6, $1, $0, 255, 255, $1, 0, ItemFragment_0x59918, EVENT_PICKED_UP_GOLD_BERRY_FROM_HO_OH_ITEM_ROOM - person_event SPRITE_POKE_BALL, 10, 9, $1, $0, 255, 255, $1, 0, ItemFragment_0x5991a, EVENT_PICKED_UP_MYSTERYBERRY_FROM_HO_OH_ITEM_ROOM - person_event SPRITE_POKE_BALL, 8, 6, $1, $0, 255, 255, $1, 0, ItemFragment_0x5991c, EVENT_PICKED_UP_REVIVAL_HERB_FROM_HO_OH_ITEM_ROOM - person_event SPRITE_POKE_BALL, 8, 9, $1, $0, 255, 255, $1, 0, ItemFragment_0x5991e, EVENT_PICKED_UP_CHARCOAL_FROM_HO_OH_ITEM_ROOM + person_event SPRITE_POKE_BALL, 10, 6, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x59918, EVENT_PICKED_UP_GOLD_BERRY_FROM_HO_OH_ITEM_ROOM + person_event SPRITE_POKE_BALL, 10, 9, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x5991a, EVENT_PICKED_UP_MYSTERYBERRY_FROM_HO_OH_ITEM_ROOM + person_event SPRITE_POKE_BALL, 8, 6, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x5991c, EVENT_PICKED_UP_REVIVAL_HERB_FROM_HO_OH_ITEM_ROOM + person_event SPRITE_POKE_BALL, 8, 9, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x5991e, EVENT_PICKED_UP_CHARCOAL_FROM_HO_OH_ITEM_ROOM diff --git a/maps/RuinsofAlphHoOhWordRoom.asm b/maps/RuinsofAlphHoOhWordRoom.asm index ae71b1ebc..f11abcd6a 100644 --- a/maps/RuinsofAlphHoOhWordRoom.asm +++ b/maps/RuinsofAlphHoOhWordRoom.asm @@ -1,25 +1,25 @@ RuinsofAlphHoOhWordRoom_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 RuinsofAlphHoOhWordRoom_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 3 warp_def $9, $9, 3, GROUP_RUINS_OF_ALPH_HO_OH_ITEM_ROOM, MAP_RUINS_OF_ALPH_HO_OH_ITEM_ROOM warp_def $9, $a, 4, GROUP_RUINS_OF_ALPH_HO_OH_ITEM_ROOM, MAP_RUINS_OF_ALPH_HO_OH_ITEM_ROOM warp_def $15, $11, 2, GROUP_RUINS_OF_ALPH_INNER_CHAMBER, MAP_RUINS_OF_ALPH_INNER_CHAMBER - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 0 diff --git a/maps/RuinsofAlphInnerChamber.asm b/maps/RuinsofAlphInnerChamber.asm index 1ce89c0ec..311714c86 100644 --- a/maps/RuinsofAlphInnerChamber.asm +++ b/maps/RuinsofAlphInnerChamber.asm @@ -1,12 +1,12 @@ RuinsofAlphInnerChamber_MapScriptHeader: - ; trigger count +.MapTriggers: db 2 ; triggers dw UnknownScript_0x58f69, $0000 dw UnknownScript_0x58f6a, $0000 - ; callback count +.MapCallbacks: db 0 UnknownScript_0x58f69: @@ -25,7 +25,7 @@ UnknownScript_0x58f6e: loadmovesprites dotrigger $0 setevent EVENT_MADE_UNOWN_APPEAR_IN_RUINS - clearevent EVENT_78E + clearevent EVENT_RUINS_OF_ALPH_OUTSIDE_TOURIST_FISHER end FisherScript_0x58f7d: @@ -79,7 +79,7 @@ RuinsofAlphInnerChamber_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 9 warp_def $d, $a, 5, GROUP_RUINS_OF_ALPH_OUTSIDE, MAP_RUINS_OF_ALPH_OUTSIDE warp_def $f, $3, 3, GROUP_RUINS_OF_ALPH_HO_OH_CHAMBER, MAP_RUINS_OF_ALPH_HO_OH_CHAMBER @@ -91,40 +91,40 @@ RuinsofAlphInnerChamber_MapEventHeader: warp_def $18, $f, 3, GROUP_RUINS_OF_ALPH_AERODACTYL_CHAMBER, MAP_RUINS_OF_ALPH_AERODACTYL_CHAMBER warp_def $18, $10, 4, GROUP_RUINS_OF_ALPH_AERODACTYL_CHAMBER, MAP_RUINS_OF_ALPH_AERODACTYL_CHAMBER - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 26 - signpost 3, 2, $0, MapRuinsofAlphInnerChamberSignpost25Script - signpost 3, 5, $0, MapRuinsofAlphInnerChamberSignpost25Script - signpost 3, 8, $0, MapRuinsofAlphInnerChamberSignpost25Script - signpost 3, 11, $0, MapRuinsofAlphInnerChamberSignpost25Script - signpost 3, 14, $0, MapRuinsofAlphInnerChamberSignpost25Script - signpost 3, 17, $0, MapRuinsofAlphInnerChamberSignpost25Script - signpost 8, 2, $0, MapRuinsofAlphInnerChamberSignpost25Script - signpost 8, 5, $0, MapRuinsofAlphInnerChamberSignpost25Script - signpost 8, 8, $0, MapRuinsofAlphInnerChamberSignpost25Script - signpost 8, 11, $0, MapRuinsofAlphInnerChamberSignpost25Script - signpost 8, 14, $0, MapRuinsofAlphInnerChamberSignpost25Script - signpost 8, 17, $0, MapRuinsofAlphInnerChamberSignpost25Script - signpost 13, 2, $0, MapRuinsofAlphInnerChamberSignpost25Script - signpost 13, 17, $0, MapRuinsofAlphInnerChamberSignpost25Script - signpost 18, 2, $0, MapRuinsofAlphInnerChamberSignpost25Script - signpost 18, 5, $0, MapRuinsofAlphInnerChamberSignpost25Script - signpost 18, 8, $0, MapRuinsofAlphInnerChamberSignpost25Script - signpost 18, 11, $0, MapRuinsofAlphInnerChamberSignpost25Script - signpost 18, 14, $0, MapRuinsofAlphInnerChamberSignpost25Script - signpost 18, 17, $0, MapRuinsofAlphInnerChamberSignpost25Script - signpost 24, 2, $0, MapRuinsofAlphInnerChamberSignpost25Script - signpost 24, 5, $0, MapRuinsofAlphInnerChamberSignpost25Script - signpost 24, 8, $0, MapRuinsofAlphInnerChamberSignpost25Script - signpost 24, 11, $0, MapRuinsofAlphInnerChamberSignpost25Script - signpost 24, 14, $0, MapRuinsofAlphInnerChamberSignpost25Script - signpost 24, 17, $0, MapRuinsofAlphInnerChamberSignpost25Script - - ; people-events + signpost 3, 2, SIGNPOST_READ, MapRuinsofAlphInnerChamberSignpost25Script + signpost 3, 5, SIGNPOST_READ, MapRuinsofAlphInnerChamberSignpost25Script + signpost 3, 8, SIGNPOST_READ, MapRuinsofAlphInnerChamberSignpost25Script + signpost 3, 11, SIGNPOST_READ, MapRuinsofAlphInnerChamberSignpost25Script + signpost 3, 14, SIGNPOST_READ, MapRuinsofAlphInnerChamberSignpost25Script + signpost 3, 17, SIGNPOST_READ, MapRuinsofAlphInnerChamberSignpost25Script + signpost 8, 2, SIGNPOST_READ, MapRuinsofAlphInnerChamberSignpost25Script + signpost 8, 5, SIGNPOST_READ, MapRuinsofAlphInnerChamberSignpost25Script + signpost 8, 8, SIGNPOST_READ, MapRuinsofAlphInnerChamberSignpost25Script + signpost 8, 11, SIGNPOST_READ, MapRuinsofAlphInnerChamberSignpost25Script + signpost 8, 14, SIGNPOST_READ, MapRuinsofAlphInnerChamberSignpost25Script + signpost 8, 17, SIGNPOST_READ, MapRuinsofAlphInnerChamberSignpost25Script + signpost 13, 2, SIGNPOST_READ, MapRuinsofAlphInnerChamberSignpost25Script + signpost 13, 17, SIGNPOST_READ, MapRuinsofAlphInnerChamberSignpost25Script + signpost 18, 2, SIGNPOST_READ, MapRuinsofAlphInnerChamberSignpost25Script + signpost 18, 5, SIGNPOST_READ, MapRuinsofAlphInnerChamberSignpost25Script + signpost 18, 8, SIGNPOST_READ, MapRuinsofAlphInnerChamberSignpost25Script + signpost 18, 11, SIGNPOST_READ, MapRuinsofAlphInnerChamberSignpost25Script + signpost 18, 14, SIGNPOST_READ, MapRuinsofAlphInnerChamberSignpost25Script + signpost 18, 17, SIGNPOST_READ, MapRuinsofAlphInnerChamberSignpost25Script + signpost 24, 2, SIGNPOST_READ, MapRuinsofAlphInnerChamberSignpost25Script + signpost 24, 5, SIGNPOST_READ, MapRuinsofAlphInnerChamberSignpost25Script + signpost 24, 8, SIGNPOST_READ, MapRuinsofAlphInnerChamberSignpost25Script + signpost 24, 11, SIGNPOST_READ, MapRuinsofAlphInnerChamberSignpost25Script + signpost 24, 14, SIGNPOST_READ, MapRuinsofAlphInnerChamberSignpost25Script + signpost 24, 17, SIGNPOST_READ, MapRuinsofAlphInnerChamberSignpost25Script + +.PersonEvents: db 3 - person_event SPRITE_FISHER, 11, 7, $3, $0, 255, 255, $a0, 0, FisherScript_0x58f7d, EVENT_705 - person_event SPRITE_TEACHER, 17, 18, $2, $11, 255, 255, $0, 0, TeacherScript_0x58f80, EVENT_705 - person_event SPRITE_GRAMPS, 23, 15, $7, $0, 255, 255, $b0, 0, GrampsScript_0x58f83, EVENT_705 + person_event SPRITE_FISHER, 11, 7, OW_DOWN | $3, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, FisherScript_0x58f7d, EVENT_RUINS_OF_ALPH_INNER_CHAMBER_TOURISTS + person_event SPRITE_TEACHER, 17, 18, OW_DOWN | $2, $11, -1, -1, $0, 0, TeacherScript_0x58f80, EVENT_RUINS_OF_ALPH_INNER_CHAMBER_TOURISTS + person_event SPRITE_GRAMPS, 23, 15, OW_UP | $3, $0, -1, -1, (PAL_OW_BROWN << 4) | $80, 0, GrampsScript_0x58f83, EVENT_RUINS_OF_ALPH_INNER_CHAMBER_TOURISTS diff --git a/maps/RuinsofAlphKabutoChamber.asm b/maps/RuinsofAlphKabutoChamber.asm index 0c46a3b21..18f537546 100644 --- a/maps/RuinsofAlphKabutoChamber.asm +++ b/maps/RuinsofAlphKabutoChamber.asm @@ -1,12 +1,12 @@ RuinsofAlphKabutoChamber_MapScriptHeader: - ; trigger count +.MapTriggers: db 2 ; triggers dw UnknownScript_0x5872b, $0000 dw UnknownScript_0x58736, $0000 - ; callback count +.MapCallbacks: db 1 ; callbacks @@ -32,7 +32,7 @@ UnknownScript_0x58737: iftrue UnknownScript_0x58741 changeblock $4, $0, $2e UnknownScript_0x58741: - checkevent EVENT_2A1 + checkevent EVENT_SOLVED_KABUTO_PUZZLE iffalse UnknownScript_0x58748 return @@ -44,7 +44,7 @@ UnknownScript_0x58748: UnknownScript_0x58751: pause 30 earthquake 30 - showemote $0, $0, 20 + showemote EMOTE_SHOCK, $0, 20 pause 30 playsound SFX_STRENGTH changeblock $4, $0, $30 @@ -60,19 +60,19 @@ ReceptionistScript_0x58769: MapRuinsofAlphKabutoChamberSignpost2Script: refreshscreen $0 writebyte $0 - special Functionc360 + special Special_UnownPuzzle loadmovesprites iftrue UnknownScript_0x58778 end UnknownScript_0x58778: - setevent EVENT_705 - setevent EVENT_2A1 + setevent EVENT_RUINS_OF_ALPH_INNER_CHAMBER_TOURISTS + setevent EVENT_SOLVED_KABUTO_PUZZLE setflag ENGINE_UNLOCKED_UNOWNS_1 - setevent EVENT_74E + setevent EVENT_RUINS_OF_ALPH_KABUTO_CHAMBER_RECEPTIONIST domaptrigger GROUP_RUINS_OF_ALPH_INNER_CHAMBER, MAP_RUINS_OF_ALPH_INNER_CHAMBER, $1 earthquake 30 - showemote $0, $0, 15 + showemote EMOTE_SHOCK, $0, 15 changeblock $2, $2, $18 changeblock $4, $2, $19 reloadmappart @@ -92,7 +92,7 @@ ScientistScript_0x587a8: if_equal 26, UnknownScript_0x587cf checkevent EVENT_WALL_OPENED_IN_KABUTO_CHAMBER iftrue UnknownScript_0x587c9 - checkevent EVENT_2A1 + checkevent EVENT_SOLVED_KABUTO_PUZZLE iffalse UnknownScript_0x587c0 writetext UnknownText_0x589b8 keeptextopen @@ -125,7 +125,7 @@ MapRuinsofAlphKabutoChamberSignpost4Script: loadfont writetext UnknownText_0x58aa7 writebyte $0 - special Function8ae68 + special Special_DisplayUnownWords loadmovesprites end @@ -135,7 +135,7 @@ MapRuinsofAlphKabutoChamberSignpost5Script: loadfont writetext UnknownText_0x58ad9 writebyte $0 - special Function8ae68 + special Special_DisplayUnownWords loadmovesprites end @@ -262,7 +262,7 @@ RuinsofAlphKabutoChamber_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 5 warp_def $9, $3, 2, GROUP_RUINS_OF_ALPH_OUTSIDE, MAP_RUINS_OF_ALPH_OUTSIDE warp_def $9, $4, 2, GROUP_RUINS_OF_ALPH_OUTSIDE, MAP_RUINS_OF_ALPH_OUTSIDE @@ -270,19 +270,19 @@ RuinsofAlphKabutoChamber_MapEventHeader: warp_def $3, $4, 5, GROUP_RUINS_OF_ALPH_INNER_CHAMBER, MAP_RUINS_OF_ALPH_INNER_CHAMBER warp_def $0, $4, 1, GROUP_RUINS_OF_ALPH_KABUTO_ITEM_ROOM, MAP_RUINS_OF_ALPH_KABUTO_ITEM_ROOM - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 6 - signpost 3, 2, $0, MapRuinsofAlphKabutoChamberSignpost1Script - signpost 3, 5, $0, MapRuinsofAlphKabutoChamberSignpost1Script - signpost 2, 3, $1, MapRuinsofAlphKabutoChamberSignpost2Script - signpost 2, 4, $1, MapRuinsofAlphKabutoChamberSignpost3Script - signpost 0, 3, $1, MapRuinsofAlphKabutoChamberSignpost4Script - signpost 0, 4, $1, MapRuinsofAlphKabutoChamberSignpost5Script - - ; people-events + signpost 3, 2, SIGNPOST_READ, MapRuinsofAlphKabutoChamberSignpost1Script + signpost 3, 5, SIGNPOST_READ, MapRuinsofAlphKabutoChamberSignpost1Script + signpost 2, 3, SIGNPOST_UP, MapRuinsofAlphKabutoChamberSignpost2Script + signpost 2, 4, SIGNPOST_UP, MapRuinsofAlphKabutoChamberSignpost3Script + signpost 0, 3, SIGNPOST_UP, MapRuinsofAlphKabutoChamberSignpost4Script + signpost 0, 4, SIGNPOST_UP, MapRuinsofAlphKabutoChamberSignpost5Script + +.PersonEvents: db 2 - person_event SPRITE_RECEPTIONIST, 9, 9, $6, $0, 255, 255, $0, 0, ReceptionistScript_0x58769, EVENT_74E - person_event SPRITE_SCIENTIST, 5, 7, $7, $0, 255, 255, $90, 0, ScientistScript_0x587a8, -1 + person_event SPRITE_RECEPTIONIST, 9, 9, OW_UP | $2, $0, -1, -1, $0, 0, ReceptionistScript_0x58769, EVENT_RUINS_OF_ALPH_KABUTO_CHAMBER_RECEPTIONIST + person_event SPRITE_SCIENTIST, 5, 7, OW_UP | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, ScientistScript_0x587a8, -1 diff --git a/maps/RuinsofAlphKabutoItemRoom.asm b/maps/RuinsofAlphKabutoItemRoom.asm index cbbb8503d..67c4c8681 100644 --- a/maps/RuinsofAlphKabutoItemRoom.asm +++ b/maps/RuinsofAlphKabutoItemRoom.asm @@ -1,8 +1,8 @@ RuinsofAlphKabutoItemRoom_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 ItemFragment_0x599a2: @@ -30,24 +30,24 @@ RuinsofAlphKabutoItemRoom_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 4 warp_def $9, $3, 5, GROUP_RUINS_OF_ALPH_KABUTO_CHAMBER, MAP_RUINS_OF_ALPH_KABUTO_CHAMBER warp_def $9, $4, 5, GROUP_RUINS_OF_ALPH_KABUTO_CHAMBER, MAP_RUINS_OF_ALPH_KABUTO_CHAMBER warp_def $1, $3, 1, GROUP_RUINS_OF_ALPH_KABUTO_WORD_ROOM, MAP_RUINS_OF_ALPH_KABUTO_WORD_ROOM warp_def $1, $4, 2, GROUP_RUINS_OF_ALPH_KABUTO_WORD_ROOM, MAP_RUINS_OF_ALPH_KABUTO_WORD_ROOM - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 2 - signpost 1, 2, $0, MapRuinsofAlphKabutoItemRoomSignpost1Script - signpost 1, 5, $0, MapRuinsofAlphKabutoItemRoomSignpost1Script + signpost 1, 2, SIGNPOST_READ, MapRuinsofAlphKabutoItemRoomSignpost1Script + signpost 1, 5, SIGNPOST_READ, MapRuinsofAlphKabutoItemRoomSignpost1Script - ; people-events +.PersonEvents: db 4 - person_event SPRITE_POKE_BALL, 10, 6, $1, $0, 255, 255, $1, 0, ItemFragment_0x599a2, EVENT_PICKED_UP_BERRY_FROM_KABUTO_ITEM_ROOM - person_event SPRITE_POKE_BALL, 10, 9, $1, $0, 255, 255, $1, 0, ItemFragment_0x599a4, EVENT_PICKED_UP_PSNCUREBERRY_FROM_KABUTO_ITEM_ROOM - person_event SPRITE_POKE_BALL, 8, 6, $1, $0, 255, 255, $1, 0, ItemFragment_0x599a6, EVENT_PICKED_UP_HEAL_POWDER_FROM_KABUTO_ITEM_ROOM - person_event SPRITE_POKE_BALL, 8, 9, $1, $0, 255, 255, $1, 0, ItemFragment_0x599a8, EVENT_PICKED_UP_ENERGYPOWDER_FROM_KABUTO_ITEM_ROOM + person_event SPRITE_POKE_BALL, 10, 6, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x599a2, EVENT_PICKED_UP_BERRY_FROM_KABUTO_ITEM_ROOM + person_event SPRITE_POKE_BALL, 10, 9, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x599a4, EVENT_PICKED_UP_PSNCUREBERRY_FROM_KABUTO_ITEM_ROOM + person_event SPRITE_POKE_BALL, 8, 6, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x599a6, EVENT_PICKED_UP_HEAL_POWDER_FROM_KABUTO_ITEM_ROOM + person_event SPRITE_POKE_BALL, 8, 9, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x599a8, EVENT_PICKED_UP_ENERGYPOWDER_FROM_KABUTO_ITEM_ROOM diff --git a/maps/RuinsofAlphKabutoWordRoom.asm b/maps/RuinsofAlphKabutoWordRoom.asm index 01c0f59fe..24b821c6d 100644 --- a/maps/RuinsofAlphKabutoWordRoom.asm +++ b/maps/RuinsofAlphKabutoWordRoom.asm @@ -1,25 +1,25 @@ RuinsofAlphKabutoWordRoom_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 RuinsofAlphKabutoWordRoom_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 3 warp_def $5, $9, 3, GROUP_RUINS_OF_ALPH_KABUTO_ITEM_ROOM, MAP_RUINS_OF_ALPH_KABUTO_ITEM_ROOM warp_def $5, $a, 4, GROUP_RUINS_OF_ALPH_KABUTO_ITEM_ROOM, MAP_RUINS_OF_ALPH_KABUTO_ITEM_ROOM warp_def $b, $11, 4, GROUP_RUINS_OF_ALPH_INNER_CHAMBER, MAP_RUINS_OF_ALPH_INNER_CHAMBER - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 0 diff --git a/maps/RuinsofAlphOmanyteChamber.asm b/maps/RuinsofAlphOmanyteChamber.asm index 8f5cae4d8..39113d64a 100644 --- a/maps/RuinsofAlphOmanyteChamber.asm +++ b/maps/RuinsofAlphOmanyteChamber.asm @@ -1,12 +1,12 @@ RuinsofAlphOmanyteChamber_MapScriptHeader: - ; trigger count +.MapTriggers: db 2 ; triggers dw UnknownScript_0x58be9, $0000 dw UnknownScript_0x58bf7, $0000 - ; callback count +.MapCallbacks: db 1 ; callbacks @@ -14,7 +14,7 @@ RuinsofAlphOmanyteChamber_MapScriptHeader: dbw 1, UnknownScript_0x58bf8 UnknownScript_0x58be9: - special Function8adef + special SpecialOmanyteChamber checkevent EVENT_WALL_OPENED_IN_OMANYTE_CHAMBER iftrue UnknownScript_0x58bf3 end @@ -31,7 +31,7 @@ UnknownScript_0x58bf8: iftrue UnknownScript_0x58c02 changeblock $4, $0, $2e UnknownScript_0x58c02: - checkevent EVENT_2A2 + checkevent EVENT_SOLVED_OMANYTE_PUZZLE iffalse UnknownScript_0x58c09 return @@ -43,7 +43,7 @@ UnknownScript_0x58c09: UnknownScript_0x58c12: pause 30 earthquake 30 - showemote $0, $0, 20 + showemote EMOTE_SHOCK, $0, 20 pause 30 playsound SFX_STRENGTH changeblock $4, $0, $30 @@ -56,18 +56,18 @@ UnknownScript_0x58c12: MapRuinsofAlphOmanyteChamberSignpost2Script: refreshscreen $0 writebyte $1 - special Functionc360 + special Special_UnownPuzzle loadmovesprites iftrue UnknownScript_0x58c36 end UnknownScript_0x58c36: - setevent EVENT_705 - setevent EVENT_2A2 + setevent EVENT_RUINS_OF_ALPH_INNER_CHAMBER_TOURISTS + setevent EVENT_SOLVED_OMANYTE_PUZZLE setflag ENGINE_UNLOCKED_UNOWNS_2 domaptrigger GROUP_RUINS_OF_ALPH_INNER_CHAMBER, MAP_RUINS_OF_ALPH_INNER_CHAMBER, $1 earthquake 30 - showemote $0, $0, 15 + showemote EMOTE_SHOCK, $0, 15 changeblock $2, $2, $18 changeblock $4, $2, $19 reloadmappart @@ -90,7 +90,7 @@ MapRuinsofAlphOmanyteChamberSignpost4Script: loadfont writetext UnknownText_0x58c8e writebyte $2 - special Function8ae68 + special Special_DisplayUnownWords loadmovesprites end @@ -100,7 +100,7 @@ MapRuinsofAlphOmanyteChamberSignpost5Script: loadfont writetext UnknownText_0x58cc0 writebyte $2 - special Function8ae68 + special Special_DisplayUnownWords loadmovesprites end @@ -153,7 +153,7 @@ RuinsofAlphOmanyteChamber_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 5 warp_def $9, $3, 3, GROUP_RUINS_OF_ALPH_OUTSIDE, MAP_RUINS_OF_ALPH_OUTSIDE warp_def $9, $4, 3, GROUP_RUINS_OF_ALPH_OUTSIDE, MAP_RUINS_OF_ALPH_OUTSIDE @@ -161,17 +161,17 @@ RuinsofAlphOmanyteChamber_MapEventHeader: warp_def $3, $4, 7, GROUP_RUINS_OF_ALPH_INNER_CHAMBER, MAP_RUINS_OF_ALPH_INNER_CHAMBER warp_def $0, $4, 1, GROUP_RUINS_OF_ALPH_OMANYTE_ITEM_ROOM, MAP_RUINS_OF_ALPH_OMANYTE_ITEM_ROOM - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 6 - signpost 3, 2, $0, MapRuinsofAlphOmanyteChamberSignpost1Script - signpost 3, 5, $0, MapRuinsofAlphOmanyteChamberSignpost1Script - signpost 2, 3, $1, MapRuinsofAlphOmanyteChamberSignpost2Script - signpost 2, 4, $1, MapRuinsofAlphOmanyteChamberSignpost3Script - signpost 0, 3, $1, MapRuinsofAlphOmanyteChamberSignpost4Script - signpost 0, 4, $1, MapRuinsofAlphOmanyteChamberSignpost5Script - - ; people-events + signpost 3, 2, SIGNPOST_READ, MapRuinsofAlphOmanyteChamberSignpost1Script + signpost 3, 5, SIGNPOST_READ, MapRuinsofAlphOmanyteChamberSignpost1Script + signpost 2, 3, SIGNPOST_UP, MapRuinsofAlphOmanyteChamberSignpost2Script + signpost 2, 4, SIGNPOST_UP, MapRuinsofAlphOmanyteChamberSignpost3Script + signpost 0, 3, SIGNPOST_UP, MapRuinsofAlphOmanyteChamberSignpost4Script + signpost 0, 4, SIGNPOST_UP, MapRuinsofAlphOmanyteChamberSignpost5Script + +.PersonEvents: db 0 diff --git a/maps/RuinsofAlphOmanyteItemRoom.asm b/maps/RuinsofAlphOmanyteItemRoom.asm index 2d920e170..2cc8a786b 100644 --- a/maps/RuinsofAlphOmanyteItemRoom.asm +++ b/maps/RuinsofAlphOmanyteItemRoom.asm @@ -1,8 +1,8 @@ RuinsofAlphOmanyteItemRoom_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 ItemFragment_0x59a2c: @@ -30,24 +30,24 @@ RuinsofAlphOmanyteItemRoom_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 4 warp_def $9, $3, 5, GROUP_RUINS_OF_ALPH_OMANYTE_CHAMBER, MAP_RUINS_OF_ALPH_OMANYTE_CHAMBER warp_def $9, $4, 5, GROUP_RUINS_OF_ALPH_OMANYTE_CHAMBER, MAP_RUINS_OF_ALPH_OMANYTE_CHAMBER warp_def $1, $3, 1, GROUP_RUINS_OF_ALPH_OMANYTE_WORD_ROOM, MAP_RUINS_OF_ALPH_OMANYTE_WORD_ROOM warp_def $1, $4, 2, GROUP_RUINS_OF_ALPH_OMANYTE_WORD_ROOM, MAP_RUINS_OF_ALPH_OMANYTE_WORD_ROOM - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 2 - signpost 1, 2, $0, MapRuinsofAlphOmanyteItemRoomSignpost1Script - signpost 1, 5, $0, MapRuinsofAlphOmanyteItemRoomSignpost1Script + signpost 1, 2, SIGNPOST_READ, MapRuinsofAlphOmanyteItemRoomSignpost1Script + signpost 1, 5, SIGNPOST_READ, MapRuinsofAlphOmanyteItemRoomSignpost1Script - ; people-events +.PersonEvents: db 4 - person_event SPRITE_POKE_BALL, 10, 6, $1, $0, 255, 255, $1, 0, ItemFragment_0x59a2c, EVENT_PICKED_UP_MYSTERYBERRY_FROM_OMANYTE_ITEM_ROOM - person_event SPRITE_POKE_BALL, 10, 9, $1, $0, 255, 255, $1, 0, ItemFragment_0x59a2e, EVENT_PICKED_UP_MYSTIC_WATER_FROM_OMANYTE_ITEM_ROOM - person_event SPRITE_POKE_BALL, 8, 6, $1, $0, 255, 255, $1, 0, ItemFragment_0x59a30, EVENT_PICKED_UP_STARDUST_FROM_OMANYTE_ITEM_ROOM - person_event SPRITE_POKE_BALL, 8, 9, $1, $0, 255, 255, $1, 0, ItemFragment_0x59a32, EVENT_PICKED_UP_STAR_PIECE_FROM_OMANYTE_ITEM_ROOM + person_event SPRITE_POKE_BALL, 10, 6, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x59a2c, EVENT_PICKED_UP_MYSTERYBERRY_FROM_OMANYTE_ITEM_ROOM + person_event SPRITE_POKE_BALL, 10, 9, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x59a2e, EVENT_PICKED_UP_MYSTIC_WATER_FROM_OMANYTE_ITEM_ROOM + person_event SPRITE_POKE_BALL, 8, 6, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x59a30, EVENT_PICKED_UP_STARDUST_FROM_OMANYTE_ITEM_ROOM + person_event SPRITE_POKE_BALL, 8, 9, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x59a32, EVENT_PICKED_UP_STAR_PIECE_FROM_OMANYTE_ITEM_ROOM diff --git a/maps/RuinsofAlphOmanyteWordRoom.asm b/maps/RuinsofAlphOmanyteWordRoom.asm index 9c1906e42..cfd469320 100644 --- a/maps/RuinsofAlphOmanyteWordRoom.asm +++ b/maps/RuinsofAlphOmanyteWordRoom.asm @@ -1,25 +1,25 @@ RuinsofAlphOmanyteWordRoom_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 RuinsofAlphOmanyteWordRoom_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 3 warp_def $7, $9, 3, GROUP_RUINS_OF_ALPH_OMANYTE_ITEM_ROOM, MAP_RUINS_OF_ALPH_OMANYTE_ITEM_ROOM warp_def $7, $a, 4, GROUP_RUINS_OF_ALPH_OMANYTE_ITEM_ROOM, MAP_RUINS_OF_ALPH_OMANYTE_ITEM_ROOM warp_def $d, $11, 6, GROUP_RUINS_OF_ALPH_INNER_CHAMBER, MAP_RUINS_OF_ALPH_INNER_CHAMBER - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 0 diff --git a/maps/RuinsofAlphOutside.asm b/maps/RuinsofAlphOutside.asm index 5ce6838e4..510a2a66b 100644 --- a/maps/RuinsofAlphOutside.asm +++ b/maps/RuinsofAlphOutside.asm @@ -1,12 +1,12 @@ RuinsofAlphOutside_MapScriptHeader: - ; trigger count +.MapTriggers: db 2 ; triggers dw UnknownScript_0x5800d, $0000 dw UnknownScript_0x5800e, $0000 - ; callback count +.MapCallbacks: db 1 ; callbacks @@ -100,23 +100,7 @@ YoungsterScript_0x5807e: end TrainerPsychicNathan: - ; bit/flag number - dw EVENT_BEAT_PSYCHIC_NATHAN - - ; trainer group && trainer id - db PSYCHIC_T, NATHAN - - ; text when seen - dw PsychicNathanSeenText - - ; text when trainer beaten - dw PsychicNathanBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw PsychicNathanScript + trainer EVENT_BEAT_PSYCHIC_NATHAN, PSYCHIC_T, NATHAN, PsychicNathanSeenText, PsychicNathanBeatenText, $0000, PsychicNathanScript PsychicNathanScript: talkaftercancel @@ -128,23 +112,7 @@ PsychicNathanScript: TrainerSuperNerdStan: - ; bit/flag number - dw EVENT_BEAT_SUPER_NERD_STAN - - ; trainer group && trainer id - db SUPER_NERD, STAN - - ; text when seen - dw UnknownText_0x581e5 - - ; text when trainer beaten - dw UnknownText_0x58217 - - ; script when lost - dw $0000 - - ; script when talk again - dw UnknownScript_0x580a9 + trainer EVENT_BEAT_SUPER_NERD_STAN, SUPER_NERD, STAN, UnknownText_0x581e5, UnknownText_0x58217, $0000, UnknownScript_0x580a9 UnknownScript_0x580a9: talkaftercancel @@ -316,7 +284,7 @@ RuinsofAlphOutside_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 11 warp_def $11, $2, 1, GROUP_RUINS_OF_ALPH_HO_OH_CHAMBER, MAP_RUINS_OF_ALPH_HO_OH_CHAMBER warp_def $7, $e, 1, GROUP_RUINS_OF_ALPH_KABUTO_CHAMBER, MAP_RUINS_OF_ALPH_KABUTO_CHAMBER @@ -330,21 +298,21 @@ RuinsofAlphOutside_MapEventHeader: warp_def $14, $d, 1, GROUP_ROUTE_32_RUINS_OF_ALPH_GATE, MAP_ROUTE_32_RUINS_OF_ALPH_GATE warp_def $15, $d, 2, GROUP_ROUTE_32_RUINS_OF_ALPH_GATE, MAP_ROUTE_32_RUINS_OF_ALPH_GATE - ; xy triggers +.XYTriggers: db 2 xy_trigger 1, $e, $b, $0, UnknownScript_0x58031, $0, $0 xy_trigger 1, $f, $a, $0, UnknownScript_0x5803a, $0, $0 - ; signposts +.Signposts: db 3 - signpost 8, 16, $0, MapRuinsofAlphOutsideSignpost0Script - signpost 16, 12, $0, MapRuinsofAlphOutsideSignpost1Script - signpost 12, 18, $0, MapRuinsofAlphOutsideSignpost2Script + signpost 8, 16, SIGNPOST_READ, MapRuinsofAlphOutsideSignpost0Script + signpost 16, 12, SIGNPOST_READ, MapRuinsofAlphOutsideSignpost1Script + signpost 12, 18, SIGNPOST_READ, MapRuinsofAlphOutsideSignpost2Script - ; people-events +.PersonEvents: db 5 - person_event SPRITE_YOUNGSTER, 24, 8, $6, $0, 255, 255, $2, 1, TrainerPsychicNathan, -1 - person_event SPRITE_SCIENTIST, 19, 15, $7, $0, 255, 255, $0, 0, ScientistScript_0x58043, EVENT_703 - person_event SPRITE_FISHER, 21, 17, $3, $0, 255, 255, $a0, 0, FisherScript_0x58061, EVENT_78E - person_event SPRITE_YOUNGSTER, 15, 18, $2, $11, 255, 255, $b0, 0, YoungsterScript_0x58076, EVENT_78F - person_event SPRITE_YOUNGSTER, 12, 16, $7, $0, 255, 255, $80, 0, YoungsterScript_0x5807e, EVENT_78F + person_event SPRITE_YOUNGSTER, 24, 8, OW_UP | $2, $0, -1, -1, $2, 1, TrainerPsychicNathan, -1 + person_event SPRITE_SCIENTIST, 19, 15, OW_UP | $3, $0, -1, -1, $0, 0, ScientistScript_0x58043, EVENT_RUINS_OF_ALPH_OUTSIDE_SCIENTIST + person_event SPRITE_FISHER, 21, 17, OW_DOWN | $3, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, FisherScript_0x58061, EVENT_RUINS_OF_ALPH_OUTSIDE_TOURIST_FISHER + person_event SPRITE_YOUNGSTER, 15, 18, OW_DOWN | $2, $11, -1, -1, (PAL_OW_BROWN << 4) | $80, 0, YoungsterScript_0x58076, EVENT_RUINS_OF_ALPH_OUTSIDE_TOURIST_YOUNGSTERS + person_event SPRITE_YOUNGSTER, 12, 16, OW_UP | $3, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, YoungsterScript_0x5807e, EVENT_RUINS_OF_ALPH_OUTSIDE_TOURIST_YOUNGSTERS diff --git a/maps/RuinsofAlphResearchCenter.asm b/maps/RuinsofAlphResearchCenter.asm index 2f663809f..121a624af 100644 --- a/maps/RuinsofAlphResearchCenter.asm +++ b/maps/RuinsofAlphResearchCenter.asm @@ -1,12 +1,12 @@ RuinsofAlphResearchCenter_MapScriptHeader: - ; trigger count +.MapTriggers: db 2 ; triggers dw UnknownScript_0x59180, $0000 dw UnknownScript_0x59181, $0000 - ; callback count +.MapCallbacks: db 1 ; callbacks @@ -105,7 +105,7 @@ UnknownScript_0x5920b: writetext UnknownText_0x594cb closetext loadmovesprites - clearevent EVENT_78F + clearevent EVENT_RUINS_OF_ALPH_OUTSIDE_TOURIST_YOUNGSTERS end ScientistScript_0x59214: @@ -134,7 +134,7 @@ UnknownScript_0x5922e: MapRuinsofAlphResearchCenterSignpost1Script: loadfont - checkevent EVENT_704 + checkevent EVENT_RUINS_OF_ALPH_RESEARCH_CENTER_SCIENTIST iftrue UnknownScript_0x59241 checkcode VAR_UNOWNCOUNT if_equal 26, UnknownScript_0x59247 @@ -152,7 +152,7 @@ UnknownScript_0x59247: MapRuinsofAlphResearchCenterSignpost2Script: loadfont - checkevent EVENT_704 + checkevent EVENT_RUINS_OF_ALPH_RESEARCH_CENTER_SCIENTIST iftrue UnknownScript_0x5925a checkcode VAR_UNOWNCOUNT if_equal 26, UnknownScript_0x59260 @@ -165,7 +165,7 @@ UnknownScript_0x5925a: UnknownScript_0x59260: writetext UnknownText_0x5982d closetext - special Functionc2cd + special Special_UnownPrinter loadmovesprites end @@ -396,22 +396,22 @@ RuinsofAlphResearchCenter_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $7, $2, 6, GROUP_RUINS_OF_ALPH_OUTSIDE, MAP_RUINS_OF_ALPH_OUTSIDE warp_def $7, $3, 6, GROUP_RUINS_OF_ALPH_OUTSIDE, MAP_RUINS_OF_ALPH_OUTSIDE - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 3 - signpost 5, 6, $0, MapRuinsofAlphResearchCenterSignpost0Script - signpost 4, 3, $0, MapRuinsofAlphResearchCenterSignpost1Script - signpost 1, 7, $0, MapRuinsofAlphResearchCenterSignpost2Script + signpost 5, 6, SIGNPOST_READ, MapRuinsofAlphResearchCenterSignpost0Script + signpost 4, 3, SIGNPOST_READ, MapRuinsofAlphResearchCenterSignpost1Script + signpost 1, 7, SIGNPOST_READ, MapRuinsofAlphResearchCenterSignpost2Script - ; people-events +.PersonEvents: db 3 - person_event SPRITE_SCIENTIST, 9, 8, $7, $0, 255, 255, $90, 0, ScientistScript_0x591e5, -1 - person_event SPRITE_SCIENTIST, 6, 9, $2, $12, 255, 255, $90, 0, ScientistScript_0x59214, -1 - person_event SPRITE_SCIENTIST, 9, 6, $7, $0, 255, 255, $90, 0, ScientistScript_0x591d1, EVENT_704 + person_event SPRITE_SCIENTIST, 9, 8, OW_UP | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, ScientistScript_0x591e5, -1 + person_event SPRITE_SCIENTIST, 6, 9, OW_DOWN | $2, $12, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, ScientistScript_0x59214, -1 + person_event SPRITE_SCIENTIST, 9, 6, OW_UP | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, ScientistScript_0x591d1, EVENT_RUINS_OF_ALPH_RESEARCH_CENTER_SCIENTIST diff --git a/maps/SafariZoneBeta.asm b/maps/SafariZoneBeta.asm index b6a7c3d6c..ba0306348 100644 --- a/maps/SafariZoneBeta.asm +++ b/maps/SafariZoneBeta.asm @@ -1,24 +1,24 @@ SafariZoneBeta_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 SafariZoneBeta_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $17, $9, 1, GROUP_SAFARI_ZONE_FUCHSIA_GATE_BETA, MAP_SAFARI_ZONE_FUCHSIA_GATE_BETA warp_def $17, $a, 2, GROUP_SAFARI_ZONE_FUCHSIA_GATE_BETA, MAP_SAFARI_ZONE_FUCHSIA_GATE_BETA - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 0 diff --git a/maps/SafariZoneFuchsiaGateBeta.asm b/maps/SafariZoneFuchsiaGateBeta.asm index b654681d1..3118cc247 100644 --- a/maps/SafariZoneFuchsiaGateBeta.asm +++ b/maps/SafariZoneFuchsiaGateBeta.asm @@ -1,26 +1,26 @@ SafariZoneFuchsiaGateBeta_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 SafariZoneFuchsiaGateBeta_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 4 warp_def $0, $4, 1, GROUP_SAFARI_ZONE_BETA, MAP_SAFARI_ZONE_BETA warp_def $0, $5, 2, GROUP_SAFARI_ZONE_BETA, MAP_SAFARI_ZONE_BETA warp_def $7, $4, 7, GROUP_FUCHSIA_CITY, MAP_FUCHSIA_CITY warp_def $7, $5, 7, GROUP_FUCHSIA_CITY, MAP_FUCHSIA_CITY - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 0 diff --git a/maps/SafariZoneMainOffice.asm b/maps/SafariZoneMainOffice.asm index a34ae2c29..ec00d976c 100644 --- a/maps/SafariZoneMainOffice.asm +++ b/maps/SafariZoneMainOffice.asm @@ -1,24 +1,24 @@ SafariZoneMainOffice_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 SafariZoneMainOffice_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $7, $2, 2, GROUP_FUCHSIA_CITY, MAP_FUCHSIA_CITY warp_def $7, $3, 2, GROUP_FUCHSIA_CITY, MAP_FUCHSIA_CITY - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 0 diff --git a/maps/SafariZoneWardensHome.asm b/maps/SafariZoneWardensHome.asm index 0ad49c827..19f296234 100644 --- a/maps/SafariZoneWardensHome.asm +++ b/maps/SafariZoneWardensHome.asm @@ -1,8 +1,8 @@ SafariZoneWardensHome_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 WardensGranddaughter: @@ -77,21 +77,21 @@ SafariZoneWardensHome_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $7, $2, 6, GROUP_FUCHSIA_CITY, MAP_FUCHSIA_CITY warp_def $7, $3, 6, GROUP_FUCHSIA_CITY, MAP_FUCHSIA_CITY - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 4 - signpost 1, 0, $0, WardensHomeBookshelf - signpost 1, 1, $0, WardensHomeBookshelf - signpost 0, 7, $0, WardenPhoto - signpost 0, 9, $0, SafariZonePhoto + signpost 1, 0, SIGNPOST_READ, WardensHomeBookshelf + signpost 1, 1, SIGNPOST_READ, WardensHomeBookshelf + signpost 0, 7, SIGNPOST_READ, WardenPhoto + signpost 0, 9, SIGNPOST_READ, SafariZonePhoto - ; people-events +.PersonEvents: db 1 - person_event SPRITE_LASS, 8, 6, $9, $0, 255, 255, $a0, 0, WardensGranddaughter, -1 + person_event SPRITE_LASS, 8, 6, OW_LEFT | $1, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, WardensGranddaughter, -1 diff --git a/maps/SaffronCity.asm b/maps/SaffronCity.asm index d155c9abe..947e3192b 100644 --- a/maps/SaffronCity.asm +++ b/maps/SaffronCity.asm @@ -1,8 +1,8 @@ SaffronCity_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 1 ; callbacks @@ -261,7 +261,7 @@ SaffronCity_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 15 warp_def $3, $1a, 1, GROUP_FIGHTING_DOJO, MAP_FIGHTING_DOJO warp_def $3, $22, 1, GROUP_SAFFRON_GYM, MAP_SAFFRON_GYM @@ -279,27 +279,27 @@ SaffronCity_MapEventHeader: warp_def $16, $27, 1, GROUP_ROUTE_8_SAFFRON_GATE, MAP_ROUTE_8_SAFFRON_GATE warp_def $17, $27, 2, GROUP_ROUTE_8_SAFFRON_GATE, MAP_ROUTE_8_SAFFRON_GATE - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 8 - signpost 5, 21, $0, SaffronCitySign - signpost 5, 33, $0, SaffronGymSign - signpost 5, 25, $0, FightingDojoSign - signpost 21, 15, $0, SilphCoSign - signpost 29, 25, $0, MrPsychicsHouseSign - signpost 5, 11, $0, SaffronCityMagnetTrainStationSign - signpost 29, 10, $0, SaffronCityPokeCenterSign - signpost 11, 26, $0, SaffronCityMartSign - - ; people-events + signpost 5, 21, SIGNPOST_READ, SaffronCitySign + signpost 5, 33, SIGNPOST_READ, SaffronGymSign + signpost 5, 25, SIGNPOST_READ, FightingDojoSign + signpost 21, 15, SIGNPOST_READ, SilphCoSign + signpost 29, 25, SIGNPOST_READ, MrPsychicsHouseSign + signpost 5, 11, SIGNPOST_READ, SaffronCityMagnetTrainStationSign + signpost 29, 10, SIGNPOST_READ, SaffronCityPokeCenterSign + signpost 11, 26, SIGNPOST_READ, SaffronCityMartSign + +.PersonEvents: db 8 - person_event SPRITE_LASS, 18, 11, $5, $2, 255, 255, $80, 0, LassScript_0x19932a, -1 - person_event SPRITE_POKEFAN_M, 34, 23, $5, $2, 255, 255, $b0, 0, PokefanMScript_0x19933e, -1 - person_event SPRITE_COOLTRAINER_M, 11, 36, $5, $1, 255, 255, $a0, 0, CooltrainerMScript_0x199352, -1 - person_event SPRITE_COOLTRAINER_F, 28, 24, $5, $2, 255, 255, $80, 0, CooltrainerFScript_0x199355, -1 - person_event SPRITE_FISHER, 16, 31, $6, $0, 255, 255, $a0, 0, FisherScript_0x199358, -1 - person_event SPRITE_YOUNGSTER, 23, 19, $4, $10, 255, 255, $90, 0, YoungsterScript_0x19936c, -1 - person_event SPRITE_YOUNGSTER, 26, 39, $2, $11, 255, 255, $80, 0, YoungsterScript_0x19936f, -1 - person_event SPRITE_LASS, 12, 23, $3, $0, 255, 255, $a0, 0, LassScript_0x199372, -1 + person_event SPRITE_LASS, 18, 11, OW_UP | $1, $2, -1, -1, (PAL_OW_RED << 4) | $80, 0, LassScript_0x19932a, -1 + person_event SPRITE_POKEFAN_M, 34, 23, OW_UP | $1, $2, -1, -1, (PAL_OW_BROWN << 4) | $80, 0, PokefanMScript_0x19933e, -1 + person_event SPRITE_COOLTRAINER_M, 11, 36, OW_UP | $1, $1, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, CooltrainerMScript_0x199352, -1 + person_event SPRITE_COOLTRAINER_F, 28, 24, OW_UP | $1, $2, -1, -1, (PAL_OW_RED << 4) | $80, 0, CooltrainerFScript_0x199355, -1 + person_event SPRITE_FISHER, 16, 31, OW_UP | $2, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, FisherScript_0x199358, -1 + person_event SPRITE_YOUNGSTER, 23, 19, OW_UP | $0, $10, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, YoungsterScript_0x19936c, -1 + person_event SPRITE_YOUNGSTER, 26, 39, OW_DOWN | $2, $11, -1, -1, (PAL_OW_RED << 4) | $80, 0, YoungsterScript_0x19936f, -1 + person_event SPRITE_LASS, 12, 23, OW_DOWN | $3, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, LassScript_0x199372, -1 diff --git a/maps/SaffronGym.asm b/maps/SaffronGym.asm index 8cc8e535d..dbb330478 100644 --- a/maps/SaffronGym.asm +++ b/maps/SaffronGym.asm @@ -1,8 +1,8 @@ SaffronGym_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 SabrinaScript_0x189c2e: @@ -39,23 +39,7 @@ SabrinaScript_0x189c2e: end TrainerMediumRebecca: - ; bit/flag number - dw EVENT_BEAT_MEDIUM_REBECCA - - ; trainer group && trainer id - db MEDIUM, REBECCA - - ; text when seen - dw MediumRebeccaSeenText - - ; text when trainer beaten - dw MediumRebeccaBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw MediumRebeccaScript + trainer EVENT_BEAT_MEDIUM_REBECCA, MEDIUM, REBECCA, MediumRebeccaSeenText, MediumRebeccaBeatenText, $0000, MediumRebeccaScript MediumRebeccaScript: talkaftercancel @@ -66,23 +50,7 @@ MediumRebeccaScript: end TrainerPsychicFranklin: - ; bit/flag number - dw EVENT_BEAT_PSYCHIC_FRANKLIN - - ; trainer group && trainer id - db PSYCHIC_T, FRANKLIN - - ; text when seen - dw PsychicFranklinSeenText - - ; text when trainer beaten - dw PsychicFranklinBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw PsychicFranklinScript + trainer EVENT_BEAT_PSYCHIC_FRANKLIN, PSYCHIC_T, FRANKLIN, PsychicFranklinSeenText, PsychicFranklinBeatenText, $0000, PsychicFranklinScript PsychicFranklinScript: talkaftercancel @@ -93,23 +61,7 @@ PsychicFranklinScript: end TrainerMediumDoris: - ; bit/flag number - dw EVENT_BEAT_MEDIUM_DORIS - - ; trainer group && trainer id - db MEDIUM, DORIS - - ; text when seen - dw MediumDorisSeenText - - ; text when trainer beaten - dw MediumDorisBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw MediumDorisScript + trainer EVENT_BEAT_MEDIUM_DORIS, MEDIUM, DORIS, MediumDorisSeenText, MediumDorisBeatenText, $0000, MediumDorisScript MediumDorisScript: talkaftercancel @@ -120,23 +72,7 @@ MediumDorisScript: end TrainerPsychicJared: - ; bit/flag number - dw EVENT_BEAT_PSYCHIC_JARED - - ; trainer group && trainer id - db PSYCHIC_T, JARED - - ; text when seen - dw PsychicJaredSeenText - - ; text when trainer beaten - dw PsychicJaredBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw PsychicJaredScript + trainer EVENT_BEAT_PSYCHIC_JARED, PSYCHIC_T, JARED, PsychicJaredSeenText, PsychicJaredBeatenText, $0000, PsychicJaredScript PsychicJaredScript: talkaftercancel @@ -350,7 +286,7 @@ SaffronGym_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 32 warp_def $11, $8, 2, GROUP_SAFFRON_CITY, MAP_SAFFRON_CITY warp_def $11, $9, 2, GROUP_SAFFRON_CITY, MAP_SAFFRON_CITY @@ -385,18 +321,18 @@ SaffronGym_MapEventHeader: warp_def $3, $1, 16, GROUP_SAFFRON_GYM, MAP_SAFFRON_GYM warp_def $9, $b, 17, GROUP_SAFFRON_GYM, MAP_SAFFRON_GYM - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 1 - signpost 15, 8, $0, SaffronGymStatue + signpost 15, 8, SIGNPOST_READ, SaffronGymStatue - ; people-events +.PersonEvents: db 6 - person_event SPRITE_SABRINA, 12, 13, $6, $0, 255, 255, $80, 0, SabrinaScript_0x189c2e, -1 - person_event SPRITE_GRANNY, 20, 21, $a, $0, 255, 255, $b2, 3, TrainerMediumRebecca, -1 - person_event SPRITE_YOUNGSTER, 20, 7, $a, $0, 255, 255, $92, 3, TrainerPsychicFranklin, -1 - person_event SPRITE_GRANNY, 8, 7, $a, $0, 255, 255, $b2, 2, TrainerMediumDoris, -1 - person_event SPRITE_YOUNGSTER, 8, 21, $a, $0, 255, 255, $92, 2, TrainerPsychicJared, -1 - person_event SPRITE_GYM_GUY, 18, 13, $6, $0, 255, 255, $90, 0, SaffronGymGuyScript, -1 + person_event SPRITE_SABRINA, 12, 13, OW_UP | $2, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, SabrinaScript_0x189c2e, -1 + person_event SPRITE_GRANNY, 20, 21, OW_LEFT | $2, $0, -1, -1, (PAL_OW_BROWN << 4) | $82, 3, TrainerMediumRebecca, -1 + person_event SPRITE_YOUNGSTER, 20, 7, OW_LEFT | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 3, TrainerPsychicFranklin, -1 + person_event SPRITE_GRANNY, 8, 7, OW_LEFT | $2, $0, -1, -1, (PAL_OW_BROWN << 4) | $82, 2, TrainerMediumDoris, -1 + person_event SPRITE_YOUNGSTER, 8, 21, OW_LEFT | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 2, TrainerPsychicJared, -1 + person_event SPRITE_GYM_GUY, 18, 13, OW_UP | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, SaffronGymGuyScript, -1 diff --git a/maps/SaffronMart.asm b/maps/SaffronMart.asm index 41ddde494..df0e3c684 100644 --- a/maps/SaffronMart.asm +++ b/maps/SaffronMart.asm @@ -1,8 +1,8 @@ SaffronMart_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 ClerkScript_0x18a3bf: @@ -36,19 +36,19 @@ SaffronMart_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $7, $2, 3, GROUP_SAFFRON_CITY, MAP_SAFFRON_CITY warp_def $7, $3, 3, GROUP_SAFFRON_CITY, MAP_SAFFRON_CITY - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 3 - person_event SPRITE_CLERK, 7, 5, $9, $0, 255, 255, $0, 0, ClerkScript_0x18a3bf, -1 - person_event SPRITE_COOLTRAINER_M, 6, 11, $3, $0, 255, 255, $b0, 0, CooltrainerMScript_0x18a3c6, -1 - person_event SPRITE_COOLTRAINER_F, 10, 11, $5, $1, 255, 255, $a0, 0, CooltrainerFScript_0x18a3c9, -1 + person_event SPRITE_CLERK, 7, 5, OW_LEFT | $1, $0, -1, -1, $0, 0, ClerkScript_0x18a3bf, -1 + person_event SPRITE_COOLTRAINER_M, 6, 11, OW_DOWN | $3, $0, -1, -1, (PAL_OW_BROWN << 4) | $80, 0, CooltrainerMScript_0x18a3c6, -1 + person_event SPRITE_COOLTRAINER_F, 10, 11, OW_UP | $1, $1, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, CooltrainerFScript_0x18a3c9, -1 diff --git a/maps/SaffronPokeCenter1F.asm b/maps/SaffronPokeCenter1F.asm index ec70aed5f..e155cc53f 100644 --- a/maps/SaffronPokeCenter1F.asm +++ b/maps/SaffronPokeCenter1F.asm @@ -1,8 +1,8 @@ SaffronPokeCenter1F_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 NurseScript_0x18a47d: @@ -109,21 +109,21 @@ SaffronPokeCenter1F_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 3 warp_def $7, $3, 4, GROUP_SAFFRON_CITY, MAP_SAFFRON_CITY warp_def $7, $4, 4, GROUP_SAFFRON_CITY, MAP_SAFFRON_CITY warp_def $7, $0, 1, GROUP_POKECENTER_2F, MAP_POKECENTER_2F - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 4 - person_event SPRITE_NURSE, 5, 7, $6, $0, 255, 255, $0, 0, NurseScript_0x18a47d, -1 - person_event SPRITE_TEACHER, 6, 11, $2, $11, 255, 255, $a0, 0, TeacherScript_0x18a480, -1 - person_event SPRITE_FISHER, 10, 12, $8, $0, 255, 255, $80, 0, FisherScript_0x18a48c, -1 - person_event SPRITE_YOUNGSTER, 8, 5, $3, $0, 255, 255, $90, 0, YoungsterScript_0x18a4a0, -1 + person_event SPRITE_NURSE, 5, 7, OW_UP | $2, $0, -1, -1, $0, 0, NurseScript_0x18a47d, -1 + person_event SPRITE_TEACHER, 6, 11, OW_DOWN | $2, $11, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, TeacherScript_0x18a480, -1 + person_event SPRITE_FISHER, 10, 12, OW_LEFT | $0, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, FisherScript_0x18a48c, -1 + person_event SPRITE_YOUNGSTER, 8, 5, OW_DOWN | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, YoungsterScript_0x18a4a0, -1 diff --git a/maps/SaffronPokeCenter2FBeta.asm b/maps/SaffronPokeCenter2FBeta.asm index 51a846ea0..a3c6d29ab 100644 --- a/maps/SaffronPokeCenter2FBeta.asm +++ b/maps/SaffronPokeCenter2FBeta.asm @@ -1,23 +1,23 @@ SaffronPokeCenter2FBeta_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 SaffronPokeCenter2FBeta_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 1 warp_def $7, $0, 3, GROUP_SAFFRON_POKECENTER_1F, MAP_SAFFRON_POKECENTER_1F - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 0 diff --git a/maps/SaffronTrainStation.asm b/maps/SaffronTrainStation.asm index eaf819d1a..6ba8972a9 100644 --- a/maps/SaffronTrainStation.asm +++ b/maps/SaffronTrainStation.asm @@ -1,11 +1,11 @@ SaffronTrainStation_MapScriptHeader: - ; trigger count +.MapTriggers: db 1 ; triggers dw UnknownScript_0x18a81d, $0000 - ; callback count +.MapCallbacks: db 0 UnknownScript_0x18a81d: @@ -33,7 +33,7 @@ UnknownScript_0x18a82c: applymovement $2, MovementData_0x18a88f applymovement $0, MovementData_0x18a898 writebyte $1 - special Function8cc04 + special Special_MagnetTrain warpcheck newloadmap $f9 applymovement $0, MovementData_0x18a854 @@ -215,23 +215,23 @@ SaffronTrainStation_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 4 warp_def $11, $8, 6, GROUP_SAFFRON_CITY, MAP_SAFFRON_CITY warp_def $11, $9, 6, GROUP_SAFFRON_CITY, MAP_SAFFRON_CITY warp_def $5, $6, 4, GROUP_GOLDENROD_MAGNET_TRAIN_STATION, MAP_GOLDENROD_MAGNET_TRAIN_STATION warp_def $5, $b, 3, GROUP_GOLDENROD_MAGNET_TRAIN_STATION, MAP_GOLDENROD_MAGNET_TRAIN_STATION - ; xy triggers +.XYTriggers: db 1 xy_trigger 0, $6, $b, $0, UnknownScript_0x18a862, $0, $0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 4 - person_event SPRITE_OFFICER, 13, 13, $6, $0, 255, 255, $0, 0, OfficerScript_0x18a81e, -1 - person_event SPRITE_GYM_GUY, 18, 14, $2, $11, 255, 255, $0, 0, GymGuyScript_0x18a875, -1 - person_event SPRITE_TEACHER, 15, 10, $9, $0, 255, 255, $0, 0, TeacherScript_0x18a889, EVENT_772 - person_event SPRITE_LASS, 14, 10, $7, $0, 255, 255, $a0, 0, LassScript_0x18a88c, EVENT_772 + person_event SPRITE_OFFICER, 13, 13, OW_UP | $2, $0, -1, -1, $0, 0, OfficerScript_0x18a81e, -1 + person_event SPRITE_GYM_GUY, 18, 14, OW_DOWN | $2, $11, -1, -1, $0, 0, GymGuyScript_0x18a875, -1 + person_event SPRITE_TEACHER, 15, 10, OW_LEFT | $1, $0, -1, -1, $0, 0, TeacherScript_0x18a889, EVENT_SAFFRON_TRAIN_STATION_POPULATION + person_event SPRITE_LASS, 14, 10, OW_UP | $3, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, LassScript_0x18a88c, EVENT_SAFFRON_TRAIN_STATION_POPULATION diff --git a/maps/SeafoamGym.asm b/maps/SeafoamGym.asm index ba2721371..29bcd8bca 100644 --- a/maps/SeafoamGym.asm +++ b/maps/SeafoamGym.asm @@ -1,11 +1,11 @@ SeafoamGym_MapScriptHeader: - ; trigger count +.MapTriggers: db 1 ; triggers dw UnknownScript_0x1ab4fa, $0000 - ; callback count +.MapCallbacks: db 0 UnknownScript_0x1ab4fa: @@ -159,17 +159,17 @@ SeafoamGym_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 1 warp_def $5, $5, 1, GROUP_ROUTE_20, MAP_ROUTE_20 - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 2 - person_event SPRITE_BLAINE, 6, 9, $6, $0, 255, 255, $b0, 0, BlaineScript_0x1ab4fb, -1 - person_event SPRITE_GYM_GUY, 9, 10, $7, $0, 255, 255, $90, 0, SeafoamGymGuyScript, EVENT_777 + person_event SPRITE_BLAINE, 6, 9, OW_UP | $2, $0, -1, -1, (PAL_OW_BROWN << 4) | $80, 0, BlaineScript_0x1ab4fb, -1 + person_event SPRITE_GYM_GUY, 9, 10, OW_UP | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, SeafoamGymGuyScript, EVENT_SEAFOAM_GYM_GYM_GUY diff --git a/maps/SilphCo1F.asm b/maps/SilphCo1F.asm index c83298920..8107ce95e 100644 --- a/maps/SilphCo1F.asm +++ b/maps/SilphCo1F.asm @@ -1,8 +1,8 @@ SilphCo1F_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 ReceptionistScript_0x18abe5: @@ -55,18 +55,18 @@ SilphCo1F_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $7, $2, 7, GROUP_SAFFRON_CITY, MAP_SAFFRON_CITY warp_def $7, $3, 7, GROUP_SAFFRON_CITY, MAP_SAFFRON_CITY - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 2 - person_event SPRITE_RECEPTIONIST, 6, 8, $6, $0, 255, 255, $90, 0, ReceptionistScript_0x18abe5, -1 - person_event SPRITE_OFFICER, 5, 17, $6, $0, 255, 255, $90, 0, OfficerScript_0x18abe8, -1 + person_event SPRITE_RECEPTIONIST, 6, 8, OW_UP | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, ReceptionistScript_0x18abe5, -1 + person_event SPRITE_OFFICER, 5, 17, OW_UP | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, OfficerScript_0x18abe8, -1 diff --git a/maps/SilverCaveItemRooms.asm b/maps/SilverCaveItemRooms.asm index b00daa197..2a1cd68f3 100644 --- a/maps/SilverCaveItemRooms.asm +++ b/maps/SilverCaveItemRooms.asm @@ -1,8 +1,8 @@ SilverCaveItemRooms_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 ItemFragment_0x18c65e: @@ -15,18 +15,18 @@ SilverCaveItemRooms_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $3, $d, 3, GROUP_SILVER_CAVE_ROOM_2, MAP_SILVER_CAVE_ROOM_2 warp_def $f, $7, 4, GROUP_SILVER_CAVE_ROOM_2, MAP_SILVER_CAVE_ROOM_2 - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 2 - person_event SPRITE_POKE_BALL, 7, 10, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c65e, EVENT_69C - person_event SPRITE_POKE_BALL, 15, 19, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c660, EVENT_69D + person_event SPRITE_POKE_BALL, 7, 10, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x18c65e, EVENT_SILVER_CAVE_ITEM_ROOMS_MAX_REVIVE + person_event SPRITE_POKE_BALL, 15, 19, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x18c660, EVENT_SILVER_CAVE_ITEM_ROOMS_FULL_RESTORE diff --git a/maps/SilverCaveOutside.asm b/maps/SilverCaveOutside.asm index 290c17977..84520d6ba 100644 --- a/maps/SilverCaveOutside.asm +++ b/maps/SilverCaveOutside.asm @@ -1,8 +1,8 @@ SilverCaveOutside_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 1 ; callbacks @@ -19,8 +19,7 @@ MtSilverSign: jumptext MtSilverSignText MapSilverCaveOutsideSignpostItem2: - dw $00b8 - db FULL_RESTORE + dwb EVENT_SILVER_CAVE_OUTSIDE_HIDDEN_FULL_RESTORE, FULL_RESTORE MtSilverSignText: text "MT.SILVER" @@ -30,19 +29,19 @@ SilverCaveOutside_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $13, $17, 1, GROUP_SILVER_CAVE_POKECENTER_1F, MAP_SILVER_CAVE_POKECENTER_1F warp_def $b, $12, 1, GROUP_SILVER_CAVE_ROOM_1, MAP_SILVER_CAVE_ROOM_1 - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 3 - signpost 19, 24, $0, MtSilverPokeCenterSign - signpost 13, 17, $0, MtSilverSign - signpost 25, 9, $7, MapSilverCaveOutsideSignpostItem2 + signpost 19, 24, SIGNPOST_READ, MtSilverPokeCenterSign + signpost 13, 17, SIGNPOST_READ, MtSilverSign + signpost 25, 9, SIGNPOST_ITEM, MapSilverCaveOutsideSignpostItem2 - ; people-events +.PersonEvents: db 0 diff --git a/maps/SilverCavePokeCenter1F.asm b/maps/SilverCavePokeCenter1F.asm index a9ad58a70..1887ce73b 100644 --- a/maps/SilverCavePokeCenter1F.asm +++ b/maps/SilverCavePokeCenter1F.asm @@ -1,8 +1,8 @@ SilverCavePokeCenter1F_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 NurseScript_0x1ae59a: @@ -29,19 +29,19 @@ SilverCavePokeCenter1F_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 3 warp_def $7, $3, 1, GROUP_SILVER_CAVE_OUTSIDE, MAP_SILVER_CAVE_OUTSIDE warp_def $7, $4, 1, GROUP_SILVER_CAVE_OUTSIDE, MAP_SILVER_CAVE_OUTSIDE warp_def $7, $0, 1, GROUP_POKECENTER_2F, MAP_POKECENTER_2F - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 2 - person_event SPRITE_NURSE, 5, 7, $6, $0, 255, 255, $0, 0, NurseScript_0x1ae59a, -1 - person_event SPRITE_GRANNY, 9, 5, $8, $12, 255, 255, $0, 0, GrannyScript_0x1ae59d, -1 + person_event SPRITE_NURSE, 5, 7, OW_UP | $2, $0, -1, -1, $0, 0, NurseScript_0x1ae59a, -1 + person_event SPRITE_GRANNY, 9, 5, OW_LEFT | $0, $12, -1, -1, $0, 0, GrannyScript_0x1ae59d, -1 diff --git a/maps/SilverCaveRoom1.asm b/maps/SilverCaveRoom1.asm index 5bd516f5b..28cc88f41 100644 --- a/maps/SilverCaveRoom1.asm +++ b/maps/SilverCaveRoom1.asm @@ -1,8 +1,8 @@ SilverCaveRoom1_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 ItemFragment_0x18c554: @@ -18,35 +18,33 @@ ItemFragment_0x18c55a: db ULTRA_BALL, 1 MapSilverCaveRoom1SignpostItem0: - dw $009a - db DIRE_HIT + dwb EVENT_SILVER_CAVE_ROOM_1_HIDDEN_DIRE_HIT, DIRE_HIT MapSilverCaveRoom1SignpostItem1: - dw $009b - db ULTRA_BALL + dwb EVENT_SILVER_CAVE_ROOM_1_HIDDEN_ULTRA_BALL, ULTRA_BALL SilverCaveRoom1_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $21, $9, 2, GROUP_SILVER_CAVE_OUTSIDE, MAP_SILVER_CAVE_OUTSIDE warp_def $1, $f, 1, GROUP_SILVER_CAVE_ROOM_2, MAP_SILVER_CAVE_ROOM_2 - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 2 - signpost 23, 16, $7, MapSilverCaveRoom1SignpostItem0 - signpost 12, 17, $7, MapSilverCaveRoom1SignpostItem1 + signpost 23, 16, SIGNPOST_ITEM, MapSilverCaveRoom1SignpostItem0 + signpost 12, 17, SIGNPOST_ITEM, MapSilverCaveRoom1SignpostItem1 - ; people-events +.PersonEvents: db 4 - person_event SPRITE_POKE_BALL, 13, 8, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c554, EVENT_699 - person_event SPRITE_POKE_BALL, 33, 19, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c556, EVENT_69A - person_event SPRITE_POKE_BALL, 34, 9, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c558, EVENT_69B - person_event SPRITE_POKE_BALL, 22, 11, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c55a, EVENT_7C1 + person_event SPRITE_POKE_BALL, 13, 8, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x18c554, EVENT_SILVER_CAVE_ROOM_1_MAX_ELIXER + person_event SPRITE_POKE_BALL, 33, 19, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x18c556, EVENT_SILVER_CAVE_ROOM_1_PROTEIN + person_event SPRITE_POKE_BALL, 34, 9, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x18c558, EVENT_SILVER_CAVE_ROOM_1_ESCAPE_ROPE + person_event SPRITE_POKE_BALL, 22, 11, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x18c55a, EVENT_SILVER_CAVE_ROOM_1_ULTRA_BALL diff --git a/maps/SilverCaveRoom2.asm b/maps/SilverCaveRoom2.asm index 5a7b870a2..39c128e8b 100644 --- a/maps/SilverCaveRoom2.asm +++ b/maps/SilverCaveRoom2.asm @@ -1,8 +1,8 @@ SilverCaveRoom2_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 ItemFragment_0x18c5b2: @@ -15,30 +15,29 @@ ItemFragment_0x18c5b6: db PP_UP, 1 MapSilverCaveRoom2SignpostItem0: - dw $009c - db MAX_POTION + dwb EVENT_SILVER_CAVE_ROOM_2_HIDDEN_MAX_POTION, MAX_POTION SilverCaveRoom2_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 4 warp_def $1f, $11, 2, GROUP_SILVER_CAVE_ROOM_1, MAP_SILVER_CAVE_ROOM_1 warp_def $5, $b, 1, GROUP_SILVER_CAVE_ROOM_3, MAP_SILVER_CAVE_ROOM_3 warp_def $15, $d, 1, GROUP_SILVER_CAVE_ITEM_ROOMS, MAP_SILVER_CAVE_ITEM_ROOMS warp_def $3, $17, 2, GROUP_SILVER_CAVE_ITEM_ROOMS, MAP_SILVER_CAVE_ITEM_ROOMS - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 1 - signpost 31, 14, $7, MapSilverCaveRoom2SignpostItem0 + signpost 31, 14, SIGNPOST_ITEM, MapSilverCaveRoom2SignpostItem0 - ; people-events +.PersonEvents: db 3 - person_event SPRITE_POKE_BALL, 14, 28, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c5b2, EVENT_7C2 - person_event SPRITE_POKE_BALL, 28, 26, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c5b4, EVENT_7C3 - person_event SPRITE_POKE_BALL, 24, 8, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c5b6, EVENT_7C4 + person_event SPRITE_POKE_BALL, 14, 28, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x18c5b2, EVENT_SILVER_CAVE_ROOM_2_CALCIUM + person_event SPRITE_POKE_BALL, 28, 26, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x18c5b4, EVENT_SILVER_CAVE_ROOM_2_ULTRA_BALL + person_event SPRITE_POKE_BALL, 24, 8, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x18c5b6, EVENT_SILVER_CAVE_ROOM_2_PP_UP diff --git a/maps/SilverCaveRoom3.asm b/maps/SilverCaveRoom3.asm index 27816033c..c1035849e 100644 --- a/maps/SilverCaveRoom3.asm +++ b/maps/SilverCaveRoom3.asm @@ -1,8 +1,8 @@ SilverCaveRoom3_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 RedScript_0x18c603: @@ -22,11 +22,11 @@ RedScript_0x18c603: writetext UnknownText_0x18c63f closetext loadmovesprites - special Function8c0b6 - special Functiond91 + special Special_FadeBlackQuickly + special Special_ReloadSpritesNoPalettes disappear $2 pause 15 - special Function8c0ab + special Special_FadeInQuickly pause 30 special HealParty refreshscreen $0 @@ -51,16 +51,16 @@ SilverCaveRoom3_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 1 warp_def $21, $9, 2, GROUP_SILVER_CAVE_ROOM_2, MAP_SILVER_CAVE_ROOM_2 - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 1 - person_event SPRITE_RED, 14, 13, $7, $0, 255, 255, $80, 0, RedScript_0x18c603, EVENT_RED_IN_MT_SILVER + person_event SPRITE_RED, 14, 13, OW_UP | $3, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, RedScript_0x18c603, EVENT_RED_IN_MT_SILVER diff --git a/maps/SlowpokeWellB1F.asm b/maps/SlowpokeWellB1F.asm index a27f0cacb..971e3e30a 100644 --- a/maps/SlowpokeWellB1F.asm +++ b/maps/SlowpokeWellB1F.asm @@ -1,31 +1,15 @@ SlowpokeWellB1F_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 KurtScript_0x5a5d5: jumptextfaceplayer UnknownText_0x5a6b5 TrainerGruntM29: - ; bit/flag number - dw EVENT_BEAT_ROCKET_GRUNTM_22 - - ; trainer group && trainer id - db GRUNTM, 29 - - ; text when seen - dw GruntM29SeenText - - ; text when trainer beaten - dw GruntM29BeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw GruntM29Script + trainer EVENT_BEAT_ROCKET_GRUNTM_29, GRUNTM, 29, GruntM29SeenText, GruntM29BeatenText, $0000, GruntM29Script GruntM29Script: talkaftercancel @@ -36,37 +20,21 @@ GruntM29Script: end TrainerGruntM1: - ; bit/flag number - dw EVENT_BEAT_ROCKET_GRUNTM_1 - - ; trainer group && trainer id - db GRUNTM, 1 - - ; text when seen - dw GruntM1SeenText - - ; text when trainer beaten - dw GruntM1BeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw GruntM1Script + trainer EVENT_BEAT_ROCKET_GRUNTM_1, GRUNTM, 1, GruntM1SeenText, GruntM1BeatenText, $0000, GruntM1Script GruntM1Script: loadfont writetext TrainerGruntM1WhenTalkText closetext loadmovesprites - special Function8c0b6 - special Functiond91 + special Special_FadeBlackQuickly + special Special_ReloadSpritesNoPalettes disappear $2 disappear $3 disappear $4 disappear $5 pause 15 - special Function8c0ab + special Special_FadeInQuickly disappear $8 moveperson $8, $b, $6 appear $8 @@ -77,41 +45,25 @@ GruntM1Script: closetext loadmovesprites setevent EVENT_CLEARED_SLOWPOKE_WELL - variablesprite $6, $4 + variablesprite SPRITE_AZALEA_ROCKET, SPRITE_SILVER domaptrigger GROUP_AZALEA_TOWN, MAP_AZALEA_TOWN, $1 - clearevent EVENT_6F3 - clearevent EVENT_6E9 - setevent EVENT_6F5 - setevent EVENT_6F6 - setevent EVENT_6FB - setevent EVENT_740 - clearevent EVENT_6F9 - clearevent EVENT_6FD - clearevent EVENT_73E - special Function8c084 + clearevent EVENT_ILEX_FOREST_APPRENTICE + clearevent EVENT_ILEX_FOREST_FARFETCHD + setevent EVENT_CHARCOAL_KILN_FARFETCH_D + setevent EVENT_CHARCOAL_KILN_APPRENTICE + setevent EVENT_SLOWPOKE_WELL_SLOWPOKES + setevent EVENT_SLOWPOKE_WELL_KURT + clearevent EVENT_AZALEA_TOWN_SLOWPOKES + clearevent EVENT_KURTS_HOUSE_SLOWPOKE + clearevent EVENT_KURTS_HOUSE_KURT_1 + special FadeBlackBGMap special HealParty pause 15 warp GROUP_KURTS_HOUSE, MAP_KURTS_HOUSE, $3, $3 end TrainerGruntM2: - ; bit/flag number - dw EVENT_BEAT_ROCKET_GRUNTM_2 - - ; trainer group && trainer id - db GRUNTM, 2 - - ; text when seen - dw GruntM2SeenText - - ; text when trainer beaten - dw GruntM2BeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw GruntM2Script + trainer EVENT_BEAT_ROCKET_GRUNTM_2, GRUNTM, 2, GruntM2SeenText, GruntM2BeatenText, $0000, GruntM2Script GruntM2Script: talkaftercancel @@ -122,23 +74,7 @@ GruntM2Script: end TrainerGruntF1: - ; bit/flag number - dw EVENT_BEAT_ROCKET_GRUNTF_1 - - ; trainer group && trainer id - db GRUNTF, 1 - - ; text when seen - dw GruntF1SeenText - - ; text when trainer beaten - dw GruntF1BeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw GruntF1Script + trainer EVENT_BEAT_ROCKET_GRUNTF_1, GRUNTF, 1, GruntF1SeenText, GruntF1BeatenText, $0000, GruntF1Script GruntF1Script: talkaftercancel @@ -377,25 +313,25 @@ SlowpokeWellB1F_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $f, $11, 6, GROUP_AZALEA_TOWN, MAP_AZALEA_TOWN warp_def $b, $7, 1, GROUP_SLOWPOKE_WELL_B2F, MAP_SLOWPOKE_WELL_B2F - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 9 - person_event SPRITE_ROCKET, 11, 19, $6, $0, 255, 255, $2, 3, TrainerGruntM29, EVENT_6FC - person_event SPRITE_ROCKET, 6, 9, $6, $0, 255, 255, $2, 1, TrainerGruntM1, EVENT_6FC - person_event SPRITE_ROCKET, 10, 9, $9, $0, 255, 255, $2, 2, TrainerGruntM2, EVENT_6FC - person_event SPRITE_ROCKET_GIRL, 8, 14, $9, $0, 255, 255, $82, 4, TrainerGruntF1, EVENT_6FC - person_event SPRITE_SLOWPOKE, 8, 11, $1, $0, 255, 255, $80, 0, SlowpokeScript_0x5a681, EVENT_6FB - person_event SPRITE_SLOWPOKE, 6, 10, $1, $0, 255, 255, $80, 0, SlowpokeScript_0x5a695, EVENT_6FB - person_event SPRITE_KURT, 18, 20, $7, $0, 255, 255, $0, 0, KurtScript_0x5a5d5, EVENT_740 - person_event SPRITE_BOULDER, 6, 7, $19, $0, 255, 255, $0, 0, SlowpokeWellB1FBoulder, -1 - person_event SPRITE_POKE_BALL, 7, 14, $1, $0, 255, 255, $1, 0, ItemFragment_0x5a6a3, EVENT_662 + person_event SPRITE_ROCKET, 11, 19, OW_UP | $2, $0, -1, -1, $2, 3, TrainerGruntM29, EVENT_SLOWPOKE_WELL_ROCKETS + person_event SPRITE_ROCKET, 6, 9, OW_UP | $2, $0, -1, -1, $2, 1, TrainerGruntM1, EVENT_SLOWPOKE_WELL_ROCKETS + person_event SPRITE_ROCKET, 10, 9, OW_LEFT | $1, $0, -1, -1, $2, 2, TrainerGruntM2, EVENT_SLOWPOKE_WELL_ROCKETS + person_event SPRITE_ROCKET_GIRL, 8, 14, OW_LEFT | $1, $0, -1, -1, (PAL_OW_RED << 4) | $82, 4, TrainerGruntF1, EVENT_SLOWPOKE_WELL_ROCKETS + person_event SPRITE_SLOWPOKE, 8, 11, OW_DOWN | $1, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, SlowpokeScript_0x5a681, EVENT_SLOWPOKE_WELL_SLOWPOKES + person_event SPRITE_SLOWPOKE, 6, 10, OW_DOWN | $1, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, SlowpokeScript_0x5a695, EVENT_SLOWPOKE_WELL_SLOWPOKES + person_event SPRITE_KURT, 18, 20, OW_UP | $3, $0, -1, -1, $0, 0, KurtScript_0x5a5d5, EVENT_SLOWPOKE_WELL_KURT + person_event SPRITE_BOULDER, 6, 7, OW_LEFT | $11, $0, -1, -1, $0, 0, SlowpokeWellB1FBoulder, -1 + person_event SPRITE_POKE_BALL, 7, 14, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x5a6a3, EVENT_SLOWPOKE_WELL_B1F_SUPER_POTION diff --git a/maps/SlowpokeWellB2F.asm b/maps/SlowpokeWellB2F.asm index 7f2b4d8a4..ae74443ec 100644 --- a/maps/SlowpokeWellB2F.asm +++ b/maps/SlowpokeWellB2F.asm @@ -1,8 +1,8 @@ SlowpokeWellB2F_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 GymGuyScript_0x5ad0b: @@ -61,17 +61,17 @@ SlowpokeWellB2F_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 1 warp_def $b, $9, 2, GROUP_SLOWPOKE_WELL_B1F, MAP_SLOWPOKE_WELL_B1F - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 2 - person_event SPRITE_GYM_GUY, 8, 9, $2, $21, 255, 255, $0, 1, GymGuyScript_0x5ad0b, -1 - person_event SPRITE_POKE_BALL, 9, 19, $1, $0, 255, 255, $1, 0, ItemFragment_0x5ad28, EVENT_663 + person_event SPRITE_GYM_GUY, 8, 9, OW_DOWN | $2, $21, -1, -1, $0, 1, GymGuyScript_0x5ad0b, -1 + person_event SPRITE_POKE_BALL, 9, 19, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x5ad28, EVENT_SLOWPOKE_WELL_B2F_TM_RAIN_DANCE diff --git a/maps/SoulHouse.asm b/maps/SoulHouse.asm index 36aea0ce7..6f3aeca87 100644 --- a/maps/SoulHouse.asm +++ b/maps/SoulHouse.asm @@ -1,8 +1,8 @@ SoulHouse_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 GrampsScript_0x7ec47: @@ -70,20 +70,20 @@ SoulHouse_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $7, $4, 6, GROUP_LAVENDER_TOWN, MAP_LAVENDER_TOWN warp_def $7, $5, 6, GROUP_LAVENDER_TOWN, MAP_LAVENDER_TOWN - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 4 - person_event SPRITE_GRAMPS, 6, 8, $6, $0, 255, 255, $90, 0, GrampsScript_0x7ec47, -1 - person_event SPRITE_TEACHER, 7, 11, $5, $1, 255, 255, $90, 0, TeacherScript_0x7ec4a, -1 - person_event SPRITE_LASS, 9, 6, $7, $0, 255, 255, $90, 0, LassScript_0x7ec4d, -1 - person_event SPRITE_GRANNY, 7, 5, $7, $0, 255, 255, $90, 0, GrannyScript_0x7ec50, -1 + person_event SPRITE_GRAMPS, 6, 8, OW_UP | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, GrampsScript_0x7ec47, -1 + person_event SPRITE_TEACHER, 7, 11, OW_UP | $1, $1, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, TeacherScript_0x7ec4a, -1 + person_event SPRITE_LASS, 9, 6, OW_UP | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, LassScript_0x7ec4d, -1 + person_event SPRITE_GRANNY, 7, 5, OW_UP | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, GrannyScript_0x7ec50, -1 diff --git a/maps/SproutTower1F.asm b/maps/SproutTower1F.asm index 8a6c625db..82b1e33b9 100644 --- a/maps/SproutTower1F.asm +++ b/maps/SproutTower1F.asm @@ -1,8 +1,8 @@ SproutTower1F_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 SageScript_0x1844fe: @@ -18,23 +18,7 @@ TeacherScript_0x184507: jumptextfaceplayer UnknownText_0x18469d TrainerSageChow: - ; bit/flag number - dw EVENT_BEAT_SAGE_CHOW - - ; trainer group && trainer id - db SAGE, CHOW - - ; text when seen - dw SageChowSeenText - - ; text when trainer beaten - dw SageChowBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw SageChowScript + trainer EVENT_BEAT_SAGE_CHOW, SAGE, CHOW, SageChowSeenText, SageChowBeatenText, $0000, SageChowScript SageChowScript: talkaftercancel @@ -114,7 +98,7 @@ SproutTower1F_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 5 warp_def $f, $9, 7, GROUP_VIOLET_CITY, MAP_VIOLET_CITY warp_def $f, $a, 7, GROUP_VIOLET_CITY, MAP_VIOLET_CITY @@ -122,19 +106,19 @@ SproutTower1F_MapEventHeader: warp_def $6, $2, 2, GROUP_SPROUT_TOWER_2F, MAP_SPROUT_TOWER_2F warp_def $3, $11, 3, GROUP_SPROUT_TOWER_2F, MAP_SPROUT_TOWER_2F - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 2 - signpost 15, 7, $0, MapSproutTower1FSignpost1Script - signpost 15, 12, $0, MapSproutTower1FSignpost1Script + signpost 15, 7, SIGNPOST_READ, MapSproutTower1FSignpost1Script + signpost 15, 12, SIGNPOST_READ, MapSproutTower1FSignpost1Script - ; people-events +.PersonEvents: db 6 - person_event SPRITE_SAGE, 8, 11, $6, $0, 255, 255, $90, 0, SageScript_0x1844fe, -1 - person_event SPRITE_SAGE, 11, 10, $2, $11, 255, 255, $90, 0, SageScript_0x184501, -1 - person_event SPRITE_GRANNY, 16, 15, $8, $0, 255, 255, $0, 0, GrannyScript_0x184504, -1 - person_event SPRITE_TEACHER, 13, 13, $7, $0, 255, 255, $0, 0, TeacherScript_0x184507, -1 - person_event SPRITE_SAGE, 9, 7, $7, $0, 255, 255, $92, 4, TrainerSageChow, -1 - person_event SPRITE_POKE_BALL, 11, 20, $1, $0, 255, 255, $1, 0, ItemFragment_0x18451e, EVENT_647 + person_event SPRITE_SAGE, 8, 11, OW_UP | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, SageScript_0x1844fe, -1 + person_event SPRITE_SAGE, 11, 10, OW_DOWN | $2, $11, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, SageScript_0x184501, -1 + person_event SPRITE_GRANNY, 16, 15, OW_LEFT | $0, $0, -1, -1, $0, 0, GrannyScript_0x184504, -1 + person_event SPRITE_TEACHER, 13, 13, OW_UP | $3, $0, -1, -1, $0, 0, TeacherScript_0x184507, -1 + person_event SPRITE_SAGE, 9, 7, OW_UP | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 4, TrainerSageChow, -1 + person_event SPRITE_POKE_BALL, 11, 20, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x18451e, EVENT_SPROUT_TOWER1F_PARLYZ_HEAL diff --git a/maps/SproutTower2F.asm b/maps/SproutTower2F.asm index 9d4230ffb..bcf59da24 100644 --- a/maps/SproutTower2F.asm +++ b/maps/SproutTower2F.asm @@ -1,28 +1,12 @@ SproutTower2F_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 TrainerSageNico: - ; bit/flag number - dw EVENT_BEAT_SAGE_NICO - - ; trainer group && trainer id - db SAGE, NICO - - ; text when seen - dw SageNicoSeenText - - ; text when trainer beaten - dw SageNicoBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw SageNicoScript + trainer EVENT_BEAT_SAGE_NICO, SAGE, NICO, SageNicoSeenText, SageNicoBeatenText, $0000, SageNicoScript SageNicoScript: talkaftercancel @@ -33,23 +17,7 @@ SageNicoScript: end TrainerSageEdmond: - ; bit/flag number - dw EVENT_BEAT_SAGE_EDMOND - - ; trainer group && trainer id - db SAGE, EDMOND - - ; text when seen - dw SageEdmondSeenText - - ; text when trainer beaten - dw SageEdmondBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw SageEdmondScript + trainer EVENT_BEAT_SAGE_EDMOND, SAGE, EDMOND, SageEdmondSeenText, SageEdmondBeatenText, $0000, SageEdmondScript SageEdmondScript: talkaftercancel @@ -115,22 +83,22 @@ SproutTower2F_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 4 warp_def $4, $6, 3, GROUP_SPROUT_TOWER_1F, MAP_SPROUT_TOWER_1F warp_def $6, $2, 4, GROUP_SPROUT_TOWER_1F, MAP_SPROUT_TOWER_1F warp_def $3, $11, 5, GROUP_SPROUT_TOWER_1F, MAP_SPROUT_TOWER_1F warp_def $e, $a, 1, GROUP_SPROUT_TOWER_3F, MAP_SPROUT_TOWER_3F - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 1 - signpost 15, 12, $0, MapSproutTower2FSignpost0Script + signpost 15, 12, SIGNPOST_READ, MapSproutTower2FSignpost0Script - ; people-events +.PersonEvents: db 3 - person_event SPRITE_SAGE, 7, 16, $a, $0, 255, 255, $92, 4, TrainerSageNico, -1 - person_event SPRITE_SAGE, 18, 13, $8, $0, 255, 255, $92, 5, TrainerSageEdmond, -1 - person_event SPRITE_POKE_BALL, 5, 7, $1, $0, 255, 255, $1, 0, ItemFragment_0x1847a7, EVENT_648 + person_event SPRITE_SAGE, 7, 16, OW_LEFT | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 4, TrainerSageNico, -1 + person_event SPRITE_SAGE, 18, 13, OW_LEFT | $0, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 5, TrainerSageEdmond, -1 + person_event SPRITE_POKE_BALL, 5, 7, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x1847a7, EVENT_SPROUT_TOWER2F_X_ACCURACY diff --git a/maps/SproutTower3F.asm b/maps/SproutTower3F.asm index c7de575fd..148ef23a6 100644 --- a/maps/SproutTower3F.asm +++ b/maps/SproutTower3F.asm @@ -1,12 +1,12 @@ SproutTower3F_MapScriptHeader: - ; trigger count +.MapTriggers: db 2 ; triggers dw UnknownScript_0x184945, $0000 dw UnknownScript_0x184946, $0000 - ; callback count +.MapCallbacks: db 0 UnknownScript_0x184945: @@ -17,7 +17,7 @@ UnknownScript_0x184946: UnknownScript_0x184947: spriteface $0, UP - showemote $0, $0, 15 + showemote EMOTE_SHOCK, $0, 15 special Functionc48f playsound SFX_TACKLE playsound SFX_ELEVATOR @@ -32,7 +32,7 @@ UnknownScript_0x184947: writetext UnknownText_0x184a27 closetext loadmovesprites - showemote $0, $8, 15 + showemote EMOTE_SHOCK, $8, 15 spriteface $8, DOWN pause 15 applymovement $8, MovementData_0x184a24 @@ -47,11 +47,11 @@ UnknownScript_0x184947: pause 15 loadmovesprites playsound SFX_WARP_TO - special Function8c0b6 - special Functiond91 + special Special_FadeBlackQuickly + special Special_ReloadSpritesNoPalettes disappear $8 waitbutton - special Function8c0ab + special Special_FadeInQuickly dotrigger $1 special RestartMapMusic end @@ -86,23 +86,7 @@ UnknownScript_0x1849d1: end TrainerSageJin: - ; bit/flag number - dw EVENT_BEAT_SAGE_JIN - - ; trainer group && trainer id - db SAGE, JIN - - ; text when seen - dw SageJinSeenText - - ; text when trainer beaten - dw SageJinBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw SageJinScript + trainer EVENT_BEAT_SAGE_JIN, SAGE, JIN, SageJinSeenText, SageJinBeatenText, $0000, SageJinScript SageJinScript: talkaftercancel @@ -113,23 +97,7 @@ SageJinScript: end TrainerSageTroy: - ; bit/flag number - dw EVENT_BEAT_SAGE_TROY - - ; trainer group && trainer id - db SAGE, TROY - - ; text when seen - dw SageTroySeenText - - ; text when trainer beaten - dw SageTroyBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw SageTroyScript + trainer EVENT_BEAT_SAGE_TROY, SAGE, TROY, SageTroySeenText, SageTroyBeatenText, $0000, SageTroyScript SageTroyScript: talkaftercancel @@ -140,23 +108,7 @@ SageTroyScript: end TrainerSageNeal: - ; bit/flag number - dw EVENT_BEAT_SAGE_NEAL - - ; trainer group && trainer id - db SAGE, NEAL - - ; text when seen - dw SageNealSeenText - - ; text when trainer beaten - dw SageNealBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw SageNealScript + trainer EVENT_BEAT_SAGE_NEAL, SAGE, NEAL, SageNealSeenText, SageNealBeatenText, $0000, SageNealScript SageNealScript: talkaftercancel @@ -374,29 +326,29 @@ SproutTower3F_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 1 warp_def $e, $a, 4, GROUP_SPROUT_TOWER_2F, MAP_SPROUT_TOWER_2F - ; xy triggers +.XYTriggers: db 1 xy_trigger 0, $9, $b, $0, UnknownScript_0x184947, $0, $0 - ; signposts +.Signposts: db 6 - signpost 1, 8, $0, MapSproutTower3FSignpost5Script - signpost 1, 11, $0, MapSproutTower3FSignpost5Script - signpost 0, 9, $0, MapSproutTower3FSignpost3Script - signpost 0, 10, $0, MapSproutTower3FSignpost3Script - signpost 15, 5, $0, MapSproutTower3FSignpost5Script - signpost 15, 14, $0, MapSproutTower3FSignpost5Script - - ; people-events + signpost 1, 8, SIGNPOST_READ, MapSproutTower3FSignpost5Script + signpost 1, 11, SIGNPOST_READ, MapSproutTower3FSignpost5Script + signpost 0, 9, SIGNPOST_READ, MapSproutTower3FSignpost3Script + signpost 0, 10, SIGNPOST_READ, MapSproutTower3FSignpost3Script + signpost 15, 5, SIGNPOST_READ, MapSproutTower3FSignpost5Script + signpost 15, 14, SIGNPOST_READ, MapSproutTower3FSignpost5Script + +.PersonEvents: db 7 - person_event SPRITE_SAGE, 17, 12, $9, $0, 255, 255, $92, 3, TrainerSageJin, -1 - person_event SPRITE_SAGE, 12, 12, $6, $0, 255, 255, $92, 2, TrainerSageTroy, -1 - person_event SPRITE_SAGE, 6, 14, $6, $0, 255, 255, $90, 0, SageLiScript, -1 - person_event SPRITE_SAGE, 15, 15, $8, $0, 255, 255, $92, 3, TrainerSageNeal, -1 - person_event SPRITE_POKE_BALL, 18, 10, $1, $0, 255, 255, $1, 0, ItemFragment_0x184a19, EVENT_649 - person_event SPRITE_POKE_BALL, 5, 18, $1, $0, 255, 255, $1, 0, ItemFragment_0x184a1b, EVENT_64A - person_event SPRITE_SILVER, 8, 14, $7, $0, 255, 255, $0, 0, ObjectEvent, EVENT_RIVAL_SPROUT_TOWER + person_event SPRITE_SAGE, 17, 12, OW_LEFT | $1, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 3, TrainerSageJin, -1 + person_event SPRITE_SAGE, 12, 12, OW_UP | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 2, TrainerSageTroy, -1 + person_event SPRITE_SAGE, 6, 14, OW_UP | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, SageLiScript, -1 + person_event SPRITE_SAGE, 15, 15, OW_LEFT | $0, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 3, TrainerSageNeal, -1 + person_event SPRITE_POKE_BALL, 18, 10, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x184a19, EVENT_SPROUT_TOWER_3F_POTION + person_event SPRITE_POKE_BALL, 5, 18, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x184a1b, EVENT_SPROUT_TOWER_3F_ESCAPE_ROPE + person_event SPRITE_SILVER, 8, 14, OW_UP | $3, $0, -1, -1, $0, 0, ObjectEvent, EVENT_RIVAL_SPROUT_TOWER diff --git a/maps/TeamRocketBaseB1F.asm b/maps/TeamRocketBaseB1F.asm index 21881ef03..32582ccc7 100644 --- a/maps/TeamRocketBaseB1F.asm +++ b/maps/TeamRocketBaseB1F.asm @@ -1,11 +1,11 @@ TeamRocketBaseB1F_MapScriptHeader: - ; trigger count +.MapTriggers: db 1 ; triggers dw UnknownScript_0x6c65a, $0000 - ; callback count +.MapCallbacks: db 1 ; callbacks @@ -23,9 +23,9 @@ SecurityCamera1a: checkevent EVENT_SECURITY_CAMERA_1 iftrue NoSecurityCamera scall PlaySecurityCameraSounds - checkevent EVENT_6DA + checkevent EVENT_TEAM_ROCKET_BASE_POPULATION iftrue NoSecurityCamera - showemote $0, $0, 15 + showemote EMOTE_SHOCK, $0, 15 playmusic MUSIC_ROCKET_ENCOUNTER moveperson $2, $13, $2 appear $2 @@ -34,7 +34,7 @@ SecurityCamera1a: scall TrainerCameraGrunt1 if_equal $1, NoSecurityCamera scall PlaySecurityCameraSounds - showemote $0, $0, 15 + showemote EMOTE_SHOCK, $0, 15 playmusic MUSIC_ROCKET_ENCOUNTER moveperson $2, $13, $2 appear $2 @@ -48,9 +48,9 @@ SecurityCamera1b: checkevent EVENT_SECURITY_CAMERA_1 iftrue NoSecurityCamera scall PlaySecurityCameraSounds - checkevent EVENT_6DA + checkevent EVENT_TEAM_ROCKET_BASE_POPULATION iftrue NoSecurityCamera - showemote $0, $0, 15 + showemote EMOTE_SHOCK, $0, 15 playmusic MUSIC_ROCKET_ENCOUNTER moveperson $2, $13, $3 appear $2 @@ -59,7 +59,7 @@ SecurityCamera1b: scall TrainerCameraGrunt1 if_equal $1, NoSecurityCamera scall PlaySecurityCameraSounds - showemote $0, $0, 15 + showemote EMOTE_SHOCK, $0, 15 playmusic MUSIC_ROCKET_ENCOUNTER moveperson $2, $13, $3 appear $2 @@ -73,9 +73,9 @@ SecurityCamera2a: checkevent EVENT_SECURITY_CAMERA_2 iftrue NoSecurityCamera scall PlaySecurityCameraSounds - checkevent EVENT_6DA + checkevent EVENT_TEAM_ROCKET_BASE_POPULATION iftrue NoSecurityCamera - showemote $0, $0, 15 + showemote EMOTE_SHOCK, $0, 15 playmusic MUSIC_ROCKET_ENCOUNTER moveperson $2, $4, $7 appear $2 @@ -84,7 +84,7 @@ SecurityCamera2a: scall TrainerCameraGrunt1 if_equal $1, NoSecurityCamera scall PlaySecurityCameraSounds - showemote $0, $0, 15 + showemote EMOTE_SHOCK, $0, 15 playmusic MUSIC_ROCKET_ENCOUNTER spriteface $0, RIGHT moveperson $2, $c, $5 @@ -99,9 +99,9 @@ SecurityCamera2b: checkevent EVENT_SECURITY_CAMERA_2 iftrue NoSecurityCamera scall PlaySecurityCameraSounds - checkevent EVENT_6DA + checkevent EVENT_TEAM_ROCKET_BASE_POPULATION iftrue NoSecurityCamera - showemote $0, $0, 15 + showemote EMOTE_SHOCK, $0, 15 playmusic MUSIC_ROCKET_ENCOUNTER moveperson $2, $4, $8 appear $2 @@ -110,7 +110,7 @@ SecurityCamera2b: scall TrainerCameraGrunt1 if_equal $1, NoSecurityCamera scall PlaySecurityCameraSounds - showemote $0, $0, 15 + showemote EMOTE_SHOCK, $0, 15 playmusic MUSIC_ROCKET_ENCOUNTER spriteface $0, RIGHT moveperson $2, $c, $5 @@ -125,9 +125,9 @@ SecurityCamera3a: checkevent EVENT_SECURITY_CAMERA_3 iftrue NoSecurityCamera scall PlaySecurityCameraSounds - checkevent EVENT_6DA + checkevent EVENT_TEAM_ROCKET_BASE_POPULATION iftrue NoSecurityCamera - showemote $0, $0, 15 + showemote EMOTE_SHOCK, $0, 15 playmusic MUSIC_ROCKET_ENCOUNTER moveperson $2, $13, $6 appear $2 @@ -136,7 +136,7 @@ SecurityCamera3a: scall TrainerCameraGrunt1 if_equal $1, NoSecurityCamera scall PlaySecurityCameraSounds - showemote $0, $0, 15 + showemote EMOTE_SHOCK, $0, 15 playmusic MUSIC_ROCKET_ENCOUNTER spriteface $0, RIGHT moveperson $2, $19, $b @@ -151,9 +151,9 @@ SecurityCamera3b: checkevent EVENT_SECURITY_CAMERA_3 iftrue NoSecurityCamera scall PlaySecurityCameraSounds - checkevent EVENT_6DA + checkevent EVENT_TEAM_ROCKET_BASE_POPULATION iftrue NoSecurityCamera - showemote $0, $0, 15 + showemote EMOTE_SHOCK, $0, 15 playmusic MUSIC_ROCKET_ENCOUNTER moveperson $2, $13, $7 appear $2 @@ -162,7 +162,7 @@ SecurityCamera3b: scall TrainerCameraGrunt1 if_equal $1, NoSecurityCamera scall PlaySecurityCameraSounds - showemote $0, $0, 15 + showemote EMOTE_SHOCK, $0, 15 playmusic MUSIC_ROCKET_ENCOUNTER spriteface $0, RIGHT moveperson $2, $19, $c @@ -177,9 +177,9 @@ SecurityCamera4: checkevent EVENT_SECURITY_CAMERA_4 iftrue NoSecurityCamera scall PlaySecurityCameraSounds - checkevent EVENT_6DA + checkevent EVENT_TEAM_ROCKET_BASE_POPULATION iftrue NoSecurityCamera - showemote $0, $0, 15 + showemote EMOTE_SHOCK, $0, 15 playmusic MUSIC_ROCKET_ENCOUNTER moveperson $2, $11, $10 appear $2 @@ -188,7 +188,7 @@ SecurityCamera4: scall TrainerCameraGrunt1 if_equal $1, NoSecurityCamera scall PlaySecurityCameraSounds - showemote $0, $0, 15 + showemote EMOTE_SHOCK, $0, 15 playmusic MUSIC_ROCKET_ENCOUNTER spriteface $0, RIGHT moveperson $2, $19, $b @@ -203,9 +203,9 @@ SecurityCamera5: checkevent EVENT_SECURITY_CAMERA_5 iftrue NoSecurityCamera scall PlaySecurityCameraSounds - checkevent EVENT_6DA + checkevent EVENT_TEAM_ROCKET_BASE_POPULATION iftrue NoSecurityCamera - showemote $0, $0, 15 + showemote EMOTE_SHOCK, $0, 15 playmusic MUSIC_ROCKET_ENCOUNTER moveperson $2, $3, $10 appear $2 @@ -214,7 +214,7 @@ SecurityCamera5: scall TrainerCameraGrunt1 if_equal $1, NoSecurityCamera scall PlaySecurityCameraSounds - showemote $0, $0, 15 + showemote EMOTE_SHOCK, $0, 15 playmusic MUSIC_ROCKET_ENCOUNTER spriteface $0, RIGHT moveperson $2, $e, $10 @@ -445,9 +445,9 @@ ExplodingTrap22: end VoltorbExplodingTrap: - special Function8c084 + special FadeBlackBGMap cry VOLTORB - special Function8c079 + special FadeInBGMap setlasttalked $ff writecode VAR_BATTLETYPE, BATTLETYPE_TRAP loadpokedata VOLTORB, 23 @@ -455,9 +455,9 @@ VoltorbExplodingTrap: end GeodudeExplodingTrap: - special Function8c084 + special FadeBlackBGMap cry GEODUDE - special Function8c079 + special FadeInBGMap setlasttalked $ff writecode VAR_BATTLETYPE, BATTLETYPE_TRAP loadpokedata GEODUDE, 21 @@ -465,9 +465,9 @@ GeodudeExplodingTrap: end KoffingExplodingTrap: - special Function8c084 + special FadeBlackBGMap cry KOFFING - special Function8c079 + special FadeInBGMap setlasttalked $ff writecode VAR_BATTLETYPE, BATTLETYPE_TRAP loadpokedata KOFFING, 21 @@ -478,23 +478,7 @@ NoExplodingTrap: end TrainerScientistJed: - ; bit/flag number - dw EVENT_BEAT_SCIENTIST_JED - - ; trainer group && trainer id - db SCIENTIST, JED - - ; text when seen - dw ScientistJedSeenText - - ; text when trainer beaten - dw ScientistJedBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw ScientistJedScript + trainer EVENT_BEAT_SCIENTIST_JED, SCIENTIST, JED, ScientistJedSeenText, ScientistJedBeatenText, $0000, ScientistJedScript ScientistJedScript: talkaftercancel @@ -505,23 +489,7 @@ ScientistJedScript: end TrainerGruntM16: - ; bit/flag number - dw EVENT_BEAT_ROCKET_GRUNTM_15 - - ; trainer group && trainer id - db GRUNTM, 16 - - ; text when seen - dw GruntM16SeenText - - ; text when trainer beaten - dw GruntM16BeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw GruntM16Script + trainer EVENT_BEAT_ROCKET_GRUNTM_16, GRUNTM, 16, GruntM16SeenText, GruntM16BeatenText, $0000, GruntM16Script GruntM16Script: talkaftercancel @@ -569,8 +537,7 @@ ItemFragment_0x6cac8: db GUARD_SPEC, 1 MapTeamRocketBaseB1FSignpostItem8: - dw $0086 - db REVIVE + dwb EVENT_TEAM_ROCKET_BASE_B1F_HIDDEN_REVIVE, REVIVE SecurityCameraMovement1: @@ -761,14 +728,14 @@ TeamRocketBaseB1F_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 4 warp_def $2, $1b, 3, GROUP_MAHOGANY_MART_1F, MAP_MAHOGANY_MART_1F warp_def $e, $3, 1, GROUP_TEAM_ROCKET_BASE_B2F, MAP_TEAM_ROCKET_BASE_B2F warp_def $f, $5, 4, GROUP_TEAM_ROCKET_BASE_B1F, MAP_TEAM_ROCKET_BASE_B1F warp_def $2, $19, 3, GROUP_TEAM_ROCKET_BASE_B1F, MAP_TEAM_ROCKET_BASE_B1F - ; xy triggers +.XYTriggers: db 30 ; There are five security cameras in the base. ; Walking in front of one triggers two Rocket Grunts. @@ -805,23 +772,23 @@ TeamRocketBaseB1F_MapEventHeader: xy_trigger 0, $d, $4, $0, ExplodingTrap21, $0, $0 xy_trigger 0, $d, $5, $0, ExplodingTrap22, $0, $0 - ; signposts +.Signposts: db 9 - signpost 11, 19, $0, MapTeamRocketBaseB1FSignpost0Script - signpost 1, 24, $1, MapTeamRocketBaseB1FSignpost5Script - signpost 1, 6, $1, MapTeamRocketBaseB1FSignpost5Script - signpost 15, 8, $1, MapTeamRocketBaseB1FSignpost5Script - signpost 15, 22, $1, MapTeamRocketBaseB1FSignpost5Script - signpost 5, 24, $1, MapTeamRocketBaseB1FSignpost5Script - signpost 11, 20, $0, MapTeamRocketBaseB1FSignpost7Script - signpost 11, 21, $0, MapTeamRocketBaseB1FSignpost7Script - signpost 11, 3, $7, MapTeamRocketBaseB1FSignpostItem8 - - ; people-events + signpost 11, 19, SIGNPOST_READ, MapTeamRocketBaseB1FSignpost0Script + signpost 1, 24, SIGNPOST_UP, MapTeamRocketBaseB1FSignpost5Script + signpost 1, 6, SIGNPOST_UP, MapTeamRocketBaseB1FSignpost5Script + signpost 15, 8, SIGNPOST_UP, MapTeamRocketBaseB1FSignpost5Script + signpost 15, 22, SIGNPOST_UP, MapTeamRocketBaseB1FSignpost5Script + signpost 5, 24, SIGNPOST_UP, MapTeamRocketBaseB1FSignpost5Script + signpost 11, 20, SIGNPOST_READ, MapTeamRocketBaseB1FSignpost7Script + signpost 11, 21, SIGNPOST_READ, MapTeamRocketBaseB1FSignpost7Script + signpost 11, 3, SIGNPOST_ITEM, MapTeamRocketBaseB1FSignpostItem8 + +.PersonEvents: db 6 - person_event SPRITE_ROCKET, 4, 4, $6, $0, 255, 255, $0, 0, ObjectEvent, EVENT_6D9 - person_event SPRITE_ROCKET, 8, 6, $9, $0, 255, 255, $2, 3, TrainerGruntM16, EVENT_6DA - person_event SPRITE_SCIENTIST, 16, 22, $8, $0, 255, 255, $92, 3, TrainerScientistJed, EVENT_6DA - person_event SPRITE_POKE_BALL, 10, 31, $1, $0, 255, 255, $1, 0, ItemFragment_0x6cac4, EVENT_669 - person_event SPRITE_POKE_BALL, 19, 18, $1, $0, 255, 255, $1, 0, ItemFragment_0x6cac6, EVENT_66A - person_event SPRITE_POKE_BALL, 16, 25, $1, $0, 255, 255, $1, 0, ItemFragment_0x6cac8, EVENT_66B + person_event SPRITE_ROCKET, 4, 4, OW_UP | $2, $0, -1, -1, $0, 0, ObjectEvent, EVENT_TEAM_ROCKET_BASE_SECURITY_GRUNTS + person_event SPRITE_ROCKET, 8, 6, OW_LEFT | $1, $0, -1, -1, $2, 3, TrainerGruntM16, EVENT_TEAM_ROCKET_BASE_POPULATION + person_event SPRITE_SCIENTIST, 16, 22, OW_LEFT | $0, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 3, TrainerScientistJed, EVENT_TEAM_ROCKET_BASE_POPULATION + person_event SPRITE_POKE_BALL, 10, 31, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x6cac4, EVENT_TEAM_ROCKET_BASE_B1F_HYPER_POTION + person_event SPRITE_POKE_BALL, 19, 18, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x6cac6, EVENT_TEAM_ROCKET_BASE_B1F_NUGGET + person_event SPRITE_POKE_BALL, 16, 25, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x6cac8, EVENT_TEAM_ROCKET_BASE_B1F_GUARD_SPEC diff --git a/maps/TeamRocketBaseB2F.asm b/maps/TeamRocketBaseB2F.asm index 7b0b7bb39..701173fba 100644 --- a/maps/TeamRocketBaseB2F.asm +++ b/maps/TeamRocketBaseB2F.asm @@ -1,5 +1,5 @@ TeamRocketBaseB2F_MapScriptHeader: - ; trigger count +.MapTriggers: db 4 ; triggers @@ -8,7 +8,7 @@ TeamRocketBaseB2F_MapScriptHeader: dw UnknownScript_0x6cf87, $0000 dw UnknownScript_0x6cf88, $0000 - ; callback count +.MapCallbacks: db 1 ; callbacks @@ -53,7 +53,7 @@ UnknownScript_0x6cfac: closetext loadmovesprites spriteface $0, DOWN - showemote $0, $0, 15 + showemote EMOTE_SHOCK, $0, 15 applymovement $0, MovementData_0x6d21f playmusic MUSIC_ROCKET_ENCOUNTER applymovement $3, MovementData_0x6d224 @@ -89,26 +89,26 @@ UnknownScript_0x6cfac: loadtrainer EXECUTIVEF, 2 startbattle disappear $5 - setevent EVENT_6DD - setevent EVENT_6DE - setevent EVENT_6D6 + setevent EVENT_TEAM_ROCKET_BASE_B2F_EXECUTIVE + setevent EVENT_TEAM_ROCKET_BASE_B2F_GRUNT_WITH_EXECUTIVE + setevent EVENT_TEAM_ROCKET_BASE_B2F_LANCE returnafterbattle setevent EVENT_BEAT_ROCKET_EXECUTIVEF_2 loadfont writetext UnknownText_0x6d4c6 closetext loadmovesprites - special Function8c0b6 - special Functiond91 + special Special_FadeBlackQuickly + special Special_ReloadSpritesNoPalettes disappear $2 disappear $3 disappear $c disappear $d disappear $e pause 15 - special Function8c0ab + special Special_FadeInQuickly dotrigger $2 - clearevent EVENT_6D6 + clearevent EVENT_TEAM_ROCKET_BASE_B2F_LANCE spriteface $4, DOWN loadfont writetext UnknownText_0x6d5d8 @@ -155,19 +155,19 @@ UnknownScript_0x6d091: writetext UnknownText_0x6da97 closetext loadmovesprites - special Function8c084 - special Function1060a2 + special FadeBlackBGMap + special Mobile_HealParty playsound SFX_FULL_HEAL special HealParty - special Function8c079 + special FadeInBGMap loadfont writetext UnknownText_0x6daf7 closetext loadmovesprites dotrigger $1 - setevent EVENT_04C + setevent EVENT_LANCE_HEALED_YOU_IN_TEAM_ROCKET_BASE checkcode VAR_FACING - if_equal $3, UnknownScript_0x6d0be + if_equal RIGHT, UnknownScript_0x6d0be applymovement $4, MovementData_0x6d212 disappear $4 end @@ -178,23 +178,7 @@ UnknownScript_0x6d0be: end TrainerGruntM17: - ; bit/flag number - dw EVENT_BEAT_ROCKET_GRUNTM_16 - - ; trainer group && trainer id - db GRUNTM, 17 - - ; text when seen - dw GruntM17SeenText - - ; text when trainer beaten - dw GruntM17BeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw GruntM17Script + trainer EVENT_BEAT_ROCKET_GRUNTM_17, GRUNTM, 17, GruntM17SeenText, GruntM17BeatenText, $0000, GruntM17Script GruntM17Script: talkaftercancel @@ -205,23 +189,7 @@ GruntM17Script: end TrainerGruntM18: - ; bit/flag number - dw EVENT_BEAT_ROCKET_GRUNTM_17 - - ; trainer group && trainer id - db GRUNTM, 18 - - ; text when seen - dw GruntM18SeenText - - ; text when trainer beaten - dw GruntM18BeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw GruntM18Script + trainer EVENT_BEAT_ROCKET_GRUNTM_18, GRUNTM, 18, GruntM18SeenText, GruntM18BeatenText, $0000, GruntM18Script GruntM18Script: talkaftercancel @@ -232,23 +200,7 @@ GruntM18Script: end TrainerGruntM19: - ; bit/flag number - dw EVENT_BEAT_ROCKET_GRUNTM_18 - - ; trainer group && trainer id - db GRUNTM, 19 - - ; text when seen - dw GruntM19SeenText - - ; text when trainer beaten - dw GruntM19BeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw GruntM19Script + trainer EVENT_BEAT_ROCKET_GRUNTM_19, GRUNTM, 19, GruntM19SeenText, GruntM19BeatenText, $0000, GruntM19Script GruntM19Script: talkaftercancel @@ -265,11 +217,11 @@ VoltorbScript_0x6d101: iftrue UnknownScript_0x6d182 disappear $6 disappear $9 - checkevent EVENT_6E0 + checkevent EVENT_TEAM_ROCKET_BASE_B2F_ELECTRODE_1 iffalse UnknownScript_0x6d182 - checkevent EVENT_6E1 + checkevent EVENT_TEAM_ROCKET_BASE_B2F_ELECTRODE_2 iffalse UnknownScript_0x6d182 - checkevent EVENT_6E2 + checkevent EVENT_TEAM_ROCKET_BASE_B2F_ELECTRODE_3 iffalse UnknownScript_0x6d182 returnafterbattle special PlayMapMusic @@ -283,11 +235,11 @@ VoltorbScript_0x6d12c: iftrue UnknownScript_0x6d182 disappear $7 disappear $a - checkevent EVENT_6E0 + checkevent EVENT_TEAM_ROCKET_BASE_B2F_ELECTRODE_1 iffalse UnknownScript_0x6d182 - checkevent EVENT_6E1 + checkevent EVENT_TEAM_ROCKET_BASE_B2F_ELECTRODE_2 iffalse UnknownScript_0x6d182 - checkevent EVENT_6E2 + checkevent EVENT_TEAM_ROCKET_BASE_B2F_ELECTRODE_3 iffalse UnknownScript_0x6d182 returnafterbattle special PlayMapMusic @@ -301,11 +253,11 @@ VoltorbScript_0x6d157: iftrue UnknownScript_0x6d182 disappear $8 disappear $b - checkevent EVENT_6E0 + checkevent EVENT_TEAM_ROCKET_BASE_B2F_ELECTRODE_1 iffalse UnknownScript_0x6d182 - checkevent EVENT_6E1 + checkevent EVENT_TEAM_ROCKET_BASE_B2F_ELECTRODE_2 iffalse UnknownScript_0x6d182 - checkevent EVENT_6E2 + checkevent EVENT_TEAM_ROCKET_BASE_B2F_ELECTRODE_3 iffalse UnknownScript_0x6d182 returnafterbattle special PlayMapMusic @@ -339,10 +291,10 @@ UnknownScript_0x6d184: disappear $4 setevent EVENT_CLEARED_ROCKET_HIDEOUT clearflag ENGINE_ROCKET_SIGNAL_ON_CH20 - setevent EVENT_6DC - setevent EVENT_757 + setevent EVENT_ROUTE_43_GATE_ROCKETS + setevent EVENT_MAHOGANY_TOWN_POKEFAN_M_BLOCKS_GYM dotrigger $3 - clearevent EVENT_735 + clearevent EVENT_LAKE_OF_RAGE_CIVILIANS setevent EVENT_TURNED_OFF_SECURITY_CAMERAS setevent EVENT_SECURITY_CAMERA_1 setevent EVENT_SECURITY_CAMERA_2 @@ -352,7 +304,7 @@ UnknownScript_0x6d184: end MapTeamRocketBaseB2FSignpostPtr1: - dw $0300 + dw EVENT_OPENED_DOOR_TO_ROCKET_HIDEOUT_TRANSMITTER dw MapTeamRocketBaseB2FSignpost1Script @@ -395,8 +347,7 @@ ItemFragment_0x6d20d: db TM_THIEF, 1 MapTeamRocketBaseB2FSignpostItem22: - dw $0087 - db FULL_HEAL + dwb EVENT_TEAM_ROCKET_BASE_B2F_HIDDEN_FULL_HEAL, FULL_HEAL MovementData_0x6d212: @@ -953,7 +904,7 @@ TeamRocketBaseB2F_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 5 warp_def $e, $3, 2, GROUP_TEAM_ROCKET_BASE_B1F, MAP_TEAM_ROCKET_BASE_B1F warp_def $2, $3, 1, GROUP_TEAM_ROCKET_BASE_B3F, MAP_TEAM_ROCKET_BASE_B3F @@ -961,7 +912,7 @@ TeamRocketBaseB2F_MapEventHeader: warp_def $6, $3, 3, GROUP_TEAM_ROCKET_BASE_B3F, MAP_TEAM_ROCKET_BASE_B3F warp_def $e, $1b, 4, GROUP_TEAM_ROCKET_BASE_B3F, MAP_TEAM_ROCKET_BASE_B3F - ; xy triggers +.XYTriggers: db 9 xy_trigger 0, $e, $5, $0, UnknownScript_0x6d085, $0, $0 xy_trigger 0, $d, $4, $0, UnknownScript_0x6d08b, $0, $0 @@ -973,45 +924,45 @@ TeamRocketBaseB2F_MapEventHeader: xy_trigger 2, $a, $c, $0, UnknownScript_0x6d07a, $0, $0 xy_trigger 2, $b, $c, $0, UnknownScript_0x6d07a, $0, $0 - ; signposts +.Signposts: db 23 - signpost 12, 14, $6, MapTeamRocketBaseB2FSignpostPtr1 - signpost 12, 15, $6, MapTeamRocketBaseB2FSignpostPtr1 - signpost 9, 17, $0, MapTeamRocketBaseB2FSignpost21Script - signpost 9, 16, $0, MapTeamRocketBaseB2FSignpost21Script - signpost 9, 15, $0, MapTeamRocketBaseB2FSignpost21Script - signpost 9, 14, $0, MapTeamRocketBaseB2FSignpost21Script - signpost 9, 13, $0, MapTeamRocketBaseB2FSignpost21Script - signpost 9, 12, $0, MapTeamRocketBaseB2FSignpost21Script - signpost 8, 12, $0, MapTeamRocketBaseB2FSignpost21Script - signpost 7, 12, $0, MapTeamRocketBaseB2FSignpost21Script - signpost 6, 12, $0, MapTeamRocketBaseB2FSignpost21Script - signpost 5, 12, $0, MapTeamRocketBaseB2FSignpost21Script - signpost 4, 12, $0, MapTeamRocketBaseB2FSignpost21Script - signpost 4, 13, $0, MapTeamRocketBaseB2FSignpost21Script - signpost 4, 14, $0, MapTeamRocketBaseB2FSignpost21Script - signpost 4, 15, $0, MapTeamRocketBaseB2FSignpost21Script - signpost 4, 16, $0, MapTeamRocketBaseB2FSignpost21Script - signpost 4, 17, $0, MapTeamRocketBaseB2FSignpost21Script - signpost 5, 17, $0, MapTeamRocketBaseB2FSignpost21Script - signpost 6, 17, $0, MapTeamRocketBaseB2FSignpost21Script - signpost 7, 17, $0, MapTeamRocketBaseB2FSignpost21Script - signpost 8, 17, $0, MapTeamRocketBaseB2FSignpost21Script - signpost 7, 26, $7, MapTeamRocketBaseB2FSignpostItem22 - - ; people-events + signpost 12, 14, SIGNPOST_IFNOTSET, MapTeamRocketBaseB2FSignpostPtr1 + signpost 12, 15, SIGNPOST_IFNOTSET, MapTeamRocketBaseB2FSignpostPtr1 + signpost 9, 17, SIGNPOST_READ, MapTeamRocketBaseB2FSignpost21Script + signpost 9, 16, SIGNPOST_READ, MapTeamRocketBaseB2FSignpost21Script + signpost 9, 15, SIGNPOST_READ, MapTeamRocketBaseB2FSignpost21Script + signpost 9, 14, SIGNPOST_READ, MapTeamRocketBaseB2FSignpost21Script + signpost 9, 13, SIGNPOST_READ, MapTeamRocketBaseB2FSignpost21Script + signpost 9, 12, SIGNPOST_READ, MapTeamRocketBaseB2FSignpost21Script + signpost 8, 12, SIGNPOST_READ, MapTeamRocketBaseB2FSignpost21Script + signpost 7, 12, SIGNPOST_READ, MapTeamRocketBaseB2FSignpost21Script + signpost 6, 12, SIGNPOST_READ, MapTeamRocketBaseB2FSignpost21Script + signpost 5, 12, SIGNPOST_READ, MapTeamRocketBaseB2FSignpost21Script + signpost 4, 12, SIGNPOST_READ, MapTeamRocketBaseB2FSignpost21Script + signpost 4, 13, SIGNPOST_READ, MapTeamRocketBaseB2FSignpost21Script + signpost 4, 14, SIGNPOST_READ, MapTeamRocketBaseB2FSignpost21Script + signpost 4, 15, SIGNPOST_READ, MapTeamRocketBaseB2FSignpost21Script + signpost 4, 16, SIGNPOST_READ, MapTeamRocketBaseB2FSignpost21Script + signpost 4, 17, SIGNPOST_READ, MapTeamRocketBaseB2FSignpost21Script + signpost 5, 17, SIGNPOST_READ, MapTeamRocketBaseB2FSignpost21Script + signpost 6, 17, SIGNPOST_READ, MapTeamRocketBaseB2FSignpost21Script + signpost 7, 17, SIGNPOST_READ, MapTeamRocketBaseB2FSignpost21Script + signpost 8, 17, SIGNPOST_READ, MapTeamRocketBaseB2FSignpost21Script + signpost 7, 26, SIGNPOST_ITEM, MapTeamRocketBaseB2FSignpostItem22 + +.PersonEvents: db 14 - person_event SPRITE_ROCKET, 20, 24, $7, $0, 255, 255, $0, 0, ObjectEvent, EVENT_6DE - person_event SPRITE_ROCKET_GIRL, 20, 24, $7, $0, 255, 255, $80, 0, ObjectEvent, EVENT_6DD - person_event SPRITE_LANCE, 17, 9, $6, $0, 255, 255, $0, 0, ObjectEvent, EVENT_6D6 - person_event SPRITE_DRAGON, 17, 13, $9, $0, 255, 255, $0, 0, ObjectEvent, EVENT_6DF - person_event SPRITE_VOLTORB, 9, 11, $16, $0, 255, 255, $0, 0, VoltorbScript_0x6d101, EVENT_6E0 - person_event SPRITE_VOLTORB, 11, 11, $16, $0, 255, 255, $0, 0, VoltorbScript_0x6d12c, EVENT_6E1 - person_event SPRITE_VOLTORB, 13, 11, $16, $0, 255, 255, $0, 0, VoltorbScript_0x6d157, EVENT_6E2 - person_event SPRITE_VOLTORB, 9, 26, $16, $0, 255, 255, $0, 0, ObjectEvent, EVENT_6E0 - person_event SPRITE_VOLTORB, 11, 26, $16, $0, 255, 255, $0, 0, ObjectEvent, EVENT_6E1 - person_event SPRITE_VOLTORB, 13, 26, $16, $0, 255, 255, $0, 0, ObjectEvent, EVENT_6E2 - person_event SPRITE_ROCKET, 17, 29, $6, $0, 255, 255, $2, 3, TrainerGruntM17, EVENT_6DA - person_event SPRITE_ROCKET, 5, 8, $a, $0, 255, 255, $2, 1, TrainerGruntM18, EVENT_6DA - person_event SPRITE_ROCKET, 18, 25, $8, $0, 255, 255, $2, 4, TrainerGruntM19, EVENT_6DA - person_event SPRITE_POKE_BALL, 14, 7, $1, $0, 255, 255, $1, 0, ItemFragment_0x6d20d, EVENT_66C + person_event SPRITE_ROCKET, 20, 24, OW_UP | $3, $0, -1, -1, $0, 0, ObjectEvent, EVENT_TEAM_ROCKET_BASE_B2F_GRUNT_WITH_EXECUTIVE + person_event SPRITE_ROCKET_GIRL, 20, 24, OW_UP | $3, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, ObjectEvent, EVENT_TEAM_ROCKET_BASE_B2F_EXECUTIVE + person_event SPRITE_LANCE, 17, 9, OW_UP | $2, $0, -1, -1, $0, 0, ObjectEvent, EVENT_TEAM_ROCKET_BASE_B2F_LANCE + person_event SPRITE_DRAGON, 17, 13, OW_LEFT | $1, $0, -1, -1, $0, 0, ObjectEvent, EVENT_TEAM_ROCKET_BASE_B2F_DRAGONITE + person_event SPRITE_VOLTORB, 9, 11, OW_UP | $12, $0, -1, -1, $0, 0, VoltorbScript_0x6d101, EVENT_TEAM_ROCKET_BASE_B2F_ELECTRODE_1 + person_event SPRITE_VOLTORB, 11, 11, OW_UP | $12, $0, -1, -1, $0, 0, VoltorbScript_0x6d12c, EVENT_TEAM_ROCKET_BASE_B2F_ELECTRODE_2 + person_event SPRITE_VOLTORB, 13, 11, OW_UP | $12, $0, -1, -1, $0, 0, VoltorbScript_0x6d157, EVENT_TEAM_ROCKET_BASE_B2F_ELECTRODE_3 + person_event SPRITE_VOLTORB, 9, 26, OW_UP | $12, $0, -1, -1, $0, 0, ObjectEvent, EVENT_TEAM_ROCKET_BASE_B2F_ELECTRODE_1 + person_event SPRITE_VOLTORB, 11, 26, OW_UP | $12, $0, -1, -1, $0, 0, ObjectEvent, EVENT_TEAM_ROCKET_BASE_B2F_ELECTRODE_2 + person_event SPRITE_VOLTORB, 13, 26, OW_UP | $12, $0, -1, -1, $0, 0, ObjectEvent, EVENT_TEAM_ROCKET_BASE_B2F_ELECTRODE_3 + person_event SPRITE_ROCKET, 17, 29, OW_UP | $2, $0, -1, -1, $2, 3, TrainerGruntM17, EVENT_TEAM_ROCKET_BASE_POPULATION + person_event SPRITE_ROCKET, 5, 8, OW_LEFT | $2, $0, -1, -1, $2, 1, TrainerGruntM18, EVENT_TEAM_ROCKET_BASE_POPULATION + person_event SPRITE_ROCKET, 18, 25, OW_LEFT | $0, $0, -1, -1, $2, 4, TrainerGruntM19, EVENT_TEAM_ROCKET_BASE_POPULATION + person_event SPRITE_POKE_BALL, 14, 7, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x6d20d, EVENT_TEAM_ROCKET_BASE_B2F_TM_THIEF diff --git a/maps/TeamRocketBaseB3F.asm b/maps/TeamRocketBaseB3F.asm index 71b883128..f0a2519ef 100644 --- a/maps/TeamRocketBaseB3F.asm +++ b/maps/TeamRocketBaseB3F.asm @@ -1,39 +1,39 @@ TeamRocketBaseB3F_MapScriptHeader: - ; trigger count +.MapTriggers: db 4 ; triggers - dw UnknownScript_0x6dfe9, $0000 - dw UnknownScript_0x6dfed, $0000 - dw UnknownScript_0x6dfee, $0000 - dw UnknownScript_0x6dfef, $0000 + dw .Trigger1, $0000 + dw .Trigger2, $0000 + dw .Trigger3, $0000 + dw .Trigger4, $0000 - ; callback count +.MapCallbacks: db 1 ; callbacks - dbw 1, UnknownScript_0x6dff0 + dbw 1, .CheckGiovanniDoor -UnknownScript_0x6dfe9: +.Trigger1: priorityjump LanceScript_0x6dffc end -UnknownScript_0x6dfed: +.Trigger2: end -UnknownScript_0x6dfee: +.Trigger3: end -UnknownScript_0x6dfef: +.Trigger4: end -UnknownScript_0x6dff0: +.CheckGiovanniDoor: checkevent EVENT_OPENED_DOOR_TO_GIOVANNIS_OFFICE - iftrue UnknownScript_0x6dff7 + iftrue .OpenSesame return -UnknownScript_0x6dff7: +.OpenSesame: changeblock $a, $8, $7 return @@ -54,7 +54,7 @@ LanceScript_0x6dffc: UnknownScript_0x6e019: spriteface $0, LEFT - showemote $0, $0, 15 + showemote EMOTE_SHOCK, $0, 15 special Functionc48f appear $a applymovement $a, MovementData_0x6e164 @@ -83,7 +83,7 @@ UnknownScript_0x6e052: applymovement $0, MovementData_0x6e13a UnknownScript_0x6e056: pause 30 - showemote $0, $3, 15 + showemote EMOTE_SHOCK, $3, 15 playmusic MUSIC_ROCKET_ENCOUNTER spriteface $3, DOWN loadfont @@ -117,23 +117,7 @@ MoltresScript_0x6e091: end TrainerGruntF5: - ; bit/flag number - dw EVENT_BEAT_ROCKET_GRUNTF_5 - - ; trainer group && trainer id - db GRUNTF, 5 - - ; text when seen - dw GruntF5SeenText - - ; text when trainer beaten - dw GruntF5BeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw GruntF5Script + trainer EVENT_BEAT_ROCKET_GRUNTF_5, GRUNTF, 5, GruntF5SeenText, GruntF5BeatenText, $0000, GruntF5Script GruntF5Script: talkaftercancel @@ -145,23 +129,7 @@ GruntF5Script: end TrainerGruntM28: - ; bit/flag number - dw EVENT_BEAT_ROCKET_GRUNTM_21 - - ; trainer group && trainer id - db GRUNTM, 28 - - ; text when seen - dw GruntM28SeenText - - ; text when trainer beaten - dw GruntM28BeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw GruntM28Script + trainer EVENT_BEAT_ROCKET_GRUNTM_28, GRUNTM, 28, GruntM28SeenText, GruntM28BeatenText, $0000, GruntM28Script GruntM28Script: talkaftercancel @@ -173,23 +141,7 @@ GruntM28Script: end TrainerScientistRoss: - ; bit/flag number - dw EVENT_BEAT_SCIENTIST_ROSS - - ; trainer group && trainer id - db SCIENTIST, ROSS - - ; text when seen - dw ScientistRossSeenText - - ; text when trainer beaten - dw ScientistRossBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw ScientistRossScript + trainer EVENT_BEAT_SCIENTIST_ROSS, SCIENTIST, ROSS, ScientistRossSeenText, ScientistRossBeatenText, $0000, ScientistRossScript ScientistRossScript: talkaftercancel @@ -200,23 +152,7 @@ ScientistRossScript: end TrainerScientistMitch: - ; bit/flag number - dw EVENT_BEAT_SCIENTIST_MITCH - - ; trainer group && trainer id - db SCIENTIST, MITCH - - ; text when seen - dw ScientistMitchSeenText - - ; text when trainer beaten - dw ScientistMitchBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw ScientistMitchScript + trainer EVENT_BEAT_SCIENTIST_MITCH, SCIENTIST, MITCH, ScientistMitchSeenText, ScientistMitchBeatenText, $0000, ScientistMitchScript ScientistMitchScript: talkaftercancel @@ -623,45 +559,45 @@ TeamRocketBaseB3F_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 4 warp_def $2, $3, 2, GROUP_TEAM_ROCKET_BASE_B2F, MAP_TEAM_ROCKET_BASE_B2F warp_def $2, $1b, 3, GROUP_TEAM_ROCKET_BASE_B2F, MAP_TEAM_ROCKET_BASE_B2F warp_def $6, $3, 4, GROUP_TEAM_ROCKET_BASE_B2F, MAP_TEAM_ROCKET_BASE_B2F warp_def $e, $1b, 5, GROUP_TEAM_ROCKET_BASE_B2F, MAP_TEAM_ROCKET_BASE_B2F - ; xy triggers +.XYTriggers: db 3 xy_trigger 2, $8, $a, $0, UnknownScript_0x6e04b, $0, $0 xy_trigger 2, $8, $b, $0, UnknownScript_0x6e052, $0, $0 xy_trigger 1, $a, $8, $0, UnknownScript_0x6e019, $0, $0 - ; signposts +.Signposts: db 10 - signpost 9, 10, $6, BossDoor - signpost 9, 11, $6, BossDoor - signpost 1, 10, $0, MapTeamRocketBaseB3FSignpost9Script - signpost 1, 11, $0, MapTeamRocketBaseB3FSignpost9Script - signpost 1, 12, $0, MapTeamRocketBaseB3FSignpost9Script - signpost 1, 13, $0, MapTeamRocketBaseB3FSignpost9Script - signpost 13, 4, $0, MapTeamRocketBaseB3FSignpost9Script - signpost 13, 5, $0, MapTeamRocketBaseB3FSignpost9Script - signpost 13, 6, $0, MapTeamRocketBaseB3FSignpost9Script - signpost 13, 7, $0, MapTeamRocketBaseB3FSignpost9Script - - ; people-events + signpost 9, 10, SIGNPOST_IFNOTSET, BossDoor + signpost 9, 11, SIGNPOST_IFNOTSET, BossDoor + signpost 1, 10, SIGNPOST_READ, MapTeamRocketBaseB3FSignpost9Script + signpost 1, 11, SIGNPOST_READ, MapTeamRocketBaseB3FSignpost9Script + signpost 1, 12, SIGNPOST_READ, MapTeamRocketBaseB3FSignpost9Script + signpost 1, 13, SIGNPOST_READ, MapTeamRocketBaseB3FSignpost9Script + signpost 13, 4, SIGNPOST_READ, MapTeamRocketBaseB3FSignpost9Script + signpost 13, 5, SIGNPOST_READ, MapTeamRocketBaseB3FSignpost9Script + signpost 13, 6, SIGNPOST_READ, MapTeamRocketBaseB3FSignpost9Script + signpost 13, 7, SIGNPOST_READ, MapTeamRocketBaseB3FSignpost9Script + +.PersonEvents: db 14 - person_event SPRITE_LANCE, 18, 29, $6, $0, 255, 255, $0, 0, LanceScript_0x6dffc, EVENT_6D7 - person_event SPRITE_ROCKET, 7, 12, $7, $0, 255, 255, $0, 0, ObjectEvent, EVENT_6DB - person_event SPRITE_MOLTRES, 6, 11, $16, $0, 255, 255, $90, 0, MoltresScript_0x6e091, EVENT_6DA - person_event SPRITE_ROCKET_GIRL, 11, 25, $7, $0, 255, 255, $82, 0, TrainerGruntF5, EVENT_6DA - person_event SPRITE_ROCKET, 18, 9, $a, $0, 255, 255, $2, 3, TrainerGruntM28, EVENT_6DA - person_event SPRITE_SCIENTIST, 15, 27, $7, $0, 255, 255, $92, 0, TrainerScientistRoss, EVENT_6DA - person_event SPRITE_SCIENTIST, 19, 15, $9, $0, 255, 255, $92, 3, TrainerScientistMitch, EVENT_6DA - person_event SPRITE_ROCKET, 18, 28, $6, $0, 255, 255, $0, 0, RocketScript_0x6e048, EVENT_6DA - person_event SPRITE_SILVER, 9, 8, $6, $0, 255, 255, $0, 0, ObjectEvent, EVENT_6C0 - person_event SPRITE_POKE_BALL, 16, 5, $1, $0, 255, 255, $1, 0, ItemFragment_0x6e120, EVENT_66D - person_event SPRITE_POKE_BALL, 16, 7, $1, $0, 255, 255, $1, 0, ItemFragment_0x6e122, EVENT_66E - person_event SPRITE_POKE_BALL, 13, 32, $1, $0, 255, 255, $1, 0, ItemFragment_0x6e124, EVENT_66F - person_event SPRITE_POKE_BALL, 6, 21, $1, $0, 255, 255, $1, 0, ItemFragment_0x6e126, EVENT_670 - person_event SPRITE_POKE_BALL, 14, 18, $1, $0, 255, 255, $1, 0, ItemFragment_0x6e128, EVENT_654 + person_event SPRITE_LANCE, 18, 29, OW_UP | $2, $0, -1, -1, $0, 0, LanceScript_0x6dffc, EVENT_TEAM_ROCKET_BASE_B3F_LANCE_PASSWORDS + person_event SPRITE_ROCKET, 7, 12, OW_UP | $3, $0, -1, -1, $0, 0, ObjectEvent, EVENT_TEAM_ROCKET_BASE_B3F_EXECUTIVE + person_event SPRITE_MOLTRES, 6, 11, OW_UP | $12, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, MoltresScript_0x6e091, EVENT_TEAM_ROCKET_BASE_POPULATION + person_event SPRITE_ROCKET_GIRL, 11, 25, OW_UP | $3, $0, -1, -1, (PAL_OW_RED << 4) | $82, 0, TrainerGruntF5, EVENT_TEAM_ROCKET_BASE_POPULATION + person_event SPRITE_ROCKET, 18, 9, OW_LEFT | $2, $0, -1, -1, $2, 3, TrainerGruntM28, EVENT_TEAM_ROCKET_BASE_POPULATION + person_event SPRITE_SCIENTIST, 15, 27, OW_UP | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 0, TrainerScientistRoss, EVENT_TEAM_ROCKET_BASE_POPULATION + person_event SPRITE_SCIENTIST, 19, 15, OW_LEFT | $1, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 3, TrainerScientistMitch, EVENT_TEAM_ROCKET_BASE_POPULATION + person_event SPRITE_ROCKET, 18, 28, OW_UP | $2, $0, -1, -1, $0, 0, RocketScript_0x6e048, EVENT_TEAM_ROCKET_BASE_POPULATION + person_event SPRITE_SILVER, 9, 8, OW_UP | $2, $0, -1, -1, $0, 0, ObjectEvent, EVENT_RIVAL_TEAM_ROCKET_BASE + person_event SPRITE_POKE_BALL, 16, 5, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x6e120, EVENT_TEAM_ROCKET_BASE_B3F_PROTEIN + person_event SPRITE_POKE_BALL, 16, 7, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x6e122, EVENT_TEAM_ROCKET_BASE_B3F_X_SPECIAL + person_event SPRITE_POKE_BALL, 13, 32, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x6e124, EVENT_TEAM_ROCKET_BASE_B3F_FULL_HEAL + person_event SPRITE_POKE_BALL, 6, 21, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x6e126, EVENT_TEAM_ROCKET_BASE_B3F_ICE_HEAL + person_event SPRITE_POKE_BALL, 14, 18, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x6e128, EVENT_TEAM_ROCKET_BASE_B3F_ULTRA_BALL diff --git a/maps/TimeCapsule.asm b/maps/TimeCapsule.asm index a3eb749e2..8fce13350 100644 --- a/maps/TimeCapsule.asm +++ b/maps/TimeCapsule.asm @@ -1,44 +1,44 @@ TimeCapsule_MapScriptHeader: - ; trigger count +.MapTriggers: db 2 ; triggers - dw UnknownScript_0x1934f8, $0000 - dw UnknownScript_0x1934fc, $0000 + dw .Trigger1, $0000 + dw .Trigger2, $0000 - ; callback count +.MapCallbacks: db 1 ; callbacks - dbw 2, UnknownScript_0x1934fd + dbw 2, TimeCapsule_SetWhichChris -UnknownScript_0x1934f8: - priorityjump UnknownScript_0x19350d +.Trigger1: + priorityjump TimeCapsule_Initialize end -UnknownScript_0x1934fc: +.Trigger2: end -UnknownScript_0x1934fd: - special Function29f47 - iffalse UnknownScript_0x193508 +TimeCapsule_SetWhichChris: + special Special_CableClubCheckWhichChris + iffalse .Chris2 disappear $3 appear $2 return -UnknownScript_0x193508: +.Chris2: disappear $2 appear $3 return -UnknownScript_0x19350d: +TimeCapsule_Initialize: dotrigger $1 domaptrigger GROUP_POKECENTER_2F, MAP_POKECENTER_2F, $3 end MapTimeCapsuleSignpost1Script: - special Function29eaf + special Special_TimeCapsule newloadmap $f8 end @@ -58,20 +58,20 @@ TimeCapsule_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $7, $4, 4, GROUP_POKECENTER_2F, MAP_POKECENTER_2F warp_def $7, $5, 4, GROUP_POKECENTER_2F, MAP_POKECENTER_2F - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 2 - signpost 4, 4, $3, MapTimeCapsuleSignpost1Script - signpost 4, 5, $4, MapTimeCapsuleSignpost1Script + signpost 4, 4, SIGNPOST_RIGHT, MapTimeCapsuleSignpost1Script + signpost 4, 5, SIGNPOST_LEFT, MapTimeCapsuleSignpost1Script - ; people-events +.PersonEvents: db 2 - person_event SPRITE_CHRIS, 8, 7, $9, $0, 255, 255, $0, 0, ChrisScript_0x19351a, EVENT_000 - person_event SPRITE_CHRIS, 8, 10, $8, $0, 255, 255, $0, 0, ChrisScript_0x19351a, EVENT_001 + person_event SPRITE_CHRIS, 8, 7, OW_LEFT | $1, $0, -1, -1, $0, 0, ChrisScript_0x19351a, EVENT_GAVE_KURT_APRICORNS + person_event SPRITE_CHRIS, 8, 10, OW_LEFT | $0, $0, -1, -1, $0, 0, ChrisScript_0x19351a, EVENT_RECEIVED_BALLS_FROM_KURT diff --git a/maps/TinTower1F.asm b/maps/TinTower1F.asm index 8daae5af4..e051f844e 100644 --- a/maps/TinTower1F.asm +++ b/maps/TinTower1F.asm @@ -1,12 +1,12 @@ TinTower1F_MapScriptHeader: - ; trigger count +.MapTriggers: db 2 ; triggers dw UnknownScript_0x18502a, $0000 dw UnknownScript_0x18502e, $0000 - ; callback count +.MapCallbacks: db 2 ; callbacks @@ -29,8 +29,8 @@ UnknownScript_0x18502f: iffalse UnknownScript_0x185050 special SpecialBeastsCheck iffalse UnknownScript_0x185050 - clearevent EVENT_7C5 - setevent EVENT_7B6 + clearevent EVENT_TIN_TOWER_1F_WISE_TRIO_2 + setevent EVENT_TIN_TOWER_1F_WISE_TRIO_1 UnknownScript_0x185047: checkevent EVENT_FOUGHT_HO_OH iffalse UnknownScript_0x18504f @@ -66,8 +66,8 @@ UnknownScript_0x185077: disappear $2 disappear $3 disappear $4 - clearevent EVENT_7B6 - setevent EVENT_7C5 + clearevent EVENT_TIN_TOWER_1F_WISE_TRIO_1 + setevent EVENT_TIN_TOWER_1F_WISE_TRIO_2 return UnknownScript_0x185084: @@ -520,27 +520,27 @@ TinTower1F_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 3 warp_def $f, $9, 12, GROUP_ECRUTEAK_CITY, MAP_ECRUTEAK_CITY warp_def $f, $a, 12, GROUP_ECRUTEAK_CITY, MAP_ECRUTEAK_CITY warp_def $2, $a, 2, GROUP_TIN_TOWER_2F, MAP_TIN_TOWER_2F - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 10 - person_event SPRITE_SUICUNE, 13, 13, $1, $0, 255, 255, $90, 0, ObjectEvent, EVENT_7B2 - person_event SPRITE_RAIKOU, 13, 11, $1, $0, 255, 255, $b0, 0, ObjectEvent, EVENT_7B4 - person_event SPRITE_ENTEI, 13, 16, $1, $0, 255, 255, $80, 0, ObjectEvent, EVENT_7B3 - person_event SPRITE_SUPER_NERD, 7, 12, $3, $0, 255, 255, $90, 0, SuperNerdScript_0x1851c8, EVENT_7B5 - person_event SPRITE_SAGE, 13, 9, $3, $0, 255, 255, $0, 0, SageScript_0x185173, EVENT_7B6 - person_event SPRITE_SAGE, 15, 15, $3, $0, 255, 255, $0, 0, SageScript_0x185176, EVENT_7B6 - person_event SPRITE_SAGE, 10, 18, $3, $0, 255, 255, $0, 0, SageScript_0x185179, EVENT_7B6 - person_event SPRITE_SAGE, 6, 8, $4, $10, 255, 255, $0, 0, SageScript_0x18517c, EVENT_7C5 - person_event SPRITE_SAGE, 5, 13, $6, $0, 255, 255, $0, 0, SageScript_0x185188, EVENT_7C5 - person_event SPRITE_SAGE, 6, 18, $5, $1, 255, 255, $0, 0, SageScript_0x1851bc, EVENT_7C5 + person_event SPRITE_SUICUNE, 13, 13, OW_DOWN | $1, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, ObjectEvent, EVENT_TIN_TOWER_1F_SUICUNE + person_event SPRITE_RAIKOU, 13, 11, OW_DOWN | $1, $0, -1, -1, (PAL_OW_BROWN << 4) | $80, 0, ObjectEvent, EVENT_TIN_TOWER_1F_RAIKOU + person_event SPRITE_ENTEI, 13, 16, OW_DOWN | $1, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, ObjectEvent, EVENT_TIN_TOWER_1F_ENTEI + person_event SPRITE_SUPER_NERD, 7, 12, OW_DOWN | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, SuperNerdScript_0x1851c8, EVENT_TIN_TOWER_1F_EUSINE + person_event SPRITE_SAGE, 13, 9, OW_DOWN | $3, $0, -1, -1, $0, 0, SageScript_0x185173, EVENT_TIN_TOWER_1F_WISE_TRIO_1 + person_event SPRITE_SAGE, 15, 15, OW_DOWN | $3, $0, -1, -1, $0, 0, SageScript_0x185176, EVENT_TIN_TOWER_1F_WISE_TRIO_1 + person_event SPRITE_SAGE, 10, 18, OW_DOWN | $3, $0, -1, -1, $0, 0, SageScript_0x185179, EVENT_TIN_TOWER_1F_WISE_TRIO_1 + person_event SPRITE_SAGE, 6, 8, OW_UP | $0, $10, -1, -1, $0, 0, SageScript_0x18517c, EVENT_TIN_TOWER_1F_WISE_TRIO_2 + person_event SPRITE_SAGE, 5, 13, OW_UP | $2, $0, -1, -1, $0, 0, SageScript_0x185188, EVENT_TIN_TOWER_1F_WISE_TRIO_2 + person_event SPRITE_SAGE, 6, 18, OW_UP | $1, $1, -1, -1, $0, 0, SageScript_0x1851bc, EVENT_TIN_TOWER_1F_WISE_TRIO_2 diff --git a/maps/TinTower2F.asm b/maps/TinTower2F.asm index 03448d61f..254b8e930 100644 --- a/maps/TinTower2F.asm +++ b/maps/TinTower2F.asm @@ -1,24 +1,24 @@ TinTower2F_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 TinTower2F_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $e, $a, 1, GROUP_TIN_TOWER_3F, MAP_TIN_TOWER_3F warp_def $2, $a, 3, GROUP_TIN_TOWER_1F, MAP_TIN_TOWER_1F - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 0 diff --git a/maps/TinTower3F.asm b/maps/TinTower3F.asm index 2bb75172c..705da3cb4 100644 --- a/maps/TinTower3F.asm +++ b/maps/TinTower3F.asm @@ -1,8 +1,8 @@ TinTower3F_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 ItemFragment_0x185a37: @@ -12,17 +12,17 @@ TinTower3F_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $e, $a, 1, GROUP_TIN_TOWER_2F, MAP_TIN_TOWER_2F warp_def $2, $10, 2, GROUP_TIN_TOWER_4F, MAP_TIN_TOWER_4F - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 1 - person_event SPRITE_POKE_BALL, 18, 7, $1, $0, 255, 255, $1, 0, ItemFragment_0x185a37, EVENT_64B + person_event SPRITE_POKE_BALL, 18, 7, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x185a37, EVENT_TIN_TOWER_3F_FULL_HEAL diff --git a/maps/TinTower4F.asm b/maps/TinTower4F.asm index 873ba660f..a514ca86d 100644 --- a/maps/TinTower4F.asm +++ b/maps/TinTower4F.asm @@ -1,8 +1,8 @@ TinTower4F_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 ItemFragment_0x185a58: @@ -15,30 +15,29 @@ ItemFragment_0x185a5c: db ESCAPE_ROPE, 1 MapTinTower4FSignpostItem0: - dw $007d - db MAX_POTION + dwb EVENT_TIN_TOWER_4F_HIDDEN_MAX_POTION, MAX_POTION TinTower4F_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 4 warp_def $4, $2, 2, GROUP_TIN_TOWER_5F, MAP_TIN_TOWER_5F warp_def $2, $10, 2, GROUP_TIN_TOWER_3F, MAP_TIN_TOWER_3F warp_def $e, $2, 3, GROUP_TIN_TOWER_5F, MAP_TIN_TOWER_5F warp_def $f, $11, 4, GROUP_TIN_TOWER_5F, MAP_TIN_TOWER_5F - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 1 - signpost 6, 11, $7, MapTinTower4FSignpostItem0 + signpost 6, 11, SIGNPOST_ITEM, MapTinTower4FSignpostItem0 - ; people-events +.PersonEvents: db 3 - person_event SPRITE_POKE_BALL, 14, 18, $1, $0, 255, 255, $1, 0, ItemFragment_0x185a58, EVENT_64C - person_event SPRITE_POKE_BALL, 18, 21, $1, $0, 255, 255, $1, 0, ItemFragment_0x185a5a, EVENT_64D - person_event SPRITE_POKE_BALL, 16, 6, $1, $0, 255, 255, $1, 0, ItemFragment_0x185a5c, EVENT_64E + person_event SPRITE_POKE_BALL, 14, 18, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x185a58, EVENT_TIN_TOWER_4F_ULTRA_BALL + person_event SPRITE_POKE_BALL, 18, 21, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x185a5a, EVENT_TIN_TOWER_4F_PP_UP + person_event SPRITE_POKE_BALL, 16, 6, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x185a5c, EVENT_TIN_TOWER_4F_ESCAPE_ROPE diff --git a/maps/TinTower5F.asm b/maps/TinTower5F.asm index e92d5859d..06e56eaf7 100644 --- a/maps/TinTower5F.asm +++ b/maps/TinTower5F.asm @@ -1,42 +1,40 @@ TinTower5F_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 ItemFragment_0x185aa9: db RARE_CANDY, 1 MapTinTower5FSignpostItem0: - dw $007e - db FULL_RESTORE + dwb EVENT_TIN_TOWER_5F_HIDDEN_FULL_RESTORE, FULL_RESTORE MapTinTower5FSignpostItem1: - dw $007f - db CARBOS + dwb EVENT_TIN_TOWER_5F_HIDDEN_CARBOS, CARBOS TinTower5F_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 4 warp_def $f, $b, 2, GROUP_TIN_TOWER_6F, MAP_TIN_TOWER_6F warp_def $4, $2, 1, GROUP_TIN_TOWER_4F, MAP_TIN_TOWER_4F warp_def $e, $2, 3, GROUP_TIN_TOWER_4F, MAP_TIN_TOWER_4F warp_def $f, $11, 4, GROUP_TIN_TOWER_4F, MAP_TIN_TOWER_4F - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 2 - signpost 14, 16, $7, MapTinTower5FSignpostItem0 - signpost 15, 3, $7, MapTinTower5FSignpostItem1 + signpost 14, 16, SIGNPOST_ITEM, MapTinTower5FSignpostItem0 + signpost 15, 3, SIGNPOST_ITEM, MapTinTower5FSignpostItem1 - ; people-events +.PersonEvents: db 1 - person_event SPRITE_POKE_BALL, 13, 13, $1, $0, 255, 255, $1, 0, ItemFragment_0x185aa9, EVENT_64F + person_event SPRITE_POKE_BALL, 13, 13, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x185aa9, EVENT_TIN_TOWER_5F_RARE_CANDY diff --git a/maps/TinTower6F.asm b/maps/TinTower6F.asm index 3bddb4071..4fb1758a5 100644 --- a/maps/TinTower6F.asm +++ b/maps/TinTower6F.asm @@ -1,8 +1,8 @@ TinTower6F_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 ItemFragment_0x185ae4: @@ -12,17 +12,17 @@ TinTower6F_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $9, $3, 1, GROUP_TIN_TOWER_7F, MAP_TIN_TOWER_7F warp_def $f, $b, 1, GROUP_TIN_TOWER_5F, MAP_TIN_TOWER_5F - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 1 - person_event SPRITE_POKE_BALL, 12, 12, $1, $0, 255, 255, $1, 0, ItemFragment_0x185ae4, EVENT_7C6 + person_event SPRITE_POKE_BALL, 12, 12, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x185ae4, EVENT_TIN_TOWER_6F_MAX_POTION diff --git a/maps/TinTower7F.asm b/maps/TinTower7F.asm index 79e7f6477..ceb4494b5 100644 --- a/maps/TinTower7F.asm +++ b/maps/TinTower7F.asm @@ -1,8 +1,8 @@ TinTower7F_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 ItemFragment_0x185b05: @@ -12,7 +12,7 @@ TinTower7F_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 5 warp_def $9, $3, 1, GROUP_TIN_TOWER_6F, MAP_TIN_TOWER_6F warp_def $f, $a, 1, GROUP_TIN_TOWER_8F, MAP_TIN_TOWER_8F @@ -20,12 +20,12 @@ TinTower7F_MapEventHeader: warp_def $3, $8, 3, GROUP_TIN_TOWER_7F, MAP_TIN_TOWER_7F warp_def $9, $6, 5, GROUP_TIN_TOWER_9F, MAP_TIN_TOWER_9F - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 1 - person_event SPRITE_POKE_BALL, 5, 20, $1, $0, 255, 255, $1, 0, ItemFragment_0x185b05, EVENT_650 + person_event SPRITE_POKE_BALL, 5, 20, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x185b05, EVENT_TIN_TOWER_7F_MAX_REVIVE diff --git a/maps/TinTower8F.asm b/maps/TinTower8F.asm index 10b3d6cd4..15da97cf2 100644 --- a/maps/TinTower8F.asm +++ b/maps/TinTower8F.asm @@ -1,8 +1,8 @@ TinTower8F_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 ItemFragment_0x185b35: @@ -18,7 +18,7 @@ TinTower8F_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 6 warp_def $5, $2, 2, GROUP_TIN_TOWER_7F, MAP_TIN_TOWER_7F warp_def $b, $2, 1, GROUP_TIN_TOWER_9F, MAP_TIN_TOWER_9F @@ -27,14 +27,14 @@ TinTower8F_MapEventHeader: warp_def $f, $e, 6, GROUP_TIN_TOWER_9F, MAP_TIN_TOWER_9F warp_def $9, $6, 7, GROUP_TIN_TOWER_9F, MAP_TIN_TOWER_9F - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 3 - person_event SPRITE_POKE_BALL, 17, 11, $1, $0, 255, 255, $1, 0, ItemFragment_0x185b35, EVENT_651 - person_event SPRITE_POKE_BALL, 10, 15, $1, $0, 255, 255, $1, 0, ItemFragment_0x185b37, EVENT_652 - person_event SPRITE_POKE_BALL, 5, 7, $1, $0, 255, 255, $1, 0, ItemFragment_0x185b39, EVENT_653 + person_event SPRITE_POKE_BALL, 17, 11, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x185b35, EVENT_TIN_TOWER_8F_NUGGET + person_event SPRITE_POKE_BALL, 10, 15, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x185b37, EVENT_TIN_TOWER_8F_MAX_ELIXER + person_event SPRITE_POKE_BALL, 5, 7, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x185b39, EVENT_TIN_TOWER_8F_FULL_RESTORE diff --git a/maps/TinTower9F.asm b/maps/TinTower9F.asm index 75673d3b0..a27114998 100644 --- a/maps/TinTower9F.asm +++ b/maps/TinTower9F.asm @@ -1,8 +1,8 @@ TinTower9F_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 ItemFragment_0x185b88: @@ -20,7 +20,7 @@ TinTower9F_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 7 warp_def $3, $c, 2, GROUP_TIN_TOWER_8F, MAP_TIN_TOWER_8F warp_def $5, $2, 3, GROUP_TIN_TOWER_8F, MAP_TIN_TOWER_8F @@ -30,12 +30,12 @@ TinTower9F_MapEventHeader: warp_def $d, $6, 5, GROUP_TIN_TOWER_8F, MAP_TIN_TOWER_8F warp_def $d, $8, 6, GROUP_TIN_TOWER_8F, MAP_TIN_TOWER_8F - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 1 - person_event SPRITE_POKE_BALL, 5, 13, $1, $0, 255, 255, $1, 0, ItemFragment_0x185b88, EVENT_7C7 + person_event SPRITE_POKE_BALL, 5, 13, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x185b88, EVENT_TIN_TOWER_9F_HP_UP diff --git a/maps/TinTowerRoof.asm b/maps/TinTowerRoof.asm index 38d01485a..1d3aef3bd 100644 --- a/maps/TinTowerRoof.asm +++ b/maps/TinTowerRoof.asm @@ -1,8 +1,8 @@ TinTowerRoof_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 1 ; callbacks @@ -48,16 +48,16 @@ TinTowerRoof_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 1 warp_def $d, $9, 4, GROUP_TIN_TOWER_9F, MAP_TIN_TOWER_9F - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 1 - person_event SPRITE_HO_OH, 9, 13, $16, $0, 255, 255, $80, 0, HoOhScript_0x77244, EVENT_73C + person_event SPRITE_HO_OH, 9, 13, OW_UP | $12, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, HoOhScript_0x77244, EVENT_TIN_TOWER_ROOF_HO_OH diff --git a/maps/TohjoFalls.asm b/maps/TohjoFalls.asm index 0855535a6..ee3a16e6b 100644 --- a/maps/TohjoFalls.asm +++ b/maps/TohjoFalls.asm @@ -1,8 +1,8 @@ TohjoFalls_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 ItemFragment_0x18db02: @@ -12,17 +12,17 @@ TohjoFalls_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $f, $d, 2, GROUP_ROUTE_27, MAP_ROUTE_27 warp_def $f, $19, 3, GROUP_ROUTE_27, MAP_ROUTE_27 - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 1 - person_event SPRITE_POKE_BALL, 10, 6, $1, $0, 255, 255, $1, 0, ItemFragment_0x18db02, EVENT_6A9 + person_event SPRITE_POKE_BALL, 10, 6, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x18db02, EVENT_TOHJO_FALLS_MOON_STONE diff --git a/maps/TradeCenter.asm b/maps/TradeCenter.asm index b454d7d2a..6e3db4772 100644 --- a/maps/TradeCenter.asm +++ b/maps/TradeCenter.asm @@ -1,55 +1,55 @@ TradeCenter_MapScriptHeader: - ; trigger count +.MapTriggers: db 2 ; triggers - dw UnknownScript_0x1933e9, $0000 - dw UnknownScript_0x1933ed, $0000 + dw .Trigger1, $0000 + dw .Trigger2, $0000 - ; callback count +.MapCallbacks: db 1 ; callbacks - dbw 2, UnknownScript_0x1933ee + dbw 2, TradeCenter_SetWhichChris -UnknownScript_0x1933e9: - priorityjump UnknownScript_0x1933fe +.Trigger1: + priorityjump TradeCenter_Initialize end -UnknownScript_0x1933ed: +.Trigger2: end -UnknownScript_0x1933ee: - special Function29f47 - iffalse UnknownScript_0x1933f9 +TradeCenter_SetWhichChris: + special Special_CableClubCheckWhichChris + iffalse .Chris2 disappear $3 appear $2 return -UnknownScript_0x1933f9: +.Chris2: disappear $2 appear $3 return -UnknownScript_0x1933fe: +TradeCenter_Initialize: dotrigger $1 domaptrigger GROUP_POKECENTER_2F, MAP_POKECENTER_2F, $1 end MapTradeCenterSignpost1Script: - special Function29ec4 + special Special_TradeCenter newloadmap $f8 end -UnknownScript_0x19340b: +ChrisScript_0x19340b: loadfont - writetext UnknownText_0x193412 + writetext .FriendReadyText closetext loadmovesprites end -UnknownText_0x193412: +.FriendReadyText: text "Your friend is" line "ready." done @@ -58,20 +58,20 @@ TradeCenter_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $7, $4, 2, GROUP_POKECENTER_2F, MAP_POKECENTER_2F warp_def $7, $5, 2, GROUP_POKECENTER_2F, MAP_POKECENTER_2F - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 2 - signpost 4, 4, $3, MapTradeCenterSignpost1Script - signpost 4, 5, $4, MapTradeCenterSignpost1Script + signpost 4, 4, SIGNPOST_RIGHT, MapTradeCenterSignpost1Script + signpost 4, 5, SIGNPOST_LEFT, MapTradeCenterSignpost1Script - ; people-events +.PersonEvents: db 2 - person_event SPRITE_CHRIS, 8, 7, $9, $0, 255, 255, $0, 0, ChrisScript_0x193499, EVENT_000 - person_event SPRITE_CHRIS, 8, 10, $8, $0, 255, 255, $0, 0, ChrisScript_0x193499, EVENT_001 + person_event SPRITE_CHRIS, 8, 7, OW_LEFT | $1, $0, -1, -1, $0, 0, ChrisScript_0x193499, EVENT_GAVE_KURT_APRICORNS + person_event SPRITE_CHRIS, 8, 10, OW_LEFT | $0, $0, -1, -1, $0, 0, ChrisScript_0x193499, EVENT_RECEIVED_BALLS_FROM_KURT diff --git a/maps/TrainerHouse1F.asm b/maps/TrainerHouse1F.asm index 99c36018b..e18ed7b90 100644 --- a/maps/TrainerHouse1F.asm +++ b/maps/TrainerHouse1F.asm @@ -1,8 +1,8 @@ TrainerHouse1F_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 ReceptionistScript_0x9af67: @@ -134,25 +134,25 @@ TrainerHouse1F_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 3 warp_def $d, $2, 3, GROUP_VIRIDIAN_CITY, MAP_VIRIDIAN_CITY warp_def $d, $3, 3, GROUP_VIRIDIAN_CITY, MAP_VIRIDIAN_CITY warp_def $2, $8, 1, GROUP_TRAINER_HOUSE_B1F, MAP_TRAINER_HOUSE_B1F - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 3 - signpost 0, 5, $0, MapTrainerHouse1FSignpost0Script - signpost 0, 7, $0, MapTrainerHouse1FSignpost1Script - signpost 10, 7, $0, MapTrainerHouse1FSignpost2Script + signpost 0, 5, SIGNPOST_READ, MapTrainerHouse1FSignpost0Script + signpost 0, 7, SIGNPOST_READ, MapTrainerHouse1FSignpost1Script + signpost 10, 7, SIGNPOST_READ, MapTrainerHouse1FSignpost2Script - ; people-events +.PersonEvents: db 5 - person_event SPRITE_RECEPTIONIST, 15, 4, $9, $0, 255, 255, $a0, 0, ReceptionistScript_0x9af67, -1 - person_event SPRITE_COOLTRAINER_M, 15, 11, $7, $0, 255, 255, $0, 0, CooltrainerMScript_0x9af6a, -1 - person_event SPRITE_COOLTRAINER_F, 6, 10, $6, $2, 255, 255, $80, 0, CooltrainerFScript_0x9af6d, -1 - person_event SPRITE_YOUNGSTER, 12, 8, $5, $2, 255, 255, $80, 0, YoungsterScript_0x9af70, -1 - person_event SPRITE_GENTLEMAN, 8, 6, $9, $0, 255, 255, $0, 0, GentlemanScript_0x9af73, -1 + person_event SPRITE_RECEPTIONIST, 15, 4, OW_LEFT | $1, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, ReceptionistScript_0x9af67, -1 + person_event SPRITE_COOLTRAINER_M, 15, 11, OW_UP | $3, $0, -1, -1, $0, 0, CooltrainerMScript_0x9af6a, -1 + person_event SPRITE_COOLTRAINER_F, 6, 10, OW_UP | $2, $2, -1, -1, (PAL_OW_RED << 4) | $80, 0, CooltrainerFScript_0x9af6d, -1 + person_event SPRITE_YOUNGSTER, 12, 8, OW_UP | $1, $2, -1, -1, (PAL_OW_RED << 4) | $80, 0, YoungsterScript_0x9af70, -1 + person_event SPRITE_GENTLEMAN, 8, 6, OW_LEFT | $1, $0, -1, -1, $0, 0, GentlemanScript_0x9af73, -1 diff --git a/maps/TrainerHouseB1F.asm b/maps/TrainerHouseB1F.asm index 9d947359a..1be37c9aa 100644 --- a/maps/TrainerHouseB1F.asm +++ b/maps/TrainerHouseB1F.asm @@ -1,11 +1,11 @@ TrainerHouseB1F_MapScriptHeader: - ; trigger count +.MapTriggers: db 1 ; triggers dw UnknownScript_0x9b38a, $0000 - ; callback count +.MapCallbacks: db 0 UnknownScript_0x9b38a: @@ -171,18 +171,18 @@ TrainerHouseB1F_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 1 warp_def $4, $9, 3, GROUP_TRAINER_HOUSE_1F, MAP_TRAINER_HOUSE_1F - ; xy triggers +.XYTriggers: db 1 xy_trigger 0, $3, $7, $0, UnknownScript_0x9b38b, $0, $0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 2 - person_event SPRITE_RECEPTIONIST, 5, 11, $6, $0, 255, 255, $a0, 0, ObjectEvent, -1 - person_event SPRITE_CHRIS, 15, 10, $8, $0, 255, 255, $80, 0, ObjectEvent, -1 + person_event SPRITE_RECEPTIONIST, 5, 11, OW_UP | $2, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, ObjectEvent, -1 + person_event SPRITE_CHRIS, 15, 10, OW_LEFT | $0, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, ObjectEvent, -1 diff --git a/maps/Underground.asm b/maps/Underground.asm index 63116edcb..e2672a95b 100644 --- a/maps/Underground.asm +++ b/maps/Underground.asm @@ -1,36 +1,34 @@ Underground_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 MapUndergroundSignpostItem0: - dw $00e5 - db FULL_RESTORE + dwb EVENT_UNDERGROUND_HIDDEN_FULL_RESTORE, FULL_RESTORE MapUndergroundSignpostItem1: - dw $00e6 - db X_SPECIAL + dwb EVENT_UNDERGROUND_HIDDEN_X_SPECIAL, X_SPECIAL Underground_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $2, $3, 3, GROUP_ROUTE_5_UNDERGROUND_ENTRANCE, MAP_ROUTE_5_UNDERGROUND_ENTRANCE warp_def $18, $3, 3, GROUP_ROUTE_6_UNDERGROUND_ENTRANCE, MAP_ROUTE_6_UNDERGROUND_ENTRANCE - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 2 - signpost 9, 3, $7, MapUndergroundSignpostItem0 - signpost 19, 1, $7, MapUndergroundSignpostItem1 + signpost 9, 3, SIGNPOST_ITEM, MapUndergroundSignpostItem0 + signpost 19, 1, SIGNPOST_ITEM, MapUndergroundSignpostItem1 - ; people-events +.PersonEvents: db 0 diff --git a/maps/UndergroundPathSwitchRoomEntrances.asm b/maps/UndergroundPathSwitchRoomEntrances.asm index f5e8b439e..14273808b 100644 --- a/maps/UndergroundPathSwitchRoomEntrances.asm +++ b/maps/UndergroundPathSwitchRoomEntrances.asm @@ -1,12 +1,12 @@ UndergroundPathSwitchRoomEntrances_MapScriptHeader: - ; trigger count +.MapTriggers: db 2 ; triggers dw UnknownScript_0x7c9f5, $0000 dw UnknownScript_0x7c9f6, $0000 - ; callback count +.MapCallbacks: db 1 ; callbacks @@ -79,7 +79,7 @@ TeacherScript_0x7ca7d: UnknownScript_0x7ca80: spriteface $0, RIGHT - showemote $0, $0, 15 + showemote EMOTE_SHOCK, $0, 15 special Functionc48f pause 15 playsound SFX_EXIT_BUILDING @@ -98,7 +98,7 @@ UnknownScript_0x7ca80: UnknownScript_0x7caaa: spriteface $0, RIGHT - showemote $0, $0, 15 + showemote EMOTE_SHOCK, $0, 15 special Functionc48f pause 15 playsound SFX_EXIT_BUILDING @@ -116,9 +116,9 @@ UnknownScript_0x7caaa: end UnknownScript_0x7cad4: - checkevent EVENT_6C5 + checkevent EVENT_RIVAL_BURNED_TOWER iftrue UnknownScript_0x7cae1 - setevent EVENT_6C5 + setevent EVENT_RIVAL_BURNED_TOWER domaptrigger GROUP_BURNED_TOWER_1F, MAP_BURNED_TOWER_1F, $1 UnknownScript_0x7cae1: playmusic MUSIC_RIVAL_ENCOUNTER @@ -126,7 +126,7 @@ UnknownScript_0x7cae1: writetext UnknownText_0x7ce9d closetext loadmovesprites - setevent EVENT_6C1 + setevent EVENT_RIVAL_UNDERGROUND_PATH checkevent EVENT_GOT_TOTODILE_FROM_ELM iftrue UnknownScript_0x7cb09 checkevent EVENT_GOT_CHIKORITA_FROM_ELM @@ -166,23 +166,7 @@ UnknownScript_0x7cb29: end TrainerGruntM11: - ; bit/flag number - dw EVENT_BEAT_ROCKET_GRUNTM_11 - - ; trainer group && trainer id - db GRUNTM, 11 - - ; text when seen - dw GruntM11SeenText - - ; text when trainer beaten - dw GruntM11BeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw GruntM11Script + trainer EVENT_BEAT_ROCKET_GRUNTM_11, GRUNTM, 11, GruntM11SeenText, GruntM11BeatenText, $0000, GruntM11Script GruntM11Script: talkaftercancel @@ -193,23 +177,7 @@ GruntM11Script: end TrainerGruntM25: - ; bit/flag number - dw EVENT_BEAT_ROCKET_GRUNTM_20 - - ; trainer group && trainer id - db GRUNTM, 25 - - ; text when seen - dw GruntM25SeenText - - ; text when trainer beaten - dw GruntM25BeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw GruntM25Script + trainer EVENT_BEAT_ROCKET_GRUNTM_25, GRUNTM, 25, GruntM25SeenText, GruntM25BeatenText, $0000, GruntM25Script GruntM25Script: talkaftercancel @@ -220,23 +188,7 @@ GruntM25Script: end TrainerBurglarDuncan: - ; bit/flag number - dw EVENT_BEAT_BURGLAR_DUNCAN - - ; trainer group && trainer id - db BURGLAR, DUNCAN - - ; text when seen - dw BurglarDuncanSeenText - - ; text when trainer beaten - dw BurglarDuncanBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw BurglarDuncanScript + trainer EVENT_BEAT_BURGLAR_DUNCAN, BURGLAR, DUNCAN, BurglarDuncanSeenText, BurglarDuncanBeatenText, $0000, BurglarDuncanScript BurglarDuncanScript: talkaftercancel @@ -247,23 +199,7 @@ BurglarDuncanScript: end TrainerBurglarEddie: - ; bit/flag number - dw EVENT_BEAT_BURGLAR_EDDIE - - ; trainer group && trainer id - db BURGLAR, EDDIE - - ; text when seen - dw BurglarEddieSeenText - - ; text when trainer beaten - dw BurglarEddieBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw BurglarEddieScript + trainer EVENT_BEAT_BURGLAR_EDDIE, BURGLAR, EDDIE, BurglarEddieSeenText, BurglarEddieBeatenText, $0000, BurglarEddieScript BurglarEddieScript: talkaftercancel @@ -274,23 +210,7 @@ BurglarEddieScript: end TrainerGruntM13: - ; bit/flag number - dw EVENT_BEAT_ROCKET_GRUNTM_12 - - ; trainer group && trainer id - db GRUNTM, 13 - - ; text when seen - dw GruntM13SeenText - - ; text when trainer beaten - dw GruntM13BeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw GruntM13Script + trainer EVENT_BEAT_ROCKET_GRUNTM_13, GRUNTM, 13, GruntM13SeenText, GruntM13BeatenText, $0000, GruntM13Script GruntM13Script: talkaftercancel @@ -301,23 +221,7 @@ GruntM13Script: end TrainerGruntF3: - ; bit/flag number - dw EVENT_BEAT_ROCKET_GRUNTF_3 - - ; trainer group && trainer id - db GRUNTF, 3 - - ; text when seen - dw GruntF3SeenText - - ; text when trainer beaten - dw GruntF3BeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw GruntF3Script + trainer EVENT_BEAT_ROCKET_GRUNTF_3, GRUNTF, 3, GruntF3SeenText, GruntF3BeatenText, $0000, GruntF3Script GruntF3Script: talkaftercancel @@ -686,13 +590,11 @@ ItemFragment_0x7ce7f: db FULL_HEAL, 1 MapUndergroundPathSwitchRoomEntrancesSignpostItem4: - dw $008e - db MAX_POTION + dwb EVENT_UNDERGROUND_PATH_SWITCH_ROOM_ENTRANCES_HIDDEN_MAX_POTION, MAX_POTION MapUndergroundPathSwitchRoomEntrancesSignpostItem5: - dw $008f - db REVIVE + dwb EVENT_UNDERGROUND_PATH_SWITCH_ROOM_ENTRANCES_HIDDEN_REVIVE, REVIVE MovementData_0x7ce87: @@ -993,7 +895,7 @@ UndergroundPathSwitchRoomEntrances_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 9 warp_def $3, $17, 6, GROUP_WAREHOUSE_ENTRANCE, MAP_WAREHOUSE_ENTRANCE warp_def $a, $16, 1, GROUP_UNDERGROUND_WAREHOUSE, MAP_UNDERGROUND_WAREHOUSE @@ -1005,30 +907,30 @@ UndergroundPathSwitchRoomEntrances_MapEventHeader: warp_def $1d, $14, 13, GROUP_GOLDENROD_CITY, MAP_GOLDENROD_CITY warp_def $1d, $15, 13, GROUP_GOLDENROD_CITY, MAP_GOLDENROD_CITY - ; xy triggers +.XYTriggers: db 2 xy_trigger 0, $4, $13, $0, UnknownScript_0x7ca80, $0, $0 xy_trigger 0, $5, $13, $0, UnknownScript_0x7caaa, $0, $0 - ; signposts +.Signposts: db 6 - signpost 1, 16, $0, MapUndergroundPathSwitchRoomEntrancesSignpost0Script - signpost 1, 10, $0, MapUndergroundPathSwitchRoomEntrancesSignpost1Script - signpost 1, 2, $0, MapUndergroundPathSwitchRoomEntrancesSignpost2Script - signpost 11, 20, $0, MapUndergroundPathSwitchRoomEntrancesSignpost3Script - signpost 9, 8, $7, MapUndergroundPathSwitchRoomEntrancesSignpostItem4 - signpost 8, 1, $7, MapUndergroundPathSwitchRoomEntrancesSignpostItem5 - - ; people-events + signpost 1, 16, SIGNPOST_READ, MapUndergroundPathSwitchRoomEntrancesSignpost0Script + signpost 1, 10, SIGNPOST_READ, MapUndergroundPathSwitchRoomEntrancesSignpost1Script + signpost 1, 2, SIGNPOST_READ, MapUndergroundPathSwitchRoomEntrancesSignpost2Script + signpost 11, 20, SIGNPOST_READ, MapUndergroundPathSwitchRoomEntrancesSignpost3Script + signpost 9, 8, SIGNPOST_ITEM, MapUndergroundPathSwitchRoomEntrancesSignpostItem4 + signpost 8, 1, SIGNPOST_ITEM, MapUndergroundPathSwitchRoomEntrancesSignpostItem5 + +.PersonEvents: db 11 - person_event SPRITE_PHARMACIST, 16, 13, $9, $0, 255, 255, $a2, 2, TrainerBurglarDuncan, EVENT_6CE - person_event SPRITE_PHARMACIST, 12, 8, $8, $0, 255, 255, $a2, 2, TrainerBurglarEddie, EVENT_6CE - person_event SPRITE_ROCKET, 6, 21, $6, $0, 255, 255, $2, 3, TrainerGruntM13, EVENT_6CE - person_event SPRITE_ROCKET, 6, 15, $6, $0, 255, 255, $2, 3, TrainerGruntM11, EVENT_6CE - person_event SPRITE_ROCKET, 6, 7, $6, $0, 255, 255, $2, 3, TrainerGruntM25, EVENT_6CE - person_event SPRITE_ROCKET_GIRL, 16, 23, $6, $0, 255, 255, $82, 1, TrainerGruntF3, EVENT_6CE - person_event SPRITE_TEACHER, 31, 7, $6, $0, 255, 255, $0, 0, TeacherScript_0x7ca7d, -1 - person_event SPRITE_SUPER_NERD, 31, 23, $6, $0, 255, 255, $0, 0, SuperNerdScript_0x7ca7a, -1 - person_event SPRITE_POKE_BALL, 16, 5, $1, $0, 255, 255, $1, 0, ItemFragment_0x7ce7d, EVENT_673 - person_event SPRITE_POKE_BALL, 13, 18, $1, $0, 255, 255, $1, 0, ItemFragment_0x7ce7f, EVENT_674 - person_event SPRITE_SILVER, 7, 27, $6, $0, 255, 255, $0, 0, ObjectEvent, EVENT_6C1 + person_event SPRITE_PHARMACIST, 16, 13, OW_LEFT | $1, $0, -1, -1, (PAL_OW_GREEN << 4) | $82, 2, TrainerBurglarDuncan, EVENT_RADIO_TOWER_ROCKET_TAKEOVER + person_event SPRITE_PHARMACIST, 12, 8, OW_LEFT | $0, $0, -1, -1, (PAL_OW_GREEN << 4) | $82, 2, TrainerBurglarEddie, EVENT_RADIO_TOWER_ROCKET_TAKEOVER + person_event SPRITE_ROCKET, 6, 21, OW_UP | $2, $0, -1, -1, $2, 3, TrainerGruntM13, EVENT_RADIO_TOWER_ROCKET_TAKEOVER + person_event SPRITE_ROCKET, 6, 15, OW_UP | $2, $0, -1, -1, $2, 3, TrainerGruntM11, EVENT_RADIO_TOWER_ROCKET_TAKEOVER + person_event SPRITE_ROCKET, 6, 7, OW_UP | $2, $0, -1, -1, $2, 3, TrainerGruntM25, EVENT_RADIO_TOWER_ROCKET_TAKEOVER + person_event SPRITE_ROCKET_GIRL, 16, 23, OW_UP | $2, $0, -1, -1, (PAL_OW_RED << 4) | $82, 1, TrainerGruntF3, EVENT_RADIO_TOWER_ROCKET_TAKEOVER + person_event SPRITE_TEACHER, 31, 7, OW_UP | $2, $0, -1, -1, $0, 0, TeacherScript_0x7ca7d, -1 + person_event SPRITE_SUPER_NERD, 31, 23, OW_UP | $2, $0, -1, -1, $0, 0, SuperNerdScript_0x7ca7a, -1 + person_event SPRITE_POKE_BALL, 16, 5, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x7ce7d, EVENT_UNDERGROUND_PATH_SWITCH_ROOM_ENTRANCES_SMOKE_BALL + person_event SPRITE_POKE_BALL, 13, 18, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x7ce7f, EVENT_UNDERGROUND_PATH_SWITCH_ROOM_ENTRANCES_FULL_HEAL + person_event SPRITE_SILVER, 7, 27, OW_UP | $2, $0, -1, -1, $0, 0, ObjectEvent, EVENT_RIVAL_UNDERGROUND_PATH diff --git a/maps/UndergroundWarehouse.asm b/maps/UndergroundWarehouse.asm index ab0b3e355..7f036735b 100644 --- a/maps/UndergroundWarehouse.asm +++ b/maps/UndergroundWarehouse.asm @@ -1,8 +1,8 @@ UndergroundWarehouse_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 1 ; callbacks @@ -30,23 +30,7 @@ UnknownScript_0x7d950: return TrainerGruntM24: - ; bit/flag number - dw EVENT_BEAT_ROCKET_GRUNTM_19 - - ; trainer group && trainer id - db GRUNTM, 24 - - ; text when seen - dw GruntM24SeenText - - ; text when trainer beaten - dw GruntM24BeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw GruntM24Script + trainer EVENT_BEAT_ROCKET_GRUNTM_24, GRUNTM, 24, GruntM24SeenText, GruntM24BeatenText, $0000, GruntM24Script GruntM24Script: talkaftercancel @@ -57,23 +41,7 @@ GruntM24Script: end TrainerGruntM14: - ; bit/flag number - dw EVENT_BEAT_ROCKET_GRUNTM_13 - - ; trainer group && trainer id - db GRUNTM, 14 - - ; text when seen - dw GruntM14SeenText - - ; text when trainer beaten - dw GruntM14BeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw GruntM14Script + trainer EVENT_BEAT_ROCKET_GRUNTM_14, GRUNTM, 14, GruntM14SeenText, GruntM14BeatenText, $0000, GruntM14Script GruntM14Script: talkaftercancel @@ -84,23 +52,7 @@ GruntM14Script: end TrainerGruntM15: - ; bit/flag number - dw EVENT_BEAT_ROCKET_GRUNTM_14 - - ; trainer group && trainer id - db GRUNTM, 15 - - ; text when seen - dw GruntM15SeenText - - ; text when trainer beaten - dw GruntM15BeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw GruntM15Script + trainer EVENT_BEAT_ROCKET_GRUNTM_15, GRUNTM, 15, GruntM15SeenText, GruntM15BeatenText, $0000, GruntM15Script GruntM15Script: talkaftercancel @@ -113,12 +65,12 @@ GruntM15Script: GentlemanScript_0x7d9bf: faceplayer loadfont - checkevent EVENT_04A + checkevent EVENT_RECEIVED_CARD_KEY iftrue UnknownScript_0x7d9de writetext UnknownText_0x7dbc6 keeptextopen verbosegiveitem CARD_KEY, 1 - setevent EVENT_04A + setevent EVENT_RECEIVED_CARD_KEY setevent EVENT_WAREHOUSE_LAYOUT_1 clearevent EVENT_WAREHOUSE_LAYOUT_2 clearevent EVENT_WAREHOUSE_LAYOUT_3 @@ -256,24 +208,24 @@ UndergroundWarehouse_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 3 warp_def $c, $2, 2, GROUP_UNDERGROUND_PATH_SWITCH_ROOM_ENTRANCES, MAP_UNDERGROUND_PATH_SWITCH_ROOM_ENTRANCES warp_def $c, $3, 3, GROUP_UNDERGROUND_PATH_SWITCH_ROOM_ENTRANCES, MAP_UNDERGROUND_PATH_SWITCH_ROOM_ENTRANCES warp_def $2, $11, 1, GROUP_GOLDENROD_DEPT_STORE_B1F, MAP_GOLDENROD_DEPT_STORE_B1F - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 7 - person_event SPRITE_ROCKET, 12, 13, $7, $0, 255, 255, $2, 3, TrainerGruntM24, EVENT_6CE - person_event SPRITE_ROCKET, 19, 12, $7, $0, 255, 255, $2, 3, TrainerGruntM14, EVENT_6CE - person_event SPRITE_ROCKET, 7, 18, $9, $0, 255, 255, $2, 4, TrainerGruntM15, EVENT_6CE - person_event SPRITE_GENTLEMAN, 12, 16, $3, $0, 255, 255, $0, 0, GentlemanScript_0x7d9bf, EVENT_6CE - person_event SPRITE_POKE_BALL, 19, 22, $1, $0, 255, 255, $1, 0, ItemFragment_0x7d9e4, EVENT_679 - person_event SPRITE_POKE_BALL, 13, 17, $1, $0, 255, 255, $1, 0, ItemFragment_0x7d9e6, EVENT_67A - person_event SPRITE_POKE_BALL, 5, 6, $1, $0, 255, 255, $1, 0, ItemFragment_0x7d9e8, EVENT_655 + person_event SPRITE_ROCKET, 12, 13, OW_UP | $3, $0, -1, -1, $2, 3, TrainerGruntM24, EVENT_RADIO_TOWER_ROCKET_TAKEOVER + person_event SPRITE_ROCKET, 19, 12, OW_UP | $3, $0, -1, -1, $2, 3, TrainerGruntM14, EVENT_RADIO_TOWER_ROCKET_TAKEOVER + person_event SPRITE_ROCKET, 7, 18, OW_LEFT | $1, $0, -1, -1, $2, 4, TrainerGruntM15, EVENT_RADIO_TOWER_ROCKET_TAKEOVER + person_event SPRITE_GENTLEMAN, 12, 16, OW_DOWN | $3, $0, -1, -1, $0, 0, GentlemanScript_0x7d9bf, EVENT_RADIO_TOWER_ROCKET_TAKEOVER + person_event SPRITE_POKE_BALL, 19, 22, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x7d9e4, EVENT_UNDERGROUND_WAREHOUSE_MAX_ETHER + person_event SPRITE_POKE_BALL, 13, 17, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x7d9e6, EVENT_UNDERGROUND_WAREHOUSE_TM_SLEEP_TALK + person_event SPRITE_POKE_BALL, 5, 6, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x7d9e8, EVENT_UNDERGROUND_WAREHOUSE_ULTRA_BALL diff --git a/maps/UnionCave1F.asm b/maps/UnionCave1F.asm index f11bf3d76..89bcb27ae 100644 --- a/maps/UnionCave1F.asm +++ b/maps/UnionCave1F.asm @@ -1,28 +1,12 @@ UnionCave1F_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 TrainerPokemaniacLarry: - ; bit/flag number - dw EVENT_BEAT_POKEMANIAC_LARRY - - ; trainer group && trainer id - db POKEMANIAC, LARRY - - ; text when seen - dw PokemaniacLarrySeenText - - ; text when trainer beaten - dw PokemaniacLarryBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw PokemaniacLarryScript + trainer EVENT_BEAT_POKEMANIAC_LARRY, POKEMANIAC, LARRY, PokemaniacLarrySeenText, PokemaniacLarryBeatenText, $0000, PokemaniacLarryScript PokemaniacLarryScript: talkaftercancel @@ -33,23 +17,7 @@ PokemaniacLarryScript: end TrainerHikerRussell: - ; bit/flag number - dw EVENT_BEAT_HIKER_RUSSELL - - ; trainer group && trainer id - db HIKER, RUSSELL - - ; text when seen - dw HikerRussellSeenText - - ; text when trainer beaten - dw HikerRussellBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw HikerRussellScript + trainer EVENT_BEAT_HIKER_RUSSELL, HIKER, RUSSELL, HikerRussellSeenText, HikerRussellBeatenText, $0000, HikerRussellScript HikerRussellScript: talkaftercancel @@ -60,23 +28,7 @@ HikerRussellScript: end TrainerHikerDaniel: - ; bit/flag number - dw EVENT_BEAT_HIKER_DANIEL - - ; trainer group && trainer id - db HIKER, DANIEL - - ; text when seen - dw HikerDanielSeenText - - ; text when trainer beaten - dw HikerDanielBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw HikerDanielScript + trainer EVENT_BEAT_HIKER_DANIEL, HIKER, DANIEL, HikerDanielSeenText, HikerDanielBeatenText, $0000, HikerDanielScript HikerDanielScript: talkaftercancel @@ -87,23 +39,7 @@ HikerDanielScript: end TrainerFirebreatherBill: - ; bit/flag number - dw EVENT_BEAT_FIREBREATHER_BILL - - ; trainer group && trainer id - db FIREBREATHER, BILL - - ; text when seen - dw FirebreatherBillSeenText - - ; text when trainer beaten - dw FirebreatherBillBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw FirebreatherBillScript + trainer EVENT_BEAT_FIREBREATHER_BILL, FIREBREATHER, BILL, FirebreatherBillSeenText, FirebreatherBillBeatenText, $0000, FirebreatherBillScript FirebreatherBillScript: talkaftercancel @@ -114,23 +50,7 @@ FirebreatherBillScript: end TrainerFirebreatherRay: - ; bit/flag number - dw EVENT_BEAT_FIREBREATHER_RAY - - ; trainer group && trainer id - db FIREBREATHER, RAY - - ; text when seen - dw FirebreatherRaySeenText - - ; text when trainer beaten - dw FirebreatherRayBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw FirebreatherRayScript + trainer EVENT_BEAT_FIREBREATHER_RAY, FIREBREATHER, RAY, FirebreatherRaySeenText, FirebreatherRayBeatenText, $0000, FirebreatherRayScript FirebreatherRayScript: talkaftercancel @@ -272,27 +192,27 @@ UnionCave1F_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 4 warp_def $13, $5, 3, GROUP_UNION_CAVE_B1F, MAP_UNION_CAVE_B1F warp_def $21, $3, 4, GROUP_UNION_CAVE_B1F, MAP_UNION_CAVE_B1F warp_def $1f, $11, 1, GROUP_ROUTE_33, MAP_ROUTE_33 warp_def $3, $11, 4, GROUP_ROUTE_32, MAP_ROUTE_32 - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 9 - person_event SPRITE_POKEFAN_M, 10, 7, $9, $0, 255, 255, $b2, 2, TrainerHikerDaniel, -1 - person_event SPRITE_SUPER_NERD, 25, 8, $a, $0, 255, 255, $92, 3, TrainerPokemaniacLarry, -1 - person_event SPRITE_POKEFAN_M, 12, 15, $a, $0, 255, 255, $b2, 1, TrainerHikerRussell, -1 - person_event SPRITE_FISHER, 31, 19, $8, $0, 255, 255, $82, 4, TrainerFirebreatherRay, -1 - person_event SPRITE_FISHER, 23, 18, $7, $0, 255, 255, $82, 4, TrainerFirebreatherBill, -1 - person_event SPRITE_POKE_BALL, 25, 21, $1, $0, 255, 255, $1, 0, ItemFragment_0x59c00, EVENT_65A - person_event SPRITE_POKE_BALL, 6, 8, $1, $0, 255, 255, $1, 0, ItemFragment_0x59c02, EVENT_65B - person_event SPRITE_POKE_BALL, 21, 8, $1, $0, 255, 255, $1, 0, ItemFragment_0x59c04, EVENT_65C - person_event SPRITE_POKE_BALL, 37, 16, $1, $0, 255, 255, $1, 0, ItemFragment_0x59c06, EVENT_65D + person_event SPRITE_POKEFAN_M, 10, 7, OW_LEFT | $1, $0, -1, -1, (PAL_OW_BROWN << 4) | $82, 2, TrainerHikerDaniel, -1 + person_event SPRITE_SUPER_NERD, 25, 8, OW_LEFT | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 3, TrainerPokemaniacLarry, -1 + person_event SPRITE_POKEFAN_M, 12, 15, OW_LEFT | $2, $0, -1, -1, (PAL_OW_BROWN << 4) | $82, 1, TrainerHikerRussell, -1 + person_event SPRITE_FISHER, 31, 19, OW_LEFT | $0, $0, -1, -1, (PAL_OW_RED << 4) | $82, 4, TrainerFirebreatherRay, -1 + person_event SPRITE_FISHER, 23, 18, OW_UP | $3, $0, -1, -1, (PAL_OW_RED << 4) | $82, 4, TrainerFirebreatherBill, -1 + person_event SPRITE_POKE_BALL, 25, 21, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x59c00, EVENT_UNION_CAVE_1F_GREAT_BALL + person_event SPRITE_POKE_BALL, 6, 8, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x59c02, EVENT_UNION_CAVE_1F_X_ATTACK + person_event SPRITE_POKE_BALL, 21, 8, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x59c04, EVENT_UNION_CAVE_1F_POTION + person_event SPRITE_POKE_BALL, 37, 16, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x59c06, EVENT_UNION_CAVE_1F_AWAKENING diff --git a/maps/UnionCaveB1F.asm b/maps/UnionCaveB1F.asm index c3796bf3b..2e23e9072 100644 --- a/maps/UnionCaveB1F.asm +++ b/maps/UnionCaveB1F.asm @@ -1,28 +1,12 @@ UnionCaveB1F_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 TrainerPokemaniacAndrew: - ; bit/flag number - dw EVENT_BEAT_POKEMANIAC_ANDREW - - ; trainer group && trainer id - db POKEMANIAC, ANDREW - - ; text when seen - dw PokemaniacAndrewSeenText - - ; text when trainer beaten - dw PokemaniacAndrewBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw PokemaniacAndrewScript + trainer EVENT_BEAT_POKEMANIAC_ANDREW, POKEMANIAC, ANDREW, PokemaniacAndrewSeenText, PokemaniacAndrewBeatenText, $0000, PokemaniacAndrewScript PokemaniacAndrewScript: talkaftercancel @@ -33,23 +17,7 @@ PokemaniacAndrewScript: end TrainerPokemaniacCalvin: - ; bit/flag number - dw EVENT_BEAT_POKEMANIAC_CALVIN - - ; trainer group && trainer id - db POKEMANIAC, CALVIN - - ; text when seen - dw PokemaniacCalvinSeenText - - ; text when trainer beaten - dw PokemaniacCalvinBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw PokemaniacCalvinScript + trainer EVENT_BEAT_POKEMANIAC_CALVIN, POKEMANIAC, CALVIN, PokemaniacCalvinSeenText, PokemaniacCalvinBeatenText, $0000, PokemaniacCalvinScript PokemaniacCalvinScript: talkaftercancel @@ -60,23 +28,7 @@ PokemaniacCalvinScript: end TrainerHikerPhillip: - ; bit/flag number - dw EVENT_BEAT_HIKER_PHILLIP - - ; trainer group && trainer id - db HIKER, PHILLIP - - ; text when seen - dw HikerPhillipSeenText - - ; text when trainer beaten - dw HikerPhillipBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw HikerPhillipScript + trainer EVENT_BEAT_HIKER_PHILLIP, HIKER, PHILLIP, HikerPhillipSeenText, HikerPhillipBeatenText, $0000, HikerPhillipScript HikerPhillipScript: talkaftercancel @@ -87,23 +39,7 @@ HikerPhillipScript: end TrainerHikerLeonard: - ; bit/flag number - dw EVENT_BEAT_HIKER_LEONARD - - ; trainer group && trainer id - db HIKER, LEONARD - - ; text when seen - dw HikerLeonardSeenText - - ; text when trainer beaten - dw HikerLeonardBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw HikerLeonardScript + trainer EVENT_BEAT_HIKER_LEONARD, HIKER, LEONARD, HikerLeonardSeenText, HikerLeonardBeatenText, $0000, HikerLeonardScript HikerLeonardScript: talkaftercancel @@ -211,7 +147,7 @@ UnionCaveB1F_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 5 warp_def $3, $3, 7, GROUP_RUINS_OF_ALPH_OUTSIDE, MAP_RUINS_OF_ALPH_OUTSIDE warp_def $b, $3, 8, GROUP_RUINS_OF_ALPH_OUTSIDE, MAP_RUINS_OF_ALPH_OUTSIDE @@ -219,18 +155,18 @@ UnionCaveB1F_MapEventHeader: warp_def $21, $3, 2, GROUP_UNION_CAVE_1F, MAP_UNION_CAVE_1F warp_def $1f, $11, 1, GROUP_UNION_CAVE_B2F, MAP_UNION_CAVE_B2F - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 7 - person_event SPRITE_POKEFAN_M, 8, 13, $a, $0, 255, 255, $b2, 3, TrainerHikerPhillip, -1 - person_event SPRITE_POKEFAN_M, 11, 20, $6, $0, 255, 255, $b2, 3, TrainerHikerLeonard, -1 - person_event SPRITE_SUPER_NERD, 36, 9, $8, $0, 255, 255, $92, 3, TrainerPokemaniacAndrew, -1 - person_event SPRITE_SUPER_NERD, 34, 21, $8, $0, 255, 255, $92, 3, TrainerPokemaniacCalvin, -1 - person_event SPRITE_POKE_BALL, 20, 6, $1, $0, 255, 255, $1, 0, ItemFragment_0x5a016, EVENT_65E - person_event SPRITE_BOULDER, 14, 11, $19, $0, 255, 255, $0, 0, UnionCaveB1FBoulder, -1 - person_event SPRITE_POKE_BALL, 27, 21, $1, $0, 255, 255, $1, 0, ItemFragment_0x5a018, EVENT_65F + person_event SPRITE_POKEFAN_M, 8, 13, OW_LEFT | $2, $0, -1, -1, (PAL_OW_BROWN << 4) | $82, 3, TrainerHikerPhillip, -1 + person_event SPRITE_POKEFAN_M, 11, 20, OW_UP | $2, $0, -1, -1, (PAL_OW_BROWN << 4) | $82, 3, TrainerHikerLeonard, -1 + person_event SPRITE_SUPER_NERD, 36, 9, OW_LEFT | $0, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 3, TrainerPokemaniacAndrew, -1 + person_event SPRITE_SUPER_NERD, 34, 21, OW_LEFT | $0, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 3, TrainerPokemaniacCalvin, -1 + person_event SPRITE_POKE_BALL, 20, 6, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x5a016, EVENT_UNION_CAVE_B1F_TM_SWIFT + person_event SPRITE_BOULDER, 14, 11, OW_LEFT | $11, $0, -1, -1, $0, 0, UnionCaveB1FBoulder, -1 + person_event SPRITE_POKE_BALL, 27, 21, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x5a018, EVENT_UNION_CAVE_B1F_X_DEFEND diff --git a/maps/UnionCaveB2F.asm b/maps/UnionCaveB2F.asm index fca0b24db..b97276ce7 100644 --- a/maps/UnionCaveB2F.asm +++ b/maps/UnionCaveB2F.asm @@ -1,8 +1,8 @@ UnionCaveB2F_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 1 ; callbacks @@ -33,23 +33,7 @@ SurfScript_0x5a31f: end TrainerCooltrainermNick: - ; bit/flag number - dw EVENT_BEAT_COOLTRAINERM_NICK - - ; trainer group && trainer id - db COOLTRAINERM, NICK - - ; text when seen - dw CooltrainermNickSeenText - - ; text when trainer beaten - dw CooltrainermNickBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw CooltrainermNickScript + trainer EVENT_BEAT_COOLTRAINERM_NICK, COOLTRAINERM, NICK, CooltrainermNickSeenText, CooltrainermNickBeatenText, $0000, CooltrainermNickScript CooltrainermNickScript: talkaftercancel @@ -60,23 +44,7 @@ CooltrainermNickScript: end TrainerCooltrainerfGwen: - ; bit/flag number - dw EVENT_BEAT_COOLTRAINERF_GWEN - - ; trainer group && trainer id - db COOLTRAINERF, GWEN - - ; text when seen - dw CooltrainerfGwenSeenText - - ; text when trainer beaten - dw CooltrainerfGwenBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw CooltrainerfGwenScript + trainer EVENT_BEAT_COOLTRAINERF_GWEN, COOLTRAINERF, GWEN, CooltrainerfGwenSeenText, CooltrainerfGwenBeatenText, $0000, CooltrainerfGwenScript CooltrainerfGwenScript: talkaftercancel @@ -87,23 +55,7 @@ CooltrainerfGwenScript: end TrainerCooltrainerfEmma: - ; bit/flag number - dw EVENT_BEAT_COOLTRAINERF_EMMA - - ; trainer group && trainer id - db COOLTRAINERF, EMMA - - ; text when seen - dw CooltrainerfEmmaSeenText - - ; text when trainer beaten - dw CooltrainerfEmmaBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw CooltrainerfEmmaScript + trainer EVENT_BEAT_COOLTRAINERF_EMMA, COOLTRAINERF, EMMA, CooltrainerfEmmaSeenText, CooltrainerfEmmaBeatenText, $0000, CooltrainerfEmmaScript CooltrainerfEmmaScript: talkaftercancel @@ -188,21 +140,21 @@ UnionCaveB2F_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 1 warp_def $3, $5, 5, GROUP_UNION_CAVE_B1F, MAP_UNION_CAVE_B1F - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 6 - person_event SPRITE_ROCKER, 23, 19, $6, $0, 255, 255, $82, 3, TrainerCooltrainermNick, -1 - person_event SPRITE_COOLTRAINER_F, 17, 9, $a, $0, 255, 255, $82, 1, TrainerCooltrainerfGwen, -1 - person_event SPRITE_COOLTRAINER_F, 34, 7, $7, $0, 255, 255, $82, 3, TrainerCooltrainerfEmma, -1 - person_event SPRITE_POKE_BALL, 6, 20, $1, $0, 255, 255, $1, 0, ItemFragment_0x5a36a, EVENT_660 - person_event SPRITE_POKE_BALL, 23, 16, $1, $0, 255, 255, $1, 0, ItemFragment_0x5a36c, EVENT_661 - person_event SPRITE_SURF, 35, 15, $24, $11, 255, 255, $90, 0, SurfScript_0x5a31f, EVENT_760 + person_event SPRITE_ROCKER, 23, 19, OW_UP | $2, $0, -1, -1, (PAL_OW_RED << 4) | $82, 3, TrainerCooltrainermNick, -1 + person_event SPRITE_COOLTRAINER_F, 17, 9, OW_LEFT | $2, $0, -1, -1, (PAL_OW_RED << 4) | $82, 1, TrainerCooltrainerfGwen, -1 + person_event SPRITE_COOLTRAINER_F, 34, 7, OW_UP | $3, $0, -1, -1, (PAL_OW_RED << 4) | $82, 3, TrainerCooltrainerfEmma, -1 + person_event SPRITE_POKE_BALL, 6, 20, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x5a36a, EVENT_UNION_CAVE_B2F_ELIXER + person_event SPRITE_POKE_BALL, 23, 16, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x5a36c, EVENT_UNION_CAVE_B2F_HYPER_POTION + person_event SPRITE_SURF, 35, 15, OW_UP | $20, $11, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, SurfScript_0x5a31f, EVENT_UNION_CAVE_B2F_LAPRAS diff --git a/maps/VermilionCity.asm b/maps/VermilionCity.asm index e5eda8fee..7b5a63afd 100644 --- a/maps/VermilionCity.asm +++ b/maps/VermilionCity.asm @@ -1,8 +1,8 @@ VermilionCity_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 1 ; callbacks @@ -117,8 +117,7 @@ VermilionCityMartSign: jumpstd martsign MapVermilionCitySignpostItem7: - dw $00fc - db FULL_HEAL + dwb EVENT_VERMILION_CITY_HIDDEN_FULL_HEAL, FULL_HEAL UnknownText_0x1aaa15: text "VERMILION PORT is" @@ -266,7 +265,7 @@ VermilionCity_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 10 warp_def $5, $5, 1, GROUP_VERMILION_HOUSE_FISHING_SPEECH_HOUSE, MAP_VERMILION_HOUSE_FISHING_SPEECH_HOUSE warp_def $5, $9, 1, GROUP_VERMILION_POKECENTER_1F, MAP_VERMILION_POKECENTER_1F @@ -279,25 +278,25 @@ VermilionCity_MapEventHeader: warp_def $1f, $14, 2, GROUP_VERMILION_PORT_PASSAGE, MAP_VERMILION_PORT_PASSAGE warp_def $7, $22, 1, GROUP_DIGLETTS_CAVE, MAP_DIGLETTS_CAVE - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 8 - signpost 3, 25, $0, VermilionCitySign - signpost 19, 5, $0, VermilionGymSign - signpost 13, 5, $0, PokemonFanClubSign - signpost 9, 33, $0, VermilionCityDiglettsCaveSign - signpost 15, 27, $0, VermilionCityPortSign - signpost 5, 10, $0, VermilionCityPokeCenterSign - signpost 13, 22, $0, VermilionCityMartSign - signpost 19, 12, $7, MapVermilionCitySignpostItem7 - - ; people-events + signpost 3, 25, SIGNPOST_READ, VermilionCitySign + signpost 19, 5, SIGNPOST_READ, VermilionGymSign + signpost 13, 5, SIGNPOST_READ, PokemonFanClubSign + signpost 9, 33, SIGNPOST_READ, VermilionCityDiglettsCaveSign + signpost 15, 27, SIGNPOST_READ, VermilionCityPortSign + signpost 5, 10, SIGNPOST_READ, VermilionCityPokeCenterSign + signpost 13, 22, SIGNPOST_READ, VermilionCityMartSign + signpost 19, 12, SIGNPOST_ITEM, MapVermilionCitySignpostItem7 + +.PersonEvents: db 6 - person_event SPRITE_TEACHER, 13, 22, $2, $11, 255, 255, $0, 0, TeacherScript_0x1aa983, -1 - person_event SPRITE_GRAMPS, 10, 27, $9, $0, 255, 255, $0, 0, GrampsScript_0x1aa986, -1 - person_event SPRITE_MACHOP, 11, 30, $16, $0, 255, 255, $90, 0, VermilionMachop, -1 - person_event SPRITE_SUPER_NERD, 20, 18, $2, $11, 255, 255, $a0, 0, SuperNerdScript_0x1aa99b, -1 - person_event SPRITE_BIG_SNORLAX, 12, 38, $15, $0, 255, 255, $0, 0, VermilionSnorlax, EVENT_770 - person_event SPRITE_POKEFAN_M, 16, 35, $6, $0, 255, 255, $80, 0, VermilionGymBadgeGuy, -1 + person_event SPRITE_TEACHER, 13, 22, OW_DOWN | $2, $11, -1, -1, $0, 0, TeacherScript_0x1aa983, -1 + person_event SPRITE_GRAMPS, 10, 27, OW_LEFT | $1, $0, -1, -1, $0, 0, GrampsScript_0x1aa986, -1 + person_event SPRITE_MACHOP, 11, 30, OW_UP | $12, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, VermilionMachop, -1 + person_event SPRITE_SUPER_NERD, 20, 18, OW_DOWN | $2, $11, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, SuperNerdScript_0x1aa99b, -1 + person_event SPRITE_BIG_SNORLAX, 12, 38, OW_UP | $11, $0, -1, -1, $0, 0, VermilionSnorlax, EVENT_VERMILION_CITY_SNORLAX + person_event SPRITE_POKEFAN_M, 16, 35, OW_UP | $2, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, VermilionGymBadgeGuy, -1 diff --git a/maps/VermilionGym.asm b/maps/VermilionGym.asm index ef9246b3d..4b637c1d3 100644 --- a/maps/VermilionGym.asm +++ b/maps/VermilionGym.asm @@ -1,8 +1,8 @@ VermilionGym_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 SurgeScript_0x1920a5: @@ -38,23 +38,7 @@ SurgeScript_0x1920a5: end TrainerGentlemanGregory: - ; bit/flag number - dw EVENT_BEAT_GENTLEMAN_GREGORY - - ; trainer group && trainer id - db GENTLEMAN, GREGORY - - ; text when seen - dw GentlemanGregorySeenText - - ; text when trainer beaten - dw GentlemanGregoryBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw GentlemanGregoryScript + trainer EVENT_BEAT_GENTLEMAN_GREGORY, GENTLEMAN, GREGORY, GentlemanGregorySeenText, GentlemanGregoryBeatenText, $0000, GentlemanGregoryScript GentlemanGregoryScript: talkaftercancel @@ -65,23 +49,7 @@ GentlemanGregoryScript: end TrainerGuitaristVincent: - ; bit/flag number - dw EVENT_BEAT_GUITARIST_VINCENT - - ; trainer group && trainer id - db GUITARIST, VINCENT - - ; text when seen - dw GuitaristVincentSeenText - - ; text when trainer beaten - dw GuitaristVincentBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw GuitaristVincentScript + trainer EVENT_BEAT_GUITARIST_VINCENT, GUITARIST, VINCENT, GuitaristVincentSeenText, GuitaristVincentBeatenText, $0000, GuitaristVincentScript GuitaristVincentScript: talkaftercancel @@ -92,23 +60,7 @@ GuitaristVincentScript: end TrainerJugglerHorton: - ; bit/flag number - dw EVENT_BEAT_JUGGLER_HORTON - - ; trainer group && trainer id - db JUGGLER, HORTON - - ; text when seen - dw JugglerHortonSeenText - - ; text when trainer beaten - dw JugglerHortonBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw JugglerHortonScript + trainer EVENT_BEAT_JUGGLER_HORTON, JUGGLER, HORTON, JugglerHortonSeenText, JugglerHortonBeatenText, $0000, JugglerHortonScript JugglerHortonScript: talkaftercancel @@ -305,38 +257,38 @@ VermilionGym_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $11, $4, 7, GROUP_VERMILION_CITY, MAP_VERMILION_CITY warp_def $11, $5, 7, GROUP_VERMILION_CITY, MAP_VERMILION_CITY - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 17 - signpost 7, 1, $0, MapVermilionGymSignpost14Script - signpost 7, 3, $0, MapVermilionGymSignpost14Script - signpost 7, 5, $0, MapVermilionGymSignpost14Script - signpost 7, 7, $0, MapVermilionGymSignpost14Script - signpost 7, 9, $0, MapVermilionGymSignpost14Script - signpost 9, 1, $0, MapVermilionGymSignpost14Script - signpost 9, 3, $0, MapVermilionGymSignpost14Script - signpost 9, 5, $0, MapVermilionGymSignpost14Script - signpost 9, 7, $0, MapVermilionGymSignpost14Script - signpost 9, 9, $0, MapVermilionGymSignpost14Script - signpost 11, 1, $0, MapVermilionGymSignpost14Script - signpost 11, 3, $0, MapVermilionGymSignpost14Script - signpost 11, 5, $0, MapVermilionGymSignpost14Script - signpost 11, 7, $0, MapVermilionGymSignpost14Script - signpost 11, 9, $0, MapVermilionGymSignpost14Script - signpost 15, 3, $0, VermilionGymStatue - signpost 15, 6, $0, VermilionGymStatue - - ; people-events + signpost 7, 1, SIGNPOST_READ, MapVermilionGymSignpost14Script + signpost 7, 3, SIGNPOST_READ, MapVermilionGymSignpost14Script + signpost 7, 5, SIGNPOST_READ, MapVermilionGymSignpost14Script + signpost 7, 7, SIGNPOST_READ, MapVermilionGymSignpost14Script + signpost 7, 9, SIGNPOST_READ, MapVermilionGymSignpost14Script + signpost 9, 1, SIGNPOST_READ, MapVermilionGymSignpost14Script + signpost 9, 3, SIGNPOST_READ, MapVermilionGymSignpost14Script + signpost 9, 5, SIGNPOST_READ, MapVermilionGymSignpost14Script + signpost 9, 7, SIGNPOST_READ, MapVermilionGymSignpost14Script + signpost 9, 9, SIGNPOST_READ, MapVermilionGymSignpost14Script + signpost 11, 1, SIGNPOST_READ, MapVermilionGymSignpost14Script + signpost 11, 3, SIGNPOST_READ, MapVermilionGymSignpost14Script + signpost 11, 5, SIGNPOST_READ, MapVermilionGymSignpost14Script + signpost 11, 7, SIGNPOST_READ, MapVermilionGymSignpost14Script + signpost 11, 9, SIGNPOST_READ, MapVermilionGymSignpost14Script + signpost 15, 3, SIGNPOST_READ, VermilionGymStatue + signpost 15, 6, SIGNPOST_READ, VermilionGymStatue + +.PersonEvents: db 5 - person_event SPRITE_SURGE, 6, 9, $6, $0, 255, 255, $b0, 0, SurgeScript_0x1920a5, -1 - person_event SPRITE_GENTLEMAN, 12, 12, $8, $0, 255, 255, $92, 4, TrainerGentlemanGregory, -1 - person_event SPRITE_ROCKER, 11, 8, $6, $3, 255, 255, $82, 3, TrainerGuitaristVincent, -1 - person_event SPRITE_SUPER_NERD, 14, 4, $9, $0, 255, 255, $92, 4, TrainerJugglerHorton, -1 - person_event SPRITE_GYM_GUY, 19, 11, $6, $0, 255, 255, $90, 1, VermilionGymGuyScript, -1 + person_event SPRITE_SURGE, 6, 9, OW_UP | $2, $0, -1, -1, (PAL_OW_BROWN << 4) | $80, 0, SurgeScript_0x1920a5, -1 + person_event SPRITE_GENTLEMAN, 12, 12, OW_LEFT | $0, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 4, TrainerGentlemanGregory, -1 + person_event SPRITE_ROCKER, 11, 8, OW_UP | $2, $3, -1, -1, (PAL_OW_RED << 4) | $82, 3, TrainerGuitaristVincent, -1 + person_event SPRITE_SUPER_NERD, 14, 4, OW_LEFT | $1, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 4, TrainerJugglerHorton, -1 + person_event SPRITE_GYM_GUY, 19, 11, OW_UP | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 1, VermilionGymGuyScript, -1 diff --git a/maps/VermilionHouseDiglettsCaveSpeechHouse.asm b/maps/VermilionHouseDiglettsCaveSpeechHouse.asm index ff19655dd..2fa1fc65f 100644 --- a/maps/VermilionHouseDiglettsCaveSpeechHouse.asm +++ b/maps/VermilionHouseDiglettsCaveSpeechHouse.asm @@ -1,8 +1,8 @@ VermilionHouseDiglettsCaveSpeechHouse_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 GentlemanScript_0x192031: @@ -21,17 +21,17 @@ VermilionHouseDiglettsCaveSpeechHouse_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $7, $2, 6, GROUP_VERMILION_CITY, MAP_VERMILION_CITY warp_def $7, $3, 6, GROUP_VERMILION_CITY, MAP_VERMILION_CITY - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 1 - person_event SPRITE_GENTLEMAN, 7, 5, $4, $10, 255, 255, $80, 0, GentlemanScript_0x192031, -1 + person_event SPRITE_GENTLEMAN, 7, 5, OW_UP | $0, $10, -1, -1, (PAL_OW_RED << 4) | $80, 0, GentlemanScript_0x192031, -1 diff --git a/maps/VermilionHouseFishingSpeechHouse.asm b/maps/VermilionHouseFishingSpeechHouse.asm index 6f0a824c8..48c4c8cbb 100644 --- a/maps/VermilionHouseFishingSpeechHouse.asm +++ b/maps/VermilionHouseFishingSpeechHouse.asm @@ -1,8 +1,8 @@ VermilionHouseFishingSpeechHouse_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 FishingDude: @@ -51,18 +51,18 @@ VermilionHouseFishingSpeechHouse_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $7, $2, 1, GROUP_VERMILION_CITY, MAP_VERMILION_CITY warp_def $7, $3, 1, GROUP_VERMILION_CITY, MAP_VERMILION_CITY - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 1 - signpost 0, 3, $0, FishingDudesHousePhoto + signpost 0, 3, SIGNPOST_READ, FishingDudesHousePhoto - ; people-events +.PersonEvents: db 1 - person_event SPRITE_FISHING_GURU, 8, 6, $6, $0, 255, 255, $a0, 0, FishingDude, -1 + person_event SPRITE_FISHING_GURU, 8, 6, OW_UP | $2, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, FishingDude, -1 diff --git a/maps/VermilionMagnetTrainSpeechHouse.asm b/maps/VermilionMagnetTrainSpeechHouse.asm index 745a6c9ed..d76778627 100644 --- a/maps/VermilionMagnetTrainSpeechHouse.asm +++ b/maps/VermilionMagnetTrainSpeechHouse.asm @@ -1,8 +1,8 @@ VermilionMagnetTrainSpeechHouse_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 PokefanFScript_0x191eb7: @@ -33,20 +33,20 @@ VermilionMagnetTrainSpeechHouse_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $7, $2, 4, GROUP_VERMILION_CITY, MAP_VERMILION_CITY warp_def $7, $3, 4, GROUP_VERMILION_CITY, MAP_VERMILION_CITY - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 2 - signpost 1, 0, $0, VermilionMagnetTrainSpeechHouseBookshelf - signpost 1, 1, $0, VermilionMagnetTrainSpeechHouseBookshelf + signpost 1, 0, SIGNPOST_READ, VermilionMagnetTrainSpeechHouseBookshelf + signpost 1, 1, SIGNPOST_READ, VermilionMagnetTrainSpeechHouseBookshelf - ; people-events +.PersonEvents: db 2 - person_event SPRITE_POKEFAN_F, 7, 6, $8, $0, 255, 255, $0, 0, PokefanFScript_0x191eb7, -1 - person_event SPRITE_YOUNGSTER, 7, 4, $a, $0, 255, 255, $a0, 0, YoungsterScript_0x191eba, -1 + person_event SPRITE_POKEFAN_F, 7, 6, OW_LEFT | $0, $0, -1, -1, $0, 0, PokefanFScript_0x191eb7, -1 + person_event SPRITE_YOUNGSTER, 7, 4, OW_LEFT | $2, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, YoungsterScript_0x191eba, -1 diff --git a/maps/VermilionMart.asm b/maps/VermilionMart.asm index 08549a33b..2054323ff 100644 --- a/maps/VermilionMart.asm +++ b/maps/VermilionMart.asm @@ -1,8 +1,8 @@ VermilionMart_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 ClerkScript_0x191f7e: @@ -35,19 +35,19 @@ VermilionMart_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $7, $2, 5, GROUP_VERMILION_CITY, MAP_VERMILION_CITY warp_def $7, $3, 5, GROUP_VERMILION_CITY, MAP_VERMILION_CITY - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 3 - person_event SPRITE_CLERK, 7, 5, $9, $0, 255, 255, $0, 0, ClerkScript_0x191f7e, -1 - person_event SPRITE_SUPER_NERD, 6, 9, $6, $0, 255, 255, $80, 0, SuperNerdScript_0x191f85, -1 - person_event SPRITE_BUENA, 10, 12, $5, $1, 255, 255, $a0, 0, BuenaScript_0x191f88, -1 + person_event SPRITE_CLERK, 7, 5, OW_LEFT | $1, $0, -1, -1, $0, 0, ClerkScript_0x191f7e, -1 + person_event SPRITE_SUPER_NERD, 6, 9, OW_UP | $2, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, SuperNerdScript_0x191f85, -1 + person_event SPRITE_BUENA, 10, 12, OW_UP | $1, $1, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, BuenaScript_0x191f88, -1 diff --git a/maps/VermilionPokeCenter1F.asm b/maps/VermilionPokeCenter1F.asm index da87c15b0..bb9457982 100644 --- a/maps/VermilionPokeCenter1F.asm +++ b/maps/VermilionPokeCenter1F.asm @@ -1,8 +1,8 @@ VermilionPokeCenter1F_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 NurseScript_0x191603: @@ -74,21 +74,21 @@ VermilionPokeCenter1F_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 3 warp_def $7, $3, 2, GROUP_VERMILION_CITY, MAP_VERMILION_CITY warp_def $7, $4, 2, GROUP_VERMILION_CITY, MAP_VERMILION_CITY warp_def $7, $0, 1, GROUP_POKECENTER_2F, MAP_POKECENTER_2F - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 4 - person_event SPRITE_NURSE, 5, 7, $6, $0, 255, 255, $0, 0, NurseScript_0x191603, -1 - person_event SPRITE_FISHING_GURU, 6, 11, $6, $0, 255, 255, $80, 0, FishingGuruScript_0x191606, -1 - person_event SPRITE_SAILOR, 9, 10, $4, $10, 255, 255, $90, 0, SailorScript_0x19161a, -1 - person_event SPRITE_BUG_CATCHER, 9, 5, $3, $0, 255, 255, $a0, 0, BugCatcherScript_0x19161d, -1 + person_event SPRITE_NURSE, 5, 7, OW_UP | $2, $0, -1, -1, $0, 0, NurseScript_0x191603, -1 + person_event SPRITE_FISHING_GURU, 6, 11, OW_UP | $2, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, FishingGuruScript_0x191606, -1 + person_event SPRITE_SAILOR, 9, 10, OW_UP | $0, $10, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, SailorScript_0x19161a, -1 + person_event SPRITE_BUG_CATCHER, 9, 5, OW_DOWN | $3, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, BugCatcherScript_0x19161d, -1 diff --git a/maps/VermilionPokeCenter2FBeta.asm b/maps/VermilionPokeCenter2FBeta.asm index de245eef7..f3a435000 100644 --- a/maps/VermilionPokeCenter2FBeta.asm +++ b/maps/VermilionPokeCenter2FBeta.asm @@ -1,23 +1,23 @@ VermilionPokeCenter2FBeta_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 VermilionPokeCenter2FBeta_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 1 warp_def $7, $0, 3, GROUP_VERMILION_POKECENTER_1F, MAP_VERMILION_POKECENTER_1F - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 0 diff --git a/maps/VermilionPort.asm b/maps/VermilionPort.asm index bcd154e8d..07e6ae00c 100644 --- a/maps/VermilionPort.asm +++ b/maps/VermilionPort.asm @@ -1,12 +1,12 @@ VermilionPort_MapScriptHeader: - ; trigger count +.MapTriggers: db 2 ; triggers dw .Trigger1, $0000 dw .Trigger2, $0000 - ; callback count +.MapCallbacks: db 1 ; callbacks @@ -27,19 +27,19 @@ UnknownScript_0x74da6: applymovement $0, MovementData_0x74ef3 appear $2 dotrigger $0 - setevent EVENT_731 - setevent EVENT_730 - setevent EVENT_739 - clearevent EVENT_733 - setevent EVENT_030 - setevent EVENT_000 + setevent EVENT_FAST_SHIP_CABINS_SE_SSE_CAPTAINS_CABIN_TWIN_1 + setevent EVENT_FAST_SHIP_CABINS_SE_SSE_GENTLEMAN + setevent EVENT_FAST_SHIP_PASSENGERS_FIRST_TRIP + clearevent EVENT_OLIVINE_PORT_PASSAGE_POKEFAN_M + setevent EVENT_FAST_SHIP_FIRST_TIME + setevent EVENT_GAVE_KURT_APRICORNS blackoutmod GROUP_VERMILION_CITY, MAP_VERMILION_CITY end SailorScript_0x74dc4: faceplayer loadfont - checkevent EVENT_000 + checkevent EVENT_GAVE_KURT_APRICORNS iftrue UnknownScript_0x74e1a writetext UnknownText_0x74f06 closetext @@ -51,10 +51,10 @@ SailorScript_0x74dc4: waitbutton applymovement $0, MovementData_0x74ef1 playsound SFX_EXIT_BUILDING - special Function8c084 + special FadeBlackBGMap waitbutton - setevent EVENT_73A - clearevent EVENT_73B + setevent EVENT_FAST_SHIP_PASSENGERS_EASTBOUND + clearevent EVENT_FAST_SHIP_PASSENGERS_WESTBOUND clearevent EVENT_BEAT_POKEMANIAC_ETHAN clearevent EVENT_BEAT_BURGLAR_COREY clearevent EVENT_BEAT_BUG_CATCHER_KEN @@ -79,9 +79,9 @@ UnknownScript_0x74e1a: UnknownScript_0x74e20: spriteface $3, RIGHT - checkevent EVENT_000 + checkevent EVENT_GAVE_KURT_APRICORNS iftrue UnknownScript_0x74e86 - checkevent EVENT_001 + checkevent EVENT_RECEIVED_BALLS_FROM_KURT iftrue UnknownScript_0x74e86 spriteface $0, LEFT loadfont @@ -101,7 +101,7 @@ UnknownScript_0x74e20: writetext UnknownText_0x74fc2 closetext loadmovesprites - setevent EVENT_001 + setevent EVENT_RECEIVED_BALLS_FROM_KURT applymovement $0, MovementData_0x74ef8 jump SailorScript_0x74dc4 @@ -145,7 +145,7 @@ UnknownScript_0x74e8d: SailorScript_0x74e97: faceplayer loadfont - checkevent EVENT_000 + checkevent EVENT_GAVE_KURT_APRICORNS iftrue UnknownScript_0x74e1a checkcode VAR_WEEKDAY if_equal MONDAY, UnknownScript_0x74eda @@ -163,7 +163,7 @@ SailorScript_0x74e97: writetext UnknownText_0x74fc2 closetext loadmovesprites - setevent EVENT_001 + setevent EVENT_RECEIVED_BALLS_FROM_KURT applymovement $0, MovementData_0x74efe jump SailorScript_0x74dc4 @@ -194,8 +194,7 @@ SuperNerdScript_0x74ee6: end MapVermilionPortSignpostItem0: - dw $00eb - db IRON + dwb EVENT_VERMILION_PORT_HIDDEN_IRON, IRON MovementData_0x74ef1: @@ -303,21 +302,21 @@ VermilionPort_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $5, $9, 5, GROUP_VERMILION_PORT_PASSAGE, MAP_VERMILION_PORT_PASSAGE warp_def $11, $7, 1, GROUP_FAST_SHIP_1F, MAP_FAST_SHIP_1F - ; xy triggers +.XYTriggers: db 1 xy_trigger 0, $b, $7, $0, UnknownScript_0x74e20, $0, $0 - ; signposts +.Signposts: db 1 - signpost 13, 16, $7, MapVermilionPortSignpostItem0 + signpost 13, 16, SIGNPOST_ITEM, MapVermilionPortSignpostItem0 - ; people-events +.PersonEvents: db 3 - person_event SPRITE_SAILOR, 21, 11, $7, $0, 255, 255, $0, 0, SailorScript_0x74dc4, EVENT_72B - person_event SPRITE_SAILOR, 15, 10, $9, $0, 255, 255, $0, 0, SailorScript_0x74e97, -1 - person_event SPRITE_SUPER_NERD, 15, 15, $5, $2, 255, 255, $0, 0, SuperNerdScript_0x74ee6, -1 + person_event SPRITE_SAILOR, 21, 11, OW_UP | $3, $0, -1, -1, $0, 0, SailorScript_0x74dc4, EVENT_VERMILION_PORT_SAILOR_AT_GANGWAY + person_event SPRITE_SAILOR, 15, 10, OW_LEFT | $1, $0, -1, -1, $0, 0, SailorScript_0x74e97, -1 + person_event SPRITE_SUPER_NERD, 15, 15, OW_UP | $1, $2, -1, -1, $0, 0, SuperNerdScript_0x74ee6, -1 diff --git a/maps/VermilionPortPassage.asm b/maps/VermilionPortPassage.asm index 586127cd1..8ac0b8694 100644 --- a/maps/VermilionPortPassage.asm +++ b/maps/VermilionPortPassage.asm @@ -1,8 +1,8 @@ VermilionPortPassage_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 TeacherScript_0x7701a: @@ -19,7 +19,7 @@ VermilionPortPassage_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 5 warp_def $0, $f, 8, GROUP_VERMILION_CITY, MAP_VERMILION_CITY warp_def $0, $10, 9, GROUP_VERMILION_CITY, MAP_VERMILION_CITY @@ -27,12 +27,12 @@ VermilionPortPassage_MapEventHeader: warp_def $2, $3, 3, GROUP_VERMILION_PORT_PASSAGE, MAP_VERMILION_PORT_PASSAGE warp_def $e, $3, 1, GROUP_VERMILION_PORT, MAP_VERMILION_PORT - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 1 - person_event SPRITE_TEACHER, 5, 21, $8, $0, 255, 255, $0, 0, TeacherScript_0x7701a, -1 + person_event SPRITE_TEACHER, 5, 21, OW_LEFT | $0, $0, -1, -1, $0, 0, TeacherScript_0x7701a, -1 diff --git a/maps/VictoryRoad.asm b/maps/VictoryRoad.asm index c858b1192..509bd0303 100644 --- a/maps/VictoryRoad.asm +++ b/maps/VictoryRoad.asm @@ -1,12 +1,12 @@ VictoryRoad_MapScriptHeader: - ; trigger count +.MapTriggers: db 2 ; triggers dw UnknownScript_0x74490, $0000 dw UnknownScript_0x74491, $0000 - ; callback count +.MapCallbacks: db 0 UnknownScript_0x74490: @@ -18,7 +18,7 @@ UnknownScript_0x74491: UnknownScript_0x74492: moveperson $2, $12, $b spriteface $0, DOWN - showemote $0, $0, 15 + showemote EMOTE_SHOCK, $0, 15 special Functionc48f pause 15 appear $2 @@ -32,7 +32,7 @@ UnknownScript_0x74492: UnknownScript_0x744b5: spriteface $0, DOWN - showemote $0, $0, 15 + showemote EMOTE_SHOCK, $0, 15 special Functionc48f pause 15 appear $2 @@ -51,7 +51,7 @@ UnknownScript_0x744d4: writetext UnknownText_0x7455f closetext loadmovesprites - setevent EVENT_6C2 + setevent EVENT_RIVAL_VICTORY_ROAD checkevent EVENT_GOT_TOTODILE_FROM_ELM iftrue UnknownScript_0x744ff checkevent EVENT_GOT_CHIKORITA_FROM_ELM @@ -106,13 +106,11 @@ ItemFragment_0x74531: db HP_UP, 1 MapVictoryRoadSignpostItem0: - dw $009e - db MAX_POTION + dwb EVENT_VICTORY_ROAD_HIDDEN_MAX_POTION, MAX_POTION MapVictoryRoadSignpostItem1: - dw $009f - db FULL_HEAL + dwb EVENT_VICTORY_ROAD_HIDDEN_FULL_HEAL, FULL_HEAL MovementData_0x74539: @@ -240,7 +238,7 @@ VictoryRoad_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 10 warp_def $43, $9, 5, GROUP_VICTORY_ROAD_GATE, MAP_VICTORY_ROAD_GATE warp_def $31, $1, 3, GROUP_VICTORY_ROAD, MAP_VICTORY_ROAD @@ -253,21 +251,21 @@ VictoryRoad_MapEventHeader: warp_def $1b, $0, 8, GROUP_VICTORY_ROAD, MAP_VICTORY_ROAD warp_def $5, $d, 3, GROUP_ROUTE_23, MAP_ROUTE_23 - ; xy triggers +.XYTriggers: db 2 xy_trigger 0, $8, $c, $0, UnknownScript_0x74492, $0, $0 xy_trigger 0, $8, $d, $0, UnknownScript_0x744b5, $0, $0 - ; signposts +.Signposts: db 2 - signpost 29, 3, $7, MapVictoryRoadSignpostItem0 - signpost 65, 3, $7, MapVictoryRoadSignpostItem1 + signpost 29, 3, SIGNPOST_ITEM, MapVictoryRoadSignpostItem0 + signpost 65, 3, SIGNPOST_ITEM, MapVictoryRoadSignpostItem1 - ; people-events +.PersonEvents: db 6 - person_event SPRITE_SILVER, 17, 22, $7, $0, 255, 255, $0, 0, ObjectEvent, EVENT_6C2 - person_event SPRITE_POKE_BALL, 32, 7, $1, $0, 255, 255, $1, 0, ItemFragment_0x74529, EVENT_6A3 - person_event SPRITE_POKE_BALL, 52, 16, $1, $0, 255, 255, $1, 0, ItemFragment_0x7452b, EVENT_6A4 - person_event SPRITE_POKE_BALL, 33, 22, $1, $0, 255, 255, $1, 0, ItemFragment_0x7452d, EVENT_6A5 - person_event SPRITE_POKE_BALL, 52, 19, $1, $0, 255, 255, $1, 0, ItemFragment_0x7452f, EVENT_6A6 - person_event SPRITE_POKE_BALL, 42, 11, $1, $0, 255, 255, $1, 0, ItemFragment_0x74531, EVENT_6A7 + person_event SPRITE_SILVER, 17, 22, OW_UP | $3, $0, -1, -1, $0, 0, ObjectEvent, EVENT_RIVAL_VICTORY_ROAD + person_event SPRITE_POKE_BALL, 32, 7, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x74529, EVENT_VICTORY_ROAD_TM_EARTHQUAKE + person_event SPRITE_POKE_BALL, 52, 16, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x7452b, EVENT_VICTORY_ROAD_MAX_REVIVE + person_event SPRITE_POKE_BALL, 33, 22, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x7452d, EVENT_VICTORY_ROAD_FULL_RESTORE + person_event SPRITE_POKE_BALL, 52, 19, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x7452f, EVENT_VICTORY_ROAD_FULL_HEAL + person_event SPRITE_POKE_BALL, 42, 11, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x74531, EVENT_VICTORY_ROAD_HP_UP diff --git a/maps/VictoryRoadGate.asm b/maps/VictoryRoadGate.asm index ac00e6926..c57b2251e 100644 --- a/maps/VictoryRoadGate.asm +++ b/maps/VictoryRoadGate.asm @@ -1,12 +1,12 @@ VictoryRoadGate_MapScriptHeader: - ; trigger count +.MapTriggers: db 2 ; triggers dw UnknownScript_0x9b9fb, $0000 dw UnknownScript_0x9b9fc, $0000 - ; callback count +.MapCallbacks: db 0 UnknownScript_0x9b9fb: @@ -98,7 +98,7 @@ VictoryRoadGate_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 8 warp_def $7, $11, 1, GROUP_ROUTE_22, MAP_ROUTE_22 warp_def $7, $12, 1, GROUP_ROUTE_22, MAP_ROUTE_22 @@ -109,15 +109,15 @@ VictoryRoadGate_MapEventHeader: warp_def $7, $1, 2, GROUP_ROUTE_28, MAP_ROUTE_28 warp_def $7, $2, 2, GROUP_ROUTE_28, MAP_ROUTE_28 - ; xy triggers +.XYTriggers: db 1 xy_trigger 0, $b, $a, $0, UnknownScript_0x9b9fd, $0, $0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 3 - person_event SPRITE_OFFICER, 15, 12, $9, $0, 255, 255, $0, 0, OfficerScript_0x9ba03, -1 - person_event SPRITE_BLACK_BELT, 9, 11, $9, $0, 255, 255, $0, 0, BlackBeltScript_0x9ba21, EVENT_OPENED_MT_SILVER - person_event SPRITE_BLACK_BELT, 9, 16, $8, $0, 255, 255, $0, 0, BlackBeltScript_0x9ba24, EVENT_FOUGHT_SNORLAX + person_event SPRITE_OFFICER, 15, 12, OW_LEFT | $1, $0, -1, -1, $0, 0, OfficerScript_0x9ba03, -1 + person_event SPRITE_BLACK_BELT, 9, 11, OW_LEFT | $1, $0, -1, -1, $0, 0, BlackBeltScript_0x9ba21, EVENT_OPENED_MT_SILVER + person_event SPRITE_BLACK_BELT, 9, 16, OW_LEFT | $0, $0, -1, -1, $0, 0, BlackBeltScript_0x9ba24, EVENT_FOUGHT_SNORLAX diff --git a/maps/VioletCity.asm b/maps/VioletCity.asm index 2b238af6b..5adefc5d2 100644 --- a/maps/VioletCity.asm +++ b/maps/VioletCity.asm @@ -1,8 +1,8 @@ VioletCity_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 1 ; callbacks @@ -46,7 +46,7 @@ UnknownScript_0x1a83d1: applymovement $2, MovementData_0x1a8463 playsound SFX_ENTER_DOOR disappear $2 - clearevent EVENT_6CB + clearevent EVENT_EARLS_ACADEMY_EARL waitbutton end @@ -90,8 +90,7 @@ FruitTreeScript_0x1a8425: fruittree $9 MapVioletCitySignpostItem6: - dw $00b0 - db HYPER_POTION + dwb EVENT_VIOLET_CITY_HIDDEN_HYPER_POTION, HYPER_POTION MovementData_0x1a842a: big_step_down @@ -275,7 +274,7 @@ VioletCity_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 9 warp_def $11, $9, 2, GROUP_VIOLET_MART, MAP_VIOLET_MART warp_def $11, $12, 1, GROUP_VIOLET_GYM, MAP_VIOLET_GYM @@ -287,26 +286,26 @@ VioletCity_MapEventHeader: warp_def $18, $27, 1, GROUP_ROUTE_31_VIOLET_GATE, MAP_ROUTE_31_VIOLET_GATE warp_def $19, $27, 2, GROUP_ROUTE_31_VIOLET_GATE, MAP_ROUTE_31_VIOLET_GATE - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 7 - signpost 20, 24, $0, VioletCitySign - signpost 17, 15, $0, VioletGymSign - signpost 8, 24, $0, SproutTowerSign - signpost 17, 27, $0, EarlsPokemonAcademySign - signpost 25, 32, $0, VioletCityPokeCenterSign - signpost 17, 10, $0, VioletCityMartSign - signpost 14, 37, $7, MapVioletCitySignpostItem6 - - ; people-events + signpost 20, 24, SIGNPOST_READ, VioletCitySign + signpost 17, 15, SIGNPOST_READ, VioletGymSign + signpost 8, 24, SIGNPOST_READ, SproutTowerSign + signpost 17, 27, SIGNPOST_READ, EarlsPokemonAcademySign + signpost 25, 32, SIGNPOST_READ, VioletCityPokeCenterSign + signpost 17, 10, SIGNPOST_READ, VioletCityMartSign + signpost 14, 37, SIGNPOST_ITEM, MapVioletCitySignpostItem6 + +.PersonEvents: db 8 - person_event SPRITE_FISHER, 20, 17, $3, $0, 255, 255, $a0, 0, FisherScript_0x1a83bb, EVENT_6CA - person_event SPRITE_LASS, 32, 32, $2, $22, 255, 255, $a0, 0, LassScript_0x1a8403, -1 - person_event SPRITE_SUPER_NERD, 18, 28, $2, $21, 255, 255, $80, 0, SuperNerdScript_0x1a8406, -1 - person_event SPRITE_GRAMPS, 24, 21, $5, $1, 255, 255, $0, 0, GrampsScript_0x1a8409, -1 - person_event SPRITE_YOUNGSTER, 22, 9, $3, $0, 255, 255, $a0, 0, YoungsterScript_0x1a840c, -1 - person_event SPRITE_FRUIT_TREE, 33, 18, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x1a8425, -1 - person_event SPRITE_POKE_BALL, 5, 8, $1, $0, 255, 255, $1, 0, ItemFragment_0x1a8421, EVENT_643 - person_event SPRITE_POKE_BALL, 9, 39, $1, $0, 255, 255, $1, 0, ItemFragment_0x1a8423, EVENT_644 + person_event SPRITE_FISHER, 20, 17, OW_DOWN | $3, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, FisherScript_0x1a83bb, EVENT_VIOLET_CITY_EARL + person_event SPRITE_LASS, 32, 32, OW_DOWN | $2, $22, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, LassScript_0x1a8403, -1 + person_event SPRITE_SUPER_NERD, 18, 28, OW_DOWN | $2, $21, -1, -1, (PAL_OW_RED << 4) | $80, 0, SuperNerdScript_0x1a8406, -1 + person_event SPRITE_GRAMPS, 24, 21, OW_UP | $1, $1, -1, -1, $0, 0, GrampsScript_0x1a8409, -1 + person_event SPRITE_YOUNGSTER, 22, 9, OW_DOWN | $3, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, YoungsterScript_0x1a840c, -1 + person_event SPRITE_FRUIT_TREE, 33, 18, OW_DOWN | $1, $0, -1, -1, $0, 0, FruitTreeScript_0x1a8425, -1 + person_event SPRITE_POKE_BALL, 5, 8, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x1a8421, EVENT_VIOLET_CITY_PP_UP + person_event SPRITE_POKE_BALL, 9, 39, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x1a8423, EVENT_VIOLET_CITY_RARE_CANDY diff --git a/maps/VioletGym.asm b/maps/VioletGym.asm index 79dddae6c..a2201c4c5 100644 --- a/maps/VioletGym.asm +++ b/maps/VioletGym.asm @@ -1,8 +1,8 @@ VioletGym_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 FalknerScript_0x683c2: @@ -27,25 +27,25 @@ FalknerScript_0x683c2: scall VioletGymTriggerRockets .FightDone checkevent EVENT_GOT_TM31_MUD_SLAP - iftrue UnknownScript_0x68412 + iftrue .SpeechAfterTM setevent EVENT_BEAT_BIRD_KEEPER_ROD setevent EVENT_BEAT_BIRD_KEEPER_ABE domaptrigger GROUP_ELMS_LAB, MAP_ELMS_LAB, $2 - specialphonecall $3 + specialphonecall ELMCALL_ASSISTANT writetext UnknownText_0x685c8 keeptextopen verbosegiveitem TM_MUD_SLAP, 1 - iffalse UnknownScript_0x68416 + iffalse .NoRoomForMudSlap setevent EVENT_GOT_TM31_MUD_SLAP writetext UnknownText_0x68648 closetext loadmovesprites end -UnknownScript_0x68412: +.SpeechAfterTM: writetext UnknownText_0x68735 closetext -UnknownScript_0x68416: +.NoRoomForMudSlap: loadmovesprites end @@ -61,23 +61,7 @@ VioletGymTriggerRockets: jumpstd radiotowerrockets TrainerBird_keeperRod: - ; bit/flag number - dw EVENT_BEAT_BIRD_KEEPER_ROD - - ; trainer group && trainer id - db BIRD_KEEPER, ROD - - ; text when seen - dw Bird_keeperRodSeenText - - ; text when trainer beaten - dw Bird_keeperRodBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw Bird_keeperRodScript + trainer EVENT_BEAT_BIRD_KEEPER_ROD, BIRD_KEEPER, ROD, Bird_keeperRodSeenText, Bird_keeperRodBeatenText, $0000, Bird_keeperRodScript Bird_keeperRodScript: talkaftercancel @@ -88,23 +72,7 @@ Bird_keeperRodScript: end TrainerBird_keeperAbe: - ; bit/flag number - dw EVENT_BEAT_BIRD_KEEPER_ABE - - ; trainer group && trainer id - db BIRD_KEEPER, ABE - - ; text when seen - dw Bird_keeperAbeSeenText - - ; text when trainer beaten - dw Bird_keeperAbeBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw Bird_keeperAbeScript + trainer EVENT_BEAT_BIRD_KEEPER_ABE, BIRD_KEEPER, ABE, Bird_keeperAbeSeenText, Bird_keeperAbeBeatenText, $0000, Bird_keeperAbeScript Bird_keeperAbeScript: talkaftercancel @@ -311,22 +279,22 @@ VioletGym_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $f, $4, 2, GROUP_VIOLET_CITY, MAP_VIOLET_CITY warp_def $f, $5, 2, GROUP_VIOLET_CITY, MAP_VIOLET_CITY - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 2 - signpost 13, 3, $0, VioletGymStatue - signpost 13, 6, $0, VioletGymStatue + signpost 13, 3, SIGNPOST_READ, VioletGymStatue + signpost 13, 6, SIGNPOST_READ, VioletGymStatue - ; people-events +.PersonEvents: db 4 - person_event SPRITE_FALKNER, 5, 9, $6, $0, 255, 255, $90, 0, FalknerScript_0x683c2, -1 - person_event SPRITE_YOUNGSTER, 10, 11, $8, $2, 255, 255, $92, 3, TrainerBird_keeperRod, -1 - person_event SPRITE_YOUNGSTER, 14, 6, $9, $2, 255, 255, $92, 3, TrainerBird_keeperAbe, -1 - person_event SPRITE_GYM_GUY, 17, 11, $6, $0, 255, 255, $80, 0, VioletGymGuyScript, -1 + person_event SPRITE_FALKNER, 5, 9, OW_UP | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, FalknerScript_0x683c2, -1 + person_event SPRITE_YOUNGSTER, 10, 11, OW_LEFT | $0, $2, -1, -1, (PAL_OW_BLUE << 4) | $82, 3, TrainerBird_keeperRod, -1 + person_event SPRITE_YOUNGSTER, 14, 6, OW_LEFT | $1, $2, -1, -1, (PAL_OW_BLUE << 4) | $82, 3, TrainerBird_keeperAbe, -1 + person_event SPRITE_GYM_GUY, 17, 11, OW_UP | $2, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, VioletGymGuyScript, -1 diff --git a/maps/VioletMart.asm b/maps/VioletMart.asm index 7463c18de..23bc3d6a4 100644 --- a/maps/VioletMart.asm +++ b/maps/VioletMart.asm @@ -1,8 +1,8 @@ VioletMart_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 ClerkScript_0x68295: @@ -47,19 +47,19 @@ VioletMart_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $7, $2, 1, GROUP_VIOLET_CITY, MAP_VIOLET_CITY warp_def $7, $3, 1, GROUP_VIOLET_CITY, MAP_VIOLET_CITY - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 3 - person_event SPRITE_CLERK, 7, 5, $9, $0, 255, 255, $0, 0, ClerkScript_0x68295, -1 - person_event SPRITE_GRANNY, 10, 11, $5, $1, 255, 255, $0, 0, GrannyScript_0x6829c, -1 - person_event SPRITE_COOLTRAINER_M, 6, 9, $3, $0, 255, 255, $80, 0, CooltrainerMScript_0x6829f, -1 + person_event SPRITE_CLERK, 7, 5, OW_LEFT | $1, $0, -1, -1, $0, 0, ClerkScript_0x68295, -1 + person_event SPRITE_GRANNY, 10, 11, OW_UP | $1, $1, -1, -1, $0, 0, GrannyScript_0x6829c, -1 + person_event SPRITE_COOLTRAINER_M, 6, 9, OW_DOWN | $3, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, CooltrainerMScript_0x6829f, -1 diff --git a/maps/VioletNicknameSpeechHouse.asm b/maps/VioletNicknameSpeechHouse.asm index 1aa7c7b83..9545c6e36 100644 --- a/maps/VioletNicknameSpeechHouse.asm +++ b/maps/VioletNicknameSpeechHouse.asm @@ -1,8 +1,8 @@ VioletNicknameSpeechHouse_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 TeacherScript_0x693e9: @@ -43,19 +43,19 @@ VioletNicknameSpeechHouse_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $7, $3, 4, GROUP_VIOLET_CITY, MAP_VIOLET_CITY warp_def $7, $4, 4, GROUP_VIOLET_CITY, MAP_VIOLET_CITY - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 3 - person_event SPRITE_TEACHER, 7, 6, $9, $0, 255, 255, $0, 0, TeacherScript_0x693e9, -1 - person_event SPRITE_LASS, 8, 10, $7, $0, 255, 255, $a0, 0, LassScript_0x693ec, -1 - person_event SPRITE_BIRD, 6, 9, $5, $1, 255, 255, $b0, 0, BirdScript_0x693ef, -1 + person_event SPRITE_TEACHER, 7, 6, OW_LEFT | $1, $0, -1, -1, $0, 0, TeacherScript_0x693e9, -1 + person_event SPRITE_LASS, 8, 10, OW_UP | $3, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, LassScript_0x693ec, -1 + person_event SPRITE_BIRD, 6, 9, OW_UP | $1, $1, -1, -1, (PAL_OW_BROWN << 4) | $80, 0, BirdScript_0x693ef, -1 diff --git a/maps/VioletOnixTradeHouse.asm b/maps/VioletOnixTradeHouse.asm index 7d237a77a..c92b5632a 100644 --- a/maps/VioletOnixTradeHouse.asm +++ b/maps/VioletOnixTradeHouse.asm @@ -1,8 +1,8 @@ VioletOnixTradeHouse_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 PokefanMScript_0x6998d: @@ -32,18 +32,18 @@ VioletOnixTradeHouse_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $7, $3, 6, GROUP_VIOLET_CITY, MAP_VIOLET_CITY warp_def $7, $4, 6, GROUP_VIOLET_CITY, MAP_VIOLET_CITY - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 2 - person_event SPRITE_POKEFAN_M, 7, 6, $3, $0, 255, 255, $0, 0, PokefanMScript_0x6998d, -1 - person_event SPRITE_YOUNGSTER, 9, 10, $4, $20, 255, 255, $80, 0, YoungsterScript_0x69990, -1 + person_event SPRITE_POKEFAN_M, 7, 6, OW_DOWN | $3, $0, -1, -1, $0, 0, PokefanMScript_0x6998d, -1 + person_event SPRITE_YOUNGSTER, 9, 10, OW_UP | $0, $20, -1, -1, (PAL_OW_RED << 4) | $80, 0, YoungsterScript_0x69990, -1 diff --git a/maps/VioletPokeCenter1F.asm b/maps/VioletPokeCenter1F.asm index b76c747b1..284094753 100644 --- a/maps/VioletPokeCenter1F.asm +++ b/maps/VioletPokeCenter1F.asm @@ -1,8 +1,8 @@ VioletPokeCenter1F_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 NurseScript_0x694c9: @@ -212,22 +212,22 @@ VioletPokeCenter1F_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 3 warp_def $7, $3, 5, GROUP_VIOLET_CITY, MAP_VIOLET_CITY warp_def $7, $4, 5, GROUP_VIOLET_CITY, MAP_VIOLET_CITY warp_def $7, $0, 1, GROUP_POKECENTER_2F, MAP_POKECENTER_2F - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 5 - person_event SPRITE_NURSE, 5, 7, $6, $0, 255, 255, $0, 0, NurseScript_0x694c9, -1 - person_event SPRITE_GAMEBOY_KID, 10, 11, $6, $0, 255, 255, $a0, 0, GameboyKidScript_0x69540, -1 - person_event SPRITE_GENTLEMAN, 8, 5, $3, $0, 255, 255, $0, 0, GentlemanScript_0x69543, -1 - person_event SPRITE_YOUNGSTER, 5, 12, $6, $0, 255, 255, $80, 0, YoungsterScript_0x69546, -1 - person_event SPRITE_SCIENTIST, 7, 8, $6, $0, 255, 255, $90, 0, ScientistScript_0x694cc, EVENT_ELMS_AIDE_IN_VIOLET_POKEMON_CENTER + person_event SPRITE_NURSE, 5, 7, OW_UP | $2, $0, -1, -1, $0, 0, NurseScript_0x694c9, -1 + person_event SPRITE_GAMEBOY_KID, 10, 11, OW_UP | $2, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, GameboyKidScript_0x69540, -1 + person_event SPRITE_GENTLEMAN, 8, 5, OW_DOWN | $3, $0, -1, -1, $0, 0, GentlemanScript_0x69543, -1 + person_event SPRITE_YOUNGSTER, 5, 12, OW_UP | $2, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, YoungsterScript_0x69546, -1 + person_event SPRITE_SCIENTIST, 7, 8, OW_UP | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, ScientistScript_0x694cc, EVENT_ELMS_AIDE_IN_VIOLET_POKEMON_CENTER diff --git a/maps/ViridianCity.asm b/maps/ViridianCity.asm index 0fb20ff3f..8d748a8e3 100644 --- a/maps/ViridianCity.asm +++ b/maps/ViridianCity.asm @@ -1,8 +1,8 @@ ViridianCity_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 1 ; callbacks @@ -215,7 +215,7 @@ ViridianCity_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 5 warp_def $7, $20, 1, GROUP_VIRIDIAN_GYM, MAP_VIRIDIAN_GYM warp_def $9, $15, 1, GROUP_VIRIDIAN_NICKNAME_SPEECH_HOUSE, MAP_VIRIDIAN_NICKNAME_SPEECH_HOUSE @@ -223,21 +223,21 @@ ViridianCity_MapEventHeader: warp_def $13, $1d, 2, GROUP_VIRIDIAN_MART, MAP_VIRIDIAN_MART warp_def $19, $17, 1, GROUP_VIRIDIAN_POKECENTER_1F, MAP_VIRIDIAN_POKECENTER_1F - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 6 - signpost 17, 17, $0, ViridianCitySign - signpost 7, 27, $0, ViridianGymSign - signpost 1, 19, $0, ViridianCityWelcomeSign - signpost 15, 21, $0, TrainerHouseSign - signpost 25, 24, $0, ViridianCityPokeCenterSign - signpost 19, 30, $0, ViridianCityMartSign - - ; people-events + signpost 17, 17, SIGNPOST_READ, ViridianCitySign + signpost 7, 27, SIGNPOST_READ, ViridianGymSign + signpost 1, 19, SIGNPOST_READ, ViridianCityWelcomeSign + signpost 15, 21, SIGNPOST_READ, TrainerHouseSign + signpost 25, 24, SIGNPOST_READ, ViridianCityPokeCenterSign + signpost 19, 30, SIGNPOST_READ, ViridianCityMartSign + +.PersonEvents: db 4 - person_event SPRITE_GRAMPS, 9, 22, $2, $22, 255, 255, $0, 0, GrampsScript_0x1a9a4c, -1 - person_event SPRITE_GRAMPS, 12, 34, $6, $0, 255, 255, $90, 0, GrampsScript_0x1a9a61, -1 - person_event SPRITE_FISHER, 27, 10, $6, $0, 255, 255, $80, 0, FisherScript_0x1a9a75, -1 - person_event SPRITE_YOUNGSTER, 25, 21, $2, $33, 255, 255, $a0, 0, YoungsterScript_0x1a9a90, -1 + person_event SPRITE_GRAMPS, 9, 22, OW_DOWN | $2, $22, -1, -1, $0, 0, GrampsScript_0x1a9a4c, -1 + person_event SPRITE_GRAMPS, 12, 34, OW_UP | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, GrampsScript_0x1a9a61, -1 + person_event SPRITE_FISHER, 27, 10, OW_UP | $2, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, FisherScript_0x1a9a75, -1 + person_event SPRITE_YOUNGSTER, 25, 21, OW_DOWN | $2, $33, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, YoungsterScript_0x1a9a90, -1 diff --git a/maps/ViridianGym.asm b/maps/ViridianGym.asm index b6d2c985e..30aa729b2 100644 --- a/maps/ViridianGym.asm +++ b/maps/ViridianGym.asm @@ -1,8 +1,8 @@ ViridianGym_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 BlueScript_0x9aa26: @@ -168,20 +168,20 @@ ViridianGym_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $11, $4, 1, GROUP_VIRIDIAN_CITY, MAP_VIRIDIAN_CITY warp_def $11, $5, 1, GROUP_VIRIDIAN_CITY, MAP_VIRIDIAN_CITY - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 2 - signpost 13, 3, $0, ViridianGymStatue - signpost 13, 6, $0, ViridianGymStatue + signpost 13, 3, SIGNPOST_READ, ViridianGymStatue + signpost 13, 6, SIGNPOST_READ, ViridianGymStatue - ; people-events +.PersonEvents: db 2 - person_event SPRITE_BLUE, 7, 9, $6, $0, 255, 255, $0, 0, BlueScript_0x9aa26, EVENT_776 - person_event SPRITE_GYM_GUY, 17, 11, $6, $0, 255, 255, $90, 0, ViridianGymGuyScript, EVENT_776 + person_event SPRITE_BLUE, 7, 9, OW_UP | $2, $0, -1, -1, $0, 0, BlueScript_0x9aa26, EVENT_VIRIDIAN_GYM_BLUE + person_event SPRITE_GYM_GUY, 17, 11, OW_UP | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, ViridianGymGuyScript, EVENT_VIRIDIAN_GYM_BLUE diff --git a/maps/ViridianMart.asm b/maps/ViridianMart.asm index 4e85c98e5..441cf81b7 100644 --- a/maps/ViridianMart.asm +++ b/maps/ViridianMart.asm @@ -1,8 +1,8 @@ ViridianMart_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 ClerkScript_0x9b5e7: @@ -35,19 +35,19 @@ ViridianMart_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $7, $2, 4, GROUP_VIRIDIAN_CITY, MAP_VIRIDIAN_CITY warp_def $7, $3, 4, GROUP_VIRIDIAN_CITY, MAP_VIRIDIAN_CITY - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 3 - person_event SPRITE_CLERK, 7, 5, $9, $0, 255, 255, $0, 0, ClerkScript_0x9b5e7, -1 - person_event SPRITE_LASS, 6, 11, $5, $2, 255, 255, $0, 0, LassScript_0x9b5ee, -1 - person_event SPRITE_COOLTRAINER_M, 10, 5, $7, $0, 255, 255, $0, 0, CooltrainerMScript_0x9b5f1, -1 + person_event SPRITE_CLERK, 7, 5, OW_LEFT | $1, $0, -1, -1, $0, 0, ClerkScript_0x9b5e7, -1 + person_event SPRITE_LASS, 6, 11, OW_UP | $1, $2, -1, -1, $0, 0, LassScript_0x9b5ee, -1 + person_event SPRITE_COOLTRAINER_M, 10, 5, OW_UP | $3, $0, -1, -1, $0, 0, CooltrainerMScript_0x9b5f1, -1 diff --git a/maps/ViridianNicknameSpeechHouse.asm b/maps/ViridianNicknameSpeechHouse.asm index d5888fedd..f6479e7c9 100644 --- a/maps/ViridianNicknameSpeechHouse.asm +++ b/maps/ViridianNicknameSpeechHouse.asm @@ -1,8 +1,8 @@ ViridianNicknameSpeechHouse_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 PokefanMScript_0x9ae3a: @@ -59,20 +59,20 @@ ViridianNicknameSpeechHouse_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $7, $2, 2, GROUP_VIRIDIAN_CITY, MAP_VIRIDIAN_CITY warp_def $7, $3, 2, GROUP_VIRIDIAN_CITY, MAP_VIRIDIAN_CITY - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 4 - person_event SPRITE_POKEFAN_M, 8, 6, $9, $0, 255, 255, $80, 0, PokefanMScript_0x9ae3a, -1 - person_event SPRITE_LASS, 8, 9, $7, $0, 255, 255, $a0, 0, LassScript_0x9ae3d, -1 - person_event SPRITE_MOLTRES, 6, 9, $16, $2, 255, 255, $b0, 0, MoltresScript_0x9ae40, -1 - person_event SPRITE_GROWLITHE, 7, 10, $16, $2, 255, 255, $90, 0, GrowlitheScript_0x9ae4a, -1 + person_event SPRITE_POKEFAN_M, 8, 6, OW_LEFT | $1, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, PokefanMScript_0x9ae3a, -1 + person_event SPRITE_LASS, 8, 9, OW_UP | $3, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, LassScript_0x9ae3d, -1 + person_event SPRITE_MOLTRES, 6, 9, OW_UP | $12, $2, -1, -1, (PAL_OW_BROWN << 4) | $80, 0, MoltresScript_0x9ae40, -1 + person_event SPRITE_GROWLITHE, 7, 10, OW_UP | $12, $2, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, GrowlitheScript_0x9ae4a, -1 diff --git a/maps/ViridianPokeCenter1F.asm b/maps/ViridianPokeCenter1F.asm index 0baaaa342..7d72c8558 100644 --- a/maps/ViridianPokeCenter1F.asm +++ b/maps/ViridianPokeCenter1F.asm @@ -1,8 +1,8 @@ ViridianPokeCenter1F_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 NurseScript_0x9b690: @@ -69,21 +69,21 @@ ViridianPokeCenter1F_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 3 warp_def $7, $3, 5, GROUP_VIRIDIAN_CITY, MAP_VIRIDIAN_CITY warp_def $7, $4, 5, GROUP_VIRIDIAN_CITY, MAP_VIRIDIAN_CITY warp_def $7, $0, 1, GROUP_POKECENTER_2F, MAP_POKECENTER_2F - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 4 - person_event SPRITE_NURSE, 5, 7, $6, $0, 255, 255, $0, 0, NurseScript_0x9b690, -1 - person_event SPRITE_COOLTRAINER_M, 8, 12, $5, $1, 255, 255, $80, 0, CooltrainerMScript_0x9b693, -1 - person_event SPRITE_COOLTRAINER_F, 7, 9, $7, $0, 255, 255, $90, 0, CooltrainerFScript_0x9b6a7, -1 - person_event SPRITE_BUG_CATCHER, 10, 5, $9, $0, 255, 255, $a0, 0, BugCatcherScript_0x9b6aa, -1 + person_event SPRITE_NURSE, 5, 7, OW_UP | $2, $0, -1, -1, $0, 0, NurseScript_0x9b690, -1 + person_event SPRITE_COOLTRAINER_M, 8, 12, OW_UP | $1, $1, -1, -1, (PAL_OW_RED << 4) | $80, 0, CooltrainerMScript_0x9b693, -1 + person_event SPRITE_COOLTRAINER_F, 7, 9, OW_UP | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, CooltrainerFScript_0x9b6a7, -1 + person_event SPRITE_BUG_CATCHER, 10, 5, OW_LEFT | $1, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, BugCatcherScript_0x9b6aa, -1 diff --git a/maps/ViridianPokeCenter2FBeta.asm b/maps/ViridianPokeCenter2FBeta.asm index 71899935c..9140390db 100644 --- a/maps/ViridianPokeCenter2FBeta.asm +++ b/maps/ViridianPokeCenter2FBeta.asm @@ -1,23 +1,23 @@ ViridianPokeCenter2FBeta_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 ViridianPokeCenter2FBeta_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 1 warp_def $7, $0, 3, GROUP_VIRIDIAN_POKECENTER_1F, MAP_VIRIDIAN_POKECENTER_1F - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 0 diff --git a/maps/WarehouseEntrance.asm b/maps/WarehouseEntrance.asm index 383cb172b..b1c32d372 100644 --- a/maps/WarehouseEntrance.asm +++ b/maps/WarehouseEntrance.asm @@ -1,19 +1,19 @@ WarehouseEntrance_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 3 ; callbacks - dbw 5, UnknownScript_0x7c043 + dbw 5, .ResetSwitches - dbw 1, UnknownScript_0x7c076 + dbw 1, .CheckBasementKey - dbw 2, UnknownScript_0x7c082 + dbw 2, .CheckDayOfWeek -UnknownScript_0x7c043: +.ResetSwitches: clearevent EVENT_SWITCH_1 clearevent EVENT_SWITCH_2 clearevent EVENT_SWITCH_3 @@ -33,69 +33,71 @@ UnknownScript_0x7c043: copyvartobyte UndergroundSwitchPositions return -UnknownScript_0x7c076: +.CheckBasementKey: checkevent EVENT_USED_BASEMENT_KEY - iffalse UnknownScript_0x7c07d + iffalse .LockBasementDoor return -UnknownScript_0x7c07d: +.LockBasementDoor: changeblock $12, $6, $3d return -UnknownScript_0x7c082: +.CheckDayOfWeek: checkcode VAR_WEEKDAY - if_equal MONDAY, UnknownScript_0x7c0a5 - if_equal TUESDAY, UnknownScript_0x7c0b5 - if_equal WEDNESDAY, UnknownScript_0x7c0be - if_equal THURSDAY, UnknownScript_0x7c0c7 - if_equal FRIDAY, UnknownScript_0x7c0d0 - if_equal SATURDAY, UnknownScript_0x7c0d9 + if_equal MONDAY, .Monday + if_equal TUESDAY, .Tuesday + if_equal WEDNESDAY, .Wednesday + if_equal THURSDAY, .Thursday + if_equal FRIDAY, .Friday + if_equal SATURDAY, .Saturday + +.Sunday: disappear $7 disappear $8 appear $9 appear $a return -UnknownScript_0x7c0a5: +.Monday: disappear $7 checkmorn - iffalse UnknownScript_0x7c0ae + iffalse .NotMondayMorning appear $7 -UnknownScript_0x7c0ae: +.NotMondayMorning: disappear $8 disappear $9 disappear $a return -UnknownScript_0x7c0b5: +.Tuesday: disappear $7 appear $8 disappear $9 disappear $a return -UnknownScript_0x7c0be: +.Wednesday: disappear $7 disappear $8 appear $9 disappear $a return -UnknownScript_0x7c0c7: +.Thursday: disappear $7 appear $8 disappear $9 disappear $a return -UnknownScript_0x7c0d0: +.Friday: disappear $7 disappear $8 appear $9 disappear $a return -UnknownScript_0x7c0d9: +.Saturday: disappear $7 appear $8 disappear $9 @@ -103,23 +105,7 @@ UnknownScript_0x7c0d9: return TrainerSupernerdEric: - ; bit/flag number - dw EVENT_BEAT_SUPER_NERD_ERIC - - ; trainer group && trainer id - db SUPER_NERD, ERIC - - ; text when seen - dw SupernerdEricSeenText - - ; text when trainer beaten - dw SupernerdEricBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw SupernerdEricScript + trainer EVENT_BEAT_SUPER_NERD_ERIC, SUPER_NERD, ERIC, SupernerdEricSeenText, SupernerdEricBeatenText, $0000, SupernerdEricScript SupernerdEricScript: talkaftercancel @@ -130,23 +116,7 @@ SupernerdEricScript: end TrainerSupernerdTeru: - ; bit/flag number - dw EVENT_BEAT_SUPER_NERD_TERU - - ; trainer group && trainer id - db SUPER_NERD, TERU - - ; text when seen - dw SupernerdTeruSeenText - - ; text when trainer beaten - dw SupernerdTeruBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw SupernerdTeruScript + trainer EVENT_BEAT_SUPER_NERD_TERU, SUPER_NERD, TERU, SupernerdTeruSeenText, SupernerdTeruBeatenText, $0000, SupernerdTeruScript SupernerdTeruScript: talkaftercancel @@ -157,23 +127,7 @@ SupernerdTeruScript: end TrainerPokemaniacIssac: - ; bit/flag number - dw EVENT_BEAT_POKEMANIAC_ISSAC - - ; trainer group && trainer id - db POKEMANIAC, ISSAC - - ; text when seen - dw PokemaniacIssacSeenText - - ; text when trainer beaten - dw PokemaniacIssacBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw PokemaniacIssacScript + trainer EVENT_BEAT_POKEMANIAC_ISSAC, POKEMANIAC, ISSAC, PokemaniacIssacSeenText, PokemaniacIssacBeatenText, $0000, PokemaniacIssacScript PokemaniacIssacScript: talkaftercancel @@ -184,23 +138,7 @@ PokemaniacIssacScript: end TrainerPokemaniacDonald: - ; bit/flag number - dw EVENT_BEAT_POKEMANIAC_DONALD - - ; trainer group && trainer id - db POKEMANIAC, DONALD - - ; text when seen - dw PokemaniacDonaldSeenText - - ; text when trainer beaten - dw PokemaniacDonaldBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw PokemaniacDonaldScript + trainer EVENT_BEAT_POKEMANIAC_DONALD, POKEMANIAC, DONALD, PokemaniacDonaldSeenText, PokemaniacDonaldBeatenText, $0000, PokemaniacDonaldScript PokemaniacDonaldScript: talkaftercancel @@ -213,11 +151,11 @@ PokemaniacDonaldScript: GrannyScript_0x7c132: loadfont checkcode VAR_WEEKDAY - if_equal SUNDAY, UnknownScript_0x7c140 - if_equal SATURDAY, UnknownScript_0x7c140 - jump UnknownScript_0x7c300 + if_equal SUNDAY, .Open + if_equal SATURDAY, .Open + jump WarehouseEntranceScript_ShopClosed -UnknownScript_0x7c140: +.Open: pokemart $1, $0021 loadmovesprites end @@ -225,179 +163,179 @@ UnknownScript_0x7c140: GrampsScript_0x7c146: loadfont checkflag ENGINE_GOLDENROD_UNDERGROUND_MERCHANT_CLOSED - iftrue UnknownScript_0x7c300 + iftrue WarehouseEntranceScript_ShopClosed checkcode VAR_WEEKDAY - if_equal MONDAY, UnknownScript_0x7c156 - jump UnknownScript_0x7c300 + if_equal MONDAY, .CheckMorn + jump WarehouseEntranceScript_ShopClosed -UnknownScript_0x7c156: +.CheckMorn: checkmorn - iffalse UnknownScript_0x7c300 + iffalse WarehouseEntranceScript_ShopClosed pokemart $2, $0000 loadmovesprites end -SuperNerdScript_0x7c161: +OlderHaircutBrotherScript: loadfont checkcode VAR_WEEKDAY - if_equal TUESDAY, UnknownScript_0x7c173 - if_equal THURSDAY, UnknownScript_0x7c173 - if_equal SATURDAY, UnknownScript_0x7c173 - jump UnknownScript_0x7c300 + if_equal TUESDAY, .DoHaircut + if_equal THURSDAY, .DoHaircut + if_equal SATURDAY, .DoHaircut + jump WarehouseEntranceScript_ShopClosed -UnknownScript_0x7c173: +.DoHaircut: checkflag ENGINE_GOLDENROD_UNDERGROUND_GOT_HAIRCUT - iftrue UnknownScript_0x7c208 + iftrue .AlreadyGotHaircut special Function24ae8 writetext UnknownText_0x7c5f9 yesorno - iffalse UnknownScript_0x7c1fc + iffalse .Refused checkmoney $0, 500 - if_equal $2, UnknownScript_0x7c202 + if_equal $2, .NotEnoughMoney writetext UnknownText_0x7c69a keeptextopen special Function7413 - if_equal $0, UnknownScript_0x7c1fc - if_equal $1, UnknownScript_0x7c1fc + if_equal $0, .Refused + if_equal $1, .Refused setflag ENGINE_GOLDENROD_UNDERGROUND_GOT_HAIRCUT - if_equal $2, UnknownScript_0x7c1a9 - if_equal $3, UnknownScript_0x7c1b5 - jump UnknownScript_0x7c1c1 - -UnknownScript_0x7c1a9: - setevent EVENT_000 - clearevent EVENT_001 - clearevent EVENT_002 - jump UnknownScript_0x7c1cd - -UnknownScript_0x7c1b5: - clearevent EVENT_000 - setevent EVENT_001 - clearevent EVENT_002 - jump UnknownScript_0x7c1cd - -UnknownScript_0x7c1c1: - clearevent EVENT_000 - clearevent EVENT_001 - setevent EVENT_002 - jump UnknownScript_0x7c1cd - -UnknownScript_0x7c1cd: + if_equal $2, .two + if_equal $3, .three + jump .else + +.two: + setevent EVENT_GAVE_KURT_APRICORNS + clearevent EVENT_RECEIVED_BALLS_FROM_KURT + clearevent EVENT_DRAGON_SHRINE_QUESTION_2 + jump .then + +.three: + clearevent EVENT_GAVE_KURT_APRICORNS + setevent EVENT_RECEIVED_BALLS_FROM_KURT + clearevent EVENT_DRAGON_SHRINE_QUESTION_2 + jump .then + +.else: + clearevent EVENT_GAVE_KURT_APRICORNS + clearevent EVENT_RECEIVED_BALLS_FROM_KURT + setevent EVENT_DRAGON_SHRINE_QUESTION_2 + jump .then + +.then: takemoney $0, 500 special Function24ae8 writetext UnknownText_0x7c6b8 closetext loadmovesprites - special Function8c084 + special FadeBlackBGMap playmusic MUSIC_HEAL pause 60 - special Function8c079 + special FadeInBGMap special RestartMapMusic loadfont writetext UnknownText_0x7c6d8 closetext - checkevent EVENT_000 + checkevent EVENT_GAVE_KURT_APRICORNS iftrue UnknownScript_0x7c2bb - checkevent EVENT_001 + checkevent EVENT_RECEIVED_BALLS_FROM_KURT iftrue UnknownScript_0x7c2c4 jump UnknownScript_0x7c2cd -UnknownScript_0x7c1fc: +.Refused: writetext UnknownText_0x7c6ea closetext loadmovesprites end -UnknownScript_0x7c202: +.NotEnoughMoney: writetext UnknownText_0x7c709 closetext loadmovesprites end -UnknownScript_0x7c208: +.AlreadyGotHaircut: writetext UnknownText_0x7c72b closetext loadmovesprites end -SuperNerdScript_0x7c20e: +YoungerHaircutBrotherScript: loadfont checkcode VAR_WEEKDAY - if_equal SUNDAY, UnknownScript_0x7c220 - if_equal WEDNESDAY, UnknownScript_0x7c220 - if_equal FRIDAY, UnknownScript_0x7c220 - jump UnknownScript_0x7c300 + if_equal SUNDAY, .DoHaircut + if_equal WEDNESDAY, .DoHaircut + if_equal FRIDAY, .DoHaircut + jump WarehouseEntranceScript_ShopClosed -UnknownScript_0x7c220: +.DoHaircut: checkflag ENGINE_GOLDENROD_UNDERGROUND_GOT_HAIRCUT - iftrue UnknownScript_0x7c2b5 + iftrue .AlreadyGotHaircut special Function24ae8 writetext UnknownText_0x7c75c yesorno - iffalse UnknownScript_0x7c2a9 + iffalse .Refused checkmoney $0, 300 - if_equal $2, UnknownScript_0x7c2af + if_equal $2, .NotEnoughMoney writetext UnknownText_0x7c7f1 keeptextopen special Function7418 - if_equal $0, UnknownScript_0x7c2a9 - if_equal $1, UnknownScript_0x7c2a9 + if_equal $0, .Refused + if_equal $1, .Refused setflag ENGINE_GOLDENROD_UNDERGROUND_GOT_HAIRCUT - if_equal $2, UnknownScript_0x7c256 - if_equal $3, UnknownScript_0x7c262 - jump UnknownScript_0x7c26e - -UnknownScript_0x7c256: - setevent EVENT_000 - clearevent EVENT_001 - clearevent EVENT_002 - jump UnknownScript_0x7c27a - -UnknownScript_0x7c262: - clearevent EVENT_000 - setevent EVENT_001 - clearevent EVENT_002 - jump UnknownScript_0x7c27a - -UnknownScript_0x7c26e: - clearevent EVENT_000 - clearevent EVENT_001 - setevent EVENT_002 - jump UnknownScript_0x7c27a - -UnknownScript_0x7c27a: + if_equal $2, .two + if_equal $3, .three + jump .else + +.two: + setevent EVENT_GAVE_KURT_APRICORNS + clearevent EVENT_RECEIVED_BALLS_FROM_KURT + clearevent EVENT_DRAGON_SHRINE_QUESTION_2 + jump .then + +.three: + clearevent EVENT_GAVE_KURT_APRICORNS + setevent EVENT_RECEIVED_BALLS_FROM_KURT + clearevent EVENT_DRAGON_SHRINE_QUESTION_2 + jump .then + +.else: + clearevent EVENT_GAVE_KURT_APRICORNS + clearevent EVENT_RECEIVED_BALLS_FROM_KURT + setevent EVENT_DRAGON_SHRINE_QUESTION_2 + jump .then + +.then: takemoney $0, 300 special Function24ae8 writetext UnknownText_0x7c80e closetext loadmovesprites - special Function8c084 + special FadeBlackBGMap playmusic MUSIC_HEAL pause 60 - special Function8c079 + special FadeInBGMap special RestartMapMusic loadfont writetext UnknownText_0x7c82a closetext - checkevent EVENT_000 + checkevent EVENT_GAVE_KURT_APRICORNS iftrue UnknownScript_0x7c2bb - checkevent EVENT_001 + checkevent EVENT_RECEIVED_BALLS_FROM_KURT iftrue UnknownScript_0x7c2c4 jump UnknownScript_0x7c2cd -UnknownScript_0x7c2a9: +.Refused: writetext UnknownText_0x7c842 closetext loadmovesprites end -UnknownScript_0x7c2af: +.NotEnoughMoney: writetext UnknownText_0x7c85b closetext loadmovesprites end -UnknownScript_0x7c2b5: +.AlreadyGotHaircut: writetext UnknownText_0x7c87b closetext loadmovesprites @@ -424,18 +362,18 @@ UnknownScript_0x7c2cd: loadmovesprites end -MapWarehouseEntranceSignpost0Script:: +BasementDoorScript:: loadfont checkevent EVENT_USED_BASEMENT_KEY - iftrue UnknownScript_0x7c2fa + iftrue .Open checkitem BASEMENT_KEY - iftrue UnknownScript_0x7c2e8 + iftrue .Unlock writetext UnknownText_0x7c5b0 closetext loadmovesprites end -UnknownScript_0x7c2e8: +.Unlock: playsound SFX_TRANSACTION writetext UnknownText_0x7c5d6 closetext @@ -446,13 +384,13 @@ UnknownScript_0x7c2e8: setevent EVENT_USED_BASEMENT_KEY end -UnknownScript_0x7c2fa: +.Open: writetext UnknownText_0x7c5c3 closetext loadmovesprites end -UnknownScript_0x7c300: +WarehouseEntranceScript_ShopClosed: writetext UnknownText_0x7c904 closetext loadmovesprites @@ -465,18 +403,15 @@ MapWarehouseEntranceSignpost1Script: jumptext UnknownText_0x7c91a MapWarehouseEntranceSignpostItem2: - dw $008b - db PARLYZ_HEAL + dwb EVENT_WAREHOUSE_ENTRANCE_HIDDEN_PARLYZ_HEAL, PARLYZ_HEAL MapWarehouseEntranceSignpostItem3: - dw $008c - db SUPER_POTION + dwb EVENT_WAREHOUSE_ENTRANCE_HIDDEN_SUPER_POTION, SUPER_POTION MapWarehouseEntranceSignpostItem4: - dw $008d - db ANTIDOTE + dwb EVENT_WAREHOUSE_ENTRANCE_HIDDEN_ANTIDOTE, ANTIDOTE SupernerdEricSeenText: @@ -712,7 +647,7 @@ WarehouseEntrance_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 6 warp_def $2, $3, 7, GROUP_UNDERGROUND_PATH_SWITCH_ROOM_ENTRANCES, MAP_UNDERGROUND_PATH_SWITCH_ROOM_ENTRANCES warp_def $22, $3, 4, GROUP_UNDERGROUND_PATH_SWITCH_ROOM_ENTRANCES, MAP_UNDERGROUND_PATH_SWITCH_ROOM_ENTRANCES @@ -721,25 +656,25 @@ WarehouseEntrance_MapEventHeader: warp_def $1f, $16, 3, GROUP_WAREHOUSE_ENTRANCE, MAP_WAREHOUSE_ENTRANCE warp_def $1b, $16, 1, GROUP_UNDERGROUND_PATH_SWITCH_ROOM_ENTRANCES, MAP_UNDERGROUND_PATH_SWITCH_ROOM_ENTRANCES - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 5 - signpost 6, 18, $0, MapWarehouseEntranceSignpost0Script - signpost 6, 19, $0, MapWarehouseEntranceSignpost1Script - signpost 13, 6, $7, MapWarehouseEntranceSignpostItem2 - signpost 18, 4, $7, MapWarehouseEntranceSignpostItem3 - signpost 8, 17, $7, MapWarehouseEntranceSignpostItem4 + signpost 6, 18, SIGNPOST_READ, BasementDoorScript + signpost 6, 19, SIGNPOST_READ, MapWarehouseEntranceSignpost1Script + signpost 13, 6, SIGNPOST_ITEM, MapWarehouseEntranceSignpostItem2 + signpost 18, 4, SIGNPOST_ITEM, MapWarehouseEntranceSignpostItem3 + signpost 8, 17, SIGNPOST_ITEM, MapWarehouseEntranceSignpostItem4 - ; people-events +.PersonEvents: db 9 - person_event SPRITE_SUPER_NERD, 35, 9, $8, $0, 255, 255, $b2, 3, TrainerSupernerdEric, -1 - person_event SPRITE_SUPER_NERD, 13, 10, $7, $0, 255, 255, $b2, 2, TrainerSupernerdTeru, -1 - person_event SPRITE_SUPER_NERD, 31, 7, $a, $0, 255, 255, $92, 2, TrainerPokemaniacIssac, -1 - person_event SPRITE_SUPER_NERD, 10, 6, $9, $0, 255, 255, $92, 3, TrainerPokemaniacDonald, -1 - person_event SPRITE_POKE_BALL, 29, 11, $1, $0, 255, 255, $1, 0, ItemFragment_0x7c306, EVENT_672 - person_event SPRITE_GRAMPS, 15, 11, $8, $0, 255, 255, $b0, 0, GrampsScript_0x7c146, EVENT_753 - person_event SPRITE_SUPER_NERD, 18, 11, $8, $0, 255, 255, $90, 0, SuperNerdScript_0x7c161, EVENT_754 - person_event SPRITE_SUPER_NERD, 19, 11, $8, $0, 255, 255, $a0, 0, SuperNerdScript_0x7c20e, EVENT_755 - person_event SPRITE_GRANNY, 25, 11, $8, $0, 255, 255, $b0, 0, GrannyScript_0x7c132, EVENT_752 + person_event SPRITE_SUPER_NERD, 35, 9, OW_LEFT | $0, $0, -1, -1, (PAL_OW_BROWN << 4) | $82, 3, TrainerSupernerdEric, -1 + person_event SPRITE_SUPER_NERD, 13, 10, OW_UP | $3, $0, -1, -1, (PAL_OW_BROWN << 4) | $82, 2, TrainerSupernerdTeru, -1 + person_event SPRITE_SUPER_NERD, 31, 7, OW_LEFT | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 2, TrainerPokemaniacIssac, -1 + person_event SPRITE_SUPER_NERD, 10, 6, OW_LEFT | $1, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 3, TrainerPokemaniacDonald, -1 + person_event SPRITE_POKE_BALL, 29, 11, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x7c306, EVENT_WAREHOUSE_ENTRANCE_COIN_CASE + person_event SPRITE_GRAMPS, 15, 11, OW_LEFT | $0, $0, -1, -1, (PAL_OW_BROWN << 4) | $80, 0, GrampsScript_0x7c146, EVENT_WAREHOUSE_ENTRANCE_GRAMPS + person_event SPRITE_SUPER_NERD, 18, 11, OW_LEFT | $0, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, OlderHaircutBrotherScript, EVENT_WAREHOUSE_ENTRANCE_OLDER_HAIRCUT_BROTHER + person_event SPRITE_SUPER_NERD, 19, 11, OW_LEFT | $0, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, YoungerHaircutBrotherScript, EVENT_WAREHOUSE_ENTRANCE_YOUNGER_HAIRCUT_BROTHER + person_event SPRITE_GRANNY, 25, 11, OW_LEFT | $0, $0, -1, -1, (PAL_OW_BROWN << 4) | $80, 0, GrannyScript_0x7c132, EVENT_WAREHOUSE_ENTRANCE_GRANNY diff --git a/maps/WhirlIslandB1F.asm b/maps/WhirlIslandB1F.asm index 342b7e716..bfa027695 100644 --- a/maps/WhirlIslandB1F.asm +++ b/maps/WhirlIslandB1F.asm @@ -1,8 +1,8 @@ WhirlIslandB1F_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 ItemFragment_0x18c410: @@ -24,25 +24,22 @@ WhirlIslandB1FBoulder: jumpstd strengthboulder MapWhirlIslandB1FSignpostItem0: - dw $0097 - db RARE_CANDY + dwb EVENT_WHIRL_ISLAND_B1F_HIDDEN_RARE_CANDY, RARE_CANDY MapWhirlIslandB1FSignpostItem1: - dw $0098 - db ULTRA_BALL + dwb EVENT_WHIRL_ISLAND_B1F_HIDDEN_ULTRA_BALL, ULTRA_BALL MapWhirlIslandB1FSignpostItem2: - dw $0099 - db FULL_RESTORE + dwb EVENT_WHIRL_ISLAND_B1F_HIDDEN_FULL_RESTORE, FULL_RESTORE WhirlIslandB1F_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 9 warp_def $5, $5, 2, GROUP_WHIRL_ISLAND_NW, MAP_WHIRL_ISLAND_NW warp_def $3, $23, 2, GROUP_WHIRL_ISLAND_NE, MAP_WHIRL_ISLAND_NE @@ -54,20 +51,20 @@ WhirlIslandB1F_MapEventHeader: warp_def $1b, $d, 2, GROUP_WHIRL_ISLAND_B2F, MAP_WHIRL_ISLAND_B2F warp_def $15, $11, 1, GROUP_WHIRL_ISLAND_CAVE, MAP_WHIRL_ISLAND_CAVE - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 3 - signpost 4, 30, $7, MapWhirlIslandB1FSignpostItem0 - signpost 18, 36, $7, MapWhirlIslandB1FSignpostItem1 - signpost 23, 2, $7, MapWhirlIslandB1FSignpostItem2 + signpost 4, 30, SIGNPOST_ITEM, MapWhirlIslandB1FSignpostItem0 + signpost 18, 36, SIGNPOST_ITEM, MapWhirlIslandB1FSignpostItem1 + signpost 23, 2, SIGNPOST_ITEM, MapWhirlIslandB1FSignpostItem2 - ; people-events +.PersonEvents: db 6 - person_event SPRITE_POKE_BALL, 17, 11, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c410, EVENT_691 - person_event SPRITE_POKE_BALL, 22, 6, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c412, EVENT_692 - person_event SPRITE_POKE_BALL, 27, 37, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c414, EVENT_693 - person_event SPRITE_POKE_BALL, 12, 21, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c416, EVENT_694 - person_event SPRITE_POKE_BALL, 30, 23, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c418, EVENT_695 - person_event SPRITE_BOULDER, 30, 27, $19, $0, 255, 255, $0, 0, WhirlIslandB1FBoulder, -1 + person_event SPRITE_POKE_BALL, 17, 11, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x18c410, EVENT_WHIRL_ISLAND_B1F_FULL_RESTORE + person_event SPRITE_POKE_BALL, 22, 6, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x18c412, EVENT_WHIRL_ISLAND_B1F_CARBOS + person_event SPRITE_POKE_BALL, 27, 37, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x18c414, EVENT_WHIRL_ISLAND_B1F_CALCIUM + person_event SPRITE_POKE_BALL, 12, 21, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x18c416, EVENT_WHIRL_ISLAND_B1F_NUGGET + person_event SPRITE_POKE_BALL, 30, 23, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x18c418, EVENT_WHIRL_ISLAND_B1F_ESCAPE_ROPE + person_event SPRITE_BOULDER, 30, 27, OW_LEFT | $11, $0, -1, -1, $0, 0, WhirlIslandB1FBoulder, -1 diff --git a/maps/WhirlIslandB2F.asm b/maps/WhirlIslandB2F.asm index e8cbe7b26..87fd91dec 100644 --- a/maps/WhirlIslandB2F.asm +++ b/maps/WhirlIslandB2F.asm @@ -1,8 +1,8 @@ WhirlIslandB2F_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 ItemFragment_0x18c4b8: @@ -18,21 +18,21 @@ WhirlIslandB2F_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 4 warp_def $5, $b, 7, GROUP_WHIRL_ISLAND_B1F, MAP_WHIRL_ISLAND_B1F warp_def $b, $7, 8, GROUP_WHIRL_ISLAND_B1F, MAP_WHIRL_ISLAND_B1F warp_def $19, $7, 1, GROUP_WHIRL_ISLAND_LUGIA_CHAMBER, MAP_WHIRL_ISLAND_LUGIA_CHAMBER warp_def $1f, $d, 5, GROUP_WHIRL_ISLAND_SW, MAP_WHIRL_ISLAND_SW - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 3 - person_event SPRITE_POKE_BALL, 15, 14, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c4b8, EVENT_696 - person_event SPRITE_POKE_BALL, 8, 10, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c4ba, EVENT_697 - person_event SPRITE_POKE_BALL, 16, 9, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c4bc, EVENT_698 + person_event SPRITE_POKE_BALL, 15, 14, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x18c4b8, EVENT_WHIRL_ISLAND_B2F_FULL_RESTORE + person_event SPRITE_POKE_BALL, 8, 10, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x18c4ba, EVENT_WHIRL_ISLAND_B2F_MAX_REVIVE + person_event SPRITE_POKE_BALL, 16, 9, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x18c4bc, EVENT_WHIRL_ISLAND_B2F_MAX_ELIXER diff --git a/maps/WhirlIslandCave.asm b/maps/WhirlIslandCave.asm index 019c2ca28..af104ab9d 100644 --- a/maps/WhirlIslandCave.asm +++ b/maps/WhirlIslandCave.asm @@ -1,24 +1,24 @@ WhirlIslandCave_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 WhirlIslandCave_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $5, $7, 9, GROUP_WHIRL_ISLAND_B1F, MAP_WHIRL_ISLAND_B1F warp_def $d, $3, 4, GROUP_WHIRL_ISLAND_NW, MAP_WHIRL_ISLAND_NW - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 0 diff --git a/maps/WhirlIslandLugiaChamber.asm b/maps/WhirlIslandLugiaChamber.asm index ae55569e2..a1edf2f24 100644 --- a/maps/WhirlIslandLugiaChamber.asm +++ b/maps/WhirlIslandLugiaChamber.asm @@ -1,8 +1,8 @@ WhirlIslandLugiaChamber_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 1 ; callbacks @@ -47,16 +47,16 @@ WhirlIslandLugiaChamber_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 1 warp_def $d, $9, 3, GROUP_WHIRL_ISLAND_B2F, MAP_WHIRL_ISLAND_B2F - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 1 - person_event SPRITE_LUGIA, 9, 13, $16, $0, 255, 255, $90, 0, LugiaScript_0x18c518, EVENT_73D + person_event SPRITE_LUGIA, 9, 13, OW_UP | $12, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, LugiaScript_0x18c518, EVENT_WHIRL_ISLAND_LUGIA_CHAMBER_LUGIA diff --git a/maps/WhirlIslandNE.asm b/maps/WhirlIslandNE.asm index 18b838024..bc57e4957 100644 --- a/maps/WhirlIslandNE.asm +++ b/maps/WhirlIslandNE.asm @@ -1,8 +1,8 @@ WhirlIslandNE_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 ItemFragment_0x18c396: @@ -12,18 +12,18 @@ WhirlIslandNE_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 3 warp_def $d, $3, 2, GROUP_ROUTE_41, MAP_ROUTE_41 warp_def $3, $11, 2, GROUP_WHIRL_ISLAND_B1F, MAP_WHIRL_ISLAND_B1F warp_def $b, $d, 3, GROUP_WHIRL_ISLAND_B1F, MAP_WHIRL_ISLAND_B1F - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 1 - person_event SPRITE_POKE_BALL, 15, 15, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c396, EVENT_68F + person_event SPRITE_POKE_BALL, 15, 15, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x18c396, EVENT_WHIRL_ISLAND_NE_ULTRA_BALL diff --git a/maps/WhirlIslandNW.asm b/maps/WhirlIslandNW.asm index bf3526319..5a9da92be 100644 --- a/maps/WhirlIslandNW.asm +++ b/maps/WhirlIslandNW.asm @@ -1,26 +1,26 @@ WhirlIslandNW_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 WhirlIslandNW_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 4 warp_def $7, $5, 1, GROUP_ROUTE_41, MAP_ROUTE_41 warp_def $3, $5, 1, GROUP_WHIRL_ISLAND_B1F, MAP_WHIRL_ISLAND_B1F warp_def $f, $3, 4, GROUP_WHIRL_ISLAND_SW, MAP_WHIRL_ISLAND_SW warp_def $f, $7, 2, GROUP_WHIRL_ISLAND_CAVE, MAP_WHIRL_ISLAND_CAVE - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 0 diff --git a/maps/WhirlIslandSE.asm b/maps/WhirlIslandSE.asm index 99bdd5207..ebea7cafc 100644 --- a/maps/WhirlIslandSE.asm +++ b/maps/WhirlIslandSE.asm @@ -1,24 +1,24 @@ WhirlIslandSE_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 WhirlIslandSE_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $d, $5, 4, GROUP_ROUTE_41, MAP_ROUTE_41 warp_def $3, $5, 6, GROUP_WHIRL_ISLAND_B1F, MAP_WHIRL_ISLAND_B1F - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 0 diff --git a/maps/WhirlIslandSW.asm b/maps/WhirlIslandSW.asm index c270ff8f9..d93bf14ea 100644 --- a/maps/WhirlIslandSW.asm +++ b/maps/WhirlIslandSW.asm @@ -1,8 +1,8 @@ WhirlIslandSW_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 ItemFragment_0x18c3bc: @@ -12,7 +12,7 @@ WhirlIslandSW_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 5 warp_def $7, $5, 3, GROUP_ROUTE_41, MAP_ROUTE_41 warp_def $3, $11, 5, GROUP_WHIRL_ISLAND_B1F, MAP_WHIRL_ISLAND_B1F @@ -20,12 +20,12 @@ WhirlIslandSW_MapEventHeader: warp_def $f, $3, 3, GROUP_WHIRL_ISLAND_NW, MAP_WHIRL_ISLAND_NW warp_def $f, $11, 4, GROUP_WHIRL_ISLAND_B2F, MAP_WHIRL_ISLAND_B2F - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 1 - person_event SPRITE_POKE_BALL, 6, 19, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c3bc, EVENT_690 + person_event SPRITE_POKE_BALL, 6, 19, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x18c3bc, EVENT_WHIRL_ISLAND_SW_ULTRA_BALL diff --git a/maps/WillsRoom.asm b/maps/WillsRoom.asm index 646ee8545..2cde824e9 100644 --- a/maps/WillsRoom.asm +++ b/maps/WillsRoom.asm @@ -1,12 +1,12 @@ WillsRoom_MapScriptHeader: - ; trigger count +.MapTriggers: db 2 ; triggers dw UnknownScript_0x1804c6, $0000 dw UnknownScript_0x1804ca, $0000 - ; callback count +.MapCallbacks: db 1 ; callbacks @@ -21,7 +21,7 @@ UnknownScript_0x1804ca: end UnknownScript_0x1804cb: - checkevent EVENT_309 + checkevent EVENT_WILLS_ROOM_ENTRANCE_CLOSED iffalse UnknownScript_0x1804d5 changeblock $4, $e, $2a UnknownScript_0x1804d5: @@ -40,7 +40,7 @@ UnknownScript_0x1804e0: reloadmappart loadmovesprites dotrigger $1 - setevent EVENT_309 + setevent EVENT_WILLS_ROOM_ENTRANCE_CLOSED waitbutton end @@ -134,18 +134,18 @@ WillsRoom_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 3 warp_def $11, $5, 4, GROUP_INDIGO_PLATEAU_POKECENTER_1F, MAP_INDIGO_PLATEAU_POKECENTER_1F warp_def $2, $4, 1, GROUP_KOGAS_ROOM, MAP_KOGAS_ROOM warp_def $2, $5, 2, GROUP_KOGAS_ROOM, MAP_KOGAS_ROOM - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 1 - person_event SPRITE_WILL, 11, 9, $6, $0, 255, 255, $80, 0, WillScript_0x1804f8, -1 + person_event SPRITE_WILL, 11, 9, OW_UP | $2, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, WillScript_0x1804f8, -1 diff --git a/maps/WiseTriosRoom.asm b/maps/WiseTriosRoom.asm index e8dafe2d1..87524c1b4 100644 --- a/maps/WiseTriosRoom.asm +++ b/maps/WiseTriosRoom.asm @@ -1,12 +1,12 @@ WiseTriosRoom_MapScriptHeader: - ; trigger count +.MapTriggers: db 2 ; triggers dw UnknownScript_0x98572, $0000 dw UnknownScript_0x98573, $0000 - ; callback count +.MapCallbacks: db 1 ; callbacks @@ -26,18 +26,18 @@ UnknownScript_0x98574: iftrue UnknownScript_0x9858c checkitem CLEAR_BELL iftrue UnknownScript_0x9858c - clearevent EVENT_7AB - setevent EVENT_7AC + clearevent EVENT_WISE_TRIOS_ROOM_WISE_TRIO_1 + setevent EVENT_WISE_TRIOS_ROOM_WISE_TRIO_2 return UnknownScript_0x9858c: - setevent EVENT_7AB - clearevent EVENT_7AC + setevent EVENT_WISE_TRIOS_ROOM_WISE_TRIO_1 + clearevent EVENT_WISE_TRIOS_ROOM_WISE_TRIO_2 return UnknownScript_0x98593: - setevent EVENT_7AB - setevent EVENT_7AC + setevent EVENT_WISE_TRIOS_ROOM_WISE_TRIO_1 + setevent EVENT_WISE_TRIOS_ROOM_WISE_TRIO_2 return SageScript_0x9859a: @@ -52,7 +52,7 @@ SageScript_0x985a0: UnknownScript_0x985a3: spriteface $4, UP spriteface $0, DOWN - showemote $0, $4, 20 + showemote EMOTE_SHOCK, $4, 20 follow $0, $4 applymovement $0, MovementData_0x98622 stopfollow @@ -66,23 +66,7 @@ UnknownScript_0x985a3: end TrainerSageGaku: - ; bit/flag number - dw EVENT_BEAT_SAGE_GAKU - - ; trainer group && trainer id - db SAGE, GAKU - - ; text when seen - dw SageGakuSeenText - - ; text when trainer beaten - dw SageGakuBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw SageGakuScript + trainer EVENT_BEAT_SAGE_GAKU, SAGE, GAKU, SageGakuSeenText, SageGakuBeatenText, $0000, SageGakuScript SageGakuScript: loadfont @@ -92,23 +76,7 @@ SageGakuScript: end TrainerSageMasa: - ; bit/flag number - dw EVENT_BEAT_SAGE_MASA - - ; trainer group && trainer id - db SAGE, MASA - - ; text when seen - dw SageMasaSeenText - - ; text when trainer beaten - dw SageMasaBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw SageMasaScript + trainer EVENT_BEAT_SAGE_MASA, SAGE, MASA, SageMasaSeenText, SageMasaBeatenText, $0000, SageMasaScript SageMasaScript: loadfont @@ -118,29 +86,13 @@ SageMasaScript: end TrainerSageKoji: - ; bit/flag number - dw EVENT_BEAT_SAGE_KOJI - - ; trainer group && trainer id - db SAGE, KOJI - - ; text when seen - dw SageKojiSeenText - - ; text when trainer beaten - dw SageKojiBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw SageKojiScript + trainer EVENT_BEAT_SAGE_KOJI, SAGE, KOJI, SageKojiSeenText, SageKojiBeatenText, $0000, SageKojiScript SageKojiScript: checkevent EVENT_KOJI_ALLOWS_YOU_PASSAGE_TO_TIN_TOWER iftrue UnknownScript_0x9861b pause 10 - showemote $0, $7, 20 + showemote EMOTE_SHOCK, $7, 20 loadfont writetext UnknownText_0x98c6c keeptextopen @@ -393,24 +345,24 @@ WiseTriosRoom_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 3 warp_def $4, $7, 4, GROUP_ECRUTEAK_CITY, MAP_ECRUTEAK_CITY warp_def $5, $7, 5, GROUP_ECRUTEAK_CITY, MAP_ECRUTEAK_CITY warp_def $4, $1, 5, GROUP_ECRUTEAK_HOUSE, MAP_ECRUTEAK_HOUSE - ; xy triggers +.XYTriggers: db 1 xy_trigger 0, $4, $7, $0, UnknownScript_0x985a3, $0, $0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 6 - person_event SPRITE_SAGE, 6, 10, $3, $0, 255, 255, $0, 0, SageScript_0x9859a, EVENT_7AB - person_event SPRITE_SAGE, 11, 10, $5, $1, 255, 255, $0, 0, SageScript_0x9859d, EVENT_7AB - person_event SPRITE_SAGE, 9, 11, $8, $0, 255, 255, $0, 0, SageScript_0x985a0, EVENT_7AB - person_event SPRITE_SAGE, 6, 8, $6, $0, 255, 255, $2, 2, TrainerSageGaku, EVENT_7AC - person_event SPRITE_SAGE, 10, 8, $7, $0, 255, 255, $2, 2, TrainerSageMasa, EVENT_7AC - person_event SPRITE_SAGE, 8, 10, $8, $0, 255, 255, $2, 2, TrainerSageKoji, EVENT_7AC + person_event SPRITE_SAGE, 6, 10, OW_DOWN | $3, $0, -1, -1, $0, 0, SageScript_0x9859a, EVENT_WISE_TRIOS_ROOM_WISE_TRIO_1 + person_event SPRITE_SAGE, 11, 10, OW_UP | $1, $1, -1, -1, $0, 0, SageScript_0x9859d, EVENT_WISE_TRIOS_ROOM_WISE_TRIO_1 + person_event SPRITE_SAGE, 9, 11, OW_LEFT | $0, $0, -1, -1, $0, 0, SageScript_0x985a0, EVENT_WISE_TRIOS_ROOM_WISE_TRIO_1 + person_event SPRITE_SAGE, 6, 8, OW_UP | $2, $0, -1, -1, $2, 2, TrainerSageGaku, EVENT_WISE_TRIOS_ROOM_WISE_TRIO_2 + person_event SPRITE_SAGE, 10, 8, OW_UP | $3, $0, -1, -1, $2, 2, TrainerSageMasa, EVENT_WISE_TRIOS_ROOM_WISE_TRIO_2 + person_event SPRITE_SAGE, 8, 10, OW_LEFT | $0, $0, -1, -1, $2, 2, TrainerSageKoji, EVENT_WISE_TRIOS_ROOM_WISE_TRIO_2 diff --git a/maps/second_map_headers.asm b/maps/second_map_headers.asm index 26a3f02ca..1ba749409 100644 --- a/maps/second_map_headers.asm +++ b/maps/second_map_headers.asm @@ -456,7 +456,7 @@ map_header_2 GoldenrodPokeComCenter2FMobile, GOLDENROD_POKECOM_CENTER_2F_MOBILE, $0, NONE map_header_2 IlexForestAzaleaGate, ILEX_FOREST_AZALEA_GATE, $0, NONE map_header_2 Route34IlexForestGate, ROUTE_34_ILEX_FOREST_GATE, $0, NONE - map_header_2 DayCare, DAY_CARE, $0, NONE + map_header_2 DayCare, DAYCARE, $0, NONE map_header_2 VermilionHouseFishingSpeechHouse, VERMILION_HOUSE_FISHING_SPEECH_HOUSE, $0, NONE map_header_2 VermilionPokeCenter1F, VERMILION_POKECENTER_1F, $0, NONE map_header_2 VermilionPokeCenter2FBeta, VERMILION_POKECENTER_2F_BETA, $0, NONE |