jdaster64
472b0059f2
Adding PartnerAfflictEnemy function ( #417 )
...
* 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
* Added PartnerAfflictEnemy
* Unnest flag checks, remove Jenkinsfile change
Co-authored-by: Ethan Roseman <ethteck@gmail.com>
2021-09-11 19:31:06 +09:00
ThreeMustyFears
b5eb88b9f3
Match super boots ( #415 )
...
* update common_structs.h
* match super boots
* run coverage.py
* missed a couple things
* Update functions.h
* removing a warning
* requested changes
Co-authored-by: ThreeMustyFears <>
2021-09-08 07:02:00 +09:00
Alexander Faßbender
ed8f1a9593
Rename string to msg ( #414 )
...
* change all occurences of to unless they are a chaar-array
* resolve pr review
2021-09-02 17:46:27 +02:00
Ethan Roseman
1b163a0c4a
Decomp some pause screen map functions ( #412 )
...
* decomp pause screen map functions
* pull upstream and merge
* change get_variable calls to evt_get_variable
* style fixes for map pause screen
* close match on pause_map_init and style in map pause functions
* small pause_map_cleanup change
* Matches (thanks Josh), structs, symbols, cleanup
* cleanup
* Symbol / struct refresh
* further cleanup
* data/rodata disasm, rodata migration, cleanup
* PR comments
* map message ids
Co-authored-by: Rain <rainmachus@gmail.com>
2021-09-02 20:17:40 +09:00
JaThePlayer
2a8b55c9e1
Battle Popup Decomp ( #411 )
...
* 17D6A0.c decomp
* cleanup
* fix func_8024F84C return type
* BattlePopups renamed to battlePopups
* Rename BattlePopup to PopupMessage and move it to common_structs.h
* Remove unnecessary extern
* Move local declarations inside for loops
2021-09-02 07:37:46 +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
Alexander Faßbender
afab424519
Rename all si_funcs to evt_funcs ( #403 )
...
* resolve #397
* fix libultra
* Match func_80144E4C (#406 )
* Update hud_element.c
* Update hud_element.h
* Update hud_element.h
* Delete func_80144E4C.s
* 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
* combine PR #398 with #403
* More entity decomp (#402 )
* More entity decomp
* cleanup
* Vec3f instead of 3 floats in structE307C0
* resolve #397
* fix libultra
* combine PR #398 with #403
* decompile evt_goto_end_loop
Co-authored-by: JoshDuMan <40190173+JoshDuMan@users.noreply.github.com>
Co-authored-by: Ethan Roseman <ethteck@gmail.com>
Co-authored-by: JaThePlayer <50085307+JaThePlayer@users.noreply.github.com>
2021-08-29 23:34:42 +09:00
JaThePlayer
4554a46d39
More entity decomp ( #402 )
...
* More entity decomp
* cleanup
* Vec3f instead of 3 floats in structE307C0
2021-08-29 23:09:41 +09: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
JoshDuMan
09459d19b4
Match func_80144E4C ( #406 )
...
* Update hud_element.c
* Update hud_element.h
* Update hud_element.h
* Delete func_80144E4C.s
2021-08-29 21:12:13 +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
ThreeMustyFears
cdbf170061
Match action_cmd/hit_lava ( #399 )
2021-08-26 22:52:45 +01: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
Muskellunge
9103d9b35a
decompiled func_80242178_7ECE88 ( #387 )
...
* decompiled func_80242178_7ECE88
* Delete Paper Mario (U) [!].z64:Zone.Identifier
* update pr
2021-08-25 19:05:22 +09:00
jdaster64
29ea27859d
action_cmd_tidal_wave_update ( #379 )
2021-08-23 22:54:56 +01:00
ThreeMustyFears
2a571dc6fa
Match sneaky parasol ( #376 )
...
* match sneaky parasol
* coverage.py
* tidying
* more tidying
* missed pointer
* change to --
2021-08-22 23:10:21 +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
Andrew
eb8eb93f89
decomp functions from various files ( #373 )
...
* Match func_8024FAE8
* Match func_80260A20
* Match functions in 190B20.c
2021-08-22 01:22:06 +01:00
ThreeMustyFears
ca1adbcb60
Match ultra boots ( #372 )
...
* match ultra boots
* update PlayerStatus struct
* add func
* update func prototype
* missed something
* coverage.py
* unnessary return
* requested changes
I changed gSpinHistoryPosY, and gSpinHistoryPosAngle to arrays based off of the declarations in 7E9D0.c
Co-authored-by: ThreeMustyFears <>
2021-08-20 19:31:00 +09: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
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
ThreeMustyFears
25dcbe4b92
Match some funcs in world/action/walk ( #362 )
...
* match some walk funcs
* fix D_800F7B40 type
* update functions.h
* update splat.yaml
* remove walk.data.s
* run coverage.py
* remove line at top
* changed brace
* requested changes
Co-authored-by: ThreeMustyFears <>
2021-08-15 18:28:16 +09: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
JaThePlayer
18a2781cf1
add ActionCommandStatus, random decomp ( #358 )
2021-08-06 12:00:15 +01:00
Rainchus
18f0888e91
decomp functions in d5a50 and fix type for widthScale and heightScale ( #357 )
2021-08-05 09:16:57 +01:00
ThreeMustyFears
f23045e775
Match world/action/jump funcs ( #352 )
...
* Match all funcs
* Update common_structs.h
func_802B6000_E24040 was attempting to assign an f32 to a char[], so I updated these
* Added a couple of flags
* Some requested changes
I couldn't figure out how to get Kelebek1's suggestions for the suggest_player_anim_clearUnkFlag to work, but I managed to do it for sfx_play_sound_at_player
* Update enums.h
Removed unnecessary flag that I previously added
* Update functions.h
* Update 7bb60_len_41b0.c
There were some conflicting declarations so I changed them
* Delete ver/us/asm/nonmatchings/world/action/jump directory
* Update jump.c
2021-08-04 18:20:16 +09: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
Alexander Faßbender
11a6166cd8
Decompile miscellaneous dead funcs and find_duplicates.py ( #349 )
...
* 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
* :)
* .
* .
Co-authored-by: Ethan Roseman <ethteck@gmail.com>
2021-08-02 23:04:11 +09:00
Ethan Roseman
8feea763c4
NPC AI funcs ( #351 )
...
* UnkNpcAIFunc26
* UnkNpcAIFunc27
* UnkNpcAIFunc28/29
* update symbol addrs
2021-08-01 21:06:57 +09: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
Ethan Roseman
5d69c3454f
effect shims and more battle matches ( #347 )
2021-07-31 15:32:19 +01:00
ThreeMustyFears
a1228bfad9
Match func_800397E8 ( #342 )
...
* Match func_800397E8
* Fix function prototype
* Delete func_800397E8.s
* add spaces
* Style changes
* Add flags in enum.h
* Added flags
2021-07-25 04:07:08 +09:00
Ethan Roseman
ed9727a34e
Various decomp, use of SCREEN_WIDTH and SCREEN_HEIGHT, etc ( #340 )
...
* Update symbol_addrs
* effects.h and cleanup
* effect code generation!
* func_80024A784
* state_step_demo
* meh
* work on gfx_task_main and cleanup
* state_step_intro
* set_custom_gfx
2021-07-23 03:48:30 +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
Nalfein (Kenny)
22fa63e393
Decomp btl_are_all_enemies_defeated ( #337 )
...
* Initial decomp
* Rearrange variable definitions and if-statements
* Getting closer to matching
* Only address matching left
* Rename variables for clarity
* Search and replace was too eager...
* Rewrite as a for-loop. Matches!
* Removed and renamed variables
* Rearrange statements for neatness. Remove unneccessary comments
* Ran coverage
* Change the typing to Actor*
* Rename variables, don't be so literal with return values, and compare pointer to NULL, you dunce
* Move variable definitions around
2021-07-21 23:37:24 +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
Ethan Roseman
53b5004d6e
New images + more ( #332 )
...
* no foliage warnings
* new images
* 4 funcs in 16F740
* update symbol addrs
* no more UnkStarFuncs.inc.c
* clean
2021-07-21 20:43:13 +09: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
Nalfein (Kenny)
32de1484d3
Decomp btl_check_enemies_defeated function ( #327 )
...
* Decompile btl_check_enemies_defeated function
* Run coverage.py
* Address style for pull request
2021-07-21 15:46:15 +09:00
Codey
45654bd1a2
func_80052E18 ( #331 )
2021-07-21 07:37:00 +01:00
Nalfein (Kenny)
9e9bb3a049
Decompile btl_check_player_defeated function ( #326 )
...
* Decompile btl_check_player_defeated
* Ran coverage.py
* Replaced pointer arithmetic with undefined symbol
* Actually did the math to use the correct undefined symbol
* Address style for pull request
2021-07-20 22:58:08 -04:00
Ethan Roseman
ed2665a934
Various funcs in 77480, 1A5830, 1776B0 ( #328 )
...
* 2 funcs in 77480
* SetPartSize
* 2 funcs in 1A5830
* 34 funcs in 1776B0
2021-07-20 11:51:11 +01:00
Rainchus
186ceb8eb0
decomp hud functions ( #324 )
...
* decomp dead functions
* decomp battle functions in 1A5830.c
* delete matched functions .s files
* fix variable names
* decomp hud elements
* merge master, delete asm files
* fix style
* Update src/d5a50_len_5fd0.c
Co-authored-by: alex <hi@imalex.xyz>
Co-authored-by: Ethan Roseman <ethteck@gmail.com>
Co-authored-by: alex <hi@imalex.xyz>
2021-07-20 15:27:49 +09:00
Alexander Faßbender
3763936d82
match star spirits ( #325 )
2021-07-19 19:27:56 +01:00
