diff --git a/constants/misc_constants.asm b/constants/misc_constants.asm index 92e66f06b..7ed9587b4 100644 --- a/constants/misc_constants.asm +++ b/constants/misc_constants.asm @@ -13,9 +13,11 @@ FEMALE EQU 1 const CHECK_FLAG ; G/S version ID: 0 = Gold, 1 = Silver (used by checkver) +; Mystery Gift uses incremented values 1 and 2 GS_VERSION EQU 0 ; Pokémon Pikachu 2, a step counter / virtual pet device (used by Mystery Gift) POKEMON_PIKACHU_2_VERSION EQU 3 +RESERVED_GAME_VERSION EQU 4 ; save file corruption check values SAVE_CHECK_VALUE_1 EQU 99 diff --git a/data/player_names.asm b/data/player_names.asm index d537af5dc..8d1b6ef51 100644 --- a/data/player_names.asm +++ b/data/player_names.asm @@ -33,5 +33,5 @@ FemalePlayerNameArray: db "AMANDA@" db "JUANA@" db "JODI@" - db 2 ; displacement + db 2 ; title indent db " NAME @" ; title diff --git a/data/predef_pointers.asm b/data/predef_pointers.asm index b7b034c91..d96e01927 100644 --- a/data/predef_pointers.asm +++ b/data/predef_pointers.asm @@ -81,4 +81,4 @@ PredefPointers:: add_predef AnimateFrontpic add_predef Unused_HOF_AnimateAlignedFrontpic add_predef HOF_AnimateFrontpic - dbw -1, InexplicablyEmptyFunction ; ??? + dbw -1, DummyEndPredef ; pointless diff --git a/engine/battle/core.asm b/engine/battle/core.asm index fc3114a5d..5bd9fe8cc 100644 --- a/engine/battle/core.asm +++ b/engine/battle/core.asm @@ -2366,18 +2366,20 @@ WinTrainerBattle: call BattleWinSlideInEnemyTrainerFrontpic ld c, 40 call DelayFrames + ld a, [wBattleType] cp BATTLETYPE_CANLOSE jr nz, .skip_heal predef HealParty .skip_heal + ld a, [wDebugFlags] bit DEBUG_BATTLE_F, a jr nz, .skip_win_loss_text call PrintWinLossText - .skip_win_loss_text - jp .GiveMoney + + jp .give_money .mobile call BattleWinSlideInEnemyTrainerFrontpic @@ -2405,7 +2407,7 @@ WinTrainerBattle: call ClearBGPalettes ret -.GiveMoney: +.give_money ld a, [wAmuletCoin] and a call nz, .DoubleReward @@ -2678,7 +2680,8 @@ UpdateFaintedPlayerMon: ld a, [wWhichMonFaintedFirst] and a ret z - ret ; ?????????? + ; code was probably dummied out here + ret AskUseNextPokemon: call EmptyBattleTextbox @@ -3160,7 +3163,8 @@ EnemySwitch_SetMode: jp ShowSetEnemyMonAndSendOutAnimation CheckWhetherSwitchmonIsPredetermined: -; returns carry if: ??? +; returns the enemy switchmon index in b, or +; returns carry if the index is not yet determined. ld a, [wLinkMode] and a jr z, .not_linked @@ -3182,7 +3186,7 @@ CheckWhetherSwitchmonIsPredetermined: .check_wBattleHasJustStarted ld a, [wBattleHasJustStarted] and a - ld b, $0 + ld b, 0 jr nz, .return_carry and a diff --git a/engine/battle/move_effects/spite.asm b/engine/battle/move_effects/spite.asm index 06627268b..3e1c2f9bd 100644 --- a/engine/battle/move_effects/spite.asm +++ b/engine/battle/move_effects/spite.asm @@ -4,7 +4,7 @@ BattleCommand_Spite: ld a, [wAttackMissed] and a jp nz, .failed - ld bc, PARTYMON_STRUCT_LENGTH ; ???? + ld bc, PARTYMON_STRUCT_LENGTH ; unused ld hl, wEnemyMonMoves ldh a, [hBattleTurn] and a diff --git a/engine/battle_anims/functions.asm b/engine/battle_anims/functions.asm index af24bf6c0..349226bf6 100644 --- a/engine/battle_anims/functions.asm +++ b/engine/battle_anims/functions.asm @@ -124,17 +124,17 @@ BattleAnimFunction_ThrowFromUserToTarget: ld hl, BATTLEANIMSTRUCT_YCOORD add hl, bc 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 add hl, bc ld a, [hl] dec [hl] - ; Get ???, which is the amplitude of the sine function + ; Get param (amplitude of the sine function) ld hl, BATTLEANIMSTRUCT_PARAM add hl, bc ld d, [hl] call BattleAnim_Sine - ; Store the result in the Y offset + ; Store the sine result in the Y offset ld hl, BATTLEANIMSTRUCT_YOFFSET add hl, bc ld [hl], a diff --git a/engine/events/poisonstep_pals.asm b/engine/events/poisonstep_pals.asm index 07bd246a1..5154cf29b 100644 --- a/engine/events/poisonstep_pals.asm +++ b/engine/events/poisonstep_pals.asm @@ -3,7 +3,8 @@ LoadPoisonBGPals: ldh a, [hCGB] and a ret nz - ret ; ???? + ; code was probably dummied out here + ret .LoadPals: ldh a, [hCGB] diff --git a/engine/link/mystery_gift.asm b/engine/link/mystery_gift.asm index 8b4240c0c..00f48e094 100644 --- a/engine/link/mystery_gift.asm +++ b/engine/link/mystery_gift.asm @@ -88,7 +88,7 @@ DoMysteryGift: jr z, .skip_append_save call .AddMysteryGiftPartnerID ld a, [wMysteryGiftGameVersion] - cp 4 ; ??? + cp RESERVED_GAME_VERSION jr z, .skip_append_save call .SaveMysteryGiftTrainerName farcall RestoreMobileEventIndex diff --git a/engine/overworld/events.asm b/engine/overworld/events.asm index 822b9ebf9..2418ca900 100644 --- a/engine/overworld/events.asm +++ b/engine/overworld/events.asm @@ -900,7 +900,7 @@ CountStep: ; Increase the EXP of (both) DayCare Pokemon by 1. farcall DayCareStep - ; Every four steps, deal damage to all Poisoned Pokemon + ; Every 4 steps, deal damage to all poisoned Pokemon. ld hl, wPoisonStepCount ld a, [hl] cp 4 diff --git a/engine/overworld/map_objects.asm b/engine/overworld/map_objects.asm index f6157ce83..c49e1dafa 100644 --- a/engine/overworld/map_objects.asm +++ b/engine/overworld/map_objects.asm @@ -1756,7 +1756,8 @@ StepFunction_ScreenShake: ret StepFunction_16: - call Field1c_AnonJumptable ; ???? + call Field1c_AnonJumptable + ; jumptable was dummied out here StepFunction_17: call Field1c_AnonJumptable diff --git a/engine/pokedex/pokedex.asm b/engine/pokedex/pokedex.asm index 341730829..37c3f0a3c 100644 --- a/engine/pokedex/pokedex.asm +++ b/engine/pokedex/pokedex.asm @@ -513,7 +513,8 @@ Pokedex_InitOptionScreen: call ClearSprites call Pokedex_DrawOptionScreenBG 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 call Pokedex_DisplayModeDescription call WaitBGMap @@ -1171,7 +1172,7 @@ Pokedex_DrawDexEntryScreenBG: .Height: db "HT ?", $5e, "??", $5f, -1 ; HT ?'??" .Weight: - db "WT ???lb", -1 ; WT ???lb + db "WT ???lb", -1 .MenuItems: db $3b, " PAGE AREA CRY PRNT", -1 diff --git a/engine/printer/printer_serial.asm b/engine/printer/printer_serial.asm index f717ad381..f3c0709b9 100644 --- a/engine/printer/printer_serial.asm +++ b/engine/printer/printer_serial.asm @@ -85,7 +85,7 @@ Print_InitPrinterHandshake: Printer_StartTransmittingTilemap: call Printer_ResetData - ; check ??? + ; check remaining tile data ld hl, wPrinterRowIndex ld a, [hl] and a diff --git a/home/map.asm b/home/map.asm index b315928b8..cd90c7e6c 100644 --- a/home/map.asm +++ b/home/map.asm @@ -2299,10 +2299,8 @@ LoadMapTileset:: pop hl ret -InexplicablyEmptyFunction:: -; unused -; Inexplicably empty. -; Seen in PredefPointers. +DummyEndPredef:: +; Unused function at the end of PredefPointers. rept 16 nop endr diff --git a/home/menu.asm b/home/menu.asm index e664550aa..29466e41c 100644 --- a/home/menu.asm +++ b/home/menu.asm @@ -200,7 +200,7 @@ PlaceVerticalMenuItems:: ld a, [de] ld c, a inc de - ld b, $0 + ld b, 0 add hl, bc jp PlaceString diff --git a/home/trainers.asm b/home/trainers.asm index eac8101e8..87f82cf0a 100644 --- a/home/trainers.asm +++ b/home/trainers.asm @@ -230,7 +230,8 @@ CheckTrainerFlag:: ; unreferenced PrintWinLossText:: ld a, [wBattleType] cp BATTLETYPE_CANLOSE - jr .canlose ; ?????????? + ; code was probably dummied out here + jr .canlose ; unused ld hl, wWinTextPointer