diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-10-28 13:35:39 -0400 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-10-28 14:34:38 -0400 |
| commit | ea426a88794b1d216a278b54d18cefafbf7d8771 (patch) | |
| tree | 732c7a81c528251b651b6441d0f4a974548beb2c /data | |
| parent | 6d333bed5fde0c2da0a6a9df2ccae83933400e42 (diff) | |
Identify more WRAM labels, and start a <X>_DummyFunction label convention
Diffstat (limited to 'data')
| -rw-r--r-- | data/events/engine_flags.asm | 2 | ||||
| -rw-r--r-- | data/events/special_pointers.asm | 20 |
2 files changed, 11 insertions, 11 deletions
diff --git a/data/events/engine_flags.asm b/data/events/engine_flags.asm index f43e64aea..526413651 100644 --- a/data/events/engine_flags.asm +++ b/data/events/engine_flags.asm @@ -125,7 +125,7 @@ EngineFlags: engine_flag wSwarmFlags, SWARMFLAGS_BUENAS_PASSWORD_F engine_flag wSwarmFlags, SWARMFLAGS_GOLDENROD_DEPT_STORE_SALE_F - engine_flag wGameTimerPause, GAMETIMERPAUSE_MOBILE_7_F + engine_flag wGameTimerPaused, GAME_TIMER_MOBILE_F engine_flag wPlayerGender, PLAYERGENDER_FEMALE_F diff --git a/data/events/special_pointers.asm b/data/events/special_pointers.asm index e1702991c..5d6b0a16e 100644 --- a/data/events/special_pointers.asm +++ b/data/events/special_pointers.asm @@ -55,8 +55,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 BattleTowerFade add_special FadeBlackQuickly @@ -65,21 +65,21 @@ SpecialsPointers:: add_special ReloadSpritesNoPalettes ; bank 0 add_special ClearBGPalettes ; bank 0 add_special UpdateTimePals ; bank 0 - add_special ClearTilemap ; bank 0 + add_special ClearTilemap ; bank 0; unused as special add_special UpdateSprites ; bank 0 add_special UpdatePlayerSprite ; bank 0 add_special GameCornerPrizeMonCheckDex - add_special UnusedSetSeenMon + add_special UnusedSetSeenMon ; unused add_special WaitSFX ; bank 0 add_special PlayMapMusic ; bank 0 add_special RestartMapMusic ; bank 0 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 @@ -134,7 +134,7 @@ SpecialsPointers:: add_special Function170114 add_special BattleTowerBattle add_special Function1704e1 - add_special DummySpecial_17021d + add_special UnusedBattleTowerDummySpecial1 add_special LoadOpponentTrainerAndPokemonWithOTSprite add_special Function11ba38 add_special CheckForBattleTowerRules @@ -166,7 +166,7 @@ SpecialsPointers:: add_special BeastsCheck add_special MonCheck add_special SetPlayerPalette - add_special DummySpecial_170bd2 + add_special UnusedBattleTowerDummySpecial2 add_special Mobile_SelectThreeMons add_special Function1037eb add_special Function10383c @@ -181,4 +181,4 @@ SpecialsPointers:: add_special UnusedFindItemInPCOrBag add_special InitialSetDSTFlag add_special InitialClearDSTFlag - add_special DummySpecial_c224 + add_special UnusedDummySpecial ; unused |