Leahnaya/pokeemerald
1
0
Fork 0
mirror of https://github.com/pret/pokeemerald.git synced 2026-08-20 09:05:46 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into HEAD

Browse Source
This commit is contained in:
LOuroboros
2022-04-02 18:09:51 -03:00
parent be3d9c1c6d
commit fa39dc76dc
528 changed files with 8751 additions and 16995 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
data/scripts/gift_altering_cave.inc
View File

@@ -1,7 +1,7 @@
MysteryGiftScript_AlteringCave::
setvaddress MysteryGiftScript_AlteringCave
addvar VAR_ALTERING_CAVE_WILD_SET, 1
vgoto_if_ne VAR_ALTERING_CAVE_WILD_SET, 10, MysteryGiftScript_AlteringCave_
vgoto_if_ne VAR_ALTERING_CAVE_WILD_SET, (NUM_ALTERING_CAVE_TABLES + 1), MysteryGiftScript_AlteringCave_
setvar VAR_ALTERING_CAVE_WILD_SET, 0
MysteryGiftScript_AlteringCave_:
lock

2
data/scripts/kecleon.inc
View File

@@ -71,7 +71,7 @@ EventScript_BattleKecleon::
playmoncry SPECIES_KECLEON, CRY_MODE_ENCOUNTER
delay 40
waitmoncry
setwildbattle SPECIES_KECLEON, 30, ITEM_NONE
setwildbattle SPECIES_KECLEON, 30
setflag FLAG_SYS_CTRL_OBJ_DELETE
dowildbattle
clearflag FLAG_SYS_CTRL_OBJ_DELETE

4
data/scripts/pc.inc
View File

@@ -1,6 +1,6 @@
EventScript_PC::
lockall
setvar VAR_0x8004, 0
setvar VAR_0x8004, PC_LOCATION_OTHER
special DoPCTurnOnEffect
playse SE_PC_ON
msgbox Text_BootUpPC, MSGBOX_DEFAULT
@@ -51,7 +51,7 @@ EventScript_AccessLanettesPC::
return
EventScript_TurnOffPC::
setvar VAR_0x8004, 0
setvar VAR_0x8004, PC_LOCATION_OTHER
playse SE_PC_OFF
special DoPCTurnOffEffect
releaseall

6
data/scripts/secret_base.inc
View File

@@ -133,7 +133,7 @@ SecretBase_EventScript_InitSecretBase::
closemessage
playse SE_EXIT
setvar VAR_INIT_SECRET_BASE, 0
setflag FLAG_DECORATION_0
setflag FLAG_HIDE_SECRET_BASE_TRAINER
special SetPlayerSecretBase
special EnterSecretBase
setvar VAR_0x8004, 0
@@ -172,14 +172,14 @@ SecretBase_EventScript_Enter::
playse SE_EXIT
special IsCurSecretBaseOwnedByAnotherPlayer
goto_if_eq VAR_RESULT, FALSE, SecretBase_EventScript_EnterPlayersBase
clearflag FLAG_DECORATION_0
clearflag FLAG_HIDE_SECRET_BASE_TRAINER
special EnterSecretBase
setvar VAR_SECRET_BASE_INITIALIZED, 0
waitstate
end
SecretBase_EventScript_EnterPlayersBase::
setflag FLAG_DECORATION_0
setflag FLAG_HIDE_SECRET_BASE_TRAINER
special EnterSecretBase
setvar VAR_SECRET_BASE_INITIALIZED, 0
waitstate