aboutsummaryrefslogtreecommitdiffstats
path: root/wram.asm
diff options
context:
space:
mode:
authorU-Daniel-Laptop\Daniel <corrnondacqb@yahoo.com>2013-12-23 07:33:42 -0600
committerU-Daniel-Laptop\Daniel <corrnondacqb@yahoo.com>2013-12-23 07:33:42 -0600
commiteedf04c24359128f9a6a455ba66847574226a4a7 (patch)
tree7254c0c8af64e98fd940b3d27a245bfab89f2c1c /wram.asm
parentPointer table clean up (diff)
parentCleaned up all Map Headers. (diff)
downloadpokeyellow-eedf04c24359128f9a6a455ba66847574226a4a7.tar.gz
pokeyellow-eedf04c24359128f9a6a455ba66847574226a4a7.tar.xz
pokeyellow-eedf04c24359128f9a6a455ba66847574226a4a7.zip
Merge branch 'master' of https://github.com/huderlem/pokered
Conflicts: main.asm
Diffstat (limited to 'wram.asm')
-rw-r--r--wram.asm8
1 files changed, 7 insertions, 1 deletions
diff --git a/wram.asm b/wram.asm
index bdb15701..3e1e9684 100644
--- a/wram.asm
+++ b/wram.asm
@@ -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