From ed29db5841849345c5971a9b08681dfb6560c07d Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Thu, 29 Oct 2015 23:32:11 -0400 Subject: No more -bash000; engine/movement.asm, SPRITEMOVEFN --- maps/Colosseum.asm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'maps/Colosseum.asm') diff --git a/maps/Colosseum.asm b/maps/Colosseum.asm index c77512f7f..80028a76a 100644 --- a/maps/Colosseum.asm +++ b/maps/Colosseum.asm @@ -3,9 +3,9 @@ Colosseum_MapScriptHeader: db 3 ; triggers - dw .Trigger1, $0000 - dw .Trigger2, $0000 - dw .Trigger3, $0000 + dw .Trigger1, NONE + dw .Trigger2, NONE + dw .Trigger3, NONE .MapCallbacks: db 2 @@ -83,5 +83,5 @@ Colosseum_MapEventHeader: .PersonEvents: db 2 - person_event SPRITE_CHRIS, 4, 3, $9, 0, 0, -1, -1, 0, 0, 0, ChrisScript_0x193499, EVENT_GAVE_KURT_APRICORNS - person_event SPRITE_CHRIS, 4, 6, $8, 0, 0, -1, -1, 0, 0, 0, ChrisScript_0x193499, EVENT_RECEIVED_BALLS_FROM_KURT + person_event SPRITE_CHRIS, 4, 3, SPRITEMOVEFN_09, 0, 0, -1, -1, 0, 0, 0, ChrisScript_0x193499, EVENT_GAVE_KURT_APRICORNS + person_event SPRITE_CHRIS, 4, 6, SPRITEMOVEFN_08, 0, 0, -1, -1, 0, 0, 0, ChrisScript_0x193499, EVENT_RECEIVED_BALLS_FROM_KURT -- cgit v1.2.3 From fda1f7c01a9fb2944aeb42f2d2f19a766b2538e6 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sat, 31 Oct 2015 21:05:02 -0400 Subject: SPRITEMOVEDATA --- maps/Colosseum.asm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'maps/Colosseum.asm') diff --git a/maps/Colosseum.asm b/maps/Colosseum.asm index 80028a76a..48cb6f7ea 100644 --- a/maps/Colosseum.asm +++ b/maps/Colosseum.asm @@ -83,5 +83,5 @@ Colosseum_MapEventHeader: .PersonEvents: db 2 - person_event SPRITE_CHRIS, 4, 3, SPRITEMOVEFN_09, 0, 0, -1, -1, 0, 0, 0, ChrisScript_0x193499, EVENT_GAVE_KURT_APRICORNS - person_event SPRITE_CHRIS, 4, 6, SPRITEMOVEFN_08, 0, 0, -1, -1, 0, 0, 0, ChrisScript_0x193499, EVENT_RECEIVED_BALLS_FROM_KURT + person_event SPRITE_CHRIS, 4, 3, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, 0, 0, ChrisScript_0x193499, EVENT_GAVE_KURT_APRICORNS + person_event SPRITE_CHRIS, 4, 6, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, 0, 0, ChrisScript_0x193499, EVENT_RECEIVED_BALLS_FROM_KURT -- cgit v1.2.3 From 72af3337fd8746c51aac273b6c056209e73c7ae0 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 2 Nov 2015 14:37:02 -0500 Subject: No more NONE --- maps/Colosseum.asm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'maps/Colosseum.asm') diff --git a/maps/Colosseum.asm b/maps/Colosseum.asm index 48cb6f7ea..52feffa09 100644 --- a/maps/Colosseum.asm +++ b/maps/Colosseum.asm @@ -3,9 +3,9 @@ Colosseum_MapScriptHeader: db 3 ; triggers - dw .Trigger1, NONE - dw .Trigger2, NONE - dw .Trigger3, NONE + dw .Trigger1, 0 + dw .Trigger2, 0 + dw .Trigger3, 0 .MapCallbacks: db 2 -- cgit v1.2.3