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/FallarborTown | |
| parent | d3bfb6cfc63f9f64295cbd864f98df9cf4c643b4 (diff) | |
| parent | f0bf1e641cb8532611c97354beaf46afaca7c417 (diff) | |
Merge pull request #780 from GriffinRichards/sync-scripts
Sync some scripts with pokeemerald
Diffstat (limited to 'data/maps/FallarborTown')
| -rw-r--r-- | data/maps/FallarborTown/map.json | 8 | ||||
| -rw-r--r-- | data/maps/FallarborTown/scripts.inc | 18 |
2 files changed, 13 insertions, 13 deletions
diff --git a/data/maps/FallarborTown/map.json b/data/maps/FallarborTown/map.json index 7ad3e4f1f..71e07b7c3 100644 --- a/data/maps/FallarborTown/map.json +++ b/data/maps/FallarborTown/map.json @@ -120,7 +120,7 @@ "y": 15, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "FallarborTown_EventScript_1A00E1" + "script": "Common_EventScript_PokemartSign" }, { "type": "sign", @@ -128,7 +128,7 @@ "y": 7, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "FallarborTown_EventScript_1A00EA" + "script": "Common_EventScript_PokemonCenterSign" }, { "type": "sign", @@ -144,7 +144,7 @@ "y": 7, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "FallarborTown_EventScript_1A00EA" + "script": "Common_EventScript_PokemonCenterSign" }, { "type": "sign", @@ -160,7 +160,7 @@ "y": 15, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "FallarborTown_EventScript_1A00E1" + "script": "Common_EventScript_PokemartSign" }, { "type": "sign", diff --git a/data/maps/FallarborTown/scripts.inc b/data/maps/FallarborTown/scripts.inc index a168a0ef5..a39d7e51f 100644 --- a/data/maps/FallarborTown/scripts.inc +++ b/data/maps/FallarborTown/scripts.inc @@ -1,5 +1,5 @@ FallarborTown_MapScripts:: @ 814E7E0 - map_script 3, FallarborTown_MapScript1_14E7E6 + map_script MAP_SCRIPT_ON_TRANSITION, FallarborTown_MapScript1_14E7E6 .byte 0 FallarborTown_MapScript1_14E7E6:: @ 814E7E6 @@ -13,21 +13,21 @@ FallarborTown_EventScript_14E7F5:: @ 814E7F5 lock faceplayer goto_if_set FLAG_DEFEATED_EVIL_TEAM_MT_CHIMNEY, FallarborTown_EventScript_14E80A - msgbox FallarborTown_Text_16C7FF, 4 + msgbox FallarborTown_Text_16C7FF, MSGBOX_DEFAULT release end FallarborTown_EventScript_14E80A:: @ 814E80A - msgbox FallarborTown_Text_16C855, 4 + msgbox FallarborTown_Text_16C855, MSGBOX_DEFAULT release end FallarborTown_EventScript_14E814:: @ 814E814 - msgbox FallarborTown_Text_16C8D6, 2 + msgbox FallarborTown_Text_16C8D6, MSGBOX_NPC end FallarborTown_EventScript_14E81D:: @ 814E81D - msgbox FallarborTown_Text_16C941, 2 + msgbox FallarborTown_Text_16C941, MSGBOX_NPC end FallarborTown_EventScript_14E826:: @ 814E826 @@ -35,21 +35,21 @@ FallarborTown_EventScript_14E826:: @ 814E826 faceplayer waitse playmoncry SPECIES_AZURILL, 0 - msgbox FallarborTown_Text_16C92C, 4 + msgbox FallarborTown_Text_16C92C, MSGBOX_DEFAULT waitmoncry release end FallarborTown_EventScript_14E839:: @ 814E839 - msgbox FallarborTown_Text_16CA39, 3 + msgbox FallarborTown_Text_16CA39, MSGBOX_SIGN end FallarborTown_EventScript_14E842:: @ 814E842 MeteorFalls_1F_1R_EventScript_14E842:: @ 814E842 MeteorFalls_1F_2R_EventScript_14E842:: @ 814E842 - msgbox FallarborTown_Text_16CA83, 3 + msgbox FallarborTown_Text_16CA83, MSGBOX_SIGN end FallarborTown_EventScript_14E84B:: @ 814E84B - msgbox FallarborTown_Text_16CAB9, 3 + msgbox FallarborTown_Text_16CAB9, MSGBOX_SIGN end |