dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

port sub_8050F3C

Browse Source
This commit is contained in:
PikalaxALT
2019-10-29 21:29:10 -04:00
parent e9592bee5d
commit e7a66b2941
12 changed files with 865 additions and 2610 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/cable_club.s
+4 -4
View File
@@ -2193,7 +2193,7 @@ _08081894:
.align 2, 0
_080818A4: .4byte gPaletteFade
_080818A8:
ldr r1, _080818C0 @ =gUnknown_2031DA4
ldr r1, _080818C0 @ =gSelectedTradeMonPositions
movs r0, 0
strb r0, [r1]
strb r0, [r1, 0x1]
@@ -2205,7 +2205,7 @@ _080818B8:
strh r0, [r4, 0x8]
b _080818D8
.align 2, 0
_080818C0: .4byte gUnknown_2031DA4
_080818C0: .4byte gSelectedTradeMonPositions
_080818C4:
ldr r0, _080818E0 @ =gReceivedRemoteLinkPlayers
ldrb r0, [r0]
@@ -2269,7 +2269,7 @@ _0808192C:
.align 2, 0
_0808193C: .4byte gPaletteFade
_08081940:
ldr r1, _08081958 @ =gUnknown_2031DA4
ldr r1, _08081958 @ =gSelectedTradeMonPositions
movs r0, 0
strb r0, [r1]
strb r0, [r1, 0x1]
@@ -2281,7 +2281,7 @@ _08081950:
strh r0, [r4]
b _08081970
.align 2, 0
_08081958: .4byte gUnknown_2031DA4
_08081958: .4byte gSelectedTradeMonPositions
_0808195C:
bl IsLinkTaskFinished
lsls r0, 24
asm/evolution_scene.s
+16 -16
View File
@@ -2817,7 +2817,7 @@ _080CF620:
movs r0, 0
adds r1, r4, 0
movs r2, 0x1
bl sub_8054508
bl DrawTextOnTradeWindow
ldr r0, _080CF648 @ =gTasks
adds r1, r7, r6
lsls r1, 3
@@ -3110,7 +3110,7 @@ _080CF8A8:
movs r0, 0
adds r1, r4, 0
movs r2, 0x1
bl sub_8054508
bl DrawTextOnTradeWindow
ldr r0, _080CF91C @ =0x00000103
bl PlayFanfare
ldr r2, _080CF920 @ =gTasks
@@ -3222,7 +3222,7 @@ _080CF9AC:
ldr r1, _080CF9C8 @ =gUnknown_841E325
movs r0, 0
movs r2, 0x1
bl sub_8054508
bl DrawTextOnTradeWindow
ldr r0, _080CF9CC @ =gTasks
adds r1, r7, r6
lsls r1, 3
@@ -3341,7 +3341,7 @@ _080CFAA8:
movs r0, 0
adds r1, r4, 0
movs r2, 0x1
bl sub_8054508
bl DrawTextOnTradeWindow
ldr r1, _080CFAD4 @ =gTasks
adds r0, r7, r6
lsls r0, 3
@@ -3376,7 +3376,7 @@ _080CFAF2:
ldr r1, _080CFB2C @ =gDisplayedStringBattle
movs r0, 0
movs r2, 0x1
bl sub_8054508
bl DrawTextOnTradeWindow
ldr r0, _080CFB30 @ =gTasks
adds r1, r7, r6
lsls r1, 3
@@ -3477,7 +3477,7 @@ _080CFBDA:
ldr r1, _080CFC04 @ =gDisplayedStringBattle
movs r0, 0
movs r2, 0x1
bl sub_8054508
bl DrawTextOnTradeWindow
ldr r0, _080CFC08 @ =gTasks
adds r1, r7, r6
lsls r1, 3
@@ -3509,7 +3509,7 @@ _080CFC26:
ldr r1, _080CFC4C @ =gDisplayedStringBattle
movs r0, 0
movs r2, 0x1
bl sub_8054508
bl DrawTextOnTradeWindow
ldr r0, _080CFC50 @ =gTasks
adds r1, r7, r6
lsls r1, 3
@@ -3537,7 +3537,7 @@ _080CFC54:
ldr r1, _080CFCEC @ =gDisplayedStringBattle
movs r0, 0
movs r2, 0x1
bl sub_8054508
bl DrawTextOnTradeWindow
ldr r0, _080CFCF0 @ =gTasks
adds r1, r7, r6
lsls r1, 3
@@ -3625,7 +3625,7 @@ _080CFD1C:
ldr r1, _080CFD68 @ =gDisplayedStringBattle
movs r0, 0
movs r2, 0x1
bl sub_8054508
bl DrawTextOnTradeWindow
ldr r1, _080CFD6C @ =gTasks
adds r0, r7, r6
lsls r0, 3
@@ -3665,7 +3665,7 @@ _080CFD70:
ldr r1, _080CFDA4 @ =gDisplayedStringBattle
movs r0, 0
movs r2, 0x1
bl sub_8054508
bl DrawTextOnTradeWindow
ldr r1, _080CFDA8 @ =gTasks
adds r0, r7, r6
lsls r0, 3
@@ -3782,7 +3782,7 @@ _080CFE74:
ldr r1, _080CFEB8 @ =gDisplayedStringBattle
movs r0, 0
movs r2, 0x1
bl sub_8054508
bl DrawTextOnTradeWindow
ldr r1, _080CFEBC @ =gTasks
adds r0, r7, r6
lsls r0, 3
@@ -3825,7 +3825,7 @@ _080CFEC0:
ldr r1, _080CFF20 @ =gDisplayedStringBattle
movs r0, 0
movs r2, 0x1
bl sub_8054508
bl DrawTextOnTradeWindow
ldr r0, _080CFF24 @ =gTasks
adds r1, r7, r6
lsls r1, 3
@@ -3859,7 +3859,7 @@ _080CFF42:
ldr r1, _080CFF68 @ =gDisplayedStringBattle
movs r0, 0
movs r2, 0x1
bl sub_8054508
bl DrawTextOnTradeWindow
ldr r0, _080CFF6C @ =gTasks
adds r1, r7, r6
lsls r1, 3
@@ -3890,7 +3890,7 @@ _080CFF70:
ldr r1, _080CFFB0 @ =gDisplayedStringBattle
movs r0, 0
movs r2, 0x1
bl sub_8054508
bl DrawTextOnTradeWindow
ldr r1, _080CFFB4 @ =gTasks
adds r0, r7, r6
lsls r0, 3
@@ -3909,7 +3909,7 @@ _080CFFB8:
ldr r1, _080CFFE4 @ =gDisplayedStringBattle
movs r0, 0
movs r2, 0x1
bl sub_8054508
bl DrawTextOnTradeWindow
ldr r1, _080CFFE8 @ =gTasks
adds r0, r7, r6
lsls r0, 3
@@ -3932,7 +3932,7 @@ _080CFFEC:
ldr r1, _080D0010 @ =gDisplayedStringBattle
movs r0, 0
movs r2, 0x1
bl sub_8054508
bl DrawTextOnTradeWindow
ldr r1, _080D0014 @ =gTasks
adds r0, r7, r6
lsls r0, 3
asm/link_rfu_3.s
+2 -2
View File
@@ -3083,7 +3083,7 @@ _08117210:
movs r2, 0xD8
bl memcpy
bl ResetBlockReceivedFlags
ldr r1, _08117270 @ =gUnknown_2031DA4
ldr r1, _08117270 @ =gSelectedTradeMonPositions
strb r7, [r1]
movs r0, 0x6
strb r0, [r1, 0x1]
@@ -3105,7 +3105,7 @@ _0811725C:
.align 2, 0
_08117268: .4byte gLinkPartnerMail
_0811726C: .4byte gBlockRecvBuffer
_08117270: .4byte gUnknown_2031DA4
_08117270: .4byte gSelectedTradeMonPositions
_08117274: .4byte gMain
_08117278: .4byte CB2_ReturnToField
_0811727C: .4byte CB2_InitTradeAnim_LinkTrade
asm/pokeball.s
+3 -3
View File
@@ -2327,8 +2327,8 @@ _0804BB90:
bx r0
thumb_func_end sub_804BAA4
thumb_func_start sub_804BB98
sub_804BB98: @ 804BB98
thumb_func_start CreateTradePokeballSprite
CreateTradePokeballSprite: @ 804BB98
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@@ -2414,7 +2414,7 @@ _0804BC40: .4byte gUnknown_82605CC
_0804BC44: .4byte gUnknown_82606F4
_0804BC48: .4byte gSprites
_0804BC4C: .4byte sub_804BC50
thumb_func_end sub_804BB98
thumb_func_end CreateTradePokeballSprite
thumb_func_start sub_804BC50
sub_804BC50: @ 804BC50
asm/trade.s
+134 -2462
View File
File diff suppressed because it is too large Load Diff
data/strings.s
+4 -4
View File
@@ -4407,17 +4407,17 @@ gUnknown_841E1C5::
.string "Your friend wants\n"
.string "to trade POKéMON.$"
gUnknown_841E1E9:: @ 841E1E9
gText_XWillBeSentToY:: @ 841E1E9
.string "{STR_VAR_2} will be\n"
.string "sent to {STR_VAR_1}.$"
gUnknown_841E200:: @ 841E200
gText_ByeByeVar1:: @ 841E200
.string "Bye-bye, {STR_VAR_2}!$"
gUnknown_841E20D:: @ 841E20D
gText_XSentOverY:: @ 841E20D
.string "{STR_VAR_1} sent over {STR_VAR_3}.$"
gUnknown_841E21E:: @ 841E21E
gText_TakeGoodCareOfX:: @ 841E21E
.string "Take good care of {STR_VAR_3}!$"
gText_From:: @ 841E234
data/trade.s
+1 -1
View File
@@ -750,7 +750,7 @@ gSpriteAnimTable_826CE74::
gUnknown_826CE7C:: @ 826CE7C
obj_tiles gUnknown_8264C1C, 0x0300, 5552
gUnknown_826CE84:: @ 826CE84
sGlowBallSpriteTemplate:: @ 826CE84
spr_template 5552, 5551, gOamData_826CE5C, gSpriteAnimTable_826CE74, NULL, gDummySpriteAffineAnimTable, SpriteCB_TradeGlowCore
gOamData_826CE9C::
include/gba/defines.h
+1
View File
@@ -76,6 +76,7 @@
#define RGB_BLACK RGB(0, 0, 0)
#define RGB_WHITE RGB(31, 31, 31)
#define RGB_WHITEALPHA (0xFFFF)
#define NAKED __attribute__((naked))
#define UNUSED __attribute__((unused))
include/pokeball.h
+1 -1
View File
@@ -25,7 +25,7 @@ enum
u8 DoPokeballSendOutAnimation(s16 pan, u8 kindOfThrow);
void CreatePokeballSpriteToReleaseMon(u8 monSpriteId, u8 bank, u8 x, u8 y, u8 oamPriority, u8 subpriortiy, u8 g, u32 h);
u8 sub_804BB98(u8 monSpriteId, u8 bank, u8 x, u8 y, u8 oamPriority, u8 subpriortiy, u8 g, u32 h);
u8 CreateTradePokeballSprite(u8 monSpriteId, u8 bank, u8 x, u8 y, u8 oamPriority, u8 subpriortiy, u8 g, u32 h);
u8 sub_807671C(u8 a, u8 b, u8 x, u8 y, u8 oamPriority, u8 subPriority, u8 g, u32 h);
void sub_8076918(u8 bank);
void DoHitAnimHealthboxEffect(u8 bank);
include/strings.h
+4
View File
@@ -662,5 +662,9 @@ extern const u8 gText_SevenIsland[];
// trade
extern const u8 gUnknown_841E0A5[];
extern const u8 gText_XWillBeSentToY[];
extern const u8 gText_ByeByeVar1[];
extern const u8 gText_XSentOverY[];
extern const u8 gText_TakeGoodCareOfX[];
#endif //GUARD_STRINGS_H
src/oak_speech.c
+1 -1
View File
@@ -977,7 +977,7 @@ static void Task_OakSpeech15(u8 taskId)
{
ClearDialogWindowAndFrame(0, 1);
spriteId = gTasks[taskId].data[4];
gTasks[taskId].data[6] = sub_804BB98(spriteId, gSprites[spriteId].oam.paletteNum, 0x64, 0x42, 0, 0, 32, 0xFFFF1F3F);
gTasks[taskId].data[6] = CreateTradePokeballSprite(spriteId, gSprites[spriteId].oam.paletteNum, 0x64, 0x42, 0, 0, 32, 0xFFFF1F3F);
gTasks[taskId].data[3] = 48;
gTasks[taskId].data[0] = 64;
gTasks[taskId].func = Task_OakSpeech16;
src/trade.c
+694 -116
View File
File diff suppressed because it is too large Load Diff