diff options
| author | YamaArashi <shadow962@live.com> | 2016-07-05 01:06:32 -0700 |
|---|---|---|
| committer | YamaArashi <shadow962@live.com> | 2016-07-05 01:06:32 -0700 |
| commit | 1465509725e20d73dc5959e8aaf82cfe36321838 (patch) | |
| tree | 88d3c080e69674d0db7a13516fdbac7ddee9b3b1 | |
| parent | 10a06e177a5869e17c636c3740d96a0f9003bd0e (diff) | |
remaining ruby/sapphire event script differences
| -rw-r--r-- | data/scripts/magma_summit.s | 15 | ||||
| -rw-r--r-- | data/scripts/maps/Route110_TrickHouseEntrance.s | 16 | ||||
| -rw-r--r-- | data/scripts/tv.s | 4 |
3 files changed, 27 insertions, 8 deletions
diff --git a/data/scripts/magma_summit.s b/data/scripts/magma_summit.s index e585c666c..0992a62c0 100644 --- a/data/scripts/magma_summit.s +++ b/data/scripts/magma_summit.s @@ -1,14 +1,29 @@ MtPyre_Summit_EventScript_1B2DA9:: @ 81B2DA9 + .ifdef SAPPHIRE + trainerbattle 0, TRAINER_MT_PYRE_SUMMIT_GRUNT_1, 0, UnknownString_81B50C3, UnknownString_81B50F5 + msgbox UnknownString_81B5131, 6 + .else trainerbattle 0, TRAINER_MT_PYRE_SUMMIT_GRUNT_1, 0, MtPyre_Summit_Text_1B5CFD, MtPyre_Summit_Text_1B5D30 msgbox MtPyre_Summit_Text_1B5D6D, 6 + .endif end MtPyre_Summit_EventScript_1B2DC0:: @ 81B2DC0 + .ifdef SAPPHIRE + trainerbattle 0, TRAINER_MT_PYRE_SUMMIT_GRUNT_2, 0, UnknownString_81B5166, UnknownString_81B519F + msgbox UnknownString_81B51B5, 6 + .else trainerbattle 0, TRAINER_MT_PYRE_SUMMIT_GRUNT_2, 0, MtPyre_Summit_Text_1B5DA2, MtPyre_Summit_Text_1B5DDB msgbox MtPyre_Summit_Text_1B5DF1, 6 + .endif end MtPyre_Summit_EventScript_1B2DD7:: @ 81B2DD7 + .ifdef SAPPHIRE + trainerbattle 0, TRAINER_MT_PYRE_SUMMIT_GRUNT_3, 0, UnknownString_81B51EB, UnknownString_81B5224 + msgbox UnknownString_81B5248, 6 + .else trainerbattle 0, TRAINER_MT_PYRE_SUMMIT_GRUNT_3, 0, MtPyre_Summit_Text_1B5E27, MtPyre_Summit_Text_1B5E60 msgbox MtPyre_Summit_Text_1B5E84, 6 + .endif end diff --git a/data/scripts/maps/Route110_TrickHouseEntrance.s b/data/scripts/maps/Route110_TrickHouseEntrance.s index 94763df3c..434794b2f 100644 --- a/data/scripts/maps/Route110_TrickHouseEntrance.s +++ b/data/scripts/maps/Route110_TrickHouseEntrance.s @@ -591,14 +591,14 @@ Route110_TrickHouseEntrance_EventScript_1616D7:: @ 81616D7 gUnknown_081616E1:: @ 81616E1 lockall switch 0x4044 - case 0, 0x8161740 - case 1, 0x8161769 - case 2, 0x8161792 - case 3, 0x81617BB - case 4, 0x81617E4 - case 5, 0x816180D - case 6, 0x8161836 - case 7, 0x816185F + case 0, Route110_TrickHouseEntrance_EventScript_161740 + case 1, Route110_TrickHouseEntrance_EventScript_161769 + case 2, Route110_TrickHouseEntrance_EventScript_161792 + case 3, Route110_TrickHouseEntrance_EventScript_1617BB + case 4, Route110_TrickHouseEntrance_EventScript_1617E4 + case 5, Route110_TrickHouseEntrance_EventScript_16180D + case 6, Route110_TrickHouseEntrance_EventScript_161836 + case 7, Route110_TrickHouseEntrance_EventScript_16185F end Route110_TrickHouseEntrance_EventScript_161740:: @ 8161740 diff --git a/data/scripts/tv.s b/data/scripts/tv.s index fddfb1457..353e8bcb8 100644 --- a/data/scripts/tv.s +++ b/data/scripts/tv.s @@ -43,7 +43,11 @@ EventScript_1A6F01: end EventScript_1A6F0B: + .ifdef SAPPHIRE + msgbox UnknownString_8172D30, 4 + .else msgbox UnknownString_8172C50, 4 + .endif special 297 clearflag 2141 setflag 255 |