ref: 4800861b6f84d073bba79c00156eee51c62f1314
parent: bc61a0ca05427efef48b4cd8030464f8790be7de
parent: 7c6932fbae357f0e514516a8f3468783efa93c65
author: surskitty <[email protected]>
date: Sat Sep 9 19:44:31 EDT 2017
Merge https://github.com/pret/pokecrystal
--- a/README.md
+++ b/README.md
@@ -9,8 +9,23 @@
To set up the repository, see [INSTALL.md](INSTALL.md).
-### irc: [freenode#pret][irc]
+## See also
+* Disassembly of [**Pokémon Red/Blue**][pokered]
+* Disassembly of [**Pokémon Yellow**][pokeyellow]
+* Disassembly of [**Pokémon Pinball**][pokepinball]
+* Disassembly of [**Pokémon TCG**][poketcg]
+* Disassembly of [**Pokémon Ruby**][pokeruby]
+* Disassembly of [**Pokémon Emerald**][pokeemerald]
+* Discord: [**pret**][Discord]
+* irc: [freenode#pret][irc]
+[pokered]: https://github.com/pret/pokered
+[pokeyellow]: https://github.com/pret/pokeyellow
+[pokepinball]: https://github.com/pret/pokepinball
+[poketcg]: https://github.com/pret/poketcg
+[pokeruby]: https://github.com/pret/pokeruby
+[pokeemerald]: https://github.com/pret/pokeemerald
+[Discord]: https://discord.gg/cJxDDVP
[irc]: https://kiwiirc.com/client/irc.freenode.net/?#pret
[travis]: https://travis-ci.org/pret/pokecrystal
[travis-badge]: https://travis-ci.org/pret/pokecrystal.svg?branch=master
--- a/wram.asm
+++ b/wram.asm
@@ -379,9 +379,7 @@
wEnemyTrainerItem2:: ds 1 ; c651
wEnemyTrainerBaseReward:: ds 1 ; c652
wEnemyTrainerAIFlags:: ds 3 ; c653
-OTClassName:: ds NAME_LENGTH ; c656
-
- ds 2
+OTClassName:: ds TRAINER_CLASS_NAME_LENGTH ; c656
CurOTMon:: ; c663
ds 1