Commit Graph

67 Commits

Author SHA1 Message Date
mrshigure
89de30009c
[JP] Finished World Areas, Pause, Dead Maps (kzn, flo) and some more (#1208) 2024-11-04 15:43:33 +09:00
z64a
bf0741ce15
upstream window IDs from dx (#1214) 2024-10-23 20:18:00 -04:00
z64a
ee3bffb249
effects and action command cleanup (#1213) 2024-10-23 14:44:44 +09:00
Ethan
8dd922bf68
Fix yamls for other versions too 2024-10-16 20:05:43 +09:00
z64a
63b0e737ee
npc-enemy-flags (#1212) 2024-10-07 23:15:38 -04:00
z64a
5929e49b72
isBattle refactor (#1211) 2024-10-01 11:50:46 +09:00
z64a
ba4499e2a7
some effect symbols (#1210) 2024-09-30 13:03:14 +09:00
z64a
5e2487fde2
dx camera upstreams (#1207) 2024-09-23 14:42:15 -04:00
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
Ethan Roseman
8b198cf9d2
Fix alignment for bins (#1201) 2024-09-12 16:15:01 +09:00
Ethan Roseman
7f524ee10a
Dep update & fix pip install (#1196) 2024-09-01 20:20:38 +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
croghostrider
1ad6a2145e
PAL filemenu_get_menu_message (#1166) 2024-02-05 13:35:58 +09:00
croghostrider
8ea884c0a9
PAL dma_load_msg (#1165) 2024-02-05 02:05:31 +09: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
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
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
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
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
9cac66c54a
misc work (#1108)
Co-authored-by: HailSanta <Hail2Santa@gmail.com>
2023-08-03 16:38:11 +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
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
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
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
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
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
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
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
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
aa08abd4da
Dump PAL filemenu section (#1036)
* Dump PAL filemenu section

Co-authored-by: Unnunu <serge_zorkin@mail.ru>

* Clean up numbers

* Use more constants

* Find more constants

* Clean up a bit

* eth cleanup

* Clean up

* Fix brace style

* rename new file & funcs

---------

Co-authored-by: Unnunu <serge_zorkin@mail.ru>
Co-authored-by: Ethan Roseman <ethteck@gmail.com>
2023-05-01 16:40:57 +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