Ethan Roseman
e6b5b033a5
bump pigment to 0.3.0
2023-07-20 15:18:25 +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
Ethan Roseman
1118ee8110
Require pigment64, use it to build most standalone images ( #1088 )
2023-07-18 09:53:53 +01: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
Alex Bates
6257881b44
fix configure macOS cpp finding ( #1070 )
2023-06-27 08:00:58 +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
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
Marijn van der Werf
5511e18133
Clean executable files ( #1047 )
...
* Mark headers as non-executable
* Update shebangs
2023-05-04 18:03:02 +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
Ethan Roseman
e0cfd078da
imgfx data ( #1029 )
2023-04-25 13:55:14 +09:00
Marijn van der Werf
0c741974a6
fix image building to work with new n64img output ( #1001 )
2023-03-27 00:43:00 +09:00
Marijn van der Werf
7c04b86492
build: remove iconv wrapper for macOS ( #992 )
2023-03-23 10:21:32 +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
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
Ethan Roseman
ba42928a18
3unks the Threequel ( #955 )
...
* Fix modern gcc issue with function call arg evaluation order, shiftability issue with heap, other fixes
* cursed function byebye
* configure cleanup
* npc_do_other_npc_collision & func_80244550_A2E790
* wip
* PR comments
2023-02-24 13:02:57 +09:00
Ethan Roseman
8f974438a3
3uncs 2 ( #952 )
...
* progress
* Fix modern gcc issue with function call arg evaluation order, shiftability issue with heap, other fixes
* cursed function byebye
* configure cleanup
* Fix configure issue
* MakeShop
Co-authored-by: JoshDuMan <40190173+JoshDuMan@users.noreply.github.com>
* item_entity_load
Co-authored-by: JoshDuMan <40190173+JoshDuMan@users.noreply.github.com>
* closer
* PR comment
---------
Co-authored-by: JoshDuMan <40190173+JoshDuMan@users.noreply.github.com>
2023-02-22 17:22:31 +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
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
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
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
pixel-stuck
ddebe5eb64
Big steps toward ROM shiftability ( #912 )
...
* shiftability work
* Cleanup
* fix build
* Fix sprite shading profile when shifted
* fix overworld items icons, message icons, and corrupted bowser graphics on the title screen
* add shift flag to configure.py
* restoring ifdef stuff
Co-authored-by: Ethan Roseman <ethteck@gmail.com>
2023-01-16 23:03:23 +00:00
Ethan Roseman
cf2099772d
10 functions ( #893 )
...
* fixins
* 2 dogs
* a few funcs + progress
* 3 more
* clean & PR comments
2022-12-21 17:15:21 +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
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
Lightning
0583c230a7
Fixing debug builds, does require newer AS from decompals ( #837 )
2022-10-28 10:42:27 +09:00
Ethan Roseman
9e8f3eb36b
Line numbies + a couple funx ( #833 )
...
* check_input_open_menus
* func_8003DA38
* some shiftability snibblets
* clean
* PR comments
2022-10-18 20:43:04 +09:00
Ethan Roseman
46decfa258
Warning Fixies ( #826 )
...
* warnings
* morenings
* more
* morz
* mor3
* PR
2022-10-16 23:22:18 +09:00
Ethan Roseman
c700116f41
BSS And Libultra ( #823 )
...
* BSS refactor (the Wiseguy method)
* controller.c
* ldiv.c
* motor.c
* cartrominit.c
* more libultra matching + standardization
* more libultra stuff
* more
* clean
* warnings
2022-10-16 07:24:05 +09:00
Lightning
c1c1dfd533
Fix z64 building in debug mode ( #822 )
2022-10-15 07:50:43 +09:00
Ethan Roseman
473bfa0692
dead_sqrtf, data migration, etc ( #790 )
...
* more goods
* move dead map data to dir
* data migration / splatification
* new splat
* git subrepo pull --force tools/splat
subrepo:
subdir: "tools/splat"
merged: "d93b6550c4"
upstream:
origin: "https://github.com/ethteck/splat.git "
branch: "master"
commit: "d93b6550c4"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo "
commit: "2f68596"
* splat fix
* dead_sqrtf bye bye
* fix
* Clover comments
* comment
2022-09-29 05:52:12 +09:00
HailSanta
3706178f3a
sprite names ( #782 )
...
* initial variation support
* checkpoint
* pass 1
* second pass
* first few
* more
* change anim < 16 format
* next batch
* goomba anims
* more npcs
* safety
* success
* checkpoint
* last of dro
* a few
* checkpoint
* penguins
* conventions
* flowers A
* Flowers B
* partner animation support
* parter stuff
* id cleanup
* laki
* more laki
* laki done
* sushie
* goompa
* watt + bow
* bombette + parakarry
* goombario
* kooper
* goomba family
* spike jr troopa
* jr troopa
* world partners
* goombas
* lee
* chan
* the master
* toads
* mostly toads
* so many toads
* penguins
* nok npcs
* ch 2+3
* rest of chapters
* parade
* green mario harharhar
* battle bowser
* world bowser
* goomba king
* enough sprites for now
Co-authored-by: HailSanta <Hail2Santa@gmail.com>
2022-09-24 18:04:13 +09:00
Ethan Roseman
0094fa6a31
Pigs and speech bubbles 🐽 💬 ( #767 )
...
* lil_oink effect
* oink map funcs
* fix build to not be big
* machi funcs
* mac func
* data migration
* draw_shop_items
* e20eb0.c funcs + data
* warnings
* PR warnings and cleanup
2022-09-11 02:04:04 +09:00
EllipticEllipsis
80b605f737
Fix some stuff for Mac installation ( #753 )
2022-08-28 13:12:47 +09:00
HailSanta
f4efd09c80
isk + misc ( #746 )
...
* isk + warning patrol
* minor reorg
* effect data union
* structs sorted and dummy structs added
* effect data cleanup + some end funcs
* two more PAL_PTR*
* temp
* flower fx
* pal_inc_c
* remove tabs
* isk_05
* blur union
* more isk
* isk funcs done
* sun stuff
* delete sun_main
* sun comments
* extra stuff
* actor decorations
2022-08-10 14:36:38 +01:00
Ethan Roseman
d31e0b8936
Engine cod ( #738 )
...
* a couplez
* func & data cleaning
* sig
* move data and fix nonmatching
* Finish 17D6A0
* Don't use backticks in progress.py
* func_8025995C and clean
* 2 sprite funcs and cleanup
* 3 sprite funcs
* gather_magic_main
* 3 sprite funcs
* more sprite work and cleanup
* sprite funcs
* more clean
* UnkFloatFunc005
* warnings
* cleaning and os stuff
* 2 more funcs + warnings
* yaml work, move map data metadata to separate yml file
* apply_transform_to_children
* cleaningz
* PR comment
2022-07-08 21:57:08 +09:00
Ethan Roseman
bae34c46ed
Upgrade to splat 0.9.0 ( #730 )
...
* changes for splat 0.9.0
* wip
* git subrepo pull --branch=develop --force tools/splat
subrepo:
subdir: "tools/splat"
merged: "2ff7357501"
upstream:
origin: "https://github.com/ethteck/splat.git "
branch: "develop"
commit: "2ff7357501"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo "
commit: "2f68596"
* OK
* big_snowflakes gfx data
* Jenkins?
* cleanup
* debuff effect gfx data
* fix
* more effect gfx data
* dlabel
* git subrepo pull --branch=experiment --force tools/splat
subrepo:
subdir: "tools/splat"
merged: "1365775e09"
upstream:
origin: "https://github.com/ethteck/splat.git "
branch: "experiment"
commit: "1365775e09"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo "
commit: "2f68596"
* .
* git subrepo pull --branch=experiment --force tools/splat
subrepo:
subdir: "tools/splat"
merged: "6bd9fe1c4e"
upstream:
origin: "https://github.com/ethteck/splat.git "
branch: "experiment"
commit: "6bd9fe1c4e"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo "
commit: "2f68596"
* flower splash/trail gfx
* throw_spiny gfx
* disable_x and butterflies gfx data
* draw_coin_sparkles
* Warnings, cleanup
* cleanin
* attempt at test_item_player_collision
* more gfx + cleanup
* more effect gfx
* func_8002D160
* update update_symbol_addrs and symbol_addrs
* git subrepo pull --branch=develop --force tools/splat
subrepo:
subdir: "tools/splat"
merged: "4914dc9029"
upstream:
origin: "https://github.com/ethteck/splat.git "
branch: "develop"
commit: "4914dc9029"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo "
commit: "2f68596"
* git subrepo pull --branch=master --force tools/splat
subrepo:
subdir: "tools/splat"
merged: "aa71299594"
upstream:
origin: "https://github.com/ethteck/splat.git "
branch: "master"
commit: "aa71299594"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo "
commit: "2f68596"
* fix
* fix regression
* Add rabbitizer to requirements
* warnings
* symbol_addrs fixes
2022-06-13 00:33:32 +09:00
alex
dcd315865c
Remove script DSL ( #717 )
...
* remove cc_dsl task
* ok
2022-05-27 22:00:53 +09:00
Ethan Roseman
179998098c
Misc decomp 53 ( #703 )
...
* some btl_state work
* msg_draw_speech_bubble
* cleaners
* btl_state_stuff
* btl_state_update_next_enemy wip
* btl_state stuff
* disable_x fx + cleanup
* wip
* fxstuff
* path funcs & cleanup
* clean
* model_api funcs
* two action commands
* action_cmd progress
* UnkFunc001
* air raid func
* cleanup, data migration, goodies
* remove data file
* git subrepo pull --force tools/splat
subrepo:
subdir: "tools/splat"
merged: "a847090eac"
upstream:
origin: "https://github.com/ethteck/splat.git "
branch: "master"
commit: "a847090eac"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo "
commit: "2f68596"
* fix build
* more cleanup
* clean
* PR comments
2022-05-05 23:08:16 +09:00
Ethan Roseman
96e85f4da1
SFX funcs, configure fix ( #635 )
...
* SFX funcs, configure fix
* the actual rename (oops)
2022-01-31 19:10:02 +09:00
Ethan Roseman
d2da25dc10
GCC 2.7.2 support ( #633 )
...
* name big_smoke_puff
* 0-5
* 6 -> land
* more effect stuff
* flower effects
* name fix
* cloud_puff
* flower splash
* cloud_trail
* 2 more
* more
* a bunch more
* -2F
* more
* the rest
* cleanup and the rest
* attack_result_text
* PR stuffs
* numbaz
* Attempt to get 2.7.2 support working
* Update Jenkinsfile
* try
* fix
* fix issues
* remove KMC_ASM remnants
* NON_EQUIVALENT for the effect gfx func
* We don't need wine
2022-01-29 10:01:26 +09:00
alex
715e469ab9
update msg building for precomp
2022-01-08 15:45:42 +00:00
Lightning
9764f4d44f
Changes required to prevent kmc compiler from using debugging ( #514 )
...
as it inserts extra instructions at the moment
2021-11-01 10:26:58 +09:00
Alex Bates
8a380bf6ea
use is_debug.c on jp ( #507 )
2021-10-29 23:07:59 -04:00
