Fix many warnings. (#557)

* Fix many warnings.

* Fix more warnings.

* More warnings

* Some more warnings

* Last fixes and address comments

* ehtan
This commit is contained in:
JoshDuMan 2021-12-20 10:59:25 -05:00 committed by GitHub
parent bc7899aaef
commit a5340e8dce
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
65 changed files with 355 additions and 319 deletions

View File

@ -15,4 +15,12 @@ enum {
CAM_FLAG_1000 = 0x1000,
};
void update_camera_mode_0(Camera*);
void update_camera_mode_1(Camera*);
void update_camera_mode_2(Camera*);
void update_camera_mode_4(Camera*);
void update_camera_mode_5(Camera*);
void update_camera_mode_6(Camera*);
void create_camera_leadplayer_matrix(Camera*);
#endif

View File

@ -215,7 +215,7 @@ f32 clamp_angle(f32 theta);
s32 sign(s32 value);
s32 func_80055448(s32);
s32 func_80055464(s32, s32);
void func_800561A4(s32);
s32 func_800E0208(void);
s32 battle_heap_create(void);
void filemenu_init(s32);
@ -577,6 +577,7 @@ void set_window_update(s32 panelID, s32);
void snd_stop_sound(s32 soundID);
void partner_disable_input(void);
void func_80268798(s32, s32, s32, s32);
void func_8026880C(s32, s32, s32);
void func_802687E4(s32 arg0, s32 arg1, s32 arg2, s32 arg3, s32 arg4);
void sfx_stop_sound(s32 soundID);
void close_message(MessagePrintState* msgPrintState);
@ -634,4 +635,56 @@ void open_status_menu_short(void);
void func_8024EFE0(f32 x, f32 y, f32 z, s32 a, s32 b, s32 c);
void func_802664DC(f32 x, f32 y, f32 z, s32 attack, s32 a);
void init_encounters_ui(void);
void initialize_collision(void);
void render_entities(void);
void render_player(void);
void render_generic_entities_world(void);
void render_effects_world(void);
s32 get_asset_offset(char*, s32*);
void initialize_status_menu(void);
void set_background_size(s16, s16, s16, s16);
void read_background_size(BackgroundHeader*);
void set_max_SP(s8);
void sync_status_menu(void);
void create_cameras_a(void);
void func_80045AC0(void);
void create_encounters(void);
void update_encounters_neutral(void);
void update_encounters_pre_battle(void);
void update_encounters_conversation(void);
void update_encounters_post_battle(void);
void update_merlee_messages(void);
void reset_background_settings(void);
void func_80138188(void);
void func_80268770(s32, s32, s32);
void func_80268C9C(void);
void func_802B6CF0_E2B3A0(void);
void func_80269160(void);
void load_tattle_flags(s32);
void remove_consumable(void);
void delete_shadow(s32);
void repartner_set_tether_distance(void);
void save_tattle_flags(s32);
void draw_merlee_messages(void);
void draw_encounters_conversation(void);
void draw_encounters_post_battle(void);
void draw_encounters_pre_battle(void);
void draw_encounters_neutral(void);
void show_first_strike_message(void);
void entity_upgrade_block_hide_content(s32);
void clear_player_status(void);
void clear_entity_models(void);
void clear_animator_list(void);
void clear_model_data(void);
void clear_sprite_shading_data(void);
void clear_character_set(void);
void clear_game_modes(void);
void clear_trigger_data(void);
void clear_script_list(void);
void clear_entity_data(s32);
void clear_effect_data(void);
void clear_area_flags(void);
#endif

View File

@ -153,7 +153,9 @@ typedef enum ShapeTypes {
typedef ModelTreeInfo ModelTreeInfoList[0x200];
extern ModelTreeInfoList* mdl_currentModelTreeNodeInfo;
void update_model_animator(s32);
void update_model_animator_with_transform(s32 animatorID, Mtx* mtx);
void set_mdl_custom_gfx_set(Model*, s32, u32);
s32 step_model_animator(ModelAnimator* animator);
void animator_update_model_transforms(ModelAnimator* animator, Mtx* rootTransform);
void render_animated_model(s32 animatorID, Mtx* rootTransform);

View File

@ -282,7 +282,7 @@ typedef struct Enemy {
s32 func_800490B4(EnemyTerritoryThing* arg0, Enemy* arg1, f32 arg2, f32 arg3, s32 arg4);
/// The default Npc::onUpdate and Npc::onRender callback.
void STUB_npc_callback(void);
void STUB_npc_callback(Npc*);
void mtx_ident_mirror_y(Matrix4f mtx);

View File

@ -266,18 +266,6 @@ extern s16 gCurrentDoorSoundsSet;
extern s32 D_800D9620;
extern UNK_TYPE D_800E92D8;
extern UNK_TYPE D_80147574;
extern UNK_TYPE D_80109270;
extern UNK_TYPE D_80108558;
extern s32 D_80108248;
extern s32 D_80108518;
extern s32 D_80108270;
extern s32 D_80108538;
extern s32 D_80080FC4;
extern s32 D_801086AC;
extern s32 D_801083D8;
extern s32 D_80108068;
extern s32 D_80104BEC;
extern UNK_FUN_PTR(D_8010C920);
extern s32 D_8010C940;
@ -400,7 +388,6 @@ extern s32 D_8038F800;
extern s32 D_803B5000;
extern HeapNode heap_battleHead;
extern s32 D_80108A64;
extern s32 bMarioIdleAnims[];
extern s32 bMarioDefendAnims[];
extern s32 bPeachIdleAnims[];

View File

@ -2,14 +2,14 @@
#include "effects.h"
#include "hud_element.h"
extern s32 D_80108AAC;
extern s32 D_80108AD4;
extern HudElementAnim D_80108AAC[];
extern HudElementAnim D_80108AD4[];
extern s32 D_8029FB90;
extern f32 D_8029FB94;
extern EffectInstance* D_8029FB98;
extern EffectInstance* D_8029FB9C;
extern HudElement* D_8029FBA0;
extern s32 D_8029FBA0;
extern s16 D_8029FBA4;
extern s32 D_8029FBA8;
extern s32 D_8029FBAC;
@ -20,10 +20,10 @@ void func_80260A60(void) {
ActorPart* actorPart = &battleStatus->playerActor->partsTable[0];
if (battleStatus->flags2 & 0x40) {
actorPart->idleAnimations = &bPeachIdleAnims;
actorPart->idleAnimations = bPeachIdleAnims;
set_animation(0, 0, 0xA0002);
} else if (!battleStatus->outtaSightActive) {
actorPart->idleAnimations = &bMarioIdleAnims;
actorPart->idleAnimations = bMarioIdleAnims;
}
}
@ -50,7 +50,7 @@ ApiStatus activate_defend_command(Evt* script, s32 isInitialCall) {
deduct_current_move_fp();
gBattleStatus.flags1 |= 0x400000;
actorPart->idleAnimations = &bMarioDefendAnims;
actorPart->idleAnimations = bMarioDefendAnims;
set_animation(0, 0, 0x10014);
return ApiStatus_DONE2;
}
@ -135,7 +135,7 @@ ApiStatus N(GiveRefund)(Evt* script, s32 isInitialCall) {
posY = player->currentPos.y;
posZ = player->currentPos.z;
get_screen_coords(gCurrentCameraID, posX, posY, posZ, &iconPosX, &iconPosY, &iconPosZ);
D_8029FBA0 = create_hud_element(&D_80108A64);
D_8029FBA0 = create_hud_element(D_80108A64);
set_hud_element_render_pos(D_8029FBA0, iconPosX + 36, iconPosY - 63);
}
@ -410,13 +410,13 @@ ApiStatus func_802619E8(Evt* script, s32 isInitialCall) {
screenY -= 19;
if (script->varTable[10] > 0) {
D_8029FBAC = create_hud_element(&D_80108AD4);
D_8029FBAC = create_hud_element(D_80108AD4);
set_hud_element_render_pos(D_8029FBAC, screenX, screenY);
screenY += 9;
}
if (script->varTable[11] > 0 || script->varTable[12] > 0) {
D_8029FBA8 = create_hud_element(&D_80108AAC);
D_8029FBA8 = create_hud_element(D_80108AAC);
set_hud_element_render_pos(D_8029FBA8, screenX, screenY);
}
return ApiStatus_DONE2;

View File

@ -66,8 +66,8 @@ extern HudElementAnim D_8010760C[];
extern HudElementAnim D_801075E0[];
extern HudElementAnim D_80107314[];
extern HudElementAnim D_8010701C[];
extern HudElementAnim* D_8010717C[];
extern HudElementAnim* D_80107474[];
extern HudElementAnim D_8010717C[];
extern HudElementAnim D_80107474[];
extern s32 D_800A0F40;
extern PopupMessage D_800A0BC0[32];

View File

@ -1,7 +1,6 @@
#include "common.h"
#include "hud_element.h"
extern s32 D_80104A28;
extern s32 D_80107D48;
extern s32 D_80107D98;
extern s32 D_80107CA8;
@ -28,8 +27,8 @@ extern u8 D_802AD000;
extern u8 D_802AD001;
extern s16 D_802AD006;
extern s16 D_802AD008;
extern s32* D_802AD010;
extern s32* D_802AD028;
extern s32 D_802AD010[];
extern s32 D_802AD028[];
extern s32 D_802AD040;
extern s32 D_802AD044;
extern s32 D_802AD048;
@ -87,7 +86,7 @@ extern s32 D_802AD66C;
extern s8 D_802AD673;
extern s32 D_802AD678[];
extern s32 D_802AD690[];
extern s32* D_802AD6C0[];
extern s32 D_802AD6C0[];
extern s32 D_802AD6D4;
s16 D_802AB340[] = { 0x001C, 0x0028 };
@ -104,9 +103,9 @@ s32 D_802AB390[] = { &D_80108974, 0x8010899C };
s32 D_802AB398[] = { &D_80108974, 0x8010899C, 0x80107990, 0x801079BC, 0x801079E8, 0x80107A14, 0x80107A40, 0x80107A6C, 0x80107A98, 0x80107AC4, 0x80107AF0, 0x80107B1C, 0x80107B48, 0x80107B74, 0x80107BA0, 0x80107BCC, 0x80107BF8, 0x80107C24, 0x80107C50, 0x80107C7C, &D_80108974, 0x8010899C, &D_80108974, 0x8010899C };
s32 D_802AB3F8[] = { &D_80107CA8, &D_80107CF8, &D_80107D48, &D_80107D98, &D_80107DE8, &D_80107CA8, &D_80107E88, &D_80107ED8, &D_80107F28, &D_80107E38, &D_80107FC8, &D_80107FC8, &D_80107FC8, &D_80107FC8, &D_80107FC8, &D_80107FC8 };
s32* D_802AB3F8[] = { &D_80107CA8, &D_80107CF8, &D_80107D48, &D_80107D98, &D_80107DE8, &D_80107CA8, &D_80107E88, &D_80107ED8, &D_80107F28, &D_80107E38, &D_80107FC8, &D_80107FC8, &D_80107FC8, &D_80107FC8, &D_80107FC8, &D_80107FC8 };
s32 D_802AB438[] = { &D_80107CD0, &D_80107D20, &D_80107D70, &D_80107DC0, &D_80107E10, &D_80107CD0, &D_80107EB0, &D_80107F00, &D_80107F50, &D_80107E60, &D_80107FF0, &D_80107FF0, &D_80107FF0, &D_80107FF0, &D_80107FF0, &D_80107FF0 };
s32* D_802AB438[] = { &D_80107CD0, &D_80107D20, &D_80107D70, &D_80107DC0, &D_80107E10, &D_80107CD0, &D_80107EB0, &D_80107F00, &D_80107F50, &D_80107E60, &D_80107FF0, &D_80107FF0, &D_80107FF0, &D_80107FF0, &D_80107FF0, &D_80107FF0 };
s32 D_802AB478[] = { 0x80292200 };
@ -182,8 +181,8 @@ void func_802A10B8(void) {
s32 i;
for (i = 0; i < main_menu_numOptions; i++) {
s32* icons1 = &D_802AD010;
s32* icons2 = &D_802AD028;
s32* icons1 = D_802AD010;
s32* icons2 = D_802AD028;
free_hud_element(icons1[i]);
free_hud_element(icons2[i]);
@ -201,6 +200,7 @@ void func_802A10B8(void) {
INCLUDE_ASM(s32, "415D90", func_802A11B0);
void btl_draw_menu_wheel(void);
INCLUDE_ASM(s32, "415D90", btl_draw_menu_wheel);
// Very similar to func_802A45D8 - maybe can be used to reduce fake matches there
@ -282,7 +282,7 @@ void func_802A2910(void) {
s32* moveOptionCostUnitIconIDs;
s32 i;
moveOptionIconIDs = &battle_menu_moveOptionIconIDs;
moveOptionIconIDs = battle_menu_moveOptionIconIDs;
for (i = 0; i < battle_menu_moveOptionCount; i++) {
set_hud_element_tint(moveOptionIconIDs[i], 255, 255, 255);
@ -293,13 +293,13 @@ void func_802A2910(void) {
set_hud_element_tint(battle_menu_moveDownArrowIcon, 255, 255, 255);
set_hud_element_tint(battle_menu_moveTitleIcon, 255, 255, 255);
moveOptionCostUnitIconIDs = &battle_menu_moveOptionCostUnitIconIDs;
moveOptionCostUnitIconIDs = battle_menu_moveOptionCostUnitIconIDs;
for (i = 0; i < battle_menu_moveOptionCount; i++) {
set_hud_element_tint(moveOptionCostUnitIconIDs[i], 255, 255, 255);
}
set_hud_element_anim(battle_menu_moveCursorIcon, &D_80104A28);
set_hud_element_anim(battle_menu_moveCursorIcon, D_80104A28);
set_window_update(1, 5);
if (!battle_menu_hasSpiritsMenu) {
@ -333,7 +333,7 @@ void func_802A2AB8(void) {
}
set_window_update(8, 1);
moveOptionIconIDs = &battle_menu_moveOptionIconIDs;
moveOptionIconIDs = battle_menu_moveOptionIconIDs;
for (i = 0; i < battle_menu_moveOptionCount; i++) {
set_hud_element_tint(moveOptionIconIDs[i], 255, 255, 255);
@ -344,13 +344,13 @@ void func_802A2AB8(void) {
set_hud_element_tint(battle_menu_moveDownArrowIcon, 255, 255, 255);
set_hud_element_tint(battle_menu_moveTitleIcon, 255, 255, 255);
moveOptionCostUnitIconIDs = &battle_menu_moveOptionCostUnitIconIDs;
moveOptionCostUnitIconIDs = battle_menu_moveOptionCostUnitIconIDs;
for (i = 0; i < battle_menu_moveOptionCount; i++) {
set_hud_element_tint(moveOptionCostUnitIconIDs[i], 255, 255, 255);
}
set_hud_element_anim(battle_menu_moveCursorIcon, &D_80104A28);
set_hud_element_anim(battle_menu_moveCursorIcon, D_80104A28);
battle_menu_moveTextColor = 10;
D_802AD10F = 1;
battle_menu_moveState = 20;
@ -501,7 +501,7 @@ void func_802A47E0(void) {
set_hud_element_tint(D_802AD618, 0xFF, 0xFF, 0xFF);
set_hud_element_tint(D_802AD61C, 0xFF, 0xFF, 0xFF);
set_hud_element_tint(D_802AD620, 0xFF, 0xFF, 0xFF);
set_hud_element_anim(D_802AD618, &D_80104A28);
set_hud_element_anim(D_802AD618, D_80104A28);
set_window_update(6, 5);
set_window_update(7, 5);
set_window_update(8, 1);
@ -525,7 +525,7 @@ void func_802A48FC(void) {
set_hud_element_tint(D_802AD618, 0xFF, 0xFF, 0xFF);
set_hud_element_tint(D_802AD61C, 0xFF, 0xFF, 0xFF);
set_hud_element_tint(D_802AD620, 0xFF, 0xFF, 0xFF);
set_hud_element_anim(D_802AD618, &D_80104A28);
set_hud_element_anim(D_802AD618, D_80104A28);
D_802AD614 = 10;
D_802AD60B = 1;
D_802AD604 = 20;

View File

@ -7,7 +7,6 @@
extern UNK_FUN_PTR(D_8010C920);
extern UNK_FUN_PTR(D_8010C93C);
extern s32 D_8010C940;
extern s32 D_8010C950;
extern s32 D_802BDF60;
@ -17,7 +16,6 @@ s32 func_802B7140(void);
void func_802B72C0_E22870(void);
void func_802B70B4_E201C4(void);
s32 func_800E0208(void);
void func_800E0330(void);
void func_800E0374(void);
void func_800E04D0(void);
@ -713,7 +711,7 @@ void check_for_interactables(void) {
// TODO: Remove after func_800E24F8 is matching.
static const pad[3] = { 0.0f, 0.0f, 0.0f };
static const s32 pad[3] = { 0.0f, 0.0f, 0.0f };
void func_800E0AD0(void) {
if ((gPlayerStatusPtr->animFlags & 0x10) && (D_8010C958 != 0)) {

View File

@ -7,7 +7,6 @@
extern s32 D_8010C924;
extern s32 D_8010C964;
extern s32 D_8010C96C; // npc list index
extern s32 gSpinHistoryBufferPos;
extern s16 D_8010C9B0;
extern s32 gSpinHistoryPosY[5];
@ -149,7 +148,7 @@ void set_action_state(s32 actionState) {
}
if (playerStatus->unk_D8) {
playerStatus->unk_D8[3][9] = 0xA;
playerStatus->unk_D8[3][9] = 0xA; // TODO: Substruct? Currently UB.
playerStatus->unk_D8 = NULL;
}
}

View File

@ -4,6 +4,18 @@
extern s32 D_800F7FA8;
extern s32 D_800F7F80[10];
extern HudElementAnim D_80108248[];
extern HudElementAnim D_80108518[];
extern HudElementAnim D_80108270[];
extern HudElementAnim D_80108538[];
extern HudElementAnim D_80080FC4[];
extern HudElementAnim D_801086AC[];
extern HudElementAnim D_801083D8[];
extern HudElementAnim D_80108068[];
extern HudElementAnim D_80104BEC[];
extern HudElementAnim D_80108558[];
extern HudElementAnim D_80109270[];
void clear_player_data(void) {
PlayerData* playerData = &gPlayerData;
s32 i;
@ -320,68 +332,68 @@ void initialize_status_menu(void) {
close_status_menu();
iconIndex = create_hud_element(&D_80108248);
iconIndex = create_hud_element(D_80108248);
uiStatus->hpIconIndexes[0] = iconIndex;
set_hud_element_flags(iconIndex, 0x80);
clear_hud_element_flags(iconIndex, 0x8000);
iconIndex = create_hud_element(&D_80108518);
iconIndex = create_hud_element(D_80108518);
uiStatus->hpIconIndexes[1] = iconIndex;
set_hud_element_flags(iconIndex, 0x80);
clear_hud_element_flags(iconIndex, 0x8000);
iconIndex = create_hud_element(&D_80108270);
iconIndex = create_hud_element(D_80108270);
uiStatus->fpIconIndexes[0] = iconIndex;
set_hud_element_flags(iconIndex, 0x80);
clear_hud_element_flags(iconIndex, 0x8000);
iconIndex = create_hud_element(&D_80108538);
iconIndex = create_hud_element(D_80108538);
uiStatus->fpIconIndexes[1] = iconIndex;
set_hud_element_flags(iconIndex, 0x80);
clear_hud_element_flags(iconIndex, 0x8000);
iconIndex = create_hud_element(&D_80108558);
iconIndex = create_hud_element(D_80108558);
uiStatus->coinIconIndex = iconIndex;
set_hud_element_flags(iconIndex, 0x80);
clear_hud_element_flags(iconIndex, 0x8000);
iconIndex = create_hud_element(&D_80080FC4);
iconIndex = create_hud_element(D_80080FC4);
uiStatus->coinIconIndex2 = iconIndex;
set_hud_element_flags(iconIndex, 0x80);
clear_hud_element_flags(iconIndex, 0x8000);
iconIndex = create_hud_element(&D_801086AC);
iconIndex = create_hud_element(D_801086AC);
uiStatus->starpointsIconIndex = iconIndex;
set_hud_element_flags(iconIndex, 0x80);
clear_hud_element_flags(iconIndex, 0x8000);
iconIndex = create_hud_element(&D_80104BEC);
iconIndex = create_hud_element(D_80104BEC);
uiStatus->starpointsIconIndex2 = iconIndex;
set_hud_element_flags(iconIndex, 0x80);
clear_hud_element_flags(iconIndex, 0x8000);
newVar = create_hud_element(&D_80108068);
newVar = create_hud_element(D_80108068);
iconIndex = newVar;
uiStatus->iconIndex8 = iconIndex;
set_hud_element_flags(iconIndex, 0x82);
clear_hud_element_flags(iconIndex, 0x8000);
iconIndex = create_hud_element(&D_80108068);
iconIndex = create_hud_element(D_80108068);
uiStatus->iconIndex9 = iconIndex;
set_hud_element_flags(iconIndex, 0x82);
clear_hud_element_flags(iconIndex, 0x8000);
iconIndex = create_hud_element(&D_80108068);
iconIndex = create_hud_element(D_80108068);
uiStatus->iconIndexA = iconIndex;
set_hud_element_flags(iconIndex, 0x82);
clear_hud_element_flags(iconIndex, 0x8000);
iconIndex = create_hud_element(&D_80108068);
iconIndex = create_hud_element(D_80108068);
uiStatus->iconIndexB = iconIndex;
set_hud_element_flags(iconIndex, 0x82);
clear_hud_element_flags(iconIndex, 0x8000);
iconIndex = create_hud_element(&D_801083D8);
iconIndex = create_hud_element(D_801083D8);
uiStatus->iconIndexC = iconIndex;
set_hud_element_flags(iconIndex, 0x80);
clear_hud_element_flags(iconIndex, 0x8000);
@ -518,11 +530,11 @@ void show_coin_counter(void) {
if (uiStatus->unk_6C[0] == 0) {
set_window_properties(0x14, 0x20, 0xa4, 0x40, 0x14, 0x15, coin_counter_draw_content, 0, -1);
set_window_update(0x14, basic_window_update);
index = create_hud_element(&D_80109270);
index = create_hud_element(D_80109270);
uiStatus->iconIndex10 = index;
set_hud_element_flags(index, 0x80);
set_hud_element_tint(index, 0xff, 0xff, 0xff);
index = create_hud_element(&D_80108558);
index = create_hud_element(D_80108558);
uiStatus->iconIndex11 = index;
set_hud_element_flags(index, 0x80);
set_hud_element_tint(index, 0xff, 0xff, 0xff);

View File

@ -1,11 +1,6 @@
#include "common.h"
#include "camera.h"
void update_camera_mode_0(Camera*);
void update_camera_mode_1(Camera*);
void update_camera_mode_2(Camera*);
void update_camera_mode_4(Camera*);
INCLUDE_ASM(void, "9d10_len_1080", update_camera_mode_4, Camera* camera);
INCLUDE_ASM(void, "9d10_len_1080", update_camera_mode_2, Camera* camera);

View File

@ -14,7 +14,6 @@ extern s16 D_80155D8C;
extern s16 D_80155D8E;
extern s16 D_80155D90;
void delete_shadow(s16);
void draw_item_entities(void);
void func_80132D94(void);

View File

@ -115,7 +115,7 @@ INCLUDE_ASM(s32, "EA0C10", func_80242A14_EA3314);
ApiStatus func_80242A4C_EA334C(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
s32* ptr = evt_get_variable(script, *args);
s32* ptr = (s32*) evt_get_variable(script, *args);
s32 i;
if (ptr != NULL) {

View File

@ -1,7 +1,5 @@
#include "common.h"
void update_camera_mode_6(Camera*);
// types, floats, and other shtuff
#ifdef NON_EQUIVALENT
void update_camera_mode_6(Camera* camera) {

View File

@ -661,10 +661,8 @@ s32 func_80055FF0(s32, s32);
s32 func_8005600C(s32, s32);
s32 func_80056028(s32, u8);
s32 func_80056044(s32, u8);
s32 func_80056068(s32, u8);
void func_8005608C(s32*, s32*);
void func_800560A8(void);
void func_8005610C(void);
void func_80056144(UnkFuncAl, s32);
void func_8005615C(void);
void func_80056180(void);

View File

@ -17,7 +17,7 @@ ApiStatus func_802A9000_428A70(Evt* script, s32 isInitialCall) {
s32 *args = script->ptrReadPos;
BattleStatus* battleStatus = &gBattleStatus;
ActionCommandStatus* actionCommandStatus = &gActionCommandStatus;
HudElement* hudElement;
s32 hudElement;
battleStatus->unk_434 = &D_80294340;
battleStatus->unk_82 = 0;

View File

@ -3,16 +3,16 @@
#define NAMESPACE action_command_body_slam
extern s32 D_80108AFC;
extern s32 D_80108B28;
extern s32 D_8029275C;
extern s32 D_80292BAC;
extern HudElementAnim D_80108AFC[];
extern HudElementAnim D_80108B28[];
extern HudElementAnim D_8029275C[];
extern HudElementAnim D_80292BAC[];
extern s32 D_80294320;
ApiStatus N(CreateHudElements)(Evt* script, s32 isInitialCall) {
ActionCommandStatus* actionCommandStatus = &gActionCommandStatus;
BattleStatus* battleStatus = &gBattleStatus;
HudElement* hudElement;
s32 hudElement;
battleStatus->unk_82 = 100;
battleStatus->unk_434 = &D_80294320;
@ -34,25 +34,25 @@ ApiStatus N(CreateHudElements)(Evt* script, s32 isInitialCall) {
actionCommandStatus->hudElementX = -48;
actionCommandStatus->hudElementY = 80;
hudElement = create_hud_element(&D_80108B28);
hudElement = create_hud_element(D_80108B28);
actionCommandStatus->hudElements[0] = hudElement;
set_hud_element_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY);
set_hud_element_render_depth(hudElement, 0);
set_hud_element_flags(hudElement, 0x82);
hudElement = create_hud_element(&D_80108AFC);
hudElement = create_hud_element(D_80108AFC);
actionCommandStatus->hudElements[1] = hudElement;
set_hud_element_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY + 28);
set_hud_element_render_depth(hudElement, 0);
set_hud_element_flags(hudElement, 0x82);
hudElement = create_hud_element(&D_80292BAC);
hudElement = create_hud_element(D_80292BAC);
actionCommandStatus->hudElements[3] = hudElement;
set_hud_element_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY + 28);
set_hud_element_render_depth(hudElement, 0);
set_hud_element_flags(hudElement, 0x82);
hudElement = create_hud_element(&D_8029275C);
hudElement = create_hud_element(D_8029275C);
actionCommandStatus->hudElements[2] = hudElement;
set_hud_element_render_pos(hudElement, actionCommandStatus->hudElementX + 41, actionCommandStatus->hudElementY + 22);
set_hud_element_render_depth(hudElement, 0);
@ -66,7 +66,7 @@ INCLUDE_ASM(s32, "battle/action_cmd/body_slam", func_802A92D4_4285B4);
void N(draw_hud_elements)(void) {
s32 x, y;
HudElement* hudElement;
s32 hudElement;
draw_hud_element_clipped(gActionCommandStatus.hudElements[0]);
hudElement = gActionCommandStatus.hudElements[1];

View File

@ -4,8 +4,6 @@
#define NAMESPACE action_command_bomb
void btl_set_popup_duration(s32);
void func_80268C9C(void);
void func_80269160(void);
void sfx_adjust_env_sound_params(s32, s32, s32, s32);
extern HudElementAnim D_80108AFC;

View File

@ -9,8 +9,6 @@ extern HudElementAnim D_80108AFC;
extern HudElementAnim D_802928F8;
extern HudElementAnim D_80109244;
s32 func_80268770(s32, s32, s16);
ApiStatus func_802A9000_4233F0(Evt* script, s32 isInitialCall) {
ActionCommandStatus* actionCommandStatus = &gActionCommandStatus;
BattleStatus* battleStatus = &gBattleStatus;
@ -132,7 +130,6 @@ void func_802A96B8_423AA8(void) {
draw_hud_element_clipped(hudElements[3]);
}
void func_802A97FC_423BEC(void) {
free_hud_element(gActionCommandStatus.hudElements[0]);
free_hud_element(gActionCommandStatus.hudElements[1]);

View File

@ -1,8 +1,5 @@
#include "common.h"
void func_80268770(s32, s32, s32);
void func_8026880C(s32, s32, s32);
void N(UnkActionCommandFunc1)(void) {
ActionCommandStatus* actionCommandStatus = &gActionCommandStatus;

View File

@ -3,23 +3,21 @@
#define NAMESPACE action_command_flee
extern s32 D_80108AFC;
extern s32 D_80108B28;
extern s32 D_80109244;
extern s32 D_802928F8;
extern s32 D_80292974;
extern HudElementAnim D_80108AFC[];
extern HudElementAnim D_80108B28[];
extern HudElementAnim D_80109244[];
extern HudElementAnim D_802928F8[];
extern HudElementAnim D_80292974[];
extern s32 D_80294200;
extern s32 D_802A9920;
extern s32 D_80108B80;
extern s32 D_802A9920;
extern s32 D_802A9920;
extern HudElementAnim D_80108B80[];
ApiStatus func_802A9000_422AD0(Evt* script, s32 isInitialCall) {
ActionCommandStatus* actionCommandStatus = &gActionCommandStatus;
BattleStatus* battleStatus = &gBattleStatus;
Bytecode* args = script->ptrReadPos;
s32 xOffset;
HudElement* hudElement;
s32 hudElement;
battleStatus->unk_82 = 0;
battleStatus->unk_434 = &D_80294200;
@ -40,25 +38,25 @@ ApiStatus func_802A9000_422AD0(Evt* script, s32 isInitialCall) {
D_802A9920 = 0;
actionCommandStatus->hudElementY = 80;
hudElement = create_hud_element(&D_80108B28);
hudElement = create_hud_element(D_80108B28);
actionCommandStatus->hudElements[0] = hudElement;
set_hud_element_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY);
set_hud_element_render_depth(hudElement, 0);
set_hud_element_flags(hudElement, 0x82);
hudElement = create_hud_element(&D_80108AFC);
hudElement = create_hud_element(D_80108AFC);
actionCommandStatus->hudElements[1] = hudElement;
set_hud_element_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY + 28);
set_hud_element_render_depth(hudElement, 0);
set_hud_element_flags(hudElement, 0x82);
hudElement = create_hud_element(&D_802928F8);
hudElement = create_hud_element(D_802928F8);
actionCommandStatus->hudElements[2] = hudElement;
set_hud_element_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY + 28);
set_hud_element_render_depth(hudElement, 0);
set_hud_element_flags(hudElement, 0x82);
hudElement = create_hud_element(&D_80109244);
hudElement = create_hud_element(D_80109244);
actionCommandStatus->hudElements[3] = hudElement;
set_hud_element_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY + 28);
set_hud_element_render_depth(hudElement, 0);
@ -68,7 +66,7 @@ ApiStatus func_802A9000_422AD0(Evt* script, s32 isInitialCall) {
set_hud_element_render_pos(actionCommandStatus->hudElements[3], actionCommandStatus->hudElementX - xOffset, actionCommandStatus->hudElementY + 17);
set_hud_element_render_pos(actionCommandStatus->hudElements[2], actionCommandStatus->hudElementX - xOffset, actionCommandStatus->hudElementY - 1);
hudElement = create_hud_element(&D_80292974);
hudElement = create_hud_element(D_80292974);
actionCommandStatus->hudElements[4] = hudElement;
set_hud_element_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY + 28);
set_hud_element_render_depth(hudElement, 0);
@ -98,7 +96,7 @@ ApiStatus func_802A92A0_422D70(Evt* script) {
void func_802A9378_422E48(void) {
s32 temp;
HudElement* hudElement;
s32 hudElement;
BattleStatus* battleStatus = &gBattleStatus;
ActionCommandStatus* actionCommandStatus = &gActionCommandStatus;
@ -144,7 +142,7 @@ void func_802A9378_422E48(void) {
break;
}
set_hud_element_anim(actionCommandStatus->hudElements[0], &D_80108B80);
set_hud_element_anim(actionCommandStatus->hudElements[0], D_80108B80);
D_802A9920 = 1;
actionCommandStatus->state = 11;
actionCommandStatus->unk_54 = actionCommandStatus->unk_52;
@ -209,7 +207,7 @@ void func_802A96F4_4231C4(void) {
s32 y;
s32 x;
s32 temp_a1;
HudElement* hudElement;
s32 hudElement;
s32 temp_v1;
BattleStatus* battleStatus = &gBattleStatus;
@ -236,7 +234,7 @@ void func_802A96F4_4231C4(void) {
if (actionCommandStatus->unk_68 == 0) {
func_80268798(x, y, actionCommandStatus->barFillLevel / 100, 4);
} else {
func_8026880C(x, y, actionCommandStatus->barFillLevel / 100, 4);
func_8026880C(x, y, actionCommandStatus->barFillLevel / 100);
}
}

View File

@ -3,21 +3,21 @@
#define NAMESPACE action_command_hammer
extern s32 D_80108E48;
// icon indexes for hud elements
extern s32 D_802922F0;
extern s32 D_8029275C;
extern s32 D_802927F0;
extern s32 D_80292848;
extern s32 D_802928A0;
extern s32 D_80292A2C;
extern HudElementAnim D_802922F0[];
extern HudElementAnim D_8029275C[];
extern HudElementAnim D_802927F0[];
extern HudElementAnim D_80292848[];
extern HudElementAnim D_802928A0[];
extern HudElementAnim D_80108E48[];
extern HudElementAnim D_80292A2C[];
extern s32 D_802941E0;
ApiStatus N(CreateHudElements)(Evt* script, s32 isInitialCall) {
ActionCommandStatus* actionCommandStatus = &gActionCommandStatus;
BattleStatus* battleStatus = &gBattleStatus;
HudElement* hudElement;
s32 hudElement;
battleStatus->unk_82 = 1;
battleStatus->unk_434 = &D_802941E0;
@ -36,43 +36,43 @@ ApiStatus N(CreateHudElements)(Evt* script, s32 isInitialCall) {
actionCommandStatus->unk_60 = 0;
actionCommandStatus->hudElementY = 96;
hudElement = create_hud_element(&D_802922F0);
hudElement = create_hud_element(D_802922F0);
actionCommandStatus->hudElements[0] = hudElement;
set_hud_element_flags(hudElement, 0x82);
set_hud_element_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY);
set_hud_element_render_depth(hudElement, 10);
hudElement = create_hud_element(&D_8029275C);
hudElement = create_hud_element(D_8029275C);
actionCommandStatus->hudElements[1] = hudElement;
set_hud_element_flags(hudElement, 0x82);
set_hud_element_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY);
set_hud_element_render_depth(hudElement, 0);
hudElement = create_hud_element(&D_802927F0);
hudElement = create_hud_element(D_802927F0);
actionCommandStatus->hudElements[2] = hudElement;
set_hud_element_flags(hudElement, 0x82);
set_hud_element_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY);
set_hud_element_render_depth(hudElement, 0);
hudElement = create_hud_element(&D_80292848);
hudElement = create_hud_element(D_80292848);
actionCommandStatus->hudElements[3] = hudElement;
set_hud_element_flags(hudElement, 0x82);
set_hud_element_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY);
set_hud_element_render_depth(hudElement, 0);
hudElement = create_hud_element(&D_802928A0);
hudElement = create_hud_element(D_802928A0);
actionCommandStatus->hudElements[4] = hudElement;
set_hud_element_flags(hudElement, 0x82);
set_hud_element_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY);
set_hud_element_render_depth(hudElement, 0);
hudElement = create_hud_element(&D_80108E48);
hudElement = create_hud_element(D_80108E48);
actionCommandStatus->hudElements[5] = hudElement;
set_hud_element_flags(hudElement, 0x82);
set_hud_element_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY);
set_hud_element_render_depth(hudElement, 0);
hudElement = create_hud_element(&D_80292A2C);
hudElement = create_hud_element(D_80292A2C);
actionCommandStatus->hudElements[6] = hudElement;
set_hud_element_flags(hudElement, 0x82);
set_hud_element_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY);

View File

@ -3,9 +3,6 @@
#define NAMESPACE action_command_hurricane
void func_80268770(s32, s32, s16);
void func_8026880C(s32, s32, s16);
extern s32 D_80294420;
extern HudElementAnim D_80108AFC;
extern HudElementAnim D_80108B28;

View File

@ -6,12 +6,12 @@
extern s32 D_802941C0;
// icon id's for hud elements
extern s32 D_80108B28;
extern s32 D_80292A2C;
extern s32 D_80108B54;
extern HudElementAnim D_80108B28[];
extern HudElementAnim D_80292A2C[];
extern HudElementAnim D_80108B54[];
ApiStatus N(CreateHudElements)(Evt* script, s32 isInitialCall) {
HudElement* hudElement;
s32 hudElement;
ActionCommandStatus* actionCommandStatus = &gActionCommandStatus;
gBattleStatus.unk_82 = 1;
@ -30,14 +30,14 @@ ApiStatus N(CreateHudElements)(Evt* script, s32 isInitialCall) {
actionCommandStatus->unk_60 = 0;
actionCommandStatus->hudElementY = 80;
hudElement = create_hud_element(&D_80108B28);
hudElement = create_hud_element(D_80108B28);
actionCommandStatus->hudElements[0] = hudElement;
set_hud_element_flags(hudElement, 0x82);
set_hud_element_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY);
set_hud_element_render_depth(hudElement, 0);
set_hud_element_alpha(hudElement, 0xFF);
hudElement = create_hud_element(&D_80292A2C);
hudElement = create_hud_element(D_80292A2C);
actionCommandStatus->hudElements[1] = hudElement;
set_hud_element_flags(hudElement, 0x82);
set_hud_element_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY);
@ -48,7 +48,7 @@ ApiStatus N(CreateHudElements)(Evt* script, s32 isInitialCall) {
}
ApiStatus func_802A9120_421B10(Evt* script, s32 isInitialCall) {
HudElement* hudElement;
s32 hudElement;
ActionCommandStatus* actionCommandStatus = &gActionCommandStatus;
BattleStatus* battleStatus = &gBattleStatus;
@ -84,7 +84,7 @@ ApiStatus func_802A9120_421B10(Evt* script, s32 isInitialCall) {
void N(update)(void) {
ActionCommandStatus* actionCommandStatus = &gActionCommandStatus;
BattleStatus* battleStatus = &gBattleStatus;
HudElement* hudElement;
s32 hudElement;
s32 temp_s0_3;
switch (actionCommandStatus->state) {
@ -126,7 +126,7 @@ void N(update)(void) {
temp_s0_3 = battleStatus->unk_434[actionCommandStatus->unk_50];
if (((actionCommandStatus->unk_4E - temp_s0_3) - 2) <= 0) {
set_hud_element_anim(actionCommandStatus->hudElements[0], &D_80108B54);
set_hud_element_anim(actionCommandStatus->hudElements[0], D_80108B54);
}
if (((battleStatus->currentButtonsPressed & 0x8000) != 0) && (actionCommandStatus->autoSucceed == 0)) {
actionCommandStatus->unk_60 = 1;

View File

@ -13,8 +13,6 @@ extern HudElementAnim D_80108B80;
extern HudElementAnim D_80292374;
void btl_set_popup_duration(s32);
void func_80268C9C(void);
void func_80269160(void);
void sfx_adjust_env_sound_params(s32, s32, s32, s32);
typedef struct structD_802A9930_42E340 {

View File

@ -3,23 +3,16 @@
#define NAMESPACE action_command_power_shock
extern const HudElementAnim D_80108AFC;
extern const HudElementAnim D_80108B28;
extern const HudElementAnim D_80108B80;
extern const HudElementAnim D_80109244;
extern const HudElementAnim D_80292974;
extern const HudElementAnim D_80108AFC[];
extern const HudElementAnim D_80108B28[];
extern const HudElementAnim D_80108B80[];
extern const HudElementAnim D_80109244[];
extern const HudElementAnim D_80292974[];
extern s32 D_802943A0[];
extern s16 D_802A9AA2_42D9B2[];
extern s32 D_802A9B00;
// Function declarations; should ideally be moved to functions.h / 196AA0.c header?
s32 func_80268224(s32);
void func_80268798(s32, s32, s32, s32);
void func_80268834(s32, s32, s32, s32);
void func_80268858(void);
void func_80268C9C(void);
void func_80269118(void);
void func_80269160(void);
ApiStatus N(CreateHudElements)(Evt* script, s32 isInitialCall) {
ActionCommandStatus* actionCommandStatus = &gActionCommandStatus;

View File

@ -4,11 +4,6 @@
#define NAMESPACE action_command_smack
void func_80268C9C(void);
void func_80269160(void);
void func_80268770(s32, s32, s32);
void func_8026880C(s32, s32, s32);
void btl_set_popup_duration(s32 duration);
void sfx_adjust_env_sound_params(s32 soundID, u8 volume, u8 pan, s16 pitchShift);
extern HudElementAnim D_80108AFC;

View File

@ -3,15 +3,15 @@
#define NAMESPACE action_command_spook
extern s32 D_80108AFC;
extern s32 D_80108E1C;
extern s32 D_80292974;
extern HudElementAnim D_80108AFC[];
extern HudElementAnim D_80108E1C[];
extern HudElementAnim D_80292974[];
extern s32 D_80294440;
ApiStatus func_802A9000_430020(void) {
ActionCommandStatus* actionCommandStatus = &gActionCommandStatus;
BattleStatus* battleStatus = &gBattleStatus;
HudElement* hudElement;
s32 hudElement;
battleStatus->unk_82 = 100;
battleStatus->unk_434 = &D_80294440;
@ -34,19 +34,19 @@ ApiStatus func_802A9000_430020(void) {
actionCommandStatus->hudElementX = -48;
actionCommandStatus->hudElementY = 80;
hudElement = create_hud_element(&D_80108E1C);
hudElement = create_hud_element(D_80108E1C);
actionCommandStatus->hudElements[0] = hudElement;
set_hud_element_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY);
set_hud_element_render_depth(hudElement, 0);
set_hud_element_flags(hudElement, 0x82);
hudElement = create_hud_element(&D_80108AFC);
hudElement = create_hud_element(D_80108AFC);
actionCommandStatus->hudElements[1] = hudElement;
set_hud_element_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY + 28);
set_hud_element_render_depth(hudElement, 0);
set_hud_element_flags(hudElement, 0x82);
hudElement = create_hud_element(&D_80292974);
hudElement = create_hud_element(D_80292974);
actionCommandStatus->hudElements[2] = hudElement;
set_hud_element_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY + 28);
set_hud_element_render_depth(hudElement, 0);

View File

@ -3,14 +3,14 @@
#define NAMESPACE action_command_squirt
extern s32 D_80108AFC[];
extern s32 D_80108B28[];
extern HudElementAnim D_80108AFC[];
extern HudElementAnim D_80108B28[];
extern s32 D_80294380;
ApiStatus func_802A9000_429D20(void) {
ActionCommandStatus* actionCommandStatus = &gActionCommandStatus;
BattleStatus* battleStatus = &gBattleStatus;
HudElement* hudElement;
s32 hudElement;
battleStatus->unk_82 = 5;
battleStatus->unk_434 = &D_80294380;

View File

@ -3,14 +3,15 @@
#define NAMESPACE action_command_stop_leech
extern s32 D_80108AFC;
extern s32 D_80108B28;
extern HudElementAnim D_80108B80[];
extern HudElementAnim D_80108AFC[];
extern HudElementAnim D_80108B28[];
extern s32 D_80294260;
ApiStatus func_802A9000_425590(void) {
ActionCommandStatus* actionCommandStatus = &gActionCommandStatus;
BattleStatus* battleStatus = &gBattleStatus;
HudElement* hudElement;
s32 hudElement;
battleStatus->unk_82 = 5;
battleStatus->unk_434 = &D_80294260;
@ -28,13 +29,13 @@ ApiStatus func_802A9000_425590(void) {
actionCommandStatus->unk_48 = 0;
actionCommandStatus->hudElementY = 80;
hudElement = create_hud_element(&D_80108B28);
hudElement = create_hud_element(D_80108B28);
actionCommandStatus->hudElements[0] = hudElement;
set_hud_element_flags(hudElement, 0x82);
set_hud_element_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY);
set_hud_element_render_depth(hudElement, 0);
hudElement = create_hud_element(&D_80108AFC);
hudElement = create_hud_element(D_80108AFC);
actionCommandStatus->hudElements[1] = hudElement;
set_hud_element_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY + 28);
set_hud_element_render_depth(hudElement, 0);
@ -68,12 +69,10 @@ ApiStatus func_802A9110_4256A0(Evt* script) {
return ApiStatus_DONE2;
}
extern s32 D_80108B80;
void func_802A91F8_425788(void) {
BattleStatus* battleStatus = &gBattleStatus;
ActionCommandStatus* actionCommandStatus = &gActionCommandStatus;
HudElement* hudElement;
s32 hudElement;
s16 hudElementX;
switch (actionCommandStatus->state) {
@ -107,7 +106,7 @@ void func_802A91F8_425788(void) {
actionCommandStatus->unk_4E -= 1;
break;
}
set_hud_element_anim(actionCommandStatus->hudElements[0], &D_80108B80);
set_hud_element_anim(actionCommandStatus->hudElements[0], D_80108B80);
actionCommandStatus->barFillLevel = 0;
actionCommandStatus->state = 11;
actionCommandStatus->unk_54 = actionCommandStatus->unk_52;
@ -150,7 +149,7 @@ void func_802A91F8_425788(void) {
void func_802A94A4_425A34(void) {
ActionCommandStatus* actionCommandStatus = &gActionCommandStatus;
s32 x, y;
HudElement* hudElement;
s32 hudElement;
if (actionCommandStatus->unk_6A == 0) {
draw_hud_element_clipped(actionCommandStatus->hudElements[0]);

View File

@ -3,12 +3,12 @@
#define NAMESPACE action_command_tidal_wave
extern s32 D_80108AFC;
extern s32 D_80108B28;
extern HudElementAnim D_80108AFC[];
extern HudElementAnim D_80108B28[]