Commit Graph

290 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
Ethan Roseman
9cd911765d
File menu & more (#658) 2022-03-10 09:55:38 +00: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
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
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
Ethan Roseman
3a578399fb
calc_item_damage_enemy and some others (#641)
* SFX funcs, configure fix

* the actual rename (oops)

* 3 sprite funcs

* 2 funcz

* calc_item_damage_enemy and cleanup, others

* cleanup

* Warnings

* clean fx_api

* match npc_raycast_general and name npc_collision.c

* PR comment
2022-02-09 03:33:05 +09:00
Unnunu
650d52d16a
Pause menu (#642)
* start data migration

* decomp 12 functions

* make initial bss

* pause_tutorial_draw_contents

* pause_init

* decomp 3 functions

* decomp pause_tabs

* pause_badges_draw_contents

* pause_items

* pause_partners

* pause_spirits

* pause_map

* pause_gfx and pause_styles

* fixing warnings

* fixed all warnings

* bss

* rename bss fields

* make static from bss

* renaming global vars

* finish

* small fix

* PR suggestions
2022-02-09 03:24:51 +09:00
JoshDuMan
9394e1ee21
Match phys_peach_update (#638) 2022-02-02 17:19:52 +00:00
JoshDuMan
e1766601f8
Match 50 functions in Libultra (#636)
* Fix script disasm

* Stuff

* Work on libultra

* More Libultra Work

* My Libultra work for now

* Fix all OS warnings

* fix gitignore
2022-01-31 20:40:55 +09:00
Ethan Roseman
96e85f4da1
SFX funcs, configure fix (#635)
* SFX funcs, configure fix

* the actual rename (oops)
2022-01-31 19:10:02 +09:00
Ethan Roseman
3bd5a9d91e
Goods and Services (misc decomp PR from eth number 335) (#629)
* an end func

* 2nd segment bss file added

* hud_element work

* some renaming, set_hud_element_scale

* 2 hud_element funcz

* remove more unneeded undefined_syms

* bss 3, PR comments

* fx_134

* func_80200080

* 4 funx

* fix shtuff

* a func

* create_actor

* func_80263064

* initialize_battle, some stuff, and cleanup

* clean

* NL
2022-01-20 22:08:24 +09:00
JoshDuMan
0f67c8c425
Disassemble Various Battle Scripts (#626)
* Disassemble DGB

* Disasm omo

* Disassemble KGR

* Disassemble Battle Goompa

* Disasm Goombario

* Disasm Jan2

* Disasm JAN Battle Map

* Delete data files

* Disasm Spin Smash

* Partners Disasm

* Disasm KZN Battle Map

* Delete func

* jungle_guy

* Spear Guy
2022-01-19 20:21:19 +09:00
JoshDuMan
44dd710d54
Disassemble 3 Battle Maps (#622)
* Disassemble ISK Part 2 Battle Map

* Disassemble MIM BTL Map and fix script maps

* Delete mim

* Disasm Script

* Disassemble ARN Battle Map

* Remove files

* Remove struct

* Handle comments and merge conflicts
2022-01-17 02:22:23 +09:00
HailSanta
4e33a016eb
struct renaming and trigger/entity cleanup (#623)
* rename static structs to blueprint

* evt structs renamed

* renamed HudElementAnim to HudScript, worked on triggers

* fix Trigger/TriggerBP fields and entity cleanup

* entity data cleanup 1

* block

* blue warp pipe

Co-authored-by: HailSanta <Hail2Santa@gmail.com>
2022-01-16 22:28:09 +09:00
HailSanta
41c304137d
hud and item script names (#617)
* hud script names 1

* more hud elements!

* battle hud scripts

* names for some item globals

* hud elem scripts for items

* item entity names

* cleanup and missing struct in partners

* more partner cleanup

* battle stuff

* fix some warnings?

* resolve stuff

* fix symbol_addrs

* minor fixes

* splat pause_icon_table.data.s

* glabel -> dlabel

* rom addrs

* fix splat stuff

* data splits, warnings

* split more hud scripts

* added symbols for battle menu

* finished hud scripts fot 415D90

* entity documentation

* entity documentation

* more consistent name

Co-authored-by: HailSanta <Hail2Santa@gmail.com>
Co-authored-by: Ethan Roseman <ethteck@gmail.com>
2022-01-15 03:54:45 +09:00
Unnunu
5f05525446
match raycast functions (#620)
* npc_raycast_down

* npc_raycast_down_ahead

* npc_raycast_down_sides

* npc_raycast_up

* npc_raycast_up_corner

* npc_raycast_up_corners

* npc_test_move_complex_with_slipping

* player_raycast_down

* player_raycast_up_corners

* decomp 3 funcs

* player_test_move_without_slipping

* player_test_move_with_slipping

* match player_test_move_with_slipping

* clean up code

* fix param names

* remove space

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

Co-authored-by: Alex Bates <hi@imalex.xyz>
2022-01-15 03:09:45 +09:00
Unnunu
486dbfda39
Match status_icons (#612) 2022-01-10 15:55:26 +00:00
Unnunu
559007d861
Match collision functions (#609)
* match allocate_hit_tables

* load_collision

* load_hit_data

* parent_collider_to_model

* update_collider_transform

* test_up_ray_collider

* test_ray_triangle_general

* test_down_ray_triangle

* test_up_ray_triangle

* test_ray_colliders

* test_ray_zones

* test_ray_entities

* func_8005DB00

* rename everything

* follow codyng style

* fix

* PR suggestions

* remove p prefix

Co-authored-by: Sergey Zorkin <szorkins@gmail.com>
2022-01-08 19:11:20 +09: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
55228bd3a7
Fix a few warnings (#601)
* .

* Externs

* Fix a few warnings

* __osGetCause

* Comment

* Ethan
2022-01-04 02:36:01 +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
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
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
JoshDuMan
6e062b19d8
Disassemble and format DGB data. (#558)
* Dissamble data.

* Fix warnings and format data
2021-12-22 23:59:52 +09: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
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
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
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
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