JoshDuMan
ae1e2a740d
Match BoostAttack ( #477 )
2021-10-17 20:34:18 +01:00
JoshDuMan
2010d0b320
Match PlayEffect ( #478 )
...
* Match PlayEffect
* Delete PlayEffect.s
* Remove comments
* Fix warnings
* Update fx_api.c
2021-10-18 00:13:11 +09:00
JoshDuMan
85ba892809
Match WaitForState, SetBattleVar, and func_8026E260 ( #473 )
...
* Match WaitForState
* Delete WaitForState.s
* Update unk_95 field.
* Match func_8026E260
* Delete func_8026E260.s
* Match SetBattleVar
* Delete SetBattleVar.s
2021-10-16 18:59:17 +09:00
Gota7
072a585908
Match some spring, sprite, and pause code ( #472 )
...
* Start Spring Work
Progress.
* More WIP
* Still WIP
Spring isn't ready for this yet.
* Decompile some sprite functions
Making progress.
* Partner stuff
More progress.
* PR fixes
* PR fixes
For commenting.
2021-10-16 18:53:28 +09:00
Rainchus
d84eda49dd
Decomp some functions from watt overworld file ( #462 )
...
* decomp watt overworld functions
* fix struct that was wrongly changed
* run coverage.py
* requested changes for watt.c and decomp a function from sbk_02
* run coverage.py
* more style changes
* decomp all functions in 92A2B0.c
* run coverage.py
* use map_var instead of hex constant, other style changes
* cleanup
Co-authored-by: Ethan Roseman <ethteck@gmail.com>
2021-10-11 15:42:26 +09:00
JoshDuMan
99da60cace
Match func_802D2520 ( #465 )
2021-10-07 09:37:11 +01:00
JoshDuMan
ef1928e55d
Match virtual_entity_list_render_UI ( #463 )
...
* Update player_api.c
* Delete virtual_entity_list_render_UI.s
* Fix some warnings
* Fix warnings.
* Match virtual_entity_list_render_world
* Remove asm and fix warnings.
* Delete virtual_entity_list_render_world.s
* Add draw_entity_model_A
2021-10-06 15:22:42 +09:00
eperdew
5a85b3115d
Decompile mega_shock.c ( #457 )
...
* parent d2721ed191
author eperdew <eperdew17@gmail.com> 1632807291 -0700
committer eperdew <eperdew17@gmail.com> 1633221439 -0700
Decompile mega_shock.c.
* Move common stuff to top of variable declaration blocks.
* Address @ethteck's review comments on func_802A92A0_42DCB0.
Also remove an unnecessary shift during a comparison.
2021-10-03 21:20:11 -04:00
Ethan Roseman
969e28c76c
40% ( #459 )
...
* cleanup
* some of effect_9
* remove 1 warning
* restore Bowser Slug to his former glory (behavior)
2021-10-03 18:42:38 +01:00
Ethan Roseman
59050ec3e9
Effects & misc ( #458 )
...
* 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
* Actor struct refactor to match AddActorVar (thanks Josh)
* various cleanup, matched an obfuscation func
* fx_7 work
* is_block_on_ground
* state_*
* create_entity_shadow, update asm macro to fix diff.py
* set_standard_shadow_scale
* set_npc_shadow_scale and set_peach_shadow_scale
* create_shadow_type
* revert macro.inc
* clear_model_data (thanks Josh)
* cleanup
* mdl_get_next_texture_address
* mdl_set_all_fog_mode
* load_model_textures
* fx_7_appendGfx (effect_7 done)
* fx_8_main
* fx_8_render
* fx_8_update
* func_E0010000
* func_E0010104
* effect_8 done
* effect_8 done
* warnings
* cleanup
* try to fix some warnings
* warnings + change Bowser Slug behavior
2021-10-04 00:44:16 +09:00
Dalrik
c3bf1ad8fa
Match pause_stats_init and pause_stats_handle_input ( #456 )
2021-10-03 00:49:22 +01:00
JoshDuMan
d2721ed191
Match LoadBattleDmaData ( #455 )
...
* Match LoadBattleDmaData
* Delete LoadBattleDmaData.s
* Add DmaTable
* Update battle.h
* Fix build
* Fix Fix
* Fix Fix's Fix
2021-10-02 20:02:18 +09:00
Dalrik
387414b395
Decomp misc functions in 196AA0 ( #452 )
...
* Decomp misc functions in 196AA0
* Review changes on 196AA0
* Fix naming of Get/SetCommandAutoSuccess
2021-10-02 09:40:53 +09:00
JoshDuMan
46d4b4483b
Match EndActorSpeech ( #454 )
...
* Match EndActorSpeech
* Delete EndActorSpeech.s
* Address PR comments
* Add missing declarations.
* Fix bad function call?
* Create 181810.c
2021-10-01 21:54:52 +09:00
Dalrik
c3c790527d
Decomp pause_sort_item_list and pause_draw_rect ( #453 )
...
* WIP pause_sort_item_list
* Decomp pause_draw_rect and pause_sort_item_list
The match on pause_sort_item_list is very sketchy, there's probably a much simpler way to write the function that I can't find
* Review for 135EE0
2021-10-01 20:14:54 +09:00
JoshDuMan
39dd275427
Match update_effects ( #450 )
...
* Match update_effects
* Delete update_effects.s
* Remove unneeded variable.
* Fix errors.
* Fix general_heap_free typing.
Co-authored-by: Ethan Roseman <ethteck@gmail.com>
2021-09-30 18:57:23 +09:00
fig02
5779f5de0e
crash_screen OK ( #449 )
...
* crash screen done
* cleanup
* done i think
* crash -> crash_screen
* fix warnings
* size comment
* review
2021-09-30 08:01:31 +09:00
Ian
cedfcbbb89
Decomp most of the pause badge menu ( #447 )
...
* Define gMoveTable
* pause_get_total_equipped_bp_cost
* pause_badges_draw_bp_orbs
* pause_badges_cleanup
* pause_badges_init
* pause_badges_try_remove
* pause_badges_handle_input
* pause_badges_try_equip
* WIP on pause_badges_load_badges, almost perfect match
* Full match on pause_badges_load_badges
* Review changes for pause badges
* A few more pause badge review changes, missing some spaces around add/subtract operators
* More small pause badges fixes
* Pause badges review: remove enum typedefs, add names for ranges in ItemID
2021-09-28 16:47:55 +09: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
JaThePlayer
8e9a2f92b0
Decomp a lot of DF950.c ( #440 )
...
* Decomp a lot of DF950.c
* Rename Sound to SoundInstance
* Rename struct_8014F5A4 to AlternatingSoundSet, and rename the fields.
* Make sure the soundID parameters are typed as SoundID, style changes
* Remove unnecesary empty line
2021-09-27 22:32:18 +09:00
ThreeMustyFears
c90afde1d8
Match some bow funcs, a laki, and a chest func ( #443 )
2021-09-27 02:00:51 +01:00
Ethan Roseman
555f0ea15b
Effects ( #442 )
...
* effect shim names
* fx_1_main and data migration
* fx_1_renderWorld
* header reorg
* remove stale comment
* effect_1
* cleanup
* fx_6 stuff
* most of effect_6, misc changes
* cleanup
* PR stuff
* warningz
2021-09-27 08:19:58 +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
Alexander Faßbender
205103bf2e
Decompile dead functions ( #432 )
...
* decompile several dead functions
* .
* resolve issues and deduplicate StarSpiritEffect structs
* .
* resolve the requested change
2021-09-26 16:52:25 -04:00
eperdew
560f5a873e
Decompile E225B0.c. ( #434 )
...
* Decompile E225B0.c.
* Decompile EB5130.c.
* Fix an off-by-one error that did not affect codegen.
The struct declared in EB5130.c was missing a byte in a char array
for no good reason.
* Address ethteck's feedback for PR#434.
- Move struct8015A578 to common_structs.h.
- Add new unknown sound SOUND_UNKNOWN_17B.
- Address various nits.
* Update PR based on @nanaian's feedback.
- Change first argument of mem_clear to be a void* (matching bzero).
2021-09-26 21:04:12 +09:00
JaThePlayer
bb6e9303dc
Decomp some Evt, fio, ItemEntity & other functions ( #433 )
...
* Decomp some evt, fio and item entity functions
* run coverage.py
* Remove redundant comment
* Make ItemEntity.type s8, MAX_ITEM_ENTITIES, style changes
2021-09-26 07:13:36 +09:00
JaThePlayer
8e48172c1e
Decompile PopupMenu functions + more ( #430 )
...
* cleanup create_popup_menu
* fix some warnings
* decomp parts of 18C790.c
* rename PopupMessage.unk_04 to updateFunc
2021-09-25 13:14:28 +01: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
eldexterr
cb1bc0c312
BattleStatus (0x436) added (from common_structs.h) ( #427 )
...
* Update common_structs.h
This ones are actually flags used by Power Rush and Mega Rush, I dunno if they're used for something else tho.
But if you enter in Danger State (2-5HP) and you have equipped Power Rush dangerFlags will be 0x02 not 0x01.
* BattleStatus(0x172-0x177)
Added missing notes from BattleStatus(0x172) & (0x174)
* Update common_structs.h
0x174 declaration is fixed, and now uses currentTurnEnemy instead of currentTurnActor
* BattleStatus (0x436) added (common_structs.h)
This is defined every time an actor is created with ~Func:create_actor (802653A4, 193C84), at ~Func:create_actor(0x908)
It retrieves the ID two lines before by using function 80047608 and will get the next available index.
* hudElementDataIndex fixed, and I renamed some status functions
HudElementDataIndex now uses the proper name and it has the name change on all files.
Also I changed the names for the following functions to:
remove_status_1 > remove_status_debuff
remove_status_2 > remove_status_static
remove_status_3 > remove_status_transparent
remove_status_4 seems to still be a mystery, maybe is for a unused status?
2021-09-25 08:15:45 +09:00
Alexander Faßbender
9a50c4cbe1
Decompile dead functions ( #429 )
...
* decompile several duplicated dead funcs
* decompile several dead functions
* decompile dead functions
* resolve issue with UnkNpcAIFunc31
2021-09-25 08:06:34 +09:00
Alexander Faßbender
c66590758e
Decompile dead functions ( #426 )
...
* decompile several dead functions and add more dead counterparts to existing functions to dead.h
* .
* Update EF2680.c
2021-09-23 10:55:12 +02:00
eldexterr
f0da0b568e
Added some missing notes to common_structs.h ( #423 )
...
* Update common_structs.h
This ones are actually flags used by Power Rush and Mega Rush, I dunno if they're used for something else tho.
But if you enter in Danger State (2-5HP) and you have equipped Power Rush dangerFlags will be 0x02 not 0x01.
* BattleStatus(0x172-0x177)
Added missing notes from BattleStatus(0x172) & (0x174)
* Update common_structs.h
0x174 declaration is fixed, and now uses currentTurnEnemy instead of currentTurnActor
2021-09-23 12:26:43 +09:00
ThreeMustyFears
a9179ce7fb
Match use_tweester, and munchlesia + misc partners ( #422 )
...
* update common_structs and enums
* match tweester and munchlesia
* update undefined_syms
* same function in different partners
* run coverage
* some changes
* other spaces
* attempt at deduplicating
* Revert "attempt at deduplicating"
This reverts commit 6393e85703
.
Co-authored-by: ThreeMustyFears <>
2021-09-23 11:06:57 +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
ThreeMustyFears
b127733cfa
Match spinning flower and slide ( #419 )
...
* match use_spinning_flower.c
* match slide.c
* some partners.c matches
2021-09-16 13:19:12 +01:00
eldexterr
f95eb165f3
Update common_structs.h ( #418 )
...
This ones are actually flags used by Power Rush and Mega Rush, I dunno if they're used for something else tho.
But if you enter in Danger State (2-5HP) and you have equipped Power Rush dangerFlags will be 0x02 not 0x01.
2021-09-14 21:33:44 +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
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
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
Ethan Roseman
ff2c968335
Getting rid of warnings and removing function decl from INCLUDE_ASM ( #396 )
...
* Fix some fx stuff
* INCLUDE_ASM doesn't emit a function decl anymore
2021-08-26 05:32:48 +09:00
Alexander Faßbender
4bdb7280a7
Create dead.h and update dead code units ( #394 )
...
* create dead.h and resolve #350
* Update variables.h
* Update dead.h
2021-08-26 04:29:59 +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
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
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
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
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
alex
bd529b6edb
some pause BSS, some api deduplication ( #363 )
...
* move some pause bss out of undefined_syms
* dedup LoadPartyImage
* dedup StashVars.inc.c a bit
* put BSS attribute at start of line
2021-08-17 00:00:00 +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
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
JoshDuMan
763e071b52
Label some time freeze defines. ( #341 )
...
* Create defines for time freezes.
* Update SaveBlock.c
* Update state_pause.c
* Update 3251D0.c
* Update state_file_select.c
* Update HeartBlock.c
* Update goombario.c
* Update state_battle.c
* Update C4DEF0.c
* Update C4DEF0.c
2021-07-25 01:34:55 +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
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)
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
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
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
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
alex
035a0e6db6
is_debug ( #322 )
2021-07-19 17:22:43 +09:00
Alexander Faßbender
2a4966887c
match battle partner/move functions ( #319 )
2021-07-18 16:21:37 +01:00
alex
0538a9220b
match update_cameras ( #321 )
...
* near-match func_800279B4
* fix lakilester split
* match func_8023A1B0_70DEC0
* match func_800271FC
* further work on func_800279B4
* match update_cameras
* add CAM_FLAGs
* remove CAM macro
2021-07-18 02:04:14 +09:00
Rainchus
bca5129f4c
Match battle functions and some unused/dead functions ( #318 )
...
* decomp dead functions
* decomp battle functions in 1A5830.c
* delete matched functions .s files
* fix variable names
2021-07-18 00:10:58 +09:00
ThreeMustyFears
3d2798422a
Match func_8003DFA0 and func_8003E1D0 ( #316 )
...
* match func_8003DFA0 and func_8003E1D0
* update return types
* Delete func_8003DFA0.s
* Delete func_8003E1D0.s
* made requested changed to npc.c
* moved prototypes and changed return type to void
* Correcting a couple mistakes
My bad I think void should have been an EffectInstance* which I got from looking at the matching INCLUDE ASM in src/4ac90_len_3910.c and I forgot to modify src/evt/fx_api.c as it has a prototype for these functions in it
* Update fx_api.c
* further cleanup
Co-authored-by: Ethan Roseman <ethteck@gmail.com>
2021-07-17 23:45:08 +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
d2875030a3
Name files and avoid use of X32 type for functionTemp ( #314 )
...
* name entity files
* name encounter_api
* abolish X32
2021-07-16 21:22:21 +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
Ethan Roseman
f02743e1cb
Tidying and msg.c work ( #311 )
...
* undefined syms cleanup
* moving all remaining undefined funcs to dead_syms (as they're dead)
* Rename and update MessagePrintState
* msg wip
* B9D60 -> msg
* msg stuff
* .
* PR stuff
2021-07-13 22:43:14 +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
alex
8decbeb3ff
Disassemble fully battle/area_kmr_part_1 ( #307 )
...
* 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
* disasm_script: handle = (const) NPC_ANIM
* disasm_script improvements
* wip
* it compiles!
* battles.c -> area.c
* squish warnings
* 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"
* all OK except rodata padding
* ok
* ACTOR_SELF
Co-authored-by: Ethan Roseman <ethteck@gmail.com>
2021-07-12 21:06:00 +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
03eccf598f
Misc decomp 534 ( #301 )
...
* splat disasm update
* a little
* splat jtbl robustness
* git subrepo pull (merge) --force tools/splat
subrepo:
subdir: "tools/splat"
merged: "150dcdebfd"
upstream:
origin: "https://github.com/ethteck/splat.git "
branch: "master"
commit: "150dcdebfd"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo "
commit: "2f68596"
* some rodata stuff
* git subrepo pull tools/splat
subrepo:
subdir: "tools/splat"
merged: "21bf3a381c"
upstream:
origin: "https://github.com/ethteck/splat.git "
branch: "master"
commit: "21bf3a381c"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo "
commit: "2f68596"
* progress
* All area rodata migrated
* UnkDistFunc
* SwitchToPartner
* UnkNpcAIFunc23
* UnkNpcAIFunc24
* UnkNpcAIFunc25
* cleanup & symbol_addrs
* disasm update
* work on fio.c (6240)
* data 'n' tst_04 funcz
* more tst_
* misc & PlayFX3D
* two end_01 funcs
* more shtuff
* fix
* fix2
2021-07-09 00:53:00 +09:00
Ethan Roseman
41417f4d70
All area rodata migrated ( #299 )
...
* splat disasm update
* a little
* splat jtbl robustness
* git subrepo pull (merge) --force tools/splat
subrepo:
subdir: "tools/splat"
merged: "150dcdebfd"
upstream:
origin: "https://github.com/ethteck/splat.git "
branch: "master"
commit: "150dcdebfd"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo "
commit: "2f68596"
* some rodata stuff
* git subrepo pull tools/splat
subrepo:
subdir: "tools/splat"
merged: "21bf3a381c"
upstream:
origin: "https://github.com/ethteck/splat.git "
branch: "master"
commit: "21bf3a381c"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo "
commit: "2f68596"
* progress
* All area rodata migrated
2021-07-03 20:22:53 +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
Ethan Roseman
e9176cb08f
Most of player_api and 18F340 ( #296 )
...
* 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
2021-06-16 18:52:15 +09:00
pixel-stuck
e61e67ea9b
[WIP] Work on npc.c ( #295 )
...
* formatting
* format + misc work
* lots of work on npc.c
* PR comments, asm delet + other misc fixes
* missed one
* temporarily remove cleanup step for testing
* test fix for splat
* test
* o2
* o0
* fix Yay0decompress.c bug
* debug logging
* stuff
* stuff2
* restore stuff
* more PR comments and some general cleanup
* NPC flags + improve match + misc
Co-authored-by: Ethan Roseman <ethteck@gmail.com>
2021-06-15 17:05:16 +09:00
Ethan Roseman
6ec6aab984
Mostly hud stuff ( #294 )
...
* bss
* 3 audios
* d5a50 stuff
* some icon funcs
* get_icon_render_pos
* PlayerLandJump
* func_80248170
* cleanup
2021-06-07 10:15:48 -04:00