summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorDizzyEggg <jajkodizzy@wp.pl>2019-01-19 23:04:33 +0100
committerDizzyEggg <jajkodizzy@wp.pl>2019-01-19 23:04:33 +0100
commit576d1b3474e9ebec6a16d3ca68378d0f92fb4026 (patch)
tree7e8703ba4a5ab4af71dd6b0fe9b1e382c25193bb /data
parentf06c0749bcebc10fe146ca038a6a8597952a0f21 (diff)
Document and match somne trainer card
Diffstat (limited to 'data')
-rw-r--r--data/maps/LilycoveCity/scripts.inc2
-rw-r--r--data/maps/LilycoveCity_ContestLobby/scripts.inc2
-rw-r--r--data/maps/LilycoveCity_CoveLilyMotel_2F/scripts.inc2
-rw-r--r--data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc2
-rw-r--r--data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc2
-rw-r--r--data/specials.inc4
6 files changed, 7 insertions, 7 deletions
diff --git a/data/maps/LilycoveCity/scripts.inc b/data/maps/LilycoveCity/scripts.inc
index 02319e8cf..c1cec509f 100644
--- a/data/maps/LilycoveCity/scripts.inc
+++ b/data/maps/LilycoveCity/scripts.inc
@@ -157,7 +157,7 @@ LilycoveCity_EventScript_1E2D11:: @ 81E2D11
LilycoveCity_EventScript_1E2D1A:: @ 81E2D1A
lockall
- specialvar VAR_0x8004, sub_80F8940
+ specialvar VAR_0x8004, CountPlayerContestPaintings
switch VAR_0x8004
case 0, LilycoveCity_EventScript_1E2D3A
msgbox LilycoveCity_Text_1E4571, MSGBOX_DEFAULT
diff --git a/data/maps/LilycoveCity_ContestLobby/scripts.inc b/data/maps/LilycoveCity_ContestLobby/scripts.inc
index 74bee15d3..42ce7beeb 100644
--- a/data/maps/LilycoveCity_ContestLobby/scripts.inc
+++ b/data/maps/LilycoveCity_ContestLobby/scripts.inc
@@ -100,7 +100,7 @@ LilycoveCity_ContestLobby_EventScript_21A314:: @ 821A314
return
LilycoveCity_ContestLobby_EventScript_21A360:: @ 821A360
- specialvar VAR_0x8004, sub_80F8940
+ specialvar VAR_0x8004, CountPlayerContestPaintings
switch VAR_0x8004
case 1, LilycoveCity_ContestLobby_EventScript_21A3A2
case 2, LilycoveCity_ContestLobby_EventScript_21A3A6
diff --git a/data/maps/LilycoveCity_CoveLilyMotel_2F/scripts.inc b/data/maps/LilycoveCity_CoveLilyMotel_2F/scripts.inc
index f7fd5f453..03ac733f9 100644
--- a/data/maps/LilycoveCity_CoveLilyMotel_2F/scripts.inc
+++ b/data/maps/LilycoveCity_CoveLilyMotel_2F/scripts.inc
@@ -6,7 +6,7 @@ LilycoveCity_CoveLilyMotel_2F_EventScript_2186D3:: @ 82186D3
faceplayer
call_if_unset FLAG_TEMP_2, LilycoveCity_CoveLilyMotel_2F_EventScript_2186F9
call_if_set FLAG_TEMP_2, LilycoveCity_CoveLilyMotel_2F_EventScript_21870F
- specialvar VAR_RESULT, sub_80C08E4
+ specialvar VAR_RESULT, HasAllHoennMons
compare VAR_RESULT, 1
goto_if_eq LilycoveCity_CoveLilyMotel_2F_EventScript_218702
release
diff --git a/data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc b/data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc
index da39ee655..f73fbf092 100644
--- a/data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc
+++ b/data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc
@@ -92,7 +92,7 @@ LilycoveCity_LilycoveMuseum_2F_Movement_219863: @ 8219863
LilycoveCity_LilycoveMuseum_2F_EventScript_219866:: @ 8219866
lockall
goto_if_set FLAG_RECEIVED_GLASS_ORNAMENT, LilycoveCity_LilycoveMuseum_2F_EventScript_219921
- specialvar VAR_0x8004, sub_80F8940
+ specialvar VAR_0x8004, CountPlayerContestPaintings
switch VAR_0x8004
case 1, LilycoveCity_LilycoveMuseum_2F_EventScript_2198BA
case 2, LilycoveCity_LilycoveMuseum_2F_EventScript_2198BA
diff --git a/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc b/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc
index 8568a72ef..1f65beda3 100644
--- a/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc
+++ b/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc
@@ -16,7 +16,7 @@ LittlerootTown_ProfessorBirchsLab_MapScript1_1F9CA1: @ 81F9CA1
end
LittlerootTown_ProfessorBirchsLab_EventScript_1F9CCD:: @ 81F9CCD
- specialvar VAR_RESULT, sub_80C08E4
+ specialvar VAR_RESULT, HasAllHoennMons
compare VAR_RESULT, 1
goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1F9CE9
setobjectmovementtype 3, 3
diff --git a/data/specials.inc b/data/specials.inc
index a5f272dc9..83e56106f 100644
--- a/data/specials.inc
+++ b/data/specials.inc
@@ -148,7 +148,7 @@ gSpecials:: @ 81DBA64
def_special sub_80F88E8
def_special sub_80F88DC
def_special sub_80F8864
- def_special sub_80F8940
+ def_special CountPlayerContestPaintings
def_special ShowContestWinner
def_special MauvilleGymSpecial2
def_special MauvilleGymSpecial1
@@ -345,7 +345,7 @@ gSpecials:: @ 81DBA64
def_special sub_80B05B4
def_special SetPacifidlogTMReceivedDay
def_special GetDaysUntilPacifidlogTMAvailable
- def_special sub_80C08E4
+ def_special HasAllHoennMons
def_special MonOTNameMatchesPlayer
def_special BufferLottoTicketNumber
def_special sub_81653CC