diff options
Diffstat (limited to 'maps/OlivineLighthouse3F.asm')
| -rw-r--r-- | maps/OlivineLighthouse3F.asm | 128 |
1 files changed, 31 insertions, 97 deletions
diff --git a/maps/OlivineLighthouse3F.asm b/maps/OlivineLighthouse3F.asm index fd146ddb7..e3603d91b 100644 --- a/maps/OlivineLighthouse3F.asm +++ b/maps/OlivineLighthouse3F.asm @@ -1,118 +1,60 @@ -OlivineLighthouse3F_MapScriptHeader: ; 0x5b23b - ; trigger count +OlivineLighthouse3F_MapScriptHeader: +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 -; 0x5b23d -TrainerBird_keeperTheo: ; 0x5b23d - ; bit/flag number - dw $3fe +TrainerBird_keeperTheo: + trainer EVENT_BEAT_BIRD_KEEPER_THEO, BIRD_KEEPER, THEO, Bird_keeperTheoSeenText, Bird_keeperTheoBeatenText, $0000, Bird_keeperTheoScript - ; 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 -; 0x5b249 - -Bird_keeperTheoScript: ; 0x5b249 +Bird_keeperTheoScript: talkaftercancel loadfont writetext UnknownText_0x5b2df closetext loadmovesprites end -; 0x5b251 - -TrainerGentlemanPreston: ; 0x5b251 - ; bit/flag number - dw $49a - - ; trainer group && trainer id - db GENTLEMAN, PRESTON - - ; text when seen - dw GentlemanPrestonSeenText - ; text when trainer beaten - dw GentlemanPrestonBeatenText +TrainerGentlemanPreston: + trainer EVENT_BEAT_GENTLEMAN_PRESTON, GENTLEMAN, PRESTON, GentlemanPrestonSeenText, GentlemanPrestonBeatenText, $0000, GentlemanPrestonScript - ; script when lost - dw $0000 - - ; script when talk again - dw GentlemanPrestonScript -; 0x5b25d - -GentlemanPrestonScript: ; 0x5b25d +GentlemanPrestonScript: talkaftercancel loadfont writetext UnknownText_0x5b457 closetext loadmovesprites end -; 0x5b265 - -TrainerSailorTerrell: ; 0x5b265 - ; bit/flag number - dw $577 - - ; 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 -; 0x5b271 +TrainerSailorTerrell: + trainer EVENT_BEAT_SAILOR_TERRELL, SAILOR, TERRELL, SailorTerrellSeenText, SailorTerrellBeatenText, $0000, SailorTerrellScript -SailorTerrellScript: ; 0x5b271 +SailorTerrellScript: talkaftercancel loadfont writetext UnknownText_0x5b384 closetext loadmovesprites end -; 0x5b279 -ItemFragment_0x5b279: ; 0x5b279 +ItemFragment_0x5b279: db ETHER, 1 -; 0x5b27b -Bird_keeperTheoSeenText: ; 0x5b27b +Bird_keeperTheoSeenText: text "Why are you here?" line "Are you just going" para "to gawk? I suggest" line "that you leave!" done -; 0x5b2c4 -Bird_keeperTheoBeatenText: ; 0x5b2c4 +Bird_keeperTheoBeatenText: text "You really are" line "concerned…" done -; 0x5b2df -UnknownText_0x5b2df: ; 0x5b2df +UnknownText_0x5b2df: text "How the heck do" line "you go up?" @@ -122,22 +64,19 @@ UnknownText_0x5b2df: ; 0x5b2df para "but I can't get up" line "there…" done -; 0x5b333 -SailorTerrellSeenText: ; 0x5b333 +SailorTerrellSeenText: text "Sailors are both" line "kind and strong." cont "How about you?" done -; 0x5b365 -SailorTerrellBeatenText: ; 0x5b365 +SailorTerrellBeatenText: text "You are both kind" line "and strong…" done -; 0x5b384 -UnknownText_0x5b384: ; 0x5b384 +UnknownText_0x5b384: text "Every time I come" line "back to OLIVINE, I" cont "visit the GYM." @@ -148,34 +87,30 @@ UnknownText_0x5b384: ; 0x5b384 para "changed without me" line "noticing." done -; 0x5b3f4 -GentlemanPrestonSeenText: ; 0x5b3f4 +GentlemanPrestonSeenText: text "I travel the world" line "to train my #-" cont "MON. I wish to" cont "battle with you." done -; 0x5b437 -GentlemanPrestonBeatenText: ; 0x5b437 +GentlemanPrestonBeatenText: text "…sigh… I must" line "train some more…" done -; 0x5b457 -UnknownText_0x5b457: ; 0x5b457 +UnknownText_0x5b457: text "JASMINE used to" line "use rock #MON" cont "like ONIX." done -; 0x5b481 -OlivineLighthouse3F_MapEventHeader: ; 0x5b481 +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 @@ -187,16 +122,15 @@ OlivineLighthouse3F_MapEventHeader: ; 0x5b481 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, $ffff - person_event SPRITE_GENTLEMAN, 9, 17, $9, $0, 255, 255, $92, 4, TrainerGentlemanPreston, $ffff - person_event SPRITE_YOUNGSTER, 13, 7, $7, $0, 255, 255, $92, 3, TrainerBird_keeperTheo, $ffff - person_event SPRITE_POKE_BALL, 6, 12, $1, $0, 255, 255, $1, 0, ItemFragment_0x5b279, $0664 -; 0x5b4e8 + 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 |