Commit Graph

471 Commits

Author SHA1 Message Date
AltoXorg
c356a0e330
pal world (#1218) 2024-11-09 12:19:32 +09:00
mrshigure
89de30009c
[JP] Finished World Areas, Pause, Dead Maps (kzn, flo) and some more (#1208) 2024-11-04 15:43:33 +09:00
z64a
b1ca4bd051
filemenu state upstreams from dx (#1215) 2024-10-31 09:21:15 +09:00
z64a
ee3bffb249
effects and action command cleanup (#1213) 2024-10-23 14:44:44 +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
5e2487fde2
dx camera upstreams (#1207) 2024-09-23 14:42:15 -04: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
AltoXorg
6a2ad7e1b9
iQue appendGfx_message (#1167)
* iQue appendGfx_message

* i forgot constant name

* update progress.py

this should 100% by now :)
2024-02-06 21:32:33 +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
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
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
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
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
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
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
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
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
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
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
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
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
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
Unnunu
771113de21
npc_do_player_collision (#1017) 2023-04-16 10:21:08 +09:00
HailSanta
93ed912319
fold doc 1 (#1009)
* minor fold cleanup

* fold doc I

* enough

* rename

* last

---------

Co-authored-by: HailSanta <Hail2Santa@gmail.com>
2023-04-08 02:18:12 +09:00
HailSanta
f0145e8541
other world partners (#981)
* watt

* half sushie

* sushie

* laki first pass

* checkpoint

* ok

* PartnerStatus

* enough

* minor

---------

Co-authored-by: HailSanta <Hail2Santa@gmail.com>
2023-03-16 15:41:26 +09:00
HailSanta
c1d9bbbd2a
more world partners (#976)
* wip

* hm

* update

* bow

* parakarry

---------

Co-authored-by: HailSanta <Hail2Santa@gmail.com>
2023-03-14 17:55:49 +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
HailSanta
288bb8511f
world kooper cleanup (#963)
* kooper cleanup

* second pass

---------

Co-authored-by: HailSanta <Hail2Santa@gmail.com>
2023-03-04 12:20:43 +09:00
Ethan Roseman
209457a32a
msg_copy_to_print_buffer (#962)
* wip

* wip

* update_camera_mode_unused

* PR comment

* fix warning

* wip

* wip

* msg_copy_to_print_buffer

* PR comments
2023-03-03 10:42:48 +09:00
HailSanta
1cf0d59f2a
camera control points union (#958)
* union for camera points

* remove raw

* first cleanup

* enums and names

* one minor thing

* corrected comment

---------

Co-authored-by: HailSanta <Hail2Santa@gmail.com>
2023-03-02 17:32:54 +09:00
HailSanta
07c314d8e7
draw popup menu (#956)
* shape misc

* new func

* popup stuff

---------

Co-authored-by: HailSanta <Hail2Santa@gmail.com>
2023-02-25 17:30:02 +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
e55556ddcb
enemy+npc flags (#946)
* npc flags 1

* enemy & npc flags

* removed item headers

* minor item cleanup

* coverage

---------

Co-authored-by: HailSanta <Hail2Santa@gmail.com>
2023-02-18 17:13:07 +09:00
HailSanta
f033bbae6d
all data done (#945)
* misc fold

* omo cleanup

* projectile target offset

* missing actor part fields

* msg chars

* decimal offsets

* partIndex -> partID

* callables

* EVT_PLAY_EFFECT

* fix out of range offsets

* some renames

* battle_area -> battle/area

* renames

* battle names last

* more power

* hammer moves

* hammer directory

* all moves migrated

* moved items

* moved starpowers

* fixed jp

---------

Co-authored-by: HailSanta <Hail2Santa@gmail.com>
2023-02-17 16:44:14 +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
HailSanta
4fce6037a1
misc battle cleanup (#943)
* peach NPC flags and missing ANIM_LIST_END

* ANIMS

* auto smash

* misc battle cleanup

* misc battle doc 2

* more battle

---------

Co-authored-by: HailSanta <Hail2Santa@gmail.com>
2023-02-15 03:18:27 -05: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
HailSanta
8c688c82d7
all map data complete (#941)
* just 10 left

* six left

* split dead flo_19

* merged texture pan includes

* cooking

* bedroom

* study

* one left

* kkj_25 ok

* kkj_25 cleanup I

* enemy include reorg

* NO_DROPS cleanup

* revised NO_DROP

* dead_flo_19 splits

* StaticNpc -> NpcData

* removed tabs

* canonical npcdata fields ordering

* ANIM_LIST_END for ExtraAnims

* npcdata field reordering

* DISPOSE_LOCATION

* kkj_25 done

* marked unused area bytes

* adjusted function temp defines

---------

Co-authored-by: HailSanta <Hail2Santa@gmail.com>
2023-02-14 09:46:48 +09:00
HailSanta
18befa1ec6
area sam (#931)
* sam_02

* sam_11 ok

* sam_11 done

* jan progress

* jan_03

* fix

* small

* oops

* spaceman

---------

Co-authored-by: HailSanta <Hail2Santa@gmail.com>
2023-02-03 15:16:32 +09:00
Ethan Roseman
76438a7198
Fix typedefs for various things to be more C compliant (#929) 2023-02-02 02:48:25 +09:00