summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGriffinR <griffin.g.richards@gmail.com>2020-02-27 14:21:13 -0500
committerGriffinR <griffin.g.richards@gmail.com>2020-02-27 14:21:13 -0500
commit2d9327a1ff21ac142c17e270755c658491eee5aa (patch)
tree3c10b1e08e0bbada1aa4313012e435031b9576eb
parent43f66fce5574592ac1c37b9452fe858e482156bb (diff)
Document Four Island scripts, trainer_card.inc
-rw-r--r--data/event_scripts.s1
-rw-r--r--data/maps/FourIsland/map.json10
-rw-r--r--data/maps/FourIsland/scripts.inc70
-rw-r--r--data/maps/FourIsland/text.inc14
-rw-r--r--data/maps/FourIsland_Harbor/map.json2
-rw-r--r--data/maps/FourIsland_Harbor/scripts.inc2
-rw-r--r--data/maps/FourIsland_House1/map.json2
-rw-r--r--data/maps/FourIsland_House1/scripts.inc4
-rw-r--r--data/maps/FourIsland_House1/text.inc13
-rw-r--r--data/maps/FourIsland_House2/map.json2
-rw-r--r--data/maps/FourIsland_LoreleisHouse/map.json30
-rw-r--r--data/maps/FourIsland_LoreleisHouse/scripts.inc20
-rw-r--r--data/maps/FourIsland_LoreleisHouse/text.inc8
-rw-r--r--data/maps/FourIsland_Mart/map.json6
-rw-r--r--data/maps/FourIsland_Mart/scripts.inc10
-rw-r--r--data/maps/FourIsland_Mart/text.inc4
-rw-r--r--data/maps/FourIsland_PokemonCenter_1F/map.json12
-rw-r--r--data/maps/FourIsland_PokemonCenter_1F/scripts.inc14
-rw-r--r--data/maps/FourIsland_PokemonCenter_1F/text.inc9
-rw-r--r--data/scripts/fame_checker.inc8
-rw-r--r--data/scripts/trainer_card.inc336
-rw-r--r--data/specials.inc2
-rw-r--r--data/text/fame_checker.inc2
-rw-r--r--data/text/trainer_card.inc60
-rw-r--r--include/constants/flags.h2
-rw-r--r--include/constants/trainer_card.h15
-rw-r--r--include/trainer_card.h2
-rw-r--r--src/field_specials.c2
-rw-r--r--src/trainer_card.c55
29 files changed, 363 insertions, 354 deletions
diff --git a/data/event_scripts.s b/data/event_scripts.s
index c088f893d..1e9e38b98 100644
--- a/data/event_scripts.s
+++ b/data/event_scripts.s
@@ -34,6 +34,7 @@
#include "constants/quest_log.h"
#include "constants/daycare.h"
#include "constants/easy_chat.h"
+#include "constants/trainer_card.h"
.include "asm/macros.inc"
.include "asm/macros/event.inc"
.set FALSE, 0
diff --git a/data/maps/FourIsland/map.json b/data/maps/FourIsland/map.json
index ed72da60f..35dd24e8c 100644
--- a/data/maps/FourIsland/map.json
+++ b/data/maps/FourIsland/map.json
@@ -90,7 +90,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
- "script": "FourIsland_EventScript_167E2E",
+ "script": "FourIsland_EventScript_OldWoman",
"flag": "0"
},
{
@@ -155,7 +155,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
- "script": "FourIsland_EventScript_167E73",
+ "script": "FourIsland_EventScript_FatMan",
"flag": "0"
},
{
@@ -168,7 +168,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
- "script": "FourIsland_EventScript_167E5A",
+ "script": "FourIsland_EventScript_LittleGirl",
"flag": "0"
}
],
@@ -237,7 +237,7 @@
"x": 13,
"y": 19,
"elevation": 0,
- "script": "FourIsland_EventScript_167E7C"
+ "script": "FourIsland_EventScript_IslandSign"
},
{
"type": "hidden_item",
@@ -264,7 +264,7 @@
"x": 31,
"y": 23,
"elevation": 0,
- "script": "FourIsland_EventScript_167E85"
+ "script": "FourIsland_EventScript_LoreleisHouseSign"
}
]
}
diff --git a/data/maps/FourIsland/scripts.inc b/data/maps/FourIsland/scripts.inc
index 85e1db283..8a7dfafbf 100644
--- a/data/maps/FourIsland/scripts.inc
+++ b/data/maps/FourIsland/scripts.inc
@@ -1,3 +1,6 @@
+.equ LOCALID_DAYCARE_MAN, 1
+.equ LOCALID_RIVAL, 10
+
FourIsland_MapScripts:: @ 8167CAE
map_script MAP_SCRIPT_ON_TRANSITION, FourIsland_OnTransition
map_script MAP_SCRIPT_ON_FRAME_TABLE, FourIsland_OnFrame
@@ -6,65 +9,64 @@ FourIsland_MapScripts:: @ 8167CAE
FourIsland_OnTransition:: @ 8167CB9
setworldmapflag FLAG_WORLD_MAP_FOUR_ISLAND
compare VAR_MAP_SCENE_FOUR_ISLAND, 0
- call_if_eq EventScript_167CCD
- call EventScript_167CD1
+ call_if_eq FourIsland_EventScript_ShowRival
+ call FourIsland_EventScript_TrySetDayCareManPos
end
-EventScript_167CCD:: @ 8167CCD
+FourIsland_EventScript_ShowRival:: @ 8167CCD
clearflag FLAG_HIDE_FOUR_ISLAND_RIVAL
return
-EventScript_167CD1:: @ 8167CD1
- goto_if_unset FLAG_PENDING_DAYCARE_EGG, EventScript_167CE1
- setobjectxyperm 1, 16, 14
-
-EventScript_167CE1:: @ 8167CE1
+FourIsland_EventScript_TrySetDayCareManPos:: @ 8167CD1
+ goto_if_unset FLAG_PENDING_DAYCARE_EGG, FourIsland_EventScript_EndSetDayCareManPos
+ setobjectxyperm LOCALID_DAYCARE_MAN, 16, 14
+FourIsland_EventScript_EndSetDayCareManPos:: @ 8167CE1
return
FourIsland_OnFrame:: @ 8167CE2
- map_script_2 VAR_MAP_SCENE_FOUR_ISLAND, 0, EventScript_167CEC
+ map_script_2 VAR_MAP_SCENE_FOUR_ISLAND, 0, FourIsland_EventScript_RivalScene
.2byte 0
-EventScript_167CEC:: @ 8167CEC
+FourIsland_EventScript_RivalScene:: @ 8167CEC
lockall
textcolor 0
- applymovement 10, Movement_WalkInPlaceFastestDown
+ applymovement LOCALID_RIVAL, Movement_WalkInPlaceFastestDown
waitmovement 0
playbgm MUS_RIVAL1, 0
- applymovement 10, Movement_ExclamationMark
+ applymovement LOCALID_RIVAL, Movement_ExclamationMark
waitmovement 0
- applymovement 10, Movement_Delay48
+ applymovement LOCALID_RIVAL, Movement_Delay48
waitmovement 0
delay 25
- applymovement 10, Movement_167D49
+ applymovement LOCALID_RIVAL, FourIsland_Movement_RivalApproach
waitmovement 0
- msgbox gUnknown_8182B37
+ msgbox FourIsland_Text_RivalAlreadyGotEggBeSmellingYa
closemessage
- applymovement OBJ_EVENT_ID_PLAYER, Movement_167D52
- applymovement 10, Movement_167D4E
+ applymovement OBJ_EVENT_ID_PLAYER, FourIsland_Movement_PlayerWatchRivalExit
+ applymovement LOCALID_RIVAL, FourIsland_Movement_RivalExit
waitmovement 0
fadedefaultbgm
playse SE_KAIDAN
delay 35
- removeobject 10
+ removeobject LOCALID_RIVAL
setvar VAR_MAP_SCENE_FOUR_ISLAND, 1
releaseall
end
-Movement_167D49:: @ 8167D49
+FourIsland_Movement_RivalApproach:: @ 8167D49
walk_right
walk_right
walk_down
walk_down
step_end
-Movement_167D4E:: @ 8167D4E
+FourIsland_Movement_RivalExit:: @ 8167D4E
delay_16
delay_4
walk_down
step_end
-Movement_167D52:: @ 8167D52
+FourIsland_Movement_PlayerWatchRivalExit:: @ 8167D52
walk_left
walk_in_place_fastest_right
step_end
@@ -136,36 +138,36 @@ FourIsland_EventScript_CheckOnTwoMons:: @ 8167E19
release
end
-FourIsland_EventScript_167E2E:: @ 8167E2E
+FourIsland_EventScript_OldWoman:: @ 8167E2E
lock
faceplayer
- goto_if_set FLAG_SYS_CAN_LINK_WITH_RS, EventScript_167E43
- msgbox gUnknown_8182A2B
+ goto_if_set FLAG_SYS_CAN_LINK_WITH_RS, FourIsland_EventScript_OldWomanLoreleiLeft
+ msgbox FourIsland_Text_LoreleiHasReturned
release
end
-EventScript_167E43:: @ 8167E43
+FourIsland_EventScript_OldWomanLoreleiLeft:: @ 8167E43
famechecker FAMECHECKER_LORELEI, 5
- msgbox gUnknown_8182A75
+ msgbox FourIsland_Text_LoreleiMetLaprasAsChild
release
end
-FourIsland_EventScript_167E5A:: @ 8167E5A
+FourIsland_EventScript_LittleGirl:: @ 8167E5A
lock
faceplayer
famechecker FAMECHECKER_LORELEI, 4
- msgbox gUnknown_8182CE3
+ msgbox FourIsland_Text_LoreleiHasLotsOfStuffedDolls
release
end
-FourIsland_EventScript_167E73:: @ 8167E73
- msgbox gUnknown_8182D8E, MSGBOX_NPC
+FourIsland_EventScript_FatMan:: @ 8167E73
+ msgbox FourIsland_Text_MadeSlushieUsingIcefallCaveIce, MSGBOX_NPC
end
-FourIsland_EventScript_167E7C:: @ 8167E7C
- msgbox gUnknown_8182A03, MSGBOX_SIGN
+FourIsland_EventScript_IslandSign:: @ 8167E7C
+ msgbox FourIsland_Text_IslandSign, MSGBOX_SIGN
end
-FourIsland_EventScript_167E85:: @ 8167E85
- msgbox gUnknown_8182DEB, MSGBOX_SIGN
+FourIsland_EventScript_LoreleisHouseSign:: @ 8167E85
+ msgbox FourIsland_Text_LoreleisHouse, MSGBOX_SIGN
end
diff --git a/data/maps/FourIsland/text.inc b/data/maps/FourIsland/text.inc
index 04845b223..e54650761 100644
--- a/data/maps/FourIsland/text.inc
+++ b/data/maps/FourIsland/text.inc
@@ -1,13 +1,13 @@
-gUnknown_8182A03:: @ 8182A03
+FourIsland_Text_IslandSign:: @ 8182A03
.string "FOUR ISLAND\n"
.string "The Warm, Blue, Floe Island$"
-gUnknown_8182A2B:: @ 8182A2B
+FourIsland_Text_LoreleiHasReturned:: @ 8182A2B
.string "LORELEI has returned.\p"
.string "Did she find the city life too\n"
.string "stressful, I wonder?$"
-gUnknown_8182A75:: @ 8182A75
+FourIsland_Text_LoreleiMetLaprasAsChild:: @ 8182A75
.string "LORELEI has gone back.\p"
.string "The LAPRAS she has, I imagine it\n"
.string "to be the one she met as a child.\p"
@@ -16,7 +16,7 @@ gUnknown_8182A75:: @ 8182A75
.string "Perhaps that POKéMON has been with\n"
.string "her ever since.$"
-gUnknown_8182B37:: @ 8182B37
+FourIsland_Text_RivalAlreadyGotEggBeSmellingYa:: @ 8182B37
.string "{RIVAL}: Hey!\n"
.string "{PLAYER}!\p"
.string "What are you doing here in the\n"
@@ -37,7 +37,7 @@ gUnknown_8182B37:: @ 8182B37
.string "waste.\p"
.string "Be smelling ya!$"
-gUnknown_8182CE3:: @ 8182CE3
+FourIsland_Text_LoreleiHasLotsOfStuffedDolls:: @ 8182CE3
.string "Oh, you found me!\n"
.string "Please don't tell LORELEI.\p"
.string "Did you know that LORELEI has lots\n"
@@ -45,12 +45,12 @@ gUnknown_8182CE3:: @ 8182CE3
.string "Every time she comes back to\n"
.string "FOUR ISLAND, her collection grows!$"
-gUnknown_8182D8E:: @ 8182D8E
+FourIsland_Text_MadeSlushieUsingIcefallCaveIce:: @ 8182D8E
.string "Ooh, chilly!\p"
.string "I made a slushie using ice I\n"
.string "shaved inside ICEFALL CAVE.\p"
.string "It's chilly and tasty!$"
-gUnknown_8182DEB:: @ 8182DEB
+FourIsland_Text_LoreleisHouse:: @ 8182DEB
.string "LORELEI'S HOUSE$"
diff --git a/data/maps/FourIsland_Harbor/map.json b/data/maps/FourIsland_Harbor/map.json
index 6cd0223da..fa23fe2cd 100644
--- a/data/maps/FourIsland_Harbor/map.json
+++ b/data/maps/FourIsland_Harbor/map.json
@@ -38,7 +38,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
- "script": "FourIsland_Harbor_EventScript_171C99",
+ "script": "FourIsland_Harbor_EventScript_Sailor",
"flag": "0"
}
],
diff --git a/data/maps/FourIsland_Harbor/scripts.inc b/data/maps/FourIsland_Harbor/scripts.inc
index d8933d783..3a16cd3e3 100644
--- a/data/maps/FourIsland_Harbor/scripts.inc
+++ b/data/maps/FourIsland_Harbor/scripts.inc
@@ -1,7 +1,7 @@
FourIsland_Harbor_MapScripts:: @ 8171C98
.byte 0
-FourIsland_Harbor_EventScript_171C99:: @ 8171C99
+FourIsland_Harbor_EventScript_Sailor:: @ 8171C99
lock
faceplayer
message Text_WhereDoYouWantToSail
diff --git a/data/maps/FourIsland_House1/map.json b/data/maps/FourIsland_House1/map.json
index 3d4984879..f581ffa5a 100644
--- a/data/maps/FourIsland_House1/map.json
+++ b/data/maps/FourIsland_House1/map.json
@@ -38,7 +38,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
- "script": "FourIsland_House1_EventScript_171C45",
+ "script": "FourIsland_House1_EventScript_FatMan",
"flag": "0"
}
],
diff --git a/data/maps/FourIsland_House1/scripts.inc b/data/maps/FourIsland_House1/scripts.inc
index 46ec500fe..e8e6322f5 100644
--- a/data/maps/FourIsland_House1/scripts.inc
+++ b/data/maps/FourIsland_House1/scripts.inc
@@ -1,6 +1,6 @@
FourIsland_House1_MapScripts:: @ 8171C44
.byte 0
-FourIsland_House1_EventScript_171C45:: @ 8171C45
- msgbox gUnknown_81A3802, MSGBOX_NPC
+FourIsland_House1_EventScript_FatMan:: @ 8171C45
+ msgbox FourIsland_House1_Text_YoureAwfullyHeavy, MSGBOX_NPC
end
diff --git a/data/maps/FourIsland_House1/text.inc b/data/maps/FourIsland_House1/text.inc
index 2d4f8c4bd..255b3c028 100644
--- a/data/maps/FourIsland_House1/text.inc
+++ b/data/maps/FourIsland_House1/text.inc
@@ -1,4 +1,7 @@
-Text_1A3778:: @ 81A3778
+@ Text for this file was split weirdly, and is instead in FourIsland_PokemonCenter_1F/text.inc
+@ Theres also an unused JP version of that text in this file instead
+
+JPText_BodySlamTeach:: @ 81A3778
.string "そーれ ぼよーん!\n"
.string "どっちが さきに へたばるか?\l"
.string "のしかかり しょうぶ してるんだ\p"
@@ -7,17 +10,17 @@ Text_1A3778:: @ 81A3778
.string "かわりに きみの ポケモンに\l"
.string "のしかかり おしえて やろっか?$"
-Text_1A37DB:: @ 81A37DB
+JPText_BodySlamDeclined:: @ 81A37DB
.string "また おいで ぼよーん!$"
-Text_1A37E8:: @ 81A37E8
+JPText_BodySlamWhichMon:: @ 81A37E8
.string "どの ポケモンに\n"
.string "おしえたい かい?$"
-Text_1A37FB:: @ 81A37FB
+JPText_BodySlamTaught:: @ 81A37FB
.string "ぼよよーん!$"
-gUnknown_81A3802:: @ 81A3802
+FourIsland_House1_Text_YoureAwfullyHeavy:: @ 81A3802
.string "There! Boing!\n"
.string "You're awfully heavy!$"
diff --git a/data/maps/FourIsland_House2/map.json b/data/maps/FourIsland_House2/map.json
index b83419325..a4b926233 100644
--- a/data/maps/FourIsland_House2/map.json
+++ b/data/maps/FourIsland_House2/map.json
@@ -25,7 +25,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
- "script": "FourIsland_House2_EventScript_1B2938",
+ "script": "FourIsland_House2_EventScript_StickerMan",
"flag": "0"
}
],
diff --git a/data/maps/FourIsland_LoreleisHouse/map.json b/data/maps/FourIsland_LoreleisHouse/map.json
index 7dbe72a88..1c09bc412 100644
--- a/data/maps/FourIsland_LoreleisHouse/map.json
+++ b/data/maps/FourIsland_LoreleisHouse/map.json
@@ -25,7 +25,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
- "script": "FourIsland_LoreleisHouse_EventScript_171C58",
+ "script": "FourIsland_LoreleisHouse_EventScript_Lorelei",
"flag": "FLAG_HIDE_LORELEI_IN_HER_HOUSE"
},
{
@@ -38,7 +38,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
- "script": "FourIsland_LoreleisHouse_EventScript_171C8D",
+ "script": "FourIsland_LoreleisHouse_EventScript_Doll",
"flag": "0"
},
{
@@ -51,7 +51,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
- "script": "FourIsland_LoreleisHouse_EventScript_171C8D",
+ "script": "FourIsland_LoreleisHouse_EventScript_Doll",
"flag": "0"
},
{
@@ -64,7 +64,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
- "script": "FourIsland_LoreleisHouse_EventScript_171C8D",
+ "script": "FourIsland_LoreleisHouse_EventScript_Doll",
"flag": "0"
},
{
@@ -77,7 +77,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
- "script": "FourIsland_LoreleisHouse_EventScript_171C8D",
+ "script": "FourIsland_LoreleisHouse_EventScript_Doll",
"flag": "0"
},
{
@@ -90,7 +90,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
- "script": "FourIsland_LoreleisHouse_EventScript_171C8D",
+ "script": "FourIsland_LoreleisHouse_EventScript_Doll",
"flag": "0"
},
{
@@ -103,7 +103,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
- "script": "FourIsland_LoreleisHouse_EventScript_171C8D",
+ "script": "FourIsland_LoreleisHouse_EventScript_Doll",
"flag": "0"
},
{
@@ -116,7 +116,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
- "script": "FourIsland_LoreleisHouse_EventScript_171C8D",
+ "script": "FourIsland_LoreleisHouse_EventScript_Doll",
"flag": "FLAG_HIDE_LORELEI_HOUSE_MEOWTH_DOLL"
},
{
@@ -129,7 +129,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
- "script": "FourIsland_LoreleisHouse_EventScript_171C8D",
+ "script": "FourIsland_LoreleisHouse_EventScript_Doll",
"flag": "FLAG_HIDE_LORELEI_HOUSE_CHANSEY_DOLL"
},
{
@@ -142,7 +142,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
- "script": "FourIsland_LoreleisHouse_EventScript_171C8D",
+ "script": "FourIsland_LoreleisHouse_EventScript_Doll",
"flag": "FLAG_HIDE_LORELEI_HOUSE_JIGGLYPUFF_DOLL"
},
{
@@ -155,7 +155,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
- "script": "FourIsland_LoreleisHouse_EventScript_171C8D",
+ "script": "FourIsland_LoreleisHouse_EventScript_Doll",
"flag": "FLAG_HIDE_LORELEIS_HOUSE_NIDORAN_F_DOLL"
},
{
@@ -168,7 +168,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
- "script": "FourIsland_LoreleisHouse_EventScript_171C8D",
+ "script": "FourIsland_LoreleisHouse_EventScript_Doll",
"flag": "FLAG_HIDE_LORELEIS_HOUSE_NIDORAN_M_DOLL"
},
{
@@ -181,7 +181,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
- "script": "FourIsland_LoreleisHouse_EventScript_171C8D",
+ "script": "FourIsland_LoreleisHouse_EventScript_Doll",
"flag": "FLAG_HIDE_LORELEIS_HOUSE_PIDGEOT_DOLL"
},
{
@@ -194,7 +194,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
- "script": "FourIsland_LoreleisHouse_EventScript_171C8D",
+ "script": "FourIsland_LoreleisHouse_EventScript_Doll",
"flag": "FLAG_HIDE_LORELEIS_HOUSE_FEAROW_DOLL"
},
{
@@ -207,7 +207,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
- "script": "FourIsland_LoreleisHouse_EventScript_171C8D",
+ "script": "FourIsland_LoreleisHouse_EventScript_Doll",
"flag": "FLAG_HIDE_LORELEIS_HOUSE_LAPRAS_DOLL"
}
],
diff --git a/data/maps/FourIsland_LoreleisHouse/scripts.inc b/data/maps/FourIsland_LoreleisHouse/scripts.inc
index c39cc1da9..6259870e6 100644
--- a/data/maps/FourIsland_LoreleisHouse/scripts.inc
+++ b/data/maps/FourIsland_LoreleisHouse/scripts.inc
@@ -6,28 +6,28 @@ FourIsland_LoreleisHouse_OnTransition:: @ 8171C54
special Special_ComputeLoreleiDollCollection
end
-FourIsland_LoreleisHouse_EventScript_171C58:: @ 8171C58
+FourIsland_LoreleisHouse_EventScript_Lorelei:: @ 8171C58
lock
faceplayer
- goto_if_set FLAG_TALKED_TO_LORELEI_AFTER_WAREHOUSE, EventScript_171C83
- goto_if_set FLAG_DEFEATED_ROCKETS_IN_WAREHOUSE, EventScript_171C76
- msgbox gUnknown_81A3826
+ goto_if_set FLAG_TALKED_TO_LORELEI_AFTER_WAREHOUSE, FourIsland_LoreleisHouse_EventScript_Lorelei3
+ goto_if_set FLAG_DEFEATED_ROCKETS_IN_WAREHOUSE, FourIsland_LoreleisHouse_EventScript_Lorelei2
+ msgbox FourIsland_LoreleisHouse_Text_IfAnythingWereToHappenToIsland
release
end
-EventScript_171C76:: @ 8171C76
+FourIsland_LoreleisHouse_EventScript_Lorelei2:: @ 8171C76
setflag FLAG_TALKED_TO_LORELEI_AFTER_WAREHOUSE
- msgbox gUnknown_81A390C
+ msgbox FourIsland_LoreleisHouse_Text_IllReturnToLeagueInShortWhile
release
end
-EventScript_171C83:: @ 8171C83
- msgbox gUnknown_81A39D8
+FourIsland_LoreleisHouse_EventScript_Lorelei3:: @ 8171C83
+ msgbox FourIsland_LoreleisHouse_Text_WillDoWhatICanHereAndNow
release
end
-FourIsland_LoreleisHouse_EventScript_171C8D:: @ 8171C8D
+FourIsland_LoreleisHouse_EventScript_Doll:: @ 8171C8D
lock
- msgbox gUnknown_81A3A42
+ msgbox FourIsland_LoreleisHouse_Text_StuffedMonDollsGalore
release
end
diff --git a/data/maps/FourIsland_LoreleisHouse/text.inc b/data/maps/FourIsland_LoreleisHouse/text.inc
index 5c7d0cd81..b332cd50e 100644
--- a/data/maps/FourIsland_LoreleisHouse/text.inc
+++ b/data/maps/FourIsland_LoreleisHouse/text.inc
@@ -1,4 +1,4 @@
-gUnknown_81A3826:: @ 81A3826
+FourIsland_LoreleisHouse_Text_IfAnythingWereToHappenToIsland:: @ 81A3826
.string "LORELEI: There's something weighing\n"
.string "heavily on my mind.\p"
.string "If anything were to happen on\n"
@@ -8,7 +8,7 @@ gUnknown_81A3826:: @ 81A3826
.string "I wonder if that would make me\n"
.string "irresponsible to my home…$"
-gUnknown_81A390C:: @ 81A390C
+FourIsland_LoreleisHouse_Text_IllReturnToLeagueInShortWhile:: @ 81A390C
.string "LORELEI: So, you managed to solve\n"
.string "all the problems here?\p"
.string "That's wonderful.\p"
@@ -18,12 +18,12 @@ gUnknown_81A390C:: @ 81A390C
.string "I'll return to the POKéMON LEAGUE\n"
.string "in a short while.$"
-gUnknown_81A39D8:: @ 81A39D8
+FourIsland_LoreleisHouse_Text_WillDoWhatICanHereAndNow:: @ 81A39D8
.string "I don't know what will happen in\n"
.string "the future, but…\p"
.string "I will do what I can here and now.\n"
.string "That's all I can do.$"
-gUnknown_81A3A42:: @ 81A3A42
+FourIsland_LoreleisHouse_Text_StuffedMonDollsGalore:: @ 81A3A42
.string "Stuffed POKéMON dolls galore!$"
diff --git a/data/maps/FourIsland_Mart/map.json b/data/maps/FourIsland_Mart/map.json
index f5820fef9..5543c8c50 100644
--- a/data/maps/FourIsland_Mart/map.json
+++ b/data/maps/FourIsland_Mart/map.json
@@ -25,7 +25,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
- "script": "FourIsland_Mart_EventScript_171CAE",
+ "script": "FourIsland_Mart_EventScript_Clerk",
"flag": "0"
},
{
@@ -38,7 +38,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
- "script": "FourIsland_Mart_EventScript_1ACF46",
+ "script": "FourIsland_Mart_EventScript_OldMan",
"flag": "0"
},
{
@@ -51,7 +51,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
- "script": "FourIsland_Mart_EventScript_171CE8",
+ "script": "FourIsland_Mart_EventScript_Camper",
"flag": "0"
}
],
diff --git a/data/maps/FourIsland_Mart/scripts.inc b/data/maps/FourIsland_Mart/scripts.inc
index 5f85eaae4..36b3a0914 100644
--- a/data/maps/FourIsland_Mart/scripts.inc
+++ b/data/maps/FourIsland_Mart/scripts.inc
@@ -1,19 +1,19 @@
FourIsland_Mart_MapScripts:: @ 8171CAD
.byte 0
-FourIsland_Mart_EventScript_171CAE:: @ 8171CAE
+FourIsland_Mart_EventScript_Clerk:: @ 8171CAE
goto_if_questlog EventScript_ReleaseEnd
lock
faceplayer
message Text_MayIHelpYou
waitmessage
- pokemart Items_171CD4
+ pokemart FourIsland_Mart_Items
msgbox Text_PleaseComeAgain
release
end
.align 2
-Items_171CD4:: @ 8171CD4
+FourIsland_Mart_Items:: @ 8171CD4
.2byte ITEM_ULTRA_BALL
.2byte ITEM_FULL_RESTORE
.2byte ITEM_MAX_POTION
@@ -26,6 +26,6 @@ Items_171CD4:: @ 8171CD4
release
end
-FourIsland_Mart_EventScript_171CE8:: @ 8171CE8
- msgbox gUnknown_81A3B14, MSGBOX_NPC
+FourIsland_Mart_EventScript_Camper:: @ 8171CE8
+ msgbox FourIsland_Mart_Text_IcefallCaveIsFrigid, MSGBOX_NPC
end
diff --git a/data/maps/FourIsland_Mart/text.inc b/data/maps/FourIsland_Mart/text.inc
index eba66dd37..afde0e79c 100644
--- a/data/maps/FourIsland_Mart/text.inc
+++ b/data/maps/FourIsland_Mart/text.inc
@@ -1,4 +1,4 @@
-Text_1A3A60:: @ 81A3A60
+FourIsland_Mart_Text_LoreleiGrewUpOnThisIsland:: @ 81A3A60
.string "We've had a great and powerful\n"
.string "TRAINER grow up on this island.\p"
.string "I bet even you'd know her.\n"
@@ -6,7 +6,7 @@ Text_1A3A60:: @ 81A3A60
.string "When LORELEI was just a tyke,\n"
.string "I taught her about POKéMON.$"
-gUnknown_81A3B14:: @ 81A3B14
+FourIsland_Mart_Text_IcefallCaveIsFrigid:: @ 81A3B14
.string "The SEVII ISLANDS are in a warm\n"
.string "region overall.\p"
.string "But there is one exception you\n"
diff --git a/data/maps/FourIsland_PokemonCenter_1F/map.json b/data/maps/FourIsland_PokemonCenter_1F/map.json
index a8bf5fa97..7757c904e 100644
--- a/data/maps/FourIsland_PokemonCenter_1F/map.json
+++ b/data/maps/FourIsland_PokemonCenter_1F/map.json
@@ -25,7 +25,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
- "script": "FourIsland_PokemonCenter_1F_EventScript_171BF9",
+ "script": "FourIsland_PokemonCenter_1F_EventScript_Nurse",
"flag": "0"
},
{
@@ -38,7 +38,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
- "script": "FourIsland_PokemonCenter_1F_EventScript_171C02",
+ "script": "FourIsland_PokemonCenter_1F_EventScript_Man",
"flag": "0"
},
{
@@ -51,7 +51,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
- "script": "FourIsland_PokemonCenter_1F_EventScript_171C0B",
+ "script": "FourIsland_PokemonCenter_1F_EventScript_Woman",
"flag": "0"
},
{
@@ -64,7 +64,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
- "script": "FourIsland_PokemonCenter_1F_EventScript_171C14",
+ "script": "FourIsland_PokemonCenter_1F_EventScript_Gentleman",
"flag": "0"
}
],
@@ -91,14 +91,14 @@
"x": 3,
"y": 1,
"elevation": 0,
- "script": "FourIsland_PokemonCenter_1F_EventScript_1ACDD0"
+ "script": "FourIsland_PokemonCenter_1F_EventScript_PokemonJournal"
},
{
"type": "bg_event_type_1",
"x": 2,
"y": 1,
"elevation": 0,
- "script": "FourIsland_PokemonCenter_1F_EventScript_1ACDD0"
+ "script": "FourIsland_PokemonCenter_1F_EventScript_PokemonJournal"
}
]
}
diff --git a/data/maps/FourIsland_PokemonCenter_1F/scripts.inc b/data/maps/FourIsland_PokemonCenter_1F/scripts.inc
index 4ee8e33c1..afb0c7582 100644
--- a/data/maps/FourIsland_PokemonCenter_1F/scripts.inc
+++ b/data/maps/FourIsland_PokemonCenter_1F/scripts.inc
@@ -7,21 +7,21 @@ FourIsland_PokemonCenter_1F_OnTransition:: @ 8171BF5
setrespawn SPAWN_FOUR_ISLAND
end
-FourIsland_PokemonCenter_1F_EventScript_171BF9:: @ 8171BF9
+FourIsland_PokemonCenter_1F_EventScript_Nurse:: @ 8171BF9
lock
faceplayer
call EventScript_PkmnCenterNurse
release
end
-FourIsland_PokemonCenter_1F_EventScript_171C02:: @ 8171C02
- msgbox gUnknown_81A3627, MSGBOX_NPC
+FourIsland_PokemonCenter_1F_EventScript_Man:: @ 8171C02
+ msgbox FourIsland_PokemonCenter_1F_Text_RareIceMonsInCave, MSGBOX_NPC
end
-FourIsland_PokemonCenter_1F_EventScript_171C0B:: @ 8171C0B
- msgbox gUnknown_81A3697, MSGBOX_NPC
+FourIsland_PokemonCenter_1F_EventScript_Woman:: @ 8171C0B
+ msgbox FourIsland_PokemonCenter_1F_Text_DayCarePeopleFoundEggBefore, MSGBOX_NPC
end
-FourIsland_PokemonCenter_1F_EventScript_171C14:: @ 8171C14
- msgbox gUnknown_81A3734, MSGBOX_NPC
+FourIsland_PokemonCenter_1F_EventScript_Gentleman:: @ 8171C14
+ msgbox FourIsland_PokemonCenter_1F_Text_NewPokemonJournalHasntArrived, MSGBOX_NPC
end
diff --git a/data/maps/FourIsland_PokemonCenter_1F/text.inc b/data/maps/FourIsland_PokemonCenter_1F/text.inc
index 954aabd96..43e6cacf6 100644
--- a/data/maps/FourIsland_PokemonCenter_1F/text.inc
+++ b/data/maps/FourIsland_PokemonCenter_1F/text.inc
@@ -1,3 +1,4 @@
+@ The 5 texts below are supposed to be in FourIsland_House1
Text_BodySlamTeach:: @ 81A3505
.string "Ready?\n"
.string "Boing!\p"
@@ -19,17 +20,17 @@ Text_BodySlamWhichMon:: @ 81A35DA
Text_BodySlamTaught:: @ 81A3609
.string "Boioing!$"
-Text_1A3612:: @ 81A3612
+FourIsland_House1_Text_FatMan:: @ 81A3612
.string "それ ぼよーん!\n"
.string "おまえ おもいなあー!$"
-gUnknown_81A3627:: @ 81A3627
+FourIsland_PokemonCenter_1F_Text_RareIceMonsInCave:: @ 81A3627
.string "There's a rare kind of ICE POKéMON\n"
.string "that lives in the cave.\p"
.string "We get a lot of visitors hoping to\n"
.string "see that POKéMON.$"
-gUnknown_81A3697:: @ 81A3697
+FourIsland_PokemonCenter_1F_Text_DayCarePeopleFoundEggBefore:: @ 81A3697
.string "Oh? A POKéMON EGG?\n"
.string "…I have no idea.\p"
.string "…Oh, wait. The DAY-CARE people\n"
@@ -37,7 +38,7 @@ gUnknown_81A3697:: @ 81A3697
.string "They said that they'd found EGGS\n"
.string "before on their property.$"
-gUnknown_81A3734:: @ 81A3734
+FourIsland_PokemonCenter_1F_Text_NewPokemonJournalHasntArrived:: @ 81A3734
.string "What's this?\p"
.string "The new POKéMON JOURNAL hasn't\n"
.string "arrived on this island?$"
diff --git a/data/scripts/fame_checker.inc b/data/scripts/fame_checker.inc
index c844cc115..81c05ab40 100644
--- a/data/scripts/fame_checker.inc
+++ b/data/scripts/fame_checker.inc
@@ -27,11 +27,11 @@ EventScript_1ACDB5:: @ 81ACDB5
release
end
-FourIsland_PokemonCenter_1F_EventScript_1ACDD0:: @ 81ACDD0
+FourIsland_PokemonCenter_1F_EventScript_PokemonJournal:: @ 81ACDD0
lockall
famechecker FAMECHECKER_DAISY, 5
textcolor 3
- msgbox gUnknown_81B1B3D
+ msgbox PokemonJournal_Text_SpecialFeatureDaisyOak
releaseall
end
@@ -143,11 +143,11 @@ FiveIsland_ResortGorgeous_House_EventScript_1ACF2C:: @ 81ACF2C
releaseall
end
-FourIsland_Mart_EventScript_1ACF46:: @ 81ACF46
+FourIsland_Mart_EventScript_OldMan:: @ 81ACF46
lock
faceplayer
famechecker FAMECHECKER_LORELEI, 2
- msgbox Text_1A3A60
+ msgbox FourIsland_Mart_Text_LoreleiGrewUpOnThisIsland
release
end
diff --git a/data/scripts/trainer_card.inc b/data/scripts/trainer_card.inc
index 906744fa8..39589cffa 100644
--- a/data/scripts/trainer_card.inc
+++ b/data/scripts/trainer_card.inc
@@ -1,79 +1,79 @@
CeladonCity_GameCorner_EventScript_PhotoPrinter:: @ 81B2867
lockall
showmoneybox 0, 0, 0
- msgbox gUnknown_81B1D7D, MSGBOX_YESNO
+ msgbox CeladonCity_GameCorner_Text_TryPokemonPrinter, MSGBOX_YESNO
compare VAR_RESULT, NO
- goto_if_eq EventScript_1B2926
+ goto_if_eq CeladonCity_GameCorner_EventScript_DeclinePhoto
checkmoney 50, 0
compare VAR_RESULT, FALSE
- goto_if_eq EventScript_1B292B
+ goto_if_eq CeladonCity_GameCorner_EventScript_NotEnoughMoneyForPhoto
playse SE_SHOP
removemoney 50, 0
updatemoneybox 0, 0, 0
waitse
- message gUnknown_81B1E24
+ message CeladonCity_GameCorner_Text_ChoosePrintType
waitmessage
multichoice 21, 0, MULTICHOICE_TRAINER_CARD_ICON_TINT, TRUE
switch VAR_RESULT
- case 0, EventScript_1B28DB
- case 1, EventScript_1B28E6
- case 2, EventScript_1B28F1
- case 3, EventScript_1B28FC
+ case 0, CeladonCity_GameCorner_EventScript_PrintTypeNormal
+ case 1, CeladonCity_GameCorner_EventScript_PrintTypeBlack
+ case 2, CeladonCity_GameCorner_EventScript_PrintTypePink
+ case 3, CeladonCity_GameCorner_EventScript_PrintTypeSepia
end
-EventScript_1B28DB:: @ 81B28DB
- setvar VAR_0x8004, 0
- goto EventScript_1B2907
+CeladonCity_GameCorner_EventScript_PrintTypeNormal:: @ 81B28DB
+ setvar VAR_0x8004, MON_ICON_TINT_NORMAL
+ goto CeladonCity_GameCorner_EventScript_PrintPhoto
end
-EventScript_1B28E6:: @ 81B28E6
- setvar VAR_0x8004, 1
- goto EventScript_1B2907
+CeladonCity_GameCorner_EventScript_PrintTypeBlack:: @ 81B28E6
+ setvar VAR_0x8004, MON_ICON_TINT_BLACK
+ goto CeladonCity_GameCorner_EventScript_PrintPhoto
end
-EventScript_1B28F1:: @ 81B28F1
- setvar VAR_0x8004, 2
- goto EventScript_1B2907
+CeladonCity_GameCorner_EventScript_PrintTypePink:: @ 81B28F1
+ setvar VAR_0x8004, MON_ICON_TINT_PINK
+ goto CeladonCity_GameCorner_EventScript_PrintPhoto
end
-EventScript_1B28FC:: @ 81B28FC
- setvar VAR_0x8004, 3
- goto EventScript_1B2907
+CeladonCity_GameCorner_EventScript_PrintTypeSepia:: @ 81B28FC
+ setvar VAR_0x8004, MON_ICON_TINT_SEPIA
+ goto CeladonCity_GameCorner_EventScript_PrintPhoto
end
-EventScript_1B2907:: @ 81B2907
- message gUnknown_81B1E42
+CeladonCity_GameCorner_EventScript_PrintPhoto:: @ 81B2907
+ message CeladonCity_GameCorner_Text_BigSmileForPhoto
waitmessage
playse MUS_ME_PHOTO
dofieldeffect FLDEFF_UNK_45
delay 60
special Special_UpdateTrainerCardPhotoIcons
- msgbox gUnknown_81B1E7D
+ msgbox CeladonCity_GameCorner_Text_PrintIsReadyCheckTrainerCard
hidemoneybox 0, 0
releaseall
end
-EventScript_1B2926:: @ 81B2926
+CeladonCity_GameCorner_EventScript_DeclinePhoto:: @ 81B2926
hidemoneybox 0, 0
releaseall
end
-EventScript_1B292B:: @ 81B292B
- msgbox gUnknown_81B1E07
+CeladonCity_GameCorner_EventScript_NotEnoughMoneyForPhoto:: @ 81B292B
+ msgbox CeladonCity_GameCorner_Text_DontHaveEnoughMoney
hidemoneybox 0, 0
releaseall
end
-FourIsland_House2_EventScript_1B2938:: @ 81B2938
+FourIsland_House2_EventScript_StickerMan:: @ 81B2938
lock
- specialvar VAR_0x8008, Special_StickerLadyGetBragFlags
- goto_if_unset FLAG_MET_STICKER_LADY, EventScript_1B2951
- goto_if_set FLAG_MET_STICKER_LADY, EventScript_1B2994
+ specialvar VAR_0x8008, StickerManGetBragFlags
+ goto_if_unset FLAG_MET_STICKER_MAN, FourIsland_House2_EventScript_MeetStickerMan
+ goto_if_set FLAG_MET_STICKER_MAN, EventScript_1B2994
end
-EventScript_1B2951:: @ 81B2951
- setflag FLAG_MET_STICKER_LADY
- msgbox gUnknown_81B1EB3
+FourIsland_House2_EventScript_MeetStickerMan:: @ 81B2951
+ setflag FLAG_MET_STICKER_MAN
+ msgbox FourIsland_House2_Text_WishICouldShowOffStickers
applymovement 1, Movement_FacePlayer
waitmovement 0
playse SE_PIN
@@ -82,10 +82,10 @@ EventScript_1B2951:: @ 81B2951
applymovement 1, Movement_Delay48
waitmovement 0
compare VAR_0x8008, 0
- goto_if_eq EventScript_1B2B8E
- message gUnknown_81B1EF8
+ goto_if_eq FourIsland_House2_EventScript_StickerManNothingToBrag
+ message FourIsland_House2_Text_GiveYouStickerIfYouBrag
waitmessage
- goto EventScript_1B29D0
+ goto FourIsland_House2_EventScript_ChooseBrag
end
EventScript_1B2994:: @ 81B2994
@@ -95,290 +95,282 @@ EventScript_1B2994:: @ 81B2994
special sub_8112364
compare VAR_0x8008, 0
goto_if_eq EventScript_1B29C6
- message gUnknown_81B2025
+ message FourIsland_House2_Text_BragAboutWhatToday
waitmessage
- goto EventScript_1B29D0
+ goto FourIsland_House2_EventScript_ChooseBrag
end
EventScript_1B29C6:: @ 81B29C6
- msgbox gUnknown_81B1FEF
+ msgbox FourIsland_House2_Text_BragAboutSomethingForMe
release
end
-EventScript_1B29D0:: @ 81B29D0
+FourIsland_House2_EventScript_ChooseBrag:: @ 81B29D0
switch VAR_0x8008
- case 1, EventScript_1B2A23
- case 2, EventScript_1B2A4F
- case 4, EventScript_1B2A7B
- case 3, EventScript_1B2AA7
- case 5, EventScript_1B2ADE
- case 6, EventScript_1B2B15
- case 7, EventScript_1B2B4C
+ case 1, FourIsland_House2_EventScript_ChooseBragHoF
+ case 2, FourIsland_House2_EventScript_ChooseBragEggs
+ case 4, FourIsland_House2_EventScript_ChooseBragLinkWins
+ case 3, FourIsland_House2_EventScript_ChooseBragHoFEggs
+ case 5, FourIsland_House2_EventScript_ChooseBragHoFLinkWins
+ case 6, FourIsland_House2_EventScript_ChooseBragEggsLinkWins
+ case 7, FourIsland_House2_EventScript_ChooseBragHofEggsLinkWins
end
-EventScript_1B2A23:: @ 81B2A23
+FourIsland_House2_EventScript_ChooseBragHoF:: @ 81B2A23
multichoice 15, 8, MULTICHOICE_HOF_QUIT, FALSE
switch VAR_RESULT
- case 0, EventScript_1B2B98
- case 1, EventScript_1B2DF6
- case SCR_MENU_CANCEL, EventScript_1B2DF6
+ case 0, FourIsland_House2_EventScript_BragHoF
+ case 1, FourIsland_House2_EventScript_QuitBrag
+ case SCR_MENU_CANCEL, FourIsland_House2_EventScript_QuitBrag
end
-EventScript_1B2A4F:: @ 81B2A4F
+FourIsland_House2_EventScript_ChooseBragEggs:: @ 81B2A4F
multichoice 16, 8, MULTICHOICE_EGGS_QUIT, FALSE
switch VAR_RESULT
- case 0, EventScript_1B2C62
- case 1, EventScript_1B2DF6
- case SCR_MENU_CANCEL, EventScript_1B2DF6
+ case 0, FourIsland_House2_EventScript_BragEggs
+ case 1, FourIsland_House2_EventScript_QuitBrag
+ case SCR_MENU_CANCEL, FourIsland_House2_EventScript_QuitBrag
end
-EventScript_1B2A7B:: @ 81B2A7B
+FourIsland_House2_EventScript_ChooseBragLinkWins:: @ 81B2A7B
multichoice 15, 8, MULTICHOICE_VICTORIES_QUIT, FALSE
switch VAR_RESULT
- case 0, EventScript_1B2D2C
- case 1, EventScript_1B2DF6
- case SCR_MENU_CANCEL, EventScript_1B2DF6
+ case 0, FourIsland_House2_EventScript_BragLinkWins
+ case 1, FourIsland_House2_EventScript_QuitBrag
+ case SCR_MENU_CANCEL, FourIsland_House2_EventScript_QuitBrag
end
-EventScript_1B2AA7:: @ 81B2AA7
+FourIsland_House2_EventScript_ChooseBragHoFEggs:: @ 81B2AA7
multichoice 15, 6, MULTICHOICE_HOF_EGGS_QUIT, FALSE
switch VAR_RESULT
- case 0, EventScript_1B2B98
- case 1, EventScript_1B2C62
- case 2, EventScript_1B2DF6
- case SCR_MENU_CANCEL, EventScript_1B2DF6
+ case 0, FourIsland_House2_EventScript_BragHoF
+ case 1, FourIsland_House2_EventScript_BragEggs
+ case 2, FourIsland_House2_EventScript_QuitBrag
+ case SCR_MENU_CANCEL, FourIsland_House2_EventScript_QuitBrag
end
-EventScript_1B2ADE:: @ 81B2ADE
+FourIsland_House2_EventScript_ChooseBragHoFLinkWins:: @ 81B2ADE
multichoice 15, 6, MULTICHOICE_HOF_VICTORIES_QUIT, FALSE
switch VAR_RESULT
- case 0, EventScript_1B2B98
- case 1, EventScript_1B2D2C
- case 2, EventScript_1B2DF6
- case SCR_MENU_CANCEL, EventScript_1B2DF6
+ case 0, FourIsland_House2_EventScript_BragHoF
+ case 1, FourIsland_House2_EventScript_BragLinkWins
+ case 2, FourIsland_House2_EventScript_QuitBrag
+ case SCR_MENU_CANCEL, FourIsland_House2_EventScript_QuitBrag
end
-EventScript_1B2B15:: @ 81B2B15
+FourIsland_House2_EventScript_ChooseBragEggsLinkWins:: @ 81B2B15
multichoice 15, 6, MULTICHOICE_EGGS_VICTORIES_QUIT, FALSE
switch VAR_RESULT
- case 0, EventScript_1B2C62
- case 1, EventScript_1B2D2C
- case 2, EventScript_1B2DF6
- case SCR_MENU_CANCEL, EventScript_1B2DF6
+ case 0, FourIsland_House2_EventScript_BragEggs
+ case 1, FourIsland_House2_EventScript_BragLinkWins
+ case 2, FourIsland_House2_EventScript_QuitBrag
+ case SCR_MENU_CANCEL, FourIsland_House2_EventScript_QuitBrag
end
-EventScript_1B2B4C:: @ 81B2B4C
+FourIsland_House2_EventScript_ChooseBragHofEggsLinkWins:: @ 81B2B4C
multichoice 15, 5, MULTICHOICE_HOF_EGGS_VICTORIES_QUIT, FALSE
switch VAR_RESULT
- case 0, EventScript_1B2B98
- case 1, EventScript_1B2C62
- case 2, EventScript_1B2D2C
- case 3, EventScript_1B2DF6
- case SCR_MENU_CANCEL, EventScript_1B2DF6
+ case 0, FourIsland_House2_EventScript_BragHoF
+ case 1, FourIsland_House2_EventScript_BragEggs
+ case 2, FourIsland_House2_EventScript_BragLinkWins
+ case 3, FourIsland_House2_EventScript_QuitBrag
+ case SCR_MENU_CANCEL, FourIsland_House2_EventScript_QuitBrag
end
-EventScript_1B2B8E:: @ 81B2B8E
- msgbox gUnknown_81B1EF8
+FourIsland_House2_EventScript_StickerManNothingToBrag:: @ 81B2B8E
+ msgbox FourIsland_House2_Text_GiveYouStickerIfYouBrag
release
end
-EventScript_1B2B98:: @ 81B2B98
+FourIsland_House2_EventScript_BragHoF:: @ 81B2B98
compare VAR_0x8004, 39
- goto_if_le EventScript_1B2BC5
+ goto_if_le FourIsland_House2_EventScript_BragHoFLowest
compare VAR_0x8004, 99
- goto_if_le EventScript_1B2BE3
+ goto_if_le FourIsland_House2_EventScript_BragHoFLow
compare VAR_0x8004, 199
- goto_if_le EventScript_1B2C01
+ goto_if_le FourIsland_House2_EventScript_BragHoFHigh
compare VAR_0x8004, 200
- goto_if_ge EventScript_1B2C1F
+ goto_if_ge FourIsland_House2_EventScript_BragHoFHighest
end
-EventScript_1B2BC5:: @ 81B2BC5
+FourIsland_House2_EventScript_BragHoFLowest:: @ 81B2BC5
compare VAR_HOF_BRAG_STATE, 1
- goto_if_eq EventScript_1B2C3D
+ goto_if_eq FourIsland_House2_EventScript_AlreadyBraggedHoF
setvar VAR_HOF_BRAG_STATE, 1
- msgbox gUnknown_81B206E
- goto EventScript_1B2C51
-
-EventScript_1B2BE2:: @ 81B2BE2
+ msgbox FourIsland_House2_Text_WowHoFLowest
+ goto FourIsland_House2_EventScript_BraggedHoF
end
-EventScript_1B2BE3:: @ 81B2BE3
+FourIsland_House2_EventScript_BragHoFLow:: @ 81B2BE3
compare VAR_HOF_BRAG_STATE, 2
- goto_if_eq EventScript_1B2C3D
+ goto_if_eq FourIsland_House2_EventScript_AlreadyBraggedHoF
setvar VAR_HOF_BRAG_STATE, 2
- msgbox gUnknown_81B20CF
- goto EventScript_1B2C51
-
-EventScript_1B2C00:: @ 81B2C00
+ msgbox FourIsland_House2_Text_WowHoFLow
+ goto FourIsland_House2_EventScript_BraggedHoF
end
-EventScript_1B2C01:: @ 81B2C01
+FourIsland_House2_EventScript_BragHoFHigh:: @ 81B2C01
compare VAR_HOF_BRAG_STATE, 3
- goto_if_eq EventScript_1B2C3D
+ goto_if_eq FourIsland_House2_EventScript_AlreadyBraggedHoF
setvar VAR_HOF_BRAG_STATE, 3
- msgbox gUnknown_81B2133
- goto EventScript_1B2C51
-
-EventScript_1B2C1E:: @ 81B2C1E
+ msgbox FourIsland_House2_Text_WowHoFHigh
+ goto FourIsland_House2_EventScript_BraggedHoF
end
-EventScript_1B2C1F:: @ 81B2C1F
+FourIsland_House2_EventScript_BragHoFHighest:: @ 81B2C1F
compare VAR_HOF_BRAG_STATE, 4
- goto_if_eq EventScript_1B2C47
+ goto_if_eq FourIsland_House2_EventScript_AlreadyBraggedHoFMax
setvar VAR_HOF_BRAG_STATE, 4
- msgbox gUnknown_81B21C4
- goto EventScript_1B2C51
-
-EventScript_1B2C3C:: @ 81B2C3C
+ msgbox FourIsland_House2_Text_WowHoFHighest
+ goto FourIsland_House2_EventScript_BraggedHoF
end
-EventScript_1B2C3D:: @ 81B2C3D
- msgbox gUnknown_81B227C
+FourIsland_House2_EventScript_AlreadyBraggedHoF:: @ 81B2C3D
+ msgbox FourIsland_House2_Text_ComeBackWithBetterStoryHoF
release
end
-EventScript_1B2C47:: @ 81B2C47
- msgbox gUnknown_81B22B0
+FourIsland_House2_EventScript_AlreadyBraggedHoFMax:: @ 81B2C47
+ msgbox FourIsland_House2_Text_LivingLegendHoF
release
end
-EventScript_1B2C51:: @ 81B2C51
+FourIsland_House2_EventScript_BraggedHoF:: @ 81B2C51
textcolor 3
playfanfare MUS_FANFA1
- message gUnknown_81B2242
+ message FourIsland_House2_Text_HoFStickerApplied
waitmessage
waitfanfare
delay 90
release
end
-EventScript_1B2C62:: @ 81B2C62
+FourIsland_House2_EventScript_BragEggs:: @ 81B2C62
compare VAR_0x8005, 99
- goto_if_le EventScript_1B2C8F
+ goto_if_le FourIsland_House2_EventScript_BragEggsLowest
compare VAR_0x8005, 199
- goto_if_le EventScript_1B2CAD
+ goto_if_le FourIsland_House2_EventScript_BragEggsLow
compare VAR_0x8005, 299
- goto_if_le EventScript_1B2CCB
+ goto_if_le FourIsland_House2_EventScript_BragEggsHigh
compare VAR_0x8005, 300
- goto_if_ge EventScript_1B2CE9
+ goto_if_ge FourIsland_House2_EventScript_BragEggsHighest
end
-EventScript_1B2C8F:: @ 81B2C8F
+FourIsland_House2_EventScript_BragEggsLowest:: @ 81B2C8F
compare VAR_EGG_BRAG_STATE, 1
- goto_if_eq EventScript_1B2D07
+ goto_if_eq FourIsland_House2_EventScript_AlreadyBraggedEggs
setvar VAR_EGG_BRAG_STATE, 1
- msgbox gUnknown_81B2308
- goto EventScript_1B2D1B
+ msgbox FourIsland_House2_Text_WowEggsLowest
+ goto FourIsland_House2_EventScript_BraggedEggs
end
-EventScript_1B2CAD:: @ 81B2CAD
+FourIsland_House2_EventScript_BragEggsLow:: @ 81B2CAD
compare VAR_EGG_BRAG_STATE, 2
- goto_if_eq EventScript_1B2D07
+ goto_if_eq FourIsland_House2_EventScript_AlreadyBraggedEggs
setvar VAR_EGG_BRAG_STATE, 2
- msgbox gUnknown_81B2372
- goto EventScript_1B2D1B
+ msgbox FourIsland_House2_Text_WowEggsLow
+ goto FourIsland_House2_EventScript_BraggedEggs
end
-EventScript_1B2CCB:: @ 81B2CCB
+FourIsland_House2_EventScript_BragEggsHigh:: @ 81B2CCB
compare VAR_EGG_BRAG_STATE, 3
- goto_if_eq EventScript_1B2D07
+ goto_if_eq FourIsland_House2_EventScript_AlreadyBraggedEggs
setvar VAR_EGG_BRAG_STATE, 3
- msgbox gUnknown_81B23E0
- goto EventScript_1B2D1B
+ msgbox FourIsland_House2_Text_WowEggsHigh
+ goto FourIsland_House2_EventScript_BraggedEggs
end
-EventScript_1B2CE9:: @ 81B2CE9
+FourIsland_House2_EventScript_BragEggsHighest:: @ 81B2CE9
compare VAR_EGG_BRAG_STATE, 4
- goto_if_eq EventScript_1B2D11
+ goto_if_eq FourIsland_House2_EventScript_AlreadyBraggedEggsMax
setvar VAR_EGG_BRAG_STATE, 4
- msgbox gUnknown_81B2448
- goto EventScript_1B2D1B
+ msgbox FourIsland_House2_Text_WowEggsHighest
+ goto FourIsland_House2_EventScript_BraggedEggs
end
-EventScript_1B2D07:: @ 81B2D07
- msgbox gUnknown_81B251B
+FourIsland_House2_EventScript_AlreadyBraggedEggs:: @ 81B2D07
+ msgbox FourIsland_House2_Text_ComeBackWithBetterStoryEggs
release
end
-EventScript_1B2D11:: @ 81B2D11
- msgbox gUnknown_81B254F
+FourIsland_House2_EventScript_AlreadyBraggedEggsMax:: @ 81B2D11
+ msgbox FourIsland_House2_Text_LivingLegendEggs
release
end
-EventScript_1B2D1B:: @ 81B2D1B
+FourIsland_House2_EventScript_BraggedEggs:: @ 81B2D1B
textcolor 3
playfanfare MUS_FANFA1
- message gUnknown_81B24EA
+ message FourIsland_House2_Text_EggStickerApplied
waitmessage
waitfanfare
delay 90
release
end
-EventScript_1B2D2C:: @ 81B2D2C
+FourIsland_House2_EventScript_BragLinkWins:: @ 81B2D2C
compare VAR_0x8006, 19
- goto_if_le EventScript_1B2D59
+ goto_if_le FourIsland_House2_EventScript_BragLinkWinsLowest
compare VAR_0x8006, 49
- goto_if_le EventScript_1B2D77
+ goto_if_le FourIsland_House2_EventScript_BragLinkWinsLow
compare VAR_0x8006, 99
- goto_if_le EventScript_1B2D95
+ goto_if_le FourIsland_House2_EventScript_BragLinkWinsHigh
compare VAR_0x8006, 100
- goto_if_ge EventScript_1B2DB3
+ goto_if_ge FourIsland_House2_EventScript_BragLinkWinsHighest
end
-EventScript_1B2D59:: @ 81B2D59
+FourIsland_House2_EventScript_BragLinkWinsLowest:: @ 81B2D59
compare VAR_LINK_WIN_BRAG_STATE, 1
- goto_if_eq EventScript_1B2DD1
+ goto_if_eq FourIsland_House2_EventScript_AlreadyBraggedLinkWins
setvar VAR_LINK_WIN_BRAG_STATE, 1
- msgbox gUnknown_81B25A7
- goto EventScript_1B2DE5
+ msgbox FourIsland_House2_Text_WowLinkWinsLowest
+ goto FourIsland_House2_EventScript_BraggedLinkWins
end
-EventScript_1B2D77:: @ 81B2D77
+FourIsland_House2_EventScript_BragLinkWinsLow:: @ 81B2D77
compare VAR_LINK_WIN_BRAG_STATE, 2
- goto_if_eq EventScript_1B2DD1
+ goto_if_eq FourIsland_House2_EventScript_AlreadyBraggedLinkWins
setvar VAR_LINK_WIN_BRAG_STATE, 2
- msgbox gUnknown_81B2609
- goto EventScript_1B2DE5
+ msgbox FourIsland_House2_Text_WowLinkWinsLow
+ goto FourIsland_House2_EventScript_BraggedLinkWins
end
-EventScript_1B2D95:: @ 81B2D95
+FourIsland_House2_EventScript_BragLinkWinsHigh:: @ 81B2D95
compare VAR_LINK_WIN_BRAG_STATE, 3
- goto_if_eq EventScript_1B2DD1
+ goto_if_eq FourIsland_House2_EventScript_AlreadyBraggedLinkWins
setvar VAR_LINK_WIN_BRAG_STATE, 3
- msgbox gUnknown_81B267B
- goto EventScript_1B2DE5
+ msgbox FourIsland_House2_Text_WowLinkWinsHigh
+ goto FourIsland_House2_EventScript_BraggedLinkWins
end
-EventScript_1B2DB3:: @ 81B2DB3
+FourIsland_House2_EventScript_BragLinkWinsHighest:: @ 81B2DB3
compare VAR_LINK_WIN_BRAG_STATE, 4
- goto_if_eq EventScript_1B2DDB
+ goto_if_eq FourIsland_House2_EventScript_AlreadyBraggedLinkWinsMax
setvar VAR_LINK_WIN_BRAG_STATE, 4
- msgbox gUnknown_81B26F6
- goto EventScript_1B2DE5
+ msgbox FourIsland_House2_Text_WowLinkWinsHighest
+ goto FourIsland_House2_EventScript_BraggedLinkWins
end
-EventScript_1B2DD1:: @ 81B2DD1
- msgbox gUnknown_81B27DB
+FourIsland_House2_EventScript_AlreadyBraggedLinkWins:: @ 81B2DD1
+ msgbox FourIsland_House2_Text_ComeBackWithBetterStoryLinkWins
release
end
-EventScript_1B2DDB:: @ 81B2DDB
- msgbox gUnknown_81B280F
+FourIsland_House2_EventScript_AlreadyBraggedLinkWinsMax:: @ 81B2DDB
+ msgbox FourIsland_House2_Text_LivingLegendLinkWins
release
end
-EventScript_1B2DE5:: @ 81B2DE5
+FourIsland_House2_EventScript_BraggedLinkWins:: @ 81B2DE5
textcolor 3
playfanfare MUS_FANFA1
- message gUnknown_81B27A6
+ message FourIsland_House2_Text_VictoryStickerApplied
waitmessage
waitfanfare
delay 90
release
end
-EventScript_1B2DF6:: @ 81B2DF6
+FourIsland_House2_EventScript_QuitBrag:: @ 81B2DF6
release
end
diff --git a/data/specials.inc b/data/specials.inc
index 19ea756a7..3689ebd5f 100644
--- a/data/specials.inc
+++ b/data/specials.inc
@@ -368,7 +368,7 @@ gSpecials:: @ 815FD60
def_special ShouldShowBoxWasFullMessage
def_special ChangeBoxPokemonNickname
def_special Special_UpdateTrainerCardPhotoIcons
- def_special Special_StickerLadyGetBragFlags
+ def_special StickerManGetBragFlags
def_special SetUsedPkmnCenterQuestLogEvent
def_special IsWirelessAdapterConnected
def_special TryBecomeLinkLeader
diff --git a/data/text/fame_checker.inc b/data/text/fame_checker.inc
index a8226df05..10a19b83d 100644
--- a/data/text/fame_checker.inc
+++ b/data/text/fame_checker.inc
@@ -1468,7 +1468,7 @@ PokemonJournal_Text_SpecialFeatureProfOak:: @ 81B1AB9
.string "PROF. OAK reportedly lives with his\n"
.string "grandchildren DAISY and {RIVAL}.$"
-gUnknown_81B1B3D:: @ 81B1B3D
+PokemonJournal_Text_SpecialFeatureDaisyOak:: @ 81B1B3D
.string "This is a POKéMON JOURNAL from\n"
.string "years ago…\p"
.string "POKéMON JOURNAL\n"
diff --git a/data/text/trainer_card.inc b/data/text/trainer_card.inc
index 3a6557cca..4a54e5b5b 100644
--- a/data/text/trainer_card.inc
+++ b/data/text/trainer_card.inc
@@ -1,31 +1,31 @@
-gUnknown_81B1D7D:: @ 81B1D7D
+CeladonCity_GameCorner_Text_TryPokemonPrinter:: @ 81B1D7D
.string "It's a POKéMON PRINTER!\p"
.string "It can put a print of your POKéMON\n"
.string "on the back of your TRAINER CARD.\p"
.string "It costs only ¥50.\n"
.string "Would you like to try it?$"
-gUnknown_81B1E07:: @ 81B1E07
+CeladonCity_GameCorner_Text_DontHaveEnoughMoney:: @ 81B1E07
.string "You don't have enough money.$"
-gUnknown_81B1E24:: @ 81B1E24
+CeladonCity_GameCorner_Text_ChoosePrintType:: @ 81B1E24
.string "Please choose the print type.$"
-gUnknown_81B1E42:: @ 81B1E42
+CeladonCity_GameCorner_Text_BigSmileForPhoto:: @ 81B1E42
.string "A big smile for the photo, please!\n"
.string "Three… Two… One…\p"
.string "Flash!$"
-gUnknown_81B1E7D:: @ 81B1E7D
+CeladonCity_GameCorner_Text_PrintIsReadyCheckTrainerCard:: @ 81B1E7D
.string "Your POKéMON print is ready!\n"
.string "Check your TRAINER CARD.$"
-gUnknown_81B1EB3:: @ 81B1EB3
+FourIsland_House2_Text_WishICouldShowOffStickers:: @ 81B1EB3
.string "Giggle…\n"
.string "I collected a ton of STICKERS.\l"
.string "I wish I could show them off…$"
-gUnknown_81B1EF8:: @ 81B1EF8
+FourIsland_House2_Text_GiveYouStickerIfYouBrag:: @ 81B1EF8
.string "Oh, excellent!\n"
.string "You've come to the right place!\p"
.string "Look, look! See? See?\n"
@@ -38,113 +38,113 @@ gUnknown_81B1EF8:: @ 81B1EF8
.string "yourself.\p"
.string "What will you brag about?$"
-gUnknown_81B1FEF:: @ 81B1FEF
+FourIsland_House2_Text_BragAboutSomethingForMe:: @ 81B1FEF
.string "Brag about something for me.\n"
.string "I'll give you a STICKER.$"
-gUnknown_81B2025:: @ 81B2025
+FourIsland_House2_Text_BragAboutWhatToday:: @ 81B2025
.string "Oh, hi!\n"
.string "Here comes the braggart.\p"
.string "What are you going to brag about\n"
.string "today?$"
-gUnknown_81B206E:: @ 81B206E
+FourIsland_House2_Text_WowHoFLowest:: @ 81B206E
.string "Oh, wow, you made it into the\n"
.string "HALL OF FAME.\p"
.string "That's pretty good, yup!\n"
.string "I'll give you one of these.$"
-gUnknown_81B20CF:: @ 81B20CF
+FourIsland_House2_Text_WowHoFLow:: @ 81B20CF
.string "Oh, wow, you've entered the\n"
.string "HALL OF FAME often!\p"
.string "That's impressive, yup!\n"
.string "I'll give you one of these.$"
-gUnknown_81B2133:: @ 81B2133
+FourIsland_House2_Text_WowHoFHigh:: @ 81B2133
.string "Whoa! You've made it into the\n"
.string "HALL OF FAME that often?\l"
.string "That's seriously incredible, yup!\p"
.string "You own the POKéMON LEAGUE!\n"
.string "I'll give you one of these.$"
-gUnknown_81B21C4:: @ 81B21C4
+FourIsland_House2_Text_WowHoFHighest:: @ 81B21C4
.string "No way! You've gone into the\n"
.string "HALL OF FAME that many times?\p"
.string "You're beyond incredible, yup!\n"
.string "That's it, I have to give you this.$"
-gUnknown_81B2242:: @ 81B2242
+FourIsland_House2_Text_HoFStickerApplied:: @ 81B2242
.string "The HALL OF FAME STICKER was\n"
.string "applied to the TRAINER CARD.$"
-gUnknown_81B227C:: @ 81B227C
+FourIsland_House2_Text_ComeBackWithBetterStoryHoF:: @ 81B227C
.string "Hmm…\p"
.string "Come back with a better story next\n"
.string "time, okay?$"
-gUnknown_81B22B0:: @ 81B22B0
+FourIsland_House2_Text_LivingLegendHoF:: @ 81B22B0
.string "Oh, no, no can do.\p"
.string "You're practically a living legend.\n"
.string "I have no SITCKERS left to give.$"
-gUnknown_81B2308:: @ 81B2308
+FourIsland_House2_Text_WowEggsLowest:: @ 81B2308
.string "Oh, wow, there are POKéMON EGGS?\n"
.string "I didn't know that!\p"
.string "That's pretty good, yup!\n"
.string "I'll give you one of these.$"
-gUnknown_81B2372:: @ 81B2372
+FourIsland_House2_Text_WowEggsLow:: @ 81B2372
.string "You've hatched that many EGGS?\n"
.string "You really must like them!\p"
.string "That's impressive, yup!\n"
.string "I'll give you one of these.$"
-gUnknown_81B23E0:: @ 81B23E0
+FourIsland_House2_Text_WowEggsHigh:: @ 81B23E0
.string "Whoa! You've hatched a whole\n"
.string "bunch of EGGS!\p"
.string "You're an EGG-hatching machine!\n"
.string "I'll give you one of these.$"
-gUnknown_81B2448:: @ 81B2448
+FourIsland_House2_Text_WowEggsHighest:: @ 81B2448
.string "Wh… You hatched that many EGGS?\p"
.string "What's behind your love of EGGS?\n"
.string "It's beyond incredible, yup!\p"
.string "You're too awesome, I tell you.\n"
.string "That's it, I have to give you this.$"
-gUnknown_81B24EA:: @ 81B24EA
+FourIsland_House2_Text_EggStickerApplied:: @ 81B24EA
.string "The EGG STICKER was applied\n"
.string "to the TRAINER CARD.$"
-gUnknown_81B251B:: @ 81B251B
+FourIsland_House2_Text_ComeBackWithBetterStoryEggs:: @ 81B251B
.string "Hmm…\p"
.string "Come back with a better story next\n"
.string "time, okay?$"
-gUnknown_81B254F:: @ 81B254F
+FourIsland_House2_Text_LivingLegendEggs:: @ 81B254F
.string "Oh, no, no can do.\p"
.string "You're practically a living legend.\n"
.string "I have no SITCKERS left to give.$"
-gUnknown_81B25A7:: @ 81B25A7
+FourIsland_House2_Text_WowLinkWinsLowest:: @ 81B25A7
.string "Oh, wow, you've had success\n"
.string "link battling?\p"
.string "You're pretty strong, yup!\n"
.string "I'll give you one of these.$"
-gUnknown_81B2609:: @ 81B2609
+FourIsland_House2_Text_WowLinkWinsLow:: @ 81B2609
.string "You've beaten your friends a lot\n"
.string "link battling, huh?\p"
.string "You're impressively strong, yup!\n"
.string "I'll give you one of these.$"
-gUnknown_81B267B:: @ 81B267B
+FourIsland_House2_Text_WowLinkWinsHigh:: @ 81B267B
.string "Whoa! You've beaten your friends\n"
.string "a frightful number of times.\p"
.string "Have you lost friends over this?\n"
.string "I'll give you one of these.$"
-gUnknown_81B26F6:: @ 81B26F6
+FourIsland_House2_Text_WowLinkWinsHighest:: @ 81B26F6
.string "Wh… Wickedly whoa!\n"
.string "You've won mind-blowingly often!\p"
.string "It just knocks me out thinking\n"
@@ -152,16 +152,16 @@ gUnknown_81B26F6:: @ 81B26F6
.string "You're the stuff of nightmares!\n"
.string "That's it, I have to give you this.$"
-gUnknown_81B27A6:: @ 81B27A6
+FourIsland_House2_Text_VictoryStickerApplied:: @ 81B27A6
.string "The VICTORY STICKER was applied\n"
.string "to the TRAINER CARD.$"
-gUnknown_81B27DB:: @ 81B27DB
+FourIsland_House2_Text_ComeBackWithBetterStoryLinkWins:: @ 81B27DB
.string "Hmm…\p"
.string "Come back with a better story next\n"
.string "time, okay?$"
-gUnknown_81B280F:: @ 81B280F
+FourIsland_House2_Text_LivingLegendLinkWins:: @ 81B280F
.string "Oh, no, no can do.\p"
.string "You're practically a living legend.\n"
.string "I have no SITCKERS left to give.$"
diff --git a/include/constants/flags.h b/include/constants/flags.h
index 7555f3c6b..44ef7e22f 100644
--- a/include/constants/flags.h
+++ b/include/constants/flags.h
@@ -670,7 +670,7 @@
#define FLAG_SILPH_11F_DOOR 0x28D
#define FLAG_0x28E 0x28E
#define FLAG_0x28F 0x28F
-#define FLAG_MET_STICKER_LADY 0x290
+#define FLAG_MET_STICKER_MAN 0x290
#define FLAG_PALLET_LADY_NOT_BLOCKING_SIGN 0x291
#define FLAG_GOT_VS_SEEKER 0x292
#define FLAG_GOT_TM19_FROM_ERIKA 0x293
diff --git a/include/constants/trainer_card.h b/include/constants/trainer_card.h
new file mode 100644
index 000000000..cdc69d610
--- /dev/null
+++ b/include/constants/trainer_card.h
@@ -0,0 +1,15 @@
+#ifndef GUARD_CONSTANTS_TRAINER_CARD_H
+#define GUARD_CONSTANTS_TRAINER_CARD_H
+
+#define TRAINER_CARD_PROFILE_LENGTH 4
+#define TRAINER_CARD_STICKER_TYPES 3
+
+#define CARD_TYPE_FRLG 0
+#define CARD_TYPE_RSE 1
+
+#define MON_ICON_TINT_NORMAL 0
+#define MON_ICON_TINT_BLACK 1
+#define MON_ICON_TINT_PINK 2
+#define MON_ICON_TINT_SEPIA 3
+
+#endif // GUARD_CONSTANTS_TRAINER_CARD_H
diff --git a/include/trainer_card.h b/include/trainer_card.h
index ed3e803d5..1355f682f 100644
--- a/include/trainer_card.h
+++ b/include/trainer_card.h
@@ -1,6 +1,8 @@
#ifndef GUARD_TRAINER_CARD_H
#define GUARD_TRAINER_CARD_H
+#include "constants/trainer_card.h"
+
struct TrainerCard
{
/*0x00*/ u8 gender;
diff --git a/src/field_specials.c b/src/field_specials.c
index 6554f6116..8904178c0 100644
--- a/src/field_specials.c
+++ b/src/field_specials.c
@@ -1695,7 +1695,7 @@ void Special_UpdateTrainerCardPhotoIcons(void)
VarSet(VAR_TRAINER_CARD_MON_ICON_TINT_IDX, gSpecialVar_0x8004);
}
-u16 Special_StickerLadyGetBragFlags(void)
+u16 StickerManGetBragFlags(void)
{
u16 result = 0;
u32 numEggs;
diff --git a/src/trainer_card.c b/src/trainer_card.c
index d60738ee6..3157b6cdb 100644
--- a/src/trainer_card.c
+++ b/src/trainer_card.c
@@ -32,13 +32,6 @@
#define BADGE_COUNT 8
-// Trainer Card Types
-enum
-{
- CARD_TYPE_FRLG,
- CARD_TYPE_EMERALD,
-};
-
// Trainer Card Strings
enum
{
@@ -620,13 +613,13 @@ static bool8 LoadCardGfx(void)
switch (sTrainerCardDataPtr->gfxLoadState)
{
case 0:
- if (sTrainerCardDataPtr->cardType == CARD_TYPE_EMERALD)
+ if (sTrainerCardDataPtr->cardType == CARD_TYPE_RSE)
LZ77UnCompWram(sUnknown_83CCE30, &sTrainerCardDataPtr->var_E1C);
else
LZ77UnCompWram(sUnknown_83CCEC8, &sTrainerCardDataPtr->var_E1C);
break;
case 1:
- if (sTrainerCardDataPtr->cardType == CARD_TYPE_EMERALD)
+ if (sTrainerCardDataPtr->cardType == CARD_TYPE_RSE)
LZ77UnCompWram(sUnknown_83CC8A8, &sTrainerCardDataPtr->var_96C);
else
LZ77UnCompWram(sUnknown_83CC984, &sTrainerCardDataPtr->var_96C);
@@ -634,14 +627,14 @@ static bool8 LoadCardGfx(void)
case 2:
if (!sTrainerCardDataPtr->isLink)
{
- if (sTrainerCardDataPtr->cardType == CARD_TYPE_EMERALD)
+ if (sTrainerCardDataPtr->cardType == CARD_TYPE_RSE)
LZ77UnCompWram(sUnknown_83CC4DC, &sTrainerCardDataPtr->var_4BC);
else
LZ77UnCompWram(sUnknown_83CC6F0, &sTrainerCardDataPtr->var_4BC);
}
else
{
- if (sTrainerCardDataPtr->cardType == CARD_TYPE_EMERALD)
+ if (sTrainerCardDataPtr->cardType == CARD_TYPE_RSE)
LZ77UnCompWram(sUnknown_83CCAB0, &sTrainerCardDataPtr->var_4BC);
else
LZ77UnCompWram(sUnknown_83CCCA4, &sTrainerCardDataPtr->var_4BC);
@@ -651,7 +644,7 @@ static bool8 LoadCardGfx(void)
LZ77UnCompWram(sFireRedTrainerCardBadges_Tile, &sTrainerCardDataPtr->cardTiles);
break;
case 4:
- if (sTrainerCardDataPtr->cardType == CARD_TYPE_EMERALD)
+ if (sTrainerCardDataPtr->cardType == CARD_TYPE_RSE)
LZ77UnCompWram(gEmeraldTrainerCard_Gfx, &sTrainerCardDataPtr->var_18CC);
else
LZ77UnCompWram(gFireRedTrainerCard_Gfx, &sTrainerCardDataPtr->var_18CC);
@@ -810,7 +803,7 @@ static void SetPlayerCardData(struct TrainerCard *trainerCard, u8 cardType)
{
trainerCard->stars = GetTrainerStarCount(trainerCard);
}
- else if (cardType == CARD_TYPE_EMERALD)
+ else if (cardType == CARD_TYPE_RSE)
{
trainerCard->stars = 0;
if (trainerCard->hofDebutHours != 0 || (trainerCard->hofDebutMinutes != 0 || trainerCard->hofDebutSeconds != 0))
@@ -829,7 +822,7 @@ void TrainerCard_GenerateCardForLinkPlayer(struct TrainerCard *trainerCard)
u8 id = 0;
trainerCard->version = GAME_VERSION;
- SetPlayerCardData(trainerCard, CARD_TYPE_EMERALD);
+ SetPlayerCardData(trainerCard, CARD_TYPE_RSE);
if (GetCardType() != CARD_TYPE_FRLG)
return;
@@ -1118,7 +1111,7 @@ static void PrintMoneyOnCard(void)
txtPtr = StringCopy(buffer, gText_TrainerCardYen);
ConvertIntToDecimalStringN(txtPtr, sTrainerCardDataPtr->trainerCard.money, STR_CONV_MODE_LEFT_ALIGN, 6);
- if (sTrainerCardDataPtr->cardType != CARD_TYPE_EMERALD)
+ if (sTrainerCardDataPtr->cardType != CARD_TYPE_RSE)
{
x = -122 - 6 * StringLength(buffer);
AddTextPrinterParameterized3(1, sTrainerCardFontIds[1], 20, 56, sFireRedTrainerCardPage1TextColors, TEXT_SPEED_FF, gText_TrainerCardMoney);
@@ -1148,7 +1141,7 @@ static void PrintPokedexOnCard(void)
if (FlagGet(FLAG_SYS_POKEDEX_GET))
{
ConvertIntToDecimalStringN(buffer, sTrainerCardDataPtr->trainerCard.caughtMonsCount, 0, 3);
- if (sTrainerCardDataPtr->cardType != CARD_TYPE_EMERALD)
+ if (sTrainerCardDataPtr->cardType != CARD_TYPE_RSE)
{
x = -120 - 6 * StringLength(buffer);
AddTextPrinterParameterized3(1, sTrainerCardFontIds[1], 20, 72, sFireRedTrainerCardPage1TextColors, TEXT_SPEED_FF, gText_TrainerCardPokedex);
@@ -1186,7 +1179,7 @@ static void PrintTimeOnCard(void)
minutes = 59;
FillWindowPixelRect(1, PIXEL_FILL(0), sTrainerCardTimeHoursXPositions[sTrainerCardDataPtr->cardType], sTrainerCardTimeMinutesYPositions[sTrainerCardDataPtr->cardType], 50, 12);
- if (sTrainerCardDataPtr->cardType != CARD_TYPE_EMERALD)
+ if (sTrainerCardDataPtr->cardType != CARD_TYPE_RSE)
AddTextPrinterParameterized3(1, sTrainerCardFontIds[1], 20, 88, sFireRedTrainerCardPage1TextColors, TEXT_SPEED_FF, gText_TrainerCardTime);
else
AddTextPrinterParameterized3(1, sTrainerCardFontIds[1], 16, 89, sFireRedTrainerCardPage1TextColors, TEXT_SPEED_FF, gText_TrainerCardTime);
@@ -1223,7 +1216,7 @@ static void PrintNameOnCard2(void)
{
StringCopy(sTrainerCardDataPtr->strings[TRAINER_CARD_STRING_NAME], sTrainerCardDataPtr->trainerCard.playerName);
ConvertInternationalString(sTrainerCardDataPtr->strings[TRAINER_CARD_STRING_NAME], sTrainerCardDataPtr->language);
- if (sTrainerCardDataPtr->cardType == CARD_TYPE_EMERALD)
+ if (sTrainerCardDataPtr->cardType == CARD_TYPE_RSE)
{
StringAppend(sTrainerCardDataPtr->strings[TRAINER_CARD_STRING_NAME], gText_Var1sTrainerCard);
}
@@ -1321,7 +1314,7 @@ static void PrintTradesStringOnCard(void)
static void PrintBerryCrushNumOnCard(void)
{
- if (sTrainerCardDataPtr->cardType != CARD_TYPE_EMERALD)
+ if (sTrainerCardDataPtr->cardType != CARD_TYPE_RSE)
{
StringCopy(sTrainerCardDataPtr->strings[TRAINER_CARD_STRING_BERRY_CRUSH], gText_BerryCrushes);
ConvertIntToDecimalStringN(sTrainerCardDataPtr->strings[TRAINER_CARD_STRING_BERRY_CRUSH_COUNT], sTrainerCardDataPtr->trainerCard.berryCrushPoints, STR_CONV_MODE_RIGHT_ALIGN, 5);
@@ -1330,7 +1323,7 @@ static void PrintBerryCrushNumOnCard(void)
static void PrintBerryCrushStringOnCard(void)
{
- if (sTrainerCardDataPtr->cardType != CARD_TYPE_EMERALD && sTrainerCardDataPtr->trainerCard.berryCrushPoints)
+ if (sTrainerCardDataPtr->cardType != CARD_TYPE_RSE && sTrainerCardDataPtr->trainerCard.berryCrushPoints)
{
AddTextPrinterParameterized3(1, sTrainerCardFontIds[1], sTrainerCardHofDebutXPositions[sTrainerCardDataPtr->cardType], 99, sFireRedTrainerCardPage1TextColors, TEXT_SPEED_FF, sTrainerCardDataPtr->strings[TRAINER_CARD_STRING_BERRY_CRUSH]);
AddTextPrinterParameterized3(1, sTrainerCardFontIds[1], 186, 99, sTrainerCardPage2TextColors, TEXT_SPEED_FF, sTrainerCardDataPtr->strings[TRAINER_CARD_STRING_BERRY_CRUSH_COUNT]);
@@ -1339,7 +1332,7 @@ static void PrintBerryCrushStringOnCard(void)
static void PrintUnionNumOnCard(void)
{
- if (sTrainerCardDataPtr->cardType != CARD_TYPE_EMERALD)
+ if (sTrainerCardDataPtr->cardType != CARD_TYPE_RSE)
{
StringCopy(sTrainerCardDataPtr->strings[TRAINER_CARD_STRING_UNION_ROOM], gText_UnionRoomTradesBattles);
ConvertIntToDecimalStringN(sTrainerCardDataPtr->strings[TRAINER_CARD_STRING_UNION_ROOM_NUM], sTrainerCardDataPtr->trainerCard.unionRoomNum, STR_CONV_MODE_RIGHT_ALIGN, 5);
@@ -1348,7 +1341,7 @@ static void PrintUnionNumOnCard(void)
static void PrintUnionStringOnCard(void)
{
- if (sTrainerCardDataPtr->cardType != CARD_TYPE_EMERALD && sTrainerCardDataPtr->trainerCard.unionRoomNum)
+ if (sTrainerCardDataPtr->cardType != CARD_TYPE_RSE && sTrainerCardDataPtr->trainerCard.unionRoomNum)
{
AddTextPrinterParameterized3(1, sTrainerCardFontIds[1], sTrainerCardHofDebutXPositions[sTrainerCardDataPtr->cardType], 83, sFireRedTrainerCardPage1TextColors, TEXT_SPEED_FF, sTrainerCardDataPtr->strings[TRAINER_CARD_STRING_UNION_ROOM]);
AddTextPrinterParameterized3(1, sTrainerCardFontIds[1], 186, 83, sTrainerCardPage2TextColors, TEXT_SPEED_FF, sTrainerCardDataPtr->strings[TRAINER_CARD_STRING_UNION_ROOM_NUM]);
@@ -1363,7 +1356,7 @@ static void TrainerCard_PrintPokemonIconsOnCard(void)
memcpy(buffer, sUnknown_83CD94C, sizeof(sUnknown_83CD94C));
memcpy(buffer2, sUnknown_83CD952, sizeof(sUnknown_83CD952));
- if (sTrainerCardDataPtr->cardType != CARD_TYPE_EMERALD)
+ if (sTrainerCardDataPtr->cardType != CARD_TYPE_RSE)
{
for (i = 0; i < 6; i++)
{
@@ -1446,19 +1439,19 @@ static bool8 SetTrainerCardBgsAndPals(void)
LoadBgTiles(0, sTrainerCardDataPtr->var_18CC, 6144, 0);
break;
case 2:
- if (sTrainerCardDataPtr->cardType == CARD_TYPE_EMERALD)
+ if (sTrainerCardDataPtr->cardType == CARD_TYPE_RSE)
LoadPalette(sEmeraldTrainerCardStarPals[sTrainerCardDataPtr->trainerCard.stars], 0, 96);
else
LoadPalette(sFireRedTrainerCardStarPals[sTrainerCardDataPtr->trainerCard.stars], 0, 96);
break;
case 3:
- if (sTrainerCardDataPtr->cardType == CARD_TYPE_EMERALD)
+ if (sTrainerCardDataPtr->cardType == CARD_TYPE_RSE)
LoadPalette(sEmeraldTrainerCardBadges_Pal, 48, 32);
else
LoadPalette(sFireRedTrainerCardBadges_Pal, 48, 32);
break;
case 4:
- if (sTrainerCardDataPtr->cardType == CARD_TYPE_EMERALD && sTrainerCardDataPtr->trainerCard.gender != MALE)
+ if (sTrainerCardDataPtr->cardType == CARD_TYPE_RSE && sTrainerCardDataPtr->trainerCard.gender != MALE)
LoadPalette(sEmeraldTrainerCardFemaleBackground_Pal, 16, 32);
else if (sTrainerCardDataPtr->trainerCard.gender != MALE)
LoadPalette(sFireRedTrainerCardFemaleBackground_Pal, 16, 32);
@@ -1546,7 +1539,7 @@ static void TrainerCard_PrintStarsAndBadgesOnCard(void)
static void sub_808B090(void)
{
- if (sTrainerCardDataPtr->cardType != CARD_TYPE_EMERALD)
+ if (sTrainerCardDataPtr->cardType != CARD_TYPE_RSE)
{
if (sTrainerCardDataPtr->hasTrades)
{
@@ -1848,8 +1841,8 @@ static void sub_808B774(void)
sTrainerCardDataPtr->var_7 = 0;
sTrainerCardDataPtr->var_8 = 0;
sTrainerCardDataPtr->var_456 = 0;
- if (GetCardType() == CARD_TYPE_EMERALD)
- sTrainerCardDataPtr->cardType = CARD_TYPE_EMERALD;
+ if (GetCardType() == CARD_TYPE_RSE)
+ sTrainerCardDataPtr->cardType = CARD_TYPE_RSE;
else
sTrainerCardDataPtr->cardType = CARD_TYPE_FRLG;
@@ -1866,14 +1859,14 @@ static u8 GetCardType(void)
if (gGameVersion == VERSION_FIRE_RED || gGameVersion == VERSION_LEAF_GREEN)
return CARD_TYPE_FRLG;
else
- return CARD_TYPE_EMERALD;
+ return CARD_TYPE_RSE;
}
else
{
if (sTrainerCardDataPtr->trainerCard.version == VERSION_FIRE_RED || sTrainerCardDataPtr->trainerCard.version == VERSION_LEAF_GREEN)
return CARD_TYPE_FRLG;
else
- return CARD_TYPE_EMERALD;
+ return CARD_TYPE_RSE;
}
}