diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2019-03-24 13:09:46 -0500 |
|---|---|---|
| committer | huderlem <huderlem@gmail.com> | 2019-03-24 13:15:37 -0500 |
| commit | 456cc3a6f02b6f45753b47e5ea37bd92e616f089 (patch) | |
| tree | 6bda4b048a176415741bc253d94f6ffd980dbbe2 /src | |
| parent | d3ff307f9f1067ae1a893bed1938417eb0c07c83 (diff) | |
Split out the remaining wireless-related files
Diffstat (limited to 'src')
| -rw-r--r-- | src/main_menu.c | 6 | ||||
| -rw-r--r-- | src/union_room.c (renamed from src/rom_8011DC0.c) | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/main_menu.c b/src/main_menu.c index e6e29d942..cbd257cb1 100644 --- a/src/main_menu.c +++ b/src/main_menu.c @@ -525,7 +525,7 @@ enum ACTION_OPTION, ACTION_MYSTERY_GIFT, ACTION_MYSTERY_EVENTS, - ACTION_UNKNOWN, // TODO: change when rom_8011DC0 decompiled + ACTION_EREADER, ACTION_INVALID }; @@ -1033,7 +1033,7 @@ static void Task_HandleMainMenuAPressed(u8 taskId) } else { - action = ACTION_UNKNOWN; + action = ACTION_EREADER; } break; case 3: @@ -1082,7 +1082,7 @@ static void Task_HandleMainMenuAPressed(u8 taskId) SetMainCallback2(CB2_InitMysteryEventMenu); DestroyTask(taskId); break; - case ACTION_UNKNOWN: + case ACTION_EREADER: SetMainCallback2(sub_801867C); DestroyTask(taskId); break; diff --git a/src/rom_8011DC0.c b/src/union_room.c index 3d9eab8d7..51d48fdcf 100644 --- a/src/rom_8011DC0.c +++ b/src/union_room.c @@ -2474,12 +2474,12 @@ u16 ReadAsU16(const u8 *ptr) return (ptr[1] << 8) | (ptr[0]); } -void sub_8015664(u32 arg0, const u8 *src) +void sub_8015664(u32 nextState, const u8 *src) { struct UnkStruct_URoom *data = gUnknown_02022C30.uRoom; data->state = 8; - data->stateAfterPrint = arg0; + data->stateAfterPrint = nextState; if (src != gStringVar4) StringExpandPlaceholders(gStringVar4, src); } @@ -3023,7 +3023,7 @@ void sub_80156E0(u8 taskId) break; case 13: sub_8017E00(gStringVar4, gUnknown_02022C2C | 0x40); - sub_8015664(0xE, gStringVar4); + sub_8015664(14, gStringVar4); break; case 14: sub_800ADF8(); |