Commit Graph

95 Commits

Author SHA1 Message Date
Rainchus
d9c72e432b
Match more overworld partner functions (#541)
* 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

* decomp world sushie/watt files

* run coverage.py

* small style fixes

* fix 2 warnings in watt.c

* decomp kooper world functions

* requested style changes

* couple more style changes

* decomp kooper world functions

* last style changes

* decomp more kooper world functions

* match world kooper file except 2 non_equivalent

* non matching of last world bow function

* migrate data.s file to bombette.c, also decomp various overoworld partner functions

* match more overworld partner functions

* style changes

* update variable names

* some requested changes done

* add enums and other cleanup to overworld partner files

* run coverage.py

* add a space to watt file

* remove raw pointers from partner files plus other requested changes

* remove goompa raw pointer

Co-authored-by: root <root@DESKTOP-HK751F2.localdomain>
Co-authored-by: Rainchus <Rainchus@github.com>
2021-12-06 21:25:43 +09:00
Alexander Faßbender
d2ce4dd89e
Match all FX render functions (#540)
* match most fx_XX_render functions

* match the rest of the fx render functions

* resolve data migration issues

* resolve issues

* Update effect_117.c
2021-11-26 10:25:50 +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
Ethan Roseman
755c83a363
fold_* , effect_10, and other assorted decomp (#535)
* work on appendGfx_message

* :OK:

* indentation

* message window states

* SetEntityCullMode & some of appendGfx_model

* 9 smalls

* 2 more

* 2 mo

* update_player_actor_shadow

* EffectInstanceData rework

* some shtuff

* effect_10 dun

* wip

* wip

* wipz

* rename

* progz

* remove wip work for appendGfx_model

* PR comments

* Alex comments

* tomorrow for sure

* eventually
2021-11-19 23:31:28 +09: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
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
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
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
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
b1b328d0e8
Match evt_get_float_variable and a world function (#471)
* Match evt_get_float_variable

* Delete evt_get_float_variable.s

* Match func_80240240_D13810

* Delete func_80240240_D13810.s

* Address Ethan's wants

* Remove space

* Create SetAngleClamped.inc.c

* Update D13810.c

* Update DA5260.c

* Update DB7910.c

* Update DC43D0.c

* Update DD79B0.c

* Update DEBED0.c

* Update DEEEA0.c

* Delete func_8024003C_DA527C.s

* Delete func_8024001C_DB792C.s

* Delete func_8024001C_DC43EC.s

* Delete func_8024001C_DD79CC.s

* Delete func_8024001C_DEBEEC.s

* Delete func_8024001C_DEEEBC.s

* Fix build stuff (#5)

* Fix more instances of build issues (#6)
2021-10-13 11:56:42 +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
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
Dalrik
c3bf1ad8fa
Match pause_stats_init and pause_stats_handle_input (#456) 2021-10-03 00:49:22 +01: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
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
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
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
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
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
Ethan Roseman
ac5b75763c
Fix alignment (#421)
* git subrepo pull (merge) tools/splat

subrepo:
  subdir:   "tools/splat"
  merged:   "0f6b99498e"
upstream:
  origin:   "https://github.com/ethteck/splat.git"
  branch:   "master"
  commit:   "a889d905d9"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "2f68596"

* OK

* git subrepo pull (merge) --force tools/splat

subrepo:
  subdir:   "tools/splat"
  merged:   "7eb5744b2a"
upstream:
  origin:   "https://github.com/ethteck/splat.git"
  branch:   "master"
  commit:   "7eb5744b2a"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "2f68596"
2021-09-22 20:09:51 +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
Muskellunge
c58b4098f5
decomped AC function (#401)
* rename func_80242178_7ECE88

* matched tiny function

* decomp AC func

* renamed some vars

* made requested changes

* named temp_s0
2021-08-27 01:44:37 -04:00
jdaster64
3627d909fc
Power Shock - Adding 4/5 matching funcs (#389)
* Tidal Wave update function

* Tidal Wave merge issues, re-delete ASM

* action_cmd_tidal_wave_update (#379)

* Adding Power Shock 4/5 matching, NON_MATCHING update func

* Responses to comments

* disable ccache on Jenkins :(

* oops

* Fix type warnings for HUD scripts, add function declarations

* Fixing a couple more Power Shock warnings

* Change HudElements* to s32s in Power Shock code

Co-authored-by: Ethan Roseman <ethteck@gmail.com>
2021-08-26 03:08:35 +09:00
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
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
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
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
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
18837f7303
Shift (#334)
* migrate si.data.s to si.c

* remove unused undefined_sym

* split world script data into individual scripts

Co-authored-by: Alex Bates <hi@imalex.xyz>
2021-07-21 20:52:26 +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
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
Ethan Roseman
a876384c97
fix power bounce and unknown move code/data splits (#320) 2021-07-18 00:21:02 +09:00