Commit Graph

106 Commits

Author SHA1 Message Date
AltoXorg
b171712e0e
Match libultra iQue ver (#1111)
* match libultra ique pt 1

* add sgidefs.h to include/gcc

* recvmesg match + _getcount

* add elfpatch.py for those compiled with -mips3

* pt 2

* os/setthreadpri(.data) -> os/thread

* os thread matches

* os timer matches

* pt 4 (erm... 3?)

* vitbl

* os pi matches

* pt. uhmmmm, i've lost track...

* os pfs matches

* replace elfpatch.py

* pt. just forget it...

* outsource from ultralib ique branch

* .

* . 2

* final blow

* add egcs compiler to Jenkinsfile

* fix errors from CI

* minor changes as requested
2023-08-17 02:29:21 +09:00
HailSanta
f445cbaf18
item data generation (#1105)
* item entities

* pt II

* item hud scripts

* world map

* remove duplicate

* py formatting

* generate hud script ID mapping

* rename jump item -> boots

* item table

* unify pt1

* unify pt2

* item enum and ranges

* fix

* disambiguate boots/hammer names

* move table as well

* remove old move table

* comments concerns etc

* py fmt

* recipe generation

* break it!

* phix it

---------

Co-authored-by: HailSanta <Hail2Santa@gmail.com>
Co-authored-by: Ethan Roseman <ethteck@gmail.com>
2023-08-03 12:44:30 +09:00
Ethan Roseman
a3f35fe27a
Make audio respect the asset stack (#1107) 2023-08-01 00:18:27 +09:00
Ethan Roseman
6e80d188e7
More pal work (#1102)
* wip

* same size at least

* closer

* matchin

* cleanup

* 22go

* 1 mo

* Fix asm, gettin ready

* almost

* Split more segments

* Clean up undefined_syms

* Remove temporay code

* Use dirs for regional assets

* Fix imports

* clean

* PRomment & cleanup

---------

Co-authored-by: Marijn van der Werf <marijn.vanderwerf@gmail.com>
2023-07-31 13:55:07 +09:00
lshamis
ae66312d8c
Add Python linter to github actions (#1100)
* Add Python linter to github actions

* wip

* Add back splat_ext

* Format files

* C++ -> C

* format 2 files

* split workflow into separate file, line length 120, fix excludes

* -l 120 in ci

* update black locally and apply formatting changes

* pyproject.toject

---------

Co-authored-by: Ethan Roseman <ethteck@gmail.com>
2023-07-30 02:03:17 +09:00
Levi Willrich
96b4ec67f1
SBN encoding (#1085)
* add SBN decoding

* sbn.yaml instead of files.json/init.json

* add id numbers to file name - filenames internal to SBNs are duplicates

* Fixed bug where we mistakenly interpreted a bank file ID of -1 as the last file in the list rather than no file

* Encoding functional

* cleanup

* Updated .gitignore to catch sbn files

* fixed some bugs and made suggested changes

* Fixes some code review issues

* fixes, pal sbn

---------

Co-authored-by: Alex Bates <alex@nanaian.town>
Co-authored-by: Ethan Roseman <ethteck@gmail.com>
2023-07-25 19:55:08 +09:00
Ethan Roseman
01d88aa9ee
Effect data refactor (#1094)
* grood

* fixes
2023-07-25 02:51:48 +09:00
Ethan Roseman
ccc8e8e46b
More autos (#1097)
* prep

* git subrepo pull --force tools/splat

subrepo:
  subdir:   "tools/splat"
  merged:   "aab26aab63"
upstream:
  origin:   "https://github.com/ethteck/splat.git"
  branch:   "master"
  commit:   "aab26aab63"
git-subrepo:
  version:  "0.4.5"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "aa416e4"

* fix

* blah
2023-07-25 00:37:23 +09:00
HailSanta
76386ce361
icons archive generation (#1091)
* OK

* broken

* fixed

* misnomer

* fix names, add other versions

* fix stray object file and warnings

* .bin.o

* incorrect asset_deps

* cleanup

---------

Co-authored-by: HailSanta <Hail2Santa@gmail.com>
Co-authored-by: Ethan Roseman <ethteck@gmail.com>
2023-07-23 02:20:37 +09:00
Ethan Roseman
d516801b5f
Shiftable BSS (#1092)
* Shiftable BSS

* osFlash cleanup

* Fix warning

* PRomment

* fixes

* gulp

* yummy

* more

* more

* more alignment

* oopth

* fix budges

* Several budges

* more

* more budges

* fix black screen before "today..."

* final cleanup
2023-07-22 01:53:09 +09:00
Ethan Roseman
e6b5b033a5
bump pigment to 0.3.0 2023-07-20 15:18:25 +09:00
Ethan Roseman
9b765a1f25
Mopping (#1090)
* yaml simplifications

* remove unneeded end markers after c files

* git subrepo pull --force tools/splat

subrepo:
  subdir:   "tools/splat"
  merged:   "7869ef2e51"
upstream:
  origin:   "https://github.com/ethteck/splat.git"
  branch:   "master"
  commit:   "7869ef2e51"
git-subrepo:
  version:  "0.4.5"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "aa416e4"

* cleanin

* effect_shims.h

* PRomment
2023-07-19 18:01:28 +09:00
Ethan Roseman
4ad11af535
mapfs shape data (#1087)
* script

* fix prologue printing

* added type hints for return types

* model docs

* more models

* pretty print for sprite xmls on earlier python ver

* 1x oops

* sprite xml labels

* cod cleanup

* type cleanup

* fixes, script erroring

* script fixes

* objcopy

* link, objcopy, etc

* map_shape.ld

* discard

* kpa_117 match

* move stuff into /geom

* fix some shapes

* 253

* 221

* opaque lights

* 488

* all clear

* fixies

* RDP_MATRIX macro

* more explicit property 5F

---------

Co-authored-by: HailSanta <Hail2Santa@gmail.com>
2023-07-18 18:07:58 +09:00
Ethan Roseman
1118ee8110
Require pigment64, use it to build most standalone images (#1088) 2023-07-18 09:53:53 +01:00
Ethan Roseman
f91fe539a4
Snug bugs unrelated to and never been inside of a rug (#1082)
* Fix enum name, offset

* Fix bugs

Some assets were slipping by the asset stack
Tex archve building wasn't respecting the asset stack (Fixes #1074)

* Fixes #1081

* fix paths kinda

* git subrepo pull --force tools/splat

subrepo:
  subdir:   "tools/splat"
  merged:   "818924683b"
upstream:
  origin:   "https://github.com/ethteck/splat.git"
  branch:   "master"
  commit:   "818924683b"
git-subrepo:
  version:  "0.4.5"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "aa416e4"

* Fix stuff after splupdate
2023-07-13 17:56:16 +09:00
Ethan Roseman
4f77ffbc3e
more pal funcs & npc sprites improvement (#1079)
* cod changes and fixes for npc sprites

* 6 mo

* Cleanup
2023-07-10 14:57:27 +09:00
Ethan Roseman
4d8b61d6a0
whoooooweee that is some good ol' fashioned decomp (pal funcs) (#1076)
* whoooooweee that is some good ol' fashioned decomp

* fixins

* PRomment

* Fixes #1075

* change ver to pal

* another

* some more

* progress.py formatting

* oopth

* Promment

* Promment2
2023-07-03 18:35:05 +09:00
HailSanta
6bb14ff8be
tex archives (#1072)
* extraction

* hmm

* eth cleanup

* tex skeleton

* building

* OK

* pal OK

* cleaned texture names

* moved tex code to separate file

* additional error checking

* proposed splits

* split a5dd0

* additional cleanup

* myoop

* wahoo

* lru

* fixules

* fixin agin

---------

Co-authored-by: HailSanta <Hail2Santa@gmail.com>
Co-authored-by: Ethan Roseman <ethteck@gmail.com>
2023-06-29 21:06:23 +09:00
Alex Bates
6257881b44
fix configure macOS cpp finding (#1070) 2023-06-27 08:00:58 +09:00
Ethan Roseman
8837fbdf65
Player sprites & more (#1055)
* WIP work on sprites (sprite_stuff.py)

* cleanup of various stuff

* separate compiler installation into separate script

* wipz

* more

* renames, bugfixes

* more

* very grood

* cleanin

* goods and services

* oopth

* oopth2

* Parse palette data from xml

* more work

* more wipperz

* more

* it working

* git subrepo pull --force tools/splat

subrepo:
  subdir:   "tools/splat"
  merged:   "e72a868f9f"
upstream:
  origin:   "https://github.com/ethteck/splat.git"
  branch:   "master"
  commit:   "e72a868f9f"
git-subrepo:
  version:  "0.4.5"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "aa416e4"

* fix symbol_addrs for new splat

* upd8s

* Use generated header, other versions, fixes

* fixes & formatting

* wip fusing npc + player extraction & cleanup

* remove npc_files

* buildin

* fix some bugs

* Cleanup, yay0s separately

* cleen

* cleanup

* Respect stack during build

* jp spritz

* dun

* fix c files

---------

Co-authored-by: pixel-stuck <mathmcclintic@gmail.com>
2023-06-26 19:27:37 +09:00
Rainchus
ec6f2ef428
fix configure.py to find correct split.py (#1048)
* fix configure.py to find correct split.py

* name func_802667F0 to DisplayActionRating and use enum

* use enum in DisplayActionRating

* Change DisplayActionRating to show_action_rating
2023-05-09 12:48:11 +09:00
Marijn van der Werf
5511e18133
Clean executable files (#1047)
* Mark headers as non-executable

* Update shebangs
2023-05-04 18:03:02 +09:00
Marijn van der Werf
30aa49d4a8
Clean trailing whitespace (#1038)
* Add missing newlines

* Remove trailing whitepace
2023-04-29 15:28:06 +02:00
Ethan Roseman
e0cfd078da
imgfx data (#1029) 2023-04-25 13:55:14 +09:00
Marijn van der Werf
0c741974a6
fix image building to work with new n64img output (#1001) 2023-03-27 00:43:00 +09:00
Marijn van der Werf
7c04b86492
build: remove iconv wrapper for macOS (#992) 2023-03-23 10:21:32 +09:00
Marijn van der Werf
f504af5b90
A couple of PAL sections (#986)
* Splat later segments

* battle_areas

* effects
2023-03-20 00:05:43 +09:00
Marijn van der Werf
9551b16d77
Build world/area_mac/machi for PAL (#967)
* Build machi and mac_00 for PAL

* Import `segtypes.common.asm`

* PAL rest of area_mac

* fixup

* tik

* Rename gMasterGfxPos to gMainGfxPos

* kgr

* kgr

* Use s32 for casts

* PAL area_kmr

* Cleanup

* Fix defines
2023-03-12 19:08:06 -04:00
Ethan Roseman
c5dde1054f
cn -> ique (#969) 2023-03-09 00:40:22 +09:00
HailSanta
5ba2b3a6bd
partners and notifications (#966)
* kooper cleanup

* second pass

* notifications

* goombario

* tweesters mostly

---------

Co-authored-by: HailSanta <Hail2Santa@gmail.com>
2023-03-06 16:44:48 +09:00
Ethan Roseman
ba42928a18
3unks the Threequel (#955)
* Fix modern gcc issue with function call arg evaluation order, shiftability issue with heap, other fixes

* cursed function byebye

* configure cleanup

* npc_do_other_npc_collision & func_80244550_A2E790

* wip

* PR comments
2023-02-24 13:02:57 +09:00
Ethan Roseman
8f974438a3
3uncs 2 (#952)
* progress

* Fix modern gcc issue with function call arg evaluation order, shiftability issue with heap, other fixes

* cursed function byebye

* configure cleanup

* Fix configure issue

* MakeShop

Co-authored-by: JoshDuMan <40190173+JoshDuMan@users.noreply.github.com>

* item_entity_load

Co-authored-by: JoshDuMan <40190173+JoshDuMan@users.noreply.github.com>

* closer

* PR comment

---------

Co-authored-by: JoshDuMan <40190173+JoshDuMan@users.noreply.github.com>
2023-02-22 17:22:31 +09:00
Marijn van der Werf
aaeddca8e8
Partially build iQue release (#935)
* Build iQue main segment

* Dump CN assembly

* Clean up offsets

* Add CN version of pause screen

* Disassemble pause_stats_draw_contents

# Conflicts:
#	src/pause/pause_stats.c

* Extract version differences to variables

* Document changes in gv_01

* Include credits changes

* Build filemenu for ique

* Match iQue filemenu_draw_file_name

* Match filemenu_draw_char

* Match ique filemenu_draw_message

* Match remaining iQue filemenu functions

* Clean up ique bss

* Clean up ique libultra splat list

* Add constants for multibyte chars

* Use decimal int representation

* Use MSG_CHAR constants for condition

* Remove defined symbols

* Add ique rom to CI

* avoid x/0

---------

Co-authored-by: pixel-stuck <mathmcclintic@gmail.com>
Co-authored-by: Ethan Roseman <ethteck@gmail.com>
2023-02-21 23:37:27 +09:00
Marijn van der Werf
0d70e3ecac
Build main segment in JP (#939)
* Remove JP dump

* Add new JP dump

* Fix sort_symbol_addrs to only look at one version

* Deduplicate and sort symbol_addrs

* Clean up JP rom if conditions

* Use /current dir for diffing

* Fix state_step_logos

* Add todo comments for unsplitted segments

* Fix draw_merlee_message

* rename background_gfx

* Fix background_gfx

* Fix JP build

* Set unused data offsets to auto
2023-02-17 11:06:56 +09:00
Ethan Roseman
a37f30dc94
Modern gcc + shiftability work (#942)
* wip changes for modern gcc

* more

* wip

* blah

* Define explicit size for symbol

* Clean up evt_handle_exec1

* wip

* .

* fixes & VLA macro

* VLA innit

* wipz

* Fix potential UB

* meowp

* meowp2

* fixies

* git subrepo pull --force tools/splat

subrepo:
  subdir:   "tools/splat"
  merged:   "e1f0b17917"
upstream:
  origin:   "https://github.com/ethteck/splat.git"
  branch:   "master"
  commit:   "e1f0b17917"
git-subrepo:
  version:  "0.4.5"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "aa416e4"

* fixules

* git subrepo pull --force tools/splat

subrepo:
  subdir:   "tools/splat"
  merged:   "3ba3277e57"
upstream:
  origin:   "https://github.com/ethteck/splat.git"
  branch:   "master"
  commit:   "3ba3277e57"
git-subrepo:
  version:  "0.4.5"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "aa416e4"

* more shiftability + symbols work

* git subrepo pull --force tools/splat

subrepo:
  subdir:   "tools/splat"
  merged:   "02879e52a7"
upstream:
  origin:   "https://github.com/ethteck/splat.git"
  branch:   "master"
  commit:   "02879e52a7"
git-subrepo:
  version:  "0.4.5"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "aa416e4"

* more

* revert bss changes for now, new heaps overlay for aligning stuff to 0x1000 (not sure how necessary that is, so maybe will revert later on)

* 'fixing' jp shift build

* more

* more syms

* more progress

* more

* ididid

* git subrepo pull --force tools/splat

subrepo:
  subdir:   "tools/splat"
  merged:   "de54da38f5"
upstream:
  origin:   "https://github.com/ethteck/splat.git"
  branch:   "master"
  commit:   "de54da38f5"
git-subrepo:
  version:  "0.4.5"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "aa416e4"

* git subrepo pull --force tools/splat

subrepo:
  subdir:   "tools/splat"
  merged:   "a27dc436a6"
upstream:
  origin:   "https://github.com/ethteck/splat.git"
  branch:   "master"
  commit:   "a27dc436a6"
git-subrepo:
  version:  "0.4.5"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "aa416e4"

* blah

* stuff's broken, but at least it's maybe cleaner

* modern gcc back

* revert

* shifting all overlays - works so far

* progs

* another

* modern gcc flag, re-enabled all ifdef shift stuff

* fixies

* progress

* fixes, matching build

* heaps3 overlay and some symbol names

* changies

* PR comments & cleanup
2023-02-14 22:14:14 +09:00
Ethan Roseman
bc618160ed
Shiftability / modern gcc work (#927)
* cleanup & fixes

* some pointers

* fix some bss syms

* sizes, modern gcc prep, etc

* Fixing errors on modern gcc

* a few fixes

* fixes
2023-02-01 01:12:03 +09:00
pixel-stuck
ddebe5eb64
Big steps toward ROM shiftability (#912)
* shiftability work

* Cleanup

* fix build

* Fix sprite shading profile when shifted

* fix overworld items icons, message icons, and corrupted bowser graphics on the title screen

* add shift flag to configure.py

* restoring ifdef stuff

Co-authored-by: Ethan Roseman <ethteck@gmail.com>
2023-01-16 23:03:23 +00:00
Ethan Roseman
cf2099772d
10 functions (#893)
* fixins

* 2 dogs

* a few funcs + progress

* 3 more

* clean & PR comments
2022-12-21 17:15:21 +09:00
HailSanta
e4283f3ea1
area_mac (#884)
* mac_00 match

* mac_00 cleanup pass

* enough mac_00 cleanup

* mac_01 match

* cleanup pass 1

* first pass done

* more

* unkfoldfunc dedupe

* quick

* mockup

* new splat segment

* git subrepo pull --force tools/splat

subrepo:
  subdir:   "tools/splat"
  merged:   "b2d7b86185"
upstream:
  origin:   "https://github.com/ethteck/splat.git"
  branch:   "master"
  commit:   "b2d7b86185"
git-subrepo:
  version:  "0.4.5"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "aa416e4"

* fix custom segment

* git subrepo pull --force tools/splat

subrepo:
  subdir:   "tools/splat"
  merged:   "0f66e7552a"
upstream:
  origin:   "https://github.com/ethteck/splat.git"
  branch:   "master"
  commit:   "0f66e7552a"
git-subrepo:
  version:  "0.4.5"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "aa416e4"

* common vtx

* victory

* checkpoint

* remove map-specific subaligns

* enough

* quick fixes

Co-authored-by: HailSanta <Hail2Santa@gmail.com>
Co-authored-by: Ethan Roseman <ethteck@gmail.com>
2022-12-12 21:31:29 +09:00
Ethan Roseman
29c3ffa2e0
Misc decomp 3: Oh baby a triple (#882)
* clean

* git subrepo pull --force tools/splat

subrepo:
  subdir:   "tools/splat"
  merged:   "901241040d"
upstream:
  origin:   "https://github.com/ethteck/splat.git"
  branch:   "master"
  commit:   "901241040d"
git-subrepo:
  version:  "0.4.5"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "aa416e4"

* splat update

* more matches after nop hack

* git subrepo pull --force tools/splat

subrepo:
  subdir:   "tools/splat"
  merged:   "715ee0ad55"
upstream:
  origin:   "https://github.com/ethteck/splat.git"
  branch:   "master"
  commit:   "715ee0ad55"
git-subrepo:
  version:  "0.4.5"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "aa416e4"

* Renames, match boot_idle

* one mo

* wips

* fish func

Co-authored-by: @JaThePlayer

* sushie dun

* warnings

* clean

* match a nok func

* nok_02 stuff

* nok_04 party image

* func_802BD5D8_3174F8

* LoadPartyImage & stuff

* warnings
2022-12-11 16:43:29 +09:00
Ethan Roseman
f56df3d9f7
sprite_shading_profiles & obk_07 (#859)
* obk_07 funcs

* 2 mo

* sprite_shading_profiles

* tiny clean

* PR comments
2022-11-15 23:55:59 +09:00
Lightning
0583c230a7
Fixing debug builds, does require newer AS from decompals (#837) 2022-10-28 10:42:27 +09:00
Ethan Roseman
9e8f3eb36b
Line numbies + a couple funx (#833)
* check_input_open_menus

* func_8003DA38

* some shiftability snibblets

* clean

* PR comments
2022-10-18 20:43:04 +09:00
Ethan Roseman
46decfa258
Warning Fixies (#826)
* warnings

* morenings

* more

* morz

* mor3

* PR
2022-10-16 23:22:18 +09:00
Ethan Roseman
c700116f41
BSS And Libultra (#823)
* BSS refactor (the Wiseguy method)

* controller.c

* ldiv.c

* motor.c

* cartrominit.c

* more libultra matching + standardization

* more libultra stuff

* more

* clean

* warnings
2022-10-16 07:24:05 +09:00
Lightning
c1c1dfd533
Fix z64 building in debug mode (#822) 2022-10-15 07:50:43 +09:00
Ethan Roseman
473bfa0692
dead_sqrtf, data migration, etc (#790)
* more goods

* move dead map data to dir

* data migration / splatification

* new splat

* git subrepo pull --force tools/splat

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

* splat fix

* dead_sqrtf bye bye

* fix

* Clover comments

* comment
2022-09-29 05:52:12 +09:00
HailSanta
3706178f3a
sprite names (#782)
* initial variation support

* checkpoint

* pass 1

* second pass

* first few

* more

* change anim < 16 format

* next batch

* goomba anims

* more npcs

* safety

* success

* checkpoint

* last of dro

* a few

* checkpoint

* penguins

* conventions

* flowers A

* Flowers B

* partner animation support

* parter stuff

* id cleanup

* laki

* more laki

* laki done

* sushie

* goompa

* watt + bow

* bombette + parakarry

* goombario

* kooper

* goomba family

* spike jr troopa

* jr troopa

* world partners

* goombas

* lee

* chan

* the master

* toads

* mostly toads

* so many toads

* penguins

* nok npcs

* ch 2+3

* rest of chapters

* parade

* green mario harharhar

* battle bowser

* world bowser

* goomba king

* enough sprites for now

Co-authored-by: HailSanta <Hail2Santa@gmail.com>
2022-09-24 18:04:13 +09:00
Ethan Roseman
0094fa6a31
Pigs and speech bubbles 🐽 💬 (#767)
* lil_oink effect

* oink map funcs

* fix build to not be big

* machi funcs

* mac func

* data migration

* draw_shop_items

* e20eb0.c funcs + data

* warnings

* PR warnings and cleanup
2022-09-11 02:04:04 +09:00
EllipticEllipsis
80b605f737
Fix some stuff for Mac installation (#753) 2022-08-28 13:12:47 +09:00