41 Commits

Author	SHA1	Message	Date
dark-samus	af694484f7	Merge branch 'master' of https://github.com/pmret/papermario into entity_funcs	2021-01-16 15:12:49 -05:00
dark-samus	bfebc525a5	merge master	2021-01-15 12:06:43 -05:00
Ethan Roseman	a890c93736	Merge branch 'master' into ninja	2021-01-15 16:17:03 +09:00
Zelllll	d2bed729be	reverted name of macro	2021-01-14 21:19:49 -06:00
Alex Bates	63aa87446b	ninja src/**/*.c	2021-01-14 03:56:02 +00:00
dark-samus	6f304364c6	merge master	2021-01-07 14:59:49 -05:00
Ethan Roseman	1c7a19255b	Merge branch 'master' into misc-decomp	2021-01-01 10:20:39 +09:00
Ethan Roseman	c42debe758	M -> N, StartRumbleWithParams dup	2020-12-28 16:09:39 +09:00
Ethan Roseman	1c52052c12	Merge branch 'master' into audio	2020-12-22 18:13:24 +09:00
Ethan Roseman	b753ff25ed	non audio :floshed:	2020-12-20 12:47:09 +09:00
Rain	ad44b62331	add macro usage to initialize_status_menu()	2020-12-05 03:10:01 -06:00
Ethan Roseman	d39d5837c3	alHeapAlloc	2020-12-01 18:23:26 -05:00
dark-samus	48487dbab0	merge master	2020-11-21 02:45:11 -05:00
dark-samus	d68a3e84a6	merge master	2020-11-18 00:35:50 -05:00
dark-samus	3676d8cd6c	decomp more, delete as for matched funcs	2020-11-18 00:32:18 -05:00
Ethan Roseman	f1279977bd	various decomp, cleaning splat.yaml	2020-11-18 00:20:28 -05:00
Ethan Roseman	0f72d512b3	item decomp	2020-11-12 00:44:10 -05:00
Ethan Roseman	9f69203bb3	badge work	2020-11-10 15:21:37 -05:00
Ethan Roseman	cdd2d6bd15	ASM update and types	2020-11-08 15:40:26 -05:00
Ethan Roseman	5ae79b7f86	Various decomp	2020-11-05 19:30:17 -05:00
Ethan Roseman	9494153160	PR comments	2020-10-26 17:45:24 -04:00
Ethan Roseman	2462200b48	Merge branch 'master' into cornucopia	2020-10-22 17:16:58 -04:00
Alex Bates	0ea4d24deb	merge master	2020-10-22 17:34:31 +01:00
dark-samus	49c7ba0239	add list types and fix code that uses them	2020-10-21 20:07:00 -04:00
Alex Bates	c2ba2ea7c5	add STATIC_ASSERT	2020-10-21 17:16:42 +01:00
Alex Bates	1dc8a3583d	declare M in map.h	2020-10-21 14:12:24 +01:00
Ethan Roseman	773f9256c4	GetNpcCollisionHeight	2020-10-20 22:47:13 -04:00
alex	607dba0c58	Merge branch 'master' into misc-improvements	2020-10-20 18:51:56 +01:00
Alex Bates	23f8d8ee35	add structs/macros for matching map data	2020-10-20 04:11:07 +01:00
Ethan Roseman	8e104e1147	AwaitPlayerNearNPC	2020-10-19 18:47:29 -04:00
dark-samus	430ff41bc6	lots of stuff	2020-10-12 21:28:01 -04:00
Ethan Roseman	bbca99bd94	ASM macro fix, decomp of many	2020-09-25 17:18:09 -04:00
Ethan Roseman	196abe7db2	Addr file and macro fix	2020-09-22 18:54:01 -04:00
Ethan Roseman	11d7006656	Types in INCLUDE_ASM_T macro	2020-09-22 17:36:30 -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
Alex Bates	7498c2dc1c	require directory as string in INCLUDE_ASM macro	2020-08-17 22:10:44 +01:00
Alex Bates	1a36566cdc	add ASSERT macro	2020-08-17 13:09:19 +01:00
Ethan Roseman	430e6dff98	Adding macro.inc include to macro	2020-08-12 22:46:59 -04:00
Ethan Roseman	0782fa07a3	Refactoring stuff	2020-08-12 21:56:23 -04:00