All functions in main.asm have non-generic names

This commit is contained in:
pikalaxalt
2016-05-08 14:11:24 -04:00
parent bb58230ca7
commit e95d42e0af
34 changed files with 537 additions and 551 deletions

View File

@@ -81,7 +81,7 @@ ENDC
bccoord 1, 14
pop af
ld [rSVBK], a
call PlaceWholeStringInBoxAtOnce
call PlaceHLTextAtBC
ret
; 11c05d

View File

@@ -10,7 +10,7 @@ Function11c05d: ; 11c05d
cp $ff
jr z, .asm_11c071
push hl
call Function11c156
call CopyMobileFixedWordToC608
pop hl
call PlaceString
and a
@@ -21,7 +21,6 @@ Function11c05d: ; 11c05d
ld b, h
scf
ret
; 11c075
Function11c075: ; 11c075
@@ -32,7 +31,6 @@ Function11c075: ; 11c075
ld bc, wcd36
call Function11c08f
ret
; 11c082
Function11c082: ; 11c082
@@ -41,9 +39,8 @@ Function11c082: ; 11c082
call Function11c254
pop de
ld bc, wcd36
call Function11c0c6
call PrintFixedWordBattleMessage
ret
; 11c08f
Function11c08f: ; 11c08f
@@ -96,123 +93,144 @@ Function11c08f: ; 11c08f
dec a
jr nz, .asm_11c0b0
ret
; 11c0c6
Function11c0c6: ; 11c0c6
PrintFixedWordBattleMessage: ; 11c0c6
; Use up to 6 words from bc to print text starting at de.
; Preserve $cf63, $cf64
ld a, [wJumptableIndex]
ld l, a
ld a, [wcf64]
ld h, a
push hl
ld hl, $c608 + 16
; reset value at c618 (not preserved)
ld hl, $c618
ld a, $0
ld [hli], a
; preserve de
push de
; $cf63 keeps track of which line we're on (0, 1, or 2)
; $cf64 keeps track of how much room we have left in the current line
xor a
ld [wJumptableIndex], a
ld a, $12
ld a, 18
ld [wcf64], a
ld a, $6
.asm_11c0e1
ld a, $6 ; up to 6 times
.loop
push af
; load the 2-byte word data pointed to by bc
ld a, [bc]
ld e, a
inc bc
ld a, [bc]
ld d, a
inc bc
; if $0000, we're done
or e
jr z, .asm_11c133
jr z, .done
; preserving hl and bc, get the length of the word
push hl
push bc
call Function11c156
call Function11c14a
call CopyMobileFixedWordToC608
call GetLengthOfWordAtC608
ld e, c
pop bc
pop hl
; if the functions return 0, we're done
ld a, e
or a
jr z, .asm_11c133
.asm_11c0fa
jr z, .done
.loop2
; e contains the length of the word
; add 1 for the space, unless we're at the start of the line
ld a, [wcf64]
cp $12
jr z, .asm_11c102
cp 18
jr z, .skip_inc
inc e
.asm_11c102
.skip_inc
; if the word fits, put it on the same line
cp e
jr nc, .asm_11c11c
jr nc, .same_line
; otherwise, go to the next line
ld a, [wJumptableIndex]
inc a
ld [wJumptableIndex], a
ld [hl], $4e
; if we're on line 2, insert "<NEXT>"
ld [hl], "<NEXT>"
rra
jr c, .asm_11c113
ld [hl], $55
jr c, .got_line_terminator
; else, insert "<CONT>"
ld [hl], "<CONT>"
.asm_11c113
.got_line_terminator
inc hl
ld a, $12
; init the next line, holding on to the same word
ld a, 18
ld [wcf64], a
dec e
jr .asm_11c0fa
jr .loop2
.asm_11c11c
cp $12
jr z, .asm_11c123
ld [hl], $7f
.same_line
; add the space, unless we're at the start of the line
cp 18
jr z, .skip_space
ld [hl], " "
inc hl
.asm_11c123
.skip_space
; deduct the length of the word
sub e
ld [wcf64], a
ld de, $c608
.asm_11c12a
.place_string_loop
; load the string from de to hl
ld a, [de]
cp $50
jr z, .asm_11c133
cp "@"
jr z, .done
inc de
ld [hli], a
jr .asm_11c12a
jr .place_string_loop
.asm_11c133
.done
; next word?
pop af
dec a
jr nz, .asm_11c0e1
ld [hl], $57
jr nz, .loop
; we're finished, place "<DONE>"
ld [hl], "<DONE>"
; now, let's place the string from c618 to bc
pop bc
ld hl, $c608 + 16
call PlaceWholeStringInBoxAtOnce
ld hl, $c618
call PlaceHLTextAtBC
; restore the original values of $cf63 and $cf64
pop hl
ld a, l
ld [wJumptableIndex], a
ld a, h
ld [wcf64], a
ret
; 11c14a
Function11c14a: ; 11c14a
GetLengthOfWordAtC608: ; 11c14a
ld c, $0
ld hl, $c608
.asm_11c14f
.loop
ld a, [hli]
cp $50
cp "@"
ret z
inc c
jr .asm_11c14f
jr .loop
; 11c156
Function11c156: ; 11c156
CopyMobileFixedWordToC608: ; 11c156
ld a, [rSVBK]
push af
ld a, $1
ld [rSVBK], a
ld a, $50
ld a, "@"
ld hl, $c608
ld bc, $000b
ld bc, NAME_LENGTH
call ByteFill
ld a, d
and a
@@ -239,7 +257,7 @@ Function11c156: ; 11c156
rl b
add hl, bc
ld bc, 5 ; length of a string
.loop
.copy_string
ld de, $c608
call CopyBytes
ld de, $c608
@@ -253,7 +271,7 @@ Function11c156: ; 11c156
call GetPokemonName
ld hl, StringBuffer1
ld bc, PKMN_NAME_LENGTH - 1
jr .loop
jr .copy_string
; 11c1ab
Function11c1ab: ; 11c1ab
@@ -265,7 +283,6 @@ Function11c1ab: ; 11c1ab
pop af
ld [hInMenu], a
ret
; 11c1b9
Function11c1b9: ; 11c1b9
@@ -278,7 +295,6 @@ Function11c1b9: ; 11c1b9
pop af
ld [rSVBK], a
ret
; 11c1ca
Function11c1ca: ; 11c1ca
@@ -329,7 +345,6 @@ Function11c1ca: ; 11c1ca
call Function11d4aa
call Function11d3ba
ret
; 11c254
Function11c254: ; 11c254
@@ -351,10 +366,8 @@ Function11c254: ; 11c254
call CopyBytes
call CloseSRAM
ret
; 11c277
Function11c277: ; 11c277 (47:4277)
ld a, " "
hlcoord 0, 6
@@ -379,14 +392,12 @@ Function11c283: ; 11c283
callba ClearSpriteAnims
call ClearSprites
ret
; 11c2ac
.DoJumptableFunction: ; 11c2ac
jumptable .Jumptable, wJumptableIndex
; 11c2bb
.Jumptable: ; 11c2bb (47:42bb)
dw Function11c2e9 ; 00
dw Function11c346 ; 01
@@ -412,7 +423,6 @@ Function11c283: ; 11c283
dw Function11ce0b ; 15
dw Function11ce2b ; 16
Function11c2e9: ; 11c2e9 (47:42e9)
depixel 3, 1, 2, 5
ld a, SPRITE_ANIM_INDEX_1D
@@ -535,7 +545,6 @@ Function11c38a: ; 11c38a (47:438a)
dec a
jr nz, .asm_11c392
ret
; 11c3bc (47:43bc)
String_11c3bc: ; 11c3bc
@@ -705,7 +714,6 @@ Function11c4be: ; 11c4be (47:44be)
call ByteFill
callba ReloadMapPart
ret
; 11c4db (47:44db)
String_11c4db: ; 11c4db
@@ -865,7 +873,6 @@ Function11c53d: ; 11c53d (47:453d)
.asm_11c5ee
ld [hl], a
ret
; 11c5f0
Function11c5f0: ; 11c5f0 (47:45f0)
@@ -903,7 +910,6 @@ Function11c618: ; 11c618 (47:4618)
call ByteFill
callba ReloadMapPart
ret
; 11c62a (47:462a)
String_11c62a: ; 11c62a
@@ -1265,7 +1271,6 @@ Function11c7bc: ; 11c7bc (47:47bc)
pop hl
pop de
ret
; 11c854 (47:4854)
Unknown_11c854: ; 11c854
@@ -1339,7 +1344,6 @@ Function11c86e: ; 11c86e (47:486e)
dec c
jr nz, .asm_11c8c2
ret
; 11c8c7 (47:48c7)
BCD2String: ; 11c8c7
@@ -1363,7 +1367,6 @@ BCD2String: ; 11c8c7
add "0"
ld [hli], a
ret
; 11c8ec
MobileString_Page: ; 11c8ec
@@ -1480,7 +1483,6 @@ Function11c95d: ; 11c95d (47:495d)
jr nz, .asm_11c980
pop hl
ret
; 11c986 (47:4986)
Unknown_11c986:
@@ -1606,7 +1608,6 @@ Function11ca19: ; 11ca19 (47:4a19)
jr nz, .asm_11ca22
callba ReloadMapPart
ret
; 11ca38 (47:4a38)
String_11ca38: ; 11ca38
@@ -1736,7 +1737,6 @@ Function11cab3: ; 11cab3 (47:4ab3)
ret nz
inc [hl]
ret
; 11cb1c (47:4b1c)
String_11cb1c: ; 11cb1c
@@ -1867,7 +1867,6 @@ Function11cbf5: ; 11cbf5 (47:4bf5)
dec hl
set 7, [hl]
ret
; 11cc01 (47:4c01)
Unknown_11cc01: ; 11cc01
@@ -1933,7 +1932,6 @@ Function11cd04: ; 11cd04 (47:4d04)
ld a, $4
ld [wJumptableIndex], a
ret
; 11cd10 (47:4d10)
String_11cd10: ; 11cd10
@@ -2033,7 +2031,6 @@ Function11cdaa: ; 11cdaa (47:4daa)
call ByteFill
callba ReloadMapPart
ret
; 11cdc7 (47:4dc7)
String_11cdc7: ; 11cdc7
@@ -2162,7 +2159,6 @@ Function11ce2b: ; 11ce2b (47:4e2b)
ret z
ld [wcd22], a
ret
; 11ceb9 (47:4eb9)
Unknown_11ceb9: ; 11ceb9
@@ -2278,7 +2274,6 @@ Function11cfb5: ; 11cfb5 (47:4fb5)
ld hl, wJumptableIndex
inc [hl]
ret
; 11cfba (47:4fba)
Unknown_11cfba:
@@ -2522,7 +2517,6 @@ Function11d0b6: ; 11d0b6 (47:50b6)
dw .nine
dw .ten
.zero ; 11d0dd (47:50dd)
ld a, [wcd20] ; wcd20 (aliases: CreditsPos)
sla a
@@ -2702,7 +2696,6 @@ Function11d0b6: ; 11d0b6 (47:50b6)
ld e, a
call Function11d2ee
ret
; 11d208 (47:5208)
Unknown_11d208: ; 11d208
@@ -2887,7 +2880,6 @@ Function11d323: ; 11d323
pop af
ld [rSVBK], a
ret
; 11d33a
Palette_11d33a:
@@ -2970,7 +2962,6 @@ Palette_11d33a:
RGB 00, 00, 00
RGB 00, 00, 00
RGB 00, 00, 00
; 11d3ba
Function11d3ba: ; 11d3ba
@@ -3146,7 +3137,6 @@ Function11d3ba: ; 11d3ba
pop af
ld [rSVBK], a
ret
; 11d493
.CheckSeenMon: ; 11d493
@@ -3165,7 +3155,6 @@ Function11d3ba: ; 11d3ba
pop bc
pop hl
ret
; 11d4aa
Function11d4aa: ; 11d4aa
@@ -3226,10 +3215,8 @@ Function11d4aa: ; 11d4aa
pop af
ld [rSVBK], a
ret
; 11d4fe
SortedPokemon:
; Pokemon sorted by kana.
; Notably, Rhydon is missing.

View File

@@ -481,9 +481,11 @@ _Get2bpp:: ; 104284
ld a, b ; bank
ld l, c ; number of tiles
ld h, $0
rept 4
add hl, hl ; multiply by 16 (16 bytes of a 2bpp = 8 x 8 tile)
endr
; multiply by 16 (16 bytes of a 2bpp = 8 x 8 tile)
add hl, hl
add hl, hl
add hl, hl
add hl, hl
ld b, h
ld c, l
ld h, d ; address

View File

@@ -11,14 +11,14 @@ InitMobileProfile: ; 4802f (12:402f)
call Function48d3d
ld a, [wd479]
bit 1, a
jr z, .asm_4805a
jr z, .not_yet_initialized
ld a, [wd003]
set 0, a
set 1, a
set 2, a
set 3, a
ld [wd003], a
.asm_4805a
.not_yet_initialized
call Function486bf
call LoadFontsExtra
ld de, GFX_488c3
@@ -125,22 +125,22 @@ Function48157: ; 48157 (12:4157)
ld hl, wMenuCursorY
ld b, [hl]
push bc
asm_4815f: ; 4815f (12:415f)
bit 0, a
bit A_BUTTON_F, a
jp nz, Function4820d
ld b, a
ld a, [wd002]
bit 6, a
jr z, .asm_48177
jr z, .dont_check_b_button
ld hl, wd479
bit 1, [hl]
jr z, .asm_48177
bit 1, b
jr nz, .asm_4817a
.asm_48177
jr z, .dont_check_b_button
bit B_BUTTON_F, b
jr nz, .b_button
.dont_check_b_button
jp Function48272
.asm_4817a
.b_button
call ClearBGPalettes
call Function48d30
pop bc
@@ -497,13 +497,14 @@ Function4840c: ; 4840c (12:440c)
ld [hl], b
ld a, [wd002]
bit 6, a
jr nz, .asm_48437
jr nz, .narrower_box
ld b, 9
ld c, 1
hlcoord 1, 4
call ClearBox
jp Function48157
.asm_48437
.narrower_box
ld b, 7
ld c, 1
hlcoord 1, 6
@@ -667,13 +668,13 @@ Function48689: ; 48689 (12:4689)
call GetMysteryGift_MobileAdapterLayout
call ClearBGPalettes
hlcoord 0, 0
ld b, $4
ld c, $14
ld b, 4
ld c, SCREEN_WIDTH
call ClearBox
hlcoord 0, 2
ld a, $c
ld [hl], a
ld bc, $13
ld bc, SCREEN_WIDTH - 1
add hl, bc
ld [hl], a
ld de, MobileProfileString
@@ -689,121 +690,139 @@ Function486bf: ; 486bf (12:46bf)
ld hl, w2DMenuCursorInitY
ld a, [wd002]
bit 6, a
jr nz, .asm_486ce
ld a, $4
jr nz, .start_at_6
ld a, 4
ld [hli], a
jr .asm_486d1
.asm_486ce
ld a, $6
ld [hli], a
.asm_486d1
ld a, $1
jr .got_init_y
.start_at_6
ld a, 6
ld [hli], a
.got_init_y
ld a, 1
ld [hli], a ; init x
ld a, [wd002]
bit 6, a
jr nz, .asm_486e7
jr nz, .check_wd479
call Function48725
ld a, $4
jr nc, .asm_486e4
ld a, $5
.asm_486e4
ld a, 4
jr nc, .got_num_rows_1
ld a, 5
.got_num_rows_1
ld [hli], a
jr .asm_486fb
.asm_486e7
jr .got_num_rows_2
.check_wd479
ld a, [wd479]
bit 1, a
jr nz, .asm_486f8
jr nz, .four_rows
call Function48725
jr c, .asm_486f8
ld a, $3
jr c, .four_rows
ld a, 3
ld [hli], a
jr .asm_486fb
.asm_486f8
ld a, $4
jr .got_num_rows_2
.four_rows
ld a, 4
ld [hli], a
.asm_486fb
ld a, $1
ld [hli], a
ld [hl], $0
.got_num_rows_2
ld a, 1
ld [hli], a ; num cols
ld [hl], $0 ; flags 1
set 5, [hl]
inc hl
xor a
ld [hli], a
ld [hli], a ; flags 2
ld a, $20
ld [hli], a
ld a, $1
add $40
add $80
ld [hli], a ; cursor offsets
ld a, A_BUTTON
add D_UP
add D_DOWN
push af
ld a, [wd002]
bit 6, a
jr z, .asm_4871a
jr z, .got_joypad_mask
pop af
add $2
add B_BUTTON
push af
.asm_4871a
.got_joypad_mask
pop af
ld [hli], a
ld a, $1
ld [hli], a
ld [hli], a
ld [hli], a ; cursor y
ld [hli], a ; cursor x
xor a
rept 3
ld [hli], a
endr
ld [hli], a ; off char
ld [hli], a ; cursor tile
ld [hli], a ; cursor tile + 1
ret
Function48725: ; 48725 (12:4725)
; ld a, [wd003]
; and $f
; cp $f
; jr nz, .clear_carry
; scf
; ret
; .clear_carry
; and a
; ret
ld a, [wd003]
bit 0, a
jr z, .asm_4873a
jr z, .clear_carry
bit 1, a
jr z, .asm_4873a
jr z, .clear_carry
bit 2, a
jr z, .asm_4873a
jr z, .clear_carry
bit 3, a
jr z, .asm_4873a
jr z, .clear_carry
scf
ret
.asm_4873a
.clear_carry
and a
ret
Function4873c: ; 4873c (12:473c)
ld hl, w2DMenuCursorInitY
ld a, $4
ld a, 4
ld [hli], a
ld a, $c
ld [hli], a
ld a, $2
ld [hli], a
ld a, $1
ld [hli], a
ld [hl], $0
ld a, 12
ld [hli], a ; init x
ld a, 2
ld [hli], a ; num rows
ld a, 1
ld [hli], a ; num cols
ld [hl], $0 ; flags 1
set 5, [hl]
inc hl
xor a
ld [hli], a
ld a, $20
ld [hli], a
ld a, $1
add $2
ld [hli], a
ld [hli], a ; flags 2
ln a, 2, 0
ld [hli], a ; cursor offsets
ld a, A_BUTTON
add B_BUTTON
ld [hli], a ; joypad filter
; ld a, [PlayerGender]
; xor 1
; inc a
ld a, [PlayerGender]
and a
jr z, .asm_48764
ld a, $2
jr .asm_48766
.asm_48764
jr z, .male
ld a, 2
jr .okay_gender
.male
ld a, 1
.okay_gender
ld [hli], a ; cursor y
ld a, $1
.asm_48766
ld [hli], a
ld a, $1
ld [hli], a
ld [hli], a ; cursor x
xor a
rept 3
ld [hli], a
endr
ld [hli], a ; off char
ld [hli], a ; cursor tile
ld [hli], a ; cursor tile + 1
ret
Function4876f: ; 4876f (12:476f)

View File

@@ -1001,52 +1001,51 @@ Mobile_CommunicationStandby: ; 10060d
db "つうしんたいきちゅう!@"
; 10062d
Function10062d: ; 10062d
AdvanceMobileInactivityTimerAndCheckExpired: ; 10062d
push bc
call Function10064e
call IncrementMobileInactivityTimerByCFrames
pop bc
ld a, [wcd44]
ld a, [wMobileInactivityTimerMinutes]
cp b
jr nc, .asm_10063a
jr nc, .timed_out
and a
ret
.asm_10063a
.timed_out
ld a, $fa
ld [wcd2b], a
scf
ret
; 100641
Function100641: ; 100641
StartMobileInactivityTimer: ; 100641
xor a
ld [wcd44], a
ld [wcd45], a
ld [wcd46], a
ld [wMobileInactivityTimerMinutes], a
ld [wMobileInactivityTimerSeconds], a
ld [wMobileInactivityTimerFrames], a
ret
; 10064c
Function10064c: ; 10064c
IncrementMobileInactivityTimerBy1Frame: ; 10064c
ld c, 1
Function10064e: ; 10064e
ld hl, wcd46
IncrementMobileInactivityTimerByCFrames: ; 10064e
ld hl, wMobileInactivityTimerFrames ; timer?
ld a, [hl]
add c
cp $3c
jr c, .asm_100658
cp 60
jr c, .seconds
xor a
.asm_100658
.seconds
ld [hld], a
ret c
ld a, [hl]
inc a
cp $3c
jr c, .asm_100661
cp 60
jr c, .minutes
xor a
.asm_100661
.minutes
ld [hld], a
ret c
inc [hl]
@@ -1268,35 +1267,35 @@ Function100772: ; 100772
Function10079c: ; 10079c
ld a, [wcd21]
cp $01
jr nz, .asm_1007f4
jr nz, .dont_quit
ld hl, wcd2a
bit 5, [hl]
jr nz, .asm_1007f4
jr nz, .dont_quit
ld hl, wcd2a
bit 6, [hl]
jr nz, .asm_1007f4
jr nz, .dont_quit
ld a, [wcd6a]
add c
cp $3c
jr nc, .asm_1007be
cp 60
jr nc, .overflow
ld [wcd6a], a
and a
ret
.asm_1007be
sub $3c
.overflow
sub 60
ld [wcd6a], a
ld d, b
push de
call Function1007f6
pop de
jr c, .asm_1007e5
jr c, .quit
ld a, c
and a
jr nz, .asm_1007e5
jr nz, .quit
ld a, b
cp $0a
jr nc, .asm_1007e5
cp 10
jr nc, .quit
ld a, d
and a
ret z
@@ -1309,7 +1308,7 @@ Function10079c: ; 10079c
and a
ret
.asm_1007e5
.quit
call Function1008e0
ld hl, wcd2a
set 4, [hl]
@@ -1318,7 +1317,7 @@ Function10079c: ; 10079c
scf
ret
.asm_1007f4
.dont_quit
and a
ret
; 1007f6
@@ -1704,7 +1703,7 @@ _LinkBattleSendReceiveAction: ; 100a09
.MobileBattle_SendReceiveAction: ; 100a87
call Function100acf
call Function100641
call StartMobileInactivityTimer
ld a, 0
ld [wcd27], a
.asm_100a92
@@ -1714,7 +1713,7 @@ _LinkBattleSendReceiveAction: ; 100a09
ld c, $01
ld b, $03
push bc
call Function10062d
call AdvanceMobileInactivityTimerAndCheckExpired
pop bc
jr c, .asm_100ac7
ld b, $01
@@ -2019,7 +2018,7 @@ Mobile_PartyMenuSelect: ; 100cb5
push bc
callba PlaySpriteAnimations
callba HDMATransferTileMapToWRAMBank3
call Function100dfd
call MobileComms_CheckInactivityTimer
pop bc
jr c, .done
ld a, [wMenuJoypadFilter]
@@ -2073,7 +2072,7 @@ MobileBattleMonMenu: ; 100d22
push bc
callba PlaySpriteAnimations
callba HDMATransferTileMapToWRAMBank3
call Function100dfd
call MobileComms_CheckInactivityTimer
pop bc
jr c, .asm_100d54
ld a, [wMenuJoypadFilter]
@@ -2180,7 +2179,7 @@ Mobile_SetOverworldDelay: ; 100dd2
Function100dd8: ; 100dd8
ld c, $01
ld b, $03
callba Function10062d
callba AdvanceMobileInactivityTimerAndCheckExpired
jr c, .asm_100dfb
ld c, $3c
ld b, $01
@@ -2198,7 +2197,7 @@ Function100dd8: ; 100dd8
ret
; 100dfd
Function100dfd: ; 100dfd
MobileComms_CheckInactivityTimer: ; 100dfd
ld a, [OverworldDelay]
ld c, a
ld a, 30
@@ -2206,22 +2205,22 @@ Function100dfd: ; 100dfd
ld c, a
ld b, 3
push bc
callba Function10062d
callba AdvanceMobileInactivityTimerAndCheckExpired ; useless to farcall
pop bc
jr c, .asm_100e2b
jr c, .quit
ld b, 1
call Function10079c
jr c, .asm_100e2b
jr c, .quit
call Function1009f3
jr c, .asm_100e2b
callba Function10032e
jr c, .quit
callba Function10032e ; useless to farcall
ld a, [wcd2b]
and a
jr nz, .asm_100e2b
jr nz, .quit
xor a
ret
.asm_100e2b
.quit
scf
ret
; 100e2d
@@ -2234,7 +2233,7 @@ Function100e2d: ; 100e2d
ld c, a
ld b, 3
push bc
callba Function10062d
callba AdvanceMobileInactivityTimerAndCheckExpired
pop bc
jr c, .asm_100e61
ld b, 1
@@ -3277,7 +3276,7 @@ Function1014b7: ; 1014b7
Function1014ce: ; 1014ce
callba Function100720
callba Function100641
callba StartMobileInactivityTimer
ld a, [wMobileCommsJumptableIndex]
inc a
ld [wMobileCommsJumptableIndex], a
@@ -3345,7 +3344,7 @@ Function101537: ; 101537
; 101544
Function101544: ; 101544
callba Function100641
callba StartMobileInactivityTimer
ld a, $12
call Function3e32
ld a, [wMobileCommsJumptableIndex]
@@ -3355,7 +3354,7 @@ Function101544: ; 101544
; 101557
Function101557: ; 101557
callba Function100641
callba StartMobileInactivityTimer
ld hl, wcd53
ld a, $08
call Function3e32
@@ -3387,8 +3386,8 @@ Function101571: ; 101571
; 10158a
Function10158a: ; 10158a
callba Function10064c
ld a, [wcd44]
callba IncrementMobileInactivityTimerBy1Frame
ld a, [wMobileInactivityTimerMinutes]
cp $0a
jr c, Function10156d
ld a, $fb
@@ -3539,7 +3538,7 @@ Function10168e: ; 10168e
ret c
ld c, $01
ld b, $03
callba Function10062d
callba AdvanceMobileInactivityTimerAndCheckExpired
ret c
ld a, [wcd26]
ld hl, Jumptable_1016c3
@@ -3772,7 +3771,7 @@ Function1017f5: ; 1017f5
ret c
ld c, $01
ld b, $03
callba Function10062d
callba AdvanceMobileInactivityTimerAndCheckExpired
ret c
callba Function100382
ld a, [wcd27]
@@ -5277,7 +5276,7 @@ Function1022d0: ; 1022d0
sub c
ld c, a
ld b, $03
callba Function10062d
callba AdvanceMobileInactivityTimerAndCheckExpired
jr c, .asm_1022f3
xor a
ret
@@ -6153,7 +6152,7 @@ Function1028e8: ; 1028e8
ld hl, wcd4b
res 6, [hl]
ld [wcd50], a
callba Function100641
callba StartMobileInactivityTimer
ld a, 0
ld [wcd4a], a
ret
@@ -6557,7 +6556,7 @@ Function102bac: ; 102bac
ld [CurPartyMon], a
call LowVolume
call ClearSprites
callba _BattleStatsScreenInit
callba _MobileStatsScreenInit
ld a, [CurPartyMon]
inc a
ld [wMenuCursorY], a

View File

@@ -983,9 +983,9 @@ Function106464:: ; 106464
ld hl, VTiles2 tile $60
lb bc, BANK(MobilePhoneTilesGFX), 1
call Get2bpp
ld de, GFX_f9424
ld de, FontsExtra2_UpArrowGFX
ld hl, VTiles2 tile $61
lb bc, BANK(GFX_f9424), 1
lb bc, BANK(FontsExtra2_UpArrowGFX), 1
call Get2bpp
ld de, GFX_106514
ld hl, VTiles2 tile $62

File diff suppressed because it is too large Load Diff

View File

@@ -230,45 +230,7 @@ INCBIN "gfx/unknown/16c633.tilemap"
INCBIN "gfx/unknown/16c79b.tilemap"
UnknownMobilePalettes_16c903: ; 16c903
RGB 31, 31, 31
RGB 04, 10, 20
RGB 16, 19, 25
RGB 25, 27, 29
RGB 31, 31, 31
RGB 31, 31, 31
RGB 31, 31, 31
RGB 31, 31, 31
RGB 31, 31, 31
RGB 31, 31, 31
RGB 31, 31, 31
RGB 31, 31, 31
RGB 31, 31, 31
RGB 31, 31, 31
RGB 31, 31, 31
RGB 31, 31, 31
RGB 31, 31, 31
RGB 31, 31, 31
RGB 31, 31, 31
RGB 31, 31, 31
RGB 31, 31, 31
RGB 31, 31, 31
RGB 31, 31, 31
RGB 31, 31, 31
RGB 31, 31, 31
RGB 31, 31, 31
RGB 31, 31, 31
RGB 31, 31, 31
RGB 31, 31, 31
RGB 31, 31, 31
RGB 31, 31, 31
RGB 31, 31, 31
INCLUDE "gfx/unknown/16c903.pal"
; 16c943

View File

@@ -892,11 +892,11 @@ Function17d48d: ; 17d48d
ld a, [hli]
ld [wcd43], a
ld a, [hli]
ld [wcd44], a
ld [wMobileInactivityTimerMinutes], a
ld a, [hli]
ld [wcd45], a
ld [wMobileInactivityTimerSeconds], a
ld a, [hli]
ld [wcd46], a
ld [wMobileInactivityTimerFrames], a
ld a, [hli]
and a
jr z, .asm_17d58a
@@ -2050,7 +2050,7 @@ Function17dd13: ; 17dd13
push hl
pop bc
pop hl
call PlaceWholeStringInBoxAtOnce
call PlaceHLTextAtBC
ret
; 17dd30
@@ -3420,16 +3420,16 @@ Function17e5af: ; 17e5af
ret z
ld a, [wcd43]
ld l, a
ld a, [wcd44]
ld a, [wMobileInactivityTimerMinutes]
ld h, a
bccoord 0, 0
add hl, bc
ld bc, $ffec
add hl, bc
ld a, [wcd45]
ld a, [wMobileInactivityTimerSeconds]
ld c, a
ld b, $0
ld a, [wcd46]
ld a, [wMobileInactivityTimerFrames]
call Function17e600
ld a, [wcd2e]
ld c, a
@@ -3453,7 +3453,7 @@ Function17e5af: ; 17e5af
pop de
ld a, [wcd43]
ld l, a
ld a, [wcd44]
ld a, [wMobileInactivityTimerMinutes]
ld h, a
bccoord 0, 0
add hl, bc