diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-07-20 18:03:49 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-20 18:03:49 -0400 |
| commit | 4dc2ba23f617f0b53a8f4d95e82a71580a808c91 (patch) | |
| tree | 9522877c5990fcc3877e985f0d1c228a1c42593d /src/decoration.c | |
| parent | c6b4319b682807d714f88857f16287770b483db8 (diff) | |
| parent | aeeff84462973b267e62031a945603d96afed716 (diff) | |
Merge branch 'master' into constants-mapdatasize
Diffstat (limited to 'src/decoration.c')
| -rw-r--r-- | src/decoration.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/decoration.c b/src/decoration.c index 8dde2834d..4dd7e0f12 100644 --- a/src/decoration.c +++ b/src/decoration.c @@ -1430,7 +1430,7 @@ const struct YesNoFuncTable gUnknown_083EC634[] = { // text -extern u8 gUnknown_0815F399[]; +extern u8 SecretBase_EventScript_PCCancel[]; void sub_80FE1DC(void) { @@ -1524,7 +1524,7 @@ void gpu_pal_decompress_alloc_tag_and_upload(u8 taskId) FreeSpritePaletteByTag(6); if (ewram_1f000.isPlayerRoom == 0) { - ScriptContext1_SetupScript(gUnknown_0815F399); + ScriptContext1_SetupScript(SecretBase_EventScript_PCCancel); DestroyTask(taskId); } else { |