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

63 Commits

Author SHA1 Message Date
Ethan Roseman
03dc313e03
Revert "Integrated kmc gcc for matching libgultra (#224)" (#238) 
* Revert "Integrated kmc gcc for matching libgultra (#224)"

This reverts commit c83d233482.

* also revert install.sh
 2021-03-28 13:56:05 +09:00
Ethan Roseman
896639da49
Pause segment images (#235) 
* splat update incoming

* git subrepo pull --force tools/splat

subrepo:
  subdir:   "tools/splat"
  merged:   "90fae1a829"
upstream:
  origin:   "https://github.com/ethteck/splat.git"
  branch:   "master"
  commit:   "90fae1a829"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "2f68596"
 2021-03-27 18:22:18 +00:00
Mr-Wiseguy
c83d233482
Integrated kmc gcc for matching libgultra (#224) 
Any source files in the src/ultra directory will be compiled using it
Moved epiread and sptaskyield as examples
 2021-03-26 11:01:57 -04:00
Ethan Roseman
eac31e27ab
All map data + rodata disasm (#218) 
* Misc early code decomp

* Make expected script

* fix m2ctx

* gOverrideFlags & set/unset macros

* update symbol addrs

* Cleanup and PR comments

* oops

* UnkNpcAIFunc16

* UnkNpcAIFunc17

* UnkNpcAIFunc18

* symbol_addrs

* area_mac data/rodata disassembly

* 16C8E0 segment rodata migration

* delete_actor

* 16F740 funcs

* symbol_addrs

* depend on s files: optional

* UnkNpcAIFunc19

* UnkNpcAIFunc20

* UnkNpcAIFunc21

* UnkNpcAIFunc22

* .

* removing unnecessary lines from splat yaml

* all map rodata disassembled

* all map data disasm

* 2 undefined syms

* fix stuff

* Update splat extensions

* .

* git subrepo pull (merge) tools/splat

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

* git subrepo pull (merge) tools/splat

subrepo:
  subdir:   "tools/splat"
  merged:   "a1db6e1200"
upstream:
  origin:   "https://github.com/ethteck/splat.git"
  branch:   "master"
  commit:   "a1db6e1200"
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:   "45f167b5fd"
upstream:
  origin:   "https://github.com/ethteck/splat.git"
  branch:   "master"
  commit:   "45f167b5fd"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "2f68596"

* git subrepo pull --force tools/splat

subrepo:
  subdir:   "tools/splat"
  merged:   "8d3af099e7"
upstream:
  origin:   "https://github.com/ethteck/splat.git"
  branch:   "master"
  commit:   "8d3af099e7"
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:   "e904556c0c"
upstream:
  origin:   "https://github.com/ethteck/splat.git"
  branch:   "master"
  commit:   "e904556c0c"
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:   "795df1f226"
upstream:
  origin:   "https://github.com/ethteck/splat.git"
  branch:   "master"
  commit:   "795df1f226"
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:   "90787f49bd"
upstream:
  origin:   "https://github.com/ethteck/splat.git"
  branch:   "master"
  commit:   "90787f49bd"
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:   "8f4395956b"
upstream:
  origin:   "https://github.com/ethteck/splat.git"
  branch:   "master"
  commit:   "8f4395956b"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "2f68596"

* Updated splat, fixed alignment stuff, woo

* File split
 2021-03-22 22:29:47 -04:00
Ethan Roseman
e4480c0f59
Some map funcs, 16C8E0 segment rodata migration, 16F740 funcs, etc (#217) 
* Misc early code decomp

* Make expected script

* fix m2ctx

* gOverrideFlags & set/unset macros

* update symbol addrs

* Cleanup and PR comments

* oops

* UnkNpcAIFunc16

* UnkNpcAIFunc17

* UnkNpcAIFunc18

* symbol_addrs

* area_mac data/rodata disassembly

* 16C8E0 segment rodata migration

* delete_actor

* 16F740 funcs

* symbol_addrs
 2021-03-20 03:17:02 +09:00
Ethan Roseman
577b3e3ebe
Misc decomp (#215) 
* Misc early code decomp

* Make expected script

* fix m2ctx

* gOverrideFlags & set/unset macros

* update symbol addrs

* Cleanup and PR comments

* oops
 2021-03-19 19:25:14 +09:00
Ethan Roseman
dc20524e2d
Fix permuter (2) (#204) 
* Wrap __asm__ for macro inclusion in a dummy function for the permuter

* -DPERMUTER
 2021-03-10 13:39:12 +09: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
Alex Bates
0a1569cf2a configure.py: add --clean option 2021-02-10 16:49:00 +00:00
Alex Bates
676d6d9a16 require that msg files go in assets/msg/* 2021-02-10 02:36:46 +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
Ethan Roseman
6dcaac6f7b Merge branch 'master' into star-rod-0-4-0 2021-02-09 11:53:48 +09:00
alex
1d45aae386
Merge branch 'master' into star-rod-0-4-0 2021-02-09 01:42:35 +00:00
Ethan Roseman
bbac3d905b match nuContRmbMgr.c 2021-02-09 03:02:14 +09:00
Alex Bates
f8c4ba3003 place message headers in builddir 2021-02-08 16:38:13 +00:00
Alex Bates
93828ea8b9 fix sprite deps 2021-02-08 16:17:11 +00:00
Ethan Roseman
ce8f88b43a changing configure for splat update 2021-02-08 20:04:29 +09:00
Alex Bates
2e1d9cd240 fix build 2021-02-07 15:38:57 +00:00
Alex Bates
de8d909f57 Merge branch 'star-rod-0-4-0' of github.com:nanaian/papermario into star-rod-0-4-0 2021-02-06 22:27:34 +00:00
Alex Bates
592ffd4e48 a 2021-02-06 22:26:35 +00:00
Alex Bates
e9951c7daf extract configuration to build.cfg 2021-02-06 22:14:01 +00:00
Alex Bates
ffe1f285a1 update splat 2021-02-06 19:05:57 +00:00
alex
69e9f6e3ba
Merge branch 'master' into star-rod-0-4-0 2021-02-06 18:00:37 +00:00
Alex Bates
1df36e757a splat *_bg.png assets 2021-02-06 17:36:35 +00:00
Alex Bates
137a93231d prompt re-dump 2021-02-06 16:15:22 +00:00
Alex Bates
93acfc1918 Merge remote-tracking branch 'pmret/master' into moremapassets 2021-02-06 16:14:21 +00:00
Alex Bates
e0515e1eed name many funcs 2021-02-06 15:20:35 +00: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
Alex Bates
68fe856234 permuter 2021-02-04 13:54:08 +00:00
Alex Bates
209f623a88 partner bgs 2021-02-04 02:52:35 +00:00
alex
87a1aa24d9
Merge pull request #166 from nanaian/various-configure-fixes 
Various configure fixes
 2021-02-03 18:36:37 +00:00
Ethan Roseman
437ca7d836 removing undefined_funcs.txt 2021-02-03 21:53:00 +09:00
Alex Bates
e3f42531d8 check object checksums upon sha1 FAILED 2021-02-03 11:33:47 +00:00
Alex Bates
267acf3ad3 fix configure.py on old python for github actions 2021-02-03 10:41:37 +00:00
Alex Bates
f4d828a3cd fix header file dependencies 2021-02-03 10:41:24 +00:00
Alex Bates
94526b469a use grep to search for INCLUDE_ASM/SCRIPT instead of python 2021-01-27 10:56:57 +00:00
Ethan Roseman
4141881c33 splat in configure 2021-01-25 00:35:24 +09:00
Ethan Roseman
dc72859546 rename 2021-01-25 00:19:48 +09:00
Ethan Roseman
999f918dcb removing ccache invocation from configure since it's ineffective 2021-01-18 22:44:52 +09:00
Ethan Roseman
a2f7a80eaf
Merge pull request #160 from pmret/arm 
Arm support (raspberry pi)
 2021-01-17 02:27:25 +09:00
Ethan Roseman
41a271b539 add ccache 2021-01-17 00:18:06 +09:00