diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2018-01-24 11:20:41 -0500 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2018-01-24 11:20:41 -0500 |
| commit | 95fd05744d0577c61deef4d51ed73b43845c9bcf (patch) | |
| tree | ad9e460b242878ae26474f4e2d3a47d03eba8ad7 | |
| parent | d719d318e8b2de51e818485423ac878d20dd295a (diff) | |
Remove "UnusedSpecial_" prefixes too
| -rw-r--r-- | data/special_pointers.asm | 8 | ||||
| -rwxr-xr-x | engine/events/battle_tower/battle_tower.asm | 2 | ||||
| -rw-r--r-- | engine/specials.asm | 4 | ||||
| -rwxr-xr-x | mobile/mobile_12_2.asm | 2 |
4 files changed, 8 insertions, 8 deletions
diff --git a/data/special_pointers.asm b/data/special_pointers.asm index 575d9fa33..2c049c77f 100644 --- a/data/special_pointers.asm +++ b/data/special_pointers.asm @@ -69,7 +69,7 @@ SpecialsPointers:: ; c029 add_special UpdateSprites ; bank 0 add_special ReplaceKrisSprite ; bank 0 add_special GameCornerPrizeMonCheckDex - add_special UnusedSpecial_SeenMon + add_special UnusedSetSeenMon add_special WaitSFX ; bank 0 add_special PlayMapMusic ; bank 0 add_special RestartMapMusic ; bank 0 @@ -79,7 +79,7 @@ SpecialsPointers:: ; c029 add_special FindPartyMonAtLeastThatHappy add_special FindPartyMonThatSpecies add_special FindPartyMonThatSpeciesYourTrainerID - add_special UnusedSpecial_CheckUnusedTwoDayTimer + add_special UnusedCheckUnusedTwoDayTimer add_special DayCareMon1 add_special DayCareMon2 add_special SelectRandomBugContestContestants @@ -133,7 +133,7 @@ SpecialsPointers:: ; c029 add_special Function1700ba add_special Function170114 add_special BattleTowerBattle - add_special UnusedSpecial_Function1704e1 + add_special Function1704e1 add_special DummySpecial_17021d add_special LoadOpponentTrainerAndPokemonWithOTSprite add_special Function11ba38 @@ -178,7 +178,7 @@ SpecialsPointers:: ; c029 add_special Function10387b add_special AskRememberPassword add_special LoadMapPalettes - add_special UnusedSpecial_FindItemInPCOrBag + add_special UnusedFindItemInPCOrBag add_special InitialSetDSTFlag add_special InitialClearDSTFlag add_special DummySpecial_c224 diff --git a/engine/events/battle_tower/battle_tower.asm b/engine/events/battle_tower/battle_tower.asm index 9cf6917b2..887457e2c 100755 --- a/engine/events/battle_tower/battle_tower.asm +++ b/engine/events/battle_tower/battle_tower.asm @@ -619,7 +619,7 @@ Unreferenced_Function1704ca: ; 1704ca ret ; 1704e1 -UnusedSpecial_Function1704e1: ; 1704e1 +Function1704e1: ; 1704e1 call SpeechTextBox call FadeToMenu call InitBattleTowerChallengeRAM diff --git a/engine/specials.asm b/engine/specials.asm index 2193106e7..dc4ce32c4 100644 --- a/engine/specials.asm +++ b/engine/specials.asm @@ -43,7 +43,7 @@ GameCornerPrizeMonCheckDex: ; c230 ret ; c252 -UnusedSpecial_SeenMon: ; c252 +UnusedSetSeenMon: ; c252 ld a, [ScriptVar] dec a call SetSeenMon @@ -307,7 +307,7 @@ ScriptReturnCarry: ; c3e2 ret ; c3ef -UnusedSpecial_CheckUnusedTwoDayTimer: ; c3ef +UnusedCheckUnusedTwoDayTimer: ; c3ef farcall CheckUnusedTwoDayTimer ld a, [wUnusedTwoDayTimer] ld [ScriptVar], a diff --git a/mobile/mobile_12_2.asm b/mobile/mobile_12_2.asm index 14d8c6e65..3b1da1f93 100755 --- a/mobile/mobile_12_2.asm +++ b/mobile/mobile_12_2.asm @@ -159,7 +159,7 @@ MobileCheckOwnMonAnywhere: ; 4a843 ret ; 4a927 -UnusedSpecial_FindItemInPCOrBag: ; 4a927 +UnusedFindItemInPCOrBag: ; 4a927 ld a, [ScriptVar] ld [CurItem], a ld hl, PCItems |