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

document battle transition symbols

Browse Source
This commit is contained in:
jiangzhengwenjz
2019-07-23 09:16:59 +08:00
parent a20ac0d7b0
commit e37e108542
9 changed files with 842 additions and 842 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/battle_setup.s
+2 -2
View File
@@ -30,13 +30,13 @@ _0807F644:
bne _0807F686 bne _0807F686
bl sub_812B478 bl sub_812B478
ldrb r0, [r4, 0x2] ldrb r0, [r4, 0x2]
bl sub_80D08B8 bl BT_StartOnField
ldrh r0, [r4] ldrh r0, [r4]
adds r0, 0x1 adds r0, 0x1
strh r0, [r4] strh r0, [r4]
b _0807F686 b _0807F686
_0807F65E: _0807F65E:
bl sub_80D08F8 bl BT_IsDone
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
cmp r0, 0x1 cmp r0, 0x1
asm/battle_tower.s
+3 -3
View File
@@ -2025,7 +2025,7 @@ sub_80E68C4: @ 80E68C4
push {r4,lr} push {r4,lr}
lsls r0, 24 lsls r0, 24
lsrs r4, r0, 24 lsrs r4, r0, 24
bl sub_80D08F8 bl BT_IsDone
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
cmp r0, 0x1 cmp r0, 0x1
@@ -2114,7 +2114,7 @@ _080E6970:
bl sub_8080060 bl sub_8080060
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
bl sub_80D08B8 bl BT_StartOnField
b _080E69E6 b _080E69E6
.align 2, 0 .align 2, 0
_080E698C: .4byte gSaveBlock1Ptr _080E698C: .4byte gSaveBlock1Ptr
@@ -2154,7 +2154,7 @@ _080E69A0:
bl sub_8080060 bl sub_8080060
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
bl sub_80D08B8 bl BT_StartOnField
_080E69E6: _080E69E6:
add sp, 0x4 add sp, 0x4
pop {r4-r6} pop {r4-r6}
asm/battle_transition.s
+790 -790
View File
File diff suppressed because it is too large Load Diff
asm/overworld.s
+3 -3
View File
@@ -3398,13 +3398,13 @@ sub_8056578: @ 8056578
bx r0 bx r0
thumb_func_end sub_8056578 thumb_func_end sub_8056578
thumb_func_start sub_80565A8 thumb_func_start CB2_OverworldBasic
sub_80565A8: @ 80565A8 CB2_OverworldBasic: @ 80565A8
push {lr} push {lr}
bl sub_8056578 bl sub_8056578
pop {r0} pop {r0}
bx r0 bx r0
thumb_func_end sub_80565A8 thumb_func_end CB2_OverworldBasic
thumb_func_start sub_80565B4 thumb_func_start sub_80565B4
sub_80565B4: @ 80565B4 sub_80565B4: @ 80565B4
data/data_83F5738.s
+37 -37
View File
@@ -133,40 +133,40 @@ gUnknown_83F846D:: @ 83F846D
gUnknown_83F847D:: @ 83F847D gUnknown_83F847D:: @ 83F847D
.incbin "baserom.gba", 0x3F847D, 0x323 .incbin "baserom.gba", 0x3F847D, 0x323
gUnknown_83F87A0:: @ 83F87A0 sBigPokeballTileset:: @ 83F87A0
.incbin "baserom.gba", 0x3F87A0, 0x580 .incbin "baserom.gba", 0x3F87A0, 0x580
gUnknown_83F8D20:: @ 83F8D20 sSlidingPokeballTilemap:: @ 83F8D20
.incbin "baserom.gba", 0x3F8D20, 0x240 .incbin "baserom.gba", 0x3F8D20, 0x240
gUnknown_83F8F60:: @ 83F8F60 sVsBarTileset:: @ 83F8F60
.incbin "baserom.gba", 0x3F8F60, 0x11E0 .incbin "baserom.gba", 0x3F8F60, 0x11E0
gUnknown_83FA140:: @ 83FA140 sGridSquareTilemap:: @ 83FA140
.incbin "baserom.gba", 0x3FA140, 0x1E0 .incbin "baserom.gba", 0x3FA140, 0x1E0
gUnknown_83FA320:: @ 83FA320 sBT_Phase1Tasks:: @ 83FA320
.incbin "baserom.gba", 0x3FA320, 0x48 .incbin "baserom.gba", 0x3FA320, 0x48
gUnknown_83FA368:: @ 83FA368 sBT_Phase2Tasks:: @ 83FA368
.incbin "baserom.gba", 0x3FA368, 0x48 .incbin "baserom.gba", 0x3FA368, 0x48
gUnknown_83FA3B0:: @ 83FA3B0 sBT_MainPhases:: @ 83FA3B0
.incbin "baserom.gba", 0x3FA3B0, 0x10 .incbin "baserom.gba", 0x3FA3B0, 0x10
gUnknown_83FA3C0:: @ 83FA3C0 sBT_Phase2BlurFuncs:: @ 83FA3C0
.incbin "baserom.gba", 0x3FA3C0, 0xC .incbin "baserom.gba", 0x3FA3C0, 0xC
gUnknown_83FA3CC:: @ 83FA3CC sBT_Phase2DistortedWaveFuncs:: @ 83FA3CC
.incbin "baserom.gba", 0x3FA3CC, 0x8 .incbin "baserom.gba", 0x3FA3CC, 0x8
gUnknown_83FA3D4:: @ 83FA3D4 sBT_Phase2HorizontalCorrugateFuncs:: @ 83FA3D4
.incbin "baserom.gba", 0x3FA3D4, 0x8 .incbin "baserom.gba", 0x3FA3D4, 0x8
gUnknown_83FA3DC:: @ 83FA3DC sBT_Phase2BigPokeballFuncs:: @ 83FA3DC
.incbin "baserom.gba", 0x3FA3DC, 0x18 .incbin "baserom.gba", 0x3FA3DC, 0x18
gUnknown_83FA3F4:: @ 83FA3F4 sBT_Phase2SlidingPokeballsFuncs:: @ 83FA3F4
.incbin "baserom.gba", 0x3FA3F4, 0xC .incbin "baserom.gba", 0x3FA3F4, 0xC
gUnknown_83FA400:: @ 83FA400 gUnknown_83FA400:: @ 83FA400
@@ -178,82 +178,82 @@ gUnknown_83FA404:: @ 83FA404
gUnknown_83FA40E:: @ 83FA40E gUnknown_83FA40E:: @ 83FA40E
.incbin "baserom.gba", 0x3FA40E, 0x6 .incbin "baserom.gba", 0x3FA40E, 0x6
gUnknown_83FA414:: @ 83FA414 sBT_Phase2ClockwiseBlackFadeFuncs:: @ 83FA414
.incbin "baserom.gba", 0x3FA414, 0x1C .incbin "baserom.gba", 0x3FA414, 0x1C
gUnknown_83FA430:: @ 83FA430 sBT_Phase2FullScreenWaveFuncs:: @ 83FA430
.incbin "baserom.gba", 0x3FA430, 0x8 .incbin "baserom.gba", 0x3FA430, 0x8
gUnknown_83FA438:: @ 83FA438 sBT_Phase2BlackWaveToRightFuncs:: @ 83FA438
.incbin "baserom.gba", 0x3FA438, 0xC .incbin "baserom.gba", 0x3FA438, 0xC
gUnknown_83FA444:: @ 83FA444 gUnknown_83FA444:: @ 83FA444
.incbin "baserom.gba", 0x3FA444, 0x20 .incbin "baserom.gba", 0x3FA444, 0x20
gUnknown_83FA464:: @ 83FA464 sBT_Phase2AntiClockwiseSpiralFuncs:: @ 83FA464
.incbin "baserom.gba", 0x3FA464, 0x8 .incbin "baserom.gba", 0x3FA464, 0x8
gUnknown_83FA46C:: @ 83FA46C sBT_Phase2MugshotFuncs:: @ 83FA46C
.incbin "baserom.gba", 0x3FA46C, 0x28 .incbin "baserom.gba", 0x3FA46C, 0x28
gUnknown_83FA494:: @ 83FA494 sMugshotsTrainerPicIDsTable:: @ 83FA494
.incbin "baserom.gba", 0x3FA494, 0x6 .incbin "baserom.gba", 0x3FA494, 0x6
gUnknown_83FA49A:: @ 83FA49A sMugshotsOpponentRotationScales:: @ 83FA49A
.incbin "baserom.gba", 0x3FA49A, 0x14 .incbin "baserom.gba", 0x3FA49A, 0x14
gUnknown_83FA4AE:: @ 83FA4AE sMugshotsOpponentCoords:: @ 83FA4AE
.incbin "baserom.gba", 0x3FA4AE, 0x16 .incbin "baserom.gba", 0x3FA4AE, 0x16
gUnknown_83FA4C4:: @ 83FA4C4 sBT_Phase2MugshotSpriteFuncs:: @ 83FA4C4
.incbin "baserom.gba", 0x3FA4C4, 0x1C .incbin "baserom.gba", 0x3FA4C4, 0x1C
gUnknown_83FA4E0:: @ 83FA4E0 sMugShotSlideVelocity:: @ 83FA4E0
.incbin "baserom.gba", 0x3FA4E0, 0x4 .incbin "baserom.gba", 0x3FA4E0, 0x4
gUnknown_83FA4E4:: @ 83FA4E4 sMugShotSlideDeceleration:: @ 83FA4E4
.incbin "baserom.gba", 0x3FA4E4, 0x4 .incbin "baserom.gba", 0x3FA4E4, 0x4
gUnknown_83FA4E8:: @ 83FA4E8 sBT_Phase2SlicedScreenFuncs:: @ 83FA4E8
.incbin "baserom.gba", 0x3FA4E8, 0xC .incbin "baserom.gba", 0x3FA4E8, 0xC
gUnknown_83FA4F4:: @ 83FA4F4 sBT_Phase2WhiteFadeInStripesFuncs:: @ 83FA4F4
.incbin "baserom.gba", 0x3FA4F4, 0x14 .incbin "baserom.gba", 0x3FA4F4, 0x14
gUnknown_83FA508:: @ 83FA508 sWhiteStripeDelay:: @ 83FA508
.incbin "baserom.gba", 0x3FA508, 0xC .incbin "baserom.gba", 0x3FA508, 0xC
gUnknown_83FA514:: @ 83FA514 sBT_Phase2GridSquaresFuncs:: @ 83FA514
.incbin "baserom.gba", 0x3FA514, 0xC .incbin "baserom.gba", 0x3FA514, 0xC
gUnknown_83FA520:: @ 83FA520 sBT_Phase2BlackDoodlesFuncs:: @ 83FA520
.incbin "baserom.gba", 0x3FA520, 0x14 .incbin "baserom.gba", 0x3FA520, 0x14
gUnknown_83FA534:: @ 83FA534 sBlackDoodlesSegments:: @ 83FA534
.incbin "baserom.gba", 0x3FA534, 0x46 .incbin "baserom.gba", 0x3FA534, 0x46
gUnknown_83FA57A:: @ 83FA57A sBlackDoodlesDelay:: @ 83FA57A
.incbin "baserom.gba", 0x3FA57A, 0xE .incbin "baserom.gba", 0x3FA57A, 0xE
gUnknown_83FA588:: @ 83FA588 sBT_Phase1FadeFuncs:: @ 83FA588
.incbin "baserom.gba", 0x3FA588, 0x44 .incbin "baserom.gba", 0x3FA588, 0x44
gUnknown_83FA5CC:: @ 83FA5CC sSpriteTemplate_SlidingPokeball:: @ 83FA5CC
.incbin "baserom.gba", 0x3FA5CC, 0x6C .incbin "baserom.gba", 0x3FA5CC, 0x6C
gUnknown_83FA638:: @ 83FA638 sSlidingPokeballBigPokeballPalette:: @ 83FA638
.incbin "baserom.gba", 0x3FA638, 0x108 .incbin "baserom.gba", 0x3FA638, 0x108
gUnknown_83FA740:: @ 83FA740 sVsBarOpponentPalettes:: @ 83FA740
.incbin "baserom.gba", 0x3FA740, 0x14 .incbin "baserom.gba", 0x3FA740, 0x14
gUnknown_83FA754:: @ 83FA754 sVsBarPlayerPalettes:: @ 83FA754
.incbin "baserom.gba", 0x3FA754, 0x30 .incbin "baserom.gba", 0x3FA754, 0x30
gUnknown_83FA784:: @ 83FA784 sBigPokeballTilemap:: @ 83FA784
.incbin "baserom.gba", 0x3FA784, 0x4B0 .incbin "baserom.gba", 0x3FA784, 0x4B0
gUnknown_83FAC34:: @ 83FAC34 sVsBarTilemap:: @ 83FAC34
.incbin "baserom.gba", 0x3FAC34, 0x500 .incbin "baserom.gba", 0x3FAC34, 0x500
gUnknown_83FB134:: @ 83FB134 gUnknown_83FB134:: @ 83FB134
include/battle_transition.h
+2 -2
View File
@@ -4,7 +4,7 @@
#include "global.h" #include "global.h"
void sub_8149DFC(u8 a0); void sub_8149DFC(u8 a0);
bool8 sub_80D08F8(void); bool8 BT_IsDone(void);
void sub_80D08B8(u8 a0); void BT_StartOnField(u8 a0);
#endif // GUARD_BATTLE_TRANSITION_H #endif // GUARD_BATTLE_TRANSITION_H
src/teachy_tv.c
+2 -2
View File
@@ -1208,11 +1208,11 @@ static void TeachyTvPreBattleAnimAndSetBattleCallback(u8 taskId)
switch (data[7]) switch (data[7])
{ {
case 0: case 0:
sub_80D08B8(data[6]); BT_StartOnField(data[6]);
++data[7]; ++data[7];
break; break;
case 1: case 1:
if (sub_80D08F8()) if (BT_IsDone())
{ {
SetMainCallback2(sub_800FD9C); SetMainCallback2(sub_800FD9C);
DestroyTask(taskId); DestroyTask(taskId);
src/trainer_tower.c
+2 -2
View File
@@ -1111,7 +1111,7 @@ void sub_815E114(void)
void sub_815E124(u8 taskId) void sub_815E124(u8 taskId)
{ {
if (sub_80D08F8() == TRUE) if (BT_IsDone() == TRUE)
{ {
gMain.savedCallback = sub_815E114; gMain.savedCallback = sub_815E114;
CleanupOverworldWindowsAndTilemaps(); CleanupOverworldWindowsAndTilemaps();
@@ -1129,7 +1129,7 @@ void sub_815E160(void)
sub_815E9FC(); sub_815E9FC();
CreateTask(sub_815E124, 1); CreateTask(sub_815E124, 1);
PlayMapChosenOrBattleBGM(0); PlayMapChosenOrBattleBGM(0);
sub_80D08B8(sub_8080060()); BT_StartOnField(sub_8080060());
} }
void sub_815E1C0(void) void sub_815E1C0(void)
sym_ewram.txt
+1 -1
View File
@@ -1057,7 +1057,7 @@ gUnknown_2039A24: @ 2039A24
.include "src/coins.o" .include "src/coins.o"
.align 2 .align 2
gUnknown_2039A2C: @ 2039A2C sTransitionStructPtr: @ 2039A2C
.space 0x4 .space 0x4
gUnknown_2039A30: @ 2039A30 gUnknown_2039A30: @ 2039A30