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

36
maps/BlackthornGym2F.asm
View File

@@ -59,23 +59,7 @@ BlackthornGymBoulder:
jumpstd strengthboulder
TrainerCooltrainermCody:
; bit/flag number
dw EVENT_BEAT_COOLTRAINERM_CODY
; trainer group && trainer id
db COOLTRAINERM, CODY
; text when seen
dw CooltrainermCodySeenText
; text when trainer beaten
dw CooltrainermCodyBeatenText
; script when lost
dw $0000
; script when talk again
dw CooltrainermCodyScript
trainer EVENT_BEAT_COOLTRAINERM_CODY, COOLTRAINERM, CODY, CooltrainermCodySeenText, CooltrainermCodyBeatenText, $0000, CooltrainermCodyScript
CooltrainermCodyScript:
talkaftercancel
@@ -86,23 +70,7 @@ CooltrainermCodyScript:
end
TrainerCooltrainerfFran:
; bit/flag number
dw EVENT_BEAT_COOLTRAINERF_FRAN
; trainer group && trainer id
db COOLTRAINERF, FRAN
; text when seen
dw CooltrainerfFranSeenText
; text when trainer beaten
dw CooltrainerfFranBeatenText
; script when lost
dw $0000
; script when talk again
dw CooltrainerfFranScript
trainer EVENT_BEAT_COOLTRAINERF_FRAN, COOLTRAINERF, FRAN, CooltrainerfFranSeenText, CooltrainerfFranBeatenText, $0000, CooltrainerfFranScript
CooltrainerfFranScript:
talkaftercancel