Identify some more labels, and make some more consistent

This commit is contained in:
Rangi
2020-11-01 12:36:38 -05:00
parent 4a323cf591
commit 6220200f0f
18 changed files with 121 additions and 116 deletions

View File

@@ -1249,7 +1249,7 @@ LinkTradeOTPartymonMenuLoop:
.not_d_up
bit D_DOWN_F, a
jp z, LinkTradePartiesMenuMasterLoop
jp LinkTradeCheckCancel
jp LinkTradeOTPartymonMenuCheckCancel
LinkTrade_PlayerPartyMenu:
farcall InitMG_Mobile_LinkTradePalMap
@@ -1323,7 +1323,7 @@ LinkTradePartymonMenuLoop:
ld [hl], " "
pop bc
pop hl
jp Function28ade
jp LinkTradePartymonMenuCheckCancel
LinkTradePartiesMenuMasterLoop:
ld a, [wMonType]
@@ -1501,11 +1501,12 @@ LinkTrade_TradeStatsMenu:
text_far _LinkAbnormalMonText
text_end
LinkTradeCheckCancel:
LinkTradeOTPartymonMenuCheckCancel:
ld a, [wMenuCursorY]
cp 1
jp nz, LinkTradePartiesMenuMasterLoop
call HideCursor
push hl
push bc
ld bc, NAME_LENGTH
@@ -1513,7 +1514,9 @@ LinkTradeCheckCancel:
ld [hl], " "
pop bc
pop hl
Function28ade:
; fallthrough
LinkTradePartymonMenuCheckCancel:
.loop1
ld a, "▶"
ldcoord_a 9, 17
@@ -1548,6 +1551,8 @@ Function28ade:
ld a, [wOtherPlayerLinkMode]
cp $f
jr nz, .loop1
; fallthrough
ExitLinkCommunications:
call RotateThreePalettesRight
call ClearScreen

View File

@@ -8,20 +8,23 @@ __LoadTradeScreenBorderGFX:
call Get2bpp
ret
Function16d42e:
ld hl, Tilemap_MobileTradeBorderFullscreen
LoadMobileTradeBorderTilemap:
ld hl, MobileTradeBorderTilemap
decoord 0, 0
ld bc, SCREEN_WIDTH * SCREEN_HEIGHT
call CopyBytes
ret
Function16d43b: ; unreferenced
TestMobileTradeBorderTilemap: ; unreferenced
; Loads the mobile trade border graphics and tilemap,
; with a placeholder SCGB_DIPLOMA layout, and exits
; after pressing A or B. Possibly used for testing.
call LoadStandardMenuHeader
call ClearBGPalettes
call ClearTilemap
call ClearSprites
farcall __LoadTradeScreenBorderGFX ; useless to farcall
farcall Function16d42e ; useless to farcall
farcall LoadMobileTradeBorderTilemap ; useless to farcall
ld b, SCGB_DIPLOMA
call GetSGBLayout
call SetPalettes
@@ -30,13 +33,13 @@ Function16d43b: ; unreferenced
call Call_ExitMenu
ret
Tilemap_MobileTradeBorderFullscreen:
INCBIN "gfx/trade/border_mobile_fullscreen.tilemap"
MobileTradeBorderTilemap:
INCBIN "gfx/trade/border_mobile.tilemap"
Tilemap_CableTradeBorderTop:
CableTradeBorderTopTilemap:
INCBIN "gfx/trade/border_cable_top.tilemap"
Tilemap_CableTradeBorderBottom:
CableTradeBorderBottomTilemap:
INCBIN "gfx/trade/border_cable_bottom.tilemap"
_LinkTextbox:
@@ -111,7 +114,7 @@ _LinkTextbox:
InitTradeSpeciesList:
call _LoadTradeScreenBorderGFX
call Function16d6ae
call LoadCableTradeBorderTilemap
farcall InitMG_Mobile_LinkTradePalMap
farcall PlaceTradePartnerNamesAndParty
hlcoord 10, 17
@@ -137,13 +140,13 @@ LoadTradeRoomBGPals:
farcall _LoadTradeRoomBGPals
ret
Function16d6ae:
call Function16d42e
ld hl, Tilemap_CableTradeBorderTop
LoadCableTradeBorderTilemap:
call LoadMobileTradeBorderTilemap
ld hl, CableTradeBorderTopTilemap
decoord 0, 0
ld bc, 2 * SCREEN_WIDTH
call CopyBytes
ld hl, Tilemap_CableTradeBorderBottom
ld hl, CableTradeBorderBottomTilemap
decoord 0, 16
ld bc, 2 * SCREEN_WIDTH
call CopyBytes