Game-Decompilation/sotn-decomp
1
0
Fork 0
mirror of https://github.com/Xeeynamo/sotn-decomp.git synced 2024-11-23 04:59:41 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

Change assembly location from asm/ to asm/us/

Browse Source
This commit is contained in:
Luciano Ciccariello 2023-02-21 19:11:05 +00:00
parent 9f76897c04
commit e03a4d15e2
62 changed files with 1504 additions and 1495 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
.gitignore vendored
View File

@ -13,19 +13,19 @@ ctx.c.m2c
generated.symbols.*.txt
__pycache__
asm/*/*.s
asm/*/data/*.s
asm/*/nonmatchings/*.s
asm/*/nonmatchings/*/*.s
asm/*/nonmatchings/*/*/*.s
asm/servant/*/data/*.s
asm/servant/*/nonmatchings/*.s
asm/servant/*/nonmatchings/*/*.s
asm/servant/*/nonmatchings/*/*/*.s
asm/st/*/data/*.s
asm/st/*/nonmatchings/*.s
asm/st/*/nonmatchings/*/*.s
asm/st/*/nonmatchings/*/*/*.s
asm/*/*/*.s
asm/*/*/data/*.s
asm/*/*/nonmatchings/*.s
asm/*/*/nonmatchings/*/*.s
asm/*/*/nonmatchings/*/*/*.s
asm/*/servant/*/data/*.s
asm/*/servant/*/nonmatchings/*.s
asm/*/servant/*/nonmatchings/*/*.s
asm/*/servant/*/nonmatchings/*/*/*.s
asm/*/st/*/data/*.s
asm/*/st/*/nonmatchings/*.s
asm/*/st/*/nonmatchings/*/*.s
asm/*/st/*/nonmatchings/*/*/*.s
assets/
build/
expected/

2
Makefile
View File

@ -19,7 +19,7 @@ CPP_FLAGS += -Iinclude -undef -Wall -lang-c -fno-builtin -gstabs
CPP_FLAGS += -Dmips -D__GNUC__=2 -D__OPTIMIZE__ -D__mips__ -D__mips -Dpsx -D__psx__ -D__psx -D_PSYQ -D__EXTENSIONS__ -D_MIPSEL -D_LANGUAGE_C -DLANGUAGE_C
# Directories
ASM_DIR := asm
ASM_DIR := asm/$(VERSION)
SRC_DIR := src
ASSETS_DIR := assets
INCLUDE_DIR := include

2
README.md
View File

@ -81,7 +81,7 @@ Some non-matching functions are present in the source preprocessed by the macro
1. Run `make clean extract all expected` at least once
1. After setup and build, choose an overlay (eg. `ST/WRP`)
1. Look for one of those functions which hasn't successfully decompiled yet (eg. `INCLUDE_ASM("asm/st/wrp/nonmatchings/6FD0", func_801873A0);`)
1. Look for one of those functions which hasn't successfully decompiled yet (eg. `INCLUDE_ASM("asm/us/st/wrp/nonmatchings/6FD0", func_801873A0);`)
1. Run `./tools/decompile.py func_801873A0` to decompile the function in the C source code where the function is supposed to be located
1. If the function does not compile, try addressing the compilation errors until `make` compiles
1. If the function does not match, invoke `python3 ./tools/asm-differ/diff.py -mwo --overlay st/wrp func_801873A0` and refactor the code until it matches

0
asm/main/psxsdk/libapi1.s → asm/us/main/psxsdk/libapi1.s
View File

0
asm/main/psxsdk/libapi2.s → asm/us/main/psxsdk/libapi2.s
View File

0
asm/main/psxsdk/libc.s → asm/us/main/psxsdk/libc.s
View File

0
asm/main/psxsdk/libcard.s → asm/us/main/psxsdk/libcard.s
View File

2
config/splat.us.dra.yaml
View File

@ -3,7 +3,7 @@ options:
basename: dra
base_path: ..
target_path: iso/DRA.BIN
asm_path: asm/dra
asm_path: asm/us/dra
asset_path: assets/dra
src_path: src/dra
compiler: GCC

2
config/splat.us.main.yaml
View File

@ -3,7 +3,7 @@ options:
basename: main
base_path: ..
target_path: iso/SLUS_000.67
asm_path: asm/main
asm_path: asm/us/main
asset_path: assets/main
src_path: src/main
compiler: GCC

2
config/splat.us.ric.yaml
View File

@ -3,7 +3,7 @@ options:
basename: ric
base_path: ..
target_path: iso/BIN/RIC.BIN
asm_path: asm/ric
asm_path: asm/us/ric
asset_path: assets/ric
src_path: src/ric
compiler: GCC

2
config/splat.us.stcen.yaml
View File

@ -3,7 +3,7 @@ options:
basename: stcen
base_path: ..
target_path: iso/ST/CEN/CEN.BIN
asm_path: asm/st/cen
asm_path: asm/us/st/cen
asset_path: assets/st/cen
src_path: src/st/cen
compiler: GCC

2
config/splat.us.stdre.yaml
View File

@ -3,7 +3,7 @@ options:
basename: stdre
base_path: ..
target_path: iso/ST/DRE/DRE.BIN
asm_path: asm/st/dre
asm_path: asm/us/st/dre
asset_path: assets/st/dre
src_path: src/st/dre
compiler: GCC

2
config/splat.us.stmad.yaml
View File

@ -3,7 +3,7 @@ options:
basename: stmad
base_path: ..
target_path: iso/ST/MAD/MAD.BIN
asm_path: asm/st/mad
asm_path: asm/us/st/mad
asset_path: assets/st/mad
src_path: src/st/mad
compiler: GCC

2
config/splat.us.stno3.yaml
View File

@ -3,7 +3,7 @@ options:
basename: stno3
base_path: ..
target_path: iso/ST/NO3/NO3.BIN
asm_path: asm/st/no3
asm_path: asm/us/st/no3
asset_path: assets/st/no3
src_path: src/st/no3
compiler: GCC

2
config/splat.us.stnp3.yaml
View File

@ -3,7 +3,7 @@ options:
basename: stnp3
base_path: ..
target_path: iso/ST/NP3/NP3.BIN
asm_path: asm/st/np3
asm_path: asm/us/st/np3
asset_path: assets/st/np3
src_path: src/st/np3
compiler: GCC

2
config/splat.us.stnz0.yaml
View File

@ -3,7 +3,7 @@ options:
basename: stnz0
base_path: ..
target_path: iso/ST/NZ0/NZ0.BIN
asm_path: asm/st/nz0
asm_path: asm/us/st/nz0
asset_path: assets/st/nz0
src_path: src/st/nz0
compiler: GCC

2
config/splat.us.strwrp.yaml
View File

@ -3,7 +3,7 @@ options:
basename: strwrp
base_path: ..
target_path: iso/ST/RWRP/RWRP.BIN
asm_path: asm/st/rwrp
asm_path: asm/us/st/rwrp
asset_path: assets/st/rwrp
src_path: src/st/rwrp
compiler: GCC

2
config/splat.us.stsel.yaml
View File

@ -3,7 +3,7 @@ options:
basename: stsel
base_path: ..
target_path: iso/ST/SEL/SEL.BIN
asm_path: asm/st/sel
asm_path: asm/us/st/sel
asset_path: assets/st/sel
src_path: src/st/sel
compiler: GCC

2
config/splat.us.stst0.yaml
View File

@ -3,7 +3,7 @@ options:
basename: stst0
base_path: ..
target_path: iso/ST/ST0/ST0.BIN
asm_path: asm/st/st0
asm_path: asm/us/st/st0
asset_path: assets/st/st0
src_path: src/st/st0
compiler: GCC

2
config/splat.us.stwrp.yaml
View File

@ -3,7 +3,7 @@ options:
basename: stwrp
base_path: ..
target_path: iso/ST/WRP/WRP.BIN
asm_path: asm/st/wrp
asm_path: asm/us/st/wrp
asset_path: assets/st/wrp
src_path: src/st/wrp
compiler: GCC

2
config/splat.us.tt_000.yaml
View File

@ -3,7 +3,7 @@ options:
basename: tt_000
base_path: ..
target_path: iso/SERVANT/TT_000.BIN
asm_path: asm/servant/tt_000
asm_path: asm/us/servant/tt_000
asset_path: assets/servant/tt_000
src_path: src/servant/tt_000
compiler: GCC

14
config/symbols.us.dra.txt
View File

@ -928,14 +928,14 @@ g_volumeR = 0x8013B698;
g_imgUnk8013C200 = 0x8013C200;
g_imgUnk8013C270 = 0x8013C270;
g_StageOverlay = 0x80180000;
EntitySubweaponThrownDagger = 0x80124B88;
EntitySubweaponCrashCrossParticles = 0x80126C48;
EntitySubweaponThrownAxe = 0x80125330;
EntitySubwpnThrownDagger = 0x80124B88;
EntitySubwpnCrashCrossParticles = 0x80126C48;
EntitySubwpnThrownAxe = 0x80125330;
EntityPlayerBlinkWhite = 0x8011BDA4;
EntitySubweaponThrownVibhuti = 0x80128714;
EntitySubwpnThrownVibhuti = 0x80128714;
EntityNumberMovesToHpMeter = 0x80118D0C;
EntitySubweaponCrashCross = 0x801267B0;
EntitySubweaponReboundStone = 0x80127F40;
EntitySubwpnCrashCross = 0x801267B0;
EntitySubwpnReboundStone = 0x80127F40;
EntityLevelUpAnimation = 0x80121980;
EntityHolyWater = 0x80125C2C;
EntityHolyWaterFlame = 0x801262AC;
@ -951,7 +951,7 @@ EntityPlayerPinkEffect = 0x80120AF8;
EntityHolyWaterBreakGlass = 0x80125E68;
EntityStopWatch = 0x8012A89C;
EntityStopWatchExpandingCircle = 0x8012A528;
EntitySubweaponBible = 0x8012B990;
EntitySubwpnBible = 0x8012B990;
EntityBatEcho = 0x8012BEF8;
EntitySummonSpirit = 0x8012A0A4;
EntityTeleport = 0x801243B0;

2
config/symbols.us.stno3.txt
View File

@ -94,7 +94,7 @@ EntityExplosion3 = 0x801CE2F4;
EntityUnkId31 = 0x801CDF10;
EntityUnkId30 = 0x801CDD80;
EntityUnkId2F = 0x801CED60;
EntityStrongWargGroundWaveAttack = 0x801CE98C;
EntityStrongWargWaveAttack = 0x801CE98C;
EntityStrongWarg = 0x801CC974;
EntityHeartRoomGoldDoor = 0x801BC05C;
EntitySwitch = 0x801BBF38;

2
config/symbols.us.stnz0.txt
View File

@ -50,7 +50,7 @@ EntitySkeleton = 0x801C5FC4;
EntitySpittleBone = 0x801C672C;
EntitySpittleBoneSpit = 0x801C6C6C;
EntityTableWithGlobe = 0x801B3534;
EntitySubWeaponPickup = 0x801C7048;
EntitySubwpnPickup = 0x801C7048;
EntityCloseBossRoom = 0x801B3FCC;
EntityBossRoomBlock = 0x801B4518;
EntitySlogra = 0x801B4778;

24
src/dra/42398.c
View File

@ -48,7 +48,7 @@ s32 func_80136010(void);
// matching in gcc 2.6.0 + aspsx 2.3.4
#ifndef NON_MATCHING
INCLUDE_ASM("asm/dra/nonmatchings/42398", func_800E2398);
INCLUDE_ASM("asm/us/dra/nonmatchings/42398", func_800E2398);
#else
u_long* FntFlush(int id);
int FntPrint();
@ -76,11 +76,11 @@ void func_800E2438(const char* str) {
func_800E2398(str);
}
INCLUDE_ASM("asm/dra/nonmatchings/42398", func_800E249C);
INCLUDE_ASM("asm/us/dra/nonmatchings/42398", func_800E249C);
INCLUDE_ASM("asm/dra/nonmatchings/42398", func_800E2824);
INCLUDE_ASM("asm/us/dra/nonmatchings/42398", func_800E2824);
INCLUDE_ASM("asm/dra/nonmatchings/42398", func_800E2B00);
INCLUDE_ASM("asm/us/dra/nonmatchings/42398", func_800E2B00);
void func_800E2E98(s32 colorAdd) {
s32 newColorChannel;
@ -165,7 +165,7 @@ void func_800E2F3C(void) {
// matching in gcc 2.6.0 + aspsx 2.3.4
// https://decomp.me/scratch/NgIDx
#ifndef NON_MATCHING
INCLUDE_ASM("asm/dra/nonmatchings/42398", func_800E31C0);
INCLUDE_ASM("asm/us/dra/nonmatchings/42398", func_800E31C0);
#else
void func_800E31C0(void) {
if ((D_800BD1C0 != 0) && (D_80138FB0 != 3)) {
@ -184,7 +184,7 @@ void func_800E31C0(void) {
// TODO: fix branching
// https://decomp.me/scratch/y3otf
#ifndef NON_EQUIVALENT
INCLUDE_ASM("asm/dra/nonmatchings/42398", func_800E3278);
INCLUDE_ASM("asm/us/dra/nonmatchings/42398", func_800E3278);
#else
extern s32 D_800BD1C8;
extern s32 D_800BD1CC;
@ -323,7 +323,7 @@ void func_800E376C(void) {
// https://decomp.me/scratch/Ocshz
// mips to c doesn't support this function very well
INCLUDE_ASM("asm/dra/nonmatchings/42398", func_800E385C);
INCLUDE_ASM("asm/us/dra/nonmatchings/42398", func_800E385C);
void func_800E38CC(void) {
if (D_800A015C != 0) {
@ -557,14 +557,14 @@ void func_800E4124(s32 context) {
g_backbufferY = 0;
}
INCLUDE_ASM("asm/dra/nonmatchings/42398", func_800E414C);
INCLUDE_ASM("asm/us/dra/nonmatchings/42398", func_800E414C);
void ClearBackbuffer(void) { ClearImage(&c_backbufferClear, 0, 0, 0); }
// TODO aspatch jump points to the wrong instruction,
// otherwise this is fully decompiled
#ifndef NON_EQUIVALENT
INCLUDE_ASM("asm/dra/nonmatchings/42398", func_800E451C);
INCLUDE_ASM("asm/us/dra/nonmatchings/42398", func_800E451C);
#else
void func_800E451C(void) {
@ -697,7 +697,7 @@ void func_800E4970(void) {
void func_800E4A04(void) { s32 pad[3]; }
INCLUDE_ASM("asm/dra/nonmatchings/42398", func_800E4A14);
INCLUDE_ASM("asm/us/dra/nonmatchings/42398", func_800E4A14);
void func_800E5358(void) {
POLY_GT4* poly = &D_80086FEC[D_8013640C];
@ -740,9 +740,9 @@ void func_800E5498(void) {
D_80097930[0]++;
}
INCLUDE_ASM("asm/dra/nonmatchings/42398", func_800E5584);
INCLUDE_ASM("asm/us/dra/nonmatchings/42398", func_800E5584);
INCLUDE_ASM("asm/dra/nonmatchings/42398", func_800E5D30);
INCLUDE_ASM("asm/us/dra/nonmatchings/42398", func_800E5D30);
void func_800E6218(void) {
if (D_8006CBC4 != 0) {

2
src/dra/46358.c
View File

@ -1,3 +1,3 @@
#include "dra.h"
INCLUDE_ASM("asm/dra/nonmatchings/46358", func_800E6358);
INCLUDE_ASM("asm/us/dra/nonmatchings/46358", func_800E6358);

2
src/dra/46FD4.c
View File

@ -181,7 +181,7 @@ void func_800E7458(void) {
}
}
INCLUDE_ASM("asm/dra/nonmatchings/46FD4", func_800E768C);
INCLUDE_ASM("asm/us/dra/nonmatchings/46FD4", func_800E768C);
void func_800E7AEC(void) {
switch (D_8003C734) {

188
src/dra/47BB8.c
View File

@ -5,7 +5,7 @@
s32 DecompressData(u8* dst, u8* src);
INCLUDE_ASM("asm/dra/nonmatchings/47BB8", func_800E7BB8);
INCLUDE_ASM("asm/us/dra/nonmatchings/47BB8", func_800E7BB8);
void func_800E7D08(void) {
s32 i;
@ -20,7 +20,7 @@ void func_800E7D08(void) {
#ifndef NON_EQUIVALENT
void LoadStageTileset(u32* pTilesetData, s16 y);
INCLUDE_ASM("asm/dra/nonmatchings/47BB8", LoadStageTileset);
INCLUDE_ASM("asm/us/dra/nonmatchings/47BB8", LoadStageTileset);
#else
void LoadStageTileset(u32* pTilesetData, s16 y) {
RECT sp10;
@ -51,7 +51,7 @@ void LoadStageTileset(u32* pTilesetData, s16 y) {
// Not matching due to case 2/11
#ifndef NON_EQUIVALENT
INCLUDE_ASM("asm/dra/nonmatchings/47BB8", func_800E7E08);
INCLUDE_ASM("asm/us/dra/nonmatchings/47BB8", func_800E7E08);
#else
void LoadStageTileset(u32* pTilesetData, s16 y);
extern u32 g_Clut;
@ -179,7 +179,7 @@ s32 func_800E7E08(u32 arg0) {
}
#endif
INCLUDE_ASM("asm/dra/nonmatchings/47BB8", func_800E81FC);
INCLUDE_ASM("asm/us/dra/nonmatchings/47BB8", func_800E81FC);
void func_800E8D24(void) {
s8* ptr;
@ -195,7 +195,7 @@ void func_800E8D24(void) {
}
// https://decomp.me/scratch/YhofM
INCLUDE_ASM("asm/dra/nonmatchings/47BB8", func_800E8D54);
INCLUDE_ASM("asm/us/dra/nonmatchings/47BB8", func_800E8D54);
void func_800E8D54(void);
void InitializePads(void) {
@ -228,7 +228,7 @@ void ReadPads(void) {
func_800E8D54();
}
INCLUDE_ASM("asm/dra/nonmatchings/47BB8", func_800E8EE4);
INCLUDE_ASM("asm/us/dra/nonmatchings/47BB8", func_800E8EE4);
s32 func_800E908C(void) {
if (TestEvent(D_80073068) == 1) {
@ -293,7 +293,7 @@ void func_800E92F4(void) {
D_8013B3D0 = 0;
}
INCLUDE_ASM("asm/dra/nonmatchings/47BB8", func_800E930C);
INCLUDE_ASM("asm/us/dra/nonmatchings/47BB8", func_800E930C);
extern Unkstruct_8013B15C D_8013B15C[];
@ -303,7 +303,7 @@ s32 func_800E9508(s32 arg0) {
return temp;
}
INCLUDE_ASM("asm/dra/nonmatchings/47BB8", func_800E9530);
INCLUDE_ASM("asm/us/dra/nonmatchings/47BB8", func_800E9530);
u8 func_800E9610(u32 arg0, u32 arg1) { return D_8013B160[arg0].unk0[arg1]; }
@ -385,7 +385,7 @@ s32 func_800E9804(s32 arg0) {
return ret;
}
INCLUDE_ASM("asm/dra/nonmatchings/47BB8", func_800E9880);
INCLUDE_ASM("asm/us/dra/nonmatchings/47BB8", func_800E9880);
s32 func_800E9B18(s32 arg0, s32 arg1) {
char buffer[0x8];
@ -429,14 +429,14 @@ void GetSaveIcon(u8* dst, s32 iconIdx) {
}
}
INCLUDE_ASM("asm/dra/nonmatchings/47BB8", func_800E9C14);
INCLUDE_ASM("asm/us/dra/nonmatchings/47BB8", func_800E9C14);
INCLUDE_ASM("asm/dra/nonmatchings/47BB8", func_800EA2B0);
INCLUDE_ASM("asm/us/dra/nonmatchings/47BB8", func_800EA2B0);
// This function matches in PSY-Q 3.5: GCC 2.6.0 + aspsx 2.3.4
// probably aspsx
#ifndef NON_MATCHING
INCLUDE_ASM("asm/dra/nonmatchings/47BB8", func_800EA48C);
INCLUDE_ASM("asm/us/dra/nonmatchings/47BB8", func_800EA48C);
#else
extern const char aBaslus00067dra[];
@ -489,7 +489,7 @@ void func_800EA5AC(u16 arg0, u8 arg1, u8 arg2, u8 arg3) {
}
#ifndef NON_EQUIVALENT
INCLUDE_ASM("asm/dra/nonmatchings/47BB8", func_800EA5E4);
INCLUDE_ASM("asm/us/dra/nonmatchings/47BB8", func_800EA5E4);
#else
extern s32 D_8003C78C;
extern s32* D_800A3BB8[];
@ -556,9 +556,9 @@ void func_800EA5E4(s32 arg0) {
}
#endif
INCLUDE_ASM("asm/dra/nonmatchings/47BB8", func_800EA720);
INCLUDE_ASM("asm/us/dra/nonmatchings/47BB8", func_800EA720);
INCLUDE_ASM("asm/dra/nonmatchings/47BB8", func_800EA7CC);
INCLUDE_ASM("asm/us/dra/nonmatchings/47BB8", func_800EA7CC);
s32 func_800EAD0C(void) { // the return type is needed for matching
func_800EA5E4(4);
@ -625,7 +625,7 @@ void func_800EAEEC(void) {
// ASPSX
#ifndef NON_MATCHING
INCLUDE_ASM("asm/dra/nonmatchings/47BB8", func_800EAF28);
INCLUDE_ASM("asm/us/dra/nonmatchings/47BB8", func_800EAF28);
#else
void func_800EAF28(s32 arg0) {
s32 temp_v1;
@ -686,7 +686,7 @@ u32 DecompressReadNibble(void) {
// reg swap + fake stuff
#ifndef NON_MATCHING
INCLUDE_ASM("asm/dra/nonmatchings/47BB8", DecompressData);
INCLUDE_ASM("asm/us/dra/nonmatchings/47BB8", DecompressData);
#else
s32 DecompressData(u8* dst, u8* src) {
u32 buf[8];
@ -791,13 +791,13 @@ s32 DecompressData(u8* dst, u8* src) {
}
#endif
INCLUDE_ASM("asm/dra/nonmatchings/47BB8", func_800EB314);
INCLUDE_ASM("asm/us/dra/nonmatchings/47BB8", func_800EB314);
void func_800EB4F8(PixPattern* pix, s32 bitDepth, s32 x, s32 y) {
LoadTPage(pix + 1, bitDepth, 0, x, y, (int)pix->w, (int)pix->h);
}
INCLUDE_ASM("asm/dra/nonmatchings/47BB8", func_800EB534);
INCLUDE_ASM("asm/us/dra/nonmatchings/47BB8", func_800EB534);
void func_800EB6B4(void) {
s32 i;
@ -822,7 +822,7 @@ bool func_800EB720(void) {
return false;
}
INCLUDE_ASM("asm/dra/nonmatchings/47BB8", func_800EB758);
INCLUDE_ASM("asm/us/dra/nonmatchings/47BB8", func_800EB758);
// clears out each entity struct 1 byte at a time
void func_800EBB70(void) {
@ -841,11 +841,11 @@ void func_800EBB70(void) {
}
}
INCLUDE_ASM("asm/dra/nonmatchings/47BB8", func_800EBBAC);
INCLUDE_ASM("asm/us/dra/nonmatchings/47BB8", func_800EBBAC);
// The loop at the end is weird, the rest is matching
#ifndef NON_EQUIVALENT
INCLUDE_ASM("asm/dra/nonmatchings/47BB8", func_800ECBF8);
INCLUDE_ASM("asm/us/dra/nonmatchings/47BB8", func_800ECBF8);
#else
typedef struct {
s16 unk00, unk02;
@ -955,11 +955,11 @@ void func_800ECE2C(void) {
}
}
INCLUDE_ASM("asm/dra/nonmatchings/47BB8", func_800ECE58);
INCLUDE_ASM("asm/us/dra/nonmatchings/47BB8", func_800ECE58);
INCLUDE_ASM("asm/dra/nonmatchings/47BB8", SetRoomForegroundLayer);
INCLUDE_ASM("asm/us/dra/nonmatchings/47BB8", SetRoomForegroundLayer);
INCLUDE_ASM("asm/dra/nonmatchings/47BB8", SetRoomBackgroundLayer);
INCLUDE_ASM("asm/us/dra/nonmatchings/47BB8", SetRoomBackgroundLayer);
extern Unkstruct_8003C794* D_8003C794;
@ -1019,7 +1019,7 @@ DR_ENV* func_800EDB08(POLY_GT4* poly) {
return NULL;
}
INCLUDE_ASM("asm/dra/nonmatchings/47BB8", func_800EDB58);
INCLUDE_ASM("asm/us/dra/nonmatchings/47BB8", func_800EDB58);
s32 AllocPolygons(u8 primitives, s32 count) {
s32 polyIndex = 0;
@ -1110,13 +1110,13 @@ void FreePolygons(s32 polygonIndex) {
}
}
INCLUDE_ASM("asm/dra/nonmatchings/47BB8", func_800EDEDC);
INCLUDE_ASM("asm/us/dra/nonmatchings/47BB8", func_800EDEDC);
INCLUDE_ASM("asm/dra/nonmatchings/47BB8", CheckCollision);
INCLUDE_ASM("asm/us/dra/nonmatchings/47BB8", CheckCollision);
INCLUDE_ASM("asm/dra/nonmatchings/47BB8", func_800EFBF8);
INCLUDE_ASM("asm/us/dra/nonmatchings/47BB8", func_800EFBF8);
INCLUDE_ASM("asm/dra/nonmatchings/47BB8", func_800F0334);
INCLUDE_ASM("asm/us/dra/nonmatchings/47BB8", func_800F0334);
extern Unkstruct_aSimCBinDemoKey aSimCBinDemoKey;
@ -1166,7 +1166,7 @@ void func_800F0578(s32 arg0) {
}
}
INCLUDE_ASM("asm/dra/nonmatchings/47BB8", func_800F0608);
INCLUDE_ASM("asm/us/dra/nonmatchings/47BB8", func_800F0608);
s32 func_800F087C(u32 chunkX, u32 chunkY) {
RoomBossTeleport* phi_s1;
@ -1185,10 +1185,10 @@ s32 func_800F087C(u32 chunkX, u32 chunkY) {
}
}
INCLUDE_ASM("asm/dra/nonmatchings/47BB8", func_800F0940);
INCLUDE_ASM("asm/us/dra/nonmatchings/47BB8", func_800F0940);
#ifndef NON_EQUIVALENT
INCLUDE_ASM("asm/dra/nonmatchings/47BB8", SetNextRoomToLoad);
INCLUDE_ASM("asm/us/dra/nonmatchings/47BB8", SetNextRoomToLoad);
#else
bool SetNextRoomToLoad(u32 chunkX, u32 chunkY) {
s32 res;
@ -1223,7 +1223,7 @@ loop_3:
#endif
#ifndef NON_EQUIVALENT
INCLUDE_ASM("asm/dra/nonmatchings/47BB8", func_800F0CD8);
INCLUDE_ASM("asm/us/dra/nonmatchings/47BB8", func_800F0CD8);
#else
extern s16 D_80072F98;
extern s32 D_801375A4;
@ -1390,7 +1390,7 @@ void func_800F1424(void) {
}
}
INCLUDE_ASM("asm/dra/nonmatchings/47BB8", func_800F14CC);
INCLUDE_ASM("asm/us/dra/nonmatchings/47BB8", func_800F14CC);
s32 func_800F16D0(void) {
if (D_8003C730 != 0)
@ -1430,9 +1430,9 @@ u8 func_800F17C8(s8 arg0[], s32 arg1, s32 arg2) {
}
}
INCLUDE_ASM("asm/dra/nonmatchings/47BB8", func_800F180C);
INCLUDE_ASM("asm/us/dra/nonmatchings/47BB8", func_800F180C);
INCLUDE_ASM("asm/dra/nonmatchings/47BB8", func_800F1868);
INCLUDE_ASM("asm/us/dra/nonmatchings/47BB8", func_800F1868);
void func_800F18C4(s32 arg0, s32 arg1) {
s8 sp10[20];
@ -1449,7 +1449,7 @@ void func_800F18C4(s32 arg0, s32 arg1) {
func_800F1868(arg0, arg1, &sp10);
}
INCLUDE_ASM("asm/dra/nonmatchings/47BB8", func_800F1954);
INCLUDE_ASM("asm/us/dra/nonmatchings/47BB8", func_800F1954);
void func_800F1A3C(s32 arg0) {
if (arg0 == 0) {
@ -1469,20 +1469,20 @@ void func_800F1A3C(s32 arg0) {
}
}
INCLUDE_ASM("asm/dra/nonmatchings/47BB8", func_800F1B08);
INCLUDE_ASM("asm/us/dra/nonmatchings/47BB8", func_800F1B08);
INCLUDE_ASM("asm/dra/nonmatchings/47BB8", func_800F1D54);
INCLUDE_ASM("asm/us/dra/nonmatchings/47BB8", func_800F1D54);
INCLUDE_ASM("asm/dra/nonmatchings/47BB8", func_800F1EB0);
INCLUDE_ASM("asm/us/dra/nonmatchings/47BB8", func_800F1EB0);
void func_800F1FC4(s32 arg0) {
func_800F1EB0((playerX >> 8) + g_CurrentRoom.left,
(playerY >> 8) + g_CurrentRoom.top, arg0);
}
INCLUDE_ASM("asm/dra/nonmatchings/47BB8", func_800F2014);
INCLUDE_ASM("asm/us/dra/nonmatchings/47BB8", func_800F2014);
INCLUDE_ASM("asm/dra/nonmatchings/47BB8", func_800F2120);
INCLUDE_ASM("asm/us/dra/nonmatchings/47BB8", func_800F2120);
void func_800F223C(void) {
g_StageId ^= 0x20;
@ -1490,7 +1490,7 @@ void func_800F223C(void) {
g_StageId ^= 0x20;
}
INCLUDE_ASM("asm/dra/nonmatchings/47BB8", func_800F2288);
INCLUDE_ASM("asm/us/dra/nonmatchings/47BB8", func_800F2288);
void func_800F2404(s32 arg0) {
s32* temp;
@ -1536,7 +1536,7 @@ void func_800F2404(s32 arg0) {
}
#ifndef NON_EQUIVALENT
INCLUDE_ASM("asm/dra/nonmatchings/47BB8", func_800F24F4);
INCLUDE_ASM("asm/us/dra/nonmatchings/47BB8", func_800F24F4);
#else
void func_801042C4(s32);
void func_80105428();
@ -1588,7 +1588,7 @@ block_18:
}
#endif
INCLUDE_ASM("asm/dra/nonmatchings/47BB8", func_800F2658);
INCLUDE_ASM("asm/us/dra/nonmatchings/47BB8", func_800F2658);
bool func_800F27F4(s32 arg0) {
if (arg0 == 0) {
@ -1601,11 +1601,11 @@ bool func_800F27F4(s32 arg0) {
D_801375C8 = 8;
}
INCLUDE_ASM("asm/dra/nonmatchings/47BB8", func_800F2860);
INCLUDE_ASM("asm/us/dra/nonmatchings/47BB8", func_800F2860);
INCLUDE_ASM("asm/dra/nonmatchings/47BB8", func_800F298C);
INCLUDE_ASM("asm/us/dra/nonmatchings/47BB8", func_800F298C);
INCLUDE_ASM("asm/dra/nonmatchings/47BB8", func_800F483C);
INCLUDE_ASM("asm/us/dra/nonmatchings/47BB8", func_800F483C);
bool IsAlucart(void) {
if (CheckEquipmentItemCount(0xA8, 0) && CheckEquipmentItemCount(0xA7, 0) &&
@ -1614,9 +1614,9 @@ bool IsAlucart(void) {
return false;
}
INCLUDE_ASM("asm/dra/nonmatchings/47BB8", func_800F4994);
INCLUDE_ASM("asm/us/dra/nonmatchings/47BB8", func_800F4994);
INCLUDE_ASM("asm/dra/nonmatchings/47BB8", func_800F4D38);
INCLUDE_ASM("asm/us/dra/nonmatchings/47BB8", func_800F4D38);
void func_800F4F48(void) {
s32 i;
@ -1627,7 +1627,7 @@ void func_800F4F48(void) {
}
}
INCLUDE_ASM("asm/dra/nonmatchings/47BB8", func_800F4FD0);
INCLUDE_ASM("asm/us/dra/nonmatchings/47BB8", func_800F4FD0);
void func_800F53A4(void) {
func_800F4994();
@ -1791,13 +1791,13 @@ bool ScissorSprite(SPRT* sprite, MenuContext* context) {
return false;
}
INCLUDE_ASM("asm/dra/nonmatchings/47BB8", func_800F5904);
INCLUDE_ASM("asm/us/dra/nonmatchings/47BB8", func_800F5904);
void func_800F5A90(void) {
func_800F5904(NULL, 96, 96, 64, 64, 0, 0, 0, 0x114, 1, 0);
}
INCLUDE_ASM("asm/dra/nonmatchings/47BB8", func_800F5AE4);
INCLUDE_ASM("asm/us/dra/nonmatchings/47BB8", func_800F5AE4);
void DrawMenuSprite(MenuContext* context, s32 x, s32 y, s32 width, s32 height,
s32 u, s32 v, s32 clut, s32 tpage, s32 arg9,
@ -1844,7 +1844,7 @@ void DrawMenuSprite(MenuContext* context, s32 x, s32 y, s32 width, s32 height,
// Matches with gcc 2.6.0 + aspsx 2.3.4
#ifndef NON_MATCHING
INCLUDE_ASM("asm/dra/nonmatchings/47BB8", DrawMenuRect);
INCLUDE_ASM("asm/us/dra/nonmatchings/47BB8", DrawMenuRect);
#else
// NOTE: used to draw the menu cursor
void DrawMenuRect(MenuContext* context, s32 posX, s32 posY, s32 width,
@ -1893,7 +1893,7 @@ void func_800F5E68(MenuContext* context, s32 iOption, s32 x, s32 y, s32 w,
DrawMenuRect(context, x, y + (iOption * (h + yGap)), w, h, r, 0, 0);
}
INCLUDE_ASM("asm/dra/nonmatchings/47BB8", DrawRelicsMenu);
INCLUDE_ASM("asm/us/dra/nonmatchings/47BB8", DrawRelicsMenu);
void DrawMenuAlucardPortrait(MenuContext* ctx) {
DrawMenuSprite(ctx, 0x10, 0x24, 0x40, 0x40, 0, 0x80, 0x150, 0x9C, 1, 0, 0);
@ -1907,7 +1907,7 @@ s32 func_800F62E8(s32 context) {
}
// Apply cloak palette
INCLUDE_ASM("asm/dra/nonmatchings/47BB8", func_800F6304);
INCLUDE_ASM("asm/us/dra/nonmatchings/47BB8", func_800F6304);
void DrawMenuAlucardCloakPreview(MenuContext* ctx) {
DrawMenuSprite(ctx, 0xC0, 0x80, 0x20, 0x40, 0, 0xB0, 0x100, 7, 1, 0, 2);
@ -1987,7 +1987,7 @@ void DrawMenuChar(char ch, int x, int y, MenuContext* context) {
0x196, 0x1E, 1, 0);
}
INCLUDE_ASM("asm/dra/nonmatchings/47BB8", DrawMenuStr);
INCLUDE_ASM("asm/us/dra/nonmatchings/47BB8", DrawMenuStr);
// https://decomp.me/scratch/S4Dzb
void DrawMenuInt(s32 digit, s32 x, s32 y, MenuContext* context) {
@ -1998,23 +1998,23 @@ void DrawMenuInt(s32 digit, s32 x, s32 y, MenuContext* context) {
} while (digit != 0);
}
INCLUDE_ASM("asm/dra/nonmatchings/47BB8", func_800F6998);
INCLUDE_ASM("asm/us/dra/nonmatchings/47BB8", func_800F6998);
void func_800F6A48(void) {
func_800EA538(6);
func_800EA5E4(0x411);
}
INCLUDE_ASM("asm/dra/nonmatchings/47BB8", func_800F6A70);
INCLUDE_ASM("asm/us/dra/nonmatchings/47BB8", func_800F6A70);
INCLUDE_ASM("asm/dra/nonmatchings/47BB8", func_800F6BEC);
INCLUDE_ASM("asm/us/dra/nonmatchings/47BB8", func_800F6BEC);
INCLUDE_ASM("asm/dra/nonmatchings/47BB8", func_800F6CC0);
INCLUDE_ASM("asm/us/dra/nonmatchings/47BB8", func_800F6CC0);
INCLUDE_ASM("asm/dra/nonmatchings/47BB8", func_800F6DC8);
INCLUDE_ASM("asm/us/dra/nonmatchings/47BB8", func_800F6DC8);
#ifndef NON_MATCHING
INCLUDE_ASM("asm/dra/nonmatchings/47BB8", DrawSettingsButton);
INCLUDE_ASM("asm/us/dra/nonmatchings/47BB8", DrawSettingsButton);
#else
extern s32 g_menuButtonSettingsCursorPos;
extern s32 g_menuButtonSettingsConfig[];
@ -2091,10 +2091,10 @@ void func_800F7244(void) {
}
}
INCLUDE_ASM("asm/dra/nonmatchings/47BB8", func_800F72BC);
INCLUDE_ASM("asm/us/dra/nonmatchings/47BB8", func_800F72BC);
#ifndef NON_EQUIVALENT
INCLUDE_ASM("asm/dra/nonmatchings/47BB8", DrawPauseMenu);
INCLUDE_ASM("asm/us/dra/nonmatchings/47BB8", DrawPauseMenu);
#else
void func_800F6998(s32, s32 x, s32 y, MenuContext*, s32);
extern s32 g_menuButtonSettingsCursorPos;
@ -2276,9 +2276,9 @@ void DrawPauseMenu(s32 arg0) {
}
#endif
INCLUDE_ASM("asm/dra/nonmatchings/47BB8", DrawSpellMenu);
INCLUDE_ASM("asm/us/dra/nonmatchings/47BB8", DrawSpellMenu);
INCLUDE_ASM("asm/dra/nonmatchings/47BB8", func_800F7F64);
INCLUDE_ASM("asm/us/dra/nonmatchings/47BB8", func_800F7F64);
void func_800F82F4(void) {
RECT dstRect;
@ -2295,9 +2295,9 @@ void func_800F82F4(void) {
LoadImage(&dstRect, (u_long*)g_imgUnk8013C270->data);
}
INCLUDE_ASM("asm/dra/nonmatchings/47BB8", DrawSystemMenu);
INCLUDE_ASM("asm/us/dra/nonmatchings/47BB8", DrawSystemMenu);
INCLUDE_ASM("asm/dra/nonmatchings/47BB8", func_800F84CC);
INCLUDE_ASM("asm/us/dra/nonmatchings/47BB8", func_800F84CC);
void func_800F86E4(void) {
s32 i;
@ -2360,7 +2360,7 @@ void func_800F892C(s32 index, s32 x, s32 y, MenuContext* context) {
// does not match due to stack bigger than expected
// matches in gcc 2.6.0 + aspsx 2.3.4
#ifndef NON_MATCHING
INCLUDE_ASM("asm/dra/nonmatchings/47BB8", func_800F8990);
INCLUDE_ASM("asm/us/dra/nonmatchings/47BB8", func_800F8990);
#else
void func_800F8990(MenuContext* ctx, s32 x, s32 y) {
const s32 Cols = 2;
@ -2434,11 +2434,11 @@ void func_800F8990(MenuContext* ctx, s32 x, s32 y) {
}
#endif
INCLUDE_ASM("asm/dra/nonmatchings/47BB8", func_800F8C98);
INCLUDE_ASM("asm/us/dra/nonmatchings/47BB8", func_800F8C98);
INCLUDE_ASM("asm/dra/nonmatchings/47BB8", func_800F8E18);
INCLUDE_ASM("asm/us/dra/nonmatchings/47BB8", func_800F8E18);
INCLUDE_ASM("asm/dra/nonmatchings/47BB8", func_800F8F28);
INCLUDE_ASM("asm/us/dra/nonmatchings/47BB8", func_800F8F28);
void func_800F9690(void) {
POLY_GT4* poly = &D_80086FEC[D_8013783C];
@ -2518,9 +2518,9 @@ void func_800F9808(u32 arg0) {
LoadTPage(oldPos, 0, 0, 0x180, arg0, temp_s0 + 256, 16);
}
INCLUDE_ASM("asm/dra/nonmatchings/47BB8", func_800F98AC);
INCLUDE_ASM("asm/us/dra/nonmatchings/47BB8", func_800F98AC);
INCLUDE_ASM("asm/dra/nonmatchings/47BB8", func_800F99B8);
INCLUDE_ASM("asm/us/dra/nonmatchings/47BB8", func_800F99B8);
void func_800F9D40(s32 arg0, s32 arg1, s32 arg2) {
if (arg2 != 0) {
@ -2553,23 +2553,23 @@ void func_800F9DD0(u8* arg0, u8* arg1) {
}
// https://decomp.me/scratch/VmuNt 99.46%
INCLUDE_ASM("asm/dra/nonmatchings/47BB8", func_800F9E18);
INCLUDE_ASM("asm/us/dra/nonmatchings/47BB8", func_800F9E18);
INCLUDE_ASM("asm/dra/nonmatchings/47BB8", func_800F9F40);
INCLUDE_ASM("asm/us/dra/nonmatchings/47BB8", func_800F9F40);
INCLUDE_ASM("asm/dra/nonmatchings/47BB8", func_800FA034);
INCLUDE_ASM("asm/us/dra/nonmatchings/47BB8", func_800FA034);
INCLUDE_ASM("asm/dra/nonmatchings/47BB8", func_800FA3C4);
INCLUDE_ASM("asm/us/dra/nonmatchings/47BB8", func_800FA3C4);
INCLUDE_ASM("asm/dra/nonmatchings/47BB8", func_800FA60C);
INCLUDE_ASM("asm/us/dra/nonmatchings/47BB8", func_800FA60C);
// https://decomp.me/scratch/JL0hI
// has some logic related to the weapon struct
INCLUDE_ASM("asm/dra/nonmatchings/47BB8", func_800FA7E8);
INCLUDE_ASM("asm/us/dra/nonmatchings/47BB8", func_800FA7E8);
INCLUDE_ASM("asm/dra/nonmatchings/47BB8", func_800FA8C4);
INCLUDE_ASM("asm/us/dra/nonmatchings/47BB8", func_800FA8C4);
INCLUDE_ASM("asm/dra/nonmatchings/47BB8", func_800FA9DC);
INCLUDE_ASM("asm/us/dra/nonmatchings/47BB8", func_800FA9DC);
void func_800FAB1C(void) {
Entity* entity = &g_EntityArray[UNK_ENTITY_4];
@ -2640,19 +2640,19 @@ void func_800FAD34(s32 arg0, u8 arg1, u16 equipIcon, u16 palette) {
}
}
INCLUDE_ASM("asm/dra/nonmatchings/47BB8", func_800FADC0);
INCLUDE_ASM("asm/us/dra/nonmatchings/47BB8", func_800FADC0);
void func_800FAE98(void) {
func_800FADC0();
D_800978F8 = 0x40;
}
INCLUDE_ASM("asm/dra/nonmatchings/47BB8", func_800FAEC4);
INCLUDE_ASM("asm/us/dra/nonmatchings/47BB8", func_800FAEC4);
// https://decomp.me/scratch/HEhaF by @pixel-stuck
// matches with gcc 2.6.0 + aspsx 2.3.4
#ifndef NON_MATCHING
INCLUDE_ASM("asm/dra/nonmatchings/47BB8", func_800FAF44);
INCLUDE_ASM("asm/us/dra/nonmatchings/47BB8", func_800FAF44);
#else
void func_800FAF44(s32 arg0) {
s32 var_a0;
@ -2717,7 +2717,7 @@ void func_800FB0FC(void) {
func_800FB004();
}
INCLUDE_ASM("asm/dra/nonmatchings/47BB8", func_800FB160);
INCLUDE_ASM("asm/us/dra/nonmatchings/47BB8", func_800FB160);
bool func_800FB1EC(s32 arg0) {
if (D_801375CC.equipTypeFilter == 0) {
@ -2732,15 +2732,15 @@ bool func_800FB1EC(s32 arg0) {
return false;
}
INCLUDE_ASM("asm/dra/nonmatchings/47BB8", func_800FB23C);
INCLUDE_ASM("asm/us/dra/nonmatchings/47BB8", func_800FB23C);
INCLUDE_ASM("asm/dra/nonmatchings/47BB8", func_800FB9BC);
INCLUDE_ASM("asm/us/dra/nonmatchings/47BB8", func_800FB9BC);
INCLUDE_ASM("asm/dra/nonmatchings/47BB8", func_800FBAC4);
INCLUDE_ASM("asm/us/dra/nonmatchings/47BB8", func_800FBAC4);
INCLUDE_ASM("asm/dra/nonmatchings/47BB8", func_800FBC24);
INCLUDE_ASM("asm/us/dra/nonmatchings/47BB8", func_800FBC24);
INCLUDE_ASM("asm/dra/nonmatchings/47BB8", func_800FD39C);
INCLUDE_ASM("asm/us/dra/nonmatchings/47BB8", func_800FD39C);
s32 func_800FD4C0(s32 bossId, s32 action) {
s32 temp_v0;
@ -2807,7 +2807,7 @@ extern Unkstruct_800A4B12 D_800A4B12[];
u8 func_800FD688(s32 arg0) { return D_800A4B12[g_playerEquip[arg0]].unk0; }
INCLUDE_ASM("asm/dra/nonmatchings/47BB8", func_800FD6C4);
INCLUDE_ASM("asm/us/dra/nonmatchings/47BB8", func_800FD6C4);
u8* func_800FD744(s32 equipTypeFilter) {
u8* phi_v0 = &D_80097A8D;

154
src/dra/5D874.c
View File

@ -4,7 +4,7 @@
#include "sfx.h"
#ifndef NON_EQUIVALENT
INCLUDE_ASM("asm/dra/nonmatchings/5D874", func_800FD874);
INCLUDE_ASM("asm/us/dra/nonmatchings/5D874", func_800FD874);
#else
void func_800FD874(u16 context, s32 arg1) {
u8* temp_a0_2;
@ -61,9 +61,9 @@ void func_800FD874(u16 context, s32 arg1) {
}
#endif
INCLUDE_ASM("asm/dra/nonmatchings/5D874", func_800FD9D4);
INCLUDE_ASM("asm/us/dra/nonmatchings/5D874", func_800FD9D4);
INCLUDE_ASM("asm/dra/nonmatchings/5D874", func_800FDB18);
INCLUDE_ASM("asm/us/dra/nonmatchings/5D874", func_800FDB18);
bool func_800FDC94(s32 arg0) {
u8 temp = D_800A841C[arg0 * 0x1C];
@ -77,7 +77,7 @@ bool func_800FDC94(s32 arg0) {
}
// https://decomp.me/scratch/5ufgy
INCLUDE_ASM("asm/dra/nonmatchings/5D874", func_800FDCE0);
INCLUDE_ASM("asm/us/dra/nonmatchings/5D874", func_800FDCE0);
bool func_800FDD44(s32 equipHeadIndex) {
s32 equippedItem;
@ -106,9 +106,9 @@ void func_800FDE00(void) {
D_80137968 = 0;
}
INCLUDE_ASM("asm/dra/nonmatchings/5D874", func_800FDE20);
INCLUDE_ASM("asm/us/dra/nonmatchings/5D874", func_800FDE20);
INCLUDE_ASM("asm/dra/nonmatchings/5D874", func_800FE044);
INCLUDE_ASM("asm/us/dra/nonmatchings/5D874", func_800FE044);
bool func_800FE3A8(s32 arg0) {
/*
@ -122,9 +122,9 @@ bool func_800FE3A8(s32 arg0) {
return (D_80097964[arg0] & temp) != 0;
}
INCLUDE_ASM("asm/dra/nonmatchings/5D874", func_800FE3C4);
INCLUDE_ASM("asm/us/dra/nonmatchings/5D874", func_800FE3C4);
INCLUDE_ASM("asm/dra/nonmatchings/5D874", func_800FE728);
INCLUDE_ASM("asm/us/dra/nonmatchings/5D874", func_800FE728);
bool HasEnoughMp(s32 mpCount, bool subtractMp) {
if (D_80097B9C.mp >= mpCount) {
@ -153,7 +153,7 @@ void AddHearts(s32 value) {
}
}
INCLUDE_ASM("asm/dra/nonmatchings/5D874", func_800FE97C);
INCLUDE_ASM("asm/us/dra/nonmatchings/5D874", func_800FE97C);
// !FAKE: explicitly casting two pointers to s32
// before comparing them, that's weird
@ -168,7 +168,7 @@ void func_800FEE6C(void) {
} while ((s32)var_v1 < (s32)&D_80139828[0x10]);
}
INCLUDE_ASM("asm/dra/nonmatchings/5D874", func_800FEEA4);
INCLUDE_ASM("asm/us/dra/nonmatchings/5D874", func_800FEEA4);
s32 func_800FF064(s32 arg0) {
s32 playerMP;
@ -198,7 +198,7 @@ void func_800FF0F4(s32 arg0) { D_80139828[arg0] = 0x1000; }
s32 func_800FF110(s32 arg0) { return D_80139828[arg0]; }
INCLUDE_ASM("asm/dra/nonmatchings/5D874", func_800FF128);
INCLUDE_ASM("asm/us/dra/nonmatchings/5D874", func_800FF128);
s32 func_800FF460(s32 arg0) {
if (arg0 == 0) {
@ -290,12 +290,12 @@ void func_800FF708(s32 arg0, s32 arg1) {
g_playerEquip[arg1 + 2] = rnd;
}
INCLUDE_ASM("asm/dra/nonmatchings/5D874", func_800FF7B8);
INCLUDE_ASM("asm/us/dra/nonmatchings/5D874", func_800FF7B8);
extern Unkstruct_80137990 D_80137990;
#ifndef NON_MATCHING
INCLUDE_ASM("asm/dra/nonmatchings/5D874", DrawHudRichter);
INCLUDE_ASM("asm/us/dra/nonmatchings/5D874", DrawHudRichter);
#else
void DrawHudRichter(void) {
POLY_GT4* poly;
@ -400,7 +400,7 @@ void DrawHudRichter(void) {
}
#endif
INCLUDE_ASM("asm/dra/nonmatchings/5D874", func_80100B50);
INCLUDE_ASM("asm/us/dra/nonmatchings/5D874", func_80100B50);
extern Unkstruct_80137990 D_80137990;
@ -470,9 +470,9 @@ void func_8010189C(void) {
}
}
INCLUDE_ASM("asm/dra/nonmatchings/5D874", func_80101A80);
INCLUDE_ASM("asm/us/dra/nonmatchings/5D874", func_80101A80);
INCLUDE_ASM("asm/dra/nonmatchings/5D874", func_801024DC);
INCLUDE_ASM("asm/us/dra/nonmatchings/5D874", func_801024DC);
extern Unkstruct_80086FFA D_80086FFA[];
@ -533,9 +533,9 @@ void func_801026BC(s32 arg0) {
void func_801027A4(void) { func_801026BC(0); }
INCLUDE_ASM("asm/dra/nonmatchings/5D874", func_801027C4);
INCLUDE_ASM("asm/us/dra/nonmatchings/5D874", func_801027C4);
INCLUDE_ASM("asm/dra/nonmatchings/5D874", func_801028AC);
INCLUDE_ASM("asm/us/dra/nonmatchings/5D874", func_801028AC);
void func_80102CD8(s32 arg0) {
D_801379AC[0] = arg0;
@ -544,9 +544,9 @@ void func_80102CD8(s32 arg0) {
}
// https://decomp.me/scratch/NNXbc
INCLUDE_ASM("asm/dra/nonmatchings/5D874", func_80102D08);
INCLUDE_ASM("asm/us/dra/nonmatchings/5D874", func_80102D08);
INCLUDE_ASM("asm/dra/nonmatchings/5D874", func_80102D70);
INCLUDE_ASM("asm/us/dra/nonmatchings/5D874", func_80102D70);
void func_80102DEC(s32 context) {
D_80137E64 = 0;
@ -676,14 +676,14 @@ POLY_GT4* func_80103148(POLY_GT4* poly1, POLY_GT4* arg1) {
return (POLY_GT4*)poly1->tag;
}
INCLUDE_ASM("asm/dra/nonmatchings/5D874", func_80103238);
INCLUDE_ASM("asm/us/dra/nonmatchings/5D874", func_80103238);
void func_80103EAC(void) {
D_80137E4C = 0;
func_800E92F4();
}
INCLUDE_ASM("asm/dra/nonmatchings/5D874", func_80103ED4);
INCLUDE_ASM("asm/us/dra/nonmatchings/5D874", func_80103ED4);
void func_8010427C(void) {
FreePolygons(D_80137E40);
@ -691,18 +691,18 @@ void func_8010427C(void) {
FreePolygons(D_80137E48);
}
INCLUDE_ASM("asm/dra/nonmatchings/5D874", func_801042C4);
INCLUDE_ASM("asm/us/dra/nonmatchings/5D874", func_801042C4);
INCLUDE_ASM("asm/dra/nonmatchings/5D874", func_80104790);
INCLUDE_ASM("asm/us/dra/nonmatchings/5D874", func_80104790);
INCLUDE_ASM("asm/dra/nonmatchings/5D874", func_80105078);
INCLUDE_ASM("asm/us/dra/nonmatchings/5D874", func_80105078);
void func_80105408(void) {
*D_80072EF4 = 0x1000;
D_80072EFC = 1;
}
INCLUDE_ASM("asm/dra/nonmatchings/5D874", func_80105428);
INCLUDE_ASM("asm/us/dra/nonmatchings/5D874", func_80105428);
void DestroyEntity(Entity* entity) {
s32 i;
@ -731,7 +731,7 @@ void func_801065F4(s16 startIndex) {
void func_80106670(s32 blendMode);
#ifndef NON_EQUIVALENT
INCLUDE_ASM("asm/dra/nonmatchings/5D874", func_80106670);
INCLUDE_ASM("asm/us/dra/nonmatchings/5D874", func_80106670);
#else
extern u32 D_80097944; // tile count?
@ -849,9 +849,9 @@ void func_80106670(s32 blendMode) {
}
#endif
INCLUDE_ASM("asm/dra/nonmatchings/5D874", func_80106A28);
INCLUDE_ASM("asm/us/dra/nonmatchings/5D874", func_80106A28);
INCLUDE_ASM("asm/dra/nonmatchings/5D874", func_8010715C);
INCLUDE_ASM("asm/us/dra/nonmatchings/5D874", func_8010715C);
void func_801071CC(POLY_GT4* poly, u32 colorIntensity, s32 vertexIndex) {
switch (vertexIndex) {
@ -955,25 +955,25 @@ void func_80107460(void) {
D_80137F6C = (D_80137F6C + 1) & 7;
}
INCLUDE_ASM("asm/dra/nonmatchings/5D874", CopyMapOverlayCallback);
INCLUDE_ASM("asm/us/dra/nonmatchings/5D874", CopyMapOverlayCallback);
// https://decomp.me/scratch/1AWN1
INCLUDE_ASM("asm/dra/nonmatchings/5D874", func_80107614);
INCLUDE_ASM("asm/us/dra/nonmatchings/5D874", func_80107614);
// https://decomp.me/scratch/U0IGY
INCLUDE_ASM("asm/dra/nonmatchings/5D874", func_80107750);
INCLUDE_ASM("asm/us/dra/nonmatchings/5D874", func_80107750);
INCLUDE_ASM("asm/dra/nonmatchings/5D874", func_801078C4);
INCLUDE_ASM("asm/us/dra/nonmatchings/5D874", func_801078C4);
INCLUDE_ASM("asm/dra/nonmatchings/5D874", func_80107B04);
INCLUDE_ASM("asm/us/dra/nonmatchings/5D874", func_80107B04);
INCLUDE_ASM("asm/dra/nonmatchings/5D874", func_80107C6C);
INCLUDE_ASM("asm/us/dra/nonmatchings/5D874", func_80107C6C);
INCLUDE_ASM("asm/dra/nonmatchings/5D874", func_80107DB4);
INCLUDE_ASM("asm/us/dra/nonmatchings/5D874", func_80107DB4);
INCLUDE_ASM("asm/dra/nonmatchings/5D874", func_80107EF0);
INCLUDE_ASM("asm/us/dra/nonmatchings/5D874", func_80107EF0);
INCLUDE_ASM("asm/dra/nonmatchings/5D874", func_801080DC);
INCLUDE_ASM("asm/us/dra/nonmatchings/5D874", func_801080DC);
void func_8010838C(s32 arg0) {
func_801073C0();
@ -1001,10 +1001,10 @@ bool func_801083F0(void) {
return true;
}
INCLUDE_ASM("asm/dra/nonmatchings/5D874", func_80108448);
INCLUDE_ASM("asm/us/dra/nonmatchings/5D874", func_80108448);
// https://decomp.me/scratch/QZk8K
INCLUDE_ASM("asm/dra/nonmatchings/5D874", func_801092E8);
INCLUDE_ASM("asm/us/dra/nonmatchings/5D874", func_801092E8);
void func_80109328(void) {
s16* player_unk1E = &PLAYER.unk1E;
@ -1023,9 +1023,9 @@ void func_80109328(void) {
PLAYER.blendMode = 0;
}
INCLUDE_ASM("asm/dra/nonmatchings/5D874", func_801093C4);
INCLUDE_ASM("asm/us/dra/nonmatchings/5D874", func_801093C4);
INCLUDE_ASM("asm/dra/nonmatchings/5D874", func_80109594);
INCLUDE_ASM("asm/us/dra/nonmatchings/5D874", func_80109594);
void func_80109990(void) {
if (D_80137FB4 == 0) {
@ -1039,12 +1039,12 @@ void func_80109990(void) {
}
}
INCLUDE_ASM("asm/dra/nonmatchings/5D874", func_80109A44);
INCLUDE_ASM("asm/us/dra/nonmatchings/5D874", func_80109A44);
// regalloc
// https://decomp.me/scratch/rdeqb
#ifndef NON_MATCHING
INCLUDE_ASM("asm/dra/nonmatchings/5D874", func_8010A234);
INCLUDE_ASM("asm/us/dra/nonmatchings/5D874", func_8010A234);
#else
void func_8010A234(s32 arg0) {
s32 temp;
@ -1094,7 +1094,7 @@ void func_8010A234(s32 arg0) {
// Matching in gcc 2.7.2 + aspsx (the one in decomp.me)
// https://decomp.me/scratch/oKHMJ
#ifndef NON_MATCHING
INCLUDE_ASM("asm/dra/nonmatchings/5D874", func_8010A3F0);
INCLUDE_ASM("asm/us/dra/nonmatchings/5D874", func_8010A3F0);
#else
void func_8010A3F0(void) {
s32 temp = 0x38;
@ -1113,9 +1113,9 @@ void func_8010A3F0(void) {
}
#endif
INCLUDE_ASM("asm/dra/nonmatchings/5D874", func_8010A4A4);
INCLUDE_ASM("asm/us/dra/nonmatchings/5D874", func_8010A4A4);
INCLUDE_ASM("asm/dra/nonmatchings/5D874", UpdateEntityAlucard);
INCLUDE_ASM("asm/us/dra/nonmatchings/5D874", UpdateEntityAlucard);
void func_8010BF64(Unkstruct_8010BF64* arg0) {
if (g_CurrentPlayableCharacter == PLAYER_ALUCARD) {
@ -1128,24 +1128,24 @@ void func_8010BF64(Unkstruct_8010BF64* arg0) {
}
}
INCLUDE_ASM("asm/dra/nonmatchings/5D874", func_8010BFFC);
INCLUDE_ASM("asm/us/dra/nonmatchings/5D874", func_8010BFFC);
INCLUDE_ASM("asm/dra/nonmatchings/5D874", func_8010C36C);
INCLUDE_ASM("asm/us/dra/nonmatchings/5D874", func_8010C36C);
INCLUDE_ASM("asm/dra/nonmatchings/5D874", func_8010C9F4);
INCLUDE_ASM("asm/us/dra/nonmatchings/5D874", func_8010C9F4);
INCLUDE_ASM("asm/dra/nonmatchings/5D874", func_8010D010);
INCLUDE_ASM("asm/us/dra/nonmatchings/5D874", func_8010D010);
INCLUDE_ASM("asm/dra/nonmatchings/5D874", func_8010D2C8);
INCLUDE_ASM("asm/us/dra/nonmatchings/5D874", func_8010D2C8);
void func_8010D584(s16 step) {
PLAYER.step = step;
PLAYER.unk2E = 0;
}
INCLUDE_ASM("asm/dra/nonmatchings/5D874", func_8010D59C);
INCLUDE_ASM("asm/us/dra/nonmatchings/5D874", func_8010D59C);
INCLUDE_ASM("asm/dra/nonmatchings/5D874", func_8010D800);
INCLUDE_ASM("asm/us/dra/nonmatchings/5D874", func_8010D800);
void func_8010DA2C(s32* arg0) {
g_CurrentEntity->unk4C = arg0;
@ -1159,14 +1159,14 @@ void func_8010DA48(u32 arg0) {
g_CurrentEntity->animFrameIdx = 0;
}
INCLUDE_ASM("asm/dra/nonmatchings/5D874", func_8010DA70);
INCLUDE_ASM("asm/us/dra/nonmatchings/5D874", func_8010DA70);
INCLUDE_ASM("asm/dra/nonmatchings/5D874", func_8010DB38);
INCLUDE_ASM("asm/us/dra/nonmatchings/5D874", func_8010DB38);
INCLUDE_ASM("asm/dra/nonmatchings/5D874", func_8010DBFC);
INCLUDE_ASM("asm/us/dra/nonmatchings/5D874", func_8010DBFC);
#ifndef NON_EQUIVALENT
INCLUDE_ASM("asm/dra/nonmatchings/5D874", UpdateAnim);
INCLUDE_ASM("asm/us/dra/nonmatchings/5D874", UpdateAnim);
#else
void UpdateAnim(FrameProperty* frameProps, s32* arg1) {
AnimationFrame* animFrame;
@ -1217,7 +1217,7 @@ void UpdateAnim(FrameProperty* frameProps, s32* arg1) {
}
#endif
INCLUDE_ASM("asm/dra/nonmatchings/5D874", func_8010DF70);
INCLUDE_ASM("asm/us/dra/nonmatchings/5D874", func_8010DF70);
void func_8010DFF0(s32 arg0, s32 arg1) {
POLY_GT4* poly;
@ -1349,7 +1349,7 @@ s32 func_8010E27C(void) {
}
// https://decomp.me/scratch/YvoMU
INCLUDE_ASM("asm/dra/nonmatchings/5D874", func_8010E334);
INCLUDE_ASM("asm/us/dra/nonmatchings/5D874", func_8010E334);
/*
* Updates the Entity acceleration in the X Axis
@ -1395,7 +1395,7 @@ void func_8010E42C(u16 arg0) {
// matches in gcc 2.6.0 + aspsx 2.3.4
// aspsx
#ifndef NON_MATCHING
INCLUDE_ASM("asm/dra/nonmatchings/5D874", func_8010E470);
INCLUDE_ASM("asm/us/dra/nonmatchings/5D874", func_8010E470);
#else
void func_8010E470(s32 arg0, s32 arg1) {
PLAYER.accelerationX = arg1;
@ -1426,7 +1426,7 @@ void func_8010E4D0(void) {
func_8010E470(0, 0);
}
INCLUDE_ASM("asm/dra/nonmatchings/5D874", func_8010E570);
INCLUDE_ASM("asm/us/dra/nonmatchings/5D874", func_8010E570);
void func_8010E570(/*?*/ s32);
void func_8010E6AC(s32 arg0) {
@ -1544,7 +1544,7 @@ void func_8010E9A4(void) {
// TODO: aspatch div macro
// https://discord.com/channels/710646040331681844/815529862604390411/1051628313073958992
#ifndef NON_MATCHING
INCLUDE_ASM("asm/dra/nonmatchings/5D874", func_8010EA54);
INCLUDE_ASM("asm/us/dra/nonmatchings/5D874", func_8010EA54);
#else
void func_8010EA54(s32 arg0) {
s16 temp_hi;
@ -1585,10 +1585,10 @@ s32 func_8010EADC(s16 arg0, s16 arg1) {
return (ret == 0) ? -1 : 0;
}
INCLUDE_ASM("asm/dra/nonmatchings/5D874", func_8010EB5C);
INCLUDE_ASM("asm/us/dra/nonmatchings/5D874", func_8010EB5C);
// https://decomp.me/scratch/N8Srk
INCLUDE_ASM("asm/dra/nonmatchings/5D874", func_8010EC8C);
INCLUDE_ASM("asm/us/dra/nonmatchings/5D874", func_8010EC8C);
void func_8010ED54(u8 arg0) {
PLAYER.accelerationY = 0;
@ -1599,7 +1599,7 @@ void func_8010ED54(u8 arg0) {
D_80072F68 = 0;
}
INCLUDE_ASM("asm/dra/nonmatchings/5D874", func_8010EDB8);
INCLUDE_ASM("asm/us/dra/nonmatchings/5D874", func_8010EDB8);
void func_8010FAF4(void) {
DestroyEntity(&g_EntityArray[UNK_ENTITY_10]);
@ -1682,25 +1682,25 @@ void func_8010FD88(void) {
PlaySfx(NA_SE_AL_BACKSLIDE);
}
INCLUDE_ASM("asm/dra/nonmatchings/5D874", func_8010FDF8);
INCLUDE_ASM("asm/us/dra/nonmatchings/5D874", func_8010FDF8);
s32 func_8010FDF8(/*?*/ s32);
INCLUDE_ASM("asm/dra/nonmatchings/5D874", func_80110394);
INCLUDE_ASM("asm/us/dra/nonmatchings/5D874", func_80110394);
INCLUDE_ASM("asm/dra/nonmatchings/5D874", func_801104D0);
INCLUDE_ASM("asm/us/dra/nonmatchings/5D874", func_801104D0);
INCLUDE_ASM("asm/dra/nonmatchings/5D874", func_801106A4);
INCLUDE_ASM("asm/us/dra/nonmatchings/5D874", func_801106A4);
INCLUDE_ASM("asm/dra/nonmatchings/5D874", func_8011081C);
INCLUDE_ASM("asm/us/dra/nonmatchings/5D874", func_8011081C);
INCLUDE_ASM("asm/dra/nonmatchings/5D874", func_80110968);
INCLUDE_ASM("asm/us/dra/nonmatchings/5D874", func_80110968);
INCLUDE_ASM("asm/dra/nonmatchings/5D874", func_80110BC8);
INCLUDE_ASM("asm/us/dra/nonmatchings/5D874", func_80110BC8);
INCLUDE_ASM("asm/dra/nonmatchings/5D874", func_80110DF8);
INCLUDE_ASM("asm/us/dra/nonmatchings/5D874", func_80110DF8);
INCLUDE_ASM("asm/dra/nonmatchings/5D874", func_80111018);
INCLUDE_ASM("asm/us/dra/nonmatchings/5D874", func_80111018);
INCLUDE_ASM("asm/dra/nonmatchings/5D874", func_801112AC);
INCLUDE_ASM("asm/us/dra/nonmatchings/5D874", func_801112AC);
INCLUDE_ASM("asm/dra/nonmatchings/5D874", func_8011151C);
INCLUDE_ASM("asm/us/dra/nonmatchings/5D874", func_8011151C);

10
src/dra/71830.c
View File

@ -70,7 +70,7 @@ void func_8011197C(void) {
PLAYER.palette = D_801396E8;
}
INCLUDE_ASM("asm/dra/nonmatchings/71830", func_801119C4);
INCLUDE_ASM("asm/us/dra/nonmatchings/71830", func_801119C4);
void func_80111CC0(void) {
if (D_80072F00[1] != 0) {
@ -107,7 +107,7 @@ bool func_80111D24(void) {
return false;
}
INCLUDE_ASM("asm/dra/nonmatchings/71830", func_80111DE8);
INCLUDE_ASM("asm/us/dra/nonmatchings/71830", func_80111DE8);
bool func_8011203C(void) {
s32 collision = func_80111D24();
@ -127,7 +127,7 @@ bool func_8011203C(void) {
return false;
}
INCLUDE_ASM("asm/dra/nonmatchings/71830", func_801120B4);
INCLUDE_ASM("asm/us/dra/nonmatchings/71830", func_801120B4);
void func_80112B64(void) {
if (func_8010FDF8(0x4301C) == 0) {
@ -138,7 +138,7 @@ void func_80112B64(void) {
}
}
INCLUDE_ASM("asm/dra/nonmatchings/71830", func_80112BB0);
INCLUDE_ASM("asm/us/dra/nonmatchings/71830", func_80112BB0);
void func_80113148(void) {
if ((D_80072F0A[0] != 0) && (D_80072EEC & 0x40)) {
@ -151,7 +151,7 @@ void func_80113148(void) {
}
}
INCLUDE_ASM("asm/dra/nonmatchings/71830", func_801131C4);
INCLUDE_ASM("asm/us/dra/nonmatchings/71830", func_801131C4);
void func_801139CC(s32 arg0) {
s32 move = PLAYER.facing != 0 ? -3 : 3;

6
src/dra/73AAC.c
View File

@ -183,11 +183,11 @@ block_13:
PLAYER.objectRoomIndex = 1;
}
INCLUDE_ASM("asm/dra/nonmatchings/73AAC", func_8011405C);
INCLUDE_ASM("asm/us/dra/nonmatchings/73AAC", func_8011405C);
INCLUDE_ASM("asm/dra/nonmatchings/73AAC", func_80114DF4);
INCLUDE_ASM("asm/us/dra/nonmatchings/73AAC", func_80114DF4);
INCLUDE_ASM("asm/dra/nonmatchings/73AAC", func_80115394);
INCLUDE_ASM("asm/us/dra/nonmatchings/73AAC", func_80115394);
void func_80115BB0(void) {
PLAYER.unk19 = 4;

212
src/dra/75F54.c
View File

@ -3,11 +3,11 @@
#include "objects.h"
#include "sfx.h"
INCLUDE_ASM("asm/dra/nonmatchings/75F54", func_80115F54);
INCLUDE_ASM("asm/us/dra/nonmatchings/75F54", func_80115F54);
INCLUDE_ASM("asm/dra/nonmatchings/75F54", func_80116208);
INCLUDE_ASM("asm/us/dra/nonmatchings/75F54", func_80116208);
INCLUDE_ASM("asm/dra/nonmatchings/75F54", func_80116408);
INCLUDE_ASM("asm/us/dra/nonmatchings/75F54", func_80116408);
void func_801166A4(void) {
switch (PLAYER.unk2E) {
@ -91,19 +91,19 @@ void func_8011690C(s16 arg0) {
}
}
INCLUDE_ASM("asm/dra/nonmatchings/75F54", func_80116994);
INCLUDE_ASM("asm/us/dra/nonmatchings/75F54", func_80116994);
INCLUDE_ASM("asm/dra/nonmatchings/75F54", func_80116B0C);
INCLUDE_ASM("asm/us/dra/nonmatchings/75F54", func_80116B0C);
INCLUDE_ASM("asm/dra/nonmatchings/75F54", func_801177A0);
INCLUDE_ASM("asm/us/dra/nonmatchings/75F54", func_801177A0);
INCLUDE_ASM("asm/dra/nonmatchings/75F54", func_80117AC0);
INCLUDE_ASM("asm/us/dra/nonmatchings/75F54", func_80117AC0);
INCLUDE_ASM("asm/dra/nonmatchings/75F54", func_80117D3C);
INCLUDE_ASM("asm/us/dra/nonmatchings/75F54", func_80117D3C);
INCLUDE_ASM("asm/dra/nonmatchings/75F54", func_80117DEC);
INCLUDE_ASM("asm/us/dra/nonmatchings/75F54", func_80117DEC);
INCLUDE_ASM("asm/dra/nonmatchings/75F54", func_801182F8);
INCLUDE_ASM("asm/us/dra/nonmatchings/75F54", func_801182F8);
void func_80118614(void) {
if (PLAYER.animFrameDuration < 0) {
@ -155,11 +155,11 @@ Entity* GetFreeDraEntity(s16 start, s16 end) {
return NULL;
}
INCLUDE_ASM("asm/dra/nonmatchings/75F54", func_80118810);
INCLUDE_ASM("asm/us/dra/nonmatchings/75F54", func_80118810);
INCLUDE_ASM("asm/dra/nonmatchings/75F54", func_80118894);
INCLUDE_ASM("asm/us/dra/nonmatchings/75F54", func_80118894);
INCLUDE_ASM("asm/dra/nonmatchings/75F54", func_80118970);
INCLUDE_ASM("asm/us/dra/nonmatchings/75F54", func_80118970);
s32 func_80118B18(Entity* ent1, Entity* ent2, s32 arg2) {
s16 var_a1;
@ -214,7 +214,7 @@ s32 func_80118B18(Entity* ent1, Entity* ent2, s32 arg2) {
// nops between assignments probably aspsx
// matching in gcc 2.6.0 + aspsx 2.3.4
#ifndef NON_MATCHING
INCLUDE_ASM("asm/dra/nonmatchings/75F54", func_80118C28);
INCLUDE_ASM("asm/us/dra/nonmatchings/75F54", func_80118C28);
#else
extern u8 D_800ACFB4[];
extern u8 D_800ACFB5[];
@ -252,10 +252,10 @@ s32 func_80118C84(s16 arg0, s16 arg1) {
}
// number appears and moves to HP meter, probably for healing effects
INCLUDE_ASM("asm/dra/nonmatchings/75F54", EntityNumberMovesToHpMeter);
INCLUDE_ASM("asm/us/dra/nonmatchings/75F54", EntityNumberMovesToHpMeter);
// "Guard" text displays on screen
INCLUDE_ASM("asm/dra/nonmatchings/75F54", EntityGuardText);
INCLUDE_ASM("asm/us/dra/nonmatchings/75F54", EntityGuardText);
void func_80119D3C(Entity* entity) {
s32 temp;
@ -296,9 +296,9 @@ void func_80119D3C(Entity* entity) {
}
}
INCLUDE_ASM("asm/dra/nonmatchings/75F54", func_80119E78);
INCLUDE_ASM("asm/us/dra/nonmatchings/75F54", func_80119E78);
INCLUDE_ASM("asm/dra/nonmatchings/75F54", func_80119F70);
INCLUDE_ASM("asm/us/dra/nonmatchings/75F54", func_80119F70);
void func_8011A290(Entity* entity) {
Unkstruct_8011A290 sp10;
@ -351,7 +351,7 @@ void func_8011A3AC(Entity* arg0, s32 arg1, s32 arg2, Unkstruct_8011A3AC* arg3) {
void func_8011A4C8(Entity* entity) {}
INCLUDE_ASM("asm/dra/nonmatchings/75F54", func_8011A4D0);
INCLUDE_ASM("asm/us/dra/nonmatchings/75F54", func_8011A4D0);
void func_8011A870(void) {
Entity* entity = g_CurrentEntity = &g_EntityArray[UNK_ENTITY_4];
@ -396,7 +396,7 @@ label:
goto loop_1;
}
INCLUDE_ASM("asm/dra/nonmatchings/75F54", func_8011A9D8);
INCLUDE_ASM("asm/us/dra/nonmatchings/75F54", func_8011A9D8);
Entity* func_8011AAFC(Entity* self, u32 flags, s32 arg2) {
Entity* entity;
@ -442,9 +442,9 @@ Entity* func_8011AAFC(Entity* self, u32 flags, s32 arg2) {
return entity;
}
INCLUDE_ASM("asm/dra/nonmatchings/75F54", func_8011AC3C);
INCLUDE_ASM("asm/us/dra/nonmatchings/75F54", func_8011AC3C);
INCLUDE_ASM("asm/dra/nonmatchings/75F54", func_8011B190);
INCLUDE_ASM("asm/us/dra/nonmatchings/75F54", func_8011B190);
void func_8011B334(Entity* entity) {
Unkstruct_8011B334 temp;
@ -480,7 +480,7 @@ void func_8011B334(Entity* entity) {
}
}
INCLUDE_ASM("asm/dra/nonmatchings/75F54", func_8011B480);
INCLUDE_ASM("asm/us/dra/nonmatchings/75F54", func_8011B480);
void func_8011B530(Entity* entity) {
if (PLAYER.step != 0x25) {
@ -492,9 +492,9 @@ void func_8011B530(Entity* entity) {
}
}
INCLUDE_ASM("asm/dra/nonmatchings/75F54", func_8011B5A4);
INCLUDE_ASM("asm/us/dra/nonmatchings/75F54", func_8011B5A4);
INCLUDE_ASM("asm/dra/nonmatchings/75F54", func_8011BBE0);
INCLUDE_ASM("asm/us/dra/nonmatchings/75F54", func_8011BBE0);
// same as RIC/func_80162E9C
bool func_8011BD48(Entity* entity) {
@ -513,22 +513,22 @@ bool func_8011BD48(Entity* entity) {
}
// player turns white for some sort of status effect
INCLUDE_ASM("asm/dra/nonmatchings/75F54", EntityPlayerBlinkWhite);
INCLUDE_ASM("asm/us/dra/nonmatchings/75F54", EntityPlayerBlinkWhite);
// blue outline around player when mp refills
INCLUDE_ASM("asm/dra/nonmatchings/75F54", EntityMpReplenished);
INCLUDE_ASM("asm/us/dra/nonmatchings/75F54", EntityMpReplenished);
void func_8011E0E4(Entity* entity) {}
INCLUDE_ASM("asm/dra/nonmatchings/75F54", func_8011E0EC);
INCLUDE_ASM("asm/us/dra/nonmatchings/75F54", func_8011E0EC);
INCLUDE_ASM("asm/dra/nonmatchings/75F54", func_8011E390);
INCLUDE_ASM("asm/us/dra/nonmatchings/75F54", func_8011E390);
INCLUDE_ASM("asm/dra/nonmatchings/75F54", func_8011E4BC);
INCLUDE_ASM("asm/us/dra/nonmatchings/75F54", func_8011E4BC);
void func_8011EDA0(Entity* entity) {}
INCLUDE_ASM("asm/dra/nonmatchings/75F54", func_8011EDA8);
INCLUDE_ASM("asm/us/dra/nonmatchings/75F54", func_8011EDA8);
// same as RIC/func_801601DC
void func_8011F074(Entity* entity) {
@ -577,22 +577,22 @@ void func_8011F074(Entity* entity) {
}
// effect when player takes lightning damage
INCLUDE_ASM("asm/dra/nonmatchings/75F54", EntityHitByLightning);
INCLUDE_ASM("asm/us/dra/nonmatchings/75F54", EntityHitByLightning);
// player gets frozen
INCLUDE_ASM("asm/dra/nonmatchings/75F54", EntityHitByIce);
INCLUDE_ASM("asm/us/dra/nonmatchings/75F54", EntityHitByIce);
// transparent white circle closes over player
INCLUDE_ASM("asm/dra/nonmatchings/75F54", EntityTransparentWhiteCircle);
INCLUDE_ASM("asm/us/dra/nonmatchings/75F54", EntityTransparentWhiteCircle);
// pink effect on player
INCLUDE_ASM("asm/dra/nonmatchings/75F54", EntityPlayerPinkEffect);
INCLUDE_ASM("asm/us/dra/nonmatchings/75F54", EntityPlayerPinkEffect);
// player dissolves into pixels
INCLUDE_ASM("asm/dra/nonmatchings/75F54", EntityPlayerDissolves);
INCLUDE_ASM("asm/us/dra/nonmatchings/75F54", EntityPlayerDissolves);
// level up animation
INCLUDE_ASM("asm/dra/nonmatchings/75F54", EntityLevelUpAnimation);
INCLUDE_ASM("asm/us/dra/nonmatchings/75F54", EntityLevelUpAnimation);
extern Unkstruct_80138094 D_80138094[];
@ -606,19 +606,19 @@ void func_80121F14(s32 arg0, s32 arg1) {
}
}
INCLUDE_ASM("asm/dra/nonmatchings/75F54", func_80121F58);
INCLUDE_ASM("asm/us/dra/nonmatchings/75F54", func_80121F58);
// spawns mist (player transform)
INCLUDE_ASM("asm/dra/nonmatchings/75F54", EntityMist);
INCLUDE_ASM("asm/us/dra/nonmatchings/75F54", EntityMist);
INCLUDE_ASM("asm/dra/nonmatchings/75F54", func_80123788);
INCLUDE_ASM("asm/us/dra/nonmatchings/75F54", func_80123788);
INCLUDE_ASM("asm/dra/nonmatchings/75F54", func_801238CC);
INCLUDE_ASM("asm/us/dra/nonmatchings/75F54", func_801238CC);
// move a0,s0 thing
// https://decomp.me/scratch/rJCCX
#ifndef NON_MATCHING
INCLUDE_ASM("asm/dra/nonmatchings/75F54", func_80123A60);
INCLUDE_ASM("asm/us/dra/nonmatchings/75F54", func_80123A60);
#else
void func_80123A60(Entity* entity) {
if (D_80072F2C & 0x01000000) {
@ -656,7 +656,7 @@ block_7:
}
#endif
INCLUDE_ASM("asm/dra/nonmatchings/75F54", func_80123B40);
INCLUDE_ASM("asm/us/dra/nonmatchings/75F54", func_80123B40);
void func_80123F78(Entity* entity) {
if (D_800973FC == 0) {
@ -826,11 +826,11 @@ void func_80124164(POLY_GT4* poly, s32 colorIntensity, s32 y, s32 radius,
}
// teleport effect like when using library card (ID 0x42)
INCLUDE_ASM("asm/dra/nonmatchings/75F54", EntityTeleport);
INCLUDE_ASM("asm/us/dra/nonmatchings/75F54", EntityTeleport);
// move a0,s0 thing
#ifndef NON_MATCHING
INCLUDE_ASM("asm/dra/nonmatchings/75F54", func_80124A8C);
INCLUDE_ASM("asm/us/dra/nonmatchings/75F54", func_80124A8C);
#else
void func_80124A8C(Entity* entity) {
u32* playerStep = &PLAYER.step;
@ -871,12 +871,12 @@ void func_80124A8C(Entity* entity) {
#endif
// dagger thrown when using subweapon
INCLUDE_ASM("asm/dra/nonmatchings/75F54", EntitySubweaponThrownDagger);
INCLUDE_ASM("asm/us/dra/nonmatchings/75F54", EntitySubwpnThrownDagger);
// axe thrown when using subweapon
INCLUDE_ASM("asm/dra/nonmatchings/75F54", EntitySubweaponThrownAxe);
INCLUDE_ASM("asm/us/dra/nonmatchings/75F54", EntitySubwpnThrownAxe);
INCLUDE_ASM("asm/dra/nonmatchings/75F54", func_80125A30);
INCLUDE_ASM("asm/us/dra/nonmatchings/75F54", func_80125A30);
s32 func_80125B6C(s16 arg0, s16 arg1) {
CollisionResult collisionResult;
@ -979,18 +979,18 @@ void EntityHolyWater(Entity* entity) {
}
// glass breaking effect for holy water
INCLUDE_ASM("asm/dra/nonmatchings/75F54", EntityHolyWaterBreakGlass);
INCLUDE_ASM("asm/us/dra/nonmatchings/75F54", EntityHolyWaterBreakGlass);
// green flame when holy water explodes
INCLUDE_ASM("asm/dra/nonmatchings/75F54", EntityHolyWaterFlame);
INCLUDE_ASM("asm/us/dra/nonmatchings/75F54", EntityHolyWaterFlame);
// cross subweapon crash (full effect with all parts)
INCLUDE_ASM("asm/dra/nonmatchings/75F54", EntitySubweaponCrashCross);
INCLUDE_ASM("asm/us/dra/nonmatchings/75F54", EntitySubwpnCrashCross);
// rising blue particles from cross crash
INCLUDE_ASM("asm/dra/nonmatchings/75F54", EntitySubweaponCrashCrossParticles);
INCLUDE_ASM("asm/us/dra/nonmatchings/75F54", EntitySubwpnCrashCrossParticles);
INCLUDE_ASM("asm/dra/nonmatchings/75F54", func_80126ECC);
INCLUDE_ASM("asm/us/dra/nonmatchings/75F54", func_80126ECC);
void func_801274DC(Entity* entity) {
switch (entity->step) {
@ -1035,7 +1035,7 @@ void func_801274DC(Entity* entity) {
}
}
INCLUDE_ASM("asm/dra/nonmatchings/75F54", func_8012768C);
INCLUDE_ASM("asm/us/dra/nonmatchings/75F54", func_8012768C);
void func_80127840(Entity* entity) {
switch (entity->step) {
@ -1251,10 +1251,10 @@ void func_80127EF0(s16 arg0) {
}
}
INCLUDE_ASM("asm/dra/nonmatchings/75F54", EntitySubweaponReboundStone);
INCLUDE_ASM("asm/us/dra/nonmatchings/75F54", EntitySubwpnReboundStone);
// ash thrown when using vibhuti subweapon
INCLUDE_ASM("asm/dra/nonmatchings/75F54", EntitySubweaponThrownVibhuti);
INCLUDE_ASM("asm/us/dra/nonmatchings/75F54", EntitySubwpnThrownVibhuti);
s32 func_80128BBC(Unkstruct_80128BBC* arg0, u8 value) {
u8 ret = 0;
@ -1276,20 +1276,20 @@ s32 func_80128BBC(Unkstruct_80128BBC* arg0, u8 value) {
return ret;
}
INCLUDE_ASM("asm/dra/nonmatchings/75F54", func_80128C2C);
INCLUDE_ASM("asm/us/dra/nonmatchings/75F54", func_80128C2C);
INCLUDE_ASM("asm/dra/nonmatchings/75F54", func_801291C4);
INCLUDE_ASM("asm/us/dra/nonmatchings/75F54", func_801291C4);
INCLUDE_ASM("asm/dra/nonmatchings/75F54", func_80129864);
INCLUDE_ASM("asm/us/dra/nonmatchings/75F54", func_80129864);
// opens hole in backround and spirit comes out (ID 0x40)
INCLUDE_ASM("asm/dra/nonmatchings/75F54", EntitySummonSpirit);
INCLUDE_ASM("asm/us/dra/nonmatchings/75F54", EntitySummonSpirit);
// expanding circle effect when activating stopwatch
INCLUDE_ASM("asm/dra/nonmatchings/75F54", EntityStopWatchExpandingCircle);
INCLUDE_ASM("asm/us/dra/nonmatchings/75F54", EntityStopWatchExpandingCircle);
// stopwatch subweapon effect. stops enemies (Dra Entity 0x2A)
INCLUDE_ASM("asm/dra/nonmatchings/75F54", EntityStopWatch);
INCLUDE_ASM("asm/us/dra/nonmatchings/75F54", EntityStopWatch);
void func_8012B78C(Entity* entity) {
POLY_GT4* poly;
@ -1347,12 +1347,12 @@ void func_8012B78C(Entity* entity) {
}
// book rotates around player
INCLUDE_ASM("asm/dra/nonmatchings/75F54", EntitySubweaponBible);
INCLUDE_ASM("asm/us/dra/nonmatchings/75F54", EntitySubwpnBible);
// echo of bat effect
INCLUDE_ASM("asm/dra/nonmatchings/75F54", EntityBatEcho);
INCLUDE_ASM("asm/us/dra/nonmatchings/75F54", EntityBatEcho);
INCLUDE_ASM("asm/dra/nonmatchings/75F54", func_8012C600);
INCLUDE_ASM("asm/us/dra/nonmatchings/75F54", func_8012C600);
bool func_8012C88C(void) {
if ((PLAYER.unk2E != 0) && (PLAYER.unk2E != 8)) {
@ -1372,9 +1372,9 @@ bool func_8012C88C(void) {
return false;
}
INCLUDE_ASM("asm/dra/nonmatchings/75F54", func_8012C97C);
INCLUDE_ASM("asm/us/dra/nonmatchings/75F54", func_8012C97C);
INCLUDE_ASM("asm/dra/nonmatchings/75F54", func_8012CA64);
INCLUDE_ASM("asm/us/dra/nonmatchings/75F54", func_8012CA64);
void func_8012CB0C(void) {
PLAYER.unkAC = 0xDE;
@ -1385,7 +1385,7 @@ void func_8012CB0C(void) {
PLAYER.unk2E = 7;
}
INCLUDE_ASM("asm/dra/nonmatchings/75F54", func_8012CB4C);
INCLUDE_ASM("asm/us/dra/nonmatchings/75F54", func_8012CB4C);
void func_8012CC30(s32 arg0) {
if (arg0 == 0) {
@ -1404,7 +1404,7 @@ void func_8012CC30(s32 arg0) {
}
}
INCLUDE_ASM("asm/dra/nonmatchings/75F54", func_8012CCE4);
INCLUDE_ASM("asm/us/dra/nonmatchings/75F54", func_8012CCE4);
void func_8012CED4(void) {
if ((PLAYER.unk2E == 2) && (D_800B0914 == PLAYER.unk2E)) {
@ -1440,7 +1440,7 @@ void func_8012CFF0(void) {
D_800B0914 = 0;
}
INCLUDE_ASM("asm/dra/nonmatchings/75F54", func_8012D024);
INCLUDE_ASM("asm/us/dra/nonmatchings/75F54", func_8012D024);
void func_8012D178(void) {
s32 var_v0;
@ -1468,29 +1468,29 @@ void func_8012D178(void) {
}
}
INCLUDE_ASM("asm/dra/nonmatchings/75F54", func_8012D28C);
INCLUDE_ASM("asm/us/dra/nonmatchings/75F54", func_8012D28C);
INCLUDE_ASM("asm/dra/nonmatchings/75F54", func_8012D3E8);
INCLUDE_ASM("asm/us/dra/nonmatchings/75F54", func_8012D3E8);
INCLUDE_ASM("asm/dra/nonmatchings/75F54", func_8012DBBC);
INCLUDE_ASM("asm/us/dra/nonmatchings/75F54", func_8012DBBC);
INCLUDE_ASM("asm/dra/nonmatchings/75F54", func_8012DF04);
INCLUDE_ASM("asm/us/dra/nonmatchings/75F54", func_8012DF04);
INCLUDE_ASM("asm/dra/nonmatchings/75F54", func_8012E040);
INCLUDE_ASM("asm/us/dra/nonmatchings/75F54", func_8012E040);
INCLUDE_ASM("asm/dra/nonmatchings/75F54", func_8012E550);
INCLUDE_ASM("asm/us/dra/nonmatchings/75F54", func_8012E550);
INCLUDE_ASM("asm/dra/nonmatchings/75F54", func_8012E7A4);
INCLUDE_ASM("asm/us/dra/nonmatchings/75F54", func_8012E7A4);
INCLUDE_ASM("asm/dra/nonmatchings/75F54", func_8012E9C0);
INCLUDE_ASM("asm/us/dra/nonmatchings/75F54", func_8012E9C0);
INCLUDE_ASM("asm/dra/nonmatchings/75F54", func_8012EAD0);
INCLUDE_ASM("asm/us/dra/nonmatchings/75F54", func_8012EAD0);
INCLUDE_ASM("asm/dra/nonmatchings/75F54", func_8012ED30);
INCLUDE_ASM("asm/us/dra/nonmatchings/75F54", func_8012ED30);
INCLUDE_ASM("asm/dra/nonmatchings/75F54", func_8012EF2C);
INCLUDE_ASM("asm/us/dra/nonmatchings/75F54", func_8012EF2C);
INCLUDE_ASM("asm/dra/nonmatchings/75F54", func_8012F178);
INCLUDE_ASM("asm/us/dra/nonmatchings/75F54", func_8012F178);
s32 func_8012F83C(s32 arg0, s32 arg1, s32 arg2, s32 arg3, s32 arg4) {
s32 temp_a0 = arg0 - arg2;
@ -1501,20 +1501,20 @@ s32 func_8012F83C(s32 arg0, s32 arg1, s32 arg2, s32 arg3, s32 arg4) {
1;
}
INCLUDE_ASM("asm/dra/nonmatchings/75F54", func_8012F894);
INCLUDE_ASM("asm/us/dra/nonmatchings/75F54", func_8012F894);
INCLUDE_ASM("asm/dra/nonmatchings/75F54", func_80130264);
INCLUDE_ASM("asm/us/dra/nonmatchings/75F54", func_80130264);
INCLUDE_ASM("asm/dra/nonmatchings/75F54", func_80130618);
INCLUDE_ASM("asm/us/dra/nonmatchings/75F54", func_80130618);
INCLUDE_ASM("asm/dra/nonmatchings/75F54", func_801309B4);
INCLUDE_ASM("asm/us/dra/nonmatchings/75F54", func_801309B4);
INCLUDE_ASM("asm/dra/nonmatchings/75F54", func_80130E94);
INCLUDE_ASM("asm/us/dra/nonmatchings/75F54", func_80130E94);
// https://decomp.me/scratch/cu30D
// TODO: branching is wrong jpt_ needs a file split
#ifndef NON_EQUIVALENT
INCLUDE_ASM("asm/dra/nonmatchings/75F54", func_8013136C);
INCLUDE_ASM("asm/us/dra/nonmatchings/75F54", func_8013136C);
#else
void func_8012C600(void); /* extern */
extern u16 D_8007412E;
@ -1602,7 +1602,7 @@ void func_8013136C(Entity* entity) {
#endif
// one rotating cross from the cross subweapon crash
INCLUDE_ASM("asm/dra/nonmatchings/75F54", func_801315F8);
INCLUDE_ASM("asm/us/dra/nonmatchings/75F54", func_801315F8);
void func_80131EBC(const char* str, s16 id) { D_80138784[id] = str; }
@ -1862,12 +1862,12 @@ void func_80132760(void) {
func_80132264();
}
INCLUDE_ASM("asm/dra/nonmatchings/75F54", func_801327B4);
INCLUDE_ASM("asm/us/dra/nonmatchings/75F54", func_801327B4);
// https://decomp.me/scratch/0X5YL
// Matches with gcc 2.6.0 + aspsx 2.3.4
#ifndef NON_MATCHING
INCLUDE_ASM("asm/dra/nonmatchings/75F54", func_80132A04);
INCLUDE_ASM("asm/us/dra/nonmatchings/75F54", func_80132A04);
#else
void func_801327B4(s16, s16, s16, s16, s16, s16, s16, s16);
extern s16 D_800BD19C[];
@ -1920,7 +1920,7 @@ void func_80132A04(s16 voice, s16 vabId, s16 prog, s16 tone, u16 note,
}
#endif
INCLUDE_ASM("asm/dra/nonmatchings/75F54", func_80132C2C);
INCLUDE_ASM("asm/us/dra/nonmatchings/75F54", func_80132C2C);
extern s16 D_80139868[];
@ -1945,16 +1945,16 @@ void func_80132E90(u32 arg0, s8* arg1) {
arg1[0] = (temp2 = (((arg0 / 75) / 60) / 10) * 0x10) + temp;
}
INCLUDE_ASM("asm/dra/nonmatchings/75F54", func_80132F60);
INCLUDE_ASM("asm/us/dra/nonmatchings/75F54", func_80132F60);
void func_80132F60();
INCLUDE_ASM("asm/dra/nonmatchings/75F54", func_80133290);
INCLUDE_ASM("asm/us/dra/nonmatchings/75F54", func_80133290);
void func_80133290();
INCLUDE_ASM("asm/dra/nonmatchings/75F54", func_80133488);
INCLUDE_ASM("asm/us/dra/nonmatchings/75F54", func_80133488);
void func_80133488();
INCLUDE_ASM("asm/dra/nonmatchings/75F54", func_80133604);
INCLUDE_ASM("asm/us/dra/nonmatchings/75F54", func_80133604);
void func_80133604();
void func_80133780(s8 arg0) { SsSetSerialAttr(0, 1, arg0 == 1); }
@ -1969,19 +1969,19 @@ void func_801337B4(void) {
}
}
INCLUDE_ASM("asm/dra/nonmatchings/75F54", func_80133810);
INCLUDE_ASM("asm/us/dra/nonmatchings/75F54", func_80133810);
bool func_80133940(void) { return D_801396F4 == 0; }
bool func_80133950(void) { return D_8013980C == 0; }
INCLUDE_ASM("asm/dra/nonmatchings/75F54", func_80133960);
INCLUDE_ASM("asm/us/dra/nonmatchings/75F54", func_80133960);
void func_80133960();
INCLUDE_ASM("asm/dra/nonmatchings/75F54", func_80133BDC);
INCLUDE_ASM("asm/us/dra/nonmatchings/75F54", func_80133BDC);
void func_80133BDC();
INCLUDE_ASM("asm/dra/nonmatchings/75F54", func_80133FCC);
INCLUDE_ASM("asm/us/dra/nonmatchings/75F54", func_80133FCC);
extern Unkstruct_80138FB4* D_80138FB4;
@ -2247,15 +2247,15 @@ void func_8013493C(s16 arg0, s16 arg1) {
D_8013B628[arg1] = D_801390B4[arg0];
}
INCLUDE_ASM("asm/dra/nonmatchings/75F54", func_801349F4);
INCLUDE_ASM("asm/us/dra/nonmatchings/75F54", func_801349F4);
INCLUDE_ASM("asm/dra/nonmatchings/75F54", func_80134B48);
INCLUDE_ASM("asm/us/dra/nonmatchings/75F54", func_80134B48);
INCLUDE_ASM("asm/dra/nonmatchings/75F54", func_80134C60);
INCLUDE_ASM("asm/us/dra/nonmatchings/75F54", func_80134C60);
INCLUDE_ASM("asm/dra/nonmatchings/75F54", func_80134D14);
INCLUDE_ASM("asm/us/dra/nonmatchings/75F54", func_80134D14);
INCLUDE_ASM("asm/dra/nonmatchings/75F54", func_80134E64);
INCLUDE_ASM("asm/us/dra/nonmatchings/75F54", func_80134E64);
INCLUDE_ASM("asm/dra/nonmatchings/75F54", func_80134F50);
INCLUDE_ASM("asm/us/dra/nonmatchings/75F54", func_80134F50);
void func_80134F50();

10
src/dra/953A0.c
View File

@ -40,7 +40,7 @@ void func_801353A0(void) {
}
}
INCLUDE_ASM("asm/dra/nonmatchings/953A0", func_80135484);
INCLUDE_ASM("asm/us/dra/nonmatchings/953A0", func_80135484);
void func_80135624(s16 arg0, s32 arg1, s32 arg2, s16 arg3, s16 arg4) {
if (arg2 != 0) {
@ -54,7 +54,7 @@ void func_80135624(s16 arg0, s32 arg1, s32 arg2, s16 arg3, s16 arg4) {
D_8013AED4[arg1] = D_800BF55A[arg0 * 7];
}
INCLUDE_ASM("asm/dra/nonmatchings/953A0", func_8013572C);
INCLUDE_ASM("asm/us/dra/nonmatchings/953A0", func_8013572C);
s16 func_80135C00(s16 arg0) {
arg0++;
@ -66,13 +66,13 @@ s16 func_80135C00(s16 arg0) {
return arg0;
}
INCLUDE_ASM("asm/dra/nonmatchings/953A0", func_80135C2C);
INCLUDE_ASM("asm/us/dra/nonmatchings/953A0", func_80135C2C);
void func_80135C2C();
INCLUDE_ASM("asm/dra/nonmatchings/953A0", func_80135D8C);
INCLUDE_ASM("asm/us/dra/nonmatchings/953A0", func_80135D8C);
void func_80135D8C();
INCLUDE_ASM("asm/dra/nonmatchings/953A0", func_80136010);
INCLUDE_ASM("asm/us/dra/nonmatchings/953A0", func_80136010);
void func_801361F8(void) {
if (D_8013AEEC != 0) {

22
src/main/5A38.c
View File

@ -2,7 +2,7 @@
#include <game.h>
#include <psxsdk/libetc.h>
INCLUDE_ASM("asm/main/nonmatchings/5A38", PadInit);
INCLUDE_ASM("asm/us/main/nonmatchings/5A38", PadInit);
// void PadInit(s32 arg0) {
// D_80073080 = arg0;
// D_8003925C = -1;
@ -11,31 +11,31 @@ INCLUDE_ASM("asm/main/nonmatchings/5A38", PadInit);
// ChangeClearPAD(0);
// }
INCLUDE_ASM("asm/main/nonmatchings/5A38", PadRead);
INCLUDE_ASM("asm/us/main/nonmatchings/5A38", PadRead);
INCLUDE_ASM("asm/main/nonmatchings/5A38", PadStop);
INCLUDE_ASM("asm/us/main/nonmatchings/5A38", PadStop);
INCLUDE_ASM("asm/main/nonmatchings/5A38", StopPAD);
INCLUDE_ASM("asm/us/main/nonmatchings/5A38", StopPAD);
INCLUDE_ASM("asm/main/nonmatchings/5A38", PAD_init);
INCLUDE_ASM("asm/us/main/nonmatchings/5A38", PAD_init);
INCLUDE_ASM("asm/main/nonmatchings/5A38", PAD_dr);
INCLUDE_ASM("asm/us/main/nonmatchings/5A38", PAD_dr);
INCLUDE_ASM("asm/main/nonmatchings/5A38", VSync);
INCLUDE_ASM("asm/us/main/nonmatchings/5A38", VSync);
INCLUDE_ASM("asm/main/nonmatchings/5A38", v_wait);
INCLUDE_ASM("asm/us/main/nonmatchings/5A38", v_wait);
INCLUDE_ASM("asm/main/nonmatchings/5A38", ChangeClearRCnt);
INCLUDE_ASM("asm/us/main/nonmatchings/5A38", ChangeClearRCnt);
int ResetCallback(void) { return D_8002D340->ResetCallback(); }
INCLUDE_ASM("asm/main/nonmatchings/5A38", InterruptCallback);
INCLUDE_ASM("asm/us/main/nonmatchings/5A38", InterruptCallback);
void* DMACallback(int dma, void (*func)()) {
return D_8002D340->DMACallback(dma, func);
}
INCLUDE_ASM("asm/main/nonmatchings/5A38", VSyncCallback);
INCLUDE_ASM("asm/us/main/nonmatchings/5A38", VSyncCallback);
// int VSyncCallback(void (*f)()) {
// return D_8002D340->VSyncCallbacks(0, f);
// }

46
src/main/5E78.c
View File

@ -1,47 +1,47 @@
#include "common.h"
INCLUDE_ASM("asm/main/nonmatchings/5E78", SetIntrMask);
INCLUDE_ASM("asm/us/main/nonmatchings/5E78", SetIntrMask);
INCLUDE_ASM("asm/main/nonmatchings/5E78", startIntr);
INCLUDE_ASM("asm/us/main/nonmatchings/5E78", startIntr);
INCLUDE_ASM("asm/main/nonmatchings/5E78", trapIntr);
INCLUDE_ASM("asm/us/main/nonmatchings/5E78", trapIntr);
INCLUDE_ASM("asm/main/nonmatchings/5E78", setIntr);
INCLUDE_ASM("asm/us/main/nonmatchings/5E78", setIntr);
INCLUDE_ASM("asm/main/nonmatchings/5E78", stopIntr);
INCLUDE_ASM("asm/us/main/nonmatchings/5E78", stopIntr);
INCLUDE_ASM("asm/main/nonmatchings/5E78", restartIntr);
INCLUDE_ASM("asm/us/main/nonmatchings/5E78", restartIntr);
INCLUDE_ASM("asm/main/nonmatchings/5E78", memclr);
INCLUDE_ASM("asm/us/main/nonmatchings/5E78", memclr);
INCLUDE_ASM("asm/main/nonmatchings/5E78", _96_remove);
INCLUDE_ASM("asm/us/main/nonmatchings/5E78", _96_remove);
INCLUDE_ASM("asm/main/nonmatchings/5E78", ReturnFromException);
INCLUDE_ASM("asm/us/main/nonmatchings/5E78", ReturnFromException);
INCLUDE_ASM("asm/main/nonmatchings/5E78", ResetEntryInt);
INCLUDE_ASM("asm/us/main/nonmatchings/5E78", ResetEntryInt);
INCLUDE_ASM("asm/main/nonmatchings/5E78", HookEntryInt);
INCLUDE_ASM("asm/us/main/nonmatchings/5E78", HookEntryInt);
INCLUDE_ASM("asm/main/nonmatchings/5E78", EnterCriticalSection);
INCLUDE_ASM("asm/us/main/nonmatchings/5E78", EnterCriticalSection);
INCLUDE_ASM("asm/main/nonmatchings/5E78", ExitCriticalSection);
INCLUDE_ASM("asm/us/main/nonmatchings/5E78", ExitCriticalSection);
INCLUDE_ASM("asm/main/nonmatchings/5E78", startIntrVSync);
INCLUDE_ASM("asm/us/main/nonmatchings/5E78", startIntrVSync);
INCLUDE_ASM("asm/main/nonmatchings/5E78", trapIntrVSync);
INCLUDE_ASM("asm/us/main/nonmatchings/5E78", trapIntrVSync);
INCLUDE_ASM("asm/main/nonmatchings/5E78", setIntrVSync);
INCLUDE_ASM("asm/us/main/nonmatchings/5E78", setIntrVSync);
INCLUDE_ASM("asm/main/nonmatchings/5E78", VSync_memclr);
INCLUDE_ASM("asm/us/main/nonmatchings/5E78", VSync_memclr);
INCLUDE_ASM("asm/main/nonmatchings/5E78", startIntrDMA);
INCLUDE_ASM("asm/us/main/nonmatchings/5E78", startIntrDMA);
INCLUDE_ASM("asm/main/nonmatchings/5E78", trapIntrDMA);
INCLUDE_ASM("asm/us/main/nonmatchings/5E78", trapIntrDMA);
INCLUDE_ASM("asm/main/nonmatchings/5E78", setIntrDMA);
INCLUDE_ASM("asm/us/main/nonmatchings/5E78", setIntrDMA);
INCLUDE_ASM("asm/main/nonmatchings/5E78", DMA_memclr);
INCLUDE_ASM("asm/us/main/nonmatchings/5E78", DMA_memclr);
INCLUDE_ASM("asm/main/nonmatchings/5E78", SetVideoMode);
INCLUDE_ASM("asm/us/main/nonmatchings/5E78", SetVideoMode);
INCLUDE_ASM("asm/main/nonmatchings/5E78", GetVideoMode);
INCLUDE_ASM("asm/us/main/nonmatchings/5E78", GetVideoMode);

4
src/main/7190.c
View File

@ -1,5 +1,5 @@
#include "common.h"
INCLUDE_ASM("asm/main/nonmatchings/7190", memchr);
INCLUDE_ASM("asm/us/main/nonmatchings/7190", memchr);
INCLUDE_ASM("asm/main/nonmatchings/7190", memmove);
INCLUDE_ASM("asm/us/main/nonmatchings/7190", memmove);

178
src/main/72A4.c
View File

@ -1,181 +1,181 @@
#include "common.h"
#include <game.h>
INCLUDE_ASM("asm/main/nonmatchings/72A4", GsInitVcount);
INCLUDE_ASM("asm/us/main/nonmatchings/72A4", GsInitVcount);
INCLUDE_ASM("asm/main/nonmatchings/72A4", SetRCnt);
INCLUDE_ASM("asm/us/main/nonmatchings/72A4", SetRCnt);
INCLUDE_ASM("asm/main/nonmatchings/72A4", GetRCnt);
INCLUDE_ASM("asm/us/main/nonmatchings/72A4", GetRCnt);
INCLUDE_ASM("asm/main/nonmatchings/72A4", StartRCnt);
INCLUDE_ASM("asm/us/main/nonmatchings/72A4", StartRCnt);
INCLUDE_ASM("asm/main/nonmatchings/72A4", StopRCnt);
INCLUDE_ASM("asm/us/main/nonmatchings/72A4", StopRCnt);
INCLUDE_ASM("asm/main/nonmatchings/72A4", ResetRCnt);
INCLUDE_ASM("asm/us/main/nonmatchings/72A4", ResetRCnt);
INCLUDE_ASM("asm/main/nonmatchings/72A4", GsGetVcount);
INCLUDE_ASM("asm/us/main/nonmatchings/72A4", GsGetVcount);
INCLUDE_ASM("asm/main/nonmatchings/72A4", GsClearVcount);
INCLUDE_ASM("asm/us/main/nonmatchings/72A4", GsClearVcount);
INCLUDE_ASM("asm/main/nonmatchings/72A4", rsin);
INCLUDE_ASM("asm/us/main/nonmatchings/72A4", rsin);
INCLUDE_ASM("asm/main/nonmatchings/72A4", sin_1);
INCLUDE_ASM("asm/us/main/nonmatchings/72A4", sin_1);
INCLUDE_ASM("asm/main/nonmatchings/72A4", rcos);
INCLUDE_ASM("asm/us/main/nonmatchings/72A4", rcos);
INCLUDE_ASM("asm/main/nonmatchings/72A4", SetFogNear);
INCLUDE_ASM("asm/us/main/nonmatchings/72A4", SetFogNear);
INCLUDE_ASM("asm/main/nonmatchings/72A4", InitGeom);
INCLUDE_ASM("asm/us/main/nonmatchings/72A4", InitGeom);
INCLUDE_ASM("asm/main/nonmatchings/72A4", SquareRoot0);
INCLUDE_ASM("asm/us/main/nonmatchings/72A4", SquareRoot0);
INCLUDE_ASM("asm/main/nonmatchings/72A4", func_80016F7C);
INCLUDE_ASM("asm/us/main/nonmatchings/72A4", func_80016F7C);
INCLUDE_ASM("asm/main/nonmatchings/72A4", func_80017008);
INCLUDE_ASM("asm/us/main/nonmatchings/72A4", func_80017008);
INCLUDE_ASM("asm/main/nonmatchings/72A4", func_80017078);
INCLUDE_ASM("asm/us/main/nonmatchings/72A4", func_80017078);
INCLUDE_ASM("asm/main/nonmatchings/72A4", func_80017134);
INCLUDE_ASM("asm/us/main/nonmatchings/72A4", func_80017134);
INCLUDE_ASM("asm/main/nonmatchings/72A4", SquareRoot12);
INCLUDE_ASM("asm/us/main/nonmatchings/72A4", SquareRoot12);
INCLUDE_ASM("asm/main/nonmatchings/72A4", CompMatrix);
INCLUDE_ASM("asm/us/main/nonmatchings/72A4", CompMatrix);
INCLUDE_ASM("asm/main/nonmatchings/72A4", func_8001741C);
INCLUDE_ASM("asm/us/main/nonmatchings/72A4", func_8001741C);
INCLUDE_ASM("asm/main/nonmatchings/72A4", func_80017528);
INCLUDE_ASM("asm/us/main/nonmatchings/72A4", func_80017528);
INCLUDE_ASM("asm/main/nonmatchings/72A4", func_8001760C);
INCLUDE_ASM("asm/us/main/nonmatchings/72A4", func_8001760C);
INCLUDE_ASM("asm/main/nonmatchings/72A4", SetMulMatrix);
INCLUDE_ASM("asm/us/main/nonmatchings/72A4", SetMulMatrix);
INCLUDE_ASM("asm/main/nonmatchings/72A4", func_80017804);
INCLUDE_ASM("asm/us/main/nonmatchings/72A4", func_80017804);
INCLUDE_ASM("asm/main/nonmatchings/72A4", func_80017964);
INCLUDE_ASM("asm/us/main/nonmatchings/72A4", func_80017964);
INCLUDE_ASM("asm/main/nonmatchings/72A4", func_80017994);
INCLUDE_ASM("asm/us/main/nonmatchings/72A4", func_80017994);
INCLUDE_ASM("asm/main/nonmatchings/72A4", PushMatrix);
INCLUDE_ASM("asm/us/main/nonmatchings/72A4", PushMatrix);
INCLUDE_ASM("asm/main/nonmatchings/72A4", PopMatrix);
INCLUDE_ASM("asm/us/main/nonmatchings/72A4", PopMatrix);
INCLUDE_ASM("asm/main/nonmatchings/72A4", func_80017BF8);
INCLUDE_ASM("asm/us/main/nonmatchings/72A4", func_80017BF8);
INCLUDE_ASM("asm/main/nonmatchings/72A4", func_80017C40);
INCLUDE_ASM("asm/us/main/nonmatchings/72A4", func_80017C40);
INCLUDE_ASM("asm/main/nonmatchings/72A4", ReadColorMatrix);
INCLUDE_ASM("asm/us/main/nonmatchings/72A4", ReadColorMatrix);
INCLUDE_ASM("asm/main/nonmatchings/72A4", TransMatrix);
INCLUDE_ASM("asm/us/main/nonmatchings/72A4", TransMatrix);
INCLUDE_ASM("asm/main/nonmatchings/72A4", ScaleMatrix);
INCLUDE_ASM("asm/us/main/nonmatchings/72A4", ScaleMatrix);
INCLUDE_ASM("asm/main/nonmatchings/72A4", SetRotMatrix);
INCLUDE_ASM("asm/us/main/nonmatchings/72A4", SetRotMatrix);
INCLUDE_ASM("asm/main/nonmatchings/72A4", SetLightMatrix);
INCLUDE_ASM("asm/us/main/nonmatchings/72A4", SetLightMatrix);
INCLUDE_ASM("asm/main/nonmatchings/72A4", SetColorMatrix);
INCLUDE_ASM("asm/us/main/nonmatchings/72A4", SetColorMatrix);
INCLUDE_ASM("asm/main/nonmatchings/72A4", SetTransMatrix);
INCLUDE_ASM("asm/us/main/nonmatchings/72A4", SetTransMatrix);
INCLUDE_ASM("asm/main/nonmatchings/72A4", SetVertex0);
INCLUDE_ASM("asm/us/main/nonmatchings/72A4", SetVertex0);
INCLUDE_ASM("asm/main/nonmatchings/72A4", SetVertex1);
INCLUDE_ASM("asm/us/main/nonmatchings/72A4", SetVertex1);
INCLUDE_ASM("asm/main/nonmatchings/72A4", SetVertex2);
INCLUDE_ASM("asm/us/main/nonmatchings/72A4", SetVertex2);
INCLUDE_ASM("asm/main/nonmatchings/72A4", SetVertexTri);
INCLUDE_ASM("asm/us/main/nonmatchings/72A4", SetVertexTri);
INCLUDE_ASM("asm/main/nonmatchings/72A4", SetRGBfifo);
INCLUDE_ASM("asm/us/main/nonmatchings/72A4", SetRGBfifo);
INCLUDE_ASM("asm/main/nonmatchings/72A4", SetIR123);
INCLUDE_ASM("asm/us/main/nonmatchings/72A4", SetIR123);
INCLUDE_ASM("asm/main/nonmatchings/72A4", SetIR0);
INCLUDE_ASM("asm/us/main/nonmatchings/72A4", SetIR0);
INCLUDE_ASM("asm/main/nonmatchings/72A4", SetSZfifo3);
INCLUDE_ASM("asm/us/main/nonmatchings/72A4", SetSZfifo3);
INCLUDE_ASM("asm/main/nonmatchings/72A4", SetSZfifo4);
INCLUDE_ASM("asm/us/main/nonmatchings/72A4", SetSZfifo4);
INCLUDE_ASM("asm/main/nonmatchings/72A4", SetSXSYfifo);
INCLUDE_ASM("asm/us/main/nonmatchings/72A4", SetSXSYfifo);
INCLUDE_ASM("asm/main/nonmatchings/72A4", SetRii);
INCLUDE_ASM("asm/us/main/nonmatchings/72A4", SetRii);
INCLUDE_ASM("asm/main/nonmatchings/72A4", SetMAC123);
INCLUDE_ASM("asm/us/main/nonmatchings/72A4", SetMAC123);
INCLUDE_ASM("asm/main/nonmatchings/72A4", SetData32);
INCLUDE_ASM("asm/us/main/nonmatchings/72A4", SetData32);
INCLUDE_ASM("asm/main/nonmatchings/72A4", SetDQA);
INCLUDE_ASM("asm/us/main/nonmatchings/72A4", SetDQA);
INCLUDE_ASM("asm/main/nonmatchings/72A4", SetDQB);
INCLUDE_ASM("asm/us/main/nonmatchings/72A4", SetDQB);
INCLUDE_ASM("asm/main/nonmatchings/72A4", SetBackColor);
INCLUDE_ASM("asm/us/main/nonmatchings/72A4", SetBackColor);
INCLUDE_ASM("asm/main/nonmatchings/72A4", SetFarColor);
INCLUDE_ASM("asm/us/main/nonmatchings/72A4", SetFarColor);
INCLUDE_ASM("asm/main/nonmatchings/72A4", SetGeomOffset);
INCLUDE_ASM("asm/us/main/nonmatchings/72A4", SetGeomOffset);
INCLUDE_ASM("asm/main/nonmatchings/72A4", SetGeomScreen);
INCLUDE_ASM("asm/us/main/nonmatchings/72A4", SetGeomScreen);
INCLUDE_ASM("asm/main/nonmatchings/72A4", LocalLight);
INCLUDE_ASM("asm/us/main/nonmatchings/72A4", LocalLight);
INCLUDE_ASM("asm/main/nonmatchings/72A4", DpqColor);
INCLUDE_ASM("asm/us/main/nonmatchings/72A4", DpqColor);
INCLUDE_ASM("asm/main/nonmatchings/72A4", NormalColor);
INCLUDE_ASM("asm/us/main/nonmatchings/72A4", NormalColor);
INCLUDE_ASM("asm/main/nonmatchings/72A4", NormalColor3);
INCLUDE_ASM("asm/us/main/nonmatchings/72A4", NormalColor3);
INCLUDE_ASM("asm/main/nonmatchings/72A4", NormalColorDpq);
INCLUDE_ASM("asm/us/main/nonmatchings/72A4", NormalColorDpq);
INCLUDE_ASM("asm/main/nonmatchings/72A4", NormalColorDpq3);
INCLUDE_ASM("asm/us/main/nonmatchings/72A4", NormalColorDpq3);
INCLUDE_ASM("asm/main/nonmatchings/72A4", NormalColorCol);
INCLUDE_ASM("asm/us/main/nonmatchings/72A4", NormalColorCol);
INCLUDE_ASM("asm/main/nonmatchings/72A4", NormalColorCol3);
INCLUDE_ASM("asm/us/main/nonmatchings/72A4", NormalColorCol3);
INCLUDE_ASM("asm/main/nonmatchings/72A4", ColorDpq);
INCLUDE_ASM("asm/us/main/nonmatchings/72A4", ColorDpq);
INCLUDE_ASM("asm/main/nonmatchings/72A4", ColorCol);
INCLUDE_ASM("asm/us/main/nonmatchings/72A4", ColorCol);
INCLUDE_ASM("asm/main/nonmatchings/72A4", AverageSZ3);
INCLUDE_ASM("asm/us/main/nonmatchings/72A4", AverageSZ3);
INCLUDE_ASM("asm/main/nonmatchings/72A4", AverageSZ4);
INCLUDE_ASM("asm/us/main/nonmatchings/72A4", AverageSZ4);
INCLUDE_ASM("asm/main/nonmatchings/72A4", RotTransPers);
INCLUDE_ASM("asm/us/main/nonmatchings/72A4", RotTransPers);
INCLUDE_ASM("asm/main/nonmatchings/72A4", RotTransPers3);
INCLUDE_ASM("asm/us/main/nonmatchings/72A4", RotTransPers3);
INCLUDE_ASM("asm/main/nonmatchings/72A4", RotTrans);
INCLUDE_ASM("asm/us/main/nonmatchings/72A4", RotTrans);
INCLUDE_ASM("asm/main/nonmatchings/72A4", NormalClip);
INCLUDE_ASM("asm/us/main/nonmatchings/72A4", NormalClip);
INCLUDE_ASM("asm/main/nonmatchings/72A4", RotTransPers4);
INCLUDE_ASM("asm/us/main/nonmatchings/72A4", RotTransPers4);
INCLUDE_ASM("asm/main/nonmatchings/72A4", RotAverage3);
INCLUDE_ASM("asm/us/main/nonmatchings/72A4", RotAverage3);
INCLUDE_ASM("asm/main/nonmatchings/72A4", RotAverage4);
INCLUDE_ASM("asm/us/main/nonmatchings/72A4", RotAverage4);
INCLUDE_ASM("asm/main/nonmatchings/72A4", RotAverageNclip3);
INCLUDE_ASM("asm/us/main/nonmatchings/72A4", RotAverageNclip3);
INCLUDE_ASM("asm/main/nonmatchings/72A4", RotAverageNclip4);
INCLUDE_ASM("asm/us/main/nonmatchings/72A4", RotAverageNclip4);
INCLUDE_ASM("asm/main/nonmatchings/72A4", RotAverageNclipColorCol3);
INCLUDE_ASM("asm/us/main/nonmatchings/72A4", RotAverageNclipColorCol3);
INCLUDE_ASM("asm/main/nonmatchings/72A4", RotMatrix);
INCLUDE_ASM("asm/us/main/nonmatchings/72A4", RotMatrix);
INCLUDE_ASM("asm/main/nonmatchings/72A4", RotMatrixYXZ);
INCLUDE_ASM("asm/us/main/nonmatchings/72A4", RotMatrixYXZ);
INCLUDE_ASM("asm/main/nonmatchings/72A4", RotMatrixX);
INCLUDE_ASM("asm/us/main/nonmatchings/72A4", RotMatrixX);
INCLUDE_ASM("asm/main/nonmatchings/72A4", RotMatrixY);
INCLUDE_ASM("asm/us/main/nonmatchings/72A4", RotMatrixY);
INCLUDE_ASM("asm/main/nonmatchings/72A4", RotMatrixZ);
INCLUDE_ASM("asm/us/main/nonmatchings/72A4", RotMatrixZ);
INCLUDE_ASM("asm/main/nonmatchings/72A4", ratan2);
INCLUDE_ASM("asm/us/main/nonmatchings/72A4", ratan2);
INCLUDE_ASM("asm/main/nonmatchings/72A4", patch_gte);
INCLUDE_ASM("asm/us/main/nonmatchings/72A4", patch_gte);
INCLUDE_ASM("asm/main/nonmatchings/72A4", func_8001929C);
INCLUDE_ASM("asm/us/main/nonmatchings/72A4", func_8001929C);
INCLUDE_ASM("asm/main/nonmatchings/72A4", FlushCache);
INCLUDE_ASM("asm/us/main/nonmatchings/72A4", FlushCache);
void func_800192DC(s32 arg0, s32 arg1) {
D_800987C8 = arg0;
@ -184,7 +184,7 @@ void func_800192DC(s32 arg0, s32 arg1) {
}
#ifndef NON_EQUIVALENT
INCLUDE_ASM("asm/main/nonmatchings/72A4", CdInit);
INCLUDE_ASM("asm/us/main/nonmatchings/72A4", CdInit);
#else
int CdInit() {
int i;

2
src/main/psxsdk/sprintf.c
View File

@ -1,3 +1,3 @@
#include "common.h"
INCLUDE_ASM("asm/main/nonmatchings/psxsdk/sprintf", sprintf);
INCLUDE_ASM("asm/us/main/nonmatchings/psxsdk/sprintf", sprintf);

26
src/ric/1AC60.c
View File

@ -21,21 +21,21 @@ void func_80156C60(Entity* entity) {
*ptr++ = 0;
}
INCLUDE_ASM("asm/ric/nonmatchings/1AC60", func_80156CCC);
INCLUDE_ASM("asm/us/ric/nonmatchings/1AC60", func_80156CCC);
INCLUDE_ASM("asm/ric/nonmatchings/1AC60", func_80156DE4);
INCLUDE_ASM("asm/us/ric/nonmatchings/1AC60", func_80156DE4);
INCLUDE_ASM("asm/ric/nonmatchings/1AC60", func_80156F40);
INCLUDE_ASM("asm/us/ric/nonmatchings/1AC60", func_80156F40);
INCLUDE_ASM("asm/ric/nonmatchings/1AC60", func_801572A8);
INCLUDE_ASM("asm/us/ric/nonmatchings/1AC60", func_801572A8);
INCLUDE_ASM("asm/ric/nonmatchings/1AC60", func_80157894);
INCLUDE_ASM("asm/us/ric/nonmatchings/1AC60", func_80157894);
// https://decomp.me/scratch/hk5zb
// Almost matched, just a jump issue
INCLUDE_ASM("asm/ric/nonmatchings/1AC60", func_80157A50);
INCLUDE_ASM("asm/us/ric/nonmatchings/1AC60", func_80157A50);
INCLUDE_ASM("asm/ric/nonmatchings/1AC60", UpdateEntityRichter);
INCLUDE_ASM("asm/us/ric/nonmatchings/1AC60", UpdateEntityRichter);
void func_801587C0() { D_80175956 = 0; }
@ -54,7 +54,7 @@ void func_80158814(void) {
PLAYER.palette = D_80175954;
}
INCLUDE_ASM("asm/ric/nonmatchings/1AC60", func_8015885C);
INCLUDE_ASM("asm/us/ric/nonmatchings/1AC60", func_8015885C);
void func_80158B04(s32 arg0) {
s32 var_s0;
@ -215,7 +215,7 @@ void func_80158FA4(void) {
}
}
INCLUDE_ASM("asm/ric/nonmatchings/1AC60", func_801590A0);
INCLUDE_ASM("asm/us/ric/nonmatchings/1AC60", func_801590A0);
void func_801595D8(void) {
if (!func_8015DBB0(0x9009)) {
@ -232,7 +232,7 @@ void func_801595D8(void) {
}
}
INCLUDE_ASM("asm/ric/nonmatchings/1AC60", func_80159670);
INCLUDE_ASM("asm/us/ric/nonmatchings/1AC60", func_80159670);
void func_80159BC8(void) {
PLAYER.animFrameDuration = 0;
@ -281,11 +281,11 @@ void func_80159C04(void) {
}
}
INCLUDE_ASM("asm/ric/nonmatchings/1AC60", func_80159CE4);
INCLUDE_ASM("asm/us/ric/nonmatchings/1AC60", func_80159CE4);
INCLUDE_ASM("asm/ric/nonmatchings/1AC60", func_8015A7D0);
INCLUDE_ASM("asm/us/ric/nonmatchings/1AC60", func_8015A7D0);
INCLUDE_ASM("asm/ric/nonmatchings/1AC60", func_8015A9B0);
INCLUDE_ASM("asm/us/ric/nonmatchings/1AC60", func_8015A9B0);
void func_8015AFE0(void) {
if (PLAYER.unk2E == 0) {

2
src/ric/1F348.c
View File

@ -129,7 +129,7 @@ void func_8015B348(void) {
}
}
INCLUDE_ASM("asm/ric/nonmatchings/1F348", func_8015B898);
INCLUDE_ASM("asm/us/ric/nonmatchings/1F348", func_8015B898);
// same as DRA/func_80115C50
void func_8015BB80(void) {

4
src/ric/202A8.c
View File

@ -61,9 +61,9 @@ void func_8015C2A8(void) {
}
}
INCLUDE_ASM("asm/ric/nonmatchings/202A8", func_8015C4AC);
INCLUDE_ASM("asm/us/ric/nonmatchings/202A8", func_8015C4AC);
INCLUDE_ASM("asm/ric/nonmatchings/202A8", func_8015C6D4);
INCLUDE_ASM("asm/us/ric/nonmatchings/202A8", func_8015C6D4);
void func_8015C908(s32 step) {
PLAYER.step = step;

110
src/ric/20920.c
View File

@ -273,14 +273,14 @@ void func_8015D120(void) {
}
}
INCLUDE_ASM("asm/ric/nonmatchings/20920", func_8015D1D0);
INCLUDE_ASM("asm/us/ric/nonmatchings/20920", func_8015D1D0);
// decompiling func_8015FB84 first is recommended to discover struct
INCLUDE_ASM("asm/ric/nonmatchings/20920", func_8015D250);
INCLUDE_ASM("asm/us/ric/nonmatchings/20920", func_8015D250);
INCLUDE_ASM("asm/ric/nonmatchings/20920", func_8015D3CC);
INCLUDE_ASM("asm/us/ric/nonmatchings/20920", func_8015D3CC);
INCLUDE_ASM("asm/ric/nonmatchings/20920", func_8015D678);
INCLUDE_ASM("asm/us/ric/nonmatchings/20920", func_8015D678);
void func_8015D9B4() { func_8015C908(22); }
@ -322,10 +322,10 @@ void func_8015DB04(void) {
g_api.PlaySfx(0x707);
}
INCLUDE_ASM("asm/ric/nonmatchings/20920", func_8015DBB0);
INCLUDE_ASM("asm/us/ric/nonmatchings/20920", func_8015DBB0);
// same as func_800E2398
INCLUDE_ASM("asm/ric/nonmatchings/20920", func_8015E380);
INCLUDE_ASM("asm/us/ric/nonmatchings/20920", func_8015E380);
void func_8015E420(s32 arg0) {
while (PadRead(0))
@ -334,7 +334,7 @@ void func_8015E420(s32 arg0) {
func_8015E380(arg0);
}
INCLUDE_ASM("asm/ric/nonmatchings/20920", func_8015E484);
INCLUDE_ASM("asm/us/ric/nonmatchings/20920", func_8015E484);
void func_8015E7B4(Unkstruct_8010BF64* arg0) { // !FAKE:
s32 temp = D_80154604;
@ -345,13 +345,13 @@ void func_8015E7B4(Unkstruct_8010BF64* arg0) { // !FAKE:
arg0->unk20 = D_801545EA[0] + 1;
}
INCLUDE_ASM("asm/ric/nonmatchings/20920", func_8015E800);
INCLUDE_ASM("asm/us/ric/nonmatchings/20920", func_8015E800);
INCLUDE_ASM("asm/ric/nonmatchings/20920", func_8015EE28);
INCLUDE_ASM("asm/us/ric/nonmatchings/20920", func_8015EE28);
INCLUDE_ASM("asm/ric/nonmatchings/20920", func_8015F414);
INCLUDE_ASM("asm/us/ric/nonmatchings/20920", func_8015F414);
INCLUDE_ASM("asm/ric/nonmatchings/20920", func_8015F680);
INCLUDE_ASM("asm/us/ric/nonmatchings/20920", func_8015F680);
Entity* func_8015F8F8(s16 entityIndex, s16 arg1) {
Entity* entity = &g_EntityArray[entityIndex];
@ -369,15 +369,15 @@ Entity* func_8015F8F8(s16 entityIndex, s16 arg1) {
return NULL;
}
INCLUDE_ASM("asm/ric/nonmatchings/20920", func_8015F96C);
INCLUDE_ASM("asm/us/ric/nonmatchings/20920", func_8015F96C);
INCLUDE_ASM("asm/ric/nonmatchings/20920", func_8015F9F0);
INCLUDE_ASM("asm/us/ric/nonmatchings/20920", func_8015F9F0);
// This function matches with GCC 2.7.2 using -01 Compilation flags
// Matches with GCC 2.6.0 + aspsx 2.3.4
// https://decomp.me/scratch/VaPMV
#ifndef NON_MATCHING
INCLUDE_ASM("asm/ric/nonmatchings/20920", func_8015FA5C);
INCLUDE_ASM("asm/us/ric/nonmatchings/20920", func_8015FA5C);
#else
extern s32 D_80154674[];
extern s32 D_80154675[];
@ -401,7 +401,7 @@ void func_8015FA5C(s32 arg0) {
// aspsx
// https://decomp.me/scratch/bRvg6
#ifndef NON_MATCHING
INCLUDE_ASM("asm/ric/nonmatchings/20920", func_8015FAB8);
INCLUDE_ASM("asm/us/ric/nonmatchings/20920", func_8015FAB8);
#else
void func_8015FAB8(Entity* entity) {
u16 var_v0;
@ -427,11 +427,11 @@ void func_8015FAB8(Entity* entity) {
}
#endif
INCLUDE_ASM("asm/ric/nonmatchings/20920", func_8015FB84);
INCLUDE_ASM("asm/us/ric/nonmatchings/20920", func_8015FB84);
INCLUDE_ASM("asm/ric/nonmatchings/20920", func_8015FDB0);
INCLUDE_ASM("asm/us/ric/nonmatchings/20920", func_8015FDB0);
INCLUDE_ASM("asm/ric/nonmatchings/20920", func_8015FEA8);
INCLUDE_ASM("asm/us/ric/nonmatchings/20920", func_8015FEA8);
// same as DRA/func_8011F074
void func_801601DC(Entity* entity) {
@ -483,7 +483,7 @@ void func_801603B4(void) {}
void func_801603BC(void) {}
INCLUDE_ASM("asm/ric/nonmatchings/20920", func_801603C4);
INCLUDE_ASM("asm/us/ric/nonmatchings/20920", func_801603C4);
Entity* func_801606BC(Entity* srcEntity, u32 arg1, s32 arg2) {
/**
@ -512,11 +512,11 @@ Entity* func_801606BC(Entity* srcEntity, u32 arg1, s32 arg2) {
return entity;
}
INCLUDE_ASM("asm/ric/nonmatchings/20920", func_80160788);
INCLUDE_ASM("asm/us/ric/nonmatchings/20920", func_80160788);
// move a0,s0
#ifndef NON_MATCHING
INCLUDE_ASM("asm/ric/nonmatchings/20920", func_80160C38);
INCLUDE_ASM("asm/us/ric/nonmatchings/20920", func_80160C38);
#else
void func_80160C38(Entity* entity) {
if (PLAYER.step == 17) {
@ -550,7 +550,7 @@ void func_80160C38(Entity* entity) {
// aspatch jumps to the wrong instruction
// Matches with PSY-Q 3.5 + aspsx 2.3.4
#ifndef NON_MATCHING
INCLUDE_ASM("asm/ric/nonmatchings/20920", func_80160D2C);
INCLUDE_ASM("asm/us/ric/nonmatchings/20920", func_80160D2C);
#else
void func_80160D2C(Entity* self) {
if (PLAYER.step != 26) {
@ -631,15 +631,15 @@ void func_80160F0C(Entity* self) {
}
}
INCLUDE_ASM("asm/ric/nonmatchings/20920", func_80160FC4);
INCLUDE_ASM("asm/us/ric/nonmatchings/20920", func_80160FC4);
INCLUDE_ASM("asm/ric/nonmatchings/20920", func_8016147C);
INCLUDE_ASM("asm/us/ric/nonmatchings/20920", func_8016147C);
INCLUDE_ASM("asm/ric/nonmatchings/20920", func_80161C2C);
INCLUDE_ASM("asm/us/ric/nonmatchings/20920", func_80161C2C);
INCLUDE_ASM("asm/ric/nonmatchings/20920", func_80161EF8);
INCLUDE_ASM("asm/us/ric/nonmatchings/20920", func_80161EF8);
INCLUDE_ASM("asm/ric/nonmatchings/20920", func_80161FF0);
INCLUDE_ASM("asm/us/ric/nonmatchings/20920", func_80161FF0);
void func_801623E0(Entity* entity) {
POLY_GT4* poly;
@ -701,7 +701,7 @@ void func_801623E0(Entity* entity) {
* Aspatch jumps to the wrong instruction
*/
#ifndef NON_MATCHING
INCLUDE_ASM("asm/ric/nonmatchings/20920", func_80162604);
INCLUDE_ASM("asm/us/ric/nonmatchings/20920", func_80162604);
#else
void func_80162604(Entity* entity) {
POLY_GT4* poly;
@ -775,7 +775,7 @@ void func_80162604(Entity* entity) {
}
#endif
INCLUDE_ASM("asm/ric/nonmatchings/20920", func_80162870);
INCLUDE_ASM("asm/us/ric/nonmatchings/20920", func_80162870);
void func_80162C7C(void) {}
@ -788,7 +788,7 @@ void func_80162C7C(void) {}
* CAUTION: rodata yet to be confirmed matching
*/
#ifndef NON_MATCHING
INCLUDE_ASM("asm/ric/nonmatchings/20920", func_80162C84);
INCLUDE_ASM("asm/us/ric/nonmatchings/20920", func_80162C84);
#else
extern s32 D_80154ED4;
extern s32 D_80154EF8;
@ -870,7 +870,7 @@ bool func_80162E9C(Entity* entity) {
return false;
}
INCLUDE_ASM("asm/ric/nonmatchings/20920", func_80162EF8);
INCLUDE_ASM("asm/us/ric/nonmatchings/20920", func_80162EF8);
void func_801641A0(Entity* entity) {
POLY_GT4* poly;
@ -945,11 +945,11 @@ void func_801641A0(Entity* entity) {
}
}
INCLUDE_ASM("asm/ric/nonmatchings/20920", func_80164444);
INCLUDE_ASM("asm/us/ric/nonmatchings/20920", func_80164444);
INCLUDE_ASM("asm/ric/nonmatchings/20920", func_80164DF8);
INCLUDE_ASM("asm/us/ric/nonmatchings/20920", func_80164DF8);
INCLUDE_ASM("asm/ric/nonmatchings/20920", func_801656B0);
INCLUDE_ASM("asm/us/ric/nonmatchings/20920", func_801656B0);
void func_80165DD8(POLY_GT4* poly, s32 colorIntensity, s32 y, s32 radius,
bool arg4) {
@ -1064,9 +1064,9 @@ void func_80166044() {
PLAYER.blendMode = 0;
}
INCLUDE_ASM("asm/ric/nonmatchings/20920", func_80166060);
INCLUDE_ASM("asm/us/ric/nonmatchings/20920", func_80166060);
INCLUDE_ASM("asm/ric/nonmatchings/20920", func_80166784);
INCLUDE_ASM("asm/us/ric/nonmatchings/20920", func_80166784);
void func_8016779C(Entity* entity) {
if (D_80072F66 == 0) {
@ -1139,11 +1139,11 @@ void func_80167A60(void) {}
void func_80167A68(void) {}
INCLUDE_ASM("asm/ric/nonmatchings/20920", func_80167A70);
INCLUDE_ASM("asm/us/ric/nonmatchings/20920", func_80167A70);
INCLUDE_ASM("asm/ric/nonmatchings/20920", func_80167EC4);
INCLUDE_ASM("asm/us/ric/nonmatchings/20920", func_80167EC4);
INCLUDE_ASM("asm/ric/nonmatchings/20920", func_801682B4);
INCLUDE_ASM("asm/us/ric/nonmatchings/20920", func_801682B4);
s32 func_8016840C(s16 x, s16 y) {
CollisionResult sp10;
@ -1168,15 +1168,15 @@ s32 func_8016840C(s16 x, s16 y) {
return 2;
}
INCLUDE_ASM("asm/ric/nonmatchings/20920", func_801684D8);
INCLUDE_ASM("asm/us/ric/nonmatchings/20920", func_801684D8);
INCLUDE_ASM("asm/ric/nonmatchings/20920", func_80168A20);
INCLUDE_ASM("asm/us/ric/nonmatchings/20920", func_80168A20);
INCLUDE_ASM("asm/ric/nonmatchings/20920", func_8016902C);
INCLUDE_ASM("asm/us/ric/nonmatchings/20920", func_8016902C);
INCLUDE_ASM("asm/ric/nonmatchings/20920", func_80169470);
INCLUDE_ASM("asm/us/ric/nonmatchings/20920", func_80169470);
INCLUDE_ASM("asm/ric/nonmatchings/20920", func_80169704);
INCLUDE_ASM("asm/us/ric/nonmatchings/20920", func_80169704);
void func_80169C10(Entity* entity) {
POLY_GT4* poly;
@ -1264,13 +1264,13 @@ void func_80169D74(Entity* entity) {
entity->unk80.modeS16.unk0 = (entity->unk80.modeS16.unk0 + 1) & 0x3F;
}
INCLUDE_ASM("asm/ric/nonmatchings/20920", func_80169F04);
INCLUDE_ASM("asm/us/ric/nonmatchings/20920", func_80169F04);
INCLUDE_ASM("asm/ric/nonmatchings/20920", func_8016A26C);
INCLUDE_ASM("asm/us/ric/nonmatchings/20920", func_8016A26C);
INCLUDE_ASM("asm/ric/nonmatchings/20920", func_8016A974);
INCLUDE_ASM("asm/us/ric/nonmatchings/20920", func_8016A974);
INCLUDE_ASM("asm/ric/nonmatchings/20920", func_8016B0C0);
INCLUDE_ASM("asm/us/ric/nonmatchings/20920", func_8016B0C0);
void func_8016B8E8(s32 arg0) {
g_CurrentEntity->unk7C.s = (arg0 << 0x10 >> 0xF) - g_CurrentEntity->unk7C.s;
@ -1288,9 +1288,9 @@ void func_8016B92C(s16 arg0) {
}
}
INCLUDE_ASM("asm/ric/nonmatchings/20920", func_8016B97C);
INCLUDE_ASM("asm/us/ric/nonmatchings/20920", func_8016B97C);
INCLUDE_ASM("asm/ric/nonmatchings/20920", func_8016C1BC);
INCLUDE_ASM("asm/us/ric/nonmatchings/20920", func_8016C1BC);
s32 func_8016C6C4(Unkstruct_80128BBC* arg0, u8 value) {
u8 ret = 0;
@ -1312,9 +1312,9 @@ s32 func_8016C6C4(Unkstruct_80128BBC* arg0, u8 value) {
return ret;
}
INCLUDE_ASM("asm/ric/nonmatchings/20920", func_8016C734);
INCLUDE_ASM("asm/us/ric/nonmatchings/20920", func_8016C734);
INCLUDE_ASM("asm/ric/nonmatchings/20920", func_8016CC74);
INCLUDE_ASM("asm/us/ric/nonmatchings/20920", func_8016CC74);
void func_8016D328(Entity* entity) {
s16 firstPolygonIndex;
@ -1361,7 +1361,7 @@ void func_8016D328(Entity* entity) {
}
}
INCLUDE_ASM("asm/ric/nonmatchings/20920", func_8016D4D8);
INCLUDE_ASM("asm/us/ric/nonmatchings/20920", func_8016D4D8);
void func_8016D920(Entity* entity) {
switch (entity->step) {
@ -1382,6 +1382,6 @@ void func_8016D920(Entity* entity) {
}
}
INCLUDE_ASM("asm/ric/nonmatchings/20920", func_8016D9C4);
INCLUDE_ASM("asm/us/ric/nonmatchings/20920", func_8016D9C4);
INCLUDE_ASM("asm/ric/nonmatchings/20920", func_8016DF74);
INCLUDE_ASM("asm/us/ric/nonmatchings/20920", func_8016DF74);

26
src/ric/32324.c
View File

@ -39,13 +39,13 @@ void func_8016E324(Entity* entity) {
}
}
INCLUDE_ASM("asm/ric/nonmatchings/32324", func_8016E46C);
INCLUDE_ASM("asm/us/ric/nonmatchings/32324", func_8016E46C);
INCLUDE_ASM("asm/ric/nonmatchings/32324", func_8016E9E4);
INCLUDE_ASM("asm/us/ric/nonmatchings/32324", func_8016E9E4);
INCLUDE_ASM("asm/ric/nonmatchings/32324", func_8016F198);
INCLUDE_ASM("asm/us/ric/nonmatchings/32324", func_8016F198);
INCLUDE_ASM("asm/ric/nonmatchings/32324", func_8016F6F0);
INCLUDE_ASM("asm/us/ric/nonmatchings/32324", func_8016F6F0);
void func_80170548(Entity* entity) {
switch (entity->step) {
@ -74,7 +74,7 @@ void func_80170548(Entity* entity) {
* to be included in a NON_MATCHING state.
*/
#ifndef NON_MATCHING
INCLUDE_ASM("asm/ric/nonmatchings/32324", func_801705EC);
INCLUDE_ASM("asm/us/ric/nonmatchings/32324", func_801705EC);
#else
void func_80156C60(Entity* entity);
@ -114,17 +114,17 @@ void func_801705EC(Entity* entity) {
}
#endif
INCLUDE_ASM("asm/ric/nonmatchings/32324", func_801706C0);
INCLUDE_ASM("asm/us/ric/nonmatchings/32324", func_801706C0);
INCLUDE_ASM("asm/ric/nonmatchings/32324", func_80170874);
INCLUDE_ASM("asm/us/ric/nonmatchings/32324", func_80170874);
INCLUDE_ASM("asm/ric/nonmatchings/32324", func_8017091C);
INCLUDE_ASM("asm/us/ric/nonmatchings/32324", func_8017091C);
INCLUDE_ASM("asm/ric/nonmatchings/32324", func_80170F64);
INCLUDE_ASM("asm/us/ric/nonmatchings/32324", func_80170F64);
INCLUDE_ASM("asm/ric/nonmatchings/32324", func_8017161C);
INCLUDE_ASM("asm/us/ric/nonmatchings/32324", func_8017161C);
INCLUDE_ASM("asm/ric/nonmatchings/32324", func_801719A4);
INCLUDE_ASM("asm/us/ric/nonmatchings/32324", func_801719A4);
void func_80172AE8(Entity* entity) {
POLY_GT4* poly;
@ -181,6 +181,6 @@ void func_80172AE8(Entity* entity) {
entity->unk7E.modeU8.unk0;
}
INCLUDE_ASM("asm/ric/nonmatchings/32324", func_80172D00);
INCLUDE_ASM("asm/us/ric/nonmatchings/32324", func_80172D00);
INCLUDE_ASM("asm/ric/nonmatchings/32324", func_8017328C);
INCLUDE_ASM("asm/us/ric/nonmatchings/32324", func_8017328C);

20
src/servant/tt_000/10E8.c
View File

@ -42,7 +42,7 @@ void func_801710E8(Entity* entity, s32* arg1) {
}
}
INCLUDE_ASM("asm/servant/tt_000/nonmatchings/10E8", func_8017110C);
INCLUDE_ASM("asm/us/servant/tt_000/nonmatchings/10E8", func_8017110C);
s32 func_801713C8(Entity* entity) {
if (entity->unk3C == 0)
@ -202,10 +202,10 @@ void func_801718A0(Entity* entity) {
poly->y2 = poly->y3 = poly->y0 + D_80170608[frame].height;
}
INCLUDE_ASM("asm/servant/tt_000/nonmatchings/10E8", func_801719E0);
INCLUDE_ASM("asm/us/servant/tt_000/nonmatchings/10E8", func_801719E0);
#ifndef NON_EQUIVALENT
INCLUDE_ASM("asm/servant/tt_000/nonmatchings/10E8", func_80171ED4);
INCLUDE_ASM("asm/us/servant/tt_000/nonmatchings/10E8", func_80171ED4);
#else
extern void* D_8003C788;
extern u16 D_8006F3CC[];
@ -276,9 +276,9 @@ void func_80171ED4(s32 arg0) {
}
#endif
INCLUDE_ASM("asm/servant/tt_000/nonmatchings/10E8", func_80172120);
INCLUDE_ASM("asm/us/servant/tt_000/nonmatchings/10E8", func_80172120);
INCLUDE_ASM("asm/servant/tt_000/nonmatchings/10E8", func_80172C30);
INCLUDE_ASM("asm/us/servant/tt_000/nonmatchings/10E8", func_80172C30);
void func_8017339C(void) {}
@ -294,7 +294,7 @@ void func_801733C4(void) {}
void func_801733CC(void) {}
INCLUDE_ASM("asm/servant/tt_000/nonmatchings/10E8", func_801733D4);
INCLUDE_ASM("asm/us/servant/tt_000/nonmatchings/10E8", func_801733D4);
void func_80173C0C(void) {}
@ -311,7 +311,7 @@ void func_80173C2C(Entity* entity) {
DestroyEntity(entity);
}
INCLUDE_ASM("asm/servant/tt_000/nonmatchings/10E8", func_80173C64);
INCLUDE_ASM("asm/us/servant/tt_000/nonmatchings/10E8", func_80173C64);
void DestroyEntity(Entity* entity) {
s32 i;
@ -399,7 +399,7 @@ s32 func_80173FE8(Entity* entity, s32 x, s32 y) {
// PSY-Q 3.5 match as in GCC a jump skips a 'nop'
#ifndef NON_MATCHING
INCLUDE_ASM("asm/servant/tt_000/nonmatchings/10E8", func_80174038);
INCLUDE_ASM("asm/us/servant/tt_000/nonmatchings/10E8", func_80174038);
#else
void func_80174038(Entity* entity) {
switch (entity->step) {
@ -471,7 +471,7 @@ void func_80174038(Entity* entity) {
#endif
// TODO func_80174210
INCLUDE_ASM("asm/servant/tt_000/nonmatchings/10E8", func_80174210);
INCLUDE_ASM("asm/us/servant/tt_000/nonmatchings/10E8", func_80174210);
void func_801745E4(Entity* entityParent, u16 objectId, u16 subId) {
Entity* entity;
@ -499,7 +499,7 @@ init_entity:
// PSY-Q 3.5 match as in GCC a jump skips a 'nop'
#ifndef NON_MATCHING
INCLUDE_ASM("asm/servant/tt_000/nonmatchings/10E8", func_801746A0);
INCLUDE_ASM("asm/us/servant/tt_000/nonmatchings/10E8", func_801746A0);
#else
s32 func_801746A0(s32 arg0) {
if (D_800733E4 < 0 && !(*D_80072F20 & 1))

176
src/st/cen/D600.c
View File

@ -16,17 +16,17 @@ extern s16 D_8019D3B4;
extern s16 D_8019D3B6;
extern s32 D_8019D3B8;
INCLUDE_ASM("asm/st/cen/nonmatchings/D600", func_8018D600);
INCLUDE_ASM("asm/us/st/cen/nonmatchings/D600", func_8018D600);
INCLUDE_ASM("asm/st/cen/nonmatchings/D600", func_8018D6E0);
INCLUDE_ASM("asm/us/st/cen/nonmatchings/D600", func_8018D6E0);
INCLUDE_ASM("asm/st/cen/nonmatchings/D600", func_8018D89C);
INCLUDE_ASM("asm/us/st/cen/nonmatchings/D600", func_8018D89C);
INCLUDE_ASM("asm/st/cen/nonmatchings/D600", func_8018DB18);
INCLUDE_ASM("asm/us/st/cen/nonmatchings/D600", func_8018DB18);
INCLUDE_ASM("asm/st/cen/nonmatchings/D600", func_8018DF0C);
INCLUDE_ASM("asm/us/st/cen/nonmatchings/D600", func_8018DF0C);
INCLUDE_ASM("asm/st/cen/nonmatchings/D600", func_8018DF60);
INCLUDE_ASM("asm/us/st/cen/nonmatchings/D600", func_8018DF60);
void func_8018E124(s16 arg0) {
RECT rect;
@ -38,9 +38,9 @@ void func_8018E124(s16 arg0) {
ClearImage(&rect, 0, 0, 0);
}
INCLUDE_ASM("asm/st/cen/nonmatchings/D600", func_8018E180);
INCLUDE_ASM("asm/us/st/cen/nonmatchings/D600", func_8018E180);
INCLUDE_ASM("asm/st/cen/nonmatchings/D600", func_8018E238);
INCLUDE_ASM("asm/us/st/cen/nonmatchings/D600", func_8018E238);
void func_8018E3BC(s32 arg0) {
D_8019D3B8 = arg0 + 0x100000;
@ -48,11 +48,11 @@ void func_8018E3BC(s32 arg0) {
D_8019D3B4 = 1;
}
INCLUDE_ASM("asm/st/cen/nonmatchings/D600", func_8018E3E8);
INCLUDE_ASM("asm/us/st/cen/nonmatchings/D600", func_8018E3E8);
INCLUDE_ASM("asm/st/cen/nonmatchings/D600", func_8018E6C4);
INCLUDE_ASM("asm/us/st/cen/nonmatchings/D600", func_8018E6C4);
INCLUDE_ASM("asm/st/cen/nonmatchings/D600", func_8018E7C8);
INCLUDE_ASM("asm/us/st/cen/nonmatchings/D600", func_8018E7C8);
void func_8018F890(s16 arg0) {
s16 temp_v0 = arg0 - *(s16*)&g_CurrentRoom.height;
@ -66,42 +66,42 @@ void func_8018F890(s16 arg0) {
}
}
INCLUDE_ASM("asm/st/cen/nonmatchings/D600", func_8018F8EC);
INCLUDE_ASM("asm/us/st/cen/nonmatchings/D600", func_8018F8EC);
INCLUDE_ASM("asm/st/cen/nonmatchings/D600", func_8018F95C);
INCLUDE_ASM("asm/us/st/cen/nonmatchings/D600", func_8018F95C);
INCLUDE_ASM("asm/st/cen/nonmatchings/D600", func_8019007C);
INCLUDE_ASM("asm/us/st/cen/nonmatchings/D600", func_8019007C);
INCLUDE_ASM("asm/st/cen/nonmatchings/D600", func_80190374);
INCLUDE_ASM("asm/us/st/cen/nonmatchings/D600", func_80190374);
INCLUDE_ASM("asm/st/cen/nonmatchings/D600", func_8019040C);
INCLUDE_ASM("asm/us/st/cen/nonmatchings/D600", func_8019040C);
INCLUDE_ASM("asm/st/cen/nonmatchings/D600", func_801904B8);
INCLUDE_ASM("asm/us/st/cen/nonmatchings/D600", func_801904B8);
INCLUDE_ASM("asm/st/cen/nonmatchings/D600", func_80190540);
INCLUDE_ASM("asm/us/st/cen/nonmatchings/D600", func_80190540);
INCLUDE_ASM("asm/st/cen/nonmatchings/D600", func_80190A78);
INCLUDE_ASM("asm/us/st/cen/nonmatchings/D600", func_80190A78);
INCLUDE_ASM("asm/st/cen/nonmatchings/D600", func_80190B64);
INCLUDE_ASM("asm/us/st/cen/nonmatchings/D600", func_80190B64);
s32 Random(void) {
g_randomNext = (g_randomNext * 0x01010101) + 1;
return g_randomNext >> 0x18;
}
INCLUDE_ASM("asm/st/cen/nonmatchings/D600", func_80190E7C);
INCLUDE_ASM("asm/us/st/cen/nonmatchings/D600", func_80190E7C);
INCLUDE_ASM("asm/st/cen/nonmatchings/D600", func_80191178);
INCLUDE_ASM("asm/us/st/cen/nonmatchings/D600", func_80191178);
INCLUDE_ASM("asm/st/cen/nonmatchings/D600", func_80191280);
INCLUDE_ASM("asm/us/st/cen/nonmatchings/D600", func_80191280);
INCLUDE_ASM("asm/st/cen/nonmatchings/D600", func_80192398);
INCLUDE_ASM("asm/us/st/cen/nonmatchings/D600", func_80192398);
INCLUDE_ASM("asm/st/cen/nonmatchings/D600", func_80192A3C);
INCLUDE_ASM("asm/us/st/cen/nonmatchings/D600", func_80192A3C);
INCLUDE_ASM("asm/st/cen/nonmatchings/D600", func_80192B00);
INCLUDE_ASM("asm/us/st/cen/nonmatchings/D600", func_80192B00);
INCLUDE_ASM("asm/st/cen/nonmatchings/D600", func_80192C18);
INCLUDE_ASM("asm/us/st/cen/nonmatchings/D600", func_80192C18);
void func_80192D30(s16 arg0) {
while (1) {
@ -123,9 +123,9 @@ void func_80192D7C(s16 arg0) {
}
}
INCLUDE_ASM("asm/st/cen/nonmatchings/D600", func_80192DD4);
INCLUDE_ASM("asm/us/st/cen/nonmatchings/D600", func_80192DD4);
INCLUDE_ASM("asm/st/cen/nonmatchings/D600", func_80192ED0);
INCLUDE_ASM("asm/us/st/cen/nonmatchings/D600", func_80192ED0);
void func_80192FE4(s16 arg0) {
while (true) {
@ -147,13 +147,13 @@ void func_80193030(s16 arg0) {
}
}
INCLUDE_ASM("asm/st/cen/nonmatchings/D600", func_80193088);
INCLUDE_ASM("asm/us/st/cen/nonmatchings/D600", func_80193088);
INCLUDE_ASM("asm/st/cen/nonmatchings/D600", func_80193184);
INCLUDE_ASM("asm/us/st/cen/nonmatchings/D600", func_80193184);
INCLUDE_ASM("asm/st/cen/nonmatchings/D600", func_80193298);
INCLUDE_ASM("asm/us/st/cen/nonmatchings/D600", func_80193298);
INCLUDE_ASM("asm/st/cen/nonmatchings/D600", func_80193410);
INCLUDE_ASM("asm/us/st/cen/nonmatchings/D600", func_80193410);
void CreateEntityFromCurrentEntity(u16 arg0, Entity* arg1) {
DestroyEntity(arg1);
@ -164,11 +164,11 @@ void CreateEntityFromCurrentEntity(u16 arg0, Entity* arg1) {
}
void CreateEntityFromEntity(u16 objectId, Entity* source, Entity* entity);
INCLUDE_ASM("asm/st/cen/nonmatchings/D600", func_80193538);
INCLUDE_ASM("asm/us/st/cen/nonmatchings/D600", func_80193538);
INCLUDE_ASM("asm/st/cen/nonmatchings/D600", func_801935B4);
INCLUDE_ASM("asm/us/st/cen/nonmatchings/D600", func_801935B4);
INCLUDE_ASM("asm/st/cen/nonmatchings/D600", func_8019362C);
INCLUDE_ASM("asm/us/st/cen/nonmatchings/D600", func_8019362C);
void DestroyEntity(Entity* entity) {
s32 i;
@ -185,7 +185,7 @@ void DestroyEntity(Entity* entity) {
*ptr++ = 0;
}
INCLUDE_ASM("asm/st/cen/nonmatchings/D600", func_801942D0);
INCLUDE_ASM("asm/us/st/cen/nonmatchings/D600", func_801942D0);
void func_8019434C(Entity* entity) {
if (entity->objectRoomIndex) {
@ -196,9 +196,9 @@ void func_8019434C(Entity* entity) {
}
}
INCLUDE_ASM("asm/st/cen/nonmatchings/D600", func_80194394);
INCLUDE_ASM("asm/us/st/cen/nonmatchings/D600", func_80194394);
INCLUDE_ASM("asm/st/cen/nonmatchings/D600", func_8019444C);
INCLUDE_ASM("asm/us/st/cen/nonmatchings/D600", func_8019444C);
/*
* Returns the absolute distance from g_CurrentEntity to player in the X Axis
@ -244,11 +244,11 @@ void func_80194648(void) {
}
}
INCLUDE_ASM("asm/st/cen/nonmatchings/D600", func_80194674);
INCLUDE_ASM("asm/us/st/cen/nonmatchings/D600", func_80194674);
INCLUDE_ASM("asm/st/cen/nonmatchings/D600", func_801948EC);
INCLUDE_ASM("asm/us/st/cen/nonmatchings/D600", func_801948EC);
INCLUDE_ASM("asm/st/cen/nonmatchings/D600", AllocEntity);
INCLUDE_ASM("asm/us/st/cen/nonmatchings/D600", AllocEntity);
s32 func_80194B34(u8 arg0, s16 arg1) { return D_80180BBC[arg0] * arg1; }
@ -380,9 +380,9 @@ void func_80194EC4(u8 arg0) {
entity->animFrameDuration = 0;
}
INCLUDE_ASM("asm/st/cen/nonmatchings/D600", func_80194EE0);
INCLUDE_ASM("asm/us/st/cen/nonmatchings/D600", func_80194EE0);
INCLUDE_ASM("asm/st/cen/nonmatchings/D600", InitializeEntity);
INCLUDE_ASM("asm/us/st/cen/nonmatchings/D600", InitializeEntity);
void func_80195070(Entity* entity) {
if (entity->step == 0) {
@ -390,25 +390,25 @@ void func_80195070(Entity* entity) {
}
}
INCLUDE_ASM("asm/st/cen/nonmatchings/D600", func_80195098);
INCLUDE_ASM("asm/us/st/cen/nonmatchings/D600", func_80195098);
INCLUDE_ASM("asm/st/cen/nonmatchings/D600", func_801951C0);
INCLUDE_ASM("asm/us/st/cen/nonmatchings/D600", func_801951C0);
INCLUDE_ASM("asm/st/cen/nonmatchings/D600", func_80195318);
INCLUDE_ASM("asm/us/st/cen/nonmatchings/D600", func_80195318);
INCLUDE_ASM("asm/st/cen/nonmatchings/D600", func_8019565C);
INCLUDE_ASM("asm/us/st/cen/nonmatchings/D600", func_8019565C);
INCLUDE_ASM("asm/st/cen/nonmatchings/D600", func_80195714);
INCLUDE_ASM("asm/us/st/cen/nonmatchings/D600", func_80195714);
INCLUDE_ASM("asm/st/cen/nonmatchings/D600", func_80195798);
INCLUDE_ASM("asm/us/st/cen/nonmatchings/D600", func_80195798);
INCLUDE_ASM("asm/st/cen/nonmatchings/D600", func_801958F4);
INCLUDE_ASM("asm/us/st/cen/nonmatchings/D600", func_801958F4);
INCLUDE_ASM("asm/st/cen/nonmatchings/D600", func_80195974);
INCLUDE_ASM("asm/us/st/cen/nonmatchings/D600", func_80195974);
INCLUDE_ASM("asm/st/cen/nonmatchings/D600", func_80195A50);
INCLUDE_ASM("asm/us/st/cen/nonmatchings/D600", func_80195A50);
INCLUDE_ASM("asm/st/cen/nonmatchings/D600", func_80195B68);
INCLUDE_ASM("asm/us/st/cen/nonmatchings/D600", func_80195B68);
void func_80195C0C(void) {
g_api.PlaySfx(0x67A);
@ -418,23 +418,23 @@ void func_80195C0C(void) {
void func_80195C5C(void) { DestroyEntity(g_CurrentEntity); }
INCLUDE_ASM("asm/st/cen/nonmatchings/D600", func_80195C84);
INCLUDE_ASM("asm/us/st/cen/nonmatchings/D600", func_80195C84);
INCLUDE_ASM("asm/st/cen/nonmatchings/D600", EntityExplosion);
INCLUDE_ASM("asm/us/st/cen/nonmatchings/D600", EntityExplosion);
INCLUDE_ASM("asm/st/cen/nonmatchings/D600", func_801965F4);
INCLUDE_ASM("asm/us/st/cen/nonmatchings/D600", func_801965F4);
INCLUDE_ASM("asm/st/cen/nonmatchings/D600", func_80196698);
INCLUDE_ASM("asm/us/st/cen/nonmatchings/D600", func_80196698);
INCLUDE_ASM("asm/st/cen/nonmatchings/D600", func_80196C80);
INCLUDE_ASM("asm/us/st/cen/nonmatchings/D600", func_80196C80);
INCLUDE_ASM("asm/st/cen/nonmatchings/D600", func_80196F30);
INCLUDE_ASM("asm/us/st/cen/nonmatchings/D600", func_80196F30);
INCLUDE_ASM("asm/st/cen/nonmatchings/D600", func_80197A00);
INCLUDE_ASM("asm/us/st/cen/nonmatchings/D600", func_80197A00);
INCLUDE_ASM("asm/st/cen/nonmatchings/D600", func_80197B28);
INCLUDE_ASM("asm/us/st/cen/nonmatchings/D600", func_80197B28);
INCLUDE_ASM("asm/st/cen/nonmatchings/D600", func_80198084);
INCLUDE_ASM("asm/us/st/cen/nonmatchings/D600", func_80198084);
extern u16 D_80180440[];
void func_80198174(Entity* entity) {
@ -463,53 +463,53 @@ void func_80198174(Entity* entity) {
}
}
INCLUDE_ASM("asm/st/cen/nonmatchings/D600", func_80198284);
INCLUDE_ASM("asm/us/st/cen/nonmatchings/D600", func_80198284);
INCLUDE_ASM("asm/st/cen/nonmatchings/D600", func_801983B4);
INCLUDE_ASM("asm/us/st/cen/nonmatchings/D600", func_801983B4);
INCLUDE_ASM("asm/st/cen/nonmatchings/D600", func_8019849C);
INCLUDE_ASM("asm/us/st/cen/nonmatchings/D600", func_8019849C);
INCLUDE_ASM("asm/st/cen/nonmatchings/D600", func_8019858C);
INCLUDE_ASM("asm/us/st/cen/nonmatchings/D600", func_8019858C);
INCLUDE_ASM("asm/st/cen/nonmatchings/D600", func_80198680);
INCLUDE_ASM("asm/us/st/cen/nonmatchings/D600", func_80198680);
INCLUDE_ASM("asm/st/cen/nonmatchings/D600", func_801988B0);
INCLUDE_ASM("asm/us/st/cen/nonmatchings/D600", func_801988B0);
INCLUDE_ASM("asm/st/cen/nonmatchings/D600", func_801989AC);
INCLUDE_ASM("asm/us/st/cen/nonmatchings/D600", func_801989AC);
INCLUDE_ASM("asm/st/cen/nonmatchings/D600", func_80198F2C);
INCLUDE_ASM("asm/us/st/cen/nonmatchings/D600", func_80198F2C);
INCLUDE_ASM("asm/st/cen/nonmatchings/D600", func_8019902C);
INCLUDE_ASM("asm/us/st/cen/nonmatchings/D600", func_8019902C);
INCLUDE_ASM("asm/st/cen/nonmatchings/D600", func_801990F8);
INCLUDE_ASM("asm/us/st/cen/nonmatchings/D600", func_801990F8);
INCLUDE_ASM("asm/st/cen/nonmatchings/D600", func_801991C0);
INCLUDE_ASM("asm/us/st/cen/nonmatchings/D600", func_801991C0);
INCLUDE_ASM("asm/st/cen/nonmatchings/D600", func_80199278);
INCLUDE_ASM("asm/us/st/cen/nonmatchings/D600", func_80199278);
INCLUDE_ASM("asm/st/cen/nonmatchings/D600", func_80199450);
INCLUDE_ASM("asm/us/st/cen/nonmatchings/D600", func_80199450);
INCLUDE_ASM("asm/st/cen/nonmatchings/D600", func_80199A30);
INCLUDE_ASM("asm/us/st/cen/nonmatchings/D600", func_80199A30);
INCLUDE_ASM("asm/st/cen/nonmatchings/D600", func_8019A130);
INCLUDE_ASM("asm/us/st/cen/nonmatchings/D600", func_8019A130);
INCLUDE_ASM("asm/st/cen/nonmatchings/D600", func_8019A328);
INCLUDE_ASM("asm/us/st/cen/nonmatchings/D600", func_8019A328);
INCLUDE_ASM("asm/st/cen/nonmatchings/D600", func_8019A420);
INCLUDE_ASM("asm/us/st/cen/nonmatchings/D600", func_8019A420);
INCLUDE_ASM("asm/st/cen/nonmatchings/D600", func_8019A5F0);
INCLUDE_ASM("asm/us/st/cen/nonmatchings/D600", func_8019A5F0);
INCLUDE_ASM("asm/st/cen/nonmatchings/D600", func_8019B274);
INCLUDE_ASM("asm/us/st/cen/nonmatchings/D600", func_8019B274);
INCLUDE_ASM("asm/st/cen/nonmatchings/D600", func_8019B608);
INCLUDE_ASM("asm/us/st/cen/nonmatchings/D600", func_8019B608);
INCLUDE_ASM("asm/st/cen/nonmatchings/D600", func_8019BAB8);
INCLUDE_ASM("asm/us/st/cen/nonmatchings/D600", func_8019BAB8);
INCLUDE_ASM("asm/st/cen/nonmatchings/D600", func_8019BBA4);
INCLUDE_ASM("asm/us/st/cen/nonmatchings/D600", func_8019BBA4);
INCLUDE_ASM("asm/st/cen/nonmatchings/D600", func_8019BED4);
INCLUDE_ASM("asm/us/st/cen/nonmatchings/D600", func_8019BED4);
INCLUDE_ASM("asm/st/cen/nonmatchings/D600", func_8019C2BC);
INCLUDE_ASM("asm/us/st/cen/nonmatchings/D600", func_8019C2BC);
POLY_GT4* func_8019C40C(POLY_GT4* poly) {
while (poly != NULL) {
@ -549,7 +549,7 @@ POLY_GT4* func_8019C43C(POLY_GT4* poly, u8 index) {
return NULL;
}
INCLUDE_ASM("asm/st/cen/nonmatchings/D600", func_8019C4B8);
INCLUDE_ASM("asm/us/st/cen/nonmatchings/D600", func_8019C4B8);
void func_8019C540(POLY_GT4* poly) {
poly->p1 = 0;

138
src/st/dre/11A64.c
View File

@ -81,7 +81,7 @@ void func_80191A64(Entity* entity) {
AnimateEntity(obj->unk10, entity);
}
INCLUDE_ASM("asm/st/dre/nonmatchings/11A64", func_80191B44);
INCLUDE_ASM("asm/us/st/dre/nonmatchings/11A64", func_80191B44);
extern u16 g_eBreakableInit[];
extern u8* g_eBreakableAnimations[];
@ -113,11 +113,11 @@ void EntityBreakable(Entity* entity) {
}
}
INCLUDE_ASM("asm/st/dre/nonmatchings/11A64", func_80191E34);
INCLUDE_ASM("asm/us/st/dre/nonmatchings/11A64", func_80191E34);
INCLUDE_ASM("asm/st/dre/nonmatchings/11A64", func_80192104);
INCLUDE_ASM("asm/us/st/dre/nonmatchings/11A64", func_80192104);
INCLUDE_ASM("asm/st/dre/nonmatchings/11A64", func_80193B3C);
INCLUDE_ASM("asm/us/st/dre/nonmatchings/11A64", func_80193B3C);
void func_80193D7C(Entity* entity) {
if (entity->step == 0) {
@ -140,11 +140,11 @@ void func_80193D7C(Entity* entity) {
entity->zPriority = PLAYER.zPriority + 4;
}
INCLUDE_ASM("asm/st/dre/nonmatchings/11A64", func_80193E18);
INCLUDE_ASM("asm/us/st/dre/nonmatchings/11A64", func_80193E18);
INCLUDE_ASM("asm/st/dre/nonmatchings/11A64", func_80194214);
INCLUDE_ASM("asm/us/st/dre/nonmatchings/11A64", func_80194214);
INCLUDE_ASM("asm/st/dre/nonmatchings/11A64", func_80194488);
INCLUDE_ASM("asm/us/st/dre/nonmatchings/11A64", func_80194488);
void func_801946C4(Entity* entity) {
switch (entity->step) {
@ -177,7 +177,7 @@ void func_80194774(void) {
D_801A3EDE = D_801A3EE0 + 20;
}
INCLUDE_ASM("asm/st/dre/nonmatchings/11A64", func_801947C8);
INCLUDE_ASM("asm/us/st/dre/nonmatchings/11A64", func_801947C8);
void func_8019498C(s16 yOffset) {
RECT rect;
@ -189,9 +189,9 @@ void func_8019498C(s16 yOffset) {
ClearImage(&rect, 0, 0, 0);
}
INCLUDE_ASM("asm/st/dre/nonmatchings/11A64", func_801949E8);
INCLUDE_ASM("asm/us/st/dre/nonmatchings/11A64", func_801949E8);
INCLUDE_ASM("asm/st/dre/nonmatchings/11A64", func_80194AA0);
INCLUDE_ASM("asm/us/st/dre/nonmatchings/11A64", func_80194AA0);
void func_80194C24(s32 arg0) {
D_801A3F18 = arg0 + 0x100000;
@ -199,13 +199,13 @@ void func_80194C24(s32 arg0) {
D_801A3F14 = 1;
}
INCLUDE_ASM("asm/st/dre/nonmatchings/11A64", func_80194C50);
INCLUDE_ASM("asm/us/st/dre/nonmatchings/11A64", func_80194C50);
INCLUDE_ASM("asm/st/dre/nonmatchings/11A64", func_80194F14);
INCLUDE_ASM("asm/us/st/dre/nonmatchings/11A64", func_80194F14);
INCLUDE_ASM("asm/st/dre/nonmatchings/11A64", func_80194FF4);
INCLUDE_ASM("asm/us/st/dre/nonmatchings/11A64", func_80194FF4);
INCLUDE_ASM("asm/st/dre/nonmatchings/11A64", func_801950F8);
INCLUDE_ASM("asm/us/st/dre/nonmatchings/11A64", func_801950F8);
void func_801961DC(s16 arg0) {
s16 temp_v0 = arg0 - *(s16*)D_8009740C;
@ -219,26 +219,26 @@ void func_801961DC(s16 arg0) {
}
}
INCLUDE_ASM("asm/st/dre/nonmatchings/11A64", func_80196238);
INCLUDE_ASM("asm/us/st/dre/nonmatchings/11A64", func_80196238);
INCLUDE_ASM("asm/st/dre/nonmatchings/11A64", func_80196678);
INCLUDE_ASM("asm/us/st/dre/nonmatchings/11A64", func_80196678);
INCLUDE_ASM("asm/st/dre/nonmatchings/11A64", func_8019697C);
INCLUDE_ASM("asm/us/st/dre/nonmatchings/11A64", func_8019697C);
INCLUDE_ASM("asm/st/dre/nonmatchings/11A64", func_80196CC8);
INCLUDE_ASM("asm/us/st/dre/nonmatchings/11A64", func_80196CC8);
s32 Random(void) {
g_randomNext = (g_randomNext * 0x01010101) + 1;
return g_randomNext >> 0x18;
}
INCLUDE_ASM("asm/st/dre/nonmatchings/11A64", Update);
INCLUDE_ASM("asm/us/st/dre/nonmatchings/11A64", Update);
INCLUDE_ASM("asm/st/dre/nonmatchings/11A64", func_801972BC);
INCLUDE_ASM("asm/us/st/dre/nonmatchings/11A64", func_801972BC);
INCLUDE_ASM("asm/st/dre/nonmatchings/11A64", func_801973C4);
INCLUDE_ASM("asm/us/st/dre/nonmatchings/11A64", func_801973C4);
INCLUDE_ASM("asm/st/dre/nonmatchings/11A64", EntityNumericDamage);
INCLUDE_ASM("asm/us/st/dre/nonmatchings/11A64", EntityNumericDamage);
void CreateEntityFromLayout(Entity* entity, LayoutObject* initDesc) {
DestroyEntity(entity);
@ -253,9 +253,9 @@ void CreateEntityFromLayout(Entity* entity, LayoutObject* initDesc) {
entity->unk68 = (initDesc->objectId >> 0xA) & 7;
}
INCLUDE_ASM("asm/st/dre/nonmatchings/11A64", func_80198C44);
INCLUDE_ASM("asm/us/st/dre/nonmatchings/11A64", func_80198C44);
INCLUDE_ASM("asm/st/dre/nonmatchings/11A64", func_80198D5C);
INCLUDE_ASM("asm/us/st/dre/nonmatchings/11A64", func_80198D5C);
void func_80198E74(s16 arg0) {
while (1) {
@ -279,9 +279,9 @@ void func_80198EC0(s16 arg0) {
}
}
INCLUDE_ASM("asm/st/dre/nonmatchings/11A64", func_80198F18);
INCLUDE_ASM("asm/us/st/dre/nonmatchings/11A64", func_80198F18);
INCLUDE_ASM("asm/st/dre/nonmatchings/11A64", func_80199014);
INCLUDE_ASM("asm/us/st/dre/nonmatchings/11A64", func_80199014);
void func_80199128(s16 arg0) {
while (1) {
@ -305,11 +305,11 @@ void func_80199174(s16 arg0) {
}
}
INCLUDE_ASM("asm/st/dre/nonmatchings/11A64", func_801991CC);
INCLUDE_ASM("asm/us/st/dre/nonmatchings/11A64", func_801991CC);
INCLUDE_ASM("asm/st/dre/nonmatchings/11A64", func_801992C8);
INCLUDE_ASM("asm/us/st/dre/nonmatchings/11A64", func_801992C8);
INCLUDE_ASM("asm/st/dre/nonmatchings/11A64", func_801993DC);
INCLUDE_ASM("asm/us/st/dre/nonmatchings/11A64", func_801993DC);
void func_80199554(void) {
Unkstruct8* currentRoomTileLayout = &g_CurrentRoomTileLayout;
@ -366,7 +366,7 @@ s32 func_801996F8(Unkstruct5* arg0) {
return diff;
}
INCLUDE_ASM("asm/st/dre/nonmatchings/11A64", EntityRedDoor);
INCLUDE_ASM("asm/us/st/dre/nonmatchings/11A64", EntityRedDoor);
void DestroyEntity(Entity* item) {
s32 i;
@ -434,7 +434,7 @@ s32 AnimateEntity(const u8 frames[], Entity* entity) {
return (u8)flag;
}
INCLUDE_ASM("asm/st/dre/nonmatchings/11A64", func_8019A590);
INCLUDE_ASM("asm/us/st/dre/nonmatchings/11A64", func_8019A590);
/*
* Returns the absolute distance from g_CurrentEntity to player in the X Axis
@ -480,9 +480,9 @@ void FallEntity(void) {
}
}
INCLUDE_ASM("asm/st/dre/nonmatchings/11A64", func_8019A7B8);
INCLUDE_ASM("asm/us/st/dre/nonmatchings/11A64", func_8019A7B8);
INCLUDE_ASM("asm/st/dre/nonmatchings/11A64", func_8019AA30);
INCLUDE_ASM("asm/us/st/dre/nonmatchings/11A64", func_8019AA30);
Entity* AllocEntity(Entity* start, Entity* end) {
Entity* current = start;
@ -688,11 +688,11 @@ void func_8019B1B4(Entity* arg0) {
}
}
INCLUDE_ASM("asm/st/dre/nonmatchings/11A64", func_8019B1DC);
INCLUDE_ASM("asm/us/st/dre/nonmatchings/11A64", func_8019B1DC);
INCLUDE_ASM("asm/st/dre/nonmatchings/11A64", func_8019B304);
INCLUDE_ASM("asm/us/st/dre/nonmatchings/11A64", func_8019B304);
INCLUDE_ASM("asm/st/dre/nonmatchings/11A64", func_8019B45C);
INCLUDE_ASM("asm/us/st/dre/nonmatchings/11A64", func_8019B45C);
void ReplaceBreakableWithItemDrop(Entity* entity) {
u16 temp_a0;
@ -727,7 +727,7 @@ void ReplaceBreakableWithItemDrop(Entity* entity) {
// This function matches with PSYQ4.0 GCC 2.7.2 with -02 Optimization flag
#ifndef NON_MATCHING
INCLUDE_ASM("asm/st/dre/nonmatchings/11A64", func_8019B858);
INCLUDE_ASM("asm/us/st/dre/nonmatchings/11A64", func_8019B858);
#else
void func_8019B858(void) {
s32 temp_v1;
@ -803,9 +803,9 @@ void func_8019BA38(u16 arg0) {
DestroyEntity(g_CurrentEntity);
}
INCLUDE_ASM("asm/st/dre/nonmatchings/11A64", func_8019BAB8);
INCLUDE_ASM("asm/us/st/dre/nonmatchings/11A64", func_8019BAB8);
INCLUDE_ASM("asm/st/dre/nonmatchings/11A64", func_8019BB94);
INCLUDE_ASM("asm/us/st/dre/nonmatchings/11A64", func_8019BB94);
void CollectHeartVessel(void) {
if (g_CurrentPlayableCharacter != PLAYER_ALUCARD) {
@ -830,7 +830,7 @@ void CollectLifeVessel(void) {
void func_8019BDA0(void) { DestroyEntity(g_CurrentEntity); }
INCLUDE_ASM("asm/st/dre/nonmatchings/11A64", EntityPriceDrop);
INCLUDE_ASM("asm/us/st/dre/nonmatchings/11A64", EntityPriceDrop);
void EntityExplosion(Entity* entity) {
u32 temp_v0;
@ -896,17 +896,17 @@ void func_8019C738(Entity* entity, s32 renderFlags) {
}
}
INCLUDE_ASM("asm/st/dre/nonmatchings/11A64", EntityInventoryDrop);
INCLUDE_ASM("asm/us/st/dre/nonmatchings/11A64", EntityInventoryDrop);
INCLUDE_ASM("asm/st/dre/nonmatchings/11A64", func_8019CDC4);
INCLUDE_ASM("asm/us/st/dre/nonmatchings/11A64", func_8019CDC4);
INCLUDE_ASM("asm/st/dre/nonmatchings/11A64", EntityRelicOrb);
INCLUDE_ASM("asm/us/st/dre/nonmatchings/11A64", EntityRelicOrb);
INCLUDE_ASM("asm/st/dre/nonmatchings/11A64", EntityHeartDrop);
INCLUDE_ASM("asm/us/st/dre/nonmatchings/11A64", EntityHeartDrop);
INCLUDE_ASM("asm/st/dre/nonmatchings/11A64", func_8019DC6C);
INCLUDE_ASM("asm/us/st/dre/nonmatchings/11A64", func_8019DC6C);
INCLUDE_ASM("asm/st/dre/nonmatchings/11A64", func_8019E1C8);
INCLUDE_ASM("asm/us/st/dre/nonmatchings/11A64", func_8019E1C8);
void func_8019E2B8(Entity* entity) {
switch (entity->step) {
@ -935,9 +935,9 @@ void func_8019E2B8(Entity* entity) {
}
// https://decomp.me/scratch/lcx4I
INCLUDE_ASM("asm/st/dre/nonmatchings/11A64", func_8019E3C8);
INCLUDE_ASM("asm/us/st/dre/nonmatchings/11A64", func_8019E3C8);
INCLUDE_ASM("asm/st/dre/nonmatchings/11A64", func_8019E4F8);
INCLUDE_ASM("asm/us/st/dre/nonmatchings/11A64", func_8019E4F8);
void func_8019E5E0(Entity* entity) {
u8 new_var2;
@ -1000,7 +1000,7 @@ void func_8019E6D0(Entity* entity) {
}
}
INCLUDE_ASM("asm/st/dre/nonmatchings/11A64", func_8019E7C4);
INCLUDE_ASM("asm/us/st/dre/nonmatchings/11A64", func_8019E7C4);
bool func_8019E9F4(Unkstruct6* arg0) {
CollisionResult res;
@ -1031,7 +1031,7 @@ bool func_8019E9F4(Unkstruct6* arg0) {
return false;
}
INCLUDE_ASM("asm/st/dre/nonmatchings/11A64", func_8019EAF0);
INCLUDE_ASM("asm/us/st/dre/nonmatchings/11A64", func_8019EAF0);
void EntityIntenseExplosion(Entity* entity) {
u32 temp_v0;
@ -1136,23 +1136,23 @@ void func_8019F304(void) {
}
// https://decomp.me/scratch/Hfk9n
INCLUDE_ASM("asm/st/dre/nonmatchings/11A64", func_8019F3BC);
INCLUDE_ASM("asm/us/st/dre/nonmatchings/11A64", func_8019F3BC);
INCLUDE_ASM("asm/st/dre/nonmatchings/11A64", func_8019F594);
INCLUDE_ASM("asm/us/st/dre/nonmatchings/11A64", func_8019F594);
INCLUDE_ASM("asm/st/dre/nonmatchings/11A64", func_8019FB74);
INCLUDE_ASM("asm/us/st/dre/nonmatchings/11A64", func_8019FB74);
INCLUDE_ASM("asm/st/dre/nonmatchings/11A64", func_801A0274);
INCLUDE_ASM("asm/us/st/dre/nonmatchings/11A64", func_801A0274);
INCLUDE_ASM("asm/st/dre/nonmatchings/11A64", func_801A046C);
INCLUDE_ASM("asm/us/st/dre/nonmatchings/11A64", func_801A046C);
INCLUDE_ASM("asm/st/dre/nonmatchings/11A64", func_801A0564);
INCLUDE_ASM("asm/us/st/dre/nonmatchings/11A64", func_801A0564);
INCLUDE_ASM("asm/st/dre/nonmatchings/11A64", EntityStageNamePopup);
INCLUDE_ASM("asm/us/st/dre/nonmatchings/11A64", EntityStageNamePopup);
INCLUDE_ASM("asm/st/dre/nonmatchings/11A64", EntityAbsorbOrb);
INCLUDE_ASM("asm/us/st/dre/nonmatchings/11A64", EntityAbsorbOrb);
INCLUDE_ASM("asm/st/dre/nonmatchings/11A64", func_801A174C);
INCLUDE_ASM("asm/us/st/dre/nonmatchings/11A64", func_801A174C);
extern ObjInit2 D_80181420[];
void EntityRoomForeground(Entity* entity) {
@ -1177,11 +1177,11 @@ void EntityRoomForeground(Entity* entity) {
AnimateEntity(objInit->unk10, entity);
}
INCLUDE_ASM("asm/st/dre/nonmatchings/11A64", func_801A1CE8);
INCLUDE_ASM("asm/us/st/dre/nonmatchings/11A64", func_801A1CE8);
INCLUDE_ASM("asm/st/dre/nonmatchings/11A64", func_801A2018);
INCLUDE_ASM("asm/us/st/dre/nonmatchings/11A64", func_801A2018);
INCLUDE_ASM("asm/st/dre/nonmatchings/11A64", func_801A2400);
INCLUDE_ASM("asm/us/st/dre/nonmatchings/11A64", func_801A2400);
POLY_GT4* func_801A2550(POLY_GT4* poly) {
while (poly != NULL) {
@ -1194,11 +1194,11 @@ POLY_GT4* func_801A2550(POLY_GT4* poly) {
return NULL;
}
INCLUDE_ASM("asm/st/dre/nonmatchings/11A64", func_801A2580);
INCLUDE_ASM("asm/us/st/dre/nonmatchings/11A64", func_801A2580);
// https://decomp.me/scratch/IIvQX a0 -> v0 register swap
#ifndef NON_MATCHING
INCLUDE_ASM("asm/st/dre/nonmatchings/11A64", func_801A25FC);
INCLUDE_ASM("asm/us/st/dre/nonmatchings/11A64", func_801A25FC);
#else
POLY_GT4* func_801A25FC(POLY_GT4* poly, s32 arg1) {
s32 i;
@ -1297,12 +1297,12 @@ s32 func_801A27E4(s32 arg0, u8 arg1) {
return ret;
}
INCLUDE_ASM("asm/st/dre/nonmatchings/11A64", func_801A2848);
INCLUDE_ASM("asm/us/st/dre/nonmatchings/11A64", func_801A2848);
INCLUDE_ASM("asm/st/dre/nonmatchings/11A64", func_801A2A58);
INCLUDE_ASM("asm/us/st/dre/nonmatchings/11A64", func_801A2A58);
INCLUDE_ASM("asm/st/dre/nonmatchings/11A64", func_801A2C9C);
INCLUDE_ASM("asm/us/st/dre/nonmatchings/11A64", func_801A2C9C);
INCLUDE_ASM("asm/st/dre/nonmatchings/11A64", func_801A2E20);
INCLUDE_ASM("asm/us/st/dre/nonmatchings/11A64", func_801A2E20);
INCLUDE_ASM("asm/st/dre/nonmatchings/11A64", func_801A2F10);
INCLUDE_ASM("asm/us/st/dre/nonmatchings/11A64", func_801A2F10);

102
src/st/mad/D8C8.c
View File

@ -64,12 +64,12 @@ extern LayoutObject* D_801997DC;
extern u8 D_801997E0;
extern s8 D_801997E4;
INCLUDE_ASM("asm/st/mad/nonmatchings/D8C8", func_8018D8C8);
INCLUDE_ASM("asm/us/st/mad/nonmatchings/D8C8", func_8018D8C8);
INCLUDE_ASM("asm/st/mad/nonmatchings/D8C8", func_8018DC28);
INCLUDE_ASM("asm/us/st/mad/nonmatchings/D8C8", func_8018DC28);
#ifndef NON_EQUIVALENT
INCLUDE_ASM("asm/st/mad/nonmatchings/D8C8", func_8018DF0C);
INCLUDE_ASM("asm/us/st/mad/nonmatchings/D8C8", func_8018DF0C);
#else
void func_8018DF0C(s32 arg0, s32 arg1) {
s32 temp_a3;
@ -162,11 +162,11 @@ void func_8018DF0C(s32 arg0, s32 arg1) {
}
#endif
INCLUDE_ASM("asm/st/mad/nonmatchings/D8C8", func_8018E090);
INCLUDE_ASM("asm/us/st/mad/nonmatchings/D8C8", func_8018E090);
INCLUDE_ASM("asm/st/mad/nonmatchings/D8C8", func_8018E13C);
INCLUDE_ASM("asm/us/st/mad/nonmatchings/D8C8", func_8018E13C);
INCLUDE_ASM("asm/st/mad/nonmatchings/D8C8", func_8018E1D4);
INCLUDE_ASM("asm/us/st/mad/nonmatchings/D8C8", func_8018E1D4);
void func_8018E5AC(Entity* self) {
s32 temp_v0;
@ -188,7 +188,7 @@ void func_8018E5AC(Entity* self) {
AnimateEntity(objInit->unk10, self);
}
INCLUDE_ASM("asm/st/mad/nonmatchings/D8C8", func_8018E674);
INCLUDE_ASM("asm/us/st/mad/nonmatchings/D8C8", func_8018E674);
extern u16 g_eBreakableInit[];
extern u8* g_eBreakableAnimations[8];
@ -227,7 +227,7 @@ s32 Random(void) {
}
#ifndef NON_MATCHING
INCLUDE_ASM("asm/st/mad/nonmatchings/D8C8", Update);
INCLUDE_ASM("asm/us/st/mad/nonmatchings/D8C8", Update);
#else
extern s16 D_801806B4[];
extern u16 D_80199E54[];
@ -314,11 +314,11 @@ void Update(void) {
}
#endif
INCLUDE_ASM("asm/st/mad/nonmatchings/D8C8", func_8018EC90);
INCLUDE_ASM("asm/us/st/mad/nonmatchings/D8C8", func_8018EC90);
INCLUDE_ASM("asm/st/mad/nonmatchings/D8C8", func_8018EDB8);
INCLUDE_ASM("asm/us/st/mad/nonmatchings/D8C8", func_8018EDB8);
INCLUDE_ASM("asm/st/mad/nonmatchings/D8C8", EntityNumericDamage);
INCLUDE_ASM("asm/us/st/mad/nonmatchings/D8C8", EntityNumericDamage);
void CreateEntityFromLayout(Entity* entity, LayoutObject* initDesc) {
DestroyEntity(entity);
@ -338,7 +338,7 @@ void CreateEntityFromLayout(Entity* entity, LayoutObject* initDesc) {
* rework is needed to get it in compiling state
*/
#ifndef NON_EQUIVALENT
INCLUDE_ASM("asm/st/mad/nonmatchings/D8C8", func_80190608);
INCLUDE_ASM("asm/us/st/mad/nonmatchings/D8C8", func_80190608);
#else
void func_80190608(LayoutObject* initDesc) {
s16 temp_a2;
@ -371,7 +371,7 @@ void func_80190608(LayoutObject* initDesc) {
}
#endif
INCLUDE_ASM("asm/st/mad/nonmatchings/D8C8", func_80190720);
INCLUDE_ASM("asm/us/st/mad/nonmatchings/D8C8", func_80190720);
void func_80190838(s32 arg0) {
s32 a1 = 0xFFFE;
@ -397,7 +397,7 @@ loop_1:
}
#ifndef NON_MATCHING
INCLUDE_ASM("asm/st/mad/nonmatchings/D8C8", func_801908DC);
INCLUDE_ASM("asm/us/st/mad/nonmatchings/D8C8", func_801908DC);
#else
void func_801908DC(s16 arg0) {
u32 temp_a0, temp_v1_2;
@ -421,7 +421,7 @@ void func_801908DC(s16 arg0) {
}
#endif
INCLUDE_ASM("asm/st/mad/nonmatchings/D8C8", func_801909D8);
INCLUDE_ASM("asm/us/st/mad/nonmatchings/D8C8", func_801909D8);
void func_80190AD8(s32 arg0) {
s32 a1 = 0xFFFE;
@ -444,12 +444,12 @@ void func_80190B24(s16 arg0) {
}
}
INCLUDE_ASM("asm/st/mad/nonmatchings/D8C8", func_80190B7C);
INCLUDE_ASM("asm/us/st/mad/nonmatchings/D8C8", func_80190B7C);
INCLUDE_ASM("asm/st/mad/nonmatchings/D8C8", func_80190C78);
INCLUDE_ASM("asm/us/st/mad/nonmatchings/D8C8", func_80190C78);
#ifndef NON_EQUIVALENT
INCLUDE_ASM("asm/st/mad/nonmatchings/D8C8", InitRoomEntities);
INCLUDE_ASM("asm/us/st/mad/nonmatchings/D8C8", InitRoomEntities);
#else
void InitRoomEntities(s32 objLayoutId) {
s16 temp_s0;
@ -552,7 +552,7 @@ s32 func_801910A8(Unkstruct5* arg0) {
return var_v0_2;
}
INCLUDE_ASM("asm/st/mad/nonmatchings/D8C8", EntityRedDoor);
INCLUDE_ASM("asm/us/st/mad/nonmatchings/D8C8", EntityRedDoor);
void DestroyEntity(Entity* item) {
s32 i;
@ -589,7 +589,7 @@ void PreventEntityFromRespawning(Entity* entity) {
#include "st/AnimateEntity.h"
INCLUDE_ASM("asm/st/mad/nonmatchings/D8C8", func_80191F24);
INCLUDE_ASM("asm/us/st/mad/nonmatchings/D8C8", func_80191F24);
s32 func_8019203C(void) {
s16 value = g_CurrentEntity->posX.i.hi - PLAYER.posX.i.hi;
@ -645,11 +645,11 @@ u8 func_8019214C(void) {
return unkState;
}
INCLUDE_ASM("asm/st/mad/nonmatchings/D8C8", func_80192190);
INCLUDE_ASM("asm/us/st/mad/nonmatchings/D8C8", func_80192190);
INCLUDE_ASM("asm/st/mad/nonmatchings/D8C8", func_80192408);
INCLUDE_ASM("asm/us/st/mad/nonmatchings/D8C8", func_80192408);
INCLUDE_ASM("asm/st/mad/nonmatchings/D8C8", func_80192618);
INCLUDE_ASM("asm/us/st/mad/nonmatchings/D8C8", func_80192618);
Entity* AllocEntity(Entity* start, Entity* end) {
Entity* current = start;
@ -841,11 +841,11 @@ void EntityDummy(Entity* arg0) {
}
}
INCLUDE_ASM("asm/st/mad/nonmatchings/D8C8", func_80192DD0);
INCLUDE_ASM("asm/us/st/mad/nonmatchings/D8C8", func_80192DD0);
INCLUDE_ASM("asm/st/mad/nonmatchings/D8C8", func_80192EF8);
INCLUDE_ASM("asm/us/st/mad/nonmatchings/D8C8", func_80192EF8);
INCLUDE_ASM("asm/st/mad/nonmatchings/D8C8", func_80193050);
INCLUDE_ASM("asm/us/st/mad/nonmatchings/D8C8", func_80193050);
void ReplaceBreakableWithItemDrop(Entity* entity) {
u16 temp_a0;
@ -880,7 +880,7 @@ void ReplaceBreakableWithItemDrop(Entity* entity) {
// This function matches with PSYQ4.0 GCC 2.7.2 with -02 Optimization flag
#ifndef NON_MATCHING
INCLUDE_ASM("asm/st/mad/nonmatchings/D8C8", func_8019344C);
INCLUDE_ASM("asm/us/st/mad/nonmatchings/D8C8", func_8019344C);
#else
void func_8019344C(void) {
s32 temp_v1;
@ -943,7 +943,7 @@ void func_801934D0(u16 arg0) {
}
}
INCLUDE_ASM("asm/st/mad/nonmatchings/D8C8", func_8019362C);
INCLUDE_ASM("asm/us/st/mad/nonmatchings/D8C8", func_8019362C);
extern s32 g_playerGold; // g_playerGold?
void* const D_80180D60[];
@ -976,7 +976,7 @@ void func_801937BC(void) {}
void func_801937C4(void) { DestroyEntity(g_CurrentEntity); }
// https://decomp.me/scratch/GsS0m
INCLUDE_ASM("asm/st/mad/nonmatchings/D8C8", func_801937EC);
INCLUDE_ASM("asm/us/st/mad/nonmatchings/D8C8", func_801937EC);
void CollectHeartVessel(void) {
g_api.PlaySfx(0x670);
@ -998,7 +998,7 @@ Entity* func_801939C4(void) {
return g_CurrentEntity;
}
INCLUDE_ASM("asm/st/mad/nonmatchings/D8C8", EntityPriceDrop);
INCLUDE_ASM("asm/us/st/mad/nonmatchings/D8C8", EntityPriceDrop);
void EntityExplosion(Entity* entity) {
u32 temp_v0;
@ -1052,16 +1052,16 @@ void func_80194314(Entity* entity) {
}
}
INCLUDE_ASM("asm/st/mad/nonmatchings/D8C8", EntityInventoryDrop);
INCLUDE_ASM("asm/us/st/mad/nonmatchings/D8C8", EntityInventoryDrop);
INCLUDE_ASM("asm/st/mad/nonmatchings/D8C8", EntityRelicOrb);
INCLUDE_ASM("asm/us/st/mad/nonmatchings/D8C8", EntityRelicOrb);
// v1 -> a0 reg swap
// branching
// signature conflict
// https://decomp.me/scratch/h3CVU
#ifndef NON_EQUIVALENT
INCLUDE_ASM("asm/st/mad/nonmatchings/D8C8", EntityHeartDrop);
INCLUDE_ASM("asm/us/st/mad/nonmatchings/D8C8", EntityHeartDrop);
#else
void EntityHeartDrop(Entity* entity, u32 arg1) {
u16 temp_v0_2;
@ -1106,7 +1106,7 @@ void EntityHeartDrop(Entity* entity, u32 arg1) {
}
#endif
INCLUDE_ASM("asm/st/mad/nonmatchings/D8C8", func_8019563C);
INCLUDE_ASM("asm/us/st/mad/nonmatchings/D8C8", func_8019563C);
void func_8019572C(Entity* entity) {
switch (entity->step) {
@ -1134,10 +1134,10 @@ void func_8019572C(Entity* entity) {
}
}
INCLUDE_ASM("asm/st/mad/nonmatchings/D8C8", func_8019583C);
INCLUDE_ASM("asm/us/st/mad/nonmatchings/D8C8", func_8019583C);
// https://decomp.me/scratch/3IMus
INCLUDE_ASM("asm/st/mad/nonmatchings/D8C8", func_8019596C);
INCLUDE_ASM("asm/us/st/mad/nonmatchings/D8C8", func_8019596C);
void func_80195A54(Entity* entity) {
if (entity->step == 0) {
@ -1193,7 +1193,7 @@ void func_80195B44(Entity* entity) {
}
}
INCLUDE_ASM("asm/st/mad/nonmatchings/D8C8", func_80195C38);
INCLUDE_ASM("asm/us/st/mad/nonmatchings/D8C8", func_80195C38);
bool func_80195E68(Unkstruct6* unk) {
CollisionResult res;
@ -1220,7 +1220,7 @@ bool func_80195E68(Unkstruct6* unk) {
return false;
}
INCLUDE_ASM("asm/st/mad/nonmatchings/D8C8", func_80195F64);
INCLUDE_ASM("asm/us/st/mad/nonmatchings/D8C8", func_80195F64);
void EntityIntenseExplosion(Entity* entity) {
u32 zPriority;
@ -1284,7 +1284,7 @@ void func_801965E4(Entity* entity) {
}
}
INCLUDE_ASM("asm/st/mad/nonmatchings/D8C8", func_801966B0);
INCLUDE_ASM("asm/us/st/mad/nonmatchings/D8C8", func_801966B0);
void func_8019686C(u16 objectId, Entity* ent1, Entity* ent2) {
DestroyEntity(ent2);
@ -1326,21 +1326,21 @@ void func_80196934(void) {
}
}
INCLUDE_ASM("asm/st/mad/nonmatchings/D8C8", func_801969EC);
INCLUDE_ASM("asm/us/st/mad/nonmatchings/D8C8", func_801969EC);
INCLUDE_ASM("asm/st/mad/nonmatchings/D8C8", func_80196BC4);
INCLUDE_ASM("asm/us/st/mad/nonmatchings/D8C8", func_80196BC4);
INCLUDE_ASM("asm/st/mad/nonmatchings/D8C8", func_801971A4);
INCLUDE_ASM("asm/us/st/mad/nonmatchings/D8C8", func_801971A4);
INCLUDE_ASM("asm/st/mad/nonmatchings/D8C8", func_801978A4);
INCLUDE_ASM("asm/us/st/mad/nonmatchings/D8C8", func_801978A4);
INCLUDE_ASM("asm/st/mad/nonmatchings/D8C8", func_80197A9C);
INCLUDE_ASM("asm/us/st/mad/nonmatchings/D8C8", func_80197A9C);
INCLUDE_ASM("asm/st/mad/nonmatchings/D8C8", func_80197B94);
INCLUDE_ASM("asm/us/st/mad/nonmatchings/D8C8", func_80197B94);
INCLUDE_ASM("asm/st/mad/nonmatchings/D8C8", EntityAbsorbOrb);
INCLUDE_ASM("asm/us/st/mad/nonmatchings/D8C8", EntityAbsorbOrb);
INCLUDE_ASM("asm/st/mad/nonmatchings/D8C8", EntityEnemyBlood);
INCLUDE_ASM("asm/us/st/mad/nonmatchings/D8C8", EntityEnemyBlood);
void EntityRoomForeground(Entity* entity) {
ObjInit2* obj = &D_801810F4[entity->subId];
@ -1360,11 +1360,11 @@ void EntityRoomForeground(Entity* entity) {
AnimateEntity(obj->unk10, entity);
}
INCLUDE_ASM("asm/st/mad/nonmatchings/D8C8", func_80198BC8);
INCLUDE_ASM("asm/us/st/mad/nonmatchings/D8C8", func_80198BC8);
INCLUDE_ASM("asm/st/mad/nonmatchings/D8C8", func_80198FA0);
INCLUDE_ASM("asm/us/st/mad/nonmatchings/D8C8", func_80198FA0);
INCLUDE_ASM("asm/st/mad/nonmatchings/D8C8", func_80199388);
INCLUDE_ASM("asm/us/st/mad/nonmatchings/D8C8", func_80199388);
POLY_GT4* func_801994D8(POLY_GT4* poly) {
while (poly != NULL) {
@ -1377,7 +1377,7 @@ POLY_GT4* func_801994D8(POLY_GT4* poly) {
return NULL;
}
INCLUDE_ASM("asm/st/mad/nonmatchings/D8C8", func_80199508);
INCLUDE_ASM("asm/us/st/mad/nonmatchings/D8C8", func_80199508);
POLY_GT4* func_80199584(POLY_GT4* startPoly, s32 count) {
POLY_GT4* poly;

46
src/st/no3/377D4.c
View File

@ -29,7 +29,7 @@ void EntityCavernDoorVase(Entity* arg0) {
AnimateEntity(temp_s0->unk10, arg0);
}
INCLUDE_ASM("asm/st/no3/nonmatchings/377D4", EntityUnkId12);
INCLUDE_ASM("asm/us/st/no3/nonmatchings/377D4", EntityUnkId12);
extern u16 g_eBreakableInit[];
extern u8* g_eBreakableAnimations[8];
@ -64,7 +64,7 @@ void EntityBreakable(Entity* entity) {
// matches except for nops after loads
#ifndef NON_MATCHING
INCLUDE_ASM("asm/st/no3/nonmatchings/377D4", EntityUnkId16);
INCLUDE_ASM("asm/us/st/no3/nonmatchings/377D4", EntityUnkId16);
#else
extern u8 D_8003CB25;
extern u8 D_8003CB26;
@ -95,23 +95,23 @@ void func_801B7B98(Entity* arg0) {
#endif
// lightning and sound for background
INCLUDE_ASM("asm/st/no3/nonmatchings/377D4", EntityBackgroundLightning);
INCLUDE_ASM("asm/us/st/no3/nonmatchings/377D4", EntityBackgroundLightning);
// window that opens and shuts in the background
INCLUDE_ASM("asm/st/no3/nonmatchings/377D4", EntityShuttingWindow);
INCLUDE_ASM("asm/us/st/no3/nonmatchings/377D4", EntityShuttingWindow);
// main door to the castle that closes during intro
INCLUDE_ASM("asm/st/no3/nonmatchings/377D4", EntityCastleDoor);
INCLUDE_ASM("asm/us/st/no3/nonmatchings/377D4", EntityCastleDoor);
// bushes in parallax background
INCLUDE_ASM("asm/st/no3/nonmatchings/377D4", EntityBackgroundBushes);
INCLUDE_ASM("asm/us/st/no3/nonmatchings/377D4", EntityBackgroundBushes);
INCLUDE_ASM("asm/st/no3/nonmatchings/377D4", EntityUnkId1C);
INCLUDE_ASM("asm/us/st/no3/nonmatchings/377D4", EntityUnkId1C);
// transparent water "plane" seen in the merman room
INCLUDE_ASM("asm/st/no3/nonmatchings/377D4", EntityTransparentWater);
INCLUDE_ASM("asm/us/st/no3/nonmatchings/377D4", EntityTransparentWater);
INCLUDE_ASM("asm/st/no3/nonmatchings/377D4", func_801B94F0);
INCLUDE_ASM("asm/us/st/no3/nonmatchings/377D4", func_801B94F0);
// lever and platform to open caverns door
void EntityCavernDoorLever(Entity* entity) {
@ -154,12 +154,12 @@ void EntityCavernDoorLever(Entity* entity) {
}
// platform attached to lever at cavern door
INCLUDE_ASM("asm/st/no3/nonmatchings/377D4", EntityCavernDoorPlatform);
INCLUDE_ASM("asm/us/st/no3/nonmatchings/377D4", EntityCavernDoorPlatform);
// door blocking way to caverns
INCLUDE_ASM("asm/st/no3/nonmatchings/377D4", EntityCavernDoor);
INCLUDE_ASM("asm/us/st/no3/nonmatchings/377D4", EntityCavernDoor);
INCLUDE_ASM("asm/st/no3/nonmatchings/377D4", func_801B9C44);
INCLUDE_ASM("asm/us/st/no3/nonmatchings/377D4", func_801B9C44);
// switch that clicks when you step on it
void EntityClickSwitch(Entity* entity) {
@ -193,10 +193,10 @@ void EntityClickSwitch(Entity* entity) {
}
// smaller weight blocking path near cube of zoe
INCLUDE_ASM("asm/st/no3/nonmatchings/377D4", EntityZoeSmallWeight);
INCLUDE_ASM("asm/us/st/no3/nonmatchings/377D4", EntityZoeSmallWeight);
// taller weight blocking path near cube of zoe
INCLUDE_ASM("asm/st/no3/nonmatchings/377D4", EntityZoeTallWeight);
INCLUDE_ASM("asm/us/st/no3/nonmatchings/377D4", EntityZoeTallWeight);
// trap door that leads to underground garden in saturn version.
// also opens the one leading to the save room
@ -238,26 +238,26 @@ void EntityTrapDoor(Entity* entity) {
}
// left side of the breakable rock, drops pot roast
INCLUDE_ASM("asm/st/no3/nonmatchings/377D4", EntityMermanRockLeftSide);
INCLUDE_ASM("asm/us/st/no3/nonmatchings/377D4", EntityMermanRockLeftSide);
// right side of the merman room rock, breaks when hit
INCLUDE_ASM("asm/st/no3/nonmatchings/377D4", EntityMermanRockRightSide);
INCLUDE_ASM("asm/us/st/no3/nonmatchings/377D4", EntityMermanRockRightSide);
INCLUDE_ASM("asm/st/no3/nonmatchings/377D4", EntityUnkId26);
INCLUDE_ASM("asm/us/st/no3/nonmatchings/377D4", EntityUnkId26);
// falling rock that breaks into dust
INCLUDE_ASM("asm/st/no3/nonmatchings/377D4", EntityFallingRock2);
INCLUDE_ASM("asm/us/st/no3/nonmatchings/377D4", EntityFallingRock2);
INCLUDE_ASM("asm/st/no3/nonmatchings/377D4", EntityUnkId5C);
INCLUDE_ASM("asm/us/st/no3/nonmatchings/377D4", EntityUnkId5C);
// falling rock with puff of smoke when it disappears. I think part of the
// merman room breakable rock
INCLUDE_ASM("asm/st/no3/nonmatchings/377D4", EntityFallingRock);
INCLUDE_ASM("asm/us/st/no3/nonmatchings/377D4", EntityFallingRock);
INCLUDE_ASM("asm/st/no3/nonmatchings/377D4", func_801BB548);
INCLUDE_ASM("asm/us/st/no3/nonmatchings/377D4", func_801BB548);
// sky animation during death cutscene
INCLUDE_ASM("asm/st/no3/nonmatchings/377D4", EntityDeathSkySwirl);
INCLUDE_ASM("asm/us/st/no3/nonmatchings/377D4", EntityDeathSkySwirl);
extern u8 D_80181390;
@ -323,7 +323,7 @@ void EntitySwitch(Entity* entity) {
}
// door preventing access to warp room / heart
INCLUDE_ASM("asm/st/no3/nonmatchings/377D4", EntityHeartRoomGoldDoor);
INCLUDE_ASM("asm/us/st/no3/nonmatchings/377D4", EntityHeartRoomGoldDoor);
void EntityUnkId49(Entity* entity) {
do {

14
src/st/no3/3C4EC.c
View File

@ -83,7 +83,7 @@ void EntityPushAlucard(Entity* entity) {
// Instruction reorder, only matches in PSY-Q 4.0
// Probably ASPSX
#ifndef NON_MATCHING
INCLUDE_ASM("asm/st/no3/nonmatchings/3C4EC", EntityUnkId53);
INCLUDE_ASM("asm/us/st/no3/nonmatchings/3C4EC", EntityUnkId53);
#else
void EntityUnkId53(Entity* entity) {
s32 temp_v0;
@ -128,20 +128,20 @@ void EntityUnkId53(Entity* entity) {
#endif
// large foreground tree during intro
INCLUDE_ASM("asm/st/no3/nonmatchings/3C4EC", EntityForegroundTree);
INCLUDE_ASM("asm/us/st/no3/nonmatchings/3C4EC", EntityForegroundTree);
INCLUDE_ASM("asm/st/no3/nonmatchings/3C4EC", EntityUnkId50);
INCLUDE_ASM("asm/us/st/no3/nonmatchings/3C4EC", EntityUnkId50);
// part of parallax background with pine trees
INCLUDE_ASM("asm/st/no3/nonmatchings/3C4EC", EntityBackgroundPineTrees);
INCLUDE_ASM("asm/us/st/no3/nonmatchings/3C4EC", EntityBackgroundPineTrees);
INCLUDE_ASM("asm/st/no3/nonmatchings/3C4EC", EntityUnkId52);
INCLUDE_ASM("asm/us/st/no3/nonmatchings/3C4EC", EntityUnkId52);
INCLUDE_ASM("asm/st/no3/nonmatchings/3C4EC", EntityUnkId54);
INCLUDE_ASM("asm/us/st/no3/nonmatchings/3C4EC", EntityUnkId54);
// regalloc
#ifndef NON_MATCHING
INCLUDE_ASM("asm/st/no3/nonmatchings/3C4EC", EntityUnkId55);
INCLUDE_ASM("asm/us/st/no3/nonmatchings/3C4EC", EntityUnkId55);
#else
void EntityUnkId55(Entity* entity, u16 arg2) {
s32 firstPolygonIndex;

160
src/st/no3/3E134.c
View File

@ -139,7 +139,7 @@ void func_801BE544(void) {
D_801D7D2A = D_801D7D2C + 0x14;
}
INCLUDE_ASM("asm/st/no3/nonmatchings/3E134", func_801BE598);
INCLUDE_ASM("asm/us/st/no3/nonmatchings/3E134", func_801BE598);
void func_801BE75C(s16 yOffset) {
RECT rect;
@ -151,9 +151,9 @@ void func_801BE75C(s16 yOffset) {
ClearImage(&rect, 0, 0, 0);
}
INCLUDE_ASM("asm/st/no3/nonmatchings/3E134", func_801BE7BC);
INCLUDE_ASM("asm/us/st/no3/nonmatchings/3E134", func_801BE7BC);
INCLUDE_ASM("asm/st/no3/nonmatchings/3E134", func_801BE870);
INCLUDE_ASM("asm/us/st/no3/nonmatchings/3E134", func_801BE870);
void func_801BE9F4(s32 arg0) {
D_801D7D64 = arg0 + 0x100000;
@ -161,7 +161,7 @@ void func_801BE9F4(s32 arg0) {
D_801D7D60 = 1;
}
INCLUDE_ASM("asm/st/no3/nonmatchings/3E134", func_801BEA20);
INCLUDE_ASM("asm/us/st/no3/nonmatchings/3E134", func_801BEA20);
void func_801BECCC(Entity* entity) {
/** TODO: !FAKE
@ -191,19 +191,19 @@ void func_801BECCC(Entity* entity) {
}
}
INCLUDE_ASM("asm/st/no3/nonmatchings/3E134", func_801BEDAC);
INCLUDE_ASM("asm/us/st/no3/nonmatchings/3E134", func_801BEDAC);
// seems to cause a room transition
INCLUDE_ASM("asm/st/no3/nonmatchings/3E134", EntityRoomTransition1);
INCLUDE_ASM("asm/us/st/no3/nonmatchings/3E134", EntityRoomTransition1);
// seems to cause a room transition
INCLUDE_ASM("asm/st/no3/nonmatchings/3E134", EntityRoomTransition2);
INCLUDE_ASM("asm/us/st/no3/nonmatchings/3E134", EntityRoomTransition2);
// shows the sword taken from you by Death. Using a different subid shows
// the other items?
INCLUDE_ASM("asm/st/no3/nonmatchings/3E134", EntityDeathStolenItem);
INCLUDE_ASM("asm/us/st/no3/nonmatchings/3E134", EntityDeathStolenItem);
INCLUDE_ASM("asm/st/no3/nonmatchings/3E134", EntityUnkId5A);
INCLUDE_ASM("asm/us/st/no3/nonmatchings/3E134", EntityUnkId5A);
void EntityUnkId5B(Entity* entity) {
Entity* newEntity;
@ -304,20 +304,20 @@ void func_801C13F8() {
}
// A single "puff" of the warg explosion animation, opaque
INCLUDE_ASM("asm/st/no3/nonmatchings/3E134", EntityWargExplosionPuffOpaque);
INCLUDE_ASM("asm/us/st/no3/nonmatchings/3E134", EntityWargExplosionPuffOpaque);
s32 Random(void) {
g_randomNext = (g_randomNext * 0x01010101) + 1;
return g_randomNext >> 0x18;
}
INCLUDE_ASM("asm/st/no3/nonmatchings/3E134", Update);
INCLUDE_ASM("asm/us/st/no3/nonmatchings/3E134", Update);
INCLUDE_ASM("asm/st/no3/nonmatchings/3E134", func_801C1B78);
INCLUDE_ASM("asm/us/st/no3/nonmatchings/3E134", func_801C1B78);
INCLUDE_ASM("asm/st/no3/nonmatchings/3E134", func_801C1C80);
INCLUDE_ASM("asm/us/st/no3/nonmatchings/3E134", func_801C1C80);
INCLUDE_ASM("asm/st/no3/nonmatchings/3E134", EntityNumericDamage);
INCLUDE_ASM("asm/us/st/no3/nonmatchings/3E134", EntityNumericDamage);
void CreateEntityFromLayout(Entity* entity, LayoutObject* initDesc) {
DestroyEntity(entity);
@ -332,9 +332,9 @@ void CreateEntityFromLayout(Entity* entity, LayoutObject* initDesc) {
entity->unk68 = (initDesc->objectId >> 0xA) & 7;
}
INCLUDE_ASM("asm/st/no3/nonmatchings/3E134", func_801C3500);
INCLUDE_ASM("asm/us/st/no3/nonmatchings/3E134", func_801C3500);
INCLUDE_ASM("asm/st/no3/nonmatchings/3E134", func_801C3618);
INCLUDE_ASM("asm/us/st/no3/nonmatchings/3E134", func_801C3618);
void func_801C3730(s16 arg0) {
while (true) {
@ -356,9 +356,9 @@ void func_801C377C(s16 arg0) {
}
}
INCLUDE_ASM("asm/st/no3/nonmatchings/3E134", func_801C37D4);
INCLUDE_ASM("asm/us/st/no3/nonmatchings/3E134", func_801C37D4);
INCLUDE_ASM("asm/st/no3/nonmatchings/3E134", func_801C38D0);
INCLUDE_ASM("asm/us/st/no3/nonmatchings/3E134", func_801C38D0);
void func_801C39E4(s16 arg0) {
while (true) {
@ -381,12 +381,12 @@ void func_801C3A30(s16 arg0) {
}
}
INCLUDE_ASM("asm/st/no3/nonmatchings/3E134", func_801C3A88);
INCLUDE_ASM("asm/us/st/no3/nonmatchings/3E134", func_801C3A88);
INCLUDE_ASM("asm/st/no3/nonmatchings/3E134", func_801C3B84);
INCLUDE_ASM("asm/us/st/no3/nonmatchings/3E134", func_801C3B84);
#ifndef NON_MATCHING
INCLUDE_ASM("asm/st/no3/nonmatchings/3E134", InitRoomEntities);
INCLUDE_ASM("asm/us/st/no3/nonmatchings/3E134", InitRoomEntities);
#else
void InitRoomEntities(s32 objLayoutId) {
s16 temp_s0;
@ -494,7 +494,7 @@ s32 func_801C3FB4(Unkstruct5* arg0) {
return diff;
}
INCLUDE_ASM("asm/st/no3/nonmatchings/3E134", EntityRedDoor);
INCLUDE_ASM("asm/us/st/no3/nonmatchings/3E134", EntityRedDoor);
void DestroyEntity(Entity* item) {
s32 i;
@ -531,7 +531,7 @@ void PreventEntityFromRespawning(Entity* entity) {
#include "st/AnimateEntity.h"
INCLUDE_ASM("asm/st/no3/nonmatchings/3E134", func_801C4E4C);
INCLUDE_ASM("asm/us/st/no3/nonmatchings/3E134", func_801C4E4C);
/*
* Returns the absolute distance from g_CurrentEntity to player in the X Axis
@ -577,9 +577,9 @@ void FallEntity(void) {
}
}
INCLUDE_ASM("asm/st/no3/nonmatchings/3E134", func_801C5074);
INCLUDE_ASM("asm/us/st/no3/nonmatchings/3E134", func_801C5074);
INCLUDE_ASM("asm/st/no3/nonmatchings/3E134", func_801C52EC);
INCLUDE_ASM("asm/us/st/no3/nonmatchings/3E134", func_801C52EC);
Entity* AllocEntity(Entity* start, Entity* end) {
Entity* current = start;
@ -775,11 +775,11 @@ void EntityDummy(Entity* arg0) {
}
}
INCLUDE_ASM("asm/st/no3/nonmatchings/3E134", func_801C5A98);
INCLUDE_ASM("asm/us/st/no3/nonmatchings/3E134", func_801C5A98);
INCLUDE_ASM("asm/st/no3/nonmatchings/3E134", func_801C5BC0);
INCLUDE_ASM("asm/us/st/no3/nonmatchings/3E134", func_801C5BC0);
INCLUDE_ASM("asm/st/no3/nonmatchings/3E134", func_801C5D18);
INCLUDE_ASM("asm/us/st/no3/nonmatchings/3E134", func_801C5D18);
void ReplaceBreakableWithItemDrop(Entity* entity) {
u16 temp_a0;
@ -813,7 +813,7 @@ void ReplaceBreakableWithItemDrop(Entity* entity) {
}
#ifndef NON_MATCHING
INCLUDE_ASM("asm/st/no3/nonmatchings/3E134", func_801C6114);
INCLUDE_ASM("asm/us/st/no3/nonmatchings/3E134", func_801C6114);
#else
// matches with gcc 2.6.0 + aspsx 2.34
void func_801C6114(void) {
@ -909,7 +909,7 @@ void CollectGold(u16 goldSize) {
DestroyEntity(g_CurrentEntity);
}
INCLUDE_ASM("asm/st/no3/nonmatchings/3E134", func_801C6450);
INCLUDE_ASM("asm/us/st/no3/nonmatchings/3E134", func_801C6450);
void CollectHeartVessel(void) {
if (g_CurrentPlayableCharacter != PLAYER_ALUCARD) {
@ -934,7 +934,7 @@ void func_801C660C(void) {
void func_801C665C(void) { DestroyEntity(g_CurrentEntity); }
INCLUDE_ASM("asm/st/no3/nonmatchings/3E134", EntityPriceDrop);
INCLUDE_ASM("asm/us/st/no3/nonmatchings/3E134", EntityPriceDrop);
void EntityExplosion(Entity* entity) {
u16 zPriority;
@ -995,15 +995,15 @@ void func_801C6FF4(Entity* entity, s32 renderFlags) {
}
}
INCLUDE_ASM("asm/st/no3/nonmatchings/3E134", EntityInventoryDrop);
INCLUDE_ASM("asm/us/st/no3/nonmatchings/3E134", EntityInventoryDrop);
INCLUDE_ASM("asm/st/no3/nonmatchings/3E134", func_801C7680);
INCLUDE_ASM("asm/us/st/no3/nonmatchings/3E134", func_801C7680);
INCLUDE_ASM("asm/st/no3/nonmatchings/3E134", EntityRelicOrb);
INCLUDE_ASM("asm/us/st/no3/nonmatchings/3E134", EntityRelicOrb);
// https://decomp.me/scratch/TfITc
#ifndef NON_EQUIVALENT
INCLUDE_ASM("asm/st/no3/nonmatchings/3E134", EntityHeartDrop);
INCLUDE_ASM("asm/us/st/no3/nonmatchings/3E134", EntityHeartDrop);
#else
extern u8 D_8003BEEC[];
extern u16 D_80181C8C[];
@ -1047,7 +1047,7 @@ void EntityHeartDrop(Entity* self) {
}
#endif
INCLUDE_ASM("asm/st/no3/nonmatchings/3E134", EntityUnkId0E);
INCLUDE_ASM("asm/us/st/no3/nonmatchings/3E134", EntityUnkId0E);
u8 func_801C8A84(s16* arg0, u8 facing) {
u8 ret = 0;
@ -1097,9 +1097,9 @@ void EntityUnkId13(Entity* entity) {
}
}
INCLUDE_ASM("asm/st/no3/nonmatchings/3E134", func_801C8C84);
INCLUDE_ASM("asm/us/st/no3/nonmatchings/3E134", func_801C8C84);
INCLUDE_ASM("asm/st/no3/nonmatchings/3E134", func_801C8DB4);
INCLUDE_ASM("asm/us/st/no3/nonmatchings/3E134", func_801C8DB4);
void EntityUnkId14(Entity* entity) {
if (entity->step == 0) {
@ -1151,7 +1151,7 @@ void EntityUnkId15(Entity* arg0) {
}
}
INCLUDE_ASM("asm/st/no3/nonmatchings/3E134", func_801C9080);
INCLUDE_ASM("asm/us/st/no3/nonmatchings/3E134", func_801C9080);
bool func_801C92B0(Unkstruct6* unk) {
CollisionResult res;
@ -1178,7 +1178,7 @@ bool func_801C92B0(Unkstruct6* unk) {
return false;
}
INCLUDE_ASM("asm/st/no3/nonmatchings/3E134", func_801C93AC);
INCLUDE_ASM("asm/us/st/no3/nonmatchings/3E134", func_801C93AC);
void EntityIntenseExplosion(Entity* entity) {
u32 zPriority;
@ -1271,23 +1271,23 @@ void func_801C9BC0(void) {
}
}
INCLUDE_ASM("asm/st/no3/nonmatchings/3E134", func_801C9C78);
INCLUDE_ASM("asm/us/st/no3/nonmatchings/3E134", func_801C9C78);
INCLUDE_ASM("asm/st/no3/nonmatchings/3E134", func_801C9E50);
INCLUDE_ASM("asm/us/st/no3/nonmatchings/3E134", func_801C9E50);
INCLUDE_ASM("asm/st/no3/nonmatchings/3E134", func_801CA430);
INCLUDE_ASM("asm/us/st/no3/nonmatchings/3E134", func_801CA430);
INCLUDE_ASM("asm/st/no3/nonmatchings/3E134", func_801CAB30);
INCLUDE_ASM("asm/us/st/no3/nonmatchings/3E134", func_801CAB30);
INCLUDE_ASM("asm/st/no3/nonmatchings/3E134", func_801CAD28);
INCLUDE_ASM("asm/us/st/no3/nonmatchings/3E134", func_801CAD28);
INCLUDE_ASM("asm/st/no3/nonmatchings/3E134", func_801CAE20);
INCLUDE_ASM("asm/us/st/no3/nonmatchings/3E134", func_801CAE20);
INCLUDE_ASM("asm/st/no3/nonmatchings/3E134", EntityStageNamePopup);
INCLUDE_ASM("asm/us/st/no3/nonmatchings/3E134", EntityStageNamePopup);
INCLUDE_ASM("asm/st/no3/nonmatchings/3E134", EntityAbsorbOrb);
INCLUDE_ASM("asm/us/st/no3/nonmatchings/3E134", EntityAbsorbOrb);
INCLUDE_ASM("asm/st/no3/nonmatchings/3E134", EntityEnemyBlood);
INCLUDE_ASM("asm/us/st/no3/nonmatchings/3E134", EntityEnemyBlood);
void EntityRoomForeground(Entity* entity) {
ObjInit2* objInit = &D_80182764[entity->subId];
@ -1311,11 +1311,11 @@ void EntityRoomForeground(Entity* entity) {
AnimateEntity(objInit->unk10, entity);
}
INCLUDE_ASM("asm/st/no3/nonmatchings/3E134", func_801CC5A4);
INCLUDE_ASM("asm/us/st/no3/nonmatchings/3E134", func_801CC5A4);
INCLUDE_ASM("asm/st/no3/nonmatchings/3E134", func_801CC6F8);
INCLUDE_ASM("asm/us/st/no3/nonmatchings/3E134", func_801CC6F8);
INCLUDE_ASM("asm/st/no3/nonmatchings/3E134", func_801CC820);
INCLUDE_ASM("asm/us/st/no3/nonmatchings/3E134", func_801CC820);
void func_801CC90C(Entity* arg0) {
s16 temp_v0_2;
@ -1339,26 +1339,26 @@ void func_801CC90C(Entity* arg0) {
}
// stronger version of warg with jump and flame attack
INCLUDE_ASM("asm/st/no3/nonmatchings/3E134", EntityStrongWarg);
INCLUDE_ASM("asm/us/st/no3/nonmatchings/3E134", EntityStrongWarg);
INCLUDE_ASM("asm/st/no3/nonmatchings/3E134", EntityUnkId30);
INCLUDE_ASM("asm/us/st/no3/nonmatchings/3E134", EntityUnkId30);
INCLUDE_ASM("asm/st/no3/nonmatchings/3E134", EntityUnkId31);
INCLUDE_ASM("asm/us/st/no3/nonmatchings/3E134", EntityUnkId31);
// some sort of explosion
INCLUDE_ASM("asm/st/no3/nonmatchings/3E134", EntityExplosion3);
INCLUDE_ASM("asm/us/st/no3/nonmatchings/3E134", EntityExplosion3);
INCLUDE_ASM("asm/st/no3/nonmatchings/3E134", func_801CE740);
INCLUDE_ASM("asm/us/st/no3/nonmatchings/3E134", func_801CE740);
// flame-like attack on ground from strong warg
INCLUDE_ASM("asm/st/no3/nonmatchings/3E134", EntityStrongWargGroundWaveAttack);
INCLUDE_ASM("asm/us/st/no3/nonmatchings/3E134", EntityStrongWargWaveAttack);
INCLUDE_ASM("asm/st/no3/nonmatchings/3E134", EntityUnkId2F);
INCLUDE_ASM("asm/us/st/no3/nonmatchings/3E134", EntityUnkId2F);
// beams that go up when strong warg dies
INCLUDE_ASM("asm/st/no3/nonmatchings/3E134", EntityStrongWargDeathBeams);
INCLUDE_ASM("asm/us/st/no3/nonmatchings/3E134", EntityStrongWargDeathBeams);
INCLUDE_ASM("asm/st/no3/nonmatchings/3E134", func_801CF438);
INCLUDE_ASM("asm/us/st/no3/nonmatchings/3E134", func_801CF438);
void func_801CF58C(Entity* arg0) {
arg0->accelerationX = 0;
@ -1368,7 +1368,7 @@ void func_801CF58C(Entity* arg0) {
arg0->unk80.modeS16.unk0 = 0x20;
}
INCLUDE_ASM("asm/st/no3/nonmatchings/3E134", func_801CF5E0);
INCLUDE_ASM("asm/us/st/no3/nonmatchings/3E134", func_801CF5E0);
// duplicate of func_801CC90C in this file
void func_801CF6D8(Entity* arg0) {
@ -1392,9 +1392,9 @@ void func_801CF6D8(Entity* arg0) {
}
}
INCLUDE_ASM("asm/st/no3/nonmatchings/3E134", EntityWarg);
INCLUDE_ASM("asm/us/st/no3/nonmatchings/3E134", EntityWarg);
INCLUDE_ASM("asm/st/no3/nonmatchings/3E134", EntityUnkId4B);
INCLUDE_ASM("asm/us/st/no3/nonmatchings/3E134", EntityUnkId4B);
extern u8 D_8018383C;
@ -1425,31 +1425,31 @@ void EntityWargExplosionPuffTransparent(Entity* entity) {
}
}
INCLUDE_ASM("asm/st/no3/nonmatchings/3E134", func_801D06FC);
INCLUDE_ASM("asm/us/st/no3/nonmatchings/3E134", func_801D06FC);
INCLUDE_ASM("asm/st/no3/nonmatchings/3E134", func_801D0A2C);
INCLUDE_ASM("asm/us/st/no3/nonmatchings/3E134", func_801D0A2C);
// Alucard says "ahh" and turns blue from water contact
INCLUDE_ASM("asm/st/no3/nonmatchings/3E134", EntityAlucardWaterEffect);
INCLUDE_ASM("asm/us/st/no3/nonmatchings/3E134", EntityAlucardWaterEffect);
// large splash going upwards
INCLUDE_ASM("asm/st/no3/nonmatchings/3E134", EntityLargeUpwardsSplash);
INCLUDE_ASM("asm/us/st/no3/nonmatchings/3E134", EntityLargeUpwardsSplash);
// splash animation and sound when Alucard touches water
INCLUDE_ASM("asm/st/no3/nonmatchings/3E134", EntityAlucardSplash);
INCLUDE_ASM("asm/us/st/no3/nonmatchings/3E134", EntityAlucardSplash);
// small water droplets go to the side
INCLUDE_ASM("asm/st/no3/nonmatchings/3E134", EntitySidewaysWaterDroplets);
INCLUDE_ASM("asm/us/st/no3/nonmatchings/3E134", EntitySidewaysWaterDroplets);
// small water droplets go upwards
INCLUDE_ASM("asm/st/no3/nonmatchings/3E134", EntitySmallUpwardsSplash);
INCLUDE_ASM("asm/us/st/no3/nonmatchings/3E134", EntitySmallUpwardsSplash);
// particle effect, part of merman splash
INCLUDE_ASM("asm/st/no3/nonmatchings/3E134", EntitySmallWaterSplash);
INCLUDE_ASM("asm/us/st/no3/nonmatchings/3E134", EntitySmallWaterSplash);
// https://decomp.me/scratch/steI4
#ifndef NON_EQUIVALENT
INCLUDE_ASM("asm/st/no3/nonmatchings/3E134", func_801D2D40);
INCLUDE_ASM("asm/us/st/no3/nonmatchings/3E134", func_801D2D40);
#else
extern Entity D_8007DE38[];
@ -1480,13 +1480,13 @@ s32 func_801D2D40(s16 arg0) {
#endif
// another merman variant
INCLUDE_ASM("asm/st/no3/nonmatchings/3E134", EntityMerman3);
INCLUDE_ASM("asm/us/st/no3/nonmatchings/3E134", EntityMerman3);
// https://decomp.me/scratch/SXkSP
// https://decomp.me/scratch/v6yMP
// some sort of explosion
#ifndef NON_EQUIVALENT
INCLUDE_ASM("asm/st/no3/nonmatchings/3E134", EntityExplosion2);
INCLUDE_ASM("asm/us/st/no3/nonmatchings/3E134", EntityExplosion2);
#else
void func_801D6880(POLY_GT4*, s32);
void func_801D6FCC(POLY_GT4*, s16);
@ -1585,7 +1585,7 @@ void EntityMediumWaterSplash(Entity* entity) {
}
// spawns EntityMediumWaterSplash, part of merman splash
INCLUDE_ASM("asm/st/no3/nonmatchings/3E134", EntityLargeWaterSplash);
INCLUDE_ASM("asm/us/st/no3/nonmatchings/3E134", EntityLargeWaterSplash);
// some kind of falling object
void EntityFallingObject2(Entity* self) {
@ -1688,9 +1688,9 @@ void EntityLargeFallingObject(Entity* self) {
}
}
INCLUDE_ASM("asm/st/no3/nonmatchings/3E134", EntityMerman2);
INCLUDE_ASM("asm/us/st/no3/nonmatchings/3E134", EntityMerman2);
INCLUDE_ASM("asm/st/no3/nonmatchings/3E134", EntityMerman);
INCLUDE_ASM("asm/us/st/no3/nonmatchings/3E134", EntityMerman);
// fireball shot by merman
void EntityMermanFireball(Entity* self) {
@ -1758,7 +1758,7 @@ void EntityFallingObject(Entity* arg0) {
}
// part of explosion when merman dies
INCLUDE_ASM("asm/st/no3/nonmatchings/3E134", EntityMermanExplosion);
INCLUDE_ASM("asm/us/st/no3/nonmatchings/3E134", EntityMermanExplosion);
s32 func_801C52EC(s32*);
s32 func_801C5A98(s32*, s32);
@ -1783,7 +1783,7 @@ void func_801D59D0(void) {
}
}
INCLUDE_ASM("asm/st/no3/nonmatchings/3E134", EntityBoneScimitar);
INCLUDE_ASM("asm/us/st/no3/nonmatchings/3E134", EntityBoneScimitar);
// debris that rotates and falls down
void EntityFallingDebris(Entity* entity) {

8
src/st/no3/56264.c
View File

@ -71,13 +71,13 @@ void EntityBat(Entity* entity) {
}
}
INCLUDE_ASM("asm/st/no3/nonmatchings/56264", EntityZombie);
INCLUDE_ASM("asm/us/st/no3/nonmatchings/56264", EntityZombie);
INCLUDE_ASM("asm/st/no3/nonmatchings/56264", EntityUnkId4D);
INCLUDE_ASM("asm/us/st/no3/nonmatchings/56264", EntityUnkId4D);
INCLUDE_ASM("asm/st/no3/nonmatchings/56264", func_801D6880);
INCLUDE_ASM("asm/us/st/no3/nonmatchings/56264", func_801D6880);
INCLUDE_ASM("asm/st/no3/nonmatchings/56264", func_801D6C68);
INCLUDE_ASM("asm/us/st/no3/nonmatchings/56264", func_801D6C68);
POLY_GT4* func_801D6DB8(POLY_GT4* poly) {
while (poly != NULL) {

230
src/st/np3/3246C.c
View File

@ -28,7 +28,7 @@ void func_801B246C(Entity* arg0) {
AnimateEntity(temp_s0->unk10, arg0);
}
INCLUDE_ASM("asm/st/np3/nonmatchings/3246C", func_801B2540);
INCLUDE_ASM("asm/us/st/np3/nonmatchings/3246C", func_801B2540);
extern u16 g_eBreakableInit[];
extern u8* g_eBreakableAnimations[8];
@ -65,7 +65,7 @@ void EntityBreakable(Entity* entity) {
// nops in between assignments
// https://decomp.me/scratch/sKMmw
#ifndef NON_MATCHING
INCLUDE_ASM("asm/st/np3/nonmatchings/3246C", func_801B2830);
INCLUDE_ASM("asm/us/st/np3/nonmatchings/3246C", func_801B2830);
#else
extern u16 D_80180A60;
@ -104,19 +104,19 @@ void func_801B2830(Entity* entity) {
}
#endif
INCLUDE_ASM("asm/st/np3/nonmatchings/3246C", func_801B28E4);
INCLUDE_ASM("asm/us/st/np3/nonmatchings/3246C", func_801B28E4);
INCLUDE_ASM("asm/st/np3/nonmatchings/3246C", func_801B2C20);
INCLUDE_ASM("asm/us/st/np3/nonmatchings/3246C", func_801B2C20);
INCLUDE_ASM("asm/st/np3/nonmatchings/3246C", func_801B2F30);
INCLUDE_ASM("asm/us/st/np3/nonmatchings/3246C", func_801B2F30);
INCLUDE_ASM("asm/st/np3/nonmatchings/3246C", func_801B32A8);
INCLUDE_ASM("asm/us/st/np3/nonmatchings/3246C", func_801B32A8);
INCLUDE_ASM("asm/st/np3/nonmatchings/3246C", func_801B3704);
INCLUDE_ASM("asm/us/st/np3/nonmatchings/3246C", func_801B3704);
INCLUDE_ASM("asm/st/np3/nonmatchings/3246C", func_801B39CC);
INCLUDE_ASM("asm/us/st/np3/nonmatchings/3246C", func_801B39CC);
INCLUDE_ASM("asm/st/np3/nonmatchings/3246C", func_801B3D24);
INCLUDE_ASM("asm/us/st/np3/nonmatchings/3246C", func_801B3D24);
void EntityCavernDoorLever(Entity* entity) {
s32 posX;
@ -157,11 +157,11 @@ void EntityCavernDoorLever(Entity* entity) {
entity[1].posY.val = posY;
}
INCLUDE_ASM("asm/st/np3/nonmatchings/3246C", func_801B4004);
INCLUDE_ASM("asm/us/st/np3/nonmatchings/3246C", func_801B4004);
INCLUDE_ASM("asm/st/np3/nonmatchings/3246C", func_801B40F8);
INCLUDE_ASM("asm/us/st/np3/nonmatchings/3246C", func_801B40F8);
INCLUDE_ASM("asm/st/np3/nonmatchings/3246C", func_801B44B4);
INCLUDE_ASM("asm/us/st/np3/nonmatchings/3246C", func_801B44B4);
// switch that clicks when you step on it
void EntityClickSwitch(Entity* entity) {
@ -194,61 +194,61 @@ void EntityClickSwitch(Entity* entity) {
}
}
INCLUDE_ASM("asm/st/np3/nonmatchings/3246C", func_801B4680);
INCLUDE_ASM("asm/us/st/np3/nonmatchings/3246C", func_801B4680);
INCLUDE_ASM("asm/st/np3/nonmatchings/3246C", func_801B4940);
INCLUDE_ASM("asm/us/st/np3/nonmatchings/3246C", func_801B4940);
INCLUDE_ASM("asm/st/np3/nonmatchings/3246C", EntityTrapDoor);
INCLUDE_ASM("asm/us/st/np3/nonmatchings/3246C", EntityTrapDoor);
INCLUDE_ASM("asm/st/np3/nonmatchings/3246C", func_801B4D60);
INCLUDE_ASM("asm/us/st/np3/nonmatchings/3246C", func_801B4D60);
INCLUDE_ASM("asm/st/np3/nonmatchings/3246C", func_801B5108);
INCLUDE_ASM("asm/us/st/np3/nonmatchings/3246C", func_801B5108);
INCLUDE_ASM("asm/st/np3/nonmatchings/3246C", func_801B5488);
INCLUDE_ASM("asm/us/st/np3/nonmatchings/3246C", func_801B5488);
INCLUDE_ASM("asm/st/np3/nonmatchings/3246C", func_801B560C);
INCLUDE_ASM("asm/us/st/np3/nonmatchings/3246C", func_801B560C);
INCLUDE_ASM("asm/st/np3/nonmatchings/3246C", func_801B5790);
INCLUDE_ASM("asm/us/st/np3/nonmatchings/3246C", func_801B5790);
INCLUDE_ASM("asm/st/np3/nonmatchings/3246C", func_801B5C5C);
INCLUDE_ASM("asm/us/st/np3/nonmatchings/3246C", func_801B5C5C);
INCLUDE_ASM("asm/st/np3/nonmatchings/3246C", func_801B5DE8);
INCLUDE_ASM("asm/us/st/np3/nonmatchings/3246C", func_801B5DE8);
INCLUDE_ASM("asm/st/np3/nonmatchings/3246C", func_801B5E98);
INCLUDE_ASM("asm/us/st/np3/nonmatchings/3246C", func_801B5E98);
INCLUDE_ASM("asm/st/np3/nonmatchings/3246C", EntitySwitch);
INCLUDE_ASM("asm/us/st/np3/nonmatchings/3246C", EntitySwitch);
INCLUDE_ASM("asm/st/np3/nonmatchings/3246C", func_801B6084);
INCLUDE_ASM("asm/us/st/np3/nonmatchings/3246C", func_801B6084);
INCLUDE_ASM("asm/st/np3/nonmatchings/3246C", EntityUnkId49);
INCLUDE_ASM("asm/us/st/np3/nonmatchings/3246C", EntityUnkId49);
INCLUDE_ASM("asm/st/np3/nonmatchings/3246C", func_801B653C);
INCLUDE_ASM("asm/us/st/np3/nonmatchings/3246C", func_801B653C);
INCLUDE_ASM("asm/st/np3/nonmatchings/3246C", func_801B65FC);
INCLUDE_ASM("asm/us/st/np3/nonmatchings/3246C", func_801B65FC);
INCLUDE_ASM("asm/st/np3/nonmatchings/3246C", func_801B6990);
INCLUDE_ASM("asm/us/st/np3/nonmatchings/3246C", func_801B6990);
INCLUDE_ASM("asm/st/np3/nonmatchings/3246C", func_801B75EC);
INCLUDE_ASM("asm/us/st/np3/nonmatchings/3246C", func_801B75EC);
INCLUDE_ASM("asm/st/np3/nonmatchings/3246C", func_801B7798);
INCLUDE_ASM("asm/us/st/np3/nonmatchings/3246C", func_801B7798);
INCLUDE_ASM("asm/st/np3/nonmatchings/3246C", func_801B78BC);
INCLUDE_ASM("asm/us/st/np3/nonmatchings/3246C", func_801B78BC);
INCLUDE_ASM("asm/st/np3/nonmatchings/3246C", func_801B8CC0);
INCLUDE_ASM("asm/us/st/np3/nonmatchings/3246C", func_801B8CC0);
INCLUDE_ASM("asm/st/np3/nonmatchings/3246C", func_801B8D84);
INCLUDE_ASM("asm/us/st/np3/nonmatchings/3246C", func_801B8D84);
INCLUDE_ASM("asm/st/np3/nonmatchings/3246C", func_801B8E94);
INCLUDE_ASM("asm/us/st/np3/nonmatchings/3246C", func_801B8E94);
INCLUDE_ASM("asm/st/np3/nonmatchings/3246C", func_801B90BC);
INCLUDE_ASM("asm/us/st/np3/nonmatchings/3246C", func_801B90BC);
INCLUDE_ASM("asm/st/np3/nonmatchings/3246C", Update);
INCLUDE_ASM("asm/us/st/np3/nonmatchings/3246C", Update);
INCLUDE_ASM("asm/st/np3/nonmatchings/3246C", func_801B93E8);
INCLUDE_ASM("asm/us/st/np3/nonmatchings/3246C", func_801B93E8);
INCLUDE_ASM("asm/st/np3/nonmatchings/3246C", func_801B94F0);
INCLUDE_ASM("asm/us/st/np3/nonmatchings/3246C", func_801B94F0);
INCLUDE_ASM("asm/st/np3/nonmatchings/3246C", EntityNumericDamage);
INCLUDE_ASM("asm/us/st/np3/nonmatchings/3246C", EntityNumericDamage);
void CreateEntityFromLayout(Entity* entity, LayoutObject* initDesc) {
DestroyEntity(entity);
@ -263,29 +263,29 @@ void CreateEntityFromLayout(Entity* entity, LayoutObject* initDesc) {
entity->unk68 = (initDesc->objectId >> 0xA) & 7;
}
INCLUDE_ASM("asm/st/np3/nonmatchings/3246C", func_801BAD70);
INCLUDE_ASM("asm/us/st/np3/nonmatchings/3246C", func_801BAD70);
INCLUDE_ASM("asm/st/np3/nonmatchings/3246C", func_801BAE88);
INCLUDE_ASM("asm/us/st/np3/nonmatchings/3246C", func_801BAE88);
INCLUDE_ASM("asm/st/np3/nonmatchings/3246C", func_801BAFA0);
INCLUDE_ASM("asm/us/st/np3/nonmatchings/3246C", func_801BAFA0);
INCLUDE_ASM("asm/st/np3/nonmatchings/3246C", func_801BAFEC);
INCLUDE_ASM("asm/us/st/np3/nonmatchings/3246C", func_801BAFEC);
INCLUDE_ASM("asm/st/np3/nonmatchings/3246C", func_801BB044);
INCLUDE_ASM("asm/us/st/np3/nonmatchings/3246C", func_801BB044);
INCLUDE_ASM("asm/st/np3/nonmatchings/3246C", func_801BB140);
INCLUDE_ASM("asm/us/st/np3/nonmatchings/3246C", func_801BB140);
INCLUDE_ASM("asm/st/np3/nonmatchings/3246C", func_801BB254);
INCLUDE_ASM("asm/us/st/np3/nonmatchings/3246C", func_801BB254);
INCLUDE_ASM("asm/st/np3/nonmatchings/3246C", func_801BB2A0);
INCLUDE_ASM("asm/us/st/np3/nonmatchings/3246C", func_801BB2A0);
INCLUDE_ASM("asm/st/np3/nonmatchings/3246C", func_801BB2F8);
INCLUDE_ASM("asm/us/st/np3/nonmatchings/3246C", func_801BB2F8);
INCLUDE_ASM("asm/st/np3/nonmatchings/3246C", func_801BB3F4);
INCLUDE_ASM("asm/us/st/np3/nonmatchings/3246C", func_801BB3F4);
INCLUDE_ASM("asm/st/np3/nonmatchings/3246C", InitRoomEntities);
INCLUDE_ASM("asm/us/st/np3/nonmatchings/3246C", InitRoomEntities);
INCLUDE_ASM("asm/st/np3/nonmatchings/3246C", func_801BB680);
INCLUDE_ASM("asm/us/st/np3/nonmatchings/3246C", func_801BB680);
void CreateEntityFromCurrentEntity(u16 objectId, Entity* entity) {
DestroyEntity(entity);
@ -320,7 +320,7 @@ s32 func_801BB824(Unkstruct5* arg0) {
return diff;
}
INCLUDE_ASM("asm/st/np3/nonmatchings/3246C", EntityRedDoor);
INCLUDE_ASM("asm/us/st/np3/nonmatchings/3246C", EntityRedDoor);
void DestroyEntity(Entity* item) {
s32 i;
@ -357,7 +357,7 @@ void PreventEntityFromRespawning(Entity* entity) {
#include "st/AnimateEntity.h"
INCLUDE_ASM("asm/st/np3/nonmatchings/3246C", func_801BC6BC);
INCLUDE_ASM("asm/us/st/np3/nonmatchings/3246C", func_801BC6BC);
s32 func_801BC7D4(void) {
s16 yDistance = g_CurrentEntity->posX.i.hi - PLAYER.posX.i.hi;
@ -391,11 +391,11 @@ void MoveEntity(void) {
g_CurrentEntity->posY.val += g_CurrentEntity->accelerationY;
}
INCLUDE_ASM("asm/st/np3/nonmatchings/3246C", FallEntity);
INCLUDE_ASM("asm/us/st/np3/nonmatchings/3246C", FallEntity);
INCLUDE_ASM("asm/st/np3/nonmatchings/3246C", func_801BC8E4);
INCLUDE_ASM("asm/us/st/np3/nonmatchings/3246C", func_801BC8E4);
INCLUDE_ASM("asm/st/np3/nonmatchings/3246C", func_801BCB5C);
INCLUDE_ASM("asm/us/st/np3/nonmatchings/3246C", func_801BCB5C);
Entity* AllocEntity(Entity* start, Entity* end) {
Entity* current = start;
@ -433,7 +433,7 @@ u8 func_801BCED8(s32 x, s32 y) {
return func_801BCE58(diffX, diffY);
}
INCLUDE_ASM("asm/st/np3/nonmatchings/3246C", func_801BCF20);
INCLUDE_ASM("asm/us/st/np3/nonmatchings/3246C", func_801BCF20);
void func_801BCF78(u16 slope, s16 speed) {
Entity* entity;
@ -469,7 +469,7 @@ u16 func_801BD06C(s32 x, s32 y) {
return ratan2(diffY, diffX);
}
INCLUDE_ASM("asm/st/np3/nonmatchings/3246C", func_801BD0B4);
INCLUDE_ASM("asm/us/st/np3/nonmatchings/3246C", func_801BD0B4);
void func_801BD114(u8 step) {
g_CurrentEntity->step = step;
@ -484,7 +484,7 @@ void func_801BD134(u8 arg0) {
g_CurrentEntity->animFrameDuration = 0;
}
INCLUDE_ASM("asm/st/np3/nonmatchings/3246C", func_801BD150);
INCLUDE_ASM("asm/us/st/np3/nonmatchings/3246C", func_801BD150);
void InitializeEntity(u16 arg0[]) {
u16 temp_v1;
@ -520,11 +520,11 @@ void EntityDummy(Entity* arg0) {
}
}
INCLUDE_ASM("asm/st/np3/nonmatchings/3246C", func_801BD308);
INCLUDE_ASM("asm/us/st/np3/nonmatchings/3246C", func_801BD308);
INCLUDE_ASM("asm/st/np3/nonmatchings/3246C", func_801BD430);
INCLUDE_ASM("asm/us/st/np3/nonmatchings/3246C", func_801BD430);
INCLUDE_ASM("asm/st/np3/nonmatchings/3246C", func_801BD588);
INCLUDE_ASM("asm/us/st/np3/nonmatchings/3246C", func_801BD588);
void ReplaceBreakableWithItemDrop(Entity* entity) {
u16 temp_a0;
@ -557,39 +557,39 @@ void ReplaceBreakableWithItemDrop(Entity* entity) {
entity->step = temp_a0;
}
INCLUDE_ASM("asm/st/np3/nonmatchings/3246C", func_801BD984);
INCLUDE_ASM("asm/us/st/np3/nonmatchings/3246C", func_801BD984);
INCLUDE_ASM("asm/st/np3/nonmatchings/3246C", func_801BDA08);
INCLUDE_ASM("asm/us/st/np3/nonmatchings/3246C", func_801BDA08);
INCLUDE_ASM("asm/st/np3/nonmatchings/3246C", func_801BDB64);
INCLUDE_ASM("asm/us/st/np3/nonmatchings/3246C", func_801BDB64);
INCLUDE_ASM("asm/st/np3/nonmatchings/3246C", func_801BDBE4);
INCLUDE_ASM("asm/us/st/np3/nonmatchings/3246C", func_801BDBE4);
INCLUDE_ASM("asm/st/np3/nonmatchings/3246C", func_801BDCC0);
INCLUDE_ASM("asm/us/st/np3/nonmatchings/3246C", func_801BDCC0);
INCLUDE_ASM("asm/st/np3/nonmatchings/3246C", func_801BDDD8);
INCLUDE_ASM("asm/us/st/np3/nonmatchings/3246C", func_801BDDD8);
INCLUDE_ASM("asm/st/np3/nonmatchings/3246C", func_801BDE7C);
INCLUDE_ASM("asm/us/st/np3/nonmatchings/3246C", func_801BDE7C);
void func_801BDECC(void) { DestroyEntity(g_CurrentEntity); }
INCLUDE_ASM("asm/st/np3/nonmatchings/3246C", EntityPriceDrop);
INCLUDE_ASM("asm/us/st/np3/nonmatchings/3246C", EntityPriceDrop);
INCLUDE_ASM("asm/st/np3/nonmatchings/3246C", EntityExplosion);
INCLUDE_ASM("asm/us/st/np3/nonmatchings/3246C", EntityExplosion);
INCLUDE_ASM("asm/st/np3/nonmatchings/3246C", func_801BE864);
INCLUDE_ASM("asm/us/st/np3/nonmatchings/3246C", func_801BE864);
INCLUDE_ASM("asm/st/np3/nonmatchings/3246C", EntityInventoryDrop);
INCLUDE_ASM("asm/us/st/np3/nonmatchings/3246C", EntityInventoryDrop);
INCLUDE_ASM("asm/st/np3/nonmatchings/3246C", func_801BEEF0);
INCLUDE_ASM("asm/us/st/np3/nonmatchings/3246C", func_801BEEF0);
INCLUDE_ASM("asm/st/np3/nonmatchings/3246C", EntityRelicOrb);
INCLUDE_ASM("asm/us/st/np3/nonmatchings/3246C", EntityRelicOrb);
INCLUDE_ASM("asm/st/np3/nonmatchings/3246C", EntityHeartDrop);
INCLUDE_ASM("asm/us/st/np3/nonmatchings/3246C", EntityHeartDrop);
INCLUDE_ASM("asm/st/np3/nonmatchings/3246C", EntityUnkId0E);
INCLUDE_ASM("asm/us/st/np3/nonmatchings/3246C", EntityUnkId0E);
INCLUDE_ASM("asm/st/np3/nonmatchings/3246C", func_801C02F4);
INCLUDE_ASM("asm/us/st/np3/nonmatchings/3246C", func_801C02F4);
void func_801C03E4(Entity* entity) {
switch (entity->step) {
@ -617,45 +617,45 @@ void func_801C03E4(Entity* entity) {
}
}
INCLUDE_ASM("asm/st/np3/nonmatchings/3246C", func_801C04F4);
INCLUDE_ASM("asm/us/st/np3/nonmatchings/3246C", func_801C04F4);
INCLUDE_ASM("asm/st/np3/nonmatchings/3246C", func_801C0624);
INCLUDE_ASM("asm/us/st/np3/nonmatchings/3246C", func_801C0624);
INCLUDE_ASM("asm/st/np3/nonmatchings/3246C", func_801C070C);
INCLUDE_ASM("asm/us/st/np3/nonmatchings/3246C", func_801C070C);
INCLUDE_ASM("asm/st/np3/nonmatchings/3246C", func_801C07FC);
INCLUDE_ASM("asm/us/st/np3/nonmatchings/3246C", func_801C07FC);
INCLUDE_ASM("asm/st/np3/nonmatchings/3246C", func_801C08F0);
INCLUDE_ASM("asm/us/st/np3/nonmatchings/3246C", func_801C08F0);
INCLUDE_ASM("asm/st/np3/nonmatchings/3246C", func_801C0B20);
INCLUDE_ASM("asm/us/st/np3/nonmatchings/3246C", func_801C0B20);
INCLUDE_ASM("asm/st/np3/nonmatchings/3246C", func_801C0C1C);
INCLUDE_ASM("asm/us/st/np3/nonmatchings/3246C", func_801C0C1C);
INCLUDE_ASM("asm/st/np3/nonmatchings/3246C", EntityIntenseExplosion);
INCLUDE_ASM("asm/us/st/np3/nonmatchings/3246C", EntityIntenseExplosion);
INCLUDE_ASM("asm/st/np3/nonmatchings/3246C", func_801C129C);
INCLUDE_ASM("asm/us/st/np3/nonmatchings/3246C", func_801C129C);
INCLUDE_ASM("asm/st/np3/nonmatchings/3246C", func_801C1368);
INCLUDE_ASM("asm/us/st/np3/nonmatchings/3246C", func_801C1368);
INCLUDE_ASM("asm/st/np3/nonmatchings/3246C", func_801C1430);
INCLUDE_ASM("asm/us/st/np3/nonmatchings/3246C", func_801C1430);
INCLUDE_ASM("asm/st/np3/nonmatchings/3246C", func_801C14E8);
INCLUDE_ASM("asm/us/st/np3/nonmatchings/3246C", func_801C14E8);
INCLUDE_ASM("asm/st/np3/nonmatchings/3246C", func_801C16C0);
INCLUDE_ASM("asm/us/st/np3/nonmatchings/3246C", func_801C16C0);
INCLUDE_ASM("asm/st/np3/nonmatchings/3246C", func_801C1CA0);
INCLUDE_ASM("asm/us/st/np3/nonmatchings/3246C", func_801C1CA0);
INCLUDE_ASM("asm/st/np3/nonmatchings/3246C", func_801C23A0);
INCLUDE_ASM("asm/us/st/np3/nonmatchings/3246C", func_801C23A0);
INCLUDE_ASM("asm/st/np3/nonmatchings/3246C", func_801C2598);
INCLUDE_ASM("asm/us/st/np3/nonmatchings/3246C", func_801C2598);
INCLUDE_ASM("asm/st/np3/nonmatchings/3246C", func_801C2690);
INCLUDE_ASM("asm/us/st/np3/nonmatchings/3246C", func_801C2690);
INCLUDE_ASM("asm/st/np3/nonmatchings/3246C", EntityStageNamePopup);
INCLUDE_ASM("asm/us/st/np3/nonmatchings/3246C", EntityStageNamePopup);
INCLUDE_ASM("asm/st/np3/nonmatchings/3246C", EntityAbsorbOrb);
INCLUDE_ASM("asm/us/st/np3/nonmatchings/3246C", EntityAbsorbOrb);
INCLUDE_ASM("asm/st/np3/nonmatchings/3246C", EntityEnemyBlood);
INCLUDE_ASM("asm/us/st/np3/nonmatchings/3246C", EntityEnemyBlood);
extern ObjInit2 D_801820F0[];
void EntityRoomForeground(Entity* entity) {
@ -680,31 +680,31 @@ void EntityRoomForeground(Entity* entity) {
AnimateEntity(objInit->unk10, entity);
}
INCLUDE_ASM("asm/st/np3/nonmatchings/3246C", func_801C3E14);
INCLUDE_ASM("asm/us/st/np3/nonmatchings/3246C", func_801C3E14);
INCLUDE_ASM("asm/st/np3/nonmatchings/3246C", func_801C4144);
INCLUDE_ASM("asm/us/st/np3/nonmatchings/3246C", func_801C4144);
INCLUDE_ASM("asm/st/np3/nonmatchings/3246C", func_801C424C);
INCLUDE_ASM("asm/us/st/np3/nonmatchings/3246C", func_801C424C);
INCLUDE_ASM("asm/st/np3/nonmatchings/3246C", func_801C4DCC);
INCLUDE_ASM("asm/us/st/np3/nonmatchings/3246C", func_801C4DCC);
INCLUDE_ASM("asm/st/np3/nonmatchings/3246C", func_801C56D8);
INCLUDE_ASM("asm/us/st/np3/nonmatchings/3246C", func_801C56D8);
INCLUDE_ASM("asm/st/np3/nonmatchings/3246C", func_801C5BC4);
INCLUDE_ASM("asm/us/st/np3/nonmatchings/3246C", func_801C5BC4);
INCLUDE_ASM("asm/st/np3/nonmatchings/3246C", func_801C5F58);
INCLUDE_ASM("asm/us/st/np3/nonmatchings/3246C", func_801C5F58);
INCLUDE_ASM("asm/st/np3/nonmatchings/3246C", func_801C61B4);
INCLUDE_ASM("asm/us/st/np3/nonmatchings/3246C", func_801C61B4);
INCLUDE_ASM("asm/st/np3/nonmatchings/3246C", func_801C6458);
INCLUDE_ASM("asm/us/st/np3/nonmatchings/3246C", func_801C6458);
INCLUDE_ASM("asm/st/np3/nonmatchings/3246C", func_801C6564);
INCLUDE_ASM("asm/us/st/np3/nonmatchings/3246C", func_801C6564);
INCLUDE_ASM("asm/st/np3/nonmatchings/3246C", func_801C7650);
INCLUDE_ASM("asm/us/st/np3/nonmatchings/3246C", func_801C7650);
INCLUDE_ASM("asm/st/np3/nonmatchings/3246C", func_801C7880);
INCLUDE_ASM("asm/us/st/np3/nonmatchings/3246C", func_801C7880);
INCLUDE_ASM("asm/st/np3/nonmatchings/3246C", func_801C7954);
INCLUDE_ASM("asm/us/st/np3/nonmatchings/3246C", func_801C7954);
void func_801C7D80(Entity* self) {
if (self->step == 0) {
@ -805,9 +805,9 @@ void EntityLargeFallingObject(Entity* self) {
}
}
INCLUDE_ASM("asm/st/np3/nonmatchings/3246C", EntityMerman2);
INCLUDE_ASM("asm/us/st/np3/nonmatchings/3246C", EntityMerman2);
INCLUDE_ASM("asm/st/np3/nonmatchings/3246C", EntityMerman);
INCLUDE_ASM("asm/us/st/np3/nonmatchings/3246C", EntityMerman);
void func_801C8DF0(Entity* self) {
Entity* entity;
@ -912,7 +912,7 @@ void func_801C90E8(void) {
}
}
INCLUDE_ASM("asm/st/np3/nonmatchings/3246C", EntityBoneScimitar);
INCLUDE_ASM("asm/us/st/np3/nonmatchings/3246C", EntityBoneScimitar);
// debris that rotates and falls down
void EntityFallingDebris(Entity* entity) {

98
src/st/np3/4997C.c
View File

@ -71,29 +71,29 @@ void EntityBat(Entity* entity) {
}
}
INCLUDE_ASM("asm/st/np3/nonmatchings/4997C", EntityZombie);
INCLUDE_ASM("asm/us/st/np3/nonmatchings/4997C", EntityZombie);
INCLUDE_ASM("asm/st/np3/nonmatchings/4997C", EntityUnkId4D);
INCLUDE_ASM("asm/us/st/np3/nonmatchings/4997C", EntityUnkId4D);
INCLUDE_ASM("asm/st/np3/nonmatchings/4997C", func_801C9F98);
INCLUDE_ASM("asm/us/st/np3/nonmatchings/4997C", func_801C9F98);
INCLUDE_ASM("asm/st/np3/nonmatchings/4997C", func_801CA498);
INCLUDE_ASM("asm/us/st/np3/nonmatchings/4997C", func_801CA498);
INCLUDE_ASM("asm/st/np3/nonmatchings/4997C", func_801CA654);
INCLUDE_ASM("asm/us/st/np3/nonmatchings/4997C", func_801CA654);
INCLUDE_ASM("asm/st/np3/nonmatchings/4997C", func_801CAE0C);
INCLUDE_ASM("asm/us/st/np3/nonmatchings/4997C", func_801CAE0C);
INCLUDE_ASM("asm/st/np3/nonmatchings/4997C", func_801CB018);
INCLUDE_ASM("asm/us/st/np3/nonmatchings/4997C", func_801CB018);
INCLUDE_ASM("asm/st/np3/nonmatchings/4997C", func_801CBF18);
INCLUDE_ASM("asm/us/st/np3/nonmatchings/4997C", func_801CBF18);
INCLUDE_ASM("asm/st/np3/nonmatchings/4997C", func_801CC2E0);
INCLUDE_ASM("asm/us/st/np3/nonmatchings/4997C", func_801CC2E0);
INCLUDE_ASM("asm/st/np3/nonmatchings/4997C", func_801CD540);
INCLUDE_ASM("asm/us/st/np3/nonmatchings/4997C", func_801CD540);
INCLUDE_ASM("asm/st/np3/nonmatchings/4997C", func_801CD620);
INCLUDE_ASM("asm/us/st/np3/nonmatchings/4997C", func_801CD620);
INCLUDE_ASM("asm/st/np3/nonmatchings/4997C", func_801CD658);
INCLUDE_ASM("asm/us/st/np3/nonmatchings/4997C", func_801CD658);
void func_801CD734() {
while (PadRead(0))
@ -102,79 +102,79 @@ void func_801CD734() {
func_801CD658();
}
INCLUDE_ASM("asm/st/np3/nonmatchings/4997C", func_801CD78C);
INCLUDE_ASM("asm/us/st/np3/nonmatchings/4997C", func_801CD78C);
INCLUDE_ASM("asm/st/np3/nonmatchings/4997C", func_801CD83C);
INCLUDE_ASM("asm/us/st/np3/nonmatchings/4997C", func_801CD83C);
INCLUDE_ASM("asm/st/np3/nonmatchings/4997C", func_801CD91C);
INCLUDE_ASM("asm/us/st/np3/nonmatchings/4997C", func_801CD91C);
INCLUDE_ASM("asm/st/np3/nonmatchings/4997C", func_801CDA14);
INCLUDE_ASM("asm/us/st/np3/nonmatchings/4997C", func_801CDA14);
INCLUDE_ASM("asm/st/np3/nonmatchings/4997C", func_801CDA6C);
INCLUDE_ASM("asm/us/st/np3/nonmatchings/4997C", func_801CDA6C);
INCLUDE_ASM("asm/st/np3/nonmatchings/4997C", func_801CDAC8);
INCLUDE_ASM("asm/us/st/np3/nonmatchings/4997C", func_801CDAC8);
INCLUDE_ASM("asm/st/np3/nonmatchings/4997C", func_801CDC80);
INCLUDE_ASM("asm/us/st/np3/nonmatchings/4997C", func_801CDC80);
INCLUDE_ASM("asm/st/np3/nonmatchings/4997C", func_801CDD00);
INCLUDE_ASM("asm/us/st/np3/nonmatchings/4997C", func_801CDD00);
INCLUDE_ASM("asm/st/np3/nonmatchings/4997C", func_801CDD80);
INCLUDE_ASM("asm/us/st/np3/nonmatchings/4997C", func_801CDD80);
INCLUDE_ASM("asm/st/np3/nonmatchings/4997C", func_801CDE10);
INCLUDE_ASM("asm/us/st/np3/nonmatchings/4997C", func_801CDE10);
INCLUDE_ASM("asm/st/np3/nonmatchings/4997C", func_801CDE88);
INCLUDE_ASM("asm/us/st/np3/nonmatchings/4997C", func_801CDE88);
INCLUDE_ASM("asm/st/np3/nonmatchings/4997C", func_801CDF1C);
INCLUDE_ASM("asm/us/st/np3/nonmatchings/4997C", func_801CDF1C);
INCLUDE_ASM("asm/st/np3/nonmatchings/4997C", func_801CDFD8);
INCLUDE_ASM("asm/us/st/np3/nonmatchings/4997C", func_801CDFD8);
INCLUDE_ASM("asm/st/np3/nonmatchings/4997C", func_801CE04C);
INCLUDE_ASM("asm/us/st/np3/nonmatchings/4997C", func_801CE04C);
INCLUDE_ASM("asm/st/np3/nonmatchings/4997C", func_801CE120);
INCLUDE_ASM("asm/us/st/np3/nonmatchings/4997C", func_801CE120);
INCLUDE_ASM("asm/st/np3/nonmatchings/4997C", func_801CE1E8);
INCLUDE_ASM("asm/us/st/np3/nonmatchings/4997C", func_801CE1E8);
INCLUDE_ASM("asm/st/np3/nonmatchings/4997C", func_801CE228);
INCLUDE_ASM("asm/us/st/np3/nonmatchings/4997C", func_801CE228);
INCLUDE_ASM("asm/st/np3/nonmatchings/4997C", func_801CE258);
INCLUDE_ASM("asm/us/st/np3/nonmatchings/4997C", func_801CE258);
INCLUDE_ASM("asm/st/np3/nonmatchings/4997C", func_801CE2CC);
INCLUDE_ASM("asm/us/st/np3/nonmatchings/4997C", func_801CE2CC);
INCLUDE_ASM("asm/st/np3/nonmatchings/4997C", func_801CE3FC);
INCLUDE_ASM("asm/us/st/np3/nonmatchings/4997C", func_801CE3FC);
INCLUDE_ASM("asm/st/np3/nonmatchings/4997C", func_801CE4CC);
INCLUDE_ASM("asm/us/st/np3/nonmatchings/4997C", func_801CE4CC);
INCLUDE_ASM("asm/st/np3/nonmatchings/4997C", func_801CE69C);
INCLUDE_ASM("asm/us/st/np3/nonmatchings/4997C", func_801CE69C);
INCLUDE_ASM("asm/st/np3/nonmatchings/4997C", func_801CF254);
INCLUDE_ASM("asm/us/st/np3/nonmatchings/4997C", func_801CF254);
INCLUDE_ASM("asm/st/np3/nonmatchings/4997C", func_801CF5B8);
INCLUDE_ASM("asm/us/st/np3/nonmatchings/4997C", func_801CF5B8);
INCLUDE_ASM("asm/st/np3/nonmatchings/4997C", func_801CF778);
INCLUDE_ASM("asm/us/st/np3/nonmatchings/4997C", func_801CF778);
INCLUDE_ASM("asm/st/np3/nonmatchings/4997C", func_801CF7A0);
INCLUDE_ASM("asm/us/st/np3/nonmatchings/4997C", func_801CF7A0);
INCLUDE_ASM("asm/st/np3/nonmatchings/4997C", func_801CF94C);
INCLUDE_ASM("asm/us/st/np3/nonmatchings/4997C", func_801CF94C);
INCLUDE_ASM("asm/st/np3/nonmatchings/4997C", func_801D0730);
INCLUDE_ASM("asm/us/st/np3/nonmatchings/4997C", func_801D0730);
INCLUDE_ASM("asm/st/np3/nonmatchings/4997C", func_801D0A00);
INCLUDE_ASM("asm/us/st/np3/nonmatchings/4997C", func_801D0A00);
INCLUDE_ASM("asm/st/np3/nonmatchings/4997C", func_801D0B40);
INCLUDE_ASM("asm/us/st/np3/nonmatchings/4997C", func_801D0B40);
INCLUDE_ASM("asm/st/np3/nonmatchings/4997C", func_801D0B78);
INCLUDE_ASM("asm/us/st/np3/nonmatchings/4997C", func_801D0B78);
INCLUDE_ASM("asm/st/np3/nonmatchings/4997C", func_801D0D40);
INCLUDE_ASM("asm/us/st/np3/nonmatchings/4997C", func_801D0D40);
INCLUDE_ASM("asm/st/np3/nonmatchings/4997C", func_801D1BB8);
INCLUDE_ASM("asm/us/st/np3/nonmatchings/4997C", func_801D1BB8);
INCLUDE_ASM("asm/st/np3/nonmatchings/4997C", func_801D1F38);
INCLUDE_ASM("asm/us/st/np3/nonmatchings/4997C", func_801D1F38);
INCLUDE_ASM("asm/st/np3/nonmatchings/4997C", func_801D2320);
INCLUDE_ASM("asm/us/st/np3/nonmatchings/4997C", func_801D2320);
INCLUDE_ASM("asm/st/np3/nonmatchings/4997C", func_801D2470);
INCLUDE_ASM("asm/us/st/np3/nonmatchings/4997C", func_801D2470);
INCLUDE_ASM("asm/st/np3/nonmatchings/4997C", func_801D24A0);
INCLUDE_ASM("asm/us/st/np3/nonmatchings/4997C", func_801D24A0);
POLY_GT4* func_801D251C(POLY_GT4* startPoly, s32 count) {
POLY_GT4* poly;

229
src/st/nz0/30958.c
View File

@ -61,117 +61,117 @@ extern s32 D_80180C70;
extern u32 D_801822BC[];
extern u32 D_801822C8[];
INCLUDE_ASM("asm/st/nz0/nonmatchings/30958", func_801B0958);
INCLUDE_ASM("asm/us/st/nz0/nonmatchings/30958", func_801B0958);
INCLUDE_ASM("asm/st/nz0/nonmatchings/30958", func_801B0A20);
INCLUDE_ASM("asm/us/st/nz0/nonmatchings/30958", func_801B0A20);
INCLUDE_ASM("asm/st/nz0/nonmatchings/30958", func_801B0AA4);
INCLUDE_ASM("asm/us/st/nz0/nonmatchings/30958", func_801B0AA4);
INCLUDE_ASM("asm/st/nz0/nonmatchings/30958", EntityBreakable);
INCLUDE_ASM("asm/us/st/nz0/nonmatchings/30958", EntityBreakable);
// bust with red eyes that can have a candle on it
INCLUDE_ASM("asm/st/nz0/nonmatchings/30958", EntityRedEyeBust);
INCLUDE_ASM("asm/us/st/nz0/nonmatchings/30958", EntityRedEyeBust);
INCLUDE_ASM("asm/st/nz0/nonmatchings/30958", func_801B12E8);
INCLUDE_ASM("asm/us/st/nz0/nonmatchings/30958", func_801B12E8);
INCLUDE_ASM("asm/st/nz0/nonmatchings/30958", func_801B14C4);
INCLUDE_ASM("asm/us/st/nz0/nonmatchings/30958", func_801B14C4);
INCLUDE_ASM("asm/st/nz0/nonmatchings/30958", func_801B1770);
INCLUDE_ASM("asm/us/st/nz0/nonmatchings/30958", func_801B1770);
INCLUDE_ASM("asm/st/nz0/nonmatchings/30958", func_801B19A0);
INCLUDE_ASM("asm/us/st/nz0/nonmatchings/30958", func_801B19A0);
INCLUDE_ASM("asm/st/nz0/nonmatchings/30958", func_801B1C18);
INCLUDE_ASM("asm/us/st/nz0/nonmatchings/30958", func_801B1C18);
INCLUDE_ASM("asm/st/nz0/nonmatchings/30958", func_801B1E54);
INCLUDE_ASM("asm/us/st/nz0/nonmatchings/30958", func_801B1E54);
// moveable box for spike/switch areas
INCLUDE_ASM("asm/st/nz0/nonmatchings/30958", EntityMoveableBox);
INCLUDE_ASM("asm/us/st/nz0/nonmatchings/30958", EntityMoveableBox);
// lever to operate cannon
INCLUDE_ASM("asm/st/nz0/nonmatchings/30958", EntityCannonLever);
INCLUDE_ASM("asm/us/st/nz0/nonmatchings/30958", EntityCannonLever);
// cannon for shortcut
INCLUDE_ASM("asm/st/nz0/nonmatchings/30958", EntityCannon);
INCLUDE_ASM("asm/us/st/nz0/nonmatchings/30958", EntityCannon);
// projectile shot by cannon
INCLUDE_ASM("asm/st/nz0/nonmatchings/30958", EntityCannonShot);
INCLUDE_ASM("asm/us/st/nz0/nonmatchings/30958", EntityCannonShot);
INCLUDE_ASM("asm/st/nz0/nonmatchings/30958", func_801B2978);
INCLUDE_ASM("asm/us/st/nz0/nonmatchings/30958", func_801B2978);
INCLUDE_ASM("asm/st/nz0/nonmatchings/30958", func_801B2AD8);
INCLUDE_ASM("asm/us/st/nz0/nonmatchings/30958", func_801B2AD8);
INCLUDE_ASM("asm/st/nz0/nonmatchings/30958", func_801B2D08);
INCLUDE_ASM("asm/us/st/nz0/nonmatchings/30958", func_801B2D08);
INCLUDE_ASM("asm/st/nz0/nonmatchings/30958", func_801B2FD8);
INCLUDE_ASM("asm/us/st/nz0/nonmatchings/30958", func_801B2FD8);
INCLUDE_ASM("asm/st/nz0/nonmatchings/30958", func_801B3294);
INCLUDE_ASM("asm/us/st/nz0/nonmatchings/30958", func_801B3294);
// table with globe on it that can be broken
INCLUDE_ASM("asm/st/nz0/nonmatchings/30958", EntityTableWithGlobe);
INCLUDE_ASM("asm/us/st/nz0/nonmatchings/30958", EntityTableWithGlobe);
INCLUDE_ASM("asm/st/nz0/nonmatchings/30958", func_801B3648);
INCLUDE_ASM("asm/us/st/nz0/nonmatchings/30958", func_801B3648);
INCLUDE_ASM("asm/st/nz0/nonmatchings/30958", func_801B37C0);
INCLUDE_ASM("asm/us/st/nz0/nonmatchings/30958", func_801B37C0);
INCLUDE_ASM("asm/st/nz0/nonmatchings/30958", func_801B3A50);
INCLUDE_ASM("asm/us/st/nz0/nonmatchings/30958", func_801B3A50);
INCLUDE_ASM("asm/st/nz0/nonmatchings/30958", func_801B3B78);
INCLUDE_ASM("asm/us/st/nz0/nonmatchings/30958", func_801B3B78);
INCLUDE_ASM("asm/st/nz0/nonmatchings/30958", func_801B3C38);
INCLUDE_ASM("asm/us/st/nz0/nonmatchings/30958", func_801B3C38);
// trigger to stop music and close slogra/gaibon room
INCLUDE_ASM("asm/st/nz0/nonmatchings/30958", EntityCloseBossRoom);
INCLUDE_ASM("asm/us/st/nz0/nonmatchings/30958", EntityCloseBossRoom);
// blocks that move to close slogra/gaibon room
INCLUDE_ASM("asm/st/nz0/nonmatchings/30958", EntityBossRoomBlock);
INCLUDE_ASM("asm/us/st/nz0/nonmatchings/30958", EntityBossRoomBlock);
INCLUDE_ASM("asm/st/nz0/nonmatchings/30958", func_801B4690);
INCLUDE_ASM("asm/us/st/nz0/nonmatchings/30958", func_801B4690);
// slogra boss
INCLUDE_ASM("asm/st/nz0/nonmatchings/30958", EntitySlogra);
INCLUDE_ASM("asm/us/st/nz0/nonmatchings/30958", EntitySlogra);
INCLUDE_ASM("asm/st/nz0/nonmatchings/30958", func_801B54A8);
INCLUDE_ASM("asm/us/st/nz0/nonmatchings/30958", func_801B54A8);
// projectile fired from slogra's spear
INCLUDE_ASM("asm/st/nz0/nonmatchings/30958", EntitySlograSpearProjectile);
INCLUDE_ASM("asm/us/st/nz0/nonmatchings/30958", EntitySlograSpearProjectile);
// gaibon boss
INCLUDE_ASM("asm/st/nz0/nonmatchings/30958", EntityGaibon);
INCLUDE_ASM("asm/us/st/nz0/nonmatchings/30958", EntityGaibon);
INCLUDE_ASM("asm/st/nz0/nonmatchings/30958", func_801B69E8);
INCLUDE_ASM("asm/us/st/nz0/nonmatchings/30958", func_801B69E8);
// small red projectile from gaibon
INCLUDE_ASM("asm/st/nz0/nonmatchings/30958", EntitySmallGaibonProjectile);
INCLUDE_ASM("asm/us/st/nz0/nonmatchings/30958", EntitySmallGaibonProjectile);
// large red projectile from gaibon
INCLUDE_ASM("asm/st/nz0/nonmatchings/30958", EntityLargeGaibonProjectile);
INCLUDE_ASM("asm/us/st/nz0/nonmatchings/30958", EntityLargeGaibonProjectile);
INCLUDE_ASM("asm/st/nz0/nonmatchings/30958", func_801B6DE4);
INCLUDE_ASM("asm/us/st/nz0/nonmatchings/30958", func_801B6DE4);
INCLUDE_ASM("asm/st/nz0/nonmatchings/30958", func_801B7034);
INCLUDE_ASM("asm/us/st/nz0/nonmatchings/30958", func_801B7034);
INCLUDE_ASM("asm/st/nz0/nonmatchings/30958", func_801B74CC);
INCLUDE_ASM("asm/us/st/nz0/nonmatchings/30958", func_801B74CC);
INCLUDE_ASM("asm/st/nz0/nonmatchings/30958", func_801B7520);
INCLUDE_ASM("asm/us/st/nz0/nonmatchings/30958", func_801B7520);
INCLUDE_ASM("asm/st/nz0/nonmatchings/30958", func_801B76E4);
INCLUDE_ASM("asm/us/st/nz0/nonmatchings/30958", func_801B76E4);
INCLUDE_ASM("asm/st/nz0/nonmatchings/30958", func_801B7740);
INCLUDE_ASM("asm/us/st/nz0/nonmatchings/30958", func_801B7740);
INCLUDE_ASM("asm/st/nz0/nonmatchings/30958", func_801B77F8);
INCLUDE_ASM("asm/us/st/nz0/nonmatchings/30958", func_801B77F8);
INCLUDE_ASM("asm/st/nz0/nonmatchings/30958", func_801B797C);
INCLUDE_ASM("asm/us/st/nz0/nonmatchings/30958", func_801B797C);
INCLUDE_ASM("asm/st/nz0/nonmatchings/30958", func_801B79A8);
INCLUDE_ASM("asm/us/st/nz0/nonmatchings/30958", func_801B79A8);
INCLUDE_ASM("asm/st/nz0/nonmatchings/30958", func_801B7C54);
INCLUDE_ASM("asm/us/st/nz0/nonmatchings/30958", func_801B7C54);
// cutscene where alucard and maria discuss castle changing
INCLUDE_ASM("asm/st/nz0/nonmatchings/30958", EntityMariaCutscene);
INCLUDE_ASM("asm/us/st/nz0/nonmatchings/30958", EntityMariaCutscene);
INCLUDE_ASM("asm/st/nz0/nonmatchings/30958", func_801B8E0C);
INCLUDE_ASM("asm/us/st/nz0/nonmatchings/30958", func_801B8E0C);
INCLUDE_ASM("asm/st/nz0/nonmatchings/30958", func_801B8F94);
INCLUDE_ASM("asm/us/st/nz0/nonmatchings/30958", func_801B8F94);
s32 Random(void) {
// Linear congruential generator algorithm
@ -180,13 +180,13 @@ s32 Random(void) {
return g_randomNext >> 0x18;
}
INCLUDE_ASM("asm/st/nz0/nonmatchings/30958", Update);
INCLUDE_ASM("asm/us/st/nz0/nonmatchings/30958", Update);
INCLUDE_ASM("asm/st/nz0/nonmatchings/30958", func_801B9800);
INCLUDE_ASM("asm/us/st/nz0/nonmatchings/30958", func_801B9800);
INCLUDE_ASM("asm/st/nz0/nonmatchings/30958", TestCollisions);
INCLUDE_ASM("asm/us/st/nz0/nonmatchings/30958", TestCollisions);
INCLUDE_ASM("asm/st/nz0/nonmatchings/30958", EntityNumericDamage);
INCLUDE_ASM("asm/us/st/nz0/nonmatchings/30958", EntityNumericDamage);
void CreateEntityFromLayout(Entity* entity, LayoutObject* initDesc) {
DestroyEntity(entity);
@ -201,9 +201,9 @@ void CreateEntityFromLayout(Entity* entity, LayoutObject* initDesc) {
entity->unk68 = (initDesc->objectId >> 0xA) & 7;
}
INCLUDE_ASM("asm/st/nz0/nonmatchings/30958", func_801BB188);
INCLUDE_ASM("asm/us/st/nz0/nonmatchings/30958", func_801BB188);
INCLUDE_ASM("asm/st/nz0/nonmatchings/30958", func_801BB2A0);
INCLUDE_ASM("asm/us/st/nz0/nonmatchings/30958", func_801BB2A0);
void func_801BB3B8(s16 arg0) {
while (true) {
@ -224,9 +224,9 @@ void func_801BB404(s16 arg0) {
}
}
INCLUDE_ASM("asm/st/nz0/nonmatchings/30958", func_801BB45C);
INCLUDE_ASM("asm/us/st/nz0/nonmatchings/30958", func_801BB45C);
INCLUDE_ASM("asm/st/nz0/nonmatchings/30958", func_801BB558);
INCLUDE_ASM("asm/us/st/nz0/nonmatchings/30958", func_801BB558);
void func_801BB66C(s16 arg0) {
while (true) {
@ -247,15 +247,15 @@ void func_801BB6B8(s16 arg0) {
}
}
INCLUDE_ASM("asm/st/nz0/nonmatchings/30958", func_801BB710);
INCLUDE_ASM("asm/us/st/nz0/nonmatchings/30958", func_801BB710);
INCLUDE_ASM("asm/st/nz0/nonmatchings/30958", func_801BB80C);
INCLUDE_ASM("asm/us/st/nz0/nonmatchings/30958", func_801BB80C);
INCLUDE_ASM("asm/st/nz0/nonmatchings/30958", func_801BB920);
INCLUDE_ASM("asm/us/st/nz0/nonmatchings/30958", func_801BB920);
// TODO: try after resolving aspsx
// https://decomp.me/scratch/cJ3CF
INCLUDE_ASM("asm/st/nz0/nonmatchings/30958", func_801BBA98);
INCLUDE_ASM("asm/us/st/nz0/nonmatchings/30958", func_801BBA98);
void CreateEntityFromCurrentEntity(u16 objectId, Entity* entity) {
DestroyEntity(entity);
@ -290,7 +290,7 @@ s32 func_801BBC3C(Unkstruct5* arg0) {
return diff;
}
INCLUDE_ASM("asm/st/nz0/nonmatchings/30958", EntityRedDoor);
INCLUDE_ASM("asm/us/st/nz0/nonmatchings/30958", EntityRedDoor);
void DestroyEntity(Entity* item) {
s32 i;
@ -327,7 +327,7 @@ void PreventEntityFromRespawning(Entity* entity) {
#include "st/AnimateEntity.h"
INCLUDE_ASM("asm/st/nz0/nonmatchings/30958", func_801BCAD4);
INCLUDE_ASM("asm/us/st/nz0/nonmatchings/30958", func_801BCAD4);
/*
* Returns the absolute distance from g_CurrentEntity to player in the X Axis
@ -373,9 +373,9 @@ void FallEntity(void) {
}
}
INCLUDE_ASM("asm/st/nz0/nonmatchings/30958", func_801BCCFC);
INCLUDE_ASM("asm/us/st/nz0/nonmatchings/30958", func_801BCCFC);
INCLUDE_ASM("asm/st/nz0/nonmatchings/30958", func_801BCF74);
INCLUDE_ASM("asm/us/st/nz0/nonmatchings/30958", func_801BCF74);
Entity* AllocEntity(Entity* start, Entity* end) {
Entity* current = start;
@ -577,11 +577,11 @@ void EntityDummy(Entity* arg0) {
}
}
INCLUDE_ASM("asm/st/nz0/nonmatchings/30958", func_801BD720);
INCLUDE_ASM("asm/us/st/nz0/nonmatchings/30958", func_801BD720);
INCLUDE_ASM("asm/st/nz0/nonmatchings/30958", func_801BD848);
INCLUDE_ASM("asm/us/st/nz0/nonmatchings/30958", func_801BD848);
INCLUDE_ASM("asm/st/nz0/nonmatchings/30958", func_801BD9A0);
INCLUDE_ASM("asm/us/st/nz0/nonmatchings/30958", func_801BD9A0);
void ReplaceBreakableWithItemDrop(Entity* entity) {
u16 subId;
@ -613,7 +613,7 @@ void ReplaceBreakableWithItemDrop(Entity* entity) {
// https://decomp.me/scratch/W8pIb branch problem, probably aspsx
#ifndef NON_MATCHING
INCLUDE_ASM("asm/st/nz0/nonmatchings/30958", func_801BDD9C);
INCLUDE_ASM("asm/us/st/nz0/nonmatchings/30958", func_801BDD9C);
#else
void func_801BDD9C(void) {
if (g_CurrentEntity->accelerationY >= 0) {
@ -707,7 +707,7 @@ void CollectGold(u16 goldSize) {
// https://decomp.me/scratch/2vxD2
// https://decomp.me/scratch/peM5t by stuckpixel
INCLUDE_ASM("asm/st/nz0/nonmatchings/30958", func_801BE0D8);
INCLUDE_ASM("asm/us/st/nz0/nonmatchings/30958", func_801BE0D8);
void CollectHeartVessel(void) {
if (g_CurrentPlayableCharacter != PLAYER_ALUCARD) {
@ -732,7 +732,7 @@ void CollectLifeVessel(void) {
void func_801BE2E4(void) { DestroyEntity(g_CurrentEntity); }
INCLUDE_ASM("asm/st/nz0/nonmatchings/30958", EntityPriceDrop);
INCLUDE_ASM("asm/us/st/nz0/nonmatchings/30958", EntityPriceDrop);
void EntityExplosion(Entity* entity) {
u32 temp_v0;
@ -796,17 +796,17 @@ void func_801BEC7C(Entity* entity, s32 arg1) {
}
}
INCLUDE_ASM("asm/st/nz0/nonmatchings/30958", EntityInventoryDrop);
INCLUDE_ASM("asm/us/st/nz0/nonmatchings/30958", EntityInventoryDrop);
INCLUDE_ASM("asm/st/nz0/nonmatchings/30958", func_801BF308);
INCLUDE_ASM("asm/us/st/nz0/nonmatchings/30958", func_801BF308);
INCLUDE_ASM("asm/st/nz0/nonmatchings/30958", EntityRelicOrb);
INCLUDE_ASM("asm/us/st/nz0/nonmatchings/30958", EntityRelicOrb);
INCLUDE_ASM("asm/st/nz0/nonmatchings/30958", EntityHeartDrop);
INCLUDE_ASM("asm/us/st/nz0/nonmatchings/30958", EntityHeartDrop);
INCLUDE_ASM("asm/st/nz0/nonmatchings/30958", EntityUnkId0E);
INCLUDE_ASM("asm/us/st/nz0/nonmatchings/30958", EntityUnkId0E);
INCLUDE_ASM("asm/st/nz0/nonmatchings/30958", func_801C070C);
INCLUDE_ASM("asm/us/st/nz0/nonmatchings/30958", func_801C070C);
void func_801C07FC(Entity* entity) {
switch (entity->step) {
@ -835,9 +835,9 @@ void func_801C07FC(Entity* entity) {
}
// https://decomp.me/scratch/0VI4v
INCLUDE_ASM("asm/st/nz0/nonmatchings/30958", func_801C090C);
INCLUDE_ASM("asm/us/st/nz0/nonmatchings/30958", func_801C090C);
INCLUDE_ASM("asm/st/nz0/nonmatchings/30958", func_801C0A3C);
INCLUDE_ASM("asm/us/st/nz0/nonmatchings/30958", func_801C0A3C);
void func_801C0B24(Entity* entity) {
if (entity->step == 0) {
@ -894,7 +894,7 @@ void func_801C0C14(Entity* entity) {
}
}
INCLUDE_ASM("asm/st/nz0/nonmatchings/30958", func_801C0D08);
INCLUDE_ASM("asm/us/st/nz0/nonmatchings/30958", func_801C0D08);
bool func_801C0F38(Unkstruct6* unk) {
CollisionResult res;
@ -921,7 +921,7 @@ bool func_801C0F38(Unkstruct6* unk) {
return false;
}
INCLUDE_ASM("asm/st/nz0/nonmatchings/30958", func_801C1034);
INCLUDE_ASM("asm/us/st/nz0/nonmatchings/30958", func_801C1034);
void EntityIntenseExplosion(Entity* entity) {
u32 temp_v0;
@ -1022,19 +1022,19 @@ void func_801C1848(void) {
}
}
INCLUDE_ASM("asm/st/nz0/nonmatchings/30958", func_801C1900);
INCLUDE_ASM("asm/us/st/nz0/nonmatchings/30958", func_801C1900);
INCLUDE_ASM("asm/st/nz0/nonmatchings/30958", func_801C1AD8);
INCLUDE_ASM("asm/us/st/nz0/nonmatchings/30958", func_801C1AD8);
INCLUDE_ASM("asm/st/nz0/nonmatchings/30958", func_801C20B8);
INCLUDE_ASM("asm/us/st/nz0/nonmatchings/30958", func_801C20B8);
INCLUDE_ASM("asm/st/nz0/nonmatchings/30958", func_801C27B8);
INCLUDE_ASM("asm/us/st/nz0/nonmatchings/30958", func_801C27B8);
INCLUDE_ASM("asm/st/nz0/nonmatchings/30958", func_801C29B0);
INCLUDE_ASM("asm/us/st/nz0/nonmatchings/30958", func_801C29B0);
INCLUDE_ASM("asm/st/nz0/nonmatchings/30958", EntityAbsorbOrb);
INCLUDE_ASM("asm/us/st/nz0/nonmatchings/30958", EntityAbsorbOrb);
INCLUDE_ASM("asm/st/nz0/nonmatchings/30958", EntityEnemyBlood);
INCLUDE_ASM("asm/us/st/nz0/nonmatchings/30958", EntityEnemyBlood);
void EntityRoomForeground(Entity* entity) {
ObjInit2* objInit = &D_80182014[entity->subId];
@ -1060,7 +1060,7 @@ void EntityRoomForeground(Entity* entity) {
AnimateEntity(objInit->unk10, entity);
}
INCLUDE_ASM("asm/st/nz0/nonmatchings/30958", func_801C33D8);
INCLUDE_ASM("asm/us/st/nz0/nonmatchings/30958", func_801C33D8);
void func_801C3708(void) {
s32 temp = func_801BCF74(&D_8018216C);
@ -1082,7 +1082,7 @@ void func_801C3708(void) {
}
}
INCLUDE_ASM("asm/st/nz0/nonmatchings/30958", EntityBoneScimitar);
INCLUDE_ASM("asm/us/st/nz0/nonmatchings/30958", EntityBoneScimitar);
// debris that rotates and falls down
void EntityFallingDebris(Entity* entity) {
@ -1113,9 +1113,11 @@ void EntityFallingDebris(Entity* entity) {
}
}
INCLUDE_ASM("asm/st/nz0/nonmatchings/30958", func_801C3F9C); // Unique
// Unique
INCLUDE_ASM("asm/us/st/nz0/nonmatchings/30958", func_801C3F9C);
INCLUDE_ASM("asm/st/nz0/nonmatchings/30958", func_801C4198); // Unique
// Unique
INCLUDE_ASM("asm/us/st/nz0/nonmatchings/30958", func_801C4198);
void func_801C4550(void) {
if (g_CurrentEntity->unk80.modeS16.unk2 > 0) {
@ -1127,7 +1129,8 @@ void func_801C4550(void) {
}
// green knight that throws axes
INCLUDE_ASM("asm/st/nz0/nonmatchings/30958", EntityAxeKnight); // Unique
// Unique
INCLUDE_ASM("asm/us/st/nz0/nonmatchings/30958", EntityAxeKnight);
void func_801C4CC0(void) {
if (g_CurrentEntity->subId != 0) {
@ -1192,13 +1195,14 @@ void EntityAxeKnightThrowingAxe(Entity* entity) {
}
}
INCLUDE_ASM("asm/st/nz0/nonmatchings/30958", EntityBloodSplatter);
INCLUDE_ASM("asm/us/st/nz0/nonmatchings/30958", EntityBloodSplatter);
INCLUDE_ASM("asm/st/nz0/nonmatchings/30958", func_801C53AC);
INCLUDE_ASM("asm/us/st/nz0/nonmatchings/30958", func_801C53AC);
INCLUDE_ASM("asm/st/nz0/nonmatchings/30958", EntityBloodDrips); // Unique
// Unique
INCLUDE_ASM("asm/us/st/nz0/nonmatchings/30958", EntityBloodDrips);
INCLUDE_ASM("asm/st/nz0/nonmatchings/30958", func_801C5D20);
INCLUDE_ASM("asm/us/st/nz0/nonmatchings/30958", func_801C5D20);
void func_801C5F2C(Entity* arg0) {
if ((func_801BCF74(&D_801824B8) & 0x60) == 0x60) {
@ -1215,7 +1219,8 @@ void func_801C5F2C(Entity* arg0) {
}
// throws bones at you
INCLUDE_ASM("asm/st/nz0/nonmatchings/30958", EntitySkeleton); // Unique
// Unique
INCLUDE_ASM("asm/us/st/nz0/nonmatchings/30958", EntitySkeleton);
void func_801C6494(Entity* entity) {
if (entity->step) {
@ -1302,16 +1307,19 @@ void func_801C6678(Entity* entity) {
}
// moves around on walls and drips poison
INCLUDE_ASM("asm/st/nz0/nonmatchings/30958", EntitySpittleBone); // Unique
// Unique
INCLUDE_ASM("asm/us/st/nz0/nonmatchings/30958", EntitySpittleBone);
// https://decomp.me/scratch/T0T7K mostly regalloc
INCLUDE_ASM("asm/st/nz0/nonmatchings/30958", func_801C6B24);
INCLUDE_ASM("asm/us/st/nz0/nonmatchings/30958", func_801C6B24);
// spit projectile from spittle bone
INCLUDE_ASM("asm/st/nz0/nonmatchings/30958", EntitySpittleBoneSpit); // Unique
// Unique
INCLUDE_ASM("asm/us/st/nz0/nonmatchings/30958", EntitySpittleBoneSpit);
// probably the subweapons floating in the breakable containers
INCLUDE_ASM("asm/st/nz0/nonmatchings/30958", EntitySubWeaponPickup); // Unique
// Unique
INCLUDE_ASM("asm/us/st/nz0/nonmatchings/30958", EntitySubwpnPickup);
void func_801C7538(Entity* entity) {
s32 new_var;
@ -1444,7 +1452,7 @@ void func_801C7884(Entity* entity) {
}
}
INCLUDE_ASM("asm/st/nz0/nonmatchings/30958", EntityBloodSkeleton);
INCLUDE_ASM("asm/us/st/nz0/nonmatchings/30958", EntityBloodSkeleton);
s32 func_801C7CF0(Unkstruct5* arg0) {
s16 diff;
@ -1464,15 +1472,15 @@ s32 func_801C7CF0(Unkstruct5* arg0) {
}
// sealed door that displays "Magically Sealed" prompt
INCLUDE_ASM("asm/st/nz0/nonmatchings/30958", EntityMagicallySealedDoor);
INCLUDE_ASM("asm/us/st/nz0/nonmatchings/30958", EntityMagicallySealedDoor);
INCLUDE_ASM("asm/st/nz0/nonmatchings/30958", func_801C8ADC);
INCLUDE_ASM("asm/us/st/nz0/nonmatchings/30958", func_801C8ADC);
INCLUDE_ASM("asm/st/nz0/nonmatchings/30958", EntityStageNamePopup);
INCLUDE_ASM("asm/us/st/nz0/nonmatchings/30958", EntityStageNamePopup);
INCLUDE_ASM("asm/st/nz0/nonmatchings/30958", func_801C9930);
INCLUDE_ASM("asm/us/st/nz0/nonmatchings/30958", func_801C9930);
INCLUDE_ASM("asm/st/nz0/nonmatchings/30958", func_801C9D18);
INCLUDE_ASM("asm/us/st/nz0/nonmatchings/30958", func_801C9D18);
POLY_GT4* func_801C9E68(POLY_GT4* poly) {
while (poly != NULL) {
@ -1485,7 +1493,7 @@ POLY_GT4* func_801C9E68(POLY_GT4* poly) {
return NULL;
}
INCLUDE_ASM("asm/st/nz0/nonmatchings/30958", func_801C9E98);
INCLUDE_ASM("asm/us/st/nz0/nonmatchings/30958", func_801C9E98);
POLY_GT4* func_801C9F14(POLY_GT4* startPoly, s32 count) {
POLY_GT4* poly;
@ -1585,4 +1593,5 @@ s32 func_801CA0FC(s32 arg0, u8 arg1) {
}
// particle effect that spawns life up item
INCLUDE_ASM("asm/st/nz0/nonmatchings/30958", EntityLifeUpSpawn); // Unique
// Unique
INCLUDE_ASM("asm/us/st/nz0/nonmatchings/30958", EntityLifeUpSpawn);

218
src/st/rwrp/8DF0.c
View File

@ -6,69 +6,69 @@
#include "stage.h"
INCLUDE_ASM("asm/st/rwrp/nonmatchings/8DF0", func_80188DF0);
INCLUDE_ASM("asm/us/st/rwrp/nonmatchings/8DF0", func_80188DF0);
INCLUDE_ASM("asm/st/rwrp/nonmatchings/8DF0", func_80188ED0);
INCLUDE_ASM("asm/us/st/rwrp/nonmatchings/8DF0", func_80188ED0);
INCLUDE_ASM("asm/st/rwrp/nonmatchings/8DF0", func_8018908C);
INCLUDE_ASM("asm/us/st/rwrp/nonmatchings/8DF0", func_8018908C);
INCLUDE_ASM("asm/st/rwrp/nonmatchings/8DF0", func_801891C0);
INCLUDE_ASM("asm/us/st/rwrp/nonmatchings/8DF0", func_801891C0);
INCLUDE_ASM("asm/st/rwrp/nonmatchings/8DF0", func_80189E9C);
INCLUDE_ASM("asm/us/st/rwrp/nonmatchings/8DF0", func_80189E9C);
INCLUDE_ASM("asm/st/rwrp/nonmatchings/8DF0", func_8018A168);
INCLUDE_ASM("asm/us/st/rwrp/nonmatchings/8DF0", func_8018A168);
INCLUDE_ASM("asm/st/rwrp/nonmatchings/8DF0", Update);
INCLUDE_ASM("asm/us/st/rwrp/nonmatchings/8DF0", Update);
INCLUDE_ASM("asm/st/rwrp/nonmatchings/8DF0", func_8018A494);
INCLUDE_ASM("asm/us/st/rwrp/nonmatchings/8DF0", func_8018A494);
INCLUDE_ASM("asm/st/rwrp/nonmatchings/8DF0", func_8018A59C);
INCLUDE_ASM("asm/us/st/rwrp/nonmatchings/8DF0", func_8018A59C);
INCLUDE_ASM("asm/st/rwrp/nonmatchings/8DF0", func_8018B6B4);
INCLUDE_ASM("asm/us/st/rwrp/nonmatchings/8DF0", func_8018B6B4);
INCLUDE_ASM("asm/st/rwrp/nonmatchings/8DF0", func_8018BD58);
INCLUDE_ASM("asm/us/st/rwrp/nonmatchings/8DF0", func_8018BD58);
INCLUDE_ASM("asm/st/rwrp/nonmatchings/8DF0", func_8018BE1C);
INCLUDE_ASM("asm/us/st/rwrp/nonmatchings/8DF0", func_8018BE1C);
INCLUDE_ASM("asm/st/rwrp/nonmatchings/8DF0", func_8018BF34);
INCLUDE_ASM("asm/us/st/rwrp/nonmatchings/8DF0", func_8018BF34);
INCLUDE_ASM("asm/st/rwrp/nonmatchings/8DF0", func_8018C04C);
INCLUDE_ASM("asm/us/st/rwrp/nonmatchings/8DF0", func_8018C04C);
INCLUDE_ASM("asm/st/rwrp/nonmatchings/8DF0", func_8018C098);
INCLUDE_ASM("asm/us/st/rwrp/nonmatchings/8DF0", func_8018C098);
INCLUDE_ASM("asm/st/rwrp/nonmatchings/8DF0", func_8018C0F0);
INCLUDE_ASM("asm/us/st/rwrp/nonmatchings/8DF0", func_8018C0F0);
INCLUDE_ASM("asm/st/rwrp/nonmatchings/8DF0", func_8018C1EC);
INCLUDE_ASM("asm/us/st/rwrp/nonmatchings/8DF0", func_8018C1EC);
INCLUDE_ASM("asm/st/rwrp/nonmatchings/8DF0", func_8018C300);
INCLUDE_ASM("asm/us/st/rwrp/nonmatchings/8DF0", func_8018C300);
INCLUDE_ASM("asm/st/rwrp/nonmatchings/8DF0", func_8018C34C);
INCLUDE_ASM("asm/us/st/rwrp/nonmatchings/8DF0", func_8018C34C);
INCLUDE_ASM("asm/st/rwrp/nonmatchings/8DF0", func_8018C3A4);
INCLUDE_ASM("asm/us/st/rwrp/nonmatchings/8DF0", func_8018C3A4);
INCLUDE_ASM("asm/st/rwrp/nonmatchings/8DF0", func_8018C4A0);
INCLUDE_ASM("asm/us/st/rwrp/nonmatchings/8DF0", func_8018C4A0);
INCLUDE_ASM("asm/st/rwrp/nonmatchings/8DF0", func_8018C5B4);
INCLUDE_ASM("asm/us/st/rwrp/nonmatchings/8DF0", func_8018C5B4);
INCLUDE_ASM("asm/st/rwrp/nonmatchings/8DF0", func_8018C72C);
INCLUDE_ASM("asm/us/st/rwrp/nonmatchings/8DF0", func_8018C72C);
INCLUDE_ASM("asm/st/rwrp/nonmatchings/8DF0", func_8018C7E0);
INCLUDE_ASM("asm/us/st/rwrp/nonmatchings/8DF0", func_8018C7E0);
INCLUDE_ASM("asm/st/rwrp/nonmatchings/8DF0", func_8018C854);
INCLUDE_ASM("asm/us/st/rwrp/nonmatchings/8DF0", func_8018C854);
INCLUDE_ASM("asm/st/rwrp/nonmatchings/8DF0", func_8018C8D0);
INCLUDE_ASM("asm/us/st/rwrp/nonmatchings/8DF0", func_8018C8D0);
INCLUDE_ASM("asm/st/rwrp/nonmatchings/8DF0", func_8018C948);
INCLUDE_ASM("asm/us/st/rwrp/nonmatchings/8DF0", func_8018C948);
INCLUDE_ASM("asm/st/rwrp/nonmatchings/8DF0", func_8018D580);
INCLUDE_ASM("asm/us/st/rwrp/nonmatchings/8DF0", func_8018D580);
INCLUDE_ASM("asm/st/rwrp/nonmatchings/8DF0", func_8018D5EC);
INCLUDE_ASM("asm/us/st/rwrp/nonmatchings/8DF0", func_8018D5EC);
INCLUDE_ASM("asm/st/rwrp/nonmatchings/8DF0", func_8018D668);
INCLUDE_ASM("asm/us/st/rwrp/nonmatchings/8DF0", func_8018D668);
INCLUDE_ASM("asm/st/rwrp/nonmatchings/8DF0", func_8018D6B0);
INCLUDE_ASM("asm/us/st/rwrp/nonmatchings/8DF0", func_8018D6B0);
INCLUDE_ASM("asm/st/rwrp/nonmatchings/8DF0", func_8018D768);
INCLUDE_ASM("asm/us/st/rwrp/nonmatchings/8DF0", func_8018D768);
s32 func_8018D880(void) {
s16 temp_v1 = g_CurrentEntity->posX.i.hi - PLAYER.posX.i.hi;
@ -79,156 +79,156 @@ s32 func_8018D880(void) {
return temp_v1;
}
INCLUDE_ASM("asm/st/rwrp/nonmatchings/8DF0", func_8018D8BC);
INCLUDE_ASM("asm/us/st/rwrp/nonmatchings/8DF0", func_8018D8BC);
INCLUDE_ASM("asm/st/rwrp/nonmatchings/8DF0", func_8018D8F0);
INCLUDE_ASM("asm/us/st/rwrp/nonmatchings/8DF0", func_8018D8F0);
INCLUDE_ASM("asm/st/rwrp/nonmatchings/8DF0", func_8018D934);
INCLUDE_ASM("asm/us/st/rwrp/nonmatchings/8DF0", func_8018D934);
INCLUDE_ASM("asm/st/rwrp/nonmatchings/8DF0", func_8018D964);
INCLUDE_ASM("asm/us/st/rwrp/nonmatchings/8DF0", func_8018D964);
INCLUDE_ASM("asm/st/rwrp/nonmatchings/8DF0", func_8018D990);
INCLUDE_ASM("asm/us/st/rwrp/nonmatchings/8DF0", func_8018D990);
INCLUDE_ASM("asm/st/rwrp/nonmatchings/8DF0", func_8018DC08);
INCLUDE_ASM("asm/us/st/rwrp/nonmatchings/8DF0", func_8018DC08);
INCLUDE_ASM("asm/st/rwrp/nonmatchings/8DF0", func_8018DDF0);
INCLUDE_ASM("asm/us/st/rwrp/nonmatchings/8DF0", func_8018DDF0);
INCLUDE_ASM("asm/st/rwrp/nonmatchings/8DF0", func_8018DE50);
INCLUDE_ASM("asm/us/st/rwrp/nonmatchings/8DF0", func_8018DE50);
INCLUDE_ASM("asm/st/rwrp/nonmatchings/8DF0", func_8018DE7C);
INCLUDE_ASM("asm/us/st/rwrp/nonmatchings/8DF0", func_8018DE7C);
INCLUDE_ASM("asm/st/rwrp/nonmatchings/8DF0", func_8018DE98);
INCLUDE_ASM("asm/us/st/rwrp/nonmatchings/8DF0", func_8018DE98);
INCLUDE_ASM("asm/st/rwrp/nonmatchings/8DF0", func_8018DF04);
INCLUDE_ASM("asm/us/st/rwrp/nonmatchings/8DF0", func_8018DF04);
INCLUDE_ASM("asm/st/rwrp/nonmatchings/8DF0", func_8018DF3C);
INCLUDE_ASM("asm/us/st/rwrp/nonmatchings/8DF0", func_8018DF3C);
INCLUDE_ASM("asm/st/rwrp/nonmatchings/8DF0", func_8018DF84);
INCLUDE_ASM("asm/us/st/rwrp/nonmatchings/8DF0", func_8018DF84);
INCLUDE_ASM("asm/st/rwrp/nonmatchings/8DF0", func_8018DFCC);
INCLUDE_ASM("asm/us/st/rwrp/nonmatchings/8DF0", func_8018DFCC);
INCLUDE_ASM("asm/st/rwrp/nonmatchings/8DF0", func_8018E024);
INCLUDE_ASM("asm/us/st/rwrp/nonmatchings/8DF0", func_8018E024);
INCLUDE_ASM("asm/st/rwrp/nonmatchings/8DF0", func_8018E0B0);
INCLUDE_ASM("asm/us/st/rwrp/nonmatchings/8DF0", func_8018E0B0);
INCLUDE_ASM("asm/st/rwrp/nonmatchings/8DF0", func_8018E0E0);
INCLUDE_ASM("asm/us/st/rwrp/nonmatchings/8DF0", func_8018E0E0);
INCLUDE_ASM("asm/st/rwrp/nonmatchings/8DF0", func_8018E118);
INCLUDE_ASM("asm/us/st/rwrp/nonmatchings/8DF0", func_8018E118);
INCLUDE_ASM("asm/st/rwrp/nonmatchings/8DF0", func_8018E160);
INCLUDE_ASM("asm/us/st/rwrp/nonmatchings/8DF0", func_8018E160);
INCLUDE_ASM("asm/st/rwrp/nonmatchings/8DF0", func_8018E1C0);
INCLUDE_ASM("asm/us/st/rwrp/nonmatchings/8DF0", func_8018E1C0);
INCLUDE_ASM("asm/st/rwrp/nonmatchings/8DF0", func_8018E1E0);
INCLUDE_ASM("asm/us/st/rwrp/nonmatchings/8DF0", func_8018E1E0);
INCLUDE_ASM("asm/st/rwrp/nonmatchings/8DF0", func_8018E1FC);
INCLUDE_ASM("asm/us/st/rwrp/nonmatchings/8DF0", func_8018E1FC);
INCLUDE_ASM("asm/st/rwrp/nonmatchings/8DF0", func_8018E290);
INCLUDE_ASM("asm/us/st/rwrp/nonmatchings/8DF0", func_8018E290);
INCLUDE_ASM("asm/st/rwrp/nonmatchings/8DF0", func_8018E38C);
INCLUDE_ASM("asm/us/st/rwrp/nonmatchings/8DF0", func_8018E38C);
INCLUDE_ASM("asm/st/rwrp/nonmatchings/8DF0", func_8018E3B4);
INCLUDE_ASM("asm/us/st/rwrp/nonmatchings/8DF0", func_8018E3B4);
INCLUDE_ASM("asm/st/rwrp/nonmatchings/8DF0", func_8018E4DC);
INCLUDE_ASM("asm/us/st/rwrp/nonmatchings/8DF0", func_8018E4DC);
INCLUDE_ASM("asm/st/rwrp/nonmatchings/8DF0", func_8018E634);
INCLUDE_ASM("asm/us/st/rwrp/nonmatchings/8DF0", func_8018E634);
INCLUDE_ASM("asm/st/rwrp/nonmatchings/8DF0", func_8018E978);
INCLUDE_ASM("asm/us/st/rwrp/nonmatchings/8DF0", func_8018E978);
INCLUDE_ASM("asm/st/rwrp/nonmatchings/8DF0", func_8018EA30);
INCLUDE_ASM("asm/us/st/rwrp/nonmatchings/8DF0", func_8018EA30);
INCLUDE_ASM("asm/st/rwrp/nonmatchings/8DF0", func_8018EAB4);
INCLUDE_ASM("asm/us/st/rwrp/nonmatchings/8DF0", func_8018EAB4);
INCLUDE_ASM("asm/st/rwrp/nonmatchings/8DF0", func_8018EC10);
INCLUDE_ASM("asm/us/st/rwrp/nonmatchings/8DF0", func_8018EC10);
INCLUDE_ASM("asm/st/rwrp/nonmatchings/8DF0", func_8018EC90);
INCLUDE_ASM("asm/us/st/rwrp/nonmatchings/8DF0", func_8018EC90);
INCLUDE_ASM("asm/st/rwrp/nonmatchings/8DF0", func_8018ED6C);
INCLUDE_ASM("asm/us/st/rwrp/nonmatchings/8DF0", func_8018ED6C);
INCLUDE_ASM("asm/st/rwrp/nonmatchings/8DF0", func_8018EE84);
INCLUDE_ASM("asm/us/st/rwrp/nonmatchings/8DF0", func_8018EE84);
INCLUDE_ASM("asm/st/rwrp/nonmatchings/8DF0", func_8018EF28);
INCLUDE_ASM("asm/us/st/rwrp/nonmatchings/8DF0", func_8018EF28);
INCLUDE_ASM("asm/st/rwrp/nonmatchings/8DF0", func_8018EF78);
INCLUDE_ASM("asm/us/st/rwrp/nonmatchings/8DF0", func_8018EF78);
INCLUDE_ASM("asm/st/rwrp/nonmatchings/8DF0", func_8018EFA0);
INCLUDE_ASM("asm/us/st/rwrp/nonmatchings/8DF0", func_8018EFA0);
INCLUDE_ASM("asm/st/rwrp/nonmatchings/8DF0", func_8018F814);
INCLUDE_ASM("asm/us/st/rwrp/nonmatchings/8DF0", func_8018F814);
INCLUDE_ASM("asm/st/rwrp/nonmatchings/8DF0", func_8018F910);
INCLUDE_ASM("asm/us/st/rwrp/nonmatchings/8DF0", func_8018F910);
INCLUDE_ASM("asm/st/rwrp/nonmatchings/8DF0", func_8018F9B4);
INCLUDE_ASM("asm/us/st/rwrp/nonmatchings/8DF0", func_8018F9B4);
INCLUDE_ASM("asm/st/rwrp/nonmatchings/8DF0", func_8018FF9C);
INCLUDE_ASM("asm/us/st/rwrp/nonmatchings/8DF0", func_8018FF9C);
INCLUDE_ASM("asm/st/rwrp/nonmatchings/8DF0", func_8019024C);
INCLUDE_ASM("asm/us/st/rwrp/nonmatchings/8DF0", func_8019024C);
INCLUDE_ASM("asm/st/rwrp/nonmatchings/8DF0", func_80190D1C);
INCLUDE_ASM("asm/us/st/rwrp/nonmatchings/8DF0", func_80190D1C);
INCLUDE_ASM("asm/st/rwrp/nonmatchings/8DF0", func_80190E44);
INCLUDE_ASM("asm/us/st/rwrp/nonmatchings/8DF0", func_80190E44);
INCLUDE_ASM("asm/st/rwrp/nonmatchings/8DF0", func_801913A0);
INCLUDE_ASM("asm/us/st/rwrp/nonmatchings/8DF0", func_801913A0);
INCLUDE_ASM("asm/st/rwrp/nonmatchings/8DF0", func_80191490);
INCLUDE_ASM("asm/us/st/rwrp/nonmatchings/8DF0", func_80191490);
INCLUDE_ASM("asm/st/rwrp/nonmatchings/8DF0", func_801915A0);
INCLUDE_ASM("asm/us/st/rwrp/nonmatchings/8DF0", func_801915A0);
INCLUDE_ASM("asm/st/rwrp/nonmatchings/8DF0", func_801916D0);
INCLUDE_ASM("asm/us/st/rwrp/nonmatchings/8DF0", func_801916D0);
INCLUDE_ASM("asm/st/rwrp/nonmatchings/8DF0", func_801917B8);
INCLUDE_ASM("asm/us/st/rwrp/nonmatchings/8DF0", func_801917B8);
INCLUDE_ASM("asm/st/rwrp/nonmatchings/8DF0", func_801918A8);
INCLUDE_ASM("asm/us/st/rwrp/nonmatchings/8DF0", func_801918A8);
INCLUDE_ASM("asm/st/rwrp/nonmatchings/8DF0", func_8019199C);
INCLUDE_ASM("asm/us/st/rwrp/nonmatchings/8DF0", func_8019199C);
INCLUDE_ASM("asm/st/rwrp/nonmatchings/8DF0", func_80191BCC);
INCLUDE_ASM("asm/us/st/rwrp/nonmatchings/8DF0", func_80191BCC);
INCLUDE_ASM("asm/st/rwrp/nonmatchings/8DF0", func_80191CC8);
INCLUDE_ASM("asm/us/st/rwrp/nonmatchings/8DF0", func_80191CC8);
INCLUDE_ASM("asm/st/rwrp/nonmatchings/8DF0", func_80192248);
INCLUDE_ASM("asm/us/st/rwrp/nonmatchings/8DF0", func_80192248);
INCLUDE_ASM("asm/st/rwrp/nonmatchings/8DF0", func_80192348);
INCLUDE_ASM("asm/us/st/rwrp/nonmatchings/8DF0", func_80192348);
INCLUDE_ASM("asm/st/rwrp/nonmatchings/8DF0", func_80192414);
INCLUDE_ASM("asm/us/st/rwrp/nonmatchings/8DF0", func_80192414);
INCLUDE_ASM("asm/st/rwrp/nonmatchings/8DF0", func_801924DC);
INCLUDE_ASM("asm/us/st/rwrp/nonmatchings/8DF0", func_801924DC);
INCLUDE_ASM("asm/st/rwrp/nonmatchings/8DF0", func_80192594);
INCLUDE_ASM("asm/us/st/rwrp/nonmatchings/8DF0", func_80192594);
INCLUDE_ASM("asm/st/rwrp/nonmatchings/8DF0", func_8019276C);
INCLUDE_ASM("asm/us/st/rwrp/nonmatchings/8DF0", func_8019276C);
INCLUDE_ASM("asm/st/rwrp/nonmatchings/8DF0", func_80192D4C);
INCLUDE_ASM("asm/us/st/rwrp/nonmatchings/8DF0", func_80192D4C);
INCLUDE_ASM("asm/st/rwrp/nonmatchings/8DF0", func_8019344C);
INCLUDE_ASM("asm/us/st/rwrp/nonmatchings/8DF0", func_8019344C);
INCLUDE_ASM("asm/st/rwrp/nonmatchings/8DF0", func_80193644);
INCLUDE_ASM("asm/us/st/rwrp/nonmatchings/8DF0", func_80193644);
INCLUDE_ASM("asm/st/rwrp/nonmatchings/8DF0", func_8019373C);
INCLUDE_ASM("asm/us/st/rwrp/nonmatchings/8DF0", func_8019373C);
INCLUDE_ASM("asm/st/rwrp/nonmatchings/8DF0", func_8019390C);
INCLUDE_ASM("asm/us/st/rwrp/nonmatchings/8DF0", func_8019390C);
INCLUDE_ASM("asm/st/rwrp/nonmatchings/8DF0", func_80194590);
INCLUDE_ASM("asm/us/st/rwrp/nonmatchings/8DF0", func_80194590);
INCLUDE_ASM("asm/st/rwrp/nonmatchings/8DF0", func_80194924);
INCLUDE_ASM("asm/us/st/rwrp/nonmatchings/8DF0", func_80194924);
INCLUDE_ASM("asm/st/rwrp/nonmatchings/8DF0", func_80194DD4);
INCLUDE_ASM("asm/us/st/rwrp/nonmatchings/8DF0", func_80194DD4);
INCLUDE_ASM("asm/st/rwrp/nonmatchings/8DF0", func_80194EC0);
INCLUDE_ASM("asm/us/st/rwrp/nonmatchings/8DF0", func_80194EC0);
INCLUDE_ASM("asm/st/rwrp/nonmatchings/8DF0", func_801951F0);
INCLUDE_ASM("asm/us/st/rwrp/nonmatchings/8DF0", func_801951F0);
INCLUDE_ASM("asm/st/rwrp/nonmatchings/8DF0", func_801955D8);
INCLUDE_ASM("asm/us/st/rwrp/nonmatchings/8DF0", func_801955D8);
INCLUDE_ASM("asm/st/rwrp/nonmatchings/8DF0", func_80195728);
INCLUDE_ASM("asm/us/st/rwrp/nonmatchings/8DF0", func_80195728);
INCLUDE_ASM("asm/st/rwrp/nonmatchings/8DF0", func_80195758);
INCLUDE_ASM("asm/us/st/rwrp/nonmatchings/8DF0", func_80195758);
INCLUDE_ASM("asm/st/rwrp/nonmatchings/8DF0", func_801957D4);
INCLUDE_ASM("asm/us/st/rwrp/nonmatchings/8DF0", func_801957D4);
INCLUDE_ASM("asm/st/rwrp/nonmatchings/8DF0", func_8019585C);
INCLUDE_ASM("asm/us/st/rwrp/nonmatchings/8DF0", func_8019585C);
INCLUDE_ASM("asm/st/rwrp/nonmatchings/8DF0", func_8019593C);
INCLUDE_ASM("asm/us/st/rwrp/nonmatchings/8DF0", func_8019593C);
INCLUDE_ASM("asm/st/rwrp/nonmatchings/8DF0", func_80195990);
INCLUDE_ASM("asm/us/st/rwrp/nonmatchings/8DF0", func_80195990);
INCLUDE_ASM("asm/st/rwrp/nonmatchings/8DF0", func_801959BC);
INCLUDE_ASM("asm/us/st/rwrp/nonmatchings/8DF0", func_801959BC);

12
src/st/sel/2C048.c
View File

@ -35,7 +35,7 @@ void func_801AC048(void) {
}
#ifndef NON_MATCHING
INCLUDE_ASM("asm/st/sel/nonmatchings/2C048", func_801AC084);
INCLUDE_ASM("asm/us/st/sel/nonmatchings/2C048", func_801AC084);
#else
// Those arrays are weird. They do not store s32 but they are used as such.
extern s32 D_80180068[];
@ -65,7 +65,7 @@ void func_801AC084(s32 arg0, s32 ypos) {
}
#endif
INCLUDE_ASM("asm/st/sel/nonmatchings/2C048", func_801AC174);
INCLUDE_ASM("asm/us/st/sel/nonmatchings/2C048", func_801AC174);
void func_801ACBE4(s32 arg0, u16 arg1) {
POLY_GT4* poly = &D_80086FEC[D_801BAF18[arg0].unk0];
@ -82,11 +82,11 @@ void func_801ACC3C(void) {
}
}
INCLUDE_ASM("asm/st/sel/nonmatchings/2C048", func_801ACC7C);
INCLUDE_ASM("asm/us/st/sel/nonmatchings/2C048", func_801ACC7C);
INCLUDE_ASM("asm/st/sel/nonmatchings/2C048", func_801ACDFC);
INCLUDE_ASM("asm/us/st/sel/nonmatchings/2C048", func_801ACDFC);
INCLUDE_ASM("asm/st/sel/nonmatchings/2C048", func_801ACEC0);
INCLUDE_ASM("asm/us/st/sel/nonmatchings/2C048", func_801ACEC0);
void func_801ACF7C(void) {
func_801B1ED0();
@ -94,7 +94,7 @@ void func_801ACF7C(void) {
func_801B25D4(D_801A75C0, 1);
}
INCLUDE_ASM("asm/st/sel/nonmatchings/2C048", func_801ACFBC);
INCLUDE_ASM("asm/us/st/sel/nonmatchings/2C048", func_801ACFBC);
void PrintFileSelectPlaceName(s32 arg0, s32 arg1, s32 y) {
const s32 x = 160;

58
src/st/sel/2D260.c
View File

@ -111,7 +111,7 @@ void func_801AD590(void) {
func_801B2608(D_80180454[D_801D6B0C], 9);
}
INCLUDE_ASM("asm/st/sel/nonmatchings/2D260", func_801AD66C);
INCLUDE_ASM("asm/us/st/sel/nonmatchings/2D260", func_801AD66C);
/* DATA */
extern u8* D_801803B0;
@ -146,7 +146,7 @@ void func_801AD78C(void) {
DrawString16x16(g_InputSaveName, 0x80, 0x48, 1);
}
INCLUDE_ASM("asm/st/sel/nonmatchings/2D260", func_801AD968);
INCLUDE_ASM("asm/us/st/sel/nonmatchings/2D260", func_801AD968);
void func_801ADC3C(void) {
s32* new_var = &D_801BCC84;
@ -184,15 +184,15 @@ void func_801ADC3C(void) {
}
}
INCLUDE_ASM("asm/st/sel/nonmatchings/2D260", func_801ADF94);
INCLUDE_ASM("asm/us/st/sel/nonmatchings/2D260", func_801ADF94);
INCLUDE_ASM("asm/st/sel/nonmatchings/2D260", func_801AE6D0);
INCLUDE_ASM("asm/us/st/sel/nonmatchings/2D260", func_801AE6D0);
INCLUDE_ASM("asm/st/sel/nonmatchings/2D260", func_801AE9A8);
INCLUDE_ASM("asm/us/st/sel/nonmatchings/2D260", func_801AE9A8);
INCLUDE_ASM("asm/st/sel/nonmatchings/2D260", func_801AEA8C);
INCLUDE_ASM("asm/us/st/sel/nonmatchings/2D260", func_801AEA8C);
INCLUDE_ASM("asm/st/sel/nonmatchings/2D260", func_801AEB74);
INCLUDE_ASM("asm/us/st/sel/nonmatchings/2D260", func_801AEB74);
void func_801AECA0(void) {
s32 i = 0;
@ -214,7 +214,7 @@ void func_801AECA0(void) {
g_api.func_800EA5E4(0x8004);
}
INCLUDE_ASM("asm/st/sel/nonmatchings/2D260", func_801AED48);
INCLUDE_ASM("asm/us/st/sel/nonmatchings/2D260", func_801AED48);
void func_801AEE74(void) {
s32 i = 0;
@ -234,7 +234,7 @@ void func_801AEE74(void) {
}
}
INCLUDE_ASM("asm/st/sel/nonmatchings/2D260", Update);
INCLUDE_ASM("asm/us/st/sel/nonmatchings/2D260", Update);
void func_801B17C8(void) {
switch (D_800978F8) {
@ -366,7 +366,7 @@ void func_801B1D68(POLY_GT4* poly) { func_801B1CFC(poly, 0); }
void func_801B1D88(POLY_GT4* arg0) { func_801B1CFC(arg0, 0x80); }
INCLUDE_ASM("asm/st/sel/nonmatchings/2D260", func_801B1DA8);
INCLUDE_ASM("asm/us/st/sel/nonmatchings/2D260", func_801B1DA8);
void func_801B1ED0(void) {
s32 var_v1 = 0xF;
@ -403,10 +403,10 @@ void func_801B1F4C(s32 arg0) {
}
void func_801B1FD8(u8* arg0, s32 arg1);
INCLUDE_ASM("asm/st/sel/nonmatchings/2D260", func_801B1FD8);
INCLUDE_ASM("asm/us/st/sel/nonmatchings/2D260", func_801B1FD8);
void func_801B2108(s32, s32);
INCLUDE_ASM("asm/st/sel/nonmatchings/2D260", func_801B2108);
INCLUDE_ASM("asm/us/st/sel/nonmatchings/2D260", func_801B2108);
void func_801B248C(s32 arg0, s32 arg1) {
if (D_801BC398[arg1] != arg0) {
@ -488,11 +488,11 @@ void func_801B26A0(POLY_GT4* poly, s32 x, s32 y, s32 width, s32 height, s32 u,
extern RECT D_80182584;
void func_801B2700(s32 arg0, s32 arg1);
INCLUDE_ASM("asm/st/sel/nonmatchings/2D260", func_801B2700);
INCLUDE_ASM("asm/us/st/sel/nonmatchings/2D260", func_801B2700);
void func_801B27A8(s32 x, s32 y, s32 w, s32 h, s32 u, s32 v, s32 clut, s32 arg7,
s32 tge, s32 c);
INCLUDE_ASM("asm/st/sel/nonmatchings/2D260", func_801B27A8);
INCLUDE_ASM("asm/us/st/sel/nonmatchings/2D260", func_801B27A8);
void func_801B28D4(u8* str, s32 x, s32 y, s32 tge) {
const int w = 12;
@ -520,7 +520,7 @@ s32 func_801B2984(u8 ch) {
}
#ifndef NON_MATCHING
INCLUDE_ASM("asm/st/sel/nonmatchings/2D260", DrawString16x16);
INCLUDE_ASM("asm/us/st/sel/nonmatchings/2D260", DrawString16x16);
#else
extern u8 D_8018046D[];
@ -626,9 +626,9 @@ void func_801B2DF4(void) {
func_801B2DEC();
}
INCLUDE_ASM("asm/st/sel/nonmatchings/2D260", func_801B2E5C);
INCLUDE_ASM("asm/us/st/sel/nonmatchings/2D260", func_801B2E5C);
INCLUDE_ASM("asm/st/sel/nonmatchings/2D260", func_801B2F50);
INCLUDE_ASM("asm/us/st/sel/nonmatchings/2D260", func_801B2F50);
void func_801B3120(void) {
s32* var_a0;
@ -651,7 +651,7 @@ void func_801B3120(void) {
}
}
INCLUDE_ASM("asm/st/sel/nonmatchings/2D260", func_801B3164);
INCLUDE_ASM("asm/us/st/sel/nonmatchings/2D260", func_801B3164);
void func_801B367C(s32 arg0) {
g_memCardRStep = 0;
@ -659,7 +659,7 @@ void func_801B367C(s32 arg0) {
}
#ifndef NON_MATCHING
INCLUDE_ASM("asm/st/sel/nonmatchings/2D260", func_801B3694);
INCLUDE_ASM("asm/us/st/sel/nonmatchings/2D260", func_801B3694);
#else
s32 func_801B3694(void) {
char saveFile[0x20];
@ -720,7 +720,7 @@ s32 func_801B3694(void) {
}
#endif
INCLUDE_ASM("asm/st/sel/nonmatchings/2D260", func_801B38B4);
INCLUDE_ASM("asm/us/st/sel/nonmatchings/2D260", func_801B38B4);
void func_801B3A54(s32 arg0, s32 arg1) {
char pad[0x20];
@ -733,7 +733,7 @@ void func_801B3A54(s32 arg0, s32 arg1) {
D_801BB008 = arg1;
}
INCLUDE_ASM("asm/st/sel/nonmatchings/2D260", func_801B3A94);
INCLUDE_ASM("asm/us/st/sel/nonmatchings/2D260", func_801B3A94);
void func_801B3E14(s32 arg0) {
g_memCardRStep = 0;
@ -741,7 +741,7 @@ void func_801B3E14(s32 arg0) {
}
#ifndef NON_MATCHING
INCLUDE_ASM("asm/st/sel/nonmatchings/2D260", func_801B3E2C);
INCLUDE_ASM("asm/us/st/sel/nonmatchings/2D260", func_801B3E2C);
#else
s32 func_801B3E2C(void) {
char saveFile[0x20];
@ -780,7 +780,7 @@ void func_801B3F7C(s32 arg0) {
g_memCardRStepSub = arg0;
}
INCLUDE_ASM("asm/st/sel/nonmatchings/2D260", func_801B3F94);
INCLUDE_ASM("asm/us/st/sel/nonmatchings/2D260", func_801B3F94);
void InitRoomEntities(s32 objLayoutId) {
s32 temp_s0 = D_8003C9A4;
@ -808,7 +808,7 @@ void InitRoomEntities(s32 objLayoutId) {
}
}
INCLUDE_ASM("asm/st/sel/nonmatchings/2D260", TestCollisions);
INCLUDE_ASM("asm/us/st/sel/nonmatchings/2D260", TestCollisions);
void func_801B4B30(Entity* entity) {
s32 i;
@ -865,7 +865,7 @@ s32 AnimateEntity(const u8 frames[], Entity* entity) {
return (u8)flag;
}
INCLUDE_ASM("asm/st/sel/nonmatchings/2D260", func_801B4C68);
INCLUDE_ASM("asm/us/st/sel/nonmatchings/2D260", func_801B4C68);
void func_801B4D78(void) {
Entity* e = &g_EntityArray[UNK_ENTITY_3];
@ -881,11 +881,11 @@ void func_801B4D78(void) {
}
}
INCLUDE_ASM("asm/st/sel/nonmatchings/2D260", func_801B4DE0);
INCLUDE_ASM("asm/us/st/sel/nonmatchings/2D260", func_801B4DE0);
INCLUDE_ASM("asm/st/sel/nonmatchings/2D260", func_801B4FFC);
INCLUDE_ASM("asm/us/st/sel/nonmatchings/2D260", func_801B4FFC);
INCLUDE_ASM("asm/st/sel/nonmatchings/2D260", func_801B519C);
INCLUDE_ASM("asm/us/st/sel/nonmatchings/2D260", func_801B519C);
void func_801B5350(void) {
Entity* entity = &g_EntityArray[UNK_ENTITY_5];
@ -955,4 +955,4 @@ void func_801B5548(void) {
}
}
INCLUDE_ASM("asm/st/sel/nonmatchings/2D260", func_801B55C8);
INCLUDE_ASM("asm/us/st/sel/nonmatchings/2D260", func_801B55C8);

24
src/st/sel/3642C.c
View File

@ -10,7 +10,7 @@ void func_801B642C(void) {
D_801BC35A = D_801BC35C + 0x14;
}
INCLUDE_ASM("asm/st/sel/nonmatchings/3642C", func_801B6480);
INCLUDE_ASM("asm/us/st/sel/nonmatchings/3642C", func_801B6480);
void func_801B6648(s16 yOffset) {
RECT rect;
@ -22,9 +22,9 @@ void func_801B6648(s16 yOffset) {
ClearImage(&rect, 0, 0, 0);
}
INCLUDE_ASM("asm/st/sel/nonmatchings/3642C", func_801B66A4);
INCLUDE_ASM("asm/us/st/sel/nonmatchings/3642C", func_801B66A4);
INCLUDE_ASM("asm/st/sel/nonmatchings/3642C", func_801B675C);
INCLUDE_ASM("asm/us/st/sel/nonmatchings/3642C", func_801B675C);
void func_801B68E0(s32 arg0) {
D_801BC394 = arg0 + 0x100000;
@ -32,11 +32,11 @@ void func_801B68E0(s32 arg0) {
D_801BC390 = 1;
}
INCLUDE_ASM("asm/st/sel/nonmatchings/3642C", func_801B690C);
INCLUDE_ASM("asm/us/st/sel/nonmatchings/3642C", func_801B690C);
INCLUDE_ASM("asm/st/sel/nonmatchings/3642C", func_801B69F8);
INCLUDE_ASM("asm/us/st/sel/nonmatchings/3642C", func_801B69F8);
INCLUDE_ASM("asm/st/sel/nonmatchings/3642C", func_801B76F0);
INCLUDE_ASM("asm/us/st/sel/nonmatchings/3642C", func_801B76F0);
void func_801B786C(s16 arg0) {
RECT rect;
@ -48,9 +48,9 @@ void func_801B786C(s16 arg0) {
ClearImage(&rect, 0, 0, 0);
}
INCLUDE_ASM("asm/st/sel/nonmatchings/3642C", func_801B78BC);
INCLUDE_ASM("asm/us/st/sel/nonmatchings/3642C", func_801B78BC);
INCLUDE_ASM("asm/st/sel/nonmatchings/3642C", func_801B79D4);
INCLUDE_ASM("asm/us/st/sel/nonmatchings/3642C", func_801B79D4);
void func_801B80F0(void) {
EnterCriticalSection();
@ -136,14 +136,14 @@ void func_801B8500(void) {
D_801BC8C8 = 0;
}
INCLUDE_ASM("asm/st/sel/nonmatchings/3642C", func_801B8518);
INCLUDE_ASM("asm/us/st/sel/nonmatchings/3642C", func_801B8518);
s32 func_801B8714(s32 arg0) { return D_801BC654[arg0 * 0x9E]; }
INCLUDE_ASM("asm/st/sel/nonmatchings/3642C", func_801B873C);
INCLUDE_ASM("asm/us/st/sel/nonmatchings/3642C", func_801B873C);
#ifndef NON_MATCHING
INCLUDE_ASM("asm/st/sel/nonmatchings/3642C", func_801B881C);
INCLUDE_ASM("asm/us/st/sel/nonmatchings/3642C", func_801B881C);
#else
extern volatile u8 D_801BC658[];
u8 func_801B881C(s32 arg0, s32 arg1) {
@ -176,7 +176,7 @@ s32 func_801B884C(s32 cardSlot, s32 cardSubSlot, const char* saveFile,
return 0;
}
INCLUDE_ASM("asm/st/sel/nonmatchings/3642C", func_801B88F4);
INCLUDE_ASM("asm/us/st/sel/nonmatchings/3642C", func_801B88F4);
s32 func_801B89C8(s32 cardSlot, s32 cardBlock, const char* path) {
char buf[0x20];

30
src/st/sel/38D24.c
View File

@ -2,7 +2,7 @@
s32 func_801B8D24(s32 cardSlot, s32 cardSubSlot);
#ifndef NON_MATCHING
INCLUDE_ASM("asm/st/sel/nonmatchings/38D24", func_801B8D24);
INCLUDE_ASM("asm/us/st/sel/nonmatchings/38D24", func_801B8D24);
#else
s32 func_801B8D24(s32 cardSlot, s32 cardSubSlot) {
s8 cardPath[0x8];
@ -44,14 +44,14 @@ void func_801B8DE8(u8* dst, s32 arg1) {
}
void StoreSaveData(SaveData* save, s32 arg1, s32 arg2);
INCLUDE_ASM("asm/st/sel/nonmatchings/38D24", StoreSaveData);
INCLUDE_ASM("asm/us/st/sel/nonmatchings/38D24", StoreSaveData);
s32 LoadSaveData(SaveData* save); // LoadSaveData
INCLUDE_ASM("asm/st/sel/nonmatchings/38D24", LoadSaveData);
INCLUDE_ASM("asm/us/st/sel/nonmatchings/38D24", LoadSaveData);
void func_801B9698(char* dstSaveName, s32 saveSlot);
#ifndef NON_MATCHING
INCLUDE_ASM("asm/st/sel/nonmatchings/38D24", func_801B9698);
INCLUDE_ASM("asm/us/st/sel/nonmatchings/38D24", func_801B9698);
#else
void func_801B9698(char* dstSaveName, s32 saveSlot) {
strncpy(dstSaveName, D_801A802C, sizeof(D_801A802C));
@ -79,7 +79,7 @@ s32 func_801B9744(void) {
}
s32 func_801B97BC(s32*);
INCLUDE_ASM("asm/st/sel/nonmatchings/38D24", func_801B97BC);
INCLUDE_ASM("asm/us/st/sel/nonmatchings/38D24", func_801B97BC);
void func_801B988C(u32* arg0) {
s32 temp_v0;
@ -108,13 +108,13 @@ void func_801B9924(void) {
func_801B18F4();
}
INCLUDE_ASM("asm/st/sel/nonmatchings/38D24", func_801B994C);
INCLUDE_ASM("asm/us/st/sel/nonmatchings/38D24", func_801B994C);
INCLUDE_ASM("asm/st/sel/nonmatchings/38D24", func_801B99E4);
INCLUDE_ASM("asm/us/st/sel/nonmatchings/38D24", func_801B99E4);
// func_801B9B7C(Unkstruct_801B9B7C* arg0, s16 arg1, s16 arg2, s16 arg3, s32
// arg4);
INCLUDE_ASM("asm/st/sel/nonmatchings/38D24", func_801B9B7C);
INCLUDE_ASM("asm/us/st/sel/nonmatchings/38D24", func_801B9B7C);
void func_801B9C18(s32 unused, void (*callback)()) {
s32* s0 = D_801BD044;
@ -125,7 +125,7 @@ void func_801B9C18(s32 unused, void (*callback)()) {
StSetStream(D_801BD038, 1, -1, NULL, NULL);
}
INCLUDE_ASM("asm/st/sel/nonmatchings/38D24", func_801B9C80);
INCLUDE_ASM("asm/us/st/sel/nonmatchings/38D24", func_801B9C80);
void func_801BA460(s32 option) {
if (option == 0) {
@ -223,7 +223,7 @@ void func_801BA6A8(void (*func)()) { DMACallback(0, func); }
void func_801BA6CC(void (*func)()) { DMACallback(1, func); }
INCLUDE_ASM("asm/st/sel/nonmatchings/38D24", MDEC_rest);
INCLUDE_ASM("asm/us/st/sel/nonmatchings/38D24", MDEC_rest);
void func_801BA7EC(s32* arg0, u32 arg1) {
MDEC_in_sync();
@ -242,10 +242,10 @@ void func_801BA880(s32 arg0, u32 arg1) {
*D_80196410 = 0x01000200;
}
INCLUDE_ASM("asm/st/sel/nonmatchings/38D24", MDEC_in_sync);
INCLUDE_ASM("asm/us/st/sel/nonmatchings/38D24", MDEC_in_sync);
#ifndef NON_MATCHING
INCLUDE_ASM("asm/st/sel/nonmatchings/38D24", MDEC_out_sync);
INCLUDE_ASM("asm/us/st/sel/nonmatchings/38D24", MDEC_out_sync);
#else
void MDEC_out_sync(void) {
volatile s32 sp10 = 0x100000;
@ -259,8 +259,8 @@ void MDEC_out_sync(void) {
}
#endif
INCLUDE_ASM("asm/st/sel/nonmatchings/38D24", MDEC_print_error);
INCLUDE_ASM("asm/us/st/sel/nonmatchings/38D24", MDEC_print_error);
INCLUDE_ASM("asm/st/sel/nonmatchings/38D24", func_801BAB70);
INCLUDE_ASM("asm/us/st/sel/nonmatchings/38D24", func_801BAB70);
INCLUDE_ASM("asm/st/sel/nonmatchings/38D24", func_801BABA4);
INCLUDE_ASM("asm/us/st/sel/nonmatchings/38D24", func_801BABA4);

2
src/st/sel/func_801B8A8C.c
View File

@ -4,7 +4,7 @@
// points to a 'nop' while the current build toolchain points to the
// instruction right after the 'nop'.
#ifndef NON_MATCHING
INCLUDE_ASM("asm/st/sel/nonmatchings/func_801B8A8C", func_801B8A8C);
INCLUDE_ASM("asm/us/st/sel/nonmatchings/func_801B8A8C", func_801B8A8C);
#else
void _clear_event(void);
void _clear_event_x(void);

240
src/st/st0/27D64.c
View File

@ -48,7 +48,7 @@ void func_801A7D64(Entity* arg0) {
}
#ifndef NON_MATCHING
INCLUDE_ASM("asm/st/st0/nonmatchings/27D64", func_801A7E2C);
INCLUDE_ASM("asm/us/st/st0/nonmatchings/27D64", func_801A7E2C);
#else
bool func_801A7E2C(Entity* entity) {
s16 distance;
@ -68,7 +68,7 @@ bool func_801A7E2C(Entity* entity) {
#endif
#ifndef NON_MATCHING
INCLUDE_ASM("asm/st/st0/nonmatchings/27D64", EntityLockCamera);
INCLUDE_ASM("asm/us/st/st0/nonmatchings/27D64", EntityLockCamera);
#else
extern u16 D_801805B0[];
extern u8 D_8018065C[];
@ -128,9 +128,9 @@ void EntityLockCamera(Entity* entity) {
}
#endif
INCLUDE_ASM("asm/st/st0/nonmatchings/27D64", func_801A805C);
INCLUDE_ASM("asm/us/st/st0/nonmatchings/27D64", func_801A805C);
INCLUDE_ASM("asm/st/st0/nonmatchings/27D64", func_801A8328);
INCLUDE_ASM("asm/us/st/st0/nonmatchings/27D64", func_801A8328);
void func_801A8620(Entity* entity) {
s16 dist;
@ -253,9 +253,9 @@ void func_801A8620(Entity* entity) {
}
}
INCLUDE_ASM("asm/st/st0/nonmatchings/27D64", func_801A8984);
INCLUDE_ASM("asm/us/st/st0/nonmatchings/27D64", func_801A8984);
INCLUDE_ASM("asm/st/st0/nonmatchings/27D64", func_801A89D8);
INCLUDE_ASM("asm/us/st/st0/nonmatchings/27D64", func_801A89D8);
void func_801A8B9C(s16 yOffset) {
RECT rect;
@ -267,23 +267,23 @@ void func_801A8B9C(s16 yOffset) {
ClearImage(&rect, 0, 0, 0);
}
INCLUDE_ASM("asm/st/st0/nonmatchings/27D64", func_801A8BF8);
INCLUDE_ASM("asm/us/st/st0/nonmatchings/27D64", func_801A8BF8);
INCLUDE_ASM("asm/st/st0/nonmatchings/27D64", func_801A8CB0);
INCLUDE_ASM("asm/us/st/st0/nonmatchings/27D64", func_801A8CB0);
INCLUDE_ASM("asm/st/st0/nonmatchings/27D64", func_801A8E34);
INCLUDE_ASM("asm/us/st/st0/nonmatchings/27D64", func_801A8E34);
INCLUDE_ASM("asm/st/st0/nonmatchings/27D64", func_801A8E60);
INCLUDE_ASM("asm/us/st/st0/nonmatchings/27D64", func_801A8E60);
INCLUDE_ASM("asm/st/st0/nonmatchings/27D64", func_801A910C);
INCLUDE_ASM("asm/us/st/st0/nonmatchings/27D64", func_801A910C);
INCLUDE_ASM("asm/st/st0/nonmatchings/27D64", EntityDialogue);
INCLUDE_ASM("asm/us/st/st0/nonmatchings/27D64", EntityDialogue);
INCLUDE_ASM("asm/st/st0/nonmatchings/27D64", func_801AA218);
INCLUDE_ASM("asm/us/st/st0/nonmatchings/27D64", func_801AA218);
INCLUDE_ASM("asm/st/st0/nonmatchings/27D64", EntityCutscene);
INCLUDE_ASM("asm/us/st/st0/nonmatchings/27D64", EntityCutscene);
INCLUDE_ASM("asm/st/st0/nonmatchings/27D64", EntitySecretButton);
INCLUDE_ASM("asm/us/st/st0/nonmatchings/27D64", EntitySecretButton);
extern u16 D_80180628[];
void EntitySecretStairsEmitter(Entity* entity) {
@ -315,17 +315,17 @@ void EntitySecretStairsEmitter(Entity* entity) {
}
}
INCLUDE_ASM("asm/st/st0/nonmatchings/27D64", EntitySecretStairsChunk);
INCLUDE_ASM("asm/us/st/st0/nonmatchings/27D64", EntitySecretStairsChunk);
INCLUDE_ASM("asm/st/st0/nonmatchings/27D64", EntityStageTitleFadeout);
INCLUDE_ASM("asm/us/st/st0/nonmatchings/27D64", EntityStageTitleFadeout);
INCLUDE_ASM("asm/st/st0/nonmatchings/27D64", EntityStageTitleCard);
INCLUDE_ASM("asm/us/st/st0/nonmatchings/27D64", EntityStageTitleCard);
INCLUDE_ASM("asm/st/st0/nonmatchings/27D64", func_801ABBBC);
INCLUDE_ASM("asm/us/st/st0/nonmatchings/27D64", func_801ABBBC);
INCLUDE_ASM("asm/st/st0/nonmatchings/27D64", func_801AC458);
INCLUDE_ASM("asm/us/st/st0/nonmatchings/27D64", func_801AC458);
INCLUDE_ASM("asm/st/st0/nonmatchings/27D64", EntityDracula);
INCLUDE_ASM("asm/us/st/st0/nonmatchings/27D64", EntityDracula);
extern u16 D_801805E0[];
void EntityDraculaBody(Entity* entity) {
@ -559,19 +559,19 @@ bool func_801ADAC8(s32 arg0) {
}
}
INCLUDE_ASM("asm/st/st0/nonmatchings/27D64", func_801ADB10);
INCLUDE_ASM("asm/us/st/st0/nonmatchings/27D64", func_801ADB10);
INCLUDE_ASM("asm/st/st0/nonmatchings/27D64", EntityDraculaFinalForm);
INCLUDE_ASM("asm/us/st/st0/nonmatchings/27D64", EntityDraculaFinalForm);
INCLUDE_ASM("asm/st/st0/nonmatchings/27D64", EntityDraculaMegaFireball);
INCLUDE_ASM("asm/us/st/st0/nonmatchings/27D64", EntityDraculaMegaFireball);
INCLUDE_ASM("asm/st/st0/nonmatchings/27D64", EntityDraculaRainAttack);
INCLUDE_ASM("asm/us/st/st0/nonmatchings/27D64", EntityDraculaRainAttack);
INCLUDE_ASM("asm/st/st0/nonmatchings/27D64", func_801AF380);
INCLUDE_ASM("asm/us/st/st0/nonmatchings/27D64", func_801AF380);
INCLUDE_ASM("asm/st/st0/nonmatchings/27D64", func_801AF6D0);
INCLUDE_ASM("asm/us/st/st0/nonmatchings/27D64", func_801AF6D0);
INCLUDE_ASM("asm/st/st0/nonmatchings/27D64", func_801AF774);
INCLUDE_ASM("asm/us/st/st0/nonmatchings/27D64", func_801AF774);
void func_801B0030(s32 arg0) {
D_8003C734 = arg0;
@ -580,29 +580,29 @@ void func_801B0030(s32 arg0) {
g_backbufferY = 0;
}
INCLUDE_ASM("asm/st/st0/nonmatchings/27D64", func_801B0058);
INCLUDE_ASM("asm/us/st/st0/nonmatchings/27D64", func_801B0058);
INCLUDE_ASM("asm/st/st0/nonmatchings/27D64", func_801B0180);
INCLUDE_ASM("asm/us/st/st0/nonmatchings/27D64", func_801B0180);
INCLUDE_ASM("asm/st/st0/nonmatchings/27D64", func_801B01C0);
INCLUDE_ASM("asm/us/st/st0/nonmatchings/27D64", func_801B01C0);
INCLUDE_ASM("asm/st/st0/nonmatchings/27D64", func_801B01F8);
INCLUDE_ASM("asm/us/st/st0/nonmatchings/27D64", func_801B01F8);
INCLUDE_ASM("asm/st/st0/nonmatchings/27D64", func_801B0280);
INCLUDE_ASM("asm/us/st/st0/nonmatchings/27D64", func_801B0280);
INCLUDE_ASM("asm/st/st0/nonmatchings/27D64", func_801B0324);
INCLUDE_ASM("asm/us/st/st0/nonmatchings/27D64", func_801B0324);
INCLUDE_ASM("asm/st/st0/nonmatchings/27D64", func_801B0414);
INCLUDE_ASM("asm/us/st/st0/nonmatchings/27D64", func_801B0414);
INCLUDE_ASM("asm/st/st0/nonmatchings/27D64", func_801B0464);
INCLUDE_ASM("asm/us/st/st0/nonmatchings/27D64", func_801B0464);
INCLUDE_ASM("asm/st/st0/nonmatchings/27D64", func_801B101C);
INCLUDE_ASM("asm/us/st/st0/nonmatchings/27D64", func_801B101C);
INCLUDE_ASM("asm/st/st0/nonmatchings/27D64", func_801B1198);
INCLUDE_ASM("asm/us/st/st0/nonmatchings/27D64", func_801B1198);
INCLUDE_ASM("asm/st/st0/nonmatchings/27D64", func_801B11E8);
INCLUDE_ASM("asm/us/st/st0/nonmatchings/27D64", func_801B11E8);
INCLUDE_ASM("asm/st/st0/nonmatchings/27D64", func_801B1298);
INCLUDE_ASM("asm/us/st/st0/nonmatchings/27D64", func_801B1298);
s32 Random(void) {
g_randomNext = (g_randomNext * 0x01010101) + 1;
@ -610,7 +610,7 @@ s32 Random(void) {
}
#ifndef NON_MATCHING
INCLUDE_ASM("asm/st/st0/nonmatchings/27D64", Update);
INCLUDE_ASM("asm/us/st/st0/nonmatchings/27D64", Update);
#else
extern s16 D_801815EC[];
extern u16 D_801C2584[];
@ -697,11 +697,11 @@ void Update(void) {
}
#endif
INCLUDE_ASM("asm/st/st0/nonmatchings/27D64", func_801B1B98);
INCLUDE_ASM("asm/us/st/st0/nonmatchings/27D64", func_801B1B98);
INCLUDE_ASM("asm/st/st0/nonmatchings/27D64", func_801B1CA0);
INCLUDE_ASM("asm/us/st/st0/nonmatchings/27D64", func_801B1CA0);
INCLUDE_ASM("asm/st/st0/nonmatchings/27D64", EntityNumericDamage);
INCLUDE_ASM("asm/us/st/st0/nonmatchings/27D64", EntityNumericDamage);
void CreateEntityFromLayout(Entity* entity, LayoutObject* initDesc) {
DestroyEntity(entity);
@ -716,31 +716,31 @@ void CreateEntityFromLayout(Entity* entity, LayoutObject* initDesc) {
entity->unk68 = (initDesc->objectId >> 0xA) & 7;
}
INCLUDE_ASM("asm/st/st0/nonmatchings/27D64", func_801B31A4);
INCLUDE_ASM("asm/us/st/st0/nonmatchings/27D64", func_801B31A4);
INCLUDE_ASM("asm/st/st0/nonmatchings/27D64", func_801B32BC);
INCLUDE_ASM("asm/us/st/st0/nonmatchings/27D64", func_801B32BC);
INCLUDE_ASM("asm/st/st0/nonmatchings/27D64", func_801B33D4);
INCLUDE_ASM("asm/us/st/st0/nonmatchings/27D64", func_801B33D4);
INCLUDE_ASM("asm/st/st0/nonmatchings/27D64", func_801B3420);
INCLUDE_ASM("asm/us/st/st0/nonmatchings/27D64", func_801B3420);
INCLUDE_ASM("asm/st/st0/nonmatchings/27D64", func_801B3478);
INCLUDE_ASM("asm/us/st/st0/nonmatchings/27D64", func_801B3478);
INCLUDE_ASM("asm/st/st0/nonmatchings/27D64", func_801B3574);
INCLUDE_ASM("asm/us/st/st0/nonmatchings/27D64", func_801B3574);
INCLUDE_ASM("asm/st/st0/nonmatchings/27D64", func_801B3688);
INCLUDE_ASM("asm/us/st/st0/nonmatchings/27D64", func_801B3688);
INCLUDE_ASM("asm/st/st0/nonmatchings/27D64", func_801B36D4);
INCLUDE_ASM("asm/us/st/st0/nonmatchings/27D64", func_801B36D4);
INCLUDE_ASM("asm/st/st0/nonmatchings/27D64", func_801B372C);
INCLUDE_ASM("asm/us/st/st0/nonmatchings/27D64", func_801B372C);
INCLUDE_ASM("asm/st/st0/nonmatchings/27D64", func_801B3828);
INCLUDE_ASM("asm/us/st/st0/nonmatchings/27D64", func_801B3828);
INCLUDE_ASM("asm/st/st0/nonmatchings/27D64", func_801B393C);
INCLUDE_ASM("asm/us/st/st0/nonmatchings/27D64", func_801B393C);
INCLUDE_ASM("asm/st/st0/nonmatchings/27D64", func_801B3AB4);
INCLUDE_ASM("asm/us/st/st0/nonmatchings/27D64", func_801B3AB4);
INCLUDE_ASM("asm/st/st0/nonmatchings/27D64", CreateEntityFromCurrentEntity);
INCLUDE_ASM("asm/us/st/st0/nonmatchings/27D64", CreateEntityFromCurrentEntity);
void CreateEntityFromEntity(u16 objectId, Entity* source, Entity* entity) {
DestroyEntity(entity);
@ -767,7 +767,7 @@ s32 func_801B3C58(Unkstruct5* arg0) {
return diff;
}
INCLUDE_ASM("asm/st/st0/nonmatchings/27D64", EntityRedDoor);
INCLUDE_ASM("asm/us/st/st0/nonmatchings/27D64", EntityRedDoor);
void DestroyEntity(Entity* item) {
s32 i;
@ -804,7 +804,7 @@ void PreventEntityFromRespawning(Entity* entity) {
#include "st/AnimateEntity.h"
INCLUDE_ASM("asm/st/st0/nonmatchings/27D64", func_801B4AF0);
INCLUDE_ASM("asm/us/st/st0/nonmatchings/27D64", func_801B4AF0);
/*
* Returns the absolute distance from g_CurrentEntity to player in the X Axis
@ -866,11 +866,11 @@ u8 func_801B4D18(void) {
return unkState;
}
INCLUDE_ASM("asm/st/st0/nonmatchings/27D64", func_801B4D5C);
INCLUDE_ASM("asm/us/st/st0/nonmatchings/27D64", func_801B4D5C);
INCLUDE_ASM("asm/st/st0/nonmatchings/27D64", func_801B4FD4);
INCLUDE_ASM("asm/us/st/st0/nonmatchings/27D64", func_801B4FD4);
INCLUDE_ASM("asm/st/st0/nonmatchings/27D64", func_801B51E4);
INCLUDE_ASM("asm/us/st/st0/nonmatchings/27D64", func_801B51E4);
Entity* AllocEntity(Entity* start, Entity* end) {
Entity* current = start;
@ -885,21 +885,21 @@ Entity* AllocEntity(Entity* start, Entity* end) {
return NULL;
}
INCLUDE_ASM("asm/st/st0/nonmatchings/27D64", func_801B542C);
INCLUDE_ASM("asm/us/st/st0/nonmatchings/27D64", func_801B542C);
INCLUDE_ASM("asm/st/st0/nonmatchings/27D64", func_801B5458);
INCLUDE_ASM("asm/us/st/st0/nonmatchings/27D64", func_801B5458);
INCLUDE_ASM("asm/st/st0/nonmatchings/27D64", func_801B5474);
INCLUDE_ASM("asm/us/st/st0/nonmatchings/27D64", func_801B5474);
INCLUDE_ASM("asm/st/st0/nonmatchings/27D64", func_801B54E0);
INCLUDE_ASM("asm/us/st/st0/nonmatchings/27D64", func_801B54E0);
INCLUDE_ASM("asm/st/st0/nonmatchings/27D64", func_801B5518);
INCLUDE_ASM("asm/us/st/st0/nonmatchings/27D64", func_801B5518);
INCLUDE_ASM("asm/st/st0/nonmatchings/27D64", func_801B5560);
INCLUDE_ASM("asm/us/st/st0/nonmatchings/27D64", func_801B5560);
INCLUDE_ASM("asm/st/st0/nonmatchings/27D64", func_801B55A8);
INCLUDE_ASM("asm/us/st/st0/nonmatchings/27D64", func_801B55A8);
INCLUDE_ASM("asm/st/st0/nonmatchings/27D64", func_801B5600);
INCLUDE_ASM("asm/us/st/st0/nonmatchings/27D64", func_801B5600);
u16 func_801B568C(s16 x, s16 y) { return ratan2(y, x); }
@ -916,7 +916,7 @@ u16 func_801B56F4(s32 x, s32 y) {
}
#ifndef NON_MATCHING
INCLUDE_ASM("asm/st/st0/nonmatchings/27D64", func_801B573C);
INCLUDE_ASM("asm/us/st/st0/nonmatchings/27D64", func_801B573C);
#else
// very minor reg swap
u16 func_801B573C(u16 arg0, s16 arg1, s16 arg2) {
@ -957,39 +957,39 @@ void func_801B57B4(u8 arg0) {
g_CurrentEntity->animFrameDuration = 0;
}
INCLUDE_ASM("asm/st/st0/nonmatchings/27D64", func_801B57D0);
INCLUDE_ASM("asm/us/st/st0/nonmatchings/27D64", func_801B57D0);
INCLUDE_ASM("asm/st/st0/nonmatchings/27D64", InitializeEntity);
INCLUDE_ASM("asm/us/st/st0/nonmatchings/27D64", InitializeEntity);
INCLUDE_ASM("asm/st/st0/nonmatchings/27D64", EntityDummy);
INCLUDE_ASM("asm/us/st/st0/nonmatchings/27D64", EntityDummy);
INCLUDE_ASM("asm/st/st0/nonmatchings/27D64", func_801B5970);
INCLUDE_ASM("asm/us/st/st0/nonmatchings/27D64", func_801B5970);
INCLUDE_ASM("asm/st/st0/nonmatchings/27D64", func_801B5A98);
INCLUDE_ASM("asm/us/st/st0/nonmatchings/27D64", func_801B5A98);
INCLUDE_ASM("asm/st/st0/nonmatchings/27D64", func_801B5BF0);
INCLUDE_ASM("asm/us/st/st0/nonmatchings/27D64", func_801B5BF0);
INCLUDE_ASM("asm/st/st0/nonmatchings/27D64", func_801B5E38);
INCLUDE_ASM("asm/us/st/st0/nonmatchings/27D64", func_801B5E38);
INCLUDE_ASM("asm/st/st0/nonmatchings/27D64", func_801B5EC8);
INCLUDE_ASM("asm/us/st/st0/nonmatchings/27D64", func_801B5EC8);
INCLUDE_ASM("asm/st/st0/nonmatchings/27D64", func_801B5F4C);
INCLUDE_ASM("asm/us/st/st0/nonmatchings/27D64", func_801B5F4C);
INCLUDE_ASM("asm/st/st0/nonmatchings/27D64", func_801B60A8);
INCLUDE_ASM("asm/us/st/st0/nonmatchings/27D64", func_801B60A8);
INCLUDE_ASM("asm/st/st0/nonmatchings/27D64", func_801B615C);
INCLUDE_ASM("asm/us/st/st0/nonmatchings/27D64", func_801B615C);
void func_801B61D4(void) {}
INCLUDE_ASM("asm/st/st0/nonmatchings/27D64", func_801B61DC);
INCLUDE_ASM("asm/us/st/st0/nonmatchings/27D64", func_801B61DC);
INCLUDE_ASM("asm/st/st0/nonmatchings/27D64", func_801B6204);
INCLUDE_ASM("asm/us/st/st0/nonmatchings/27D64", func_801B6204);
INCLUDE_ASM("asm/st/st0/nonmatchings/27D64", func_801B6314);
INCLUDE_ASM("asm/us/st/st0/nonmatchings/27D64", func_801B6314);
INCLUDE_ASM("asm/st/st0/nonmatchings/27D64", func_801B633C);
INCLUDE_ASM("asm/us/st/st0/nonmatchings/27D64", func_801B633C);
INCLUDE_ASM("asm/st/st0/nonmatchings/27D64", func_801B6358);
INCLUDE_ASM("asm/us/st/st0/nonmatchings/27D64", func_801B6358);
void EntityExplosion(Entity* entity) {
if (entity->step == 0) {
@ -1021,13 +1021,13 @@ void EntityExplosion(Entity* entity) {
}
}
INCLUDE_ASM("asm/st/st0/nonmatchings/27D64", func_801B6C5C);
INCLUDE_ASM("asm/us/st/st0/nonmatchings/27D64", func_801B6C5C);
INCLUDE_ASM("asm/st/st0/nonmatchings/27D64", func_801B6D34);
INCLUDE_ASM("asm/us/st/st0/nonmatchings/27D64", func_801B6D34);
INCLUDE_ASM("asm/st/st0/nonmatchings/27D64", func_801B7308);
INCLUDE_ASM("asm/us/st/st0/nonmatchings/27D64", func_801B7308);
INCLUDE_ASM("asm/st/st0/nonmatchings/27D64", func_801B7B0C);
INCLUDE_ASM("asm/us/st/st0/nonmatchings/27D64", func_801B7B0C);
void func_801B7BFC(Entity* entity) {
switch (entity->step) {
@ -1055,15 +1055,15 @@ void func_801B7BFC(Entity* entity) {
}
}
INCLUDE_ASM("asm/st/st0/nonmatchings/27D64", func_801B7D0C);
INCLUDE_ASM("asm/us/st/st0/nonmatchings/27D64", func_801B7D0C);
INCLUDE_ASM("asm/st/st0/nonmatchings/27D64", func_801B7E3C);
INCLUDE_ASM("asm/us/st/st0/nonmatchings/27D64", func_801B7E3C);
INCLUDE_ASM("asm/st/st0/nonmatchings/27D64", func_801B7F24);
INCLUDE_ASM("asm/us/st/st0/nonmatchings/27D64", func_801B7F24);
INCLUDE_ASM("asm/st/st0/nonmatchings/27D64", func_801B8014);
INCLUDE_ASM("asm/us/st/st0/nonmatchings/27D64", func_801B8014);
INCLUDE_ASM("asm/st/st0/nonmatchings/27D64", func_801B8108);
INCLUDE_ASM("asm/us/st/st0/nonmatchings/27D64", func_801B8108);
bool func_801B8338(Unkstruct6* unk) {
CollisionResult res;
@ -1090,29 +1090,29 @@ bool func_801B8338(Unkstruct6* unk) {
return false;
}
INCLUDE_ASM("asm/st/st0/nonmatchings/27D64", func_801B8434);
INCLUDE_ASM("asm/us/st/st0/nonmatchings/27D64", func_801B8434);
INCLUDE_ASM("asm/st/st0/nonmatchings/27D64", EntityIntenseExplosion);
INCLUDE_ASM("asm/us/st/st0/nonmatchings/27D64", EntityIntenseExplosion);
INCLUDE_ASM("asm/st/st0/nonmatchings/27D64", func_801B8AB4);
INCLUDE_ASM("asm/us/st/st0/nonmatchings/27D64", func_801B8AB4);
INCLUDE_ASM("asm/st/st0/nonmatchings/27D64", func_801B8B80);
INCLUDE_ASM("asm/us/st/st0/nonmatchings/27D64", func_801B8B80);
INCLUDE_ASM("asm/st/st0/nonmatchings/27D64", func_801B8C48);
INCLUDE_ASM("asm/us/st/st0/nonmatchings/27D64", func_801B8C48);
INCLUDE_ASM("asm/st/st0/nonmatchings/27D64", func_801B8D00);
INCLUDE_ASM("asm/us/st/st0/nonmatchings/27D64", func_801B8D00);
INCLUDE_ASM("asm/st/st0/nonmatchings/27D64", func_801B8ED8);
INCLUDE_ASM("asm/us/st/st0/nonmatchings/27D64", func_801B8ED8);
INCLUDE_ASM("asm/st/st0/nonmatchings/27D64", func_801B94B8);
INCLUDE_ASM("asm/us/st/st0/nonmatchings/27D64", func_801B94B8);
INCLUDE_ASM("asm/st/st0/nonmatchings/27D64", func_801B9BB8);
INCLUDE_ASM("asm/us/st/st0/nonmatchings/27D64", func_801B9BB8);
INCLUDE_ASM("asm/st/st0/nonmatchings/27D64", func_801B9DB0);
INCLUDE_ASM("asm/us/st/st0/nonmatchings/27D64", func_801B9DB0);
INCLUDE_ASM("asm/st/st0/nonmatchings/27D64", EntityAbsorbOrb);
INCLUDE_ASM("asm/us/st/st0/nonmatchings/27D64", EntityAbsorbOrb);
INCLUDE_ASM("asm/st/st0/nonmatchings/27D64", func_801BA23C);
INCLUDE_ASM("asm/us/st/st0/nonmatchings/27D64", func_801BA23C);
extern ObjInit2 D_80181FE8[];
void EntityRoomForeground(Entity* entity) {
@ -1137,16 +1137,16 @@ void EntityRoomForeground(Entity* entity) {
AnimateEntity(objInit->unk10, entity);
}
INCLUDE_ASM("asm/st/st0/nonmatchings/27D64", func_801BA7D8);
INCLUDE_ASM("asm/us/st/st0/nonmatchings/27D64", func_801BA7D8);
INCLUDE_ASM("asm/st/st0/nonmatchings/27D64", EntityClouds);
INCLUDE_ASM("asm/us/st/st0/nonmatchings/27D64", EntityClouds);
INCLUDE_ASM("asm/st/st0/nonmatchings/27D64", EntityClockTower3D);
INCLUDE_ASM("asm/us/st/st0/nonmatchings/27D64", EntityClockTower3D);
INCLUDE_ASM("asm/st/st0/nonmatchings/27D64", EntityCutscenePhotograph);
INCLUDE_ASM("asm/us/st/st0/nonmatchings/27D64", EntityCutscenePhotograph);
#ifndef NON_MATCHING // TODO fix 'li' opcode with ASPATCH
INCLUDE_ASM("asm/st/st0/nonmatchings/27D64", EntityCutscenePhotographFire);
INCLUDE_ASM("asm/us/st/st0/nonmatchings/27D64", EntityCutscenePhotographFire);
#else
extern u16 D_801805D4[];
extern u8 D_801824CC[];
@ -1179,15 +1179,15 @@ void EntityCutscenePhotographFire(Entity* entity) {
}
#endif
INCLUDE_ASM("asm/st/st0/nonmatchings/27D64", func_801BC5C0);
INCLUDE_ASM("asm/us/st/st0/nonmatchings/27D64", func_801BC5C0);
INCLUDE_ASM("asm/st/st0/nonmatchings/27D64", func_801BD0C0);
INCLUDE_ASM("asm/us/st/st0/nonmatchings/27D64", func_801BD0C0);
INCLUDE_ASM("asm/st/st0/nonmatchings/27D64", func_801BD4A8);
INCLUDE_ASM("asm/us/st/st0/nonmatchings/27D64", func_801BD4A8);
INCLUDE_ASM("asm/st/st0/nonmatchings/27D64", func_801BD5F8);
INCLUDE_ASM("asm/us/st/st0/nonmatchings/27D64", func_801BD5F8);
INCLUDE_ASM("asm/st/st0/nonmatchings/27D64", func_801BD628);
INCLUDE_ASM("asm/us/st/st0/nonmatchings/27D64", func_801BD628);
POLY_GT4* func_801BD6A4(POLY_GT4* startPoly, s32 count) {
POLY_GT4* poly;
@ -1285,6 +1285,6 @@ s32 func_801BD88C(s32 arg0, u8 arg1) {
return ret;
}
INCLUDE_ASM("asm/st/st0/nonmatchings/27D64", func_801BD8F0);
INCLUDE_ASM("asm/us/st/st0/nonmatchings/27D64", func_801BD8F0);
INCLUDE_ASM("asm/st/st0/nonmatchings/27D64", EntityBackgroundVortex);
INCLUDE_ASM("asm/us/st/st0/nonmatchings/27D64", EntityBackgroundVortex);

90
src/st/wrp/6FD0.c
View File

@ -1735,7 +1735,7 @@ void func_80186FD0(Entity* arg0) {
// nops in between array assignments, matches with PSY-Q 3.6 and 4.0
#ifndef NON_MATCHING
INCLUDE_ASM("asm/st/wrp/nonmatchings/6FD0", func_801870B0);
INCLUDE_ASM("asm/us/st/wrp/nonmatchings/6FD0", func_801870B0);
#else
void func_801870B0(Entity* entity) {
s32 ret;
@ -1825,7 +1825,7 @@ void EntityBreakable(Entity* entity) {
}
#ifndef NON_MATCHING
INCLUDE_ASM("asm/st/wrp/nonmatchings/6FD0", EntityWarpRoom);
INCLUDE_ASM("asm/us/st/wrp/nonmatchings/6FD0", EntityWarpRoom);
#else
extern u8 D_8003BEBC;
extern void (*D_8003C7E8)(u16 arg0, u8 arg1, u8 arg2, u8 arg3);
@ -2239,7 +2239,7 @@ void EntityWarpRoom(Entity* entity) {
// TODO this is matching, but EntityWarpRoom needs to match first due to the
// jump table.
#ifndef NON_MATCHING
INCLUDE_ASM("asm/st/wrp/nonmatchings/6FD0", EntityWarpSmallRocks);
INCLUDE_ASM("asm/us/st/wrp/nonmatchings/6FD0", EntityWarpSmallRocks);
#else
void EntityWarpSmallRocks(Entity* entity) {
@ -2338,7 +2338,7 @@ s32 Random(void) {
}
#ifndef NON_MATCHING
INCLUDE_ASM("asm/st/wrp/nonmatchings/6FD0", Update);
INCLUDE_ASM("asm/us/st/wrp/nonmatchings/6FD0", Update);
#else
void Update(void) {
s16 i;
@ -2423,7 +2423,7 @@ void Update(void) {
#endif
#ifndef NON_MATCHING
INCLUDE_ASM("asm/st/wrp/nonmatchings/6FD0", func_80188514);
INCLUDE_ASM("asm/us/st/wrp/nonmatchings/6FD0", func_80188514);
#else
void func_80188514(void) {
Entity* entity;
@ -2456,10 +2456,10 @@ void func_80188514(void) {
#endif
// https://decomp.me/scratch/Nq66t
INCLUDE_ASM("asm/st/wrp/nonmatchings/6FD0", TestCollisions);
INCLUDE_ASM("asm/us/st/wrp/nonmatchings/6FD0", TestCollisions);
// https://decomp.me/scratch/m0PKE
INCLUDE_ASM("asm/st/wrp/nonmatchings/6FD0", EntityNumericDamage);
INCLUDE_ASM("asm/us/st/wrp/nonmatchings/6FD0", EntityNumericDamage);
void CreateEntityFromLayout(Entity* entity, LayoutObject* initDesc) {
DestroyEntity(entity);
@ -2475,7 +2475,7 @@ void CreateEntityFromLayout(Entity* entity, LayoutObject* initDesc) {
}
#ifndef NON_MATCHING
INCLUDE_ASM("asm/st/wrp/nonmatchings/6FD0", func_80189E9C);
INCLUDE_ASM("asm/us/st/wrp/nonmatchings/6FD0", func_80189E9C);
#else
void func_80189E9C(LayoutObject* layoutObj) {
s16 temp_v0, posY;
@ -2510,7 +2510,7 @@ void func_80189E9C(LayoutObject* layoutObj) {
}
#endif
INCLUDE_ASM("asm/st/wrp/nonmatchings/6FD0", func_80189FB4);
INCLUDE_ASM("asm/us/st/wrp/nonmatchings/6FD0", func_80189FB4);
void func_8018A0CC(s16 arg0) {
do {
@ -2535,10 +2535,10 @@ loop_1:
}
}
INCLUDE_ASM("asm/st/wrp/nonmatchings/6FD0", func_8018A170);
INCLUDE_ASM("asm/us/st/wrp/nonmatchings/6FD0", func_8018A170);
void func_8018A170(s16);
INCLUDE_ASM("asm/st/wrp/nonmatchings/6FD0", func_8018A26C);
INCLUDE_ASM("asm/us/st/wrp/nonmatchings/6FD0", func_8018A26C);
void func_8018A26C(s16);
void func_8018A380(s16 arg0) {
@ -2565,7 +2565,7 @@ void func_8018A3CC(s16 arg0) {
}
#ifndef NON_MATCHING
INCLUDE_ASM("asm/st/wrp/nonmatchings/6FD0", func_8018A424);
INCLUDE_ASM("asm/us/st/wrp/nonmatchings/6FD0", func_8018A424);
void func_8018A424(s16 arg0);
#else
void func_8018A424(s16 arg0) {
@ -2589,7 +2589,7 @@ void func_8018A424(s16 arg0) {
#endif
#ifndef NON_MATCHING
INCLUDE_ASM("asm/st/wrp/nonmatchings/6FD0", func_8018A520);
INCLUDE_ASM("asm/us/st/wrp/nonmatchings/6FD0", func_8018A520);
void func_8018A424(s16 arg0);
#else
void func_8018A520(s16 arg0) {
@ -2618,7 +2618,7 @@ loop_5:
#endif
#ifndef NON_EQUIVALENT
INCLUDE_ASM("asm/st/wrp/nonmatchings/6FD0", InitRoomEntities);
INCLUDE_ASM("asm/us/st/wrp/nonmatchings/6FD0", InitRoomEntities);
#else
void InitRoomEntities(s32 objLayoutId) {
s16 temp_s0;
@ -2721,7 +2721,7 @@ s32 func_8018A950(Unkstruct5* arg0) {
return diff;
}
INCLUDE_ASM("asm/st/wrp/nonmatchings/6FD0", EntityRedDoor);
INCLUDE_ASM("asm/us/st/wrp/nonmatchings/6FD0", EntityRedDoor);
void DestroyEntity(Entity* item) {
s32 i;
@ -2758,7 +2758,7 @@ void PreventEntityFromRespawning(Entity* entity) {
#include "st/AnimateEntity.h"
INCLUDE_ASM("asm/st/wrp/nonmatchings/6FD0", func_8018B7E8);
INCLUDE_ASM("asm/us/st/wrp/nonmatchings/6FD0", func_8018B7E8);
/*
* Returns the absolute distance from g_CurrentEntity to player in the X Axis
@ -2805,7 +2805,7 @@ void FallEntity(void) {
}
#ifndef NON_MATCHING
INCLUDE_ASM("asm/st/wrp/nonmatchings/6FD0", func_8018BA10);
INCLUDE_ASM("asm/us/st/wrp/nonmatchings/6FD0", func_8018BA10);
#else
s32 func_8018BA10(u16* arg0) {
s16 new_var;
@ -2873,7 +2873,7 @@ s32 func_8018BA10(u16* arg0) {
}
#endif
INCLUDE_ASM("asm/st/wrp/nonmatchings/6FD0", func_8018BC88);
INCLUDE_ASM("asm/us/st/wrp/nonmatchings/6FD0", func_8018BC88);
Entity* AllocEntity(Entity* start, Entity* end) {
Entity* current = start;
@ -3060,12 +3060,12 @@ void EntityDummy(Entity* arg0) {
}
}
INCLUDE_ASM("asm/st/wrp/nonmatchings/6FD0", func_8018C434);
INCLUDE_ASM("asm/us/st/wrp/nonmatchings/6FD0", func_8018C434);
void func_8018C55C(u16* arg0, s16 arg1);
INCLUDE_ASM("asm/st/wrp/nonmatchings/6FD0", func_8018C55C);
INCLUDE_ASM("asm/us/st/wrp/nonmatchings/6FD0", func_8018C55C);
INCLUDE_ASM("asm/st/wrp/nonmatchings/6FD0", func_8018C6B4);
INCLUDE_ASM("asm/us/st/wrp/nonmatchings/6FD0", func_8018C6B4);
void ReplaceBreakableWithItemDrop(Entity* entity) {
u16 subId;
@ -3099,7 +3099,7 @@ void ReplaceBreakableWithItemDrop(Entity* entity) {
// matches in gcc 2.7.2 + aspsx
// most likely aspsx
#ifndef NON_MATCHING
INCLUDE_ASM("asm/st/wrp/nonmatchings/6FD0", func_8018CAB0);
INCLUDE_ASM("asm/us/st/wrp/nonmatchings/6FD0", func_8018CAB0);
#else
void func_8018CAB0(void) {
s32 temp_v1;
@ -3198,7 +3198,7 @@ void CollectGold(u16 goldSize) {
}
#ifndef NON_MATCHING
INCLUDE_ASM("asm/st/wrp/nonmatchings/6FD0", func_8018CDEC);
INCLUDE_ASM("asm/us/st/wrp/nonmatchings/6FD0", func_8018CDEC);
#else
void func_8018CDEC(u16 arg0) {
u16 temp_v0;
@ -3257,7 +3257,7 @@ void CollectLifeVessel(void) {
void func_8018CFF8(void) { DestroyEntity(g_CurrentEntity); }
INCLUDE_ASM("asm/st/wrp/nonmatchings/6FD0", EntityPriceDrop);
INCLUDE_ASM("asm/us/st/wrp/nonmatchings/6FD0", EntityPriceDrop);
void EntityExplosion(Entity* entity) {
u16 zPriority;
@ -3318,15 +3318,15 @@ void func_8018D990(Entity* arg0, s32 renderFlags) {
}
}
INCLUDE_ASM("asm/st/wrp/nonmatchings/6FD0", EntityInventoryDrop);
INCLUDE_ASM("asm/us/st/wrp/nonmatchings/6FD0", EntityInventoryDrop);
INCLUDE_ASM("asm/st/wrp/nonmatchings/6FD0", func_8018E01C);
INCLUDE_ASM("asm/us/st/wrp/nonmatchings/6FD0", func_8018E01C);
INCLUDE_ASM("asm/st/wrp/nonmatchings/6FD0", EntityRelicOrb);
INCLUDE_ASM("asm/us/st/wrp/nonmatchings/6FD0", EntityRelicOrb);
INCLUDE_ASM("asm/st/wrp/nonmatchings/6FD0", EntityHeartDrop);
INCLUDE_ASM("asm/us/st/wrp/nonmatchings/6FD0", EntityHeartDrop);
INCLUDE_ASM("asm/st/wrp/nonmatchings/6FD0", EntityUnkId0E);
INCLUDE_ASM("asm/us/st/wrp/nonmatchings/6FD0", EntityUnkId0E);
u8 func_8018F420(s16* arg0, u8 facing) {
u8 ret = 0;
@ -3376,10 +3376,10 @@ void func_8018F510(Entity* entity) {
}
}
INCLUDE_ASM("asm/st/wrp/nonmatchings/6FD0", func_8018F620);
INCLUDE_ASM("asm/us/st/wrp/nonmatchings/6FD0", func_8018F620);
#ifndef NON_EQUIVALENT
INCLUDE_ASM("asm/st/wrp/nonmatchings/6FD0", func_8018F750);
INCLUDE_ASM("asm/us/st/wrp/nonmatchings/6FD0", func_8018F750);
#else
extern void func_8018F928(Entity*);
void func_8018F750(Entity* source, s8 count, u16 xOffset, u16 yOffset,
@ -3456,7 +3456,7 @@ void func_8018F928(Entity* arg0) {
}
}
INCLUDE_ASM("asm/st/wrp/nonmatchings/6FD0", func_8018FA1C);
INCLUDE_ASM("asm/us/st/wrp/nonmatchings/6FD0", func_8018FA1C);
bool func_8018FC4C(Unkstruct6* unk) {
CollisionResult res;
@ -3483,7 +3483,7 @@ bool func_8018FC4C(Unkstruct6* unk) {
return false;
}
INCLUDE_ASM("asm/st/wrp/nonmatchings/6FD0", func_8018FD48);
INCLUDE_ASM("asm/us/st/wrp/nonmatchings/6FD0", func_8018FD48);
void EntityIntenseExplosion(Entity* entity) {
u32 zPriority;
@ -3578,24 +3578,24 @@ void func_8019055C(void) {
}
}
INCLUDE_ASM("asm/st/wrp/nonmatchings/6FD0", func_80190614);
INCLUDE_ASM("asm/us/st/wrp/nonmatchings/6FD0", func_80190614);
INCLUDE_ASM("asm/st/wrp/nonmatchings/6FD0", func_801907EC);
INCLUDE_ASM("asm/us/st/wrp/nonmatchings/6FD0", func_801907EC);
INCLUDE_ASM("asm/st/wrp/nonmatchings/6FD0", func_80190DCC);
INCLUDE_ASM("asm/us/st/wrp/nonmatchings/6FD0", func_80190DCC);
INCLUDE_ASM("asm/st/wrp/nonmatchings/6FD0", func_801914CC);
INCLUDE_ASM("asm/us/st/wrp/nonmatchings/6FD0", func_801914CC);
INCLUDE_ASM("asm/st/wrp/nonmatchings/6FD0", func_801916C4);
INCLUDE_ASM("asm/us/st/wrp/nonmatchings/6FD0", func_801916C4);
s32 func_80193A3C(u8* arg0, u8 value);
INCLUDE_ASM("asm/st/wrp/nonmatchings/6FD0", func_801917BC);
INCLUDE_ASM("asm/us/st/wrp/nonmatchings/6FD0", func_801917BC);
INCLUDE_ASM("asm/st/wrp/nonmatchings/6FD0", EntityStageNamePopup);
INCLUDE_ASM("asm/us/st/wrp/nonmatchings/6FD0", EntityStageNamePopup);
INCLUDE_ASM("asm/st/wrp/nonmatchings/6FD0", EntityAbsorbOrb);
INCLUDE_ASM("asm/us/st/wrp/nonmatchings/6FD0", EntityAbsorbOrb);
INCLUDE_ASM("asm/st/wrp/nonmatchings/6FD0", EntityEnemyBlood);
INCLUDE_ASM("asm/us/st/wrp/nonmatchings/6FD0", EntityEnemyBlood);
void EntityRoomForeground(Entity* entity) {
ObjInit2* objInit = &D_80181134[entity->subId];
@ -3619,7 +3619,7 @@ void EntityRoomForeground(Entity* entity) {
}
#ifndef NON_MATCHING
INCLUDE_ASM("asm/st/wrp/nonmatchings/6FD0", func_80192F40);
INCLUDE_ASM("asm/us/st/wrp/nonmatchings/6FD0", func_80192F40);
#else
void func_80192F40(u8* arg0, u8 arg1) {
u8 sp10[0x40];
@ -3785,9 +3785,9 @@ void func_80192F40(u8* arg0, u8 arg1) {
}
#endif
INCLUDE_ASM("asm/st/wrp/nonmatchings/6FD0", func_80193270);
INCLUDE_ASM("asm/us/st/wrp/nonmatchings/6FD0", func_80193270);
INCLUDE_ASM("asm/st/wrp/nonmatchings/6FD0", func_80193658);
INCLUDE_ASM("asm/us/st/wrp/nonmatchings/6FD0", func_80193658);
POLY_GT4* func_801937A8(POLY_GT4* poly) {
while (poly) {