ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-12-26 19:54:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

Rename some functions and all RAM objects in decoration.c

Browse Source
This commit is contained in:
PikalaxALT 2017-10-22 20:13:31 -04:00
parent 9fc2c99d18
commit 0dd3db7061
5 changed files with 349 additions and 349 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
asm/trader.s
View File

@ -433,15 +433,15 @@ sub_8133DA0: @ 8133DA0
push {r4-r6,lr} push {r4-r6,lr}
lsls r0, 24 lsls r0, 24
lsrs r6, r0, 24 lsrs r6, r0, 24
bl sub_81279C4 bl IsSelectedDecorInThePC
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
cmp r0, 0x1 cmp r0, 0x1
bne _08133DFC bne _08133DFC
ldr r5, =gSpecialVar_0x8006 ldr r5, =gSpecialVar_0x8006
ldr r0, =gUnknown_0203A172 ldr r0, =gCurDecorationIndex
ldrb r1, [r0] ldrb r1, [r0]
ldr r0, =gUnknown_0203A14C ldr r0, =gCurDecorInventoryItems
ldr r0, [r0] ldr r0, [r0]
adds r0, r1 adds r0, r1
ldrb r0, [r0] ldrb r0, [r0]

28
data/strings.s
View File

@ -1517,52 +1517,52 @@ gUnknown_085EA79D:: @ 85EA79D
gUnknown_085EA7A9:: @ 85EA7A9 gUnknown_085EA7A9:: @ 85EA7A9
.string "{STR_VAR_3}{STR_VAR_1}/{STR_VAR_2}$" .string "{STR_VAR_3}{STR_VAR_1}/{STR_VAR_2}$"
gUnknown_085EA7B1:: @ 85EA7B1 gText_Decorate:: @ 85EA7B1
.string "DECORATE$" .string "DECORATE$"
gUnknown_085EA7BA:: @ 85EA7BA gText_PutAway:: @ 85EA7BA
.string "PUT AWAY$" .string "PUT AWAY$"
gUnknown_085EA7C3:: @ 85EA7C3 gText_Toss2:: @ 85EA7C3
.string "TOSS$" .string "TOSS$"
gText_Color161Shadow161:: @ 85EA7C8 gText_Color161Shadow161:: @ 85EA7C8
.string "{COLOR 161}{SHADOW 161}$" .string "{COLOR 161}{SHADOW 161}$"
gUnknown_085EA7CF:: @ 85EA7CF gText_PutOutSelectedDecorItem:: @ 85EA7CF
.string "Put out the selected decoration item.$" .string "Put out the selected decoration item.$"
gUnknown_085EA7F5:: @ 85EA7F5 gText_StoreChosenDecorInPC:: @ 85EA7F5
.string "Store the chosen decoration in the PC.$" .string "Store the chosen decoration in the PC.$"
gUnknown_085EA81C:: @ 85EA81C gText_ThrowAwayUnwantedDecors:: @ 85EA81C
.string "Throw away unwanted decorations.$" .string "Throw away unwanted decorations.$"
gText_NoDecorations:: @ 85EA83D gText_NoDecorations:: @ 85EA83D
.string "There are no decorations.{PAUSE_UNTIL_PRESS}$" .string "There are no decorations.{PAUSE_UNTIL_PRESS}$"
gUnknown_085EA859:: @ 85EA859 gText_Desk:: @ 85EA859
.string "DESK$" .string "DESK$"
gUnknown_085EA85E:: @ 85EA85E gText_Chair:: @ 85EA85E
.string "CHAIR$" .string "CHAIR$"
gUnknown_085EA864:: @ 85EA864 gText_Plant:: @ 85EA864
.string "PLANT$" .string "PLANT$"
gUnknown_085EA86A:: @ 85EA86A gText_Ornament:: @ 85EA86A
.string "ORNAMENT$" .string "ORNAMENT$"
gUnknown_085EA873:: @ 85EA873 gText_Mat:: @ 85EA873
.string "MAT$" .string "MAT$"
gUnknown_085EA877:: @ 85EA877 gText_Poster:: @ 85EA877
.string "POSTER$" .string "POSTER$"
gUnknown_085EA87E:: @ 85EA87E gText_Doll:: @ 85EA87E
.string "DOLL$" .string "DOLL$"
gUnknown_085EA883:: @ 85EA883 gText_Cushion:: @ 85EA883
.string "CUSHION$" .string "CUSHION$"
gText_Gold:: @ 85EA88B gText_Gold:: @ 85EA88B

4
include/decoration.h
View File

@ -187,8 +187,8 @@ struct DecorPCPointers
}; };
extern const struct Decoration gDecorations[]; extern const struct Decoration gDecorations[];
extern EWRAM_DATA u8 *gUnknown_0203A14C; extern EWRAM_DATA u8 *gCurDecorInventoryItems;
extern EWRAM_DATA u8 gUnknown_0203A172; extern EWRAM_DATA u8 gCurDecorationIndex;
void sub_8126968(void); void sub_8126968(void);

28
include/strings.h
View File

@ -56,19 +56,19 @@ extern const u8 gText_NoDecorationHere[];
extern const u8 gText_DecorationWillBeDiscarded[]; extern const u8 gText_DecorationWillBeDiscarded[];
extern const u8 gText_CantThrowAwayInUse[]; extern const u8 gText_CantThrowAwayInUse[];
extern const u8 gText_DecorationThrownAway[]; extern const u8 gText_DecorationThrownAway[];
extern const u8 gUnknown_085EA859[]; extern const u8 gText_Desk[];
extern const u8 gUnknown_085EA85E[]; extern const u8 gText_Chair[];
extern const u8 gUnknown_085EA864[]; extern const u8 gText_Plant[];
extern const u8 gUnknown_085EA86A[]; extern const u8 gText_Ornament[];
extern const u8 gUnknown_085EA873[]; extern const u8 gText_Mat[];
extern const u8 gUnknown_085EA877[]; extern const u8 gText_Poster[];
extern const u8 gUnknown_085EA7CF[]; extern const u8 gText_PutOutSelectedDecorItem[];
extern const u8 gUnknown_085EA7F5[]; extern const u8 gText_StoreChosenDecorInPC[];
extern const u8 gUnknown_085EA81C[]; extern const u8 gText_ThrowAwayUnwantedDecors[];
extern const u8 gUnknown_085EA87E[]; extern const u8 gText_Doll[];
extern const u8 gUnknown_085EA883[]; extern const u8 gText_Cushion[];
extern const u8 gUnknown_085EA7B1[]; extern const u8 gText_Decorate[];
extern const u8 gUnknown_085EA7BA[]; extern const u8 gText_PutAway[];
extern const u8 gUnknown_085EA7C3[]; extern const u8 gText_Toss2[];
#endif //GUARD_STRINGS_H #endif //GUARD_STRINGS_H

630
src/decoration.c
View File

File diff suppressed because it is too large Load Diff