diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-06-21 16:27:29 -0400 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-06-21 16:27:29 -0400 |
| commit | 9dee89fae39ce638beed51edbc3f837a6222bd68 (patch) | |
| tree | 09f8c7436d45f265e8429c382368c552cf050db3 | |
| parent | e0df1a6041b73e8304e8c5a691b454652f5a667d (diff) | |
Replace "Unreferenced" labels with "; unreferenced" comments
68 files changed, 138 insertions, 177 deletions
diff --git a/data/pokemon/unused_pic_banks.asm b/data/pokemon/unused_pic_banks.asm index 2ede9c3f..6532c722 100644 --- a/data/pokemon/unused_pic_banks.asm +++ b/data/pokemon/unused_pic_banks.asm @@ -1,7 +1,7 @@ ; This was a table of Pokémon sprite banks in the 1997 G/S prototype. ; See pokegold-spaceworld's gfx/pokemon/pkmn_pic_banks.asm. -Unreferenced_MonPicBanks: +BetaMonPicBanks: ; unreferenced ; last mon in bank, bank # db RAICHU, $15 + 0 db DUGTRIO, $15 + 1 diff --git a/engine/battle/battle_transition.asm b/engine/battle/battle_transition.asm index 3686a459..e09d617f 100644 --- a/engine/battle/battle_transition.asm +++ b/engine/battle/battle_transition.asm @@ -737,7 +737,7 @@ ENDM jr nz, .row ret -Unreferenced_Function8ca53: +Function8ca53: ; unreferenced ld a, 1 ldh [hBGMapMode], a call WaitBGMap diff --git a/engine/battle/core.asm b/engine/battle/core.asm index 87809901..5e9c802b 100644 --- a/engine/battle/core.asm +++ b/engine/battle/core.asm @@ -1846,7 +1846,7 @@ GetMaxHP: ld c, a ret -Unreferenced_GetHalfHP: +GetHalfHP: ; unreferenced ld hl, wBattleMonHP ldh a, [hBattleTurn] and a @@ -6232,7 +6232,7 @@ CheckUnownLetter: INCLUDE "data/wild/unlocked_unowns.asm" -Unreferenced_SwapBattlerLevels: +SwapBattlerLevels: ; unreferenced push bc ld a, [wBattleMonLevel] ld b, a @@ -6592,7 +6592,7 @@ _LoadHPBar: callfar LoadHPBar ret -Unreferenced_LoadHPExpBarGFX: +LoadHPExpBarGFX: ; unreferenced ld de, EnemyHPBarBorderGFX ld hl, vTiles2 tile $6c lb bc, BANK(EnemyHPBarBorderGFX), 4 @@ -7477,7 +7477,7 @@ ComeBackText: text_far _ComeBackText text_end -Unreferenced_HandleSafariAngerEatingStatus: +HandleSafariAngerEatingStatus: ; unreferenced ld hl, wSafariMonEating ld a, [hl] and a @@ -7875,7 +7875,7 @@ InitEnemyWildmon: predef PlaceGraphic ret -Unreferenced_Function3f41a: +Function3f41a: ; unreferenced ld hl, wEnemyMonMoves ld de, wListMoves_MoveIndicesBuffer ld b, NUM_MOVES diff --git a/engine/battle/unreferenced_getgen1trainerclassname.asm b/engine/battle/getgen1trainerclassname.asm index 04532523..78b543f1 100644 --- a/engine/battle/unreferenced_getgen1trainerclassname.asm +++ b/engine/battle/getgen1trainerclassname.asm @@ -1,4 +1,4 @@ -Unreferenced_GetGen1TrainerClassName: +GetGen1TrainerClassName: ; unreferenced ld hl, Gen1TrainerClassNames ld a, [wTrainerClass] dec a diff --git a/engine/battle_anims/anim_commands.asm b/engine/battle_anims/anim_commands.asm index 5061197c..3b67de12 100644 --- a/engine/battle_anims/anim_commands.asm +++ b/engine/battle_anims/anim_commands.asm @@ -189,7 +189,7 @@ ClearActorHud: call ClearBox ret -Unreferenced_Functioncc1ff: +Functioncc1ff: ; unreferenced xor a ldh [hBGMapMode], a ld a, LOW(vBGMap0 tile $28) diff --git a/engine/events/halloffame.asm b/engine/events/halloffame.asm index 2a10d736..acc73d48 100644 --- a/engine/events/halloffame.asm +++ b/engine/events/halloffame.asm @@ -392,7 +392,7 @@ _HallOfFamePC: .EmptyString: db "@" -.UnreferencedEmptyString: +.EmptyString2: ; unreferenced db "@" .HOFMaster: diff --git a/engine/events/npc_trade.asm b/engine/events/npc_trade.asm index 44466c82..f410c28d 100644 --- a/engine/events/npc_trade.asm +++ b/engine/events/npc_trade.asm @@ -283,14 +283,14 @@ CopyTradeName: call CopyBytes ret -Unreferenced_Functionfcbc7: +Functionfcbc7: ; unreferenced ld bc, 4 call CopyBytes ld a, "@" ld [de], a ret -Unreferenced_Functionfcbd1: +Functionfcbd1: ; unreferenced ld bc, 3 call CopyBytes ld a, "@" diff --git a/engine/events/overworld.asm b/engine/events/overworld.asm index 466c0109..15c00bb6 100644 --- a/engine/events/overworld.asm +++ b/engine/events/overworld.asm @@ -948,7 +948,7 @@ StrengthFunction: jr c, .Failed jr .UseStrength -.Unreferenced_AlreadyUsing: +.AlreadyUsingStrength: ; unreferenced ld hl, .AlreadyUsingStrengthText call MenuTextboxBackup ld a, $80 diff --git a/engine/games/slot_machine.asm b/engine/games/slot_machine.asm index 94ba474f..b4935b2e 100644 --- a/engine/games/slot_machine.asm +++ b/engine/games/slot_machine.asm @@ -229,7 +229,7 @@ SlotsLoop: call PrintNum ret -Unreferenced_Function92d7a: +Function92d7a: ; unreferenced ; debug function? ld a, [wSlotBias] add 0 @@ -247,7 +247,7 @@ Unreferenced_Function92d7a: ld [hl], a ret -Unreferenced_Function92d95: +Function92d95: ; unreferenced ; animate OAM tiles? ld hl, wce66 ld a, [hl] @@ -844,7 +844,7 @@ Slots_UpdateReelPositionAndOAM: jr nz, .loop ret -Unreferenced_Function93127: +Function93127: ; unreferenced push hl srl a srl a diff --git a/engine/gfx/color.asm b/engine/gfx/color.asm index 01e5acb7..04f1aa71 100644 --- a/engine/gfx/color.asm +++ b/engine/gfx/color.asm @@ -102,7 +102,7 @@ SGB_ApplyCreditsPals:: InitPartyMenuPalettes: call CheckCGB jr nz, .cgb - ld hl, BlkPacket_9fa5 + ld hl, BlkPacket_PartyMenu ld de, wSGBPals + 1 ld bc, 6 palettes jp CopyBytes @@ -181,7 +181,7 @@ Function9136: ld hl, BlkPacket_9ee5 jp PushSGBPals -Unreferenced_Function9144: +Function9144: ; unreferenced call CheckCGB jr nz, .cgb ldh a, [hSGB] @@ -196,7 +196,7 @@ Unreferenced_Function9144: call GetPredefPal jp LoadHLPaletteIntoDE -Unreferenced_Function915e: +Function915e: ; unreferenced call CheckCGB jr nz, .cgb ldh a, [hSGB] @@ -243,7 +243,7 @@ Intro_LoadMonPalette: call LoadPalette_White_Col1_Col2_Black ret -Unreferenced_Function91b4: +Function91b4: ; unreferenced ldh a, [hCGB] and a jr nz, .cgb @@ -646,7 +646,7 @@ GetMonPalettePointer: call _GetMonPalettePointer ret -Unreferenced_Function9be8: +Function9be8: ; unreferenced ret call CheckCGB ret z @@ -668,7 +668,7 @@ Unreferenced_Function9be8: BattleObjectPals: INCLUDE "gfx/battle_anims/battle_anims.pal" -Unreferenced_Function9c39: +Function9c39: ; unreferenced call CheckCGB ret z ld a, $90 @@ -869,7 +869,7 @@ _InitSGBBorderPals: dw DataSndPacket7 dw DataSndPacket8 -Unreferenced_Function9d70: +Function9d70: ; unreferenced di xor a ldh [rJOYP], a diff --git a/engine/gfx/sprites.asm b/engine/gfx/sprites.asm index adec8755..13ea14d0 100644 --- a/engine/gfx/sprites.asm +++ b/engine/gfx/sprites.asm @@ -495,7 +495,7 @@ GetFrameOAMPointer: add hl, de ret -Unreferenced_BrokenGetStdGraphics: +BrokenGetStdGraphics: ; unreferenced push hl ld l, a ld h, 0 diff --git a/engine/items/mart.asm b/engine/items/mart.asm index 3978ef33..edf8f5b5 100644 --- a/engine/items/mart.asm +++ b/engine/items/mart.asm @@ -668,7 +668,7 @@ SellMenu: and a ret -.Unreferenced_NothingToSell: +.NothingToSell: ; unreferenced ld hl, .NothingToSellText call MenuTextboxBackup and a diff --git a/engine/items/pack.asm b/engine/items/pack.asm index e7caceca..0f36222b 100644 --- a/engine/items/pack.asm +++ b/engine/items/pack.asm @@ -499,7 +499,7 @@ TossMenu: .finish ret -Unreferenced_ResetPocketCursorPositions: +ResetPocketCursorPositions: ; unreferenced ld a, [wCurPocket] and a ; ITEM_POCKET jr z, .items @@ -1423,7 +1423,7 @@ Pack_GetItemName: call CopyName1 ret -Unreferenced_Pack_ClearTilemap: +Pack_ClearTilemap: ; unreferenced hlcoord 0, 0 ld bc, SCREEN_WIDTH * SCREEN_HEIGHT ld a, " " diff --git a/engine/items/tmhm.asm b/engine/items/tmhm.asm index 1d71f695..4fe6876d 100644 --- a/engine/items/tmhm.asm +++ b/engine/items/tmhm.asm @@ -435,7 +435,7 @@ TMHMPocket_GetCurrentLineCoord: jr nz, .loop ret -Unreferenced_Function2c89a: +Function2c89a: ; unreferenced pop hl ld bc, 3 add hl, bc @@ -483,7 +483,7 @@ TMHM_PlaySFX_ReadText2: pop de ret -Unreferenced_Function2c8e4: +Function2c8e4: ; unreferenced call ConvertCurItemIntoCurTMHM call .CheckHaveRoomForTMHM ld hl, .NoRoomTMHMText diff --git a/engine/link/link.asm b/engine/link/link.asm index 3b225347..6293c14f 100644 --- a/engine/link/link.asm +++ b/engine/link/link.asm @@ -2333,7 +2333,7 @@ CableClubCheckWhichChris: LinkCommsBorderGFX: INCBIN "gfx/trade/border_tiles.2bpp" -Unreferenced_Function29deb: +Function29deb: ; unreferenced ld a, BANK(sPartyMail) call OpenSRAM ld d, FALSE diff --git a/engine/menus/intro_menu.asm b/engine/menus/intro_menu.asm index d144d0fe..8b12b991 100644 --- a/engine/menus/intro_menu.asm +++ b/engine/menus/intro_menu.asm @@ -931,7 +931,7 @@ TitleScreenScene: dw TitleScreenMain dw TitleScreenEnd -.Unreferenced_NextScene: +TitleScreenNextScene: ; unreferenced ld hl, wJumptableIndex inc [hl] ret diff --git a/engine/menus/menu_2.asm b/engine/menus/menu_2.asm index 745a666c..77eb3398 100644 --- a/engine/menus/menu_2.asm +++ b/engine/menus/menu_2.asm @@ -111,7 +111,7 @@ ShowMoney_TerminatorString: db "@" db "@" ; unused -Unreferenced_StartMenu_PrintSafariGameStatus: +StartMenu_PrintSafariGameStatus: ; unreferenced ld hl, wOptions ld a, [hl] push af diff --git a/engine/menus/naming_screen.asm b/engine/menus/naming_screen.asm index 0e064362..8153d296 100644 --- a/engine/menus/naming_screen.asm +++ b/engine/menus/naming_screen.asm @@ -960,7 +960,7 @@ INCBIN "gfx/icons/mail_big.2bpp" ld [wNamingScreenMaxNameLength], a ret -.Unreferenced_PleaseWriteAMailString: +.PleaseWriteAMailString: ; unreferenced db "メールを かいてね@" .InitCharset: diff --git a/engine/menus/scrolling_menu.asm b/engine/menus/scrolling_menu.asm index 0574bc73..d23b4d1e 100644 --- a/engine/menus/scrolling_menu.asm +++ b/engine/menus/scrolling_menu.asm @@ -78,7 +78,7 @@ ScrollingMenuJoyAction: jp nz, .d_down jr .loop -.unreferenced ; unused +.no_zero_no_carry ; unreferenced ld a, -1 and a ret diff --git a/engine/menus/trainer_card.asm b/engine/menus/trainer_card.asm index 9c0beb14..6f2ef316 100644 --- a/engine/menus/trainer_card.asm +++ b/engine/menus/trainer_card.asm @@ -126,7 +126,7 @@ TrainerCard_Page1_Joypad: ld [wJumptableIndex], a ret -.Unreferenced_KantoCheck: +.KantoBadgeCheck: ; unreferenced ld a, [wKantoBadges] and a ret z @@ -169,7 +169,7 @@ TrainerCard_Page2_Joypad: ld [wJumptableIndex], a ret -.Unreferenced_KantoCheck: +.KantoBadgeCheck: ; unreferenced ld a, [wKantoBadges] and a ret z diff --git a/engine/movie/intro.asm b/engine/movie/intro.asm index 5e6af7a8..c9f9ac11 100644 --- a/engine/movie/intro.asm +++ b/engine/movie/intro.asm @@ -134,7 +134,7 @@ GameFreakPresents_NextScene: inc [hl] ret -Unreferenced_Functione4a8d: +Functione4a8d: ; unreferenced ld c, 64 call DelayFrames call GameFreakPresents_NextScene @@ -1482,7 +1482,7 @@ Functione5473: inc [hl] ret -Unreferenced_Functione548c: +Functione548c: ; unreferenced ld bc, vTiles1 - vTiles0 .loop ld a, [de] diff --git a/engine/movie/trade_animation.asm b/engine/movie/trade_animation.asm index 410c3c7c..94736037 100644 --- a/engine/movie/trade_animation.asm +++ b/engine/movie/trade_animation.asm @@ -1323,9 +1323,8 @@ TradeAnim_WaitAnim: call TradeAnim_AdvanceScriptPointer ret -Unreferenced_DebugTrade: -; This function is not referenced. -; It was meant for use in Japanese versions, so the +DebugTrade: ; unreferenced +; This function was meant for use in Japanese versions, so the ; constant used for copy length was changed by accident. ld hl, .DebugTradeData diff --git a/engine/overworld/cmd_queue.asm b/engine/overworld/cmd_queue.asm index 29919ee7..5e29689a 100644 --- a/engine/overworld/cmd_queue.asm +++ b/engine/overworld/cmd_queue.asm @@ -33,7 +33,7 @@ HandleCmdQueue:: jr nz, .loop ret -Unreferenced_GetNthCmdQueueEntry: +GetNthCmdQueueEntry: ; unreferenced ld hl, wCmdQueue ld bc, CMDQUEUE_ENTRY_SIZE call AddNTimes diff --git a/engine/overworld/events.asm b/engine/overworld/events.asm index ea69bc3e..c55e58de 100644 --- a/engine/overworld/events.asm +++ b/engine/overworld/events.asm @@ -916,8 +916,7 @@ CountStep: scf ret -; unused -.unreferenced +.whiteout ; unreferenced ld a, PLAYEREVENT_WHITEOUT scf ret diff --git a/engine/overworld/load_map_part.asm b/engine/overworld/load_map_part.asm index 2150df1c..32dc1226 100644 --- a/engine/overworld/load_map_part.asm +++ b/engine/overworld/load_map_part.asm @@ -35,7 +35,7 @@ _LoadMapPart:: jr nz, .loop ret -Unreferenced_Function153ba: +Function153ba: ; unreferenced decoord 2, 2 ld bc, (SURROUNDING_WIDTH + 1) * 2 add hl, bc @@ -66,7 +66,7 @@ Unreferenced_Function153ba: jr nz, .loop ret -Unreferenced_Function153dd: +Function153dd: ; unreferenced decoord 4, 4 ld bc, (SURROUNDING_WIDTH + 1) * 4 add hl, bc @@ -128,7 +128,7 @@ Ureferenced_Function15400: jr nz, .loop ret -Unreferenced_Function15423: +Function15423: ; unreferenced decoord 8, 8 ld bc, (SURROUNDING_WIDTH + 1) * 8 add hl, bc diff --git a/engine/overworld/map_objects.asm b/engine/overworld/map_objects.asm index 25245576..d163c1d1 100644 --- a/engine/overworld/map_objects.asm +++ b/engine/overworld/map_objects.asm @@ -402,7 +402,7 @@ UpdatePlayerStep: set PLAYERSTEP_CONTINUE_F, [hl] ret -Unreferenced_Function4732: +Function4732: ; unreferenced push bc ld e, a ld d, 0 diff --git a/engine/overworld/map_setup.asm b/engine/overworld/map_setup.asm index 1b0a6c08..210a7b0f 100644 --- a/engine/overworld/map_setup.asm +++ b/engine/overworld/map_setup.asm @@ -111,13 +111,13 @@ EnableTextAcceleration: ld [wDisableTextAcceleration], a ret -Unreferenced_ActivateMapAnims: - ld a, $1 +DuplicateActivateMapAnims: ; unreferenced + ld a, TRUE ldh [hMapAnims], a ret -Unreferenced_SuspendMapAnims: - xor a +DuplicateSuspendMapAnims: ; unreferenced + xor a ; FALSE ldh [hMapAnims], a ret @@ -221,12 +221,12 @@ FadeOutMapMusic: ret ActivateMapAnims: - ld a, $1 + ld a, TRUE ldh [hMapAnims], a ret SuspendMapAnims: - xor a + xor a ; FALSE ldh [hMapAnims], a ret diff --git a/engine/overworld/npc_movement.asm b/engine/overworld/npc_movement.asm index 01d49d21..cc9cf0b8 100644 --- a/engine/overworld/npc_movement.asm +++ b/engine/overworld/npc_movement.asm @@ -274,7 +274,7 @@ WillObjectBumpIntoSomeoneElse: ld e, [hl] jr IsNPCAtCoord -Unreferenced_Function70f4: +Function70f4: ; unreferenced ldh a, [hMapObjectIndexBuffer] call GetObjectStruct call .CheckWillBeFacingNPC @@ -473,7 +473,7 @@ IsObjectMovingOffEdgeOfScreen: scf ret -Unreferenced_Function71f2: +Function71f2: ; unreferenced ld a, [wPlayerStandingMapX] ld d, a ld a, [wPlayerStandingMapY] diff --git a/engine/overworld/overworld.asm b/engine/overworld/overworld.asm index 1a5d96db..d20c719b 100644 --- a/engine/overworld/overworld.asm +++ b/engine/overworld/overworld.asm @@ -436,16 +436,16 @@ endr .done: ret -Unreferenced_Function1438a: +Function1438a: ; unreferenced ld a, c jr GetUsedSprite -Unreferenced_Function1438d: +Function1438d: ; unreferenced ld a, c ld b, 0 jr GetUsedSprite -Unreferenced_Function14392: +Function14392: ; unreferenced ld a, c ld b, SPRITE_GFX_LIST_CAPACITY jr GetUsedSprite diff --git a/engine/overworld/player_object.asm b/engine/overworld/player_object.asm index 07cbf28b..1ebdbcfa 100644 --- a/engine/overworld/player_object.asm +++ b/engine/overworld/player_object.asm @@ -113,7 +113,7 @@ RefreshPlayerCoords: ret nz ret -Unreferenced_SpawnObject1: +SpawnObject1: ; unreferenced ld a, 1 ld hl, UnusedObject1Template call CopyPlayerObjectTemplate diff --git a/engine/phone/phone.asm b/engine/phone/phone.asm index 7b41f4d3..551f1552 100644 --- a/engine/phone/phone.asm +++ b/engine/phone/phone.asm @@ -148,7 +148,7 @@ CheckPhoneCall:: ; unused ret -UnreferencedInitCallReceiveDelay: +FarInitCallReceiveDelay: ; unreferenced farcall InitCallReceiveDelay ret diff --git a/engine/pokedex/pokedex_2.asm b/engine/pokedex/pokedex_2.asm index a4e579d8..1f78bd4b 100644 --- a/engine/pokedex/pokedex_2.asm +++ b/engine/pokedex/pokedex_2.asm @@ -214,8 +214,7 @@ DisplayDexEntry: call FarString ret -UnreferencedPOKeString: -; unused +POKeString: ; unreferenced db "#@" GetDexEntryPointer: diff --git a/engine/pokegear/pokegear.asm b/engine/pokegear/pokegear.asm index 9150937d..c3afe830 100644 --- a/engine/pokegear/pokegear.asm +++ b/engine/pokegear/pokegear.asm @@ -1649,7 +1649,7 @@ LoadStation_EvolutionRadio: ld de, UnownStationName ret -Unreferenced_LoadStation: +DummyLoadStation: ; unreferenced ret RadioMusicRestartDE: @@ -2748,7 +2748,7 @@ INCBIN "gfx/pokegear/dexmap_nest_icon.2bpp" FlyMapLabelBorderGFX: INCBIN "gfx/pokegear/flymap_label_border.1bpp" -Unreferenced_Function92264: +Function92264: xor a ld [wTownMapPlayerIconLandmark], a call ClearBGPalettes diff --git a/engine/pokemon/bills_pc.asm b/engine/pokemon/bills_pc.asm index b0d448af..8f341ad3 100644 --- a/engine/pokemon/bills_pc.asm +++ b/engine/pokemon/bills_pc.asm @@ -1521,7 +1521,7 @@ endr dbsprite 19, 4, 0, 7, $07, 0 db -1 -Unreferenced_BillsPC_FillBox: +BillsPC_FillBox: ; unreferenced .row push bc push hl diff --git a/engine/pokemon/bills_pc_top.asm b/engine/pokemon/bills_pc_top.asm index 64b328cb..3428d038 100644 --- a/engine/pokemon/bills_pc_top.asm +++ b/engine/pokemon/bills_pc_top.asm @@ -139,7 +139,7 @@ BillsPC_DepositMenu: and a ret -Unreferenced_Functione4ed: +Functione4ed: ; unreferenced ld a, [wPartyCount] and a jr z, .no_mon @@ -206,7 +206,7 @@ BillsPC_WithdrawMenu: and a ret -Unreferenced_Functione548: +Functione548: ; unreferenced ld a, [wPartyCount] cp PARTY_LENGTH jr nc, .party_full @@ -261,7 +261,7 @@ CopyBoxmonToTempMon: call CloseSRAM ret -Unreferenced_LoadBoxMonListing: +LoadBoxMonListing: ; unreferenced ld a, [wCurBox] cp b jr z, .same_box diff --git a/engine/pokemon/breeding.asm b/engine/pokemon/breeding.asm index ee1afd25..eba42c0c 100644 --- a/engine/pokemon/breeding.asm +++ b/engine/pokemon/breeding.asm @@ -927,7 +927,7 @@ DayCareMonCompatibilityText: text_far _BreedShowsInterestText text_end -Unreferenced_DayCareMonPrintEmptyString: +DayCareMonPrintEmptyString: ; unreferenced ld hl, .string ret diff --git a/engine/pokemon/mail_2.asm b/engine/pokemon/mail_2.asm index f7cfe5c7..0ddf8242 100644 --- a/engine/pokemon/mail_2.asm +++ b/engine/pokemon/mail_2.asm @@ -690,7 +690,7 @@ MailGFX_PlaceMessage: .place_author jp PlaceString -Unreferenced_Functionbb4c5: +Functionbb4c5: ; unreferenced .loop ld a, [hl] xor $ff diff --git a/engine/pokemon/mon_menu.asm b/engine/pokemon/mon_menu.asm index 3bf31474..4510a5a2 100644 --- a/engine/pokemon/mon_menu.asm +++ b/engine/pokemon/mon_menu.asm @@ -625,7 +625,7 @@ MonMenu_Fly: ld a, $0 ret -.Unreferenced: +.NoReload: ; unreferenced ld a, $1 ret diff --git a/engine/pokemon/stats_screen.asm b/engine/pokemon/stats_screen.asm index 457d43fc..d1bc4172 100644 --- a/engine/pokemon/stats_screen.asm +++ b/engine/pokemon/stats_screen.asm @@ -512,7 +512,7 @@ LoadPinkPage: .PkrsStr: db "#RUS@" -Unreferenced_Function50f4d: +Function50f4d: ; unreferenced hlcoord 7, 0 ld bc, SCREEN_WIDTH ld d, SCREEN_HEIGHT diff --git a/engine/printer/printer.asm b/engine/printer/printer.asm index 47da5285..6a43ab49 100644 --- a/engine/printer/printer.asm +++ b/engine/printer/printer.asm @@ -571,7 +571,7 @@ PlacePrinterStatusString: ld [wPrinterStatus], a ret -Unreferenced_Function847b9: +Function847b9: ; unreferenced ld a, [wPrinterStatus] and a ret z diff --git a/engine/rtc/print_hours_mins.asm b/engine/rtc/print_hours_mins.asm index 41ad2009..4efd461a 100644 --- a/engine/rtc/print_hours_mins.asm +++ b/engine/rtc/print_hours_mins.asm @@ -1,4 +1,4 @@ -Unreferenced_Function1c0a0d: +Function1c0a0d: ; unreferenced ld a, b ld b, c ld c, a diff --git a/engine/rtc/restart_clock.asm b/engine/rtc/restart_clock.asm index 5dc98718..15b1fd13 100644 --- a/engine/rtc/restart_clock.asm +++ b/engine/rtc/restart_clock.asm @@ -206,8 +206,7 @@ RestartClock: ld [wBuffer2], a ret -.unreferenced -; unused +.UnusedPlaceCharsFragment: ; unreferenced ld a, [wBuffer3] ld b, a call Coord2Tile @@ -227,10 +226,8 @@ RestartClock: ld [hl], e ret -UnreferencedString_HourJP: -; unused +JPHourString: ; unreferenced db "じ@" ; HR -UnreferencedString_MinuteJP: -; unused +JPMinuteString: ; unreferenced db "ふん@" ; MIN diff --git a/engine/rtc/rtc.asm b/engine/rtc/rtc.asm index e56bed45..dcd8494d 100644 --- a/engine/rtc/rtc.asm +++ b/engine/rtc/rtc.asm @@ -1,4 +1,4 @@ -Unreferenced_StopRTC: +StopRTC: ; unreferenced ld a, SRAM_ENABLE ld [MBC3SRamEnable], a call LatchClock @@ -54,7 +54,7 @@ TimesOfDay: db MAX_HOUR, NITE_F db -1, MORN_F -Unreferenced_1404e: +BetaTimesOfDay: ; unreferenced db 20, NITE_F db 40, MORN_F db 60, DAY_F diff --git a/engine/rtc/timeset.asm b/engine/rtc/timeset.asm index b89d1af7..4cdfc41b 100644 --- a/engine/rtc/timeset.asm +++ b/engine/rtc/timeset.asm @@ -193,7 +193,7 @@ DisplayHourOClock: pop hl ret -UnreferencedFunction907ba: +Function907ba: ; unreferenced ld h, d ld l, e push hl diff --git a/gfx/sgb/blk_packets.asm b/gfx/sgb/blk_packets.asm index 32e64a37..ce28fa29 100644 --- a/gfx/sgb/blk_packets.asm +++ b/gfx/sgb/blk_packets.asm @@ -69,7 +69,7 @@ BlkPacket_SlotMachine: attr_blk_data %011, 0,0,0, 04,04, 15,09 ; slot reels: pal 0 attr_blk_data %011, 0,0,0, 00,12, 19,17 ; text box: pal 0 -BlkPacket_9fa5: +BlkPacket_PartyMenu: attr_blk 7 attr_blk_data %111, 0,0,1, 00,00, 02,12 attr_blk_data %010, 0,0,0, 12,01, 18,02 diff --git a/gfx/sgb/pal_packets.asm b/gfx/sgb/pal_packets.asm index d9be5824..e23505a7 100644 --- a/gfx/sgb/pal_packets.asm +++ b/gfx/sgb/pal_packets.asm @@ -34,7 +34,7 @@ PalPacket_a045: PalPacket_GSIntroShellderLapras: sgb_pal_set GS_INTRO_SHELLDER_LAPRAS, ROUTES, ROUTES, ROUTES -UnreferencedPalPacket_BetaIntroLapras: +PalPacket_BetaIntroLapras: ; unreferenced sgb_pal_set BETA_INTRO_LAPRAS, ROUTES, ROUTES, ROUTES PalPacket_GSIntroJigglypuffPikachu: @@ -61,7 +61,7 @@ PalPacket_BattleGrayscale: PalPacket_Pokegear: sgb_pal_set POKEGEAR, ROUTES, ROUTES, ROUTES -UnreferencedPalPacket_a0f5: +PalPacket_a0f5: ; unreferenced sgb_pal_set PACK, ROUTES, ROUTES, ROUTES PalPacket_SlotMachine: diff --git a/gfx/tileset_palette_maps.asm b/gfx/tileset_palette_maps.asm index 58799237..c0a72820 100644 --- a/gfx/tileset_palette_maps.asm +++ b/gfx/tileset_palette_maps.asm @@ -95,4 +95,7 @@ TilesetForestPalMap: INCLUDE "gfx/tilesets/forest_palette_map.asm" MapGroupPalettes: - ds NUM_MAP_GROUPS, PAL_BG_ROOF +; entries correspond to GROUP_* constants +rept NUM_MAP_GROUPS + db PAL_BG_ROOF +endr diff --git a/home/audio.asm b/home/audio.asm index 9e982331..e4e5df03 100644 --- a/home/audio.asm +++ b/home/audio.asm @@ -440,7 +440,7 @@ GetMapMusic_MaybeSpecial:: call GetMapMusic ret -Unreferenced_Function3f7d:: +Function3f7d:: ; unreferenced ; Places a BCD number at the ; upper center of the screen. ld a, 4 * TILE_WIDTH diff --git a/home/battle.asm b/home/battle.asm index c2c3aeff..c0bcaad3 100644 --- a/home/battle.asm +++ b/home/battle.asm @@ -15,7 +15,7 @@ GetPartyLocation:: ld bc, PARTYMON_STRUCT_LENGTH jp AddNTimes -Unreferenced_GetDexNumber:: +GetDexNumber:: ; unreferenced ; Probably used in gen 1 to convert index number to dex number ; Not required in gen 2 because index number == dex number push hl diff --git a/home/fade.asm b/home/fade.asm index 3364638f..5a02cdde 100644 --- a/home/fade.asm +++ b/home/fade.asm @@ -1,7 +1,6 @@ ; Functions to fade the screen in and out. -Unreferenced_Function360:: -; TimeOfDayFade +TimeOfDayFade:: ; unreferenced ld a, [wTimeOfDayPal] ld b, a ld hl, IncGradGBPalTable_11 diff --git a/home/flag.asm b/home/flag.asm index 125c2a43..76e08e26 100644 --- a/home/flag.asm +++ b/home/flag.asm @@ -102,7 +102,7 @@ CheckReceivedDex:: and a ret -Unreferenced_CheckBPressedDebug:: +CheckBPressedDebug:: ; unreferenced ; Used in debug ROMs to walk through walls and avoid encounters. ld a, [wDebugFlags] @@ -122,7 +122,7 @@ xor_a_dec_a:: dec a ret -Unreferenced_CheckFieldDebug:: +CheckFieldDebug:: ; unreferenced push hl ld hl, wDebugFlags bit DEBUG_FIELD_F, [hl] diff --git a/home/gfx.asm b/home/gfx.asm index 9be62597..dd41ce51 100644 --- a/home/gfx.asm +++ b/home/gfx.asm @@ -260,12 +260,12 @@ Copy1bpp:: pop hl jp FarCopyBytesDouble -Unreferenced_Get2bpp:: +DuplicateGet2bpp:: ; unreferenced ldh a, [rLCDC] add a jp c, Request2bpp -Unreferenced_Copy2bpp:: +DuplicateCopy2bpp: ; unreferenced push de push hl diff --git a/home/map.asm b/home/map.asm index b158f3a5..22ea0b06 100644 --- a/home/map.asm +++ b/home/map.asm @@ -231,8 +231,7 @@ CheckIndoorMap:: cp GATE ret -; unused -UnreferencedCheckEnvironment:: +CheckUnknownMap:: ; unreferenced cp INDOOR ret z cp GATE @@ -1218,7 +1217,7 @@ UpdateBGMapColumn:: ldh [hBGMapTileCount], a ret -Unreferenced_Function2939:: +Function2939:: ; unreferenced ld hl, wBGMapBuffer ld bc, wBGMapBufferEnd - wBGMapBuffer xor a diff --git a/home/map_objects.asm b/home/map_objects.asm index 738da1f6..0b57e211 100644 --- a/home/map_objects.asm +++ b/home/map_objects.asm @@ -362,7 +362,7 @@ CopyPlayerObjectTemplate:: call CopyBytes ret -Unreferenced_Function1855: +Function1855: ; unreferenced call GetMapObject ld hl, MAPOBJECT_OBJECT_STRUCT_ID add hl, bc @@ -574,12 +574,12 @@ _GetMovementByte:: ld a, h ret -UnreferencedSetVramState_Bit0:: +SetVramState_Bit0:: ; unreferenced ld hl, wVramState set 0, [hl] ret -UnreferencedResetVramState_Bit0:: +ResetVramState_Bit0:: ; unreferenced ld hl, wVramState res 0, [hl] ret diff --git a/home/math.asm b/home/math.asm index c99214cc..8e950163 100644 --- a/home/math.asm +++ b/home/math.asm @@ -48,7 +48,7 @@ Divide:: pop hl ret -UnreferencedSubtractAbsolute:: +SubtractAbsolute:: ; unreferenced ; Return |a - b|, sign in carry. sub b ret nc diff --git a/home/menu.asm b/home/menu.asm index 6aef1adf..020b68e1 100644 --- a/home/menu.asm +++ b/home/menu.asm @@ -382,7 +382,7 @@ YesNoBox:: PlaceYesNoBox:: jr _YesNoBox -UnreferencedPlaceGenericTwoOptionBox:: +PlaceGenericTwoOptionBox:: ; unreferenced call LoadMenuHeader jr InterpretTwoOptionMenu @@ -676,7 +676,7 @@ PlaceNthMenuStrings:: call PlaceString ret -Unreferenced_Function1e08:: +Function1e08:: ; unreferenced call GetMenuDataPointerTableEntry inc hl inc hl diff --git a/home/pokemon.asm b/home/pokemon.asm index d035a2e4..29af1cdd 100644 --- a/home/pokemon.asm +++ b/home/pokemon.asm @@ -204,7 +204,7 @@ Print8BitNumLeftAlign:: ld b, PRINTNUM_LEFTALIGN | 1 jp PrintNum -Unreferenced_GetNthMove:: +GetNthMove:: ; unreferenced ld hl, wListMoves_MoveIndicesBuffer ld c, a ld b, 0 diff --git a/home/print_num.asm b/home/print_num.asm index a1dca238..d9cf15f5 100644 --- a/home/print_num.asm +++ b/home/print_num.asm @@ -301,8 +301,8 @@ PrintNum:: inc hl ret -Unreferenced_PrintHexNumber:: -; Print c-digit hex number from de to hl +PrintHexNumber:: ; unreferenced +; Print the c-byte value from de to hl as hexadecimal digits. .loop push bc call .HandleByte diff --git a/home/serial.asm b/home/serial.asm index 78814317..be00058d 100644 --- a/home/serial.asm +++ b/home/serial.asm @@ -380,7 +380,7 @@ LinkDataReceived:: ldh [rSC], a ret -Unreferenced_Function8ca:: +Function8ca:: ; unreferenced ld a, [wLinkMode] and a ret nz diff --git a/home/text.asm b/home/text.asm index be57ccfb..a5ab8fa3 100644 --- a/home/text.asm +++ b/home/text.asm @@ -128,8 +128,8 @@ SpeechTextbox:: ld c, TEXTBOX_INNERW jp Textbox -UnreferencedTestText:: - text "ゲームフりーク！" +GameFreakText:: ; unreferenced + text "ゲームフりーク！" ; "GAMEFREAK!" done RadioTerminator:: @@ -633,10 +633,7 @@ TextCommands:: dw TextCommand_FAR ; TX_FAR TextCommand_START:: -; text_start ; write text until "@" -; [$00]["...@"] - ld d, h ld e, l ld h, b @@ -648,11 +645,7 @@ TextCommand_START:: ret TextCommand_RAM:: -; text_ram -; write text from a ram address -; little endian -; [$01][addr] - +; write text from a ram address (little endian) ld a, [hli] ld e, a ld a, [hli] @@ -665,11 +658,7 @@ TextCommand_RAM:: ret TextCommand_FAR:: -; text_far -; write text from a different bank -; little endian -; [$16][addr][bank] - +; write text from a different bank (little endian) ldh a, [hROMBank] push af @@ -694,11 +683,7 @@ TextCommand_FAR:: ret TextCommand_BCD:: -; text_bcd ; write bcd from address, typically ram -; [$02][addr][flags] -; flags: see PrintBCDNumber - ld a, [hli] ld e, a ld a, [hli] @@ -715,10 +700,7 @@ TextCommand_BCD:: ret TextCommand_MOVE:: -; text_move ; move to a new tile -; [$03][addr] - ld a, [hli] ld [wMenuScrollPosition + 2], a ld c, a @@ -728,11 +710,7 @@ TextCommand_MOVE:: ret TextCommand_BOX:: -; text_box -; draw a box -; little endian -; [$04][addr][height][width] - +; draw a box (height, width) ld a, [hli] ld e, a ld a, [hli] @@ -749,19 +727,12 @@ TextCommand_BOX:: ret TextCommand_LOW:: -; text_low ; write text at (1,16) -; [$05] - bccoord TEXTBOX_INNERX, TEXTBOX_INNERY + 2 ret TextCommand_PROMPT_BUTTON:: -; text_promptbutton -; wait for button press -; show arrow -; [06] - +; wait for button press; show arrow ld a, [wLinkMode] cp LINK_COLOSSEUM jp z, TextCommand_LINK_PROMPT_BUTTON @@ -776,7 +747,6 @@ TextCommand_PROMPT_BUTTON:: ret TextCommand_SCROLL:: -; text_scroll ; pushes text up two lines and sets the BC cursor to the border tile ; below the first character column of the text box. push hl @@ -788,13 +758,11 @@ TextCommand_SCROLL:: ret TextCommand_START_ASM:: -; text_asm - +; run assembly code jp hl TextCommand_NUM:: -; text_decimal -; [$09][addr][hi:bytes lo:digits] +; print a number ld a, [hli] ld e, a ld a, [hli] @@ -818,7 +786,7 @@ TextCommand_NUM:: ret TextCommand_PAUSE:: -; text_pause +; wait for button press or 30 frames push hl push bc call GetJoypad @@ -833,10 +801,7 @@ TextCommand_PAUSE:: ret TextCommand_SOUND:: -; chars: -; $0b, $0e, $0f, $10, $11, $12, $13 -; see TextSFX - +; play a sound effect from TextSFX push bc dec hl ld a, [hli] @@ -867,8 +832,8 @@ TextCommand_SOUND:: pop bc ret -Unreferenced_Function13a2:: -; sound_cry +TextCommand_CRY:: ; unreferenced +; play a pokemon cry push de ld e, [hl] inc hl @@ -890,8 +855,7 @@ TextSFX:: db -1 TextCommand_DOTS:: -; text_dots -; [$0C][num] +; wait for button press or 30 frames while printing "…"s ld a, [hli] ld d, a push hl @@ -919,9 +883,7 @@ TextCommand_DOTS:: ret TextCommand_LINK_PROMPT_BUTTON:: -; text_linkpromptbutton -; wait for key down -; display arrow +; wait for button press; display arrow push hl push bc call PromptButton @@ -930,7 +892,6 @@ TextCommand_LINK_PROMPT_BUTTON:: ret TextCommand_STRINGBUFFER:: -; text_buffer ; Print a string from one of the following: ; 0: wStringBuffer3 ; 1: wStringBuffer4 @@ -939,8 +900,6 @@ TextCommand_STRINGBUFFER:: ; 4: wStringBuffer1 ; 5: wEnemyMonNick ; 6: wBattleMonNick -; [$14][id] - ld a, [hli] push hl ld e, a @@ -959,8 +918,7 @@ TextCommand_STRINGBUFFER:: ret TextCommand_DAY:: -; text_today - +; print the day of the week call GetWeekday push hl push bc diff --git a/home/time.asm b/home/time.asm index e49a5765..cfac2ef4 100644 --- a/home/time.asm +++ b/home/time.asm @@ -1,6 +1,6 @@ ; Functions relating to the timer interrupt and the real-time-clock. -Unreferenced_Timer:: +Timer:: ; unreferenced reti LatchClock:: @@ -249,7 +249,7 @@ SetClock:: call CloseSRAM ; unlatch clock, disable clock r/w ret -UnreferencedClearRTCStatus:: +ClearRTCStatus:: ; unreferenced ; clear sRTCStatusFlags xor a push af diff --git a/home/trainers.asm b/home/trainers.asm index 0f9a1c9b..a5be4068 100644 --- a/home/trainers.asm +++ b/home/trainers.asm @@ -203,7 +203,7 @@ FacingPlayerDistance:: and a ret -UnreferencedCheckTrainerFlag:: +CheckTrainerFlag:: ; unreferenced push bc ld hl, OBJECT_MAP_OBJECT_INDEX add hl, bc @@ -160,3 +160,5 @@ hBattleTurn:: hCGBPalUpdate:: db hCGB:: db hSGB:: db + + ds 21 @@ -204,7 +204,7 @@ INCLUDE "engine/events/basement_key.asm" INCLUDE "engine/events/sacred_ash.asm" INCLUDE "engine/pokemon/tempmon.asm" INCLUDE "engine/pokemon/types.asm" -INCLUDE "engine/battle/unreferenced_getgen1trainerclassname.asm" +INCLUDE "engine/battle/getgen1trainerclassname.asm" INCLUDE "engine/pokemon/mon_stats.asm" INCLUDE "engine/link/init_list.asm" INCLUDE "engine/pokemon/experience.asm" diff --git a/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm b/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm index 0f86465e..e5dcbe3f 100644 --- a/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm +++ b/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm @@ -16,7 +16,7 @@ FastShipCabins_SE_SSE_CaptainsCabin_MapScripts: db 0 ; callbacks -.UnreferencedDummyScene: +.DummyScene: ; unreferenced end SSAquaCaptain: diff --git a/maps/GoldenrodBikeShop.asm b/maps/GoldenrodBikeShop.asm index c4a05e3f..06f2d0e6 100644 --- a/maps/GoldenrodBikeShop.asm +++ b/maps/GoldenrodBikeShop.asm @@ -6,7 +6,7 @@ GoldenrodBikeShop_MapScripts: db 0 ; callbacks -.UnreferencedDummyScene: +.DummyScene: ; unreferenced end GoldenrodBikeShopClerkScript: diff --git a/maps/Route32.asm b/maps/Route32.asm index 45ee6ac0..e9ff6ce3 100644 --- a/maps/Route32.asm +++ b/maps/Route32.asm @@ -57,7 +57,7 @@ Route32CooltrainerMContinueScene: closetext end -.Unreferenced: +.GoToSproutTower: ; unreferenced writetext Route32CooltrainerMText_UnusedSproutTower waitbutton closetext @@ -2,6 +2,7 @@ INCLUDE "constants.asm" INCLUDE "macros/wram.asm" + INCLUDE "vram.asm" @@ -1731,6 +1732,7 @@ wCurPartyMon:: ; is being dealt with at the moment ; 0-5 db + ds 1 wWhichHPBar:: @@ -1762,6 +1764,7 @@ wPartyMenuActionText:: db wItemAttributeParamBuffer:: db wCurPartyLevel:: db + wScrollingMenuListSize:: db wLinkMode:: db @@ -1879,7 +1882,7 @@ ENDU wLinkBattleRNs:: ds 10 -wTempEnemyMonSpecies:: db +wTempEnemyMonSpecies:: db wTempBattleMonSpecies:: db wEnemyMon:: battle_struct wEnemyMon @@ -2101,17 +2104,20 @@ wPlayerData1:: wPlayerID:: dw wPlayerName:: ds NAME_LENGTH -wMomsName:: ds NAME_LENGTH -wRivalName:: ds NAME_LENGTH -wRedsName:: ds NAME_LENGTH +wMomsName:: ds NAME_LENGTH +wRivalName:: ds NAME_LENGTH +wRedsName:: ds NAME_LENGTH wGreensName:: ds NAME_LENGTH wSavedAtLeastOnce:: db wSpawnAfterChampion:: db + +; init time set at newgame wStartDay:: db wStartHour:: db wStartMinute:: db wStartSecond:: db + wRTC:: ds 4 wDSTBackupDay:: db |