Commit Graph

2585 Commits

Author SHA1 Message Date
Ethan Roseman
2782eb0252
update diccord links to new server 2023-08-21 15:51:35 +09:00
Alex Bates
92180a52ee
Build shift US on Jenkins (#1113)
* build shift us on jenkins

* fix

* fix for real this time

* if sbn dir exists, dont exit
2023-08-21 13:09:17 +09:00
Ethan Roseman
a3cdc47fb7
Fix shiftable build 2023-08-20 17:54:36 +09:00
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
Ethan Roseman
b22883da65
Fix progress.py a bit 2023-08-14 13:53:55 +09:00
HailSanta
308af519a5
sounds halfway named (#1110)
* first few

* more

* more sounds

* for now

* visually separate remaining sounds

* checkpoint

* star power refactor

* standard name

* fix

---------

Co-authored-by: HailSanta <Hail2Santa@gmail.com>
2023-08-13 06:08:33 +09:00
Marijn van der Werf
ff4935de77
Pal engine2 (#1106)
* Work on engine2

* Fix some names

* Match init_hud_element_list

* Fix stuff

* fix stuff

* Update src/msg.c

Co-authored-by: Alex Bates <alex@nanaian.town>

* condtionally define constants

* fix warning

---------

Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>
Co-authored-by: Alex Bates <alex@nanaian.town>
Co-authored-by: Ethan Roseman <ethteck@gmail.com>
2023-08-07 13:50:01 +09:00
HailSanta
38c7785bfd
CRASH (#1109)
* sounds 1

* identify looping sounds

* standardize sound names

* more sounds

* more sounds

* ow ow ow

* 2 more

---------

Co-authored-by: HailSanta <Hail2Santa@gmail.com>
2023-08-05 14:24:23 +09:00
HailSanta
9cac66c54a
misc work (#1108)
Co-authored-by: HailSanta <Hail2Santa@gmail.com>
2023-08-03 16:38:11 +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
Rainchus
f8d6ccddc4
use enum for EnableActorBlur, EnablePlayerBlur, EnableIdleScript args (#1104)
* use enum for EnableActorBlur, EnablePlayerBlur, EnableIdleScript

* create new enum for EnablePlayerBlur
2023-08-03 12:17:33 +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
Ethan Roseman
b9cc73472b
Standard names for struct fields (#1103)
* position -> pos

* rotation -> rot

* velocity -> vel

* distance -> dist

* current -> cur

* current -> cur
2023-07-30 14:08: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
Marijn van der Werf
a69ae38bfe
Pal entity (#1099)
* Start with entity segment

* Match Hammer[123]Block

* match /^entity_model_ShatteringHammer[1-3]Block$/

* match /_ShatteringHammer(Yellow|Red|Unused)Block$/

* Clean up undefined syms

* Match push/brick/shat block

* Match inert and heart blocks

* Match pow super ultra

* Match hit yellow block

* Match 5 more entities

* Match more segments

* More pal entities

* More pal segments

* More entities

* More entities

* Finish entities
2023-07-28 03:30:24 +09:00
Ethan Roseman
4c7a8da864
fix --shift 2023-07-26 04:14:55 +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
9fe80585a4
more segments for pal (#1095)
* evt segment for pal

* fix issue with auto on effect loads segment

* Clean up undefined_syms

* Clean up

* meowp

* Match engine4

* Remove Addr declarations

* Fix indentation

* Remove `#if` for pal main segment

---------

Co-authored-by: Marijn van der Werf <marijn.vanderwerf@gmail.com>
2023-07-25 03:07:47 +09:00
Ethan Roseman
9f00021dbe
DMA_COPY_SEGMENT macro for straightforward DMAs of segments (#1096)
* DMA_SEGMENT macro for straightforward DMAs of segments

* PRomment
2023-07-25 03:04:21 +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
53fac51608
Remove outdated / unused tools and such from the repo (#1093)
* Remove outdated / unused tools and such from the repo

* Remove shtuff from SETUP.md
2023-07-23 02:20:18 +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
9fdb1092e7
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:50 +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
Rainchus
c2c5f15a2a
rename D_800A0948 to gLoadedFromFileSelect (#1080)
* name D_800A0948 to gMapLoadFrom

* replace comparison of 0 with LOAD_FROM_MAP

* update gLoadingDemoMap to gLoadedFromFileSelect

* up jp and ique versions

* update if statement
2023-07-15 14:26:29 +09: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
Ethan Roseman
8f0f0bd941
oopth 2023-06-28 09:52:27 +09:00
Alex Bates
6257881b44
fix configure macOS cpp finding (#1070) 2023-06-27 08:00:58 +09:00
Alex Bates
80aa54dd53
fix SPRITE_ROM_START in --shift (#1071) 2023-06-27 08:00:12 +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
Marlon Pohl
f0a9274c01
Implemented kkj_19_5_baking_GetItemNameRaw for pal (#1066)
* Implemented kkj_19_5_baking_GetItemNameRaw for pal

* Usage of decimals instead of hexadecimals

* Implemented mgm_01_2_npc SetMsgVars_BlocksRemaining

* Implemented mgm_02_0_header.c

* Removed .s file

I'm such an idiot for forgetting this

* removed implemented methods

* optimized decomp

* found the value for the hex number

thanks to @marijnvdwerf and @Brotenko

* Fixed args indexing

Co-authored-by: Ethan Roseman <ethteck@gmail.com>

* Added empty line after definitions

* Apply suggestions from code review

Co-authored-by: Marijn van der Werf <marijn.vanderwerf@gmail.com>
Co-authored-by: Ethan Roseman <ethteck@gmail.com>

* adjusted format (fixed compiler warning)

* made review changes

* removed duplicated code

* namespaced pal_var

---------

Co-authored-by: Ethan Roseman <ethteck@gmail.com>
Co-authored-by: Marijn van der Werf <marijn.vanderwerf@gmail.com>
2023-06-22 09:44:51 +09:00
Lincoln-LM
d65dce43df
Document Probability Distribution of Calls to rand_int (#1063)
* document probability of the majority of conditional calls to rand_int

* update positions of else/elseif comments

* remove unneeded documentation
2023-06-16 10:22:26 +09:00
HailSanta
c3690e380e
battles organization (#1065)
* sbk

* pokey

* bandit

* check

* missing part ID refs

* nok progress

* area headers

* actors moved to common

* dedupe all stages

* couple missing actors and simplified includes

* separated stages by world area

* stage cleanup I

* stage cleanup II

* done stage cleanup

---------

Co-authored-by: HailSanta <Hail2Santa@gmail.com>
2023-06-05 17:16:46 +09:00
HailSanta
edd9111b63
battle area trd 1/2/3 (#1062)
* check

* flips

* trailing ,

* koopa bros

* more koopa bros

* fake bowser

* progress

* progress

* koopa bros done

* koopa bros anims

* reverted overly specific name

* wayward stages

* areas use headers

---------

Co-authored-by: HailSanta <Hail2Santa@gmail.com>
2023-05-23 21:57:34 +09:00
0xfedfedfe
9457e315a8
Name is_debug_panic and fix ASSERT/PANIC macros (#1061)
* Name is_debug_panic and revamp ASSERT/PANIC macros

* Update src/is_debug.c

Co-authored-by: Alex Bates <16batesa@gmail.com>
2023-05-22 15:38:20 +01:00
Lincoln-LM
f770d12db4
Document PRNG Related Functions (#1060)
* document gfx_rand

* document global LCG

* rename func_80029994

* clarify rand_int_internal comment

* gfx_rand -> gfx_rand_int

* remove unneeded parens

* gfx_rand_int -> effect_rand_int

* gfx_prng_seed -> effect_prng_seed

* fix local variable case
2023-05-22 15:37:25 +01:00
HailSanta
2e926567e3
various cleanup (#1057)
* checkpoint

* battle doc

* items 2

* actor palette stuff

* minor adjustment

* the booool

* comments, flags, and todos

* oops

* chain chomp

* quick fix

* stone chomp as well

* partIDs

* hm

* status turn mod

* status_key

* status table alignments

* TURN_DONE - > INACTIVE

* idle anims alignment

* defense table alignment

* STATUS_END

* actor part IDs

* lee

* lee again

* standardizing names

* BattlePositions

* actor macros

* standardize battle and stage macros

* check

* the rest

* red/blue goomba names

* trd_part_1

* rest of trd 1

* pal fix

---------

Co-authored-by: HailSanta <Hail2Santa@gmail.com>
2023-05-21 02:26:11 +09:00
X4X5
7b37ff9230
Add Fedora to install.sh (#1049)
* Update install.sh

* Update install.sh

I'll work on this when I don't feel like I'm losing braincells

* Update install.sh

Get `--extra` up for Fedora

* Update install.sh

* Update install.sh

Imagine typos

* Update install.sh

Finished!
2023-05-09 13:27:53 +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
HailSanta
ee0bd3c304
effect flags (#1052)
* damage intensity

* standardized battle script names

* few more

* effect flags

* slight name change

* renderUI = NULL

* rm space

---------

Co-authored-by: HailSanta <Hail2Santa@gmail.com>
2023-05-09 12:46:47 +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