diff options
author | Thomas Winwood <twwinwood@gmail.com> | 2018-07-21 02:06:31 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-07-21 02:06:31 +0100 |
commit | 23ef2f50a7b94c23b50e9e690a7482ac349c9ef3 (patch) | |
tree | 63c20c67efbdf8334c6e273f78065b83135e3886 /sram.asm | |
parent | 17a4d0540acc00e3f5ad260009115eb36e72b7d2 (diff) | |
parent | 2d73d040d16a7836f935a7a6cb2a311aed2ca5a2 (diff) |
Merge branch 'master' into the-diffening
Diffstat (limited to 'sram.asm')
-rw-r--r-- | sram.asm | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -208,7 +208,7 @@ sBattleTowerSaveFileFlags:: db sBattleTowerReward:: db ; team of previous trainer -sBTMonOfTrainers:: ; 0xbe51 +sBTMonOfTrainers:: ; be51 sBTMonPrevTrainer1:: db sBTMonPrevTrainer2:: db sBTMonPrevTrainer3:: db |