diff options
| author | PikalaxALT <PikalaxALT@gmail.com> | 2015-12-28 10:57:04 -0500 |
|---|---|---|
| committer | PikalaxALT <PikalaxALT@gmail.com> | 2015-12-28 10:57:04 -0500 |
| commit | 57d4cb0edfd62ca403b1470c67ac4efbd761ec5a (patch) | |
| tree | 427023b8c124e46cf5bc29d3af564ccf536af431 /battle/core.asm | |
| parent | f030315b1fd797aa6765ac8cd8c35c0cd9b600a0 (diff) | |
trainer card
Diffstat (limited to 'battle/core.asm')
| -rw-r--r-- | battle/core.asm | 10 |
1 files changed, 5 insertions, 5 deletions
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 |