diff options
Diffstat (limited to 'maps/OlivineLighthouse2F.asm')
| -rw-r--r-- | maps/OlivineLighthouse2F.asm | 197 |
1 files changed, 68 insertions, 129 deletions
diff --git a/maps/OlivineLighthouse2F.asm b/maps/OlivineLighthouse2F.asm index d8c6b1389..2fd90734b 100644 --- a/maps/OlivineLighthouse2F.asm +++ b/maps/OlivineLighthouse2F.asm @@ -1,243 +1,185 @@ -OlivineLighthouse2F_MapScriptHeader: ; 0x5af6f - ; trigger count +OlivineLighthouse2F_MapScriptHeader: +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 -; 0x5af71 -TrainerGentlemanAlfred: ; 0x5af71 - ; bit/flag number - dw $49e +TrainerGentlemanAlfred: + trainer EVENT_BEAT_GENTLEMAN_ALFRED, GENTLEMAN, ALFRED, GentlemanAlfredSeenText, GentlemanAlfredBeatenText, $0000, GentlemanAlfredScript - ; 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 -; 0x5af7d - -GentlemanAlfredScript: ; 0x5af7d +GentlemanAlfredScript: talkaftercancel loadfont writetext UnknownText_0x5b13e closetext loadmovesprites end -; 0x5af85 - -TrainerSailorHuey1: ; 0x5af85 - ; bit/flag number - dw $576 - - ; 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 -; 0x5af91 +TrainerSailorHuey1: + trainer EVENT_BEAT_SAILOR_HUEY, SAILOR, HUEY1, SailorHuey1SeenText, SailorHuey1BeatenText, $0000, SailorHuey1Script -SailorHuey1Script: ; 0x5af91 - writecode $17, $7 +SailorHuey1Script: + writecode VAR_CALLERID, PHONE_SAILOR_HUEY talkaftercancel loadfont - checkflag $0066 + checkflag ENGINE_HUEY iftrue UnknownScript_0x5afc7 - checkcellnum $7 + checkcellnum PHONE_SAILOR_HUEY iftrue UnknownScript_0x5b05f - checkevent $0263 + checkevent EVENT_HUEY_ASKED_FOR_PHONE_NUMBER iftrue UnknownScript_0x5afb0 - setevent $0263 + setevent EVENT_HUEY_ASKED_FOR_PHONE_NUMBER scall UnknownScript_0x5b053 jump UnknownScript_0x5afb3 -; 0x5afb0 -UnknownScript_0x5afb0: ; 0x5afb0 +UnknownScript_0x5afb0: scall UnknownScript_0x5b057 -UnknownScript_0x5afb3: ; 0x5afb3 - askforphonenumber $7 +UnknownScript_0x5afb3: + askforphonenumber PHONE_SAILOR_HUEY if_equal $1, UnknownScript_0x5b067 if_equal $2, UnknownScript_0x5b063 trainertotext SAILOR, HUEY1, $0 scall UnknownScript_0x5b05b jump UnknownScript_0x5b05f -; 0x5afc7 -UnknownScript_0x5afc7: ; 0x5afc7 +UnknownScript_0x5afc7: scall UnknownScript_0x5b06b winlosstext SailorHuey1BeatenText, $0000 - copybytetovar wd9f4 - if_equal $3, UnknownScript_0x5afe2 - if_equal $2, UnknownScript_0x5afe8 - if_equal $1, UnknownScript_0x5afee - if_equal $0, UnknownScript_0x5aff4 -UnknownScript_0x5afe2: ; 0x5afe2 + copybytetovar wHueyFightCount + if_equal 3, .Fight3 + if_equal 2, .Fight2 + if_equal 1, .Fight1 + if_equal 0, .LoadFight0 +.Fight3 checkevent EVENT_RESTORED_POWER_TO_KANTO - iftrue UnknownScript_0x5b01b -UnknownScript_0x5afe8: ; 0x5afe8 + iftrue .LoadFight3 +.Fight2 checkevent EVENT_BEAT_ELITE_FOUR - iftrue UnknownScript_0x5b00e -UnknownScript_0x5afee: ; 0x5afee + iftrue .LoadFight2 +.Fight1 checkevent EVENT_CLEARED_RADIO_TOWER - iftrue UnknownScript_0x5b001 -UnknownScript_0x5aff4: ; 0x5aff4 + iftrue .LoadFight1 +.LoadFight0 loadtrainer SAILOR, HUEY1 startbattle returnafterbattle - loadvar wd9f4, $1 - clearflag $0066 + loadvar wHueyFightCount, 1 + clearflag ENGINE_HUEY end -; 0x5b001 -UnknownScript_0x5b001: ; 0x5b001 +.LoadFight1 loadtrainer SAILOR, HUEY2 startbattle returnafterbattle - loadvar wd9f4, $2 - clearflag $0066 + loadvar wHueyFightCount, 2 + clearflag ENGINE_HUEY end -; 0x5b00e -UnknownScript_0x5b00e: ; 0x5b00e +.LoadFight2 loadtrainer SAILOR, HUEY3 startbattle returnafterbattle - loadvar wd9f4, $3 - clearflag $0066 + loadvar wHueyFightCount, 3 + clearflag ENGINE_HUEY end -; 0x5b01b -UnknownScript_0x5b01b: ; 0x5b01b +.LoadFight3 loadtrainer SAILOR, HUEY4 startbattle returnafterbattle - clearflag $0066 + clearflag ENGINE_HUEY checkevent EVENT_HUEY_PROTEIN iftrue UnknownScript_0x5b03f - checkevent $0265 + checkevent EVENT_GOT_PROTEIN_FROM_HUEY iftrue UnknownScript_0x5b03e scall UnknownScript_0x5b076 verbosegiveitem PROTEIN, 1 iffalse UnknownScript_0x5b06f - setevent $0265 + setevent EVENT_GOT_PROTEIN_FROM_HUEY jump UnknownScript_0x5b05f -; 0x5b03e -UnknownScript_0x5b03e: ; 0x5b03e +UnknownScript_0x5b03e: end -; 0x5b03f -UnknownScript_0x5b03f: ; 0x5b03f +UnknownScript_0x5b03f: loadfont writetext UnknownText_0x5b1b6 closetext verbosegiveitem PROTEIN, 1 iffalse UnknownScript_0x5b06f clearevent EVENT_HUEY_PROTEIN - setevent $0265 + setevent EVENT_GOT_PROTEIN_FROM_HUEY jump UnknownScript_0x5b05f -; 0x5b053 -UnknownScript_0x5b053: ; 0x5b053 +UnknownScript_0x5b053: jumpstd asknumber1m end -; 0x5b057 -UnknownScript_0x5b057: ; 0x5b057 +UnknownScript_0x5b057: jumpstd asknumber2m end -; 0x5b05b -UnknownScript_0x5b05b: ; 0x5b05b +UnknownScript_0x5b05b: jumpstd registerednumberm end -; 0x5b05f -UnknownScript_0x5b05f: ; 0x5b05f +UnknownScript_0x5b05f: jumpstd numberacceptedm end -; 0x5b063 -UnknownScript_0x5b063: ; 0x5b063 +UnknownScript_0x5b063: jumpstd numberdeclinedm end -; 0x5b067 -UnknownScript_0x5b067: ; 0x5b067 +UnknownScript_0x5b067: jumpstd phonefullm end -; 0x5b06b -UnknownScript_0x5b06b: ; 0x5b06b +UnknownScript_0x5b06b: jumpstd rematchm end -; 0x5b06f -UnknownScript_0x5b06f: ; 0x5b06f +UnknownScript_0x5b06f: setevent EVENT_HUEY_PROTEIN jumpstd packfullm end -; 0x5b076 -UnknownScript_0x5b076: ; 0x5b076 +UnknownScript_0x5b076: jumpstd rematchgiftm end -; 0x5b07a -SailorHuey1SeenText: ; 0x5b07a +SailorHuey1SeenText: text "Men of the sea are" line "always spoiling" cont "for a good fight!" done -; 0x5b0b0 -SailorHuey1BeatenText: ; 0x5b0b0 +SailorHuey1BeatenText: text "Urf!" line "I lose!" done -; 0x5b0be ; possibly unused -UnknownText_0x5b0be: ; 0x5b0be +UnknownText_0x5b0be: text "What power!" line "How would you like" para "to sail the seas" line "with me?" done -; 0x5b0f8 -GentlemanAlfredSeenText: ; 0x5b0f8 +GentlemanAlfredSeenText: text "Hm? This is no" line "place for playing." done -; 0x5b11b -GentlemanAlfredBeatenText: ; 0x5b11b +GentlemanAlfredBeatenText: text "Ah! I can see that" line "you're serious." done -; 0x5b13e -UnknownText_0x5b13e: ; 0x5b13e +UnknownText_0x5b13e: text "Up top is a #-" line "MON that keeps the" cont "LIGHTHOUSE lit." @@ -248,9 +190,8 @@ UnknownText_0x5b13e: ; 0x5b13e para "can't be cured by" line "ordinary medicine." done -; 0x5b1b6 -UnknownText_0x5b1b6: ; 0x5b1b6 +UnknownText_0x5b1b6: text "Man! You're as" line "tough as ever!" @@ -258,13 +199,12 @@ UnknownText_0x5b1b6: ; 0x5b1b6 line "that medicine from" cont "before." done -; 0x5b1fd -OlivineLighthouse2F_MapEventHeader: ; 0x5b1fd +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 @@ -273,14 +213,13 @@ OlivineLighthouse2F_MapEventHeader: ; 0x5b1fd 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, $ffff - person_event SPRITE_GENTLEMAN, 12, 21, $8, $0, 255, 255, $92, 3, TrainerGentlemanAlfred, $ffff -; 0x5b23b + 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 |