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/Route11.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/Route11.asm')
| -rw-r--r-- | maps/Route11.asm | 72 |
1 files changed, 4 insertions, 68 deletions
diff --git a/maps/Route11.asm b/maps/Route11.asm index 4f809febc..8ce0ed7a0 100644 --- a/maps/Route11.asm +++ b/maps/Route11.asm @@ -6,23 +6,7 @@ Route11_MapScriptHeader: db 0 TrainerYoungsterOwen: - ; bit/flag number - dw EVENT_BEAT_YOUNGSTER_OWEN - - ; trainer group && trainer id - db YOUNGSTER, OWEN - - ; text when seen - dw YoungsterOwenSeenText - - ; text when trainer beaten - dw YoungsterOwenBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw YoungsterOwenScript + trainer EVENT_BEAT_YOUNGSTER_OWEN, YOUNGSTER, OWEN, YoungsterOwenSeenText, YoungsterOwenBeatenText, $0000, YoungsterOwenScript YoungsterOwenScript: talkaftercancel @@ -33,23 +17,7 @@ YoungsterOwenScript: end TrainerYoungsterJason: - ; bit/flag number - dw EVENT_BEAT_YOUNGSTER_JASON - - ; trainer group && trainer id - db YOUNGSTER, JASON - - ; text when seen - dw YoungsterJasonSeenText - - ; text when trainer beaten - dw YoungsterJasonBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw YoungsterJasonScript + trainer EVENT_BEAT_YOUNGSTER_JASON, YOUNGSTER, JASON, YoungsterJasonSeenText, YoungsterJasonBeatenText, $0000, YoungsterJasonScript YoungsterJasonScript: talkaftercancel @@ -60,23 +28,7 @@ YoungsterJasonScript: end TrainerPsychicHerman: - ; bit/flag number - dw EVENT_BEAT_PSYCHIC_HERMAN - - ; trainer group && trainer id - db PSYCHIC_T, HERMAN - - ; text when seen - dw PsychicHermanSeenText - - ; text when trainer beaten - dw PsychicHermanBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw PsychicHermanScript + trainer EVENT_BEAT_PSYCHIC_HERMAN, PSYCHIC_T, HERMAN, PsychicHermanSeenText, PsychicHermanBeatenText, $0000, PsychicHermanScript PsychicHermanScript: talkaftercancel @@ -87,23 +39,7 @@ PsychicHermanScript: end TrainerPsychicFidel: - ; bit/flag number - dw EVENT_BEAT_PSYCHIC_FIDEL - - ; trainer group && trainer id - db PSYCHIC_T, FIDEL - - ; text when seen - dw PsychicFidelSeenText - - ; text when trainer beaten - dw PsychicFidelBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw PsychicFidelScript + trainer EVENT_BEAT_PSYCHIC_FIDEL, PSYCHIC_T, FIDEL, PsychicFidelSeenText, PsychicFidelBeatenText, $0000, PsychicFidelScript PsychicFidelScript: talkaftercancel |