Merge branch 'master' of https://github.com/GriffinRichards/pokefirered into clone-union

This commit is contained in:
GriffinR committed 2022-08-10 13:48:30 -04:00
commit 2b93687ade
1146 files changed
+40526 -38156

No files matched your search

+2 -2
View File
@@ -1,10 +1,10 @@
.set LOCALID_RUBY, 1
MtEmber_RubyPath_B3F_MapScripts:: @ 8163C48
MtEmber_RubyPath_B3F_MapScripts::
.byte 0
@ Odd that this is here and not in MtEmber_RubyPath_B5F/scripts.inc
MtEmber_RubyPath_B5F_EventScript_Ruby:: @ 8163C49
MtEmber_RubyPath_B5F_EventScript_Ruby::
lock
faceplayer
setflag FLAG_GOT_RUBY
+1 -1
View File
@@ -1,3 +1,3 @@
MtEmber_RubyPath_B3F_Text_FoundARuby:: @ 817ADC5
MtEmber_RubyPath_B3F_Text_FoundARuby::
.string "{PLAYER} found a RUBY!$"