diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-07-22 20:23:19 -0400 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-07-22 20:23:19 -0400 |
| commit | 31287c6aaa71f863a282ccf8ebf43479adff2296 (patch) | |
| tree | cd1728b263d708cb9c821d0e2f6536301c434e82 /data/events | |
| parent | 3f392c279248562068a80ceaf2884f62a18f6e17 (diff) | |
Revert "Factor out tables into data/overworld/"
This reverts commit 3f392c279248562068a80ceaf2884f62a18f6e17.
Diffstat (limited to 'data/events')
| -rw-r--r-- | data/events/engine_flags.asm | 120 | ||||
| -rw-r--r-- | data/events/special_pointers.asm | 130 | ||||
| -rw-r--r-- | data/events/std_scripts.asm | 52 |
3 files changed, 0 insertions, 302 deletions
diff --git a/data/events/engine_flags.asm b/data/events/engine_flags.asm deleted file mode 100644 index bd135f36..00000000 --- a/data/events/engine_flags.asm +++ /dev/null @@ -1,120 +0,0 @@ -engine_flag: MACRO -; location, bit -; (all locations are in WRAM bank 1) - dwb \1 + (\2 / 8), 1 << (\2 % 8) -ENDM - -EngineFlags: -; entries correspond to ENGINE_* constants - - ; pokegear - 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 - engine_flag wPokegearFlags, POKEGEAR_OBTAINED_F - - ; day-care - engine_flag wDayCareMan, DAYCAREMAN_HAS_EGG_F - engine_flag wDayCareMan, DAYCAREMAN_HAS_MON_F - engine_flag wDayCareLady, DAYCARELADY_HAS_MON_F - - 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 - - engine_flag wStatusFlags, STATUSFLAGS_POKEDEX_F - engine_flag wStatusFlags, STATUSFLAGS_UNOWN_DEX_F - engine_flag wStatusFlags, STATUSFLAGS_CAUGHT_POKERUS_F - engine_flag wStatusFlags, STATUSFLAGS_ROCKET_SIGNAL_F - engine_flag wStatusFlags, STATUSFLAGS_HALL_OF_FAME_F - - 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 - engine_flag wStatusFlags2, STATUSFLAGS2_UNUSED_5_F - engine_flag wStatusFlags2, STATUSFLAGS2_REACHED_GOLDENROD_F - engine_flag wStatusFlags2, STATUSFLAGS2_ROCKETS_IN_MAHOGANY_F - - engine_flag wBikeFlags, BIKEFLAGS_STRENGTH_ACTIVE_F - engine_flag wBikeFlags, BIKEFLAGS_ALWAYS_ON_BIKE_F - engine_flag wBikeFlags, BIKEFLAGS_DOWNHILL_F - - engine_flag wJohtoBadges, ZEPHYRBADGE - engine_flag wJohtoBadges, HIVEBADGE - engine_flag wJohtoBadges, PLAINBADGE - engine_flag wJohtoBadges, FOGBADGE - engine_flag wJohtoBadges, MINERALBADGE - engine_flag wJohtoBadges, STORMBADGE - engine_flag wJohtoBadges, GLACIERBADGE - engine_flag wJohtoBadges, RISINGBADGE - - engine_flag wKantoBadges, BOULDERBADGE - engine_flag wKantoBadges, CASCADEBADGE - engine_flag wKantoBadges, THUNDERBADGE - engine_flag wKantoBadges, RAINBOWBADGE - engine_flag wKantoBadges, SOULBADGE - engine_flag wKantoBadges, MARSHBADGE - engine_flag wKantoBadges, VOLCANOBADGE - engine_flag wKantoBadges, EARTHBADGE - - ; unown sets (see data/wild/unlocked_unowns.asm) - engine_flag wUnlockedUnowns, 0 ; A-K - engine_flag wUnlockedUnowns, 1 ; L-R - engine_flag wUnlockedUnowns, 2 ; S-W - engine_flag wUnlockedUnowns, 3 ; X-Z - engine_flag wUnlockedUnowns, 4 ; unused - engine_flag wUnlockedUnowns, 5 ; unused - engine_flag wUnlockedUnowns, 6 ; unused - engine_flag wUnlockedUnowns, 7 ; unused - - ; fly - engine_flag wVisitedSpawns, SPAWN_HOME - engine_flag wVisitedSpawns, SPAWN_DEBUG - engine_flag wVisitedSpawns, SPAWN_PALLET - engine_flag wVisitedSpawns, SPAWN_VIRIDIAN - engine_flag wVisitedSpawns, SPAWN_PEWTER - engine_flag wVisitedSpawns, SPAWN_CERULEAN - engine_flag wVisitedSpawns, SPAWN_ROCK_TUNNEL - engine_flag wVisitedSpawns, SPAWN_VERMILION - engine_flag wVisitedSpawns, SPAWN_LAVENDER - engine_flag wVisitedSpawns, SPAWN_SAFFRON - engine_flag wVisitedSpawns, SPAWN_CELADON - engine_flag wVisitedSpawns, SPAWN_FUCHSIA - engine_flag wVisitedSpawns, SPAWN_CINNABAR - engine_flag wVisitedSpawns, SPAWN_INDIGO - engine_flag wVisitedSpawns, SPAWN_NEW_BARK - engine_flag wVisitedSpawns, SPAWN_CHERRYGROVE - engine_flag wVisitedSpawns, SPAWN_VIOLET - engine_flag wVisitedSpawns, SPAWN_AZALEA - engine_flag wVisitedSpawns, SPAWN_CIANWOOD - engine_flag wVisitedSpawns, SPAWN_GOLDENROD - engine_flag wVisitedSpawns, SPAWN_OLIVINE - engine_flag wVisitedSpawns, SPAWN_ECRUTEAK - engine_flag wVisitedSpawns, SPAWN_MAHOGANY - engine_flag wVisitedSpawns, SPAWN_LAKE_OF_RAGE - engine_flag wVisitedSpawns, SPAWN_BLACKTHORN - engine_flag wVisitedSpawns, SPAWN_MT_SILVER - engine_flag wVisitedSpawns, NUM_SPAWNS ; unused - - engine_flag wLuckyNumberShowFlag, LUCKYNUMBERSHOW_GAME_OVER_F - - engine_flag wStatusFlags2, STATUSFLAGS2_UNUSED_3_F - - engine_flag wDailyFlags1, DAILYFLAGS1_KURT_MAKING_BALLS_F - 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 - engine_flag wDailyFlags1, DAILYFLAGS1_GOT_SHUCKIE_TODAY_F - engine_flag wDailyFlags1, DAILYFLAGS1_GOLDENROD_UNDERGROUND_BARGAIN_F - engine_flag wDailyFlags1, DAILYFLAGS1_TRAINER_HOUSE_F - - 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 - engine_flag wDailyFlags2, DAILYFLAGS2_DAISYS_GROOMING_F - engine_flag wDailyFlags2, DAILYFLAGS2_INDIGO_PLATEAU_RIVAL_FIGHT_F diff --git a/data/events/special_pointers.asm b/data/events/special_pointers.asm deleted file mode 100644 index b7e4d213..00000000 --- a/data/events/special_pointers.asm +++ /dev/null @@ -1,130 +0,0 @@ -; Special routines can be used with the "special" map script command. -; They often use wScriptVar for arguments and return values. - -add_special: MACRO -; Some ROM0 specials have a nonzero bank. -\1Special:: -IF _NARG == 1 - dba \1 -ELSE - dbw \2, \1 -ENDC -ENDM - -SpecialsPointers:: - add_special WarpToSpawnPoint - -; Communications - add_special SetBitsForLinkTradeRequest - add_special WaitForLinkedFriend - add_special CheckLinkTimeout - add_special TryQuickSave - add_special CheckBothSelectedSameRoom - add_special FailedLinkToPast - add_special CloseLink - add_special WaitForOtherPlayerToExit - add_special SetBitsForBattleRequest - add_special SetBitsForTimeCapsuleRequest - add_special CheckTimeCapsuleCompatibility - add_special EnterTimeCapsule - add_special TradeCenter - add_special Colosseum - add_special TimeCapsule - add_special CableClubCheckWhichChris - add_special CheckMysteryGift - add_special GetMysteryGiftItem - add_special UnlockMysteryGift - -; Map events - add_special BugContestJudging - add_special CheckPartyFullAfterContest - add_special ContestDropOffMons - add_special ContestReturnMons - add_special GiveParkBalls - add_special CheckMagikarpLength - add_special MagikarpHouseSign - add_special HealParty ; this is both a special and a predef - add_special PokemonCenterPC - add_special PlayersHousePC - add_special DayCareMan - add_special DayCareLady - add_special DayCareManOutside - add_special MoveDeletion - add_special BankOfMom - add_special MagnetTrain - add_special NameRival - add_special SetDayOfWeek - add_special OverworldTownMap - add_special UnownPrinter - add_special MapRadio - add_special UnownPuzzle - add_special SlotMachine - add_special CardFlip - add_special DummyNonfunctionalGameCornerGame - add_special ClearBGPalettesBufferScreen - add_special FadeOutPalettes - add_special FadeBlackQuickly - add_special FadeInPalettes - add_special FadeInQuickly - add_special ReloadSpritesNoPalettes, 2 - add_special ClearBGPalettes - add_special UpdateTimePals - add_special ClearTilemap - add_special UpdateSprites - add_special UpdatePlayerSprite - add_special GameCornerPrizeMonCheckDex - add_special UnusedSetSeenMon - add_special WaitSFX, 3 - add_special PlayMapMusic - add_special RestartMapMusic - add_special HealMachineAnim - add_special SurfStartStep - add_special FindPartyMonAboveLevel - add_special FindPartyMonAtLeastThatHappy - add_special FindPartyMonThatSpecies - add_special FindPartyMonThatSpeciesYourTrainerID - add_special UnusedCheckUnusedTwoDayTimer - add_special DayCareMon1 - add_special DayCareMon2 - add_special SelectRandomBugContestContestants - add_special ActivateFishingSwarm - add_special ToggleMaptileDecorations - add_special ToggleDecorationsVisibility - add_special GiveShuckle - add_special ReturnShuckle - add_special BillsGrandfather - add_special CheckPokerus - add_special DisplayCoinCaseBalance - add_special DisplayMoneyAndCoinBalance - add_special PlaceMoneyTopRight - add_special CheckForLuckyNumberWinners - add_special CheckLuckyNumberShowFlag - add_special ResetLuckyNumberShowFlag - add_special PrintTodaysLuckyNumber - add_special SelectApricornForKurt - add_special NameRater - add_special DisplayLinkRecord - add_special GetFirstPokemonHappiness - add_special CheckFirstMonIsEgg - add_special RandomUnseenWildMon - add_special RandomPhoneWildMon - add_special RandomPhoneMon - add_special LoadUsedSpritesGFX - add_special PlaySlowCry - add_special SnorlaxAwake - add_special OlderHaircutBrother - add_special YoungerHaircutBrother - add_special DaisysGrooming - add_special PlayCurMonCry - add_special ProfOaksPCBoot - add_special GameboyCheck - add_special TrainerHouse - add_special PhotoStudio - add_special InitRoamMons - add_special FadeOutMusic - add_special Diploma - add_special PrintDiploma - add_special InitialSetDSTFlag - add_special InitialClearDSTFlag - add_special MrChrono - add_special DummySpecial_c389 diff --git a/data/events/std_scripts.asm b/data/events/std_scripts.asm deleted file mode 100644 index 2a7b48b9..00000000 --- a/data/events/std_scripts.asm +++ /dev/null @@ -1,52 +0,0 @@ -add_stdscript: MACRO -\1StdScript:: - dba \1 -ENDM - -StdScripts:: - add_stdscript PokecenterNurseScript - add_stdscript DifficultBookshelfScript - add_stdscript PictureBookshelfScript - add_stdscript MagazineBookshelfScript - add_stdscript TeamRocketOathScript - add_stdscript IncenseBurnerScript - add_stdscript MerchandiseShelfScript - add_stdscript TownMapScript - add_stdscript WindowScript - add_stdscript TVScript - add_stdscript HomepageScript ; unused - add_stdscript Radio1Script - add_stdscript Radio2Script - add_stdscript TrashCanScript - add_stdscript StrengthBoulderScript - add_stdscript SmashRockScript - add_stdscript PokecenterSignScript - add_stdscript MartSignScript - add_stdscript GoldenrodRocketsScript - add_stdscript RadioTowerRocketsScript - add_stdscript ElevatorButtonScript - add_stdscript DayToTextScript - add_stdscript BugContestResultsWarpScript - add_stdscript BugContestResultsScript - add_stdscript InitializeEventsScript - add_stdscript AskNumber1MScript - add_stdscript AskNumber2MScript - add_stdscript RegisteredNumberMScript - add_stdscript NumberAcceptedMScript - add_stdscript NumberDeclinedMScript - add_stdscript PhoneFullMScript - add_stdscript RematchMScript - add_stdscript AskNumber1FScript - add_stdscript AskNumber2FScript - add_stdscript RegisteredNumberFScript - add_stdscript NumberAcceptedFScript - add_stdscript NumberDeclinedFScript - add_stdscript PhoneFullFScript - add_stdscript RematchFScript - add_stdscript GymStatue1Script - add_stdscript GymStatue2Script - add_stdscript ReceiveItemScript - add_stdscript ReceiveTogepiEggScript - add_stdscript PCScript - add_stdscript GameCornerCoinVendorScript - add_stdscript HappinessCheckScript |
