Commit Graph

603 Commits

Author SHA1 Message Date
Ethan Roseman
f3edd49096
Merge pull request #44 from ethteck/si
Two functions & splat update
2020-08-26 19:44:51 -04:00
Ethan Roseman
7633f31d87 Update splat 2020-08-26 19:14:44 -04:00
Ethan Roseman
74a46100c1 2 more 2020-08-26 18:54:55 -04:00
Alex Bates
cfe3a40880
move ActionState comment 2020-08-24 14:22:44 +01:00
Alex Bates
1546efeec0
bump n64splat 2020-08-24 14:18:49 +01:00
Alex Bates
b37ca1583c
ci: don't fail lint on first push to new branch 2020-08-24 13:53:19 +01: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
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
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
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
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
Alex Bates
42688faecd
match check_input_hammer 2020-08-20 20:15:06 +01:00
Alex Bates
7f2e872956
fix coverage.py --delete-matched 2020-08-20 20:02:06 +01:00
Alex Bates
79944164d9
wip: set_action_state 2020-08-20 19:43:45 +01:00
Ethan Roseman
5d08b829a5
Merge pull request #36 from ethteck/splat
Testing condensed ld
2020-08-20 14:37:28 -04:00
Alex Bates
e54bb887d7
match move_player 2020-08-20 19:26:34 +01: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