-
Notifications
You must be signed in to change notification settings - Fork 27
Duskull, Kecleon, Kangaskhan Overlays + Peripherals #404
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
HappyLappy1
wants to merge
135
commits into
UsernameFodder:master
Choose a base branch
from
HappyLappy1:master
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
135 commits
Select commit
Hold shift + click to select a range
7910710
Spring Cleaning Overlay 19
HappyLappy1 bdffcdb
Oops
HappyLappy1 1f6f5c6
Format Symbols
HappyLappy1 576dd13
Describe Symbols
HappyLappy1 7a6935b
Fix Bar Items
HappyLappy1 1e97972
Ignore this, I changed these function names by hand poorly
HappyLappy1 eb45402
Syntax
HappyLappy1 915b40e
Update symbols/overlay19.yml
HappyLappy1 9774b7f
Update symbols/overlay19.yml
HappyLappy1 5f5effa
Fix a few things
HappyLappy1 5f6b9aa
Add Aliases
HappyLappy1 fe2b5d9
Update overlay19.yml
HappyLappy1 8f2ecda
Update overlay19.yml
HappyLappy1 f5efe41
Merge branch 'master' into master
HappyLappy1 460e089
Merge branch 'master' into master
HappyLappy1 b52e137
Initial Dump
HappyLappy1 4842720
Manual Fixed + Additions
HappyLappy1 ebfd684
More manual fixes plus a few cafe things
HappyLappy1 54e859b
Update overlay19.yml
HappyLappy1 f55a78e
Fix Syntax
HappyLappy1 ac2a5e0
Update ground_mode.h
HappyLappy1 b7943ac
Overlay 26 Findings
HappyLappy1 7294ff0
Update overlay19.yml
HappyLappy1 da7efdd
Merge branch 'UsernameFodder:master' into Spring-Cleaning-SwapShop
HappyLappy1 9bdd3df
Recycle Shop Stuff and fixes
HappyLappy1 a591ac0
Merge branch 'master' into Spring-Cleaning-SwapShop
HappyLappy1 bb64b8b
Fixes Round 1
HappyLappy1 f2edf75
Merge branch 'Spring-Cleaning-SwapShop' of https://github.com/HappyLa…
HappyLappy1 ea387df
More Fixes
HappyLappy1 37c464e
Header Fixes
HappyLappy1 2c6441b
Update arm9.h
HappyLappy1 c26a201
Let's see how badly it explodes.
HappyLappy1 14ffe64
Update arm9.h
HappyLappy1 a6ab1f3
More fixes
HappyLappy1 e3a34ec
More fixes, plus one new function
HappyLappy1 b47dc11
Maybe Fixes
HappyLappy1 57d8cce
Fix Headers More
HappyLappy1 d2cb266
test
HappyLappy1 b37c8a2
...
HappyLappy1 86a9b46
That was stupid...
HappyLappy1 9406cc9
Fix typo...
HappyLappy1 5abc8ed
Add more types
HappyLappy1 f5a1006
Fix Sizes
HappyLappy1 ac09593
...
HappyLappy1 b8e574f
Fix Syntax
HappyLappy1 f5e1edf
...
HappyLappy1 2123b81
Merge pull request #2 from HappyLappy1/Spring-Cleaning-SwapShop
HappyLappy1 c02db16
Merge branch 'UsernameFodder:master' into master
HappyLappy1 51b7aeb
Ground Mode Discoveries
HappyLappy1 d214202
Fix Smol Mistakes
HappyLappy1 c316348
Update arm9.h
HappyLappy1 84a68c6
Finish Descriptions
HappyLappy1 e3e2fe4
Fix header inconsistencies
HappyLappy1 bc67c0d
Fix Syntax
HappyLappy1 079107d
Merge pull request #3 from HappyLappy1/Spring-Cleaning-SwapShop
HappyLappy1 15766f0
Revert "Ground Mode Discoveries and more!"
HappyLappy1 8c6b70a
Merge pull request #4 from HappyLappy1/revert-3-Spring-Cleaning-SwapShop
HappyLappy1 e91a851
Revert "Revert "Ground Mode Discoveries and more!""
HappyLappy1 cbcc3a6
Apply Fixes from Review
HappyLappy1 3262fbb
Update arm9.h
HappyLappy1 cf5dd62
test two-aligned struct
HappyLappy1 f2d75a1
Oops. Yeah they're working.
HappyLappy1 5e7ecbc
more fixes
HappyLappy1 63e6a32
Apply suggestions from code review
HappyLappy1 f9f080d
Finish fixing EuAddr Names
HappyLappy1 aa7da8a
Fix Syntax
HappyLappy1 49ff55b
Fix Syntax... A second time???
HappyLappy1 0c3bcee
Update headers/types/ground_mode/ground_mode.h
HappyLappy1 b9c335e
Update headers/types/ground_mode/ground_mode.h
HappyLappy1 f4773ac
Update headers/types/ground_mode/ground_mode.h
HappyLappy1 d7cc8e8
Merge branch 'master' into master
HappyLappy1 a23e654
Update common.h
HappyLappy1 801cacc
Update ground_mode.h
HappyLappy1 5ffffc0
Name params
HappyLappy1 e0154b5
Update ground_mode.h
HappyLappy1 288e8c9
Update arm9.yml
HappyLappy1 d71699f
Update arm9.h
HappyLappy1 2a450a0
Update arm9.h
HappyLappy1 0ce46a2
Fix Syntax
HappyLappy1 6f62db4
Update overlay10.h
HappyLappy1 73d40be
Update overlay10.yml
HappyLappy1 e77676e
Update overlay11.h
HappyLappy1 54f2227
Update overlay19.h
HappyLappy1 251b0e2
Fix syntax
HappyLappy1 2fc926f
Update arm9.h
HappyLappy1 6ccc684
Update arm9.yml
HappyLappy1 f4a2c15
Update arm9.h
HappyLappy1 fb4612c
Merge branch 'master' into revert-4-revert-3-Spring-Cleaning-SwapShop
HappyLappy1 73a671d
Update arm9.h
HappyLappy1 e16018b
Update arm9.h
HappyLappy1 f73dcbc
Update arm9.h
HappyLappy1 037b4dc
Update overlay29.h
HappyLappy1 2e4058f
Merge pull request #5 from HappyLappy1/revert-4-revert-3-Spring-Clean…
HappyLappy1 6180bdc
Merge branch 'master' into master
HappyLappy1 0dc1204
Update overlay29.h
HappyLappy1 841cbff
Update arm9.h
HappyLappy1 a4af5d7
Duskull Bank Functions and Data
HappyLappy1 9315b77
Arm9 Kecleon Shop
HappyLappy1 726f8bf
Update overlay29.yml
HappyLappy1 3ab0eb8
Update overlay29.yml
HappyLappy1 c0d336a
Update overlay29.h
HappyLappy1 17c5218
Update arm9.h
HappyLappy1 36fb58a
Merge branch 'master' into master
HappyLappy1 77ca8c5
Update arm9.h
HappyLappy1 e3afc71
Update overlay29.h
HappyLappy1 73b7e23
Revert "Update overlay29.h"
HappyLappy1 995c1b8
Revert "Update arm9.h"
HappyLappy1 228f95d
External formatter did NOT work as intended...
HappyLappy1 fc7c82e
Update rescue.h
HappyLappy1 15e168c
Update arm9.yml
HappyLappy1 9fc4a6f
Overlays 22 and 23
HappyLappy1 9de3438
Merge branch 'UsernameFodder:master' into Kecleon-Duskull-And-Kangaskhan
HappyLappy1 058c5ba
Round 1 fixes
HappyLappy1 f43371a
...
HappyLappy1 a23fdb4
Add lengths and descriptions
HappyLappy1 8e8fbfe
Add datatypes... Surely nothing will go wrong.
HappyLappy1 a2dec38
Update overlay22.yml
HappyLappy1 08482af
Please work?
HappyLappy1 ce3df8e
...
HappyLappy1 21a8d5b
oops
HappyLappy1 4f455a6
Fix Syntax
HappyLappy1 4a55edb
Merge pull request #6 from HappyLappy1/Kecleon-Duskull-And-Kangaskhan
HappyLappy1 c495f1e
Apply suggestions
HappyLappy1 f083e51
Update headers/functions/overlay15.h
HappyLappy1 57de2bd
Merge branch 'master' into master
HappyLappy1 b5f1da1
Maybe fix syntax manually?
HappyLappy1 4c8803e
Merge branch 'master' of https://github.com/HappyLappy1/pmdsky-debug
HappyLappy1 266bc68
Update overlay11.h
HappyLappy1 96c5108
Update overlay11.yml
HappyLappy1 a72b968
Update overlay23.yml
HappyLappy1 322cf2a
Update overlay11.h
HappyLappy1 29836fb
Update overlay11.h
HappyLappy1 4c0814a
Update overlay22.yml
HappyLappy1 4e1e89d
Update overlay23.yml
HappyLappy1 6fd9717
Update arm9.yml
HappyLappy1 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| #ifndef HEADERS_FUNCTIONS_OVERLAY15_H_ | ||
| #define HEADERS_FUNCTIONS_OVERLAY15_H_ | ||
|
|
||
| void InitDuskullBankStruct(void); | ||
| undefined4 DuskullBankSubcaseManager1(void); | ||
| void DuskullBankSubcaseManager2(enum bank_subcase subcase); | ||
| void BankUpdateDigitInputMenuDisplay(bool is_withdrawing); | ||
| void DuskullBankTextboxGoldStatusCallback(int window_id); | ||
| void DuskullBankDigitInputDisplayCallback(void); | ||
| undefined4 DuskullBankEntryPoint(void); | ||
| void DuskullBankDestructor(void); | ||
| undefined4 DuskullBankFrameUpdate(void); | ||
|
|
||
| #endif | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,46 @@ | ||
| #ifndef HEADERS_FUNCTIONS_OVERLAY22_H_ | ||
| #define HEADERS_FUNCTIONS_OVERLAY22_H_ | ||
|
|
||
| void GreenKecleonShopUpdateItemNamesAndCollectionMenu(void); | ||
| int GreenKecleonShopInitCollectionMenu(void); | ||
| void GreenKecleonShopDoNothing(void); | ||
| undefined4 GreenKecleonShopGetCollectionMenuStatus(void); | ||
| uint16_t GreenKecleonShopGetShopItemSlot(void); | ||
| void GreenKecleonShopInitItemNameData(void); | ||
| void GreenKecleonShopFreeItemNameData(void); | ||
| void GreenKecleonShopFillItemNameData(void); | ||
| int GreenKecleonShopCountSelectedItems(void); | ||
| int GreenKecleonShopGetFirstSelectedItemIndex(void); | ||
| int GreenKecleonShopSumSelectedItemPrices(void); | ||
| void GreenKecleonShopPurchaseSingleItem(uint32_t item_slot); | ||
| void GreenKecleonShopPurchaseSelectedItems(void); | ||
| char* GreenKecleonGetItemNameStringByIndex(undefined4 param_1, int param_2, uint32_t* param_3); | ||
| undefined4 GreenKecleonShopUnkCollectionMenuCallback(uint32_t param_1); | ||
| void GreenKecleonShopVoidFnCollectionMenuCallback(uint32_t param_1); | ||
| void PurpleKecleonShopUpdateItemNamesAndCollectionMenu(void); | ||
| int PurpleKecleonShopInitCollectionMenu(void); | ||
| void PurpleKecleonShopDoNothing(void); | ||
| undefined4 PurpleKecleonShopGetCollectionMenuStatus(void); | ||
| uint16_t PurpleKecleonShopGetShopItemSlot(void); | ||
| void PurpleKecleonShopInitItemNameData(void); | ||
| void PurpleKecleonShopFreeItemNameData(void); | ||
| void PurpleKecleonShopFillItemNameData(void); | ||
| int PurpleKecleonShopCountSelectedItems(void); | ||
| int PurpleKecleonShopGetFirstSelectedItemIndex(void); | ||
| int PurpleKecleonShopSumSelectedItemPrices(void); | ||
| void PurpleKecleonShopPurchaseSingleItem(uint32_t item_slot); | ||
| void PurpleKecleonShopPurchaseSelectedItems(void); | ||
| char* PurpleKecleonGetItemNameStringByIndex(undefined4 param_1, int param_2, uint32_t* param_3); | ||
| undefined4 PurpleKecleonShopUnkCollectionMenuCallback(uint32_t param_1); | ||
| void PurpleKecleonShopCollectionMenuCallback(uint32_t param_1); | ||
| void KecleonShopSubcaseManager1(int32_t subcase_id); | ||
| void KecleonShopSubcaseManager2(void); | ||
| void RemoveInvalidKecleonShopItems(void); | ||
| void KecleonShopSumBagItemSellPrices(void); | ||
| void KecleonShopUpdatePortraitEmotion(bool is_angry); | ||
| undefined4 KecleonShopEntryPoint(void); | ||
| void KecleonShopDestructor(void); | ||
| undefined4 KecleonShopFrameUpdate(void); | ||
| void KecleonShopCloseSimpleMenu(void); | ||
|
|
||
| #endif |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,18 @@ | ||
| #ifndef HEADERS_FUNCTIONS_OVERLAY23_H_ | ||
| #define HEADERS_FUNCTIONS_OVERLAY23_H_ | ||
|
|
||
| void KangaskhanStorageSubcaseManager1(int32_t subcase_id); | ||
| void KangaskhanStorageSubcaseManager2(void); | ||
| undefined4 KangaskhanStorageEntryPoint(void); | ||
| void KangaskhanStorageDestructor(void); | ||
| undefined4 KangaskhanStorageFrameUpdate(void); | ||
| void KangaskhanStorageCloseSimpleMenu(void); | ||
| void KangaskhanStorageShowDialogueAndPortraitIfNotRock(int window_id, | ||
| struct preprocessor_flags flags, | ||
| int string_id); | ||
| void KangaskhanStorageWithdrawSelectedItems(void); | ||
| void KangaskhanStorageDepositSelectedItems(void); | ||
| void KangaskhanStorageWithdrawSingleItem(void); | ||
| void KangaskhanStorageDepositSingleItem(void); | ||
|
|
||
| #endif |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.