Skip to content

Match code_BD670, code_B6580, code_B3A70, code_B2900 #80

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Bl00D4NGEL wants to merge 13 commits into
base: main
Choose a base branch
from
Open

Match code_BD670, code_B6580, code_B3A70, code_B2900 #80

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
f85a273
match: src/app/code_BD670
Bl00D4NGEL Mar 3, 2026
60a43cb
match: src/app/code_B6580
Bl00D4NGEL Mar 3, 2026
7afa497
match: most of app/code_B2900
Bl00D4NGEL Mar 4, 2026
ff53e52
refac: re-define Unk80364210, introduce IS_MAIN_VEHICLE and IS_NOT_MA…
Bl00D4NGEL Mar 5, 2026
84c4ba8
match: func_8032B560
Bl00D4NGEL Mar 6, 2026
c236f9b
rematch cannonLandedFrame
Bl00D4NGEL Mar 8, 2026
e8daa62
Merge remote-tracking branch 'origin/main' into match/app-code-b
Bl00D4NGEL Mar 8, 2026
e6b4ef5
refac: drop useless typedef
Bl00D4NGEL Mar 8, 2026
d448c4e
match: func_8032C540, func_8032CC44
Bl00D4NGEL Mar 8, 2026
c0e434c
match: func_8032CF28, func_8032D33C
Bl00D4NGEL Mar 9, 2026
c174e07
match: app/code_B3A70.c
Bl00D4NGEL Mar 9, 2026
731108d
renames and stuff
Bl00D4NGEL Mar 9, 2026
dc502dd
rename rocket_pack -> rocket_belt
Bl00D4NGEL Mar 9, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions config/us/pilotwings64.us.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -431,7 +431,7 @@ segments:
- [0xAA820, c, app/rings]
- [0xAC1A0, c, app/code_AC1A0]
- [0xAE460, c, app/code_AE460]
- [0xAF950, c, app/rocket_pack]
- [0xAF950, c, app/rocket_belt]
- [0xB1B30, c, app/rpsound]
- [0xB2900, c, app/code_B2900]
- [0xB3A70, c, app/code_B3A70]
Expand Down Expand Up @@ -508,7 +508,7 @@ segments:
- [0xD7000, .data, app/demo]
- [0xD7010, data] # app/rings
- [0xD70D0, .data, app/code_AE460]
- [0xD70E0, .data, app/rocket_pack]
- [0xD70E0, .data, app/rocket_belt]
- [0xD7100, .data, app/code_B2900]
- [0xD7140, .data, app/code_B3A70]
- [0xD7170, .data, app/results]
Expand Down Expand Up @@ -594,7 +594,7 @@ segments:
- [0xDC3C0, .rodata, app/rings]
- [0xDC4D0, .rodata, app/code_AC1A0]
- [0xDC800, .rodata, app/code_AE460]
- [0xDC8C0, .rodata, app/rocket_pack]
- [0xDC8C0, .rodata, app/rocket_belt]
- [0xDC9F0, .rodata, app/rpsound]
- [0xDCAF0, .rodata, app/code_B2900]
- [0xDCB20, .rodata, app/code_B3A70]
Expand Down Expand Up @@ -631,12 +631,16 @@ segments:
- { type: bss, vram: 0x803597E0, name: app_bss_803597E0 }
- { type: .bss, vram: 0x803624E0, name: app/file_menu }
- { type: bss, vram: 0x80362500, name: app_bss_80362500 }
- { type: bss, vram: 0x80362690, name: app/code_72B70 } # TODO: Map .bss in .c file
- { type: bss, vram: 0x80367A40, name: app_bss_80367A40 } # code_75A60 and beyond
- { type: .bss, vram: 0x80369F10, name: app/menu }
- { type: bss, vram: 0x80369F30, name: app_bss_80369F30 }
- { type: .bss, vram: 0x8036C120, name: app/options }
- { type: bss, vram: 0x8036C150, name: app_bss_8036C150 }
- { type: .bss, vram: 0x803718F0, name: app/results }
- { type: bss, vram: 0x80371960, name: app_bss_80371960 }
- { type: .bss, vram: 0x80371DB0, name: app/code_BD670 }
- { type: bss, vram: 0x80371E60, name: app_bss_80371E60 }
- { type: .bss, vram: 0x80377F10, name: app/text_data }
- { type: .bss, vram: 0x80378CE0, name: app/code_C9B60 }
- { type: .bss, vram: 0x80378CF0, name: app/targets }
Expand Down
138 changes: 83 additions & 55 deletions config/us/sym/symbol_addrs_app.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@ ballsGet_802CC15C = 0x802CC15C; // type:func
// birdman0
bird_802CC1B0 = 0x802CC1B0; // type:func
bird_802CC270 = 0x802CC270; // type:func
bird_802CC39C = 0x802CC39C; // type:func
birdEnterLeave = 0x802CC39C; // type:func
bird_802CC51C = 0x802CC51C; // type:func
bird_802CC55C = 0x802CC55C; // type:func
birdMovementFrame = 0x802CC55C; // type:func
bird_802CD0F8 = 0x802CD0F8; // type:func
bird_802CD2E8 = 0x802CD2E8; // type:func
bird_802CE0A4 = 0x802CE0A4; // type:func
Expand Down Expand Up @@ -61,21 +61,21 @@ bonusLoad = 0x802D23EC; // type:func
bonusFrameUpdate = 0x802D25AC; // type:func
bonusDeinit = 0x802D27CC; // type:func

cannon_802D5A90 = 0x802D5A90; // type:func
cannonLoadLevel = 0x802D5B50; // type:func
cannon_802D5C5C = 0x802D5C5C; // type:func
cannonEndTarget = 0x802D5E98; // type:func
cannonMovementFrame = 0x802D5F00; // type:func
cannonAimingFrame = 0x802D66C4; // type:func
cannonShoot = 0x802D6B7C; // type:func
cannonPilotLand = 0x802D6CC4; // type:func
cannonLoadPilot = 0x802D6F38; // type:func
cannonLoad802D77D8 = 0x802D77D8; // type:func
cannonFrame802D7B7C = 0x802D7B7C; // type:func
cannonLandedFrame = 0x802D8098; // type:func
cannonEndShot = 0x802D8494; // type:func
cannonEndAllTgts = 0x802D8730; // type:func
cannon_802D8A40 = 0x802D8A40; // type:func
cannon_802D5A90 = 0x802D5A90; // type:func
cannonLoadLevel = 0x802D5B50; // type:func
cannonLevelEnterLeave = 0x802D5C5C; // type:func
cannonEndTarget = 0x802D5E98; // type:func
cannonMovementFrame = 0x802D5F00; // type:func
cannonAimingFrame = 0x802D66C4; // type:func
cannonShoot = 0x802D6B7C; // type:func
cannonPilotLand = 0x802D6CC4; // type:func
cannonLoadPilot = 0x802D6F38; // type:func
cannonLoad802D77D8 = 0x802D77D8; // type:func
cannonFrame802D7B7C = 0x802D7B7C; // type:func
cannonLandedFrame = 0x802D8098; // type:func
cannonEndShot = 0x802D8494; // type:func
cannonEndAllTgts = 0x802D8730; // type:func
cannon_802D8A40 = 0x802D8A40; // type:func

screenDrawBox = 0x802DED44; // type:func
screenDrawBox2 = 0x802DF03C; // type:func
Expand Down Expand Up @@ -277,44 +277,46 @@ textFmtIntAt = 0x80342404; // type:func

introSceneRunner = 0x803439B4; // type:func

level_803449B0 = 0x803449B0; // type:func
levelIsValidIndex = 0x80344CD0; // type:func
strToUpper = 0x80344D40; // type:func
level_80344E0C = 0x80344E0C; // type:func
levelGetTestCount = 0x80344EF0; // type:func
level_80344FC8 = 0x80344FC8; // type:func
level_8034528C = 0x8034528C; // type:func
level_8034536C = 0x8034536C; // type:func
level_803453AC = 0x803453AC; // type:func
level_80345464 = 0x80345464; // type:func
level_803456D8 = 0x803456D8; // type:func
level_80345A24 = 0x80345A24; // type:func
levelGet_80345C80 = 0x80345C80; // type:func
levelGet_80345C90 = 0x80345C90; // type:func
levelGet_80345CA0 = 0x80345CA0; // type:func
levelGet_80345CB0 = 0x80345CB0; // type:func
levelGet_80345CC0 = 0x80345CC0; // type:func
levelLoadCommObj = 0x80345CE4; // type:func
level_803462D4 = 0x803462D4; // type:func
levelGetClsVehTest = 0x8034633C; // type:func
levelGet_80346364 = 0x80346364; // type:func
level_80346370 = 0x80346370; // type:func
levelGet_80346468 = 0x80346468; // type:func
levelDataGetTHER = 0x80345AAC; // type:func
levelDataGetLWIN = 0x80345ACC; // type:func
levelDataGetTPAD = 0x80345AFC; // type:func
levelDataGetCNTG = 0x80345B1C; // type:func
levelDataGetOBSV = 0x80345B3C; // type:func
levelDataGetLPAD = 0x80345B5C; // type:func
levelDataGetLSTP = 0x80345B7C; // type:func
levelDataGetRNGS = 0x80345B9C; // type:func
levelDataGetBALS = 0x80345BBC; // type:func
levelDataGetTARG = 0x80345BDC; // type:func
levelDataGetHPAD = 0x80345BFC; // type:func
levelDataGetBTGT = 0x80345C1C; // type:func
levelDataGetPHTS = 0x80345C3C; // type:func
levelDataGetFALC = 0x80345C5C; // type:func
levelDataGetHOPD = 0x80346474; // type:func
level_803449B0 = 0x803449B0; // type:func
levelIsValidIndex = 0x80344CD0; // type:func
strToUpper = 0x80344D40; // type:func
level_80344E0C = 0x80344E0C; // type:func
levelGetTestCount = 0x80344EF0; // type:func
level_80344FC8 = 0x80344FC8; // type:func
level_8034528C = 0x8034528C; // type:func
level_8034536C = 0x8034536C; // type:func
level_803453AC = 0x803453AC; // type:func
level_80345464 = 0x80345464; // type:func
level_803456D8 = 0x803456D8; // type:func
level_80345A24 = 0x80345A24; // type:func
levelGet_80345C80 = 0x80345C80; // type:func
levelGet_80345C90 = 0x80345C90; // type:func
levelGet_80345CA0 = 0x80345CA0; // type:func
levelGet_80345CB0 = 0x80345CB0; // type:func
levelGet_80345CC0 = 0x80345CC0; // type:func
levelLoadCommObj = 0x80345CE4; // type:func
level_803462D4 = 0x803462D4; // type:func
levelGetClsVehTest = 0x8034633C; // type:func
levelGet_80346364 = 0x80346364; // type:func
level_80346370 = 0x80346370; // type:func
levelGet_80346468 = 0x80346468; // type:func
levelDataGetTHER = 0x80345AAC; // type:func
levelDataGetLWIN = 0x80345ACC; // type:func
levelDataGetTPAD = 0x80345AFC; // type:func
levelDataGetCNTG = 0x80345B1C; // type:func
levelDataGetOBSV = 0x80345B3C; // type:func
levelDataGetLPAD = 0x80345B5C; // type:func
levelDataGetLSTP = 0x80345B7C; // type:func
levelDataGetRNGS = 0x80345B9C; // type:func
levelDataGetBALS = 0x80345BBC; // type:func
levelDataGetTARG = 0x80345BDC; // type:func
levelDataGetHPAD = 0x80345BFC; // type:func
levelDataGetBTGT = 0x80345C1C; // type:func
levelDataGetPHTS = 0x80345C3C; // type:func
levelDataGetFALC = 0x80345C5C; // type:func
levelDataGetHOPD = 0x80346474; // type:func
levelGetTotalPoints = 0x8032BD20; // type:func
levelSetPointsToNextMedal = 0x8032C174; // type:func

thermInit = 0x803465F0; // type:func
therm_8034662C = 0x8034662C; // type:func
Expand Down Expand Up @@ -371,6 +373,26 @@ optionsSetSetting = 0x80316BEC; // type:func
optionsSetTrack = 0x80316D34; // type:func
optionsItemWrap = 0x80316D88; // type:func

gyrocopterEnterLeave = 0x802F5BF0; // type:func

gyrocopterMovementFrame = 0x802F604C; // type:func

hangGliderEnterLeave = 0x802EF368; // type:func

hangGliderMovementFrame = 0x802EF5B0; // type:func

jumbleHopperEnterLeave = 0x802FA108; // type:func

jumbleHopperMovementFrame = 0x802FA2D0; // type:func

rocketBeltEnterLeave = 0x80324EC4; // type:func

rocketBeltMovementFrame = 0x80325160; // type:func

skydivingEnterLeave = 0x8032FC08; // type:func

skydivingMovementFrame = 0x803308C4; // type:func

// -----------------------------------------------------------------------------
// Data Symbols
// -----------------------------------------------------------------------------
Expand Down Expand Up @@ -444,3 +466,9 @@ sTextNameCount = 0x80378CD0;

sMissileTargets = 0x80378CF0;
sMissileTargetCount = 0x80378CF4;

gMedalPointRequirements = 0x8034FBD4;

sShutterBugTestItems = 0x8034FC10; // size:0x10
sSkyDivingItems = 0x8034FC20; // size:0x8
sOtherItems = 0x8034FC28; // size:0xC
2 changes: 2 additions & 0 deletions include/uv_janim.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,7 @@ void func_802006FC(Unk80371120*, Unk80371120*, Unk80371120*, f32);
void func_80200B00(s32, s32, f32);
void uvJanimPoseLine(Unk80371120*, s32, f32);
void uvJanimPoseGrid(Unk80371120*, s32, f32, f32);
void func_802006FC(Unk80371120*, Unk80371120*, Unk80371120*, f32);
void func_80200638(s32, Unk80371120*);

#endif // UV_JANIM_H
Loading