aboutsummaryrefslogtreecommitdiffstats
path: root/engine/trade.asm
diff options
context:
space:
mode:
authorYamaArashi <shadow962@live.com>2015-08-12 02:16:56 -0700
committerYamaArashi <shadow962@live.com>2015-08-12 02:16:56 -0700
commit64cfbcce7a71e6e75553575490fd60cbd61a5665 (patch)
treeb58d4f80d1b50d6db8306fb15323d144593d18f2 /engine/trade.asm
parentconstants for IntroMoveMon (diff)
downloadpokeyellow-64cfbcce7a71e6e75553575490fd60cbd61a5665.tar.gz
pokeyellow-64cfbcce7a71e6e75553575490fd60cbd61a5665.tar.xz
pokeyellow-64cfbcce7a71e6e75553575490fd60cbd61a5665.zip
commented SGB palette stuff
Diffstat (limited to 'engine/trade.asm')
-rwxr-xr-xengine/trade.asm12
1 files changed, 6 insertions, 6 deletions
diff --git a/engine/trade.asm b/engine/trade.asm
index b7c72520..16a3d6a9 100755
--- a/engine/trade.asm
+++ b/engine/trade.asm
@@ -268,8 +268,8 @@ Trade_DrawOpenEndOfLinkCable: ; 41298 (10:5298)
call Trade_ClearTileMap
ld b, vBGMap0 / $100
call CopyScreenTileBufferToVRAM
- ld b, $8
- call GoPAL_SET
+ ld b, SET_PAL_GENERIC
+ call RunPaletteCommand
; This function call is pointless. It just copies blank tiles to VRAM that was
; already filled with blank tiles.
@@ -727,10 +727,10 @@ Trade_CircleOAM3: ; 4159c (10:559c)
Trade_LoadMonSprite: ; 415a4 (10:55a4)
ld [wcf91], a
ld [wd0b5], a
- ld [wcf1d], a
- ld b, $b
- ld c, $0
- call GoPAL_SET
+ ld [wWholeScreenPaletteMonSpecies], a
+ ld b, SET_PAL_POKEMON_WHOLE_SCREEN
+ ld c, 0
+ call RunPaletteCommand
ld a, [H_AUTOBGTRANSFERENABLED]
xor $1
ld [H_AUTOBGTRANSFERENABLED], a