diff options
| author | U-Fish-PC\Daniel <corrnondacqb@yahoo.com> | 2014-05-19 10:38:20 -0400 |
|---|---|---|
| committer | U-Fish-PC\Daniel <corrnondacqb@yahoo.com> | 2014-05-19 16:05:19 -0400 |
| commit | 1a0992a2f16ba2026c7fbf9fcfd1576a0f81c329 (patch) | |
| tree | 0981af81f93d33b07cbfe47674d87ae4aa2d46b0 /wram.asm | |
| parent | 82ffb336a975fe8cf9c3953fc380339feaae65b3 (diff) | |
| parent | d218d1972a9be5b9d0025a17842239e1fbf5b622 (diff) | |
Merge branch 'master' of https://github.com/huderlem/pokered into pull-data
Conflicts:
main.asm
text.asm
text/maps/route_22.asm
Diffstat (limited to 'wram.asm')
| -rwxr-xr-x | wram.asm | 14 |
1 files changed, 12 insertions, 2 deletions
@@ -964,7 +964,12 @@ W_YBLOCKCOORD:: ; d363 ds 1 W_XBLOCKCOORD:: ; d364 - ds 3 + ds 1 + +wLastMap:: ; d365 + ds 1 + + ds 1 W_CURMAPTILESET:: ; d367 ds 1 @@ -1323,7 +1328,12 @@ W_RIVALSTARTER:: ; d715 W_PLAYERSTARTER:: ; d717 ds 1 - ds 27 + ds 1 + +wLastBlackoutMap:: ; d719 + ds 1 + + ds 25 W_FLAGS_D733:: ; d733 |