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

503 Commits

Author SHA1 Message Date
Ethan Roseman e1b4b8b594 🐱 2020-10-16 16:29:55 -04:00
Alex Bates 46586ba9ba
match actor/part decoration funcs 2020-10-16 20:07:41 +01:00
Ethan Roseman 9e9ce5bb29 👀 2020-10-16 14:49:18 -04:00
Alex Bates c1fabdfad9
match and name create_part_shadow_by_ptr 2020-10-16 18:15:51 +01:00
Alex Bates ddbb46112d
match create_part_shadow and heroes_is_ability_active 2020-10-16 17:59:36 +01:00
Ethan Roseman 369cb32bbc hey rain 2020-10-16 02:09:20 -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 a285afc756 Use all symbols in symbol_addrs.txt 2020-10-15 00:43:07 -04:00
Ethan Roseman 8c9e999bfc Cleanup 2020-10-15 00:24:44 -04:00
Ethan Roseman 3b40b9b28d Asm update 2020-10-15 00:18:54 -04:00
Ethan Roseman 1b407d6364 Merge branch 'master' into asm-cleanup 2020-10-14 23:56:20 -04:00
Ethan Roseman 46f1d49601 Splitting remaining files 2020-10-14 23:49:49 -04:00
Ethan Roseman 5d75311b41 removing func_8005FB10.s 2020-10-14 23:22:17 -04:00
Ethan Roseman 12c8605fcf Split files 2020-10-14 23:20:51 -04:00
Ethan Roseman 4deae1a8e0 remove contRmbControl 2020-10-14 22:59:30 -04:00
Ethan Roseman 84f211a2ae First pass 2020-10-14 22:56:47 -04:00
Ethan Roseman 1f54aaefa1
Merge pull request #69 from nanaian/intro 
Various things
 2020-10-14 20:57:37 -04:00
Alex Bates c1df5a8612
near-match boot_main 2020-10-15 01:49:59 +01:00
Alex Bates 0a2b3780a3
rename curtain globals 2020-10-15 00:16:44 +01:00
Alex Bates 8a4c4fbbf5
fix coverage, remove extraneous nusys asm 2020-10-14 21:48:16 +01:00
Ethan Roseman 3dc2c9fe67 Merge branch 'master' into in-progress 2020-10-14 16:02:26 -04:00
Ethan Roseman 9510d4fff6
Merge pull request #54 from JoshDuMan/Testing 
Begin decompiling nusys
 2020-10-14 15:59:53 -04:00
JoshDuMan 656eb98424 Merge branch 'Testing' of https://github.com/JoshDuMan/papermario into Testing 2020-10-14 13:37:04 -04:00
JoshDuMan 230597b4ee Fix PR requests 2020-10-14 13:36:34 -04:00
Ethan Roseman ac54bf13e8 9 more 2020-10-14 12:45:54 -04:00
Alex Bates e068d2848b
match func_80028838 2020-10-14 17:11:59 +01:00
Alex Bates 7731c8c373
match some stub functions 2020-10-14 16:48:20 +01:00
Alex Bates ee5cb1b8aa
match no-op functions 2020-10-14 16:43:51 +01:00
Ethan Roseman 7cd481c1a2 Merge branch 'master' into in-progress 2020-10-13 21:57:58 -04:00
dark-samus e465321115 format + deleted matched 2020-10-12 22:25:46 -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 2323879ef1
Merge branch 'master' into Testing 2020-10-12 20:32:15 -04:00
Ethan Roseman 5086e559a4 meowp 2020-10-11 21:59:42 -04:00
Ethan Roseman 41e9cf18ba matched func_80145CE8 2020-10-09 14:55:23 -04:00
Ethan Roseman 09a5186443 . 2020-10-09 14:26:33 -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 2f67a08a29 ASM round 2 + many decomped funcs 2020-10-06 15:16:17 -04:00
Ethan Roseman b68891331f Float funcs fixed 2020-10-05 16:04:33 -04:00
Ethan Roseman 9d37af0d65 freebie 2020-10-03 16:11:05 -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
JoshDuMan 84db54fce8 Merge in master 2020-09-28 00:00:10 -04:00
JoshDuMan 37565257e6 Merge branch 'Testing' of https://github.com/JoshDuMan/papermario into Testing 2020-09-27 22:43:04 -04:00
JoshDuMan 55dfeef1c8 Work on nuSched 2020-09-27 22:42:51 -04:00
Ethan Roseman 51c076bd8e symbols! 2020-09-27 21:13:56 -04:00
Ethan Roseman 19f82d642d 5 more 2020-09-27 20:17:51 -04:00
Ethan Roseman c541824930 SetSelfEnemyFlagBits 2020-09-27 19:57:02 -04:00
Ethan Roseman 164c6e76d3 curtains 2020-09-27 14:13:50 -04:00
Ethan Roseman 82b3662064 2 more 2020-09-27 13:57:40 -04:00
Ethan Roseman 36c5bde376 more goods 2020-09-26 21:02:29 -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 8be527b2cf Splat update & one new code file 2020-09-23 23:38:08 -04:00
Ethan Roseman e5de7baa7f a few changes 2020-09-23 23:16:13 -04:00
Ethan Roseman a9e5d79531 more 2020-09-21 23:10:53 -04:00
Ethan Roseman fc1361c4b8 oopz 2020-09-21 21:00:47 -04:00
Ethan Roseman a1d39c1c1e Sounds and flags 2020-09-21 20:56:17 -04:00
JoshDuMan 0a3874a0d0
Merge branch 'master' into Testing 2020-09-21 01:51:52 -04:00
JoshDuMan 7e632e3ceb Decompile nuContRmbMgr 2020-09-21 00:37:52 -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
JoshDuMan ed816c640f hi 2020-09-18 16:48:52 -04:00
dark-samus 94e77f99d1 lots of changes 2020-09-18 16:07:15 -04:00
Ethan Roseman 5fa1be7e2a More 2020-09-18 01:51:36 -04:00
Ethan Roseman 7f6b34c29b Some more SI funcs 2020-09-17 21:28:34 -04:00
Ethan Roseman ddb9f77fc1 Misc 42e0 funcs, new SQ macro, removing no-builtin 2020-09-11 16:29:52 -04:00
Ethan Roseman 0f1c5c4e55
Merge pull request #48 from ethteck/various-stuff 
Various funcs
 2020-09-08 16:37:20 -04:00
Ethan Roseman 373969d474
Merge pull request #43 from nanaian/physics 
match some in code_7bb60, fix coverage.py, fix lint action
 2020-09-08 08:21:20 -04:00
Alex Bates 8d7e4b327e
match set_action_state 
Thanks @pixel-stuck!
 2020-09-08 12:21:15 +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
Ethan Roseman 66cc5a1ee6
Merge pull request #46 from ethteck/code-6000-done 
Finished code_6000.c
 2020-09-02 14:40:35 -04:00
Ethan Roseman ee8d55d6a2 PR fixes and a couple more 2020-09-02 12:37:33 -04:00
Ethan Roseman 90d2ddf2f6 Finished code_6000.c 2020-09-01 21:45:06 -04:00
sonicspiral f389bf188e removed func_8014A52C from asm/nonmatchings/code_e0b30_len_b80/ 2020-08-30 01:51:58 -07: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 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 50a791ea0b 9 more 2020-08-24 00:16:43 -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 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 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
Jdog 6aa628f3ac Added gCurrentScriptList and some more matching funcs 2020-08-13 19:53:38 -07:00
Alex Bates 29db02ea7d match RemoveFortressKeys 2020-08-14 03:24:21 +01:00
Alex Bates e06fbbab51 match CountFortressKeys 
Also fixed typo in the function name ('Fortess').
 2020-08-14 03:22:41 +01:00
Alex Bates 707d25f656 match RemoveItem, almost 
The generated addu instruction on the line marked with FIXME has its operands in a different order.
 2020-08-14 02:55:06 +01:00
Alex Bates 31cabbeeff match FindItem 2020-08-14 02:43:04 +01:00
Alex Bates 4ccb221916 remove battle_heap_create asm 2020-08-14 01:50:25 +01:00
Ethan Roseman 7d5c31a6e6 Cleanup, starting trigger functions 2020-08-13 01:03:47 -04:00
Ethan Roseman e37c5b8194 removing .inc 2020-08-12 22:37:16 -04:00
Ethan Roseman 0782fa07a3 Refactoring stuff 2020-08-12 21:56:23 -04:00