Rename some routines to avoid conflicts when removing "Special_" prefixes

This commit is contained in:
Rangi
2018-01-24 11:12:02 -05:00
parent 505a6595bc
commit 132fe46925
24 changed files with 76 additions and 76 deletions

View File

@@ -1655,7 +1655,7 @@ DummySpecial_170bd2: ; 170bd2
; 170bd3
Special_CheckForBattleTowerRules: ; 170bd3
farcall CheckForBattleTowerRules
farcall _CheckForBattleTowerRules
jr c, .asm_170bde
xor a ; FALSE
jr .asm_170be0

View File

@@ -29,7 +29,7 @@ CheckForMobileBattleRules: ; 8b1e1
db "@"
; 0x8b201
CheckForBattleTowerRules: ; 8b201
_CheckForBattleTowerRules: ; 8b201
ld hl, StringBuffer2
ld [hl], "3"
inc hl

View File

@@ -1,4 +1,4 @@
NameRater: ; fb6ed
_NameRater: ; fb6ed
; Introduce himself
ld hl, NameRaterIntroText
call PrintText

View File

@@ -1,4 +1,4 @@
GiveOddEgg: ; 1fb4b6
_GiveOddEgg: ; 1fb4b6
; Figure out which egg to give.
; Compare a random word to

View File

@@ -1,4 +1,4 @@
CheckPokerus: ; 4d860
_CheckPokerus: ; 4d860
; Return carry if a monster in your party has Pokerus
; Get number of monsters to iterate over

View File

@@ -1,4 +1,4 @@
UnownPrinter: ; 16be4
_UnownPrinter: ; 16be4
ld a, [UnownDex]
and a
ret z

View File

@@ -184,7 +184,7 @@ TownMapScript:
opentext
farwritetext TownMapText
waitbutton
special Special_TownMap
special Special_OverworldTownMap
closetext
end