summaryrefslogtreecommitdiff
path: root/data/scripts/pokeblocks.inc
diff options
context:
space:
mode:
authorMarcus Huderle <huderlem@gmail.com>2018-01-01 19:03:47 -0800
committerGitHub <noreply@github.com>2018-01-01 19:03:47 -0800
commit397f32f29dbcd8fb6ad47afe5ba1ee354ca2b5c7 (patch)
treeb4c05276d2e5d65f5bf7cf55a054947c92235f8e /data/scripts/pokeblocks.inc
parent79a9ff94719b5397647ddf11efc1d3dc1d388e1d (diff)
parent664b42470fb6c590dd2bd8b02707a790feda23fe (diff)
Merge pull request #503 from huderlem/specials
Label a bunch of specials
Diffstat (limited to 'data/scripts/pokeblocks.inc')
-rw-r--r--data/scripts/pokeblocks.inc8
1 files changed, 4 insertions, 4 deletions
diff --git a/data/scripts/pokeblocks.inc b/data/scripts/pokeblocks.inc
index 4a659f469..eb12ab148 100644
--- a/data/scripts/pokeblocks.inc
+++ b/data/scripts/pokeblocks.inc
@@ -53,7 +53,7 @@ FallarborTown_ContestLobby_EventScript_1B76A1:: @ 81B76A1
compare RESULT, 0
goto_if_eq FallarborTown_ContestLobby_EventScript_1B770E
msgbox FallarborTown_ContestLobby_Text_1B6E9D, 4
- specialvar RESULT, sub_810CA00
+ specialvar RESULT, GetFirstFreePokeblockSlot
compare RESULT, 65535
goto_if 5, FallarborTown_ContestLobby_EventScript_1B76EF
compare RESULT, 65535
@@ -94,7 +94,7 @@ FallarborTown_ContestLobby_EventScript_1B7734:: @ 81B7734
FallarborTown_ContestLobby_EventScript_1B7742:: @ 81B7742
copyvar VAR_SPECIAL_4, VAR_SPECIAL_9
fadescreen 1
- special sub_804E538
+ special DoBerryBlending
waitstate
releaseall
end
@@ -214,7 +214,7 @@ VerdanturfTown_ContestLobby_EventScript_1B783B:: @ 81B783B
checkitem ITEM_POKEBLOCK_CASE, 1
compare RESULT, 0
goto_if_eq FallarborTown_ContestLobby_EventScript_1B7942
- specialvar RESULT, sub_810CA00
+ specialvar RESULT, GetFirstFreePokeblockSlot
compare RESULT, 65535
goto_if 5, FallarborTown_ContestLobby_EventScript_1B7878
compare RESULT, 65535
@@ -276,7 +276,7 @@ FallarborTown_ContestLobby_EventScript_1B791D:: @ 81B791D
removeobject 239
removeobject 238
removeobject 237
- special sub_804E538
+ special DoBerryBlending
waitstate
releaseall
end