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/Route9.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/Route9.asm')
| -rw-r--r-- | maps/Route9.asm | 108 |
1 files changed, 6 insertions, 102 deletions
diff --git a/maps/Route9.asm b/maps/Route9.asm index 032f33cc7..70c052907 100644 --- a/maps/Route9.asm +++ b/maps/Route9.asm @@ -6,23 +6,7 @@ Route9_MapScriptHeader: db 0 TrainerCamperDean: - ; bit/flag number - dw EVENT_BEAT_CAMPER_DEAN - - ; trainer group && trainer id - db CAMPER, DEAN - - ; text when seen - dw CamperDeanSeenText - - ; text when trainer beaten - dw CamperDeanBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw CamperDeanScript + trainer EVENT_BEAT_CAMPER_DEAN, CAMPER, DEAN, CamperDeanSeenText, CamperDeanBeatenText, $0000, CamperDeanScript CamperDeanScript: talkaftercancel @@ -33,23 +17,7 @@ CamperDeanScript: end TrainerPicnickerHeidi: - ; bit/flag number - dw EVENT_BEAT_PICNICKER_HEIDI - - ; trainer group && trainer id - db PICNICKER, HEIDI - - ; text when seen - dw PicnickerHeidiSeenText - - ; text when trainer beaten - dw PicnickerHeidiBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw PicnickerHeidiScript + trainer EVENT_BEAT_PICNICKER_HEIDI, PICNICKER, HEIDI, PicnickerHeidiSeenText, PicnickerHeidiBeatenText, $0000, PicnickerHeidiScript PicnickerHeidiScript: talkaftercancel @@ -60,23 +28,7 @@ PicnickerHeidiScript: end TrainerCamperSid: - ; bit/flag number - dw EVENT_BEAT_CAMPER_SID - - ; trainer group && trainer id - db CAMPER, SID - - ; text when seen - dw CamperSidSeenText - - ; text when trainer beaten - dw CamperSidBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw CamperSidScript + trainer EVENT_BEAT_CAMPER_SID, CAMPER, SID, CamperSidSeenText, CamperSidBeatenText, $0000, CamperSidScript CamperSidScript: talkaftercancel @@ -87,23 +39,7 @@ CamperSidScript: end TrainerPicnickerEdna: - ; bit/flag number - dw EVENT_BEAT_PICNICKER_EDNA - - ; trainer group && trainer id - db PICNICKER, EDNA - - ; text when seen - dw PicnickerEdnaSeenText - - ; text when trainer beaten - dw PicnickerEdnaBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw PicnickerEdnaScript + trainer EVENT_BEAT_PICNICKER_EDNA, PICNICKER, EDNA, PicnickerEdnaSeenText, PicnickerEdnaBeatenText, $0000, PicnickerEdnaScript PicnickerEdnaScript: talkaftercancel @@ -114,23 +50,7 @@ PicnickerEdnaScript: end TrainerHikerTim: - ; bit/flag number - dw EVENT_BEAT_HIKER_TIM - - ; trainer group && trainer id - db HIKER, TIM - - ; text when seen - dw HikerTimSeenText - - ; text when trainer beaten - dw HikerTimBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw HikerTimScript + trainer EVENT_BEAT_HIKER_TIM, HIKER, TIM, HikerTimSeenText, HikerTimBeatenText, $0000, HikerTimScript HikerTimScript: talkaftercancel @@ -141,23 +61,7 @@ HikerTimScript: end TrainerHikerSidney: - ; bit/flag number - dw EVENT_BEAT_HIKER_SIDNEY - - ; trainer group && trainer id - db HIKER, SIDNEY - - ; text when seen - dw HikerSidneySeenText - - ; text when trainer beaten - dw HikerSidneyBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw HikerSidneyScript + trainer EVENT_BEAT_HIKER_SIDNEY, HIKER, SIDNEY, HikerSidneySeenText, HikerSidneyBeatenText, $0000, HikerSidneyScript HikerSidneyScript: talkaftercancel |