From bb97b63af1fbeca208cb30a41f8195b4408821dc Mon Sep 17 00:00:00 2001 From: luckytyphlosion Date: Sun, 18 Oct 2015 15:37:40 -0400 Subject: Complete documentation of bank3 Also: split out bcd predefs from yellow/main.asm, start removing traces of W_ --- engine/palettes.asm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'engine/palettes.asm') 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 -- cgit v1.3.1-sl0p