Rooba
/
pokecrystal
mirror of https://github.com/pret/pokecrystal.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
data/special_pointers.asm
View File

@ -49,7 +49,7 @@ SpecialsPointers:: ; c029
add_special Special_MagnetTrain
add_special Special_NameRival
add_special Special_SetDayOfWeek
add_special Special_TownMap
add_special Special_OverworldTownMap
add_special Special_UnownPrinter
add_special Special_MapRadio
add_special Special_UnownPuzzle
@ -75,10 +75,10 @@ SpecialsPointers:: ; c029
add_special RestartMapMusic ; bank 0
add_special Special_HealMachineAnim
add_special Special_SurfStartStep
add_special Special_FindGreaterThanThatLevel
add_special Special_FindAtLeastThatHappy
add_special Special_FindThatSpecies
add_special Special_FindThatSpeciesYourTrainerID
add_special Special_FindPartyMonGreaterThanThatLevel
add_special Special_FindPartyMonAtLeastThatHappy
add_special Special_FindPartyMonThatSpecies
add_special Special_FindPartyMonThatSpeciesYourTrainerID
add_special UnusedSpecial_CheckUnusedTwoDayTimer
add_special Special_DayCareMon1
add_special Special_DayCareMon2

2
engine/battle/core.asm
View File

@ -8709,7 +8709,7 @@ IsMobileBattle2: ; 3f830
ret
; 3f836
DisplayLinkRecord: ; 3f836
_DisplayLinkRecord: ; 3f836
ld a, BANK(sLinkBattleStats)
call GetSRAMBank

2
engine/decorations.asm
View File

@ -1102,7 +1102,7 @@ DecorationDesc_TownMapPoster: ; 0x26f91
opentext
writetext .TownMapText
waitbutton
special Special_TownMap
special Special_OverworldTownMap
closetext
end
; 0x26f9b

2
engine/events/battle_tower/battle_tower.asm
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

2
engine/events/battle_tower/rules.asm
View File

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

2
engine/events/name_rater.asm
View File

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

2
engine/events/odd_egg.asm
View File

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

2
engine/events/pokerus/check_pokerus.asm
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

2
engine/events/print_unown.asm
View File

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

2
engine/events/std_scripts.asm
View File

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

4
engine/link.asm
View File

@ -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

2
engine/map_objects.asm
View File

@ -2572,7 +2572,7 @@ ContinueSpawnFacing: ; 57db
ret
; 57e2
SetPlayerPalette: ; 57e2
_SetPlayerPalette: ; 57e2
ld a, d
and %10000000
ret z

8
engine/search2.asm
View File

@ -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

32
engine/specials.asm
View File

@ -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

2
engine/time.asm
View File

@ -261,7 +261,7 @@ RestartLuckyNumberCountdown: ; 1152b
ret
; 11542
CheckLuckyNumberShowFlag: ; 11542
_CheckLuckyNumberShowFlag: ; 11542
ld hl, wLuckyNumberDayBuffer
jp CheckDayDependentEventHL
; 11548

4
engine/timeset.asm
View File

@ -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

2
engine/unown_puzzle.asm
View File

@ -3,7 +3,7 @@ PUZZLE_VOID EQU $ef
puzcoord EQUS "* 6 +"
UnownPuzzle: ; e1190
_UnownPuzzle: ; e1190
ld a, [hInMenu]
push af
ld a, $1

4
home/time.asm
View File

@ -187,14 +187,14 @@ FixTime:: ; 61d
ret
; 658
SetTimeOfDay:: ; 658
InitTimeOfDay:: ; 658
xor a
ld [StringBuffer2], a
ld a, $0 ; useless
ld [StringBuffer2 + 3], a
jr InitTime
SetDayOfWeek:: ; 663
InitDayOfWeek:: ; 663
call UpdateTime
ld a, [hHours]
ld [StringBuffer2 + 1], a

8
maps/ElmsLab.asm
View File

@ -108,10 +108,10 @@ ElmCheckEverstone:
checkevent EVENT_TOLD_ELM_ABOUT_TOGEPI_OVER_THE_PHONE
iffalse ElmCheckTogepiEgg
writebyte TOGEPI
special Special_FindThatSpeciesYourTrainerID
special Special_FindPartyMonThatSpeciesYourTrainerID
iftrue ShowElmTogepiScript
writebyte TOGETIC
special Special_FindThatSpeciesYourTrainerID
special Special_FindPartyMonThatSpeciesYourTrainerID
iftrue ShowElmTogepiScript
writetext UnknownText_0x79a40
waitbutton
@ -120,10 +120,10 @@ ElmCheckEverstone:
ElmEggHatchedScript:
writebyte TOGEPI
special Special_FindThatSpeciesYourTrainerID
special Special_FindPartyMonThatSpeciesYourTrainerID
iftrue ShowElmTogepiScript
writebyte TOGETIC
special Special_FindThatSpeciesYourTrainerID
special Special_FindPartyMonThatSpeciesYourTrainerID
iftrue ShowElmTogepiScript
jump ElmCheckGotEggAgain

4
maps/GoldenrodCity.asm
View File

@ -52,7 +52,7 @@ GoldenrodCity_MapScripts:
.MoveTutorDone:
return
MoveTutor:
MoveTutorScript:
faceplayer
opentext
writetext UnknownText_0x199042
@ -607,4 +607,4 @@ GoldenrodCity_MapEvents:
object_event 29, 20, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodCityRocket4Script, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
object_event 29, 7, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodCityRocket5Script, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
object_event 31, 10, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodCityRocket6Script, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
object_event 12, 22, SPRITE_POKEFAN_M, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, MoveTutor, EVENT_GOLDENROD_CITY_MOVE_TUTOR
object_event 12, 22, SPRITE_POKEFAN_M, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, MoveTutorScript, EVENT_GOLDENROD_CITY_MOVE_TUTOR

2
maps/LakeOfRageMagikarpHouse.asm
View File

@ -40,7 +40,7 @@ UnknownScript_0x19a6d7:
UnknownScript_0x19a6e0:
writebyte MAGIKARP
special Special_FindThatSpecies
special Special_FindPartyMonThatSpecies
iffalse UnknownScript_0x19a6d7
writetext UnknownText_0x19a93e
waitbutton

32
maps/PlayersHouse2F.asm
View File

@ -34,25 +34,25 @@ PlayersHouse2F_MapScripts:
db 0, 0, 0 ; filler
Doll1:
Doll1Script:
describedecoration DECODESC_LEFT_DOLL
Doll2:
Doll2Script:
describedecoration DECODESC_RIGHT_DOLL
BigDoll:
BigDollScript:
describedecoration DECODESC_BIG_DOLL
GameConsole:
GameConsoleScript:
describedecoration DECODESC_CONSOLE
PlayersHousePoster:
PlayersHousePosterScript:
conditional_event EVENT_PLAYERS_ROOM_POSTER, .Script
.Script:
describedecoration DECODESC_POSTER
PlayersHouseRadio:
PlayersHouseRadioScript:
checkevent EVENT_GOT_A_POKEMON_FROM_ELM
iftrue .NormalRadio
checkevent EVENT_LISTENED_TO_INITIAL_RADIO
@ -82,10 +82,10 @@ PlayersHouseRadio:
closetext
end
PlayersHouseBookshelf:
PlayersHouseBookshelfScript:
jumpstd picturebookshelf
PlayersHousePC:
PlayersHousePCScript:
opentext
special Special_PlayersHousePC
iftrue .Warp
@ -128,14 +128,14 @@ PlayersHouse2F_MapEvents:
.BGEvents:
db 4
bg_event 2, 1, BGEVENT_UP, PlayersHousePC
bg_event 3, 1, BGEVENT_READ, PlayersHouseRadio
bg_event 5, 1, BGEVENT_READ, PlayersHouseBookshelf
bg_event 6, 0, BGEVENT_IFSET, PlayersHousePoster
bg_event 2, 1, BGEVENT_UP, PlayersHousePCScript
bg_event 3, 1, BGEVENT_READ, PlayersHouseRadioScript
bg_event 5, 1, BGEVENT_READ, PlayersHouseBookshelfScript
bg_event 6, 0, BGEVENT_IFSET, PlayersHousePosterScript
.ObjectEvents:
db 4
object_event 4, 2, SPRITE_CONSOLE, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GameConsole, EVENT_PLAYERS_HOUSE_2F_CONSOLE
object_event 4, 4, SPRITE_DOLL_1, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Doll1, EVENT_PLAYERS_HOUSE_2F_DOLL_1
object_event 5, 4, SPRITE_DOLL_2, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Doll2, EVENT_PLAYERS_HOUSE_2F_DOLL_2
object_event 0, 1, SPRITE_BIG_DOLL, SPRITEMOVEDATA_BIGDOLL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BigDoll, EVENT_PLAYERS_HOUSE_2F_BIG_DOLL
object_event 4, 2, SPRITE_CONSOLE, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GameConsoleScript, EVENT_PLAYERS_HOUSE_2F_CONSOLE
object_event 4, 4, SPRITE_DOLL_1, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Doll1Script, EVENT_PLAYERS_HOUSE_2F_DOLL_1
object_event 5, 4, SPRITE_DOLL_2, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Doll2Script, EVENT_PLAYERS_HOUSE_2F_DOLL_2
object_event 0, 1, SPRITE_BIG_DOLL, SPRITEMOVEDATA_BIGDOLL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BigDollScript, EVENT_PLAYERS_HOUSE_2F_BIG_DOLL

18
maps/PlayersNeighborsHouse.asm
View File

@ -9,16 +9,16 @@ PlayersNeighborsHouse_MapScripts:
.MapCallbacks:
db 0
PlayersNeighborsDaughter:
PlayersNeighborsDaughterScript:
jumptextfaceplayer PlayersNeighborsDaughterText
PlayersNeighbor:
PlayersNeighborScript:
jumptextfaceplayer PlayersNeighborText
PlayersNeighborsHouseBookshelf:
PlayersNeighborsHouseBookshelfScript:
jumpstd magazinebookshelf
PlayersNeighborsHouseRadio:
PlayersNeighborsHouseRadioScript:
checkevent EVENT_GOT_A_POKEMON_FROM_ELM
iftrue .NormalRadio
checkevent EVENT_LISTENED_TO_INITIAL_RADIO
@ -112,11 +112,11 @@ PlayersNeighborsHouse_MapEvents:
.BGEvents:
db 3
bg_event 0, 1, BGEVENT_READ, PlayersNeighborsHouseBookshelf
bg_event 1, 1, BGEVENT_READ, PlayersNeighborsHouseBookshelf
bg_event 7, 1, BGEVENT_READ, PlayersNeighborsHouseRadio
bg_event 0, 1, BGEVENT_READ, PlayersNeighborsHouseBookshelfScript
bg_event 1, 1, BGEVENT_READ, PlayersNeighborsHouseBookshelfScript
bg_event 7, 1, BGEVENT_READ, PlayersNeighborsHouseRadioScript
.ObjectEvents:
db 2
object_event 2, 3, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, PlayersNeighborsDaughter, -1
object_event 5, 3, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, PlayersNeighbor, EVENT_PLAYERS_NEIGHBORS_HOUSE_NEIGHBOR
object_event 2, 3, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, PlayersNeighborsDaughterScript, -1
object_event 5, 3, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, PlayersNeighborScript, EVENT_PLAYERS_NEIGHBORS_HOUSE_NEIGHBOR

2
mobile/mobile_45.asm
View File

@ -6838,7 +6838,7 @@ Unknown_117356: ; 117356
SECTION "Mobile Stadium", ROMX
Special_GiveOddEgg: ; 117656
farcall GiveOddEgg
farcall _GiveOddEgg
ret
; 11765d