diff --git a/src/fragments/67/fragment67.c b/src/fragments/67/fragment67.c index 143b51b..242c016 100644 --- a/src/fragments/67/fragment67.c +++ b/src/fragments/67/fragment67.c @@ -1,3 +1,5 @@ -#include "global.h" +#include "fragment67.h" -#pragma GLOBAL_ASM("asm/us/nonmatchings/fragments/67/fragment67/func_8F000020.s") +s32 func_8F000020(UNUSED s32 arg0, UNUSED s32 arg1) { + return 2; +} diff --git a/src/fragments/67/fragment67.h b/src/fragments/67/fragment67.h new file mode 100644 index 0000000..cb89ddb --- /dev/null +++ b/src/fragments/67/fragment67.h @@ -0,0 +1,8 @@ +#ifndef _FRAGMENT67_H_ +#define _FRAGMENT67_H_ + +#include "global.h" + +s32 func_8F000020(UNUSED s32 arg0, UNUSED s32 arg1); + +#endif // _FRAGMENT67_H_ diff --git a/src/fragments/68/fragment68.c b/src/fragments/68/fragment68.c index c421f1b..8db0351 100644 --- a/src/fragments/68/fragment68.c +++ b/src/fragments/68/fragment68.c @@ -1,3 +1,7 @@ -#include "global.h" +#include "fragment68.h" +#include "src/29BA0.h" -#pragma GLOBAL_ASM("asm/us/nonmatchings/fragments/68/fragment68/func_8F100020.s") +s32 func_8F100020(UNUSED s32 arg0, UNUSED s32 arg1, UNUSED s32 arg2) { + FRAGMENT_LOAD_AND_CALL2(fragment67, 0, 0); + return 0x80; +} diff --git a/src/fragments/68/fragment68.h b/src/fragments/68/fragment68.h new file mode 100644 index 0000000..f9c79c2 --- /dev/null +++ b/src/fragments/68/fragment68.h @@ -0,0 +1,8 @@ +#ifndef _FRAGMENT68_H_ +#define _FRAGMENT68_H_ + +#include "global.h" + +s32 func_8F100020(UNUSED s32 arg0, UNUSED s32 arg1, UNUSED s32 arg2); + +#endif // _FRAGMENT68_H_ diff --git a/src/fragments/69/fragment69.c b/src/fragments/69/fragment69.c index 26d098c..28f953c 100644 --- a/src/fragments/69/fragment69.c +++ b/src/fragments/69/fragment69.c @@ -1,3 +1,7 @@ -#include "global.h" +#include "fragment69.h" +#include "src/29BA0.h" -#pragma GLOBAL_ASM("asm/us/nonmatchings/fragments/69/fragment69/func_8F200020.s") +s32 func_8F200020(UNUSED s32 arg0, UNUSED s32 arg1, UNUSED s32 arg2) { + FRAGMENT_LOAD_AND_CALL2(fragment67, 0, 0); + return 0x80; +} diff --git a/src/fragments/69/fragment69.h b/src/fragments/69/fragment69.h new file mode 100644 index 0000000..49ed284 --- /dev/null +++ b/src/fragments/69/fragment69.h @@ -0,0 +1,8 @@ +#ifndef _FRAGMENT69_H_ +#define _FRAGMENT69_H_ + +#include "global.h" + +s32 func_8F200020(UNUSED s32 arg0, UNUSED s32 arg1, UNUSED s32 arg2); + +#endif // _FRAGMENT69_H_ diff --git a/src/fragments/70/fragment70.c b/src/fragments/70/fragment70.c index 52cecd7..29c8332 100644 --- a/src/fragments/70/fragment70.c +++ b/src/fragments/70/fragment70.c @@ -1,3 +1,7 @@ -#include "global.h" +#include "fragment70.h" +#include "src/29BA0.h" -#pragma GLOBAL_ASM("asm/us/nonmatchings/fragments/70/fragment70/func_8F300020.s") +s32 func_8F300020(UNUSED s32 arg0, UNUSED s32 arg1) { + FRAGMENT_LOAD_AND_CALL2(fragment67, 0, 0); + return 0x80; +} diff --git a/src/fragments/70/fragment70.h b/src/fragments/70/fragment70.h new file mode 100644 index 0000000..a47b1f1 --- /dev/null +++ b/src/fragments/70/fragment70.h @@ -0,0 +1,8 @@ +#ifndef _FRAGMENT70_H_ +#define _FRAGMENT70_H_ + +#include "global.h" + +s32 func_8F300020(UNUSED s32 arg0, UNUSED s32 arg1); + +#endif // _FRAGMENT70_H_ diff --git a/src/fragments/71/fragment71.c b/src/fragments/71/fragment71.c index 5107b30..56731de 100644 --- a/src/fragments/71/fragment71.c +++ b/src/fragments/71/fragment71.c @@ -1,3 +1,7 @@ -#include "global.h" +#include "fragment71.h" +#include "src/29BA0.h" -#pragma GLOBAL_ASM("asm/us/nonmatchings/fragments/71/fragment71/func_8F400020.s") +s32 func_8F400020(UNUSED s32 arg0, UNUSED s32 arg1) { + FRAGMENT_LOAD_AND_CALL2(fragment67, 0, 0); + return 0x80; +} diff --git a/src/fragments/71/fragment71.h b/src/fragments/71/fragment71.h new file mode 100644 index 0000000..20d7cfb --- /dev/null +++ b/src/fragments/71/fragment71.h @@ -0,0 +1,8 @@ +#ifndef _FRAGMENT71_H_ +#define _FRAGMENT71_H_ + +#include "global.h" + +s32 func_8F400020(UNUSED s32 arg0, UNUSED s32 arg1); + +#endif // _FRAGMENT71_H_ diff --git a/src/fragments/72/fragment72.c b/src/fragments/72/fragment72.c index cb55caa..afea06b 100644 --- a/src/fragments/72/fragment72.c +++ b/src/fragments/72/fragment72.c @@ -1,3 +1,7 @@ -#include "global.h" +#include "fragment72.h" +#include "src/29BA0.h" -#pragma GLOBAL_ASM("asm/us/nonmatchings/fragments/72/fragment72/func_8F500020.s") +s32 func_8F500020(UNUSED s32 arg0, UNUSED s32 arg1, UNUSED s32 arg2) { + FRAGMENT_LOAD_AND_CALL2(fragment67, 0, 0); + return 0x80; +} diff --git a/src/fragments/72/fragment72.h b/src/fragments/72/fragment72.h new file mode 100644 index 0000000..36ac29d --- /dev/null +++ b/src/fragments/72/fragment72.h @@ -0,0 +1,8 @@ +#ifndef _FRAGMENT72_H_ +#define _FRAGMENT72_H_ + +#include "global.h" + +s32 func_8F500020(UNUSED s32 arg0, UNUSED s32 arg1, UNUSED s32 arg2); + +#endif // _FRAGMENT72_H_ diff --git a/src/fragments/73/fragment73.c b/src/fragments/73/fragment73.c index c92bf1c..79b8d7b 100644 --- a/src/fragments/73/fragment73.c +++ b/src/fragments/73/fragment73.c @@ -1,3 +1,7 @@ -#include "global.h" +#include "fragment73.h" +#include "src/29BA0.h" -#pragma GLOBAL_ASM("asm/us/nonmatchings/fragments/73/fragment73/func_8F600020.s") +s32 func_8F600020(UNUSED s32 arg0, UNUSED s32 arg1, UNUSED s32 arg2) { + FRAGMENT_LOAD_AND_CALL2(fragment67, 0, 0); + return 0x80; +} diff --git a/src/fragments/73/fragment73.h b/src/fragments/73/fragment73.h new file mode 100644 index 0000000..f811f7c --- /dev/null +++ b/src/fragments/73/fragment73.h @@ -0,0 +1,8 @@ +#ifndef _FRAGMENT73_H_ +#define _FRAGMENT73_H_ + +#include "global.h" + +s32 func_8F600020(UNUSED s32 arg0, UNUSED s32 arg1, UNUSED s32 arg2); + +#endif // _FRAGMENT73_H_ diff --git a/src/fragments/74/fragment74.c b/src/fragments/74/fragment74.c index cf0b6ed..94f029c 100644 --- a/src/fragments/74/fragment74.c +++ b/src/fragments/74/fragment74.c @@ -1,3 +1,7 @@ -#include "global.h" +#include "fragment74.h" +#include "src/29BA0.h" -#pragma GLOBAL_ASM("asm/us/nonmatchings/fragments/74/fragment74/func_8F700020.s") +s32 func_8F700020(UNUSED s32 arg0, UNUSED s32 arg1, UNUSED s32 arg2) { + FRAGMENT_LOAD_AND_CALL2(fragment67, 0, 0); + return 0x80; +} diff --git a/src/fragments/74/fragment74.h b/src/fragments/74/fragment74.h new file mode 100644 index 0000000..df7f879 --- /dev/null +++ b/src/fragments/74/fragment74.h @@ -0,0 +1,8 @@ +#ifndef _FRAGMENT74_H_ +#define _FRAGMENT74_H_ + +#include "global.h" + +s32 func_8F700020(UNUSED s32 arg0, UNUSED s32 arg1, UNUSED s32 arg2); + +#endif // _FRAGMENT74_H_ diff --git a/src/fragments/76/fragment76.c b/src/fragments/76/fragment76.c index 22d2290..1aeeff0 100644 --- a/src/fragments/76/fragment76.c +++ b/src/fragments/76/fragment76.c @@ -1,3 +1,7 @@ -#include "global.h" +#include "fragment76.h" +#include "src/29BA0.h" -#pragma GLOBAL_ASM("asm/us/nonmatchings/fragments/76/fragment76/func_8FB00020.s") +s32 func_8FB00020(UNUSED s32 arg0, UNUSED s32 arg1) { + FRAGMENT_LOAD_AND_CALL2(fragment67, 0, 0); + return 0x80; +} diff --git a/src/fragments/76/fragment76.h b/src/fragments/76/fragment76.h new file mode 100644 index 0000000..6638cbb --- /dev/null +++ b/src/fragments/76/fragment76.h @@ -0,0 +1,8 @@ +#ifndef _FRAGMENT76_H_ +#define _FRAGMENT76_H_ + +#include "global.h" + +s32 func_8FB00020(UNUSED s32 arg0, UNUSED s32 arg1); + +#endif // _FRAGMENT76_H_ diff --git a/src/fragments/77/fragment77.c b/src/fragments/77/fragment77.c index 8871126..d354456 100644 --- a/src/fragments/77/fragment77.c +++ b/src/fragments/77/fragment77.c @@ -1,3 +1,7 @@ -#include "global.h" +#include "fragment77.h" +#include "src/29BA0.h" -#pragma GLOBAL_ASM("asm/us/nonmatchings/fragments/77/fragment77/func_8FC00020.s") +s32 func_8FC00020(UNUSED s32 arg0, UNUSED s32 arg1) { + FRAGMENT_LOAD_AND_CALL2(fragment67, 0, 0); + return 0x80; +} diff --git a/src/fragments/77/fragment77.h b/src/fragments/77/fragment77.h new file mode 100644 index 0000000..b05218a --- /dev/null +++ b/src/fragments/77/fragment77.h @@ -0,0 +1,8 @@ +#ifndef _FRAGMENT77_H_ +#define _FRAGMENT77_H_ + +#include "global.h" + +s32 func_8FC00020(UNUSED s32 arg0, UNUSED s32 arg1); + +#endif // _FRAGMENT77_H_ diff --git a/yamls/us/rom.yaml b/yamls/us/rom.yaml index 2b4cece..cf03999 100644 --- a/yamls/us/rom.yaml +++ b/yamls/us/rom.yaml @@ -2347,8 +2347,6 @@ - [0x3B8530, textbin, fragments/67/fragment67_header] - [0x3B8550, c, fragments/67/fragment67] - - {vram: 0x8F000030, type: bss, name: fragments/67/fragment67_bss} - - name: fragment67_relocs type: code bss_size: 0x0 @@ -2367,8 +2365,6 @@ - [0x3B8570, textbin, fragments/68/fragment68_header] - [0x3B8590, c, fragments/68/fragment68] - - {vram: 0x8F100080, type: bss, name: fragments/68/fragment68_bss} - - name: fragment68_relocs type: code bss_size: 0x0 @@ -2386,8 +2382,6 @@ - [0x3B8600, textbin, fragments/69/fragment69_header] - [0x3B8620, c, fragments/69/fragment69] - - {vram: 0x8F200080, type: bss, name: fragments/69/fragment69_bss} - - name: fragment69_relocs type: code bss_size: 0x0 @@ -2405,8 +2399,6 @@ - [0x3B8690, textbin, fragments/70/fragment70_header] - [0x3B86B0, c, fragments/70/fragment70] - - {vram: 0x8F300080, type: bss, name: fragments/70/fragment70_bss} - - name: fragment70_relocs type: code bss_size: 0x0 @@ -2424,8 +2416,6 @@ - [0x3B8720, textbin, fragments/71/fragment71_header] - [0x3B8740, c, fragments/71/fragment71] - - {vram: 0x8F400080, type: bss, name: fragments/71/fragment71_bss} - - name: fragment71_relocs type: code bss_size: 0x0 @@ -2443,8 +2433,6 @@ - [0x3B87B0, textbin, fragments/72/fragment72_header] - [0x3B87D0, c, fragments/72/fragment72] - - {vram: 0x8F500080, type: bss, name: fragments/72/fragment72_bss} - - name: fragment72_relocs type: code bss_size: 0x0 @@ -2462,8 +2450,6 @@ - [0x3B8840, textbin, fragments/73/fragment73_header] - [0x3B8860, c, fragments/73/fragment73] - - {vram: 0x8F600080, type: bss, name: fragments/73/fragment73_bss} - - name: fragment73_relocs type: code bss_size: 0x0 @@ -2481,8 +2467,6 @@ - [0x3B88D0, textbin, fragments/74/fragment74_header] - [0x3B88F0, c, fragments/74/fragment74] - - {vram: 0x8F700080, type: bss, name: fragments/74/fragment74_bss} - - name: fragment74_relocs type: code bss_size: 0x0 @@ -2520,8 +2504,6 @@ - [0x3B9590, textbin, fragments/76/fragment76_header] - [0x3B95B0, c, fragments/76/fragment76] - - {vram: 0x8FB00080, type: bss, name: fragments/76/fragment76_bss} - - name: fragment76_relocs type: code bss_size: 0x0 @@ -2539,8 +2521,6 @@ - [0x3B9620, textbin, fragments/77/fragment77_header] - [0x3B9640, c, fragments/77/fragment77] - - {vram: 0x8FC00080, type: bss, name: fragments/77/fragment77_bss} - - name: fragment77_relocs type: code bss_size: 0x0