gijs
/
ogrebattle64
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Identified more symbols

This commit is contained in:
Ogre 2023-09-08 03:31:38 +02:00
parent 328ebf8aa9
commit 32432fe0a8
4 changed files with 39 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/common.h
View File

@ -277,7 +277,7 @@ extern void func_801707F4();
extern void func_8017223C(s32);
extern void func_80172368();
extern void func_80172394();
extern void func_8019B2E0(void);
extern void __resets_menu_timer(void);
extern u16 D_800C4C26;
extern u16 D_8018F1A2;
extern s32 D_8018FB34;
@ -294,7 +294,7 @@ extern void func_801C8864(void);
extern u8 D_800A872C;
extern CharacterSlot CHARACTER_SLOT_MAGNUS[];
extern CharacterSlot CHARACTER_SLOT[];
typedef struct {
/* 0x00 */ u8 field_0x0;

20
src/4D5C0.c
View File

@ -47,14 +47,14 @@ void func_801779DC(void) {
}
/* 4D8F8 801779F8 */
void** func_801779F8(void) {
void** __returns_GLOBAL_with_inc_timer(void) {
func_80173610();
return __GLOBAL_WITH__inc_menu_timer;
}
/* 4D91C 80177A1C */
void func_80177A1C(void) {
func_8019B2E0();
void __calls_resets_menu_timer(void) {
__resets_menu_timer();
}
/* 4D938 80177A38 */
@ -153,7 +153,19 @@ INCLUDE_ASM(const s32, "4D5C0", func_80178054);
INCLUDE_ASM(const s32, "4D5C0", func_80178060);
INCLUDE_ASM(const s32, "4D5C0", func_8017806C);
// INCLUDE_ASM(const s32, "4D5C0", func_8017806C);
/* 4DF6C 8017806C */
extern void buSave(u8);
extern void func_801B5A30();
extern s8 D_80187030;
void func_8017806C(void) {
D_80187030 = 1;
buSave(0xE);
func_801B5A30();
}
INCLUDE_ASM(const s32, "4D5C0", func_8017809C);

14
src/item.c
View File

@ -166,7 +166,7 @@ Element item_get_element(u16 index) {
element = ITEM_DATA[index].element;
if (element == ELEMENT_UNKNOWN_0x10) {
element = CHARACTER_SLOT_MAGNUS->field_0x1a;
element = CHARACTER_SLOT[0].field_0x1a;
}
return element;
}
@ -190,7 +190,7 @@ s8 item_get_field_0xc(u16 index) {
s8 item_get_strength(u16 index) {
s8 ret;
if (index == 132) {
ret = CHARACTER_SLOT_MAGNUS[0].strength / 20;
ret = CHARACTER_SLOT[0].strength / 20;
} else {
ret = ITEM_DATA[index].strength;
}
@ -201,7 +201,7 @@ s8 item_get_strength(u16 index) {
s8 item_get_vitality(u16 index) {
s8 ret;
if (index == 132) {
ret = CHARACTER_SLOT_MAGNUS[0].vitality / 20;
ret = CHARACTER_SLOT[0].vitality / 20;
} else {
ret = ITEM_DATA[index].vitality;
}
@ -212,7 +212,7 @@ s8 item_get_vitality(u16 index) {
s8 item_get_intelligence(u16 index) {
s8 ret;
if (index == 132) {
ret = CHARACTER_SLOT_MAGNUS[0].intelligence / 20;
ret = CHARACTER_SLOT[0].intelligence / 20;
} else {
ret = ITEM_DATA[index].intelligence;
}
@ -223,7 +223,7 @@ s8 item_get_intelligence(u16 index) {
s8 item_get_mentality(u16 index) {
s8 ret;
if (index == 132) {
ret = CHARACTER_SLOT_MAGNUS[0].mentality / 20;
ret = CHARACTER_SLOT[0].mentality / 20;
} else {
ret = ITEM_DATA[index].mentality;
}
@ -234,7 +234,7 @@ s8 item_get_mentality(u16 index) {
s8 item_get_agility(u16 index) {
s8 ret;
if (index == 132) {
ret = CHARACTER_SLOT_MAGNUS[0].agility / 20;
ret = CHARACTER_SLOT[0].agility / 20;
} else {
ret = ITEM_DATA[index].agility;
}
@ -245,7 +245,7 @@ s8 item_get_agility(u16 index) {
s8 item_get_dexterity(u16 index) {
s8 ret;
if (index == 132) {
ret = CHARACTER_SLOT_MAGNUS[0].dexterity / 20;
ret = CHARACTER_SLOT[0].dexterity / 20;
} else {
ret = ITEM_DATA[index].dexterity;
}

20
symbol_addrs.txt
View File

@ -1,4 +1,9 @@
ABILITY_DATA = 0x8018AA80; // rom:0x60980 size:0x10
STR_IS_THE_NAME_ACCEPTABLE = 0x8018FDC4; // rom:0x65CC4 type:asciz
STR_MOVING_ON_TO_THE_NEXT_STAGE = 0x8018FDE4; // rom:0x65CE4 type:asciz
STR_NAME_INPUT = 0x80193A78; // type:asciz
STR_YES = 0x8018FE10; // rom:0x65D10 type:asciz
STR_NO = 0x8018FE14; // rom:0x65D14 type:asciz
__handle_name_input = 0x801807F4; // rom:0x566F4 type:func
STR_LEVEL_UP = 0x8021DFCC; // rom:0x1B22DC
STR_MAXIMUM_HP_UP = 0x8021DFD8; // rom:0x1B22E8
@ -11,10 +16,10 @@ STR_PETRIFICATION = 0x8021DFA0; // rom:0x1B22B0
STR_PHYSICAL = 0x80187660; // rom:0x5D560 type:asciz
ITEM_DATA = 0x8018C410; // size:0x20
ABILITY_DATA = 0x8018AA80; // rom:0x60980 size:0x10
ability_get_element = 0x8016E470;
ITEM_DATA = 0x8018C410; // size:0x20
item_get_field_0x0 = 0x8016F5C8;
item_get_element = 0x8016F5E0;
item_get_field_0x2 = 0x8016F614;
@ -223,6 +228,9 @@ __menu_handle_input = 0x8019B8AC; // type:func
__MENU_TIMER = 0x801BA540; // type:u32
__inc_menu_timer = 0x8019BCEC; // type:func rom:0x1D21EC
__calls_inc_menu_timer = 0x80177A38; // rom:0x4D938
__resets_menu_timer = 0x8019B2E0; // rom:0x1D17E0
__calls_resets_menu_timer = 0x80177A1C; // rom:0x4D91C
__returns_GLOBAL_with_inc_timer = 0x801779F8; // rom:0x4D8F8
__MENU_INDEX = 0x801BA94C;
__GLOBAL_WITH__inc_menu_timer = 0x8018FB20;
@ -514,9 +522,9 @@ entry = 0x80070C00;
guRotateRPYF = 0x80092A90;
CHARACTER_SLOT_MAGNUS = 0x80193BF8; // size:0x38
CHARACTER_SLOT_01 = 0x80193C30; // size:0x38
CHARACTER_SLOT_02 = 0x80193C68; // size:0x38
CHARACTER_SLOT = 0x80193BF8; // size:0x38
//CHARACTER_SLOT_01 = 0x80193C30; // size:0x38
//CHARACTER_SLOT_02 = 0x80193C68; // size:0x38
PERSPECTIVE_MATRIX_00 = 0x801969b0;
PERSPECTIVE_MATRIX_01 = 0x800C4BE4;