Future/pokecrystal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Mobile jumptable exit bits

Browse Source
This commit is contained in:
Rangi42
2024-12-02 12:13:43 -05:00
committed by Sylvie
parent 41045d0266
commit 03a1c6efad
7 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mobile/fixed_words.asm
View File

@@ -370,7 +370,7 @@ EZChat_MasterLoop:
ldh a, [hJoyPressed] ldh a, [hJoyPressed]
ldh [hJoypadPressed], a ldh [hJoypadPressed], a
ld a, [wJumptableIndex] ld a, [wJumptableIndex]
bit 7, a bit JUMPTABLE_EXIT_F, a
jr nz, .exit jr nz, .exit
call .DoJumptableFunction call .DoJumptableFunction
farcall PlaySpriteAnimations farcall PlaySpriteAnimations
@@ -1686,7 +1686,7 @@ Function11cab3:
.asm_11caf3 .asm_11caf3
ld hl, wJumptableIndex ld hl, wJumptableIndex
set 7, [hl] set JUMPTABLE_EXIT_F, [hl]
ret ret
.asm_11caf9 .asm_11caf9

4
mobile/mobile_41.asm
View File

@@ -853,7 +853,7 @@ CheckMobileAdapterStatus: ; unused
Function10635c: Function10635c:
ld a, [wMobileCommsJumptableIndex] ld a, [wMobileCommsJumptableIndex]
bit 7, a bit JUMPTABLE_EXIT_F, a
ret nz ret nz
ld a, [wMobileCommsJumptableIndex] ld a, [wMobileCommsJumptableIndex]
ld hl, .Jumptable ld hl, .Jumptable
@@ -1004,7 +1004,7 @@ Function106442:
Function106453: Function106453:
ld a, [wMobileCommsJumptableIndex] ld a, [wMobileCommsJumptableIndex]
set 7, a set JUMPTABLE_EXIT_F, a
ld [wMobileCommsJumptableIndex], a ld [wMobileCommsJumptableIndex], a
nop nop
ld a, $4 ld a, $4

4
mobile/mobile_42.asm
View File

@@ -337,7 +337,7 @@ MobileTradeAnim_InitSpeciesName:
MobileTradeAnim_JumptableLoop: MobileTradeAnim_JumptableLoop:
ld a, [wJumptableIndex] ld a, [wJumptableIndex]
bit 7, a bit JUMPTABLE_EXIT_F, a
jr nz, .StopAnim jr nz, .StopAnim
call .ExecuteMobileTradeAnimCommand call .ExecuteMobileTradeAnimCommand
call DelayFrame call DelayFrame
@@ -404,7 +404,7 @@ GetMobileTradeAnimByte:
EndMobileTradeAnim: EndMobileTradeAnim:
ld hl, wJumptableIndex ld hl, wJumptableIndex
set 7, [hl] set JUMPTABLE_EXIT_F, [hl]
ret ret
WaitMobileTradeSpriteAnims: WaitMobileTradeSpriteAnims:

10
mobile/mobile_45_stadium.asm
View File

@@ -532,7 +532,7 @@ Function117ab4:
Function117acd: Function117acd:
call JoyTextDelay call JoyTextDelay
ld a, [wJumptableIndex] ld a, [wJumptableIndex]
bit 7, a bit JUMPTABLE_EXIT_F, a
jr nz, .asm_117ae2 jr nz, .asm_117ae2
call Function117ae9 call Function117ae9
farcall HDMATransferAttrmapAndTilemapToWRAMBank3 farcall HDMATransferAttrmapAndTilemapToWRAMBank3
@@ -640,7 +640,7 @@ Function117b4f:
call ExitMenu call ExitMenu
call ExitMenu call ExitMenu
farcall HDMATransferTilemapAndAttrmap_Overworld farcall HDMATransferTilemapAndAttrmap_Overworld
ld a, $80 ld a, JUMPTABLE_EXIT
ld [wJumptableIndex], a ld [wJumptableIndex], a
ret ret
@@ -659,12 +659,12 @@ Function117bb6:
ld a, $2 ld a, $2
ld [wc303], a ld [wc303], a
farcall DisplayMobileError farcall DisplayMobileError
ld a, $80 ld a, JUMPTABLE_EXIT
ld [wJumptableIndex], a ld [wJumptableIndex], a
ret ret
.asm_117be1 .asm_117be1
ld a, $80 ld a, JUMPTABLE_EXIT
ld [wJumptableIndex], a ld [wJumptableIndex], a
ret ret
@@ -749,7 +749,7 @@ Function117c4a:
call RotateThreePalettesRight call RotateThreePalettesRight
pop af pop af
ldh [rSVBK], a ldh [rSVBK], a
ld a, $80 ld a, JUMPTABLE_EXIT
ld [wJumptableIndex], a ld [wJumptableIndex], a
ret ret

4
mobile/mobile_46.asm
View File

@@ -5555,7 +5555,7 @@ Function11ac51:
.loop .loop
call JoyTextDelay call JoyTextDelay
ld a, [wJumptableIndex] ld a, [wJumptableIndex]
bit 7, a bit JUMPTABLE_EXIT_F, a
jr nz, .asm_11aca8 jr nz, .asm_11aca8
call Function11b314 call Function11b314
call Function11acb7 call Function11acb7
@@ -5686,7 +5686,7 @@ MobileIncJumptableIndex:
Function11ad8f: Function11ad8f:
ld hl, wJumptableIndex ld hl, wJumptableIndex
set 7, [hl] set JUMPTABLE_EXIT_F, [hl]
ret ret
Function11ad95: Function11ad95:

6
mobile/mobile_5e.asm
View File

@@ -149,7 +149,7 @@ Function17a751:
ld hl, $d08f ld hl, $d08f
inc [hl] inc [hl]
ld a, [$d087] ld a, [$d087]
bit 7, a bit JUMPTABLE_EXIT_F, a
jr z, .asm_17a755 jr z, .asm_17a755
ret ret
@@ -239,7 +239,7 @@ Function17a7f4:
dec [hl] dec [hl]
ret nz ret nz
ld hl, $d087 ld hl, $d087
set 7, [hl] set JUMPTABLE_EXIT_F, [hl]
ret ret
Function17a7ff: Function17a7ff:
@@ -253,7 +253,7 @@ Function17a7ff:
ld hl, $d088 ld hl, $d088
set 5, [hl] set 5, [hl]
ld hl, $d087 ld hl, $d087
set 7, [hl] set JUMPTABLE_EXIT_F, [hl]
ret ret
Function17a81a: Function17a81a:

4
mobile/mobile_5f.asm
View File

@@ -4444,7 +4444,7 @@ DisplayMobileError:
call JoyTextDelay call JoyTextDelay
call .RunJumptable call .RunJumptable
ld a, [wc303] ld a, [wc303]
bit 7, a bit JUMPTABLE_EXIT_F, a
jr nz, .quit jr nz, .quit
farcall HDMATransferAttrmapAndTilemapToWRAMBank3 farcall HDMATransferAttrmapAndTilemapToWRAMBank3
jr .loop jr .loop
@@ -5143,7 +5143,7 @@ Function17ff23:
xor a xor a
ld [wMusicFadeID + 1], a ld [wMusicFadeID + 1], a
ld hl, wc303 ld hl, wc303
set 7, [hl] set JUMPTABLE_EXIT_F, [hl]
ret ret
Function17ff3c: Function17ff3c: