Commit Graph

319 Commits

Author SHA1 Message Date
HailSanta
13a2f40f2a
Update GameStatus fields (#595)
* renamed a few fields in game status

* created constant for MAX_GAME_TIME

* names for rumble funcs

* suggested changes

* created sound out enum

* function naming test

* actorClass consistent name

* water block effect field

* battle_status fields

Co-authored-by: Clover <cloverhax@gmail.com>
2022-01-03 18:56:30 +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
JoshDuMan
de651a7efb
D_80000000 -> 0x80000000 (#599) 2022-01-02 04:07:25 -08:00
JoshDuMan
5962ce37fd
Disassemble KMR 2 Battle (#597) 2022-01-01 08:08:04 -05:00
Ethan Roseman
5a5d158920
"fix" overlay stuff (#594) 2021-12-30 23:30:23 +09:00
JoshDuMan
781472bf4f
Fix some non-matchings (#591) 2021-12-30 20:58:35 +09:00
Ethan Roseman
3f946f9f72
The Great Deduplication (50%) (#590)
* UnkNpcAIFunc37

* UnkNpcAIFunc38

* UnkNpcAIFunc39

* UnkNpcAIMainFunc2

* PR comments
2021-12-30 20:54:26 +09:00
Ethan Roseman
5cb9183779
Effects, includes (#589)
* effect_13

* effect_14

* most of effect_15

* clean, standardize effects

* fx_16 wip

* UnkNpcAIFunc35

* includes

* UnkPosFunc2

* UnkNpcAIFunc36

* PR comments
2021-12-30 14:14:55 +09:00
JoshDuMan
bd56f6060f
Decomp Some Libultra (#588)
* Work on KMC Libultra

* libultra decomp

* fix
2021-12-29 15:14:20 -05:00
JoshDuMan
7f1c1351f2
Match actor_api.c (#585)
* Decomp 3 197F40 functions

* 2 more

* oops

* 3 more

* Match the last of actor_api.c

* comments
2021-12-29 21:22:01 +09:00
Rainchus
2f7a1c72af
Decomp some player render functions (#581)
* 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
2021-12-29 13:09:19 +09:00
Zelllll
8dcb7f1ba9
Name and document frame buffer copy/filter functions (#587)
* Name and document frame buffer copy/filter functions

* 0/1 naming of variables to match pass 0 and pass 1
2021-12-28 20:29:24 -05: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
JoshDuMan
69e1a012bd
Partner Script Disassembly (#577)
* frogress

* kooper data

* More Work

* Bombette, Sushi, Parakarry Scripts

* Finish wPartners work.

* Partner BSS
2021-12-28 21:44:31 +09:00
Ethan Roseman
15b6cb398c
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
2021-12-28 20:43:24 +09:00
Rainchus
33457751e2
decomp appendGfx_player, fix warnings in 77480.c file (#572)
* decomp appendGfx_player, fix warnings in 77480.c file

* small style fixes

* fix action state enum and make use of enum
2021-12-27 22:00:13 -05:00
JoshDuMan
fe374e5fb1
Match func_802552EC (#573)
* Match func_802552EC

* Delete func_802552EC.s

* Clean-up

* actor

* Update functions.h

* oops

* Match update_actor_shadow
2021-12-27 21:55:35 -05:00
JoshDuMan
2f23f46775
Match func_802549F4 (#571)
* Match func_802549F4.

* Delete func_802549F4.s

* Match func_80254C50

* s8

* Delete func_80254C50.s

* Update functions.h

* s8 again

* Trying out github.dev

* Fix build?

* Match func_802550BC
2021-12-26 20:29:29 +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
Alto1772
be35cf4fc9
split rsp ucode (#560)
* define rspboot

* define rspaudio and f3dex2

* some changes as requested
2021-12-25 01:32:52 +09:00
Alex Bates
585c0dc428
Name and document btl_init_menu_* funcs (#567)
* btl_init_menu_*

* https://c.tenor.com/D0mk5R5x1G8AAAAC/cat-fat-cat.gif
2021-12-24 23:21:03 +09:00
JoshDuMan
f940e6188c
Match enable_actor_blur (#566)
* Match enable_actor_blur

* Delete enable_actor_blur.s

* resolve issues

Co-authored-by: Brotenko <brotenko@gmail.com>
2021-12-24 23:09:03 +09:00
JoshDuMan
dc3a45ee4a
Name load_script.c (#565)
* Update splat.yaml

* Rename 1967B0.c to load_script.c
2021-12-24 22:47:30 +09:00
JoshDuMan
4ccbccbe7d
Match filemenu_set_cursor_goal_pos (#559)
* Match filemenu_set_cursor_goal_pos

* Delete filemenu_set_cursor_goal_pos.s

* Update 163400.c

* [0]

* [0]

* Match filemenu_update_cursor

* Delete filemenu_update_cursor.s

* Cleanup

* new line
2021-12-23 00:39:54 +09:00
JoshDuMan
6e062b19d8
Disassemble and format DGB data. (#558)
* Dissamble data.

* Fix warnings and format data
2021-12-22 23:59:52 +09:00
JoshDuMan
bc7899aaef
Match four functions in 20ec0_len_5040.c (#555)
* Match 4 functions.

* Delete func_80047A30.s

* Delete func_80047928.s

* Delete func_80047820.s

* Delete func_800477F4.s
2021-12-18 18:58:00 +09:00
JoshDuMan
0b4d9252c1
Many func's in 20ec0_len_5040.c (#554)
* Start working matching 20ec0_len_5040.c

* Update 20ec0_len_5040.c

* Delete enable_status_1.s

* Delete enable_status_2.s

* Delete enable_status_3.s

* Delete enable_status_4.s

* Delete enable_status_icon_boost_hammer.s

* Delete enable_status_icon_boost_jump.s

* Delete enable_status_icon_boost_partner.s

* Delete enable_status_icon_danger.s

* Delete enable_status_icon_peril.s

* Delete enable_status_icon_surprise.s

* Match remove_status_ func's (#9)

* Fix build (#10)

* Match 6 more (#11)

* create_status_icon_boost_hammer

* Comments

* StatusIconFlag
2021-12-17 23:09:33 -05:00
JoshDuMan
2b6323a6b2
Match check_for_interactables (#553)
* Match check_for_interactables

* Delete check_for_interactables.s

* Update enums.h

* unk_C8 -> Npc*

* Update 77480.c

* Update 77480.c

* Update 77480.c

* Update 77480.c

* Update 77480.c (#7)

* Update functions.h

* Merge branch 'master' of https://github.com/pmret/papermario into arn

* Fix build.

* Update src/77480.c

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

* Comments

Co-authored-by: Alex Bates <hi@imalex.xyz>
2021-12-17 23:04:54 -05:00
Ethan Roseman
9e1d4db698
First overlay's BSS symbols moved to C (#551)
* 2 fold funcs

* func_8013B1B0

* cleanup & naming

* more formatting

* cleanup

* progress & filemenu stuff

* 2

* func_8013CFA8

* fold_load_gfx (thanks Wiseguy)

* update_encounters_pre_battle

* 3 mdl funcs

* more model funcs

* cd180 funcs

* progrezz

* 3 cam funcs

* more

* 1 more

* eob30 progress

* sfx_play_sound_at_position & sound enum cleanup

* cleanup

* cleanup2

* PR comments

* BSS migrated to C for the first overlay

* rename

* PR comments
2021-12-16 17:33:47 +09:00
Alexander Faßbender
967427ba97
Decomp misc funcs (#546)
* decomp misc funcs

* cleanup on MakeShop and initial work on ShowShopOwnerDialog

* match ShowShopOwnerDialog

* decomp misc funcs

* cleanup on MakeShop and initial work on ShowShopOwnerDialog

* match ShowShopOwnerDialog

* resolve issues

* resolve warnings

* Update src/world/script_api/7E0E80.c

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

Co-authored-by: Alex Bates <hi@imalex.xyz>
2021-12-15 20:12:43 +01:00
Alexander Faßbender
bbed111c28
Update migrate_data_to_c including some migration (#550)
* optimize migrate_data_to_c.py and do some data migration as a test

* .

* spacing

Co-authored-by: Ethan Roseman <ethteck@gmail.com>
2021-12-15 16:02:33 +01:00
Ethan Roseman
7230c62545
Appetizer sampler (#547)
* 2 fold funcs

* func_8013B1B0

* cleanup & naming

* more formatting

* cleanup

* progress & filemenu stuff

* 2

* func_8013CFA8

* fold_load_gfx (thanks Wiseguy)

* update_encounters_pre_battle

* 3 mdl funcs

* more model funcs

* cd180 funcs

* progrezz

* 3 cam funcs

* more

* 1 more

* eob30 progress

* sfx_play_sound_at_position & sound enum cleanup

* cleanup

* cleanup2

* PR comments
2021-12-13 18:27:28 +09:00
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
JoshDuMan
cf8f817af2
Match check_for_ispy and check_for_pulse_stone (#544)
* Match check_for_ispy

* Delete check_for_ispy.s

* Match check_for_pulse_stone

* Delete check_for_pulse_stone.s

* Update 77480.c

* Update 77480.c

* Update variables.h

* Update variables.h
2021-12-04 23:23:12 +09:00
JoshDuMan
72b2e593f6
Match func_8026EBF8, LoadFreeItemScript, and LoadItemScript (#543)
* Match func_8026EBF8

* Delete func_8026EBF8.s

* Match LoadItemScript

* Delete LoadItemScript.s

* Document more of DecorationTable

* Fix warning.

* Comments

* Comments

* Match LoadFreeItemScript

* Delete LoadFreeItemScript.s

* doublke

* Alex GOAT

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

Co-authored-by: Alex Bates <hi@imalex.xyz>
2021-12-04 13:34:49 +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
Rainchus
89b21600b1
match functions in world partner files for lakilester, watt, sushie (#536)
* 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

* requested style changes

* couple more style changes

* last style changes
2021-11-19 23:39:57 +09: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
ThreeMustyFears
7a95f21a17
Match some 16F740 funcs (#532)
* update enums and functions

* match a couple of funcs

* run coverage.py

* some initial cleanup

* missed something

* requested changes

* remove space

* more changes

* aligned enum

Co-authored-by: ThreeMustyFears <>
2021-11-17 23:43:50 +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
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
JoshDuMan
e9dd00e871
Match StartBossBattle (#526)
* Match StartBossBattle

* Delete StartBossBattle.s

* Remove unneeded temp

* eth debugging

* debug2

* d3bug

* oopth

* d6bug

* d7bug

* revert

* Update encounter_api.c

Co-authored-by: Ethan Roseman <ethteck@gmail.com>
2021-11-11 17:24:36 +09:00
Lightning
90c0d29bf9
match _heap_realloc (#524)
* match _heap_realloc

* Minor code cleanup
2021-11-11 13:38:52 +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
Technoman
97e67dc61c
Match RemoveActorDecoration, AddActorDecoration, GetDistanceToGoal (#513)
* Match AddActorDecoration & RemoveActorDecoration

* Match GetDistanceToGoal

* Delete AddActorDecoration.s

* Delete GetDistanceToGoal.s

* Delete RemoveActorDecoration.s

* Update RemoveActorDecoration

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

* Update AddActorDecoration

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

* Update GetDistanceToGoal

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

* Update GetDistanceToGoal

Co-authored-by: Alexander Faßbender <31699028+Brotenko@users.noreply.github.com>
2021-11-01 17:14:07 +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
Technoman
a9b8afe9ff
Match CreatePartShadow & RemovePartShadow (#511) 2021-10-31 13:57:57 +00:00
JoshDuMan
14d3ac1aaa
Match check_conversation_trigger (#508)
* Match check_conversation_trigger

* Delete check_conversation_trigger.s

* Address comments

thanks alex

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

Co-authored-by: Alex Bates <hi@imalex.xyz>
2021-10-31 00:02:01 -04:00
Alex Bates
a8c85b377a
Share 1370.c across versions (#509)
* split jp gfxRetrace_Callback

* func_80025F70

* use 1370_len_7d0 on jp

* rename 1370_len_7d0 to main

* coverage.py
2021-10-31 03:53:55 +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
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
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
Lightning
fb74314a6d
Debug in elf (#491)
* git subrepo pull (merge) --force tools/splat

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

* Allow storage of extra debug info in elf

* Fix string

* Add comment detailing purpose of genobjcopy
2021-10-25 23:26:38 -04: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
JoshDuMan
8f7aadc176
Match state_step_battle (#492)
* Match state_step_battle

* Delete state_step_battle.s

* v

* cleanup & fix build err

Co-authored-by: Ethan Roseman <ethteck@gmail.com>
2021-10-25 20:53: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
149b764045
Match GetStatusFlags (#484)
* Match GetStatusFlags

* Delete GetStatusFlags.s

* Update 197F40.c

* Address Alex's comments
2021-10-20 20:45:35 +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
Gota7
936261657f
Match various (dead) code (#469)
* Match some functions in EB1170

* Code style fixes

* Match various (dead) code

* Don't edit gitignore

* Clean up PR

* More PR fixes

* PR fixes
2021-10-14 00:14:50 -04: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
JoshDuMan
b1989c4f0c
Match two si.c functions (#466)
* Match evt_handle_print_debug_var, kinda

* Delete evt_handle_print_debug_var.s

* Update comment.

* Address comment

* Match evt_get_variable

* Delete evt_get_variable.s

* Remove ;;;

* Address Ethan's comment
2021-10-11 15:53:15 +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
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
Gota7
62082fb3d4
Match some functions in EB1170 (#460)
* Match some functions in EB1170

* Code style fixes
2021-10-10 12:09:19 +09: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
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
JoshDuMan
54a37aa105
Match VirtualEntityJumpTo (#461) 2021-10-05 01:44:29 +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
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
Ethan Roseman
4c787f68c1
Effect_6 done, splat, diff updates (#451)
* 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
2021-09-30 18:48:03 +09:00
JoshDuMan
3f468d79b4
Match get_map_IDs_by_name (#448)
* Match get_map_IDs_by_name

* Delete get_map_IDs_by_name.s

* Update world.c
2021-09-30 12:17:52 +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