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/Route32RuinsofAlphGate.asm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'maps/Route32RuinsofAlphGate.asm') diff --git a/maps/Route32RuinsofAlphGate.asm b/maps/Route32RuinsofAlphGate.asm index 57ffd34bd..db9ebad45 100644 --- a/maps/Route32RuinsofAlphGate.asm +++ b/maps/Route32RuinsofAlphGate.asm @@ -47,10 +47,10 @@ Route32RuinsofAlphGate_MapEventHeader: .Warps: db 4 - warp_def $4, $0, 10, GROUP_RUINS_OF_ALPH_OUTSIDE, MAP_RUINS_OF_ALPH_OUTSIDE - warp_def $5, $0, 11, GROUP_RUINS_OF_ALPH_OUTSIDE, MAP_RUINS_OF_ALPH_OUTSIDE - warp_def $4, $9, 2, GROUP_ROUTE_32, MAP_ROUTE_32 - warp_def $5, $9, 3, GROUP_ROUTE_32, MAP_ROUTE_32 + warp_def $4, $0, 10, RUINS_OF_ALPH_OUTSIDE + warp_def $5, $0, 11, RUINS_OF_ALPH_OUTSIDE + warp_def $4, $9, 2, ROUTE_32 + warp_def $5, $9, 3, ROUTE_32 .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/Route32RuinsofAlphGate.asm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'maps/Route32RuinsofAlphGate.asm') diff --git a/maps/Route32RuinsofAlphGate.asm b/maps/Route32RuinsofAlphGate.asm index db9ebad45..a12a294d9 100644 --- a/maps/Route32RuinsofAlphGate.asm +++ b/maps/Route32RuinsofAlphGate.asm @@ -60,6 +60,6 @@ Route32RuinsofAlphGate_MapEventHeader: .PersonEvents: db 3 - person_event SPRITE_OFFICER, 6, 9, OW_UP | $2, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, OfficerScript_0x69a2d, -1 - person_event SPRITE_POKEFAN_M, 6, 12, OW_UP | $0, $10, -1, -1, (PAL_OW_BROWN << 4) | $80, 0, PokefanMScript_0x69a30, -1 - person_event SPRITE_YOUNGSTER, 10, 5, OW_UP | $3, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, YoungsterScript_0x69a33, -1 + person_event SPRITE_OFFICER, 6, 9, $6, 0, 0, -1, -1, (PAL_OW_RED << 4) | $80, 0, OfficerScript_0x69a2d, -1 + person_event SPRITE_POKEFAN_M, 6, 12, $4, 1, 0, -1, -1, (PAL_OW_BROWN << 4) | $80, 0, PokefanMScript_0x69a30, -1 + person_event SPRITE_YOUNGSTER, 10, 5, $7, 0, 0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, YoungsterScript_0x69a33, -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/Route32RuinsofAlphGate.asm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'maps/Route32RuinsofAlphGate.asm') diff --git a/maps/Route32RuinsofAlphGate.asm b/maps/Route32RuinsofAlphGate.asm index a12a294d9..371489b25 100644 --- a/maps/Route32RuinsofAlphGate.asm +++ b/maps/Route32RuinsofAlphGate.asm @@ -60,6 +60,6 @@ Route32RuinsofAlphGate_MapEventHeader: .PersonEvents: db 3 - person_event SPRITE_OFFICER, 6, 9, $6, 0, 0, -1, -1, (PAL_OW_RED << 4) | $80, 0, OfficerScript_0x69a2d, -1 - person_event SPRITE_POKEFAN_M, 6, 12, $4, 1, 0, -1, -1, (PAL_OW_BROWN << 4) | $80, 0, PokefanMScript_0x69a30, -1 - person_event SPRITE_YOUNGSTER, 10, 5, $7, 0, 0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, YoungsterScript_0x69a33, -1 + person_event SPRITE_OFFICER, 6, 9, $6, 0, 0, -1, -1, 8 + PAL_OW_RED, 0, 0, OfficerScript_0x69a2d, -1 + person_event SPRITE_POKEFAN_M, 6, 12, $4, 1, 0, -1, -1, 8 + PAL_OW_BROWN, 0, 0, PokefanMScript_0x69a30, -1 + person_event SPRITE_YOUNGSTER, 10, 5, $7, 0, 0, -1, -1, 8 + PAL_OW_GREEN, 0, 0, YoungsterScript_0x69a33, -1 -- cgit v1.2.3