pmret/papermario
1
0
Fork 0
mirror of https://github.com/pmret/papermario.git synced 2024-11-08 12:02:30 +01:00
Code Issues Packages Projects Releases Wiki Activity
2,604 Commits 4 Branches 0 Tags 206 MiB
3637dae749
Commit Graph

985 Commits

Author SHA1 Message Date
Ethan Roseman
dfff7bce1a
squirt effect done, 0 warnings, undefined_syms cleanup, wip (#922) 
* warnings & WIP

* 0 warnings

* squirt_appendGfx && gfx data (squirt effect dun)

* undefined_syms cleanup

* clean

* don't die when no warnings
 2023-01-25 23:06:57 +09:00
HailSanta
a03510d8a6
area_omo (#921) 
* omo_09

* omo_11

* part of omo

* 08/10/13

* more

* train toad rename

* hmm

* guard ai

* omo_02

* fix partner anim enum

* omo_15

* omo_12

* last omo

* pra_15

* reflections

* under 100 maps left

* cleanup floats

* horse

Co-authored-by: HailSanta <Hail2Santa@gmail.com>
 2023-01-25 11:33:20 +09:00
Ethan Roseman
8b27ed01ef
3unks (#920) 
* chomp_drop_appendGfx

* stars_shimmer_main & stars_shimmer_update

* clean
 2023-01-24 12:33:04 +09:00
MS-DOS1999
ebe5fbd0f6
match update_camera_mode_4/6 (#919) 2023-01-23 23:46:51 +00:00
Ethan Roseman
bfbb7d1f98
Twuncs (#917) 
* wip

* func_80240000_D2BD30

* npc_find_standing_on_entity

* wip

* cleanup

* warning

* close

* anotha one

* spr_allocate_components

* func_80243FC4_A2E204

* func_80240B4C_B2108C

* clean
 2023-01-23 00:35:43 +09:00
HailSanta
858eb4c19e
fix map warnings (#916) 
* omo_17

* sam_06

* sam_06

* hos_02

* hos_03

* shops

* star kid name fix

* shop dialogue

* nok_11

* nok 14/15

* small fixes

* ready

Co-authored-by: HailSanta <Hail2Santa@gmail.com>
 2023-01-21 17:14:46 +09:00
Ethan Roseman
0cee144b18
func_802401A0_DDC9D0 & save/load tattle flags (#915) 
* func_802401A0_DDC9D0

* func_802428C8_A2CB08

* cleanup

* wip

* warning

* save/load_tattle_flags

* PR comments

* idnex
 2023-01-19 10:33:52 +09:00
Unnunu
0e2d3b96d4
matched 2 functions (#914) 
* matched 2 functions

* PR comment
 2023-01-18 15:58:17 +09:00
pixel-stuck
ddebe5eb64
Big steps toward ROM shiftability (#912) 
* shiftability work

* Cleanup

* fix build

* Fix sprite shading profile when shifted

* fix overworld items icons, message icons, and corrupted bowser graphics on the title screen

* add shift flag to configure.py

* restoring ifdef stuff

Co-authored-by: Ethan Roseman <ethteck@gmail.com>
 2023-01-16 23:03:23 +00:00
HailSanta
935fd14530
misc battle cleanup III (#911) 
* misc

* fix one type

* yeah

* misc

* all substates

* almost done

* renames

* comments

* a couple maps

Co-authored-by: HailSanta <Hail2Santa@gmail.com>
 2023-01-15 18:22:41 +09:00
Unnunu
2f79b35772
model functions (#910) 
* matched appendGfx_model

* 3 more

* fog modes

* cleaning

* fix

* fixed macro name

* FogModes enum

* extra tile enum renamed
 2023-01-13 16:56:28 +09:00
HailSanta
eb7ed118a6
flags -> flag (#909) 
* flagsnt

* not this one

Co-authored-by: HailSanta <Hail2Santa@gmail.com>
 2023-01-12 11:09:13 +09:00
HailSanta
efa45a5668
misc battle cleanup II (#908) 
* flags and fixes

* move category start

* first strike and battle messages

Co-authored-by: HailSanta <Hail2Santa@gmail.com>
 2023-01-11 17:38:04 +09:00
InfoManiac742
fbc054d01c
Fix typo (#907) 2023-01-11 17:16:27 +09:00
HailSanta
cc3a146066
battle substates cleanup I (#906) 
* cleanup in progress

* celebrate done

* progress

* etc

* substate enums done

* flag fixup

* brevity

* msg name fix

Co-authored-by: HailSanta <Hail2Santa@gmail.com>
 2023-01-10 15:33:09 +09:00
HailSanta
403f796246
area_dgb (#904) 
* a couple maps

* almost done

* ok

* cleanup

* ok

Co-authored-by: HailSanta <Hail2Santa@gmail.com>
 2023-01-05 17:02:12 -05:00
Unnunu
2514e13635
btl_state_update_player_menu (#902) 2023-01-05 19:43:31 +00:00
HailSanta
1c470c92e5
area osr (#903) 
* 0/1

* ~2

* 2

* 4

* done

* ws

Co-authored-by: HailSanta <Hail2Santa@gmail.com>
 2023-01-05 02:04:03 -05:00
Unnunu
1cea652202
sprites and effects (#900) 
* firework_rocket

* confetti_main

* 5 sprite funcs

* cleaning up

* minBlurAlpha

* everything is right
 2023-01-04 00:57:48 +09:00
HailSanta
a2e96ae3ae
area kpa (#901) 
* kpa 1/3/4/5

* more!

* just one left

* done

* stray cleanup

Co-authored-by: HailSanta <Hail2Santa@gmail.com>
 2023-01-03 19:46:15 +09:00
HailSanta
0e54cd9b30
area kmr (#898) 
* kmr_02 ok

* some cleanup

* foliage EVS

* quiz cleanup

* partners

* cleanup pass ?

* kmr_02 done

* kmr_20 ok

* begin kmr_20 cleanup

* enough kmr_20

* kpa_90+

* more kpa

Co-authored-by: HailSanta <Hail2Santa@gmail.com>
 2023-01-02 10:58:39 +09:00
Ethan Roseman
cfb36ee36e
5uncs (#895) 
* 2 dogs

* pause_stats_draw_contents

* Cleanup

* is_ability_active :confetti:

* WIP

* spawn_drops

* PR
 2022-12-29 14:48:27 +09:00
Unnunu
e6de400efa
Draw box (#897) 
* wip

* matched draw_box

* cleaning up

* renamed file

* fixed warning

* PR comments
 2022-12-29 14:08:13 +09:00
Unnunu
207f4400b6
matched 4 obk functions (#896) 2022-12-28 14:30:30 +00:00
HailSanta
cbdce77daf
area_spooky (#894) 
* obk_01

* obk_02

* obk_03

* obk_06

* obk_05

* checkpoint

* chandelier documentation

* obk_04

* obk_09

* obk_07

* obk done

* tabs

* kmr_22

* kmr_11

* last thing

Co-authored-by: HailSanta <Hail2Santa@gmail.com>
 2022-12-25 14:10:23 +09:00
Ethan Roseman
cf2099772d
10 functions (#893) 
* fixins

* 2 dogs

* a few funcs + progress

* 3 more

* clean & PR comments
 2022-12-21 17:15:21 +09:00
Ethan Roseman
1452474409
More cleanup, bss, undefined_syms (#892) 
* tons more BSS, undefined_syms, cleanup abound

* git subrepo pull --force tools/splat

subrepo:
  subdir:   "tools/splat"
  merged:   "741a0d030d"
upstream:
  origin:   "https://github.com/ethteck/splat.git"
  branch:   "master"
  commit:   "741a0d030d"
git-subrepo:
  version:  "0.4.5"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "aa416e4"

* one more

* fix progress.py
 2022-12-18 02:08:52 +09:00
Ethan Roseman
03c7e0d80d
BSS, undefined_syms (#891) 2022-12-17 12:20:37 +09:00
Ethan Roseman
6ea08f8257
Map funcs and update_input (#888) 
* warning

* func_80240098_BBD238

* hos/kkj stuff

* update_input is deated (thanks arienain on decomp.me\!)

* 4 mo
 2022-12-15 10:56:16 +09:00
Unnunu
debdd6c4e6
matched 2 model functions (#887) 2022-12-14 13:03:51 +00:00
Ethan Roseman
10c94b1cb3
a match for the clover (#886) 
* warning

* func_80240098_BBD238
 2022-12-13 18:18:15 +09:00
HailSanta
e4283f3ea1
area_mac (#884) 
* mac_00 match

* mac_00 cleanup pass

* enough mac_00 cleanup

* mac_01 match

* cleanup pass 1

* first pass done

* more

* unkfoldfunc dedupe

* quick

* mockup

* new splat segment

* git subrepo pull --force tools/splat

subrepo:
  subdir:   "tools/splat"
  merged:   "b2d7b86185"
upstream:
  origin:   "https://github.com/ethteck/splat.git"
  branch:   "master"
  commit:   "b2d7b86185"
git-subrepo:
  version:  "0.4.5"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "aa416e4"

* fix custom segment

* git subrepo pull --force tools/splat

subrepo:
  subdir:   "tools/splat"
  merged:   "0f66e7552a"
upstream:
  origin:   "https://github.com/ethteck/splat.git"
  branch:   "master"
  commit:   "0f66e7552a"
git-subrepo:
  version:  "0.4.5"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "aa416e4"

* common vtx

* victory

* checkpoint

* remove map-specific subaligns

* enough

* quick fixes

Co-authored-by: HailSanta <Hail2Santa@gmail.com>
Co-authored-by: Ethan Roseman <ethteck@gmail.com>
 2022-12-12 21:31:29 +09:00
pixel-stuck
ff3835672d
water block effect matched (#883) 
* more effects

* delete asm

* PR comments

* More PR comments

* fully match water block effect

* cleanup for PR

* PR comments

* define for components
 2022-12-12 15:13:49 +09:00
Ethan Roseman
29c3ffa2e0
Misc decomp 3: Oh baby a triple (#882) 
* clean

* git subrepo pull --force tools/splat

subrepo:
  subdir:   "tools/splat"
  merged:   "901241040d"
upstream:
  origin:   "https://github.com/ethteck/splat.git"
  branch:   "master"
  commit:   "901241040d"
git-subrepo:
  version:  "0.4.5"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "aa416e4"

* splat update

* more matches after nop hack

* git subrepo pull --force tools/splat

subrepo:
  subdir:   "tools/splat"
  merged:   "715ee0ad55"
upstream:
  origin:   "https://github.com/ethteck/splat.git"
  branch:   "master"
  commit:   "715ee0ad55"
git-subrepo:
  version:  "0.4.5"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "aa416e4"

* Renames, match boot_idle

* one mo

* wips

* fish func

Co-authored-by: @JaThePlayer

* sushie dun

* warnings

* clean

* match a nok func

* nok_02 stuff

* nok_04 party image

* func_802BD5D8_3174F8

* LoadPartyImage & stuff

* warnings
 2022-12-11 16:43:29 +09:00
Unnunu
abd49f653a
matched status_menu_draw_stat (#880) 
* status_menu_draw_stat

* fix warning
 2022-12-08 01:12:25 +09:00
Ethan Roseman
5b5b8c579f
95% (#881) 
* fixes

* 2 nusys funcs

* warnings

* appendGfx_npc_blur

* clean

* cleanup, standardize button macro
 2022-12-07 17:39:22 +09:00
Ethan Roseman
5b63159eaf
Effect, map decomp (#877) 
* snaking_static_appendGfx, gfx migration, cleanup

* more decomp + data stuff

* fix for Light

* map funcs

* 2 obk_07

* 4 mor

* fixes

* message IDs
 2022-12-06 08:53:46 +09:00
HailSanta
703896a7f1
isk+ (#878) 
* isk_01/2/3

* machi

* mac_05

* mac_04 matched

* mac_04

* mac_02 match

* mostly cookin

* mac_02 cleanup

* tayce t cleanup done

* most of isk

* almost done isk

* isk done

* mapconfig 1C

* jump to goal

Co-authored-by: HailSanta <Hail2Santa@gmail.com>
 2022-12-06 08:29:22 +09:00
Spencer Vaughn
40c2b9be4d
snaking_static effect (#876) 
* snaking_static_main: Matched

* snaking_static_update: Matched

* snaking_static: PR cleanup
 2022-12-04 11:39:46 +09:00
Ethan Roseman
d2b436287f
Effect work (#875) 
* quizmo_audience effect

* explosion_main

* tidying

* wip shtuff

* fixules

* partner_buff dun

* shockwave

* remove script
 2022-12-04 11:05:33 +09:00
HailSanta
2561914d1a
area_tik+ (#874) 
* koopa

* para troopa

* some fuzzy

* tik_05

* tik_02

* tik_01

* tik_03

* tik_03b

* tik_04

* tik_07

* tik_08

* tik_09

* tik_10/12

* tik_14

* tik_15

* tik_17/18

* more tiks

* area_tik

* mac_03

* cleanup

* oink names

Co-authored-by: HailSanta <Hail2Santa@gmail.com>
 2022-11-30 16:39:42 +09:00
Ethan Roseman
2adca590f6
Effect work (#872) 
* this effect is awful

* ice_pillar effect

* radial_shimmer done, some data migration

* snowfalls

* data & snowfall

* wip
 2022-11-28 05:38:13 +09:00
Unnunu
30f8879ddc
dead maps (#871) 
* dead flo_00

* dead flo_03

* dead flo_07

* dead flo_08

* dead flo_09

* dead flo_10

* dead flo_11

* dead flo_12

* dead flo_13

* dead flo_14 flo_15

* dead flo_16

* dead flo_17 flo_18

* dead flo_19 unused

* kzn maps and PR comments
 2022-11-26 22:14:03 +09:00
pixel-stuck
0c9c8e8137
Windy leaves and water splash effects (#870) 
* more effects

* delete asm

* PR comments

* More PR comments
 2022-11-26 01:06:31 +09:00
Devon R
25e4f67adb
Renames for documentation purposes (#864) 
* Renames for documentation purposes

* Change wording (CANT_CHANGE_PARTNER => PARTNER_CHANGE_DISABLED)

* Renaming (behaviour => behavior) and TRUE/FALSE

* Remove unnecessary false comparison

* Address review comments
 2022-11-26 00:16:13 +09:00
pixel-stuck
f63ffa7e95
Match whirlwind effect (#869) 
* match whirlwind effect

* delete asm

* PR comments
 2022-11-24 23:57:29 +09:00
Unnunu
ff4034651c
matched func_801180E8 (#867) 
* matched func_801180E8

* fixed braces and field name
 2022-11-24 04:06:21 +09:00
Ethan Roseman
78c30637f2
Misc matches & cleanup (#868) 
* yaml updates

* 2 funcs & cleanup

* anotha 1

* re-org

* PR & cleanup
 2022-11-24 03:33:39 +09:00
HailSanta
c776b32bc6
generic_entity -> worker (#865) 
* workers

* broke out worker flags

* quick fix

* player sprite sets

* enum ws

* default -> world

* fix long line

* virtual entity split and minor cleanup

Co-authored-by: HailSanta <Hail2Santa@gmail.com>
 2022-11-21 23:12:28 -05:00
Unnunu
eff23cecb6
matched 5 functions (#862) 
* matched one

* btl_draw_upgrade_windows

* 2 sprite funcs

* rename

* func_80242FE0
 2022-11-20 02:24:16 +09:00
Unnunu
0f4f12a1dd
btl_state_update_partner_menu (#860) 
* btl_state_update_partner_menu

* cleaning

* enums in btl_state_draw_partner_menu

* PR comments
 2022-11-16 18:46:50 +09:00
Ethan Roseman
f56df3d9f7
sprite_shading_profiles & obk_07 (#859) 
* obk_07 funcs

* 2 mo

* sprite_shading_profiles

* tiny clean

* PR comments
 2022-11-15 23:55:59 +09:00
Unnunu
17e4bff020
star beam and few others (#857) 
* peach/star beam

* 3 more

* func_802A5290 wip

* PR comments
 2022-11-14 20:00:29 +09:00
Ethan Roseman
8d429c8b07
Map Funcs (#855) 
* 2 mo hossz

* jan_00 2 funcs

* a jan_03

* dupes & stuff

* 2 mo

* 4 macs

* mac_01/8017D0

* cleanup + matching

* 3 obks

* wip

* clean
 2022-11-12 04:34:36 +09:00
Ethan Roseman
a880543beb
ItemChoice_SaveSelected + hos funcs (#854) 
* cleanup

* a bunch of ItemChoice_SaveSelected

* the last few

* a bit more

* some position -> pos

* warnings

* 2 snibblets

* 2 snibblets

* one more

* weird

* mo

* more hos_05

* hos5

* 3 mo

* comment

* cleen
 2022-11-10 11:00:56 +09:00
Unnunu
b9502a1ac4
action commands (#853) 
* reorg done

* warning

* PR comments
 2022-11-08 22:01:42 +09:00
Ethan Roseman
922a953691
4 effect funcs (#851) 
* tattle_window

* cleanup

* music_note_appendGfx

* motion_blur_flame_update

* Gfx bin, PR comments

* undefined_syms cleanup

* undefined_syms cleanup
 2022-11-06 00:31:01 +09:00
Unnunu
294602ec98
battle partners (#852) 
* goompa and goombario

* kooper

* bombette

* parakarry

* watt

* sushie

* lakilester

* bow

* twink

* fix warning

* fix messed fields

* CalculateArcsinDeg

* updated splat entries
 2022-11-05 16:06:28 +09:00
mrshigure
9da8f0a56a
[Effects] A few functions (#850) 
* [Effects] A few functions

* Addressing PR comments
 2022-11-05 09:43:44 +09:00
Ethan Roseman
3f08935b05
Dead cod (#848) 
* 2 sams

* dead cod

* little more

* wip

* fix comments
 2022-11-03 01:01:00 +09:00
mrshigure
7a56814010
Some effect functions (#846) 2022-11-02 12:51:32 +00:00
Unnunu
cf4eeecc13
msg stuff (#847) 
* matched several msg functions

* added images and set flags

* fix merge issue

* warning

* Update src/msg_data.c

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

Co-authored-by: Alex Bates <16batesa@gmail.com>
 2022-11-02 21:30:07 +09:00
Unnunu
8fd2613bd8
encounters and static npc flags (#843) 
* matched update_encounters_neutral

* matched encounter funcs

* replaced NPC flags with ENEMY flags

* cleaning up

* warnings
 2022-11-01 12:27:10 +00:00
Ethan Roseman
5a668faf5d
Cleanup + misc decomp (#844) 
* hos funcs

* more hos funcs

* 4 more

* little clean

* 4 more

* find_similar_areas min, max params

* calc_partner_test_enemy

* nothing of substance

* battle_state_update_begin/end_player_turn

* fix

* warnings

* 2 omos

* 2 mo omo

* PR comments

* 3 mo omo
 2022-11-01 16:41:14 +09:00
Unnunu
76254641e5
non-world data migration (#841) 
* migrated 54360

* partially migrated 1AF2D0

* level up screen

* 1AF2D0 fully migrated

* cleaned up

* matched one audio function

* fixed warning

* PR comments
 2022-10-31 00:41:22 +09:00
HailSanta
b656ab90b4
area_flo (#839) 
* some reorg

* minor stuff

* flo_03

* flo_08

* flo_09

* flo_00

* flo_11/12

* flo_10

* flo 24/25

* flo 22/23

* flo 21

* flo_19

* flo 17/23

* flo 16

* flo 15

* flo_14

* flo_13

* area flo

* tik_06

* couple missed things

Co-authored-by: HailSanta <Hail2Santa@gmail.com>
 2022-10-31 00:23:13 +09:00
mrshigure
1124ab3382
[Effects] More functions (#838) 2022-10-30 09:22:40 +09:00
Spencer Vaughn
f67d317d5a
more effects functions (#836) 
* water_fountain: matched main

* water_fountain: Matched update

* quizmo_audience: Matched main

* star_outline:  Matched main

* star_outline: Matched update

* quizmo_audience: Removed unused struct
 2022-10-27 22:07:27 +09:00
Ethan Roseman
b64886fa8c
A couple map funcs (#835) 
* find_similar_areas improvement

* func_sizes in find_similar_areas

* 4 funqz

* another

* clean

* sams

* more sams

* osr, pra

* omo

* some obk

* cleanup + funcz

* wip

* warnings

* more

* 3 mo

* 7 more

* render_models (thanks Unnunu\!)

* cleanup

* PR comments
 2022-10-25 19:04:54 +09:00
mrshigure
ec25f51281
[Effects] Matching a couple of functions (#834) 
* [Effects] Matching a couple of functions

* Addressed comments
 2022-10-25 18:49:05 +09:00
mrshigure
b0afefafe0
[Effects] Matching 23 effect functions (#831) 
* [Effects] Matching 23 effect functions

* Addressed PR comments
 2022-10-18 19:07:21 +09:00
Unnunu
9a876d74f7
matched some gfx and model functions (#830) 
* matched 3 functions

* two iwa functions

* matched 4 model functions

* alpha decimal

* PR suggestions
 2022-10-18 07:58:52 +09:00
Ethan Roseman
77ee6c819b
More libultra and appendGfx_player_actor (#829) 
* libultra stuff

* vi stuff

* initialize.c

* bss stuff

* appendGfx_player_actor
 2022-10-17 18:51:58 +09:00
HailSanta
342887a94c
kmr + revisions (#828) 
* kmr_07

* more kmr

* kzn cleanup 1-9

* kzn cleanup II

* arn/mgm/gv/end revision

* iwa I

* bubulb spelling

* rest of iwa

* more kmr

* enough kmr_23 for now

* quick fix

Co-authored-by: HailSanta <Hail2Santa@gmail.com>
 2022-10-17 16:46:24 +09:00
Ethan Roseman
46decfa258
Warning Fixies (#826) 
* warnings

* morenings

* more

* morz

* mor3

* PR
 2022-10-16 23:22:18 +09:00
Ethan Roseman
c700116f41
BSS And Libultra (#823) 
* BSS refactor (the Wiseguy method)

* controller.c

* ldiv.c

* motor.c

* cartrominit.c

* more libultra matching + standardization

* more libultra stuff

* more

* clean

* warnings
 2022-10-16 07:24:05 +09:00
HailSanta
fab07c1c8c
area_dro (#821) 
* dro work

* nok varstash dupes

* p1

* rest

* documentin

* fixes

* imports sorted

* dro_01 cleaned up

* dro done

* kmr_06

* cleanup

* mergin

* warnings

* really fix warnings

* git subrepo pull --force tools/splat

subrepo:
  subdir:   "tools/splat"
  merged:   "ebadd64f07"
upstream:
  origin:   "https://github.com/ethteck/splat.git"
  branch:   "master"
  commit:   "ebadd64f07"
git-subrepo:
  version:  "0.4.5"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "aa416e4"

* dead map reorg I

* dead reorg II

* dead reorg III

* dead reorg IV

* got a func

* part of area_kmr

* oops

Co-authored-by: HailSanta <Hail2Santa@gmail.com>
Co-authored-by: Ethan Roseman <ethteck@gmail.com>
 2022-10-15 12:04:53 -04:00
Ethan Roseman
f12e57b7c4
Partner Funcs + Splupdate (#820) 
* progz

* fixies

* git subrepo pull --force tools/splat

subrepo:
  subdir:   "tools/splat"
  merged:   "6c228fc53a"
upstream:
  origin:   "https://github.com/ethteck/splat.git"
  branch:   "master"
  commit:   "6c228fc53a"
git-subrepo:
  version:  "0.4.5"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "aa416e4"

* 3

* func_80238000_703AF0

* Force upgrades of requirements in Jenkinsfile

* --amend

* main_loop finished

* PR comments
 2022-10-15 07:21:50 +09:00
Unnunu
b93928a013
two background gfx functions (#819) 
* matched tattle_cam_pre_render

* matched appendGfx_background_texture

* cleaning up

* fix one warning

* made ARRAY_COUNT and removed unnecessary cast
 2022-10-13 10:16:49 +09:00
Spencer Vaughn
fec4a513ac
Matched effects funcs (#818) 
* thunderbolt_ring: Matched update and main

* snowfall_main: Matched

* shiny_flare_main: Matched

* shiny_flare_update: Matched

* thunderbolt_ring_update: clean up

* rising_bubble_main: matched

* ring_blast: Matched main and update

* quizmo_stage: Matched main and update

* ring_blast_main: Fixed warning message

* PR_818: PR clean up
 2022-10-12 21:39:03 +09:00
mrshigure
5df977a353
[Effects] Migrating data + a couple of functions (#817) 
* [Effects] Migrating data + a couple of functions

* Addressed PR comments
 2022-10-12 09:28:15 +09:00
HailSanta
37e138402f
sbk done (#815) 
* sbk_02

* tex panner enum everywhere

* sbk_02 done

* choice cleanup

* todo imports

* ai reorg

* more reorg

* all sbk done

* all sbk

* reduce warnings

* really fix one

Co-authored-by: HailSanta <Hail2Santa@gmail.com>
 2022-10-12 06:19:39 +09:00
Ethan Roseman
f394da14cb
Floaters (#816) 
* progrz

* 3 big boys

* play_movement_dust_effects

* clean
 2022-10-12 06:13:08 +09:00
HailSanta
2e8a4efa30
area_mim (#813) 
* area_mim

* fixes

* mim is FINISHED, you hear me? FINISHED

* slight improvement

* and this

Co-authored-by: HailSanta <Hail2Santa@gmail.com>
 2022-10-10 18:02:54 -04:00
Unnunu
f918be9c7e
matched 3 npc functions (#814) 
* 3 npc functions

* fixed warnings

* added padding

* code improvements
 2022-10-11 06:57:21 +09:00
Unnunu
cc6f4d9a66
all battle maps done (#812) 
* make BS flags enum everywhere

* area_kpa

* fix merge conflicts

* area_kpa2

* fix merge conflicts

* area_kpa3

* area_kpa4

* matched all battle map functions and some others

* fix warnings
 2022-10-10 12:26:32 +01:00
Ethan Roseman
57c0421151
Map funcs (#811) 
* Many duplicate funcs, still around 41 left :P

* 19 duplicate funcs left

* Finished matching some duplicate funcs in world/area

* wipperz

* hos_01 funcs

* more funx

* 3 hos_04 funcs

* hos_04 funcs

* more hos

* tik_25 func

* mores

* progress

* clean

* mo

* meep

* PRs

Co-authored-by: Nasina7 <nasina987@gmail.com>
 2022-10-09 18:09:41 +09:00
HailSanta
7481bed65b
area_arn (#810) 
* area_arn

* iwa

* iwa cleanup

* run coverage

Co-authored-by: HailSanta <Hail2Santa@gmail.com>
 2022-10-09 01:55:27 -04:00
mrshigure
9a644e30d6
Effect gfx data + some light funcs (#809) 2022-10-08 11:07:10 +01:00
Unnunu
41f5781a1d
tik2/tik3/kzn2/kkj battle maps (#808) 
* area_tik2

* area_tik3

* area_kzn2

* area_kkj

* added area refs
 2022-10-08 11:06:15 +01:00
HailSanta
f96542f52a
area_trd (#807) 
* EVT_PLAY_EFFECT

* area_trd data

* forgot a flag name

* fix bobomb spelling

* todo note

* fix macros

* fixed a couple more

Co-authored-by: HailSanta <Hail2Santa@gmail.com>
 2022-10-07 14:45:58 -04:00
Spencer Vaughn
5afce0b883
Matched effects main funcs (#806) 
* hieroglyphs_main: Initial c

* hieroglyphs_update: Compiled c

* hieroglyphs_main: Matched

* huff_puff_breath_main: Matched

* smoke_burst_main: Matched

* sweat_main: Matched

* PR_806: Updated init signatures

* huff_puff_breath_main: removed unused temp

* smoke_burst_main: Updated fx struct with rgba
 2022-10-07 16:31:45 +09:00
Ethan Roseman
59217b8cf8
A few battle/partner funcs (#804) 
* 5 battle partner funcs

* 3 battle funcs

* rodata fix for the fish

* PR comments
 2022-10-06 09:06:09 +09:00
mrshigure
b7d0ec9921
[Effects] Gfx data + stars_burst (#803) 
* [Effects] Gfx data + stars_burst

* Addressed PR comments
 2022-10-06 08:26:03 +09:00
Unnunu
48588557a4
flo/flo2/tik battle maps (#805) 
* area_flo

* area_flo2

* area_tik
 2022-10-05 19:14:18 -04:00
HailSanta
43c9a7c91d
sbk map data (#802) 
* jan_00 ok

* whale cleanup

* sbk

* format cleanup

* fixes, revisions, and some trd

* stop warnings

Co-authored-by: HailSanta <Hail2Santa@gmail.com>
 2022-10-06 05:11:24 +09:00
Ethan Roseman
73af4eb5a0
Tables & Chairs (sorry no chairs actually) (#800) 
* git subrepo pull --force tools/splat

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

* wips

* more

* wipperz

* it workz

* mdl_make_local_vertex_copy

* sleep_bubble finished + gfx

* fire_breath gfx

* func_800F0490

* func_800EFE2C

* 8a860 funcs

* cleanup + dead cod

* dead clean

* git subrepo pull --force tools/splat

subrepo:
  subdir:   "tools/splat"
  merged:   "a1730f38ad"
upstream:
  origin:   "https://github.com/ethteck/splat.git"
  branch:   "master"
  commit:   "a1730f38ad"
git-subrepo:
  version:  "0.4.5"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "aa416e4"

* cleanup + splat prep

* git subrepo pull --force tools/splat

subrepo:
  subdir:   "tools/splat"
  merged:   "4e5fca24a5"
upstream:
  origin:   "https://github.com/ethteck/splat.git"
  branch:   "master"
  commit:   "4e5fca24a5"
git-subrepo:
  version:  "0.4.5"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "aa416e4"

* bits

* clean

* bss c -> asm

* btl_update_starpoints_display

* is_debug + cleanup

* load_script / 190B20 data

* all the symz

* clean

* cleanup + stuff
 2022-10-04 23:09:23 +09:00
Unnunu
f62c83607e
omo3/pra/dig battle maps (#799) 
* area_pra wip

* temp

* finish area_pra

* omo3 map

* area_dig

* cleaning up

* fixed sprite include

* removed script
 2022-10-04 10:10:23 +09:00
HailSanta
cba14cc73d
end/mgm/tst maps (#798) 
* mgm_00

* mgm_03

* mgm_01 OK

* several btl_kzn2

* reflection cleanup

* more maps

* ok for now

* tst_10

* area tst

* pre mgm

* mgm_02 ok

* mgm_02 cleanup

* added IDs

* end_01 almost compiles

* end_01 OK

* end_01 partially done

* end_01 almost done

* end_01 done

* end_00 OK

* credits include cleanup

* end_00 initial cleanup

* new splits 1

* done end_00 cleanup

* areas mgm, end, tst

* whale stuff

Co-authored-by: HailSanta <Hail2Santa@gmail.com>
 2022-10-03 20:56:24 -04:00
Spencer Vaughn
794618569d
Match 3 effects (#797) 
* func_80240BD4_EA96B4: Initial c

* func_80240BD4_EA96B4: compiles

* func_80240BD4_EA96B4: Match

* func_8024199C_ECB69C: Initial c

* func_8024199C_ECB69C: Compiled c

* func_8024199C_ECB69C: Non matching

* func_80242260_EE8810: Initial c

* func_80242260_EE8810: Compiled c

* func_80242260_EE8810: Non matching

* smoke_burst_update: Initial c

* smoke_burst_update: Compiled c

* smoke_burst_update: updated SmokeBurstFXData

* smoke_burst_update: Matched

* removed asm match

* Fixed warnings

* PR_796: Comment clean up

* PR_796: Added new line after temp declaration

* hieroglyphs_update: Initial c

* hieroglyphs_update: Compiled c

* hieroglyphs_update: Matched

* huff_puff_breath_update: Initial c

* huff_puff_breath_update: Compiled c

* huff_puff_breath_update: Matched

* hieroglyphs_update: Updated effects.h

* hieroglyphs_update: Updated effects.h

* PR_796: Clean up 3

* PR_796: Updated commented struct sizes and updated bools

* PR_796: Updated bools in EA8AE0

* sweat_update: Initial c

* sweat_update: Complied c

* sweat_update: Matched

* sweat_update: Matched clean up

* huff_puff_breath_update: Updated effects struct size

* hieroglyphs_update: Update effects struct size offset

* hieroglyphs_update: Matched clean up

* huff_puff_breath_update: Matched clean up

* PR_797: Updated struct member names

Co-authored-by: Spencer Vaughn <spencer.vaughn@dws.la>
 2022-10-04 03:12:44 +09:00
Spencer Vaughn
c976e6e6fe
First effects match + 3 random functions (#796) 
* func_80240BD4_EA96B4: Initial c

* func_80240BD4_EA96B4: compiles

* func_80240BD4_EA96B4: Match

* func_8024199C_ECB69C: Initial c

* func_8024199C_ECB69C: Compiled c

* func_8024199C_ECB69C: Non matching

* func_80242260_EE8810: Initial c

* func_80242260_EE8810: Compiled c

* func_80242260_EE8810: Non matching

* smoke_burst_update: Initial c

* smoke_burst_update: Compiled c

* smoke_burst_update: updated SmokeBurstFXData

* smoke_burst_update: Matched

* removed asm match

* Fixed warnings

* PR_796: Comment clean up

* PR_796: Added new line after temp declaration

* PR_796: Clean up 3

* PR_796: Updated commented struct sizes and updated bools

* PR_796: Updated bools in EA8AE0

Co-authored-by: Spencer Vaughn <spencer.vaughn@dws.la>
 2022-10-03 08:05:04 +09:00
HailSanta
7b24d78503
area KZN and others (#795) 
* kzn_01

* cleanup

* kzn_05

* sound name

* missed evt_ptr

* splat change

* broken :(

* pan params for other maps

* works, but not great

* some kzn funcs

* documentin

* minor

* kzn_07 funcs

* more matches

* kzn_08

* kzn_06 fixup

* kzn_01_fix

* kzn 5

* kzn_07

* surprisingly OK

* some matches

* letter choice

* refactor

* more maps

* check

* first area done!

* now with extra bonus map

* kzn23

* some camera stuff

* entrances adjustment

* kzn_22 OK

* kzn_22 cleanup

* kzn_20 ok

* kzn_20 cleanup

* kzn_18 ok

* kzn_18 cleanup

* kgr_01

* area kgr done

* kgr_02 renames

* kzn_11

* kzn_17 ok

* kzn_17 cleanup

* kzn_04 done

* kzn_03 ok

* kzn_19

* bad kzn_19

* funcs idk

* figured a thing out

* kzn_19 ok

* some matches

* kzn_19 cleanup

* all kzn funcs

* merg'd

* some kzn btl matches

* vine field renames

* kzn cleanup 1

* kzn cleanup 2

* tab patrol

* trailing space patrol

* piranha anims split

* actor type sounds

* example

* requests + remove hardcoded dma entries

* split vine image

Co-authored-by: HailSanta <Hail2Santa@gmail.com>
Co-authored-by: Ethan Roseman <ethteck@gmail.com>
 2022-09-30 21:44:48 -04:00
Ethan Roseman
473bfa0692
dead_sqrtf, data migration, etc (#790) 
* more goods

* move dead map data to dir

* data migration / splatification

* new splat

* git subrepo pull --force tools/splat

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

* splat fix

* dead_sqrtf bye bye

* fix

* Clover comments

* comment
 2022-09-29 05:52:12 +09:00
Unnunu
50ab50f669
filemenu (#791) 
* migrated filemenu data

* matched filemenu_get_menu_message

* matched the rest of filemenu

* cleaning up

* fix
 2022-09-29 02:09:11 +09:00
mrshigure
70590f890e
[Effects] Matched 29 functions (#789) 
* [Effects] Matched 29 functions

* Fixing a warning

* Addressed PR feedback
 2022-09-28 03:10:05 +09:00
HailSanta
3a8ba482e4
collision stuff (#785) 
* flag fixes

* enum vals

* npc flags

* ai flags

* collision stuff

* ok

Co-authored-by: HailSanta <Hail2Santa@gmail.com>
 2022-09-25 05:01:49 +09:00
HailSanta
b6ab97c066
enum cleanup (#784) 
* flag fixes

* enum vals

* npc flags

* ai flags

Co-authored-by: HailSanta <Hail2Santa@gmail.com>
 2022-09-25 04:34:16 +09:00
Ethan Roseman
87179cdf3f
Shiftability work + splat update (#783) 
* evt bss + shiftability work

* entity BSS

* more BSS

* another follows_vram

* more shift goodz

* git subrepo pull --force tools/splat

subrepo:
  subdir:   "tools/splat"
  merged:   "9af40c5265"
upstream:
  origin:   "https://github.com/ethteck/splat.git"
  branch:   "master"
  commit:   "9af40c5265"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "2f68596"
 2022-09-24 11:21:54 -04:00
HailSanta
3706178f3a
sprite names (#782) 
* initial variation support

* checkpoint

* pass 1

* second pass

* first few

* more

* change anim < 16 format

* next batch

* goomba anims

* more npcs

* safety

* success

* checkpoint

* last of dro

* a few

* checkpoint

* penguins

* conventions

* flowers A

* Flowers B

* partner animation support

* parter stuff

* id cleanup

* laki

* more laki

* laki done

* sushie

* goompa

* watt + bow

* bombette + parakarry

* goombario

* kooper

* goomba family

* spike jr troopa

* jr troopa

* world partners

* goombas

* lee

* chan

* the master

* toads

* mostly toads

* so many toads

* penguins

* nok npcs

* ch 2+3

* rest of chapters

* parade

* green mario harharhar

* battle bowser

* world bowser

* goomba king

* enough sprites for now

Co-authored-by: HailSanta <Hail2Santa@gmail.com>
 2022-09-24 18:04:13 +09:00
mrshigure
79babd7154
Matching more effects (#780) 
* Matching more effects

* Deleted matched functions

* Addressed PR comments

* PR comments and remove goto

Co-authored-by: Ethan Roseman <ethteck@gmail.com>
 2022-09-21 16:09:22 +09:00
Alex Bates
1ad0f7b149
Fix 'badly punctuated parameter list in define' issues (#777) 
* remove defines of old SCRIPT macro

* get rid of uses of unnamed ...
 2022-09-16 08:27:35 -10:00
Alex Bates
4fa83c8ae6
Match src/battle/area_kzn2/59F420.c (petit piranha funcs) (#774) 
* Match func_80218D90_59F470 (src/battle/area_kzn2/59F420.c)

* clean up

* Match func_80218D40_59F420

* name funcs

* fix warnings

* remove double newline
 2022-09-16 06:45:16 -10:00
HailSanta
9ef69b66cf
needed more DEG_TO_RAD (#773) 
* sneaky

* first batch

* DEG_TO_RAD

* some mac_04 funcs

* parasol done

* unk playerstatus fields

* sprite learnin

* new sprite stuff

* yay

* fix a warning

Co-authored-by: HailSanta <Hail2Santa@gmail.com>
 2022-09-15 09:39:16 -10:00
mrshigure
5592b4dae2
Matching effects (#771) 
* Matching effects

* Updated fx_3D_main

* Changing color values to decimal
 2022-09-13 18:52:01 +09:00
HailSanta
81c2817b09
PLAYER_STATUS_FLAGS begone (#772) 
Co-authored-by: HailSanta <Hail2Santa@gmail.com>
 2022-09-13 15:36:06 +09:00
HailSanta
f7e39c0802
player anim + collider surface types (#769) 
* player anim + collider surface types

* added default surface type

* remove unused flags and define surface mask

* revised action table

* checkpoint

* player sprite stuff

* remove currentAnim union

* more actions

* enough

* discharged

Co-authored-by: HailSanta <Hail2Santa@gmail.com>
 2022-09-13 02:26:57 -04:00
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
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
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
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
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
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
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