Future/pokecrystal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

42
maps/Route35.asm
View File

@@ -6,7 +6,7 @@ Route35_MapScriptHeader:
db 0
TrainerBird_keeperBryan:
trainer EVENT_BEAT_BIRD_KEEPER_BRYAN, BIRD_KEEPER, BRYAN, Bird_keeperBryanSeenText, Bird_keeperBryanBeatenText, $0000, Bird_keeperBryanScript
trainer EVENT_BEAT_BIRD_KEEPER_BRYAN, BIRD_KEEPER, BRYAN, Bird_keeperBryanSeenText, Bird_keeperBryanBeatenText, NONE, Bird_keeperBryanScript
Bird_keeperBryanScript:
talkaftercancel
@@ -17,7 +17,7 @@ Bird_keeperBryanScript:
end
TrainerJugglerIrwin:
trainer EVENT_BEAT_JUGGLER_IRWIN, JUGGLER, IRWIN1, JugglerIrwin1SeenText, JugglerIrwin1BeatenText, $0000, JugglerIrwin1Script
trainer EVENT_BEAT_JUGGLER_IRWIN, JUGGLER, IRWIN1, JugglerIrwin1SeenText, JugglerIrwin1BeatenText, NONE, JugglerIrwin1Script
JugglerIrwin1Script:
writecode VAR_CALLERID, PHONE_JUGGLER_IRWIN
@@ -72,7 +72,7 @@ UnknownScript_0x19c91b:
end
TrainerCamperIvan:
trainer EVENT_BEAT_CAMPER_IVAN, CAMPER, IVAN, CamperIvanSeenText, CamperIvanBeatenText, $0000, CamperIvanScript
trainer EVENT_BEAT_CAMPER_IVAN, CAMPER, IVAN, CamperIvanSeenText, CamperIvanBeatenText, NONE, CamperIvanScript
CamperIvanScript:
talkaftercancel
@@ -83,7 +83,7 @@ CamperIvanScript:
end
TrainerCamperElliot:
trainer EVENT_BEAT_CAMPER_ELLIOT, CAMPER, ELLIOT, CamperElliotSeenText, CamperElliotBeatenText, $0000, CamperElliotScript
trainer EVENT_BEAT_CAMPER_ELLIOT, CAMPER, ELLIOT, CamperElliotSeenText, CamperElliotBeatenText, NONE, CamperElliotScript
CamperElliotScript:
talkaftercancel
@@ -94,7 +94,7 @@ CamperElliotScript:
end
TrainerPicnickerBrooke:
trainer EVENT_BEAT_PICNICKER_BROOKE, PICNICKER, BROOKE, PicnickerBrookeSeenText, PicnickerBrookeBeatenText, $0000, PicnickerBrookeScript
trainer EVENT_BEAT_PICNICKER_BROOKE, PICNICKER, BROOKE, PicnickerBrookeSeenText, PicnickerBrookeBeatenText, NONE, PicnickerBrookeScript
PicnickerBrookeScript:
talkaftercancel
@@ -105,7 +105,7 @@ PicnickerBrookeScript:
end
TrainerPicnickerKim:
trainer EVENT_BEAT_PICNICKER_KIM, PICNICKER, KIM, PicnickerKimSeenText, PicnickerKimBeatenText, $0000, PicnickerKimScript
trainer EVENT_BEAT_PICNICKER_KIM, PICNICKER, KIM, PicnickerKimSeenText, PicnickerKimBeatenText, NONE, PicnickerKimScript
PicnickerKimScript:
talkaftercancel
@@ -116,7 +116,7 @@ PicnickerKimScript:
end
TrainerBug_catcherArnie1:
trainer EVENT_BEAT_BUG_CATCHER_ARNIE, BUG_CATCHER, ARNIE1, Bug_catcherArnie1SeenText, Bug_catcherArnie1BeatenText, $0000, Bug_catcherArnie1Script
trainer EVENT_BEAT_BUG_CATCHER_ARNIE, BUG_CATCHER, ARNIE1, Bug_catcherArnie1SeenText, Bug_catcherArnie1BeatenText, NONE, Bug_catcherArnie1Script
Bug_catcherArnie1Script:
writecode VAR_CALLERID, PHONE_BUG_CATCHER_ARNIE
@@ -148,7 +148,7 @@ UnknownScript_0x19c9a7:
UnknownScript_0x19c9bb:
scall UnknownScript_0x19c91b
winlosstext Bug_catcherArnie1BeatenText, $0000
winlosstext Bug_catcherArnie1BeatenText, NONE
copybytetovar wArnieFightCount
if_equal 4, .Fight4
if_equal 3, .Fight3
@@ -213,7 +213,7 @@ UnknownScript_0x19ca2f:
end
TrainerFirebreatherWalt:
trainer EVENT_BEAT_FIREBREATHER_WALT, FIREBREATHER, WALT, FirebreatherWaltSeenText, FirebreatherWaltBeatenText, $0000, FirebreatherWaltScript
trainer EVENT_BEAT_FIREBREATHER_WALT, FIREBREATHER, WALT, FirebreatherWaltSeenText, FirebreatherWaltBeatenText, NONE, FirebreatherWaltScript
FirebreatherWaltScript:
talkaftercancel
@@ -234,7 +234,7 @@ OfficerScript_0x19ca49:
writetext UnknownText_0x19ceea
closetext
loadmovesprites
winlosstext UnknownText_0x19cf06, $0000
winlosstext UnknownText_0x19cf06, NONE
loadtrainer OFFICER, DIRK
startbattle
returnafterbattle
@@ -469,14 +469,14 @@ Route35_MapEventHeader:
.PersonEvents:
db 11
person_event SPRITE_YOUNGSTER, 19, 4, $a, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 2, 2, TrainerCamperIvan, -1
person_event SPRITE_YOUNGSTER, 20, 8, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 2, 3, TrainerCamperElliot, -1
person_event SPRITE_LASS, 20, 7, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 2, 3, TrainerPicnickerBrooke, -1
person_event SPRITE_LASS, 26, 10, $a, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 2, 1, TrainerPicnickerKim, -1
person_event SPRITE_YOUNGSTER, 28, 14, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 0, TrainerBird_keeperBryan, -1
person_event SPRITE_FISHER, 10, 2, $1e, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 2, TrainerFirebreatherWalt, -1
person_event SPRITE_BUG_CATCHER, 7, 16, $6, 0, 2, -1, -1, (1 << 3) | PAL_OW_BROWN, 2, 3, TrainerBug_catcherArnie1, -1
person_event SPRITE_SUPER_NERD, 10, 5, $a, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 2, TrainerJugglerIrwin, -1
person_event SPRITE_OFFICER, 6, 5, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, OfficerScript_0x19ca49, -1
person_event SPRITE_FRUIT_TREE, 25, 2, $1, 0, 0, -1, -1, 0, 0, 0, FruitTreeScript_0x19ca7e, -1
person_event SPRITE_POKE_BALL, 16, 13, $1, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x19ca7c, EVENT_ROUTE_35_TM_ROLLOUT
person_event SPRITE_YOUNGSTER, 19, 4, SPRITEMOVEFN_0A, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 2, 2, TrainerCamperIvan, -1
person_event SPRITE_YOUNGSTER, 20, 8, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 2, 3, TrainerCamperElliot, -1
person_event SPRITE_LASS, 20, 7, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 2, 3, TrainerPicnickerBrooke, -1
person_event SPRITE_LASS, 26, 10, SPRITEMOVEFN_0A, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, 2, 1, TrainerPicnickerKim, -1
person_event SPRITE_YOUNGSTER, 28, 14, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 0, TrainerBird_keeperBryan, -1
person_event SPRITE_FISHER, 10, 2, SPRITEMOVEFN_1E, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, 2, 2, TrainerFirebreatherWalt, -1
person_event SPRITE_BUG_CATCHER, 7, 16, SPRITEMOVEFN_06, 0, 2, -1, -1, (1 << 3) | PAL_OW_BROWN, 2, 3, TrainerBug_catcherArnie1, -1
person_event SPRITE_SUPER_NERD, 10, 5, SPRITEMOVEFN_0A, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 2, TrainerJugglerIrwin, -1
person_event SPRITE_OFFICER, 6, 5, SPRITEMOVEFN_06, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 0, 0, OfficerScript_0x19ca49, -1
person_event SPRITE_FRUIT_TREE, 25, 2, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 0, 0, FruitTreeScript_0x19ca7e, -1
person_event SPRITE_POKE_BALL, 16, 13, SPRITEMOVEFN_01, 0, 0, -1, -1, 0, 1, 0, ItemFragment_0x19ca7c, EVENT_ROUTE_35_TM_ROLLOUT