diff options
Diffstat (limited to 'engine/bank3d')
| -rw-r--r-- | engine/bank3d/link_menu.asm | 8 | ||||
| -rw-r--r-- | engine/bank3d/main.asm | 8 |
2 files changed, 12 insertions, 4 deletions
diff --git a/engine/bank3d/link_menu.asm b/engine/bank3d/link_menu.asm index 5cf1dc8e..edd040b0 100644 --- a/engine/bank3d/link_menu.asm +++ b/engine/bank3d/link_menu.asm @@ -529,6 +529,7 @@ Func_f56bd:: ; f56bd (3d:56bd) ld e,l hlCoord 1,12 call PlaceString +.asm_f56e6 call Delay3 ld a,$1 ld [H_AUTOBGTRANSFERENABLED],a @@ -807,6 +808,7 @@ LinkMenu: ; f580c (3d:580c) ld d,$ec ld e,$7f call Func_f59ec +.asm_f5974 xor a ld [wBuffer], a ld a,$ff @@ -849,12 +851,12 @@ LinkMenu: ; f580c (3d:580c) ld d,$7f ld e,$ec call Func_f59ec - jp .chooseCancel + jp .choseCancel .asm_f59cd ld hl,Text_f5a11 call PrintText - jp .chooseCancel + jp .choseCancel .asm_f59d6 ld b,$7f @@ -863,7 +865,7 @@ LinkMenu: ; f580c (3d:580c) ld e,$7f call Func_f59ec call Func_f531b - jp c,.chooseCancel + jp c,.choseCancel ld a,$f0 jp .next diff --git a/engine/bank3d/main.asm b/engine/bank3d/main.asm index 7a2435a5..6e9788d1 100644 --- a/engine/bank3d/main.asm +++ b/engine/bank3d/main.asm @@ -39,6 +39,7 @@ Func_f42c2:: ; f42c2 (3d:f42c2) cp $31 jr nc,.asm_f42ce ld a,$7f +.asm_f42ce ld [hl],a ld bc,$14 add hl,bc @@ -68,6 +69,7 @@ Func_f430a:: ; f430a (3d:430a) callab Func_fcdb8 pop de ret nc +.asm_f432b push de ld e,$0 ld a,[wd470] @@ -77,6 +79,7 @@ Func_f430a:: ; f430a (3d:430a) cp $c8 jr c,.asm_f433b inc e +.asm_f433b ld c,d dec c ld b,$0 @@ -124,6 +127,7 @@ Func_f430a:: ; f430a (3d:430a) .asm_f4380 ld a,b ld [wd471],a +.asm_f4384 ret Pointer_f4385:: ; f4385 (3d:4385) @@ -271,7 +275,7 @@ HandleMenuInputDouble:: ; f5a40 (3d:5a40) xor a ld [wd09b],a -HandleMenuInputPokemonSelectionDouble:: ; 3aaf (0:3aaf) +HandleMenuInputPokemonSelectionDouble:: ; f5a44 (3d:5a44) ld a,[H_DOWNARROWBLINKCNT1] push af ld a,[H_DOWNARROWBLINKCNT2] @@ -280,6 +284,7 @@ HandleMenuInputPokemonSelectionDouble:: ; 3aaf (0:3aaf) ld [H_DOWNARROWBLINKCNT1],a ; blinking down arrow timing value 1 ld a,$06 ld [H_DOWNARROWBLINKCNT2],a ; blinking down arrow timing value 2 +.loop1 xor a ld [wPartyMonAnimCounter],a ; counter for pokemon shaking animation call Func_f5ab0 @@ -387,6 +392,7 @@ Func_f5ab0:: ; f5ab0 (3d:5ab0) cp "▶" jr z,.asm_f5af4 ld [wTileBehindCursor],a +.asm_f5af4 ld a,"▶" ld [hl],a ld a,l |