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

245 Commits

Author SHA1 Message Date
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
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
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 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
dark-samus 62827e8823 actually fix assembler bug, make sure it compiles. 2020-08-14 22:24:08 -04:00
dark-samus 50f8ca824b fix bug in assembler 2020-08-14 21:54:11 -04:00
Alex Bates dae676c8af match UpdateLerp 2020-08-15 01:49:33 +01:00
Jdog 73a39e0747 undo change to script_context struct that was experimental 2020-08-14 16:33:44 -07:00
Jdog 1a4f01fe7b Fixing some issues and including removal of .s files 2020-08-14 16:31:50 -07:00
Alex Bates eb3ef759d7 Merge remote-tracking branch 'origin/master' into sr-structs 2020-08-14 23:59:42 +01:00
Alex Bates a2ab091516 Merge remote-tracking branch 'origin/sr-structs-ethan' into sr-structs 2020-08-14 23:55:03 +01:00
Alex Bates 4724a110a5 generate enums.h 2020-08-14 23:53:01 +01:00
Alex Bates 6c59c2fca7 swap bg_header raster/palette fields 2020-08-14 23:53:01 +01:00
Jdog 760e1351fb Working more on script-related functions 2020-08-14 15:05:05 -07:00
Ethan Roseman 6e44a205e9 OK 2020-08-14 17:53:45 -04:00
Alex Bates 5e6173f25b generate common_structs.h from star rod database 2020-08-14 21:10:34 +01: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 bc5fa0f5bf fix master 2020-08-14 11:05:28 -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 c179e51a88 Change to use ARRAY_COUNT for script list stuff 2020-08-14 07:50:44 -07:00
Jdog 73e1eff76e more refinements on script list stuff 2020-08-14 07:25:33 -07:00
Alex Bates 652d2ada46 match game_status 2020-08-14 12:47:54 +01:00
Alex Bates 9eb74da229 use `char[]` type for string externs 2020-08-14 05:25:13 +01:00
Alex Bates 357220cf92 fix some mis-sized unknown fields 2020-08-14 05:22:59 +01:00
dark-samus 84ecb71d07 add fairly close to matching is_ability_active commented 2020-08-14 00:20:11 -04:00
Alex Bates 78d23805e0 wip: update game_status struct 
Non-matching right now, I probably made an alignment/sizing error somewhere - proofreading would be appreciated.
 2020-08-14 05:08:55 +01:00
Alex Bates 15f3d1a565 use bg_header type for gBackgroundImage 2020-08-14 04:37:24 +01: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
Jdog 56391da10c Merge remote-tracking branch 'upstream/master' 2020-08-12 22:07:53 -07:00
Ethan Roseman 7d5c31a6e6 Cleanup, starting trigger functions 2020-08-13 01:03:47 -04:00
Jdog 9b60b24cb7 removed uneccessary global vars 2020-08-12 21:10:41 -07:00
Ethan Roseman 430e6dff98 Adding macro.inc include to macro 2020-08-12 22:46:59 -04:00
Ethan Roseman 0782fa07a3 Refactoring stuff 2020-08-12 21:56:23 -04:00