Commit Graph

223 Commits

Author SHA1 Message Date
Ethan Roseman
cdd2d6bd15 ASM update and types 2020-11-08 15:40:26 -05:00
dark-samus
1e70aa7667 one more 2020-11-08 15:23:39 -05:00
Ethan Roseman
72f4a180f2 SetNpcFlagBits 2020-11-07 23:33:15 -05:00
dark-samus
783f0a2f83 merge master 2020-11-07 19:33:16 -05:00
dark-samus
18a3e6078b more funcs 2020-11-07 19:30:14 -05:00
Ethan Roseman
1173f4c681 :island: 2020-11-07 14:44:44 -05:00
Ethan Roseman
eff6fe2f10 vec3f 2020-11-06 12:32:30 -05:00
Ethan Roseman
5ae79b7f86 Various decomp 2020-11-05 19:30:17 -05:00
JoshDuMan
58e04b19ba Merge https://github.com/ethteck/papermario into stuff 2020-11-02 18:49:38 -05:00
Ethan Roseman
087b30ab35 a couple more kmrs 2020-11-02 16:04:59 -05:00
JoshDuMan
ee3c059779 Work on world functions. 2020-11-02 02:07:02 -05:00
dark-samus
4ab5a61497 merg 2020-11-02 00:28:46 -05:00
dark-samus
73551cac91 another func, new file split 2020-11-01 20:14:01 -05:00
Ethan Roseman
54cd46a228 Merge branch 'master' into maps 2020-10-31 11:44:54 -04:00
dark-samus
623309db81 some funcs 2020-10-31 03:54:00 -04:00
alex
ed62a6999b
Merge branch 'master' into audio 2020-10-31 05:57:48 +00:00
Ethan Roseman
da058dc095 GetGameStatus75 2020-10-30 00:07:11 -04:00
Ethan Roseman
f94c542a9d Set80151310_0 2020-10-29 22:15:51 -04:00
Ethan Roseman
d0d833cd1d LoadPath 2020-10-29 16:16:39 -04:00
Alex Bates
631afbe477
match many small funcs, rename symbols 2020-10-29 03:48:04 +00:00
Alex Bates
a2329fc84a
match func_8014A964, func_8014AC84 2020-10-29 02:17:11 +00:00
Alex Bates
1a6b1f5fcd
rename MusicPlayer unkFlags to flags 2020-10-29 01:35:05 +00:00
Alex Bates
e0c8108543
match _set_music_track 2020-10-29 01:34:00 +00:00
Alex Bates
9eef0b0273
match set_music_track
rewrite flag as NOT


clean up set_music_track temps
2020-10-29 01:34:00 +00:00
Ethan Roseman
90e7a9acab Assorted functions 2020-10-28 02:42:14 -04:00
Ethan Roseman
2d215e6943 Some 1A5830 funcs 2020-10-26 23:31:40 -04:00
Ethan Roseman
eb41485a0a New C file split, many functions decompiled 2020-10-26 19:10:32 -04:00
Ethan Roseman
c2d7449287 SetEntityPosition + co 2020-10-25 22:20:37 -04:00
Ethan Roseman
97f1f96662 SomeItemEntityFunc 2020-10-25 21:12:01 -04:00
Ethan Roseman
4b1f9e0fa5 Some decomp, tons of cleanup 2020-10-24 17:51:27 -04:00
Ethan Roseman
2462200b48 Merge branch 'master' into cornucopia 2020-10-22 17:16:58 -04:00
Ethan Roseman
69a29dc8fc removing extra lines / formatting 2020-10-21 21:43:08 -04:00
dark-samus
49c7ba0239 add list types and fix code that uses them 2020-10-21 20:07:00 -04:00
Ethan Roseman
5bf7732a4e SomeXYZFuncTodoRename 2020-10-21 01:33:24 -04:00
Ethan Roseman
69fd94e161 SetNpcB5_3 2020-10-20 19:02:05 -04:00
Ethan Roseman
6bfd58db59 Merge branch 'master' into cornucopia 2020-10-20 18:00:16 -04:00
Alex Bates
99ac1cf053
update si types 2020-10-20 07:33:40 +01:00
Alex Bates
9b3dedd328
add spaces between structs back
Whoops
2020-10-20 04:38:30 +01:00
Alex Bates
23f8d8ee35
add structs/macros for matching map data 2020-10-20 04:11:07 +01:00
Alex Bates
f9a667bc7d
begin script disassembly 2020-10-19 22:58:57 +01:00
Ethan Roseman
0e132ce687 si_handle_bind_🔒 2020-10-18 21:20:07 -04:00
Alex Bates
bbeef1ff98
near-match ActorSpeak
just regalloc issues
2020-10-17 21:21:57 +01:00
Ethan Roseman
890fd346e9 🌠 2020-10-16 23:47:10 -04:00
Ethan Roseman
36f2fc2f86 clover we miss you 2020-10-16 22:36:28 -04:00
Ethan Roseman
9866661518 Merge branch 'better-cornucopia' into cornucopia 2020-10-16 21:00:37 -04:00
Ethan Roseman
f67477a9eb meowp 2020-10-16 20:59:49 -04:00
Ethan Roseman
67b516d3d2 :arrow: 2020-10-16 18:23:52 -04:00
Ethan Roseman
e1b4b8b594 🐱 2020-10-16 16:29:55 -04:00
Alex Bates
57d69d1e72
match add_actor_decoration, near-match others 2020-10-16 21:29:54 +01:00
Ethan Roseman
9e9ce5bb29 👀 2020-10-16 14:49:18 -04:00
Ethan Roseman
1040a9124c hey clover lol wudup 2020-10-15 23:07:50 -04:00
Ethan Roseman
5bc8e56a91 treats 2020-10-15 22:05:04 -04:00
Ethan Roseman
f45c24f7c8 Some shtuff 2020-10-15 18:11:56 -04:00
Ethan Roseman
ac54bf13e8 9 more 2020-10-14 12:45:54 -04:00
dark-samus
733b591d5f merge master 2020-10-12 22:16:00 -04:00
dark-samus
430ff41bc6 lots of stuff 2020-10-12 21:28:01 -04:00
Ethan Roseman
8490965da5 fixing format 2020-10-10 13:42:15 -04:00
Ethan Roseman
41e9cf18ba matched func_80145CE8 2020-10-09 14:55:23 -04:00
Ethan Roseman
eb6aaccd73 more 2020-10-08 17:45:26 -04:00
Ethan Roseman
011231df41 Many more functions decomped 2020-10-08 15:03:58 -04:00
Ethan Roseman
b68891331f Float funcs fixed 2020-10-05 16:04:33 -04:00
Ethan Roseman
5794cdf6fc Some more 2020-10-03 16:04:49 -04:00
Ethan Roseman
926df66474 saving for later 2020-10-02 02:07:54 -04:00
dark-samus
c79f950a04 big merg 2020-09-28 16:59:36 -04:00
Ethan Roseman
677ec4f4e5 more 2020-09-25 22:49:59 -04:00
Ethan Roseman
210e65c3bf More decomp + coverage fix 2020-09-25 21:51:54 -04:00
Ethan Roseman
bbca99bd94 ASM macro fix, decomp of many 2020-09-25 17:18:09 -04:00
Ethan Roseman
a9e5d79531 more 2020-09-21 23:10:53 -04:00
Ethan Roseman
5121395a7e Struct update & formatting 2020-09-21 20:59:58 -04:00
Ethan Roseman
a1d39c1c1e Sounds and flags 2020-09-21 20:56:17 -04:00
Ethan Roseman
4e6a401484 byte/flag stuff 2020-09-19 11:16:02 -04:00
dark-samus
bb5d337778 big update 2020-09-18 16:57:52 -04:00
dark-samus
94e77f99d1 lots of changes 2020-09-18 16:07:15 -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
0f1c5c4e55
Merge pull request #48 from ethteck/various-stuff
Various funcs
2020-09-08 16:37:20 -04:00
Alex Bates
db1accd991
type PlayerStatus::unk_D8 2020-09-08 12:25:57 +01:00
Ethan Roseman
ab244966a8 more 2020-09-07 17:12:31 -04:00
Ethan Roseman
290a7426a5 Various funcs 2020-09-06 11:53:48 -04: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
b9c67f8f7e Merge remote-tracking branch 'origin/master' into si 2020-08-23 20:34:29 -04: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
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
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
Alex Bates
f19e2edbd3
format files 2020-08-19 01:16:12 +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
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
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
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
Alex Bates
97d6f772ee Merge master into lerp 2020-08-15 04:13:54 +01:00
Ethan Roseman
a414ce047b Merge branch 'master' into si 2020-08-14 22:50:30 -04:00
Alex Bates
dae676c8af match UpdateLerp 2020-08-15 01:49:33 +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
6c59c2fca7 swap bg_header raster/palette fields 2020-08-14 23:53:01 +01: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
7e0880dfdd Work on script interpreter 2020-08-14 11:18:05 -04:00
Ethan Roseman
bc5fa0f5bf fix master 2020-08-14 11:05:28 -04:00
Alex Bates
652d2ada46 match game_status 2020-08-14 12:47:54 +01:00
Alex Bates
357220cf92 fix some mis-sized unknown fields 2020-08-14 05:22:59 +01: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
Ethan Roseman
7d5c31a6e6 Cleanup, starting trigger functions 2020-08-13 01:03:47 -04:00
Ethan Roseman
0782fa07a3 Refactoring stuff 2020-08-12 21:56:23 -04:00