From 249bad9551b1c9c29fd64bc36486eb6612427c3b Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 13 Jul 2015 00:16:35 -0400 Subject: Replace EVENT_ALWAYS_THERE with -1 --- 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 0763577a6..6b3605435 100644 --- a/maps/Route32RuinsofAlphGate.asm +++ b/maps/Route32RuinsofAlphGate.asm @@ -60,6 +60,6 @@ Route32RuinsofAlphGate_MapEventHeader: ; people-events db 3 - person_event SPRITE_OFFICER, 6, 9, $6, $0, 255, 255, $80, 0, OfficerScript_0x69a2d, EVENT_ALWAYS_THERE - person_event SPRITE_POKEFAN_M, 6, 12, $4, $10, 255, 255, $b0, 0, PokefanMScript_0x69a30, EVENT_ALWAYS_THERE - person_event SPRITE_YOUNGSTER, 10, 5, $7, $0, 255, 255, $a0, 0, YoungsterScript_0x69a33, EVENT_ALWAYS_THERE + person_event SPRITE_OFFICER, 6, 9, $6, $0, 255, 255, $80, 0, OfficerScript_0x69a2d, -1 + person_event SPRITE_POKEFAN_M, 6, 12, $4, $10, 255, 255, $b0, 0, PokefanMScript_0x69a30, -1 + person_event SPRITE_YOUNGSTER, 10, 5, $7, $0, 255, 255, $a0, 0, YoungsterScript_0x69a33, -1 -- cgit v1.2.3 From 894955f9d922de5fc33e6c0aa7af9795dbcbc158 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Thu, 16 Jul 2015 18:10:10 -0400 Subject: Special script annotation, trainer constant enumeration, person-event structure update --- 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 6b3605435..5eb46b011 100644 --- a/maps/Route32RuinsofAlphGate.asm +++ b/maps/Route32RuinsofAlphGate.asm @@ -60,6 +60,6 @@ Route32RuinsofAlphGate_MapEventHeader: ; people-events db 3 - person_event SPRITE_OFFICER, 6, 9, $6, $0, 255, 255, $80, 0, OfficerScript_0x69a2d, -1 - person_event SPRITE_POKEFAN_M, 6, 12, $4, $10, 255, 255, $b0, 0, PokefanMScript_0x69a30, -1 - person_event SPRITE_YOUNGSTER, 10, 5, $7, $0, 255, 255, $a0, 0, YoungsterScript_0x69a33, -1 + person_event SPRITE_OFFICER, 6, 9, UP << 2 | $2, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, OfficerScript_0x69a2d, -1 + person_event SPRITE_POKEFAN_M, 6, 12, UP << 2 | $0, $10, -1, -1, (PAL_OW_BROWN << 4) | $80, 0, PokefanMScript_0x69a30, -1 + person_event SPRITE_YOUNGSTER, 10, 5, UP << 2 | $3, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, YoungsterScript_0x69a33, -1 -- cgit v1.2.3 From 94129b6b451fc7770ea75ffbdcbaab4967f513bd Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sun, 19 Jul 2015 04:58:31 -0400 Subject: Finished the decoration attributes table Interpretation of the Decoration Attributes table is complete. Other changes include some more event flag and function naming, as well as a minor tweak to the person_events of every map. --- 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 5eb46b011..37533abe9 100644 --- a/maps/Route32RuinsofAlphGate.asm +++ b/maps/Route32RuinsofAlphGate.asm @@ -60,6 +60,6 @@ Route32RuinsofAlphGate_MapEventHeader: ; people-events db 3 - person_event SPRITE_OFFICER, 6, 9, UP << 2 | $2, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, OfficerScript_0x69a2d, -1 - person_event SPRITE_POKEFAN_M, 6, 12, UP << 2 | $0, $10, -1, -1, (PAL_OW_BROWN << 4) | $80, 0, PokefanMScript_0x69a30, -1 - person_event SPRITE_YOUNGSTER, 10, 5, UP << 2 | $3, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, YoungsterScript_0x69a33, -1 + 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 -- cgit v1.2.3 From 5631bdc0d7f90d5036b71489883d787715983d41 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Tue, 21 Jul 2015 00:02:21 -0400 Subject: Added labels to different parts of the map script and event headers --- maps/Route32RuinsofAlphGate.asm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'maps/Route32RuinsofAlphGate.asm') diff --git a/maps/Route32RuinsofAlphGate.asm b/maps/Route32RuinsofAlphGate.asm index 37533abe9..57ffd34bd 100644 --- a/maps/Route32RuinsofAlphGate.asm +++ b/maps/Route32RuinsofAlphGate.asm @@ -1,8 +1,8 @@ Route32RuinsofAlphGate_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 OfficerScript_0x69a2d: @@ -45,20 +45,20 @@ Route32RuinsofAlphGate_MapEventHeader: ; filler db 0, 0 - ; warps +.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 - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.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 -- cgit v1.2.3