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/Route31.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/Route31.asm')
| -rw-r--r-- | maps/Route31.asm | 24 |
1 files changed, 4 insertions, 20 deletions
diff --git a/maps/Route31.asm b/maps/Route31.asm index 3deaca873..5866fab1d 100644 --- a/maps/Route31.asm +++ b/maps/Route31.asm @@ -19,33 +19,17 @@ UnknownScript_0x1a5443: return TrainerBug_catcherWade1: - ; bit/flag number - dw EVENT_BEAT_BUG_CATCHER_WADE - - ; trainer group && trainer id - db BUG_CATCHER, WADE1 - - ; text when seen - dw Bug_catcherWade1SeenText - - ; text when trainer beaten - dw Bug_catcherWade1BeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw Bug_catcherWade1Script + trainer EVENT_BEAT_BUG_CATCHER_WADE, BUG_CATCHER, WADE1, Bug_catcherWade1SeenText, Bug_catcherWade1BeatenText, $0000, Bug_catcherWade1Script Bug_catcherWade1Script: - writecode VAR_CALLERID, $10 + writecode VAR_CALLERID, PHONE_BUG_CATCHER_WADE talkaftercancel loadfont checkflag ENGINE_WADE iftrue UnknownScript_0x1a5493 checkflag ENGINE_WADE_HAS_ITEM iftrue UnknownScript_0x1a5507 - checkcellnum $10 + checkcellnum PHONE_BUG_CATCHER_WADE iftrue UnknownScript_0x1a5558 checkevent EVENT_WADE_ASKED_FOR_PHONE_NUMBER iftrue UnknownScript_0x1a547c @@ -58,7 +42,7 @@ Bug_catcherWade1Script: UnknownScript_0x1a547c: scall UnknownScript_0x1a5550 UnknownScript_0x1a547f: - askforphonenumber $10 + askforphonenumber PHONE_BUG_CATCHER_WADE if_equal $1, UnknownScript_0x1a5560 if_equal $2, UnknownScript_0x1a555c trainertotext BUG_CATCHER, WADE1, $0 |