diff options
| author | PikalaxALT <PikalaxALT@gmail.com> | 2015-07-18 23:45:39 -0400 |
|---|---|---|
| committer | PikalaxALT <PikalaxALT@gmail.com> | 2015-07-18 23:45:39 -0400 |
| commit | 60cd04b02300c288a01a2f78a44cb39cbe6861d1 (patch) | |
| tree | ef5bb2bd660a2020864c909fb5dda73f027a9e7c /maps/Route12.asm | |
| parent | e674869018ffe8f9be2351b2b569eb7300910e6a (diff) | |
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.
Diffstat (limited to 'maps/Route12.asm')
| -rw-r--r-- | maps/Route12.asm | 72 |
1 files changed, 4 insertions, 68 deletions
diff --git a/maps/Route12.asm b/maps/Route12.asm index a13cec780..8b1e52dfd 100644 --- a/maps/Route12.asm +++ b/maps/Route12.asm @@ -6,23 +6,7 @@ Route12_MapScriptHeader: db 0 TrainerFisherKyle: - ; bit/flag number - dw EVENT_BEAT_FISHER_KYLE - - ; trainer group && trainer id - db FISHER, KYLE - - ; text when seen - dw FisherKyleSeenText - - ; text when trainer beaten - dw FisherKyleBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw FisherKyleScript + trainer EVENT_BEAT_FISHER_KYLE, FISHER, KYLE, FisherKyleSeenText, FisherKyleBeatenText, $0000, FisherKyleScript FisherKyleScript: talkaftercancel @@ -33,23 +17,7 @@ FisherKyleScript: end TrainerFisherMartin: - ; bit/flag number - dw EVENT_BEAT_FISHER_MARTIN - - ; trainer group && trainer id - db FISHER, MARTIN - - ; text when seen - dw FisherMartinSeenText - - ; text when trainer beaten - dw FisherMartinBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw FisherMartinScript + trainer EVENT_BEAT_FISHER_MARTIN, FISHER, MARTIN, FisherMartinSeenText, FisherMartinBeatenText, $0000, FisherMartinScript FisherMartinScript: talkaftercancel @@ -60,23 +28,7 @@ FisherMartinScript: end TrainerFisherStephen: - ; bit/flag number - dw EVENT_BEAT_FISHER_STEPHEN - - ; trainer group && trainer id - db FISHER, STEPHEN - - ; text when seen - dw FisherStephenSeenText - - ; text when trainer beaten - dw FisherStephenBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw FisherStephenScript + trainer EVENT_BEAT_FISHER_STEPHEN, FISHER, STEPHEN, FisherStephenSeenText, FisherStephenBeatenText, $0000, FisherStephenScript FisherStephenScript: talkaftercancel @@ -87,23 +39,7 @@ FisherStephenScript: end TrainerFisherBarney: - ; bit/flag number - dw EVENT_BEAT_FISHER_BARNEY - - ; trainer group && trainer id - db FISHER, BARNEY - - ; text when seen - dw FisherBarneySeenText - - ; text when trainer beaten - dw FisherBarneyBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw FisherBarneyScript + trainer EVENT_BEAT_FISHER_BARNEY, FISHER, BARNEY, FisherBarneySeenText, FisherBarneyBeatenText, $0000, FisherBarneyScript FisherBarneyScript: talkaftercancel |