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/VictoryRoadGate.asm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'maps/VictoryRoadGate.asm') diff --git a/maps/VictoryRoadGate.asm b/maps/VictoryRoadGate.asm index 8562ccf31..6fc084313 100644 --- a/maps/VictoryRoadGate.asm +++ b/maps/VictoryRoadGate.asm @@ -3,8 +3,8 @@ VictoryRoadGate_MapScriptHeader: db 2 ; triggers - dw UnknownScript_0x9b9fb, $0000 - dw UnknownScript_0x9b9fc, $0000 + dw UnknownScript_0x9b9fb, NONE + dw UnknownScript_0x9b9fc, NONE .MapCallbacks: db 0 @@ -118,6 +118,6 @@ VictoryRoadGate_MapEventHeader: .PersonEvents: db 3 - person_event SPRITE_OFFICER, 11, 8, $9, 0, 0, -1, -1, 0, 0, 0, OfficerScript_0x9ba03, -1 - person_event SPRITE_BLACK_BELT, 5, 7, $9, 0, 0, -1, -1, 0, 0, 0, BlackBeltScript_0x9ba21, EVENT_OPENED_MT_SILVER - person_event SPRITE_BLACK_BELT, 5, 12, $8, 0, 0, -1, -1, 0, 0, 0, BlackBeltScript_0x9ba24, EVENT_FOUGHT_SNORLAX + person_event SPRITE_OFFICER, 11, 8, SPRITEMOVEFN_09, 0, 0, -1, -1, 0, 0, 0, OfficerScript_0x9ba03, -1 + person_event SPRITE_BLACK_BELT, 5, 7, SPRITEMOVEFN_09, 0, 0, -1, -1, 0, 0, 0, BlackBeltScript_0x9ba21, EVENT_OPENED_MT_SILVER + person_event SPRITE_BLACK_BELT, 5, 12, SPRITEMOVEFN_08, 0, 0, -1, -1, 0, 0, 0, BlackBeltScript_0x9ba24, EVENT_FOUGHT_SNORLAX -- 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/VictoryRoadGate.asm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'maps/VictoryRoadGate.asm') diff --git a/maps/VictoryRoadGate.asm b/maps/VictoryRoadGate.asm index 6fc084313..26bc2925b 100644 --- a/maps/VictoryRoadGate.asm +++ b/maps/VictoryRoadGate.asm @@ -118,6 +118,6 @@ VictoryRoadGate_MapEventHeader: .PersonEvents: db 3 - person_event SPRITE_OFFICER, 11, 8, SPRITEMOVEFN_09, 0, 0, -1, -1, 0, 0, 0, OfficerScript_0x9ba03, -1 - person_event SPRITE_BLACK_BELT, 5, 7, SPRITEMOVEFN_09, 0, 0, -1, -1, 0, 0, 0, BlackBeltScript_0x9ba21, EVENT_OPENED_MT_SILVER - person_event SPRITE_BLACK_BELT, 5, 12, SPRITEMOVEFN_08, 0, 0, -1, -1, 0, 0, 0, BlackBeltScript_0x9ba24, EVENT_FOUGHT_SNORLAX + person_event SPRITE_OFFICER, 11, 8, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, 0, 0, OfficerScript_0x9ba03, -1 + person_event SPRITE_BLACK_BELT, 5, 7, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, 0, 0, BlackBeltScript_0x9ba21, EVENT_OPENED_MT_SILVER + person_event SPRITE_BLACK_BELT, 5, 12, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, 0, 0, BlackBeltScript_0x9ba24, EVENT_FOUGHT_SNORLAX -- 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/VictoryRoadGate.asm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'maps/VictoryRoadGate.asm') diff --git a/maps/VictoryRoadGate.asm b/maps/VictoryRoadGate.asm index 26bc2925b..62c6ace9b 100644 --- a/maps/VictoryRoadGate.asm +++ b/maps/VictoryRoadGate.asm @@ -3,8 +3,8 @@ VictoryRoadGate_MapScriptHeader: db 2 ; triggers - dw UnknownScript_0x9b9fb, NONE - dw UnknownScript_0x9b9fc, NONE + dw UnknownScript_0x9b9fb, 0 + dw UnknownScript_0x9b9fc, 0 .MapCallbacks: db 0 -- cgit v1.2.3