diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-01-23 10:24:11 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-23 10:24:11 -0500 |
| commit | a01d83a4341cd0cdad01fe2d0b96920301257f2a (patch) | |
| tree | ac4f4ce6086d4664ea49d515759a8044ecd1d973 /data/maps/MtEmber_RubyPath_B3F | |
| parent | e7cd8c59f4ca0f6c56a3b3782c21e896c203694e (diff) | |
| parent | 91099dbd0c451188742bf045a26a036e0e8d9f89 (diff) | |
Merge branch 'master' into sync-ai
Diffstat (limited to 'data/maps/MtEmber_RubyPath_B3F')
| -rw-r--r-- | data/maps/MtEmber_RubyPath_B3F/scripts.inc | 6 | ||||
| -rw-r--r-- | data/maps/MtEmber_RubyPath_B3F/text.inc | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/data/maps/MtEmber_RubyPath_B3F/scripts.inc b/data/maps/MtEmber_RubyPath_B3F/scripts.inc index 59fb37bf3..3c6852535 100644 --- a/data/maps/MtEmber_RubyPath_B3F/scripts.inc +++ b/data/maps/MtEmber_RubyPath_B3F/scripts.inc @@ -1,12 +1,12 @@ MtEmber_RubyPath_B3F_MapScripts:: @ 8163C48 .byte 0 -MtEmber_RubyPath_B3F_EventScript_163C49:: @ 8163C49 -MtEmber_RubyPath_B5F_EventScript_163C49:: @ 8163C49 +@ Odd that this is here and not in MtEmber_RubyPath_B5F/scripts.inc +MtEmber_RubyPath_B5F_EventScript_Ruby:: @ 8163C49 lock faceplayer setflag FLAG_GOT_RUBY removeobject 1 - giveitem_msg gUnknown_817ADC5, ITEM_RUBY, 1, MUS_FAN5 + giveitem_msg MtEmber_RubyPath_B3F_Text_FoundARuby, ITEM_RUBY, 1, MUS_FAN5 release end diff --git a/data/maps/MtEmber_RubyPath_B3F/text.inc b/data/maps/MtEmber_RubyPath_B3F/text.inc index 4cf8b5a50..ddee8c872 100644 --- a/data/maps/MtEmber_RubyPath_B3F/text.inc +++ b/data/maps/MtEmber_RubyPath_B3F/text.inc @@ -1,3 +1,3 @@ -gUnknown_817ADC5:: @ 817ADC5 +MtEmber_RubyPath_B3F_Text_FoundARuby:: @ 817ADC5 .string "{PLAYER} found a RUBY!$" |