Leahnaya/pokeplatinum
1
0
Fork 0
mirror of https://github.com/pret/pokeplatinum.git synced 2026-04-27 00:57:12 -05:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Compare commits

base: Leahnaya:554cedae4d5b7b7d4e25026570198d5686749907
Branches Tags
Leahnaya:main
Leahnaya:xmap
Leahnaya:revert-621-pret/pr/sinjoh/heapSyncFull
Leahnaya:metroskrew
...
compare: Leahnaya:f49a2cda224333fafa1fa174f44d0361696ab885
Branches Tags
Leahnaya:main
Leahnaya:xmap
Leahnaya:revert-621-pret/pr/sinjoh/heapSyncFull
Leahnaya:metroskrew

4 Commits
554cedae4d ... f49a2cda22

Author SHA1 Message Date
Rachel
f49a2cda22
Merge ba6c8fca17 into 2c06aacabb 2026-03-21 18:31:43 -04:00
Kalaay
2c06aacabb
Rename WaitABXPadPress to WaitButton to reflect generic usage (#1023)
Some checks are pending
build / build (push) Waiting to run
Details
2026-03-21 10:59:17 -07:00
Alexandre Sollier
a2de4c1f85
Document distortion world 1F/B1F events (#1012) 
Signed-off-by: Kuruyia <github@kuruyia.net>
 2026-03-21 10:54:24 -07:00
Viperio
b23ff4f8ae
Document battle_main.c (#1016) 2026-03-21 09:08:26 -07:00
288 changed files with 3574 additions and 3617 deletions
Show Stats Expand all files Collapse all files

14
asm/macros/scrcmd.inc
View File

@ -348,10 +348,12 @@
// This also sets the player's direction appropriately when a pad
// button is pressed, unlike the WaitABPadPress command.
.macro WaitABXPadPress
.short SCRCMD_WAITABXPADPRESS
.macro WaitButton
.short SCRCMD_WAITBUTTON
.endm
// As opposed to WaitButton, this does not do a turn frame,
// i.e. it does not set the player's direction if a pad button is pressed.
.macro WaitABPadPress
.short SCRCMD_WAITABPADPRESS
.endm
@ -5183,7 +5185,7 @@
LockAll
FacePlayer
Message \messageID
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
.endm
@ -5192,7 +5194,7 @@
PlayFanfare SEQ_SE_CONFIRM
LockAll
Message \messageID
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
.endm
@ -5205,10 +5207,10 @@
PlayCry \species, \unused
Message \messageID
WaitCry
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
.endm
.endm
.macro PokeMartCommonWithGreeting unused=1
PlayFanfare SEQ_SE_CONFIRM

9
include/battle/battle_io_command.h
View File

@ -4,11 +4,14 @@
#include "struct_decls/battle_system.h"
#include "struct_defs/battler_data.h"
#include "battle/struct_ov16_0223C2C0.h"
typedef struct BattlerInitData {
u8 battler;
u8 battlerType;
} BattlerInitData;
BattlerData *ov16_0225BFFC(BattleSystem *battleSys, UnkStruct_ov16_0223C2C0 *param1);
BattlerData *BattlerData_New(BattleSystem *battleSys, BattlerInitData *battlerInitData);
void ov16_0225C038(BattleSystem *battleSys, BattlerData *battlerData, int ballID, int param3);
void ov16_0225C0DC(BattleSystem *battleSys, BattlerData *battlerData);
void BattleSystem_ExecuteBattlerCommand(BattleSystem *battleSys, BattlerData *battlerData);
void ov16_0225C104(BattleSystem *battleSys, BattlerData *battlerData, int param2);
#endif // POKEPLATINUM_BATTLE_BATTLE_IO_COMMAND_H

10
include/battle/ov16_0223B140.h → include/battle/battle_main.h
View File

@ -1,16 +1,16 @@
#ifndef POKEPLATINUM_OV16_0223B140_H
#define POKEPLATINUM_OV16_0223B140_H
#ifndef POKEPLATINUM_BATTLE_MAIN_H
#define POKEPLATINUM_BATTLE_MAIN_H
#include "struct_decls/battle_system.h"
#include "overlay_manager.h"
BOOL Battle_Main(ApplicationManager *appMan, int *param1);
BOOL Battle_Main(ApplicationManager *appMan, int *state);
void ov16_0223B384(BattleSystem *battleSys);
void ov16_0223B3E4(BattleSystem *battleSys);
void ov16_0223B430(BattleSystem *battleSys);
void ov16_0223B53C(BattleSystem *battleSys);
void ov16_0223B578(BattleSystem *battleSys);
void BattleSystem_LoadFightOverlay(BattleSystem *battleSys, int param1);
void BattleSystem_LoadFightOverlay(BattleSystem *battleSys, int flags);
#endif // POKEPLATINUM_OV16_0223B140_H
#endif // POKEPLATINUM_BATTLE_MAIN_H

9
include/battle/struct_ov16_0223C2C0.h
View File

@ -1,9 +0,0 @@
#ifndef POKEPLATINUM_STRUCT_OV16_0223C2C0_H
#define POKEPLATINUM_STRUCT_OV16_0223C2C0_H
typedef struct {
u8 unk_00;
u8 unk_01;
} UnkStruct_ov16_0223C2C0;
#endif // POKEPLATINUM_STRUCT_OV16_0223C2C0_H

2
include/data/field/script_commands.h
View File

@ -73,7 +73,7 @@ const ScrCmdFunc gFieldScriptCommands[] = {
ScriptCommandTableEntry(SCRCMD_MESSAGENOSKIP, ScrCmd_MessageNoSkip)
ScriptCommandTableEntry(SCRCMD_MESSAGESYNCHRONIZED, ScrCmd_MessageSynchronized)
ScriptCommandTableEntry(SCRCMD_WAITABPRESS, ScrCmd_WaitABPress)
ScriptCommandTableEntry(SCRCMD_WAITABXPADPRESS, ScrCmd_WaitABXPadPress)
ScriptCommandTableEntry(SCRCMD_WAITBUTTON, ScrCmd_WaitButton)
ScriptCommandTableEntry(SCRCMD_WAITABPADPRESS, ScrCmd_WaitABPadPress)
ScriptCommandTableEntry(SCRCMD_OPENMESSAGE, ScrCmd_OpenMessage)
ScriptCommandTableEntry(SCRCMD_CLOSEMESSAGE, ScrCmd_CloseMessage)

6
include/struct_defs/battle_system.h
View File

@ -47,9 +47,9 @@ struct BattleSystem {
MessageLoader *attackMsgLoader;
StringTemplate *strFormatter;
String *msgBuffer;
SysTask *task_1C;
SysTask *task_20;
SysTask *task_24;
SysTask *taskDrawSprites;
SysTask *taskUpdateRedHPSound;
SysTask *taskFlyInMessageBox;
PaletteData *paletteData;
u32 battleType;
BattleContext *battleCtx;

2
platinum.us/main.lsf
View File

@ -684,7 +684,7 @@ Overlay dummy4
Overlay battle
{
After battle_anim
Object main.nef.p/src_battle_ov16_0223B140.c.o
Object main.nef.p/src_battle_battle_main.c.o
Object main.nef.p/src_battle_battle_system.c.o
Object main.nef.p/src_battle_battle_script.c.o
Object main.nef.p/src_battle_battle_controller_player.c.o

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

@ -43,7 +43,7 @@ AcuityCavern_Uxie:
AcuityCavern_UxieDisappeared:
Message AcuityCavern_Text_UxieDisappeared
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End

10
res/field/scripts/scripts_amity_square.s
View File

@ -470,7 +470,7 @@ AmitySquare_FollowerMon_SeemsToBeEnjoyingTheWalk:
AmitySquare_FollowerMon_End:
WaitCry
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End
@ -584,7 +584,7 @@ AmitySquare_YouMaySpendAllTheTimeYouLikeInAmitySquare:
Return
AmitySquare_WestReceptionist_End:
WaitABXPadPress
WaitButton
CloseMessage
ApplyMovement 0, _08C8
WaitMovement
@ -592,7 +592,7 @@ AmitySquare_WestReceptionist_End:
End
AmitySquare_EastReceptionist_End:
WaitABXPadPress
WaitButton
CloseMessage
ApplyMovement 1, _08D0
WaitMovement
@ -951,7 +951,7 @@ AmitySquare_GiftMan_AccessoryGift:
AmitySquare_GiftMan_DeclinedGift:
Message AmitySquare_Text_OhItsNoProblemToMe
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End
@ -970,7 +970,7 @@ AmitySquare_GiftMan_CannotFitItem:
AmitySquare_GiftMan_ReceivedGift:
SetFlag FLAG_AMITY_SQUARE_MAN_GIFT_RECEIVED
Message AmitySquare_Text_HahahahPerhapsIllSeeYouAgainTomorrow
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End

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

@ -83,7 +83,7 @@ _0145:
_014D:
SetVar VAR_UNK_0x40BF, 0
Message 6
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End

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

@ -80,7 +80,7 @@ _0139:
_0141:
SetVar VAR_UNK_0x40BC, 0
Message 6
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End

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

@ -80,7 +80,7 @@ _0139:
_0141:
SetVar VAR_UNK_0x40B7, 0
Message 6
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End

14
res/field/scripts/scripts_battle_frontier_gate_to_fight_area.s
View File

@ -37,7 +37,7 @@ _0038:
Message 3
Call _0095
Message 10
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End
@ -71,7 +71,7 @@ _0095:
_0103:
Message 10
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End
@ -127,7 +127,7 @@ _018A:
End
_0195:
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End
@ -153,7 +153,7 @@ _01D3:
End
_01DE:
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End
@ -179,7 +179,7 @@ _021C:
End
_0227:
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End
@ -205,7 +205,7 @@ _0265:
End
_0270:
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End
@ -231,7 +231,7 @@ _02AE:
End
_02B9:
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End

10
res/field/scripts/scripts_battle_hall.s
View File

@ -214,7 +214,7 @@ BattleHall_EndChallenge:
_0355:
SetVar VAR_BATTLE_HALL_LOBBY_LOAD_ACTION, 0
Message BattleHall_Text_HopeToSeeYouAgain
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End
@ -717,7 +717,7 @@ BattleHall_RecordKeeperIntro:
End
BattleHall_RecordKeeperEnd:
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End
@ -793,7 +793,7 @@ BattleHall_Winston1Species:
End
BattleHall_WinstonEnd:
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End
@ -869,7 +869,7 @@ BattleHall_Serena1Species:
End
BattleHall_SerenaEnd:
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End
@ -913,7 +913,7 @@ BattleHall_Jasmine:
End
BattleHall_MajorNPCEnd:
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End

4
res/field/scripts/scripts_battle_park_exchange_service_corner.s
View File

@ -67,7 +67,7 @@ BattleParkExchangeServiceCorner_Unused2:
BattleParkExchangeServiceCorner_Unused3:
Message 6
WaitABXPadPress
WaitButton
CloseMessage
HideBattlePoints
ReleaseAll
@ -133,7 +133,7 @@ _01F1:
LockAll
Message 11
Message 12
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End

16
res/field/scripts/scripts_battle_tower.s
View File

@ -228,7 +228,7 @@ _0360:
CallBattleTowerFunction BT_FUNC_CHECK_ENOUGH_VALID_POKEMON, 0, VAR_RESULT
GoToIfEq VAR_RESULT, 1, BattleTower_SelectAndValidatePokemon
MessageSeenBanlistSpecies BattleTower_Text_NotEnoughEligiblePokemon, 3
GoTo BattleTower_WaitABXPadPress
GoTo BattleTower_WaitButton
End
BattleTower_InitDoubleBattleRoomChallenge:
@ -236,7 +236,7 @@ BattleTower_InitDoubleBattleRoomChallenge:
CallBattleTowerFunction BT_FUNC_CHECK_ENOUGH_VALID_POKEMON, 0, VAR_RESULT
GoToIfEq VAR_RESULT, 1, BattleTower_SelectAndValidatePokemon
MessageSeenBanlistSpecies BattleTower_Text_NotEnoughEligiblePokemon, 4
GoTo BattleTower_WaitABXPadPress
GoTo BattleTower_WaitButton
End
BattleTower_SelectAndValidatePokemon:
@ -455,8 +455,8 @@ BattleTower_ClearCommunicationAndClose:
Call BattleTower_ClearCommunication
BattleTower_WeHopeToSeeYouAgain:
Message BattleTower_Text_WeHopeToSeeYouAgain
BattleTower_WaitABXPadPress:
WaitABXPadPress
BattleTower_WaitButton:
WaitButton
BattleTower_Close:
CloseMessage
Call _07B5
@ -681,7 +681,7 @@ BattleTower_StartMultiBattleRoomChallenge:
CallBattleTowerFunction BT_FUNC_CHECK_ENOUGH_VALID_POKEMON, 2, VAR_RESULT
GoToIfEq VAR_RESULT, 1, BattleTower_AskCommunicateWithFriend
MessageSeenBanlistSpecies BattleTower_Text_NotEnoughEligiblePokemon, 2
GoTo BattleTower_WaitABXPadPress
GoTo BattleTower_WaitButton
End
BattleTower_AskCommunicateWithFriend:
@ -1152,7 +1152,7 @@ _12CE:
_12F9:
Message BattleTower_Text_NoDataYet
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End
@ -1304,14 +1304,14 @@ BattleTower_PerfectHighestIVValue:
End
BattleTower_JudgeEnd:
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End
BattleTower_CancelJudge:
Message BattleTower_Text_OhYouDontNeedMeToJudge
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End

10
res/field/scripts/scripts_battle_tower_battle_salon.s
View File

@ -167,7 +167,7 @@ BattleTowerBattleSalon_Cheryl:
GoToIfEq VAR_RESULT, MENU_YES, BattleTowerBattleSalon_CherylTeamUp
BattleTowerBattleSalon_CherylDontTeamUp:
Message BattleTowerBattleSalon_Text_CherylDontTeamUp
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End
@ -195,7 +195,7 @@ BattleTowerBattleSalon_Mira:
GoToIfEq VAR_RESULT, MENU_YES, BattleTowerBattleSalon_MiraTeamUp
BattleTowerBattleSalon_MiraDontTeamUp:
Message BattleTowerBattleSalon_Text_MiraDontTeamUp
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End
@ -223,7 +223,7 @@ BattleTowerBattleSalon_Riley:
GoToIfEq VAR_RESULT, MENU_YES, BattleTowerBattleSalon_RileyTeamUp
BattleTowerBattleSalon_RileyDontTeamUp:
Message BattleTowerBattleSalon_Text_RileyDontTeamUp
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End
@ -250,7 +250,7 @@ BattleTowerBattleSalon_Marley:
GoToIfEq VAR_RESULT, MENU_YES, BattleTowerBattleSalon_MarleyTeamUp
BattleTowerBattleSalon_MarleyDontTeamUp:
Message BattleTowerBattleSalon_Text_MarleyDontTeamUp
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End
@ -277,7 +277,7 @@ BattleTowerBattleSalon_Buck:
GoToIfEq VAR_RESULT, MENU_YES, BattleTowerBattleSalon_BuckTeamUp
BattleTowerBattleSalon_BuckDontTeamUp:
Message BattleTowerBattleSalon_Text_BuckDontTeamUp
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End

10
res/field/scripts/scripts_battleground.s
View File

@ -90,14 +90,14 @@ _015A:
FacePlayer
GoToIfSet FLAG_UNK_0x00D7, _0178
Message 1
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End
_0178:
Message 2
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End
@ -189,7 +189,7 @@ _0278:
ApplyMovement LOCALID_PLAYER, _02A8
WaitMovement
Message 0
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End
@ -250,7 +250,7 @@ _0376:
Return
_037E:
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End
@ -396,7 +396,7 @@ _0605:
Return
_06B0:
SetVar VAR_MAP_LOCAL_5, TRAINER_LEADER_ROARK_REMATCH
SetVar VAR_MAP_LOCAL_5, TRAINER_LEADER_ROARK_REMATCH
Return
_06B8:

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

@ -980,7 +980,7 @@ _0F5B:
OpenMessage
GetTrainerMessageTypes VAR_0x8000, VAR_0x8001, VAR_0x8002
PrintTrainerDialogue VAR_0x8004, VAR_0x8001
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End

28
res/field/scripts/scripts_berry_tree_interaction.s
View File

@ -39,7 +39,7 @@ BerryTree_PlantedStateNoWater:
BufferItemNameWithArticle 0, VAR_0x8000
CapitalizeFirstLetter 0
Message BerryTrees_Text_BerryWasPlantedHereAfterHarvest
WaitABXPadPress
WaitButton
GoTo BerryTree_CloseAndEnd
BerryTree_SproutedState:
@ -52,7 +52,7 @@ BerryTree_SproutedState:
BerryTree_SproutedStateNoWater:
BufferBerryName 0, VAR_0x8000
Message BerryTrees_Text_BerryPlantHasSproutedAfterHarvest
WaitABXPadPress
WaitButton
GoTo BerryTree_CloseAndEnd
BerryTree_GrowingState:
@ -65,7 +65,7 @@ BerryTree_GrowingState:
BerryTree_GrowingStateNoWater:
BufferBerryName 0, VAR_0x8000
Message BerryTrees_Text_BerryPlantIsGrowingBiggerAfterHarvest
WaitABXPadPress
WaitButton
GoTo BerryTree_CloseAndEnd
BerryTree_BloomingState:
@ -78,7 +78,7 @@ BerryTree_BloomingState:
BerryTree_BloomingStateNoWater:
BufferBerryName 0, VAR_0x8000
Message BerryTrees_Text_BerryPlantIsInBloomAfterHarvest
WaitABXPadPress
WaitButton
GoTo BerryTree_CloseAndEnd
BerryTree_CheckPlayerHasSprayduck:
@ -116,7 +116,7 @@ BerryTree_OfferWatering:
CloseMessage
SetBerryWateringState BERRY_WATERING_START
Message BerryTrees_Text_ThereAllHappy
WaitABXPadPress
WaitButton
SetBerryWateringState BERRY_WATERING_END
GoTo BerryTree_CloseAndEnd
@ -158,7 +158,7 @@ BerryTree_ShowBerriesStoredMessage:
GetItemPocket VAR_0x8000, VAR_RESULT
BufferPocketName 3, VAR_RESULT
Message BerryTrees_Text_PlayerPutAwayBerriesInBagPocket
WaitABXPadPress
WaitButton
GoTo BerryTree_CloseAndEnd
BerryTree_CheckBagSpace:
@ -170,7 +170,7 @@ BerryTree_ShowMultipleBerriesBagFullMessage:
BufferItemNamePlural 0, VAR_0x8000
BerryTree_ShowBagFullMessage:
Message BerryTrees_Text_BagIsFullBerriesCouldntBeTaken
WaitABXPadPress
WaitButton
GoTo BerryTree_CloseAndEnd
BerryTree_HandleHarvestDeclined:
@ -189,7 +189,7 @@ BerryTree_ShowLeftBerriesMessage:
BufferItemNamePlural 1, VAR_0x8000
Message BerryTrees_Text_PlayerLeftBerriesWhereTheyWere
BerryTree_EndLeftBerryMessage:
WaitABXPadPress
WaitButton
GoTo BerryTree_CloseAndEnd
BerryTree_CheckExistingMulch:
@ -262,7 +262,7 @@ BerryTree_ApplyMulch:
BerryTree_ShowMulchAppliedMessage:
BufferItemName 0, VAR_0x8005
Message BerryTrees_Text_MulchWasScatteredOnSoilAfterHarvest
WaitABXPadPress
WaitButton
GoTo BerryTree_CloseAndEnd
BerryTree_OfferPlantBerry:
@ -281,7 +281,7 @@ BerryTree_OpenBerryMenu:
GoToIfEq VAR_RESULT, 0, BerryTree_ReleaseAndEnd
BufferItemName 0, VAR_RESULT
Message BerryTrees_Text_BerryWasPlantedInSoftSoil
WaitABXPadPress
WaitButton
RemoveItem VAR_RESULT, 1, VAR_0x8004
PlantBerry VAR_RESULT
GoTo BerryTree_CloseAndEnd
@ -294,14 +294,14 @@ BerryTree_ReleaseAndEnd:
BerryTree_ShowEmptySoilMessage:
Message BerryTrees_Text_SoftEarthySoilAfterHarvest
WaitABXPadPress
WaitButton
GoTo BerryTree_CloseAndEnd
BerryTree_ShowMulchExistsMessage:
GetBerryMulchType VAR_RESULT
BufferItemName 0, VAR_RESULT
Message BerryTrees_Text_MulchHasBeenLaidDownAfterHarvest
WaitABXPadPress
WaitButton
GoTo BerryTree_CloseAndEnd
BerryTree_PlantBerryScript:
@ -310,7 +310,7 @@ BerryTree_PlantBerryScript:
FacePlayer
BufferItemName 0, VAR_0x8000
Message BerryTrees_Text_BerryWasPlantedInSoftSoil
WaitABXPadPress
WaitButton
CloseMessage
RemoveItem VAR_0x8000, 1, VAR_0x8004
PlantBerry VAR_0x8000
@ -321,7 +321,7 @@ BerryTree_WaterBerryScript:
LockAll
SetBerryWateringState BERRY_WATERING_START
Message BerryTrees_Text_ThereAllHappy
WaitABXPadPress
WaitButton
SetBerryWateringState BERRY_WATERING_END
CloseMessage
ReleaseAll

10
res/field/scripts/scripts_cafe.s
View File

@ -79,7 +79,7 @@ _013E:
_0143:
Message 3
WaitABXPadPress
WaitButton
CloseMessage
HideMoney
ReleaseAll
@ -87,7 +87,7 @@ _0143:
_0150:
Message 4
WaitABXPadPress
WaitButton
CloseMessage
HideMoney
ReleaseAll
@ -95,7 +95,7 @@ _0150:
_015D:
Message 5
WaitABXPadPress
WaitButton
CloseMessage
HideMoney
ReleaseAll
@ -107,14 +107,14 @@ _016A:
FacePlayer
GoToIfSet FLAG_UNK_0x0107, _0188
Message 10
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End
_0188:
Message 11
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End

14
res/field/scripts/scripts_canalave_city.s
View File

@ -290,7 +290,7 @@ _046A:
GoTo _0473
_0473:
WaitABXPadPress
WaitButton
CloseMessage
SetVar VAR_CANALAVE_STATE, 5
ClearFlag FLAG_HIDE_LAKE_VERITY_LOW_WATER_COUNTERPART
@ -358,7 +358,7 @@ _050F:
GoTo _0518
_0518:
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End
@ -376,7 +376,7 @@ _053C:
GoTo _0545
_0545:
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End
@ -548,7 +548,7 @@ _080C:
_0847:
Message 29
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End
@ -634,14 +634,14 @@ _0938:
_0943:
Message 33
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End
_094E:
Message 34
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End
@ -687,7 +687,7 @@ _09BC:
GoToIfNe VAR_RESULT, 6, CanalaveCity_RIVAL_EnterLibrary
BufferRivalName 0
Message 3
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End

4
res/field/scripts/scripts_canalave_city_east_house.s
View File

@ -62,7 +62,7 @@ _0105:
Message 8
PlaySound SEQ_WASURE
WaitSound
WaitABXPadPress
WaitButton
CloseMessage
End
@ -78,7 +78,7 @@ _0125:
_0130:
Message 3
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End

12
res/field/scripts/scripts_canalave_city_gym.s
View File

@ -57,7 +57,7 @@ CanalaveGym_ByronTryGiveTM91:
BufferItemName 0, VAR_0x8004
BufferTMHMMoveName 1, VAR_0x8004
Message CanalaveGym_Text_ByronExplainTM91
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End
@ -72,7 +72,7 @@ CanalaveGym_ByronAfterBadge:
GoToIfUnset FLAG_OBTAINED_BYRON_TM91, CanalaveGym_ByronTryGiveTM91
BufferRivalName 1
Message CanalaveGym_Text_ByronAfterBadge
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End
@ -88,7 +88,7 @@ CanalaveGym_GymGuide:
FacePlayer
GoToIfBadgeAcquired BADGE_ID_MINE, CanalaveGym_GymGuideAfterBadge
Message CanalaveGym_Text_GymGuideBeforeBadge
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End
@ -96,7 +96,7 @@ CanalaveGym_GymGuide:
CanalaveGym_GymGuideAfterBadge:
BufferPlayerName 0
Message CanalaveGym_Text_GymGuideAfterBadge
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End
@ -108,7 +108,7 @@ CanalaveGym_GymStatue:
BufferRivalName 0
BufferRivalName 1
Message CanalaveGym_Text_GymStatueBeforeBadge
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End
@ -118,7 +118,7 @@ CanalaveGym_GymStatueAfterBadge:
BufferPlayerName 1
BufferRivalName 2
Message CanalaveGym_Text_GymStatueAfterBadge
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End

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

@ -104,7 +104,7 @@ _0160:
WaitSound
BufferPlayerName 0
Message 2
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End

4
res/field/scripts/scripts_canalave_city_mart.s
View File

@ -23,7 +23,7 @@ CanalaveCityMart_Lady:
FacePlayer
BufferItemName 0, ITEM_MAX_POTION //Unused?
Message CanalaveCityMart_Text_ThatsTheRepeatBall
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End
@ -34,7 +34,7 @@ CanalaveCityMart_Pokefan:
FacePlayer
BufferItemName 0, ITEM_X_ATTACK //Unused?
Message CanalaveCityMart_Text_ShouldTakeReviveToIronIsland
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End

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

@ -22,7 +22,7 @@ _000A:
_0051:
Message 1
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End

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

@ -15,14 +15,14 @@ _0016:
FacePlayer
GoToIfSet FLAG_UNK_0x00A8, _0034
Message 0
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End
_0034:
Message 1
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End
@ -43,7 +43,7 @@ _003F:
_0068:
FacePlayer
Message 4
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End

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

@ -25,14 +25,14 @@ _0033:
FacePlayer
GoToIfSet FLAG_UNK_0x00A8, _0051
Message 0
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End
_0051:
Message 1
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End
@ -46,7 +46,7 @@ _005C:
End
_007A:
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End

40
res/field/scripts/scripts_canalave_library_3f.s
View File

@ -338,14 +338,14 @@ _03E8:
FacePlayer
GoToIfSet FLAG_UNK_0x00A8, _0406
Message 26
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End
_0406:
Message 27
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End
@ -356,14 +356,14 @@ _0411:
FacePlayer
GoToIfSet FLAG_UNK_0x00A8, _042F
Message 28
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End
_042F:
Message 29
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End
@ -380,14 +380,14 @@ _043A:
_0463:
BufferPlayerName 0
Message 31
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End
_0471:
Message 32
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End
@ -404,14 +404,14 @@ _047C:
_04A5:
BufferPlayerName 0
Message 34
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End
_04B3:
Message 35
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End
@ -428,14 +428,14 @@ _04BE:
_04E7:
BufferPlayerName 0
Message 37
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End
_04F5:
Message 38
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End
@ -452,7 +452,7 @@ _0500:
_0529:
BufferPlayerName 0
Message 40
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End
@ -465,7 +465,7 @@ _0537:
ShowYesNoMenu VAR_RESULT
GoToIfEq VAR_RESULT, MENU_NO, _0529
Message 43
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End
@ -482,7 +482,7 @@ _056A:
_0593:
BufferPlayerName 0
Message 45
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End
@ -495,7 +495,7 @@ _05A1:
ShowYesNoMenu VAR_RESULT
GoToIfEq VAR_RESULT, MENU_NO, _0593
Message 48
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End
@ -512,14 +512,14 @@ _05D4:
_05FD:
BufferPlayerName 0
Message 50
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End
_060B:
Message 51
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End
@ -543,21 +543,21 @@ _0616:
_0673:
Message 55
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End
_067E:
Message 56
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End
_0689:
Message 57
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End
@ -565,7 +565,7 @@ _0689:
_0694:
BufferPlayerName 0
Message 54
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End

10
res/field/scripts/scripts_celestic_town.s
View File

@ -32,7 +32,7 @@ _0038:
_0063:
Message 3
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End
@ -100,7 +100,7 @@ _0166:
RemoveItem ITEM_OLD_CHARM, 1, VAR_RESULT
SetFlag FLAG_UNK_0x00A6
Message 7
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End
@ -190,7 +190,7 @@ _022C:
_024A:
SetVar VAR_UNK_0x40F1, 1
Message 0
WaitABXPadPress
WaitButton
CloseMessage
Return
@ -215,7 +215,7 @@ _026C:
_0289:
Message 8
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End
@ -236,7 +236,7 @@ _0294:
SetFlag FLAG_UNK_0x0299
WaitTime 12, VAR_RESULT
Message 11
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End

4
res/field/scripts/scripts_celestic_town_cave.s
View File

@ -18,7 +18,7 @@ _0027:
GoToIfUnset FLAG_UNK_0x00A7, _0040
BufferPlayerName 0
Message 15
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End
@ -429,7 +429,7 @@ _0538:
_057A:
Message 9
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End

4
res/field/scripts/scripts_celestic_town_north_house.s
View File

@ -30,7 +30,7 @@ _0043:
End
_004E:
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End
@ -57,7 +57,7 @@ _008E:
End
_0099:
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End

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

@ -73,28 +73,28 @@ _0113:
_0153:
Message 6
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End
_015E:
Message 7
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End
_0169:
Message 8
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End
_0174:
Message 9
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End

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

@ -49,21 +49,21 @@ _00B6:
_00C0:
Message 4
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End
_00CB:
Message 5
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End
_00D6:
Message 6
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End

4
res/field/scripts/scripts_celestic_town_southwest_house.s
View File

@ -15,14 +15,14 @@ _000A:
Message 0
SetVar VAR_0x8004, POKETCH_APPID_ANALOGWATCH
Common_GivePoketchApp
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End
_003A:
Message 1
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End

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

@ -96,7 +96,7 @@ CommonScript_PokecenterNurse_Greeting:
CommonScript_PokecenterNurse_DeclineHealPokemon:
Message CommonStrings_Text_PokecenterHopeToSeeYouAgain1
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
ReturnCommonScript
@ -142,7 +142,7 @@ CommonScript_PokecenterNurse_FarewellAfterHeal:
ApplyMovement VAR_0x8007, CommonScript_PokecenterNurse_NurseBowMovement
WaitMovement
Message CommonStrings_Text_PokecenterHopeToSeeYouAgain1
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
ReturnCommonScript
@ -157,7 +157,7 @@ CommonScript_PokecenterNurse_FarewellAfterHeal_GoldCard:
ApplyMovement VAR_0x8007, CommonScript_PokecenterNurse_NurseBowMovement
WaitMovement
Message CommonStrings_Text_PokecenterHopeToSeeYouAgain2
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
ReturnCommonScript
@ -175,7 +175,7 @@ CommonScript_PokecenterNurse_IdentifiedPokerus:
SetPlayerState PLAYER_TRANSITION_WALKING
ChangePlayerState
Message CommonStrings_Text_PokecenterYourPokemonMayBeInfected
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
ReturnCommonScript
@ -190,7 +190,7 @@ CommonScript_PokecenterNurse_GoldCard:
ShowYesNoMenu VAR_RESULT
GoToIfEq VAR_RESULT, MENU_YES, CommonScript_PokecenterNurse_AcceptHealPokemon_GoldCard
Message CommonStrings_Text_PokecenterHopeToSeeYouAgain2
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
ReturnCommonScript
@ -202,7 +202,7 @@ CommonScript_PokecenterNurse_GoldCard_PreviouslySeen:
ShowYesNoMenu VAR_RESULT
GoToIfEq VAR_RESULT, MENU_YES, CommonScript_PokecenterNurse_AcceptHealPokemon_GoldCard
Message CommonStrings_Text_PokecenterHopeToSeeYouAgain2
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
ReturnCommonScript
@ -458,14 +458,14 @@ _0632:
_065F:
Message pl_msg_00000213_00046
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End
_066A:
Message pl_msg_00000213_00048
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End
@ -505,7 +505,7 @@ _06D5:
SlatherHoneyTree
WaitTime 10, VAR_RESULT
Message pl_msg_00000213_00051
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End
@ -669,7 +669,7 @@ CommonScript_EmptyScript3:
CommonScript_SendToUndergroundPC:
Call CommonScript_ObtainUndergroundItem
Message pl_msg_00000213_00109
WaitABXPadPress
WaitButton
ReturnCommonScript
End
@ -718,7 +718,7 @@ CommonScript_InternalObtainUndergroundSphere:
CommonScript_ObtainAccessoryWaitForConfirm:
Call CommonScript_InternalObtainAccessory
Message CommonStrings_Text_PutAwayItemInTheFashionCaseNoLineFeed
WaitABXPadPress
WaitButton
ReturnCommonScript
End
@ -741,7 +741,7 @@ CommonScript_InternalObtainAccessory:
CommonScript_ObtainContestBackdropWaitForConfirm:
Call CommonScript_InternalObtainContestBackdrop
Message CommonStrings_Text_PutAwayItemInTheFashionCaseNoLineFeed
WaitABXPadPress
WaitButton
ReturnCommonScript
End
@ -773,7 +773,7 @@ CommonScript_InternalAddItemQuantityNoLineFeed:
CallIfEq VAR_RESULT, POCKET_KEY_ITEMS, CommonScript_PrintMessageObtainedKeyItem
CallIfNe VAR_RESULT, POCKET_KEY_ITEMS, CommonScript_PrepareMessageObtainedItem
Message CommonStrings_Text_PutItemInThePocketNoLineFeed
WaitABXPadPress
WaitButton
Return
CommonScript_AddItemQuantity:
@ -881,7 +881,7 @@ CommonScript_BagIsFull:
CommonScript_InternalBagIsFull:
Message CommonStrings_Text_BagIsFull
WaitABXPadPress
WaitButton
Return
_0BEE:
@ -1164,7 +1164,7 @@ CommonScript_PlayerHouseBlackOutRecover:
WaitFadeScreen
CallIfSet FLAG_HAS_POKEDEX, CommonScript_PlayerHouseBlackOutRecover_BeforePokedexMessage
CallIfUnset FLAG_HAS_POKEDEX, CommonScript_PlayerHouseBlackOutRecover_AfterPokedexMessage
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End
@ -1197,7 +1197,7 @@ CommonScript_PokecenterBlackOutRecover:
ApplyMovement VAR_0x8007, CommonScript_PokecenterNurse_NurseBowMovement
WaitMovement
Message CommonStrings_Text_PokecenterGoodLuckTrainer
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End
@ -1210,7 +1210,7 @@ CommonScript_PokecenterBlackOutRecover_HasCoalBadge:
ApplyMovement VAR_0x8007, CommonScript_PokecenterNurse_NurseBowMovement
WaitMovement
Message CommonStrings_Text_PokecenterAllHappyAndHealthy
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End
@ -1358,7 +1358,7 @@ _12A8:
LockAll
FacePlayer
MessageFromTrainerType
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End
@ -1536,14 +1536,14 @@ _14AC:
FadeScreenIn FADE_SCREEN_SPEED_SLOW, COLOR_WHITE
WaitFadeScreen
Message pl_msg_00000213_00124
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End
_1570:
Message pl_msg_00000213_00125
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End
@ -1669,7 +1669,7 @@ CommonScript_Frontier_End:
CommonScript_GriseousOrbCouldNotBeRemoved:
Message CommonStrings_Text_GriseousOrbCouldNotBeRemoved
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
ReturnCommonScript

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

@ -247,7 +247,7 @@ ContestHallLobby_Frame4:
ContestHallLobby_ItsAPhotoFrame:
Message ContestHallLobby_Text_ItsAPhotoFrame
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End
@ -272,7 +272,7 @@ ContestHallLobby_RichBoy:
GoToIfUnset FLAG_RECEIVED_CONTEST_HALL_LOBBY_MILD_POFFIN, ContestHallLobby_HasNotReceivedPoffinYet
ContestHallLobby_ItTakesPracticeToWinContests:
Message ContestHallLobby_Text_ItTakesPracticeToWinContests
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End
@ -286,14 +286,14 @@ ContestHallLobby_HasNotReceivedPoffinYet:
Call ContestHallLobby_GiveMildPoffin
SetFlag FLAG_RECEIVED_CONTEST_HALL_LOBBY_MILD_POFFIN
Message ContestHallLobby_Text_FeedThatPoffinToAPokemon2
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End
ContestHallLobby_PoffinCaseIsFull:
Message ContestHallLobby_Text_YourPoffinCasesFull
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End

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

@ -14,8 +14,8 @@
ScriptEntry _0036 @ 0x2648
ScriptEntry ContestRegistration_Dummy @ 0x2649
ScriptEntry OngoingContest_OnTransition @ 0x264A
ScriptEntry ContestHallLobby_OnTransition @ 0x264B
ScriptEntry OngoingContest_OnTransition @ 0x264A
ScriptEntry ContestHallLobby_OnTransition @ 0x264B
ScriptEntry _01D4 @ 0x264C
ScriptEntry _01E9 @ 0x264D
ScriptEntry ContestRegistration_ReceptionistOfficialContest @ 0x264E
@ -224,7 +224,7 @@ ContestRegistration_Receptionists_ContestMenuExit:
SetVar VAR_UNK_0x40D5, 0
ClearFlag FLAG_COMMUNICATION_CLUB_ACCESSIBLE
Message ContestRegistration_Text_LookForwardToYourParticipationAnotherTime
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End
@ -256,7 +256,7 @@ ContestRegistration_Receptionists_ContestMenuItem_InfoSelected:
ContestRegistration_ReceptionistLinkContest_LinkContestInfo:
Message ContestRegistration_Text_ExplainLinkContest
GoTo ContestRegistration_Receptionists_WouldYouLikeToEnterContest
#define ReceptionistOfficialContest_InfoMenuItem_ContestBasics 0
#define ReceptionistOfficialContest_InfoMenuItem_TypesOfContests 1
@ -664,7 +664,7 @@ ContestRegistration_StartPracticeContest:
Call ContestRegistration_AssessPracticeResults
GoToIfEq VAR_RESULT, MENU_YES, ContestRegistration_StartContest
Message ContestRegistration_Text_WeLookForwardToYourNextVisit1
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End
@ -834,7 +834,7 @@ OngoingContest_OfficialContest_ReturnToContestRegistration:
Common_GiveAccessory
ContestRegistration_ThankYouForParticipating:
Message ContestRegistration_Text_ThankYouForParticipating
WaitABXPadPress
WaitButton
CloseMessage
ContestRegistration_End:
End
@ -1089,7 +1089,7 @@ ContestRegistration_ReceptionistPracticeContest_PracticeCategoryMenu_ActingSelec
ContestRegistration_ReceptionistPracticeContest_Exit2:
Message ContestRegistration_Text_WeLookForwardToYourNextVisit3
WaitABXPadPress
WaitButton
GoTo ContestRegistration_Receptionists_End
End
@ -1108,7 +1108,7 @@ ContestRegistration_Unused:
GoToIfEq VAR_0x8008, 2, ContestRegistration_Unused4
GoToIfEq VAR_0x8008, 3, ContestRegistration_Unused5
GoTo ContestRegistration_Unused6
End
End
ContestRegistration_Unused2:
SetVar VAR_0x8004, 0
@ -1132,7 +1132,7 @@ ContestRegistration_Unused5:
ContestRegistration_Unused6:
Message ContestRegistration_Text_Unused6
WaitABXPadPress
WaitButton
GoTo ContestRegistration_Receptionists_End
End
@ -1193,7 +1193,7 @@ ContestRegistration_ReceptionistPracticeContest_SelectContestTypeTough:
ContestRegistration_ReceptionistPracticeContest_Exit3:
Message ContestRegistration_Text_WeLookForwardToYourNextVisit4
WaitABXPadPress
WaitButton
GoTo ContestRegistration_Receptionists_End
End
@ -1210,7 +1210,7 @@ ContestRegistration_ReceptionistPracticeContest_TryRegisterMon:
OpenPartyMenuForContest VAR_RESULT, VAR_0x8004, VAR_0x8005, 0
TryEnterContestMon VAR_MAP_LOCAL_2, VAR_RESULT
GoToIfEq VAR_RESULT, MenuItemEnter, ContestRegistration_ReceptionistPracticeContest_RegisterMonDone
SetMonSummary VAR_MAP_LOCAL_2
SetMonSummary VAR_MAP_LOCAL_2
GetMonPartySlot VAR_RESULT
GoTo ContestRegistration_ReceptionistPracticeContest_TryRegisterMon
@ -1396,7 +1396,7 @@ ContestRegistration_Unused7:
ContestRegistration_ReceptionistPracticeContest_Exit:
Message ContestRegistration_Text_WeLookForwardToYourNextVisit1
WaitABXPadPress
WaitButton
ContestRegistration_Receptionists_End:
CloseMessage
ReleaseAll

4
res/field/scripts/scripts_counterpart_talk.s
View File

@ -22,7 +22,7 @@ _0027:
_003A:
CallIfEq VAR_0x8004, GENDER_MALE, _005C
CallIfEq VAR_0x8004, GENDER_FEMALE, _0064
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End
@ -193,7 +193,7 @@ _037C:
End
_03A1:
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End

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

@ -26,7 +26,7 @@ CycleShop_PokefanM:
CycleShop_ThisIsTheLatestModelSoIllReadTheOperatingManualToYou:
Message CycleShop_Text_ThisIsTheLatestModelSoIllReadTheOperatingManualToYou
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End
@ -41,14 +41,14 @@ CycleShop_Youngster:
FacePlayer
GoToIfSet FLAG_TEAM_GALACTIC_LEFT_ETERNA_BUILDING, CycleShop_WhatWasTeamGalacticTryingToDoWithOtherPeoplesPokemon
Message CycleShop_Text_TheManagersGoneOffToTheTeamGalacticBuildingAndHasntReturned
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End
CycleShop_WhatWasTeamGalacticTryingToDoWithOtherPeoplesPokemon:
Message CycleShop_Text_WhatWasTeamGalacticTryingToDoWithOtherPeoplesPokemon
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End

34
res/field/scripts/scripts_day_care_common.s
View File

@ -17,7 +17,7 @@ _000A:
GoToIfEq VAR_RESULT, DAYCARE_ONE_MON, _00BE
GoToIfEq VAR_RESULT, DAYCARE_TWO_MONS, _00CB
Message 0
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End
@ -30,7 +30,7 @@ _004A:
ShowYesNoMenu VAR_RESULT
GoToIfEq VAR_RESULT, MENU_YES, _0083
Message 3
WaitABXPadPress
WaitButton
CloseMessage
ClearFlag FLAG_UNK_0x0073
ResetDaycarePersonalityAndStepCounter
@ -41,7 +41,7 @@ _0083:
GetPartyCount VAR_RESULT
GoToIfNe VAR_RESULT, 6, _009F
Message 4
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End
@ -53,7 +53,7 @@ _009F:
WaitSound
WaitABPress
Message 6
WaitABXPadPress
WaitButton
CloseMessage
GiveEggFromDaycare
ClearFlag FLAG_UNK_0x0073
@ -63,7 +63,7 @@ _009F:
_00BE:
BufferDaycareMonNicknames
Message 2
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End
@ -76,7 +76,7 @@ _00CB:
CallIfEq VAR_RESULT, 1, _0115
CallIfEq VAR_RESULT, 2, _011A
CallIfEq VAR_RESULT, 3, _011F
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End
@ -110,7 +110,7 @@ _0124:
ShowYesNoMenu VAR_RESULT
GoToIfEq VAR_RESULT, MENU_YES, _017E
Message 20
WaitABXPadPress
WaitButton
CloseMessage
HideMoney
ReleaseAll
@ -163,7 +163,7 @@ _025F:
_0270:
PlayCry VAR_0x8001
Message 36
WaitABXPadPress
WaitButton
CloseMessage
WaitCry
HideMoney
@ -172,7 +172,7 @@ _0270:
_0285:
Message 35
WaitABXPadPress
WaitButton
CloseMessage
HideMoney
ReleaseAll
@ -180,7 +180,7 @@ _0285:
_0292:
Message 23
WaitABXPadPress
WaitButton
CloseMessage
HideMoney
ReleaseAll
@ -195,7 +195,7 @@ _029F:
_02BB:
Message 31
WaitABXPadPress
WaitButton
CloseMessage
HideMoney
ReleaseAll
@ -203,7 +203,7 @@ _02BB:
_02C8:
Message 33
WaitABXPadPress
WaitButton
CloseMessage
HideMoney
ReleaseAll
@ -211,7 +211,7 @@ _02C8:
_02D5:
Message 34
WaitABXPadPress
WaitButton
CloseMessage
HideMoney
ReleaseAll
@ -219,7 +219,7 @@ _02D5:
_02E2:
Message 19
WaitABXPadPress
WaitButton
CloseMessage
HideMoney
ReleaseAll
@ -275,7 +275,7 @@ _03DE:
CheckMoney2 VAR_RESULT, VAR_0x8004
GoToIfEq VAR_RESULT, 1, _03FE
Message 21
WaitABXPadPress
WaitButton
CloseMessage
HideMoney
ReleaseAll
@ -306,7 +306,7 @@ _0444:
_045E:
Message 26
WaitABXPadPress
WaitButton
CloseMessage
HideMoney
ReleaseAll
@ -338,7 +338,7 @@ _04A0:
ShowYesNoMenu VAR_RESULT
GoToIfEq VAR_RESULT, MENU_YES, _0346
Message 23
WaitABXPadPress
WaitButton
CloseMessage
HideMoney
ReleaseAll

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

@ -65,7 +65,7 @@ _0070:
WaitTime 30, VAR_RESULT
FinishDistortionWorldGiratinaShadowEvent
Message 3
WaitABXPadPress
WaitButton
CloseMessage
ApplyMovement LOCALID_PLAYER, _0174
ApplyMovement 128, _01C4

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

@ -56,7 +56,7 @@ _00C6:
WaitMovement
_00D0:
Message 1
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End

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

@ -114,7 +114,7 @@ _01BB:
_01C3:
WaitMovement
Message 10
WaitABXPadPress
WaitButton
CloseMessage
End
@ -129,14 +129,14 @@ _01DA:
LockAll
GoToIfGe VAR_DISTORTION_WORLD_PROGRESS, 10, _01F8
Message 3
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End
_01F8:
Message 11
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End

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

@ -130,7 +130,7 @@ _0194:
ApplyMovement 129, _0264
WaitMovement
Message 12
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End

16
res/field/scripts/scripts_eterna_city.s
View File

@ -67,14 +67,14 @@ EternaCity_PokemonBreederF1:
FacePlayer
GoToIfSet FLAG_TEAM_GALACTIC_LEFT_ETERNA_BUILDING, EternaCity_WithTeamGalacticGoneWhatsGoingToHappenToTheirBuilding
Message EternaCity_Text_SinceThatTeamGalacticBuildingWentUp
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End
EternaCity_WithTeamGalacticGoneWhatsGoingToHappenToTheirBuilding:
Message EternaCity_Text_WithTeamGalacticGoneWhatsGoingToHappenToTheirBuilding
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End
@ -85,14 +85,14 @@ EternaCity_BugCatcher1:
FacePlayer
GoToIfSet FLAG_TEAM_GALACTIC_LEFT_ETERNA_BUILDING, EternaCity_DoYouUseYourBikesKickstand
Message EternaCity_Text_MyFriendSaidTeamGalacticTookHisFavoritePokemonAway
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End
EternaCity_DoYouUseYourBikesKickstand:
Message EternaCity_Text_DoYouUseYourBikesKickstand
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End
@ -549,7 +549,7 @@ EternaCity_BugCatcher2:
GoToIfUnset FLAG_RECEIVED_BICYCLE, EternaCity_ItFeelsGreatRidingABikeWithTheWindInYourFaceDoesntIt
GoToIfGe VAR_ROUTE_207_COUNTERPART_TRIGGER_STATE, 1, EternaCity_ItFeelsGreatRidingABikeWithTheWindInYourFaceDoesntIt
Message EternaCity_Text_OhWowYouGotABicycle2
WaitABXPadPress
WaitButton
CloseMessage
ApplyMovement LOCALID_BUG_CATCHER_2, EternaCity_Movement_BugCatcher2FaceSouth
WaitMovement
@ -558,7 +558,7 @@ EternaCity_BugCatcher2:
EternaCity_ItFeelsGreatRidingABikeWithTheWindInYourFaceDoesntIt:
Message EternaCity_Text_ItFeelsGreatRidingABikeWithTheWindInYourFaceDoesntIt
WaitABXPadPress
WaitButton
CloseMessage
ApplyMovement LOCALID_BUG_CATCHER_2, EternaCity_Movement_BugCatcher2FaceSouth
WaitMovement
@ -1195,13 +1195,13 @@ EternaCity_CynthiaTryAgainGiveEggEnd:
EternaCity_OhYouDontHaveRoomForThisEgg:
SetVar VAR_ETERNA_CITY_STATE, 4
Message EternaCity_Text_OhYouDontHaveRoomForThisEgg
WaitABXPadPress
WaitButton
CloseMessage
Return
EternaCity_OhYouDontNeedToFeelObligated:
Message EternaCity_Text_OhYouDontNeedToFeelObligated
WaitABXPadPress
WaitButton
CloseMessage
SetVar VAR_ETERNA_CITY_STATE, 4
Return

22
res/field/scripts/scripts_eterna_city_condominiums_1f.s
View File

@ -43,14 +43,14 @@ EternaCityCondominiums1F_TryGiveNickname:
EternaCityCondominiums1F_ISeePleaseComeVisitAgain:
Message EternaCityCondominiums1F_Text_ISeePleaseComeVisitAgain
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End
EternaCityCondominiums1F_SelectedEgg:
Message EternaCityCondominiums1F_Text_AnEggCanGoByNoOtherName
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End
@ -58,7 +58,7 @@ EternaCityCondominiums1F_SelectedEgg:
EternaCityCondominiums1F_SelectedOutsiderPokemon:
BufferPartyMonNickname 0, VAR_0x8005
Message EternaCityCondominiums1F_Text_NicknameIsItThatIsATrulyImpeccableName
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End
@ -78,7 +78,7 @@ EternaCityCondominiums1F_GiveNewNickname:
IncrementGameRecord RECORD_POKEMON_NICKNAMED
BufferPartyMonNickname 0, VAR_0x8005
Message EternaCityCondominiums1F_Text_ThisPokemonShallBeKnownAsNicknameItIsABetterNameThanBefore
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End
@ -86,7 +86,7 @@ EternaCityCondominiums1F_GiveNewNickname:
EternaCityCondominiums1F_GaveSameNickname:
BufferPartyMonNickname 0, VAR_0x8005
Message EternaCityCondominiums1F_Text_ThisPokemonShallBeKnownAsNicknameItLooksNoDifferentFromBefore
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End
@ -119,7 +119,7 @@ EternaCityCondominiums1F_TryTrade:
FinishNpcTrade
SetFlag FLAG_TRADED_FOR_CHARAP_CHATOT
Message EternaCityCondominiums1F_Text_YesSoAwesomeABuizel
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End
@ -127,21 +127,21 @@ EternaCityCondominiums1F_TryTrade:
EternaCityCondominiums1F_WhatITotallyWantIsABuizel:
FinishNpcTrade
Message EternaCityCondominiums1F_Text_WhatITotallyWantIsABuizel
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End
EternaCityCondominiums1F_OhOKTotallyGotIt:
Message EternaCityCondominiums1F_Text_OhOKTotallyGotIt
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End
EternaCityCondominiums1F_DidThatChatotITradedYouTotallyLearnThatChatterMove:
Message EternaCityCondominiums1F_Text_DidThatChatotITradedYouTotallyLearnThatChatterMove
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End
@ -157,14 +157,14 @@ EternaCityCondominiums1F_PokefanM:
EternaCityCondominiums1F_HiImTheBuildingSuperintented:
Message EternaCityCondominiums1F_Text_HiImTheBuildingSuperintented
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End
EternaCityCondominiums1F_ImBuildingSuperintendentMantain24HourWatchZZZ:
Message EternaCityCondominiums1F_Text_ImBuildingSuperintendentMantain24HourWatchZZZ
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End

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

@ -30,7 +30,7 @@ EternaCityCondominiums2F_BagIsFull:
EternaCityCondominiums2F_FolksLikeMeHaveALongHistoryWeCanLookBackOn:
Message EternaCityCondominiums2F_Text_FolksLikeMeHaveALongHistoryWeCanLookBackOn
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End

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

@ -35,7 +35,7 @@ EternaCityEastHouse_WellIfYoureNotInterestedDontFeelObligatedOrAnything:
End
EternaCityEastHouse_PokemonBreederMEnd:
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End

26
res/field/scripts/scripts_eterna_city_gym.s
View File

@ -22,7 +22,7 @@ EternaGym_GymGuide:
FacePlayer
GoToIfBadgeAcquired BADGE_ID_FOREST, EternaGym_GymGuideAfterBadge
Message EternaGym_Text_GymGuideBeforeBadge
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End
@ -30,7 +30,7 @@ EternaGym_GymGuide:
EternaGym_GymGuideAfterBadge:
BufferPlayerName 0
Message EternaGym_Text_GymGuideAfterBadge
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End
@ -42,7 +42,7 @@ EternaGym_GymStatue:
BufferRivalName 0
BufferRivalName 1
Message EternaGym_Text_GymStatueBeforeBadge
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End
@ -52,7 +52,7 @@ EternaGym_GymStatueAfterBadge:
BufferPlayerName 1
BufferRivalName 2
Message EternaGym_Text_GymStatueAfterBadge
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End
@ -94,7 +94,7 @@ EternaGym_GardeniaTryGiveTM86Again:
BufferItemName 0, VAR_0x8004
BufferTMHMMoveName 1, VAR_0x8004
Message EternaGym_Text_GardeniaExplainGrassKnot
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End
@ -108,7 +108,7 @@ EternaGym_GardeniaGiveTM86BagFullAgain:
EternaGym_Gardenia_AlreadyHaveForestbadge:
GoToIfUnset FLAG_OBTAINED_GARDENIA_TM86, EternaGym_GardeniaTryGiveTM86Again
Message EternaGym_Text_GardeniaGymBeaten
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End
@ -122,7 +122,7 @@ EternaGym_GardeniaGiveTM86:
BufferItemName 0, VAR_0x8004
BufferTMHMMoveName 1, VAR_0x8004
Message EternaGym_Text_GardeniaExplainGrassKnot
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
AdvanceEternaGymClock
@ -152,7 +152,7 @@ EternaGym_LassCaroline:
CheckWonBattle VAR_RESULT
GoToIfEq VAR_RESULT, FALSE, EternaGym_LostBattle
Message EternaGym_Text_LassCarolineAfterBattle
WaitABXPadPress
WaitButton
SetVar VAR_ETERNA_GYM_TRAINERS_BEATEN, 1
CloseMessage
ReleaseAll
@ -161,7 +161,7 @@ EternaGym_LassCaroline:
EternaGym_LassCarolineBeaten:
Message EternaGym_Text_LassCarolineAfterBattle
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End
@ -180,7 +180,7 @@ EternaGym_AromaLadyJenna:
CheckWonBattle VAR_RESULT
GoToIfEq VAR_RESULT, FALSE, EternaGym_LostBattle
Message EternaGym_Text_AromaLadyJennaAfterBattle
WaitABXPadPress
WaitButton
SetVar VAR_ETERNA_GYM_TRAINERS_BEATEN, 2
CloseMessage
ReleaseAll
@ -189,7 +189,7 @@ EternaGym_AromaLadyJenna:
EternaGym_AromaLadyJennaBeaten:
Message EternaGym_Text_AromaLadyJennaAfterBattle
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End
@ -208,7 +208,7 @@ EternaGym_AromaLadyAngela:
CheckWonBattle VAR_RESULT
GoToIfEq VAR_RESULT, FALSE, EternaGym_LostBattle
Message EternaGym_Text_AromaLadyAngelaAfterBattle
WaitABXPadPress
WaitButton
SetVar VAR_ETERNA_GYM_TRAINERS_BEATEN, 3
CloseMessage
ReleaseAll
@ -217,7 +217,7 @@ EternaGym_AromaLadyAngela:
EternaGym_AromaLadyAngelaBeaten:
Message EternaGym_Text_AromaLadyAngelaAfterBattle
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End

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

@ -24,14 +24,14 @@ EternaCityPokecenter1F_SchoolKidM:
FacePlayer
GoToIfSet FLAG_TEAM_GALACTIC_LEFT_ETERNA_BUILDING, EternaCityPokecenter1F_IGotMyPokemonBack
Message EternaCityPokecenter1F_Text_TeamGalacticTookMyPokemonAway
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End
EternaCityPokecenter1F_IGotMyPokemonBack:
Message EternaCityPokecenter1F_Text_IGotMyPokemonBack
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End
@ -61,35 +61,35 @@ EternaCityPokecenter1F_GivePoketchAppFriendshipChecker:
SetVar VAR_MAP_LOCAL_2, 1
SetVar VAR_0x8004, POKETCH_APPID_FRIENDSHIPCHECKER
Common_GivePoketchApp
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End
EternaCityPokecenter1F_IfYouSpendEnoughTimeWithThemAllPokemonWillOpenUpToYou:
Message EternaCityPokecenter1F_Text_IfYouSpendEnoughTimeWithThemAllPokemonWillOpenUpToYou
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End
EternaCityPokecenter1F_ItSeemsToLikeYou:
Message EternaCityPokecenter1F_Text_ItSeemsToLikeYou
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End
EternaCityPokecenter1F_ItsBecomingComfortableAroundYouIThink:
Message EternaCityPokecenter1F_Text_ItsBecomingComfortableAroundYouIThink
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End
EternaCityPokecenter1F_HmmItNeedsToGetUsedToYouMore:
Message EternaCityPokecenter1F_Text_HmmItNeedsToGetUsedToYouMore
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End

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

@ -94,7 +94,7 @@ EternaCitySouthHouse_DidNotCatchAllRoamingLegendaryBirds:
Return
EternaCitySouthHouse_ProfOakEnd:
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End

48
res/field/scripts/scripts_eterna_city_underground_man_house.s
View File

@ -43,21 +43,21 @@ EternaCityUndergroundManHouse_LetMeMentorYouAsYouBecomeAFullFledgedSpelunker:
EternaCityUndergroundManHouse_ICantForceYouToAcceptMyProposalIfYoureNotInclined:
Message EternaCityUndergroundManHouse_Text_ICantForceYouToAcceptMyProposalIfYoureNotInclined
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End
EternaCityUndergroundManHouse_SoMySpelunkerAreYouGoingUndergroundWithYourFriends:
Message EternaCityUndergroundManHouse_Text_SoMySpelunkerAreYouGoingUndergroundWithYourFriends
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End
EternaCityUndergroundManHouse_FromNowOnYouAreTheSpelunkingMaster:
Message EternaCityUndergroundManHouse_Text_FromNowOnYouAreTheSpelunkingMaster
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End
@ -65,7 +65,7 @@ EternaCityUndergroundManHouse_FromNowOnYouAreTheSpelunkingMaster:
EternaCityUndergroundManHouse_StartMissionGoUnderground:
SetFlag FLAG_HAS_ACTIVE_UNDERGROUND_MISSION
Message EternaCityUndergroundManHouse_Text_IWillTeachYouByAssigningMissionsFirstGoUnderground
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End
@ -73,7 +73,7 @@ EternaCityUndergroundManHouse_StartMissionGoUnderground:
EternaCityUndergroundManHouse_StartMissionDigUpTreasureOrSpheres:
SetFlag FLAG_HAS_ACTIVE_UNDERGROUND_MISSION
Message EternaCityUndergroundManHouse_Text_ForMyNextTestIWantYouToDigUpSomeTreasureOrSpheresForMe
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End
@ -81,7 +81,7 @@ EternaCityUndergroundManHouse_StartMissionDigUpTreasureOrSpheres:
EternaCityUndergroundManHouse_StartMissionBurySpheres:
SetFlag FLAG_HAS_ACTIVE_UNDERGROUND_MISSION
Message EternaCityUndergroundManHouse_Text_IWantYouToGoBuryTheseStrangeSpheresInTheUnderground
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End
@ -89,7 +89,7 @@ EternaCityUndergroundManHouse_StartMissionBurySpheres:
EternaCityUndergroundManHouse_StartMissionMakeASecretBase:
SetFlag FLAG_HAS_ACTIVE_UNDERGROUND_MISSION
Message EternaCityUndergroundManHouse_Text_YourNextAssignmentIsGoMakeYourOwnSecretBase
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End
@ -97,7 +97,7 @@ EternaCityUndergroundManHouse_StartMissionMakeASecretBase:
EternaCityUndergroundManHouse_StartMissionDecorateASecretBase:
SetFlag FLAG_HAS_ACTIVE_UNDERGROUND_MISSION
Message EternaCityUndergroundManHouse_Text_ForMyFinalTestIWantYouToDecorateYourSecretBase
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End
@ -108,49 +108,49 @@ EternaCityUndergroundManHouse_StartMissionStealAFlag:
CloseMessage
Call EternaCityUndergroundManHouse_UndergroundManWalkAround
Message EternaCityUndergroundManHouse_Text_StealYourFriendsFlagIfYouCanDoThatIWillPermitYouToMoveBoulders
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End
EternaCityUndergroundManHouse_DidNotYetCompleteMissionGoUnderground:
Message EternaCityUndergroundManHouse_Text_ToGetDownToTheUndergroundTunnelsYouNeedOnlyToUseYourExplorerKit
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End
EternaCityUndergroundManHouse_DidNotYetCompleteMissionDigUpTreasureOrSpheres:
Message EternaCityUndergroundManHouse_Text_YouveNotLocatedAnyTreasureOrSpheresYet
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End
EternaCityUndergroundManHouse_DidNotYetCompleteMissionBurySpheres:
Message EternaCityUndergroundManHouse_Text_YouveNotBuriedTheSpheresYet
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End
EternaCityUndergroundManHouse_DidNotYetCompleteMissionMakeASecretBase:
Message EternaCityUndergroundManHouse_Text_HmYouDontKnowHowToUseTheDiggerDrill
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End
EternaCityUndergroundManHouse_DidNotYetCompleteMissionDecorateYourSecretBase:
Message EternaCityUndergroundManHouse_Text_AhHaveIFinallyManagedToStumpYou
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End
EternaCityUndergroundManHouse_DidNotYetCompleteMissionStealAFlag:
Message EternaCityUndergroundManHouse_Text_IfYouManageToStealAFlagYouBeSureToComeShowMe
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End
@ -183,7 +183,7 @@ EternaCityUndergroundManHouse_MissionGoUnderground:
SetVar VAR_0x8005, 1
Common_ObtainUndergroundTrap
Message EternaCityUndergroundManHouse_Text_ThoseAreCalledTraps
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End
@ -204,7 +204,7 @@ EternaCityUndergroundManHouse_MissionDigUpTreasureOrSpheres:
SetVar VAR_0x8005, 1
Common_ObtainUndergroundSphere
Message EternaCityUndergroundManHouse_Text_DigInTheWallsOfTheUndergroundTunnelsToUnearthHiddenStuff
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End
@ -219,7 +219,7 @@ EternaCityUndergroundManHouse_MissionBurySpheres:
SetVar VAR_0x8005, 1
Common_ObtainUndergroundTrap
Message EternaCityUndergroundManHouse_Text_YouMayHaveSeenThemAlreadyButTheseAreSphereCollectors
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End
@ -243,7 +243,7 @@ EternaCityUndergroundManHouse_MissionMakeASecretBase:
SetVar VAR_0x8005, 1
Common_SendToUndergroundPCWithLinefeed
Message EternaCityUndergroundManHouse_Text_IncidentallyADiggerDrillCanBeUsedOnlyOnce
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End
@ -257,7 +257,7 @@ EternaCityUndergroundManHouse_MissionDecorateYourSecretBase:
Message EternaCityUndergroundManHouse_Text_AhYouveEvenManagedToDecorateYourSecretBaseThisIsYourReward
Call EternaCityUndergroundManHouse_SendStarterDollToUndergroundPC
Message EternaCityUndergroundManHouse_Text_ThereAreWaysOfCollectingMoreDecorationGoods
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End
@ -300,7 +300,7 @@ EternaCityUndergroundManHouse_MissionStealAFlag:
ClearFlag FLAG_HAS_ACTIVE_UNDERGROUND_MISSION
ClearFlag FLAG_UNDERGROUND_MAN_COULDNT_GIVE_REWARD
Message EternaCityUndergroundManHouse_Text_ThereReallyIsNothingElseThatICanTeachYou
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End
@ -372,7 +372,7 @@ EternaCityUndergroundManHouse_MyGoodnessYouveCapturedFiftyFlagsTakeThisAsYourRew
EternaCityUndergroundManHouse_UndergroundPCIsFull:
SetFlag FLAG_UNDERGROUND_MAN_COULDNT_GIVE_REWARD
Message EternaCityUndergroundManHouse_Text_OhYourUndergroundPCAppearsToBeFull
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End
@ -451,14 +451,14 @@ EternaCityUndergroundManHouse_ScientistM:
GoToIfSet FLAG_TALKED_TO_UNDERGROUND_MAN_HOUSE_SCIENTIST_M, EternaCityUndergroundManHouse_OhYoudLikeMoreAdviceOnDiggingUpTreasureAndSpheres
SetFlag FLAG_TALKED_TO_UNDERGROUND_MAN_HOUSE_SCIENTIST_M
Message EternaCityUndergroundManHouse_Text_LetsDigUpSomeTreasure
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End
EternaCityUndergroundManHouse_OhYoudLikeMoreAdviceOnDiggingUpTreasureAndSpheres:
Message EternaCityUndergroundManHouse_Text_OhYoudLikeMoreAdviceOnDiggingUpTreasureAndSpheres
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End

4
res/field/scripts/scripts_eterna_forest.s
View File

@ -52,7 +52,7 @@ EternaForest_StartFollowingCheryl:
SetFlag FLAG_TALKED_TO_ETERNA_FOREST_CHERYL
SetVar VAR_ETERNA_FOREST_FOLLOWER_CHERYL_STATE, 1
Message EternaForest_Text_IllKeepYourPokemonInPerfectHealth
WaitABXPadPress
WaitButton
CloseMessage
SetVar VAR_PARTNER_TRAINER_ID, TRAINER_CHERYL_ETERNA_FOREST
SetHasPartner
@ -421,7 +421,7 @@ EternaForest_OnFrameCherylOldChateauCutscene:
ApplyMovement LOCALID_CHERYL, EternaForest_Movement_CherylWalkOnSpotNorth
WaitMovement
Message EternaForest_Text_ThereIsAnOldChateauAhead
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End

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

@ -29,7 +29,7 @@ EternaForestOutside_PokemonBreederF:
EternaForestOutside_ICollectBerriesAndTradeThemForAccessoriesInFloaromaTown:
Message EternaForestOutside_Text_ICollectBerriesAndTradeThemForAccessoriesInFloaromaTown
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End

22
res/field/scripts/scripts_field_moves.s
View File

@ -39,7 +39,7 @@ _008E:
Message FieldMoves_Text_TreeLooksLikeCanBeCut
GetCurrentMapID VAR_0x8004
CallIfEq VAR_0x8004, 203, _014A
WaitABXPadPress
WaitButton
CloseMessage
GoTo _066D
End
@ -142,7 +142,7 @@ FieldMoves_Rock:
_0275:
Message FieldMoves_Text_PokemonMayBeAbleToSmashRock
WaitABXPadPress
WaitButton
CloseMessage
GoTo _066D
End
@ -199,7 +199,7 @@ FieldMoves_Boulder:
_0372:
Message FieldMoves_Text_BoulderMayBeAbleToPush
WaitABXPadPress
WaitButton
CloseMessage
GoTo _066D
End
@ -213,7 +213,7 @@ _0381:
ScrCmd_0C5 VAR_0x8004
CloseMessage
Message FieldMoves_Text_PokemonStrengthMadePossibleToMove
WaitABXPadPress
WaitButton
CloseMessage
GetCurrentMapID VAR_0x8004
CreateJournalEvent LOCATION_EVENT_USED_STRENGTH, VAR_0x8004, 0, 0, 0
@ -222,7 +222,7 @@ _0381:
_03BD:
Message FieldMoves_Text_StrengthMadePossibleToMove
WaitABXPadPress
WaitButton
CloseMessage
GoTo _066D
End
@ -237,7 +237,7 @@ FieldMoves_UseStrengthFromMenu:
CloseMessage
ScrCmd_0C5 VAR_0x8000
Message FieldMoves_Text_PokemonStrengthMadePossibleToMove
WaitABXPadPress
WaitButton
CloseMessage
GetCurrentMapID VAR_0x8004
CreateJournalEvent LOCATION_EVENT_USED_STRENGTH, VAR_0x8004, 0, 0, 0
@ -261,14 +261,14 @@ FieldMoves_RockyWall:
_0469:
Message FieldMoves_Text_RockyWallWillMoveScale
WaitABXPadPress
WaitButton
CloseMessage
GoTo _0671
End
_0478:
Message FieldMoves_Text_NoRockClimbingWithPartner
WaitABXPadPress
WaitButton
CloseMessage
GoTo _0671
End
@ -310,7 +310,7 @@ FieldMoves_Water:
_0512:
Message FieldMoves_Text_NoSurfingWithPartner
WaitABXPadPress
WaitButton
CloseMessage
GoTo _0671
@ -353,7 +353,7 @@ FieldMoves_Fog_Unused:
_05B4:
Message FieldMoves_Text_DeepFogDrapesArea_Unused
WaitABXPadPress
WaitButton
CloseMessage
GoTo _0671
End
@ -430,7 +430,7 @@ FieldMoves_Waterfall:
_06C3:
Message FieldMoves_Text_WallOfWater
WaitABXPadPress
WaitButton
CloseMessage
GoTo _0671
End

16
res/field/scripts/scripts_fight_area.s
View File

@ -190,7 +190,7 @@ _02EE:
WaitMovement
BufferRivalName 0
Message 3
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End
@ -433,21 +433,21 @@ _0521:
Common_GiveItemQuantity
SetFlag FLAG_SUPER_ROD_OBTAINED
Message 44
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End
_056F:
Message 45
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End
_057A:
Message 46
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End
@ -478,7 +478,7 @@ _05CA:
_05FB:
Message 40
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End
@ -641,7 +641,7 @@ _0802:
LockAll
FacePlayer
Message 5
WaitABXPadPress
WaitButton
ApplyMovement 25, _0450
WaitMovement
CloseMessage
@ -653,7 +653,7 @@ _081F:
LockAll
FacePlayer
Message 6
WaitABXPadPress
WaitButton
ApplyMovement 24, _0470
WaitMovement
CloseMessage
@ -665,7 +665,7 @@ _083C:
LockAll
FacePlayer
Message 21
WaitABXPadPress
WaitButton
ApplyMovement 8, _085C
WaitMovement
CloseMessage

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

@ -31,7 +31,7 @@ _002A:
_0071:
Message 1
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End

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

@ -95,7 +95,7 @@ _0182:
_018D:
Message 5
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End

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

@ -132,7 +132,7 @@ FloaromaMeadow_CantGiveHoneyBagIsFull:
Message FloaromaMeadow_Text_OhTooBadSeemsToMeYourBagsFull
FloaromaMeadow_DefeatedGruntsReturn:
SetFlag FLAG_DEFEATED_FLOAROMA_MEADOW_GRUNTS
WaitABXPadPress
WaitButton
CloseMessage
Return
@ -206,7 +206,7 @@ FloaromaMeadow_TryGiveHoney:
FloaromaMeadow_OopsyWellComeAgain:
Message FloaromaMeadow_Text_OopsyWellComeAgain
WaitABXPadPress
WaitButton
HideMoney
CloseMessage
ReleaseAll
@ -214,7 +214,7 @@ FloaromaMeadow_OopsyWellComeAgain:
FloaromaMeadow_CantBuyHoneyBagIsFull:
Message FloaromaMeadow_Text_OhTooBadSeemsToMeYourBagsFull
WaitABXPadPress
WaitButton
HideMoney
CloseMessage
ReleaseAll
@ -222,7 +222,7 @@ FloaromaMeadow_CantBuyHoneyBagIsFull:
FloaromaMeadow_OopsyYouDontHaveEnoughMoney:
Message FloaromaMeadow_Text_OopsyYouDontHaveEnoughMoney
WaitABXPadPress
WaitButton
HideMoney
CloseMessage
ReleaseAll

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

@ -28,7 +28,7 @@ FloaromaTown_Grunts:
ApplyMovement LOCALID_GRUNT_M_EAST, FloaromaTown_Movement_WalkOnSpotWest
WaitMovement
Message FloaromaTown_Text_DontComplainThisIsAPrettyDecentAssignment
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End
@ -52,14 +52,14 @@ FloaromaTown_SchoolKidM:
ApplyMovement LOCALID_SCHOOL_KID_M, FloaromaTown_Movement_SchoolKidMFaceNorth
WaitMovement
Message FloaromaTown_Text_ThoseGalacticGuysWentToTheMeadowPastTheseFlowersHere
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End
FloaromaTown_BeingSurroundedByFlowersPutsMeInAnOddlyPleasantMood:
Message FloaromaTown_Text_BeingSurroundedByFlowersPutsMeInAnOddlyPleasantMood
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End
@ -127,7 +127,7 @@ FloaromaTown_GracideaFlowersHaveBeenAroundALongTimeInThisRegion:
End
FloaromaTown_BeautyEnd:
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End

4
res/field/scripts/scripts_floaroma_town_middle_house.s
View File

@ -24,7 +24,7 @@ FloaromaTownMiddleHouse_Twin:
FloaromaTownMiddleHouse_OhIGuessIJustLikeWeirdThings:
Message FloaromaTownMiddleHouse_Text_OhIGuessIJustLikeWeirdThings
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End
@ -42,7 +42,7 @@ FloaromaTownMiddleHouse_HeresTheTMForTheMovePluck:
FloaromaTownMiddleHouse_WhenAPokemonUsesPluckItEatsABerryHeldByItsFoe:
Message FloaromaTownMiddleHouse_Text_WhenAPokemonUsesPluckItEatsABerryHeldByItsFoe
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End

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

@ -27,14 +27,14 @@ FloaromaTownPokecenter1F_AceTrainerF:
FacePlayer
GoToIfGe VAR_VALLEY_WINDWORKS_TEAM_GALACTIC_STATE, 2, FloaromaTownPokecenter1F_ItsALongWayFromHereToEternaCity
Message FloaromaTownPokecenter1F_Text_ThereveBeenProblemsWithTheElectricPowerLately
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End
FloaromaTownPokecenter1F_ItsALongWayFromHereToEternaCity:
Message FloaromaTownPokecenter1F_Text_ItsALongWayFromHereToEternaCity
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End

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

@ -55,7 +55,7 @@ FlowerParadise_Shaymin:
FlowerParadise_ShayminDisappearedAmongTheFlowers:
Message FlowerParadise_Text_ShayminDisappearedAmongTheFlowers
WaitABXPadPress
WaitButton
CloseMessage
ClearFlag FLAG_HIDE_FLOWER_PARADISE_SHAYMIN
ReleaseAll

4
res/field/scripts/scripts_flower_shop.s
View File

@ -25,7 +25,7 @@ FlowerShop_PokemonBreederF:
FlowerShop_PleasePlantThatBerryInSoftEarthySoil:
Message FlowerShop_Text_PleasePlantThatBerryInSoftEarthySoil
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End
@ -52,7 +52,7 @@ FlowerShop_Lass:
FlowerShop_UseThatSprayduckToWaterTheSoilWhereYouvePlantedBerries:
Message FlowerShop_Text_UseThatSprayduckToWaterTheSoilWhereYouvePlantedBerries
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End

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

@ -17,7 +17,7 @@ FollowerPartners_Rival:
GoToIfGe VAR_FOLLOWER_RIVAL_STATE, 3, FollowerPartners_Rival_PostStarterMessage
BufferPlayerName 1
Message FollowerPartners_Text_Rival_HeyPlayerYouCanChooseFirst
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End
@ -30,14 +30,14 @@ FollowerPartners_Rival_PostStarterMessage:
GoToIfEq VAR_FOLLOWER_RIVAL_TIMES_TALKED, 1, FollowerPartners_Rival_PokemonAllHaveDifferentMovesHuh
BufferRivalName 0
Message FollowerPartners_Text_Rival_ThatPokemonBattle
WaitABXPadPress
WaitButton
GoTo FollowerPartners_Rival_IncreaseTimesTalked
End
FollowerPartners_Rival_Unused:
BufferRivalName 0
Message FollowerPartners_Text_Rival_AllRightLetsMoveOut
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End
@ -45,7 +45,7 @@ FollowerPartners_Rival_Unused:
FollowerPartners_Rival_HeyThatsEnoughTalkingAlready:
BufferRivalName 0
Message FollowerPartners_Text_Rival_HeyThatsEnoughTalkingAlready
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End
@ -53,14 +53,14 @@ FollowerPartners_Rival_HeyThatsEnoughTalkingAlready:
FollowerPartners_Rival_HeyDoYouKnowAboutTheChampion:
BufferRivalName 0
Message FollowerPartners_Text_Rival_HeyDoYouKnowAboutTheChampion
WaitABXPadPress
WaitButton
GoTo FollowerPartners_Rival_IncreaseTimesTalked
End
FollowerPartners_Rival_ThatLakeHasAMiragePokemonLivingInIt:
BufferRivalName 0
Message FollowerPartners_Text_Rival_ThatLakeHasAMiragePokemonLivingInIt
WaitABXPadPress
WaitButton
GoTo FollowerPartners_Rival_IncreaseTimesTalked
End
@ -68,14 +68,14 @@ FollowerPartners_Rival_DoYouBelieveIt:
BufferRivalName 0
BufferRivalStarterSpeciesName 1
Message FollowerPartners_Text_Rival_DoYouBelieveIt
WaitABXPadPress
WaitButton
GoTo FollowerPartners_Rival_IncreaseTimesTalked
End
FollowerPartners_Rival_PokemonAllHaveDifferentMovesHuh:
BufferRivalName 0
Message FollowerPartners_Text_Rival_PokemonAllHaveDifferentMovesHuh
WaitABXPadPress
WaitButton
GoTo FollowerPartners_Rival_IncreaseTimesTalked
End
@ -97,7 +97,7 @@ _00F9:
_0126:
BufferRivalName 0
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End
@ -108,7 +108,7 @@ _0131:
End
_013C:
WaitABXPadPress
WaitButton
CloseMessage
AddVar VAR_UNK_0x40CB, 1
ReleaseAll
@ -133,14 +133,14 @@ FollowerPartners_Cheryl_MyPokemonIsAnExcellentHealer:
FollowerPartners_Cheryl_PlayerBattlingWithYouMakesMeFeelElated:
BufferPlayerName 0
Message FollowerPartners_Text_Cheryl_PlayerBattlingWithYouMakesMeFeelElated
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End
FollowerPartners_Cheryl_IncreaseTimesTalked:
AddVar VAR_FOLLOWER_CHERYL_TIMES_TALKED, 1
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End
@ -169,14 +169,14 @@ FollowerPartners_Buck_MyBigBrothersOneOfTheEliteFour:
FollowerPartners_Buck_ItMightBeCoolBeingAGymLeaderOrEliteFour:
Message FollowerPartners_Text_Buck_ItMightBeCoolBeingAGymLeaderOrEliteFour
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End
FollowerPartners_Buck_IncreaseTimesTalked:
AddVar VAR_FOLLOWER_BUCK_TIMES_TALKED, 1
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End
@ -200,14 +200,14 @@ FollowerPartners_Mira_ThisCaveItsSoEasyToGetConfusedHere:
FollowerPartners_Mira_PlayerDidYouGetToBeSoGood:
BufferPlayerName 0
Message FollowerPartners_Text_Mira_PlayerDidYouGetToBeSoGood
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End
FollowerPartners_Mira_IncreaseTimesTalked:
AddVar VAR_FOLLOWER_MIRA_TIMES_TALKED, 1
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End
@ -225,14 +225,14 @@ FollowerPartners_Marley:
FollowerPartners_Marley_ThePokemonAmongFlowers:
Message FollowerPartners_Text_Marley_ThePokemonAmongFlowers
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End
FollowerPartners_Marley_IncreaseTimesTalked:
AddVar VAR_FOLLOWER_MARLEY_TIMES_TALKED, 1
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End

12
res/field/scripts/scripts_footstep_house.s
View File

@ -372,7 +372,7 @@ FootstepHouse_AndThatsWhatYourPokemonThinksOfYou_NoRibbon:
Call _00ED
WaitTime 10, VAR_RESULT
Message FootstepHouse_Text_AndThatsWhatYourPokemonThinksOfYou
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End
@ -383,7 +383,7 @@ FootstepHouse_PokemonDoesntLeaveAnyFootprints:
Call _00ED
WaitTime 10, VAR_RESULT
Message FootstepHouse_Text_PokemonDoesntLeaveAnyFootprints
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End
@ -394,7 +394,7 @@ FootstepHouse_PokemonSilentType_NoRibbon:
Call _00ED
WaitTime 10, VAR_RESULT
Message FootstepHouse_Text_PokemonSilentType
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End
@ -410,7 +410,7 @@ FootstepHouse_AndThatsWhatYourPokemonThinksOfYou_GiveRibbon:
WaitSound
SetPartyMonRibbon LOCALID_PARTY_SLOT, RIBBON_FOOTPRINT
Message FootstepHouse_Text_PlayerPutTheFootprintRibbonOnPokemon
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End
@ -426,7 +426,7 @@ FootstepHouse_PokemonDoesntLeaveAnyFootprints_GiveRibbon:
WaitSound
SetPartyMonRibbon LOCALID_PARTY_SLOT, RIBBON_FOOTPRINT
Message FootstepHouse_Text_PlayerPutTheFootprintRibbonOnPokemon
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End
@ -442,7 +442,7 @@ FootstepHouse_PokemonSilentType_GiveRibbon:
WaitSound
SetPartyMonRibbon LOCALID_PARTY_SLOT, RIBBON_FOOTPRINT
Message FootstepHouse_Text_PlayerPutTheFootprintRibbonOnPokemon
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End

4
res/field/scripts/scripts_fuego_ironworks_building.s
View File

@ -55,7 +55,7 @@ _00E1:
End
_00EC:
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End
@ -111,7 +111,7 @@ _019E:
_01E5:
Message 6
Message 8
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End

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

@ -41,7 +41,7 @@ _005D:
_0098:
Message 3
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End

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

@ -30,7 +30,7 @@ _000C:
AddObject 1
SetFlag FLAG_UNK_0x011F
Message 0
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End

20
res/field/scripts/scripts_galactic_hq_1f.s
View File

@ -22,14 +22,14 @@ _0028:
FacePlayer
GoToIfSet FLAG_GALACTIC_LEFT_LAKE_VALOR, _0046
Message 0
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End
_0046:
Message 1
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End
@ -40,14 +40,14 @@ _0051:
FacePlayer
GoToIfSet FLAG_GALACTIC_LEFT_LAKE_VALOR, _006F
Message 4
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End
_006F:
Message 5
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End
@ -58,14 +58,14 @@ _007A:
FacePlayer
GoToIfSet FLAG_GALACTIC_LEFT_LAKE_VALOR, _0098
Message 6
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End
_0098:
Message 7
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End
@ -76,14 +76,14 @@ _00A3:
FacePlayer
GoToIfSet FLAG_GALACTIC_LEFT_LAKE_VALOR, _00C1
Message 2
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End
_00C1:
Message 3
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End
@ -99,7 +99,7 @@ _00DF:
CheckItem ITEM_GALACTIC_KEY, 1, VAR_RESULT
GoToIfEq VAR_RESULT, 1, _0107
Message 9
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End
@ -114,7 +114,7 @@ _0107:
_012A:
BufferPlayerName 0
Message 11
WaitABXPadPress
WaitButton
WaitFanfare SEQ_SE_CONFIRM
PlayFanfare SEQ_SE_DP_DOOR10
ApplyMovement 5, _0164

4
res/field/scripts/scripts_galactic_hq_2f.s
View File

@ -32,7 +32,7 @@ _003E:
WaitFadeScreen
BufferPlayerName 0
Message 2
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End
@ -83,7 +83,7 @@ _010A:
End
_0118:
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End

4
res/field/scripts/scripts_galactic_hq_3f.s
View File

@ -18,7 +18,7 @@ _0021:
CheckItem ITEM_GALACTIC_KEY, 1, VAR_RESULT
GoToIfEq VAR_RESULT, 1, _0049
Message 1
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End
@ -33,7 +33,7 @@ _0049:
_006C:
BufferPlayerName 0
Message 3
WaitABXPadPress
WaitButton
WaitFanfare SEQ_SE_CONFIRM
PlayFanfare SEQ_SE_DP_DOOR10
ApplyMovement 5, _00A8

4
res/field/scripts/scripts_galactic_hq_4f.s
View File

@ -106,7 +106,7 @@ _012C:
CheckItem ITEM_GALACTIC_KEY, 1, VAR_RESULT
GoToIfEq VAR_RESULT, 1, _0154
Message 5
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End
@ -121,7 +121,7 @@ _0154:
_0177:
BufferPlayerName 0
Message 7
WaitABXPadPress
WaitButton
WaitFanfare SEQ_SE_CONFIRM
PlayFanfare SEQ_SE_DP_DOOR10
ApplyMovement 1, _01B4

4
res/field/scripts/scripts_galactic_hq_b2f.s
View File

@ -22,7 +22,7 @@ _0034:
CheckItem ITEM_GALACTIC_KEY, 1, VAR_RESULT
GoToIfEq VAR_RESULT, 1, _005C
Message 2
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End
@ -37,7 +37,7 @@ _005C:
_007F:
BufferPlayerName 0
Message 4
WaitABXPadPress
WaitButton
WaitFanfare SEQ_SE_CONFIRM
PlayFanfare SEQ_SE_DP_DOOR10
ApplyMovement 6, _00BC

22
res/field/scripts/scripts_galactic_hq_control_room.s
View File

@ -74,14 +74,14 @@ _0105:
_0109:
Message 3
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End
_0114:
Message 2
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End
@ -114,14 +114,14 @@ _014C:
LockAll
GoToIfSet FLAG_FREED_GALACTIC_HQ_POKEMON, _0168
Message 13
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End
_0168:
Message 16
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End
@ -131,14 +131,14 @@ _0173:
LockAll
GoToIfSet FLAG_FREED_GALACTIC_HQ_POKEMON, _018F
Message 14
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End
_018F:
Message 17
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End
@ -148,14 +148,14 @@ _019A:
LockAll
GoToIfSet FLAG_FREED_GALACTIC_HQ_POKEMON, _01B6
Message 15
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End
_01B6:
Message 18
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End
@ -261,7 +261,7 @@ _0341:
_0347:
Message 12
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End
@ -354,7 +354,7 @@ _03FD:
ApplyMovement 0, _0468
WaitMovement
Message 8
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End
@ -362,7 +362,7 @@ _03FD:
_0450:
FacePlayer
Message 9
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End

26
res/field/scripts/scripts_game_corner.s
View File

@ -93,7 +93,7 @@ GameCorner_SlotMachine:
GameCorner_SlotMachine_NoCoinCase:
Message GameCorner_Text_YouCantPlayIfYouDontHaveACoinCase
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End
@ -114,7 +114,7 @@ GameCorner_CoinsClerk:
GameCorner_CoinsClerk_NoCoinCase:
Message GameCorner_Text_DidYouWantSomeCoins_NoCoinCase
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End
@ -168,7 +168,7 @@ GameCorner_CoinsClerk_Buy500Coins:
GameCorner_CoinsClerk_NotEnoughMoney:
Message GameCorner_Text_UmYouDontAppearToHaveEnoughMoney
WaitABXPadPress
WaitButton
CloseMessage
HideCoins
HideMoney
@ -177,7 +177,7 @@ GameCorner_CoinsClerk_NotEnoughMoney:
GameCorner_CoinsClerk_CoinCaseFull:
Message GameCorner_Text_OhYourCoinCaseIsFull
WaitABXPadPress
WaitButton
CloseMessage
HideCoins
HideMoney
@ -186,7 +186,7 @@ GameCorner_CoinsClerk_CoinCaseFull:
GameCorner_CoinsClerk_Cancel:
Message GameCorner_Text_OhYouDontNeedCoinsThen
WaitABXPadPress
WaitButton
CloseMessage
HideCoins
HideMoney
@ -215,7 +215,7 @@ GameCorner_CoinsClerk_GiveTM64:
Common_GiveItemQuantity
SetFlag FLAG_GAME_CORNER_RECEIVED_TM64
Message GameCorner_Text_PleaseKeepPlayingTheSlots
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End
@ -240,7 +240,7 @@ GameCorner_OldMan20Coins:
SetFlag FLAG_GAME_CORNER_RECEIVED_20_COINS_OLD_MAN
BufferPlayerName 0
Message GameCorner_Text_IveBeenWinningATonToday
WaitABXPadPress
WaitButton
PlayFanfare SEQ_SE_PL_COIN
AddCoins 20
WaitFanfare SEQ_SE_PL_COIN
@ -250,14 +250,14 @@ GameCorner_OldMan20Coins:
GameCorner_OldMan20Coins_NoCoinCase:
Message GameCorner_Text_HeyKidIfYouWantToPlayHereYouNeedACoinCase
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End
GameCorner_OldMan20Coins_LineUpClefairy:
Message GameCorner_Text_ListenWhenClefairyAppears
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End
@ -273,7 +273,7 @@ GameCorner_Farmer:
SetFlag FLAG_GAME_CORNER_RECEIVED_50_COINS_FARMER
BufferPlayerName 0
Message GameCorner_Text_WooHooClefairyLookYeahahItsACarnival
WaitABXPadPress
WaitButton
PlayFanfare SEQ_SE_PL_COIN
AddCoins 50
WaitFanfare SEQ_SE_PL_COIN
@ -283,14 +283,14 @@ GameCorner_Farmer:
GameCorner_Farmer_NoCoinCase:
Message GameCorner_Text_WooHooClefairyLookAtItItsDrivingMeBananas
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End
GameCorner_Farmer_CannotAddCoins:
Message GameCorner_Text_WooHooClefairyItsAdorable
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End
@ -337,7 +337,7 @@ GameCorner_Looker_PostStarkMountain:
End
GameCorner_Looker_End:
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End

16
res/field/scripts/scripts_global_terminal_1f.s
View File

@ -153,7 +153,7 @@ GlobalTerminal1f_CheckPartyCount:
GlobalTerminal1f_GTS_Exit_NotEnoughPokemon:
Message pl_msg_00000046_00009
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End
@ -206,7 +206,7 @@ GlobalTerminal1f_GTS_Exit:
GlobalTerminal1f_GTS_Clerk_EndTalk:
SetVar VAR_UNK_0x40D5, 0
Message pl_msg_00000046_00006
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End
@ -230,7 +230,7 @@ GlobalTerminal1f_CheckFreeBoxSlot:
GlobalTerminal1f_GTS_Exit_NoSpace:
Message pl_msg_00000046_00008
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End
@ -258,7 +258,7 @@ _0360:
GlobalTerminal1f_GTS_Exit_BadEgg:
CallCommonScript 0x2338 @ CommonScript_HasBadEgg; outputs pl_msg_00000221_00127
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End
@ -431,7 +431,7 @@ _05EE:
End
_05F9:
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End
@ -449,14 +449,14 @@ _0601:
ScrCmd_30E VAR_0x8004
GoToIfEq VAR_0x8004, 0, _0647
Message pl_msg_00000046_00030
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End
_0647:
Message pl_msg_00000046_00031
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End
@ -508,7 +508,7 @@ _06FD:
End
_0708:
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End

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

@ -18,28 +18,28 @@ _0006:
_0044:
Message 1
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End
_004F:
Message 2
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End
_005A:
Message 3
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End
_0065:
Message 4
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End

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

@ -25,7 +25,7 @@ _0014:
FadeScreenIn
WaitFadeScreen
Message 1
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End
@ -41,7 +41,7 @@ _005F:
SetFlag FLAG_UNK_0x00FD
FacePlayer
Message 3
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End
@ -52,7 +52,7 @@ _0081:
Message 4
FacePlayer
Message 5
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End

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

@ -15,14 +15,14 @@ _000A:
Message 0
SetVar VAR_0x8004, POKETCH_APPID_COINTOSS
Common_GivePoketchApp
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End
_003A:
Message 1
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End
@ -37,14 +37,14 @@ _0045:
_0066:
Message 2
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End
_0071:
Message 3
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End

12
res/field/scripts/scripts_grand_lake_route_213_northwest_house.s
View File

@ -22,7 +22,7 @@ _000E:
_0053:
Message 1
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End
@ -54,35 +54,35 @@ _0068:
_0103:
Message 3
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End
_010E:
Message 4
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End
_0119:
Message 5
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End
_0124:
Message 6
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End
_012F:
Message 7
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End

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

@ -28,7 +28,7 @@ _004B:
_0055:
Message 1
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End

4
res/field/scripts/scripts_grand_lake_valor_lakefront_west_house.s
View File

@ -19,7 +19,7 @@ _0006:
_004C:
Message 0
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End
@ -60,7 +60,7 @@ _0095:
_00D3:
Message 3
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End

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

@ -51,7 +51,7 @@ _0093:
_00BC:
Message 1
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End

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

@ -110,12 +110,12 @@ _01F8:
ScrCmd_21D 2, 0, 0
ScrCmd_21D 3, 0, 1
Message 7
WaitABXPadPress
WaitButton
GoTo _03EA
_0256:
Message 22
WaitABXPadPress
WaitButton
GoTo _03EA
_0261:
@ -169,7 +169,7 @@ _037A:
BufferPlayerName 0
ScrCmd_21D 2, VAR_0x8004, 1
Message 9
WaitABXPadPress
WaitButton
GoTo _03EA
_03DA:
@ -179,7 +179,7 @@ _03DA:
_03E5:
Message 4
WaitABXPadPress
WaitButton
_03EA:
CloseMessage
ReleaseAll

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

@ -59,7 +59,7 @@ _00C8:
_00D0:
Message 1
WaitABXPadPress
WaitButton
CloseMessage
ClearFlag FLAG_UNK_0x024E
ReleaseAll

12
res/field/scripts/scripts_hearthome_city.s
View File

@ -97,14 +97,14 @@ HearthomeCity_Fisherman:
HearthomeCity_ItMakesMeHappy:
Message HearthomeCity_Text_ItMakesMeHappy
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End
HearthomeCity_IDoApologize:
Message HearthomeCity_Text_IDoApologize
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End
@ -140,7 +140,7 @@ HearthomeCity_WalkToContestHallEast:
HearthomeCity_ThisIsTheContestHall:
SetFlag FLAG_UNK_0x0001
Message HearthomeCity_Text_ThisIsTheContestHall
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End
@ -405,21 +405,21 @@ HearthomeCity_NoGoodsToGive:
HearthomeCity_TalkToMeSomeOtherTime:
Message HearthomeCity_Text_TalkToMeSomeOtherTime
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End
HearthomeCity_YourUndergroundPCIsFull:
Message HearthomeCity_Text_YourUndergroundPCIsFull
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End
HearthomeCity_TalkToMeSomeOtherTime2:
Message HearthomeCity_Text_TalkToMeSomeOtherTime2
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End

4
res/field/scripts/scripts_hearthome_city_dp_gym_elevator_room_1.s
View File

@ -20,7 +20,7 @@ _001A:
LockAll
PlayFanfare SEQ_SE_DP_UG_020
Message 1
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End
@ -30,7 +30,7 @@ _002B:
LockAll
Message 0
PlayFanfare SEQ_SE_DP_MAZYO4
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End

4
res/field/scripts/scripts_hearthome_city_dp_gym_elevator_room_2.s
View File

@ -20,7 +20,7 @@ _001A:
LockAll
PlayFanfare SEQ_SE_DP_UG_020
Message 1
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End
@ -30,7 +30,7 @@ _002B:
LockAll
Message 0
PlayFanfare SEQ_SE_DP_MAZYO4
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End

4
res/field/scripts/scripts_hearthome_city_dp_gym_leader_room.s
View File

@ -78,7 +78,7 @@ _012B:
BufferItemName 0, VAR_0x8004
BufferTMHMMoveName 1, VAR_0x8004
Message 4
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End
@ -92,7 +92,7 @@ _0169:
_0173:
GoToIfUnset FLAG_OBTAINED_FANTINA_TM65, _012B
Message 5
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End

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

@ -30,7 +30,7 @@ EternaGym_GymGuideEncouragement:
End
EternaGym_GymGuideEnd:
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End
@ -48,7 +48,7 @@ HearthomeGym_GymStatue:
BufferRivalName 0
BufferRivalName 1
Message HearthomeGym_Text_GymStatueBeforeBadge
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End
@ -58,7 +58,7 @@ HearthomeGym_GymStatueAfterBadge:
BufferPlayerName 1
BufferRivalName 2
Message HearthomeGym_Text_GymStatueAfterBadge
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End

4
res/field/scripts/scripts_hearthome_city_gym_leader_room.s
View File

@ -94,7 +94,7 @@ HearthomeGym_FantinaTryGiveTM65:
BufferItemName 0, VAR_0x8004
BufferTMHMMoveName 1, VAR_0x8004
Message HearthomeGym_FantinaExplainTM65
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End
@ -108,7 +108,7 @@ HearthomeGym_FantinaCannotGiveTM65:
HearthomeGym_FantinaAfterBadge:
GoToIfUnset FLAG_OBTAINED_FANTINA_TM65, HearthomeGym_FantinaTryGiveTM65
Message HearthomeGym_Text_FantinaAfterBadge
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End

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

@ -67,14 +67,14 @@ HearthomeCityNorthwestHouse_DontGiveNickname:
HearthomeCityNorthwestHouse_PartyIsFull:
Message HearthomeCityNorthwestHouse_Text_YouCantTakeAnyMorePokemon
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End
HearthomeCityNorthwestHouse_DeclineEevee:
Message HearthomeCityNorthwestHouse_Text_GuessIllRaiseItMyself
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End
@ -83,14 +83,14 @@ HearthomeCityNorthwestHouse_AlreadyReceivedEevee:
GetNationalDexEnabled VAR_RESULT
GoToIfEq VAR_RESULT, TRUE, HearthomeCityNorthwestHouse_NowThatsANationalDex
Message HearthomeCityNorthwestHouse_Text_BillDevelopedTheBasicStorageSystem
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End
HearthomeCityNorthwestHouse_NowThatsANationalDex:
Message HearthomeCityNorthwestHouse_Text_NowThatsANationalDex
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End

18
res/field/scripts/scripts_hearthome_city_pokemon_fan_club.s
View File

@ -32,14 +32,14 @@ HearthomeCityPokemonFanClub_Gentleman:
Common_GiveItemQuantity
SetFlag FLAG_RECEIVED_HEARTHOME_CITY_POKEMON_FAN_CLUB_POFFIN_CASE
Message HearthomeCityPokemonFanClub_Text_FillItWithPoffins
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End
HearthomeCityPokemonFanClub_WeAreTheNumberOneFanClub:
Message HearthomeCityPokemonFanClub_Text_WeAreTheNumberOneFanClub
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End
@ -69,49 +69,49 @@ HearthomeCityPokemonFanClub_Beauty:
HearthomeCityPokemonFanClub_Friendship255:
Message HearthomeCityPokemonFanClub_Text_ItSimplyAdoresYou
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End
HearthomeCityPokemonFanClub_Friendship200To254:
Message HearthomeCityPokemonFanClub_Text_ItsVeryFriendlyTowardYou
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End
HearthomeCityPokemonFanClub_Friendship150To199:
Message HearthomeCityPokemonFanClub_Text_ItsQuiteFriendlyToYou
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End
HearthomeCityPokemonFanClub_Friendship100To149:
Message HearthomeCityPokemonFanClub_Text_ItsWarmingUpToYou
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End
HearthomeCityPokemonFanClub_Friendship50To99:
Message HearthomeCityPokemonFanClub_Text_ItsFeelingNeutralTowardYou
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End
HearthomeCityPokemonFanClub_Friendship1To49:
Message HearthomeCityPokemonFanClub_Text_ItSeemsToDislikeYouALittle
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End
HearthomeCityPokemonFanClub_Friendship0:
Message HearthomeCityPokemonFanClub_Text_ThisOneReallyHasntTakenTooKindlyToYou
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End

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

@ -25,7 +25,7 @@ HearthomeCitySoutheastHouse2F_AceTrainerF:
HearthomeCitySoutheastHouse2F_ExplainShellBell:
BufferItemName 0, ITEM_SHELL_BELL
Message HearthomeCitySoutheastHouse2F_Text_TheHolderRegainsHPWhenItInflictsDamage
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End

4
res/field/scripts/scripts_hidden_items.s
View File

@ -380,7 +380,7 @@ _05FA:
_060D:
SetFlagFromVar VAR_0x8006
Message 9
WaitABXPadPress
WaitButton
SetVar VAR_RESULT, 1
GoTo _04AC
End
@ -403,7 +403,7 @@ _063C:
_064F:
BufferItemName 0, VAR_0x8004
Message 4
WaitABXPadPress
WaitButton
SetVar VAR_RESULT, 0
GoTo _04AC
End

4
res/field/scripts/scripts_iceberg_ruins.s
View File

@ -80,7 +80,7 @@ IcebergRuins_ItsAStatueOfAPokemon:
End
IcebergRuins_StatueEnd:
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End
@ -144,7 +144,7 @@ IcebergRuins_ActivateStatue:
ScrCmd_29F 1
SetVar VAR_ICEBERG_RUINS_STATE, RUINS_STATE_ACTIVATED_STATUE
Message IcebergRuins_Text_SomethingChangedInTheAir
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End

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

@ -35,7 +35,7 @@ _003E:
_0071:
Message 5
WaitABXPadPress
WaitButton
CloseMessage
ReleaseAll
End

Some files were not shown because too many files have changed in this diff Show More