diff options
| author | U-Fish-PC\Daniel <corrnondacqb@yahoo.com> | 2014-01-23 14:02:16 -0500 |
|---|---|---|
| committer | U-Fish-PC\Daniel <corrnondacqb@yahoo.com> | 2014-01-23 14:02:16 -0500 |
| commit | a60d16d89c257e321a86acff727299d3a74c489e (patch) | |
| tree | 8ea0846b554911a5c0d4ea794235c5e770282819 /wram.asm | |
| parent | 966fa8a5cff06a754bad4ec5789bc6fe9b9fdad1 (diff) | |
| parent | 47ec18ffa3c5a012b5210fecf3d1492a6fea2667 (diff) | |
Merge branch 'master' of https://github.com/iimarckus/pokered
Diffstat (limited to 'wram.asm')
| -rw-r--r-- | wram.asm | 25 |
1 files changed, 23 insertions, 2 deletions
@@ -1421,7 +1421,19 @@ W_PLAYTIMEFRAMES: ; da45 W_NUMSAFARIBALLS: ; da47 ds 1 - ds 56 +W_DAYCARE_IN_USE: ; da48 +; 0 if no pokemon is in the daycare +; 1 if pokemon is in the daycare + ds 1 + +W_DAYCAREMONNAME: ; da49 + ds 11 + +W_DAYCAREMONOT: ; da54 + ds 11 + +W_DAYCAREMONDATA: ; da5f + ds 33 W_NUMINBOX: ; da80 ; number of mons in current box @@ -1432,5 +1444,14 @@ W_BOXMON1DATA: ; da96 W_BOXMON2DATA: ; dab7 ds 33 * 19 -; dd2a +W_BOXMON1OT: ; dd2a + ds 11 +W_BOXMON2OT: ; dd35 + ds 11 * 19 + +W_BOXMON1NAME: ; de06 + ds 11 +W_BOXMON2NAME: ; de11 + ds 11 * 19 +; dee2 |