Renaming: (fix #412)

- MapTriggers / maptrigger → SceneScripts / scene_script
- XYTriggers / xy_trigger → CoordEvents / coord_event
- Signposts / signpost → BGEvents / bg_event
- PersonEvents / person_event → ObjectEvents / object_event

3 files changed, 19 insertions, 19 deletions

diff --git a/event/bug_contest/judging.asm b/event/bug_contest/judging.asm
index fea442a65..901ae88fa 100755
--- a/event/bug_contest/judging.asm
+++ b/event/bug_contest/judging.asm
@@ -2,21 +2,21 @@ _BugContestJudging: ; 1369d
 	call ContestScore
 	farcall TrainerRankings_BugContestScore
 	call BugContest_JudgeContestants
-	ld a, [wBugContestThirdPlacePersonID]
+	ld a, [wBugContestThirdPlaceWinnerID]
 	call LoadContestantName
 	ld a, [wBugContestThirdPlaceMon]
 	ld [wNamedObjectIndexBuffer], a
 	call GetPokemonName
 	ld hl, BugContest_ThirdPlaceText
 	call PrintText
-	ld a, [wBugContestSecondPlacePersonID]
+	ld a, [wBugContestSecondPlaceWinnerID]
 	call LoadContestantName
 	ld a, [wBugContestSecondPlaceMon]
 	ld [wNamedObjectIndexBuffer], a
 	call GetPokemonName
 	ld hl, BugContest_SecondPlaceText
 	call PrintText
-	ld a, [wBugContestFirstPlacePersonID]
+	ld a, [wBugContestFirstPlaceWinnerID]
 	call LoadContestantName
 	ld a, [wBugContestFirstPlaceMon]
 	ld [wNamedObjectIndexBuffer], a
@@ -140,7 +140,7 @@ INCLUDE "data/bug_contest_winners.asm"
 
 
 BugContest_GetPlayersResult: ; 13807
-	ld hl, wBugContestThirdPlacePersonID
+	ld hl, wBugContestThirdPlaceWinnerID
 	ld de, -4
 	ld b, 3
 .loop
@@ -158,7 +158,7 @@ BugContest_GetPlayersResult: ; 13807
 BugContest_JudgeContestants: ; 13819
 	call ClearContestResults
 	call ComputeAIContestantScores
-	ld hl, wBugContestTempPersonID
+	ld hl, wBugContestTempWinnerID
 	ld a, 1 ; Player
 	ld [hli], a
 	ld a, [wContestMon]
@@ -188,15 +188,15 @@ DetermineContestWinners: ; 1383e
 	ld c, 2
 	call StringCmp
 	jr c, .not_first_place
-	ld hl, wBugContestSecondPlacePersonID
-	ld de, wBugContestThirdPlacePersonID
+	ld hl, wBugContestSecondPlaceWinnerID
+	ld de, wBugContestThirdPlaceWinnerID
 	ld bc, 4
 	call CopyBytes
-	ld hl, wBugContestFirstPlacePersonID
-	ld de, wBugContestSecondPlacePersonID
+	ld hl, wBugContestFirstPlaceWinnerID
+	ld de, wBugContestSecondPlaceWinnerID
 	ld bc, 4
 	call CopyBytes
-	ld hl, wBugContestFirstPlacePersonID
+	ld hl, wBugContestFirstPlaceWinnerID
 	call CopyTempContestant
 	jr .done
 
@@ -206,11 +206,11 @@ DetermineContestWinners: ; 1383e
 	ld c, 2
 	call StringCmp
 	jr c, .not_second_place
-	ld hl, wBugContestSecondPlacePersonID
-	ld de, wBugContestThirdPlacePersonID
+	ld hl, wBugContestSecondPlaceWinnerID
+	ld de, wBugContestThirdPlaceWinnerID
 	ld bc, 4
 	call CopyBytes
-	ld hl, wBugContestSecondPlacePersonID
+	ld hl, wBugContestSecondPlaceWinnerID
 	call CopyTempContestant
 	jr .done
 
@@ -220,7 +220,7 @@ DetermineContestWinners: ; 1383e
 	ld c, 2
 	call StringCmp
 	jr c, .done
-	ld hl, wBugContestThirdPlacePersonID
+	ld hl, wBugContestThirdPlaceWinnerID
 	call CopyTempContestant
 
 .done
@@ -229,7 +229,7 @@ DetermineContestWinners: ; 1383e
 
 CopyTempContestant: ; 138a0
 ; Could've just called CopyBytes.
-	ld de, wBugContestTempPersonID
+	ld de, wBugContestTempWinnerID
 rept 3
 	ld a, [de]
 	inc de
@@ -251,7 +251,7 @@ ComputeAIContestantScores: ; 138b0
 	ld a, e
 	inc a
 	inc a
-	ld [wBugContestTempPersonID], a
+	ld [wBugContestTempWinnerID], a
 	dec a
 	ld c, a
 	ld b, 0
diff --git a/event/overworld.asm b/event/overworld.asm
index 584617e27..370162fa9 100755
--- a/event/overworld.asm
+++ b/event/overworld.asm
@@ -881,11 +881,11 @@ dig_incave
 
 .DigOut: ; 0xcc59
 	step_dig 32
-	hide_person
+	hide_object
 	step_end
 
 .DigReturn: ; 0xcc5d
-	show_person
+	show_object
 	return_dig 32
 	step_end
 
diff --git a/event/std_collision.asm b/event/std_collision.asm
index 17b1e49b2..79dbc71f1 100644
--- a/event/std_collision.asm
+++ b/event/std_collision.asm
@@ -1,4 +1,4 @@
-CheckFacingTileForStd:: ; 1365b
+CheckFacingTileForStdScript:: ; 1365b
 ; Checks to see if the tile you're facing has a std script associated with it.  If so, executes the script and returns carry.
 	ld a, c
 	ld de, 3