actually fix assembler bug, make sure it compiles.

This commit is contained in:
dark-samus 2020-08-14 22:24:08 -04:00
parent 50f8ca824b
commit 62827e8823
4 changed files with 4 additions and 5 deletions

View File

@ -20,6 +20,8 @@ s32 func_800555E4(s32);
void func_80137D88(s32, f32);
void func_80137E10(s32, u8, u8, u8);
s32 rand_int(s32);
void sort_items(void);
s32 is_ability_active(s32 arg0);
s32 play_sound_at_position(s32 soundID, s32 value2, f32 posX, f32 posY, f32 posZ);
s32 set_music_track(s32 musicPlayer, s32 songID, s32 variation, s32 unk, s32 volume);

View File

@ -897,7 +897,7 @@ SECTIONS
build/bin/papermario.090FE0.bin_90fe0_len_14df0.o(.data);
}
// uncomment once rodata for is_ability_active is needed.
/* uncomment once rodata for is_ability_active is needed. */
/*.rodata8010BF60 0x8010BF60 : AT(0xA5410) {
build/src/code_80850_len_3060.o(.rodata)
}

View File

@ -1,8 +1,5 @@
#include "common.h"
void sort_items(void);
s32 is_ability_active(s32 arg0);
void clear_player_data(void) {
player_data* playerData = &gPlayerData;
s32 i;
@ -719,7 +716,7 @@ void reset_status_menu(void) {
}
// uses a jumptable, which we need .rodata support for.
INCLUDE_ASM(code_80850_len_3060, is_ability_active);
s32 INCLUDE_ASM(code_80850_len_3060, is_ability_active, s32 arg0);
// Somewhat close. Needs work.
/*s32 is_ability_active(s32 arg0) {
s32 iVar2;

Binary file not shown.