diff options
| author | luckytyphlosion <alan.rj.huang@gmail.com> | 2015-08-30 18:56:44 -0400 |
|---|---|---|
| committer | luckytyphlosion <alan.rj.huang@gmail.com> | 2015-08-30 18:56:44 -0400 |
| commit | 2b7961759b3786725b95ee8f4a0b6e556091db7a (patch) | |
| tree | 6287d4bb7bad7d012f804dc18856341a09fc015b /wram.asm | |
| parent | Merge branch 'master' of https://github.com/iimarckus/pokered (diff) | |
| download | pokeyellow-2b7961759b3786725b95ee8f4a0b6e556091db7a.tar.gz pokeyellow-2b7961759b3786725b95ee8f4a0b6e556091db7a.tar.xz pokeyellow-2b7961759b3786725b95ee8f4a0b6e556091db7a.zip | |
Fixes.
Diffstat (limited to 'wram.asm')
| -rwxr-xr-x | wram.asm | 4 |
1 files changed, 1 insertions, 3 deletions
@@ -847,8 +847,6 @@ wCoordIndex:: ; cd3d wOptionsTextSpeedCursorX:: ; cd3d -wBoxNumString:: ; cd3d - wTrainerInfoTextBoxWidthPlus1:: ; cd3d wSwappedMenuItem:: ; cd3d @@ -1367,7 +1365,6 @@ wExpAmountGained:: ; cf4b wcf4b:: ds 2 ; storage buffer for various strings wGainBoostedExp:: ; cf4d ->>>>>>> 1a987d1e1ab96ca9553d4253c72858057332a03a ds 1 ds 17 @@ -2103,6 +2100,7 @@ wEvolutionOccurred:: ; d121 wVBlankSavedROMBank:: ; d122 ds 1 +wFarCopyDataSavedROMBank:: ; d123 ds 1 wIsKeyItem:: ; d124 |