Commit Graph

81 Commits

Author SHA1 Message Date
Unnunu
763b320bfb
b_area_omo2 (#729) 2022-06-12 15:44:36 +01:00
HailSanta
611a083ae9
hud-script-disasm (#726)
* pause hud scripts

* script name prefixes

* missing sparkle script item entity fields

* revert incorrect hypothesis

* global hud scripts + sparkle script macros

* remove tabs

* hs_op_15

* split battle images

* battle hud scripts

* fix warnings

Co-authored-by: HailSanta <Hail2Santa@gmail.com>
2022-06-10 04:03:11 +09:00
Unnunu
76187e5c3b
3 more battle maps (#724)
* area_pra2

* finish

* sound enum

* renamed enum member

* fixed alignment

* area_pra3

* area_sam

* area_sam2
2022-06-06 21:34:45 +09:00
Unnunu
d8837960b1
pra2 battle map (#720)
* area_pra2

* finish

* sound enum

* renamed enum member

* fixed alignment
2022-05-31 03:39:42 +09:00
Ethan Roseman
021592d219
Misc decomp 70 (#716)
* aura_appendGfx

* 3 more action commands

* fire_shell

* hammer, hurricane

* spiny_surge

* data stuff, cleanup, whirlwind

* warnings

* water_block data and func

* water_block

* effect stuff cleanup

* big_snowflakes effect

* data cleanup, fpr abi regs

* 2 battle item funcs + data

* 2 mo

* shooting_star func

* 3 16F740 funcs

* btl_state_update_end_battle

* map funcs

* more dedupe

* cleanin

* draw_entity_model_C/D

* effect butterflies, btl state funcs

* it is done

* it is done

* PR comments, some cleanup
2022-05-27 22:03:19 +09:00
Unnunu
52b9d1b11c
battle camera (#710)
* match func_80248DE4

* BattleCam_TargetActor

* renamed functions

* Update src/16F740.c

Co-authored-by: alex <16batesa@gmail.com>

Co-authored-by: alex <16batesa@gmail.com>
2022-05-16 15:18:18 -04:00
Ethan Roseman
179998098c
Misc decomp 53 (#703)
* some btl_state work

* msg_draw_speech_bubble

* cleaners

* btl_state_stuff

* btl_state_update_next_enemy wip

* btl_state stuff

* disable_x fx + cleanup

* wip

* fxstuff

* path funcs & cleanup

* clean

* model_api funcs

* two action commands

* action_cmd progress

* UnkFunc001

* air raid func

* cleanup, data migration, goodies

* remove data file

* git subrepo pull --force tools/splat

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

* fix build

* more cleanup

* clean

* PR comments
2022-05-05 23:08:16 +09:00
ThreeMustyFears
02a6b226a4
Match a couple of Parakarry battle funcs (#690)
* match two Parakarry battle funcs

* run coverage

* cleanup

* more cleaning

* changes

* changed loops

* missed another parenthesis

Co-authored-by: ThreeMustyFears <>
2022-04-13 07:57:39 +09:00
HailSanta
7dbd1770ec
Santas workshop (#670)
* initial name changes

* hud_element function names

* missing player data fields

* entity cleanup

* missed a few things + starting action states

* some world partner cleanup

* idle/walk/hammer + peach cooking stuff

* clean

Co-authored-by: HailSanta <Hail2Santa@gmail.com>
Co-authored-by: Ethan Roseman <ethteck@gmail.com>
2022-03-26 20:47:10 +09:00
Ethan Roseman
3ff0057674
Match-a-palooza (75% functions, 60% bytes) (#666)
* aura_update

* CompareFloats

* UnkBufferFunc

* SetPlayerStatusPosYaw

* SetNpcPosYaw

* IsAOrBPressed

* UnkEnemyPosFunc

* UnkNpcAIFunc47

* UnkFunc57

* UnkFunc58

* UnkFunc59

* delete unneded data

* UnkFunc60

* UnkFunc61

* UnkNpcAIFunc48

* UnkNpcAIFunc49

* UnkNpcAIMainFunc7

* lee func

* cleanup

* UnkFunc62

* UnkNpcAIMainFunc8

* SixFloatsFunc

* UnkNpcAIMainFunc9 part 1

* UnkNpcAIMainFunc9 part 2

* UnkNpcAIMainFunc10

* warnings
2022-03-20 19:12:30 +09:00
Nasina
30f66666d6
Matched func_802A1628_795908 (#664)
* Decompiled and Matched func_802A1628_795908

* Fix flag checks and removed cast

* Remove unnecessary scope

* Fixed else code styling

* Fixed if statement whitespace
2022-03-18 18:34:15 +09:00
Nasina
9dcb0616b6
Decompiled and Matched unknown_move (#663)
* Decompiled and Matched unknown_move

* Remove s32 cast

* Changed 0 to ABILITY_DODGE_MASTER

* Fix enemyTargetActor declaration and initialization
2022-03-17 12:09:16 +09:00
Nasina
83717471f9
Decompiled and Matched func_802A10A4_77F2E4 (#662)
* Decompiled func_802A10A4_77F2E4

* Resolved Suggestions

* Fixed Formatting Error

* Fixed Formatting Errors

* oops

* Move playerActorState Assignment
2022-03-17 12:05:16 +09:00
Ethan Roseman
33254f23be
Map func dedupe & fire breath effect (#661)
* find_duplicates improvements, closer on a func

* UnkFunc54

* UnkFunc55

* UnkFunc56

* fire_breath

* name stuff

* warnings

* cleanup

* .
2022-03-14 02:33:10 +09:00
Ethan Roseman
9fa9639575
The Great Effect Naming (#632)
* name big_smoke_puff

* 0-5

* 6 -> land

* more effect stuff

* flower effects

* name fix

* cloud_puff

* flower splash

* cloud_trail

* 2 more

* more

* a bunch more

* -2F

* more

* the rest

* cleanup and the rest

* PR stuffs
2022-01-25 01:58:33 +09:00
JoshDuMan
0f67c8c425
Disassemble Various Battle Scripts (#626)
* Disassemble DGB

* Disasm omo

* Disassemble KGR

* Disassemble Battle Goompa

* Disasm Goombario

* Disasm Jan2

* Disasm JAN Battle Map

* Delete data files

* Disasm Spin Smash

* Partners Disasm

* Disasm KZN Battle Map

* Delete func

* jungle_guy

* Spear Guy
2022-01-19 20:21:19 +09:00
JoshDuMan
44dd710d54
Disassemble 3 Battle Maps (#622)
* Disassemble ISK Part 2 Battle Map

* Disassemble MIM BTL Map and fix script maps

* Delete mim

* Disasm Script

* Disassemble ARN Battle Map

* Remove files

* Remove struct

* Handle comments and merge conflicts
2022-01-17 02:22:23 +09:00
HailSanta
41c304137d
hud and item script names (#617)
* hud script names 1

* more hud elements!

* battle hud scripts

* names for some item globals

* hud elem scripts for items

* item entity names

* cleanup and missing struct in partners

* more partner cleanup

* battle stuff

* fix some warnings?

* resolve stuff

* fix symbol_addrs

* minor fixes

* splat pause_icon_table.data.s

* glabel -> dlabel

* rom addrs

* fix splat stuff

* data splits, warnings

* split more hud scripts

* added symbols for battle menu

* finished hud scripts fot 415D90

* entity documentation

* entity documentation

* more consistent name

Co-authored-by: HailSanta <Hail2Santa@gmail.com>
Co-authored-by: Ethan Roseman <ethteck@gmail.com>
2022-01-15 03:54:45 +09:00
JoshDuMan
36e5315fdc
Disassemble Various Data Files (#616)
* Disassemble IWA Battle Map

* Disassemble SBK Battle Map

* Disassemble Quake Hammer

* Disassemble jump.c

* Disassemble Hammer Action Command

* Some Labelling

* Fix symbol_addrs

* Disassemble ISK Part 1 Battle Map

* Restore symbol_addrs
2022-01-13 15:26:42 +09:00
JoshDuMan
79bcd008f9
Battle Map and Move Disassembly (#614) 2022-01-11 02:06:43 -05:00
JoshDuMan
4657f3621b
Disassemble mac, hos, and nok Battle Maps (#602)
* voodoo magic

* Cleanup + match func_802180D0_464560

* work

* Finish mac battle map

* Add to gBattleAreas

* splat

* Disassembled hos and nok battle maps

* Match Kent C Function

* fix build

* Fix

* Work on disasm_script

Co-authored-by: Ethan Roseman <ethteck@gmail.com>
2022-01-05 20:01:44 +09:00
JoshDuMan
f44eb0bb88
Disassemble KMR 3 Battle (#600)
* Work.

* D_80000000

* The rest of KMR_03

* Comments
2022-01-03 18:54:01 +09:00
Alex Bates
d22bd18f98
Disassemble Star Power scripts (#584)
* fix diff_evt.py

* document UW/UF based on @SeekyCt's advice

* fix star_rod_idx_to_c.py

* migrate battle/star/focus data

* use N() where possible

* rm data.s

* update symbol_addrs

* refresh

* lullaby

* star storm

* chill out

* fix float problems (sad)

* smooch

* time out

* up and away

* star beam

* peach beam

* peach focus

* peach dash

* rm old data

* Assorted Decomp Across The Galaxy (#574)

* popup_menu_update & other

* a bunch of 190B20

* starting load_player_actor

* load_player_actor

* blorp

* load_partner_actor

* fx_11_main

* fx_11 done

* cleanup

* fx_12

* 3 encounter_api funcs

* encounter_api done

* some 20ec0 funcs

* clean

* PR comments, warnings

* name btl_actorHomePositions

* PR comments

* merge

* Introduce SPRITE_PIXEL_SCALE (#580)

* fix func_80273444 warns

* make end of data explicit in splat.yaml

* lol

Co-authored-by: Ethan Roseman <ethteck@gmail.com>
Co-authored-by: Alexander Faßbender <31699028+Brotenko@users.noreply.github.com>
2021-12-29 02:11:07 +09:00
Rainchus
095680b006
Duplighost battle functions (#556)
* decomp some functions in 1AC760.c

* broken data migration

* data nearly migrated, rodata in laki file is null

* fix building and laki data migration

* data migration for kpa3 WIP

* add missing data

* decomp duplighost functions and duplicates

* fix some warnings

* resolve issues

* fix warnings

Co-authored-by: Brotenko <brotenko@gmail.com>
2021-12-25 10:34:55 +09:00
Alexander Faßbender
bb5c96a417
Use designated inits for data tables and AC 0A data migration (#538)
* data tables and minor data migration

* remove redundant comments
2021-11-23 16:26:32 +01:00
Lightning
1c64f15db1
Make a 224 functions show up in the elf (#530)
* Make a 224 functions show up in the elf

* fix up appendGfx_model (as an example)

* Changed all L labels to .L for local jump tables. Did not change global jump tables found in /data/ as .L is for local only

* Decompile even more misc battle map funcs (#531)

* decompile misc battle map funcs

* fix warnings

* Decompile misc battle map funcs (#528)

* .

* .

* resolve issues

* Update fx_api.c

* Update fx_api.c

* Make a 224 functions show up in the elf

* fix up appendGfx_model (as an example)

* Changed all L labels to .L for local jump tables. Did not change global jump tables found in /data/ as .L is for local only

* Fix merge issue

Co-authored-by: Ethan Roseman <ethteck@gmail.com>
Co-authored-by: Alexander Faßbender <31699028+Brotenko@users.noreply.github.com>
2021-11-16 16:19:38 +09:00
Alexander Faßbender
e9f80f2856
Decompile misc battle map funcs (#528)
* .

* .

* resolve issues

* Update fx_api.c

* Update fx_api.c
2021-11-14 21:23:07 +01:00
Alexander Faßbender
75e2c18977
Decompile even more misc battle map funcs (#531)
* decompile misc battle map funcs

* fix warnings
2021-11-14 21:16:52 +01:00
Alexander Faßbender
fbc901ac49
decompile several map and battle-map related functions (#504)
* decompile several map and battle-map related functions

* remove unnecessary folder

* resolve issue

* .

* .

* Update 52B6A0.c

* Update 6DBDA0.c
2021-10-29 20:14:51 +02:00
Alexander Faßbender
1f57f7ed09
Decompile several battle map functions (#500)
* add information about dead maps

* link the names of dead maps to their alive counterparts

* decompile several battle maps related functions

* add information about dead maps

* link the names of dead maps to their alive counterparts

* decompile several battle maps related functions

* .

* resolve issues

* .

* rename of chainchomp related structs and functions
2021-10-28 16:51:46 +02:00
eperdew
bf65da2020
Decompile small action command functions (#468)
* Decompile small functions in air_lift.c

* Decompile small functions of 07.c

* Decompile small functions in 0A.c and air_raid.c

* Decompile func_802A96B8_423AA8

* Match func_802A91B0_4235A0 and fix warnings in break_free.c

* Match small functions in dizzy_shell.c

* Match small functions in fire_shell.c

* Match easy functions in hurricane.c

* Match easy functions in spiny_surge.c

* Fix 2 --> DONE2 and leftover redundant assignments.
2021-10-10 21:46:02 -04:00
eperdew
789049ee36
Decompile action_cmd/bomb.c (#467)
* Decompile the easy functions of bomb.c

* Deduplicate action command function in bomb.c

* Fully decompile bomb.c

* Remove matched func_802A928C_427CFC.s

* Clean up bomb.c before making a PR.

* Address @nanaian's feedback.

* Convert nonsense function pointer symbol reference to proper BSS var.
2021-10-10 07:30:38 +09:00
eperdew
93a4f819ac
Match smack.c (#464)
* Get full match on smack.c
* Clean up smack.c and remove the unnecessary 42ED70.data.s
* Update smack.c to use barFillLevel instead of unk_44.
2021-10-08 02:56:18 +01:00
eperdew
5a85b3115d
Decompile mega_shock.c (#457)
* parent d2721ed191
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
eperdew
61467570c8
Decompile func_80218808_5B1CB8, area_arn/4550D0.c, and area_dig/6DE1F0.c. (#446)
* Decompile area_arn/4550D0.c and area_dig/6DE1F0.c.

* Remove covered assembly files for battle/area_arn and battle/area_dig.

* Decompile func_80218808_5B1CB8.

* Address @ethteck's feedback on PR#446, sans the switch on actorType.

* Deduplicate UnkFunc52, and add a switch-based matching decomp.

* Turn ACTOR_TYPE_XXX defines into an ActorType macro.

* Remove erroneously added src/world/common/spiked_goomba.c.
2021-09-28 16:28:01 +09:00
JoshDuMan
a8571ab3e7
Match func_802A9634_42A354 (#441)
* Match func_802A9634_42A354

* Delete func_802A9634_42A354.s

* Update functions.h

* Update squirt.c
2021-09-26 17:00:26 -04:00
JoshDuMan
36fe0a9232
Match func_802A10E4_743ED4. (#435)
* Match func_802A10E4_743ED4

* Delete func_802A10E4_743ED4.s

* Formatting
2021-09-26 15:55:57 +09:00
Alexander Faßbender
bcc20df00b
Replace get_variable with evt_get_variable in .s files (#410)
* rename every function that is part of evt_funcs.h to have the evtt_ prefix.

* remove old .s files

* fix symbol_addrs error

* add evt_ 'prefix' to the dead functions in dead-h

* fix issue with .s files missing the evt_ prefix
2021-08-29 20:05:08 +02:00
Alexander Faßbender
b198250cde
Rename every function that is a part of evt_funcs.h to have the evt_ prefix (#408)
* rename every function that is part of evt_funcs.h to have the evtt_ prefix.

* remove old .s files

* fix symbol_addrs error

* add evt_ 'prefix' to the dead functions in dead-h
2021-08-29 18:51:56 +02:00
Ethan Roseman
a865cbdf17
Trigger funcs (#405)
* remove old tools, fix warnings

* almost match si_handle_print_debug_var

* si_goto_end_loop and warnings

* is_trigger_bound and create_trigger

* Cleanup + matching 2 non-matchings

* update_triggers (trigger.c complete)

* fix warnings

* PR comments, m2ctx.py fix
2021-08-29 22:44:17 +09:00
Muskellunge
c58b4098f5
decomped AC function (#401)
* rename func_80242178_7ECE88

* matched tiny function

* decomp AC func

* renamed some vars

* made requested changes

* named temp_s0
2021-08-27 01:44:37 -04:00
JaThePlayer
0bdf15542e
Chest & Heart Block entities (#393) 2021-08-25 22:29:43 +01:00
jdaster64
3627d909fc
Power Shock - Adding 4/5 matching funcs (#389)
* Tidal Wave update function

* Tidal Wave merge issues, re-delete ASM

* action_cmd_tidal_wave_update (#379)

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

* Responses to comments

* disable ccache on Jenkins :(

* oops

* Fix type warnings for HUD scripts, add function declarations

* Fixing a couple more Power Shock warnings

* Change HudElements* to s32s in Power Shock code

Co-authored-by: Ethan Roseman <ethteck@gmail.com>
2021-08-26 03:08:35 +09:00
alex
d0be37641b
Fix a bunch of warnings (#388)
* git subrepo pull (merge) --force tools/splat

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

* configure: add --no-warn

* clean up hud_element.h

* fix some warnings
2021-08-25 21:34:03 +09:00
jdaster64
29ea27859d
action_cmd_tidal_wave_update (#379) 2021-08-23 22:54:56 +01:00
alex
49bee8512b
hud_element.c (#371)
* generate permuter_settings.toml
* remove -Wshadow (#366)

Co-authored-by: pixel-stuck <mathmcclintic@gmail.com>
2021-08-18 17:28:32 +01:00
JaThePlayer
af6416de0e
Major Action Command Decomp (#365)
* Decomp jump and most of tidal wave action commands

* More action commands

* stop_leech.c fully decomped.

* flee.c decomped

* cleanup and function name convention fixes

* slight cleanup

* Move ActionCommand enum to enums.h, style changes

* Changed some numbers to decimal

* That one missing newline

Co-authored-by: Ethan Roseman <ethteck@gmail.com>
2021-08-17 03:31:45 +09:00
Ethan Roseman
c7a7567d68
FX data/funcs, camera funcs, state funcs (#364)
* fx table work

* fx data

* blah

* render_effects_UI

* split out effects.c

* battle state menu functions

* render_frame

* clean

* clean

* 4 camera funcs

* state_step_end_battle & symbol names

* state_file_select done

* 111f0 done

* .

* PR comments
2021-08-17 03:14:58 +09:00
JaThePlayer
18a2781cf1
add ActionCommandStatus, random decomp (#358) 2021-08-06 12:00:15 +01:00
Alexander Faßbender
7a6368c960
Decompilation of duplicated functions (#354)
* match last bow fumction

* decomp more partner functions

* :)

* :)

* resolve merge conflict and style conflicts

* fix

* decomp :)

* :(

* :(((

* :)

* :(

* :)

* :)))))

* :(

* :/

* idk

* :/

* What

* Done.

* PR comments

* :(

* decompile dead funcs

* find_duplicates.py +x

* rename dead functions and resolve PR

* :)

* .

* .

* decompile duplicate functions

* :(

* decompile several dupliacte funcions

* decompile several dupliacte funcions

* .

* --

* resolve coverage issue

* rename include-file to specify original use-case

Co-authored-by: Ethan Roseman <ethteck@gmail.com>
2021-08-04 18:12:31 +09:00