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

200 Commits

Author SHA1 Message Date
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 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 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 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 fa0fc93187 Formatting 2020-08-20 10:11:36 -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 325fec679c
fix codestyle 
Bitten by my own script. Damn.
 2020-08-20 17:07:05 +01:00
Alex Bates 4f2261c5d9
resolve conflicts with master 2020-08-20 17:02:57 +01: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
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 0e9e50c64d
resolve conflicts with master, remove enum ScriptBufferValue 2020-08-19 23:28:08 +01:00
Jdog 65f1db2e87 Match func_802B7000 2020-08-19 09:55:52 -07:00
Jdog ada5f9dcfe Match SetNpcEffect, PlaySoundAtNpc, SetNpcRenderMode (previously un-named func defined by me) 2020-08-19 07:34:52 -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 Bates fbbbf83d22
add NON_MATCHING 2020-08-19 02:45:26 +01:00
Jdog 2864ba6476 Remove comments about omitting return statements 2020-08-18 18:24:56 -07:00
alex c52ad332cc
Merge branch 'master' into coverage 2020-08-19 02:00:00 +01:00
Alex Bates 05d0eff2b1
remove commented INCLUDE_ASM macros 2020-08-19 01:55:56 +01: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 42747be7ae
fix signatures for builtins mistakenly marked as api functions 2020-08-19 01:23:22 +01: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
Jdog 63f8254227 And remove TODO 2020-08-18 15:53:04 -07: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
Jdog b88d8f7afc Match SetNpcScale, SetNpcJumpScale 2020-08-18 14:12:26 -07:00
Jdog e8d377eda0 ...And include comment 2020-08-18 13:47:06 -07:00
Jdog d5bc60ffc9 Move todo variable declaration into if block for SetNpcCollisionSize 2020-08-18 13:46:15 -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 5f04055355 Newline 2020-08-18 12:43:55 -04:00
Ethan Roseman 00306ce572
Merge pull request #17 from Rainchus/master 
ebd0 matched functions
 2020-08-18 12:43:25 -04:00
Alex Bates 25eda26d0b
1024.f -> 1024.0f 2020-08-18 10:30:36 +01: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 82effcaf8e
remove temp comment 2020-08-17 18:27:37 +01:00
Alex Bates cd74f41fc0
Merge master into assert 2020-08-17 18:16:13 +01:00
Alex Bates 1a36566cdc
add ASSERT macro 2020-08-17 13:09:19 +01:00
Alex Bates 9f50926f9b
match si_handle_switch, si_handle_switch_const 2020-08-17 13:07:33 +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 e40b05d9c5
rename types (#20) 2020-08-16 04:19:00 +01:00
Ethan Roseman 934bd5a415
Merge pull request #18 from nanaian/f8f60 
split and match most functions at f8f60
 2020-08-15 22:37:35 -04:00
Alex Bates 1b6d31e6ee
Merge #21 into f8f60 2020-08-16 02:51:54 +01:00
Jdog 7544d4686e Add extra info to comment about file splitting issue 2020-08-15 18:51:51 -07:00
Jdog 01ecc1dd24 Added proper return types to a few script functions. Use ptrReadPos++ in places where it's not stricly necessary, but good practice. 2020-08-15 15:26:14 -07: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
Alex Bates 66d6883188 update get_variable, get_npc signatures 2020-08-15 19:49:26 +01:00
Alex Bates 3c8f57089b remove redundancy comments 2020-08-15 19:03:29 +01:00
Alex Bates 2bd2a1c97c fix float constant 2020-08-15 19:03:29 +01: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 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 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 2a169dc34a remove redundant casts 2020-08-15 04:12:30 +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
Jdog 9496d860e4 Dumb mistake 2020-08-14 19:55:54 -07:00
Ethan Roseman 9a518db863 Fix hard-coded loop counter 2020-08-14 22:55:19 -04:00
Ethan Roseman 8b703053de Add TODO 2020-08-14 22:51:23 -04:00