summaryrefslogtreecommitdiff
path: root/home.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 /home.asm
parentfb0a630c062cbb18026abe2792339dea27fac4d8 (diff)
parent696cffd3ae51d23855a7eb1fc5b62e69198dbf36 (diff)
Merge pull request #114 from YamaArashi/master
Commented SGB palettes and other things
Diffstat (limited to 'home.asm')
-rw-r--r--home.asm10
1 files changed, 5 insertions, 5 deletions
diff --git a/home.asm b/home.asm
index e1fbc0f2..0d7c5271 100644
--- a/home.asm
+++ b/home.asm
@@ -2706,7 +2706,7 @@ IsItemInBag:: ; 3493 (0:3493)
; set zero flag if item isn't in player's bag
; else reset zero flag
; related to Pokémon Tower and ghosts
- predef IsItemInBag_
+ predef GetQuantityOfItemInBag
ld a,b
and a
ret
@@ -4469,7 +4469,7 @@ RestoreScreenTilesAndReloadTilePatterns:: ; 3dbe (0:3dbe)
call ReloadMapSpriteTilePatterns
call LoadScreenTilesFromBuffer2
call LoadTextBoxTilePatterns
- call GoPAL_SET_CF1C
+ call RunDefaultPaletteCommand
jr Delay3
@@ -4499,13 +4499,13 @@ GBPalWhiteOut::
ret
-GoPAL_SET_CF1C:: ; 3ded (0:3ded)
+RunDefaultPaletteCommand:: ; 3ded (0:3ded)
ld b,$ff
-GoPAL_SET:: ; 3def (0:3def)
+RunPaletteCommand:: ; 3def (0:3def)
ld a,[wOnSGB]
and a
ret z
- predef_jump Func_71ddf
+ predef_jump _RunPaletteCommand
GetHealthBarColor::
; Return at hl the palette of