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/RuinsofAlphInnerChamber.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/RuinsofAlphInnerChamber.asm')
| -rw-r--r-- | maps/RuinsofAlphInnerChamber.asm | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/maps/RuinsofAlphInnerChamber.asm b/maps/RuinsofAlphInnerChamber.asm index 311714c86..3219ae048 100644 --- a/maps/RuinsofAlphInnerChamber.asm +++ b/maps/RuinsofAlphInnerChamber.asm @@ -81,15 +81,15 @@ RuinsofAlphInnerChamber_MapEventHeader: .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 - warp_def $f, $4, 4, GROUP_RUINS_OF_ALPH_HO_OH_CHAMBER, MAP_RUINS_OF_ALPH_HO_OH_CHAMBER - warp_def $3, $f, 3, GROUP_RUINS_OF_ALPH_KABUTO_CHAMBER, MAP_RUINS_OF_ALPH_KABUTO_CHAMBER - warp_def $3, $10, 4, GROUP_RUINS_OF_ALPH_KABUTO_CHAMBER, MAP_RUINS_OF_ALPH_KABUTO_CHAMBER - warp_def $15, $3, 3, GROUP_RUINS_OF_ALPH_OMANYTE_CHAMBER, MAP_RUINS_OF_ALPH_OMANYTE_CHAMBER - warp_def $15, $4, 4, GROUP_RUINS_OF_ALPH_OMANYTE_CHAMBER, MAP_RUINS_OF_ALPH_OMANYTE_CHAMBER - 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 + warp_def $d, $a, 5, RUINS_OF_ALPH_OUTSIDE + warp_def $f, $3, 3, RUINS_OF_ALPH_HO_OH_CHAMBER + warp_def $f, $4, 4, RUINS_OF_ALPH_HO_OH_CHAMBER + warp_def $3, $f, 3, RUINS_OF_ALPH_KABUTO_CHAMBER + warp_def $3, $10, 4, RUINS_OF_ALPH_KABUTO_CHAMBER + warp_def $15, $3, 3, RUINS_OF_ALPH_OMANYTE_CHAMBER + warp_def $15, $4, 4, RUINS_OF_ALPH_OMANYTE_CHAMBER + warp_def $18, $f, 3, RUINS_OF_ALPH_AERODACTYL_CHAMBER + warp_def $18, $10, 4, RUINS_OF_ALPH_AERODACTYL_CHAMBER .XYTriggers: db 0 @@ -125,6 +125,6 @@ RuinsofAlphInnerChamber_MapEventHeader: .PersonEvents: db 3 - 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 + person_event SPRITE_FISHER, 11, 7, $3, 0, 0, -1, -1, 8 + PAL_OW_GREEN, 0, 0, FisherScript_0x58f7d, EVENT_RUINS_OF_ALPH_INNER_CHAMBER_TOURISTS + person_event SPRITE_TEACHER, 17, 18, $2, 1, 1, -1, -1, 0, 0, 0, TeacherScript_0x58f80, EVENT_RUINS_OF_ALPH_INNER_CHAMBER_TOURISTS + person_event SPRITE_GRAMPS, 23, 15, $7, 0, 0, -1, -1, 8 + PAL_OW_BROWN, 0, 0, GrampsScript_0x58f83, EVENT_RUINS_OF_ALPH_INNER_CHAMBER_TOURISTS |