Skip to content
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.

Sign up for GitHub

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

Jump to bottom

FIELD_PLAYER_AVATAR -> PlayerAvatar #133

Merged
merged 7 commits into from
May 20, 2023
Merged

FIELD_PLAYER_AVATAR -> PlayerAvatar #133

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
4ef465d
FIELD_PLAYER_AVATAR -> PlayerAvatar
adrienntindall May 11, 2023
12d860f
Merge branch 'pret:master' into master
adrienntindall May 11, 2023
d229f7f
BAG_DATA -> Bag, ITEM_SLOT -> BagPocket
adrienntindall May 11, 2023
9571df3
Merge branch 'master' of https://github.com/adrienntindall/pokeheartgold
adrienntindall May 11, 2023
4ba5f06
Bag names, field_player_avatar,h match style, added Korean
adrienntindall May 20, 2023
ea612da
Merge remote-tracking branch 'upstream/master'
adrienntindall May 20, 2023
a99e066
Clean up bag.h
adrienntindall May 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 11 additions & 11 deletions asm/battle_setup.s
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ _0205193C:
cmp r7, #4
blt _0205193C
add r0, r6, #0
bl Sav2_Bag_new
bl BagNew
mov r1, #0x42
lsl r1, r1, #2
str r0, [r4, r1]
Expand Down Expand Up @@ -340,7 +340,7 @@ sub_02051AAC: ; 0x02051AAC
mov r1, #4
mov r2, #0x14
add r3, r6, #0
bl Bag_AddItem
bl BagAddItem
add r0, r6, #0
bl AllocMonZeroed
mov r2, #0
Expand Down Expand Up @@ -576,7 +576,7 @@ sub_02051D18: ; 0x02051D18
bl SavArray_PlayerParty_get
str r0, [sp, #0x18]
add r0, r4, #0
bl Sav2_Bag_get
bl SaveGetBag
str r0, [sp, #0x14]
add r0, r4, #0
bl Sav2_Pokedex_get
Expand Down Expand Up @@ -678,7 +678,7 @@ _02051E14:
lsl r1, r1, #2
ldr r0, [sp, #0x14]
ldr r1, [r5, r1]
bl Sav2_Bag_copy
bl BagCopy
mov r1, #0x11
lsl r1, r1, #4
ldr r0, [sp, #0x10]
Expand Down Expand Up @@ -819,7 +819,7 @@ sub_02051F2C: ; 0x02051F2C
str r0, [sp, #0x14]
ldr r0, [sp]
ldr r0, [r0, #0xc]
bl Sav2_Bag_get
bl SaveGetBag
str r0, [sp, #0x10]
ldr r0, [sp]
ldr r0, [r0, #0xc]
Expand Down Expand Up @@ -901,7 +901,7 @@ _02052004:
lsl r1, r1, #2
ldr r0, [sp, #0x10]
ldr r1, [r5, r1]
bl Sav2_Bag_copy
bl BagCopy
mov r1, #0x11
lsl r1, r1, #4
ldr r0, [sp, #0xc]
Expand Down Expand Up @@ -986,7 +986,7 @@ sub_020520B0: ; 0x020520B0
str r0, [sp, #0x20]
ldr r0, [sp]
ldr r0, [r0, #0xc]
bl Sav2_Bag_get
bl SaveGetBag
str r0, [sp, #0x1c]
ldr r0, [sp]
ldr r0, [r0, #0xc]
Expand Down Expand Up @@ -1129,7 +1129,7 @@ _020521F6:
lsl r1, r1, #2
ldr r0, [sp, #0x1c]
ldr r1, [r5, r1]
bl Sav2_Bag_copy
bl BagCopy
mov r1, #0x11
lsl r1, r1, #4
ldr r0, [sp, #0x18]
Expand Down Expand Up @@ -1335,7 +1335,7 @@ sub_0205239C: ; 0x0205239C
bl SavArray_PlayerParty_get
add r7, r0, #0
ldr r0, [r4, #0xc]
bl Sav2_Bag_get
bl SaveGetBag
str r0, [sp]
ldr r0, [r4, #0xc]
bl Sav2_Pokedex_get
Expand All @@ -1358,7 +1358,7 @@ sub_0205239C: ; 0x0205239C
lsl r0, r0, #2
ldr r0, [r5, r0]
ldr r1, [sp]
bl Sav2_Bag_copy
bl BagCopy
mov r0, #0x11
lsl r0, r0, #4
ldr r0, [r5, r0]
Expand Down Expand Up @@ -1407,7 +1407,7 @@ sub_02052444: ; 0x02052444
ldr r0, [r5, #0xc]
bl SavArray_PlayerParty_get
ldr r0, [r5, #0xc]
bl Sav2_Bag_get
bl SaveGetBag
ldr r0, [r5, #0xc]
bl Sav2_Pokedex_get
add r1, r0, #0
Expand Down
8 changes: 4 additions & 4 deletions asm/include/battle_setup.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,10 +108,10 @@
.public GetPartyMonByIndex
.public Party_copy
.public SavArray_PlayerParty_get
.public Sav2_Bag_new
.public Sav2_Bag_copy
.public Bag_AddItem
.public Sav2_Bag_get
.public BagNew
.public BagCopy
.public BagAddItem
.public SaveGetBag
.public sub_02088288
.public Fsys_GetGearPhoneRingManager
.public sub_02092E14
Expand Down
4 changes: 2 additions & 2 deletions asm/include/overlay_01_021F6CFC.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@
.public sub_0205B514
.public sub_0205B564
.public sub_0205B5B4
.public Bag_HasItem
.public Sav2_Bag_get
.public BagHasItem
.public SaveGetBag
.public MI_CpuFill8
.public ov01_021F6A9C
.public ov01_021F6C28
Expand Down
10 changes: 5 additions & 5 deletions asm/include/overlay_03.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,11 +206,11 @@
.public GetItemIndexMapping
.public GetItemDescIntoString
.public GetItemAttr
.public Bag_HasSpaceForItem
.public Bag_AddItem
.public Bag_GetQuantity
.public CreateBagView
.public Sav2_Bag_get
.public BagHasSpaceForItem
.public BagAddItem
.public BagGetQuantity
.public BagViewCreate
.public SaveGetBag
.public sub_020881C0
.public sub_020910B8
.public sub_02092B04
Expand Down
4 changes: 2 additions & 2 deletions asm/include/overlay_05.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,8 +152,8 @@
.public GetPartyCount
.public GetPartyMonByIndex
.public ItemIdIsMail
.public Bag_HasItem
.public Sav2_Bag_get
.public BagHasItem
.public SaveGetBag
.public sub_0207CAAC
.public RatioToInt
.public sub_020880B0
Expand Down
6 changes: 3 additions & 3 deletions asm/include/overlay_08.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,9 +136,9 @@
.public GetItemAttr_PreloadedItemData
.public MoveIsHM
.public ItemIdIsMail
.public Bag_TakeItem
.public Bag_HasItem
.public Bag_GetPocketSlotN
.public BagTakeItem
.public BagHasItem
.public BagGetNthPocket
.public BagCursor_Battle_PocketGetPosition
.public BagCursor_Battle_GetLastUsedItem
.public BagCursor_Battle_GetLastUsedPocket
Expand Down
4 changes: 2 additions & 2 deletions asm/include/overlay_101.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -273,8 +273,8 @@
.public PCStorage_GetActiveBox
.public PCStorage_CountEmptySpotsInAllBoxes
.public PCStorage_GetBoxName
.public Bag_HasItem
.public Sav2_Bag_get
.public BagHasItem
.public SaveGetBag
.public sub_0208820C
.public PhoneBookTrainerGetRematchInfo
.public AllocAndReadPhoneBook
Expand Down
6 changes: 3 additions & 3 deletions asm/include/overlay_103.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,9 +151,9 @@
.public SavArray_PlayerParty_get
.public ItemToMailId
.public MailToItemId
.public Bag_AddItem
.public Bag_TakeItem
.public Sav2_Bag_get
.public BagAddItem
.public BagTakeItem
.public SaveGetBag
.public sub_02090E68
.public sub_02090F6C
.public sub_02090F70
Expand Down
4 changes: 2 additions & 2 deletions asm/include/overlay_112.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -291,8 +291,8 @@
.public GetPartyMonByIndex
.public SavArray_PlayerParty_get
.public GetItemNameIntoString
.public Bag_AddItem
.public Sav2_Bag_get
.public BagAddItem
.public SaveGetBag
.public sub_0208F270
.public sub_020932E0
.public sub_02093354
Expand Down
4 changes: 2 additions & 2 deletions asm/include/overlay_12_022378C0.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,8 +170,8 @@
.public sub_02075A7C
.public sub_02075D3C
.public sub_02075D4C
.public Sav2_Bag_new
.public Sav2_Bag_copy
.public BagNew
.public BagCopy
.public BagCursor_Battle_Init
.public sub_020880B0
.public ApplyMonMoodModifier
Expand Down
2 changes: 1 addition & 1 deletion asm/include/overlay_12_battle_controller_player.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
.public GetPartyCount
.public GetPartyMonByIndex
.public LoadAllItemData
.public Bag_TakeItem
.public BagTakeItem
.public BagCursor_Battle_SetLastUsedItem
.public MIi_CpuClear32
.public MIi_CpuClearFast
Expand Down
8 changes: 4 additions & 4 deletions asm/include/overlay_14.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -267,10 +267,10 @@
.public GetItemNameIntoString
.public GetItemDescIntoString
.public ItemIdIsMail
.public Bag_AddItem
.public Bag_TakeItem
.public CreateBagView
.public Sav2_Bag_get
.public BagAddItem
.public BagTakeItem
.public BagViewCreate
.public SaveGetBag
.public sub_020830D8
.public sub_0208311C
.public sub_02088288
Expand Down
14 changes: 7 additions & 7 deletions asm/include/overlay_15.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,13 +184,13 @@
.public TMHMGetMove
.public MoveIsHM
.public ItemIdIsNotJohtoBall
.public Bag_GetRegisteredItemSlot1
.public Bag_GetRegisteredItemSlot2
.public Bag_TryRegisterItem
.public Bag_UnregisterItem
.public Pocket_TakeItem
.public Pocket_GetQuantity
.public Sav2_Bag_get
.public BagGetRegisteredItem1
.public BagGetRegisteredItem2
.public BagTryRegisterItem
.public BagUnregisterItem
.public BagPocketTakeItem
.public BagPocketGetQuantity
.public SaveGetBag
.public BagCursor_Field_PocketGetPosition
.public BagCursor_Field_GetPocket
.public BagCursor_Field_PocketSetPosition
Expand Down
6 changes: 3 additions & 3 deletions asm/include/overlay_16.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@
.public sub_0207789C
.public sub_02077904
.public sub_0207790C
.public Bag_GetQuantity
.public CreateBagView
.public Sav2_Bag_get
.public BagGetQuantity
.public BagViewCreate
.public SaveGetBag
.public BagCursor_new
.public MI_CpuFill8
.public _s32_div_f
Expand Down
8 changes: 4 additions & 4 deletions asm/include/overlay_17.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,10 +131,10 @@
.public GetItemIconAnim
.public ItemIdIsBerry
.public GetNutName
.public Bag_HasSpaceForItem
.public Bag_AddItem
.public Bag_TakeItem
.public Sav2_Bag_get
.public BagHasSpaceForItem
.public BagAddItem
.public BagTakeItem
.public SaveGetBag
.public NNS_GfdDoVramTransfer
.public MI_CpuFill8
.public MI_CpuCopy8
Expand Down
6 changes: 3 additions & 3 deletions asm/include/overlay_27.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,9 +128,9 @@
.public Pokemon_GetIconPalette
.public sub_02074490
.public GetItemIndexMapping
.public Bag_GetRegisteredItemSlot1
.public Bag_GetRegisteredItemSlot2
.public Sav2_Bag_get
.public BagGetRegisteredItem1
.public BagGetRegisteredItem2
.public SaveGetBag
.public Fsys_GetGearPhoneRingManager
.public sub_02092E08
.public GXS_SetGraphicsMode
Expand Down
2 changes: 1 addition & 1 deletion asm/include/overlay_58.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
.public Party_GetUnkSubSlot
.public Party_SetUnkSubSlot
.public SavArray_PlayerParty_get
.public Sav2_Bag_get
.public SaveGetBag
.public ApplyMonMoodModifier
.public MI_CpuFill8
.public _ffixu
Expand Down
4 changes: 2 additions & 2 deletions asm/include/overlay_65.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,8 +209,8 @@
.public PartyHasMon
.public GetItemNameIntoString
.public ItemIdIsMail
.public Bag_HasItem
.public Sav2_Bag_get
.public BagHasItem
.public SaveGetBag
.public sub_02088288
.public sub_02089D40
.public sub_0208AD34
Expand Down
2 changes: 1 addition & 1 deletion asm/include/overlay_80_02235FC8.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
.public GetPartyCount
.public SavArray_PlayerParty_get
.public SavArray_IsNatDexEnabled
.public Sav2_Bag_get
.public SaveGetBag
.public sub_02088288
.public sub_0208828C
.public sub_02089D40
Expand Down
4 changes: 2 additions & 2 deletions asm/include/overlay_85.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,8 +213,8 @@
.public GetPartyCount
.public GetPartyMonByIndex
.public SavArray_PlayerParty_get
.public Bag_AddItem
.public Sav2_Bag_get
.public BagAddItem
.public SaveGetBag
.public MonSetTrainerMemo
.public sub_02096CE0
.public sub_02096D4C
Expand Down
8 changes: 4 additions & 4 deletions asm/include/scrcmd_11.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,10 +65,10 @@
.public AddMonToParty
.public GetPartyCount
.public SavArray_PlayerParty_get
.public Bag_HasSpaceForItem
.public Bag_AddItem
.public Bag_HasItem
.public Sav2_Bag_get
.public BagHasSpaceForItem
.public BagAddItem
.public BagHasItem
.public SaveGetBag
.public GetSpecialRibbonNo
.public MonSetTrainerMemo
.public OS_GetTick
2 changes: 1 addition & 1 deletion asm/include/scrcmd_20.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
.public GetPartyMonByIndex
.public SavArray_PlayerParty_get
.public SavArray_IsNatDexEnabled
.public Sav2_Bag_get
.public SaveGetBag
.public sub_02088288
.public sub_0208828C
.public sub_02089D40
Expand Down
6 changes: 3 additions & 3 deletions asm/include/unk_0203BC10.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,9 +138,9 @@
.public ItemIdIsMail
.public ItemToMailId
.public BerryToItemId
.public Bag_HasItem
.public CreateBagView
.public Sav2_Bag_get
.public BagHasItem
.public BagViewCreate
.public SaveGetBag
.public BagCursor_Field_PocketGetPosition
.public BagCursor_Field_PocketSetPosition
.public sub_02088288
Expand Down
4 changes: 2 additions & 2 deletions asm/include/unk_0203E348.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,8 +176,8 @@
.public sub_020778E8
.public sub_02077904
.public sub_0207790C
.public CreateBagView
.public Sav2_Bag_get
.public BagViewCreate
.public SaveGetBag
.public sub_020830D8
.public sub_0208311C
.public sub_02088288
Expand Down
2 changes: 1 addition & 1 deletion asm/include/unk_0204F500.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
.public GetPartyCount
.public SavArray_PlayerParty_get
.public SavArray_IsNatDexEnabled
.public Sav2_Bag_get
.public SaveGetBag
.public sub_02088288
.public sub_0208828C
.public sub_02089D40
Expand Down
Loading