pmret/papermario
1
0
Fork 0
mirror of https://github.com/pmret/papermario.git synced 2024-11-18 17:02:46 +01:00
Code Issues Packages Projects Releases Wiki Activity
2,319 Commits 5 Branches 0 Tags 205 MiB
57c0421151
Commit Graph

799 Commits

Author SHA1 Message Date
Rainchus
44260c5bff
Decoration-related functions (#210) 
* decomp some functions in code_182B30.c

* run coverage.py

* remove blank line

* decomp func_80259A48, func_8025C840, func_8025C8A0, func_8025CCC8, func_8025CD28 in code_182B30.c

* fix small style stuff

* another small style fix
 2021-03-15 12:24:30 +00:00
Ethan Roseman
a1f7a21114
Rodata migration + other goodz (#208) 
* rodata migration

* a5dd0 rodata migration

* e79b0 rodata migration

* more rodata migration

* more migration

* goombario rodata

* SetNpcCollision32

* removing old stuff

* oops

* UnkBackgroundFunc

* removing unnecessary files

* UnkBackgroundFunc2

* UnkStarFuncs

* .

* misc star decomp and AddHP

* oops

* AddFP

* fix offset, update symbol_addrs

* .

* git subrepo pull tools/splat

subrepo:
  subdir:   "tools/splat"
  merged:   "f602284b3e"
upstream:
  origin:   "https://github.com/ethteck/splat.git"
  branch:   "master"
  commit:   "f602284b3e"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "2f68596"

* re-disasm

* fix effect disasm

* oops

* fix lullaby
 2021-03-13 00:53:11 +09:00
Rainchus
a7c90175bf
Misc branch (#205) 
* decomp some functions in code_182B30.c

* run coverage.py

* remove blank line
 2021-03-11 03:19:19 -05:00
Ethan Roseman
0552ce26d5
Support for "addu" in place of move pseudoinstruction (#206) 
* addu support

* some libultra decomp

* reorganization

* reorg

* comments
 2021-03-11 17:08:22 +09:00
Ethan Roseman
c0b67ce0d4 Permuter fix 3 2021-03-10 17:05:27 +09:00
Ethan Roseman
555102c17c
Misc decomp 3 (#202) 
* data fixes, SoundID rename

* ?

* git subrepo pull tools/splat

subrepo:
  subdir:   "tools/splat"
  merged:   "36030366ce"
upstream:
  origin:   "https://github.com/ethteck/splat.git"
  branch:   "master"
  commit:   "36030366ce"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "2f68596"
 2021-03-10 14:13:02 +09:00
JoshDuMan
f0585ec87c
Some Libultra data and decompilation work (#200) 
* Move osWritebackDCacheAll.s to hasm

* Fix build

* Work on Libultra data and decompilation

* Fix Build

* Fix JP build

* Address comments
 2021-03-10 14:06:53 +09:00
Ethan Roseman
f3b6e497b0
Wrap __asm__ for macro inclusion in a dummy function for the permuter (#203) 2021-03-10 13:10:55 +09:00
Ethan Roseman
a923a3f1b8
refactor include_asm (#201) 2021-03-10 02:10:12 +09:00
Ethan Roseman
b7a2673672
Misc decomp and rodata migration (#198) 
* misc decomp...2

* re-run disasm

* more shtuff

* rodata stuff

* more rodata stuff

* more rodata migration

* rodata stuff 🐱

* meowp

* git subrepo pull tools/splat

subrepo:
  subdir:   "tools/splat"
  merged:   "199d63489a"
upstream:
  origin:   "https://github.com/ethteck/splat.git"
  branch:   "master"
  commit:   "199d63489a"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "2f68596"

* git subrepo pull tools/splat

subrepo:
  subdir:   "tools/splat"
  merged:   "b0f5ab40a2"
upstream:
  origin:   "https://github.com/ethteck/splat.git"
  branch:   "master"
  commit:   "b0f5ab40a2"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "2f68596"

* git subrepo pull tools/splat

subrepo:
  subdir:   "tools/splat"
  merged:   "4e79cc1a4e"
upstream:
  origin:   "https://github.com/ethteck/splat.git"
  branch:   "master"
  commit:   "4e79cc1a4e"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "2f68596"

* git subrepo pull tools/splat

subrepo:
  subdir:   "tools/splat"
  merged:   "53370e3217"
upstream:
  origin:   "https://github.com/ethteck/splat.git"
  branch:   "master"
  commit:   "53370e3217"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "2f68596"

* OK

* symbol_addrs script update

* PR comments

* fake gross match
 2021-03-07 18:32:24 +00:00
alex
9e6cf181bd
Several partner-related functions (#196) 
* decompile bombette and bow related functions

* decompile bombette and bow related functions

* decompile bombette and bow related functions

* decompile partner function - mainly bombette and bow

* decompile Goombario functions

* OK

* resolve my comments on #190

* rename IsPartnerImmobile funcs

* rm old asm

Co-authored-by: brotenko@gmail.com <brotenko@gmail.com>
 2021-02-27 20:05:02 -05:00
alex
a4e1c2f522
Add versioning (#187) 
* fix vscode cpp extension messing with files.associations

* move stuff

* it builds!

* symlink papermario.us.z64

* ci: put baserom in right place

* add jp

* fix splat dir

* ignore starrod dump

* .s deps

* update jenkins

* add dsl back

* configure.py versions

* wups

* fine ethan

* fix paths

* configure: default to only the version(s) with existing baseroms

* fix coverage

* fix progress.py

* progress.py verisoning

* remove format.sh from CONTRIBUTING

* update CONTRIBUTING

* fix first_diff

* diff.py: use ver/current/

* update splat.yaml

* trying to fix subrepo

* git subrepo pull tools/splat

subrepo:
  subdir:   "tools/splat"
  merged:   "06a737f02d"
upstream:
  origin:   "https://github.com/ethteck/splat.git"
  branch:   "master"
  commit:   "06a737f02d"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "2f68596"

* configure fix

* git subrepo pull tools/splat

subrepo:
  subdir:   "tools/splat"
  merged:   "41786effd3"
upstream:
  origin:   "https://github.com/ethteck/splat.git"
  branch:   "master"
  commit:   "41786effd3"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "2f68596"

Co-authored-by: Ethan Roseman <ethteck@gmail.com>
 2021-02-22 18:21:23 +09:00
Ethan Roseman
6d66d5fedb
Odds and Ends (#189) 
* fixing segment

* redoing subtree

* git subrepo clone https://github.com/ethteck/splat.git tools/splat

subrepo:
  subdir:   "tools/splat"
  merged:   "99cf514297"
upstream:
  origin:   "https://github.com/ethteck/splat.git"
  branch:   "master"
  commit:   "99cf514297"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "2f68596"

* fix symbol_addrs

* sweet victory

* reformat collision_main_lateral.s

* Lots of matches, fixed diff.py issue, improved coverage.py

* some more

* update symbol_addrs

* git subrepo pull tools/splat

subrepo:
  subdir:   "tools/splat"
  merged:   "c46026725a"
upstream:
  origin:   "https://github.com/ethteck/splat.git"
  branch:   "master"
  commit:   "c46026725a"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "2f68596"

* update symbol_addrs

* fix disasm

* 2 mo

* Jenkinsfile

* PR comments

* check_input_status_menu, removing some macros

* a few funcs

* assist updates

* UnkAlphaFunc

* UnkPartnerPosFuncs

* Deleting stuff

* oopz

* dead_syms.txt, UnkNpcAIFunc14

* update symbol_addrs

* cleanup

* symbol_addrs

* cleanup
 2021-02-20 23:41:30 +09:00
Ethan Roseman
ee7f09bb2b
Snibblets, Tidbits, and Morsels (#188) 
* fixing segment

* redoing subtree

* git subrepo clone https://github.com/ethteck/splat.git tools/splat

subrepo:
  subdir:   "tools/splat"
  merged:   "99cf514297"
upstream:
  origin:   "https://github.com/ethteck/splat.git"
  branch:   "master"
  commit:   "99cf514297"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "2f68596"

* fix symbol_addrs

* sweet victory

* reformat collision_main_lateral.s

* Lots of matches, fixed diff.py issue, improved coverage.py

* some more

* update symbol_addrs

* git subrepo pull tools/splat

subrepo:
  subdir:   "tools/splat"
  merged:   "c46026725a"
upstream:
  origin:   "https://github.com/ethteck/splat.git"
  branch:   "master"
  commit:   "c46026725a"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "2f68596"

* update symbol_addrs

* fix disasm

* 2 mo

* Jenkinsfile

* PR comments
 2021-02-18 20:54:07 +09:00
Ethan Roseman
8afd8bf1f1
Various meta work and some decomp (#184) 
* some

* DeadUnkTexturePanFunc

* DeadUnkTexturePanFunc2

* move guOrthoF to os

* up

* git subrepo pull tools/splat

subrepo:
  subdir:   "tools/splat"
  merged:   "ae2cce951d"
upstream:
  origin:   "https://github.com/ethteck/splat.git"
  branch:   "master"
  commit:   "ae2cce951d"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "2f68596"

* Updating bin dir

* git subrepo pull tools/splat

subrepo:
  subdir:   "tools/splat"
  merged:   "5517f520e4"
upstream:
  origin:   "https://github.com/ethteck/splat.git"
  branch:   "master"
  commit:   "5517f520e4"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "2f68596"

* git subrepo pull tools/splat

subrepo:
  subdir:   "tools/splat"
  merged:   "fe48dc3b3a"
upstream:
  origin:   "https://github.com/ethteck/splat.git"
  branch:   "master"
  commit:   "fe48dc3b3a"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "2f68596"

* revert garbage

* :OK:

* git subrepo pull tools/splat

subrepo:
  subdir:   "tools/splat"
  merged:   "8c86e4b95b"
upstream:
  origin:   "https://github.com/ethteck/splat.git"
  branch:   "master"
  commit:   "8c86e4b95b"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "2f68596"

* data migration

* 3

* .rodata migration and a buncha funcs

* 2 mo

* some decomp, a file boundary fix

* cleanup

* UnkNpaAIFunc13s

* Update symbol_addrs

* remove sublist

* deleted asm

* data fix

* fix data

* wtf?!

* git subrepo pull tools/splat

subrepo:
  subdir:   "tools/splat"
  merged:   "88ce6b44a6"
upstream:
  origin:   "https://github.com/ethteck/splat.git"
  branch:   "master"
  commit:   "88ce6b44a6"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "2f68596"

* symbol_addrs update

* blah

* PR comments
 2021-02-16 19:32:34 +09:00
brotenko@gmail.com
44415597e5 decompile repeating move-related functions. 2021-02-14 19:07:39 +01:00
brotenko@gmail.com
15228aa8d4 refactor functions according to reviews. 2021-02-13 17:58:00 +01:00
brotenko@gmail.com
19eef41547 add new common_struct EffectInstanceData 2021-02-13 00:51:36 +01:00
brotenko@gmail.com
10a7efd1ae decompile ActorAddMovePos 2021-02-12 23:45:21 +01:00
brotenko@gmail.com
e53d5b620f Decompiled dispatch_event_partner 2021-02-12 22:31:22 +01:00
Alex Bates
b0f0aaeda8 more undefined syms 2021-02-10 15:30:33 +00:00
Alex Bates
e449d4d448 undefined syms 2021-02-10 15:26:26 +00:00
Alex Bates
e07dcb4da6 Merge branch 'master' of github.com:pmret/papermario into werror 2021-02-10 15:05:49 +00:00
Ethan Roseman
79e8904cd6
Merge pull request #174 from nanaian/data 
move some battle data to c
 2021-02-10 09:54:35 -05:00
Alex Bates
8a64d45fc5 undefined syms 2021-02-10 14:42:36 +00:00
Alex Bates
b2d0b2c6c8 MESSAGE_ID macro: 0x10 -> 16 2021-02-10 13:45:00 +00:00
Alex Bates
87652e8abb add message naming to splat.yaml 2021-02-10 01:36:01 +00:00
Alex Bates
7a1ce92e55 use extern in headers 2021-02-09 17:16:18 +00:00
Alex Bates
b53e85cc16 move code_90FE0 to c files, new splits 2021-02-09 16:32:35 +00:00
Alex Bates
7d34a06136 match load_partner_npc 2021-02-09 15:03:21 +00:00
Alex Bates
78c2615e58 match create_partner_npc 2021-02-09 13:07:46 +00:00
Alex Bates
d46e65757d fix Matrix4f-related warnings 2021-02-09 11:07:05 +00:00
Alex Bates
7cb10dce7e Merge branch 'master' of github.com:pmret/papermario into data 2021-02-09 10:25:25 +00:00
Ethan Roseman
6dcaac6f7b Merge branch 'master' into star-rod-0-4-0 2021-02-09 11:53:48 +09:00
Alex Bates
7f4785cc98 match code_16c8e0, code_190B20 data 2021-02-09 02:09:57 +00:00
Ethan Roseman
8401f88fd5 undo comment 2021-02-09 10:43:04 +09:00
Ethan Roseman
bbac3d905b match nuContRmbMgr.c 2021-02-09 03:02:14 +09:00
Ethan Roseman
398fa6c695 gfxRetrace_Callback 2021-02-09 00:53:44 +09:00
Alex Bates
592ffd4e48 a 2021-02-06 22:26:35 +00:00
Alex Bates
e0515e1eed name many funcs 2021-02-06 15:20:35 +00:00
Alex Bates
9dc59a69c3 #define all area_kmr SAVE_VAR/SAVE_FLAGs 2021-02-06 13:38:16 +00:00
Alex Bates
cf745c85cb clean up coconut 2021-02-06 05:26:27 +00:00
Ethan Roseman
aeecb59fc2 decomp 2021-02-06 03:47:47 +09:00
Alex Bates
0a18a59a9d clean up coconut.c main 2021-02-05 14:56:42 +00:00
Ethan Roseman
e52cc15d4d Merge branch 'data' of https://github.com/nanaian/papermario into data 2021-02-05 01:16:57 +09:00
Ethan Roseman
0a8b4f3757 goods 2021-02-05 01:16:02 +09:00
Alex Bates
0c8c308133 func_802D3474 2021-02-04 15:41:12 +00:00
Alex Bates
ca7a0c3eac PLAYER -> PLAYER_ACTOR 2021-02-04 14:26:24 +00:00
Ethan Roseman
51dbb6e5d7 improve coconut 2021-02-04 20:29:44 +09:00
Ethan Roseman
251cc995c5 symbol 2021-02-03 22:31:15 +09:00
Ethan Roseman
78411d2270 more decomp and 🍀 symbols 2021-01-21 00:45:03 +09:00
Ethan Roseman
e2e4c86b9c some rodata migration, decomp 2021-01-20 02:27:48 +09:00
Ethan Roseman
b8edd71cd8 42e0 2021-01-20 01:31:43 +09:00
Ethan Roseman
bbb2a5be7d mo 2021-01-18 00:41:00 +09:00
Ethan Roseman
545a655d40 2 funcz 2021-01-17 23:40:02 +09:00
dark-samus
839b9f5508 whitespace 2021-01-16 17:15:27 -05:00
dark-samus
af694484f7 Merge branch 'master' of https://github.com/pmret/papermario into entity_funcs 2021-01-16 15:12:49 -05:00
dark-samus
e2c8066302 finish data migration for code_104730 2021-01-16 15:08:08 -05:00
alex
7fcffc1b38
Merge pull request #154 from pmret/ninja 
Use Ninja build system
 2021-01-16 17:19:09 +00:00
dark-samus
c3e190d6c9 fix for PR 2021-01-16 09:41:40 -05:00
dark-samus
d9083c1927 fix some things 2021-01-16 09:37:13 -05:00
Ethan Roseman
996b554cb8 Moving headers, README 2021-01-16 22:04:57 +09:00
dark-samus
a4b5d8f200 some stuff 2021-01-16 01:34:36 -05:00
Ethan Roseman
919dd605b2 Merge branch 'master' into entity_funcs 2021-01-16 12:49:56 +09:00
dark-samus
8dfdafb3a6 more PR comments 2021-01-15 21:47:44 -05:00
Ethan Roseman
e9f9c737c0 Merge branch 'master' into gfx 2021-01-16 11:18:21 +09:00
dark-samus
f1aa2190d9 typedef gets formatted :( 2021-01-15 17:26:03 -05:00
dark-samus
6fa31ae20a Most PR comments 2021-01-15 17:16:41 -05:00
dark-samus
557a9db0e2 more 2021-01-15 15:35:39 -05:00
dark-samus
728f0e44d1 some more fixes 2021-01-15 12:34:27 -05:00
dark-samus
8a2bb470a9 format 2021-01-15 12:18:27 -05:00
dark-samus
bfebc525a5 merge master 2021-01-15 12:06:43 -05:00
dark-samus
8d533d5615 stuff 2021-01-15 12:01:44 -05:00
Ethan Roseman
a890c93736 Merge branch 'master' into ninja 2021-01-15 16:17:03 +09:00
Zelllll
d2bed729be reverted name of macro 2021-01-14 21:19:49 -06:00
Alex Bates
63aa87446b ninja src/**/*.c 2021-01-14 03:56:02 +00:00
Ethan Roseman
70135c6bb2 some gfx funcs 2021-01-13 19:48:54 +09:00
dark-samus
5b4f8d90d1 merge master 2021-01-12 15:11:10 -05:00
dark-samus
dcbb258e45 misc work 2021-01-12 14:45:50 -05:00
Ethan Roseman
42768fc40b gfx syms (thanks 🍀) 2021-01-11 12:52:08 +09:00
Ethan Roseman
3984c74621 almost 2021-01-09 19:20:33 +09:00
Ethan Roseman
765e59e020 blah 2021-01-09 16:55:31 +09:00
dark-samus
6f304364c6 merge master 2021-01-07 14:59:49 -05:00
Ethan Roseman
c6c8f3876c a few more 2021-01-06 23:19:41 +09:00
Ethan Roseman
bdbe0c5e65 a few 2021-01-03 18:34:04 +09:00
Ethan Roseman
89b5336bea 6 more 2021-01-03 18:02:50 +09:00
Ethan Roseman
a697806e00 area_trd_part_3 2021-01-02 20:30:34 +09:00
Ethan Roseman
a0d1324d2c UnkNpcAIFunc12 2021-01-02 16:51:14 +09:00
Ethan Roseman
1c7a19255b Merge branch 'master' into misc-decomp 2021-01-01 10:20:39 +09:00
Ethan Roseman
8a5f2dcf5c
Merge pull request #144 from nanaian/battles 
goomba
 2020-12-30 06:34:28 -05:00
Ethan Roseman
c2e027729c some more digs 2020-12-30 17:18:27 +09:00
Ethan Roseman
1dd75cd0e5 UnkBattleFunc2 2020-12-30 16:03:05 +09:00
Ethan Roseman
1ca57773cf UnkBattleFunc1 2020-12-30 15:53:40 +09:00
Ethan Roseman
693fda4460
Merge pull request #140 from mkst/code_39cb0_len_100 
WIP - Matching code_39cb0_len_100.c
 2020-12-29 17:18:23 -05:00
dark-samus
cd1ff2ec13 some work 2020-12-29 14:06:06 -05:00
Alex Bates
77a3238a3b clean up 2020-12-29 11:35:59 +00:00
Alex Bates
724a15c99d i did it 2020-12-29 02:17:34 +00:00
Ethan Roseman
c42debe758 M -> N, StartRumbleWithParams dup 2020-12-28 16:09:39 +09:00
Ethan Roseman
8e96d92a59 Merge branch 'master' into misc-decomp 2020-12-28 11:45:34 +09:00
Ethan Roseman
3cb8153d9d Merge branch 'audio-ext' into misc-decomp 2020-12-28 11:45:29 +09:00
Ethan Roseman
a7e0a2fb87
Merge branch 'master' into battles 2020-12-27 09:48:26 -05:00
Ethan Roseman
6bd5f8dae4 4 funcz 2020-12-27 23:23:36 +09:00
Alex Bates
67d0f32c8f match battle/area_kmr_part_1/battles.c 2020-12-27 12:11:14 +00:00
alex
40ca6c9563
Merge pull request #138 from nanaian/worldpartners 
match world partner table
 2020-12-26 12:42:49 +00:00
Mark Street
466a31fe4e Matching code_39cb0_len_100.c 2020-12-24 23:39:47 +00:00
Alex Bates
94ca7f82c0 update script syntax 2020-12-24 11:15:05 +00:00
Ethan Roseman
696522aafe smores 2020-12-23 15:56:34 +09:00
Alex Bates
fb1bb896a5 use partners.h 2020-12-22 16:19:06 +00:00
Ethan Roseman
594d5bd2c7 759b0 funcs 2020-12-22 23:58:31 +09:00
Ethan Roseman
fe82f4be0a clean 2 2020-12-22 22:50:47 +09:00
Ethan Roseman
2754ed84fe cleanup + 1 match 2020-12-22 22:24:49 +09:00
Ethan Roseman
1c52052c12 Merge branch 'master' into audio 2020-12-22 18:13:24 +09:00
Ethan Roseman
b753ff25ed non audio :floshed: 2020-12-20 12:47:09 +09:00
Ethan Roseman
8243e81b2e Audio header 2020-12-10 07:53:35 +09:00
Ethan Roseman
bba92dd7d2 condensing some structs! :) 2020-12-08 19:50:14 +09:00
Ethan Roseman
3762983408 Merge branch 'mac-support' into audio 2020-12-05 19:57:10 -05:00
Rain
ad44b62331 add macro usage to initialize_status_menu() 2020-12-05 03:10:01 -06:00
Rain
498027e7a4 decomp initialize_status_menu 2020-12-04 16:36:25 -06:00
Rain
50c01dc7d1 decomp func_8003F414 2020-12-03 09:36:01 -06:00
Rain
f517de6651 decomp func_8003F4CC and BindIdle (also decomp func_8003F414 but it shares a name with another function causing issues, so it's commented out) 2020-12-03 08:11:20 -06:00
Rain
b85b91ce6c match some functions in code_1a1f0_len_5390.c 2020-12-03 02:07:39 -06:00
Ethan Roseman
04eebda913 cleanup 2020-12-02 02:09:33 -05:00
Ethan Roseman
eed8dc90bf more audio 2020-12-01 23:50:32 -05:00
Ethan Roseman
5062328c73 new file 2020-12-01 19:13:24 -05:00
Ethan Roseman
d39d5837c3 alHeapAlloc 2020-12-01 18:23:26 -05:00
Ethan Roseman
f1ee257cdf more 2020-11-28 19:08:38 -05:00
Ethan Roseman
87c2c84869 more 197F40 2020-11-28 11:51:36 -05:00
Ethan Roseman
93c1cb5a4a 197F40 funcs 2020-11-27 14:38:52 -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
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
dark-samus
b2f0bdc869 a few more 2020-11-23 02:52:10 -05:00
Ethan Roseman
dcd2acf4fe UnkNpcAIFunc11 2020-11-22 15:47:15 -05:00
Ethan Roseman
c5ebc6a376 SetGameStatusUnk84_1 2020-11-22 11:03:02 -05:00
Ethan Roseman
a2f84553ed UnkNpcAIFunc8 2020-11-22 10:27:43 -05:00
Ethan Roseman
4400966849 Merge branch 'master' into cornucopia 2020-11-22 10:07:20 -05:00
Alex Bates
bf9a32751a merge master 2020-11-22 10:59:30 +00:00
Ethan Roseman
931d3b358b UnkNpcAIFunc3 2020-11-21 20:54:57 -05:00
Ethan Roseman
7d09429fd6 GetEntryPos 2020-11-21 20:31:57 -05:00
dark-samus
63429d6ad2 split code_106ef0 and match most funcs 2020-11-21 04:28:02 -05:00
dark-samus
48487dbab0 merge master 2020-11-21 02:45:11 -05:00
dark-samus
03c4960eda some funcs in code_105f90 2020-11-21 02:40:54 -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
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
bfe3694532 PR comments 2020-11-19 14:21:59 -05:00
Alex Bates
b5f0c2588a
merge master 2020-11-19 09:31:10 +00:00
dark-samus
141626664f decompile more entity funcs, split new file 2020-11-19 03:31:22 -05:00
Ethan Roseman
201ce54455 197F40 funcs 2020-11-18 22:17:41 -05:00
Ethan Roseman
e682166792 Merge remote-tracking branch 'origin/master' into cornucopia 2020-11-18 14:10:14 -05:00
dark-samus
d68a3e84a6 merge master 2020-11-18 00:35:50 -05:00
dark-samus
3676d8cd6c decomp more, delete as for matched funcs 2020-11-18 00:32:18 -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
Lavos1
5315827969 Update DecorationTable 2020-11-15 23:15:59 +00: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
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
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