diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-07-20 18:02:50 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-20 18:02:50 -0400 |
| commit | aeeff84462973b267e62031a945603d96afed716 (patch) | |
| tree | 046ce2a73b467844e95a490b1cfa9cdda5e5f4df /data/maps/RustboroCity_PokemonCenter_1F | |
| parent | d3bfb6cfc63f9f64295cbd864f98df9cf4c643b4 (diff) | |
| parent | f0bf1e641cb8532611c97354beaf46afaca7c417 (diff) | |
Merge pull request #780 from GriffinRichards/sync-scripts
Sync some scripts with pokeemerald
Diffstat (limited to 'data/maps/RustboroCity_PokemonCenter_1F')
| -rw-r--r-- | data/maps/RustboroCity_PokemonCenter_1F/scripts.inc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/data/maps/RustboroCity_PokemonCenter_1F/scripts.inc b/data/maps/RustboroCity_PokemonCenter_1F/scripts.inc index 6da36aef8..83766d86e 100644 --- a/data/maps/RustboroCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/RustboroCity_PokemonCenter_1F/scripts.inc @@ -1,28 +1,28 @@ RustboroCity_PokemonCenter_1F_MapScripts:: @ 8157B79 - map_script 3, RustboroCity_PokemonCenter_1F_MapScript1_157B7F + map_script MAP_SCRIPT_ON_TRANSITION, RustboroCity_PokemonCenter_1F_MapScript1_157B7F .byte 0 RustboroCity_PokemonCenter_1F_MapScript1_157B7F:: @ 8157B7F setrespawn HEAL_LOCATION_RUSTBORO_CITY - call RustboroCity_PokemonCenter_1F_EventScript_19FD1B + call Common_EventScript_UpdateBrineyLocation end RustboroCity_PokemonCenter_1F_EventScript_157B88:: @ 8157B88 setvar VAR_0x800B, 1 - call RustboroCity_PokemonCenter_1F_EventScript_19FD5B + call Common_EventScript_PkmnCenterNurse waitmessage waitbuttonpress release end RustboroCity_PokemonCenter_1F_EventScript_157B96:: @ 8157B96 - msgbox RustboroCity_PokemonCenter_1F_Text_184B37, 2 + msgbox RustboroCity_PokemonCenter_1F_Text_184B37, MSGBOX_NPC end RustboroCity_PokemonCenter_1F_EventScript_157B9F:: @ 8157B9F - msgbox RustboroCity_PokemonCenter_1F_Text_184BAB, 2 + msgbox RustboroCity_PokemonCenter_1F_Text_184BAB, MSGBOX_NPC end RustboroCity_PokemonCenter_1F_EventScript_157BA8:: @ 8157BA8 - msgbox RustboroCity_PokemonCenter_1F_Text_184C19, 2 + msgbox RustboroCity_PokemonCenter_1F_Text_184C19, MSGBOX_NPC end |