diff options
Diffstat (limited to 'engine')
| -rwxr-xr-x | engine/dumps/bank03.asm | 6 | ||||
| -rw-r--r-- | engine/intro.asm (renamed from engine/Intro.asm) | 24 | ||||
| -rw-r--r-- | engine/predef.asm | 4 | ||||
| -rw-r--r-- | engine/title.asm | 9 |
4 files changed, 15 insertions, 28 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 diff --git a/engine/Intro.asm b/engine/intro.asm index 55f8c3f..ad8fb3e 100644 --- a/engine/Intro.asm +++ b/engine/intro.asm @@ -9,7 +9,7 @@ DemoStart:: ; 558D call FadeInIntroPic ld hl, OakSpeechDemo call PrintText - call RotateThreePalettesRight + call GBFadeOutToWhite call ClearTileMap ld de, ProtagonistPic lb bc, BANK(ProtagonistPic), $00 @@ -27,7 +27,7 @@ GameStart:: ; 55BB call FadeInIntroPic ld hl, OakSpeech1 call PrintText - call RotateThreePalettesRight + call GBFadeOutToWhite call ClearTileMap ld a, DEX_YADOKING ld [wCurSpecies], a @@ -43,7 +43,7 @@ GameStart:: ; 55BB call PlayCry ld hl, OakSpeech3 call PrintText - call RotateThreePalettesRight + call GBFadeOutToWhite call ClearTileMap ld de, ProtagonistPic lb bc, BANK(ProtagonistPic), $00 @@ -52,7 +52,7 @@ GameStart:: ; 55BB ld hl, OakSpeech4 call PrintText call ChoosePlayerName - call RotateThreePalettesRight + call GBFadeOutToWhite call ClearTileMap ld de, RivalPic lb bc, BANK(RivalPic), $00 @@ -61,7 +61,7 @@ GameStart:: ; 55BB ld hl, OakSpeech5 call PrintText call ChooseRivalName - call RotateThreePalettesRight + call GBFadeOutToWhite call ClearTileMap ld de, OakPic lb bc, BANK(OakPic), $00 @@ -71,12 +71,12 @@ GameStart:: ; 55BB call PrintText callba SetClockDialog call Function04ac - call RotateThreePalettesRight + call GBFadeOutToWhite call ClearTileMap ld de, ProtagonistPic lb bc, BANK(ProtagonistPic), $00 call IntroDisplayPicCenteredOrUpperRight - call RotateThreePalettesLeft + call GBFadeInFromWhite ld hl, OakSpeech7 call PrintText ldh a, [hROMBank] @@ -116,7 +116,7 @@ IntroCleanup:: ; 568E call LoadFontExtra ld c, $32 call DelayFrames - call RotateThreePalettesRight + call GBFadeOutToWhite call ClearTileMap call Function0502 ld a, $00 @@ -499,14 +499,14 @@ ChoosePlayerName:: ; 5B25 cp "@" jr z, .loop - call RotateThreePalettesRight + call GBFadeOutToWhite call ClearTileMap call LoadFontExtra call WaitBGMap ld de, $4D10 ld bc, $1200 call IntroDisplayPicCenteredOrUpperRight - call RotateThreePalettesLeft + call GBFadeInFromWhite .farjump ld hl, ChoosePlayerNameEndText call PrintText @@ -552,14 +552,14 @@ ChooseRivalName:: ; 5BA9 cp "@" jr z, .loop - call RotateThreePalettesRight + call GBFadeOutToWhite call ClearTileMap call LoadFontExtra call WaitBGMap ld de, $4BD4 ld bc, $1200 call IntroDisplayPicCenteredOrUpperRight - call RotateThreePalettesLeft + call GBFadeInFromWhite .farjump ld hl, ChooseRivalNameEndText call PrintText diff --git a/engine/predef.asm b/engine/predef.asm index c9293b4..92fed51 100644 --- a/engine/predef.asm +++ b/engine/predef.asm @@ -1,10 +1,6 @@ INCLUDE "constants.asm" -; if DEBUG SECTION "engine/predef.asm", ROMX -; else -; SECTION "Predef pointers", ROMX[$62AD], BANK[$01] -; endc GetPredefPointer:: ; 1:62b0 ld a, h diff --git a/engine/title.asm b/engine/title.asm index c39abdd..5abeade 100644 --- a/engine/title.asm +++ b/engine/title.asm @@ -420,12 +420,8 @@ TitleSeq_TitleScreenInputAndTimeout:: jr .psbtn_nextseq .psbtn_gotodebug -if DEBUG ld a, $01 ; DebugMenu jr .psbtn_nextseq -else - ret -endc .psbtn_sramclear ld a, $02 @@ -629,12 +625,7 @@ SetTitleGfxNext:: jr nz, .loop ret -; if DEBUG SECTION "engine/title.asm@Title screen TEMPORARY", ROMX -; else -; SECTION "Title screen TEMPORARY", ROMX[$62A2], BANK[$01] ; TODO: merge this with the main section above -; endc - GameInit:: call ClearWindowData |