From 46f6cc4d41494c044f1091491c712afc2a5bfd3a Mon Sep 17 00:00:00 2001 From: Rangi Date: Fri, 23 Oct 2020 20:39:20 -0400 Subject: Comment, remove, or revise many unreferenced labels --- data/decorations/decorations.asm | 5 ++- data/maps/blocks.asm | 94 ++++++++++++++++++++-------------------- data/maps/landmarks.asm | 12 ++--- data/moves/animations.asm | 6 +-- data/phone/text/elm.asm | 1 - data/phone/text/landmarks.asm | 89 ++++++++++--------------------------- data/sprite_anims/oam.asm | 7 ++- data/text/common_2.asm | 1 - data/text/unused_sweet_honey.asm | 16 +++---- 9 files changed, 92 insertions(+), 139 deletions(-) (limited to 'data') diff --git a/data/decorations/decorations.asm b/data/decorations/decorations.asm index 947bca1b..e3ec28f1 100644 --- a/data/decorations/decorations.asm +++ b/data/decorations/decorations.asm @@ -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 diff --git a/data/maps/blocks.asm b/data/maps/blocks.asm index 94c8ff86..38297736 100644 --- a/data/maps/blocks.asm +++ b/data/maps/blocks.asm @@ -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" RuinsOfAlphHoOhChamber_Blocks: @@ -493,19 +493,19 @@ RuinsOfAlphInnerChamber_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: diff --git a/data/maps/landmarks.asm b/data/maps/landmarks.asm index 8e25aca2..2ab7fcff 100644 --- a/data/maps/landmarks.asm +++ b/data/maps/landmarks.asm @@ -127,7 +127,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@" @@ -143,11 +143,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@" @@ -198,7 +198,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@" diff --git a/data/moves/animations.asm b/data/moves/animations.asm index 379b897c..e215957a 100644 --- a/data/moves/animations.asm +++ b/data/moves/animations.asm @@ -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 @@ -4104,7 +4104,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 diff --git a/data/phone/text/elm.asm b/data/phone/text/elm.asm index a1450ca2..9fb91821 100644 --- a/data/phone/text/elm.asm +++ b/data/phone/text/elm.asm @@ -197,7 +197,6 @@ ElmPhoneGiftText: para "See you later!" done -; unused ElmPhoneGotAholdOfSomethingNeatText: text "Hello, ?" line "How's it going?" diff --git a/data/phone/text/landmarks.asm b/data/phone/text/landmarks.asm index 175f6111..4943c3b1 100644 --- a/data/phone/text/landmarks.asm +++ b/data/phone/text/landmarks.asm @@ -1,67 +1,22 @@ -PhoneNationalParkText: - db "NATIONAL PARK@" - -PhoneLighthouseText: - db "LIGHTHOUSE@" - -; unreferenced -PhoneUndergroundText: - db "UNDERGROUND@" - -PhoneDarkCaveText: - db "DARK CAVE@" - -PhoneMtMortarText: - db "MT.MORTAR@" - -PhoneRoute26Text: - db "ROUTE 26@" - -PhoneRoute27Text: - db "ROUTE 27@" - -PhoneRoute30Text: - db "ROUTE 30@" - -PhoneRoute31Text: - db "ROUTE 31@" - -PhoneRoute32Text: - db "ROUTE 32@" - -PhoneRoute33Text: - db "ROUTE 33@" - -PhoneRoute34Text: - db "ROUTE 34@" - -PhoneRoute35Text: - db "ROUTE 35@" - -PhoneRoute36Text: - db "ROUTE 36@" - -; unreferenced -PhoneRoute37Text: - db "ROUTE 37@" - -PhoneRoute38Text: - db "ROUTE 38@" - -PhoneRoute39Text: - db "ROUTE 39@" - -PhoneRoute42Text: - db "ROUTE 42@" - -PhoneRoute43Text: - db "ROUTE 43@" - -PhoneRoute44Text: - db "ROUTE 44@" - -PhoneRoute45Text: - db "ROUTE 45@" - -PhoneRoute46Text: - db "ROUTE 46@" +PhoneNationalParkText: db "NATIONAL PARK@" +PhoneLighthouseText: db "LIGHTHOUSE@" +PhoneUndergroundText: db "UNDERGROUND@" ; unreferenced +PhoneDarkCaveText: db "DARK CAVE@" +PhoneMtMortarText: db "MT.MORTAR@" +PhoneRoute26Text: db "ROUTE 26@" +PhoneRoute27Text: db "ROUTE 27@" +PhoneRoute30Text: db "ROUTE 30@" +PhoneRoute31Text: db "ROUTE 31@" +PhoneRoute32Text: db "ROUTE 32@" +PhoneRoute33Text: db "ROUTE 33@" +PhoneRoute34Text: db "ROUTE 34@" +PhoneRoute35Text: db "ROUTE 35@" +PhoneRoute36Text: db "ROUTE 36@" +PhoneRoute37Text: db "ROUTE 37@" ; unreferenced +PhoneRoute38Text: db "ROUTE 38@" +PhoneRoute39Text: db "ROUTE 39@" +PhoneRoute42Text: db "ROUTE 42@" +PhoneRoute43Text: db "ROUTE 43@" +PhoneRoute44Text: db "ROUTE 44@" +PhoneRoute45Text: db "ROUTE 45@" +PhoneRoute46Text: db "ROUTE 46@" diff --git a/data/sprite_anims/oam.asm b/data/sprite_anims/oam.asm index cc43267d..2af73fe0 100644 --- a/data/sprite_anims/oam.asm +++ b/data/sprite_anims/oam.asm @@ -762,7 +762,7 @@ ELIF DEF(_SILVER) dbsprite 3, -2, 0, 0, $1c, 0 dbsprite 4, -2, 0, 0, $1e, 0 -.OAMData_GSIntroLugia3: +.OAMData_GSIntroLugia3: ; unreferenced db 17 dbsprite -5, -2, 0, 0, $3c, 0 dbsprite -5, 0, 0, 0, $3e, 0 @@ -782,7 +782,7 @@ ELIF DEF(_SILVER) dbsprite 3, -1, 0, 0, $56, 0 dbsprite 4, -1, 0, 0, $58, 0 -.OAMData_GSIntroLugia4: +.OAMData_GSIntroLugia4: ; unreferenced db 17 dbsprite -5, -2, 0, 0, $5a, 0 dbsprite -5, 0, 0, 0, $5c, 0 @@ -802,8 +802,7 @@ ELIF DEF(_SILVER) dbsprite 3, -1, 0, 0, $74, 0 dbsprite 4, -1, 0, 0, $76, 0 -; unused / copy of intro4 -.OAMData_GSIntroLugia5: +.OAMData_GSIntroLugia5: ; unreferenced db 17 dbsprite -5, -2, 0, 0, $5a, 0 dbsprite -5, 0, 0, 0, $5c, 0 diff --git a/data/text/common_2.asm b/data/text/common_2.asm index 5f5f0e5d..6963e2a8 100644 --- a/data/text/common_2.asm +++ b/data/text/common_2.asm @@ -160,7 +160,6 @@ _RodNothingText:: text "Not even a nibble!" prompt -; unreferenced _UnusedNothingHereText:: text "Looks like there's" line "nothing here." diff --git a/data/text/unused_sweet_honey.asm b/data/text/unused_sweet_honey.asm index 04ceae2e..d4970118 100644 --- a/data/text/unused_sweet_honey.asm +++ b/data/text/unused_sweet_honey.asm @@ -8,7 +8,7 @@ ; Most of these texts seem to be associated with a single NPC. ; The last text is associated with a second NPC, probably a Butterfree. -UnusedSweetHoneyText: +UnusedSweetHoneyText: ; unreferenced text "My #MON is an" line "expert at collect-" cont "ing SWEET HONEY." @@ -17,7 +17,7 @@ UnusedSweetHoneyText: line "with you." done -UnusedSweetHoneyBagFullText: +UnusedSweetHoneyBagFullText: ; unreferenced text "I want to give you" line "some SWEET HONEY," @@ -25,17 +25,17 @@ UnusedSweetHoneyBagFullText: line "room for it." done -UnusedSweetHoneyGiveText: +UnusedSweetHoneyGiveText: ; unreferenced text "Here you go! Have" line "some SWEET HONEY!" done -UnusedGotSweetHoneyText: +UnusedGotSweetHoneyText: ; unreferenced text " received" line "SWEET HONEY." done -UnusedSweetHoneyAfterText1: +UnusedSweetHoneyAfterText1: ; unreferenced text "My little brother" line "takes SWEET HONEY" @@ -46,7 +46,7 @@ UnusedSweetHoneyAfterText1: line "up to?" done -UnusedSweetHoneyAfterText2: +UnusedSweetHoneyAfterText2: ; unreferenced text "Did you put SWEET" line "HONEY on a tree?" @@ -54,7 +54,7 @@ UnusedSweetHoneyAfterText2: line "it?" done -UnusedSweetHoneyAfterText3: +UnusedSweetHoneyAfterText3: ; unreferenced text "Did you put SWEET" line "HONEY on a tree?" @@ -63,6 +63,6 @@ UnusedSweetHoneyAfterText3: cont "be drawn to it." done -UnusedSweetHoneyButterfreeText: +UnusedSweetHoneyButterfreeText: ; unreferenced text "BUTTERFREE: Freeh!" done -- cgit v1.2.3 From 6e142eb5b365659ec9e13360b663037cbfa615af Mon Sep 17 00:00:00 2001 From: Rangi Date: Tue, 27 Oct 2020 10:00:51 -0400 Subject: Create data/collision/ for tile collision-related data --- data/collision/collision_permissions.asm | 258 +++++++++++++++++++++++++++++++ data/collision/collision_stdscripts.asm | 18 +++ data/collision/field_move_blocks.asm | 55 +++++++ data/collision_permissions.asm | 258 ------------------------------- data/events/collision_stdscripts.asm | 18 --- data/events/field_move_blocks.asm | 52 ------- 6 files changed, 331 insertions(+), 328 deletions(-) create mode 100644 data/collision/collision_permissions.asm create mode 100644 data/collision/collision_stdscripts.asm create mode 100644 data/collision/field_move_blocks.asm delete mode 100644 data/collision_permissions.asm delete mode 100644 data/events/collision_stdscripts.asm delete mode 100644 data/events/field_move_blocks.asm (limited to 'data') diff --git a/data/collision/collision_permissions.asm b/data/collision/collision_permissions.asm new file mode 100644 index 00000000..57172ca5 --- /dev/null +++ b/data/collision/collision_permissions.asm @@ -0,0 +1,258 @@ +TileCollisionTable:: +; entries correspond to COLL_* constants + db LAND_TILE ; COLL_FLOOR + db LAND_TILE ; COLL_01 + db LAND_TILE ; 02 + db LAND_TILE ; COLL_03 + db LAND_TILE ; COLL_04 + db LAND_TILE ; 05 + db LAND_TILE ; 06 + db WALL_TILE ; COLL_WALL + db LAND_TILE ; COLL_CUT_08 + db LAND_TILE ; 09 + db LAND_TILE ; 0a + db LAND_TILE ; 0b + db LAND_TILE ; 0c + db LAND_TILE ; 0d + db LAND_TILE ; 0e + db WALL_TILE ; 0f + db LAND_TILE ; COLL_TALL_GRASS_10 + db LAND_TILE ; 11 + db WALL_TILE | TALK ; COLL_CUT_TREE + db LAND_TILE ; 13 + db LAND_TILE ; COLL_LONG_GRASS + db WALL_TILE | TALK ; COLL_HEADBUTT_TREE + db LAND_TILE ; 16 + db LAND_TILE ; 17 + db LAND_TILE ; COLL_TALL_GRASS + db LAND_TILE ; 19 + db WALL_TILE | TALK ; COLL_CUT_TREE_1A + db LAND_TILE ; 1b + db LAND_TILE ; COLL_LONG_GRASS_1C + db WALL_TILE | TALK ; COLL_HEADBUTT_TREE_1D + db LAND_TILE ; 1e + db LAND_TILE ; 1f + db WATER_TILE ; 20 + db WATER_TILE ; COLL_WATER_21 + db WATER_TILE | TALK ; 22 + db LAND_TILE ; COLL_ICE + db WATER_TILE | TALK ; COLL_WHIRLPOOL + db WATER_TILE ; 25 + db WATER_TILE ; 26 + db WALL_TILE ; COLL_BUOY + db WATER_TILE ; COLL_CUT_28 + db WATER_TILE ; COLL_WATER + db WATER_TILE | TALK ; 2a + db LAND_TILE ; COLL_ICE_2B + db WATER_TILE | TALK ; COLL_WHIRLPOOL_2C + db WATER_TILE ; 2d + db WATER_TILE ; 2e + db WALL_TILE ; 2f + db WATER_TILE ; COLL_WATERFALL_RIGHT + db WATER_TILE ; COLL_WATERFALL_LEFT + db WATER_TILE ; COLL_WATERFALL_UP + db WATER_TILE ; COLL_WATERFALL + db WATER_TILE ; 34 + db WATER_TILE ; 35 + db WATER_TILE ; 36 + db WATER_TILE ; 37 + db WATER_TILE ; COLL_CURRENT_RIGHT + db WATER_TILE ; COLL_CURRENT_LEFT + db WATER_TILE ; COLL_CURRENT_UP + db WATER_TILE ; COLL_CURRENT_DOWN + db WATER_TILE ; 3c + db WATER_TILE ; 3d + db WATER_TILE ; 3e + db WATER_TILE ; 3f + db LAND_TILE ; COLL_BRAKE + db LAND_TILE ; COLL_WALK_RIGHT + db LAND_TILE ; COLL_WALK_LEFT + db LAND_TILE ; COLL_WALK_UP + db LAND_TILE ; COLL_WALK_DOWN + db LAND_TILE ; COLL_BRAKE_45 + db LAND_TILE ; COLL_BRAKE_46 + db LAND_TILE ; COLL_BRAKE_47 + db LAND_TILE ; COLL_GRASS_48 + db LAND_TILE ; COLL_GRASS_49 + db LAND_TILE ; COLL_GRASS_4A + db LAND_TILE ; COLL_GRASS_4B + db LAND_TILE ; COLL_GRASS_4C + db LAND_TILE ; 4d + db LAND_TILE ; 4e + db LAND_TILE ; 4f + db LAND_TILE ; COLL_WALK_RIGHT_ALT + db LAND_TILE ; COLL_WALK_LEFT_ALT + db LAND_TILE ; COLL_WALK_UP_ALT + db LAND_TILE ; COLL_WALK_DOWN_ALT + db LAND_TILE ; COLL_BRAKE_ALT + db LAND_TILE ; COLL_BRAKE_55 + db LAND_TILE ; COLL_BRAKE_56 + db LAND_TILE ; COLL_BRAKE_57 + db LAND_TILE ; 58 + db LAND_TILE ; 59 + db LAND_TILE ; 5a + db LAND_TILE ; COLL_5B + db LAND_TILE ; 5c + db LAND_TILE ; 5d + db LAND_TILE ; 5e + db LAND_TILE ; 5f + db LAND_TILE ; COLL_PIT + db LAND_TILE ; COLL_VIRTUAL_BOY + db WALL_TILE ; 62 + db LAND_TILE ; 63 + db LAND_TILE ; COLL_64 + db LAND_TILE ; COLL_65 + db LAND_TILE ; 66 + db LAND_TILE ; 67 + db LAND_TILE ; COLL_PIT_68 + db LAND_TILE ; 69 + db WALL_TILE ; 6a + db LAND_TILE ; 6b + db LAND_TILE ; 6c + db LAND_TILE ; 6d + db LAND_TILE ; 6e + db LAND_TILE ; 6f + db LAND_TILE ; COLL_WARP_CARPET_DOWN + db LAND_TILE ; COLL_DOOR + db LAND_TILE ; COLL_LADDER + db LAND_TILE ; COLL_STAIRCASE_73 + db LAND_TILE ; COLL_CAVE_74 + db LAND_TILE ; COLL_DOOR_75 + db LAND_TILE ; COLL_WARP_CARPET_LEFT + db LAND_TILE ; COLL_WARP_77 + db LAND_TILE ; COLL_WARP_CARPET_UP + db LAND_TILE ; COLL_DOOR_79 + db LAND_TILE ; COLL_STAIRCASE + db LAND_TILE ; COLL_CAVE + db LAND_TILE ; COLL_WARP_PANEL + db LAND_TILE ; COLL_DOOR_7D + db LAND_TILE ; COLL_WARP_CARPET_RIGHT + db LAND_TILE ; COLL_WARP_7F + db WALL_TILE ; 80 + db WALL_TILE ; 81 + db WALL_TILE ; 82 + db WALL_TILE ; 83 + db WALL_TILE ; 84 + db LAND_TILE ; 85 + db LAND_TILE ; 86 + db LAND_TILE ; 87 + db WALL_TILE ; 88 + db WALL_TILE ; 89 + db WALL_TILE ; 8a + db WALL_TILE ; 8b + db WALL_TILE ; 8c + db LAND_TILE ; 8d + db LAND_TILE ; 8e + db LAND_TILE ; 8f + db WALL_TILE ; COLL_COUNTER + db WALL_TILE ; COLL_BOOKSHELF + db WALL_TILE ; 92 + db WALL_TILE ; COLL_PC + db WALL_TILE ; COLL_RADIO + db WALL_TILE ; COLL_TOWN_MAP + db WALL_TILE ; COLL_MART_SHELF + db WALL_TILE ; COLL_TV + db WALL_TILE ; COLL_COUNTER_98 + db WALL_TILE ; 99 + db WALL_TILE ; 9a + db WALL_TILE ; 9b + db WALL_TILE ; COLL_9C + db WALL_TILE ; COLL_WINDOW + db WALL_TILE ; 9e + db WALL_TILE ; COLL_INCENSE_BURNER + db LAND_TILE ; COLL_HOP_RIGHT + db LAND_TILE ; COLL_HOP_LEFT + db LAND_TILE ; COLL_HOP_UP + db LAND_TILE ; COLL_HOP_DOWN + db LAND_TILE ; COLL_HOP_DOWN_RIGHT + db LAND_TILE ; COLL_HOP_DOWN_LEFT + db LAND_TILE ; COLL_HOP_UP_RIGHT + db LAND_TILE ; COLL_HOP_UP_LEFT + db LAND_TILE ; a8 + db LAND_TILE ; a9 + db LAND_TILE ; aa + db LAND_TILE ; ab + db LAND_TILE ; ac + db LAND_TILE ; ad + db LAND_TILE ; ae + db LAND_TILE ; af + db LAND_TILE ; COLL_RIGHT_WALL + db LAND_TILE ; COLL_LEFT_WALL + db LAND_TILE ; COLL_UP_WALL + db LAND_TILE ; COLL_DOWN_WALL + db LAND_TILE ; COLL_DOWN_RIGHT_WALL + db LAND_TILE ; COLL_DOWN_LEFT_WALL + db LAND_TILE ; COLL_UP_RIGHT_WALL + db LAND_TILE ; COLL_UP_LEFT_WALL + db LAND_TILE ; b8 + db LAND_TILE ; b9 + db LAND_TILE ; ba + db LAND_TILE ; bb + db LAND_TILE ; bc + db LAND_TILE ; bd + db LAND_TILE ; be + db LAND_TILE ; bf + db WATER_TILE ; COLL_RIGHT_BUOY + db WATER_TILE ; COLL_LEFT_BUOY + db WATER_TILE ; COLL_UP_BUOY + db WATER_TILE ; COLL_DOWN_BUOY + db WATER_TILE ; COLL_DOWN_RIGHT_BUOY + db WATER_TILE ; COLL_DOWN_LEFT_BUOY + db WATER_TILE ; COLL_UP_RIGHT_BUOY + db WATER_TILE ; COLL_UP_LEFT_BUOY + db WATER_TILE ; c8 + db WATER_TILE ; c9 + db WATER_TILE ; ca + db WATER_TILE ; cb + db WATER_TILE ; cc + db WATER_TILE ; cd + db WATER_TILE ; ce + db WATER_TILE ; cf + db LAND_TILE ; d0 + db LAND_TILE ; d1 + db LAND_TILE ; d2 + db LAND_TILE ; d3 + db LAND_TILE ; d4 + db LAND_TILE ; d5 + db LAND_TILE ; d6 + db LAND_TILE ; d7 + db LAND_TILE ; d8 + db LAND_TILE ; d9 + db LAND_TILE ; da + db LAND_TILE ; db + db LAND_TILE ; dc + db LAND_TILE ; dd + db LAND_TILE ; de + db LAND_TILE ; df + db LAND_TILE ; e0 + db LAND_TILE ; e1 + db LAND_TILE ; e2 + db LAND_TILE ; e3 + db LAND_TILE ; e4 + db LAND_TILE ; e5 + db LAND_TILE ; e6 + db LAND_TILE ; e7 + db LAND_TILE ; e8 + db LAND_TILE ; e9 + db LAND_TILE ; ea + db LAND_TILE ; eb + db LAND_TILE ; ec + db LAND_TILE ; ed + db LAND_TILE ; ee + db LAND_TILE ; ef + db LAND_TILE ; f0 + db LAND_TILE ; f1 + db LAND_TILE ; f2 + db LAND_TILE ; f3 + db LAND_TILE ; f4 + db LAND_TILE ; f5 + db LAND_TILE ; f6 + db LAND_TILE ; f7 + db LAND_TILE ; f8 + db LAND_TILE ; f9 + db LAND_TILE ; fa + db LAND_TILE ; fb + db LAND_TILE ; fc + db LAND_TILE ; fd + db LAND_TILE ; fe + db WALL_TILE ; COLL_FF diff --git a/data/collision/collision_stdscripts.asm b/data/collision/collision_stdscripts.asm new file mode 100644 index 00000000..5c94c62f --- /dev/null +++ b/data/collision/collision_stdscripts.asm @@ -0,0 +1,18 @@ +; std scripts associated with tile collisions + +stdcoll: MACRO + db \1 + dw (\2StdScript - StdScripts) / 3 +ENDM + +TileCollisionStdScripts: + ; collision type, std script + stdcoll COLL_BOOKSHELF, MagazineBookshelfScript + stdcoll COLL_PC, PCScript + stdcoll COLL_RADIO, Radio1Script + stdcoll COLL_TOWN_MAP, TownMapScript + stdcoll COLL_MART_SHELF, MerchandiseShelfScript + stdcoll COLL_TV, TVScript + stdcoll COLL_WINDOW, WindowScript + stdcoll COLL_INCENSE_BURNER, IncenseBurnerScript + db -1 ; end diff --git a/data/collision/field_move_blocks.asm b/data/collision/field_move_blocks.asm new file mode 100644 index 00000000..444be14b --- /dev/null +++ b/data/collision/field_move_blocks.asm @@ -0,0 +1,55 @@ +; these blocks all use COLL_CUT_TREE in one quadrant +CutTreeBlockPointers: +; tileset, block list pointer + dbw TILESET_JOHTO, .johto + dbw TILESET_JOHTO_MODERN, .johto_modern + dbw TILESET_KANTO, .kanto + dbw TILESET_PARK, .park + dbw TILESET_FOREST, .forest + db -1 ; end + +.johto: +; facing block, replacement block, animation + db $03, $02, 1 ; grass + db $5b, $3c, 0 ; tree + db $5f, $3d, 0 ; tree + db $63, $3f, 0 ; tree + db $67, $3e, 0 ; tree + db -1 ; end + +.johto_modern: +; facing block, replacement block, animation + db $03, $02, $01 ; grass + db -1 ; end + +.kanto: +; facing block, replacement block, animation + db $0b, $0a, 1 ; grass + db $32, $6d, 0 ; tree + db $33, $6c, 0 ; tree + db $34, $6f, 0 ; tree + db $35, $4c, 0 ; tree + db $60, $6e, 0 ; tree + db -1 ; end + +.park: +; facing block, replacement block, animation + db $13, $03, 1 ; grass + db $03, $04, 1 ; grass + db -1 ; end + +.forest: +; facing block, replacement block, animation + db $0f, $17, 0 + db -1 ; end + + +; these blocks all use COLL_WHIRLPOOL in one quadrant +WhirlpoolBlockPointers: + dbw TILESET_JOHTO, .johto + db -1 ; end + +.johto: +; facing block, replacement block, animation + db $07, $36, 0 + db -1 ; end diff --git a/data/collision_permissions.asm b/data/collision_permissions.asm deleted file mode 100644 index 57172ca5..00000000 --- a/data/collision_permissions.asm +++ /dev/null @@ -1,258 +0,0 @@ -TileCollisionTable:: -; entries correspond to COLL_* constants - db LAND_TILE ; COLL_FLOOR - db LAND_TILE ; COLL_01 - db LAND_TILE ; 02 - db LAND_TILE ; COLL_03 - db LAND_TILE ; COLL_04 - db LAND_TILE ; 05 - db LAND_TILE ; 06 - db WALL_TILE ; COLL_WALL - db LAND_TILE ; COLL_CUT_08 - db LAND_TILE ; 09 - db LAND_TILE ; 0a - db LAND_TILE ; 0b - db LAND_TILE ; 0c - db LAND_TILE ; 0d - db LAND_TILE ; 0e - db WALL_TILE ; 0f - db LAND_TILE ; COLL_TALL_GRASS_10 - db LAND_TILE ; 11 - db WALL_TILE | TALK ; COLL_CUT_TREE - db LAND_TILE ; 13 - db LAND_TILE ; COLL_LONG_GRASS - db WALL_TILE | TALK ; COLL_HEADBUTT_TREE - db LAND_TILE ; 16 - db LAND_TILE ; 17 - db LAND_TILE ; COLL_TALL_GRASS - db LAND_TILE ; 19 - db WALL_TILE | TALK ; COLL_CUT_TREE_1A - db LAND_TILE ; 1b - db LAND_TILE ; COLL_LONG_GRASS_1C - db WALL_TILE | TALK ; COLL_HEADBUTT_TREE_1D - db LAND_TILE ; 1e - db LAND_TILE ; 1f - db WATER_TILE ; 20 - db WATER_TILE ; COLL_WATER_21 - db WATER_TILE | TALK ; 22 - db LAND_TILE ; COLL_ICE - db WATER_TILE | TALK ; COLL_WHIRLPOOL - db WATER_TILE ; 25 - db WATER_TILE ; 26 - db WALL_TILE ; COLL_BUOY - db WATER_TILE ; COLL_CUT_28 - db WATER_TILE ; COLL_WATER - db WATER_TILE | TALK ; 2a - db LAND_TILE ; COLL_ICE_2B - db WATER_TILE | TALK ; COLL_WHIRLPOOL_2C - db WATER_TILE ; 2d - db WATER_TILE ; 2e - db WALL_TILE ; 2f - db WATER_TILE ; COLL_WATERFALL_RIGHT - db WATER_TILE ; COLL_WATERFALL_LEFT - db WATER_TILE ; COLL_WATERFALL_UP - db WATER_TILE ; COLL_WATERFALL - db WATER_TILE ; 34 - db WATER_TILE ; 35 - db WATER_TILE ; 36 - db WATER_TILE ; 37 - db WATER_TILE ; COLL_CURRENT_RIGHT - db WATER_TILE ; COLL_CURRENT_LEFT - db WATER_TILE ; COLL_CURRENT_UP - db WATER_TILE ; COLL_CURRENT_DOWN - db WATER_TILE ; 3c - db WATER_TILE ; 3d - db WATER_TILE ; 3e - db WATER_TILE ; 3f - db LAND_TILE ; COLL_BRAKE - db LAND_TILE ; COLL_WALK_RIGHT - db LAND_TILE ; COLL_WALK_LEFT - db LAND_TILE ; COLL_WALK_UP - db LAND_TILE ; COLL_WALK_DOWN - db LAND_TILE ; COLL_BRAKE_45 - db LAND_TILE ; COLL_BRAKE_46 - db LAND_TILE ; COLL_BRAKE_47 - db LAND_TILE ; COLL_GRASS_48 - db LAND_TILE ; COLL_GRASS_49 - db LAND_TILE ; COLL_GRASS_4A - db LAND_TILE ; COLL_GRASS_4B - db LAND_TILE ; COLL_GRASS_4C - db LAND_TILE ; 4d - db LAND_TILE ; 4e - db LAND_TILE ; 4f - db LAND_TILE ; COLL_WALK_RIGHT_ALT - db LAND_TILE ; COLL_WALK_LEFT_ALT - db LAND_TILE ; COLL_WALK_UP_ALT - db LAND_TILE ; COLL_WALK_DOWN_ALT - db LAND_TILE ; COLL_BRAKE_ALT - db LAND_TILE ; COLL_BRAKE_55 - db LAND_TILE ; COLL_BRAKE_56 - db LAND_TILE ; COLL_BRAKE_57 - db LAND_TILE ; 58 - db LAND_TILE ; 59 - db LAND_TILE ; 5a - db LAND_TILE ; COLL_5B - db LAND_TILE ; 5c - db LAND_TILE ; 5d - db LAND_TILE ; 5e - db LAND_TILE ; 5f - db LAND_TILE ; COLL_PIT - db LAND_TILE ; COLL_VIRTUAL_BOY - db WALL_TILE ; 62 - db LAND_TILE ; 63 - db LAND_TILE ; COLL_64 - db LAND_TILE ; COLL_65 - db LAND_TILE ; 66 - db LAND_TILE ; 67 - db LAND_TILE ; COLL_PIT_68 - db LAND_TILE ; 69 - db WALL_TILE ; 6a - db LAND_TILE ; 6b - db LAND_TILE ; 6c - db LAND_TILE ; 6d - db LAND_TILE ; 6e - db LAND_TILE ; 6f - db LAND_TILE ; COLL_WARP_CARPET_DOWN - db LAND_TILE ; COLL_DOOR - db LAND_TILE ; COLL_LADDER - db LAND_TILE ; COLL_STAIRCASE_73 - db LAND_TILE ; COLL_CAVE_74 - db LAND_TILE ; COLL_DOOR_75 - db LAND_TILE ; COLL_WARP_CARPET_LEFT - db LAND_TILE ; COLL_WARP_77 - db LAND_TILE ; COLL_WARP_CARPET_UP - db LAND_TILE ; COLL_DOOR_79 - db LAND_TILE ; COLL_STAIRCASE - db LAND_TILE ; COLL_CAVE - db LAND_TILE ; COLL_WARP_PANEL - db LAND_TILE ; COLL_DOOR_7D - db LAND_TILE ; COLL_WARP_CARPET_RIGHT - db LAND_TILE ; COLL_WARP_7F - db WALL_TILE ; 80 - db WALL_TILE ; 81 - db WALL_TILE ; 82 - db WALL_TILE ; 83 - db WALL_TILE ; 84 - db LAND_TILE ; 85 - db LAND_TILE ; 86 - db LAND_TILE ; 87 - db WALL_TILE ; 88 - db WALL_TILE ; 89 - db WALL_TILE ; 8a - db WALL_TILE ; 8b - db WALL_TILE ; 8c - db LAND_TILE ; 8d - db LAND_TILE ; 8e - db LAND_TILE ; 8f - db WALL_TILE ; COLL_COUNTER - db WALL_TILE ; COLL_BOOKSHELF - db WALL_TILE ; 92 - db WALL_TILE ; COLL_PC - db WALL_TILE ; COLL_RADIO - db WALL_TILE ; COLL_TOWN_MAP - db WALL_TILE ; COLL_MART_SHELF - db WALL_TILE ; COLL_TV - db WALL_TILE ; COLL_COUNTER_98 - db WALL_TILE ; 99 - db WALL_TILE ; 9a - db WALL_TILE ; 9b - db WALL_TILE ; COLL_9C - db WALL_TILE ; COLL_WINDOW - db WALL_TILE ; 9e - db WALL_TILE ; COLL_INCENSE_BURNER - db LAND_TILE ; COLL_HOP_RIGHT - db LAND_TILE ; COLL_HOP_LEFT - db LAND_TILE ; COLL_HOP_UP - db LAND_TILE ; COLL_HOP_DOWN - db LAND_TILE ; COLL_HOP_DOWN_RIGHT - db LAND_TILE ; COLL_HOP_DOWN_LEFT - db LAND_TILE ; COLL_HOP_UP_RIGHT - db LAND_TILE ; COLL_HOP_UP_LEFT - db LAND_TILE ; a8 - db LAND_TILE ; a9 - db LAND_TILE ; aa - db LAND_TILE ; ab - db LAND_TILE ; ac - db LAND_TILE ; ad - db LAND_TILE ; ae - db LAND_TILE ; af - db LAND_TILE ; COLL_RIGHT_WALL - db LAND_TILE ; COLL_LEFT_WALL - db LAND_TILE ; COLL_UP_WALL - db LAND_TILE ; COLL_DOWN_WALL - db LAND_TILE ; COLL_DOWN_RIGHT_WALL - db LAND_TILE ; COLL_DOWN_LEFT_WALL - db LAND_TILE ; COLL_UP_RIGHT_WALL - db LAND_TILE ; COLL_UP_LEFT_WALL - db LAND_TILE ; b8 - db LAND_TILE ; b9 - db LAND_TILE ; ba - db LAND_TILE ; bb - db LAND_TILE ; bc - db LAND_TILE ; bd - db LAND_TILE ; be - db LAND_TILE ; bf - db WATER_TILE ; COLL_RIGHT_BUOY - db WATER_TILE ; COLL_LEFT_BUOY - db WATER_TILE ; COLL_UP_BUOY - db WATER_TILE ; COLL_DOWN_BUOY - db WATER_TILE ; COLL_DOWN_RIGHT_BUOY - db WATER_TILE ; COLL_DOWN_LEFT_BUOY - db WATER_TILE ; COLL_UP_RIGHT_BUOY - db WATER_TILE ; COLL_UP_LEFT_BUOY - db WATER_TILE ; c8 - db WATER_TILE ; c9 - db WATER_TILE ; ca - db WATER_TILE ; cb - db WATER_TILE ; cc - db WATER_TILE ; cd - db WATER_TILE ; ce - db WATER_TILE ; cf - db LAND_TILE ; d0 - db LAND_TILE ; d1 - db LAND_TILE ; d2 - db LAND_TILE ; d3 - db LAND_TILE ; d4 - db LAND_TILE ; d5 - db LAND_TILE ; d6 - db LAND_TILE ; d7 - db LAND_TILE ; d8 - db LAND_TILE ; d9 - db LAND_TILE ; da - db LAND_TILE ; db - db LAND_TILE ; dc - db LAND_TILE ; dd - db LAND_TILE ; de - db LAND_TILE ; df - db LAND_TILE ; e0 - db LAND_TILE ; e1 - db LAND_TILE ; e2 - db LAND_TILE ; e3 - db LAND_TILE ; e4 - db LAND_TILE ; e5 - db LAND_TILE ; e6 - db LAND_TILE ; e7 - db LAND_TILE ; e8 - db LAND_TILE ; e9 - db LAND_TILE ; ea - db LAND_TILE ; eb - db LAND_TILE ; ec - db LAND_TILE ; ed - db LAND_TILE ; ee - db LAND_TILE ; ef - db LAND_TILE ; f0 - db LAND_TILE ; f1 - db LAND_TILE ; f2 - db LAND_TILE ; f3 - db LAND_TILE ; f4 - db LAND_TILE ; f5 - db LAND_TILE ; f6 - db LAND_TILE ; f7 - db LAND_TILE ; f8 - db LAND_TILE ; f9 - db LAND_TILE ; fa - db LAND_TILE ; fb - db LAND_TILE ; fc - db LAND_TILE ; fd - db LAND_TILE ; fe - db WALL_TILE ; COLL_FF diff --git a/data/events/collision_stdscripts.asm b/data/events/collision_stdscripts.asm deleted file mode 100644 index 5c94c62f..00000000 --- a/data/events/collision_stdscripts.asm +++ /dev/null @@ -1,18 +0,0 @@ -; std scripts associated with tile collisions - -stdcoll: MACRO - db \1 - dw (\2StdScript - StdScripts) / 3 -ENDM - -TileCollisionStdScripts: - ; collision type, std script - stdcoll COLL_BOOKSHELF, MagazineBookshelfScript - stdcoll COLL_PC, PCScript - stdcoll COLL_RADIO, Radio1Script - stdcoll COLL_TOWN_MAP, TownMapScript - stdcoll COLL_MART_SHELF, MerchandiseShelfScript - stdcoll COLL_TV, TVScript - stdcoll COLL_WINDOW, WindowScript - stdcoll COLL_INCENSE_BURNER, IncenseBurnerScript - db -1 ; end diff --git a/data/events/field_move_blocks.asm b/data/events/field_move_blocks.asm deleted file mode 100644 index fea80f53..00000000 --- a/data/events/field_move_blocks.asm +++ /dev/null @@ -1,52 +0,0 @@ -CutTreeBlockPointers: -; tileset, block list pointer - dbw TILESET_JOHTO, .johto - dbw TILESET_JOHTO_MODERN, .johto_modern - dbw TILESET_KANTO, .kanto - dbw TILESET_PARK, .park - dbw TILESET_FOREST, .forest - db -1 ; end - -.johto: -; facing block, replacement block, animation - db $03, $02, 1 ; grass - db $5b, $3c, 0 ; tree - db $5f, $3d, 0 ; tree - db $63, $3f, 0 ; tree - db $67, $3e, 0 ; tree - db -1 ; end - -.johto_modern: -; facing block, replacement block, animation - db $03, $02, $01 ; grass - db -1 ; end - -.kanto: -; facing block, replacement block, animation - db $0b, $0a, 1 ; grass - db $32, $6d, 0 ; tree - db $33, $6c, 0 ; tree - db $34, $6f, 0 ; tree - db $35, $4c, 0 ; tree - db $60, $6e, 0 ; tree - db -1 ; end - -.park: -; facing block, replacement block, animation - db $13, $03, 1 ; grass - db $03, $04, 1 ; grass - db -1 ; end - -.forest: -; facing block, replacement block, animation - db $0f, $17, 0 - db -1 ; end - -WhirlpoolBlockPointers: - dbw TILESET_JOHTO, .johto - db -1 ; end - -.johto: -; facing block, replacement block, animation - db $07, $36, 0 - db -1 ; end -- cgit v1.2.3 From 9483cf47dd62d3c513dade49747e868f49f0e374 Mon Sep 17 00:00:00 2001 From: Rangi Date: Wed, 28 Oct 2020 10:21:24 -0400 Subject: Replace many '; unused' with '; unreferenced' --- data/battle/effect_command_pointers.asm | 4 ++-- data/sprite_anims/framesets.asm | 18 +++++++++--------- data/sprite_anims/oam.asm | 4 ++-- 3 files changed, 13 insertions(+), 13 deletions(-) (limited to 'data') diff --git a/data/battle/effect_command_pointers.asm b/data/battle/effect_command_pointers.asm index d5c044d7..d1f747a1 100644 --- a/data/battle/effect_command_pointers.asm +++ b/data/battle/effect_command_pointers.asm @@ -63,7 +63,7 @@ BattleCommandPointers: dw BattleCommand_Charge dw BattleCommand_CheckCharge dw BattleCommand_TrapTarget - dw BattleCommand3c + dw BattleCommand_Unused3C dw BattleCommand_Rampage dw BattleCommand_CheckRampage dw BattleCommand_ConstantDamage @@ -96,7 +96,7 @@ BattleCommandPointers: dw BattleCommand_Endure dw BattleCommand_CheckCurl dw BattleCommand_RolloutPower - dw BattleCommand5d + dw BattleCommand_Unused5D dw BattleCommand_FuryCutter dw BattleCommand_Attract dw BattleCommand_HappinessPower diff --git a/data/sprite_anims/framesets.asm b/data/sprite_anims/framesets.asm index 6104dbb7..4ae8d6b7 100644 --- a/data/sprite_anims/framesets.asm +++ b/data/sprite_anims/framesets.asm @@ -291,45 +291,45 @@ ENDC frame SPRITE_ANIM_OAMSET_MAGNET_TRAIN_RED_2, 8, OAM_X_FLIP dorestart -; unused +.Frameset_Unknown1: ; unreferenced frame SPRITE_ANIM_OAMSET_UNUSED_43, 8 frame SPRITE_ANIM_OAMSET_UNUSED_44, 8 dorestart -; unused +.Frameset_Unknown2: ; unreferenced frame SPRITE_ANIM_OAMSET_UNUSED_45, 8 frame SPRITE_ANIM_OAMSET_UNUSED_46, 8 dorestart -; unused +.Frameset_Unknown3: ; unreferenced frame SPRITE_ANIM_OAMSET_UNUSED_47, 8 frame SPRITE_ANIM_OAMSET_UNUSED_48, 8 dorestart -; unused +.Frameset_Unknown4: ; unreferenced frame SPRITE_ANIM_OAMSET_UNUSED_49, 1 frame SPRITE_ANIM_OAMSET_UNUSED_49, 1, OAM_X_FLIP frame SPRITE_ANIM_OAMSET_UNUSED_49, 1, OAM_X_FLIP, OAM_Y_FLIP frame SPRITE_ANIM_OAMSET_UNUSED_49, 1, OAM_Y_FLIP dorestart -; unused +.Frameset_Unknown5: ; unreferenced frame SPRITE_ANIM_OAMSET_UNUSED_4A, 32 endanim -; unused +.Frameset_Unknown6: ; unreferenced frame SPRITE_ANIM_OAMSET_UNUSED_4B, 32 endanim -; unused +.Frameset_Unknown7: ; unreferenced frame SPRITE_ANIM_OAMSET_UNUSED_4C, 32 endanim -; unused +.Frameset_Unknown8: ; unreferenced frame SPRITE_ANIM_OAMSET_UNUSED_4D, 32 endanim -; unused +.Frameset_Unknown9: ; unreferenced frame SPRITE_ANIM_OAMSET_UNUSED_4E, 3 dowait 3 dorestart diff --git a/data/sprite_anims/oam.asm b/data/sprite_anims/oam.asm index 2af73fe0..d34d3a03 100644 --- a/data/sprite_anims/oam.asm +++ b/data/sprite_anims/oam.asm @@ -141,7 +141,7 @@ ENDC dbsprite -1, 0, 0, 0, $00, 7 | Y_FLIP dbsprite 0, 0, 0, 0, $00, 7 | X_FLIP | Y_FLIP -; unused +.OAMData_Unknown1: ; unreferenced db 4 dbsprite -1, -1, 0, 0, $00, 0 | PRIORITY dbsprite 0, -1, 0, 0, $00, 0 | X_FLIP | PRIORITY @@ -265,7 +265,7 @@ ENDC dbsprite 1, 0, 4, 4, $17, 0 dbsprite 1, 1, 4, 4, $18, 0 -; unused +.OAMData_Unknown2: ; unreferenced db 36 dbsprite -3, -3, 0, 0, $00, 0 dbsprite -2, -3, 0, 0, $01, 0 -- cgit v1.2.3 From b47bfbd813cc7981ff3b99baa7913933f28d67b9 Mon Sep 17 00:00:00 2001 From: Rangi Date: Wed, 28 Oct 2020 13:35:26 -0400 Subject: Identify more WRAM labels, and start a _DummyFunction label convention --- data/events/special_pointers.asm | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'data') diff --git a/data/events/special_pointers.asm b/data/events/special_pointers.asm index c2a625fe..a25b6ab2 100644 --- a/data/events/special_pointers.asm +++ b/data/events/special_pointers.asm @@ -60,8 +60,8 @@ SpecialsPointers:: add_special UnownPuzzle add_special SlotMachine add_special CardFlip - add_special DummyNonfunctionalGameCornerGame - add_special ClearBGPalettesBufferScreen + add_special UnusedDummyGame ; unused + add_special ClearBGPalettesBufferScreen ; unused add_special FadeOutPalettes add_special FadeBlackQuickly add_special FadeInPalettes @@ -69,21 +69,21 @@ SpecialsPointers:: add_special ReloadSpritesNoPalettes, 2 add_special ClearBGPalettes add_special UpdateTimePals - add_special ClearTilemap + add_special ClearTilemap ; unused as special add_special UpdateSprites add_special UpdatePlayerSprite add_special GameCornerPrizeMonCheckDex - add_special UnusedSetSeenMon + add_special UnusedSetSeenMon ; unused add_special WaitSFX, 3 add_special PlayMapMusic add_special RestartMapMusic add_special HealMachineAnim add_special SurfStartStep - add_special FindPartyMonAboveLevel - add_special FindPartyMonAtLeastThatHappy + add_special FindPartyMonAboveLevel ; unused + add_special FindPartyMonAtLeastThatHappy ; unused add_special FindPartyMonThatSpecies add_special FindPartyMonThatSpeciesYourTrainerID - add_special UnusedCheckUnusedTwoDayTimer + add_special UnusedCheckUnusedTwoDayTimer ; unused add_special DayCareMon1 add_special DayCareMon2 add_special SelectRandomBugContestContestants @@ -127,4 +127,4 @@ SpecialsPointers:: add_special InitialSetDSTFlag add_special InitialClearDSTFlag add_special MrChrono - add_special DummySpecial_c389 + add_special UnusedDummySpecial ; unused -- cgit v1.2.3 From 7062ce2ffaf439e611c0f3840b4b1974c712d2c6 Mon Sep 17 00:00:00 2001 From: Rangi Date: Thu, 29 Oct 2020 14:45:52 -0400 Subject: Identify the remaining uses of another WRAM union --- data/text/common_2.asm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data') diff --git a/data/text/common_2.asm b/data/text/common_2.asm index 6963e2a8..b7a537c6 100644 --- a/data/text/common_2.asm +++ b/data/text/common_2.asm @@ -1264,7 +1264,7 @@ _LinkAbnormalMonText:: _LinkAskTradeForText:: text "Trade @" - text_ram wceef + text_ram wBufferTrademonNick text_start line "for @" text_ram wStringBuffer1 -- cgit v1.2.3 From b89636769c271cadc154e045cca3ea06cb4a61e1 Mon Sep 17 00:00:00 2001 From: Rangi Date: Thu, 29 Oct 2020 23:23:44 -0400 Subject: Updates to more closely sync with pokecrystal --- data/moves/tmhm_moves.asm | 1 + data/player_names.asm | 6 +++--- data/pokemon/palettes.asm | 1 + data/radio/oaks_pkmn_talk_routes.asm | 3 ++- data/text/battle.asm | 4 ++-- 5 files changed, 9 insertions(+), 6 deletions(-) (limited to 'data') diff --git a/data/moves/tmhm_moves.asm b/data/moves/tmhm_moves.asm index 2834e7df..e2c44f23 100644 --- a/data/moves/tmhm_moves.asm +++ b/data/moves/tmhm_moves.asm @@ -32,6 +32,7 @@ endr db 0 ; end +; unused db 0 db 0 db 0 diff --git a/data/player_names.asm b/data/player_names.asm index 0155dac4..3291ea66 100644 --- a/data/player_names.asm +++ b/data/player_names.asm @@ -1,8 +1,8 @@ NameMenuHeader: - db STATICMENU_NO_TOP_SPACING + db STATICMENU_NO_TOP_SPACING ; flags menu_coords 0, 0, 10, TEXTBOX_Y - 1 dw .Names - db 1 + db 1 ; default option .Names: db STATICMENU_CURSOR | STATICMENU_PLACE_TITLE | STATICMENU_DISABLE_B ; flags @@ -21,5 +21,5 @@ ELIF DEF(_SILVER) db "OSCAR@" db "MAX@" ENDC - db 2 + db 2 ; ???? db "NAME@" ; title diff --git a/data/pokemon/palettes.asm b/data/pokemon/palettes.asm index e6fbf844..36d2c662 100644 --- a/data/pokemon/palettes.asm +++ b/data/pokemon/palettes.asm @@ -3,6 +3,7 @@ PokemonPalettes: ; Each back.gbcpal is generated from the corresponding .png, and ; only the middle two colors are included, not black or white. +; (Back sprites are used since they are the same in Gold and Silver.) ; Shiny palettes are defined directly, not generated. ; 000 diff --git a/data/radio/oaks_pkmn_talk_routes.asm b/data/radio/oaks_pkmn_talk_routes.asm index 254dd8e5..db244740 100644 --- a/data/radio/oaks_pkmn_talk_routes.asm +++ b/data/radio/oaks_pkmn_talk_routes.asm @@ -1,6 +1,7 @@ ; Oak's Pokémon Talk will list wild Pokémon on these maps. -OaksPKMNTalkRoutes:; there are NUM_OAKS_POKEMON_TALK_ROUTES entries +OaksPKMNTalkRoutes: +; there are NUM_OAKS_POKEMON_TALK_ROUTES entries map_id ROUTE_29 map_id ROUTE_46 map_id ROUTE_30 diff --git a/data/text/battle.asm b/data/text/battle.asm index fe14f938..811a8e8c 100644 --- a/data/text/battle.asm +++ b/data/text/battle.asm @@ -340,7 +340,7 @@ BattleText_StringBuffer1GrewToLevel: text_decimal wCurPartyLevel, 1, 3 text "!@" sound_dex_fanfare_50_79 - db "@" + text_end BattleText_WildMonIsEating: text "Wild @" @@ -1073,7 +1073,7 @@ BeatUpAttackText: ; BUG: Pokémon names 8-10 characters long can overflow the textbox, ; printing as "Enemy 1234567890 can't": up to 21 characters, over 18. -CantReceiveGiftText: +PresentFailedText: text " can't" line "receive the gift!" prompt -- cgit v1.2.3