summaryrefslogtreecommitdiff
path: root/data/trainers/attributes.asm
diff options
context:
space:
mode:
authorThomas Winwood <twwinwood@gmail.com>2018-07-21 02:06:31 +0100
committerGitHub <noreply@github.com>2018-07-21 02:06:31 +0100
commit23ef2f50a7b94c23b50e9e690a7482ac349c9ef3 (patch)
tree63c20c67efbdf8334c6e273f78065b83135e3886 /data/trainers/attributes.asm
parent17a4d0540acc00e3f5ad260009115eb36e72b7d2 (diff)
parent2d73d040d16a7836f935a7a6cb2a311aed2ca5a2 (diff)
Merge branch 'master' into the-diffening
Diffstat (limited to 'data/trainers/attributes.asm')
-rw-r--r--data/trainers/attributes.asm4
1 files changed, 1 insertions, 3 deletions
diff --git a/data/trainers/attributes.asm b/data/trainers/attributes.asm
index b64e2b3b4..67d852d83 100644
--- a/data/trainers/attributes.asm
+++ b/data/trainers/attributes.asm
@@ -1,4 +1,4 @@
-TrainerClassAttributes: ; 3959c
+TrainerClassAttributes:
; entries correspond to trainer classes (see constants/trainer_constants.asm)
; Falkner
@@ -402,5 +402,3 @@ TrainerClassAttributes: ; 3959c
db 25 ; base reward
dw AI_BASIC | AI_SETUP | AI_SMART | AI_AGGRESSIVE | AI_CAUTIOUS | AI_STATUS | AI_RISKY
dw CONTEXT_USE | SWITCH_SOMETIMES
-
-; 39771