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/Route8.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/Route8.asm')
| -rw-r--r-- | maps/Route8.asm | 90 |
1 files changed, 5 insertions, 85 deletions
diff --git a/maps/Route8.asm b/maps/Route8.asm index 377aa8f58..3cfc2992b 100644 --- a/maps/Route8.asm +++ b/maps/Route8.asm @@ -6,23 +6,7 @@ Route8_MapScriptHeader: db 0 TrainerBikerDwayne: - ; bit/flag number - dw EVENT_BEAT_BIKER_DWAYNE - - ; trainer group && trainer id - db BIKER, DWAYNE - - ; text when seen - dw BikerDwayneSeenText - - ; text when trainer beaten - dw BikerDwayneBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw BikerDwayneScript + trainer EVENT_BEAT_BIKER_DWAYNE, BIKER, DWAYNE, BikerDwayneSeenText, BikerDwayneBeatenText, $0000, BikerDwayneScript BikerDwayneScript: talkaftercancel @@ -33,23 +17,7 @@ BikerDwayneScript: end TrainerBikerHarris: - ; bit/flag number - dw EVENT_BEAT_BIKER_HARRIS - - ; trainer group && trainer id - db BIKER, HARRIS - - ; text when seen - dw BikerHarrisSeenText - - ; text when trainer beaten - dw BikerHarrisBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw BikerHarrisScript + trainer EVENT_BEAT_BIKER_HARRIS, BIKER, HARRIS, BikerHarrisSeenText, BikerHarrisBeatenText, $0000, BikerHarrisScript BikerHarrisScript: talkaftercancel @@ -60,23 +28,7 @@ BikerHarrisScript: end TrainerBikerZeke: - ; bit/flag number - dw EVENT_BEAT_BIKER_ZEKE - - ; trainer group && trainer id - db BIKER, ZEKE - - ; text when seen - dw BikerZekeSeenText - - ; text when trainer beaten - dw BikerZekeBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw BikerZekeScript + trainer EVENT_BEAT_BIKER_ZEKE, BIKER, ZEKE, BikerZekeSeenText, BikerZekeBeatenText, $0000, BikerZekeScript BikerZekeScript: talkaftercancel @@ -87,23 +39,7 @@ BikerZekeScript: end TrainerSupernerdSam: - ; bit/flag number - dw EVENT_BEAT_SUPER_NERD_SAM - - ; trainer group && trainer id - db SUPER_NERD, SAM - - ; text when seen - dw SupernerdSamSeenText - - ; text when trainer beaten - dw SupernerdSamBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw SupernerdSamScript + trainer EVENT_BEAT_SUPER_NERD_SAM, SUPER_NERD, SAM, SupernerdSamSeenText, SupernerdSamBeatenText, $0000, SupernerdSamScript SupernerdSamScript: talkaftercancel @@ -114,23 +50,7 @@ SupernerdSamScript: end TrainerSupernerdTom: - ; bit/flag number - dw EVENT_BEAT_SUPER_NERD_TOM - - ; trainer group && trainer id - db SUPER_NERD, TOM - - ; text when seen - dw SupernerdTomSeenText - - ; text when trainer beaten - dw SupernerdTomBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw SupernerdTomScript + trainer EVENT_BEAT_SUPER_NERD_TOM, SUPER_NERD, TOM, SupernerdTomSeenText, SupernerdTomBeatenText, $0000, SupernerdTomScript SupernerdTomScript: talkaftercancel |