mirror of
https://github.com/Ninjdai1/pokeemerald.git
synced 2024-12-25 19:24:16 +01:00
evo scene file is done
This commit is contained in:
parent
e8903fb4dd
commit
51df918c04
@ -1888,7 +1888,7 @@ sub_8035C4C: @ 8035C4C
|
||||
bne _08035C68
|
||||
ldr r0, =gText_Draw
|
||||
movs r1, 0x15
|
||||
bl sub_814F9EC
|
||||
bl BattleHandleAddTextPrinter
|
||||
b _08035D68
|
||||
.pool
|
||||
_08035C68:
|
||||
@ -1964,10 +1964,10 @@ _08035CE2:
|
||||
_08035CFC:
|
||||
ldr r0, =gText_Win
|
||||
movs r1, 0x17
|
||||
bl sub_814F9EC
|
||||
bl BattleHandleAddTextPrinter
|
||||
ldr r0, =gText_Loss
|
||||
movs r1, 0x16
|
||||
bl sub_814F9EC
|
||||
bl BattleHandleAddTextPrinter
|
||||
b _08035D68
|
||||
.pool
|
||||
_08035D20:
|
||||
@ -1985,19 +1985,19 @@ _08035D20:
|
||||
_08035D36:
|
||||
ldr r0, =gText_Win
|
||||
movs r1, 0x16
|
||||
bl sub_814F9EC
|
||||
bl BattleHandleAddTextPrinter
|
||||
ldr r0, =gText_Loss
|
||||
movs r1, 0x17
|
||||
bl sub_814F9EC
|
||||
bl BattleHandleAddTextPrinter
|
||||
b _08035D68
|
||||
.pool
|
||||
_08035D58:
|
||||
ldr r0, =gText_Win
|
||||
movs r1, 0x17
|
||||
bl sub_814F9EC
|
||||
bl BattleHandleAddTextPrinter
|
||||
ldr r0, =gText_Loss
|
||||
movs r1, 0x16
|
||||
bl sub_814F9EC
|
||||
bl BattleHandleAddTextPrinter
|
||||
_08035D68:
|
||||
pop {r0}
|
||||
bx r0
|
||||
@ -2068,14 +2068,14 @@ _08035DDC:
|
||||
_08035DE6:
|
||||
adds r0, r1, 0
|
||||
movs r1, 0x11
|
||||
bl sub_814F9EC
|
||||
bl BattleHandleAddTextPrinter
|
||||
ldrb r1, [r4, 0x18]
|
||||
movs r0, 0x4
|
||||
b _08035E14
|
||||
_08035DF4:
|
||||
adds r0, r1, 0
|
||||
movs r1, 0x12
|
||||
bl sub_814F9EC
|
||||
bl BattleHandleAddTextPrinter
|
||||
ldrb r1, [r4, 0x18]
|
||||
movs r0, 0x4
|
||||
str r0, [sp]
|
||||
@ -2085,7 +2085,7 @@ _08035DF4:
|
||||
_08035E08:
|
||||
adds r0, r1, 0
|
||||
movs r1, 0x13
|
||||
bl sub_814F9EC
|
||||
bl BattleHandleAddTextPrinter
|
||||
ldrb r1, [r4, 0x18]
|
||||
movs r0, 0x8
|
||||
_08035E14:
|
||||
@ -2099,7 +2099,7 @@ _08035E1A:
|
||||
_08035E22:
|
||||
adds r0, r1, 0
|
||||
movs r1, 0x14
|
||||
bl sub_814F9EC
|
||||
bl BattleHandleAddTextPrinter
|
||||
ldrb r1, [r4, 0x18]
|
||||
movs r0, 0x8
|
||||
str r0, [sp]
|
||||
@ -2139,14 +2139,14 @@ _08035E66:
|
||||
adds r1, r0, r4
|
||||
adds r0, r1, 0
|
||||
movs r1, 0xF
|
||||
bl sub_814F9EC
|
||||
bl BattleHandleAddTextPrinter
|
||||
lsls r0, r6, 3
|
||||
subs r0, r6
|
||||
lsls r0, 2
|
||||
adds r1, r0, r4
|
||||
adds r0, r1, 0
|
||||
movs r1, 0x10
|
||||
bl sub_814F9EC
|
||||
bl BattleHandleAddTextPrinter
|
||||
movs r4, 0x7
|
||||
str r4, [sp]
|
||||
adds r0, r7, 0
|
||||
|
@ -5045,7 +5045,7 @@ sub_8066FF4: @ 8066FF4
|
||||
bl BufferStringBattle
|
||||
ldr r0, =gDisplayedStringBattle
|
||||
movs r1, 0
|
||||
bl sub_814F9EC
|
||||
bl BattleHandleAddTextPrinter
|
||||
ldr r1, =gBattleBankFunc
|
||||
ldrb r0, [r5]
|
||||
lsls r0, 2
|
||||
|
@ -4354,7 +4354,7 @@ sub_814D590: @ 814D590
|
||||
bl BufferStringBattle
|
||||
ldr r0, =gDisplayedStringBattle
|
||||
movs r1, 0
|
||||
bl sub_814F9EC
|
||||
bl BattleHandleAddTextPrinter
|
||||
ldr r1, =gBattleBankFunc
|
||||
ldrb r0, [r5]
|
||||
lsls r0, 2
|
||||
|
@ -5185,7 +5185,7 @@ sub_8061F34: @ 8061F34
|
||||
bl BufferStringBattle
|
||||
ldr r0, =gDisplayedStringBattle
|
||||
movs r1, 0
|
||||
bl sub_814F9EC
|
||||
bl BattleHandleAddTextPrinter
|
||||
ldr r1, =gBattleBankFunc
|
||||
ldrb r0, [r5]
|
||||
lsls r0, 2
|
||||
|
@ -1247,7 +1247,7 @@ _08057F80:
|
||||
bl battle_menu_cursor_related_2
|
||||
ldr r0, =gText_BattleSwitchWhich
|
||||
movs r1, 0xB
|
||||
bl sub_814F9EC
|
||||
bl BattleHandleAddTextPrinter
|
||||
ldr r1, =gBattleBankFunc
|
||||
ldr r0, =gActiveBank
|
||||
ldrb r0, [r0]
|
||||
@ -4244,11 +4244,11 @@ sub_80599D4: @ 80599D4
|
||||
movs r0, 0x5
|
||||
bl PlaySE
|
||||
ldrb r0, [r4]
|
||||
bl BattleDestroyCursorAt
|
||||
bl BattleDestroyYesNoCursorAt
|
||||
movs r0, 0
|
||||
strb r0, [r4]
|
||||
movs r0, 0
|
||||
bl BattleCreateCursorAt
|
||||
bl BattleCreateYesNoCursorAt
|
||||
_08059A02:
|
||||
ldr r0, =gMain
|
||||
ldrh r1, [r0, 0x2E]
|
||||
@ -4263,11 +4263,11 @@ _08059A02:
|
||||
movs r0, 0x5
|
||||
bl PlaySE
|
||||
ldrb r0, [r4]
|
||||
bl BattleDestroyCursorAt
|
||||
bl BattleDestroyYesNoCursorAt
|
||||
movs r0, 0x1
|
||||
strb r0, [r4]
|
||||
movs r0, 0x1
|
||||
bl BattleCreateCursorAt
|
||||
bl BattleCreateYesNoCursorAt
|
||||
_08059A2C:
|
||||
ldr r0, =gMain
|
||||
ldrh r1, [r0, 0x2E]
|
||||
@ -4281,7 +4281,7 @@ _08059A2C:
|
||||
movs r1, 0x8
|
||||
movs r2, 0x1D
|
||||
movs r3, 0xD
|
||||
bl sub_8056A3C
|
||||
bl HandleBattleWindow
|
||||
movs r0, 0x5
|
||||
bl PlaySE
|
||||
ldr r0, =gUnknown_03005D74
|
||||
@ -4314,7 +4314,7 @@ _08059A7A:
|
||||
movs r1, 0x8
|
||||
movs r2, 0x1D
|
||||
movs r3, 0xD
|
||||
bl sub_8056A3C
|
||||
bl HandleBattleWindow
|
||||
movs r0, 0x5
|
||||
bl PlaySE
|
||||
bl PlayerBufferExecCompleted
|
||||
@ -4355,7 +4355,7 @@ _08059AC4:
|
||||
lsls r1, 24
|
||||
lsrs r1, 24
|
||||
adds r0, r7, 0
|
||||
bl sub_814F9EC
|
||||
bl BattleHandleAddTextPrinter
|
||||
ldrh r0, [r4]
|
||||
cmp r0, 0
|
||||
beq _08059AF4
|
||||
@ -4382,7 +4382,7 @@ sub_8059B18: @ 8059B18
|
||||
bl StringCopy
|
||||
adds r0, r4, 0
|
||||
movs r1, 0x7
|
||||
bl sub_814F9EC
|
||||
bl BattleHandleAddTextPrinter
|
||||
pop {r4}
|
||||
pop {r0}
|
||||
bx r0
|
||||
@ -4432,7 +4432,7 @@ sub_8059B3C: @ 8059B3C
|
||||
bl ConvertIntToDecimalStringN
|
||||
adds r0, r6, 0
|
||||
movs r1, 0x9
|
||||
bl sub_814F9EC
|
||||
bl BattleHandleAddTextPrinter
|
||||
_08059B98:
|
||||
pop {r4-r7}
|
||||
pop {r0}
|
||||
@ -4481,7 +4481,7 @@ sub_8059BB0: @ 8059BB0
|
||||
bl StringCopy
|
||||
adds r0, r6, 0
|
||||
movs r1, 0xA
|
||||
bl sub_814F9EC
|
||||
bl BattleHandleAddTextPrinter
|
||||
pop {r4-r6}
|
||||
pop {r0}
|
||||
bx r0
|
||||
@ -4718,7 +4718,7 @@ b_link_standby_message: @ 8059DC0
|
||||
strh r1, [r0]
|
||||
ldr r0, =gText_LinkStandby
|
||||
movs r1, 0
|
||||
bl sub_814F9EC
|
||||
bl BattleHandleAddTextPrinter
|
||||
_08059DE0:
|
||||
pop {r0}
|
||||
bx r0
|
||||
@ -8458,7 +8458,7 @@ sub_805BF80: @ 805BF80
|
||||
bl BufferStringBattle
|
||||
ldr r0, =gDisplayedStringBattle
|
||||
movs r1, 0
|
||||
bl sub_814F9EC
|
||||
bl BattleHandleAddTextPrinter
|
||||
ldr r1, =gBattleBankFunc
|
||||
ldrb r0, [r5]
|
||||
lsls r0, 2
|
||||
@ -8534,7 +8534,7 @@ dp01t_12_6_battle_menu: @ 805C044
|
||||
bl sub_817F2A8
|
||||
ldr r0, =gText_BattleMenu
|
||||
movs r1, 0x2
|
||||
bl sub_814F9EC
|
||||
bl BattleHandleAddTextPrinter
|
||||
movs r4, 0
|
||||
_0805C062:
|
||||
lsls r0, r4, 24
|
||||
@ -8554,7 +8554,7 @@ _0805C062:
|
||||
bl BattleStringExpandPlaceholdersToDisplayedString
|
||||
ldr r0, =gDisplayedStringBattle
|
||||
movs r1, 0x1
|
||||
bl sub_814F9EC
|
||||
bl BattleHandleAddTextPrinter
|
||||
pop {r4}
|
||||
pop {r0}
|
||||
bx r0
|
||||
@ -8577,15 +8577,15 @@ sub_805C0B0: @ 805C0B0
|
||||
movs r1, 0x8
|
||||
movs r2, 0x1D
|
||||
movs r3, 0xD
|
||||
bl sub_8056A3C
|
||||
bl HandleBattleWindow
|
||||
ldr r0, =gText_BattleYesNoChoice
|
||||
movs r1, 0xC
|
||||
bl sub_814F9EC
|
||||
bl BattleHandleAddTextPrinter
|
||||
ldr r1, =gUnknown_03005D74
|
||||
movs r0, 0x1
|
||||
strb r0, [r1]
|
||||
movs r0, 0x1
|
||||
bl BattleCreateCursorAt
|
||||
bl BattleCreateYesNoCursorAt
|
||||
ldr r1, =gBattleBankFunc
|
||||
ldrb r0, [r4]
|
||||
lsls r0, 2
|
||||
|
@ -4966,7 +4966,7 @@ sub_81BDA4C: @ 81BDA4C
|
||||
bl BufferStringBattle
|
||||
ldr r0, =gDisplayedStringBattle
|
||||
movs r1, 0
|
||||
bl sub_814F9EC
|
||||
bl BattleHandleAddTextPrinter
|
||||
ldr r1, =gBattleBankFunc
|
||||
ldrb r0, [r4]
|
||||
lsls r0, 2
|
||||
|
@ -4722,7 +4722,7 @@ sub_8188E90: @ 8188E90
|
||||
bl BufferStringBattle
|
||||
ldr r0, =gDisplayedStringBattle
|
||||
movs r1, 0
|
||||
bl sub_814F9EC
|
||||
bl BattleHandleAddTextPrinter
|
||||
ldr r1, =gBattleBankFunc
|
||||
ldrb r0, [r4]
|
||||
lsls r0, 2
|
||||
|
@ -4822,7 +4822,7 @@ sub_818C43C: @ 818C43C
|
||||
bl BufferStringBattle
|
||||
ldr r0, =gDisplayedStringBattle
|
||||
movs r1, 0
|
||||
bl sub_814F9EC
|
||||
bl BattleHandleAddTextPrinter
|
||||
ldr r1, =gBattleBankFunc
|
||||
ldrb r0, [r4]
|
||||
lsls r0, 2
|
||||
|
@ -792,7 +792,7 @@ dp01t_10_6_message: @ 81599DC
|
||||
bl BufferStringBattle
|
||||
ldr r0, =gDisplayedStringBattle
|
||||
movs r1, 0
|
||||
bl sub_814F9EC
|
||||
bl BattleHandleAddTextPrinter
|
||||
ldr r1, =gBattleBankFunc
|
||||
ldrb r0, [r4]
|
||||
lsls r0, 2
|
||||
@ -862,7 +862,7 @@ sub_8159A94: @ 8159A94
|
||||
str r1, [r0]
|
||||
ldr r0, =gText_SafariZoneMenu
|
||||
movs r1, 0x2
|
||||
bl sub_814F9EC
|
||||
bl BattleHandleAddTextPrinter
|
||||
movs r4, 0
|
||||
_08159AAE:
|
||||
lsls r0, r4, 24
|
||||
@ -882,7 +882,7 @@ _08159AAE:
|
||||
bl BattleStringExpandPlaceholdersToDisplayedString
|
||||
ldr r0, =gDisplayedStringBattle
|
||||
movs r1, 0x1
|
||||
bl sub_814F9EC
|
||||
bl BattleHandleAddTextPrinter
|
||||
pop {r4}
|
||||
pop {r0}
|
||||
bx r0
|
||||
|
@ -3606,7 +3606,7 @@ sub_816A3B8: @ 816A3B8
|
||||
bl BufferStringBattle
|
||||
ldr r0, =gDisplayedStringBattle
|
||||
movs r1, 0
|
||||
bl sub_814F9EC
|
||||
bl BattleHandleAddTextPrinter
|
||||
ldr r1, =gBattleBankFunc
|
||||
ldrb r0, [r4]
|
||||
lsls r0, 2
|
||||
@ -3676,7 +3676,7 @@ dp01t_12_1_battle_menu: @ 816A470
|
||||
str r1, [r0]
|
||||
ldr r0, =gText_BattleMenu
|
||||
movs r1, 0x2
|
||||
bl sub_814F9EC
|
||||
bl BattleHandleAddTextPrinter
|
||||
movs r4, 0
|
||||
_0816A48A:
|
||||
lsls r0, r4, 24
|
||||
@ -3696,7 +3696,7 @@ _0816A48A:
|
||||
bl BattleStringExpandPlaceholdersToDisplayedString
|
||||
ldr r0, =gDisplayedStringBattle
|
||||
movs r1, 0x1
|
||||
bl sub_814F9EC
|
||||
bl BattleHandleAddTextPrinter
|
||||
pop {r4}
|
||||
pop {r0}
|
||||
bx r0
|
||||
|
@ -20557,7 +20557,7 @@ _081A5306:
|
||||
movs r1, 0
|
||||
movs r2, 0x18
|
||||
movs r3, 0xD
|
||||
bl sub_8056A3C
|
||||
bl HandleBattleWindow
|
||||
b _081A553E
|
||||
.pool
|
||||
_081A531C:
|
||||
@ -20582,29 +20582,29 @@ _081A5328:
|
||||
ldr r4, =gDisplayedStringBattle
|
||||
adds r0, r4, 0
|
||||
movs r1, 0xF
|
||||
bl sub_814F9EC
|
||||
bl BattleHandleAddTextPrinter
|
||||
ldr r0, =gText_Vs
|
||||
movs r1, 0x10
|
||||
bl sub_814F9EC
|
||||
bl BattleHandleAddTextPrinter
|
||||
ldr r0, =gText_OpponentMon1Name
|
||||
bl BattleStringExpandPlaceholdersToDisplayedString
|
||||
adds r0, r4, 0
|
||||
movs r1, 0x11
|
||||
bl sub_814F9EC
|
||||
bl BattleHandleAddTextPrinter
|
||||
ldr r0, =gText_Mind
|
||||
movs r1, 0x12
|
||||
bl sub_814F9EC
|
||||
bl BattleHandleAddTextPrinter
|
||||
ldr r0, =gText_Skill
|
||||
movs r1, 0x13
|
||||
bl sub_814F9EC
|
||||
bl BattleHandleAddTextPrinter
|
||||
ldr r0, =gText_Body
|
||||
movs r1, 0x14
|
||||
bl sub_814F9EC
|
||||
bl BattleHandleAddTextPrinter
|
||||
ldr r0, =gText_Judgement
|
||||
bl BattleStringExpandPlaceholdersToDisplayedString
|
||||
adds r0, r4, 0
|
||||
movs r1, 0x15
|
||||
bl sub_814F9EC
|
||||
bl BattleHandleAddTextPrinter
|
||||
b _081A553E
|
||||
.pool
|
||||
_081A53B4:
|
||||
@ -20688,7 +20688,7 @@ _081A5464:
|
||||
bl BattleStringExpandPlaceholdersToDisplayedString
|
||||
ldr r0, =gDisplayedStringBattle
|
||||
movs r1, 0x15
|
||||
bl sub_814F9EC
|
||||
bl BattleHandleAddTextPrinter
|
||||
ldrb r0, [r5]
|
||||
adds r0, 0x1
|
||||
strb r0, [r5]
|
||||
@ -20733,7 +20733,7 @@ _081A54D4:
|
||||
movs r1, 0
|
||||
movs r2, 0x18
|
||||
movs r3, 0xD
|
||||
bl sub_8056A3C
|
||||
bl HandleBattleWindow
|
||||
movs r0, 0
|
||||
bl CopyBgTilemapBufferToVram
|
||||
ldr r0, =gMPlay_BGM
|
||||
|
File diff suppressed because it is too large
Load Diff
@ -13861,7 +13861,7 @@ sub_81B7810: @ 81B7810
|
||||
cmp r4, 0
|
||||
beq _081B7860
|
||||
bl sub_81B06F4
|
||||
ldr r0, =gUnknown_030061E8
|
||||
ldr r0, =gCB2_AfterEvolution
|
||||
ldr r1, [r6]
|
||||
str r1, [r0]
|
||||
ldrb r3, [r6, 0x9]
|
||||
@ -14307,7 +14307,7 @@ sub_81B7C74: @ 81B7C74
|
||||
lsrs r5, r0, 24
|
||||
movs r0, 0x5
|
||||
bl PlaySE
|
||||
ldr r2, =gUnknown_030061E8
|
||||
ldr r2, =gCB2_AfterEvolution
|
||||
ldr r1, =gUnknown_0203CEC8
|
||||
ldr r0, [r1]
|
||||
str r0, [r2]
|
||||
|
12
asm/trade.s
12
asm/trade.s
@ -10590,7 +10590,7 @@ _0807CEDC:
|
||||
ldrb r0, [r0]
|
||||
movs r1, 0
|
||||
bl sub_807B4D0
|
||||
ldr r1, =gUnknown_030061E8
|
||||
ldr r1, =gCB2_AfterEvolution
|
||||
ldr r0, =sub_807B60C
|
||||
str r0, [r1]
|
||||
ldr r7, =gUnknown_02032298
|
||||
@ -10615,7 +10615,7 @@ _0807CEDC:
|
||||
adds r1, 0x8F
|
||||
ldrb r2, [r1]
|
||||
adds r1, r4, 0
|
||||
bl sub_813E1D4
|
||||
bl TradeEvolutionScene
|
||||
b _0807CF48
|
||||
.pool
|
||||
_0807CF38:
|
||||
@ -12695,7 +12695,7 @@ _0807E328:
|
||||
ldrb r0, [r0]
|
||||
movs r1, 0
|
||||
bl sub_807B4D0
|
||||
ldr r1, =gUnknown_030061E8
|
||||
ldr r1, =gCB2_AfterEvolution
|
||||
ldr r0, =sub_807B60C
|
||||
str r0, [r1]
|
||||
ldr r7, =gUnknown_02032298
|
||||
@ -12720,7 +12720,7 @@ _0807E328:
|
||||
adds r1, 0x8F
|
||||
ldrb r2, [r1]
|
||||
adds r1, r4, 0
|
||||
bl sub_813E1D4
|
||||
bl TradeEvolutionScene
|
||||
b _0807E394
|
||||
.pool
|
||||
_0807E384:
|
||||
@ -12810,7 +12810,7 @@ _0807E434:
|
||||
b _0807E4B2
|
||||
.pool
|
||||
_0807E444:
|
||||
ldr r0, =gUnknown_030061E8
|
||||
ldr r0, =gCB2_AfterEvolution
|
||||
ldr r1, =sub_807EB50
|
||||
mov r8, r1
|
||||
str r1, [r0]
|
||||
@ -12836,7 +12836,7 @@ _0807E444:
|
||||
adds r1, 0x8F
|
||||
ldrb r2, [r1]
|
||||
adds r1, r4, 0
|
||||
bl sub_813E1D4
|
||||
bl TradeEvolutionScene
|
||||
b _0807E4AE
|
||||
.pool
|
||||
_0807E494:
|
||||
|
@ -204,7 +204,7 @@ struct StringInfoBattle
|
||||
void BufferStringBattle(u16 stringID);
|
||||
u32 BattleStringExpandPlaceholdersToDisplayedString(const u8* src);
|
||||
u32 BattleStringExpandPlaceholders(const u8* src, u8* dst);
|
||||
void sub_814F9EC(const u8* text, u8 arg1);
|
||||
void BattleHandleAddTextPrinter(const u8* text, u8 arg1);
|
||||
void SetPpNumbersPaletteInMoveSelection(void);
|
||||
u8 GetCurrentPpToMaxPpState(u8 currentPp, u8 maxPp);
|
||||
|
||||
@ -215,6 +215,7 @@ extern u8 gBattleTextBuff1[TEXT_BUFF_ARRAY_COUNT];
|
||||
extern u8 gBattleTextBuff2[TEXT_BUFF_ARRAY_COUNT];
|
||||
extern u8 gBattleTextBuff3[TEXT_BUFF_ARRAY_COUNT];
|
||||
|
||||
extern const u8* const gBattleStringsTable[];
|
||||
extern const u8* const gStatNamesTable[];
|
||||
extern const u8* const gPokeblockWasTooXStringTable[];
|
||||
extern const u8* const gRefereeStringsTable[];
|
||||
|
@ -46,10 +46,10 @@ u8 TypeCalc(u16 move, u8 bankAtk, u8 bankDef);
|
||||
u8 AI_TypeCalc(u16 move, u16 targetSpecies, u8 targetAbility);
|
||||
u8 BankGetTurnOrder(u8 bank);
|
||||
void SetMoveEffect(bool8 primary, u8 certain);
|
||||
void BattleDestroyCursorAt(u8 cursorPosition);
|
||||
void BattleCreateCursorAt(u8 cursorPosition);
|
||||
void BattleDestroyYesNoCursorAt(u8 cursorPosition);
|
||||
void BattleCreateYesNoCursorAt(u8 cursorPosition);
|
||||
void BufferMoveToLearnIntoBattleTextBuff2(void);
|
||||
void sub_8056A3C(u8 xStart, u8 yStart, u8 xEnd, u8 yEnd, u8 flags);
|
||||
void HandleBattleWindow(u8 xStart, u8 yStart, u8 xEnd, u8 yEnd, u8 flags);
|
||||
bool8 UproarWakeUpCheck(u8 bank);
|
||||
|
||||
extern void (* const gBattleScriptingCommandsTable[])(void);
|
||||
|
@ -1,8 +1,8 @@
|
||||
#ifndef GUARD_EVOLUTION_SCENE_H
|
||||
#define GUARD_EVOLUTION_SCENE_H
|
||||
|
||||
void EvolutionScene(struct Pokemon* mon, u16 speciesToEvolve, bool8 canStopEvo, u8 partyID);
|
||||
void BeginEvolutionScene(struct Pokemon* mon, u16 speciesToEvolve, bool8 canStopEvo, u8 partyID);
|
||||
void EvolutionScene(struct Pokemon* mon, u16 speciesToEvolve, bool8 canStopEvo, u8 partyID);
|
||||
void TradeEvolutionScene(struct Pokemon* mon, u16 speciesToEvolve, u8 preEvoSpriteID, u8 partyID);
|
||||
|
||||
extern void (*gCB2_AfterEvolution)(void);
|
||||
|
@ -181,7 +181,6 @@ SECTIONS {
|
||||
asm/battle_records.o(.text);
|
||||
asm/pokedex_area_screen.o(.text);
|
||||
src/evolution_scene.o(.text);
|
||||
asm/evolution_scene.o(.text);
|
||||
asm/roulette.o(.text);
|
||||
asm/pokedex_cry_screen.o(.text);
|
||||
src/coins.o(.text);
|
||||
|
@ -85,7 +85,7 @@ extern u16 gTrainerBattleOpponent_B;
|
||||
extern struct BattleEnigmaBerry gEnigmaBerries[BATTLE_BANKS_COUNT];
|
||||
extern void (*gPreBattleCallback1)(void);
|
||||
extern void (*gBattleMainFunc)(void);
|
||||
extern void (*gUnknown_030061E8)(void);
|
||||
extern void (*gCB2_AfterEvolution)(void);
|
||||
extern struct UnknownPokemonStruct2 gUnknown_02022FF8[3]; // what is it used for?
|
||||
extern struct UnknownPokemonStruct2* gUnknown_02023058; // what is it used for?
|
||||
extern u8 gUnknown_02039B28[]; // possibly a struct?
|
||||
@ -2121,7 +2121,7 @@ static void sub_8038F34(void)
|
||||
if (sub_800A520() == TRUE)
|
||||
{
|
||||
sub_800ADF8();
|
||||
sub_814F9EC(gText_LinkStandby3, 0);
|
||||
BattleHandleAddTextPrinter(gText_LinkStandby3, 0);
|
||||
gBattleCommunication[MULTIUSE_STATE]++;
|
||||
}
|
||||
break;
|
||||
@ -2247,17 +2247,17 @@ static void sub_803939C(void)
|
||||
case 3:
|
||||
if (!gPaletteFade.active)
|
||||
{
|
||||
sub_814F9EC(gText_RecordBattleToPass, 0);
|
||||
BattleHandleAddTextPrinter(gText_RecordBattleToPass, 0);
|
||||
gBattleCommunication[MULTIUSE_STATE]++;
|
||||
}
|
||||
break;
|
||||
case 4:
|
||||
if (!IsTextPrinterActive(0))
|
||||
{
|
||||
sub_8056A3C(0x18, 8, 0x1D, 0xD, 0);
|
||||
sub_814F9EC(gText_BattleYesNoChoice, 0xC);
|
||||
HandleBattleWindow(0x18, 8, 0x1D, 0xD, 0);
|
||||
BattleHandleAddTextPrinter(gText_BattleYesNoChoice, 0xC);
|
||||
gBattleCommunication[CURSOR_POSITION] = 1;
|
||||
BattleCreateCursorAt(1);
|
||||
BattleCreateYesNoCursorAt(1);
|
||||
gBattleCommunication[MULTIUSE_STATE]++;
|
||||
}
|
||||
break;
|
||||
@ -2267,9 +2267,9 @@ static void sub_803939C(void)
|
||||
if (gBattleCommunication[CURSOR_POSITION] != 0)
|
||||
{
|
||||
PlaySE(SE_SELECT);
|
||||
BattleDestroyCursorAt(gBattleCommunication[CURSOR_POSITION]);
|
||||
BattleDestroyYesNoCursorAt(gBattleCommunication[CURSOR_POSITION]);
|
||||
gBattleCommunication[CURSOR_POSITION] = 0;
|
||||
BattleCreateCursorAt(0);
|
||||
BattleCreateYesNoCursorAt(0);
|
||||
}
|
||||
}
|
||||
else if (gMain.newKeys & DPAD_DOWN)
|
||||
@ -2277,9 +2277,9 @@ static void sub_803939C(void)
|
||||
if (gBattleCommunication[CURSOR_POSITION] == 0)
|
||||
{
|
||||
PlaySE(SE_SELECT);
|
||||
BattleDestroyCursorAt(gBattleCommunication[CURSOR_POSITION]);
|
||||
BattleDestroyYesNoCursorAt(gBattleCommunication[CURSOR_POSITION]);
|
||||
gBattleCommunication[CURSOR_POSITION] = 1;
|
||||
BattleCreateCursorAt(1);
|
||||
BattleCreateYesNoCursorAt(1);
|
||||
}
|
||||
}
|
||||
else if (gMain.newKeys & A_BUTTON)
|
||||
@ -2287,7 +2287,7 @@ static void sub_803939C(void)
|
||||
PlaySE(SE_SELECT);
|
||||
if (gBattleCommunication[CURSOR_POSITION] == 0)
|
||||
{
|
||||
sub_8056A3C(0x18, 8, 0x1D, 0xD, 1);
|
||||
HandleBattleWindow(0x18, 8, 0x1D, 0xD, 1);
|
||||
gBattleCommunication[1] = MoveRecordedBattleToSaveData();
|
||||
gBattleCommunication[MULTIUSE_STATE] = 10;
|
||||
}
|
||||
@ -2305,11 +2305,11 @@ static void sub_803939C(void)
|
||||
case 6:
|
||||
if (sub_800A520() == TRUE)
|
||||
{
|
||||
sub_8056A3C(0x18, 8, 0x1D, 0xD, 1);
|
||||
HandleBattleWindow(0x18, 8, 0x1D, 0xD, 1);
|
||||
if (gMain.field_439_x4)
|
||||
{
|
||||
sub_800ADF8();
|
||||
sub_814F9EC(gText_LinkStandby3, 0);
|
||||
BattleHandleAddTextPrinter(gText_LinkStandby3, 0);
|
||||
}
|
||||
gBattleCommunication[MULTIUSE_STATE]++;
|
||||
}
|
||||
@ -2340,14 +2340,14 @@ static void sub_803939C(void)
|
||||
{
|
||||
PlaySE(SE_SAVE);
|
||||
BattleStringExpandPlaceholdersToDisplayedString(gText_BattleRecordedOnPass);
|
||||
sub_814F9EC(gDisplayedStringBattle, 0);
|
||||
BattleHandleAddTextPrinter(gDisplayedStringBattle, 0);
|
||||
gBattleCommunication[1] = 0x80;
|
||||
gBattleCommunication[MULTIUSE_STATE]++;
|
||||
}
|
||||
else
|
||||
{
|
||||
BattleStringExpandPlaceholdersToDisplayedString(gText_BattleRecordCouldntBeSaved);
|
||||
sub_814F9EC(gDisplayedStringBattle, 0);
|
||||
BattleHandleAddTextPrinter(gDisplayedStringBattle, 0);
|
||||
gBattleCommunication[1] = 0x80;
|
||||
gBattleCommunication[MULTIUSE_STATE]++;
|
||||
}
|
||||
@ -2358,7 +2358,7 @@ static void sub_803939C(void)
|
||||
if (gMain.field_439_x4)
|
||||
{
|
||||
sub_800ADF8();
|
||||
sub_814F9EC(gText_LinkStandby3, 0);
|
||||
BattleHandleAddTextPrinter(gText_LinkStandby3, 0);
|
||||
}
|
||||
gBattleCommunication[MULTIUSE_STATE]++;
|
||||
}
|
||||
@ -3690,7 +3690,7 @@ static void TryDoEventsBeforeFirstTurn(void)
|
||||
TurnValuesCleanUp(FALSE);
|
||||
SpecialStatusesClear();
|
||||
*(&gBattleStruct->field_91) = gAbsentBankFlags;
|
||||
sub_814F9EC(gText_EmptyString3, 0);
|
||||
BattleHandleAddTextPrinter(gText_EmptyString3, 0);
|
||||
gBattleMainFunc = HandleTurnActionSelectionState;
|
||||
ResetSentPokesToOpponentValue();
|
||||
|
||||
@ -3797,7 +3797,7 @@ void BattleTurnPassed(void)
|
||||
*(gBattleStruct->field_5C + i) = 6;
|
||||
|
||||
*(&gBattleStruct->field_91) = gAbsentBankFlags;
|
||||
sub_814F9EC(gText_EmptyString3, 0);
|
||||
BattleHandleAddTextPrinter(gText_EmptyString3, 0);
|
||||
gBattleMainFunc = HandleTurnActionSelectionState;
|
||||
gRandomTurnNumber = Random();
|
||||
|
||||
@ -4939,7 +4939,7 @@ static void HandleEndTurn_FinishBattle(void)
|
||||
BeginFastPaletteFade(3);
|
||||
FadeOutMapMusic(5);
|
||||
gBattleMainFunc = FreeResetData_ReturnToOvOrDoEvolutions;
|
||||
gUnknown_030061E8 = BattleMainCB2;
|
||||
gCB2_AfterEvolution = BattleMainCB2;
|
||||
}
|
||||
else
|
||||
{
|
||||
|
@ -2209,7 +2209,7 @@ static void sub_814F950(u8* dst)
|
||||
}
|
||||
}
|
||||
|
||||
void sub_814F9EC(const u8 *text, u8 arg1)
|
||||
void BattleHandleAddTextPrinter(const u8 *text, u8 arg1)
|
||||
{
|
||||
const u8 *r8 = gUnknown_085CD660[gBattleScripting.field_24];
|
||||
bool32 r9;
|
||||
|
@ -6114,33 +6114,33 @@ static void atk5A_yesnoboxlearnmove(void)
|
||||
switch (gBattleScripting.learnMoveState)
|
||||
{
|
||||
case 0:
|
||||
sub_8056A3C(0x18, 8, 0x1D, 0xD, 0);
|
||||
sub_814F9EC(gText_BattleYesNoChoice, 0xC);
|
||||
HandleBattleWindow(0x18, 8, 0x1D, 0xD, 0);
|
||||
BattleHandleAddTextPrinter(gText_BattleYesNoChoice, 0xC);
|
||||
gBattleScripting.learnMoveState++;
|
||||
gBattleCommunication[CURSOR_POSITION] = 0;
|
||||
BattleCreateCursorAt(0);
|
||||
BattleCreateYesNoCursorAt(0);
|
||||
break;
|
||||
case 1:
|
||||
if (gMain.newKeys & DPAD_UP && gBattleCommunication[CURSOR_POSITION] != 0)
|
||||
{
|
||||
PlaySE(SE_SELECT);
|
||||
BattleDestroyCursorAt(gBattleCommunication[CURSOR_POSITION]);
|
||||
BattleDestroyYesNoCursorAt(gBattleCommunication[CURSOR_POSITION]);
|
||||
gBattleCommunication[CURSOR_POSITION] = 0;
|
||||
BattleCreateCursorAt(0);
|
||||
BattleCreateYesNoCursorAt(0);
|
||||
}
|
||||
if (gMain.newKeys & DPAD_DOWN && gBattleCommunication[CURSOR_POSITION] == 0)
|
||||
{
|
||||
PlaySE(SE_SELECT);
|
||||
BattleDestroyCursorAt(gBattleCommunication[CURSOR_POSITION]);
|
||||
BattleDestroyYesNoCursorAt(gBattleCommunication[CURSOR_POSITION]);
|
||||
gBattleCommunication[CURSOR_POSITION] = 1;
|
||||
BattleCreateCursorAt(1);
|
||||
BattleCreateYesNoCursorAt(1);
|
||||
}
|
||||
if (gMain.newKeys & A_BUTTON)
|
||||
{
|
||||
PlaySE(SE_SELECT);
|
||||
if (gBattleCommunication[1] == 0)
|
||||
{
|
||||
sub_8056A3C(0x18, 0x8, 0x1D, 0xD, 1);
|
||||
HandleBattleWindow(0x18, 0x8, 0x1D, 0xD, 1);
|
||||
BeginNormalPaletteFade(-1, 0, 0, 0x10, 0);
|
||||
gBattleScripting.learnMoveState++;
|
||||
}
|
||||
@ -6214,7 +6214,7 @@ static void atk5A_yesnoboxlearnmove(void)
|
||||
}
|
||||
break;
|
||||
case 5:
|
||||
sub_8056A3C(0x18, 8, 0x1D, 0xD, 1);
|
||||
HandleBattleWindow(0x18, 8, 0x1D, 0xD, 1);
|
||||
gBattlescriptCurrInstr += 5;
|
||||
break;
|
||||
case 6:
|
||||
@ -6231,26 +6231,26 @@ static void atk5B_yesnoboxstoplearningmove(void)
|
||||
switch (gBattleScripting.learnMoveState)
|
||||
{
|
||||
case 0:
|
||||
sub_8056A3C(0x18, 8, 0x1D, 0xD, 0);
|
||||
sub_814F9EC(gText_BattleYesNoChoice, 0xC);
|
||||
HandleBattleWindow(0x18, 8, 0x1D, 0xD, 0);
|
||||
BattleHandleAddTextPrinter(gText_BattleYesNoChoice, 0xC);
|
||||
gBattleScripting.learnMoveState++;
|
||||
gBattleCommunication[CURSOR_POSITION] = 0;
|
||||
BattleCreateCursorAt(0);
|
||||
BattleCreateYesNoCursorAt(0);
|
||||
break;
|
||||
case 1:
|
||||
if (gMain.newKeys & DPAD_UP && gBattleCommunication[CURSOR_POSITION] != 0)
|
||||
{
|
||||
PlaySE(SE_SELECT);
|
||||
BattleDestroyCursorAt(gBattleCommunication[CURSOR_POSITION]);
|
||||
BattleDestroyYesNoCursorAt(gBattleCommunication[CURSOR_POSITION]);
|
||||
gBattleCommunication[CURSOR_POSITION] = 0;
|
||||
BattleCreateCursorAt(0);
|
||||
BattleCreateYesNoCursorAt(0);
|
||||
}
|
||||
if (gMain.newKeys & DPAD_DOWN && gBattleCommunication[CURSOR_POSITION] == 0)
|
||||
{
|
||||
PlaySE(SE_SELECT);
|
||||
BattleDestroyCursorAt(gBattleCommunication[CURSOR_POSITION]);
|
||||
BattleDestroyYesNoCursorAt(gBattleCommunication[CURSOR_POSITION]);
|
||||
gBattleCommunication[CURSOR_POSITION] = 1;
|
||||
BattleCreateCursorAt(1);
|
||||
BattleCreateYesNoCursorAt(1);
|
||||
}
|
||||
if (gMain.newKeys & A_BUTTON)
|
||||
{
|
||||
@ -6261,13 +6261,13 @@ static void atk5B_yesnoboxstoplearningmove(void)
|
||||
else
|
||||
gBattlescriptCurrInstr += 5;
|
||||
|
||||
sub_8056A3C(0x18, 0x8, 0x1D, 0xD, 1);
|
||||
HandleBattleWindow(0x18, 0x8, 0x1D, 0xD, 1);
|
||||
}
|
||||
else if (gMain.newKeys & B_BUTTON)
|
||||
{
|
||||
PlaySE(SE_SELECT);
|
||||
gBattlescriptCurrInstr = BSScriptReadPtr(gBattlescriptCurrInstr + 1);
|
||||
sub_8056A3C(0x18, 0x8, 0x1D, 0xD, 1);
|
||||
HandleBattleWindow(0x18, 0x8, 0x1D, 0xD, 1);
|
||||
}
|
||||
break;
|
||||
}
|
||||
@ -6527,38 +6527,38 @@ static void atk67_yesnobox(void)
|
||||
switch (gBattleCommunication[0])
|
||||
{
|
||||
case 0:
|
||||
sub_8056A3C(0x18, 8, 0x1D, 0xD, 0);
|
||||
sub_814F9EC(gText_BattleYesNoChoice, 0xC);
|
||||
HandleBattleWindow(0x18, 8, 0x1D, 0xD, 0);
|
||||
BattleHandleAddTextPrinter(gText_BattleYesNoChoice, 0xC);
|
||||
gBattleCommunication[0]++;
|
||||
gBattleCommunication[CURSOR_POSITION] = 0;
|
||||
BattleCreateCursorAt(0);
|
||||
BattleCreateYesNoCursorAt(0);
|
||||
break;
|
||||
case 1:
|
||||
if (gMain.newKeys & DPAD_UP && gBattleCommunication[CURSOR_POSITION] != 0)
|
||||
{
|
||||
PlaySE(SE_SELECT);
|
||||
BattleDestroyCursorAt(gBattleCommunication[CURSOR_POSITION]);
|
||||
BattleDestroyYesNoCursorAt(gBattleCommunication[CURSOR_POSITION]);
|
||||
gBattleCommunication[CURSOR_POSITION] = 0;
|
||||
BattleCreateCursorAt(0);
|
||||
BattleCreateYesNoCursorAt(0);
|
||||
}
|
||||
if (gMain.newKeys & DPAD_DOWN && gBattleCommunication[CURSOR_POSITION] == 0)
|
||||
{
|
||||
PlaySE(SE_SELECT);
|
||||
BattleDestroyCursorAt(gBattleCommunication[CURSOR_POSITION]);
|
||||
BattleDestroyYesNoCursorAt(gBattleCommunication[CURSOR_POSITION]);
|
||||
gBattleCommunication[CURSOR_POSITION] = 1;
|
||||
BattleCreateCursorAt(1);
|
||||
BattleCreateYesNoCursorAt(1);
|
||||
}
|
||||
if (gMain.newKeys & B_BUTTON)
|
||||
{
|
||||
gBattleCommunication[CURSOR_POSITION] = 1;
|
||||
PlaySE(SE_SELECT);
|
||||
sub_8056A3C(0x18, 8, 0x1D, 0xD, 1);
|
||||
HandleBattleWindow(0x18, 8, 0x1D, 0xD, 1);
|
||||
gBattlescriptCurrInstr++;
|
||||
}
|
||||
else if (gMain.newKeys & A_BUTTON)
|
||||
{
|
||||
PlaySE(SE_SELECT);
|
||||
sub_8056A3C(0x18, 8, 0x1D, 0xD, 1);
|
||||
HandleBattleWindow(0x18, 8, 0x1D, 0xD, 1);
|
||||
gBattlescriptCurrInstr++;
|
||||
}
|
||||
break;
|
||||
@ -6674,7 +6674,7 @@ static void atk6C_draw_lvlupbox(void)
|
||||
SetBgAttribute(1, BG_CTRL_ATTR_MOSAIC, 0);
|
||||
ShowBg(0);
|
||||
ShowBg(1);
|
||||
sub_8056A3C(0x12, 7, 0x1D, 0x13, 0x80);
|
||||
HandleBattleWindow(0x12, 7, 0x1D, 0x13, 0x80);
|
||||
gBattleScripting.atk6C_state = 4;
|
||||
break;
|
||||
case 4:
|
||||
@ -6704,7 +6704,7 @@ static void atk6C_draw_lvlupbox(void)
|
||||
if (gMain.newKeys != 0)
|
||||
{
|
||||
PlaySE(SE_SELECT);
|
||||
sub_8056A3C(0x12, 7, 0x1D, 0x13, 0x81);
|
||||
HandleBattleWindow(0x12, 7, 0x1D, 0x13, 0x81);
|
||||
gBattleScripting.atk6C_state++;
|
||||
}
|
||||
break;
|
||||
@ -7148,7 +7148,7 @@ static void atk76_various(void)
|
||||
break;
|
||||
case 16:
|
||||
BattleStringExpandPlaceholdersToDisplayedString(gRefereeStringsTable[gBattlescriptCurrInstr[1]]);
|
||||
sub_814F9EC(gDisplayedStringBattle, 0x16);
|
||||
BattleHandleAddTextPrinter(gDisplayedStringBattle, 0x16);
|
||||
break;
|
||||
case 17:
|
||||
if (IsTextPrinterActive(0x16))
|
||||
@ -11238,7 +11238,7 @@ static void atkF2_display_dex_info(void)
|
||||
}
|
||||
}
|
||||
|
||||
void sub_8056A3C(u8 xStart, u8 yStart, u8 xEnd, u8 yEnd, u8 flags)
|
||||
void HandleBattleWindow(u8 xStart, u8 yStart, u8 xEnd, u8 yEnd, u8 flags)
|
||||
{
|
||||
s32 destY, destX;
|
||||
u16 var = 0;
|
||||
@ -11286,7 +11286,7 @@ void sub_8056A3C(u8 xStart, u8 yStart, u8 xEnd, u8 yEnd, u8 flags)
|
||||
}
|
||||
}
|
||||
|
||||
void BattleCreateCursorAt(u8 cursorPosition)
|
||||
void BattleCreateYesNoCursorAt(u8 cursorPosition)
|
||||
{
|
||||
u16 src[2];
|
||||
src[0] = 1;
|
||||
@ -11296,7 +11296,7 @@ void BattleCreateCursorAt(u8 cursorPosition)
|
||||
CopyBgTilemapBufferToVram(0);
|
||||
}
|
||||
|
||||
void BattleDestroyCursorAt(u8 cursorPosition)
|
||||
void BattleDestroyYesNoCursorAt(u8 cursorPosition)
|
||||
{
|
||||
u16 src[2];
|
||||
src[0] = 0x1016;
|
||||
@ -11311,26 +11311,26 @@ static void atkF3_nickname_caught_poke(void)
|
||||
switch (gBattleCommunication[MULTIUSE_STATE])
|
||||
{
|
||||
case 0:
|
||||
sub_8056A3C(0x18, 8, 0x1D, 0xD, 0);
|
||||
sub_814F9EC(gText_BattleYesNoChoice, 0xC);
|
||||
HandleBattleWindow(0x18, 8, 0x1D, 0xD, 0);
|
||||
BattleHandleAddTextPrinter(gText_BattleYesNoChoice, 0xC);
|
||||
gBattleCommunication[MULTIUSE_STATE]++;
|
||||
gBattleCommunication[CURSOR_POSITION] = 0;
|
||||
BattleCreateCursorAt(0);
|
||||
BattleCreateYesNoCursorAt(0);
|
||||
break;
|
||||
case 1:
|
||||
if (gMain.newKeys & DPAD_UP && gBattleCommunication[CURSOR_POSITION] != 0)
|
||||
{
|
||||
PlaySE(SE_SELECT);
|
||||
BattleDestroyCursorAt(gBattleCommunication[CURSOR_POSITION]);
|
||||
BattleDestroyYesNoCursorAt(gBattleCommunication[CURSOR_POSITION]);
|
||||
gBattleCommunication[CURSOR_POSITION] = 0;
|
||||
BattleCreateCursorAt(0);
|
||||
BattleCreateYesNoCursorAt(0);
|
||||
}
|
||||
if (gMain.newKeys & DPAD_DOWN && gBattleCommunication[CURSOR_POSITION] == 0)
|
||||
{
|
||||
PlaySE(SE_SELECT);
|
||||
BattleDestroyCursorAt(gBattleCommunication[CURSOR_POSITION]);
|
||||
BattleDestroyYesNoCursorAt(gBattleCommunication[CURSOR_POSITION]);
|
||||
gBattleCommunication[CURSOR_POSITION] = 1;
|
||||
BattleCreateCursorAt(1);
|
||||
BattleCreateYesNoCursorAt(1);
|
||||
}
|
||||
if (gMain.newKeys & A_BUTTON)
|
||||
{
|
||||
|
File diff suppressed because it is too large
Load Diff
@ -370,7 +370,7 @@ gUnknown_030061C4: @ 30061C4
|
||||
gUnknown_030061D0: @ 30061D0
|
||||
.space 0x18
|
||||
|
||||
gUnknown_030061E8: @ 30061E8
|
||||
gCB2_AfterEvolution: @ 30061E8
|
||||
.space 0x4
|
||||
|
||||
gUnknown_030061EC: @ 30061EC
|
||||
|
@ -1280,11 +1280,7 @@ gUnknown_0203AB78: @ 203AB78
|
||||
gUnknown_0203AB7C: @ 203AB7C
|
||||
.space 0x4
|
||||
|
||||
gEvoStructPtr: @ 203AB80
|
||||
.space 0x4
|
||||
|
||||
gUnknown_0203AB84: @ 203AB84
|
||||
.space 0x4
|
||||
.include "src/evolution_scene.o"
|
||||
|
||||
gUnknown_0203AB88: @ 203AB88
|
||||
.space 0x4
|
||||
|
Loading…
Reference in New Issue
Block a user