Commit Graph

659 Commits

Author SHA1 Message Date
Ethan Roseman
41e7f56f0e
More shiftability fixes (#1203) 2024-09-13 03:22:01 +09:00
Ethan Roseman
888b27eec8
Fix charset craziness (#1202) 2024-09-13 02:00:57 +09:00
Alex Bates
c43d15e8cf
Clean up map filenames (#1175)
Co-authored-by: Ethan <ethteck@gmail.com>
2024-03-24 15:43:34 +09:00
HailSanta
e342a33a20
star rod dx upstreaming (#1177)
* so far

* leftover

* first batch

* part zwei

* item name changes

* misspelling

* comments

* THE

* fix pal

* muurgle

---------

Co-authored-by: HailSanta <Hail2Santa@gmail.com>
2024-03-06 02:32:00 -05:00
AltoXorg
8d5b066b7d
SHIFT_BSS be gone (#1173)
* merge asm in src all versions

* main: refactor and eliminate SHIFT_BSS

* engine1 static BSS

* engine2

* folder move

* fix shift build

* cleanup msg & msg_draw

* wtf?

* un-static-ized

* .

* remove unnecess. rodata pad

* populate dangling common syms
2024-03-05 19:54:53 +09:00
Alex Bates
9574baebaf
Make EVT macros easier to read and write (#1154)
* fix rename.py

* update doxygen EVT_CALL->Call

* support passing files to rename.py

* remove EVT macro prefix and make them PascalCase

* rename PlayEffect function to PlayEffect_impl so it doesn't conflict with macro

* dead_PlayEffect_impl
2024-01-21 13:04:47 +00:00
Ethan Roseman
f89df67fe4
Autos gawn (#1153)
* working on it

* ique brok

* Autos gawn (#1152)

* ique builds

* Yeet most `auto, .data` from ique

* us dun

---------

Co-authored-by: angie <angheloalf95@gmail.com>

* update shplort

* fix configure

* requests

---------

Co-authored-by: angie <angheloalf95@gmail.com>
2024-01-21 03:28:11 +09:00
AltoXorg
bfe9a42b06
some JP decomp (#1149)
* main segment cleanup

* engine1

* engine4

* evt

* entity

* engine2 msg split

* engine2 draft

* identify all gu functions

* font_width + charset

* update msg ids

* os stuff

* msg stuffs

* msg_copy_to_print_buffer

* popup_menu_draw_menu_contents

* appendGfx_message

* cleanup

* building fixed

* Change exceptasm symbols to not be global

---------

Co-authored-by: Ethan <ethteck@gmail.com>
2024-01-16 14:13:54 +09:00
Alex Bates
6b5883f1f5
Assetify crash font (#1140)
* assetify crash font

* bump pigment64 version

* bump pigment ver

* maybe fix

* 2

* move to new img asset inclusion

---------

Co-authored-by: Ethan <ethteck@gmail.com>
2024-01-09 01:42:34 +09:00
Ethan Roseman
6da232df36
Image asset rework (#1141)
* poc

* A bit

* 19 files to go

* ique fixed this took me hours omg

* 4 more

* dead vines

* fixules

* drop .bin from needed macro
2024-01-08 01:36:59 +09:00
Ethan Roseman
b716abeadb
Misc tidying (#1134)
Cleaned up Yay0compress cod
Identified / classified remaining bins in the US yaml
Tiny comment removal in a source file
2023-12-11 18:44:57 +09:00
HailSanta
c2ade571fe
model rendering doc (#1128)
* all over the place

* model roundup

* missing reset_tiles for jp/ique splat

* fix pal

* fix ique

---------

Co-authored-by: HailSanta <Hail2Santa@gmail.com>
2023-11-24 13:06:58 +09:00
Alex Bates
59ab2bb752
fix debug builds (#1129) 2023-11-24 13:03:59 +09:00
HailSanta
5f5722c850
sfx and render modes cleanup (#1124)
* misc

* map_init returns

* remaining render mode names

* fix render mode case order

* minor additions

---------

Co-authored-by: HailSanta <Hail2Santa@gmail.com>
2023-11-10 14:19:40 +09:00
Ethan Roseman
ecb65c720a
vram_classes splat update (#1123)
* Change splat subrepo to use main branch

* git subrepo pull --force tools/splat

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

* building now

* vram classes in the us yaml

* more progrezz

* more

* prepare to deal with the shiftable build

* revert a couple things

* bring the yaml more in line with the old one while debugging

* got statis

* vacuum

* git subrepo pull --force tools/splat

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

* clean
2023-11-09 21:48:23 -05:00
HailSanta
54e7bb973c
all sounds named (#1120)
* 128 left

* all sounds done

* most battle flags

* battle message states

* status bar and shop cleanup

---------

Co-authored-by: HailSanta <Hail2Santa@gmail.com>
2023-10-22 08:39:20 -04:00
HailSanta
ce4ab34def
battle/actor flags and more (#1119)
* battle documentation

* mostly startup stuff

* battle file names

* minor reorg

* actor rendering

* few extras

* file renames and camera unks

* py fix

* fio cleanup

* sounds progress

---------

Co-authored-by: HailSanta <Hail2Santa@gmail.com>
2023-10-14 15:43:12 -04:00
HailSanta
3293216356
last actors (#1118)
* omo2

* minor fixes

* actor types extraction

* format py

---------

Co-authored-by: HailSanta <Hail2Santa@gmail.com>
2023-10-02 09:12:53 +09:00
HailSanta
46b2f11a59
more boss actors (#1117)
* common actors

* tubba and huff

* chapter 2

* fix ruff / tuff puff names

* bloopers

* slight

* everything except omo2

* format py

* fix pal

---------

Co-authored-by: HailSanta <Hail2Santa@gmail.com>
2023-09-23 01:57:29 -04:00
JoshDuMan
bde8f70e3f
Clean up game_modes.c and game_states.c (#1115) 2023-09-15 23:53:00 -04:00
HailSanta
ef440ff994
most actors (#1114)
* common actors

* tubba and huff

* chapter 2

* fix ruff / tuff puff names

* bloopers

---------

Co-authored-by: HailSanta <Hail2Santa@gmail.com>
2023-09-01 03:51:10 +09:00
HailSanta
9774b26d93
actors and sounds (#1112)
* all sorts of things

* various

* more

* various

* sound space names

* more

* alternating sounds done

* check

* partial jr troopa cleanup

* jr troopas

* fixes

* extract actor levels

* actor levels done

* chan

* the master

* standard names

* named actor vars

* ACTION_RESULT enum

* fix evt names

* fix struct names

* ember

* lava bubble

* goomba bros + flipped enum

* fix other enum

* goomba king battle

* tutorial enemies

* separate lee

* half lee

* lee done

* lee + duplighost

* more actors

* stray comment

* shy guy dedupe

---------

Co-authored-by: HailSanta <Hail2Santa@gmail.com>
2023-08-22 03:07:08 +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
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
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
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
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
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
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
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
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
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
Jacob Butler
31c98cc94c
Albino Dino sprite/animation names (#1042)
* Look at this

* Animation ordering fix

* Animation Naming Ordering Fix 2

---------

Co-authored-by: Ethan Roseman <ethteck@gmail.com>
2023-05-02 04:55:25 +09:00
HailSanta
94cc139227
standardized battle script names (#1043)
* damage intensity

* standardized battle script names

* few more

---------

Co-authored-by: HailSanta <Hail2Santa@gmail.com>
2023-05-01 16:22:52 +09:00
HailSanta
c8548d5002
btl cam modes (#1035)
* some btl cam

* couple things

---------

Co-authored-by: HailSanta <Hail2Santa@gmail.com>
2023-04-29 03:19:30 -04:00
HailSanta
7a9df943ad
various cleanup (#1030)
* more fold

* fold render modes

* fold rename 1

* fold rename 2

* fold rename 3

* imgfx struct reorg

* post merge

* the rest

* extras

* forgot these

* done

* ImgFx

* ImgFX

* check

* misc cam stuff

* ws

* misc

* btl msg

* 3 combine modes

* 3 more

* many more

* screen overlays

* stencil types

* all screen transitions

* jp build fix

* another jp fix

* iq fix

* mystery battle enum added oOoOoOoOooo

* DMG_SRC

* starting battle cam presets

---------

Co-authored-by: HailSanta <Hail2Santa@gmail.com>
2023-04-26 00:33:17 +01:00
Ethan Roseman
e0cfd078da
imgfx data (#1029) 2023-04-25 13:55:14 +09:00
HailSanta
e41923e55d
image fx (#1015)
* more fold

* fold render modes

* fold rename 1

* fold rename 2

* fold rename 3

* imgfx struct reorg

* post merge

* the rest

* extras

* forgot these

* done

* ImgFx

* ImgFX

* check

* misc cam stuff

* ws

---------

Co-authored-by: HailSanta <Hail2Santa@gmail.com>
2023-04-20 17:15:58 +09:00