falso
/
papermario
mirror of https://github.com/pmret/papermario.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
430 Commits 6 Branches 0 Tags 283 MiB
Commit Graph

82 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 e8ed3ae03f Match SetCamEnabled, SetCamFlag80, SetCamPerspective, func_802CA90C. WIP func_802CA988. Modified Camera struct. 2020-08-20 09:41:42 -07:00
Josh 7e4d7f9085
Merge branch 'master' into master 2020-08-19 19:26:09 -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
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
Jdog 17d513eeba Added function prototype for set_npc_yaw. Match NpcJump0, NpcJump1, GetNpcYaw, SetNpcYaw 2020-08-18 17:31:39 -07: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
Alex Bates b5256e31ee
add astyle, update clang-tidy config 2020-08-19 01:11:25 +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 7498c2dc1c
require directory as string in INCLUDE_ASM macro 2020-08-17 22:10:44 +01:00
Alex Bates cd74f41fc0
Merge master into assert 2020-08-17 18:16:13 +01:00
Alex Bates f762aa1139
add misc global vars from SR database 2020-08-17 13:40:21 +01:00
Alex Bates 1a36566cdc
add ASSERT macro 2020-08-17 13:09:19 +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 46c2016bf1
rename enums 2020-08-16 05:24:20 +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 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
Alex Bates 4bb2eb3ed2 rename si_vars.h to si.h 2020-08-15 22:12:50 +01:00
Alex Bates 66d6883188 update get_variable, get_npc signatures 2020-08-15 19:49:26 +01:00
Alex Bates 2bd2a1c97c fix float constant 2020-08-15 19:03:29 +01:00
Jdog 19b143fdd3 Match DeleteNpc 2020-08-15 09:57:33 -07:00
Alex Bates 25025e4c4d style: add newline at eof 2020-08-15 17:37:11 +01:00
Alex Bates 946680f312 match most functions in f8f60 2020-08-15 15:32:48 +01:00
Alex Bates cbc5f2fe40 match AwaitPlayerApproach, IsPlayerWithin, AwaitPlayerLeave, GetDist2D 2020-08-15 13:00:13 +01: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
Ethan Roseman 1d3c037d9a fixing header format 2020-08-14 23:54:29 -04:00
Josh 541f8058e2
Merge branch 'master' into master 2020-08-14 20:37:33 -07:00
Alex Bates 97d6f772ee Merge master into lerp 2020-08-15 04:13:54 +01:00
Ethan Roseman 81e3edffb4
Merge pull request #13 from pixel-stuck/master 
Fix assembler bug + misc other changes
 2020-08-14 23:08:36 -04:00
Ethan Roseman a414ce047b Merge branch 'master' into si 2020-08-14 22:50:30 -04:00