691 Commits

Author	SHA1	Message	Date
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	47b70ab74f	Remember to hit ctrl+s on documents. It's important.	2020-08-23 18:40:11 -07:00
Ethan Roseman	b9c67f8f7e	Merge remote-tracking branch 'origin/master' into si	2020-08-23 20:34:29 -04:00
Jdog	c140901612	#include enums.h in variables.h to make format script happy	2020-08-22 16:39:45 -07: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	e8ed3ae03f	Match SetCamEnabled, SetCamFlag80, SetCamPerspective, func_802CA90C. WIP func_802CA988. Modified Camera struct.	2020-08-20 09:41:42 -07:00
Josh	7e4d7f9085	Merge branch 'master' into master	2020-08-19 19:26:09 -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
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	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	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
Alex Bates	b5256e31ee	add astyle, update clang-tidy config	2020-08-19 01:11:25 +01: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
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	cd74f41fc0	Merge master into assert	2020-08-17 18:16:13 +01:00
Alex Bates	f762aa1139	add misc global vars from SR database	2020-08-17 13:40:21 +01:00
Alex Bates	1a36566cdc	add ASSERT macro	2020-08-17 13:09:19 +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	5103d1cc7d	remove duplicate StaticNpcSettings declaration	2020-08-16 04:22:21 +01:00
Alex Bates	e40b05d9c5	rename types (#20)	2020-08-16 04:19:00 +01:00
Alex Bates	3c527f99d9	add newline at eof	2020-08-16 02:54:04 +01:00
Alex Bates	1b6d31e6ee	Merge #21 into f8f60	2020-08-16 02:51:54 +01:00
Jdog	7beaf4c461	Match CloseChoice, CancelMessage, CancelMessageAndBlock. Added gCurrentPrintContext and D_802DB268 (related)	2020-08-15 14:51:44 -07:00
Alex Bates	4bb2eb3ed2	rename si_vars.h to si.h	2020-08-15 22:12:50 +01:00
Alex Bates	66d6883188	update get_variable, get_npc signatures	2020-08-15 19:49:26 +01:00
Alex Bates	2bd2a1c97c	fix float constant	2020-08-15 19:03:29 +01: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	cbc5f2fe40	match AwaitPlayerApproach, IsPlayerWithin, AwaitPlayerLeave, GetDist2D	2020-08-15 13:00:13 +01: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
Ethan Roseman	1d3c037d9a	fixing header format	2020-08-14 23:54:29 -04:00
Josh	541f8058e2	Merge branch 'master' into master	2020-08-14 20:37:33 -07:00
Alex Bates	97d6f772ee	Merge master into lerp	2020-08-15 04:13:54 +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
Ethan Roseman	a414ce047b	Merge branch 'master' into si	2020-08-14 22:50:30 -04: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
Jdog	73a39e0747	undo change to script_context struct that was experimental	2020-08-14 16:33:44 -07:00
Jdog	1a4f01fe7b	Fixing some issues and including removal of .s files	2020-08-14 16:31:50 -07:00
Alex Bates	eb3ef759d7	Merge remote-tracking branch 'origin/master' into sr-structs	2020-08-14 23:59:42 +01:00
Alex Bates	a2ab091516	Merge remote-tracking branch 'origin/sr-structs-ethan' into sr-structs	2020-08-14 23:55:03 +01:00
Alex Bates	4724a110a5	generate enums.h	2020-08-14 23:53:01 +01:00
Alex Bates	6c59c2fca7	swap bg_header raster/palette fields	2020-08-14 23:53:01 +01:00
Jdog	760e1351fb	Working more on script-related functions	2020-08-14 15:05:05 -07:00
Ethan Roseman	6e44a205e9	OK	2020-08-14 17:53:45 -04:00
Alex Bates	5e6173f25b	generate common_structs.h from star rod database	2020-08-14 21:10:34 +01:00
Ethan Roseman	56ef80de67	Merge remote-tracking branch 'origin/master' into si	2020-08-14 11:23:15 -04:00
Ethan Roseman	7e0880dfdd	Work on script interpreter	2020-08-14 11:18:05 -04:00
Ethan Roseman	1620b367ee	Merge pull request #6 from JoshW-7/master ... Added gCurrentScriptList and some more matching funcs	2020-08-14 11:09:37 -04:00
Ethan Roseman	bc5fa0f5bf	fix master	2020-08-14 11:05:28 -04:00
Ethan Roseman	4dbaf81ed2	Merge pull request #7 from nanaian/load_map_bg ... match load_map_bg	2020-08-14 10:58:16 -04:00
Jdog	c179e51a88	Change to use ARRAY_COUNT for script list stuff	2020-08-14 07:50:44 -07:00
Jdog	73e1eff76e	more refinements on script list stuff	2020-08-14 07:25:33 -07:00
Alex Bates	652d2ada46	match game_status	2020-08-14 12:47:54 +01:00
Alex Bates	9eb74da229	use char[] type for string externs	2020-08-14 05:25:13 +01:00
Alex Bates	357220cf92	fix some mis-sized unknown fields	2020-08-14 05:22:59 +01:00
dark-samus	84ecb71d07	add fairly close to matching is_ability_active commented	2020-08-14 00:20:11 -04:00
Alex Bates	78d23805e0	wip: update game_status struct ... Non-matching right now, I probably made an alignment/sizing error somewhere - proofreading would be appreciated.	2020-08-14 05:08:55 +01:00
Alex Bates	15f3d1a565	use bg_header type for gBackgroundImage	2020-08-14 04:37:24 +01:00
Alex Bates	86c2917cc0	match load_map_bg ... Also added three new symbols to `undefined_syms.h`. Two of these are almost certainly string literals in `load_map_bg`, but we don't have rodata capability yet so they have to be declared in a different way.	2020-08-14 04:25:16 +01:00
Jdog	6aa628f3ac	Added gCurrentScriptList and some more matching funcs	2020-08-13 19:53:38 -07:00
Jdog	56391da10c	Merge remote-tracking branch 'upstream/master'	2020-08-12 22:07:53 -07:00
Ethan Roseman	7d5c31a6e6	Cleanup, starting trigger functions	2020-08-13 01:03:47 -04:00
Jdog	9b60b24cb7	removed uneccessary global vars	2020-08-12 21:10:41 -07: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