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/PewterGym.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/PewterGym.asm')
| -rw-r--r-- | maps/PewterGym.asm | 18 |
1 files changed, 1 insertions, 17 deletions
diff --git a/maps/PewterGym.asm b/maps/PewterGym.asm index fcac4b8ec..60317d163 100644 --- a/maps/PewterGym.asm +++ b/maps/PewterGym.asm @@ -36,23 +36,7 @@ BrockScript_0x1a2864: end TrainerCamperJerry: - ; bit/flag number - dw EVENT_BEAT_CAMPER_JERRY - - ; trainer group && trainer id - db CAMPER, JERRY - - ; text when seen - dw CamperJerrySeenText - - ; text when trainer beaten - dw CamperJerryBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw CamperJerryScript + trainer EVENT_BEAT_CAMPER_JERRY, CAMPER, JERRY, CamperJerrySeenText, CamperJerryBeatenText, $0000, CamperJerryScript CamperJerryScript: talkaftercancel |