diff options
Diffstat (limited to 'battle')
-rw-r--r-- | battle/anim_commands.asm | 2 | ||||
-rw-r--r-- | battle/core.asm | 10 | ||||
-rw-r--r-- | battle/effect_commands.asm | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/battle/anim_commands.asm b/battle/anim_commands.asm index 4596f19d4..266b76af2 100644 --- a/battle/anim_commands.asm +++ b/battle/anim_commands.asm @@ -1169,7 +1169,7 @@ BattleAnimCmd_BeatUp: ; cc776 (33:4776) .done pop af ld [CurPartySpecies], a ; CurPartySpecies - ld b, SCGB_01 + ld b, SCGB_BATTLE_COLORS call GetSGBLayout pop af ld [rSVBK], a diff --git a/battle/core.asm b/battle/core.asm index 3abf99872..3dc8a4dc0 100644 --- a/battle/core.asm +++ b/battle/core.asm @@ -2994,7 +2994,7 @@ SetUpBattlePartyMenu_NoLoop: ; 3d2f7 SetUpBattlePartyMenu: ; switch to fullscreen menu? callba LoadPartyMenuGFX callba InitPartyMenuWithCancel - callba InitBattlePartyMenuPals + callba InitPartyMenuBGPal7 callba InitPartyMenuGFX ret ; 3d313 @@ -3141,7 +3141,7 @@ LostBattle: ; 3d38e jr nz, .LostLinkBattle ; Greyscale - ld b, SCGB_00 + ld b, SCGB_BATTLE_GRAYSCALE call GetSGBLayout call SetPalettes jr .end @@ -7360,7 +7360,7 @@ FinishBattleAnim: ; 3ee27 push bc push de push hl - ld b, SCGB_01 + ld b, SCGB_BATTLE_COLORS call GetSGBLayout call SetPalettes call DelayFrame @@ -8495,7 +8495,7 @@ BattleIntro: ; 3f4dd callba ClearBattleRAM call InitEnemy call BackUpVBGMap2 - ld b, SCGB_00 + ld b, SCGB_BATTLE_GRAYSCALE call GetSGBLayout ld hl, rLCDC res 6, [hl] @@ -9418,7 +9418,7 @@ InitBattleDisplay: ; 3fb6c ld [rWY], a call WaitBGMap call HideSprites - ld b, SCGB_01 + ld b, SCGB_BATTLE_COLORS call GetSGBLayout call SetPalettes ld a, $90 diff --git a/battle/effect_commands.asm b/battle/effect_commands.asm index ad89448da..0c7eafbc5 100644 --- a/battle/effect_commands.asm +++ b/battle/effect_commands.asm @@ -9168,7 +9168,7 @@ BattleCommand_BatonPass: ; 379c9 hlcoord 1, 0 lb bc, 4, 10 call ClearBox - ld b, SCGB_01 + ld b, SCGB_BATTLE_COLORS call GetSGBLayout call SetPalettes call BatonPass_LinkPlayerSwitch |