pmret/papermario
1
0
Fork 0
mirror of https://github.com/pmret/papermario.git synced 2024-11-18 00:42:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

. (#527)

Browse Source
This commit is contained in:
Alexander Faßbender 2021-11-12 13:19:10 +01:00 committed by GitHub
parent e9dd00e871
commit 81d3abc7a4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
75 changed files with 108 additions and 108 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/16F740.c
View File

@ -7,7 +7,7 @@ extern s32 D_80280A30;
extern s32 D_8029F254;
// Almost good but some reorderings at the beginning
#ifdef NON_MATCHING
#ifdef NON_EQUIVALENT
void btl_merlee_on_start_turn(void) {
PlayerData* playerData = &gPlayerData;
BattleStatus* battleStatus = &gBattleStatus;

2
src/18F340.c
View File

@ -202,7 +202,7 @@ ApiStatus ConsumeLifeShroom(Evt *script, s32 isInitialCall) {
}
// TODO something wrong with the struct breakdown for BattleStatus
#ifdef NON_MATCHING
#ifdef NON_EQUIVALENT
ApiStatus RestorePreDefeatState(Evt* script, s32 isInitialCall) {
PlayerData* playerData = &gPlayerData;
BattleStatus* battleStatus = &gBattleStatus;

2
src/196AA0.c
View File

@ -91,7 +91,7 @@ void func_80268858(void) {
}
// action_cmd_current_main - calls current action command's main func
#ifdef NON_MATCHING
#ifdef NON_EQUIVALENT
void func_80268938(void) {
enum ActionCommand ac;

4
src/1A5830.c
View File

@ -801,7 +801,7 @@ s32 calc_enemy_damage_target(Actor* attacker) {
}
// part before the first conditional needs work
#ifdef NON_MATCHING
#ifdef NON_EQUIVALENT
s32 dispatch_damage_event_actor(Actor* actor, s32 damageAmount, s32 originalEvent, s32 stopMotion) {
BattleStatus* battleStatus = &gBattleStatus;
ActorMovementWalk* walk;
@ -1181,7 +1181,7 @@ ApiStatus GetEnemyMaxHP(Evt* script, s32 isInitialCall) {
}
// battlestatus shtuff
#ifdef NON_MATCHING
#ifdef NON_EQUIVALENT
ApiStatus RemoveActor(Evt* script, s32 isInitialCall) {
BattleStatus* battleStatus = &gBattleStatus;
EncounterStatus* currentEncounter = &gCurrentEncounter;

2
src/1AC760.c
View File

@ -47,7 +47,7 @@ INCLUDE_ASM(s32, "1AC760", calc_partner_test_enemy);
INCLUDE_ASM(s32, "1AC760", calc_partner_damage_enemy);
//Some slight stack / ordering issues at the beginning
#ifdef NON_MATCHING
#ifdef NON_EQUIVALENT
s32 dispatch_damage_event_partner(s32 damageAmount, s32 event, s32 stopMotion) {
BattleStatus* battleStatus = &gBattleStatus;
Actor* partner = battleStatus->partnerActor;

2
src/25f00_len_940.c
View File

@ -32,7 +32,7 @@ extern NUDMABuffer* D_800A3BD4;
// s32 nuAuDmaCallBack(s32 addr, s32 len, void* state, s32 arg3);
// WIP
#ifdef NON_MATCHING
#ifdef NON_EQUIVALENT
s32 nuAuDmaCallBack(s32 addr, s32 len, void *state, u8 arg3) {
NUDMABuffer *temp_s1;
NUDMABuffer *temp_a1;

4
src/28910_len_5090.c
View File

@ -4,7 +4,7 @@ INCLUDE_ASM(void, "28910_len_5090", func_8004D510, BGMPlayer* arg0);
// Return values are being pushed into v0 in the wrong place
// May depend on data decomp
#ifdef NON_MATCHING
#ifdef NON_EQUIVALENT
BGMPlayer* snd_get_player_with_song_name(s32 songString) {
UnkAl19E0* temp_v1 = D_8009A664->data;
@ -417,7 +417,7 @@ void snd_BGMCmd_F7_SubTrackReverbType(BGMPlayer* player, BGMPlayerTrack* track)
}
// unk_D4 type shenanigans
#ifdef NON_MATCHING
#ifdef NON_EQUIVALENT
void snd_BGMCmd_FD(BGMPlayer* player, BGMPlayerTrack* track) {
func_800560BC(player->unk_234, track->unk_5C, player->unk_D4.u16 >> 8);
}

2
src/2e230_len_2190.c
View File

@ -549,7 +549,7 @@ INCLUDE_ASM(s32, "2e230_len_2190", snd_load_BK_to_bank, s32 bkFileOffset, SoundB
void snd_swizzle_BK_instruments(s32 bkFileOffset, SoundBank* bank, InstrumentGroup instruments, s32 instrumentCount,
u8 arg4);
// float weirdness
#ifdef NON_MATCHING
#ifdef NON_EQUIVALENT
void snd_swizzle_BK_instruments(s32 bkFileOffset, SoundBank* bank, Instruments instruments, u32 instrumentCount,
u8 arg4) {
SoundBank* sb = bank;

2
src/30450.c
View File

@ -396,7 +396,7 @@ INCLUDE_ASM(s32, "30450", func_80055CC4);
s32 func_80055CE8(s32 songName, s32* arg1, BGMPlayer** player);
// We need to figure out what currentTrackData is a list of
#ifdef NON_MATCHING
#ifdef NON_EQUIVALENT
s32 func_80055CE8(s32 songName, s32* arg1, BGMPlayer** player) {
UnkAl19E0* temp_a3 = D_8009A5C0;
s32 ret = 0;

2
src/362a0_len_2f70.c
View File

@ -144,7 +144,7 @@ extern s32 D_800A4240;
extern f32 D_800A4244;
extern f32 D_800A4254;
#ifdef NON_MATCHING
#ifdef NON_EQUIVALENT
f32 test_up_ray_collider(s32 ignoreFlags, s32 colliderID, f32 x, f32 y, f32 z, f32 length, f32 yaw) {
CollisionData* collisionData = &gCollisionData;
f32 cosTheta;

6
src/415D90.c
View File

@ -541,7 +541,7 @@ void func_802A4A10(void) {
INCLUDE_ASM(s32, "415D90", func_802A4A54);
// getting there but needs work
#ifdef NON_MATCHING
#ifdef NON_EQUIVALENT
void func_802A5290(s32 arg0, s32 x, s32 y) {
s16 temp_s1;
s16 temp_s1_3;
@ -658,7 +658,7 @@ void func_802A5738(s32 arg0, s32 x, s32 y) {
}
// regalloc, arg setting order dumbness
#ifdef NON_MATCHING
#ifdef NON_EQUIVALENT
void func_802A57C8(s32 arg0, s32 x, s32 y) {
x += 11;
y += 6;
@ -760,7 +760,7 @@ s32 func_802A58D0(void) {
INCLUDE_ASM(s32, "415D90", btl_state_update_player_menu);
//requires above to be decomped
#ifdef NON_MATCHING
#ifdef NON_EQUIVALENT
void btl_state_draw_player_menu(void) {
switch (gBattleState2) {
case 1:

2
src/43F0.c
View File

@ -378,7 +378,7 @@ s32 sign(s32 val) {
}
// D_800743E0 index needs to add the upper 32 bits from func_8006DDC0 ret
#ifdef NON_MATCHING
#ifdef NON_EQUIVALENT
typedef struct {
u8 unk_00[39];

2
src/759b0_len_61b0.c
View File

@ -18,7 +18,7 @@ INCLUDE_ASM(s32, "759b0_len_61b0", npc_raycast_up_corners);
s32 npc_raycast_general(s32 ignoreFlags, f32 startX, f32 startY, f32 startZ, f32 dirX, f32 dirY, f32 dirZ, f32* hitX,
f32* hitY, f32* hitZ, f32* outDepth, f32* hitNx, f32* hitNy, f32* hitNz);
// Dumb float regalloc
#ifdef NON_MATCHING
#ifdef NON_EQUIVALENT
s32 npc_raycast_general(s32 flags, f32 startX, f32 startY, f32 startZ, f32 dirX, f32 dirY, f32 dirZ, f32* hitX,
f32* hitY, f32* hitZ, f32* outDepth, f32* hitNx, f32* hitNy, f32* hitNz) {
s32 entityID;

2
src/77480.c
View File

@ -493,7 +493,7 @@ void player_render_interact_prompts(void) {
}
// Weird control flow / issue with loading linker addrs
#ifdef NON_MATCHING
#ifdef NON_EQUIVALENT
extern s8 D_8015A57A;
void check_for_ispy(void) {
PlayerStatus* playerStatus = &gPlayerStatus;

4
src/7B440.c
View File

@ -36,7 +36,7 @@ void update_player_input(void) {
}
}
#ifdef NON_MATCHING
#ifdef NON_EQUIVALENT
void reset_player_status(void) {
s32* temp8010C92C = &D_8010C92C;
PlayerStatus* playerStatus = &gPlayerStatus;
@ -180,7 +180,7 @@ void game_input_to_move_vector(f32* arg0, f32* arg1) {
}
// tail merge crap
#ifdef NON_MATCHING
#ifdef NON_EQUIVALENT
void func_800E24F8(void) {
Shadow* playerShadow = get_shadow_by_index(gPlayerStatus.shadowID);
Camera* camera = &gCameras[0];

4
src/7E9D0.c
View File

@ -81,7 +81,7 @@ void set_action_state(s32 actionState) {
if (playerStatus->animFlags & 0x4000) {
// TODO figure this out
#ifdef NON_MATCHING
#ifdef NON_EQUIVALENT
if (
actionState == ACTION_STATE_IDLE || actionState == ACTION_STATE_WALK ||
actionState == ACTION_STATE_RUN || actionState == ACTION_STATE_JUMP ||
@ -316,7 +316,7 @@ void peach_sync_disguise_npc(void) {
}
#ifdef NON_MATCHING
#ifdef NON_EQUIVALENT
Npc* peach_make_disguise_npc(s32 peachDisguise) {
PlayerStatus* playerStatus = &gPlayerStatus;
NpcBlueprint blueprint;

6
src/7bb60_len_41b0.c
View File

@ -60,7 +60,7 @@ INCLUDE_ASM(s32, "7bb60_len_41b0", func_800E2BB0);
INCLUDE_ASM(s32, "7bb60_len_41b0", phys_update_jump);
#ifdef NON_MATCHING
#ifdef NON_EQUIVALENT
// Rodata issue.
extern s32 D_800F7B50;
@ -103,7 +103,7 @@ void phys_init_integrator_for_current_state(void) {
}
#else
INCLUDE_ASM(void, "7bb60_len_41b0", phys_init_integrator_for_current_state, void);
#endif // NON_MATCHING
#endif // NON_EQUIVALENT
// This function is wack. This weird stuff is needed to match
void gravity_use_fall_parms(void) {
@ -216,7 +216,7 @@ INCLUDE_ASM(s32, "7bb60_len_41b0", collision_main_lateral);
s32 collision_check_player_intersecting_world(s32 arg0, s32 arg1, f32 arg2);
//something weird with hitID
#ifdef NON_MATCHING
#ifdef NON_EQUIVALENT
s32 collision_check_player_intersecting_world(s32 arg0, s32 arg1, f32 arg2) {
f32 angle = 0.0f;
s32 ret = -1;

2
src/7fd10_len_b40.c
View File

@ -13,7 +13,7 @@ void func_800E6860(void) {
}
// playerStatus getting coppied to a0 - how? inlining?
#ifdef NON_MATCHING
#ifdef NON_EQUIVALENT
s32 func_800E6904(void) {
PartnerActionStatus* partnerActionStatus = &gPartnerActionStatus;
//PlayerStatus* playerStatus = &gPlayerStatus; // doesn't change codegen to use it, so commented out for now

4
src/80850_len_3060.c
View File

@ -390,7 +390,7 @@ void initialize_status_menu(void) {
}
// close but maybe just regalloc remaining?
#ifdef NON_MATCHING
#ifdef NON_EQUIVALENT
void status_menu_draw_number(s32 iconID, s32 x, s32 y, s32 value, s32 numDigits) {
s8 digits[4];
s32 i;
@ -871,7 +871,7 @@ void reset_status_menu(void) {
}
// Weird order of loading stuff
#ifdef NON_MATCHING
#ifdef NON_EQUIVALENT
s32 is_ability_active(s32 ability) {
s32 abilityMoveID;
PlayerData* playerData = &gPlayerData;

2
src/8800.c
View File

@ -401,7 +401,7 @@ Camera* initialize_next_camera(CameraInitData* initData) {
}
// Ordering shtuff
#ifdef NON_MATCHING
#ifdef NON_EQUIVALENT
void set_cam_viewport(s16 id, s16 x, s16 y, s16 width, s16 height) {
Camera* camera = &gCameras[id];

2
src/8a860_len_3f30.c
View File

@ -169,7 +169,7 @@ void func_800F4D28(PopupMessage* popup, s32 x, s32 y) {
}
}
#ifdef NON_MATCHING
#ifdef NON_EQUIVALENT
void create_popup_menu(PopupMenu* popup) {
PopupMenu* otherPopup;
s8 entryCount;

4
src/B0E0.c
View File

@ -9,7 +9,7 @@ void func_80030210(Camera* camera, f32 arg1, f32 arg2, s32 arg3);
void update_camera_mode_unused(Camera* camera);
// Issues with zero float temp?
#ifdef NON_MATCHING
#ifdef NON_EQUIVALENT
void update_camera_mode_unused(Camera* camera) {
PlayerStatus* playerStatus = &gPlayerStatus;
f32 temp_f30;
@ -202,7 +202,7 @@ INCLUDE_ASM(s32, "B0E0", update_camera_from_controller);
void update_camera_zone_interp(Camera* camera);
// Mostly issues with the switch
#ifdef NON_MATCHING
#ifdef NON_EQUIVALENT
void update_camera_zone_interp(Camera* camera) {
CameraControlSettings* cs;
f32 targetX;

2
src/B4580.c
View File

@ -30,7 +30,7 @@ extern Matrix4f gAnimRotScaleMtx;
extern StaticAnimatorNode** gAnimTreeRoot;
// reg swap
#ifdef NON_MATCHING
#ifdef NON_EQUIVALENT
Vtx* animator_copy_vertices_to_buffer(ModelAnimator* animator, AnimatorNode* node, Vec3s* buffer, s32 vtxCount,
s32 overhead, s32 startIdx) {
DisplayListBufferHandle* handle;

2
src/DF950.c
View File

@ -370,7 +370,7 @@ void func_80149A6C(s32 soundID, s32 keepPlaying) {
}
}
#ifdef NON_MATCHING // weird & 0xFF everywhere
#ifdef NON_EQUIVALENT // weird & 0xFF everywhere
void sfx_play_sound_with_params(s32 soundID, u8 arg1, u8 arg2, s16 arg3) {
AlternatingSoundSet* alternatingSound;

4
src/EB1170.c
View File

@ -21,7 +21,7 @@ INCLUDE_ASM(s32, "EB1170", func_80240310_EB1170);
#include "world/common/AddPlayerHandsOffset.inc.c"
// LW %LO issue.
#ifdef NON_MATCHING
#ifdef NON_EQUIVALENT
ApiStatus func_80240654_EB14B4(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
@ -37,7 +37,7 @@ ApiStatus func_80240654_EB14B4(Evt* script, s32 isInitialCall) {
}
#else
INCLUDE_ASM(s32, "EB1170", func_80240654_EB14B4);
#endif // NON_MATCHING
#endif // NON_EQUIVALENT
ApiStatus func_802406A8_EB1508(Evt* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;

2
src/EF2680.c
View File

@ -192,7 +192,7 @@ INCLUDE_ASM(s32, "EF2680", func_80242530_EF4B40);
// This should be roughly like this and is a copy from CD7350 (func_80242918_CD9BF8), but with the little extra block
// at the beginning. I have to assume that is has to roughly look like below, but I can't get it to match.
#ifdef NON_MATCHING
#ifdef NON_EQUIVALENT
ApiStatus func_8024299C_EF4FAC(Evt* script, s32 isInitialCall) {
Enemy* enemy = script->owner1.enemy;
Npc* npc = get_npc_unsafe(enemy->npcID);

10
src/a5dd0_len_114e0.c
View File

@ -905,7 +905,7 @@ void set_entity_commandlist(Entity* entity, s32* entityScript) {
}
// Ordering issues with the savedReadPos cases (4 and 5)
#ifdef NON_MATCHING
#ifdef NON_EQUIVALENT
s32 step_entity_commandlist(Entity* entity) {
s32* args = entity->scriptReadPos;
s32 ret;
@ -1282,7 +1282,7 @@ s32 entity_get_collision_flags(Entity* entity) {
INCLUDE_ASM(s32, "a5dd0_len_114e0", entity_interacts_with_current_partner);
// float bs
#ifdef NON_MATCHING
#ifdef NON_EQUIVALENT
s32 test_player_entity_aabb(Entity* entity) {
f32 temp_f4;
f32 colliderDiameter;
@ -1865,7 +1865,7 @@ void clear_game_modes(void) {
}
// weird ordering at the beginning
#ifndef NON_MATCHING
#ifndef NON_EQUIVALENT
INCLUDE_ASM(s32, "a5dd0_len_114e0", set_next_game_mode);
#else
GameMode* set_next_game_mode(GameMode* arg0) {
@ -2210,7 +2210,7 @@ void mdl_create_model(ModelBlueprint* bp, s32 arg1);
INCLUDE_ASM(s32, "a5dd0_len_114e0", mdl_create_model);
// The global here is getting optimized out because nothing is happening to it. Very weird
#ifdef NON_MATCHING
#ifdef NON_EQUIVALENT
void func_80116674(void) {
s32 i;
@ -2367,7 +2367,7 @@ void load_data_for_models(ModelNode* model, s32 romOffset, s32 size) {
}
// tiny reg swap in the first loop
#ifdef NON_MATCHING
#ifdef NON_EQUIVALENT
void load_model_transforms(ModelNode* model, ModelNode* parent, Matrix4f mdlTxMtx, s32 treeDepth) {
Matrix4f sp10;
Matrix4f sp50;

2
src/ad90_len_2880.c
View File

@ -3,7 +3,7 @@
void update_camera_mode_6(Camera*);
// types, floats, and other shtuff
#ifdef NON_MATCHING
#ifdef NON_EQUIVALENT
void update_camera_mode_6(Camera* camera) {
f32 cosBoom;
f32 cosRotation;

2
src/battle/action_cmd/power_shock.c
View File

@ -107,7 +107,7 @@ ApiStatus func_802A9210_42D120(Evt* script, s32 isInitialCall) {
return ApiStatus_DONE2;
}
#ifdef NON_MATCHING
#ifdef NON_EQUIVALENT
void func_802A9310_42D220(void) {
ActionCommandStatus* actionCommandStatus = &gActionCommandStatus;
BattleStatus* battleStatus = &gBattleStatus;

4
src/battle/item/mystery.c
View File

@ -5,7 +5,7 @@
#include "ItemRefund.inc.c"
#ifdef NON_MATCHING
#ifdef NON_EQUIVALENT
extern s32 D_802A25E4;
extern HudElement* D_802A25C8;
@ -44,7 +44,7 @@ INCLUDE_ASM(ApiStatus, "battle/item/mystery", battle_item_mystery_func_802A123C_
s32 isInitialCall);
#endif
#ifdef NON_MATCHING
#ifdef NON_EQUIVALENT
extern s32 D_802A25E4;
extern s32 D_802A25E8;

2
src/battle/item/shooting_star.c
View File

@ -3,7 +3,7 @@
#include "ItemRefund.inc.c"
#ifdef NON_MATCHING
#ifdef NON_EQUIVALENT
ApiStatus N(func_802A123C_71D9AC)(Evt* script, s32 isInitialCall) {
s32 c8 = 200;
s32 temp_s1 = 100 + rand_int(c8);

2
src/battle/item/sleepy_sheep.c
View File

@ -6,7 +6,7 @@
#include "ItemRefund.inc.c"
#ifdef NON_MATCHING
#ifdef NON_EQUIVALENT
extern Vec3f D_802A3F88;
extern s32* D_802A3F58;

4
src/battle/item/strange_cake.c
View File

@ -6,7 +6,7 @@
#include "ItemRefund.inc.c"
#ifdef NON_MATCHING
#ifdef NON_EQUIVALENT
extern s32 D_802A25E4;
extern HudElement* D_802A2DF4;
@ -44,7 +44,7 @@ ApiStatus N(func_802A123C_73153C)(Evt* script, s32 isInitialCall) {
INCLUDE_ASM(ApiStatus, "battle/item/strange_cake", battle_item_strange_cake_func_802A123C_73153C);
#endif
#ifdef NON_MATCHING
#ifdef NON_EQUIVALENT
extern s32 D_802A2DEC;
extern s32 D_802A2DF0;

2
src/battle/partner/sushie.c
View File

@ -4,7 +4,7 @@
extern f64 D_8023C060_70BD00;
extern s32 D_8023C070;
#ifdef NON_MATCHING
#ifdef NON_EQUIVALENT
ApiStatus func_80238000_707CA0(Evt* script, s32 isInitialCall) {
BattleStatus* battleStatus = &gBattleStatus;
Actor* partnerActor = battleStatus->partnerActor;

2
src/battle/star/up_and_away/7952E0.c
View File

@ -41,7 +41,7 @@ ApiStatus func_802A15B4_795894(Evt* script, s32 isInitialCall) {
return ApiStatus_BLOCK;
}
#ifdef NON_MATCHING
#ifdef NON_EQUIVALENT
ApiStatus func_802A1628_795908(Evt* script, s32 isInitialCall) {
Actor* targetActor = get_actor(get_actor(script->owner1.actorID)->targetActorID);
s32 flags = targetActor->flags;

2
src/e0b30_len_b80.c
View File

@ -231,7 +231,7 @@ void bgm_set_target_volume(s16 volume) {
}
//Data loading shenanigans
#ifdef NON_MATCHING
#ifdef NON_EQUIVALENT
void bgm_update_volume(void) {
s16* currentVolume;
s16 compareVolume;

2
src/entity/Block.c
View File

@ -203,7 +203,7 @@ void entity_MulticoinBlock_check_if_inactive(Entity* entity) {
extern s32 D_802E9E80;
#ifdef NON_MATCHING
#ifdef NON_EQUIVALENT
// tail merge + rodata
s32 entity_block_handle_collision(Entity* entity) {
u8 bVar1;

2
src/entity/Switch.c
View File

@ -518,7 +518,7 @@ INCLUDE_ASM(void, "entity/Switch", entity_shattering_init_pieces, Entity* entity
INCLUDE_ASM(void, "entity/Switch", entity_shattering_idle, Entity* entity);
#ifdef NON_MATCHING
#ifdef NON_EQUIVALENT
// display list issues
void entity_shattering_setupGfx(s32 entityIndex) {
Gfx* temp_s2;

4
src/entity/jan_iwa/E2D730.c
View File

@ -94,7 +94,7 @@ s32 func_802BB374_E2DCA4(void);
INCLUDE_ASM(s32, "entity/jan_iwa/E2D730", func_802BB374_E2DCA4);
// regalloc, play_model_animation weirdness
#ifdef NON_MATCHING
#ifdef NON_EQUIVALENT
void func_802BB648_E2DF78(Entity* entity) {
structE2D730* temp_a1_2;
structE2D730* data = (structE2D730*)entity->dataBuf;
@ -150,7 +150,7 @@ void func_802BB98C_E2E2BC(Entity* entity) {
add_vec2D_polar(&gPlayerStatus.position.x, &gPlayerStatus.position.z, data->unk_08, data->unk_04.f);
}
#ifdef NON_MATCHING // play_model_animation weirdness, branch likely in case 0
#ifdef NON_EQUIVALENT // play_model_animation weirdness, branch likely in case 0
void func_802BB9E0_E2E310(Entity* entity) {
structE2D730* data = (structE2D730*)entity->dataBuf;
PartnerActionStatus* partnerActionStatus = &gPartnerActionStatus;

2
src/entity/jan_iwa/E2E5F0.c
View File

@ -52,7 +52,7 @@ void func_802BC050_E2E980(Entity* entity) {
}
}
#ifdef NON_MATCHING // play_model_animation weirdness
#ifdef NON_EQUIVALENT // play_model_animation weirdness
void func_802BC0B8_E2E9E8(Entity* entity) {
play_model_animation(entity->virtualModelIndex, 0x60);
disable_player_input();

2
src/evt/f8f60_len_1560.c
View File

@ -269,7 +269,7 @@ ApiStatus func_802D4D88(Evt* script, s32 initialCall) {
return ApiStatus_DONE2;
}
#ifdef NON_MATCHING
#ifdef NON_EQUIVALENT
// most likely functionally equivalent, lots of issues though.
void load_path_data(s32 numVecs, f32* arg1, struct Vec3f* arg2, struct Vec3f* arg3) {
struct Vec3f* temp_s4;

2
src/fio.c
View File

@ -36,7 +36,7 @@ s32 fio_calc_header_checksum(void) {
return sum;
}
#ifdef NON_MATCHING
#ifdef NON_EQUIVALENT
s32 fio_validate_header_checksums(void) {
SaveData* saveData = D_800D95E8;

4
src/hud_element.c
View File

@ -103,7 +103,7 @@ void func_801413F8(void) {
gCameras[3].flags &= ~0x6;
}
#ifdef NON_MATCHING
#ifdef NON_EQUIVALENT
s32 create_hud_element(const HudElementAnim* anim) {
HudElement *hudElement;
s32 id;
@ -437,7 +437,7 @@ void set_hud_element_transform_rotation_pivot(s32 id, s32 dx, s32 dy) {
}
}
#ifdef NON_MATCHING
#ifdef NON_EQUIVALENT
void copy_world_hud_element_ref_to_battle(s32 worldID, s32 battleID) {
D_80157460[battleID & ~0x800].flags.as_word = D_80156F60[worldID & ~0x800].flags.as_word;
}

2
src/main.c
View File

@ -106,7 +106,7 @@ INCLUDE_ASM(s32, "main", gfxRetrace_Callback);
#endif
//gfx stuff
#ifdef NON_MATCHING
#ifdef NON_EQUIVALENT
void gfx_task_main(void) {
u16 t;
s32 temp_a0_3;

10
src/msg.c
View File

@ -197,7 +197,7 @@ void update_messages(void) {
}
}
#ifdef NON_MATCHING
#ifdef NON_EQUIVALENT
s32 _update_message(MessagePrintState* printer) {
GameStatus* temp_v0_5;
f32 temp_f4;
@ -714,7 +714,7 @@ MessagePrintState* msg_get_printer_for_msg(s32 msgID, s32* donePrintingWriteback
return _msg_get_printer_for_msg(msgID, donePrintingWriteback, 0);
}
#ifdef NON_MATCHING
#ifdef NON_EQUIVALENT
MessagePrintState* _msg_get_printer_for_msg(s32 msgID, s32* donePrintingWriteback, s32 arg2) {
if (msgID != 0) {
s8* srcBuffer = (s8*) msgID;
@ -807,7 +807,7 @@ void set_message_images(s32* images) {
}
// loop crap
#ifdef NON_MATCHING
#ifdef NON_EQUIVALENT
void set_message_msg(s32 msgID, s32 index) {
u8* buffer = msgID;
u8* mallocSpace = NULL;
@ -860,7 +860,7 @@ void close_message(MessagePrintState* msgPrintState) {
// so close, just some dumb control flow thing at the beginning
s32 msg_get_print_char_width(s32 character, s32 charset, s32 variation, f32 msgScale, s32 overrideCharWidth, u8 flags);
#ifdef NON_MATCHING
#ifdef NON_EQUIVALENT
s32 msg_get_print_char_width(s32 character, s32 charset, s32 variation, f32 msgScale, s32 overrideCharWidth, u8 flags) {
u8* charWidthTable;
f32 baseWidth;
@ -922,7 +922,7 @@ s32 get_msg_lines(s32 msgID) {
}
// some weird stacky msgIDy stuff
#ifdef NON_MATCHING
#ifdef NON_EQUIVALENT
void draw_msg(s32 msgID, s32 posX, s32 posY, s32 opacity, s32 palette, u8 style) {
s32 width;
MessagePrintState stackPrinter;

10
src/npc.c
View File

@ -440,7 +440,7 @@ INCLUDE_ASM(void, "npc", update_npcs, void);
INCLUDE_ASM(f32, "npc", npc_get_render_yaw);
#ifdef NON_MATCHING
#ifdef NON_EQUIVALENT
// float regalloc
void appendGfx_npc(Npc* npc) {
Matrix4f subroutine_arg6;
@ -1194,7 +1194,7 @@ Npc* npc_find_closest_simple(f32 x, f32 y, f32 z, f32 radius) {
}
// Needs work
#ifdef NON_MATCHING
#ifdef NON_EQUIVALENT
s32 npc_find_standing_on_entity(s32 arg0) {
s32 entityIndex = (arg0 | 0x4000);
s32 yTemp = get_entity_by_index(entityIndex)->position.y - 10.0f;
@ -1255,7 +1255,7 @@ s32 npc_get_collider_below(Npc* npc) {
return 0;
}
#ifdef NON_MATCHING
#ifdef NON_EQUIVALENT
// Rodata issue. Most likely the last function in the TU with a jumptable.
void func_8003D3BC(Npc* npc) {
s32 temp_s4 = npc->unk_98;
@ -1338,7 +1338,7 @@ void func_8003D624(Npc* npc, s32 arg1, s32 arg2, s32 arg3, s32 arg4, s32 arg5, s
func_8003D3BC(npc);
}
#ifdef NON_MATCHING
#ifdef NON_EQUIVALENT
// Rodata padding issue. Most likely belongs to a separate TU than the function above with the switch.
void func_8003D660(Npc* npc, s32 arg1) {
PartnerActionStatus* temp = &gPartnerActionStatus;
@ -1667,7 +1667,7 @@ s32 kill_encounter(Enemy* enemy) {
}
}
#ifdef NON_MATCHING
#ifdef NON_EQUIVALENT
// regalloc. s2/s3 switched
void kill_enemy(Enemy* enemy) {
EncounterStatus* encounterStatus = &gCurrentEncounter;

2
src/os/39cb0_len_100.c
View File

@ -15,7 +15,7 @@ void nuBoot(void) {
osStartThread(&D_800A4270);
}
#ifdef NON_MATCHING
#ifdef NON_EQUIVALENT
void boot_idle(void) {
nuIdleFunc = NULL;

2
src/pause/pause_items.c
View File

@ -53,7 +53,7 @@ INCLUDE_ASM(s32, "pause/pause_items", pause_items_draw_contents);
extern u32 D_802705C4;
#ifdef NON_MATCHING
#ifdef NON_EQUIVALENT
void pause_items_load_items(s32 invItems) {
PlayerData* playerData = &gPlayerData;
s32 i;

2
src/sprite.c
View File

@ -322,7 +322,7 @@ s32 func_802DDEC4(s32 arg0) {
INCLUDE_ASM(s32, "sprite", func_802DDEE4);
#ifdef NON_MATCHING
#ifdef NON_EQUIVALENT
// There's a problem here: this matches if arg6 is an s32, but the uses of this function match if it is a u16...
s32 func_802DDFF8(s32 arg0, s32 arg1, s32 arg2, s32 arg3, s32 arg4, s32 arg5, u16 arg6) {

2
src/state_logos.c
View File

@ -176,7 +176,7 @@ void state_drawUI_logos(void) {
// all sorts of issues, but I think it's mostly with D_800A0918, 1C, and 14. Those need better types so they can have
// proper array accesses. the display list macros should mostly be good
#ifdef NON_MATCHING
#ifdef NON_EQUIVALENT
void appendGfx_intro_logos(void) {
s32 i;

4
src/world/action/encounter.c
View File

@ -4,7 +4,7 @@
extern f32 D_802B6770_E27C80;
//wip - not good yet
#ifdef NON_MATCHING
#ifdef NON_EQUIVALENT
void func_802B6000_E28A30(void) {
PlayerStatus* playerStatus = &gPlayerStatus;
@ -31,7 +31,7 @@ INCLUDE_ASM(s32, "world/action/encounter", func_802B6000_E28A30);
#endif
//wip - not good yet
#ifdef NON_MATCHING
#ifdef NON_EQUIVALENT
void func_802B609C_E28ACC(void) {
PlayerStatus* playerStatus = &gPlayerStatus;

2
src/world/action/idle.c
View File

@ -80,7 +80,7 @@ void world_action_idle_update(void) {
}
}
#ifndef NON_MATCHING
#ifndef NON_EQUIVALENT
INCLUDE_ASM(void, "world/action/idle", func_802B61E4_E23444, void);
#else
void func_802B61E4_E23444(void) {

2
src/world/area_arn/arn_04/events.c
View File

@ -430,7 +430,7 @@ ApiStatus N(func_80240B94_BE4344)(Evt* script, s32 isInitialCall) {
#include "world/common/UnkNpcAIFunc23.inc.c"
#ifdef NON_MATCHING
#ifdef NON_EQUIVALENT
//second npc_raycast_down_sides call
void N(func_80241040_BE47F0)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) {
Enemy* enemy = script->owner1.enemy;

2
src/world/area_arn/arn_07/events.c
View File

@ -1165,7 +1165,7 @@ NpcGroupList N(npcGroupList_802478E8) = {
#include "world/common/UnkNpcAIFunc23.inc.c"
#ifdef NON_MATCHING
#ifdef NON_EQUIVALENT
void N(func_80240B00_BED8F0)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) {
Enemy* enemy = script->owner1.enemy;
Npc* npc = get_npc_unsafe(enemy->npcID);

2
src/world/area_dgb/dgb_01/BFD9A0.c
View File

@ -488,7 +488,7 @@ NpcAISettings N(npcAISettings_80244D24) = {
#include "world/common/UnkNpcAIFunc23.inc.c"
#ifdef NON_MATCHING
#ifdef NON_EQUIVALENT
// second npc_raycast_down_sides call
void N(func_802402D0_BFDB50)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) {
Enemy* enemy = script->owner1.enemy;

4
src/world/area_dgb/dgb_04/C36530.c
View File

@ -397,7 +397,7 @@ EvtSource N(makeEntities) = SCRIPT({
#include "world/common/UnkNpcAIFunc23.inc.c"
#ifdef NON_MATCHING
#ifdef NON_EQUIVALENT
// second npc_raycast_down_sides call
void N(func_802401B0_C366E0)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) {
Enemy* enemy = script->owner1.enemy;
@ -941,7 +941,7 @@ ApiStatus N(func_8024240C_C3893C)(Evt* script, s32 isInitialCall) {
#include "world/common/UnkFunc18.inc.c"
#ifdef NON_MATCHING
#ifdef NON_EQUIVALENT
typedef struct {
s32 unk_00[8];

2
src/world/area_dgb/dgb_08/C3FDB0.c
View File

@ -1157,7 +1157,7 @@ ApiStatus N(func_802414AC_C4125C)(Evt* script, s32 isInitialCall) {
#include "world/common/UnkNpcAIFunc23.inc.c"
#ifdef NON_MATCHING
#ifdef NON_EQUIVALENT
// second npc_raycast_down_sides call
void N(func_80241910_C416C0)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) {
Enemy* enemy = script->owner1.enemy;

2
src/world/area_dgb/dgb_09/C46BE0.c
View File

@ -975,7 +975,7 @@ ApiStatus N(func_802410D4_C47CB4)(Evt* script, s32 isInitialCall) {
#include "world/common/UnkNpcAIFunc23.inc.c"
#ifdef NON_MATCHING
#ifdef NON_EQUIVALENT
// second npc_raycast_down_sides call
void N(func_802415D4_C481B4)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) {
Enemy* enemy = script->owner1.enemy;

2
src/world/area_dro/dro_02/9694C0.c
View File

@ -91,7 +91,7 @@ MapConfig N(config) = {
};
// Extraneous END_CASE_MULTI
#ifdef NON_MATCHING
#ifdef NON_EQUIVALENT
EvtSource N(80243AF0) = SCRIPT({
GetEntryID(EVT_VAR(0));
match EVT_VAR(0) {

2
src/world/area_flo/flo_08/CAED40.c
View File

@ -15,7 +15,7 @@ ApiStatus N(func_8024003C_CAED7C)(Evt* script, s32 isInitialCall) {
#include "world/common/UnkFunc18.inc.c"
#ifdef NON_MATCHING
#ifdef NON_EQUIVALENT
typedef struct {
s32 unk_00[8];
char unk_20[0x64];

2
src/world/area_flo/flo_09/CB5320.c
View File

@ -2,7 +2,7 @@
#include "world/common/UnkNpcAIFunc23.inc.c"
#ifdef NON_MATCHING
#ifdef NON_EQUIVALENT
void N(func_802404D0_CB54D0)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) {
Enemy* enemy = script->owner1.enemy;
Npc* npc = get_npc_unsafe(enemy->npcID);

4
src/world/area_flo/flo_13/CC3850.c
View File

@ -1186,7 +1186,7 @@ NpcGroupList N(npcGroupList_80247984) = {
#include "world/common/UnkNpcAIFunc23.inc.c"
#ifdef NON_MATCHING
#ifdef NON_EQUIVALENT
void N(func_802404D0_CB54D0)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) {
Enemy* enemy = script->owner1.enemy;
Npc* npc = get_npc_unsafe(enemy->npcID);
@ -1561,7 +1561,7 @@ void N(func_80241B68_CC5378)(Evt* script, NpcAISettings* aiSettings, EnemyTerrit
}
// enemy2 is being copied to a0
#ifdef NON_MATCHING
#ifdef NON_EQUIVALENT
ApiStatus N(func_80241DB8_CC55C8)(Evt* script, s32 isInitialCall) {
Enemy* enemy = script->owner1.enemy;
Bytecode* args = script->ptrReadPos;

2
src/world/area_flo/flo_14/CCB310.c
View File

@ -589,7 +589,7 @@ ApiStatus N(func_8024046C_CCB77C)(Evt* script, s32 isInitialCall) {
}
// graphics macros
#ifdef NON_MATCHING
#ifdef NON_EQUIVALENT
s32 mdl_get_copied_gfx(s32);
void mdl_get_copied_vertices(s32, s32*, s32*, s32*);
void guMtxF2L(Matrix4f, Mtx* m);

2
src/world/area_flo/flo_14/CCBE20.c
View File

@ -310,7 +310,7 @@ EvtSource N(80245224) = SCRIPT({
#include "world/common/UnkNpcAIFunc23.inc.c"
#ifdef NON_MATCHING
#ifdef NON_EQUIVALENT
// second npc_raycast_down_sides call
void N(func_80240CC0_CCBFD0)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) {
Enemy* enemy = script->owner1.enemy;

2
src/world/area_flo/flo_16/CD1F10.c
View File

@ -422,7 +422,7 @@ ApiStatus N(func_8024011C_CD1F4C)(Evt* script, s32 isInitialCall) {
#include "world/common/UnkFunc18.inc.c"
#ifdef NON_MATCHING
#ifdef NON_EQUIVALENT
typedef struct {
s32 unk_00[8];
char unk_20[0x64];

2
src/world/area_flo/flo_16/CD2C80.c
View File

@ -343,7 +343,7 @@ EvtSource N(802451C4) = SCRIPT({
#include "world/common/UnkNpcAIFunc23.inc.c"
#ifdef NON_MATCHING
#ifdef NON_EQUIVALENT
// second npc_raycast_down_sides call
void N(func_80241000_CD2E30)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) {
Enemy* enemy = script->owner1.enemy;

4
src/world/area_flo/flo_17/CD7350.c
View File

@ -611,7 +611,7 @@ EvtSource N(makeEntities) = SCRIPT({
#include "world/common/UnkNpcAIFunc23.inc.c"
#ifdef NON_MATCHING
#ifdef NON_EQUIVALENT
// second npc_raycast_down_sides call
void N(func_80241040_BE47F0)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) {
Enemy* enemy = script->owner1.enemy;
@ -982,7 +982,7 @@ void N(func_80241A14_CD8CF4)(Evt* script, NpcAISettings* aiSettings, EnemyTerrit
}
// enemy2 is being copied to a0
#ifdef NON_MATCHING
#ifdef NON_EQUIVALENT
ApiStatus N(func_80241C64_CD8F44)(Evt* script, s32 isInitialCall) {
Enemy* enemy = script->owner1.enemy;
Bytecode* args = script->ptrReadPos;

4
src/world/area_flo/flo_18/CDC6A0.c
View File

@ -357,7 +357,7 @@ EvtSource N(802413F0) = SCRIPT({
EVT_MAP_FLAG(2) = 0;
});
#ifdef NON_MATCHING
#ifdef NON_EQUIVALENT
EvtSource N(80241ED4) = SCRIPT({
EVT_VAR(0) = 0;
EVT_VAR(1) = 0;
@ -558,7 +558,7 @@ EvtSource N(80242620) = SCRIPT({
sleep 30;
});
#ifdef NON_MATCHING
#ifdef NON_EQUIVALENT
EvtSource N(80242910) = SCRIPT({
EVT_VAR(0) = 0;
EVT_VAR(1) = 0;

2
src/world/area_flo/flo_19/CE36F0.c
View File

@ -17,7 +17,7 @@ MapConfig N(config) = {
};
// Extraneous END_CASE_MULTI
#ifdef NON_MATCHING
#ifdef NON_EQUIVALENT
EvtSource N(802409C0) = SCRIPT({
GetEntryID(EVT_VAR(0));
match EVT_VAR(0) {

2
src/world/area_flo/flo_24/CF0980.c
View File

@ -189,7 +189,7 @@ EvtSource N(updateTexturePan_802417A0) = SCRIPT({
const char N(flo_10_name_hack)[];
// BUG: missing END_SPAWN_THREADs
#ifdef NON_MATCHING
#ifdef NON_EQUIVALENT
EvtSource N(8024183C) = SCRIPT({
DisablePlayerInput(TRUE);
TranslateGroup(100, 0, 45, 0);

2
src/world/area_flo/flo_25/CF2C10.c
View File

@ -504,7 +504,7 @@ static s32 N(pad_3CD8)[] = {
#include "world/common/UnkNpcAIFunc23.inc.c"
#ifdef NON_MATCHING
#ifdef NON_EQUIVALENT
// second npc_raycast_down_sides call
void N(func_80241040_BE47F0)(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) {
Enemy* enemy = script->owner1.enemy;

2
src/world/area_kmr/kmr_10/8D84D0.c
View File

@ -30,7 +30,7 @@ ApiStatus N(func_80240000_8D84D0)(Evt* script, s32 isInitialCall) {
#include "world/common/CheckItemFlags40.inc.c"
#ifdef NON_MATCHING
#ifdef NON_EQUIVALENT
// 0x1E4 is probably a linker constant. We need to learn more about animations,
// play_model_animation, and entity->unk_14 before we can tackle this
ApiStatus func_802402BC_8D878C(Evt* script, s32 isInitialCall) {

2
src/world/area_tst/tst_04/B1B570.c
View File

@ -33,7 +33,7 @@ ApiStatus func_80240000_B1B570(Evt* script, s32 isInitialCall) {
}
// float shenanigans
#ifdef NON_MATCHING
#ifdef NON_EQUIVALENT
ApiStatus func_802400FC_B1B66C(Evt* script, s32 isInitialCall) {
Npc* npc = get_npc_safe(NPC_PARTNER);

2
src/world/partner/lakilester.c
View File

@ -344,7 +344,7 @@ void func_802BDA90_3215E0(Npc* npc) {
}
}
#ifdef NON_MATCHING
#ifdef NON_EQUIVALENT
void func_802BDDD8_321928(Npc* npc) {
PlayerStatus* playerStatus = &gPlayerStatus;
CollisionStatus* collisionStatus = &gCollisionStatus;

4
src/world/script_api/7E0E80.c
View File

@ -188,7 +188,7 @@ ApiStatus func_80280410(Evt* script, s32 isInitialCall) {
INCLUDE_ASM(ApiStatus, "world/script_api/7E0E80", ShowShopPurchaseDialog, Evt* script, s32 isInitialCall);
//dumb stuff
#ifdef NON_MATCHING
#ifdef NON_EQUIVALENT
extern s32 D_8008A680[337][2];
void shop_open_item_select_popup(s32 mode) {
@ -312,7 +312,7 @@ void shop_draw_item_desc(s32 arg0, s32 posX, s32 posY) {
}
// Problems with the struct iteration
#ifdef NON_MATCHING
#ifdef NON_EQUIVALENT
void draw_shop_items(void) {
Shop* shop = gGameStatusPtr->mapShop;
StaticInventoryItem* staticItems;