Commit Graph

2682 Commits

Author SHA1 Message Date
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
JoshDuMan
4c90997d54
Match GetEntryCoords (#605)
* Match GetEntryCoords

* ()
2022-01-06 21:03:02 +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
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
Alexander Faßbender
76c7e51f4a
Update and move tools (#596)
* update scripts and move outdated ones to /old/

* updates

* resolve issues
2022-01-02 13:10:49 +01: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
alex
3c2bd694e5
update star_rod_idx_to_c.py for battle formations 2021-12-30 14:22:44 +00:00
Ethan Roseman
0bba296295
add gcc-multilib to ubuntu dependencies 2021-12-30 21:40: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
Alexander Faßbender
70c2c679a4
Introduce SPRITE_PIXEL_SCALE (#580) 2021-12-28 12:52:32 +00: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
Alexander Faßbender
3428ae1941
Convert DSL scripts into macro syntax (#570)
* convert half the workload of DSL scripts into macro syntax

* convert more DSL scripts to macro syntax
2021-12-25 02:09:06 +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
Alexander Faßbender
f82f699188
DSL Script conversion (#562)
* start converting scritps to new syntax

* convert old DSL scripts to new format

* update disasm_script and disasm more DSL scripts

* .

* .

* resolve issues

* add EVT_PTR() to GotoMap calls
2021-12-24 14:29:05 +01:00
Alexander Faßbender
6667a4288f
update disasm_script to use current (#561) 2021-12-23 13:16:12 +01: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
Alexander Faßbender
dbde606a86
calc_item_damage_enemy (#549)
* setup function

* cleanup parts of calc_item_damage_enemy

* .

* .

* .

* resolve issues

* set function as NON_MATCHING

* npc flags

* resolve issues

* .

* Update include/enums.h

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

* Update 17FEB0.c

Co-authored-by: Alex Bates <hi@imalex.xyz>
2021-12-21 23:12:59 +01:00
JoshDuMan
a5340e8dce
Fix many warnings. (#557)
* Fix many warnings.

* Fix more warnings.

* More warnings

* Some more warnings

* Last fixes and address comments

* ehtan
2021-12-21 00:59:25 +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
Ethan Roseman
731d270014
Fuse symbol_info with disasm_script so you can give it symbols (#552) 2021-12-15 19:27:26 -05: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
Alexander Faßbender
c719faf847
Create simple data "migration" script (#548)
* setup function

* cleanup parts of calc_item_damage_enemy

* init data2c

* clean up data2c.py

* .

* rename and update script to have additional functionality

* .
2021-12-12 22:53:19 +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