pmret/papermario
1
0
Fork 0
mirror of https://github.com/pmret/papermario.git synced 2024-11-18 08:52:40 +01:00
Code Issues Packages Projects Releases Wiki Activity
2,417 Commits 5 Branches 0 Tags 205 MiB
0e2d3b96d4
Commit Graph

734 Commits

Author SHA1 Message Date
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
f46f5d16ac
Dead code data+rodata disasm (#228) 
* dead code disasm

* yaml splitting

* rodata almost done

* OK

* some decomp

* DeadUnk1

Co-authored-by: Rain <rainmachus@gmail.com>
 2021-03-26 10:52:37 -04:00
Ethan Roseman
4ace4bb0d9
415D90 and Audio (#229) 
* 415D90 decomp

* code_415D90 rodata migration

* data migration, decomp

* .

* .

* .

* 4 funcs

* non-matching

* audio part 1

* audio work

* end of snd

* update_symbol_addrs

* .

* 🐔

* .

* sfx func names

* bgm

* more audio

* .

* a few audio funcs
 2021-03-26 10:46:45 -04:00
Maide
ec2870d218
Update battle item enums (#225) 
* a

* Dizzy Dial

* Dried shroom

* Dusty Hammer

* Egg Missile

* Electro Pop

* Fire Flower

* Food

* Fright Jar

* Hustle Drink

* Insecticide Herb

* Life Shroom

* Mushroom

* Mystery (partial)

* Pebble

* Please Come Back

* POW Block

* Repel Gel

* Shooting Star

* Sleepy Sheep

* Snowman Doll

* Stone Cap

* Stop Watch

* Strange Cake

* Strange Cake fixed

* Stone Cap broked

* git subrepo pull --force tools/splat

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

* Static all the things

* Tasty Tonic

* Thunder Bolt

* Thunder Rage

* Ultra Shroom

* Unknown Item

* Volt Shroom

Format & coverage

* Item Ids

* Update enums

* Fix

Co-authored-by: Lavos1 <saintlouisxx@gmail.com>
 2021-03-25 02:30:25 +09:00
Maide
f03f08a38f
Battle items (#222) 
* a

* Dizzy Dial

* Dried shroom

* Dusty Hammer

* Egg Missile

* Electro Pop

* Fire Flower

* Food

* Fright Jar

* Hustle Drink

* Insecticide Herb

* Life Shroom

* Mushroom

* Mystery (partial)

* Pebble

* Please Come Back

* POW Block

* Repel Gel

* Shooting Star

* Sleepy Sheep

* Snowman Doll

* Stone Cap

* Stop Watch

* Strange Cake

* Strange Cake fixed

* Stone Cap broked

* git subrepo pull --force tools/splat

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

* Static all the things

* Tasty Tonic

* Thunder Bolt

* Thunder Rage

* Ultra Shroom

* Unknown Item

* Volt Shroom

Format & coverage

* Item Ids

Co-authored-by: Lavos1 <saintlouisxx@gmail.com>
 2021-03-24 04:39:43 -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
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
943f612050
Work on 1b40 (#213) 
* 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

* fixing rodata

* load_engine_data

* removing undefined syms

* git subrepo pull tools/splat

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

* Skip exceptasm extraction
 2021-03-15 22:30:09 +09:00
Ethan Roseman
2e2dbba9d3
fix world rodata (#212) 2021-03-13 23:35:07 -05: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
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
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
Ethan Roseman
ab79244991
JP rom beginnings (#197) 
* data, splat fixes

* fix .gitrepo?

* git subrepo pull tools/splat

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

* audio updates (thanks Clover)

* git subrepo pull tools/splat

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

* work on jp rom

* remove comment

* fix duplicate asm labels

* git subrepo pull (merge) tools/splat

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

* fix configure and delete grub

* git subrepo pull tools/splat

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

* file split, moving things into os

* header
 2021-03-04 18:00:56 +09:00
Ethan Roseman
96af288878
Splat update (#195) 
* data, splat fixes

* fix .gitrepo?

* git subrepo pull tools/splat

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

* audio updates (thanks Clover)

* git subrepo pull tools/splat

subrepo:
  subdir:   "tools/splat"
  merged:   "c56195a9c5"
upstream:
  origin:   "https://github.com/ethteck/splat.git"
  branch:   "master"
  commit:   "c56195a9c5"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "2f68596"
 2021-02-27 01:10:11 +09:00
Ethan Roseman
698cf99458
jp cod (Created the first segment's c files for jp) (#194) 
* jp cod

* just have less code and it works

* oops

* removing splat cause subrepo is being dumb

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

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

* move jp stuff + revert configure

* git subrepo pull tools/splat

subrepo:
  subdir:   "tools/splat"
  merged:   "c56195a9c5"
upstream:
  origin:   "https://github.com/ethteck/splat.git"
  branch:   "master"
  commit:   "c56195a9c5"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "2f68596"
 2021-02-27 00:36:33 +09:00
Ethan Roseman
68792f4331
Misc decomp (#193) 
* 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

* Set80071270_0_16

* UnkFloatFunc2

* fix watt data start

* UnkNpcAIFunc15

* 🐱

* 🐱 🐱

* symbol_addrs

* fix assist.py

* delete unnecessary data file

* fix diff.py, remove parens

* parens
 2021-02-22 22:00:49 +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
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
dark-samus
a4b5d8f200 some stuff 2021-01-16 01:34:36 -05:00
Ethan Roseman
dad8c48dfb arm support (raspberry pi) 2021-01-16 06:34:21 +00:00
Ethan Roseman
919dd605b2 Merge branch 'master' into entity_funcs 2021-01-16 12:49:56 +09:00
Ethan Roseman
2e774ac081 add permuter settings 2021-01-16 11:15:17 +09:00
dark-samus
2cbb8e5712 OK 2021-01-15 12:14:26 -05:00
dark-samus
bfebc525a5 merge master 2021-01-15 12:06:43 -05:00
dark-samus
816279c3d5 more stuff 2021-01-15 12:05:05 -05:00
dark-samus
8d533d5615 stuff 2021-01-15 12:01:44 -05:00
Alex Bates
2eae138610 ninjatō 2021-01-15 16:28:05 +00:00
Alex Bates
2275b4d3ec ninja cc tools/n64crc 2021-01-15 11:36:53 +00:00
Ethan Roseman
a890c93736 Merge branch 'master' into ninja 2021-01-15 16:17:03 +09:00
Ethan Roseman
20bea3dfe9 more 2021-01-15 13:10:40 +09:00
Ethan Roseman
6fba19fd96
Merge pull request #155 from Zelllll/testfile 
code_7345A0 OK and other misc functions
 2021-01-14 22:22:29 -05:00
Ethan Roseman
8a0c80413c Merge branch 'master' into gfx 2021-01-15 10:43:15 +09:00
Ethan Roseman
978c891054 removing splat 2021-01-15 10:43:09 +09:00
Ethan Roseman
5e12a46dd4 git subrepo clone (merge) https://github.com/ethteck/n64splat.git tools/n64splat 
subrepo:
  subdir:   "tools/n64splat"
  merged:   "7574db712"
upstream:
  origin:   "https://github.com/ethteck/n64splat.git"
  branch:   "master"
  commit:   "7574db712"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo.git"
  commit:   "2f68596"
 2021-01-15 10:26:06 +09:00
Ethan Roseman
86760369a5 removed submodules 2021-01-15 10:24:28 +09:00
Ethan Roseman
642f99bf32 WIP (broken) 2021-01-15 10:20:04 +09:00
Zelllll
f670e0e7fa code_7345A0 OK 2021-01-14 18:49:15 -06:00
Alex Bates
39f48335ff ninja assets, clean up configure.py ux 2021-01-14 23:55:05 +00:00
Alex Bates
d2eb186682 ninja messages + improved msg generated headers 2021-01-14 19:17:14 +00:00
Alex Bates
5ac16f969a ninja tools/Yay0compress 2021-01-14 12:49:50 +00:00
Alex Bates
c2c49b191e ninja include/sprite/**/*.h 2021-01-14 11:57:39 +00:00
Alex Bates
84b6ae8152 move ninja build.py to ./configure.py & auto-splat 2021-01-14 11:22:38 +00:00
Alex Bates
e70b3b814f ninja image flags 2021-01-14 11:13:33 +00:00
Alex Bates
4bba67aed2 ninja img/*.png 2021-01-14 10:59:55 +00:00
Alex Bates
c6d305b07c ninja asm 2021-01-14 10:49:14 +00:00
Alex Bates
1e6af39797 ninja *.bin 2021-01-14 10:25:55 +00:00
Ethan Roseman
734f177307 new file splits, one decomp or two 2021-01-14 17:06:56 +09:00
Alex Bates
c6fe6eee00 fix .s dependency generation 2021-01-14 04:16:42 +00: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
17add9b58d merge master 2021-01-13 00:18:43 -05: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
5a95cec4c0 OK 2021-01-13 03:07:28 +09:00
Ethan Roseman
84f05d2378 not working - jtbl wip 2021-01-13 00:42:27 +09:00
Ethan Roseman
77db21cb41 more data disasm 2021-01-12 14:05:01 +09:00
Ethan Roseman
29a07b4fd3 some data 2021-01-12 13:42:16 +09:00
Ethan Roseman
b5a8262503 splat update with double support 2021-01-11 21:38:33 +09:00
Ethan Roseman
00959ac19c config comments 2021-01-11 21:23:35 +09:00
Ethan Roseman
5de12f375a sfx name to comment 2021-01-11 21:10:43 +09:00
Ethan Roseman
c7a383997f Remaining segments 2021-01-11 18:34:10 +09:00
Ethan Roseman
3bf7788bc4 some new 🐟 2021-01-11 15:58:17 +09:00
Ethan Roseman
8a29eaabcc split everything up 2021-01-11 15:03:45 +09:00
Ethan Roseman
74350fd145 more splitting of stuff 2021-01-11 13:10:31 +09:00
Ethan Roseman
42768fc40b gfx syms (thanks 🍀) 2021-01-11 12:52:08 +09:00
Ethan Roseman
f9a786bf69 remove temp file 2021-01-11 02:59:50 +09:00
Ethan Roseman
f069c32967 manual splitting of a remaining blob 2021-01-11 02:59:12 +09:00
Ethan Roseman
724b7be71e a snibblet 2021-01-11 02:32:53 +09:00
Ethan Roseman
bae802854e a bunch more 2021-01-11 01:38:51 +09:00
Ethan Roseman
761eef6130 update codescan 2021-01-11 00:30:41 +09:00
Ethan Roseman
6a18fb8862 ⛰️ 2021-01-10 23:52:28 +09:00
Ethan Roseman
39c2c200e3 🐱 2021-01-10 23:36:33 +09:00
Ethan Roseman
b1f531d062 mini 2021-01-10 23:04:46 +09:00
Ethan Roseman
a2625b01b7 🐟 🐟 🐟 🐟 2021-01-10 22:41:06 +09:00
Ethan Roseman
eccd9cf39a offset update 2021-01-10 21:11:39 +09:00
Ethan Roseman
d5018e6a9f 🐟 🐟 🐟 2021-01-10 21:00:17 +09:00
Ethan Roseman
a9a3ae4682 another 🐟 2021-01-10 19:43:17 +09:00
Ethan Roseman
eadbf1bc01 more 🐟 (2) 2021-01-10 19:05:49 +09:00
Ethan Roseman
8be70ed254 splat update 2021-01-10 17:56:43 +09:00
Ethan Roseman
0fb3ecb9ec more 🐟 2021-01-10 17:27:00 +09:00
Ethan Roseman
7d2f052403 added code_316C00 2021-01-10 13:06:27 +09:00
Ethan Roseman
7e338567d7 fixed bug 2021-01-10 02:34:40 +09:00
Ethan Roseman
8cd9185b27 oops 2021-01-10 01:45:58 +09:00
Ethan Roseman
17a02b4ceb update splat 2021-01-10 01:39:59 +09:00
Ethan Roseman
e59c265cfc fixing rodata 2021-01-09 21:21:46 +09:00
Ethan Roseman
b8c5795951 many fixes 2021-01-09 18:49:15 +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
00df60c66b update splat 2021-01-08 00:20:14 +09:00
Ethan Roseman
6148a26ab4 Effect C files 2021-01-07 19:43:17 +09:00
Ethan Roseman
dfdfcc112a Splat update 2021-01-07 17:14:08 +09:00
Ethan Roseman
4cff1ee468 File split and some decomp 2021-01-06 22:57:16 +09:00
Ethan Roseman
bdbe0c5e65 a few 2021-01-03 18:34:04 +09:00
Ethan Roseman
a0d1324d2c UnkNpcAIFunc12 2021-01-02 16:51:14 +09:00
Ethan Roseman
4e029982ac Cleanup 2021-01-01 10:49:46 +09:00
Ethan Roseman
1c7a19255b Merge branch 'master' into misc-decomp 2021-01-01 10:20:39 +09:00
Ethan Roseman
a030622f29 improving assist 2020-12-30 20:31:04 +09:00
Ethan Roseman
926737d3cb a lot more 2020-12-30 20:08:27 +09:00
Ethan Roseman
1ca57773cf UnkBattleFunc1 2020-12-30 15:53:40 +09:00
Alex Bates
9855c6202d dsl: change flag set operator to & 2020-12-29 11:37:19 +00:00
Alex Bates
92ccbd1cf6 Merge branch 'battles' of github.com:nanaian/papermario into battles 2020-12-29 02:17:52 +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
b70f74279a Battle funcs 2020-12-28 14:34:30 +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
60b8b69f1a
Merge branch 'master' into battles 2020-12-27 20:46:17 -05:00
Alex Bates
efee13f686 add data disassembly tool 2020-12-27 17:11:33 +00:00
Ethan Roseman
a7e0a2fb87
Merge branch 'master' into battles 2020-12-27 09:48:26 -05:00
Ethan Roseman
4df725f451 Fix many asm warnings 2020-12-27 22:06:28 +09:00
Ethan Roseman
1f868bbaa4 All functions in the project are not static now 2020-12-27 21:30:24 +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
Alex Bates
2793aecebe Merge branch 'master' into battles 2020-12-26 12:02:44 +00:00
Alex Bates
10e54d9070 match 2020-12-26 12:02:19 +00:00
Alex Bates
94ca7f82c0 update script syntax 2020-12-24 11:15:05 +00:00
Alex Bates
e3f570fd1a add syntax to script dsl 2020-12-23 15:12:02 +00:00
Alex Bates
17437b94bb twink data 2020-12-23 12:40:20 +00:00
Alex Bates
70cac1a479 goombaria data 2020-12-23 12:25:43 +00:00
Alex Bates
fd7fc4c44a goompa data 2020-12-23 12:21:17 +00:00
Alex Bates
7aca81daad goombario data 2020-12-23 12:07:47 +00:00
Alex Bates
f4dd1420b6 move partner source files 2020-12-23 11:18:47 +00:00
Alex Bates
dc57215491 fix style=choice arg order 2020-12-23 11:09:49 +00:00
Ethan Roseman
584ec0c615 New C file, cleanup 2020-12-23 16:08:16 +09:00
Alex Bates
64dbc07d56 match world partner table 2020-12-22 15:53:16 +00:00
Ethan Roseman
1c52052c12 Merge branch 'master' into audio 2020-12-22 18:13:24 +09:00
Alex Bates
d326dba298 fix typo (paradA_kolorados) 2020-12-22 00:16:16 +00:00
Alex Bates
36233280d6 add sprite editor gui 2020-12-22 00:09:55 +00:00
Alex Bates
09e7228e1d fix sprite component xyz signedness 2020-12-21 23:47:17 +00:00
Ethan Roseman
052f201f6e more progz 2020-12-18 11:29:35 +09:00
Ethan Roseman
2e3fe28750 data disasm / migration for some files 2020-12-15 22:27:58 +09:00
Ethan Roseman
a3add6c1a9 uhhhh here we go 2020-12-12 21:29:07 +09:00
Ethan Roseman
fb48afaf4b 5 more 2020-12-12 17:12:45 +09:00
Ethan Roseman
02654be743 some progrs 2020-12-12 15:56:00 +09:00
Ethan Roseman
0286743ae5 asm update 2020-12-10 16:11:43 +09:00
Ethan Roseman
55a37ba673 nuAuDmaNew 2020-12-10 15:39:32 +09:00
Ethan Roseman
f9d084937f asm update 2020-12-10 08:58:58 +09:00
Ethan Roseman
8243e81b2e Audio header 2020-12-10 07:53:35 +09:00
Ethan Roseman
bec22c22e4 consolidate data 2020-12-09 15:49:49 +09:00
Ethan Roseman
a9c6fd694e 10400+ data 2020-12-09 15:28:31 +09:00
Ethan Roseman
dcdab9710c 1 more 2020-12-09 13:24:00 +09:00
Ethan Roseman
bba92dd7d2 condensing some structs! :) 2020-12-08 19:50:14 +09:00
Ethan Roseman
6201aca296 data disasm 2020-12-07 08:50:02 +09:00
Ethan Roseman
3762983408 Merge branch 'mac-support' into audio 2020-12-05 19:57:10 -05:00
Ethan Roseman
56c8d5adb9 removing dumb 2020-12-05 17:29:42 -05:00
Ethan Roseman
41898d2c0b MacOS test 2020-12-05 17:17:55 -05:00
Alex Bates
e56bcae805 bump splat 2020-12-03 21:07:44 +00:00
Alex Bates
c9e556a00f change 'make clean' behaviour 2020-12-03 21:06:15 +00:00
Alex Bates
cfd0e92cff tidy up splat 2020-12-02 22:26:08 +00:00
Alex Bates
dfcb98ec0b bump splat 2020-12-02 18:13:24 +00:00