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

Some Mobile code labeling and removed magic numbers (#993)

Browse Source 
* Macro loop for EmptyAllSRAMBanks

* Many things labeled and magic numbers removed

* Conform to the style guide

* Rename URLs in mobile_46

* MOBILEAPI_19 -> MOBILEAPI_TELEPHONESTATUS

* Update engine/menus/empty_sram.asm

Co-authored-by: Rangi <35663410+Rangi42@users.noreply.github.com>

* Update ram/wram.asm

Co-authored-by: Rangi <35663410+Rangi42@users.noreply.github.com>

* Update mobile/mobile_46.asm

Co-authored-by: Rangi <35663410+Rangi42@users.noreply.github.com>

* Update mobile/mobile_46.asm

Co-authored-by: Rangi <35663410+Rangi42@users.noreply.github.com>

* Remove underscore from Set*DownloadURL symbols

* Begin Labeling TradeCornerHoldMon routines

* Add wMobileMon party_struct

* Add TRADE_CORNER_REQUEST_LENGTH constant

* Name battle tower action functions

* Label trade corner send/receive buffer

* Label the saved copy of the trade corner pokemon

also fix mailmsg_jp

* So many copies of decodeBase64Character

* Label another buffer

* Fix Alignment and use MOBILE_EMAIL_LENGTH

* `Function11ad8a` -> `MobileIncJumptableIndex`

* Apply Rangi Suggestions pass 1

Co-Authored-By: Rangi <35663410+Rangi42@users.noreply.github.com>

* Apply Suggestions 2

Co-authored-by: Rangi <35663410+Rangi42@users.noreply.github.com>
Co-authored-by: vulcandth <vulcandth@gmail.com>
This commit is contained in:
Andrew Cook
2022-09-15 10:49:58 +10:00
committed by GitHub
parent 41d5ea0482
commit 0f5540740b
19 changed files with 536 additions and 468 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
mobile/mobile_40.asm
View File

@@ -2453,10 +2453,10 @@ endr
ld [hl], e
inc hl
ld [hl], d
ld a, $07
ld a, BANK(s7_a001)
call OpenSRAM
ld hl, wc608
ld de, $a001
ld de, s7_a001
ld bc, wc7bd - wc608
call CopyBytes
call CloseSRAM
@@ -2485,7 +2485,7 @@ Function10107d:
ld bc, NAME_LENGTH
call .CopyAllFromOT
ld hl, wOTPartyMon1Species
ld de, $c699
ld de, wc699
ld bc, PARTYMON_STRUCT_LENGTH
call .CopyAllFromOT
ld a, $50
@@ -3111,7 +3111,7 @@ Function1014a6:
Function1014b7:
call GetJoypad
ldh a, [hJoyPressed]
and $03
and A_BUTTON | B_BUTTON
jr nz, .asm_1014c5
ld hl, wcd42
dec [hl]
@@ -3831,7 +3831,7 @@ _StartMobileBattle:
.CopyOTDetails:
ldh a, [rSVBK]
push af
ld a, 5
ld a, BANK(w5_dc0d)
ldh [rSVBK], a
ld bc, w5_dc0d
@@ -4723,13 +4723,13 @@ Function1020ea:
ret
Function102112:
ld a, $04
ld a, BANK(s4_a03b)
call OpenSRAM
ld hl, $a041
ld hl, s4_a03b + 6
ld c, 40
.outer_loop
push hl
ld de, $c60f
ld de, wc60f
ld b, 31
.inner_loop
ld a, [de]

2
mobile/mobile_41.asm
View File

@@ -943,7 +943,7 @@ Function1063e5:
Function1063f3:
ld de, wcd31
ld a, MOBILEAPI_19
ld a, MOBILEAPI_TELEPHONESTATUS
call MobileAPI
ld a, [wMobileCommsJumptableIndex]
inc a

2
mobile/mobile_45_2.asm
View File

@@ -239,7 +239,7 @@ Function1166d6:
cp $ff
ret nz
ld a, $4
ld [$c319], a
ld [wc319], a
xor a
ld [wc314], a
ret

2
mobile/mobile_45_sprite_engine.asm
View File

@@ -666,7 +666,7 @@ Function1163c0:
push af
ld a, $5
ldh [rSVBK], a
ld hl, $c320
ld hl, wc320
ld de, wd030
ld bc, $0010
call CopyBytes

12
mobile/mobile_45_stadium.asm
View File

@@ -25,7 +25,7 @@ Function11766b:
ld de, wcd49
ld bc, $8
call CopyBytes
ld de, $c708
ld de, wc708
ld bc, $11
call CopyBytes
call CloseSRAM
@@ -40,7 +40,7 @@ Function117699:
ld de, $b1f3
ld bc, $8
call CopyBytes
ld hl, $c708
ld hl, wc708
ld bc, $11
call CopyBytes
call CloseSRAM
@@ -52,7 +52,7 @@ Function117699:
ld [wcd4d], a
ld [wcd4e], a
ld [wcd4f], a
ld hl, $c708
ld hl, wc708
ld bc, $11
call ByteFill
call ClearBGPalettes
@@ -191,7 +191,7 @@ Function117764_b_button:
ld [wcd4a], a
ld e, a
ld d, 0
ld hl, $c708
ld hl, wc708
add hl, de
xor a
ld [hl], a
@@ -303,7 +303,7 @@ Function117764_a_button:
ld b, 0
add hl, bc
ld a, [hl]
ld hl, $c708
ld hl, wc708
add hl, de
ld [hl], a
pop de
@@ -402,7 +402,7 @@ Function117942:
call OpenSRAM
ld a, [wcd4f]
ld [sMobileLoginPassword], a
ld hl, $c708
ld hl, wc708
ld de, sMobileLoginPassword + 1
ld bc, MOBILE_LOGIN_PASSWORD_LENGTH
call CopyBytes

342
mobile/mobile_46.asm
View File

@@ -559,7 +559,7 @@ Function1184a5:
dw Function1188c8
dw Function11878d
dw Function118903
dw Function118a8f
dw SetExchangeDownloadURL
dw Function11878d
dw Function118d80
dw Function118d9b
@@ -659,7 +659,7 @@ Function11857c:
dw Function1188c8
dw Function11878d
dw Function118903
dw Function118a7a
dw SetBattleDownloadURL
dw Function11878d
dw Function11891c
dw Function1198ee
@@ -692,7 +692,7 @@ Function1185c3:
dw Function1188c8
dw Function11878d
dw Function118903
dw Function118aa4
dw SetNewsDownloadURL
dw Function11878d
dw Function118e92
dw Function11878d
@@ -738,7 +738,7 @@ Function118624:
dw Function1188c8
dw Function11878d
dw Function118903
dw Function118aa4
dw SetNewsDownloadURL
dw Function11878d
dw Function118e92
dw Function11878d
@@ -835,7 +835,7 @@ Function1186f5:
dw Function1188c8
dw Function11878d
dw Function118903
dw Function118abc
dw SetStadiumDownloadURL
dw Function11878d
dw Function119451
dw Function1195f8
@@ -873,7 +873,7 @@ Function118746:
dw Function1188c8
dw Function11878d
dw Function118903
dw Function118ad0
dw SetOddEggDownloadURL
dw Function11878d
dw Function1196f2
dw Function1197c9
@@ -1067,7 +1067,7 @@ Function1188b8:
jp Function119e2b
Function1188c0:
ld de, wc3cd
ld de, wEmailAddress
ld a, MOBILEAPI_08
jp Function119e2b
@@ -1320,7 +1320,7 @@ Function118a65: ; unreferenced
ld bc, $1000
jp Function118b10
Function118a7a:
SetBattleDownloadURL:
ld hl, BattleDownloadURL
ld de, wcc60
ld bc, $80
@@ -1329,7 +1329,7 @@ Function118a7a:
ld bc, $1000
jp Function118b10
Function118a8f:
SetExchangeDownloadURL:
ld hl, ExchangeDownloadURL
ld de, wcc60
ld bc, $80
@@ -1338,7 +1338,7 @@ Function118a8f:
ld bc, $1000
jp Function118b10
Function118aa4:
SetNewsDownloadURL:
ld hl, NewsDownloadURL
ld de, wcc60
ld bc, $80
@@ -1349,8 +1349,8 @@ Function118aa4:
ld bc, $e00
jr Function118b10
Function118abc:
ld hl, MenuDownloadURL
SetStadiumDownloadURL:
ld hl, StadiumDownloadURL
ld de, wcc60
ld bc, $80
call CopyBytes
@@ -1358,8 +1358,8 @@ Function118abc:
ld bc, $1000
jr Function118b10
Function118ad0:
ld hl, IndexDownloadURL
SetOddEggDownloadURL:
ld hl, OddEggDownloadURL
ld de, wcc60
ld bc, $80
call CopyBytes
@@ -1411,13 +1411,13 @@ Function118b10:
Function118b24:
ld hl, wc346
ld a, $8
ld a, LOW(wc708)
ld [hli], a
ld a, $c7
ld a, HIGH(wc708)
ld [hli], a
ld a, $60
ld a, LOW(wcc60)
ld [hli], a
ld a, $cc
ld a, HIGH(wcc60)
ld [hli], a
call Function119eb4
call Function119ec2
@@ -1494,10 +1494,10 @@ BattleDownloadURL:
NewsDownloadURL:
db "http://gameboy.datacenter.ne.jp/cgb/download?name=/01/CGB-BXTJ/news/index.txt", 0
MenuDownloadURL:
StadiumDownloadURL:
db "http://gameboy.datacenter.ne.jp/cgb/download?name=/01/CGB-BXTJ/POKESTA/menu.cgb", 0
IndexDownloadURL:
OddEggDownloadURL:
db "http://gameboy.datacenter.ne.jp/cgb/download?name=/01/CGB-BXTJ/tamago/index.txt", 0
popc
@@ -1569,7 +1569,7 @@ asm_118d9f:
ld a, [wcd38]
and a
jr nz, .asm_118db2
ld a, $8f
ld a, TRADE_CORNER_REQUEST_LENGTH
ld [wcd3b], a
jr .asm_118db7
@@ -1579,17 +1579,17 @@ asm_118d9f:
.asm_118db7
ld hl, w3_d800
ld a, $8
ld a, LOW(wc608)
ld [hli], a
ld a, $c6
ld a, HIGH(wc608)
ld [hli], a
ld a, [wcd3b]
ld [hli], a
xor a
ld [hli], a
ld a, $8
ld a, LOW(wc708)
ld [hli], a
ld a, $c7
ld a, HIGH(wc708)
ld [hli], a
ld a, [wcd39]
ld [hli], a
@@ -1752,9 +1752,9 @@ Function118ec6:
call CopyBytes
xor a
ld [wc31f], a
ld a, $20
ld a, LOW(wc320)
ld [wc31b], a
ld a, $c3
ld a, HIGH(wc320)
ld [wc31c], a
hlcoord 1, 14
ld a, l
@@ -1834,21 +1834,21 @@ Function118f68:
and a
jr z, .asm_118fba
ld hl, wc346
ld a, LOW($c608)
ld a, LOW(wc608)
ld [hli], a
ld a, HIGH($c608)
ld a, HIGH(wc608)
ld [hli], a
ld a, [wcd4b]
ld [hli], a
ld a, [wcd4c]
ld [hli], a
ld a, LOW($c708)
ld a, LOW(wc708)
ld [hli], a
ld a, HIGH($c708)
ld a, HIGH(wc708)
ld [hli], a
ld a, $60
ld a, LOW(wcc60)
ld [hli], a
ld a, $cc
ld a, HIGH(wcc60)
ld [hli], a
call Function119eb4
call Function119ec2
@@ -1914,21 +1914,21 @@ Function119009:
call Function1191ad
ret c
ld hl, wc346
ld a, $8
ld a, LOW(wc608)
ld [hli], a
ld a, $c6
ld a, HIGH(wc608)
ld [hli], a
ld a, [wcd4b]
ld [hli], a
ld a, [wcd4c]
ld [hli], a
ld a, $8
ld a, LOW(wc708)
ld [hli], a
ld a, $c7
ld a, HIGH(wc708)
ld [hli], a
ld a, $60
ld a, LOW(wcc60)
ld [hli], a
ld a, $cc
ld a, HIGH(wcc60)
ld [hli], a
call Function119eb4
call Function119ec2
@@ -2202,7 +2202,7 @@ Function119223:
ld [wcd4c], a
ld a, BANK(s5_b092) ; aka BANK(s5_b1b1) and BANK(s5_b1b2) and BANK(s5_b1d3)
call OpenSRAM
ld hl, wc3cd
ld hl, wEmailAddress
ld de, s5_b092
ld bc, 31
call CopyBytes
@@ -2460,9 +2460,9 @@ Function1193a0:
ld [hli], a
ld a, HIGH(wc708)
ld [hli], a
ld a, $60
ld a, LOW(wcc60)
ld [hli], a
ld a, $cc
ld a, HIGH(wcc60)
ld [hli], a
call Function119eb4
call Function119ec2
@@ -2833,9 +2833,9 @@ Function119612:
Function119629:
call BattleTowerRoomMenu2
ret c
ld a, $60
ld a, LOW(wcc60)
ld l, a
ld a, $cc
ld a, HIGH(wcc60)
ld h, a
call Function118e39
ld a, $9
@@ -3291,12 +3291,12 @@ Function1198f7:
jp Function119e2b
Function119937:
farcall Function1707f4
farcall BattleTowerAction_06
jp BattleTowerRoomMenu_IncrementJumptable
Function119940:
ld de, wc3cd
ld c, $1e
ld de, wEmailAddress
ld c, MOBILE_EMAIL_LENGTH
.asm_119945
ld a, [de]
inc de
@@ -3319,7 +3319,7 @@ Function119954:
ld [wBattleTowerRoomMenu2JumptableIndex], a
call BattleTowerRoomMenu2
ld hl, wc608
ld de, wc3cd
ld de, wEmailAddress
.asm_119962
ld a, [de]
inc de
@@ -5673,7 +5673,7 @@ Jumptable_11ad78:
dw Function11af04
dw Function11af4e
Function11ad8a:
MobileIncJumptableIndex:
ld hl, wJumptableIndex
inc [hl]
ret
@@ -5694,7 +5694,7 @@ Function11ad95:
lb bc, 8, 8
call Function11afd6
farcall ReloadMapPart
call Function11ad8a
call MobileIncJumptableIndex
ld a, $1
ld [wMenuCursorY], a
ld hl, Unknown_11afcc
@@ -5768,7 +5768,7 @@ Function11adc4:
ld [hl], a
.asm_11ae2b
call Function11ad8a
call MobileIncJumptableIndex
.asm_11ae2e
call ExitMenu
@@ -5807,7 +5807,7 @@ Function11ae4e:
lb bc, 6, 11
call Function11afd6
farcall ReloadMapPart
call Function11ad8a
call MobileIncJumptableIndex
ld a, $1
ld [wMenuCursorY], a
ld hl, Unknown_11afd2
@@ -5869,7 +5869,7 @@ Function11ae98:
ld a, [wcd4b]
ld [wScriptVar], a
call Function11b022
call Function11ad8a
call MobileIncJumptableIndex
.asm_11aef7
call ExitMenu
@@ -5897,7 +5897,7 @@ Function11af04:
lb bc, 6, 11
call Function11afd6
farcall ReloadMapPart
call Function11ad8a
call MobileIncJumptableIndex
ld a, $2
ld [wMenuCursorY], a
ld hl, Unknown_11afd2
@@ -6116,7 +6116,7 @@ Function11b082:
call Function11b295
call Function11b275
call SetPalettes
jp Function11ad8a
jp MobileIncJumptableIndex
Function11b099:
ld c, $6
@@ -6249,7 +6249,7 @@ Function11b0ff:
jr z, .asm_11b167
cp $ff
jr z, .asm_11b16b
jp Function11ad8a
jp MobileIncJumptableIndex
.asm_11b163
ld a, $1
@@ -6395,7 +6395,7 @@ Function11b20b:
add [hl]
ld e, a
ld d, 0
ld hl, $c6d0
ld hl, wc6d0
add hl, de
ld a, [hl]
ld [wTempSpecies], a
@@ -6500,9 +6500,9 @@ Function11b295:
call Function11b20b
call CheckSeenMemMon
jr z, .asm_11b2d1
ld a, [$c608]
ld a, [wc608]
ld c, a
ld a, [$c608 + 1]
ld a, [wc608 + 1]
ld b, a
ld hl, $0007
add hl, bc
@@ -6518,9 +6518,9 @@ Function11b295:
jr .asm_11b2e7
.asm_11b2d1
ld a, [$c608]
ld a, [wc608]
ld c, a
ld a, [$c608 + 1]
ld a, [wc608 + 1]
ld b, a
ld hl, $0007
add hl, bc
@@ -6531,7 +6531,7 @@ Function11b295:
ld de, String_11b30e
.asm_11b2e7
ld a, $6
ld a, NAME_LENGTH_JAPANESE
ld bc, wStringBuffer4
.asm_11b2ec
push af
@@ -6791,10 +6791,10 @@ Function11b3d9:
ld [hl], a
ret
Function11b444:
TradeCornerHoldMon:
; special
call Mobile46_InitJumptable
call Mobile46_RunJumptable
call TradeCornerHoldMon_RunJumptable
ret
Mobile46_InitJumptable:
@@ -6806,7 +6806,7 @@ Mobile46_InitJumptable:
call UpdateTime
ret
Mobile46_RunJumptable:
TradeCornerHoldMon_RunJumptable:
.loop
call .IterateJumptable
call DelayFrame
@@ -6819,17 +6819,17 @@ Mobile46_RunJumptable:
jumptable .Jumptable, wJumptableIndex
.Jumptable:
dw Function11b483
dw TradeCornerHoldMon_PrepareForUpload
dw Function11b570
dw Function11b5c0
dw Function11b5e0
dw Function11b5e7 ; unused
dw TradeCornerHoldMon_RemoveFromParty
dw TradeCornerHoldMon_Success
dw TradeCornerHoldMon_Noop ; unused
Function11b483:
TradeCornerHoldMon_PrepareForUpload:
call .InitRAM
ld hl, wPlayerName
ld a, NAME_LENGTH_JAPANESE - 1
.loop1
.get_char
push af
ld a, [hli]
ld [bc], a
@@ -6837,24 +6837,26 @@ Function11b483:
pop af
dec a
and a
jr nz, .loop1
jr nz, .get_char
ld de, PARTYMON_STRUCT_LENGTH
ld hl, wPartyMon1Species
ld a, [wcd82]
dec a
push af
.loop2
.get_next_party_mon
and a
jr z, .okay
jr z, .got_selected_mon
add hl, de
dec a
jr .loop2
jr .get_next_party_mon
.okay
.got_selected_mon
push bc
ld a, PARTYMON_STRUCT_LENGTH
.loop3
.copy_mon_byte
; copies wPartyMon to bc.
push af
ld a, [hli]
ld [bc], a
@@ -6862,9 +6864,9 @@ Function11b483:
pop af
dec a
and a
jr nz, .loop3
jr nz, .copy_mon_byte
pop de
pop de ; pushed from bc
push bc
ld a, [de]
ld [wCurSpecies], a
@@ -6961,10 +6963,10 @@ Function11b483:
and a
jr nz, .loop9
call CloseSRAM
jp Function11ad8a
jp MobileIncJumptableIndex
.InitRAM:
ld bc, $c626
ld bc, wOfferTrainerID
ld a, [wPlayerID]
ld [wcd2a], a
ld [bc], a
@@ -6985,19 +6987,19 @@ Function11b483:
ld [bc], a
inc bc
ld a, [wcd2e]
ld a, [wcd2e] ; offer gender
ld [bc], a
inc bc
ld a, [wcd2f]
ld a, [wcd2f] ; offer species
ld [bc], a
inc bc
ld a, [wcd30]
ld a, [wcd30] ; req gender
ld [bc], a
inc bc
ld a, [wd265]
ld a, [wd265] ; req species
ld [bc], a
inc bc
ret
@@ -7008,7 +7010,7 @@ Function11b570:
and a
jr nz, .exit
call .SaveData
jp Function11ad8a
jp MobileIncJumptableIndex
.exit
ld a, $4
@@ -7020,7 +7022,7 @@ Function11b570:
ldh [rSVBK], a
ld hl, w3_d800
ld de, $c608
ld de, wc608
ld bc, w3_d88f - w3_d800
call CopyBytes
@@ -7033,7 +7035,7 @@ Function11b570:
ld a, $1
ld [de], a
inc de
ld hl, $c608
ld hl, wc608
ld bc, w3_d88f - w3_d800
call CopyBytes
@@ -7052,36 +7054,36 @@ Function11b570:
call CloseSRAM
ret
Function11b5c0:
TradeCornerHoldMon_RemoveFromParty:
ld a, [wcd82]
dec a
ld [wCurPartyMon], a
xor a ; REMOVE_PARTY
ld [wPokemonWithdrawDepositParameter], a
farcall RemoveMonFromPartyOrBox
farcall Function170807
farcall BattleTowerAction_16
farcall SaveAfterLinkTrade
jp Function11ad8a
jp MobileIncJumptableIndex
Function11b5e0:
TradeCornerHoldMon_Success:
xor a
ld [wScriptVar], a
jp Function11ad8a
jp MobileIncJumptableIndex
Function11b5e7:
TradeCornerHoldMon_Noop:
ret
Function11b5e8:
ld a, $0
call OpenSRAM
ld hl, wRTC
ld de, $c608
ld de, wc608
ld bc, 4
call CopyBytes
call CloseSRAM
ld a, $5
call OpenSRAM
ld hl, $c608
ld hl, wc608
ld de, $b08c
ld bc, 4
call CopyBytes
@@ -7145,7 +7147,7 @@ Function11b66d:
jr .asm_11b6b0
.asm_11b691
farcall Function17081d
farcall BattleTowerAction_17
ld a, [wScriptVar]
and a
jr z, .asm_11b6b0
@@ -7161,7 +7163,7 @@ Function11b66d:
ldh [rSVBK], a
.asm_11b6b0
jp Function11ad8a
jp MobileIncJumptableIndex
Function11b6b3:
ret
@@ -7170,74 +7172,74 @@ Function11b6b4:
ld a, $5
call OpenSRAM
ld a, [wcd30]
ld [$c708], a
ld [wc708], a
ld a, [wcd31]
ld [$c709], a
ld [wc709], a
ld a, LOW($c708) ; Species
ld a, LOW(wc708)
ld [wMobileMonSpeciesPointer], a
ld a, HIGH($c708)
ld a, HIGH(wc708)
ld [wMobileMonSpeciesPointer + 1], a
ld a, LOW($c60d) ; Partymon Struct
ld a, LOW(wMobileMon)
ld [wMobileMonStructPointer], a
ld a, HIGH($c60d)
ld a, HIGH(wMobileMon)
ld [wMobileMonStructPointer + 1], a
ld a, LOW($c63d) ; OT
ld a, LOW(wMobileMonOT)
ld [wMobileMonOTPointer], a
ld a, HIGH($c63d)
ld a, HIGH(wMobileMonOT)
ld [wMobileMonOTPointer + 1], a
ld a, LOW($c642) ; Nickname
ld a, LOW(wMobileMonNick)
ld [wMobileMonNicknamePointer], a
ld a, HIGH($c642)
ld a, HIGH(wMobileMonNick)
ld [wMobileMonNicknamePointer + 1], a
ld a, LOW($c647) ; Mail
ld a, LOW(wMobileMonMail)
ld [wMobileMonMailPointer], a
ld a, HIGH($c647)
ld a, HIGH(wMobileMonMail)
ld [wMobileMonMailPointer + 1], a
ld a, $46
ld [$c628], a
ld a, BASE_HAPPINESS
ld [wMobileMonHappiness], a
ld de, $c63d
ld c, 5
ld de, wMobileMonOT
ld c, NAME_LENGTH_JAPANESE - 1
farcall CheckStringForErrors
jr nc, .length_check_OT
farcall Mobile_CopyDefaultOTName
.length_check_OT
ld de, $c63d
lb bc, 1, 5
ld de, wMobileMonOT
lb bc, 1, NAME_LENGTH_JAPANESE - 1
farcall CheckStringContainsLessThanBNextCharacters
jr nc, .error_check_nick
farcall Mobile_CopyDefaultOTName
.error_check_nick
ld de, $c642
ld c, 5
ld de, wMobileMonNick
ld c, NAME_LENGTH_JAPANESE - 1
farcall CheckStringForErrors
jr nc, .length_check_nick
farcall Mobile_CopyDefaultNickname
.length_check_nick
ld de, $c642
lb bc, 1, 5
ld de, wMobileMonNick
lb bc, 1, NAME_LENGTH_JAPANESE - 1
farcall CheckStringContainsLessThanBNextCharacters
jr nc, .error_check_mail
farcall Mobile_CopyDefaultNickname
.error_check_mail
ld de, $c647
ld de, wMobileMonMail
ld c, MAIL_MSG_LENGTH + 1
farcall CheckStringForErrors
jr nc, .length_check_mail
farcall Mobile_CopyDefaultMail
.length_check_mail
ld de, $c647
ld de, wMobileMonMail
lb bc, 2, MAIL_MSG_LENGTH + 1
farcall CheckStringContainsLessThanBNextCharacters
jr c, .fix_mail
@@ -7249,33 +7251,33 @@ Function11b6b4:
farcall Mobile_CopyDefaultMail
.mail_ok
ld de, $c668
ld c, $5
ld de, wMobileMonMailAuthor
ld c, NAME_LENGTH_JAPANESE - 1
farcall CheckStringForErrors
jr nc, .length_check_author
farcall Mobile_CopyDefaultMailAuthor
.length_check_author
ld de, $c668
lb bc, 1, 5
ld de, wMobileMonMailAuthor
lb bc, 1, NAME_LENGTH_JAPANESE - 1
farcall CheckStringContainsLessThanBNextCharacters
jr nc, .author_okay
farcall Mobile_CopyDefaultMailAuthor
.author_okay
ld a, [$c60e]
ld a, [wMobileMonItem]
cp -1
jr nz, .item_okay
xor a
ld [$c60e], a
ld [wMobileMonItem], a
.item_okay
ld a, [wcd31]
ld [$c60d], a
ld [wMobileMonSpecies], a
ld [wCurSpecies], a
call GetBaseData
ld hl, $c60d + MON_LEVEL
ld hl, wMobileMonLevel
ld a, [hl]
cp MIN_LEVEL
ld a, MIN_LEVEL
@@ -7289,12 +7291,12 @@ Function11b6b4:
.done_level
ld [wCurPartyLevel], a
ld hl, $c60d + MON_STAT_EXP - 1
ld de, $c60d + MON_MAXHP
ld hl, wMobileMonExp + 2
ld de, wMobileMonMaxHP
ld b, TRUE
predef CalcMonStats
ld de, $c60d + MON_MAXHP
ld hl, $c60d + MON_HP
ld de, wMobileMonMaxHP
ld hl, wMobileMonHP
ld a, [de]
ld [hli], a
inc de
@@ -7304,27 +7306,27 @@ Function11b6b4:
ret
Function11b7e5:
ld a, [$c60d] ; species
ld a, [wMobileMonSpecies]
ld [wOTTrademonSpecies], a
ld [wCurPartySpecies], a
ld a, [wcd81]
ld [wc74e], a
ld hl, $c63d ; OT
ld hl, wMobileMonOT ; OT
ld de, wOTTrademonOTName
ld bc, 5
call CopyBytes
ld a, "@"
ld [de], a
ld a, [$c60d + MON_ID] ; id
ld a, [wMobileMonID]
ld [wOTTrademonID], a
ld a, [$c60d + MON_ID + 1]
ld a, [wMobileMonID + 1]
ld [wOTTrademonID + 1], a
ld hl, $c60d + MON_DVS ; dvs
ld hl, wMobileMonDVs
ld a, [hli]
ld [wOTTrademonDVs], a
ld a, [hl]
ld [wOTTrademonDVs + 1], a
ld bc, $c60d ; pokemon_data_start
ld bc, wMobileMon ; pokemon_data_start
farcall GetCaughtGender
ld a, c
ld [wOTTrademonCaughtData], a
@@ -7340,10 +7342,10 @@ Function11b7e5:
xor a
ld [wLinkMode], a
farcall SaveAfterLinkTrade
ld a, $5
ld a, BANK(s5_a800)
call OpenSRAM
ld a, $5
ld [$a800], a
ld [s5_a800], a
call CloseSRAM
ld a, [wMapGroup]
ld b, a
@@ -7366,17 +7368,17 @@ Function11b879:
ld a, [wScriptVar]
and a
ret z
ld a, $5
ld a, BANK(s5_a800)
call OpenSRAM
ld a, [$a800]
ld a, [s5_a800]
ld [wScriptVar], a
ld a, [$a890]
ld a, [s5_a890]
ld [wcd49], a
ld a, [$a891]
ld a, [s5_a891]
ld [wcd4a], a
ld a, [$a892]
ld a, [s5_a892]
ld [wcd4b], a
ld a, [$a893]
ld a, [s5_a893]
ld [wcd4c], a
call CloseSRAM
ld a, [wScriptVar]
@@ -7455,10 +7457,10 @@ Function11b879:
Function11b920:
call Mobile46_InitJumptable
ld a, $5
ld a, BANK(sOfferTrainerID)
call OpenSRAM
ld hl, $a81f
ld de, $c626
ld hl, sOfferTrainerID
ld de, wOfferTrainerID
ld bc, 8
call CopyBytes
call CloseSRAM
@@ -7466,39 +7468,39 @@ Function11b920:
ret
Function11b93b:
ld a, $5
ld a, BANK(s5_a800)
call OpenSRAM
xor a
ld [$a800], a
ld hl, $a823
ld de, $c608
ld bc, $008f
ld [s5_a800], a
ld hl, sOfferGender
ld de, wc608
ld bc, TRADE_CORNER_REQUEST_LENGTH
call CopyBytes
call CloseSRAM
ld a, LOW($c608)
ld a, LOW(wUnknownGender)
ld [wMobileMonSpeciesPointer], a
ld a, HIGH($c608)
ld a, HIGH(wUnknownGender)
ld [wMobileMonSpeciesPointer + 1], a
ld a, LOW($c611)
ld a, LOW(wUnknownMon)
ld [wMobileMonStructPointer], a
ld a, HIGH($c611)
ld a, HIGH(wUnknownMon)
ld [wMobileMonStructPointer + 1], a
ld a, LOW($c641)
ld a, LOW(wUnknownMonOT)
ld [wMobileMonOTPointer], a
ld a, HIGH($c641)
ld a, HIGH(wUnknownMonOT)
ld [wMobileMonOTPointer + 1], a
ld a, LOW($c646)
ld a, LOW(wUnknownMonNick)
ld [wMobileMonNicknamePointer], a
ld a, HIGH($c646)
ld a, HIGH(wUnknownMonNick)
ld [wMobileMonNicknamePointer + 1], a
ld a, LOW($c64b)
ld a, LOW(wUnknownMonMail)
ld [wMobileMonMailPointer], a
ld a, HIGH($c64b)
ld a, HIGH(wUnknownMonMail)
ld [wMobileMonMailPointer + 1], a
call AddMobileMonToParty
farcall SaveAfterLinkTrade
@@ -7532,7 +7534,7 @@ AddMobileMonToParty:
ld hl, wPartyMon1Species
ld bc, PARTYMON_STRUCT_LENGTH
ld a, e
ld [wMobileMonSpecies], a
ld [wMobileMonIndex], a
.loop2
add hl, bc
dec a
@@ -7549,7 +7551,7 @@ AddMobileMonToParty:
ld hl, wPartyMonOTs
ld bc, NAME_LENGTH
ld a, [wMobileMonSpecies]
ld a, [wMobileMonIndex]
.loop3
add hl, bc
dec a
@@ -7568,7 +7570,7 @@ AddMobileMonToParty:
ld hl, wPartyMonNicknames
ld bc, MON_NAME_LENGTH
ld a, [wMobileMonSpecies]
ld a, [wMobileMonIndex]
.loop4
add hl, bc
dec a
@@ -7587,7 +7589,7 @@ AddMobileMonToParty:
ld hl, sPartyMail
ld bc, MAIL_STRUCT_LENGTH
ld a, [wMobileMonSpecies]
ld a, [wMobileMonIndex]
.loop5
add hl, bc
dec a

66
mobile/mobile_5c.asm
View File

@@ -1,68 +1,68 @@
Function170000:
ld a, [$c62b]
ld a, [wOfferSpecies]
ld [wPlayerTrademonSpecies], a
ld hl, $c62e
ld hl, wOfferMonSender
ld de, wPlayerTrademonSenderName
ld bc, $0005
ld bc, NAME_LENGTH_JAPANESE - 1
call CopyBytes
ld a, $50
ld a, "@"
ld [de], a
ld hl, $c663
ld hl, wOfferMonOT
ld de, wPlayerTrademonOTName
ld bc, $0005
ld bc, NAME_LENGTH_JAPANESE - 1
call CopyBytes
ld a, $50
ld a, "@"
ld [de], a
ld hl, $c648
ld hl, wOfferMonDVs
ld a, [hli]
ld [wPlayerTrademonDVs], a
ld a, [hl]
ld [wPlayerTrademonDVs + 1], a
ld hl, $c639
ld hl, wOfferMonID
ld a, [hli]
ld [wPlayerTrademonID], a
ld a, [hl]
ld [wPlayerTrademonID + 1], a
ld bc, $c633
ld bc, wOfferMon
farcall GetCaughtGender
ld a, c
ld [wPlayerTrademonCaughtData], a
ld a, [wcd81]
ld [wc74e], a
ld hl, $c608
ld hl, wc608
ld de, $d800
ld bc, $008f
ld bc, TRADE_CORNER_REQUEST_LENGTH
call CopyBytes
ret
Function17005a:
ld a, $5
ld a, BANK(sOfferMon)
call OpenSRAM
ld a, [$a824]
ld a, [sOfferSpecies]
ld [wOTTrademonSpecies], a
ld hl, $a827
ld hl, sOfferMonSender
ld de, wOTTrademonSenderName
ld bc, NAME_LENGTH_JAPANESE - 1
call CopyBytes
ld a, "@"
ld [de], a
ld hl, $a85c
ld hl, sOfferMonOT
ld de, wOTTrademonOTName
ld bc, NAME_LENGTH_JAPANESE - 1
call CopyBytes
ld a, "@"
ld [de], a
ld hl, $a841
ld hl, sOfferMonDVs
ld a, [hli]
ld [wOTTrademonDVs], a
ld a, [hl]
ld [wOTTrademonDVs + 1], a
ld hl, $a832
ld hl, sOfferMonID
ld a, [hli]
ld [wOTTrademonID], a
ld a, [hl]
ld [wOTTrademonID + 1], a
ld bc, $a82c
ld bc, sOfferMon
farcall GetCaughtGender
ld a, c
ld [wOTTrademonCaughtData], a
@@ -413,10 +413,10 @@ Function171ac9:
Function171ad7:
xor a
ld hl, $c608
ld hl, wc608
ld bc, $66
call ByteFill
ld de, $c608
ld de, wc608
ld a, MOBILEAPI_06
call MobileAPI
jp Function171c66
@@ -445,7 +445,7 @@ Function171aec:
jr nz, .asm_171b01
hlcoord 2, 7
ld a, $3
ld de, $c608
ld de, wc608
.asm_171b1b
push af
push hl
@@ -515,16 +515,16 @@ Function171b4b:
Function171b85:
ld hl, hJoyPressed
ld a, [hl]
and $2
and B_BUTTON
jp nz, Function171b9f
ld a, [hl]
and $1
and A_BUTTON
jp nz, Function171bbd
ld a, [hl]
and $40
and D_UP
jr nz, asm_171ba5
ld a, [hl]
and $80
and D_DOWN
jr nz, asm_171baf
ret
@@ -562,10 +562,10 @@ Function171bbd:
Function171bcc:
ld hl, hJoyPressed
ld a, [hl]
and $2
and B_BUTTON
jp nz, Function171bdc
ld a, [hl]
and $1
and A_BUTTON
jp nz, Function171beb
ret
@@ -579,10 +579,10 @@ Function171bdc:
ret
Function171beb:
ld a, $5
ld a, BANK(s5_aa4a)
call OpenSRAM
ld a, [wcd4a]
ld [$aa4a], a
ld [s5_aa4a], a
call CloseSRAM
ld hl, MenuHeader_171c6b
call LoadMenuHeader
@@ -652,7 +652,7 @@ Function171c87:
call DisableLCD
ld hl, AsciiFontGFX
ld de, vTiles2 tile $00
ld bc, $6e0
ld bc, $6e tiles
call CopyBytes
ld hl, PasswordSlowpokeLZ
ld de, vTiles0 tile $00
@@ -724,7 +724,7 @@ Function171d2b:
call DisableLCD
ld hl, AsciiFontGFX
ld de, vTiles2 tile $00
ld bc, $6e0
ld bc, $6e tiles
call CopyBytes
ld hl, PasswordSlowpokeLZ
ld de, vTiles0 tile $00
@@ -797,7 +797,7 @@ Function172e78:
call DisableLCD
ld hl, Stadium2N64GFX
ld de, vTiles2 tile $00
ld bc, $610
ld bc, $61 tiles
call CopyBytes
call EnableLCD
ld hl, Stadium2N64Tilemap

73
mobile/mobile_5f.asm
View File

@@ -265,27 +265,27 @@ CheckStringForErrors_IgnoreTerminator:
ret
Function17d0f3:
ld a, [wc608 + 5]
ld a, [wMobileMonSpecies]
ld [wOTTrademonSpecies], a
ld [wCurPartySpecies], a
ld a, [wcd81]
ld [wc74e], a
ld hl, wc608 + 53
ld hl, wMobileMonOT
ld de, wOTTrademonOTName
ld bc, 5
ld bc, NAME_LENGTH_JAPANESE - 1
call CopyBytes
ld a, "@"
ld [de], a
ld a, [wc608 + 11]
ld a, [wMobileMonID]
ld [wOTTrademonID], a
ld a, [wc608 + 12]
ld a, [wMobileMonID + 1]
ld [wOTTrademonID + 1], a
ld hl, wc608 + 26
ld hl, wMobileMonDVs
ld a, [hli]
ld [wOTTrademonDVs], a
ld a, [hl]
ld [wOTTrademonDVs + 1], a
ld bc, wc608 + 5
ld bc, wMobileMonSpecies
farcall GetCaughtGender
ld a, c
ld [wOTTrademonCaughtData], a
@@ -301,10 +301,10 @@ Function17d0f3:
xor a
ld [wLinkMode], a
farcall SaveAfterLinkTrade
ld a, $5
ld a, BANK(s5_a800)
call OpenSRAM
ld a, $5
ld [$a800], a
ld a, BANK(s5_a800)
ld [s5_a800], a
call CloseSRAM
ld a, [wMapGroup]
ld b, a
@@ -324,8 +324,8 @@ Function17d0f3:
Mobile_CopyDefaultOTName:
ld hl, Mobile5F_PlayersName
ld de, wc63d
ld bc, 5
ld de, wMobileMonOT
ld bc, NAME_LENGTH_JAPANESE - 1
call CopyBytes
ret
@@ -334,8 +334,8 @@ Mobile5F_PlayersName:
Mobile_CopyDefaultNickname:
ld hl, .DefaultNickname
ld de, wc642
ld bc, 5
ld de, wMobileMonNick
ld bc, NAME_LENGTH_JAPANESE - 1
call CopyBytes
ret
@@ -344,26 +344,27 @@ Mobile_CopyDefaultNickname:
Mobile_CopyDefaultMail:
ld a, "@"
ld hl, wc647
ld hl, wMobileMonMail
ld bc, MAIL_MSG_LENGTH + 1
call ByteFill
ld hl, .DefaultMessage
ld de, wc647
ld bc, 6
ld de, wMobileMonMail
ld bc, .DefaultMessageEnd - .DefaultMessage
call CopyBytes
ret
.DefaultMessage:
db "こんにちは@"
.DefaultMessageEnd:
Mobile_CopyDefaultMailAuthor:
ld a, "@"
ld de, wc668
ld bc, 5
ld de, wMobileMonMailAuthor
ld bc, NAME_LENGTH_JAPANESE - 1
call ByteFill
ld hl, Mobile5F_PlayersName
ld de, wc668
ld bc, 5
ld de, wMobileMonMailAuthor
ld bc, NAME_LENGTH_JAPANESE - 1
call CopyBytes
ret
@@ -542,20 +543,20 @@ Function17d2ce:
ret
Function17d314:
ld a, $5
ld a, BANK(s5_b1b1)
call OpenSRAM
ld a, [$b1b1]
ld a, [s5_b1b1]
call CloseSRAM
cp $21
jr nc, .asm_17d354
ld a, $6
ld a, BANK(s6_a006)
call OpenSRAM
ld l, $0
ld l, 0
ld h, l
ld de, $a006
ld a, [$a004]
ld de, s6_a006
ld a, [s6_a004]
ld c, a
ld a, [$a005]
ld a, [s6_a005]
ld b, a
.asm_17d336
push bc
@@ -569,10 +570,10 @@ Function17d314:
ld a, b
or c
jr nz, .asm_17d336
ld a, [$a002]
ld a, [s6_a002]
cp l
jr nz, .asm_17d354
ld a, [$a003]
ld a, [s6_a003]
cp h
jr nz, .asm_17d354
call CloseSRAM
@@ -635,10 +636,10 @@ Function17d370:
ld [wBGMapBuffer], a
ld a, $d0
ld [wcd21], a
ld a, $6
ld a, BANK(s6_a006)
call OpenSRAM
ld hl, $a006
ld de, wBGPals1
ld hl, s6_a006
ld de, w4_d000
ld bc, $1000
call CopyBytes
call CloseSRAM
@@ -1176,11 +1177,11 @@ Function17d78d:
ld a, [hli]
ld b, a
call HlToCrashCheckPointer
ld a, $6
ld a, BANK(s6_a006)
call OpenSRAM
ld hl, $a006
ld hl, s6_a006
add hl, bc
ld de, wBGPals1
ld de, w4_d000
ld bc, $1000
call CopyBytes
call CloseSRAM