Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: RainbowTabitha/Mario-Party-Toolkit
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 3.27
Choose a base ref
...
head repository: RainbowTabitha/Mario-Party-Toolkit
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref

Commits on Sep 5, 2024

  1. 3.28

    RainbowTabitha committed Sep 5, 2024
    Copy the full SHA
    a253782 View commit details

Commits on Sep 6, 2024

  1. MP7: Custom Bonus Stars

    RainbowTabitha committed Sep 6, 2024
    Copy the full SHA
    331c7fa View commit details
  2. Last Commit

    RainbowTabitha authored Sep 6, 2024

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    Copy the full SHA
    071056c View commit details

Commits on Sep 16, 2024

  1. Reinitalize repository for the greater good

    RainbowTabitha committed Sep 16, 2024
    Copy the full SHA
    0018f61 View commit details
  2. MP2 bonus stars

    RainbowTabitha committed Sep 16, 2024
    Copy the full SHA
    dd20fcd View commit details
  3. 3.30

    RainbowTabitha committed Sep 16, 2024
    Copy the full SHA
    722181a View commit details
  4. Create CODE_OF_CONDUCT.md

    RainbowTabitha authored Sep 16, 2024

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    Copy the full SHA
    16ed54e View commit details
  5. Update win32.yml

    RainbowTabitha authored Sep 16, 2024

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    Copy the full SHA
    b7953da View commit details

Commits on Oct 4, 2024

  1. 4.0.0-dev1

    RainbowTabitha committed Oct 4, 2024
    Copy the full SHA
    22a1617 View commit details

Commits on Oct 10, 2024

  1. commit this new code

    RainbowTabitha committed Oct 10, 2024
    Copy the full SHA
    753c2e6 View commit details

Commits on Oct 11, 2024

  1. items mp7 complete step 1

    RainbowTabitha committed Oct 11, 2024
    Copy the full SHA
    18d58fd View commit details
  2. round 2/3

    RainbowTabitha committed Oct 11, 2024
    Copy the full SHA
    4eb8225 View commit details
  3. 3.3

    RainbowTabitha committed Oct 11, 2024
    Copy the full SHA
    12eae6a View commit details
  4. possibly fix monitor bug

    RainbowTabitha committed Oct 11, 2024
    Copy the full SHA
    484f0e5 View commit details
  5. 100 float error

    RainbowTabitha committed Oct 11, 2024
    Copy the full SHA
    0eddfbd View commit details

Commits on Oct 14, 2024

  1. stock mp4 items

    RainbowTabitha committed Oct 14, 2024
    Copy the full SHA
    2cf5a70 View commit details
  2. stock more changes

    RainbowTabitha committed Oct 14, 2024
    Copy the full SHA
    ea46918 View commit details
  3. mp4 frame done

    RainbowTabitha committed Oct 14, 2024
    Copy the full SHA
    810fd3f View commit details
  4. frame works

    RainbowTabitha committed Oct 14, 2024
    Copy the full SHA
    9822257 View commit details

Commits on Oct 15, 2024

  1. 4.0.0-dev2

    RainbowTabitha committed Oct 15, 2024
    Copy the full SHA
    a450e5b View commit details
  2. commit this

    RainbowTabitha committed Oct 15, 2024
    Copy the full SHA
    1b83734 View commit details
  3. more changes

    RainbowTabitha committed Oct 15, 2024
    Copy the full SHA
    816075f View commit details
  4. finished shop prices

    RainbowTabitha committed Oct 15, 2024
    Copy the full SHA
    1828a2a View commit details
  5. commit

    RainbowTabitha committed Oct 15, 2024
    Copy the full SHA
    40a1adb View commit details

Commits on Oct 16, 2024

  1. more work

    RainbowTabitha committed Oct 16, 2024
    Copy the full SHA
    62e8087 View commit details
  2. Copy the full SHA
    e402587 View commit details
  3. up version

    RainbowTabitha committed Oct 16, 2024
    Copy the full SHA
    ca1f670 View commit details
  4. dev04 4.0x

    RainbowTabitha committed Oct 16, 2024
    Copy the full SHA
    7804e7f View commit details
  5. stuff

    RainbowTabitha committed Oct 16, 2024
    Copy the full SHA
    2394b7f View commit details
  6. FIX a bug silver found

    RainbowTabitha committed Oct 16, 2024
    Copy the full SHA
    631d601 View commit details
  7. show console on compiled build for now

    RainbowTabitha authored Oct 16, 2024

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    Copy the full SHA
    2ad047e View commit details
  8. Copy the full SHA
    e3c1515 View commit details
  9. Copy the full SHA
    7e82492 View commit details
  10. Update win32.yml

    RainbowTabitha authored Oct 16, 2024

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    Copy the full SHA
    067309e View commit details
  11. another minor fix

    RainbowTabitha committed Oct 16, 2024
    Copy the full SHA
    085b0ce View commit details

Commits on Nov 23, 2024

  1. Update README.md

    RainbowTabitha authored Nov 23, 2024

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    Copy the full SHA
    5956079 View commit details

Commits on Dec 7, 2024

  1. fix scrollbar

    RainbowTabitha committed Dec 7, 2024
    Copy the full SHA
    23ab996 View commit details
  2. test

    RainbowTabitha committed Dec 7, 2024
    Copy the full SHA
    31fab81 View commit details
  3. Copy the full SHA
    9b27ddc View commit details

Commits on Dec 26, 2024

  1. fix for DX injection

    RainbowTabitha authored Dec 26, 2024

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    Copy the full SHA
    4e387bc View commit details

Commits on Feb 4, 2025

  1. fix some codes for mp4-7 to work on console

    RainbowTabitha committed Feb 4, 2025
    Copy the full SHA
    dd64d3a View commit details
  2. fix bug

    RainbowTabitha committed Feb 4, 2025
    Copy the full SHA
    428dc9f View commit details

Commits on Feb 5, 2025

  1. Update marioParty7.py

    RainbowTabitha authored Feb 5, 2025

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    Copy the full SHA
    6699be6 View commit details
Showing with 15,356 additions and 3,420 deletions.
  1. +1 −1 .github/workflows/darwin-arm64.yml
  2. +2 −2 .github/workflows/win32.yml
  3. +68 −0 CODE_OF_CONDUCT.md
  4. +3 −19 README.md
  5. +65 −0 asm/mp4/MP4 vanilla store playerplace and gamephase.asm
  6. +60 −0 asm/mp4/RandomItems 1to3 Vanilla.asm
  7. +0 −118 asm/mp8DKEarlyFirstSpaceOdds.asm
  8. +0 −118 asm/mp8DKEarlyLastSpaceOdds.asm
  9. +0 −118 asm/mp8DKEarlyShopOdd.asm
  10. +0 −118 asm/mp8DKLateFirstSpaceOdds.asm
  11. +0 −118 asm/mp8DKLateLastSpaceOdds.asm
  12. +0 −118 asm/mp8DKLateShopOdd.asm
  13. BIN assets/items/barterBox.png
  14. BIN assets/items/barterBox4.png
  15. BIN assets/items/bowserPhone4.png
  16. BIN assets/items/celluarShopper4.png
  17. BIN assets/items/chanceTimeCharm.png
  18. BIN assets/items/doubleDip.png
  19. BIN assets/items/flyGuy.png
  20. BIN assets/items/gaddbrush.png
  21. BIN assets/items/goldenMushroom4.png
  22. BIN assets/items/hiddenBlockCard.png
  23. BIN assets/items/minusDice.png
  24. BIN assets/items/mushroom4.png
  25. BIN assets/items/plunderChest4.png
  26. BIN assets/items/plusDice.png
  27. BIN assets/items/poisonMushroom4.png
  28. BIN assets/items/reverseMushroom4.png
  29. BIN assets/items/skeletonKey4.png
  30. BIN assets/items/slowDice.png
  31. BIN assets/items/speedDice.png
  32. BIN assets/items/superWarpPipe.png
  33. BIN assets/items/triplePoison.png
  34. BIN assets/items/triplePoisonMushroom.png
  35. BIN assets/items/wackyWatch.png
  36. BIN assets/items/wackyWatch4.png
  37. BIN assets/items/{warpblock1.png → warpBlock1.png}
  38. BIN assets/items/warpBlock4.png
  39. +39 −0 codes/marioParty2.py
  40. +462 −206 codes/marioParty4.py
  41. +15 −8 codes/marioParty5.py
  42. +61 −21 codes/marioParty6.py
  43. +238 −162 codes/marioParty7.py
  44. +3 −3 events/general_inject.py
  45. +46 −0 events/marioParty2_bonusStarReplace.py
  46. +1,298 −502 events/marioParty4_items.py
  47. +4,321 −0 events/marioParty4_items2.py
  48. +2 −2 events/marioParty4_spaceReplace.py
  49. +1 −1 events/marioParty5_bonusStarReplace.py
  50. +2 −2 events/marioParty6_spaceReplace.py
  51. +1 −1 events/marioParty7_battle.py
  52. +72 −0 events/marioParty7_bonusStarReplace.py
  53. +2,508 −1,130 events/marioParty7_items.py
  54. +2 −2 events/marioParty7_spaceReplace.py
  55. +25 −0 frames/marioParty2_frame.py
  56. +4,229 −194 frames/marioParty4_frame.py
  57. +3 −3 frames/marioParty5_frame.py
  58. +5 −5 frames/marioParty6_frame.py
  59. +1,815 −446 frames/marioParty7_frame.py
  60. +6 −0 functions.py
  61. +2 −1 main.py
  62. +1 −1 version.py
2 changes: 1 addition & 1 deletion .github/workflows/darwin-arm64.yml
Original file line number Diff line number Diff line change
@@ -22,7 +22,7 @@ jobs:
run: cd "/Users/runner/work/Mario-Party-Toolkit/Mario-Party-Toolkit/dist/" && rm "Mario Party Toolkit"

- name: Upload Artifact
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
with:
name: MarioPartyToolkit-darwin_arm64
path: /Users/runner/work/Mario-Party-Toolkit/Mario-Party-Toolkit/dist
4 changes: 2 additions & 2 deletions .github/workflows/win32.yml
Original file line number Diff line number Diff line change
@@ -16,10 +16,10 @@ jobs:
run: python -m pip install -r requirements.txt

- name: Build Project (Dynamic build)
run: pyinstaller --onefile .\main.py --add-data "assets/eventTags/*;assets/eventTags/" --add-data "assets/icons/*;assets/icons/" --add-data "assets/items/*;assets/items/" --add-data "assets/logos/*;assets/logos/" --add-data "assets/operation/*;assets/operation/" --add-data "dependencies/win32/*;dependencies/win32/" --add-data "dependencies/bin/*;dependencies/win32/bin/" --name="Mario Party Toolkit" -w --icon="assets/icons/diceBlock.ico"
run: pyinstaller -w --onefile .\main.py --add-data "assets/eventTags/*;assets/eventTags/" --add-data "assets/icons/*;assets/icons/" --add-data "assets/items/*;assets/items/" --add-data "assets/logos/*;assets/logos/" --add-data "assets/operation/*;assets/operation/" --add-data "dependencies/win32/*;dependencies/win32/" --add-data "dependencies/bin/*;dependencies/win32/bin/" --name="Mario Party Toolkit" --icon="assets/icons/diceBlock.ico"

- name: Upload Artifact
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
with:
name: MarioPartyToolkit-win32
path: D:\a\Mario-Party-Toolkit\Mario-Party-Toolkit\dist
68 changes: 68 additions & 0 deletions CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
# LGBTQ Code of Conduct

## 1. Purpose

The primary goal of The Mario Party Toolkit is to be inclusive of the widest range of contributors with diverse backgrounds. We are committed to providing a friendly, safe, and welcoming environment for all, regardless of gender, sexual orientation, ability, ethnicity, socioeconomic status, and religion (or lack thereof).

This Code of Conduct outlines our expectations for behavior within our community and the consequences for unacceptable actions. We encourage everyone to help us create positive and safe experiences for all participants.

## 2. Open [Source/Culture/Tech] Citizenship

Our Code of Conduct aims to enhance open [source/culture/tech] citizenship by encouraging participants to understand and strengthen the relationship between their actions and their effects on the community.

Communities reflect the societies they inhabit, and positive action is necessary to address various forms of inequality and abuses of power. We recognize and appreciate efforts to foster a welcoming, friendly community that encourages full participation.

## 3. Expected Behavior

We expect all community members to:

- Participate actively and authentically, contributing to the health and longevity of our community.
- Exercise respect and consideration in speech and actions.
- Attempt to resolve conflicts through collaboration before escalating them.
- Avoid demeaning, discriminatory, or harassing behavior and language.
- Be mindful of your surroundings and fellow participants. Alert community leaders if you notice a dangerous situation, someone in distress, or violations of this Code of Conduct, even if they seem minor.
- Remember that online interactions and contributions should be respectful and constructive.

## 4. Unacceptable Behavior

The following behaviors are considered harassment and are unacceptable:

- Violence, threats of violence, or violent language directed at another person.
- Sexist, racist, homophobic, transphobic, ableist, or otherwise discriminatory jokes and language.
- Posting or displaying sexually explicit or violent material.
- Posting or threatening to post personally identifying information ("doxing").
- Personal insults related to gender, sexual orientation, race, religion, or disability.
- Inappropriate or invasive requests for personal information.
- Unwelcome sexual attention, including sexualized comments, jokes, or advances.
- Deliberate intimidation, stalking, or following (online or in person).
- Advocating for or encouraging any of the above behaviors.
- Sustained disruption of discussions or project-related activities.

## 5. Consequences of Unacceptable Behavior

Unacceptable behavior from any community member, including sponsors and decision-makers, will not be tolerated. Individuals asked to cease unacceptable behavior must comply immediately. Consequences for unacceptable behavior may include temporary bans or permanent expulsion from the project, without warning.

## 6. Reporting Guidelines

If you experience or witness unacceptable behavior or have other concerns, please notify a community organizer as soon as possible. Contact info: #9.

Organizers are available to assist with reporting and providing support in distressing situations.

## 7. Addressing Grievances

If you believe you have been unfairly accused of violating this Code of Conduct, you should notify Nayla or manifestrev with a concise description of your grievance. Your grievance will be addressed according to the policies in the [Commonwealth of Massachusetts](https://malegislature.gov/Laws/GeneralLaws/PartI/TitleXXII/Chapter161A/Section26)

## 8. Scope

All community participants, including contributors, sponsors, and other guests, are expected to adhere to this Code of Conduct in all online interactions and contributions related to the project. This Code of Conduct applies to unacceptable behavior outside of project activities if it negatively impacts the safety and well-being of community members.

## 9. Contact Info

- Discord: endangerednayla
- Email: naylahanegan@gmail.com

## 10. License and Attribution

This LGBTQ Code of Conduct is distributed by Mario Party Netplay under a Creative Commons Attribution-ShareAlike license.

Portions of text are adapted from the Stumptown Syndicate Citizen Code of Conduct and the Geek Feminism Anti-Harassment Policy.
22 changes: 3 additions & 19 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,23 +1,7 @@
# Mario Party Toolkit
![mptoolkit](https://github.com/EndangeredNayla/Mario-Party-Toolkit/assets/48419040/0dde2000-cfa9-41d6-b996-dbf1d3652bcc)

## Description
Introducing the Mario Party Toolkit, a cutting-edge software designed to transform your Mario Party sessions into a personalized adventure. Developed by a diverse team of talented creators, this toolkit offers unparalleled control over various aspects of your gameplay. Whether you wish to adjust coin gains, manage item RNGs, or customize minigame wins and item prices, the Mario Party Toolkit provides a robust set of features to tailor the game to your liking. With an intuitive graphical user interface (GUI) crafted for ease of use, this toolkit ensures that your gaming experience is both fun and customizable.

Introducing the Mario Party Toolkit, a versatile piece of software designed to revolutionize your Mario Party gaming experience. Developed by a collaborative effort of various talented code creators, this toolkit grants you unprecedented control over the intricacies of your Mario Party sessions. Released initially on GitHub in late 2022, it has now undergone extensive refinement to ensure stability and usability for all enthusiasts.

With the Mario Party Toolkit, gone are the days of passive gameplay, as you wield the power to customize key game elements to your liking. Want to tweak the coin gains anmd losses of Blue Spaces or Red Spaces to intensify the competition? Simply adjust the values with ease. Tired of relying on luck for item acquisition? Take charge of the Item RNGs and tailor them to suit your strategic preferences.

But the customization doesn't stop there. Minigame Wins, Item Prices, and countless other variables are at your command, allowing for endless possibilities to tailor your Mario Party experience to perfection. Whether you seek to level the playing field for all players or create unique challenges for yourself, the Mario Party Toolkit empowers you to do so effortlessly.

Behind the intuitive graphical user interface (GUI) lies the collaborative efforts of numerous code creators, each contributing their expertise to craft a seamless and comprehensive toolkit. While the codes were meticulously crafted by these talented individuals, the user-friendly interface was brought to life by its creator, ensuring accessibility for all users.

Unleash your creativity, elevate your gameplay, and redefine the rules of Mario Party with the Mario Party Toolkit. Get ready to embark on an adventure like never before, where every decision is yours to make, and every outcome is within your control. Download now and join the ranks of Mario Party enthusiasts who refuse to settle for anything less than perfection.

## Downloads

##### Stable Release
- [Windows](https://github.com/EndangeredNayla/Mario-Party-Toolkit/releases/download/latest/MarioPartyToolkit-win32.zip)
- [macOS (arm64)](https://github.com/EndangeredNayla/Mario-Party-Toolkit/releases/download/latest/MarioPartyToolkit-darwin_arm64.zip)

##### Development Release
- [Windows](https://nightly.link/EndangeredNayla/Mario-Party-Toolkit/workflows/win32/master/MarioPartyToolkit-win32.zip)
- [macOS (arm64)](https://nightly.link/EndangeredNayla/Mario-Party-Toolkit/workflows/darwin-arm64/master/MarioPartyToolkit-darwin_arm64.zip)
![credit](https://github.com/user-attachments/assets/fc7a6d7a-8566-42c4-8d4a-a9478b2d4d6c)
65 changes: 65 additions & 0 deletions asm/mp4/MP4 vanilla store playerplace and gamephase.asm
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
#To be inserted at 80086480
#Original instruction
lwz r3, 0 (r4)

#Store current player's placement
#Load curplayer index, multiply by 0x30
lis r15, 0x8018
ori r15, r15, 0xFD02
lbz r15, 0 (r15)

mulli r15, r15, 0x30

#Get current player placement
lis r4, 0x8018
ori r4, r4, 0xFC38 #player structs start

add r4, r4, r15 #now points to cur player

lbz r4, 0x0009 (r4) #cur player placement byte
andi. r4, r4, 0x60
srwi r4, r4, 5 #return player placement

lis r15, 0x8018
ori r15, r15, 0xFD62 #Store player placement on 0x8018FD62

sth r4, 0 (r15)

#Store current game phase (00: Early, 01: Mid, 02: Late)
#Get turn data used for the code
lis r14, 0x8018
ori r14, r14, 0xFCFC
lbz r4, 1 (r14) #Max Turn
lbz r14, 0 (r14) #Current Turn

li r14, 3
divw r4, r4, r14 #Divide Max Turn / 3.

lis r14, 0x8018
ori r14, r14, 0xFCFC
lbz r14, 0 (r14) #Current Turn


li r15, 0 #Earlygame byte
cmpw r14, r4
ble set_gamephase

li r15, 1 #Midgame byte

mulli r4, r4, 2
cmpw r14, r4
ble set_gamephase

li r15, 2 #Lategame byte

set_gamephase:

lis r4, 0x8018
ori r4, r4, 0xFD72 #Store gamephase on 0x8018FD72

sth r15, 0 (r4)

li r14, 0
li r15, 0


60 changes: 60 additions & 0 deletions asm/mp4/RandomItems 1to3 Vanilla.asm
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
#To be inserted at 80083878
#To be inserted at 80083878
#Item Space weights struct
lis r7, 0x8018
ori r7, r7, 0xFD64

# Calculate the range of random values based on percentages
li r3, 0
li r4, 0

loop_calc:
cmpwi r3, 0xE # Exit at 0xE
beq- exit_calc
lhzx r5, r7, r3 # Load the percentage for the current item using r3 as index
add r4, r4, r5 # Add the percentage to the range of random values
addi r3, r3, 1 # Increment index by 1
b loop_calc
exit_calc:

# Call the random integer function
lis r5, 0x8005
ori r5, r5, 0xFB40 # 0x8005FB40 get rand int function
mtctr r5
mr r3, r4
bctrl

# rand integer in r3 in range of percentages array

# Select the item based on the random integer
li r4, 0
li r5, 0
loop_select:
cmpwi r5, 0xE # Exit at 0xE
beq- exit_select
lhzx r6, r7, r5 # Load the percentage for the current item using r5 as index
sub r3, r3, r6 # Subtract the percentage from the random integer
cmpwi r3, 0 # Compare the updated random integer with 0
bge+ loop_increment # If the updated random integer is greater than or equal to 0, continue to the next item
b exit
loop_increment:
addi r4, r4, 1 #item id increment
addi r5, r5, 1 # Increment index by 1
b loop_select
exit:
lis r5, 0x817F
ori r5, r5, 0xFFF0
stw r4, 0 (r5)
cmpwi r4, 8
blt- skipModelIncrement
#there's a gap in the item models starting at gaddlight's item id (8)
addi r4, r4, 1

skipModelIncrement:
lis r5, 0x0007
ori r5, r5, 0x006d #base item id
add r3, r4, r5
li r4, 0 #restore from hook
li r5, 0 #restore from hook
118 changes: 0 additions & 118 deletions asm/mp8DKEarlyFirstSpaceOdds.asm

This file was deleted.

Loading