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
2,505 Commits 4 Branches 0 Tags 206 MiB
e599c2e773
Commit Graph

59 Commits

Author SHA1 Message Date
Alex Bates
e599c2e773
add git hook to make sure assets/$version has been gitignored (#1006) 
* add git hook to make sure assets/ hasn't been gitignored

* echo to stderr

* quiet git check-ignore

* add .v64 and .n64 to gitignore
 2023-03-28 13:32:20 +09:00
Ethan Roseman
179998098c
Misc decomp 53 (#703) 
* some btl_state work

* msg_draw_speech_bubble

* cleaners

* btl_state_stuff

* btl_state_update_next_enemy wip

* btl_state stuff

* disable_x fx + cleanup

* wip

* fxstuff

* path funcs & cleanup

* clean

* model_api funcs

* two action commands

* action_cmd progress

* UnkFunc001

* air raid func

* cleanup, data migration, goodies

* remove data file

* git subrepo pull --force tools/splat

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

* fix build

* more cleanup

* clean

* PR comments
 2022-05-05 23:08:16 +09:00
Alexander Faßbender
c719faf847
Create simple data "migration" script (#548) 
* setup function

* cleanup parts of calc_item_damage_enemy

* init data2c

* clean up data2c.py

* .

* rename and update script to have additional functionality

* .
 2021-12-12 22:53:19 +09:00
Alexander Faßbender
beeb5627e6
Deduplicate various dead functions (#494) 
* what is dead may never die

* resolve issues

* fixing dead_gPartnerActionStatus2

* .

* resolve issues

Co-authored-by: Ethan Roseman <ethteck@gmail.com>
 2021-10-25 16:32:44 +02:00
EllipticEllipsis
0e1100de7f
Remove jumpscare, couple of additions to CONTRIBUTING.md (#386) 
* Remove jumpscare

Allow the faint of heart to build the repo

* Clarify make_expected and add -3 info

* Add info about mips_to_c and m2ctx.py

* Mention -h

* Remove unneded version stuff for make_expected
 2021-08-25 01:08:42 -04:00
Ethan Roseman
f5a6d26ca8
Full GCC Compiler (#378) 
* fx table work

* fx data

* blah

* render_effects_UI

* split out effects.c

* initial testing of full gcc compiler

* don't touch undefined syms/funcs auto

* git subrepo pull --force tools/splat

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

* 4 npc funcs

* nine sef commands

* test

* test2

* run undefined_syms through cpp, remove bss and dead syms files

* nuContQueryRead

* update compiler

* configure fixes

* Update compiler binaries with latest build

* permuter_settings

* xgcc -> gcc

* change permissions

* .

* fix permuter stuff

* gcc is the bane of my existence

* non-dumb mac cpp

* build .cpp files with g++

* ccache

* hide stdout/stderr from ccache check

* fix #374

* tar something and other

* ok!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!

* lol

* fix linux install

* 👍

* 👍👍

* Make cousin J happy

* always 👍

* git subrepo pull (merge) tools/splat

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

Co-authored-by: alex <16batesa@gmail.com>
 2021-08-23 06:55:26 +09:00
alex
49bee8512b
hud_element.c (#371) 
* generate permuter_settings.toml
* remove -Wshadow (#366)

Co-authored-by: pixel-stuck <mathmcclintic@gmail.com>
 2021-08-18 17:28:32 +01:00
alex
d530ca24cd
Various script cleanup (#284) 
* update star_rod_idx_to_c for battles

* name spiked_goomba and paragoomba animations

* name cleft animations

* finish battle struct disasm

* fix for kmr part 3

* name jr troopa animations

Co-authored by: T00nbink <martyntoby@gmail.com>

* ignore star rod crash.xml

* foliage.inc.c

* foliage data

* script: =f -> = (float)

* script: add (int) cast
 2021-04-28 17:58:21 +09:00
alex
060486c85e
Configure updates for modding (#262) 
* root-level configure script

* fix configure on macos?

* fix macos again maybe

* fix messages, add asset stack

* generate map headers from xml maps

* fix sprite_dir asset

* git subrepo pull (merge) --force tools/splat

subrepo:
  subdir:   "tools/splat"
  merged:   "5e36c45558"
upstream:
  origin:   "https://github.com/ethteck/splat.git"
  branch:   "master"
  commit:   "5e36c45558"
git-subrepo:
  version:  "0.4.3"
  origin:   "???"
  commit:   "???"
 2021-04-18 22:26:00 +09:00
alex
8e47263c3f
Action segments (#259) 
* rm debug.i

* match phys_update_action_state

* world/action/idle.c

* ~update_npcs

* document npc_iter_nop

* fix diff.py expected/ location

* struct/naming updates

* update Npc struct via clover

* coverage

* ~world_action_idle_update

* walk, run actions

* jump

* land

* name temp anim

* size for struct

* yucky

* talk

* stuff

* all the action segments

* ~func_802B61E4_E23444

* ~func_802B6000_E287F0

* cleanup

* remove step_entity_updatecmd comment

Co-authored-by: Ethan Roseman <ethteck@gmail.com>
 2021-04-17 20:16:13 +09:00
Ethan Roseman
3315d6010f
Splat refactor (#257) 
* all non-world rodata migrated

* data disasm

* kinda working

* updated yaml

* bloop

* linker header

* configure 2.0

* bin

* mass rename to remove code_

* pause rename

* battle partner stuff

* whew

* more renames

* more renames

* more renaming

* it builds!

* updates

* remove main prefix

* one more thing

* crc, yay0

* .data, .rodata, .bss

* img

* dead_atan2

* it buildsgit add -A

* split battle/partner/6FAD10

* rm &s on sleepy_sheep syms

* sha1sum ninja rule description

* OK but commented out PaperMarioMapFS and PaperMarioNpcSprites

* uncomment

* fix mapfs

* match func_8003CFB4

* .

* clean up and name npc_iter_no_op

* npc.c

* enable cc warnings

* name npc_find_near

* use singular options.asset_path

* smores

* cc_dsl only when needed

* kinda fix configure for splat refactor2

* ok!

* new msg format

* remove old msg format docs

* slight bug fixes, splat adjustment

* git subrepo pull (merge) --force tools/splat

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

* git subrepo pull (merge) --force tools/splat

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

* Update symbol addrs

* git subrepo pull tools/splat

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

Co-authored-by: Alex Bates <hi@imalex.xyz>
 2021-04-13 16:47:52 +09:00
Alex Bates
89daf809c6 remove 'python', 'debug.i' files 2021-04-03 21:35:30 +01:00
alex
f2dfd435d9
Updates for Star Rod 0.4.x (#244) 
* update SpriteSheet.xml reading

* ignore star rod .backup files
 2021-03-30 19:12:32 +09:00
Ethan Roseman
c8d11afc54 tidying 2021-03-27 22:37:36 +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
6dcaac6f7b Merge branch 'master' into star-rod-0-4-0 2021-02-09 11:53:48 +09:00
Ethan Roseman
aae3b1a085 gitignore 2021-02-08 17:28:28 +09:00
Alex Bates
cea2a69c8d gitignore more star rod directories 2021-02-07 00:41:23 +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
ce7c13b5b1 assets_dir 2021-02-06 03:36:46 +00:00
Alex Bates
c46c637c31 ci8 in code segments 2021-02-05 09:07:38 +00:00
Alex Bates
68fe856234 permuter 2021-02-04 13:54:08 +00:00
Alex Bates
8e6b3bcb51 remove makefile 2021-01-15 16:47:06 +00:00
Alex Bates
2275b4d3ec ninja cc tools/n64crc 2021-01-15 11:36:53 +00:00
Alex Bates
6a085bc6d0 rm build.ninja; oops 2021-01-14 04:05:52 +00:00
Alex Bates
64dbc07d56 match world partner table 2020-12-22 15:53:16 +00:00
Alex Bates
36233280d6 add sprite editor gui 2020-12-22 00:09:55 +00:00
Ethan Roseman
95f93beb08 Use settings.mk 2020-12-07 08:53:31 +09:00
Ethan Roseman
393f972370 fixes 2020-12-05 17:45:08 -05:00
Ethan Roseman
41898d2c0b MacOS test 2020-12-05 17:17:55 -05:00
Alex Bates
cfd0e92cff tidy up splat 2020-12-02 22:26:08 +00:00
Alex Bates
e0daee1bb8 generate sprite animation headers 2020-11-11 16:33:55 +00:00
Alex Bates
87cc5ed999 match npc sprites 2020-11-11 13:52:04 +00:00
Alex Bates
26c23068aa split and compile messages 2020-11-07 01:09:11 +00:00
Alex Bates
44fd38f4f8 add image splits 2020-10-31 18:30:16 +00:00
Alex Bates
4fe1f27584
ignore settings.mk 2020-10-28 22:28:15 +00:00
Alex Bates
5ddfce7824
improve ld script & asset building 
makefile go brrrr
 2020-10-28 20:58:11 +00: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
83153acb59
implement SCRIPT(...) dsl 2020-10-22 05:54:03 +01:00
Ethan Roseman
59d30300f5 GetItemName 2020-10-20 20:59:17 -04:00
Alex Bates
40e3ae5618
theme doxygen 2020-10-20 18:45:35 +01:00
Alex Bates
b41366a43b
configure doxygen 2020-10-20 16:46:29 +01:00
Alex Bates
236aa9b718
decode assets fs 
encoding is wip
 2020-10-18 04:54:32 +01:00
Ethan Roseman
3ec626ce08 remove .ld 2020-10-14 12:48:19 -04:00
Ethan Roseman
610bc61443 Basic tidying 2020-08-20 12:37:26 -04:00
Alex Bates
c897d5caa3 add vscode editor settings and build tasks 2020-08-15 17:27:08 +01:00
Ethan Roseman
0782fa07a3 Refactoring stuff 2020-08-12 21:56:23 -04:00
Ethan Roseman
7463fce021 coin_counter_draw_content 2020-08-10 22:04:25 -04:00
Ethan Roseman
78bfce7053 headers, some decomp 2020-07-17 20:47:33 -04:00