diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-11-05 16:55:42 -0500 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-11-05 16:55:42 -0500 |
| commit | 3de7ab601d465581accfe3ff171aeed2808c9647 (patch) | |
| tree | ab357b894c9457b3d1d38fd49300df34412168f8 /engine/gfx | |
| parent | Remove trailing whitespace (diff) | |
| download | pokeyellow-3de7ab601d465581accfe3ff171aeed2808c9647.tar.gz pokeyellow-3de7ab601d465581accfe3ff171aeed2808c9647.tar.xz pokeyellow-3de7ab601d465581accfe3ff171aeed2808c9647.zip | |
Sync more with pokered
Diffstat (limited to 'engine/gfx')
| -rwxr-xr-x | engine/gfx/palettes.asm | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/engine/gfx/palettes.asm b/engine/gfx/palettes.asm index c08992d3..b480c6d0 100755 --- a/engine/gfx/palettes.asm +++ b/engine/gfx/palettes.asm @@ -19,7 +19,7 @@ _RunPaletteCommand: push de jp hl -SetPal_Black: +SetPal_BattleBlack: ld hl, PalPacket_Black ld de, BlkPacket_Battle ret @@ -30,7 +30,6 @@ SetPal_Battle: ld de, wPalPacket ld bc, $10 call CopyData - ;ld a, [wPlayerBattleStatus3] ld hl, wBattleMonSpecies ld a, [hl] and a @@ -42,7 +41,6 @@ SetPal_Battle: .asm_71ef9 call DeterminePaletteID ld b, a - ;ld a, [wEnemyBattleStatus3] ld hl, wEnemyMonSpecies2 call DeterminePaletteID ld c, a @@ -118,7 +116,7 @@ SetPal_Slots: ld de, BlkPacket_Slots ret -SetPal_Titlescreen: +SetPal_TitleScreen: ld hl, PalPacket_Titlescreen ld de, BlkPacket_Titlescreen ret @@ -267,13 +265,13 @@ SendUnknownPalPacket_72064:: SetPalFunctions: ; entries correspond to SET_PAL_* constants - dw SetPal_Black + dw SetPal_BattleBlack dw SetPal_Battle dw SetPal_TownMap dw SetPal_StatusScreen dw SetPal_Pokedex dw SetPal_Slots - dw SetPal_Titlescreen + dw SetPal_TitleScreen dw SetPal_NidorinoIntro dw SetPal_Generic dw SetPal_Overworld |