pmret/papermario
1
0
Fork 0
mirror of https://github.com/pmret/papermario.git synced 2024-11-19 09:22:30 +01:00
Code Issues Packages Projects Releases Wiki Activity
1,320 Commits 5 Branches 0 Tags 205 MiB
abacae0966
Commit Graph

682 Commits

Author SHA1 Message Date
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
Alex Bates
85f7331004
match func_80055050 2020-10-29 00:29:30 +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
b68eea5d66 cleanup 2 2020-10-28 16:00:45 -04:00
Ethan Roseman
5961098ef9 PR comments, match SetNpcPos 2020-10-28 15:52:09 -04:00
Ethan Roseman
6c5e959a75 cleanup 2020-10-28 15:11:05 -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
40d0eae53b Merge branch 'cornucopia' into cornonthecob 2020-10-28 13:52:35 -04:00
Ethan Roseman
ee17265064 PR comments 2020-10-28 13:34:02 -04:00
Ethan Roseman
90e7a9acab Assorted functions 2020-10-28 02:42:14 -04:00
Ethan Roseman
2ad6bb1677 PR comments 2020-10-27 23:15:10 -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
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
e8405620ba
Merge pull request #96 from ethteck/cornucopia 
SI funcs and cleanup
 2020-10-24 00:33:03 -04:00
Ethan Roseman
ef18c02a4a format 2020-10-24 00:25:25 -04:00
Ethan Roseman
3407ecb91a si funcs and cleanup 2020-10-24 00:23:16 -04:00
Ethan Roseman
6b8211bee1
Merge pull request #95 from nanaian/script-dsl 
Add script DSL
 2020-10-24 00:22:38 -04:00
Ethan Roseman
5d64708640 Map headers 2020-10-23 21:09:49 -04:00
Alex Bates
52f5d3cc49
improve build time 2020-10-23 21:06:06 +01:00
Alex Bates
f08eab499c
fix warnings 2020-10-23 20:17:35 +01:00
Alex Bates
d29496e6e0
add do..while psuedoinstruction 2020-10-23 19:35:45 +01:00
Alex Bates
652c52d3dd
use SCRIPT(...) everywhere 2020-10-23 18:39:38 +01:00
Ethan Roseman
98d8bdd789 map header WIP 2020-10-23 08:31:56 -04:00
Alex Bates
218961279b
merge make 2020-10-23 01:56:22 +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 Bates
83153acb59
implement SCRIPT(...) dsl 2020-10-22 05:54:03 +01:00
Ethan Roseman
2ea328286b Set8009A650_40 2020-10-21 22:27:59 -04:00
Alex Bates
14b509830f
#define map-namespaced functions with M 2020-10-22 03:14:13 +01: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
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
Ethan Roseman
a659c1aeb4 big boy cleanup 2020-10-21 18:05:18 -04: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
Alex Bates
ccfe465f3b
NPC -> Npc 2020-10-21 04:07:38 +01:00
Alex Bates
48c132c2d2
more casing 2020-10-21 04:06:22 +01:00
Alex Bates
d6fdb87a56
NpcSettings casing 2020-10-21 03:59:27 +01:00
Ethan Roseman
773f9256c4 GetNpcCollisionHeight 2020-10-20 22:47:13 -04:00
Alex Bates
6474bf4704
add map namespace macro M(sym) 2020-10-21 03:37:42 +01: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
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
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
b49ecebd99 PR comments 2020-10-20 10:22:51 -04:00
Alex Bates
8d89bbad3d
add @bug for read_west_sign return 2020-10-20 08:20:09 +01: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
8077a8f3cb
Script.uniqueID -> id 2020-10-20 07:40:15 +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
9a60b9f311
add NPC_GROUP macro 2020-10-20 04:29:42 +01:00
Alex Bates
24ce2e9752
kmr_12: abstract structs/scripts further 2020-10-20 04:28:21 +01:00
Alex Bates
6c936a9126
kmr_12: uncomment string literals 
It matches now I actually can't believe it
 2020-10-20 04:18:00 +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
dd72dfcd1f
fix kmr_12 split 2020-10-19 23:22:18 +01: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
4dce4c2839 misc 2020-10-18 22:55:52 -04:00
Ethan Roseman
0e132ce687 si_handle_bind_🔒 2020-10-18 21:20:07 -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
a8e550dd9a yee 2020-10-17 22:27:25 -04:00
Ethan Roseman
3e412377d9 si.c 2020-10-17 21:05:17 -04:00
Ethan Roseman
c8b796595d . 2020-10-17 18:05:39 -04:00
Ethan Roseman
ebdc55d8b1 renaming func 2020-10-17 17:49:33 -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
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
3fcceae5be format 2020-10-15 18:44:42 -04:00
Ethan Roseman
67719a662f Cleanup 2020-10-15 18:26:59 -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
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
12c8605fcf Split files 2020-10-14 23:20:51 -04:00
Ethan Roseman
84f211a2ae First pass 2020-10-14 22:56:47 -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
87e7d5bf7e
use parallel headers rather than functions.h 2020-10-14 23:37:23 +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
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
458db819d2
add newline to no-op func blocks 2020-10-14 17:15:50 +01:00
Alex Bates
7bccd92a07
remove commented func_80034BF4 2020-10-14 17:13:29 +01: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
Ethan Roseman
d7360e4bf7 Some stuff 2020-10-13 21:55:04 -04:00
Alex Bates
ce8045a3bd
format code_e79b0_len_1920.c 2020-10-13 20:57:50 +01:00
dark-samus
0c37f227a1 last one 2020-10-12 23:18:02 -04:00
dark-samus
6468819806 address final PR stuff 2020-10-12 22:54:27 -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
3aa854c0c5 splat update 2020-10-12 14:46:04 -04:00
Ethan Roseman
5086e559a4 meowp 2020-10-11 21:59:42 -04:00
Ethan Roseman
8490965da5 fixing format 2020-10-10 13:42:15 -04:00
Ethan Roseman
5a013f5579 consistency 2020-10-10 13:24:53 -04:00
Ethan Roseman
2323cb0557 pr comments 2020-10-09 23:18:32 -04:00
Ethan Roseman
73ca6fa5d4 formatting and cleanup 2020-10-09 23:09:28 -04:00
Ethan Roseman
2ddeb1c5b1 . 2020-10-09 15:07:58 -04:00
Ethan Roseman
41e9cf18ba matched func_80145CE8 2020-10-09 14:55:23 -04:00
Ethan Roseman
2eb876fccf fully matched code_e940_len_290.c 2020-10-09 14:26:17 -04:00
Ethan Roseman
eb6aaccd73 more 2020-10-08 17:45:26 -04:00
Ethan Roseman
1f7e2134e0 removing func in progress 2020-10-08 15:46:23 -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
9ef9d08761 PR comments 2020-10-04 16:11:49 -04:00
Ethan Roseman
be25066ca5 format 2020-10-03 16:20:12 -04:00
Ethan Roseman
ffa57b5a35 clean 2020-10-03 16:15:09 -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
4c4ce1a4e0 Work on merge 2020-09-28 00:38:21 -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
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
f7d1e4faec format 2020-09-27 11:11:01 -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
9878841eb8 formatting 2020-09-25 21:55:04 -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
3691babd03 format 2020-09-23 23:54:33 -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
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
JoshDuMan
7e632e3ceb Decompile nuContRmbMgr 2020-09-21 00:37:52 -04:00
Ethan Roseman
599e46e7d1 Nm2 2020-09-19 20:13:52 -04:00
Ethan Roseman
1c74bd0c7d nm 2020-09-19 20:12:28 -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
084a0ab0b6 space 2020-09-18 01:59:40 -04:00
Ethan Roseman
5fa1be7e2a More 2020-09-18 01:51:36 -04:00
Ethan Roseman
1db31856cd format 2020-09-17 21:34:13 -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
8186c6da3b meow2 2020-09-08 16:36:15 -04:00
Ethan Roseman
7043f491ea meow 2020-09-08 16:28:55 -04:00
Ethan Roseman
ce3e8ffa63 Macro stuff 2020-09-08 16:15:51 -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
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
da5d8171b8
Update code_7bb60_len_41b0.c 
~0x200
 2020-09-07 09:32:18 -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
dedd132adc
removed redundant cast, s16 type is defined in include/variables.h 2020-09-01 18:11:21 -07: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
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
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
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
Jdog
58b2a01a58 Remove WIP function 2020-08-14 19:51:02 -07:00
Ethan Roseman
a414ce047b Merge branch 'master' into si 2020-08-14 22:50:30 -04:00
Jdog
d1898f1903 Tweaks 2020-08-14 19:50:21 -07: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
Alex Bates
0d8d3e50a9 clean up MakeLerp 2020-08-15 01:17:20 +01: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
c6058a8227 Fix so everything matches 2020-08-14 15:11:48 -07: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
6ad4581788 fix 2020-08-14 11:24:31 -04:00
Ethan Roseman
32a69b688a fix 2020-08-14 11:24:05 -04:00