diff options
| author | Daniel Harding <33dannye@gmail.com> | 2020-05-20 20:17:30 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-20 20:17:30 -0500 |
| commit | 500d99c258145d233af8d14cdb5c6e0200dfc1d8 (patch) | |
| tree | 7dbe7b152dde8a6e9b56664b5b8cdfc0d6be1253 /engine/palettes.asm | |
| parent | Merge pull request #39 from TiKevin83/master (diff) | |
| parent | Merge remote-tracking branch 'pokered/master' (diff) | |
| download | pokeyellow-500d99c258145d233af8d14cdb5c6e0200dfc1d8.tar.gz pokeyellow-500d99c258145d233af8d14cdb5c6e0200dfc1d8.tar.xz pokeyellow-500d99c258145d233af8d14cdb5c6e0200dfc1d8.zip | |
Merge pull request #50 from dannye/master
merge pokered
Diffstat (limited to 'engine/palettes.asm')
| -rwxr-xr-x | engine/palettes.asm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/engine/palettes.asm b/engine/palettes.asm index 3c25d4d2..ec9816ab 100755 --- a/engine/palettes.asm +++ b/engine/palettes.asm @@ -78,7 +78,7 @@ SetPal_StatusScreen: ld bc, $10 call CopyData ld a, [wcf91] - cp VICTREEBEL + 1 + cp NUM_POKEMON_INDEXES + 1 jr c, .pokemon ld a, $1 ; not pokemon .pokemon @@ -155,7 +155,7 @@ SetPal_Overworld: ld a, [wCurMap] cp REDS_HOUSE_1F jr c, .townOrRoute - cp UNKNOWN_DUNGEON_2 + cp CERULEAN_CAVE_2F jr c, .normalDungeonOrBuilding cp NAME_RATERS_HOUSE jr c, .caveOrBruno @@ -401,7 +401,7 @@ GetPal_Pikachu:: ld a, [wCurMap] cp REDS_HOUSE_1F jr c, .townOrRoute - cp UNKNOWN_DUNGEON_2 + cp CERULEAN_CAVE_2F jr c, .normalDungeonOrBuilding cp NAME_RATERS_HOUSE jr c, .caveOrBruno @@ -484,7 +484,7 @@ SendSGBPacket: _SendSGBPacket: ;check number of packets ld a, [hl] - and a, $07 + and $07 ret z ; store number of packets in B ld b, a |