pmret/papermario
1
0
Fork 0
mirror of https://github.com/pmret/papermario.git synced 2024-11-08 12:02:30 +01:00
Code Issues Packages Projects Releases Wiki Activity
93d8c4989b
papermario/include/variables.h

340 lines
8.6 KiB
C
Raw Normal View History

headers, some decomp
2020-07-18 02:47:33 +02:00
#ifndef _VARIABLES_H_
#define _VARIABLES_H_
#include "ultra64.h"
#include "common_structs.h"
match show_coin_counter
2020-08-10 23:35:37 +02:00
#include "types.h"
lots of stuff
2020-10-13 03:28:01 +02:00
#include "macros.h"
#include enums.h in variables.h to make format script happy
2020-08-23 01:39:45 +02:00
#include "enums.h"
headers, some decomp
2020-07-18 02:47:33 +02:00
rename types (#20)
2020-08-16 05:19:00 +02:00
extern UiStatus gUIStatus;
extern PlayerData gPlayerData;
40% (#459) * cleanup * some of effect_9 * remove 1 warning * restore Bowser Slug to his former glory (behavior)
2021-10-03 19:42:38 +02:00
extern s8 gPlayerActionState;
extern s32 gPlayerAnimation;
rename types (#20)
2020-08-16 05:19:00 +02:00
extern PlayerStatus gPlayerStatus;
more
2020-09-22 05:10:53 +02:00
extern PlayerStatus* gPlayerStatusPtr;
Some more
2020-10-03 22:04:49 +02:00
extern CollisionStatus gCollisionStatus;
Fixed gGameStatusPtr (#220) * fixed gGameStatusPtr * fixed non-matching * PR comments
2021-03-23 03:25:48 +01:00
extern GameStatus gGameStatus;
extern GameStatus* gGameStatusPtr;
PR suggestions, game status macro
2020-09-14 01:03:22 +02:00
extern s32 gRandSeed;
struct renaming and trigger/entity cleanup (#623) * rename static structs to blueprint * evt structs renamed * renamed HudElementAnim to HudScript, worked on triggers * fix Trigger/TriggerBP fields and entity cleanup * entity data cleanup 1 * block * blue warp pipe Co-authored-by: HailSanta <Hail2Santa@gmail.com>
2022-01-16 14:28:09 +01:00
extern ItemData gItemTable[364];
add misc global vars from SR database
2020-08-17 14:40:21 +02:00
extern UNK_FUN_PTR(gCurrentUpdateFunction);
struct renaming and trigger/entity cleanup (#623) * rename static structs to blueprint * evt structs renamed * renamed HudElementAnim to HudScript, worked on triggers * fix Trigger/TriggerBP fields and entity cleanup * entity data cleanup 1 * block * blue warp pipe Co-authored-by: HailSanta <Hail2Santa@gmail.com>
2022-01-16 14:28:09 +01:00
extern MoveData gMoveTable[185];
more refinements on script list stuff
2020-08-14 16:25:33 +02:00
:cat:
2020-10-16 22:29:55 +02:00
extern s32 gBattleState;
Sounds and flags
2020-09-22 02:56:17 +02:00
extern BattleStatus gBattleStatus;
Miscellaneoush Decomp 323 (#323) * more images * new data file * 2 undefined syms * func_80048E34 * Shorten BattleStatus * git subrepo pull (merge) --force tools/splat subrepo: subdir: "tools/splat" merged: "2fbdbb9df8" upstream: origin: "https://github.com/ethteck/splat.git" branch: "master" commit: "2fbdbb9df8" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo" commit: "2f68596" * chop away 0x460-onward in BattleState * battle.c complete! * .
2021-07-19 13:49:30 +02:00
extern s32 D_800DC4D0;
extern s32 D_800DC4D4;
Decompile btl_check_player_defeated function (#326) * Decompile btl_check_player_defeated * Ran coverage.py * Replaced pointer arithmetic with undefined symbol * Actually did the math to use the correct undefined symbol * Address style for pull request
2021-07-21 04:58:08 +02:00
extern s32 D_800DC4D8;
Miscellaneoush Decomp 323 (#323) * more images * new data file * 2 undefined syms * func_80048E34 * Shorten BattleStatus * git subrepo pull (merge) --force tools/splat subrepo: subdir: "tools/splat" merged: "2fbdbb9df8" upstream: origin: "https://github.com/ethteck/splat.git" branch: "master" commit: "2fbdbb9df8" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo" commit: "2f68596" * chop away 0x460-onward in BattleState * battle.c complete! * .
2021-07-19 13:49:30 +02:00
extern s32 gBattleState2;
Decompile btl_check_player_defeated function (#326) * Decompile btl_check_player_defeated * Ran coverage.py * Replaced pointer arithmetic with undefined symbol * Actually did the math to use the correct undefined symbol * Address style for pull request
2021-07-21 04:58:08 +02:00
extern s32 D_800DC4E4;
Miscellaneoush Decomp 323 (#323) * more images * new data file * 2 undefined syms * func_80048E34 * Shorten BattleStatus * git subrepo pull (merge) --force tools/splat subrepo: subdir: "tools/splat" merged: "2fbdbb9df8" upstream: origin: "https://github.com/ethteck/splat.git" branch: "master" commit: "2fbdbb9df8" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo" commit: "2f68596" * chop away 0x460-onward in BattleState * battle.c complete! * .
2021-07-19 13:49:30 +02:00
extern s32 D_800DC4E8;
extern u8 gCurrentBattleSection; // in the middle of the previous var
extern u8 D_800DC4EB; // in the middle of the previous var
extern s32 D_800DC4E0;
extern s32 D_800DC4EC;
extern s32 D_800DC4F0;
extern s32 D_800DC4F4;
extern s32 D_800DC4F8;
:stars:
2020-10-17 05:47:10 +02:00
extern s32 gBattleDmaDest;
Sounds and flags
2020-09-22 02:56:17 +02:00
add ActionCommandStatus, random decomp (#358)
2021-08-06 13:00:15 +02:00
extern ActionCommandStatus gActionCommandStatus;
lots of stuff
2020-10-13 03:28:01 +02:00
extern ScriptList gWorldScriptList;
extern ScriptList gBattleScriptList;
extern ScriptList* gCurrentScriptListPtr;
more refinements on script list stuff
2020-08-14 16:25:33 +02:00
big update
2020-09-18 22:57:52 +02:00
extern s32 gNumScripts;
extern s32 D_802DAC98;
more refinements on script list stuff
2020-08-14 16:25:33 +02:00
PR fixes
2020-09-08 15:06:17 +02:00
extern s32 gScriptListCount;
Various funcs
2020-09-06 17:53:48 +02:00
lots of stuff
2020-10-13 03:28:01 +02:00
extern s32 gScriptIdList[MAX_SCRIPTS];
extern s32 gScriptIndexList[MAX_SCRIPTS];
add misc global vars from SR database
2020-08-17 14:40:21 +02:00
fixing extern
2020-10-17 23:48:43 +02:00
extern s32 gMoveScriptTable[][4];
hey rain
2020-10-16 08:09:20 +02:00
add list types and fix code that uses them
2020-10-22 02:07:00 +02:00
extern EntityList gWorldEntityList;
extern EntityList gBattleEntityList;
extern EntityList* gCurrentEntityListPtr;
add misc global vars from SR database
2020-08-17 14:40:21 +02:00
add list types and fix code that uses them
2020-10-22 02:07:00 +02:00
extern DynamicEntityList gWorldDynamicEntityList;
extern DynamicEntityList gBattleDynamicEntityList;
extern DynamicEntityList* gCurrentDynamicEntityListPtr;
ASM macro fix, decomp of many
2020-09-25 23:18:09 +02:00
add list types and fix code that uses them
2020-10-22 02:07:00 +02:00
extern NpcList gWorldNpcList;
extern NpcList gBattleNpcList;
extern NpcList* gCurrentNpcListPtr;
add misc global vars from SR database
2020-08-17 14:40:21 +02:00
add list types and fix code that uses them
2020-10-22 02:07:00 +02:00
extern ShadowList gWorldShadowList;
extern ShadowList gBattleShadowList;
extern ShadowList* gCurrentShadowListPtr;
add misc global vars from SR database
2020-08-17 14:40:21 +02:00
Fixing changes for PR: npcPtr to npc, spacing on if, removed else block in EnableNpcShadow that wasn't needed
2020-08-20 00:48:15 +02:00
extern Camera gCameras[4];
Various funcs
2020-09-06 17:53:48 +02:00
extern s32 gCurrentCameraID;
Fixing changes for PR: npcPtr to npc, spacing on if, removed else block in EnableNpcShadow that wasn't needed
2020-08-20 00:48:15 +02:00
Various meta work and some decomp (#184) * some * DeadUnkTexturePanFunc * DeadUnkTexturePanFunc2 * move guOrthoF to os * up * git subrepo pull tools/splat subrepo: subdir: "tools/splat" merged: "ae2cce951d" upstream: origin: "https://github.com/ethteck/splat.git" branch: "master" commit: "ae2cce951d" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo" commit: "2f68596" * Updating bin dir * git subrepo pull tools/splat subrepo: subdir: "tools/splat" merged: "5517f520e4" upstream: origin: "https://github.com/ethteck/splat.git" branch: "master" commit: "5517f520e4" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo" commit: "2f68596" * git subrepo pull tools/splat subrepo: subdir: "tools/splat" merged: "fe48dc3b3a" upstream: origin: "https://github.com/ethteck/splat.git" branch: "master" commit: "fe48dc3b3a" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo" commit: "2f68596" * revert garbage * :OK: * git subrepo pull tools/splat subrepo: subdir: "tools/splat" merged: "8c86e4b95b" upstream: origin: "https://github.com/ethteck/splat.git" branch: "master" commit: "8c86e4b95b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo" commit: "2f68596" * data migration * 3 * .rodata migration and a buncha funcs * 2 mo * some decomp, a file boundary fix * cleanup * UnkNpaAIFunc13s * Update symbol_addrs * remove sublist * deleted asm * data fix * fix data * wtf?! * git subrepo pull tools/splat subrepo: subdir: "tools/splat" merged: "88ce6b44a6" upstream: origin: "https://github.com/ethteck/splat.git" branch: "master" commit: "88ce6b44a6" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo" commit: "2f68596" * symbol_addrs update * blah * PR comments
2021-02-16 11:32:34 +01:00
extern CollisionData gCollisionData;
match functions in ebd0_len_6a0 & code_dc470_len_14c0
2020-08-12 20:48:51 +02:00
extern s8 D_800A0900;
Santas workshop (#670) * initial name changes * hud_element function names * missing player data fields * entity cleanup * missed a few things + starting action states * some world partner cleanup * idle/walk/hammer + peach cooking stuff * clean Co-authored-by: HailSanta <Hail2Santa@gmail.com> Co-authored-by: Ethan Roseman <ethteck@gmail.com>
2022-03-26 12:47:10 +01:00
extern f32 GravityParamsStartFall[];
Snibblets, Tidbits, and Morsels (#188) * fixing segment * redoing subtree * git subrepo clone https://github.com/ethteck/splat.git tools/splat subrepo: subdir: "tools/splat" merged: "99cf514297" upstream: origin: "https://github.com/ethteck/splat.git" branch: "master" commit: "99cf514297" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo" commit: "2f68596" * fix symbol_addrs * sweet victory * reformat collision_main_lateral.s * Lots of matches, fixed diff.py issue, improved coverage.py * some more * update symbol_addrs * git subrepo pull tools/splat subrepo: subdir: "tools/splat" merged: "c46026725a" upstream: origin: "https://github.com/ethteck/splat.git" branch: "master" commit: "c46026725a" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo" commit: "2f68596" * update symbol_addrs * fix disasm * 2 mo * Jenkinsfile * PR comments
2021-02-18 12:54:07 +01:00
extern s16 D_800F7B80;
Various funcs
2020-09-06 17:53:48 +02:00
extern EncounterStatus gCurrentEncounter;
Effects, includes (#589) * effect_13 * effect_14 * most of effect_15 * clean, standardize effects * fx_16 wip * UnkNpcAIFunc35 * includes * UnkPosFunc2 * UnkNpcAIFunc36 * PR comments
2021-12-30 06:14:55 +01:00
extern u8* D_801512F0;
more goods
2020-09-27 03:02:29 +02:00
extern s16 D_80151308;
extern s32 D_80151310;
match some functions in code_1a1f0_len_5390.c
2020-12-03 09:07:39 +01:00
Snibblets, Tidbits, and Morsels (#188) * fixing segment * redoing subtree * git subrepo clone https://github.com/ethteck/splat.git tools/splat subrepo: subdir: "tools/splat" merged: "99cf514297" upstream: origin: "https://github.com/ethteck/splat.git" branch: "master" commit: "99cf514297" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo" commit: "2f68596" * fix symbol_addrs * sweet victory * reformat collision_main_lateral.s * Lots of matches, fixed diff.py issue, improved coverage.py * some more * update symbol_addrs * git subrepo pull tools/splat subrepo: subdir: "tools/splat" merged: "c46026725a" upstream: origin: "https://github.com/ethteck/splat.git" branch: "master" commit: "c46026725a" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo" commit: "2f68596" * update symbol_addrs * fix disasm * 2 mo * Jenkinsfile * PR comments
2021-02-18 12:54:07 +01:00
extern s32 D_8010C92C;
Goods and Services (misc decomp PR from eth number 335) (#629) * an end func * 2nd segment bss file added * hud_element work * some renaming, set_hud_element_scale * 2 hud_element funcz * remove more unneeded undefined_syms * bss 3, PR comments * fx_134 * func_80200080 * 4 funx * fix shtuff * a func * create_actor * func_80263064 * initialize_battle, some stuff, and cleanup * clean * NL
2022-01-20 14:08:24 +01:00
extern s32 D_8010C950;
Odds and Ends (#189) * fixing segment * redoing subtree * git subrepo clone https://github.com/ethteck/splat.git tools/splat subrepo: subdir: "tools/splat" merged: "99cf514297" upstream: origin: "https://github.com/ethteck/splat.git" branch: "master" commit: "99cf514297" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo" commit: "2f68596" * fix symbol_addrs * sweet victory * reformat collision_main_lateral.s * Lots of matches, fixed diff.py issue, improved coverage.py * some more * update symbol_addrs * git subrepo pull tools/splat subrepo: subdir: "tools/splat" merged: "c46026725a" upstream: origin: "https://github.com/ethteck/splat.git" branch: "master" commit: "c46026725a" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo" commit: "2f68596" * update symbol_addrs * fix disasm * 2 mo * Jenkinsfile * PR comments * check_input_status_menu, removing some macros * a few funcs * assist updates * UnkAlphaFunc * UnkPartnerPosFuncs * Deleting stuff * oopz * dead_syms.txt, UnkNpcAIFunc14 * update symbol_addrs * cleanup * symbol_addrs * cleanup
2021-02-20 15:41:30 +01:00
extern s16 D_8010CD00;
match clear_player_data
2020-08-09 06:20:53 +02:00
extern s16 D_8010CD10;
extern s16 D_8010CD12;
ASM macro fix, decomp of many
2020-09-25 23:18:09 +02:00
extern s32 D_8010CD20;
match functions in ebd0_len_6a0 & code_dc470_len_14c0
2020-08-12 20:48:51 +02:00
extern s32 D_801595A0;
Various dompin (#672) * partner funcs * land.c * filemenu_update * 190A10.c * hammer.c dun * prog rock * various funcs * moving * update_item_entities * filemenu_yesno_handle_input * cleanin * sweeping * PR comments
2022-03-30 14:07:13 +02:00
extern Struct8015A578 D_8015A578;
File menu & more (#658)
2022-03-10 10:55:38 +01:00
rename types (#20)
2020-08-16 05:19:00 +02:00
extern BackgroundHeader gBackgroundImage;
headers, some decomp
2020-07-18 02:47:33 +02:00
Tidying and msg.c work (#311) * undefined syms cleanup * moving all remaining undefined funcs to dead_syms (as they're dead) * Rename and update MessagePrintState * msg wip * B9D60 -> msg * msg stuff * . * PR stuff
2021-07-13 15:43:14 +02:00
extern MessagePrintState* gCurrentPrintContext;
More decomp + coverage fix
2020-09-26 03:51:54 +02:00
extern s32 D_802DB264;
Tidying and msg.c work (#311) * undefined syms cleanup * moving all remaining undefined funcs to dead_syms (as they're dead) * Rename and update MessagePrintState * msg wip * B9D60 -> msg * msg stuff * . * PR stuff
2021-07-13 15:43:14 +02:00
extern MessagePrintState* D_802DB268;
Match CloseChoice, CancelMessage, CancelMessageAndBlock. Added gCurrentPrintContext and D_802DB268 (related)
2020-08-15 23:51:44 +02:00
struct renaming and trigger/entity cleanup (#623) * rename static structs to blueprint * evt structs renamed * renamed HudElementAnim to HudScript, worked on triggers * fix Trigger/TriggerBP fields and entity cleanup * entity data cleanup 1 * block * blue warp pipe Co-authored-by: HailSanta <Hail2Santa@gmail.com>
2022-01-16 14:28:09 +01:00
extern ShadowBlueprint CircularShadowA;
extern ShadowBlueprint CircularShadowB;
extern ShadowBlueprint SquareShadow;
Santas workshop (#670) * initial name changes * hud_element function names * missing player data fields * entity cleanup * missed a few things + starting action states * some world partner cleanup * idle/walk/hammer + peach cooking stuff * clean Co-authored-by: HailSanta <Hail2Santa@gmail.com> Co-authored-by: Ethan Roseman <ethteck@gmail.com>
2022-03-26 12:47:10 +01:00
extern s32 SaveBlockTutorialPrinterClosed;
extern s32 SaveBlockResultPrinterClosed;
extern MessagePrintState* SaveBlockTutorialPrinter;
extern MessagePrintState* SaveBlockResultPrinter;
cleanup
2020-11-02 05:31:33 +01:00
extern s32 D_802E99DC;
Santas workshop (#670) * initial name changes * hud_element function names * missing player data fields * entity cleanup * missed a few things + starting action states * some world partner cleanup * idle/walk/hammer + peach cooking stuff * clean Co-authored-by: HailSanta <Hail2Santa@gmail.com> Co-authored-by: Ethan Roseman <ethteck@gmail.com>
2022-03-26 12:47:10 +01:00
extern Entity* SwitchToLink;
struct renaming and trigger/entity cleanup (#623) * rename static structs to blueprint * evt structs renamed * renamed HudElementAnim to HudScript, worked on triggers * fix Trigger/TriggerBP fields and entity cleanup * entity data cleanup 1 * block * blue warp pipe Co-authored-by: HailSanta <Hail2Santa@gmail.com>
2022-01-16 14:28:09 +01:00
extern s32 CreateEntityVarArgBuffer[3]; // not size 3
decomp more, delete as for matched funcs
2020-11-18 06:32:18 +01:00
Santas workshop (#670) * initial name changes * hud_element function names * missing player data fields * entity cleanup * missed a few things + starting action states * some world partner cleanup * idle/walk/hammer + peach cooking stuff * clean Co-authored-by: HailSanta <Hail2Santa@gmail.com> Co-authored-by: Ethan Roseman <ethteck@gmail.com>
2022-03-26 12:47:10 +01:00
extern f32 DefaultMoveSpeeds[4];
3 down in 7B440 and 77480 (#260) * delete dgb data * 2 * 1 mo * removing macro * removing comment * meowp
2021-04-17 13:46:17 +02:00
camera functions and zone collision data (#671) * match 3 functions * match 4 camera functions * fixes * camSettings type enum * PR suggestions
2022-03-28 11:29:47 +02:00
extern CollisionData gZoneCollisionData;
Mass function rename from Star Rod + a couple funcs (#298) * . * yaml update * git subrepo pull --force tools/splat subrepo: subdir: "tools/splat" merged: "cd690f725d" upstream: origin: "https://github.com/ethteck/splat.git" branch: "master" commit: "cd690f725d" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo" commit: "2f68596" * separate main bss syms * renames and one match * SR symbol rename * fix symbol_addrs * git subrepo pull tools/splat subrepo: subdir: "tools/splat" merged: "5fa8aa24ca" upstream: origin: "https://github.com/ethteck/splat.git" branch: "master" commit: "5fa8aa24ca" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo" commit: "2f68596" * remove old artifacts
2021-06-30 04:27:12 +02:00
SetNpcFlagBits
2020-11-08 05:33:15 +01:00
// Animation related
ASM update and types
2020-11-08 21:40:26 +01:00
extern AnimatedMeshList* gCurrentAnimMeshListPtr;
SetNpcFlagBits
2020-11-08 05:33:15 +01:00
extern PartnerAnimations gPartnerAnimations[12];
ASM update and types
2020-11-08 21:40:26 +01:00
extern AnimatedModelList gBattleMeshAnimationList;
extern AnimatedModelList gWorldMeshAnimationList;
extern AnimatedModelList* gCurrentMeshAnimationListPtr;
SetNpcFlagBits
2020-11-08 05:33:15 +01:00
Cleanup, starting trigger functions
2020-08-13 07:03:47 +02:00
// Triggers
resolve clang-tidy errors
2020-08-19 02:23:52 +02:00
extern s16 gTriggerCount;
Trigger funcs (#405) * remove old tools, fix warnings * almost match si_handle_print_debug_var * si_goto_end_loop and warnings * is_trigger_bound and create_trigger * Cleanup + matching 2 non-matchings * update_triggers (trigger.c complete) * fix warnings * PR comments, m2ctx.py fix
2021-08-29 15:44:17 +02:00
extern TriggerList wTriggerList;
extern TriggerList bTriggerList;
add list types and fix code that uses them
2020-10-22 02:07:00 +02:00
extern TriggerList* gCurrentTriggerListPtr;
Cleanup, starting trigger functions
2020-08-13 07:03:47 +02:00
near-match begin_state_intro
2020-10-15 00:22:43 +02:00
// Map transition data. Should probably be a struct
FX data/funcs, camera funcs, state funcs (#364) * fx table work * fx data * blah * render_effects_UI * split out effects.c * battle state menu functions * render_frame * clean * clean * 4 camera funcs * state_step_end_battle & symbol names * state_file_select done * 111f0 done * . * PR comments
2021-08-16 20:14:58 +02:00
extern s16 gMapTransitionAlpha;
Decomp funcs in code_182B30.c, add some structs to common_structs.h (#216) * decomp funcs in code_182B30.c * decomp funcs in code_10400_len_d30.c * decomp funcs in code_13870_len_6980.c and code_fee30_len_2d60.c * resolves issues on pr
2021-03-21 13:16:00 +01:00
extern s8 D_800A0930;
extern s8 D_800A0931;
extern s16 D_800A0932[1];
near-match begin_state_intro
2020-10-15 00:22:43 +02:00
extern s16 D_800A0942;
Added symbols and restructured game_status a little bit
2020-08-11 01:20:30 +02:00
extern s16 D_800A0944;
Various decomp
2020-11-06 01:30:17 +01:00
extern s16 D_800A0946;
extern s16 D_800A0948;
near-match begin_state_intro
2020-10-15 00:22:43 +02:00
extern s16 D_800A0954;
extern s16 D_800A0956;
extern s16 D_800A0958;
extern s16 D_800A095A;
extern u8 D_800A095B;
extern s16 D_800A095C;
extern u8 D_800A095D;
extern s16 D_800A095E;
extern u8 D_800A095F;
extern s32 D_800A0960;
extern s32 D_800A0964;
Decomp funcs in code_182B30.c, add some structs to common_structs.h (#216) * decomp funcs in code_182B30.c * decomp funcs in code_10400_len_d30.c * decomp funcs in code_13870_len_6980.c and code_fee30_len_2d60.c * resolves issues on pr
2021-03-21 13:16:00 +01:00
extern s8 D_800A0B94;
decomp func_8003F4CC and BindIdle (also decomp func_8003F414 but it shares a name with another function causing issues, so it's commented out)
2020-12-03 15:11:20 +01:00
extern s16 D_800A0BB8;
A handful of script functions. Commented out ones that aren't fully matching yet
2020-08-11 23:38:21 +02:00
calc_item_damage_enemy and some others (#641) * SFX funcs, configure fix * the actual rename (oops) * 3 sprite funcs * 2 funcz * calc_item_damage_enemy and cleanup, others * cleanup * Warnings * clean fx_api * match npc_raycast_general and name npc_collision.c * PR comment
2022-02-08 19:33:05 +01:00
extern SpriteShadingProfile* D_801512B0;
Appetizer sampler (#547) * 2 fold funcs * func_8013B1B0 * cleanup & naming * more formatting * cleanup * progress & filemenu stuff * 2 * func_8013CFA8 * fold_load_gfx (thanks Wiseguy) * update_encounters_pre_battle * 3 mdl funcs * more model funcs * cd180 funcs * progrezz * 3 cam funcs * more * 1 more * eob30 progress * sfx_play_sound_at_position & sound enum cleanup * cleanup * cleanup2 * PR comments
2021-12-13 10:27:28 +01:00
extern SpriteShadingProfile* D_80151328;
Decomp some pause screen map functions (#412) * decomp pause screen map functions * pull upstream and merge * change get_variable calls to evt_get_variable * style fixes for map pause screen * close match on pause_map_init and style in map pause functions * small pause_map_cleanup change * Matches (thanks Josh), structs, symbols, cleanup * cleanup * Symbol / struct refresh * further cleanup * data/rodata disasm, rodata migration, cleanup * PR comments * map message ids Co-authored-by: Rain <rainmachus@gmail.com>
2021-09-02 13:17:40 +02:00
extern Window gWindows[64];
UI Panels
2020-11-12 19:38:17 +01:00
Rodata migration + other goodz (#208) * rodata migration * a5dd0 rodata migration * e79b0 rodata migration * more rodata migration * more migration * goombario rodata * SetNpcCollision32 * removing old stuff * oops * UnkBackgroundFunc * removing unnecessary files * UnkBackgroundFunc2 * UnkStarFuncs * . * misc star decomp and AddHP * oops * AddFP * fix offset, update symbol_addrs * . * git subrepo pull tools/splat subrepo: subdir: "tools/splat" merged: "f602284b3e" upstream: origin: "https://github.com/ethteck/splat.git" branch: "master" commit: "f602284b3e" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo" commit: "2f68596" * re-disasm * fix effect disasm * oops * fix lullaby
2021-03-12 16:53:11 +01:00
extern s32 D_802A3838;
Various funcs
2020-09-06 17:53:48 +02:00
extern s32 gGameState;
[WIP] Work on npc.c (#295) * formatting * format + misc work * lots of work on npc.c * PR comments, asm delet + other misc fixes * missed one * temporarily remove cleanup step for testing * test fix for splat * test * o2 * o0 * fix Yay0decompress.c bug * debug logging * stuff * stuff2 * restore stuff * more PR comments and some general cleanup * NPC flags + improve match + misc Co-authored-by: Ethan Roseman <ethteck@gmail.com>
2021-06-15 10:05:16 +02:00
extern s16 gNpcCount;
Misc decomp (#215) * Misc early code decomp * Make expected script * fix m2ctx * gOverrideFlags & set/unset macros * update symbol addrs * Cleanup and PR comments * oops
2021-03-19 11:25:14 +01:00
extern s32 gOverrideFlags;
Npc funcs, fio.c, and others (#674) * filemenu_choose_name_handle_input * filemenu_choose_name_init * filemenu_main_handle_input * update symbol_addrs * filemenu_draw_contents_copy_arrow * cleanup * dusting * npc funcs * fio.c finished * Cleanup * warnings * Cleanup + SaveDataHeader struct * re-add decl
2022-04-05 14:53:40 +02:00
extern s16 D_8009A6A0;
extern s16 D_8009A6A2;
extern s16 D_8009A6A4;
extern s16 D_8009A6A6;
Handful of new functions matched. Added items enum, other misc changes
2020-08-12 22:53:01 +02:00
f270, world, and more (#246) * 415D90 decomp * code_415D90 rodata migration * data migration, decomp * . * . * . * 4 funcs * non-matching * audio part 1 * audio work * end of snd * update_symbol_addrs * . * :chicken: * . * sfx func names * bgm * more audio * . * a few audio funcs * update section length * git subrepo pull --force tools/splat subrepo: subdir: "tools/splat" merged: "82ff308caf" upstream: origin: "https://github.com/ethteck/splat.git" branch: "master" commit: "82ff308caf" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo" commit: "2f68596" * git subrepo pull --force tools/splat subrepo: subdir: "tools/splat" merged: "4e9d3cdf85" upstream: origin: "https://github.com/ethteck/splat.git" branch: "master" commit: "4e9d3cdf85" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo" commit: "2f68596" * misc-decomp power * sound * 4 mo * more changes * . * some f270 * git subrepo pull --force tools/splat subrepo: subdir: "tools/splat" merged: "1c8ff4ec3f" upstream: origin: "https://github.com/ethteck/splat.git" branch: "master" commit: "1c8ff4ec3f" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo" commit: "2f68596" * git subrepo pull --force tools/splat subrepo: subdir: "tools/splat" merged: "f0633ecdbc" upstream: origin: "https://github.com/ethteck/splat.git" branch: "master" commit: "f0633ecdbc" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo" commit: "2f68596" * fix is_logo image size * . * git subrepo pull tools/splat subrepo: subdir: "tools/splat" merged: "4be92a4786" upstream: origin: "https://github.com/ethteck/splat.git" branch: "master" commit: "4be92a4786" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo" commit: "2f68596" * state_step_pause * almost * fixing symbol_addrs and disasm * update symbol_addrs * . * fix Matrix4f usages * . * . * update_symbol_addrs * fixes * I hate bitfields * load_map_by_IDs * cleanup * state_step_logos * more cleanup * . * splat * PR comments
2021-04-01 20:00:29 +02:00
extern s32* D_800A0914;
extern s32* D_800A0918;
extern s32* D_800A091C;
extern s8 D_800A0920;
extern s32 D_800A0924;
extern s8 D_800A0921;
extern s16 D_800A0922;
FX data/funcs, camera funcs, state funcs (#364) * fx table work * fx data * blah * render_effects_UI * split out effects.c * battle state menu functions * render_frame * clean * clean * 4 camera funcs * state_step_end_battle & symbol names * state_file_select done * 111f0 done * . * PR comments
2021-08-16 20:14:58 +02:00
extern s32 wMapTexName;
extern char* wMapHitName;
extern s32 wMapShapeName;
f270, world, and more (#246) * 415D90 decomp * code_415D90 rodata migration * data migration, decomp * . * . * . * 4 funcs * non-matching * audio part 1 * audio work * end of snd * update_symbol_addrs * . * :chicken: * . * sfx func names * bgm * more audio * . * a few audio funcs * update section length * git subrepo pull --force tools/splat subrepo: subdir: "tools/splat" merged: "82ff308caf" upstream: origin: "https://github.com/ethteck/splat.git" branch: "master" commit: "82ff308caf" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo" commit: "2f68596" * git subrepo pull --force tools/splat subrepo: subdir: "tools/splat" merged: "4e9d3cdf85" upstream: origin: "https://github.com/ethteck/splat.git" branch: "master" commit: "4e9d3cdf85" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo" commit: "2f68596" * misc-decomp power * sound * 4 mo * more changes * . * some f270 * git subrepo pull --force tools/splat subrepo: subdir: "tools/splat" merged: "1c8ff4ec3f" upstream: origin: "https://github.com/ethteck/splat.git" branch: "master" commit: "1c8ff4ec3f" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo" commit: "2f68596" * git subrepo pull --force tools/splat subrepo: subdir: "tools/splat" merged: "f0633ecdbc" upstream: origin: "https://github.com/ethteck/splat.git" branch: "master" commit: "f0633ecdbc" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo" commit: "2f68596" * fix is_logo image size * . * git subrepo pull tools/splat subrepo: subdir: "tools/splat" merged: "4be92a4786" upstream: origin: "https://github.com/ethteck/splat.git" branch: "master" commit: "4be92a4786" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo" commit: "2f68596" * state_step_pause * almost * fixing symbol_addrs and disasm * update symbol_addrs * . * fix Matrix4f usages * . * . * update_symbol_addrs * fixes * I hate bitfields * load_map_by_IDs * cleanup * state_step_logos * more cleanup * . * splat * PR comments
2021-04-01 20:00:29 +02:00
extern s32* D_80210000;
Crystal Palace reflection include & name some segments (#274) * src/evt section * evt data * entity * update entity func names * names * reflection wip * lol * ~pra_01 * nabbed em * match func_80240500_D4D540 * match func_802402F0_D4D330 * last pra include func git add -A * gCurrentCamID * reflection.inc.c for pra_01 * reflection.inc.c * rm * match a few in tst_11 * use npc flags Co-authored-by: Ethan Roseman <ethteck@gmail.com>
2021-04-22 05:19:31 +02:00
extern u8 D_802D9D70; // player alpha1 copy?
extern u8 D_802D9D71; // player alpha2 copy?
Tidying and Shops (#282) * render_curtains * cleanup * more cleanup * cleanup * update symbol addrs * asm update * shop progress * more cleanup * update symbol_addrs * asm cleanup * . * new data splits * rename stuff * . * . * PR stuff
2021-04-26 19:47:38 +02:00
extern DisplayContext D_80164000[];
Crystal Palace reflection include & name some segments (#274) * src/evt section * evt data * entity * update entity func names * names * reflection wip * lol * ~pra_01 * nabbed em * match func_80240500_D4D540 * match func_802402F0_D4D330 * last pra include func git add -A * gCurrentCamID * reflection.inc.c for pra_01 * reflection.inc.c * rm * match a few in tst_11 * use npc flags Co-authored-by: Ethan Roseman <ethteck@gmail.com>
2021-04-22 05:19:31 +02:00
File menu & more (#658)
2022-03-10 10:55:38 +01:00
extern WindowStyle gWindowStyles[];
Tidying and msg.c work (#311) * undefined syms cleanup * moving all remaining undefined funcs to dead_syms (as they're dead) * Rename and update MessagePrintState * msg wip * B9D60 -> msg * msg stuff * . * PR stuff
2021-07-13 15:43:14 +02:00
extern MessagePrintState gMessagePrinters[3];
Crystal Palace reflection include & name some segments (#274) * src/evt section * evt data * entity * update entity func names * names * reflection wip * lol * ~pra_01 * nabbed em * match func_80240500_D4D540 * match func_802402F0_D4D330 * last pra include func git add -A * gCurrentCamID * reflection.inc.c for pra_01 * reflection.inc.c * rm * match a few in tst_11 * use npc flags Co-authored-by: Ethan Roseman <ethteck@gmail.com>
2021-04-22 05:19:31 +02:00
extern f32 gCurtainScale;
extern f32 gCurtainScaleGoal;
extern f32 gCurtainFade;
extern f32 gCurtainFadeGoal;
extern UNK_FUN_PTR(gCurtainDrawCallback);
f270, world, and more (#246) * 415D90 decomp * code_415D90 rodata migration * data migration, decomp * . * . * . * 4 funcs * non-matching * audio part 1 * audio work * end of snd * update_symbol_addrs * . * :chicken: * . * sfx func names * bgm * more audio * . * a few audio funcs * update section length * git subrepo pull --force tools/splat subrepo: subdir: "tools/splat" merged: "82ff308caf" upstream: origin: "https://github.com/ethteck/splat.git" branch: "master" commit: "82ff308caf" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo" commit: "2f68596" * git subrepo pull --force tools/splat subrepo: subdir: "tools/splat" merged: "4e9d3cdf85" upstream: origin: "https://github.com/ethteck/splat.git" branch: "master" commit: "4e9d3cdf85" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo" commit: "2f68596" * misc-decomp power * sound * 4 mo * more changes * . * some f270 * git subrepo pull --force tools/splat subrepo: subdir: "tools/splat" merged: "1c8ff4ec3f" upstream: origin: "https://github.com/ethteck/splat.git" branch: "master" commit: "1c8ff4ec3f" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo" commit: "2f68596" * git subrepo pull --force tools/splat subrepo: subdir: "tools/splat" merged: "f0633ecdbc" upstream: origin: "https://github.com/ethteck/splat.git" branch: "master" commit: "f0633ecdbc" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo" commit: "2f68596" * fix is_logo image size * . * git subrepo pull tools/splat subrepo: subdir: "tools/splat" merged: "4be92a4786" upstream: origin: "https://github.com/ethteck/splat.git" branch: "master" commit: "4be92a4786" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo" commit: "2f68596" * state_step_pause * almost * fixing symbol_addrs and disasm * update symbol_addrs * . * fix Matrix4f usages * . * . * update_symbol_addrs * fixes * I hate bitfields * load_map_by_IDs * cleanup * state_step_logos * more cleanup * . * splat * PR comments
2021-04-01 20:00:29 +02:00
A handful of script functions. Commented out ones that aren't fully matching yet
2020-08-11 23:38:21 +02:00
extern s16 gCurrentDoorSoundsSet;
saving for later
2020-10-02 08:07:54 +02:00
extern s32 D_800D9620;
match show_coin_counter
2020-08-10 23:35:37 +02:00
extern UNK_TYPE D_800E92D8;
match all of code_dd930_len_lc0, add commented mostly matching code for update_coin_counter
2020-08-12 03:01:33 +02:00
extern UNK_TYPE D_80147574;
state_title_screen & camera funcs (#650) * state_title_screen funcz * camz * line * PR comments and matches (thanks Unnunu & Wiseguy) * enumz * gloop
2022-02-19 15:39:34 +01:00
extern s8 D_8014C248[];
Most of player_api and 18F340 (#296) * bss * 3 audios * d5a50 stuff * some icon funcs * get_icon_render_pos * PlayerLandJump * func_80248170 * cleanup * splat update prep * git subrepo pull --force tools/splat subrepo: subdir: "tools/splat" merged: "81c4b35b89" upstream: origin: "https://github.com/ethteck/splat.git" branch: "master" commit: "81c4b35b89" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * git subrepo pull tools/splat subrepo: subdir: "tools/splat" merged: "9b791a654a" upstream: origin: "https://github.com/ethteck/splat.git" branch: "master" commit: "9b791a654a" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * git subrepo pull tools/splat subrepo: subdir: "tools/splat" merged: "2cf2a5e5d8" upstream: origin: "https://github.com/ethteck/splat.git" branch: "master" commit: "2cf2a5e5d8" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * fix loop in PaperMarioNpcSprites * git subrepo pull tools/splat subrepo: subdir: "tools/splat" merged: "2fab217750" upstream: origin: "https://github.com/ethteck/splat.git" branch: "master" commit: "2fab217750" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo" commit: "2f68596" * add sha1 to yaml * git subrepo pull tools/splat subrepo: subdir: "tools/splat" merged: "426b08200d" upstream: origin: "https://github.com/ethteck/splat.git" branch: "master" commit: "426b08200d" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo" commit: "2f68596" * varTable -> union :( + player_api funcs * 6 more * 4 more * 5 mo * 1 mo * 1 mo 2 * 5 mo * player_jump * 3 mo * some 18F340 * 6 more * 6 mo * nm * 1 * 1 more * some PR feedback * symbol addr update * UnsetCamera0Flag1000 * SetPlayerSpriteSet2 * action 18 * encounter + a smol hammer * git subrepo pull (merge) tools/splat subrepo: subdir: "tools/splat" merged: "8cf482fe57" upstream: origin: "https://github.com/ethteck/splat.git" branch: "master" commit: "4c0a93eaed" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo" commit: "2f68596" * 3 and cleanup * undo yucky union * PR comments * get_enemy_safe * cleanup * move VirtualEntity * attempt to fix doxygen
2021-06-16 11:52:15 +02:00
Match check_for_ispy and check_for_pulse_stone (#544) * Match check_for_ispy * Delete check_for_ispy.s * Match check_for_pulse_stone * Delete check_for_pulse_stone.s * Update 77480.c * Update 77480.c * Update variables.h * Update variables.h
2021-12-04 15:23:12 +01:00
extern UNK_FUN_PTR(D_8010C920);
Match 2 funcs in 77480.c (#630) * update_player_blink * Delete update_player_blink.s * Delete check_for_conversation_prompt.s * Match check_for_conversation_prompt * Update variables.h * Update 77480.c * Warnings
2022-01-21 04:46:12 +01:00
extern UNK_FUN_PTR(D_8010C940);
Santas workshop (#670) * initial name changes * hud_element function names * missing player data fields * entity cleanup * missed a few things + starting action states * some world partner cleanup * idle/walk/hammer + peach cooking stuff * clean Co-authored-by: HailSanta <Hail2Santa@gmail.com> Co-authored-by: Ethan Roseman <ethteck@gmail.com>
2022-03-26 12:47:10 +01:00
extern Entity* TweesterTouchingPartner;
Match check_for_interactables (#553) * Match check_for_interactables * Delete check_for_interactables.s * Update enums.h * unk_C8 -> Npc* * Update 77480.c * Update 77480.c * Update 77480.c * Update 77480.c * Update 77480.c (#7) * Update functions.h * Merge branch 'master' of https://github.com/pmret/papermario into arn * Fix build. * Update src/77480.c Co-authored-by: Alex Bates <hi@imalex.xyz> * Comments Co-authored-by: Alex Bates <hi@imalex.xyz>
2021-12-18 05:04:54 +01:00
extern UNK_FUN_PTR(D_8010C958);
Most of player_api and 18F340 (#296) * bss * 3 audios * d5a50 stuff * some icon funcs * get_icon_render_pos * PlayerLandJump * func_80248170 * cleanup * splat update prep * git subrepo pull --force tools/splat subrepo: subdir: "tools/splat" merged: "81c4b35b89" upstream: origin: "https://github.com/ethteck/splat.git" branch: "master" commit: "81c4b35b89" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * git subrepo pull tools/splat subrepo: subdir: "tools/splat" merged: "9b791a654a" upstream: origin: "https://github.com/ethteck/splat.git" branch: "master" commit: "9b791a654a" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * git subrepo pull tools/splat subrepo: subdir: "tools/splat" merged: "2cf2a5e5d8" upstream: origin: "https://github.com/ethteck/splat.git" branch: "master" commit: "2cf2a5e5d8" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * fix loop in PaperMarioNpcSprites * git subrepo pull tools/splat subrepo: subdir: "tools/splat" merged: "2fab217750" upstream: origin: "https://github.com/ethteck/splat.git" branch: "master" commit: "2fab217750" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo" commit: "2f68596" * add sha1 to yaml * git subrepo pull tools/splat subrepo: subdir: "tools/splat" merged: "426b08200d" upstream: origin: "https://github.com/ethteck/splat.git" branch: "master" commit: "426b08200d" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo" commit: "2f68596" * varTable -> union :( + player_api funcs * 6 more * 4 more * 5 mo * 1 mo * 1 mo 2 * 5 mo * player_jump * 3 mo * some 18F340 * 6 more * 6 mo * nm * 1 * 1 more * some PR feedback * symbol addr update * UnsetCamera0Flag1000 * SetPlayerSpriteSet2 * action 18 * encounter + a smol hammer * git subrepo pull (merge) tools/splat subrepo: subdir: "tools/splat" merged: "8cf482fe57" upstream: origin: "https://github.com/ethteck/splat.git" branch: "master" commit: "4c0a93eaed" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo" commit: "2f68596" * 3 and cleanup * undo yucky union * PR comments * get_enemy_safe * cleanup * move VirtualEntity * attempt to fix doxygen
2021-06-16 11:52:15 +02:00
extern s32 D_8010C95C;
extern s32 D_8010C96C;
extern s32 D_8010C980;
extern s32 D_8010C9A0;
Match some funcs in world/action/walk (#362) * match some walk funcs * fix D_800F7B40 type * update functions.h * update splat.yaml * remove walk.data.s * run coverage.py * remove line at top * changed brace * requested changes Co-authored-by: ThreeMustyFears <>
2021-08-15 11:28:16 +02:00
extern s32 D_800F7B40;
Most of player_api and 18F340 (#296) * bss * 3 audios * d5a50 stuff * some icon funcs * get_icon_render_pos * PlayerLandJump * func_80248170 * cleanup * splat update prep * git subrepo pull --force tools/splat subrepo: subdir: "tools/splat" merged: "81c4b35b89" upstream: origin: "https://github.com/ethteck/splat.git" branch: "master" commit: "81c4b35b89" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * git subrepo pull tools/splat subrepo: subdir: "tools/splat" merged: "9b791a654a" upstream: origin: "https://github.com/ethteck/splat.git" branch: "master" commit: "9b791a654a" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * git subrepo pull tools/splat subrepo: subdir: "tools/splat" merged: "2cf2a5e5d8" upstream: origin: "https://github.com/ethteck/splat.git" branch: "master" commit: "2cf2a5e5d8" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * fix loop in PaperMarioNpcSprites * git subrepo pull tools/splat subrepo: subdir: "tools/splat" merged: "2fab217750" upstream: origin: "https://github.com/ethteck/splat.git" branch: "master" commit: "2fab217750" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo" commit: "2f68596" * add sha1 to yaml * git subrepo pull tools/splat subrepo: subdir: "tools/splat" merged: "426b08200d" upstream: origin: "https://github.com/ethteck/splat.git" branch: "master" commit: "426b08200d" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo" commit: "2f68596" * varTable -> union :( + player_api funcs * 6 more * 4 more * 5 mo * 1 mo * 1 mo 2 * 5 mo * player_jump * 3 mo * some 18F340 * 6 more * 6 mo * nm * 1 * 1 more * some PR feedback * symbol addr update * UnsetCamera0Flag1000 * SetPlayerSpriteSet2 * action 18 * encounter + a smol hammer * git subrepo pull (merge) tools/splat subrepo: subdir: "tools/splat" merged: "8cf482fe57" upstream: origin: "https://github.com/ethteck/splat.git" branch: "master" commit: "4c0a93eaed" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo" commit: "2f68596" * 3 and cleanup * undo yucky union * PR comments * get_enemy_safe * cleanup * move VirtualEntity * attempt to fix doxygen
2021-06-16 11:52:15 +02:00
extern s32 D_800F7B44;
extern f32 D_8010C938;
extern f32 D_8010C990;
curtains.c data work, assorted funcs, new file, etc and cleanup: misc decomp (#360) * PlayEffect progress, two insane funcs * PartnerActionStatus struct and some cleanup * file split * physics funcs * data migration, some decomp * curtains data, etc * git subrepo pull (merge) --force tools/splat subrepo: subdir: "tools/splat" merged: "b8bf80cd07" upstream: origin: "https://github.com/ethteck/splat.git" branch: "master" commit: "b8bf80cd07" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo" commit: "2f68596" * git subrepo pull tools/splat subrepo: subdir: "tools/splat" merged: "265b837554" upstream: origin: "https://github.com/ethteck/splat.git" branch: "master" commit: "265b837554" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo" commit: "2f68596" * PR comments
2021-08-13 19:27:57 +02:00
extern s32 D_8010C978;
Assorted Decomp Across The Galaxy (#574) * popup_menu_update & other * a bunch of 190B20 * starting load_player_actor * load_player_actor * blorp * load_partner_actor * fx_11_main * fx_11 done * cleanup * fx_12 * 3 encounter_api funcs * encounter_api done * some 20ec0 funcs * clean * PR comments, warnings * name btl_actorHomePositions * PR comments
2021-12-28 12:43:24 +01:00
extern Vec3s btl_actorHomePositions[];
Most of player_api and 18F340 (#296) * bss * 3 audios * d5a50 stuff * some icon funcs * get_icon_render_pos * PlayerLandJump * func_80248170 * cleanup * splat update prep * git subrepo pull --force tools/splat subrepo: subdir: "tools/splat" merged: "81c4b35b89" upstream: origin: "https://github.com/ethteck/splat.git" branch: "master" commit: "81c4b35b89" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * git subrepo pull tools/splat subrepo: subdir: "tools/splat" merged: "9b791a654a" upstream: origin: "https://github.com/ethteck/splat.git" branch: "master" commit: "9b791a654a" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * git subrepo pull tools/splat subrepo: subdir: "tools/splat" merged: "2cf2a5e5d8" upstream: origin: "https://github.com/ethteck/splat.git" branch: "master" commit: "2cf2a5e5d8" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * fix loop in PaperMarioNpcSprites * git subrepo pull tools/splat subrepo: subdir: "tools/splat" merged: "2fab217750" upstream: origin: "https://github.com/ethteck/splat.git" branch: "master" commit: "2fab217750" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo" commit: "2f68596" * add sha1 to yaml * git subrepo pull tools/splat subrepo: subdir: "tools/splat" merged: "426b08200d" upstream: origin: "https://github.com/ethteck/splat.git" branch: "master" commit: "426b08200d" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo" commit: "2f68596" * varTable -> union :( + player_api funcs * 6 more * 4 more * 5 mo * 1 mo * 1 mo 2 * 5 mo * player_jump * 3 mo * some 18F340 * 6 more * 6 mo * nm * 1 * 1 more * some PR feedback * symbol addr update * UnsetCamera0Flag1000 * SetPlayerSpriteSet2 * action 18 * encounter + a smol hammer * git subrepo pull (merge) tools/splat subrepo: subdir: "tools/splat" merged: "8cf482fe57" upstream: origin: "https://github.com/ethteck/splat.git" branch: "master" commit: "4c0a93eaed" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo" commit: "2f68596" * 3 and cleanup * undo yucky union * PR comments * get_enemy_safe * cleanup * move VirtualEntity * attempt to fix doxygen
2021-06-16 11:52:15 +02:00
curtains.c data work, assorted funcs, new file, etc and cleanup: misc decomp (#360) * PlayEffect progress, two insane funcs * PartnerActionStatus struct and some cleanup * file split * physics funcs * data migration, some decomp * curtains data, etc * git subrepo pull (merge) --force tools/splat subrepo: subdir: "tools/splat" merged: "b8bf80cd07" upstream: origin: "https://github.com/ethteck/splat.git" branch: "master" commit: "b8bf80cd07" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo" commit: "2f68596" * git subrepo pull tools/splat subrepo: subdir: "tools/splat" merged: "265b837554" upstream: origin: "https://github.com/ethteck/splat.git" branch: "master" commit: "265b837554" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo" commit: "2f68596" * PR comments
2021-08-13 19:27:57 +02:00
extern PartnerActionStatus gPartnerActionStatus; // something with partners
more fields and name consistency (#603) * npc fields * npc and actor naming * missing hit sounds + naming consistenct * added partner syms and player spin struct * requested changes * organized Vec structs Co-authored-by: HailSanta <Hail2Santa@gmail.com>
2022-01-05 12:05:49 +01:00
extern PlayerSpinState gPlayerSpinState; // sfx_play_sound state struct?
match show_coin_counter
2020-08-10 23:35:37 +02:00
byte/flag stuff
2020-09-19 17:16:02 +02:00
extern SaveData gCurrentSaveFile;
extern u32* gMapFlags;
Trigger funcs (#405) * remove old tools, fix warnings * almost match si_handle_print_debug_var * si_goto_end_loop and warnings * is_trigger_bound and create_trigger * Cleanup + matching 2 non-matchings * update_triggers (trigger.c complete) * fix warnings * PR comments, m2ctx.py fix
2021-08-29 15:44:17 +02:00
extern s32* gMapVars;
more goods
2020-09-27 03:02:29 +02:00
extern f32 D_80286540;
byte/flag stuff
2020-09-19 17:16:02 +02:00
Some stuff
2020-10-14 03:55:04 +02:00
extern u32 gWorldMapVars[MAX_MAPVARS];
extern u32 gBattleMapVars[MAX_MAPVARS];
extern u32 gWorldMapFlags[MAX_MAPFLAGS];
extern u32 gBattleMapFlags[MAX_MAPFLAGS];
decomp funcs in code_13870_len_6980.c & code_1A1F0_len_5390.c (#245) * decomp funcs in code_13870_len_6980.c & code_1A1F0_len_5390.c * fix pr comments * fix for loops to not be hardcoded
2021-03-30 19:39:44 +02:00
extern s32 D_8009A5D0;
Crystal Palace reflection include & name some segments (#274) * src/evt section * evt data * entity * update entity func names * names * reflection wip * lol * ~pra_01 * nabbed em * match func_80240500_D4D540 * match func_802402F0_D4D330 * last pra include func git add -A * gCurrentCamID * reflection.inc.c for pra_01 * reflection.inc.c * rm * match a few in tst_11 * use npc flags Co-authored-by: Ethan Roseman <ethteck@gmail.com>
2021-04-22 05:19:31 +02:00
extern s32 timeFreezeMode;
decomp funcs in code_13870_len_6980.c & code_1A1F0_len_5390.c (#245) * decomp funcs in code_13870_len_6980.c & code_1A1F0_len_5390.c * fix pr comments * fix for loops to not be hardcoded
2021-03-30 19:39:44 +02:00
extern s32 D_8009A678;
Some stuff
2020-10-14 03:55:04 +02:00
near-match begin_state_intro
2020-10-15 00:22:43 +02:00
extern u8 D_800779B0;
condensing some structs! :)
2020-12-08 11:50:14 +01:00
extern u32 D_80078174;
near-match begin_state_intro
2020-10-15 00:22:43 +02:00
extern u8 D_800A0963;
struct renaming and trigger/entity cleanup (#623) * rename static structs to blueprint * evt structs renamed * renamed HudElementAnim to HudScript, worked on triggers * fix Trigger/TriggerBP fields and entity cleanup * entity data cleanup 1 * block * blue warp pipe Co-authored-by: HailSanta <Hail2Santa@gmail.com>
2022-01-16 14:28:09 +01:00
extern struct EffectInstance* TriggerBlockVanishEffect;
decompile more entity funcs, split new file
2020-11-19 09:31:22 +01:00
extern UNK_TYPE D_00000094;
extern UNK_TYPE D_00000094_2; // two symbols resolve to the same addr. Required for matching
struct renaming and trigger/entity cleanup (#623) * rename static structs to blueprint * evt structs renamed * renamed HudElementAnim to HudScript, worked on triggers * fix Trigger/TriggerBP fields and entity cleanup * entity data cleanup 1 * block * blue warp pipe Co-authored-by: HailSanta <Hail2Santa@gmail.com>
2022-01-16 14:28:09 +01:00
extern EntityBlueprint Entity_InertRedBlock;
extern EntityBlueprint Entity_InertYellowBlock;
decompile more entity funcs, split new file
2020-11-19 09:31:22 +01:00
extern UNK_TYPE D_802EA310;
struct renaming and trigger/entity cleanup (#623) * rename static structs to blueprint * evt structs renamed * renamed HudElementAnim to HudScript, worked on triggers * fix Trigger/TriggerBP fields and entity cleanup * entity data cleanup 1 * block * blue warp pipe Co-authored-by: HailSanta <Hail2Santa@gmail.com>
2022-01-16 14:28:09 +01:00
extern EntityBlueprint Entity_HitGroundedYellowBlock;
extern EntityBlueprint Entity_HitFloatingYellowBlock;
extern EntityBlueprint Entity_HitRedBlock;
decompile more entity funcs, split new file
2020-11-19 09:31:22 +01:00
split code_106ef0 and match most funcs
2020-11-21 10:28:02 +01:00
extern UNK_TYPE D_0A000328;
extern UNK_TYPE D_0A000380;
extern UNK_TYPE D_0A000750;
extern UNK_TYPE D_0A000800;
some funcs in code_105f90
2020-11-21 08:40:54 +01:00
extern UNK_TYPE D_0A000808;
Many more functions decomped
2020-10-08 21:03:58 +02:00
// Scripts
struct renaming and trigger/entity cleanup (#623) * rename static structs to blueprint * evt structs renamed * renamed HudElementAnim to HudScript, worked on triggers * fix Trigger/TriggerBP fields and entity cleanup * entity data cleanup 1 * block * blue warp pipe Co-authored-by: HailSanta <Hail2Santa@gmail.com>
2022-01-16 14:28:09 +01:00
extern EvtScript SCRIPT_NpcDefeat;
extern EvtScript ShakeCam1;
extern EvtScript ShakeCamX;
Many more functions decomped
2020-10-08 21:03:58 +02:00
match func_8014AA54
2020-10-29 03:54:01 +01:00
extern s16 gMusicUnkVolume;
match many small funcs, rename symbols
2020-10-29 04:43:58 +01:00
extern s16 gMusicUnkVolume2;
match func_8014AA54
2020-10-29 03:54:01 +01:00
extern s16 gMusicCurrentVolume;
extern s16 gMusicTargetVolume;
f270, world, and more (#246) * 415D90 decomp * code_415D90 rodata migration * data migration, decomp * . * . * . * 4 funcs * non-matching * audio part 1 * audio work * end of snd * update_symbol_addrs * . * :chicken: * . * sfx func names * bgm * more audio * . * a few audio funcs * update section length * git subrepo pull --force tools/splat subrepo: subdir: "tools/splat" merged: "82ff308caf" upstream: origin: "https://github.com/ethteck/splat.git" branch: "master" commit: "82ff308caf" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo" commit: "2f68596" * git subrepo pull --force tools/splat subrepo: subdir: "tools/splat" merged: "4e9d3cdf85" upstream: origin: "https://github.com/ethteck/splat.git" branch: "master" commit: "4e9d3cdf85" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo" commit: "2f68596" * misc-decomp power * sound * 4 mo * more changes * . * some f270 * git subrepo pull --force tools/splat subrepo: subdir: "tools/splat" merged: "1c8ff4ec3f" upstream: origin: "https://github.com/ethteck/splat.git" branch: "master" commit: "1c8ff4ec3f" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo" commit: "2f68596" * git subrepo pull --force tools/splat subrepo: subdir: "tools/splat" merged: "f0633ecdbc" upstream: origin: "https://github.com/ethteck/splat.git" branch: "master" commit: "f0633ecdbc" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo" commit: "2f68596" * fix is_logo image size * . * git subrepo pull tools/splat subrepo: subdir: "tools/splat" merged: "4be92a4786" upstream: origin: "https://github.com/ethteck/splat.git" branch: "master" commit: "4be92a4786" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo" commit: "2f68596" * state_step_pause * almost * fixing symbol_addrs and disasm * update symbol_addrs * . * fix Matrix4f usages * . * . * update_symbol_addrs * fixes * I hate bitfields * load_map_by_IDs * cleanup * state_step_logos * more cleanup * . * splat * PR comments
2021-04-01 20:00:29 +02:00
extern MusicSettings gMusicSettings[4];
extern MusicSettings D_8014F6F0;
Many more functions decomped
2020-10-08 21:03:58 +02:00
Matching code_39cb0_len_100.c
2020-12-25 00:39:47 +01:00
// OS
extern OSThread D_800A4270; // idle thread, id 1
extern OSThread D_800A4420; // id 3
Support for "addu" in place of move pseudoinstruction (#206) * addu support * some libultra decomp * reorganization * reorg * comments
2021-03-11 09:08:22 +01:00
extern OSDevMgr __osPiDevMgr;
Matching code_39cb0_len_100.c
2020-12-25 00:39:47 +01:00
gfx syms (thanks :four_leaf_clover:)
2021-01-11 04:52:08 +01:00
// gfx
extern DisplayContext* gDisplayContext;
extern Gfx* gMasterGfxPos;
extern u16 gMatrixListPos;
Misc decomp (#215) * Misc early code decomp * Make expected script * fix m2ctx * gOverrideFlags & set/unset macros * update symbol addrs * Cleanup and PR comments * oops
2021-03-19 11:25:14 +01:00
extern s32 gCurrentDisplayContextIndex;
gfx syms (thanks :four_leaf_clover:)
2021-01-11 04:52:08 +01:00
some more fixes
2021-01-15 18:34:27 +01:00
extern UNK_TYPE D_0A004350;
extern UNK_TYPE D_0A0026F0;
Most of player_api and 18F340 (#296) * bss * 3 audios * d5a50 stuff * some icon funcs * get_icon_render_pos * PlayerLandJump * func_80248170 * cleanup * splat update prep * git subrepo pull --force tools/splat subrepo: subdir: "tools/splat" merged: "81c4b35b89" upstream: origin: "https://github.com/ethteck/splat.git" branch: "master" commit: "81c4b35b89" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * git subrepo pull tools/splat subrepo: subdir: "tools/splat" merged: "9b791a654a" upstream: origin: "https://github.com/ethteck/splat.git" branch: "master" commit: "9b791a654a" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * git subrepo pull tools/splat subrepo: subdir: "tools/splat" merged: "2cf2a5e5d8" upstream: origin: "https://github.com/ethteck/splat.git" branch: "master" commit: "2cf2a5e5d8" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * fix loop in PaperMarioNpcSprites * git subrepo pull tools/splat subrepo: subdir: "tools/splat" merged: "2fab217750" upstream: origin: "https://github.com/ethteck/splat.git" branch: "master" commit: "2fab217750" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo" commit: "2f68596" * add sha1 to yaml * git subrepo pull tools/splat subrepo: subdir: "tools/splat" merged: "426b08200d" upstream: origin: "https://github.com/ethteck/splat.git" branch: "master" commit: "426b08200d" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo" commit: "2f68596" * varTable -> union :( + player_api funcs * 6 more * 4 more * 5 mo * 1 mo * 1 mo 2 * 5 mo * player_jump * 3 mo * some 18F340 * 6 more * 6 mo * nm * 1 * 1 more * some PR feedback * symbol addr update * UnsetCamera0Flag1000 * SetPlayerSpriteSet2 * action 18 * encounter + a smol hammer * git subrepo pull (merge) tools/splat subrepo: subdir: "tools/splat" merged: "8cf482fe57" upstream: origin: "https://github.com/ethteck/splat.git" branch: "master" commit: "4c0a93eaed" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo" commit: "2f68596" * 3 and cleanup * undo yucky union * PR comments * get_enemy_safe * cleanup * move VirtualEntity * attempt to fix doxygen
2021-06-16 11:52:15 +02:00
extern u32* D_802EAE7C;
some more fixes
2021-01-15 18:34:27 +01:00
undefined syms
2021-02-10 15:42:36 +01:00
extern s32 D_80291FA8[];
extern s32 D_80291FD0[];
extern s32 D_80291FF8[];
extern s32 D_80292020[];
extern s32 D_80292048[];
extern s32 D_80292070[];
extern s32 D_80292098[];
extern s32 D_802920C0[];
extern s32 D_802920E8[];
extern s32 D_80292110[];
Match BoostDefense, VanishActor, ElectrifyActor, and HealActor (#481) * Match BoostDefense, VanishActor, ElectrifyActor, and HealActor * Delete BoostDefense.s * Delete VanishActor.s * Delete ElectrifyActor.s * Delete HealActor.s * Update 197F40.c * Add D_8029FBD0 * Add inflict_status * Address comments.
2021-10-19 17:15:38 +02:00
extern s32 D_8029FBD0;
Santas workshop (#670) * initial name changes * hud_element function names * missing player data fields * entity cleanup * missed a few things + starting action states * some world partner cleanup * idle/walk/hammer + peach cooking stuff * clean Co-authored-by: HailSanta <Hail2Santa@gmail.com> Co-authored-by: Ethan Roseman <ethteck@gmail.com>
2022-03-26 12:47:10 +01:00
extern s32 KoopatrolDisguiseExtraAnims[];
extern s32 HammerBroDisguiseExtraAnims[];
undefined syms
2021-02-10 16:26:26 +01:00
Match more overworld partner functions (#541) * decomp watt overworld functions * fix struct that was wrongly changed * run coverage.py * requested changes for watt.c and decomp a function from sbk_02 * run coverage.py * more style changes * decomp all functions in 92A2B0.c * run coverage.py * use map_var instead of hex constant, other style changes * pull sbk_02.h changes * ...actually merge master correctly * decomp most functions in nok_04 * decomp most of 9EDBF0.C, fix warnings in UnkFunc41.inc.c and warnings/decomp in lakilester.c * run coverage.py * code review changes + few extra functions * decomp lakilester functions and fix style in other files * decomp more laki overworld functions * add close match for func_802BDDD8_321928 * requested changes * more requested style changes * style changes * last of review changes * another small style fix * ...accidentally deleted the f on a float immediate * decomp world sushie/watt files * run coverage.py * small style fixes * fix 2 warnings in watt.c * decomp kooper world functions * requested style changes * couple more style changes * decomp kooper world functions * last style changes * decomp more kooper world functions * match world kooper file except 2 non_equivalent * non matching of last world bow function * migrate data.s file to bombette.c, also decomp various overoworld partner functions * match more overworld partner functions * style changes * update variable names * some requested changes done * add enums and other cleanup to overworld partner files * run coverage.py * add a space to watt file * remove raw pointers from partner files plus other requested changes * remove goompa raw pointer Co-authored-by: root <root@DESKTOP-HK751F2.localdomain> Co-authored-by: Rainchus <Rainchus@github.com>
2021-12-06 13:25:43 +01:00
//various
more undefined syms
2021-02-10 16:30:33 +01:00
extern s32 D_802C05CC;
Crystal Palace reflection include & name some segments (#274) * src/evt section * evt data * entity * update entity func names * names * reflection wip * lol * ~pra_01 * nabbed em * match func_80240500_D4D540 * match func_802402F0_D4D330 * last pra include func git add -A * gCurrentCamID * reflection.inc.c for pra_01 * reflection.inc.c * rm * match a few in tst_11 * use npc flags Co-authored-by: Ethan Roseman <ethteck@gmail.com>
2021-04-22 05:19:31 +02:00
extern s16 gCurrentCamID;
Match _heap_free (#522) * Committing _heap_free match * More renames and fixes from PR * Ver without goto's from Josh * Accidently left pointers in * More variable fixes based on calls to _heap_* * Remove unneeded comments, fix function variable name in header * Missing a space * Revert to while loop * Sneaking in an additional comment about heap_malloc_tail for clarity * Missed whitespace * Reduced some comments
2021-11-07 17:58:57 +01:00
extern HeapNode gSpriteHeapPtr;
Misc decomp 534 (#301) * splat disasm update * a little * splat jtbl robustness * git subrepo pull (merge) --force tools/splat subrepo: subdir: "tools/splat" merged: "150dcdebfd" upstream: origin: "https://github.com/ethteck/splat.git" branch: "master" commit: "150dcdebfd" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo" commit: "2f68596" * some rodata stuff * git subrepo pull tools/splat subrepo: subdir: "tools/splat" merged: "21bf3a381c" upstream: origin: "https://github.com/ethteck/splat.git" branch: "master" commit: "21bf3a381c" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo" commit: "2f68596" * progress * All area rodata migrated * UnkDistFunc * SwitchToPartner * UnkNpcAIFunc23 * UnkNpcAIFunc24 * UnkNpcAIFunc25 * cleanup & symbol_addrs * disasm update * work on fio.c (6240) * data 'n' tst_04 funcz * more tst_ * misc & PlayFX3D * two end_01 funcs * more shtuff * fix * fix2
2021-07-08 17:53:00 +02:00
Work on Pointers (#610)
2022-01-08 06:47:52 +01:00
extern s32 D_8029C890[10][5];
match star spirits (#325)
2021-07-19 20:27:56 +02:00
f270, world, and more (#246) * 415D90 decomp * code_415D90 rodata migration * data migration, decomp * . * . * . * 4 funcs * non-matching * audio part 1 * audio work * end of snd * update_symbol_addrs * . * :chicken: * . * sfx func names * bgm * more audio * . * a few audio funcs * update section length * git subrepo pull --force tools/splat subrepo: subdir: "tools/splat" merged: "82ff308caf" upstream: origin: "https://github.com/ethteck/splat.git" branch: "master" commit: "82ff308caf" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo" commit: "2f68596" * git subrepo pull --force tools/splat subrepo: subdir: "tools/splat" merged: "4e9d3cdf85" upstream: origin: "https://github.com/ethteck/splat.git" branch: "master" commit: "4e9d3cdf85" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo" commit: "2f68596" * misc-decomp power * sound * 4 mo * more changes * . * some f270 * git subrepo pull --force tools/splat subrepo: subdir: "tools/splat" merged: "1c8ff4ec3f" upstream: origin: "https://github.com/ethteck/splat.git" branch: "master" commit: "1c8ff4ec3f" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo" commit: "2f68596" * git subrepo pull --force tools/splat subrepo: subdir: "tools/splat" merged: "f0633ecdbc" upstream: origin: "https://github.com/ethteck/splat.git" branch: "master" commit: "f0633ecdbc" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo" commit: "2f68596" * fix is_logo image size * . * git subrepo pull tools/splat subrepo: subdir: "tools/splat" merged: "4be92a4786" upstream: origin: "https://github.com/ethteck/splat.git" branch: "master" commit: "4be92a4786" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo" commit: "2f68596" * state_step_pause * almost * fixing symbol_addrs and disasm * update symbol_addrs * . * fix Matrix4f usages * . * . * update_symbol_addrs * fixes * I hate bitfields * load_map_by_IDs * cleanup * state_step_logos * more cleanup * . * splat * PR comments
2021-04-01 20:00:29 +02:00
// Heap?
Misc decomp 534 (#301) * splat disasm update * a little * splat jtbl robustness * git subrepo pull (merge) --force tools/splat subrepo: subdir: "tools/splat" merged: "150dcdebfd" upstream: origin: "https://github.com/ethteck/splat.git" branch: "master" commit: "150dcdebfd" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo" commit: "2f68596" * some rodata stuff * git subrepo pull tools/splat subrepo: subdir: "tools/splat" merged: "21bf3a381c" upstream: origin: "https://github.com/ethteck/splat.git" branch: "master" commit: "21bf3a381c" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo" commit: "2f68596" * progress * All area rodata migrated * UnkDistFunc * SwitchToPartner * UnkNpcAIFunc23 * UnkNpcAIFunc24 * UnkNpcAIFunc25 * cleanup & symbol_addrs * disasm update * work on fio.c (6240) * data 'n' tst_04 funcz * more tst_ * misc & PlayFX3D * two end_01 funcs * more shtuff * fix * fix2
2021-07-08 17:53:00 +02:00
extern s32 D_8038F800;
extern s32 D_803B5000;
Effects, includes (#589) * effect_13 * effect_14 * most of effect_15 * clean, standardize effects * fx_16 wip * UnkNpcAIFunc35 * includes * UnkPosFunc2 * UnkNpcAIFunc36 * PR comments
2021-12-30 06:14:55 +01:00
extern HeapNode heap_collisionHead;
extern HeapNode heap_generalHead;
Match _heap_free (#522) * Committing _heap_free match * More renames and fixes from PR * Ver without goto's from Josh * Accidently left pointers in * More variable fixes based on calls to _heap_* * Remove unneeded comments, fix function variable name in header * Missing a space * Revert to while loop * Sneaking in an additional comment about heap_malloc_tail for clarity * Missed whitespace * Reduced some comments
2021-11-07 17:58:57 +01:00
extern HeapNode heap_battleHead;
f270, world, and more (#246) * 415D90 decomp * code_415D90 rodata migration * data migration, decomp * . * . * . * 4 funcs * non-matching * audio part 1 * audio work * end of snd * update_symbol_addrs * . * :chicken: * . * sfx func names * bgm * more audio * . * a few audio funcs * update section length * git subrepo pull --force tools/splat subrepo: subdir: "tools/splat" merged: "82ff308caf" upstream: origin: "https://github.com/ethteck/splat.git" branch: "master" commit: "82ff308caf" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo" commit: "2f68596" * git subrepo pull --force tools/splat subrepo: subdir: "tools/splat" merged: "4e9d3cdf85" upstream: origin: "https://github.com/ethteck/splat.git" branch: "master" commit: "4e9d3cdf85" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo" commit: "2f68596" * misc-decomp power * sound * 4 mo * more changes * . * some f270 * git subrepo pull --force tools/splat subrepo: subdir: "tools/splat" merged: "1c8ff4ec3f" upstream: origin: "https://github.com/ethteck/splat.git" branch: "master" commit: "1c8ff4ec3f" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo" commit: "2f68596" * git subrepo pull --force tools/splat subrepo: subdir: "tools/splat" merged: "f0633ecdbc" upstream: origin: "https://github.com/ethteck/splat.git" branch: "master" commit: "f0633ecdbc" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo" commit: "2f68596" * fix is_logo image size * . * git subrepo pull tools/splat subrepo: subdir: "tools/splat" merged: "4be92a4786" upstream: origin: "https://github.com/ethteck/splat.git" branch: "master" commit: "4be92a4786" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo" commit: "2f68596" * state_step_pause * almost * fixing symbol_addrs and disasm * update symbol_addrs * . * fix Matrix4f usages * . * . * update_symbol_addrs * fixes * I hate bitfields * load_map_by_IDs * cleanup * state_step_logos * more cleanup * . * splat * PR comments
2021-04-01 20:00:29 +02:00
Match a number of functions and introduce anon unions (#655) * Match a number of functions and introduce anon unions * Fix warnings * Ethan's comments
2022-02-24 16:12:33 +01:00
extern u32 bMarioIdleAnims[];
Most of player_api and 18F340 (#296) * bss * 3 audios * d5a50 stuff * some icon funcs * get_icon_render_pos * PlayerLandJump * func_80248170 * cleanup * splat update prep * git subrepo pull --force tools/splat subrepo: subdir: "tools/splat" merged: "81c4b35b89" upstream: origin: "https://github.com/ethteck/splat.git" branch: "master" commit: "81c4b35b89" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * git subrepo pull tools/splat subrepo: subdir: "tools/splat" merged: "9b791a654a" upstream: origin: "https://github.com/ethteck/splat.git" branch: "master" commit: "9b791a654a" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * git subrepo pull tools/splat subrepo: subdir: "tools/splat" merged: "2cf2a5e5d8" upstream: origin: "https://github.com/ethteck/splat.git" branch: "master" commit: "2cf2a5e5d8" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * fix loop in PaperMarioNpcSprites * git subrepo pull tools/splat subrepo: subdir: "tools/splat" merged: "2fab217750" upstream: origin: "https://github.com/ethteck/splat.git" branch: "master" commit: "2fab217750" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo" commit: "2f68596" * add sha1 to yaml * git subrepo pull tools/splat subrepo: subdir: "tools/splat" merged: "426b08200d" upstream: origin: "https://github.com/ethteck/splat.git" branch: "master" commit: "426b08200d" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo" commit: "2f68596" * varTable -> union :( + player_api funcs * 6 more * 4 more * 5 mo * 1 mo * 1 mo 2 * 5 mo * player_jump * 3 mo * some 18F340 * 6 more * 6 mo * nm * 1 * 1 more * some PR feedback * symbol addr update * UnsetCamera0Flag1000 * SetPlayerSpriteSet2 * action 18 * encounter + a smol hammer * git subrepo pull (merge) tools/splat subrepo: subdir: "tools/splat" merged: "8cf482fe57" upstream: origin: "https://github.com/ethteck/splat.git" branch: "master" commit: "4c0a93eaed" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo" commit: "2f68596" * 3 and cleanup * undo yucky union * PR comments * get_enemy_safe * cleanup * move VirtualEntity * attempt to fix doxygen
2021-06-16 11:52:15 +02:00
extern s32 bMarioDefendAnims[];
extern s32 bPeachIdleAnims[];
Add new EVT macros (#482) * add tools and new macros * change EVT_OP enum names * first file * convert some files * stuff * EVT_PTR * src/battle/item * src/battle * tool changes * clouds.inc.c * src/evt * foliage.inc.c * bitwise ops * staticentitydata vars * add diff_evt.py * use evt macros in dro_01 * evt macro docs * whoops * fix some warnings
2021-10-25 13:44:55 +02:00
// TODO: name these entity symbols
struct renaming and trigger/entity cleanup (#623) * rename static structs to blueprint * evt structs renamed * renamed HudElementAnim to HudScript, worked on triggers * fix Trigger/TriggerBP fields and entity cleanup * entity data cleanup 1 * block * blue warp pipe Co-authored-by: HailSanta <Hail2Santa@gmail.com>
2022-01-16 14:28:09 +01:00
extern EntityBlueprint Entity_SavePoint; // entitySaveBlock
extern EntityBlueprint Entity_RedSwitch;
extern EntityBlueprint Entity_BlueSwitch; // entityBlueSwitch
extern EntityBlueprint Entity_HugeBlueSwitch; // entityHugeBlueSwitch
extern EntityBlueprint Entity_GreenStompSwitch;
extern EntityBlueprint Entity_ShatteringHammer1Block;
extern EntityBlueprint Entity_ShatteringHammer2Block;
extern EntityBlueprint Entity_ShatteringHammer3Block;
extern EntityBlueprint Entity_ShatteringHammer1BlockTiny;
extern EntityBlueprint Entity_ShatteringHammer2BlockTiny;
extern EntityBlueprint Entity_ShatteringHammer3BlockTiny;
extern EntityBlueprint Entity_ShatteringBrickBlock;
Decompile several dead and duplicated functions (#353)
2021-08-02 20:03:51 +02:00
Deduplicate various dead functions (#494) * what is dead may never die * resolve issues * fixing dead_gPartnerActionStatus2 * . * resolve issues Co-authored-by: Ethan Roseman <ethteck@gmail.com>
2021-10-25 16:32:44 +02:00
// Temporary dead stuff
extern PartnerActionStatus dead_gPartnerActionStatus2;
headers, some decomp
2020-07-18 02:47:33 +02:00
#endif
Reference in New Issue Copy Permalink