summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPikalaxALT <PikalaxALT@gmail.com>2019-10-19 15:28:58 -0400
committerPikalaxALT <PikalaxALT@gmail.com>2019-10-19 15:28:58 -0400
commit42d732d266156456bbe796e49d905bdada357d94 (patch)
tree3af619891d2deecfd170ba88b5d57561a589838b
parentac27b47dc63d7511fb44c3b37a6abf56b6d2946e (diff)
variable objects in map scripts
-rw-r--r--data/maps/FuchsiaCity/scripts.inc4
-rw-r--r--data/maps/ViridianCity/scripts.inc6
2 files changed, 5 insertions, 5 deletions
diff --git a/data/maps/FuchsiaCity/scripts.inc b/data/maps/FuchsiaCity/scripts.inc
index 9bd21df92..c857c2f19 100644
--- a/data/maps/FuchsiaCity/scripts.inc
+++ b/data/maps/FuchsiaCity/scripts.inc
@@ -11,11 +11,11 @@ FuchsiaCity_MapScript1_166D7B:: @ 8166D7B
end
EventScript_166D91:: @ 8166D91
- setvar VAR_OBJ_GFX_ID_0, 118
+ setvar VAR_OBJ_GFX_ID_0, MAP_OBJ_GFX_OMANYTE
return
EventScript_166D97:: @ 8166D97
- setvar VAR_OBJ_GFX_ID_0, 147
+ setvar VAR_OBJ_GFX_ID_0, MAP_OBJ_GFX_KABUTO
return
FuchsiaCity_EventScript_166D9D:: @ 8166D9D
diff --git a/data/maps/ViridianCity/scripts.inc b/data/maps/ViridianCity/scripts.inc
index fc52f94b9..60301d9e4 100644
--- a/data/maps/ViridianCity/scripts.inc
+++ b/data/maps/ViridianCity/scripts.inc
@@ -15,17 +15,17 @@ ViridianCity_MapScript1_1658D9:: @ 81658D9
end
EventScript_165909:: @ 8165909
- setvar VAR_OBJ_GFX_ID_0, 32
+ setvar VAR_OBJ_GFX_ID_0, MAP_OBJ_GFX_OLD_MAN_1
return
EventScript_16590F:: @ 816590F
- setvar VAR_OBJ_GFX_ID_0, 32
+ setvar VAR_OBJ_GFX_ID_0, MAP_OBJ_GFX_OLD_MAN_1
setobjectxyperm 4, 21, 8
setobjectmovementtype 4, 1
return
EventScript_165920:: @ 8165920
- setvar VAR_OBJ_GFX_ID_0, 34
+ setvar VAR_OBJ_GFX_ID_0, MAP_OBJ_GFX_VIRIDIAN_DRUNK
setobjectxyperm 4, 21, 11
setobjectmovementtype 4, 8
return