Commit Graph

62 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
JoshDuMan
55228bd3a7
Fix a few warnings (#601)
* .

* Externs

* Fix a few warnings

* __osGetCause

* Comment

* Ethan
2022-01-04 02:36:01 +09:00
Ethan Roseman
068b8a5b08
B4580 and d0a70_len_4fe0 (#502)
* func_80133A94

* animator stuff

* add_anim_node and animator_node_update_model_transform

* a bunch more

* more

* .

* temp

* create_mesh_animator

* 2 mo

* d0a70 funcs

* more d0a70

* 2 mo

* 1 + cleanup

* 2 mo

* cleanup

* revert change to verbosity for splat

* PR comments
2021-10-30 02:57:15 +09:00
Ethan Roseman
33c9dda3a5
KMC GCC, effects, cleanup, map funcs (#476)
* warnings, cleanup, 2 npc ai funcs

* kmcgcc stuff

* effect_75

* effect_9.c done

* cleanup, work on kmc gcc

* start on fx_73

* guOrtho/guOrthoF

* more libultra/cleanup

* more libultra

* add wine for darwin

* effect_73 done

* UnkQuizFunc

* effect func naming

* name appendGfx funcs

* fix fx_66

* Add KMC wrapper to Jenkinsfile

* mac fixes

* fix macro usage

* oopz

* 3 fixes

* blah

* KMC_ASM

* config changes
2021-10-22 23:01:27 +09:00
Ethan Roseman
969e28c76c
40% (#459)
* cleanup
* some of effect_9
* remove 1 warning
* restore Bowser Slug to his former glory (behavior)
2021-10-03 18:42:38 +01:00
Ethan Roseman
db578d9788
a5dd0 (model file) + filemenu decomp (#420)
* remove some warnings, improve build speed on master

* update Camera

* update_camera_zone_interp not matching but close :/

* cleanup

* configure fix

* cleanup, better gbi macros

* decomp and syms

* a couple more

* 2 more and stuff

* more naming

* 3

* syms

* mdl_get_child_count

* more stuff

* get_model_list_index_from_tree_index

* 5 more

* header org

* update_entity_shadow_position

* fog color funcs

* more color stuff

* display lists

* create_shadow_from_data

* 4 evt shtuffsh

* func_80117D00

* func_80111790

* some BSS

* entity_raycast_down

* MakeEntity and almost step_entity_commandList

* step_current_game_mode

* filemenu stuff

* lots more filemenu stuff

* cleanup

* formatting

* fixes

* 1 more

* more fixes
2021-09-22 20:17:46 +09:00
Alexander Faßbender
ed8f1a9593
Rename string to msg (#414)
* change all occurences of  to  unless they are a chaar-array

* resolve pr review
2021-09-02 17:46:27 +02:00
alex
78a729a7a3
NPC animation cleanup (#384)
* remove BattleID and NpcAnimId typedefs

* change NPC_ANIM generation

* struct for StaticNpc.animations

* ~peach_make_disguise_npc
2021-08-25 01:42:29 +09:00
Ethan Roseman
f5a6d26ca8
Full GCC Compiler (#378)
* fx table work

* fx data

* blah

* render_effects_UI

* split out effects.c

* initial testing of full gcc compiler

* don't touch undefined syms/funcs auto

* git subrepo pull --force tools/splat

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

* 4 npc funcs

* nine sef commands

* test

* test2

* run undefined_syms through cpp, remove bss and dead syms files

* nuContQueryRead

* update compiler

* configure fixes

* Update compiler binaries with latest build

* permuter_settings

* xgcc -> gcc

* change permissions

* .

* fix permuter stuff

* gcc is the bane of my existence

* non-dumb mac cpp

* build .cpp files with g++

* ccache

* hide stdout/stderr from ccache check

* fix #374

* tar something and other

* ok!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!

* lol

* fix linux install

* 👍

* 👍👍

* Make cousin J happy

* always 👍

* git subrepo pull (merge) tools/splat

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

Co-authored-by: alex <16batesa@gmail.com>
2021-08-23 06:55:26 +09:00
alex
de800e9c9f
mass script to evt type rename (#377)
* add process_scripts.py

* mass evt rename
2021-08-23 06:50:10 +09:00
Ethan Roseman
ab96e98acf
Miscellaneoush Decomp 323 (#323)
* more images

* new data file

* 2 undefined syms

* func_80048E34

* Shorten BattleStatus

* git subrepo pull (merge) --force tools/splat

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

* chop away 0x460-onward in BattleState

* battle.c complete!

* .
2021-07-19 20:49:30 +09:00
alex
fcf84633a7
Split jp map_data (#313)
* split jp mapfs

* fix us pm_map_data

* jp title_data

* oops

* avoid placing build files in assets/

* match load_hit_asset

* match load_stage_collision

* name gMapConfig and gMap
2021-07-16 20:08:22 +09:00
pixel-stuck
e61e67ea9b
[WIP] Work on npc.c (#295)
* formatting

* format + misc work

* lots of work on npc.c

* PR comments, asm delet + other misc fixes

* missed one

* temporarily remove cleanup step for testing

* test fix for splat

* test

* o2

* o0

* fix Yay0decompress.c bug

* debug logging

* stuff

* stuff2

* restore stuff

* more PR comments and some general cleanup

* NPC flags + improve match + misc

Co-authored-by: Ethan Roseman <ethteck@gmail.com>
2021-06-15 17:05:16 +09:00
Maide
0ec2010b9b
dro and flo (#285)
* dro_01

* UnkFunc25

* UnkFunc26

* UnkFunc27

* Fixup old UnkFuncs

* a

* UnkFunc28

* UnkFunc29

* UnkFunc30

* dro_02

* UnkFunc30

* UnkFunc31

* UnkFunc33

* UnkFunc34

* UnkFunc35

* UnkFunc36

* Fix splat.yaml and remove asm

* Fixed finally

* a

* flo_00

* update func

* flo_03

* flo_07

* flo_08

* UnkFunc37 & 38

* UnkFunc39

* UnkFunc40

* a

* Some copies

* Func

* flo_09

* Fix linker alignment warnings

* flo_10 (partial)

* flo_11

* flo_12

* flo_13

* UnkFunc41

* Copy funcs

* UnkFunc42

* flo_14

* UnkFunc43

* UnkFunc44

* flo_16

* UnkFunc44

* UnkFunc45

* flo_15

* flo_17

* flo_18

* flo_19

* flo_21

* flo_22

* flo_23

* flo_24

* flo_25

* cya asm

* a

* a

* Finally OK!

* Alter scripts

* Fix food func

* PR1

* PR2

* Add tree structs to disassembly and change names

* tabs to spaces and callback &

* Fix the script too

* PR3

* Fucking newlines
2021-04-30 02:09:30 +09:00
Ethan Roseman
1c0d26e6c6
Tidying and Shops (#282)
* render_curtains

* cleanup

* more cleanup

* cleanup

* update symbol addrs

* asm update

* shop progress

* more cleanup

* update symbol_addrs

* asm cleanup

* .

* new data splits

* rename stuff

* .

* .

* PR stuff
2021-04-27 02:47:38 +09:00
alex
683d0857ff
Fix many compiler & linker warnings (#281)
* fix ld warnings

* fix NpcSettings warn

* get_screen_coords

* various

* bloop

* update INSTALL.md for versioned baseroms
2021-04-25 03:56:22 +09:00
alex
8e47263c3f
Action segments (#259)
* rm debug.i

* match phys_update_action_state

* world/action/idle.c

* ~update_npcs

* document npc_iter_nop

* fix diff.py expected/ location

* struct/naming updates

* update Npc struct via clover

* coverage

* ~world_action_idle_update

* walk, run actions

* jump

* land

* name temp anim

* size for struct

* yucky

* talk

* stuff

* all the action segments

* ~func_802B61E4_E23444

* ~func_802B6000_E287F0

* cleanup

* remove step_entity_updatecmd comment

Co-authored-by: Ethan Roseman <ethteck@gmail.com>
2021-04-17 20:16:13 +09:00
Maide
8fbdc83055
area_dgb (#254)
* area_arn/arn_02

* Signed StoryProgress enum

* arn_03

* Update scripts

* arn_04

* fix kmr

* Broken for Ethan

* Commiting before maybe breaking everything

* Fix star rod

* Add funcs

* arn_05

* arn_07

* arn_08/arn_09

* Cleanup prototypes

* arn_11/12/13

* Cleanup

* Cleanup

* Review

* Add npc flag

* Comments

* dgb_01

* dgb_02

* dgb_03

* dgb_04

* Fixup commented functions

* dgb_05

* dgb_06

* dgb_07

* dgb_08

* dgb_09

* dgb_10

* dgb_11

* dgb_12

* dgb_15

* dgb_13

* dgb_14

* dgb_16

* dgb_17

* dgb_18

* Dumb newlines

* Replacing some funcs, scared I'll break everything to commit NOW!

* More

* More

* More

* a

* b

* c

* d

* e

* f

* remove asm

* Move newlines
2021-04-09 02:42:36 +09:00
Maide
5c1eefbdc3
Disassemble area_arn (#251) 2021-04-03 18:21:49 +01:00
Ethan Roseman
353ab8d051
f270, world, and more (#246)
* 415D90 decomp

* code_415D90 rodata migration

* data migration, decomp

* .

* .

* .

* 4 funcs

* non-matching

* audio part 1

* audio work

* end of snd

* update_symbol_addrs

* .

* 🐔

* .

* sfx func names

* bgm

* more audio

* .

* a few audio funcs

* update section length

* git subrepo pull --force tools/splat

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

* git subrepo pull --force tools/splat

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

* misc-decomp power

* sound

* 4 mo

* more changes

* .

* some f270

* git subrepo pull --force tools/splat

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

* git subrepo pull --force tools/splat

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

* fix is_logo image size

* .

* git subrepo pull tools/splat

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

* state_step_pause

* almost

* fixing symbol_addrs and disasm

* update symbol_addrs

* .

* fix Matrix4f usages

* .

* .

* update_symbol_addrs

* fixes

* I hate bitfields

* load_map_by_IDs

* cleanup

* state_step_logos

* more cleanup

* .

* splat

* PR comments
2021-04-02 03:00:29 +09:00
Maide
21917eb3dc
Enum all the things (#241) 2021-03-29 16:34:39 +09:00
Maide
a8e5d9b1d9
world/area_arn/arn_02 (#236)
* area_arn/arn_02

* Signed StoryProgress enum
2021-03-29 01:05:56 +01:00
Ethan Roseman
4ace4bb0d9
415D90 and Audio (#229)
* 415D90 decomp

* code_415D90 rodata migration

* data migration, decomp

* .

* .

* .

* 4 funcs

* non-matching

* audio part 1

* audio work

* end of snd

* update_symbol_addrs

* .

* 🐔

* .

* sfx func names

* bgm

* more audio

* .

* a few audio funcs
2021-03-26 10:46:45 -04:00
Ethan Roseman
8afd8bf1f1
Various meta work and some decomp (#184)
* some

* DeadUnkTexturePanFunc

* DeadUnkTexturePanFunc2

* move guOrthoF to os

* up

* git subrepo pull tools/splat

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

* Updating bin dir

* git subrepo pull tools/splat

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

* git subrepo pull tools/splat

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

* revert garbage

* :OK:

* git subrepo pull tools/splat

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

* data migration

* 3

* .rodata migration and a buncha funcs

* 2 mo

* some decomp, a file boundary fix

* cleanup

* UnkNpaAIFunc13s

* Update symbol_addrs

* remove sublist

* deleted asm

* data fix

* fix data

* wtf?!

* git subrepo pull tools/splat

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

* symbol_addrs update

* blah

* PR comments
2021-02-16 19:32:34 +09:00
Alex Bates
78c2615e58 match create_partner_npc 2021-02-09 13:07:46 +00:00
dark-samus
f1aa2190d9 typedef gets formatted :( 2021-01-15 17:26:03 -05:00
dark-samus
6fa31ae20a Most PR comments 2021-01-15 17:16:41 -05:00
dark-samus
8a2bb470a9 format 2021-01-15 12:18:27 -05:00
dark-samus
dcbb258e45 misc work 2021-01-12 14:45:50 -05:00
Ethan Roseman
1c7a19255b Merge branch 'master' into misc-decomp 2021-01-01 10:20:39 +09:00
Ethan Roseman
c42debe758 M -> N, StartRumbleWithParams dup 2020-12-28 16:09:39 +09:00
Alex Bates
67d0f32c8f match battle/area_kmr_part_1/battles.c 2020-12-27 12:11:14 +00:00
Ethan Roseman
def7b12a2d e0b30 2020-11-27 01:14:28 -05:00
Ethan Roseman
dcd2acf4fe UnkNpcAIFunc11 2020-11-22 15:47:15 -05:00
Ethan Roseman
4400966849 Merge branch 'master' into cornucopia 2020-11-22 10:07:20 -05:00
Ethan Roseman
7d09429fd6 GetEntryPos 2020-11-21 20:31:57 -05:00
Ethan Roseman
7ae4f565f7 UnkNpcDurationFlagFunc 2020-11-20 09:55:56 -05:00
Ethan Roseman
4b8af37c35 UnkNpcAIFunc1 2020-11-19 23:08:05 -05:00
Alex Bates
e0daee1bb8 generate sprite animation headers 2020-11-11 16:33:55 +00:00
JoshDuMan
58e04b19ba Merge https://github.com/ethteck/papermario into stuff 2020-11-02 18:49:38 -05:00
JoshDuMan
ee3c059779 Work on world functions. 2020-11-02 02:07:02 -05:00
Alex Bates
abcda77e2c MapInitialiser -> MapInit 2020-10-31 20:04:33 +00:00