sf_i6_2 decompiled (#104)

* sf_i6_2

* use macro

* suggestion macros

Co-authored-by: petrie911 <69443847+petrie911@users.noreply.github.com>

* decimal suggestion

Co-authored-by: petrie911 <69443847+petrie911@users.noreply.github.com>

* file rename

---------

Co-authored-by: petrie911 <69443847+petrie911@users.noreply.github.com>
This commit is contained in:
inspectredc 2024-01-23 15:49:43 +00:00 committed by GitHub
parent 119dfa9354
commit 8f794a6335
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 4503 additions and 4041 deletions

View File

@ -46,6 +46,7 @@ void func_8001D1C8(u8, u32);
void func_8001D2FC(f32 *, u16);
void func_8001D3A0(f32 *, u16);
void func_8001D400(s8);
void func_8001D410(s32);
void func_8001D444(u8, u16, u8, u8);
void func_8001D4AC(u16, u8, u8, u8);
void func_8001D520(void);
@ -111,6 +112,7 @@ void func_8002E700(Player *);
void func_8002EE64(Actor * actor);
void func_8002F180(void);
void func_8002F5F4(u16* msg, RadioCharacterId character);
void func_8002F69C(Actor*);
void func_8003088C(Actor*);
void func_800319AC(Actor* this);
void func_80035448(Actor* actor);

View File

@ -137,6 +137,8 @@ D_i5_801BE2A4 = 0x801BE2A4;
func_i6_801888F4 = 0x801888F4;
func_i6_80197CC4 = 0x80197CC4;
func_i6_8018D16C = 0x8018D16C;
D_i6_801A68B0 = 0x801A68B0;//size:0x48 type:Vec3f segment:ovl_i6
D_i6_801A68F8 = 0x801A68F8;//size:0xC type:f32 segment:ovl_i6
D_i6_801A7F30 = 0x801A7F30;
D_i6_801A7F58 = 0x801A7F58;
D_i6_801A7F60 = 0x801A7F60;

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -1,17 +0,0 @@
#include "common.h"
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/sf_i6_2/func_i6_80196210.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/sf_i6_2/func_i6_8019624C.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/sf_i6_2/func_i6_80196288.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/sf_i6_2/func_i6_801962F4.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/sf_i6_2/func_i6_80196314.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/sf_i6_2/func_i6_80196968.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/sf_i6_2/func_i6_80196BF8.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/sf_i6_2/func_i6_80196D88.s")

View File

@ -140,22 +140,22 @@
symbol_name_format: i6_$VRAM
subsegments:
- [0xE9F1D0, c, fox_i6]
- [0xE9F1E0, c, fox_ve2]
- [0xEADEC0, c, sf_i6_2]
- [0xE9F1E0, c, fox_andross]
- [0xEADEC0, c, fox_ve2]
- [0xEAF7E0, c, fox_sy]
- [0xEBD210, c, sf_i6_4]
- [0xEBE400, .data, fox_i6]
- [0xEBE410, .data, fox_ve2]
- [0xEBE560, data, sf_i6_2]
- [0xEBE410, .data, fox_andross]
- [0xEBE560, .data, fox_ve2]
- [0xEBE5C0, data, fox_sy]
- [0xEBE830, data, sf_i6_4]
- [0xEBE840, .rodata, fox_i6]
- [0xEBE850, .rodata, fox_ve2]
- [0xEBF0F0, .rodata, sf_i6_2]
- [0xEBE850, .rodata, fox_andross]
- [0xEBF0F0, .rodata, fox_ve2]
- [0xEBF130, .rodata, fox_sy]
- [0xEBFB80, .rodata, sf_i6_4]
- { start: 0xEBFBE0, type: .bss, vram: 0x801A7F30, name: fox_i6 }
- { type: .bss, vram: 0x801A7F40, name: fox_ve2 }
- { type: .bss, vram: 0x801A7F40, name: fox_andross }
- { type: bss, vram: 0x801A8440, name: fox_sy }
- name: ovl_menu