diff options
| author | U-Daniel-Laptop\Daniel <corrnondacqb@yahoo.com> | 2013-12-23 07:33:42 -0600 |
|---|---|---|
| committer | U-Daniel-Laptop\Daniel <corrnondacqb@yahoo.com> | 2013-12-23 07:33:42 -0600 |
| commit | eedf04c24359128f9a6a455ba66847574226a4a7 (patch) | |
| tree | 7254c0c8af64e98fd940b3d27a245bfab89f2c1c /wram.asm | |
| parent | 3f43b0578e209da502fb1b3b3fb69c1ee48fe03b (diff) | |
| parent | d7512996309efb9e9d19f6f09e4449ef21781f99 (diff) | |
Merge branch 'master' of https://github.com/huderlem/pokered
Conflicts:
main.asm
Diffstat (limited to 'wram.asm')
| -rw-r--r-- | wram.asm | 8 |
1 files changed, 7 insertions, 1 deletions
@@ -450,7 +450,13 @@ W_PLAYERMONPP: ; d02d W_TRAINERCLASS: ; d031 ds 1 - ds 37 + ds 24 + +W_TRAINERNAME: ; d04a +; 13 bytes for the letters of the opposing trainer +; the name is terminated with $50 with possible +; unused trailing letters + ds 13 W_ISINBATTLE: ; d057 ; no battle, this is 0 |