pmret/papermario
1
0
Fork 0
mirror of https://github.com/pmret/papermario.git synced 2024-11-10 04:52:34 +01:00
Code Issues Packages Projects Releases Wiki Activity
1,928 Commits 5 Branches 0 Tags 206 MiB
af6416de0e
Commit Graph

1928 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
JaThePlayer
af6416de0e
Major Action Command Decomp (#365) 
* Decomp jump and most of tidal wave action commands

* More action commands

* stop_leech.c fully decomped.

* flee.c decomped

* cleanup and function name convention fixes

* slight cleanup

* Move ActionCommand enum to enums.h, style changes

* Changed some numbers to decimal

* That one missing newline

Co-authored-by: Ethan Roseman <ethteck@gmail.com>
 2021-08-17 03:31:45 +09: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
alex
5ba7b53d06
add macOS support to install.sh (#361) 2021-08-14 18:35:23 +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
alex
3dfb922ce0
name shrink and transparent ui anims (#359) 2021-08-12 23:06:28 -04:00
alex
932876f423
use cpp-11 if installed on macOS 2021-08-09 16:59:05 +01:00
alex
508c8ea0c2
update vscode settings 2021-08-09 16:56:33 +01:00
JaThePlayer
18a2781cf1
add ActionCommandStatus, random decomp (#358) 2021-08-06 12:00:15 +01:00
Rainchus
18f0888e91
decomp functions in d5a50 and fix type for widthScale and heightScale (#357) 2021-08-05 09:16:57 +01:00
ThreeMustyFears
f23045e775
Match world/action/jump funcs (#352) 
* Match all funcs

* Update common_structs.h

func_802B6000_E24040 was attempting to assign an f32 to a char[], so I updated these

* Added a couple of flags

* Some requested changes

I couldn't figure out how to get Kelebek1's suggestions for the suggest_player_anim_clearUnkFlag to work, but I managed to do it for sfx_play_sound_at_player

* Update enums.h

Removed unnecessary flag that I previously added

* Update functions.h

* Update 7bb60_len_41b0.c

There were some conflicting declarations so I changed them

* Delete ver/us/asm/nonmatchings/world/action/jump directory

* Update jump.c
 2021-08-04 18:20:16 +09:00
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
Alex Bates
5c5fbf8f0c run coverage on all PRs/pushes 2021-08-02 17:06:17 +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
alex
e789b7542a
configure: allow specification of cflags on a per-file basis in splat.yaml (#345) 
* fix #339

* add --debug and --non-matching configure flags
 2021-07-28 20:47:05 +09:00
alex
390e188de5
fix pm_effects segment not linking correctly on non-clean configures (#344) 2021-07-27 20:36:31 +09:00
Mark Street
2e66caf500
Skip 'sudo' in install.sh if you are already root user (#343) 2021-07-27 12:17:51 +01: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
JoshDuMan
763e071b52
Label some time freeze defines. (#341) 
* Create defines for time freezes.

* Update SaveBlock.c

* Update state_pause.c

* Update 3251D0.c

* Update state_file_select.c

* Update HeartBlock.c

* Update goombario.c

* Update state_battle.c

* Update C4DEF0.c

* Update C4DEF0.c
 2021-07-25 01:34:55 +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
6a033afffb
Shift work (#333) 
* undefined syms cleanup

* moving all remaining undefined funcs to dead_syms (as they're dead)
 2021-07-21 21:02:14 +09: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
alex
cbb656f3c9
add remaining opcode support to script DSL (#329) 
* update dsl caserange and bind syntax

* add bind_padlock

* use dsl buf and arr commands

* clean up foliage.inc.c

* disasm rest of battle/partner/goombario scripts

* fix rest of SI_CMD uses
 2021-07-21 02:43:16 +09: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