pmret/papermario
1
0
Fork 0
mirror of https://github.com/pmret/papermario.git synced 2024-11-08 20:12:30 +01:00
Code Issues Packages Projects Releases Wiki Activity
1,870 Commits 4 Branches 0 Tags 206 MiB
7cb1790789
Commit Graph

566 Commits

Author SHA1 Message Date
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
Ethan Roseman
e26a4b2491
Merge pull request #182 from Brotenko/second-try 
Decompiled various functions
 2021-02-15 10:50:30 -05:00
Ethan Roseman
a9cdcd8d23 cleanup & fix another offset 2021-02-16 00:33:05 +09:00
Ethan Roseman
7385170d42 OK 2021-02-16 00:17:59 +09:00
Ethan Roseman
db6202ebf4 Fixed section boundaries and matched non_matchings 2021-02-15 20:14:10 +09:00
Ethan Roseman
ec4b1cc9a1 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"
 2021-02-15 19:04:16 +09:00
brotenko@gmail.com
ecbf45bcbb :) 2021-02-13 17:46:09 +01:00
Alex Bates
545eeb3591 rename bActorCamOffsets to bActorOffsets 2021-02-10 23:35:37 +00:00
Alex Bates
8f1fac4e17 add bActorNames to symbol_addrs 2021-02-10 23:35:04 +00:00
Alex Bates
41a6f60b51 bActorTattles 2021-02-10 23:27:26 +00:00
Alex Bates
46b7c210ef bActorNames 2021-02-10 22:38:37 +00:00
Alex Bates
cdc6bc6a1b name many battle messages 2021-02-10 20:16:33 +00:00
Alex Bates
5ae51ccf33 add bActor structs to symbol_addrs 2021-02-10 17:30:27 +00:00
Ethan Roseman
26d8a19c32 test 2021-02-11 01:52:26 +09:00
Alex Bates
b3ee1221b0 revert 2021-02-10 16:51:00 +00:00
Ethan Roseman
07bbc67a65 eek? 2021-02-11 01:39:40 +09:00
Ethan Roseman
929f0c2515 Merge branch 'master' into tool-work 2021-02-11 01:25:06 +09:00
Alex Bates
e07dcb4da6 Merge branch 'master' of github.com:pmret/papermario into werror 2021-02-10 15:05:49 +00:00
Ethan Roseman
b1e0e80da2 Merge branch 'master' into tool-work 2021-02-11 00:05:22 +09:00
Ethan Roseman
41d5fd1610 Updates 2021-02-11 00:04:58 +09:00
Alex Bates
b398df1a48 put code_7bb60 back 2021-02-10 15:02:46 +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
addfc799f6 use tabs in msg files 2021-02-10 14:26:58 +00:00
Alex Bates
f28218a6f1 complain if [end] is missing 2021-02-10 13:44:43 +00:00
Alex Bates
87652e8abb add message naming to splat.yaml 2021-02-10 01:36:01 +00:00
Alex Bates
46d7a144e7 fix message headers 2021-02-10 00:53:14 +00:00
Alex Bates
d687f84d35 use star rod-style message syntax 2021-02-10 00:13:09 +00:00
Ethan Roseman
583b109ea7 Progress on tools 2021-02-10 02:45:46 +09:00
Alex Bates
0075864560 remove ld addrs from undefined_syms 2021-02-09 16:46:16 +00:00
Alex Bates
b53e85cc16 move code_90FE0 to c files, new splits 2021-02-09 16:32:35 +00:00
Alex Bates
297eac0fdd add all to symbol_addrs.txt 2021-02-09 10:39:22 +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
a3d563e660
Merge pull request #173 from pmret/splat-update 
Splat update
 2021-02-08 20:48:34 -05:00
alex
1d45aae386
Merge branch 'master' into star-rod-0-4-0 2021-02-09 01:42:35 +00:00
Ethan Roseman
064963aca7
Merge pull request #169 from nanaian/data 
clean up coconut
 2021-02-08 20:40:07 -05:00
Ethan Roseman
eb4ea01b3e cleanup 2021-02-09 03:20:27 +09:00
Ethan Roseman
bbac3d905b match nuContRmbMgr.c 2021-02-09 03:02:14 +09:00
Ethan Roseman
4ae0a926a3 Cleanup 2021-02-08 23:31:00 +09:00
Ethan Roseman
59fa2033fc more splits 2021-02-08 22:58:51 +09:00
Ethan Roseman
676c7ac343 more splitting 2021-02-08 22:45:37 +09:00
Ethan Roseman
0f2f6705e5 file splits 2021-02-08 21:13:38 +09:00
Ethan Roseman
27d7bea8ee git subrepo pull tools/splat 
subrepo:
  subdir:   "tools/splat"
  merged:   "e8f7675322"
upstream:
  origin:   "https://github.com/ethteck/splat.git"
  branch:   "master"
  commit:   "e8f7675322"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "2f68596"
 2021-02-08 20:03:30 +09:00
Ethan Roseman
39ea4c7a86 git subrepo pull tools/splat 
subrepo:
  subdir:   "tools/splat"
  merged:   "3a66565988"
upstream:
  origin:   "https://github.com/ethteck/splat.git"
  branch:   "master"
  commit:   "3a66565988"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "2f68596"
 2021-02-08 19:57:56 +09:00
Ethan Roseman
e578b7d90a Splat update with symbol fixes 2021-02-08 19:45:19 +09:00
Ethan Roseman
aae3b1a085 gitignore 2021-02-08 17:28:28 +09:00
Alex Bates
592ffd4e48 a 2021-02-06 22:26:35 +00:00
Alex Bates
1f8f92e276 Merge branch 'master' into star-rod-0-4-0 2021-02-06 22:25:26 +00:00
Alex Bates
191e027e6a fix build 2021-02-06 21:55:52 +00:00
root
90d7f0381d add goombario kooper and bombette splat info for palettes/anims 2021-02-06 21:50:00 +00:00
Alex Bates
ffe1f285a1 update splat 2021-02-06 19:05:57 +00:00
Alex Bates
67ee8c754d git subrepo pull --force tools/splat 
subrepo:
  subdir:   "tools/splat"
  merged:   "7e40c55d56"
upstream:
  origin:   "https://github.com/ethteck/splat.git"
  branch:   "master"
  commit:   "7e40c55d56"
git-subrepo:
  version:  "0.4.3"
  origin:   "???"
  commit:   "???"
 2021-02-06 18:45:20 +00:00
Alex Bates
11fd404d5b add funcs to symbol_addrs.txt 2021-02-06 15:37:43 +00:00
Alex Bates
e0515e1eed name many funcs 2021-02-06 15:20:35 +00:00
Alex Bates
68e927503b aux.c -> lib.c 2021-02-06 13:02:16 +00:00
Alex Bates
3e2a5c20f9 dsl: add 'int ;' declarations 2021-02-06 05:20:19 +00:00
Ethan Roseman
5c5c0cc410 git subrepo pull (merge) tools/splat 
subrepo:
  subdir:   "tools/splat"
  merged:   "9304f9415"
upstream:
  origin:   "https://github.com/ethteck/splat.git"
  branch:   "master"
  commit:   "733546fea"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo.git"
  commit:   "2f68596"
 2021-02-06 13:05:39 +09:00
Alex Bates
ce7c13b5b1 assets_dir 2021-02-06 03:36:46 +00:00
Alex Bates
8b3db7109a generate image header 2021-02-05 22:11:18 +00:00
Alex Bates
45b3ed2a18 gBattleItemTable 2021-02-05 14:22:43 +00:00
Alex Bates
9b881b8309 match coconut.png 2021-02-05 13:49:50 +00:00
Alex Bates
f35cca8b0b build images 2021-02-05 10:02:53 +00:00
Alex Bates
c46c637c31 ci8 in code segments 2021-02-05 09:07:38 +00:00
Alex Bates
d72e0079e8 ok 2021-02-04 18:48:19 +00:00
Ethan Roseman
6b1367d212 welp 2021-02-05 02:29:21 +09: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
1041c62a7a disasm_script.py: error if api func not in symbol_addrs.txt 2021-02-04 15:35:34 +00:00
Alex Bates
68fe856234 permuter 2021-02-04 13:54:08 +00:00
Ethan Roseman
51dbb6e5d7 improve coconut 2021-02-04 20:29:44 +09:00
Alex Bates
8a1ba58aac move coconut data to c 2021-02-03 20:04:37 +00:00
Ethan Roseman
8302565710 git subrepo pull tools/splat 
subrepo:
  subdir:   "tools/splat"
  merged:   "6898b0a98"
upstream:
  origin:   "https://github.com/ethteck/splat.git"
  branch:   "master"
  commit:   "6898b0a98"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "2f68596"
 2021-02-04 00:14:54 +09:00
Ethan Roseman
f8a344e713 git subrepo pull tools/splat 
subrepo:
  subdir:   "tools/splat"
  merged:   "b426daf02"
upstream:
  origin:   "https://github.com/ethteck/splat.git"
  branch:   "master"
  commit:   "b426daf02"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "2f68596"
 2021-02-04 00:09:01 +09:00
Ethan Roseman
43f3a6fa5f Data improvement 2021-02-04 00:06:31 +09:00
Ethan Roseman
251cc995c5 symbol 2021-02-03 22:31:15 +09:00
Ethan Roseman
56cd871a00 fixing peach dash 2021-02-03 21:50:11 +09:00
Ethan Roseman
7cf7b16795 migrate some stuff to os 2021-02-03 21:35:12 +09:00
Ethan Roseman
e5e89e86cf Star spirit ability naming + disasm 2021-02-03 21:28:39 +09:00
Ethan Roseman
f7cef0ab6c Move naming + disasm 2021-02-03 20:55:35 +09:00
Ethan Roseman
9ba2da5977 Item naming + disasm 2021-02-03 20:35:19 +09:00
Ethan Roseman
a19de2273e Naming battle partner segments + disasm 2021-02-03 19:43:57 +09:00
Ethan Roseman
20a99f4037 OK 2021-02-03 15:40:16 +09:00
Ethan Roseman
1d75ab46ae symbol_addrs 2021-02-02 01:18:51 +09:00
Ethan Roseman
c400654907 updating tools 2021-01-25 00:45:29 +09:00
Ethan Roseman
195a99c796 git subrepo pull --force tools/splat 
subrepo:
  subdir:   "tools/splat"
  merged:   "e2b731ab1"
upstream:
  origin:   "https://github.com/ethteck/splat.git"
  branch:   "master"
  commit:   "e2b731ab1"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "2f68596"
 2021-01-25 00:44:11 +09:00
Ethan Roseman
4201a08a28 git subrepo pull tools/splat 
subrepo:
  subdir:   "tools/splat"
  merged:   "42786d2a7"
upstream:
  origin:   "https://github.com/ethteck/splat.git"
  branch:   "master"
  commit:   "42786d2a7"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "2f68596"
 2021-01-25 00:41:31 +09:00
Ethan Roseman
15de829b58 git subrepo pull tools/splat 
subrepo:
  subdir:   "tools/splat"
  merged:   "687885c4d"
upstream:
  origin:   "https://github.com/ethteck/splat.git"
  branch:   "master"
  commit:   "687885c4d"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "2f68596"
 2021-01-25 00:19:56 +09:00
Ethan Roseman
dc72859546 rename 2021-01-25 00:19:48 +09:00
Ethan Roseman
f274ebe21a extension updates for splat update 2021-01-24 23:45:43 +09:00
Ethan Roseman
b8ddf7761a Some data migration 2021-01-21 01:14:27 +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
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
Ethan Roseman
a2f7a80eaf
Merge pull request #160 from pmret/arm 
Arm support (raspberry pi)
 2021-01-17 02:27:25 +09:00
alex
7fcffc1b38
Merge pull request #154 from pmret/ninja 
Use Ninja build system
 2021-01-16 17:19:09 +00:00