Commit Graph

618 Commits

Author SHA1 Message Date
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
Ethan Roseman
34254d102e
appendGfx_message (#520)
* work on appendGfx_message

* :OK:

* indentation

* message window states

* PR comments

* ran formatter

* change some types

* debuggin

* undebuggin

Co-authored-by: Alex Bates <hi@imalex.xyz>
2021-11-12 21:23:43 +09:00
Lightning
90c0d29bf9
match _heap_realloc (#524)
* match _heap_realloc

* Minor code cleanup
2021-11-11 13:38:52 +09:00
Alexander Faßbender
be4bb17dee
Update flags and enums in enums.h (#525)
* prepare enums.h

* update enums.h

* add commits to enums.h

* resolve enum and flag issues with enums.h

* delete artifacts

* resolve issue with soundid enum

* :P

* setup first few parameterised flag enums

* add flags to npc.h related structs

* add flags to npc.h related structs

* create enums for several common structs

* .

* resolve issue with enum sizes

* resolve issue with enum sizes

* resolve issue with enum sizes

* parameterise entity and event related flags

* update enums.h

* add commits to enums.h

* resolve enum and flag issues with enums.h

* delete artifacts

* resolve issue with soundid enum

* :P

* setup first few parameterised flag enums

* add flags to npc.h related structs

* add flags to npc.h related structs

* create enums for several common structs

* .

* resolve issue with enum sizes

* resolve issue with enum sizes

* resolve issue with enum sizes

* parameterise entity and event related flags

* .

* Update 190B20.c

* Update enums.h
2021-11-11 13:30:59 +09:00
JoshDuMan
fd7acde70b
Match attack submenus (#523)
* Match func_80263914
* Match func_802634B8
* Match func_802636E4
2021-11-10 18:57:55 +00:00
Lightning
4733902ec8
Match _heap_free (#522)
* Committing _heap_free match

* More renames and fixes from PR

* Ver without goto's from Josh

* Accidently left pointers in

* More variable fixes based on calls to _heap_*

* Remove unneeded comments, fix function variable name in header

* Missing a space

* Revert to while loop

* Sneaking in an additional comment about heap_malloc_tail for clarity

* Missed whitespace

* Reduced some comments
2021-11-08 01:58:57 +09:00
JoshDuMan
97523d8af1
Match deduct_current_move_fp (#521)
* Match deduct_current_move_fp

* Delete deduct_current_move_fp.s

* Fix costFP type

* Match reset_actor_turn_info

* Delete reset_actor_turn_info.s

* Cleanup

* Address Ethan's comment
2021-11-07 18:20:08 +09:00
Lightning
95ea4223d5
Match _heap_malloc and _heap_malloc_tail (#519)
* Matched _heap_malloc and _heap_malloc_tail

* Move heap_malloc away from using s32 returns

* Remove unmatched files

* Missed a line

* Requested changes

* Add more changes from hidden convos

* Working through entries :)

* Remove extra parens left over from match work

* Removed macro per Ethan's request

* Fix a space
2021-11-06 23:10:53 -04:00
JoshDuMan
cb9e287768
Match count_power_plus (#518) 2021-11-05 13:54:23 +00:00
Technoman
99a81611f6
Match ModifyActorDecoration, func_8026EA7C, get_coin_drop_amount (#516)
* Match get_coin_drop_amount

* Delete get_coin_drop_amount.s

* Match func_8026EA7C

* Delete func_8026EA7C.s

* extern func_80266D6C

* Match ModifyActorDecoration

* Update DecorationTable

* Update ModifyActorDecoration

* Fixed DecorationTable

* Delete ModifyActorDecoration.s

* Update DecorationTable

* Update DecorationTable

* Fixed DecorationTable, Added DecorationUnk

* Fixed DecorationTable?

* Update func_80266dc, create_part_shadow_by_ref

* Update get_coin_drop_amount

* func_8026EA7C

Co-authored-by: Alexander Faßbender <31699028+Brotenko@users.noreply.github.com>

* Update DecorationTable

* Update get_coin_drop_amount

* Update DecorationUnk

* Update get_coin_drop_amount

* Update get_coin_drop_amount

* Update DecorationUnk

Co-authored-by: Alex Bates <hi@imalex.xyz>

Co-authored-by: Alexander Faßbender <31699028+Brotenko@users.noreply.github.com>
Co-authored-by: Alex Bates <hi@imalex.xyz>
2021-11-04 02:08:36 -04:00
Alex Bates
a7caa90d28
Add descriptions to all map headers (#515)
* remove bad create_actor declaraton

* maps.py

* area name

* add doc names for all maps

* rm maps.py
2021-11-01 22:22:40 +09:00
Rainchus
432e891080
Various C file decomp (#501)
* 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

* pull sbk_02.h changes

* ...actually merge master correctly

* decomp most functions in nok_04

* decomp most of 9EDBF0.C, fix warnings in UnkFunc41.inc.c and warnings/decomp in lakilester.c

* run coverage.py

* code review changes + few extra functions

* decomp lakilester functions and fix style in other files

* decomp more laki overworld functions

* add close match for func_802BDDD8_321928

* requested changes

* more requested style changes

* style changes

* last of review changes

* another small style fix

* ...accidentally deleted the f on a float immediate
2021-11-01 17:06:45 +09:00
Technoman
b4e5b9e6af
Match SummonEnemy & UseIdleAnimation (#510) 2021-10-31 15:39:33 +00: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
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
Alex Bates
af880293a3
Add sprite.h (#503)
* add sprite.h

* fix reflection warnings
2021-10-30 01:48:20 +09:00
JoshDuMan
b062511b1a
Match calc_enemy_test_target (#499)
* match calc_enemy_test_target

* Delete calc_enemy_test_target.s

* Address comments

* Fix cloudNineDodgeChance

* Update common_structs.h
2021-10-29 21:38:40 +09:00
Gota7
9ac9c6b904
Match msg_get_glyph (#497)
* Match msg_get_glyph

And fix the type definition for draw_msg, that's it really.

* PR fixes

* PR Fix
2021-10-28 21:19:44 -04: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
Alexander Faßbender
b9bc4b8af8
Assign dead maps to alive counterparts (#496)
* add information about dead maps

* link the names of dead maps to their alive counterparts

* Update EB1170.c

* remove redundant function declaration

* resolve issues
2021-10-27 11:24:52 +02:00
Alexander Faßbender
beeb5627e6
Deduplicate various dead functions (#494)
* what is dead may never die

* resolve issues

* fixing dead_gPartnerActionStatus2

* .

* resolve issues

Co-authored-by: Ethan Roseman <ethteck@gmail.com>
2021-10-25 16:32:44 +02: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
JoshDuMan
9631996e76
Fix some warnings. (#495)
* Fix some warnings.

* Update functions.h
2021-10-25 20:29:47 +09:00
JoshDuMan
aa6054a1ea
Match calc_enemy_damage_target (#489)
* Match calc_enemy_damage_target

* Update 1A5830.c

* Delete calc_enemy_damage_target.s

* Update enums.h

* Update 1A5830.c

* Update functions.h

* ;

* eth cleanup

* comments

Co-authored-by: Ethan Roseman <ethteck@gmail.com>
2021-10-25 19:28:45 +09:00
banditguy123
36ea2dab3d
Match SetGoalToIndex and SetPartAlpha (#487) 2021-10-23 16:13:50 +01: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
JoshDuMan
ce1c0c715e
Match BoostDefense, VanishActor, ElectrifyActor, and HealActor (#481)
* Match BoostDefense, VanishActor, ElectrifyActor, and HealActor

* Delete BoostDefense.s

* Delete VanishActor.s

* Delete ElectrifyActor.s

* Delete HealActor.s

* Update 197F40.c

* Add D_8029FBD0

* Add inflict_status

* Address comments.
2021-10-20 00:15:38 +09:00
Gota7
08edbc6e01
Match part of hud_element.c (#480) 2021-10-18 16:58:32 +01:00
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