393 Commits

Author	SHA1	Message	Date
Ethan Roseman	ac54bf13e8	9 more	2020-10-14 12:45:54 -04:00
Alex Bates	458db819d2	add newline to no-op func blocks	2020-10-14 17:15:50 +01:00
Alex Bates	7bccd92a07	remove commented func_80034BF4	2020-10-14 17:13:29 +01:00
Alex Bates	e068d2848b	match func_80028838	2020-10-14 17:11:59 +01:00
Alex Bates	7731c8c373	match some stub functions	2020-10-14 16:48:20 +01:00
Alex Bates	ee5cb1b8aa	match no-op functions	2020-10-14 16:43:51 +01:00
Ethan Roseman	7cd481c1a2	Merge branch 'master' into in-progress	2020-10-13 21:57:58 -04:00
Ethan Roseman	d7360e4bf7	Some stuff	2020-10-13 21:55:04 -04:00
Alex Bates	ce8045a3bd	format code_e79b0_len_1920.c	2020-10-13 20:57:50 +01:00
dark-samus	0c37f227a1	last one	2020-10-12 23:18:02 -04:00
dark-samus	6468819806	address final PR stuff	2020-10-12 22:54:27 -04:00
dark-samus	e465321115	format + deleted matched	2020-10-12 22:25:46 -04:00
dark-samus	733b591d5f	merge master	2020-10-12 22:16:00 -04:00
dark-samus	430ff41bc6	lots of stuff	2020-10-12 21:28:01 -04:00
Ethan Roseman	2323879ef1	Merge branch 'master' into Testing	2020-10-12 20:32:15 -04:00
Ethan Roseman	3aa854c0c5	splat update	2020-10-12 14:46:04 -04:00
Ethan Roseman	5086e559a4	meowp	2020-10-11 21:59:42 -04:00
Ethan Roseman	8490965da5	fixing format	2020-10-10 13:42:15 -04:00
Ethan Roseman	5a013f5579	consistency	2020-10-10 13:24:53 -04:00
Ethan Roseman	2323cb0557	pr comments	2020-10-09 23:18:32 -04:00
Ethan Roseman	73ca6fa5d4	formatting and cleanup	2020-10-09 23:09:28 -04:00
Ethan Roseman	2ddeb1c5b1	.	2020-10-09 15:07:58 -04:00
Ethan Roseman	41e9cf18ba	matched func_80145CE8	2020-10-09 14:55:23 -04:00
Ethan Roseman	2eb876fccf	fully matched code_e940_len_290.c	2020-10-09 14:26:17 -04:00
Ethan Roseman	eb6aaccd73	more	2020-10-08 17:45:26 -04:00
Ethan Roseman	1f7e2134e0	removing func in progress	2020-10-08 15:46:23 -04:00
Ethan Roseman	011231df41	Many more functions decomped	2020-10-08 15:03:58 -04:00
Ethan Roseman	2f67a08a29	ASM round 2 + many decomped funcs	2020-10-06 15:16:17 -04:00
Ethan Roseman	b68891331f	Float funcs fixed	2020-10-05 16:04:33 -04:00
Ethan Roseman	9ef9d08761	PR comments	2020-10-04 16:11:49 -04:00
Ethan Roseman	be25066ca5	format	2020-10-03 16:20:12 -04:00
Ethan Roseman	ffa57b5a35	clean	2020-10-03 16:15:09 -04:00
Ethan Roseman	9d37af0d65	freebie	2020-10-03 16:11:05 -04:00
Ethan Roseman	5794cdf6fc	Some more	2020-10-03 16:04:49 -04:00
Ethan Roseman	926df66474	saving for later	2020-10-02 02:07:54 -04:00
dark-samus	c79f950a04	big merg	2020-09-28 16:59:36 -04:00
JoshDuMan	4c4ce1a4e0	Work on merge	2020-09-28 00:38:21 -04:00
JoshDuMan	84db54fce8	Merge in master	2020-09-28 00:00:10 -04:00
JoshDuMan	37565257e6	Merge branch 'Testing' of https://github.com/JoshDuMan/papermario into Testing	2020-09-27 22:43:04 -04:00
JoshDuMan	55dfeef1c8	Work on nuSched	2020-09-27 22:42:51 -04:00
Ethan Roseman	19f82d642d	5 more	2020-09-27 20:17:51 -04:00
Ethan Roseman	c541824930	SetSelfEnemyFlagBits	2020-09-27 19:57:02 -04:00
Ethan Roseman	164c6e76d3	curtains	2020-09-27 14:13:50 -04:00
Ethan Roseman	82b3662064	2 more	2020-09-27 13:57:40 -04:00
Ethan Roseman	f7d1e4faec	format	2020-09-27 11:11:01 -04:00
Ethan Roseman	36c5bde376	more goods	2020-09-26 21:02:29 -04:00
Ethan Roseman	677ec4f4e5	more	2020-09-25 22:49:59 -04:00
Ethan Roseman	9878841eb8	formatting	2020-09-25 21:55:04 -04:00
Ethan Roseman	210e65c3bf	More decomp + coverage fix	2020-09-25 21:51:54 -04:00
Ethan Roseman	bbca99bd94	ASM macro fix, decomp of many	2020-09-25 17:18:09 -04:00
Ethan Roseman	3691babd03	format	2020-09-23 23:54:33 -04:00
Ethan Roseman	8be527b2cf	Splat update & one new code file	2020-09-23 23:38:08 -04:00
Ethan Roseman	e5de7baa7f	a few changes	2020-09-23 23:16:13 -04:00
Ethan Roseman	11d7006656	Types in INCLUDE_ASM_T macro	2020-09-22 17:36:30 -04:00
Ethan Roseman	a9e5d79531	more	2020-09-21 23:10:53 -04:00
Ethan Roseman	5121395a7e	Struct update & formatting	2020-09-21 20:59:58 -04:00
Ethan Roseman	a1d39c1c1e	Sounds and flags	2020-09-21 20:56:17 -04:00
JoshDuMan	0a3874a0d0	Merge branch 'master' into Testing	2020-09-21 01:51:52 -04:00
JoshDuMan	7e632e3ceb	Decompile nuContRmbMgr	2020-09-21 00:37:52 -04:00
Ethan Roseman	599e46e7d1	Nm2	2020-09-19 20:13:52 -04:00
Ethan Roseman	1c74bd0c7d	nm	2020-09-19 20:12:28 -04:00
Ethan Roseman	b3d87e9347	formatting	2020-09-19 11:17:53 -04:00
Ethan Roseman	4e6a401484	byte/flag stuff	2020-09-19 11:16:02 -04:00
dark-samus	bb5d337778	big update	2020-09-18 16:57:52 -04:00
JoshDuMan	ed816c640f	hi	2020-09-18 16:48:52 -04:00
dark-samus	94e77f99d1	lots of changes	2020-09-18 16:07:15 -04:00
Ethan Roseman	084a0ab0b6	space	2020-09-18 01:59:40 -04:00
Ethan Roseman	5fa1be7e2a	More	2020-09-18 01:51:36 -04:00
Ethan Roseman	1db31856cd	format	2020-09-17 21:34:13 -04:00
Ethan Roseman	7f6b34c29b	Some more SI funcs	2020-09-17 21:28:34 -04:00
Ethan Roseman	44ffd33004	PR suggestions, game status macro	2020-09-13 19:03:22 -04:00
Ethan Roseman	ddb9f77fc1	Misc 42e0 funcs, new SQ macro, removing no-builtin	2020-09-11 16:29:52 -04:00
Ethan Roseman	0f1c5c4e55	Merge pull request #48 from ethteck/various-stuff ... Various funcs	2020-09-08 16:37:20 -04:00
Ethan Roseman	8186c6da3b	meow2	2020-09-08 16:36:15 -04:00
Ethan Roseman	7043f491ea	meow	2020-09-08 16:28:55 -04:00
Ethan Roseman	ce3e8ffa63	Macro stuff	2020-09-08 16:15:51 -04:00
Ethan Roseman	cfd7e16334	PR fixes	2020-09-08 09:06:17 -04:00
Ethan Roseman	373969d474	Merge pull request #43 from nanaian/physics ... match some in code_7bb60, fix coverage.py, fix lint action	2020-09-08 08:21:20 -04:00
Alex Bates	db1accd991	type PlayerStatus::unk_D8	2020-09-08 12:25:57 +01:00
Alex Bates	8d7e4b327e	match set_action_state ... Thanks @pixel-stuck!	2020-09-08 12:21:15 +01:00
Ethan Roseman	ab244966a8	more	2020-09-07 17:12:31 -04:00
Ethan Roseman	da5d8171b8	Update code_7bb60_len_41b0.c ... ~0x200	2020-09-07 09:32:18 -04:00
Ethan Roseman	290a7426a5	Various funcs	2020-09-06 11:53:48 -04:00
Ethan Roseman	66cc5a1ee6	Merge pull request #46 from ethteck/code-6000-done ... Finished code_6000.c	2020-09-02 14:40:35 -04:00
Ethan Roseman	c92a46ae0d	PR comments, Makefile change	2020-09-02 14:20:29 -04:00
Ethan Roseman	11e3e9b35e	tiny change	2020-09-02 12:51:45 -04:00
Ethan Roseman	ee8d55d6a2	PR fixes and a couple more	2020-09-02 12:37:33 -04:00
Ethan Roseman	90d2ddf2f6	Finished code_6000.c	2020-09-01 21:45:06 -04:00
sonicspiral	dedd132adc	removed redundant cast, s16 type is defined in include/variables.h	2020-09-01 18:11:21 -07:00
sonicspiral	b02c9b1bd9	decomp of func_8014A52C from code_e0b30_len_b80 ... * updates to undefined_syms * updates to variables.h * added helper window_terminal.bat for windows users original mips to c output ``` s16 func_8014A52C(void) { *(void *)0x80159AE2 = (u16)8; *(void *)0x80159AE4 = (u16)8; return (u16)8; } ```	2020-08-30 01:37:51 -07:00
Ethan Roseman	74a46100c1	2 more	2020-08-26 18:54:55 -04:00
Alex Bates	21d4a26913	Merge master into physics	2020-08-24 13:49:18 +01:00
Ethan Roseman	a6c722060a	Merge pull request #42 from ethteck/si ... Some more si funcs	2020-08-24 00:24:57 -04:00
Ethan Roseman	73ba3eeb22	PR suggestion	2020-08-24 00:18:10 -04:00
Ethan Roseman	50a791ea0b	9 more	2020-08-24 00:16:43 -04:00
Ethan Roseman	a264959d8c	Merge pull request #40 from JoshW-7/master ... Some new global variables & matching script functions	2020-08-23 22:03:49 -04:00
Jdog	01f92022e9	.	2020-08-23 18:42:04 -07:00
Jdog	86a51e3f69	gPlayerNpc to gPlayerNpcPtr & small formatting fix	2020-08-23 18:38:50 -07:00
Ethan Roseman	bf825e84e0	More SI funcs	2020-08-23 21:23:37 -04:00
Ethan Roseman	b9c67f8f7e	Merge remote-tracking branch 'origin/master' into si	2020-08-23 20:34:29 -04:00
Jdog	efe89e4486	Added gPlayerActionState, gPlayerAnimation, gPlayerNpc. Modifed PlayerStatus->actionState from u8 to s8. Defined ActionState enum as s8 type. A handful more script functions matched.	2020-08-22 16:24:51 -07:00
dark-samus	0b5afedb5e	merge master 2.0: electric boogaloo	2020-08-22 03:45:12 -04:00
dark-samus	f02ad05c4f	merge master	2020-08-22 03:43:30 -04:00
Ethan Roseman	4bc4681d94	Merge pull request #39 from ethteck/data-support ... Data support	2020-08-21 23:49:02 -04:00
Ethan Roseman	002b75f461	Data support	2020-08-21 23:32:59 -04:00
Ethan Roseman	87b421e8a0	Some more si functions	2020-08-21 23:04:10 -04:00
Jdog	177a9f0fe6	Several more Camera functions & struct changes	2020-08-21 08:04:57 -07:00
Jdog	eb82e98854	Lots more matching Camera-related functions	2020-08-20 14:16:52 -07:00
Jdog	89e749a724	Variable renaming, tweaks with getting camera pointer to make certain functions match. Match SetCamType	2020-08-20 13:01:56 -07:00
Alex Bates	42688faecd	match check_input_hammer	2020-08-20 20:15:06 +01:00
Alex Bates	79944164d9	wip: set_action_state	2020-08-20 19:43:45 +01:00
Alex Bates	e54bb887d7	match move_player	2020-08-20 19:26:34 +01:00
Jdog	fa0fc93187	Formatting	2020-08-20 10:11:36 -07:00
Jdog	e8ed3ae03f	Match SetCamEnabled, SetCamFlag80, SetCamPerspective, func_802CA90C. WIP func_802CA988. Modified Camera struct.	2020-08-20 09:41:42 -07:00
Alex Bates	325fec679c	fix codestyle ... Bitten by my own script. Damn.	2020-08-20 17:07:05 +01:00
Alex Bates	4f2261c5d9	resolve conflicts with master	2020-08-20 17:02:57 +01:00
Jdog	556e2cd658	More formatting issues	2020-08-19 19:51:36 -07:00
Jdog	256394d8c4	Formatting issue with set_script_timescale	2020-08-19 19:45:43 -07:00
Jdog	6bbc66ddc0	I don't know	2020-08-19 19:37:39 -07:00
Jdog	53264c467a	Remove uneccessary else block	2020-08-19 19:32:54 -07:00
Josh	7e4d7f9085	Merge branch 'master' into master	2020-08-19 19:26:09 -07:00
Jdog	eabeb3d4aa	Revise func_802B7000 using angle as left value	2020-08-19 19:22:02 -07:00
Jdog	dd98f7c034	Remove documentation	2020-08-19 16:00:45 -07:00
Jdog	bc8080788a	Fixing changes for PR: npcPtr to npc, spacing on if, removed else block in EnableNpcShadow that wasn't needed	2020-08-19 15:48:15 -07:00
Alex Bates	0e9e50c64d	resolve conflicts with master, remove enum ScriptBufferValue	2020-08-19 23:28:08 +01:00
Jdog	65f1db2e87	Match func_802B7000	2020-08-19 09:55:52 -07:00
Jdog	ada5f9dcfe	Match SetNpcEffect, PlaySoundAtNpc, SetNpcRenderMode (previously un-named func defined by me)	2020-08-19 07:34:52 -07:00
Jdog	6c8c91c54d	Merge remote-tracking branch 'upstream/master'	2020-08-18 21:55:00 -07:00
Jdog	e3575d3b58	Match EnableNpcShadow, EnableNpcBlur, ClearPartnerMoveHistory, GetPartnerPos, DisablePartnerAI, EnablePartnerAI, func_802CF54C, func_802CF56C	2020-08-18 21:54:42 -07:00
Ethan Roseman	09e8b625cf	More SI functions	2020-08-18 22:36:21 -04:00
Ethan Roseman	c557fdaf67	Merge pull request #30 from JoshW-7/master ... Several NPC-related matching functions. Modifed Npc struct with new float value.	2020-08-18 22:23:11 -04:00
Alex Bates	fbbbf83d22	add NON_MATCHING	2020-08-19 02:45:26 +01:00
Jdog	2864ba6476	Remove comments about omitting return statements	2020-08-18 18:24:56 -07:00
alex	c52ad332cc	Merge branch 'master' into coverage	2020-08-19 02:00:00 +01:00
Alex Bates	05d0eff2b1	remove commented INCLUDE_ASM macros	2020-08-19 01:55:56 +01:00
Alex Bates	91d2819d6f	Merge master into clang-format	2020-08-19 01:41:06 +01:00
Alex Bates	728c879b9f	resolve clang-tidy errors	2020-08-19 01:35:11 +01:00
Jdog	17d513eeba	Added function prototype for set_npc_yaw. Match NpcJump0, NpcJump1, GetNpcYaw, SetNpcYaw	2020-08-18 17:31:39 -07:00
Alex Bates	42747be7ae	fix signatures for builtins mistakenly marked as api functions	2020-08-19 01:23:22 +01:00
Alex Bates	852ab4a25d	fix some lint issues	2020-08-19 01:21:04 +01:00
Alex Bates	f19e2edbd3	format files	2020-08-19 01:16:12 +01:00
Jdog	63f8254227	And remove TODO	2020-08-18 15:53:04 -07:00
Jdog	d844156076	Rename func_802CE1C0 to SetNpcAnimationSpeed	2020-08-18 15:51:58 -07:00
Jdog	cd11b621c3	Modifed Npc struct w/ new float value. Match SetNpcAnimation, GetNpcAnimation, func_802CE1C (sets a float value in Npc struct)	2020-08-18 14:29:25 -07:00
Jdog	b88d8f7afc	Match SetNpcScale, SetNpcJumpScale	2020-08-18 14:12:26 -07:00
Jdog	e8d377eda0	...And include comment	2020-08-18 13:47:06 -07:00
Jdog	d5bc60ffc9	Move todo variable declaration into if block for SetNpcCollisionSize	2020-08-18 13:46:15 -07:00
Jdog	d5438113de	Match SetNpcCollisionSize (Note: includes TODO)	2020-08-18 13:44:19 -07:00
Ethan Roseman	5507d9f196	Merge pull request #29 from nanaian/match-floats ... match commented functions which use floats	2020-08-18 15:43:05 -04:00
Jdog	3a410419a8	Match SetNpcSpeed	2020-08-18 12:38:25 -07:00
Ethan Roseman	5f04055355	Newline	2020-08-18 12:43:55 -04:00
Ethan Roseman	00306ce572	Merge pull request #17 from Rainchus/master ... ebd0 matched functions	2020-08-18 12:43:25 -04:00
Alex Bates	25eda26d0b	1024.f -> 1024.0f	2020-08-18 10:30:36 +01:00
Alex Bates	2db3e8066c	match functions which use floats ... Now that float compilation is fixed, we can uncomment these!	2020-08-18 10:28:13 +01:00
Alex Bates	7498c2dc1c	require directory as string in INCLUDE_ASM macro	2020-08-17 22:10:44 +01:00
Alex Bates	82effcaf8e	remove temp comment	2020-08-17 18:27:37 +01:00
Alex Bates	cd74f41fc0	Merge master into assert	2020-08-17 18:16:13 +01:00
Alex Bates	1a36566cdc	add ASSERT macro	2020-08-17 13:09:19 +01:00
Alex Bates	9f50926f9b	match si_handle_switch, si_handle_switch_const	2020-08-17 13:07:33 +01:00
Alex Bates	95e6bddaf8	use StaticX for static table entry structs ... Change prompted by Clover.	2020-08-16 15:19:33 +01:00
Alex Bates	812288ca1a	add script interpreter constants	2020-08-16 07:55:51 +01:00
Alex Bates	e39d02e55e	rename Script to ScriptInstance	2020-08-16 06:55:30 +01:00
Alex Bates	46c2016bf1	rename enums	2020-08-16 05:24:20 +01:00
Alex Bates	0d8814555e	rename Bytecode alias	2020-08-16 04:23:40 +01:00
Alex Bates	e40b05d9c5	rename types (#20)	2020-08-16 04:19:00 +01:00
Ethan Roseman	934bd5a415	Merge pull request #18 from nanaian/f8f60 ... split and match most functions at f8f60	2020-08-15 22:37:35 -04:00
Alex Bates	1b6d31e6ee	Merge #21 into f8f60	2020-08-16 02:51:54 +01:00
Jdog	7544d4686e	Add extra info to comment about file splitting issue	2020-08-15 18:51:51 -07:00
Jdog	01ecc1dd24	Added proper return types to a few script functions. Use ptrReadPos++ in places where it's not stricly necessary, but good practice.	2020-08-15 15:26:14 -07:00
Jdog	7beaf4c461	Match CloseChoice, CancelMessage, CancelMessageAndBlock. Added gCurrentPrintContext and D_802DB268 (related)	2020-08-15 14:51:44 -07:00
Jdog	98e5db0630	Match EndSpeech, ContinueSpeech, SpeakToNpc, SetMessageImages, func_802D0C94, SetMessageString. WIP SetMessageValue (issue with extra NOP)	2020-08-15 13:54:06 -07:00
Jdog	23de219c07	Match SpeakToPlayer, remove uneccessary comment, add WIP SetNpcSpeed	2020-08-15 13:11:31 -07:00
Alex Bates	66d6883188	update get_variable, get_npc signatures	2020-08-15 19:49:26 +01:00
Alex Bates	3c8f57089b	remove redundancy comments	2020-08-15 19:03:29 +01:00
Alex Bates	2bd2a1c97c	fix float constant	2020-08-15 19:03:29 +01:00
Jdog	7d20b29129	Match GetNpcPointer	2020-08-15 10:59:48 -07:00
Jdog	19b143fdd3	Match DeleteNpc	2020-08-15 09:57:33 -07:00
Alex Bates	25025e4c4d	style: add newline at eof	2020-08-15 17:37:11 +01:00
Alex Bates	946680f312	match most functions in f8f60	2020-08-15 15:32:48 +01:00
Alex Bates	5f588bca92	match EnableStatusMenu, ShowStatusMenu	2020-08-15 13:00:51 +01:00
Alex Bates	cbc5f2fe40	match AwaitPlayerApproach, IsPlayerWithin, AwaitPlayerLeave, GetDist2D	2020-08-15 13:00:13 +01:00
Rainchus	47f377eb4a	ebd0 matched functions	2020-08-15 02:01:33 -05:00
Alex Bates	b6f7087c82	match GetAngleToNPC and GetAngleToPlayer	2020-08-15 06:04:54 +01:00
Alex Bates	0f34468a77	match GetAngleBetweenNPCs	2020-08-15 05:55:20 +01:00
Alex Bates	a25b53a8a1	name and match resolve_npc	2020-08-15 05:25:36 +01:00
Josh	541f8058e2	Merge branch 'master' into master	2020-08-14 20:37:33 -07:00
Alex Bates	dd80b5a957	match RandInt	2020-08-15 04:25:48 +01:00
Alex Bates	97d6f772ee	Merge master into lerp	2020-08-15 04:13:54 +01:00
Alex Bates	2a169dc34a	remove redundant casts	2020-08-15 04:12:30 +01:00
Ethan Roseman	81e3edffb4	Merge pull request #13 from pixel-stuck/master ... Fix assembler bug + misc other changes	2020-08-14 23:08:36 -04:00
Jdog	9496d860e4	Dumb mistake	2020-08-14 19:55:54 -07:00
Ethan Roseman	9a518db863	Fix hard-coded loop counter	2020-08-14 22:55:19 -04:00
Ethan Roseman	8b703053de	Add TODO	2020-08-14 22:51:23 -04:00
Jdog	58b2a01a58	Remove WIP function	2020-08-14 19:51:02 -07:00
Ethan Roseman	a414ce047b	Merge branch 'master' into si	2020-08-14 22:50:30 -04:00
Jdog	d1898f1903	Tweaks	2020-08-14 19:50:21 -07:00
dark-samus	62827e8823	actually fix assembler bug, make sure it compiles.	2020-08-14 22:24:08 -04:00
dark-samus	50f8ca824b	fix bug in assembler	2020-08-14 21:54:11 -04:00
Alex Bates	dae676c8af	match UpdateLerp	2020-08-15 01:49:33 +01:00
Alex Bates	0d8d3e50a9	clean up MakeLerp	2020-08-15 01:17:20 +01:00