Commit Graph

59 Commits

Author SHA1 Message Date
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
e8ed3ae03f Match SetCamEnabled, SetCamFlag80, SetCamPerspective, func_802CA90C. WIP func_802CA988. Modified Camera struct. 2020-08-20 09:41:42 -07:00
Alex Bates
4f2261c5d9
resolve conflicts with master 2020-08-20 17:02:57 +01:00
Ethan Roseman
a7d8f6dd96 N64Splat added ;) 2020-08-20 01:42:31 -04: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
Jdog
ada5f9dcfe Match SetNpcEffect, PlaySoundAtNpc, SetNpcRenderMode (previously un-named func defined by me) 2020-08-19 07:34:52 -07:00
Jdog
057c73be8e Remove EnablePartnerAI.s 2020-08-18 21:58:26 -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
c52ad332cc
Merge branch 'master' into coverage 2020-08-19 02:00:00 +01:00
Jdog
17d513eeba Added function prototype for set_npc_yaw. Match NpcJump0, NpcJump1, GetNpcYaw, SetNpcYaw 2020-08-18 17:31:39 -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
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
00306ce572
Merge pull request #17 from Rainchus/master
ebd0 matched functions
2020-08-18 12:43:25 -04: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
ca003e2471
remove matched asm 2020-08-18 01:19:21 +01:00
Alex Bates
9f50926f9b
match si_handle_switch, si_handle_switch_const 2020-08-17 13:07:33 +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
Jdog
98e5db0630 Match EndSpeech, ContinueSpeech, SpeakToNpc, SetMessageImages, func_802D0C94, SetMessageString. WIP SetMessageValue (issue with extra NOP) 2020-08-15 13:54:06 -07:00
Jdog
23de219c07 Match SpeakToPlayer, remove uneccessary comment, add WIP SetNpcSpeed 2020-08-15 13:11:31 -07:00
Jdog
7d20b29129 Match GetNpcPointer 2020-08-15 10:59:48 -07:00
Jdog
19b143fdd3 Match DeleteNpc 2020-08-15 09:57:33 -07:00
Alex Bates
946680f312 match most functions in f8f60 2020-08-15 15:32:48 +01:00
Alex Bates
5f588bca92 match EnableStatusMenu, ShowStatusMenu 2020-08-15 13:00:51 +01:00
Alex Bates
cbc5f2fe40 match AwaitPlayerApproach, IsPlayerWithin, AwaitPlayerLeave, GetDist2D 2020-08-15 13:00:13 +01:00
Rainchus
47f377eb4a ebd0 matched functions 2020-08-15 02:01:33 -05: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
Josh
541f8058e2
Merge branch 'master' into master 2020-08-14 20:37:33 -07:00
Alex Bates
dd80b5a957 match RandInt 2020-08-15 04:25:48 +01:00
Alex Bates
97d6f772ee Merge master into lerp 2020-08-15 04:13:54 +01:00
Alex Bates
b6ea00038f remove UpdateLerp.s 2020-08-15 04:03:29 +01:00
Jdog
1a4f01fe7b Fixing some issues and including removal of .s files 2020-08-14 16:31:50 -07: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
4dbaf81ed2
Merge pull request #7 from nanaian/load_map_bg
match load_map_bg
2020-08-14 10:58:16 -04:00
Jdog
73e1eff76e more refinements on script list stuff 2020-08-14 07:25:33 -07:00
Ethan Roseman
afc0415a2c
Merge pull request #5 from nanaian/items
match FindItem, RemoveItem, CountFortressKeys, RemoveFortressKeys
2020-08-13 23:28:29 -04: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