Commit Graph

216 Commits

Author SHA1 Message Date
Alexander Faßbender
7a6368c960
Decompilation of duplicated functions (#354)
* 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

* :)

* .

* .

* decompile duplicate functions

* :(

* decompile several dupliacte funcions

* decompile several dupliacte funcions

* .

* --

* resolve coverage issue

* rename include-file to specify original use-case

Co-authored-by: Ethan Roseman <ethteck@gmail.com>
2021-08-04 18:12:31 +09: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
8feea763c4
NPC AI funcs (#351)
* UnkNpcAIFunc26

* UnkNpcAIFunc27

* UnkNpcAIFunc28/29

* update symbol addrs
2021-08-01 21:06:57 +09:00
alex
b48eb150d2
battle/action_cmd (#348)
* compile

* improve match

* improve

* ~check_block_input

* match LoadActionCommand

* cleanup

* match SetupMashMeter

* check_block_input much closer

* name action_cmd segments

* make better for great good

* improve again

* revert removing blah

* close

* improve

* match func_80268224

* match func_80268284 wrappers

* improvements

* work on func_80268938

* maide changes to check_block_input

* check_block_input :OK: - thanks Maide!

Co-authored-by: Ethan Roseman <ethteck@gmail.com>
2021-08-01 01:50:10 +09:00
Ethan Roseman
5d69c3454f
effect shims and more battle matches (#347) 2021-07-31 15:32:19 +01:00
alex
90497377b9
split icons (#346)
* split icons

* subsections -> subsegments

Co-authored-by: Ethan Roseman <ethteck@gmail.com>
2021-07-30 02:19:00 +09:00
ThreeMustyFears
a1228bfad9
Match func_800397E8 (#342)
* Match func_800397E8

* Fix function prototype

* Delete func_800397E8.s

* add spaces

* Style changes

* Add flags in enum.h

* Added flags
2021-07-25 04:07:08 +09: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
Ethan Roseman
24e32f8b48
Effect code generation (#338)
* Update symbol_addrs

* effects.h and cleanup

* effect code generation!
2021-07-21 23:46:58 +09:00
Nalfein (Kenny)
22fa63e393
Decomp btl_are_all_enemies_defeated (#337)
* Initial decomp

* Rearrange variable definitions and if-statements

* Getting closer to matching

* Only address matching left

* Rename variables for clarity

* Search and replace was too eager...

* Rewrite as a for-loop. Matches!

* Removed and renamed variables

* Rearrange statements for neatness. Remove unneccessary comments

* Ran coverage

* Change the typing to Actor*

* Rename variables, don't be so literal with return values, and compare pointer to NULL, you dunce

* Move variable definitions around
2021-07-21 23:37:24 +09:00
Alto1772
d23a6cabdf
fix some asm paths in battle/item/ (#336)
* moved asm src path in battle/item as the correct way
* INCLUDE_ASM no indent lol
2021-07-21 14:19:11 +01:00
Ethan Roseman
18837f7303
Shift (#334)
* migrate si.data.s to si.c

* remove unused undefined_sym

* split world script data into individual scripts

Co-authored-by: Alex Bates <hi@imalex.xyz>
2021-07-21 20:52:26 +09:00
Ethan Roseman
53b5004d6e
New images + more (#332)
* no foliage warnings

* new images

* 4 funcs in 16F740

* update symbol addrs

* no more UnkStarFuncs.inc.c

* clean
2021-07-21 20:43:13 +09:00
Alexander Faßbender
83be3c1ea8
Miscellaneous battle/area functions (#330)
* match last bow fumction

* decomp more partner functions

* :)

* :)

* resolve merge conflict and style conflicts

* fix

* decomp :)

* :(

* :(((

* :)

* :(

* :)

* :)))))

* :(

* :/

* idk

* :/

* What

* Done.

* PR comments

Co-authored-by: Ethan Roseman <ethteck@gmail.com>
2021-07-21 20:22:42 +09:00
Nalfein (Kenny)
32de1484d3
Decomp btl_check_enemies_defeated function (#327)
* Decompile btl_check_enemies_defeated function

* Run coverage.py

* Address style for pull request
2021-07-21 15:46:15 +09:00
Codey
45654bd1a2
func_80052E18 (#331) 2021-07-21 07:37:00 +01: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
Ethan Roseman
ed2665a934
Various funcs in 77480, 1A5830, 1776B0 (#328)
* 2 funcs in 77480
* SetPartSize
* 2 funcs in 1A5830
* 34 funcs in 1776B0
2021-07-20 11:51:11 +01:00
Rainchus
186ceb8eb0
decomp hud functions (#324)
* decomp dead functions

* decomp battle functions in 1A5830.c

* delete matched functions .s files

* fix variable names

* decomp hud elements

* merge master, delete asm files

* fix style

* Update src/d5a50_len_5fd0.c

Co-authored-by: alex <hi@imalex.xyz>

Co-authored-by: Ethan Roseman <ethteck@gmail.com>
Co-authored-by: alex <hi@imalex.xyz>
2021-07-20 15:27:49 +09: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
alex
035a0e6db6
is_debug (#322) 2021-07-19 17:22:43 +09:00
Alexander Faßbender
2a4966887c
match battle partner/move functions (#319) 2021-07-18 16:21:37 +01:00
alex
0538a9220b
match update_cameras (#321)
* near-match func_800279B4

* fix lakilester split

* match func_8023A1B0_70DEC0

* match func_800271FC

* further work on func_800279B4

* match update_cameras

* add CAM_FLAGs

* remove CAM macro
2021-07-18 02:04:14 +09:00
Ethan Roseman
a876384c97
fix power bounce and unknown move code/data splits (#320) 2021-07-18 00:21:02 +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
alex
8dc3d81a84
Fix battle/partner/lakilester split (#317)
* near-match func_800279B4

* fix lakilester split

* match func_8023A1B0_70DEC0
2021-07-18 00:06:16 +09:00
ThreeMustyFears
3d2798422a
Match func_8003DFA0 and func_8003E1D0 (#316)
* match func_8003DFA0 and func_8003E1D0

* update return types

* Delete func_8003DFA0.s

* Delete func_8003E1D0.s

* made requested changed to npc.c

* moved prototypes and changed return type to void

* Correcting a couple mistakes 

My bad I think void should have been an EffectInstance* which I got from looking at the matching INCLUDE ASM in src/4ac90_len_3910.c and I forgot to modify src/evt/fx_api.c as it has a prototype for these functions in it

* Update fx_api.c

* further cleanup

Co-authored-by: Ethan Roseman <ethteck@gmail.com>
2021-07-17 23:45:08 +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
d2875030a3
Name files and avoid use of X32 type for functionTemp (#314)
* name entity files

* name encounter_api

* abolish X32
2021-07-16 21:22:21 +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
alex
7cf8bf0b88
Split charsets, matching load_font and load_font_data (#312)
Also use snake_case for splat_ext types
2021-07-16 10:28:37 +01: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
alex
a854c70a5c
Match dma_load_string (#310)
* match dma_load_string

* fix dma_load_string warnings
2021-07-13 21:45:01 +09:00
alex
31b0c3f685
Merge 4DF30 into battle/battle (#309)
* merge 4DF30 into battle/battle

* nomatching load_battle

* oops
2021-07-13 21:33:29 +09:00
alex
da6fd773bb
Disassemble battle/partner/goombario.c (#308)
* name battle/partner/ segments

* name battle_goombario sprites

* battle/partner/goombario data

* update
2021-07-12 22:00:45 +09:00
alex
8decbeb3ff
Disassemble fully battle/area_kmr_part_1 (#307)
* generate c includes for img segments

* flatten battle/item/dusty_hammer.c

needs custom splat

* use .inc.c for c incbins

* fixy

* new stuff

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

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

* remove dumb

* git subrepo pull tools/splat

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

* yaml cleaning

* Further yaml cleanup & battle item refactor

* remove rawptr

* disasm_script: handle = (const) NPC_ANIM

* disasm_script improvements

* wip

* it compiles!

* battles.c -> area.c

* squish warnings

* git subrepo pull tools/splat

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

* all OK except rodata padding

* ok

* ACTOR_SELF

Co-authored-by: Ethan Roseman <ethteck@gmail.com>
2021-07-12 21:06:00 +09:00
Ethan Roseman
7cb1790789
Fix alignment of many data sections (#305)
* generate c includes for img segments

* flatten battle/item/dusty_hammer.c

needs custom splat

* use .inc.c for c incbins

* fixy

* new stuff

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

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

* remove dumb

* git subrepo pull tools/splat

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

* yaml cleaning

* Further yaml cleanup & battle item refactor

* remove rawptr

* git subrepo pull tools/splat

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

* further cleanup

* Further cleanup & match gfx_draw_background

* clean & wip

Co-authored-by: Alex Bates <hi@imalex.xyz>
2021-07-12 18:15:00 +09:00
Ethan Roseman
6484e4883d
Work towards fixing alignment issues (#304) 2021-07-09 15:34:12 +01:00
alex
9dce90da41
Move D_80077908 to state_logos.c (#303)
* rm f270_len_1190.c

* state_logos data
2021-07-09 22:00:35 +09:00
alex
6da5c0e41b
Name many files (#302)
* get_spirits_rescued: use enum StoryProgress

* rename 6240_len_c00 to fio

* rename 1b40_len_20b0 to main_loop

* rename 3bf0_len_6f0 to input

* rename 42e0_len_1f60 to rumble

* rename 6e40_len_500 to curtains

* rename 7340_len_b00 crash

* match func_8002C890

* intro_logos and state_battle split

* rename e940_len_290 to state_startup

* split state_logos and state_pause

* state_file_select

* state_world, state_intro

* state_title_screen

* state_demo

* split game_modes and camera
2021-07-09 01:50:23 +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
425dc5df56
Lots of area func deduplication (#300)
* 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
2021-07-04 17:09:40 +09:00
Ethan Roseman
41417f4d70
All area rodata migrated (#299)
* 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
2021-07-03 20:22:53 +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
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
chansuke
18b9a58860
disable_actor_blur (#291)
* disable_actor_blur

* Fix `part->idleAnimations != 0` to `part->idleAnimations != NULL`
2021-05-02 23:55:11 -04: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
alex
d530ca24cd
Various script cleanup (#284)
* update star_rod_idx_to_c for battles

* name spiked_goomba and paragoomba animations

* name cleft animations

* finish battle struct disasm

* fix for kmr part 3

* name jr troopa animations

Co-authored by: T00nbink <martyntoby@gmail.com>

* ignore star rod crash.xml

* foliage.inc.c

* foliage data

* script: =f -> = (float)

* script: add (int) cast
2021-04-28 17:58:21 +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
Alto1772
df646f1d30
correct some paths (#279)
* rename files to correct src paths

* remove npc/func_8003E338.s
2021-04-25 00:38:15 +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
alex
9900e9a2b8
More image splits (#272)
* A number of new image splits

* Address comments.

* git subrepo pull --force --branch=imgflip tools/splat

subrepo:
  subdir:   "tools/splat"
  merged:   "9caaa45df9"
upstream:
  origin:   "https://github.com/ethteck/splat.git"
  branch:   "imgflip"
  commit:   "9caaa45df9"
git-subrepo:
  version:  "0.4.3"
  origin:   "???"
  commit:   "???"

* use flip_y over flip

* git subrepo pull --force --branch=imgflip tools/splat

subrepo:
  subdir:   "tools/splat"
  merged:   "ef663ec0d5"
upstream:
  origin:   "https://github.com/ethteck/splat.git"
  branch:   "imgflip"
  commit:   "ef663ec0d5"
git-subrepo:
  version:  "0.4.3"
  origin:   "???"
  commit:   "???"

* use flip_y

* git subrepo pull --force --branch=imgflip tools/splat

subrepo:
  subdir:   "tools/splat"
  merged:   "3144dc17f6"
upstream:
  origin:   "https://github.com/ethteck/splat.git"
  branch:   "imgflip"
  commit:   "3144dc17f6"
git-subrepo:
  version:  "0.4.3"
  origin:   "???"
  commit:   "???"

Co-authored-by: JoshDuMan <Joshua.Shoup.1996@gmail.com>
2021-04-22 01:01:00 +09:00
alex
a3e4140101
Sprite stuff (#270)
* root-level configure script

* fix configure on macos?

* fix macos again maybe

* fix messages, add asset stack

* generate map headers from xml maps

* fix sprite_dir asset

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

subrepo:
  subdir:   "tools/splat"
  merged:   "5e36c45558"
upstream:
  origin:   "https://github.com/ethteck/splat.git"
  branch:   "master"
  commit:   "5e36c45558"
git-subrepo:
  version:  "0.4.3"
  origin:   "???"
  commit:   "???"

* name sprite.c

* almost match func_802DD8F8

* match func_802DD8F8

* crusade against unsigned integers

* name some sprite data

* add pylibyaml to requirements.txt
2021-04-19 00:01:59 -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
8422d41f35
sorry bombette (#258) 2021-04-13 18:15:46 +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
Ethan Roseman
eefa9014e2
Rodata migration (#253)
* all non-world rodata migrated

* data disasm
2021-04-06 21:59:55 +09:00
Alex Bates
e1e6231338 remove unused rodata.s 2021-04-03 21:38:36 +01:00
Maide
5c1eefbdc3
Disassemble area_arn (#251) 2021-04-03 18:21:49 +01:00
Ethan Roseman
eacb7bfc55
Fixing func_80025F44 (#250)
* Fixing func_80025F44 in us and jp

* revert JP

* Webhook test
2021-04-03 19:29:56 +09:00
JoshDuMan
287332d2db
Finish disassembling icons. (#252) 2021-04-03 19:04:47 +09: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
JoshDuMan
e7df01db20
Split icons (#242)
* Work

* Ye

* Fix regression

* Disassemble more

* Fix asset folders

* Decomp some more

* Disassemble through usable items

* Finish Key items and do badge disassembly
2021-03-31 13:29:53 +01: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
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
03dc313e03
Revert "Integrated kmc gcc for matching libgultra (#224)" (#238)
* Revert "Integrated kmc gcc for matching libgultra (#224)"

This reverts commit c83d233482.

* also revert install.sh
2021-03-28 13:56:05 +09:00
Ethan Roseman
896639da49
Pause segment images (#235)
* splat update incoming

* git subrepo pull --force tools/splat

subrepo:
  subdir:   "tools/splat"
  merged:   "90fae1a829"
upstream:
  origin:   "https://github.com/ethteck/splat.git"
  branch:   "master"
  commit:   "90fae1a829"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "2f68596"
2021-03-27 18:22:18 +00:00
JoshDuMan
0616d1694e
Work (#227) 2021-03-27 22:17:18 +09:00
Mr-Wiseguy
c83d233482
Integrated kmc gcc for matching libgultra (#224)
Any source files in the src/ultra directory will be compiled using it
Moved epiread and sptaskyield as examples
2021-03-26 11:01:57 -04:00
Ethan Roseman
f46f5d16ac
Dead code data+rodata disasm (#228)
* dead code disasm

* yaml splitting

* rodata almost done

* OK

* some decomp

* DeadUnk1

Co-authored-by: Rain <rainmachus@gmail.com>
2021-03-26 10:52:37 -04: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
Maide
bc383f3485
Fix some functions (#226)
* Bed time

* Fixes 2
2021-03-25 17:56:12 +09:00
Maide
ec2870d218
Update battle item enums (#225)
* a

* Dizzy Dial

* Dried shroom

* Dusty Hammer

* Egg Missile

* Electro Pop

* Fire Flower

* Food

* Fright Jar

* Hustle Drink

* Insecticide Herb

* Life Shroom

* Mushroom

* Mystery (partial)

* Pebble

* Please Come Back

* POW Block

* Repel Gel

* Shooting Star

* Sleepy Sheep

* Snowman Doll

* Stone Cap

* Stop Watch

* Strange Cake

* Strange Cake fixed

* Stone Cap broked

* git subrepo pull --force tools/splat

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

* Static all the things

* Tasty Tonic

* Thunder Bolt

* Thunder Rage

* Ultra Shroom

* Unknown Item

* Volt Shroom

Format & coverage

* Item Ids

* Update enums

* Fix

Co-authored-by: Lavos1 <saintlouisxx@gmail.com>
2021-03-25 02:30:25 +09:00
Maide
f03f08a38f
Battle items (#222)
* a

* Dizzy Dial

* Dried shroom

* Dusty Hammer

* Egg Missile

* Electro Pop

* Fire Flower

* Food

* Fright Jar

* Hustle Drink

* Insecticide Herb

* Life Shroom

* Mushroom

* Mystery (partial)

* Pebble

* Please Come Back

* POW Block

* Repel Gel

* Shooting Star

* Sleepy Sheep

* Snowman Doll

* Stone Cap

* Stop Watch

* Strange Cake

* Strange Cake fixed

* Stone Cap broked

* git subrepo pull --force tools/splat

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

* Static all the things

* Tasty Tonic

* Thunder Bolt

* Thunder Rage

* Ultra Shroom

* Unknown Item

* Volt Shroom

Format & coverage

* Item Ids

Co-authored-by: Lavos1 <saintlouisxx@gmail.com>
2021-03-24 04:39:43 -04:00
Mr-Wiseguy
1b2e728e4d
Decompiled some functions in world.c (#223) 2021-03-24 04:36:06 -04:00
Alto1772
f36df5fcf7
manual asm cleanup + some tiny src path fixes (#221)
* delete unincluded asm

* delete some unincluded snippets

* remove asm os/{osEPiReadIo, osEPiWriteIo}

* move code_fa4c0_len_3bf0/func_{802D7460,802D74C0}

* some rm's and mv's
2021-03-23 23:10:00 +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
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
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
Ethan Roseman
943f612050
Work on 1b40 (#213)
* 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

* fixing rodata

* load_engine_data

* removing undefined syms

* git subrepo pull tools/splat

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

* Skip exceptasm extraction
2021-03-15 22:30:09 +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
Ethan Roseman
8a734c15cd
matched a fire flower func to explain decomp to a friend so here's a PR (#211)
* matched a fire flower func to explain decomp to a friend so here's a PR

* remove unnecessary line
2021-03-13 15:59:26 +00: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
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
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
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
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
Tashi
c1d0cb9cea
Matched chill_out functions (#199)
* matched functions in chill_out

* ran coverage.py

* removed redundant temp variables
2021-03-10 13:18:32 +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
ab79244991
JP rom beginnings (#197)
* data, splat fixes

* fix .gitrepo?

* git subrepo pull tools/splat

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

* audio updates (thanks Clover)

* git subrepo pull tools/splat

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

* work on jp rom

* remove comment

* fix duplicate asm labels

* git subrepo pull (merge) tools/splat

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

* fix configure and delete grub

* git subrepo pull tools/splat

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

* file split, moving things into os

* header
2021-03-04 18:00:56 +09: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
96af288878
Splat update (#195)
* data, splat fixes

* fix .gitrepo?

* git subrepo pull tools/splat

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

* audio updates (thanks Clover)

* git subrepo pull tools/splat

subrepo:
  subdir:   "tools/splat"
  merged:   "c56195a9c5"
upstream:
  origin:   "https://github.com/ethteck/splat.git"
  branch:   "master"
  commit:   "c56195a9c5"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "2f68596"
2021-02-27 01:10:11 +09:00
Ethan Roseman
698cf99458
jp cod (Created the first segment's c files for jp) (#194)
* jp cod

* just have less code and it works

* oops

* removing splat cause subrepo is being dumb

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

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

* move jp stuff + revert configure

* git subrepo pull tools/splat

subrepo:
  subdir:   "tools/splat"
  merged:   "c56195a9c5"
upstream:
  origin:   "https://github.com/ethteck/splat.git"
  branch:   "master"
  commit:   "c56195a9c5"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "2f68596"
2021-02-27 00:36:33 +09:00
Ethan Roseman
68792f4331
Misc decomp (#193)
* 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

* Set80071270_0_16

* UnkFloatFunc2

* fix watt data start

* UnkNpcAIFunc15

* 🐱

* 🐱 🐱

* symbol_addrs

* fix assist.py

* delete unnecessary data file

* fix diff.py, remove parens

* parens
2021-02-22 22:00:49 +09:00
alex
a4e1c2f522
Add versioning (#187)
* fix vscode cpp extension messing with files.associations

* move stuff

* it builds!

* symlink papermario.us.z64

* ci: put baserom in right place

* add jp

* fix splat dir

* ignore starrod dump

* .s deps

* update jenkins

* add dsl back

* configure.py versions

* wups

* fine ethan

* fix paths

* configure: default to only the version(s) with existing baseroms

* fix coverage

* fix progress.py

* progress.py verisoning

* remove format.sh from CONTRIBUTING

* update CONTRIBUTING

* fix first_diff

* diff.py: use ver/current/

* update splat.yaml

* trying to fix subrepo

* git subrepo pull tools/splat

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

* configure fix

* git subrepo pull tools/splat

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

Co-authored-by: Ethan Roseman <ethteck@gmail.com>
2021-02-22 18:21:23 +09:00