diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2020-01-22 12:38:19 -0500 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2020-01-22 12:38:19 -0500 |
| commit | 2d4be89ee590792bcbcfdcfac17bc2827ca17151 (patch) | |
| tree | 592b831e50d1d98f3842751335278e782f9274c7 /data/maps/MtEmber_RubyPath_B3F | |
| parent | 0495cce90418b84dc53b5d5c9f3b2bfe46f0ed62 (diff) | |
| parent | e97d3532d4d72a1fe9aec755cd2a3c6527484e27 (diff) | |
Merge branch 'master' of github.com:pret/pokefirered into union_room
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!$" |