No more -bash000; engine/movement.asm, SPRITEMOVEFN

This commit is contained in:
PikalaxALT
2015-10-29 23:32:11 -04:00
parent 0d17d4a758
commit ed29db5841
387 changed files with 2831 additions and 2830 deletions

View File

@@ -3,8 +3,8 @@ MahoganyMart1F_MapScriptHeader:
db 2
; triggers
dw UnknownScript_0x6c356, $0000
dw UnknownScript_0x6c357, $0000
dw UnknownScript_0x6c356, NONE
dw UnknownScript_0x6c357, NONE
.MapCallbacks:
db 1
@@ -236,8 +236,8 @@ MahoganyMart1F_MapEventHeader:
.PersonEvents:
db 5
person_event SPRITE_PHARMACIST, 3, 4, $6, 0, 0, -1, -1, 0, 0, 0, PharmacistScript_0x6c367, EVENT_TEAM_ROCKET_BASE_POPULATION
person_event SPRITE_BLACK_BELT, 6, 1, $3, 0, 0, -1, -1, 0, 0, 0, BlackBeltScript_0x6c37b, EVENT_TEAM_ROCKET_BASE_POPULATION
person_event SPRITE_LANCE, 6, 4, $8, 0, 0, -1, -1, 0, 0, 0, ObjectEvent, EVENT_MAHOGANY_MART_LANCE_AND_DRAGONITE
person_event SPRITE_DRAGON, 6, 3, $8, 0, 0, -1, -1, 0, 0, 0, ObjectEvent, EVENT_MAHOGANY_MART_LANCE_AND_DRAGONITE
person_event SPRITE_GRANNY, 3, 1, $9, 0, 0, -1, -1, 0, 0, 0, GrannyScript_0x6c3ee, EVENT_MAHOGANY_MART_OWNERS
person_event SPRITE_PHARMACIST, 3, 4, SPRITEMOVEFN_06, 0, 0, -1, -1, 0, 0, 0, PharmacistScript_0x6c367, EVENT_TEAM_ROCKET_BASE_POPULATION
person_event SPRITE_BLACK_BELT, 6, 1, SPRITEMOVEFN_03, 0, 0, -1, -1, 0, 0, 0, BlackBeltScript_0x6c37b, EVENT_TEAM_ROCKET_BASE_POPULATION
person_event SPRITE_LANCE, 6, 4, SPRITEMOVEFN_08, 0, 0, -1, -1, 0, 0, 0, ObjectEvent, EVENT_MAHOGANY_MART_LANCE_AND_DRAGONITE
person_event SPRITE_DRAGON, 6, 3, SPRITEMOVEFN_08, 0, 0, -1, -1, 0, 0, 0, ObjectEvent, EVENT_MAHOGANY_MART_LANCE_AND_DRAGONITE
person_event SPRITE_GRANNY, 3, 1, SPRITEMOVEFN_09, 0, 0, -1, -1, 0, 0, 0, GrannyScript_0x6c3ee, EVENT_MAHOGANY_MART_OWNERS