diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2021-07-31 13:30:40 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-31 13:30:40 -0400 |
| commit | 3e60a7840653e50845abf10bb02cd1b519dcd80f (patch) | |
| tree | cb4a0d227a238ebdeb3b6cb9fdb92781bcc4f5e7 /data/script_cmd_table.inc | |
| parent | 602855ea99d8015ef5b7709f6fb1e9fd167239e2 (diff) | |
| parent | d391486247cc9f29d85787d6711f7cb993cf6585 (diff) | |
Merge branch 'master' into doc-frontierpass2
Diffstat (limited to 'data/script_cmd_table.inc')
| -rw-r--r-- | data/script_cmd_table.inc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/data/script_cmd_table.inc b/data/script_cmd_table.inc index a26ce6bf2..dcc0da9f7 100644 --- a/data/script_cmd_table.inc +++ b/data/script_cmd_table.inc @@ -1,5 +1,5 @@ .align 2 -gScriptCmdTable:: @ 81DB67C +gScriptCmdTable:: .4byte ScrCmd_nop @ 0x00 .4byte ScrCmd_nop1 @ 0x01 .4byte ScrCmd_end @ 0x02 @@ -119,7 +119,7 @@ gScriptCmdTable:: @ 81DB67C .4byte ScrCmd_drawboxtext @ 0x74 .4byte ScrCmd_showmonpic @ 0x75 .4byte ScrCmd_hidemonpic @ 0x76 - .4byte ScrCmd_showcontestwinner @ 0x77 + .4byte ScrCmd_showcontestpainting @ 0x77 .4byte ScrCmd_braillemessage @ 0x78 .4byte ScrCmd_givemon @ 0x79 .4byte ScrCmd_giveegg @ 0x7a @@ -228,5 +228,5 @@ gScriptCmdTable:: @ 81DB67C .4byte ScrCmd_buffercontesttype @ 0xe1 .4byte ScrCmd_bufferitemnameplural @ 0xe2 -gScriptCmdTableEnd:: @ 81DBA08 +gScriptCmdTableEnd:: .4byte ScrCmd_nop |