Trainer data structure and field move functions

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

View File

@@ -9,33 +9,17 @@ LassScript_0x1ac002:
jumptextfaceplayer UnknownText_0x1ac1e7
TrainerHikerAnthony:
; bit/flag number
dw EVENT_BEAT_HIKER_ANTHONY
; trainer group && trainer id
db HIKER, ANTHONY2
; text when seen
dw HikerAnthony2SeenText
; text when trainer beaten
dw HikerAnthony2BeatenText
; script when lost
dw $0000
; script when talk again
dw HikerAnthony2Script
trainer EVENT_BEAT_HIKER_ANTHONY, HIKER, ANTHONY2, HikerAnthony2SeenText, HikerAnthony2BeatenText, $0000, HikerAnthony2Script
HikerAnthony2Script:
writecode VAR_CALLERID, $13
writecode VAR_CALLERID, PHONE_HIKER_ANTHONY
talkaftercancel
loadfont
checkflag ENGINE_ANTHONY
iftrue UnknownScript_0x1ac051
checkflag ENGINE_DUNSPARCE_SWARM
iftrue UnknownScript_0x1ac0c5
checkcellnum $13
checkcellnum PHONE_HIKER_ANTHONY
iftrue UnknownScript_0x1ac0d7
checkevent EVENT_ANTHONY_ASKED_FOR_PHONE_NUMBER
iftrue UnknownScript_0x1ac03a
@@ -48,7 +32,7 @@ HikerAnthony2Script:
UnknownScript_0x1ac03a:
scall UnknownScript_0x1ac0cf
UnknownScript_0x1ac03d:
askforphonenumber $13
askforphonenumber PHONE_HIKER_ANTHONY
if_equal $1, UnknownScript_0x1ac0df
if_equal $2, UnknownScript_0x1ac0db
trainertotext HIKER, ANTHONY2, $0