pmret/papermario
1
0
Fork 0
mirror of https://github.com/pmret/papermario.git synced 2024-09-19 16:01:48 +02:00
Code Issues Packages Projects Releases Wiki Activity
1,978 Commits 4 Branches 0 Tags 202 MiB
c66590758e
Commit Graph

1978 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alexander Faßbender
c66590758e
Decompile dead functions (#426) 
* decompile several dead functions and add more dead counterparts to existing functions to dead.h

* .

* Update EF2680.c
 2021-09-23 10:55:12 +02:00
eldexterr
f0da0b568e
Added some missing notes to common_structs.h (#423) 
* Update common_structs.h

This ones are actually flags used by Power Rush and Mega Rush, I dunno if they're used for something else tho.

But if you enter in Danger State (2-5HP) and you have equipped Power Rush dangerFlags will be 0x02 not 0x01.

* BattleStatus(0x172-0x177)

Added missing notes from BattleStatus(0x172) & (0x174)

* Update common_structs.h

0x174 declaration is fixed, and now uses currentTurnEnemy instead of currentTurnActor
 2021-09-23 12:26:43 +09:00
ThreeMustyFears
a9179ce7fb
Match use_tweester, and munchlesia + misc partners (#422) 
* update common_structs and enums

* match tweester and munchlesia

* update undefined_syms

* same function in different partners

* run coverage

* some changes

* other spaces

* attempt at deduplicating

* Revert "attempt at deduplicating"

This reverts commit 6393e85703.

Co-authored-by: ThreeMustyFears <>
 2021-09-23 11:06:57 +09:00
Ethan Roseman
5311ed1a44
Attempt to fix Jenkinsfile (#425) 2021-09-22 20:40:16 +09:00
Ethan Roseman
db578d9788
a5dd0 (model file) + filemenu decomp (#420) 
* remove some warnings, improve build speed on master

* update Camera

* update_camera_zone_interp not matching but close :/

* cleanup

* configure fix

* cleanup, better gbi macros

* decomp and syms

* a couple more

* 2 more and stuff

* more naming

* 3

* syms

* mdl_get_child_count

* more stuff

* get_model_list_index_from_tree_index

* 5 more

* header org

* update_entity_shadow_position

* fog color funcs

* more color stuff

* display lists

* create_shadow_from_data

* 4 evt shtuffsh

* func_80117D00

* func_80111790

* some BSS

* entity_raycast_down

* MakeEntity and almost step_entity_commandList

* step_current_game_mode

* filemenu stuff

* lots more filemenu stuff

* cleanup

* formatting

* fixes

* 1 more

* more fixes
 2021-09-22 20:17:46 +09:00
Ethan Roseman
ac5b75763c
Fix alignment (#421) 
* git subrepo pull (merge) tools/splat

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

* OK

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

subrepo:
  subdir:   "tools/splat"
  merged:   "7eb5744b2a"
upstream:
  origin:   "https://github.com/ethteck/splat.git"
  branch:   "master"
  commit:   "7eb5744b2a"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "2f68596"
 2021-09-22 20:09:51 +09:00
Ethan Roseman
0989f8daa0
fix find_duplicates 2021-09-22 19:57:12 +09:00
ThreeMustyFears
b127733cfa
Match spinning flower and slide (#419) 
* match use_spinning_flower.c
* match slide.c
* some partners.c matches
 2021-09-16 13:19:12 +01:00
eldexterr
f95eb165f3
Update common_structs.h (#418) 
This ones are actually flags used by Power Rush and Mega Rush, I dunno if they're used for something else tho.

But if you enter in Danger State (2-5HP) and you have equipped Power Rush dangerFlags will be 0x02 not 0x01.
 2021-09-14 21:33:44 +09:00
jdaster64
472b0059f2
Adding PartnerAfflictEnemy function (#417) 
* Tidal Wave update function

* Tidal Wave merge issues, re-delete ASM

* action_cmd_tidal_wave_update (#379)

* Adding Power Shock 4/5 matching, NON_MATCHING update func

* Responses to comments

* disable ccache on Jenkins :(

* oops

* Fix type warnings for HUD scripts, add function declarations

* Fixing a couple more Power Shock warnings

* Change HudElements* to s32s in Power Shock code

* Added PartnerAfflictEnemy

* Unnest flag checks, remove Jenkinsfile change

Co-authored-by: Ethan Roseman <ethteck@gmail.com>
 2021-09-11 19:31:06 +09:00
alex
d4219ed94c
fix [rainbow] in msg compiler (#416) 
It's unused but I saw the typo
 2021-09-08 19:36:06 +09:00
ThreeMustyFears
b5eb88b9f3
Match super boots (#415) 
* update common_structs.h

* match super boots

* run coverage.py

* missed a couple things

* Update functions.h

* removing a warning

* requested changes

Co-authored-by: ThreeMustyFears <>
 2021-09-08 07:02:00 +09:00
Alexander Faßbender
ed8f1a9593
Rename string to msg (#414) 
* change all occurences of  to  unless they are a chaar-array

* resolve pr review
 2021-09-02 17:46:27 +02:00
Ethan Roseman
1b163a0c4a
Decomp some pause screen map functions (#412) 
* decomp pause screen map functions

* pull upstream and merge

* change get_variable calls to evt_get_variable

* style fixes for map pause screen

* close match on pause_map_init and style in map pause functions

* small pause_map_cleanup change

* Matches (thanks Josh), structs, symbols, cleanup

* cleanup

* Symbol / struct refresh

* further cleanup

* data/rodata disasm, rodata migration, cleanup

* PR comments

* map message ids

Co-authored-by: Rain <rainmachus@gmail.com>
 2021-09-02 20:17:40 +09:00
JaThePlayer
2a8b55c9e1
Battle Popup Decomp (#411) 
* 17D6A0.c decomp

* cleanup

* fix func_8024F84C return type

* BattlePopups renamed to battlePopups

* Rename BattlePopup to PopupMessage and move it to common_structs.h

* Remove unnecessary extern

* Move local declarations inside for loops
 2021-09-02 07:37:46 +09:00
Alexander Faßbender
bcc20df00b
Replace get_variable with evt_get_variable in .s files (#410) 
* rename every function that is part of evt_funcs.h to have the evtt_ prefix.

* remove old .s files

* fix symbol_addrs error

* add evt_ 'prefix' to the dead functions in dead-h

* fix issue with .s files missing the evt_ prefix
 2021-08-29 20:05:08 +02:00
Alexander Faßbender
b198250cde
Rename every function that is a part of evt_funcs.h to have the evt_ prefix (#408) 
* rename every function that is part of evt_funcs.h to have the evtt_ prefix.

* remove old .s files

* fix symbol_addrs error

* add evt_ 'prefix' to the dead functions in dead-h
 2021-08-29 18:51:56 +02:00
Ethan Roseman
3ed6f5b382
Don't uniq warnings and write initial build to file (#407) 
* Don't uniq warnings and write initial build to file

* Don't build twice, turn ccache off by default
 2021-08-30 01:48:23 +09:00
Alexander Faßbender
afab424519
Rename all si_funcs to evt_funcs (#403) 
* resolve #397

* fix libultra

* Match func_80144E4C (#406)

* Update hud_element.c

* Update hud_element.h

* Update hud_element.h

* Delete func_80144E4C.s

* Trigger funcs (#405)

* remove old tools, fix warnings

* almost match si_handle_print_debug_var

* si_goto_end_loop and warnings

* is_trigger_bound and create_trigger

* Cleanup + matching 2 non-matchings

* update_triggers (trigger.c complete)

* fix warnings

* PR comments, m2ctx.py fix

* combine PR #398 with #403

* More entity decomp (#402)

* More entity decomp

* cleanup

* Vec3f instead of 3 floats in structE307C0

* resolve #397

* fix libultra

* combine PR #398 with #403

* decompile evt_goto_end_loop

Co-authored-by: JoshDuMan <40190173+JoshDuMan@users.noreply.github.com>
Co-authored-by: Ethan Roseman <ethteck@gmail.com>
Co-authored-by: JaThePlayer <50085307+JaThePlayer@users.noreply.github.com>
 2021-08-29 23:34:42 +09:00
JaThePlayer
4554a46d39
More entity decomp (#402) 
* More entity decomp

* cleanup

* Vec3f instead of 3 floats in structE307C0
 2021-08-29 23:09:41 +09:00
Ethan Roseman
a865cbdf17
Trigger funcs (#405) 
* remove old tools, fix warnings

* almost match si_handle_print_debug_var

* si_goto_end_loop and warnings

* is_trigger_bound and create_trigger

* Cleanup + matching 2 non-matchings

* update_triggers (trigger.c complete)

* fix warnings

* PR comments, m2ctx.py fix
 2021-08-29 22:44:17 +09:00
JoshDuMan
09459d19b4
Match func_80144E4C (#406) 
* Update hud_element.c

* Update hud_element.h

* Update hud_element.h

* Delete func_80144E4C.s
 2021-08-29 21:12:13 +09:00
Muskellunge
c58b4098f5
decomped AC function (#401) 
* rename func_80242178_7ECE88

* matched tiny function

* decomp AC func

* renamed some vars

* made requested changes

* named temp_s0
 2021-08-27 01:44:37 -04:00
ThreeMustyFears
cdbf170061
Match action_cmd/hit_lava (#399) 2021-08-26 22:52:45 +01:00
alex
b535fd7238
don't comment 'previous declaration of' warnings (#400) 2021-08-26 17:10:41 +09:00
JaThePlayer
0bdf15542e
Chest & Heart Block entities (#393) 2021-08-25 22:29:43 +01:00
Ethan Roseman
ff2c968335
Getting rid of warnings and removing function decl from INCLUDE_ASM (#396) 
* Fix some fx stuff

* INCLUDE_ASM doesn't emit a function decl anymore
 2021-08-26 05:32:48 +09:00
Alexander Faßbender
276b823402
resolve #335 (#395) 2021-08-26 04:40:35 +09:00
Alexander Faßbender
4bdb7280a7
Create dead.h and update dead code units (#394) 
* create dead.h and resolve #350

* Update variables.h

* Update dead.h
 2021-08-26 04:29:59 +09:00
jdaster64
3627d909fc
Power Shock - Adding 4/5 matching funcs (#389) 
* Tidal Wave update function

* Tidal Wave merge issues, re-delete ASM

* action_cmd_tidal_wave_update (#379)

* Adding Power Shock 4/5 matching, NON_MATCHING update func

* Responses to comments

* disable ccache on Jenkins :(

* oops

* Fix type warnings for HUD scripts, add function declarations

* Fixing a couple more Power Shock warnings

* Change HudElements* to s32s in Power Shock code

Co-authored-by: Ethan Roseman <ethteck@gmail.com>
 2021-08-26 03:08:35 +09:00
Alexander Faßbender
109db7c43a
Merge jp and us source directories (#390) 
* 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

* upload broken splat/configure

Co-authored-by: Ethan Roseman <ethteck@gmail.com>
 2021-08-26 01:56:26 +09:00
alex
d0be37641b
Fix a bunch of warnings (#388) 
* git subrepo pull (merge) --force tools/splat

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

* configure: add --no-warn

* clean up hud_element.h

* fix some warnings
 2021-08-25 21:34:03 +09:00
Muskellunge
9103d9b35a
decompiled func_80242178_7ECE88 (#387) 
* decompiled func_80242178_7ECE88

* Delete Paper Mario (U) [!].z64:Zone.Identifier

* update pr
 2021-08-25 19:05:22 +09:00
EllipticEllipsis
0e1100de7f
Remove jumpscare, couple of additions to CONTRIBUTING.md (#386) 
* Remove jumpscare

Allow the faint of heart to build the repo

* Clarify make_expected and add -3 info

* Add info about mips_to_c and m2ctx.py

* Mention -h

* Remove unneded version stuff for make_expected
 2021-08-25 01:08:42 -04:00
alex
015151cbfb
add tools/get_variable.py 2021-08-25 01:17:37 +01:00
Anghelo Carvajal
80ae4e7873
Fix install.sh on Pop!_OS and other Debian derivatives (#385) 2021-08-25 04:16:10 +09:00
alex
f81658b0fa
never use ccache in permuter_settings.toml 2021-08-24 18:11:05 +01:00
alex
78a729a7a3
NPC animation cleanup (#384) 
* remove BattleID and NpcAnimId typedefs

* change NPC_ANIM generation

* struct for StaticNpc.animations

* ~peach_make_disguise_npc
 2021-08-25 01:42:29 +09:00
alex
d726b26287
Enforce warnings count in pull requests (#380) 
* add warnings_count

Stolen from https://github.com/zeldaret/mm.

Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>

* emit only new warnings

* add jp warnings

* fix ccache (lmao)

* slug comments about warnings

* oops

* oops again

* oops again again

* adjust message

* truncate warnings list if there are more than 100

Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>
 2021-08-24 22:30:35 +09:00
alex
023a516a7c
Comment progress change on pull requests (#382) 
also:
* match jp nuContRmbForceStop
* progress.py: emit progress delta by default
 2021-08-24 11:22:24 +01:00
jdaster64
29ea27859d
action_cmd_tidal_wave_update (#379) 2021-08-23 22:54:56 +01:00
Ethan Roseman
f5a6d26ca8
Full GCC Compiler (#378) 
* fx table work

* fx data

* blah

* render_effects_UI

* split out effects.c

* initial testing of full gcc compiler

* don't touch undefined syms/funcs auto

* git subrepo pull --force tools/splat

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

* 4 npc funcs

* nine sef commands

* test

* test2

* run undefined_syms through cpp, remove bss and dead syms files

* nuContQueryRead

* update compiler

* configure fixes

* Update compiler binaries with latest build

* permuter_settings

* xgcc -> gcc

* change permissions

* .

* fix permuter stuff

* gcc is the bane of my existence

* non-dumb mac cpp

* build .cpp files with g++

* ccache

* hide stdout/stderr from ccache check

* fix #374

* tar something and other

* ok!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!

* lol

* fix linux install

* 👍

* 👍👍

* Make cousin J happy

* always 👍

* git subrepo pull (merge) tools/splat

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

Co-authored-by: alex <16batesa@gmail.com>
 2021-08-23 06:55:26 +09:00
alex
de800e9c9f
mass script to evt type rename (#377) 
* add process_scripts.py

* mass evt rename
 2021-08-23 06:50:10 +09:00
ThreeMustyFears
2a571dc6fa
Match sneaky parasol (#376) 
* match sneaky parasol

* coverage.py

* tidying

* more tidying

* missed pointer

* change to --
 2021-08-22 23:10:21 +09:00
Ethan Roseman
2c0cb43181
Tidying (#375) 
* don't touch undefined syms/funcs auto

* git subrepo pull --force tools/splat

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

* 4 npc funcs

* nine sef commands

* test

* test2

* run undefined_syms through cpp, remove bss and dead syms files

* nuContQueryRead

* Remove unnecessary flags

* oops

* oops2
 2021-08-22 22:10:06 +09:00
Andrew
eb8eb93f89
decomp functions from various files (#373) 
* Match func_8024FAE8
* Match func_80260A20
* Match functions in 190B20.c
 2021-08-22 01:22:06 +01:00
ThreeMustyFears
ca1adbcb60
Match ultra boots (#372) 
* match ultra boots

* update PlayerStatus struct

* add func

* update func prototype

* missed something

* coverage.py

* unnessary return

* requested changes

I changed gSpinHistoryPosY, and gSpinHistoryPosAngle to arrays based off of the declarations in 7E9D0.c

Co-authored-by: ThreeMustyFears <>
 2021-08-20 19:31:00 +09:00
alex
048b166d0c
configure: use relative paths & fix arm toolchain 2021-08-18 18:10:11 +01: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
aaf44dceac
effect overlay refactor (#369) 
* 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

* .

* the great effect migration

* PR comments

* main func renames

* proper symbols for the effects table! (mostly)

* effect entry table cleanup

* comments

* Remove old asm, fix fx table

* cleanup

* cleanup
 2021-08-17 12:24:26 +01:00