Commit Graph

702 Commits

Author SHA1 Message Date
Unnunu
9e0aab9e6d
camera functions and zone collision data (#671)
* match 3 functions

* match 4 camera functions

* fixes

* camSettings type enum

* PR suggestions
2022-03-28 18:29:47 +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
Rainchus
70a0b67237
Finish lakilester overworld file (#669)
* decomp appendGfx_player, fix warnings in 77480.c file

* small style fixes

* fix action state enum and make use of enum

* merge master

* decomp some mario rendering functions

* run coverage.py

* review changes

* use decimal in func arg

* 891b0 and sprite functions

* finish lakilester world file

* run coverage.py

* remove duplication declarations

* requested changes and remove some warnings from sprite.c

* ...run coverage.py

* requested changes for laki file and update functions.h

* remove redundant includes
2022-03-26 19:37:14 +09:00
Nasina
3ecb9263d1
Decomp world/actions/land.c and func_802B61E4_E23444 (#665)
* Decompiled func_802A10A4_77F2E4

* Resolved Suggestions

* Fixed Formatting Error

* Fixed Formatting Errors

* oops

* Move playerActorState Assignment

* Matched func 802B61E4 in idle.c

* Decomped and Matched func_802B6000_E24920.s

* Decomped and Matched func_802B61C0_E24AE0

* Decomped and Matched the rest of the functions in land.c

* Cleaned up land.c

* Cleaned up matched idle.c function

* Removed Function ASM files

* Fixed most warnings

* Fixed all warnings

* Applied Suggestions

* Appliied Style Suggestions

* Fix if statement
2022-03-22 17:56:28 -04:00
Ethan Roseman
bcffe508ba
btl_state_update_celebration (Thanks Unnunu!) (#668)
* btl_state_update_celebration (Thanks Unnunu\!)

* fixes

* warnings
2022-03-23 06:27:22 +09:00
Unnunu
086ab5bf24
match some libultra (#667)
* decomp 8 functions

* 3 ai funcs

* 6 more funcs

* decomp 6 funcs

* decomp 21 funcs

* cleaning up

* fix

* reverted changes in os_pfs.h
2022-03-21 15:47:44 +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
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
Unnunu
b922ddd6f3
hud_element.c (#660)
* ALT_clear_hud_element_cache

* clear_hud_element_cache

* match 3 funcs

* hud_element_update

* draw_rect_hud_element

* func_801413F8

* HudElementFlags

* flag names

* some improvements

* fix warnings

* debuffIcon TODO

* PR suggestions
2022-03-12 18:49:32 +09:00
Ethan Roseman
9cd911765d
File menu & more (#658) 2022-03-10 09:55:38 +00:00
JaThePlayer
2d733f4097
Blast, aura, sleep_bubble, fire_flower, bombette_breaking effects (#656)
* Blast, aura, sleep_bubble, fire_flower, bombette_breaking

* run coverage.py

* Move the typedefs to effects.h
2022-02-25 22:19:53 +09:00
JoshDuMan
d86d15bfd5
Match a number of functions and introduce anon unions (#655)
* Match a number of functions and introduce anon unions

* Fix warnings

* Ethan's comments
2022-02-25 00:12:33 +09:00
Ethan Roseman
48808572d9
debuff effect & 19FAF0 funcs (#653)
* debuff.c

* 19FAF0 funcs

* clean

* some API stuff

* clean

* PR
2022-02-22 01:05:36 +09:00
JaThePlayer
fb828bf8da
music_note.c, shape_spell.c, stat_change.c, tattle_window.c, recover.c data migration (#652)
* music_note.c, shape_spell.c, stat_change.c, tattle_window.c, recover.c data migration

* implement requested changes

* Recover.c data fixes, style changes

* The one newline lol

* f
2022-02-22 00:53:26 +09:00
JaThePlayer
b427897581
Decomp RestorePreDefeatState + 2 more, add enum for RushFlags (#651)
* 3 funcs

* Rename rushesFlags to rushFlags, rename the RushFlags enum values
2022-02-20 01:46:27 +09:00
Ethan Roseman
e98ea95df4
state_title_screen & camera funcs (#650)
* state_title_screen funcz

* camz

* line

* PR comments and matches (thanks Unnunu & Wiseguy)

* enumz

* gloop
2022-02-19 23:39:34 +09:00
Ethan Roseman
d02e72e78f
Item funcs & ctx fixes (#649)
* stuffs

* func_80136A08

* C50A0

* WIP

* clean

* fix context issues

* clean
2022-02-18 02:11:27 +09:00
Unnunu
546152b69e
match windows.c and migrate data for draw_box (#646)
* match 9 functions

* draw_box data

* fix warnings

* fix

* fix warnings again

* PR suggestions

* replace int literals with enum values

* two more ints replaced
2022-02-13 17:19:59 +09:00
JoshDuMan
0f27b16f3c
Match test_item_entity_position (#644)
* Match test_item_entity_position

* Delete test_item_entity_position.s

* Add ENTITY_TYPE_2

* Update C50A0.c

* Update C50A0.c
2022-02-13 02:58:21 +09:00
Ethan Roseman
3a578399fb
calc_item_damage_enemy and some others (#641)
* SFX funcs, configure fix

* the actual rename (oops)

* 3 sprite funcs

* 2 funcz

* calc_item_damage_enemy and cleanup, others

* cleanup

* Warnings

* clean fx_api

* match npc_raycast_general and name npc_collision.c

* PR comment
2022-02-09 03:33:05 +09:00
Unnunu
650d52d16a
Pause menu (#642)
* start data migration

* decomp 12 functions

* make initial bss

* pause_tutorial_draw_contents

* pause_init

* decomp 3 functions

* decomp pause_tabs

* pause_badges_draw_contents

* pause_items

* pause_partners

* pause_spirits

* pause_map

* pause_gfx and pause_styles

* fixing warnings

* fixed all warnings

* bss

* rename bss fields

* make static from bss

* renaming global vars

* finish

* small fix

* PR suggestions
2022-02-09 03:24:51 +09:00
JoshDuMan
348d12c4e3
Match some more Libultra (#639) 2022-02-08 14:05:20 +00:00
JoshDuMan
9394e1ee21
Match phys_peach_update (#638) 2022-02-02 17:19:52 +00:00
JoshDuMan
e1766601f8
Match 50 functions in Libultra (#636)
* Fix script disasm

* Stuff

* Work on libultra

* More Libultra Work

* My Libultra work for now

* Fix all OS warnings

* fix gitignore
2022-01-31 20:40:55 +09:00
Ethan Roseman
96e85f4da1
SFX funcs, configure fix (#635)
* SFX funcs, configure fix

* the actual rename (oops)
2022-01-31 19:10:02 +09:00
Ethan Roseman
d2da25dc10
GCC 2.7.2 support (#633)
* 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

* attack_result_text

* PR stuffs

* numbaz

* Attempt to get 2.7.2 support working

* Update Jenkinsfile

* try

* fix

* fix issues

* remove KMC_ASM remnants

* NON_EQUIVALENT for the effect gfx func

* We don't need wine
2022-01-29 10:01:26 +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
ee0918018d
Match get_overriding_player_anim (#631) 2022-01-24 13:51:48 +00:00
Alexander Faßbender
4ef25a394d
Decompile and dedupe dead funcs (#621)
* decompile several dead functions and dedupe some alive counterparts

* .

* dedupe UnkNpcAIFunc46

* resolve issues

* Fix warnings

* .

* PR comments

* clean

* anim IDs

Co-authored-by: Ethan Roseman <ethteck@gmail.com>
2022-01-21 14:54:46 +09:00
JoshDuMan
3de396c043
Match 2 funcs in 77480.c (#630)
* update_player_blink

* Delete update_player_blink.s

* Delete check_for_conversation_prompt.s

* Match check_for_conversation_prompt

* Update variables.h

* Update 77480.c

* Warnings
2022-01-20 22:46:12 -05:00
Ethan Roseman
3bd5a9d91e
Goods and Services (misc decomp PR from eth number 335) (#629)
* an end func

* 2nd segment bss file added

* hud_element work

* some renaming, set_hud_element_scale

* 2 hud_element funcz

* remove more unneeded undefined_syms

* bss 3, PR comments

* fx_134

* func_80200080

* 4 funx

* fix shtuff

* a func

* create_actor

* func_80263064

* initialize_battle, some stuff, and cleanup

* clean

* NL
2022-01-20 22:08:24 +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
JoshDuMan
b87012a0da
Match two functions in 23680.c (#624)
* Match 2 func's

* Delete func_800496B8.s

* Delete func_800490B4.s

* unk_AC

* Change func_800490B4 type

* comments
2022-01-16 22:32:17 +09:00
HailSanta
4e33a016eb
struct renaming and trigger/entity cleanup (#623)
* rename static structs to blueprint

* evt structs renamed

* renamed HudElementAnim to HudScript, worked on triggers

* fix Trigger/TriggerBP fields and entity cleanup

* entity data cleanup 1

* block

* blue warp pipe

Co-authored-by: HailSanta <Hail2Santa@gmail.com>
2022-01-16 22:28:09 +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
Unnunu
5f05525446
match raycast functions (#620)
* npc_raycast_down

* npc_raycast_down_ahead

* npc_raycast_down_sides

* npc_raycast_up

* npc_raycast_up_corner

* npc_raycast_up_corners

* npc_test_move_complex_with_slipping

* player_raycast_down

* player_raycast_up_corners

* decomp 3 funcs

* player_test_move_without_slipping

* player_test_move_with_slipping

* match player_test_move_with_slipping

* clean up code

* fix param names

* remove space

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

Co-authored-by: Alex Bates <hi@imalex.xyz>
2022-01-15 03:09: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
Ethan Roseman
e60e5fccd1
BSS round 2, hud_element.c funcs (#613)
* an end func

* 2nd segment bss file added

* hud_element work

* some renaming, set_hud_element_scale

* 2 hud_element funcz

* remove more unneeded undefined_syms

* bss 3, PR comments
2022-01-11 03:25:06 +09:00
Unnunu
486dbfda39
Match status_icons (#612) 2022-01-10 15:55:26 +00:00
Unnunu
559007d861
Match collision functions (#609)
* match allocate_hit_tables

* load_collision

* load_hit_data

* parent_collider_to_model

* update_collider_transform

* test_up_ray_collider

* test_ray_triangle_general

* test_down_ray_triangle

* test_up_ray_triangle

* test_ray_colliders

* test_ray_zones

* test_ray_entities

* func_8005DB00

* rename everything

* follow codyng style

* fix

* PR suggestions

* remove p prefix

Co-authored-by: Sergey Zorkin <szorkins@gmail.com>
2022-01-08 19:11:20 +09:00
JoshDuMan
5d5106b39c
Work on Pointers (#610) 2022-01-08 14:47:52 +09:00
JoshDuMan
d684991270
Disassemble TRD Part 1 Battle Map (#607) 2022-01-08 14:43:11 +09:00
Alex Bates
64c0b7de02
Avoid _VA_LIST_ in EVT_CALL (#611)
Fixes a weird compile error on precomp
2022-01-07 23:01:22 +00:00
JoshDuMan
03c60ee7c5
Improve disasm_script.py and do some sample scripts (#606) 2022-01-06 11:32:57 -05:00
Ethan Roseman
ccd3b17322
World Decomp & Dedupe (#604)
* two new funcs

* UnkFunc53

* more cleanup & dedupe

* UnkEffect0FFuncs

* tst funcs

* anotha one

* UnkNpcAIFunc42

* UnkNpcAIFunc43

* UnkNpcAIFunc44

* UnkNpcAIFunc45

* UnkNpcAIMainFunc4

* UnkNpcAIMainFunc5

* UnkNpcAIMainFunc6

* warnings
2022-01-06 22:40:01 +09:00
HailSanta
acf6b92313
more fields and name consistency (#603)
* npc fields

* npc and actor naming

* missing hit sounds + naming consistenct

* added partner syms and player spin struct

* requested changes

* organized Vec structs

Co-authored-by: HailSanta <Hail2Santa@gmail.com>
2022-01-05 20:05:49 +09: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
55228bd3a7
Fix a few warnings (#601)
* .

* Externs

* Fix a few warnings

* __osGetCause

* Comment

* Ethan
2022-01-04 02:36:01 +09:00