diff options
| author | dannye <33dannye@gmail.com> | 2021-09-26 22:38:47 -0500 |
|---|---|---|
| committer | dannye <33dannye@gmail.com> | 2021-09-26 22:43:09 -0500 |
| commit | 501a21fa5dc6f01c0563316c9cd209cccb1eef45 (patch) | |
| tree | c2fe5cc6caa9d8117df3008031d7a26317058acb /wram.asm | |
| parent | Switch from Travis CI to GitHub Actions (diff) | |
| parent | Fix typos (#334) (diff) | |
| download | pokeyellow-501a21fa5dc6f01c0563316c9cd209cccb1eef45.tar.gz pokeyellow-501a21fa5dc6f01c0563316c9cd209cccb1eef45.tar.xz pokeyellow-501a21fa5dc6f01c0563316c9cd209cccb1eef45.zip | |
Merge branch 'master' of https://github.com/pret/pokered
Diffstat (limited to 'wram.asm')
| -rw-r--r-- | wram.asm | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -147,7 +147,7 @@ wSpritePikachuStateData2:: spritestatedata2 wSpritePikachuStateData2 ; pikachu i ; The high byte of a pointer to anywhere within wSpriteStateData1 can be incremented ; to reach within wSpriteStateData2, and vice-versa for decrementing. ASSERT HIGH(wSpriteStateData1) + 1 == HIGH(wSpriteStateData2) -ASSERT LOW(wSpriteStateData1) == 0 +ASSERT LOW(wSpriteStateData1) == 0 && LOW(wSpriteStateData2) == 0 wSpriteDataEnd:: @@ -1228,7 +1228,7 @@ wPartyMenuBlkPacket:: ds $30 NEXTU ds 29 ; storage buffer for various strings -wcf4b:: ds 20 +wStringBuffer:: ds 20 NEXTU ds 29 |