Leahnaya/pokeplatinum
1
0
Fork 0
mirror of https://github.com/pret/pokeplatinum.git synced 2026-09-30 05:18:36 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Document common scripts (#1154)
Some checks are pending
build / build (push) Waiting to run
Details

Browse Source
This commit is contained in:
Viperio
2026-05-17 20:30:24 +02:00
committed by GitHub
parent 0c4eff290b
commit 6e9358e98c
50 changed files with 839 additions and 819 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
asm/macros/scrcmd.inc
View File

@@ -1130,8 +1130,8 @@
.short SCRCMD_CLEARGAME
.endm
.macro ScrCmd_0B1
.short SCRCMD_0B1
.macro OpenPCHallOfFameScreen
.short SCRCMD_OPENPCHALLOFFAMESCREEN
.endm
.macro TryStartGTSApp connectToWiFi, destVar
@@ -1797,8 +1797,8 @@
.short SCRCMD_STARTHONEYTREEBATTLE
.endm
.macro ScrCmd_12A
.short SCRCMD_12A
.macro StopHoneyTreeShaking
.short SCRCMD_STOPHONEYTREESHAKING
.endm
.macro StartSignatureApp
@@ -4103,9 +4103,9 @@
.short \customMessageWord4
.endm
.macro ScrCmd_2AB arg0
.short SCRCMD_2AB
.short \arg0
.macro CountUniqueSealsInSealCase destVar
.short SCRCMD_COUNTUNIQUESEALSINSEALCASE
.short \destVar
.endm
.macro UnlockMysteryGift
@@ -4643,8 +4643,8 @@
.short \scoreID
.endm
.macro ScrCmd_30B
.short SCRCMD_30B
.macro SaveTVSegmentPokemonStorageBulletin
.short SCRCMD_SAVETVSEGMENTPOKEMONSTORAGEBULLETIN
.endm
.macro SaveTVSegmentHomeAndManorNoFurniture
@@ -4876,9 +4876,9 @@
.long \value
.endm
.macro ScrCmd_336 arg0
.short SCRCMD_336
.short \arg0
.macro CheckIsHallOfFameCorrupted destVar
.short SCRCMD_CHECKISHALLOFFAMECORRUPTED
.short \destVar
.endm
.macro CheckHasSeenSpecies species, ret

2
generated/game_records.txt
View File

@@ -115,7 +115,7 @@ RECORD_UNK_113
RECORD_TIMES_SIGNED_TRAINER_CARD
RECORD_POKEMON_RECEIVED_FROM_FOSSIL_REVIVAL
RECORD_CHECKED_FOOTPRINTS
RECORD_UNK_117
RECORD_HONEY_TREE_POKEMON_ENCOUNTERED
RECORD_UNK_118
RECORD_UNK_119
RECORD_UNK_120

10
include/data/scripts/scrcmd.h
View File

@@ -182,7 +182,7 @@ ScriptCommand(SCRCMD_OPENUNIONROOMTRAINERCASE, ScrCm
ScriptCommand(SCRCMD_0AE, ScrCmd_0AE)
ScriptCommand(SCRCMD_0AF, ScrCmd_0AF)
ScriptCommand(SCRCMD_CLEARGAME, ScrCmd_ClearGame)
ScriptCommand(SCRCMD_0B1, ScrCmd_0B1)
ScriptCommand(SCRCMD_OPENPCHALLOFFAMESCREEN, ScrCmd_OpenPCHallOfFameScreen)
ScriptCommand(SCRCMD_TRYSTARTGTSAPP, ScrCmd_TryStartGTSApp)
ScriptCommand(SCRCMD_0B3, ScrCmd_0B3)
ScriptCommand(SCRCMD_STARTCHOOSESTARTERSCENE, ScrCmd_StartChooseStarterScene)
@@ -303,7 +303,7 @@ ScriptCommand(SCRCMD_STARTCATCHINGTUTORIAL, ScrCm
ScriptCommand(SCRCMD_SLATHERHONEYTREE, ScrCmd_SlatherHoneyTree)
ScriptCommand(SCRCMD_GETHONEYTREESTATUS, ScrCmd_GetHoneyTreeStatus)
ScriptCommand(SCRCMD_STARTHONEYTREEBATTLE, ScrCmd_StartHoneyTreeBattle)
ScriptCommand(SCRCMD_12A, ScrCmd_12A)
ScriptCommand(SCRCMD_STOPHONEYTREESHAKING, ScrCmd_StopHoneyTreeShaking)
ScriptCommand(SCRCMD_STARTSIGNATUREAPP, ScrCmd_StartSignatureApp)
ScriptCommand(SCRCMD_CHECKSAVETYPE, ScrCmd_CheckSaveType)
ScriptCommand(SCRCMD_TRYSAVEGAME, ScrCmd_TrySaveGame)
@@ -688,7 +688,7 @@ ScriptCommand(SCRCMD_CHECKITEMISPLATE, ScrCm
ScriptCommand(SCRCMD_SUBTRACTCOINSFROMVAR, ScrCmd_SubtractCoinsFromVar)
ScriptCommand(SCRCMD_HASCOINSFROMVAR, ScrCmd_HasCoinsFromVar)
ScriptCommand(SCRCMD_CHECKISMYSTERYGIFTPHRASE, ScrCmd_CheckIsMysteryGiftPhrase)
ScriptCommand(SCRCMD_2AB, ScrCmd_2AB)
ScriptCommand(SCRCMD_COUNTUNIQUESEALSINSEALCASE, ScrCmd_CountUniqueSealsInSealCase)
ScriptCommand(SCRCMD_UNLOCKMYSTERYGIFT, ScrCmd_UnlockMysteryGift)
ScriptCommand(SCRCMD_GETMOVEMENTTYPE, ScrCmd_GetMovementType)
ScriptCommand(SCRCMD_ISSEQUENCEPLAYING, ScrCmd_IsSequencePlaying)
@@ -784,7 +784,7 @@ ScriptCommand(SCRCMD_GETEMPTYPOFFINCASESLOTCOUNT, ScrCm
ScriptCommand(SCRCMD_ADDCAMERAOVERRIDEOBJECT, ScrCmd_AddCameraOverrideObject)
ScriptCommand(SCRCMD_REMOVECAMERAOVERRIDEOBJECT, ScrCmd_RemoveCameraOverrideObject)
ScriptCommand(SCRCMD_INCREMENTTRAINERSCORE, ScrCmd_IncrementTrainerScore)
ScriptCommand(SCRCMD_30B, ScrCmd_30B)
ScriptCommand(SCRCMD_SAVETVSEGMENTPOKEMONSTORAGEBULLETIN, ScrCmd_SaveTVSegmentPokemonStorageBulletin)
ScriptCommand(SCRCMD_SAVETVSEGMENTHOMEANDMANORNOFURNITURE, ScrCmd_SaveTVSegmentHomeAndManorNoFurniture)
ScriptCommand(SCRCMD_SAVETVSEGMENTHOMEANDMANOR, ScrCmd_SaveTVSegmentHomeAndManor)
ScriptCommand(SCRCMD_30E, ScrCmd_30E)
@@ -827,7 +827,7 @@ ScriptCommand(SCRCMD_332, ScrCm
ScriptCommand(SCRCMD_SETPLAYERVOLUME, ScrCmd_SetPlayerVolume)
ScriptCommand(SCRCMD_ADDTOGAMERECORD, ScrCmd_AddToGameRecord)
ScriptCommand(SCRCMD_ADDTOGAMERECORDBIGVALUE, ScrCmd_AddToGameRecordBigValue)
ScriptCommand(SCRCMD_336, ScrCmd_336)
ScriptCommand(SCRCMD_CHECKISHALLOFFAMECORRUPTED, ScrCmd_CheckIsHallOfFameCorrupted)
ScriptCommand(SCRCMD_CHECKHASSEENSPECIES, ScrCmd_CheckHasSeenSpecies)
ScriptCommand(SCRCMD_338, ScrCmd_338)
ScriptCommand(SCRCMD_339, ScrCmd_339)

2
include/scrcmd_tv_broadcast.h
View File

@@ -6,7 +6,7 @@
BOOL ScrCmd_CallTVBroadcast(ScriptContext *param0);
BOOL ScrCmd_236(ScriptContext *param0);
BOOL ScrCmd_2B8(ScriptContext *param0);
BOOL ScrCmd_30B(ScriptContext *param0);
BOOL ScrCmd_SaveTVSegmentPokemonStorageBulletin(ScriptContext *ctx);
BOOL ScrCmd_SaveTVSegmentHomeAndManorNoFurniture(ScriptContext *ctx);
BOOL ScrCmd_SaveTVSegmentHomeAndManor(ScriptContext *ctx);
BOOL ScrCmd_CallTVInterview(ScriptContext *ctx);

14
res/field/events/events_canalave_city_pokecenter_1f.json
View File

@@ -2,7 +2,7 @@
"bg_events": [],
"object_events": [
{
"id": "LOCALID_LASS",
"id": "LOCALID_CANALAVE_LASS",
"graphics_id": "OBJ_EVENT_GFX_LASS",
"movement_type": "MOVEMENT_TYPE_WANDER_NORTH_AND_SOUTH",
"trainer_type": "TRAINER_TYPE_NONE",
@@ -17,7 +17,7 @@
"y": 0
},
{
"id": "LOCALID_POKECENTER_NURSE",
"id": "LOCALID_CANALAVE_NURSE",
"graphics_id": "OBJ_EVENT_GFX_POKECENTER_NURSE",
"movement_type": "MOVEMENT_TYPE_NONE",
"trainer_type": "TRAINER_TYPE_NONE",
@@ -32,7 +32,7 @@
"y": 0
},
{
"id": "LOCALID_POKEMON_BREEDER_F",
"id": "LOCALID_CANALAVE_POKEMON_BREEDER_F",
"graphics_id": "OBJ_EVENT_GFX_POKEMON_BREEDER_F",
"movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
"trainer_type": "TRAINER_TYPE_NONE",
@@ -47,7 +47,7 @@
"y": 0
},
{
"id": "LOCALID_DAILY_TRAINER_1",
"id": "LOCALID_CANALAVE_DAILY_TRAINER_1",
"graphics_id": "OBJ_EVENT_GFX_VAR_A",
"movement_type": "MOVEMENT_TYPE_NONE",
"trainer_type": "TRAINER_TYPE_NONE",
@@ -62,7 +62,7 @@
"y": 0
},
{
"id": "LOCALID_DAILY_TRAINER_2",
"id": "LOCALID_CANALAVE_DAILY_TRAINER_2",
"graphics_id": "OBJ_EVENT_GFX_VAR_B",
"movement_type": "MOVEMENT_TYPE_NONE",
"trainer_type": "TRAINER_TYPE_NONE",
@@ -77,7 +77,7 @@
"y": 0
},
{
"id": "LOCALID_BUG_CATCHER",
"id": "LOCALID_CANALAVE_BUG_CATCHER",
"graphics_id": "OBJ_EVENT_GFX_BUG_CATCHER",
"movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
"trainer_type": "TRAINER_TYPE_NONE",
@@ -92,7 +92,7 @@
"y": 0
},
{
"id": "LOCALID_SCIENTIST_M",
"id": "LOCALID_CANALAVE_SCIENTIST_M",
"graphics_id": "OBJ_EVENT_GFX_SCIENTIST_M",
"movement_type": "MOVEMENT_TYPE_NONE",
"trainer_type": "TRAINER_TYPE_NONE",

12
res/field/events/events_celestic_town_pokecenter_1f.json
View File

@@ -2,7 +2,7 @@
"bg_events": [],
"object_events": [
{
"id": "LOCALID_POKECENTER_NURSE",
"id": "LOCALID_CELESTIC_NURSE",
"graphics_id": "OBJ_EVENT_GFX_POKECENTER_NURSE",
"movement_type": "MOVEMENT_TYPE_NONE",
"trainer_type": "TRAINER_TYPE_NONE",
@@ -17,7 +17,7 @@
"y": 0
},
{
"id": "LOCALID_EXPERT_F",
"id": "LOCALID_CELESTIC_EXPERT_F",
"graphics_id": "OBJ_EVENT_GFX_EXPERT_F",
"movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
"trainer_type": "TRAINER_TYPE_NONE",
@@ -32,7 +32,7 @@
"y": 0
},
{
"id": "LOCALID_TWIN",
"id": "LOCALID_CELESTIC_TWIN",
"graphics_id": "OBJ_EVENT_GFX_TWIN",
"movement_type": "MOVEMENT_TYPE_WANDER_NORTH_AND_SOUTH",
"trainer_type": "TRAINER_TYPE_NONE",
@@ -47,7 +47,7 @@
"y": 0
},
{
"id": "LOCALID_POKEFAN_M",
"id": "LOCALID_CELESTIC_POKEFAN_M",
"graphics_id": "OBJ_EVENT_GFX_POKEFAN_M",
"movement_type": "MOVEMENT_TYPE_NONE",
"trainer_type": "TRAINER_TYPE_NONE",
@@ -62,7 +62,7 @@
"y": 0
},
{
"id": "LOCALID_DAILY_TRAINER_1",
"id": "LOCALID_CELESTIC_DAILY_TRAINER_1",
"graphics_id": "OBJ_EVENT_GFX_VAR_A",
"movement_type": "MOVEMENT_TYPE_NONE",
"trainer_type": "TRAINER_TYPE_NONE",
@@ -77,7 +77,7 @@
"y": 0
},
{
"id": "LOCALID_DAILY_TRAINER_2",
"id": "LOCALID_CELESTIC_DAILY_TRAINER_2",
"graphics_id": "OBJ_EVENT_GFX_VAR_B",
"movement_type": "MOVEMENT_TYPE_NONE",
"trainer_type": "TRAINER_TYPE_NONE",

14
res/field/events/events_eterna_city_pokecenter_1f.json
View File

@@ -2,7 +2,7 @@
"bg_events": [],
"object_events": [
{
"id": "LOCALID_SCHOOL_KID_M",
"id": "LOCALID_ETERNA_SCHOOL_KID_M",
"graphics_id": "OBJ_EVENT_GFX_SCHOOL_KID_M",
"movement_type": "MOVEMENT_TYPE_WANDER_WEST_AND_EAST",
"trainer_type": "TRAINER_TYPE_NONE",
@@ -17,7 +17,7 @@
"y": 0
},
{
"id": "LOCALID_BATTLE_GIRL",
"id": "LOCALID_ETERNA_BATTLE_GIRL",
"graphics_id": "OBJ_EVENT_GFX_BATTLE_GIRL",
"movement_type": "MOVEMENT_TYPE_WANDER_NORTH_AND_SOUTH",
"trainer_type": "TRAINER_TYPE_NONE",
@@ -32,7 +32,7 @@
"y": 0
},
{
"id": "LOCALID_BUNEARY",
"id": "LOCALID_ETERNA_BUNEARY",
"graphics_id": "OBJ_EVENT_GFX_BUNEARY",
"movement_type": "MOVEMENT_TYPE_LOOK_SOUTH",
"trainer_type": "TRAINER_TYPE_NONE",
@@ -47,7 +47,7 @@
"y": 0
},
{
"id": "LOCALID_POKECENTER_NURSE",
"id": "LOCALID_ETERNA_NURSE",
"graphics_id": "OBJ_EVENT_GFX_POKECENTER_NURSE",
"movement_type": "MOVEMENT_TYPE_NONE",
"trainer_type": "TRAINER_TYPE_NONE",
@@ -62,7 +62,7 @@
"y": 0
},
{
"id": "LOCALID_POKEMON_BREEDER_F",
"id": "LOCALID_ETERNA_POKEMON_BREEDER_F",
"graphics_id": "OBJ_EVENT_GFX_POKEMON_BREEDER_F",
"movement_type": "MOVEMENT_TYPE_NONE",
"trainer_type": "TRAINER_TYPE_NONE",
@@ -77,7 +77,7 @@
"y": 0
},
{
"id": "LOCALID_DAILY_TRAINER_1",
"id": "LOCALID_ETERNA_DAILY_TRAINER_1",
"graphics_id": "OBJ_EVENT_GFX_VAR_A",
"movement_type": "MOVEMENT_TYPE_NONE",
"trainer_type": "TRAINER_TYPE_NONE",
@@ -92,7 +92,7 @@
"y": 0
},
{
"id": "LOCALID_DAILY_TRAINER_2",
"id": "LOCALID_ETERNA_DAILY_TRAINER_2",
"graphics_id": "OBJ_EVENT_GFX_VAR_B",
"movement_type": "MOVEMENT_TYPE_NONE",
"trainer_type": "TRAINER_TYPE_NONE",

12
res/field/events/events_fight_area_pokecenter_1f.json
View File

@@ -2,7 +2,7 @@
"bg_events": [],
"object_events": [
{
"id": "LOCALID_POKECENTER_NURSE",
"id": "LOCALID_FIGHT_AREA_NURSE",
"graphics_id": "OBJ_EVENT_GFX_POKECENTER_NURSE",
"movement_type": "MOVEMENT_TYPE_NONE",
"trainer_type": "TRAINER_TYPE_NONE",
@@ -17,7 +17,7 @@
"y": 0
},
{
"id": "LOCALID_GUITARIST",
"id": "LOCALID_FIGHT_AREA_GUITARIST",
"graphics_id": "OBJ_EVENT_GFX_GUITARIST",
"movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
"trainer_type": "TRAINER_TYPE_NONE",
@@ -32,7 +32,7 @@
"y": 0
},
{
"id": "LOCALID_WAITRESS",
"id": "LOCALID_FIGHT_AREA_WAITRESS",
"graphics_id": "OBJ_EVENT_GFX_WAITRESS",
"movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
"trainer_type": "TRAINER_TYPE_NONE",
@@ -47,7 +47,7 @@
"y": 0
},
{
"id": "LOCALID_BLACK_BELT",
"id": "LOCALID_FIGHT_AREA_BLACK_BELT",
"graphics_id": "OBJ_EVENT_GFX_BLACK_BELT",
"movement_type": "MOVEMENT_TYPE_NONE",
"trainer_type": "TRAINER_TYPE_NONE",
@@ -62,7 +62,7 @@
"y": 0
},
{
"id": "LOCALID_DAILY_TRAINER_1",
"id": "LOCALID_FIGHT_AREA_DAILY_TRAINER_1",
"graphics_id": "OBJ_EVENT_GFX_VAR_A",
"movement_type": "MOVEMENT_TYPE_NONE",
"trainer_type": "TRAINER_TYPE_NONE",
@@ -77,7 +77,7 @@
"y": 0
},
{
"id": "LOCALID_DAILY_TRAINER_2",
"id": "LOCALID_FIGHT_AREA_DAILY_TRAINER_2",
"graphics_id": "OBJ_EVENT_GFX_VAR_B",
"movement_type": "MOVEMENT_TYPE_NONE",
"trainer_type": "TRAINER_TYPE_NONE",

12
res/field/events/events_floaroma_town_pokecenter_1f.json
View File

@@ -2,7 +2,7 @@
"bg_events": [],
"object_events": [
{
"id": "LOCALID_ACE_TRAINER_F",
"id": "LOCALID_FLOAROMA_ACE_TRAINER_F",
"graphics_id": "OBJ_EVENT_GFX_ACE_TRAINER_F",
"movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
"trainer_type": "TRAINER_TYPE_NONE",
@@ -17,7 +17,7 @@
"y": 0
},
{
"id": "LOCALID_BATTLE_GIRL",
"id": "LOCALID_FLOAROMA_BATTLE_GIRL",
"graphics_id": "OBJ_EVENT_GFX_BATTLE_GIRL",
"movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
"trainer_type": "TRAINER_TYPE_NONE",
@@ -32,7 +32,7 @@
"y": 0
},
{
"id": "LOCALID_POKECENTER_NURSE",
"id": "LOCALID_FLOAROMA_NURSE",
"graphics_id": "OBJ_EVENT_GFX_POKECENTER_NURSE",
"movement_type": "MOVEMENT_TYPE_NONE",
"trainer_type": "TRAINER_TYPE_NONE",
@@ -47,7 +47,7 @@
"y": 0
},
{
"id": "LOCALID_POKEFAN_M",
"id": "LOCALID_FLOAROMA_POKEFAN_M",
"graphics_id": "OBJ_EVENT_GFX_POKEFAN_M",
"movement_type": "MOVEMENT_TYPE_LOOK_EAST",
"trainer_type": "TRAINER_TYPE_NONE",
@@ -62,7 +62,7 @@
"y": 0
},
{
"id": "LOCALID_DAILY_TRAINER_1",
"id": "LOCALID_FLOAROMA_DAILY_TRAINER_1",
"graphics_id": "OBJ_EVENT_GFX_VAR_A",
"movement_type": "MOVEMENT_TYPE_NONE",
"trainer_type": "TRAINER_TYPE_NONE",
@@ -77,7 +77,7 @@
"y": 0
},
{
"id": "LOCALID_DAILY_TRAINER_2",
"id": "LOCALID_FLOAROMA_DAILY_TRAINER_2",
"graphics_id": "OBJ_EVENT_GFX_VAR_B",
"movement_type": "MOVEMENT_TYPE_NONE",
"trainer_type": "TRAINER_TYPE_NONE",

12
res/field/events/events_hearthome_city_pokecenter_1f.json
View File

@@ -2,7 +2,7 @@
"bg_events": [],
"object_events": [
{
"id": "LOCALID_POKECENTER_NURSE",
"id": "LOCALID_HEARTHOME_NURSE",
"graphics_id": "OBJ_EVENT_GFX_POKECENTER_NURSE",
"movement_type": "MOVEMENT_TYPE_NONE",
"trainer_type": "TRAINER_TYPE_NONE",
@@ -17,7 +17,7 @@
"y": 0
},
{
"id": "LOCALID_YOUNGSTER",
"id": "LOCALID_HEARTHOME_YOUNGSTER",
"graphics_id": "OBJ_EVENT_GFX_YOUNGSTER",
"movement_type": "MOVEMENT_TYPE_WANDER_NORTH_AND_SOUTH",
"trainer_type": "TRAINER_TYPE_NONE",
@@ -32,7 +32,7 @@
"y": 0
},
{
"id": "LOCALID_SOCIALITE",
"id": "LOCALID_HEARTHOME_SOCIALITE",
"graphics_id": "OBJ_EVENT_GFX_SOCIALITE",
"movement_type": "MOVEMENT_TYPE_WANDER_WEST_AND_EAST",
"trainer_type": "TRAINER_TYPE_NONE",
@@ -47,7 +47,7 @@
"y": 0
},
{
"id": "LOCALID_GUITARIST",
"id": "LOCALID_HEARTHOME_GUITARIST",
"graphics_id": "OBJ_EVENT_GFX_GUITARIST",
"movement_type": "MOVEMENT_TYPE_LOOK_EAST",
"trainer_type": "TRAINER_TYPE_NONE",
@@ -62,7 +62,7 @@
"y": 0
},
{
"id": "LOCALID_DAILY_TRAINER_1",
"id": "LOCALID_HEARTHOME_DAILY_TRAINER_1",
"graphics_id": "OBJ_EVENT_GFX_VAR_A",
"movement_type": "MOVEMENT_TYPE_NONE",
"trainer_type": "TRAINER_TYPE_NONE",
@@ -77,7 +77,7 @@
"y": 0
},
{
"id": "LOCALID_DAILY_TRAINER_2",
"id": "LOCALID_HEARTHOME_DAILY_TRAINER_2",
"graphics_id": "OBJ_EVENT_GFX_VAR_B",
"movement_type": "MOVEMENT_TYPE_NONE",
"trainer_type": "TRAINER_TYPE_NONE",

14
res/field/events/events_jubilife_city_pokecenter_1f.json
View File

@@ -2,7 +2,7 @@
"bg_events": [],
"object_events": [
{
"id": "LOCALID_ACE_TRAINER_F",
"id": "LOCALID_JUBILIFE_ACE_TRAINER_F",
"graphics_id": "OBJ_EVENT_GFX_ACE_TRAINER_F",
"movement_type": "MOVEMENT_TYPE_WANDER_NORTH_AND_SOUTH",
"trainer_type": "TRAINER_TYPE_NONE",
@@ -17,7 +17,7 @@
"y": 0
},
{
"id": "LOCALID_SCHOOL_KID_M",
"id": "LOCALID_JUBILIFE_SCHOOL_KID_M",
"graphics_id": "OBJ_EVENT_GFX_SCHOOL_KID_M",
"movement_type": "MOVEMENT_TYPE_WANDER_WEST_AND_EAST",
"trainer_type": "TRAINER_TYPE_NONE",
@@ -32,7 +32,7 @@
"y": 0
},
{
"id": "LOCALID_TWIN",
"id": "LOCALID_JUBILIFE_TWIN",
"graphics_id": "OBJ_EVENT_GFX_TWIN",
"movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
"trainer_type": "TRAINER_TYPE_NONE",
@@ -47,7 +47,7 @@
"y": 0
},
{
"id": "LOCALID_POKECENTER_NURSE",
"id": "LOCALID_JUBILIFE_NURSE",
"graphics_id": "OBJ_EVENT_GFX_POKECENTER_NURSE",
"movement_type": "MOVEMENT_TYPE_NONE",
"trainer_type": "TRAINER_TYPE_NONE",
@@ -62,7 +62,7 @@
"y": 0
},
{
"id": "LOCALID_TEALA",
"id": "LOCALID_JUBILIFE_TEALA",
"graphics_id": "OBJ_EVENT_GFX_TEALA",
"movement_type": "MOVEMENT_TYPE_NONE",
"trainer_type": "TRAINER_TYPE_NONE",
@@ -77,7 +77,7 @@
"y": 0
},
{
"id": "LOCALID_DAILY_TRAINER_1",
"id": "LOCALID_JUBILIFE_DAILY_TRAINER_1",
"graphics_id": "OBJ_EVENT_GFX_VAR_A",
"movement_type": "MOVEMENT_TYPE_LOOK_SOUTH",
"trainer_type": "TRAINER_TYPE_NONE",
@@ -92,7 +92,7 @@
"y": 0
},
{
"id": "LOCALID_DAILY_TRAINER_2",
"id": "LOCALID_JUBILIFE_DAILY_TRAINER_2",
"graphics_id": "OBJ_EVENT_GFX_VAR_B",
"movement_type": "MOVEMENT_TYPE_LOOK_SOUTH",
"trainer_type": "TRAINER_TYPE_NONE",

18
res/field/events/events_oreburgh_city_pokecenter_1f.json
View File

@@ -2,7 +2,7 @@
"bg_events": [],
"object_events": [
{
"id": "LOCALID_PSYCHIC",
"id": "LOCALID_OREBURGH_PSYCHIC",
"graphics_id": "OBJ_EVENT_GFX_PSYCHIC",
"movement_type": "MOVEMENT_TYPE_LOOK_EAST",
"trainer_type": "TRAINER_TYPE_NONE",
@@ -17,7 +17,7 @@
"y": 0
},
{
"id": "LOCALID_ACE_TRAINER_F",
"id": "LOCALID_OREBURGH_ACE_TRAINER_F",
"graphics_id": "OBJ_EVENT_GFX_ACE_TRAINER_F",
"movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
"trainer_type": "TRAINER_TYPE_NONE",
@@ -32,7 +32,7 @@
"y": 0
},
{
"id": "LOCALID_NINJA_BOY",
"id": "LOCALID_OREBURGH_NINJA_BOY",
"graphics_id": "OBJ_EVENT_GFX_NINJA_BOY",
"movement_type": "MOVEMENT_TYPE_WANDER_WEST_AND_EAST",
"trainer_type": "TRAINER_TYPE_NONE",
@@ -47,7 +47,7 @@
"y": 0
},
{
"id": "LOCALID_POKECENTER_NURSE",
"id": "LOCALID_OREBURGH_NURSE",
"graphics_id": "OBJ_EVENT_GFX_POKECENTER_NURSE",
"movement_type": "MOVEMENT_TYPE_NONE",
"trainer_type": "TRAINER_TYPE_NONE",
@@ -62,7 +62,7 @@
"y": 0
},
{
"id": "LOCALID_GENTLEMAN",
"id": "LOCALID_OREBURGH_GENTLEMAN",
"graphics_id": "OBJ_EVENT_GFX_GENTLEMAN",
"movement_type": "MOVEMENT_TYPE_LOOK_NORTH",
"trainer_type": "TRAINER_TYPE_NONE",
@@ -77,7 +77,7 @@
"y": 0
},
{
"id": "LOCALID_DAILY_TRAINER_1",
"id": "LOCALID_OREBURGH_DAILY_TRAINER_1",
"graphics_id": "OBJ_EVENT_GFX_VAR_A",
"movement_type": "MOVEMENT_TYPE_NONE",
"trainer_type": "TRAINER_TYPE_NONE",
@@ -92,7 +92,7 @@
"y": 0
},
{
"id": "LOCALID_DAILY_TRAINER_2",
"id": "LOCALID_OREBURGH_DAILY_TRAINER_2",
"graphics_id": "OBJ_EVENT_GFX_VAR_B",
"movement_type": "MOVEMENT_TYPE_NONE",
"trainer_type": "TRAINER_TYPE_NONE",
@@ -107,7 +107,7 @@
"y": 0
},
{
"id": "LOCALID_KID_WITH_NDS_WEST",
"id": "LOCALID_OREBURGH_KID_WITH_NDS_WEST",
"graphics_id": "OBJ_EVENT_GFX_KID_WITH_NDS",
"movement_type": "MOVEMENT_TYPE_NONE",
"trainer_type": "TRAINER_TYPE_NONE",
@@ -122,7 +122,7 @@
"y": 0
},
{
"id": "LOCALID_KID_WITH_NDS_EAST",
"id": "LOCALID_OREBURGH_KID_WITH_NDS_EAST",
"graphics_id": "OBJ_EVENT_GFX_KID_WITH_NDS",
"movement_type": "MOVEMENT_TYPE_NONE",
"trainer_type": "TRAINER_TYPE_NONE",

10
res/field/events/events_pastoria_city_pokecenter_1f.json
View File

@@ -2,7 +2,7 @@
"bg_events": [],
"object_events": [
{
"id": "LOCALID_POKECENTER_NURSE",
"id": "LOCALID_PASTORIA_NURSE",
"graphics_id": "OBJ_EVENT_GFX_POKECENTER_NURSE",
"movement_type": "MOVEMENT_TYPE_NONE",
"trainer_type": "TRAINER_TYPE_NONE",
@@ -17,7 +17,7 @@
"y": 0
},
{
"id": "LOCALID_BLACK_BELT",
"id": "LOCALID_PASTORIA_BLACK_BELT",
"graphics_id": "OBJ_EVENT_GFX_BLACK_BELT",
"movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
"trainer_type": "TRAINER_TYPE_NONE",
@@ -32,7 +32,7 @@
"y": 0
},
{
"id": "LOCALID_SCHOOL_KID_F",
"id": "LOCALID_PASTORIA_SCHOOL_KID_F",
"graphics_id": "OBJ_EVENT_GFX_SCHOOL_KID_F",
"movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
"trainer_type": "TRAINER_TYPE_NONE",
@@ -47,7 +47,7 @@
"y": 0
},
{
"id": "LOCALID_DAILY_TRAINER_1",
"id": "LOCALID_PASTORIA_DAILY_TRAINER_1",
"graphics_id": "OBJ_EVENT_GFX_VAR_A",
"movement_type": "MOVEMENT_TYPE_NONE",
"trainer_type": "TRAINER_TYPE_NONE",
@@ -62,7 +62,7 @@
"y": 0
},
{
"id": "LOCALID_DAILY_TRAINER_2",
"id": "LOCALID_PASTORIA_DAILY_TRAINER_2",
"graphics_id": "OBJ_EVENT_GFX_VAR_B",
"movement_type": "MOVEMENT_TYPE_NONE",
"trainer_type": "TRAINER_TYPE_NONE",

14
res/field/events/events_pokemon_league_north_pokecenter_1f.json
View File

@@ -2,7 +2,7 @@
"bg_events": [],
"object_events": [
{
"id": "LOCALID_ACE_TRAINER_M",
"id": "LOCALID_LEAGUE_NORTH_ACE_TRAINER_M",
"graphics_id": "OBJ_EVENT_GFX_ACE_TRAINER_M",
"movement_type": "MOVEMENT_TYPE_LOOK_SOUTH",
"trainer_type": "TRAINER_TYPE_NONE",
@@ -17,7 +17,7 @@
"y": 0
},
{
"id": "LOCALID_CASHIER_F",
"id": "LOCALID_LEAGUE_NORTH_CASHIER_F",
"graphics_id": "OBJ_EVENT_GFX_CASHIER_F",
"movement_type": "MOVEMENT_TYPE_NONE",
"trainer_type": "TRAINER_TYPE_NONE",
@@ -32,7 +32,7 @@
"y": 0
},
{
"id": "LOCALID_CASHIER_M",
"id": "LOCALID_LEAGUE_NORTH_CASHIER_M",
"graphics_id": "OBJ_EVENT_GFX_CASHIER_M",
"movement_type": "MOVEMENT_TYPE_NONE",
"trainer_type": "TRAINER_TYPE_NONE",
@@ -47,7 +47,7 @@
"y": 0
},
{
"id": "LOCALID_POKECENTER_NURSE",
"id": "LOCALID_LEAGUE_NORTH_NURSE",
"graphics_id": "OBJ_EVENT_GFX_POKECENTER_NURSE",
"movement_type": "MOVEMENT_TYPE_NONE",
"trainer_type": "TRAINER_TYPE_NONE",
@@ -62,7 +62,7 @@
"y": 0
},
{
"id": "LOCALID_ACE_TRAINER_F",
"id": "LOCALID_LEAGUE_NORTH_ACE_TRAINER_F",
"graphics_id": "OBJ_EVENT_GFX_ACE_TRAINER_F",
"movement_type": "MOVEMENT_TYPE_LOOK_NORTH_SOUTH_AND_EAST",
"trainer_type": "TRAINER_TYPE_NONE",
@@ -77,7 +77,7 @@
"y": 0
},
{
"id": "LOCALID_RIVAL",
"id": "LOCALID_LEAGUE_NORTH_RIVAL",
"graphics_id": "OBJ_EVENT_GFX_BARRY",
"movement_type": "MOVEMENT_TYPE_LOOK_NORTH",
"trainer_type": "TRAINER_TYPE_NONE",
@@ -92,7 +92,7 @@
"y": 0
},
{
"id": "LOCALID_GUITARIST",
"id": "LOCALID_LEAGUE_NORTH_GUITARIST",
"graphics_id": "OBJ_EVENT_GFX_GUITARIST",
"movement_type": "MOVEMENT_TYPE_NONE",
"trainer_type": "TRAINER_TYPE_NONE",

6
res/field/events/events_pokemon_league_south_pokecenter_1f.json
View File

@@ -2,7 +2,7 @@
"bg_events": [],
"object_events": [
{
"id": "LOCALID_POKECENTER_NURSE",
"id": "LOCALID_LEAGUE_SOUTH_NURSE",
"graphics_id": "OBJ_EVENT_GFX_POKECENTER_NURSE",
"movement_type": "MOVEMENT_TYPE_NONE",
"trainer_type": "TRAINER_TYPE_NONE",
@@ -17,7 +17,7 @@
"y": 0
},
{
"id": "LOCALID_POKEFAN_M",
"id": "LOCALID_LEAGUE_SOUTH_POKEFAN_M",
"graphics_id": "OBJ_EVENT_GFX_POKEFAN_M",
"movement_type": "MOVEMENT_TYPE_LOOK_SOUTH_AND_WEST",
"trainer_type": "TRAINER_TYPE_NONE",
@@ -32,7 +32,7 @@
"y": 0
},
{
"id": "LOCALID_ACE_TRAINER_F",
"id": "LOCALID_LEAGUE_SOUTH_ACE_TRAINER_F",
"graphics_id": "OBJ_EVENT_GFX_ACE_TRAINER_F",
"movement_type": "MOVEMENT_TYPE_LOOK_SOUTH_AND_WEST",
"trainer_type": "TRAINER_TYPE_NONE",

10
res/field/events/events_resort_area_pokecenter_1f.json
View File

@@ -2,7 +2,7 @@
"bg_events": [],
"object_events": [
{
"id": "LOCALID_POKECENTER_NURSE",
"id": "LOCALID_RESORT_AREA_NURSE",
"graphics_id": "OBJ_EVENT_GFX_POKECENTER_NURSE",
"movement_type": "MOVEMENT_TYPE_NONE",
"trainer_type": "TRAINER_TYPE_NONE",
@@ -17,7 +17,7 @@
"y": 0
},
{
"id": "LOCALID_RICH_BOY",
"id": "LOCALID_RESORT_AREA_RICH_BOY",
"graphics_id": "OBJ_EVENT_GFX_RICH_BOY",
"movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
"trainer_type": "TRAINER_TYPE_NONE",
@@ -32,7 +32,7 @@
"y": 0
},
{
"id": "LOCALID_IDOL",
"id": "LOCALID_RESORT_AREA_IDOL",
"graphics_id": "OBJ_EVENT_GFX_IDOL",
"movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
"trainer_type": "TRAINER_TYPE_NONE",
@@ -47,7 +47,7 @@
"y": 0
},
{
"id": "LOCALID_DAILY_TRAINER_1",
"id": "LOCALID_RESORT_AREA_DAILY_TRAINER_1",
"graphics_id": "OBJ_EVENT_GFX_VAR_A",
"movement_type": "MOVEMENT_TYPE_NONE",
"trainer_type": "TRAINER_TYPE_NONE",
@@ -62,7 +62,7 @@
"y": 0
},
{
"id": "LOCALID_DAILY_TRAINER_2",
"id": "LOCALID_RESORT_AREA_DAILY_TRAINER_2",
"graphics_id": "OBJ_EVENT_GFX_VAR_B",
"movement_type": "MOVEMENT_TYPE_NONE",
"trainer_type": "TRAINER_TYPE_NONE",

10
res/field/events/events_sandgem_town_pokecenter_1f.json
View File

@@ -2,7 +2,7 @@
"bg_events": [],
"object_events": [
{
"id": "LOCALID_POKEMON_BREEDER_M",
"id": "LOCALID_SANDGEM_POKEMON_BREEDER_M",
"graphics_id": "OBJ_EVENT_GFX_POKEMON_BREEDER_M",
"movement_type": "MOVEMENT_TYPE_LOOK_EAST",
"trainer_type": "TRAINER_TYPE_NONE",
@@ -17,7 +17,7 @@
"y": 0
},
{
"id": "LOCALID_EXPERT_M",
"id": "LOCALID_SANDGEM_EXPERT_M",
"graphics_id": "OBJ_EVENT_GFX_EXPERT_M",
"movement_type": "MOVEMENT_TYPE_LOOK_AROUND",
"trainer_type": "TRAINER_TYPE_NONE",
@@ -32,7 +32,7 @@
"y": 0
},
{
"id": "LOCALID_LASS",
"id": "LOCALID_SANDGEM_LASS",
"graphics_id": "OBJ_EVENT_GFX_LASS",
"movement_type": "MOVEMENT_TYPE_LOOK_NORTH_WEST_AND_EAST",
"trainer_type": "TRAINER_TYPE_NONE",
@@ -47,7 +47,7 @@
"y": 0
},
{
"id": "LOCALID_POKECENTER_NURSE",
"id": "LOCALID_SANDGEM_NURSE",
"graphics_id": "OBJ_EVENT_GFX_POKECENTER_NURSE",
"movement_type": "MOVEMENT_TYPE_NONE",
"trainer_type": "TRAINER_TYPE_NONE",
@@ -62,7 +62,7 @@
"y": 0
},
{
"id": "LOCALID_TEALA",
"id": "LOCALID_SANDGEM_TEALA",
"graphics_id": "OBJ_EVENT_GFX_TEALA",
"movement_type": "MOVEMENT_TYPE_NONE",
"trainer_type": "TRAINER_TYPE_NONE",

14
res/field/events/events_snowpoint_city_pokecenter_1f.json
View File

@@ -2,7 +2,7 @@
"bg_events": [],
"object_events": [
{
"id": "LOCALID_POKECENTER_NURSE",
"id": "LOCALID_SNOWPOINT_NURSE",
"graphics_id": "OBJ_EVENT_GFX_POKECENTER_NURSE",
"movement_type": "MOVEMENT_TYPE_NONE",
"trainer_type": "TRAINER_TYPE_NONE",
@@ -17,7 +17,7 @@
"y": 0
},
{
"id": "LOCALID_LASS",
"id": "LOCALID_SNOWPOINT_LASS",
"graphics_id": "OBJ_EVENT_GFX_LASS",
"movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
"trainer_type": "TRAINER_TYPE_NONE",
@@ -32,7 +32,7 @@
"y": 0
},
{
"id": "LOCALID_BATTLE_GIRL",
"id": "LOCALID_SNOWPOINT_BATTLE_GIRL",
"graphics_id": "OBJ_EVENT_GFX_BATTLE_GIRL",
"movement_type": "MOVEMENT_TYPE_WANDER_WEST_AND_EAST",
"trainer_type": "TRAINER_TYPE_NONE",
@@ -47,7 +47,7 @@
"y": 0
},
{
"id": "LOCALID_PSYDUCK",
"id": "LOCALID_SNOWPOINT_PSYDUCK",
"graphics_id": "OBJ_EVENT_GFX_PSYDUCK",
"movement_type": "MOVEMENT_TYPE_NONE",
"trainer_type": "TRAINER_TYPE_NONE",
@@ -62,7 +62,7 @@
"y": 0
},
{
"id": "LOCALID_MAYLENE",
"id": "LOCALID_SNOWPOINT_MAYLENE",
"graphics_id": "OBJ_EVENT_GFX_MAYLENE",
"movement_type": "MOVEMENT_TYPE_LOOK_NORTH",
"trainer_type": "TRAINER_TYPE_NONE",
@@ -77,7 +77,7 @@
"y": 0
},
{
"id": "LOCALID_DAILY_TRAINER_1",
"id": "LOCALID_SNOWPOINT_DAILY_TRAINER_1",
"graphics_id": "OBJ_EVENT_GFX_VAR_A",
"movement_type": "MOVEMENT_TYPE_NONE",
"trainer_type": "TRAINER_TYPE_NONE",
@@ -92,7 +92,7 @@
"y": 0
},
{
"id": "LOCALID_DAILY_TRAINER_2",
"id": "LOCALID_SNOWPOINT_DAILY_TRAINER_2",
"graphics_id": "OBJ_EVENT_GFX_VAR_B",
"movement_type": "MOVEMENT_TYPE_NONE",
"trainer_type": "TRAINER_TYPE_NONE",

12
res/field/events/events_solaceon_town_pokecenter_1f.json
View File

@@ -2,7 +2,7 @@
"bg_events": [],
"object_events": [
{
"id": "LOCALID_POKECENTER_NURSE",
"id": "LOCALID_SOLACEON_NURSE",
"graphics_id": "OBJ_EVENT_GFX_POKECENTER_NURSE",
"movement_type": "MOVEMENT_TYPE_NONE",
"trainer_type": "TRAINER_TYPE_NONE",
@@ -17,7 +17,7 @@
"y": 0
},
{
"id": "LOCALID_OLD_MAN",
"id": "LOCALID_SOLACEON_OLD_MAN",
"graphics_id": "OBJ_EVENT_GFX_OLD_MAN",
"movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
"trainer_type": "TRAINER_TYPE_NONE",
@@ -32,7 +32,7 @@
"y": 0
},
{
"id": "LOCALID_LASS",
"id": "LOCALID_SOLACEON_LASS",
"graphics_id": "OBJ_EVENT_GFX_LASS",
"movement_type": "MOVEMENT_TYPE_WANDER_WEST_AND_EAST",
"trainer_type": "TRAINER_TYPE_NONE",
@@ -47,7 +47,7 @@
"y": 0
},
{
"id": "LOCALID_DAILY_TRAINER_1",
"id": "LOCALID_SOLACEON_DAILY_TRAINER_1",
"graphics_id": "OBJ_EVENT_GFX_VAR_A",
"movement_type": "MOVEMENT_TYPE_NONE",
"trainer_type": "TRAINER_TYPE_NONE",
@@ -62,7 +62,7 @@
"y": 0
},
{
"id": "LOCALID_DAILY_TRAINER_2",
"id": "LOCALID_SOLACEON_DAILY_TRAINER_2",
"graphics_id": "OBJ_EVENT_GFX_VAR_B",
"movement_type": "MOVEMENT_TYPE_NONE",
"trainer_type": "TRAINER_TYPE_NONE",
@@ -77,7 +77,7 @@
"y": 0
},
{
"id": "LOCALID_RUIN_MANIAC",
"id": "LOCALID_SOLACEON_RUIN_MANIAC",
"graphics_id": "OBJ_EVENT_GFX_RUIN_MANIAC",
"movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
"trainer_type": "TRAINER_TYPE_NONE",

12
res/field/events/events_sunyshore_city_pokecenter_1f.json
View File

@@ -2,7 +2,7 @@
"bg_events": [],
"object_events": [
{
"id": "LOCALID_POKECENTER_NURSE",
"id": "LOCALID_SUNYSHORE_NURSE",
"graphics_id": "OBJ_EVENT_GFX_POKECENTER_NURSE",
"movement_type": "MOVEMENT_TYPE_NONE",
"trainer_type": "TRAINER_TYPE_NONE",
@@ -17,7 +17,7 @@
"y": 0
},
{
"id": "LOCALID_OLD_MAN",
"id": "LOCALID_SUNYSHORE_OLD_MAN",
"graphics_id": "OBJ_EVENT_GFX_OLD_MAN",
"movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
"trainer_type": "TRAINER_TYPE_NONE",
@@ -32,7 +32,7 @@
"y": 0
},
{
"id": "LOCALID_NINJA_BOY",
"id": "LOCALID_SUNYSHORE_NINJA_BOY",
"graphics_id": "OBJ_EVENT_GFX_NINJA_BOY",
"movement_type": "MOVEMENT_TYPE_WANDER_WEST_AND_EAST",
"trainer_type": "TRAINER_TYPE_NONE",
@@ -47,7 +47,7 @@
"y": 0
},
{
"id": "LOCALID_MIDDLE_AGED_MAN",
"id": "LOCALID_SUNYSHORE_MIDDLE_AGED_MAN",
"graphics_id": "OBJ_EVENT_GFX_MIDDLE_AGED_MAN",
"movement_type": "MOVEMENT_TYPE_WANDER_WEST_AND_EAST",
"trainer_type": "TRAINER_TYPE_NONE",
@@ -62,7 +62,7 @@
"y": 0
},
{
"id": "LOCALID_DAILY_TRAINER_1",
"id": "LOCALID_SUNYSHORE_DAILY_TRAINER_1",
"graphics_id": "OBJ_EVENT_GFX_VAR_A",
"movement_type": "MOVEMENT_TYPE_NONE",
"trainer_type": "TRAINER_TYPE_NONE",
@@ -77,7 +77,7 @@
"y": 0
},
{
"id": "LOCALID_DAILY_TRAINER_2",
"id": "LOCALID_SUNYSHORE_DAILY_TRAINER_2",
"graphics_id": "OBJ_EVENT_GFX_VAR_B",
"movement_type": "MOVEMENT_TYPE_NONE",
"trainer_type": "TRAINER_TYPE_NONE",

8
res/field/events/events_survival_area_pokecenter_1f.json
View File

@@ -2,7 +2,7 @@
"bg_events": [],
"object_events": [
{
"id": "LOCALID_POKECENTER_NURSE",
"id": "LOCALID_SURVIVAL_AREA_NURSE",
"graphics_id": "OBJ_EVENT_GFX_POKECENTER_NURSE",
"movement_type": "MOVEMENT_TYPE_NONE",
"trainer_type": "TRAINER_TYPE_NONE",
@@ -17,7 +17,7 @@
"y": 0
},
{
"id": "LOCALID_ACE_TRAINER_M",
"id": "LOCALID_SURVIVAL_AREA_ACE_TRAINER_M",
"graphics_id": "OBJ_EVENT_GFX_ACE_TRAINER_M",
"movement_type": "MOVEMENT_TYPE_LOOK_EAST",
"trainer_type": "TRAINER_TYPE_NONE",
@@ -32,7 +32,7 @@
"y": 0
},
{
"id": "LOCALID_EXPERT_M",
"id": "LOCALID_SURVIVAL_AREA_EXPERT_M",
"graphics_id": "OBJ_EVENT_GFX_EXPERT_M",
"movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
"trainer_type": "TRAINER_TYPE_NONE",
@@ -47,7 +47,7 @@
"y": 0
},
{
"id": "LOCALID_PSYCHIC",
"id": "LOCALID_SURVIVAL_AREA_PSYCHIC",
"graphics_id": "OBJ_EVENT_GFX_PSYCHIC",
"movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
"trainer_type": "TRAINER_TYPE_NONE",

2
res/field/events/events_twinleaf_town_player_house_1f.json
View File

@@ -67,7 +67,7 @@
],
"object_events": [
{
"id": "LOCALID_MOM",
"id": "LOCALID_PLAYER_HOUSE_MOM",
"graphics_id": "OBJ_EVENT_GFX_MOM",
"movement_type": "MOVEMENT_TYPE_LOOK_NORTH",
"trainer_type": "TRAINER_TYPE_NONE",

10
res/field/events/events_veilstone_city_pokecenter_1f.json
View File

@@ -2,7 +2,7 @@
"bg_events": [],
"object_events": [
{
"id": "LOCALID_POKECENTER_NURSE",
"id": "LOCALID_VEILSTONE_NURSE",
"graphics_id": "OBJ_EVENT_GFX_POKECENTER_NURSE",
"movement_type": "MOVEMENT_TYPE_NONE",
"trainer_type": "TRAINER_TYPE_NONE",
@@ -17,7 +17,7 @@
"y": 0
},
{
"id": "LOCALID_SOCIALITE",
"id": "LOCALID_VEILSTONE_SOCIALITE",
"graphics_id": "OBJ_EVENT_GFX_SOCIALITE",
"movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
"trainer_type": "TRAINER_TYPE_NONE",
@@ -32,7 +32,7 @@
"y": 0
},
{
"id": "LOCALID_SCHOOL_KID_M",
"id": "LOCALID_VEILSTONE_SCHOOL_KID_M",
"graphics_id": "OBJ_EVENT_GFX_SCHOOL_KID_M",
"movement_type": "MOVEMENT_TYPE_LOOK_SOUTH_AND_WEST",
"trainer_type": "TRAINER_TYPE_NONE",
@@ -47,7 +47,7 @@
"y": 0
},
{
"id": "LOCALID_DAILY_TRAINER_1",
"id": "LOCALID_VEILSTONE_DAILY_TRAINER_1",
"graphics_id": "OBJ_EVENT_GFX_VAR_A",
"movement_type": "MOVEMENT_TYPE_NONE",
"trainer_type": "TRAINER_TYPE_NONE",
@@ -62,7 +62,7 @@
"y": 0
},
{
"id": "LOCALID_DAILY_TRAINER_2",
"id": "LOCALID_VEILSTONE_DAILY_TRAINER_2",
"graphics_id": "OBJ_EVENT_GFX_VAR_B",
"movement_type": "MOVEMENT_TYPE_NONE",
"trainer_type": "TRAINER_TYPE_NONE",

2
res/field/scripts/scripts_canalave_city_pokecenter_1f.s
View File

@@ -11,7 +11,7 @@
ScriptEntryEnd
CanalaveCityPokecenter1F_Nurse:
Common_CallPokecenterNurse LOCALID_POKECENTER_NURSE
Common_CallPokecenterNurse LOCALID_CANALAVE_NURSE
End
CanalaveCityPokecenter1F_PokemonBreederF:

2
res/field/scripts/scripts_celestic_town_pokecenter_1f.s
View File

@@ -10,7 +10,7 @@
ScriptEntryEnd
CelesticTownPokecenter1F_Nurse:
Common_CallPokecenterNurse LOCALID_POKECENTER_NURSE
Common_CallPokecenterNurse LOCALID_CELESTIC_NURSE
End
CelesticTownPokecenter1F_ExpertF:

1011
res/field/scripts/scripts_common.s
View File

File diff suppressed because it is too large Load Diff

2
res/field/scripts/scripts_eterna_city_pokecenter_1f.s
View File

@@ -11,7 +11,7 @@
ScriptEntryEnd
EternaCityPokecenter1F_Nurse:
Common_CallPokecenterNurse LOCALID_POKECENTER_NURSE
Common_CallPokecenterNurse LOCALID_ETERNA_NURSE
End
EternaCityPokecenter1F_BattleGirl:

2
res/field/scripts/scripts_fight_area_pokecenter_1f.s
View File

@@ -10,7 +10,7 @@
ScriptEntryEnd
FightAreaPokecenter1F_Nurse:
Common_CallPokecenterNurse LOCALID_POKECENTER_NURSE
Common_CallPokecenterNurse LOCALID_FIGHT_AREA_NURSE
End
FightAreaPokecenter1F_Guitarist:

2
res/field/scripts/scripts_floaroma_town_pokecenter_1f.s
View File

@@ -10,7 +10,7 @@
ScriptEntryEnd
FloaromaTownPokecenter1F_Nurse:
Common_CallPokecenterNurse LOCALID_POKECENTER_NURSE
Common_CallPokecenterNurse LOCALID_FLOAROMA_NURSE
End
FloaromaTownPokecenter1F_PokefanM:

2
res/field/scripts/scripts_hearthome_city_pokecenter_1f.s
View File

@@ -10,7 +10,7 @@
ScriptEntryEnd
HearthomeCityPokecenter1F_Nurse:
Common_CallPokecenterNurse LOCALID_POKECENTER_NURSE
Common_CallPokecenterNurse LOCALID_HEARTHOME_NURSE
End
HearthomeCityPokecenter1F_Youngster:

2
res/field/scripts/scripts_jubilife_city_pokecenter_1f.s
View File

@@ -10,7 +10,7 @@
ScriptEntryEnd
JubilifeCityPokecenter1F_Nurse:
Common_CallPokecenterNurse LOCALID_POKECENTER_NURSE
Common_CallPokecenterNurse LOCALID_JUBILIFE_NURSE
End
JubilifeCityPokecenter1F_Twin:

2
res/field/scripts/scripts_oreburgh_city_pokecenter_1f.s
View File

@@ -14,7 +14,7 @@
ScriptEntryEnd
OreburghCityPokecenter1F_Nurse:
Common_CallPokecenterNurse LOCALID_POKECENTER_NURSE
Common_CallPokecenterNurse LOCALID_OREBURGH_NURSE
End
OreburghCityPokecenter1F_NinjaBoy:

2
res/field/scripts/scripts_pastoria_city_pokecenter_1f.s
View File

@@ -9,7 +9,7 @@
ScriptEntryEnd
PastoriaCityPokecenter1F_Nurse:
Common_CallPokecenterNurse LOCALID_POKECENTER_NURSE
Common_CallPokecenterNurse LOCALID_PASTORIA_NURSE
End
PastoriaCityPokecenter1F_BlackBelt:

24
res/field/scripts/scripts_pokemon_league_north_pokecenter_1f.s
View File

@@ -50,17 +50,17 @@ PokemonLeagueNorthPokecenter1F_DoorGuard:
End
PokemonLeagueNorthPokecenter1F_DoorGuardMoveAwayEastSouth:
ApplyMovement LOCALID_ACE_TRAINER_M, PokemonLeagueNorthPokecenter1F_Movement_DoorGuardMoveAwayEastSouth
ApplyMovement LOCALID_LEAGUE_NORTH_ACE_TRAINER_M, PokemonLeagueNorthPokecenter1F_Movement_DoorGuardMoveAwayEastSouth
WaitMovement
GoTo PokemonLeagueNorthPokecenter1F_DoorGuardMovedAway
PokemonLeagueNorthPokecenter1F_DoorGuardMoveAwayWest:
ApplyMovement LOCALID_ACE_TRAINER_M, PokemonLeagueNorthPokecenter1F_Movement_DoorGuardMoveAwayWest
ApplyMovement LOCALID_LEAGUE_NORTH_ACE_TRAINER_M, PokemonLeagueNorthPokecenter1F_Movement_DoorGuardMoveAwayWest
WaitMovement
GoTo PokemonLeagueNorthPokecenter1F_DoorGuardMovedAway
PokemonLeagueNorthPokecenter1F_DoorGuardMoveAwayEastWest:
ApplyMovement LOCALID_ACE_TRAINER_M, PokemonLeagueNorthPokecenter1F_Movement_DoorGuardMoveAwayEastWest
ApplyMovement LOCALID_LEAGUE_NORTH_ACE_TRAINER_M, PokemonLeagueNorthPokecenter1F_Movement_DoorGuardMoveAwayEastWest
WaitMovement
GoTo PokemonLeagueNorthPokecenter1F_DoorGuardMovedAway
@@ -108,7 +108,7 @@ PokemonLeagueNorthPokecenter1F_VendorSpecial:
PokemonLeagueNorthPokecenter1F_RivalTrigger:
LockAll
ClearFlag FLAG_HIDE_POKEMON_LEAGUE_NORTH_POKECENTER_1F_RIVAL
AddObject LOCALID_RIVAL
AddObject LOCALID_LEAGUE_NORTH_RIVAL
Common_SetRivalBGM
GetPlayerMapPos VAR_0x8004, VAR_0x8005
GoToIfEq VAR_0x8004, 10, PokemonLeagueNorthPokecenter1F_RivalEnterWest
@@ -117,17 +117,17 @@ PokemonLeagueNorthPokecenter1F_RivalTrigger:
End
PokemonLeagueNorthPokecenter1F_RivalEnterWest:
ApplyMovement LOCALID_RIVAL, PokemonLeagueNorthPokecenter1F_Movement_RivalEnterWest
ApplyMovement LOCALID_LEAGUE_NORTH_RIVAL, PokemonLeagueNorthPokecenter1F_Movement_RivalEnterWest
WaitMovement
GoTo PokemonLeagueNorthPokecenter1F_RivalIntro
PokemonLeagueNorthPokecenter1F_RivalEnterNorth:
ApplyMovement LOCALID_RIVAL, PokemonLeagueNorthPokecenter1F_Movement_RivalEnterNorth
ApplyMovement LOCALID_LEAGUE_NORTH_RIVAL, PokemonLeagueNorthPokecenter1F_Movement_RivalEnterNorth
WaitMovement
GoTo PokemonLeagueNorthPokecenter1F_RivalIntro
PokemonLeagueNorthPokecenter1F_RivalEnterEast:
ApplyMovement LOCALID_RIVAL, PokemonLeagueNorthPokecenter1F_Movement_RivalEnterEast
ApplyMovement LOCALID_LEAGUE_NORTH_RIVAL, PokemonLeagueNorthPokecenter1F_Movement_RivalEnterEast
WaitMovement
GoTo PokemonLeagueNorthPokecenter1F_RivalIntro
@@ -168,23 +168,23 @@ PokemonLeagueNorthPokecenter1F_RivalPostBattle:
End
PokemonLeagueNorthPokecenter1F_RivalLeaveEast:
ApplyMovement LOCALID_RIVAL, PokemonLeagueNorthPokecenter1F_Movement_RivalLeaveEast
ApplyMovement LOCALID_LEAGUE_NORTH_RIVAL, PokemonLeagueNorthPokecenter1F_Movement_RivalLeaveEast
WaitMovement
GoTo PokemonLeagueNorthPokecenter1F_RemoveRival
PokemonLeagueNorthPokecenter1F_RivalLeaveSouth:
ApplyMovement LOCALID_RIVAL, PokemonLeagueNorthPokecenter1F_Movement_RivalLeaveSouth
ApplyMovement LOCALID_LEAGUE_NORTH_RIVAL, PokemonLeagueNorthPokecenter1F_Movement_RivalLeaveSouth
WaitMovement
GoTo PokemonLeagueNorthPokecenter1F_RemoveRival
PokemonLeagueNorthPokecenter1F_RivalLeaveWest:
ApplyMovement LOCALID_RIVAL, PokemonLeagueNorthPokecenter1F_Movement_RivalLeaveWest
ApplyMovement LOCALID_LEAGUE_NORTH_RIVAL, PokemonLeagueNorthPokecenter1F_Movement_RivalLeaveWest
WaitMovement
GoTo PokemonLeagueNorthPokecenter1F_RemoveRival
PokemonLeagueNorthPokecenter1F_RemoveRival:
PlaySE SEQ_SE_DP_KAIDAN2
RemoveObject LOCALID_RIVAL
RemoveObject LOCALID_LEAGUE_NORTH_RIVAL
WaitSE SEQ_SE_DP_KAIDAN2
SetVar VAR_RIVAL_BEAT_SUNYSHORE_GYM, 1
ReleaseAll
@@ -248,7 +248,7 @@ PokemonLeagueNorthPokecenter1F_Guitarist:
End
PokemonLeagueNorthPokecenter1F_Nurse:
Common_CallPokecenterNurse 3
Common_CallPokecenterNurse LOCALID_LEAGUE_NORTH_NURSE
End
.balign 4, 0

3
res/field/scripts/scripts_pokemon_league_south_pokecenter_1f.s
View File

@@ -1,5 +1,6 @@
#include "macros/scrcmd.inc"
#include "res/text/bank/pokemon_league_south_pokecenter_1f.h"
#include "res/field/events/events_pokemon_league_south_pokecenter_1f.h"
ScriptEntry PokemonLeagueSouthPokecenter1F_Nurse
@@ -15,7 +16,7 @@ PokemonLeagueSouthPokecenter1F_OnTransition:
End
PokemonLeagueSouthPokecenter1F_Nurse:
Common_CallPokecenterNurse 0
Common_CallPokecenterNurse LOCALID_LEAGUE_SOUTH_NURSE
End
PokemonLeagueSouthPokecenter1F_UnusedVendor2:

2
res/field/scripts/scripts_resort_area_pokecenter_1f.s
View File

@@ -9,7 +9,7 @@
ScriptEntryEnd
ResortAreaPokecenter1F_Nurse:
Common_CallPokecenterNurse LOCALID_POKECENTER_NURSE
Common_CallPokecenterNurse LOCALID_RESORT_AREA_NURSE
End
ResortAreaPokecenter1F_RichBoy:

6
res/field/scripts/scripts_sandgem_town_pokecenter_1f.s
View File

@@ -3,14 +3,14 @@
#include "res/field/events/events_sandgem_town_pokecenter_1f.h"
ScriptEntry SandgemTownPokecenter1F_PokecenterNurse
ScriptEntry SandgemTownPokecenter1F_Nurse
ScriptEntry SandgemTownPokecenter1F_BreederM
ScriptEntry SandgemTownPokecenter1F_ExpertM
ScriptEntry SandgemTownPokecenter1F_Lass
ScriptEntryEnd
SandgemTownPokecenter1F_PokecenterNurse:
Common_CallPokecenterNurse LOCALID_POKECENTER_NURSE
SandgemTownPokecenter1F_Nurse:
Common_CallPokecenterNurse LOCALID_SANDGEM_NURSE
End
SandgemTownPokecenter1F_BreederM:

8
res/field/scripts/scripts_snowpoint_city_pokecenter_1f.s
View File

@@ -11,7 +11,7 @@
ScriptEntryEnd
SnowpointCityPokecenter1F_Nurse:
Common_CallPokecenterNurse LOCALID_POKECENTER_NURSE
Common_CallPokecenterNurse LOCALID_SNOWPOINT_NURSE
End
SnowpointCityPokecenter1F_Lass:
@@ -44,17 +44,17 @@ SnowpointCityPokecenter1F_Maylene:
End
SnowpointCityPokecenter1F_MayleneWalkOnSpotSouth:
ApplyMovement LOCALID_MAYLENE, SnowpointCityPokecenter1F_Movement_MayleneWalkOnSpotSouth
ApplyMovement LOCALID_SNOWPOINT_MAYLENE, SnowpointCityPokecenter1F_Movement_MayleneWalkOnSpotSouth
WaitMovement
Return
SnowpointCityPokecenter1F_MayleneWalkOnSpotEast:
ApplyMovement LOCALID_MAYLENE, SnowpointCityPokecenter1F_Movement_MayleneWalkOnSpotEast
ApplyMovement LOCALID_SNOWPOINT_MAYLENE, SnowpointCityPokecenter1F_Movement_MayleneWalkOnSpotEast
WaitMovement
Return
SnowpointCityPokecenter1F_MayleneWalkOnSpotWest:
ApplyMovement LOCALID_MAYLENE, SnowpointCityPokecenter1F_Movement_MayleneWalkOnSpotWest
ApplyMovement LOCALID_SNOWPOINT_MAYLENE, SnowpointCityPokecenter1F_Movement_MayleneWalkOnSpotWest
WaitMovement
Return

2
res/field/scripts/scripts_solaceon_town_pokecenter_1f.s
View File

@@ -10,7 +10,7 @@
ScriptEntryEnd
SolaceonTownPokecenter1F_Nurse:
Common_CallPokecenterNurse LOCALID_POKECENTER_NURSE
Common_CallPokecenterNurse LOCALID_SOLACEON_NURSE
End
SolaceonTownPokecenter1F_OldMan:

2
res/field/scripts/scripts_sunyshore_city_pokecenter_1f.s
View File

@@ -10,7 +10,7 @@
ScriptEntryEnd
SunyshoreCityPokecenter1F_Nurse:
Common_CallPokecenterNurse LOCALID_POKECENTER_NURSE
Common_CallPokecenterNurse LOCALID_SUNYSHORE_NURSE
End
SunyshoreCityPokecenter1F_OldMan:

2
res/field/scripts/scripts_survival_area_pokecenter_1f.s
View File

@@ -10,7 +10,7 @@
ScriptEntryEnd
SurvivalAreaPokecenter1F_Nurse:
Common_CallPokecenterNurse LOCALID_POKECENTER_NURSE
Common_CallPokecenterNurse LOCALID_SURVIVAL_AREA_NURSE
End
SurvivalAreaPokecenter1F_AceTrainerM:

36
res/field/scripts/scripts_twinleaf_town_player_house_1f.s
View File

@@ -22,9 +22,9 @@ TwinleafTownPlayerHouse1F_OnTransition:
End
TwinleafTownPlayerHouse1F_SetMomPositionForCutsceneAfterRivalBattle:
SetObjectEventPos LOCALID_MOM, 2, 4
SetObjectEventDir LOCALID_MOM, DIR_NORTH
SetObjectEventMovementType LOCALID_MOM, MOVEMENT_TYPE_LOOK_NORTH
SetObjectEventPos LOCALID_PLAYER_HOUSE_MOM, 2, 4
SetObjectEventDir LOCALID_PLAYER_HOUSE_MOM, DIR_NORTH
SetObjectEventMovementType LOCALID_PLAYER_HOUSE_MOM, MOVEMENT_TYPE_LOOK_NORTH
Return
TwinleafTownPlayerHouse1F_HideRivalsMom:
@@ -34,7 +34,7 @@ TwinleafTownPlayerHouse1F_HideRivalsMom:
TwinleafTownPlayerHouse1F_OnFrame_RivalAlreadyLeft:
LockAll
ApplyMovement LOCALID_PLAYER, TwinleafTownPlayerHouse1F_Movement_PlayerFaceMom
ApplyMovement LOCALID_MOM, TwinleafTownPlayerHouse1F_Movement_MomWalkFromCouchToPlayer
ApplyMovement LOCALID_PLAYER_HOUSE_MOM, TwinleafTownPlayerHouse1F_Movement_MomWalkFromCouchToPlayer
WaitMovement
SetFlag FLAG_TALKED_TO_MOM
BufferPlayerName 0
@@ -42,7 +42,7 @@ TwinleafTownPlayerHouse1F_OnFrame_RivalAlreadyLeft:
Message TwinleafTownPlayerHouse1F_Text_RivalAlreadyLeft
CloseMessage
WaitTime 15, VAR_RESULT
ApplyMovement LOCALID_MOM, TwinleafTownPlayerHouse1F_Movement_MomWalkFromPlayerToCouch
ApplyMovement LOCALID_PLAYER_HOUSE_MOM, TwinleafTownPlayerHouse1F_Movement_MomWalkFromPlayerToCouch
WaitMovement
SetVar VAR_PLAYER_HOUSE_STATE, 1
ReleaseAll
@@ -81,7 +81,7 @@ TwinleafTownPlayerHouse1F_OnFrame_Postgame:
GoToIfEq VAR_RESULT, FALSE, TwinleafTownPlayerHouse1F_PostgameRelease
TwinleafTownPlayerHouse1F_DoMomPostgameSequence:
ApplyMovement LOCALID_PLAYER, TwinleafTownPlayerHouse1F_Movement_PlayerFaceMomPostgame
ApplyMovement LOCALID_MOM, TwinleafTownPlayerHouse1F_Movement_MomNoticePlayer
ApplyMovement LOCALID_PLAYER_HOUSE_MOM, TwinleafTownPlayerHouse1F_Movement_MomNoticePlayer
WaitMovement
BufferPlayerName 0
BufferRivalName 1
@@ -119,7 +119,7 @@ TwinleafTownPlayerHouse1F_Movement_MomNoticePlayer:
TwinleafTownPlayerHouse1F_OnFrame_CutsceneAfterRivalBattle:
LockAll
WaitTime 30, VAR_RESULT
ApplyMovement LOCALID_MOM, TwinleafTownPlayerHouse1F_Movement_MomWalkFromKitchenToCouch
ApplyMovement LOCALID_PLAYER_HOUSE_MOM, TwinleafTownPlayerHouse1F_Movement_MomWalkFromKitchenToCouch
ApplyMovement LOCALID_PLAYER, TwinleafTownPlayerHouse1F_Movement_PlayerFollowMomToCouch
WaitMovement
WaitTime 30, VAR_RESULT
@@ -269,13 +269,13 @@ TwinleafTownPlayerHouse1F_MomGiveJournal:
End
TwinleafTownPlayerHouse1F_MotherTurnAwaySouth:
ApplyMovement LOCALID_MOM, TwinleafTownPlayerHouse1F_Movement_MotherTurnAwaySouth
ApplyMovement LOCALID_PLAYER_HOUSE_MOM, TwinleafTownPlayerHouse1F_Movement_MotherTurnAwaySouth
WaitMovement
GoTo TwinleafTownPlayerHouse1F_RivalsMomEnters
End
TwinleafTownPlayerHouse1F_MotherTurnAwayNorth:
ApplyMovement LOCALID_MOM, TwinleafTownPlayerHouse1F_Movement_MotherTurnAwayNorth
ApplyMovement LOCALID_PLAYER_HOUSE_MOM, TwinleafTownPlayerHouse1F_Movement_MotherTurnAwayNorth
WaitMovement
GoTo TwinleafTownPlayerHouse1F_RivalsMomEnters
End
@@ -290,7 +290,7 @@ TwinleafTownPlayerHouse1F_RivalsMomEnters:
ClearFlag FLAG_HIDE_TWINLEAF_TOWN_PLAYER_HOUSE_1F_RIVAL_MOM
AddObject LOCALID_RIVAL_MOM
WaitSE SEQ_SE_DP_DOOR_OPEN
ApplyMovement LOCALID_MOM, TwinleafTownPlayerHouse1F_Movement_MomNoticeRivalsMom
ApplyMovement LOCALID_PLAYER_HOUSE_MOM, TwinleafTownPlayerHouse1F_Movement_MomNoticeRivalsMom
ApplyMovement LOCALID_PLAYER, TwinleafTownPlayerHouse1F_Movement_PlayerFaceRivalsMom
WaitMovement
ApplyMovement LOCALID_RIVAL_MOM, TwinleafTownPlayerHouse1F_Movement_RivalsMomEnter
@@ -298,7 +298,7 @@ TwinleafTownPlayerHouse1F_RivalsMomEnters:
CallIfEq VAR_0x8007, DIR_NORTH, TwinleafTownPlayerHouse1F_PlayerTurnWestToRivalsMom
BufferRivalName 1
Message TwinleafTownPlayerHouse1F_Text_AskIsRivalHere
ApplyMovement LOCALID_MOM, TwinleafTownPlayerHouse1F_Movement_MomWalkOnSpotSouth
ApplyMovement LOCALID_PLAYER_HOUSE_MOM, TwinleafTownPlayerHouse1F_Movement_MomWalkOnSpotSouth
WaitMovement
Message TwinleafTownPlayerHouse1F_Text_NoHesNot
BufferRivalName 1
@@ -317,28 +317,28 @@ TwinleafTownPlayerHouse1F_PlayerTurnWestToRivalsMom:
Return
TwinleafTownPlayerHouse1F_PlayerAndMomFaceEachOtherNorth:
ApplyMovement LOCALID_MOM, TwinleafTownPlayerHouse1F_Movement_MomTurnSouthToPlayer
ApplyMovement LOCALID_PLAYER_HOUSE_MOM, TwinleafTownPlayerHouse1F_Movement_MomTurnSouthToPlayer
ApplyMovement LOCALID_PLAYER, TwinleafTownPlayerHouse1F_Movement_PlayerTurnNorthToMom
WaitMovement
GoTo TwinleafTownPlayerHouse1F_WontYouPlayer
End
TwinleafTownPlayerHouse1F_PlayerAndMomFaceEachOtherSouth:
ApplyMovement LOCALID_MOM, TwinleafTownPlayerHouse1F_Movement_MomTurnNorthToPlayer
ApplyMovement LOCALID_PLAYER_HOUSE_MOM, TwinleafTownPlayerHouse1F_Movement_MomTurnNorthToPlayer
ApplyMovement LOCALID_PLAYER, TwinleafTownPlayerHouse1F_Movement_PlayerTurnSouthToMom
WaitMovement
GoTo TwinleafTownPlayerHouse1F_WontYouPlayer
End
TwinleafTownPlayerHouse1F_PlayerAndMomFaceEachOtherWest:
ApplyMovement LOCALID_MOM, TwinleafTownPlayerHouse1F_Movement_MomTurnEastToPlayer
ApplyMovement LOCALID_PLAYER_HOUSE_MOM, TwinleafTownPlayerHouse1F_Movement_MomTurnEastToPlayer
ApplyMovement LOCALID_PLAYER, TwinleafTownPlayerHouse1F_Movement_PlayerTurnWestToMom
WaitMovement
GoTo TwinleafTownPlayerHouse1F_WontYouPlayer
End
TwinleafTownPlayerHouse1F_PlayerAndMomFaceEachOtherEast:
ApplyMovement LOCALID_MOM, TwinleafTownPlayerHouse1F_Movement_MomTurnWestToPlayer
ApplyMovement LOCALID_PLAYER_HOUSE_MOM, TwinleafTownPlayerHouse1F_Movement_MomTurnWestToPlayer
ApplyMovement LOCALID_PLAYER, TwinleafTownPlayerHouse1F_Movement_PlayerTurnEastToMom
WaitMovement
GoTo TwinleafTownPlayerHouse1F_WontYouPlayer
@@ -424,14 +424,14 @@ TwinleafTownPlayerHouse1F_RivalsMomLeaveNorth:
TwinleafTownPlayerHouse1F_RivalsMomLeaveSouth:
ApplyMovement LOCALID_RIVAL_MOM, TwinleafTownPlayerHouse1F_Movement_RivalsMomLeaveSouth
ApplyMovement LOCALID_PLAYER, TwinleafTownPlayerHouse1F_Movement_PlayerWatchRivalsMomLeaveSouth
ApplyMovement LOCALID_MOM, TwinleafTownPlayerHouse1F_Movement_MomWatchRivalsMomLeaveSouth
ApplyMovement LOCALID_PLAYER_HOUSE_MOM, TwinleafTownPlayerHouse1F_Movement_MomWatchRivalsMomLeaveSouth
WaitMovement
GoTo TwinleafTownPlayerHouse1F_RemoveRivalsMom
End
TwinleafTownPlayerHouse1F_RivalsMomLeaveWest:
ApplyMovement LOCALID_RIVAL_MOM, TwinleafTownPlayerHouse1F_Movement_RivalsMomLeaveWest
ApplyMovement LOCALID_MOM, TwinleafTownPlayerHouse1F_Movement_MomWatchRivalsMomLeaveWest
ApplyMovement LOCALID_PLAYER_HOUSE_MOM, TwinleafTownPlayerHouse1F_Movement_MomWatchRivalsMomLeaveWest
WaitMovement
GoTo TwinleafTownPlayerHouse1F_RemoveRivalsMom
End
@@ -740,7 +740,7 @@ TwinleafTownPlayerHouse1F_DontGoIntoTheTallGrassTrigger:
TwinleafTownPlayerHouse1F_PlayerAndMomFaceEachOther:
ApplyMovement LOCALID_PLAYER, TwinleafTownPlayerHouse1F_Movement_PlayerAtDoorFaceMom
ApplyMovement LOCALID_MOM, TwinleafTownPlayerHouse1F_Movement_MomFacePlayerAtDoor
ApplyMovement LOCALID_PLAYER_HOUSE_MOM, TwinleafTownPlayerHouse1F_Movement_MomFacePlayerAtDoor
WaitMovement
GoTo TwinleafTownPlayerHouse1F_DontGoIntoTheTallGrass
End

2
res/field/scripts/scripts_veilstone_city_pokecenter_1f.s
View File

@@ -9,7 +9,7 @@
ScriptEntryEnd
VeilstoneCityPokecenter1F_Nurse:
Common_CallPokecenterNurse LOCALID_POKECENTER_NURSE
Common_CallPokecenterNurse LOCALID_VEILSTONE_NURSE
End
VeilstoneCityPokecenter1F_Socialite:

186
res/text/common_strings.json
View File

@@ -89,7 +89,7 @@
]
},
{
"id": "pl_msg_00000213_00011",
"id": "CommonStrings_Text_OutOfPokemonVisionDimmed",
"en_US": [
"{STRVAR_1 3, 0, 0} is out of battle-ready\n",
"Pokémon!\r",
@@ -97,15 +97,15 @@
]
},
{
"id": "pl_msg_00000213_00012",
"id": "CommonStrings_Text_Dummy12",
"garbage": 13
},
{
"id": "pl_msg_00000213_00013",
"id": "CommonStrings_Text_WouldYouLikeToSave",
"en_US": "Would you like to save the game?"
},
{
"id": "pl_msg_00000213_00014",
"id": "CommonStrings_Text_OKToOverwriteSavedFile",
"en_US": [
"There is already a saved file.\n",
"Is it OK to overwrite it?"
@@ -123,7 +123,7 @@
"en_US": "{STRVAR_1 3, 0, 0} saved the game."
},
{
"id": "pl_msg_00000213_00017",
"id": "CommonStrings_Text_00017",
"en_US": [
"Warning!\n",
"There is already a saved game file.\r",
@@ -139,14 +139,14 @@
"en_US": "Save error."
},
{
"id": "pl_msg_00000213_00019",
"id": "CommonStrings_Text_00019",
"en_US": [
"Saving...\n",
"Don’t turn off the power."
]
},
{
"id": "pl_msg_00000213_00020",
"id": "CommonStrings_Text_ImpossibleToSave",
"en_US": [
"There is already a saved game file.\n",
"It is impossible to save.\r",
@@ -158,21 +158,21 @@
]
},
{
"id": "pl_msg_00000213_00021",
"id": "CommonStrings_Text_SavingALotOfData",
"en_US": [
"Saving a lot of data...\n",
"Don’t turn off the power."
]
},
{
"id": "pl_msg_00000213_00022",
"id": "CommonStrings_Text_00022",
"en_US": [
"Want to give a nickname to the\n",
"{STRVAR_1 0, 0, 0}?"
]
},
{
"id": "pl_msg_00000213_00023",
"id": "CommonStrings_Text_Dummy23",
"garbage": 19
},
{
@@ -208,7 +208,7 @@
]
},
{
"id": "pl_msg_00000213_00029",
"id": "CommonStrings_Text_00029",
"en_US": [
"{STRVAR_1 3, 0, 0} obtained\n",
"the {COLOR 1}{STRVAR_1 8, 1, 0}{COLOR 0}!"
@@ -229,22 +229,22 @@
]
},
{
"id": "pl_msg_00000213_00032",
"id": "CommonStrings_Text_BootedUpThePC",
"en_US": "{STRVAR_1 3, 0, 0} booted up the PC.\r"
},
{
"id": "pl_msg_00000213_00033",
"id": "CommonStrings_Text_AccessWhichPC",
"en_US": "Which PC should be accessed?"
},
{
"id": "pl_msg_00000213_00034",
"id": "CommonStrings_Text_AccessedPokemonStorage",
"en_US": [
"The Pokémon Storage System\n",
"was accessed.\r"
]
},
{
"id": "pl_msg_00000213_00035",
"id": "CommonStrings_Text_AccessedPlayersPC",
"en_US": "Accessed {STRVAR_1 3, 0, 0}’s PC.\r"
},
{
@@ -263,7 +263,7 @@
]
},
{
"id": "pl_msg_00000213_00038",
"id": "CommonStrings_Text_Dummy38",
"garbage": 21
},
{
@@ -287,7 +287,7 @@
]
},
{
"id": "CommonStrings_Text_YourPokemonAreLookingGreat_BeforePokedex",
"id": "CommonStrings_Text_PokemonLookingGreatBeforePokedex",
"en_US": [
"Mom: Oh, good! You and your\n",
"Pokémon are looking great.\r",
@@ -306,7 +306,7 @@
]
},
{
"id": "CommonStrings_Text_YourPokemonAreLookingGreat_AfterPokedex",
"id": "CommonStrings_Text_PokemonLookingGreatAfterPokedex",
"en_US": [
"Mom: Oh, good! You and your\n",
"Pokémon are looking great.\r",
@@ -346,35 +346,35 @@
]
},
{
"id": "pl_msg_00000213_00046",
"id": "CommonStrings_Text_HoneyTreeSweetScentNoHoney",
"en_US": "There is a sweet scent in the air..."
},
{
"id": "pl_msg_00000213_00047",
"id": "CommonStrings_Text_HoneyTreeSweetScent",
"en_US": "There is a sweet scent in the air...\r"
},
{
"id": "pl_msg_00000213_00048",
"id": "CommonStrings_Text_HoneyTreeSlatheredNoHoney",
"en_US": "The bark is slathered with Honey..."
},
{
"id": "pl_msg_00000213_00049",
"id": "CommonStrings_Text_HoneyTreeSlathered",
"en_US": "The bark is slathered with Honey...\r"
},
{
"id": "pl_msg_00000213_00050",
"id": "CommonStrings_Text_SlatherBarkWithHoney",
"en_US": "Slather the bark with Honey?"
},
{
"id": "pl_msg_00000213_00051",
"id": "CommonStrings_Text_BarkWasSlathered",
"en_US": "The bark was slathered with Honey."
},
{
"id": "pl_msg_00000213_00052",
"id": "CommonStrings_Text_NoMailInMailbox",
"en_US": "There’s no Mail in the Mailbox.\r"
},
{
"id": "pl_msg_00000213_00053",
"id": "CommonStrings_Text_00053",
"en_US": [
"The Mail’s content will be lost.\n",
"Take it back anyway?"
@@ -397,84 +397,84 @@
"en_US": "Landed a Pokémon!"
},
{
"id": "pl_msg_00000213_00058",
"id": "CommonStrings_Text_Dummy58",
"garbage": 39
},
{
"id": "pl_msg_00000213_00059",
"id": "CommonStrings_Text_Dummy59",
"garbage": 18
},
{
"id": "pl_msg_00000213_00060",
"id": "CommonStrings_Text_Dummy60",
"garbage": 17
},
{
"id": "pl_msg_00000213_00061",
"id": "CommonStrings_Text_Dummy61",
"garbage": 11
},
{
"id": "pl_msg_00000213_00062",
"id": "CommonStrings_Text_Dummy62",
"garbage": 76
},
{
"id": "pl_msg_00000213_00063",
"id": "CommonStrings_Text_Dummy63",
"garbage": 76
},
{
"id": "pl_msg_00000213_00064",
"id": "CommonStrings_Text_Dummy64",
"garbage": 92
},
{
"id": "pl_msg_00000213_00065",
"id": "CommonStrings_Text_Dummy65",
"garbage": 85
},
{
"id": "pl_msg_00000213_00066",
"id": "CommonStrings_Text_PokemonSurvivedThePoisoning",
"en_US": [
"{STRVAR_1 1, 0, 0} survived the poisoning.\n",
"The poison faded away!\r"
]
},
{
"id": "CommonStrings_Text_ItsAnAirVentThatExchangesTheUndergroundTunnelsAir",
"id": "CommonStrings_Text_VentThatExchangesAir",
"en_US": [
"It’s an air vent that exchanges\n",
"the underground tunnels’ air."
]
},
{
"id": "pl_msg_00000213_00068",
"id": "CommonStrings_Text_GenderSymbolMale",
"en_US": "♂"
},
{
"id": "pl_msg_00000213_00069",
"id": "CommonStrings_Text_GenderSymbolFemale",
"en_US": "♀"
},
{
"id": "pl_msg_00000213_00070",
"id": "CommonStrings_Text_SweetScentNothingHere",
"en_US": "There appears to be nothing here..."
},
{
"id": "pl_msg_00000213_00071",
"id": "CommonStrings_Text_SweetScentFaded",
"en_US": [
"The sweet scent faded for some\n",
"reason..."
]
},
{
"id": "pl_msg_00000213_00072",
"id": "CommonStrings_Text_Dummy72",
"garbage": 34
},
{
"id": "pl_msg_00000213_00073",
"id": "CommonStrings_Text_RideYourBike",
"en_US": "Ride your Bike?"
},
{
"id": "pl_msg_00000213_00074",
"id": "CommonStrings_Text_GetOffYourBike",
"en_US": "Get off your Bike?"
},
{
"id": "pl_msg_00000213_00075",
"id": "CommonStrings_Text_Dummy75",
"garbage": 20
},
{
@@ -482,30 +482,30 @@
"en_US": "Oh?"
},
{
"id": "pl_msg_00000213_00077",
"id": "CommonStrings_Text_00077",
"en_US": "{STRVAR_1 0, 0, 0} hatched from the Egg!"
},
{
"id": "pl_msg_00000213_00078",
"id": "CommonStrings_Text_00078",
"en_US": [
"Would you like to nickname the newly\n",
"hatched {STRVAR_1 0, 0, 0}?"
]
},
{
"id": "pl_msg_00000213_00079",
"id": "CommonStrings_Text_RepelsEffectWoreOff",
"en_US": "Repel’s effect wore off..."
},
{
"id": "pl_msg_00000213_00080",
"id": "CommonStrings_Text_ObtainedTheUndergroundTrap",
"en_US": "Obtained the {STRVAR_1 8, 0, 0}!"
},
{
"id": "pl_msg_00000213_00081",
"id": "CommonStrings_Text_ObtainedTheUndergroundSphere",
"en_US": "Obtained the {STRVAR_1 8, 0, 0} {STRVAR_1 51, 1, 0}!"
},
{
"id": "pl_msg_00000213_00082",
"id": "CommonStrings_Text_UndergroundOffLimits",
"en_US": [
"I’m very sorry.\r",
"We are working underground right now.\n",
@@ -514,70 +514,70 @@
]
},
{
"id": "pl_msg_00000213_00083",
"id": "CommonStrings_Text_ObtainedPoketchDigitalWatch",
"en_US": [
"The {COLOR 2}Digital Watch{COLOR 0} app displays\n",
"the current time.\r"
]
},
{
"id": "pl_msg_00000213_00084",
"id": "CommonStrings_Text_ObtainedPoketchCalculator",
"en_US": [
"The {COLOR 2}Calculator{COLOR 0} app can handle\n",
"calculations up to ten digits.\r"
]
},
{
"id": "pl_msg_00000213_00085",
"id": "CommonStrings_Text_ObtainedPoketchMemoPad",
"en_US": [
"The {COLOR 2}Memo Pad{COLOR 0} app can be used for\n",
"jotting down quick notes.\r"
]
},
{
"id": "pl_msg_00000213_00086",
"id": "CommonStrings_Text_ObtainedPoketchPedometer",
"en_US": [
"The {COLOR 2}Pedometer{COLOR 0} app counts the number\n",
"of steps you’ve walked.\r"
]
},
{
"id": "pl_msg_00000213_00087",
"id": "CommonStrings_Text_ObtainedPoketchPokemonList",
"en_US": [
"The {COLOR 2}Pokémon List{COLOR 0} app lets you\n",
"check on the status of your team.\r"
]
},
{
"id": "pl_msg_00000213_00088",
"id": "CommonStrings_Text_ObtainedPoketchFriendshipChecker",
"en_US": [
"The {COLOR 2}Friendship Checker{COLOR 0} app identifies\n",
"the Pokémon that like you."
]
},
{
"id": "pl_msg_00000213_00089",
"id": "CommonStrings_Text_ObtainedPoketchDowsingMachine",
"en_US": [
"The {COLOR 2}Dowsing Machine{COLOR 0} app locates\n",
"unseeable items.\r"
]
},
{
"id": "pl_msg_00000213_00090",
"id": "CommonStrings_Text_ObtainedPoketchBerrySearcher",
"en_US": [
"The {COLOR 2}Berry Searcher{COLOR 0} app indicates\n",
"the locations of ripe Berries."
]
},
{
"id": "pl_msg_00000213_00091",
"id": "CommonStrings_Text_ObtainedPoketchDayCareChecker",
"en_US": [
"The {COLOR 2}Day-Care Checker{COLOR 0} app shows\n",
"the Pokémon left with the Day Care."
]
},
{
"id": "pl_msg_00000213_00092",
"id": "CommonStrings_Text_ObtainedPoketchPokemonHistory",
"en_US": [
"The {COLOR 2}Pokémon History{COLOR 0} app shows\n",
"the most recently obtained Pokémon."
@@ -591,116 +591,116 @@
]
},
{
"id": "pl_msg_00000213_00094",
"id": "CommonStrings_Text_ObtainedPoketchAnalogWatch",
"en_US": [
"The {COLOR 2}Analog Watch{COLOR 0} app displays\n",
"the current time."
]
},
{
"id": "pl_msg_00000213_00095",
"id": "CommonStrings_Text_ObtainedPoketchMarkingMap",
"en_US": [
"The {COLOR 2}Marking Map{COLOR 0} app allows the\n",
"placement of markers.\r"
]
},
{
"id": "pl_msg_00000213_00096",
"id": "CommonStrings_Text_ObtainedPoketchLinkSearcher",
"en_US": [
"The {COLOR 2}Link Searcher{COLOR 0} app determines\n",
"the availability of wireless hot spots.\r"
]
},
{
"id": "pl_msg_00000213_00097",
"id": "CommonStrings_Text_ObtainedPoketchCoinToss",
"en_US": [
"The {COLOR 2}Coin Toss{COLOR 0} app can be used\n",
"to make fair decisions."
]
},
{
"id": "pl_msg_00000213_00098",
"id": "CommonStrings_Text_ObtainedPoketchMoveTester",
"en_US": [
"The {COLOR 2}Move Tester{COLOR 0} app is used to check\n",
"how moves match up.\r"
]
},
{
"id": "pl_msg_00000213_00099",
"id": "CommonStrings_Text_ObtainedPoketchCalendar",
"en_US": [
"The {COLOR 2}Calendar{COLOR 0} app is a monthly\n",
"calendar with date reminders."
]
},
{
"id": "pl_msg_00000213_00100",
"id": "CommonStrings_Text_ObtainedPoketchDotArtist",
"en_US": [
"The {COLOR 2}Dot Artist{COLOR 0} app gives players\n",
"free reign to their creativity."
]
},
{
"id": "pl_msg_00000213_00101",
"id": "CommonStrings_Text_ObtainedPoketchRoulette",
"en_US": [
"The {COLOR 2}Roulette{COLOR 0} app can be customized\n",
"to make an original roulette."
]
},
{
"id": "pl_msg_00000213_00102",
"id": "CommonStrings_Text_ObtainedPoketchTrainerCounter",
"en_US": [
"The {COLOR 2}Trainer Counter{COLOR 0} app tracks\n",
"the Pokémon Radar’s rankings.\r"
]
},
{
"id": "pl_msg_00000213_00103",
"id": "CommonStrings_Text_ObtainedPoketchKitchenTimer",
"en_US": [
"The {COLOR 2}Kitchen Timer{COLOR 0} app is a 99-minute\n",
"timer."
]
},
{
"id": "pl_msg_00000213_00104",
"id": "CommonStrings_Text_ObtainedPoketchColorChanger",
"en_US": [
"The {COLOR 2}Color Changer{COLOR 0} app can change\n",
"the Pokétch display color."
]
},
{
"id": "pl_msg_00000213_00105",
"id": "CommonStrings_Text_ObtainedPoketchMatchupChecker",
"en_US": [
"The {COLOR 2}Matchup Checker{COLOR 0} app shows the\n",
"affinity of Pokémon to each other.\r"
]
},
{
"id": "pl_msg_00000213_00106",
"id": "CommonStrings_Text_ObtainedPoketchStopwatch",
"en_US": [
"The {COLOR 2}Stopwatch{COLOR 0} app keeps precise\n",
"time.\r"
]
},
{
"id": "pl_msg_00000213_00107",
"id": "CommonStrings_Text_ObtainedPoketchAlarmClock",
"en_US": [
"The {COLOR 2}Alarm Clock{COLOR 0} app operates\n",
"on a 24-hour system.\r"
]
},
{
"id": "pl_msg_00000213_00108",
"id": "CommonStrings_Text_ObtainedUndergroundItem",
"en_US": "Obtained {STRVAR_1 25, 0, 0}."
},
{
"id": "pl_msg_00000213_00109",
"id": "CommonStrings_Text_ItemWasSentToUndergroundPC",
"en_US": [
"The {STRVAR_1 25, 0, 0} was sent to\n",
"the underground PC."
]
},
{
"id": "pl_msg_00000213_00110",
"id": "CommonStrings_Text_Engraving1PlateObtained",
"en_US": [
"There is text engraved in the back\n",
"of the obtained Plate...\r",
@@ -709,7 +709,7 @@
]
},
{
"id": "pl_msg_00000213_00111",
"id": "CommonStrings_Text_Engraving2PlatesObtained",
"en_US": [
"There is text engraved in the back\n",
"of the obtained Plate...\r",
@@ -718,7 +718,7 @@
]
},
{
"id": "pl_msg_00000213_00112",
"id": "CommonStrings_Text_Engraving3PlatesObtained",
"en_US": [
"There is text engraved in the back\n",
"of the obtained Plate...\r",
@@ -727,7 +727,7 @@
]
},
{
"id": "pl_msg_00000213_00113",
"id": "CommonStrings_Text_Engraving4PlatesObtained",
"en_US": [
"There is text engraved in the back\n",
"of the obtained Plate...\r",
@@ -736,7 +736,7 @@
]
},
{
"id": "pl_msg_00000213_00114",
"id": "CommonStrings_Text_Engraving5PlatesObtained",
"en_US": [
"There is text engraved in the back\n",
"of the obtained Plate...\r",
@@ -745,7 +745,7 @@
]
},
{
"id": "pl_msg_00000213_00115",
"id": "CommonStrings_Text_Engraving6PlatesObtained",
"en_US": [
"There is text engraved in the back\n",
"of the obtained Plate...\r",
@@ -754,7 +754,7 @@
]
},
{
"id": "pl_msg_00000213_00116",
"id": "CommonStrings_Text_Engraving7PlatesObtained",
"en_US": [
"There is text engraved in the back\n",
"of the obtained Plate...\r",
@@ -763,7 +763,7 @@
]
},
{
"id": "pl_msg_00000213_00117",
"id": "CommonStrings_Text_Engraving8PlatesObtained",
"en_US": [
"There is text engraved in the back\n",
"of the obtained Plate...\r",
@@ -772,14 +772,14 @@
]
},
{
"id": "pl_msg_00000213_00118",
"id": "CommonStrings_Text_NoSeals",
"en_US": [
"Ball Capsules can’t be used because\n",
"you don’t have any Seals.\r"
]
},
{
"id": "pl_msg_00000213_00119",
"id": "CommonStrings_Text_00119",
"en_US": [
"Saving the game again...\n",
"Don’t turn off the power."
@@ -806,7 +806,7 @@
]
},
{
"id": "pl_msg_00000213_00122",
"id": "CommonStrings_Text_AskBlowIntoAzureFlute",
"en_US": [
"{STRVAR_1 3, 0, 0}’s Azure Flute is making\n",
"a sound!\r",
@@ -815,15 +815,15 @@
]
},
{
"id": "pl_msg_00000213_00123",
"id": "CommonStrings_Text_PlayerBlewAzureFlute",
"en_US": "{STRVAR_1 3, 0, 0} blew the Azure Flute.\r"
},
{
"id": "pl_msg_00000213_00124",
"id": "CommonStrings_Text_GlowingStairwayAppeared",
"en_US": "A glowing stairway appeared!"
},
{
"id": "pl_msg_00000213_00125",
"id": "CommonStrings_Text_MeaninglessUsingAzureFlute",
"en_US": [
"The Azure Flute echoed hollowly...\r",
"It appears to be meaningless using\n",
@@ -845,14 +845,14 @@
]
},
{
"id": "pl_msg_00000213_00128",
"id": "CommonStrings_Text_ItemWasSentToUndergroundPC_ArrowPrompt",
"en_US": [
"The {STRVAR_1 25, 0, 0} was sent to\n",
"the underground PC.\r"
]
},
{
"id": "pl_msg_00000213_00129",
"id": "CommonStrings_Text_CheckShardsNeededForMove",
"en_US": [
"Check the move you want taught to\n",
"see what Shards are needed."
@@ -867,7 +867,7 @@
]
},
{
"id": "pl_msg_00000213_00131",
"id": "CommonStrings_Text_HallOfFameDataCorrupted",
"en_US": [
"Your Hall of Fame data is corrupted.\r",
"It will be fixed if you enter the\n",

50
res/text/menu_entries.json
View File

@@ -234,127 +234,127 @@
"garbage": 1
},
{
"id": "pl_msg_00000361_00058",
"id": "MenuEntries_Text_PC_SomeonesPC",
"en_US": "SOMEONE’S PC"
},
{
"id": "pl_msg_00000361_00059",
"id": "MenuEntries_Text_PC_BebesPC",
"en_US": "BEBE’S PC"
},
{
"id": "pl_msg_00000361_00060",
"id": "MenuEntries_Text_PC_PlayersPC",
"en_US": "{STRVAR_1 3, 0, 0}’s PC"
},
{
"id": "pl_msg_00000361_00061",
"id": "MenuEntries_Text_PC_HallOfFame",
"en_US": "HALL OF FAME"
},
{
"id": "pl_msg_00000361_00062",
"id": "MenuEntries_Text_PC_OaksPC",
"en_US": "OAK’S PC"
},
{
"id": "pl_msg_00000361_00063",
"id": "MenuEntries_Text_PC_RowansPC",
"en_US": "ROWAN’S PC"
},
{
"id": "pl_msg_00000361_00064",
"id": "MenuEntries_Text_PC_SwitchOff",
"en_US": "SWITCH OFF"
},
{
"id": "MenuEntries_Text_PokemonStorageDepositPokemon",
"id": "MenuEntries_Text_PC_DepositPokemon",
"en_US": "DEPOSIT POKéMON"
},
{
"id": "MenuEntries_Text_PokemonStorageWithdrawPokemon",
"id": "MenuEntries_Text_PC_WithdrawPokemon",
"en_US": "WITHDRAW POKéMON"
},
{
"id": "MenuEntries_Text_PokemonStorageMovePokemon",
"id": "MenuEntries_Text_PC_MovePokemon",
"en_US": "MOVE POKéMON"
},
{
"id": "MenuEntries_Text_PokemonStorageMoveItems",
"id": "MenuEntries_Text_PC_MoveItems",
"en_US": "MOVE ITEMS"
},
{
"id": "MenuEntries_Text_PokemonStorageComparePokemon",
"id": "MenuEntries_Text_PC_ComparePokemon",
"en_US": "COMPARE POKéMON"
},
{
"id": "MenuEntries_Text_PokemonStorageSeeYa",
"id": "MenuEntries_Text_PC_SeeYa",
"en_US": "SEE YA!"
},
{
"id": "pl_msg_00000361_00071",
"id": "MenuEntries_Text_PC_Mailbox",
"en_US": "MAILBOX"
},
{
"id": "pl_msg_00000361_00072",
"id": "MenuEntries_Text_PC_BallCapsules",
"en_US": "BALL CAPSULES"
},
{
"id": "pl_msg_00000361_00073",
"id": "MenuEntries_Text_PC_LogOut",
"en_US": "LOG OUT"
},
{
"id": "MenuEntries_Text_PokemonStorageDepositPokemonDescription",
"id": "MenuEntries_Text_PC_DescriptionDepositPokemon",
"en_US": [
"Pokémon in your party may be stored\n",
"in the storage system’s Boxes."
]
},
{
"id": "MenuEntries_Text_PokemonStorageWithdrawPokemonDescription",
"id": "MenuEntries_Text_PC_DescriptionWithdrawPokemon",
"en_US": [
"Pokémon stored in Boxes may be added\n",
"to your party."
]
},
{
"id": "MenuEntries_Text_PokemonStorageMovePokemonDescription",
"id": "MenuEntries_Text_PC_DescriptionMovePokemon",
"en_US": [
"You may sort the Pokémon in Boxes\n",
"and in your party."
]
},
{
"id": "MenuEntries_Text_PokemonStorageMoveItemsDescription",
"id": "MenuEntries_Text_PC_DescriptionMoveItems",
"en_US": [
"You may sort the items held by your\n",
"Pokémon in Boxes and in your party."
]
},
{
"id": "MenuEntries_Text_PokemonStorageComparePokemonDescription",
"id": "MenuEntries_Text_PC_DescriptionComparePokemon",
"en_US": [
"You may compare two Pokémon in Boxes\n",
"or your party side by side."
]
},
{
"id": "MenuEntries_Text_PokemonStorageSeeYaDescription",
"id": "MenuEntries_Text_PC_DescriptionSeeYa",
"en_US": [
"Log out of the Pokémon Storage\n",
"System."
]
},
{
"id": "pl_msg_00000361_00080",
"id": "MenuEntries_Text_PC_DescriptionMailBox",
"en_US": [
"Up to 20 pieces of Mail can be\n",
"stored."
]
},
{
"id": "pl_msg_00000361_00081",
"id": "MenuEntries_Text_PC_DescriptionBallCapsules",
"en_US": [
"You may set or edit capsules for\n",
"decorating Poké Balls."
]
},
{
"id": "pl_msg_00000361_00082",
"id": "MenuEntries_Text_PC_DescriptionLogOut",
"en_US": "Log out of your PC."
},
{

2
src/game_records.c
View File

@@ -204,7 +204,7 @@ static u8 sUsesHighLimit[MAX_RECORDS] = {
[RECORD_TIMES_SIGNED_TRAINER_CARD] = FALSE,
[RECORD_POKEMON_RECEIVED_FROM_FOSSIL_REVIVAL] = FALSE,
[RECORD_CHECKED_FOOTPRINTS] = FALSE,
[RECORD_UNK_117] = FALSE,
[RECORD_HONEY_TREE_POKEMON_ENCOUNTERED] = FALSE,
[RECORD_UNK_118] = FALSE,
[RECORD_UNK_119] = FALSE,
[RECORD_UNK_120] = FALSE,

10
src/overlay005/scrcmd_move_tutor.c
View File

@@ -313,7 +313,7 @@ BOOL ScrCmd_ShowMoveTutorMoveSelectionMenu(ScriptContext *scriptContext)
scriptContext->data[0] = selectedOptionVar;
if (partySlot != 0xff) {
if (partySlot != PARTY_SLOT_NONE) {
mon = Party_GetPokemonBySlotIndex(SaveData_GetParty(scriptContext->fieldSystem->saveData), partySlot);
}
@@ -326,7 +326,7 @@ BOOL ScrCmd_ShowMoveTutorMoveSelectionMenu(ScriptContext *scriptContext)
int learnableMovesCount = 0;
if (partySlot != 0xff) {
if (partySlot != PARTY_SLOT_NONE) {
for (knownMoveIndex = 0; knownMoveIndex < LEARNED_MOVES_MAX; knownMoveIndex++) {
knownMoves[knownMoveIndex] = Pokemon_GetValue(mon, (MON_DATA_MOVE1 + knownMoveIndex), NULL);
}
@@ -337,7 +337,7 @@ BOOL ScrCmd_ShowMoveTutorMoveSelectionMenu(ScriptContext *scriptContext)
for (int j = 0; j < 8; j++) {
canLearn = ((movesetMaskByte >> j) & 0x1);
if ((canLearn == TRUE) && (location == sTeachableMoves[i * 8 + j].location)) {
if (canLearn == TRUE && location == sTeachableMoves[i * 8 + j].location) {
for (knownMoveIndex = 0; knownMoveIndex < LEARNED_MOVES_MAX; knownMoveIndex++) {
if (knownMoves[knownMoveIndex] == sTeachableMoves[i * 8 + j].moveID) {
break;
@@ -361,13 +361,13 @@ BOOL ScrCmd_ShowMoveTutorMoveSelectionMenu(ScriptContext *scriptContext)
}
for (int i = 0; i < learnableMovesCount; i++) {
MoveTutorManager_AddMenuEntry(moveTutorManager, learnableMoves[i], 0xff, learnableMoves[i]);
MoveTutorManager_AddMenuEntry(moveTutorManager, learnableMoves[i], 0xFF, learnableMoves[i]);
}
miscMessageLoader = MessageLoader_Init(MSG_LOADER_LOAD_ON_DEMAND, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_MENU_ENTRIES, HEAP_ID_FIELD3);
MoveTutorManager_SetMessageLoader(moveTutorManager, miscMessageLoader);
MoveTutorManager_AddMenuEntry(moveTutorManager, MenuEntries_Text_Exit, 0xff, (u16)MENU_CANCEL); // cast required to match
MoveTutorManager_AddMenuEntry(moveTutorManager, MenuEntries_Text_Exit, 0xFF, (u16)MENU_CANCEL); // cast required to match
MessageLoader_Free(miscMessageLoader);
MoveTutorManager_SetMessageLoader(moveTutorManager, moveNamesLoader);

34
src/scrcmd.c
View File

@@ -389,8 +389,8 @@ static BOOL ScrCmd_OpenUnionRoomTrainerCase(ScriptContext *ctx);
static BOOL ScrCmd_0AE(ScriptContext *ctx);
static BOOL ScrCmd_0AF(ScriptContext *ctx);
static BOOL ScrCmd_ClearGame(ScriptContext *ctx);
static BOOL ScrCmd_0B1(ScriptContext *ctx);
static BOOL ScrCmd_336(ScriptContext *ctx);
static BOOL ScrCmd_OpenPCHallOfFameScreen(ScriptContext *ctx);
static BOOL ScrCmd_CheckIsHallOfFameCorrupted(ScriptContext *ctx);
static BOOL ScrCmd_TryStartGTSApp(ScriptContext *ctx);
static BOOL ScrCmd_0B3(ScriptContext *ctx);
static BOOL ScrCmd_StartChooseStarterScene(ScriptContext *ctx);
@@ -445,7 +445,7 @@ static BOOL ScrCmd_StartCatchingTutorial(ScriptContext *ctx);
static BOOL ScrCmd_SlatherHoneyTree(ScriptContext *ctx);
static BOOL ScrCmd_GetHoneyTreeStatus(ScriptContext *ctx);
static BOOL ScrCmd_StartHoneyTreeBattle(ScriptContext *ctx);
static BOOL ScrCmd_12A(ScriptContext *ctx);
static BOOL ScrCmd_StopHoneyTreeShaking(ScriptContext *ctx);
static BOOL ScrCmd_StartSignatureApp(ScriptContext *ctx);
static BOOL ScrCmd_CheckSaveType(ScriptContext *ctx);
static BOOL ScrCmd_TrySaveGame(ScriptContext *ctx);
@@ -683,7 +683,7 @@ static BOOL ScrCmd_2A3(ScriptContext *ctx);
static BOOL ScrCmd_2A4(ScriptContext *ctx);
static BOOL ScrCmd_CheckItemIsPlate(ScriptContext *ctx);
static BOOL ScrCmd_CheckIsMysteryGiftPhrase(ScriptContext *ctx);
static BOOL ScrCmd_2AB(ScriptContext *ctx);
static BOOL ScrCmd_CountUniqueSealsInSealCase(ScriptContext *ctx);
static BOOL ScrCmd_UnlockMysteryGift(ScriptContext *ctx);
static BOOL ScrCmd_GetTrainerCasePlayerMessage(ScriptContext *ctx);
static BOOL ScrCmd_2B0(ScriptContext *ctx);
@@ -2539,7 +2539,7 @@ static BOOL ScrCmd_Unused_06E(ScriptContext *ctx)
return FALSE;
}
static BOOL ScrCmd_2AB(ScriptContext *ctx)
static BOOL ScrCmd_CountUniqueSealsInSealCase(ScriptContext *ctx)
{
u16 *destVar = ScriptContext_GetVarPointer(ctx);
@@ -3340,28 +3340,28 @@ static BOOL ScrCmd_ClearGame(ScriptContext *ctx)
return TRUE;
}
static BOOL ScrCmd_0B1(ScriptContext *ctx)
static BOOL ScrCmd_OpenPCHallOfFameScreen(ScriptContext *ctx)
{
void **v0 = FieldSystem_GetScriptMemberPtr(ctx->fieldSystem, SCRIPT_MANAGER_PARTY_MANAGEMENT_DATA);
void **data = FieldSystem_GetScriptMemberPtr(ctx->fieldSystem, SCRIPT_MANAGER_PARTY_MANAGEMENT_DATA);
*v0 = FieldTask_OpenPCHallOfFameScreen(ctx->fieldSystem);
*data = FieldTask_OpenPCHallOfFameScreen(ctx->fieldSystem);
ScriptContext_Pause(ctx, sub_02041CC8);
return TRUE;
}
static BOOL ScrCmd_336(ScriptContext *ctx)
static BOOL ScrCmd_CheckIsHallOfFameCorrupted(ScriptContext *ctx)
{
int v1;
HallOfFame *v2 = SaveData_HallOfFame(ctx->fieldSystem->saveData, HEAP_ID_FIELD1, &v1);
u16 *v0 = ScriptContext_GetVarPointer(ctx);
*v0 = 0;
int resultCode;
HallOfFame *hallOfFame = SaveData_HallOfFame(ctx->fieldSystem->saveData, HEAP_ID_FIELD1, &resultCode);
u16 *destVar = ScriptContext_GetVarPointer(ctx);
*destVar = FALSE;
if (v1 == 2) {
*v0 = 1;
if (resultCode == LOAD_RESULT_CORRUPT) {
*destVar = TRUE;
}
Heap_Free(v2);
Heap_Free(hallOfFame);
return FALSE;
}
@@ -4078,7 +4078,7 @@ static BOOL ScrCmd_StartHoneyTreeBattle(ScriptContext *ctx)
return TRUE;
}
static BOOL ScrCmd_12A(ScriptContext *ctx)
static BOOL ScrCmd_StopHoneyTreeShaking(ScriptContext *ctx)
{
FieldSystem *fieldSystem = ctx->fieldSystem;

2
src/scrcmd_tv_broadcast.c
View File

@@ -120,7 +120,7 @@ BOOL ScrCmd_2B8(ScriptContext *param0)
return FALSE;
}
BOOL ScrCmd_30B(ScriptContext *param0)
BOOL ScrCmd_SaveTVSegmentPokemonStorageBulletin(ScriptContext *param0)
{
FieldSystem_SaveTVSegment_PokemonStorageSpecialNewsBulletin(param0->fieldSystem);
return FALSE;

4
src/string_template.c
View File

@@ -407,11 +407,11 @@ void StringTemplate_SetGenderMarker(StringTemplate *template, u32 idx, enum Gend
switch (gender) {
case GENDER_MALE:
MessageLoader_GetString(loader, pl_msg_00000213_00068, template->templateBuf);
MessageLoader_GetString(loader, CommonStrings_Text_GenderSymbolMale, template->templateBuf);
break;
case GENDER_FEMALE:
MessageLoader_GetString(loader, pl_msg_00000213_00069, template->templateBuf);
MessageLoader_GetString(loader, CommonStrings_Text_GenderSymbolFemale, template->templateBuf);
break;
default: