summaryrefslogtreecommitdiff
path: root/data/trainers
diff options
context:
space:
mode:
Diffstat (limited to 'data/trainers')
-rw-r--r--data/trainers/ai_pointers.asm8
-rwxr-xr-xdata/trainers/pic_pointers_money.asm4
-rwxr-xr-xdata/trainers/special_moves.asm8
3 files changed, 10 insertions, 10 deletions
diff --git a/data/trainers/ai_pointers.asm b/data/trainers/ai_pointers.asm
index 7c0c38af..d2e3b11c 100644
--- a/data/trainers/ai_pointers.asm
+++ b/data/trainers/ai_pointers.asm
@@ -1,8 +1,8 @@
TrainerAIPointers:
-; one entry per trainer class
-; first byte, number of times (per Pokémon) it can occur
-; next two bytes, pointer to AI subroutine for trainer class
-; subroutines are defined in engine/battle/trainer_ai.asm
+ ; one entry per trainer class
+ ; first byte, number of times (per Pokémon) it can occur
+ ; next two bytes, pointer to AI subroutine for trainer class
+ ; subroutines are defined in engine/battle/trainer_ai.asm
dbw 3, GenericAI
dbw 3, GenericAI
dbw 3, GenericAI
diff --git a/data/trainers/pic_pointers_money.asm b/data/trainers/pic_pointers_money.asm
index 1236e70c..d4007394 100755
--- a/data/trainers/pic_pointers_money.asm
+++ b/data/trainers/pic_pointers_money.asm
@@ -4,8 +4,8 @@ pic_money: MACRO
ENDM
TrainerPicAndMoneyPointers::
-; pic pointer, base reward money
-; money received after battle = base money × level of highest-level enemy mon
+ ; pic pointer, base reward money
+ ; money received after battle = base money × level of highest-level enemy mon
pic_money YoungsterPic, 1500
pic_money BugCatcherPic, 1000
pic_money LassPic, 1500
diff --git a/data/trainers/special_moves.asm b/data/trainers/special_moves.asm
index 84969367..da19f587 100755
--- a/data/trainers/special_moves.asm
+++ b/data/trainers/special_moves.asm
@@ -1,9 +1,9 @@
; unique moves for gym leaders
-LoneMoves:
-; pokemon index, move to give nth pokemon
; this is not automatic! you have to write the index you want to [wLoneAttackNo]
; first. e.g., erika's script writes 4 to [wLoneAttackNo] to get mega drain,
; the fourth entry in the list.
+LoneMoves:
+ ; pokemon index, move to give nth pokemon
db 1, BIDE
db 1, BUBBLEBEAM
db 2, THUNDERBOLT
@@ -14,10 +14,10 @@ LoneMoves:
db 4, FISSURE
; unique moves for elite 4
-TeamMoves:
-; trainer, move
; all trainers in this class are given this move automatically
; (unrelated to LoneMoves)
+TeamMoves:
+ ; trainer, move
db LORELEI, BLIZZARD
db BRUNO, FISSURE
db AGATHA, TOXIC