diff options
| author | yenatch <yenatch@gmail.com> | 2014-01-22 16:37:07 -0500 |
|---|---|---|
| committer | yenatch <yenatch@gmail.com> | 2014-01-22 16:37:07 -0500 |
| commit | 2c2111b7a5b38b8e7932810c0c6752fe472f45a9 (patch) | |
| tree | 7e7161936d31330c00b7273776cb93a1fd98708c /wram.asm | |
| parent | 93e1316e3db579cdbe95c86af09a97a9d7508308 (diff) | |
| parent | 47ec18ffa3c5a012b5210fecf3d1492a6fea2667 (diff) | |
Merge remote-tracking branch 'iimarckus/master' into resplit-audio
Conflicts:
main.asm
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 |