Replaced SignpostItem with Hidden(ItemName)

This commit is contained in:
PikalaxALT 2015-12-15 11:21:58 -05:00
parent bb2aba7da1
commit efe3462f9a
69 changed files with 233 additions and 233 deletions

View File

@ -293,7 +293,7 @@ MAX_OUTDOOR_SPRITES EQU 23
const STEP_TYPE_16
const STEP_TYPE_17
const STEP_TYPE_18
const STEP_TYPE_19
const STEP_TYPE_SKYFALL_TOP
const_def
const PERSON_ACTION_00

View File

@ -767,8 +767,8 @@ TryReadSign: ; 96a38
ld de, EngineBuffer1
ld bc, 3
call FarCopyBytes
ld a, BANK(SignpostItemScript)
ld hl, SignpostItemScript
ld a, BANK(HiddenItemScript)
ld hl, HiddenItemScript
call CallScript
scf
ret

View File

@ -627,7 +627,7 @@ CmdQueue_StoneTable: ; 97f42
ld hl, OBJECT_MOVEMENTTYPE
add hl, de
ld a, [hl]
cp STEP_TYPE_19
cp STEP_TYPE_SKYFALL_TOP
jr nz, .next
ld hl, OBJECT_NEXT_TILE

View File

@ -276,7 +276,7 @@ endr
ret
; b8172
CheckForSignpostItems: ; b8172
CheckForHiddenItems: ; b8172
; Checks to see if there are hidden items on the screen that have not yet been found. If it finds one, returns carry.
call GetMapScriptHeaderBank
ld [Buffer1], a

View File

@ -88,7 +88,7 @@ MovementPointers: ; 5075
dw Movement_56 ; 56
dw Movement_rock_smash ; 57
dw Movement_return_dig ; 58
dw Movement_run_before_fall ; 59
dw Movement_skyfall_top ; 59
; 5129
@ -113,10 +113,10 @@ Movement_skyfall: ; 5137
ret
; 513e
Movement_run_before_fall: ; 513e
Movement_skyfall_top: ; 513e
ld hl, OBJECT_STEP_TYPE
add hl, bc
ld [hl], STEP_TYPE_19
ld [hl], STEP_TYPE_SKYFALL_TOP
ret
; 5145

View File

@ -1,5 +1,5 @@
ItemFinder: ; 12580
callba CheckForSignpostItems
callba CheckForHiddenItems
jr c, .found_something
ld hl, .Script_FoundNothing
jr .resume

View File

@ -434,7 +434,7 @@ return_dig: macro
db \1
endm
enum movement_run_before_fall
run_before_fall: macro
db movement_run_before_fall ; $59
enum movement_skyfall_top
skyfall_top: macro
db movement_skyfall_top ; $59
endm

View File

@ -7600,7 +7600,7 @@ RepelWoreOffScript:: ; 0x13619
db "@"
; 0x13625
SignpostItemScript:: ; 0x13625
HiddenItemScript:: ; 0x13625
opentext
copybytetovar EngineBuffer3
itemtotext 0, 0

View File

@ -214,7 +214,7 @@ AzaleaTownMartSign:
WhiteApricornTree:
fruittree FRUITTREE_AZALEA_TOWN
MapAzaleaTownSignpostItem8:
AzaleaTownHiddenFullHeal:
dwb EVENT_AZALEA_TOWN_HIDDEN_FULL_HEAL, FULL_HEAL
@ -491,7 +491,7 @@ AzaleaTown_MapEventHeader:
signpost 9, 16, SIGNPOST_READ, AzaleaTownPokeCenterSign
signpost 5, 22, SIGNPOST_READ, AzaleaTownMartSign
signpost 9, 3, SIGNPOST_READ, AzaleaTownIlextForestSign
signpost 6, 31, SIGNPOST_ITEM, MapAzaleaTownSignpostItem8
signpost 6, 31, SIGNPOST_ITEM, AzaleaTownHiddenFullHeal
.PersonEvents:
db 12

View File

@ -10,28 +10,28 @@ BurnedTower1F_MapScriptHeader:
db 3
; triggers
dw UnknownScript_0x185bf2, 0
dw UnknownScript_0x185bf6, 0
dw UnknownScript_0x185bf7, 0
dw .Trigger0, 0
dw .Trigger1, 0
dw .Trigger2, 0
.MapCallbacks:
db 1
; callbacks
dbw 1, UnknownScript_0x185bf8
dbw 1, .HoleAndLadder
UnknownScript_0x185bf2:
priorityjump UnknownScript_0x185c0d
.Trigger0:
priorityjump .EusineTrigger
end
UnknownScript_0x185bf6:
.Trigger1:
end
UnknownScript_0x185bf7:
.Trigger2:
end
UnknownScript_0x185bf8:
.HoleAndLadder:
checkevent EVENT_HOLE_IN_BURNED_TOWER
iftrue .Next
changeblock $a, $8, $32 ; hole
@ -42,65 +42,65 @@ UnknownScript_0x185bf8:
.Done
return
UnknownScript_0x185c0d:
.EusineTrigger:
spriteface BURNEDTOWER1F_SUPER_NERD, DOWN
showemote EMOTE_SHOCK, BURNEDTOWER1F_SUPER_NERD, 15
applymovement BURNEDTOWER1F_SUPER_NERD, MovementData_0x185cd3
applymovement BURNEDTOWER1F_SUPER_NERD, BurnedTower1FEusineMovement
opentext
writetext UnknownText_0x185ecc
writetext BurnedTower1FEusineIntroText
waitbutton
closetext
moveperson BURNEDTOWER1F_SUPER_NERD, $9, $e
dotrigger $1
end
UnknownScript_0x185c25:
BurnedTowerRivalBattleScript:
showemote EMOTE_SHOCK, BURNEDTOWER1F_SILVER, 15
special Special_FadeOutMusic
pause 15
spriteface BURNEDTOWER1F_SILVER, RIGHT
pause 15
applymovement PLAYER, MovementData_0x185ccd
applymovement BURNEDTOWER1F_SILVER, MovementData_0x185ccf
applymovement PLAYER, BurnedTowerMovement_PlayerWalksToSilver
applymovement BURNEDTOWER1F_SILVER, BurnedTowerMovement_SilverWalksToPlayer
playmusic MUSIC_RIVAL_ENCOUNTER
opentext
writetext UnknownText_0x185cd9
writetext BurnedTowerSilver_BeforeText
waitbutton
closetext
checkevent EVENT_GOT_TOTODILE_FROM_ELM
iftrue UnknownScript_0x185c60
iftrue .totodile
checkevent EVENT_GOT_CHIKORITA_FROM_ELM
iftrue UnknownScript_0x185c70
winlosstext UnknownText_0x185d9b, UnknownText_0x185e2c
iftrue .chikorita
winlosstext BurnedTowerSilver_WinText, BurnedTowerSilver_LossText
setlasttalked BURNEDTOWER1F_SILVER
loadtrainer RIVAL1, RIVAL1_9
startbattle
reloadmapmusic
returnafterbattle
jump UnknownScript_0x185c80
jump .returnfrombattle
UnknownScript_0x185c60:
winlosstext UnknownText_0x185d9b, UnknownText_0x185e2c
.totodile:
winlosstext BurnedTowerSilver_WinText, BurnedTowerSilver_LossText
setlasttalked BURNEDTOWER1F_SILVER
loadtrainer RIVAL1, RIVAL1_7
startbattle
reloadmapmusic
returnafterbattle
jump UnknownScript_0x185c80
jump .returnfrombattle
UnknownScript_0x185c70:
winlosstext UnknownText_0x185d9b, UnknownText_0x185e2c
.chikorita:
winlosstext BurnedTowerSilver_WinText, BurnedTowerSilver_LossText
setlasttalked BURNEDTOWER1F_SILVER
loadtrainer RIVAL1, RIVAL1_8
startbattle
reloadmapmusic
returnafterbattle
jump UnknownScript_0x185c80
jump .returnfrombattle
UnknownScript_0x185c80:
.returnfrombattle:
playmusic MUSIC_RIVAL_AFTER
opentext
writetext UnknownText_0x185de2
writetext BurnedTowerSilver_AfterText1
waitbutton
closetext
dotrigger $2
@ -114,11 +114,11 @@ UnknownScript_0x185c80:
changeblock $a, $8, $25
reloadmappart
pause 15
applymovement PLAYER, MovementData_0x185cd1
applymovement PLAYER, BurnedTower1FMovement_PlayerStartsToFall
playsound SFX_KINESIS
showemote EMOTE_SHOCK, BURNEDTOWER1F_SILVER, 20
opentext
writetext UnknownText_0x185e75
writetext BurnedTowerSilver_AfterText2
waitbutton
closetext
setevent EVENT_HOLE_IN_BURNED_TOWER
@ -126,39 +126,39 @@ UnknownScript_0x185c80:
warpcheck
end
SuperNerdScript_0x185cbc:
jumptextfaceplayer UnknownText_0x185f99
BurnedTower1FEusineScript:
jumptextfaceplayer BurnedTower1FEusineText
MortyScript_0x185cbf:
jumptextfaceplayer UnknownText_0x186002
BurnedTower1FMortyScript:
jumptextfaceplayer BurnedTower1FMortyText
BurnedTower1FRock:
jumpstd smashrock
MapBurnedTower1FSignpostItem0:
BurnedTower1FHiddenEther:
dwb EVENT_BURNED_TOWER_1F_HIDDEN_ETHER, ETHER
MapBurnedTower1FSignpostItem1:
BurnedTower1FHiddenUltraBall:
dwb EVENT_BURNED_TOWER_1F_HIDDEN_ULTRA_BALL, ULTRA_BALL
BurnedTower1FHPUp:
itemball HP_UP
MovementData_0x185ccd:
BurnedTowerMovement_PlayerWalksToSilver:
step_left
step_end
MovementData_0x185ccf:
BurnedTowerMovement_SilverWalksToPlayer:
step_right
step_end
MovementData_0x185cd1:
run_before_fall
BurnedTower1FMovement_PlayerStartsToFall:
skyfall_top
step_end
MovementData_0x185cd3:
BurnedTower1FEusineMovement:
step_down
step_left
step_left
@ -166,7 +166,7 @@ MovementData_0x185cd3:
step_down
step_end
UnknownText_0x185cd9:
BurnedTowerSilver_BeforeText:
text "<......> <......> <......>"
para "…Oh, it's you."
@ -190,7 +190,7 @@ UnknownText_0x185cd9:
line "fault!"
done
UnknownText_0x185d9b:
BurnedTowerSilver_WinText:
text "…Humph!"
para "This is why I hate"
@ -200,7 +200,7 @@ UnknownText_0x185d9b:
line "challenge in it."
done
UnknownText_0x185de2:
BurnedTowerSilver_AfterText1:
text "…Aw, whatever."
para "You would never be"
@ -210,7 +210,7 @@ UnknownText_0x185de2:
line "anyway."
done
UnknownText_0x185e2c:
BurnedTowerSilver_LossText:
text "…Humph!"
para "This is why I hate"
@ -220,7 +220,7 @@ UnknownText_0x185e2c:
line "of my time."
done
UnknownText_0x185e75:
BurnedTowerSilver_AfterText2:
text "Humph!"
para "What are you doing"
@ -232,7 +232,7 @@ UnknownText_0x185e75:
para "Serves you right!"
done
UnknownText_0x185ecc:
BurnedTower1FEusineIntroText:
text "EUSINE: My name's"
line "EUSINE."
@ -255,7 +255,7 @@ UnknownText_0x185ecc:
line "could it be?"
done
UnknownText_0x185f99:
BurnedTower1FEusineText:
text "EUSINE: I heard"
line "that SUICUNE is in"
@ -266,7 +266,7 @@ UnknownText_0x185f99:
line "could it be?"
done
UnknownText_0x186002:
BurnedTower1FMortyText:
text "MORTY: ECRUTEAK's"
line "GYM LEADER has to"
@ -307,17 +307,17 @@ BurnedTower1F_MapEventHeader:
.XYTriggers:
db 1
xy_trigger 1, $9, $b, $0, UnknownScript_0x185c25, $0, $0
xy_trigger 1, $9, $b, $0, BurnedTowerRivalBattleScript, $0, $0
.Signposts:
db 2
signpost 7, 8, SIGNPOST_ITEM, MapBurnedTower1FSignpostItem0
signpost 11, 13, SIGNPOST_ITEM, MapBurnedTower1FSignpostItem1
signpost 7, 8, SIGNPOST_ITEM, BurnedTower1FHiddenEther
signpost 11, 13, SIGNPOST_ITEM, BurnedTower1FHiddenUltraBall
.PersonEvents:
db 5
person_event SPRITE_ROCK, 4, 15, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, BurnedTower1FRock, -1
person_event SPRITE_SUPER_NERD, 12, 12, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, SuperNerdScript_0x185cbc, EVENT_BURNED_TOWER_1F_EUSINE
person_event SPRITE_SUPER_NERD, 12, 12, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, BurnedTower1FEusineScript, EVENT_BURNED_TOWER_1F_EUSINE
person_event SPRITE_SILVER, 9, 8, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, PERSONTYPE_TRAINER, 3, ObjectEvent, EVENT_RIVAL_BURNED_TOWER
person_event SPRITE_MORTY, 14, 14, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_SCRIPT, 0, MortyScript_0x185cbf, EVENT_BURNED_TOWER_MORTY
person_event SPRITE_MORTY, 14, 14, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_SCRIPT, 0, BurnedTower1FMortyScript, EVENT_BURNED_TOWER_MORTY
person_event SPRITE_POKE_BALL, 2, 14, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, BurnedTower1FHPUp, EVENT_BURNED_TOWER_1F_HP_UP

View File

@ -76,7 +76,7 @@ CeladonCityTrainerTips:
CeladonCityPokeCenterSign:
jumpstd pokecentersign
MapCeladonCitySignpostItem7:
CeladonCityHiddenPpUp:
dwb EVENT_CELADON_CITY_HIDDEN_PP_UP, PP_UP
UnknownText_0x1a9f7d:
@ -264,7 +264,7 @@ CeladonCity_MapEventHeader:
signpost 21, 19, SIGNPOST_READ, CeladonCityGameCornerSign
signpost 21, 29, SIGNPOST_READ, CeladonCityTrainerTips
signpost 9, 30, SIGNPOST_READ, CeladonCityPokeCenterSign
signpost 21, 37, SIGNPOST_ITEM, MapCeladonCitySignpostItem7
signpost 21, 37, SIGNPOST_ITEM, CeladonCityHiddenPpUp
.PersonEvents:
db 9

View File

@ -148,7 +148,7 @@ CeruleanCityPokeCenterSign:
CeruleanCityMartSign:
jumpstd martsign
MapCeruleanCitySignpostItem8:
CeruleanCityHiddenBerserkGene:
dwb EVENT_FOUND_BERSERK_GENE_IN_CERULEAN_CITY, BERSERK_GENE
UnknownText_0x1840bc:
@ -303,7 +303,7 @@ CeruleanCity_MapEventHeader:
signpost 29, 14, SIGNPOST_READ, CeruleanLockedDoor
signpost 21, 20, SIGNPOST_READ, CeruleanCityPokeCenterSign
signpost 29, 26, SIGNPOST_READ, CeruleanCityMartSign
signpost 12, 2, SIGNPOST_ITEM, MapCeruleanCitySignpostItem8
signpost 12, 2, SIGNPOST_ITEM, CeruleanCityHiddenBerserkGene
.PersonEvents:
db 6

View File

@ -136,7 +136,7 @@ CeruleanGymGuyScript:
closetext
end
MapCeruleanGymSignpostItem0:
CeruleanGymHiddenMachinePart:
dwb EVENT_FOUND_MACHINE_PART_IN_CERULEAN_GYM, MACHINE_PART
@ -379,7 +379,7 @@ CeruleanGym_MapEventHeader:
.Signposts:
db 3
signpost 8, 3, SIGNPOST_ITEM, MapCeruleanGymSignpostItem0
signpost 8, 3, SIGNPOST_ITEM, CeruleanGymHiddenMachinePart
signpost 13, 2, SIGNPOST_READ, CeruleanGymStatue1
signpost 13, 6, SIGNPOST_READ, CeruleanGymStatue2

View File

@ -148,10 +148,10 @@ CianwoodPokeCenterSign:
CianwoodCityRock:
jumpstd smashrock
MapCianwoodCitySignpostItem6:
CianwoodCityHiddenRevive:
dwb EVENT_CIANWOOD_CITY_HIDDEN_REVIVE, REVIVE
MapCianwoodCitySignpostItem7:
CianwoodCityHiddenMaxEther:
dwb EVENT_CIANWOOD_CITY_HIDDEN_MAX_ETHER, MAX_ETHER
MovementData_0x1a00da:
@ -410,8 +410,8 @@ CianwoodCity_MapEventHeader:
signpost 47, 19, SIGNPOST_READ, CianwoodPharmacySign
signpost 32, 8, SIGNPOST_READ, CianwoodPhotoStudioSign
signpost 24, 8, SIGNPOST_READ, CianwoodPokeSeerSign
signpost 19, 4, SIGNPOST_ITEM, MapCianwoodCitySignpostItem6
signpost 29, 5, SIGNPOST_ITEM, MapCianwoodCitySignpostItem7
signpost 19, 4, SIGNPOST_ITEM, CianwoodCityHiddenRevive
signpost 29, 5, SIGNPOST_ITEM, CianwoodCityHiddenMaxEther
.PersonEvents:
db 12

View File

@ -36,7 +36,7 @@ CinnabarIslandSign:
CinnabarIslandPokeCenterSign:
jumpstd pokecentersign
MapCinnabarIslandSignpostItem3:
CinnabarIslandHiddenRareCandy:
dwb EVENT_CINNABAR_ISLAND_HIDDEN_RARE_CANDY, RARE_CANDY
CinnabarIslandBlueTeleport:
@ -145,7 +145,7 @@ CinnabarIsland_MapEventHeader:
signpost 11, 12, SIGNPOST_READ, CinnabarIslandPokeCenterSign
signpost 11, 9, SIGNPOST_READ, CinnabarIslandGymSign
signpost 7, 7, SIGNPOST_READ, CinnabarIslandSign
signpost 1, 9, SIGNPOST_ITEM, MapCinnabarIslandSignpostItem3
signpost 1, 9, SIGNPOST_ITEM, CinnabarIslandHiddenRareCandy
.PersonEvents:
db 1

View File

@ -30,7 +30,7 @@ DarkCaveVioletEntranceDireHit:
DarkCaveVioletEntranceRock:
jumpstd smashrock
MapDarkCaveVioletEntranceSignpostItem0:
DarkCaveVioletEntranceHiddenElixer:
dwb EVENT_DARK_CAVE_VIOLET_ENTRANCE_HIDDEN_ELIXER, ELIXER
@ -49,7 +49,7 @@ DarkCaveVioletEntrance_MapEventHeader:
.Signposts:
db 1
signpost 3, 26, SIGNPOST_ITEM, MapDarkCaveVioletEntranceSignpostItem0
signpost 3, 26, SIGNPOST_ITEM, DarkCaveVioletEntranceHiddenElixer
.PersonEvents:
db 8

View File

@ -11,7 +11,7 @@ DiglettsCave_MapScriptHeader:
PokefanMScript_0x74002:
jumptextfaceplayer UnknownText_0x74008
MapDiglettsCaveSignpostItem0:
DiglettsCaveHiddenMaxRevive:
dwb EVENT_DIGLETTS_CAVE_HIDDEN_MAX_REVIVE, MAX_REVIVE
@ -41,7 +41,7 @@ DiglettsCave_MapEventHeader:
.Signposts:
db 1
signpost 11, 6, SIGNPOST_ITEM, MapDiglettsCaveSignpostItem0
signpost 11, 6, SIGNPOST_ITEM, DiglettsCaveHiddenMaxRevive
.PersonEvents:
db 1

View File

@ -187,13 +187,13 @@ DragonsDenB1FCalcium:
DragonsDenB1FMaxElixer:
itemball MAX_ELIXER
MapDragonsDenB1FSignpostItem1:
DragonsDenB1FHiddenRevive:
dwb EVENT_DRAGONS_DEN_B1F_HIDDEN_REVIVE, REVIVE
MapDragonsDenB1FSignpostItem2:
DragonsDenB1FHiddenMaxPotion:
dwb EVENT_DRAGONS_DEN_B1F_HIDDEN_MAX_POTION, MAX_POTION
MapDragonsDenB1FSignpostItem3:
DragonsDenB1FHiddenMaxElixer:
dwb EVENT_DRAGONS_DEN_B1F_HIDDEN_MAX_ELIXER, MAX_ELIXER
MovementDragonsDen_ClairWalksToYou:
@ -427,9 +427,9 @@ DragonsDenB1F_MapEventHeader:
.Signposts:
db 4
signpost 24, 18, SIGNPOST_READ, MapDragonsDenB1FSignpost0Script
signpost 29, 33, SIGNPOST_ITEM, MapDragonsDenB1FSignpostItem1
signpost 17, 21, SIGNPOST_ITEM, MapDragonsDenB1FSignpostItem2
signpost 15, 31, SIGNPOST_ITEM, MapDragonsDenB1FSignpostItem3
signpost 29, 33, SIGNPOST_ITEM, DragonsDenB1FHiddenRevive
signpost 17, 21, SIGNPOST_ITEM, DragonsDenB1FHiddenMaxPotion
signpost 15, 31, SIGNPOST_ITEM, DragonsDenB1FHiddenMaxElixer
.PersonEvents:
db 9

View File

@ -89,7 +89,7 @@ EcruteakCityPokeCenterSign:
EcruteakCityMartSign:
jumpstd martsign
MapEcruteakCitySignpostItem7:
EcruteakCityHiddenHyperPotion:
dwb EVENT_ECRUTEAK_CITY_HIDDEN_HYPER_POTION, HYPER_POTION
UnusedMissingDaughterText:
@ -295,7 +295,7 @@ EcruteakCity_MapEventHeader:
signpost 10, 2, SIGNPOST_READ, BurnedTowerSign
signpost 27, 24, SIGNPOST_READ, EcruteakCityPokeCenterSign
signpost 21, 30, SIGNPOST_READ, EcruteakCityMartSign
signpost 14, 23, SIGNPOST_ITEM, MapEcruteakCitySignpostItem7
signpost 14, 23, SIGNPOST_ITEM, EcruteakCityHiddenHyperPotion
.PersonEvents:
db 7

View File

@ -72,7 +72,7 @@ IcePathB1FBoulder:
IcePathB1FIron:
itemball IRON
MapIcePathB1FSignpostItem0:
IcePathB1FHiddenMaxPotion:
dwb EVENT_ICE_PATH_B1F_HIDDEN_MAX_POTION, MAX_POTION
@ -102,7 +102,7 @@ IcePathB1F_MapEventHeader:
.Signposts:
db 1
signpost 30, 17, SIGNPOST_ITEM, MapIcePathB1FSignpostItem0
signpost 30, 17, SIGNPOST_ITEM, IcePathB1FHiddenMaxPotion
.PersonEvents:
db 5

Some files were not shown because too many files have changed in this diff Show More