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/Route2.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/Route2.asm')
| -rw-r--r-- | maps/Route2.asm | 54 |
1 files changed, 3 insertions, 51 deletions
diff --git a/maps/Route2.asm b/maps/Route2.asm index 6268a1f8a..e6fbff570 100644 --- a/maps/Route2.asm +++ b/maps/Route2.asm @@ -6,23 +6,7 @@ Route2_MapScriptHeader: db 0 TrainerBug_catcherRob: - ; bit/flag number - dw EVENT_BEAT_BUG_CATCHER_ROB - - ; trainer group && trainer id - db BUG_CATCHER, ROB - - ; text when seen - dw Bug_catcherRobSeenText - - ; text when trainer beaten - dw Bug_catcherRobBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw Bug_catcherRobScript + trainer EVENT_BEAT_BUG_CATCHER_ROB, BUG_CATCHER, ROB, Bug_catcherRobSeenText, Bug_catcherRobBeatenText, $0000, Bug_catcherRobScript Bug_catcherRobScript: talkaftercancel @@ -33,23 +17,7 @@ Bug_catcherRobScript: end TrainerBug_catcherEd: - ; bit/flag number - dw EVENT_BEAT_BUG_CATCHER_ED - - ; trainer group && trainer id - db BUG_CATCHER, ED - - ; text when seen - dw Bug_catcherEdSeenText - - ; text when trainer beaten - dw Bug_catcherEdBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw Bug_catcherEdScript + trainer EVENT_BEAT_BUG_CATCHER_ED, BUG_CATCHER, ED, Bug_catcherEdSeenText, Bug_catcherEdBeatenText, $0000, Bug_catcherEdScript Bug_catcherEdScript: talkaftercancel @@ -60,23 +28,7 @@ Bug_catcherEdScript: end TrainerBug_catcherDoug: - ; bit/flag number - dw EVENT_BEAT_BUG_CATCHER_DOUG - - ; trainer group && trainer id - db BUG_CATCHER, DOUG - - ; text when seen - dw Bug_catcherDougSeenText - - ; text when trainer beaten - dw Bug_catcherDougBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw Bug_catcherDougScript + trainer EVENT_BEAT_BUG_CATCHER_DOUG, BUG_CATCHER, DOUG, Bug_catcherDougSeenText, Bug_catcherDougBeatenText, $0000, Bug_catcherDougScript Bug_catcherDougScript: talkaftercancel |