git subrepo pull --branch=master spm-headers

subrepo:
  subdir:   "spm-headers"
  merged:   "688d955"
upstream:
  origin:   "https://github.com/SeekyCt/spm-headers.git"
  branch:   "master"
  commit:   "688d955"
git-subrepo:
  version:  "0.4.5"
  origin:   "???"
  commit:   "???"
This commit is contained in:
Seeky 2023-09-18 18:09:03 +01:00
parent 214eac5f8e
commit 02cc366992
4 changed files with 18 additions and 18 deletions

View File

@ -5,8 +5,8 @@
;
[subrepo]
remote = https://github.com/SeekyCt/spm-headers.git
branch = spm-decomp
commit = fe088fe1cf6a3fe5beb0fa0457b7228125c3aaf3
parent = ab4cb8c6cc8b7fe30f2d9a9aa6006259ab73033e
branch = master
commit = 688d955223471a9c420c40fe5cfc09bcda1fdef9
parent = 214eac5f8ecaeb4d1a01a5c40f841c4e4a72b47a
method = merge
cmdver = 0.4.5

View File

@ -153,7 +153,7 @@ n.rule(
n.rule(
"decomp_cc",
command = ALLOW_CHAIN + "$cpp -M $in -MF $out.d $cppflags && " \
"$decomp_cc $decomp_cflags $flags -c $in -o $out",
"$decomp_cc $decomp_cxxflags $flags -c $in -o $out",
description = "Decomp CC $in",
deps = "gcc",
depfile = "$out.d"

View File

@ -47,18 +47,18 @@ SIZE_ASSERT(An2_08Work, 0x98)
DECOMP_STATIC(An2_08Work an2_08_wp)
DECOMP_STATIC(const char * lbl_80def2c8[4])
EVT_DECLARE(begin_rpg_parent_evt);
EVT_DECLARE(final_rpg_child_evt);
EVT_DECLARE(underchomp_attack_1_evt);
EVT_DECLARE(underchomp_attack_2_evt);
EVT_DECLARE(underchomp_attack_3_evt);
EVT_DECLARE(rpg_check_win_or_continue_evt);
EVT_DECLARE(rpg_attacking_evt);
EVT_DECLARE(rpg_use_pixls_evt);
EVT_DECLARE(rpg_use_items_evt);
EVT_DECLARE(rpg_run_away_evt);
EVT_DECLARE(rpg_snd_miss_evt);
EVT_DECLARE(rpg_snd_hit_evt);
EVT_DECLARE(begin_rpg_parent_evt)
EVT_DECLARE(final_rpg_child_evt)
EVT_DECLARE(underchomp_attack_1_evt)
EVT_DECLARE(underchomp_attack_2_evt)
EVT_DECLARE(underchomp_attack_3_evt)
EVT_DECLARE(rpg_check_win_or_continue_evt)
EVT_DECLARE(rpg_attacking_evt)
EVT_DECLARE(rpg_use_pixls_evt)
EVT_DECLARE(rpg_use_items_evt)
EVT_DECLARE(rpg_run_away_evt)
EVT_DECLARE(rpg_snd_miss_evt)
EVT_DECLARE(rpg_snd_hit_evt)
UNKNOWN_FUNCTION(func_80c6c908);
u8 rpgHandleMenu(int param_1, RpgMenu * menu);

View File

@ -12,7 +12,7 @@ enum IosOpenMode
/* 0x0 */ IOS_OPEN_NONE = 0,
/* 0x1 */ IOS_OPEN_READ = 1,
/* 0x2 */ IOS_OPEN_WRITE = 2,
/* 0x3 */ IOS_OPEN_READ_WRITE = IOS_OPEN_READ | IOS_OPEN_WRITE,
/* 0x3 */ IOS_OPEN_READ_WRITE = IOS_OPEN_READ | IOS_OPEN_WRITE
};
/*
@ -22,7 +22,7 @@ enum IosSeekMode
{
/* 0x0 */ IOS_SEEK_START,
/* 0x1 */ IOS_SEEK_CURRENT,
/* 0x2 */ IOS_SEEK_END,
/* 0x2 */ IOS_SEEK_END
};
typedef struct