Skip to content

battle2: make BattleSpawnFloatingIconAt and BattleSpawnFloatingIconAtPart non-static #313

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

Closed
j3lee wants to merge 1 commit into from
Closed

battle2: make BattleSpawnFloatingIconAt and BattleSpawnFloatingIconAtPart non-static #313

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 2 additions & 0 deletions src/battle/battle.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -767,6 +767,8 @@ s32 BattleEffectRegister(void (*func)(void));
void BattleSetLoadTimToVram(u_long* addr, s16 imgXY, s16 clutX, s16 clutY);
void BattleEnqueueClearImage(RECT* rect, s32 arg1, s32 arg2, s32 arg3);
void* func_800D29D4(ModelRenderDesc*, u_long**, int, void*);
void BattleSpawnFloatingIconAtPart(s32 actor, s32 arg1, s32 arg2);
void BattleSpawnFloatingIconAt(void* arg0, s32 arg1, s32 arg2);
// Build the model matrix for a battle effect: `scale` goes on the matrix
// diagonal, `pos` is transformed into view space to become the translation,
// and `depthBias` nudges it along that view vector (negative pulls it toward
Expand Down
5 changes: 2 additions & 3 deletions src/battle/battle2.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2439,7 +2439,6 @@ void BattleKeyframeEffectTick(void) {
}
}

static void BattleSpawnFloatingIconAt(void* arg0, s32 arg1, s32 arg2);
void func_800D4C08(SVECTOR* pos, s32 scriptAndFlags, s32 scale, s32 depthBias) {
BattleKeyframeEffectSlot* slot;

Expand All @@ -2451,7 +2450,7 @@ void func_800D4C08(SVECTOR* pos, s32 scriptAndFlags, s32 scale, s32 depthBias) {
slot->depthBias = depthBias;
}

static void BattleSpawnFloatingIconAtPart(s32 actor, s32 arg1, s32 arg2) {
void BattleSpawnFloatingIconAtPart(s32 actor, s32 arg1, s32 arg2) {
SVECTOR pos;

BattleGetPartPosition(actor, g_BattleModels[actor].boneIndices[0], &pos);
Expand All @@ -2460,7 +2459,7 @@ static void BattleSpawnFloatingIconAtPart(s32 actor, s32 arg1, s32 arg2) {

static void BattleSpawnFloatingIcon(s32 actor, s32 arg1) { BattleSpawnFloatingIconAtPart(actor, arg1, 0x1000); }

static void BattleSpawnFloatingIconAt(void* arg0, s32 arg1, s32 arg2) { func_800D4C08(arg0, arg1, 0x1000, arg2); }
void BattleSpawnFloatingIconAt(void* arg0, s32 arg1, s32 arg2) { func_800D4C08(arg0, arg1, 0x1000, arg2); }

INCLUDE_ASM("asm/us/battle/nonmatchings/battle2", func_800D4D90);

Expand Down
Loading