dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #244 from GriffinRichards/doc-saffron

Browse Source 
Document Saffron City scripts
This commit is contained in:
PikalaxALT
2020-02-16 11:23:34 -05:00
committed by GitHub
parent 51b7b11a55 ce9f821b4e
commit 4e07002d13
62 changed files with 911 additions and 904 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/event_scripts.s
+8 -8
View File
@@ -418,15 +418,15 @@ gStdScriptsEnd::
.include "data/maps/CinnabarIsland_Mart/scripts.inc"
.include "data/maps/IndigoPlateau_PokemonCenter_1F/scripts.inc"
.include "data/maps/IndigoPlateau_PokemonCenter_2F/scripts.inc"
.include "data/maps/SaffronCity_House1_1F/scripts.inc"
.include "data/maps/SaffronCity_House1_2F/scripts.inc"
.include "data/maps/SaffronCity_CopycatsHouse_1F/scripts.inc"
.include "data/maps/SaffronCity_CopycatsHouse_2F/scripts.inc"
.include "data/maps/SaffronCity_Dojo/scripts.inc"
.include "data/maps/SaffronCity_Gym/scripts.inc"
.include "data/maps/SaffronCity_House2/scripts.inc"
.include "data/maps/SaffronCity_House/scripts.inc"
.include "data/maps/SaffronCity_Mart/scripts.inc"
.include "data/maps/SaffronCity_PokemonCenter_1F/scripts.inc"
.include "data/maps/SaffronCity_PokemonCenter_2F/scripts.inc"
.include "data/maps/SaffronCity_House3/scripts.inc"
.include "data/maps/SaffronCity_MrPsychicsHouse/scripts.inc"
.include "data/maps/SaffronCity_PokemonTrainerFanClub/scripts.inc"
.include "data/maps/Route2_ViridianForest_SouthEntrance/scripts.inc"
.include "data/maps/Route2_House/scripts.inc"
@@ -733,14 +733,14 @@ gStdScriptsEnd::
.include "data/maps/CinnabarIsland_PokemonCenter_1F/text.inc"
.include "data/maps/CinnabarIsland_Mart/text.inc"
.include "data/maps/IndigoPlateau_PokemonCenter_1F/text.inc"
.include "data/maps/SaffronCity_House1_1F/text.inc"
.include "data/maps/SaffronCity_House1_2F/text.inc"
.include "data/maps/SaffronCity_CopycatsHouse_1F/text.inc"
.include "data/maps/SaffronCity_CopycatsHouse_2F/text.inc"
.include "data/maps/SaffronCity_Dojo/text.inc"
.include "data/maps/SaffronCity_Gym/text.inc"
.include "data/maps/SaffronCity_House2/text.inc"
.include "data/maps/SaffronCity_House/text.inc"
.include "data/maps/SaffronCity_Mart/text.inc"
.include "data/maps/SaffronCity_PokemonCenter_1F/text.inc"
.include "data/maps/SaffronCity_House3/text.inc"
.include "data/maps/SaffronCity_MrPsychicsHouse/text.inc"
.include "data/maps/SaffronCity_PokemonTrainerFanClub/text.inc"
.include "data/maps/Route2_ViridianForest_SouthEntrance/text.inc"
.include "data/maps/Route2_House/text.inc"
data/layouts/SaffronCity_House1_1F/border.bin → data/layouts/SaffronCity_CopycatsHouse_1F/border.bin
View File
data/layouts/SaffronCity_House1_1F/map.bin → data/layouts/SaffronCity_CopycatsHouse_1F/map.bin
View File
data/layouts/SaffronCity_House1_2F/border.bin → data/layouts/SaffronCity_CopycatsHouse_2F/border.bin
View File
data/layouts/SaffronCity_House1_2F/map.bin → data/layouts/SaffronCity_CopycatsHouse_2F/map.bin
View File
data/layouts/layouts.json
+8 -8
View File
@@ -2504,28 +2504,28 @@
"blockdata_filepath": "data/layouts/RocketHideout_Elevator/map.bin"
},
{
"id": "LAYOUT_SAFFRON_CITY_HOUSE1_1F",
"name": "SaffronCity_House1_1F_Layout",
"id": "LAYOUT_SAFFRON_CITY_COPYCATS_HOUSE_1F",
"name": "SaffronCity_CopycatsHouse_1F_Layout",
"width": 13,
"height": 10,
"border_width": 2,
"border_height": 2,
"primary_tileset": "gTileset_82D4BB4",
"secondary_tileset": "gTileset_82D4C74",
"border_filepath": "data/layouts/SaffronCity_House1_1F/border.bin",
"blockdata_filepath": "data/layouts/SaffronCity_House1_1F/map.bin"
"border_filepath": "data/layouts/SaffronCity_CopycatsHouse_1F/border.bin",
"blockdata_filepath": "data/layouts/SaffronCity_CopycatsHouse_1F/map.bin"
},
{
"id": "LAYOUT_SAFFRON_CITY_HOUSE1_2F",
"name": "SaffronCity_House1_2F_Layout",
"id": "LAYOUT_SAFFRON_CITY_COPYCATS_HOUSE_2F",
"name": "SaffronCity_CopycatsHouse_2F_Layout",
"width": 12,
"height": 9,
"border_width": 2,
"border_height": 2,
"primary_tileset": "gTileset_82D4BB4",
"secondary_tileset": "gTileset_82D4C74",
"border_filepath": "data/layouts/SaffronCity_House1_2F/border.bin",
"blockdata_filepath": "data/layouts/SaffronCity_House1_2F/map.bin"
"border_filepath": "data/layouts/SaffronCity_CopycatsHouse_2F/border.bin",
"blockdata_filepath": "data/layouts/SaffronCity_CopycatsHouse_2F/map.bin"
},
{
"id": "LAYOUT_SAFFRON_CITY_DOJO",
data/maps/IndigoPlateau_PokemonCenter_1F/text.inc
+19
View File
@@ -22,3 +22,22 @@ gUnknown_819A943:: @ 819A943
.string "As a result, the POKéMON LEAGUE is\n"
.string "closed for the time being.$"
Text_19A9E7:: @ 819A9E7
.string "AGATHA's GHOST-type POKéMON are\n"
.string "horrifically terrifying in toughness.\p"
.string "I took my FIGHTING-type POKéMON\n"
.string "and raised them to the max.\p"
.string "I went at AGATHA feeling pretty\n"
.string "confident, but she whupped us.\p"
.string "That old lady's also got a really\n"
.string "short fuse, too.\p"
.string "It doesn't take anything to get\n"
.string "that scary lady hollering.$"
Text_19AB16:: @ 819AB16
.string "Maybe becoming an ELITE FOUR\n"
.string "member is in the blood.\p"
.string "From what I've heard, LANCE has\n"
.string "a cousin who's a GYM LEADER\l"
.string "somewhere far away.$"
data/maps/OneIsland/text.inc
-9
View File
@@ -1,12 +1,3 @@
Text_181569:: @ 8181569
.string "This FAN CLUB…\n"
.string "No one here has a clue!\p"
.string "How could they not recognize\n"
.string "the brilliance that is LANCE?\p"
.string "He stands for justice!\n"
.string "He's cool, and yet passionate!\l"
.string "He's the greatest, LANCE!$"
gUnknown_818161B:: @ 818161B
.string "BILL: Here we are!\n"
.string "This is ONE ISLAND.\p"
data/maps/Route5_PokemonDayCare/text.inc
+8
View File
@@ -58,3 +58,11 @@ Route5_PokemonDayCare_Text_YouveGotNoRoomForIt:: @ 819DFC2
Route5_PokemonDayCare_Text_DontHaveEnoughMoney:: @ 819E001
.string "You don't have enough money.$"
Text_19E01E:: @ 819E01E
.string "きみの\n"
.string "みてみるかね？$"
Text_19E02A:: @ 819E02A
.string "わるいけど　ひでんのわざを　もった\n"
.string "ポケモンは　あずかれないなぁ$"
data/maps/Route5_SouthEntrance/map.json
+4 -4
View File
@@ -23,7 +23,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "Route5_SouthEntrance_EventScript_16F901",
"script": "Route5_SouthEntrance_EventScript_Guard",
"flag": "0"
}
],
@@ -65,7 +65,7 @@
"elevation": 3,
"var": "VAR_MAP_SCENE_ROUTE5_ROUTE6_ROUTE7_ROUTE8_GATES",
"var_value": 0,
"script": "Route5_SouthEntrance_EventScript_16F90A"
"script": "Route5_SouthEntrance_EventScript_GuardTriggerLeft"
},
{
"type": "trigger",
@@ -74,7 +74,7 @@
"elevation": 3,
"var": "VAR_MAP_SCENE_ROUTE5_ROUTE6_ROUTE7_ROUTE8_GATES",
"var_value": 0,
"script": "Route5_SouthEntrance_EventScript_16F916"
"script": "Route5_SouthEntrance_EventScript_GuardTriggerMid"
},
{
"type": "trigger",
@@ -83,7 +83,7 @@
"elevation": 3,
"var": "VAR_MAP_SCENE_ROUTE5_ROUTE6_ROUTE7_ROUTE8_GATES",
"var_value": 0,
"script": "Route5_SouthEntrance_EventScript_16F922"
"script": "Route5_SouthEntrance_EventScript_GuardTriggerRight"
}
],
"bg_events": []
data/maps/Route5_SouthEntrance/scripts.inc
+30 -30
View File
@@ -1,87 +1,87 @@
Route5_SouthEntrance_MapScripts:: @ 816F900
.byte 0
Route5_SouthEntrance_EventScript_16F901:: @ 816F901
msgbox gUnknown_819E16D, MSGBOX_NPC
Route5_SouthEntrance_EventScript_Guard:: @ 816F901
msgbox Route5_SouthEntrance_Text_HiHowsItGoing, MSGBOX_NPC
end
Route5_SouthEntrance_EventScript_16F90A:: @ 816F90A
Route5_SouthEntrance_EventScript_GuardTriggerLeft:: @ 816F90A
lockall
setvar VAR_TEMP_1, 0
goto EventScript_16F92E
goto Route5_SouthEntrance_EventScript_GuardTrigger
end
Route5_SouthEntrance_EventScript_16F916:: @ 816F916
Route5_SouthEntrance_EventScript_GuardTriggerMid:: @ 816F916
lockall
setvar VAR_TEMP_1, 1
goto EventScript_16F92E
goto Route5_SouthEntrance_EventScript_GuardTrigger
end
Route5_SouthEntrance_EventScript_16F922:: @ 816F922
Route5_SouthEntrance_EventScript_GuardTriggerRight:: @ 816F922
lockall
setvar VAR_TEMP_1, 2
goto EventScript_16F92E
goto Route5_SouthEntrance_EventScript_GuardTrigger
end
EventScript_16F92E:: @ 816F92E
Route5_SouthEntrance_EventScript_GuardTrigger:: @ 816F92E
textcolor 0
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestLeft
waitmovement 0
goto_if_set FLAG_GOT_TEA, EventScript_16F958
msgbox gUnknown_819E04B
goto_if_set FLAG_GOT_TEA, Route5_SouthEntrance_EventScript_GiveTea
msgbox Route5_SouthEntrance_Text_ThirstyOnGuardDuty
closemessage
applymovement OBJ_EVENT_ID_PLAYER, Movement_16F9C4
applymovement OBJ_EVENT_ID_PLAYER, Route5_SouthEntrance_Movement_BlockPlayerEntry
waitmovement 0
releaseall
end
EventScript_16F958:: @ 816F958
Route5_SouthEntrance_EventScript_GiveTea:: @ 816F958
removeitem ITEM_TEA, 1
goto EventScript_16F963
goto Route5_SouthEntrance_EventScript_GuardDrinkTea
end
EventScript_16F963:: @ 816F963
msgbox gUnknown_819E09B
Route5_SouthEntrance_EventScript_GuardDrinkTea:: @ 816F963
msgbox Route5_SouthEntrance_Text_ThatTeaLooksTasty
closemessage
compare VAR_TEMP_1, 0
call_if_eq EventScript_16F99C
call_if_eq Route5_SouthEntrance_EventScript_WalkToGuardLeft
compare VAR_TEMP_1, 1
call_if_eq EventScript_16F9A7
call_if_eq Route5_SouthEntrance_EventScript_WalkToGuardMid
compare VAR_TEMP_1, 2
call_if_eq EventScript_16F9B2
msgbox gUnknown_819E0C1
call_if_eq Route5_SouthEntrance_EventScript_WalkToGuardRight
msgbox Route5_SouthEntrance_Text_ThanksIllShareTeaWithGuards
setvar VAR_MAP_SCENE_ROUTE5_ROUTE6_ROUTE7_ROUTE8_GATES, 1
releaseall
end
EventScript_16F99C:: @ 816F99C
applymovement OBJ_EVENT_ID_PLAYER, Movement_16F9C2
Route5_SouthEntrance_EventScript_WalkToGuardLeft:: @ 816F99C
applymovement OBJ_EVENT_ID_PLAYER, Route5_SouthEntrance_Movement_WalkToGuardLeft
waitmovement 0
return
EventScript_16F9A7:: @ 816F9A7
applymovement OBJ_EVENT_ID_PLAYER, Movement_16F9BD
Route5_SouthEntrance_EventScript_WalkToGuardMid:: @ 816F9A7
applymovement OBJ_EVENT_ID_PLAYER, Route5_SouthEntrance_Movement_WalkToGuardMid
waitmovement 0
return
EventScript_16F9B2:: @ 816F9B2
applymovement OBJ_EVENT_ID_PLAYER, Movement_16F9BF
Route5_SouthEntrance_EventScript_WalkToGuardRight:: @ 816F9B2
applymovement OBJ_EVENT_ID_PLAYER, Route5_SouthEntrance_Movement_WalkToGuardRight
waitmovement 0
return
Movement_16F9BD:: @ 816F9BD
Route5_SouthEntrance_Movement_WalkToGuardMid:: @ 816F9BD
walk_left
step_end
Movement_16F9BF:: @ 816F9BF
Route5_SouthEntrance_Movement_WalkToGuardRight:: @ 816F9BF
walk_left
walk_left
step_end
Movement_16F9C2:: @ 816F9C2
Route5_SouthEntrance_Movement_WalkToGuardLeft:: @ 816F9C2
walk_in_place_left
step_end
Movement_16F9C4:: @ 816F9C4
Route5_SouthEntrance_Movement_BlockPlayerEntry:: @ 816F9C4
walk_up
step_end
data/maps/Route5_SouthEntrance/text.inc
+4 -12
View File
@@ -1,21 +1,13 @@
Text_19E01E:: @ 819E01E
.string "きみの\n"
.string "みてみるかね？$"
Text_19E02A:: @ 819E02A
.string "わるいけど　ひでんのわざを　もった\n"
.string "ポケモンは　あずかれないなぁ$"
gUnknown_819E04B:: @ 819E04B
Route5_SouthEntrance_Text_ThirstyOnGuardDuty:: @ 819E04B
.string "I'm on guard duty.\n"
.string "Gee, I'm thirsty, though!\p"
.string "Oh, wait there, the road's closed.$"
gUnknown_819E09B:: @ 819E09B
Route5_SouthEntrance_Text_ThatTeaLooksTasty:: @ 819E09B
.string "Oh, that TEA…\n"
.string "It looks awfully tasty…$"
gUnknown_819E0C1:: @ 819E0C1
Route5_SouthEntrance_Text_ThanksIllShareTeaWithGuards:: @ 819E0C1
.string "Huh? I can have this drink?\n"
.string "Gee, thanks!\l"
.string "… …\l"
@@ -29,6 +21,6 @@ gUnknown_819E0C1:: @ 819E0C1
.string "I'll share this TEA with the other\n"
.string "guards!$"
gUnknown_819E16D:: @ 819E16D
Route5_SouthEntrance_Text_HiHowsItGoing:: @ 819E16D
.string "Hi, how's it going?$"
data/maps/Route6_NorthEntrance/map.json
+4 -4
View File
@@ -23,7 +23,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "Route6_NorthEntrance_EventScript_16F9C7",
"script": "Route6_NorthEntrance_EventScript_Guard",
"flag": "0"
}
],
@@ -65,7 +65,7 @@
"elevation": 3,
"var": "VAR_MAP_SCENE_ROUTE5_ROUTE6_ROUTE7_ROUTE8_GATES",
"var_value": 0,
"script": "Route6_NorthEntrance_EventScript_16F9D0"
"script": "Route6_NorthEntrance_EventScript_GuardTriggerLeft"
},
{
"type": "trigger",
@@ -74,7 +74,7 @@
"elevation": 3,
"var": "VAR_MAP_SCENE_ROUTE5_ROUTE6_ROUTE7_ROUTE8_GATES",
"var_value": 0,
"script": "Route6_NorthEntrance_EventScript_16F9DC"
"script": "Route6_NorthEntrance_EventScript_GuardTriggerMid"
},
{
"type": "trigger",
@@ -83,7 +83,7 @@
"elevation": 3,
"var": "VAR_MAP_SCENE_ROUTE5_ROUTE6_ROUTE7_ROUTE8_GATES",
"var_value": 0,
"script": "Route6_NorthEntrance_EventScript_16F9E8"
"script": "Route6_NorthEntrance_EventScript_GuardTriggerRight"
}
],
"bg_events": []
data/maps/Route6_NorthEntrance/scripts.inc
+30 -30
View File
@@ -1,87 +1,87 @@
Route6_NorthEntrance_MapScripts:: @ 816F9C6
.byte 0
Route6_NorthEntrance_EventScript_16F9C7:: @ 816F9C7
msgbox gUnknown_819E2A3, MSGBOX_NPC
Route6_NorthEntrance_EventScript_Guard:: @ 816F9C7
msgbox Route6_NorthEntrance_Text_HiHowsItGoing, MSGBOX_NPC
end
Route6_NorthEntrance_EventScript_16F9D0:: @ 816F9D0
Route6_NorthEntrance_EventScript_GuardTriggerLeft:: @ 816F9D0
lockall
setvar VAR_TEMP_1, 0
goto EventScript_16F9F4
goto Route6_NorthEntrance_EventScript_GuardTrigger
end
Route6_NorthEntrance_EventScript_16F9DC:: @ 816F9DC
Route6_NorthEntrance_EventScript_GuardTriggerMid:: @ 816F9DC
lockall
setvar VAR_TEMP_1, 1
goto EventScript_16F9F4
goto Route6_NorthEntrance_EventScript_GuardTrigger
end
Route6_NorthEntrance_EventScript_16F9E8:: @ 816F9E8
Route6_NorthEntrance_EventScript_GuardTriggerRight:: @ 816F9E8
lockall
setvar VAR_TEMP_1, 2
goto EventScript_16F9F4
goto Route6_NorthEntrance_EventScript_GuardTrigger
end
EventScript_16F9F4:: @ 816F9F4
Route6_NorthEntrance_EventScript_GuardTrigger:: @ 816F9F4
textcolor 0
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight
waitmovement 0
goto_if_set FLAG_GOT_TEA, EventScript_16FA1E
msgbox gUnknown_819E181
goto_if_set FLAG_GOT_TEA, Route6_NorthEntrance_EventScript_GiveTea
msgbox Route6_NorthEntrance_Text_ThirstyOnGuardDuty
closemessage
applymovement OBJ_EVENT_ID_PLAYER, Movement_16FA8A
applymovement OBJ_EVENT_ID_PLAYER, Route6_NorthEntrance_Movement_BlockPlayerEntry
waitmovement 0
releaseall
end
EventScript_16FA1E:: @ 816FA1E
Route6_NorthEntrance_EventScript_GiveTea:: @ 816FA1E
removeitem ITEM_TEA, 1
goto EventScript_16FA29
goto Route6_NorthEntrance_EventScript_GuardDrinkTea
end
EventScript_16FA29:: @ 816FA29
msgbox gUnknown_819E1D1
Route6_NorthEntrance_EventScript_GuardDrinkTea:: @ 816FA29
msgbox Route6_NorthEntrance_Text_ThatTeaLooksTasty
closemessage
compare VAR_TEMP_1, 0
call_if_eq EventScript_16FA62
call_if_eq Route6_NorthEntrance_EventScript_WalkToGuardLeft
compare VAR_TEMP_1, 1
call_if_eq EventScript_16FA6D
call_if_eq Route6_NorthEntrance_EventScript_WalkToGuardMid
compare VAR_TEMP_1, 2
call_if_eq EventScript_16FA78
msgbox gUnknown_819E1F7
call_if_eq Route6_NorthEntrance_EventScript_WalkToGuardRight
msgbox Route6_NorthEntrance_Text_ThanksIllShareTeaWithGuards
setvar VAR_MAP_SCENE_ROUTE5_ROUTE6_ROUTE7_ROUTE8_GATES, 1
releaseall
end
EventScript_16FA62:: @ 816FA62
applymovement OBJ_EVENT_ID_PLAYER, Movement_16FA83
Route6_NorthEntrance_EventScript_WalkToGuardLeft:: @ 816FA62
applymovement OBJ_EVENT_ID_PLAYER, Route6_NorthEntrance_Movement_WalkToGuardLeft
waitmovement 0
return
EventScript_16FA6D:: @ 816FA6D
applymovement OBJ_EVENT_ID_PLAYER, Movement_16FA86
Route6_NorthEntrance_EventScript_WalkToGuardMid:: @ 816FA6D
applymovement OBJ_EVENT_ID_PLAYER, Route6_NorthEntrance_Movement_WalkToGuardMid
waitmovement 0
return
EventScript_16FA78:: @ 816FA78
applymovement OBJ_EVENT_ID_PLAYER, Movement_16FA88
Route6_NorthEntrance_EventScript_WalkToGuardRight:: @ 816FA78
applymovement OBJ_EVENT_ID_PLAYER, Route6_NorthEntrance_Movement_WalkToGuardRight
waitmovement 0
return
Movement_16FA83:: @ 816FA83
Route6_NorthEntrance_Movement_WalkToGuardLeft:: @ 816FA83
walk_right
walk_right
step_end
Movement_16FA86:: @ 816FA86
Route6_NorthEntrance_Movement_WalkToGuardMid:: @ 816FA86
walk_right
step_end
Movement_16FA88:: @ 816FA88
Route6_NorthEntrance_Movement_WalkToGuardRight:: @ 816FA88
walk_in_place_right
step_end
Movement_16FA8A:: @ 816FA8A
Route6_NorthEntrance_Movement_BlockPlayerEntry:: @ 816FA8A
walk_down
step_end
data/maps/Route6_NorthEntrance/text.inc
+4 -4
View File
@@ -1,13 +1,13 @@
gUnknown_819E181:: @ 819E181
Route6_NorthEntrance_Text_ThirstyOnGuardDuty:: @ 819E181
.string "I'm on guard duty.\n"
.string "Gee, I'm thirsty, though!\p"
.string "Oh, wait there, the road's closed.$"
gUnknown_819E1D1:: @ 819E1D1
Route6_NorthEntrance_Text_ThatTeaLooksTasty:: @ 819E1D1
.string "Oh, that TEA…\n"
.string "It looks awfully tasty…$"
gUnknown_819E1F7:: @ 819E1F7
Route6_NorthEntrance_Text_ThanksIllShareTeaWithGuards:: @ 819E1F7
.string "Huh? I can have this drink?\n"
.string "Gee, thanks!\l"
.string "… …\l"
@@ -21,6 +21,6 @@ gUnknown_819E1F7:: @ 819E1F7
.string "I'll share this TEA with the other\n"
.string "guards!$"
gUnknown_819E2A3:: @ 819E2A3
Route6_NorthEntrance_Text_HiHowsItGoing:: @ 819E2A3
.string "Hi, how's it going?$"
data/maps/Route7_EastEntrance/map.json
+4 -4
View File
@@ -23,7 +23,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "Route7_EastEntrance_EventScript_16FA8E",
"script": "Route7_EastEntrance_EventScript_Guard",
"flag": "0"
}
],
@@ -65,7 +65,7 @@
"elevation": 3,
"var": "VAR_MAP_SCENE_ROUTE5_ROUTE6_ROUTE7_ROUTE8_GATES",
"var_value": 0,
"script": "Route7_EastEntrance_EventScript_16FA97"
"script": "Route7_EastEntrance_EventScript_GuardTriggerTop"
},
{
"type": "trigger",
@@ -74,7 +74,7 @@
"elevation": 3,
"var": "VAR_MAP_SCENE_ROUTE5_ROUTE6_ROUTE7_ROUTE8_GATES",
"var_value": 0,
"script": "Route7_EastEntrance_EventScript_16FAA3"
"script": "Route7_EastEntrance_EventScript_GuardTriggerMid"
},
{
"type": "trigger",
@@ -83,7 +83,7 @@
"elevation": 3,
"var": "VAR_MAP_SCENE_ROUTE5_ROUTE6_ROUTE7_ROUTE8_GATES",
"var_value": 0,
"script": "Route7_EastEntrance_EventScript_16FAAF"
"script": "Route7_EastEntrance_EventScript_GuardTriggerBottom"
}
],
"bg_events": []
data/maps/Route7_EastEntrance/scripts.inc
+30 -30
View File
@@ -1,87 +1,87 @@
Route7_EastEntrance_MapScripts:: @ 816FA8D
.byte 0
Route7_EastEntrance_EventScript_16FA8E:: @ 816FA8E
msgbox gUnknown_819E3D9, MSGBOX_NPC
Route7_EastEntrance_EventScript_Guard:: @ 816FA8E
msgbox Route7_EastEntrance_Text_HiHowsItGoing, MSGBOX_NPC
end
Route7_EastEntrance_EventScript_16FA97:: @ 816FA97
Route7_EastEntrance_EventScript_GuardTriggerTop:: @ 816FA97
lockall
setvar VAR_TEMP_1, 0
goto EventScript_16FABB
goto Route7_EastEntrance_EventScript_GuardTrigger
end
Route7_EastEntrance_EventScript_16FAA3:: @ 816FAA3
Route7_EastEntrance_EventScript_GuardTriggerMid:: @ 816FAA3
lockall
setvar VAR_TEMP_1, 1
goto EventScript_16FABB
goto Route7_EastEntrance_EventScript_GuardTrigger
end
Route7_EastEntrance_EventScript_16FAAF:: @ 816FAAF
Route7_EastEntrance_EventScript_GuardTriggerBottom:: @ 816FAAF
lockall
setvar VAR_TEMP_1, 2
goto EventScript_16FABB
goto Route7_EastEntrance_EventScript_GuardTrigger
end
EventScript_16FABB:: @ 816FABB
Route7_EastEntrance_EventScript_GuardTrigger:: @ 816FABB
textcolor 0
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp
waitmovement 0
goto_if_set FLAG_GOT_TEA, EventScript_16FAE5
msgbox gUnknown_819E2B7
goto_if_set FLAG_GOT_TEA, Route7_EastEntrance_EventScript_GiveTea
msgbox Route7_EastEntrance_Text_ThirstyOnGuardDuty
closemessage
applymovement OBJ_EVENT_ID_PLAYER, Movement_16FB51
applymovement OBJ_EVENT_ID_PLAYER, Route7_EastEntrance_Movement_BlockPlayerEntry
waitmovement 0
releaseall
end
EventScript_16FAE5:: @ 816FAE5
Route7_EastEntrance_EventScript_GiveTea:: @ 816FAE5
removeitem ITEM_TEA, 1
goto EventScript_16FAF0
goto Route7_EastEntrance_EventScript_GuardDrinkTea
end
EventScript_16FAF0:: @ 816FAF0
msgbox gUnknown_819E307
Route7_EastEntrance_EventScript_GuardDrinkTea:: @ 816FAF0
msgbox Route7_EastEntrance_Text_ThatTeaLooksTasty
closemessage
compare VAR_TEMP_1, 0
call_if_eq EventScript_16FB29
call_if_eq Route7_EastEntrance_WalkToGuardTop
compare VAR_TEMP_1, 1
call_if_eq EventScript_16FB34
call_if_eq Route7_EastEntrance_WalkToGuardMid
compare VAR_TEMP_1, 2
call_if_eq EventScript_16FB3F
msgbox gUnknown_819E32D
call_if_eq Route7_EastEntrance_WalkToGuardBottom
msgbox Route7_EastEntrance_Text_ThanksIllShareTeaWithGuards
setvar VAR_MAP_SCENE_ROUTE5_ROUTE6_ROUTE7_ROUTE8_GATES, 1
releaseall
end
EventScript_16FB29:: @ 816FB29
applymovement OBJ_EVENT_ID_PLAYER, Movement_16FB4F
Route7_EastEntrance_WalkToGuardTop:: @ 816FB29
applymovement OBJ_EVENT_ID_PLAYER, Route7_EastEntrance_Movement_WalkToGuardTop
waitmovement 0
return
EventScript_16FB34:: @ 816FB34
applymovement OBJ_EVENT_ID_PLAYER, Movement_16FB4A
Route7_EastEntrance_WalkToGuardMid:: @ 816FB34
applymovement OBJ_EVENT_ID_PLAYER, Route7_EastEntrance_Movement_WalkToGuardMid
waitmovement 0
return
EventScript_16FB3F:: @ 816FB3F
applymovement OBJ_EVENT_ID_PLAYER, Movement_16FB4C
Route7_EastEntrance_WalkToGuardBottom:: @ 816FB3F
applymovement OBJ_EVENT_ID_PLAYER, Route7_EastEntrance_Movement_WalkToGuardBottom
waitmovement 0
return
Movement_16FB4A:: @ 816FB4A
Route7_EastEntrance_Movement_WalkToGuardMid:: @ 816FB4A
walk_up
step_end
Movement_16FB4C:: @ 816FB4C
Route7_EastEntrance_Movement_WalkToGuardBottom:: @ 816FB4C
walk_up
walk_up
step_end
Movement_16FB4F:: @ 816FB4F
Route7_EastEntrance_Movement_WalkToGuardTop:: @ 816FB4F
walk_in_place_up
step_end
Movement_16FB51:: @ 816FB51
Route7_EastEntrance_Movement_BlockPlayerEntry:: @ 816FB51
walk_left
step_end
data/maps/Route7_EastEntrance/text.inc
+4 -4
View File
@@ -1,13 +1,13 @@
gUnknown_819E2B7:: @ 819E2B7
Route7_EastEntrance_Text_ThirstyOnGuardDuty:: @ 819E2B7
.string "I'm on guard duty.\n"
.string "Gee, I'm thirsty, though!\p"
.string "Oh, wait there, the road's closed.$"
gUnknown_819E307:: @ 819E307
Route7_EastEntrance_Text_ThatTeaLooksTasty:: @ 819E307
.string "Oh, that TEA…\n"
.string "It looks awfully tasty…$"
gUnknown_819E32D:: @ 819E32D
Route7_EastEntrance_Text_ThanksIllShareTeaWithGuards:: @ 819E32D
.string "Huh? I can have this drink?\n"
.string "Gee, thanks!\l"
.string "… …\l"
@@ -21,6 +21,6 @@ gUnknown_819E32D:: @ 819E32D
.string "I'll share this TEA with the other\n"
.string "guards!$"
gUnknown_819E3D9:: @ 819E3D9
Route7_EastEntrance_Text_HiHowsItGoing:: @ 819E3D9
.string "Hi, how's it going?$"
data/maps/Route8_WestEntrance/map.json
+4 -4
View File
@@ -23,7 +23,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "Route8_WestEntrance_EventScript_16FB54",
"script": "Route8_WestEntrance_EventScript_Guard",
"flag": "0"
}
],
@@ -65,7 +65,7 @@
"elevation": 3,
"var": "VAR_MAP_SCENE_ROUTE5_ROUTE6_ROUTE7_ROUTE8_GATES",
"var_value": 0,
"script": "Route8_WestEntrance_EventScript_16FB5D"
"script": "Route8_WestEntrance_EventScript_GuardTriggerTop"
},
{
"type": "trigger",
@@ -74,7 +74,7 @@
"elevation": 3,
"var": "VAR_MAP_SCENE_ROUTE5_ROUTE6_ROUTE7_ROUTE8_GATES",
"var_value": 0,
"script": "Route8_WestEntrance_EventScript_16FB69"
"script": "Route8_WestEntrance_EventScript_GuardTriggerMid"
},
{
"type": "trigger",
@@ -83,7 +83,7 @@
"elevation": 3,
"var": "VAR_MAP_SCENE_ROUTE5_ROUTE6_ROUTE7_ROUTE8_GATES",
"var_value": 0,
"script": "Route8_WestEntrance_EventScript_16FB75"
"script": "Route8_WestEntrance_EventScript_GuardTriggerBottom"
}
],
"bg_events": []
data/maps/Route8_WestEntrance/scripts.inc
+36 -34
View File
@@ -1,97 +1,99 @@
Route8_WestEntrance_MapScripts:: @ 816FB53
.byte 0
Route8_WestEntrance_EventScript_16FB54:: @ 816FB54
msgbox gUnknown_819E50F, MSGBOX_NPC
Route8_WestEntrance_EventScript_Guard:: @ 816FB54
msgbox Route8_WestEntrance_Text_HiHowsItGoing, MSGBOX_NPC
end
Route8_WestEntrance_EventScript_16FB5D:: @ 816FB5D
Route8_WestEntrance_EventScript_GuardTriggerTop:: @ 816FB5D
lockall
setvar VAR_TEMP_1, 0
goto EventScript_16FB81
goto Route8_WestEntrance_EventScript_GuardTrigger
end
Route8_WestEntrance_EventScript_16FB69:: @ 816FB69
Route8_WestEntrance_EventScript_GuardTriggerMid:: @ 816FB69
lockall
setvar VAR_TEMP_1, 1
goto EventScript_16FB81
goto Route8_WestEntrance_EventScript_GuardTrigger
end
Route8_WestEntrance_EventScript_16FB75:: @ 816FB75
Route8_WestEntrance_EventScript_GuardTriggerBottom:: @ 816FB75
lockall
setvar VAR_TEMP_1, 2
goto EventScript_16FB81
goto Route8_WestEntrance_EventScript_GuardTrigger
end
EventScript_16FB81:: @ 816FB81
Route8_WestEntrance_EventScript_GuardTrigger:: @ 816FB81
textcolor 0
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp
waitmovement 0
goto_if_set FLAG_GOT_TEA, EventScript_16FBAB
msgbox gUnknown_819E3ED
goto_if_set FLAG_GOT_TEA, Route8_WestEntrance_EventScript_GiveTea
msgbox Route8_WestEntrance_Text_ThirstyOnGuardDuty
closemessage
applymovement OBJ_EVENT_ID_PLAYER, Movement_16FC2D
applymovement OBJ_EVENT_ID_PLAYER, Route8_WestEntrance_Movement_BlockPlayerEntry
waitmovement 0
releaseall
end
EventScript_16FBAB:: @ 816FBAB
Route8_WestEntrance_EventScript_GiveTea:: @ 816FBAB
removeitem ITEM_TEA, 1
goto EventScript_16FBCC
goto Route8_WestEntrance_EventScript_GuardDrinkTea
end
EventScript_16FBB6:: @ 816FBB6
@ Unused
Route8_WestEntrance_EventScript_GiveSodaPop:: @ 816FBB6
removeitem ITEM_SODA_POP, 1
goto EventScript_16FBCC
goto Route8_WestEntrance_EventScript_GuardDrinkTea
end
EventScript_16FBC1:: @ 816FBC1
@ Unused
Route8_WestEntrance_EventScript_GiveLemonade:: @ 816FBC1
removeitem ITEM_LEMONADE, 1
goto EventScript_16FBCC
goto Route8_WestEntrance_EventScript_GuardDrinkTea
end
EventScript_16FBCC:: @ 816FBCC
msgbox gUnknown_819E43D
Route8_WestEntrance_EventScript_GuardDrinkTea:: @ 816FBCC
msgbox Route8_WestEntrance_Text_ThatTeaLooksTasty
closemessage
compare VAR_TEMP_1, 0
call_if_eq EventScript_16FC05
call_if_eq Route8_WestEntrance_EventScript_WalkToGuardTop
compare VAR_TEMP_1, 1
call_if_eq EventScript_16FC10
call_if_eq Route8_WestEntrance_EventScript_WalkToGuardMid
compare VAR_TEMP_1, 2
call_if_eq EventScript_16FC1B
msgbox gUnknown_819E463
call_if_eq Route8_WestEntrance_EventScript_WalkToGuardBottom
msgbox Route8_WestEntrance_Text_ThanksIllShareTeaWithGuards
setvar VAR_MAP_SCENE_ROUTE5_ROUTE6_ROUTE7_ROUTE8_GATES, 1
releaseall
end
EventScript_16FC05:: @ 816FC05
applymovement OBJ_EVENT_ID_PLAYER, Movement_16FC2B
Route8_WestEntrance_EventScript_WalkToGuardTop:: @ 816FC05
applymovement OBJ_EVENT_ID_PLAYER, Route8_WestEntrance_Movement_WalkToGuardTop
waitmovement 0
return
EventScript_16FC10:: @ 816FC10
applymovement OBJ_EVENT_ID_PLAYER, Movement_16FC26
Route8_WestEntrance_EventScript_WalkToGuardMid:: @ 816FC10
applymovement OBJ_EVENT_ID_PLAYER, Route8_WestEntrance_Movement_WalkToGuardMid
waitmovement 0
return
EventScript_16FC1B:: @ 816FC1B
applymovement OBJ_EVENT_ID_PLAYER, Movement_16FC28
Route8_WestEntrance_EventScript_WalkToGuardBottom:: @ 816FC1B
applymovement OBJ_EVENT_ID_PLAYER, Route8_WestEntrance_Movement_WalkToGuardBottom
waitmovement 0
return
Movement_16FC26:: @ 816FC26
Route8_WestEntrance_Movement_WalkToGuardMid:: @ 816FC26
walk_up
step_end
Movement_16FC28:: @ 816FC28
Route8_WestEntrance_Movement_WalkToGuardBottom:: @ 816FC28
walk_up
walk_up
step_end
Movement_16FC2B:: @ 816FC2B
Route8_WestEntrance_Movement_WalkToGuardTop:: @ 816FC2B
walk_in_place_up
step_end
Movement_16FC2D:: @ 816FC2D
Route8_WestEntrance_Movement_BlockPlayerEntry:: @ 816FC2D
walk_right
step_end
data/maps/Route8_WestEntrance/text.inc
+4 -4
View File
@@ -1,13 +1,13 @@
gUnknown_819E3ED:: @ 819E3ED
Route8_WestEntrance_Text_ThirstyOnGuardDuty:: @ 819E3ED
.string "I'm on guard duty.\n"
.string "Gee, I'm thirsty, though!\p"
.string "Oh, wait there, the road's closed.$"
gUnknown_819E43D:: @ 819E43D
Route8_WestEntrance_Text_ThatTeaLooksTasty:: @ 819E43D
.string "Oh, that TEA…\n"
.string "It looks awfully tasty…$"
gUnknown_819E463:: @ 819E463
Route8_WestEntrance_Text_ThanksIllShareTeaWithGuards:: @ 819E463
.string "Huh? I can have this drink?\n"
.string "Gee, thanks!\l"
.string "… …\l"
@@ -21,6 +21,6 @@ gUnknown_819E463:: @ 819E463
.string "I'll share this TEA with the other\n"
.string "guards!$"
gUnknown_819E50F:: @ 819E50F
Route8_WestEntrance_Text_HiHowsItGoing:: @ 819E50F
.string "Hi, how's it going?$"
data/maps/SaffronCity/map.json
+27 -27
View File
@@ -45,7 +45,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "SaffronCity_EventScript_16737A",
"script": "SaffronCity_EventScript_RocketGrunt1",
"flag": "FLAG_HIDE_SAFFRON_ROCKETS"
},
{
@@ -58,7 +58,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "SaffronCity_EventScript_167383",
"script": "SaffronCity_EventScript_RocketGrunt2",
"flag": "FLAG_HIDE_SAFFRON_ROCKETS"
},
{
@@ -71,7 +71,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "SaffronCity_EventScript_16738C",
"script": "SaffronCity_EventScript_RocketGrunt3",
"flag": "FLAG_HIDE_SAFFRON_ROCKETS"
},
{
@@ -84,7 +84,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "SaffronCity_EventScript_167395",
"script": "SaffronCity_EventScript_RocketGrunt4",
"flag": "FLAG_HIDE_SAFFRON_ROCKETS"
},
{
@@ -97,7 +97,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "SaffronCity_EventScript_16739E",
"script": "SaffronCity_EventScript_RocketGrunt5",
"flag": "FLAG_HIDE_SAFFRON_ROCKETS"
},
{
@@ -110,7 +110,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "SaffronCity_EventScript_1673B9",
"script": "SaffronCity_EventScript_DoorGuardGrunt",
"flag": "FLAG_HIDE_SAFFRON_ROCKETS"
},
{
@@ -123,7 +123,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "SaffronCity_EventScript_1673B0",
"script": "SaffronCity_EventScript_RocketGrunt7",
"flag": "FLAG_HIDE_SAFFRON_ROCKETS"
},
{
@@ -136,7 +136,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "SaffronCity_EventScript_1673A7",
"script": "SaffronCity_EventScript_RocketGrunt6",
"flag": "FLAG_HIDE_SAFFRON_ROCKETS"
},
{
@@ -149,7 +149,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "SaffronCity_EventScript_1673EC",
"script": "SaffronCity_EventScript_Youngster",
"flag": "FLAG_HIDE_SAFFRON_CIVILIANS"
},
{
@@ -162,7 +162,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "SaffronCity_EventScript_1673E3",
"script": "SaffronCity_EventScript_WorkerM",
"flag": "FLAG_HIDE_SAFFRON_CIVILIANS"
},
{
@@ -175,7 +175,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "SaffronCity_EventScript_16741A",
"script": "SaffronCity_EventScript_Man",
"flag": "FLAG_HIDE_SAFFRON_CIVILIANS"
},
{
@@ -188,7 +188,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "SaffronCity_EventScript_1673FE",
"script": "SaffronCity_EventScript_Boy",
"flag": "FLAG_HIDE_SAFFRON_CIVILIANS"
},
{
@@ -201,7 +201,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "SaffronCity_EventScript_167407",
"script": "SaffronCity_EventScript_Pidgeot",
"flag": "FLAG_HIDE_SAFFRON_CIVILIANS"
},
{
@@ -214,7 +214,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "SaffronCity_EventScript_1673F5",
"script": "SaffronCity_EventScript_Lass",
"flag": "FLAG_HIDE_SAFFRON_CIVILIANS"
},
{
@@ -227,7 +227,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "SaffronCity_EventScript_1AD03A",
"script": "SaffronCity_EventScript_BattleGirl",
"flag": "FLAG_HIDE_POSTGAME_GOSSIPERS"
}
],
@@ -243,7 +243,7 @@
"x": 22,
"y": 14,
"elevation": 0,
"dest_map": "MAP_SAFFRON_CITY_HOUSE1_1F",
"dest_map": "MAP_SAFFRON_CITY_COPYCATS_HOUSE_1F",
"dest_warp_id": 1
},
{
@@ -264,7 +264,7 @@
"x": 27,
"y": 21,
"elevation": 0,
"dest_map": "MAP_SAFFRON_CITY_HOUSE2",
"dest_map": "MAP_SAFFRON_CITY_HOUSE",
"dest_warp_id": 1
},
{
@@ -285,7 +285,7 @@
"x": 43,
"y": 38,
"elevation": 0,
"dest_map": "MAP_SAFFRON_CITY_HOUSE3",
"dest_map": "MAP_SAFFRON_CITY_MR_PSYCHICS_HOUSE",
"dest_warp_id": 1
},
{
@@ -345,63 +345,63 @@
"x": 29,
"y": 14,
"elevation": 0,
"script": "SaffronCity_EventScript_167423"
"script": "SaffronCity_EventScript_CitySign"
},
{
"type": "bg_event_type_0",
"x": 42,
"y": 14,
"elevation": 0,
"script": "SaffronCity_EventScript_16742C"
"script": "SaffronCity_EventScript_DojoSign"
},
{
"type": "bg_event_type_0",
"x": 13,
"y": 25,
"elevation": 0,
"script": "SaffronCity_EventScript_167471"
"script": "SaffronCity_EventScript_SilphProductSign"
},
{
"type": "bg_event_type_0",
"x": 18,
"y": 30,
"elevation": 0,
"script": "SaffronCity_EventScript_167456"
"script": "SaffronCity_EventScript_TrainerTips2"
},
{
"type": "bg_event_type_0",
"x": 29,
"y": 31,
"elevation": 0,
"script": "SaffronCity_EventScript_16745F"
"script": "SaffronCity_EventScript_SilphCoSign"
},
{
"type": "bg_event_type_0",
"x": 54,
"y": 25,
"elevation": 0,
"script": "SaffronCity_EventScript_16744D"
"script": "SaffronCity_EventScript_TrainerTips1"
},
{
"type": "bg_event_type_0",
"x": 50,
"y": 14,
"elevation": 0,
"script": "SaffronCity_EventScript_167435"
"script": "SaffronCity_EventScript_GymSign"
},
{
"type": "bg_event_type_0",
"x": 40,
"y": 38,
"elevation": 0,
"script": "SaffronCity_EventScript_167468"
"script": "SaffronCity_EventScript_MrPsychicsHouseSign"
},
{
"type": "bg_event_type_0",
"x": 49,
"y": 22,
"elevation": 0,
"script": "SaffronCity_EventScript_16747A"
"script": "SaffronCity_EventScript_TrainerFanClubSign"
}
]
}
data/maps/SaffronCity/scripts.inc
+51 -51
View File
@@ -4,121 +4,121 @@ SaffronCity_MapScripts:: @ 816735F
SaffronCity_OnTransition:: @ 8167365
setworldmapflag FLAG_WORLD_MAP_SAFFRON_CITY
call_if_unset FLAG_RESCUED_MR_FUJI, EventScript_167372
call_if_unset FLAG_RESCUED_MR_FUJI, SaffronCity_EventScript_MoveDoorGuardGrunt
end
EventScript_167372:: @ 8167372
SaffronCity_EventScript_MoveDoorGuardGrunt:: @ 8167372
setobjectxyperm 6, 33, 31
return
SaffronCity_EventScript_16737A:: @ 816737A
msgbox gUnknown_8181003, MSGBOX_NPC
SaffronCity_EventScript_RocketGrunt1:: @ 816737A
msgbox SaffronCity_Text_WhatDoYouWantGetLost, MSGBOX_NPC
end
SaffronCity_EventScript_167383:: @ 8167383
msgbox gUnknown_818101F, MSGBOX_NPC
SaffronCity_EventScript_RocketGrunt2:: @ 8167383
msgbox SaffronCity_Text_BossTakeTownForTeamRocket, MSGBOX_NPC
end
SaffronCity_EventScript_16738C:: @ 816738C
msgbox gUnknown_818105A, MSGBOX_NPC
SaffronCity_EventScript_RocketGrunt3:: @ 816738C
msgbox SaffronCity_Text_DontGetDefiantOrIllHurtYou, MSGBOX_NPC
end
SaffronCity_EventScript_167395:: @ 8167395
msgbox gUnknown_8181087, MSGBOX_NPC
SaffronCity_EventScript_RocketGrunt4:: @ 8167395
msgbox SaffronCity_Text_SaffronBelongsToTeamRocket, MSGBOX_NPC
end
SaffronCity_EventScript_16739E:: @ 816739E
msgbox gUnknown_81810A7, MSGBOX_NPC
SaffronCity_EventScript_RocketGrunt5:: @ 816739E
msgbox SaffronCity_Text_CriminalLifeMakesMeFeelAlive, MSGBOX_NPC
end
SaffronCity_EventScript_1673A7:: @ 81673A7
msgbox gUnknown_81810D5, MSGBOX_NPC
SaffronCity_EventScript_RocketGrunt6:: @ 81673A7
msgbox SaffronCity_Text_WatchWhereYoureWalking, MSGBOX_NPC
end
SaffronCity_EventScript_1673B0:: @ 81673B0
msgbox gUnknown_81810F5, MSGBOX_NPC
SaffronCity_EventScript_RocketGrunt7:: @ 81673B0
msgbox SaffronCity_Text_WeCanExploitMonsAroundWorld, MSGBOX_NPC
end
SaffronCity_EventScript_1673B9:: @ 81673B9
SaffronCity_EventScript_DoorGuardGrunt:: @ 81673B9
lock
goto_if_set FLAG_RESCUED_MR_FUJI, EventScript_1673D7
goto_if_set FLAG_RESCUED_MR_FUJI, SaffronCity_EventScript_DoorGuardAsleep
applymovement 6, Movement_FacePlayer
waitmovement 0
msgbox gUnknown_81812CA
msgbox SaffronCity_Text_ImASecurityGuard
release
end
EventScript_1673D7:: @ 81673D7
SaffronCity_EventScript_DoorGuardAsleep:: @ 81673D7
textcolor 3
msgbox gUnknown_8181302
msgbox SaffronCity_Text_HesTakingASnooze
release
end
SaffronCity_EventScript_1673E3:: @ 81673E3
msgbox gUnknown_8181159, MSGBOX_NPC
SaffronCity_EventScript_WorkerM:: @ 81673E3
msgbox SaffronCity_Text_YouBeatTeamRocket, MSGBOX_NPC
end
SaffronCity_EventScript_1673EC:: @ 81673EC
msgbox gUnknown_8181189, MSGBOX_NPC
SaffronCity_EventScript_Youngster:: @ 81673EC
msgbox SaffronCity_Text_SafeToGoOutAgain, MSGBOX_NPC
end
SaffronCity_EventScript_1673F5:: @ 81673F5
msgbox gUnknown_81811BF, MSGBOX_NPC
SaffronCity_EventScript_Lass:: @ 81673F5
msgbox SaffronCity_Text_PeopleComingBackToSaffron, MSGBOX_NPC
end
SaffronCity_EventScript_1673FE:: @ 81673FE
msgbox gUnknown_8181225, MSGBOX_NPC
SaffronCity_EventScript_Boy:: @ 81673FE
msgbox SaffronCity_Text_FlewHereOnPidgeot, MSGBOX_NPC
end
SaffronCity_EventScript_167407:: @ 8167407
SaffronCity_EventScript_Pidgeot:: @ 8167407
lock
faceplayer
waitse
playmoncry SPECIES_PIDGEOT, 0
msgbox gUnknown_8181286
msgbox SaffronCity_Text_Pidgeot
waitmoncry
release
end
SaffronCity_EventScript_16741A:: @ 816741A
msgbox gUnknown_8181299, MSGBOX_NPC
SaffronCity_EventScript_Man:: @ 816741A
msgbox SaffronCity_Text_SawRocketBossEscaping, MSGBOX_NPC
end
SaffronCity_EventScript_167423:: @ 8167423
msgbox gUnknown_8181326, MSGBOX_SIGN
SaffronCity_EventScript_CitySign:: @ 8167423
msgbox SaffronCity_Text_CitySign, MSGBOX_SIGN
end
SaffronCity_EventScript_16742C:: @ 816742C
msgbox gUnknown_8181354, MSGBOX_SIGN
SaffronCity_EventScript_DojoSign:: @ 816742C
msgbox SaffronCity_Text_FightingDojo, MSGBOX_SIGN
end
SaffronCity_EventScript_167435:: @ 8167435
SaffronCity_EventScript_GymSign:: @ 8167435
lockall
famechecker FAMECHECKER_SABRINA, 0
msgbox gUnknown_8181362
msgbox SaffronCity_Text_GymSign
releaseall
end
SaffronCity_EventScript_16744D:: @ 816744D
msgbox gUnknown_81813AA, MSGBOX_SIGN
SaffronCity_EventScript_TrainerTips1:: @ 816744D
msgbox SaffronCity_Text_FullHealCuresStatus, MSGBOX_SIGN
end
SaffronCity_EventScript_167456:: @ 8167456
msgbox gUnknown_8181452, MSGBOX_SIGN
SaffronCity_EventScript_TrainerTips2:: @ 8167456
msgbox SaffronCity_Text_GreatBallImprovedCatchRate, MSGBOX_SIGN
end
SaffronCity_EventScript_16745F:: @ 816745F
msgbox gUnknown_81814B9, MSGBOX_SIGN
SaffronCity_EventScript_SilphCoSign:: @ 816745F
msgbox SaffronCity_Text_SilphCoSign, MSGBOX_SIGN
end
SaffronCity_EventScript_167468:: @ 8167468
msgbox gUnknown_81814D3, MSGBOX_SIGN
SaffronCity_EventScript_MrPsychicsHouseSign:: @ 8167468
msgbox SaffronCity_Text_MrPsychicsHouse, MSGBOX_SIGN
end
SaffronCity_EventScript_167471:: @ 8167471
msgbox gUnknown_81814E7, MSGBOX_SIGN
SaffronCity_EventScript_SilphProductSign:: @ 8167471
msgbox SaffronCity_Text_SilphsLatestProduct, MSGBOX_SIGN
end
SaffronCity_EventScript_16747A:: @ 816747A
msgbox gUnknown_8181519, MSGBOX_SIGN
SaffronCity_EventScript_TrainerFanClubSign:: @ 816747A
msgbox SaffronCity_Text_TrainerFanClubSign, MSGBOX_SIGN
end
data/maps/SaffronCity/text.inc
+33 -24
View File
@@ -1,80 +1,80 @@
gUnknown_8181003:: @ 8181003
SaffronCity_Text_WhatDoYouWantGetLost:: @ 8181003
.string "What do you want?\n"
.string "Get lost!$"
gUnknown_818101F:: @ 818101F
SaffronCity_Text_BossTakeTownForTeamRocket:: @ 818101F
.string "BOSS said he'll take this town\n"
.string "in the name of TEAM ROCKET!$"
gUnknown_818105A:: @ 818105A
SaffronCity_Text_DontGetDefiantOrIllHurtYou:: @ 818105A
.string "Don't get defiant!\n"
.string "Or I'll have to hurt you!$"
gUnknown_8181087:: @ 8181087
SaffronCity_Text_SaffronBelongsToTeamRocket:: @ 8181087
.string "SAFFRON belongs to TEAM ROCKET!$"
gUnknown_81810A7:: @ 81810A7
SaffronCity_Text_CriminalLifeMakesMeFeelAlive:: @ 81810A7
.string "My life as a criminal makes me feel\n"
.string "so alive!$"
gUnknown_81810D5:: @ 81810D5
SaffronCity_Text_WatchWhereYoureWalking:: @ 81810D5
.string "Ow!\n"
.string "Watch where you're walking!$"
gUnknown_81810F5:: @ 81810F5
SaffronCity_Text_WeCanExploitMonsAroundWorld:: @ 81810F5
.string "With SILPH under control, we can\n"
.string "exploit POKéMON around the world!\p"
.string "We'll get stinking rich, yeahah!$"
gUnknown_8181159:: @ 8181159
SaffronCity_Text_YouBeatTeamRocket:: @ 8181159
.string "You beat TEAM ROCKET all alone?\n"
.string "That's amazing!$"
gUnknown_8181189:: @ 8181189
SaffronCity_Text_SafeToGoOutAgain:: @ 8181189
.string "Yeah! TEAM ROCKET is gone!\n"
.string "It's safe to go out again!$"
gUnknown_81811BF:: @ 81811BF
SaffronCity_Text_PeopleComingBackToSaffron:: @ 81811BF
.string "People fled from here in droves\n"
.string "when those ROCKETS came.\p"
.string "They should be flocking back to\n"
.string "SAFFRON now.$"
gUnknown_8181225:: @ 8181225
SaffronCity_Text_FlewHereOnPidgeot:: @ 8181225
.string "I flew here on my PIDGEOT when\n"
.string "I read about SILPH.\p"
.string "It's already over?\n"
.string "I missed the media action…$"
gUnknown_8181286:: @ 8181286
SaffronCity_Text_Pidgeot:: @ 8181286
.string "PIDGEOT: Bi bibii!$"
gUnknown_8181299:: @ 8181299
SaffronCity_Text_SawRocketBossEscaping:: @ 8181299
.string "I saw the ROCKET BOSS escaping\n"
.string "SILPH's building.$"
gUnknown_81812CA:: @ 81812CA
SaffronCity_Text_ImASecurityGuard:: @ 81812CA
.string "I'm a security guard.\p"
.string "Suspicious kids I don't allow in!$"
gUnknown_8181302:: @ 8181302
SaffronCity_Text_HesTakingASnooze:: @ 8181302
.string "…\n"
.string "Snore…\p"
.string "Hah! He's taking a snooze!$"
gUnknown_8181326:: @ 8181326
SaffronCity_Text_CitySign:: @ 8181326
.string "SAFFRON CITY\n"
.string "Shining, Golden Land of Commerce$"
gUnknown_8181354:: @ 8181354
SaffronCity_Text_FightingDojo:: @ 8181354
.string "FIGHTING DOJO$"
gUnknown_8181362:: @ 8181362
SaffronCity_Text_GymSign:: @ 8181362
.string "SAFFRON CITY POKéMON GYM\n"
.string "LEADER: SABRINA\l"
.string "The Master of PSYCHIC POKéMON!$"
gUnknown_81813AA:: @ 81813AA
SaffronCity_Text_FullHealCuresStatus:: @ 81813AA
.string "TRAINER TIPS\p"
.string "FULL HEAL cures all ailments like\n"
.string "burns, paralysis, poisoning,\l"
@@ -82,25 +82,34 @@ gUnknown_81813AA:: @ 81813AA
.string "It costs a bit more, but it's more\n"
.string "convenient than buying other items.$"
gUnknown_8181452:: @ 8181452
SaffronCity_Text_GreatBallImprovedCatchRate:: @ 8181452
.string "TRAINER TIPS\p"
.string "The new GREAT BALL offers improved\n"
.string "catching rates.\p"
.string "Try it on those hard-to-catch\n"
.string "POKéMON.$"
gUnknown_81814B9:: @ 81814B9
SaffronCity_Text_SilphCoSign:: @ 81814B9
.string "SILPH CO. OFFICE BUILDING$"
gUnknown_81814D3:: @ 81814D3
SaffronCity_Text_MrPsychicsHouse:: @ 81814D3
.string "MR. PSYCHIC'S HOUSE$"
gUnknown_81814E7:: @ 81814E7
SaffronCity_Text_SilphsLatestProduct:: @ 81814E7
.string "SILPH's latest product!\n"
.string "Release to be determined…$"
gUnknown_8181519:: @ 8181519
SaffronCity_Text_TrainerFanClubSign:: @ 8181519
.string "POKéMON TRAINER FAN CLUB\p"
.string "Many TRAINERS have scribbled their\n"
.string "names on this sign.$"
SaffronCity_Text_HowCanClubNotRecognizeLance:: @ 8181569
.string "This FAN CLUB…\n"
.string "No one here has a clue!\p"
.string "How could they not recognize\n"
.string "the brilliance that is LANCE?\p"
.string "He stands for justice!\n"
.string "He's cool, and yet passionate!\l"
.string "He's the greatest, LANCE!$"
data/maps/SaffronCity_House1_1F/map.json → data/maps/SaffronCity_CopycatsHouse_1F/map.json
+7 -7
View File
@@ -1,7 +1,7 @@
{
"id": "MAP_SAFFRON_CITY_HOUSE1_1F",
"name": "SaffronCity_House1_1F",
"layout": "LAYOUT_SAFFRON_CITY_HOUSE1_1F",
"id": "MAP_SAFFRON_CITY_COPYCATS_HOUSE_1F",
"name": "SaffronCity_CopycatsHouse_1F",
"layout": "LAYOUT_SAFFRON_CITY_COPYCATS_HOUSE_1F",
"music": "MUS_NIBI",
"region_map_section": "MAPSEC_SAFFRON_CITY",
"requires_flash": false,
@@ -23,7 +23,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "SaffronCity_House1_1F_EventScript_16EB40",
"script": "SaffronCity_CopycatsHouse_1F_EventScript_CopycatsDad",
"flag": "0"
},
{
@@ -36,7 +36,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "SaffronCity_House1_1F_EventScript_16EB37",
"script": "SaffronCity_CopycatsHouse_1F_EventScript_CopycatsMom",
"flag": "0"
},
{
@@ -49,7 +49,7 @@
"movement_range_y": 2,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "SaffronCity_House1_1F_EventScript_16EB49",
"script": "SaffronCity_CopycatsHouse_1F_EventScript_Chansey",
"flag": "0"
}
],
@@ -79,7 +79,7 @@
"x": 10,
"y": 2,
"elevation": 3,
"dest_map": "MAP_SAFFRON_CITY_HOUSE1_2F",
"dest_map": "MAP_SAFFRON_CITY_COPYCATS_HOUSE_2F",
"dest_warp_id": 0
}
],
data/maps/SaffronCity_CopycatsHouse_1F/scripts.inc
+20
View File
@@ -0,0 +1,20 @@
SaffronCity_CopycatsHouse_1F_MapScripts:: @ 816EB36
.byte 0
SaffronCity_CopycatsHouse_1F_EventScript_CopycatsMom:: @ 816EB37
msgbox SaffronCity_CopycatsHouse_1F_Text_DaughterIsSelfCentered, MSGBOX_NPC
end
SaffronCity_CopycatsHouse_1F_EventScript_CopycatsDad:: @ 816EB40
msgbox SaffronCity_CopycatsHouse_1F_Text_DaughterLikesToMimicPeople, MSGBOX_NPC
end
SaffronCity_CopycatsHouse_1F_EventScript_Chansey:: @ 816EB49
lock
faceplayer
waitse
playmoncry SPECIES_CHANSEY, 0
msgbox SaffronCity_CopycatsHouse_1F_Text_Chansey
waitmoncry
release
end
data/maps/SaffronCity_CopycatsHouse_1F/text.inc
+13
View File
@@ -0,0 +1,13 @@
SaffronCity_CopycatsHouse_1F_Text_DaughterIsSelfCentered:: @ 819AB9B
.string "My daughter is so self-centered.\n"
.string "She has but a few friends.$"
SaffronCity_CopycatsHouse_1F_Text_DaughterLikesToMimicPeople:: @ 819ABD7
.string "My daughter likes to mimic people.\n"
.string "It's rather vexing.\p"
.string "Her mimicry has earned her the\n"
.string "nickname COPYCAT around here.$"
SaffronCity_CopycatsHouse_1F_Text_Chansey:: @ 819AC4B
.string "CHANSEY: Chaan! Sii!$"
data/maps/SaffronCity_House1_2F/map.json → data/maps/SaffronCity_CopycatsHouse_2F/map.json
+11 -11
View File
@@ -1,7 +1,7 @@
{
"id": "MAP_SAFFRON_CITY_HOUSE1_2F",
"name": "SaffronCity_House1_2F",
"layout": "LAYOUT_SAFFRON_CITY_HOUSE1_2F",
"id": "MAP_SAFFRON_CITY_COPYCATS_HOUSE_2F",
"name": "SaffronCity_CopycatsHouse_2F",
"layout": "LAYOUT_SAFFRON_CITY_COPYCATS_HOUSE_2F",
"music": "MUS_NIBI",
"region_map_section": "MAPSEC_SAFFRON_CITY",
"requires_flash": false,
@@ -23,7 +23,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "SaffronCity_House1_2F_EventScript_16EB5D",
"script": "SaffronCity_CopycatsHouse_2F_EventScript_Doduo",
"flag": "0"
},
{
@@ -36,7 +36,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "SaffronCity_House1_2F_EventScript_16EB70",
"script": "SaffronCity_CopycatsHouse_2F_EventScript_Doll",
"flag": "0"
},
{
@@ -49,7 +49,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "SaffronCity_House1_2F_EventScript_16EB70",
"script": "SaffronCity_CopycatsHouse_2F_EventScript_Doll",
"flag": "0"
},
{
@@ -62,7 +62,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "SaffronCity_House1_2F_EventScript_16EB7B",
"script": "SaffronCity_CopycatsHouse_2F_EventScript_Copycat",
"flag": "0"
}
],
@@ -71,7 +71,7 @@
"x": 10,
"y": 2,
"elevation": 3,
"dest_map": "MAP_SAFFRON_CITY_HOUSE1_1F",
"dest_map": "MAP_SAFFRON_CITY_COPYCATS_HOUSE_1F",
"dest_warp_id": 3
}
],
@@ -82,14 +82,14 @@
"x": 1,
"y": 1,
"elevation": 0,
"script": "SaffronCity_House1_2F_EventScript_16EBC9"
"script": "SaffronCity_CopycatsHouse_2F_EventScript_Computer"
},
{
"type": "bg_event_type_0",
"x": 3,
"y": 5,
"elevation": 0,
"script": "SaffronCity_House1_2F_EventScript_16EBD2"
"script": "SaffronCity_CopycatsHouse_2F_EventScript_Game"
},
{
"type": "hidden_item",
@@ -97,7 +97,7 @@
"y": 1,
"elevation": 0,
"item": "ITEM_NUGGET",
"flag": "HIDDEN_ITEM_SAFFRON_CITY_HOUSE1_2F_NUGGET",
"flag": "HIDDEN_ITEM_SAFFRON_CITY_COPYCATS_HOUSE_2F_NUGGET",
"quantity": 1,
"underfoot": false
}
data/maps/SaffronCity_CopycatsHouse_2F/scripts.inc
+50
View File
@@ -0,0 +1,50 @@
SaffronCity_CopycatsHouse_2F_MapScripts:: @ 816EB5C
.byte 0
SaffronCity_CopycatsHouse_2F_EventScript_Doduo:: @ 816EB5D
lock
faceplayer
waitse
playmoncry SPECIES_DODUO, 0
msgbox SaffronCity_CopycatsHouse_2F_Text_Doduo
waitmoncry
release
end
SaffronCity_CopycatsHouse_2F_EventScript_Doll:: @ 816EB70
lock
msgbox SaffronCity_CopycatsHouse_2F_Text_RareMonOnlyDoll
release
end
SaffronCity_CopycatsHouse_2F_EventScript_Copycat:: @ 816EB7B
goto_if_questlog EventScript_ReleaseEnd
special sub_8112364
lock
faceplayer
checkitem ITEM_POKE_DOLL, 1
compare VAR_RESULT, TRUE
goto_if_eq EventScript_MimicTutor
checkplayergender
compare VAR_RESULT, MALE
call_if_eq SaffronCity_CopycatsHouse_2F_EventScript_MimicPlayerMale
compare VAR_RESULT, FEMALE
call_if_eq SaffronCity_CopycatsHouse_2F_EventScript_MimicPlayerFemale
release
end
SaffronCity_CopycatsHouse_2F_EventScript_MimicPlayerMale:: @ 816EBB7
msgbox SaffronCity_CopycatsHouse_2F_Text_MimickingFavoriteHobbyMale
return
SaffronCity_CopycatsHouse_2F_EventScript_MimicPlayerFemale:: @ 816EBC0
msgbox SaffronCity_CopycatsHouse_2F_Text_MimickingFavoriteHobbyFemale
return
SaffronCity_CopycatsHouse_2F_EventScript_Computer:: @ 816EBC9
msgbox SaffronCity_CopycatsHouse_2F_Text_MySecrets, MSGBOX_SIGN
end
SaffronCity_CopycatsHouse_2F_EventScript_Game:: @ 816EBD2
msgbox SaffronCity_CopycatsHouse_2F_Text_MarioWearingABucket, MSGBOX_SIGN
end
data/maps/SaffronCity_House1_2F/text.inc → data/maps/SaffronCity_CopycatsHouse_2F/text.inc
+11 -9
View File
@@ -1,4 +1,4 @@
gUnknown_819AC60:: @ 819AC60
SaffronCity_CopycatsHouse_2F_Text_MimickingFavoriteHobbyMale:: @ 819AC60
.string "{PLAYER}: Hi!\n"
.string "Do you like POKéMON?\p"
.string "{PLAYER}: Uh, no, I just asked you.\p"
@@ -7,7 +7,7 @@ gUnknown_819AC60:: @ 819AC60
.string "COPYCAT: Hmm? Quit mimicking?\n"
.string "But, that's my favorite hobby!$"
gUnknown_819ACF1:: @ 819ACF1
SaffronCity_CopycatsHouse_2F_Text_MimickingFavoriteHobbyFemale:: @ 819ACF1
.string "{PLAYER}: Hi.\n"
.string "You must like POKéMON.\p"
.string "{PLAYER}: No, not me.\n"
@@ -51,10 +51,10 @@ Text_MimicTaughtFemale:: @ 819AE90
.string "COPYCAT: You bet!\n"
.string "It's a scream!$"
Text_19AF1A:: @ 819AF1A
SaffronCity_CopycatsHouse_2F_Text_TooMuchInBag:: @ 819AF1A
.string "にもつが　いっぱいね！$"
Text_19AF26:: @ 819AF26
SaffronCity_CopycatsHouse_2F_Text_MimickingFavoriteHobbyMaleJP:: @ 819AF26
.string "{PLAYER}“やあ！　こんにちは！\n"
.string "きみ　ポケモン　すきかい？\p"
.string "{PLAYER}“ぼく　じゃなくって\n"
@@ -66,7 +66,7 @@ Text_19AF26:: @ 819AF26
.string "だって　あたし　\n"
.string "ものまね　しゅみ　なんだ　もん！”$"
Text_19AFB0:: @ 819AFB0
SaffronCity_CopycatsHouse_2F_Text_MimickingFavoriteHobbyFemaleJP:: @ 819AFB0
.string "{PLAYER}“こんにちは！\n"
.string "ポケモン　すきなのね？\p"
.string "{PLAYER}“わたし　じゃなくって\n"
@@ -78,23 +78,25 @@ Text_19AFB0:: @ 819AFB0
.string "だって　あたし\n"
.string "ものまね　しゅみ　なんだ　もん！$"
gUnknown_819B030:: @ 819B030
SaffronCity_CopycatsHouse_2F_Text_Doduo:: @ 819B030
.string "DODUO: Giiih!\p"
.string "PRETTY MIRROR LOOK AT ME,\n"
.string "SEE HOW PRETTY I CAN BE?$"
gUnknown_819B071:: @ 819B071
SaffronCity_CopycatsHouse_2F_Text_RareMonOnlyDoll:: @ 819B071
.string "This is a rare POKéMON!\n"
.string "Huh? It's only a doll!$"
gUnknown_819B0A0:: @ 819B0A0
SaffronCity_CopycatsHouse_2F_Text_MarioWearingABucket:: @ 819B0A0
.string "A game with MARIO wearing a bucket\n"
.string "on his head!$"
gUnknown_819B0D0:: @ 819B0D0
SaffronCity_CopycatsHouse_2F_Text_MySecrets:: @ 819B0D0
.string "…\p"
.string "My Secrets!\p"
.string "Skill: Mimicry!\n"
.string "Hobby: Collecting dolls!\l"
.string "Favorite POKéMON: CLEFAIRY!$"
SaffronCity_CopycatsHouse_2F_Text_HuhCantSee:: @ 819B123
.string "？　みえないぞ‥$"
data/maps/SaffronCity_Dojo/map.json
+13 -13
View File
@@ -23,7 +23,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 7,
"script": "SaffronCity_Dojo_EventScript_16ED46",
"script": "SaffronCity_Dojo_EventScript_Hitoshi",
"flag": "0"
},
{
@@ -36,7 +36,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 7,
"script": "SaffronCity_Dojo_EventScript_16ED5D",
"script": "SaffronCity_Dojo_EventScript_Hideki",
"flag": "0"
},
{
@@ -49,7 +49,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 7,
"script": "SaffronCity_Dojo_EventScript_16ED74",
"script": "SaffronCity_Dojo_EventScript_Aaron",
"flag": "0"
},
{
@@ -62,7 +62,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 7,
"script": "SaffronCity_Dojo_EventScript_16ED8B",
"script": "SaffronCity_Dojo_EventScript_Mike",
"flag": "0"
},
{
@@ -75,7 +75,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 2,
"script": "SaffronCity_Dojo_EventScript_16EDA2",
"script": "SaffronCity_Dojo_EventScript_MasterKoichi",
"flag": "0"
},
{
@@ -88,7 +88,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "SaffronCity_Dojo_EventScript_16EC00",
"script": "SaffronCity_Dojo_EventScript_HitmonleeBall",
"flag": "FLAG_HIDE_DOJO_HITMONLEE_BALL"
},
{
@@ -101,7 +101,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "SaffronCity_Dojo_EventScript_16EC46",
"script": "SaffronCity_Dojo_EventScript_HitmonchanBall",
"flag": "FLAG_HIDE_DOJO_HITMONCHAN_BALL"
}
],
@@ -136,7 +136,7 @@
"elevation": 3,
"var": "VAR_MAP_SCENE_SAFFRON_CITY_DOJO",
"var_value": 0,
"script": "SaffronCity_Dojo_EventScript_16EBDC"
"script": "SaffronCity_Dojo_EventScript_TriggerMasterBattleLeft"
},
{
"type": "trigger",
@@ -145,7 +145,7 @@
"elevation": 3,
"var": "VAR_MAP_SCENE_SAFFRON_CITY_DOJO",
"var_value": 0,
"script": "SaffronCity_Dojo_EventScript_16EBEE"
"script": "SaffronCity_Dojo_EventScript_TriggerMasterBattleRight"
}
],
"bg_events": [
@@ -154,28 +154,28 @@
"x": 3,
"y": 13,
"elevation": 0,
"script": "SaffronCity_Dojo_EventScript_16ED2B"
"script": "SaffronCity_Dojo_EventScript_Statue"
},
{
"type": "bg_event_type_0",
"x": 9,
"y": 13,
"elevation": 0,
"script": "SaffronCity_Dojo_EventScript_16ED2B"
"script": "SaffronCity_Dojo_EventScript_Statue"
},
{
"type": "bg_event_type_0",
"x": 5,
"y": 2,
"elevation": 0,
"script": "SaffronCity_Dojo_EventScript_16ED34"
"script": "SaffronCity_Dojo_EventScript_LeftScroll"
},
{
"type": "bg_event_type_0",
"x": 7,
"y": 2,
"elevation": 0,
"script": "SaffronCity_Dojo_EventScript_16ED3D"
"script": "SaffronCity_Dojo_EventScript_RightScroll"
}
]
}
data/maps/SaffronCity_Dojo/scripts.inc
+57 -55
View File
@@ -1,157 +1,159 @@
.equ LOCALID_KARATE_MASTER, 5
SaffronCity_Dojo_MapScripts:: @ 816EBDB
.byte 0
SaffronCity_Dojo_EventScript_16EBDC:: @ 816EBDC
SaffronCity_Dojo_EventScript_TriggerMasterBattleLeft:: @ 816EBDC
lockall
setvar VAR_MAP_SCENE_SAFFRON_CITY_DOJO, 1
applymovement 5, Movement_WalkInPlaceFastestLeft
applymovement LOCALID_KARATE_MASTER, Movement_WalkInPlaceFastestLeft
waitmovement 0
releaseall
end
SaffronCity_Dojo_EventScript_16EBEE:: @ 816EBEE
SaffronCity_Dojo_EventScript_TriggerMasterBattleRight:: @ 816EBEE
lockall
setvar VAR_MAP_SCENE_SAFFRON_CITY_DOJO, 1
applymovement 5, Movement_WalkInPlaceFastestRight
applymovement LOCALID_KARATE_MASTER, Movement_WalkInPlaceFastestRight
waitmovement 0
releaseall
end
SaffronCity_Dojo_EventScript_16EC00:: @ 816EC00
SaffronCity_Dojo_EventScript_HitmonleeBall:: @ 816EC00
lock
faceplayer
goto_if_set FLAG_GOT_HITMON_FROM_DOJO, EventScript_16EC3C
goto_if_set FLAG_GOT_HITMON_FROM_DOJO, SaffronCity_Dojo_EventScript_AlreadyGotHitmon
drawmonpic SPECIES_HITMONLEE, 10, 3
setvar VAR_TEMP_1, SPECIES_HITMONLEE
applymovement 5, Movement_WalkInPlaceFastestUp
applymovement LOCALID_KARATE_MASTER, Movement_WalkInPlaceFastestUp
waitmovement 0
textcolor 0
msgbox gUnknown_819B44E, MSGBOX_YESNO
msgbox SaffronCity_Dojo_Text_YouWantHitmonlee, MSGBOX_YESNO
call EventScript_1A6675
compare VAR_RESULT, YES
goto_if_eq EventScript_16EC82
goto_if_eq SaffronCity_Dojo_EventScript_GiveHitmon
erasemonpic
release
end
EventScript_16EC3C:: @ 816EC3C
msgbox gUnknown_819B4E1
SaffronCity_Dojo_EventScript_AlreadyGotHitmon:: @ 816EC3C
msgbox SaffronCity_Dojo_Text_BetterNotGetGreedy
release
end
SaffronCity_Dojo_EventScript_16EC46:: @ 816EC46
SaffronCity_Dojo_EventScript_HitmonchanBall:: @ 816EC46
lock
faceplayer
goto_if_set FLAG_GOT_HITMON_FROM_DOJO, EventScript_16EC3C
goto_if_set FLAG_GOT_HITMON_FROM_DOJO, SaffronCity_Dojo_EventScript_AlreadyGotHitmon
drawmonpic SPECIES_HITMONCHAN, 10, 3
setvar VAR_TEMP_1, SPECIES_HITMONCHAN
applymovement 5, Movement_WalkInPlaceFastestUp
applymovement LOCALID_KARATE_MASTER, Movement_WalkInPlaceFastestUp
waitmovement 0
textcolor 0
msgbox gUnknown_819B49E, MSGBOX_YESNO
msgbox SaffronCity_Dojo_Text_YouWantHitmonchan, MSGBOX_YESNO
call EventScript_1A6675
compare VAR_RESULT, YES
goto_if_eq EventScript_16EC82
goto_if_eq SaffronCity_Dojo_EventScript_GiveHitmon
erasemonpic
release
end
EventScript_16EC82:: @ 816EC82
SaffronCity_Dojo_EventScript_GiveHitmon:: @ 816EC82
erasemonpic
givemon VAR_TEMP_1, 25, ITEM_NONE
compare VAR_RESULT, 0
goto_if_eq EventScript_16ECB5
goto_if_eq SaffronCity_Dojo_EventScript_ReceivedHitmonParty
compare VAR_RESULT, 1
goto_if_eq EventScript_16ECEC
goto_if_eq SaffronCity_Dojo_EventScript_ReceivedHitmonPC
compare VAR_RESULT, 2
goto_if_eq EventScript_NoMoreRoomForPokemon
release
end
EventScript_16ECB5:: @ 816ECB5
SaffronCity_Dojo_EventScript_ReceivedHitmonParty:: @ 816ECB5
removeobject VAR_LAST_TALKED
getspeciesname 0, VAR_TEMP_1
playfanfare MUS_FANFA1
message Text_19B473
message SaffronCity_Dojo_Text_ReceivedMonFromKarateMaster
waitmessage
waitfanfare
setflag FLAG_GOT_HITMON_FROM_DOJO
msgbox Text_GiveNicknameToThisMon, MSGBOX_YESNO
compare VAR_RESULT, NO
goto_if_eq EventScript_16ED29
goto_if_eq SaffronCity_Dojo_EventScript_EndGiveMon
call EventScript_GetGiftMonPartySlot
call EventScript_ChangePokemonNickname
goto EventScript_16ED29
goto SaffronCity_Dojo_EventScript_EndGiveMon
end
EventScript_16ECEC:: @ 816ECEC
SaffronCity_Dojo_EventScript_ReceivedHitmonPC:: @ 816ECEC
removeobject VAR_LAST_TALKED
getspeciesname 0, VAR_TEMP_1
playfanfare MUS_FANFA1
message Text_19B473
message SaffronCity_Dojo_Text_ReceivedMonFromKarateMaster
waitmessage
waitfanfare
setflag FLAG_GOT_HITMON_FROM_DOJO
msgbox Text_GiveNicknameToThisMon, MSGBOX_YESNO
compare VAR_RESULT, NO
goto_if_eq EventScript_16ED1E
goto_if_eq SaffronCity_Dojo_EventScript_TransferredHitmonToPC
call EventScript_NameReceivedBoxMon
goto EventScript_16ED1E
goto SaffronCity_Dojo_EventScript_TransferredHitmonToPC
end
EventScript_16ED1E:: @ 816ED1E
SaffronCity_Dojo_EventScript_TransferredHitmonToPC:: @ 816ED1E
call EventScript_TransferredToPC
goto EventScript_16ED29
goto SaffronCity_Dojo_EventScript_EndGiveMon
end
EventScript_16ED29:: @ 816ED29
SaffronCity_Dojo_EventScript_EndGiveMon:: @ 816ED29
release
end
SaffronCity_Dojo_EventScript_16ED2B:: @ 816ED2B
msgbox gUnknown_819B52E, MSGBOX_SIGN
SaffronCity_Dojo_EventScript_Statue:: @ 816ED2B
msgbox SaffronCity_Dojo_Text_FightingDojo, MSGBOX_SIGN
end
SaffronCity_Dojo_EventScript_16ED34:: @ 816ED34
msgbox gUnknown_819B4F8, MSGBOX_SIGN
SaffronCity_Dojo_EventScript_LeftScroll:: @ 816ED34
msgbox SaffronCity_Dojo_Text_EnemiesOnEverySide, MSGBOX_SIGN
end
SaffronCity_Dojo_EventScript_16ED3D:: @ 816ED3D
msgbox gUnknown_819B50F, MSGBOX_SIGN
SaffronCity_Dojo_EventScript_RightScroll:: @ 816ED3D
msgbox SaffronCity_Dojo_Text_GoesAroundComesAround, MSGBOX_SIGN
end
SaffronCity_Dojo_EventScript_16ED46:: @ 816ED46
trainerbattle_single TRAINER_BLACK_BELT_HITOSHI, Text_19B3DF, Text_19B40F
msgbox gUnknown_819B41F, MSGBOX_AUTOCLOSE
SaffronCity_Dojo_EventScript_Hitoshi:: @ 816ED46
trainerbattle_single TRAINER_BLACK_BELT_HITOSHI, SaffronCity_Dojo_Text_HitoshiIntro, SaffronCity_Dojo_Text_HitoshiDefeat
msgbox SaffronCity_Dojo_Text_HitoshiPostBattle, MSGBOX_AUTOCLOSE
end
SaffronCity_Dojo_EventScript_16ED5D:: @ 816ED5D
trainerbattle_single TRAINER_BLACK_BELT_HIDEKI, Text_19B2E0, Text_19B2FD
msgbox gUnknown_819B30F, MSGBOX_AUTOCLOSE
SaffronCity_Dojo_EventScript_Hideki:: @ 816ED5D
trainerbattle_single TRAINER_BLACK_BELT_HIDEKI, SaffronCity_Dojo_Text_HidekiIntro, SaffronCity_Dojo_Text_HidekiDefeat
msgbox SaffronCity_Dojo_Text_HidekiPostBattle, MSGBOX_AUTOCLOSE
end
SaffronCity_Dojo_EventScript_16ED74:: @ 816ED74
trainerbattle_single TRAINER_BLACK_BELT_AARON, Text_19B341, Text_19B396
msgbox gUnknown_819B3AC, MSGBOX_AUTOCLOSE
SaffronCity_Dojo_EventScript_Aaron:: @ 816ED74
trainerbattle_single TRAINER_BLACK_BELT_AARON, SaffronCity_Dojo_Text_AaronIntro, SaffronCity_Dojo_Text_AaronDefeat
msgbox SaffronCity_Dojo_Text_AaronPostBattle, MSGBOX_AUTOCLOSE
end
SaffronCity_Dojo_EventScript_16ED8B:: @ 816ED8B
trainerbattle_single TRAINER_BLACK_BELT_MIKE, Text_19B275, Text_19B292
msgbox gUnknown_819B29D, MSGBOX_AUTOCLOSE
SaffronCity_Dojo_EventScript_Mike:: @ 816ED8B
trainerbattle_single TRAINER_BLACK_BELT_MIKE, SaffronCity_Dojo_Text_MikeIntro, SaffronCity_Dojo_Text_MikeDefeat
msgbox SaffronCity_Dojo_Text_MikePostBattle, MSGBOX_AUTOCLOSE
end
SaffronCity_Dojo_EventScript_16EDA2:: @ 816EDA2
trainerbattle_single TRAINER_BLACK_BELT_KOICHI, Text_19B12C, Text_19B193, EventScript_16EDD0
goto_if_set FLAG_GOT_HITMON_FROM_DOJO, EventScript_16EDC6
msgbox gUnknown_819B1A7, MSGBOX_AUTOCLOSE
SaffronCity_Dojo_EventScript_MasterKoichi:: @ 816EDA2
trainerbattle_single TRAINER_BLACK_BELT_KOICHI, SaffronCity_Dojo_Text_MasterKoichiIntro, SaffronCity_Dojo_Text_MasterKoichiDefeat, SaffronCity_Dojo_EventScript_DefeatedMasterKoichi
goto_if_set FLAG_GOT_HITMON_FROM_DOJO, SaffronCity_Dojo_EventScript_MasterKoichiAlreadyGotHitmon
msgbox SaffronCity_Dojo_Text_ChoosePrizedFightingMon, MSGBOX_AUTOCLOSE
end
EventScript_16EDC6:: @ 816EDC6
msgbox gUnknown_819B24C
SaffronCity_Dojo_EventScript_MasterKoichiAlreadyGotHitmon:: @ 816EDC6
msgbox SaffronCity_Dojo_Text_StayAndTrainWithUs
release
end
EventScript_16EDD0:: @ 816EDD0
SaffronCity_Dojo_EventScript_DefeatedMasterKoichi:: @ 816EDD0
setvar VAR_MAP_SCENE_SAFFRON_CITY_DOJO, 1
release
end
data/maps/SaffronCity_Dojo/text.inc
+24 -27
View File
@@ -1,7 +1,4 @@
Text_19B123:: @ 819B123
.string "？　みえないぞ‥$"
Text_19B12C:: @ 819B12C
SaffronCity_Dojo_Text_MasterKoichiIntro:: @ 819B12C
.string "Grunt!\p"
.string "I am the KARATE MASTER!\n"
.string "I am the LEADER here!\p"
@@ -9,11 +6,11 @@ Text_19B12C:: @ 819B12C
.string "Expect no mercy!\p"
.string "Fwaaa!$"
Text_19B193:: @ 819B193
SaffronCity_Dojo_Text_MasterKoichiDefeat:: @ 819B193
.string "Hwa!\n"
.string "Arrgh! Beaten!$"
gUnknown_819B1A7:: @ 819B1A7
SaffronCity_Dojo_Text_ChoosePrizedFightingMon:: @ 819B1A7
.string "Indeed, I have lost!\p"
.string "But, I beseech you, do not take\n"
.string "our emblem as your trophy!\p"
@@ -21,85 +18,85 @@ gUnknown_819B1A7:: @ 819B1A7
.string "FIGHTING POKéMON!\p"
.string "Choose whichever one you like!$"
gUnknown_819B24C:: @ 819B24C
SaffronCity_Dojo_Text_StayAndTrainWithUs:: @ 819B24C
.string "Grunt!\n"
.string "Stay and train at karate with us!$"
Text_19B275:: @ 819B275
SaffronCity_Dojo_Text_MikeIntro:: @ 819B275
.string "Hoargh!\n"
.string "Take your shoes off!$"
Text_19B292:: @ 819B292
SaffronCity_Dojo_Text_MikeDefeat:: @ 819B292
.string "I give up!$"
gUnknown_819B29D:: @ 819B29D
SaffronCity_Dojo_Text_MikePostBattle:: @ 819B29D
.string "You wait 'til you see our MASTER!\n"
.string "I'm a small fry compared to him!$"
Text_19B2E0:: @ 819B2E0
SaffronCity_Dojo_Text_HidekiIntro:: @ 819B2E0
.string "I hear you're good!\n"
.string "Show me!$"
Text_19B2FD:: @ 819B2FD
SaffronCity_Dojo_Text_HidekiDefeat:: @ 819B2FD
.string "Judge!\n"
.string "One point!$"
gUnknown_819B30F:: @ 819B30F
SaffronCity_Dojo_Text_HidekiPostBattle:: @ 819B30F
.string "Our MASTER is a pro fighter.\n"
.string "Be prepared to lose!$"
Text_19B341:: @ 819B341
SaffronCity_Dojo_Text_AaronIntro:: @ 819B341
.string "Hiyah!\n"
.string "I have no fear for anything tough!\p"
.string "I shatter boulders for training\n"
.string "every day!$"
Text_19B396:: @ 819B396
SaffronCity_Dojo_Text_AaronDefeat:: @ 819B396
.string "Yow!\n"
.string "Stubbed fingers!$"
gUnknown_819B3AC:: @ 819B3AC
SaffronCity_Dojo_Text_AaronPostBattle:: @ 819B3AC
.string "The only thing that frightens us is\n"
.string "psychic power!$"
Text_19B3DF:: @ 819B3DF
SaffronCity_Dojo_Text_HitoshiIntro:: @ 819B3DF
.string "Hwaah!\p"
.string "You're trespassing in our\n"
.string "FIGHTING DOJO!$"
Text_19B40F:: @ 819B40F
SaffronCity_Dojo_Text_HitoshiDefeat:: @ 819B40F
.string "Oof!\n"
.string "I give up!$"
gUnknown_819B41F:: @ 819B41F
SaffronCity_Dojo_Text_HitoshiPostBattle:: @ 819B41F
.string "The prime fighters across the land\n"
.string "train here.$"
gUnknown_819B44E:: @ 819B44E
SaffronCity_Dojo_Text_YouWantHitmonlee:: @ 819B44E
.string "You want the hard-kicking\n"
.string "HITMONLEE?$"
Text_19B473:: @ 819B473
SaffronCity_Dojo_Text_ReceivedMonFromKarateMaster:: @ 819B473
.string "{PLAYER} received the {STR_VAR_1}\n"
.string "from the KARATE MASTER.$"
gUnknown_819B49E:: @ 819B49E
SaffronCity_Dojo_Text_YouWantHitmonchan:: @ 819B49E
.string "You want the piston-punching\n"
.string "HITMONCHAN?$"
Text_19B4C7:: @ 819B4C7
SaffronCity_Dojo_Text_ReceivedMonFromKarateMaster2:: @ 819B4C7
.string "{PLAYER}は　カラテ　だいおう　から\n"
.string "{STR_VAR_1}を　もらった！$"
gUnknown_819B4E1:: @ 819B4E1
SaffronCity_Dojo_Text_BetterNotGetGreedy:: @ 819B4E1
.string "Better not get greedy…$"
gUnknown_819B4F8:: @ 819B4F8
SaffronCity_Dojo_Text_EnemiesOnEverySide:: @ 819B4F8
.string "Enemies on every side!$"
gUnknown_819B50F:: @ 819B50F
SaffronCity_Dojo_Text_GoesAroundComesAround:: @ 819B50F
.string "What goes around comes around.$"
gUnknown_819B52E:: @ 819B52E
SaffronCity_Dojo_Text_FightingDojo:: @ 819B52E
.string "FIGHTING DOJO$"
data/maps/SaffronCity_Gym/map.json
+11 -11
View File
@@ -23,7 +23,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 3,
"script": "SaffronCity_Gym_EventScript_16EEC3",
"script": "SaffronCity_Gym_EventScript_Cameron",
"flag": "0"
},
{
@@ -36,7 +36,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 3,
"script": "SaffronCity_Gym_EventScript_16EE88",
"script": "SaffronCity_Gym_EventScript_Johan",
"flag": "0"
},
{
@@ -49,7 +49,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 3,
"script": "SaffronCity_Gym_EventScript_16EEDA",
"script": "SaffronCity_Gym_EventScript_Preston",
"flag": "0"
},
{
@@ -62,7 +62,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 3,
"script": "SaffronCity_Gym_EventScript_16EEF1",
"script": "SaffronCity_Gym_EventScript_Amanda",
"flag": "0"
},
{
@@ -75,7 +75,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 3,
"script": "SaffronCity_Gym_EventScript_16EF08",
"script": "SaffronCity_Gym_EventScript_Stacy",
"flag": "0"
},
{
@@ -88,7 +88,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 3,
"script": "SaffronCity_Gym_EventScript_16EF1F",
"script": "SaffronCity_Gym_EventScript_Tasha",
"flag": "0"
},
{
@@ -101,7 +101,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "SaffronCity_Gym_EventScript_16EDD8",
"script": "SaffronCity_Gym_EventScript_Sabrina",
"flag": "0"
},
{
@@ -114,7 +114,7 @@
"movement_range_y": 1,
"trainer_type": 1,
"trainer_sight_or_berry_tree_id": 3,
"script": "SaffronCity_Gym_EventScript_16EE9F",
"script": "SaffronCity_Gym_EventScript_Tyron",
"flag": "0"
},
{
@@ -127,7 +127,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "SaffronCity_Gym_EventScript_16EF36",
"script": "SaffronCity_Gym_EventScript_GymGuy",
"flag": "0"
}
],
@@ -371,14 +371,14 @@
"x": 12,
"y": 20,
"elevation": 0,
"script": "SaffronCity_Gym_EventScript_16EF55"
"script": "SaffronCity_Gym_EventScript_GymStatue"
},
{
"type": "bg_event_type_0",
"x": 16,
"y": 20,
"elevation": 0,
"script": "SaffronCity_Gym_EventScript_16EF55"
"script": "SaffronCity_Gym_EventScript_GymStatue"
}
]
}
data/maps/SaffronCity_Gym/scripts.inc
+44 -44
View File
@@ -1,97 +1,97 @@
SaffronCity_Gym_MapScripts:: @ 816EDD7
.byte 0
SaffronCity_Gym_EventScript_16EDD8:: @ 816EDD8
SaffronCity_Gym_EventScript_Sabrina:: @ 816EDD8
famechecker FAMECHECKER_SABRINA, FCPICKSTATE_COLORED, UpdatePickStateFromSpecialVar8005
trainerbattle_single TRAINER_LEADER_SABRINA, Text_19B53C, Text_19B602, EventScript_16EE0A, NO_MUSIC
goto_if_unset FLAG_GOT_TM04_FROM_SABRINA, EventScript_16EE3D
msgbox gUnknown_819B7F2
trainerbattle_single TRAINER_LEADER_SABRINA, SaffronCity_Gym_Text_SabrinaIntro, SaffronCity_Gym_Text_SabrinaDefeat, SaffronCity_Gym_EventScript_DefeatedSabrina, NO_MUSIC
goto_if_unset FLAG_GOT_TM04_FROM_SABRINA, SaffronCity_Gym_EventScript_GiveTM04
msgbox SaffronCity_Gym_Text_ExplainTM04
release
end
EventScript_16EE0A:: @ 816EE0A
SaffronCity_Gym_EventScript_DefeatedSabrina:: @ 816EE0A
famechecker FAMECHECKER_SABRINA, 2
famechecker FAMECHECKER_SABRINA, 3
clearflag FLAG_HIDE_SAFFRON_CITY_POKECENTER_SABRINA_JOURNALS
setflag FLAG_DEFEATED_SABRINA
setflag FLAG_BADGE06_GET
set_gym_trainers 6
goto EventScript_16EE3D
goto SaffronCity_Gym_EventScript_GiveTM04
end
EventScript_16EE3D:: @ 816EE3D
msgbox gUnknown_819B6FA
SaffronCity_Gym_EventScript_GiveTM04:: @ 816EE3D
msgbox SaffronCity_Gym_Text_ExplainMarshBadgeTakeThis
checkitemspace ITEM_TM04, 1
compare VAR_RESULT, FALSE
goto_if_eq EventScript_16EE7E
giveitem_msg gUnknown_819B7D3, ITEM_TM04
goto_if_eq SaffronCity_Gym_EventScript_NoRoomForTM04
giveitem_msg SaffronCity_Gym_Text_ReceivedTM04FromSabrina, ITEM_TM04
setflag FLAG_GOT_TM04_FROM_SABRINA
msgbox gUnknown_819B685
msgbox SaffronCity_Gym_Text_SabrinaPostBattle
release
end
EventScript_16EE7E:: @ 816EE7E
msgbox gUnknown_819B849
SaffronCity_Gym_EventScript_NoRoomForTM04:: @ 816EE7E
msgbox SaffronCity_Gym_Text_BagFullOfOtherItems
release
end
SaffronCity_Gym_EventScript_16EE88:: @ 816EE88
trainerbattle_single TRAINER_PSYCHIC_JOHAN, Text_19B936, Text_19B957
msgbox gUnknown_819B96D, MSGBOX_AUTOCLOSE
SaffronCity_Gym_EventScript_Johan:: @ 816EE88
trainerbattle_single TRAINER_PSYCHIC_JOHAN, SaffronCity_Gym_Text_JohanIntro, SaffronCity_Gym_Text_JohanDefeat
msgbox SaffronCity_Gym_Text_JohanPostBattle, MSGBOX_AUTOCLOSE
end
SaffronCity_Gym_EventScript_16EE9F:: @ 816EE9F
trainerbattle_single TRAINER_PSYCHIC_TYRON, Text_19BA45, Text_19BA9E
SaffronCity_Gym_EventScript_Tyron:: @ 816EE9F
trainerbattle_single TRAINER_PSYCHIC_TYRON, SaffronCity_Gym_Text_TyronIntro, SaffronCity_Gym_Text_TyronDefeat
famechecker FAMECHECKER_SABRINA, 5
msgbox gUnknown_819BAB4, MSGBOX_AUTOCLOSE
msgbox SaffronCity_Gym_Text_TyronPostBattle, MSGBOX_AUTOCLOSE
end
SaffronCity_Gym_EventScript_16EEC3:: @ 816EEC3
trainerbattle_single TRAINER_PSYCHIC_CAMERON, Text_19BB49, Text_19BBA1
msgbox gUnknown_819BBB3, MSGBOX_AUTOCLOSE
SaffronCity_Gym_EventScript_Cameron:: @ 816EEC3
trainerbattle_single TRAINER_PSYCHIC_CAMERON, SaffronCity_Gym_Text_CameronIntro, SaffronCity_Gym_Text_CameronDefeat
msgbox SaffronCity_Gym_Text_CameronPostBattle, MSGBOX_AUTOCLOSE
end
SaffronCity_Gym_EventScript_16EEDA:: @ 816EEDA
trainerbattle_single TRAINER_PSYCHIC_PRESTON, Text_19BC57, Text_19BCBC
msgbox gUnknown_819BCC4, MSGBOX_AUTOCLOSE
SaffronCity_Gym_EventScript_Preston:: @ 816EEDA
trainerbattle_single TRAINER_PSYCHIC_PRESTON, SaffronCity_Gym_Text_PrestonIntro, SaffronCity_Gym_Text_PrestonDefeat
msgbox SaffronCity_Gym_Text_PrestonPostBattle, MSGBOX_AUTOCLOSE
end
SaffronCity_Gym_EventScript_16EEF1:: @ 816EEF1
trainerbattle_single TRAINER_CHANNELER_AMANDA, Text_19B86A, Text_19B8A8
msgbox gUnknown_819B8B9, MSGBOX_AUTOCLOSE
SaffronCity_Gym_EventScript_Amanda:: @ 816EEF1
trainerbattle_single TRAINER_CHANNELER_AMANDA, SaffronCity_Gym_Text_AmandaIntro, SaffronCity_Gym_Text_AmandaDefeat
msgbox SaffronCity_Gym_Text_AmandaPostBattle, MSGBOX_AUTOCLOSE
end
SaffronCity_Gym_EventScript_16EF08:: @ 816EF08
trainerbattle_single TRAINER_CHANNELER_STACY, Text_19B998, Text_19B9EC
msgbox gUnknown_819B9F7, MSGBOX_AUTOCLOSE
SaffronCity_Gym_EventScript_Stacy:: @ 816EF08
trainerbattle_single TRAINER_CHANNELER_STACY, SaffronCity_Gym_Text_StacyIntro, SaffronCity_Gym_Text_StacyDefeat
msgbox SaffronCity_Gym_Text_StacyPostBattle, MSGBOX_AUTOCLOSE
end
SaffronCity_Gym_EventScript_16EF1F:: @ 816EF1F
trainerbattle_single TRAINER_CHANNELER_TASHA, Text_19BAE8, Text_19BB0D
msgbox gUnknown_819BB1F, MSGBOX_AUTOCLOSE
SaffronCity_Gym_EventScript_Tasha:: @ 816EF1F
trainerbattle_single TRAINER_CHANNELER_TASHA, SaffronCity_Gym_Text_TashaIntro, SaffronCity_Gym_Text_TashaDefeat
msgbox SaffronCity_Gym_Text_TashaPostBattle, MSGBOX_AUTOCLOSE
end
SaffronCity_Gym_EventScript_16EF36:: @ 816EF36
SaffronCity_Gym_EventScript_GymGuy:: @ 816EF36
lock
faceplayer
goto_if_set FLAG_DEFEATED_SABRINA, EventScript_16EF4B
msgbox gUnknown_819BCF6
goto_if_set FLAG_DEFEATED_SABRINA, SaffronCity_Gym_EventScript_GymGuyPostVictory
msgbox SaffronCity_Gym_Text_GymGuyAdvice
release
end
EventScript_16EF4B:: @ 816EF4B
msgbox gUnknown_819BDBB
SaffronCity_Gym_EventScript_GymGuyPostVictory:: @ 816EF4B
msgbox SaffronCity_Gym_Text_GymGuyPostVictory
release
end
SaffronCity_Gym_EventScript_16EF55:: @ 816EF55
SaffronCity_Gym_EventScript_GymStatue:: @ 816EF55
lockall
goto_if_set FLAG_BADGE06_GET, EventScript_16EF69
msgbox gUnknown_819BDFE
goto_if_set FLAG_BADGE06_GET, SaffronCity_Gym_EventScript_GymStatuePostVictory
msgbox SaffronCity_Gym_Text_GymStatue
releaseall
end
EventScript_16EF69:: @ 816EF69
msgbox gUnknown_819BE37
SaffronCity_Gym_EventScript_GymStatuePostVictory:: @ 816EF69
msgbox SaffronCity_Gym_Text_GymStatuePlayerWon
releaseall
end
data/maps/SaffronCity_Gym/text.inc
+32 -32
View File
@@ -1,4 +1,4 @@
Text_19B53C:: @ 819B53C
SaffronCity_Gym_Text_SabrinaIntro:: @ 819B53C
.string "I had a vision of your arrival.\p"
.string "I have had psychic powers since\n"
.string "I was a child.\p"
@@ -7,7 +7,7 @@ Text_19B53C:: @ 819B53C
.string "I dislike battling, but if you wish,\n"
.string "I will show you my powers!{PLAY_BGM}{MUS_EXEYE}$"
Text_19B602:: @ 819B602
SaffronCity_Gym_Text_SabrinaDefeat:: @ 819B602
.string "This loss shocks me!\n"
.string "But, a loss is a loss.\p"
.string "I admit, I didn't work hard enough\n"
@@ -15,13 +15,13 @@ Text_19B602:: @ 819B602
.string "Your victory has earned you the\n"
.string "MARSHBADGE.$"
gUnknown_819B685:: @ 819B685
SaffronCity_Gym_Text_SabrinaPostBattle:: @ 819B685
.string "Psychic power isn't something that\n"
.string "only a few people have.\p"
.string "Everyone has psychic power.\n"
.string "People just don't realize it.$"
gUnknown_819B6FA:: @ 819B6FA
SaffronCity_Gym_Text_ExplainMarshBadgeTakeThis:: @ 819B6FA
.string "The MARSHBADGE makes POKéMON up\n"
.string "to Lv. 70 obey you.\p"
.string "Stronger POKéMON will become wild,\n"
@@ -30,87 +30,87 @@ gUnknown_819B6FA:: @ 819B6FA
.string "much to avoid that problem.\p"
.string "Wait, please take this TM with you.$"
gUnknown_819B7D3:: @ 819B7D3
SaffronCity_Gym_Text_ReceivedTM04FromSabrina:: @ 819B7D3
.string "{PLAYER} received TM04 from\n"
.string "SABRINA.$"
gUnknown_819B7F2:: @ 819B7F2
SaffronCity_Gym_Text_ExplainTM04:: @ 819B7F2
.string "TM04 is CALM MIND.\p"
.string "It makes the POKéMON concentrate\n"
.string "to raise both SP. ATK and SP. DEF.$"
gUnknown_819B849:: @ 819B849
SaffronCity_Gym_Text_BagFullOfOtherItems:: @ 819B849
.string "Your BAG is full of other items.$"
Text_19B86A:: @ 819B86A
SaffronCity_Gym_Text_AmandaIntro:: @ 819B86A
.string "SABRINA is far younger than I,\n"
.string "but she has earned my respect.$"
Text_19B8A8:: @ 819B8A8
SaffronCity_Gym_Text_AmandaDefeat:: @ 819B8A8
.string "Not good enough!$"
gUnknown_819B8B9:: @ 819B8B9
SaffronCity_Gym_Text_AmandaPostBattle:: @ 819B8B9
.string "In a battle of equals, the one\n"
.string "with the stronger will wins.\p"
.string "If you wish to beat SABRINA, focus\n"
.string "and will yourself to victory.$"
Text_19B936:: @ 819B936
SaffronCity_Gym_Text_JohanIntro:: @ 819B936
.string "Does our unseen power scare you?$"
Text_19B957:: @ 819B957
SaffronCity_Gym_Text_JohanDefeat:: @ 819B957
.string "I never foresaw this!$"
gUnknown_819B96D:: @ 819B96D
SaffronCity_Gym_Text_JohanPostBattle:: @ 819B96D
.string "PSYCHIC POKéMON fear only ghosts\n"
.string "and bugs!$"
Text_19B998:: @ 819B998
SaffronCity_Gym_Text_StacyIntro:: @ 819B998
.string "POKéMON take on the appearance of\n"
.string "their TRAINERS.\p"
.string "Your POKéMON must be tough, then!$"
Text_19B9EC:: @ 819B9EC
SaffronCity_Gym_Text_StacyDefeat:: @ 819B9EC
.string "I knew it!$"
gUnknown_819B9F7:: @ 819B9F7
SaffronCity_Gym_Text_StacyPostBattle:: @ 819B9F7
.string "I have much to learn still…\p"
.string "I must master PSYCHIC and teach it\n"
.string "to my POKéMON…$"
Text_19BA45:: @ 819BA45
SaffronCity_Gym_Text_TyronIntro:: @ 819BA45
.string "You understand, don't you?\p"
.string "That power alone isn't enough to\n"
.string "win in the world of POKéMON?$"
Text_19BA9E:: @ 819BA9E
SaffronCity_Gym_Text_TyronDefeat:: @ 819BA9E
.string "I don't believe this!$"
gUnknown_819BAB4:: @ 819BAB4
SaffronCity_Gym_Text_TyronPostBattle:: @ 819BAB4
.string "SABRINA just wiped out the KARATE\n"
.string "MASTER next door.$"
Text_19BAE8:: @ 819BAE8
SaffronCity_Gym_Text_TashaIntro:: @ 819BAE8
.string "You and I, our POKéMON shall\n"
.string "battle!$"
Text_19BB0D:: @ 819BB0D
SaffronCity_Gym_Text_TashaDefeat:: @ 819BB0D
.string "I lost after all!$"
gUnknown_819BB1F:: @ 819BB1F
SaffronCity_Gym_Text_TashaPostBattle:: @ 819BB1F
.string "I knew that this was going to take\n"
.string "place.$"
Text_19BB49:: @ 819BB49
SaffronCity_Gym_Text_CameronIntro:: @ 819BB49
.string "SABRINA is young, but she's also\n"
.string "our highly skilled LEADER.\p"
.string "You won't reach her easily!$"
Text_19BBA1:: @ 819BBA1
SaffronCity_Gym_Text_CameronDefeat:: @ 819BBA1
.string "Ow!\n"
.string "Down and out!$"
gUnknown_819BBB3:: @ 819BBB3
SaffronCity_Gym_Text_CameronPostBattle:: @ 819BBB3
.string "There used to be two POKéMON GYMS\n"
.string "in SAFFRON.\p"
.string "The FIGHTING DOJO next door lost\n"
@@ -118,20 +118,20 @@ gUnknown_819BBB3:: @ 819BBB3
.string "We simply creamed them when we\n"
.string "decided to have just one GYM.$"
Text_19BC57:: @ 819BC57
SaffronCity_Gym_Text_PrestonIntro:: @ 819BC57
.string "SAFFRON POKéMON GYM is famous for\n"
.string "training psychics.\p"
.string "You want to see SABRINA, don't\n"
.string "you? I can tell!$"
Text_19BCBC:: @ 819BCBC
SaffronCity_Gym_Text_PrestonDefeat:: @ 819BCBC
.string "Arrrgh!$"
gUnknown_819BCC4:: @ 819BCC4
SaffronCity_Gym_Text_PrestonPostBattle:: @ 819BCC4
.string "That's right! I used telepathy to\n"
.string "read your mind!$"
gUnknown_819BCF6:: @ 819BCF6
SaffronCity_Gym_Text_GymGuyAdvice:: @ 819BCF6
.string "Yo!\n"
.string "Champ in the making!\p"
.string "SABRINA's POKéMON use psychic\n"
@@ -141,18 +141,18 @@ gUnknown_819BCF6:: @ 819BCF6
.string "They'll get destroyed before they\n"
.string "can even aim a punch!$"
gUnknown_819BDBB:: @ 819BDBB
SaffronCity_Gym_Text_GymGuyPostVictory:: @ 819BDBB
.string "Psychic power, huh?\p"
.string "If I had that, I'd make a bundle\n"
.string "at the slots!$"
gUnknown_819BDFE:: @ 819BDFE
SaffronCity_Gym_Text_GymStatue:: @ 819BDFE
.string "SAFFRON POKéMON GYM\n"
.string "LEADER: SABRINA\p"
.string "WINNING TRAINERS:\n"
.string "{RIVAL}$"
gUnknown_819BE37:: @ 819BE37
SaffronCity_Gym_Text_GymStatuePlayerWon:: @ 819BE37
.string "SAFFRON POKéMON GYM\n"
.string "LEADER: SABRINA\p"
.string "WINNING TRAINERS:\n"
data/maps/SaffronCity_House2/map.json → data/maps/SaffronCity_House/map.json
+6 -6
View File
@@ -1,6 +1,6 @@
{
"id": "MAP_SAFFRON_CITY_HOUSE2",
"name": "SaffronCity_House2",
"id": "MAP_SAFFRON_CITY_HOUSE",
"name": "SaffronCity_House",
"layout": "LAYOUT_HOUSE5",
"music": "MUS_NIBI",
"region_map_section": "MAPSEC_SAFFRON_CITY",
@@ -23,7 +23,7 @@
"movement_range_y": 4,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "SaffronCity_House2_EventScript_16EF86",
"script": "SaffronCity_House_EventScript_Pidgey",
"flag": "0"
},
{
@@ -36,7 +36,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "SaffronCity_House2_EventScript_16EF74",
"script": "SaffronCity_House_EventScript_Lass",
"flag": "0"
},
{
@@ -49,7 +49,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "SaffronCity_House2_EventScript_16EF7D",
"script": "SaffronCity_House_EventScript_Youngster",
"flag": "0"
},
{
@@ -96,7 +96,7 @@
"x": 5,
"y": 4,
"elevation": 3,
"script": "SaffronCity_House2_EventScript_16EF99"
"script": "SaffronCity_House_EventScript_Letter"
}
]
}
data/maps/SaffronCity_House/scripts.inc
+24
View File
@@ -0,0 +1,24 @@
SaffronCity_House_MapScripts:: @ 816EF73
.byte 0
SaffronCity_House_EventScript_Lass:: @ 816EF74
msgbox SaffronCity_House_Text_DontLookAtMyLetter, MSGBOX_NPC
end
SaffronCity_House_EventScript_Youngster:: @ 816EF7D
msgbox SaffronCity_House_Text_GettingCopycatPokeDoll, MSGBOX_NPC
end
SaffronCity_House_EventScript_Pidgey:: @ 816EF86
lock
faceplayer
waitse
playmoncry SPECIES_PIDGEY, 0
msgbox SaffronCity_House_Text_Pidgey
waitmoncry
release
end
SaffronCity_House_EventScript_Letter:: @ 816EF99
msgbox SaffronCity_House_Text_ExplainPPUp, MSGBOX_SIGN
end
data/maps/SaffronCity_House2/text.inc → data/maps/SaffronCity_House/text.inc
+4 -4
View File
@@ -1,17 +1,17 @@
gUnknown_819BE74:: @ 819BE74
SaffronCity_House_Text_DontLookAtMyLetter:: @ 819BE74
.string "…Thank you for writing.\n"
.string "I hope to see you soon!\p"
.string "…Hey!\n"
.string "Don't look at my letter!$"
gUnknown_819BEC3:: @ 819BEC3
SaffronCity_House_Text_Pidgey:: @ 819BEC3
.string "PIDGEY: Kurukkoo!$"
gUnknown_819BED5:: @ 819BED5
SaffronCity_House_Text_GettingCopycatPokeDoll:: @ 819BED5
.string "The COPYCAT is cute!\n"
.string "I'm getting her a POKé DOLL.$"
gUnknown_819BF07:: @ 819BF07
SaffronCity_House_Text_ExplainPPUp:: @ 819BF07
.string "I was given a PP UP as a gift.\p"
.string "It's used to increase the PP of\n"
.string "a POKéMON's move.\p"
data/maps/SaffronCity_House1_1F/scripts.inc
-20
View File
@@ -1,20 +0,0 @@
SaffronCity_House1_1F_MapScripts:: @ 816EB36
.byte 0
SaffronCity_House1_1F_EventScript_16EB37:: @ 816EB37
msgbox gUnknown_819AB9B, MSGBOX_NPC
end
SaffronCity_House1_1F_EventScript_16EB40:: @ 816EB40
msgbox gUnknown_819ABD7, MSGBOX_NPC
end
SaffronCity_House1_1F_EventScript_16EB49:: @ 816EB49
lock
faceplayer
waitse
playmoncry SPECIES_CHANSEY, 0
msgbox gUnknown_819AC4B
waitmoncry
release
end
data/maps/SaffronCity_House1_1F/text.inc
-32
View File
@@ -1,32 +0,0 @@
Text_19A9E7:: @ 819A9E7
.string "AGATHA's GHOST-type POKéMON are\n"
.string "horrifically terrifying in toughness.\p"
.string "I took my FIGHTING-type POKéMON\n"
.string "and raised them to the max.\p"
.string "I went at AGATHA feeling pretty\n"
.string "confident, but she whupped us.\p"
.string "That old lady's also got a really\n"
.string "short fuse, too.\p"
.string "It doesn't take anything to get\n"
.string "that scary lady hollering.$"
Text_19AB16:: @ 819AB16
.string "Maybe becoming an ELITE FOUR\n"
.string "member is in the blood.\p"
.string "From what I've heard, LANCE has\n"
.string "a cousin who's a GYM LEADER\l"
.string "somewhere far away.$"
gUnknown_819AB9B:: @ 819AB9B
.string "My daughter is so self-centered.\n"
.string "She has but a few friends.$"
gUnknown_819ABD7:: @ 819ABD7
.string "My daughter likes to mimic people.\n"
.string "It's rather vexing.\p"
.string "Her mimicry has earned her the\n"
.string "nickname COPYCAT around here.$"
gUnknown_819AC4B:: @ 819AC4B
.string "CHANSEY: Chaan! Sii!$"
data/maps/SaffronCity_House1_2F/scripts.inc
-50
View File
@@ -1,50 +0,0 @@
SaffronCity_House1_2F_MapScripts:: @ 816EB5C
.byte 0
SaffronCity_House1_2F_EventScript_16EB5D:: @ 816EB5D
lock
faceplayer
waitse
playmoncry SPECIES_DODUO, 0
msgbox gUnknown_819B030
waitmoncry
release
end
SaffronCity_House1_2F_EventScript_16EB70:: @ 816EB70
lock
msgbox gUnknown_819B071
release
end
SaffronCity_House1_2F_EventScript_16EB7B:: @ 816EB7B
goto_if_questlog EventScript_ReleaseEnd
special sub_8112364
lock
faceplayer
checkitem ITEM_POKE_DOLL, 1
compare VAR_RESULT, TRUE
goto_if_eq EventScript_MimicTutor
checkplayergender
compare VAR_RESULT, MALE
call_if_eq EventScript_16EBB7
compare VAR_RESULT, FEMALE
call_if_eq EventScript_16EBC0
release
end
EventScript_16EBB7:: @ 816EBB7
msgbox gUnknown_819AC60
return
EventScript_16EBC0:: @ 816EBC0
msgbox gUnknown_819ACF1
return
SaffronCity_House1_2F_EventScript_16EBC9:: @ 816EBC9
msgbox gUnknown_819B0D0, MSGBOX_SIGN
end
SaffronCity_House1_2F_EventScript_16EBD2:: @ 816EBD2
msgbox gUnknown_819B0A0, MSGBOX_SIGN
end
data/maps/SaffronCity_House2/scripts.inc
-24
View File
@@ -1,24 +0,0 @@
SaffronCity_House2_MapScripts:: @ 816EF73
.byte 0
SaffronCity_House2_EventScript_16EF74:: @ 816EF74
msgbox gUnknown_819BE74, MSGBOX_NPC
end
SaffronCity_House2_EventScript_16EF7D:: @ 816EF7D
msgbox gUnknown_819BED5, MSGBOX_NPC
end
SaffronCity_House2_EventScript_16EF86:: @ 816EF86
lock
faceplayer
waitse
playmoncry SPECIES_PIDGEY, 0
msgbox gUnknown_819BEC3
waitmoncry
release
end
SaffronCity_House2_EventScript_16EF99:: @ 816EF99
msgbox gUnknown_819BF07, MSGBOX_SIGN
end
data/maps/SaffronCity_House3/scripts.inc
-26
View File
@@ -1,26 +0,0 @@
SaffronCity_House3_MapScripts:: @ 816F05E
.byte 0
SaffronCity_House3_EventScript_16F05F:: @ 816F05F
lock
faceplayer
goto_if_set FLAG_GOT_TM29_FROM_MR_PSYCHIC, EventScript_16F0B5
msgbox gUnknown_819C142
checkitemspace ITEM_TM29, 1
compare VAR_RESULT, FALSE
goto_if_eq EventScript_16F0AB
giveitem_msg gUnknown_819C16C, ITEM_TM29
msgbox gUnknown_819C18F
setflag FLAG_GOT_TM29_FROM_MR_PSYCHIC
release
end
EventScript_16F0AB:: @ 816F0AB
msgbox gUnknown_819C1FC
release
end
EventScript_16F0B5:: @ 816F0B5
msgbox gUnknown_819C18F
release
end
data/maps/SaffronCity_Mart/map.json
+3 -3
View File
@@ -23,7 +23,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "SaffronCity_Mart_EventScript_16EFB5",
"script": "SaffronCity_Mart_EventScript_Clerk",
"flag": "0"
},
{
@@ -36,7 +36,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "SaffronCity_Mart_EventScript_16EFAC",
"script": "SaffronCity_Mart_EventScript_Youngster",
"flag": "0"
},
{
@@ -49,7 +49,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "SaffronCity_Mart_EventScript_16EFA3",
"script": "SaffronCity_Mart_EventScript_Lass",
"flag": "0"
}
],
data/maps/SaffronCity_Mart/scripts.inc
+7 -7
View File
@@ -1,27 +1,27 @@
SaffronCity_Mart_MapScripts:: @ 816EFA2
.byte 0
SaffronCity_Mart_EventScript_16EFA3:: @ 816EFA3
msgbox gUnknown_819BFF1, MSGBOX_NPC
SaffronCity_Mart_EventScript_Lass:: @ 816EFA3
msgbox SaffronCity_Mart_Text_ReviveIsCostly, MSGBOX_NPC
end
SaffronCity_Mart_EventScript_16EFAC:: @ 816EFAC
msgbox gUnknown_819BF8F, MSGBOX_NPC
SaffronCity_Mart_EventScript_Youngster:: @ 816EFAC
msgbox SaffronCity_Mart_Text_MaxRepelMoreEffectiveThanSuper, MSGBOX_NPC
end
SaffronCity_Mart_EventScript_16EFB5:: @ 816EFB5
SaffronCity_Mart_EventScript_Clerk:: @ 816EFB5
goto_if_questlog EventScript_ReleaseEnd
lock
faceplayer
message Text_MayIHelpYou
waitmessage
pokemart Items_16EFDC
pokemart SaffronCity_Mart_Items
msgbox Text_PleaseComeAgain
release
end
.align 2
Items_16EFDC:: @ 816EFDC
SaffronCity_Mart_Items:: @ 816EFDC
.2byte ITEM_GREAT_BALL
.2byte ITEM_HYPER_POTION
.2byte ITEM_REVIVE
data/maps/SaffronCity_Mart/text.inc
+2 -2
View File
@@ -1,10 +1,10 @@
gUnknown_819BF8F:: @ 819BF8F
SaffronCity_Mart_Text_MaxRepelMoreEffectiveThanSuper:: @ 819BF8F
.string "MAX REPEL keeps weaker POKéMON\n"
.string "from appearing.\p"
.string "MAX REPEL stays effective longer\n"
.string "than SUPER REPEL.$"
gUnknown_819BFF1:: @ 819BFF1
SaffronCity_Mart_Text_ReviveIsCostly:: @ 819BFF1
.string "REVIVE is costly, but it revives\n"
.string "fainted POKéMON!$"
data/maps/SaffronCity_House3/map.json → data/maps/SaffronCity_MrPsychicsHouse/map.json
+3 -3
View File
@@ -1,6 +1,6 @@
{
"id": "MAP_SAFFRON_CITY_HOUSE3",
"name": "SaffronCity_House3",
"id": "MAP_SAFFRON_CITY_MR_PSYCHICS_HOUSE",
"name": "SaffronCity_MrPsychicsHouse",
"layout": "LAYOUT_HOUSE5",
"music": "MUS_NIBI",
"region_map_section": "MAPSEC_SAFFRON_CITY",
@@ -23,7 +23,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "SaffronCity_House3_EventScript_16F05F",
"script": "SaffronCity_MrPsychicsHouse_EventScript_MrPsychic",
"flag": "0"
}
],
data/maps/SaffronCity_MrPsychicsHouse/scripts.inc
+26
View File
@@ -0,0 +1,26 @@
SaffronCity_MrPsychicsHouse_MapScripts:: @ 816F05E
.byte 0
SaffronCity_MrPsychicsHouse_EventScript_MrPsychic:: @ 816F05F
lock
faceplayer
goto_if_set FLAG_GOT_TM29_FROM_MR_PSYCHIC, SaffronCity_MrPsychicsHouse_EventScript_AlreadyGotTM29
msgbox SaffronCity_MrPsychicsHouse_Text_YouWantedThis
checkitemspace ITEM_TM29, 1
compare VAR_RESULT, FALSE
goto_if_eq SaffronCity_MrPsychicsHouse_EventScript_NoRoomForTM29
giveitem_msg SaffronCity_MrPsychicsHouse_Text_ReceivedTM29FromMrPsychic, ITEM_TM29
msgbox SaffronCity_MrPsychicsHouse_Text_ExplainTM29
setflag FLAG_GOT_TM29_FROM_MR_PSYCHIC
release
end
SaffronCity_MrPsychicsHouse_EventScript_NoRoomForTM29:: @ 816F0AB
msgbox SaffronCity_MrPsychicsHouse_Text_YouveNoRoom
release
end
SaffronCity_MrPsychicsHouse_EventScript_AlreadyGotTM29:: @ 816F0B5
msgbox SaffronCity_MrPsychicsHouse_Text_ExplainTM29
release
end
data/maps/SaffronCity_House3/text.inc → data/maps/SaffronCity_MrPsychicsHouse/text.inc
+4 -4
View File
@@ -1,18 +1,18 @@
gUnknown_819C142:: @ 819C142
SaffronCity_MrPsychicsHouse_Text_YouWantedThis:: @ 819C142
.string "…Wait! Don't say a word!\p"
.string "You wanted this!$"
gUnknown_819C16C:: @ 819C16C
SaffronCity_MrPsychicsHouse_Text_ReceivedTM29FromMrPsychic:: @ 819C16C
.string "{PLAYER} received TM29\n"
.string "from MR. PSYCHIC.$"
gUnknown_819C18F:: @ 819C18F
SaffronCity_MrPsychicsHouse_Text_ExplainTM29:: @ 819C18F
.string "You already know, don't you?\n"
.string "TM29 is PSYCHIC.\p"
.string "It's an attack that may also lower\n"
.string "the target's special stats.$"
gUnknown_819C1FC:: @ 819C1FC
SaffronCity_MrPsychicsHouse_Text_YouveNoRoom:: @ 819C1FC
.string "Where do you plan to put this?\n"
.string "You've no room.$"
data/maps/SaffronCity_PokemonCenter_1F/map.json
+6 -6
View File
@@ -23,7 +23,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "SaffronCity_PokemonCenter_1F_EventScript_16EFFB",
"script": "SaffronCity_PokemonCenter_1F_EventScript_Nurse",
"flag": "0"
},
{
@@ -36,7 +36,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "SaffronCity_PokemonCenter_1F_EventScript_16F004",
"script": "SaffronCity_PokemonCenter_1F_EventScript_Gentleman",
"flag": "0"
},
{
@@ -49,7 +49,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "SaffronCity_PokemonCenter_1F_EventScript_16F00D",
"script": "SaffronCity_PokemonCenter_1F_EventScript_Woman",
"flag": "0"
},
{
@@ -62,7 +62,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "SaffronCity_PokemonCenter_1F_EventScript_16F016",
"script": "SaffronCity_PokemonCenter_1F_EventScript_Youngster",
"flag": "0"
},
{
@@ -75,7 +75,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "SaffronCity_PokemonCenter_1F_EventScript_1ACEEC",
"script": "SaffronCity_PokemonCenter_1F_EventScript_PokemonJournalSabrina",
"flag": "FLAG_HIDE_SAFFRON_CITY_POKECENTER_SABRINA_JOURNALS"
},
{
@@ -88,7 +88,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "SaffronCity_PokemonCenter_1F_EventScript_1ACEEC",
"script": "SaffronCity_PokemonCenter_1F_EventScript_PokemonJournalSabrina",
"flag": "FLAG_HIDE_SAFFRON_CITY_POKECENTER_SABRINA_JOURNALS"
}
],
data/maps/SaffronCity_PokemonCenter_1F/scripts.inc
+10 -10
View File
@@ -7,31 +7,31 @@ SaffronCity_PokemonCenter_1F_OnTransition:: @ 816EFF7
setrespawn SPAWN_SAFFRON_CITY
end
SaffronCity_PokemonCenter_1F_EventScript_16EFFB:: @ 816EFFB
SaffronCity_PokemonCenter_1F_EventScript_Nurse:: @ 816EFFB
lock
faceplayer
call EventScript_PkmnCenterNurse
release
end
SaffronCity_PokemonCenter_1F_EventScript_16F004:: @ 816F004
msgbox gUnknown_819C058, MSGBOX_NPC
SaffronCity_PokemonCenter_1F_EventScript_Gentleman:: @ 816F004
msgbox SaffronCity_PokemonCenter_1F_Text_SilphCoVictimOfFame, MSGBOX_NPC
end
SaffronCity_PokemonCenter_1F_EventScript_16F00D:: @ 816F00D
msgbox gUnknown_819C023, MSGBOX_NPC
SaffronCity_PokemonCenter_1F_EventScript_Woman:: @ 816F00D
msgbox SaffronCity_PokemonCenter_1F_Text_GrowthRatesDifferBySpecies, MSGBOX_NPC
end
SaffronCity_PokemonCenter_1F_EventScript_16F016:: @ 816F016
SaffronCity_PokemonCenter_1F_EventScript_Youngster:: @ 816F016
lock
faceplayer
compare VAR_MAP_SCENE_SILPH_CO_11F, 1
goto_if_eq EventScript_16F02D
msgbox gUnknown_819C0B4
goto_if_eq SaffronCity_PokemonCenter_1F_EventScript_YoungsterRocketsGone
msgbox SaffronCity_PokemonCenter_1F_Text_GreatIfEliteFourCameBeatRockets
release
end
EventScript_16F02D:: @ 816F02D
msgbox gUnknown_819C102
SaffronCity_PokemonCenter_1F_EventScript_YoungsterRocketsGone:: @ 816F02D
msgbox SaffronCity_PokemonCenter_1F_Text_TeamRocketTookOff
release
end
data/maps/SaffronCity_PokemonCenter_1F/text.inc
+4 -4
View File
@@ -1,19 +1,19 @@
gUnknown_819C023:: @ 819C023
SaffronCity_PokemonCenter_1F_Text_GrowthRatesDifferBySpecies:: @ 819C023
.string "POKéMON growth rates differ from\n"
.string "species to species.$"
gUnknown_819C058:: @ 819C058
SaffronCity_PokemonCenter_1F_Text_SilphCoVictimOfFame:: @ 819C058
.string "SILPH CO. is widely known to all.\p"
.string "It's a victim of its own fame - it\n"
.string "attracted TEAM ROCKET.$"
gUnknown_819C0B4:: @ 819C0B4
SaffronCity_PokemonCenter_1F_Text_GreatIfEliteFourCameBeatRockets:: @ 819C0B4
.string "Sigh…\n"
.string "Wouldn't this be great?\p"
.string "If the ELITE FOUR came and\n"
.string "stomped TEAM ROCKET?$"
gUnknown_819C102:: @ 819C102
SaffronCity_PokemonCenter_1F_Text_TeamRocketTookOff:: @ 819C102
.string "TEAM ROCKET took off!\n"
.string "We can go out safely again!\l"
.string "That's great!$"
data/maps/SaffronCity_PokemonTrainerFanClub/map.json
+10 -10
View File
@@ -23,7 +23,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "SaffronCity_PokemonTrainerFanClub_EventScript_16F281",
"script": "SaffronCity_PokemonTrainerFanClub_EventScript_BattleGirl",
"flag": "0"
},
{
@@ -36,7 +36,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "SaffronCity_PokemonTrainerFanClub_EventScript_16F2F8",
"script": "SaffronCity_PokemonTrainerFanClub_EventScript_LittleGirl",
"flag": "0"
},
{
@@ -49,7 +49,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "SaffronCity_PokemonTrainerFanClub_EventScript_16F36F",
"script": "SaffronCity_PokemonTrainerFanClub_EventScript_Youngster",
"flag": "0"
},
{
@@ -62,7 +62,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "SaffronCity_PokemonTrainerFanClub_EventScript_16F3E6",
"script": "SaffronCity_PokemonTrainerFanClub_EventScript_Gentleman",
"flag": "0"
},
{
@@ -75,7 +75,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "SaffronCity_PokemonTrainerFanClub_EventScript_16F45D",
"script": "SaffronCity_PokemonTrainerFanClub_EventScript_Woman",
"flag": "FLAG_HIDE_SAFFRON_FAN_CLUB_WOMAN"
},
{
@@ -88,7 +88,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "SaffronCity_PokemonTrainerFanClub_EventScript_16F4BF",
"script": "SaffronCity_PokemonTrainerFanClub_EventScript_Rocker",
"flag": "FLAG_HIDE_SAFFRON_FAN_CLUB_ROCKER"
},
{
@@ -101,7 +101,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "SaffronCity_PokemonTrainerFanClub_EventScript_16F521",
"script": "SaffronCity_PokemonTrainerFanClub_EventScript_Beauty",
"flag": "FLAG_HIDE_SAFFRON_FAN_CLUB_BEAUTY"
},
{
@@ -114,7 +114,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "SaffronCity_PokemonTrainerFanClub_EventScript_16F583",
"script": "SaffronCity_PokemonTrainerFanClub_EventScript_BlackBelt",
"flag": "FLAG_HIDE_SAFFRON_FAN_CLUB_BLACKBELT"
},
{
@@ -127,7 +127,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "SaffronCity_PokemonTrainerFanClub_EventScript_1ACF7A",
"script": "SaffronCity_PokemonTrainerFanClub_EventScript_PokemonJournalBruno",
"flag": "FLAG_HIDE_POSTGAME_GOSSIPERS"
},
{
@@ -140,7 +140,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "SaffronCity_PokemonTrainerFanClub_EventScript_1ACF7A",
"script": "SaffronCity_PokemonTrainerFanClub_EventScript_PokemonJournalBruno",
"flag": "FLAG_HIDE_POSTGAME_GOSSIPERS"
}
],
data/maps/SaffronCity_PokemonTrainerFanClub/scripts.inc
+139 -135
View File
@@ -4,10 +4,10 @@ SaffronCity_PokemonTrainerFanClub_MapScripts:: @ 816F0BF
.byte 0
SaffronCity_PokemonTrainerFanClub_OnFrame:: @ 816F0CA
map_script_2 VAR_MAP_SCENE_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB, 1, EventScript_16F0D4
map_script_2 VAR_MAP_SCENE_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB, 1, SaffronCity_PokemonTrainerFanClub_EventScript_MeetFirstFans
.2byte 0
EventScript_16F0D4:: @ 816F0D4
SaffronCity_PokemonTrainerFanClub_EventScript_MeetFirstFans:: @ 816F0D4
lockall
textcolor 1
applymovement 1, Movement_WalkInPlaceFastestDown
@@ -17,18 +17,18 @@ EventScript_16F0D4:: @ 816F0D4
waitmovement 0
applymovement 1, Movement_Delay48
waitmovement 0
msgbox gUnknown_819C22B
msgbox SaffronCity_PokemonTrainerFanClub_Text_HuhYou
closemessage
applymovement 1, Movement_16F124
applymovement 1, SaffronCity_PokemonTrainerFanClub_Movement_FanApproachPlayer
waitmovement 0
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight
waitmovement 0
msgbox gUnknown_819C235
msgbox SaffronCity_PokemonTrainerFanClub_Text_YourePlayerWereYourFansNow
setvar VAR_MAP_SCENE_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB, 2
releaseall
end
Movement_16F124:: @ 816F124
SaffronCity_PokemonTrainerFanClub_Movement_FanApproachPlayer:: @ 816F124
delay_16
delay_8
walk_down
@@ -38,7 +38,8 @@ Movement_16F124:: @ 816F124
walk_left
step_end
Movement_16F12C:: @ 816F12C
@ Unused, leftover from RS
LilycoveCity_PokemonTrainerFanClub_Movement_FanApproachPlayer:: @ 816F12C
delay_8
walk_in_place_fastest_down
walk_down
@@ -48,7 +49,8 @@ Movement_16F12C:: @ 816F12C
walk_left
step_end
Movement_16F134:: @ 816F134
@ Unused, leftover from RS
LilycoveCity_PokemonTrainerFanClub_Movement_LittleGirlWatchPlayer:: @ 816F134
walk_fast_left
walk_fast_left
walk_fast_down
@@ -57,12 +59,14 @@ Movement_16F134:: @ 816F134
walk_fast_down
step_end
Movement_16F13B:: @ 816F13B
@ Unused, leftover from RS
LilycoveCity_PokemonTrainerFanClub_Movement_LittleGirlMoveCloserToPlayer:: @ 816F13B
walk_down
walk_in_place_fastest_right
step_end
Movement_16F13E:: @ 816F13E
@ Unused, leftover from RS
LilycoveCity_PokemonTrainerFanClub_Movement_LittleGirlHideFromPlayer:: @ 816F13E
jump_in_place_right
walk_fast_up
walk_fast_up
@@ -72,383 +76,383 @@ Movement_16F13E:: @ 816F13E
SaffronCity_PokemonTrainerFanClub_OnTransition:: @ 816F144
compare VAR_MAP_SCENE_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB, 1
goto_if_eq EventScript_16F267
goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_SetMemberPosForFirstMeeting
compare VAR_MAP_SCENE_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB, 2
goto_if_eq EventScript_16F15B
goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_UpdateFanMemberPositions
end
EventScript_16F15B:: @ 816F15B
SaffronCity_PokemonTrainerFanClub_EventScript_UpdateFanMemberPositions:: @ 816F15B
special Special_TryLoseFansFromPlayTime
setvar VAR_0x8004, FANCLUB_MEMBER1
specialvar VAR_RESULT, Special_IsFanClubMemberFanOfPlayer
compare VAR_RESULT, FALSE
call_if_eq EventScript_16F207
call_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_MoveMember1ToFarTable
setvar VAR_0x8004, FANCLUB_MEMBER2
specialvar VAR_RESULT, Special_IsFanClubMemberFanOfPlayer
compare VAR_RESULT, FALSE
call_if_eq EventScript_16F213
call_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_MoveMember2ToFarTable
setvar VAR_0x8004, FANCLUB_MEMBER3
specialvar VAR_RESULT, Special_IsFanClubMemberFanOfPlayer
compare VAR_RESULT, FALSE
call_if_eq EventScript_16F21F
call_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_MoveMember3ToFarTable
setvar VAR_0x8004, FANCLUB_MEMBER4
specialvar VAR_RESULT, Special_IsFanClubMemberFanOfPlayer
compare VAR_RESULT, FALSE
call_if_eq EventScript_16F22B
call_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_MoveMember4ToFarTable
setvar VAR_0x8004, FANCLUB_MEMBER5
specialvar VAR_RESULT, Special_IsFanClubMemberFanOfPlayer
compare VAR_RESULT, FALSE
call_if_eq EventScript_16F237
call_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_MoveMember5ToFarTable
setvar VAR_0x8004, FANCLUB_MEMBER6
specialvar VAR_RESULT, Special_IsFanClubMemberFanOfPlayer
compare VAR_RESULT, FALSE
call_if_eq EventScript_16F243
call_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_MoveMember6ToFarTable
setvar VAR_0x8004, FANCLUB_MEMBER7
specialvar VAR_RESULT, Special_IsFanClubMemberFanOfPlayer
compare VAR_RESULT, FALSE
call_if_eq EventScript_16F24F
call_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_MoveMember7ToFarTable
setvar VAR_0x8004, FANCLUB_MEMBER8
specialvar VAR_RESULT, Special_IsFanClubMemberFanOfPlayer
compare VAR_RESULT, FALSE
call_if_eq EventScript_16F25B
call_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_MoveMember8ToFarTable
end
EventScript_16F207:: @ 816F207
SaffronCity_PokemonTrainerFanClub_EventScript_MoveMember1ToFarTable:: @ 816F207
setobjectxyperm 1, 5, 2
setobjectmovementtype 1, 7
return
EventScript_16F213:: @ 816F213
SaffronCity_PokemonTrainerFanClub_EventScript_MoveMember2ToFarTable:: @ 816F213
setobjectxyperm 3, 7, 4
setobjectmovementtype 3, 9
return
EventScript_16F21F:: @ 816F21F
SaffronCity_PokemonTrainerFanClub_EventScript_MoveMember3ToFarTable:: @ 816F21F
setobjectxyperm 4, 2, 2
setobjectmovementtype 4, 7
return
EventScript_16F22B:: @ 816F22B
SaffronCity_PokemonTrainerFanClub_EventScript_MoveMember4ToFarTable:: @ 816F22B
setobjectxyperm 2, 3, 4
setobjectmovementtype 2, 10
return
EventScript_16F237:: @ 816F237
SaffronCity_PokemonTrainerFanClub_EventScript_MoveMember5ToFarTable:: @ 816F237
setobjectxyperm 6, 4, 6
setobjectmovementtype 6, 7
return
EventScript_16F243:: @ 816F243
SaffronCity_PokemonTrainerFanClub_EventScript_MoveMember6ToFarTable:: @ 816F243
setobjectxyperm 5, 10, 3
setobjectmovementtype 5, 7
return
EventScript_16F24F:: @ 816F24F
SaffronCity_PokemonTrainerFanClub_EventScript_MoveMember7ToFarTable:: @ 816F24F
setobjectxyperm 7, 7, 5
setobjectmovementtype 7, 9
return
EventScript_16F25B:: @ 816F25B
SaffronCity_PokemonTrainerFanClub_EventScript_MoveMember8ToFarTable:: @ 816F25B
setobjectxyperm 8, 9, 6
setobjectmovementtype 8, 9
return
EventScript_16F267:: @ 816F267
call EventScript_16F22B
call EventScript_16F237
call EventScript_16F243
call EventScript_16F24F
call EventScript_16F25B
SaffronCity_PokemonTrainerFanClub_EventScript_SetMemberPosForFirstMeeting:: @ 816F267
call SaffronCity_PokemonTrainerFanClub_EventScript_MoveMember4ToFarTable
call SaffronCity_PokemonTrainerFanClub_EventScript_MoveMember5ToFarTable
call SaffronCity_PokemonTrainerFanClub_EventScript_MoveMember6ToFarTable
call SaffronCity_PokemonTrainerFanClub_EventScript_MoveMember7ToFarTable
call SaffronCity_PokemonTrainerFanClub_EventScript_MoveMember8ToFarTable
end
SaffronCity_PokemonTrainerFanClub_EventScript_16F281:: @ 816F281
SaffronCity_PokemonTrainerFanClub_EventScript_BattleGirl:: @ 816F281
lock
faceplayer
setvar VAR_0x8004, FANCLUB_MEMBER1
special Special_BufferFanClubTrainerName
compare VAR_MAP_SCENE_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB, 0
goto_if_eq EventScript_16F2EE
goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_BattleGirlPlayerNotChampion
specialvar VAR_RESULT, Special_IsFanClubMemberFanOfPlayer
compare VAR_RESULT, TRUE
goto_if_eq EventScript_16F2C0
goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_BattleGirlPlayersFan
specialvar VAR_RESULT, Special_GetNumFansOfPlayerInTrainerFanClub
compare VAR_RESULT, (NUM_TRAINER_FAN_CLUB_MEMBERS - 1)
goto_if_eq EventScript_16F2E4
msgbox gUnknown_819C420
goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_BattleGirlOnlyNonFan
msgbox SaffronCity_PokemonTrainerFanClub_Text_WasYourFanNotAnymore
release
end
EventScript_16F2C0:: @ 816F2C0
SaffronCity_PokemonTrainerFanClub_EventScript_BattleGirlPlayersFan:: @ 816F2C0
specialvar VAR_RESULT, Special_GetNumFansOfPlayerInTrainerFanClub
compare VAR_RESULT, 1
goto_if_eq EventScript_16F2DA
msgbox gUnknown_819C390
goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_BattleGirlOnlyFan
msgbox SaffronCity_PokemonTrainerFanClub_Text_AlwaysCheerForYou
release
end
EventScript_16F2DA:: @ 816F2DA
msgbox gUnknown_819C3BD
SaffronCity_PokemonTrainerFanClub_EventScript_BattleGirlOnlyFan:: @ 816F2DA
msgbox SaffronCity_PokemonTrainerFanClub_Text_IllAlwaysBelieveInYou
release
end
EventScript_16F2E4:: @ 816F2E4
msgbox gUnknown_819C4A5
SaffronCity_PokemonTrainerFanClub_EventScript_BattleGirlOnlyNonFan:: @ 816F2E4
msgbox SaffronCity_PokemonTrainerFanClub_Text_EveryonesYourFanButICantBe
release
end
EventScript_16F2EE:: @ 816F2EE
msgbox gUnknown_819C55C
SaffronCity_PokemonTrainerFanClub_EventScript_BattleGirlPlayerNotChampion:: @ 816F2EE
msgbox SaffronCity_PokemonTrainerFanClub_Text_TrainersCoolWhenBattling
release
end
SaffronCity_PokemonTrainerFanClub_EventScript_16F2F8:: @ 816F2F8
SaffronCity_PokemonTrainerFanClub_EventScript_LittleGirl:: @ 816F2F8
lock
faceplayer
setvar VAR_0x8004, FANCLUB_MEMBER4
special Special_BufferFanClubTrainerName
compare VAR_MAP_SCENE_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB, 0
goto_if_eq EventScript_16F365
goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_LittleGirlPlayerNotChampion
specialvar VAR_RESULT, Special_IsFanClubMemberFanOfPlayer
compare VAR_RESULT, TRUE
goto_if_eq EventScript_16F337
goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_LittleGirlPlayersFan
specialvar VAR_RESULT, Special_GetNumFansOfPlayerInTrainerFanClub
compare VAR_RESULT, (NUM_TRAINER_FAN_CLUB_MEMBERS - 1)
goto_if_eq EventScript_16F35B
msgbox gUnknown_819CBD3
goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_LittleGirlOnlyNonFan
msgbox SaffronCity_PokemonTrainerFanClub_Text_WantToBeLikeSabrina
release
end
EventScript_16F337:: @ 816F337
SaffronCity_PokemonTrainerFanClub_EventScript_LittleGirlPlayersFan:: @ 816F337
specialvar VAR_RESULT, Special_GetNumFansOfPlayerInTrainerFanClub
compare VAR_RESULT, 1
goto_if_eq EventScript_16F351
msgbox gUnknown_819CB32
goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_LittleGirlOnlyFan
msgbox SaffronCity_PokemonTrainerFanClub_Text_WantToBeLikeYouOneDay
release
end
EventScript_16F351:: @ 816F351
msgbox gUnknown_819CB62
SaffronCity_PokemonTrainerFanClub_EventScript_LittleGirlOnlyFan:: @ 816F351
msgbox SaffronCity_PokemonTrainerFanClub_Text_EveryoneButMeStoppedBeingYourFan
release
end
EventScript_16F35B:: @ 816F35B
msgbox gUnknown_819CC2B
SaffronCity_PokemonTrainerFanClub_EventScript_LittleGirlOnlyNonFan:: @ 816F35B
msgbox SaffronCity_PokemonTrainerFanClub_Text_WontStopBeingSabrinasFan
release
end
EventScript_16F365:: @ 816F365
msgbox gUnknown_819CCC2
SaffronCity_PokemonTrainerFanClub_EventScript_LittleGirlPlayerNotChampion:: @ 816F365
msgbox SaffronCity_PokemonTrainerFanClub_Text_CanIBecomeCoolTrainerOneDay
release
end
SaffronCity_PokemonTrainerFanClub_EventScript_16F36F:: @ 816F36F
SaffronCity_PokemonTrainerFanClub_EventScript_Youngster:: @ 816F36F
lock
faceplayer
setvar VAR_0x8004, FANCLUB_MEMBER2
special Special_BufferFanClubTrainerName
compare VAR_MAP_SCENE_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB, 0
goto_if_eq EventScript_16F3DC
goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_YoungsterPlayerNotChampion
specialvar VAR_RESULT, Special_IsFanClubMemberFanOfPlayer
compare VAR_RESULT, TRUE
goto_if_eq EventScript_16F3AE
goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_YoungsterPlayersFan
specialvar VAR_RESULT, Special_GetNumFansOfPlayerInTrainerFanClub
compare VAR_RESULT, (NUM_TRAINER_FAN_CLUB_MEMBERS - 1)
goto_if_eq EventScript_16F3D2
msgbox gUnknown_819C6BA
goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_YoungsterOnlyNonFan
msgbox SaffronCity_PokemonTrainerFanClub_Text_BrocksMyHero
release
end
EventScript_16F3AE:: @ 816F3AE
SaffronCity_PokemonTrainerFanClub_EventScript_YoungsterPlayersFan:: @ 816F3AE
specialvar VAR_RESULT, Special_GetNumFansOfPlayerInTrainerFanClub
compare VAR_RESULT, 1
goto_if_eq EventScript_16F3C8
msgbox gUnknown_819C5A9
goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_YoungsterOnlyFan
msgbox SaffronCity_PokemonTrainerFanClub_Text_CanYouAutographShorts
release
end
EventScript_16F3C8:: @ 816F3C8
msgbox gUnknown_819C600
SaffronCity_PokemonTrainerFanClub_EventScript_YoungsterOnlyFan:: @ 816F3C8
msgbox SaffronCity_PokemonTrainerFanClub_Text_CountingOnYou
release
end
EventScript_16F3D2:: @ 816F3D2
msgbox gUnknown_819C73A
SaffronCity_PokemonTrainerFanClub_EventScript_YoungsterOnlyNonFan:: @ 816F3D2
msgbox SaffronCity_PokemonTrainerFanClub_Text_BrocksFanToBitterEnd
release
end
EventScript_16F3DC:: @ 816F3DC
msgbox gUnknown_819C7C8
SaffronCity_PokemonTrainerFanClub_EventScript_YoungsterPlayerNotChampion:: @ 816F3DC
msgbox SaffronCity_PokemonTrainerFanClub_Text_BrocksLastWordOnCool
release
end
SaffronCity_PokemonTrainerFanClub_EventScript_16F3E6:: @ 816F3E6
SaffronCity_PokemonTrainerFanClub_EventScript_Gentleman:: @ 816F3E6
lock
faceplayer
setvar VAR_0x8004, FANCLUB_MEMBER3
special Special_BufferFanClubTrainerName
compare VAR_MAP_SCENE_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB, 0
goto_if_eq EventScript_16F453
goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_GentlemanPlayerNotChampion
specialvar VAR_RESULT, Special_IsFanClubMemberFanOfPlayer
compare VAR_RESULT, TRUE
goto_if_eq EventScript_16F425
goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_GentlemanPlayersFan
specialvar VAR_RESULT, Special_GetNumFansOfPlayerInTrainerFanClub
compare VAR_RESULT, (NUM_TRAINER_FAN_CLUB_MEMBERS - 1)
goto_if_eq EventScript_16F449
msgbox gUnknown_819C986
goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_GentlemanOnlyNonFan
msgbox SaffronCity_PokemonTrainerFanClub_Text_HmmAndYouAre
release
end
EventScript_16F425:: @ 816F425
SaffronCity_PokemonTrainerFanClub_EventScript_GentlemanPlayersFan:: @ 816F425
specialvar VAR_RESULT, Special_GetNumFansOfPlayerInTrainerFanClub
compare VAR_RESULT, 1
goto_if_eq EventScript_16F43F
msgbox gUnknown_819C81E
goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_GentlemanOnlyFan
msgbox SaffronCity_PokemonTrainerFanClub_Text_HadPleasureOfWatchingYouBattle
release
end
EventScript_16F43F:: @ 816F43F
msgbox gUnknown_819C8C1
SaffronCity_PokemonTrainerFanClub_EventScript_GentlemanOnlyFan:: @ 816F43F
msgbox SaffronCity_PokemonTrainerFanClub_Text_NeverSeenTrainerOfYourMagnificence
release
end
EventScript_16F449:: @ 816F449
msgbox gUnknown_819C9D5
SaffronCity_PokemonTrainerFanClub_EventScript_GentlemanOnlyNonFan:: @ 816F449
msgbox SaffronCity_PokemonTrainerFanClub_Text_YouveStillAWaysToGo
release
end
EventScript_16F453:: @ 816F453
msgbox gUnknown_819CA7C
SaffronCity_PokemonTrainerFanClub_EventScript_GentlemanPlayerNotChampion:: @ 816F453
msgbox SaffronCity_PokemonTrainerFanClub_Text_YoullBeTalkedAboutIfYouKeepWinning
release
end
SaffronCity_PokemonTrainerFanClub_EventScript_16F45D:: @ 816F45D
SaffronCity_PokemonTrainerFanClub_EventScript_Woman:: @ 816F45D
lock
faceplayer
setvar VAR_0x8004, FANCLUB_MEMBER6
special Special_BufferFanClubTrainerName
specialvar VAR_RESULT, Special_IsFanClubMemberFanOfPlayer
compare VAR_RESULT, TRUE
goto_if_eq EventScript_16F491
goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_WomanPlayersFan
specialvar VAR_RESULT, Special_GetNumFansOfPlayerInTrainerFanClub
compare VAR_RESULT, (NUM_TRAINER_FAN_CLUB_MEMBERS - 1)
goto_if_eq EventScript_16F4B5
msgbox gUnknown_819D01F
goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_WomanOnlyNonFan
msgbox SaffronCity_PokemonTrainerFanClub_Text_TrainerHasBeenOnFire
release
end
EventScript_16F491:: @ 816F491
SaffronCity_PokemonTrainerFanClub_EventScript_WomanPlayersFan:: @ 816F491
specialvar VAR_RESULT, Special_GetNumFansOfPlayerInTrainerFanClub
compare VAR_RESULT, 1
goto_if_eq EventScript_16F4AB
msgbox gUnknown_819CEDF
goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_WomanOnlyFan
msgbox SaffronCity_PokemonTrainerFanClub_Text_AdoreWayYouBattle
release
end
EventScript_16F4AB:: @ 816F4AB
msgbox gUnknown_819CF6D
SaffronCity_PokemonTrainerFanClub_EventScript_WomanOnlyFan:: @ 816F4AB
msgbox SaffronCity_PokemonTrainerFanClub_Text_ImYourNumberOneFan
release
end
EventScript_16F4B5:: @ 816F4B5
msgbox gUnknown_819D075
SaffronCity_PokemonTrainerFanClub_EventScript_WomanOnlyNonFan:: @ 816F4B5
msgbox SaffronCity_PokemonTrainerFanClub_Text_EveryoneTalksAboutYou
release
end
SaffronCity_PokemonTrainerFanClub_EventScript_16F4BF:: @ 816F4BF
SaffronCity_PokemonTrainerFanClub_EventScript_Rocker:: @ 816F4BF
lock
faceplayer
setvar VAR_0x8004, FANCLUB_MEMBER5
special Special_BufferFanClubTrainerName
specialvar VAR_RESULT, Special_IsFanClubMemberFanOfPlayer
compare VAR_RESULT, TRUE
goto_if_eq EventScript_16F4F3
goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_RockerPlayersFan
specialvar VAR_RESULT, Special_GetNumFansOfPlayerInTrainerFanClub
compare VAR_RESULT, (NUM_TRAINER_FAN_CLUB_MEMBERS - 1)
goto_if_eq EventScript_16F517
msgbox gUnknown_819CDDA
goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_RockerOnlyNonFan
msgbox SaffronCity_PokemonTrainerFanClub_Text_LoveWayTrainerTalks
release
end
EventScript_16F4F3:: @ 816F4F3
SaffronCity_PokemonTrainerFanClub_EventScript_RockerPlayersFan:: @ 816F4F3
specialvar VAR_RESULT, Special_GetNumFansOfPlayerInTrainerFanClub
compare VAR_RESULT, 1
goto_if_eq EventScript_16F50D
msgbox gUnknown_819CCF3
goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_RockerOnlyFan
msgbox SaffronCity_PokemonTrainerFanClub_Text_TheWayYouBattleIsCool
release
end
EventScript_16F50D:: @ 816F50D
msgbox gUnknown_819CD4E
SaffronCity_PokemonTrainerFanClub_EventScript_RockerOnlyFan:: @ 816F50D
msgbox SaffronCity_PokemonTrainerFanClub_Text_ImOnlyOneLeftOfYourFans
release
end
EventScript_16F517:: @ 816F517
msgbox gUnknown_819CE3A
SaffronCity_PokemonTrainerFanClub_EventScript_RockerOnlyNonFan:: @ 816F517
msgbox SaffronCity_PokemonTrainerFanClub_Text_ImLoneTrainerFan
release
end
SaffronCity_PokemonTrainerFanClub_EventScript_16F521:: @ 816F521
SaffronCity_PokemonTrainerFanClub_EventScript_Beauty:: @ 816F521
lock
faceplayer
setvar VAR_0x8004, FANCLUB_MEMBER7
special Special_BufferFanClubTrainerName
specialvar VAR_RESULT, Special_IsFanClubMemberFanOfPlayer
compare VAR_RESULT, TRUE
goto_if_eq EventScript_16F555
goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_BeautyPlayersFan
specialvar VAR_RESULT, Special_GetNumFansOfPlayerInTrainerFanClub
compare VAR_RESULT, (NUM_TRAINER_FAN_CLUB_MEMBERS - 1)
goto_if_eq EventScript_16F579
msgbox gUnknown_819D1AE
goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_BeautyOnlyNonFan
msgbox SaffronCity_PokemonTrainerFanClub_Text_WhyCantOthersSeeMastersDignity
release
end
EventScript_16F555:: @ 816F555
SaffronCity_PokemonTrainerFanClub_EventScript_BeautyPlayersFan:: @ 816F555
specialvar VAR_RESULT, Special_GetNumFansOfPlayerInTrainerFanClub
compare VAR_RESULT, 1
goto_if_eq EventScript_16F56F
msgbox gUnknown_819D0E3
goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_BeautyOnlyFan
msgbox SaffronCity_PokemonTrainerFanClub_Text_YouReallyAreAmazing
release
end
EventScript_16F56F:: @ 816F56F
msgbox gUnknown_819D148
SaffronCity_PokemonTrainerFanClub_EventScript_BeautyOnlyFan:: @ 816F56F
msgbox SaffronCity_PokemonTrainerFanClub_Text_ImYourOnlyFan
release
end
EventScript_16F579:: @ 816F579
msgbox gUnknown_819D211
SaffronCity_PokemonTrainerFanClub_EventScript_BeautyOnlyNonFan:: @ 816F579
msgbox SaffronCity_PokemonTrainerFanClub_Text_BelieveInMasterWithAllMyHeart
release
end
SaffronCity_PokemonTrainerFanClub_EventScript_16F583:: @ 816F583
SaffronCity_PokemonTrainerFanClub_EventScript_BlackBelt:: @ 816F583
lock
faceplayer
setvar VAR_0x8004, FANCLUB_MEMBER8
special Special_BufferFanClubTrainerName
specialvar VAR_RESULT, Special_IsFanClubMemberFanOfPlayer
compare VAR_RESULT, TRUE
goto_if_eq EventScript_16F5B7
goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_BlackBeltPlayersFan
specialvar VAR_RESULT, Special_GetNumFansOfPlayerInTrainerFanClub
compare VAR_RESULT, (NUM_TRAINER_FAN_CLUB_MEMBERS - 1)
goto_if_eq EventScript_16F5DB
msgbox gUnknown_819D3D2
goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_BlackBeltOnlyNonFan
msgbox SaffronCity_PokemonTrainerFanClub_Text_OnlyMasterHasMyRespect
release
end
EventScript_16F5B7:: @ 816F5B7
SaffronCity_PokemonTrainerFanClub_EventScript_BlackBeltPlayersFan:: @ 816F5B7
specialvar VAR_RESULT, Special_GetNumFansOfPlayerInTrainerFanClub
compare VAR_RESULT, 1
goto_if_eq EventScript_16F5D1
msgbox gUnknown_819D2B4
goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_BlackBeltOnlyFan
msgbox SaffronCity_PokemonTrainerFanClub_Text_YourBattleStyleIsEducational
release
end
EventScript_16F5D1:: @ 816F5D1
msgbox gUnknown_819D31F
SaffronCity_PokemonTrainerFanClub_EventScript_BlackBeltOnlyFan:: @ 816F5D1
msgbox SaffronCity_PokemonTrainerFanClub_Text_WontStopBeingYourFan
release
end
EventScript_16F5DB:: @ 816F5DB
msgbox gUnknown_819D477
SaffronCity_PokemonTrainerFanClub_EventScript_BlackBeltOnlyNonFan:: @ 816F5DB
msgbox SaffronCity_PokemonTrainerFanClub_Text_NeverBeFanOfAnyoneButMaster
release
end
data/maps/SaffronCity_PokemonTrainerFanClub/text.inc
+38 -38
View File
@@ -1,8 +1,8 @@
gUnknown_819C22B:: @ 819C22B
SaffronCity_PokemonTrainerFanClub_Text_HuhYou:: @ 819C22B
.string "Huh?\n"
.string "You…$"
gUnknown_819C235:: @ 819C235
SaffronCity_PokemonTrainerFanClub_Text_YourePlayerWereYourFansNow:: @ 819C235
.string "Are you maybe…\n"
.string "… …\p"
.string "You are!\n"
@@ -19,17 +19,17 @@ gUnknown_819C235:: @ 819C235
.string "That way, maybe other people will\n"
.string "become fans just like me.$"
gUnknown_819C390:: @ 819C390
SaffronCity_PokemonTrainerFanClub_Text_AlwaysCheerForYou:: @ 819C390
.string "I'll always be cheering for you!\p"
.string "Go, {PLAYER}, go!$"
gUnknown_819C3BD:: @ 819C3BD
SaffronCity_PokemonTrainerFanClub_Text_IllAlwaysBelieveInYou:: @ 819C3BD
.string "I'll always believe in you,\n"
.string "{PLAYER}.\p"
.string "Please show the others what you're\n"
.string "like when you battle seriously.$"
gUnknown_819C420:: @ 819C420
SaffronCity_PokemonTrainerFanClub_Text_WasYourFanNotAnymore:: @ 819C420
.string "I'm sorry.\n"
.string "I was your fan before.\p"
.string "But now, you seem to have lost\n"
@@ -37,7 +37,7 @@ gUnknown_819C420:: @ 819C420
.string "Lately, I think {STR_VAR_1} has been\n"
.string "a lot cooler.$"
gUnknown_819C4A5:: @ 819C4A5
SaffronCity_PokemonTrainerFanClub_Text_EveryonesYourFanButICantBe:: @ 819C4A5
.string "Oh!\n"
.string "{PLAYER}!\p"
.string "Everyone's been all excited about\n"
@@ -48,12 +48,12 @@ gUnknown_819C4A5:: @ 819C4A5
.string "Once I became {STR_VAR_1}'s fan,\n"
.string "I can't just stop being a fan.$"
gUnknown_819C55C:: @ 819C55C
SaffronCity_PokemonTrainerFanClub_Text_TrainersCoolWhenBattling:: @ 819C55C
.string "I think TRAINERS are so cool when\n"
.string "they're battling.\p"
.string "Don't you think so, too?$"
gUnknown_819C5A9:: @ 819C5A9
SaffronCity_PokemonTrainerFanClub_Text_CanYouAutographShorts:: @ 819C5A9
.string "Oh! It's {PLAYER}!\n"
.string "Too cool!\p"
.string "Oh!\n"
@@ -61,7 +61,7 @@ gUnknown_819C5A9:: @ 819C5A9
.string "Can you autograph something?\n"
.string "How about my shorts?$"
gUnknown_819C600:: @ 819C600
SaffronCity_PokemonTrainerFanClub_Text_CountingOnYou:: @ 819C600
.string "However hot it's been…\p"
.string "And however cold it may get…\p"
.string "I've always believed in, and worn,\n"
@@ -71,7 +71,7 @@ gUnknown_819C600:: @ 819C600
.string "I believe in you just as much as\n"
.string "I believe in shorts!$"
gUnknown_819C6BA:: @ 819C6BA
SaffronCity_PokemonTrainerFanClub_Text_BrocksMyHero:: @ 819C6BA
.string "BROCK's my hero!\n"
.string "He's a man among men!\p"
.string "Heheh, I got my mom to do\n"
@@ -79,7 +79,7 @@ gUnknown_819C6BA:: @ 819C6BA
.string "I got her to embroider “BROCK”\n"
.string "on my shorts!$"
gUnknown_819C73A:: @ 819C73A
SaffronCity_PokemonTrainerFanClub_Text_BrocksFanToBitterEnd:: @ 819C73A
.string "… …\p"
.string "… …\n"
.string "I'm BROCK's fan!\p"
@@ -88,13 +88,13 @@ gUnknown_819C73A:: @ 819C73A
.string "and on my shorts!\p"
.string "I'll be his fan to the bitter end!$"
gUnknown_819C7C8:: @ 819C7C8
SaffronCity_PokemonTrainerFanClub_Text_BrocksLastWordOnCool:: @ 819C7C8
.string "BROCK's the last word on cool,\n"
.string "end of story!\p"
.string "Now there's a guy who I want to\n"
.string "be like!$"
gUnknown_819C81E:: @ 819C81E
SaffronCity_PokemonTrainerFanClub_Text_HadPleasureOfWatchingYouBattle:: @ 819C81E
.string "{PLAYER}, I've had the pleasure of\n"
.string "watching you battle.\p"
.string "It brings back sweet memories of\n"
@@ -102,7 +102,7 @@ gUnknown_819C81E:: @ 819C81E
.string "May you continue to find success.\n"
.string "You have a fan in me!$"
gUnknown_819C8C1:: @ 819C8C1
SaffronCity_PokemonTrainerFanClub_Text_NeverSeenTrainerOfYourMagnificence:: @ 819C8C1
.string "I have journeyed far and wide\n"
.string "across the lands.\p"
.string "But never have I seen a TRAINER\n"
@@ -112,13 +112,13 @@ gUnknown_819C8C1:: @ 819C8C1
.string "Make that a promise to me,\n"
.string "my young idol!$"
gUnknown_819C986:: @ 819C986
SaffronCity_PokemonTrainerFanClub_Text_HmmAndYouAre:: @ 819C986
.string "Hmm…\n"
.string "And you are?\p"
.string "Were you hoping to sign up for\n"
.string "a membership in our FAN CLUB?$"
gUnknown_819C9D5:: @ 819C9D5
SaffronCity_PokemonTrainerFanClub_Text_YouveStillAWaysToGo:: @ 819C9D5
.string "Ah, so you are the much-\n"
.string "talked-about {PLAYER}.\p"
.string "You certainly do have the look of\n"
@@ -128,7 +128,7 @@ gUnknown_819C9D5:: @ 819C9D5
.string "… …\p"
.string "You've still a ways to go!$"
gUnknown_819CA7C:: @ 819CA7C
SaffronCity_PokemonTrainerFanClub_Text_YoullBeTalkedAboutIfYouKeepWinning:: @ 819CA7C
.string "All of us gathered here are fans\n"
.string "of POKéMON TRAINERS.\p"
.string "The way they look in battle…\n"
@@ -136,12 +136,12 @@ gUnknown_819CA7C:: @ 819CA7C
.string "Perhaps you will be talked about\n"
.string "here, too, if you keep winning.$"
gUnknown_819CB32:: @ 819CB32
SaffronCity_PokemonTrainerFanClub_Text_WantToBeLikeYouOneDay:: @ 819CB32
.string "It's {PLAYER}!\n"
.string "It's {PLAYER}!\p"
.string "I want to be like {PLAYER} one day!$"
gUnknown_819CB62:: @ 819CB62
SaffronCity_PokemonTrainerFanClub_Text_EveryoneButMeStoppedBeingYourFan:: @ 819CB62
.string "Everyone stopped being {PLAYER}'s\n"
.string "fan…\p"
.string "But that means I can have {PLAYER}\n"
@@ -149,13 +149,13 @@ gUnknown_819CB62:: @ 819CB62
.string "Yay! Go for it!\n"
.string "My one and only {PLAYER}!$"
gUnknown_819CBD3:: @ 819CBD3
SaffronCity_PokemonTrainerFanClub_Text_WantToBeLikeSabrina:: @ 819CBD3
.string "Do you know what?\n"
.string "I want to be like SABRINA!\p"
.string "I want to be a psychic girl just\n"
.string "like her!$"
gUnknown_819CC2B:: @ 819CC2B
SaffronCity_PokemonTrainerFanClub_Text_WontStopBeingSabrinasFan:: @ 819CC2B
.string "Even if I'm the only one, I won't\n"
.string "stop being SABRINA's fan.\p"
.string "My dream is to be like SABRINA,\n"
@@ -163,11 +163,11 @@ gUnknown_819CC2B:: @ 819CC2B
.string "I want to be a psychic girl just\n"
.string "like her!$"
gUnknown_819CCC2:: @ 819CCC2
SaffronCity_PokemonTrainerFanClub_Text_CanIBecomeCoolTrainerOneDay:: @ 819CCC2
.string "I wonder if I can become a cool\n"
.string "TRAINER one day?$"
gUnknown_819CCF3:: @ 819CCF3
SaffronCity_PokemonTrainerFanClub_Text_TheWayYouBattleIsCool:: @ 819CCF3
.string "Oh, man, oh, man!\n"
.string "Cool! Too cool!\p"
.string "…Huh?\n"
@@ -175,7 +175,7 @@ gUnknown_819CCF3:: @ 819CCF3
.string "Just the way you battle.\n"
.string "That's cool.$"
gUnknown_819CD4E:: @ 819CD4E
SaffronCity_PokemonTrainerFanClub_Text_ImOnlyOneLeftOfYourFans:: @ 819CD4E
.string "Yo, {PLAYER}!\p"
.string "Looks like I'm the only one left\n"
.string "out of your fans.\p"
@@ -183,13 +183,13 @@ gUnknown_819CD4E:: @ 819CD4E
.string "fan… It's less stressful.\p"
.string "Keep up and at it!$"
gUnknown_819CDDA:: @ 819CDDA
SaffronCity_PokemonTrainerFanClub_Text_LoveWayTrainerTalks:: @ 819CDDA
.string "{STR_VAR_1}'s cool, huh?\n"
.string "I love the way he talks.\p"
.string "I'd really relish a chance to meet\n"
.string "him in person once.$"
gUnknown_819CE3A:: @ 819CE3A
SaffronCity_PokemonTrainerFanClub_Text_ImLoneTrainerFan:: @ 819CE3A
.string "Huh, can you believe it?\n"
.string "Everyone turned into your fans.\p"
.string "So after all we've been through,\n"
@@ -197,7 +197,7 @@ gUnknown_819CE3A:: @ 819CE3A
.string "Eh, being the one and only\n"
.string "{STR_VAR_1} fan's my style, anyway.$"
gUnknown_819CEDF:: @ 819CEDF
SaffronCity_PokemonTrainerFanClub_Text_AdoreWayYouBattle:: @ 819CEDF
.string "Oh, my goodness!\n"
.string "Is it really you, {PLAYER}?\p"
.string "I have to tell you, I adore the\n"
@@ -205,7 +205,7 @@ gUnknown_819CEDF:: @ 819CEDF
.string "I hope you'll keep at it.\n"
.string "I'll be your number one fan!$"
gUnknown_819CF6D:: @ 819CF6D
SaffronCity_PokemonTrainerFanClub_Text_ImYourNumberOneFan:: @ 819CF6D
.string "Oh, my goodness!\n"
.string "If it isn't {PLAYER}!\p"
.string "It's so disappointing… I realized\n"
@@ -214,13 +214,13 @@ gUnknown_819CF6D:: @ 819CF6D
.string "Let me cheer you on, at least!\p"
.string "Hurray, hurray, {PLAYER}!$"
gUnknown_819D01F:: @ 819D01F
SaffronCity_PokemonTrainerFanClub_Text_TrainerHasBeenOnFire:: @ 819D01F
.string "Recently, {STR_VAR_1} has been on\n"
.string "fire.\p"
.string "The way he battles… It's just \n"
.string "the way that I like it!$"
gUnknown_819D075:: @ 819D075
SaffronCity_PokemonTrainerFanClub_Text_EveryoneTalksAboutYou:: @ 819D075
.string "Oh, hello!\n"
.string "If it isn't {PLAYER}!\p"
.string "Lately, all everyone talks about\n"
@@ -228,25 +228,25 @@ gUnknown_819D075:: @ 819D075
.string "I'm feeling lonesome because I\n"
.string "prefer {STR_VAR_1}.$"
gUnknown_819D0E3:: @ 819D0E3
SaffronCity_PokemonTrainerFanClub_Text_YouReallyAreAmazing:: @ 819D0E3
.string "Amazing!\n"
.string "{PLAYER}, you really are amazing!\p"
.string "Instead of just watching, maybe\n"
.string "I should become a TRAINER, too.$"
gUnknown_819D148:: @ 819D148
SaffronCity_PokemonTrainerFanClub_Text_ImYourOnlyFan:: @ 819D148
.string "I'm your only fan…\n"
.string "Sigh… This is lonely…\p"
.string "Can't you try harder and make the\n"
.string "others take notice of you?$"
gUnknown_819D1AE:: @ 819D1AE
SaffronCity_PokemonTrainerFanClub_Text_WhyCantOthersSeeMastersDignity:: @ 819D1AE
.string "Master {STR_VAR_1} is so dignified…\n"
.string "He is so my type.\p"
.string "Why can't the others see the\n"
.string "dignity he simply oozes?$"
gUnknown_819D211:: @ 819D211
SaffronCity_PokemonTrainerFanClub_Text_BelieveInMasterWithAllMyHeart:: @ 819D211
.string "I believe in Master {STR_VAR_1}\n"
.string "with all my heart.\p"
.string "Even if I am the only one to\n"
@@ -255,14 +255,14 @@ gUnknown_819D211:: @ 819D211
.string "Not if I keep thinking about Master\n"
.string "{STR_VAR_1}.$"
gUnknown_819D2B4:: @ 819D2B4
SaffronCity_PokemonTrainerFanClub_Text_YourBattleStyleIsEducational:: @ 819D2B4
.string "Hiyah!\p"
.string "Your battling style is most\n"
.string "educational.\p"
.string "I hope that you will keep plugging\n"
.string "away at success, hiyah!$"
gUnknown_819D31F:: @ 819D31F
SaffronCity_PokemonTrainerFanClub_Text_WontStopBeingYourFan:: @ 819D31F
.string "Instead of just watching others\n"
.string "battle, battle yourself!\p"
.string "…My DOJO's MASTER chewed me out\n"
@@ -271,7 +271,7 @@ gUnknown_819D31F:: @ 819D31F
.string "being your fan!\p"
.string "I can't stop being your fan!$"
gUnknown_819D3D2:: @ 819D3D2
SaffronCity_PokemonTrainerFanClub_Text_OnlyMasterHasMyRespect:: @ 819D3D2
.string "Hiyah! There is but one TRAINER\n"
.string "who has my respect.\p"
.string "And that is none other than my\n"
@@ -279,7 +279,7 @@ gUnknown_819D3D2:: @ 819D3D2
.string "You should become a fan of my\n"
.string "MASTER like me! Hiyah!$"
gUnknown_819D477:: @ 819D477
SaffronCity_PokemonTrainerFanClub_Text_NeverBeFanOfAnyoneButMaster:: @ 819D477
.string "Hiyah! I respect my MASTER at the\n"
.string "FIGHTING DOJO.\p"
.string "I will never become a fan of\n"
data/maps/map_groups.json
+4 -4
View File
@@ -409,15 +409,15 @@
"IndigoPlateau_PokemonCenter_2F"
],
"gMapGroup14": [
"SaffronCity_House1_1F",
"SaffronCity_House1_2F",
"SaffronCity_CopycatsHouse_1F",
"SaffronCity_CopycatsHouse_2F",
"SaffronCity_Dojo",
"SaffronCity_Gym",
"SaffronCity_House2",
"SaffronCity_House",
"SaffronCity_Mart",
"SaffronCity_PokemonCenter_1F",
"SaffronCity_PokemonCenter_2F",
"SaffronCity_House3",
"SaffronCity_MrPsychicsHouse",
"SaffronCity_PokemonTrainerFanClub"
],
"gMapGroup15": [
data/scripts/fame_checker.inc
+7 -7
View File
@@ -118,12 +118,12 @@ SafariZone_North_RestHouse_EventScript_BaldingMan:: @ 81ACED3
release
end
SaffronCity_PokemonCenter_1F_EventScript_1ACEEC:: @ 81ACEEC
SaffronCity_PokemonCenter_1F_EventScript_PokemonJournalSabrina:: @ 81ACEEC
lock
faceplayer
famechecker FAMECHECKER_SABRINA, 4
textcolor 3
msgbox gUnknown_81B1753
msgbox PokemonJournal_Text_SpecialFeatureSabrina
release
end
@@ -160,12 +160,12 @@ FiveIsland_PokemonCenter_1F_EventScript_1ACF5F:: @ 81ACF5F
release
end
SaffronCity_PokemonTrainerFanClub_EventScript_1ACF7A:: @ 81ACF7A
SaffronCity_PokemonTrainerFanClub_EventScript_PokemonJournalBruno:: @ 81ACF7A
lock
faceplayer
famechecker FAMECHECKER_BRUNO, 2
textcolor 3
msgbox gUnknown_81B1913
msgbox PokemonJournal_Text_SpecialFeatureBruno
release
end
@@ -215,15 +215,15 @@ EventScript_1AD021:: @ 81AD021
lock
faceplayer
famechecker FAMECHECKER_LANCE, 1
msgbox Text_181569
msgbox SaffronCity_Text_HowCanClubNotRecognizeLance
release
end
SaffronCity_EventScript_1AD03A:: @ 81AD03A
SaffronCity_EventScript_BattleGirl:: @ 81AD03A
lock
faceplayer
famechecker FAMECHECKER_LANCE, 2
msgbox Text_181569
msgbox SaffronCity_Text_HowCanClubNotRecognizeLance
release
end
data/text/fame_checker.inc
+2 -2
View File
@@ -1413,7 +1413,7 @@ PokemonJournal_Text_SpecialFeatureKoga:: @ 81B16A8
.string "He even concocts medicine to nurse\n"
.string "his POKéMON to health.$"
gUnknown_81B1753:: @ 81B1753
PokemonJournal_Text_SpecialFeatureSabrina:: @ 81B1753
.string "POKéMON JOURNAL\p"
.string "Special Feature: SAFFRON GYM\n"
.string "LEADER SABRINA!\p"
@@ -1437,7 +1437,7 @@ gUnknown_81B187F:: @ 81B187F
.string "and cool battling style, LORELEI\l"
.string "has a surprising secret!$"
gUnknown_81B1913:: @ 81B1913
PokemonJournal_Text_SpecialFeatureBruno:: @ 81B1913
.string "POKéMON JOURNAL\p"
.string "Special Feature:\n"
.string "ELITE FOUR's BRUNO!\p"
include/constants/flags.h
+1 -1
View File
@@ -1046,7 +1046,7 @@
#define HIDDEN_ITEM_SAFARI_ZONE_WEST_REVIVE 23
#define HIDDEN_ITEM_SILPH_CO_5F_ELIXIR 24
#define HIDDEN_ITEM_SILPH_CO_9F_MAX_POTION 25
#define HIDDEN_ITEM_SAFFRON_CITY_HOUSE1_2F_NUGGET 26
#define HIDDEN_ITEM_SAFFRON_CITY_COPYCATS_HOUSE_2F_NUGGET 26
#define HIDDEN_ITEM_POWER_PLANT_MAX_ELIXIR 27
#define HIDDEN_ITEM_POWER_PLANT_THUNDER_STONE 28
#define HIDDEN_ITEM_SEAFOAM_ISLANDS_B3F_NUGGET 29
include/constants/layouts.h
+2 -2
View File
@@ -208,8 +208,8 @@
#define LAYOUT_ROUTE16_NORTH_ENTRANCE_1F 223
#define LAYOUT_ENTRANCE_1F 224
#define LAYOUT_ROCKET_HIDEOUT_ELEVATOR 225
#define LAYOUT_SAFFRON_CITY_HOUSE1_1F 226
#define LAYOUT_SAFFRON_CITY_HOUSE1_2F 227
#define LAYOUT_SAFFRON_CITY_COPYCATS_HOUSE_1F 226
#define LAYOUT_SAFFRON_CITY_COPYCATS_HOUSE_2F 227
#define LAYOUT_SAFFRON_CITY_DOJO 228
#define LAYOUT_SILPH_CO_ELEVATOR 229
#define LAYOUT_ONE_ISLAND 230
include/constants/map_groups.h
+4 -4
View File
@@ -366,15 +366,15 @@
#define MAP_INDIGO_PLATEAU_POKEMON_CENTER_2F (1 | (13 << 8))
// Map Group 14
#define MAP_SAFFRON_CITY_HOUSE1_1F (0 | (14 << 8))
#define MAP_SAFFRON_CITY_HOUSE1_2F (1 | (14 << 8))
#define MAP_SAFFRON_CITY_COPYCATS_HOUSE_1F (0 | (14 << 8))
#define MAP_SAFFRON_CITY_COPYCATS_HOUSE_2F (1 | (14 << 8))
#define MAP_SAFFRON_CITY_DOJO (2 | (14 << 8))
#define MAP_SAFFRON_CITY_GYM (3 | (14 << 8))
#define MAP_SAFFRON_CITY_HOUSE2 (4 | (14 << 8))
#define MAP_SAFFRON_CITY_HOUSE (4 | (14 << 8))
#define MAP_SAFFRON_CITY_MART (5 | (14 << 8))
#define MAP_SAFFRON_CITY_POKEMON_CENTER_1F (6 | (14 << 8))
#define MAP_SAFFRON_CITY_POKEMON_CENTER_2F (7 | (14 << 8))
#define MAP_SAFFRON_CITY_HOUSE3 (8 | (14 << 8))
#define MAP_SAFFRON_CITY_MR_PSYCHICS_HOUSE (8 | (14 << 8))
#define MAP_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB (9 | (14 << 8))
// Map Group 15