diff options
Diffstat (limited to 'engine/main_menu.asm')
| -rwxr-xr-x | engine/main_menu.asm | 50 |
1 files changed, 25 insertions, 25 deletions
diff --git a/engine/main_menu.asm b/engine/main_menu.asm index 7e22a02e..0dd1804b 100755 --- a/engine/main_menu.asm +++ b/engine/main_menu.asm @@ -92,7 +92,7 @@ Function5ae4: ; 5ae4 (1:5ae4) ret .asm_5af0 - ld a, [hCGB] + ldh a, [hCGB] cp $1 ld a, $1 ret nz @@ -132,7 +132,7 @@ Function5b27: ; 5b27 (1:5b27) and a ret z xor a - ld [hBGMapMode], a + ldh [hBGMapMode], a call Function5b45 ld hl, wOptions ld a, [hl] @@ -142,7 +142,7 @@ Function5b27: ; 5b27 (1:5b27) pop af ld [wOptions], a ld a, $1 - ld [hBGMapMode], a + ldh [hBGMapMode], a ret Function5b45: ; 5b45 (1:5b45) @@ -175,7 +175,7 @@ Function5b5b: ; 5b5b (1:5b5b) decoord 1, 14 call Function5bb8 decoord 4, 16 - ld a, [hHours] + ldh a, [hHours] ld c, a farcall PrintHour ld [hl], $9c @@ -229,7 +229,7 @@ Function5bb8: ; 5bb8 (1:5bb8) Function5bf7: ; 5bf7 (1:5bf7) xor a - ld [hMapAnims], a + ldh [hMapAnims], a call ClearTileMap call LoadFontsExtra call Functiond9e @@ -256,12 +256,12 @@ MainMenu_NewGame: ld a, $0 ld [wceec], a ld a, $f1 - ld [hMapEntryMethod], a + ldh [hMapEntryMethod], a jp FinishContinueFunction Function5c3a: ; 5c3a (1:5c3a) xor a - ld [hBGMapMode], a + ldh [hBGMapMode], a call Function5c41 ret @@ -276,16 +276,16 @@ Function5c41: ; 5c41 (1:5c41) xor a call ByteFill - ld a, [rLY] - ld [hSecondsBackup], a + ldh a, [rLY] + ldh [hSecondsBackup], a call DelayFrame - ld a, [hRandomSub] + ldh a, [hRandomSub] ld [wPlayerID], a - ld a, [rLY] - ld [hSecondsBackup], a + ldh a, [rLY] + ldh [hSecondsBackup], a call DelayFrame - ld a, [hRandomAdd] + ldh a, [hRandomAdd] ld [wPlayerID + 1], a ld hl, wPartyCount @@ -481,7 +481,7 @@ MainMenu_Continue: call LoadStandardMenuDataHeader call DisplaySaveInfoOnContinue ld a, $1 - ld [hBGMapMode], a + ldh [hBGMapMode], a ld c, 20 call DelayFrames call ConfirmContinue @@ -514,7 +514,7 @@ MainMenu_Continue: cp $1 jr z, .asm_5e42 ld a, $f2 - ld [hMapEntryMethod], a + ldh [hMapEntryMethod], a jp FinishContinueFunction .asm_5e41 @@ -533,7 +533,7 @@ PostCreditsSpawn: ; 5e52 (1:5e52) xor a ld [wd1db], a ld a, $f1 - ld [hMapEntryMethod], a + ldh [hMapEntryMethod], a ret ConfirmContinue: ; 5e5b (1:5e5b) @@ -613,7 +613,7 @@ DisplayContinueDataWithRTCError: ; 5ec7 (1:5ec7) Continue_LoadMenuHeader: ; 5ed7 (1:5ed7) xor a - ld [hBGMapMode], a + ldh [hBGMapMode], a ld hl, .MenuDataHeader_Dex CheckFlag ENGINE_POKEDEX jr nz, .asm_5ee7 @@ -920,7 +920,7 @@ StorePlayerName: ; 6119 (1:6119) ret ShrinkPlayer: ; 6123 (1:6123) - ld a, [hROMBank] + ldh a, [hROMBank] push af ld a, 0 << 7 | 32 ; fade out @@ -986,11 +986,11 @@ MovePlayerPic push hl push de xor a - ld [hBGMapMode], a + ldh [hBGMapMode], a lb bc, 7, 7 predef PlaceGraphic xor a - ld [hBGMapThird], a + ldh [hBGMapThird], a call WaitBGMap call DelayFrame pop de @@ -1023,17 +1023,17 @@ IntroFadePalettes: Intro_WipeInFrontpic: ; 61c5 (1:61c5) ld a, $77 - ld [hWX], a + ldh [hWX], a call DelayFrame ld a, $e4 call DmgToCgbBGPals .asm_61d1 call DelayFrame - ld a, [hWX] + ldh a, [hWX] sub $8 cp $ff ret z - ld [hWX], a + ldh [hWX], a jr .asm_61d1 Intro_PrepTrainerPic: ; 61df, 61e0 (1:61df, 1:61e0) @@ -1042,7 +1042,7 @@ Intro_PrepTrainerPic: ; 61df, 61e0 (1:61df, 1:61e0) ld hl, $58a0 rst FarCall xor a - ld [hGraphicStartTile], a + ldh [hGraphicStartTile], a hlcoord 6, 4 lb bc, 7, 7 predef PlaceGraphic @@ -1053,7 +1053,7 @@ ShrinkFrame: ; 61f7 (1:61f7) ld c, $31 predef DecompressGet2bpp xor a - ld [hGraphicStartTile], a + ldh [hGraphicStartTile], a hlcoord 6, 4 lb bc, 7, 7 predef PlaceGraphic |