Commit Graph

409 Commits

Author SHA1 Message Date
HailSanta
70d3b7b3a8
msg names and more map data prep (#768)
* minor NPC fixup

* most var type renames

* rest of var names

* remove deprecated

* var types cleanup

* fixed -> float 1

* fixed -> float 2

* fixed -> float 3

* fixed -> float 4

* evt fixed removed

* localvar shorthand

* missing byte names

* missing flag names

* evt var cleanup

* local var shorthand redux

* minor cleanup

* mario anim name

* item ranges cleanup

* player anim names

* all message names

* renames for existing

* remove unused enum

* squash msg ids

* again

* all message refs replaced

* area headers

* idk

* also merged

* remove superfluous parens

Co-authored-by: HailSanta <Hail2Santa@gmail.com>
2022-09-12 01:23:47 +09:00
Ethan Roseman
0094fa6a31
Pigs and speech bubbles 🐽 💬 (#767)
* lil_oink effect

* oink map funcs

* fix build to not be big

* machi funcs

* mac func

* data migration

* draw_shop_items

* e20eb0.c funcs + data

* warnings

* PR warnings and cleanup
2022-09-11 02:04:04 +09:00
Stephen Giardina
64083a6748
Sjg misc decomp (#766)
* Decompile func_802400BC_A4C01C

* Decompile world functions
• func_80240310_C5AA50
• func_802403B0_C5AAF0
• func_802403DC_C5AB1C

* Update variable names

* Moved star to the left

* Update partner variables
2022-09-11 00:14:47 +09:00
Ethan Roseman
408c49cb75
one for the books (#765)
* func_802A1518_78BB18

* btl_state_update_select_target

* wip

* btl_state_draw_select_target and WIP

* cleanup

* render_shaded_sprite and wip

* WIP/cleanup

* wip

* reset_player_status

* btl_state_update_player_move and cleanup

* func_802A2C84

* func_80242FE0 wip

* btl_state_update_normal_start and cleanup

* WIP

* btl_state_update_end_turn

* btl_state_update_enemy_striking_first

* cleanup

* cleanup & wip

* item_entity_update & cleanup

* update_item_entity_temp

* appendGfx_item_entity

* E21870

* mdl_create_mode

* cleanup

* func_802A9310_42D220

* area_flo2 battle funcs dun

* b_area_isk_part_1_ChompChainUpdate

* wip and rip

* clean

* partner_move_to_goal

* partner_get_out

* wip

* cleanup

* func_802BD1AC_31CD1C

* func_802BD754_31D2C4

* Cleanin

* fix func def

* UnkShadowFunc001

* a bunch of kpa funcs

* comment
2022-09-08 21:21:07 +09:00
HailSanta
c108f11cab
EVT mass renames (#763)
* mapconfig -> mapsettings

* Map/Area -> MapConfig/AreaConfig

* old EVT names

* kmr names

* game byte names

* EVT_SAVE_FLAG names

* removed EVT_WAIT_FRAMES

* including the to_rename files in case they need to be reused

* more npc AI

* battle and stage names

* fixed enum value

* territory substruct refactor

* refactored enemy drops substruct

* refactor NpcGroupList

* adjusted NPC_GROUP for passive NPCs

Co-authored-by: HailSanta <Hail2Santa@gmail.com>
2022-09-08 21:12:26 +09:00
mrshigure
2d68776591
Matched a couple of effects functions (#764)
* Matched a couple of effects functions

* Deleted asm files

* Addressed PR comments
2022-09-08 18:46:35 +09:00
Kevin Klions
a580f19ab8
Matched a couple random functions (#761)
* matched function rising_bubble_update

* matched function func_80240A5C_9B21EC

* matched func_802417AC_EAA28C

* fixed build, addressed PR comments

* addressed more PR comments
2022-09-07 22:19:01 +09:00
HailSanta
0df93d5b2b
prep for map dumping (#760)
* prep for map dumping

* s p a c i n g

* advanced door + world statics

* sneaky tabs

* more world

* one more

* saved for later

Co-authored-by: HailSanta <Hail2Santa@gmail.com>
2022-09-06 11:26:53 -04:00
Kazu
c0d92f075a
Matching some kkj, kpa, pra, and osr area functions (#758)
* Matching some kkj, kpa, and osr area functions

* Include effects.h in AAC830.c

* Addressed PR comments

* Separated strings in func_80240000_AAFFF0

* Addressed PR comments continuation

* Added Bytecode args in func_80240020_AB2190

* Match func_802401A0_AB6430, func_80240000_AB92B0, func_80240050_AB9300

* Match functions that call start_rumble

* Match functions from area_pra

* Addressed PR comments

* Color hex to dec func_802401A0_AB6430
2022-09-07 00:09:50 +09:00
Stephen Giardina
cdeb55a660
Decompile func_802400BC_A4C01C (#759) 2022-09-05 22:18:47 +09:00
mrshigure
cc2d6996b8
Matching effects and some world/area_kkj functions (#756)
* Matching effects and some world/area_kkj functions

* Partially addressed PR comments

* Partially addressed PR comments

* Added EVT_FIXED_TO_FLOAT macro
2022-09-05 13:53:21 +09:00
EllipticEllipsis
1a8c131880
Match a few functions, cleanup of unmatched libultra/gcc internal stuff, some documentation in 43F0.c (#755)
* Decompile memset, strcpy, strcmp

* Rename a lot of libultra functions and files,
match int_to_string (43F0.c OK)

* Nail a few warnings

* Clean up libultra header includes somewhat
2022-09-04 22:12:30 +01:00
mrshigure
2ad8779ea7
Matched some world/area_kkj functions (#754)
* Matched some world/area_kkj functions

* Deleted matched functions

* Partially addressed comments

* Addressed comments
2022-08-31 15:33:56 +09:00
mrshigure
993c09a70e
Matched all functions in kkj_19/AF7C00.c, kmr_20/8ED5A0.c, and kmr_20/8EDB70.c (#752)
* Matched all functions in kkj_19/AF7C00.c, kmr_20/8ED5A0.c, and kmr_20/8EDB70.c

* Update src/world/area_kkj/kkj_19/AF7C00.c

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

* Update src/world/area_kkj/kkj_19/AF7C00.c

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

* Update src/world/area_kkj/kkj_19/AF7C00.c

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

* Update src/world/area_kkj/kkj_19/AF7C00.c

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

* Update src/world/area_kkj/kkj_19/AF7C00.c

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

* Update src/world/area_kkj/kkj_19/AF7C00.c

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

* Update src/world/area_kkj/kkj_19/AF7C00.c

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

* Update src/world/area_kmr/kmr_20/8EDB70.c

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

* Update src/world/area_kkj/kkj_19/AF7C00.c

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

* Update src/world/area_kkj/kkj_19/AF7C00.c

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

* Addressed comments

* Fixed index usage

Co-authored-by: Ethan Roseman <ethteck@gmail.com>
2022-08-28 08:33:23 +09:00
HailSanta
51d02cfbf5
actor decor stuff (#750)
* big func

* this and that

* checkpoint

* more funcs

* enough

* formatting

Co-authored-by: HailSanta <Hail2Santa@gmail.com>
Co-authored-by: Ethan Roseman <ethteck@gmail.com>
2022-08-26 19:13:57 +09:00
Ethan Roseman
7467b148d1
A few funcs (#751)
* update_item_entity_collectable

* cleanup

* snibblets and bits

* CancelablePlayerRunToGoal and PlayerRunToGoal

* nonmatch

* PR comments and peach_star_beam effect

* PR stuffs
2022-08-25 19:18:04 +09:00
Ethan Roseman
9d47d968f9
small and large boys (#749)
* func_802DE780

* EnterPlayerPostPipe

* UnkFoldFunc

* smores

* func_802403C0_800C40

* 3 mo

* filemenu_draw_char

* btl_state_update_enemy_move

* prepz

* fix func thing

* btl_state_update_partner_striking_first

* PR comments

* PR comment

* warning
2022-08-17 10:15:54 +09:00
HailSanta
d11054b41a
several actor funcs (#748)
* no sun :(

* livin in the sunshine

* misc

* small fix

* splat fix

* comments + sparkles enum

Co-authored-by: HailSanta <Hail2Santa@gmail.com>
2022-08-17 10:04:23 +09:00
Ethan Roseman
ded1be2b17
Effect work and rodata migration (#747)
* bombette_breaking WIP

* bombette_breaking

* migration & stuff

* spr funcs

* btl_state_update_begin_turn

* beginning effect data work

* effect rodata migration

* fix

* fixin

* breaking_junk

* args

* handle gfx

* trim yaml

* yaml cleanup

* gfx stuff

* git subrepo pull --force tools/splat

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

* water_splash gfx

* move decl down

* fix warnings
2022-08-11 00:29:06 +09:00
HailSanta
f4efd09c80
isk + misc (#746)
* isk + warning patrol

* minor reorg

* effect data union

* structs sorted and dummy structs added

* effect data cleanup + some end funcs

* two more PAL_PTR*

* temp

* flower fx

* pal_inc_c

* remove tabs

* isk_05

* blur union

* more isk

* isk funcs done

* sun stuff

* delete sun_main

* sun comments

* extra stuff

* actor decorations
2022-08-10 14:36:38 +01:00
HailSanta
ba183f35b5
effect organization (#745)
* isk + warning patrol

* minor reorg

* effect data union

* structs sorted and dummy structs added

* effect data cleanup + some end funcs

* two more PAL_PTR*

Co-authored-by: HailSanta <Hail2Santa@gmail.com>
2022-08-07 21:42:54 +09:00
Jake Kallos
b04187c149
match some functions in kmr_20/8EBE50.c (#742)
* Update 8EBE50.c

* removed asm source files

* whupz

Co-authored-by: Ethan Roseman <ethteck@gmail.com>
2022-08-07 11:53:10 +09:00
HailSanta
1ce49b1ba9
audio odyssey (#744)
* first pass

* seq cmd args retyping

* some SEF commands

* etc

* couple more SND commands

* more functions

* checkpoint

* five more

* another one

* more funcs + cleanup

* reverted unnecessary unions

* all SEF commands done

* a bunch more

* more!

* morrrrrrre

* almost done for now

* 99%

* 100

* few names and types

* reorg

* minor chnages

* miscmiscmisc

* yet more

* another day another func

* eth wip func_8004EC68

* some sym names

* retyping sound mgr fields

* minor renames

* D_80078400

* bigger func

* retypings

* enhanced drum info

* the evil is defeated

* merged

* prelim ambient sound func names

* audio frame

* checkpoint

* renames

* learnin bout sounds

* latest

* fix snd_load_BK_to_bank

* func_80056FA4

* warnings

* cosmetics

* func_800522A8

* struct reorg

* figured some stuff out

* much more info

* fx params

* cleanin up

* revert accidental changes to jp

* more accidental jp changes reverted

* misc names

* small stuff

* migrated all audio data

* checkpoint

* header reorg begins

* audio public/private headers

* fixed headers

* fixin warnins

* oops

* 51 fixed

* formatted binary data in 30450

* workwork

* cleanup

* misc

* flip macro arg order

* more names

* audio event triggers

* various

* sfx player cleanup

* start bgm player cleanup

* names names names

* priorities

* merlow

* misc enum vals

* rocking chair

* kmr_00 funcs

* enough

* restore delete jp file

* func_80055EB4

* fix func name

* addressed comments

* demoted a couple variables from global

* couple hidden panel things

* credits mostly

* credits dedupe in progress

* jump table repair

* 'finished' end dedupe

Co-authored-by: HailSanta <Hail2Santa@gmail.com>
Co-authored-by: Ethan Roseman <ethteck@gmail.com>
2022-08-06 21:14:04 +09:00
Unnunu
ae64b1b5cc
entities (#741)
* matched execute_render_tasks

* step_entity_command_list

* partially migrated entity data

* entity blueprints migrated

* matched create_entity

* matched entity functions

* SaveBlock

* SaveBlock and Switch

* switch model done

* matched shattering block functions

* shattering block models

* matched block funcs

* block models

* finish Block.c

* ItemBlock

* HeartBlock

* SuperBlock

* SimpleSpring

* HiddenPanel wip

* HiddenPanel

* Chest

* WoodenCrate

* BlueWarpPipe

* SignPost

* Padlock

* Boarded floor and padlocks

* BombableRock

* Tweester

* StarBoxLauncher

* wip

* ArrowSign

* BellbellPlant

* TrumpetPlant

* munchlesia wip

* Munchlesia

* UnusedBlock

* cleaning

* fix warnings

* git subrepo pull --force tools/splat

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

* PR suggestions

* created vtx splat segments
2022-07-17 17:38:19 +01:00
Rainchus
6a04b6a5fe
decomp func_8025CEC8 (#740)
* decomp func_8025CEC8
* change func_8025CEC8 to use ARRAY_COUNT
2022-07-09 21:29:28 +01:00
Ethan Roseman
d31e0b8936
Engine cod (#738)
* a couplez

* func & data cleaning

* sig

* move data and fix nonmatching

* Finish 17D6A0

* Don't use backticks in progress.py

* func_8025995C and clean

* 2 sprite funcs and cleanup

* 3 sprite funcs

* gather_magic_main

* 3 sprite funcs

* more sprite work and cleanup

* sprite funcs

* more clean

* UnkFloatFunc005

* warnings

* cleaning and os stuff

* 2 more funcs + warnings

* yaml work, move map data metadata to separate yml file

* apply_transform_to_children

* cleaningz

* PR comment
2022-07-08 21:57:08 +09:00
Mr-Wiseguy
ea64a774fc
Cleaned up and documented gfx_draw_background, changed vscode config to use gcc-x86 to avoid intellisense truncation warnings for pointers (#739) 2022-07-03 15:42:28 +09:00
Jacco Potters
97059b9f4d
match 2 mac_02 funcs, one needs data migration (#737)
* match 2 mac_02 funcs, one needs data migration

* delete matched asm

* remove duplicate extern

* add indent

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

Co-authored-by: Alex Bates <16batesa@gmail.com>
2022-06-29 17:42:28 +09:00
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
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