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

Trainer data structure and field move functions

Browse Source 
Trainer data in map scripts is now a macro-defined structure.

Field move functions in main.asm are now nearly completely annotated, with local references.

Trailing white space deleted.
This commit is contained in:
PikalaxALT
2015-07-18 23:45:39 -04:00
parent e674869018
commit 60cd04b023
116 changed files with 2148 additions and 8705 deletions
Download Patch File Download Diff File Expand all files Collapse all files

120
maps/Route43.asm
View File

@@ -20,23 +20,7 @@ UnknownScript_0x19d05c:
return
TrainerCamperSpencer:
; bit/flag number
dw EVENT_BEAT_CAMPER_SPENCER
; trainer group && trainer id
db CAMPER, SPENCER
; text when seen
dw CamperSpencerSeenText
; text when trainer beaten
dw CamperSpencerBeatenText
; script when lost
dw $0000
; script when talk again
dw CamperSpencerScript
trainer EVENT_BEAT_CAMPER_SPENCER, CAMPER, SPENCER, CamperSpencerSeenText, CamperSpencerBeatenText, $0000, CamperSpencerScript
CamperSpencerScript:
talkaftercancel
@@ -47,23 +31,7 @@ CamperSpencerScript:
end
TrainerPokemaniacBen:
; bit/flag number
dw EVENT_BEAT_POKEMANIAC_BEN
; trainer group && trainer id
db POKEMANIAC, BEN
; text when seen
dw PokemaniacBenSeenText
; text when trainer beaten
dw PokemaniacBenBeatenText
; script when lost
dw $0000
; script when talk again
dw PokemaniacBenScript
trainer EVENT_BEAT_POKEMANIAC_BEN, POKEMANIAC, BEN, PokemaniacBenSeenText, PokemaniacBenBeatenText, $0000, PokemaniacBenScript
PokemaniacBenScript:
talkaftercancel
@@ -74,31 +42,15 @@ PokemaniacBenScript:
end
TrainerPokemaniacBrent1:
; bit/flag number
dw EVENT_BEAT_POKEMANIAC_BRENT
; trainer group && trainer id
db POKEMANIAC, BRENT1
; text when seen
dw PokemaniacBrent1SeenText
; text when trainer beaten
dw PokemaniacBrent1BeatenText
; script when lost
dw $0000
; script when talk again
dw PokemaniacBrent1Script
trainer EVENT_BEAT_POKEMANIAC_BRENT, POKEMANIAC, BRENT1, PokemaniacBrent1SeenText, PokemaniacBrent1BeatenText, $0000, PokemaniacBrent1Script
PokemaniacBrent1Script:
writecode VAR_CALLERID, $1e
writecode VAR_CALLERID, PHONE_POKEMANIAC_BRENT
talkaftercancel
loadfont
checkflag ENGINE_BRENT
iftrue UnknownScript_0x19d0cf
checkcellnum $1e
checkcellnum PHONE_POKEMANIAC_BRENT
iftrue UnknownScript_0x19d138
checkevent EVENT_BRENT_ASKED_FOR_PHONE_NUMBER
iftrue UnknownScript_0x19d0b8
@@ -111,7 +63,7 @@ PokemaniacBrent1Script:
UnknownScript_0x19d0b8:
scall UnknownScript_0x19d130
UnknownScript_0x19d0bb:
askforphonenumber $1e
askforphonenumber PHONE_POKEMANIAC_BRENT
if_equal $1, UnknownScript_0x19d140
if_equal $2, UnknownScript_0x19d13c
trainertotext POKEMANIAC, BRENT1, $0
@@ -195,23 +147,7 @@ UnknownScript_0x19d144:
end
TrainerPokemaniacRon:
; bit/flag number
dw EVENT_BEAT_POKEMANIAC_RON
; trainer group && trainer id
db POKEMANIAC, RON
; text when seen
dw PokemaniacRonSeenText
; text when trainer beaten
dw PokemaniacRonBeatenText
; script when lost
dw $0000
; script when talk again
dw PokemaniacRonScript
trainer EVENT_BEAT_POKEMANIAC_RON, POKEMANIAC, RON, PokemaniacRonSeenText, PokemaniacRonBeatenText, $0000, PokemaniacRonScript
PokemaniacRonScript:
talkaftercancel
@@ -222,23 +158,7 @@ PokemaniacRonScript:
end
TrainerFisherMarvin:
; bit/flag number
dw EVENT_BEAT_FISHER_MARVIN
; trainer group && trainer id
db FISHER, MARVIN
; text when seen
dw FisherMarvinSeenText
; text when trainer beaten
dw FisherMarvinBeatenText
; script when lost
dw $0000
; script when talk again
dw FisherMarvinScript
trainer EVENT_BEAT_FISHER_MARVIN, FISHER, MARVIN, FisherMarvinSeenText, FisherMarvinBeatenText, $0000, FisherMarvinScript
FisherMarvinScript:
talkaftercancel
@@ -249,33 +169,17 @@ FisherMarvinScript:
end
TrainerPicnickerTiffany3:
; bit/flag number
dw EVENT_BEAT_PICNICKER_TIFFANY
; trainer group && trainer id
db PICNICKER, TIFFANY3
; text when seen
dw PicnickerTiffany3SeenText
; text when trainer beaten
dw PicnickerTiffany3BeatenText
; script when lost
dw $0000
; script when talk again
dw PicnickerTiffany3Script
trainer EVENT_BEAT_PICNICKER_TIFFANY, PICNICKER, TIFFANY3, PicnickerTiffany3SeenText, PicnickerTiffany3BeatenText, $0000, PicnickerTiffany3Script
PicnickerTiffany3Script:
writecode VAR_CALLERID, $1f
writecode VAR_CALLERID, PHONE_PICNICKER_TIFFANY
talkaftercancel
loadfont
checkflag ENGINE_TIFFANY
iftrue UnknownScript_0x19d1c1
checkflag ENGINE_TIFFANY_HAS_PINK_BOW
iftrue UnknownScript_0x19d21e
checkcellnum $1f
checkcellnum PHONE_PICNICKER_TIFFANY
iftrue UnknownScript_0x19d245
checkpoke CLEFAIRY
iffalse UnknownScript_0x19d233
@@ -290,7 +194,7 @@ PicnickerTiffany3Script:
UnknownScript_0x19d1aa:
scall UnknownScript_0x19d23d
UnknownScript_0x19d1ad:
askforphonenumber $1f
askforphonenumber PHONE_PICNICKER_TIFFANY
if_equal $1, UnknownScript_0x19d24d
if_equal $2, UnknownScript_0x19d249
trainertotext PICNICKER, TIFFANY3, $0