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/Route36RuinsofAlphgate.asm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'maps/Route36RuinsofAlphgate.asm') diff --git a/maps/Route36RuinsofAlphgate.asm b/maps/Route36RuinsofAlphgate.asm index 4854e7f8b..b5b4d1c03 100644 --- a/maps/Route36RuinsofAlphgate.asm +++ b/maps/Route36RuinsofAlphgate.asm @@ -36,10 +36,10 @@ Route36RuinsofAlphgate_MapEventHeader: .Warps: db 4 - warp_def $0, $4, 3, GROUP_ROUTE_36, MAP_ROUTE_36 - warp_def $0, $5, 4, GROUP_ROUTE_36, MAP_ROUTE_36 - warp_def $7, $4, 9, GROUP_RUINS_OF_ALPH_OUTSIDE, MAP_RUINS_OF_ALPH_OUTSIDE - warp_def $7, $5, 9, GROUP_RUINS_OF_ALPH_OUTSIDE, MAP_RUINS_OF_ALPH_OUTSIDE + warp_def $0, $4, 3, ROUTE_36 + warp_def $0, $5, 4, ROUTE_36 + warp_def $7, $4, 9, RUINS_OF_ALPH_OUTSIDE + warp_def $7, $5, 9, RUINS_OF_ALPH_OUTSIDE .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/Route36RuinsofAlphgate.asm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'maps/Route36RuinsofAlphgate.asm') diff --git a/maps/Route36RuinsofAlphgate.asm b/maps/Route36RuinsofAlphgate.asm index b5b4d1c03..3338c8284 100644 --- a/maps/Route36RuinsofAlphgate.asm +++ b/maps/Route36RuinsofAlphgate.asm @@ -49,5 +49,5 @@ Route36RuinsofAlphgate_MapEventHeader: .PersonEvents: db 2 - person_event SPRITE_OFFICER, 8, 4, OW_LEFT | $1, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, OfficerScript_0x6aa1a, -1 - person_event SPRITE_GRAMPS, 9, 11, OW_DOWN | $2, $21, -1, -1, (PAL_OW_BROWN << 4) | $80, 0, GrampsScript_0x6aa1d, -1 + person_event SPRITE_OFFICER, 8, 4, $9, 0, 0, -1, -1, (PAL_OW_RED << 4) | $80, 0, OfficerScript_0x6aa1a, -1 + person_event SPRITE_GRAMPS, 9, 11, $2, 2, 1, -1, -1, (PAL_OW_BROWN << 4) | $80, 0, GrampsScript_0x6aa1d, -1 -- 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/Route36RuinsofAlphgate.asm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'maps/Route36RuinsofAlphgate.asm') diff --git a/maps/Route36RuinsofAlphgate.asm b/maps/Route36RuinsofAlphgate.asm index 3338c8284..3b9e461ca 100644 --- a/maps/Route36RuinsofAlphgate.asm +++ b/maps/Route36RuinsofAlphgate.asm @@ -49,5 +49,5 @@ Route36RuinsofAlphgate_MapEventHeader: .PersonEvents: db 2 - person_event SPRITE_OFFICER, 8, 4, $9, 0, 0, -1, -1, (PAL_OW_RED << 4) | $80, 0, OfficerScript_0x6aa1a, -1 - person_event SPRITE_GRAMPS, 9, 11, $2, 2, 1, -1, -1, (PAL_OW_BROWN << 4) | $80, 0, GrampsScript_0x6aa1d, -1 + person_event SPRITE_OFFICER, 8, 4, $9, 0, 0, -1, -1, 8 + PAL_OW_RED, 0, 0, OfficerScript_0x6aa1a, -1 + person_event SPRITE_GRAMPS, 9, 11, $2, 2, 1, -1, -1, 8 + PAL_OW_BROWN, 0, 0, GrampsScript_0x6aa1d, -1 -- cgit v1.2.3