Commit Graph

183 Commits

Author SHA1 Message Date
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
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
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
mrshigure
b7d0ec9921
[Effects] Gfx data + stars_burst (#803)
* [Effects] Gfx data + stars_burst

* Addressed PR comments
2022-10-06 08:26:03 +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
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
Unnunu
036115e97d
matched several world functions (#794)
* matched 11 functions

* fix warning
2022-10-01 20:34:49 +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
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
Ethan Roseman
2b40121739
Shiftability work (#778)
* move data includes

* splat yaml comments

* 8a160 data + funcs

* naming things

* 801b0 funcs

* data stuff

* BSS temp removal + new splat accommodations

* git subrepo pull --force tools/splat

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

* splat accommodations

* git subrepo pull --force tools/splat

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

* set vram for seg

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

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

* more goods

* git subrepo pull --force tools/splat

subrepo:
  subdir:   "tools/splat"
  merged:   "470c358834"
upstream:
  origin:   "https://github.com/ethteck/splat.git"
  branch:   "master"
  commit:   "470c358834"
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:   "df424333da"
upstream:
  origin:   "https://github.com/ethteck/splat.git"
  branch:   "master"
  commit:   "df424333da"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "2f68596"

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

subrepo:
  subdir:   "tools/splat"
  merged:   "18eb9cb2e6"
upstream:
  origin:   "https://github.com/ethteck/splat.git"
  branch:   "master"
  commit:   "18eb9cb2e6"
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:   "285a549bc6"
upstream:
  origin:   "https://github.com/ethteck/splat.git"
  branch:   "master"
  commit:   "285a549bc6"
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:   "c523ce1a3a"
upstream:
  origin:   "https://github.com/ethteck/splat.git"
  branch:   "master"
  commit:   "c523ce1a3a"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "2f68596"

* hawaii push

* shiftability work

* DEG_TO_RAD

* git subrepo pull tools/splat

subrepo:
  subdir:   "tools/splat"
  merged:   "6c02ec5ecd"
upstream:
  origin:   "https://github.com/ethteck/splat.git"
  branch:   "master"
  commit:   "6c02ec5ecd"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo.git"
  commit:   "2f68596"
2022-09-17 15:10:37 -04: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
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
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
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
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
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
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
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
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
Ethan Roseman
341ed0040f
some assorted cleanup / commenting of stuff (#722) 2022-06-01 03:39:46 +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
HailSanta
5b7f18a2ca
start chest inc + misc cleanup (#711)
* start chest inc + misc cleanup

* popups

* 5b320 OK

* finish HudScript retyping

* item hud scripts

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

* BattleCam_TargetActor

* renamed functions

* Update src/16F740.c

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

Co-authored-by: alex <16batesa@gmail.com>
2022-05-16 15:18:18 -04:00
pixel-stuck
5f2aca559c
decomp damage_indicator (#705) 2022-05-10 11:25:50 +01: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
HailSanta
cfe089af10
monty mole AI + various enums (#694)
* monty mole AI pt 1

* monty mole AI #2

* enum values for evt priority and flags

* enemy ai flags

* done monty mole + partner enums

* removed union for partner action state

* missed parter action states + cam move flags + entity collision bit

Co-authored-by: HailSanta <Hail2Santa@gmail.com>
2022-04-18 00:36:37 +09:00
HailSanta
0ef8c71bdb
combining various AI and item check imports (#692)
* aggregating AI includes

* workin on AI funcs

* fix

* misc

* ongoing lock dedupe

* item choices

* so many item choices

* dead item choices

* deleted matches

Co-authored-by: HailSanta <Hail2Santa@gmail.com>
Co-authored-by: Ethan Roseman <ethteck@gmail.com>
2022-04-15 12:28:49 +09:00
HailSanta
8d730c5c50
isolated chuck quizmo (#685)
* toad house

* push blocks

* requested cleanup

* quizmo 1

* dro_01, dro_02, hos_03, jan_02

* quizmo jan_03

* kmr_02 quizmo

* quizmo area_mac

* quizmo functions aggregated

* remove functions no longer needed

* cleanup

* cleanclean

* quizmo started data

* quizmo data half done

* nearly done

* fix mislabeled data in dgb_01

* fix QuizRequirement struct

* isolate give item code

* deconflict varstash data name with varTable fields

* misc quizmo cleanup

* quizmo done

* fix file with invalid symbols

* PR comments

Co-authored-by: HailSanta <Hail2Santa@gmail.com>
Co-authored-by: Ethan Roseman <ethteck@gmail.com>
2022-04-12 15:01:58 +09:00
Rainchus
93d8c4989b
More overworld partner functions and other various functions (#680)
* decomp appendGfx_player, fix warnings in 77480.c file

* small style fixes

* fix action state enum and make use of enum

* merge master

* decomp some mario rendering functions

* run coverage.py

* review changes

* use decimal in func arg

* 891b0 and sprite functions

* finish lakilester world file

* run coverage.py

* remove duplication declarations

* requested changes and remove some warnings from sprite.c

* ...run coverage.py

* decomp 2 funcs in throw_spiny.c

* throw_spiny_appendGfx

* match spiny throw.c and remaining kooper overworld functions

* cleanup throw_spiny.c and decomp spin.c

* combine variable declarations in spin.c

* run coverage.py

* more spin.c cleanup

* req changes

Co-authored-by: Ethan Roseman <ethteck@gmail.com>
2022-04-12 10:59:20 +09:00
Ethan Roseman
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
Ethan Roseman
4555d9fab5
StashVars (#679)
* beginnings

* more

* done

* cleanup

* remove sublist.txt
2022-04-08 14:25:49 -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
HailSanta
7dbd1770ec
Santas workshop (#670)
* initial name changes

* hud_element function names

* missing player data fields

* entity cleanup

* missed a few things + starting action states

* some world partner cleanup

* idle/walk/hammer + peach cooking stuff

* clean

Co-authored-by: HailSanta <Hail2Santa@gmail.com>
Co-authored-by: Ethan Roseman <ethteck@gmail.com>
2022-03-26 20:47:10 +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
33254f23be
Map func dedupe & fire breath effect (#661)
* find_duplicates improvements, closer on a func

* UnkFunc54

* UnkFunc55

* UnkFunc56

* fire_breath

* name stuff

* warnings

* cleanup

* .
2022-03-14 02:33:10 +09:00
Ethan Roseman
55a849a50a
De-duplicate more UnkNpcAIMainFunc occurrences (#659) 2022-03-10 19:11:34 +09:00
Ethan Roseman
9cd911765d
File menu & more (#658) 2022-03-10 09:55:38 +00:00
JaThePlayer
2d733f4097
Blast, aura, sleep_bubble, fire_flower, bombette_breaking effects (#656)
* Blast, aura, sleep_bubble, fire_flower, bombette_breaking

* run coverage.py

* Move the typedefs to effects.h
2022-02-25 22:19:53 +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
JaThePlayer
fb828bf8da
music_note.c, shape_spell.c, stat_change.c, tattle_window.c, recover.c data migration (#652)
* music_note.c, shape_spell.c, stat_change.c, tattle_window.c, recover.c data migration

* implement requested changes

* Recover.c data fixes, style changes

* The one newline lol

* f
2022-02-22 00:53:26 +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
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
348d12c4e3
Match some more Libultra (#639) 2022-02-08 14:05:20 +00:00
Ethan Roseman
d2da25dc10
GCC 2.7.2 support (#633)
* name big_smoke_puff

* 0-5

* 6 -> land

* more effect stuff

* flower effects

* name fix

* cloud_puff

* flower splash

* cloud_trail

* 2 more

* more

* a bunch more

* -2F

* more

* the rest

* cleanup and the rest

* attack_result_text

* PR stuffs

* numbaz

* Attempt to get 2.7.2 support working

* Update Jenkinsfile

* try

* fix

* fix issues

* remove KMC_ASM remnants

* NON_EQUIVALENT for the effect gfx func

* We don't need wine
2022-01-29 10:01:26 +09:00
Ethan Roseman
9fa9639575
The Great Effect Naming (#632)
* name big_smoke_puff

* 0-5

* 6 -> land

* more effect stuff

* flower effects

* name fix

* cloud_puff

* flower splash

* cloud_trail

* 2 more

* more

* a bunch more

* -2F

* more

* the rest

* cleanup and the rest

* PR stuffs
2022-01-25 01:58:33 +09:00
Alexander Faßbender
4ef25a394d
Decompile and dedupe dead funcs (#621)
* decompile several dead functions and dedupe some alive counterparts

* .

* dedupe UnkNpcAIFunc46

* resolve issues

* Fix warnings

* .

* PR comments

* clean

* anim IDs

Co-authored-by: Ethan Roseman <ethteck@gmail.com>
2022-01-21 14:54:46 +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
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
JoshDuMan
36e5315fdc
Disassemble Various Data Files (#616)
* Disassemble IWA Battle Map

* Disassemble SBK Battle Map

* Disassemble Quake Hammer

* Disassemble jump.c

* Disassemble Hammer Action Command

* Some Labelling

* Fix symbol_addrs

* Disassemble ISK Part 1 Battle Map

* Restore symbol_addrs
2022-01-13 15:26:42 +09:00
JoshDuMan
79bcd008f9
Battle Map and Move Disassembly (#614) 2022-01-11 02:06:43 -05:00
Ethan Roseman
e60e5fccd1
BSS round 2, hud_element.c funcs (#613)
* 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
2022-01-11 03:25:06 +09:00
Alex Bates
2f86b35b63
Fix KMC_ASM configure flag (#608)
Co-authored-by: Ethan Roseman <ethteck@gmail.com>
2022-01-07 15:02:56 +00:00
HailSanta
acf6b92313
more fields and name consistency (#603)
* npc fields

* npc and actor naming

* missing hit sounds + naming consistenct

* added partner syms and player spin struct

* requested changes

* organized Vec structs

Co-authored-by: HailSanta <Hail2Santa@gmail.com>
2022-01-05 20:05:49 +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
de651a7efb
D_80000000 -> 0x80000000 (#599) 2022-01-02 04:07:25 -08:00
Ethan Roseman
3f946f9f72
The Great Deduplication (50%) (#590)
* UnkNpcAIFunc37

* UnkNpcAIFunc38

* UnkNpcAIFunc39

* UnkNpcAIMainFunc2

* PR comments
2021-12-30 20:54:26 +09:00
Ethan Roseman
5cb9183779
Effects, includes (#589)
* effect_13

* effect_14

* most of effect_15

* clean, standardize effects

* fx_16 wip

* UnkNpcAIFunc35

* includes

* UnkPosFunc2

* UnkNpcAIFunc36

* PR comments
2021-12-30 14:14:55 +09:00
JoshDuMan
69e1a012bd
Partner Script Disassembly (#577)
* frogress

* kooper data

* More Work

* Bombette, Sushi, Parakarry Scripts

* Finish wPartners work.

* Partner BSS
2021-12-28 21:44:31 +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
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
Ethan Roseman
9e1d4db698
First overlay's BSS symbols moved to C (#551)
* 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

* BSS migrated to C for the first overlay

* rename

* PR comments
2021-12-16 17:33:47 +09: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
Rainchus
d9c72e432b
Match more overworld partner functions (#541)
* decomp watt overworld functions

* fix struct that was wrongly changed

* run coverage.py

* requested changes for watt.c and decomp a function from sbk_02

* run coverage.py

* more style changes

* decomp all functions in 92A2B0.c

* run coverage.py

* use map_var instead of hex constant, other style changes

* pull sbk_02.h changes

* ...actually merge master correctly

* decomp most functions in nok_04

* decomp most of 9EDBF0.C, fix warnings in UnkFunc41.inc.c and warnings/decomp in lakilester.c

* run coverage.py

* code review changes + few extra functions

* decomp lakilester functions and fix style in other files

* decomp more laki overworld functions

* add close match for func_802BDDD8_321928

* requested changes

* more requested style changes

* style changes

* last of review changes

* another small style fix

* ...accidentally deleted the f on a float immediate

* decomp world sushie/watt files

* run coverage.py

* small style fixes

* fix 2 warnings in watt.c

* decomp kooper world functions

* requested style changes

* couple more style changes

* decomp kooper world functions

* last style changes

* decomp more kooper world functions

* match world kooper file except 2 non_equivalent

* non matching of last world bow function

* migrate data.s file to bombette.c, also decomp various overoworld partner functions

* match more overworld partner functions

* style changes

* update variable names

* some requested changes done

* add enums and other cleanup to overworld partner files

* run coverage.py

* add a space to watt file

* remove raw pointers from partner files plus other requested changes

* remove goompa raw pointer

Co-authored-by: root <root@DESKTOP-HK751F2.localdomain>
Co-authored-by: Rainchus <Rainchus@github.com>
2021-12-06 21:25:43 +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
Ethan Roseman
34254d102e
appendGfx_message (#520)
* work on appendGfx_message

* :OK:

* indentation

* message window states

* PR comments

* ran formatter

* change some types

* debuggin

* undebuggin

Co-authored-by: Alex Bates <hi@imalex.xyz>
2021-11-12 21:23:43 +09:00
Lightning
4733902ec8
Match _heap_free (#522)
* Committing _heap_free match

* More renames and fixes from PR

* Ver without goto's from Josh

* Accidently left pointers in

* More variable fixes based on calls to _heap_*

* Remove unneeded comments, fix function variable name in header

* Missing a space

* Revert to while loop

* Sneaking in an additional comment about heap_malloc_tail for clarity

* Missed whitespace

* Reduced some comments
2021-11-08 01:58:57 +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
Alexander Faßbender
b9bc4b8af8
Assign dead maps to alive counterparts (#496)
* add information about dead maps

* link the names of dead maps to their alive counterparts

* Update EB1170.c

* remove redundant function declaration

* resolve issues
2021-10-27 11:24:52 +02:00
Alexander Faßbender
beeb5627e6
Deduplicate various dead functions (#494)
* what is dead may never die

* resolve issues

* fixing dead_gPartnerActionStatus2

* .

* resolve issues

Co-authored-by: Ethan Roseman <ethteck@gmail.com>
2021-10-25 16:32:44 +02: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
Rainchus
d84eda49dd
Decomp some functions from watt overworld file (#462)
* decomp watt overworld functions

* fix struct that was wrongly changed

* run coverage.py

* requested changes for watt.c and decomp a function from sbk_02

* run coverage.py

* more style changes

* decomp all functions in 92A2B0.c

* run coverage.py

* use map_var instead of hex constant, other style changes

* cleanup

Co-authored-by: Ethan Roseman <ethteck@gmail.com>
2021-10-11 15:42:26 +09:00
Ethan Roseman
59050ec3e9
Effects & misc (#458)
* fx_6_appendGfx

* update_effects

* effect_6 done

* Update diff.py

* update configure for new splat

* git subrepo pull --force tools/splat

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

* nu stuff / undefined_syms org

* Actor struct refactor to match AddActorVar (thanks Josh)

* various cleanup, matched an obfuscation func

* fx_7 work

* is_block_on_ground

* state_*

* create_entity_shadow, update asm macro to fix diff.py

* set_standard_shadow_scale

* set_npc_shadow_scale and set_peach_shadow_scale

* create_shadow_type

* revert macro.inc

* clear_model_data (thanks Josh)

* cleanup

* mdl_get_next_texture_address

* mdl_set_all_fog_mode

* load_model_textures

* fx_7_appendGfx (effect_7 done)

* fx_8_main

* fx_8_render

* fx_8_update

* func_E0010000

* func_E0010104

* effect_8 done

* effect_8 done

* warnings

* cleanup

* try to fix some warnings

* warnings + change Bowser Slug behavior
2021-10-04 00:44:16 +09:00
Ethan Roseman
4c787f68c1
Effect_6 done, splat, diff updates (#451)
* fx_6_appendGfx

* update_effects

* effect_6 done

* Update diff.py

* update configure for new splat

* git subrepo pull --force tools/splat

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

* nu stuff / undefined_syms org
2021-09-30 18:48:03 +09:00
fig02
5779f5de0e
crash_screen OK (#449)
* crash screen done

* cleanup

* done i think

* crash -> crash_screen

* fix warnings

* size comment

* review
2021-09-30 08:01:31 +09:00
Ian
cedfcbbb89
Decomp most of the pause badge menu (#447)
* Define gMoveTable

* pause_get_total_equipped_bp_cost

* pause_badges_draw_bp_orbs

* pause_badges_cleanup

* pause_badges_init

* pause_badges_try_remove

* pause_badges_handle_input

* pause_badges_try_equip

* WIP on pause_badges_load_badges, almost perfect match

* Full match on pause_badges_load_badges

* Review changes for pause badges

* A few more pause badge review changes, missing some spaces around add/subtract operators

* More small pause badges fixes

* Pause badges review: remove enum typedefs, add names for ranges in ItemID
2021-09-28 16:47:55 +09:00
Alexander Faßbender
205103bf2e
Decompile dead functions (#432)
* decompile several dead functions

* .

* resolve issues and deduplicate StarSpiritEffect structs

* .

* resolve the requested change
2021-09-26 16:52:25 -04:00
Ethan Roseman
e04a2e8330
Set up IDO and match osFlash.c (#424)
* set up IDO, created osFlash, fix newlines in libultra headers

* osFlash OK

* Try to fix Jenkinsfile
2021-09-25 16:31:44 +09:00
Alexander Faßbender
9a50c4cbe1
Decompile dead functions (#429)
* decompile several duplicated dead funcs

* decompile several dead functions

* decompile dead functions

* resolve issue with UnkNpcAIFunc31
2021-09-25 08:06:34 +09:00
Alexander Faßbender
c66590758e
Decompile dead functions (#426)
* decompile several dead functions and add more dead counterparts to existing functions to dead.h

* .

* Update EF2680.c
2021-09-23 10:55:12 +02:00