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/Route20.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/Route20.asm')
| -rw-r--r-- | maps/Route20.asm | 54 |
1 files changed, 3 insertions, 51 deletions
diff --git a/maps/Route20.asm b/maps/Route20.asm index 279baa4d2..9a354d11a 100644 --- a/maps/Route20.asm +++ b/maps/Route20.asm @@ -14,23 +14,7 @@ Route20_MapScriptHeader: return TrainerSwimmerfNicole: - ; bit/flag number - dw EVENT_BEAT_SWIMMERF_NICOLE - - ; trainer group && trainer id - db SWIMMERF, NICOLE - - ; text when seen - dw SwimmerfNicoleSeenText - - ; text when trainer beaten - dw SwimmerfNicoleBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw SwimmerfNicoleScript + trainer EVENT_BEAT_SWIMMERF_NICOLE, SWIMMERF, NICOLE, SwimmerfNicoleSeenText, SwimmerfNicoleBeatenText, $0000, SwimmerfNicoleScript SwimmerfNicoleScript: talkaftercancel @@ -41,23 +25,7 @@ SwimmerfNicoleScript: end TrainerSwimmerfLori: - ; bit/flag number - dw EVENT_BEAT_SWIMMERF_LORI - - ; trainer group && trainer id - db SWIMMERF, LORI - - ; text when seen - dw SwimmerfLoriSeenText - - ; text when trainer beaten - dw SwimmerfLoriBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw SwimmerfLoriScript + trainer EVENT_BEAT_SWIMMERF_LORI, SWIMMERF, LORI, SwimmerfLoriSeenText, SwimmerfLoriBeatenText, $0000, SwimmerfLoriScript SwimmerfLoriScript: talkaftercancel @@ -68,23 +36,7 @@ SwimmerfLoriScript: end TrainerSwimmermCameron: - ; bit/flag number - dw EVENT_BEAT_SWIMMERM_CAMERON - - ; trainer group && trainer id - db SWIMMERM, CAMERON - - ; text when seen - dw SwimmermCameronSeenText - - ; text when trainer beaten - dw SwimmermCameronBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw SwimmermCameronScript + trainer EVENT_BEAT_SWIMMERM_CAMERON, SWIMMERM, CAMERON, SwimmermCameronSeenText, SwimmermCameronBeatenText, $0000, SwimmermCameronScript SwimmermCameronScript: talkaftercancel |