Commit Graph

138 Commits

Author SHA1 Message Date
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
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
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