Harmonize some more symbols with pokegold

This commit is contained in:
Rangi
2020-06-16 11:28:52 -04:00
parent 4342ced31f
commit b9f2b93c17
34 changed files with 69 additions and 63 deletions

View File

@@ -76,7 +76,7 @@ Unused_CheckShininess:
and a
ret
Unreferenced_Function8aa4:
Unreferenced_SGB_ApplyCreditsPals:
push de
push bc
ld hl, PalPacket_9ce6
@@ -205,7 +205,7 @@ Unreferenced_Function8b67:
call GetPredefPal
jp LoadHLPaletteIntoDE
Unreferenced_Function8b81:
Unreferenced_GSIntro_LoadMonPalette:
call CheckCGB
jr nz, .cgb
ldh a, [hSGB]

View File

@@ -287,7 +287,7 @@ EXPORT PICS_FIX
db BANK("Pics 23") ; BANK("Pics 1") + 22
db BANK("Pics 24") ; BANK("Pics 1") + 23
Function511ec:
Unreferenced_GSIntro_GetMonFrontpic:
ld a, c
push de
ld hl, PokemonPicPointers

View File

@@ -2503,8 +2503,8 @@ CableClubCheckWhichChris:
ld [wScriptVar], a
ret
Unreferenced_Gen1LinkCommsBorderGFX:
INCBIN "gfx/trade/unused_gen_1_border_tiles.2bpp"
Unreferenced_GSLinkCommsBorderGFX:
INCBIN "gfx/trade/unused_gs_border_tiles.2bpp"
Unreferenced_Function29fe4:
ld a, BANK(sPartyMail)

View File

@@ -1,6 +1,6 @@
PrepMysteryGiftDataToSend:
ld de, wMysteryGiftStaging
ld a, $1
ld a, $1 + GS_VERSION
ld [de], a
inc de ; wc801
ld a, BANK(sGameData)

View File

@@ -363,8 +363,8 @@ Continue:
ld c, 20
call DelayFrames
farcall JumpRoamMons
farcall MysteryGift_CopyReceivedDecosToPC ; Mystery Gift
farcall Function140ae ; time-related
farcall MysteryGift_CopyReceivedDecosToPC
farcall ClockContinue
ld a, [wSpawnAfterChampion]
cp SPAWN_LANCE
jr z, .SpawnAfterE4

View File

@@ -4,7 +4,7 @@ INCBIN "gfx/mobile/mobile_menu.2bpp"
MainMenu:
xor a
ld [wDisableTextAcceleration], a
call Function49ed0
call ClearTilemapEtc
ld b, SCGB_DIPLOMA
call GetSGBLayout
call SetPalettes
@@ -310,7 +310,7 @@ MainMenu_PrintCurrentTimeAndDay:
.Day:
db "DAY@"
Function49ed0:
ClearTilemapEtc:
xor a
ldh [hMapAnims], a
call ClearTilemap

View File

@@ -15,7 +15,7 @@ _ReplaceKrisSprite::
call GetUsedSprite
ret
Function14146: ; mobile
_RefreshSprites: ; mobile
ld hl, wSpriteFlags
ld a, [hl]
push af
@@ -26,7 +26,7 @@ Function14146: ; mobile
ld [wSpriteFlags], a
ret
Function14157: ; mobile
_ClearSprites: ; mobile
ld hl, wSpriteFlags
ld a, [hl]
push af

View File

@@ -2817,9 +2817,9 @@ Script_checksave:
ret
; unused
ld a, [.byte]
ld a, [.gs_version]
ld [wScriptVar], a
ret
.byte
db 0
.gs_version
db GS_VERSION

View File

@@ -448,7 +448,7 @@ CheckCancelPrint:
.pressed_b
ld a, [wca80]
cp $c
cp $0c
jr nz, .cancel
.loop
ld a, [wPrinterOpcode]

View File

@@ -90,7 +90,7 @@ SaveRTC:
StartClock::
call GetClock
call Function1409b
call _FixDays
call FixDays
jr nc, .skip_set
; bit 5: Day count exceeds 139
@@ -101,7 +101,7 @@ StartClock::
call StartRTC
ret
Function1409b:
_FixDays:
ld hl, hRTCDayHi
bit 7, [hl]
jr nz, .set_bit_7
@@ -116,7 +116,7 @@ Function1409b:
call RecordRTCStatus ; set bit 7 on sRTCStatusFlags
ret
Function140ae:
ClockContinue:
call CheckRTCStatus
ld c, a
and %11000000 ; Day count exceeded 255 or 16383

View File

@@ -593,7 +593,7 @@ InitialClearDSTFlag:
text_far _TimeAskOkayText
text_end
DebugDisplayTime:
Unreferenced_MrChrono:
hlcoord 1, 14
lb bc, 3, SCREEN_WIDTH - 2
call ClearBox