diff options
| author | YamaArashi <shadow962@live.com> | 2016-07-02 14:57:40 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-02 14:57:40 -0700 |
| commit | 272c48425016d21a348d66cb7141fbaf43ae99d6 (patch) | |
| tree | 8e95e11b78990c2042f09a060bcc90169547c931 /data/event_scripts.s | |
| parent | 8f08ae61851a6d21b1da046e50670b267a43b144 (diff) | |
| parent | 4be92ee7bb2206f997b43e7e75b164c4911737b1 (diff) | |
Merge pull request #21 from yenatch/master
More sapphire diffs, and no more graphics diffs.
Diffstat (limited to 'data/event_scripts.s')
| -rw-r--r-- | data/event_scripts.s | 23 |
1 files changed, 19 insertions, 4 deletions
diff --git a/data/event_scripts.s b/data/event_scripts.s index b811b0ede..c3a75e834 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -1891,18 +1891,32 @@ SeafloorCavern_Room3_EventScript_1A0196:: @ 81A0196 SeafloorCavern_Room4_EventScript_1A0196:: @ 81A0196 SeafloorCavern_Room9_EventScript_1A0196:: @ 81A0196 SlateportCity_OceanicMuseum_2F_EventScript_1A0196:: @ 81A0196 + .ifdef SAPPHIRE + setvar 0x4011, 117 + setvar 0x4012, 118 + setvar 0x4014, 119 + setvar 0x4015, 120 + setvar 0x4016, 195 + setvar 0x4017, 196 + .else setvar 0x4011, 119 setvar 0x4012, 120 setvar 0x4014, 117 setvar 0x4015, 118 setvar 0x4016, 196 setvar 0x4017, 195 + .endif return CaveOfOrigin_B4F_EventScript_1A01B5:: @ 81A01B5 SeafloorCavern_Room9_EventScript_1A01B5:: @ 81A01B5 + .ifdef SAPPHIRE + setvar 0x4018, 197 + setvar 0x4019, 205 + .else setvar 0x4018, 198 setvar 0x4019, 206 + .endif return DewfordTown_Gym_EventScript_1A01C0:: @ 81A01C0 @@ -2065,7 +2079,11 @@ Route126_EventScript_1A02C1:: @ 81A02C1 Route127_EventScript_1A02C1:: @ 81A02C1 Route128_EventScript_1A02C1:: @ 81A02C1 SootopolisCity_EventScript_1A02C1:: @ 81A02C1 + .ifdef SAPPHIRE + setweather 13 + .else setweather 12 + .endif return DewfordTown_Gym_EventScript_1A02C5:: @ 81A02C5 @@ -2273,7 +2291,7 @@ SouthernIsland_Exterior_EventScript_1A047C:: @ 81A047C CaveOfOrigin_B4F_EventScript_1A04A0:: @ 81A04A0 lockall checksound - pokecry SPECIES_GROUDON, 2 + pokecry SPECIES_GROUDON_OR_KYOGRE, 2 waitpokecry setvar 0x4005, 1 releaseall @@ -4737,9 +4755,6 @@ BattleTower_Lobby_EventScript_1AE30F:: @ 81AE30F .include "data/scripts/day_care.s" .include "data/text/day_care.s" -@ XXX JP - .incbin "baserom.gba", 0x1B2C6D, 0x28 - .include "data/scripts/magma_chimney.s" .include "data/scripts/magma_summit.s" |