summaryrefslogtreecommitdiff
path: root/data/script_cmd_table.inc
diff options
context:
space:
mode:
authorDeokishisu <6993375+Deokishisu@users.noreply.github.com>2021-02-15 14:54:35 -0500
committerDeokishisu <6993375+Deokishisu@users.noreply.github.com>2021-02-15 14:54:35 -0500
commit7b2bf8c7e2249f66a04eabdbaeb2a8018855955f (patch)
treefd9c56262c4ef44569f313e5e067523a6a3546bf /data/script_cmd_table.inc
parentb89c3e901e1de2f3513d74fa548373d82d3f26d0 (diff)
Rename obedient/fatefulEncounter to eventLegal
Per discussion on pret, `obedient`/`fatefulEncounter` has been renamed to `eventLegal`, and all related functions and constants have been modified with this in mind. Additionally, fixed some whitespace alignment issues in `script_cmd_table.h`, `pokemon.h`, and `tv.c` from the last commit.
Diffstat (limited to 'data/script_cmd_table.inc')
-rw-r--r--data/script_cmd_table.inc4
1 files changed, 2 insertions, 2 deletions
diff --git a/data/script_cmd_table.inc b/data/script_cmd_table.inc
index 371219e39..a26ce6bf2 100644
--- a/data/script_cmd_table.inc
+++ b/data/script_cmd_table.inc
@@ -205,8 +205,8 @@ gScriptCmdTable:: @ 81DB67C
.4byte ScrCmd_nop1 @ 0xca
.4byte ScrCmd_nop1 @ 0xcb
.4byte ScrCmd_nop1 @ 0xcc
- .4byte ScrCmd_setmonfatefulencounter @ 0xcd
- .4byte ScrCmd_checkmonfatefulencounter @ 0xce
+ .4byte ScrCmd_setmoneventlegal @ 0xcd
+ .4byte ScrCmd_checkmoneventlegal @ 0xce
.4byte ScrCmd_gotoram @ 0xcf
.4byte ScrCmd_nop1 @ 0xd0
.4byte ScrCmd_warpspinenter @ 0xd1