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/Route17.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/Route17.asm')
| -rw-r--r-- | maps/Route17.asm | 72 |
1 files changed, 4 insertions, 68 deletions
diff --git a/maps/Route17.asm b/maps/Route17.asm index 2c7e2a605..bcb008f83 100644 --- a/maps/Route17.asm +++ b/maps/Route17.asm @@ -15,23 +15,7 @@ UnknownScript_0x1ad0ab: return TrainerBikerCharles: - ; bit/flag number - dw EVENT_BEAT_BIKER_CHARLES - - ; trainer group && trainer id - db BIKER, CHARLES - - ; text when seen - dw BikerCharlesSeenText - - ; text when trainer beaten - dw BikerCharlesBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw BikerCharlesScript + trainer EVENT_BEAT_BIKER_CHARLES, BIKER, CHARLES, BikerCharlesSeenText, BikerCharlesBeatenText, $0000, BikerCharlesScript BikerCharlesScript: talkaftercancel @@ -42,23 +26,7 @@ BikerCharlesScript: end TrainerBikerRiley: - ; bit/flag number - dw EVENT_BEAT_BIKER_RILEY - - ; trainer group && trainer id - db BIKER, RILEY - - ; text when seen - dw BikerRileySeenText - - ; text when trainer beaten - dw BikerRileyBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw BikerRileyScript + trainer EVENT_BEAT_BIKER_RILEY, BIKER, RILEY, BikerRileySeenText, BikerRileyBeatenText, $0000, BikerRileyScript BikerRileyScript: talkaftercancel @@ -69,23 +37,7 @@ BikerRileyScript: end TrainerBikerJoel: - ; bit/flag number - dw EVENT_BEAT_BIKER_JOEL - - ; trainer group && trainer id - db BIKER, JOEL - - ; text when seen - dw BikerJoelSeenText - - ; text when trainer beaten - dw BikerJoelBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw BikerJoelScript + trainer EVENT_BEAT_BIKER_JOEL, BIKER, JOEL, BikerJoelSeenText, BikerJoelBeatenText, $0000, BikerJoelScript BikerJoelScript: talkaftercancel @@ -96,23 +48,7 @@ BikerJoelScript: end TrainerBikerGlenn: - ; bit/flag number - dw EVENT_BEAT_BIKER_GLENN - - ; trainer group && trainer id - db BIKER, GLENN - - ; text when seen - dw BikerGlennSeenText - - ; text when trainer beaten - dw BikerGlennBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw BikerGlennScript + trainer EVENT_BEAT_BIKER_GLENN, BIKER, GLENN, BikerGlennSeenText, BikerGlennBeatenText, $0000, BikerGlennScript BikerGlennScript: talkaftercancel |