diff options
| author | YamaArashi <shadow962@live.com> | 2015-08-12 02:16:56 -0700 |
|---|---|---|
| committer | YamaArashi <shadow962@live.com> | 2015-08-12 02:16:56 -0700 |
| commit | 64cfbcce7a71e6e75553575490fd60cbd61a5665 (patch) | |
| tree | b58d4f80d1b50d6db8306fb15323d144593d18f2 /home | |
| parent | constants for IntroMoveMon (diff) | |
| download | pokeyellow-64cfbcce7a71e6e75553575490fd60cbd61a5665.tar.gz pokeyellow-64cfbcce7a71e6e75553575490fd60cbd61a5665.tar.xz pokeyellow-64cfbcce7a71e6e75553575490fd60cbd61a5665.zip | |
commented SGB palette stuff
Diffstat (limited to 'home')
| -rw-r--r-- | home/overworld.asm | 8 | ||||
| -rw-r--r-- | home/vblank.asm | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/home/overworld.asm b/home/overworld.asm index eba47df2..6b3a75c6 100644 --- a/home/overworld.asm +++ b/home/overworld.asm @@ -659,8 +659,8 @@ CheckMapConnections:: ; 07ba (0:07ba) .loadNewMap ; load the connected map that was entered call LoadMapHeader call PlayDefaultMusicFadeOutCurrent - ld b,$09 - call GoPAL_SET + ld b, SET_PAL_OVERWORLD + call RunPaletteCommand ; Since the sprite set shouldn't change, this will just update VRAM slots at ; $C2XE without loading any tile patterns. callba InitMapSprites @@ -2343,8 +2343,8 @@ LoadMapData:: ; 1241 (0:1241) ld a,$01 ld [wUpdateSpritesEnabled],a call EnableLCD - ld b,$09 - call GoPAL_SET + ld b, SET_PAL_OVERWORLD + call RunPaletteCommand call LoadPlayerSpriteGraphics ld a,[wd732] and a,1 << 4 | 1 << 3 ; fly warp or dungeon warp diff --git a/home/vblank.asm b/home/vblank.asm index 3bdbe7cb..8ffae9f1 100644 --- a/home/vblank.asm +++ b/home/vblank.asm @@ -74,7 +74,7 @@ VBlank:: callba TrackPlayTime ; keep track of time played - ld a, [$fff9] + ld a, [hDisableJoypadPolling] and a call z, ReadJoypad |