diff options
author | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-06-13 18:48:26 -0400 |
---|---|---|
committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-06-13 18:48:26 -0400 |
commit | 75035a71a544821de0b397cfd5bacad5cf4da8fd (patch) | |
tree | a6f0321c5bb59c2e5bae7d26d20fe7c8e4ff4e88 /data | |
parent | 0d683ea0c72c3d86736cd08667f14d6abe5964c3 (diff) |
Label some mobile addresses, and revise some comments
Diffstat (limited to 'data')
-rw-r--r-- | data/engine_flags.asm | 40 | ||||
-rw-r--r-- | data/predef_pointers.asm | 18 | ||||
-rw-r--r-- | data/special_pointers.asm | 44 |
3 files changed, 51 insertions, 51 deletions
diff --git a/data/engine_flags.asm b/data/engine_flags.asm index ab669acfc..f43e64aea 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 @@ -39,7 +39,7 @@ EngineFlags: engine_flag wStatusFlags2, STATUSFLAGS2_REACHED_GOLDENROD_F engine_flag wStatusFlags2, STATUSFLAGS2_ROCKETS_IN_MAHOGANY_F - engine_flag wBikeFlags, BIKEFLAGS_STRENGTH_ACTIVE_F ; $18 + engine_flag wBikeFlags, BIKEFLAGS_STRENGTH_ACTIVE_F engine_flag wBikeFlags, BIKEFLAGS_ALWAYS_ON_BIKE_F engine_flag wBikeFlags, BIKEFLAGS_DOWNHILL_F @@ -48,7 +48,7 @@ EngineFlags: engine_flag wJohtoBadges, PLAINBADGE engine_flag wJohtoBadges, FOGBADGE engine_flag wJohtoBadges, MINERALBADGE - engine_flag wJohtoBadges, STORMBADGE ; $20 + engine_flag wJohtoBadges, STORMBADGE engine_flag wJohtoBadges, GLACIERBADGE engine_flag wJohtoBadges, RISINGBADGE @@ -57,7 +57,7 @@ EngineFlags: engine_flag wKantoBadges, THUNDERBADGE engine_flag wKantoBadges, RAINBOWBADGE engine_flag wKantoBadges, SOULBADGE - engine_flag wKantoBadges, MARSHBADGE ; $28 + engine_flag wKantoBadges, MARSHBADGE engine_flag wKantoBadges, VOLCANOBADGE engine_flag wKantoBadges, EARTHBADGE @@ -67,7 +67,7 @@ EngineFlags: engine_flag wUnlockedUnowns, 2 ; S-W engine_flag wUnlockedUnowns, 3 ; X-Z engine_flag wUnlockedUnowns, 4 ; unused - engine_flag wUnlockedUnowns, 5 ; unused ; $30 + engine_flag wUnlockedUnowns, 5 ; unused engine_flag wUnlockedUnowns, 6 ; unused engine_flag wUnlockedUnowns, 7 ; unused @@ -77,7 +77,7 @@ EngineFlags: engine_flag wVisitedSpawns, SPAWN_PALLET engine_flag wVisitedSpawns, SPAWN_VIRIDIAN engine_flag wVisitedSpawns, SPAWN_PEWTER - engine_flag wVisitedSpawns, SPAWN_CERULEAN ; $38 + engine_flag wVisitedSpawns, SPAWN_CERULEAN engine_flag wVisitedSpawns, SPAWN_ROCK_TUNNEL engine_flag wVisitedSpawns, SPAWN_VERMILION engine_flag wVisitedSpawns, SPAWN_LAVENDER @@ -85,7 +85,7 @@ EngineFlags: engine_flag wVisitedSpawns, SPAWN_CELADON engine_flag wVisitedSpawns, SPAWN_FUCHSIA engine_flag wVisitedSpawns, SPAWN_CINNABAR - engine_flag wVisitedSpawns, SPAWN_INDIGO ; $40 + engine_flag wVisitedSpawns, SPAWN_INDIGO engine_flag wVisitedSpawns, SPAWN_NEW_BARK engine_flag wVisitedSpawns, SPAWN_CHERRYGROVE engine_flag wVisitedSpawns, SPAWN_VIOLET @@ -93,7 +93,7 @@ EngineFlags: engine_flag wVisitedSpawns, SPAWN_CIANWOOD engine_flag wVisitedSpawns, SPAWN_GOLDENROD engine_flag wVisitedSpawns, SPAWN_OLIVINE - engine_flag wVisitedSpawns, SPAWN_ECRUTEAK ; $48 + engine_flag wVisitedSpawns, SPAWN_ECRUTEAK engine_flag wVisitedSpawns, SPAWN_MAHOGANY engine_flag wVisitedSpawns, SPAWN_LAKE_OF_RAGE engine_flag wVisitedSpawns, SPAWN_BLACKTHORN @@ -104,7 +104,7 @@ EngineFlags: engine_flag wStatusFlags2, STATUSFLAGS2_UNUSED_3_F - engine_flag wDailyFlags1, DAILYFLAGS1_KURT_MAKING_BALLS_F ; $50 + engine_flag wDailyFlags1, DAILYFLAGS1_KURT_MAKING_BALLS_F engine_flag wDailyFlags1, DAILYFLAGS1_BUG_CONTEST_F engine_flag wDailyFlags1, DAILYFLAGS1_FISH_SWARM_F engine_flag wDailyFlags1, DAILYFLAGS1_TIME_CAPSULE_F @@ -113,7 +113,7 @@ EngineFlags: engine_flag wDailyFlags1, DAILYFLAGS1_GOLDENROD_UNDERGROUND_BARGAIN_F engine_flag wDailyFlags1, DAILYFLAGS1_TRAINER_HOUSE_F - engine_flag wDailyFlags2, DAILYFLAGS2_MT_MOON_SQUARE_CLEFAIRY_F ; $58 + engine_flag wDailyFlags2, DAILYFLAGS2_MT_MOON_SQUARE_CLEFAIRY_F 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 @@ -122,7 +122,7 @@ EngineFlags: engine_flag wDailyFlags2, DAILYFLAGS2_MOVE_TUTOR_F engine_flag wDailyFlags2, DAILYFLAGS2_BUENAS_PASSWORD_F - engine_flag wSwarmFlags, SWARMFLAGS_BUENAS_PASSWORD_F ; $60 + engine_flag wSwarmFlags, SWARMFLAGS_BUENAS_PASSWORD_F engine_flag wSwarmFlags, SWARMFLAGS_GOLDENROD_DEPT_STORE_SALE_F engine_flag wGameTimerPause, GAMETIMERPAUSE_MOBILE_7_F @@ -135,7 +135,7 @@ EngineFlags: engine_flag wDailyRematchFlags, 0 ; jack engine_flag wDailyRematchFlags, 1 ; huey engine_flag wDailyRematchFlags, 2 ; gaven - engine_flag wDailyRematchFlags, 3 ; beth ; $68 + engine_flag wDailyRematchFlags, 3 ; beth engine_flag wDailyRematchFlags, 4 ; jose engine_flag wDailyRematchFlags, 5 ; reena engine_flag wDailyRematchFlags, 6 ; joey @@ -143,7 +143,7 @@ EngineFlags: engine_flag wDailyRematchFlags, 8 ; ralph engine_flag wDailyRematchFlags, 9 ; liz engine_flag wDailyRematchFlags, 10 ; anthony - engine_flag wDailyRematchFlags, 11 ; todd ; $70 + engine_flag wDailyRematchFlags, 11 ; todd engine_flag wDailyRematchFlags, 12 ; gina engine_flag wDailyRematchFlags, 13 ; arnie engine_flag wDailyRematchFlags, 14 ; alan @@ -151,7 +151,7 @@ EngineFlags: engine_flag wDailyRematchFlags, 16 ; chad engine_flag wDailyRematchFlags, 17 ; tully engine_flag wDailyRematchFlags, 18 ; brent - engine_flag wDailyRematchFlags, 19 ; tiffany ; $78 + engine_flag wDailyRematchFlags, 19 ; tiffany engine_flag wDailyRematchFlags, 20 ; vance engine_flag wDailyRematchFlags, 21 ; wilton engine_flag wDailyRematchFlags, 22 ; parry @@ -160,7 +160,7 @@ EngineFlags: engine_flag wDailyPhoneItemFlags, 0 ; beverly has nugget engine_flag wDailyPhoneItemFlags, 1 ; jose has star piece engine_flag wDailyPhoneItemFlags, 2 ; wade has item (see EVENT_WADE_HAS_*** in constants/event_flags.asm) - engine_flag wDailyPhoneItemFlags, 3 ; gina has leaf stone ; $80 + engine_flag wDailyPhoneItemFlags, 3 ; gina has leaf stone engine_flag wDailyPhoneItemFlags, 4 ; alan has fire stone engine_flag wDailyPhoneItemFlags, 5 ; liz has thunderstone engine_flag wDailyPhoneItemFlags, 6 ; derek has nugget @@ -169,7 +169,7 @@ EngineFlags: engine_flag wDailyPhoneItemFlags, 9 ; wilton has item (see EVENT_WILTON_HAS_*** in constants/event_flags.asm) engine_flag wDailyPhoneTimeOfDayFlags, 0 ; jack - engine_flag wDailyPhoneTimeOfDayFlags, 1 ; huey ; $88 + engine_flag wDailyPhoneTimeOfDayFlags, 1 ; huey engine_flag wDailyPhoneTimeOfDayFlags, 2 ; gaven engine_flag wDailyPhoneTimeOfDayFlags, 3 ; beth engine_flag wDailyPhoneTimeOfDayFlags, 4 ; jose @@ -177,7 +177,7 @@ EngineFlags: engine_flag wDailyPhoneTimeOfDayFlags, 6 ; joey engine_flag wDailyPhoneTimeOfDayFlags, 7 ; wade engine_flag wDailyPhoneTimeOfDayFlags, 8 ; ralph - engine_flag wDailyPhoneTimeOfDayFlags, 9 ; liz ; $90 + engine_flag wDailyPhoneTimeOfDayFlags, 9 ; liz engine_flag wDailyPhoneTimeOfDayFlags, 10 ; anthony engine_flag wDailyPhoneTimeOfDayFlags, 11 ; todd engine_flag wDailyPhoneTimeOfDayFlags, 12 ; gina @@ -185,7 +185,7 @@ EngineFlags: engine_flag wDailyPhoneTimeOfDayFlags, 14 ; alan engine_flag wDailyPhoneTimeOfDayFlags, 15 ; dana engine_flag wDailyPhoneTimeOfDayFlags, 16 ; chad - engine_flag wDailyPhoneTimeOfDayFlags, 17 ; tully ; $98 + engine_flag wDailyPhoneTimeOfDayFlags, 17 ; tully engine_flag wDailyPhoneTimeOfDayFlags, 18 ; brent engine_flag wDailyPhoneTimeOfDayFlags, 19 ; tiffany engine_flag wDailyPhoneTimeOfDayFlags, 20 ; vance @@ -195,5 +195,5 @@ EngineFlags: engine_flag wPlayerSpriteSetupFlags, PLAYERSPRITESETUP_FEMALE_TO_MALE_F - engine_flag wSwarmFlags, SWARMFLAGS_DUNSPARCE_SWARM_F ; $a0 + engine_flag wSwarmFlags, SWARMFLAGS_DUNSPARCE_SWARM_F engine_flag wSwarmFlags, SWARMFLAGS_YANMA_SWARM_F diff --git a/data/predef_pointers.asm b/data/predef_pointers.asm index a35a380b8..b7b034c91 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,7 +23,7 @@ PredefPointers:: add_predef CalcMonStatC add_predef CanLearnTMHMMove add_predef GetTMHMMove - add_predef LinkTextboxAtHL ; $ 10 + add_predef LinkTextboxAtHL add_predef PrintMoveDescription add_predef UpdatePlayerHUD add_predef PlaceGraphic @@ -31,7 +31,7 @@ PredefPointers:: 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 GetAnimatedFrontpic add_predef GetTrainerPic - add_predef DecompressGet2bpp ; $40 + add_predef DecompressGet2bpp add_predef CheckTypeMatchup add_predef ConvertMon_1to2 add_predef NewPokedexEntry @@ -79,6 +79,6 @@ PredefPointers:: add_predef PlaceStatusString add_predef LoadMonAnimation add_predef AnimateFrontpic - add_predef Unused_HOF_AnimateAlignedFrontpic ; $48 + add_predef Unused_HOF_AnimateAlignedFrontpic add_predef HOF_AnimateFrontpic dbw -1, InexplicablyEmptyFunction ; ??? diff --git a/data/special_pointers.asm b/data/special_pointers.asm index 23504c8b3..8ed043e5c 100644 --- a/data/special_pointers.asm +++ b/data/special_pointers.asm @@ -7,7 +7,7 @@ add_special: MACRO ENDM SpecialsPointers:: - add_special WarpToSpawnPoint ; $0 + add_special WarpToSpawnPoint ; Communications add_special SetBitsForLinkTradeRequest @@ -17,7 +17,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 @@ -25,7 +25,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 @@ -35,7 +35,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 @@ -43,7 +43,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 @@ -51,7 +51,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 @@ -59,7 +59,7 @@ SpecialsPointers:: add_special ClearBGPalettesBufferScreen add_special FadeOutPalettes add_special BattleTowerFade - add_special FadeBlackQuickly ; $30 + add_special FadeBlackQuickly add_special FadeInPalettes add_special FadeInQuickly add_special ReloadSpritesNoPalettes ; bank 0 @@ -67,7 +67,7 @@ SpecialsPointers:: add_special UpdateTimePals ; bank 0 add_special ClearTilemap ; bank 0 add_special UpdateSprites ; bank 0 - add_special ReplaceKrisSprite ; $38 ; bank 0 + add_special ReplaceKrisSprite ; bank 0 add_special GameCornerPrizeMonCheckDex add_special UnusedSetSeenMon add_special WaitSFX ; bank 0 @@ -75,7 +75,7 @@ SpecialsPointers:: add_special RestartMapMusic ; bank 0 add_special HealMachineAnim add_special SurfStartStep - add_special FindPartyMonAboveLevel ; $40 + add_special FindPartyMonAboveLevel add_special FindPartyMonAtLeastThatHappy add_special FindPartyMonThatSpecies add_special FindPartyMonThatSpeciesYourTrainerID @@ -83,7 +83,7 @@ SpecialsPointers:: add_special DayCareMon1 add_special DayCareMon2 add_special SelectRandomBugContestContestants - add_special ActivateFishingSwarm ; $48 + add_special ActivateFishingSwarm add_special ToggleMaptileDecorations add_special ToggleDecorationsVisibility add_special GiveShuckle @@ -91,7 +91,7 @@ SpecialsPointers:: add_special BillsGrandfather add_special CheckPokerus add_special DisplayCoinCaseBalance - add_special DisplayMoneyAndCoinBalance ; $50 + add_special DisplayMoneyAndCoinBalance add_special PlaceMoneyTopRight add_special CheckForLuckyNumberWinners add_special CheckLuckyNumberShowFlag @@ -99,7 +99,7 @@ SpecialsPointers:: add_special PrintTodaysLuckyNumber add_special SelectApricornForKurt add_special NameRater - add_special DisplayLinkRecord ; $58 + add_special DisplayLinkRecord add_special GetFirstPokemonHappiness add_special CheckFirstMonIsEgg add_special RandomUnseenWildMon @@ -107,7 +107,7 @@ SpecialsPointers:: add_special RandomPhoneMon add_special LoadUsedSpritesGFX add_special PlaySlowCry - add_special SnorlaxAwake ; $60 + add_special SnorlaxAwake add_special OlderHaircutBrother add_special YoungerHaircutBrother add_special DaisysGrooming @@ -115,7 +115,7 @@ SpecialsPointers:: add_special ProfOaksPCBoot add_special GameboyCheck add_special TrainerHouse - add_special PhotoStudio ; $68 + add_special PhotoStudio add_special InitRoamMons add_special FadeOutMusic add_special Diploma @@ -125,7 +125,7 @@ SpecialsPointers:: add_special Function11ac3e add_special Function11b444 add_special Function11b5e8 - add_special Function11b7e5 ; $70 + add_special Function11b7e5 add_special Function11b879 add_special Function11b920 add_special Function11b93b @@ -133,7 +133,7 @@ SpecialsPointers:: add_special Function1700ba add_special Function170114 add_special BattleTowerBattle - add_special Function1704e1 ; $78 + add_special Function1704e1 add_special DummySpecial_17021d add_special LoadOpponentTrainerAndPokemonWithOTSprite add_special Function11ba38 @@ -141,7 +141,7 @@ SpecialsPointers:: add_special GiveOddEgg add_special Reset ; bank 0 add_special Function1011f1 - add_special Function101220 ; $80 + add_special Function101220 add_special Function101225 add_special Function101231 add_special MoveTutor @@ -149,7 +149,7 @@ SpecialsPointers:: add_special Function11c1ab add_special BattleTowerAction add_special DisplayUnownWords - add_special Menu_ChallengeExplanationCancel ; $88 + add_special Menu_ChallengeExplanationCancel add_special Function17d2b6 add_special Function17d2ce add_special BattleTowerMobileError @@ -157,7 +157,7 @@ SpecialsPointers:: add_special HoOhChamber add_special Function102142 add_special CelebiShrineEvent - add_special CheckCaughtCelebi ; $90 + add_special CheckCaughtCelebi add_special PokeSeer add_special BuenasPassword add_special BuenaPrize @@ -165,7 +165,7 @@ SpecialsPointers:: add_special SampleKenjiBreakCountdown add_special BeastsCheck add_special MonCheck - add_special SetPlayerPalette ; $98 + add_special SetPlayerPalette add_special DummySpecial_170bd2 add_special Mobile_SelectThreeMons add_special Function1037eb @@ -173,7 +173,7 @@ SpecialsPointers:: add_special StubbedTrainerRankings_Healings add_special RefreshSprites add_special Function1037c2 - add_special Mobile_DummyReturnFalse ; $a0 + add_special Mobile_DummyReturnFalse add_special Function103780 add_special Function10387b add_special AskRememberPassword @@ -181,4 +181,4 @@ SpecialsPointers:: add_special UnusedFindItemInPCOrBag add_special InitialSetDSTFlag add_special InitialClearDSTFlag - add_special DummySpecial_c224 ; $a8 + add_special DummySpecial_c224 |