Commit Graph

2451 Commits

Author SHA1 Message Date
Ethan Roseman
ec0ae12540
Partner, map, engine funcs (#736)
* phys_should_player_be_sliding
* functions from brotenko
* UnkTrigFunc001
* trd_05
* IsPartnerXXX funcs
* nok funcs
2022-06-26 11:21:38 +01:00
Ethan Roseman
0785fc6f93
Tiny funcs & cleanup & entity (#735)
* baby funcs for ethy

* progress on pause_stats_draw_contents

* a5dd0 work + cleanup

* almost create_entity

* cleanup

* some funcz

* btl_show_message_popup (thanks Unnunu\!)

* more

* more cleen

* PR comments
2022-06-17 18:21:13 +09:00
JaThePlayer
d1fb0597af
More functions, some from Brotenko (#734)
* More functions, some from Brotenko

* Matched the unmatched
2022-06-17 15:14:21 +09:00
Ethan Roseman
e39f5874f6
Overlay 2 bss reorg (#733)
* cleanup + almost done with _use_partner_ability

* _use_partner_ability and bss bonanza

* gCameras fix

* cleanup

* cleanup
2022-06-14 01:34:22 +09:00
JaThePlayer
d65d58af35
Mystic Miscellaneous Matches (#732)
* Some random functions

* fixed a flag, oops

* classic coverage.py blunder

* Fixed the warning + style changes

* More warning fixes

* Remove the NON_EQUIVALENT wrapper
2022-06-14 00:00:53 +09:00
Unnunu
e324092e0a
entity models and some gfx functions (#731)
* decomp 7 functions

* match func_80138E54

* matched render_transition_stencil

* renames

* fix warnings

* fix two warnings
2022-06-13 02:22:06 +09:00
Ethan Roseman
bae34c46ed
Upgrade to splat 0.9.0 (#730)
* changes for splat 0.9.0

* wip

* git subrepo pull --branch=develop --force tools/splat

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

* OK

* big_snowflakes gfx data

* Jenkins?

* cleanup

* debuff effect gfx data

* fix

* more effect gfx data

* dlabel

* git subrepo pull --branch=experiment --force tools/splat

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

* .

* git subrepo pull --branch=experiment --force tools/splat

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

* flower splash/trail gfx

* throw_spiny gfx

* disable_x and butterflies gfx data

* draw_coin_sparkles

* Warnings, cleanup

* cleanin

* attempt at test_item_player_collision

* more gfx + cleanup

* more effect gfx

* func_8002D160

* update update_symbol_addrs and symbol_addrs

* git subrepo pull --branch=develop --force tools/splat

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

* git subrepo pull --branch=master --force tools/splat

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

* fix

* fix regression

* Add rabbitizer to requirements

* warnings

* symbol_addrs fixes
2022-06-13 00:33:32 +09:00
Unnunu
763b320bfb
b_area_omo2 (#729) 2022-06-12 15:44:36 +01:00
HailSanta
a335b73d0a
misc-functions (#728)
* misc stuff

* ShowEmote

* finish fx_api + replacing sound enum values

* load_path_data

* requested fixes

* vertex data extracted

Co-authored-by: HailSanta <Hail2Santa@gmail.com>
2022-06-11 03:06:12 +09:00
HailSanta
611a083ae9
hud-script-disasm (#726)
* pause hud scripts

* script name prefixes

* missing sparkle script item entity fields

* revert incorrect hypothesis

* global hud scripts + sparkle script macros

* remove tabs

* hs_op_15

* split battle images

* battle hud scripts

* fix warnings

Co-authored-by: HailSanta <Hail2Santa@gmail.com>
2022-06-10 04:03:11 +09:00
Unnunu
accf5a60f6
Animations (#727)
* decomp 5 animator functions

* animation script disasm

* cleaning up

* improvements in animation disasm

* TODO
2022-06-09 22:49:57 +09:00
Unnunu
59119c0949
item entity functions and a few others (#725)
* matched 4 functions
* matched 2 item entity funcs and migrated data
* removed default case and fixed lights def
2022-06-09 00:36:32 +01:00
Unnunu
76187e5c3b
3 more battle maps (#724)
* area_pra2

* finish

* sound enum

* renamed enum member

* fixed alignment

* area_pra3

* area_sam

* area_sam2
2022-06-06 21:34:45 +09:00
Rainchus
2de8e0c028
various removal of hardcoded pointers (#721)
* various removal of hardcoded pointers

* fix most warnings introduced

* fix building

* unhardcode entity pointers

* more unhardcoding of pointers

* remove 2 warnings
2022-06-01 22:56:36 -04:00
Ethan Roseman
341ed0040f
some assorted cleanup / commenting of stuff (#722) 2022-06-01 03:39:46 +09:00
Unnunu
d8837960b1
pra2 battle map (#720)
* area_pra2

* finish

* sound enum

* renamed enum member

* fixed alignment
2022-05-31 03:39:42 +09:00
Unnunu
b4ee2f8a75
intro_state, evt and decoration tables (#718)
* matched appendGfx_intro_logos

* create 38F00.c

* 3 evt functions

* wip

* match func_80259AAC

* match 8 decoration funcs

* fix warnings

* fix merge issue

* cleaning up

* renamed data file

* PR suggestion
2022-05-29 00:15:51 +09:00
Ethan Roseman
c0694d26f1
House cleaning (#719)
* various cleanup

* further cleanup

* some cleanup + matches

* clean
2022-05-28 20:13:30 +09:00
Ethan Roseman
021592d219
Misc decomp 70 (#716)
* aura_appendGfx

* 3 more action commands

* fire_shell

* hammer, hurricane

* spiny_surge

* data stuff, cleanup, whirlwind

* warnings

* water_block data and func

* water_block

* effect stuff cleanup

* big_snowflakes effect

* data cleanup, fpr abi regs

* 2 battle item funcs + data

* 2 mo

* shooting_star func

* 3 16F740 funcs

* btl_state_update_end_battle

* map funcs

* more dedupe

* cleanin

* draw_entity_model_C/D

* effect butterflies, btl state funcs

* it is done

* it is done

* PR comments, some cleanup
2022-05-27 22:03:19 +09:00
alex
dcd315865c
Remove script DSL (#717)
* remove cc_dsl task

* ok
2022-05-27 22:00:53 +09:00
Nasina
5b0cf78903
Matched the rest of world/actions (#715)
* Matched func_802B6000_E28A30

* oops

* Attempted to match func_802B6000_E236E0 and added UB check

* Removed Goto for walk.c func

* Matched func_802B609C_E28ACC

* Cleanup

* oops

* rodata moment

* autoformat why

* oop

* oop but again

* Fixed Warnings

* Fixed Misc Whitespace
2022-05-27 02:01:29 +09:00
Unnunu
6815d6b296
matched some battle movement functions (#714)
* match 5 functions

* move update_lerp_battle declaration

* PR suggestions
2022-05-22 16:48:09 +09:00
HailSanta
1e91e60cb6
rest of 5B320 (#713)
* rest of 5B320

* whitespace

* fix warnings

* split 5B320.c with includes

* ICON_anim_heart_piece_palette

* requested changes

Co-authored-by: HailSanta <Hail2Santa@gmail.com>
2022-05-21 13:56:54 +09:00
HailSanta
5b7f18a2ca
start chest inc + misc cleanup (#711)
* start chest inc + misc cleanup

* popups

* 5b320 OK

* finish HudScript retyping

* item hud scripts

Co-authored-by: HailSanta <Hail2Santa@gmail.com>
2022-05-18 16:53:28 +09:00
Unnunu
52b9d1b11c
battle camera (#710)
* match func_80248DE4

* BattleCam_TargetActor

* renamed functions

* Update src/16F740.c

Co-authored-by: alex <16batesa@gmail.com>

Co-authored-by: alex <16batesa@gmail.com>
2022-05-16 15:18:18 -04:00
alex
f0bdf8ee09
Format collision.c (#709)
* improve collision.c style

* oop
2022-05-14 23:12:59 +09:00
Mathyland
3746411d89
matched func_80240038_7E73D8, func_80240040_7E73E0 (#707)
* matched func_80240038_7E73D8, func_80240040_7E73E0

* Update src/world/area_mac/machi/7E73A0.c

Co-authored-by: Ethan Roseman <ethteck@gmail.com>

* Update src/world/area_mac/machi/7E73A0.c

Co-authored-by: Ethan Roseman <ethteck@gmail.com>

* Update src/world/area_mac/machi/7E73A0.c

Co-authored-by: Ethan Roseman <ethteck@gmail.com>

* Update src/world/area_mac/machi/7E73A0.c

Co-authored-by: Ethan Roseman <ethteck@gmail.com>

Co-authored-by: Ethan Roseman <ethteck@gmail.com>
2022-05-13 13:53:11 +09:00
Seeky
d641b72336
Cleanup evt_handle_call (#706) 2022-05-12 00:50:06 +01:00
pixel-stuck
5f2aca559c
decomp damage_indicator (#705) 2022-05-10 11:25:50 +01:00
Ethan Roseman
c3b2ccf04f
Update progress.py to show progress for effect and map code (#704) 2022-05-06 07:56:16 +09:00
Ethan Roseman
179998098c
Misc decomp 53 (#703)
* some btl_state work

* msg_draw_speech_bubble

* cleaners

* btl_state_stuff

* btl_state_update_next_enemy wip

* btl_state stuff

* disable_x fx + cleanup

* wip

* fxstuff

* path funcs & cleanup

* clean

* model_api funcs

* two action commands

* action_cmd progress

* UnkFunc001

* air raid func

* cleanup, data migration, goodies

* remove data file

* git subrepo pull --force tools/splat

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

* fix build

* more cleanup

* clean

* PR comments
2022-05-05 23:08:16 +09:00
Kevin Klions
8a170a33ac
Various small world/script functions (#702)
* matched func_8024068C_A2755C, mostly func_80242AD4_DF94D4

* matched func_8024089C_AD492C

* matched func_802405EC_AE5B7C

* matched func_802405D0_AE5B60

* deleted commented out INCLUDE_ASM call

* matched func_802411C4_A6F5A4

* matched func_80242AD4_DF94D4, was a big brain moment

* small changes for cleanup on a function

* matched another small function

* deleted assembly functions that were matched

* changes based on code review

* added arguments for script functions
2022-05-05 20:53:05 +09:00
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