More unreferenced labels and unused text

This commit is contained in:
xCrystal 2018-01-02 19:38:56 +01:00
parent d7970f749a
commit b4e087167f
30 changed files with 66 additions and 61 deletions

View File

@ -8091,7 +8091,7 @@ TextJump_GoodComeBack: ; 3f352
db "@"
; 3f357
UnusedFunction_TextJump_ComeBack: ; 3f357
Unreferenced_TextJump_ComeBack: ; 3f357
; this function doesn't seem to be used
ld hl, TextJump_ComeBack
ret

View File

@ -232,8 +232,7 @@ ClearActorHud: ; cc207
ret
; cc220
Functioncc220: ; cc220
; Appears to be unused.
Unreferenced_Functioncc220: ; cc220
xor a
ld [hBGMapMode], a
ld a, LOW(vBGMap0 tile $28)

View File

@ -246,7 +246,6 @@ BillsPCDepositMenuDataHeader: ; 0xe253d (38:653d)
; 0xe2564 (38:6564)
Unreferenced_BillsPCClearThreeBoxes: ; e2564
; unreferenced
hlcoord 0, 0
ld b, 4
ld c, 8
@ -1586,7 +1585,7 @@ endr
db -1
; e2ed5
BillsPC_UnusedFillBox: ; e2ed5
Unreferenced_BillsPC_FillBox: ; e2ed5
.row
push bc
push hl

View File

@ -143,7 +143,7 @@ BillsPC_DepositMenu: ; e4fe (3:64fe)
and a
ret
Functione512: ; unused
Unreferenced_Functione512:
ld a, [PartyCount]
and a
jr z, .no_pkmn
@ -212,7 +212,7 @@ BillsPC_WithdrawMenu: ; e559 (3:6559)
and a
ret
Functione56d: ; unused
Unreferenced_Functione56d:
ld a, [PartyCount]
cp PARTY_LENGTH
jr nc, .asm_e576

View File

@ -220,6 +220,7 @@ RestartClock: ; 20021 (8:4021)
ret
; 20160 (8:4160)
; unused
.unreferenced ; 20160
ld a, [Buffer3]
ld b, a

View File

@ -994,6 +994,7 @@ CountStep: ; 96b79
ret
; 96bd3
; unused
.unreferenced ; 96bd3
ld a, 7
scf

View File

@ -361,7 +361,7 @@ HandleCmdQueue:: ; 97e08
ret
; 97e25
GetNthCmdQueueEntry: ; 97e25 unreferenced
Unreferenced_GetNthCmdQueueEntry: ; 97e25
ld hl, wCmdQueue
ld bc, CMDQUEUE_ENTRY_SIZE
call AddNTimes

View File

@ -892,7 +892,7 @@ Text_Mart_ICanPayThisMuch: ; 0x15f78
db "@"
; 0x15f7d
DummyString ; 15f7d
.UnusedString15f7d: ; 15f7d
db "!ダミー!@"
Text_Mart_HowMayIHelpYou: ; 0x15f83

View File

@ -765,7 +765,7 @@ NamingScreen_AdvanceCursor_CheckEndOfString: ; 11b27
; 11b56
Dakutens: ; Dummied out
Dakutens: ; unused
db "かが", "きぎ", "くぐ", "けげ", "こご"
db "さざ", "しじ", "すず", "せぜ", "そぞ"
db "ただ", "ちぢ", "つづ", "てで", "とど"
@ -776,7 +776,7 @@ Dakutens: ; Dummied out
db "ハバ", "ヒビ", "フブ", "へべ", "ホボ"
db $ff
Handakutens: ; Dummied out
Handakutens: ; unused
db "はぱ", "ひぴ", "ふぷ", "へぺ", "ほぽ"
db "ハパ", "ヒピ", "フプ", "へぺ", "ホポ"
db $ff
@ -1051,7 +1051,7 @@ INCBIN "gfx/icon/mail2.2bpp"
; 11f7a (4:5f7a)
.Dummy: ; dummied out
.UnusedString11f7a:
db "メールを かいてね@"
; 11f84

View File

@ -817,25 +817,33 @@ PartyMenuStrings: ; 0x504d2
ChooseAMonString: ; 0x504e4
db "Choose a #MON.@"
UseOnWhichPKMNString: ; 0x504f3
db "Use on which <PK><MN>?@"
WhichPKMNString: ; 0x50504
db "Which <PK><MN>?@"
TeachWhichPKMNString: ; 0x5050e
db "Teach which <PK><MN>?@"
MoveToWhereString: ; 0x5051e
db "Move to where?@"
ChooseAFemalePKMNString: ; 0x5052d ; UNUSED
ChooseAFemalePKMNString: ; 0x5052d
; unused
db "Choose a ♀<PK><MN>.@"
ChooseAMalePKMNString: ; 0x5053b ; UNUSED
ChooseAMalePKMNString: ; 0x5053b
; unused
db "Choose a ♂<PK><MN>.@"
ToWhichPKMNString: ; 0x50549
db "To which <PK><MN>?@"
YouHaveNoPKMNString: ; 0x50556
db "You have no <PK><MN>!@"
PrintPartyMenuActionText: ; 50566
ld a, [CurPartyMon]
ld hl, PartyMonNicknames

View File

@ -316,7 +316,7 @@ DoPlayerMovement:: ; 80000
scf
ret
; unused?
; unused
xor a
ret

View File

@ -1751,7 +1751,7 @@ LoadStation_EvolutionRadio: ; 9183e (24:583e)
; 91853 (24:5853)
LoadStation_Dummy: ; 91853
Unreferenced_LoadStation: ; 91853
ret
RadioMusicRestartDE: ; 91854 (24:5854)

View File

@ -183,7 +183,7 @@ SlotsLoop: ; 927af (24:67af)
ld [wCurrSpriteOAMAddr], a
callfar DoNextFrameForFirst16Sprites
call .PrintCoinsAndPayout
call .DummyFunc
call .Stubbed_Function927d3
call DelayFrame
and a
ret
@ -192,7 +192,7 @@ SlotsLoop: ; 927af (24:67af)
scf
ret
.DummyFunc: ; 927d3 (24:67d3)
.Stubbed_Function927d3: ; 927d3 (24:67d3)
; dummied out
ret
ld a, [wReel1ReelAction]

View File

@ -141,7 +141,7 @@ SpecialsPointers:: ; c029
add_special Special_Function1700ba
add_special Special_Function170114
add_special Special_BattleTowerBattle
add_special Special_Function1704e1
add_special UnusedSpecial_Function1704e1
add_special DummySpecial17021d
add_special Special_LoadOpponentTrainerAndPokemonWithOTSprite
add_special Special_Function11ba38

View File

@ -527,8 +527,7 @@ GetFrameOAMPointer: ; 8d1a2
ret
; 8d1ac
BrokenGetStdGraphics: ; 8d1ac
; dummied out
Unreferenced_BrokenGetStdGraphics: ; 8d1ac
push hl
ld l, a
ld h, 0

View File

@ -1268,7 +1268,7 @@ MonMenu_Fly: ; 12e30
ld a, $0
ret
.Unused:
.Unreferenced:
ld a, $1
ret
; 12e55

View File

@ -1563,8 +1563,8 @@ TradeAnim_WaitAnim2: ; 29886
; 29893
DebugTrade: ; 29893
; This function is unreferenced.
Unreferenced_DebugTrade: ; 29893
; This function is not referenced.
; It was meant for use in Japanese versions, so the
; constant used for copy length was changed by accident.

View File

@ -84,18 +84,18 @@ INCLUDE "gfx/footprints.asm"
; This and the following two functions are unreferenced.
; Debug, perhaps?
Unknown_fb434:
Unreferenced_fb434:
db 0
Functionfb435: ; 4b435
ld a, [Unknown_fb434]
Unreferenced_Functionfb435: ; 4b435
ld a, [Unreferenced_fb434]
and a
jp nz, Get1bpp_2
jp Get1bpp
; fb43f
Functionfb43f: ; fb43f
ld a, [Unknown_fb434]
Unreferenced_Functionfb43f: ; fb43f
ld a, [Unreferenced_fb434]
and a
jp nz, Get2bpp_2
jp Get2bpp

View File

@ -18,7 +18,7 @@ FastShipCabins_SE_SSE_CaptainsCabin_MapScriptHeader:
.MapCallbacks:
db 0
Unused_0x75ea6:
Unreferenced_0x75ea6:
end
SSAquaCaptain:

View File

@ -41,8 +41,8 @@ GoldenrodDeptStore2FDirectory:
GoldenrodDeptStore2FElevatorButton:
jumpstd elevatorbutton
; possibly unused
UnknownText_0x55b7c:
; unused
UnusedText_0x55b7c:
text "We intend to sell"
line "items for #MON"
cont "to hold."
@ -52,8 +52,8 @@ UnknownText_0x55b7c:
cont "MON hold it."
done
; possibly unused
UnknownText_0x55bd3:
; unused
UnusedText_0x55bd3:
text "By giving #MON"
line "items to hold, I"

View File

@ -164,8 +164,8 @@ SailorHuey1BeatenText:
line "I lose!"
done
; possibly unused
UnknownText_0x5b0be:
; unused
UnusedText_0x5b0be:
text "What power!"
line "How would you like"

View File

@ -324,7 +324,7 @@ Route29FisherText:
line "progress."
done
; possibly unused
; unused
Text_WaitingForDay:
text "I'm waiting for"
line "#MON that"

View File

@ -59,7 +59,7 @@ Route32CooltrainerMContinueScene:
closetext
end
.Unused:
.Unreferenced:
writetext Route32CooltrainerMText_UnusedSproutTower
waitbutton
closetext
@ -839,7 +839,7 @@ BirdKeeperPeterAfterText:
cont "in VIOLET CITY."
done
; possibly unused
; unused
Route32UnusedText:
text "The fishermen"
line "yelled at me for"

View File

@ -799,7 +799,6 @@ UnknownText_0x6b7af:
; This text is unused and unreferenced in the final game.
; The tree Pokémon is Sudowoodo.
; The Silph Scope 2 was later reworked into the Squirtbottle.
UnusedSudowoodoText:
text "I hear there's a"
line "#MON that looks"

View File

@ -114,8 +114,8 @@ UnknownText_0x58e4f:
line "on the walls…"
done
; possibly unused.. again?
UnknownText_0x58e70:
; unused
UnusedText_0x58e70:
text "It's UNOWN text!"
done

View File

@ -115,8 +115,8 @@ UnknownText_0x58612:
line "on the walls…"
done
; possibly unused
UnknownText_0x58633:
; unused
UnusedText_0x58633:
text "It's UNOWN text!"
done

View File

@ -202,8 +202,8 @@ UnknownText_0x589b8:
cont "this wall here…"
done
; possibly unused
UnknownText_0x58a03:
; unused
UnusedText_0x58a03:
text "The patterns on"
line "the wall appear to"
cont "be words!"
@ -226,8 +226,8 @@ UnknownText_0x58aa7:
line "on the walls…"
done
; possibly unused
UnknownText_0x58ac8:
; unused
UnusedText_0x58ac8:
text "It's UNOWN text!"
done

View File

@ -115,8 +115,8 @@ UnknownText_0x58c8e:
line "on the walls…"
done
; possibly unused.. this again?
UnknownText_0x58caf:
; unused
UnusedText_0x58caf:
text "It's UNOWN text!"
done

View File

@ -169,8 +169,8 @@ UnknownScript_0x59260:
closetext
end
UnknownScript_0x59269:
jumptext UnknownText_0x59848
UnreferencedScript_0x59269:
jumptext UnusedText_0x59848
MapRuinsOfAlphResearchCenterSignpost0Script:
jumptext UnknownText_0x59886
@ -308,8 +308,8 @@ UnknownText_0x595cb:
cont "kinds of them…"
done
; possibly unused
UnknownText_0x59669:
; unused
UnusedText_0x59669:
text "We think something"
line "caused the cryptic"
@ -320,8 +320,8 @@ UnknownText_0x59669:
line "studies on that."
done
; possibly unused
UnknownText_0x596d3:
; unused
UnusedText_0x596d3:
text "According to my"
line "research…"
@ -374,8 +374,8 @@ UnknownText_0x5982d:
line "printed out."
done
; possibly unused
UnknownText_0x59848:
; unused
UnusedText_0x59848:
text "It's a photo of"
line "the RESEARCH"

View File

@ -654,8 +654,7 @@ Unreferenced_Function1704ca: ; 1704ca
ret
; 1704e1
Special_Function1704e1: ; 1704e1
; unreferenced special
UnusedSpecial_Function1704e1: ; 1704e1
call SpeechTextBox
call FadeToMenu
call InitBattleTowerChallengeRAM