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

436 Commits

Author SHA1 Message Date
Ethan Roseman 38f3e12f66 UI Panels 2020-11-12 13:38:17 -05: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 124a5170b7 more pause decomp 2020-11-12 00:18:35 -05:00
Alex Bates e0daee1bb8 generate sprite animation headers 2020-11-11 16:33:55 +00: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 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 954eae1e2f some pause stuff 2020-11-09 23:23:01 -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 2bf9437691 PR comments 2020-11-08 18:26:29 -05:00
Ethan Roseman a4bdc90eac PR comments 2020-11-08 17:38:16 -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
dark-samus ee24e5a629 cleanup 2020-11-08 15:42:47 -05:00
Ethan Roseman cdd2d6bd15 ASM update and types 2020-11-08 15:40:26 -05:00
dark-samus 1e70aa7667 one more 2020-11-08 15:23:39 -05:00
Alex Bates 70032a1123 rename si funcs 2020-11-08 19:20:09 +00:00
Alex Bates c13ca4392b use ScriptOpcode enum instead of macros 2020-11-08 19:07:10 +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 72f4a180f2 SetNpcFlagBits 2020-11-07 23:33:15 -05:00
dark-samus 783f0a2f83 merge master 2020-11-07 19:33:16 -05:00
dark-samus 18a3e6078b more funcs 2020-11-07 19:30:14 -05:00
Ethan Roseman 0207e22f5e Merge branch 'master' into cornucopia 2020-11-07 14:58:58 -05:00
Ethan Roseman adf6b96cf9
Merge pull request #116 from ethteck/cornucopia 
Various decomp
 2020-11-07 14:48:11 -05:00
Ethan Roseman 1173f4c681 :island: 2020-11-07 14:44:44 -05:00
Alex Bates 5943328c0b merge master 2020-11-07 14:45:34 +00:00
Alex Bates 26c23068aa split and compile messages 2020-11-07 01:09:11 +00:00
Ethan Roseman eff6fe2f10 vec3f 2020-11-06 12:32:30 -05:00
Ethan Roseman 5ae79b7f86 Various decomp 2020-11-05 19:30:17 -05:00
JoshDuMan 58e04b19ba Merge https://github.com/ethteck/papermario into stuff 2020-11-02 18:49:38 -05:00
Ethan Roseman 087b30ab35 a couple more kmrs 2020-11-02 16:04:59 -05:00
Ethan Roseman 5a0dea8665 a few more kmr funcs 2020-11-02 14:53:06 -05:00
dark-samus bf34fb3706 Merge branch 'master' of https://github.com/ethteck/papermario into code_102610_funcs 2020-11-02 13:15:27 -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
dark-samus 4ab5a61497 merg 2020-11-02 00:28:46 -05:00
dark-samus cefd4dc016 cleanup 2020-11-01 23:31:33 -05:00
dark-samus 73551cac91 another func, new file split 2020-11-01 20:14:01 -05:00
Alex Bates dd4b9ec6e5 merge master 2020-10-31 20:10:22 +00:00
Alex Bates abcda77e2c MapInitialiser -> MapInit 2020-10-31 20:04:33 +00:00
Ethan Roseman 54cd46a228 Merge branch 'master' into maps 2020-10-31 11:44:54 -04:00
Ethan Roseman 0e383a411b kmr_03 data OK but messy 2020-10-31 11:44:24 -04:00
dark-samus 623309db81 some funcs 2020-10-31 03:54:00 -04:00
alex ed62a6999b
Merge branch 'master' into audio 2020-10-31 05:57:48 +00:00
Ethan Roseman cff33e37f4 UnkPositionFunc 2020-10-30 19:11:46 -04:00
Ethan Roseman b0d5e8ee62 3 more 2020-10-30 18:41:04 -04:00
Alex Bates 2a1c35a80c
lint 2020-10-30 17:50:58 +00:00
Alex Bates 3d9127a340
match world table .data 2020-10-30 17:43:12 +00: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 da058dc095 GetGameStatus75 2020-10-30 00:07:11 -04:00
Ethan Roseman 7717a96628 Call800EB168 2020-10-29 23:56:54 -04:00
Ethan Roseman f94c542a9d Set80151310_0 2020-10-29 22:15:51 -04:00
Alex Bates cce065d529
badly match func_8014A498 2020-10-29 23:52:24 +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 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 d9d6595581
make set_music_track non-void 
Still matches; its return value is used in SetMusicTrack
 2020-10-29 01:38:51 +00:00
Alex Bates 322932c295
name set_music_track arg3 2020-10-29 01:36:53 +00:00
Alex Bates 1a6b1f5fcd
rename MusicPlayer unkFlags to flags 2020-10-29 01:35:05 +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 8f3e3a85e4
Merge pull request #100 from ethteck/cornonthecob 
100th PR Bonanza: Corn kernels and cornucopiae for all!
 2020-10-28 17:03:00 -04:00
Ethan Roseman 9a10bd2677 start_script_in_group 2020-10-28 15:06:49 -04:00
Ethan Roseman 0e554072d1
Merge pull request #99 from ethteck/cornucopia 
Cornucopia 4nucopia
 2020-10-28 15:04:44 -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 74ad0711fd
Merge pull request #98 from ethteck/cornucopia 
Cornucopia 3D
 2020-10-26 18:06:13 -04:00
Ethan Roseman 9494153160 PR comments 2020-10-26 17:45:24 -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 97f1f96662 SomeItemEntityFunc 2020-10-25 21:12:01 -04:00
Ethan Roseman 4b1f9e0fa5 Some decomp, tons of cleanup 2020-10-24 17:51:27 -04:00
Ethan Roseman 6b8211bee1
Merge pull request #95 from nanaian/script-dsl 
Add script DSL
 2020-10-24 00:22:38 -04:00
Alex Bates 652c52d3dd
use SCRIPT(...) everywhere 2020-10-23 18:39:38 +01:00
Ethan Roseman 2462200b48 Merge branch 'master' into cornucopia 2020-10-22 17:16:58 -04:00
Alex Bates 0ea4d24deb
merge master 2020-10-22 17:34:31 +01:00
alex 191be39a03
document StatDrop (#88) 2020-10-22 06:01:11 +01:00
Ethan Roseman 69a29dc8fc removing extra lines / formatting 2020-10-21 21:43:08 -04:00
Ethan Roseman 5c049a9f22 SomeMatrixOperations bogo 2020-10-21 21:39:50 -04:00
dark-samus 49c7ba0239 add list types and fix code that uses them 2020-10-21 20:07:00 -04:00
Alex Bates 3cb526273f
typedef Script as zero-size Bytecode array 2020-10-21 17:48:56 +01:00
Alex Bates c2ba2ea7c5
add STATIC_ASSERT 2020-10-21 17:16:42 +01:00
Alex Bates 1dc8a3583d
declare M in map.h 2020-10-21 14:12:24 +01: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 69fd94e161 SetNpcB5_3 2020-10-20 19:02:05 -04:00
Ethan Roseman 6bfd58db59 Merge branch 'master' into cornucopia 2020-10-20 18:00:16 -04: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
Alex Bates 26f0cee254
comment goomba_npc movement 2020-10-20 08:14:07 +01:00
Alex Bates 056fbac32c
add FORMATION_ID macro 2020-10-20 07:49:40 +01:00
Alex Bates ef7ddd6773
MapHeader -> MapConfig 
It ain't a header if it ain't at the top of the data.
 2020-10-20 07:36:05 +01:00
Alex Bates 99ac1cf053
update si types 2020-10-20 07:33:40 +01:00
Alex Bates a9310efa85
add MessageID constants 2020-10-20 07:10:14 +01:00
Alex Bates 9d1715d198
kmr_12: use static where possible 2020-10-20 06:44:46 +01:00
Alex Bates 3b3b07c90a
kmr_12: use function pointers for unnamed api funcs 2020-10-20 06:14:50 +01:00
Alex Bates 9b3dedd328
add spaces between structs back 
Whoops
 2020-10-20 04:38:30 +01:00
Alex Bates 9a60b9f311
add NPC_GROUP macro 2020-10-20 04:29:42 +01:00
Alex Bates 23f8d8ee35
add structs/macros for matching map data 2020-10-20 04:11:07 +01: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 0e132ce687 si_handle_bind_🔒 2020-10-18 21:20:07 -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 55e4a0df8f Nusys 1.0 -> 2.05, Makefile cleanup 2020-10-17 23:48:26 -04:00
Ethan Roseman a7fdf796d9 Merge branch 'cornucopia' of github.com:ethteck/papermario into cornucopia 2020-10-17 17:48:48 -04:00
Ethan Roseman 5ce835151a fixing extern 2020-10-17 17:48:43 -04:00
Alex Bates bbeef1ff98
near-match ActorSpeak 
just regalloc issues
 2020-10-17 21:21:57 +01: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
Ethan Roseman e1b4b8b594 🐱 2020-10-16 16:29:55 -04:00
Alex Bates 57d69d1e72
match add_actor_decoration, near-match others 2020-10-16 21:29:54 +01:00
Ethan Roseman 9e9ce5bb29 👀 2020-10-16 14:49:18 -04: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 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
Alex Bates 0a2b3780a3
rename curtain globals 2020-10-15 00:16:44 +01:00
Alex Bates ff3fbdfa8f
near-match begin_state_intro 2020-10-14 23:22:43 +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
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
Ethan Roseman 7cd481c1a2 Merge branch 'master' into in-progress 2020-10-13 21:57:58 -04:00
Ethan Roseman d7360e4bf7 Some stuff 2020-10-13 21:55:04 -04:00
dark-samus 0c37f227a1 last one 2020-10-12 23:18:02 -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 8490965da5 fixing format 2020-10-10 13:42:15 -04:00
Ethan Roseman 41e9cf18ba matched func_80145CE8 2020-10-09 14:55:23 -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 be25066ca5 format 2020-10-03 16:20:12 -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
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 196abe7db2 Addr file and macro fix 2020-09-22 18:54:01 -04:00
Ethan Roseman 11d7006656 Types in INCLUDE_ASM_T macro 2020-09-22 17:36:30 -04:00
Ethan Roseman a9e5d79531 more 2020-09-21 23:10:53 -04:00
Ethan Roseman 5121395a7e Struct update & formatting 2020-09-21 20:59:58 -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
Ethan Roseman b3d87e9347 formatting 2020-09-19 11:17:53 -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 7f6b34c29b Some more SI funcs 2020-09-17 21:28:34 -04:00
Ethan Roseman 44ffd33004 PR suggestions, game status macro 2020-09-13 19:03:22 -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 cfd7e16334 PR fixes 2020-09-08 09:06:17 -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 db1accd991
type PlayerStatus::unk_D8 2020-09-08 12:25:57 +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 c92a46ae0d PR comments, Makefile change 2020-09-02 14:20:29 -04:00
Ethan Roseman 11e3e9b35e tiny change 2020-09-02 12:51:45 -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 b02c9b1bd9 decomp of func_8014A52C from code_e0b30_len_b80 
* updates to undefined_syms
* updates to variables.h
* added helper window_terminal.bat for windows users
original mips to c output
```
s16 func_8014A52C(void) {
    *(void *)0x80159AE2 = (u16)8;
    *(void *)0x80159AE4 = (u16)8;
    return (u16)8;
}
```
 2020-08-30 01:37:51 -07:00
Ethan Roseman 74a46100c1 2 more 2020-08-26 18:54:55 -04:00
Alex Bates cfe3a40880
move ActionState comment 2020-08-24 14:22:44 +01: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 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 47b70ab74f Remember to hit ctrl+s on documents. It's important. 2020-08-23 18:40:11 -07:00
Ethan Roseman b9c67f8f7e Merge remote-tracking branch 'origin/master' into si 2020-08-23 20:34:29 -04:00
Jdog c140901612 #include enums.h in variables.h to make format script happy 2020-08-22 16:39:45 -07: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