Resolve some "???" comments

This commit is contained in:
Rangi 2020-11-17 11:09:02 -05:00
parent cd3fb2ca72
commit 9b3c45b14d
15 changed files with 33 additions and 25 deletions

View File

@ -13,9 +13,11 @@ FEMALE EQU 1
const CHECK_FLAG const CHECK_FLAG
; G/S version ID: 0 = Gold, 1 = Silver (used by checkver) ; G/S version ID: 0 = Gold, 1 = Silver (used by checkver)
; Mystery Gift uses incremented values 1 and 2
GS_VERSION EQU 0 GS_VERSION EQU 0
; Pokémon Pikachu 2, a step counter / virtual pet device (used by Mystery Gift) ; Pokémon Pikachu 2, a step counter / virtual pet device (used by Mystery Gift)
POKEMON_PIKACHU_2_VERSION EQU 3 POKEMON_PIKACHU_2_VERSION EQU 3
RESERVED_GAME_VERSION EQU 4
; save file corruption check values ; save file corruption check values
SAVE_CHECK_VALUE_1 EQU 99 SAVE_CHECK_VALUE_1 EQU 99

View File

@ -33,5 +33,5 @@ FemalePlayerNameArray:
db "AMANDA@" db "AMANDA@"
db "JUANA@" db "JUANA@"
db "JODI@" db "JODI@"
db 2 ; displacement db 2 ; title indent
db " NAME @" ; title db " NAME @" ; title

View File

@ -81,4 +81,4 @@ PredefPointers::
add_predef AnimateFrontpic add_predef AnimateFrontpic
add_predef Unused_HOF_AnimateAlignedFrontpic add_predef Unused_HOF_AnimateAlignedFrontpic
add_predef HOF_AnimateFrontpic add_predef HOF_AnimateFrontpic
dbw -1, InexplicablyEmptyFunction ; ??? dbw -1, DummyEndPredef ; pointless

View File

@ -2366,18 +2366,20 @@ WinTrainerBattle:
call BattleWinSlideInEnemyTrainerFrontpic call BattleWinSlideInEnemyTrainerFrontpic
ld c, 40 ld c, 40
call DelayFrames call DelayFrames
ld a, [wBattleType] ld a, [wBattleType]
cp BATTLETYPE_CANLOSE cp BATTLETYPE_CANLOSE
jr nz, .skip_heal jr nz, .skip_heal
predef HealParty predef HealParty
.skip_heal .skip_heal
ld a, [wDebugFlags] ld a, [wDebugFlags]
bit DEBUG_BATTLE_F, a bit DEBUG_BATTLE_F, a
jr nz, .skip_win_loss_text jr nz, .skip_win_loss_text
call PrintWinLossText call PrintWinLossText
.skip_win_loss_text .skip_win_loss_text
jp .GiveMoney
jp .give_money
.mobile .mobile
call BattleWinSlideInEnemyTrainerFrontpic call BattleWinSlideInEnemyTrainerFrontpic
@ -2405,7 +2407,7 @@ WinTrainerBattle:
call ClearBGPalettes call ClearBGPalettes
ret ret
.GiveMoney: .give_money
ld a, [wAmuletCoin] ld a, [wAmuletCoin]
and a and a
call nz, .DoubleReward call nz, .DoubleReward
@ -2678,7 +2680,8 @@ UpdateFaintedPlayerMon:
ld a, [wWhichMonFaintedFirst] ld a, [wWhichMonFaintedFirst]
and a and a
ret z ret z
ret ; ?????????? ; code was probably dummied out here
ret
AskUseNextPokemon: AskUseNextPokemon:
call EmptyBattleTextbox call EmptyBattleTextbox
@ -3160,7 +3163,8 @@ EnemySwitch_SetMode:
jp ShowSetEnemyMonAndSendOutAnimation jp ShowSetEnemyMonAndSendOutAnimation
CheckWhetherSwitchmonIsPredetermined: CheckWhetherSwitchmonIsPredetermined:
; returns carry if: ??? ; returns the enemy switchmon index in b, or
; returns carry if the index is not yet determined.
ld a, [wLinkMode] ld a, [wLinkMode]
and a and a
jr z, .not_linked jr z, .not_linked
@ -3182,7 +3186,7 @@ CheckWhetherSwitchmonIsPredetermined:
.check_wBattleHasJustStarted .check_wBattleHasJustStarted
ld a, [wBattleHasJustStarted] ld a, [wBattleHasJustStarted]
and a and a
ld b, $0 ld b, 0
jr nz, .return_carry jr nz, .return_carry
and a and a

View File

@ -4,7 +4,7 @@ BattleCommand_Spite:
ld a, [wAttackMissed] ld a, [wAttackMissed]
and a and a
jp nz, .failed jp nz, .failed
ld bc, PARTYMON_STRUCT_LENGTH ; ???? ld bc, PARTYMON_STRUCT_LENGTH ; unused
ld hl, wEnemyMonMoves ld hl, wEnemyMonMoves
ldh a, [hBattleTurn] ldh a, [hBattleTurn]
and a and a

View File

@ -124,17 +124,17 @@ BattleAnimFunction_ThrowFromUserToTarget:
ld hl, BATTLEANIMSTRUCT_YCOORD ld hl, BATTLEANIMSTRUCT_YCOORD
add hl, bc add hl, bc
dec [hl] dec [hl]
; Decrease ??? and hold onto its previous value (argument of the sine function) ; Decrease var1 and hold onto its previous value (argument of the sine function)
ld hl, BATTLEANIMSTRUCT_VAR1 ld hl, BATTLEANIMSTRUCT_VAR1
add hl, bc add hl, bc
ld a, [hl] ld a, [hl]
dec [hl] dec [hl]
; Get ???, which is the amplitude of the sine function ; Get param (amplitude of the sine function)
ld hl, BATTLEANIMSTRUCT_PARAM ld hl, BATTLEANIMSTRUCT_PARAM
add hl, bc add hl, bc
ld d, [hl] ld d, [hl]
call BattleAnim_Sine call BattleAnim_Sine
; Store the result in the Y offset ; Store the sine result in the Y offset
ld hl, BATTLEANIMSTRUCT_YOFFSET ld hl, BATTLEANIMSTRUCT_YOFFSET
add hl, bc add hl, bc
ld [hl], a ld [hl], a

View File

@ -3,7 +3,8 @@ LoadPoisonBGPals:
ldh a, [hCGB] ldh a, [hCGB]
and a and a
ret nz ret nz
ret ; ???? ; code was probably dummied out here
ret
.LoadPals: .LoadPals:
ldh a, [hCGB] ldh a, [hCGB]

View File

@ -88,7 +88,7 @@ DoMysteryGift:
jr z, .skip_append_save jr z, .skip_append_save
call .AddMysteryGiftPartnerID call .AddMysteryGiftPartnerID
ld a, [wMysteryGiftGameVersion] ld a, [wMysteryGiftGameVersion]
cp 4 ; ??? cp RESERVED_GAME_VERSION
jr z, .skip_append_save jr z, .skip_append_save
call .SaveMysteryGiftTrainerName call .SaveMysteryGiftTrainerName
farcall RestoreMobileEventIndex farcall RestoreMobileEventIndex

View File

@ -900,7 +900,7 @@ CountStep:
; Increase the EXP of (both) DayCare Pokemon by 1. ; Increase the EXP of (both) DayCare Pokemon by 1.
farcall DayCareStep farcall DayCareStep
; Every four steps, deal damage to all Poisoned Pokemon ; Every 4 steps, deal damage to all poisoned Pokemon.
ld hl, wPoisonStepCount ld hl, wPoisonStepCount
ld a, [hl] ld a, [hl]
cp 4 cp 4

View File

@ -1756,7 +1756,8 @@ StepFunction_ScreenShake:
ret ret
StepFunction_16: StepFunction_16:
call Field1c_AnonJumptable ; ???? call Field1c_AnonJumptable
; jumptable was dummied out here
StepFunction_17: StepFunction_17:
call Field1c_AnonJumptable call Field1c_AnonJumptable

View File

@ -513,7 +513,8 @@ Pokedex_InitOptionScreen:
call ClearSprites call ClearSprites
call Pokedex_DrawOptionScreenBG call Pokedex_DrawOptionScreenBG
call Pokedex_InitArrowCursor call Pokedex_InitArrowCursor
ld a, [wCurDexMode] ; Index of the topmost visible item in a scrolling menu ??? ; point cursor to the current dex mode (modes == menu item indexes)
ld a, [wCurDexMode]
ld [wDexArrowCursorPosIndex], a ld [wDexArrowCursorPosIndex], a
call Pokedex_DisplayModeDescription call Pokedex_DisplayModeDescription
call WaitBGMap call WaitBGMap
@ -1171,7 +1172,7 @@ Pokedex_DrawDexEntryScreenBG:
.Height: .Height:
db "HT ?", $5e, "??", $5f, -1 ; HT ?'??" db "HT ?", $5e, "??", $5f, -1 ; HT ?'??"
.Weight: .Weight:
db "WT ???lb", -1 ; WT ???lb db "WT ???lb", -1
.MenuItems: .MenuItems:
db $3b, " PAGE AREA CRY PRNT", -1 db $3b, " PAGE AREA CRY PRNT", -1

View File

@ -85,7 +85,7 @@ Print_InitPrinterHandshake:
Printer_StartTransmittingTilemap: Printer_StartTransmittingTilemap:
call Printer_ResetData call Printer_ResetData
; check ??? ; check remaining tile data
ld hl, wPrinterRowIndex ld hl, wPrinterRowIndex
ld a, [hl] ld a, [hl]
and a and a

View File

@ -2299,10 +2299,8 @@ LoadMapTileset::
pop hl pop hl
ret ret
InexplicablyEmptyFunction:: DummyEndPredef::
; unused ; Unused function at the end of PredefPointers.
; Inexplicably empty.
; Seen in PredefPointers.
rept 16 rept 16
nop nop
endr endr

View File

@ -200,7 +200,7 @@ PlaceVerticalMenuItems::
ld a, [de] ld a, [de]
ld c, a ld c, a
inc de inc de
ld b, $0 ld b, 0
add hl, bc add hl, bc
jp PlaceString jp PlaceString

View File

@ -230,7 +230,8 @@ CheckTrainerFlag:: ; unreferenced
PrintWinLossText:: PrintWinLossText::
ld a, [wBattleType] ld a, [wBattleType]
cp BATTLETYPE_CANLOSE cp BATTLETYPE_CANLOSE
jr .canlose ; ?????????? ; code was probably dummied out here
jr .canlose
; unused ; unused
ld hl, wWinTextPointer ld hl, wWinTextPointer