summaryrefslogtreecommitdiff
path: root/engine/link.asm
diff options
context:
space:
mode:
Diffstat (limited to 'engine/link.asm')
-rwxr-xr-xengine/link.asm86
1 files changed, 43 insertions, 43 deletions
diff --git a/engine/link.asm b/engine/link.asm
index 8ba1702e9..2083c9fb6 100755
--- a/engine/link.asm
+++ b/engine/link.asm
@@ -15,7 +15,7 @@ LinkCommunications: ; 28000
call LoadStandardFont
call LoadFontsBattleExtra
callba Function16d69a
- call Function3200
+ call WaitBGMap2
hlcoord 3, 8
ld b, $2
ld c, $c
@@ -26,7 +26,7 @@ LinkCommunications: ; 28000
ld de, String28419
call PlaceString
call Function28eff
- call Function3200
+ call WaitBGMap2
ld hl, wcf5d
xor a
ld [hli], a
@@ -474,7 +474,7 @@ Function283b2: ; 283b2
ld b, $a
.asm_283b7
call DelayFrame
- call LinkCommunicationsSignalDataReceived
+ call LinkDataReceived
dec b
jr nz, .asm_283b7
xor a
@@ -497,7 +497,7 @@ Function283b2: ; 283b2
call ClearScreen
ld b, SCGB_08
call GetSGBLayout
- call Function3200
+ call WaitBGMap2
ret
; 283ed
@@ -1219,7 +1219,7 @@ rept 3
endr
ld [hl], a
ld a, $1
- ld [MenuSelection2], a
+ ld [wMenuCursorY], a
inc a
ld [wPlayerLinkAction], a
jp Function2888b
@@ -1239,7 +1239,7 @@ Function28803: ; 28803
ld a, $6
ld [wcfa2], a
ld a, $1
- ld [wcfaa], a
+ ld [wMenuCursorX], a
ld a, $10
ld [wcfa7], a
ld a, $20
@@ -1258,13 +1258,13 @@ Function28835: ; 28835
ld [wd263], a
callab Function50db9
ld hl, OTPartyMon1Species
- callba Function4d319
+ callba LinkMonStatsScreen
jp Function2891c
.asm_2885b
bit 6, a
jr z, .asm_28883
- ld a, [MenuSelection2]
+ ld a, [wMenuCursorY]
ld b, a
ld a, [OTPartyCount]
cp b
@@ -1276,11 +1276,11 @@ Function28835: ; 28835
push bc
ld bc, NAME_LENGTH
add hl, bc
- ld [hl], $7f
+ ld [hl], " "
pop bc
pop hl
ld a, [PartyCount]
- ld [MenuSelection2], a
+ ld [wMenuCursorY], a
jr Function2888b
.asm_28883
@@ -1304,14 +1304,14 @@ Function2888b: ; 2888b
ld a, $6
ld [wcfa2], a
ld a, $1
- ld [wcfaa], a
+ ld [wMenuCursorX], a
ld a, $10
ld [wcfa7], a
ld a, $20
ld [wcfa5], a
xor a
ld [wcfa6], a
- call Function3200
+ call WaitBGMap2
Function288c5: ; 288c5
callba Function16d70c
@@ -1328,7 +1328,7 @@ Function288c5: ; 288c5
.asm_288d9
bit 7, a
jr z, .asm_288fe
- ld a, [MenuSelection2]
+ ld a, [wMenuCursorY]
dec a
jp nz, Function2891c
ld a, $1
@@ -1342,13 +1342,13 @@ Function288c5: ; 288c5
pop bc
pop hl
ld a, $1
- ld [MenuSelection2], a
+ ld [wMenuCursorY], a
jp Function28803
.asm_288fe
bit 6, a
jr z, Function2891c
- ld a, [MenuSelection2]
+ ld a, [wMenuCursorY]
ld b, a
ld a, [PartyCount]
cp b
@@ -1373,7 +1373,7 @@ Function2891c: ; 2891c
Function28926: ; 28926
call LoadTileMapToTempTileMap
- ld a, [MenuSelection2]
+ ld a, [wMenuCursorY]
push af
hlcoord 0, 15
ld b, $1
@@ -1398,21 +1398,21 @@ Function28926: ; 28926
ld a, $1
ld [wcfa2], a
ld a, $1
- ld [MenuSelection2], a
- ld [wcfaa], a
+ ld [wMenuCursorY], a
+ ld [wMenuCursorX], a
ld a, $20
ld [wcfa7], a
xor a
ld [wcfa5], a
ld [wcfa6], a
- call Function1bd3
+ call ScrollingMenuJoypad
bit 4, a
jr nz, .asm_2898d
bit 1, a
jr z, .asm_289cd
.asm_28983
pop af
- ld [MenuSelection2], a
+ ld [wMenuCursorY], a
call Call_LoadTempTileMapToTileMap
jp Function2888b
@@ -1430,14 +1430,14 @@ Function28926: ; 28926
ld a, $b
ld [wcfa2], a
ld a, $1
- ld [MenuSelection2], a
- ld [wcfaa], a
+ ld [wMenuCursorY], a
+ ld [wMenuCursorX], a
ld a, $20
ld [wcfa7], a
xor a
ld [wcfa5], a
ld [wcfa6], a
- call Function1bd3
+ call ScrollingMenuJoypad
bit 5, a
jp nz, .asm_28946
bit 1, a
@@ -1446,11 +1446,11 @@ Function28926: ; 28926
.asm_289cd
pop af
- ld [MenuSelection2], a
+ ld [wMenuCursorY], a
ld a, $4
ld [wd263], a
callab Function50db9
- callba Function4d319
+ callba LinkMonStatsScreen
call Call_LoadTempTileMapToTileMap
hlcoord 6, 1
lb bc, 6, 1
@@ -1465,7 +1465,7 @@ Function28926: ; 28926
.asm_289fe
call Function1bee
pop af
- ld [MenuSelection2], a
+ ld [wMenuCursorY], a
dec a
ld [wd002], a
ld [wPlayerLinkAction], a
@@ -1549,7 +1549,7 @@ UnknownText_0x28ac4: ; 0x28ac4
Function28ac9: ; 28ac9
- ld a, [MenuSelection2]
+ ld a, [wMenuCursorY]
cp $1
jp nz, Function2891c
call Function1bf7
@@ -1579,12 +1579,12 @@ Function28ade: ; 28ade
bit 6, a
jr z, .asm_28b03
ld a, [OTPartyCount]
- ld [MenuSelection2], a
+ ld [wMenuCursorY], a
jp Function28803
.asm_28b03
ld a, $1
- ld [MenuSelection2], a
+ ld [wMenuCursorY], a
jp Function2888b
.asm_28b0b
@@ -1602,7 +1602,7 @@ Function28b22: ; 28b22
call ClearScreen
ld b, SCGB_08
call GetSGBLayout
- call Function3200
+ call WaitBGMap2
xor a
ld [wcfbb], a
xor a
@@ -1715,17 +1715,17 @@ Function28b87: ; 28b87
ld a, $3
ld [wcfa8], a
ld a, $1
- ld [MenuSelection2], a
- ld [wcfaa], a
+ ld [wMenuCursorY], a
+ ld [wMenuCursorX], a
callba Function4d354
- call Function1bd3
+ call ScrollingMenuJoypad
push af
call Call_ExitMenu
- call Function3200
+ call WaitBGMap2
pop af
bit 1, a
jr nz, .asm_28c33
- ld a, [MenuSelection2]
+ ld a, [wMenuCursorY]
dec a
jr z, .asm_28c54
@@ -1886,12 +1886,12 @@ Function28b87: ; 28b87
ld [wd002], a
xor a
ld [wPokemonWithdrawDepositParameter], a
- callab Functione039
+ callab RemoveMonFromPartyOrBox
ld a, [PartyCount]
dec a
ld [CurPartyMon], a
ld a, $1
- ld [wd1e9], a
+ ld [wForceEvolution], a
ld a, [wd003]
push af
ld hl, OTPartySpecies
@@ -2295,9 +2295,9 @@ Special_WaitForLinkedFriend: ; 29d11
jr .asm_29d39
.asm_29d79
- call LinkCommunicationsSignalDataReceived
+ call LinkDataReceived
call DelayFrame
- call LinkCommunicationsSignalDataReceived
+ call LinkDataReceived
ld c, $32
call DelayFrames
ld a, $1
@@ -2349,7 +2349,7 @@ Function29dba: ; 29dba
ld a, [ScriptVar]
and a
jr z, .asm_29e08
- ld bc, rIE
+ ld bc, -1
.asm_29de0
dec bc
ld a, b
@@ -2426,7 +2426,7 @@ Function29e47: ; 29e47
ld b, $a
.asm_29e49
call DelayFrame
- call LinkCommunicationsSignalDataReceived
+ call LinkDataReceived
dec b
jr nz, .asm_29e49
ret
@@ -2467,9 +2467,9 @@ Special_CheckBothSelectedSameRoom: ; 29e82
ld a, [wd265]
call Function29f17
push af
- call LinkCommunicationsSignalDataReceived
+ call LinkDataReceived
call DelayFrame
- call LinkCommunicationsSignalDataReceived
+ call LinkDataReceived
pop af
ld b, a
ld a, [wd265]
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-28 07:36:14 +0000