Rename some routines to avoid conflicts when removing "Special_" prefixes
This commit is contained in:
Rangi
@@ -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
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -40,7 +40,7 @@ UnknownScript_0x19a6d7:
|
||||
|
||||
UnknownScript_0x19a6e0:
|
||||
writebyte MAGIKARP
|
||||
special Special_FindThatSpecies
|
||||
special Special_FindPartyMonThatSpecies
|
||||
iffalse UnknownScript_0x19a6d7
|
||||
writetext UnknownText_0x19a93e
|
||||
waitbutton
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user