Commit Graph

29 Commits

Author SHA1 Message Date
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
AltoXorg 36f1ef2c72
huge iQue matching (#1126)
* engine1

* !

* entity/model

* maps

* level_up

* btl_states_menus

* effects

* cleanup and asm match

* battle_code

* cleanup

* msg.c near matching

* final

* fix compilation

* meaningful

* pr commento

* compiler warn eliminate

* rank <-> chapter switcheroo
2023-11-21 00:22:26 +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
JoshDuMan bde8f70e3f
Clean up game_modes.c and game_states.c (#1115) 2023-09-15 23:53:00 -04: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
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
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 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
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
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 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 2340b15e97
Master to main (#970)
* step 1

* gMasterGfxPos -> gMainGfxPos

* change label name
2023-03-09 01:55:54 +09:00
Ethan Roseman c5dde1054f
cn -> ique (#969) 2023-03-09 00:40:22 +09:00
HailSanta 8a7432f465
popup and window priority (#960)
Co-authored-by: HailSanta <Hail2Santa@gmail.com>
2023-03-02 11:36:11 +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
HailSanta 2d3a608ce7
area hos (#928)
* hos_06 ok

* hos_06

* hos_01

* hos_01

* hos_04

* hos 10/20

* hos_05 builds

* hos_05 data ok

* hos_05 ok

* hos_05 cleanup pt1

* hos_05 cleanup done

* small fix

* a couple more

* fix little thing

* finish sam_01

---------

Co-authored-by: HailSanta <Hail2Santa@gmail.com>
2023-02-01 11:31:09 +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
HailSanta eb7ed118a6
flags -> flag (#909)
* flagsnt

* not this one

Co-authored-by: HailSanta <Hail2Santa@gmail.com>
2023-01-12 11:09:13 +09:00
Ethan Roseman cfb36ee36e
5uncs (#895)
* 2 dogs

* pause_stats_draw_contents

* Cleanup

* is_ability_active :confetti:

* WIP

* spawn_drops

* PR
2022-12-29 14:48:27 +09:00
Unnunu e6de400efa
Draw box (#897)
* wip

* matched draw_box

* cleaning up

* renamed file

* fixed warning

* PR comments
2022-12-29 14:08:13 +09:00
Unnunu cf4eeecc13
msg stuff (#847)
* matched several msg functions

* added images and set flags

* fix merge issue

* warning

* Update src/msg_data.c

Co-authored-by: Alex Bates <16batesa@gmail.com>

Co-authored-by: Alex Bates <16batesa@gmail.com>
2022-11-02 21:30:07 +09:00
Ethan Roseman 46decfa258
Warning Fixies (#826)
* warnings

* morenings

* more

* morz

* mor3

* PR
2022-10-16 23:22:18 +09:00
Unnunu 50ab50f669
filemenu (#791)
* migrated filemenu data

* matched filemenu_get_menu_message

* matched the rest of filemenu

* cleaning up

* fix
2022-09-29 02:09:11 +09:00