mirror of
https://github.com/pmret/papermario.git
synced 2024-11-08 12:02:30 +01:00
3315d6010f
* all non-world rodata migrated * data disasm * kinda working * updated yaml * bloop * linker header * configure 2.0 * bin * mass rename to remove code_ * pause rename * battle partner stuff * whew * more renames * more renames * more renaming * it builds! * updates * remove main prefix * one more thing * crc, yay0 * .data, .rodata, .bss * img * dead_atan2 * it buildsgit add -A * split battle/partner/6FAD10 * rm &s on sleepy_sheep syms * sha1sum ninja rule description * OK but commented out PaperMarioMapFS and PaperMarioNpcSprites * uncomment * fix mapfs * match func_8003CFB4 * . * clean up and name npc_iter_no_op * npc.c * enable cc warnings * name npc_find_near * use singular options.asset_path * smores * cc_dsl only when needed * kinda fix configure for splat refactor2 * ok! * new msg format * remove old msg format docs * slight bug fixes, splat adjustment * git subrepo pull (merge) --force tools/splat subrepo: subdir: "tools/splat" merged: "cfc140bb76" upstream: origin: "https://github.com/ethteck/splat.git" branch: "master" commit: "cfc140bb76" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo" commit: "2f68596" * git subrepo pull (merge) --force tools/splat subrepo: subdir: "tools/splat" merged: "85349befcd" upstream: origin: "https://github.com/ethteck/splat.git" branch: "master" commit: "85349befcd" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo" commit: "2f68596" * Update symbol addrs * git subrepo pull tools/splat subrepo: subdir: "tools/splat" merged: "a44631e194" upstream: origin: "https://github.com/ethteck/splat.git" branch: "master" commit: "a44631e194" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo" commit: "2f68596" Co-authored-by: Alex Bates <hi@imalex.xyz>
61 lines
1.3 KiB
C
61 lines
1.3 KiB
C
#include "common.h"
|
|
#include "battle/battle.h"
|
|
|
|
extern s32 D_800DC060;
|
|
extern Stage* D_800DC064;
|
|
|
|
INCLUDE_ASM(s32, "4DF30", func_80072B30);
|
|
|
|
void func_80072BB0(void) {
|
|
func_80072B30();
|
|
}
|
|
|
|
void func_80072BCC(s32 arg0) {
|
|
gBattleStatus.unk_488 = arg0;
|
|
}
|
|
|
|
//weird stuff with loading gBattleStatus
|
|
#ifdef NON_MATCHING
|
|
void load_battle_section(void) {
|
|
BattleArea* battleArea;
|
|
s32 temp_a0;
|
|
|
|
battleArea = &gBattleAreas[gBattleStatus.currentBattleSection];
|
|
dma_copy(battleArea->dmaStart, battleArea->dmaEnd, battleArea->dmaDest);
|
|
|
|
gBattleStatus.unk_48C = &(*battleArea->battles)[gBattleStatus.unk_47B];
|
|
|
|
if (gBattleStatus.unk_47C >= 0) {
|
|
D_800DC064 = NULL;
|
|
} else {
|
|
D_800DC064 = &(*battleArea->stages)[gBattleStatus.unk_47C];
|
|
}
|
|
|
|
func_80241190(1);
|
|
gBattleStatus.unk_460 = 0;
|
|
}
|
|
#else
|
|
INCLUDE_ASM(s32, "4DF30", load_battle_section);
|
|
#endif
|
|
|
|
INCLUDE_ASM(s32, "4DF30", load_battle);
|
|
|
|
void set_battle_stage(s32 arg0) {
|
|
gBattleStatus.unk_47C = arg0;
|
|
}
|
|
|
|
void func_80072CDC(s32 arg0) {
|
|
gBattleStatus.unk_484 = arg0;
|
|
}
|
|
|
|
void func_80072CEC(f32 arg0, f32 arg1, f32 arg2) {
|
|
}
|
|
|
|
void func_80072CF4(void) {
|
|
func_80072CEC(1.0f, 1.1f, 1.2f);
|
|
}
|
|
|
|
INCLUDE_ASM(s32, "4DF30", setup_demo_player);
|
|
|
|
INCLUDE_ASM(s32, "4DF30", load_demo_battle);
|