diff options
| author | dannye <33dannye@gmail.com> | 2025-01-30 21:40:19 -0600 |
|---|---|---|
| committer | dannye <33dannye@gmail.com> | 2025-01-30 21:40:19 -0600 |
| commit | 6cb885a9f68b9f445d7fa45279731336fe0247d4 (patch) | |
| tree | 39736ab1dd8ebcc57f8e981db6103285743d5530 /engine/movie/trade.asm | |
| parent | Identify unnamed functions in map_sprites.asm (#126) (diff) | |
| parent | Fix some label typos, and add some constants instead of raw numbers (#492) (diff) | |
| download | pokeyellow-6cb885a9f68b9f445d7fa45279731336fe0247d4.tar.gz pokeyellow-6cb885a9f68b9f445d7fa45279731336fe0247d4.tar.xz pokeyellow-6cb885a9f68b9f445d7fa45279731336fe0247d4.zip | |
Merge branch 'master' of https://github.com/pret/pokered
Diffstat (limited to 'engine/movie/trade.asm')
| -rw-r--r-- | engine/movie/trade.asm | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/engine/movie/trade.asm b/engine/movie/trade.asm index be826996..dfbe643f 100644 --- a/engine/movie/trade.asm +++ b/engine/movie/trade.asm @@ -183,7 +183,7 @@ LoadTradingGFXAndMonNames: ld a, $f0 ; SGB OBP0 .next ldh [rOBP0], a - call UpdateGBCPal_OBP0 + call UpdateCGBPal_OBP0 call EnableLCD xor a ldh [hAutoBGTransferEnabled], a @@ -201,7 +201,7 @@ LoadTradingGFXAndMonNames: Trade_LoadMonPartySpriteGfx: ld a, %11010000 ldh [rOBP1], a - call UpdateGBCPal_OBP1 + call UpdateCGBPal_OBP1 farjp LoadMonPartySpriteGfx Trade_SwapNames: @@ -305,7 +305,7 @@ Trade_AnimateBallEnteringLinkCable: call DelayFrames ld a, %11100100 ldh [rOBP0], a - call UpdateGBCPal_OBP0 + call UpdateCGBPal_OBP0 xor a ld [wLinkCableAnimBulgeToggle], a lb bc, $20, $60 @@ -386,7 +386,7 @@ Trade_AnimLeftToRight: ld [wTradedMonMovingRight], a ld a, %11100100 ldh [rOBP0], a - call UpdateGBCPal_OBP0 + call UpdateCGBPal_OBP0 ld a, $54 ld [wBaseCoordX], a ld a, $1c @@ -604,7 +604,7 @@ Trade_AnimCircledMon: ldh a, [rBGP] xor $3c ; make link cable flash ldh [rBGP], a - call UpdateGBCPal_BGP + call UpdateCGBPal_BGP ld hl, wShadowOAMSprite00TileID ld de, $4 ld c, $14 |