diff options
Diffstat (limited to 'misc')
| -rwxr-xr-x | misc/battle_tower_5c.asm | 1 | ||||
| -rwxr-xr-x | misc/mobile_41.asm | 2 | ||||
| -rwxr-xr-x | misc/mobile_46.asm | 14 | ||||
| -rw-r--r-- | misc/mobile_5f.asm | 37 |
4 files changed, 27 insertions, 27 deletions
diff --git a/misc/battle_tower_5c.asm b/misc/battle_tower_5c.asm index a7eb38eb4..c975f4901 100755 --- a/misc/battle_tower_5c.asm +++ b/misc/battle_tower_5c.asm @@ -1,4 +1,5 @@ Function1700b0: ; 1700b0 +; special call InitBattleTowerChallengeRAM callba Function118121 ret diff --git a/misc/mobile_41.asm b/misc/mobile_41.asm index e27d9a01e..525bd7b80 100755 --- a/misc/mobile_41.asm +++ b/misc/mobile_41.asm @@ -1004,7 +1004,7 @@ Function106464:: ; 106464 Function10649b: ; 10649b ld a, [TextBoxFrame] and $7 - ld bc, $30 + ld bc, 3 tiles ld hl, Frames call AddNTimes ld d, h diff --git a/misc/mobile_46.asm b/misc/mobile_46.asm index de5539eaa..fb1519908 100755 --- a/misc/mobile_46.asm +++ b/misc/mobile_46.asm @@ -142,7 +142,6 @@ Function11811a: ; 11811a Function118121: ; 118121 xor a ld [wcd38], a - Function118125: ; 118125 call Function1183cb ld a, $3 @@ -155,16 +154,15 @@ Function118125: ; 118125 push af ld a, $3 ld [rSVBK], a -.asm_11813e +.loop call JoyTextDelay call Function118473 ld a, [wcf66] cp $f - jr c, .asm_118151 + jr c, .skip ld a, [wcd34] ld [wcf66], a - -.asm_118151 +.skip call Function11854d call Function11a8fa callba Function115dd3 @@ -173,7 +171,7 @@ Function118125: ; 118125 ld a, [wcf66] ld hl, wcd33 cp [hl] - jr nz, .asm_11813e + jr nz, .loop xor a ld [w3_d000], a pop af @@ -552,12 +550,12 @@ Function118473: ; 118473 inc a ld [wcd68], a cp 99 - jr z, .asm_1184a0 + jr z, .ninety_nine xor a ld [wcd67], a ret -.asm_1184a0 +.ninety_nine xor a ld [wcd65], a ret diff --git a/misc/mobile_5f.asm b/misc/mobile_5f.asm index 204ea7371..a83c7a925 100644 --- a/misc/mobile_5f.asm +++ b/misc/mobile_5f.asm @@ -4631,7 +4631,9 @@ Function17f53d: ; 17f53d push af ld a, $1 ld [rSVBK], a + call Function17f555 + pop af ld [rSVBK], a call ExitAllMenus @@ -4639,21 +4641,20 @@ Function17f53d: ; 17f53d ; 17f555 Function17f555: ; 17f555 -.asm_17f555 +.loop call JoyTextDelay - call Function17f5ae + call .RunJumptable ld a, [wc303] bit 7, a - jr nz, .asm_17f56a + jr nz, .quit callba Function104000 - jr .asm_17f555 + jr .loop -.asm_17f56a - call Function17f56e +.quit + call .deinit ret -; 17f56e -Function17f56e: ; 17f56e +.deinit ld a, [wc300] cp $22 jr z, .asm_17f597 @@ -4695,11 +4696,11 @@ Function17f56e: ; 17f56e ret ; 17f5ae -Function17f5ae: ; 17f5ae - jumptable Table17f5bd, wc303 +.RunJumptable: ; 17f5ae + jumptable .Jumptable, wc303 ; 17f5bd -Table17f5bd: ; 17f5bd +.Jumptable: ; 17f5bd dw Function17f5c3 dw Function17ff23 dw Function17f5d2 @@ -4858,26 +4859,26 @@ Palette_17f6af: ; 17f6af Function17f6b7: ; 17f6b7 ld a, [wc300] - call Function17f6cd + call .bcd_two_digits inc hl ld a, [wc302] and $f - call Function17f6d8 + call .bcd_digit ld a, [wc301] - call Function17f6cd + call .bcd_two_digits ret ; 17f6cd -Function17f6cd: ; 17f6cd +.bcd_two_digits: ; 17f6cd ld c, a and $f0 swap a - call Function17f6d8 + call .bcd_digit ld a, c and $f -Function17f6d8: ; 17f6d8 - add $f6 +.bcd_digit: ; 17f6d8 + add "0" ld [hli], a ret ; 17f6dc |