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/Route13.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/Route13.asm')
| -rw-r--r-- | maps/Route13.asm | 90 |
1 files changed, 5 insertions, 85 deletions
diff --git a/maps/Route13.asm b/maps/Route13.asm index c8627721d..b2e03f13e 100644 --- a/maps/Route13.asm +++ b/maps/Route13.asm @@ -6,23 +6,7 @@ Route13_MapScriptHeader: db 0 TrainerPokefanmAlex: - ; bit/flag number - dw EVENT_BEAT_POKEFANM_ALEX - - ; trainer group && trainer id - db POKEFANM, ALEX - - ; text when seen - dw PokefanmAlexSeenText - - ; text when trainer beaten - dw PokefanmAlexBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw PokefanmAlexScript + trainer EVENT_BEAT_POKEFANM_ALEX, POKEFANM, ALEX, PokefanmAlexSeenText, PokefanmAlexBeatenText, $0000, PokefanmAlexScript PokefanmAlexScript: talkaftercancel @@ -33,23 +17,7 @@ PokefanmAlexScript: end TrainerPokefanmJoshua: - ; bit/flag number - dw EVENT_BEAT_POKEFANM_JOSHUA - - ; trainer group && trainer id - db POKEFANM, JOSHUA - - ; text when seen - dw PokefanmJoshuaSeenText - - ; text when trainer beaten - dw PokefanmJoshuaBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw PokefanmJoshuaScript + trainer EVENT_BEAT_POKEFANM_JOSHUA, POKEFANM, JOSHUA, PokefanmJoshuaSeenText, PokefanmJoshuaBeatenText, $0000, PokefanmJoshuaScript PokefanmJoshuaScript: talkaftercancel @@ -60,23 +28,7 @@ PokefanmJoshuaScript: end TrainerBird_keeperPerry: - ; bit/flag number - dw EVENT_BEAT_BIRD_KEEPER_PERRY - - ; trainer group && trainer id - db BIRD_KEEPER, PERRY - - ; text when seen - dw Bird_keeperPerrySeenText - - ; text when trainer beaten - dw Bird_keeperPerryBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw Bird_keeperPerryScript + trainer EVENT_BEAT_BIRD_KEEPER_PERRY, BIRD_KEEPER, PERRY, Bird_keeperPerrySeenText, Bird_keeperPerryBeatenText, $0000, Bird_keeperPerryScript Bird_keeperPerryScript: talkaftercancel @@ -87,23 +39,7 @@ Bird_keeperPerryScript: end TrainerBird_keeperBret: - ; bit/flag number - dw EVENT_BEAT_BIRD_KEEPER_BRET - - ; trainer group && trainer id - db BIRD_KEEPER, BRET - - ; text when seen - dw Bird_keeperBretSeenText - - ; text when trainer beaten - dw Bird_keeperBretBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw Bird_keeperBretScript + trainer EVENT_BEAT_BIRD_KEEPER_BRET, BIRD_KEEPER, BRET, Bird_keeperBretSeenText, Bird_keeperBretBeatenText, $0000, Bird_keeperBretScript Bird_keeperBretScript: talkaftercancel @@ -114,23 +50,7 @@ Bird_keeperBretScript: end TrainerHikerKenny: - ; bit/flag number - dw EVENT_BEAT_HIKER_KENNY - - ; trainer group && trainer id - db HIKER, KENNY - - ; text when seen - dw HikerKennySeenText - - ; text when trainer beaten - dw HikerKennyBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw HikerKennyScript + trainer EVENT_BEAT_HIKER_KENNY, HIKER, KENNY, HikerKennySeenText, HikerKennyBeatenText, $0000, HikerKennyScript HikerKennyScript: talkaftercancel |