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

Merge remote-tracking branch '_pret/master' into _RHH/pr/master/pret_sync20240324

Browse Source 
# Conflicts:
#	src/battle_anim_fight.c
This commit is contained in:
Eduardo Quezada
2024-03-24 13:52:18 -03:00
parent 88565970c8 f19747d6cc
commit 3d181e5c70
15 changed files with 98 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
data/script_cmd_table.inc
View File

@@ -205,8 +205,8 @@ gScriptCmdTable::
.4byte ScrCmd_nop1 @ 0xca
.4byte ScrCmd_nop1 @ 0xcb
.4byte ScrCmd_nop1 @ 0xcc
.4byte ScrCmd_setmonmodernfatefulencounter @ 0xcd
.4byte ScrCmd_checkmonmodernfatefulencounter @ 0xce
.4byte ScrCmd_setmodernfatefulencounter @ 0xcd
.4byte ScrCmd_checkmodernfatefulencounter @ 0xce
.4byte ScrCmd_trywondercardscript @ 0xcf
.4byte ScrCmd_nop1 @ 0xd0
.4byte ScrCmd_warpspinenter @ 0xd1