mirror of
https://gitlab.com/xCrystal/pokecrystal-board.git
synced 2024-11-16 11:27:33 -08:00
local labels for some mobile link battles
This commit is contained in:
parent
2ee4938987
commit
40ed4545b2
28
main.asm
28
main.asm
@ -42615,13 +42615,13 @@ Function3c12f: ; 3c12f
|
|||||||
call UpdateBattleMonInParty
|
call UpdateBattleMonInParty
|
||||||
callba AIChooseMove
|
callba AIChooseMove
|
||||||
call CheckInMobileLinkBattle
|
call CheckInMobileLinkBattle
|
||||||
jr nz, .asm_3c174
|
jr nz, .notmobilelinkbattle
|
||||||
callba Function100da5
|
callba Function100da5
|
||||||
callba Function100641
|
callba Function100641
|
||||||
callba Function100dd8
|
callba Function100dd8
|
||||||
jp c, .asm_3c1be
|
jp c, .asm_3c1be
|
||||||
|
|
||||||
.asm_3c174
|
.notmobilelinkbattle
|
||||||
call Function3c410
|
call Function3c410
|
||||||
jr c, .asm_3c18a
|
jr c, .asm_3c18a
|
||||||
.asm_3c179
|
.asm_3c179
|
||||||
@ -44852,7 +44852,7 @@ Function3cfa4: ; 3cfa4
|
|||||||
ld hl, BattleText_0x809da
|
ld hl, BattleText_0x809da
|
||||||
call StdBattleTextBox
|
call StdBattleTextBox
|
||||||
call CheckInMobileLinkBattle
|
call CheckInMobileLinkBattle
|
||||||
jr z, .asm_3cff5
|
jr z, .ismobilelinkbattle
|
||||||
ld a, [InLinkBattle]
|
ld a, [InLinkBattle]
|
||||||
and a
|
and a
|
||||||
ret nz
|
ret nz
|
||||||
@ -44877,7 +44877,7 @@ Function3cfa4: ; 3cfa4
|
|||||||
.asm_3cff2
|
.asm_3cff2
|
||||||
jp Function3d02b
|
jp Function3d02b
|
||||||
|
|
||||||
.asm_3cff5
|
.ismobilelinkbattle
|
||||||
call Function3ebd8
|
call Function3ebd8
|
||||||
ld c, $28
|
ld c, $28
|
||||||
call DelayFrames
|
call DelayFrames
|
||||||
@ -45381,11 +45381,11 @@ Function3d313: ; 3d313
|
|||||||
|
|
||||||
Function3d329: ; 3d329
|
Function3d329: ; 3d329
|
||||||
call CheckInMobileLinkBattle
|
call CheckInMobileLinkBattle
|
||||||
jr z, .asm_3d335
|
jr z, .ismobilelinkbattle
|
||||||
callba PartyMenuSelect
|
callba PartyMenuSelect
|
||||||
ret
|
ret
|
||||||
|
|
||||||
.asm_3d335
|
.ismobilelinkbattle
|
||||||
callba Function100cb5
|
callba Function100cb5
|
||||||
ret
|
ret
|
||||||
; 3d33c
|
; 3d33c
|
||||||
@ -45525,7 +45525,7 @@ LostBattle: ; 3d38e
|
|||||||
.asm_3d40a
|
.asm_3d40a
|
||||||
ld hl, LostAgainstText
|
ld hl, LostAgainstText
|
||||||
call CheckInMobileLinkBattle
|
call CheckInMobileLinkBattle
|
||||||
jr z, .asm_3d417
|
jr z, .ismobilelinkbattle
|
||||||
|
|
||||||
.asm_3d412
|
.asm_3d412
|
||||||
call StdBattleTextBox
|
call StdBattleTextBox
|
||||||
@ -45534,7 +45534,7 @@ LostBattle: ; 3d38e
|
|||||||
scf
|
scf
|
||||||
ret
|
ret
|
||||||
|
|
||||||
.asm_3d417
|
.ismobilelinkbattle
|
||||||
; Remove the enemy from the screen.
|
; Remove the enemy from the screen.
|
||||||
hlcoord 0, 0
|
hlcoord 0, 0
|
||||||
ld bc, $0815
|
ld bc, $0815
|
||||||
@ -47526,12 +47526,12 @@ Function3e192: ; 3e192
|
|||||||
|
|
||||||
Function3e19b: ; 3e19b
|
Function3e19b: ; 3e19b
|
||||||
call CheckInMobileLinkBattle
|
call CheckInMobileLinkBattle
|
||||||
jr z, .asm_3e1a8
|
jr z, .ismobilelinkbattle
|
||||||
callba LoadBattleMenuDataHeader
|
callba LoadBattleMenuDataHeader
|
||||||
and a
|
and a
|
||||||
ret
|
ret
|
||||||
|
|
||||||
.asm_3e1a8
|
.ismobilelinkbattle
|
||||||
callba Function100b12
|
callba Function100b12
|
||||||
ld a, [$cd2b]
|
ld a, [$cd2b]
|
||||||
and a
|
and a
|
||||||
@ -47700,11 +47700,11 @@ Function3e299:
|
|||||||
|
|
||||||
Function3e2f5: ; 3e2f5
|
Function3e2f5: ; 3e2f5
|
||||||
call CheckInMobileLinkBattle
|
call CheckInMobileLinkBattle
|
||||||
jr z, .asm_3e301
|
jr z, .ismobilelinkbattle
|
||||||
callba Function24e99
|
callba Function24e99
|
||||||
ret
|
ret
|
||||||
|
|
||||||
.asm_3e301
|
.ismobilelinkbattle
|
||||||
callba Function100d22
|
callba Function100d22
|
||||||
ret
|
ret
|
||||||
; 3e308
|
; 3e308
|
||||||
@ -47925,11 +47925,11 @@ Function3e4a8: ; 3e4a8
|
|||||||
|
|
||||||
Function3e4bc: ; 3e4bc
|
Function3e4bc: ; 3e4bc
|
||||||
call CheckInMobileLinkBattle
|
call CheckInMobileLinkBattle
|
||||||
jr nz, .asm_3e4c8
|
jr nz, .notmobilelinkbattle
|
||||||
callba Function100b9f
|
callba Function100b9f
|
||||||
ret
|
ret
|
||||||
|
|
||||||
.asm_3e4c8
|
.notmobilelinkbattle
|
||||||
ld hl, EnemyMonMove1
|
ld hl, EnemyMonMove1
|
||||||
ld a, [$d235]
|
ld a, [$d235]
|
||||||
dec a
|
dec a
|
||||||
|
Loading…
Reference in New Issue
Block a user