summaryrefslogtreecommitdiff
path: root/engine/menu/naming_screen.asm
diff options
context:
space:
mode:
authorDaniel Harding <corrnondacqb@yahoo.com>2015-08-18 10:32:50 -0500
committerDaniel Harding <corrnondacqb@yahoo.com>2015-08-18 10:32:50 -0500
commit1a987d1e1ab96ca9553d4253c72858057332a03a (patch)
treed101dc054e112304f327a5359532ee972e8da81a /engine/menu/naming_screen.asm
parentfb0a630c062cbb18026abe2792339dea27fac4d8 (diff)
parent696cffd3ae51d23855a7eb1fc5b62e69198dbf36 (diff)
Merge pull request #114 from YamaArashi/master
Commented SGB palettes and other things
Diffstat (limited to 'engine/menu/naming_screen.asm')
-rwxr-xr-xengine/menu/naming_screen.asm6
1 files changed, 3 insertions, 3 deletions
diff --git a/engine/menu/naming_screen.asm b/engine/menu/naming_screen.asm
index 85111cd6..978216c8 100755
--- a/engine/menu/naming_screen.asm
+++ b/engine/menu/naming_screen.asm
@@ -88,8 +88,8 @@ DisplayNamingScreen: ; 6596 (1:6596)
call GBPalWhiteOutWithDelay3
call ClearScreen
call UpdateSprites
- ld b, $8
- call GoPAL_SET
+ ld b, SET_PAL_GENERIC
+ call RunPaletteCommand
call LoadHpBarAndStatusTilePatterns
call LoadEDTile
callba LoadMonPartySpriteGfx
@@ -163,7 +163,7 @@ DisplayNamingScreen: ; 6596 (1:6596)
call GBPalWhiteOutWithDelay3
call ClearScreen
call ClearSprites
- call GoPAL_SET_CF1C
+ call RunDefaultPaletteCommand
call GBPalNormal
xor a
ld [W_SUBANIMTRANSFORM], a