Rainchus
095680b006
Duplighost battle functions ( #556 )
...
* decomp some functions in 1AC760.c
* broken data migration
* data nearly migrated, rodata in laki file is null
* fix building and laki data migration
* data migration for kpa3 WIP
* add missing data
* decomp duplighost functions and duplicates
* fix some warnings
* resolve issues
* fix warnings
Co-authored-by: Brotenko <brotenko@gmail.com>
2021-12-25 10:34:55 +09:00
Alexander Faßbender
bb5c96a417
Use designated inits for data tables and AC 0A data migration ( #538 )
...
* data tables and minor data migration
* remove redundant comments
2021-11-23 16:26:32 +01:00
Lightning
1c64f15db1
Make a 224 functions show up in the elf ( #530 )
...
* Make a 224 functions show up in the elf
* fix up appendGfx_model (as an example)
* Changed all L labels to .L for local jump tables. Did not change global jump tables found in /data/ as .L is for local only
* Decompile even more misc battle map funcs (#531 )
* decompile misc battle map funcs
* fix warnings
* Decompile misc battle map funcs (#528 )
* .
* .
* resolve issues
* Update fx_api.c
* Update fx_api.c
* Make a 224 functions show up in the elf
* fix up appendGfx_model (as an example)
* Changed all L labels to .L for local jump tables. Did not change global jump tables found in /data/ as .L is for local only
* Fix merge issue
Co-authored-by: Ethan Roseman <ethteck@gmail.com>
Co-authored-by: Alexander Faßbender <31699028+Brotenko@users.noreply.github.com>
2021-11-16 16:19:38 +09:00
Alexander Faßbender
e9f80f2856
Decompile misc battle map funcs ( #528 )
...
* .
* .
* resolve issues
* Update fx_api.c
* Update fx_api.c
2021-11-14 21:23:07 +01:00
Alexander Faßbender
75e2c18977
Decompile even more misc battle map funcs ( #531 )
...
* decompile misc battle map funcs
* fix warnings
2021-11-14 21:16:52 +01:00
Alexander Faßbender
fbc901ac49
decompile several map and battle-map related functions ( #504 )
...
* decompile several map and battle-map related functions
* remove unnecessary folder
* resolve issue
* .
* .
* Update 52B6A0.c
* Update 6DBDA0.c
2021-10-29 20:14:51 +02:00
Alexander Faßbender
1f57f7ed09
Decompile several battle map functions ( #500 )
...
* add information about dead maps
* link the names of dead maps to their alive counterparts
* decompile several battle maps related functions
* add information about dead maps
* link the names of dead maps to their alive counterparts
* decompile several battle maps related functions
* .
* resolve issues
* .
* rename of chainchomp related structs and functions
2021-10-28 16:51:46 +02:00
eperdew
bf65da2020
Decompile small action command functions ( #468 )
...
* Decompile small functions in air_lift.c
* Decompile small functions of 07.c
* Decompile small functions in 0A.c and air_raid.c
* Decompile func_802A96B8_423AA8
* Match func_802A91B0_4235A0 and fix warnings in break_free.c
* Match small functions in dizzy_shell.c
* Match small functions in fire_shell.c
* Match easy functions in hurricane.c
* Match easy functions in spiny_surge.c
* Fix 2 --> DONE2 and leftover redundant assignments.
2021-10-10 21:46:02 -04:00
eperdew
789049ee36
Decompile action_cmd/bomb.c ( #467 )
...
* Decompile the easy functions of bomb.c
* Deduplicate action command function in bomb.c
* Fully decompile bomb.c
* Remove matched func_802A928C_427CFC.s
* Clean up bomb.c before making a PR.
* Address @nanaian's feedback.
* Convert nonsense function pointer symbol reference to proper BSS var.
2021-10-10 07:30:38 +09:00
eperdew
93a4f819ac
Match smack.c ( #464 )
...
* Get full match on smack.c
* Clean up smack.c and remove the unnecessary 42ED70.data.s
* Update smack.c to use barFillLevel instead of unk_44.
2021-10-08 02:56:18 +01:00
eperdew
5a85b3115d
Decompile mega_shock.c ( #457 )
...
* parent d2721ed191
2021-10-03 21:20:11 -04:00
eperdew
61467570c8
Decompile func_80218808_5B1CB8, area_arn/4550D0.c, and area_dig/6DE1F0.c. ( #446 )
...
* Decompile area_arn/4550D0.c and area_dig/6DE1F0.c.
* Remove covered assembly files for battle/area_arn and battle/area_dig.
* Decompile func_80218808_5B1CB8.
* Address @ethteck's feedback on PR#446, sans the switch on actorType.
* Deduplicate UnkFunc52, and add a switch-based matching decomp.
* Turn ACTOR_TYPE_XXX defines into an ActorType macro.
* Remove erroneously added src/world/common/spiked_goomba.c.
2021-09-28 16:28:01 +09:00
JoshDuMan
a8571ab3e7
Match func_802A9634_42A354 ( #441 )
...
* Match func_802A9634_42A354
* Delete func_802A9634_42A354.s
* Update functions.h
* Update squirt.c
2021-09-26 17:00:26 -04:00
JoshDuMan
36fe0a9232
Match func_802A10E4_743ED4. ( #435 )
...
* Match func_802A10E4_743ED4
* Delete func_802A10E4_743ED4.s
* Formatting
2021-09-26 15:55:57 +09:00
Alexander Faßbender
bcc20df00b
Replace get_variable with evt_get_variable in .s files ( #410 )
...
* rename every function that is part of evt_funcs.h to have the evtt_ prefix.
* remove old .s files
* fix symbol_addrs error
* add evt_ 'prefix' to the dead functions in dead-h
* fix issue with .s files missing the evt_ prefix
2021-08-29 20:05:08 +02:00
Alexander Faßbender
b198250cde
Rename every function that is a part of evt_funcs.h to have the evt_ prefix ( #408 )
...
* rename every function that is part of evt_funcs.h to have the evtt_ prefix.
* remove old .s files
* fix symbol_addrs error
* add evt_ 'prefix' to the dead functions in dead-h
2021-08-29 18:51:56 +02:00
Ethan Roseman
a865cbdf17
Trigger funcs ( #405 )
...
* remove old tools, fix warnings
* almost match si_handle_print_debug_var
* si_goto_end_loop and warnings
* is_trigger_bound and create_trigger
* Cleanup + matching 2 non-matchings
* update_triggers (trigger.c complete)
* fix warnings
* PR comments, m2ctx.py fix
2021-08-29 22:44:17 +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
JaThePlayer
0bdf15542e
Chest & Heart Block entities ( #393 )
2021-08-25 22:29:43 +01: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
jdaster64
29ea27859d
action_cmd_tidal_wave_update ( #379 )
2021-08-23 22:54:56 +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
JaThePlayer
af6416de0e
Major Action Command Decomp ( #365 )
...
* Decomp jump and most of tidal wave action commands
* More action commands
* stop_leech.c fully decomped.
* flee.c decomped
* cleanup and function name convention fixes
* slight cleanup
* Move ActionCommand enum to enums.h, style changes
* Changed some numbers to decimal
* That one missing newline
Co-authored-by: Ethan Roseman <ethteck@gmail.com>
2021-08-17 03:31:45 +09:00
Ethan Roseman
c7a7567d68
FX data/funcs, camera funcs, state funcs ( #364 )
...
* 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
* .
* PR comments
2021-08-17 03:14:58 +09:00
JaThePlayer
18a2781cf1
add ActionCommandStatus, random decomp ( #358 )
2021-08-06 12:00:15 +01:00
Alexander Faßbender
7a6368c960
Decompilation of duplicated functions ( #354 )
...
* match last bow fumction
* decomp more partner functions
* :)
* :)
* resolve merge conflict and style conflicts
* fix
* decomp :)
* :(
* :(((
* :)
* :(
* :)
* :)))))
* :(
* :/
* idk
* :/
* What
* Done.
* PR comments
* :(
* decompile dead funcs
* find_duplicates.py +x
* rename dead functions and resolve PR
* :)
* .
* .
* decompile duplicate functions
* :(
* decompile several dupliacte funcions
* decompile several dupliacte funcions
* .
* --
* resolve coverage issue
* rename include-file to specify original use-case
Co-authored-by: Ethan Roseman <ethteck@gmail.com>
2021-08-04 18:12:31 +09:00
Alexander Faßbender
0fb0b32d0c
Decompile several dead and duplicated functions ( #353 )
2021-08-02 19:03:51 +01:00
alex
b48eb150d2
battle/action_cmd ( #348 )
...
* compile
* improve match
* improve
* ~check_block_input
* match LoadActionCommand
* cleanup
* match SetupMashMeter
* check_block_input much closer
* name action_cmd segments
* make better for great good
* improve again
* revert removing blah
* close
* improve
* match func_80268224
* match func_80268284 wrappers
* improvements
* work on func_80268938
* maide changes to check_block_input
* check_block_input :OK: - thanks Maide!
Co-authored-by: Ethan Roseman <ethteck@gmail.com>
2021-08-01 01:50:10 +09:00
Alto1772
d23a6cabdf
fix some asm paths in battle/item/ ( #336 )
...
* moved asm src path in battle/item as the correct way
* INCLUDE_ASM no indent lol
2021-07-21 14:19:11 +01:00
Alexander Faßbender
83be3c1ea8
Miscellaneous battle/area functions ( #330 )
...
* match last bow fumction
* decomp more partner functions
* :)
* :)
* resolve merge conflict and style conflicts
* fix
* decomp :)
* :(
* :(((
* :)
* :(
* :)
* :)))))
* :(
* :/
* idk
* :/
* What
* Done.
* PR comments
Co-authored-by: Ethan Roseman <ethteck@gmail.com>
2021-07-21 20:22:42 +09:00
Alexander Faßbender
3763936d82
match star spirits ( #325 )
2021-07-19 19:27:56 +01:00
Ethan Roseman
ab96e98acf
Miscellaneoush Decomp 323 ( #323 )
...
* more images
* new data file
* 2 undefined syms
* func_80048E34
* Shorten BattleStatus
* git subrepo pull (merge) --force tools/splat
subrepo:
subdir: "tools/splat"
merged: "2fbdbb9df8"
upstream:
origin: "https://github.com/ethteck/splat.git "
branch: "master"
commit: "2fbdbb9df8"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo "
commit: "2f68596"
* chop away 0x460-onward in BattleState
* battle.c complete!
* .
2021-07-19 20:49:30 +09:00
Alexander Faßbender
2a4966887c
match battle partner/move functions ( #319 )
2021-07-18 16:21:37 +01:00
Ethan Roseman
a876384c97
fix power bounce and unknown move code/data splits ( #320 )
2021-07-18 00:21:02 +09:00
alex
8dc3d81a84
Fix battle/partner/lakilester split ( #317 )
...
* near-match func_800279B4
* fix lakilester split
* match func_8023A1B0_70DEC0
2021-07-18 00:06:16 +09:00
alex
31b0c3f685
Merge 4DF30 into battle/battle ( #309 )
...
* merge 4DF30 into battle/battle
* nomatching load_battle
* oops
2021-07-13 21:33:29 +09:00
alex
da6fd773bb
Disassemble battle/partner/goombario.c ( #308 )
...
* name battle/partner/ segments
* name battle_goombario sprites
* battle/partner/goombario data
* update
2021-07-12 22:00:45 +09: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
ad80f13149
Battle Area + Effect Data ( #289 )
...
* part 2 dun
* DivActorLevel4
* Dist3D
* SetBackgroundAlpha & FreeIcon
* update symbol_addrs
* UnkBackgroundFunc3
* anudder
* UnkFogFunc2
* Disasm most remaining data
* model stuff and renames
* update symbol_addrs
2021-05-02 04:03:42 +09:00
Ethan Roseman
b2cc576bda
Shops and Battle Areas ( #287 )
...
* fix BSS bs
* more shop stuff
* gamestatus stuff
* name and some nonmatchings
* cleanup
* clean
* battle area data
* DeadUnkFloatFuncAbs
* symz
* removing stuff
* Battle Area Deduplication
* UnkFogFunc
2021-04-30 02:38:02 +09:00
Ethan Roseman
1c0d26e6c6
Tidying and Shops ( #282 )
...
* render_curtains
* cleanup
* more cleanup
* cleanup
* update symbol addrs
* asm update
* shop progress
* more cleanup
* update symbol_addrs
* asm cleanup
* .
* new data splits
* rename stuff
* .
* .
* PR stuff
2021-04-27 02:47:38 +09:00
Alto1772
df646f1d30
correct some paths ( #279 )
...
* rename files to correct src paths
* remove npc/func_8003E338.s
2021-04-25 00:38:15 +09:00
alex
df3ef58ba1
Crystal Palace reflection include & name some segments ( #274 )
...
* src/evt section
* evt data
* entity
* update entity func names
* names
* reflection wip
* lol
* ~pra_01
* nabbed em
* match func_80240500_D4D540
* match func_802402F0_D4D330
* last pra include func git add -A
* gCurrentCamID
* reflection.inc.c for pra_01
* reflection.inc.c
* rm
* match a few in tst_11
* use npc flags
Co-authored-by: Ethan Roseman <ethteck@gmail.com>
2021-04-21 23:19:31 -04:00
Ethan Roseman
8422d41f35
sorry bombette ( #258 )
2021-04-13 18:15:46 +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
Ethan Roseman
4ace4bb0d9
415D90 and Audio ( #229 )
...
* 415D90 decomp
* code_415D90 rodata migration
* data migration, decomp
* .
* .
* .
* 4 funcs
* non-matching
* audio part 1
* audio work
* end of snd
* update_symbol_addrs
* .
* 🐔
* .
* sfx func names
* bgm
* more audio
* .
* a few audio funcs
2021-03-26 10:46:45 -04:00
Maide
bc383f3485
Fix some functions ( #226 )
...
* Bed time
* Fixes 2
2021-03-25 17:56:12 +09:00
Maide
f03f08a38f
Battle items ( #222 )
...
* a
* Dizzy Dial
* Dried shroom
* Dusty Hammer
* Egg Missile
* Electro Pop
* Fire Flower
* Food
* Fright Jar
* Hustle Drink
* Insecticide Herb
* Life Shroom
* Mushroom
* Mystery (partial)
* Pebble
* Please Come Back
* POW Block
* Repel Gel
* Shooting Star
* Sleepy Sheep
* Snowman Doll
* Stone Cap
* Stop Watch
* Strange Cake
* Strange Cake fixed
* Stone Cap broked
* git subrepo pull --force tools/splat
subrepo:
subdir: "tools/splat"
merged: "db0b6f0cba"
upstream:
origin: "https://github.com/ethteck/splat.git "
branch: "master"
commit: "db0b6f0cba"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo "
commit: "2f68596"
* Static all the things
* Tasty Tonic
* Thunder Bolt
* Thunder Rage
* Ultra Shroom
* Unknown Item
* Volt Shroom
Format & coverage
* Item Ids
Co-authored-by: Lavos1 <saintlouisxx@gmail.com>
2021-03-24 04:39:43 -04:00
