summaryrefslogtreecommitdiff
path: root/maps/GoldenrodGym.asm
diff options
context:
space:
mode:
authorRangi <remy.oukaour+rangi42@gmail.com>2018-02-01 12:40:58 -0500
committerRangi <remy.oukaour+rangi42@gmail.com>2018-02-01 13:03:21 -0500
commitfcfe77bc3db73afd2001c21ec9cc1cfb1beca20e (patch)
tree2fe20a614851089b0e22cc2dc0164ee40447ebb6 /maps/GoldenrodGym.asm
parent936a170e0da19cb5bb2ccc325a43a28690230098 (diff)
Meaningful scene constant names
(Two common patterns: 0=default event and 1=nothing; and 0=nothing and 1=some event)
Diffstat (limited to 'maps/GoldenrodGym.asm')
-rw-r--r--maps/GoldenrodGym.asm10
1 files changed, 5 insertions, 5 deletions
diff --git a/maps/GoldenrodGym.asm b/maps/GoldenrodGym.asm
index 2d686d4d3..d02f2a4af 100644
--- a/maps/GoldenrodGym.asm
+++ b/maps/GoldenrodGym.asm
@@ -8,8 +8,8 @@
GoldenrodGym_MapScripts:
db 2 ; scene scripts
- scene_script .DummyScene0 ; SCENE_GOLDENRODGYM_0
- scene_script .DummyScene1 ; SCENE_GOLDENRODGYM_1
+ scene_script .DummyScene0 ; SCENE_GOLDENRODGYM_NOTHING
+ scene_script .DummyScene1 ; SCENE_GOLDENRODGYM_WHITNEY_STOPS_CRYING
db 0 ; callbacks
@@ -33,7 +33,7 @@ WhitneyScript_0x5400c:
reloadmapafterbattle
setevent EVENT_BEAT_WHITNEY
setevent EVENT_MADE_WHITNEY_CRY
- setscene SCENE_GOLDENRODGYM_1
+ setscene SCENE_GOLDENRODGYM_WHITNEY_STOPS_CRYING
setevent EVENT_BEAT_BEAUTY_VICTORIA
setevent EVENT_BEAT_BEAUTY_SAMANTHA
setevent EVENT_BEAT_LASS_CARRIE
@@ -110,7 +110,7 @@ WhitneyCriesScript:
waitbutton
closetext
applymovement GOLDENRODGYM_LASS2, BridgetWalksAwayMovement
- setscene SCENE_GOLDENRODGYM_0
+ setscene SCENE_GOLDENRODGYM_NOTHING
clearevent EVENT_MADE_WHITNEY_CRY
end
@@ -385,7 +385,7 @@ GoldenrodGym_MapEvents:
warp_event 3, 17, 1, GOLDENROD_CITY
db 1 ; coord events
- coord_event 8, 5, SCENE_GOLDENRODGYM_1, WhitneyCriesScript
+ coord_event 8, 5, SCENE_GOLDENRODGYM_WHITNEY_STOPS_CRYING, WhitneyCriesScript
db 2 ; bg events
bg_event 1, 15, BGEVENT_READ, GoldenrodGymStatue