Commit Graph

2098 Commits

Author SHA1 Message Date
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
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
Alexander Faßbender
26679ce499
Cleanup charge moves (#542) 2021-12-04 14:00:24 +00: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
Mr-Wiseguy
44999f1a38
Cleaned up some code related to u32->f32 casts (#539) 2021-11-26 01:10:00 +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
Alto1772
fa892a40de
replaced commented out with if-0s (#529)
* replaced commented out with if-0s

* remove commented out map funcs

* ifdef non-matching

* use NON_EQUIVALENT instead
2021-11-18 21:41:03 +09:00
Ethan Roseman
38249a8967
Propose new stuff for ifdefs (#534)
* propose new stuff for ifdefs

* oopth

* Update CONTRIBUTING.md
2021-11-18 00:42:27 +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
JoshDuMan
54242fd671
Update .clang-tidy (#533) 2021-11-16 17:03:38 +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
Alexander Faßbender
81d3abc7a4
. (#527) 2021-11-12 21:19:10 +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
Alexander Faßbender
be4bb17dee
Update flags and enums in enums.h (#525)
* prepare enums.h

* update enums.h

* add commits to enums.h

* resolve enum and flag issues with enums.h

* delete artifacts

* resolve issue with soundid enum

* :P

* setup first few parameterised flag enums

* add flags to npc.h related structs

* add flags to npc.h related structs

* create enums for several common structs

* .

* resolve issue with enum sizes

* resolve issue with enum sizes

* resolve issue with enum sizes

* parameterise entity and event related flags

* update enums.h

* add commits to enums.h

* resolve enum and flag issues with enums.h

* delete artifacts

* resolve issue with soundid enum

* :P

* setup first few parameterised flag enums

* add flags to npc.h related structs

* add flags to npc.h related structs

* create enums for several common structs

* .

* resolve issue with enum sizes

* resolve issue with enum sizes

* resolve issue with enum sizes

* parameterise entity and event related flags

* .

* Update 190B20.c

* Update enums.h
2021-11-11 13:30:59 +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
Alex Bates
a7caa90d28
Add descriptions to all map headers (#515)
* remove bad create_actor declaraton

* maps.py

* area name

* add doc names for all maps

* rm maps.py
2021-11-01 22:22:40 +09: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
Lightning
9764f4d44f
Changes required to prevent kmc compiler from using debugging (#514)
as it inserts extra instructions at the moment
2021-11-01 10:26:58 +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