Rename WiFi overlays

Move overlay 4 to `nintendo_wfc`
Move overlay 18 to `wfc_settings`
Move overlay 60 to `http`
`unk_02099550` to `wifi_overlays`
This commit is contained in:
Gudf 2026-01-23 03:24:39 +01:00
parent 71b5c18510
commit cf878689e2
50 changed files with 113 additions and 114 deletions

View File

@ -51,7 +51,7 @@ enum HeapID {
HEAP_ID_POFFIN_CUTSCENE,
HEAP_ID_CHOOSE_STARTER_APP,
HEAP_ID_48,
HEAP_ID_49,
HEAP_ID_NINTENDO_WFC,
HEAP_ID_50,
HEAP_ID_51,
HEAP_ID_52,

View File

@ -1,5 +1,5 @@
#ifndef POKEPLATINUM_HTTP_H
#define POKEPLATINUM_HTTP_H
#ifndef POKEPLATINUM_HTTP_HTTP_H
#define POKEPLATINUM_HTTP_HTTP_H
void HTTP_Init(void);
int HTTP_PrepareRequest(const u8 *url, int dwcProfileID, const void *data, int dataSize, u8 *response, int maxResponseLength);
@ -8,4 +8,4 @@ void HTTP_Shutdown(void);
int HTTP_GetErrorCode(void);
int HTTP_GetResponseLength(void);
#endif // POKEPLATINUM_HTTP_H
#endif // POKEPLATINUM_HTTP_HTTP_H

View File

@ -1,5 +1,5 @@
#ifndef POKEPLATINUM_OV60_0221F800_H
#define POKEPLATINUM_OV60_0221F800_H
#ifndef POKEPLATINUM_HTTP_HTTP_B64_H
#define POKEPLATINUM_HTTP_HTTP_B64_H
enum HTTPB64EncodeResult {
HTTP_B64_ENCODE_SUCCESS = 0,
@ -10,4 +10,4 @@ enum HTTPB64EncodeResult {
enum HTTPB64EncodeResult HTTPB64_EncryptAndEncodeB64(u32 dwcProfileID, const u8 *in, int length, u8 *out, int outSize);
u32 HTTPB64_CalcEncodedSize(u32 decodedSize);
#endif // POKEPLATINUM_OV60_0221F800_H
#endif // POKEPLATINUM_HTTP_HTTP_B64_H

View File

@ -1,5 +1,5 @@
#ifndef POKEPLATINUM_OV4_021D0D80_H
#define POKEPLATINUM_OV4_021D0D80_H
#ifndef POKEPLATINUM_NINTENDO_WFC_MAIN_H
#define POKEPLATINUM_NINTENDO_WFC_MAIN_H
#include <dwc.h>
@ -63,4 +63,4 @@ void NintendoWFC_SetDisconnectIfAlone(BOOL disconnect);
u8 NintendoWFC_GetNeedsGameSave(void);
void NintendoWFC_ResetNeedsGameSave(void);
#endif // POKEPLATINUM_OV4_021D0D80_H
#endif // POKEPLATINUM_NINTENDO_WFC_MAIN_H

View File

@ -1,5 +1,5 @@
#ifndef POKEPLATINUM_OV4_021D2808_H
#define POKEPLATINUM_OV4_021D2808_H
#ifndef POKEPLATINUM_NINTENDO_WFC_VOICE_CHAT_H
#define POKEPLATINUM_NINTENDO_WFC_VOICE_CHAT_H
#include "constants/heap.h"
@ -16,4 +16,4 @@ BOOL VoiceChat_ProcessReceivedData(int id, void *buffer, int size);
void VoiceChat_RequestEnd(void);
BOOL VoiceChat_AddConferenceClients(int newClientsBitmap, int currentClientID);
#endif // POKEPLATINUM_OV4_021D2808_H
#endif // POKEPLATINUM_NINTENDO_WFC_VOICE_CHAT_H

View File

@ -1,8 +0,0 @@
#ifndef POKEPLATINUM_OV18_0221F800_H
#define POKEPLATINUM_OV18_0221F800_H
#include "constants/heap.h"
void WFCSettings_StartApplication(enum HeapID heapID);
#endif // POKEPLATINUM_OV18_0221F800_H

View File

@ -0,0 +1,8 @@
#ifndef POKEPLATINUM_WFC_SETTINGS_H
#define POKEPLATINUM_WFC_SETTINGS_H
#include "constants/heap.h"
void WFCSettings_StartApplication(enum HeapID heapID);
#endif // POKEPLATINUM_WFC_SETTINGS_H

View File

@ -1,5 +1,5 @@
#ifndef POKEPLATINUM_UNK_02099550_H
#define POKEPLATINUM_UNK_02099550_H
#ifndef POKEPLATINUM_WIFI_OVERLAYS_H
#define POKEPLATINUM_WIFI_OVERLAYS_H
#include "savedata.h"
@ -10,4 +10,4 @@ void Overlay_UnloadWFCSettingsOverlay(void);
void Overlay_LoadHttpOverlay(void);
void Overlay_UnloadHttpOverlay(void);
#endif // POKEPLATINUM_UNK_02099550_H
#endif // POKEPLATINUM_WIFI_OVERLAYS_H

View File

@ -347,7 +347,7 @@ Static main
Object main.nef.p/src_applications_poffin_case_main.c.o
Object main.nef.p/src_poffin_sprite.c.o
Object main.nef.p/src_unk_02099500.c.o
Object main.nef.p/src_unk_02099550.c.o
Object main.nef.p/src_wifi_overlays.c.o
Object main.nef.p/src_unk_02099604.c.o
Object main.nef.p/src_unk_020996D0.c.o
Object main.nef.p/src_move_reminder_data.c.o
@ -439,11 +439,11 @@ Overlay overlay3
Object main.nef.p/src_overlay003_ov3_dummy.c.o
}
Overlay overlay4
Overlay nintendo_wfc
{
After main
Object main.nef.p/src_overlay004_ov4_021D0D80.c.o
Object main.nef.p/src_overlay004_ov4_021D2808.c.o
Object main.nef.p/src_nintendo_wfc_main.c.o
Object main.nef.p/src_nintendo_wfc_voice_chat.c.o
Library libdwcauth.a
Library libdwcbase.a
Library libdwcac.a
@ -619,13 +619,13 @@ Overlay overlay9
Overlay overlay10
{
After overlay4
After nintendo_wfc
Object main.nef.p/src_overlay010_ov10_0221F800.c.o
}
Overlay overlay11
{
After overlay4
After nintendo_wfc
Object main.nef.p/src_overlay011_move_palettes.c.o
Object main.nef.p/src_overlay011_particle_helper.c.o
}
@ -737,10 +737,10 @@ Overlay overlay17
Object main.nef.p/src_overlay017_ov17_02252CEC.c.o
}
Overlay overlay18
Overlay wfc_settings
{
After overlay4
Object main.nef.p/src_overlay018_ov18_0221F800.c.o
After nintendo_wfc
Object main.nef.p/src_wfc_settings_wfc_settings.c.o
Library libmb.a
Library libdwcutil.a
}
@ -1116,11 +1116,11 @@ Overlay overlay59
Object main.nef.p/src_overlay059_ov59_021D2F88.c.o
}
Overlay overlay60
Overlay http
{
After overlay4
Object main.nef.p/src_overlay060_ov60_0221F800.c.o
Object main.nef.p/src_overlay060_http.c.o
After nintendo_wfc
Object main.nef.p/src_http_http_b64.c.o
Object main.nef.p/src_http_http.c.o
Library libdwcgsghttp.a
Library libdwcnd.a
Library libdwcnhttp.a
@ -1128,7 +1128,7 @@ Overlay overlay60
Overlay overlay61
{
After overlay60
After http
Object main.nef.p/src_overlay061_ov61_0222AE60.c.o
Object main.nef.p/src_overlay061_ov61_0222B008.c.o
Object main.nef.p/src_overlay061_ov61_0222BC4C.c.o
@ -1159,7 +1159,7 @@ Overlay overlay62
Overlay overlay63
{
After overlay60
After http
Object main.nef.p/src_overlay063_ov63_0222AE60.c.o
Object main.nef.p/src_overlay063_ov63_0222BCE8.c.o
Object main.nef.p/src_overlay063_ov63_0222BE18.c.o
@ -1455,7 +1455,7 @@ Overlay overlay96
Overlay main_menu
{
After overlay60
After http
Object main.nef.p/src_main_menu_main_menu.c.o
Object main.nef.p/src_main_menu_ov97_0222C174.c.o
Object main.nef.p/src_main_menu_ov97_0222D04C.c.o

View File

@ -3,7 +3,7 @@ de8a847bff8c343d69b853a215e6ee775ef2ef96 *overlay0.sbin
906b5d19e6478a795eda151c771ff3a47fb1a8d5 *overlay1.sbin
de8a847bff8c343d69b853a215e6ee775ef2ef96 *overlay2.sbin
de8a847bff8c343d69b853a215e6ee775ef2ef96 *overlay3.sbin
2527b3e0bbc7cf76e9125c8215043faf84ef0af2 *overlay4.sbin
2527b3e0bbc7cf76e9125c8215043faf84ef0af2 *nintendo_wfc.sbin
0456f78ac3e294722f669c793fc9727b23b66fba *overlay5.sbin
6e5ed74d5bdb94d2ce78d8990c364b4766eab772 *overlay6.sbin
fef29cf33d4dfd1f068a7b67798e7b5950fce749 *overlay7.sbin
@ -17,7 +17,7 @@ d9b09c1e37088d6aaeb73143ecec98ab3327ec67 *trainer_ai.sbin
de8a847bff8c343d69b853a215e6ee775ef2ef96 *overlay15.sbin
b058a62fb8e4d646bb7508f5a21e406591f809c1 *battle.sbin
543c0afabc3d90310f1bc8d4902743461dfdc1e5 *overlay17.sbin
111fe69ca18026aa8574b8f79a6b94ef73715267 *overlay18.sbin
111fe69ca18026aa8574b8f79a6b94ef73715267 *wfc_settings.sbin
d414d37a9b80f1d346666ad9ef5ba635d5ebb552 *pc_boxes.sbin
7534ad61985affc27e8b121a6645b825ffae48c7 *overlay20.sbin
6dd9a720fe069aedd9107398c16ba93e57769c64 *pokedex.sbin
@ -59,7 +59,7 @@ ea68f11d110d5929d18eeaad9cf3f1792986ab7f *poketch_unused_4.sbin
88b06ba661770c8feef9ec96bcee6942819fbda4 *game_start.sbin
9b7c8c69b165a8a4f1da4ff4fc73bdc0af52def8 *overlay58.sbin
43b9d869fc580cb7e6af6ef95cbbc015b5542d50 *overlay59.sbin
0a0cfedfb93a08ff8fd187d6e62a5c9a1e3056cc *overlay60.sbin
0a0cfedfb93a08ff8fd187d6e62a5c9a1e3056cc *http.sbin
a5f5fb58639672291dc9328f8659fdea0a1329ee *overlay61.sbin
d073752e86af2a435978fed11ce5557c5dc3b3ac *overlay62.sbin
75595fd5704b4ffdce5e32160e35506e166d2122 *overlay63.sbin

View File

@ -10,7 +10,7 @@
#include "struct_defs/struct_020322F8.h"
#include "struct_defs/struct_0203233C.h"
#include "overlay004/ov4_021D0D80.h"
#include "nintendo_wfc/main.h"
#include "comm_ring.h"
#include "communication_information.h"

View File

@ -1,8 +1,8 @@
#include "overlay060/http.h"
#include "http/http.h"
#include <dwc.h>
#include "overlay060/ov60_0221F800.h"
#include "http/http_b64.h"
#define HASH_SIZE 20

View File

@ -1,4 +1,4 @@
#include "overlay060/ov60_0221F800.h"
#include "http/http_b64.h"
#include <dwc.h>
#include <nitro.h>

View File

@ -7,7 +7,7 @@
#include "constants/net.h"
#include "main_menu/mystery_gift_app.h"
#include "overlay004/ov4_021D0D80.h"
#include "nintendo_wfc/main.h"
#include "heap.h"
#include "overlay_manager.h"
@ -15,7 +15,7 @@
#include "unk_02033200.h"
#include "unk_020366A0.h"
#include "unk_020393C8.h"
#include "unk_02099550.h"
#include "wifi_overlays.h"
static BOOL Unk_ov97_02240400;
static int Unk_ov97_0224040C;

View File

@ -329,7 +329,7 @@ pokeplatinum_c = files(
'applications/poffin_case/main.c',
'poffin_sprite.c',
'unk_02099500.c',
'unk_02099550.c',
'wifi_overlays.c',
'unk_02099604.c',
'unk_020996D0.c',
'move_reminder_data.c',
@ -356,8 +356,8 @@ pokeplatinum_c = files(
'overlay001/ov1_021D0D80.c',
'overlay002/ov2_dummy.c',
'overlay003/ov3_dummy.c',
'overlay004/ov4_021D0D80.c',
'overlay004/ov4_021D2808.c',
'nintendo_wfc/main.c',
'nintendo_wfc/voice_chat.c',
'overlay005/fieldmap.c',
'overlay005/ov5_021D1A94.c',
'overlay005/field_control.c',
@ -567,7 +567,7 @@ pokeplatinum_c = files(
'overlay017/ov17_02252A70.c',
'overlay017/ov17_02252AB0.c',
'overlay017/ov17_02252CEC.c',
'overlay018/ov18_0221F800.c',
'wfc_settings/wfc_settings.c',
'applications/pc_boxes/box_app_manager.c',
'applications/pc_boxes/touch_dial.c',
'applications/pc_boxes/ov19_021D61B0.c',
@ -734,8 +734,8 @@ pokeplatinum_c = files(
'overlay059/ov59_021D2A2C.c',
'overlay059/ov59_021D2B44.c',
'overlay059/ov59_021D2F88.c',
'overlay060/ov60_0221F800.c',
'overlay060/http.c',
'http/http_b64.c',
'http/http.c',
'overlay061/ov61_0222AE60.c',
'overlay061/ov61_0222B008.c',
'overlay061/ov61_0222BC4C.c',

View File

@ -1,4 +1,4 @@
#include "overlay004/ov4_021D0D80.h"
#include "nintendo_wfc/main.h"
#include <dwc.h>
#include <nitro.h>
@ -9,7 +9,7 @@
#include "constants/net.h"
#include "global/assert.h"
#include "overlay004/ov4_021D2808.h"
#include "nintendo_wfc/voice_chat.h"
#include "communication_system.h"
#include "dwc_error.h"

View File

@ -1,11 +1,11 @@
#include "overlay004/ov4_021D2808.h"
#include "nintendo_wfc/voice_chat.h"
#include <dwc.h>
#include <nitro.h>
#include <string.h>
#include <vct.h>
#include "overlay004/ov4_021D0D80.h"
#include "nintendo_wfc/main.h"
#include "heap.h"
#include "unk_0203266C.h"

View File

@ -8,7 +8,7 @@
#include "struct_defs/dress_up_photo.h"
#include "struct_defs/struct_02030A80.h"
#include "overlay004/ov4_021D0D80.h"
#include "nintendo_wfc/main.h"
#include "overlay061/ov61_0222AE60.h"
#include "overlay061/ov61_0222BC4C.h"
#include "overlay061/struct_ov61_0222AFC0.h"

View File

@ -10,7 +10,7 @@
#include "struct_decls/struct_0202B370_decl.h"
#include "struct_defs/struct_02017498.h"
#include "overlay004/ov4_021D0D80.h"
#include "nintendo_wfc/main.h"
#include "overlay061/struct_ov61_0222C3B0.h"
#include "bg_window.h"

View File

@ -15,7 +15,7 @@
#include "struct_defs/struct_0207E060.h"
#include "struct_defs/wi_fi_history.h"
#include "overlay004/ov4_021D0D80.h"
#include "nintendo_wfc/main.h"
#include "overlay065/ov65_02235060.h"
#include "overlay065/struct_ov65_0222E99C.h"
#include "overlay065/struct_ov65_0222EBE0_decl.h"
@ -86,10 +86,10 @@
#include "unk_0203909C.h"
#include "unk_020393C8.h"
#include "unk_0207DFAC.h"
#include "unk_02099550.h"
#include "unk_0209C390.h"
#include "vars_flags.h"
#include "vram_transfer.h"
#include "wifi_overlays.h"
FS_EXTERN_OVERLAY(overlay63);

View File

@ -9,7 +9,7 @@
#include "struct_defs/struct_0207DFAC.h"
#include "struct_defs/struct_0207E060.h"
#include "overlay004/ov4_021D0D80.h"
#include "nintendo_wfc/main.h"
#include "overlay063/ov63_0222BE18.h"
#include "overlay063/ov63_0222CCE4.h"
#include "overlay063/struct_ov63_0222BE18_decl.h"

View File

@ -17,7 +17,7 @@
#include "sys_task.h"
#include "sys_task_manager.h"
#include "system.h"
#include "unk_02099550.h"
#include "wifi_overlays.h"
FS_EXTERN_OVERLAY(overlay63);

View File

@ -4,7 +4,7 @@
#include <nitro.h>
#include <string.h>
#include "overlay004/ov4_021D0D80.h"
#include "nintendo_wfc/main.h"
#include "overlay066/struct_ov66_02231428.h"
#include "overlay066/struct_ov66_02231560.h"

View File

@ -8,7 +8,7 @@
#include "struct_decls/struct_0202B370_decl.h"
#include "struct_defs/wi_fi_history.h"
#include "overlay004/ov4_021D0D80.h"
#include "nintendo_wfc/main.h"
#include "overlay066/struct_ov66_02232B20.h"
#include "overlay066/struct_ov66_022589B4.h"

View File

@ -3,7 +3,7 @@
#include <nitro.h>
#include <string.h>
#include "overlay004/ov4_021D0D80.h"
#include "nintendo_wfc/main.h"
#include "overlay082/ov82_0223B2E0.h"
#include "overlay082/struct_ov82_0223B164.h"
#include "overlay083/struct_ov83_0223C344.h"

View File

@ -9,7 +9,7 @@
#include "struct_decls/struct_0202440C_decl.h"
#include "struct_decls/struct_0202B370_decl.h"
#include "overlay004/ov4_021D0D80.h"
#include "nintendo_wfc/main.h"
#include "overlay083/ov83_0223C958.h"
#include "overlay083/ov83_0223D150.h"
#include "overlay083/ov83_0223D4CC.h"

View File

@ -5,7 +5,7 @@
#include "struct_defs/struct_02039A58.h"
#include "overlay004/ov4_021D0D80.h"
#include "nintendo_wfc/main.h"
#include "communication_system.h"
#include "heap.h"

View File

@ -50,8 +50,8 @@
#include "system.h"
#include "trainer_info.h"
#include "unk_02033200.h"
#include "unk_02099550.h"
#include "vram_transfer.h"
#include "wifi_overlays.h"
static void GTSApplication_VBlankCallback(void *appStatePtr);
static void GTSApplication_SetVRAMBanks(void);
@ -132,7 +132,7 @@ BOOL GTSApplication_Init(ApplicationManager *appMan, int *loopState)
*loopState = 1;
break;
case 1:
Overlay_LoadWFCOverlay(); // load overlay4
Overlay_LoadWFCOverlay();
Overlay_LoadHttpOverlay();
WirelessDriver_Init();
(*loopState) = 0;

View File

@ -4,7 +4,7 @@
#include <nitro.h>
#include <string.h>
#include "overlay060/http.h"
#include "http/http.h"
#include "overlay094/gts_application_state.h"
#include "overlay094/struct_ov94_0223BA24.h"
#include "overlay096/struct_world_exchange_trainer.h"

View File

@ -6,7 +6,7 @@
#include "constants/net.h"
#include "overlay004/ov4_021D0D80.h"
#include "nintendo_wfc/main.h"
#include "overlay094/application.h"
#include "overlay094/gts_application_state.h"
#include "overlay094/networking.h"

View File

@ -4,7 +4,7 @@
#include <nitro.h>
#include <string.h>
#include "overlay060/http.h"
#include "http/http.h"
#include "overlay096/struct_ov96_0223B450.h"
#include "overlay096/struct_ov96_0223B450_sub1.h"
#include "overlay096/struct_world_exchange_trainer.h"

View File

@ -32,8 +32,8 @@
#include "system.h"
#include "unk_02033200.h"
#include "unk_020393C8.h"
#include "unk_02099550.h"
#include "vram_transfer.h"
#include "wifi_overlays.h"
static void ov96_0223B940(void *param0);
static void ov96_0223B960(void);

View File

@ -8,7 +8,7 @@
#include "struct_defs/struct_02049A68.h"
#include "overlay004/ov4_021D0D80.h"
#include "nintendo_wfc/main.h"
#include "overlay096/ov96_0223B140.h"
#include "overlay096/ov96_0223B6A0.h"
#include "overlay096/struct_ov96_0223B450.h"

View File

@ -29,8 +29,8 @@
#include "unk_02038FFC.h"
#include "unk_020393C8.h"
#include "unk_020890F4.h"
#include "unk_02099550.h"
#include "vars_flags.h"
#include "wifi_overlays.h"
#include "constdata/const_020F2DBC.h"

View File

@ -9,7 +9,7 @@
#include "struct_decls/struct_0202B370_decl.h"
#include "overlay004/ov4_021D0D80.h"
#include "nintendo_wfc/main.h"
#include "overlay061/struct_ov61_0222C3B0.h"
#include "overlay094/networking.h"
#include "overlay098/ov98_02246C20.h"

View File

@ -11,7 +11,7 @@
#include "struct_decls/struct_0202B370_decl.h"
#include "applications/naming_screen.h"
#include "overlay004/ov4_021D0D80.h"
#include "nintendo_wfc/main.h"
#include "overlay063/ov63_0222BE18.h"
#include "overlay063/ov63_0222CCE4.h"
#include "overlay063/struct_ov63_0222BEC0_decl.h"

View File

@ -9,7 +9,7 @@
#include "struct_decls/struct_0202B370_decl.h"
#include "struct_defs/struct_02015958.h"
#include "overlay004/ov4_021D0D80.h"
#include "nintendo_wfc/main.h"
#include "overlay066/ov66_0222DDF0.h"
#include "overlay066/struct_ov66_02230DBC.h"
#include "overlay114/ov114_02260044.h"

View File

@ -3,7 +3,7 @@
#include <nitro.h>
#include <string.h>
#include "overlay004/ov4_021D0D80.h"
#include "nintendo_wfc/main.h"
#include "overlay114/ov114_0225C700.h"
#include "overlay114/struct_ov114_0225C76C.h"
#include "overlay114/struct_ov114_0225C9A8.h"

View File

@ -5,7 +5,7 @@
#include "constants/graphics.h"
#include "overlay004/ov4_021D0D80.h"
#include "nintendo_wfc/main.h"
#include "overlay114/ov114_0225C700.h"
#include "overlay116/ov116_02260440.h"
#include "overlay116/ov116_02261870.h"

View File

@ -4,7 +4,7 @@
#include <nitro.h>
#include <string.h>
#include "overlay004/ov4_021D0D80.h"
#include "nintendo_wfc/main.h"
#include "overlay114/ov114_0225C700.h"
#include "overlay117/ov117_02260668.h"
#include "overlay117/ov117_02266498.h"

View File

@ -6,7 +6,7 @@
#include "constants/graphics.h"
#include "overlay004/ov4_021D0D80.h"
#include "nintendo_wfc/main.h"
#include "overlay114/ov114_0225C700.h"
#include "overlay117/ov117_022626B0.h"
#include "overlay117/ov117_02263AF0.h"

View File

@ -16,7 +16,7 @@
#include "unk_02033200.h"
#include "unk_020393C8.h"
#include "unk_0208BA78.h"
#include "unk_02099550.h"
#include "wifi_overlays.h"
static NNSFndHeapHandle Unk_021BF678;

View File

@ -4,7 +4,7 @@
#include <nitro.h>
#include <string.h>
#include "overlay004/ov4_021D0D80.h"
#include "nintendo_wfc/main.h"
#include "overlay065/struct_ov65_0222F6EC.h"
#include "overlay066/ov66_022324F0.h"
@ -187,7 +187,7 @@ static void sub_02036734(void)
}
if (CommMan_IsConnectedToWifi()) {
Heap_Destroy(HEAP_ID_49);
Heap_Destroy(HEAP_ID_NINTENDO_WFC);
}
NetworkIcon_Destroy();
@ -2202,11 +2202,11 @@ static void sub_020386B4(void)
}
{
Heap_CreateAtEnd(HEAP_ID_APPLICATION, HEAP_ID_49, (0x2A000 + 0xA000 + 0x1400));
Heap_CreateAtEnd(HEAP_ID_APPLICATION, HEAP_ID_NINTENDO_WFC, (0x2A000 + 0xA000 + 0x1400));
}
if (CommSys_InitServer(1, 1, 512, 1)) {
NintendoWFC_Init(Unk_021C07D4->saveData, HEAP_ID_49, (0x2B000 + 0x1400), CommLocal_MaxMachines(Unk_021C07D4->unk_4A) + 1);
NintendoWFC_Init(Unk_021C07D4->saveData, HEAP_ID_NINTENDO_WFC, (0x2B000 + 0x1400), CommLocal_MaxMachines(Unk_021C07D4->unk_4A) + 1);
NintendoWFC_SetFatalErrorCallback(sub_020389FC);
CommSys_SwitchTransitionTypeToParallel();
sub_02036C94(sub_0203862C, (30 * 60 * 2));
@ -2530,11 +2530,11 @@ static void sub_02038BA8(void)
}
{
Heap_CreateAtEnd(HEAP_ID_APPLICATION, HEAP_ID_49, 0x60000);
Heap_CreateAtEnd(HEAP_ID_APPLICATION, HEAP_ID_NINTENDO_WFC, 0x60000);
}
if (CommSys_InitServer(1, 1, 512, 1)) {
NintendoWFC_Init(Unk_021C07D4->saveData, HEAP_ID_49, 0x58000, CommLocal_MaxMachines(Unk_021C07D4->unk_4A) + 1);
NintendoWFC_Init(Unk_021C07D4->saveData, HEAP_ID_NINTENDO_WFC, 0x58000, CommLocal_MaxMachines(Unk_021C07D4->unk_4A) + 1);
NintendoWFC_SetFatalErrorCallback(sub_020389FC);
CommSys_SwitchTransitionTypeToParallel();
NintendoWFC_SetVoiceChatEnabled(0);

View File

@ -9,7 +9,7 @@
#include "heap.h"
#include "savedata.h"
#include "unk_0202ACE0.h"
#include "unk_02099550.h"
#include "wifi_overlays.h"
int sub_02038FFC(enum HeapID heapID)
{

View File

@ -6,7 +6,7 @@
#include "struct_decls/struct_02061AB4_decl.h"
#include "field/field_system.h"
#include "overlay004/ov4_021D0D80.h"
#include "nintendo_wfc/main.h"
#include "communication_information.h"
#include "communication_system.h"

View File

@ -9,7 +9,6 @@
#include "struct_defs/struct_0207DE04.h"
#include "field/field_system.h"
#include "overlay018/ov18_0221F800.h"
#include "overlay065/ov65_0222DCE0.h"
#include "overlay065/ov65_0223648C.h"
#include "overlay066/struct_ov66_02231134.h"
@ -19,6 +18,7 @@
#include "overlay116/ov116_022604C4.h"
#include "overlay117/ov117_02260440.h"
#include "overlay117/struct_ov117_02260440.h"
#include "wfc_settings/wfc_settings.h"
#include "communication_system.h"
#include "encounter.h"
@ -30,10 +30,10 @@
#include "system_flags.h"
#include "unk_02038FFC.h"
#include "unk_0203D1B8.h"
#include "unk_02099550.h"
#include "unk_02099604.h"
#include "unk_0209BA18.h"
#include "vars_flags.h"
#include "wifi_overlays.h"
FS_EXTERN_OVERLAY(overlay65);
FS_EXTERN_OVERLAY(overlay114);

View File

@ -5,7 +5,7 @@
#include "struct_defs/struct_0207E060.h"
#include "overlay004/ov4_021D0D80.h"
#include "nintendo_wfc/main.h"
#include "heap.h"
#include "trainer_info.h"

View File

@ -26,8 +26,8 @@
#include "unk_0202F1D4.h"
#include "unk_020553DC.h"
#include "unk_0208C010.h"
#include "unk_02099550.h"
#include "vars_flags.h"
#include "wifi_overlays.h"
#include "constdata/const_020EA358.h"
#include "constdata/const_020F2FCC.h"

View File

@ -1,4 +1,4 @@
#include "overlay018/ov18_0221F800.h"
#include "wfc_settings/wfc_settings.h"
#include <dwc.h>
#include <nitro.h>

View File

@ -1,9 +1,9 @@
#include "unk_02099550.h"
#include "wifi_overlays.h"
#include <nitro.h>
#include <string.h>
#include "overlay018/ov18_0221F800.h"
#include "wfc_settings/wfc_settings.h"
#include "game_overlay.h"
#include "heap.h"
@ -11,29 +11,28 @@
#include "overlay_manager.h"
#include "savedata.h"
FS_EXTERN_OVERLAY(overlay4);
FS_EXTERN_OVERLAY(overlay18);
FS_EXTERN_OVERLAY(overlay60);
FS_EXTERN_OVERLAY(overlay89);
FS_EXTERN_OVERLAY(nintendo_wfc);
FS_EXTERN_OVERLAY(wfc_settings);
FS_EXTERN_OVERLAY(http);
void Overlay_LoadWFCOverlay(void)
{
Overlay_LoadByID(FS_OVERLAY_ID(overlay4), 2);
Overlay_LoadByID(FS_OVERLAY_ID(nintendo_wfc), OVERLAY_LOAD_ASYNC);
}
void Overlay_UnloadWFCOverlay(void)
{
Overlay_UnloadByID(FS_OVERLAY_ID(overlay4));
Overlay_UnloadByID(FS_OVERLAY_ID(nintendo_wfc));
}
void Overlay_LoadWFCSettingsOverlay(void)
{
Overlay_LoadByID(FS_OVERLAY_ID(overlay18), 2);
Overlay_LoadByID(FS_OVERLAY_ID(wfc_settings), OVERLAY_LOAD_ASYNC);
}
void Overlay_UnloadWFCSettingsOverlay(void)
{
Overlay_UnloadByID(FS_OVERLAY_ID(overlay18));
Overlay_UnloadByID(FS_OVERLAY_ID(wfc_settings));
}
static void StartWFCSettings(SaveData *saveData, enum HeapID heapID)
@ -51,19 +50,19 @@ static void StartWFCSettings(SaveData *saveData, enum HeapID heapID)
void Overlay_LoadHttpOverlay(void)
{
Overlay_LoadByID(FS_OVERLAY_ID(overlay60), 2);
Overlay_LoadByID(FS_OVERLAY_ID(http), OVERLAY_LOAD_ASYNC);
}
void Overlay_UnloadHttpOverlay(void)
{
Overlay_UnloadByID(FS_OVERLAY_ID(overlay60));
Overlay_UnloadByID(FS_OVERLAY_ID(http));
}
static BOOL RebootIntoWFCSettings(ApplicationManager *appMan, int *unused)
{
Heap_Create(HEAP_ID_APPLICATION, HEAP_ID_49, 0x41000);
StartWFCSettings(((ApplicationArgs *)ApplicationManager_Args(appMan))->saveData, HEAP_ID_49);
Heap_Destroy(HEAP_ID_49);
Heap_Create(HEAP_ID_APPLICATION, HEAP_ID_NINTENDO_WFC, 0x41000);
StartWFCSettings(((ApplicationArgs *)ApplicationManager_Args(appMan))->saveData, HEAP_ID_NINTENDO_WFC);
Heap_Destroy(HEAP_ID_NINTENDO_WFC);
OS_ResetSystem(RESET_CLEAN);
return TRUE;