diff options
Diffstat (limited to 'home.asm')
| -rw-r--r-- | home.asm | 48 |
1 files changed, 24 insertions, 24 deletions
@@ -317,15 +317,15 @@ PrintLetterDelay:: ; 313d ; mid: 3 frames ; slow: 5 frames -; TextBoxFrame + 1[!0] and A or B override text speed with a one-frame delay. -; Options[4] and TextBoxFrame + 1[!1] disable the delay. +; TextBoxFlags[!0] and A or B override text speed with a one-frame delay. +; Options[4] and TextBoxFlags[!1] disable the delay. ld a, [Options] bit NO_TEXT_SCROLL, a ret nz ; non-scrolling text? - ld a, [TextBoxFrame + 1] + ld a, [TextBoxFlags] bit 1, a ret z @@ -342,7 +342,7 @@ PrintLetterDelay:: ; 313d ld [hl], a ; force fast scroll? - ld a, [TextBoxFrame + 1] + ld a, [TextBoxFlags] bit 0, a jr z, .fast @@ -542,7 +542,7 @@ WaitBGMap:: ; 31f6 ret ; 3200 -Function3200:: ; 0x3200 +WaitBGMap2:: ; 0x3200 ld a, [hCGB] and a jr z, .bg0 @@ -1146,26 +1146,26 @@ GetMoveName:: ; 34f8 ; 350c -HandleScrollingMenu:: ; 350c +ScrollingMenu:: ; 350c call CopyMenuData2 ld a, [hROMBank] push af - ld a, BANK(Function245af) + ld a, BANK(_ScrollingMenu) rst Bankswitch - call Function245af - call Function3524 - call Function245cb + call _InitScrollingMenu + call .UpdatePalettes + call _ScrollingMenu pop af rst Bankswitch - ld a, [wcf73] + ld a, [wMenuJoypad] ret ; 3524 -Function3524:: ; 3524 +.UpdatePalettes ; 3524 ld hl, VramState bit 0, [hl] jp nz, UpdateTimePals @@ -1714,7 +1714,7 @@ DrawBattleHPBar:: ; 3750 PrepMonFrontpic:: ; 3786 ld a, $1 - ld [wc2c6], a + ld [wBoxAlignment], a _PrepMonFrontpic:: ; 378b ld a, [CurPartySpecies] @@ -1730,12 +1730,12 @@ _PrepMonFrontpic:: ; 378b lb bc, 7, 7 predef FillBox xor a - ld [wc2c6], a + ld [wBoxAlignment], a ret .not_pokemon xor a - ld [wc2c6], a + ld [wBoxAlignment], a inc a ld [CurPartySpecies], a ret @@ -2019,13 +2019,13 @@ Function3b0c:: ; 3b0c _InitSpriteAnimStruct:: ; 3b2a - ld [wc3b8], a + ld [wSpriteAnimIDBuffer], a ld a, [hROMBank] push af ld a, BANK(InitSpriteAnimStruct) rst Bankswitch - ld a, [wc3b8] + ld a, [wSpriteAnimIDBuffer] call InitSpriteAnimStruct @@ -2036,17 +2036,17 @@ _InitSpriteAnimStruct:: ; 3b2a ; 3b3c -Function3b3c:: ; 3b3c +ReinitSpriteAnimFrame:: ; 3b3c - ld [wc3b8], a + ld [wSpriteAnimIDBuffer], a ld a, [hROMBank] push af - ld a, BANK(Function8d120) + ld a, BANK(_ReinitSpriteAnimFrame) rst Bankswitch - ld a, [wc3b8] + ld a, [wSpriteAnimIDBuffer] - call Function8d120 + call _ReinitSpriteAnimFrame pop af rst Bankswitch @@ -2192,7 +2192,7 @@ Function3f7c:: ; 3f7c ; 3f88 Function3f88:: ; 3f88 - ld hl, w6_d000 + ld hl, wDecompressScratch ld b, $0 .asm_3f8d push bc @@ -2213,7 +2213,7 @@ Function3f88:: ; 3f88 ; 3f9f Function3f9f:: ; 3f9f - ld hl, w6_d000 + ld hl, wDecompressScratch .asm_3fa2 push bc ld c, $8 |