Commit Graph

583 Commits

Author SHA1 Message Date
Alex Bates
e0daee1bb8 generate sprite animation headers 2020-11-11 16:33:55 +00:00
Ethan Roseman
b71ff4bbc2 format 2020-11-10 15:33:36 -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
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
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
29177030b0 format 2020-11-08 19:22:00 +00: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
Alex Bates
6ecf63e992 add match dsl syntax 2020-11-08 12:16:10 +00:00
Ethan Roseman
7614b51d70 ED510 stuff 2020-11-08 01:12:12 -05:00
Ethan Roseman
72f4a180f2 SetNpcFlagBits 2020-11-07 23:33:15 -05:00
Ethan Roseman
24558d98d6 sbk_01 2020-11-07 15:50:39 -05:00
Ethan Roseman
1588ca0061 format 2020-11-07 15:23:28 -05:00
Ethan Roseman
1173f4c681 :island: 2020-11-07 14:44:44 -05:00
Ethan Roseman
63c41f1db4 PR comment 2020-11-07 09:33:22 -05:00
Ethan Roseman
eff6fe2f10 vec3f 2020-11-06 12:32:30 -05:00
Ethan Roseman
b0001034bf format 2020-11-05 19:37:31 -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
cadd7693a9 fixing paths 2020-11-02 16:41:24 -05:00
Ethan Roseman
d16d6a3c1a comment 2020-11-02 16:31:54 -05:00
Ethan Roseman
d604f179c8 PR comments 2020-11-02 16:24:18 -05:00
Ethan Roseman
202243349f format 2020-11-02 16:10:37 -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
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
Alex Bates
dd2eb476dc remove sinful ld_addrs usage 2020-11-02 17:16:26 +00:00
JoshDuMan
ee3c059779 Work on world functions. 2020-11-02 02:07:02 -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
Alex Bates
abcda77e2c MapInitialiser -> MapInit 2020-10-31 20:04:33 +00:00
Ethan Roseman
9151bf2fe4 NotDoesScriptExist -> AwaitScriptComplete 2020-10-31 15:35:43 -04:00
Ethan Roseman
0f3d65f7c9 cleanup 2020-10-31 15:34:10 -04:00
Ethan Roseman
bfbae5e26a remove padding3 2020-10-31 15:04:45 -04: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
alex
ed62a6999b
Merge branch 'master' into audio 2020-10-31 05:57:48 +00:00
Alex Bates
efc303a70d avoid #including all map headers in world.c 2020-10-31 04:49:04 +00:00
Ethan Roseman
90641b1b06 kmr_03 2020-10-30 19:42:25 -04:00
Alex Bates
f0c4df447a squash warnings 2020-10-30 23:41:49 +00: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
7fa97805b9
clean up get_song_variation_override_for_cur_map 2020-10-30 19:19:17 +00:00
Alex Bates
202fc247ad
format 2020-10-30 19:09:41 +00:00
Alex Bates
3206f6ffde
name code_341d0_len_20d0.c 2020-10-30 19:01:24 +00:00
Alex Bates
c1c0a98810
match area table
YOOOOOOOOOOOOOO
2020-10-30 18:58:59 +00:00
Alex Bates
0c2d448abb
match start of rodata_73DA0 2020-10-30 18:43:53 +00:00
Alex Bates
2a1c35a80c
lint 2020-10-30 17:50:58 +00:00
Alex Bates
8939f6da76
fix dma_copy 2020-10-30 17:45:38 +00:00
Ethan Roseman
97121d2c50 UnkCameraFunc 2020-10-30 13:43:45 -04: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
a61be9ab77 rename 2020-10-30 00:43:23 -04: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
0f4b4f8db0
add comment about .data 2020-10-30 00:01:11 +00:00
Alex Bates
cce065d529
badly match func_8014A498 2020-10-29 23:52:24 +00:00
Ethan Roseman
e8ba79a88c PR comment ;( 2020-10-29 19:27:23 -04:00
Ethan Roseman
9193d0a4ca PR comments 2020-10-29 19:23:22 -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
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