Replaced SignpostItem with Hidden(ItemName)

constants/sprite_constants.asm

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

engine/events.asm

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

engine/events_2.asm

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

engine/events_3.asm

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

engine/movement.asm

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

event/itemfinder.asm

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

macros/movement.asm

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

main.asm

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

maps/AzaleaTown.asm

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

maps/BurnedTower1F.asm

@@ -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,59 +114,59 @@ 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
 	pause 15
 	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
 	step_left
 	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