dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Document kecleon

Browse Source
This commit is contained in:
GriffinR
2019-10-06 16:06:34 -04:00
parent 748a1dbdd4
commit 02070eaf73
6 changed files with 112 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
data/maps/FortreeCity/scripts.inc
View File

@@ -72,7 +72,7 @@ FortreeCity_EventScript_1E2630:: @ 81E2630
FortreeCity_EventScript_1E2645:: @ 81E2645
msgbox FortreeCity_Text_1E2A48, MSGBOX_DEFAULT
closemessage
applymovement VAR_LAST_TALKED, FortreeCity_Movement_2723C7
applymovement VAR_LAST_TALKED, Movement_KecleonAppears
waitmovement 0
waitse
playmoncry SPECIES_KECLEON, 2

4
data/maps/Route119/map.json
View File

@@ -477,7 +477,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route119_EventScript_27231C",
"script": "Route119_EventScript_Kecleon1",
"flag": "FLAG_HIDE_ROUTE_119_KECLEON_1"
},
{
@@ -490,7 +490,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route119_EventScript_272329",
"script": "Route119_EventScript_Kecleon2",
"flag": "FLAG_HIDE_ROUTE_119_KECLEON_2"
},
{

28
data/maps/Route120/map.json
View File

@@ -412,8 +412,8 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route120_EventScript_1F57BC",
"flag": "FLAG_HIDE_ROUTE_120_KECLEON_1"
"script": "Route120_EventScript_InvisibleBridgeKecleon",
"flag": "FLAG_HIDE_ROUTE_120_KECLEON_BRIDGE_INVISIBLE"
},
{
"graphics_id": "EVENT_OBJ_GFX_STEVEN",
@@ -425,7 +425,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route120_EventScript_1F5641",
"script": "Route120_EventScript_Steven",
"flag": "FLAG_HIDE_ROUTE_120_STEVEN"
},
{
@@ -491,7 +491,7 @@
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "0x0",
"flag": "FLAG_HIDE_ROUTE_120_KECLEON_BRIDGE"
"flag": "FLAG_HIDE_ROUTE_120_KECLEON_BRIDGE_VISIBLE"
},
{
"graphics_id": "EVENT_OBJ_GFX_KECLEON_1",
@@ -503,8 +503,8 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route120_EventScript_2722DB",
"flag": "FLAG_HIDE_ROUTE_120_KECLEON_2"
"script": "Route120_EventScript_Kecleon1",
"flag": "FLAG_HIDE_ROUTE_120_KECLEON_1"
},
{
"graphics_id": "EVENT_OBJ_GFX_KECLEON_1",
@@ -516,8 +516,8 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route120_EventScript_2722E8",
"flag": "FLAG_HIDE_ROUTE_120_KECLEON_3"
"script": "Route120_EventScript_Kecleon2",
"flag": "FLAG_HIDE_ROUTE_120_KECLEON_2"
},
{
"graphics_id": "EVENT_OBJ_GFX_KECLEON_1",
@@ -529,8 +529,8 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route120_EventScript_2722F5",
"flag": "FLAG_HIDE_ROUTE_120_KECLEON_4"
"script": "Route120_EventScript_Kecleon3",
"flag": "FLAG_HIDE_ROUTE_120_KECLEON_3"
},
{
"graphics_id": "EVENT_OBJ_GFX_KECLEON_1",
@@ -542,8 +542,8 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route120_EventScript_27230F",
"flag": "FLAG_HIDE_ROUTE_120_KECLEON_6"
"script": "Route120_EventScript_Kecleon5",
"flag": "FLAG_HIDE_ROUTE_120_KECLEON_5"
},
{
"graphics_id": "EVENT_OBJ_GFX_KECLEON_1",
@@ -555,8 +555,8 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route120_EventScript_272302",
"flag": "FLAG_HIDE_ROUTE_120_KECLEON_5"
"script": "Route120_EventScript_Kecleon4",
"flag": "FLAG_HIDE_ROUTE_120_KECLEON_4"
},
{
"graphics_id": "EVENT_OBJ_GFX_GIRL_3",

123
data/maps/Route120/scripts.inc
View File

@@ -1,39 +1,39 @@
Route120_MapScripts:: @ 81F53EC
map_script MAP_SCRIPT_ON_RESUME, Route120_MapScript1_1F53FC
map_script MAP_SCRIPT_ON_RESUME, Route120_MapScript1_OnResume
map_script MAP_SCRIPT_ON_TRANSITION, Route120_OnTransition
map_script MAP_SCRIPT_ON_LOAD, Route120_MapScript1_1F5474
.byte 0
Route120_MapScript1_1F53FC: @ 81F53FC
call_if_set FLAG_SYS_CTRL_OBJ_DELETE, Route120_EventScript_1F5406
Route120_MapScript1_OnResume: @ 81F53FC
call_if_set FLAG_SYS_CTRL_OBJ_DELETE, Route120_EventScript_RemoveKecleonObject
end
Route120_EventScript_1F5406:: @ 81F5406
Route120_EventScript_RemoveKecleonObject:: @ 81F5406
compare VAR_0x8009, 0
call_if_eq Route120_EventScript_1F5449
call_if_eq Route120_EventScript_RemoveBridgeKecleon
compare VAR_0x8009, 1
call_if_eq Route120_EventScript_1F5460
call_if_eq Route120_EventScript_RemoveKecleon
compare VAR_0x8009, 2
call_if_eq Route120_EventScript_1F5460
call_if_eq Route120_EventScript_RemoveKecleon
compare VAR_0x8009, 3
call_if_eq Route120_EventScript_1F5460
call_if_eq Route120_EventScript_RemoveKecleon
compare VAR_0x8009, 4
call_if_eq Route120_EventScript_1F5460
call_if_eq Route120_EventScript_RemoveKecleon
compare VAR_0x8009, 5
call_if_eq Route120_EventScript_1F5460
call_if_eq Route120_EventScript_RemoveKecleon
return
Route120_EventScript_1F5449:: @ 81F5449
Route120_EventScript_RemoveBridgeKecleon:: @ 81F5449
specialvar VAR_RESULT, GetBattleOutcome
compare VAR_RESULT, 7
compare VAR_RESULT, B_OUTCOME_CAUGHT
goto_if_ne Common_EventScript_NopReturn
removeobject 30
removeobject 36
removeobject 30 @ Invisible Bridge Kecleon
removeobject 36 @ Visible Bridge Kecleon
return
Route120_EventScript_1F5460:: @ 81F5460
Route120_EventScript_RemoveKecleon:: @ 81F5460
specialvar VAR_RESULT, GetBattleOutcome
compare VAR_RESULT, 7
compare VAR_RESULT, B_OUTCOME_CAUGHT
goto_if_ne Common_EventScript_NopReturn
removeobject VAR_LAST_TALKED
return
@@ -166,44 +166,44 @@ Route120_EventScript_1F5638:: @ 81F5638
msgbox Route120_Text_2A7183, MSGBOX_DEFAULT
return
Route120_EventScript_1F5641:: @ 81F5641
Route120_EventScript_Steven:: @ 81F5641
lock
faceplayer
goto_if_set FLAG_NOT_READY_FOR_BATTLE_ROUTE_120, Route120_EventScript_1F5672
msgbox Route120_Text_1F5998, MSGBOX_YESNO
msgbox Route120_Text_StevenGreeting, MSGBOX_YESNO
compare VAR_RESULT, 0
goto_if_eq Route120_EventScript_1F5665
goto Route120_EventScript_1F568B
goto_if_eq Route120_EventScript_StevenNotReady
goto Route120_EventScript_StevenBattleKecleon
end
Route120_EventScript_1F5665:: @ 81F5665
Route120_EventScript_StevenNotReady:: @ 81F5665
msgbox Route120_Text_1F5AAC, MSGBOX_DEFAULT
setflag FLAG_NOT_READY_FOR_BATTLE_ROUTE_120
release
end
Route120_EventScript_1F5672:: @ 81F5672
msgbox Route120_Text_1F5ADE, MSGBOX_YESNO
msgbox Route120_Text_StevenReadyForBattle, MSGBOX_YESNO
compare VAR_RESULT, 0
goto_if_eq Route120_EventScript_1F5665
goto Route120_EventScript_1F568B
goto_if_eq Route120_EventScript_StevenNotReady
goto Route120_EventScript_StevenBattleKecleon
end
Route120_EventScript_1F568B:: @ 81F568B
msgbox Route120_Text_1F5B0F, MSGBOX_DEFAULT
Route120_EventScript_StevenBattleKecleon:: @ 81F568B
msgbox Route120_Text_StevenShowMeYourPower, MSGBOX_DEFAULT
closemessage
compare VAR_FACING, 2
call_if_eq Route120_EventScript_1F57A3
compare VAR_FACING, 3
call_if_eq Route120_EventScript_1F57AE
compare VAR_FACING, DIR_NORTH
call_if_eq Route120_EventScript_PlayerApproachKecleonNorth
compare VAR_FACING, DIR_WEST
call_if_eq Route120_EventScript_PlayerApproachKecleonWest
applymovement 31, Common_Movement_WalkInPlaceFastestLeft
waitmovement 0
delay 20
msgbox Route120_Text_1F5B43, MSGBOX_DEFAULT
msgbox Route120_Text_StevenUsedDevonScope, MSGBOX_DEFAULT
closemessage
applymovement 30, Common_Movement_WalkInPlaceFastestRight
waitmovement 0
applymovement 30, Route120_Movement_2723C7
applymovement 30, Movement_KecleonAppears
waitmovement 0
waitse
playmoncry SPECIES_KECLEON, 2
@@ -215,31 +215,31 @@ Route120_EventScript_1F568B:: @ 81F568B
dowildbattle
clearflag FLAG_SYS_CTRL_OBJ_DELETE
specialvar VAR_RESULT, GetBattleOutcome
compare VAR_RESULT, 1
goto_if_eq Route120_EventScript_1F571C
compare VAR_RESULT, 4
goto_if_eq Route120_EventScript_1F571C
compare VAR_RESULT, 5
goto_if_eq Route120_EventScript_1F571C
goto Route120_EventScript_1F572C
compare VAR_RESULT, B_OUTCOME_WON
goto_if_eq Route120_EventScript_RemoveBridgeKecleonPostBattle
compare VAR_RESULT, B_OUTCOME_RAN
goto_if_eq Route120_EventScript_RemoveBridgeKecleonPostBattle
compare VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED
goto_if_eq Route120_EventScript_RemoveBridgeKecleonPostBattle
goto Route120_EventScript_StevenGiveDeconScope
end
Route120_EventScript_1F571C:: @ 81F571C
Route120_EventScript_RemoveBridgeKecleonPostBattle:: @ 81F571C
fadescreenswapbuffers 1
removeobject 30
removeobject 36
removeobject 30 @ Invisible Bridge Kecleon
removeobject 36 @ Visible Bridge Kecleon
fadescreenswapbuffers 0
goto Route120_EventScript_1F572C
goto Route120_EventScript_StevenGiveDeconScope
end
Route120_EventScript_1F572C:: @ 81F572C
Route120_EventScript_StevenGiveDeconScope:: @ 81F572C
applymovement 31, Common_Movement_WalkInPlaceFastestDown
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp
waitmovement 0
msgbox Route120_Text_1F5BAF, MSGBOX_DEFAULT
msgbox Route120_Text_StevenGiveDevonScope, MSGBOX_DEFAULT
giveitem_std ITEM_DEVON_SCOPE
setflag FLAG_RECEIVED_DEVON_SCOPE
msgbox Route120_Text_1F5C7B, MSGBOX_DEFAULT
msgbox Route120_Text_StevenGoodbye, MSGBOX_DEFAULT
closemessage
applymovement 31, Common_Movement_WalkInPlaceFastestDown
waitmovement 0
@@ -257,23 +257,23 @@ Route120_EventScript_1F572C:: @ 81F572C
release
end
Route120_EventScript_1F57A3:: @ 81F57A3
Route120_EventScript_PlayerApproachKecleonNorth:: @ 81F57A3
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft
waitmovement 0
return
Route120_EventScript_1F57AE:: @ 81F57AE
applymovement EVENT_OBJ_ID_PLAYER, Route120_Movement_1F57B9
Route120_EventScript_PlayerApproachKecleonWest:: @ 81F57AE
applymovement EVENT_OBJ_ID_PLAYER, Route120_Movement_ApproachKecleonWest
waitmovement 0
return
Route120_Movement_1F57B9: @ 81F57B9
Route120_Movement_ApproachKecleonWest: @ 81F57B9
walk_down
walk_left
step_end
Route120_EventScript_1F57BC:: @ 81F57BC
msgbox Route120_Text_1F5D00, MSGBOX_NPC
Route120_EventScript_InvisibleBridgeKecleon:: @ 81F57BC
msgbox Kecleon_Text_SomethingUnseeable, MSGBOX_NPC
end
Route120_EventScript_1F57C5:: @ 81F57C5
@@ -383,7 +383,7 @@ Route120_EventScript_1F5981:: @ 81F5981
msgbox Route120_Text_29F002, MSGBOX_AUTOCLOSE
end
Route120_Text_1F5998: @ 81F5998
Route120_Text_StevenGreeting: @ 81F5998
.string "STEVEN: Hm? {PLAYER}{KUN}, hi.\n"
.string "It's been a while.\p"
.string "There's something here that you can't\n"
@@ -400,21 +400,21 @@ Route120_Text_1F5AAC: @ 81F5AAC
.string "STEVEN: No?\p"
.string "I'll wait here, so you can get ready.$"
Route120_Text_1F5ADE: @ 81F5ADE
Route120_Text_StevenReadyForBattle: @ 81F5ADE
.string "STEVEN: {PLAYER}{KUN}, are your POKéMON\n"
.string "ready for battle?$"
Route120_Text_1F5B0F: @ 81F5B0F
Route120_Text_StevenShowMeYourPower: @ 81F5B0F
.string "STEVEN: {PLAYER}{KUN}, show me your true\n"
.string "power as a TRAINER!$"
Route120_Text_1F5B43: @ 81F5B43
Route120_Text_StevenUsedDevonScope: @ 81F5B43
.string "STEVEN used the DEVON SCOPE.\p"
.string "An invisible POKéMON became completely\n"
.string "visible!\p"
.string "The startled POKéMON attacked!$"
Route120_Text_1F5BAF: @ 81F5BAF
Route120_Text_StevenGiveDevonScope: @ 81F5BAF
.string "STEVEN: I see…\n"
.string "Your battle style is intriguing.\p"
.string "Your POKéMON have obviously grown\n"
@@ -424,22 +424,21 @@ Route120_Text_1F5BAF: @ 81F5BAF
.string "Who knows, there may be other\n"
.string "concealed POKéMON.$"
Route120_Text_1F5C7B: @ 81F5C7B
Route120_Text_StevenGoodbye: @ 81F5C7B
.string "STEVEN: {PLAYER}{KUN}.\p"
.string "I enjoy seeing POKéMON and TRAINERS\n"
.string "who strive together.\p"
.string "I think you're doing great.\p"
.string "Well, let's meet again somewhere.$"
Route119_Text_1F5D00: @ 81F5D00
Route120_Text_1F5D00: @ 81F5D00
Kecleon_Text_SomethingUnseeable: @ 81F5D00
.string "Something unseeable is in the way.$"
Route119_Text_1F5D23: @ 81F5D23
Kecleon_Text_WantToUseDevonScope: @ 81F5D23
.string "Something unseeable is in the way.\p"
.string "Want to use the DEVON SCOPE?$"
Route119_Text_1F5D63: @ 81F5D63
Kecleon_Text_UseDevonScopeMonAttacked: @ 81F5D63
.string "{PLAYER} used the DEVON SCOPE.\p"
.string "An invisible POKéMON became completely\n"
.string "visible!\p"

57
data/scripts/kecleon.inc
View File

@@ -1,74 +1,73 @@
Route120_EventScript_2722DB:: @ 82722DB
Route120_EventScript_Kecleon1:: @ 82722DB
lock
faceplayer
setvar VAR_0x8009, 1
goto Route120_EventScript_272336
goto EventScript_Kecleon
end
Route120_EventScript_2722E8:: @ 82722E8
Route120_EventScript_Kecleon2:: @ 82722E8
lock
faceplayer
setvar VAR_0x8009, 2
goto Route120_EventScript_272336
goto EventScript_Kecleon
end
Route120_EventScript_2722F5:: @ 82722F5
Route120_EventScript_Kecleon3:: @ 82722F5
lock
faceplayer
setvar VAR_0x8009, 3
goto Route120_EventScript_272336
goto EventScript_Kecleon
end
Route120_EventScript_272302:: @ 8272302
Route120_EventScript_Kecleon4:: @ 8272302
lock
faceplayer
setvar VAR_0x8009, 4
goto Route120_EventScript_272336
goto EventScript_Kecleon
end
Route120_EventScript_27230F:: @ 827230F
Route120_EventScript_Kecleon5:: @ 827230F
lock
faceplayer
setvar VAR_0x8009, 5
goto Route120_EventScript_272336
goto EventScript_Kecleon
end
Route119_EventScript_27231C:: @ 827231C
Route119_EventScript_Kecleon1:: @ 827231C
lock
faceplayer
setvar VAR_0x8009, 6
goto Route119_EventScript_272336
goto EventScript_Kecleon
end
Route119_EventScript_272329:: @ 8272329
Route119_EventScript_Kecleon2:: @ 8272329
lock
faceplayer
setvar VAR_0x8009, 7
goto Route119_EventScript_272336
goto EventScript_Kecleon
end
Route119_EventScript_272336:: @ 8272336
Route120_EventScript_272336:: @ 8272336
EventScript_Kecleon:: @ 8272336
checkitem ITEM_DEVON_SCOPE, 1
compare VAR_RESULT, 1
goto_if_eq Route119_EventScript_272350
msgbox Route119_Text_1F5D00, MSGBOX_DEFAULT
goto_if_eq EventScript_AskUseDevonScope
msgbox Kecleon_Text_SomethingUnseeable, MSGBOX_DEFAULT
release
end
Route119_EventScript_272350:: @ 8272350
msgbox Route119_Text_1F5D23, MSGBOX_YESNO
EventScript_AskUseDevonScope:: @ 8272350
msgbox Kecleon_Text_WantToUseDevonScope, MSGBOX_YESNO
compare VAR_RESULT, 1
goto_if_eq Route119_EventScript_272365
goto_if_eq EventScript_BattleKecleon
release
end
Route119_EventScript_272365:: @ 8272365
msgbox Route119_Text_1F5D63, MSGBOX_DEFAULT
EventScript_BattleKecleon:: @ 8272365
msgbox Kecleon_Text_UseDevonScopeMonAttacked, MSGBOX_DEFAULT
closemessage
applymovement VAR_LAST_TALKED, Common_Movement_FacePlayer
waitmovement 0
applymovement VAR_LAST_TALKED, Route119_Movement_2723C7
applymovement VAR_LAST_TALKED, Movement_KecleonAppears
waitmovement 0
waitse
playmoncry SPECIES_KECLEON, 2
@@ -79,11 +78,11 @@ Route119_EventScript_272365:: @ 8272365
dowildbattle
clearflag FLAG_SYS_CTRL_OBJ_DELETE
specialvar VAR_RESULT, GetBattleOutcome
compare VAR_RESULT, 1
compare VAR_RESULT, B_OUTCOME_WON
goto_if_eq EventScript_RemoveKecleon
compare VAR_RESULT, 4
compare VAR_RESULT, B_OUTCOME_RAN
goto_if_eq EventScript_RemoveKecleon
compare VAR_RESULT, 5
compare VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED
goto_if_eq EventScript_RemoveKecleon
release
end
@@ -92,9 +91,7 @@ EventScript_RemoveKecleon:: @ 82723C1
goto Common_EventScript_RemoveStaticPokemon
end
FortreeCity_Movement_2723C7: @ 82723C7
Route119_Movement_2723C7: @ 82723C7
Route120_Movement_2723C7: @ 82723C7
Movement_KecleonAppears: @ 82723C7
set_visible
delay_4
set_invisible

14
include/constants/flags.h
View File

@@ -925,7 +925,7 @@
#define FLAG_HIDE_MOSSDEEP_CITY_STEVENS_HOUSE_STEVEN 0x3C7
#define FLAG_HIDE_MOSSDEEP_CITY_STEVENS_HOUSE_BELDUM_POKEBALL 0x3C8
#define FLAG_HIDE_FORTREE_CITY_KECLEON 0x3C9
#define FLAG_HIDE_ROUTE_120_KECLEON_1 0x3CA
#define FLAG_HIDE_ROUTE_120_KECLEON_BRIDGE_INVISIBLE 0x3CA
#define FLAG_HIDE_LILYCOVE_CITY_RIVAL 0x3CB
#define FLAG_HIDE_ROUTE_120_STEVEN 0x3CC
#define FLAG_HIDE_SOOTOPOLIS_CITY_STEVEN 0x3CD
@@ -936,14 +936,14 @@
#define FLAG_HIDE_AQUA_HIDEOUT_B1F_ELECTRODE_2 0x3D2
#define FLAG_HIDE_OLDALE_TOWN_RIVAL 0x3D3
#define FLAG_HIDE_UNDERWATER_SEA_FLOOR_CAVERN_STOLEN_SUBMARINE 0x3D4
#define FLAG_HIDE_ROUTE_120_KECLEON_BRIDGE 0x3D5
#define FLAG_HIDE_ROUTE_120_KECLEON_2 0x3D6
#define FLAG_HIDE_ROUTE_120_KECLEON_BRIDGE_VISIBLE 0x3D5
#define FLAG_HIDE_ROUTE_120_KECLEON_1 0x3D6
#define FLAG_HIDE_RUSTURF_TUNNEL_LOVER_WOMAN 0x3D7
#define FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_LOVER_WOMAN 0x3D8
#define FLAG_HIDE_ROUTE_120_KECLEON_3 0x3D9
#define FLAG_HIDE_ROUTE_120_KECLEON_4 0x3DA
#define FLAG_HIDE_ROUTE_120_KECLEON_5 0x3DB
#define FLAG_HIDE_ROUTE_120_KECLEON_6 0x3DC
#define FLAG_HIDE_ROUTE_120_KECLEON_2 0x3D9
#define FLAG_HIDE_ROUTE_120_KECLEON_3 0x3DA
#define FLAG_HIDE_ROUTE_120_KECLEON_4 0x3DB
#define FLAG_HIDE_ROUTE_120_KECLEON_5 0x3DC
#define FLAG_HIDE_ROUTE_119_KECLEON_1 0x3DD
#define FLAG_HIDE_ROUTE_119_KECLEON_2 0x3DE
#define FLAG_HIDE_ROUTE_101_BOY 0x3DF