summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGriffinR <griffin.g.richards@gmail.com>2020-02-19 12:17:16 -0500
committerGriffinR <griffin.g.richards@gmail.com>2020-02-25 15:46:07 -0500
commit44c9109c2a04fbbf01268f53f0f4a57174563fb1 (patch)
treec219f4d483b74e9dceaa61df540227b6ecd9451c
parent71fec599bbe144af8d4a16e98ec32454fd10a4a8 (diff)
Document Pallet Town scripts
-rw-r--r--asm/field_control_avatar.s4
-rw-r--r--data/event_scripts.s29
-rw-r--r--data/maps/PalletTown/map.json20
-rw-r--r--data/maps/PalletTown/scripts.inc307
-rw-r--r--data/maps/PalletTown/text.inc24
-rw-r--r--data/maps/PalletTown_GarysHouse/map.json10
-rw-r--r--data/maps/PalletTown_GarysHouse/scripts.inc153
-rw-r--r--data/maps/PalletTown_GarysHouse/text.inc48
-rw-r--r--data/maps/PalletTown_PlayersHouse_1F/map.json4
-rw-r--r--data/maps/PalletTown_PlayersHouse_1F/scripts.inc43
-rw-r--r--data/maps/PalletTown_PlayersHouse_1F/text.inc14
-rw-r--r--data/maps/PalletTown_PlayersHouse_2F/map.json6
-rw-r--r--data/maps/PalletTown_PlayersHouse_2F/scripts.inc19
-rw-r--r--data/maps/PalletTown_PlayersHouse_2F/text.inc4
-rw-r--r--data/maps/PalletTown_ProfessorOaksLab/map.json40
-rw-r--r--data/maps/PalletTown_ProfessorOaksLab/scripts.inc1020
-rw-r--r--data/maps/PalletTown_ProfessorOaksLab/text.inc118
-rw-r--r--data/scripts/pc.inc2
-rw-r--r--data/scripts/pokedex_rating.inc58
-rw-r--r--data/text/pokedex_rating.inc50
-rw-r--r--data/text/sign_lady.inc30
-rw-r--r--include/constants/vars.h2
-rw-r--r--src/prof_pc.c72
23 files changed, 1034 insertions, 1043 deletions
diff --git a/asm/field_control_avatar.s b/asm/field_control_avatar.s
index b74e60d1f..e1006c04f 100644
--- a/asm/field_control_avatar.s
+++ b/asm/field_control_avatar.s
@@ -798,7 +798,7 @@ sub_806CEA0: @ 806CEA0
movs r0, 0
b _0806CED2
_0806CEB8:
- ldr r0, _0806CED8 @ =gUnknown_8168CE4
+ ldr r0, _0806CED8 @ =PalletTown_PlayersHouse_2F_EventScript_PC
cmp r4, r0
beq _0806CECA
ldr r0, _0806CEDC @ =EventScript_PC
@@ -815,7 +815,7 @@ _0806CED2:
pop {r1}
bx r1
.align 2, 0
-_0806CED8: .4byte gUnknown_8168CE4
+_0806CED8: .4byte PalletTown_PlayersHouse_2F_EventScript_PC
_0806CEDC: .4byte EventScript_PC
thumb_func_end sub_806CEA0
diff --git a/data/event_scripts.s b/data/event_scripts.s
index b787a52a5..671e2436c 100644
--- a/data/event_scripts.s
+++ b/data/event_scripts.s
@@ -1620,34 +1620,7 @@ Text_1ACD45:: @ 81ACD45
.include "data/scripts/fame_checker.inc"
.include "data/text/fame_checker.inc"
-
-gUnknown_81B1C8B:: @ 81B1C8B
- .string "Hmm…\n"
- .string "Is that right…$"
-
-gUnknown_81B1C9F:: @ 81B1C9F
- .string "Oh!\n"
- .string "Look, look!$"
-
-gUnknown_81B1CAF:: @ 81B1CAF
- .string "Read it, read it!$"
-
-gUnknown_81B1CC1:: @ 81B1CC1
- .string "TRAINER TIPS\p"
- .string "Press START to open the MENU!$"
-
-gUnknown_81B1CEC:: @ 81B1CEC
- .string "Signs are useful, aren't they?$"
-
-gUnknown_81B1D0B:: @ 81B1D0B
- .string "Look, look!\p"
- .string "I copied what it said on one of\n"
- .string "those TRAINER TIPS signs!$"
-
-gUnknown_81B1D51:: @ 81B1D51
- .string "TRAINER TIPS!\p"
- .string "Press START to open the MENU!$"
-
+ .include "data/text/sign_lady.inc"
.include "data/text/trainer_card.inc"
.include "data/scripts/trainer_card.inc"
.include "data/text/help_system.inc"
diff --git a/data/maps/PalletTown/map.json b/data/maps/PalletTown/map.json
index 58924be03..054580b13 100644
--- a/data/maps/PalletTown/map.json
+++ b/data/maps/PalletTown/map.json
@@ -36,7 +36,7 @@
"movement_range_y": 4,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
- "script": "PalletTown_EventScript_16575C",
+ "script": "PalletTown_EventScript_SignLady",
"flag": "0"
},
{
@@ -49,7 +49,7 @@
"movement_range_y": 2,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
- "script": "PalletTown_EventScript_16582F",
+ "script": "PalletTown_EventScript_FatMan",
"flag": "0"
},
{
@@ -97,7 +97,7 @@
"elevation": 3,
"var": "VAR_MAP_SCENE_PALLET_TOWN_OAK",
"var_value": 0,
- "script": "PalletTown_EventScript_1655ED"
+ "script": "PalletTown_EventScript_OakTriggerLeft"
},
{
"type": "trigger",
@@ -106,7 +106,7 @@
"elevation": 3,
"var": "VAR_MAP_SCENE_PALLET_TOWN_OAK",
"var_value": 0,
- "script": "PalletTown_EventScript_1655F9"
+ "script": "PalletTown_EventScript_OakTriggerRight"
},
{
"type": "trigger",
@@ -115,7 +115,7 @@
"elevation": 3,
"var": "VAR_TEMP_2",
"var_value": 1,
- "script": "PalletTown_EventScript_16587B"
+ "script": "PalletTown_EventScript_SignLadyTrigger"
}
],
"bg_events": [
@@ -124,35 +124,35 @@
"x": 16,
"y": 16,
"elevation": 0,
- "script": "PalletTown_EventScript_165838"
+ "script": "PalletTown_EventScript_OaksLabSign"
},
{
"type": "bg_event_type_0",
"x": 4,
"y": 7,
"elevation": 0,
- "script": "PalletTown_EventScript_165850"
+ "script": "PalletTown_EventScript_PlayersHouseSign"
},
{
"type": "bg_event_type_0",
"x": 13,
"y": 7,
"elevation": 0,
- "script": "PalletTown_EventScript_165859"
+ "script": "PalletTown_EventScript_RivalsHouseSign"
},
{
"type": "bg_event_type_0",
"x": 9,
"y": 11,
"elevation": 0,
- "script": "PalletTown_EventScript_165862"
+ "script": "PalletTown_EventScript_TownSign"
},
{
"type": "bg_event_type_0",
"x": 5,
"y": 14,
"elevation": 0,
- "script": "PalletTown_EventScript_16586B"
+ "script": "PalletTown_EventScript_TrainerTips"
}
]
}
diff --git a/data/maps/PalletTown/scripts.inc b/data/maps/PalletTown/scripts.inc
index 9fd73f882..77fb4cb8c 100644
--- a/data/maps/PalletTown/scripts.inc
+++ b/data/maps/PalletTown/scripts.inc
@@ -1,3 +1,8 @@
+.equ LOCALID_SIGN_LADY, 1
+.equ LOCALID_PROF_OAK, 3
+
+.equ SIGN_LADY_READY, VAR_TEMP_2
+
PalletTown_MapScripts:: @ 816545A
map_script MAP_SCRIPT_ON_TRANSITION, PalletTown_OnTransition
map_script MAP_SCRIPT_ON_FRAME_TABLE, PalletTown_OnFrame
@@ -5,50 +10,51 @@ PalletTown_MapScripts:: @ 816545A
PalletTown_OnTransition:: @ 8165465
setworldmapflag FLAG_WORLD_MAP_PALLET_TOWN
- call_if_set FLAG_PALLET_LADY_NOT_BLOCKING_SIGN, EventScript_165488
+ call_if_set FLAG_PALLET_LADY_NOT_BLOCKING_SIGN, PalletTown_EventScript_TryReadySignLady
compare VAR_MAP_SCENE_PALLET_TOWN_SIGN_LADY, 0
- call_if_eq EventScript_1654A8
+ call_if_eq PalletTown_EventScript_SetSignLadyPos
compare VAR_MAP_SCENE_PALLET_TOWN_SIGN_LADY, 1
- call_if_eq EventScript_1654A2
+ call_if_eq PalletTown_EventScript_SetSignLadyDone
end
-EventScript_165488:: @ 8165488
+PalletTown_EventScript_TryReadySignLady:: @ 8165488
goto_if_unset FLAG_PALLET_TOWN_LADY_MOVED_FROM_SIGN, EventScript_Return
compare VAR_MAP_SCENE_PALLET_TOWN_SIGN_LADY, 1
goto_if_ge EventScript_Return
setvar VAR_MAP_SCENE_PALLET_TOWN_SIGN_LADY, 1
return
-EventScript_1654A2:: @ 81654A2
+PalletTown_EventScript_SetSignLadyDone:: @ 81654A2
setvar VAR_MAP_SCENE_PALLET_TOWN_SIGN_LADY, 2
return
-EventScript_1654A8:: @ 81654A8
- goto_if_set FLAG_PALLET_LADY_NOT_BLOCKING_SIGN, EventScript_1654BD
- setobjectxyperm 1, 5, 15
- setobjectmovementtype 1, 7
+PalletTown_EventScript_SetSignLadyPos:: @ 81654A8
+ goto_if_set FLAG_PALLET_LADY_NOT_BLOCKING_SIGN, PalletTown_EventScript_MoveSignLadyToRouteEntrance
+ setobjectxyperm LOCALID_SIGN_LADY, 5, 15
+ setobjectmovementtype LOCALID_SIGN_LADY, MOVEMENT_TYPE_FACE_UP
return
-EventScript_1654BD:: @ 81654BD
- setobjectxyperm 1, 12, 2
- setobjectmovementtype 1, 8
- setvar VAR_TEMP_2, 1
+PalletTown_EventScript_MoveSignLadyToRouteEntrance:: @ 81654BD
+ setobjectxyperm LOCALID_SIGN_LADY, 12, 2
+ setobjectmovementtype LOCALID_SIGN_LADY, MOVEMENT_TYPE_FACE_DOWN
+ setvar SIGN_LADY_READY, TRUE
return
PalletTown_OnFrame:: @ 81654CE
- map_script_2 VAR_MAP_SCENE_PALLET_TOWN_OAK, 2, EventScript_1654D8
+ map_script_2 VAR_MAP_SCENE_PALLET_TOWN_OAK, 2, PalletTown_EventScript_OakRatingScene
.2byte 0
-EventScript_1654D8:: @ 81654D8
+@ Oak approaches player after exiting their house post Elite Four to check if they should receieve the National Dex
+PalletTown_EventScript_OakRatingScene:: @ 81654D8
lockall
textcolor 0
- setobjectxyperm 3, 14, 14
- setobjectmovementtype 3, 9
- addobject 3
- applymovement 3, Movement_1655AF
+ setobjectxyperm LOCALID_PROF_OAK, 14, 14
+ setobjectmovementtype LOCALID_PROF_OAK, MOVEMENT_TYPE_FACE_LEFT
+ addobject LOCALID_PROF_OAK
+ applymovement LOCALID_PROF_OAK, PalletTown_Movement_OakWalkToPlayersDoor
waitmovement 0
- goto_if_unset FLAG_WORLD_MAP_ONE_ISLAND, EventScript_1655A1
- msgbox gUnknown_817D8BF
+ goto_if_unset FLAG_WORLD_MAP_ONE_ISLAND, PalletTown_EventScript_NotBeenToOneIslandYet
+ msgbox PalletTown_Text_OakLetMeSeePokedex
setvar VAR_0x8004, 0
specialvar VAR_RESULT, Special_GetPokedexCount
copyvar VAR_0x8008, VAR_0x8005
@@ -56,17 +62,17 @@ EventScript_1654D8:: @ 81654D8
getnumberstring 0, VAR_0x8008
getnumberstring 1, VAR_0x8009
compare VAR_0x8009, 60
- goto_if_lt EventScript_165593
- msgbox gUnknown_817D9AA
+ goto_if_lt PalletTown_EventScript_NotEnoughMonsForNationalDex
+ msgbox PalletTown_Text_CaughtXImpressiveFollowMe
closemessage
playbgm MUS_ANNAI, 0
- applymovement OBJ_EVENT_ID_PLAYER, Movement_1655DD
- applymovement 3, Movement_1655CC
+ applymovement OBJ_EVENT_ID_PLAYER, PalletTown_Movement_PlayerWalkToLabFromHouse
+ applymovement LOCALID_PROF_OAK, PalletTown_Movement_OakWalkToLabFromHouse
waitmovement 0
opendoor 16, 13
waitdooranim
- applymovement 3, Movement_16572E
- applymovement OBJ_EVENT_ID_PLAYER, Movement_165758
+ applymovement LOCALID_PROF_OAK, PalletTown_Movement_OakEnterLab
+ applymovement OBJ_EVENT_ID_PLAYER, PalletTown_Movement_PlayerEnterLab
waitmovement 0
closedoor 16, 13
waitdooranim
@@ -78,26 +84,26 @@ EventScript_1654D8:: @ 81654D8
releaseall
end
-EventScript_16557E:: @ 816557E
+PalletTown_EventScript_EndOakRatingScene:: @ 816557E
closemessage
- applymovement 3, Movement_1655BE
+ applymovement LOCALID_PROF_OAK, PalletTown_Movement_OakExit
waitmovement 0
- removeobject 3
+ removeobject LOCALID_PROF_OAK
setvar VAR_MAP_SCENE_PALLET_TOWN_OAK, 3
releaseall
end
-EventScript_165593:: @ 8165593
- msgbox gUnknown_817D925
- goto EventScript_16557E
+PalletTown_EventScript_NotEnoughMonsForNationalDex:: @ 8165593
+ msgbox PalletTown_Text_CaughtXPuttingInHonestEffort
+ goto PalletTown_EventScript_EndOakRatingScene
end
-EventScript_1655A1:: @ 81655A1
- msgbox gUnknown_817DA16
- goto EventScript_16557E
+PalletTown_EventScript_NotBeenToOneIslandYet:: @ 81655A1
+ msgbox PalletTown_Text_OakYouEnjoyingTraveling
+ goto PalletTown_EventScript_EndOakRatingScene
end
-Movement_1655AF:: @ 81655AF
+PalletTown_Movement_OakWalkToPlayersDoor:: @ 81655AF
walk_left
walk_left
walk_left
@@ -114,7 +120,7 @@ Movement_1655AF:: @ 81655AF
walk_in_place_fastest_up
step_end
-Movement_1655BE:: @ 81655BE
+PalletTown_Movement_OakExit:: @ 81655BE
walk_right
walk_right
walk_right
@@ -130,7 +136,7 @@ Movement_1655BE:: @ 81655BE
walk_right
step_end
-Movement_1655CC:: @ 81655CC
+PalletTown_Movement_OakWalkToLabFromHouse:: @ 81655CC
walk_right
walk_right
walk_right
@@ -149,7 +155,7 @@ Movement_1655CC:: @ 81655CC
walk_in_place_fastest_up
step_end
-Movement_1655DD:: @ 81655DD
+PalletTown_Movement_PlayerWalkToLabFromHouse:: @ 81655DD
walk_down
walk_right
walk_right
@@ -167,24 +173,24 @@ Movement_1655DD:: @ 81655DD
walk_right
step_end
-PalletTown_EventScript_1655ED:: @ 81655ED
+PalletTown_EventScript_OakTriggerLeft:: @ 81655ED
lockall
setvar VAR_TEMP_1, 0
- goto EventScript_165605
+ goto PalletTown_EventScript_OakTrigger
end
-PalletTown_EventScript_1655F9:: @ 81655F9
+PalletTown_EventScript_OakTriggerRight:: @ 81655F9
lockall
setvar VAR_TEMP_1, 1
- goto EventScript_165605
+ goto PalletTown_EventScript_OakTrigger
end
-EventScript_165605:: @ 8165605
+PalletTown_EventScript_OakTrigger:: @ 8165605
famechecker FAMECHECKER_OAK, FCPICKSTATE_COLORED, UpdatePickStateFromSpecialVar8005
textcolor 0
delay 30
playbgm MUS_OHKIDO, 0
- message Text_17D72C
+ message PalletTown_Text_OakDontGoOut
waitmessage
delay 85
closemessage
@@ -194,23 +200,23 @@ EventScript_165605:: @ 8165605
applymovement OBJ_EVENT_ID_PLAYER, Movement_ExclamationMark
waitmovement 0
delay 30
- addobject 3
+ addobject LOCALID_PROF_OAK
compare VAR_TEMP_1, 0
- call_if_eq EventScript_1656B8
+ call_if_eq PalletTown_EventScript_OakEnterLeft
compare VAR_TEMP_1, 1
- call_if_eq EventScript_1656C3
+ call_if_eq PalletTown_EventScript_OakEnterRight
delay 30
- msgbox gUnknown_817D74A
+ msgbox PalletTown_Text_OakGrassUnsafeNeedMon
closemessage
delay 30
compare VAR_TEMP_1, 0
- call_if_eq EventScript_1656CE
+ call_if_eq PalletTown_EventScript_OakLeadPlayerToLabLeft
compare VAR_TEMP_1, 1
- call_if_eq EventScript_1656E0
+ call_if_eq PalletTown_EventScript_OakLeadPlayerToLabRight
opendoor 16, 13
waitdooranim
- applymovement 3, Movement_16572E
- applymovement OBJ_EVENT_ID_PLAYER, Movement_165758
+ applymovement LOCALID_PROF_OAK, PalletTown_Movement_OakEnterLab
+ applymovement OBJ_EVENT_ID_PLAYER, PalletTown_Movement_PlayerEnterLab
waitmovement 0
closedoor 16, 13
waitdooranim
@@ -224,29 +230,29 @@ EventScript_165605:: @ 8165605
releaseall
end
-EventScript_1656B8:: @ 81656B8
- applymovement 3, Movement_1656F2
+PalletTown_EventScript_OakEnterLeft:: @ 81656B8
+ applymovement LOCALID_PROF_OAK, PalletTown_Movement_OakEnterLeft
waitmovement 0
return
-EventScript_1656C3:: @ 81656C3
- applymovement 3, Movement_1656FB
+PalletTown_EventScript_OakEnterRight:: @ 81656C3
+ applymovement LOCALID_PROF_OAK, PalletTown_Movement_OakEnterRight
waitmovement 0
return
-EventScript_1656CE:: @ 81656CE
- applymovement 3, Movement_165705
- applymovement OBJ_EVENT_ID_PLAYER, Movement_165731
+PalletTown_EventScript_OakLeadPlayerToLabLeft:: @ 81656CE
+ applymovement LOCALID_PROF_OAK, PalletTown_Movement_OakWalkToLabLeft
+ applymovement OBJ_EVENT_ID_PLAYER, PalletTown_Movement_PlayerWalkToLabLeft
waitmovement 0
return
-EventScript_1656E0:: @ 81656E0
- applymovement 3, Movement_165719
- applymovement OBJ_EVENT_ID_PLAYER, Movement_165744
+PalletTown_EventScript_OakLeadPlayerToLabRight:: @ 81656E0
+ applymovement LOCALID_PROF_OAK, PalletTown_Movement_OakWalkToLabRight
+ applymovement OBJ_EVENT_ID_PLAYER, PalletTown_Movement_PlayerWalkToLabRight
waitmovement 0
return
-Movement_1656F2:: @ 81656F2
+PalletTown_Movement_OakEnterLeft:: @ 81656F2
walk_up
walk_up
walk_right
@@ -257,7 +263,7 @@ Movement_1656F2:: @ 81656F2
walk_up
step_end
-Movement_1656FB:: @ 81656FB
+PalletTown_Movement_OakEnterRight:: @ 81656FB
walk_right
walk_up
walk_up
@@ -269,8 +275,7 @@ Movement_1656FB:: @ 81656FB
walk_up
step_end
-Movement_165705:: @ 8165705
- walk_down
+ .macro walk_to_lab
walk_left
walk_down
walk_down
@@ -287,214 +292,174 @@ Movement_165705:: @ 8165705
walk_right
walk_right
walk_right
+ .endm
+
+PalletTown_Movement_OakWalkToLabLeft:: @ 8165705
+ walk_down
+ walk_to_lab
walk_right
walk_in_place_fastest_up
step_end
-Movement_165719:: @ 8165719
+PalletTown_Movement_OakWalkToLabRight:: @ 8165719
walk_down
walk_left
- walk_left
- walk_down
- walk_down
- walk_down
- walk_down
- walk_down
- walk_down
- walk_down
- walk_down
- walk_down
- walk_down
- walk_down
- walk_right
- walk_right
- walk_right
- walk_right
+ walk_to_lab
walk_right
walk_in_place_fastest_up
step_end
-Movement_16572E:: @ 816572E
+PalletTown_Movement_OakEnterLab:: @ 816572E
walk_up
set_invisible
step_end
-Movement_165731:: @ 8165731
- walk_down
- walk_down
- walk_left
- walk_down
- walk_down
- walk_down
+PalletTown_Movement_PlayerWalkToLabLeft:: @ 8165731
walk_down
walk_down
- walk_down
- walk_down
- walk_down
- walk_down
- walk_down
- walk_down
- walk_right
- walk_right
- walk_right
- walk_right
+ walk_to_lab
step_end
-Movement_165744:: @ 8165744
+PalletTown_Movement_PlayerWalkToLabRight:: @ 8165744
walk_down
walk_down
walk_left
- walk_left
- walk_down
- walk_down
- walk_down
- walk_down
- walk_down
- walk_down
- walk_down
- walk_down
- walk_down
- walk_down
- walk_down
- walk_right
- walk_right
- walk_right
- walk_right
+ walk_to_lab
step_end
-Movement_165758:: @ 8165758
+PalletTown_Movement_PlayerEnterLab:: @ 8165758
walk_right
walk_up
set_invisible
step_end
-PalletTown_EventScript_16575C:: @ 816575C
+PalletTown_EventScript_SignLady:: @ 816575C
lock
compare VAR_MAP_SCENE_PALLET_TOWN_SIGN_LADY, 2
- goto_if_eq EventScript_1657ED
+ goto_if_eq PalletTown_EventScript_SignLadyDone
compare VAR_MAP_SCENE_PALLET_TOWN_SIGN_LADY, 1
- goto_if_eq EventScript_165815
- compare VAR_TEMP_2, 1
- goto_if_eq EventScript_1658C2
- goto_if_set FLAG_TEMP_2, EventScript_165801
- msgbox gUnknown_81B1C8B
- applymovement 1, Movement_FacePlayer
+ goto_if_eq PalletTown_EventScript_SignLadyJustShowedSign
+ compare SIGN_LADY_READY, TRUE
+ goto_if_eq PalletTown_EventScript_SignLadyStartShowSign
+ goto_if_set FLAG_TEMP_2, PalletTown_EventScript_SignLadyGoReadSign
+ msgbox PalletTown_Text_HmmIsThatRight
+ applymovement LOCALID_SIGN_LADY, Movement_FacePlayer
waitmovement 0
playse SE_PIN
- applymovement 1, Movement_ExclamationMark
+ applymovement LOCALID_SIGN_LADY, Movement_ExclamationMark
waitmovement 0
- applymovement 1, Movement_Delay48
+ applymovement LOCALID_SIGN_LADY, Movement_Delay48
waitmovement 0
- msgbox gUnknown_81B1C9F
+ msgbox PalletTown_Text_OhLookLook
closemessage
compare VAR_FACING, DIR_EAST
- call_if_eq EventScript_1657D7
+ call_if_eq PalletTown_EventScript_SignLadyMoveOutOfWayRight
compare VAR_FACING, DIR_EAST
- call_if_ne EventScript_1657E2
+ call_if_ne PalletTown_EventScript_SignLadyMoveOutOfWayLeft
moveobjectoffscreen 1
setflag FLAG_TEMP_2
release
end
-EventScript_1657D7:: @ 81657D7
- applymovement 1, Movement_165829
+PalletTown_EventScript_SignLadyMoveOutOfWayRight:: @ 81657D7
+ applymovement LOCALID_SIGN_LADY, PalletTown_Movement_SignLadyMoveOutOfWayRight
waitmovement 0
return
-EventScript_1657E2:: @ 81657E2
- applymovement 1, Movement_16582C
+PalletTown_EventScript_SignLadyMoveOutOfWayLeft:: @ 81657E2
+ applymovement LOCALID_SIGN_LADY, PalletTown_Movement_SignLadyMoveOutOfWayLeft
waitmovement 0
return
-EventScript_1657ED:: @ 81657ED
- applymovement 1, Movement_FacePlayer
+PalletTown_EventScript_SignLadyDone:: @ 81657ED
+ applymovement LOCALID_SIGN_LADY, Movement_FacePlayer
waitmovement 0
- msgbox gUnknown_817D7C8
+ msgbox PalletTown_Text_RaisingMonsToo
release
end
-EventScript_165801:: @ 8165801
- applymovement 1, Movement_FacePlayer
+PalletTown_EventScript_SignLadyGoReadSign:: @ 8165801
+ applymovement LOCALID_SIGN_LADY, Movement_FacePlayer
waitmovement 0
- msgbox gUnknown_81B1CAF
+ msgbox PalletTown_Text_ReadItReadIt
release
end
-EventScript_165815:: @ 8165815
- applymovement 1, Movement_FacePlayer
+PalletTown_EventScript_SignLadyJustShowedSign:: @ 8165815
+ applymovement LOCALID_SIGN_LADY, Movement_FacePlayer
waitmovement 0
- msgbox gUnknown_81B1CEC
+ msgbox PalletTown_Text_SignsAreUsefulArentThey
release
end
-Movement_165829:: @ 8165829
+PalletTown_Movement_SignLadyMoveOutOfWayRight:: @ 8165829
walk_right
walk_in_place_fastest_left
step_end
-Movement_16582C:: @ 816582C
+PalletTown_Movement_SignLadyMoveOutOfWayLeft:: @ 816582C
walk_left
walk_in_place_fastest_right
step_end
-PalletTown_EventScript_16582F:: @ 816582F
- msgbox gUnknown_817D80D, MSGBOX_NPC
+PalletTown_EventScript_FatMan:: @ 816582F
+ msgbox PalletTown_Text_CanStoreItemsAndMonsInPC, MSGBOX_NPC
end
-PalletTown_EventScript_165838:: @ 8165838
+PalletTown_EventScript_OaksLabSign:: @ 8165838
lockall
famechecker FAMECHECKER_OAK, 0
- msgbox gUnknown_817D866
+ msgbox PalletTown_Text_OakPokemonResearchLab
releaseall
end
-PalletTown_EventScript_165850:: @ 8165850
- msgbox gUnknown_817D87F, MSGBOX_SIGN
+PalletTown_EventScript_PlayersHouseSign:: @ 8165850
+ msgbox PalletTown_Text_PlayersHouse, MSGBOX_SIGN
end
-PalletTown_EventScript_165859:: @ 8165859
- msgbox gUnknown_817D88A, MSGBOX_SIGN
+PalletTown_EventScript_RivalsHouseSign:: @ 8165859
+ msgbox PalletTown_Text_RivalsHouse, MSGBOX_SIGN
end
-PalletTown_EventScript_165862:: @ 8165862
- msgbox gUnknown_817D895, MSGBOX_SIGN
+PalletTown_EventScript_TownSign:: @ 8165862
+ msgbox PalletTown_Text_TownSign, MSGBOX_SIGN
end
-PalletTown_EventScript_16586B:: @ 816586B
+PalletTown_EventScript_TrainerTips:: @ 816586B
lockall
- msgbox gUnknown_81B1CC1
+ msgbox PalletTown_Text_PressStartToOpenMenu
setvar VAR_MAP_SCENE_PALLET_TOWN_SIGN_LADY, 1
releaseall
end
-PalletTown_EventScript_16587B:: @ 816587B
+PalletTown_EventScript_SignLadyTrigger:: @ 816587B
lockall
- applymovement 1, Movement_WalkInPlaceFastestRight
+ applymovement LOCALID_SIGN_LADY, Movement_WalkInPlaceFastestRight
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestLeft
waitmovement 0
- call EventScript_165894
+ call PalletTown_EventScript_SignLadyShowSign
releaseall
end
-EventScript_165894:: @ 8165894
+PalletTown_EventScript_SignLadyShowSign:: @ 8165894
textcolor 1
- msgbox gUnknown_81B1D0B
+ msgbox PalletTown_Text_LookCopiedTrainerTipsSign
closemessage
delay 20
textcolor 3
setflag FLAG_PALLET_TOWN_LADY_MOVED_FROM_SIGN
setvar VAR_MAP_SCENE_PALLET_TOWN_SIGN_LADY, 1
- setvar VAR_TEMP_2, 0
+ setvar SIGN_LADY_READY, FALSE
special sub_80699E0
special sub_80699BC
signmsg
- msgbox gUnknown_81B1D51
+ msgbox PalletTown_Text_PressStartToOpenMenuCopy
normalmsg
return
-EventScript_1658C2:: @ 81658C2
- applymovement 1, Movement_FacePlayer
+PalletTown_EventScript_SignLadyStartShowSign:: @ 81658C2
+ applymovement LOCALID_SIGN_LADY, Movement_FacePlayer
waitmovement 0
- call EventScript_165894
+ call PalletTown_EventScript_SignLadyShowSign
release
end
diff --git a/data/maps/PalletTown/text.inc b/data/maps/PalletTown/text.inc
index ad476a541..5ed553ce2 100644
--- a/data/maps/PalletTown/text.inc
+++ b/data/maps/PalletTown/text.inc
@@ -1,8 +1,8 @@
-Text_17D72C:: @ 817D72C
+PalletTown_Text_OakDontGoOut:: @ 817D72C
.string "OAK: Hey! Wait!\n"
.string "Don't go out!$"
-gUnknown_817D74A:: @ 817D74A
+PalletTown_Text_OakGrassUnsafeNeedMon:: @ 817D74A
.string "OAK: It's unsafe!\n"
.string "Wild POKéMON live in tall grass!\p"
.string "You need your own POKéMON for\n"
@@ -10,30 +10,30 @@ gUnknown_817D74A:: @ 817D74A
.string "I know!\n"
.string "Here, come with me!$"
-gUnknown_817D7C8:: @ 817D7C8
+PalletTown_Text_RaisingMonsToo:: @ 817D7C8
.string "I'm raising POKéMON, too.\p"
.string "When they get strong, they can\n"
.string "protect me.$"
-gUnknown_817D80D:: @ 817D80D
+PalletTown_Text_CanStoreItemsAndMonsInPC:: @ 817D80D
.string "Technology is incredible!\p"
.string "You can now store and recall items\n"
.string "and POKéMON as data via PC.$"
-gUnknown_817D866:: @ 817D866
+PalletTown_Text_OakPokemonResearchLab:: @ 817D866
.string "OAK POKéMON RESEARCH LAB$"
-gUnknown_817D87F:: @ 817D87F
+PalletTown_Text_PlayersHouse:: @ 817D87F
.string "{PLAYER}'s house$"
-gUnknown_817D88A:: @ 817D88A
+PalletTown_Text_RivalsHouse:: @ 817D88A
.string "{RIVAL}'s house$"
-gUnknown_817D895:: @ 817D895
+PalletTown_Text_TownSign:: @ 817D895
.string "PALLET TOWN\n"
.string "Shades of your journey await!$"
-gUnknown_817D8BF:: @ 817D8BF
+PalletTown_Text_OakLetMeSeePokedex:: @ 817D8BF
.string "OAK: Ah, {PLAYER}!\n"
.string "You're back, are you?\p"
.string "How much have you filled in your\n"
@@ -41,14 +41,14 @@ gUnknown_817D8BF:: @ 817D8BF
.string "May I see it?\p"
.string "Let's see…$"
-gUnknown_817D925:: @ 817D925
+PalletTown_Text_CaughtXPuttingInHonestEffort:: @ 817D925
.string "You've caught {STR_VAR_2}…\p"
.string "Hm, it looks as if you're putting\n"
.string "in an honest effort.\p"
.string "When you manage to fill it some\n"
.string "more, come show me, please.$"
-gUnknown_817D9AA:: @ 817D9AA
+PalletTown_Text_CaughtXImpressiveFollowMe:: @ 817D9AA
.string "You've caught… {STR_VAR_2}!?\n"
.string "Now, this is impressive!\p"
.string "There's something I wanted to ask\n"
@@ -56,7 +56,7 @@ gUnknown_817D9AA:: @ 817D9AA
.string "Come.\n"
.string "Follow me.$"
-gUnknown_817DA16:: @ 817DA16
+PalletTown_Text_OakYouEnjoyingTraveling:: @ 817DA16
.string "OAK: Ah, {PLAYER}!\n"
.string "You seem to be enjoying traveling.\p"
.string "Knowing you, {PLAYER}, I can easily\n"
diff --git a/data/maps/PalletTown_GarysHouse/map.json b/data/maps/PalletTown_GarysHouse/map.json
index 6b44f7eb3..f4d46bac8 100644
--- a/data/maps/PalletTown_GarysHouse/map.json
+++ b/data/maps/PalletTown_GarysHouse/map.json
@@ -25,7 +25,7 @@
"movement_range_y": 3,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
- "script": "PalletTown_GarysHouse_EventScript_168D56",
+ "script": "PalletTown_GarysHouse_EventScript_Daisy",
"flag": "0"
},
{
@@ -38,7 +38,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
- "script": "PalletTown_GarysHouse_EventScript_168F63",
+ "script": "PalletTown_GarysHouse_EventScript_TownMap",
"flag": "FLAG_HIDE_TOWN_MAP"
}
],
@@ -72,21 +72,21 @@
"x": 12,
"y": 1,
"elevation": 0,
- "script": "PalletTown_GarysHouse_EventScript_168F6C"
+ "script": "PalletTown_GarysHouse_EventScript_Bookshelf"
},
{
"type": "bg_event_type_0",
"x": 11,
"y": 1,
"elevation": 0,
- "script": "PalletTown_GarysHouse_EventScript_168F6C"
+ "script": "PalletTown_GarysHouse_EventScript_Bookshelf"
},
{
"type": "bg_event_type_0",
"x": 9,
"y": 1,
"elevation": 0,
- "script": "PalletTown_GarysHouse_EventScript_168F75"
+ "script": "PalletTown_GarysHouse_EventScript_Picture"
}
]
}
diff --git a/data/maps/PalletTown_GarysHouse/scripts.inc b/data/maps/PalletTown_GarysHouse/scripts.inc
index 2059a2f58..a64dff1a9 100644
--- a/data/maps/PalletTown_GarysHouse/scripts.inc
+++ b/data/maps/PalletTown_GarysHouse/scripts.inc
@@ -1,67 +1,72 @@
+.equ LOCALID_DAISY, 1
+.equ LOCALID_TOWN_MAP, 2
+
+.equ RECEIVED_TOWN_MAP, VAR_TEMP_1
+
PalletTown_GarysHouse_MapScripts:: @ 8168D27
map_script MAP_SCRIPT_ON_TRANSITION, PalletTown_GarysHouse_OnTransition
.byte 0
PalletTown_GarysHouse_OnTransition:: @ 8168D2D
compare VAR_MAP_SCENE_PALLET_TOWN_GARYS_HOUSE, 2
- call_if_lt EventScript_168D44
+ call_if_lt PalletTown_GarysHouse_EventScript_MoveDaisyToTable
compare VAR_MAP_SCENE_PALLET_TOWN_GARYS_HOUSE, 2
- call_if_ge EventScript_168D50
+ call_if_ge PalletTown_GarysHouse_EventScript_AlreadyReceivedTownMap
end
-EventScript_168D44:: @ 8168D44
- setobjectmovementtype 1, 10
- setobjectxyperm 1, 5, 4
+PalletTown_GarysHouse_EventScript_MoveDaisyToTable:: @ 8168D44
+ setobjectmovementtype LOCALID_DAISY, MOVEMENT_TYPE_FACE_RIGHT
+ setobjectxyperm LOCALID_DAISY, 5, 4
return
-EventScript_168D50:: @ 8168D50
- setvar VAR_TEMP_1, 1
+PalletTown_GarysHouse_EventScript_AlreadyReceivedTownMap:: @ 8168D50
+ setvar RECEIVED_TOWN_MAP, TRUE
return
-PalletTown_GarysHouse_EventScript_168D56:: @ 8168D56
+PalletTown_GarysHouse_EventScript_Daisy:: @ 8168D56
lock
faceplayer
famechecker FAMECHECKER_DAISY, FCPICKSTATE_COLORED, UpdatePickStateFromSpecialVar8005
- goto_if_set FLAG_SYS_GAME_CLEAR, EventScript_168DB9
- compare VAR_TEMP_1, 1
- goto_if_eq EventScript_168EEC
+ goto_if_set FLAG_SYS_GAME_CLEAR, PalletTown_GarysHouse_EventScript_GroomMon
+ compare RECEIVED_TOWN_MAP, TRUE
+ goto_if_eq PalletTown_GarysHouse_EventScript_PleaseGiveMonsRest
compare VAR_MAP_SCENE_PALLET_TOWN_GARYS_HOUSE, 2
- goto_if_eq EventScript_168F59
+ goto_if_eq PalletTown_GarysHouse_EventScript_ExplainTownMap
compare VAR_MAP_SCENE_PALLET_TOWN_GARYS_HOUSE, 1
- goto_if_eq EventScript_168EF6
+ goto_if_eq PalletTown_GarysHouse_EventScript_GiveTownMap
compare VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 1
- goto_if_ge EventScript_168DAF
- msgbox gUnknown_818D58C
+ goto_if_ge PalletTown_GarysHouse_EventScript_HeardBattledRival
+ msgbox PalletTown_GarysHouse_Text_HiBrothersAtLab
closemessage
- applymovement 1, Movement_FaceOriginalDirection
+ applymovement LOCALID_DAISY, Movement_FaceOriginalDirection
waitmovement 0
release
end
-EventScript_168DAF:: @ 8168DAF
- msgbox gUnknown_818D5C4
+PalletTown_GarysHouse_EventScript_HeardBattledRival:: @ 8168DAF
+ msgbox PalletTown_GarysHouse_Text_HeardYouBattledRival
release
end
-EventScript_168DB9:: @ 8168DB9
+PalletTown_GarysHouse_EventScript_GroomMon:: @ 8168DB9
goto_if_questlog EventScript_ReleaseEnd
special sub_8112364
compare VAR_MASSAGE_COOLDOWN_STEP_COUNTER, 500
- goto_if_lt EventScript_168E46
- msgbox gUnknown_818D7D3, MSGBOX_YESNO
+ goto_if_lt PalletTown_GarysHouse_EventScript_RateMonFriendship
+ msgbox PalletTown_GarysHouse_Text_LikeMeToGroomMon, MSGBOX_YESNO
compare VAR_RESULT, NO
- goto_if_eq EventScript_168E3C
- msgbox gUnknown_818D8B2
+ goto_if_eq PalletTown_GarysHouse_EventScript_DeclineGrooming
+ msgbox PalletTown_GarysHouse_Text_GroomWhichOne
special Special_ChooseMonFromParty
waitstate
lock
faceplayer
- compare VAR_0x8004, 6
- goto_if_ge EventScript_168E3C
+ compare VAR_0x8004, PARTY_SIZE
+ goto_if_ge PalletTown_GarysHouse_EventScript_DeclineGrooming
specialvar VAR_RESULT, Special_GetSpeciesOfPartySlot_x8004
compare VAR_RESULT, SPECIES_EGG
- goto_if_eq EventScript_168E32
- msgbox gUnknown_818D8CC
+ goto_if_eq PalletTown_GarysHouse_EventScript_CantGroomEgg
+ msgbox PalletTown_GarysHouse_Text_LookingNiceInNoTime
closemessage
fadescreen FADE_TO_BLACK
playfanfare MUS_ME_ASA
@@ -69,109 +74,109 @@ EventScript_168DB9:: @ 8168DB9
special Special_DaisyMassageServices
fadescreen FADE_FROM_BLACK
special Special_GetMonNickname
- msgbox gUnknown_818D8FE
+ msgbox PalletTown_GarysHouse_Text_ThereYouGoAllDone
release
end
-EventScript_168E32:: @ 8168E32
- msgbox gUnknown_818D97B
+PalletTown_GarysHouse_EventScript_CantGroomEgg:: @ 8168E32
+ msgbox PalletTown_GarysHouse_Text_CantGroomAnEgg
release
end
-EventScript_168E3C:: @ 8168E3C
- msgbox gUnknown_818D875
+PalletTown_GarysHouse_EventScript_DeclineGrooming:: @ 8168E3C
+ msgbox PalletTown_GarysHouse_Text_DontNeedAnyGrooming
release
end
-EventScript_168E46:: @ 8168E46
- msgbox gUnknown_818D9A5
+PalletTown_GarysHouse_EventScript_RateMonFriendship:: @ 8168E46
+ msgbox PalletTown_GarysHouse_Text_MayISeeFirstMon
specialvar VAR_RESULT, Special_GetLeadMonFriendship
switch VAR_RESULT
- case 0, EventScript_168EA6
- case 1, EventScript_168EB0
- case 2, EventScript_168EBA
- case 3, EventScript_168EC4
- case 4, EventScript_168ECE
- case 5, EventScript_168ED8
- case 6, EventScript_168EE2
+ case 0, PalletTown_GarysHouse_EventScript_MonFriendshipLowest
+ case 1, PalletTown_GarysHouse_EventScript_MonFriendshipLower
+ case 2, PalletTown_GarysHouse_EventScript_MonFriendshipLow
+ case 3, PalletTown_GarysHouse_EventScript_MonFriendshipMid
+ case 4, PalletTown_GarysHouse_EventScript_MonFriendshipHigh
+ case 5, PalletTown_GarysHouse_EventScript_MonFriendshipHigher
+ case 6, PalletTown_GarysHouse_EventScript_MonFriendshipHighest
end
-EventScript_168EA6:: @ 8168EA6
- msgbox gUnknown_818DBDD
+PalletTown_GarysHouse_EventScript_MonFriendshipLowest:: @ 8168EA6
+ msgbox PalletTown_GarysHouse_Text_WhyWouldMonHateYouSoMuch
release
end
-EventScript_168EB0:: @ 8168EB0
- msgbox gUnknown_818DB88
+PalletTown_GarysHouse_EventScript_MonFriendshipLower:: @ 8168EB0
+ msgbox PalletTown_GarysHouse_Text_DontLikeWayItGlaresAtYou
release
end
-EventScript_168EBA:: @ 8168EBA
- msgbox gUnknown_818DB2E
+PalletTown_GarysHouse_EventScript_MonFriendshipLow:: @ 8168EBA
+ msgbox PalletTown_GarysHouse_Text_NotFamiliarWithYouYet
release
end
-EventScript_168EC4:: @ 8168EC4
- msgbox gUnknown_818DAF3
+PalletTown_GarysHouse_EventScript_MonFriendshipMid:: @ 8168EC4
+ msgbox PalletTown_GarysHouse_Text_ItsWarmingUpToYou
release
end
-EventScript_168ECE:: @ 8168ECE
- msgbox gUnknown_818DABE
+PalletTown_GarysHouse_EventScript_MonFriendshipHigh:: @ 8168ECE
+ msgbox PalletTown_GarysHouse_Text_ItsQuiteFriendly
release
end
-EventScript_168ED8:: @ 8168ED8
- msgbox gUnknown_818DA73
+PalletTown_GarysHouse_EventScript_MonFriendshipHigher:: @ 8168ED8
+ msgbox PalletTown_GarysHouse_Text_ItLooksVeryHappy
release
end
-EventScript_168EE2:: @ 8168EE2
- msgbox gUnknown_818DA16
+PalletTown_GarysHouse_EventScript_MonFriendshipHighest:: @ 8168EE2
+ msgbox PalletTown_GarysHouse_Text_CouldntLoveYouMore
release
end
-EventScript_168EEC:: @ 8168EEC
- msgbox gUnknown_818D701
+PalletTown_GarysHouse_EventScript_PleaseGiveMonsRest:: @ 8168EEC
+ msgbox PalletTown_GarysHouse_Text_PleaseGiveMonsRest
release
end
-EventScript_168EF6:: @ 8168EF6
- msgbox gUnknown_818D60A
+PalletTown_GarysHouse_EventScript_GiveTownMap:: @ 8168EF6
+ msgbox PalletTown_GarysHouse_Text_ErrandForGrandpaThisWillHelp
closemessage
checkitemspace ITEM_TOWN_MAP, 1
compare VAR_RESULT, FALSE
- goto_if_eq EventScript_168F4F
- applymovement 1, Movement_WalkInPlaceFastestRight
+ goto_if_eq PalletTown_GarysHouse_EventScript_NoRoomForTownMap
+ applymovement LOCALID_DAISY, Movement_WalkInPlaceFastestRight
waitmovement 0
- removeobject 2
+ removeobject LOCALID_TOWN_MAP
setvar VAR_MAP_SCENE_PALLET_TOWN_GARYS_HOUSE, 2
delay 15
- applymovement 1, Movement_FacePlayer
+ applymovement LOCALID_DAISY, Movement_FacePlayer
waitmovement 0
delay 12
- giveitem_msg gUnknown_818D661, ITEM_TOWN_MAP, 1, MUS_FAN5
+ giveitem_msg PalletTown_GarysHouse_Text_ReceivedTownMapFromDaisy, ITEM_TOWN_MAP, 1, MUS_FAN5
release
end
-EventScript_168F4F:: @ 8168F4F
- msgbox gUnknown_818D684
+PalletTown_GarysHouse_EventScript_NoRoomForTownMap:: @ 8168F4F
+ msgbox PalletTown_GarysHouse_Text_DontHaveSpaceForThis
release
end
-EventScript_168F59:: @ 8168F59
- msgbox gUnknown_818D6AF
+PalletTown_GarysHouse_EventScript_ExplainTownMap:: @ 8168F59
+ msgbox PalletTown_GarysHouse_Text_ExplainTownMap
release
end
-PalletTown_GarysHouse_EventScript_168F63:: @ 8168F63
- msgbox gUnknown_818D763, MSGBOX_NPC
+PalletTown_GarysHouse_EventScript_TownMap:: @ 8168F63
+ msgbox PalletTown_GarysHouse_Text_ItsBigMapOfKanto, MSGBOX_NPC
end
-PalletTown_GarysHouse_EventScript_168F6C:: @ 8168F6C
- msgbox gUnknown_818D7A1, MSGBOX_SIGN
+PalletTown_GarysHouse_EventScript_Bookshelf:: @ 8168F6C
+ msgbox PalletTown_GarysHouse_Text_ShelvesCrammedFullOfBooks, MSGBOX_SIGN
end
-PalletTown_GarysHouse_EventScript_168F75:: @ 8168F75
- msgbox gUnknown_818DC47, MSGBOX_SIGN
+PalletTown_GarysHouse_EventScript_Picture:: @ 8168F75
+ msgbox PalletTown_GarysHouse_Text_LovelyAndSweetClefairy, MSGBOX_SIGN
end
diff --git a/data/maps/PalletTown_GarysHouse/text.inc b/data/maps/PalletTown_GarysHouse/text.inc
index 92d05fbef..38e3adbdc 100644
--- a/data/maps/PalletTown_GarysHouse/text.inc
+++ b/data/maps/PalletTown_GarysHouse/text.inc
@@ -1,47 +1,47 @@
-gUnknown_818D58C:: @ 818D58C
+PalletTown_GarysHouse_Text_HiBrothersAtLab:: @ 818D58C
.string "DAISY: Hi, {PLAYER}!\p"
.string "My brother, {RIVAL}, is out at\n"
.string "Grandpa's LAB.$"
-gUnknown_818D5C4:: @ 818D5C4
+PalletTown_GarysHouse_Text_HeardYouBattledRival:: @ 818D5C4
.string "DAISY: {PLAYER}, I heard you had\n"
.string "a battle against {RIVAL}.\p"
.string "I wish I'd seen that!$"
-gUnknown_818D60A:: @ 818D60A
+PalletTown_GarysHouse_Text_ErrandForGrandpaThisWillHelp:: @ 818D60A
.string "Grandpa asked you to run an\n"
.string "errand?\p"
.string "Gee, that's lazy of him.\n"
.string "Here, this will help you.$"
-gUnknown_818D661:: @ 818D661
+PalletTown_GarysHouse_Text_ReceivedTownMapFromDaisy:: @ 818D661
.string "{PLAYER} received a TOWN MAP\n"
.string "from DAISY.$"
-gUnknown_818D684:: @ 818D684
+PalletTown_GarysHouse_Text_DontHaveSpaceForThis:: @ 818D684
.string "You don't have space for this in\n"
.string "your BAG.$"
-gUnknown_818D6AF:: @ 818D6AF
+PalletTown_GarysHouse_Text_ExplainTownMap:: @ 818D6AF
.string "You can use the TOWN MAP to find\n"
.string "out where you are, or check the\l"
.string "names of places.$"
-gUnknown_818D701:: @ 818D701
+PalletTown_GarysHouse_Text_PleaseGiveMonsRest:: @ 818D701
.string "DAISY: Just like people, POKéMON\n"
.string "are living things.\p"
.string "When they get tired, please give\n"
.string "them a rest.$"
-gUnknown_818D763:: @ 818D763
+PalletTown_GarysHouse_Text_ItsBigMapOfKanto:: @ 818D763
.string "It's a big map of the KANTO region.\n"
.string "Now this would be useful!$"
-gUnknown_818D7A1:: @ 818D7A1
+PalletTown_GarysHouse_Text_ShelvesCrammedFullOfBooks:: @ 818D7A1
.string "The shelves are crammed full of\n"
.string "books on POKéMON.$"
-gUnknown_818D7D3:: @ 818D7D3
+PalletTown_GarysHouse_Text_LikeMeToGroomMon:: @ 818D7D3
.string "DAISY: Hi, {PLAYER}!\n"
.string "Good timing.\p"
.string "I'm about to have some tea.\n"
@@ -50,72 +50,72 @@ gUnknown_818D7D3:: @ 818D7D3
.string "Your POKéMON are a little dirty.\p"
.string "Would you like me to groom one?$"
-gUnknown_818D875:: @ 818D875
+PalletTown_GarysHouse_Text_DontNeedAnyGrooming:: @ 818D875
.string "You don't need any grooming done?\n"
.string "Okay, we'll just have tea.$"
-gUnknown_818D8B2:: @ 818D8B2
+PalletTown_GarysHouse_Text_GroomWhichOne:: @ 818D8B2
.string "Which one should I groom?$"
-gUnknown_818D8CC:: @ 818D8CC
+PalletTown_GarysHouse_Text_LookingNiceInNoTime:: @ 818D8CC
.string "DAISY: Okay, I'll get it looking\n"
.string "nice in no time.$"
-gUnknown_818D8FE:: @ 818D8FE
+PalletTown_GarysHouse_Text_ThereYouGoAllDone:: @ 818D8FE
.string "{SIZE}Á{STR_VAR_1} looks dreamily content…\p"
.string "{SIZE}ÈDAISY: There you go! All done.\n"
.string "See? Doesn't it look nice?\p"
.string "Giggle…\n"
.string "It's such a cute POKéMON.$"
-gUnknown_818D97B:: @ 818D97B
+PalletTown_GarysHouse_Text_CantGroomAnEgg:: @ 818D97B
.string "Oh, sorry. I honestly can't\n"
.string "groom an EGG.$"
-gUnknown_818D9A5:: @ 818D9A5
+PalletTown_GarysHouse_Text_MayISeeFirstMon:: @ 818D9A5
.string "DAISY: Your POKéMON grow to love\n"
.string "you if you raise them with love.\p"
.string "For example, {PLAYER}, may I see\n"
.string "your first POKéMON?$"
-gUnknown_818DA16:: @ 818DA16
+PalletTown_GarysHouse_Text_CouldntLoveYouMore:: @ 818DA16
.string "It couldn't possibly love you\n"
.string "any more than it does now.\p"
.string "Your POKéMON is happy beyond\n"
.string "words.$"
-gUnknown_818DA73:: @ 818DA73
+PalletTown_GarysHouse_Text_ItLooksVeryHappy:: @ 818DA73
.string "It looks very happy.\p"
.string "I wish {RIVAL} could see this and\n"
.string "learn something from it.$"
-gUnknown_818DABE:: @ 818DABE
+PalletTown_GarysHouse_Text_ItsQuiteFriendly:: @ 818DABE
.string "It's quite friendly with you.\n"
.string "Keep being good to it!$"
-gUnknown_818DAF3:: @ 818DAF3
+PalletTown_GarysHouse_Text_ItsWarmingUpToYou:: @ 818DAF3
.string "It's warming up to you.\n"
.string "Trust must be growing between you.$"
-gUnknown_818DB2E:: @ 818DB2E
+PalletTown_GarysHouse_Text_NotFamiliarWithYouYet:: @ 818DB2E
.string "It's not quite familiar with you\n"
.string "yet.\p"
.string "POKéMON are all quite wary when\n"
.string "you first get them.$"
-gUnknown_818DB88:: @ 818DB88
+PalletTown_GarysHouse_Text_DontLikeWayItGlaresAtYou:: @ 818DB88
.string "{PLAYER}, I don't like the way it\n"
.string "glares at you.\p"
.string "Could you try being a little nicer\n"
.string "to it?$"
-gUnknown_818DBDD:: @ 818DBDD
+PalletTown_GarysHouse_Text_WhyWouldMonHateYouSoMuch:: @ 818DBDD
.string "…Um, it's not easy for me to say\n"
.string "this, but…\p"
.string "Is there some reason why your\n"
.string "POKéMON would hate you so much?$"
-gUnknown_818DC47:: @ 818DC47
+PalletTown_GarysHouse_Text_LovelyAndSweetClefairy:: @ 818DC47
.string "“The lovely and sweet\n"
.string "CLEFAIRY”$"
diff --git a/data/maps/PalletTown_PlayersHouse_1F/map.json b/data/maps/PalletTown_PlayersHouse_1F/map.json
index 414766d99..f4e7cc175 100644
--- a/data/maps/PalletTown_PlayersHouse_1F/map.json
+++ b/data/maps/PalletTown_PlayersHouse_1F/map.json
@@ -25,7 +25,7 @@
"movement_range_y": 0,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
- "script": "PalletTown_PlayersHouse_1F_EventScript_168C09",
+ "script": "PalletTown_PlayersHouse_1F_EventScript_Mom",
"flag": "0"
}
],
@@ -66,7 +66,7 @@
"x": 6,
"y": 1,
"elevation": 0,
- "script": "PalletTown_PlayersHouse_1F_EventScript_168C62"
+ "script": "PalletTown_PlayersHouse_1F_EventScript_TV"
}
]
}
diff --git a/data/maps/PalletTown_PlayersHouse_1F/scripts.inc b/data/maps/PalletTown_PlayersHouse_1F/scripts.inc
index 6dc0a1a47..0fa5219aa 100644
--- a/data/maps/PalletTown_PlayersHouse_1F/scripts.inc
+++ b/data/maps/PalletTown_PlayersHouse_1F/scripts.inc
@@ -1,58 +1,59 @@
PalletTown_PlayersHouse_1F_MapScripts:: @ 8168C08
.byte 0
-PalletTown_PlayersHouse_1F_EventScript_168C09:: @ 8168C09
+PalletTown_PlayersHouse_1F_EventScript_Mom:: @ 8168C09
lock
faceplayer
- goto_if_set FLAG_BEAT_RIVAL_IN_OAKS_LAB, EventScript_168C4A
+ goto_if_set FLAG_BEAT_RIVAL_IN_OAKS_LAB, PalletTown_PlayersHouse_1F_EventScript_MomHeal
checkplayergender
compare VAR_RESULT, MALE
- call_if_eq EventScript_168C38
+ call_if_eq PalletTown_PlayersHouse_1F_EventScript_MomOakLookingForYouMale
compare VAR_RESULT, FEMALE
- call_if_eq EventScript_168C41
+ call_if_eq PalletTown_PlayersHouse_1F_EventScript_MomOakLookingForYouFemale
closemessage
applymovement 1, Movement_FaceOriginalDirection
waitmovement 0
release
end
-EventScript_168C38:: @ 8168C38
- msgbox gUnknown_818D2F0
+PalletTown_PlayersHouse_1F_EventScript_MomOakLookingForYouMale:: @ 8168C38
+ msgbox PalletTown_PlayersHouse_1F_Text_AllBoysLeaveOakLookingForYou
return
-EventScript_168C41:: @ 8168C41
- msgbox gUnknown_818D360
+PalletTown_PlayersHouse_1F_EventScript_MomOakLookingForYouFemale:: @ 8168C41
+ msgbox PalletTown_PlayersHouse_1F_Text_AllGirlsLeaveOakLookingForYou
return
-EventScript_168C4A:: @ 8168C4A
- msgbox gUnknown_818D3D1
+PalletTown_PlayersHouse_1F_EventScript_MomHeal:: @ 8168C4A
+ msgbox PalletTown_PlayersHouse_1F_Text_YouShouldTakeQuickRest
closemessage
call EventScript_OutOfCenterPartyHeal
- msgbox gUnknown_818D3F8
+ msgbox PalletTown_PlayersHouse_1F_Text_LookingGreatTakeCare
release
end
-PalletTown_PlayersHouse_1F_EventScript_168C62:: @ 8168C62
+@ Displays special text if interacted with from side or back (which are normally inaccessible)
+PalletTown_PlayersHouse_1F_EventScript_TV:: @ 8168C62
lockall
compare VAR_FACING, DIR_NORTH
- goto_if_eq EventScript_168C78
- msgbox gUnknown_818D4F9
+ goto_if_eq PalletTown_PlayersHouse_1F_EventScript_TVScreen
+ msgbox PalletTown_PlayersHouse_1F_Text_OopsWrongSide
releaseall
end
-EventScript_168C78:: @ 8168C78
+PalletTown_PlayersHouse_1F_EventScript_TVScreen:: @ 8168C78
checkplayergender
compare VAR_RESULT, MALE
- call_if_eq EventScript_168C91
+ call_if_eq PalletTown_PlayersHouse_1F_EventScript_TVScreenMale
compare VAR_RESULT, FEMALE
- call_if_eq EventScript_168C9A
+ call_if_eq PalletTown_PlayersHouse_1F_EventScript_TVScreenFemale
releaseall
end
-EventScript_168C91:: @ 8168C91
- msgbox gUnknown_818D43E
+PalletTown_PlayersHouse_1F_EventScript_TVScreenMale:: @ 8168C91
+ msgbox PalletTown_PlayersHouse_1F_Text_MovieOnTVFourBoysOnRailroad
return
-EventScript_168C9A:: @ 8168C9A
- msgbox gUnknown_818D492
+PalletTown_PlayersHouse_1F_EventScript_TVScreenFemale:: @ 8168C9A
+ msgbox PalletTown_PlayersHouse_1F_Text_MovieOnTVGirlOnBrickRoad
return
diff --git a/data/maps/PalletTown_PlayersHouse_1F/text.inc b/data/maps/PalletTown_PlayersHouse_1F/text.inc
index ba40d1729..baa31b38d 100644
--- a/data/maps/PalletTown_PlayersHouse_1F/text.inc
+++ b/data/maps/PalletTown_PlayersHouse_1F/text.inc
@@ -1,38 +1,38 @@
-gUnknown_818D2F0:: @ 818D2F0
+PalletTown_PlayersHouse_1F_Text_AllBoysLeaveOakLookingForYou:: @ 818D2F0
.string "MOM: …Right.\n"
.string "All boys leave home someday.\l"
.string "It said so on TV.\p"
.string "Oh, yes. PROF. OAK, next door, was\n"
.string "looking for you.$"
-gUnknown_818D360:: @ 818D360
+PalletTown_PlayersHouse_1F_Text_AllGirlsLeaveOakLookingForYou:: @ 818D360
.string "MOM: …Right.\n"
.string "All girls dream of traveling.\l"
.string "It said so on TV.\p"
.string "Oh, yes. PROF. OAK, next door, was\n"
.string "looking for you.$"
-gUnknown_818D3D1:: @ 818D3D1
+PalletTown_PlayersHouse_1F_Text_YouShouldTakeQuickRest:: @ 818D3D1
.string "MOM: {PLAYER}!\n"
.string "You should take a quick rest.$"
-gUnknown_818D3F8:: @ 818D3F8
+PalletTown_PlayersHouse_1F_Text_LookingGreatTakeCare:: @ 818D3F8
.string "MOM: Oh, good! You and your\n"
.string "POKéMON are looking great.\l"
.string "Take care now!$"
-gUnknown_818D43E:: @ 818D43E
+PalletTown_PlayersHouse_1F_Text_MovieOnTVFourBoysOnRailroad:: @ 818D43E
.string "There's a movie on TV.\n"
.string "Four boys are walking on railroad\l"
.string "tracks.\p"
.string "…I better go, too.$"
-gUnknown_818D492:: @ 818D492
+PalletTown_PlayersHouse_1F_Text_MovieOnTVGirlOnBrickRoad:: @ 818D492
.string "There's a movie on TV.\n"
.string "A girl with her hair in pigtails is\l"
.string "walking up a brick road.\p"
.string "…I better go, too.$"
-gUnknown_818D4F9:: @ 818D4F9
+PalletTown_PlayersHouse_1F_Text_OopsWrongSide:: @ 818D4F9
.string "Oops, wrong side…$"
diff --git a/data/maps/PalletTown_PlayersHouse_2F/map.json b/data/maps/PalletTown_PlayersHouse_2F/map.json
index 67befec6c..8d6f9fa57 100644
--- a/data/maps/PalletTown_PlayersHouse_2F/map.json
+++ b/data/maps/PalletTown_PlayersHouse_2F/map.json
@@ -31,21 +31,21 @@
"x": 6,
"y": 5,
"elevation": 3,
- "script": "PalletTown_PlayersHouse_2F_EventScript_168CD2"
+ "script": "PalletTown_PlayersHouse_2F_EventScript_NES"
},
{
"type": "bg_event_type_0",
"x": 1,
"y": 1,
"elevation": 0,
- "script": "PalletTown_PlayersHouse_2F_EventScript_168CE4"
+ "script": "PalletTown_PlayersHouse_2F_EventScript_PC"
},
{
"type": "bg_event_type_0",
"x": 11,
"y": 1,
"elevation": 0,
- "script": "PalletTown_PlayersHouse_2F_EventScript_168CDB"
+ "script": "PalletTown_PlayersHouse_2F_EventScript_Sign"
}
]
}
diff --git a/data/maps/PalletTown_PlayersHouse_2F/scripts.inc b/data/maps/PalletTown_PlayersHouse_2F/scripts.inc
index 7e8c8ee73..de44c733a 100644
--- a/data/maps/PalletTown_PlayersHouse_2F/scripts.inc
+++ b/data/maps/PalletTown_PlayersHouse_2F/scripts.inc
@@ -5,32 +5,31 @@ PalletTown_PlayersHouse_2F_MapScripts:: @ 8168CA3
PalletTown_PlayersHouse_2F_OnTransition:: @ 8168CAE
compare VAR_MAP_SCENE_PALLET_TOWN_PLAYERS_HOUSE_2F, 0
- call_if_eq EventScript_168CBA
+ call_if_eq PalletTown_PlayersHouse_2F_EventScript_SetRespawn
end
-EventScript_168CBA:: @ 8168CBA
+PalletTown_PlayersHouse_2F_EventScript_SetRespawn:: @ 8168CBA
setrespawn SPAWN_PALLET_TOWN
return
PalletTown_PlayersHouse_2F_OnWarp:: @ 8168CBE
- map_script_2 VAR_MAP_SCENE_PALLET_TOWN_PLAYERS_HOUSE_2F, 0, EventScript_168CC8
+ map_script_2 VAR_MAP_SCENE_PALLET_TOWN_PLAYERS_HOUSE_2F, 0, PalletTown_PlayersHouse_2F_FirstWarpIn
.2byte 0
-EventScript_168CC8:: @ 8168CC8
+PalletTown_PlayersHouse_2F_FirstWarpIn:: @ 8168CC8
turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH
setvar VAR_MAP_SCENE_PALLET_TOWN_PLAYERS_HOUSE_2F, 1
end
-PalletTown_PlayersHouse_2F_EventScript_168CD2:: @ 8168CD2
- msgbox gUnknown_818D50B, MSGBOX_SIGN
+PalletTown_PlayersHouse_2F_EventScript_NES:: @ 8168CD2
+ msgbox PalletTown_PlayersHouse_2F_Text_PlayedWithNES, MSGBOX_SIGN
end
-PalletTown_PlayersHouse_2F_EventScript_168CDB:: @ 8168CDB
- msgbox gUnknown_818D53B, MSGBOX_SIGN
+PalletTown_PlayersHouse_2F_EventScript_Sign:: @ 8168CDB
+ msgbox PalletTown_PlayersHouse_2F_Text_PressLRForHelp, MSGBOX_SIGN
end
-gUnknown_8168CE4:: @ 8168CE4
-PalletTown_PlayersHouse_2F_EventScript_168CE4:: @ 8168CE4
+PalletTown_PlayersHouse_2F_EventScript_PC:: @ 8168CE4
goto_if_questlog EventScript_ReleaseEnd
lockall
setvar VAR_0x8004, 32
diff --git a/data/maps/PalletTown_PlayersHouse_2F/text.inc b/data/maps/PalletTown_PlayersHouse_2F/text.inc
index e6c794231..cb7a68dce 100644
--- a/data/maps/PalletTown_PlayersHouse_2F/text.inc
+++ b/data/maps/PalletTown_PlayersHouse_2F/text.inc
@@ -1,9 +1,9 @@
-gUnknown_818D50B:: @ 818D50B
+PalletTown_PlayersHouse_2F_Text_PlayedWithNES:: @ 818D50B
.string "{PLAYER} played with the NES.\p"
.string "…Okay!\n"
.string "It's time to go!$"
-gUnknown_818D53B:: @ 818D53B
+PalletTown_PlayersHouse_2F_Text_PressLRForHelp:: @ 818D53B
.string "It's a posted notice…\p"
.string "If you're confused, ask for HELP!\n"
.string "Press the L or R Button!$"
diff --git a/data/maps/PalletTown_ProfessorOaksLab/map.json b/data/maps/PalletTown_ProfessorOaksLab/map.json
index 31e6014cb..4e72c8909 100644
--- a/data/maps/PalletTown_ProfessorOaksLab/map.json
+++ b/data/maps/PalletTown_ProfessorOaksLab/map.json
@@ -25,7 +25,7 @@
"movement_range_y": 0,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
- "script": "PalletTown_ProfessorOaksLab_EventScript_169DEE",
+ "script": "PalletTown_ProfessorOaksLab_EventScript_Aide1",
"flag": "0"
},
{
@@ -38,7 +38,7 @@
"movement_range_y": 4,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
- "script": "PalletTown_ProfessorOaksLab_EventScript_169E46",
+ "script": "PalletTown_ProfessorOaksLab_EventScript_Aide3",
"flag": "0"
},
{
@@ -51,7 +51,7 @@
"movement_range_y": 0,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
- "script": "PalletTown_ProfessorOaksLab_EventScript_169E1A",
+ "script": "PalletTown_ProfessorOaksLab_EventScript_Aide2",
"flag": "0"
},
{
@@ -64,7 +64,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
- "script": "PalletTown_ProfessorOaksLab_EventScript_169595",
+ "script": "PalletTown_ProfessorOaksLab_EventScript_ProfOak",
"flag": "FLAG_HIDE_OAK_IN_HIS_LAB"
},
{
@@ -77,7 +77,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
- "script": "PalletTown_ProfessorOaksLab_EventScript_169BAB",
+ "script": "PalletTown_ProfessorOaksLab_EventScript_BulbasaurBall",
"flag": "FLAG_HIDE_BULBASAUR_BALL"
},
{
@@ -90,7 +90,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
- "script": "PalletTown_ProfessorOaksLab_EventScript_169D78",
+ "script": "PalletTown_ProfessorOaksLab_EventScript_SquirtleBall",
"flag": "FLAG_HIDE_SQUIRTLE_BALL"
},
{
@@ -103,7 +103,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
- "script": "PalletTown_ProfessorOaksLab_EventScript_169DAE",
+ "script": "PalletTown_ProfessorOaksLab_EventScript_CharmanderBall",
"flag": "FLAG_HIDE_CHARMANDER_BALL"
},
{
@@ -116,7 +116,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
- "script": "PalletTown_ProfessorOaksLab_EventScript_16955F",
+ "script": "PalletTown_ProfessorOaksLab_EventScript_Rival",
"flag": "FLAG_HIDE_RIVAL_IN_LAB"
},
{
@@ -129,7 +129,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
- "script": "PalletTown_ProfessorOaksLab_EventScript_169E5F",
+ "script": "PalletTown_ProfessorOaksLab_EventScript_Pokedex",
"flag": "FLAG_HIDE_POKEDEX"
},
{
@@ -142,7 +142,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
- "script": "PalletTown_ProfessorOaksLab_EventScript_169E5F",
+ "script": "PalletTown_ProfessorOaksLab_EventScript_Pokedex",
"flag": "FLAG_HIDE_POKEDEX"
}
],
@@ -177,7 +177,7 @@
"elevation": 3,
"var": "VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB",
"var_value": 2,
- "script": "PalletTown_ProfessorOaksLab_EventScript_1692C3"
+ "script": "PalletTown_ProfessorOaksLab_EventScript_LeaveStarterSceneTrigger"
},
{
"type": "trigger",
@@ -186,7 +186,7 @@
"elevation": 3,
"var": "VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB",
"var_value": 2,
- "script": "PalletTown_ProfessorOaksLab_EventScript_1692C3"
+ "script": "PalletTown_ProfessorOaksLab_EventScript_LeaveStarterSceneTrigger"
},
{
"type": "trigger",
@@ -195,7 +195,7 @@
"elevation": 3,
"var": "VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB",
"var_value": 2,
- "script": "PalletTown_ProfessorOaksLab_EventScript_1692C3"
+ "script": "PalletTown_ProfessorOaksLab_EventScript_LeaveStarterSceneTrigger"
},
{
"type": "trigger",
@@ -204,7 +204,7 @@
"elevation": 3,
"var": "VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB",
"var_value": 3,
- "script": "PalletTown_ProfessorOaksLab_EventScript_1692E7"
+ "script": "PalletTown_ProfessorOaksLab_EventScript_RivalBattleTriggerLeft"
},
{
"type": "trigger",
@@ -213,7 +213,7 @@
"elevation": 3,
"var": "VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB",
"var_value": 3,
- "script": "PalletTown_ProfessorOaksLab_EventScript_1692F3"
+ "script": "PalletTown_ProfessorOaksLab_EventScript_RivalBattleTriggerMid"
},
{
"type": "trigger",
@@ -222,7 +222,7 @@
"elevation": 3,
"var": "VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB",
"var_value": 3,
- "script": "PalletTown_ProfessorOaksLab_EventScript_1692FF"
+ "script": "PalletTown_ProfessorOaksLab_EventScript_RivalBattleTriggerRight"
}
],
"bg_events": [
@@ -231,28 +231,28 @@
"x": 2,
"y": 1,
"elevation": 0,
- "script": "PalletTown_ProfessorOaksLab_EventScript_169E68"
+ "script": "PalletTown_ProfessorOaksLab_EventScript_Computer"
},
{
"type": "bg_event_type_0",
"x": 3,
"y": 1,
"elevation": 0,
- "script": "PalletTown_ProfessorOaksLab_EventScript_169E68"
+ "script": "PalletTown_ProfessorOaksLab_EventScript_Computer"
},
{
"type": "bg_event_type_0",
"x": 6,
"y": 1,
"elevation": 0,
- "script": "PalletTown_ProfessorOaksLab_EventScript_169E71"
+ "script": "PalletTown_ProfessorOaksLab_EventScript_LeftSign"
},
{
"type": "bg_event_type_0",
"x": 7,
"y": 1,
"elevation": 0,
- "script": "PalletTown_ProfessorOaksLab_EventScript_169E7A"
+ "script": "PalletTown_ProfessorOaksLab_EventScript_RightSign"
}
]
}
diff --git a/data/maps/PalletTown_ProfessorOaksLab/scripts.inc b/data/maps/PalletTown_ProfessorOaksLab/scripts.inc
index 0e466abd3..19518f6e7 100644
--- a/data/maps/PalletTown_ProfessorOaksLab/scripts.inc
+++ b/data/maps/PalletTown_ProfessorOaksLab/scripts.inc
@@ -1,3 +1,18 @@
+.equ LOCALID_PROF_OAK, 4
+.equ LOCALID_BULBASAUR_BALL, 5
+.equ LOCALID_SQUIRTLE_BALL, 6
+.equ LOCALID_CHARMANDER_BALL, 7
+.equ LOCALID_RIVAL, 8
+.equ LOCALID_POKEDEX_1, 9
+.equ LOCALID_POKEDEX_2, 10
+
+.equ PLAYER_STARTER_NUM, VAR_TEMP_1
+.equ PLAYER_STARTER_SPECIES, VAR_TEMP_2
+.equ RIVAL_STARTER_SPECIES, VAR_TEMP_3
+.equ RIVAL_STARTER_ID, VAR_TEMP_4
+
+.equ SHOWED_OAK_COMPLETE_DEX, FLAG_TEMP_2
+
PalletTown_ProfessorOaksLab_MapScripts:: @ 8168F7E
map_script MAP_SCRIPT_ON_TRANSITION, PalletTown_ProfessorOaksLab_OnTransition
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, PalletTown_ProfessorOaksLab_OnWarp
@@ -7,194 +22,194 @@ PalletTown_ProfessorOaksLab_MapScripts:: @ 8168F7E
PalletTown_ProfessorOaksLab_OnTransition:: @ 8168F8E
setflag FLAG_VISITED_OAKS_LAB
compare VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 1
- call_if_eq EventScript_168FC6
+ call_if_eq PalletTown_ProfessorOaksLab_EventScript_ReadyOakForStarterScene
compare VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 7
- call_if_eq EventScript_168FD5
+ call_if_eq PalletTown_ProfessorOaksLab_EventScript_ReadyOakForNationalDexScene
compare VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 8
- call_if_eq EventScript_168FC0
- call_if_set FLAG_GOT_POKEBALLS_FROM_OAK_AFTER_22_RIVAL, EventScript_168FBC
+ call_if_eq PalletTown_ProfessorOaksLab_EventScript_SetNationalDexSceneFinished
+ call_if_set FLAG_GOT_POKEBALLS_FROM_OAK_AFTER_22_RIVAL, PalletTown_ProfessorOaksLab_EventScript_SetSkipPokeBallCheck
end
-EventScript_168FBC:: @ 8168FBC
+PalletTown_ProfessorOaksLab_EventScript_SetSkipPokeBallCheck:: @ 8168FBC
setflag FLAG_OAK_SKIP_22_RIVAL_CHECK
return
-EventScript_168FC0:: @ 8168FC0
+PalletTown_ProfessorOaksLab_EventScript_SetNationalDexSceneFinished:: @ 8168FC0
setvar VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 9
return
-EventScript_168FC6:: @ 8168FC6
- setobjectxyperm 4, 6, 11
- setobjectmovementtype 4, 7
+PalletTown_ProfessorOaksLab_EventScript_ReadyOakForStarterScene:: @ 8168FC6
+ setobjectxyperm LOCALID_PROF_OAK, 6, 11
+ setobjectmovementtype LOCALID_PROF_OAK, MOVEMENT_TYPE_FACE_UP
savebgm MUS_OHKIDO
return
-EventScript_168FD5:: @ 8168FD5
- setobjectxyperm 4, 6, 11
- setobjectmovementtype 4, 7
+PalletTown_ProfessorOaksLab_EventScript_ReadyOakForNationalDexScene:: @ 8168FD5
+ setobjectxyperm LOCALID_PROF_OAK, 6, 11
+ setobjectmovementtype LOCALID_PROF_OAK, MOVEMENT_TYPE_FACE_UP
return
PalletTown_ProfessorOaksLab_OnWarp:: @ 8168FE1
- map_script_2 VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 1, EventScript_168FEB
+ map_script_2 VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 1, PalletTown_ProfessorOaksLab_EventScript_ReadyPlayerForStarterScene
.2byte 0
-EventScript_168FEB:: @ 8168FEB
+PalletTown_ProfessorOaksLab_EventScript_ReadyPlayerForStarterScene:: @ 8168FEB
turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH
end
PalletTown_ProfessorOaksLab_OnFrame:: @ 8168FF0
- map_script_2 VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 1, EventScript_16923E
- map_script_2 VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 7, EventScript_169002
+ map_script_2 VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 1, PalletTown_ProfessorOaksLab_ChooseStarterScene
+ map_script_2 VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 7, PalletTown_ProfessorOaksLab_EventScript_EnterForNationalDexScene
.2byte 0
-EventScript_169002:: @ 8169002
+PalletTown_ProfessorOaksLab_EventScript_EnterForNationalDexScene:: @ 8169002
lockall
setvar VAR_FACING, DIR_NORTH
textcolor 0
- applymovement 4, Movement_1692B0
+ applymovement LOCALID_PROF_OAK, PalletTown_ProfessorOaksLab_Movement_OakEnter
waitmovement 0
- removeobject 4
- setobjectxyperm 4, 6, 3
- setobjectmovementtype 4, 8
+ removeobject LOCALID_PROF_OAK
+ setobjectxyperm LOCALID_PROF_OAK, 6, 3
+ setobjectmovementtype LOCALID_PROF_OAK, MOVEMENT_TYPE_FACE_DOWN
clearflag FLAG_HIDE_OAK_IN_HIS_LAB
- applymovement OBJ_EVENT_ID_PLAYER, Movement_1692B7
+ applymovement OBJ_EVENT_ID_PLAYER, PalletTown_ProfessorOaksLab_Movement_PlayerEnter
waitmovement 0
- goto EventScript_169035
+ goto PalletTown_ProfessorOaksLab_EventScript_NationalDexScene
end
-EventScript_169035:: @ 8169035
- msgbox gUnknown_818EE60
+PalletTown_ProfessorOaksLab_EventScript_NationalDexScene:: @ 8169035
+ msgbox PalletTown_ProfessorOaksLab_Text_OakSightingsOfRareMons
closemessage
compare VAR_FACING, DIR_NORTH
- call_if_eq EventScript_169174
+ call_if_eq PalletTown_ProfessorOaksLab_EventScript_NationalDexSceneRivalEnterNorth
compare VAR_FACING, DIR_SOUTH
- call_if_eq EventScript_1691BB
+ call_if_eq PalletTown_ProfessorOaksLab_EventScript_NationalDexSceneRivalEnterSouth
compare VAR_FACING, DIR_EAST
- call_if_eq EventScript_169194
+ call_if_eq PalletTown_ProfessorOaksLab_EventScript_NationalDexSceneRivalEnterEastWest
compare VAR_FACING, DIR_WEST
- call_if_eq EventScript_169194
- msgbox gUnknown_818EF59
+ call_if_eq PalletTown_ProfessorOaksLab_EventScript_NationalDexSceneRivalEnterEastWest
+ msgbox PalletTown_ProfessorOaksLab_Text_RivalJustLetMeHandleEverything
fadedefaultbgm
- msgbox gUnknown_818F004
+ msgbox PalletTown_ProfessorOaksLab_Text_OakNeedYourHelpTooNeedToSeePokedexes
compare VAR_FACING, DIR_NORTH
- call_if_eq EventScript_1691DB
+ call_if_eq PalletTown_ProfessorOaksLab_EventScript_PlayerFaceOakNorth
compare VAR_FACING, DIR_WEST
- call_if_eq EventScript_1691E6
+ call_if_eq PalletTown_ProfessorOaksLab_EventScript_PlayerFaceOakWest
textcolor 3
- msgbox gUnknown_818F062
+ msgbox PalletTown_ProfessorOaksLab_Text_OakTookBothPokedexUnits
closemessage
call EventScript_1A6675
compare VAR_FACING, DIR_NORTH
- call_if_eq EventScript_1691F1
+ call_if_eq PalletTown_ProfessorOaksLab_EventScript_OakBringDexesToDeskNorth
compare VAR_FACING, DIR_SOUTH
- call_if_eq EventScript_1691FC
+ call_if_eq PalletTown_ProfessorOaksLab_EventScript_OakBringDexesToDeskSouth
compare VAR_FACING, DIR_EAST
- call_if_eq EventScript_169215
+ call_if_eq PalletTown_ProfessorOaksLab_EventScript_OakBringDexesToDeskEast
compare VAR_FACING, DIR_WEST
- call_if_eq EventScript_169227
- addobject 9
- addobject 10
+ call_if_eq PalletTown_ProfessorOaksLab_EventScript_OakBringDexesToDeskWest
+ addobject LOCALID_POKEDEX_1
+ addobject LOCALID_POKEDEX_2
delay 30
- msgbox gUnknown_818F085
+ msgbox PalletTown_ProfessorOaksLab_Text_OakNowTheseUnitsCanRecordMoreData
closemessage
- removeobject 9
- removeobject 10
+ removeobject LOCALID_POKEDEX_1
+ removeobject LOCALID_POKEDEX_2
delay 30
compare VAR_FACING, DIR_NORTH
- call_if_eq EventScript_169845
+ call_if_eq PalletTown_ProfessorOaksLab_EventScript_OakBringDexesOverNorth
compare VAR_FACING, DIR_SOUTH
- call_if_eq EventScript_169850
+ call_if_eq PalletTown_ProfessorOaksLab_EventScript_OakBringDexesOverSouth
compare VAR_FACING, DIR_EAST
- call_if_eq EventScript_16985B
+ call_if_eq PalletTown_ProfessorOaksLab_EventScript_OakBringDexesOverEast
compare VAR_FACING, DIR_WEST
- call_if_eq EventScript_16986D
+ call_if_eq PalletTown_ProfessorOaksLab_EventScript_OakBringDexesOverWest
textcolor 3
playfanfare MUS_FAN5
- message Text_18F0E8
+ message PalletTown_ProfessorOaksLab_Text_PlayersPokedexWasUpgraded
waitmessage
waitfanfare
call EventScript_1A6675
special EnableNationalPokedex
- msgbox gUnknown_818F103
- msgbox gUnknown_818F1DB
+ msgbox PalletTown_ProfessorOaksLab_Text_OakMustReallyWorkToFillPokedex
+ msgbox PalletTown_ProfessorOaksLab_Text_RivalIllCompleteThePokedex
closemessage
playbgm MUS_RIVAL2, 0
compare VAR_FACING, DIR_NORTH
- call_if_eq EventScript_169B69
+ call_if_eq PalletTown_ProfessorOaksLab_EventScript_RivalExitNorth
compare VAR_FACING, DIR_SOUTH
- call_if_eq EventScript_169B7B
+ call_if_eq PalletTown_ProfessorOaksLab_EventScript_RivalExit
compare VAR_FACING, DIR_EAST
- call_if_eq EventScript_169B7B
+ call_if_eq PalletTown_ProfessorOaksLab_EventScript_RivalExit
compare VAR_FACING, DIR_WEST
- call_if_eq EventScript_169B7B
- removeobject 8
+ call_if_eq PalletTown_ProfessorOaksLab_EventScript_RivalExit
+ removeobject LOCALID_RIVAL
fadedefaultbgm
setvar VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 8
releaseall
end
-EventScript_169174:: @ 8169174
- setobjectxyperm 8, 5, 10
- addobject 8
+PalletTown_ProfessorOaksLab_EventScript_NationalDexSceneRivalEnterNorth:: @ 8169174
+ setobjectxyperm LOCALID_RIVAL, 5, 10
+ addobject LOCALID_RIVAL
playbgm MUS_RIVAL1, 0
- applymovement OBJ_EVENT_ID_PLAYER, Movement_169B94
- applymovement 8, Movement_169B9D
+ applymovement OBJ_EVENT_ID_PLAYER, PalletTown_ProfessorOaksLab_Movement_WatchRivalEnterNorth
+ applymovement LOCALID_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalEnter
waitmovement 0
return
-EventScript_169194:: @ 8169194
- setobjectxyperm 8, 6, 10
- addobject 8
+PalletTown_ProfessorOaksLab_EventScript_NationalDexSceneRivalEnterEastWest:: @ 8169194
+ setobjectxyperm LOCALID_RIVAL, 6, 10
+ addobject LOCALID_RIVAL
playbgm MUS_RIVAL1, 0
- applymovement 4, Movement_WalkInPlaceFastestDown
- applymovement OBJ_EVENT_ID_PLAYER, Movement_169B91
- applymovement 8, Movement_169B9D
+ applymovement LOCALID_PROF_OAK, Movement_WalkInPlaceFastestDown
+ applymovement OBJ_EVENT_ID_PLAYER, PalletTown_ProfessorOaksLab_Movement_WatchRivalEnterEastWest
+ applymovement LOCALID_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalEnter
waitmovement 0
return
-EventScript_1691BB:: @ 81691BB
- setobjectxyperm 8, 6, 10
- addobject 8
+PalletTown_ProfessorOaksLab_EventScript_NationalDexSceneRivalEnterSouth:: @ 81691BB
+ setobjectxyperm LOCALID_RIVAL, 6, 10
+ addobject LOCALID_RIVAL
playbgm MUS_RIVAL1, 0
- applymovement 4, Movement_WalkInPlaceFastestDown
- applymovement 8, Movement_169B9D
+ applymovement LOCALID_PROF_OAK, Movement_WalkInPlaceFastestDown
+ applymovement LOCALID_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalEnter
waitmovement 0
return
-EventScript_1691DB:: @ 81691DB
+PalletTown_ProfessorOaksLab_EventScript_PlayerFaceOakNorth:: @ 81691DB
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp
waitmovement 0
return
-EventScript_1691E6:: @ 81691E6
+PalletTown_ProfessorOaksLab_EventScript_PlayerFaceOakWest:: @ 81691E6
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestLeft
waitmovement 0
return
-EventScript_1691F1:: @ 81691F1
- applymovement 4, Movement_169232
+PalletTown_ProfessorOaksLab_EventScript_OakBringDexesToDeskNorth:: @ 81691F1
+ applymovement LOCALID_PROF_OAK, PalletTown_ProfessorOaksLab_Movement_OakBringDexesToDesk
waitmovement 0
return
-EventScript_1691FC:: @ 81691FC
- applymovement 4, Movement_169238
- applymovement OBJ_EVENT_ID_PLAYER, Movement_1698C7
- applymovement 8, Movement_1698C7
- waitmovement 4
+PalletTown_ProfessorOaksLab_EventScript_OakBringDexesToDeskSouth:: @ 81691FC
+ applymovement LOCALID_PROF_OAK, PalletTown_ProfessorOaksLab_Movement_OakBringDexesToDeskSouth
+ applymovement OBJ_EVENT_ID_PLAYER, PalletTown_ProfessorOaksLab_Movement_WatchOakWalkToDesk
+ applymovement LOCALID_RIVAL, PalletTown_ProfessorOaksLab_Movement_WatchOakWalkToDesk
+ waitmovement LOCALID_PROF_OAK
return
-EventScript_169215:: @ 8169215
- applymovement 4, Movement_169232
- applymovement OBJ_EVENT_ID_PLAYER, Movement_1698C3
- waitmovement 4
+PalletTown_ProfessorOaksLab_EventScript_OakBringDexesToDeskEast:: @ 8169215
+ applymovement LOCALID_PROF_OAK, PalletTown_ProfessorOaksLab_Movement_OakBringDexesToDesk
+ applymovement OBJ_EVENT_ID_PLAYER, PalletTown_ProfessorOaksLab_Movement_WatchOakWalkToDeskEast
+ waitmovement LOCALID_PROF_OAK
return
-EventScript_169227:: @ 8169227
- applymovement 4, Movement_169232
+PalletTown_ProfessorOaksLab_EventScript_OakBringDexesToDeskWest:: @ 8169227
+ applymovement LOCALID_PROF_OAK, PalletTown_ProfessorOaksLab_Movement_OakBringDexesToDesk
waitmovement 0
return
-Movement_169232:: @ 8169232
+PalletTown_ProfessorOaksLab_Movement_OakBringDexesToDesk:: @ 8169232
walk_up
walk_left
walk_in_place_fastest_up
@@ -202,7 +217,7 @@ Movement_169232:: @ 8169232
delay_4
step_end
-Movement_169238:: @ 8169238
+PalletTown_ProfessorOaksLab_Movement_OakBringDexesToDeskSouth:: @ 8169238
walk_left
walk_left
walk_up
@@ -210,37 +225,37 @@ Movement_169238:: @ 8169238
delay_4
step_end
-EventScript_16923E:: @ 816923E
+PalletTown_ProfessorOaksLab_ChooseStarterScene:: @ 816923E
lockall
textcolor 0
- applymovement 4, Movement_1692B0
+ applymovement LOCALID_PROF_OAK, PalletTown_ProfessorOaksLab_Movement_OakEnter
waitmovement 0
- removeobject 4
- setobjectxyperm 4, 6, 3
- setobjectmovementtype 4, 8
+ removeobject LOCALID_PROF_OAK
+ setobjectxyperm LOCALID_PROF_OAK, 6, 3
+ setobjectmovementtype LOCALID_PROF_OAK, MOVEMENT_TYPE_FACE_DOWN
clearflag FLAG_HIDE_OAK_IN_HIS_LAB
- applymovement OBJ_EVENT_ID_PLAYER, Movement_1692B7
+ applymovement OBJ_EVENT_ID_PLAYER, PalletTown_ProfessorOaksLab_Movement_PlayerEnter
waitmovement 0
- applymovement 8, Movement_WalkInPlaceFastestUp
+ applymovement LOCALID_RIVAL, Movement_WalkInPlaceFastestUp
waitmovement 0
clearflag FLAG_SPECIAL_FLAG_0x4001
savebgm SE_STOP
fadedefaultbgm
- msgbox gUnknown_818DC94
+ msgbox PalletTown_ProfessorOaksLab_Text_RivalFedUpWithWaiting
closemessage
delay 60
- msgbox gUnknown_818DFBC
+ msgbox PalletTown_ProfessorOaksLab_Text_OakThreeMonsChooseOne
closemessage
delay 30
- applymovement 8, Movement_1692C0
+ applymovement LOCALID_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalReact
waitmovement 0
- msgbox gUnknown_818DCB9
- msgbox gUnknown_818E0EA
+ msgbox PalletTown_ProfessorOaksLab_Text_RivalNoFairWhatAboutMe
+ msgbox PalletTown_ProfessorOaksLab_Text_OakBePatientRival
setvar VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 2
releaseall
end
-Movement_1692B0:: @ 81692B0
+PalletTown_ProfessorOaksLab_Movement_OakEnter:: @ 81692B0
walk_up
walk_up
walk_up
@@ -249,7 +264,7 @@ Movement_1692B0:: @ 81692B0
walk_up
step_end
-Movement_1692B7:: @ 81692B7
+PalletTown_ProfessorOaksLab_Movement_PlayerEnter:: @ 81692B7
walk_up
walk_up
walk_up
@@ -260,97 +275,101 @@ Movement_1692B7:: @ 81692B7
walk_up
step_end
-Movement_1692C0:: @ 81692C0
+PalletTown_ProfessorOaksLab_Movement_RivalReact:: @ 81692C0
walk_in_place_up
walk_in_place_up
step_end
-PalletTown_ProfessorOaksLab_EventScript_1692C3:: @ 81692C3
+PalletTown_ProfessorOaksLab_EventScript_LeaveStarterSceneTrigger:: @ 81692C3
lockall
textcolor 0
- applymovement 4, Movement_FaceDown
+ applymovement LOCALID_PROF_OAK, Movement_FaceDown
waitmovement 0
- msgbox gUnknown_818E177
+ msgbox PalletTown_ProfessorOaksLab_Text_OakHeyDontGoAwayYet
closemessage
- applymovement OBJ_EVENT_ID_PLAYER, Movement_1692E5
+ applymovement OBJ_EVENT_ID_PLAYER, PalletTown_ProfessorOaksLab_Movement_PlayerWalkUp
waitmovement 0
releaseall
end
-Movement_1692E5:: @ 81692E5
+PalletTown_ProfessorOaksLab_Movement_PlayerWalkUp:: @ 81692E5
walk_up
step_end
-PalletTown_ProfessorOaksLab_EventScript_1692E7:: @ 81692E7
+PalletTown_ProfessorOaksLab_EventScript_RivalBattleTriggerLeft:: @ 81692E7
lockall
setvar VAR_TEMP_2, 1
- goto EventScript_16930B
+ goto PalletTown_ProfessorOaksLab_EventScript_RivalBattle
end
-PalletTown_ProfessorOaksLab_EventScript_1692F3:: @ 81692F3
+PalletTown_ProfessorOaksLab_EventScript_RivalBattleTriggerMid:: @ 81692F3
lockall
setvar VAR_TEMP_2, 2
- goto EventScript_16930B
+ goto PalletTown_ProfessorOaksLab_EventScript_RivalBattle
end
-PalletTown_ProfessorOaksLab_EventScript_1692FF:: @ 81692FF
+PalletTown_ProfessorOaksLab_EventScript_RivalBattleTriggerRight:: @ 81692FF
lockall
setvar VAR_TEMP_2, 3
- goto EventScript_16930B
+ goto PalletTown_ProfessorOaksLab_EventScript_RivalBattle
end
-EventScript_16930B:: @ 816930B
+PalletTown_ProfessorOaksLab_EventScript_RivalBattle:: @ 816930B
textcolor 0
playbgm MUS_RIVAL1, 0
- applymovement 8, Movement_WalkInPlaceFastestDown
+ applymovement LOCALID_RIVAL, Movement_WalkInPlaceFastestDown
waitmovement 0
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp
waitmovement 0
- msgbox gUnknown_818DDA4
+ msgbox PalletTown_ProfessorOaksLab_Text_RivalLetsCheckOutMons
closemessage
- applymovement 4, Movement_FaceDown
+ applymovement LOCALID_PROF_OAK, Movement_FaceDown
waitmovement 0
compare VAR_STARTER_MON, 0
- goto_if_eq EventScript_1693D2
+ goto_if_eq PalletTown_ProfessorOaksLab_EventScript_RivalApproachForBattleCharmander
compare VAR_STARTER_MON, 1
- goto_if_eq EventScript_16944D
+ goto_if_eq PalletTown_ProfessorOaksLab_EventScript_RivalApproachForBattleBulbasaur
compare VAR_STARTER_MON, 2
- goto_if_eq EventScript_16935A
+ goto_if_eq PalletTown_ProfessorOaksLab_EventScript_RivalApproachForBattleSquirtle
end
-EventScript_16935A:: @ 816935A
+@ The scripts for the rival approaching the player for battle are a bit bloated because
+@ both the player and rival can be in 3 different positions, so theres 9 different approaches
+@ NOTE: Names below refer to the Rival's mon (e.g. for RivalBattleSquirtle, player has Charmander)
+
+PalletTown_ProfessorOaksLab_EventScript_RivalApproachForBattleSquirtle:: @ 816935A
compare VAR_TEMP_2, 1
- goto_if_eq EventScript_16937C
+ goto_if_eq PalletTown_ProfessorOaksLab_EventScript_RivalApproachForBattleSquirtleLeft
compare VAR_TEMP_2, 2
- goto_if_eq EventScript_16938C
+ goto_if_eq PalletTown_ProfessorOaksLab_EventScript_RivalApproachForBattleSquirtleMid
compare VAR_TEMP_2, 3
- goto_if_eq EventScript_16939C
+ goto_if_eq PalletTown_ProfessorOaksLab_EventScript_RivalApproachForBattleSquirtleRight
end
-EventScript_16937C:: @ 816937C
- applymovement 8, Movement_1693C0
+PalletTown_ProfessorOaksLab_EventScript_RivalApproachForBattleSquirtleLeft:: @ 816937C
+ applymovement LOCALID_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalApproachForBattleSquirtleLeft
waitmovement 0
- goto EventScript_1693AC
+ goto PalletTown_ProfessorOaksLab_EventScript_RivalBattleSquirtle
end
-EventScript_16938C:: @ 816938C
- applymovement 8, Movement_1693C7
+PalletTown_ProfessorOaksLab_EventScript_RivalApproachForBattleSquirtleMid:: @ 816938C
+ applymovement LOCALID_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalApproachForBattleSquirtleMid
waitmovement 0
- goto EventScript_1693AC
+ goto PalletTown_ProfessorOaksLab_EventScript_RivalBattleSquirtle
end
-EventScript_16939C:: @ 816939C
- applymovement 8, Movement_1693CD
+PalletTown_ProfessorOaksLab_EventScript_RivalApproachForBattleSquirtleRight:: @ 816939C
+ applymovement LOCALID_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalApproachForBattleSquirtleRight
waitmovement 0
- goto EventScript_1693AC
+ goto PalletTown_ProfessorOaksLab_EventScript_RivalBattleSquirtle
end
-EventScript_1693AC:: @ 81693AC
- trainerbattle_earlyrival TRAINER_RIVAL_OAKS_LAB_SQUIRTLE, RIVAL_BATTLE_TUTORIAL, Text_18DDEA, Text_RivalVictory
- goto EventScript_1694C2
+PalletTown_ProfessorOaksLab_EventScript_RivalBattleSquirtle:: @ 81693AC
+ trainerbattle_earlyrival TRAINER_RIVAL_OAKS_LAB_SQUIRTLE, RIVAL_BATTLE_TUTORIAL, PalletTown_ProfessorOaksLab_Text_RivalDefeat, Text_RivalVictory
+ goto PalletTown_ProfessorOaksLab_EventScript_EndRivalBattle
end
-Movement_1693C0:: @ 81693C0
+PalletTown_ProfessorOaksLab_Movement_RivalApproachForBattleSquirtleLeft:: @ 81693C0
walk_left
walk_left
walk_left
@@ -359,7 +378,7 @@ Movement_1693C0:: @ 81693C0
walk_down
step_end
-Movement_1693C7:: @ 81693C7
+PalletTown_ProfessorOaksLab_Movement_RivalApproachForBattleSquirtleMid:: @ 81693C7
walk_left
walk_left
walk_left
@@ -367,46 +386,46 @@ Movement_1693C7:: @ 81693C7
walk_down
step_end
-Movement_1693CD:: @ 81693CD
+PalletTown_ProfessorOaksLab_Movement_RivalApproachForBattleSquirtleRight:: @ 81693CD
walk_left
walk_left
walk_down
walk_down
step_end
-EventScript_1693D2:: @ 81693D2
+PalletTown_ProfessorOaksLab_EventScript_RivalApproachForBattleCharmander:: @ 81693D2
compare VAR_TEMP_2, 1
- goto_if_eq EventScript_1693F4
+ goto_if_eq PalletTown_ProfessorOaksLab_EventScript_RivalApproachForBattleCharmanderLeft
compare VAR_TEMP_2, 2
- goto_if_eq EventScript_169404
+ goto_if_eq PalletTown_ProfessorOaksLab_EventScript_RivalApproachForBattleCharmanderMid
compare VAR_TEMP_2, 3
- goto_if_eq EventScript_169414
+ goto_if_eq PalletTown_ProfessorOaksLab_EventScript_RivalApproachForBattleCharmanderRight
end
-EventScript_1693F4:: @ 81693F4
- applymovement 8, Movement_169438
+PalletTown_ProfessorOaksLab_EventScript_RivalApproachForBattleCharmanderLeft:: @ 81693F4
+ applymovement LOCALID_RIVAL, PalletTown_ProfessorOaksLab_Movement_ApproachForBattleCharmanderLeft
waitmovement 0
- goto EventScript_169424
+ goto PalletTown_ProfessorOaksLab_EventScript_RivalBattleCharmander
end
-EventScript_169404:: @ 8169404
- applymovement 8, Movement_169440
+PalletTown_ProfessorOaksLab_EventScript_RivalApproachForBattleCharmanderMid:: @ 8169404
+ applymovement LOCALID_RIVAL, PalletTown_ProfessorOaksLab_Movement_ApproachForBattleCharmanderMid
waitmovement 0
- goto EventScript_169424
+ goto PalletTown_ProfessorOaksLab_EventScript_RivalBattleCharmander
end
-EventScript_169414:: @ 8169414
- applymovement 8, Movement_169447
+PalletTown_ProfessorOaksLab_EventScript_RivalApproachForBattleCharmanderRight:: @ 8169414
+ applymovement LOCALID_RIVAL, PalletTown_ProfessorOaksLab_Movement_ApproachForBattleCharmanderRight
waitmovement 0
- goto EventScript_169424
+ goto PalletTown_ProfessorOaksLab_EventScript_RivalBattleCharmander
end
-EventScript_169424:: @ 8169424
- trainerbattle_earlyrival TRAINER_RIVAL_OAKS_LAB_CHARMANDER, RIVAL_BATTLE_TUTORIAL, Text_18DDEA, Text_RivalVictory
- goto EventScript_1694C2
+PalletTown_ProfessorOaksLab_EventScript_RivalBattleCharmander:: @ 8169424
+ trainerbattle_earlyrival TRAINER_RIVAL_OAKS_LAB_CHARMANDER, RIVAL_BATTLE_TUTORIAL, PalletTown_ProfessorOaksLab_Text_RivalDefeat, Text_RivalVictory
+ goto PalletTown_ProfessorOaksLab_EventScript_EndRivalBattle
end
-Movement_169438:: @ 8169438
+PalletTown_ProfessorOaksLab_Movement_ApproachForBattleCharmanderLeft:: @ 8169438
walk_left
walk_left
walk_left
@@ -416,7 +435,7 @@ Movement_169438:: @ 8169438
walk_down
step_end
-Movement_169440:: @ 8169440
+PalletTown_ProfessorOaksLab_Movement_ApproachForBattleCharmanderMid:: @ 8169440
walk_left
walk_left
walk_left
@@ -425,7 +444,7 @@ Movement_169440:: @ 8169440
walk_down
step_end
-Movement_169447:: @ 8169447
+PalletTown_ProfessorOaksLab_Movement_ApproachForBattleCharmanderRight:: @ 8169447
walk_left
walk_left
walk_left
@@ -433,39 +452,39 @@ Movement_169447:: @ 8169447
walk_down
step_end
-EventScript_16944D:: @ 816944D
+PalletTown_ProfessorOaksLab_EventScript_RivalApproachForBattleBulbasaur:: @ 816944D
compare VAR_TEMP_2, 1
- goto_if_eq EventScript_16946F
+ goto_if_eq PalletTown_ProfessorOaksLab_EventScript_RivalApproachForBattleBulbasaurLeft
compare VAR_TEMP_2, 2
- goto_if_eq EventScript_16947F
+ goto_if_eq PalletTown_ProfessorOaksLab_EventScript_RivalApproachForBattleBulbasaurMid
compare VAR_TEMP_2, 3
- goto_if_eq EventScript_16948F
+ goto_if_eq PalletTown_ProfessorOaksLab_EventScript_RivalApproachForBattleBulbasaurRight
end
-EventScript_16946F:: @ 816946F
- applymovement 8, Movement_1694B3
+PalletTown_ProfessorOaksLab_EventScript_RivalApproachForBattleBulbasaurLeft:: @ 816946F
+ applymovement LOCALID_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalApproachForBattleBulbasaurLeft
waitmovement 0
- goto EventScript_16949F
+ goto PalletTown_ProfessorOaksLab_EventScript_RivalBattleBulbasaur
end
-EventScript_16947F:: @ 816947F
- applymovement 8, Movement_1694B9
+PalletTown_ProfessorOaksLab_EventScript_RivalApproachForBattleBulbasaurMid:: @ 816947F
+ applymovement LOCALID_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalApproachForBattleBulbasaurMid
waitmovement 0
- goto EventScript_16949F
+ goto PalletTown_ProfessorOaksLab_EventScript_RivalBattleBulbasaur
end
-EventScript_16948F:: @ 816948F
- applymovement 8, Movement_1694BE
+PalletTown_ProfessorOaksLab_EventScript_RivalApproachForBattleBulbasaurRight:: @ 816948F
+ applymovement LOCALID_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalApproachForBattleBulbasaurRight
waitmovement 0
- goto EventScript_16949F
+ goto PalletTown_ProfessorOaksLab_EventScript_RivalBattleBulbasaur
end
-EventScript_16949F:: @ 816949F
- trainerbattle_earlyrival TRAINER_RIVAL_OAKS_LAB_BULBASAUR, RIVAL_BATTLE_TUTORIAL, Text_18DDEA, Text_RivalVictory
- goto EventScript_1694C2
+PalletTown_ProfessorOaksLab_EventScript_RivalBattleBulbasaur:: @ 816949F
+ trainerbattle_earlyrival TRAINER_RIVAL_OAKS_LAB_BULBASAUR, RIVAL_BATTLE_TUTORIAL, PalletTown_ProfessorOaksLab_Text_RivalDefeat, Text_RivalVictory
+ goto PalletTown_ProfessorOaksLab_EventScript_EndRivalBattle
end
-Movement_1694B3:: @ 81694B3
+PalletTown_ProfessorOaksLab_Movement_RivalApproachForBattleBulbasaurLeft:: @ 81694B3
walk_left
walk_left
walk_left
@@ -473,31 +492,31 @@ Movement_1694B3:: @ 81694B3
walk_down
step_end
-Movement_1694B9:: @ 81694B9
+PalletTown_ProfessorOaksLab_Movement_RivalApproachForBattleBulbasaurMid:: @ 81694B9
walk_left
walk_left
walk_down
walk_down
step_end
-Movement_1694BE:: @ 81694BE
+PalletTown_ProfessorOaksLab_Movement_RivalApproachForBattleBulbasaurRight:: @ 81694BE
walk_left
walk_down
walk_down
step_end
-EventScript_1694C2:: @ 81694C2
+PalletTown_ProfessorOaksLab_EventScript_EndRivalBattle:: @ 81694C2
special HealPlayerParty
- msgbox gUnknown_818DE38
+ msgbox PalletTown_ProfessorOaksLab_Text_RivalGoToughenMyMon
closemessage
playbgm MUS_RIVAL2, 0
compare VAR_TEMP_2, 1
- call_if_eq EventScript_169504
+ call_if_eq PalletTown_ProfessorOaksLab_EventScript_RivalExitAfterBattleLeft
compare VAR_TEMP_2, 2
- call_if_eq EventScript_169516
+ call_if_eq PalletTown_ProfessorOaksLab_EventScript_RivalExitAfterBattleMid
compare VAR_TEMP_2, 3
- call_if_eq EventScript_169528
- removeobject 8
+ call_if_eq PalletTown_ProfessorOaksLab_EventScript_RivalExitAfterBattleRight
+ removeobject LOCALID_RIVAL
playse SE_KAIDAN
fadedefaultbgm
setvar VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 4
@@ -505,25 +524,25 @@ EventScript_1694C2:: @ 81694C2
releaseall
end
-EventScript_169504:: @ 8169504
- applymovement 8, Movement_16953A
- applymovement OBJ_EVENT_ID_PLAYER, Movement_169553
- waitmovement 8
+PalletTown_ProfessorOaksLab_EventScript_RivalExitAfterBattleLeft:: @ 8169504
+ applymovement LOCALID_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalExitAfterBattleLeft
+ applymovement OBJ_EVENT_ID_PLAYER, PalletTown_ProfessorOaksLab_Movement_PlayerWatchRivalExitAfterBattle
+ waitmovement LOCALID_RIVAL
return
-EventScript_169516:: @ 8169516
- applymovement 8, Movement_16954A
- applymovement OBJ_EVENT_ID_PLAYER, Movement_169553
- waitmovement 8
+PalletTown_ProfessorOaksLab_EventScript_RivalExitAfterBattleMid:: @ 8169516
+ applymovement LOCALID_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalExitAfterBattleMid
+ applymovement OBJ_EVENT_ID_PLAYER, PalletTown_ProfessorOaksLab_Movement_PlayerWatchRivalExitAfterBattle
+ waitmovement LOCALID_RIVAL
return
-EventScript_169528:: @ 8169528
- applymovement 8, Movement_169542
- applymovement OBJ_EVENT_ID_PLAYER, Movement_169559
- waitmovement 8
+PalletTown_ProfessorOaksLab_EventScript_RivalExitAfterBattleRight:: @ 8169528
+ applymovement LOCALID_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalExitAfterBattleRight
+ applymovement OBJ_EVENT_ID_PLAYER, PalletTown_ProfessorOaksLab_Movement_PlayerWatchRivalExitAfterBattleRight
+ waitmovement LOCALID_RIVAL
return
-Movement_16953A:: @ 816953A
+PalletTown_ProfessorOaksLab_Movement_RivalExitAfterBattleLeft:: @ 816953A
walk_right
walk_down
walk_down
@@ -533,7 +552,7 @@ Movement_16953A:: @ 816953A
delay_8
step_end
-Movement_169542:: @ 8169542
+PalletTown_ProfessorOaksLab_Movement_RivalExitAfterBattleRight:: @ 8169542
walk_left
walk_down
walk_down
@@ -543,7 +562,7 @@ Movement_169542:: @ 8169542
delay_8
step_end
-Movement_16954A:: @ 816954A
+PalletTown_ProfessorOaksLab_Movement_RivalExitAfterBattleMid:: @ 816954A
walk_right
walk_down
walk_down
@@ -554,7 +573,7 @@ Movement_16954A:: @ 816954A
delay_8
step_end
-Movement_169553:: @ 8169553
+PalletTown_ProfessorOaksLab_Movement_PlayerWatchRivalExitAfterBattle:: @ 8169553
delay_16
delay_8
walk_in_place_fastest_right
@@ -562,7 +581,7 @@ Movement_169553:: @ 8169553
walk_in_place_fastest_down
step_end
-Movement_169559:: @ 8169559
+PalletTown_ProfessorOaksLab_Movement_PlayerWatchRivalExitAfterBattleRight:: @ 8169559
delay_16
delay_8
walk_in_place_fastest_left
@@ -570,168 +589,168 @@ Movement_169559:: @ 8169559
walk_in_place_fastest_down
step_end
-PalletTown_ProfessorOaksLab_EventScript_16955F:: @ 816955F
+PalletTown_ProfessorOaksLab_EventScript_Rival:: @ 816955F
lock
faceplayer
compare VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 3
- goto_if_eq EventScript_16958B
+ goto_if_eq PalletTown_ProfessorOaksLab_EventScript_RivalChoseStarter
compare VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 2
- goto_if_eq EventScript_169581
- msgbox gUnknown_818DC67
+ goto_if_eq PalletTown_ProfessorOaksLab_EventScript_RivalWaitingForStarter
+ msgbox PalletTown_ProfessorOaksLab_Text_RivalGrampsIsntAround
release
end
-EventScript_169581:: @ 8169581
- msgbox gUnknown_818DCE2
+PalletTown_ProfessorOaksLab_EventScript_RivalWaitingForStarter:: @ 8169581
+ msgbox PalletTown_ProfessorOaksLab_Text_RivalGoChoosePlayer
release
end
-EventScript_16958B:: @ 816958B
- msgbox gUnknown_818DD75
+PalletTown_ProfessorOaksLab_EventScript_RivalChoseStarter:: @ 816958B
+ msgbox PalletTown_ProfessorOaksLab_Text_RivalMyMonLooksTougher
release
end
-PalletTown_ProfessorOaksLab_EventScript_169595:: @ 8169595
+PalletTown_ProfessorOaksLab_EventScript_ProfOak:: @ 8169595
lock
faceplayer
- goto_if_set FLAG_TEMP_2, EventScript_169600
+ goto_if_set SHOWED_OAK_COMPLETE_DEX, PalletTown_ProfessorOaksLab_EventScript_OakJustShownCompleteDex
compare VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 9
- goto_if_eq EventScript_169903
+ goto_if_eq PalletTown_ProfessorOaksLab_EventScript_RatePokedex
compare VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 8
- goto_if_eq EventScript_169A6E
- goto_if_set FLAG_SYS_GAME_CLEAR, EventScript_1699CE
+ goto_if_eq PalletTown_ProfessorOaksLab_EventScript_MonsAroundWorldWait
+ goto_if_set FLAG_SYS_GAME_CLEAR, PalletTown_ProfessorOaksLab_EventScript_TryStartNationalDexScene
compare VAR_MAP_SCENE_CERULEAN_CITY_RIVAL, 1
- goto_if_eq EventScript_169903
+ goto_if_eq PalletTown_ProfessorOaksLab_EventScript_RatePokedex
compare VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 6
- goto_if_eq EventScript_1698D6
+ goto_if_eq PalletTown_ProfessorOaksLab_EventScript_RatePokedexOrTryGiveBalls
compare VAR_MAP_SCENE_VIRIDIAN_CITY_MART, 1
- goto_if_ge EventScript_16961E
+ goto_if_ge PalletTown_ProfessorOaksLab_EventScript_ReceiveDexScene
compare VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 4
- goto_if_eq EventScript_169614
+ goto_if_eq PalletTown_ProfessorOaksLab_EventScript_OakBattleMonForItToGrow
compare VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 3
- goto_if_eq EventScript_16960A
- msgbox gUnknown_818E116
+ goto_if_eq PalletTown_ProfessorOaksLab_EventScript_OakCanReachNextTownWithMon
+ msgbox PalletTown_ProfessorOaksLab_Text_OakWhichOneWillYouChoose
release
end
-EventScript_169600:: @ 8169600
- msgbox gUnknown_81A72AD
+PalletTown_ProfessorOaksLab_EventScript_OakJustShownCompleteDex:: @ 8169600
+ msgbox PokedexRating_Text_ThankYouMadeDreamReality
release
end
-EventScript_16960A:: @ 816960A
- msgbox gUnknown_818E330
+PalletTown_ProfessorOaksLab_EventScript_OakCanReachNextTownWithMon:: @ 816960A
+ msgbox PalletTown_ProfessorOaksLab_Text_OakCanReachNextTownWithMon
release
end
-EventScript_169614:: @ 8169614
- msgbox gUnknown_818E3AD
+PalletTown_ProfessorOaksLab_EventScript_OakBattleMonForItToGrow:: @ 8169614
+ msgbox PalletTown_ProfessorOaksLab_Text_OakBattleMonForItToGrow
release
end
-EventScript_16961E:: @ 816961E
- msgbox gUnknown_818E405
+PalletTown_ProfessorOaksLab_EventScript_ReceiveDexScene:: @ 816961E
+ msgbox PalletTown_ProfessorOaksLab_Text_OakHaveSomethingForMe
textcolor 3
playfanfare MUS_ME_WAZA
- message Text_18E4AF
+ message PalletTown_ProfessorOaksLab_Text_DeliveredOaksParcel
waitmessage
waitfanfare
call EventScript_1A6675
removeitem ITEM_OAKS_PARCEL, 1
- msgbox gUnknown_818E4CA
+ msgbox PalletTown_ProfessorOaksLab_Text_OakCustomBallIOrdered
playbgm MUS_RIVAL1, 0
- msgbox gUnknown_818DE8D
+ msgbox PalletTown_ProfessorOaksLab_Text_RivalGramps
closemessage
compare VAR_FACING, DIR_NORTH
- call_if_eq EventScript_169A82
+ call_if_eq PalletTown_ProfessorOaksLab_EventScript_DexSceneRivalEnterNorth
compare VAR_FACING, DIR_SOUTH
- call_if_eq EventScript_169AC1
+ call_if_eq PalletTown_ProfessorOaksLab_EventScript_DexSceneRivalEnterSouth
compare VAR_FACING, DIR_EAST
- call_if_eq EventScript_169A9E
+ call_if_eq PalletTown_ProfessorOaksLab_EventScript_DexSceneRivalEnterEastWest
compare VAR_FACING, DIR_WEST
- call_if_eq EventScript_169A9E
+ call_if_eq PalletTown_ProfessorOaksLab_EventScript_DexSceneRivalEnterEastWest
fadedefaultbgm
- msgbox gUnknown_818DE99
+ msgbox PalletTown_ProfessorOaksLab_Text_RivalWhatDidYouCallMeFor
closemessage
delay 30
playse SE_PIN
- applymovement 4, Movement_ExclamationMark
+ applymovement LOCALID_PROF_OAK, Movement_ExclamationMark
waitmovement 0
- applymovement 4, Movement_Delay48
+ applymovement LOCALID_PROF_OAK, Movement_Delay48
waitmovement 0
compare VAR_FACING, DIR_SOUTH
- call_if_eq EventScript_169ADD
+ call_if_eq PalletTown_ProfessorOaksLab_EventScript_DexSceneOakFacePlayerAndRivalSouth
compare VAR_FACING, DIR_EAST
- call_if_eq EventScript_169B14
+ call_if_eq PalletTown_ProfessorOaksLab_EventScript_DexSceneOakFacePlayerAndRivalEast
compare VAR_FACING, DIR_WEST
- call_if_eq EventScript_169AF5
+ call_if_eq PalletTown_ProfessorOaksLab_EventScript_DexSceneOakFacePlayerAndRivalWest
compare VAR_FACING, DIR_NORTH
- call_if_eq EventScript_169B86
- msgbox gUnknown_818E508
+ call_if_eq PalletTown_ProfessorOaksLab_EventScript_DexSceneOakFacePlayerAndRivalNorth
+ msgbox PalletTown_ProfessorOaksLab_Text_OakHaveRequestForYouTwo
closemessage
compare VAR_FACING, DIR_NORTH
- call_if_eq EventScript_169882
+ call_if_eq PalletTown_ProfessorOaksLab_EventScript_DexSceneOakWalkToDeskNorth
compare VAR_FACING, DIR_SOUTH
- call_if_eq EventScript_16988D
+ call_if_eq PalletTown_ProfessorOaksLab_EventScript_DexSceneOakWalkToDeskSouth
compare VAR_FACING, DIR_EAST
- call_if_eq EventScript_1698A6
+ call_if_eq PalletTown_ProfessorOaksLab_EventScript_DexSceneOakWalkToDeskEast
compare VAR_FACING, DIR_WEST
- call_if_eq EventScript_1698B8
- msgbox gUnknown_818E536
+ call_if_eq PalletTown_ProfessorOaksLab_EventScript_DexSceneOakWalkToDeskWest
+ msgbox PalletTown_ProfessorOaksLab_Text_OakPokedexOnDesk
closemessage
delay 40
- msgbox gUnknown_818E5C5
+ msgbox PalletTown_ProfessorOaksLab_Text_OakTakeTheseWithYou
closemessage
- applymovement 4, Movement_WalkInPlaceFastestUp
+ applymovement LOCALID_PROF_OAK, Movement_WalkInPlaceFastestUp
waitmovement 0
- removeobject 9
+ removeobject LOCALID_POKEDEX_1
delay 10
- removeobject 10
+ removeobject LOCALID_POKEDEX_2
delay 25
compare VAR_FACING, DIR_NORTH
- call_if_eq EventScript_169845
+ call_if_eq PalletTown_ProfessorOaksLab_EventScript_OakBringDexesOverNorth
compare VAR_FACING, DIR_SOUTH
- call_if_eq EventScript_169850
+ call_if_eq PalletTown_ProfessorOaksLab_EventScript_OakBringDexesOverSouth
compare VAR_FACING, DIR_EAST
- call_if_eq EventScript_16985B
+ call_if_eq PalletTown_ProfessorOaksLab_EventScript_OakBringDexesOverEast
compare VAR_FACING, DIR_WEST
- call_if_eq EventScript_16986D
+ call_if_eq PalletTown_ProfessorOaksLab_EventScript_OakBringDexesOverWest
delay 10
textcolor 3
playfanfare MUS_FAN5
- message Text_18E5EA
+ message PalletTown_ProfessorOaksLab_Text_ReceivedPokedexFromOak
waitmessage
waitfanfare
call EventScript_1A6675
setflag FLAG_SYS_POKEDEX_GET
special sub_810B810
setvar VAR_MAP_SCENE_POKEMON_CENTER_TEALA, 1
- msgbox gUnknown_818E612
- giveitem_msg gUnknown_818E6B3, ITEM_POKE_BALL, 5
- msgbox gUnknown_818E6D0
+ msgbox PalletTown_ProfessorOaksLab_Text_OakCatchMonsForDataTakeThese
+ giveitem_msg PalletTown_ProfessorOaksLab_Text_ReceivedFivePokeBalls, ITEM_POKE_BALL, 5
+ msgbox PalletTown_ProfessorOaksLab_Text_OakExplainCatching
famechecker FAMECHECKER_OAK, 1
- msgbox gUnknown_818E784
- msgbox gUnknown_818DEC8
+ msgbox PalletTown_ProfessorOaksLab_Text_OakCompleteMonGuideWasMyDream
+ msgbox PalletTown_ProfessorOaksLab_Text_RivalLeaveItToMeGramps
compare VAR_FACING, DIR_NORTH
- call_if_eq EventScript_169B33
+ call_if_eq PalletTown_ProfessorOaksLab_EventScript_DexSceneRivalFacePlayerNorth
compare VAR_FACING, DIR_SOUTH
- call_if_eq EventScript_169B45
+ call_if_eq PalletTown_ProfessorOaksLab_EventScript_DexSceneRivalFacePlayerSouth
compare VAR_FACING, DIR_EAST
- call_if_eq EventScript_169B57
+ call_if_eq PalletTown_ProfessorOaksLab_EventScript_DexSceneRivalFacePlayerEastWest
compare VAR_FACING, DIR_WEST
- call_if_eq EventScript_169B57
- msgbox gUnknown_818DEF3
+ call_if_eq PalletTown_ProfessorOaksLab_EventScript_DexSceneRivalFacePlayerEastWest
+ msgbox PalletTown_ProfessorOaksLab_Text_RivalTellSisNotToGiveYouMap
closemessage
playbgm MUS_RIVAL2, 0
compare VAR_FACING, DIR_NORTH
- call_if_eq EventScript_169B69
+ call_if_eq PalletTown_ProfessorOaksLab_EventScript_RivalExitNorth
compare VAR_FACING, DIR_SOUTH
- call_if_eq EventScript_169B7B
+ call_if_eq PalletTown_ProfessorOaksLab_EventScript_RivalExit
compare VAR_FACING, DIR_EAST
- call_if_eq EventScript_169B7B
+ call_if_eq PalletTown_ProfessorOaksLab_EventScript_RivalExit
compare VAR_FACING, DIR_WEST
- call_if_eq EventScript_169B7B
- removeobject 8
+ call_if_eq PalletTown_ProfessorOaksLab_EventScript_RivalExit
+ removeobject LOCALID_RIVAL
fadedefaultbgm
setvar VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 6
setvar VAR_MAP_SCENE_VIRIDIAN_CITY_MART, 2
@@ -741,86 +760,86 @@ EventScript_16961E:: @ 816961E
release
end
-EventScript_169845:: @ 8169845
- applymovement 4, Movement_16987C
+PalletTown_ProfessorOaksLab_EventScript_OakBringDexesOverNorth:: @ 8169845
+ applymovement LOCALID_PROF_OAK, PalletTown_ProfessorOaksLab_Movement_OakBringDexesOver
waitmovement 0
return
-EventScript_169850:: @ 8169850
- applymovement 4, Movement_16987F
+PalletTown_ProfessorOaksLab_EventScript_OakBringDexesOverSouth:: @ 8169850
+ applymovement LOCALID_PROF_OAK, PalletTown_ProfessorOaksLab_Movement_OakBringDexesOverSouth
waitmovement 0
return
-EventScript_16985B:: @ 816985B
- applymovement 4, Movement_16987C
- applymovement OBJ_EVENT_ID_PLAYER, Movement_169878
+PalletTown_ProfessorOaksLab_EventScript_OakBringDexesOverEast:: @ 816985B
+ applymovement LOCALID_PROF_OAK, PalletTown_ProfessorOaksLab_Movement_OakBringDexesOver
+ applymovement OBJ_EVENT_ID_PLAYER, PalletTown_ProfessorOaksLab_Movement_PlayerFaceOakForDexEast
waitmovement 0
return
-EventScript_16986D:: @ 816986D
- applymovement 4, Movement_16987C
+PalletTown_ProfessorOaksLab_EventScript_OakBringDexesOverWest:: @ 816986D
+ applymovement LOCALID_PROF_OAK, PalletTown_ProfessorOaksLab_Movement_OakBringDexesOver
waitmovement 0
return
-Movement_169878:: @ 8169878
+PalletTown_ProfessorOaksLab_Movement_PlayerFaceOakForDexEast:: @ 8169878
delay_16
delay_8
walk_in_place_fastest_right
step_end
-Movement_16987C:: @ 816987C
+PalletTown_ProfessorOaksLab_Movement_OakBringDexesOver:: @ 816987C
walk_right
walk_down
step_end
-Movement_16987F:: @ 816987F
+PalletTown_ProfessorOaksLab_Movement_OakBringDexesOverSouth:: @ 816987F
walk_down
walk_right
step_end
-EventScript_169882:: @ 8169882
- applymovement 4, Movement_1698CB
+PalletTown_ProfessorOaksLab_EventScript_DexSceneOakWalkToDeskNorth:: @ 8169882
+ applymovement LOCALID_PROF_OAK, PalletTown_ProfessorOaksLab_Movement_OakWalkToDesk
waitmovement 0
return
-EventScript_16988D:: @ 816988D
- applymovement 4, Movement_1698D0
- applymovement OBJ_EVENT_ID_PLAYER, Movement_1698C7
- applymovement 8, Movement_1698C7
- waitmovement 4
+PalletTown_ProfessorOaksLab_EventScript_DexSceneOakWalkToDeskSouth:: @ 816988D
+ applymovement LOCALID_PROF_OAK, PalletTown_ProfessorOaksLab_Movement_OakWalkToDeskSouth
+ applymovement OBJ_EVENT_ID_PLAYER, PalletTown_ProfessorOaksLab_Movement_WatchOakWalkToDesk
+ applymovement LOCALID_RIVAL, PalletTown_ProfessorOaksLab_Movement_WatchOakWalkToDesk
+ waitmovement LOCALID_PROF_OAK
return
-EventScript_1698A6:: @ 81698A6
- applymovement 4, Movement_1698CB
- applymovement OBJ_EVENT_ID_PLAYER, Movement_1698C3
- waitmovement 4
+PalletTown_ProfessorOaksLab_EventScript_DexSceneOakWalkToDeskEast:: @ 81698A6
+ applymovement LOCALID_PROF_OAK, PalletTown_ProfessorOaksLab_Movement_OakWalkToDesk
+ applymovement OBJ_EVENT_ID_PLAYER, PalletTown_ProfessorOaksLab_Movement_WatchOakWalkToDeskEast
+ waitmovement LOCALID_PROF_OAK
return
-EventScript_1698B8:: @ 81698B8
- applymovement 4, Movement_1698CB
+PalletTown_ProfessorOaksLab_EventScript_DexSceneOakWalkToDeskWest:: @ 81698B8
+ applymovement LOCALID_PROF_OAK, PalletTown_ProfessorOaksLab_Movement_OakWalkToDesk
waitmovement 0
return
-Movement_1698C3:: @ 81698C3
+PalletTown_ProfessorOaksLab_Movement_WatchOakWalkToDeskEast:: @ 81698C3
delay_16
delay_8
walk_in_place_fastest_up
step_end
-Movement_1698C7:: @ 81698C7
+PalletTown_ProfessorOaksLab_Movement_WatchOakWalkToDesk:: @ 81698C7
delay_16
delay_8
walk_in_place_fastest_left
step_end
-Movement_1698CB:: @ 81698CB
+PalletTown_ProfessorOaksLab_Movement_OakWalkToDesk:: @ 81698CB
walk_up
walk_left
delay_16
walk_in_place_fastest_down
step_end
-Movement_1698D0:: @ 81698D0
+PalletTown_ProfessorOaksLab_Movement_OakWalkToDeskSouth:: @ 81698D0
walk_left
walk_left
walk_up
@@ -828,67 +847,67 @@ Movement_1698D0:: @ 81698D0
walk_in_place_fastest_right
step_end
-EventScript_1698D6:: @ 81698D6
+PalletTown_ProfessorOaksLab_EventScript_RatePokedexOrTryGiveBalls:: @ 81698D6
setvar VAR_0x8004, 0
specialvar VAR_RESULT, Special_GetPokedexCount
copyvar VAR_0x8008, VAR_0x8005
copyvar VAR_0x8009, VAR_0x8006
getnumberstring 0, VAR_0x8008
getnumberstring 1, VAR_0x8009
- compare VAR_0x8009, 1
- goto_if_eq EventScript_1699FB
- goto EventScript_169903
+ compare VAR_0x8009, 1 @ Player only has starter
+ goto_if_eq PalletTown_ProfessorOaksLab_EventScript_CheckIfPlayerNeedsBalls
+ goto PalletTown_ProfessorOaksLab_EventScript_RatePokedex
end
-EventScript_169903:: @ 8169903
- call ProfOak_EventScript_RatePokedexInPerson
- goto_if_set FLAG_OAK_SAW_DEX_COMPLETION, EventScript_169913
+PalletTown_ProfessorOaksLab_EventScript_RatePokedex:: @ 8169903
+ call PokedexRating_EventScript_RateInPerson
+ goto_if_set FLAG_OAK_SAW_DEX_COMPLETION, PalletTown_ProfessorOaksLab_EventScript_DexCompleted
release
end
-EventScript_169913:: @ 8169913
+PalletTown_ProfessorOaksLab_EventScript_DexCompleted:: @ 8169913
closemessage
delay 40
- message Text_1A7291
+ message PokedexRating_Text_Wroooaaarrr
waitmessage
compare VAR_FACING, DIR_NORTH
- call_if_eq EventScript_169964
+ call_if_eq PalletTown_ProfessorOaksLab_EventScript_OakExcitedNorth
compare VAR_FACING, DIR_SOUTH
- call_if_eq EventScript_16996F
+ call_if_eq PalletTown_ProfessorOaksLab_EventScript_OakExcitedSouth
compare VAR_FACING, DIR_EAST
- call_if_eq EventScript_16997A
+ call_if_eq PalletTown_ProfessorOaksLab_EventScript_OakExcitedEast
compare VAR_FACING, DIR_WEST
- call_if_eq EventScript_169985
- applymovement 4, Movement_FacePlayer
+ call_if_eq PalletTown_ProfessorOaksLab_EventScript_OakExcitedWest
+ applymovement LOCALID_PROF_OAK, Movement_FacePlayer
waitmovement 0
closemessage
delay 70
- msgbox gUnknown_81A72AD
- setflag FLAG_TEMP_2
+ msgbox PokedexRating_Text_ThankYouMadeDreamReality
+ setflag SHOWED_OAK_COMPLETE_DEX
release
end
-EventScript_169964:: @ 8169964
- applymovement 4, Movement_169990
+PalletTown_ProfessorOaksLab_EventScript_OakExcitedNorth:: @ 8169964
+ applymovement LOCALID_PROF_OAK, PalletTown_ProfessorOaksLab_Movement_OakExcitedNorth
waitmovement 0
return
-EventScript_16996F:: @ 816996F
- applymovement 4, Movement_169997
+PalletTown_ProfessorOaksLab_EventScript_OakExcitedSouth:: @ 816996F
+ applymovement LOCALID_PROF_OAK, PalletTown_ProfessorOaksLab_Movement_OakExcitedSouth
waitmovement 0
return
-EventScript_16997A:: @ 816997A
- applymovement 4, Movement_16999E
+PalletTown_ProfessorOaksLab_EventScript_OakExcitedEast:: @ 816997A
+ applymovement LOCALID_PROF_OAK, PalletTown_ProfessorOaksLab_Movement_OakExcitedEast
waitmovement 0
return
-EventScript_169985:: @ 8169985
- applymovement 4, Movement_1699A5
+PalletTown_ProfessorOaksLab_EventScript_OakExcitedWest:: @ 8169985
+ applymovement LOCALID_PROF_OAK, PalletTown_ProfessorOaksLab_Movement_OakExcitedWest
waitmovement 0
return
-Movement_169990:: @ 8169990
+PalletTown_ProfessorOaksLab_Movement_OakExcitedNorth:: @ 8169990
walk_in_place_down
walk_in_place_fast_down
walk_in_place_down
@@ -897,7 +916,7 @@ Movement_169990:: @ 8169990
walk_in_place_down
step_end
-Movement_169997:: @ 8169997
+PalletTown_ProfessorOaksLab_Movement_OakExcitedSouth:: @ 8169997
walk_in_place_up
walk_in_place_fast_up
walk_in_place_up
@@ -906,7 +925,7 @@ Movement_169997:: @ 8169997
walk_in_place_up
step_end
-Movement_16999E:: @ 816999E
+PalletTown_ProfessorOaksLab_Movement_OakExcitedEast:: @ 816999E
walk_in_place_left
walk_in_place_fast_left
walk_in_place_left
@@ -915,7 +934,7 @@ Movement_16999E:: @ 816999E
walk_in_place_left
step_end
-Movement_1699A5:: @ 81699A5
+PalletTown_ProfessorOaksLab_Movement_OakExcitedWest:: @ 81699A5
walk_in_place_right
walk_in_place_fast_right
walk_in_place_right
@@ -924,6 +943,7 @@ Movement_1699A5:: @ 81699A5
walk_in_place_right
step_end
+@ Unused
Movement_1699AC:: @ 81699AC
walk_left
walk_in_place_fastest_down
@@ -951,6 +971,7 @@ Movement_1699AC:: @ 81699AC
walk_left
step_end
+@ Unused
Movement_1699C5:
walk_up
walk_down
@@ -962,146 +983,146 @@ Movement_1699C5:
delay_16
step_end
-EventScript_1699CE:: @ 81699CE
- call ProfOak_EventScript_RatePokedexInPerson
+PalletTown_ProfessorOaksLab_EventScript_TryStartNationalDexScene:: @ 81699CE
+ call PokedexRating_EventScript_RateInPerson
closemessage
compare VAR_0x8009, 60
- goto_if_lt EventScript_1699F9
- goto_if_unset FLAG_WORLD_MAP_ONE_ISLAND, EventScript_1699F9
+ goto_if_lt PalletTown_ProfessorOaksLab_EventScript_DontStartNationalDexScene
+ goto_if_unset FLAG_WORLD_MAP_ONE_ISLAND, PalletTown_ProfessorOaksLab_EventScript_DontStartNationalDexScene
delay 30
- msgbox gUnknown_818EDF5
- goto EventScript_169035
+ msgbox PalletTown_ProfessorOaksLab_Text_OakFavorToAskYouPlayer
+ goto PalletTown_ProfessorOaksLab_EventScript_NationalDexScene
end
-EventScript_1699F9:: @ 81699F9
+PalletTown_ProfessorOaksLab_EventScript_DontStartNationalDexScene:: @ 81699F9
release
end
-EventScript_1699FB:: @ 81699FB
+PalletTown_ProfessorOaksLab_EventScript_CheckIfPlayerNeedsBalls:: @ 81699FB
goto_if_questlog EventScript_ReleaseEnd
special sub_8112364
- goto_if_set FLAG_OAK_SKIP_22_RIVAL_CHECK, EventScript_169A6E
- goto_if_set FLAG_GOT_POKEBALLS_FROM_OAK_AFTER_22_RIVAL, EventScript_169A78
+ goto_if_set FLAG_OAK_SKIP_22_RIVAL_CHECK, PalletTown_ProfessorOaksLab_EventScript_MonsAroundWorldWait
+ goto_if_set FLAG_GOT_POKEBALLS_FROM_OAK_AFTER_22_RIVAL, PalletTown_ProfessorOaksLab_EventScript_PlayerAlreadyGotBalls
checkitem ITEM_POKE_BALL, 1
compare VAR_RESULT, FALSE
- goto_if_eq EventScript_169A34
- goto EventScript_169A6E
+ goto_if_eq PalletTown_ProfessorOaksLab_EventScript_PlayerOutOfBalls
+ goto PalletTown_ProfessorOaksLab_EventScript_MonsAroundWorldWait
end
-EventScript_169A34:: @ 8169A34
+PalletTown_ProfessorOaksLab_EventScript_PlayerOutOfBalls:: @ 8169A34
compare VAR_MAP_SCENE_ROUTE22, 2
- goto_if_ge EventScript_169A45
- goto EventScript_169A6E
+ goto_if_ge PalletTown_ProfessorOaksLab_EventScript_GivePlayerMoreBalls
+ goto PalletTown_ProfessorOaksLab_EventScript_MonsAroundWorldWait
end
-EventScript_169A45:: @ 8169A45
- msgbox gUnknown_818E89C
- giveitem_msg gUnknown_818E6B3, ITEM_POKE_BALL, 5
+PalletTown_ProfessorOaksLab_EventScript_GivePlayerMoreBalls:: @ 8169A45
+ msgbox PalletTown_ProfessorOaksLab_Text_OakAddedNothingToPokedex
+ giveitem_msg PalletTown_ProfessorOaksLab_Text_ReceivedFivePokeBalls, ITEM_POKE_BALL, 5
setflag FLAG_GOT_POKEBALLS_FROM_OAK_AFTER_22_RIVAL
release
end
-EventScript_169A6E:: @ 8169A6E
- msgbox gUnknown_818E871
+PalletTown_ProfessorOaksLab_EventScript_MonsAroundWorldWait:: @ 8169A6E
+ msgbox PalletTown_ProfessorOaksLab_Text_OakMonsAroundWorldWait
release
end
-EventScript_169A78:: @ 8169A78
- msgbox gUnknown_818E98E
+PalletTown_ProfessorOaksLab_EventScript_PlayerAlreadyGotBalls:: @ 8169A78
+ msgbox PalletTown_ProfessorOaksLab_Text_OakComeSeeMeSometime
release
end
-EventScript_169A82:: @ 8169A82
- setobjectxyperm 8, 5, 10
- addobject 8
- applymovement OBJ_EVENT_ID_PLAYER, Movement_169B94
- applymovement 8, Movement_169B9D
+PalletTown_ProfessorOaksLab_EventScript_DexSceneRivalEnterNorth:: @ 8169A82
+ setobjectxyperm LOCALID_RIVAL, 5, 10
+ addobject LOCALID_RIVAL
+ applymovement OBJ_EVENT_ID_PLAYER, PalletTown_ProfessorOaksLab_Movement_WatchRivalEnterNorth
+ applymovement LOCALID_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalEnter
waitmovement 0
return
-EventScript_169A9E:: @ 8169A9E
- setobjectxyperm 8, 6, 10
- addobject 8
- applymovement 4, Movement_WalkInPlaceFastestDown
- applymovement OBJ_EVENT_ID_PLAYER, Movement_169B91
- applymovement 8, Movement_169B9D
+PalletTown_ProfessorOaksLab_EventScript_DexSceneRivalEnterEastWest:: @ 8169A9E
+ setobjectxyperm LOCALID_RIVAL, 6, 10
+ addobject LOCALID_RIVAL
+ applymovement LOCALID_PROF_OAK, Movement_WalkInPlaceFastestDown
+ applymovement OBJ_EVENT_ID_PLAYER, PalletTown_ProfessorOaksLab_Movement_WatchRivalEnterEastWest
+ applymovement LOCALID_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalEnter
waitmovement 0
return
-EventScript_169AC1:: @ 8169AC1
- setobjectxyperm 8, 6, 10
- addobject 8
- applymovement 4, Movement_WalkInPlaceFastestDown
- applymovement 8, Movement_169B9D
+PalletTown_ProfessorOaksLab_EventScript_DexSceneRivalEnterSouth:: @ 8169AC1
+ setobjectxyperm LOCALID_RIVAL, 6, 10
+ addobject LOCALID_RIVAL
+ applymovement LOCALID_PROF_OAK, Movement_WalkInPlaceFastestDown
+ applymovement LOCALID_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalEnter
waitmovement 0
return
-EventScript_169ADD:: @ 8169ADD
- applymovement 4, Movement_FacePlayer
+PalletTown_ProfessorOaksLab_EventScript_DexSceneOakFacePlayerAndRivalSouth:: @ 8169ADD
+ applymovement LOCALID_PROF_OAK, Movement_FacePlayer
waitmovement 0
delay 15
- applymovement 4, Movement_WalkInPlaceFastestDown
+ applymovement LOCALID_PROF_OAK, Movement_WalkInPlaceFastestDown
waitmovement 0
return
-EventScript_169AF5:: @ 8169AF5
- applymovement 4, Movement_FacePlayer
+PalletTown_ProfessorOaksLab_EventScript_DexSceneOakFacePlayerAndRivalWest:: @ 8169AF5
+ applymovement LOCALID_PROF_OAK, Movement_FacePlayer
waitmovement 0
delay 15
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestLeft
- applymovement 4, Movement_WalkInPlaceFastestDown
+ applymovement LOCALID_PROF_OAK, Movement_WalkInPlaceFastestDown
waitmovement 0
return
-EventScript_169B14:: @ 8169B14
- applymovement 4, Movement_FacePlayer
+PalletTown_ProfessorOaksLab_EventScript_DexSceneOakFacePlayerAndRivalEast:: @ 8169B14
+ applymovement LOCALID_PROF_OAK, Movement_FacePlayer
waitmovement 0
delay 15
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight
- applymovement 4, Movement_WalkInPlaceFastestDown
+ applymovement LOCALID_PROF_OAK, Movement_WalkInPlaceFastestDown
waitmovement 0
return
-EventScript_169B33:: @ 8169B33
- applymovement 8, Movement_FacePlayer
+PalletTown_ProfessorOaksLab_EventScript_DexSceneRivalFacePlayerNorth:: @ 8169B33
+ applymovement LOCALID_RIVAL, Movement_FacePlayer
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestLeft
waitmovement 0
return
-EventScript_169B45:: @ 8169B45
- applymovement 8, Movement_WalkInPlaceFastestUp
+PalletTown_ProfessorOaksLab_EventScript_DexSceneRivalFacePlayerSouth:: @ 8169B45
+ applymovement LOCALID_RIVAL, Movement_WalkInPlaceFastestUp
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestDown
waitmovement 0
return
-EventScript_169B57:: @ 8169B57
- applymovement 8, Movement_FacePlayer
+PalletTown_ProfessorOaksLab_EventScript_DexSceneRivalFacePlayerEastWest:: @ 8169B57
+ applymovement LOCALID_RIVAL, Movement_FacePlayer
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestDown
waitmovement 0
return
-EventScript_169B69:: @ 8169B69
- applymovement OBJ_EVENT_ID_PLAYER, Movement_169B91
- applymovement 8, Movement_169BA4
+PalletTown_ProfessorOaksLab_EventScript_RivalExitNorth:: @ 8169B69
+ applymovement OBJ_EVENT_ID_PLAYER, PalletTown_ProfessorOaksLab_Movement_WatchRivalEnterEastWest
+ applymovement LOCALID_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalExit
waitmovement 0
return
-EventScript_169B7B:: @ 8169B7B
- applymovement 8, Movement_169BA4
+PalletTown_ProfessorOaksLab_EventScript_RivalExit:: @ 8169B7B
+ applymovement LOCALID_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalExit
waitmovement 0
return
-EventScript_169B86:: @ 8169B86
+PalletTown_ProfessorOaksLab_EventScript_DexSceneOakFacePlayerAndRivalNorth:: @ 8169B86
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp
waitmovement 0
return
-Movement_169B91:: @ 8169B91
+PalletTown_ProfessorOaksLab_Movement_WatchRivalEnterEastWest:: @ 8169B91
delay_4
walk_in_place_fastest_down
step_end
-Movement_169B94:: @ 8169B94
+PalletTown_ProfessorOaksLab_Movement_WatchRivalEnterNorth:: @ 8169B94
walk_in_place_fastest_down
delay_16
delay_16
@@ -1112,7 +1133,7 @@ Movement_169B94:: @ 8169B94
walk_in_place_fastest_left
step_end
-Movement_169B9D:: @ 8169B9D
+PalletTown_ProfessorOaksLab_Movement_RivalEnter:: @ 8169B9D
walk_up
walk_up
walk_up
@@ -1121,7 +1142,7 @@ Movement_169B9D:: @ 8169B9D
walk_up
step_end
-Movement_169BA4:: @ 8169BA4
+PalletTown_ProfessorOaksLab_Movement_RivalExit:: @ 8169BA4
walk_down
walk_down
walk_down
@@ -1130,79 +1151,74 @@ Movement_169BA4:: @ 8169BA4
walk_down
step_end
- .equ VAR_OAKSLAB_PLAYER_STARTER_NO, VAR_TEMP_1
- .equ VAR_OAKSLAB_PLAYER_STARTER_SPECIES, VAR_TEMP_2
- .equ VAR_OAKSLAB_RIVAL_STARTER_SPECIES, VAR_TEMP_3
- .equ VAR_OAKSLAB_RIVAL_STARTER_OBJID, VAR_TEMP_4
-
-PalletTown_ProfessorOaksLab_EventScript_169BAB:: @ 8169BAB
+PalletTown_ProfessorOaksLab_EventScript_BulbasaurBall:: @ 8169BAB
lock
faceplayer
- setvar VAR_OAKSLAB_PLAYER_STARTER_NO, 0
- setvar VAR_OAKSLAB_PLAYER_STARTER_SPECIES, SPECIES_BULBASAUR
- setvar VAR_OAKSLAB_RIVAL_STARTER_SPECIES, SPECIES_CHARMANDER
- setvar VAR_OAKSLAB_RIVAL_STARTER_OBJID, 7
+ setvar PLAYER_STARTER_NUM, 0
+ setvar PLAYER_STARTER_SPECIES, SPECIES_BULBASAUR
+ setvar RIVAL_STARTER_SPECIES, SPECIES_CHARMANDER
+ setvar RIVAL_STARTER_ID, LOCALID_CHARMANDER_BALL
compare VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 3
- goto_if_ge EventScript_169DE4
+ goto_if_ge PalletTown_ProfessorOaksLab_EventScript_LastPokeBall
compare VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 2
- goto_if_eq EventScript_169BE1
- msgbox gUnknown_818EA19
+ goto_if_eq PalletTown_ProfessorOaksLab_EventScript_ConfirmStarterChoice
+ msgbox PalletTown_ProfessorOaksLab_Text_ThoseArePokeBalls
release
end
-EventScript_169BE1:: @ 8169BE1
- applymovement 4, Movement_FaceRight
+PalletTown_ProfessorOaksLab_EventScript_ConfirmStarterChoice:: @ 8169BE1
+ applymovement LOCALID_PROF_OAK, Movement_FaceRight
waitmovement 0
- drawmonpic VAR_OAKSLAB_PLAYER_STARTER_SPECIES, 10, 3
+ drawmonpic PLAYER_STARTER_SPECIES, 10, 3
textcolor 0
- compare VAR_OAKSLAB_PLAYER_STARTER_NO, 0
- goto_if_eq EventScript_OakDescribesBulbasaur
- compare VAR_OAKSLAB_PLAYER_STARTER_NO, 1
- goto_if_eq EventScript_OakDescribesCharmander
- compare VAR_OAKSLAB_PLAYER_STARTER_NO, 2
- goto_if_eq EventScript_OakDescribesSquirtle
+ compare PLAYER_STARTER_NUM, 0
+ goto_if_eq PalletTown_ProfessorOaksLab_EventScript_ConfirmBulbasaur
+ compare PLAYER_STARTER_NUM, 1
+ goto_if_eq PalletTown_ProfessorOaksLab_EventScript_ConfirmCharmander
+ compare PLAYER_STARTER_NUM, 2
+ goto_if_eq PalletTown_ProfessorOaksLab_EventScript_ConfirmSquirtle
end
-EventScript_OakDescribesBulbasaur:: @ 8169C14
- msgbox gUnknown_818E272, MSGBOX_YESNO
+PalletTown_ProfessorOaksLab_EventScript_ConfirmBulbasaur:: @ 8169C14
+ msgbox PalletTown_ProfessorOaksLab_Text_OakChoosingBulbasaur, MSGBOX_YESNO
compare VAR_RESULT, YES
- goto_if_eq EventScript_ThisPokeIsRealyEnergetic
+ goto_if_eq PalletTown_ProfessorOaksLab_EventScript_ChoseStarter
compare VAR_RESULT, NO
- goto_if_eq EventScript_DeclinedStarter
+ goto_if_eq PalletTown_ProfessorOaksLab_EventScript_DeclinedStarter
end
-EventScript_OakDescribesCharmander:: @ 8169C33
- msgbox gUnknown_818E207, MSGBOX_YESNO
+PalletTown_ProfessorOaksLab_EventScript_ConfirmCharmander:: @ 8169C33
+ msgbox PalletTown_ProfessorOaksLab_Text_OakChoosingSquirtle, MSGBOX_YESNO
compare VAR_RESULT, YES
- goto_if_eq EventScript_ThisPokeIsRealyEnergetic
+ goto_if_eq PalletTown_ProfessorOaksLab_EventScript_ChoseStarter
compare VAR_RESULT, NO
- goto_if_eq EventScript_DeclinedStarter
+ goto_if_eq PalletTown_ProfessorOaksLab_EventScript_DeclinedStarter
end
-EventScript_OakDescribesSquirtle:: @ 8169C52
- msgbox gUnknown_818E194, MSGBOX_YESNO
+PalletTown_ProfessorOaksLab_EventScript_ConfirmSquirtle:: @ 8169C52
+ msgbox PalletTown_ProfessorOaksLab_Text_OakChoosingCharmander, MSGBOX_YESNO
compare VAR_RESULT, YES
- goto_if_eq EventScript_ThisPokeIsRealyEnergetic
+ goto_if_eq PalletTown_ProfessorOaksLab_EventScript_ChoseStarter
compare VAR_RESULT, NO
- goto_if_eq EventScript_DeclinedStarter
+ goto_if_eq PalletTown_ProfessorOaksLab_EventScript_DeclinedStarter
end
-EventScript_DeclinedStarter:: @ 8169C71
+PalletTown_ProfessorOaksLab_EventScript_DeclinedStarter:: @ 8169C71
erasemonpic
release
end
-EventScript_ThisPokeIsRealyEnergetic:: @ 8169C74
+PalletTown_ProfessorOaksLab_EventScript_ChoseStarter:: @ 8169C74
erasemonpic
removeobject VAR_LAST_TALKED
- msgbox gUnknown_818E2E5
+ msgbox PalletTown_ProfessorOaksLab_Text_OakThisMonIsEnergetic
call EventScript_1A6675
setflag FLAG_SYS_POKEMON_GET
setflag FLAG_PALLET_LADY_NOT_BLOCKING_SIGN
- givemon VAR_OAKSLAB_PLAYER_STARTER_SPECIES, 5, ITEM_NONE
- copyvar VAR_STARTER_MON, VAR_OAKSLAB_PLAYER_STARTER_NO
- getspeciesname 0, VAR_OAKSLAB_PLAYER_STARTER_SPECIES
- message Text_18E30D
+ givemon PLAYER_STARTER_SPECIES, 5, ITEM_NONE
+ copyvar VAR_STARTER_MON, PLAYER_STARTER_NUM
+ getspeciesname 0, PLAYER_STARTER_SPECIES
+ message PalletTown_ProfessorOaksLab_Text_ReceivedMonFromOak
waitmessage
playfanfare MUS_FAN5
waitfanfare
@@ -1210,63 +1226,63 @@ EventScript_ThisPokeIsRealyEnergetic:: @ 8169C74
compare VAR_RESULT, YES
goto_if_eq EventScript_GiveNicknameToStarter
compare VAR_RESULT, NO
- goto_if_eq EventScript_SkipGiveNicknameToStarter
+ goto_if_eq PalletTown_ProfessorOaksLab_EventScript_RivalPicksStarter
end
EventScript_GiveNicknameToStarter:: @ 8169CCC
setvar VAR_0x8004, 0
call EventScript_ChangePokemonNickname
- goto EventScript_SkipGiveNicknameToStarter
+ goto PalletTown_ProfessorOaksLab_EventScript_RivalPicksStarter
end
-EventScript_SkipGiveNicknameToStarter:: @ 8169CDC
+PalletTown_ProfessorOaksLab_EventScript_RivalPicksStarter:: @ 8169CDC
closemessage
- compare VAR_OAKSLAB_PLAYER_STARTER_NO, 0
- goto_if_eq EventScript_RivalWalksToCharmander
- compare VAR_OAKSLAB_PLAYER_STARTER_NO, 1
- goto_if_eq EventScript_RivalWalksToSquirtle
- compare VAR_OAKSLAB_PLAYER_STARTER_NO, 2
- goto_if_eq EventScript_RivalWalksToBulbasaur
+ compare PLAYER_STARTER_NUM, 0
+ goto_if_eq PalletTown_ProfessorOaksLab_EventScript_RivalWalksToCharmander
+ compare PLAYER_STARTER_NUM, 1
+ goto_if_eq PalletTown_ProfessorOaksLab_EventScript_RivalWalksToSquirtle
+ compare PLAYER_STARTER_NUM, 2
+ goto_if_eq PalletTown_ProfessorOaksLab_EventScript_RivalWalksToBulbasaur
end
-EventScript_RivalWalksToCharmander:: @ 8169CFF
- applymovement 8, Movement_RivalWalksToCharmander
+PalletTown_ProfessorOaksLab_EventScript_RivalWalksToCharmander:: @ 8169CFF
+ applymovement LOCALID_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalWalksToCharmander
waitmovement 0
- goto Movement_RivalTakesHisStarter
+ goto PalletTown_ProfessorOaksLab_EventScript_RivalTakesStarter
end
-EventScript_RivalWalksToBulbasaur:: @ 8169D0F
- applymovement 8, Movement_RivalWalksToBulbasaur
+PalletTown_ProfessorOaksLab_EventScript_RivalWalksToBulbasaur:: @ 8169D0F
+ applymovement LOCALID_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalWalksToBulbasaur
waitmovement 0
- goto Movement_RivalTakesHisStarter
+ goto PalletTown_ProfessorOaksLab_EventScript_RivalTakesStarter
end
-EventScript_RivalWalksToSquirtle:: @ 8169D1F
- applymovement 8, Movement_RivalWalksToSquirtle
+PalletTown_ProfessorOaksLab_EventScript_RivalWalksToSquirtle:: @ 8169D1F
+ applymovement LOCALID_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalWalksToSquirtle
waitmovement 0
- goto Movement_RivalTakesHisStarter
+ goto PalletTown_ProfessorOaksLab_EventScript_RivalTakesStarter
end
-Movement_RivalTakesHisStarter:: @ 8169D2F
+PalletTown_ProfessorOaksLab_EventScript_RivalTakesStarter:: @ 8169D2F
textcolor 0
- msgbox gUnknown_818DD34
- removeobject VAR_OAKSLAB_RIVAL_STARTER_OBJID
+ msgbox PalletTown_ProfessorOaksLab_Text_RivalIllTakeThisOneThen
+ removeobject RIVAL_STARTER_ID
textcolor 3
- getspeciesname 0, VAR_OAKSLAB_RIVAL_STARTER_SPECIES
- message Text_18DD52
+ getspeciesname 0, RIVAL_STARTER_SPECIES
+ message PalletTown_ProfessorOaksLab_Text_RivalReceivedMonFromOak
waitmessage
playfanfare MUS_FAN5
waitfanfare
setvar VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 3
- call_if_set FLAG_PALLET_TOWN_LADY_MOVED_FROM_SIGN, EventScript_169D5C
+ call_if_set FLAG_PALLET_TOWN_LADY_MOVED_FROM_SIGN, PalletTown_ProfessorOaksLab_EventScript_ReadyEndSignLadyScene
release
end
-EventScript_169D5C:: @ 8169D5C
+PalletTown_ProfessorOaksLab_EventScript_ReadyEndSignLadyScene:: @ 8169D5C
setvar VAR_MAP_SCENE_PALLET_TOWN_SIGN_LADY, 1
return
-Movement_RivalWalksToCharmander:: @ 8169D62
+PalletTown_ProfessorOaksLab_Movement_RivalWalksToCharmander:: @ 8169D62
walk_down
walk_down
walk_right
@@ -1277,7 +1293,7 @@ Movement_RivalWalksToCharmander:: @ 8169D62
walk_up
step_end
-Movement_RivalWalksToBulbasaur:: @ 8169D6B
+PalletTown_ProfessorOaksLab_Movement_RivalWalksToBulbasaur:: @ 8169D6B
walk_down
walk_right
walk_right
@@ -1286,7 +1302,7 @@ Movement_RivalWalksToBulbasaur:: @ 8169D6B
walk_in_place_fastest_up
step_end
-Movement_RivalWalksToSquirtle:: @ 8169D72
+PalletTown_ProfessorOaksLab_Movement_RivalWalksToSquirtle:: @ 8169D72
walk_down
walk_right
walk_right
@@ -1294,98 +1310,98 @@ Movement_RivalWalksToSquirtle:: @ 8169D72
walk_in_place_fastest_up
step_end
-PalletTown_ProfessorOaksLab_EventScript_169D78:: @ 8169D78
+PalletTown_ProfessorOaksLab_EventScript_SquirtleBall:: @ 8169D78
lock
faceplayer
- setvar VAR_OAKSLAB_PLAYER_STARTER_NO, 1
- setvar VAR_OAKSLAB_PLAYER_STARTER_SPECIES, SPECIES_SQUIRTLE
- setvar VAR_OAKSLAB_RIVAL_STARTER_SPECIES, SPECIES_BULBASAUR
- setvar VAR_OAKSLAB_RIVAL_STARTER_OBJID, 5
+ setvar PLAYER_STARTER_NUM, 1
+ setvar PLAYER_STARTER_SPECIES, SPECIES_SQUIRTLE
+ setvar RIVAL_STARTER_SPECIES, SPECIES_BULBASAUR
+ setvar RIVAL_STARTER_ID, LOCALID_BULBASAUR_BALL
compare VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 3
- goto_if_ge EventScript_169DE4
+ goto_if_ge PalletTown_ProfessorOaksLab_EventScript_LastPokeBall
compare VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 2
- goto_if_eq EventScript_169BE1
- msgbox gUnknown_818EA19
+ goto_if_eq PalletTown_ProfessorOaksLab_EventScript_ConfirmStarterChoice
+ msgbox PalletTown_ProfessorOaksLab_Text_ThoseArePokeBalls
release
end
-PalletTown_ProfessorOaksLab_EventScript_169DAE:: @ 8169DAE
+PalletTown_ProfessorOaksLab_EventScript_CharmanderBall:: @ 8169DAE
lock
faceplayer
- setvar VAR_OAKSLAB_PLAYER_STARTER_NO, 2
- setvar VAR_OAKSLAB_PLAYER_STARTER_SPECIES, SPECIES_CHARMANDER
- setvar VAR_OAKSLAB_RIVAL_STARTER_SPECIES, SPECIES_SQUIRTLE
- setvar VAR_OAKSLAB_RIVAL_STARTER_OBJID, 6
+ setvar PLAYER_STARTER_NUM, 2
+ setvar PLAYER_STARTER_SPECIES, SPECIES_CHARMANDER
+ setvar RIVAL_STARTER_SPECIES, SPECIES_SQUIRTLE
+ setvar RIVAL_STARTER_ID, LOCALID_SQUIRTLE_BALL
compare VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 3
- goto_if_ge EventScript_169DE4
+ goto_if_ge PalletTown_ProfessorOaksLab_EventScript_LastPokeBall
compare VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 2
- goto_if_eq EventScript_169BE1
- msgbox gUnknown_818EA19
+ goto_if_eq PalletTown_ProfessorOaksLab_EventScript_ConfirmStarterChoice
+ msgbox PalletTown_ProfessorOaksLab_Text_ThoseArePokeBalls
release
end
-EventScript_169DE4:: @ 8169DE4
- msgbox gUnknown_818EA45
+PalletTown_ProfessorOaksLab_EventScript_LastPokeBall:: @ 8169DE4
+ msgbox PalletTown_ProfessorOaksLab_Text_OaksLastMon
release
end
-PalletTown_ProfessorOaksLab_EventScript_169DEE:: @ 8169DEE
+PalletTown_ProfessorOaksLab_EventScript_Aide1:: @ 8169DEE
lock
faceplayer
- goto_if_set FLAG_SYS_GAME_CLEAR, EventScript_169E03
- msgbox gUnknown_818EBE6
+ goto_if_set FLAG_SYS_GAME_CLEAR, PalletTown_ProfessorOaksLab_EventScript_Aide1GameClear
+ msgbox PalletTown_ProfessorOaksLab_Text_StudyAsOaksAide
release
end
-EventScript_169E03:: @ 8169E03
+PalletTown_ProfessorOaksLab_EventScript_Aide1GameClear:: @ 8169E03
famechecker FAMECHECKER_OAK, 5
- msgbox gUnknown_818ED15
+ msgbox PalletTown_ProfessorOaksLab_Text_OakIsGoingToHaveRadioShow
release
end
-PalletTown_ProfessorOaksLab_EventScript_169E1A:: @ 8169E1A
+PalletTown_ProfessorOaksLab_EventScript_Aide2:: @ 8169E1A
lock
faceplayer
- goto_if_set FLAG_SYS_GAME_CLEAR, EventScript_169E2F
- msgbox gUnknown_818EBE6
+ goto_if_set FLAG_SYS_GAME_CLEAR, PalletTown_ProfessorOaksLab_EventScript_Aide2GameClear
+ msgbox PalletTown_ProfessorOaksLab_Text_StudyAsOaksAide
release
end
-EventScript_169E2F:: @ 8169E2F
+PalletTown_ProfessorOaksLab_EventScript_Aide2GameClear:: @ 8169E2F
famechecker FAMECHECKER_DAISY, 0
- msgbox gUnknown_818EC0B
+ msgbox PalletTown_ProfessorOaksLab_Text_DaisyWillGroomMons
release
end
-PalletTown_ProfessorOaksLab_EventScript_169E46:: @ 8169E46
+PalletTown_ProfessorOaksLab_EventScript_Aide3:: @ 8169E46
lock
faceplayer
famechecker FAMECHECKER_OAK, 2
- msgbox gUnknown_818ED81
+ msgbox PalletTown_ProfessorOaksLab_Text_OakIsAuthorityOnMons
release
end
-PalletTown_ProfessorOaksLab_EventScript_169E5F:: @ 8169E5F
- msgbox gUnknown_818E9E5, MSGBOX_NPC
+PalletTown_ProfessorOaksLab_EventScript_Pokedex:: @ 8169E5F
+ msgbox PalletTown_ProfessorOaksLab_Text_BlankEncyclopedia, MSGBOX_NPC
end
-PalletTown_ProfessorOaksLab_EventScript_169E68:: @ 8169E68
- msgbox gUnknown_818EAF4, MSGBOX_SIGN
+PalletTown_ProfessorOaksLab_EventScript_Computer:: @ 8169E68
+ msgbox PalletTown_ProfessorOaksLab_Text_EmailMessage, MSGBOX_SIGN
end
-PalletTown_ProfessorOaksLab_EventScript_169E71:: @ 8169E71
- msgbox gUnknown_818EA66, MSGBOX_SIGN
+PalletTown_ProfessorOaksLab_EventScript_LeftSign:: @ 8169E71
+ msgbox PalletTown_ProfessorOaksLab_Text_PressStartToOpenMenu, MSGBOX_SIGN
end
-PalletTown_ProfessorOaksLab_EventScript_169E7A:: @ 8169E7A
+PalletTown_ProfessorOaksLab_EventScript_RightSign:: @ 8169E7A
lockall
compare VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 6
- goto_if_ge EventScript_169E90
- msgbox gUnknown_818EA84
+ goto_if_ge PalletTown_ProfessorOaksLab_EventScript_RightSignAlt
+ msgbox PalletTown_ProfessorOaksLab_Text_SaveOptionInMenu
releaseall
end
-EventScript_169E90:: @ 8169E90
- msgbox gUnknown_818EAB6
+PalletTown_ProfessorOaksLab_EventScript_RightSignAlt:: @ 8169E90
+ msgbox PalletTown_ProfessorOaksLab_Text_AllMonTypesHaveStrongAndWeakPoints
releaseall
end
diff --git a/data/maps/PalletTown_ProfessorOaksLab/text.inc b/data/maps/PalletTown_ProfessorOaksLab/text.inc
index e437d4b39..ad7e8b7a1 100644
--- a/data/maps/PalletTown_ProfessorOaksLab/text.inc
+++ b/data/maps/PalletTown_ProfessorOaksLab/text.inc
@@ -1,37 +1,37 @@
-gUnknown_818DC67:: @ 818DC67
+PalletTown_ProfessorOaksLab_Text_RivalGrampsIsntAround:: @ 818DC67
.string "{RIVAL}: What, it's only {PLAYER}?\n"
.string "Gramps isn't around.$"
-gUnknown_818DC94:: @ 818DC94
+PalletTown_ProfessorOaksLab_Text_RivalFedUpWithWaiting:: @ 818DC94
.string "{RIVAL}: Gramps!\n"
.string "I'm fed up with waiting!$"
-gUnknown_818DCB9:: @ 818DCB9
+PalletTown_ProfessorOaksLab_Text_RivalNoFairWhatAboutMe:: @ 818DCB9
.string "{RIVAL}: Hey! Gramps! No fair!\n"
.string "What about me?$"
-gUnknown_818DCE2:: @ 818DCE2
+PalletTown_ProfessorOaksLab_Text_RivalGoChoosePlayer:: @ 818DCE2
.string "{RIVAL}: Heh, I don't need to be\n"
.string "greedy like you. I'm mature!\p"
.string "Go ahead and choose, {PLAYER}!$"
-gUnknown_818DD34:: @ 818DD34
+PalletTown_ProfessorOaksLab_Text_RivalIllTakeThisOneThen:: @ 818DD34
.string "{RIVAL}: I'll take this one, then!$"
-Text_18DD52:: @ 818DD52
+PalletTown_ProfessorOaksLab_Text_RivalReceivedMonFromOak:: @ 818DD52
.string "{RIVAL} received the {STR_VAR_1}\n"
.string "from PROF. OAK!$"
-gUnknown_818DD75:: @ 818DD75
+PalletTown_ProfessorOaksLab_Text_RivalMyMonLooksTougher:: @ 818DD75
.string "{RIVAL}: My POKéMON looks a lot\n"
.string "tougher than yours.$"
-gUnknown_818DDA4:: @ 818DDA4
+PalletTown_ProfessorOaksLab_Text_RivalLetsCheckOutMons:: @ 818DDA4
.string "{RIVAL}: Wait, {PLAYER}!\n"
.string "Let's check out our POKéMON!\p"
.string "Come on, I'll take you on!$"
-Text_18DDEA:: @ 818DDEA
+PalletTown_ProfessorOaksLab_Text_RivalDefeat:: @ 818DDEA
.string "WHAT?\n"
.string "Unbelievable!\l"
.string "I picked the wrong POKéMON!$"
@@ -41,24 +41,24 @@ Text_RivalVictory:: @ 818DE1A
.string "{RIVAL}: Yeah!\n"
.string "Am I great or what?$"
-gUnknown_818DE38:: @ 818DE38
+PalletTown_ProfessorOaksLab_Text_RivalGoToughenMyMon:: @ 818DE38
.string "{RIVAL}: Okay! I'll make my\n"
.string "POKéMON battle to toughen it up!\p"
.string "{PLAYER}! Gramps!\n"
.string "Smell you later!$"
-gUnknown_818DE8D:: @ 818DE8D
+PalletTown_ProfessorOaksLab_Text_RivalGramps:: @ 818DE8D
.string "{RIVAL}: Gramps!$"
-gUnknown_818DE99:: @ 818DE99
+PalletTown_ProfessorOaksLab_Text_RivalWhatDidYouCallMeFor:: @ 818DE99
.string "{RIVAL}: I almost forgot!\n"
.string "What did you call me for?$"
-gUnknown_818DEC8:: @ 818DEC8
+PalletTown_ProfessorOaksLab_Text_RivalLeaveItToMeGramps:: @ 818DEC8
.string "{RIVAL}: All right, Gramps!\n"
.string "Leave it all to me!$"
-gUnknown_818DEF3:: @ 818DEF3
+PalletTown_ProfessorOaksLab_Text_RivalTellSisNotToGiveYouMap:: @ 818DEF3
.string "{PLAYER}, I hate to say it, but you\n"
.string "won't be necessary for this.\p"
.string "I know! I'll borrow a TOWN MAP\n"
@@ -68,7 +68,7 @@ gUnknown_818DEF3:: @ 818DEF3
.string "Don't bother coming around to\n"
.string "my place after this!$"
-gUnknown_818DFBC:: @ 818DFBC
+PalletTown_ProfessorOaksLab_Text_OakThreeMonsChooseOne:: @ 818DFBC
.string "OAK: {RIVAL}?\n"
.string "Let me think…\p"
.string "Oh, that's right, I told you to\n"
@@ -85,59 +85,59 @@ gUnknown_818DFBC:: @ 818DFBC
.string "You can have one.\n"
.string "Go on, choose!$"
-gUnknown_818E0EA:: @ 818E0EA
+PalletTown_ProfessorOaksLab_Text_OakBePatientRival:: @ 818E0EA
.string "OAK: Be patient, {RIVAL}.\n"
.string "You can have one, too!$"
-gUnknown_818E116:: @ 818E116
+PalletTown_ProfessorOaksLab_Text_OakWhichOneWillYouChoose:: @ 818E116
.string "OAK: Now, {PLAYER}.\p"
.string "Inside those three POKé BALLS are\n"
.string "POKéMON.\p"
.string "Which one will you choose for\n"
.string "yourself?$"
-gUnknown_818E177:: @ 818E177
+PalletTown_ProfessorOaksLab_Text_OakHeyDontGoAwayYet:: @ 818E177
.string "OAK: Hey!\n"
.string "Don't go away yet!$"
-gUnknown_818E194:: @ 818E194
+PalletTown_ProfessorOaksLab_Text_OakChoosingCharmander:: @ 818E194
.string "Ah! CHARMANDER is your choice.\n"
.string "You should raise it patiently.\p"
.string "So, {PLAYER}, you're claiming the\n"
.string "FIRE POKéMON CHARMANDER?$"
-gUnknown_818E207:: @ 818E207
+PalletTown_ProfessorOaksLab_Text_OakChoosingSquirtle:: @ 818E207
.string "Hm! SQUIRTLE is your choice.\n"
.string "It's one worth raising.\p"
.string "So, {PLAYER}, you've decided on the\n"
.string "WATER POKéMON SQUIRTLE?$"
-gUnknown_818E272:: @ 818E272
+PalletTown_ProfessorOaksLab_Text_OakChoosingBulbasaur:: @ 818E272
.string "I see! BULBASAUR is your choice.\n"
.string "It's very easy to raise.\p"
.string "So, {PLAYER}, you want to go with\n"
.string "the GRASS POKéMON BULBASAUR?$"
-gUnknown_818E2E5:: @ 818E2E5
+PalletTown_ProfessorOaksLab_Text_OakThisMonIsEnergetic:: @ 818E2E5
.string "This POKéMON is really quite\n"
.string "energetic!$"
-Text_18E30D:: @ 818E30D
+PalletTown_ProfessorOaksLab_Text_ReceivedMonFromOak:: @ 818E30D
.string "{PLAYER} received the {STR_VAR_1}\n"
.string "from PROF. OAK!$"
-gUnknown_818E330:: @ 818E330
+PalletTown_ProfessorOaksLab_Text_OakCanReachNextTownWithMon:: @ 818E330
.string "OAK: If a wild POKéMON appears,\n"
.string "your POKéMON can battle it.\p"
.string "With it at your side, you should be\n"
.string "able to reach the next town.$"
-gUnknown_818E3AD:: @ 818E3AD
+PalletTown_ProfessorOaksLab_Text_OakBattleMonForItToGrow:: @ 818E3AD
.string "OAK: {PLAYER}, raise your young\n"
.string "POKéMON by making it battle.\p"
.string "It has to battle for it to grow.$"
-gUnknown_818E405:: @ 818E405
+PalletTown_ProfessorOaksLab_Text_OakHaveSomethingForMe:: @ 818E405
.string "OAK: Oh, {PLAYER}!\n"
.string "How is my old POKéMON?\p"
.string "Well, it seems to be growing more\n"
@@ -147,35 +147,35 @@ gUnknown_818E405:: @ 818E405
.string "What's that?\n"
.string "You have something for me?$"
-Text_18E4AF:: @ 818E4AF
+PalletTown_ProfessorOaksLab_Text_DeliveredOaksParcel:: @ 818E4AF
.string "{PLAYER} delivered OAK'S PARCEL.$"
-gUnknown_818E4CA:: @ 818E4CA
+PalletTown_ProfessorOaksLab_Text_OakCustomBallIOrdered:: @ 818E4CA
.string "Ah! \n"
.string "It's the custom POKé BALL!\p"
.string "I had it on order.\n"
.string "Thank you!$"
-gUnknown_818E508:: @ 818E508
+PalletTown_ProfessorOaksLab_Text_OakHaveRequestForYouTwo:: @ 818E508
.string "OAK: Oh, right!\n"
.string "I have a request for you two.$"
-gUnknown_818E536:: @ 818E536
+PalletTown_ProfessorOaksLab_Text_OakPokedexOnDesk:: @ 818E536
.string "On the desk there is my invention,\n"
.string "the POKéDEX!\p"
.string "It automatically records data on\n"
.string "POKéMON you've seen or caught.\p"
.string "It's a high-tech encyclopedia!$"
-gUnknown_818E5C5:: @ 818E5C5
+PalletTown_ProfessorOaksLab_Text_OakTakeTheseWithYou:: @ 818E5C5
.string "OAK: {PLAYER} and {RIVAL}.\n"
.string "Take these with you.$"
-Text_18E5EA:: @ 818E5EA
+PalletTown_ProfessorOaksLab_Text_ReceivedPokedexFromOak:: @ 818E5EA
.string "{PLAYER} received the POKéDEX\n"
.string "from PROF. OAK.$"
-gUnknown_818E612:: @ 818E612
+PalletTown_ProfessorOaksLab_Text_OakCatchMonsForDataTakeThese:: @ 818E612
.string "OAK: You can't get detailed data\n"
.string "on POKéMON by just seeing them.\p"
.string "You must catch them to obtain\n"
@@ -183,10 +183,10 @@ gUnknown_818E612:: @ 818E612
.string "So, here are some tools for\n"
.string "catching wild POKéMON.$"
-gUnknown_818E6B3:: @ 818E6B3
+PalletTown_ProfessorOaksLab_Text_ReceivedFivePokeBalls:: @ 818E6B3
.string "{PLAYER} received five POKé BALLS.$"
-gUnknown_818E6D0:: @ 818E6D0
+PalletTown_ProfessorOaksLab_Text_OakExplainCatching:: @ 818E6D0
.string "When a wild POKéMON appears,\n"
.string "it's fair game.\p"
.string "Just throw a POKé BALL at it and\n"
@@ -195,7 +195,7 @@ gUnknown_818E6D0:: @ 818E6D0
.string "A healthy POKéMON can escape.\n"
.string "You have to be lucky!$"
-gUnknown_818E784:: @ 818E784
+PalletTown_ProfessorOaksLab_Text_OakCompleteMonGuideWasMyDream:: @ 818E784
.string "To make a complete guide on all\n"
.string "the POKéMON in the world…\p"
.string "That was my dream!\p"
@@ -207,11 +207,11 @@ gUnknown_818E784:: @ 818E784
.string "This is a great undertaking in\n"
.string "POKéMON history!$"
-gUnknown_818E871:: @ 818E871
+PalletTown_ProfessorOaksLab_Text_OakMonsAroundWorldWait:: @ 818E871
.string "POKéMON around the world wait for\n"
.string "you, {PLAYER}!$"
-gUnknown_818E89C:: @ 818E89C
+PalletTown_ProfessorOaksLab_Text_OakAddedNothingToPokedex:: @ 818E89C
.string "Ah, {PLAYER}!\n"
.string "How is your POKéDEX shaping up?\p"
.string "{RIVAL} has already caught some\n"
@@ -223,34 +223,34 @@ gUnknown_818E89C:: @ 818E89C
.string "I'll give you these, so do try a\n"
.string "little harder.$"
-gUnknown_818E98E:: @ 818E98E
+PalletTown_ProfessorOaksLab_Text_OakComeSeeMeSometime:: @ 818E98E
.string "OAK: Come see me sometime.\p"
.string "After all, I want to know how your\n"
.string "POKéDEX is coming along.$"
-gUnknown_818E9E5:: @ 818E9E5
+PalletTown_ProfessorOaksLab_Text_BlankEncyclopedia:: @ 818E9E5
.string "It's like an encyclopedia, but the\n"
.string "pages are blank.$"
-gUnknown_818EA19:: @ 818EA19
+PalletTown_ProfessorOaksLab_Text_ThoseArePokeBalls:: @ 818EA19
.string "Those are POKé BALLS.\n"
.string "They contain POKéMON!$"
-gUnknown_818EA45:: @ 818EA45
+PalletTown_ProfessorOaksLab_Text_OaksLastMon:: @ 818EA45
.string "That's PROF. OAK's last POKéMON.$"
-gUnknown_818EA66:: @ 818EA66
+PalletTown_ProfessorOaksLab_Text_PressStartToOpenMenu:: @ 818EA66
.string "Press START to open the MENU!$"
-gUnknown_818EA84:: @ 818EA84
+PalletTown_ProfessorOaksLab_Text_SaveOptionInMenu:: @ 818EA84
.string "The SAVE option is on the MENU.\n"
.string "Use it regularly.$"
-gUnknown_818EAB6:: @ 818EAB6
+PalletTown_ProfessorOaksLab_Text_AllMonTypesHaveStrongAndWeakPoints:: @ 818EAB6
.string "All POKéMON types have strong and\n"
.string "weak points against others.$"
-gUnknown_818EAF4:: @ 818EAF4
+PalletTown_ProfessorOaksLab_Text_EmailMessage:: @ 818EAF4
.string "There's an e-mail message here.\p"
.string "…\p"
.string "Finally!\n"
@@ -264,11 +264,11 @@ gUnknown_818EAF4:: @ 818EAF4
.string "PROF. OAK, please visit us!\n"
.string "…$"
-gUnknown_818EBE6:: @ 818EBE6
+PalletTown_ProfessorOaksLab_Text_StudyAsOaksAide:: @ 818EBE6
.string "I study POKéMON as PROF. OAK's\n"
.string "AIDE.$"
-gUnknown_818EC0B:: @ 818EC0B
+PalletTown_ProfessorOaksLab_Text_DaisyWillGroomMons:: @ 818EC0B
.string "Hi, {PLAYER}. I bet you've become\n"
.string "good friends with your POKéMON.\p"
.string "By the way, did you know about\n"
@@ -280,25 +280,25 @@ gUnknown_818EC0B:: @ 818EC0B
.string "This is a secret, so please don't\n"
.string "tell anyone.$"
-gUnknown_818ED15:: @ 818ED15
+PalletTown_ProfessorOaksLab_Text_OakIsGoingToHaveRadioShow:: @ 818ED15
.string "PROF. OAK is going to have his own\n"
.string "radio show soon.\p"
.string "The program will be called PROF.\n"
.string "OAK's POKéMON SEMINAR.$"
-gUnknown_818ED81:: @ 818ED81
+PalletTown_ProfessorOaksLab_Text_OakIsAuthorityOnMons:: @ 818ED81
.string "PROF. OAK may not look like much,\n"
.string "but he's the authority on POKéMON.\p"
.string "Many POKéMON TRAINERS hold him in\n"
.string "high regard.$"
-gUnknown_818EDF5:: @ 818EDF5
+PalletTown_ProfessorOaksLab_Text_OakFavorToAskYouPlayer:: @ 818EDF5
.string "Ah, now this is excellent!\p"
.string "{PLAYER}, I have another important\n"
.string "favor to ask of you.\p"
.string "I need you to listen closely.$"
-gUnknown_818EE60:: @ 818EE60
+PalletTown_ProfessorOaksLab_Text_OakSightingsOfRareMons:: @ 818EE60
.string "Recently, there have been sightings\n"
.string "of many rare POKéMON species.\p"
.string "I'm talking about POKéMON that\n"
@@ -308,7 +308,7 @@ gUnknown_818EE60:: @ 818EE60
.string "Since I can't do it, {PLAYER}, I'd\n"
.string "like you to go in my place.$"
-gUnknown_818EF59:: @ 818EF59
+PalletTown_ProfessorOaksLab_Text_RivalJustLetMeHandleEverything:: @ 818EF59
.string "{RIVAL}: Hey, I heard that!\p"
.string "Gramps, what's with favoring\n"
.string "{PLAYER} over me all the time?\p"
@@ -317,27 +317,27 @@ gUnknown_818EF59:: @ 818EF59
.string "You should just let me handle\n"
.string "everything.$"
-gUnknown_818F004:: @ 818F004
+PalletTown_ProfessorOaksLab_Text_OakNeedYourHelpTooNeedToSeePokedexes:: @ 818F004
.string "OAK: I know, I know.\n"
.string "Of course I need your help, too.\p"
.string "Now, I need to see both your\n"
.string "POKéDEXES.$"
-gUnknown_818F062:: @ 818F062
+PalletTown_ProfessorOaksLab_Text_OakTookBothPokedexUnits:: @ 818F062
.string "PROF. OAK took both POKéDEX\n"
.string "units.$"
-gUnknown_818F085:: @ 818F085
+PalletTown_ProfessorOaksLab_Text_OakNowTheseUnitsCanRecordMoreData:: @ 818F085
.string "… … … … … …\p"
.string "… … … … … …\p"
.string "…And that's done!\p"
.string "Now these units can record data on\n"
.string "a lot more POKéMON.$"
-Text_18F0E8:: @ 818F0E8
+PalletTown_ProfessorOaksLab_Text_PlayersPokedexWasUpgraded:: @ 818F0E8
.string "{PLAYER}'s POKéDEX was upgraded!$"
-gUnknown_818F103:: @ 818F103
+PalletTown_ProfessorOaksLab_Text_OakMustReallyWorkToFillPokedex:: @ 818F103
.string "Now, {PLAYER} and {RIVAL}!\p"
.string "This time, you really must work\n"
.string "towards filling your POKéDEXES.\p"
@@ -346,7 +346,7 @@ gUnknown_818F103:: @ 818F103
.string "Truly, this is a monumentally great\n"
.string "undertaking in POKéMON history!$"
-gUnknown_818F1DB:: @ 818F1DB
+PalletTown_ProfessorOaksLab_Text_RivalIllCompleteThePokedex:: @ 818F1DB
.string "{RIVAL}: Gramps, calm down.\n"
.string "Don't get so excited.\p"
.string "I'll get the POKéDEX completed,\n"
diff --git a/data/scripts/pc.inc b/data/scripts/pc.inc
index 6e266bdfc..6dc544270 100644
--- a/data/scripts/pc.inc
+++ b/data/scripts/pc.inc
@@ -90,7 +90,7 @@ EventScript_AccessProfOaksPC:: @ 81A6A7A
compare VAR_RESULT, NO
goto_if_eq EventScript_ExitOaksPC
setflag FLAG_OAKS_RATING_IS_VIA_PC
- call ProfOak_EventScript_RatePokedex
+ call PokedexRating_EventScript_Rate
clearflag FLAG_OAKS_RATING_IS_VIA_PC
goto EventScript_ExitOaksPC
end
diff --git a/data/scripts/pokedex_rating.inc b/data/scripts/pokedex_rating.inc
index 4a3d39042..8d313d200 100644
--- a/data/scripts/pokedex_rating.inc
+++ b/data/scripts/pokedex_rating.inc
@@ -1,40 +1,40 @@
-ProfOak_EventScript_RatePokedexInPerson:: @ 81A737B
+PokedexRating_EventScript_RateInPerson:: @ 81A737B
goto_if_questlog EventScript_ReleaseEnd
special sub_8112364
- call_if_set FLAG_OAK_SAW_DEX_COMPLETION, ProfOak_EventScript_DexCompleteIntro
- call_if_unset FLAG_OAK_SAW_DEX_COMPLETION, ProfOak_EventScript_NormalIntro
- call ProfOak_EventScript_RatePokedex
+ call_if_set FLAG_OAK_SAW_DEX_COMPLETION, PokedexRating_EventScript_DexCompleteIntro
+ call_if_unset FLAG_OAK_SAW_DEX_COMPLETION, PokedexRating_EventScript_NormalIntro
+ call PokedexRating_EventScript_Rate
return
-ProfOak_EventScript_DexCompleteIntro:: @ 81A73A4
- msgbox Text_LoveSeeingYourPokedex
+PokedexRating_EventScript_DexCompleteIntro:: @ 81A73A4
+ msgbox PokedexRating_Text_LoveSeeingYourPokedex
return
-ProfOak_EventScript_NormalIntro:: @ 81A73AD
- msgbox Text_HowIsPokedexComingAlong
+PokedexRating_EventScript_NormalIntro:: @ 81A73AD
+ msgbox PokedexRating_Text_HowIsPokedexComingAlong
return
-ProfOak_EventScript_ShowRatingMsg:: @ 81A73B6
+PokedexRating_EventScript_ShowRatingMsg:: @ 81A73B6
copyvar VAR_0x8004, VAR_0x8009
special Special_GetProfOaksRatingMessage
waitmessage
compare VAR_RESULT, FALSE
- call_if_eq ProfOak_EventScript_RatingFanfare
+ call_if_eq PokedexRating_EventScript_NormalFanfare
compare VAR_RESULT, TRUE
- call_if_eq ProfOak_EventScript_DexCompleteFanfare
+ call_if_eq PokedexRating_EventScript_DexCompleteFanfare
waitfanfare
waitbuttonpress
return
-ProfOak_EventScript_RatingFanfare:: @ 81A73D8
+PokedexRating_EventScript_NormalFanfare:: @ 81A73D8
playfanfare MUS_FAN2
return
-ProfOak_EventScript_DexCompleteFanfare:: @ 81A73DC
+PokedexRating_EventScript_DexCompleteFanfare:: @ 81A73DC
playfanfare MUS_FANFA5
return
-ProfOak_EventScript_RatePokedex:: @ 81A73E0
+PokedexRating_EventScript_Rate:: @ 81A73E0
setvar VAR_0x8004, 31
special HelpSystem_BackupSomeVariable
special Special_SetSomeVariable
@@ -45,40 +45,40 @@ ProfOak_EventScript_RatePokedex:: @ 81A73E0
copyvar VAR_0x800A, VAR_RESULT
getnumberstring 0, VAR_0x8008 @ Num Kanto Seen
getnumberstring 1, VAR_0x8009 @ Num Kanto Caught
- msgbox Text_YouveSeenXAndOwnedYMons
- call_if_unset FLAG_OAKS_RATING_IS_VIA_PC, ProfOak_EventScript_SetTextColor
- call ProfOak_EventScript_ShowRatingMsg
+ msgbox PokedexRating_Text_SeenXOwnedY
+ call_if_unset FLAG_OAKS_RATING_IS_VIA_PC, PokedexRating_EventScript_SetTextColor
+ call PokedexRating_EventScript_ShowRatingMsg
compare VAR_0x800A, FALSE
- goto_if_eq ProfOak_EventScript_EndRatePokedex @ National Dex not enabled
+ goto_if_eq PokedexRating_EventScript_EndRating @ National Dex not enabled
setvar VAR_0x8004, 1
specialvar VAR_RESULT, Special_GetPokedexCount
copyvar VAR_0x8008, VAR_0x8005
copyvar VAR_0x8009, VAR_0x8006
getnumberstring 0, VAR_0x8008 @ Num National Seen
getnumberstring 1, VAR_0x8009 @ Num National Caught
- msgbox Text_AndNationalDexSeenXOwnedY
+ msgbox PokedexRating_Text_NationalDexSeenXOwnedY
specialvar VAR_RESULT, HasAllMons
compare VAR_RESULT, FALSE
- goto_if_eq ProfOak_EventScript_DexIncomplete
+ goto_if_eq PokedexRating_EventScript_DexIncomplete
compare VAR_RESULT, TRUE
- goto_if_eq ProfOak_EventScript_DexComplete
+ goto_if_eq PokedexRating_EventScript_DexComplete
end
-ProfOak_EventScript_SetTextColor:: @ 81A746D
+PokedexRating_EventScript_SetTextColor:: @ 81A746D
textcolor 0
return
-ProfOak_EventScript_DexIncomplete:: @ 81A7470
- msgbox Text_LookForwardToFilledNationalDex
- goto ProfOak_EventScript_EndRatePokedex
+PokedexRating_EventScript_DexIncomplete:: @ 81A7470
+ msgbox PokedexRating_Text_LookForwardToFilledNationalDex
+ goto PokedexRating_EventScript_EndRating
end
-ProfOak_EventScript_DexComplete:: @ 81A747E
+PokedexRating_EventScript_DexComplete:: @ 81A747E
setflag FLAG_OAK_SAW_DEX_COMPLETION
- msgbox Text_YouveCompletedDex
- goto ProfOak_EventScript_EndRatePokedex
+ msgbox PokedexRating_Text_YouveCompletedDex
+ goto PokedexRating_EventScript_EndRating
end
-ProfOak_EventScript_EndRatePokedex:: @ 81A748F
+PokedexRating_EventScript_EndRating:: @ 81A748F
special HelpSystem_RestoreSomeVariable
return
diff --git a/data/text/pokedex_rating.inc b/data/text/pokedex_rating.inc
index 306cd5225..a31f9f171 100644
--- a/data/text/pokedex_rating.inc
+++ b/data/text/pokedex_rating.inc
@@ -1,119 +1,119 @@
-Text_HowIsPokedexComingAlong:: @ 81A6C51
+PokedexRating_Text_HowIsPokedexComingAlong:: @ 81A6C51
.string "OAK: Good to see you!\n"
.string "How is your POKéDEX coming along?\p"
.string "Here, let me take a look.$"
-Text_YouveSeenXAndOwnedYMons:: @ 81A6CA3
+PokedexRating_Text_SeenXOwnedY:: @ 81A6CA3
.string "The amount of progress you've made\n"
.string "on your POKéDEX is:\p"
.string "{STR_VAR_1} POKéMON seen and\n"
.string "{STR_VAR_2} POKéMON owned.\p"
.string "{SIZE}ÁPROF. OAK's rating:$"
-gUnknown_81A6D17:: @ 81A6D17
+PokedexRating_Text_LessThan10:: @ 81A6D17
.string "You still have lots to do.\p"
.string "Go into every patch of grass you\n"
.string "see and look for POKéMON!$"
-gUnknown_81A6D6D:: @ 81A6D6D
+PokedexRating_Text_LessThan20:: @ 81A6D6D
.string "It looks as if you're getting on\n"
.string "the right track!\p"
.string "I've given one of my AIDES a FLASH\n"
.string "HM. Make sure you go get it!$"
-gUnknown_81A6DDF:: @ 81A6DDF
+PokedexRating_Text_LessThan30:: @ 81A6DDF
.string "Your POKéDEX could use a bit more\n"
.string "volume still!\p"
.string "Try to catch other species of\n"
.string "POKéMON!$"
-gUnknown_81A6E36:: @ 81A6E36
+PokedexRating_Text_LessThan40:: @ 81A6E36
.string "Good, it's apparent that you're\n"
.string "trying hard!\p"
.string "I've given one of my AIDES an\n"
.string "ITEMFINDER. Be sure to collect it!$"
-gUnknown_81A6EA4:: @ 81A6EA4
+PokedexRating_Text_LessThan50:: @ 81A6EA4
.string "Your POKéDEX is coming along quite\n"
.string "well!\p"
.string "I've given one of my AIDES an\n"
.string "AMULET COIN. Be sure to get it!$"
-gUnknown_81A6F0B:: @ 81A6F0B
+PokedexRating_Text_LessThan60:: @ 81A6F0B
.string "Ah, you've finally topped 50\n"
.string "species!\p"
.string "I've given one of my AIDES an EXP.\n"
.string "SHARE. Be sure to go get it!$"
-gUnknown_81A6F71:: @ 81A6F71
+PokedexRating_Text_LessThan70:: @ 81A6F71
.string "Hoho! This is turning into quite the\n"
.string "respectable POKéDEX!$"
-gUnknown_81A6FAB:: @ 81A6FAB
+PokedexRating_Text_LessThan80:: @ 81A6FAB
.string "Very good!\p"
.string "I think you'll collect even more\n"
.string "POKéMON by going fishing!$"
-gUnknown_81A6FF1:: @ 81A6FF1
+PokedexRating_Text_LessThan90:: @ 81A6FF1
.string "Wonderful! Let me guess… You\n"
.string "like to collect things, don't you?$"
-gUnknown_81A7031:: @ 81A7031
+PokedexRating_Text_LessThan100:: @ 81A7031
.string "I'm impressed!\n"
.string "It must have been difficult to do!$"
-gUnknown_81A7063:: @ 81A7063
+PokedexRating_Text_LessThan110:: @ 81A7063
.string "You've finally hit 100 species!\n"
.string "I can't believe how good you are!$"
-gUnknown_81A70A5:: @ 81A70A5
+PokedexRating_Text_LessThan120:: @ 81A70A5
.string "You even have the evolved forms\n"
.string "of POKéMON! Super!$"
-gUnknown_81A70D8:: @ 81A70D8
+PokedexRating_Text_LessThan130:: @ 81A70D8
.string "Excellent! Trade with friends to\n"
.string "get some more!$"
-gUnknown_81A7108:: @ 81A7108
+PokedexRating_Text_LessThan140:: @ 81A7108
.string "Outstanding!\n"
.string "You've become a real pro at this!$"
-gUnknown_81A7137:: @ 81A7137
+PokedexRating_Text_LessThan150:: @ 81A7137
.string "I have nothing left to say!\n"
.string "You're the POKéMON PROFESSOR now!$"
-gUnknown_81A7175:: @ 81A7175
+PokedexRating_Text_Complete:: @ 81A7175
.string "Your POKéDEX is entirely complete!\n"
.string "Congratulations!!$"
-Text_AndNationalDexSeenXOwnedY:: @ 81A71AA
+PokedexRating_Text_NationalDexSeenXOwnedY:: @ 81A71AA
.string "And your NATIONAL POKéDEX is:\p"
.string "{STR_VAR_1} POKéMON seen and\n"
.string "{STR_VAR_2} POKéMON owned.$"
-Text_LookForwardToFilledNationalDex:: @ 81A71EE
+PokedexRating_Text_LookForwardToFilledNationalDex:: @ 81A71EE
.string "I'll be looking forward to seeing\n"
.string "you fill the NATIONAL POKéDEX!$"
-Text_YouveCompletedDex:: @ 81A722F
+PokedexRating_Text_YouveCompletedDex:: @ 81A722F
.string "Finally…\p"
.string "You've finally completed the\n"
.string "POKéDEX!\p"
.string "It's magnificent!\n"
.string "Truly, this is a fantastic feat!$"
-Text_1A7291:: @ 81A7291
+PokedexRating_Text_Wroooaaarrr:: @ 81A7291
.string "Wroooooooaaaaaarrrr!$"
-Text_1A72A6:: @ 81A72A6
+PokedexRating_Text_HaHa:: @ 81A72A6
.string "はあ はあ‥$"
-gUnknown_81A72AD:: @ 81A72AD
+PokedexRating_Text_ThankYouMadeDreamReality:: @ 81A72AD
.string "Thank you, {PLAYER}!\n"
.string "Sincerely, thank you!\l"
.string "You've made my dream a reality!$"
-Text_LoveSeeingYourPokedex:: @ 81A72F2
+PokedexRating_Text_LoveSeeingYourPokedex:: @ 81A72F2
.string "OAK: Ah, welcome!\p"
.string "Tell me, how is your POKéDEX\n"
.string "coming along?\p"
diff --git a/data/text/sign_lady.inc b/data/text/sign_lady.inc
new file mode 100644
index 000000000..1c6d1c8f1
--- /dev/null
+++ b/data/text/sign_lady.inc
@@ -0,0 +1,30 @@
+@ For the NPC in Pallet Town that talks about the Trainer Tips sign
+
+PalletTown_Text_HmmIsThatRight:: @ 81B1C8B
+ .string "Hmm…\n"
+ .string "Is that right…$"
+
+PalletTown_Text_OhLookLook:: @ 81B1C9F
+ .string "Oh!\n"
+ .string "Look, look!$"
+
+PalletTown_Text_ReadItReadIt:: @ 81B1CAF
+ .string "Read it, read it!$"
+
+@ Used by sign
+PalletTown_Text_PressStartToOpenMenu:: @ 81B1CC1
+ .string "TRAINER TIPS\p"
+ .string "Press START to open the MENU!$"
+
+PalletTown_Text_SignsAreUsefulArentThey:: @ 81B1CEC
+ .string "Signs are useful, aren't they?$"
+
+PalletTown_Text_LookCopiedTrainerTipsSign:: @ 81B1D0B
+ .string "Look, look!\p"
+ .string "I copied what it said on one of\n"
+ .string "those TRAINER TIPS signs!$"
+
+@ Used by NPC
+PalletTown_Text_PressStartToOpenMenuCopy:: @ 81B1D51
+ .string "TRAINER TIPS!\p"
+ .string "Press START to open the MENU!$"
diff --git a/include/constants/vars.h b/include/constants/vars.h
index 043f5bc39..ca3642ca3 100644
--- a/include/constants/vars.h
+++ b/include/constants/vars.h
@@ -90,7 +90,7 @@
#define VAR_0x402F 0x402F
#define VAR_ICE_STEP_COUNT 0x4030
-#define VAR_STARTER_MON 0x4031
+#define VAR_STARTER_MON 0x4031 // 0: Bulbasaur, 1: Squirtle, 2: Charmander
#define VAR_0x4032 0x4032
#define VAR_ENIGMA_BERRY_AVAILABLE 0x4033
diff --git a/src/prof_pc.c b/src/prof_pc.c
index d1f06a2ba..ce81d9ce8 100644
--- a/src/prof_pc.c
+++ b/src/prof_pc.c
@@ -4,22 +4,22 @@
#include "field_message_box.h"
#include "constants/species.h"
-extern const u8 gUnknown_81A6D17[];
-extern const u8 gUnknown_81A6D6D[];
-extern const u8 gUnknown_81A6DDF[];
-extern const u8 gUnknown_81A6E36[];
-extern const u8 gUnknown_81A6EA4[];
-extern const u8 gUnknown_81A6F0B[];
-extern const u8 gUnknown_81A6F71[];
-extern const u8 gUnknown_81A6FAB[];
-extern const u8 gUnknown_81A6FF1[];
-extern const u8 gUnknown_81A7031[];
-extern const u8 gUnknown_81A7063[];
-extern const u8 gUnknown_81A70A5[];
-extern const u8 gUnknown_81A70D8[];
-extern const u8 gUnknown_81A7108[];
-extern const u8 gUnknown_81A7137[];
-extern const u8 gUnknown_81A7175[];
+extern const u8 PokedexRating_Text_LessThan10[];
+extern const u8 PokedexRating_Text_LessThan20[];
+extern const u8 PokedexRating_Text_LessThan30[];
+extern const u8 PokedexRating_Text_LessThan40[];
+extern const u8 PokedexRating_Text_LessThan50[];
+extern const u8 PokedexRating_Text_LessThan60[];
+extern const u8 PokedexRating_Text_LessThan70[];
+extern const u8 PokedexRating_Text_LessThan80[];
+extern const u8 PokedexRating_Text_LessThan90[];
+extern const u8 PokedexRating_Text_LessThan100[];
+extern const u8 PokedexRating_Text_LessThan110[];
+extern const u8 PokedexRating_Text_LessThan120[];
+extern const u8 PokedexRating_Text_LessThan130[];
+extern const u8 PokedexRating_Text_LessThan140[];
+extern const u8 PokedexRating_Text_LessThan150[];
+extern const u8 PokedexRating_Text_Complete[];
u16 Special_GetPokedexCount(void)
{
@@ -41,65 +41,67 @@ static const u8 *GetProfOaksRatingMessageByCount(u16 count)
gSpecialVar_Result = FALSE;
if (count < 10)
- return gUnknown_81A6D17;
+ return PokedexRating_Text_LessThan10;
if (count < 20)
- return gUnknown_81A6D6D;
+ return PokedexRating_Text_LessThan20;
if (count < 30)
- return gUnknown_81A6DDF;
+ return PokedexRating_Text_LessThan30;
if (count < 40)
- return gUnknown_81A6E36;
+ return PokedexRating_Text_LessThan40;
if (count < 50)
- return gUnknown_81A6EA4;
+ return PokedexRating_Text_LessThan50;
if (count < 60)
- return gUnknown_81A6F0B;
+ return PokedexRating_Text_LessThan60;
if (count < 70)
- return gUnknown_81A6F71;
+ return PokedexRating_Text_LessThan70;
if (count < 80)
- return gUnknown_81A6FAB;
+ return PokedexRating_Text_LessThan80;
if (count < 90)
- return gUnknown_81A6FF1;
+ return PokedexRating_Text_LessThan90;
if (count < 100)
- return gUnknown_81A7031;
+ return PokedexRating_Text_LessThan100;
if (count < 110)
- return gUnknown_81A7063;
+ return PokedexRating_Text_LessThan110;
if (count < 120)
- return gUnknown_81A70A5;
+ return PokedexRating_Text_LessThan120;
if (count < 130)
- return gUnknown_81A70D8;
+ return PokedexRating_Text_LessThan130;
if (count < 140)
- return gUnknown_81A7108;
+ return PokedexRating_Text_LessThan140;
if (count < 150)
- return gUnknown_81A7137;
+ return PokedexRating_Text_LessThan150;
if (count == 150)
{
+ // Mew doesn't count for completing the pokedex
if (GetSetPokedexFlag(SpeciesToNationalPokedexNum(SPECIES_MEW), 1))
- return gUnknown_81A7137;
+ return PokedexRating_Text_LessThan150;
+
gSpecialVar_Result = TRUE;
- return gUnknown_81A7175;
+ return PokedexRating_Text_Complete;
}
if (count == 151)
{
gSpecialVar_Result = TRUE;
- return gUnknown_81A7175;
+ return PokedexRating_Text_Complete;
}
- return gUnknown_81A6D17;
+ return PokedexRating_Text_LessThan10;
}
void Special_GetProfOaksRatingMessage(void)