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 /maps | |
| parent | e4f053e312b7cce44e2b4e9b8449f3e724dda0bc (diff) | |
| parent | e9e60965a8ebe4939eb226832e21449c188d8e46 (diff) | |
Resolved conflict caused by my changes.
Diffstat (limited to 'maps')
| -rw-r--r-- | maps/Route1P2.asm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/maps/Route1P2.asm b/maps/Route1P2.asm index ae7e399..29b74f1 100644 --- a/maps/Route1P2.asm +++ b/maps/Route1P2.asm @@ -48,7 +48,7 @@ Route1P2Script:: ; 7C7F Route1P2Text1: ; 7CA7 ld hl, Route1P2TextString4 call OpenTextbox - call RotateFourPalettesLeft + call GBFadeOutToBlack jp Init Route1P2Text2: ; 7CB3 |