diff options
Diffstat (limited to 'engine')
| -rw-r--r-- | engine/battle/battle_transitions.asm | 8 | ||||
| -rw-r--r-- | engine/battle/ghost_marowak_anim.asm | 6 | ||||
| -rwxr-xr-x | engine/gamefreak.asm | 8 | ||||
| -rwxr-xr-x | engine/hall_of_fame.asm | 2 | ||||
| -rwxr-xr-x | engine/overworld/healing_machine.asm | 6 | ||||
| -rwxr-xr-x | engine/palettes.asm | 6 |
6 files changed, 18 insertions, 18 deletions
diff --git a/engine/battle/battle_transitions.asm b/engine/battle/battle_transitions.asm index 2ff681dd..c5c4ffbe 100644 --- a/engine/battle/battle_transitions.asm +++ b/engine/battle/battle_transitions.asm @@ -196,9 +196,9 @@ BattleTransition_BlackScreen: ; 70ad3 (1c:4ad3) ld [rBGP], a ld [rOBP0], a ld [rOBP1], a - call Func_3021 - call Func_3040 - call Func_3061 + call UpdateGBCPal_BGP + call UpdateGBCPal_OBP0 + call UpdateGBCPal_OBP1 ret ; for non-dungeon trainer battles @@ -362,7 +362,7 @@ BattleTransition_FlashScreen_: ; 70be8 (1c:4be8) cp $1 jr z, .done ld [rBGP], a - call Func_3021 + call UpdateGBCPal_BGP ld c, $2 call DelayFrames jr .loop diff --git a/engine/battle/ghost_marowak_anim.asm b/engine/battle/ghost_marowak_anim.asm index 719fcf0a..67ed3247 100644 --- a/engine/battle/ghost_marowak_anim.asm +++ b/engine/battle/ghost_marowak_anim.asm @@ -2,7 +2,7 @@ MarowakAnim: ; 7092b (1c:492b) ; animate the ghost being unveiled as a Marowak ld a, $e4 ld [rOBP1], a - call Func_3061 + call UpdateGBCPal_OBP1 call CopyMonPicFromBGToSpriteVRAM ; cover the BG ghost pic with a sprite ghost pic that looks the same ; now that the ghost pic is being displayed using sprites, clear the ghost pic from the BG tilemap coord hl, 12, 0 @@ -28,7 +28,7 @@ MarowakAnim: ; 7092b (1c:492b) sla a sla a ld [rOBP1], a - call Func_3061 + call UpdateGBCPal_OBP1 jr nz, .fadeOutGhostLoop call ClearSprites call CopyMonPicFromBGToSpriteVRAM ; copy Marowak pic from BG to sprite VRAM @@ -42,7 +42,7 @@ MarowakAnim: ; 7092b (1c:492b) srl b rra ld [rOBP1], a - call Func_3061 + call UpdateGBCPal_OBP1 ld a, b and a jr nz, .fadeInMarowakLoop diff --git a/engine/gamefreak.asm b/engine/gamefreak.asm index acbd5fc9..a5c0edef 100755 --- a/engine/gamefreak.asm +++ b/engine/gamefreak.asm @@ -3,8 +3,8 @@ LoadShootingStarGraphics: ; 70000 (1c:4000) ld [rOBP0], a ld a, $a4 ld [rOBP1], a ; $ff49 - call Func_3040 - call Func_3061 + call UpdateGBCPal_OBP0 + call UpdateGBCPal_OBP1 ld de, AnimationTileset2 ; $4757 ; star tile (top left quadrant) ld hl, vChars1 + $200 lb bc, BANK(AnimationTileset2), $01 @@ -77,7 +77,7 @@ AnimateShootingStar: ; 7004a (1c:404a) ld hl, rOBP0 ; $ff48 rrc [hl] rrc [hl] - call Func_3040 + call UpdateGBCPal_OBP0 ld c, 10 call CheckForUserInterruption ret c @@ -223,7 +223,7 @@ MoveDownSmallStars: ; 70142 (1c:4142) ld a, [rOBP1] ; $ff49 xor %10100000 ld [rOBP1], a ; $ff49 - call Func_3061 + call UpdateGBCPal_OBP1 ld c, 3 call CheckForUserInterruption ret c diff --git a/engine/hall_of_fame.asm b/engine/hall_of_fame.asm index d8ca2d2b..cf7a3caa 100755 --- a/engine/hall_of_fame.asm +++ b/engine/hall_of_fame.asm @@ -121,7 +121,7 @@ HoFShowMonOrPlayer: ; 702a2 (1c:42a2) call RunPaletteCommand ld a, %11100100 ld [rBGP], a - call Func_3021 + call UpdateGBCPal_BGP ld c, $31 ; back pic call HoFLoadMonPlayerPicTileIDs ld d, $a0 diff --git a/engine/overworld/healing_machine.asm b/engine/overworld/healing_machine.asm index 320cda73..daaf33b2 100755 --- a/engine/overworld/healing_machine.asm +++ b/engine/overworld/healing_machine.asm @@ -12,7 +12,7 @@ AnimateHealingMachine: ; 7048b (1c:448b) push af ld a, $e0 ld [rOBP1], a ; $ff49 - call Func_3061 + call UpdateGBCPal_OBP1 ld hl, wOAMBuffer + $84 ld de, PokeCenterOAMData ; $44d7 call CopyHealingMachineOAM @@ -54,7 +54,7 @@ AnimateHealingMachine: ; 7048b (1c:448b) call DelayFrames pop af ld [rOBP1], a ; $ff49 - call Func_3061 + call UpdateGBCPal_OBP1 pop hl pop af ld [hl], a @@ -79,7 +79,7 @@ FlashSprite8Times: ; 70547 (1c:4547) ld a, [rOBP1] xor d ld [rOBP1], a - call Func_3061 + call UpdateGBCPal_OBP1 ld c, 10 call DelayFrames dec b diff --git a/engine/palettes.asm b/engine/palettes.asm index 2668236a..58efd103 100755 --- a/engine/palettes.asm +++ b/engine/palettes.asm @@ -849,17 +849,17 @@ Func_7240f:: ; 7240f (1c:640f) and a jr nz,.asm_72419 ld a,[rBGP] - ld [wdef2],a + ld [wLastBGP],a jr .asm_72428 .asm_72419 dec a jr nz,.asm_72423 ld a,[rOBP0] - ld [wdef3],a + ld [wLastOBP0],a jr .asm_72428 .asm_72423 ld a,[rOBP1] - ld [wdef4],a + ld [wLastOBP1],a .asm_72428 ld b,a and $3 |