diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2020-01-12 17:04:23 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-12 17:04:23 -0500 |
| commit | 92d99d4fd2e5579372b9f4cc39468000553ba3a8 (patch) | |
| tree | 4ff8e60d1ad6a25dad888a4e78011624b46ad9ec /data/maps/Route1 | |
| parent | 15ff7eb2f87032797f6ce9ef9bb471c468b48a36 (diff) | |
| parent | 0676e732869d0e62322b001cbab57b8500361005 (diff) | |
Merge pull request #207 from GriffinRichards/sync-script
Sync scripts with pokeemerald
Diffstat (limited to 'data/maps/Route1')
| -rw-r--r-- | data/maps/Route1/scripts.inc | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/data/maps/Route1/scripts.inc b/data/maps/Route1/scripts.inc index ef784e8ee..8d5617e3f 100644 --- a/data/maps/Route1/scripts.inc +++ b/data/maps/Route1/scripts.inc @@ -4,19 +4,18 @@ Route1_MapScripts:: @ 8167EFD Route1_EventScript_167EFE:: @ 8167EFE lock faceplayer - checkflag FLAG_GOT_POTION_ON_ROUTE_1 - goto_if TRUE, EventScript_167F48 + goto_if_set FLAG_GOT_POTION_ON_ROUTE_1, EventScript_167F48 msgbox gUnknown_818329D textcolor 3 checkitemspace ITEM_POTION, 1 - compare_var_to_value VAR_RESULT, 0 - goto_if eq, EventScript_1A6BF9 + compare VAR_RESULT, FALSE + goto_if_eq EventScript_BagIsFull getitemname 1, ITEM_POTION playfanfare MUS_FANFA1 - message Text_1A51F6 + message Text_ObtainedTheX waitmessage waitfanfare - additem ITEM_POTION, 1 + additem ITEM_POTION msgbox gUnknown_8183387 call EventScript_1A6675 setflag FLAG_GOT_POTION_ON_ROUTE_1 @@ -29,9 +28,9 @@ EventScript_167F48:: @ 8167F48 end Route1_EventScript_167F52:: @ 8167F52 - msgbox gUnknown_81833B9, 2 + msgbox gUnknown_81833B9, MSGBOX_NPC end Route1_EventScript_167F5B:: @ 8167F5B - msgbox gUnknown_818343A, 3 + msgbox gUnknown_818343A, MSGBOX_SIGN end |