diff options
| author | luckytyphlosion <alan.rj.huang@gmail.com> | 2015-10-18 15:37:40 -0400 |
|---|---|---|
| committer | luckytyphlosion <alan.rj.huang@gmail.com> | 2015-10-18 15:37:40 -0400 |
| commit | bb97b63af1fbeca208cb30a41f8195b4408821dc (patch) | |
| tree | 106b0bab693daa5335445b01c43a8cd4c851d231 /engine/palettes.asm | |
| parent | 35874024438c0a716ad3de8896207f02db56e7d1 (diff) | |
Complete documentation of bank3
Also: split out bcd predefs from yellow/main.asm, start removing traces
of W_
Diffstat (limited to 'engine/palettes.asm')
| -rwxr-xr-x | engine/palettes.asm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/engine/palettes.asm b/engine/palettes.asm index 8182315c..722b7804 100755 --- a/engine/palettes.asm +++ b/engine/palettes.asm @@ -147,7 +147,7 @@ SetPal_Overworld: ; 71fa5 (1c:5fa5) ld de, wPalPacket ld bc, $10 call CopyData - ld a, [W_CURMAPTILESET] + ld a, [wCurMapTileset] cp CEMETERY jr z, .PokemonTowerOrAgatha cp CAVERN @@ -222,7 +222,7 @@ SetPal_TrainerCard: ; 72025 (1c:6025) call CopyData ld de, BadgeBlkDataLengths ld hl, wTrainerCardBlkPacket + 2 - ld a, [W_OBTAINEDBADGES] + ld a, [wObtainedBadges] ld c, 8 .badgeLoop srl a @@ -391,7 +391,7 @@ Func_720e3:: ; 720e3 (1c:60e3) Func_7213b:: ; 7213b (1c:613b) ; similar to SetPal_Overworld - ld a, [W_CURMAPTILESET] + ld a, [wCurMapTileset] cp CEMETERY jr z, .PokemonTowerOrAgatha cp CAVERN |