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
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
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
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
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
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
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
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
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
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
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
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
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
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
Ethan Roseman
b39f8de7cd
Hotfix for imgfx data splitting bug ( fixes #1033 )
2023-05-02 03:55:03 +09:00
HailSanta
884140f419
split em ( #1040 )
...
Co-authored-by: HailSanta <Hail2Santa@gmail.com>
2023-04-30 03:33:56 +09:00
Marijn van der Werf
30aa49d4a8
Clean trailing whitespace ( #1038 )
...
* Add missing newlines
* Remove trailing whitepace
2023-04-29 15:28:06 +02: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
Marijn van der Werf
aa29eb5553
Pal pause ( #1011 )
...
* PAL pause segment
* PAL pause_gfx_en segment
* Apply name changes
* Merge gPauseBadgesElements
* Rename ITEM_TYPE_FLAG_ENTITY_COLLECTIBLE
* Split PAL and monolingual arrays
2023-04-21 17:33:49 +09:00
Marijn van der Werf
595f142b27
Pal battle ( #989 )
...
* world partners
Co-authored-by: Unnunu <serge_zorkin@mail.ru>
* battle partners
* battle items
* Update src/battle/common/move/ItemRefund.inc.c
Co-authored-by: Alex Bates <16batesa@gmail.com>
* add LANGUAGE enum
* Move extern variable declarations
* Remove temp var
* Update scripts
* remove post
* Fix n64img version
This reverts commit f5a2c592bd
2023-03-27 02:03:19 +09:00
Marijn van der Werf
f504af5b90
A couple of PAL sections ( #986 )
...
* Splat later segments
* battle_areas
* effects
2023-03-20 00:05:43 +09:00
Marijn van der Werf
d31022e042
Second batch of PAL maps ( #974 )
...
* iwa
* sbk
* dro
* isk
* trd
* nok
* hos
* kpa
* osr
* kkj
* tst
* jan
* mim
* obk
* Use MODEL_ constants
* Rename defines
* Fix SetCamSpeed invocations
* Remove Boo float defines
* Simplifly float
2023-03-14 17:47:14 +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
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
HailSanta
5a5d088d83
battle cleanup ( #947 )
...
* item cleanup
* quick
* star power cleanup
* battle cleanup
* battle cleanup
* SetGroupVisibility
* more stage cleanup
* stage clean
* misc
* half of stages
* stagework
---------
Co-authored-by: HailSanta <Hail2Santa@gmail.com>
2023-02-21 00:22:38 +09:00
HailSanta
768e88f20d
area jan ( #937 )
...
* couple jan
* pipe includes cleanup
* jan_13 checkpoint
* Rafael checkpoint
* jan_05 ok
* jan_0X done
* fix spear guy name
* all jan ok
* jan done
* no halves
---------
Co-authored-by: HailSanta <Hail2Santa@gmail.com>
2023-02-10 17:00:28 +09:00
HailSanta
713883c750
world script data ( #933 )
...
* nok_01 ok
* nok_01 cleanup
* nok_02 ok
* nok_02 cleanup pt 1
* nok_02 cleanup pt 2
* nok_02 cleanup pt 3
* map api data
* rooms api
* rooms cleanup
* rooms cleanup
* done rooms cleanup
* fix mixed up enemy/npc flags
* tabs
---------
Co-authored-by: HailSanta <Hail2Santa@gmail.com>
2023-02-05 19:13:45 -05: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
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
HailSanta
a03510d8a6
area_omo ( #921 )
...
* omo_09
* omo_11
* part of omo
* 08/10/13
* more
* train toad rename
* hmm
* guard ai
* omo_02
* fix partner anim enum
* omo_15
* omo_12
* last omo
* pra_15
* reflections
* under 100 maps left
* cleanup floats
* horse
Co-authored-by: HailSanta <Hail2Santa@gmail.com>
2023-01-25 11:33:20 +09:00
HailSanta
858eb4c19e
fix map warnings ( #916 )
...
* omo_17
* sam_06
* sam_06
* hos_02
* hos_03
* shops
* star kid name fix
* shop dialogue
* nok_11
* nok 14/15
* small fixes
* ready
Co-authored-by: HailSanta <Hail2Santa@gmail.com>
2023-01-21 17:14:46 +09:00
HailSanta
efa45a5668
misc battle cleanup II ( #908 )
...
* flags and fixes
* move category start
* first strike and battle messages
Co-authored-by: HailSanta <Hail2Santa@gmail.com>
2023-01-11 17:38:04 +09:00
HailSanta
cc3a146066
battle substates cleanup I ( #906 )
...
* cleanup in progress
* celebrate done
* progress
* etc
* substate enums done
* flag fixup
* brevity
* msg name fix
Co-authored-by: HailSanta <Hail2Santa@gmail.com>
2023-01-10 15:33:09 +09:00
HailSanta
a2e96ae3ae
area kpa ( #901 )
...
* kpa 1/3/4/5
* more!
* just one left
* done
* stray cleanup
Co-authored-by: HailSanta <Hail2Santa@gmail.com>
2023-01-03 19:46:15 +09:00
HailSanta
e4283f3ea1
area_mac ( #884 )
...
* mac_00 match
* mac_00 cleanup pass
* enough mac_00 cleanup
* mac_01 match
* cleanup pass 1
* first pass done
* more
* unkfoldfunc dedupe
* quick
* mockup
* new splat segment
* git subrepo pull --force tools/splat
subrepo:
subdir: "tools/splat"
merged: "b2d7b86185"
upstream:
origin: "https://github.com/ethteck/splat.git "
branch: "master"
commit: "b2d7b86185"
git-subrepo:
version: "0.4.5"
origin: "https://github.com/ingydotnet/git-subrepo "
commit: "aa416e4"
* fix custom segment
* git subrepo pull --force tools/splat
subrepo:
subdir: "tools/splat"
merged: "0f66e7552a"
upstream:
origin: "https://github.com/ethteck/splat.git "
branch: "master"
commit: "0f66e7552a"
git-subrepo:
version: "0.4.5"
origin: "https://github.com/ingydotnet/git-subrepo "
commit: "aa416e4"
* common vtx
* victory
* checkpoint
* remove map-specific subaligns
* enough
* quick fixes
Co-authored-by: HailSanta <Hail2Santa@gmail.com>
Co-authored-by: Ethan Roseman <ethteck@gmail.com>
2022-12-12 21:31:29 +09:00
Ethan Roseman
29c3ffa2e0
Misc decomp 3: Oh baby a triple ( #882 )
...
* clean
* git subrepo pull --force tools/splat
subrepo:
subdir: "tools/splat"
merged: "901241040d"
upstream:
origin: "https://github.com/ethteck/splat.git "
branch: "master"
commit: "901241040d"
git-subrepo:
version: "0.4.5"
origin: "https://github.com/ingydotnet/git-subrepo "
commit: "aa416e4"
* splat update
* more matches after nop hack
* git subrepo pull --force tools/splat
subrepo:
subdir: "tools/splat"
merged: "715ee0ad55"
upstream:
origin: "https://github.com/ethteck/splat.git "
branch: "master"
commit: "715ee0ad55"
git-subrepo:
version: "0.4.5"
origin: "https://github.com/ingydotnet/git-subrepo "
commit: "aa416e4"
* Renames, match boot_idle
* one mo
* wips
* fish func
Co-authored-by: @JaThePlayer
* sushie dun
* warnings
* clean
* match a nok func
* nok_02 stuff
* nok_04 party image
* func_802BD5D8_3174F8
* LoadPartyImage & stuff
* warnings
2022-12-11 16:43:29 +09:00
HailSanta
2561914d1a
area_tik+ ( #874 )
...
* koopa
* para troopa
* some fuzzy
* tik_05
* tik_02
* tik_01
* tik_03
* tik_03b
* tik_04
* tik_07
* tik_08
* tik_09
* tik_10/12
* tik_14
* tik_15
* tik_17/18
* more tiks
* area_tik
* mac_03
* cleanup
* oink names
Co-authored-by: HailSanta <Hail2Santa@gmail.com>
2022-11-30 16:39:42 +09:00
Ethan Roseman
f56df3d9f7
sprite_shading_profiles & obk_07 ( #859 )
...
* obk_07 funcs
* 2 mo
* sprite_shading_profiles
* tiny clean
* PR comments
2022-11-15 23:55:59 +09:00
Alex Bates
480257bceb
fix typo in comment ("Afriad")
2022-10-30 13:07:15 +00:00
HailSanta
342887a94c
kmr + revisions ( #828 )
...
* kmr_07
* more kmr
* kzn cleanup 1-9
* kzn cleanup II
* arn/mgm/gv/end revision
* iwa I
* bubulb spelling
* rest of iwa
* more kmr
* enough kmr_23 for now
* quick fix
Co-authored-by: HailSanta <Hail2Santa@gmail.com>
2022-10-17 16:46:24 +09:00
HailSanta
f96542f52a
area_trd ( #807 )
...
* EVT_PLAY_EFFECT
* area_trd data
* forgot a flag name
* fix bobomb spelling
* todo note
* fix macros
* fixed a couple more
Co-authored-by: HailSanta <Hail2Santa@gmail.com>
2022-10-07 14:45:58 -04:00
