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
Ethan Roseman
068b8a5b08
B4580 and d0a70_len_4fe0 ( #502 )
...
* func_80133A94
* animator stuff
* add_anim_node and animator_node_update_model_transform
* a bunch more
* more
* .
* temp
* create_mesh_animator
* 2 mo
* d0a70 funcs
* more d0a70
* 2 mo
* 1 + cleanup
* 2 mo
* cleanup
* revert change to verbosity for splat
* PR comments
2021-10-30 02:57:15 +09:00
Lightning
fb74314a6d
Debug in elf ( #491 )
...
* git subrepo pull (merge) --force tools/splat
subrepo:
subdir: "tools/splat"
merged: "e5838f0b06"
upstream:
origin: "https://github.com/ethteck/splat.git "
branch: "master"
commit: "e5838f0b06"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo "
commit: "2f68596"
* Allow storage of extra debug info in elf
* Fix string
* Add comment detailing purpose of genobjcopy
2021-10-25 23:26:38 -04:00
Alex Bates
ae00fea170
Add new EVT macros ( #482 )
...
* add tools and new macros
* change EVT_OP enum names
* first file
* convert some files
* stuff
* EVT_PTR
* src/battle/item
* src/battle
* tool changes
* clouds.inc.c
* src/evt
* foliage.inc.c
* bitwise ops
* staticentitydata vars
* add diff_evt.py
* use evt macros in dro_01
* evt macro docs
* whoops
* fix some warnings
2021-10-25 20:44:55 +09:00
Ethan Roseman
33c9dda3a5
KMC GCC, effects, cleanup, map funcs ( #476 )
...
* warnings, cleanup, 2 npc ai funcs
* kmcgcc stuff
* effect_75
* effect_9.c done
* cleanup, work on kmc gcc
* start on fx_73
* guOrtho/guOrthoF
* more libultra/cleanup
* more libultra
* add wine for darwin
* effect_73 done
* UnkQuizFunc
* effect func naming
* name appendGfx funcs
* fix fx_66
* Add KMC wrapper to Jenkinsfile
* mac fixes
* fix macro usage
* oopz
* 3 fixes
* blah
* KMC_ASM
* config changes
2021-10-22 23:01:27 +09:00
Lightning
f6fa89bbc4
Minor enhanement ;) ( #488 )
2021-10-21 13:38:17 -04:00
Ethan Roseman
4c787f68c1
Effect_6 done, splat, diff updates ( #451 )
...
* fx_6_appendGfx
* update_effects
* effect_6 done
* Update diff.py
* update configure for new splat
* git subrepo pull --force tools/splat
subrepo:
subdir: "tools/splat"
merged: "0efa552c5d"
upstream:
origin: "https://github.com/ethteck/splat.git "
branch: "master"
commit: "0efa552c5d"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo "
commit: "2f68596"
* nu stuff / undefined_syms org
2021-09-30 18:48:03 +09:00
Ethan Roseman
e04a2e8330
Set up IDO and match osFlash.c ( #424 )
...
* set up IDO, created osFlash, fix newlines in libultra headers
* osFlash OK
* Try to fix Jenkinsfile
2021-09-25 16:31:44 +09:00
Ethan Roseman
db578d9788
a5dd0 (model file) + filemenu decomp ( #420 )
...
* remove some warnings, improve build speed on master
* update Camera
* update_camera_zone_interp not matching but close :/
* cleanup
* configure fix
* cleanup, better gbi macros
* decomp and syms
* a couple more
* 2 more and stuff
* more naming
* 3
* syms
* mdl_get_child_count
* more stuff
* get_model_list_index_from_tree_index
* 5 more
* header org
* update_entity_shadow_position
* fog color funcs
* more color stuff
* display lists
* create_shadow_from_data
* 4 evt shtuffsh
* func_80117D00
* func_80111790
* some BSS
* entity_raycast_down
* MakeEntity and almost step_entity_commandList
* step_current_game_mode
* filemenu stuff
* lots more filemenu stuff
* cleanup
* formatting
* fixes
* 1 more
* more fixes
2021-09-22 20:17:46 +09:00
alex
d4219ed94c
fix [rainbow] in msg compiler ( #416 )
...
It's unused but I saw the typo
2021-09-08 19:36:06 +09:00
Ethan Roseman
3ed6f5b382
Don't uniq warnings and write initial build to file ( #407 )
...
* Don't uniq warnings and write initial build to file
* Don't build twice, turn ccache off by default
2021-08-30 01:48:23 +09:00
Muskellunge
c58b4098f5
decomped AC function ( #401 )
...
* rename func_80242178_7ECE88
* matched tiny function
* decomp AC func
* renamed some vars
* made requested changes
* named temp_s0
2021-08-27 01:44:37 -04:00
jdaster64
3627d909fc
Power Shock - Adding 4/5 matching funcs ( #389 )
...
* Tidal Wave update function
* Tidal Wave merge issues, re-delete ASM
* action_cmd_tidal_wave_update (#379 )
* Adding Power Shock 4/5 matching, NON_MATCHING update func
* Responses to comments
* disable ccache on Jenkins :(
* oops
* Fix type warnings for HUD scripts, add function declarations
* Fixing a couple more Power Shock warnings
* Change HudElements* to s32s in Power Shock code
Co-authored-by: Ethan Roseman <ethteck@gmail.com>
2021-08-26 03:08:35 +09:00
alex
d0be37641b
Fix a bunch of warnings ( #388 )
...
* git subrepo pull (merge) --force tools/splat
subrepo:
subdir: "tools/splat"
merged: "5d7a6c0813"
upstream:
origin: "https://github.com/ethteck/splat.git "
branch: "master"
commit: "5d7a6c0813"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo "
commit: "2f68596"
* configure: add --no-warn
* clean up hud_element.h
* fix some warnings
2021-08-25 21:34:03 +09:00
EllipticEllipsis
0e1100de7f
Remove jumpscare, couple of additions to CONTRIBUTING.md ( #386 )
...
* Remove jumpscare
Allow the faint of heart to build the repo
* Clarify make_expected and add -3 info
* Add info about mips_to_c and m2ctx.py
* Mention -h
* Remove unneded version stuff for make_expected
2021-08-25 01:08:42 -04:00
alex
f81658b0fa
never use ccache in permuter_settings.toml
2021-08-24 18:11:05 +01:00
alex
78a729a7a3
NPC animation cleanup ( #384 )
...
* remove BattleID and NpcAnimId typedefs
* change NPC_ANIM generation
* struct for StaticNpc.animations
* ~peach_make_disguise_npc
2021-08-25 01:42:29 +09:00
alex
d726b26287
Enforce warnings count in pull requests ( #380 )
...
* add warnings_count
Stolen from https://github.com/zeldaret/mm .
Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>
* emit only new warnings
* add jp warnings
* fix ccache (lmao)
* slug comments about warnings
* oops
* oops again
* oops again again
* adjust message
* truncate warnings list if there are more than 100
Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>
2021-08-24 22:30:35 +09:00
Ethan Roseman
f5a6d26ca8
Full GCC Compiler ( #378 )
...
* fx table work
* fx data
* blah
* render_effects_UI
* split out effects.c
* initial testing of full gcc compiler
* don't touch undefined syms/funcs auto
* git subrepo pull --force tools/splat
subrepo:
subdir: "tools/splat"
merged: "25b848a230"
upstream:
origin: "https://github.com/ethteck/splat.git "
branch: "master"
commit: "25b848a230"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo "
commit: "2f68596"
* 4 npc funcs
* nine sef commands
* test
* test2
* run undefined_syms through cpp, remove bss and dead syms files
* nuContQueryRead
* update compiler
* configure fixes
* Update compiler binaries with latest build
* permuter_settings
* xgcc -> gcc
* change permissions
* .
* fix permuter stuff
* gcc is the bane of my existence
* non-dumb mac cpp
* build .cpp files with g++
* ccache
* hide stdout/stderr from ccache check
* fix #374
* tar something and other
* ok!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
* lol
* fix linux install
* 👍
* 👍 👍
* Make cousin J happy
* always 👍
* git subrepo pull (merge) tools/splat
subrepo:
subdir: "tools/splat"
merged: "09a5715405"
upstream:
origin: "https://github.com/ethteck/splat.git "
branch: "master"
commit: "09a5715405"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo "
commit: "2f68596"
Co-authored-by: alex <16batesa@gmail.com>
2021-08-23 06:55:26 +09:00
alex
de800e9c9f
mass script to evt type rename ( #377 )
...
* add process_scripts.py
* mass evt rename
2021-08-23 06:50:10 +09:00
Ethan Roseman
2c0cb43181
Tidying ( #375 )
...
* don't touch undefined syms/funcs auto
* git subrepo pull --force tools/splat
subrepo:
subdir: "tools/splat"
merged: "25b848a230"
upstream:
origin: "https://github.com/ethteck/splat.git "
branch: "master"
commit: "25b848a230"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo "
commit: "2f68596"
* 4 npc funcs
* nine sef commands
* test
* test2
* run undefined_syms through cpp, remove bss and dead syms files
* nuContQueryRead
* Remove unnecessary flags
* oops
* oops2
2021-08-22 22:10:06 +09:00
alex
048b166d0c
configure: use relative paths & fix arm toolchain
2021-08-18 18:10:11 +01:00
alex
49bee8512b
hud_element.c ( #371 )
...
* generate permuter_settings.toml
* remove -Wshadow (#366 )
Co-authored-by: pixel-stuck <mathmcclintic@gmail.com>
2021-08-18 17:28:32 +01:00
Ethan Roseman
aaf44dceac
effect overlay refactor ( #369 )
...
* fx table work
* fx data
* blah
* render_effects_UI
* split out effects.c
* battle state menu functions
* render_frame
* clean
* clean
* 4 camera funcs
* state_step_end_battle & symbol names
* state_file_select done
* 111f0 done
* .
* the great effect migration
* PR comments
* main func renames
* proper symbols for the effects table! (mostly)
* effect entry table cleanup
* comments
* Remove old asm, fix fx table
* cleanup
* cleanup
2021-08-17 12:24:26 +01:00
Ethan Roseman
3c887e6ac3
curtains.c data work, assorted funcs, new file, etc and cleanup: misc decomp ( #360 )
...
* PlayEffect progress, two insane funcs
* PartnerActionStatus struct and some cleanup
* file split
* physics funcs
* data migration, some decomp
* curtains data, etc
* git subrepo pull (merge) --force tools/splat
subrepo:
subdir: "tools/splat"
merged: "b8bf80cd07"
upstream:
origin: "https://github.com/ethteck/splat.git "
branch: "master"
commit: "b8bf80cd07"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo "
commit: "2f68596"
* git subrepo pull tools/splat
subrepo:
subdir: "tools/splat"
merged: "265b837554"
upstream:
origin: "https://github.com/ethteck/splat.git "
branch: "master"
commit: "265b837554"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo "
commit: "2f68596"
* PR comments
2021-08-14 02:27:57 +09:00
alex
932876f423
use cpp-11 if installed on macOS
2021-08-09 16:59:05 +01:00
Ethan Roseman
5d69c3454f
effect shims and more battle matches ( #347 )
2021-07-31 15:32:19 +01:00
alex
e789b7542a
configure: allow specification of cflags on a per-file basis in splat.yaml ( #345 )
...
* fix #339
* add --debug and --non-matching configure flags
2021-07-28 20:47:05 +09:00
Ethan Roseman
24e32f8b48
Effect code generation ( #338 )
...
* Update symbol_addrs
* effects.h and cleanup
* effect code generation!
2021-07-21 23:46:58 +09:00
alex
cbb656f3c9
add remaining opcode support to script DSL ( #329 )
...
* update dsl caserange and bind syntax
* add bind_padlock
* use dsl buf and arr commands
* clean up foliage.inc.c
* disasm rest of battle/partner/goombario scripts
* fix rest of SI_CMD uses
2021-07-21 02:43:16 +09:00
Ethan Roseman
1beee32dc6
Message work ( #315 )
...
* msg wip
* var name restoration
* rodata padding
* New compiler that supports .bss section attribute!
* -fno-common & cleanup
* clean
* extern bss for now
* msg work
* git subrepo pull (merge) --force tools/splat
subrepo:
subdir: "tools/splat"
merged: "8588eaae7b"
upstream:
origin: "https://github.com/ethteck/splat.git "
branch: "master"
commit: "8588eaae7b"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo "
commit: "2f68596"
* msg_draw_prim_rect
* draw_message_window
* render_messages
* draw_string progress
* remove dumb file
* images, data
2021-07-17 03:27:27 +09:00
alex
fcf84633a7
Split jp map_data ( #313 )
...
* split jp mapfs
* fix us pm_map_data
* jp title_data
* oops
* avoid placing build files in assets/
* match load_hit_asset
* match load_stage_collision
* name gMapConfig and gMap
2021-07-16 20:08:22 +09:00
alex
7cf8bf0b88
Split charsets, matching load_font and load_font_data ( #312 )
...
Also use snake_case for splat_ext types
2021-07-16 10:28:37 +01:00
Ethan Roseman
7cb1790789
Fix alignment of many data sections ( #305 )
...
* generate c includes for img segments
* flatten battle/item/dusty_hammer.c
needs custom splat
* use .inc.c for c incbins
* fixy
* new stuff
* git subrepo pull (merge) --force tools/splat
subrepo:
subdir: "tools/splat"
merged: "6120d18600"
upstream:
origin: "https://github.com/ethteck/splat.git "
branch: "master"
commit: "6120d18600"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo "
commit: "2f68596"
* remove dumb
* git subrepo pull tools/splat
subrepo:
subdir: "tools/splat"
merged: "8a179e74ba"
upstream:
origin: "https://github.com/ethteck/splat.git "
branch: "master"
commit: "8a179e74ba"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo "
commit: "2f68596"
* yaml cleaning
* Further yaml cleanup & battle item refactor
* remove rawptr
* git subrepo pull tools/splat
subrepo:
subdir: "tools/splat"
merged: "fe30b60b75"
upstream:
origin: "https://github.com/ethteck/splat.git "
branch: "master"
commit: "fe30b60b75"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo "
commit: "2f68596"
* further cleanup
* Further cleanup & match gfx_draw_background
* clean & wip
Co-authored-by: Alex Bates <hi@imalex.xyz>
2021-07-12 18:15:00 +09:00
Ethan Roseman
647db26552
Mass function rename from Star Rod + a couple funcs ( #298 )
...
* .
* yaml update
* git subrepo pull --force tools/splat
subrepo:
subdir: "tools/splat"
merged: "cd690f725d"
upstream:
origin: "https://github.com/ethteck/splat.git "
branch: "master"
commit: "cd690f725d"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo "
commit: "2f68596"
* separate main bss syms
* renames and one match
* SR symbol rename
* fix symbol_addrs
* git subrepo pull tools/splat
subrepo:
subdir: "tools/splat"
merged: "5fa8aa24ca"
upstream:
origin: "https://github.com/ethteck/splat.git "
branch: "master"
commit: "5fa8aa24ca"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo "
commit: "2f68596"
* remove old artifacts
2021-06-30 11:27:12 +09:00
Ethan Roseman
8c690d23d1
Assorted Morsels ( #297 )
...
* bss
* 3 audios
* d5a50 stuff
* some icon funcs
* get_icon_render_pos
* PlayerLandJump
* func_80248170
* cleanup
* splat update prep
* git subrepo pull --force tools/splat
subrepo:
subdir: "tools/splat"
merged: "81c4b35b89"
upstream:
origin: "https://github.com/ethteck/splat.git "
branch: "master"
commit: "81c4b35b89"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo.git "
commit: "2f68596"
* git subrepo pull tools/splat
subrepo:
subdir: "tools/splat"
merged: "9b791a654a"
upstream:
origin: "https://github.com/ethteck/splat.git "
branch: "master"
commit: "9b791a654a"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo.git "
commit: "2f68596"
* git subrepo pull tools/splat
subrepo:
subdir: "tools/splat"
merged: "2cf2a5e5d8"
upstream:
origin: "https://github.com/ethteck/splat.git "
branch: "master"
commit: "2cf2a5e5d8"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo.git "
commit: "2f68596"
* fix loop in PaperMarioNpcSprites
* git subrepo pull tools/splat
subrepo:
subdir: "tools/splat"
merged: "2fab217750"
upstream:
origin: "https://github.com/ethteck/splat.git "
branch: "master"
commit: "2fab217750"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo "
commit: "2f68596"
* add sha1 to yaml
* git subrepo pull tools/splat
subrepo:
subdir: "tools/splat"
merged: "426b08200d"
upstream:
origin: "https://github.com/ethteck/splat.git "
branch: "master"
commit: "426b08200d"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo "
commit: "2f68596"
* varTable -> union :( + player_api funcs
* 6 more
* 4 more
* 5 mo
* 1 mo
* 1 mo 2
* 5 mo
* player_jump
* 3 mo
* some 18F340
* 6 more
* 6 mo
* nm
* 1
* 1 more
* some PR feedback
* symbol addr update
* UnsetCamera0Flag1000
* SetPlayerSpriteSet2
* action 18
* encounter + a smol hammer
* git subrepo pull (merge) tools/splat
subrepo:
subdir: "tools/splat"
merged: "8cf482fe57"
upstream:
origin: "https://github.com/ethteck/splat.git "
branch: "master"
commit: "4c0a93eaed"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo "
commit: "2f68596"
* 3 and cleanup
* undo yucky union
* PR comments
* get_enemy_safe
* cleanup
* move VirtualEntity
* attempt to fix doxygen
* 3, cleanup
* broken
* fixed!
* progress
* 2
* 3 and cleanup
* 6 map_api funcs
* 3 map api
* CreateNpc
* BringPartnerOut & NpcFlyTo
* npc_api complete
* update_scripts
* 4 si bois inc si_execute_next_command
* update symbol_addrs
* 2 more and cleanup
* camera struct & do_camera_type_0
* PR feedback
* small tidying
2021-06-21 13:30:57 +09:00
alex
39029a810e
split and pack title_data ( #293 )
2021-05-08 15:54:34 +09:00
Maide
0ec2010b9b
dro and flo ( #285 )
...
* dro_01
* UnkFunc25
* UnkFunc26
* UnkFunc27
* Fixup old UnkFuncs
* a
* UnkFunc28
* UnkFunc29
* UnkFunc30
* dro_02
* UnkFunc30
* UnkFunc31
* UnkFunc33
* UnkFunc34
* UnkFunc35
* UnkFunc36
* Fix splat.yaml and remove asm
* Fixed finally
* a
* flo_00
* update func
* flo_03
* flo_07
* flo_08
* UnkFunc37 & 38
* UnkFunc39
* UnkFunc40
* a
* Some copies
* Func
* flo_09
* Fix linker alignment warnings
* flo_10 (partial)
* flo_11
* flo_12
* flo_13
* UnkFunc41
* Copy funcs
* UnkFunc42
* flo_14
* UnkFunc43
* UnkFunc44
* flo_16
* UnkFunc44
* UnkFunc45
* flo_15
* flo_17
* flo_18
* flo_19
* flo_21
* flo_22
* flo_23
* flo_24
* flo_25
* cya asm
* a
* a
* Finally OK!
* Alter scripts
* Fix food func
* PR1
* PR2
* Add tree structs to disassembly and change names
* tabs to spaces and callback &
* Fix the script too
* PR3
* Fucking newlines
2021-04-30 02:09:30 +09:00
alex
d530ca24cd
Various script cleanup ( #284 )
...
* update star_rod_idx_to_c for battles
* name spiked_goomba and paragoomba animations
* name cleft animations
* finish battle struct disasm
* fix for kmr part 3
* name jr troopa animations
Co-authored by: T00nbink <martyntoby@gmail.com>
* ignore star rod crash.xml
* foliage.inc.c
* foliage data
* script: =f -> = (float)
* script: add (int) cast
2021-04-28 17:58:21 +09:00
Ethan Roseman
011a957985
Compiler's Worst Nightmare ( #278 )
...
* 25.00%
* remove __naked__ and name printContext->unk_4E8
* change rodata strings to []
* actually remove
* fix headers
* git subrepo pull --force tools/splat
subrepo:
subdir: "tools/splat"
merged: "eec8ac0cb8"
upstream:
origin: "https://github.com/ethteck/splat.git "
branch: "master"
commit: "eec8ac0cb8"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo "
commit: "2f68596"
* progress
* .
* .
* some stuff
* git subrepo pull --force tools/splat
subrepo:
subdir: "tools/splat"
merged: "4e012eaad6"
upstream:
origin: "https://github.com/ethteck/splat.git "
branch: "imgflip"
commit: "4e012eaad6"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo "
commit: "2f68596"
* :OK:
* 2 graphics funcs!
* woo
* more
* match func_802A15A0_733670 (#276 )
* .
* gfx_draw_frame, other fixes
* macros begone!
Co-authored-by: pixel-stuck <mathmcclintic@gmail.com>
2021-04-23 20:55:30 +09:00
Alex Bates
b786f3860b
remove temp print() in img/build.py
2021-04-22 09:26:16 +01:00
alex
9900e9a2b8
More image splits ( #272 )
...
* A number of new image splits
* Address comments.
* git subrepo pull --force --branch=imgflip tools/splat
subrepo:
subdir: "tools/splat"
merged: "9caaa45df9"
upstream:
origin: "https://github.com/ethteck/splat.git "
branch: "imgflip"
commit: "9caaa45df9"
git-subrepo:
version: "0.4.3"
origin: "???"
commit: "???"
* use flip_y over flip
* git subrepo pull --force --branch=imgflip tools/splat
subrepo:
subdir: "tools/splat"
merged: "ef663ec0d5"
upstream:
origin: "https://github.com/ethteck/splat.git "
branch: "imgflip"
commit: "ef663ec0d5"
git-subrepo:
version: "0.4.3"
origin: "???"
commit: "???"
* use flip_y
* git subrepo pull --force --branch=imgflip tools/splat
subrepo:
subdir: "tools/splat"
merged: "3144dc17f6"
upstream:
origin: "https://github.com/ethteck/splat.git "
branch: "imgflip"
commit: "3144dc17f6"
git-subrepo:
version: "0.4.3"
origin: "???"
commit: "???"
Co-authored-by: JoshDuMan <Joshua.Shoup.1996@gmail.com>
2021-04-22 01:01:00 +09:00
alex
a3e4140101
Sprite stuff ( #270 )
...
* root-level configure script
* fix configure on macos?
* fix macos again maybe
* fix messages, add asset stack
* generate map headers from xml maps
* fix sprite_dir asset
* git subrepo pull (merge) --force tools/splat
subrepo:
subdir: "tools/splat"
merged: "5e36c45558"
upstream:
origin: "https://github.com/ethteck/splat.git "
branch: "master"
commit: "5e36c45558"
git-subrepo:
version: "0.4.3"
origin: "???"
commit: "???"
* name sprite.c
* almost match func_802DD8F8
* match func_802DD8F8
* crusade against unsigned integers
* name some sprite data
* add pylibyaml to requirements.txt
2021-04-19 00:01:59 -04:00
alex
060486c85e
Configure updates for modding ( #262 )
...
* root-level configure script
* fix configure on macos?
* fix macos again maybe
* fix messages, add asset stack
* generate map headers from xml maps
* fix sprite_dir asset
* git subrepo pull (merge) --force tools/splat
subrepo:
subdir: "tools/splat"
merged: "5e36c45558"
upstream:
origin: "https://github.com/ethteck/splat.git "
branch: "master"
commit: "5e36c45558"
git-subrepo:
version: "0.4.3"
origin: "???"
commit: "???"
2021-04-18 22:26:00 +09:00
Ethan Roseman
3976b4d614
Fixing the mac build ( #263 )
2021-04-17 22:31:33 -04:00
alex
a557e4cd96
Fix configure on macOS ( #261 )
...
* root-level configure script
* fix configure on macos?
2021-04-17 20:53:34 +09:00
Ethan Roseman
3315d6010f
Splat refactor ( #257 )
...
* all non-world rodata migrated
* data disasm
* kinda working
* updated yaml
* bloop
* linker header
* configure 2.0
* bin
* mass rename to remove code_
* pause rename
* battle partner stuff
* whew
* more renames
* more renames
* more renaming
* it builds!
* updates
* remove main prefix
* one more thing
* crc, yay0
* .data, .rodata, .bss
* img
* dead_atan2
* it buildsgit add -A
* split battle/partner/6FAD10
* rm &s on sleepy_sheep syms
* sha1sum ninja rule description
* OK but commented out PaperMarioMapFS and PaperMarioNpcSprites
* uncomment
* fix mapfs
* match func_8003CFB4
* .
* clean up and name npc_iter_no_op
* npc.c
* enable cc warnings
* name npc_find_near
* use singular options.asset_path
* smores
* cc_dsl only when needed
* kinda fix configure for splat refactor2
* ok!
* new msg format
* remove old msg format docs
* slight bug fixes, splat adjustment
* git subrepo pull (merge) --force tools/splat
subrepo:
subdir: "tools/splat"
merged: "cfc140bb76"
upstream:
origin: "https://github.com/ethteck/splat.git "
branch: "master"
commit: "cfc140bb76"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo "
commit: "2f68596"
* git subrepo pull (merge) --force tools/splat
subrepo:
subdir: "tools/splat"
merged: "85349befcd"
upstream:
origin: "https://github.com/ethteck/splat.git "
branch: "master"
commit: "85349befcd"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo "
commit: "2f68596"
* Update symbol addrs
* git subrepo pull tools/splat
subrepo:
subdir: "tools/splat"
merged: "a44631e194"
upstream:
origin: "https://github.com/ethteck/splat.git "
branch: "master"
commit: "a44631e194"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo "
commit: "2f68596"
Co-authored-by: Alex Bates <hi@imalex.xyz>
2021-04-13 16:47:52 +09:00
