diff options
author | Remy Oukaour <remy.oukaour@gmail.com> | 2018-01-09 15:12:49 -0500 |
---|---|---|
committer | Remy Oukaour <remy.oukaour@gmail.com> | 2018-01-09 15:12:49 -0500 |
commit | 5a73a62d9bdaa42aa3b94064a0ddba63a8e34ad2 (patch) | |
tree | 710bacb3bd6d11d6f6d16639e99b5c95424261c4 /data | |
parent | 2f741dfa03204d4a98988ee76b241edc90f5ffc4 (diff) |
Move battle engine data into data/
IsJohtoGymLeader → IsGymLeader
Diffstat (limited to 'data')
-rw-r--r-- | data/moves/effects_priorities.asm | 9 | ||||
-rw-r--r-- | data/trainers/leaders.asm | 32 | ||||
-rw-r--r-- | data/wild/treemons_asleep.asm | 31 |
3 files changed, 72 insertions, 0 deletions
diff --git a/data/moves/effects_priorities.asm b/data/moves/effects_priorities.asm new file mode 100644 index 000000000..6faa6d032 --- /dev/null +++ b/data/moves/effects_priorities.asm @@ -0,0 +1,9 @@ +MoveEffectPriorities: ; 3c5df + db EFFECT_PROTECT, 3 + db EFFECT_ENDURE, 3 + db EFFECT_PRIORITY_HIT, 2 + db EFFECT_FORCE_SWITCH, 0 + db EFFECT_COUNTER, 0 + db EFFECT_MIRROR_COAT, 0 + db -1 +; 3c5ec diff --git a/data/trainers/leaders.asm b/data/trainers/leaders.asm new file mode 100644 index 000000000..a41f641e2 --- /dev/null +++ b/data/trainers/leaders.asm @@ -0,0 +1,32 @@ +; These lists determine the battle music and victory music, and whether to +; award HAPPINESS_GYMBATTLE for winning. + +; Note: CHAMPION and RED are unused for battle music checks, since they are +; accounted for prior to the list check. + +GymLeaders: + db FALKNER + db WHITNEY + db BUGSY + db MORTY + db PRYCE + db JASMINE + db CHUCK + db CLAIR + db WILL + db BRUNO + db KAREN + db KOGA + db CHAMPION + db RED +; fallthrough +KantoGymLeaders: + db BROCK + db MISTY + db LT_SURGE + db ERIKA + db JANINE + db SABRINA + db BLAINE + db BLUE + db -1 diff --git a/data/wild/treemons_asleep.asm b/data/wild/treemons_asleep.asm new file mode 100644 index 000000000..50c50f99f --- /dev/null +++ b/data/wild/treemons_asleep.asm @@ -0,0 +1,31 @@ +; Used by CheckSleepingTreeMon + +AsleepTreeMonsNite: + db CATERPIE + db METAPOD + db BUTTERFREE + db WEEDLE + db KAKUNA + db BEEDRILL + db SPEAROW + db EKANS + db EXEGGCUTE + db LEDYBA + db AIPOM + db -1 ; end + +AsleepTreeMonsDay: + db VENONAT + db HOOTHOOT + db NOCTOWL + db SPINARAK + db HERACROSS + db -1 ; end + +AsleepTreeMonsMorn: + db VENONAT + db HOOTHOOT + db NOCTOWL + db SPINARAK + db HERACROSS + db -1 ; end |