mirror of
https://gitlab.com/xCrystal/pokecrystal-board.git
synced 2025-01-23 09:16:20 -08:00
Identify some more labels (a few link-related)
This commit is contained in:
parent
3a2932cec1
commit
ae4fe08084
@ -199,7 +199,7 @@ SentAllToMomText:
|
|||||||
text "Sent all to MOM!"
|
text "Sent all to MOM!"
|
||||||
prompt
|
prompt
|
||||||
|
|
||||||
BattleText_0x80a4f:
|
UnusedRivalLossText: ; unreferenced
|
||||||
text "<RIVAL>: Huh? I"
|
text "<RIVAL>: Huh? I"
|
||||||
line "should've chosen"
|
line "should've chosen"
|
||||||
cont "your #MON!"
|
cont "your #MON!"
|
||||||
@ -215,7 +215,7 @@ BattleText_UseNextMon:
|
|||||||
text "Use next #MON?"
|
text "Use next #MON?"
|
||||||
done
|
done
|
||||||
|
|
||||||
BattleText_0x80a93:
|
UnusedRivalWinText: ; unreferenced
|
||||||
text "<RIVAL>: Yes!"
|
text "<RIVAL>: Yes!"
|
||||||
line "I guess I chose a"
|
line "I guess I chose a"
|
||||||
cont "good #MON!"
|
cont "good #MON!"
|
||||||
|
@ -8470,7 +8470,7 @@ ReadAndPrintLinkBattleRecord:
|
|||||||
call .PrintBattleRecord
|
call .PrintBattleRecord
|
||||||
hlcoord 0, 8
|
hlcoord 0, 8
|
||||||
ld b, NUM_LINK_BATTLE_RECORDS
|
ld b, NUM_LINK_BATTLE_RECORDS
|
||||||
ld de, sLinkBattleRecord + 2
|
ld de, sLinkBattleRecord1Name
|
||||||
.loop
|
.loop
|
||||||
push bc
|
push bc
|
||||||
push hl
|
push hl
|
||||||
@ -8485,35 +8485,35 @@ ReadAndPrintLinkBattleRecord:
|
|||||||
push hl
|
push hl
|
||||||
ld h, d
|
ld h, d
|
||||||
ld l, e
|
ld l, e
|
||||||
ld de, wd002
|
ld de, wLinkBattleRecordName
|
||||||
ld bc, NAME_LENGTH - 1
|
ld bc, NAME_LENGTH - 1
|
||||||
call CopyBytes
|
call CopyBytes
|
||||||
ld a, "@"
|
ld a, "@"
|
||||||
ld [de], a
|
ld [de], a
|
||||||
inc de
|
inc de ; wLinkBattleRecordWins
|
||||||
ld bc, 6
|
ld bc, 6
|
||||||
call CopyBytes
|
call CopyBytes
|
||||||
ld de, wd002
|
ld de, wLinkBattleRecordName
|
||||||
pop hl
|
pop hl
|
||||||
call PlaceString
|
call PlaceString
|
||||||
pop hl
|
pop hl
|
||||||
ld de, 26
|
ld de, 26
|
||||||
add hl, de
|
add hl, de
|
||||||
push hl
|
push hl
|
||||||
ld de, wd00d
|
ld de, wLinkBattleRecordWins
|
||||||
lb bc, 2, 4
|
lb bc, 2, 4
|
||||||
call PrintNum
|
call PrintNum
|
||||||
pop hl
|
pop hl
|
||||||
ld de, 5
|
ld de, 5
|
||||||
add hl, de
|
add hl, de
|
||||||
push hl
|
push hl
|
||||||
ld de, wd00f
|
ld de, wLinkBattleRecordLosses
|
||||||
lb bc, 2, 4
|
lb bc, 2, 4
|
||||||
call PrintNum
|
call PrintNum
|
||||||
pop hl
|
pop hl
|
||||||
ld de, 5
|
ld de, 5
|
||||||
add hl, de
|
add hl, de
|
||||||
ld de, wd011
|
ld de, wLinkBattleRecordDraws
|
||||||
lb bc, 2, 4
|
lb bc, 2, 4
|
||||||
call PrintNum
|
call PrintNum
|
||||||
jr .next
|
jr .next
|
||||||
|
@ -2159,7 +2159,7 @@ SetBitsForBattleRequest:
|
|||||||
ret
|
ret
|
||||||
|
|
||||||
SetBitsForTimeCapsuleRequest:
|
SetBitsForTimeCapsuleRequest:
|
||||||
ld a, $2
|
ld a, USING_INTERNAL_CLOCK
|
||||||
ldh [rSB], a
|
ldh [rSB], a
|
||||||
xor a
|
xor a
|
||||||
ldh [hSerialReceive], a
|
ldh [hSerialReceive], a
|
||||||
@ -2176,7 +2176,7 @@ WaitForLinkedFriend:
|
|||||||
ld a, [wPlayerLinkAction]
|
ld a, [wPlayerLinkAction]
|
||||||
and a
|
and a
|
||||||
jr z, .no_link_action
|
jr z, .no_link_action
|
||||||
ld a, $2
|
ld a, USING_INTERNAL_CLOCK
|
||||||
ldh [rSB], a
|
ldh [rSB], a
|
||||||
xor a
|
xor a
|
||||||
ldh [hSerialReceive], a
|
ldh [hSerialReceive], a
|
||||||
@ -2201,7 +2201,7 @@ WaitForLinkedFriend:
|
|||||||
jr z, .connected
|
jr z, .connected
|
||||||
ld a, CONNECTION_NOT_ESTABLISHED
|
ld a, CONNECTION_NOT_ESTABLISHED
|
||||||
ldh [hSerialConnectionStatus], a
|
ldh [hSerialConnectionStatus], a
|
||||||
ld a, $2
|
ld a, USING_INTERNAL_CLOCK
|
||||||
ldh [rSB], a
|
ldh [rSB], a
|
||||||
xor a
|
xor a
|
||||||
ldh [hSerialReceive], a
|
ldh [hSerialReceive], a
|
||||||
@ -2219,7 +2219,7 @@ WaitForLinkedFriend:
|
|||||||
jr z, .done
|
jr z, .done
|
||||||
|
|
||||||
.not_done
|
.not_done
|
||||||
ld a, $1
|
ld a, USING_EXTERNAL_CLOCK
|
||||||
ldh [rSB], a
|
ldh [rSB], a
|
||||||
ld a, (0 << rSC_ON) | (1 << rSC_CLOCK)
|
ld a, (0 << rSC_ON) | (1 << rSC_CLOCK)
|
||||||
ldh [rSC], a
|
ldh [rSC], a
|
||||||
@ -2464,7 +2464,7 @@ Link_ResetSerialRegistersAfterLinkClosure:
|
|||||||
call DelayFrames
|
call DelayFrames
|
||||||
ld a, CONNECTION_NOT_ESTABLISHED
|
ld a, CONNECTION_NOT_ESTABLISHED
|
||||||
ldh [hSerialConnectionStatus], a
|
ldh [hSerialConnectionStatus], a
|
||||||
ld a, $2
|
ld a, USING_INTERNAL_CLOCK
|
||||||
ldh [rSB], a
|
ldh [rSB], a
|
||||||
xor a
|
xor a
|
||||||
ldh [hSerialReceive], a
|
ldh [hSerialReceive], a
|
||||||
|
@ -388,7 +388,8 @@ LinkDataReceived::
|
|||||||
ldh [rSC], a
|
ldh [rSC], a
|
||||||
ret
|
ret
|
||||||
|
|
||||||
Function919:: ; unreferenced
|
SetBitsForTimeCapsuleRequestIfNotLinked:: ; unreferenced
|
||||||
|
; Similar to SetBitsForTimeCapsuleRequest (see engine/link/link.asm).
|
||||||
ld a, [wLinkMode]
|
ld a, [wLinkMode]
|
||||||
and a
|
and a
|
||||||
ret nz
|
ret nz
|
||||||
|
@ -230,8 +230,8 @@ hall_of_fame: MACRO
|
|||||||
ENDM
|
ENDM
|
||||||
|
|
||||||
link_battle_record: MACRO
|
link_battle_record: MACRO
|
||||||
\1Name:: ds NAME_LENGTH - 1
|
|
||||||
\1ID:: dw
|
\1ID:: dw
|
||||||
|
\1Name:: ds NAME_LENGTH - 1
|
||||||
\1Wins:: dw
|
\1Wins:: dw
|
||||||
\1Losses:: dw
|
\1Losses:: dw
|
||||||
\1Draws:: dw
|
\1Draws:: dw
|
||||||
|
26
wram.asm
26
wram.asm
@ -1056,8 +1056,13 @@ ENDU
|
|||||||
|
|
||||||
NEXTU
|
NEXTU
|
||||||
; mystery gift data
|
; mystery gift data
|
||||||
wMysteryGiftPartyTemp:: ; ds PARTY_LENGTH * (1 + 1 + NUM_MOVES)
|
UNION
|
||||||
wMysteryGiftStaging::
|
wMysteryGiftPartyTemp:: ds (1 + 1 + NUM_MOVES) * PARTY_LENGTH
|
||||||
|
|
||||||
|
NEXTU
|
||||||
|
wMysteryGiftStaging:: ds 80
|
||||||
|
|
||||||
|
NEXTU
|
||||||
wc800:: ds 1
|
wc800:: ds 1
|
||||||
wc801:: ds 1
|
wc801:: ds 1
|
||||||
wc802:: ds 1
|
wc802:: ds 1
|
||||||
@ -1076,6 +1081,7 @@ wMobileSDK_SendCommandID:: db
|
|||||||
wc820:: ds 1
|
wc820:: ds 1
|
||||||
wc821:: ds 1
|
wc821:: ds 1
|
||||||
wc822:: ds 46
|
wc822:: ds 46
|
||||||
|
ENDU
|
||||||
|
|
||||||
UNION
|
UNION
|
||||||
wMysteryGiftTrainerData:: ds (1 + 1 + NUM_MOVES) * PARTY_LENGTH + 2
|
wMysteryGiftTrainerData:: ds (1 + 1 + NUM_MOVES) * PARTY_LENGTH + 2
|
||||||
@ -1829,6 +1835,13 @@ wSuicuneFrame::
|
|||||||
wStartFlypoint:: db
|
wStartFlypoint:: db
|
||||||
wEndFlypoint:: db
|
wEndFlypoint:: db
|
||||||
|
|
||||||
|
NEXTU
|
||||||
|
; link battle record data
|
||||||
|
wLinkBattleRecordName:: ds NAME_LENGTH
|
||||||
|
wLinkBattleRecordWins:: dw
|
||||||
|
wLinkBattleRecordLosses:: dw
|
||||||
|
wLinkBattleRecordDraws:: dw
|
||||||
|
|
||||||
NEXTU
|
NEXTU
|
||||||
; unidentified
|
; unidentified
|
||||||
wd002:: db
|
wd002:: db
|
||||||
@ -1837,13 +1850,9 @@ wd004:: db
|
|||||||
|
|
||||||
; mobile?
|
; mobile?
|
||||||
ds 1
|
ds 1
|
||||||
wd006:: ds 2
|
|
||||||
wd008:: ds 2
|
|
||||||
ds 2
|
ds 2
|
||||||
wd00c:: ds 1
|
wd008:: ds 2
|
||||||
wd00d:: ds 1
|
ds 6
|
||||||
ds 1
|
|
||||||
wd00f:: ds 1
|
|
||||||
wd010:: ds 1
|
wd010:: ds 1
|
||||||
wd011:: ds 1
|
wd011:: ds 1
|
||||||
wd012:: ds 1
|
wd012:: ds 1
|
||||||
@ -2331,7 +2340,6 @@ wPutativeTMHMMove:: db
|
|||||||
wInitListType:: db
|
wInitListType:: db
|
||||||
wBattleHasJustStarted:: db
|
wBattleHasJustStarted:: db
|
||||||
|
|
||||||
; wd265 has many different short-term uses
|
|
||||||
wNamedObjectIndexBuffer::
|
wNamedObjectIndexBuffer::
|
||||||
wDeciramBuffer::
|
wDeciramBuffer::
|
||||||
wTempByteValue::
|
wTempByteValue::
|
||||||
|
Loading…
x
Reference in New Issue
Block a user