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,175 Commits 4 Branches 0 Tags 206 MiB
fb828bf8da
Commit Graph

329 Commits

Author SHA1 Message Date
Ethan Roseman
647db26552
Mass function rename from Star Rod + a couple funcs (#298) 
* .

* yaml update

* git subrepo pull --force tools/splat

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

* separate main bss syms

* renames and one match

* SR symbol rename

* fix symbol_addrs

* git subrepo pull tools/splat

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

* remove old artifacts
 2021-06-30 11:27:12 +09:00
Ethan Roseman
8c690d23d1
Assorted Morsels (#297) 
* bss

* 3 audios

* d5a50 stuff

* some icon funcs

* get_icon_render_pos

* PlayerLandJump

* func_80248170

* cleanup

* splat update prep

* git subrepo pull --force tools/splat

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

* git subrepo pull tools/splat

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

* git subrepo pull tools/splat

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

* fix loop in PaperMarioNpcSprites

* git subrepo pull tools/splat

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

* add sha1 to yaml

* git subrepo pull tools/splat

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

* varTable -> union :( + player_api funcs

* 6 more

* 4 more

* 5 mo

* 1 mo

* 1 mo 2

* 5 mo

* player_jump

* 3 mo

* some 18F340

* 6 more

* 6 mo

* nm

* 1

* 1 more

* some PR feedback

* symbol addr update

* UnsetCamera0Flag1000

* SetPlayerSpriteSet2

* action 18

* encounter + a smol hammer

* git subrepo pull (merge) tools/splat

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

* 3 and cleanup

* undo yucky union

* PR comments

* get_enemy_safe

* cleanup

* move VirtualEntity

* attempt to fix doxygen

* 3, cleanup

* broken

* fixed!

* progress

* 2

* 3 and cleanup

* 6 map_api funcs

* 3 map api

* CreateNpc

* BringPartnerOut & NpcFlyTo

* npc_api complete

* update_scripts

* 4 si bois inc si_execute_next_command

* update symbol_addrs

* 2 more and cleanup

* camera struct & do_camera_type_0

* PR feedback

* small tidying
 2021-06-21 13:30:57 +09:00
Ethan Roseman
e9176cb08f
Most of player_api and 18F340 (#296) 
* bss

* 3 audios

* d5a50 stuff

* some icon funcs

* get_icon_render_pos

* PlayerLandJump

* func_80248170

* cleanup

* splat update prep

* git subrepo pull --force tools/splat

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

* git subrepo pull tools/splat

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

* git subrepo pull tools/splat

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

* fix loop in PaperMarioNpcSprites

* git subrepo pull tools/splat

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

* add sha1 to yaml

* git subrepo pull tools/splat

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

* varTable -> union :( + player_api funcs

* 6 more

* 4 more

* 5 mo

* 1 mo

* 1 mo 2

* 5 mo

* player_jump

* 3 mo

* some 18F340

* 6 more

* 6 mo

* nm

* 1

* 1 more

* some PR feedback

* symbol addr update

* UnsetCamera0Flag1000

* SetPlayerSpriteSet2

* action 18

* encounter + a smol hammer

* git subrepo pull (merge) tools/splat

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

* 3 and cleanup

* undo yucky union

* PR comments

* get_enemy_safe

* cleanup

* move VirtualEntity

* attempt to fix doxygen
 2021-06-16 18:52:15 +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
Ethan Roseman
6ec6aab984
Mostly hud stuff (#294) 
* bss

* 3 audios

* d5a50 stuff

* some icon funcs

* get_icon_render_pos

* PlayerLandJump

* func_80248170

* cleanup
 2021-06-07 10:15:48 -04:00
Ethan Roseman
08aad50545
50% Functions Decompiled (#292) 
* part 2 dun

* DivActorLevel4

* Dist3D

* SetBackgroundAlpha & FreeIcon

* update symbol_addrs

* UnkBackgroundFunc3

* anudder

* UnkFogFunc2

* Disasm most remaining data

* model stuff and renames

* update symbol_addrs

* bss

* a5dd0 data migration

* entity funcs

* render_entities

* render_shadows

* entity_get_collision_flags

* 2 map api

* 2 mo

* progress

* fix 2 non-matchings

* clean

* pause_draw_menu_label

* another

* progs

* 50% function count

* remove commented funcs

* symbol_addrs

* PR comments
 2021-05-08 14:34:57 +09:00
Ethan Roseman
ad80f13149
Battle Area + Effect Data (#289) 
* part 2 dun

* DivActorLevel4

* Dist3D

* SetBackgroundAlpha & FreeIcon

* update symbol_addrs

* UnkBackgroundFunc3

* anudder

* UnkFogFunc2

* Disasm most remaining data

* model stuff and renames

* update symbol_addrs
 2021-05-02 04:03:42 +09:00
Ethan Roseman
b2cc576bda
Shops and Battle Areas (#287) 
* fix BSS bs

* more shop stuff

* gamestatus stuff

* name and some nonmatchings

* cleanup

* clean

* battle area data

* DeadUnkFloatFuncAbs

* symz

* removing stuff

* Battle Area Deduplication

* UnkFogFunc
 2021-04-30 02:38:02 +09:00
Maide
24db21f97c
Some 43F0 funcs (#286) 
* Some 43F0 funcs

* Small cleanup

* PR

Co-authored-by: Ethan Roseman <ethteck@gmail.com>
 2021-04-30 02:31: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
df3ef58ba1
Crystal Palace reflection include & name some segments (#274) 
* src/evt section

* evt data

* entity

* update entity func names

* names

* reflection wip

* lol

* ~pra_01

* nabbed em

* match func_80240500_D4D540

* match func_802402F0_D4D330

* last pra include func git add -A

* gCurrentCamID

* reflection.inc.c for pra_01

* reflection.inc.c

* rm

* match a few in tst_11

* use npc flags

Co-authored-by: Ethan Roseman <ethteck@gmail.com>
 2021-04-21 23:19:31 -04:00
Maide
52ca40f632
DenSinH's PR (#269) 2021-04-19 02:30:54 +09:00
Ethan Roseman
8e4df57de7
25.00% (#268) 
* 25.00%

* remove __naked__ and name printContext->unk_4E8

* change rodata strings to []
 2021-04-19 02:25:32 +09:00
Ethan Roseman
f822f04c07
3 down in 7B440 and 77480 (#260) 
* delete dgb data

* 2

* 1 mo

* removing macro

* removing comment

* meowp
 2021-04-17 20:46:17 +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
Ethan Roseman
3315d6010f
Splat refactor (#257) 
* all non-world rodata migrated

* data disasm

* kinda working

* updated yaml

* bloop

* linker header

* configure 2.0

* bin

* mass rename to remove code_

* pause rename

* battle partner stuff

* whew

* more renames

* more renames

* more renaming

* it builds!

* updates

* remove main prefix

* one more thing

* crc, yay0

* .data, .rodata, .bss

* img

* dead_atan2

* it buildsgit add -A

* split battle/partner/6FAD10

* rm &s on sleepy_sheep syms

* sha1sum ninja rule description

* OK but commented out PaperMarioMapFS and PaperMarioNpcSprites

* uncomment

* fix mapfs

* match func_8003CFB4

* .

* clean up and name npc_iter_no_op

* npc.c

* enable cc warnings

* name npc_find_near

* use singular options.asset_path

* smores

* cc_dsl only when needed

* kinda fix configure for splat refactor2

* ok!

* new msg format

* remove old msg format docs

* slight bug fixes, splat adjustment

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

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

* Update symbol addrs

* git subrepo pull tools/splat

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

Co-authored-by: Alex Bates <hi@imalex.xyz>
 2021-04-13 16:47:52 +09:00
pixel-stuck
3fd09d2a7c
Decompile most of code_b72b0_len_15ed0.c (#256) 2021-04-13 01:07:05 +01: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
alex
498694158a
Enum cleanup (#247) 
* various cleanup

* item cleanup

* enums

* enum flags

* NO

* treat didAreaChange as bool in ifs
 2021-04-02 01:50:38 -04:00
Rainchus
ce6b660d64
match funcs in code_a5dd0_len_114e0 (#249) 
* decomp funcs in code_13870_len_6980.c & code_1A1F0_len_5390.c

* fix pr comments

* fix for loops to not be hardcoded

* match some funcs in code_a5dd0_len_114e0

* fix pr comments
 2021-04-02 01:50:15 -04: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
Rainchus
0a96011cfb
decomp funcs in code_13870_len_6980.c & code_1A1F0_len_5390.c (#245) 
* decomp funcs in code_13870_len_6980.c & code_1A1F0_len_5390.c

* fix pr comments

* fix for loops to not be hardcoded
 2021-03-31 02:39:44 +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
alex
c8da41b5e4
Some of code_a5dd0_len_114e0.c (#240) 
* match load_area_specific_entity_data

* wFog

* fix func_8011D72C type

* func_8011BAE8

* clone_model

* clean D_801512E0

* ~set_next_game_mode

* _set_game_mode

* gamemode funcs

* ~step_current_game_mode

* name funcs

* match queue_render_task

* tex panner funcs

* get_entity_type

* Entity::aabb

* GameMode::renderAux

* set_game_mode_slot

* game mode syms
 2021-03-29 03:31:15 +09:00
Ethan Roseman
eac31e27ab
All map data + rodata disasm (#218) 
* Misc early code decomp

* Make expected script

* fix m2ctx

* gOverrideFlags & set/unset macros

* update symbol addrs

* Cleanup and PR comments

* oops

* UnkNpcAIFunc16

* UnkNpcAIFunc17

* UnkNpcAIFunc18

* symbol_addrs

* area_mac data/rodata disassembly

* 16C8E0 segment rodata migration

* delete_actor

* 16F740 funcs

* symbol_addrs

* depend on s files: optional

* UnkNpcAIFunc19

* UnkNpcAIFunc20

* UnkNpcAIFunc21

* UnkNpcAIFunc22

* .

* removing unnecessary lines from splat yaml

* all map rodata disassembled

* all map data disasm

* 2 undefined syms

* fix stuff

* Update splat extensions

* .

* git subrepo pull (merge) tools/splat

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

* git subrepo pull (merge) tools/splat

subrepo:
  subdir:   "tools/splat"
  merged:   "a1db6e1200"
upstream:
  origin:   "https://github.com/ethteck/splat.git"
  branch:   "master"
  commit:   "a1db6e1200"
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:   "45f167b5fd"
upstream:
  origin:   "https://github.com/ethteck/splat.git"
  branch:   "master"
  commit:   "45f167b5fd"
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:   "8d3af099e7"
upstream:
  origin:   "https://github.com/ethteck/splat.git"
  branch:   "master"
  commit:   "8d3af099e7"
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:   "e904556c0c"
upstream:
  origin:   "https://github.com/ethteck/splat.git"
  branch:   "master"
  commit:   "e904556c0c"
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:   "795df1f226"
upstream:
  origin:   "https://github.com/ethteck/splat.git"
  branch:   "master"
  commit:   "795df1f226"
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:   "90787f49bd"
upstream:
  origin:   "https://github.com/ethteck/splat.git"
  branch:   "master"
  commit:   "90787f49bd"
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:   "8f4395956b"
upstream:
  origin:   "https://github.com/ethteck/splat.git"
  branch:   "master"
  commit:   "8f4395956b"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "2f68596"

* Updated splat, fixed alignment stuff, woo

* File split
 2021-03-22 22:29:47 -04:00
Rainchus
042cb625b6
Decomp funcs in code_182B30.c, add some structs to common_structs.h (#216) 
* decomp funcs in code_182B30.c

* decomp funcs in code_10400_len_d30.c

* decomp funcs in code_13870_len_6980.c and code_fee30_len_2d60.c

* resolves issues on pr
 2021-03-21 21:16:00 +09:00
Ethan Roseman
e4480c0f59
Some map funcs, 16C8E0 segment rodata migration, 16F740 funcs, etc (#217) 
* Misc early code decomp

* Make expected script

* fix m2ctx

* gOverrideFlags & set/unset macros

* update symbol addrs

* Cleanup and PR comments

* oops

* UnkNpcAIFunc16

* UnkNpcAIFunc17

* UnkNpcAIFunc18

* symbol_addrs

* area_mac data/rodata disassembly

* 16C8E0 segment rodata migration

* delete_actor

* 16F740 funcs

* symbol_addrs
 2021-03-20 03:17:02 +09:00
Ethan Roseman
577b3e3ebe
Misc decomp (#215) 
* Misc early code decomp

* Make expected script

* fix m2ctx

* gOverrideFlags & set/unset macros

* update symbol addrs

* Cleanup and PR comments

* oops
 2021-03-19 19:25:14 +09:00
Rainchus
44260c5bff
Decoration-related functions (#210) 
* decomp some functions in code_182B30.c

* run coverage.py

* remove blank line

* decomp func_80259A48, func_8025C840, func_8025C8A0, func_8025CCC8, func_8025CD28 in code_182B30.c

* fix small style stuff

* another small style fix
 2021-03-15 12:24:30 +00:00
Rainchus
a7c90175bf
Misc branch (#205) 
* decomp some functions in code_182B30.c

* run coverage.py

* remove blank line
 2021-03-11 03:19:19 -05:00
Ethan Roseman
555102c17c
Misc decomp 3 (#202) 
* data fixes, SoundID rename

* ?

* git subrepo pull tools/splat

subrepo:
  subdir:   "tools/splat"
  merged:   "36030366ce"
upstream:
  origin:   "https://github.com/ethteck/splat.git"
  branch:   "master"
  commit:   "36030366ce"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "2f68596"
 2021-03-10 14:13:02 +09:00
Ethan Roseman
b7a2673672
Misc decomp and rodata migration (#198) 
* misc decomp...2

* re-run disasm

* more shtuff

* rodata stuff

* more rodata stuff

* more rodata migration

* rodata stuff 🐱

* meowp

* git subrepo pull tools/splat

subrepo:
  subdir:   "tools/splat"
  merged:   "199d63489a"
upstream:
  origin:   "https://github.com/ethteck/splat.git"
  branch:   "master"
  commit:   "199d63489a"
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:   "b0f5ab40a2"
upstream:
  origin:   "https://github.com/ethteck/splat.git"
  branch:   "master"
  commit:   "b0f5ab40a2"
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:   "4e79cc1a4e"
upstream:
  origin:   "https://github.com/ethteck/splat.git"
  branch:   "master"
  commit:   "4e79cc1a4e"
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:   "53370e3217"
upstream:
  origin:   "https://github.com/ethteck/splat.git"
  branch:   "master"
  commit:   "53370e3217"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "2f68596"

* OK

* symbol_addrs script update

* PR comments

* fake gross match
 2021-03-07 18:32:24 +00:00
alex
9e6cf181bd
Several partner-related functions (#196) 
* decompile bombette and bow related functions

* decompile bombette and bow related functions

* decompile bombette and bow related functions

* decompile partner function - mainly bombette and bow

* decompile Goombario functions

* OK

* resolve my comments on #190

* rename IsPartnerImmobile funcs

* rm old asm

Co-authored-by: brotenko@gmail.com <brotenko@gmail.com>
 2021-02-27 20:05:02 -05:00
Ethan Roseman
ee7f09bb2b
Snibblets, Tidbits, and Morsels (#188) 
* fixing segment

* redoing subtree

* git subrepo clone https://github.com/ethteck/splat.git tools/splat

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

* fix symbol_addrs

* sweet victory

* reformat collision_main_lateral.s

* Lots of matches, fixed diff.py issue, improved coverage.py

* some more

* update symbol_addrs

* git subrepo pull tools/splat

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

* update symbol_addrs

* fix disasm

* 2 mo

* Jenkinsfile

* PR comments
 2021-02-18 20:54:07 +09: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
brotenko@gmail.com
15228aa8d4 refactor functions according to reviews. 2021-02-13 17:58:00 +01:00
brotenko@gmail.com
19eef41547 add new common_struct EffectInstanceData 2021-02-13 00:51:36 +01:00
brotenko@gmail.com
10a7efd1ae decompile ActorAddMovePos 2021-02-12 23:45:21 +01:00
brotenko@gmail.com
e53d5b620f Decompiled dispatch_event_partner 2021-02-12 22:31:22 +01:00
Alex Bates
d46e65757d fix Matrix4f-related warnings 2021-02-09 11:07:05 +00:00
Ethan Roseman
6dcaac6f7b Merge branch 'master' into star-rod-0-4-0 2021-02-09 11:53:48 +09:00
Alex Bates
592ffd4e48 a 2021-02-06 22:26:35 +00:00
Ethan Roseman
51dbb6e5d7 improve coconut 2021-02-04 20:29:44 +09:00
Ethan Roseman
bbb2a5be7d mo 2021-01-18 00:41:00 +09:00
dark-samus
a4b5d8f200 some stuff 2021-01-16 01:34:36 -05:00
Ethan Roseman
919dd605b2 Merge branch 'master' into entity_funcs 2021-01-16 12:49:56 +09:00
dark-samus
8dfdafb3a6 more PR comments 2021-01-15 21:47:44 -05:00
dark-samus
8a2bb470a9 format 2021-01-15 12:18:27 -05:00
dark-samus
8d533d5615 stuff 2021-01-15 12:01:44 -05:00
Ethan Roseman
70135c6bb2 some gfx funcs 2021-01-13 19:48:54 +09:00
dark-samus
5b4f8d90d1 merge master 2021-01-12 15:11:10 -05:00
dark-samus
dcbb258e45 misc work 2021-01-12 14:45:50 -05:00
Ethan Roseman
42768fc40b gfx syms (thanks 🍀) 2021-01-11 12:52:08 +09:00
dark-samus
6f304364c6 merge master 2021-01-07 14:59:49 -05:00
Ethan Roseman
bdbe0c5e65 a few 2021-01-03 18:34:04 +09:00
Ethan Roseman
89b5336bea 6 more 2021-01-03 18:02:50 +09:00
Ethan Roseman
a697806e00 area_trd_part_3 2021-01-02 20:30:34 +09:00
Ethan Roseman
1c7a19255b Merge branch 'master' into misc-decomp 2021-01-01 10:20:39 +09:00
Ethan Roseman
1ca57773cf UnkBattleFunc1 2020-12-30 15:53:40 +09:00
Alex Bates
77a3238a3b clean up 2020-12-29 11:35:59 +00:00
Alex Bates
724a15c99d i did it 2020-12-29 02:17:34 +00:00
Ethan Roseman
3cb8153d9d Merge branch 'audio-ext' into misc-decomp 2020-12-28 11:45:29 +09:00
Ethan Roseman
6bd5f8dae4 4 funcz 2020-12-27 23:23:36 +09:00
Ethan Roseman
594d5bd2c7 759b0 funcs 2020-12-22 23:58:31 +09:00
Ethan Roseman
f1ee257cdf more 2020-11-28 19:08:38 -05:00
Ethan Roseman
87c2c84869 more 197F40 2020-11-28 11:51:36 -05:00
Ethan Roseman
93c1cb5a4a 197F40 funcs 2020-11-27 14:38:52 -05:00
Ethan Roseman
def7b12a2d e0b30 2020-11-27 01:14:28 -05:00
Ethan Roseman
1e02c566ad a few more 2020-11-26 16:19:34 -05:00
Ethan Roseman
03349746a4 Status->Debuff 2020-11-26 15:34:10 -05:00
Ethan Roseman
3df62667fb Some of 317020 2020-11-23 14:19:13 -05:00
Ethan Roseman
8271cb5636 3251D0 OK 2020-11-23 13:48:34 -05:00
dark-samus
b2f0bdc869 a few more 2020-11-23 02:52:10 -05:00
Ethan Roseman
c5ebc6a376 SetGameStatusUnk84_1 2020-11-22 11:03:02 -05:00
Ethan Roseman
931d3b358b UnkNpcAIFunc3 2020-11-21 20:54:57 -05:00
dark-samus
63429d6ad2 split code_106ef0 and match most funcs 2020-11-21 04:28:02 -05:00
dark-samus
48487dbab0 merge master 2020-11-21 02:45:11 -05:00
dark-samus
03c4960eda some funcs in code_105f90 2020-11-21 02:40:54 -05:00
Ethan Roseman
26417ed814 UnkMusicFunc 2020-11-20 09:44:08 -05:00
Ethan Roseman
0f530e12aa 5 mo 2020-11-19 19:58:41 -05:00
Ethan Roseman
3a2f17b91d a few more 2020-11-19 19:41:49 -05:00
Ethan Roseman
bfe3694532 PR comments 2020-11-19 14:21:59 -05:00
dark-samus
141626664f decompile more entity funcs, split new file 2020-11-19 03:31:22 -05:00
Ethan Roseman
201ce54455 197F40 funcs 2020-11-18 22:17:41 -05:00
Ethan Roseman
e682166792 Merge remote-tracking branch 'origin/master' into cornucopia 2020-11-18 14:10:14 -05:00
dark-samus
d68a3e84a6 merge master 2020-11-18 00:35:50 -05:00
dark-samus
3676d8cd6c decomp more, delete as for matched funcs 2020-11-18 00:32:18 -05:00
Ethan Roseman
f1279977bd various decomp, cleaning splat.yaml 2020-11-18 00:20:28 -05:00
Ethan Roseman
a0ec3e79c3 4 16c8e0 funcs 2020-11-17 22:00:47 -05:00
Ethan Roseman
0192620100
Merge pull request #123 from Kelebek1/Fixes 
Fix a couple functions
 2020-11-17 20:23:49 -05:00
Ethan Roseman
e67d69b88e 4 funcs in code_1A5830 2020-11-15 22:04:33 -05:00
Lavos1
5315827969 Update DecorationTable 2020-11-15 23:15:59 +00:00
Ethan Roseman
d2bd96e127 couple more 2020-11-12 19:27:57 -05:00
Ethan Roseman
38f3e12f66 UI Panels 2020-11-12 13:38:17 -05:00
Ethan Roseman
124a5170b7 more pause decomp 2020-11-12 00:18:35 -05:00
Ethan Roseman
9f69203bb3 badge work 2020-11-10 15:21:37 -05:00
Ethan Roseman
43f11633a3 more syms, file split 2020-11-10 10:11:43 -05:00
Ethan Roseman
0499f2d722 more syms 2020-11-10 00:08:44 -05:00
Ethan Roseman
954eae1e2f some pause stuff 2020-11-09 23:23:01 -05:00
Ethan Roseman
e1626030ff some libultra organization 2020-11-09 21:51:33 -05:00
Ethan Roseman
a4bdc90eac PR comments 2020-11-08 17:38:16 -05:00
dark-samus
ee24e5a629 cleanup 2020-11-08 15:42:47 -05:00
Ethan Roseman
cdd2d6bd15 ASM update and types 2020-11-08 15:40:26 -05:00
dark-samus
1e70aa7667 one more 2020-11-08 15:23:39 -05:00
Ethan Roseman
72f4a180f2 SetNpcFlagBits 2020-11-07 23:33:15 -05:00
dark-samus
783f0a2f83 merge master 2020-11-07 19:33:16 -05:00
dark-samus
18a3e6078b more funcs 2020-11-07 19:30:14 -05:00
Ethan Roseman
1173f4c681 :island: 2020-11-07 14:44:44 -05:00
Ethan Roseman
eff6fe2f10 vec3f 2020-11-06 12:32:30 -05:00
Ethan Roseman
5ae79b7f86 Various decomp 2020-11-05 19:30:17 -05:00
JoshDuMan
58e04b19ba Merge https://github.com/ethteck/papermario into stuff 2020-11-02 18:49:38 -05:00
Ethan Roseman
087b30ab35 a couple more kmrs 2020-11-02 16:04:59 -05:00
JoshDuMan
ee3c059779 Work on world functions. 2020-11-02 02:07:02 -05:00
dark-samus
4ab5a61497 merg 2020-11-02 00:28:46 -05:00
dark-samus
73551cac91 another func, new file split 2020-11-01 20:14:01 -05:00
Ethan Roseman
54cd46a228 Merge branch 'master' into maps 2020-10-31 11:44:54 -04:00
dark-samus
623309db81 some funcs 2020-10-31 03:54:00 -04:00
alex
ed62a6999b
Merge branch 'master' into audio 2020-10-31 05:57:48 +00:00
Ethan Roseman
da058dc095 GetGameStatus75 2020-10-30 00:07:11 -04:00
Ethan Roseman
f94c542a9d Set80151310_0 2020-10-29 22:15:51 -04:00
Ethan Roseman
d0d833cd1d LoadPath 2020-10-29 16:16:39 -04:00
Alex Bates
631afbe477
match many small funcs, rename symbols 2020-10-29 03:48:04 +00:00
Alex Bates
a2329fc84a
match func_8014A964, func_8014AC84 2020-10-29 02:17:11 +00:00
Alex Bates
1a6b1f5fcd
rename MusicPlayer unkFlags to flags 2020-10-29 01:35:05 +00:00
Alex Bates
e0c8108543
match _set_music_track 2020-10-29 01:34:00 +00:00
Alex Bates
9eef0b0273
match set_music_track 
rewrite flag as NOT


clean up set_music_track temps
 2020-10-29 01:34:00 +00:00
Ethan Roseman
90e7a9acab Assorted functions 2020-10-28 02:42:14 -04:00
Ethan Roseman
2d215e6943 Some 1A5830 funcs 2020-10-26 23:31:40 -04:00
Ethan Roseman
eb41485a0a New C file split, many functions decompiled 2020-10-26 19:10:32 -04:00
Ethan Roseman
c2d7449287 SetEntityPosition + co 2020-10-25 22:20:37 -04:00
Ethan Roseman
97f1f96662 SomeItemEntityFunc 2020-10-25 21:12:01 -04:00
Ethan Roseman
4b1f9e0fa5 Some decomp, tons of cleanup 2020-10-24 17:51:27 -04:00
Ethan Roseman
2462200b48 Merge branch 'master' into cornucopia 2020-10-22 17:16:58 -04:00
Ethan Roseman
69a29dc8fc removing extra lines / formatting 2020-10-21 21:43:08 -04:00
dark-samus
49c7ba0239 add list types and fix code that uses them 2020-10-21 20:07:00 -04:00
Ethan Roseman
5bf7732a4e SomeXYZFuncTodoRename 2020-10-21 01:33:24 -04:00
Ethan Roseman
69fd94e161 SetNpcB5_3 2020-10-20 19:02:05 -04:00
Ethan Roseman
6bfd58db59 Merge branch 'master' into cornucopia 2020-10-20 18:00:16 -04:00
Alex Bates
99ac1cf053
update si types 2020-10-20 07:33:40 +01:00
Alex Bates
9b3dedd328
add spaces between structs back 
Whoops
 2020-10-20 04:38:30 +01:00
Alex Bates
23f8d8ee35
add structs/macros for matching map data 2020-10-20 04:11:07 +01:00
Alex Bates
f9a667bc7d
begin script disassembly 2020-10-19 22:58:57 +01:00
Ethan Roseman
0e132ce687 si_handle_bind_🔒 2020-10-18 21:20:07 -04:00
Alex Bates
bbeef1ff98
near-match ActorSpeak 
just regalloc issues
 2020-10-17 21:21:57 +01:00
Ethan Roseman
890fd346e9 🌠 2020-10-16 23:47:10 -04:00
Ethan Roseman
36f2fc2f86 clover we miss you 2020-10-16 22:36:28 -04:00