You've already forked pokecrystal-board
mirror of
https://gitlab.com/xCrystal/pokecrystal-board.git
synced 2025-09-08 08:13:02 -07:00
Rename some routines to avoid conflicts when removing "Special_" prefixes
This commit is contained in:
@@ -8709,7 +8709,7 @@ IsMobileBattle2: ; 3f830
|
||||
ret
|
||||
; 3f836
|
||||
|
||||
DisplayLinkRecord: ; 3f836
|
||||
_DisplayLinkRecord: ; 3f836
|
||||
ld a, BANK(sLinkBattleStats)
|
||||
call GetSRAMBank
|
||||
|
||||
|
||||
@@ -1102,7 +1102,7 @@ DecorationDesc_TownMapPoster: ; 0x26f91
|
||||
opentext
|
||||
writetext .TownMapText
|
||||
waitbutton
|
||||
special Special_TownMap
|
||||
special Special_OverworldTownMap
|
||||
closetext
|
||||
end
|
||||
; 0x26f9b
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -29,7 +29,7 @@ CheckForMobileBattleRules: ; 8b1e1
|
||||
db "@"
|
||||
; 0x8b201
|
||||
|
||||
CheckForBattleTowerRules: ; 8b201
|
||||
_CheckForBattleTowerRules: ; 8b201
|
||||
ld hl, StringBuffer2
|
||||
ld [hl], "3"
|
||||
inc hl
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
NameRater: ; fb6ed
|
||||
_NameRater: ; fb6ed
|
||||
; Introduce himself
|
||||
ld hl, NameRaterIntroText
|
||||
call PrintText
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
GiveOddEgg: ; 1fb4b6
|
||||
_GiveOddEgg: ; 1fb4b6
|
||||
; Figure out which egg to give.
|
||||
|
||||
; Compare a random word to
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
UnownPrinter: ; 16be4
|
||||
_UnownPrinter: ; 16be4
|
||||
ld a, [UnownDex]
|
||||
and a
|
||||
ret z
|
||||
|
||||
@@ -184,7 +184,7 @@ TownMapScript:
|
||||
opentext
|
||||
farwritetext TownMapText
|
||||
waitbutton
|
||||
special Special_TownMap
|
||||
special Special_OverworldTownMap
|
||||
closetext
|
||||
end
|
||||
|
||||
|
||||
@@ -35,7 +35,7 @@ LinkCommunications: ; 28000
|
||||
cp LINK_TIMECAPSULE
|
||||
jp nz, Gen2ToGen2LinkComms
|
||||
|
||||
TimeCapsule: ; 2805d
|
||||
Gen2ToGen1LinkComms: ; 2805d
|
||||
call ClearLinkData
|
||||
call Link_PrepPartyData_Gen1
|
||||
call FixDataForLinkTransfer
|
||||
@@ -1970,7 +1970,7 @@ LinkTrade: ; 28b87
|
||||
call DelayFrames
|
||||
ld a, [wLinkMode]
|
||||
cp LINK_TIMECAPSULE
|
||||
jp z, TimeCapsule
|
||||
jp z, Gen2ToGen1LinkComms
|
||||
jp Gen2ToGen2LinkComms
|
||||
; 28ea3
|
||||
|
||||
|
||||
@@ -2572,7 +2572,7 @@ ContinueSpawnFacing: ; 57db
|
||||
ret
|
||||
; 57e2
|
||||
|
||||
SetPlayerPalette: ; 57e2
|
||||
_SetPlayerPalette: ; 57e2
|
||||
ld a, d
|
||||
and %10000000
|
||||
ret z
|
||||
|
||||
@@ -1,18 +1,18 @@
|
||||
_FindGreaterThanThatLevel: ; 4dbd2
|
||||
_FindPartyMonGreaterThanThatLevel: ; 4dbd2
|
||||
ld hl, PartyMon1Level
|
||||
call FindGreaterThanThatLevel
|
||||
ret
|
||||
|
||||
_FindAtLeastThatHappy: ; 4dbd9
|
||||
_FindPartyMonAtLeastThatHappy: ; 4dbd9
|
||||
ld hl, PartyMon1Happiness
|
||||
call FindAtLeastThatHappy
|
||||
ret
|
||||
|
||||
_FindThatSpecies: ; 4dbe0
|
||||
_FindPartyMonThatSpecies: ; 4dbe0
|
||||
ld hl, PartyMon1Species
|
||||
jp FindThatSpecies
|
||||
|
||||
_FindThatSpeciesYourTrainerID: ; 4dbe6
|
||||
_FindPartyMonThatSpeciesYourTrainerID: ; 4dbe6
|
||||
ld hl, PartyMon1Species
|
||||
call FindThatSpecies
|
||||
ret z
|
||||
|
||||
@@ -23,7 +23,7 @@ DummySpecial_c224: ; c224
|
||||
Special_SetPlayerPalette: ; c225
|
||||
ld a, [ScriptVar]
|
||||
ld d, a
|
||||
farcall SetPlayerPalette
|
||||
farcall _SetPlayerPalette
|
||||
ret
|
||||
; c230
|
||||
|
||||
@@ -50,31 +50,31 @@ UnusedSpecial_SeenMon: ; c252
|
||||
ret
|
||||
; c25a
|
||||
|
||||
Special_FindGreaterThanThatLevel: ; c25a
|
||||
Special_FindPartyMonGreaterThanThatLevel: ; c25a
|
||||
ld a, [ScriptVar]
|
||||
ld b, a
|
||||
farcall _FindGreaterThanThatLevel
|
||||
farcall _FindPartyMonGreaterThanThatLevel
|
||||
jr z, FoundNone
|
||||
jr FoundOne
|
||||
|
||||
Special_FindAtLeastThatHappy: ; c268
|
||||
Special_FindPartyMonAtLeastThatHappy: ; c268
|
||||
ld a, [ScriptVar]
|
||||
ld b, a
|
||||
farcall _FindAtLeastThatHappy
|
||||
farcall _FindPartyMonAtLeastThatHappy
|
||||
jr z, FoundNone
|
||||
jr FoundOne
|
||||
|
||||
Special_FindThatSpecies: ; c276
|
||||
Special_FindPartyMonThatSpecies: ; c276
|
||||
ld a, [ScriptVar]
|
||||
ld b, a
|
||||
farcall _FindThatSpecies
|
||||
farcall _FindPartyMonThatSpecies
|
||||
jr z, FoundNone
|
||||
jr FoundOne
|
||||
|
||||
Special_FindThatSpeciesYourTrainerID: ; c284
|
||||
Special_FindPartyMonThatSpeciesYourTrainerID: ; c284
|
||||
ld a, [ScriptVar]
|
||||
ld b, a
|
||||
farcall _FindThatSpeciesYourTrainerID
|
||||
farcall _FindPartyMonThatSpeciesYourTrainerID
|
||||
jr z, FoundNone
|
||||
jr FoundOne
|
||||
|
||||
@@ -104,11 +104,11 @@ DefaultRivalName: ; 0xc2b2
|
||||
db "SILVER@"
|
||||
|
||||
Special_NameRater: ; c2b9
|
||||
farcall NameRater
|
||||
farcall _NameRater
|
||||
ret
|
||||
; c2c0
|
||||
|
||||
Special_TownMap: ; c2c0
|
||||
Special_OverworldTownMap: ; c2c0
|
||||
call FadeToMenu
|
||||
farcall _TownMap
|
||||
call ExitAllMenus
|
||||
@@ -117,14 +117,14 @@ Special_TownMap: ; c2c0
|
||||
|
||||
Special_UnownPrinter: ; c2cd
|
||||
call FadeToMenu
|
||||
farcall UnownPrinter
|
||||
farcall _UnownPrinter
|
||||
call ExitAllMenus
|
||||
ret
|
||||
; c2da
|
||||
|
||||
Special_DisplayLinkRecord: ; c2da
|
||||
call FadeToMenu
|
||||
farcall DisplayLinkRecord
|
||||
farcall _DisplayLinkRecord
|
||||
call ExitAllMenus
|
||||
ret
|
||||
; c2e7
|
||||
@@ -203,7 +203,7 @@ Special_MapRadio: ; c355
|
||||
|
||||
Special_UnownPuzzle: ; c360
|
||||
call FadeToMenu
|
||||
farcall UnownPuzzle
|
||||
farcall _UnownPuzzle
|
||||
ld a, [wSolvedUnownPuzzle]
|
||||
ld [ScriptVar], a
|
||||
call ExitAllMenus
|
||||
@@ -343,7 +343,7 @@ StoreSwarmMapIndices:: ; c403
|
||||
|
||||
Special_CheckPokerus: ; c419
|
||||
; Check if a monster in your party has Pokerus
|
||||
farcall CheckPokerus
|
||||
farcall _CheckPokerus
|
||||
jp ScriptReturnCarry
|
||||
; c422
|
||||
|
||||
@@ -356,7 +356,7 @@ Special_ResetLuckyNumberShowFlag: ; c422
|
||||
; c434
|
||||
|
||||
Special_CheckLuckyNumberShowFlag: ; c434
|
||||
farcall CheckLuckyNumberShowFlag
|
||||
farcall _CheckLuckyNumberShowFlag
|
||||
jp ScriptReturnCarry
|
||||
; c43d
|
||||
|
||||
|
||||
@@ -261,7 +261,7 @@ RestartLuckyNumberCountdown: ; 1152b
|
||||
ret
|
||||
; 11542
|
||||
|
||||
CheckLuckyNumberShowFlag: ; 11542
|
||||
_CheckLuckyNumberShowFlag: ; 11542
|
||||
ld hl, wLuckyNumberDayBuffer
|
||||
jp CheckDayDependentEventHL
|
||||
; 11548
|
||||
|
||||
@@ -112,7 +112,7 @@ InitClock: ; 90672 (24:4672)
|
||||
jr .HourIsSet
|
||||
|
||||
.MinutesAreSet:
|
||||
call SetTimeOfDay
|
||||
call InitTimeOfDay
|
||||
ld hl, OakText_ResponseToSetTime
|
||||
call PrintText
|
||||
call WaitPressAorB_BlinkCursor
|
||||
@@ -454,7 +454,7 @@ Special_SetDayOfWeek: ; 90913
|
||||
jr c, .loop
|
||||
ld a, [wTempDayOfWeek]
|
||||
ld [StringBuffer2], a
|
||||
call SetDayOfWeek
|
||||
call InitDayOfWeek
|
||||
call LoadStandardFont
|
||||
pop af
|
||||
ld [hInMenu], a
|
||||
|
||||
@@ -3,7 +3,7 @@ PUZZLE_VOID EQU $ef
|
||||
|
||||
puzcoord EQUS "* 6 +"
|
||||
|
||||
UnownPuzzle: ; e1190
|
||||
_UnownPuzzle: ; e1190
|
||||
ld a, [hInMenu]
|
||||
push af
|
||||
ld a, $1
|
||||
|
||||
Reference in New Issue
Block a user