From 432df825d4039a44a49fff01ef843395ab5abb3d Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Thu, 23 Jul 2015 12:59:19 -0400 Subject: Replaced GROUP_, MAP_ references with the map macro Updated macros that rely on the GROUP_, MAP_ constants to use the map macro Added GROUP_NONE and MAP_NONE for the sake of compatibility with this new scheme Added new macro elevfloor to simplify the definition of elevators under this new scheme --- maps/RuinsofAlphInnerChamber.asm | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'maps/RuinsofAlphInnerChamber.asm') diff --git a/maps/RuinsofAlphInnerChamber.asm b/maps/RuinsofAlphInnerChamber.asm index 311714c86..1cb326e31 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 -- cgit v1.2.3 From 895e14cd05c95859820b4bae6b8ee0b6b3603f50 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Wed, 29 Jul 2015 18:22:23 -0400 Subject: Reworked person_event arguments --- maps/RuinsofAlphInnerChamber.asm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'maps/RuinsofAlphInnerChamber.asm') diff --git a/maps/RuinsofAlphInnerChamber.asm b/maps/RuinsofAlphInnerChamber.asm index 1cb326e31..23b576e35 100644 --- a/maps/RuinsofAlphInnerChamber.asm +++ b/maps/RuinsofAlphInnerChamber.asm @@ -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, (PAL_OW_GREEN << 4) | $80, 0, FisherScript_0x58f7d, EVENT_RUINS_OF_ALPH_INNER_CHAMBER_TOURISTS + person_event SPRITE_TEACHER, 17, 18, $2, 1, 1, -1, -1, $0, 0, TeacherScript_0x58f80, EVENT_RUINS_OF_ALPH_INNER_CHAMBER_TOURISTS + person_event SPRITE_GRAMPS, 23, 15, $7, 0, 0, -1, -1, (PAL_OW_BROWN << 4) | $80, 0, GrampsScript_0x58f83, EVENT_RUINS_OF_ALPH_INNER_CHAMBER_TOURISTS -- cgit v1.2.3 From aa27080e29e04dadb9986cd4f1f73579a3b01e96 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Fri, 31 Jul 2015 15:02:32 -0400 Subject: Split fourth-to-last byte of person_event into nybble arguments --- maps/RuinsofAlphInnerChamber.asm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'maps/RuinsofAlphInnerChamber.asm') diff --git a/maps/RuinsofAlphInnerChamber.asm b/maps/RuinsofAlphInnerChamber.asm index 23b576e35..3219ae048 100644 --- a/maps/RuinsofAlphInnerChamber.asm +++ b/maps/RuinsofAlphInnerChamber.asm @@ -125,6 +125,6 @@ RuinsofAlphInnerChamber_MapEventHeader: .PersonEvents: db 3 - person_event SPRITE_FISHER, 11, 7, $3, 0, 0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, FisherScript_0x58f7d, EVENT_RUINS_OF_ALPH_INNER_CHAMBER_TOURISTS - person_event SPRITE_TEACHER, 17, 18, $2, 1, 1, -1, -1, $0, 0, TeacherScript_0x58f80, EVENT_RUINS_OF_ALPH_INNER_CHAMBER_TOURISTS - person_event SPRITE_GRAMPS, 23, 15, $7, 0, 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 -- cgit v1.2.3