diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2019-10-27 20:52:55 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2019-10-27 20:52:55 -0400 |
| commit | 47534a1471019a25e25c29a3f5bb529ccbd73e86 (patch) | |
| tree | da4f2abb0fa27f5f07bcbdd4af47ca4eec84a786 /data/maps/MtEmber_RubyPath_B5F | |
| parent | b8fec3d9f617ec9a764bb56804c526ff7449631f (diff) | |
| parent | 922411abebd56d0f5d6072bad4924c909c8e2c27 (diff) | |
Merge branch 'master' of github.com:pret/pokefirered into trade
Diffstat (limited to 'data/maps/MtEmber_RubyPath_B5F')
| -rw-r--r-- | data/maps/MtEmber_RubyPath_B5F/map.json | 4 | ||||
| -rw-r--r-- | data/maps/MtEmber_RubyPath_B5F/scripts.inc | 14 |
2 files changed, 9 insertions, 9 deletions
diff --git a/data/maps/MtEmber_RubyPath_B5F/map.json b/data/maps/MtEmber_RubyPath_B5F/map.json index 637afcde5..ce5dbc269 100644 --- a/data/maps/MtEmber_RubyPath_B5F/map.json +++ b/data/maps/MtEmber_RubyPath_B5F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "99", + "graphics_id": "MAP_OBJ_GFX_RUBY", "x": 7, "y": 7, "elevation": 0, @@ -24,7 +24,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "MtEmber_RubyPath_B5F_EventScript_163C49", - "flag": "138" + "flag": "FLAG_HIDE_RUBY" } ], "warp_events": [ diff --git a/data/maps/MtEmber_RubyPath_B5F/scripts.inc b/data/maps/MtEmber_RubyPath_B5F/scripts.inc index c3d8b7320..53aec5282 100644 --- a/data/maps/MtEmber_RubyPath_B5F/scripts.inc +++ b/data/maps/MtEmber_RubyPath_B5F/scripts.inc @@ -7,31 +7,31 @@ MtEmber_RubyPath_B5F_EventScript_163BAB:: @ 8163BAB setvar VAR_0x8006, 0 braillemessage gUnknown_81A92C5 getbraillestringwidth gUnknown_81A92C5 - call EventScript_1A926C + call EventScript_BrailleCursorWaitButton setvar VAR_0x8006, 0 braillemessage gUnknown_81A92D0 getbraillestringwidth gUnknown_81A92D0 - call EventScript_1A926C + call EventScript_BrailleCursorWaitButton setvar VAR_0x8006, 0 braillemessage gUnknown_81A92DC getbraillestringwidth gUnknown_81A92DC - call EventScript_1A926C + call EventScript_BrailleCursorWaitButton setvar VAR_0x8006, 0 braillemessage gUnknown_81A92E6 getbraillestringwidth gUnknown_81A92E6 - call EventScript_1A926C + call EventScript_BrailleCursorWaitButton setvar VAR_0x8006, 0 braillemessage gUnknown_81A92F2 getbraillestringwidth gUnknown_81A92F2 - call EventScript_1A926C + call EventScript_BrailleCursorWaitButton setvar VAR_0x8006, 0 braillemessage gUnknown_81A92FE getbraillestringwidth gUnknown_81A92FE - call EventScript_1A926C + call EventScript_BrailleCursorWaitButton setvar VAR_0x8006, 0 braillemessage gUnknown_81A930A getbraillestringwidth gUnknown_81A930A - call EventScript_1A926C + call EventScript_BrailleCursorWaitButton braillemessage gUnknown_81A9316 waitbuttonpress releaseall |