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 a29506d990 197F40 some funcs 2020-11-27 16:30:56 -05:00
Ethan Roseman 93c1cb5a4a 197F40 funcs 2020-11-27 14:38:52 -05:00
Ethan Roseman 71dde79186 asm update 2020-11-27 01:39:15 -05:00
Ethan Roseman def7b12a2d e0b30 2020-11-27 01:14:28 -05:00
Ethan Roseman c8448c7ec2 more 181810 2020-11-26 16:41:01 -05:00
Ethan Roseman 1e02c566ad a few more 2020-11-26 16:19:34 -05:00
Ethan Roseman 03349746a4 Status->Debuff 2020-11-26 15:34:10 -05:00
Ethan Roseman 83c1c2196d asm update 2020-11-23 14:48:06 -05:00
Ethan Roseman 96a2d67c2e some more 2020-11-23 14:44:38 -05:00
Ethan Roseman 9f068a6461 some of 317E50 2020-11-23 14:23:07 -05:00
Ethan Roseman 3df62667fb Some of 317020 2020-11-23 14:19:13 -05:00
Ethan Roseman 8271cb5636 3251D0 OK 2020-11-23 13:48:34 -05:00
Ethan Roseman dcd2acf4fe UnkNpcAIFunc11 2020-11-22 15:47:15 -05:00
Ethan Roseman f96113fb7b NpcJumpFunc3 2020-11-22 15:26:38 -05:00
Ethan Roseman 8574e9b538 UnkNpcAIFunc10 2020-11-22 15:16:08 -05:00
Ethan Roseman ccde4308bc UnkNpcAIFunc9 2020-11-22 11:36:35 -05:00
Ethan Roseman e8774ab163 UnkFunc2 2020-11-22 11:14:56 -05:00
Ethan Roseman 1f82a0c857 SetPartnerFlags20000 2020-11-22 11:06:57 -05:00
Ethan Roseman c5ebc6a376 SetGameStatusUnk84_1 2020-11-22 11:03:02 -05:00
Ethan Roseman b9cbed38c4 SetPartnerFlags80000 2020-11-22 10:56:38 -05:00
Ethan Roseman 7e24097436 SetPartnerFlagsA0000 2020-11-22 10:53:16 -05:00
Ethan Roseman 41b7fd69a1 UnkYawFunc 2020-11-22 10:46:50 -05:00
Ethan Roseman a2f84553ed UnkNpcAIFunc8 2020-11-22 10:27:43 -05:00
Ethan Roseman be82772294 deleting asm 2020-11-21 23:48:21 -05:00
Ethan Roseman d801c72075 UnkNpcAIFunc7 2020-11-21 23:47:41 -05:00
Ethan Roseman 1cdf9d7c7c UnkNpcAIFunc6 2020-11-21 23:41:28 -05:00
Ethan Roseman 36e421710d UnkNpcAIFunc5 2020-11-21 23:32:54 -05:00
Ethan Roseman a82d6893ed UnkNpcAIFunc4 2020-11-21 23:25:13 -05:00
Ethan Roseman 931d3b358b UnkNpcAIFunc3 2020-11-21 20:54:57 -05:00
Ethan Roseman 26299a4a51 UnkNpcAIFunc2 2020-11-21 20:45:02 -05:00
Ethan Roseman 7d09429fd6 GetEntryPos 2020-11-21 20:31:57 -05:00
Ethan Roseman 2d3e328905 UnkDurationCheck 2020-11-21 19:34:13 -05:00
Ethan Roseman bfa719011a Removing extras 2020-11-20 18:01:08 -05:00
Ethan Roseman 266e94ddfd UnkSetDurationFunc 2020-11-20 18:00:44 -05:00
Ethan Roseman e0e8885781 GetEncounterEnemyIsOwner 2020-11-20 17:45:02 -05:00
Ethan Roseman 24d87054ff NpcJumpFunc2 2020-11-20 10:04:59 -05:00
Ethan Roseman 7ae4f565f7 UnkNpcDurationFlagFunc 2020-11-20 09:55:56 -05:00
Ethan Roseman 26417ed814 UnkMusicFunc 2020-11-20 09:44:08 -05:00
Ethan Roseman fb85b1d269 another 2020-11-20 00:16:08 -05:00
Ethan Roseman 850635eea8 NpcJumpFunc 2020-11-19 23:21:23 -05:00
Ethan Roseman 4b8af37c35 UnkNpcAIFunc1 2020-11-19 23:08:05 -05:00
Ethan Roseman 0f530e12aa 5 mo 2020-11-19 19:58:41 -05:00
Ethan Roseman 3a2f17b91d a few more 2020-11-19 19:41:49 -05:00
Ethan Roseman 201ce54455 197F40 funcs 2020-11-18 22:17:41 -05:00
Ethan Roseman af33521ffb silly asm update 2020-11-18 18:51:37 -05:00
Ethan Roseman e682166792 Merge remote-tracking branch 'origin/master' into cornucopia 2020-11-18 14:10:14 -05:00
Ethan Roseman f1279977bd various decomp, cleaning splat.yaml 2020-11-18 00:20:28 -05:00
Ethan Roseman a0ec3e79c3 4 16c8e0 funcs 2020-11-17 22:00:47 -05:00
Ethan Roseman 0192620100
Merge pull request #123 from Kelebek1/Fixes 
Fix a couple functions
 2020-11-17 20:23:49 -05:00
Ethan Roseman e67d69b88e 4 funcs in code_1A5830 2020-11-15 22:04:33 -05:00
Ethan Roseman f616532137 osSiDeviceBusy 2020-11-13 01:36:13 -05:00
Ethan Roseman f6f56a8a5f libultra organization 2020-11-13 01:17:53 -05:00
Ethan Roseman d2bd96e127 couple more 2020-11-12 19:27:57 -05:00
Ethan Roseman 38f3e12f66 UI Panels 2020-11-12 13:38:17 -05:00
Lavos1 b3c8870efb PR 2020-11-12 10:27:07 +00:00
Ethan Roseman 0f72d512b3 item decomp 2020-11-12 00:44:10 -05:00
Ethan Roseman af1a04b440 pause item syms 2020-11-12 00:32:25 -05:00
Ethan Roseman 89132f5cc1 partner c file 2020-11-12 00:22:50 -05:00
Ethan Roseman 124a5170b7 more pause decomp 2020-11-12 00:18:35 -05:00
Ethan Roseman 9f69203bb3 badge work 2020-11-10 15:21:37 -05:00
Ethan Roseman 7392e2ca3b more progress 2020-11-10 14:43:24 -05:00
Ethan Roseman 012dd951e1 progress 2020-11-10 13:38:00 -05:00
Ethan Roseman c61554b7e9 asm update 2020-11-10 11:27:02 -05:00
Ethan Roseman 43f11633a3 more syms, file split 2020-11-10 10:11:43 -05:00
Ethan Roseman 0499f2d722 more syms 2020-11-10 00:08:44 -05:00
Ethan Roseman 323127d90e asm update 2020-11-09 23:28:45 -05:00
Ethan Roseman 954eae1e2f some pause stuff 2020-11-09 23:23:01 -05:00
Ethan Roseman 3dab89bb72 asm update 2020-11-09 22:51:52 -05:00
Ethan Roseman b78de19ffb random progress 2020-11-09 22:48:47 -05:00
Ethan Roseman e1626030ff some libultra organization 2020-11-09 21:51:33 -05:00
Ethan Roseman 47f464a17e Merge branch 'master' into cornucopia 2020-11-08 17:00:39 -05:00
Ethan Roseman f55cace9a3 more EF070 2020-11-08 16:05:39 -05:00
Ethan Roseman cdd2d6bd15 ASM update and types 2020-11-08 15:40:26 -05:00
Ethan Roseman b7726af819 EF070 stuff 2020-11-08 15:24:39 -05:00
Alex Bates 70032a1123 rename si funcs 2020-11-08 19:20:09 +00:00
Ethan Roseman 9b26bd68ad more syms 2020-11-08 14:02:08 -05:00
Ethan Roseman 680cead360 gAnimatedMeshesPtr 2020-11-08 13:39:23 -05:00
Ethan Roseman 7614b51d70 ED510 stuff 2020-11-08 01:12:12 -05:00
Ethan Roseman b1ee019af2 asm update 2020-11-07 23:36:45 -05:00
Ethan Roseman 72f4a180f2 SetNpcFlagBits 2020-11-07 23:33:15 -05:00
Ethan Roseman 1173f4c681 :island: 2020-11-07 14:44:44 -05:00
Ethan Roseman dac394f9c6 asm refresh 2020-11-06 12:35:35 -05:00
Ethan Roseman 5ae79b7f86 Various decomp 2020-11-05 19:30:17 -05:00
JoshDuMan 05712a9ad3 Address comments 2020-11-03 00:59:39 -05:00
JoshDuMan 58e04b19ba Merge https://github.com/ethteck/papermario into stuff 2020-11-02 18:49:38 -05:00
Ethan Roseman d86bb8d66b Deleting junk 2020-11-02 16:51:08 -05:00
Ethan Roseman cadd7693a9 fixing paths 2020-11-02 16:41:24 -05:00
Ethan Roseman 087b30ab35 a couple more kmrs 2020-11-02 16:04:59 -05:00
Ethan Roseman 285396f142 CheckItemFlags40 2020-11-02 15:48:48 -05:00
Ethan Roseman ec5e547146 symbol detection fix 2020-11-02 15:44:06 -05:00
Ethan Roseman d55b0888a1 gItemTable offsets 2020-11-02 15:22:54 -05:00
Ethan Roseman 743619e28f a few more 2020-11-02 15:19:04 -05:00
Ethan Roseman 5a0dea8665 a few more kmr funcs 2020-11-02 14:53:06 -05:00
Ethan Roseman 0df7ef28a3 gCurrentEncounter offsets + some funcs 2020-11-02 14:21:58 -05:00
Alex Bates 0448af546c merge master 2020-11-02 17:22:42 +00:00
JoshDuMan ee3c059779 Work on world functions. 2020-11-02 02:07:02 -05:00
Ethan Roseman 3a134d6a7d gPlayerStatus offsets 2020-11-01 18:37:28 -05:00
Ethan Roseman 5d160b9f08 gPlayerData offsets 2020-11-01 18:28:44 -05:00
Ethan Roseman b6bc2fb604 asm refresh + new splat / symbol_addrs format 2020-11-01 17:36:59 -05:00
Alex Bates dd4b9ec6e5 merge master 2020-10-31 20:10:22 +00:00
Ethan Roseman 54cd46a228 Merge branch 'master' into maps 2020-10-31 11:44:54 -04:00
alex ed62a6999b
Merge branch 'master' into audio 2020-10-31 05:57:48 +00:00
Ethan Roseman 90641b1b06 kmr_03 2020-10-30 19:42:25 -04:00
Ethan Roseman fc5dcf43ea Camera0MoveFlag1 2020-10-30 19:25:07 -04:00
Ethan Roseman a840d81a29 SetCamera0MoveFlagNeg1 2020-10-30 19:21:00 -04:00
Ethan Roseman cff33e37f4 UnkPositionFunc 2020-10-30 19:11:46 -04:00
Ethan Roseman 51b1c9acfb CheckPartnerFlags1000 2020-10-30 19:03:29 -04:00
Ethan Roseman b0d5e8ee62 3 more 2020-10-30 18:41:04 -04:00
Ethan Roseman 31fc3ab212 UnkPartnerFuncs 2020-10-30 17:50:48 -04:00
Ethan Roseman 8ee2bf4522 UnkMoveNpc 2020-10-30 16:23:23 -04:00
Alex Bates 2a1c35a80c
lint 2020-10-30 17:50:58 +00:00
Ethan Roseman 97121d2c50 UnkCameraFunc 2020-10-30 13:43:45 -04:00
Alex Bates debc0016fd
use ld_addrs.h in load_world_script_api 
Renamed from load_map_script_lib
 2020-10-30 16:07:33 +00:00
Ethan Roseman 0b04520f25 1 more 2020-10-30 00:32:25 -04:00
Ethan Roseman 83a5d82fbd GetPartnerCall800EB168 2020-10-30 00:15:44 -04:00
Ethan Roseman da058dc095 GetGameStatus75 2020-10-30 00:07:11 -04:00
Ethan Roseman 3848319469 NotDoesScriptExist 2020-10-30 00:01:25 -04:00
Ethan Roseman 7717a96628 Call800EB168 2020-10-29 23:56:54 -04:00
Ethan Roseman 8dc783bf5b PartnerToggleAbilityScript 2020-10-29 23:47:20 -04:00
Ethan Roseman 3a53233b1d Unk800E98C4SyncStatusMenu 2020-10-29 23:37:25 -04:00
Ethan Roseman 19a34fe4bf GetNpcUnsafeOwner2 2020-10-29 22:49:54 -04:00
Ethan Roseman bef10dd44e Call800E9894 2020-10-29 22:40:04 -04:00
Ethan Roseman 4a1f26c6ea Set80151310 2020-10-29 22:33:05 -04:00
Ethan Roseman ba35048ab2 GetPlayerCoins 2020-10-29 22:20:45 -04:00
Ethan Roseman f94c542a9d Set80151310_0 2020-10-29 22:15:51 -04:00
Alex Bates 484fba8d4d
name transition_music_volume_to 2020-10-29 22:44:10 +00:00
Alex Bates db1ee14d8f
match get_song_variation_override_for_cur_map 
This was previously called get_default_variation_for_song, but its more of an override than a default.
 2020-10-29 22:41:43 +00:00
Alex Bates c1df09dba8
match some cursed funcs + cleanup 2020-10-29 21:37:15 +00:00
Ethan Roseman 0fb1e1ab30 🐶 2020-10-29 16:58:34 -04:00
Ethan Roseman d0d833cd1d LoadPath 2020-10-29 16:16:39 -04:00
Ethan Roseman 977fa7117d InterpPlayerYaw 2020-10-29 15:56:58 -04:00
Ethan Roseman 7376b736d0 a couple 2020-10-29 12:08:00 -04:00
Alex Bates 631afbe477
match many small funcs, rename symbols 2020-10-29 03:48:04 +00:00
Alex Bates 9c5338c04b
match func_8014AA54 2020-10-29 02:54:01 +00:00
Alex Bates a2329fc84a
match func_8014A964, func_8014AC84 2020-10-29 02:17:11 +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 3d7357eeb7
Merge pull request #101 from nanaian/make 
Makefile go brrrrr
 2020-10-28 18:31:57 -04:00
Alex Bates ce67831083
fix hasm sections 2020-10-28 22:18:28 +00:00
Ethan Roseman ea2f64830c ASM refresh 2020-10-28 16:23:17 -04:00
Ethan Roseman b68eea5d66 cleanup 2 2020-10-28 16:00:45 -04:00
Ethan Roseman 9a10bd2677 start_script_in_group 2020-10-28 15:06:49 -04: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 099c159535 a few more map funcs 2020-10-25 22:37:22 -04:00
Ethan Roseman c2d7449287 SetEntityPosition + co 2020-10-25 22:20:37 -04:00
Ethan Roseman c4acc92579 GetEntityPosition 2020-10-25 21:44:43 -04:00
Ethan Roseman e0ed375784 SetEntityFlags100000 2020-10-25 21:29:59 -04:00
Ethan Roseman 8a95d84a82 SyncStatusMenu and another 2020-10-25 21:23:02 -04:00
Ethan Roseman 97f1f96662 SomeItemEntityFunc 2020-10-25 21:12:01 -04:00
Ethan Roseman 37b94d320c UnkTexturePanFunc2 2020-10-25 16:08:59 -04:00
Ethan Roseman 763de9d951 UnkTexturePanFunc 2020-10-25 16:01:41 -04:00
Ethan Roseman 698c142dd4 GetCurrentCameraYawClamped180 2020-10-24 18:42:58 -04:00
Ethan Roseman 4c26b6df56 SetPlayerStatusAnimFlags100000 2020-10-24 18:32:02 -04:00
Ethan Roseman 86087faf8f GetCurrentFloor (less than 10k funcs now) 2020-10-24 18:25:25 -04:00
Ethan Roseman 820dd235e6 3 more 2020-10-24 18:14:57 -04:00
Ethan Roseman 4b1f9e0fa5 Some decomp, tons of cleanup 2020-10-24 17:51:27 -04:00
Ethan Roseman 4915acf7a2 si_find_label 2020-10-24 16:07:26 -04:00
Ethan Roseman 3407ecb91a si funcs and cleanup 2020-10-24 00:23:16 -04:00
Ethan Roseman 2ea328286b Set8009A650_40 2020-10-21 22:27:59 -04:00
Ethan Roseman 32e896c011 SetManyVars 2020-10-21 22:05:01 -04:00
Ethan Roseman 7a7f24431f more cleanup 2020-10-21 21:53:26 -04:00
Ethan Roseman 5c049a9f22 SomeMatrixOperations bogo 2020-10-21 21:39:50 -04:00
Ethan Roseman a659c1aeb4 big boy cleanup 2020-10-21 18:05:18 -04:00
Ethan Roseman 5bf7732a4e SomeXYZFuncTodoRename 2020-10-21 01:33:24 -04:00
Ethan Roseman 773f9256c4 GetNpcCollisionHeight 2020-10-20 22:47:13 -04:00
Ethan Roseman 59d30300f5 GetItemName 2020-10-20 20:59:17 -04:00
Ethan Roseman 2bbf2623e7 1 more 2020-10-20 19:31:45 -04:00
Ethan Roseman 6bfd58db59 Merge branch 'master' into cornucopia 2020-10-20 18:00:16 -04:00
Ethan Roseman fe04af7b4c SpawnSunEffect 2020-10-20 17:43:20 -04:00
Ethan Roseman 89ae878f24 Merge branch 'master' into misc-improvements 2020-10-20 17:26:27 -04:00
Alex Bates 1e9843e549
remove _ prefix from filenames 2020-10-20 21:32:06 +01:00
Alex Bates ca88a636e9
split maps further, clean asm 2020-10-20 20:47:10 +01:00
Alex Bates ff7c3f333e
split all map files 2020-10-20 20:11:56 +01:00
alex 607dba0c58
Merge branch 'master' into misc-improvements 2020-10-20 18:51:56 +01:00
Ethan Roseman dbd8e0b1ee Merge branch 'misc-improvements' into cornucopia 2020-10-20 12:44:50 -04:00
Ethan Roseman dfd9de4765 Beginning SpawnSunEffect 2020-10-19 19:48:16 -04:00
Ethan Roseman 8e104e1147 AwaitPlayerNearNPC 2020-10-19 18:47:29 -04:00
Alex Bates f9a667bc7d
begin script disassembly 2020-10-19 22:58:57 +01:00
Ethan Roseman 8e47ca56c4
Map code (#80) 
* split all map code

hype

* split area_table.bin properly

* fix coverage.py c_func_pattern to match multiline func signatures

* add src/world/* to makefile

* bump splat

* yikes

* splat maps without vram_lock

Co-authored-by: Alex Bates <hi@imalex.xyz>
 2020-10-19 00:42:17 -04:00
sonicspiral a82d662627
Decomp func_8013A854 from code_d0a70_len_4fe0 and add UnkStructFromfunc8013A854 (#78) 
* inisital docs of asm logic and mips_to_c output

* add temp unknown struct for this func
* remove comments from asm, will keep them local only.

* moved UnkSructFromfunc8013A854 to common_sructs.h
* added it's pointer to undefined_syms
* fixed struct pointer and size
* this is a new struct, no others that are `0x7C` in size

* pulled upstream. testing more code.

* fix func_8013A854 to represent latest upstream

* remove unknown struct from common structs to this func

* this is a void func

* unknown struct should be an array with size based on mipstoc outpute a0 < 0x5A

* correct number of lines of asm output from diff, but all code does not match

* fix data types in UnkStructFromfunc8013A854

* temp_v0's logical shift needs to go after UnkStructFromfunc8013A854

* remove unneeded variables

* remove unneeded variables and adding inline sll multiple calc

* add UnkStructFromfunc8013A854 back to common structs

* add UnkStructFromfunc8013A854 back to common structs

* pull latest n64 splat

* analyzing func_8013AA9C to construct UnkStructFromfunc8013A854

* may need unions to represent sub structs in this unk

* roll back struct changes and focus on regalloc

* not an array of pointers looks like there's an array of 90 structs, each struct of size 0x7C

* got OK, now need to cleanup code

* Merge branch 'master' of https://github.com/ethteck/papermario into code_d0a70_len_4fe0-func_8013A854

# Conflicts:
#	tools/n64splat

* fix comment

* remove func_8013AA9C comment used during debug

* add placeholders unks in UnkStructFromfunc8013A854 based on func_8013AA9C

* add first 6 unks in D_80156954

* update todo, add some padding

* adding padding

* adjusting padding

* finished first implementation of padding for UnkStructFromfunc8013A854

* run ./coverage.py --delete-matched

* git checkout -f master && git pull for tools/star-rod

* several changes to UnkStruct8013A854:
* change name from UnkStructFromfunc8013A854 to UnkStruct8013A854
* only include known member data
* add list typedef since this is any arracy of structs

* fix UNKSTRUCT8013A854_SIZE const

* fix スプラトゥーン n64splat

* implement UnkStruct8013A854List to track which array we are pointing to in this unknown struct

* resolve PR feedback. todo resolve splat, review alex optimization:
* move unkstruct extern, struct, and size to code_d0a70_len_4fe0.c
* format void func_8013A854 variable spacing
* add unknown symbol D_80156954;0x80156954 to tools/symbol_addrs.txt

* try fix スプラトn64 with git checkout master && git pull

* fix lint

* move var declaration to inside if and format code

* remove todo comment

Co-authored-by: sonicspiral <>
Co-authored-by: sonicspiral <mru@plusultra.localdomain>
 2020-10-19 00:15:04 -04:00
Ethan Roseman 56f2d04886 si_handle_bind\_🔒 2020-10-18 21:48:27 -04:00
Ethan Roseman 78dc55f2f5 some of world_goompa 2020-10-18 20:24:43 -04:00
Ethan Roseman b71a05cd97 world_goombaria 2020-10-18 20:04:18 -04:00
Ethan Roseman 37856b1b54 ⭐ 2020-10-18 19:27:14 -04:00
Ethan Roseman fa589f28f1 more 🐟 2020-10-18 18:16:42 -04:00
Ethan Roseman a15a282a08 Thy cornucopia hath return! 2020-10-18 17:04:40 -04:00
Ethan Roseman 55e4a0df8f Nusys 1.0 -> 2.05, Makefile cleanup 2020-10-17 23:48:26 -04:00
Ethan Roseman 16a9ee0a7b Merge branch 'master' into new_splits 2020-10-17 22:41:09 -04:00
Ethan Roseman f33010a8c2 deleting junk 2020-10-17 22:28:10 -04:00
Ethan Roseman a8e550dd9a yee 2020-10-17 22:27:25 -04:00
Ethan Roseman 3136a914c6
Merge pull request #75 from ethteck/Yay0 
Yay0
 2020-10-17 21:57:48 -04:00
Ethan Roseman 3e412377d9 si.c 2020-10-17 21:05:17 -04:00
Ethan Roseman 948697d3d8 Initial work 2020-10-17 16:37:46 -04: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