diff options
| author | SatoMew <SatoMew@users.noreply.github.com> | 2020-08-29 00:17:28 +0100 |
|---|---|---|
| committer | SatoMew <SatoMew@users.noreply.github.com> | 2020-08-29 00:17:28 +0100 |
| commit | 2bf30e571aa8d7268250a845784098df4c30f531 (patch) | |
| tree | 2378ea3077fe12b6eb3eb33c4e281a405c45dc97 /engine/dumps | |
| parent | e4f053e312b7cce44e2b4e9b8449f3e724dda0bc (diff) | |
| parent | e9e60965a8ebe4939eb226832e21449c188d8e46 (diff) | |
Resolved conflict caused by my changes.
Diffstat (limited to 'engine/dumps')
| -rwxr-xr-x | engine/dumps/bank03.asm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/engine/dumps/bank03.asm b/engine/dumps/bank03.asm index 39d1f78..2c2a21c 100755 --- a/engine/dumps/bank03.asm +++ b/engine/dumps/bank03.asm @@ -2196,7 +2196,7 @@ Function60a0: ; 03:60a0 call LoadMapPart call GetMemSGBLayout call WaitBGMap - call RotateThreePalettesLeft + call GBFadeInFromWhite .sub_e155 pop bc ld a, b @@ -3342,7 +3342,7 @@ Functione8f9: ; 03:68f9 ld hl, NamingScreen push de call FarCall_hl - call RotateThreePalettesRight + call GBFadeOutToWhite pop de ld a, [de] cp $50 @@ -3364,7 +3364,7 @@ Functione8f9: ; 03:68f9 ld a, BANK(NamingScreen) ld hl, NamingScreen call FarCall_hl - call RotateThreePalettesRight + call GBFadeOutToWhite ld de, wdf17 ld a, [de] cp $50 |