diff options
Diffstat (limited to 'engine/intro_menu.asm')
| -rwxr-xr-x | engine/intro_menu.asm | 64 |
1 files changed, 32 insertions, 32 deletions
diff --git a/engine/intro_menu.asm b/engine/intro_menu.asm index cf5bcf8a0..ddc728c4f 100755 --- a/engine/intro_menu.asm +++ b/engine/intro_menu.asm @@ -7,7 +7,7 @@ _MainMenu: ; 5ae8 ld [wMapMusic], a call PlayMusic callba MainMenu - jp Function6219 + jp StartTitleScreen ; 5b04 ; unreferenced @@ -50,7 +50,7 @@ NewGame_ClearTileMapEtc: ; 5b44 call ClearTileMap call LoadFontsExtra call LoadStandardFont - call ResetTextRelatedRAM + call ClearWindowData ret ; 5b54 @@ -353,7 +353,7 @@ LoadOrRegenerateLuckyIDNumber: ; 5d33 Continue: ; 5d65 callba TryLoadSaveFile jr c, .FailToLoad - callba Function150b9 + callba _LoadData call LoadStandardMenuDataHeader call DisplaySaveInfoOnContinue ld a, $1 @@ -450,9 +450,9 @@ ConfirmContinue: ; 5e34 call DelayFrame call GetJoypad ld hl, hJoyPressed - bit 0, [hl] + bit A_BUTTON_F, [hl] jr nz, .PressA - bit 1, [hl] + bit B_BUTTON_F, [hl] jr z, .loop scf ret @@ -545,9 +545,9 @@ Continue_LoadMenuHeader: ; 5ebf ld hl, .MenuDataHeader_NoDex .pokedex_header - call Function1e35 + call _OffsetMenuDataHeader call MenuBox - call Function1c89 + call PlaceVerticalMenuItems ret ; 5ed9 @@ -685,7 +685,7 @@ OakSpeech: ; 0x5f99 ld [TrainerClass], a call Intro_PrepTrainerPic - ld b, SCGB_1C + ld b, SCGB_FRONTPICPALS call GetSGBLayout call Intro_RotatePalettesLeftFrontpic @@ -706,7 +706,7 @@ OakSpeech: ; 0x5f99 ld [TempMonDVs], a ld [TempMonDVs + 1], a - ld b, SCGB_1C + ld b, SCGB_FRONTPICPALS call GetSGBLayout call Intro_WipeInFrontpic @@ -723,7 +723,7 @@ OakSpeech: ; 0x5f99 ld [TrainerClass], a call Intro_PrepTrainerPic - ld b, SCGB_1C + ld b, SCGB_FRONTPICPALS call GetSGBLayout call Intro_RotatePalettesLeftFrontpic @@ -736,7 +736,7 @@ OakSpeech: ; 0x5f99 ld [CurPartySpecies], a callba DrawIntroPlayerPic - ld b, SCGB_1C + ld b, SCGB_FRONTPICPALS call GetSGBLayout call Intro_RotatePalettesLeftFrontpic @@ -783,7 +783,7 @@ OakText7: ; 0x606f NamePlayer: ; 0x6074 callba MovePlayerPicRight callba ShowPlayerNamingChoices - ld a, [MenuSelection2] + ld a, [wMenuCursorY] dec a jr z, .NewName call StorePlayerName @@ -806,7 +806,7 @@ NamePlayer: ; 0x6074 ld [CurPartySpecies], a callba DrawIntroPlayerPic - ld b, SCGB_1C + ld b, SCGB_FRONTPICPALS call GetSGBLayout call RotateThreePalettesLeft @@ -828,8 +828,8 @@ NamePlayer: ; 0x6074 Function60e9: ; Unreferenced call LoadMenuDataHeader - call InterpretMenu2 - ld a, [MenuSelection2] + call VerticalMenu + ld a, [wMenuCursorY] dec a call CopyNameFromMenu call WriteBackup @@ -1003,19 +1003,19 @@ Intro_PlacePlayerSprite: ; 61cd .sprites ; 61fe db 4 - db $4c, $48, 0 - db $4c, $50, 1 - db $54, $48, 2 - db $54, $50, 3 + db 9 * 8 + 4, 9 * 8, 0 + db 9 * 8 + 4, 10 * 8, 1 + db 10 * 8 + 4, 9 * 8, 2 + db 10 * 8 + 4, 10 * 8, 3 ; 620b -Function620b: ; 620b - callab Functione4579 - jr c, Function6219 +CrystalIntroSequence: ; 620b + callab Copyright_GFPresents + jr c, StartTitleScreen callba CrystalIntro -Function6219: ; 6219 +StartTitleScreen: ; 6219 ld a, [rSVBK] push af ld a, $5 @@ -1036,7 +1036,7 @@ Function6219: ; 6219 ld hl, rLCDC res 2, [hl] call ClearScreen - call Function3200 + call WaitBGMap2 xor a ld [hLCDStatCustom], a ld [hSCX], a @@ -1067,9 +1067,9 @@ endr .jumptable dw _MainMenu - dw Function6389 - dw Function620b - dw Function620b + dw DeleteSaveData + dw CrystalIntroSequence + dw CrystalIntroSequence dw ResetClock ; 6274 @@ -1320,8 +1320,8 @@ TitleScreenEnd: ; 6375 ret ; 6389 -Function6389: ; 6389 - callba Function4d54c +DeleteSaveData: ; 6389 + callba _DeleteSaveData jp Init ; 6392 @@ -1336,7 +1336,7 @@ Function639b: ; unreferenced and $3 ret nz ld bc, SpriteAnim10 - ld hl, SpriteAnim10FrameIndex - SpriteAnim10 + ld hl, SPRITEANIMSTRUCT_FRAME add hl, bc ; over-the-top compicated way to load wc3ae into hl ld l, [hl] ld h, 0 @@ -1410,7 +1410,7 @@ CopyrightString: ; 63fd GameInit:: ; 642e callba TryLoadSaveData - call ResetTextRelatedRAM + call ClearWindowData call ClearBGPalettes call ClearTileMap ld a, VBGMap0 / $100 @@ -1423,5 +1423,5 @@ GameInit:: ; 642e ld a, $90 ld [hWY], a call WaitBGMap - jp Function620b + jp CrystalIntroSequence ; 6454 |