No more -bash000; engine/movement.asm, SPRITEMOVEFN
This commit is contained in:
@@ -47,7 +47,7 @@ GrowlitheScript_0x5ebb2:
|
||||
end
|
||||
|
||||
TrainerGruntM10:
|
||||
trainer EVENT_BEAT_ROCKET_GRUNTM_10, GRUNTM, 10, GruntM10SeenText, GruntM10BeatenText, $0000, GruntM10Script
|
||||
trainer EVENT_BEAT_ROCKET_GRUNTM_10, GRUNTM, 10, GruntM10SeenText, GruntM10BeatenText, NONE, GruntM10Script
|
||||
|
||||
GruntM10Script:
|
||||
talkaftercancel
|
||||
@@ -58,7 +58,7 @@ GruntM10Script:
|
||||
end
|
||||
|
||||
TrainerExecutivem2:
|
||||
trainer EVENT_BEAT_ROCKET_EXECUTIVEM_2, EXECUTIVEM, 2, Executivem2SeenText, Executivem2BeatenText, $0000, Executivem2Script
|
||||
trainer EVENT_BEAT_ROCKET_EXECUTIVEM_2, EXECUTIVEM, 2, Executivem2SeenText, Executivem2BeatenText, NONE, Executivem2Script
|
||||
|
||||
Executivem2Script:
|
||||
talkaftercancel
|
||||
@@ -69,7 +69,7 @@ Executivem2Script:
|
||||
end
|
||||
|
||||
TrainerGruntF4:
|
||||
trainer EVENT_BEAT_ROCKET_GRUNTF_4, GRUNTF, 4, GruntF4SeenText, GruntF4BeatenText, $0000, GruntF4Script
|
||||
trainer EVENT_BEAT_ROCKET_GRUNTF_4, GRUNTF, 4, GruntF4SeenText, GruntF4BeatenText, NONE, GruntF4Script
|
||||
|
||||
GruntF4Script:
|
||||
talkaftercancel
|
||||
@@ -80,7 +80,7 @@ GruntF4Script:
|
||||
end
|
||||
|
||||
TrainerScientistRich:
|
||||
trainer EVENT_BEAT_SCIENTIST_RICH, SCIENTIST, RICH, ScientistRichSeenText, ScientistRichBeatenText, $0000, ScientistRichScript
|
||||
trainer EVENT_BEAT_SCIENTIST_RICH, SCIENTIST, RICH, ScientistRichSeenText, ScientistRichBeatenText, NONE, ScientistRichScript
|
||||
|
||||
ScientistRichScript:
|
||||
talkaftercancel
|
||||
@@ -257,10 +257,10 @@ RadioTower4F_MapEventHeader:
|
||||
|
||||
.PersonEvents:
|
||||
db 7
|
||||
person_event SPRITE_FISHER, 4, 6, $7, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, FisherScript_0x5eb82, EVENT_RADIO_TOWER_CIVILIANS_AFTER
|
||||
person_event SPRITE_TEACHER, 6, 14, $3, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, TeacherScript_0x5eb85, -1
|
||||
person_event SPRITE_GROWLITHE, 7, 12, $16, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, GrowlitheScript_0x5ebb2, -1
|
||||
person_event SPRITE_ROCKET, 6, 5, $1f, 0, 0, -1, -1, 0, 2, 3, TrainerGruntM10, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
|
||||
person_event SPRITE_ROCKET, 1, 14, $8, 0, 2, -1, -1, 0, 2, 2, TrainerExecutivem2, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
|
||||
person_event SPRITE_ROCKET_GIRL, 4, 12, $9, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 1, TrainerGruntF4, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
|
||||
person_event SPRITE_SCIENTIST, 2, 4, $8, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 4, TrainerScientistRich, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
|
||||
person_event SPRITE_FISHER, 4, 6, SPRITEMOVEFN_07, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, FisherScript_0x5eb82, EVENT_RADIO_TOWER_CIVILIANS_AFTER
|
||||
person_event SPRITE_TEACHER, 6, 14, SPRITEMOVEFN_03, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 0, 0, TeacherScript_0x5eb85, -1
|
||||
person_event SPRITE_GROWLITHE, 7, 12, SPRITEMOVEFN_16, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 0, 0, GrowlitheScript_0x5ebb2, -1
|
||||
person_event SPRITE_ROCKET, 6, 5, SPRITEMOVEFN_1F, 0, 0, -1, -1, 0, 2, 3, TrainerGruntM10, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
|
||||
person_event SPRITE_ROCKET, 1, 14, SPRITEMOVEFN_08, 0, 2, -1, -1, 0, 2, 2, TrainerExecutivem2, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
|
||||
person_event SPRITE_ROCKET_GIRL, 4, 12, SPRITEMOVEFN_09, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 1, TrainerGruntF4, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
|
||||
person_event SPRITE_SCIENTIST, 2, 4, SPRITEMOVEFN_08, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 4, TrainerScientistRich, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
|
||||
|
Reference in New Issue
Block a user