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

272 Commits

Author SHA1 Message Date
alex
de800e9c9f
mass script to evt type rename (#377) 
* add process_scripts.py

* mass evt rename
 2021-08-23 06:50:10 +09:00
alex
49bee8512b
hud_element.c (#371) 
* generate permuter_settings.toml
* remove -Wshadow (#366)

Co-authored-by: pixel-stuck <mathmcclintic@gmail.com>
 2021-08-18 17:28:32 +01:00
Ethan Roseman
c7a7567d68
FX data/funcs, camera funcs, state funcs (#364) 
* fx table work

* fx data

* blah

* render_effects_UI

* split out effects.c

* battle state menu functions

* render_frame

* clean

* clean

* 4 camera funcs

* state_step_end_battle & symbol names

* state_file_select done

* 111f0 done

* .

* PR comments
 2021-08-17 03:14:58 +09:00
alex
bd529b6edb
some pause BSS, some api deduplication (#363) 
* move some pause bss out of undefined_syms

* dedup LoadPartyImage

* dedup StashVars.inc.c a bit

* put BSS attribute at start of line
 2021-08-17 00:00:00 +09:00
ThreeMustyFears
25dcbe4b92
Match some funcs in world/action/walk (#362) 
* match some walk funcs

* fix D_800F7B40 type

* update functions.h

* update splat.yaml

* remove walk.data.s

* run coverage.py

* remove line at top

* changed brace

* requested changes

Co-authored-by: ThreeMustyFears <>
 2021-08-15 18:28:16 +09:00
Ethan Roseman
3c887e6ac3
curtains.c data work, assorted funcs, new file, etc and cleanup: misc decomp (#360) 
* PlayEffect progress, two insane funcs

* PartnerActionStatus struct and some cleanup

* file split

* physics funcs

* data migration, some decomp

* curtains data, etc

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

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

* PR comments
 2021-08-14 02:27:57 +09:00
JaThePlayer
18a2781cf1
add ActionCommandStatus, random decomp (#358) 2021-08-06 12:00:15 +01:00
Alexander Faßbender
0fb0b32d0c
Decompile several dead and duplicated functions (#353) 2021-08-02 19:03:51 +01:00
Alexander Faßbender
11a6166cd8
Decompile miscellaneous dead funcs and find_duplicates.py (#349) 
* match last bow fumction

* decomp more partner functions

* :)

* :)

* resolve merge conflict and style conflicts

* fix

* decomp :)

* :(

* :(((

* :)

* :(

* :)

* :)))))

* :(

* :/

* idk

* :/

* What

* Done.

* PR comments

* :(

* decompile dead funcs

* find_duplicates.py +x

* rename dead functions and resolve PR

* :)

* .

* .

Co-authored-by: Ethan Roseman <ethteck@gmail.com>
 2021-08-02 23:04:11 +09:00
Ethan Roseman
5d69c3454f
effect shims and more battle matches (#347) 2021-07-31 15:32:19 +01:00
Ethan Roseman
ed9727a34e
Various decomp, use of SCREEN_WIDTH and SCREEN_HEIGHT, etc (#340) 
* Update symbol_addrs

* effects.h and cleanup

* effect code generation!

* func_80024A784

* state_step_demo

* meh

* work on gfx_task_main and cleanup

* state_step_intro

* set_custom_gfx
 2021-07-23 03:48:30 +09:00
Nalfein (Kenny)
9e9bb3a049
Decompile btl_check_player_defeated function (#326) 
* Decompile btl_check_player_defeated

* Ran coverage.py

* Replaced pointer arithmetic with undefined symbol

* Actually did the math to use the correct undefined symbol

* Address style for pull request
 2021-07-20 22:58:08 -04:00
Alexander Faßbender
3763936d82
match star spirits (#325) 2021-07-19 19:27:56 +01: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
Rainchus
bca5129f4c
Match battle functions and some unused/dead functions (#318) 
* decomp dead functions

* decomp battle functions in 1A5830.c

* delete matched functions .s files

* fix variable names
 2021-07-18 00:10:58 +09:00
Ethan Roseman
1beee32dc6
Message work (#315) 
* msg wip

* var name restoration

* rodata padding

* New compiler that supports .bss section attribute!

* -fno-common & cleanup

* clean

* extern bss for now

* msg work

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

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

* msg_draw_prim_rect

* draw_message_window

* render_messages

* draw_string progress

* remove dumb file

* images, data
 2021-07-17 03:27:27 +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
Ethan Roseman
f02743e1cb
Tidying and msg.c work (#311) 
* undefined syms cleanup

* moving all remaining undefined funcs to dead_syms (as they're dead)

* Rename and update MessagePrintState

* msg wip

* B9D60 -> msg

* msg stuff

* .

* PR stuff
 2021-07-13 22:43:14 +09:00
Ethan Roseman
03eccf598f
Misc decomp 534 (#301) 
* splat disasm update

* a little

* splat jtbl robustness

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

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

* some rodata stuff

* git subrepo pull tools/splat

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

* progress

* All area rodata migrated

* UnkDistFunc

* SwitchToPartner

* UnkNpcAIFunc23

* UnkNpcAIFunc24

* UnkNpcAIFunc25

* cleanup & symbol_addrs

* disasm update

* work on fio.c (6240)

* data 'n' tst_04 funcz

* more tst_

* misc & PlayFX3D

* two end_01 funcs

* more shtuff

* fix

* fix2
 2021-07-09 00:53:00 +09:00
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
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
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
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
Ethan Roseman
011a957985
Compiler's Worst Nightmare (#278) 
* 25.00%

* remove __naked__ and name printContext->unk_4E8

* change rodata strings to []

* actually remove

* fix headers

* git subrepo pull --force tools/splat

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

* progress

* .

* .

* some stuff

* git subrepo pull --force tools/splat

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

* :OK:

* 2 graphics funcs!

* woo

* more

* match func_802A15A0_733670 (#276)

* .

* gfx_draw_frame, other fixes

* macros begone!

Co-authored-by: pixel-stuck <mathmcclintic@gmail.com>
 2021-04-23 20:55:30 +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
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
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
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
JoshDuMan
0616d1694e
Work (#227) 2021-03-27 22:17:18 +09: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
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
Ethan Roseman
9e06bed2b2
Fixed gGameStatusPtr (#220) 
* fixed gGameStatusPtr

* fixed non-matching

* PR comments
 2021-03-22 22:25:48 -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
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
Ethan Roseman
a1f7a21114
Rodata migration + other goodz (#208) 
* rodata migration

* a5dd0 rodata migration

* e79b0 rodata migration

* more rodata migration

* more migration

* goombario rodata

* SetNpcCollision32

* removing old stuff

* oops

* UnkBackgroundFunc

* removing unnecessary files

* UnkBackgroundFunc2

* UnkStarFuncs

* .

* misc star decomp and AddHP

* oops

* AddFP

* fix offset, update symbol_addrs

* .

* git subrepo pull tools/splat

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

* re-disasm

* fix effect disasm

* oops

* fix lullaby
 2021-03-13 00:53:11 +09:00
Ethan Roseman
0552ce26d5
Support for "addu" in place of move pseudoinstruction (#206) 
* addu support

* some libultra decomp

* reorganization

* reorg

* comments
 2021-03-11 17:08:22 +09:00
JoshDuMan
f0585ec87c
Some Libultra data and decompilation work (#200) 
* Move osWritebackDCacheAll.s to hasm

* Fix build

* Work on Libultra data and decompilation

* Fix Build

* Fix JP build

* Address comments
 2021-03-10 14:06:53 +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
Ethan Roseman
6d66d5fedb
Odds and Ends (#189) 
* 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

* check_input_status_menu, removing some macros

* a few funcs

* assist updates

* UnkAlphaFunc

* UnkPartnerPosFuncs

* Deleting stuff

* oopz

* dead_syms.txt, UnkNpcAIFunc14

* update symbol_addrs

* cleanup

* symbol_addrs

* cleanup
 2021-02-20 23:41:30 +09: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
Alex Bates
b0f0aaeda8 more undefined syms 2021-02-10 15:30:33 +00:00
Alex Bates
e449d4d448 undefined syms 2021-02-10 15:26:26 +00:00
Alex Bates
8a64d45fc5 undefined syms 2021-02-10 14:42:36 +00:00
Ethan Roseman
251cc995c5 symbol 2021-02-03 22:31:15 +09:00
dark-samus
6fa31ae20a Most PR comments 2021-01-15 17:16:41 -05:00
dark-samus
728f0e44d1 some more fixes 2021-01-15 12:34:27 -05:00
dark-samus
5b4f8d90d1 merge master 2021-01-12 15:11:10 -05:00
Ethan Roseman
42768fc40b gfx syms (thanks 🍀) 2021-01-11 12:52:08 +09:00
Ethan Roseman
765e59e020 blah 2021-01-09 16:55:31 +09:00
dark-samus
6f304364c6 merge master 2021-01-07 14:59:49 -05:00
Mark Street
466a31fe4e Matching code_39cb0_len_100.c 2020-12-24 23:39:47 +00:00
Ethan Roseman
1c52052c12 Merge branch 'master' into audio 2020-12-22 18:13:24 +09:00
Ethan Roseman
bba92dd7d2 condensing some structs! :) 2020-12-08 19:50:14 +09:00
Rain
498027e7a4 decomp initialize_status_menu 2020-12-04 16:36:25 -06:00
Rain
f517de6651 decomp func_8003F4CC and BindIdle (also decomp func_8003F414 but it shares a name with another function causing issues, so it's commented out) 2020-12-03 08:11:20 -06:00
Rain
b85b91ce6c match some functions in code_1a1f0_len_5390.c 2020-12-03 02:07:39 -06:00
dark-samus
63429d6ad2 split code_106ef0 and match most funcs 2020-11-21 04:28:02 -05:00
dark-samus
03c4960eda some funcs in code_105f90 2020-11-21 02:40:54 -05:00
dark-samus
141626664f decompile more entity funcs, split new file 2020-11-19 03:31:22 -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
38f3e12f66 UI Panels 2020-11-12 13:38:17 -05:00
Ethan Roseman
af1a04b440 pause item syms 2020-11-12 00:32:25 -05:00
Ethan Roseman
124a5170b7 more pause decomp 2020-11-12 00:18:35 -05:00
Ethan Roseman
7392e2ca3b more progress 2020-11-10 14:43:24 -05:00
Ethan Roseman
c61554b7e9 asm update 2020-11-10 11:27:02 -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
b78de19ffb random progress 2020-11-09 22:48: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
9b26bd68ad more syms 2020-11-08 14:02:08 -05:00
Ethan Roseman
680cead360 gAnimatedMeshesPtr 2020-11-08 13:39:23 -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
5ae79b7f86 Various decomp 2020-11-05 19:30:17 -05:00
dark-samus
bf34fb3706 Merge branch 'master' of https://github.com/ethteck/papermario into code_102610_funcs 2020-11-02 13:15:27 -05:00
dark-samus
4ab5a61497 merg 2020-11-02 00:28:46 -05:00
dark-samus
cefd4dc016 cleanup 2020-11-01 23:31:33 -05:00
Alex Bates
dd4b9ec6e5 merge master 2020-10-31 20:10:22 +00:00
alex
ed62a6999b
Merge branch 'master' into audio 2020-10-31 05:57:48 +00:00
Alex Bates
debc0016fd
use ld_addrs.h in load_world_script_api 
Renamed from load_map_script_lib
 2020-10-30 16:07:33 +00:00
Alex Bates
cce065d529
badly match func_8014A498 2020-10-29 23:52:24 +00:00
Alex Bates
c1df09dba8
match some cursed funcs + cleanup 2020-10-29 21:37:15 +00:00
Ethan Roseman
0fb1e1ab30 🐶 2020-10-29 16:58:34 -04:00
Alex Bates
631afbe477
match many small funcs, rename symbols 2020-10-29 03:48:04 +00:00
Alex Bates
9c5338c04b
match func_8014AA54 2020-10-29 02:54:01 +00:00
Alex Bates
a2329fc84a
match func_8014A964, func_8014AC84 2020-10-29 02:17:11 +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
4b1f9e0fa5 Some decomp, tons of cleanup 2020-10-24 17:51:27 -04:00
dark-samus
49c7ba0239 add list types and fix code that uses them 2020-10-21 20:07:00 -04:00
Ethan Roseman
5ce835151a fixing extern 2020-10-17 17:48:43 -04:00
Ethan Roseman
890fd346e9 🌠 2020-10-16 23:47:10 -04:00
Ethan Roseman
e1b4b8b594 🐱 2020-10-16 16:29:55 -04:00
Ethan Roseman
369cb32bbc hey rain 2020-10-16 02:09:20 -04:00
Ethan Roseman
5bc8e56a91 treats 2020-10-15 22:05:04 -04:00
Ethan Roseman
f45c24f7c8 Some shtuff 2020-10-15 18:11:56 -04:00
Alex Bates
0a2b3780a3
rename curtain globals 2020-10-15 00:16:44 +01:00
Alex Bates
ff3fbdfa8f
near-match begin_state_intro 2020-10-14 23:22:43 +01:00
Ethan Roseman
3dc2c9fe67 Merge branch 'master' into in-progress 2020-10-14 16:02:26 -04:00
Ethan Roseman
9510d4fff6
Merge pull request #54 from JoshDuMan/Testing 
Begin decompiling nusys
 2020-10-14 15:59:53 -04:00
Alex Bates
e068d2848b
match func_80028838 2020-10-14 17:11:59 +01:00
Ethan Roseman
7cd481c1a2 Merge branch 'master' into in-progress 2020-10-13 21:57:58 -04:00
Ethan Roseman
d7360e4bf7 Some stuff 2020-10-13 21:55:04 -04:00
dark-samus
733b591d5f merge master 2020-10-12 22:16:00 -04:00
dark-samus
430ff41bc6 lots of stuff 2020-10-12 21:28:01 -04:00
Ethan Roseman
2323879ef1
Merge branch 'master' into Testing 2020-10-12 20:32:15 -04:00
Ethan Roseman
011231df41 Many more functions decomped 2020-10-08 15:03:58 -04:00
Ethan Roseman
5794cdf6fc Some more 2020-10-03 16:04:49 -04:00
Ethan Roseman
926df66474 saving for later 2020-10-02 02:07:54 -04:00
dark-samus
c79f950a04 big merg 2020-09-28 16:59:36 -04:00
JoshDuMan
84db54fce8 Merge in master 2020-09-28 00:00:10 -04:00
Ethan Roseman
164c6e76d3 curtains 2020-09-27 14:13:50 -04:00
Ethan Roseman
36c5bde376 more goods 2020-09-26 21:02:29 -04:00
Ethan Roseman
677ec4f4e5 more 2020-09-25 22:49:59 -04:00
Ethan Roseman
210e65c3bf More decomp + coverage fix 2020-09-25 21:51:54 -04:00
Ethan Roseman
bbca99bd94 ASM macro fix, decomp of many 2020-09-25 17:18:09 -04:00
Ethan Roseman
a9e5d79531 more 2020-09-21 23:10:53 -04:00
Ethan Roseman
a1d39c1c1e Sounds and flags 2020-09-21 20:56:17 -04:00
JoshDuMan
0a3874a0d0
Merge branch 'master' into Testing 2020-09-21 01:51:52 -04:00
Ethan Roseman
4e6a401484 byte/flag stuff 2020-09-19 11:16:02 -04:00
dark-samus
bb5d337778 big update 2020-09-18 16:57:52 -04:00
JoshDuMan
ed816c640f hi 2020-09-18 16:48:52 -04:00
dark-samus
94e77f99d1 lots of changes 2020-09-18 16:07:15 -04:00
Ethan Roseman
44ffd33004 PR suggestions, game status macro 2020-09-13 19:03:22 -04:00
Ethan Roseman
ddb9f77fc1 Misc 42e0 funcs, new SQ macro, removing no-builtin 2020-09-11 16:29:52 -04:00
Ethan Roseman
0f1c5c4e55
Merge pull request #48 from ethteck/various-stuff 
Various funcs
 2020-09-08 16:37:20 -04:00
Ethan Roseman
cfd7e16334 PR fixes 2020-09-08 09:06:17 -04:00
Ethan Roseman
373969d474
Merge pull request #43 from nanaian/physics 
match some in code_7bb60, fix coverage.py, fix lint action
 2020-09-08 08:21:20 -04:00
Ethan Roseman
290a7426a5 Various funcs 2020-09-06 11:53:48 -04:00
sonicspiral
b02c9b1bd9 decomp of func_8014A52C from code_e0b30_len_b80 
* updates to undefined_syms
* updates to variables.h
* added helper window_terminal.bat for windows users
original mips to c output
```
s16 func_8014A52C(void) {
    *(void *)0x80159AE2 = (u16)8;
    *(void *)0x80159AE4 = (u16)8;
    return (u16)8;
}
```
 2020-08-30 01:37:51 -07:00
Alex Bates
21d4a26913
Merge master into physics 2020-08-24 13:49:18 +01:00
Ethan Roseman
a264959d8c
Merge pull request #40 from JoshW-7/master 
Some new global variables & matching script functions
 2020-08-23 22:03:49 -04:00
Jdog
47b70ab74f Remember to hit ctrl+s on documents. It's important. 2020-08-23 18:40:11 -07:00
Jdog
c140901612 #include enums.h in variables.h to make format script happy 2020-08-22 16:39:45 -07:00
Jdog
efe89e4486 Added gPlayerActionState, gPlayerAnimation, gPlayerNpc. Modifed PlayerStatus->actionState from u8 to s8. Defined ActionState enum as s8 type. A handful more script functions matched. 2020-08-22 16:24:51 -07:00
dark-samus
0b5afedb5e merge master 2.0: electric boogaloo 2020-08-22 03:45:12 -04:00
dark-samus
f02ad05c4f merge master 2020-08-22 03:43:30 -04:00
Ethan Roseman
002b75f461 Data support 2020-08-21 23:32:59 -04:00
Alex Bates
79944164d9
wip: set_action_state 2020-08-20 19:43:45 +01:00