diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2021-10-07 16:10:35 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-07 16:10:35 -0400 |
| commit | a2655ba9ab82646a54f60abc6078df372179f8d4 (patch) | |
| tree | 95b074a1a4d77d6cd77e413e1d6e72eb55b595b0 /data/maps/MossdeepCity_PokemonCenter_2F | |
| parent | e86d3410a1719fcbf62754bfda93a295aa7e0d57 (diff) | |
| parent | 001a25e49cd6acdac89a62f4230aef80422e78f2 (diff) | |
Merge branch 'master' into doc-union
Diffstat (limited to 'data/maps/MossdeepCity_PokemonCenter_2F')
| -rw-r--r-- | data/maps/MossdeepCity_PokemonCenter_2F/scripts.inc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/data/maps/MossdeepCity_PokemonCenter_2F/scripts.inc b/data/maps/MossdeepCity_PokemonCenter_2F/scripts.inc index 1d88c9ca2..3b41bff6c 100644 --- a/data/maps/MossdeepCity_PokemonCenter_2F/scripts.inc +++ b/data/maps/MossdeepCity_PokemonCenter_2F/scripts.inc @@ -1,4 +1,4 @@ -MossdeepCity_PokemonCenter_2F_MapScripts:: @ 8222334 +MossdeepCity_PokemonCenter_2F_MapScripts:: map_script MAP_SCRIPT_ON_FRAME_TABLE, CableClub_OnFrame map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, CableClub_OnWarp map_script MAP_SCRIPT_ON_LOAD, CableClub_OnLoad @@ -6,23 +6,23 @@ MossdeepCity_PokemonCenter_2F_MapScripts:: @ 8222334 .byte 0 @ The below 3 are unused and leftover from RS -MossdeepCity_PokemonCenter_2F_EventScript_Colosseum:: @ 8222349 +MossdeepCity_PokemonCenter_2F_EventScript_Colosseum:: call CableClub_EventScript_Colosseum end -MossdeepCity_PokemonCenter_2F_EventScript_TradeCenter:: @ 822234F +MossdeepCity_PokemonCenter_2F_EventScript_TradeCenter:: call CableClub_EventScript_TradeCenter end -MossdeepCity_PokemonCenter_2F_EventScript_RecordCorner:: @ 8222355 +MossdeepCity_PokemonCenter_2F_EventScript_RecordCorner:: call CableClub_EventScript_RecordCorner end -MossdeepCity_PokemonCenter_2F_EventScript_Woman5:: @ 822235B +MossdeepCity_PokemonCenter_2F_EventScript_Woman5:: msgbox MossdeepCity_PokemonCenter_2F_Text_Woman5, MSGBOX_NPC end -MossdeepCity_PokemonCenter_2F_Text_Woman5: @ 8222364 +MossdeepCity_PokemonCenter_2F_Text_Woman5: .string "If I win a whole lot of link battles\n" .string "and show everyone how good I am,\l" .string "I might get a fan following!$" |