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/BattleTowerHallway.asm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'maps/BattleTowerHallway.asm') diff --git a/maps/BattleTowerHallway.asm b/maps/BattleTowerHallway.asm index 6e917f1d0..b68971451 100644 --- a/maps/BattleTowerHallway.asm +++ b/maps/BattleTowerHallway.asm @@ -96,4 +96,4 @@ BattleTowerHallway_MapEventHeader: ; people-events db 1 - person_event SPRITE_RECEPTIONIST, 6, 15, $6, $0, 255, 255, $0, 0, BattleTowerHallway_MapEventHeader, EVENT_ALWAYS_THERE + person_event SPRITE_RECEPTIONIST, 6, 15, $6, $0, 255, 255, $0, 0, BattleTowerHallway_MapEventHeader, -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/BattleTowerHallway.asm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'maps/BattleTowerHallway.asm') diff --git a/maps/BattleTowerHallway.asm b/maps/BattleTowerHallway.asm index b68971451..48d656895 100644 --- a/maps/BattleTowerHallway.asm +++ b/maps/BattleTowerHallway.asm @@ -96,4 +96,4 @@ BattleTowerHallway_MapEventHeader: ; people-events db 1 - person_event SPRITE_RECEPTIONIST, 6, 15, $6, $0, 255, 255, $0, 0, BattleTowerHallway_MapEventHeader, -1 + person_event SPRITE_RECEPTIONIST, 6, 15, UP << 2 | $2, $0, -1, -1, $0, 0, BattleTowerHallway_MapEventHeader, -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/BattleTowerHallway.asm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'maps/BattleTowerHallway.asm') diff --git a/maps/BattleTowerHallway.asm b/maps/BattleTowerHallway.asm index 48d656895..f4f73b3c8 100644 --- a/maps/BattleTowerHallway.asm +++ b/maps/BattleTowerHallway.asm @@ -96,4 +96,4 @@ BattleTowerHallway_MapEventHeader: ; people-events db 1 - person_event SPRITE_RECEPTIONIST, 6, 15, UP << 2 | $2, $0, -1, -1, $0, 0, BattleTowerHallway_MapEventHeader, -1 + person_event SPRITE_RECEPTIONIST, 6, 15, OW_UP | $2, $0, -1, -1, $0, 0, BattleTowerHallway_MapEventHeader, -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/BattleTowerHallway.asm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'maps/BattleTowerHallway.asm') diff --git a/maps/BattleTowerHallway.asm b/maps/BattleTowerHallway.asm index f4f73b3c8..311f8cc0f 100644 --- a/maps/BattleTowerHallway.asm +++ b/maps/BattleTowerHallway.asm @@ -1,12 +1,12 @@ BattleTowerHallway_MapScriptHeader: - ; trigger count +.MapTriggers: db 2 ; triggers dw UnknownScript_0x9f5bb, $0000 dw UnknownScript_0x9f5c0, $0000 - ; callback count +.MapCallbacks: db 0 UnknownScript_0x9f5bb: @@ -79,7 +79,7 @@ BattleTowerHallway_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 6 warp_def $1, $b, 1, GROUP_BATTLE_TOWER_ELEVATOR, MAP_BATTLE_TOWER_ELEVATOR warp_def $0, $5, 1, GROUP_BATTLE_TOWER_BATTLE_ROOM, MAP_BATTLE_TOWER_BATTLE_ROOM @@ -88,12 +88,12 @@ BattleTowerHallway_MapEventHeader: warp_def $0, $d, 1, GROUP_BATTLE_TOWER_BATTLE_ROOM, MAP_BATTLE_TOWER_BATTLE_ROOM warp_def $0, $f, 1, GROUP_BATTLE_TOWER_BATTLE_ROOM, MAP_BATTLE_TOWER_BATTLE_ROOM - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 1 person_event SPRITE_RECEPTIONIST, 6, 15, OW_UP | $2, $0, -1, -1, $0, 0, BattleTowerHallway_MapEventHeader, -1 -- cgit v1.2.3