diff options
Diffstat (limited to 'battle')
| -rw-r--r-- | battle/anim_commands.asm | 6 | ||||
| -rw-r--r-- | battle/bg_effects.asm | 8 | ||||
| -rw-r--r-- | battle/core.asm | 12 |
3 files changed, 13 insertions, 13 deletions
diff --git a/battle/anim_commands.asm b/battle/anim_commands.asm index 064920afe..ebc6a8a43 100644 --- a/battle/anim_commands.asm +++ b/battle/anim_commands.asm @@ -1437,13 +1437,13 @@ Functioncc91a: ; cc91a ld a, $5 ld [rSVBK], a ld hl, BGPals - ld de, wMapPals + ld de, UnknBGPals ld a, [rBGP] ld b, a ld c, $7 call CopyPals ld hl, OBPals - ld de, Unkn2Pals + ld de, UnknOBPals ld a, [rBGP] ld b, a ld c, $2 @@ -1465,7 +1465,7 @@ Functioncc94b: ; cc94b ld a, $5 ld [rSVBK], a ld hl, OBPals + $10 - ld de, Unkn2Pals + $10 + ld de, UnknOBPals + $10 ld a, [rOBP0] ld b, a ld c, $2 diff --git a/battle/bg_effects.asm b/battle/bg_effects.asm index da3d6b4a1..b6b1901da 100644 --- a/battle/bg_effects.asm +++ b/battle/bg_effects.asm @@ -2571,12 +2571,12 @@ Functionc8e52: ; c8e52 (32:4e52) push bc push af ld hl, BGPals ; BGPals - ld de, wMapPals ; wd000 + ld de, UnknBGPals ; wd000 ld b, a ld c, $1 call CopyPals ld hl, OBPals + 8 - ld de, Unkn2Pals + 8 + ld de, UnknOBPals + 8 pop af ld b, a ld c, $1 @@ -2598,12 +2598,12 @@ Functionc8e7f: ; c8e7f (32:4e7f) push bc push af ld hl, BGPals + 8 - ld de, wMapPals + 8 + ld de, UnknBGPals + 8 ld b, a ld c, $1 call CopyPals ld hl, OBPals ; OBPals - ld de, Unkn2Pals ; wd040 + ld de, UnknOBPals ; wd040 pop af ld b, a ld c, $1 diff --git a/battle/core.asm b/battle/core.asm index 008535576..15ee3caa4 100644 --- a/battle/core.asm +++ b/battle/core.asm @@ -2916,7 +2916,7 @@ ForcePlayerMonChoice: ; 3d227 call ExitMenu call LoadTileMapToTempTileMap call WaitBGMap - call ClearSGB + call GetMemSGBLayout call SetPalettes xor a ld c, a @@ -2935,7 +2935,7 @@ ForcePlayerMonChoice: ; 3d227 call DelayFrame call _LoadHPBar call WriteBackup - call ClearSGB + call GetMemSGBLayout call SetPalettes call SendOutPkmnText call NewBattleMonStatus @@ -5372,7 +5372,7 @@ Function3e299: call _LoadHPBar call WriteBackup call LoadTileMapToTempTileMap - call ClearSGB + call GetMemSGBLayout call SetPalettes jp BattleMenu ; 3e2f5 @@ -5454,7 +5454,7 @@ Function3e358: ; 3e358 call ClearSprites call _LoadHPBar call WriteBackup - call ClearSGB + call GetMemSGBLayout call SetPalettes ld a, [CurPartyMon] ld [CurBattleMon], a @@ -8450,7 +8450,7 @@ Function3f486: ; 3f486 ld hl, EnemyMonDVs predef GetUnownLetter ld de, VTiles2 - predef Function5108b + predef FrontpicPredef pop af ld [CurPartySpecies], a ret @@ -8659,7 +8659,7 @@ InitEnemyWildmon: ; 3f607 ld [wdef4], a .skip_unown ld de, VTiles2 - predef Function5108b + predef FrontpicPredef xor a ld [TrainerClass], a ld [hFillBox], a |