Commit Graph

434 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
01f92022e9 . 2020-08-23 18:42:04 -07:00
Jdog
47b70ab74f Remember to hit ctrl+s on documents. It's important. 2020-08-23 18:40:11 -07:00
Jdog
86a51e3f69 gPlayerNpc to gPlayerNpcPtr & small formatting fix 2020-08-23 18:38:50 -07: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
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
8677bf3af1
Merge pull request #38 from JoshW-7/master
Lots of Cam funcs & updates to Camera struct.
2020-08-21 14:37:43 -04:00
Jdog
177a9f0fe6 Several more Camera functions & struct changes 2020-08-21 08:04:57 -07:00
Jdog
540b74c71b Remove n64splitter 2020-08-20 16:41:10 -07:00
Jdog
eb82e98854 Lots more matching Camera-related functions 2020-08-20 14:16:52 -07:00
Ethan Roseman
d5a453b2c1
Merge pull request #37 from ethteck/splat
Further LD improvements
2020-08-20 16:39:31 -04:00
Ethan Roseman
dd080cbd38 Further LD improvements 2020-08-20 16:33:21 -04: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
Ethan Roseman
5d08b829a5
Merge pull request #36 from ethteck/splat
Testing condensed ld
2020-08-20 14:37:28 -04:00
Ethan Roseman
8c5aa0d027 Testing condensed ld 2020-08-20 14:22:11 -04:00
Jdog
6145ce6c94 Merge branch 'master' of https://github.com/JoshW-7/papermario 2020-08-20 10:12:13 -07:00
Jdog
fa0fc93187 Formatting 2020-08-20 10:11:36 -07:00
Jdog
e818be1b9f Formatting 2020-08-20 10:09:18 -07:00
Jdog
e8ed3ae03f Match SetCamEnabled, SetCamFlag80, SetCamPerspective, func_802CA90C. WIP func_802CA988. Modified Camera struct. 2020-08-20 09:41:42 -07:00
Ethan Roseman
56928c3089
Merge pull request #35 from ethteck/tidying-splat
Basic tidying
2020-08-20 12:39:16 -04:00
Ethan Roseman
b498086436
Merge pull request #27 from nanaian/coverage
remove matched asm, add NON_MATCHING
2020-08-20 12:38:42 -04:00
Ethan Roseman
610bc61443 Basic tidying 2020-08-20 12:37:26 -04:00
Alex Bates
bb263e818f
remove n64splitter submodule 2020-08-20 17:19:22 +01:00
Alex Bates
f708590e44
actually fix coverage.py this time 2020-08-20 17:11:03 +01:00
Alex Bates
325fec679c
fix codestyle
Bitten by my own script. Damn.
2020-08-20 17:07:05 +01:00
Alex Bates
130ebd5401
ci: fix coverage 2020-08-20 17:06:48 +01:00
Alex Bates
4f2261c5d9
resolve conflicts with master 2020-08-20 17:02:57 +01:00
Ethan Roseman
90c8ca6429
Merge pull request #34 from nanaian/splat-fix-install
add dependencies for n64splat
2020-08-20 11:59:19 -04:00
Alex Bates
b19b406850
apt-get -> apt 2020-08-20 16:54:19 +01:00
Alex Bates
f9ddece6cb
add dependencies for n64splat 2020-08-20 12:40:24 +01:00
Ethan Roseman
97e390269f
Merge pull request #33 from ethteck/splat
N64Splat added!
2020-08-20 02:28:10 -04:00
Ethan Roseman
51eca76be3 Update splat 2020-08-20 02:25:11 -04:00
Ethan Roseman
a7d8f6dd96 N64Splat added ;) 2020-08-20 01:42:31 -04:00
Ethan Roseman
703668e3e3
Merge pull request #32 from JoshW-7/master
More NPC functions
2020-08-19 22:57:22 -04: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
Ethan Roseman
8cb8c07189
Merge pull request #26 from nanaian/clang-format
add astyle, clang-tidy
2020-08-19 22:17:27 -04: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
54fc47a0eb
fix lint workflow 2020-08-19 23:33:22 +01:00
Alex Bates
0e9e50c64d
resolve conflicts with master, remove enum ScriptBufferValue 2020-08-19 23:28:08 +01:00
Alex Bates
ea32764c77
disable questionable clang-tidy checks 2020-08-19 23:09:09 +01:00
Jdog
65f1db2e87 Match func_802B7000 2020-08-19 09:55:52 -07:00
Jdog
51ff61c479 Remove SetNpcEffect.s 2020-08-19 07:35:56 -07:00