diff options
| -rwxr-xr-x | engine/crystal_intro.asm | 16 | ||||
| -rwxr-xr-x | engine/intro_menu.asm | 10 |
2 files changed, 13 insertions, 13 deletions
diff --git a/engine/crystal_intro.asm b/engine/crystal_intro.asm index 33aa03fa3..0738464b4 100755 --- a/engine/crystal_intro.asm +++ b/engine/crystal_intro.asm @@ -1,4 +1,4 @@ -Functione4579: ; e4579 +Copyright_GFPresents: ; e4579 ld de, MUSIC_NONE call PlayMusic call ClearBGPalettes @@ -24,7 +24,7 @@ Functione4579: ; e4579 call DelayFrames call ClearTileMap callba GBCOnlyScreen - call Functione45e8 + call .GetGFLogoGFX .joy_loop call JoyTextDelay ld a, [hJoyLast] @@ -39,17 +39,17 @@ Functione4579: ; e4579 jr .joy_loop .pressed_button - call Functione465e + call .StopGamefreakAnim scf ret .finish - call Functione465e + call .StopGamefreakAnim and a ret ; e45e8 -Functione45e8: ; e45e8 +.GetGFLogoGFX: ; e45e8 ld de, GameFreakLogo ld hl, VTiles2 lb bc, BANK(GameFreakLogo), $1c @@ -106,7 +106,7 @@ Functione45e8: ; e45e8 ret ; e465e -Functione465e: ; e465e +.StopGamefreakAnim: ; e465e callba ClearSpriteAnims call ClearTileMap call ClearSprites @@ -380,7 +380,7 @@ CrystalIntro: ; e48ac push af ld a, [hVBlank] push af - call Functione4901 + call .InitRAMAddrs .loop: ; e48bc call JoyTextDelay ld a, [hJoyLast] @@ -418,7 +418,7 @@ CrystalIntro: ; e48ac ret ; e4901 -Functione4901: ; e4901 +.InitRAMAddrs: ; e4901 xor a ld [hVBlank], a ld a, $1 diff --git a/engine/intro_menu.asm b/engine/intro_menu.asm index e208abfc4..9423b13c1 100755 --- a/engine/intro_menu.asm +++ b/engine/intro_menu.asm @@ -1010,8 +1010,8 @@ Intro_PlacePlayerSprite: ; 61cd ; 620b -Function620b: ; 620b - callab Functione4579 +CrystalIntroSequence: ; 620b + callab Copyright_GFPresents jr c, StartTitleScreen callba CrystalIntro @@ -1068,8 +1068,8 @@ endr .jumptable dw _MainMenu dw Function6389 - dw Function620b - dw Function620b + dw CrystalIntroSequence + dw CrystalIntroSequence dw ResetClock ; 6274 @@ -1423,5 +1423,5 @@ GameInit:: ; 642e ld a, $90 ld [hWY], a call WaitBGMap - jp Function620b + jp CrystalIntroSequence ; 6454 |