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/SproutTower2F.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/SproutTower2F.asm')
| -rw-r--r-- | maps/SproutTower2F.asm | 36 |
1 files changed, 2 insertions, 34 deletions
diff --git a/maps/SproutTower2F.asm b/maps/SproutTower2F.asm index 1d74f3b1a..5a74dee7e 100644 --- a/maps/SproutTower2F.asm +++ b/maps/SproutTower2F.asm @@ -6,23 +6,7 @@ SproutTower2F_MapScriptHeader: db 0 TrainerSageNico: - ; bit/flag number - dw EVENT_BEAT_SAGE_NICO - - ; trainer group && trainer id - db SAGE, NICO - - ; text when seen - dw SageNicoSeenText - - ; text when trainer beaten - dw SageNicoBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw SageNicoScript + trainer EVENT_BEAT_SAGE_NICO, SAGE, NICO, SageNicoSeenText, SageNicoBeatenText, $0000, SageNicoScript SageNicoScript: talkaftercancel @@ -33,23 +17,7 @@ SageNicoScript: end TrainerSageEdmond: - ; bit/flag number - dw EVENT_BEAT_SAGE_EDMOND - - ; trainer group && trainer id - db SAGE, EDMOND - - ; text when seen - dw SageEdmondSeenText - - ; text when trainer beaten - dw SageEdmondBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw SageEdmondScript + trainer EVENT_BEAT_SAGE_EDMOND, SAGE, EDMOND, SageEdmondSeenText, SageEdmondBeatenText, $0000, SageEdmondScript SageEdmondScript: talkaftercancel |