diff options
| author | scnorton <scnorton@biociphers.org> | 2017-12-18 15:00:57 -0500 |
|---|---|---|
| committer | scnorton <scnorton@biociphers.org> | 2017-12-18 15:00:57 -0500 |
| commit | 89c0d40ee6c7fa2ad9f7f44e3a51ea50264e9280 (patch) | |
| tree | f5387471637b5e9e62fa5b6a0614a935b2921118 /data/scripts/pokeblocks.inc | |
| parent | 408f3cf295e76b61f2c1a442c80d1036bbaa9d28 (diff) | |
| parent | 3c5f725de49371aced1788a21f5e53df5b498b5f (diff) | |
Merge branch 'master' into decompile_data
Diffstat (limited to 'data/scripts/pokeblocks.inc')
| -rw-r--r-- | data/scripts/pokeblocks.inc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/data/scripts/pokeblocks.inc b/data/scripts/pokeblocks.inc index 6fe754097..6934ffe57 100644 --- a/data/scripts/pokeblocks.inc +++ b/data/scripts/pokeblocks.inc @@ -76,7 +76,7 @@ FallarborTown_ContestLobby_EventScript_1B76EF:: @ 81B76EF FallarborTown_ContestLobby_EventScript_1B770E:: @ 81B770E msgbox FallarborTown_ContestLobby_Text_1B6FF0, 4 dodailyevents - checkflag 2241 + checkflag FLAG_DAILY_RECEIVED_BERRY_FALLARBOR goto_if_eq FallarborTown_ContestLobby_EventScript_1B774F goto FallarborTown_ContestLobby_EventScript_1B7759 end @@ -107,7 +107,7 @@ FallarborTown_ContestLobby_EventScript_1B774F:: @ 81B774F FallarborTown_ContestLobby_EventScript_1B7759:: @ 81B7759 msgbox FallarborTown_ContestLobby_Text_1B704A, 4 giveitem ITEM_PECHA_BERRY - setflag 2241 + setflag FLAG_DAILY_RECEIVED_BERRY_FALLARBOR goto FallarborTown_ContestLobby_EventScript_1B76EF end @@ -162,7 +162,7 @@ FallarborTown_ContestLobby_EventScript_1B77DC:: @ 81B77DC FallarborTown_ContestLobby_EventScript_1B77E6:: @ 81B77E6 dodailyevents - checkflag 2241 + checkflag FLAG_DAILY_RECEIVED_BERRY_FALLARBOR goto_if_eq FallarborTown_ContestLobby_EventScript_1B77F6 goto FallarborTown_ContestLobby_EventScript_1B7800 end @@ -175,7 +175,7 @@ FallarborTown_ContestLobby_EventScript_1B77F6:: @ 81B77F6 FallarborTown_ContestLobby_EventScript_1B7800:: @ 81B7800 msgbox FallarborTown_ContestLobby_Text_1B74B4, 4 giveitem ITEM_PECHA_BERRY - setflag 2241 + setflag FLAG_DAILY_RECEIVED_BERRY_FALLARBOR msgbox FallarborTown_ContestLobby_Text_1B753A, 4 release end |