pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2025-04-09 05:44:44 -07:00
Code Issues Packages Projects Releases Wiki Activity

Comment, remove, or revise many unreferenced labels

Browse Source
This commit is contained in:
Rangi 2020-10-26 15:45:57 -04:00
parent a2b6befd7d
commit 9dcdad5e60
180 changed files with 810 additions and 1032 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
audio/cries.asm
View File

@ -464,7 +464,7 @@ Cry_Sentret_Ch6:
square_note 8, 15, 1, 1824
sound_ret
Cry_Sentret_Ch8:
Cry_Sentret_Ch8: ; unreferenced
noise_note 8, 3, -3, 0
noise_note 8, 9, 2, 0
sound_ret
@ -1082,7 +1082,7 @@ Cry_Weepinbell:
channel 6, Cry_Weepinbell_Ch6
channel 8, Cry_Weepinbell_Ch8
Cry_Unused_Ch5:
Cry_Unused_Ch5: ; unreferenced
duty_cycle_pattern 3, 3, 0, 0
square_note 15, 14, 0, 1920
square_note 15, 15, 0, 1924
@ -1092,7 +1092,7 @@ Cry_Unused_Ch5:
square_note 8, 7, 1, 1924
sound_ret
Cry_Unused_Ch6:
Cry_Unused_Ch6: ; unreferenced
duty_cycle_pattern 0, 0, 1, 1
square_note 15, 10, 0, 1857
square_note 15, 11, 0, 1859
@ -1102,7 +1102,7 @@ Cry_Unused_Ch6:
square_note 8, 3, 1, 1862
sound_ret
Cry_Unused_Ch8:
Cry_Unused_Ch8: ; unreferenced
noise_note 2, 15, 2, 76
noise_note 6, 14, 0, 58
noise_note 15, 13, 0, 58

9
audio/engine.asm
View File

@ -38,15 +38,16 @@ _InitSound::
dec e
jr nz, .clearsound
ld hl, wChannels ; start of channel data
ld de, wChannelsEnd - wChannels ; length of area to clear (entire sound wram area)
.clearchannels
ld hl, wAudio
ld de, wAudioEnd - wAudio
.clearaudio
xor a
ld [hli], a
dec de
ld a, e
or d
jr nz, .clearchannels
jr nz, .clearaudio
ld a, MAX_VOLUME
ld [wVolume], a
call MusicOn

2
audio/music/magnettrain.asm
View File

@ -246,7 +246,7 @@ Music_MagnetTrain_Ch4:
drum_note 12, 16
sound_ret
.sub1: ; unused
.sub1: ; unreferenced
drum_note 9, 1
drum_note 8, 1
drum_note 8, 1

12
audio/sfx.asm
View File

@ -21,7 +21,7 @@ Sfx_Menu:
Sfx_ReadText:
Sfx_ReadText2:
channel_count 1
channel 5, Sfx_ReadText2_Ch5
channel 5, Sfx_ReadText_Ch5 ; aka Sfx_ReadText2_Ch5
Sfx_Poison:
channel_count 1
@ -486,10 +486,10 @@ Sfx_Elevator:
Sfx_LevelUp:
Sfx_DexFanfare5079:
channel_count 4
channel 5, Sfx_LevelUp_Ch5
channel 6, Sfx_LevelUp_Ch6
channel 7, Sfx_LevelUp_Ch7
channel 8, Sfx_LevelUp_Ch8
channel 5, Sfx_LevelUp_Ch5 ; aka Sfx_DexFanfare5079_Ch5
channel 6, Sfx_LevelUp_Ch6 ; aka Sfx_DexFanfare5079_Ch6
channel 7, Sfx_LevelUp_Ch7 ; aka Sfx_DexFanfare5079_Ch7
channel 8, Sfx_LevelUp_Ch8 ; aka Sfx_DexFanfare5079_Ch8
Sfx_LevelUp_Ch5:
Sfx_DexFanfare5079_Ch5:
@ -942,7 +942,7 @@ Sfx_Fanfare2:
channel 6, Sfx_Fanfare2_Ch6
channel 8, Sfx_Fanfare2_Ch8
Sfx_Unused:
Sfx_Unused: ; unreferenced
channel_count 4
channel 5, Sfx_Unused_Ch5
channel 6, Sfx_Unused_Ch6

2
audio/sfx_pointers.asm
View File

@ -144,7 +144,7 @@ SFX:
dba Sfx_MilkDrink
dba Sfx_Present
dba Sfx_MorningSun
dba Sfx_LevelUp
dba Sfx_LevelUp ; aka Sfx_DexFanfare5079
dba Sfx_KeyItem
dba Sfx_Fanfare2
dba Sfx_RegisterPhoneNumber

2
constants/map_constants.asm
View File

@ -1,5 +1,5 @@
newgroup: MACRO
const_value = const_value + 1
const_skip
__map_value__ = 1
ENDM

2
constants/map_data_constants.asm
View File

@ -66,7 +66,7 @@ NUM_MAP_PALETTES EQU const_value
shift_const NORTH
; SpawnPoints indexes (see data/maps/spawn_points.asm)
const_value = -1
const_def -1
const SPAWN_N_A
const SPAWN_HOME
const SPAWN_DEBUG

2
constants/pokemon_data_constants.asm
View File

@ -179,7 +179,7 @@ NUM_TREEMON_SETS EQU const_value
const TREEMON_SCORE_RARE ; 2
; ChangeHappiness arguments (see data/happiness_changes.asm)
const_value = 1
const_def 1
const HAPPINESS_GAINLEVEL ; 01
const HAPPINESS_USEDITEM ; 02
const HAPPINESS_USEDXITEM ; 03

2
constants/trainer_constants.asm
View File

@ -3,7 +3,7 @@ __trainer_class__ = 0
trainerclass: MACRO
\1 EQU __trainer_class__
__trainer_class__ = __trainer_class__ + 1
const_value = 1
const_def 1
ENDM
; trainer class ids

22
data/battle_tower/parties.asm
View File

@ -1,7 +1,7 @@
BattleTowerMons:
; 10 groups of 21 mons.
; 10 groups (one per floor level) of 21 mons (BATTLETOWER_NUM_UNIQUE_MON).
BattleTowerMons1:
; BattleTowerMons group 1
db JOLTEON
db MIRACLEBERRY
@ -550,7 +550,7 @@ BattleTowerMons1:
db "BARIYA-DO@@"
BattleTowerMons2:
; BattleTowerMons group 2
db UMBREON
db LEFTOVERS
@ -1099,7 +1099,7 @@ BattleTowerMons2:
db "NUO-@@@@@@@"
BattleTowerMons3:
; BattleTowerMons group 3
db JOLTEON
db MIRACLEBERRY
@ -1648,7 +1648,7 @@ BattleTowerMons3:
db "OKORIZARU@@"
BattleTowerMons4:
; BattleTowerMons group 4
db TAUROS
db GOLD_BERRY
@ -2197,7 +2197,7 @@ BattleTowerMons4:
db "EREBU-@@@@@"
BattleTowerMons5:
; BattleTowerMons group 5
db KINGDRA
db GOLD_BERRY
@ -2746,7 +2746,7 @@ BattleTowerMons5:
db "HURI-ZA-@@@"
BattleTowerMons6:
; BattleTowerMons group 6
db KINGDRA
db LEFTOVERS
@ -3295,7 +3295,7 @@ BattleTowerMons6:
db "GORO-NIya@@"
BattleTowerMons7:
; BattleTowerMons group 7
db JOLTEON
db MIRACLEBERRY
@ -3844,7 +3844,7 @@ BattleTowerMons7:
db "KAMEtuKUSU@"
BattleTowerMons8:
; BattleTowerMons group 8
db JOLTEON
db MIRACLEBERRY
@ -4393,7 +4393,7 @@ BattleTowerMons8:
db "GURANBURU@@"
BattleTowerMons9:
; BattleTowerMons group 9
db UMBREON
db KINGS_ROCK
@ -4942,7 +4942,7 @@ BattleTowerMons9:
db "BETOBETON@@"
BattleTowerMons10:
; BattleTowerMons group 10
db HOUNDOOM
db MINT_BERRY

145
data/battle_tower/unknown.asm
View File

File diff suppressed because it is too large Load Diff

5
data/decorations/decorations.asm
View File

@ -48,7 +48,8 @@ DecorationIDs:
db DECO_BIG_SNORLAX_DOLL ; 1a
db DECO_BIG_ONIX_DOLL ; 1b
db DECO_BIG_LAPRAS_DOLL ; 1c
TrophyIDs:
db DECO_GOLD_TROPHY_DOLL ; 33
db DECO_SILVER_TROPHY_DOLL ; 34
db -1
db -1 ; end

96
data/maps/blocks.asm
View File

@ -15,7 +15,7 @@ Route44_Blocks:
Route28_Blocks:
INCBIN "maps/Route28.blk"
BetaPlayersHouse2F_Blocks:
BetaPlayersHouse2F_Blocks: ; unreferenced
INCBIN "maps/unused/BetaPlayersHouse2F.blk"
CeladonCity_Blocks:
@ -30,25 +30,25 @@ Route2_Blocks:
ElmsHouse_Blocks:
INCBIN "maps/ElmsHouse.blk"
BetaSproutTower1_Blocks:
BetaSproutTower1_Blocks: ; unreferenced
INCBIN "maps/unused/BetaSproutTower1.blk"
Route11_Blocks:
INCBIN "maps/Route11.blk"
BetaSproutTower5_Blocks:
BetaSproutTower5_Blocks: ; unreferenced
INCBIN "maps/unused/BetaSproutTower5.blk"
Route15_Blocks:
INCBIN "maps/Route15.blk"
BetaSproutTower9_Blocks:
BetaSproutTower9_Blocks: ; unreferenced
INCBIN "maps/unused/BetaSproutTower9.blk"
Route19_Blocks:
INCBIN "maps/Route19.blk"
BetaBlackthornCity_Blocks:
BetaBlackthornCity_Blocks: ; unreferenced
INCBIN "maps/unused/BetaBlackthornCity.blk"
Route10South_Blocks:
@ -94,7 +94,7 @@ Route25_Blocks:
Route24_Blocks:
INCBIN "maps/Route24.blk"
BetaVioletCity_Blocks:
BetaVioletCity_Blocks: ; unreferenced
INCBIN "maps/unused/BetaVioletCity.blk"
Route3_Blocks:
@ -103,25 +103,25 @@ Route3_Blocks:
PewterCity_Blocks:
INCBIN "maps/PewterCity.blk"
BetaSilverCaveOutside_Blocks:
BetaSilverCaveOutside_Blocks: ; unreferenced
INCBIN "maps/unused/BetaSilverCaveOutside.blk"
BetaSproutTower2_Blocks:
BetaSproutTower2_Blocks: ; unreferenced
INCBIN "maps/unused/BetaSproutTower2.blk"
Route12_Blocks:
INCBIN "maps/Route12.blk"
BetaGoldenrodCity_Blocks:
BetaGoldenrodCity_Blocks: ; unreferenced
INCBIN "maps/unused/BetaGoldenrodCity.blk"
Route20_Blocks:
INCBIN "maps/Route20.blk"
BetaSproutTower6_Blocks:
BetaSproutTower6_Blocks: ; unreferenced
INCBIN "maps/unused/BetaSproutTower6.blk"
BetaPokecenter_Blocks:
BetaPokecenter_Blocks: ; unreferenced
INCBIN "maps/unused/BetaPokecenter.blk"
Route30_Blocks:
@ -145,7 +145,7 @@ FuchsiaCity_Blocks:
Route38_Blocks:
INCBIN "maps/Route38.blk"
BetaCianwoodCity_Blocks:
BetaCianwoodCity_Blocks: ; unreferenced
INCBIN "maps/unused/BetaCianwoodCity.blk"
OlivineTimsHouse_Blocks:
@ -214,10 +214,10 @@ Route29Route46Gate_Blocks:
Route5SaffronGate_Blocks:
INCBIN "maps/NorthSouthGate.blk"
BetaEcruteakCity_Blocks:
BetaEcruteakCity_Blocks: ; unreferenced
INCBIN "maps/unused/BetaEcruteakCity.blk"
BetaCherrygroveCity_Blocks:
BetaCherrygroveCity_Blocks: ; unreferenced
INCBIN "maps/unused/BetaCherrygroveCity.blk"
CinnabarIsland_Blocks:
@ -229,7 +229,7 @@ Route4_Blocks:
Route8_Blocks:
INCBIN "maps/Route8.blk"
BetaSproutTower3_Blocks:
BetaSproutTower3_Blocks: ; unreferenced
INCBIN "maps/unused/BetaSproutTower3.blk"
ViridianCity_Blocks:
@ -241,13 +241,13 @@ Route13_Blocks:
Route21_Blocks:
INCBIN "maps/Route21.blk"
BetaSproutTower7_Blocks:
BetaSproutTower7_Blocks: ; unreferenced
INCBIN "maps/unused/BetaSproutTower7.blk"
Route17_Blocks:
INCBIN "maps/Route17.blk"
BetaMahoganyTown_Blocks:
BetaMahoganyTown_Blocks: ; unreferenced
INCBIN "maps/unused/BetaMahoganyTown.blk"
Route31_Blocks:
@ -280,16 +280,16 @@ Route17Route18Gate_Blocks:
Route31VioletGate_Blocks:
INCBIN "maps/EastWestGate.blk"
BetaAzaleaTown_Blocks:
BetaAzaleaTown_Blocks: ; unreferenced
INCBIN "maps/unused/BetaAzaleaTown.blk"
VermilionCity_Blocks:
INCBIN "maps/VermilionCity.blk"
BetaOlivineCity_Blocks:
BetaOlivineCity_Blocks: ; unreferenced
INCBIN "maps/unused/BetaOlivineCity.blk"
BetaNewBarkTown_Blocks:
BetaNewBarkTown_Blocks: ; unreferenced
INCBIN "maps/unused/BetaNewBarkTown.blk"
ElmsLab_Blocks:
@ -316,7 +316,7 @@ SECTION "Map Blocks 2", ROMX
Route14_Blocks:
INCBIN "maps/Route14.blk"
BetaSproutTower8_Blocks:
BetaSproutTower8_Blocks: ; unreferenced
INCBIN "maps/unused/BetaSproutTower8.blk"
OlivineMart_Blocks:
@ -337,7 +337,7 @@ CherrygroveMart_Blocks:
Route10North_Blocks:
INCBIN "maps/Route10North.blk"
BetaLakeOfRage_Blocks:
BetaLakeOfRage_Blocks: ; unreferenced
INCBIN "maps/unused/BetaLakeOfRage.blk"
OlivinePokecenter1F_Blocks:
@ -363,25 +363,25 @@ SaffronPokecenter1F_Blocks:
CherrygrovePokecenter1F_Blocks:
INCBIN "maps/Pokecenter1F.blk"
BetaPewterMuseumOfScience1F_Blocks:
BetaPewterMuseumOfScience1F_Blocks: ; unreferenced
INCBIN "maps/unused/BetaPewterMuseumOfScience1F.blk"
BetaPewterMuseumOfScience2F_Blocks:
BetaPewterMuseumOfScience2F_Blocks: ; unreferenced
INCBIN "maps/unused/BetaPewterMuseumOfScience2F.blk"
EarlsPokemonAcademy_Blocks:
INCBIN "maps/EarlsPokemonAcademy.blk"
BetaCinnabarPokemonLabHallway_Blocks:
BetaCinnabarPokemonLabHallway_Blocks: ; unreferenced
INCBIN "maps/unused/BetaCinnabarPokemonLabHallway.blk"
BetaCinnabarPokemonLabRoom1_Blocks:
BetaCinnabarPokemonLabRoom1_Blocks: ; unreferenced
INCBIN "maps/unused/BetaCinnabarPokemonLabRoom1.blk"
BetaCinnabarPokemonLabRoom2_Blocks:
BetaCinnabarPokemonLabRoom2_Blocks: ; unreferenced
INCBIN "maps/unused/BetaCinnabarPokemonLabRoom2.blk"
BetaCinnabarPokemonLabRoom3_Blocks:
BetaCinnabarPokemonLabRoom3_Blocks: ; unreferenced
INCBIN "maps/unused/BetaCinnabarPokemonLabRoom3.blk"
GoldenrodDeptStore1F_Blocks:
@ -424,7 +424,7 @@ CeladonMansion3F_Blocks:
CeladonMansionRoof_Blocks:
INCBIN "maps/CeladonMansionRoof.blk"
BetaHouse_Blocks:
BetaHouse_Blocks: ; unreferenced
INCBIN "maps/unused/BetaHouse.blk"
CeladonGameCorner_Blocks:
@ -446,7 +446,7 @@ VioletNicknameSpeechHouse_Blocks:
VioletKylesHouse_Blocks:
INCBIN "maps/House2.blk"
BetaUnionCave_Blocks:
BetaUnionCave_Blocks: ; unreferenced
INCBIN "maps/unused/BetaUnionCave.blk"
UnionCaveB1F_Blocks:
@ -466,7 +466,7 @@ Route5UndergroundPathEntrance_Blocks:
Route6UndergroundPathEntrance_Blocks:
INCBIN "maps/UndergroundPathEntrance.blk"
BetaCapsuleHouse_Blocks:
BetaCapsuleHouse_Blocks: ; unreferenced
INCBIN "maps/unused/BetaCapsuleHouse.blk"
KurtsHouse_Blocks:
@ -478,7 +478,7 @@ GoldenrodMagnetTrainStation_Blocks:
RuinsOfAlphOutside_Blocks:
INCBIN "maps/RuinsOfAlphOutside.blk"
BetaRuinsOfAlphUnsolvedPuzzleRoom_Blocks:
BetaRuinsOfAlphUnsolvedPuzzleRoom_Blocks: ; unreferenced
INCBIN "maps/unused/BetaRuinsOfAlphUnsolvedPuzzleRoom.blk"
RuinsOfAlphInnerChamber_Blocks:
@ -493,19 +493,19 @@ RuinsOfAlphAerodactylChamber_Blocks:
SproutTower1F_Blocks:
INCBIN "maps/SproutTower1F.blk"
BetaSproutTowerCutOut1_Blocks:
BetaSproutTowerCutOut1_Blocks: ; unreferenced
INCBIN "maps/unused/BetaSproutTowerCutOut1.blk"
SproutTower2F_Blocks:
INCBIN "maps/SproutTower2F.blk"
BetaSproutTowerCutOut2_Blocks:
BetaSproutTowerCutOut2_Blocks: ; unreferenced
INCBIN "maps/unused/BetaSproutTowerCutOut2.blk"
SproutTower3F_Blocks:
INCBIN "maps/SproutTower3F.blk"
BetaSproutTowerCutOut3_Blocks:
BetaSproutTowerCutOut3_Blocks: ; unreferenced
INCBIN "maps/unused/BetaSproutTowerCutOut3.blk"
RadioTower1F_Blocks:
@ -583,7 +583,7 @@ GoldenrodDeptStoreB1F_Blocks:
GoldenrodUndergroundWarehouse_Blocks:
INCBIN "maps/GoldenrodUndergroundWarehouse.blk"
BetaElevator_Blocks:
BetaElevator_Blocks: ; unreferenced
INCBIN "maps/unused/BetaElevator.blk"
TinTower1F_Blocks:
@ -622,7 +622,7 @@ BurnedTower1F_Blocks:
BurnedTowerB1F_Blocks:
INCBIN "maps/BurnedTowerB1F.blk"
BetaCaveTestMap_Blocks:
BetaCaveTestMap_Blocks: ; unreferenced
INCBIN "maps/unused/BetaCaveTestMap.blk"
MountMortar1FOutside_Blocks:
@ -685,16 +685,16 @@ SilverCaveRoom2_Blocks:
SilverCaveRoom3_Blocks:
INCBIN "maps/SilverCaveRoom3.blk"
BetaRocketHideoutB2F_Blocks:
BetaRocketHideoutB2F_Blocks: ; unreferenced
INCBIN "maps/unused/BetaRocketHideoutB2F.blk"
BetaRocketHideoutB1F_Blocks:
BetaRocketHideoutB1F_Blocks: ; unreferenced
INCBIN "maps/unused/BetaRocketHideoutB1F.blk"
BetaRocketHideout1F_Blocks:
BetaRocketHideout1F_Blocks: ; unreferenced
INCBIN "maps/unused/BetaRocketHideout1F.blk"
BetaRocketHideoutB3F_Blocks:
BetaRocketHideoutB3F_Blocks: ; unreferenced
INCBIN "maps/unused/BetaRocketHideoutB3F.blk"
MahoganyMart1F_Blocks:
@ -710,7 +710,7 @@ TeamRocketBaseB2F_Blocks:
TeamRocketBaseB3F_Blocks:
INCBIN "maps/TeamRocketBaseB3F.blk"
BetaRoute23_Blocks:
BetaRoute23_Blocks: ; unreferenced
INCBIN "maps/unused/BetaRoute23.blk"
IndigoPlateauPokecenter1F_Blocks:
@ -746,7 +746,7 @@ MahoganyGym_Blocks:
OlivineGym_Blocks:
INCBIN "maps/OlivineGym.blk"
BetaUnknownGym_Blocks:
BetaUnknownGym_Blocks: ; unreferenced
INCBIN "maps/unused/BetaUnknownGym.blk"
CianwoodGym_Blocks:
@ -779,7 +779,7 @@ OlivineLighthouse6F_Blocks:
SECTION "Map Blocks 3", ROMX
BetaSlowpokeWell1F_Blocks:
BetaSlowpokeWell1F_Blocks: ; unreferenced
INCBIN "maps/unused/BetaSlowpokeWell1F.blk"
SlowpokeWellB1F_Blocks:
@ -824,7 +824,7 @@ FastShip1F_Blocks:
FastShipB1F_Blocks:
INCBIN "maps/FastShipB1F.blk"
BetaFastShipInsideCutOut_Blocks:
BetaFastShipInsideCutOut_Blocks: ; unreferenced
INCBIN "maps/unused/BetaFastShipInsideCutOut.blk"
FastShipCabins_NNW_NNE_NE_Blocks:
@ -913,13 +913,13 @@ PewterGym_Blocks:
CeladonGym_Blocks:
INCBIN "maps/CeladonGym.blk"
BetaCeladonMansion1F_Blocks:
BetaCeladonMansion1F_Blocks: ; unreferenced
INCBIN "maps/unused/BetaCeladonMansion1F.blk"
CeladonCafe_Blocks:
INCBIN "maps/CeladonCafe.blk"
BetaCeladonMansion2F_Blocks:
BetaCeladonMansion2F_Blocks: ; unreferenced
INCBIN "maps/unused/BetaCeladonMansion2F.blk"
RockTunnel1F_Blocks:
@ -1040,7 +1040,7 @@ BattleTowerElevator_Blocks:
BattleTowerOutside_Blocks:
INCBIN "maps/BattleTowerOutside.blk"
BetaBlank_Blocks:
BetaBlank_Blocks: ; unreferenced
INCBIN "maps/unused/BetaBlank.blk"
GoldenrodDeptStoreRoof_Blocks:

12
data/maps/landmarks.asm
View File

@ -128,7 +128,7 @@ WhirlIslandsName: db "WHIRL¯ISLANDS@"
MtMortarName: db "MT.MORTAR@"
DragonsDenName: db "DRAGON'S¯DEN@"
IcePathName: db "ICE PATH@"
NotApplicableName: db "N/A@" ; "オバケやしき" ("HAUNTED HOUSE") in Japanese
NotApplicableName: db "N/A@" ; unreferenced ; "オバケやしき" ("HAUNTED HOUSE") in Japanese
PalletTownName: db "PALLET TOWN@"
ViridianCityName: db "VIRIDIAN¯CITY@"
PewterCityName: db "PEWTER CITY@"
@ -144,11 +144,11 @@ VictoryRoadName: db "VICTORY¯ROAD@"
MtMoonName: db "MT.MOON@"
RockTunnelName: db "ROCK TUNNEL@"
LavRadioTowerName: db "LAV¯RADIO TOWER@"
SilphCoName: db "SILPH CO.@"
SafariZoneName: db "SAFARI ZONE@"
SilphCoName: db "SILPH CO.@" ; unreferenced
SafariZoneName: db "SAFARI ZONE@" ; unreferenced
SeafoamIslandsName: db "SEAFOAM¯ISLANDS@"
PokemonMansionName: db "#MON¯MANSION@"
CeruleanCaveName: db "CERULEAN¯CAVE@"
PokemonMansionName: db "#MON¯MANSION@" ; unreferenced
CeruleanCaveName: db "CERULEAN¯CAVE@" ; unreferenced
Route1Name: db "ROUTE 1@"
Route2Name: db "ROUTE 2@"
Route3Name: db "ROUTE 3@"
@ -199,7 +199,7 @@ DarkCaveName: db "DARK CAVE@"
IlexForestName: db "ILEX¯FOREST@"
BurnedTowerName: db "BURNED¯TOWER@"
FastShipName: db "FAST SHIP@"
ViridianForestName: db "VIRIDIAN¯FOREST@"
ViridianForestName: db "VIRIDIAN¯FOREST@" ; unreferenced
DiglettsCaveName: db "DIGLETT'S¯CAVE@"
TohjoFallsName: db "TOHJO FALLS@"
UndergroundName: db "UNDERGROUND@"

6
data/moves/animations.asm
View File

@ -481,7 +481,7 @@ BattleAnim_SendOutMon:
BattleAnim_ReturnMon:
anim_sound 0, 0, SFX_BALL_POOF
.anim:
BattleAnimSub_Return:
anim_bgeffect ANIM_BG_RETURN_MON, $0, BG_EFFECT_USER, $0
anim_wait 32
anim_ret
@ -1314,7 +1314,7 @@ BattleAnim_RazorWind:
anim_wait 24
anim_ret
BattleAnim_Sonicboom_JP:
BattleAnim_Sonicboom_JP: ; unreferenced
anim_2gfx ANIM_GFX_WHIP, ANIM_GFX_HIT
.loop
anim_sound 3, 0, SFX_RAZOR_WIND
@ -4106,7 +4106,7 @@ BattleAnim_BatonPass:
anim_1gfx ANIM_GFX_MISC
anim_obj ANIM_OBJ_BATON_PASS, 44, 104, $20
anim_sound 0, 0, SFX_BATON_PASS
anim_call BattleAnim_ReturnMon.anim
anim_call BattleAnimSub_Return
anim_wait 64
anim_ret

1
data/phone/text/elm.asm
View File

@ -197,7 +197,6 @@ ElmPhoneGiftText:
para "See you later!"
done
; unused
ElmPhoneGotAholdOfSomethingNeatText:
text "Hello, <PLAY_G>?"
line "How's it going?"

5
data/phone/text/todd_overworld.asm
View File

@ -57,9 +57,8 @@ ToddRematchText:
line "my #MON better!"
done
UnusedText_0xa43ca:
; This is unused; Todd says this during the department store sale,
; but this is a duplicate of the actual string in the Route 34 scripts.
ToddSaleText: ; unreferenced
; This is a duplicate of CamperToddSaleText in maps/Route34.asm.
text "Shopping under the"
line "sky!"

2
data/text/battle.asm
View File

@ -1102,7 +1102,7 @@ BattleText_LinkErrorBattleCanceled:
line "been canceled…"
prompt
BattleText_0x8188e:
BattleText_NoTimeLeftToday: ; unreferenced
text "There is no time"
line "left today!"
done

1
data/text/common_1.asm
View File

@ -463,7 +463,6 @@ _MobileForPartnersMonText::
text "."
done
; unreferenced
_MobilePlayersMonTradeText::
text_ram wPlayerTrademonSenderName
text "'s"

5
data/text/common_2.asm
View File

@ -263,12 +263,12 @@ _MysteryGiftSentHomeText::
_MysteryGiftReceivedCardText::
text "Received"
line "@"
text_ram wc850
text_ram wMysteryGiftCardHolderName
text "'s CARD."
prompt
_MysteryGiftListedCardText::
text_ram wc850
text_ram wMysteryGiftCardHolderName
text "'s CARD was"
line "listed as no.@"
text_decimal wDeciramBuffer, 1, 2
@ -487,7 +487,6 @@ _RodNothingText::
text "Not even a nibble!"
prompt
; unreferenced
_UnusedNothingHereText::
text "Looks like there's"
line "nothing here."

Some files were not shown because too many files have changed in this diff Show More