diff options
| author | yenatch <yenatch@gmail.com> | 2015-08-17 11:58:57 -0400 |
|---|---|---|
| committer | yenatch <yenatch@gmail.com> | 2015-08-17 11:58:57 -0400 |
| commit | 3cd79c55a3e1b50c8a71ad76692342e52382c700 (patch) | |
| tree | 32a9feb55a0eadc24c4690cef4fd0d26b2032f00 /maps/RuinsofAlphOutside.asm | |
| parent | 9974a2c7014cbe7db3d0e516580fea48001ab3df (diff) | |
| parent | 4831b4429eab57f56cce4736b6930a54f07314f7 (diff) | |
Merge pull request #309 from PikalaxALT/master
Wild data, save functions, fix missing include
Diffstat (limited to 'maps/RuinsofAlphOutside.asm')
| -rw-r--r-- | maps/RuinsofAlphOutside.asm | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/maps/RuinsofAlphOutside.asm b/maps/RuinsofAlphOutside.asm index d6a56e346..1c1d3376d 100644 --- a/maps/RuinsofAlphOutside.asm +++ b/maps/RuinsofAlphOutside.asm @@ -64,7 +64,7 @@ UnknownScript_0x58044: disappear $3 stopfollow applymovement PLAYER, MovementData_0x580c5 - domaptrigger GROUP_RUINS_OF_ALPH_RESEARCH_CENTER, MAP_RUINS_OF_ALPH_RESEARCH_CENTER, $1 + domaptrigger RUINS_OF_ALPH_RESEARCH_CENTER, $1 warpcheck end @@ -286,17 +286,17 @@ RuinsofAlphOutside_MapEventHeader: .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 - warp_def $1d, $2, 1, GROUP_RUINS_OF_ALPH_OMANYTE_CHAMBER, MAP_RUINS_OF_ALPH_OMANYTE_CHAMBER - warp_def $21, $10, 1, GROUP_RUINS_OF_ALPH_AERODACTYL_CHAMBER, MAP_RUINS_OF_ALPH_AERODACTYL_CHAMBER - warp_def $d, $a, 1, GROUP_RUINS_OF_ALPH_INNER_CHAMBER, MAP_RUINS_OF_ALPH_INNER_CHAMBER - warp_def $b, $11, 1, GROUP_RUINS_OF_ALPH_RESEARCH_CENTER, MAP_RUINS_OF_ALPH_RESEARCH_CENTER - warp_def $13, $6, 1, GROUP_UNION_CAVE_B1F, MAP_UNION_CAVE_B1F - warp_def $1b, $6, 2, GROUP_UNION_CAVE_B1F, MAP_UNION_CAVE_B1F - warp_def $5, $7, 3, GROUP_ROUTE_36_RUINS_OF_ALPH_GATE, MAP_ROUTE_36_RUINS_OF_ALPH_GATE - 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 + warp_def $11, $2, 1, RUINS_OF_ALPH_HO_OH_CHAMBER + warp_def $7, $e, 1, RUINS_OF_ALPH_KABUTO_CHAMBER + warp_def $1d, $2, 1, RUINS_OF_ALPH_OMANYTE_CHAMBER + warp_def $21, $10, 1, RUINS_OF_ALPH_AERODACTYL_CHAMBER + warp_def $d, $a, 1, RUINS_OF_ALPH_INNER_CHAMBER + warp_def $b, $11, 1, RUINS_OF_ALPH_RESEARCH_CENTER + warp_def $13, $6, 1, UNION_CAVE_B1F + warp_def $1b, $6, 2, UNION_CAVE_B1F + warp_def $5, $7, 3, ROUTE_36_RUINS_OF_ALPH_GATE + warp_def $14, $d, 1, ROUTE_32_RUINS_OF_ALPH_GATE + warp_def $15, $d, 2, ROUTE_32_RUINS_OF_ALPH_GATE .XYTriggers: db 2 @@ -311,8 +311,8 @@ RuinsofAlphOutside_MapEventHeader: .PersonEvents: db 5 - 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 + person_event SPRITE_YOUNGSTER, 24, 8, $6, 0, 0, -1, -1, 0, 2, 1, TrainerPsychicNathan, -1 + person_event SPRITE_SCIENTIST, 19, 15, $7, 0, 0, -1, -1, 0, 0, 0, ScientistScript_0x58043, EVENT_RUINS_OF_ALPH_OUTSIDE_SCIENTIST + person_event SPRITE_FISHER, 21, 17, $3, 0, 0, -1, -1, 8 + PAL_OW_GREEN, 0, 0, FisherScript_0x58061, EVENT_RUINS_OF_ALPH_OUTSIDE_TOURIST_FISHER + person_event SPRITE_YOUNGSTER, 15, 18, $2, 1, 1, -1, -1, 8 + PAL_OW_BROWN, 0, 0, YoungsterScript_0x58076, EVENT_RUINS_OF_ALPH_OUTSIDE_TOURIST_YOUNGSTERS + person_event SPRITE_YOUNGSTER, 12, 16, $7, 0, 0, -1, -1, 8 + PAL_OW_RED, 0, 0, YoungsterScript_0x5807e, EVENT_RUINS_OF_ALPH_OUTSIDE_TOURIST_YOUNGSTERS |