Port miscellaneous recent updates from pokecrystal

3 files changed, 35 insertions, 35 deletions

diff --git a/data/engine_flags.asm b/data/engine_flags.asm
index 87e15afb..bd135f36 100644
--- a/data/engine_flags.asm
+++ b/data/engine_flags.asm
@@ -8,7 +8,7 @@ EngineFlags:
 ; entries correspond to ENGINE_* constants
 
 	; pokegear
-	engine_flag wPokegearFlags, POKEGEAR_RADIO_CARD_F ; $0
+	engine_flag wPokegearFlags, POKEGEAR_RADIO_CARD_F
 	engine_flag wPokegearFlags, POKEGEAR_MAP_CARD_F
 	engine_flag wPokegearFlags, POKEGEAR_PHONE_CARD_F
 	engine_flag wPokegearFlags, POKEGEAR_EXPN_CARD_F
@@ -19,7 +19,7 @@ EngineFlags:
 	engine_flag wDayCareMan, DAYCAREMAN_HAS_MON_F
 	engine_flag wDayCareLady, DAYCARELADY_HAS_MON_F
 
-	engine_flag wMomSavingMoney, MOM_SAVING_SOME_MONEY_F ; $8
+	engine_flag wMomSavingMoney, MOM_SAVING_SOME_MONEY_F
 	engine_flag wMomSavingMoney, MOM_ACTIVE_F
 
 	engine_flag wUnusedTwoDayTimerOn, 0 ; unused, possibly related to a 2-day timer
@@ -30,7 +30,7 @@ EngineFlags:
 	engine_flag wStatusFlags, STATUSFLAGS_ROCKET_SIGNAL_F
 	engine_flag wStatusFlags, STATUSFLAGS_HALL_OF_FAME_F
 
-	engine_flag wStatusFlags2, STATUSFLAGS2_BUG_CONTEST_TIMER_F ; $10
+	engine_flag wStatusFlags2, STATUSFLAGS2_BUG_CONTEST_TIMER_F
 	engine_flag wStatusFlags2, STATUSFLAGS2_SAFARI_GAME_F
 	engine_flag wStatusFlags2, STATUSFLAGS2_ROCKETS_IN_RADIO_TOWER_F
 	engine_flag wStatusFlags2, STATUSFLAGS2_BIKE_SHOP_CALL_F
@@ -39,7 +39,7 @@ EngineFlags:
 	engine_flag wStatusFlags2, STATUSFLAGS2_ROCKETS_IN_MAHOGANY_F
 
 	engine_flag wBikeFlags, BIKEFLAGS_STRENGTH_ACTIVE_F
-	engine_flag wBikeFlags, BIKEFLAGS_ALWAYS_ON_BIKE_F ; $18
+	engine_flag wBikeFlags, BIKEFLAGS_ALWAYS_ON_BIKE_F
 	engine_flag wBikeFlags, BIKEFLAGS_DOWNHILL_F
 
 	engine_flag wJohtoBadges, ZEPHYRBADGE
@@ -48,7 +48,7 @@ EngineFlags:
 	engine_flag wJohtoBadges, FOGBADGE
 	engine_flag wJohtoBadges, MINERALBADGE
 	engine_flag wJohtoBadges, STORMBADGE
-	engine_flag wJohtoBadges, GLACIERBADGE ; $20
+	engine_flag wJohtoBadges, GLACIERBADGE
 	engine_flag wJohtoBadges, RISINGBADGE
 
 	engine_flag wKantoBadges, BOULDERBADGE
@@ -57,7 +57,7 @@ EngineFlags:
 	engine_flag wKantoBadges, RAINBOWBADGE
 	engine_flag wKantoBadges, SOULBADGE
 	engine_flag wKantoBadges, MARSHBADGE
-	engine_flag wKantoBadges, VOLCANOBADGE ; $28
+	engine_flag wKantoBadges, VOLCANOBADGE
 	engine_flag wKantoBadges, EARTHBADGE
 
 	; unown sets (see data/wild/unlocked_unowns.asm)
@@ -67,7 +67,7 @@ EngineFlags:
 	engine_flag wUnlockedUnowns, 3 ; X-Z
 	engine_flag wUnlockedUnowns, 4 ; unused
 	engine_flag wUnlockedUnowns, 5 ; unused
-	engine_flag wUnlockedUnowns, 6 ; unused ; $30
+	engine_flag wUnlockedUnowns, 6 ; unused
 	engine_flag wUnlockedUnowns, 7 ; unused
 
 	; fly
@@ -77,7 +77,7 @@ EngineFlags:
 	engine_flag wVisitedSpawns, SPAWN_VIRIDIAN
 	engine_flag wVisitedSpawns, SPAWN_PEWTER
 	engine_flag wVisitedSpawns, SPAWN_CERULEAN
-	engine_flag wVisitedSpawns, SPAWN_ROCK_TUNNEL ; $38
+	engine_flag wVisitedSpawns, SPAWN_ROCK_TUNNEL
 	engine_flag wVisitedSpawns, SPAWN_VERMILION
 	engine_flag wVisitedSpawns, SPAWN_LAVENDER
 	engine_flag wVisitedSpawns, SPAWN_SAFFRON
@@ -85,7 +85,7 @@ EngineFlags:
 	engine_flag wVisitedSpawns, SPAWN_FUCHSIA
 	engine_flag wVisitedSpawns, SPAWN_CINNABAR
 	engine_flag wVisitedSpawns, SPAWN_INDIGO
-	engine_flag wVisitedSpawns, SPAWN_NEW_BARK ; $40
+	engine_flag wVisitedSpawns, SPAWN_NEW_BARK
 	engine_flag wVisitedSpawns, SPAWN_CHERRYGROVE
 	engine_flag wVisitedSpawns, SPAWN_VIOLET
 	engine_flag wVisitedSpawns, SPAWN_AZALEA
@@ -93,7 +93,7 @@ EngineFlags:
 	engine_flag wVisitedSpawns, SPAWN_GOLDENROD
 	engine_flag wVisitedSpawns, SPAWN_OLIVINE
 	engine_flag wVisitedSpawns, SPAWN_ECRUTEAK
-	engine_flag wVisitedSpawns, SPAWN_MAHOGANY ; $48
+	engine_flag wVisitedSpawns, SPAWN_MAHOGANY
 	engine_flag wVisitedSpawns, SPAWN_LAKE_OF_RAGE
 	engine_flag wVisitedSpawns, SPAWN_BLACKTHORN
 	engine_flag wVisitedSpawns, SPAWN_MT_SILVER
@@ -104,7 +104,7 @@ EngineFlags:
 	engine_flag wStatusFlags2, STATUSFLAGS2_UNUSED_3_F
 
 	engine_flag wDailyFlags1, DAILYFLAGS1_KURT_MAKING_BALLS_F
-	engine_flag wDailyFlags1, DAILYFLAGS1_BUG_CONTEST_F ; $50
+	engine_flag wDailyFlags1, DAILYFLAGS1_BUG_CONTEST_F
 	engine_flag wDailyFlags1, DAILYFLAGS1_SWARM_F
 	engine_flag wDailyFlags1, DAILYFLAGS1_TIME_CAPSULE_F
 	engine_flag wDailyFlags1, DAILYFLAGS1_ALL_FRUIT_TREES_F
@@ -113,7 +113,7 @@ EngineFlags:
 	engine_flag wDailyFlags1, DAILYFLAGS1_TRAINER_HOUSE_F
 
 	engine_flag wDailyFlags2, DAILYFLAGS2_MT_MOON_SQUARE_CLEFAIRY_F
-	engine_flag wDailyFlags2, DAILYFLAGS2_UNION_CAVE_LAPRAS_F ; $58
+	engine_flag wDailyFlags2, DAILYFLAGS2_UNION_CAVE_LAPRAS_F
 	engine_flag wDailyFlags2, DAILYFLAGS2_GOLDENROD_UNDERGROUND_GOT_HAIRCUT_F
 	engine_flag wDailyFlags2, DAILYFLAGS2_GOLDENROD_DEPT_STORE_TM27_RETURN_F
 	engine_flag wDailyFlags2, DAILYFLAGS2_DAISYS_GROOMING_F
diff --git a/data/predef_pointers.asm b/data/predef_pointers.asm
index 8f7fd669..f36f8307 100644
--- a/data/predef_pointers.asm
+++ b/data/predef_pointers.asm
@@ -7,7 +7,7 @@ add_predef: MACRO
 ENDM
 
 PredefPointers::
-	add_predef LearnMove ; $0
+	add_predef LearnMove
 	add_predef DummyPredef1
 	add_predef HealParty ; this is both a special and a predef
 	add_predef SmallFarFlagAction
@@ -23,15 +23,15 @@ PredefPointers::
 	add_predef CalcMonStatC
 	add_predef CanLearnTMHMMove
 	add_predef GetTMHMMove
-	add_predef LinkTextboxAtHL ; $ 10
-	add_predef PrintMoveDesc
+	add_predef LinkTextboxAtHL
+	add_predef PrintMoveDescription
 	add_predef UpdatePlayerHUD
 	add_predef PlaceGraphic
 	add_predef CheckPlayerPartyForFitMon
 	add_predef UpdateEnemyHUD
 	add_predef StartBattle
 	add_predef FillInExpBar
-	add_predef GetBattleMonBackpic ; $18
+	add_predef GetBattleMonBackpic
 	add_predef GetEnemyMonFrontpic
 	add_predef LearnLevelMoves
 	add_predef FillMoves
@@ -39,7 +39,7 @@ PredefPointers::
 	add_predef TradeAnimationPlayer2
 	add_predef TradeAnimation
 	add_predef CopyMonToTempMon
-	add_predef ListMoves ; $20
+	add_predef ListMoves
 	add_predef PlaceNonFaintStatus
 	add_predef Unused_PlaceEnemyHPLevel
 	add_predef ListMovePP
@@ -47,7 +47,7 @@ PredefPointers::
 	add_predef StatsScreenInit
 	add_predef DrawPlayerHP
 	add_predef DrawEnemyHP
-	add_predef PrintTempMonStats ; $28
+	add_predef PrintTempMonStats
 	add_predef GetTypeName
 	add_predef PrintMoveType
 	add_predef PrintType
@@ -55,7 +55,7 @@ PredefPointers::
 	add_predef GetUnownLetter
 	add_predef LoadPoisonBGPals
 	add_predef DummyPredef2F
-	add_predef InitSGBBorder ; $30
+	add_predef InitSGBBorder
 	add_predef LoadSGBLayout
 	add_predef Pokedex_GetArea
 	add_predef Unused_CheckShininess
@@ -63,7 +63,7 @@ PredefPointers::
 	add_predef DummyPredef35
 	add_predef DummyPredef36
 	add_predef PlayBattleAnim
-	add_predef DummyPredef38 ; $38
+	add_predef DummyPredef38
 	add_predef DummyPredef39
 	add_predef DummyPredef3A
 	add_predef PartyMonItemName
@@ -71,7 +71,7 @@ PredefPointers::
 	add_predef GetMonBackpic
 	add_predef GetTrainerPic
 	add_predef DecompressGet2bpp
-	add_predef CheckTypeMatchup ; $40
+	add_predef CheckTypeMatchup
 	add_predef ConvertMon_1to2
 	add_predef NewPokedexEntry
 	add_predef UnusedFrontpicPredef
diff --git a/data/special_pointers.asm b/data/special_pointers.asm
index 03492518..39207e73 100644
--- a/data/special_pointers.asm
+++ b/data/special_pointers.asm
@@ -12,7 +12,7 @@ ENDC
 ENDM
 
 SpecialsPointers::
-	add_special WarpToSpawnPoint ; $0
+	add_special WarpToSpawnPoint
 
 ; Communications
 	add_special SetBitsForLinkTradeRequest
@@ -22,7 +22,7 @@ SpecialsPointers::
 	add_special CheckBothSelectedSameRoom
 	add_special FailedLinkToPast
 	add_special CloseLink
-	add_special WaitForOtherPlayerToExit ; $8
+	add_special WaitForOtherPlayerToExit
 	add_special SetBitsForBattleRequest
 	add_special SetBitsForTimeCapsuleRequest
 	add_special CheckTimeCapsuleCompatibility
@@ -30,7 +30,7 @@ SpecialsPointers::
 	add_special TradeCenter
 	add_special Colosseum
 	add_special TimeCapsule
-	add_special CableClubCheckWhichChris ; $10
+	add_special CableClubCheckWhichChris
 	add_special CheckMysteryGift
 	add_special GetMysteryGiftItem
 	add_special UnlockMysteryGift
@@ -40,7 +40,7 @@ SpecialsPointers::
 	add_special CheckPartyFullAfterContest
 	add_special ContestDropOffMons
 	add_special ContestReturnMons
-	add_special GiveParkBalls ; $18
+	add_special GiveParkBalls
 	add_special CheckMagikarpLength
 	add_special MagikarpHouseSign
 	add_special HealParty ; this is both a special and a predef
@@ -48,7 +48,7 @@ SpecialsPointers::
 	add_special PlayersHousePC
 	add_special DayCareMan
 	add_special DayCareLady
-	add_special DayCareManOutside ; $20
+	add_special DayCareManOutside
 	add_special MoveDeletion
 	add_special BankOfMom
 	add_special MagnetTrain
@@ -56,7 +56,7 @@ SpecialsPointers::
 	add_special SetDayOfWeek
 	add_special OverworldTownMap
 	add_special UnownPrinter
-	add_special MapRadio ; $28
+	add_special MapRadio
 	add_special UnownPuzzle
 	add_special SlotMachine
 	add_special CardFlip
@@ -64,7 +64,7 @@ SpecialsPointers::
 	add_special ClearBGPalettesBufferScreen
 	add_special FadeOutPalettes
 	add_special FadeBlackQuickly
-	add_special FadeInPalettes ; $30
+	add_special FadeInPalettes
 	add_special FadeInQuickly
 	add_special ReloadSpritesNoPalettes, 2
 	add_special ClearBGPalettes
@@ -72,7 +72,7 @@ SpecialsPointers::
 	add_special ClearTilemap
 	add_special UpdateSprites
 	add_special ReplaceChrisSprite
-	add_special GameCornerPrizeMonCheckDex ; $38
+	add_special GameCornerPrizeMonCheckDex
 	add_special UnusedSetSeenMon
 	add_special WaitSFX, 3
 	add_special PlayMapMusic
@@ -80,7 +80,7 @@ SpecialsPointers::
 	add_special HealMachineAnim
 	add_special SurfStartStep
 	add_special FindPartyMonAboveLevel
-	add_special FindPartyMonAtLeastThatHappy ; $40
+	add_special FindPartyMonAtLeastThatHappy
 	add_special FindPartyMonThatSpecies
 	add_special FindPartyMonThatSpeciesYourTrainerID
 	add_special UnusedCheckUnusedTwoDayTimer
@@ -88,7 +88,7 @@ SpecialsPointers::
 	add_special DayCareMon2
 	add_special SelectRandomBugContestContestants
 	add_special ActivateFishingSwarm
-	add_special ToggleMaptileDecorations ; $48
+	add_special ToggleMaptileDecorations
 	add_special ToggleDecorationsVisibility
 	add_special GiveShuckle
 	add_special ReturnShuckle
@@ -96,7 +96,7 @@ SpecialsPointers::
 	add_special CheckPokerus
 	add_special DisplayCoinCaseBalance
 	add_special DisplayMoneyAndCoinBalance
-	add_special PlaceMoneyTopRight ; $50
+	add_special PlaceMoneyTopRight
 	add_special CheckForLuckyNumberWinners
 	add_special CheckLuckyNumberShowFlag
 	add_special ResetLuckyNumberShowFlag
@@ -104,7 +104,7 @@ SpecialsPointers::
 	add_special SelectApricornForKurt
 	add_special NameRater
 	add_special DisplayLinkRecord
-	add_special GetFirstPokemonHappiness ; $58
+	add_special GetFirstPokemonHappiness
 	add_special CheckFirstMonIsEgg
 	add_special RandomUnseenWildMon
 	add_special RandomPhoneWildMon
@@ -112,7 +112,7 @@ SpecialsPointers::
 	add_special LoadUsedSpritesGFX
 	add_special PlaySlowCry
 	add_special SnorlaxAwake
-	add_special OlderHaircutBrother ; $60
+	add_special OlderHaircutBrother
 	add_special YoungerHaircutBrother
 	add_special DaisysGrooming
 	add_special PlayCurMonCry
@@ -120,7 +120,7 @@ SpecialsPointers::
 	add_special GameboyCheck
 	add_special TrainerHouse
 	add_special PhotoStudio
-	add_special InitRoamMons ; $68
+	add_special InitRoamMons
 	add_special FadeOutMusic
 	add_special Diploma
 	add_special PrintDiploma