From 4cfb417b3cb3538abd9cdef1761c985cfcd55413 Mon Sep 17 00:00:00 2001 From: queueRAM Date: Tue, 3 Mar 2026 01:05:13 +0000 Subject: [PATCH] Rename app modules based on string names Rename app/code_52230 -> app/balls Rename app/code_560D0 -> app/birdman Rename app/code_597E0 -> app/bonus Rename app/code_59D80 -> app/ball_target Rename app/code_68220 -> app/environment Rename app/code_6ACE0 -> app/falco Rename app/code_71500 -> app/fire_effects Rename app/code_796C0 -> app/hang_glider Rename app/code_8A760 -> app/gyrocopter Rename app/code_915B0 -> app/hover_pads Rename app/code_AF950 -> app/rocket_pack Rename app/code_B6FE0 -> app/skydiving Rename app/code_BB820 -> app/shadow Rename app/code_C8990 -> app/splash --- config/us/pilotwings64.us.yaml | 78 ++++++++-------- src/app/ball_target.c | 38 ++++++++ src/app/{code_59D80.h => ball_target.h} | 6 +- src/app/balls.c | 66 ++++++++++++++ src/app/{code_52230.h => balls.h} | 6 +- src/app/{code_560D0.c => birdman.c} | 31 +++---- src/app/birdman.h | 8 ++ src/app/bonus.c | 12 +++ src/app/{code_597E0.h => bonus.h} | 6 +- src/app/cannonball.c | 2 +- src/app/code_52230.c | 66 -------------- src/app/code_597E0.c | 12 --- src/app/code_59D80.c | 38 -------- src/app/code_5A6A0.c | 2 +- src/app/code_68220.c | 35 -------- src/app/code_6ACE0.c | 113 ------------------------ src/app/code_71500.c | 21 ----- src/app/code_71500.h | 7 -- src/app/code_8A760.c | 31 ------- src/app/code_915B0.c | 21 ----- src/app/code_AF950.c | 32 ------- src/app/code_B2900.c | 10 +-- src/app/code_B6FE0.c | 53 ----------- src/app/code_B6FE0.h | 6 -- src/app/code_BB820.c | 56 ------------ src/app/code_C8990.c | 16 ---- src/app/code_C8990.h | 6 -- src/app/code_D2B10.c | 2 +- src/app/demo_attitude.c | 4 +- src/app/environment.c | 35 ++++++++ src/app/{code_68220.h => environment.h} | 6 +- src/app/falco.c | 113 ++++++++++++++++++++++++ src/app/{code_6ACE0.h => falco.h} | 6 +- src/app/fire_effects.c | 21 +++++ src/app/fire_effects.h | 7 ++ src/app/gyrocopter.c | 32 +++++++ src/app/gyrocopter.h | 5 ++ src/app/{code_796C0.c => hang_glider.c} | 33 +++---- src/app/hang_glider.h | 4 + src/app/hover_pads.c | 21 +++++ src/app/{code_915B0.h => hover_pads.h} | 6 +- src/app/hud.c | 2 +- src/app/level.c | 4 +- src/app/rocket_pack.c | 33 +++++++ src/app/rocket_pack.h | 5 ++ src/app/shadow.c | 56 ++++++++++++ src/app/{code_BB820.h => shadow.h} | 6 +- src/app/skydiving.c | 54 +++++++++++ src/app/skydiving.h | 6 ++ src/app/splash.c | 16 ++++ src/app/splash.h | 6 ++ src/app/task.c | 16 ++-- src/app/test_menu.c | 4 +- src/app/wind_objects.c | 6 +- 54 files changed, 657 insertions(+), 630 deletions(-) create mode 100644 src/app/ball_target.c rename src/app/{code_59D80.h => ball_target.h} (69%) create mode 100644 src/app/balls.c rename src/app/{code_52230.h => balls.h} (82%) rename src/app/{code_560D0.c => birdman.c} (54%) create mode 100644 src/app/birdman.h create mode 100644 src/app/bonus.c rename src/app/{code_597E0.h => bonus.h} (70%) delete mode 100644 src/app/code_52230.c delete mode 100644 src/app/code_597E0.c delete mode 100644 src/app/code_59D80.c delete mode 100644 src/app/code_68220.c delete mode 100644 src/app/code_6ACE0.c delete mode 100644 src/app/code_71500.c delete mode 100644 src/app/code_71500.h delete mode 100644 src/app/code_8A760.c delete mode 100644 src/app/code_915B0.c delete mode 100644 src/app/code_AF950.c delete mode 100644 src/app/code_B6FE0.c delete mode 100644 src/app/code_B6FE0.h delete mode 100644 src/app/code_BB820.c delete mode 100644 src/app/code_C8990.c delete mode 100644 src/app/code_C8990.h create mode 100644 src/app/environment.c rename src/app/{code_68220.h => environment.h} (75%) create mode 100644 src/app/falco.c rename src/app/{code_6ACE0.h => falco.h} (70%) create mode 100644 src/app/fire_effects.c create mode 100644 src/app/fire_effects.h create mode 100644 src/app/gyrocopter.c create mode 100644 src/app/gyrocopter.h rename src/app/{code_796C0.c => hang_glider.c} (50%) create mode 100644 src/app/hang_glider.h create mode 100644 src/app/hover_pads.c rename src/app/{code_915B0.h => hover_pads.h} (72%) create mode 100644 src/app/rocket_pack.c create mode 100644 src/app/rocket_pack.h create mode 100644 src/app/shadow.c rename src/app/{code_BB820.h => shadow.h} (50%) create mode 100644 src/app/skydiving.c create mode 100644 src/app/skydiving.h create mode 100644 src/app/splash.c create mode 100644 src/app/splash.h diff --git a/config/us/pilotwings64.us.yaml b/config/us/pilotwings64.us.yaml index eba3265d..8bf8b028 100644 --- a/config/us/pilotwings64.us.yaml +++ b/config/us/pilotwings64.us.yaml @@ -364,13 +364,13 @@ segments: bss_size: 0x293F0 subsegments: - [0x51E30, c, app/code_51E30] - - [0x52230, c, app/code_52230] + - [0x52230, c, app/balls] - [0x556C0, c, app/code_556C0] - - [0x560D0, c, app/code_560D0] + - [0x560D0, c, app/birdman] - [0x58120, c, app/bmsound] - [0x58B00, c, app/code_58B00] - - [0x597E0, c, app/code_597E0] - - [0x59D80, c, app/code_59D80] + - [0x597E0, c, app/bonus] + - [0x59D80, c, app/ball_target] - [0x5A6A0, c, app/code_5A6A0] - [0x5CFC0, c, app/cannonball] - [0x60020, c, app/code_60020] @@ -379,14 +379,14 @@ segments: - [0x64070, c, app/code_64070] - [0x64730, c, app/code_64730] - [0x66160, c, app/code_66160] - - [0x68220, c, app/code_68220] + - [0x68220, c, app/environment] - [0x69BF0, c, app/code_69BF0] - - [0x6ACE0, c, app/code_6ACE0] + - [0x6ACE0, c, app/falco] - [0x6DAA0, c, app/fdr] - [0x6ECD0, c, app/code_6ECD0] - [0x6F4D0, c, app/save] - [0x6FFB0, c, app/file_menu] - - [0x71500, c, app/code_71500] + - [0x71500, c, app/fire_effects] - [0x72010, c, app/code_72010] - [0x722D0, c, app/code_722D0] - [0x72910, c, app/code_72910] @@ -394,7 +394,7 @@ segments: - [0x75A60, c, app/code_75A60] - [0x76670, c, app/code_76670] - [0x78620, c, app/code_78620] - - [0x796C0, c, app/code_796C0] + - [0x796C0, c, app/hang_glider] - [0x7B9A0, c, app/gsound] - [0x7C4C0, c, app/code_7C4C0] - [0x7CF30, c, app/code_7CF30] @@ -402,9 +402,9 @@ segments: - [0x81490, c, app/code_81490] - [0x82520, c, app/code_82520] - [0x82B90, c, app/code_82B90] - - [0x8A760, c, app/code_8A760] + - [0x8A760, c, app/gyrocopter] - [0x905C0, c, app/code_905C0] - - [0x915B0, c, app/code_915B0] + - [0x915B0, c, app/hover_pads] - [0x91670, c, app/hsound] - [0x92810, c, app/menu] - [0x92BF0, c, app/level] @@ -430,22 +430,22 @@ segments: - [0xAA820, c, app/rings] - [0xAC1A0, c, app/code_AC1A0] - [0xAE460, c, app/code_AE460] - - [0xAF950, c, app/code_AF950] + - [0xAF950, c, app/rocket_pack] - [0xB1B30, c, app/rpsound] - [0xB2900, c, app/code_B2900] - [0xB3A70, c, app/code_B3A70] - [0xB5280, c, app/results] - [0xB6580, c, app/code_B6580] - - [0xB6FE0, c, app/code_B6FE0] + - [0xB6FE0, c, app/skydiving] - [0xBADE0, c, app/sdsound] - - [0xBB820, c, app/code_BB820] + - [0xBB820, c, app/shadow] - [0xBD670, c, app/code_BD670] - [0xBDAD0, c, app/smoke] - [0xBF280, c, app/snap] - [0xC6B70, c, app/snd] - [0xC7370, c, app/snow] - [0xC7B40, c, app/spath] - - [0xC8990, c, app/code_C8990] + - [0xC8990, c, app/splash] - [0xC9440, c, app/text_data] - [0xC9B60, c, app/code_C9B60] - [0xCB7C0, c, app/targets] @@ -464,32 +464,32 @@ segments: - [0xD55B0, c, app/wind_objects] - [0xD5C40, data] # app/code_51E30 - - [0xD5D40, .data, app/code_52230] - - [0xD5D50, .data, app/code_560D0] + - [0xD5D40, .data, app/balls] + - [0xD5D50, .data, app/birdman] - [0xD5F10, .data, app/code_5A6A0] - [0xD5F20, .data, app/cannonball] - [0xD5F40, .data, app/code_60020] - [0xD5F70, .data, app/code_61A60] - [0xD6030, .data, app/code_64070] - [0xD62D0, .data, app/code_64730] - - [0xD6410, .data, app/code_68220] + - [0xD6410, .data, app/environment] - [0xD6450, data] # app/code_69BF0 - - [0xD64D0, .data, app/code_6ACE0] - - [0xD6540, data] # also part of app/code_6ACE0 + - [0xD64D0, .data, app/falco] + - [0xD6540, data] # also part of app/falco - [0xD65F0, .data, app/code_6ECD0] - [0xD6610, .data, app/file_menu] - - [0xD6650, .data, app/code_71500] + - [0xD6650, .data, app/fire_effects] - [0xD6660, .data, app/code_722D0] - [0xD6680, .data, app/code_72910] - [0xD6690, .data, app/code_72B70] - [0xD66E0, .data, app/code_75A60] - - [0xD66F0, .data, app/code_796C0] + - [0xD66F0, .data, app/hang_glider] - [0xD68A0, .data, app/code_7C4C0] - [0xD68B0, .data, app/code_7CF30] - [0xD68C0, .data, app/code_7FED0] - [0xD68D0, .data, app/code_82520] - [0xD68E0, .data, app/code_82B90] - - [0xD6910, .data, app/code_8A760] + - [0xD6910, .data, app/gyrocopter] - [0xD6920, .data, app/code_905C0] - [0xD6930, .data, app/level] - [0xD6950, .data, app/credits] @@ -507,12 +507,12 @@ segments: - [0xD7000, .data, app/demo] - [0xD7010, data] # app/rings - [0xD70D0, .data, app/code_AE460] - - [0xD70E0, .data, app/code_AF950] + - [0xD70E0, .data, app/rocket_pack] - [0xD7100, .data, app/code_B2900] - [0xD7140, .data, app/code_B3A70] - [0xD7170, .data, app/results] - - [0xD7500, data] # app/code_B6FE0 - - [0xD7990, data] # app/code_BB820 + - [0xD7500, data] # app/skydiving + - [0xD7990, data] # app/shadow - [0xD7A30, .data, app/code_BD670] - [0xD7A40, .data, app/snap] - [0xD7AE0, .data, app/snd] @@ -528,13 +528,13 @@ segments: - [0xD7EF0, .data, app/code_D2D50] - [0xD7F20, .data, app/code_D3810] - [0xD7F40, .rodata, app/code_51E30] - - [0xD7F60, .rodata, app/code_52230] + - [0xD7F60, .rodata, app/balls] - [0xD8340, .rodata, app/code_556C0] - - [0xD83B0, .rodata, app/code_560D0] + - [0xD83B0, .rodata, app/birdman] - [0xD84A0, .rodata, app/bmsound] - [0xD8590, .rodata, app/code_58B00] - - [0xD85D0, .rodata, app/code_597E0] - - [0xD8610, .rodata, app/code_59D80] + - [0xD85D0, .rodata, app/bonus] + - [0xD8610, .rodata, app/ball_target] - [0xD8670, .rodata, app/code_5A6A0] - [0xD8730, .rodata, app/cannonball] - [0xD8980, .rodata, app/code_60020] @@ -543,21 +543,21 @@ segments: - [0xD8B90, .rodata, app/code_64070] - [0xD8BF0, .rodata, app/code_64730] - [0xD8CE0, .rodata, app/code_66160] - - [0xD8DD0, .rodata, app/code_68220] + - [0xD8DD0, .rodata, app/environment] - [0xD9080, .rodata, app/code_69BF0] - - [0xD91E0, .rodata, app/code_6ACE0] + - [0xD91E0, .rodata, app/falco] - [0xD9360, .rodata, app/fdr] - [0xD94F0, .rodata, app/code_6ECD0] - [0xD9510, .rodata, app/save] - [0xD95D0, .rodata, app/file_menu] - - [0xD95F0, .rodata, app/code_71500] + - [0xD95F0, .rodata, app/fire_effects] - [0xD9810, .rodata, app/code_722D0] - [0xD9830, .rodata, app/code_72910] - [0xD9840, .rodata, app/code_72B70] - [0xD99C0, .rodata, app/code_75A60] - [0xD9A10, .rodata, app/code_76670] - [0xD9CF0, .rodata, app/code_78620] - - [0xD9DF0, .rodata, app/code_796C0] + - [0xD9DF0, .rodata, app/hang_glider] - [0xD9F20, .rodata, app/gsound] - [0xD9F70, .rodata, app/code_7C4C0] - [0xDA020, .rodata, app/code_7CF30] @@ -565,9 +565,9 @@ segments: - [0xDA640, .rodata, app/code_81490] - [0xDA7C0, .rodata, app/code_82520] - [0xDA7F0, .rodata, app/code_82B90] - - [0xDABB0, .rodata, app/code_8A760] + - [0xDABB0, .rodata, app/gyrocopter] - [0xDAC60, .rodata, app/code_905C0] - - [0xDADB0, .rodata, app/code_915B0] + - [0xDADB0, .rodata, app/hover_pads] - [0xDAE00, .rodata, app/hsound] - [0xDAF00, .rodata, app/menu] - [0xDAF30, .rodata, app/level] @@ -592,21 +592,21 @@ segments: - [0xDC3C0, .rodata, app/rings] - [0xDC4D0, .rodata, app/code_AC1A0] - [0xDC800, .rodata, app/code_AE460] - - [0xDC8C0, .rodata, app/code_AF950] + - [0xDC8C0, .rodata, app/rocket_pack] - [0xDC9F0, .rodata, app/rpsound] - [0xDCAF0, .rodata, app/code_B2900] - [0xDCB20, .rodata, app/code_B3A70] - [0xDCBE0, .rodata, app/results] - [0xDD240, .rodata, app/code_B6580] - - [0xDD260, .rodata, app/code_B6FE0] + - [0xDD260, .rodata, app/skydiving] - [0xDD5B0, .rodata, app/sdsound] - - [0xDD680, .rodata, app/code_BB820] + - [0xDD680, .rodata, app/shadow] - [0xDD730, .rodata, app/code_BD670] - [0xDD740, .rodata, app/smoke] - [0xDDA90, .rodata, app/snap] - [0xDDC80, .rodata, app/snd] - [0xDDDA0, .rodata, app/spath] - - [0xDDEA0, .rodata, app/code_C8990] + - [0xDDEA0, .rodata, app/splash] - [0xDDF40, .rodata, app/code_C9B60] - [0xDDFB0, .rodata, app/targets] - [0xDE020, .rodata, app/task] diff --git a/src/app/ball_target.c b/src/app/ball_target.c new file mode 100644 index 00000000..41129aea --- /dev/null +++ b/src/app/ball_target.c @@ -0,0 +1,38 @@ +#include "common.h" +#include "ball_target.h" + +typedef struct { + u8 pad0[0x5B]; + u8 unk5B; + u8 pad5C[0x60 - 0x5C]; +} Unk803597E8; + +extern u8 D_803597E4; +extern Unk803597E8 D_803597E8[]; + +#pragma GLOBAL_ASM("asm/nonmatchings/app/ball_target/func_802D2850.s") + +#pragma GLOBAL_ASM("asm/nonmatchings/app/ball_target/func_802D28D8.s") + +#pragma GLOBAL_ASM("asm/nonmatchings/app/ball_target/func_802D29FC.s") + +#pragma GLOBAL_ASM("asm/nonmatchings/app/ball_target/func_802D2ACC.s") + +#pragma GLOBAL_ASM("asm/nonmatchings/app/ball_target/func_802D2C20.s") + +#pragma GLOBAL_ASM("asm/nonmatchings/app/ball_target/func_802D2E48.s") + +#pragma GLOBAL_ASM("asm/nonmatchings/app/ball_target/func_802D3030.s") + +u8 func_802D30B4(void) { + s32 i; + u8 ret; + + ret = 0; + for (i = 0; i < D_803597E4; i++) { + ret += (D_803597E8[i].unk5B != 0) ? 1 : 0; + } + return ret; +} + +#pragma GLOBAL_ASM("asm/nonmatchings/app/ball_target/func_802D3110.s") diff --git a/src/app/code_59D80.h b/src/app/ball_target.h similarity index 69% rename from src/app/code_59D80.h rename to src/app/ball_target.h index 12c891ee..7d72836c 100644 --- a/src/app/code_59D80.h +++ b/src/app/ball_target.h @@ -1,5 +1,5 @@ -#ifndef APP_CODE_59D80_H -#define APP_CODE_59D80_H +#ifndef APP_BALL_TARGET_H +#define APP_BALL_TARGET_H #include @@ -10,4 +10,4 @@ s32 func_802D2E48(void); void func_802D3030(void); u8 func_802D30B4(void); -#endif // APP_CODE_59D80_H +#endif // APP_BALL_TARGET_H diff --git a/src/app/balls.c b/src/app/balls.c new file mode 100644 index 00000000..ac7bce0c --- /dev/null +++ b/src/app/balls.c @@ -0,0 +1,66 @@ +#include "common.h" +#include "balls.h" + +// .data +// list of model ids +s32 D_8034E810[] = { 0xF4, 0xF5, 0xF6 }; + +#pragma GLOBAL_ASM("asm/nonmatchings/app/balls/func_802CAD00.s") + +#pragma GLOBAL_ASM("asm/nonmatchings/app/balls/func_802CADE8.s") + +#pragma GLOBAL_ASM("asm/nonmatchings/app/balls/func_802CAF50.s") + +#pragma GLOBAL_ASM("asm/nonmatchings/app/balls/func_802CB094.s") + +#pragma GLOBAL_ASM("asm/nonmatchings/app/balls/func_802CB2FC.s") + +#pragma GLOBAL_ASM("asm/nonmatchings/app/balls/func_802CB35C.s") + +#pragma GLOBAL_ASM("asm/nonmatchings/app/balls/func_802CB3F8.s") + +#pragma GLOBAL_ASM("asm/nonmatchings/app/balls/func_802CB56C.s") + +#pragma GLOBAL_ASM("asm/nonmatchings/app/balls/func_802CB6D4.s") + +#pragma GLOBAL_ASM("asm/nonmatchings/app/balls/func_802CB9B4.s") + +#pragma GLOBAL_ASM("asm/nonmatchings/app/balls/ballsCollision.s") + +#pragma GLOBAL_ASM("asm/nonmatchings/app/balls/ballsPhysics.s") + +#pragma GLOBAL_ASM("asm/nonmatchings/app/balls/func_802CC064.s") + +#pragma GLOBAL_ASM("asm/nonmatchings/app/balls/func_802CC0D4.s") + +#pragma GLOBAL_ASM("asm/nonmatchings/app/balls/func_802CC13C.s") + +u8 func_802CC15C(void) { + s32 i; + s32 ret; + + ret = 1; + for (i = 0; i < D_80357210 + D_80357211; i++) { + if (D_80357218[i].unk94 == 0) { + ret = 0; + break; + } + } + return ret; +} + +#pragma GLOBAL_ASM("asm/nonmatchings/app/balls/func_802CC1B0.s") + +#pragma GLOBAL_ASM("asm/nonmatchings/app/balls/func_802CC270.s") + +#pragma GLOBAL_ASM("asm/nonmatchings/app/balls/func_802CC39C.s") + +#pragma GLOBAL_ASM("asm/nonmatchings/app/balls/func_802CC51C.s") + +#pragma GLOBAL_ASM("asm/nonmatchings/app/balls/func_802CC55C.s") + +#pragma GLOBAL_ASM("asm/nonmatchings/app/balls/func_802CD0F8.s") + +#pragma GLOBAL_ASM("asm/nonmatchings/app/balls/func_802CD2E8.s") + +#pragma GLOBAL_ASM("asm/nonmatchings/app/balls/func_802CE0A4.s") diff --git a/src/app/code_52230.h b/src/app/balls.h similarity index 82% rename from src/app/code_52230.h rename to src/app/balls.h index b30fa4a1..1dce98ac 100644 --- a/src/app/code_52230.h +++ b/src/app/balls.h @@ -1,5 +1,5 @@ -#ifndef APP_CODE_52230_H -#define APP_CODE_52230_H +#ifndef APP_BALLS_H +#define APP_BALLS_H #include @@ -20,4 +20,4 @@ void func_802CB35C(void); void func_802CB3F8(void); u8 func_802CC15C(void); -#endif // APP_CODE_52230_H +#endif // APP_BALLS_H diff --git a/src/app/code_560D0.c b/src/app/birdman.c similarity index 54% rename from src/app/code_560D0.c rename to src/app/birdman.c index eeefe31a..2a7791a5 100644 --- a/src/app/code_560D0.c +++ b/src/app/birdman.c @@ -1,4 +1,5 @@ #include "common.h" +#include "birdman.h" f32 D_8034E820 = 0.175f; @@ -15,32 +16,32 @@ f32 D_8034E934[] = { 0.0f, 0.0f, 0.3f, 0.0f, 1.7f, 0.0f, 3.0f, 0.0f, 7.0f, // used in func_802CEBA0 f32 D_8034E9D4[3] = { 0.0f }; -#pragma GLOBAL_ASM("asm/nonmatchings/app/code_560D0/func_802CEBA0.s") +#pragma GLOBAL_ASM("asm/nonmatchings/app/birdman/func_802CEBA0.s") -#pragma GLOBAL_ASM("asm/nonmatchings/app/code_560D0/func_802CECB8.s") +#pragma GLOBAL_ASM("asm/nonmatchings/app/birdman/func_802CECB8.s") -#pragma GLOBAL_ASM("asm/nonmatchings/app/code_560D0/func_802CEDF8.s") +#pragma GLOBAL_ASM("asm/nonmatchings/app/birdman/func_802CEDF8.s") -#pragma GLOBAL_ASM("asm/nonmatchings/app/code_560D0/func_802CF24C.s") +#pragma GLOBAL_ASM("asm/nonmatchings/app/birdman/func_802CF24C.s") -#pragma GLOBAL_ASM("asm/nonmatchings/app/code_560D0/func_802CF5B4.s") +#pragma GLOBAL_ASM("asm/nonmatchings/app/birdman/func_802CF5B4.s") -#pragma GLOBAL_ASM("asm/nonmatchings/app/code_560D0/func_802CF640.s") +#pragma GLOBAL_ASM("asm/nonmatchings/app/birdman/func_802CF640.s") -#pragma GLOBAL_ASM("asm/nonmatchings/app/code_560D0/func_802CF76C.s") +#pragma GLOBAL_ASM("asm/nonmatchings/app/birdman/func_802CF76C.s") -#pragma GLOBAL_ASM("asm/nonmatchings/app/code_560D0/func_802CF8A4.s") +#pragma GLOBAL_ASM("asm/nonmatchings/app/birdman/func_802CF8A4.s") -#pragma GLOBAL_ASM("asm/nonmatchings/app/code_560D0/func_802CFAC8.s") +#pragma GLOBAL_ASM("asm/nonmatchings/app/birdman/func_802CFAC8.s") -#pragma GLOBAL_ASM("asm/nonmatchings/app/code_560D0/func_802CFEA8.s") +#pragma GLOBAL_ASM("asm/nonmatchings/app/birdman/func_802CFEA8.s") -#pragma GLOBAL_ASM("asm/nonmatchings/app/code_560D0/func_802CFF74.s") +#pragma GLOBAL_ASM("asm/nonmatchings/app/birdman/func_802CFF74.s") -#pragma GLOBAL_ASM("asm/nonmatchings/app/code_560D0/func_802D0080.s") +#pragma GLOBAL_ASM("asm/nonmatchings/app/birdman/func_802D0080.s") -#pragma GLOBAL_ASM("asm/nonmatchings/app/code_560D0/func_802D08F8.s") +#pragma GLOBAL_ASM("asm/nonmatchings/app/birdman/func_802D08F8.s") -#pragma GLOBAL_ASM("asm/nonmatchings/app/code_560D0/func_802D0A28.s") +#pragma GLOBAL_ASM("asm/nonmatchings/app/birdman/func_802D0A28.s") -#pragma GLOBAL_ASM("asm/nonmatchings/app/code_560D0/func_802D0ABC.s") +#pragma GLOBAL_ASM("asm/nonmatchings/app/birdman/func_802D0ABC.s") diff --git a/src/app/birdman.h b/src/app/birdman.h new file mode 100644 index 00000000..57bb1690 --- /dev/null +++ b/src/app/birdman.h @@ -0,0 +1,8 @@ +#ifndef APP_BIRDMAN_H +#define APP_BIRDMAN_H + +void func_802CEBA0(void*); +void func_802CECB8(void*); +void func_802CEDF8(void*); + +#endif // APP_BIRDMAN_H diff --git a/src/app/bonus.c b/src/app/bonus.c new file mode 100644 index 00000000..a22ba64f --- /dev/null +++ b/src/app/bonus.c @@ -0,0 +1,12 @@ +#include "common.h" +#include "bonus.h" + +#pragma GLOBAL_ASM("asm/nonmatchings/app/bonus/func_802D22B0.s") + +#pragma GLOBAL_ASM("asm/nonmatchings/app/bonus/func_802D22D8.s") + +#pragma GLOBAL_ASM("asm/nonmatchings/app/bonus/func_802D23EC.s") + +#pragma GLOBAL_ASM("asm/nonmatchings/app/bonus/bonusStar_802D25AC.s") + +#pragma GLOBAL_ASM("asm/nonmatchings/app/bonus/func_802D27CC.s") diff --git a/src/app/code_597E0.h b/src/app/bonus.h similarity index 70% rename from src/app/code_597E0.h rename to src/app/bonus.h index f205530f..24a51ebe 100644 --- a/src/app/code_597E0.h +++ b/src/app/bonus.h @@ -1,5 +1,5 @@ -#ifndef APP_CODE_597E0_H -#define APP_CODE_597E0_H +#ifndef APP_BONUS_H +#define APP_BONUS_H #include #include @@ -10,4 +10,4 @@ void func_802D23EC(void); void bonusStar_802D25AC(Mtx4F*); void func_802D27CC(void); -#endif // APP_CODE_597E0_H +#endif // APP_BONUS_H diff --git a/src/app/cannonball.c b/src/app/cannonball.c index 6458749e..5b0f32b9 100644 --- a/src/app/cannonball.c +++ b/src/app/cannonball.c @@ -15,7 +15,6 @@ #include "code_5A6A0.h" #include "code_60020.h" #include "code_66160.h" -#include "code_68220.h" #include "code_72010.h" #include "code_72B70.h" #include "code_7FED0.h" @@ -23,6 +22,7 @@ #include "code_B2900.h" #include "code_D2B10.h" #include "demo.h" +#include "environment.h" #include "fdr.h" #include "hud.h" #include "save.h" diff --git a/src/app/code_52230.c b/src/app/code_52230.c deleted file mode 100644 index 8a043edd..00000000 --- a/src/app/code_52230.c +++ /dev/null @@ -1,66 +0,0 @@ -#include "common.h" -#include "code_52230.h" - -// .data -// list of model ids -s32 D_8034E810[] = { 0xF4, 0xF5, 0xF6 }; - -#pragma GLOBAL_ASM("asm/nonmatchings/app/code_52230/func_802CAD00.s") - -#pragma GLOBAL_ASM("asm/nonmatchings/app/code_52230/func_802CADE8.s") - -#pragma GLOBAL_ASM("asm/nonmatchings/app/code_52230/func_802CAF50.s") - -#pragma GLOBAL_ASM("asm/nonmatchings/app/code_52230/func_802CB094.s") - -#pragma GLOBAL_ASM("asm/nonmatchings/app/code_52230/func_802CB2FC.s") - -#pragma GLOBAL_ASM("asm/nonmatchings/app/code_52230/func_802CB35C.s") - -#pragma GLOBAL_ASM("asm/nonmatchings/app/code_52230/func_802CB3F8.s") - -#pragma GLOBAL_ASM("asm/nonmatchings/app/code_52230/func_802CB56C.s") - -#pragma GLOBAL_ASM("asm/nonmatchings/app/code_52230/func_802CB6D4.s") - -#pragma GLOBAL_ASM("asm/nonmatchings/app/code_52230/func_802CB9B4.s") - -#pragma GLOBAL_ASM("asm/nonmatchings/app/code_52230/ballsCollision.s") - -#pragma GLOBAL_ASM("asm/nonmatchings/app/code_52230/ballsPhysics.s") - -#pragma GLOBAL_ASM("asm/nonmatchings/app/code_52230/func_802CC064.s") - -#pragma GLOBAL_ASM("asm/nonmatchings/app/code_52230/func_802CC0D4.s") - -#pragma GLOBAL_ASM("asm/nonmatchings/app/code_52230/func_802CC13C.s") - -u8 func_802CC15C(void) { - s32 i; - s32 ret; - - ret = 1; - for (i = 0; i < D_80357210 + D_80357211; i++) { - if (D_80357218[i].unk94 == 0) { - ret = 0; - break; - } - } - return ret; -} - -#pragma GLOBAL_ASM("asm/nonmatchings/app/code_52230/func_802CC1B0.s") - -#pragma GLOBAL_ASM("asm/nonmatchings/app/code_52230/func_802CC270.s") - -#pragma GLOBAL_ASM("asm/nonmatchings/app/code_52230/func_802CC39C.s") - -#pragma GLOBAL_ASM("asm/nonmatchings/app/code_52230/func_802CC51C.s") - -#pragma GLOBAL_ASM("asm/nonmatchings/app/code_52230/func_802CC55C.s") - -#pragma GLOBAL_ASM("asm/nonmatchings/app/code_52230/func_802CD0F8.s") - -#pragma GLOBAL_ASM("asm/nonmatchings/app/code_52230/func_802CD2E8.s") - -#pragma GLOBAL_ASM("asm/nonmatchings/app/code_52230/func_802CE0A4.s") diff --git a/src/app/code_597E0.c b/src/app/code_597E0.c deleted file mode 100644 index a47ed7a3..00000000 --- a/src/app/code_597E0.c +++ /dev/null @@ -1,12 +0,0 @@ -#include "common.h" -#include "code_597E0.h" - -#pragma GLOBAL_ASM("asm/nonmatchings/app/code_597E0/func_802D22B0.s") - -#pragma GLOBAL_ASM("asm/nonmatchings/app/code_597E0/func_802D22D8.s") - -#pragma GLOBAL_ASM("asm/nonmatchings/app/code_597E0/func_802D23EC.s") - -#pragma GLOBAL_ASM("asm/nonmatchings/app/code_597E0/bonusStar_802D25AC.s") - -#pragma GLOBAL_ASM("asm/nonmatchings/app/code_597E0/func_802D27CC.s") diff --git a/src/app/code_59D80.c b/src/app/code_59D80.c deleted file mode 100644 index e3e794e9..00000000 --- a/src/app/code_59D80.c +++ /dev/null @@ -1,38 +0,0 @@ -#include "common.h" -#include "code_59D80.h" - -typedef struct { - u8 pad0[0x5B]; - u8 unk5B; - u8 pad5C[0x60 - 0x5C]; -} Unk803597E8; - -extern u8 D_803597E4; -extern Unk803597E8 D_803597E8[]; - -#pragma GLOBAL_ASM("asm/nonmatchings/app/code_59D80/func_802D2850.s") - -#pragma GLOBAL_ASM("asm/nonmatchings/app/code_59D80/func_802D28D8.s") - -#pragma GLOBAL_ASM("asm/nonmatchings/app/code_59D80/func_802D29FC.s") - -#pragma GLOBAL_ASM("asm/nonmatchings/app/code_59D80/func_802D2ACC.s") - -#pragma GLOBAL_ASM("asm/nonmatchings/app/code_59D80/func_802D2C20.s") - -#pragma GLOBAL_ASM("asm/nonmatchings/app/code_59D80/func_802D2E48.s") - -#pragma GLOBAL_ASM("asm/nonmatchings/app/code_59D80/func_802D3030.s") - -u8 func_802D30B4(void) { - s32 i; - u8 ret; - - ret = 0; - for (i = 0; i < D_803597E4; i++) { - ret += (D_803597E8[i].unk5B != 0) ? 1 : 0; - } - return ret; -} - -#pragma GLOBAL_ASM("asm/nonmatchings/app/code_59D80/func_802D3110.s") diff --git a/src/app/code_5A6A0.c b/src/app/code_5A6A0.c index b36a2754..c8a1192f 100644 --- a/src/app/code_5A6A0.c +++ b/src/app/code_5A6A0.c @@ -6,11 +6,11 @@ #include #include "code_5A6A0.h" #include "code_61A60.h" -#include "code_68220.h" #include "code_72010.h" #include "code_9A960.h" #include "code_D1ED0.h" #include "demo.h" +#include "environment.h" typedef struct { s32 unk0; diff --git a/src/app/code_68220.c b/src/app/code_68220.c deleted file mode 100644 index e96f5e96..00000000 --- a/src/app/code_68220.c +++ /dev/null @@ -1,35 +0,0 @@ -#include "common.h" -#include "code_68220.h" - -u8 D_8034EEE0[] = { 0x63, 0x55, 0x55, 0x46, 0x52, 0x5D, 0x46, 0x52, 0x5D, 0x7B, 0x62, 0x52, 0x76, 0x5E, - 0x4A, 0x7D, 0x6A, 0x55, 0x76, 0x5E, 0x4A, 0x7B, 0x62, 0x52, 0x63, 0x55, 0x55, 0x00 }; - -f32 D_8034EEFC[] = { -180.0f, -170.0f, -12.0f, 40.0f, 65.0f, 90.0f, 105.0f, 140.0f, 180.0f }; - -#pragma GLOBAL_ASM("asm/nonmatchings/app/code_68220/func_802E0CF0.s") - -#pragma GLOBAL_ASM("asm/nonmatchings/app/code_68220/func_802E1238.s") - -#pragma GLOBAL_ASM("asm/nonmatchings/app/code_68220/func_802E1278.s") - -#pragma GLOBAL_ASM("asm/nonmatchings/app/code_68220/func_802E12B4.s") - -#pragma GLOBAL_ASM("asm/nonmatchings/app/code_68220/func_802E1444.s") - -#pragma GLOBAL_ASM("asm/nonmatchings/app/code_68220/func_802E14E8.s") - -#pragma GLOBAL_ASM("asm/nonmatchings/app/code_68220/func_802E15F0.s") - -#pragma GLOBAL_ASM("asm/nonmatchings/app/code_68220/func_802E1754.s") - -#pragma GLOBAL_ASM("asm/nonmatchings/app/code_68220/env_loadtpal.s") - -#pragma GLOBAL_ASM("asm/nonmatchings/app/code_68220/func_802E1A80.s") - -#pragma GLOBAL_ASM("asm/nonmatchings/app/code_68220/func_802E1C1C.s") - -#pragma GLOBAL_ASM("asm/nonmatchings/app/code_68220/func_802E2060.s") - -#pragma GLOBAL_ASM("asm/nonmatchings/app/code_68220/func_802E23E0.s") - -#pragma GLOBAL_ASM("asm/nonmatchings/app/code_68220/func_802E2504.s") diff --git a/src/app/code_6ACE0.c b/src/app/code_6ACE0.c deleted file mode 100644 index d05c8f9d..00000000 --- a/src/app/code_6ACE0.c +++ /dev/null @@ -1,113 +0,0 @@ -#include "common.h" -#include "code_6ACE0.h" - -typedef struct { - u8 pad0[0x254]; - u8 unk254; - u8 pad255[0x258 - 0x255]; -} Unk8035A5F8; - -typedef struct { - s32 unk0; - void* unk4; // maybe f32 pointer - s32 unk8; // always 0, maybe a pointer to something? -} Unk8034EFB0; - -// .data -f32 D_8034EFA0 = 0.0f; -s32 padD_8034EFA4[3] = { 0 }; - -extern f32 D_8035AF30; -extern f32 D_8035AF34; -extern f32 D_8035AF38; -extern f32 D_8035AF3C; - -// referenced in D_8034F03C -Unk8034EFB0 D_8034EFB0 = { 0xA, &D_8035AF30, 0 }; -Unk8034EFB0 D_8034EFBC = { 0x5, &D_8035AF34, 0 }; -Unk8034EFB0 D_8034EFC8 = { 0x6, &D_8035AF30, 0 }; -Unk8034EFB0 D_8034EFD4 = { 0x9, &D_8035AF38, 0 }; -Unk8034EFB0 D_8034EFE0 = { 0x8, &D_8035AF3C, 0 }; -Unk8034EFB0 D_8034EFEC = { 0x7, &D_8035AF3C, 0 }; -Unk8034EFB0 D_8034EFF8 = { 0x4, &D_8035AF3C, 0 }; -Unk8034EFB0 D_8034EF04 = { 0x3, &D_8035AF3C, 0 }; - -// .bss -extern Unk8035A5F8 D_8035A5F8[]; - -#pragma GLOBAL_ASM("asm/nonmatchings/app/code_6ACE0/func_802E37B0.s") - -#pragma GLOBAL_ASM("asm/nonmatchings/app/code_6ACE0/func_802E38F0.s") - -#pragma GLOBAL_ASM("asm/nonmatchings/app/code_6ACE0/func_802E3A5C.s") - -#pragma GLOBAL_ASM("asm/nonmatchings/app/code_6ACE0/func_802E3E6C.s") - -#pragma GLOBAL_ASM("asm/nonmatchings/app/code_6ACE0/func_802E3F7C.s") - -#pragma GLOBAL_ASM("asm/nonmatchings/app/code_6ACE0/func_802E43C4.s") - -#pragma GLOBAL_ASM("asm/nonmatchings/app/code_6ACE0/func_802E45B0.s") - -#pragma GLOBAL_ASM("asm/nonmatchings/app/code_6ACE0/func_802E478C.s") - -#pragma GLOBAL_ASM("asm/nonmatchings/app/code_6ACE0/func_802E4794.s") - -#pragma GLOBAL_ASM("asm/nonmatchings/app/code_6ACE0/func_802E49B0.s") - -#pragma GLOBAL_ASM("asm/nonmatchings/app/code_6ACE0/func_802E4AA8.s") - -#pragma GLOBAL_ASM("asm/nonmatchings/app/code_6ACE0/func_802E4E70.s") - -#pragma GLOBAL_ASM("asm/nonmatchings/app/code_6ACE0/func_802E51E8.s") - -#pragma GLOBAL_ASM("asm/nonmatchings/app/code_6ACE0/func_802E55A0.s") - -s32 func_802E57C4(void) { - s32 ret; - s32 i; - - ret = 0; - for (i = 0; i < D_8035A5F0; i++) { - ret += D_8035A5F8[i].unk254; - } - return ret; -} - -#pragma GLOBAL_ASM("asm/nonmatchings/app/code_6ACE0/func_802E5818.s") - -#pragma GLOBAL_ASM("asm/nonmatchings/app/code_6ACE0/func_802E587C.s") - -#pragma GLOBAL_ASM("asm/nonmatchings/app/code_6ACE0/func_802E5AFC.s") - -#pragma GLOBAL_ASM("asm/nonmatchings/app/code_6ACE0/func_802E5BF8.s") - -#pragma GLOBAL_ASM("asm/nonmatchings/app/code_6ACE0/func_802E5D78.s") - -#pragma GLOBAL_ASM("asm/nonmatchings/app/code_6ACE0/func_802E5F44.s") - -#pragma GLOBAL_ASM("asm/nonmatchings/app/code_6ACE0/func_802E5F90.s") - -#pragma GLOBAL_ASM("asm/nonmatchings/app/code_6ACE0/func_802E60A4.s") - -#pragma GLOBAL_ASM("asm/nonmatchings/app/code_6ACE0/func_802E60E8.s") - -#pragma GLOBAL_ASM("asm/nonmatchings/app/code_6ACE0/func_802E6128.s") - -#pragma GLOBAL_ASM("asm/nonmatchings/app/code_6ACE0/func_802E6184.s") - -#pragma GLOBAL_ASM("asm/nonmatchings/app/code_6ACE0/func_802E61E4.s") - -#pragma GLOBAL_ASM("asm/nonmatchings/app/code_6ACE0/func_802E6224.s") - -#pragma GLOBAL_ASM("asm/nonmatchings/app/code_6ACE0/func_802E6284.s") - -#pragma GLOBAL_ASM("asm/nonmatchings/app/code_6ACE0/func_802E62E4.s") - -#pragma GLOBAL_ASM("asm/nonmatchings/app/code_6ACE0/func_802E6344.s") - -#pragma GLOBAL_ASM("asm/nonmatchings/app/code_6ACE0/func_802E6380.s") - -#pragma GLOBAL_ASM("asm/nonmatchings/app/code_6ACE0/func_802E63BC.s") - -#pragma GLOBAL_ASM("asm/nonmatchings/app/code_6ACE0/func_802E64E0.s") diff --git a/src/app/code_71500.c b/src/app/code_71500.c deleted file mode 100644 index 54f7cd22..00000000 --- a/src/app/code_71500.c +++ /dev/null @@ -1,21 +0,0 @@ -#include "common.h" -#include "code_71500.h" - -s32 D_8034F120 = 0xFFFFFFFF; - -// .bss -extern s32 D_80362620; -extern s32 D_80362624; - -void func_802E9FD0(void) { - D_80362620 = 0; - D_80362624 = 0; -} - -#pragma GLOBAL_ASM("asm/nonmatchings/app/code_71500/func_802E9FE4.s") - -#pragma GLOBAL_ASM("asm/nonmatchings/app/code_71500/fx_create.s") - -#pragma GLOBAL_ASM("asm/nonmatchings/app/code_71500/func_802EA824.s") - -#pragma GLOBAL_ASM("asm/nonmatchings/app/code_71500/fx_create_fire.s") diff --git a/src/app/code_71500.h b/src/app/code_71500.h deleted file mode 100644 index 131c971f..00000000 --- a/src/app/code_71500.h +++ /dev/null @@ -1,7 +0,0 @@ -#ifndef APP_CODE_71500_H -#define APP_CODE_71500_H - -void func_802E9FD0(void); -void func_802E9FE4(void); - -#endif // APP_CODE_71500_H diff --git a/src/app/code_8A760.c b/src/app/code_8A760.c deleted file mode 100644 index f4fb1f54..00000000 --- a/src/app/code_8A760.c +++ /dev/null @@ -1,31 +0,0 @@ -#include "common.h" - -s32 D_8034F3E0[4] = { 0 }; - -#pragma GLOBAL_ASM("asm/nonmatchings/app/code_8A760/func_80303230.s") - -#pragma GLOBAL_ASM("asm/nonmatchings/app/code_8A760/func_80303714.s") - -#pragma GLOBAL_ASM("asm/nonmatchings/app/code_8A760/func_8030399C.s") - -#pragma GLOBAL_ASM("asm/nonmatchings/app/code_8A760/func_80304738.s") - -#pragma GLOBAL_ASM("asm/nonmatchings/app/code_8A760/func_80304B98.s") - -#pragma GLOBAL_ASM("asm/nonmatchings/app/code_8A760/func_80305BE8.s") - -#pragma GLOBAL_ASM("asm/nonmatchings/app/code_8A760/func_80305DC0.s") - -#pragma GLOBAL_ASM("asm/nonmatchings/app/code_8A760/func_80307A9C.s") - -#pragma GLOBAL_ASM("asm/nonmatchings/app/code_8A760/func_80307BAC.s") - -#pragma GLOBAL_ASM("asm/nonmatchings/app/code_8A760/func_80307E2C.s") - -#pragma GLOBAL_ASM("asm/nonmatchings/app/code_8A760/func_80307EA8.s") - -#pragma GLOBAL_ASM("asm/nonmatchings/app/code_8A760/func_80308478.s") - -#pragma GLOBAL_ASM("asm/nonmatchings/app/code_8A760/func_8030877C.s") - -#pragma GLOBAL_ASM("asm/nonmatchings/app/code_8A760/func_80308F1C.s") diff --git a/src/app/code_915B0.c b/src/app/code_915B0.c deleted file mode 100644 index ed9d5e64..00000000 --- a/src/app/code_915B0.c +++ /dev/null @@ -1,21 +0,0 @@ -#include "common.h" -#include "code_915B0.h" - -u8 func_8030A080(void) { - u8 ret; - s32 i; - - ret = 0; - for (i = 0; i < D_80369584; i++) { - ret += (D_80369588[i].unk68 != 0) ? 1 : 0; - } - return ret; -} - -#pragma GLOBAL_ASM("asm/nonmatchings/app/code_915B0/func_8030A0DC.s") - -#pragma GLOBAL_ASM("asm/nonmatchings/app/code_915B0/D_80353880.s") - -#pragma GLOBAL_ASM("asm/nonmatchings/app/code_915B0/D_80353894.s") - -#pragma GLOBAL_ASM("asm/nonmatchings/app/code_915B0/D_803538C4.s") diff --git a/src/app/code_AF950.c b/src/app/code_AF950.c deleted file mode 100644 index 7df7ab27..00000000 --- a/src/app/code_AF950.c +++ /dev/null @@ -1,32 +0,0 @@ -#include "common.h" -#include - -// used as an assignment -Vec3F D_8034FBB0 = { 0.0f, 0.0f, 0.0f }; -s32 padD_8034FBBC[5] = { 0 }; - -#pragma GLOBAL_ASM("asm/nonmatchings/app/code_AF950/func_80328420.s") - -#pragma GLOBAL_ASM("asm/nonmatchings/app/code_AF950/func_80328538.s") - -#pragma GLOBAL_ASM("asm/nonmatchings/app/code_AF950/func_8032867C.s") - -#pragma GLOBAL_ASM("asm/nonmatchings/app/code_AF950/func_80328A14.s") - -#pragma GLOBAL_ASM("asm/nonmatchings/app/code_AF950/func_80328CA0.s") - -#pragma GLOBAL_ASM("asm/nonmatchings/app/code_AF950/func_80328D74.s") - -#pragma GLOBAL_ASM("asm/nonmatchings/app/code_AF950/func_80328F44.s") - -#pragma GLOBAL_ASM("asm/nonmatchings/app/code_AF950/func_80329120.s") - -#pragma GLOBAL_ASM("asm/nonmatchings/app/code_AF950/func_803291A8.s") - -#pragma GLOBAL_ASM("asm/nonmatchings/app/code_AF950/func_8032923C.s") - -#pragma GLOBAL_ASM("asm/nonmatchings/app/code_AF950/func_80329628.s") - -#pragma GLOBAL_ASM("asm/nonmatchings/app/code_AF950/func_8032975C.s") - -#pragma GLOBAL_ASM("asm/nonmatchings/app/code_AF950/func_8032A4A8.s") diff --git a/src/app/code_B2900.c b/src/app/code_B2900.c index de87af41..b5c6eb41 100644 --- a/src/app/code_B2900.c +++ b/src/app/code_B2900.c @@ -1,14 +1,14 @@ #include "common.h" #include -#include "code_52230.h" -#include "code_59D80.h" -#include "code_6ACE0.h" +#include "ball_target.h" +#include "balls.h" #include "code_82520.h" -#include "code_915B0.h" #include "code_94E60.h" #include "code_B2900.h" -#include "targets.h" +#include "falco.h" +#include "hover_pads.h" #include "rings.h" +#include "targets.h" s32 D_8034FBD0 = 0; u16 D_8034FBD4[][3] = { diff --git a/src/app/code_B6FE0.c b/src/app/code_B6FE0.c deleted file mode 100644 index 8791ec14..00000000 --- a/src/app/code_B6FE0.c +++ /dev/null @@ -1,53 +0,0 @@ -#include "common.h" - -#pragma GLOBAL_ASM("asm/nonmatchings/app/code_B6FE0/func_8032FAB0.s") - -#pragma GLOBAL_ASM("asm/nonmatchings/app/code_B6FE0/func_8032FACC.s") - -#pragma GLOBAL_ASM("asm/nonmatchings/app/code_B6FE0/func_8032FC08.s") - -#pragma GLOBAL_ASM("asm/nonmatchings/app/code_B6FE0/func_8032FE4C.s") - -#pragma GLOBAL_ASM("asm/nonmatchings/app/code_B6FE0/func_8032FEAC.s") - -#pragma GLOBAL_ASM("asm/nonmatchings/app/code_B6FE0/func_803305D4.s") - -#pragma GLOBAL_ASM("asm/nonmatchings/app/code_B6FE0/func_803308C4.s") - -#pragma GLOBAL_ASM("asm/nonmatchings/app/code_B6FE0/func_80330BC4.s") - -#pragma GLOBAL_ASM("asm/nonmatchings/app/code_B6FE0/func_803316B0.s") - -#pragma GLOBAL_ASM("asm/nonmatchings/app/code_B6FE0/sdive_land.s") - -#pragma GLOBAL_ASM("asm/nonmatchings/app/code_B6FE0/func_803318D4.s") - -#pragma GLOBAL_ASM("asm/nonmatchings/app/code_B6FE0/sdive_getpoints.s") - -#pragma GLOBAL_ASM("asm/nonmatchings/app/code_B6FE0/func_80331AE4.s") - -#pragma GLOBAL_ASM("asm/nonmatchings/app/code_B6FE0/sdive_below.s") - -#pragma GLOBAL_ASM("asm/nonmatchings/app/code_B6FE0/func_80331D58.s") - -#pragma GLOBAL_ASM("asm/nonmatchings/app/code_B6FE0/func_80331EB8.s") - -#pragma GLOBAL_ASM("asm/nonmatchings/app/code_B6FE0/func_80331FE4.s") - -#pragma GLOBAL_ASM("asm/nonmatchings/app/code_B6FE0/func_803322CC.s") - -#pragma GLOBAL_ASM("asm/nonmatchings/app/code_B6FE0/func_80332950.s") - -#pragma GLOBAL_ASM("asm/nonmatchings/app/code_B6FE0/func_803329C0.s") - -#pragma GLOBAL_ASM("asm/nonmatchings/app/code_B6FE0/func_80332C60.s") - -#pragma GLOBAL_ASM("asm/nonmatchings/app/code_B6FE0/func_80332D94.s") - -#pragma GLOBAL_ASM("asm/nonmatchings/app/code_B6FE0/func_80332E90.s") - -#pragma GLOBAL_ASM("asm/nonmatchings/app/code_B6FE0/func_80332FCC.s") - -#pragma GLOBAL_ASM("asm/nonmatchings/app/code_B6FE0/func_80333384.s") - -#pragma GLOBAL_ASM("asm/nonmatchings/app/code_B6FE0/func_803335D0.s") diff --git a/src/app/code_B6FE0.h b/src/app/code_B6FE0.h deleted file mode 100644 index 1b54b8be..00000000 --- a/src/app/code_B6FE0.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef APP_CODE_B6FE0_H -#define APP_CODE_B6FE0_H - -void func_8032FAB0(void); - -#endif // APP_CODE_B6FE0_H diff --git a/src/app/code_BB820.c b/src/app/code_BB820.c deleted file mode 100644 index 38a384f0..00000000 --- a/src/app/code_BB820.c +++ /dev/null @@ -1,56 +0,0 @@ -#include "common.h" -#include "code_BB820.h" - -#pragma GLOBAL_ASM("asm/nonmatchings/app/code_BB820/func_803342F0.s") - -#pragma GLOBAL_ASM("asm/nonmatchings/app/code_BB820/func_803342FC.s") - -#pragma GLOBAL_ASM("asm/nonmatchings/app/code_BB820/func_80334308.s") - -#pragma GLOBAL_ASM("asm/nonmatchings/app/code_BB820/func_803343D8.s") - -#pragma GLOBAL_ASM("asm/nonmatchings/app/code_BB820/func_80334454.s") - -#pragma GLOBAL_ASM("asm/nonmatchings/app/code_BB820/func_803344BC.s") - -#pragma GLOBAL_ASM("asm/nonmatchings/app/code_BB820/func_80334578.s") - -#pragma GLOBAL_ASM("asm/nonmatchings/app/code_BB820/func_803347D0.s") - -#pragma GLOBAL_ASM("asm/nonmatchings/app/code_BB820/func_80334A38.s") - -#pragma GLOBAL_ASM("asm/nonmatchings/app/code_BB820/func_80334C70.s") - -#pragma GLOBAL_ASM("asm/nonmatchings/app/code_BB820/func_80334CC0.s") - -#pragma GLOBAL_ASM("asm/nonmatchings/app/code_BB820/func_80334CCC.s") - -#pragma GLOBAL_ASM("asm/nonmatchings/app/code_BB820/func_80335130.s") - -#pragma GLOBAL_ASM("asm/nonmatchings/app/code_BB820/func_80335700.s") - -#pragma GLOBAL_ASM("asm/nonmatchings/app/code_BB820/func_803358D4.s") - -#pragma GLOBAL_ASM("asm/nonmatchings/app/code_BB820/func_80335AE0.s") - -#pragma GLOBAL_ASM("asm/nonmatchings/app/code_BB820/func_80335AF4.s") - -#pragma GLOBAL_ASM("asm/nonmatchings/app/code_BB820/func_80335B94.s") - -#pragma GLOBAL_ASM("asm/nonmatchings/app/code_BB820/func_80335BE4.s") - -#pragma GLOBAL_ASM("asm/nonmatchings/app/code_BB820/func_80335E44.s") - -#pragma GLOBAL_ASM("asm/nonmatchings/app/code_BB820/func_80335EE4.s") - -#pragma GLOBAL_ASM("asm/nonmatchings/app/code_BB820/func_80335F24.s") - -#pragma GLOBAL_ASM("asm/nonmatchings/app/code_BB820/func_80335F84.s") - -#pragma GLOBAL_ASM("asm/nonmatchings/app/code_BB820/func_80335FD8.s") - -#pragma GLOBAL_ASM("asm/nonmatchings/app/code_BB820/func_80336064.s") - -#pragma GLOBAL_ASM("asm/nonmatchings/app/code_BB820/func_80336094.s") - -#pragma GLOBAL_ASM("asm/nonmatchings/app/code_BB820/func_803360E8.s") diff --git a/src/app/code_C8990.c b/src/app/code_C8990.c deleted file mode 100644 index 728335ee..00000000 --- a/src/app/code_C8990.c +++ /dev/null @@ -1,16 +0,0 @@ -#include "common.h" -#include "code_C8990.h" - -#pragma GLOBAL_ASM("asm/nonmatchings/app/code_C8990/func_80341460.s") - -#pragma GLOBAL_ASM("asm/nonmatchings/app/code_C8990/func_803415C8.s") - -#pragma GLOBAL_ASM("asm/nonmatchings/app/code_C8990/func_8034170C.s") - -#pragma GLOBAL_ASM("asm/nonmatchings/app/code_C8990/splash_add.s") - -#pragma GLOBAL_ASM("asm/nonmatchings/app/code_C8990/func_80341974.s") - -#pragma GLOBAL_ASM("asm/nonmatchings/app/code_C8990/func_80341CB0.s") - -#pragma GLOBAL_ASM("asm/nonmatchings/app/code_C8990/func_80341E30.s") diff --git a/src/app/code_C8990.h b/src/app/code_C8990.h deleted file mode 100644 index 70ff1cb7..00000000 --- a/src/app/code_C8990.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef APP_CODE_C8990_H -#define APP_CODE_C8990_H - -void func_803415C8(void); - -#endif // APP_CODE_C8990_H diff --git a/src/app/code_D2B10.c b/src/app/code_D2B10.c index ac539ed4..39347a7b 100644 --- a/src/app/code_D2B10.c +++ b/src/app/code_D2B10.c @@ -3,9 +3,9 @@ #include #include #include "code_5A6A0.h" -#include "code_C8990.h" #include "code_D2B10.h" #include "hud.h" +#include "splash.h" void func_8034B5E0(u8 arg0, Unk802D3658_Arg0* arg1) { func_802D3170(arg0, arg1); diff --git a/src/app/demo_attitude.c b/src/app/demo_attitude.c index 691d30a7..46373c4d 100644 --- a/src/app/demo_attitude.c +++ b/src/app/demo_attitude.c @@ -5,11 +5,11 @@ #include #include #include -#include "code_68220.h" -#include "code_71500.h" #include "code_9A960.h" #include "demo_attitude.h" +#include "environment.h" #include "file_menu.h" +#include "fire_effects.h" typedef struct { Vec3F pos; diff --git a/src/app/environment.c b/src/app/environment.c new file mode 100644 index 00000000..c45f6980 --- /dev/null +++ b/src/app/environment.c @@ -0,0 +1,35 @@ +#include "common.h" +#include "environment.h" + +u8 D_8034EEE0[] = { 0x63, 0x55, 0x55, 0x46, 0x52, 0x5D, 0x46, 0x52, 0x5D, 0x7B, 0x62, 0x52, 0x76, 0x5E, + 0x4A, 0x7D, 0x6A, 0x55, 0x76, 0x5E, 0x4A, 0x7B, 0x62, 0x52, 0x63, 0x55, 0x55, 0x00 }; + +f32 D_8034EEFC[] = { -180.0f, -170.0f, -12.0f, 40.0f, 65.0f, 90.0f, 105.0f, 140.0f, 180.0f }; + +#pragma GLOBAL_ASM("asm/nonmatchings/app/environment/func_802E0CF0.s") + +#pragma GLOBAL_ASM("asm/nonmatchings/app/environment/func_802E1238.s") + +#pragma GLOBAL_ASM("asm/nonmatchings/app/environment/func_802E1278.s") + +#pragma GLOBAL_ASM("asm/nonmatchings/app/environment/func_802E12B4.s") + +#pragma GLOBAL_ASM("asm/nonmatchings/app/environment/func_802E1444.s") + +#pragma GLOBAL_ASM("asm/nonmatchings/app/environment/func_802E14E8.s") + +#pragma GLOBAL_ASM("asm/nonmatchings/app/environment/func_802E15F0.s") + +#pragma GLOBAL_ASM("asm/nonmatchings/app/environment/func_802E1754.s") + +#pragma GLOBAL_ASM("asm/nonmatchings/app/environment/env_loadtpal.s") + +#pragma GLOBAL_ASM("asm/nonmatchings/app/environment/func_802E1A80.s") + +#pragma GLOBAL_ASM("asm/nonmatchings/app/environment/func_802E1C1C.s") + +#pragma GLOBAL_ASM("asm/nonmatchings/app/environment/func_802E2060.s") + +#pragma GLOBAL_ASM("asm/nonmatchings/app/environment/func_802E23E0.s") + +#pragma GLOBAL_ASM("asm/nonmatchings/app/environment/func_802E2504.s") diff --git a/src/app/code_68220.h b/src/app/environment.h similarity index 75% rename from src/app/code_68220.h rename to src/app/environment.h index cd0350cd..78737b70 100644 --- a/src/app/code_68220.h +++ b/src/app/environment.h @@ -1,5 +1,5 @@ -#ifndef APP_CODE_68220_H -#define APP_CODE_68220_H +#ifndef APP_ENVIRONMENT_H +#define APP_ENVIRONMENT_H #include #include @@ -12,4 +12,4 @@ void func_802E15F0(void); f32 func_802E1754(f32, f32, f32, Vec3F*); void func_802E2060(void); -#endif // APP_CODE_68220_H +#endif // APP_ENVIRONMENT_H diff --git a/src/app/falco.c b/src/app/falco.c new file mode 100644 index 00000000..b1f66d77 --- /dev/null +++ b/src/app/falco.c @@ -0,0 +1,113 @@ +#include "common.h" +#include "falco.h" + +typedef struct { + u8 pad0[0x254]; + u8 unk254; + u8 pad255[0x258 - 0x255]; +} Unk8035A5F8; + +typedef struct { + s32 unk0; + void* unk4; // maybe f32 pointer + s32 unk8; // always 0, maybe a pointer to something? +} Unk8034EFB0; + +// .data +f32 D_8034EFA0 = 0.0f; +s32 padD_8034EFA4[3] = { 0 }; + +extern f32 D_8035AF30; +extern f32 D_8035AF34; +extern f32 D_8035AF38; +extern f32 D_8035AF3C; + +// referenced in D_8034F03C +Unk8034EFB0 D_8034EFB0 = { 0xA, &D_8035AF30, 0 }; +Unk8034EFB0 D_8034EFBC = { 0x5, &D_8035AF34, 0 }; +Unk8034EFB0 D_8034EFC8 = { 0x6, &D_8035AF30, 0 }; +Unk8034EFB0 D_8034EFD4 = { 0x9, &D_8035AF38, 0 }; +Unk8034EFB0 D_8034EFE0 = { 0x8, &D_8035AF3C, 0 }; +Unk8034EFB0 D_8034EFEC = { 0x7, &D_8035AF3C, 0 }; +Unk8034EFB0 D_8034EFF8 = { 0x4, &D_8035AF3C, 0 }; +Unk8034EFB0 D_8034EF04 = { 0x3, &D_8035AF3C, 0 }; + +// .bss +extern Unk8035A5F8 D_8035A5F8[]; + +#pragma GLOBAL_ASM("asm/nonmatchings/app/falco/func_802E37B0.s") + +#pragma GLOBAL_ASM("asm/nonmatchings/app/falco/func_802E38F0.s") + +#pragma GLOBAL_ASM("asm/nonmatchings/app/falco/func_802E3A5C.s") + +#pragma GLOBAL_ASM("asm/nonmatchings/app/falco/func_802E3E6C.s") + +#pragma GLOBAL_ASM("asm/nonmatchings/app/falco/func_802E3F7C.s") + +#pragma GLOBAL_ASM("asm/nonmatchings/app/falco/func_802E43C4.s") + +#pragma GLOBAL_ASM("asm/nonmatchings/app/falco/func_802E45B0.s") + +#pragma GLOBAL_ASM("asm/nonmatchings/app/falco/func_802E478C.s") + +#pragma GLOBAL_ASM("asm/nonmatchings/app/falco/func_802E4794.s") + +#pragma GLOBAL_ASM("asm/nonmatchings/app/falco/func_802E49B0.s") + +#pragma GLOBAL_ASM("asm/nonmatchings/app/falco/func_802E4AA8.s") + +#pragma GLOBAL_ASM("asm/nonmatchings/app/falco/func_802E4E70.s") + +#pragma GLOBAL_ASM("asm/nonmatchings/app/falco/func_802E51E8.s") + +#pragma GLOBAL_ASM("asm/nonmatchings/app/falco/func_802E55A0.s") + +s32 func_802E57C4(void) { + s32 ret; + s32 i; + + ret = 0; + for (i = 0; i < D_8035A5F0; i++) { + ret += D_8035A5F8[i].unk254; + } + return ret; +} + +#pragma GLOBAL_ASM("asm/nonmatchings/app/falco/func_802E5818.s") + +#pragma GLOBAL_ASM("asm/nonmatchings/app/falco/func_802E587C.s") + +#pragma GLOBAL_ASM("asm/nonmatchings/app/falco/func_802E5AFC.s") + +#pragma GLOBAL_ASM("asm/nonmatchings/app/falco/func_802E5BF8.s") + +#pragma GLOBAL_ASM("asm/nonmatchings/app/falco/func_802E5D78.s") + +#pragma GLOBAL_ASM("asm/nonmatchings/app/falco/func_802E5F44.s") + +#pragma GLOBAL_ASM("asm/nonmatchings/app/falco/func_802E5F90.s") + +#pragma GLOBAL_ASM("asm/nonmatchings/app/falco/func_802E60A4.s") + +#pragma GLOBAL_ASM("asm/nonmatchings/app/falco/func_802E60E8.s") + +#pragma GLOBAL_ASM("asm/nonmatchings/app/falco/func_802E6128.s") + +#pragma GLOBAL_ASM("asm/nonmatchings/app/falco/func_802E6184.s") + +#pragma GLOBAL_ASM("asm/nonmatchings/app/falco/func_802E61E4.s") + +#pragma GLOBAL_ASM("asm/nonmatchings/app/falco/func_802E6224.s") + +#pragma GLOBAL_ASM("asm/nonmatchings/app/falco/func_802E6284.s") + +#pragma GLOBAL_ASM("asm/nonmatchings/app/falco/func_802E62E4.s") + +#pragma GLOBAL_ASM("asm/nonmatchings/app/falco/func_802E6344.s") + +#pragma GLOBAL_ASM("asm/nonmatchings/app/falco/func_802E6380.s") + +#pragma GLOBAL_ASM("asm/nonmatchings/app/falco/func_802E63BC.s") + +#pragma GLOBAL_ASM("asm/nonmatchings/app/falco/func_802E64E0.s") diff --git a/src/app/code_6ACE0.h b/src/app/falco.h similarity index 70% rename from src/app/code_6ACE0.h rename to src/app/falco.h index 2d30a29e..32c0cfb4 100644 --- a/src/app/code_6ACE0.h +++ b/src/app/falco.h @@ -1,5 +1,5 @@ -#ifndef APP_CODE_6ACE0_H -#define APP_CODE_6ACE0_H +#ifndef APP_FALCO_H +#define APP_FALCO_H #include @@ -11,4 +11,4 @@ void func_802E3E6C(void); void func_802E3F7C(void); s32 func_802E57C4(void); -#endif // APP_CODE_6ACE0_H +#endif // APP_FALCO_H diff --git a/src/app/fire_effects.c b/src/app/fire_effects.c new file mode 100644 index 00000000..899ebf65 --- /dev/null +++ b/src/app/fire_effects.c @@ -0,0 +1,21 @@ +#include "common.h" +#include "fire_effects.h" + +s32 D_8034F120 = 0xFFFFFFFF; + +// .bss +extern s32 D_80362620; +extern s32 D_80362624; + +void func_802E9FD0(void) { + D_80362620 = 0; + D_80362624 = 0; +} + +#pragma GLOBAL_ASM("asm/nonmatchings/app/fire_effects/func_802E9FE4.s") + +#pragma GLOBAL_ASM("asm/nonmatchings/app/fire_effects/fx_create.s") + +#pragma GLOBAL_ASM("asm/nonmatchings/app/fire_effects/func_802EA824.s") + +#pragma GLOBAL_ASM("asm/nonmatchings/app/fire_effects/fx_create_fire.s") diff --git a/src/app/fire_effects.h b/src/app/fire_effects.h new file mode 100644 index 00000000..96ed3ee3 --- /dev/null +++ b/src/app/fire_effects.h @@ -0,0 +1,7 @@ +#ifndef APP_FIRE_EFFECTS_H +#define APP_FIRE_EFFECTS_H + +void func_802E9FD0(void); +void func_802E9FE4(void); + +#endif // APP_FIRE_EFFECTS_H diff --git a/src/app/gyrocopter.c b/src/app/gyrocopter.c new file mode 100644 index 00000000..f4122292 --- /dev/null +++ b/src/app/gyrocopter.c @@ -0,0 +1,32 @@ +#include "common.h" +#include "gyrocopter.h" + +s32 D_8034F3E0[4] = { 0 }; + +#pragma GLOBAL_ASM("asm/nonmatchings/app/gyrocopter/func_80303230.s") + +#pragma GLOBAL_ASM("asm/nonmatchings/app/gyrocopter/func_80303714.s") + +#pragma GLOBAL_ASM("asm/nonmatchings/app/gyrocopter/func_8030399C.s") + +#pragma GLOBAL_ASM("asm/nonmatchings/app/gyrocopter/func_80304738.s") + +#pragma GLOBAL_ASM("asm/nonmatchings/app/gyrocopter/func_80304B98.s") + +#pragma GLOBAL_ASM("asm/nonmatchings/app/gyrocopter/func_80305BE8.s") + +#pragma GLOBAL_ASM("asm/nonmatchings/app/gyrocopter/func_80305DC0.s") + +#pragma GLOBAL_ASM("asm/nonmatchings/app/gyrocopter/func_80307A9C.s") + +#pragma GLOBAL_ASM("asm/nonmatchings/app/gyrocopter/func_80307BAC.s") + +#pragma GLOBAL_ASM("asm/nonmatchings/app/gyrocopter/func_80307E2C.s") + +#pragma GLOBAL_ASM("asm/nonmatchings/app/gyrocopter/func_80307EA8.s") + +#pragma GLOBAL_ASM("asm/nonmatchings/app/gyrocopter/func_80308478.s") + +#pragma GLOBAL_ASM("asm/nonmatchings/app/gyrocopter/func_8030877C.s") + +#pragma GLOBAL_ASM("asm/nonmatchings/app/gyrocopter/func_80308F1C.s") diff --git a/src/app/gyrocopter.h b/src/app/gyrocopter.h new file mode 100644 index 00000000..6a610e11 --- /dev/null +++ b/src/app/gyrocopter.h @@ -0,0 +1,5 @@ +#ifndef APP_GYROCOPTER_H +#define APP_GYROCOPTER_H + + +#endif // APP_GYROCOPTER_H diff --git a/src/app/code_796C0.c b/src/app/hang_glider.c similarity index 50% rename from src/app/code_796C0.c rename to src/app/hang_glider.c index 1733ed7f..a6524473 100644 --- a/src/app/code_796C0.c +++ b/src/app/hang_glider.c @@ -1,4 +1,5 @@ #include "common.h" +#include "hang_glider.h" f32 D_8034F1C0 = 10000.0f; s32 D_8034F1C4 = 0; @@ -17,34 +18,34 @@ f32 D_8034F2D0[] = { 23.9f, -1.0f, 24.0f, 0.0f, 24.1f, 1.0f, 25.0f, 1.8f, 33.5f, 2.5f, 36.0f, 0.5f, 51.0f, 0.5f, 61.0f, 0.5f, 61.5f, 20.0f, 100.0f, 50.0f, }; -#pragma GLOBAL_ASM("asm/nonmatchings/app/code_796C0/func_802F2190.s") +#pragma GLOBAL_ASM("asm/nonmatchings/app/hang_glider/func_802F2190.s") -#pragma GLOBAL_ASM("asm/nonmatchings/app/code_796C0/func_802F2370.s") +#pragma GLOBAL_ASM("asm/nonmatchings/app/hang_glider/func_802F2370.s") -#pragma GLOBAL_ASM("asm/nonmatchings/app/code_796C0/func_802F24BC.s") +#pragma GLOBAL_ASM("asm/nonmatchings/app/hang_glider/func_802F24BC.s") -#pragma GLOBAL_ASM("asm/nonmatchings/app/code_796C0/func_802F2804.s") +#pragma GLOBAL_ASM("asm/nonmatchings/app/hang_glider/func_802F2804.s") -#pragma GLOBAL_ASM("asm/nonmatchings/app/code_796C0/func_802F2F94.s") +#pragma GLOBAL_ASM("asm/nonmatchings/app/hang_glider/func_802F2F94.s") -#pragma GLOBAL_ASM("asm/nonmatchings/app/code_796C0/func_802F3030.s") +#pragma GLOBAL_ASM("asm/nonmatchings/app/hang_glider/func_802F3030.s") -#pragma GLOBAL_ASM("asm/nonmatchings/app/code_796C0/func_802F3154.s") +#pragma GLOBAL_ASM("asm/nonmatchings/app/hang_glider/func_802F3154.s") -#pragma GLOBAL_ASM("asm/nonmatchings/app/code_796C0/func_802F32EC.s") +#pragma GLOBAL_ASM("asm/nonmatchings/app/hang_glider/func_802F32EC.s") -#pragma GLOBAL_ASM("asm/nonmatchings/app/code_796C0/func_802F3470.s") +#pragma GLOBAL_ASM("asm/nonmatchings/app/hang_glider/func_802F3470.s") -#pragma GLOBAL_ASM("asm/nonmatchings/app/code_796C0/func_802F3694.s") +#pragma GLOBAL_ASM("asm/nonmatchings/app/hang_glider/func_802F3694.s") -#pragma GLOBAL_ASM("asm/nonmatchings/app/code_796C0/func_802F391C.s") +#pragma GLOBAL_ASM("asm/nonmatchings/app/hang_glider/func_802F391C.s") -#pragma GLOBAL_ASM("asm/nonmatchings/app/code_796C0/func_802F39F8.s") +#pragma GLOBAL_ASM("asm/nonmatchings/app/hang_glider/func_802F39F8.s") -#pragma GLOBAL_ASM("asm/nonmatchings/app/code_796C0/func_802F3A80.s") +#pragma GLOBAL_ASM("asm/nonmatchings/app/hang_glider/func_802F3A80.s") -#pragma GLOBAL_ASM("asm/nonmatchings/app/code_796C0/func_802F41AC.s") +#pragma GLOBAL_ASM("asm/nonmatchings/app/hang_glider/func_802F41AC.s") -#pragma GLOBAL_ASM("asm/nonmatchings/app/code_796C0/func_802F42DC.s") +#pragma GLOBAL_ASM("asm/nonmatchings/app/hang_glider/func_802F42DC.s") -#pragma GLOBAL_ASM("asm/nonmatchings/app/code_796C0/func_802F4370.s") +#pragma GLOBAL_ASM("asm/nonmatchings/app/hang_glider/func_802F4370.s") diff --git a/src/app/hang_glider.h b/src/app/hang_glider.h new file mode 100644 index 00000000..ff463114 --- /dev/null +++ b/src/app/hang_glider.h @@ -0,0 +1,4 @@ +#ifndef APP_HANG_GLIDER_H +#define APP_HANG_GLIDER_H + +#endif // APP_HANG_GLIDER_H diff --git a/src/app/hover_pads.c b/src/app/hover_pads.c new file mode 100644 index 00000000..ef3e071f --- /dev/null +++ b/src/app/hover_pads.c @@ -0,0 +1,21 @@ +#include "common.h" +#include "hover_pads.h" + +u8 func_8030A080(void) { + u8 ret; + s32 i; + + ret = 0; + for (i = 0; i < D_80369584; i++) { + ret += (D_80369588[i].unk68 != 0) ? 1 : 0; + } + return ret; +} + +#pragma GLOBAL_ASM("asm/nonmatchings/app/hover_pads/func_8030A0DC.s") + +#pragma GLOBAL_ASM("asm/nonmatchings/app/hover_pads/D_80353880.s") + +#pragma GLOBAL_ASM("asm/nonmatchings/app/hover_pads/D_80353894.s") + +#pragma GLOBAL_ASM("asm/nonmatchings/app/hover_pads/D_803538C4.s") diff --git a/src/app/code_915B0.h b/src/app/hover_pads.h similarity index 72% rename from src/app/code_915B0.h rename to src/app/hover_pads.h index 2604fd96..d0effed0 100644 --- a/src/app/code_915B0.h +++ b/src/app/hover_pads.h @@ -1,5 +1,5 @@ -#ifndef APP_CODE_915B0_H -#define APP_CODE_915B0_H +#ifndef APP_HOVER_PADS_H +#define APP_HOVER_PADS_H #include @@ -14,4 +14,4 @@ extern Unk80369588 D_80369588[]; u8 func_8030A080(void); -#endif // APP_CODE_915B0_H +#endif // APP_HOVER_PADS_H diff --git a/src/app/hud.c b/src/app/hud.c index 237be008..1d279e73 100644 --- a/src/app/hud.c +++ b/src/app/hud.c @@ -10,8 +10,8 @@ #include #include #include "demo.h" -#include "code_68220.h" #include "code_9A960.h" +#include "environment.h" #include "hud.h" #include "pads.h" #include "snap.h" diff --git a/src/app/level.c b/src/app/level.c index 8b66caea..d4f042dc 100644 --- a/src/app/level.c +++ b/src/app/level.c @@ -5,7 +5,6 @@ #include #include #include "code_58B00.h" -#include "code_68220.h" #include "code_69BF0.h" #include "code_6ECD0.h" #include "code_722D0.h" @@ -13,10 +12,11 @@ #include "code_9C080.h" #include "code_9CF50.h" #include "code_A7460.h" -#include "code_BB820.h" #include "code_BD670.h" #include "code_D2D50.h" #include "code_D3810.h" +#include "environment.h" +#include "shadow.h" #include "text_data.h" #include "toys.h" diff --git a/src/app/rocket_pack.c b/src/app/rocket_pack.c new file mode 100644 index 00000000..082d2f2f --- /dev/null +++ b/src/app/rocket_pack.c @@ -0,0 +1,33 @@ +#include "common.h" +#include +#include "rocket_pack.h" + +// used as an assignment +Vec3F D_8034FBB0 = { 0.0f, 0.0f, 0.0f }; +s32 padD_8034FBBC[5] = { 0 }; + +#pragma GLOBAL_ASM("asm/nonmatchings/app/rocket_pack/func_80328420.s") + +#pragma GLOBAL_ASM("asm/nonmatchings/app/rocket_pack/func_80328538.s") + +#pragma GLOBAL_ASM("asm/nonmatchings/app/rocket_pack/func_8032867C.s") + +#pragma GLOBAL_ASM("asm/nonmatchings/app/rocket_pack/func_80328A14.s") + +#pragma GLOBAL_ASM("asm/nonmatchings/app/rocket_pack/func_80328CA0.s") + +#pragma GLOBAL_ASM("asm/nonmatchings/app/rocket_pack/func_80328D74.s") + +#pragma GLOBAL_ASM("asm/nonmatchings/app/rocket_pack/func_80328F44.s") + +#pragma GLOBAL_ASM("asm/nonmatchings/app/rocket_pack/func_80329120.s") + +#pragma GLOBAL_ASM("asm/nonmatchings/app/rocket_pack/func_803291A8.s") + +#pragma GLOBAL_ASM("asm/nonmatchings/app/rocket_pack/func_8032923C.s") + +#pragma GLOBAL_ASM("asm/nonmatchings/app/rocket_pack/func_80329628.s") + +#pragma GLOBAL_ASM("asm/nonmatchings/app/rocket_pack/func_8032975C.s") + +#pragma GLOBAL_ASM("asm/nonmatchings/app/rocket_pack/func_8032A4A8.s") diff --git a/src/app/rocket_pack.h b/src/app/rocket_pack.h new file mode 100644 index 00000000..d201af43 --- /dev/null +++ b/src/app/rocket_pack.h @@ -0,0 +1,5 @@ +#ifndef APP_ROCKET_PACK_H +#define APP_ROCKET_PACK_H + + +#endif // APP_ROCKET_PACK_H diff --git a/src/app/shadow.c b/src/app/shadow.c new file mode 100644 index 00000000..26aa6a06 --- /dev/null +++ b/src/app/shadow.c @@ -0,0 +1,56 @@ +#include "common.h" +#include "shadow.h" + +#pragma GLOBAL_ASM("asm/nonmatchings/app/shadow/func_803342F0.s") + +#pragma GLOBAL_ASM("asm/nonmatchings/app/shadow/func_803342FC.s") + +#pragma GLOBAL_ASM("asm/nonmatchings/app/shadow/func_80334308.s") + +#pragma GLOBAL_ASM("asm/nonmatchings/app/shadow/func_803343D8.s") + +#pragma GLOBAL_ASM("asm/nonmatchings/app/shadow/func_80334454.s") + +#pragma GLOBAL_ASM("asm/nonmatchings/app/shadow/func_803344BC.s") + +#pragma GLOBAL_ASM("asm/nonmatchings/app/shadow/func_80334578.s") + +#pragma GLOBAL_ASM("asm/nonmatchings/app/shadow/func_803347D0.s") + +#pragma GLOBAL_ASM("asm/nonmatchings/app/shadow/func_80334A38.s") + +#pragma GLOBAL_ASM("asm/nonmatchings/app/shadow/func_80334C70.s") + +#pragma GLOBAL_ASM("asm/nonmatchings/app/shadow/func_80334CC0.s") + +#pragma GLOBAL_ASM("asm/nonmatchings/app/shadow/func_80334CCC.s") + +#pragma GLOBAL_ASM("asm/nonmatchings/app/shadow/func_80335130.s") + +#pragma GLOBAL_ASM("asm/nonmatchings/app/shadow/func_80335700.s") + +#pragma GLOBAL_ASM("asm/nonmatchings/app/shadow/func_803358D4.s") + +#pragma GLOBAL_ASM("asm/nonmatchings/app/shadow/func_80335AE0.s") + +#pragma GLOBAL_ASM("asm/nonmatchings/app/shadow/func_80335AF4.s") + +#pragma GLOBAL_ASM("asm/nonmatchings/app/shadow/func_80335B94.s") + +#pragma GLOBAL_ASM("asm/nonmatchings/app/shadow/func_80335BE4.s") + +#pragma GLOBAL_ASM("asm/nonmatchings/app/shadow/func_80335E44.s") + +#pragma GLOBAL_ASM("asm/nonmatchings/app/shadow/func_80335EE4.s") + +#pragma GLOBAL_ASM("asm/nonmatchings/app/shadow/func_80335F24.s") + +#pragma GLOBAL_ASM("asm/nonmatchings/app/shadow/func_80335F84.s") + +#pragma GLOBAL_ASM("asm/nonmatchings/app/shadow/func_80335FD8.s") + +#pragma GLOBAL_ASM("asm/nonmatchings/app/shadow/func_80336064.s") + +#pragma GLOBAL_ASM("asm/nonmatchings/app/shadow/func_80336094.s") + +#pragma GLOBAL_ASM("asm/nonmatchings/app/shadow/func_803360E8.s") diff --git a/src/app/code_BB820.h b/src/app/shadow.h similarity index 50% rename from src/app/code_BB820.h rename to src/app/shadow.h index cb0dc277..b46b5f5f 100644 --- a/src/app/code_BB820.h +++ b/src/app/shadow.h @@ -1,8 +1,8 @@ -#ifndef APP_CODE_BB820_H -#define APP_CODE_BB820_H +#ifndef APP_SHADOW_H +#define APP_SHADOW_H void func_80335B94(void); void func_80335BE4(void); void func_80335E44(void); -#endif // APP_CODE_BB820_H +#endif // APP_SHADOW_H diff --git a/src/app/skydiving.c b/src/app/skydiving.c new file mode 100644 index 00000000..1a5e498d --- /dev/null +++ b/src/app/skydiving.c @@ -0,0 +1,54 @@ +#include "common.h" +#include "skydiving.h" + +#pragma GLOBAL_ASM("asm/nonmatchings/app/skydiving/func_8032FAB0.s") + +#pragma GLOBAL_ASM("asm/nonmatchings/app/skydiving/func_8032FACC.s") + +#pragma GLOBAL_ASM("asm/nonmatchings/app/skydiving/func_8032FC08.s") + +#pragma GLOBAL_ASM("asm/nonmatchings/app/skydiving/func_8032FE4C.s") + +#pragma GLOBAL_ASM("asm/nonmatchings/app/skydiving/func_8032FEAC.s") + +#pragma GLOBAL_ASM("asm/nonmatchings/app/skydiving/func_803305D4.s") + +#pragma GLOBAL_ASM("asm/nonmatchings/app/skydiving/func_803308C4.s") + +#pragma GLOBAL_ASM("asm/nonmatchings/app/skydiving/func_80330BC4.s") + +#pragma GLOBAL_ASM("asm/nonmatchings/app/skydiving/func_803316B0.s") + +#pragma GLOBAL_ASM("asm/nonmatchings/app/skydiving/sdive_land.s") + +#pragma GLOBAL_ASM("asm/nonmatchings/app/skydiving/func_803318D4.s") + +#pragma GLOBAL_ASM("asm/nonmatchings/app/skydiving/sdive_getpoints.s") + +#pragma GLOBAL_ASM("asm/nonmatchings/app/skydiving/func_80331AE4.s") + +#pragma GLOBAL_ASM("asm/nonmatchings/app/skydiving/sdive_below.s") + +#pragma GLOBAL_ASM("asm/nonmatchings/app/skydiving/func_80331D58.s") + +#pragma GLOBAL_ASM("asm/nonmatchings/app/skydiving/func_80331EB8.s") + +#pragma GLOBAL_ASM("asm/nonmatchings/app/skydiving/func_80331FE4.s") + +#pragma GLOBAL_ASM("asm/nonmatchings/app/skydiving/func_803322CC.s") + +#pragma GLOBAL_ASM("asm/nonmatchings/app/skydiving/func_80332950.s") + +#pragma GLOBAL_ASM("asm/nonmatchings/app/skydiving/func_803329C0.s") + +#pragma GLOBAL_ASM("asm/nonmatchings/app/skydiving/func_80332C60.s") + +#pragma GLOBAL_ASM("asm/nonmatchings/app/skydiving/func_80332D94.s") + +#pragma GLOBAL_ASM("asm/nonmatchings/app/skydiving/func_80332E90.s") + +#pragma GLOBAL_ASM("asm/nonmatchings/app/skydiving/func_80332FCC.s") + +#pragma GLOBAL_ASM("asm/nonmatchings/app/skydiving/func_80333384.s") + +#pragma GLOBAL_ASM("asm/nonmatchings/app/skydiving/func_803335D0.s") diff --git a/src/app/skydiving.h b/src/app/skydiving.h new file mode 100644 index 00000000..a3ea8cb8 --- /dev/null +++ b/src/app/skydiving.h @@ -0,0 +1,6 @@ +#ifndef APP_SKYDIVING_H +#define APP_SKYDIVING_H + +void func_8032FAB0(void); + +#endif // APP_SKYDIVING_H diff --git a/src/app/splash.c b/src/app/splash.c new file mode 100644 index 00000000..ac9357d3 --- /dev/null +++ b/src/app/splash.c @@ -0,0 +1,16 @@ +#include "common.h" +#include "splash.h" + +#pragma GLOBAL_ASM("asm/nonmatchings/app/splash/func_80341460.s") + +#pragma GLOBAL_ASM("asm/nonmatchings/app/splash/func_803415C8.s") + +#pragma GLOBAL_ASM("asm/nonmatchings/app/splash/func_8034170C.s") + +#pragma GLOBAL_ASM("asm/nonmatchings/app/splash/splash_add.s") + +#pragma GLOBAL_ASM("asm/nonmatchings/app/splash/func_80341974.s") + +#pragma GLOBAL_ASM("asm/nonmatchings/app/splash/func_80341CB0.s") + +#pragma GLOBAL_ASM("asm/nonmatchings/app/splash/func_80341E30.s") diff --git a/src/app/splash.h b/src/app/splash.h new file mode 100644 index 00000000..6cf9a00c --- /dev/null +++ b/src/app/splash.h @@ -0,0 +1,6 @@ +#ifndef APP_SPLASH_H +#define APP_SPLASH_H + +void func_803415C8(void); + +#endif // APP_SPLASH_H diff --git a/src/app/task.c b/src/app/task.c index e0253849..35d8346e 100644 --- a/src/app/task.c +++ b/src/app/task.c @@ -5,13 +5,11 @@ #include #include #include -#include "code_52230.h" +#include "ball_target.h" +#include "balls.h" +#include "bonus.h" #include "code_58B00.h" -#include "code_597E0.h" -#include "code_59D80.h" -#include "code_68220.h" #include "code_69BF0.h" -#include "code_6ACE0.h" #include "code_6ECD0.h" #include "code_722D0.h" #include "code_72910.h" @@ -24,17 +22,19 @@ #include "code_9C080.h" #include "code_A7460.h" #include "code_B2900.h" -#include "code_B6FE0.h" -#include "code_BB820.h" -#include "targets.h" #include "code_D2D50.h" #include "code_D3810.h" #include "code_D4290.h" +#include "environment.h" +#include "falco.h" #include "mem.h" #include "pads.h" #include "rings.h" +#include "shadow.h" +#include "skydiving.h" #include "snap.h" #include "snd.h" +#include "targets.h" #include "thermals.h" typedef struct { diff --git a/src/app/test_menu.c b/src/app/test_menu.c index 76c748c8..b9c29e6c 100644 --- a/src/app/test_menu.c +++ b/src/app/test_menu.c @@ -6,16 +6,16 @@ #include #include #include -#include "code_52230.h" +#include "balls.h" #include "code_64070.h" #include "code_66160.h" -#include "code_6ACE0.h" #include "code_72B70.h" #include "code_905C0.h" #include "code_9A960.h" #include "code_B2900.h" #include "credits.h" #include "demo.h" +#include "falco.h" #include "hud.h" #include "map3d.h" #include "results.h" diff --git a/src/app/wind_objects.c b/src/app/wind_objects.c index 44b3c2b3..82edd3e6 100644 --- a/src/app/wind_objects.c +++ b/src/app/wind_objects.c @@ -1,12 +1,12 @@ #include "common.h" -#include #include #include +#include #include #include -#include "code_68220.h" +#include #include "code_9A960.h" -#include +#include "environment.h" #define WIND_OBJECT_COUNT 0x10 #define INITIAL_OBJECT_ID 0xFFFF