diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-02-15 20:44:57 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-15 20:44:57 -0500 |
| commit | a4cd331634d1fcc5f7cb217c51c328c5769a9616 (patch) | |
| tree | 7b610171c3d893d1cace513cf61e0b74014dbad2 /data/trainer_tower | |
| parent | 34deceb13695e7b13a27ecb94666fc95d2ced550 (diff) | |
| parent | fee980decd6dfd5dc98c15ba13c9ea8f7b597934 (diff) | |
Merge branch 'master' into doc-ttower
Diffstat (limited to 'data/trainer_tower')
| -rw-r--r-- | data/trainer_tower/trainers.inc | 40 |
1 files changed, 40 insertions, 0 deletions
diff --git a/data/trainer_tower/trainers.inc b/data/trainer_tower/trainers.inc index 5f9b0f49b..645a8a27e 100644 --- a/data/trainer_tower/trainers.inc +++ b/data/trainer_tower/trainers.inc @@ -5111,3 +5111,43 @@ gUnknown_84823CC:: .byte 255 @ friendship .byte 0x80, 0x6b, 0x01 + + .align 2 +gUnknown_84827AC:: @ 84827AC + .byte 0x08, 0x01 + .2byte 0 + .4byte 0 + +gUnknown_84827B4:: @ 84827B4 + .4byte gUnknown_847F16C + .4byte gUnknown_847D26C + .4byte gUnknown_84808AC + .4byte gUnknown_847ABAC + .4byte gUnknown_847CAAC + .4byte gUnknown_847E9AC + .4byte gUnknown_847AF8C + .4byte gUnknown_847CE8C + .4byte gUnknown_847DA2C + .4byte gUnknown_847BF0C + .4byte gUnknown_847D64C + .4byte gUnknown_847DE0C + .4byte gUnknown_847B74C + .4byte gUnknown_847BB2C + .4byte gUnknown_848182C + .4byte gUnknown_847F92C + .4byte gUnknown_847C2EC + .4byte gUnknown_847C6CC + .4byte gUnknown_847E5CC + .4byte gUnknown_84804CC + .4byte gUnknown_84823CC + .4byte gUnknown_8481FEC + .4byte gUnknown_84800EC + .4byte gUnknown_847E1EC + .4byte gUnknown_847ED8C + .4byte gUnknown_848106C + .4byte gUnknown_8480C8C + .4byte gUnknown_847F92C + .4byte gUnknown_847F54C + .4byte gUnknown_847E1EC + .4byte gUnknown_847D64C + .4byte gUnknown_847C6CC |