diff options
Diffstat (limited to 'home')
| -rw-r--r-- | home/audio.asm | 2 | ||||
| -rw-r--r-- | home/battle.asm | 2 | ||||
| -rw-r--r-- | home/fade.asm | 3 | ||||
| -rw-r--r-- | home/flag.asm | 4 | ||||
| -rw-r--r-- | home/gfx.asm | 2 | ||||
| -rw-r--r-- | home/header.asm | 2 | ||||
| -rw-r--r-- | home/lcd.asm | 2 | ||||
| -rw-r--r-- | home/map.asm | 9 | ||||
| -rw-r--r-- | home/map_objects.asm | 6 | ||||
| -rw-r--r-- | home/math.asm | 2 | ||||
| -rw-r--r-- | home/menu.asm | 4 | ||||
| -rw-r--r-- | home/mobile.asm | 12 | ||||
| -rw-r--r-- | home/palettes.asm | 2 | ||||
| -rw-r--r-- | home/pokemon.asm | 2 | ||||
| -rw-r--r-- | home/region.asm | 2 | ||||
| -rw-r--r-- | home/serial.asm | 2 | ||||
| -rw-r--r-- | home/text.asm | 72 | ||||
| -rw-r--r-- | home/time.asm | 6 | ||||
| -rw-r--r-- | home/trainers.asm | 2 |
19 files changed, 47 insertions, 91 deletions
diff --git a/home/audio.asm b/home/audio.asm index 87faf814d..7448de022 100644 --- a/home/audio.asm +++ b/home/audio.asm @@ -467,7 +467,7 @@ GetMapMusic_MaybeSpecial:: call GetMapMusic ret -Unreferenced_Function3d9f:: +Function3d9f:: ; 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 d7e81f8a3..da9c081a2 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 6af6ae08b..5a02cddec 100644 --- a/home/fade.asm +++ b/home/fade.asm @@ -1,7 +1,6 @@ ; Functions to fade the screen in and out. -Unreferenced_Function48c:: -; TimeOfDayFade +TimeOfDayFade:: ; unreferenced ld a, [wTimeOfDayPal] ld b, a ld hl, IncGradGBPalTable_11 diff --git a/home/flag.asm b/home/flag.asm index 125c2a434..76e08e260 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 a0f12c659..01598a95b 100644 --- a/home/gfx.asm +++ b/home/gfx.asm @@ -32,7 +32,7 @@ FarCopyBytesDouble_DoubleBankSwitch:: rst Bankswitch ret -Unreferenced_DMATransfer: +SafeHDMATransfer: ; unreferenced dec c ldh a, [hBGMapMode] push af diff --git a/home/header.asm b/home/header.asm index 2e8c58949..a450c072d 100644 --- a/home/header.asm +++ b/home/header.asm @@ -47,7 +47,7 @@ SECTION "lcd", ROM0[$0048] jp LCD SECTION "timer", ROM0[$0050] - jp Timer + jp MobileTimer SECTION "serial", ROM0[$0058] jp Serial diff --git a/home/lcd.asm b/home/lcd.asm index 1d6671117..b78f1d13a 100644 --- a/home/lcd.asm +++ b/home/lcd.asm @@ -1,6 +1,6 @@ ; LCD handling -Unreferenced_Function547:: +Function547:: ; unreferenced ldh a, [hLCDCPointer] cp LOW(rSCX) ret nz diff --git a/home/map.asm b/home/map.asm index 91c052a90..927c705db 100644 --- a/home/map.asm +++ b/home/map.asm @@ -368,8 +368,7 @@ CheckIndoorMap:: cp GATE ret -; unused -UnreferencedCheckEnvironment:: +CheckUnknownMap:: ; unreferenced cp INDOOR ret z cp GATE @@ -1313,7 +1312,7 @@ UpdateBGMapColumn:: ldh [hBGMapTileCount], a ret -Unreferenced_Function2816:: +Function2816:: ; unreferenced ld hl, wBGMapBuffer ld bc, wBGMapBufferEnd - wBGMapBuffer xor a @@ -1904,7 +1903,7 @@ CloseSubmenu:: call ReloadTilesetAndPalettes call UpdateSprites call Call_ExitMenu - call ret_d90 + call GSReloadPalettes jr FinishExitMenu ExitAllMenus:: @@ -1912,7 +1911,7 @@ ExitAllMenus:: call Call_ExitMenu call ReloadTilesetAndPalettes call UpdateSprites - call ret_d90 + call GSReloadPalettes FinishExitMenu:: ld b, SCGB_MAPPALS call GetSGBLayout diff --git a/home/map_objects.asm b/home/map_objects.asm index 667658f0c..94a33f032 100644 --- a/home/map_objects.asm +++ b/home/map_objects.asm @@ -362,7 +362,7 @@ CopyPlayerObjectTemplate:: call CopyBytes ret -Unreferenced_Function19b8: +Function19b8: ; 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 c99214cce..8e9501633 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 c53459c00..1ee95f181 100644 --- a/home/menu.asm +++ b/home/menu.asm @@ -417,7 +417,7 @@ YesNoBox:: PlaceYesNoBox:: jr _YesNoBox -UnreferencedPlaceGenericTwoOptionBox:: +PlaceGenericTwoOptionBox:: ; unreferenced call LoadMenuHeader jr InterpretTwoOptionMenu @@ -719,7 +719,7 @@ PlaceNthMenuStrings:: call PlaceString ret -Unreferenced_Function1f9e:: +Function1f9e:: ; unreferenced call GetMenuDataPointerTableEntry inc hl inc hl diff --git a/home/mobile.asm b/home/mobile.asm index 9597372fb..6cab585fa 100644 --- a/home/mobile.asm +++ b/home/mobile.asm @@ -65,7 +65,7 @@ MobileReceive:: ret -Timer:: +MobileTimer:: push af push bc push de @@ -89,11 +89,11 @@ Timer:: ld a, [$c822] bit 1, a - jr nz, .skip_Timer + jr nz, .skip_timer ldh a, [rSC] and 1 << rSC_ON - jr nz, .skip_Timer + jr nz, .skip_timer ldh a, [hROMBank] push af @@ -108,7 +108,7 @@ Timer:: ld [$c981], a rst Bankswitch -.skip_Timer +.skip_timer ldh a, [rTMA] ldh [rTIMA], a @@ -122,7 +122,7 @@ Timer:: pop af reti -Unreferenced_Function3ed7:: +Function3ed7:: ; unreferenced ld [$dc02], a ldh a, [hROMBank] push af @@ -152,7 +152,7 @@ Function3eea:: call MobileHome_PlaceBox ret -Unreferenced_Function3efd:: +Function3efd:: ; unreferenced push hl hlcoord 0, 12 ld b, 4 diff --git a/home/palettes.asm b/home/palettes.asm index 4eeab5aa1..528c273f8 100644 --- a/home/palettes.asm +++ b/home/palettes.asm @@ -301,7 +301,7 @@ ClearVBank1:: ldh [rVBK], a ret -ret_d90:: +GSReloadPalettes:: ; dummied out ret ReloadSpritesNoPalettes:: diff --git a/home/pokemon.asm b/home/pokemon.asm index edf17e7af..82fc92bdc 100644 --- a/home/pokemon.asm +++ b/home/pokemon.asm @@ -234,7 +234,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/region.asm b/home/region.asm index 185f5ed25..4b303e396 100644 --- a/home/region.asm +++ b/home/region.asm @@ -31,5 +31,5 @@ IsInJohto:: ld a, KANTO_REGION ret -ret_2f3e:: +Function2f3e:: ; dummied out ret diff --git a/home/serial.asm b/home/serial.asm index d1b67f9b2..9b595db81 100644 --- a/home/serial.asm +++ b/home/serial.asm @@ -388,7 +388,7 @@ LinkDataReceived:: ldh [rSC], a ret -Unreferenced_Function919:: +Function919:: ; unreferenced ld a, [wLinkMode] and a ret nz diff --git a/home/text.asm b/home/text.asm index abbf12c41..c8b23d5b3 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:: @@ -712,10 +712,7 @@ TextCommands:: dw TextCommand_FAR ; TX_FAR TextCommand_START:: -; text_start ; write text until "@" -; [$00]["...@"] - ld d, h ld e, l ld h, b @@ -727,11 +724,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] @@ -744,11 +737,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 @@ -773,11 +762,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] @@ -794,10 +779,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 @@ -807,11 +789,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] @@ -828,19 +806,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 @@ -857,7 +828,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 @@ -869,8 +839,7 @@ TextCommand_SCROLL:: ret TextCommand_START_ASM:: -; text_asm - +; run assembly code bit 7, h jr nz, .not_rom jp hl @@ -881,8 +850,7 @@ TextCommand_START_ASM:: ret TextCommand_NUM:: -; text_decimal -; [$09][addr][hi:bytes lo:digits] +; print a number ld a, [hli] ld e, a ld a, [hli] @@ -906,7 +874,7 @@ TextCommand_NUM:: ret TextCommand_PAUSE:: -; text_pause +; wait for button press or 30 frames push hl push bc call GetJoypad @@ -921,10 +889,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] @@ -955,8 +920,8 @@ TextCommand_SOUND:: pop bc ret -Unreferenced_Function1522:: -; sound_cry +TextCommand_CRY:: ; unreferenced +; play a pokemon cry push de ld e, [hl] inc hl @@ -978,8 +943,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 @@ -1007,9 +971,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 @@ -1018,7 +980,6 @@ TextCommand_LINK_PROMPT_BUTTON:: ret TextCommand_STRINGBUFFER:: -; text_buffer ; Print a string from one of the following: ; 0: wStringBuffer3 ; 1: wStringBuffer4 @@ -1027,8 +988,6 @@ TextCommand_STRINGBUFFER:: ; 4: wStringBuffer1 ; 5: wEnemyMonNick ; 6: wBattleMonNick -; [$14][id] - ld a, [hli] push hl ld e, a @@ -1047,8 +1006,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 206d6dce4..0b51dea79 100644 --- a/home/time.asm +++ b/home/time.asm @@ -1,11 +1,11 @@ ; Functions relating to the timer interrupt and the real-time-clock. -Unreferenced_Timer:: +Timer:: ; unreferenced push af ldh a, [hMobile] and a jr z, .not_mobile - call Timer + call MobileTimer .not_mobile pop af @@ -256,7 +256,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 cff804c96..eac8101e8 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 |