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

Merge remote-tracking branch 'pret/master' into pokefirered_pokeemeraldSync4

Browse Source 
# Conflicts:
#	include/battle.h
#	include/cable_club.h
#	src/battle_anim_fire.c
#	src/battle_anim_ghost.c
#	src/battle_anim_ground.c
#	src/battle_message.c
#	src/cable_club.c
This commit is contained in:
Eduardo Quezada
2022-09-04 17:44:13 -03:00
parent 616ab63d94 b3c7b9e09f
commit 9241dc6fe7
355 changed files with 20064 additions and 19067 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Makefile
+1 -1
View File
@@ -245,7 +245,7 @@ $(C_BUILDDIR)/isagbprn.o: CC1 := tools/agbcc/bin/old_agbcc$(EXE)
$(C_BUILDDIR)/isagbprn.o: CFLAGS := -mthumb-interwork
$(C_BUILDDIR)/trainer_tower.o: CFLAGS += -ffreestanding
$(C_BUILDDIR)/flying.o: CFLAGS += -ffreestanding
$(C_BUILDDIR)/battle_anim_flying.o: CFLAGS += -ffreestanding
$(C_BUILDDIR)/librfu_intr.o: CC1 := tools/agbcc/bin/agbcc_arm$(EXE)
$(C_BUILDDIR)/librfu_intr.o: CFLAGS := -O2 -mthumb-interwork -quiet
asm/macros/battle_anim_script.inc
+46 -46
View File
@@ -14,7 +14,7 @@
.byte 0x02
.4byte \template
.if \anim_battler == ANIM_TARGET
.byte 0x80 | (\subpriority_offset & 0x7F)
.byte ANIMSPRITE_IS_TARGET | (\subpriority_offset & 0x7F)
.else
.byte (\subpriority_offset & 0x7F)
.endif
@@ -34,20 +34,20 @@
.Lcreatetask_\@_2:
.endm
.macro delay param0:req
.macro delay frames:req
.byte 0x4
.byte \param0
.byte \frames
.endm
.macro waitforvisualfinish
.byte 0x5
.endm
.macro hang1
.macro nop
.byte 0x6
.endm
.macro hang2
.macro nop2
.byte 0x7
.endm
@@ -79,30 +79,30 @@
.byte 0xd
.endm
.macro call param0:req
.macro call ptr:req
.byte 0xe
.4byte \param0
.4byte \ptr
.endm
.macro return
.byte 0xf
.endm
.macro setarg param0:req, param1:req
.macro setarg argId:req, value:req
.byte 0x10
.byte \param0
.2byte \param1
.byte \argId
.2byte \value
.endm
.macro choosetwoturnanim param0:req, param1:req
.macro choosetwoturnanim ptr1:req, ptr2:req
.byte 0x11
.4byte \param0
.4byte \param1
.4byte \ptr1
.4byte \ptr2
.endm
.macro jumpifmoveturn param0:req, ptr:req
.macro jumpifmoveturn value:req, ptr:req
.byte 0x12
.byte \param0
.byte \value
.4byte \ptr
.endm
@@ -144,13 +144,13 @@
.byte \pan
.endm
.macro panse_1B se:req, param1:req, param2:req, param3:req, param4:req
.macro panse se:req, currentPan:req, targetPan:req, incrementPan:req, delay:req
.byte 0x1b
.2byte \se
.byte \param1
.byte \param2
.byte \param3
.byte \param4
.byte \currentPan
.byte \targetPan
.byte \incrementPan
.byte \delay
.endm
.macro loopsewithpan se:req, pan:req, wait:req, times:req
@@ -168,9 +168,9 @@
.byte \wait
.endm
.macro setbldcnt param0:req
.macro setbldcnt bldcnt:req
.byte 0x1e
.2byte \param0
.2byte \bldcnt
.endm
.macro createsoundtask addr:req, argv:vararg
@@ -186,19 +186,19 @@
.byte 0x20
.endm
.macro jumpargeq param0:req, param1:req, ptr:req
.macro jumpargeq argId:req, value:req, ptr:req
.byte 0x21
.byte \param0
.2byte \param1
.byte \argId
.2byte \value
.4byte \ptr
.endm
.macro monbg_22 battler:req
.macro monbg_static battler:req
.byte 0x22
.byte \battler
.endm
.macro clearmonbg_23 battler:req
.macro clearmonbg_static battler:req
.byte 0x23
.byte \battler
.endm
@@ -208,41 +208,41 @@
.4byte \ptr
.endm
.macro fadetobgfromset param0:req, param1:req, param2:req
.macro fadetobgfromset bgOpponent:req, bgPlayer:req, bgContest:req
.byte 0x25
.byte \param0
.byte \param1
.byte \param2
.byte \bgOpponent
.byte \bgPlayer
.byte \bgContest
.endm
.macro panse_26 se:req, param1:req, param2:req, param3:req, param4:req
.macro panse_adjustnone se:req, currentPan:req, targetPan:req, incrementPan:req, delay:req
.byte 0x26
.2byte \se
.byte \param1
.byte \param2
.byte \param3
.byte \param4
.byte \currentPan
.byte \targetPan
.byte \incrementPan
.byte \delay
.endm
.macro panse_27 se:req, param1:req, param2:req, param3:req, param4:req
.macro panse_adjustall se:req, currentPan:req, targetPan:req, incrementPan:req, delay:req
.byte 0x27
.2byte \se
.byte \param1
.byte \param2
.byte \param3
.byte \param4
.byte \currentPan
.byte \targetPan
.byte \incrementPan
.byte \delay
.endm
.macro monbgprio_28 battler:req
.macro splitbgprio battler:req
.byte 0x28
.byte \battler
.endm
.macro monbgprio_29
.macro splitbgprio_all
.byte 0x29
.endm
.macro monbgprio_2A battler:req
.macro splitbgprio_foes battler:req
.byte 0x2a
.byte \battler
.endm
@@ -257,12 +257,12 @@
.byte \battler
.endm
.macro doublebattle_2D battler:req
.macro teamattack_moveback battler:req
.byte 0x2d
.byte \battler
.endm
.macro doublebattle_2E battler:req
.macro teamattack_movefwd battler:req
.byte 0x2e
.byte \battler
.endm
asm/macros/battle_script.inc
+6 -6
View File
@@ -1282,16 +1282,16 @@
various BS_ATTACKER, VARIOUS_RESET_PLAYER_FAINTED
.endm
.macro various8 battler:req
various \battler, 8
.macro getbattlersforrecall
various BS_ATTACKER, VARIOUS_GET_BATTLERS_FOR_RECALL
.endm
.macro returnopponentmon1toball battler:req
various \battler, VARIOUS_RETURN_OPPONENT_MON1
.macro returnopponentmon1toball
various BS_ATTACKER, VARIOUS_RETURN_OPPONENT_MON1
.endm
.macro returnopponentmon2toball battler:req
various \battler, VARIOUS_RETURN_OPPONENT_MON2
.macro returnopponentmon2toball
various BS_ATTACKER, VARIOUS_RETURN_OPPONENT_MON2
.endm
.macro checkpokeflute battler:req
asm/macros/event.inc
+1 -1
View File
@@ -285,7 +285,7 @@
.endm
@ Blocks script execution until a command or C code manually unblocks it. Generally used with specific
@ commands and specials. Calling EnableBothScriptContexts for instance will allow execution to continue.
@ commands and specials. Calling ScriptContext_Enable for instance will allow execution to continue.
.macro waitstate
.byte 0x27
.endm
charmap.txt
+3 -7
View File
@@ -406,13 +406,9 @@ B_ATK_PREFIX2 = FD 2A
B_DEF_PREFIX2 = FD 2B
B_ATK_PREFIX3 = FD 2C
B_DEF_PREFIX3 = FD 2D
B_TRAINER2_CLASS = FD 2E
B_TRAINER2_NAME = FD 2F
B_TRAINER2_LOSE_TEXT = FD 30
B_TRAINER2_WIN_TEXT = FD 31
B_PARTNER_CLASS = FD 32
B_PARTNER_NAME = FD 33
B_BUFF3 = FD 34
B_TRAINER2_LOSE_TEXT = FD 2E
B_TRAINER2_WIN_TEXT = FD 2F
B_BUFF3 = FD 30
@ indicates the end of a town/city name (before " TOWN" or " CITY")
NAME_END = FC 00
constants/gba_constants.inc
+23
View File
@@ -488,3 +488,26 @@
.set OAM_SIZE_8x32, OAM_SIZE_1 | OAM_V_RECTANGLE
.set OAM_SIZE_16x32, OAM_SIZE_2 | OAM_V_RECTANGLE
.set OAM_SIZE_32x64, OAM_SIZE_3 | OAM_V_RECTANGLE
@ BLDCNT
.set BLDCNT_TGT1_BG0, 1 << 0
.set BLDCNT_TGT1_BG1, 1 << 1
.set BLDCNT_TGT1_BG2, 1 << 2
.set BLDCNT_TGT1_BG3, 1 << 3
.set BLDCNT_TGT1_OBJ, 1 << 4
.set BLDCNT_TGT1_BD, 1 << 5
.set BLDCNT_TGT1_ALL, BLDCNT_TGT1_BG0 | BLDCNT_TGT1_BG1 | BLDCNT_TGT1_BG2 | BLDCNT_TGT1_BG3 | BLDCNT_TGT1_OBJ | BLDCNT_TGT1_BD
.set BLDCNT_EFFECT_NONE, 0 << 6
.set BLDCNT_EFFECT_BLEND, 1 << 6
.set BLDCNT_EFFECT_LIGHTEN, 2 << 6
.set BLDCNT_EFFECT_DARKEN, 3 << 6
.set BLDCNT_TGT2_BG0, 1 << 8
.set BLDCNT_TGT2_BG1, 1 << 9
.set BLDCNT_TGT2_BG2, 1 << 10
.set BLDCNT_TGT2_BG3, 1 << 11
.set BLDCNT_TGT2_OBJ, 1 << 12
.set BLDCNT_TGT2_BD, 1 << 13
.set BLDCNT_TGT2_ALL, BLDCNT_TGT2_BG0 | BLDCNT_TGT2_BG1 | BLDCNT_TGT2_BG2 | BLDCNT_TGT2_BG3 | BLDCNT_TGT2_OBJ | BLDCNT_TGT2_BD
data/battle_anim_scripts.s
+3394 -3397
View File
File diff suppressed because it is too large Load Diff
data/battle_scripts_1.s
+6 -6
View File
@@ -11,7 +11,7 @@
#include "constants/songs.h"
#include "constants/trainers.h"
#include "constants/game_stat.h"
#include "battle_string_ids.h"
#include "constants/battle_string_ids.h"
.include "asm/macros/battle_script.inc"
@ Define these here since misc_constants.inc conflicts with the C headers
.set NULL, 0
@@ -2964,20 +2964,20 @@ BattleScript_RivalBattleLostSkipMonRecall::
end2
BattleScript_BattleTowerLost::
various8 BS_ATTACKER
getbattlersforrecall
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, 0, BattleScript_BattleTowerLostLostSkipMonRecall
printfromtable gDoubleBattleRecallStrings
waitmessage B_WAIT_TIME_LONG
returnopponentmon1toball BS_ATTACKER
returnopponentmon1toball
waitstate
returnopponentmon2toball BS_ATTACKER
returnopponentmon2toball
waitstate
BattleScript_BattleTowerLostLostSkipMonRecall::
trainerslidein BS_ATTACKER
waitstate
printstring STRINGID_TRAINER1WINTEXT
jumpifnotbattletype BATTLE_TYPE_DOUBLE, BattleScript_BattleTowerLostLostSkipDouble
printstring STRINGID_TRAINER2NAME
printstring STRINGID_TRAINER2WINTEXT
BattleScript_BattleTowerLostLostSkipDouble::
end2
@@ -2995,7 +2995,7 @@ BattleScript_BattleTowerTrainerBattleWon::
jumpifnotbattletype BATTLE_TYPE_TRAINER_TOWER, BattleScript_BattleTowerEtcTrainerBattleWonSkipText
printstring STRINGID_TRAINER1LOSETEXT
jumpifnotbattletype BATTLE_TYPE_DOUBLE, BattleScript_BattleTowerEtcTrainerBattleWonSkipText
printstring STRINGID_TRAINER2CLASS
printstring STRINGID_TRAINER2LOSETEXT
BattleScript_BattleTowerEtcTrainerBattleWonSkipText::
pickup
end2
data/battle_scripts_2.s
+2 -2
View File
@@ -9,7 +9,7 @@
#include "constants/pokemon.h"
#include "constants/songs.h"
#include "constants/game_stat.h"
#include "battle_string_ids.h"
#include "constants/battle_string_ids.h"
.include "asm/macros/battle_script.inc"
@ Define these here since misc_constants.inc conflicts with the C headers
.set NULL, 0
@@ -209,7 +209,7 @@ BattleScript_PokeFluteEnd::
finishaction
BattleScript_WatchesCarefully::
printfromtable gSafariPokeblockResultStringIds
printfromtable gSafariReactionStringIds
waitmessage B_WAIT_TIME_LONG
playanimation BS_OPPONENT1, B_ANIM_SAFARI_REACTION
end2
data/event_scripts.s
+4 -4
View File
@@ -1175,16 +1175,16 @@ EventScript_ReleaseEnd::
@ Unused
EventScript_DelayedLookAround::
lockall
applymovement VAR_0x8004, Movement_WalkInPlaceFasterLeft
applymovement VAR_0x8004, Common_Movement_WalkInPlaceFasterLeft
waitmovement 0
delay 20
applymovement VAR_0x8004, Movement_WalkInPlaceFasterUp
applymovement VAR_0x8004, Common_Movement_WalkInPlaceFasterUp
waitmovement 0
delay 20
applymovement VAR_0x8004, Movement_WalkInPlaceFasterRight
applymovement VAR_0x8004, Common_Movement_WalkInPlaceFasterRight
waitmovement 0
delay 20
applymovement VAR_0x8004, Movement_WalkInPlaceFasterDown
applymovement VAR_0x8004, Common_Movement_WalkInPlaceFasterDown
waitmovement 0
delay 20
releaseall
data/field_effect_scripts.s
+2 -2
View File
@@ -48,7 +48,7 @@ gFieldEffectScriptPointers::
.4byte gFldEffScript_UseWaterfall @ FLDEFF_USE_WATERFALL
.4byte gFldEffScript_UseDive @ FLDEFF_USE_DIVE
.4byte gFldEffScript_Pokeball @ FLDEFF_POKEBALL
.4byte gFldEffScript_HeartIcon @ FLDEFF_X_ICON
.4byte gFldEffScript_XIcon @ FLDEFF_X_ICON
.4byte gFldEffScript_Nop47 @ FLDEFF_NOP_47
.4byte gFldEffScript_Nop48 @ FLDEFF_NOP_48
.4byte gFldEffScript_PopOutOfAsh @ FLDEFF_POP_OUT_OF_ASH
@@ -256,7 +256,7 @@ gFldEffScript_Pokeball::
callnative FldEff_Pokeball
end
gFldEffScript_HeartIcon::
gFldEffScript_XIcon::
callnative FldEff_XIcon
end
data/maps/CeladonCity/scripts.inc
+2 -2
View File
@@ -36,7 +36,7 @@ CeladonCity_EventScript_FatMan::
faceplayer
msgbox CeladonCity_Text_MyTrustedPalPoliwrath
closemessage
applymovement LOCALID_FAT_MAN, Movement_FaceOriginalDirection
applymovement LOCALID_FAT_MAN, Common_Movement_FaceOriginalDirection
waitmovement 0
release
end
@@ -49,7 +49,7 @@ CeladonCity_EventScript_Poliwrath::
msgbox CeladonCity_Text_Poliwrath
closemessage
waitmoncry
applymovement LOCALID_POLIWRATH, Movement_FaceOriginalDirection
applymovement LOCALID_POLIWRATH, Common_Movement_FaceOriginalDirection
waitmovement 0
release
end
data/maps/CeladonCity_GameCorner/scripts.inc
+1 -1
View File
@@ -106,7 +106,7 @@ CeladonCity_GameCorner_EventScript_BaldingMan::
CeladonCity_GameCorner_EventScript_FaceSlotMachine::
closemessage
applymovement VAR_LAST_TALKED, Movement_FaceOriginalDirection
applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection
waitmovement 0
release
end
data/maps/CeruleanCity/scripts.inc
+7 -7
View File
@@ -204,9 +204,9 @@ CeruleanCity_EventScript_NoRoomForTM28::
CeruleanCity_EventScript_GruntTriggerTop::
lockall
setvar VAR_TEMP_1, 0
applymovement LOCALID_GRUNT, Movement_WalkInPlaceFasterUp
applymovement LOCALID_GRUNT, Common_Movement_WalkInPlaceFasterUp
waitmovement 0
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterDown
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterDown
waitmovement 0
goto CeruleanCity_EventScript_GruntTrigger
end
@@ -214,9 +214,9 @@ CeruleanCity_EventScript_GruntTriggerTop::
CeruleanCity_EventScript_GruntTriggerBottom::
lockall
setvar VAR_TEMP_1, 1
applymovement LOCALID_GRUNT, Movement_WalkInPlaceFasterDown
applymovement LOCALID_GRUNT, Common_Movement_WalkInPlaceFasterDown
waitmovement 0
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterUp
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterUp
waitmovement 0
goto CeruleanCity_EventScript_GruntTrigger
end
@@ -235,7 +235,7 @@ CeruleanCity_EventScript_Policeman::
faceplayer
msgbox CeruleanCity_Text_PeopleHereWereRobbed
closemessage
applymovement LOCALID_POLICEMAN, Movement_FaceOriginalDirection
applymovement LOCALID_POLICEMAN, Common_Movement_FaceOriginalDirection
waitmovement 0
release
end
@@ -270,7 +270,7 @@ CeruleanCity_EventScript_Woman::
faceplayer
msgbox CeruleanCity_Text_WantBrightRedBicycle
closemessage
applymovement LOCALID_WOMAN, Movement_FaceOriginalDirection
applymovement LOCALID_WOMAN, Common_Movement_FaceOriginalDirection
waitmovement 0
release
end
@@ -285,7 +285,7 @@ CeruleanCity_EventScript_Lass::
waitmessage
delay 40
playse SE_PIN
applymovement LOCALID_SLOWBRO, Movement_QuestionMark
applymovement LOCALID_SLOWBRO, Common_Movement_QuestionMark
waitmovement 0
delay 30
call_if_eq VAR_0x8008, 0, CeruleanCity_EventScript_SlowbroFailed1
data/maps/CeruleanCity_House4/scripts.inc
+5 -5
View File
@@ -40,7 +40,7 @@ CeruleanCity_House4_EventScript_News2::
end
CeruleanCity_House4_EventScript_NewsNotSpread::
applymovement LOCALID_WONDER_NEWS_BERRY_MAN, Movement_FacePlayer
applymovement LOCALID_WONDER_NEWS_BERRY_MAN, Common_Movement_FacePlayer
waitmovement 0
msgbox CeruleanCity_House4_Text_WishCouldShareNewsWithOthers
release
@@ -63,7 +63,7 @@ CeruleanCity_House4_EventScript_NewsSpread2::
end
CeruleanCity_House4_EventScript_NewsDone::
applymovement LOCALID_WONDER_NEWS_BERRY_MAN, Movement_FacePlayer
applymovement LOCALID_WONDER_NEWS_BERRY_MAN, Common_Movement_FacePlayer
waitmovement 0
msgbox CeruleanCity_House4_Text_EnjoyingMyselfWithAllSortsOfNews
release
@@ -71,11 +71,11 @@ CeruleanCity_House4_EventScript_NewsDone::
CeruleanCity_House4_EventScript_MovementReactionToNews::
playse SE_PIN
applymovement LOCALID_WONDER_NEWS_BERRY_MAN, Movement_ExclamationMark
applymovement LOCALID_WONDER_NEWS_BERRY_MAN, Common_Movement_ExclamationMark
waitmovement 0
applymovement LOCALID_WONDER_NEWS_BERRY_MAN, Movement_FacePlayer
applymovement LOCALID_WONDER_NEWS_BERRY_MAN, Common_Movement_FacePlayer
waitmovement 0
applymovement LOCALID_WONDER_NEWS_BERRY_MAN, Movement_Delay48
applymovement LOCALID_WONDER_NEWS_BERRY_MAN, Common_Movement_Delay48
waitmovement 0
return
data/maps/CinnabarIsland/scripts.inc
+6 -6
View File
@@ -94,9 +94,9 @@ CinnabarIsland_EventScript_BillScene::
call_if_unset FLAG_TEMP_2, CinnabarIsland_EventScript_BillFacePlayer1
call_if_set FLAG_TEMP_2, CinnabarIsland_EventScript_BillFacePlayer2
playse SE_PIN
applymovement LOCALID_BILL, Movement_ExclamationMark
applymovement LOCALID_BILL, Common_Movement_ExclamationMark
waitmovement 0
applymovement LOCALID_BILL, Movement_Delay48
applymovement LOCALID_BILL, Common_Movement_Delay48
waitmovement 0
call_if_unset FLAG_TEMP_2, CinnabarIsland_EventScript_BillApproachPlayer1
call_if_set FLAG_TEMP_2, CinnabarIsland_EventScript_BillApproachPlayer2
@@ -107,12 +107,12 @@ CinnabarIsland_EventScript_BillScene::
end
CinnabarIsland_EventScript_BillFacePlayer1::
applymovement LOCALID_BILL, Movement_WalkInPlaceFasterUp
applymovement LOCALID_BILL, Common_Movement_WalkInPlaceFasterUp
waitmovement 0
return
CinnabarIsland_EventScript_BillFacePlayer2::
applymovement LOCALID_BILL, Movement_WalkInPlaceFasterLeft
applymovement LOCALID_BILL, Common_Movement_WalkInPlaceFasterLeft
waitmovement 0
return
@@ -124,7 +124,7 @@ CinnabarIsland_EventScript_BillApproachPlayer1::
CinnabarIsland_EventScript_BillApproachPlayer2::
applymovement LOCALID_BILL, CinnabarIsland_Movement_BillApproachPlayer2
waitmovement 0
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterRight
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterRight
waitmovement 0
return
@@ -313,7 +313,7 @@ CinnabarIsland_Movement_PlayerBoardBoatFromShore::
@ Triggered when VAR_TEMP_1 is 0
CinnabarIsland_EventScript_GymDoorLocked::
lockall
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterUp
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterUp
waitmovement 0
delay 20
msgbox CinnabarIsland_Text_DoorIsLocked
data/maps/CinnabarIsland_Gym/scripts.inc
+10 -10
View File
@@ -271,13 +271,13 @@ CinnabarIsland_Gym_EventScript_BattleQuinn::
end
CinnabarIsland_Gym_EventScript_QuinnApproachLeft::
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterRight
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterRight
applymovement LOCALID_QUINN, CinnabarIsland_Gym_Movement_QuinnApproachLeft
waitmovement 0
return
CinnabarIsland_Gym_EventScript_QuinnApproachRight::
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterRight
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterRight
applymovement LOCALID_QUINN, CinnabarIsland_Gym_Movement_QuinnApproachRight
waitmovement 0
return
@@ -424,13 +424,13 @@ CinnabarIsland_Gym_EventScript_BattleRamon::
end
CinnabarIsland_Gym_EventScript_RamonApproachLeft::
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterRight
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterRight
applymovement LOCALID_RAMON, CinnabarIsland_Gym_Movement_RamonApproachLeft
waitmovement 0
return
CinnabarIsland_Gym_EventScript_RamonApproachRight::
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterRight
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterRight
applymovement LOCALID_RAMON, CinnabarIsland_Gym_Movement_RamonApproachRight
waitmovement 0
return
@@ -496,13 +496,13 @@ CinnabarIsland_Gym_EventScript_BattleDerek::
end
CinnabarIsland_Gym_EventScript_DerekApproachLeft::
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterRight
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterRight
applymovement LOCALID_DEREK, CinnabarIsland_Gym_Movement_DerekApproachLeft
waitmovement 0
return
CinnabarIsland_Gym_EventScript_DerekApproachRight::
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterRight
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterRight
applymovement LOCALID_DEREK, CinnabarIsland_Gym_Movement_DerekApproachRight
waitmovement 0
return
@@ -568,13 +568,13 @@ CinnabarIsland_Gym_EventScript_BattleDusty::
end
CinnabarIsland_Gym_EventScript_DustyApproachLeft::
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterRight
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterRight
applymovement LOCALID_DUSTY, CinnabarIsland_Gym_Movement_DustyApproachLeft
waitmovement 0
return
CinnabarIsland_Gym_EventScript_DustyApproachRight::
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterRight
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterRight
applymovement LOCALID_DUSTY, CinnabarIsland_Gym_Movement_DustyApproachRight
waitmovement 0
return
@@ -640,13 +640,13 @@ CinnabarIsland_Gym_EventScript_BattleZac::
end
CinnabarIsland_Gym_EventScript_ZacApproachLeft::
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterRight
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterRight
applymovement LOCALID_ZAC, CinnabarIsland_Gym_Movement_ZacApproachLeft
waitmovement 0
return
CinnabarIsland_Gym_EventScript_ZacApproachRight::
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterRight
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterRight
applymovement LOCALID_ZAC, CinnabarIsland_Gym_Movement_ZacApproachRight
waitmovement 0
return
data/maps/FiveIsland_MemorialPillar/scripts.inc
+5 -5
View File
@@ -9,11 +9,11 @@ FiveIsland_MemorialPillar_EventScript_MemorialMan::
goto_if_set FLAG_NO_ROOM_FOR_TM42_AT_MEMORIAL_PILLAR, FiveIsland_MemorialPillar_EventScript_ReturnedForTM42
msgbox FiveIsland_MemorialPillar_Text_ScrubScrub
closemessage
applymovement LOCALID_MEMORIAL_MAN, Movement_FacePlayer
applymovement LOCALID_MEMORIAL_MAN, Common_Movement_FacePlayer
waitmovement 0
delay 45
msgbox FiveIsland_MemorialPillar_Text_YourMonsLookHealthy
applymovement LOCALID_MEMORIAL_MAN, Movement_WalkInPlaceFasterUp
applymovement LOCALID_MEMORIAL_MAN, Common_Movement_WalkInPlaceFasterUp
waitmovement 0
msgbox FiveIsland_MemorialPillar_Text_ThisIsWhereIBuriedMyOnix
release
@@ -54,10 +54,10 @@ FiveIsland_MemorialPillar_EventScript_PlaceLemonade::
removeitem ITEM_LEMONADE
msgbox FiveIsland_MemorialPillar_Text_PlacedCanOfLemonade
closemessage
applymovement LOCALID_MEMORIAL_MAN, Movement_WalkInPlaceFasterRight
applymovement LOCALID_MEMORIAL_MAN, Common_Movement_WalkInPlaceFasterRight
waitmovement 0
delay 45
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterLeft
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterLeft
waitmovement 0
textcolor NPC_TEXT_COLOR_MALE
msgbox FiveIsland_MemorialPillar_Text_ThankYouPleaseTakeThis
@@ -69,7 +69,7 @@ FiveIsland_MemorialPillar_EventScript_PlaceLemonade::
FiveIsland_MemorialPillar_EventScript_ReceivedTM42::
msgbox FiveIsland_MemorialPillar_Text_BeGoodToYourMonsToo
applymovement LOCALID_MEMORIAL_MAN, Movement_WalkInPlaceFasterUp
applymovement LOCALID_MEMORIAL_MAN, Common_Movement_WalkInPlaceFasterUp
waitmovement 0
setflag FLAG_GOT_TM42_AT_MEMORIAL_PILLAR
return
data/maps/FiveIsland_ResortGorgeous/scripts.inc
+1 -1
View File
@@ -22,7 +22,7 @@ FiveIsland_ResortGorgeous_EventScript_SelphyReturnHomeScene::
textcolor NPC_TEXT_COLOR_FEMALE
msgbox FiveIsland_ResortGorgeous_Text_SelphyThanksYouMayGoNow
closemessage
applymovement LOCALID_SELPHY, Movement_WalkInPlaceFasterUp
applymovement LOCALID_SELPHY, Common_Movement_WalkInPlaceFasterUp
waitmovement 0
opendoor 39, 8
waitdooranim
data/maps/FiveIsland_ResortGorgeous_House/scripts.inc
+6 -6
View File
@@ -44,7 +44,7 @@ FiveIsland_ResortGorgeous_House_EventScript_ShowRequestedMon::
waitmovement 0
textcolor NPC_TEXT_COLOR_MALE
msgbox FiveIsland_ResortGorgeous_House_Text_ButlerYesMyLady
applymovement LOCALID_SELPHY, Movement_WalkInPlaceFasterUp
applymovement LOCALID_SELPHY, Common_Movement_WalkInPlaceFasterUp
waitmovement 0
textcolor NPC_TEXT_COLOR_FEMALE
msgbox FiveIsland_ResortGorgeous_House_Text_SelphyGiveTokenOfAppreciation
@@ -65,25 +65,25 @@ FiveIsland_ResortGorgeous_House_EventScript_ShowRequestedMon::
end
FiveIsland_ResortGorgeous_House_EventScript_ButlerApproachPlayerNorth::
applymovement LOCALID_SELPHY, Movement_WalkInPlaceFasterDown
applymovement LOCALID_SELPHY, Common_Movement_WalkInPlaceFasterDown
applymovement LOCALID_BUTLER, FiveIsland_ResortGorgeous_House_Movement_ButlerApproachPlayerNorth
waitmovement 0
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterLeft
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterLeft
waitmovement 0
return
FiveIsland_ResortGorgeous_House_EventScript_ButlerApproachPlayerSouth::
applymovement LOCALID_BUTLER, FiveIsland_ResortGorgeous_House_Movement_ButlerApproachPlayerSouth
waitmovement 0
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterUp
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterUp
waitmovement 0
return
FiveIsland_ResortGorgeous_House_EventScript_ButlerApproachPlayerEast::
applymovement LOCALID_SELPHY, Movement_WalkInPlaceFasterLeft
applymovement LOCALID_SELPHY, Common_Movement_WalkInPlaceFasterLeft
applymovement LOCALID_BUTLER, FiveIsland_ResortGorgeous_House_Movement_ButlerApproachPlayerEast
waitmovement 0
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterUp
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterUp
waitmovement 0
return
data/maps/FiveIsland_RocketWarehouse/scripts.inc
+6 -6
View File
@@ -43,7 +43,7 @@ FiveIsland_RocketWarehouse_EventScript_Computer::
FiveIsland_RocketWarehouse_EventScript_Admin2Trigger::
lockall
applymovement LOCALID_ADMIN2, Movement_WalkInPlaceFasterLeft
applymovement LOCALID_ADMIN2, Common_Movement_WalkInPlaceFasterLeft
waitmovement 0
setvar VAR_MAP_SCENE_ROCKET_WAREHOUSE, 1
releaseall
@@ -100,7 +100,7 @@ FiveIsland_RocketWarehouse_EventScript_DefeatedAdmin2::
end
FiveIsland_RocketWarehouse_EventScript_PlayerFaceAdmin2::
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterRight
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterRight
waitmovement 0
return
@@ -138,7 +138,7 @@ FiveIsland_RocketWarehouse_EventScript_DefeatedAdmin1::
FiveIsland_RocketWarehouse_EventScript_PlayerFaceAdmin1::
goto_if_eq PLAYER_X_POS, 27, EventScript_Return
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterRight
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterRight
waitmovement 0
return
@@ -153,17 +153,17 @@ FiveIsland_RocketWarehouse_EventScript_AdminWalkToSwitch::
return
FiveIsland_RocketWarehouse_EventScript_AdminFaceSwitch::
applymovement LOCALID_ADMIN1, Movement_WalkInPlaceFasterUp
applymovement LOCALID_ADMIN1, Common_Movement_WalkInPlaceFasterUp
waitmovement 0
return
FiveIsland_RocketWarehouse_EventScript_AdminFacePlayerLeft::
applymovement LOCALID_ADMIN1, Movement_WalkInPlaceFasterLeft
applymovement LOCALID_ADMIN1, Common_Movement_WalkInPlaceFasterLeft
waitmovement 0
return
FiveIsland_RocketWarehouse_EventScript_AdminFacePlayerDown::
applymovement LOCALID_ADMIN1, Movement_WalkInPlaceFasterDown
applymovement LOCALID_ADMIN1, Common_Movement_WalkInPlaceFasterDown
waitmovement 0
return
data/maps/FourIsland/scripts.inc
+3 -3
View File
@@ -29,12 +29,12 @@ FourIsland_OnFrame::
FourIsland_EventScript_RivalScene::
lockall
textcolor NPC_TEXT_COLOR_MALE
applymovement LOCALID_RIVAL, Movement_WalkInPlaceFasterDown
applymovement LOCALID_RIVAL, Common_Movement_WalkInPlaceFasterDown
waitmovement 0
playbgm MUS_ENCOUNTER_RIVAL, 0
applymovement LOCALID_RIVAL, Movement_ExclamationMark
applymovement LOCALID_RIVAL, Common_Movement_ExclamationMark
waitmovement 0
applymovement LOCALID_RIVAL, Movement_Delay48
applymovement LOCALID_RIVAL, Common_Movement_Delay48
waitmovement 0
delay 25
applymovement LOCALID_RIVAL, FourIsland_Movement_RivalApproach
data/maps/FourIsland_IcefallCave_Back/scripts.inc
+6 -6
View File
@@ -25,19 +25,19 @@ FourIsland_IcefallCave_Back_EventScript_LoreleiRocketsScene::
msgbox FourIsland_IcefallCave_Back_Text_ShutItLadyLeaveUsBe
closemessage
playse SE_PIN
applymovement LOCALID_LORELEI, Movement_ExclamationMark
applymovement LOCALID_LORELEI, Common_Movement_ExclamationMark
waitmovement 0
applymovement LOCALID_LORELEI, Movement_WalkInPlaceFasterDown
applymovement LOCALID_LORELEI, Common_Movement_WalkInPlaceFasterDown
waitmovement 0
applymovement LOCALID_LORELEI, Movement_Delay48
applymovement LOCALID_LORELEI, Common_Movement_Delay48
waitmovement 0
textcolor NPC_TEXT_COLOR_FEMALE
msgbox FourIsland_IcefallCave_Back_Text_LoreleiPlayerHelpMeKickPoachersOut
closemessage
applymovement LOCALID_LORELEI, Movement_WalkInPlaceFasterRight
applymovement LOCALID_LORELEI, Common_Movement_WalkInPlaceFasterRight
waitmovement 0
delay 18
applymovement LOCALID_LORELEI, Movement_WalkInPlaceFasterDown
applymovement LOCALID_LORELEI, Common_Movement_WalkInPlaceFasterDown
waitmovement 0
delay 35
applymovement LOCALID_ROCKET3, FourIsland_IcefallCave_Back_Movement_Rocket3FaceLorelei
@@ -81,7 +81,7 @@ FourIsland_IcefallCave_Back_EventScript_LoreleiRocketsScene::
delay 50
applymovement LOCALID_LORELEI, FourIsland_IcefallCave_Back_Movement_LoreleiWalkToPlayer
waitmovement 0
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterLeft
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterLeft
waitmovement 0
textcolor NPC_TEXT_COLOR_FEMALE
msgbox FourIsland_IcefallCave_Back_Text_ThankYouThisIsAwful
data/maps/FuchsiaCity_SafariZone_Entrance/scripts.inc
+1 -1
View File
@@ -100,7 +100,7 @@ FuchsiaCity_SafariZone_Entrance_EventScript_EntryTriggerLeft::
FuchsiaCity_SafariZone_Entrance_EventScript_AskEnterSafariZone::
textcolor NPC_TEXT_COLOR_MALE
msgbox FuchsiaCity_SafariZone_Entrance_Text_WelcomeToSafariZone
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterRight
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterRight
waitmovement 0
showmoneybox 0, 0
msgbox FuchsiaCity_SafariZone_Entrance_Text_PlaySafariGameFor500, MSGBOX_YESNO
data/maps/MtEmber_Exterior/scripts.inc
+7 -7
View File
@@ -38,7 +38,7 @@ MtEmber_Exterior_EventScript_Grunt1Defeated::
end
MtEmber_Exterior_EventScript_BattleGrunt1::
applymovement LOCALID_GRUNT1, Movement_FacePlayer
applymovement LOCALID_GRUNT1, Common_Movement_FacePlayer
waitmovement 0
playbgm MUS_ENCOUNTER_ROCKET, 0
msgbox MtEmber_Exterior_Text_Grunt1Intro
@@ -65,7 +65,7 @@ MtEmber_Exterior_EventScript_Grunt2::
goto_if_eq VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 4, MtEmber_Exterior_EventScript_BattleGrunt2
msgbox MtEmber_Exterior_Text_YoureInTheWayGetLost
closemessage
applymovement LOCALID_GRUNT2, Movement_FaceOriginalDirection
applymovement LOCALID_GRUNT2, Common_Movement_FaceOriginalDirection
waitmovement 0
release
end
@@ -91,18 +91,18 @@ MtEmber_Exterior_EventScript_RocketPasswordScene::
message MtEmber_Exterior_Text_WhatsPasswordAgain
waitmessage
playse SE_PIN
applymovement LOCALID_GRUNT2, Movement_QuestionMark
applymovement LOCALID_GRUNT2, Common_Movement_QuestionMark
waitmovement 0
waitbuttonpress
msgbox MtEmber_Exterior_Text_FirstPasswordGoldeen
applymovement LOCALID_GRUNT1, Movement_WalkInPlaceFasterDown
applymovement LOCALID_GRUNT1, Common_Movement_WalkInPlaceFasterDown
waitmovement 0
playse SE_PIN
applymovement LOCALID_GRUNT1, Movement_ExclamationMark
applymovement LOCALID_GRUNT1, Common_Movement_ExclamationMark
waitmovement 0
applymovement LOCALID_GRUNT1, Movement_Delay48
applymovement LOCALID_GRUNT1, Common_Movement_Delay48
waitmovement 0
applymovement LOCALID_GRUNT2, Movement_WalkInPlaceFasterDown
applymovement LOCALID_GRUNT2, Common_Movement_WalkInPlaceFasterDown
waitmovement 0
call MtEmber_Exterior_EventScript_RocketsFaceDown
msgbox MtEmber_Exterior_Text_SnoopsBeenListeningIn
data/maps/MtMoon_B2F/scripts.inc
+1 -1
View File
@@ -17,7 +17,7 @@ MtMoon_B2F_EventScript_ShowFossils::
MtMoon_B2F_EventScript_MiguelTrigger::
lockall
applymovement LOCALID_MIGUEL, Movement_WalkInPlaceFasterRight
applymovement LOCALID_MIGUEL, Common_Movement_WalkInPlaceFasterRight
waitmovement 0
call MtMoon_B2F_EventScript_BattleMiguel
releaseall
data/maps/OneIsland_PokemonCenter_1F/scripts.inc
+31 -31
View File
@@ -63,46 +63,46 @@ OneIsland_PokemonCenter_1F_EventScript_MeetCelioScene::
applymovement LOCALID_BILL, OneIsland_PokemonCenter_1F_Movement_BillWalkToCelio
waitmovement 0
msgbox OneIsland_PokemonCenter_1F_Text_BillHeyThereCelio
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterRight
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterRight
waitmovement 0
playse SE_PIN
applymovement LOCALID_CELIO, Movement_ExclamationMark
applymovement LOCALID_CELIO, Common_Movement_ExclamationMark
waitmovement 0
applymovement LOCALID_CELIO, Movement_WalkInPlaceFasterLeft
applymovement LOCALID_CELIO, Common_Movement_WalkInPlaceFasterLeft
waitmovement 0
applymovement LOCALID_CELIO, Movement_Delay48
applymovement LOCALID_CELIO, Common_Movement_Delay48
waitmovement 0
msgbox OneIsland_PokemonCenter_1F_Text_CelioCantBelieveYouCameOut
msgbox OneIsland_PokemonCenter_1F_Text_BillHowsYourResearchComing
applymovement LOCALID_BILL, Movement_WalkInPlaceFasterDown
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterUp
applymovement LOCALID_BILL, Common_Movement_WalkInPlaceFasterDown
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterUp
waitmovement 0
msgbox OneIsland_PokemonCenter_1F_Text_ThisIsMyBuddyCelio
applymovement LOCALID_BILL, Movement_WalkInPlaceFasterRight
applymovement LOCALID_BILL, Common_Movement_WalkInPlaceFasterRight
waitmovement 0
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterRight
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterRight
waitmovement 0
call_if_set FLAG_SYS_GAME_CLEAR, OneIsland_PokemonCenter_1F_EventScript_IntroducePlayerChamp
call_if_unset FLAG_SYS_GAME_CLEAR, OneIsland_PokemonCenter_1F_EventScript_IntroducePlayerNotChamp
applymovement LOCALID_CELIO, Movement_WalkInPlaceFasterDown
applymovement LOCALID_CELIO, Common_Movement_WalkInPlaceFasterDown
waitmovement 0
msgbox OneIsland_PokemonCenter_1F_Text_CelioThatsReallyImpressive
msgbox OneIsland_PokemonCenter_1F_Text_BillBringMeUpToSpeed
applymovement LOCALID_CELIO, Movement_WalkInPlaceFasterLeft
applymovement LOCALID_CELIO, Common_Movement_WalkInPlaceFasterLeft
waitmovement 0
msgbox OneIsland_PokemonCenter_1F_Text_CelioPCsCantLinkWithYours
closemessage
applymovement LOCALID_BILL, Movement_WalkInPlaceFasterUp
applymovement LOCALID_BILL, Common_Movement_WalkInPlaceFasterUp
waitmovement 0
msgbox OneIsland_PokemonCenter_1F_Text_BillLetMeHelpYou
applymovement LOCALID_BILL, Movement_WalkInPlaceFasterDown
applymovement LOCALID_BILL, Common_Movement_WalkInPlaceFasterDown
waitmovement 0
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterUp
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterUp
waitmovement 0
msgbox OneIsland_PokemonCenter_1F_Text_CanYouDeliverThisMeteoritePlayer
msgreceiveditem OneIsland_PokemonCenter_1F_Text_AcceptedMeteoriteFromBill, ITEM_METEORITE, 1, MUS_OBTAIN_KEY_ITEM
additem ITEM_METEORITE
applymovement LOCALID_CELIO, Movement_WalkInPlaceFasterDown
applymovement LOCALID_CELIO, Common_Movement_WalkInPlaceFasterDown
waitmovement 0
msgbox OneIsland_PokemonCenter_1F_Text_CelioPleaseTakeThis
giveitem_msg OneIsland_PokemonCenter_1F_Text_ObtainedTriPass, ITEM_TRI_PASS, 1, MUS_OBTAIN_KEY_ITEM
@@ -112,9 +112,9 @@ OneIsland_PokemonCenter_1F_EventScript_MeetCelioScene::
setflag FLAG_SYS_SEVII_MAP_123
msgbox OneIsland_PokemonCenter_1F_Text_BillCatchYouLater
closemessage
applymovement LOCALID_BILL, Movement_WalkInPlaceFasterUp
applymovement LOCALID_BILL, Common_Movement_WalkInPlaceFasterUp
waitmovement 0
applymovement LOCALID_CELIO, Movement_WalkInPlaceFasterUp
applymovement LOCALID_CELIO, Common_Movement_WalkInPlaceFasterUp
waitmovement 0
setflag FLAG_SYS_PC_STORAGE_DISABLED
setvar VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 1
@@ -192,7 +192,7 @@ OneIsland_PokemonCenter_1F_EventScript_Bill::
end
OneIsland_PokemonCenter_1F_EventScript_BillGoTakeStroll::
applymovement LOCALID_BILL, Movement_FacePlayer
applymovement LOCALID_BILL, Common_Movement_FacePlayer
waitmovement 0
msgbox OneIsland_PokemonCenter_1F_Text_GotPCWorkingStrollAWhileMore
release
@@ -212,7 +212,7 @@ OneIsland_PokemonCenter_1F_EventScript_Celio::
goto_if_eq VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 3, OneIsland_PokemonCenter_1F_EventScript_CelioPlayerMissingNationalDex
msgbox OneIsland_PokemonCenter_1F_Text_SorryForBeingPoorHost
closemessage
applymovement LOCALID_CELIO, Movement_FaceOriginalDirection
applymovement LOCALID_CELIO, Common_Movement_FaceOriginalDirection
waitmovement 0
release
end
@@ -272,7 +272,7 @@ OneIsland_PokemonCenter_1F_EventScript_GiveCelioSapphire::
call OneIsland_PokemonCenter_1F_EventScript_SetNetworkMachineOn
special DrawWholeMapView
msgbox OneIsland_PokemonCenter_1F_Text_LinkedUpWithLanette
applymovement LOCALID_CELIO, Movement_FacePlayer
applymovement LOCALID_CELIO, Common_Movement_FacePlayer
waitmovement 0
msgbox OneIsland_PokemonCenter_1F_Text_ManagedToLinkWithHoennThankYou
special SetPostgameFlags
@@ -304,7 +304,7 @@ OneIsland_PokemonCenter_1F_EventScript_GiveCelioRuby::
call OneIsland_PokemonCenter_1F_EventScript_SetRubyMetatile
special DrawWholeMapView
delay 30
applymovement LOCALID_CELIO, Movement_FacePlayer
applymovement LOCALID_CELIO, Common_Movement_FacePlayer
waitmovement 0
msgbox OneIsland_PokemonCenter_1F_Text_MayIAskOneMoreFavor, MSGBOX_YESNO
goto_if_eq VAR_RESULT, NO, OneIsland_PokemonCenter_1F_EventScript_DeclineHelpCelio
@@ -344,10 +344,10 @@ OneIsland_PokemonCenter_1F_EventScript_CelioWaitingForRuby::
OneIsland_PokemonCenter_1F_EventScript_CelioRequestRuby::
msgbox OneIsland_PokemonCenter_1F_Text_CelioCaughtMoreMonMaybeICanBeUseful
applymovement LOCALID_CELIO, Movement_WalkInPlaceFasterUp
applymovement LOCALID_CELIO, Common_Movement_WalkInPlaceFasterUp
waitmovement 0
msgbox OneIsland_PokemonCenter_1F_Text_YoullBeTradingFromTrainersFarAway
applymovement LOCALID_CELIO, Movement_FacePlayer
applymovement LOCALID_CELIO, Common_Movement_FacePlayer
waitmovement 0
msgbox OneIsland_PokemonCenter_1F_Text_NeedsSpecialGemstone
setvar VAR_MAP_SCENE_MT_EMBER_EXTERIOR, 1
@@ -440,7 +440,7 @@ OneIsland_PokemonCenter_1F_EventScript_LeaveOneIslandTriggerBottom::
OneIsland_PokemonCenter_1F_EventScript_LeaveOneIslandScene::
textcolor NPC_TEXT_COLOR_MALE
playse SE_PIN
applymovement LOCALID_BILL, Movement_ExclamationMark
applymovement LOCALID_BILL, Common_Movement_ExclamationMark
waitmovement 0
msgbox OneIsland_PokemonCenter_1F_Text_BillOhHeyPlayer
closemessage
@@ -450,30 +450,30 @@ OneIsland_PokemonCenter_1F_EventScript_LeaveOneIslandScene::
call_if_eq VAR_TEMP_1, 4, OneIsland_PokemonCenter_1F_EventScript_PlayerWalkToBillBottom
delay 10
msgbox OneIsland_PokemonCenter_1F_Text_BillWeGotItDone
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterDown
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterDown
waitmovement 0
msgbox OneIsland_PokemonCenter_1F_Text_CelioJobWentQuick
applymovement LOCALID_BILL, Movement_WalkInPlaceFasterDown
applymovement LOCALID_BILL, Common_Movement_WalkInPlaceFasterDown
waitmovement 0
applymovement LOCALID_CELIO, Movement_WalkInPlaceFasterUp
applymovement LOCALID_CELIO, Common_Movement_WalkInPlaceFasterUp
waitmovement 0
msgbox OneIsland_PokemonCenter_1F_Text_BillYouveLearnedALot
msgbox OneIsland_PokemonCenter_1F_Text_CelioOhReallyEhehe
closemessage
applymovement LOCALID_BILL, Movement_WalkInPlaceFasterLeft
applymovement LOCALID_BILL, Common_Movement_WalkInPlaceFasterLeft
waitmovement 0
delay 10
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterRight
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterRight
waitmovement 0
delay 15
msgbox OneIsland_PokemonCenter_1F_Text_BillWeShouldHeadBackToKanto
closemessage
applymovement LOCALID_BILL, Movement_WalkInPlaceFasterDown
applymovement LOCALID_BILL, Common_Movement_WalkInPlaceFasterDown
waitmovement 0
delay 15
applymovement LOCALID_CELIO, Movement_WalkInPlaceFasterLeft
applymovement LOCALID_CELIO, Common_Movement_WalkInPlaceFasterLeft
waitmovement 0
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterDown
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterDown
waitmovement 0
msgbox OneIsland_PokemonCenter_1F_Text_CelioPromiseIllShowYouAroundSometime
closemessage
data/maps/PalletTown/scripts.inc
+11 -11
View File
@@ -190,10 +190,10 @@ PalletTown_EventScript_OakTrigger::
waitmessage
delay 85
closemessage
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterDown
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterDown
waitmovement 0
playse SE_PIN
applymovement OBJ_EVENT_ID_PLAYER, Movement_ExclamationMark
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_ExclamationMark
waitmovement 0
delay 30
addobject LOCALID_PROF_OAK
@@ -332,12 +332,12 @@ PalletTown_EventScript_SignLady::
goto_if_eq SIGN_LADY_READY, TRUE, PalletTown_EventScript_SignLadyStartShowSign
goto_if_set FLAG_TEMP_2, PalletTown_EventScript_SignLadyGoReadSign
msgbox PalletTown_Text_HmmIsThatRight
applymovement LOCALID_SIGN_LADY, Movement_FacePlayer
applymovement LOCALID_SIGN_LADY, Common_Movement_FacePlayer
waitmovement 0
playse SE_PIN
applymovement LOCALID_SIGN_LADY, Movement_ExclamationMark
applymovement LOCALID_SIGN_LADY, Common_Movement_ExclamationMark
waitmovement 0
applymovement LOCALID_SIGN_LADY, Movement_Delay48
applymovement LOCALID_SIGN_LADY, Common_Movement_Delay48
waitmovement 0
msgbox PalletTown_Text_OhLookLook
closemessage
@@ -359,21 +359,21 @@ PalletTown_EventScript_SignLadyMoveOutOfWayLeft::
return
PalletTown_EventScript_SignLadyDone::
applymovement LOCALID_SIGN_LADY, Movement_FacePlayer
applymovement LOCALID_SIGN_LADY, Common_Movement_FacePlayer
waitmovement 0
msgbox PalletTown_Text_RaisingMonsToo
release
end
PalletTown_EventScript_SignLadyGoReadSign::
applymovement LOCALID_SIGN_LADY, Movement_FacePlayer
applymovement LOCALID_SIGN_LADY, Common_Movement_FacePlayer
waitmovement 0
msgbox PalletTown_Text_ReadItReadIt
release
end
PalletTown_EventScript_SignLadyJustShowedSign::
applymovement LOCALID_SIGN_LADY, Movement_FacePlayer
applymovement LOCALID_SIGN_LADY, Common_Movement_FacePlayer
waitmovement 0
msgbox PalletTown_Text_SignsAreUsefulArentThey
release
@@ -421,8 +421,8 @@ PalletTown_EventScript_TrainerTips::
PalletTown_EventScript_SignLadyTrigger::
lockall
applymovement LOCALID_SIGN_LADY, Movement_WalkInPlaceFasterRight
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterLeft
applymovement LOCALID_SIGN_LADY, Common_Movement_WalkInPlaceFasterRight
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterLeft
waitmovement 0
call PalletTown_EventScript_SignLadyShowSign
releaseall
@@ -445,7 +445,7 @@ PalletTown_EventScript_SignLadyShowSign::
return
PalletTown_EventScript_SignLadyStartShowSign::
applymovement LOCALID_SIGN_LADY, Movement_FacePlayer
applymovement LOCALID_SIGN_LADY, Common_Movement_FacePlayer
waitmovement 0
call PalletTown_EventScript_SignLadyShowSign
release
data/maps/PalletTown_PlayersHouse_1F/scripts.inc
+1 -1
View File
@@ -11,7 +11,7 @@ PalletTown_PlayersHouse_1F_EventScript_Mom::
call_if_eq VAR_RESULT, MALE, PalletTown_PlayersHouse_1F_EventScript_MomOakLookingForYouMale
call_if_eq VAR_RESULT, FEMALE, PalletTown_PlayersHouse_1F_EventScript_MomOakLookingForYouFemale
closemessage
applymovement LOCALID_MOM, Movement_FaceOriginalDirection
applymovement LOCALID_MOM, Common_Movement_FaceOriginalDirection
waitmovement 0
release
end
data/maps/PalletTown_ProfessorOaksLab/scripts.inc
+31 -31
View File
@@ -140,7 +140,7 @@ PalletTown_ProfessorOaksLab_EventScript_NationalDexSceneRivalEnterEastWest::
setobjectxyperm LOCALID_RIVAL, 6, 10
addobject LOCALID_RIVAL
playbgm MUS_ENCOUNTER_RIVAL, 0
applymovement LOCALID_PROF_OAK, Movement_WalkInPlaceFasterDown
applymovement LOCALID_PROF_OAK, Common_Movement_WalkInPlaceFasterDown
applymovement OBJ_EVENT_ID_PLAYER, PalletTown_ProfessorOaksLab_Movement_WatchRivalEnterEastWest
applymovement LOCALID_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalEnter
waitmovement 0
@@ -150,18 +150,18 @@ PalletTown_ProfessorOaksLab_EventScript_NationalDexSceneRivalEnterSouth::
setobjectxyperm LOCALID_RIVAL, 6, 10
addobject LOCALID_RIVAL
playbgm MUS_ENCOUNTER_RIVAL, 0
applymovement LOCALID_PROF_OAK, Movement_WalkInPlaceFasterDown
applymovement LOCALID_PROF_OAK, Common_Movement_WalkInPlaceFasterDown
applymovement LOCALID_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalEnter
waitmovement 0
return
PalletTown_ProfessorOaksLab_EventScript_PlayerFaceOakNorth::
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterUp
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterUp
waitmovement 0
return
PalletTown_ProfessorOaksLab_EventScript_PlayerFaceOakWest::
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterLeft
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterLeft
waitmovement 0
return
@@ -215,7 +215,7 @@ PalletTown_ProfessorOaksLab_ChooseStarterScene::
clearflag FLAG_HIDE_OAK_IN_HIS_LAB
applymovement OBJ_EVENT_ID_PLAYER, PalletTown_ProfessorOaksLab_Movement_PlayerEnter
waitmovement 0
applymovement LOCALID_RIVAL, Movement_WalkInPlaceFasterUp
applymovement LOCALID_RIVAL, Common_Movement_WalkInPlaceFasterUp
waitmovement 0
clearflag FLAG_DONT_TRANSITION_MUSIC
savebgm MUS_DUMMY
@@ -262,7 +262,7 @@ PalletTown_ProfessorOaksLab_Movement_RivalReact::
PalletTown_ProfessorOaksLab_EventScript_LeaveStarterSceneTrigger::
lockall
textcolor NPC_TEXT_COLOR_MALE
applymovement LOCALID_PROF_OAK, Movement_FaceDown
applymovement LOCALID_PROF_OAK, Common_Movement_FaceDown
waitmovement 0
msgbox PalletTown_ProfessorOaksLab_Text_OakHeyDontGoAwayYet
closemessage
@@ -296,13 +296,13 @@ PalletTown_ProfessorOaksLab_EventScript_RivalBattleTriggerRight::
PalletTown_ProfessorOaksLab_EventScript_RivalBattle::
textcolor NPC_TEXT_COLOR_MALE
playbgm MUS_ENCOUNTER_RIVAL, 0
applymovement LOCALID_RIVAL, Movement_WalkInPlaceFasterDown
applymovement LOCALID_RIVAL, Common_Movement_WalkInPlaceFasterDown
waitmovement 0
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterUp
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterUp
waitmovement 0
msgbox PalletTown_ProfessorOaksLab_Text_RivalLetsCheckOutMons
closemessage
applymovement LOCALID_PROF_OAK, Movement_FaceDown
applymovement LOCALID_PROF_OAK, Common_Movement_FaceDown
waitmovement 0
goto_if_eq VAR_STARTER_MON, 0, PalletTown_ProfessorOaksLab_EventScript_RivalApproachForBattleCharmander
goto_if_eq VAR_STARTER_MON, 1, PalletTown_ProfessorOaksLab_EventScript_RivalApproachForBattleBulbasaur
@@ -625,9 +625,9 @@ PalletTown_ProfessorOaksLab_EventScript_ReceiveDexScene::
closemessage
delay 30
playse SE_PIN
applymovement LOCALID_PROF_OAK, Movement_ExclamationMark
applymovement LOCALID_PROF_OAK, Common_Movement_ExclamationMark
waitmovement 0
applymovement LOCALID_PROF_OAK, Movement_Delay48
applymovement LOCALID_PROF_OAK, Common_Movement_Delay48
waitmovement 0
call_if_eq VAR_FACING, DIR_SOUTH, PalletTown_ProfessorOaksLab_EventScript_DexSceneOakFacePlayerAndRivalSouth
call_if_eq VAR_FACING, DIR_EAST, PalletTown_ProfessorOaksLab_EventScript_DexSceneOakFacePlayerAndRivalEast
@@ -644,7 +644,7 @@ PalletTown_ProfessorOaksLab_EventScript_ReceiveDexScene::
delay 40
msgbox PalletTown_ProfessorOaksLab_Text_OakTakeTheseWithYou
closemessage
applymovement LOCALID_PROF_OAK, Movement_WalkInPlaceFasterUp
applymovement LOCALID_PROF_OAK, Common_Movement_WalkInPlaceFasterUp
waitmovement 0
removeobject LOCALID_POKEDEX_1
delay 10
@@ -804,7 +804,7 @@ PalletTown_ProfessorOaksLab_EventScript_DexCompleted::
call_if_eq VAR_FACING, DIR_SOUTH, PalletTown_ProfessorOaksLab_EventScript_OakExcitedSouth
call_if_eq VAR_FACING, DIR_EAST, PalletTown_ProfessorOaksLab_EventScript_OakExcitedEast
call_if_eq VAR_FACING, DIR_WEST, PalletTown_ProfessorOaksLab_EventScript_OakExcitedWest
applymovement LOCALID_PROF_OAK, Movement_FacePlayer
applymovement LOCALID_PROF_OAK, Common_Movement_FacePlayer
waitmovement 0
closemessage
delay 70
@@ -966,7 +966,7 @@ PalletTown_ProfessorOaksLab_EventScript_DexSceneRivalEnterNorth::
PalletTown_ProfessorOaksLab_EventScript_DexSceneRivalEnterEastWest::
setobjectxyperm LOCALID_RIVAL, 6, 10
addobject LOCALID_RIVAL
applymovement LOCALID_PROF_OAK, Movement_WalkInPlaceFasterDown
applymovement LOCALID_PROF_OAK, Common_Movement_WalkInPlaceFasterDown
applymovement OBJ_EVENT_ID_PLAYER, PalletTown_ProfessorOaksLab_Movement_WatchRivalEnterEastWest
applymovement LOCALID_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalEnter
waitmovement 0
@@ -975,52 +975,52 @@ PalletTown_ProfessorOaksLab_EventScript_DexSceneRivalEnterEastWest::
PalletTown_ProfessorOaksLab_EventScript_DexSceneRivalEnterSouth::
setobjectxyperm LOCALID_RIVAL, 6, 10
addobject LOCALID_RIVAL
applymovement LOCALID_PROF_OAK, Movement_WalkInPlaceFasterDown
applymovement LOCALID_PROF_OAK, Common_Movement_WalkInPlaceFasterDown
applymovement LOCALID_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalEnter
waitmovement 0
return
PalletTown_ProfessorOaksLab_EventScript_DexSceneOakFacePlayerAndRivalSouth::
applymovement LOCALID_PROF_OAK, Movement_FacePlayer
applymovement LOCALID_PROF_OAK, Common_Movement_FacePlayer
waitmovement 0
delay 15
applymovement LOCALID_PROF_OAK, Movement_WalkInPlaceFasterDown
applymovement LOCALID_PROF_OAK, Common_Movement_WalkInPlaceFasterDown
waitmovement 0
return
PalletTown_ProfessorOaksLab_EventScript_DexSceneOakFacePlayerAndRivalWest::
applymovement LOCALID_PROF_OAK, Movement_FacePlayer
applymovement LOCALID_PROF_OAK, Common_Movement_FacePlayer
waitmovement 0
delay 15
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterLeft
applymovement LOCALID_PROF_OAK, Movement_WalkInPlaceFasterDown
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterLeft
applymovement LOCALID_PROF_OAK, Common_Movement_WalkInPlaceFasterDown
waitmovement 0
return
PalletTown_ProfessorOaksLab_EventScript_DexSceneOakFacePlayerAndRivalEast::
applymovement LOCALID_PROF_OAK, Movement_FacePlayer
applymovement LOCALID_PROF_OAK, Common_Movement_FacePlayer
waitmovement 0
delay 15
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterRight
applymovement LOCALID_PROF_OAK, Movement_WalkInPlaceFasterDown
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterRight
applymovement LOCALID_PROF_OAK, Common_Movement_WalkInPlaceFasterDown
waitmovement 0
return
PalletTown_ProfessorOaksLab_EventScript_DexSceneRivalFacePlayerNorth::
applymovement LOCALID_RIVAL, Movement_FacePlayer
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterLeft
applymovement LOCALID_RIVAL, Common_Movement_FacePlayer
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterLeft
waitmovement 0
return
PalletTown_ProfessorOaksLab_EventScript_DexSceneRivalFacePlayerSouth::
applymovement LOCALID_RIVAL, Movement_WalkInPlaceFasterUp
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterDown
applymovement LOCALID_RIVAL, Common_Movement_WalkInPlaceFasterUp
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterDown
waitmovement 0
return
PalletTown_ProfessorOaksLab_EventScript_DexSceneRivalFacePlayerEastWest::
applymovement LOCALID_RIVAL, Movement_FacePlayer
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterDown
applymovement LOCALID_RIVAL, Common_Movement_FacePlayer
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterDown
waitmovement 0
return
@@ -1036,7 +1036,7 @@ PalletTown_ProfessorOaksLab_EventScript_RivalExit::
return
PalletTown_ProfessorOaksLab_EventScript_DexSceneOakFacePlayerAndRivalNorth::
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterUp
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterUp
waitmovement 0
return
@@ -1088,7 +1088,7 @@ PalletTown_ProfessorOaksLab_EventScript_BulbasaurBall::
end
PalletTown_ProfessorOaksLab_EventScript_ConfirmStarterChoice::
applymovement LOCALID_PROF_OAK, Movement_FaceRight
applymovement LOCALID_PROF_OAK, Common_Movement_FaceRight
waitmovement 0
showmonpic PLAYER_STARTER_SPECIES, 10, 3
textcolor NPC_TEXT_COLOR_MALE
data/maps/PalletTown_RivalsHouse/scripts.inc
+3 -3
View File
@@ -32,7 +32,7 @@ PalletTown_RivalsHouse_EventScript_Daisy::
goto_if_ge VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 1, PalletTown_RivalsHouse_EventScript_HeardBattledRival
msgbox PalletTown_RivalsHouse_Text_HiBrothersAtLab
closemessage
applymovement LOCALID_DAISY, Movement_FaceOriginalDirection
applymovement LOCALID_DAISY, Common_Movement_FaceOriginalDirection
waitmovement 0
release
end
@@ -136,12 +136,12 @@ PalletTown_RivalsHouse_EventScript_GiveTownMap::
closemessage
checkitemspace ITEM_TOWN_MAP
goto_if_eq VAR_RESULT, FALSE, PalletTown_RivalsHouse_EventScript_NoRoomForTownMap
applymovement LOCALID_DAISY, Movement_WalkInPlaceFasterRight
applymovement LOCALID_DAISY, Common_Movement_WalkInPlaceFasterRight
waitmovement 0
removeobject LOCALID_TOWN_MAP
setvar VAR_MAP_SCENE_PALLET_TOWN_RIVALS_HOUSE, 2
delay 15
applymovement LOCALID_DAISY, Movement_FacePlayer
applymovement LOCALID_DAISY, Common_Movement_FacePlayer
waitmovement 0
delay 12
giveitem_msg PalletTown_RivalsHouse_Text_ReceivedTownMapFromDaisy, ITEM_TOWN_MAP, 1, MUS_OBTAIN_KEY_ITEM
data/maps/PewterCity/scripts.inc
+6 -6
View File
@@ -691,9 +691,9 @@ PewterCity_EventScript_AideGiveRunningShoes::
call_if_eq VAR_TEMP_1, 3, PewterCity_EventScript_AideNoticePlayer
waitse
playse SE_PIN
applymovement LOCALID_AIDE, Movement_ExclamationMark
applymovement LOCALID_AIDE, Common_Movement_ExclamationMark
waitmovement 0
applymovement LOCALID_AIDE, Movement_Delay48
applymovement LOCALID_AIDE, Common_Movement_Delay48
waitmovement 0
msgbox PewterCity_Text_OhPlayer
call_if_eq VAR_TEMP_1, 0, PewterCity_EventScript_AideApproachPlayer0
@@ -728,7 +728,7 @@ PewterCity_EventScript_AideGiveRunningShoes::
return
PewterCity_EventScript_AideNoticePlayer::
applymovement LOCALID_AIDE, Movement_WalkInPlaceFasterDown
applymovement LOCALID_AIDE, Common_Movement_WalkInPlaceFasterDown
waitmovement 0
return
@@ -740,7 +740,7 @@ PewterCity_EventScript_AideApproachPlayer0::
PewterCity_EventScript_AideApproachPlayer1::
closemessage
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterUp
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterUp
waitmovement 0
return
@@ -748,7 +748,7 @@ PewterCity_EventScript_AideApproachPlayer2::
closemessage
applymovement LOCALID_AIDE, PewterCity_Movement_AideApproachPlayerMid
waitmovement 0
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterUp
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterUp
waitmovement 0
return
@@ -756,7 +756,7 @@ PewterCity_EventScript_AideApproachPlayer3::
closemessage
applymovement LOCALID_AIDE, PewterCity_Movement_AideApproachPlayerBottom
waitmovement 0
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterUp
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterUp
waitmovement 0
return
data/maps/PewterCity_House1/scripts.inc
+1 -1
View File
@@ -18,7 +18,7 @@ PewterCity_House1_EventScript_Nidoran::
lock
faceplayer
call PewterCity_House1_EventScript_DoNidoranCry
applymovement LOCALID_NIDORAN, Movement_FaceOriginalDirection
applymovement LOCALID_NIDORAN, Common_Movement_FaceOriginalDirection
waitmovement 0
release
end
data/maps/PewterCity_Museum_1F/scripts.inc
+5 -5
View File
@@ -22,14 +22,14 @@ PewterCity_Museum_1F_EventScript_Scientist1BehindCounter::
PewterCity_Museum_1F_EventScript_AmberHasGeneticMatter::
msgbox PewterCity_Museum_1F_Text_AmberContainsGeneticMatter
applymovement LOCALID_SCIENTIST1, Movement_FaceOriginalDirection
applymovement LOCALID_SCIENTIST1, Common_Movement_FaceOriginalDirection
waitmovement 0
release
end
PewterCity_Museum_1F_EventScript_ExplainAmber::
msgbox PewterCity_Museum_1F_Text_AmberIsFossilizedSap
applymovement LOCALID_SCIENTIST1, Movement_FaceOriginalDirection
applymovement LOCALID_SCIENTIST1, Common_Movement_FaceOriginalDirection
waitmovement 0
release
end
@@ -37,7 +37,7 @@ PewterCity_Museum_1F_EventScript_ExplainAmber::
PewterCity_Museum_1F_EventScript_EntranceTriggerLeft::
lockall
setvar VAR_TEMP_1, 0
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterRight
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterRight
waitmovement 0
goto PewterCity_Museum_1F_EventScript_EntranceTrigger
end
@@ -45,7 +45,7 @@ PewterCity_Museum_1F_EventScript_EntranceTriggerLeft::
PewterCity_Museum_1F_EventScript_EntranceTriggerMid::
lockall
setvar VAR_TEMP_1, 1
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterRight
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterRight
waitmovement 0
goto PewterCity_Museum_1F_EventScript_EntranceTrigger
end
@@ -53,7 +53,7 @@ PewterCity_Museum_1F_EventScript_EntranceTriggerMid::
PewterCity_Museum_1F_EventScript_EntranceTriggerRight::
lockall
setvar VAR_TEMP_1, 2
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterRight
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterRight
waitmovement 0
goto PewterCity_Museum_1F_EventScript_EntranceTrigger
end
data/maps/PokemonLeague_BrunosRoom/scripts.inc
+3 -3
View File
@@ -100,16 +100,16 @@ PokemonLeague_BrunosRoom_EventScript_DefeatedBruno::
end
PokemonLeague_BrunosRoom_EventScript_BrunoLookAwayLeft::
applymovement LOCALID_BRUNO, Movement_WalkInPlaceFasterLeft
applymovement LOCALID_BRUNO, Common_Movement_WalkInPlaceFasterLeft
waitmovement 0
return
PokemonLeague_BrunosRoom_EventScript_BrunoLookAwayRight::
applymovement LOCALID_BRUNO, Movement_WalkInPlaceFasterRight
applymovement LOCALID_BRUNO, Common_Movement_WalkInPlaceFasterRight
waitmovement 0
return
PokemonLeague_BrunosRoom_EventScript_BrunoLookAwayDown::
applymovement LOCALID_BRUNO, Movement_WalkInPlaceFasterDown
applymovement LOCALID_BRUNO, Common_Movement_WalkInPlaceFasterDown
waitmovement 0
return
data/maps/PokemonLeague_ChampionsRoom/scripts.inc
+3 -3
View File
@@ -78,12 +78,12 @@ PokemonLeague_ChampionsRoom_EventScript_EnterRoom::
specialvar VAR_RESULT, GetStarterSpecies
bufferspeciesname STR_VAR_1, VAR_RESULT
msgbox PokemonLeague_ChampionsRoom_Text_OakCongratulations
applymovement LOCALID_PROF_OAK, Movement_WalkInPlaceFasterRight
applymovement LOCALID_RIVAL, Movement_WalkInPlaceFasterLeft
applymovement LOCALID_PROF_OAK, Common_Movement_WalkInPlaceFasterRight
applymovement LOCALID_RIVAL, Common_Movement_WalkInPlaceFasterLeft
waitmovement 0
msgbox PokemonLeague_ChampionsRoom_Text_OakImDisappointedRival
closemessage
applymovement LOCALID_PROF_OAK, Movement_WalkInPlaceFasterDown
applymovement LOCALID_PROF_OAK, Common_Movement_WalkInPlaceFasterDown
waitmovement 0
delay 20
msgbox PokemonLeague_ChampionsRoom_Text_OakPlayerComeWithMe
data/maps/PokemonLeague_HallOfFame/scripts.inc
+4 -4
View File
@@ -22,14 +22,14 @@ PokemonLeague_HallOfFame_EventScript_EnterRoom::
textcolor NPC_TEXT_COLOR_MALE
applymovement OBJ_EVENT_ID_PLAYER, PokemonLeague_HallOfFame_Movement_EnterRoom
waitmovement 0
applymovement LOCALID_PROF_OAK, Movement_WalkInPlaceFasterLeft
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterRight
applymovement LOCALID_PROF_OAK, Common_Movement_WalkInPlaceFasterLeft
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterRight
waitmovement 0
delay 18
msgbox PokemonLeague_HallOfFame_Text_OakCongratulations
closemessage
applymovement LOCALID_PROF_OAK, Movement_WalkInPlaceFasterUp
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterUp
applymovement LOCALID_PROF_OAK, Common_Movement_WalkInPlaceFasterUp
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterUp
waitmovement 0
delay 20
dofieldeffect FLDEFF_HALL_OF_FAME_RECORD
data/maps/PokemonTower_2F/scripts.inc
+6 -6
View File
@@ -24,9 +24,9 @@ PokemonTower_2F_EventScript_Rival::
playbgm MUS_ENCOUNTER_RIVAL, 0
call_if_eq VAR_TEMP_1, 0, PokemonTower_2F_EventScript_RivalFacePlayerRight
call_if_eq VAR_TEMP_1, 1, PokemonTower_2F_EventScript_RivalFacePlayerDown
applymovement LOCALID_RIVAL, Movement_ExclamationMark
applymovement LOCALID_RIVAL, Common_Movement_ExclamationMark
waitmovement 0
applymovement LOCALID_RIVAL, Movement_Delay48
applymovement LOCALID_RIVAL, Common_Movement_Delay48
waitmovement 0
msgbox PokemonTower_2F_Text_RivalIntro
setvar VAR_LAST_TALKED, LOCALID_RIVAL
@@ -47,14 +47,14 @@ PokemonTower_2F_EventScript_Rival::
end
PokemonTower_2F_EventScript_RivalFacePlayerRight::
applymovement LOCALID_RIVAL, Movement_WalkInPlaceFasterRight
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterLeft
applymovement LOCALID_RIVAL, Common_Movement_WalkInPlaceFasterRight
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterLeft
waitmovement 0
return
PokemonTower_2F_EventScript_RivalFacePlayerDown::
applymovement LOCALID_RIVAL, Movement_WalkInPlaceFasterDown
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterUp
applymovement LOCALID_RIVAL, Common_Movement_WalkInPlaceFasterDown
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterUp
waitmovement 0
return
data/maps/Route16_NorthEntrance_1F/scripts.inc
+1 -1
View File
@@ -49,7 +49,7 @@ Route16_NorthEntrance_1F_EventScript_NeedBikeTrigger::
textcolor NPC_TEXT_COLOR_MALE
msgbox Route16_NorthEntrance_1F_Text_ExcuseMeWaitUp
closemessage
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterUp
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterUp
waitmovement 0
delay 20
call_if_eq VAR_0x8008, 1, Route16_NorthEntrance_1F_EventScript_PlayerWalkToCounterMidTop
data/maps/Route18_EastEntrance_1F/scripts.inc
+1 -1
View File
@@ -49,7 +49,7 @@ Route18_EastEntrance_1F_EventScript_NeedBikeTrigger::
textcolor NPC_TEXT_COLOR_MALE
msgbox Route18_EastEntrance_1F_Text_ExcuseMe
closemessage
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterUp
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterUp
waitmovement 0
delay 20
call_if_eq VAR_0x8008, 1, Route18_EastEntrance_1F_EventScript_PlayerWalkToCounterMidTop
data/maps/Route24/scripts.inc
+2 -2
View File
@@ -40,7 +40,7 @@ Route24_EventScript_RocketTrigger::
textcolor NPC_TEXT_COLOR_MALE
call_if_eq VAR_TEMP_1, 0, Route24_EventScript_RocketApproachPlayer
call_if_eq VAR_TEMP_1, 1, Route24_EventScript_RocketMotionToPlayer
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterRight
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterRight
waitmovement 0
msgbox Route24_Text_JustEarnedFabulousPrize
checkitemspace ITEM_NUGGET
@@ -67,7 +67,7 @@ Route24_EventScript_RocketApproachPlayer::
return
Route24_EventScript_RocketMotionToPlayer::
applymovement LOCALID_ROCKET, Movement_WalkInPlaceFasterLeft
applymovement LOCALID_ROCKET, Common_Movement_WalkInPlaceFasterLeft
waitmovement 0
return
data/maps/Route5_SouthEntrance/scripts.inc
+1 -1
View File
@@ -25,7 +25,7 @@ Route5_SouthEntrance_EventScript_GuardTriggerRight::
Route5_SouthEntrance_EventScript_GuardTrigger::
textcolor NPC_TEXT_COLOR_MALE
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterLeft
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterLeft
waitmovement 0
goto_if_set FLAG_GOT_TEA, Route5_SouthEntrance_EventScript_GiveTea
msgbox Route5_SouthEntrance_Text_ThirstyOnGuardDuty
data/maps/Route6_NorthEntrance/scripts.inc
+1 -1
View File
@@ -25,7 +25,7 @@ Route6_NorthEntrance_EventScript_GuardTriggerRight::
Route6_NorthEntrance_EventScript_GuardTrigger::
textcolor NPC_TEXT_COLOR_MALE
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterRight
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterRight
waitmovement 0
goto_if_set FLAG_GOT_TEA, Route6_NorthEntrance_EventScript_GiveTea
msgbox Route6_NorthEntrance_Text_ThirstyOnGuardDuty
data/maps/Route7_EastEntrance/scripts.inc
+1 -1
View File
@@ -25,7 +25,7 @@ Route7_EastEntrance_EventScript_GuardTriggerBottom::
Route7_EastEntrance_EventScript_GuardTrigger::
textcolor NPC_TEXT_COLOR_MALE
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterUp
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterUp
waitmovement 0
goto_if_set FLAG_GOT_TEA, Route7_EastEntrance_EventScript_GiveTea
msgbox Route7_EastEntrance_Text_ThirstyOnGuardDuty
data/maps/Route8_WestEntrance/scripts.inc
+1 -1
View File
@@ -25,7 +25,7 @@ Route8_WestEntrance_EventScript_GuardTriggerBottom::
Route8_WestEntrance_EventScript_GuardTrigger::
textcolor NPC_TEXT_COLOR_MALE
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterUp
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterUp
waitmovement 0
goto_if_set FLAG_GOT_TEA, Route8_WestEntrance_EventScript_GiveTea
msgbox Route8_WestEntrance_Text_ThirstyOnGuardDuty
data/maps/SSAnne_2F_Corridor/scripts.inc
+1 -1
View File
@@ -28,7 +28,7 @@ SSAnne_2F_Corridor_EventScript_RivalTrigger::
playbgm MUS_ENCOUNTER_RIVAL, 0
addobject LOCALID_RIVAL
delay 10
applymovement LOCALID_RIVAL, Movement_WalkInPlaceFasterDown
applymovement LOCALID_RIVAL, Common_Movement_WalkInPlaceFasterDown
waitmovement 0
delay 20
call_if_eq VAR_TEMP_1, 0, SSAnne_2F_Corridor_EventScript_RivalApproachLeft
data/maps/SSAnne_CaptainsOffice/scripts.inc
+3 -3
View File
@@ -14,7 +14,7 @@ SSAnne_CaptainsOffice_EventScript_Captain::
waitfanfare
call EventScript_RestorePrevTextColor
delay 50
applymovement LOCALID_CAPTAIN, Movement_FacePlayer
applymovement LOCALID_CAPTAIN, Common_Movement_FacePlayer
waitmovement 0
msgbox SSAnne_CaptainsOffice_Text_ThankYouHaveHMForCut
giveitem_msg SSAnne_CaptainsOffice_Text_ObtainedHM01FromCaptain, ITEM_HM01, 1, MUS_OBTAIN_KEY_ITEM
@@ -28,13 +28,13 @@ SSAnne_CaptainsOffice_EventScript_Captain::
SSAnne_CaptainsOffice_EventScript_NoRoomForCut::
msgbox SSAnne_CaptainsOffice_Text_YouHaveNoRoomForThis
closemessage
applymovement LOCALID_CAPTAIN, Movement_FaceOriginalDirection
applymovement LOCALID_CAPTAIN, Common_Movement_FaceOriginalDirection
waitmovement 0
release
end
SSAnne_CaptainsOffice_EventScript_AlreadyGotCut::
applymovement LOCALID_CAPTAIN, Movement_FacePlayer
applymovement LOCALID_CAPTAIN, Common_Movement_FacePlayer
waitmovement 0
msgbox SSAnne_CaptainsOffice_Text_SSAnneWillSetSailSoon
release
data/maps/SSAnne_Exterior/scripts.inc
+1 -1
View File
@@ -38,7 +38,7 @@ SSAnne_Exterior_WalkDown::
return
SSAnne_Exterior_WalkInPlaceDown::
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterDown
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterDown
waitmovement 0
return
data/maps/SaffronCity/scripts.inc
+1 -1
View File
@@ -44,7 +44,7 @@ SaffronCity_EventScript_RocketGrunt7::
SaffronCity_EventScript_DoorGuardGrunt::
lock
goto_if_set FLAG_RESCUED_MR_FUJI, SaffronCity_EventScript_DoorGuardAsleep
applymovement LOCALID_DOOR_GUARD_GRUNT, Movement_FacePlayer
applymovement LOCALID_DOOR_GUARD_GRUNT, Common_Movement_FacePlayer
waitmovement 0
msgbox SaffronCity_Text_ImASecurityGuard
release
data/maps/SaffronCity_Dojo/scripts.inc
+4 -4
View File
@@ -6,7 +6,7 @@ SaffronCity_Dojo_MapScripts::
SaffronCity_Dojo_EventScript_TriggerMasterBattleLeft::
lockall
setvar VAR_MAP_SCENE_SAFFRON_CITY_DOJO, 1
applymovement LOCALID_KARATE_MASTER, Movement_WalkInPlaceFasterLeft
applymovement LOCALID_KARATE_MASTER, Common_Movement_WalkInPlaceFasterLeft
waitmovement 0
releaseall
end
@@ -14,7 +14,7 @@ SaffronCity_Dojo_EventScript_TriggerMasterBattleLeft::
SaffronCity_Dojo_EventScript_TriggerMasterBattleRight::
lockall
setvar VAR_MAP_SCENE_SAFFRON_CITY_DOJO, 1
applymovement LOCALID_KARATE_MASTER, Movement_WalkInPlaceFasterRight
applymovement LOCALID_KARATE_MASTER, Common_Movement_WalkInPlaceFasterRight
waitmovement 0
releaseall
end
@@ -25,7 +25,7 @@ SaffronCity_Dojo_EventScript_HitmonleeBall::
goto_if_set FLAG_GOT_HITMON_FROM_DOJO, SaffronCity_Dojo_EventScript_AlreadyGotHitmon
showmonpic SPECIES_HITMONLEE, 10, 3
setvar VAR_TEMP_1, SPECIES_HITMONLEE
applymovement LOCALID_KARATE_MASTER, Movement_WalkInPlaceFasterUp
applymovement LOCALID_KARATE_MASTER, Common_Movement_WalkInPlaceFasterUp
waitmovement 0
textcolor NPC_TEXT_COLOR_MALE
msgbox SaffronCity_Dojo_Text_YouWantHitmonlee, MSGBOX_YESNO
@@ -46,7 +46,7 @@ SaffronCity_Dojo_EventScript_HitmonchanBall::
goto_if_set FLAG_GOT_HITMON_FROM_DOJO, SaffronCity_Dojo_EventScript_AlreadyGotHitmon
showmonpic SPECIES_HITMONCHAN, 10, 3
setvar VAR_TEMP_1, SPECIES_HITMONCHAN
applymovement LOCALID_KARATE_MASTER, Movement_WalkInPlaceFasterUp
applymovement LOCALID_KARATE_MASTER, Common_Movement_WalkInPlaceFasterUp
waitmovement 0
textcolor NPC_TEXT_COLOR_MALE
msgbox SaffronCity_Dojo_Text_YouWantHitmonchan, MSGBOX_YESNO
data/maps/SaffronCity_PokemonTrainerFanClub/scripts.inc
+4 -4
View File
@@ -19,18 +19,18 @@ SaffronCity_PokemonTrainerFanClub_OnFrame::
SaffronCity_PokemonTrainerFanClub_EventScript_MeetFirstFans::
lockall
textcolor NPC_TEXT_COLOR_FEMALE
applymovement LOCALID_BATTLE_GIRL, Movement_WalkInPlaceFasterDown
applymovement LOCALID_BATTLE_GIRL, Common_Movement_WalkInPlaceFasterDown
waitmovement 0
playse SE_PIN
applymovement LOCALID_BATTLE_GIRL, Movement_ExclamationMark
applymovement LOCALID_BATTLE_GIRL, Common_Movement_ExclamationMark
waitmovement 0
applymovement LOCALID_BATTLE_GIRL, Movement_Delay48
applymovement LOCALID_BATTLE_GIRL, Common_Movement_Delay48
waitmovement 0
msgbox SaffronCity_PokemonTrainerFanClub_Text_HuhYou
closemessage
applymovement LOCALID_BATTLE_GIRL, SaffronCity_PokemonTrainerFanClub_Movement_FanApproachPlayer
waitmovement 0
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterRight
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterRight
waitmovement 0
msgbox SaffronCity_PokemonTrainerFanClub_Text_YourePlayerWereYourFansNow
setvar VAR_MAP_SCENE_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB, 2
data/maps/SevenIsland_House_Room1/scripts.inc
+1 -1
View File
@@ -39,7 +39,7 @@ SevenIsland_House_Room1_EventScript_OldWomanCommentOnBattle::
applymovement LOCALID_OLD_WOMAN, SevenIsland_House_Room1_Movement_OldWomanWalkBehindPlayer
waitmovement 0
copyobjectxytoperm LOCALID_OLD_WOMAN
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterUp
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterUp
waitmovement 0
call_if_eq VAR_MAP_SCENE_SEVEN_ISLAND_HOUSE_ROOM1, 1, SevenIsland_House_Room1_EventScript_BattleWonComment
call_if_eq VAR_MAP_SCENE_SEVEN_ISLAND_HOUSE_ROOM1, 2, SevenIsland_House_Room1_EventScript_BattleLostComment
data/maps/SevenIsland_SevaultCanyon_House/scripts.inc
+3 -3
View File
@@ -11,7 +11,7 @@ SevenIsland_SevaultCanyon_House_EventScript_BaldingMan::
waitmovement 0
fadedefaultbgm
delay 30
applymovement LOCALID_BALDING_MAN, Movement_FacePlayer
applymovement LOCALID_BALDING_MAN, Common_Movement_FacePlayer
waitmovement 0
msgbox SevenIsland_SevaultCanyon_House_Text_ChanseyDanceJoinIn
textcolor NPC_TEXT_COLOR_NEUTRAL
@@ -34,12 +34,12 @@ SevenIsland_SevaultCanyon_House_EventScript_BaldingMan::
end
SevenIsland_SevaultCanyon_House_EventScript_PlayerFaceDown::
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterDown
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterDown
waitmovement 0
return
SevenIsland_SevaultCanyon_House_EventScript_AlreadyDanced::
applymovement LOCALID_BALDING_MAN, Movement_FacePlayer
applymovement LOCALID_BALDING_MAN, Common_Movement_FacePlayer
waitmovement 0
msgbox SevenIsland_SevaultCanyon_House_Text_ChanseyDanceJoinIn
release
data/maps/SilphCo_11F/scripts.inc
+1 -1
View File
@@ -61,7 +61,7 @@ SilphCo_11F_EventScript_GiovanniTriggerRight::
SilphCo_11F_EventScript_BattleGiovanni::
textcolor NPC_TEXT_COLOR_MALE
applymovement LOCALID_GIOVANNI, Movement_WalkInPlaceFasterDown
applymovement LOCALID_GIOVANNI, Common_Movement_WalkInPlaceFasterDown
waitmovement 0
delay 25
msgbox SilphCo_11F_Text_GiovanniIntro
data/maps/SilphCo_7F/scripts.inc
+3 -3
View File
@@ -35,10 +35,10 @@ SilphCo_7F_EventScript_RivalTriggerBottom::
SilphCo_7F_EventScript_RivalScene::
textcolor NPC_TEXT_COLOR_MALE
playbgm MUS_ENCOUNTER_RIVAL, 0
applymovement LOCALID_RIVAL, Movement_ExclamationMark
applymovement LOCALID_RIVAL, Common_Movement_ExclamationMark
waitmovement 0
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterDown
applymovement LOCALID_RIVAL, Movement_Delay48
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterDown
applymovement LOCALID_RIVAL, Common_Movement_Delay48
waitmovement 0
msgbox SilphCo_7F_Text_RivalWhatKeptYou
call_if_eq VAR_TEMP_1, 0, SilphCo_7F_EventScript_RivalApproachTop
data/maps/SixIsland_DottedHole_SapphireRoom/scripts.inc
+8 -8
View File
@@ -60,22 +60,22 @@ SixIsland_DottedHole_SapphireRoom_EventScript_Sapphire::
@ Lots of redundant scripts below
SixIsland_DottedHole_SapphireRoom_EventScript_PlayerFaceThiefLeft2::
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterLeft
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterLeft
waitmovement 0
return
SixIsland_DottedHole_SapphireRoom_EventScript_PlayerFaceThiefDown2::
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterDown
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterDown
waitmovement 0
return
SixIsland_DottedHole_SapphireRoom_EventScript_PlayerFaceThiefLeft::
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterLeft
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterLeft
waitmovement 0
return
SixIsland_DottedHole_SapphireRoom_EventScript_PlayerFaceThiefDown::
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterDown
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterDown
waitmovement 0
return
@@ -102,28 +102,28 @@ SixIsland_DottedHole_SapphireRoom_EventScript_ThiefLookAtSapphireWest::
SixIsland_DottedHole_SapphireRoom_EventScript_ThiefGetSapphireNorth::
applymovement LOCALID_THIEF, SixIsland_DottedHole_SapphireRoom_Movement_ThiefGetSapphireFromLeft
waitmovement 0
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterUp
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterUp
waitmovement 0
return
SixIsland_DottedHole_SapphireRoom_EventScript_ThiefGetSapphireSouth::
applymovement LOCALID_THIEF, SixIsland_DottedHole_SapphireRoom_Movement_ThiefGetSapphireFromLeft
waitmovement 0
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterDown
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterDown
waitmovement 0
return
SixIsland_DottedHole_SapphireRoom_EventScript_ThiefGetSapphireEast::
applymovement LOCALID_THIEF, SixIsland_DottedHole_SapphireRoom_Movement_ThiefGetSapphireFromBelow
waitmovement 0
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterRight
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterRight
waitmovement 0
return
SixIsland_DottedHole_SapphireRoom_EventScript_ThiefGetSapphireWest::
applymovement LOCALID_THIEF, SixIsland_DottedHole_SapphireRoom_Movement_ThiefGetSapphireFromBelow
waitmovement 0
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterLeft
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterLeft
waitmovement 0
return
data/maps/SixIsland_PokemonCenter_1F/scripts.inc
+3 -3
View File
@@ -22,12 +22,12 @@ SixIsland_PokemonCenter_1F_OnFrame::
SixIsland_PokemonCenter_1F_EventScript_RivalScene::
lockall
textcolor NPC_TEXT_COLOR_MALE
applymovement LOCALID_RIVAL, Movement_WalkInPlaceFasterDown
applymovement LOCALID_RIVAL, Common_Movement_WalkInPlaceFasterDown
waitmovement 0
playbgm MUS_ENCOUNTER_RIVAL, 0
applymovement LOCALID_RIVAL, Movement_ExclamationMark
applymovement LOCALID_RIVAL, Common_Movement_ExclamationMark
waitmovement 0
applymovement LOCALID_RIVAL, Movement_Delay48
applymovement LOCALID_RIVAL, Common_Movement_Delay48
waitmovement 0
delay 25
applymovement LOCALID_RIVAL, SixIsland_PokemonCenter_1F_Movement_RivalApproach
data/maps/SixIsland_RuinValley/scripts.inc
+2 -2
View File
@@ -15,10 +15,10 @@ SixIsland_RuinValley_EventScript_OpenDottedHoleDoor::
SixIsland_RuinValley_EventScript_Scientist::
lock
msgbox SixIsland_RuinValley_Text_CantFigureOutHowToGetInside
applymovement LOCALID_SCIENTIST, Movement_FacePlayer
applymovement LOCALID_SCIENTIST, Common_Movement_FacePlayer
waitmovement 0
msgbox SixIsland_RuinValley_Text_IFoundThisPlace
applymovement LOCALID_SCIENTIST, Movement_FaceOriginalDirection
applymovement LOCALID_SCIENTIST, Common_Movement_FaceOriginalDirection
waitmovement 0
release
end
data/maps/ThreeIsland/scripts.inc
+18 -18
View File
@@ -44,14 +44,14 @@ ThreeIsland_EventScript_AntiBiker1::
end
ThreeIsland_EventScript_AntiBiker1GotFullRestore::
applymovement LOCALID_ANTIBIKER1, Movement_FacePlayer
applymovement LOCALID_ANTIBIKER1, Common_Movement_FacePlayer
waitmovement 0
msgbox ThreeIsland_Text_YouveGotImpressiveMons
release
end
ThreeIsland_EventScript_GiveFullRestore::
applymovement LOCALID_ANTIBIKER1, Movement_FacePlayer
applymovement LOCALID_ANTIBIKER1, Common_Movement_FacePlayer
waitmovement 0
msgbox ThreeIsland_Text_ThankYouOhYourMonGotHurt
checkitemspace ITEM_FULL_RESTORE
@@ -95,23 +95,23 @@ ThreeIsland_EventScript_BikerArgumentScene::
return
ThreeIsland_EventScript_PlayerFaceUp::
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterUp
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterUp
waitmovement 0
return
@ Unused
ThreeIsland_EventScript_PlayerFaceDown::
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterDown
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterDown
waitmovement 0
return
ThreeIsland_EventScript_PlayerFaceLeft::
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterLeft
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterLeft
waitmovement 0
return
ThreeIsland_EventScript_PlayerFaceRight::
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterRight
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterRight
waitmovement 0
return
@@ -136,7 +136,7 @@ ThreeIsland_EventScript_AntiBiker2::
end
ThreeIsland_EventScript_AntiBiker2BikersGone::
applymovement LOCALID_ANTIBIKER2, Movement_FacePlayer
applymovement LOCALID_ANTIBIKER2, Common_Movement_FacePlayer
waitmovement 0
msgbox ThreeIsland_Text_LostelleWentOffTowardsBondBridge
release
@@ -204,12 +204,12 @@ ThreeIsland_EventScript_BattleBikersTriggerRight::
ThreeIsland_EventScript_BattleBikersScene::
textcolor NPC_TEXT_COLOR_MALE
applymovement LOCALID_BIKER1, Movement_WalkInPlaceFasterDown
applymovement LOCALID_BIKER1, Common_Movement_WalkInPlaceFasterDown
waitmovement 0
playse SE_PIN
applymovement LOCALID_BIKER1, Movement_ExclamationMark
applymovement LOCALID_BIKER1, Common_Movement_ExclamationMark
waitmovement 0
applymovement LOCALID_BIKER1, Movement_Delay48
applymovement LOCALID_BIKER1, Common_Movement_Delay48
waitmovement 0
applymovement LOCALID_BIKER1, ThreeIsland_Movement_BikerApproach
waitmovement 0
@@ -239,10 +239,10 @@ ThreeIsland_EventScript_BattleBikersScene::
msgbox ThreeIsland_Text_Biker3Intro
setvar VAR_LAST_TALKED, LOCALID_BIKER3
trainerbattle_no_intro TRAINER_BIKER_GOON_3, ThreeIsland_Text_Biker3Defeat
applymovement LOCALID_BIKER3, Movement_WalkInPlaceFasterLeft
applymovement LOCALID_BIKER3, Common_Movement_WalkInPlaceFasterLeft
waitmovement 0
applymovement LOCALID_BIKER4, Movement_WalkInPlaceFasterDown
applymovement LOCALID_BIKER5, Movement_WalkInPlaceFasterDown
applymovement LOCALID_BIKER4, Common_Movement_WalkInPlaceFasterDown
applymovement LOCALID_BIKER5, Common_Movement_WalkInPlaceFasterDown
waitmovement 0
msgbox ThreeIsland_Text_Biker3PostBattle
closemessage
@@ -272,33 +272,33 @@ ThreeIsland_EventScript_BattleBikersScene::
end
ThreeIsland_EventScript_PaxtonApproachLeft::
applymovement LOCALID_BIKER3, Movement_WalkInPlaceFasterDown
applymovement LOCALID_BIKER3, Common_Movement_WalkInPlaceFasterDown
applymovement LOCALID_PAXTON, ThreeIsland_Movement_PaxtonApproachLeft
waitmovement 0
return
ThreeIsland_EventScript_PaxtonApproachMidLeft::
applymovement LOCALID_BIKER3, Movement_WalkInPlaceFasterDown
applymovement LOCALID_BIKER3, Common_Movement_WalkInPlaceFasterDown
applymovement LOCALID_PAXTON, ThreeIsland_Movement_PaxtonApproachMidLeft
waitmovement 0
return
ThreeIsland_EventScript_PaxtonApproachMid::
applymovement LOCALID_BIKER3, Movement_WalkInPlaceFasterDown
applymovement LOCALID_BIKER3, Common_Movement_WalkInPlaceFasterDown
applymovement LOCALID_PAXTON, ThreeIsland_Movement_PaxtonApproachMid
applymovement OBJ_EVENT_ID_PLAYER, ThreeIsland_Movement_PlayerFacePaxton
waitmovement 0
return
ThreeIsland_EventScript_PaxtonApproachMidRight::
applymovement LOCALID_BIKER3, Movement_WalkInPlaceFasterDown
applymovement LOCALID_BIKER3, Common_Movement_WalkInPlaceFasterDown
applymovement OBJ_EVENT_ID_PLAYER, ThreeIsland_Movement_PlayerFacePaxton
applymovement LOCALID_PAXTON, ThreeIsland_Movement_PaxtonApproachMidRight
waitmovement 0
return
ThreeIsland_EventScript_PaxtonApproachRight::
applymovement LOCALID_BIKER3, Movement_WalkInPlaceFasterDown
applymovement LOCALID_BIKER3, Common_Movement_WalkInPlaceFasterDown
applymovement OBJ_EVENT_ID_PLAYER, ThreeIsland_Movement_PlayerFacePaxton
applymovement LOCALID_PAXTON, ThreeIsland_Movement_PaxtonApproachRight
waitmovement 0
data/maps/ThreeIsland_BerryForest/scripts.inc
+2 -2
View File
@@ -14,7 +14,7 @@ ThreeIsland_BerryForest_EventScript_Lostelle::
faceplayer
msgbox ThreeIsland_BerryForest_Text_HelpScaryPokemon
playse SE_PIN
applymovement LOCALID_LOSTELLE, Movement_ExclamationMark
applymovement LOCALID_LOSTELLE, Common_Movement_ExclamationMark
waitmovement 0
applymovement LOCALID_LOSTELLE, ThreeIsland_BerryForest_Movement_LostelleLookAround
waitmovement 0
@@ -26,7 +26,7 @@ ThreeIsland_BerryForest_EventScript_Lostelle::
setwildbattle SPECIES_HYPNO, 30
dowildbattle
special QuestLog_CutRecording
applymovement LOCALID_LOSTELLE, Movement_FacePlayer
applymovement LOCALID_LOSTELLE, Common_Movement_FacePlayer
waitmovement 0
msgbox ThreeIsland_BerryForest_Text_ThankYouHaveThis
giveitem ITEM_IAPAPA_BERRY
data/maps/ThreeIsland_DunsparceTunnel/scripts.inc
+1 -1
View File
@@ -29,7 +29,7 @@ ThreeIsland_DunsparceTunnel_EventScript_Prospector::
goto_if_eq VAR_RESULT, TRUE, ThreeIsland_DunsparceTunnel_EventScript_ProspectorStruckGold
msgbox ThreeIsland_DunsparceTunnel_Text_ProspectingForGold
closemessage
applymovement LOCALID_PROSPECTOR, Movement_FaceOriginalDirection
applymovement LOCALID_PROSPECTOR, Common_Movement_FaceOriginalDirection
waitmovement 0
release
end
data/maps/TwoIsland_JoyfulGameCorner/scripts.inc
+7 -7
View File
@@ -43,7 +43,7 @@ TwoIsland_JoyfulGameCorner_EventScript_FoundLostelleScene::
special BufferBigGuyOrBigGirlString
msgbox TwoIsland_JoyfulGameCorner_Text_LostelleItsOkayDaddy
closemessage
applymovement LOCALID_LOSTELLE, Movement_WalkInPlaceFasterDown
applymovement LOCALID_LOSTELLE, Common_Movement_WalkInPlaceFasterDown
waitmovement 0
setvar VAR_MAP_SCENE_TWO_ISLAND_JOYFUL_GAME_CORNER, 3
releaseall
@@ -56,16 +56,16 @@ TwoIsland_JoyfulGameCorner_EventScript_HelpFindLostelleScene::
waitmovement 0
msgbox TwoIsland_JoyfulGameCorner_Text_WhereHasLostelleGottenTo
closemessage
applymovement LOCALID_DADDY, Movement_WalkInPlaceFasterDown
applymovement LOCALID_DADDY, Common_Movement_WalkInPlaceFasterDown
waitmovement 0
playse SE_PIN
applymovement LOCALID_DADDY, Movement_ExclamationMark
applymovement LOCALID_DADDY, Common_Movement_ExclamationMark
waitmovement 0
applymovement LOCALID_DADDY, Movement_Delay48
applymovement LOCALID_DADDY, Common_Movement_Delay48
waitmovement 0
applymovement LOCALID_DADDY, Movement_171527
waitmovement 0
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterRight
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterRight
waitmovement 0
msgbox TwoIsland_JoyfulGameCorner_Text_PleaseHelpFindLostelle
closemessage
@@ -78,12 +78,12 @@ TwoIsland_JoyfulGameCorner_EventScript_HelpFindLostelleScene::
applymovement LOCALID_BIKER, TwoIsland_JoyfulGameCorner_Movement_BikerLookAround
waitmovement 0
msgbox TwoIsland_JoyfulGameCorner_Text_IsThisOnlyThreeIsland
applymovement LOCALID_BIKER, Movement_WalkInPlaceFasterRight
applymovement LOCALID_BIKER, Common_Movement_WalkInPlaceFasterRight
waitmovement 0
msgbox TwoIsland_JoyfulGameCorner_Text_ThisIsTwoIslandMoveIt
msgbox TwoIsland_JoyfulGameCorner_Text_TheseIslandsAreConfusing
closemessage
applymovement LOCALID_BIKER, Movement_WalkInPlaceFasterDown
applymovement LOCALID_BIKER, Common_Movement_WalkInPlaceFasterDown
waitmovement 0
playse SE_EXIT
removeobject LOCALID_BIKER
data/maps/VermilionCity/scripts.inc
+2 -2
View File
@@ -191,8 +191,8 @@ VermilionCity_EventScript_ExitedTicketCheck::
VermilionCity_EventScript_CheckTicket::
textcolor NPC_TEXT_COLOR_MALE
applymovement LOCALID_FERRY_SAILOR, Movement_WalkInPlaceFasterLeft
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterRight
applymovement LOCALID_FERRY_SAILOR, Common_Movement_WalkInPlaceFasterLeft
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterRight
waitmovement 0
goto_if_eq VAR_MAP_SCENE_VERMILION_CITY, 3, VermilionCity_EventScript_CheckSeagallopPresentTrigger
msgbox VermilionCity_Text_DoYouHaveATicket
data/maps/VermilionCity_PokemonFanClub/scripts.inc
+4 -4
View File
@@ -57,7 +57,7 @@ VermilionCity_PokemonFanClub_EventScript_Woman::
goto_if_set SPOKE_TO_FAT_MAN_LAST, VermilionCity_PokemonFanClub_EventScript_WomanSpokeToFatMan
msgbox VermilionCity_PokemonFanClub_Text_AdoreMySeel
closemessage
applymovement LOCALID_WOMAN, Movement_FaceOriginalDirection
applymovement LOCALID_WOMAN, Common_Movement_FaceOriginalDirection
waitmovement 0
setflag SPOKE_TO_WOMAN_LAST
release
@@ -66,7 +66,7 @@ VermilionCity_PokemonFanClub_EventScript_Woman::
VermilionCity_PokemonFanClub_EventScript_WomanSpokeToFatMan::
msgbox VermilionCity_PokemonFanClub_Text_SeelFarMoreAttractive
closemessage
applymovement LOCALID_WOMAN, Movement_FaceOriginalDirection
applymovement LOCALID_WOMAN, Common_Movement_FaceOriginalDirection
waitmovement 0
clearflag SPOKE_TO_FAT_MAN_LAST
release
@@ -78,7 +78,7 @@ VermilionCity_PokemonFanClub_EventScript_FatMan::
goto_if_set SPOKE_TO_WOMAN_LAST, VermilionCity_PokemonFanClub_EventScript_FatManSpokeToWoman
msgbox VermilionCity_PokemonFanClub_Text_AdmirePikachusTail
closemessage
applymovement LOCALID_FAT_MAN, Movement_FaceOriginalDirection
applymovement LOCALID_FAT_MAN, Common_Movement_FaceOriginalDirection
waitmovement 0
setflag SPOKE_TO_FAT_MAN_LAST
release
@@ -87,7 +87,7 @@ VermilionCity_PokemonFanClub_EventScript_FatMan::
VermilionCity_PokemonFanClub_EventScript_FatManSpokeToWoman::
msgbox VermilionCity_PokemonFanClub_Text_PikachuTwiceAsCute
closemessage
applymovement LOCALID_FAT_MAN, Movement_FaceOriginalDirection
applymovement LOCALID_FAT_MAN, Common_Movement_FaceOriginalDirection
waitmovement 0
clearflag SPOKE_TO_WOMAN_LAST
release
data/maps/ViridianCity/scripts.inc
+7 -7
View File
@@ -43,7 +43,7 @@ ViridianCity_EventScript_TryUnlockGym::
ViridianCity_EventScript_GymDoorLocked::
lockall
textcolor NPC_TEXT_COLOR_NEUTRAL
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterUp
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterUp
waitmovement 0
delay 20
msgbox ViridianCity_Text_GymDoorsAreLocked
@@ -88,7 +88,7 @@ ViridianCity_EventScript_OldMan::
goto_if_eq VAR_MAP_SCENE_VIRIDIAN_CITY_GYM_DOOR, 1, ViridianCity_EventScript_OldManGymLeaderReturned
msgbox ViridianCity_Text_GymClosedWonderWhoLeaderIs
closemessage
applymovement LOCALID_OLD_MAN, Movement_FaceOriginalDirection
applymovement LOCALID_OLD_MAN, Common_Movement_FaceOriginalDirection
waitmovement 0
release
end
@@ -180,7 +180,7 @@ ViridianCity_EventScript_Woman::
ViridianCity_EventScript_WomanRoadBlocked::
msgbox ViridianCity_Text_GrandpaHasntHadCoffeeYet
closemessage
applymovement LOCALID_WOMAN, Movement_FaceOriginalDirection
applymovement LOCALID_WOMAN, Common_Movement_FaceOriginalDirection
waitmovement 0
release
end
@@ -206,9 +206,9 @@ ViridianCity_Movement_WalkDown::
ViridianCity_EventScript_TutorialTriggerLeft::
lockall
textcolor NPC_TEXT_COLOR_MALE
applymovement LOCALID_TUTORIAL_MAN, Movement_WalkInPlaceFasterLeft
applymovement LOCALID_TUTORIAL_MAN, Common_Movement_WalkInPlaceFasterLeft
waitmovement 0
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterRight
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterRight
waitmovement 0
call ViridianCity_EventScript_DoTutorialBattle
release
@@ -217,9 +217,9 @@ ViridianCity_EventScript_TutorialTriggerLeft::
ViridianCity_EventScript_TutorialTriggerRight::
lockall
textcolor NPC_TEXT_COLOR_MALE
applymovement LOCALID_TUTORIAL_MAN, Movement_WalkInPlaceFasterRight
applymovement LOCALID_TUTORIAL_MAN, Common_Movement_WalkInPlaceFasterRight
waitmovement 0
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterLeft
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterLeft
waitmovement 0
call ViridianCity_EventScript_DoTutorialBattle
release
data/maps/ViridianCity_Mart/scripts.inc
+1 -1
View File
@@ -21,7 +21,7 @@ ViridianCity_Mart_OnFrame::
ViridianCity_Mart_EventScript_ParcelScene::
lockall
textcolor NPC_TEXT_COLOR_MALE
applymovement LOCALID_CLERK, Movement_WalkInPlaceFasterDown
applymovement LOCALID_CLERK, Common_Movement_WalkInPlaceFasterDown
waitmovement 0
msgbox ViridianCity_Mart_Text_YouCameFromPallet
closemessage
data/maps/ViridianCity_School/scripts.inc
+3 -3
View File
@@ -9,7 +9,7 @@ ViridianCity_School_EventScript_Lass::
faceplayer
msgbox ViridianCity_School_Text_TryingToMemorizeNotes
closemessage
applymovement LOCALID_LASS, Movement_WalkInPlaceFasterUp
applymovement LOCALID_LASS, Common_Movement_WalkInPlaceFasterUp
waitmovement 0
release
end
@@ -19,7 +19,7 @@ ViridianCity_School_EventScript_Woman::
faceplayer
msgbox ViridianCity_School_Text_ReadBlackboardCarefully
closemessage
applymovement LOCALID_WOMAN, Movement_FaceOriginalDirection
applymovement LOCALID_WOMAN, Common_Movement_FaceOriginalDirection
waitmovement 0
release
end
@@ -36,7 +36,7 @@ ViridianCity_School_EventScript_Notebook::
msgbox ViridianCity_School_Text_TurnThePage, MSGBOX_YESNO
goto_if_eq VAR_RESULT, NO, ViridianCity_School_EventScript_StopReadingNotebook
msgbox ViridianCity_School_Text_NotebookFourthPage
applymovement LOCALID_LASS, Movement_WalkInPlaceFasterUp
applymovement LOCALID_LASS, Common_Movement_WalkInPlaceFasterUp
waitmovement 0
textcolor NPC_TEXT_COLOR_FEMALE
msgbox ViridianCity_School_Text_HeyDontLookAtMyNotes
data/scripts/cable_club.inc
+39 -39
View File
@@ -181,7 +181,7 @@ CableClub_EventScript_PlayerExitLinkRoom::
CableClub_EventScript_Tutorial::
lockall
textcolor NPC_TEXT_COLOR_FEMALE
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterUp
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterUp
waitmovement 0
msgbox CableClub_Text_FirstTimeRightThisWay
closemessage
@@ -275,12 +275,12 @@ CableClub_EventScript_TryEnterColosseum::
special TryBattleLinkup
waitstate
call EventScript_RestorePrevTextColor
goto_if_eq VAR_RESULT, 1, CableClub_EventScript_EnterColosseum
goto_if_eq VAR_RESULT, 2, CableClub_EventScript_AbortLinkSomeoneNotReady
goto_if_eq VAR_RESULT, 3, CableClub_EventScript_AbortLinkDifferentSelections
goto_if_eq VAR_RESULT, 4, CableClub_EventScript_AbortLinkIncorrectNumberOfBattlers
goto_if_eq VAR_RESULT, 5, CableClub_EventScript_AbortLink
goto_if_eq VAR_RESULT, 6, CableClub_EventScript_AbortLinkConnectionError
goto_if_eq VAR_RESULT, LINKUP_SUCCESS, CableClub_EventScript_EnterColosseum
goto_if_eq VAR_RESULT, LINKUP_SOMEONE_NOT_READY, CableClub_EventScript_AbortLinkSomeoneNotReady
goto_if_eq VAR_RESULT, LINKUP_DIFF_SELECTIONS, CableClub_EventScript_AbortLinkDifferentSelections
goto_if_eq VAR_RESULT, LINKUP_WRONG_NUM_PLAYERS, CableClub_EventScript_AbortLinkIncorrectNumberOfBattlers
goto_if_eq VAR_RESULT, LINKUP_FAILED, CableClub_EventScript_AbortLink
goto_if_eq VAR_RESULT, LINKUP_CONNECTION_ERROR, CableClub_EventScript_AbortLinkConnectionError
end
CableClub_EventScript_EnterColosseum::
@@ -373,14 +373,14 @@ CableClub_EventScript_TradeCenter::
special TryTradeLinkup
waitstate
call EventScript_RestorePrevTextColor
goto_if_eq VAR_RESULT, 1, CableClub_EventScript_EnterTradeCenter
goto_if_eq VAR_RESULT, 2, CableClub_EventScript_AbortLinkSomeoneNotReady
goto_if_eq VAR_RESULT, 3, CableClub_EventScript_AbortLinkDifferentSelections
goto_if_eq VAR_RESULT, 4, CableClub_EventScript_AbortLinkIncorrectNumberOfParticipants
goto_if_eq VAR_RESULT, 5, CableClub_EventScript_AbortLink
goto_if_eq VAR_RESULT, 6, CableClub_EventScript_AbortLinkConnectionError
goto_if_eq VAR_RESULT, 7, CableClub_EventScript_AbortLinkPlayerNotReady
goto_if_eq VAR_RESULT, 9, CableClub_EventScript_AbortLinkOtherTrainerNotReady
goto_if_eq VAR_RESULT, LINKUP_SUCCESS, CableClub_EventScript_EnterTradeCenter
goto_if_eq VAR_RESULT, LINKUP_SOMEONE_NOT_READY, CableClub_EventScript_AbortLinkSomeoneNotReady
goto_if_eq VAR_RESULT, LINKUP_DIFF_SELECTIONS, CableClub_EventScript_AbortLinkDifferentSelections
goto_if_eq VAR_RESULT, LINKUP_WRONG_NUM_PLAYERS, CableClub_EventScript_AbortLinkIncorrectNumberOfParticipants
goto_if_eq VAR_RESULT, LINKUP_FAILED, CableClub_EventScript_AbortLink
goto_if_eq VAR_RESULT, LINKUP_CONNECTION_ERROR, CableClub_EventScript_AbortLinkConnectionError
goto_if_eq VAR_RESULT, LINKUP_PLAYER_NOT_READY, CableClub_EventScript_AbortLinkPlayerNotReady
goto_if_eq VAR_RESULT, LINKUP_PARTNER_NOT_READY, CableClub_EventScript_AbortLinkOtherTrainerNotReady
end
CableClub_EventScript_EnterTradeCenter::
@@ -963,17 +963,17 @@ CableClub_EventScript_ChooseLinkLeaderFrom2::
CableClub_EventScript_TryLeadGroup2Players::
call CableClub_EventScript_TryBecomeLinkLeader
goto_if_eq VAR_RESULT, 1, CableClub_EventScript_EnterWirelessLinkRoom
goto_if_eq VAR_RESULT, 5, CableClub_EventScript_ChooseLinkLeaderFrom2
goto_if_eq VAR_RESULT, 8, CableClub_EventScript_TryLeadGroup2Players
goto_if_eq VAR_RESULT, LINKUP_SUCCESS, CableClub_EventScript_EnterWirelessLinkRoom
goto_if_eq VAR_RESULT, LINKUP_FAILED, CableClub_EventScript_ChooseLinkLeaderFrom2
goto_if_eq VAR_RESULT, LINKUP_RETRY_ROLE_ASSIGN, CableClub_EventScript_TryLeadGroup2Players
release
return
CableClub_EventScript_TryJoinGroup2Players::
call CableClub_EventScript_TryJoinLinkGroup
goto_if_eq VAR_RESULT, 1, CableClub_EventScript_EnterWirelessLinkRoom
goto_if_eq VAR_RESULT, 5, CableClub_EventScript_ChooseLinkLeaderFrom2
goto_if_eq VAR_RESULT, 8, CableClub_EventScript_TryJoinGroup2Players
goto_if_eq VAR_RESULT, LINKUP_SUCCESS, CableClub_EventScript_EnterWirelessLinkRoom
goto_if_eq VAR_RESULT, LINKUP_FAILED, CableClub_EventScript_ChooseLinkLeaderFrom2
goto_if_eq VAR_RESULT, LINKUP_RETRY_ROLE_ASSIGN, CableClub_EventScript_TryJoinGroup2Players
release
return
@@ -992,17 +992,17 @@ CableClub_EventScript_ChooseLinkLeaderFrom4::
CableClub_EventScript_TryLeadGroup4Players::
call CableClub_EventScript_TryBecomeLinkLeader
goto_if_eq VAR_RESULT, 1, CableClub_EventScript_EnterWirelessLinkRoom
goto_if_eq VAR_RESULT, 5, CableClub_EventScript_ChooseLinkLeaderFrom4
goto_if_eq VAR_RESULT, 8, CableClub_EventScript_TryLeadGroup4Players
goto_if_eq VAR_RESULT, LINKUP_SUCCESS, CableClub_EventScript_EnterWirelessLinkRoom
goto_if_eq VAR_RESULT, LINKUP_FAILED, CableClub_EventScript_ChooseLinkLeaderFrom4
goto_if_eq VAR_RESULT, LINKUP_RETRY_ROLE_ASSIGN, CableClub_EventScript_TryLeadGroup4Players
release
return
CableClub_EventScript_TryJoinGroup4Players::
call CableClub_EventScript_TryJoinLinkGroup
goto_if_eq VAR_RESULT, 1, CableClub_EventScript_EnterWirelessLinkRoom
goto_if_eq VAR_RESULT, 5, CableClub_EventScript_ChooseLinkLeaderFrom4
goto_if_eq VAR_RESULT, 8, CableClub_EventScript_TryJoinGroup4Players
goto_if_eq VAR_RESULT, LINKUP_SUCCESS, CableClub_EventScript_EnterWirelessLinkRoom
goto_if_eq VAR_RESULT, LINKUP_FAILED, CableClub_EventScript_ChooseLinkLeaderFrom4
goto_if_eq VAR_RESULT, LINKUP_RETRY_ROLE_ASSIGN, CableClub_EventScript_TryJoinGroup4Players
release
return
@@ -1021,17 +1021,17 @@ CableClub_EventScript_ChooseLinkLeader::
CableClub_EventScript_TryLeadGroupXPlayers::
call CableClub_EventScript_TryBecomeLinkLeader
goto_if_eq VAR_RESULT, 1, CableClub_EventScript_EnterWirelessLinkRoom
goto_if_eq VAR_RESULT, 5, CableClub_EventScript_ChooseLinkLeader
goto_if_eq VAR_RESULT, 8, CableClub_EventScript_TryLeadGroupXPlayers
goto_if_eq VAR_RESULT, LINKUP_SUCCESS, CableClub_EventScript_EnterWirelessLinkRoom
goto_if_eq VAR_RESULT, LINKUP_FAILED, CableClub_EventScript_ChooseLinkLeader
goto_if_eq VAR_RESULT, LINKUP_RETRY_ROLE_ASSIGN, CableClub_EventScript_TryLeadGroupXPlayers
release
return
CableClub_EventScript_TryJoinGroupXPlayers::
call CableClub_EventScript_TryJoinLinkGroup
goto_if_eq VAR_RESULT, 1, CableClub_EventScript_EnterWirelessLinkRoom
goto_if_eq VAR_RESULT, 5, CableClub_EventScript_ChooseLinkLeader
goto_if_eq VAR_RESULT, 8, CableClub_EventScript_TryJoinGroupXPlayers
goto_if_eq VAR_RESULT, LINKUP_SUCCESS, CableClub_EventScript_EnterWirelessLinkRoom
goto_if_eq VAR_RESULT, LINKUP_FAILED, CableClub_EventScript_ChooseLinkLeader
goto_if_eq VAR_RESULT, LINKUP_RETRY_ROLE_ASSIGN, CableClub_EventScript_TryJoinGroupXPlayers
release
return
@@ -1217,17 +1217,17 @@ CableClub_EventScript_ChooseLinkLeaderMinigame::
CableClub_EventScript_TryBecomeMinigameLinkLeader::
call CableClub_EventScript_TryBecomeLinkLeader
goto_if_eq VAR_RESULT, 1, CableClub_EventScript_EnterMinigame
goto_if_eq VAR_RESULT, 5, CableClub_EventScript_ChooseLinkLeaderMinigame
goto_if_eq VAR_RESULT, 8, CableClub_EventScript_TryBecomeMinigameLinkLeader
goto_if_eq VAR_RESULT, LINKUP_SUCCESS, CableClub_EventScript_EnterMinigame
goto_if_eq VAR_RESULT, LINKUP_FAILED, CableClub_EventScript_ChooseLinkLeaderMinigame
goto_if_eq VAR_RESULT, LINKUP_RETRY_ROLE_ASSIGN, CableClub_EventScript_TryBecomeMinigameLinkLeader
release
return
CableClub_EventScript_TryJoinMinigameLinkGroup::
call CableClub_EventScript_TryJoinLinkGroup
goto_if_eq VAR_RESULT, 1, CableClub_EventScript_EnterMinigame
goto_if_eq VAR_RESULT, 5, CableClub_EventScript_ChooseLinkLeaderMinigame
goto_if_eq VAR_RESULT, 8, CableClub_EventScript_TryJoinMinigameLinkGroup
goto_if_eq VAR_RESULT, LINKUP_SUCCESS, CableClub_EventScript_EnterMinigame
goto_if_eq VAR_RESULT, LINKUP_FAILED, CableClub_EventScript_ChooseLinkLeaderMinigame
goto_if_eq VAR_RESULT, LINKUP_RETRY_ROLE_ASSIGN, CableClub_EventScript_TryJoinMinigameLinkGroup
release
return
data/scripts/movement.inc
+17 -17
View File
@@ -1,55 +1,55 @@
Movement_QuestionMark::
Common_Movement_QuestionMark::
emote_question_mark
step_end
Movement_ExclamationMark::
Common_Movement_ExclamationMark::
emote_exclamation_mark
step_end
Movement_Delay48::
Common_Movement_Delay48::
delay_16
delay_16
delay_16
step_end
Movement_FacePlayer::
Common_Movement_FacePlayer::
face_player
step_end
@ Unused
Movement_FaceAwayPlayer::
Common_Movement_FaceAwayPlayer::
face_away_player
step_end
Movement_FaceOriginalDirection::
Common_Movement_FaceOriginalDirection::
face_original_direction
step_end
Movement_WalkInPlaceFasterLeft::
Common_Movement_WalkInPlaceFasterLeft::
walk_in_place_faster_left
step_end
Movement_WalkInPlaceFasterUp::
Common_Movement_WalkInPlaceFasterUp::
walk_in_place_faster_up
step_end
Movement_WalkInPlaceFasterRight::
Common_Movement_WalkInPlaceFasterRight::
walk_in_place_faster_right
step_end
Movement_WalkInPlaceFasterDown::
Common_Movement_WalkInPlaceFasterDown::
walk_in_place_faster_down
step_end
Movement_FaceRight::
Common_Movement_FaceRight::
face_right
step_end
Movement_FaceDown::
Common_Movement_FaceDown::
face_down
step_end
Movement_WalkUp5::
Common_Movement_WalkUp5::
walk_up
walk_up
walk_up
@@ -58,25 +58,25 @@ Movement_WalkUp5::
step_end
@ Unused
Movement_WalkUp4::
Common_Movement_WalkUp4::
walk_up
walk_up
walk_up
walk_up
step_end
Movement_Delay32::
Common_Movement_Delay32::
delay_16
delay_16
step_end
@ Unused
Movement_WalkUp::
Common_Movement_WalkUp::
walk_up
step_end
@ Unused
Movement_WalkUp2::
Common_Movement_WalkUp2::
walk_up
walk_up
step_end
data/scripts/pkmn_center_nurse.inc
+2 -2
View File
@@ -19,11 +19,11 @@ EventScript_PkmnCenterNurse_HealPkmn::
end
EventScript_PkmnCenterNurse_TakeAndHealPkmn::
applymovement VAR_LAST_TALKED, Movement_WalkInPlaceFasterLeft
applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceFasterLeft
waitmovement 0
dofieldeffect FLDEFF_POKECENTER_HEAL
waitfieldeffect FLDEFF_POKECENTER_HEAL
applymovement VAR_LAST_TALKED, Movement_WalkInPlaceFasterDown
applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceFasterDown
waitmovement 0
special HealPlayerParty
return
data/scripts/pokemon_league.inc
+3 -3
View File
@@ -1,5 +1,5 @@
PokemonLeague_EventScript_OpenDoor::
applymovement OBJ_EVENT_ID_PLAYER, Movement_Delay32
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_Delay32
waitmovement 0
playse SE_RS_DOOR
call PokemonLeague_EventScript_SetDoorOpen
@@ -8,7 +8,7 @@ PokemonLeague_EventScript_OpenDoor::
return
PokemonLeague_EventScript_EnterRoom::
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkUp5
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkUp5
waitmovement 0
setflag FLAG_TEMP_2
playse SE_UNLOCK
@@ -32,7 +32,7 @@ PokemonLeague_EventScript_PreventExit::
end
PokemonLeague_EventScript_OpenDoorLance::
applymovement OBJ_EVENT_ID_PLAYER, Movement_Delay32
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_Delay32
waitmovement 0
playse SE_RS_DOOR
setmetatile 6, 4, METATILE_PokemonLeague_Door_Top_Open, 1
data/scripts/questionnaire.inc
+4 -4
View File
@@ -15,12 +15,12 @@ EventScript_Questionnaire::
end
EventScript_EnableMysteryGift::
applymovement VAR_0x8008, Movement_FaceDown
applymovement VAR_0x8008, Common_Movement_FaceDown
waitmovement 0
playse SE_PIN
applymovement VAR_0x8008, Movement_ExclamationMark
applymovement VAR_0x8008, Common_Movement_ExclamationMark
waitmovement 0
applymovement VAR_0x8008, Movement_Delay48
applymovement VAR_0x8008, Common_Movement_Delay48
waitmovement 0
msgbox Text_YouKnowThoseWords
setflag FLAG_SYS_MYSTERY_GIFT_ENABLED
@@ -37,7 +37,7 @@ EventScript_DeclineQuestionnaire::
end
EventScript_TookQuestionnaire::
applymovement VAR_0x8008, Movement_FaceDown
applymovement VAR_0x8008, Common_Movement_FaceDown
waitmovement 0
msgbox Text_QuestionnaireThankYou
releaseall
data/scripts/route23.inc
+3 -3
View File
@@ -114,7 +114,7 @@ Route23_EventScript_RecognizeBadge::
Route23_EventScript_BadgeGuardTrigger::
textcolor NPC_TEXT_COLOR_MALE
applymovement VAR_0x8009, Movement_WalkInPlaceFasterLeft
applymovement VAR_0x8009, Common_Movement_WalkInPlaceFasterLeft
waitmovement 0
switch VAR_TEMP_1
case 1, Route23_EventScript_CheckBoulderBadgeTrigger
@@ -173,7 +173,7 @@ Route23_EventScript_MissingBoulderBadgeTrigger::
msgbox Text_CantLetYouPass
closemessage
applymovement OBJ_EVENT_ID_PLAYER, Route23_Movement_WalkDown
applymovement VAR_0x8009, Movement_WalkInPlaceFasterDown
applymovement VAR_0x8009, Common_Movement_WalkInPlaceFasterDown
waitmovement 0
releaseall
end
@@ -186,7 +186,7 @@ Route23_EventScript_MissingBadgeTrigger::
closemessage
waitse
applymovement OBJ_EVENT_ID_PLAYER, Route23_Movement_WalkDown
applymovement VAR_0x8009, Movement_WalkInPlaceFasterDown
applymovement VAR_0x8009, Common_Movement_WalkInPlaceFasterDown
waitmovement 0
releaseall
end
data/scripts/seagallop.inc
+1 -1
View File
@@ -117,7 +117,7 @@ EventScript_CancelSail::
VermilionCity_EventScript_WalkUpPier::
closemessage
applymovement LOCALID_FERRY_SAILOR, Movement_FaceOriginalDirection
applymovement LOCALID_FERRY_SAILOR, Common_Movement_FaceOriginalDirection
applymovement OBJ_EVENT_ID_PLAYER, VermilionCity_Movement_WalkUp
waitmovement 0
releaseall
data/scripts/trainer_card.inc
+4 -4
View File
@@ -74,12 +74,12 @@ FourIsland_House2_EventScript_StickerMan::
FourIsland_House2_EventScript_MeetStickerMan::
setflag FLAG_MET_STICKER_MAN
msgbox FourIsland_House2_Text_WishICouldShowOffStickers
applymovement LOCALID_STICKER_MAN, Movement_FacePlayer
applymovement LOCALID_STICKER_MAN, Common_Movement_FacePlayer
waitmovement 0
playse SE_PIN
applymovement LOCALID_STICKER_MAN, Movement_ExclamationMark
applymovement LOCALID_STICKER_MAN, Common_Movement_ExclamationMark
waitmovement 0
applymovement LOCALID_STICKER_MAN, Movement_Delay48
applymovement LOCALID_STICKER_MAN, Common_Movement_Delay48
waitmovement 0
goto_if_eq VAR_0x8008, 0, FourIsland_House2_EventScript_StickerManNothingToBrag
message FourIsland_House2_Text_GiveYouStickerIfYouBrag
@@ -88,7 +88,7 @@ FourIsland_House2_EventScript_MeetStickerMan::
end
FourIsland_House2_EventScript_StickerManAskForBrag::
applymovement LOCALID_STICKER_MAN, Movement_FacePlayer
applymovement LOCALID_STICKER_MAN, Common_Movement_FacePlayer
waitmovement 0
goto_if_questlog EventScript_ReleaseEnd
special QuestLog_CutRecording
data/scripts/trainer_tower.inc
+12 -12
View File
@@ -109,9 +109,9 @@ TrainerTower_EventScript_TriggerBattle::
TrainerTower_EventScript_DoSingleBattle:
ttower_encountermusic
applymovement LOCALID_TRAINER_SINGLES, Movement_ExclamationMark
applymovement LOCALID_TRAINER_SINGLES, Common_Movement_ExclamationMark
waitmovement 0
applymovement LOCALID_TRAINER_SINGLES, Movement_Delay48
applymovement LOCALID_TRAINER_SINGLES, Common_Movement_Delay48
waitmovement 0
setvar DISABLE_SINGLES_TRIGGER, TRUE
applymovement LOCALID_TRAINER_SINGLES, TrainerTower_Movement_SingleTrainerApproach
@@ -144,9 +144,9 @@ TrainerTower_EventScript_DoKnockoutBattle::
TrainerTower_EventScript_DoKnockoutBattle1:
ttower_encountermusic
applymovement LOCALID_TRAINER_KNOCKOUT, Movement_ExclamationMark
applymovement LOCALID_TRAINER_KNOCKOUT, Common_Movement_ExclamationMark
waitmovement 0
applymovement LOCALID_TRAINER_KNOCKOUT, Movement_Delay48
applymovement LOCALID_TRAINER_KNOCKOUT, Common_Movement_Delay48
waitmovement 0
applymovement LOCALID_TRAINER_KNOCKOUT, TrainerTower_Movement_BottomKnockoutTrainerApproach
waitmovement 0
@@ -154,9 +154,9 @@ TrainerTower_EventScript_DoKnockoutBattle1:
TrainerTower_EventScript_DoKnockoutBattle2::
ttower_encountermusic
applymovement LOCALID_TRAINER_DOUBLES1, Movement_ExclamationMark
applymovement LOCALID_TRAINER_DOUBLES1, Common_Movement_ExclamationMark
waitmovement 0
applymovement LOCALID_TRAINER_DOUBLES1, Movement_Delay48
applymovement LOCALID_TRAINER_DOUBLES1, Common_Movement_Delay48
waitmovement 0
applymovement LOCALID_TRAINER_DOUBLES1, TrainerTower_Movement_TopKnockoutTrainerApproach
waitmovement 0
@@ -164,9 +164,9 @@ TrainerTower_EventScript_DoKnockoutBattle2::
TrainerTower_EventScript_DoKnockoutBattle3::
ttower_encountermusic
applymovement LOCALID_TRAINER_SINGLES, Movement_ExclamationMark
applymovement LOCALID_TRAINER_SINGLES, Common_Movement_ExclamationMark
waitmovement 0
applymovement LOCALID_TRAINER_SINGLES, Movement_Delay48
applymovement LOCALID_TRAINER_SINGLES, Common_Movement_Delay48
waitmovement 0
applymovement LOCALID_TRAINER_SINGLES, TrainerTower_Movement_RightKnockoutTrainerApproach
waitmovement 0
@@ -339,9 +339,9 @@ TrainerTower_EventScript_DoubleBattleTriggerTop::
ttower_checkdoubles
goto_if_ne VAR_RESULT, PLAYER_HAS_TWO_USABLE_MONS, TrainerTower_EventScript_IneligibleForDoubleBattle
ttower_encountermusic
applymovement LOCALID_TRAINER_DOUBLES1, Movement_ExclamationMark
applymovement LOCALID_TRAINER_DOUBLES1, Common_Movement_ExclamationMark
waitmovement 0
applymovement LOCALID_TRAINER_DOUBLES1, Movement_Delay48
applymovement LOCALID_TRAINER_DOUBLES1, Common_Movement_Delay48
goto TrainerTower_EventScript_TriggerDoubleBattle
TrainerTower_EventScript_DoubleBattleTriggerBottom::
@@ -349,9 +349,9 @@ TrainerTower_EventScript_DoubleBattleTriggerBottom::
ttower_checkdoubles
goto_if_ne VAR_RESULT, PLAYER_HAS_TWO_USABLE_MONS, TrainerTower_EventScript_IneligibleForDoubleBattle
ttower_encountermusic
applymovement LOCALID_TRAINER_DOUBLES2, Movement_ExclamationMark
applymovement LOCALID_TRAINER_DOUBLES2, Common_Movement_ExclamationMark
waitmovement 0
applymovement LOCALID_TRAINER_DOUBLES2, Movement_Delay48
applymovement LOCALID_TRAINER_DOUBLES2, Common_Movement_Delay48
TrainerTower_EventScript_TriggerDoubleBattle:
waitmovement 0
setvar DISABLE_DOUBLES_TRIGGER, TRUE
data/scripts/white_out.inc
+1 -1
View File
@@ -24,7 +24,7 @@ EventScript_AfterWhiteOutHealMsg::
EventScript_AfterWhiteOutMomHeal::
lockall
textcolor NPC_TEXT_COLOR_FEMALE
applymovement LOCALID_MOM, Movement_WalkInPlaceFasterDown
applymovement LOCALID_MOM, Common_Movement_WalkInPlaceFasterDown
waitmovement 0
msgbox Text_HadQuiteAnExperienceTakeRest
call EventScript_OutOfCenterPartyHeal
data/smokescreen.s
-55
View File
@@ -1,55 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gSmokescreenImpactSpriteSheet::
obj_tiles gSmokescreenImpactTiles, 0x0180, 55019
gSmokescreenImpactSpritePalette::
obj_pal gSmokescreenImpactPalette, 55019
gOamData_835099C::
.4byte 0x40000000, 0x00000400
gAnimCmd_82509A4::
obj_image_anim_frame 0, 4
obj_image_anim_frame 4, 4
obj_image_anim_frame 8, 4
obj_image_anim_end
gAnimCmd_82509B4::
obj_image_anim_frame 0, 4, OBJ_IMAGE_ANIM_H_FLIP
obj_image_anim_frame 4, 4, OBJ_IMAGE_ANIM_H_FLIP
obj_image_anim_frame 8, 4, OBJ_IMAGE_ANIM_H_FLIP
obj_image_anim_end
gAnimCmd_82509C4::
obj_image_anim_frame 0, 4, OBJ_IMAGE_ANIM_V_FLIP
obj_image_anim_frame 4, 4, OBJ_IMAGE_ANIM_V_FLIP
obj_image_anim_frame 8, 4, OBJ_IMAGE_ANIM_V_FLIP
obj_image_anim_end
gAnimCmd_82509D4::
obj_image_anim_frame 0, 4, OBJ_IMAGE_ANIM_H_FLIP | OBJ_IMAGE_ANIM_V_FLIP
obj_image_anim_frame 4, 4, OBJ_IMAGE_ANIM_H_FLIP | OBJ_IMAGE_ANIM_V_FLIP
obj_image_anim_frame 8, 4, OBJ_IMAGE_ANIM_H_FLIP | OBJ_IMAGE_ANIM_V_FLIP
obj_image_anim_end
gSpriteAnimTable_82509E4::
.4byte gAnimCmd_82509A4
.4byte gAnimCmd_82509B4
.4byte gAnimCmd_82509C4
.4byte gAnimCmd_82509D4
gSmokescreenImpactSpriteTemplate::
spr_template 55019, 55019, gOamData_835099C, gSpriteAnimTable_82509E4, NULL, gDummySpriteAffineAnimTable, SpriteCB_DestroySprite
gSpriteSheet_EnemyShadow::
obj_tiles gFile_graphics_battle_interface_enemy_mon_shadow_sheet, 0x0080, 55129
gOamData_8250A14::
.4byte 0x40004000, 0x00000c00
gSpriteTemplate_EnemyShadow::
spr_template 55129, 55039, gOamData_8250A14, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCB_SetInvisible
graphics/interface/pss_unk_83CDAB8.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 113 B

graphics/interface/pss_unk_83CE2B8.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 132 B

graphics/interface/pss_unk_83CE438.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 168 B

graphics/interface/pss_unk_83CE738.pal
-19
View File
@@ -1,19 +0,0 @@
JASC-PAL
0100
16
0 0 0
148 148 172
255 255 255
0 0 0
123 189 255
0 123 255
255 131 131
172 24 24
255 238 230
255 230 213
255 222 205
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
graphics/interface/pss_unk_83CE810.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 282 B

graphics/interface/pss_unk_83CEA10.pal
-19
View File
@@ -1,19 +0,0 @@
JASC-PAL
0100
16
0 0 0
255 255 255
98 98 98
213 213 205
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
graphics/interface/pss_unk_83CEC80.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 886 B

graphics/interface/pss_unk_83CF16C.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 478 B

graphics/interface/pss_unk_83CF464.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 665 B

graphics/interface/pss_unk_83CF874.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 512 B

graphics/interface/pss_unk_83CFBA0.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 748 B

graphics/interface/pss_unk_83D0008.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 749 B

graphics/interface/pss_unk_83D0454.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 618 B

graphics/interface/pss_unk_83D0818.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 736 B

graphics/interface/pss_unk_83D0C78.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 805 B

graphics/interface/pss_unk_83D1124.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 636 B

graphics/interface/pss_unk_83D14F4.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 665 B

graphics/interface/pss_unk_83D18B4.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 603 B

graphics/interface/pss_unk_83D1C8C.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 552 B

graphics/interface/pss_unk_83D1FD4.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 722 B

graphics/interface/pss_unk_83D23DC.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 404 B

graphics/interface/pss_unk_83D2654.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 310 B

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