mirror of
https://gitlab.com/xCrystal/pokecrystal-board.git
synced 2025-04-09 05:44:44 -07:00
Some Mobile code labeling and removed magic numbers (#993)
* 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
GitHub
parent
41d5ea0482
commit
0f5540740b
@ -53,10 +53,11 @@ DEF MAX_PC_ITEMS EQU 50
|
||||
DEF MAX_ITEM_STACK EQU 99
|
||||
|
||||
; mail
|
||||
DEF MAIL_LINE_LENGTH EQU $10
|
||||
DEF MAIL_MSG_LENGTH EQU $20
|
||||
DEF MAILBOX_CAPACITY EQU 10
|
||||
DEF MAIL_STRUCT_LENGTH EQU $2f ; mailmsg struct
|
||||
DEF MAIL_LINE_LENGTH EQU $10
|
||||
DEF MAIL_MSG_LENGTH EQU $20
|
||||
DEF MAILBOX_CAPACITY EQU 10
|
||||
DEF MAIL_STRUCT_LENGTH EQU $2f ; mailmsg struct
|
||||
DEF MAIL_STRUCT_LENGTH_JP EQU $2a ; mailmsg_jp struct
|
||||
|
||||
; held item effects
|
||||
const_def
|
||||
|
||||
@ -25,7 +25,7 @@
|
||||
const MOBILEAPI_16
|
||||
const MOBILEAPI_17
|
||||
const MOBILEAPI_SETTIMER
|
||||
const MOBILEAPI_19
|
||||
const MOBILEAPI_TELEPHONESTATUS
|
||||
const MOBILEAPI_1A
|
||||
const MOBILEAPI_1B
|
||||
const MOBILEAPI_1C
|
||||
@ -61,3 +61,10 @@ DEF MOBILE_PHONE_NUMBER_LENGTH EQU 20
|
||||
; Maximum amount of time allowed for mobile battles each day
|
||||
DEF MOBILE_BATTLE_ALLOWED_SECONDS EQU 0
|
||||
DEF MOBILE_BATTLE_ALLOWED_MINUTES EQU 10
|
||||
|
||||
; Trade corner request size
|
||||
; DION addr $1e + request $8 + Name $5
|
||||
; + party struct $30 + OT $5 + NICK $5
|
||||
; + JP Mail struct $2a
|
||||
DEF MOBILE_EMAIL_LENGTH EQU $1e
|
||||
DEF TRADE_CORNER_REQUEST_LENGTH EQU $8f
|
||||
|
||||
@ -123,7 +123,7 @@ SpecialsPointers::
|
||||
|
||||
; Crystal only
|
||||
add_special Function11ac3e
|
||||
add_special Function11b444
|
||||
add_special TradeCornerHoldMon
|
||||
add_special Function11b5e8
|
||||
add_special Function11b7e5
|
||||
add_special Function11b879
|
||||
|
||||
@ -858,31 +858,31 @@ BattleTowerAction:
|
||||
dw BattleTowerAction_GetChallengeState
|
||||
dw BattleTowerAction_SetByteToQuickSaveChallenge
|
||||
dw BattleTowerAction_SetByteToCancelChallenge
|
||||
dw Function1707ac
|
||||
dw Function1707f4
|
||||
dw BattleTowerAction_05
|
||||
dw BattleTowerAction_06
|
||||
dw SaveBattleTowerLevelGroup
|
||||
dw LoadBattleTowerLevelGroup
|
||||
dw BattleTower_CheckSaveFileExistsAndIsYours
|
||||
dw Function1708b1
|
||||
dw BattleTowerAction_0A
|
||||
dw CheckMobileEventIndex
|
||||
dw Function1708c8
|
||||
dw Function1708f0
|
||||
dw BattleTowerAction_0C
|
||||
dw BattleTowerAction_0D
|
||||
dw BattleTowerAction_EggTicket
|
||||
dw Function1709aa
|
||||
dw Function1709bb
|
||||
dw Function170a9c
|
||||
dw Function170aa0
|
||||
dw Function170aaf
|
||||
dw Function170abe
|
||||
dw Function170ad7
|
||||
dw Function170807
|
||||
dw Function17081d
|
||||
dw BattleTowerAction_0F
|
||||
dw BattleTowerAction_10
|
||||
dw BattleTowerAction_11
|
||||
dw BattleTowerAction_12
|
||||
dw BattleTowerAction_13
|
||||
dw BattleTowerAction_14
|
||||
dw BattleTowerAction_15
|
||||
dw BattleTowerAction_16
|
||||
dw BattleTowerAction_17
|
||||
dw BattleTowerAction_LevelCheck
|
||||
dw BattleTowerAction_UbersCheck
|
||||
dw ResetBattleTowerTrainersSRAM
|
||||
dw BattleTower_GiveReward
|
||||
dw Function17071b
|
||||
dw Function170729
|
||||
dw BattleTowerAction_1C
|
||||
dw BattleTowerAction_1D
|
||||
dw BattleTower_RandomlyChooseReward
|
||||
dw BattleTower_SaveOptions
|
||||
|
||||
@ -932,7 +932,7 @@ BattleTower_GiveReward:
|
||||
ld [wScriptVar], a
|
||||
ret
|
||||
|
||||
Function17071b:
|
||||
BattleTowerAction_1C:
|
||||
ld a, BANK(sBattleTowerChallengeState)
|
||||
call OpenSRAM
|
||||
ld a, BATTLETOWER_WON_CHALLENGE
|
||||
@ -940,7 +940,7 @@ Function17071b:
|
||||
call CloseSRAM
|
||||
ret
|
||||
|
||||
Function170729:
|
||||
BattleTowerAction_1D:
|
||||
ld a, BANK(sBattleTowerChallengeState)
|
||||
call OpenSRAM
|
||||
ld a, BATTLETOWER_RECEIVED_REWARD
|
||||
@ -1019,7 +1019,7 @@ SetBattleTowerChallengeState:
|
||||
call CloseSRAM
|
||||
ret
|
||||
|
||||
Function1707ac:
|
||||
BattleTowerAction_05:
|
||||
ld a, BANK(s5_aa8c) ; aka BANK(s5_be46)
|
||||
call OpenSRAM
|
||||
ld a, [s5_aa8c]
|
||||
@ -1060,7 +1060,7 @@ Function1707ac:
|
||||
ld a, 8
|
||||
ld [wScriptVar], a
|
||||
|
||||
Function1707f4:
|
||||
BattleTowerAction_06:
|
||||
ld a, BANK(s5_be46) ; aka BANK(s5_aa8b) and BANK(s5_aa8c)
|
||||
call OpenSRAM
|
||||
xor a
|
||||
@ -1070,7 +1070,7 @@ Function1707f4:
|
||||
call CloseSRAM
|
||||
ret
|
||||
|
||||
Function170807:
|
||||
BattleTowerAction_16:
|
||||
call UpdateTime
|
||||
ld a, BANK(s5_b2f9) ; aka BANK(s5_b2fa)
|
||||
call OpenSRAM
|
||||
@ -1081,7 +1081,7 @@ Function170807:
|
||||
call CloseSRAM
|
||||
ret
|
||||
|
||||
Function17081d:
|
||||
BattleTowerAction_17:
|
||||
xor a
|
||||
ld [wScriptVar], a
|
||||
ld a, BANK(s5_b2f9) ; aka BANK(s5_b2fa)
|
||||
@ -1168,13 +1168,13 @@ BattleTower_CheckSaveFileExistsAndIsYours:
|
||||
ld [wScriptVar], a
|
||||
ret
|
||||
|
||||
Function1708b1: ; BattleTowerAction $0a
|
||||
BattleTowerAction_0A:
|
||||
xor a
|
||||
ld [wMusicFade], a
|
||||
call MaxVolume
|
||||
ret
|
||||
|
||||
CheckMobileEventIndex: ; BattleTowerAction $0b something to do with GS Ball
|
||||
CheckMobileEventIndex: ; something to do with GS Ball
|
||||
ld a, BANK(sMobileEventIndex)
|
||||
call OpenSRAM
|
||||
ld a, [sMobileEventIndex]
|
||||
@ -1182,7 +1182,7 @@ CheckMobileEventIndex: ; BattleTowerAction $0b something to do with GS Ball
|
||||
call CloseSRAM
|
||||
ret
|
||||
|
||||
Function1708c8: ; BattleTowerAction $0c
|
||||
BattleTowerAction_0C:
|
||||
call UpdateTime
|
||||
ld a, BANK(s5_aa8b) ; aka BANK(s5_aa8c), BANK(s5_aa5d), BANK(s5_aa48), and BANK(s5_aa47)
|
||||
call OpenSRAM
|
||||
@ -1201,7 +1201,7 @@ Function1708c8: ; BattleTowerAction $0c
|
||||
call CloseSRAM
|
||||
ret
|
||||
|
||||
Function1708f0: ; BattleTowerAction $0d
|
||||
BattleTowerAction_0D:
|
||||
xor a ; FALSE
|
||||
ld [wScriptVar], a
|
||||
call UpdateTime
|
||||
@ -1239,7 +1239,7 @@ Function170923:
|
||||
call CloseSRAM
|
||||
ret
|
||||
|
||||
BattleTowerAction_EggTicket: ; BattleTowerAction $0e
|
||||
BattleTowerAction_EggTicket:
|
||||
xor a ; FALSE
|
||||
ld [wScriptVar], a
|
||||
ld a, EGG_TICKET
|
||||
@ -1309,7 +1309,7 @@ endr
|
||||
String_MysteryJP:
|
||||
db "なぞナゾ@@" ; MYSTERY
|
||||
|
||||
Function1709aa: ; BattleTowerAction $0f
|
||||
BattleTowerAction_0F:
|
||||
ldh a, [rSVBK]
|
||||
push af
|
||||
ld a, BANK(w3_d090)
|
||||
@ -1320,7 +1320,7 @@ Function1709aa: ; BattleTowerAction $0f
|
||||
ldh [rSVBK], a
|
||||
ret
|
||||
|
||||
Function1709bb: ; BattleTowerAction $10
|
||||
BattleTowerAction_10:
|
||||
xor a ; FALSE
|
||||
ld [wScriptVar], a
|
||||
ld a, BANK(s5_a800)
|
||||
@ -1366,15 +1366,15 @@ Function1709bb: ; BattleTowerAction $10
|
||||
ret
|
||||
|
||||
.Action4:
|
||||
ld a, BANK(s5_b023) ; aka BANK(s5_a825) and BANK(s5_a826)
|
||||
ld a, BANK(s5_b023) ; aka BANK(sOfferReqGender) and BANK(sOfferReqSpecies)
|
||||
call OpenSRAM
|
||||
ld hl, s5_b023
|
||||
ld de, wc608
|
||||
ld bc, 105
|
||||
call CopyBytes
|
||||
ld a, [s5_a825]
|
||||
ld a, [sOfferReqGender]
|
||||
ld [wcd30], a
|
||||
ld a, [s5_a826]
|
||||
ld a, [sOfferReqSpecies]
|
||||
ld [wcd31], a
|
||||
call CloseSRAM
|
||||
farcall Function11b6b4
|
||||
@ -1444,11 +1444,11 @@ Function1709bb: ; BattleTowerAction $10
|
||||
.no_scene_2
|
||||
ret
|
||||
|
||||
Function170a9c:
|
||||
BattleTowerAction_11:
|
||||
ld c, FALSE
|
||||
jr Set_s5_aa8d
|
||||
|
||||
Function170aa0:
|
||||
BattleTowerAction_12:
|
||||
ld c, TRUE
|
||||
Set_s5_aa8d:
|
||||
ld a, BANK(s5_aa8d)
|
||||
@ -1458,7 +1458,7 @@ Set_s5_aa8d:
|
||||
call CloseSRAM
|
||||
ret
|
||||
|
||||
Function170aaf:
|
||||
BattleTowerAction_13:
|
||||
ld a, BANK(s5_aa8d)
|
||||
call OpenSRAM
|
||||
ld a, [s5_aa8d]
|
||||
@ -1466,7 +1466,7 @@ Function170aaf:
|
||||
call CloseSRAM
|
||||
ret
|
||||
|
||||
Function170abe:
|
||||
BattleTowerAction_14:
|
||||
call BattleTower_CheckSaveFileExistsAndIsYours
|
||||
ld a, [wScriptVar]
|
||||
and a
|
||||
@ -1480,7 +1480,7 @@ Function170abe:
|
||||
call CloseSRAM
|
||||
ret
|
||||
|
||||
Function170ad7:
|
||||
BattleTowerAction_15:
|
||||
ld a, BANK(sBattleTowerSaveFileFlags)
|
||||
call OpenSRAM
|
||||
ld a, [sBattleTowerSaveFileFlags]
|
||||
|
||||
@ -58,12 +58,12 @@ _GiveOddEgg:
|
||||
|
||||
; load species in wMobileMonSpecies
|
||||
ld a, EGG
|
||||
ld [wMobileMonSpecies], a
|
||||
ld [wMobileMonMiscSpecies], a
|
||||
|
||||
; load pointer to (wMobileMonSpecies - 1) in wMobileMonSpeciesPointer
|
||||
ld a, LOW(wMobileMonSpecies - 1)
|
||||
ld a, LOW(wMobileMonMiscSpecies - 1)
|
||||
ld [wMobileMonSpeciesPointer], a
|
||||
ld a, HIGH(wMobileMonSpecies - 1)
|
||||
ld a, HIGH(wMobileMonMiscSpecies - 1)
|
||||
ld [wMobileMonSpeciesPointer + 1], a
|
||||
; load pointer to wOddEgg in wMobileMonStructPointer
|
||||
ld a, LOW(wOddEgg)
|
||||
|
||||
@ -1,12 +1,8 @@
|
||||
EmptyAllSRAMBanks:
|
||||
ld a, 0
|
||||
call .EmptyBank
|
||||
ld a, 1
|
||||
call .EmptyBank
|
||||
ld a, 2
|
||||
call .EmptyBank
|
||||
ld a, 3
|
||||
for x, NUM_SRAM_BANKS
|
||||
ld a, x
|
||||
call .EmptyBank
|
||||
endr
|
||||
ret
|
||||
|
||||
.EmptyBank:
|
||||
|
||||
@ -342,6 +342,8 @@ WRAMX 2
|
||||
"Pic Animations"
|
||||
WRAMX 3
|
||||
"Battle Tower RAM"
|
||||
WRAMX 4
|
||||
"News Script RAM"
|
||||
WRAMX 5
|
||||
align 8
|
||||
"GBC Video"
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -201,6 +201,16 @@ MACRO mailmsg
|
||||
\1End::
|
||||
ENDM
|
||||
|
||||
MACRO mailmsg_jp
|
||||
\1Message:: ds MAIL_MSG_LENGTH
|
||||
\1MessageEnd:: db
|
||||
\1Author:: ds NAME_LENGTH_JAPANESE - 1
|
||||
\1AuthorID:: dw
|
||||
\1Species:: db
|
||||
\1Type:: db
|
||||
\1End::
|
||||
ENDM
|
||||
|
||||
MACRO roam_struct
|
||||
\1Species:: db
|
||||
\1Level:: db
|
||||
|
||||
@ -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]
|
||||
|
||||
@ -943,7 +943,7 @@ Function1063e5:
|
||||
|
||||
Function1063f3:
|
||||
ld de, wcd31
|
||||
ld a, MOBILEAPI_19
|
||||
ld a, MOBILEAPI_TELEPHONESTATUS
|
||||
call MobileAPI
|
||||
ld a, [wMobileCommsJumptableIndex]
|
||||
inc a
|
||||
|
||||
@ -239,7 +239,7 @@ Function1166d6:
|
||||
cp $ff
|
||||
ret nz
|
||||
ld a, $4
|
||||
ld [$c319], a
|
||||
ld [wc319], a
|
||||
xor a
|
||||
ld [wc314], a
|
||||
ret
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
36
ram/sram.asm
36
ram/sram.asm
@ -286,13 +286,23 @@ sTrainerRankingsBackup:: ds sTrainerRankingsEnd - sTrainerRankings
|
||||
|
||||
s5_a800:: db
|
||||
|
||||
ds $24
|
||||
|
||||
s5_a825:: db
|
||||
s5_a826:: db
|
||||
|
||||
ds $6d
|
||||
sOfferEmail:: ds MOBILE_EMAIL_LENGTH
|
||||
sOfferTrainerID:: dw
|
||||
sOfferSecretID:: dw
|
||||
sOfferGender:: db
|
||||
sOfferSpecies:: db
|
||||
sOfferReqGender:: db
|
||||
sOfferReqSpecies:: db
|
||||
sOfferMonSender:: ds NAME_LENGTH_JAPANESE - 1
|
||||
sOfferMon:: party_struct sOfferMon
|
||||
sOfferMonOT:: ds NAME_LENGTH_JAPANESE - 1
|
||||
sOfferMonNick:: ds NAME_LENGTH_JAPANESE - 1
|
||||
sOfferMonMail:: mailmsg_jp sOfferMonMail
|
||||
|
||||
s5_a890:: db
|
||||
s5_a891:: db
|
||||
s5_a892:: db
|
||||
s5_a893:: db
|
||||
s5_a894:: ds 6
|
||||
s5_a89a:: dw
|
||||
s5_a89c:: ds 22
|
||||
@ -372,13 +382,19 @@ s5_bfff:: db
|
||||
|
||||
SECTION "SRAM Mobile 3", SRAM
|
||||
|
||||
s6_a000::
|
||||
|
||||
s6_a000:: db
|
||||
db
|
||||
s6_a002:: db
|
||||
s6_a003:: db
|
||||
s6_a004:: db
|
||||
s6_a005:: db
|
||||
s6_a006:: ds $1000
|
||||
|
||||
SECTION "SRAM Mobile 4", SRAM
|
||||
|
||||
s7_a000::
|
||||
s7_a000:: db
|
||||
s7_a001:: db
|
||||
|
||||
ds $800
|
||||
ds $7fe
|
||||
|
||||
s7_a800:: db
|
||||
|
||||
69
ram/wram.asm
69
ram/wram.asm
@ -275,7 +275,8 @@ wSpriteAnimDataEnd::
|
||||
|
||||
; mobile data
|
||||
wc3cc:: ds 1
|
||||
wc3cd:: ds 31
|
||||
wEmailAddress:: ds MOBILE_EMAIL_LENGTH
|
||||
ds 1
|
||||
wc3ec:: ds 1
|
||||
wc3ed:: ds 1
|
||||
wc3ee:: ds 1
|
||||
@ -668,16 +669,46 @@ wDebugDarkTileColor:: ds 2
|
||||
wDebugBlackTileColor:: ds 2
|
||||
|
||||
NEXTU
|
||||
wc608:: ds 16
|
||||
wc618:: ds 37
|
||||
wc63d:: ds 5
|
||||
wc642:: ds 5
|
||||
wc647:: ds 1
|
||||
wMobileMonSender:: ds NAME_LENGTH_JAPANESE - 1
|
||||
wMobileMon:: party_struct wMobileMon
|
||||
wMobileMonOT:: ds NAME_LENGTH_JAPANESE - 1
|
||||
wMobileMonNick:: ds NAME_LENGTH_JAPANESE - 1
|
||||
wMobileMonMail:: mailmsg_jp wMobileMonMail
|
||||
|
||||
NEXTU
|
||||
wOfferEmail:: ds MOBILE_EMAIL_LENGTH
|
||||
wOfferTrainerID:: dw
|
||||
wOfferSecretID:: dw
|
||||
wOfferGender:: db
|
||||
wOfferSpecies:: db
|
||||
wOfferReqGender:: db
|
||||
wOfferReqSpecies:: db
|
||||
wOfferMonSender:: ds NAME_LENGTH_JAPANESE - 1
|
||||
wOfferMon:: party_struct wOfferMon
|
||||
wOfferMonOT:: ds NAME_LENGTH_JAPANESE - 1
|
||||
wOfferMonNick:: ds NAME_LENGTH_JAPANESE - 1
|
||||
wOfferMonMail:: mailmsg_jp wOfferMonMail
|
||||
|
||||
NEXTU
|
||||
wUnknownGender:: db
|
||||
wUnknownSpecies:: db
|
||||
wUnknownReqGender:: db
|
||||
wUnknownReqSpecies:: db
|
||||
wUnknownMonSender:: ds NAME_LENGTH_JAPANESE - 1
|
||||
wUnknownMon:: party_struct wUnknownMon
|
||||
wUnknownMonOT:: ds NAME_LENGTH_JAPANESE - 1
|
||||
wUnknownMonNick:: ds NAME_LENGTH_JAPANESE - 1
|
||||
wUnknownMonMail:: mailmsg_jp wUnknownMonMail
|
||||
|
||||
NEXTU
|
||||
wc608:: ds 7
|
||||
wc60f:: ds 9
|
||||
wc618:: ds 48
|
||||
wc648:: ds 2
|
||||
wc64a:: ds 30
|
||||
wc668:: ds 32
|
||||
wc64a:: ds 62
|
||||
wc688:: ds 2
|
||||
wc68a:: ds 30
|
||||
wc68a:: ds 15
|
||||
wc699:: ds 15
|
||||
wc6a8:: ds 40
|
||||
ENDU
|
||||
|
||||
@ -1103,8 +1134,7 @@ wc80b:: db
|
||||
wc80c:: dw
|
||||
wc80e:: db
|
||||
wc80f:: db
|
||||
wc810:: db
|
||||
wc811:: db
|
||||
wc810:: dw
|
||||
wMobileSDK_PacketChecksum:: dw
|
||||
wc814:: db
|
||||
wc815:: db
|
||||
@ -1122,8 +1152,7 @@ wc821:: db
|
||||
wc822:: db
|
||||
wc823:: ds 4
|
||||
wc827:: dw
|
||||
wc829:: db
|
||||
wc82a:: db
|
||||
wc829:: dw
|
||||
wc82b:: db
|
||||
wc82c:: db
|
||||
wc82d:: db
|
||||
@ -1141,8 +1170,7 @@ wc86a:: db
|
||||
wc86b:: db
|
||||
wc86c:: db
|
||||
wc86d:: db
|
||||
wc86e:: db
|
||||
wc86f:: db
|
||||
wc86e:: dw
|
||||
wc870:: db
|
||||
wc871:: db
|
||||
wc872:: db
|
||||
@ -1158,8 +1186,7 @@ wc87c:: db
|
||||
wc87d:: db
|
||||
wc87e:: db
|
||||
wc87f:: db
|
||||
wc880:: db
|
||||
wc881:: db
|
||||
wc880:: dw
|
||||
wc882:: db
|
||||
wc883:: db
|
||||
wc884:: ds 8
|
||||
@ -1309,7 +1336,8 @@ wcd27:: ds 1
|
||||
wcd28:: ds 1
|
||||
wcd29:: ds 1
|
||||
|
||||
wMobileMonSpecies::
|
||||
wMobileMonIndex::
|
||||
wMobileMonMiscSpecies::
|
||||
wcd2a:: db
|
||||
|
||||
UNION
|
||||
@ -3465,6 +3493,11 @@ w3_de00:: ds $200
|
||||
ENDU
|
||||
|
||||
|
||||
SECTION "News Script RAM", WRAMX
|
||||
|
||||
w4_d000:: ds $1000
|
||||
|
||||
|
||||
SECTION "GBC Video", WRAMX, ALIGN[8]
|
||||
|
||||
; eight 4-color palettes each
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user