Commit Graph

2419 Commits

Author SHA1 Message Date
HailSanta
aee5626e5b
world AI (#701)
* monty mole AI pt 1

* monty mole AI #2

* enum values for evt priority and flags

* enemy ai flags

* done monty mole + partner enums

* removed union for partner action state

* missed parter action states + cam move flags + entity collision bit

* basic ai

* piranha plant stuff

* attack ahead

* consistent hitbox names

* idk

* organized piranha plant

* delete matches

* start fuzzy

* naming

* bzzap pt 1

* bzzap 2

* bzzap names done

* rename bzzap to flyingAI

* complete flying names

* done for today

* file reorganizing

* world AI

* starting clubba dedupe

* suggested changes

* bullet bills

* sentinel start

* dedupe sentinel complete

* sentinel AI done

* melee ai organization

* piranha plant dedupe

* resolved some bad dead syms

* patrol start

* patrol AI almost done

* enough

* more ai work

* clean up clubba ai enum

* dedupe all clubbae

* started cleft extraction

* ready to dedupe cleft

* dedupe one cleft

* iwa_04

* iwa_01

* iwa_02

* ai state file reorganization

* enemy anim enum

* extracted shy guy

* dedupe shy guy ai

* shy guy patrol ai

* done shy guy ai dedupe

* added NON_MATCHING wrap

* ai etc

* more dead ai

* most dead ai merged with living

* lakitu etc

* paratroopas

* fix warnings

* fix other warning

* ParatroopaAI

* lakituAI parameter fix

* dead_flo_13 debug strings

* misc map matches

* flying magikoopa start

* name npc field

* lungeAI renamed to tackleAI

* magikoopa ai foothold

* extrated one magikoopa

* starting clubba dedupe

* addressed PR comments

* consolidated magikoopa helper funcs

* misc map stuff

* flying magikoopa dedupe

* zipline funcs

* delete matched

* grind out another 0.05%

* started letter delivery dedupe

* more delivery dedupe

* special delivery

* rest of letter delivery

* slight delivery reorg

* delivery func names

* cleft doc start

* name enemy field

* more renamins

* unk_28.f

* changed field names to facilitate renaming

* done cleft cleanup

* hopping ai

* cleanup some ai

* name field + patrol reorg

* filled out NpcAISettings fields

* assembling ai includes

* elimated state files

* remove X32 for alertOffsetDist

* removed other NpcAISettings union

* new NpcAISettings for UnkAI_4

* stationary AI cleanup

* smalls

* 0 new warnings

Co-authored-by: HailSanta <Hail2Santa@gmail.com>
Co-authored-by: Ethan Roseman <ethteck@gmail.com>
2022-04-29 13:32:16 +09:00
Kevin Klions
e85761f7ad
tik_05 functions (#699)
* matched func_802DE748, thanks stuckpixel

* revert changes made while experimenting

* matched func_8024093C_8756FC

* deleted func_802DE748 assembly

* fixed some small things

* fixed access to ptrReadPosition in func_8024093C_8756FC

* removed random whitespace

* small changes

* match

Co-authored-by: Ethan Roseman <ethteck@gmail.com>
2022-04-22 01:07:22 +09:00
ThreeMustyFears
80f5e18fc9
Match calc player damage enemy (#698)
* match calc_player_damage_enemy

* run coverage

* changes

Co-authored-by: ThreeMustyFears <>
2022-04-19 03:03:12 -04:00
Kevin Klions
13cc6f46e5
func_80240790_BBD930 (#697)
* matched func_80240790_BBD930

* removed unncessary variables

* deleted matched assembly function

* changes from comments

* fixed
2022-04-19 02:15:33 +09:00
Unnunu
d33a2407df
Audio stuff (#696) 2022-04-18 16:38:47 +01:00
ThreeMustyFears
41108b78b5
Match calc partner damage enemy (#695)
* match calc_partner_damage_enemy

* run coverage

* some var name changes

* remove typedef from enum

* fix warning

* remove casts

* saw a target flag in a comment

* Assert and script enums

Co-authored-by: ThreeMustyFears <>
2022-04-18 17:56:44 +09:00
HailSanta
cfe089af10
monty mole AI + various enums (#694)
* monty mole AI pt 1

* monty mole AI #2

* enum values for evt priority and flags

* enemy ai flags

* done monty mole + partner enums

* removed union for partner action state

* missed parter action states + cam move flags + entity collision bit

Co-authored-by: HailSanta <Hail2Santa@gmail.com>
2022-04-18 00:36:37 +09:00
HailSanta
0ef8c71bdb
combining various AI and item check imports (#692)
* aggregating AI includes

* workin on AI funcs

* fix

* misc

* ongoing lock dedupe

* item choices

* so many item choices

* dead item choices

* deleted matches

Co-authored-by: HailSanta <Hail2Santa@gmail.com>
Co-authored-by: Ethan Roseman <ethteck@gmail.com>
2022-04-15 12:28:49 +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
theRealBatman189
17c09c34e9
More world functions (#689)
* functions in tik

* Fixed suggestions and a few more functions completed

* quick fixes

* EncounterStatus

* Fixed current issues

* Merge branch 'master' of https://github.com/theRealBatman189/papermario

* Functions for trd

* fixed issues
2022-04-13 07:54:16 +09:00
alex
5718fa67fa
Merge old alex branches (#691)
* D_80283D98

* add tools/migrate_data_to_c.py

* add .byte support

* jic

* update count_power_plus
2022-04-12 20:23:49 +09:00
HailSanta
8d730c5c50
isolated chuck quizmo (#685)
* toad house

* push blocks

* requested cleanup

* quizmo 1

* dro_01, dro_02, hos_03, jan_02

* quizmo jan_03

* kmr_02 quizmo

* quizmo area_mac

* quizmo functions aggregated

* remove functions no longer needed

* cleanup

* cleanclean

* quizmo started data

* quizmo data half done

* nearly done

* fix mislabeled data in dgb_01

* fix QuizRequirement struct

* isolate give item code

* deconflict varstash data name with varTable fields

* misc quizmo cleanup

* quizmo done

* fix file with invalid symbols

* PR comments

Co-authored-by: HailSanta <Hail2Santa@gmail.com>
Co-authored-by: Ethan Roseman <ethteck@gmail.com>
2022-04-12 15:01:58 +09:00
Rainchus
93d8c4989b
More overworld partner functions and other various functions (#680)
* 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

* decomp 2 funcs in throw_spiny.c

* throw_spiny_appendGfx

* match spiny throw.c and remaining kooper overworld functions

* cleanup throw_spiny.c and decomp spin.c

* combine variable declarations in spin.c

* run coverage.py

* more spin.c cleanup

* req changes

Co-authored-by: Ethan Roseman <ethteck@gmail.com>
2022-04-12 10:59:20 +09:00
Ethan Roseman
d6ac1a490b
Map De-doop (#688)
* various

warningz

* map stuff

* UnkPhysicsFunc

* UnkModelMatrixFunc

* UnkModelMatrixFunc2

* UnkAtan2Func

* UnkGooberFuncs

* GetPeachDisguise
2022-04-12 03:32:54 +09:00
theRealBatman189
9cb873b1c0
functions in tik (#686)
* functions in tik

* Fixed suggestions and a few more functions completed

* quick fixes

* EncounterStatus

* Fixed current issues
2022-04-12 03:26:28 +09:00
alex
2b28074f94
Add include/mapfs/ headers (#687)
* add include/mapfs/

* use model names for some battle stages

* name stage fields

* area_iwa
2022-04-12 00:03:16 +09:00
Ethan Roseman
3a28a3f505
Physics (#682)
* various

* collision_main_lateral

* phys_adjust_cam_on_landing

* phys_main_collision_below

* 77480.c dun

* 7fd10 funcs

* 7bb60 funcs

* warningz

* map stuff

* PR comments
2022-04-11 15:34:35 +09:00
HailSanta
5f47e1291f
Santas-workshop -- toad houses and push blocks (#681)
* toad house

* push blocks

* requested cleanup

* clean

Co-authored-by: HailSanta <Hail2Santa@gmail.com>
Co-authored-by: Ethan Roseman <ethteck@gmail.com>
2022-04-10 17:37:13 +09:00
HailSanta
42355f53c2
Santas Super Blocks (#677)
* misc msg etc

* super blocks 1

* super blocks 2

* super block dedupe

* super blocks x

* super block isolated

* one dead super block func left

* dead maps fixed

* remove unnecessary funcs

* merged includes for pipes

* pipe data and EVT_GROUP enum

* fixed dead

* fix warnings

Co-authored-by: HailSanta <Hail2Santa@gmail.com>
Co-authored-by: Ethan Roseman <eroseman@basistech.com>
2022-04-08 15:10:12 -04:00
ThreeMustyFears
9c5f34a61e
Match parakarry func (#678)
* match parakarry func

* run coverage

* fix warning

Co-authored-by: ThreeMustyFears <>
2022-04-08 14:30:01 -04:00
Ethan Roseman
4555d9fab5
StashVars (#679)
* beginnings

* more

* done

* cleanup

* remove sublist.txt
2022-04-08 14:25:49 -04:00
Ethan Roseman
29acf47328
_update_message (#676) 2022-04-07 16:51:21 +09:00
HailSanta
2d26e6dc95
merged texture pan includes (#675)
Co-authored-by: HailSanta <Hail2Santa@gmail.com>
2022-04-07 16:41:39 +09:00
Ethan Roseman
02d678b543
Npc funcs, fio.c, and others (#674)
* filemenu_choose_name_handle_input

* filemenu_choose_name_init

* filemenu_main_handle_input

* update symbol_addrs

* filemenu_draw_contents_copy_arrow

* cleanup

* dusting

* npc funcs

* fio.c finished

* Cleanup

* warnings

* Cleanup + SaveDataHeader struct

* re-add decl
2022-04-05 21:53:40 +09:00
HailSanta
b7f7e4c96d
Santas workshop (matched area_mgm) (#673)
* mgm_01 start

* strange issue

* blah

* rodata fix

* done with mgm_01 + misc cleanup

* almost done mgm

* minor issues with last 3 functions

* match help

* mgm code done

* proper msg pal usage

* fix warnings

* fix more warnings

* ive been warned

* requests

* area_kgr

* battle cam symbol names

* msg cleanup work

Co-authored-by: HailSanta <Hail2Santa@gmail.com>
Co-authored-by: Ethan Roseman <ethteck@gmail.com>
2022-04-05 18:52:06 +09:00
Ethan Roseman
d0a7655779
Various dompin (#672)
* partner funcs

* land.c

* filemenu_update

* 190A10.c

* hammer.c dun

* prog rock

* various funcs

* moving

* update_item_entities

* filemenu_yesno_handle_input

* cleanin

* sweeping

* PR comments
2022-03-30 21:07:13 +09:00
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
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
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
55a849a50a
De-duplicate more UnkNpcAIMainFunc occurrences (#659) 2022-03-10 19:11:34 +09:00
Ethan Roseman
9cd911765d
File menu & more (#658) 2022-03-10 09:55:38 +00:00
Ryan Myers
395ca16da6
Update progress-jp badge to the correct URL (#657)
Just happened to notice this and figured I'd suggest the change.
2022-03-04 01:12:20 +09: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
JoshDuMan
32d2fde8e4
Match func_8004C444 (#648)
* Match func_8004C444

* Update audio.h

* Delete func_8004C444.s

* Update audio.h

* Ethan

* UnkAl48

* Update 26840_len_20d0.c
2022-02-18 02:02:55 +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