Merge branch 'master' of https://github.com/pret/pokeemerald into dump_maps

This commit is contained in:
Diegoisawesome 2017-11-15 00:47:34 -06:00
commit ce0e5cbfe4
121 changed files with 6022 additions and 11283 deletions

View File

@ -1,582 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start AllocateBattleResrouces
AllocateBattleResrouces: @ 8056F28
push {r4-r6,lr}
ldr r5, =gBattleResources
ldr r6, =gBattleTypeFlags
ldr r0, [r6]
movs r1, 0x80
lsls r1, 19
ands r0, r1
cmp r0, 0
beq _08056F3E
bl sub_81D55D0
_08056F3E:
ldr r4, =gBattleStruct
movs r0, 0xA9
lsls r0, 2
bl AllocZeroed
str r0, [r4]
movs r0, 0x20
bl AllocZeroed
str r0, [r5]
movs r0, 0xA0
bl AllocZeroed
ldr r1, [r5]
str r0, [r1]
movs r0, 0x10
bl AllocZeroed
ldr r1, [r5]
str r0, [r1, 0x4]
movs r0, 0x24
bl AllocZeroed
ldr r1, [r5]
str r0, [r1, 0x8]
movs r0, 0x24
bl AllocZeroed
ldr r1, [r5]
str r0, [r1, 0xC]
movs r0, 0xC
bl AllocZeroed
ldr r1, [r5]
str r0, [r1, 0x10]
movs r0, 0x1C
bl AllocZeroed
ldr r1, [r5]
str r0, [r1, 0x14]
movs r0, 0x54
bl AllocZeroed
ldr r1, [r5]
str r0, [r1, 0x18]
movs r0, 0x24
bl AllocZeroed
ldr r1, [r5]
str r0, [r1, 0x1C]
ldr r4, =gLinkBattleSendBuffer
movs r5, 0x80
lsls r5, 5
adds r0, r5, 0
bl AllocZeroed
str r0, [r4]
ldr r4, =gLinkBattleRecvBuffer
adds r0, r5, 0
bl AllocZeroed
str r0, [r4]
ldr r4, =gUnknown_0202305C
movs r0, 0x80
lsls r0, 6
bl AllocZeroed
str r0, [r4]
ldr r4, =gUnknown_02023060
adds r0, r5, 0
bl AllocZeroed
str r0, [r4]
ldr r0, [r6]
movs r1, 0x80
lsls r1, 20
ands r0, r1
cmp r0, 0
beq _08056FFA
ldr r0, =0x00004054
bl VarGet
lsls r0, 16
lsrs r0, 16
ldr r2, =gSaveBlock1Ptr
lsls r1, r0, 2
adds r1, r0
lsls r1, 5
ldr r0, =0x00001a9c
adds r1, r0
ldr r0, [r2]
adds r0, r1
bl CreateSecretBaseEnemyParty
_08056FFA:
pop {r4-r6}
pop {r0}
bx r0
.pool
thumb_func_end AllocateBattleResrouces
thumb_func_start FreeBattleResources
FreeBattleResources: @ 8057028
push {r4-r6,lr}
ldr r0, =gBattleTypeFlags
ldr r0, [r0]
movs r1, 0x80
lsls r1, 19
ands r0, r1
cmp r0, 0
beq _0805703C
bl sub_81D5694
_0805703C:
ldr r6, =gBattleResources
ldr r0, [r6]
cmp r0, 0
beq _080570D0
ldr r4, =gBattleStruct
ldr r0, [r4]
bl Free
movs r5, 0
str r5, [r4]
ldr r0, [r6]
ldr r0, [r0]
bl Free
ldr r0, [r6]
str r5, [r0]
ldr r0, [r0, 0x4]
bl Free
ldr r0, [r6]
str r5, [r0, 0x4]
ldr r0, [r0, 0x8]
bl Free
ldr r0, [r6]
str r5, [r0, 0x8]
ldr r0, [r0, 0xC]
bl Free
ldr r0, [r6]
str r5, [r0, 0xC]
ldr r0, [r0, 0x10]
bl Free
ldr r0, [r6]
str r5, [r0, 0x10]
ldr r0, [r0, 0x14]
bl Free
ldr r0, [r6]
str r5, [r0, 0x14]
ldr r0, [r0, 0x18]
bl Free
ldr r0, [r6]
str r5, [r0, 0x18]
ldr r0, [r0, 0x1C]
bl Free
ldr r0, [r6]
str r5, [r0, 0x1C]
bl Free
str r5, [r6]
ldr r4, =gLinkBattleSendBuffer
ldr r0, [r4]
bl Free
str r5, [r4]
ldr r4, =gLinkBattleRecvBuffer
ldr r0, [r4]
bl Free
str r5, [r4]
ldr r4, =gUnknown_0202305C
ldr r0, [r4]
bl Free
str r5, [r4]
ldr r4, =gUnknown_02023060
ldr r0, [r4]
bl Free
str r5, [r4]
_080570D0:
pop {r4-r6}
pop {r0}
bx r0
.pool
thumb_func_end FreeBattleResources
thumb_func_start AdjustFriendshipOnBattleFaint
AdjustFriendshipOnBattleFaint: @ 80570F4
push {r4,r5,lr}
lsls r0, 24
lsrs r5, r0, 24
ldr r0, =gBattleTypeFlags
ldr r0, [r0]
movs r1, 0x1
ands r0, r1
cmp r0, 0
beq _08057140
movs r0, 0x1
bl GetBankByIdentity
lsls r0, 24
lsrs r4, r0, 24
movs r0, 0x3
bl GetBankByIdentity
lsls r0, 24
lsrs r3, r0, 24
ldr r2, =gBattleMons
movs r0, 0x58
adds r1, r3, 0
muls r1, r0
adds r1, r2
adds r1, 0x2A
muls r0, r4
adds r0, r2
adds r0, 0x2A
ldrb r1, [r1]
ldrb r0, [r0]
cmp r1, r0
bls _0805714A
adds r4, r3, 0
b _0805714A
.pool
_08057140:
movs r0, 0x1
bl GetBankByIdentity
lsls r0, 24
lsrs r4, r0, 24
_0805714A:
ldr r2, =gBattleMons
movs r1, 0x58
adds r0, r4, 0
muls r0, r1
adds r0, r2
adds r3, r0, 0
adds r3, 0x2A
adds r0, r5, 0
muls r0, r1
adds r0, r2
adds r1, r0, 0
adds r1, 0x2A
ldrb r0, [r3]
ldrb r2, [r1]
cmp r0, r2
bls _080571B8
ldrb r1, [r1]
subs r0, r1
cmp r0, 0x1D
ble _08057198
ldr r1, =gBattlePartyID
lsls r0, r5, 1
adds r0, r1
ldrh r1, [r0]
movs r0, 0x64
muls r0, r1
ldr r1, =gPlayerParty
adds r0, r1
movs r1, 0x8
bl AdjustFriendship
b _080571CE
.pool
_08057198:
ldr r1, =gBattlePartyID
lsls r0, r5, 1
adds r0, r1
ldrh r1, [r0]
movs r0, 0x64
muls r0, r1
ldr r1, =gPlayerParty
adds r0, r1
movs r1, 0x6
bl AdjustFriendship
b _080571CE
.pool
_080571B8:
ldr r1, =gBattlePartyID
lsls r0, r5, 1
adds r0, r1
ldrh r1, [r0]
movs r0, 0x64
muls r0, r1
ldr r1, =gPlayerParty
adds r0, r1
movs r1, 0x6
bl AdjustFriendship
_080571CE:
pop {r4,r5}
pop {r0}
bx r0
.pool
thumb_func_end AdjustFriendshipOnBattleFaint
thumb_func_start sub_80571DC
sub_80571DC: @ 80571DC
push {r4-r7,lr}
lsls r0, 24
lsrs r4, r0, 24
lsls r1, 24
lsrs r7, r1, 24
adds r0, r4, 0
bl GetBankSide
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
beq _08057248
movs r2, 0
ldr r6, =gBattlePartyID
lsls r3, r4, 1
ldr r5, =gUnknown_0203CF00
ldr r4, =gBattleStruct
_080571FE:
adds r0, r2, r5
ldr r1, [r4]
adds r1, r2, r1
adds r1, 0x60
ldrb r1, [r1]
strb r1, [r0]
adds r2, 0x1
cmp r2, 0x2
ble _080571FE
adds r0, r3, r6
ldrb r0, [r0]
bl pokemon_order_func
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
adds r0, r7, 0
bl pokemon_order_func
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
bl sub_81B8FB0
movs r2, 0
ldr r4, =gBattleStruct
ldr r3, =gUnknown_0203CF00
_08057236:
ldr r0, [r4]
adds r0, r2, r0
adds r0, 0x60
adds r1, r2, r3
ldrb r1, [r1]
strb r1, [r0]
adds r2, 0x1
cmp r2, 0x2
ble _08057236
_08057248:
pop {r4-r7}
pop {r0}
bx r0
.pool
thumb_func_end sub_80571DC
thumb_func_start sub_805725C
sub_805725C: @ 805725C
push {r4-r7,lr}
mov r7, r10
mov r6, r9
mov r5, r8
push {r5-r7}
sub sp, 0x4
lsls r0, 24
lsrs r0, 24
mov r9, r0
movs r0, 0
mov r8, r0
ldr r1, =gBattleCommunication
mov r10, r1
b _08057284
.pool
_0805727C:
mov r2, r8
cmp r2, 0
beq _08057284
b _08057406
_08057284:
mov r1, r10
ldrb r0, [r1]
cmp r0, 0x1
bne _0805728E
b _08057390
_0805728E:
cmp r0, 0x1
ble _08057294
b _080573FC
_08057294:
cmp r0, 0
beq _0805729A
b _080573FC
_0805729A:
ldr r6, =gBattleMons
movs r0, 0x58
mov r5, r9
muls r5, r0
adds r0, r6, 0
adds r0, 0x4C
adds r4, r5, r0
ldr r0, [r4]
movs r7, 0x7
ands r0, r7
cmp r0, 0
beq _08057372
mov r0, r9
bl UproarWakeUpCheck
lsls r0, 24
cmp r0, 0
beq _080572FC
ldr r0, [r4]
movs r1, 0x8
negs r1, r1
ands r0, r1
str r0, [r4]
adds r2, r6, 0
adds r2, 0x50
adds r2, r5, r2
ldr r0, [r2]
ldr r1, =0xf7ffffff
ands r0, r1
str r0, [r2]
bl BattleScriptPushCursor
movs r0, 0x1
mov r2, r10
strb r0, [r2, 0x5]
ldr r1, =gBattlescriptCurrInstr
ldr r0, =BattleScript_MoveUsedWokeUp
str r0, [r1]
movs r0, 0x2
mov r8, r0
b _08057372
.pool
_080572FC:
adds r0, r5, r6
adds r0, 0x20
ldrb r0, [r0]
movs r2, 0x1
cmp r0, 0x30
bne _0805730A
movs r2, 0x2
_0805730A:
ldr r1, [r4]
adds r0, r1, 0
ands r0, r7
cmp r0, r2
bcs _0805731E
movs r0, 0x8
negs r0, r0
ands r1, r0
str r1, [r4]
b _08057322
_0805731E:
subs r0, r1, r2
str r0, [r4]
_08057322:
ldr r2, =gBattleMons
movs r0, 0x58
mov r1, r9
muls r1, r0
adds r0, r2, 0
adds r0, 0x4C
adds r0, r1, r0
ldr r4, [r0]
movs r0, 0x7
ands r4, r0
cmp r4, 0
beq _08057354
ldr r1, =gBattlescriptCurrInstr
ldr r0, =BattleScript_MoveUsedIsAsleep
str r0, [r1]
movs r1, 0x2
mov r8, r1
b _08057372
.pool
_08057354:
adds r2, 0x50
adds r2, r1, r2
ldr r0, [r2]
ldr r1, =0xf7ffffff
ands r0, r1
str r0, [r2]
bl BattleScriptPushCursor
ldr r0, =gBattleCommunication
strb r4, [r0, 0x5]
ldr r1, =gBattlescriptCurrInstr
ldr r0, =BattleScript_MoveUsedWokeUp
str r0, [r1]
movs r2, 0x2
mov r8, r2
_08057372:
ldr r1, =gBattleCommunication
ldrb r0, [r1]
adds r0, 0x1
strb r0, [r1]
mov r10, r1
b _080573FC
.pool
_08057390:
ldr r1, =gBattleMons
movs r0, 0x58
mov r2, r9
muls r2, r0
adds r0, r2, 0
adds r1, 0x4C
adds r4, r0, r1
ldr r0, [r4]
movs r1, 0x20
ands r0, r1
cmp r0, 0
beq _080573F4
bl Random
lsls r0, 16
lsrs r0, 16
movs r1, 0x5
bl __umodsi3
lsls r0, 16
lsrs r5, r0, 16
cmp r5, 0
beq _080573D4
ldr r1, =gBattlescriptCurrInstr
ldr r0, =BattleScript_MoveUsedIsFrozen
str r0, [r1]
b _080573EC
.pool
_080573D4:
ldr r0, [r4]
movs r1, 0x21
negs r1, r1
ands r0, r1
str r0, [r4]
bl BattleScriptPushCursor
ldr r1, =gBattlescriptCurrInstr
ldr r0, =BattleScript_MoveUsedUnfroze
str r0, [r1]
mov r0, r10
strb r5, [r0, 0x5]
_080573EC:
movs r1, 0x2
mov r8, r1
ldr r2, =gBattleCommunication
mov r10, r2
_080573F4:
mov r1, r10
ldrb r0, [r1]
adds r0, 0x1
strb r0, [r1]
_080573FC:
mov r2, r10
ldrb r0, [r2]
cmp r0, 0x2
beq _08057406
b _0805727C
_08057406:
mov r0, r8
cmp r0, 0x2
bne _08057430
ldr r4, =gActiveBank
mov r1, r9
strb r1, [r4]
ldrb r1, [r4]
movs r0, 0x58
muls r0, r1
ldr r1, =gBattleMons + 0x4C
adds r0, r1
str r0, [sp]
movs r0, 0
movs r1, 0x28
movs r2, 0
movs r3, 0x4
bl EmitSetMonData
ldrb r0, [r4]
bl MarkBufferBankForExecution
_08057430:
mov r0, r8
add sp, 0x4
pop {r3-r5}
mov r8, r3
mov r9, r4
mov r10, r5
pop {r4-r7}
pop {r1}
bx r1
.pool
thumb_func_end sub_805725C
.align 2, 0 @ Don't pad with nop.

File diff suppressed because it is too large Load Diff

View File

@ -586,8 +586,8 @@ _080A612E:
bx r1 bx r1
thumb_func_end sub_80A60AC thumb_func_end sub_80A60AC
thumb_func_start sub_80A6138 thumb_func_start GetBankSpriteDefault_Y
sub_80A6138: @ 80A6138 GetBankSpriteDefault_Y: @ 80A6138
push {lr} push {lr}
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
@ -597,10 +597,10 @@ sub_80A6138: @ 80A6138
lsrs r0, 24 lsrs r0, 24
pop {r1} pop {r1}
bx r1 bx r1
thumb_func_end sub_80A6138 thumb_func_end GetBankSpriteDefault_Y
thumb_func_start sub_80A614C thumb_func_start GetSubstituteSpriteDefault_Y
sub_80A614C: @ 80A614C GetSubstituteSpriteDefault_Y: @ 80A614C
push {r4,lr} push {r4,lr}
lsls r0, 24 lsls r0, 24
lsrs r4, r0, 24 lsrs r4, r0, 24
@ -633,7 +633,7 @@ _080A6180:
pop {r4} pop {r4}
pop {r1} pop {r1}
bx r1 bx r1
thumb_func_end sub_80A614C thumb_func_end GetSubstituteSpriteDefault_Y
thumb_func_start sub_80A6190 thumb_func_start sub_80A6190
sub_80A6190: @ 80A6190 sub_80A6190: @ 80A6190
@ -5180,7 +5180,7 @@ _080A8412:
adds r0, r6, 0 adds r0, r6, 0
ldr r1, [sp, 0x3C] ldr r1, [sp, 0x3C]
mov r2, r8 mov r2, r8
bl species_and_otid_get_pal bl GetFrontSpritePalFromSpeciesAndPersonality
lsls r1, r5, 20 lsls r1, r5, 20
movs r2, 0x80 movs r2, 0x80
lsls r2, 17 lsls r2, 17
@ -5243,7 +5243,7 @@ _080A84B0:
adds r0, r6, 0 adds r0, r6, 0
ldr r1, [sp, 0x3C] ldr r1, [sp, 0x3C]
mov r2, r8 mov r2, r8
bl species_and_otid_get_pal bl GetFrontSpritePalFromSpeciesAndPersonality
lsls r1, r5, 20 lsls r1, r5, 20
movs r3, 0x80 movs r3, 0x80
lsls r3, 17 lsls r3, 17

View File

@ -855,8 +855,8 @@ _080AA352:
.pool .pool
thumb_func_end sub_80AA18C thumb_func_end sub_80AA18C
thumb_func_start move_anim_start_t2 thumb_func_start LaunchStatusAnimation
move_anim_start_t2: @ 80AA364 LaunchStatusAnimation: @ 80AA364
push {r4,lr} push {r4,lr}
adds r4, r0, 0 adds r4, r0, 0
lsls r4, 24 lsls r4, 24
@ -885,7 +885,7 @@ move_anim_start_t2: @ 80AA364
pop {r0} pop {r0}
bx r0 bx r0
.pool .pool
thumb_func_end move_anim_start_t2 thumb_func_end LaunchStatusAnimation
thumb_func_start task0A_80788BC thumb_func_start task0A_80788BC
task0A_80788BC: @ 80AA3B4 task0A_80788BC: @ 80AA3B4

View File

@ -3006,7 +3006,7 @@ _0815B8A8:
lsls r2, 3 lsls r2, 3
adds r2, r3 adds r2, r3
ldrb r2, [r2, 0x1C] ldrb r2, [r2, 0x1C]
bl sub_805E448 bl HandleSpeciesGfxDataChange
ldrb r1, [r5] ldrb r1, [r5]
mov r0, sp mov r0, sp
bl sub_80A6BFC bl sub_80A6BFC
@ -3310,7 +3310,7 @@ sub_815BB58: @ 815BB58
ldr r1, =gAnimBankTarget ldr r1, =gAnimBankTarget
ldrb r1, [r1] ldrb r1, [r1]
movs r2, 0x1 movs r2, 0x1
bl sub_805E448 bl HandleSpeciesGfxDataChange
adds r0, r4, 0 adds r0, r4, 0
bl DestroyAnimVisualTask bl DestroyAnimVisualTask
pop {r4} pop {r4}
@ -10129,7 +10129,7 @@ _0815F2AC:
ldr r4, =gAnimBankAttacker ldr r4, =gAnimBankAttacker
ldrb r0, [r4] ldrb r0, [r4]
movs r1, 0 movs r1, 0
bl refresh_graphics_maybe bl LoadBattleMonGfxAndAnimate
bl IsContest bl IsContest
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0

View File

@ -4825,7 +4825,7 @@ _08172CC8:
ldrb r1, [r5, 0x1E] ldrb r1, [r5, 0x1E]
adds r0, r2, 0 adds r0, r2, 0
adds r2, r6, 0 adds r2, r6, 0
bl refresh_graphics_maybe bl LoadBattleMonGfxAndAnimate
ldrh r0, [r5, 0x1C] ldrh r0, [r5, 0x1C]
adds r0, 0x1 adds r0, 0x1
strh r0, [r5, 0x1C] strh r0, [r5, 0x1C]
@ -5030,7 +5030,7 @@ _08172E4E:
movs r3, 0x1 movs r3, 0x1
bl RequestDma3Fill bl RequestDma3Fill
ldrb r0, [r4] ldrb r0, [r4]
bl sub_805E974 bl ClearBehindSubstituteBit
adds r0, r5, 0 adds r0, r5, 0
bl DestroyAnimVisualTask bl DestroyAnimVisualTask
_08172E84: _08172E84:

View File

@ -2801,7 +2801,7 @@ sub_819BCF8: @ 819BCF8
lsls r0, 16 lsls r0, 16
lsrs r0, 16 lsrs r0, 16
add r1, sp, 0xC add r1, sp, 0xC
bl sub_81DB468 bl CopyMonCategoryText
movs r0, 0x1 movs r0, 0x1
add r1, sp, 0xC add r1, sp, 0xC
movs r2, 0x76 movs r2, 0x76
@ -8831,7 +8831,7 @@ _0819EFF2:
lsls r0, 16 lsls r0, 16
lsrs r0, 16 lsrs r0, 16
add r1, sp, 0xC add r1, sp, 0xC
bl sub_81DB468 bl CopyMonCategoryText
movs r0, 0x1 movs r0, 0x1
add r1, sp, 0xC add r1, sp, 0xC
movs r2, 0x76 movs r2, 0x76

View File

@ -1328,7 +1328,7 @@ _080B1120:
thumb_func_start sub_80B1138 thumb_func_start sub_80B1138
sub_80B1138: @ 80B1138 sub_80B1138: @ 80B1138
push {lr} push {lr}
ldr r0, =set_256color_bg_bg0 ldr r0, =CB2_ChooseStarter
bl SetMainCallback2 bl SetMainCallback2
ldr r1, =gMain ldr r1, =gMain
ldr r0, =sub_80B1158 ldr r0, =sub_80B1158
@ -1348,7 +1348,7 @@ sub_80B1158: @ 80B1158
ldrh r1, [r2] ldrh r1, [r2]
strh r1, [r0] strh r1, [r0]
ldrh r0, [r2] ldrh r0, [r2]
bl sub_8133EDC bl GetStarterPokemon
lsls r0, 16 lsls r0, 16
lsrs r0, 16 lsrs r0, 16
movs r1, 0 movs r1, 0

View File

@ -127,7 +127,7 @@ _0807F824:
b _0807F966 b _0807F966
.pool .pool
_0807F854: _0807F854:
ldr r1, =gUnknown_083390F4 ldr r1, =sBlenderCenterMap
movs r2, 0x80 movs r2, 0x80
lsls r2, 3 lsls r2, 3
movs r0, 0x2 movs r0, 0x2
@ -135,7 +135,7 @@ _0807F854:
bl CopyToBgTilemapBuffer bl CopyToBgTilemapBuffer
movs r0, 0x2 movs r0, 0x2
bl CopyBgTilemapBufferToVram bl CopyBgTilemapBufferToVram
ldr r0, =gUnknown_083390D4 ldr r0, =sBlenderCenterPal
movs r2, 0x80 movs r2, 0x80
lsls r2, 1 lsls r2, 1
movs r1, 0 movs r1, 0
@ -216,14 +216,14 @@ _0807F910:
b _0807F966 b _0807F966
.pool .pool
_0807F940: _0807F940:
ldr r0, =gUnknown_083394F4 ldr r0, =sBlenderOuterPal
movs r1, 0x80 movs r1, 0x80
movs r2, 0x20 movs r2, 0x20
bl LoadPalette bl LoadPalette
b _0807F962 b _0807F962
.pool .pool
_0807F950: _0807F950:
ldr r0, =gUnknown_08339AC0 ldr r0, =sSpriteSheet_BlenderArrow
bl LoadSpriteSheet bl LoadSpriteSheet
ldr r0, =gUnknown_08339BD8 ldr r0, =gUnknown_08339BD8
bl LoadSpriteSheet bl LoadSpriteSheet
@ -243,9 +243,9 @@ _0807F980:
bl LoadSpriteSheet bl LoadSpriteSheet
ldr r0, =gUnknown_08339C58 ldr r0, =gUnknown_08339C58
bl LoadSpriteSheet bl LoadSpriteSheet
ldr r0, =gUnknown_08339AD0 ldr r0, =sSpritePal_BlenderArrow
bl LoadSpritePalette bl LoadSpritePalette
ldr r0, =gUnknown_08339AC8 ldr r0, =sSpritePal_BlenderMisc
bl LoadSpritePalette bl LoadSpritePalette
ldr r4, =gUnknown_020322A4 ldr r4, =gUnknown_020322A4
ldr r0, [r4] ldr r0, [r4]
@ -482,12 +482,12 @@ _0807FBAC:
b _0807FCE2 b _0807FCE2
_0807FBB8: _0807FBB8:
movs r4, 0 movs r4, 0
ldr r5, =gUnknown_083399C8 ldr r5, =sBlenderSyncArrowsPos
ldr r6, =gUnknown_020322A4 ldr r6, =gUnknown_020322A4
_0807FBBE: _0807FBBE:
ldrb r1, [r5] ldrb r1, [r5]
ldrb r2, [r5, 0x1] ldrb r2, [r5, 0x1]
ldr r0, =gUnknown_08339AD8 ldr r0, =sBlenderSyncArrow_SpriteTemplate
movs r3, 0x1 movs r3, 0x1
bl CreateSprite bl CreateSprite
ldr r1, [r6] ldr r1, [r6]
@ -553,7 +553,7 @@ _0807FC64:
ldr r4, [r6] ldr r4, [r6]
ldr r0, =0x000011b8 ldr r0, =0x000011b8
adds r4, r0 adds r4, r0
ldr r5, =gUnknown_0833973A ldr r5, =gText_BerryBlenderStart
bl sav2_get_text_speed bl sav2_get_text_speed
adds r2, r0, 0 adds r2, r0, 0
lsls r2, 24 lsls r2, 24
@ -833,7 +833,7 @@ _0807FE7C:
bne _0807FEC8 bne _0807FEC8
adds r0, r4, 0 adds r0, r4, 0
adds r0, 0x1C adds r0, 0x1C
ldr r1, =gUnknown_083397D0 ldr r1, =sBlenderOpponentsNames
ldr r1, [r1, 0xC] ldr r1, [r1, 0xC]
bl StringCopy bl StringCopy
b _0807FED4 b _0807FED4
@ -841,7 +841,7 @@ _0807FE7C:
_0807FEC8: _0807FEC8:
adds r0, r4, 0 adds r0, r4, 0
adds r0, 0x1C adds r0, 0x1C
ldr r1, =gUnknown_083397D0 ldr r1, =sBlenderOpponentsNames
ldr r1, [r1] ldr r1, [r1]
bl StringCopy bl StringCopy
_0807FED4: _0807FED4:
@ -866,7 +866,7 @@ _0807FEE8:
bl StringCopy bl StringCopy
adds r0, r6, 0 adds r0, r6, 0
adds r0, 0x1C adds r0, 0x1C
ldr r4, =gUnknown_083397D0 ldr r4, =sBlenderOpponentsNames
ldr r1, [r4, 0x10] ldr r1, [r4, 0x10]
bl StringCopy bl StringCopy
adds r0, r6, 0 adds r0, r6, 0
@ -896,7 +896,7 @@ _0807FF3C:
bl StringCopy bl StringCopy
adds r0, r5, 0 adds r0, r5, 0
adds r0, 0x1C adds r0, 0x1C
ldr r4, =gUnknown_083397D0 ldr r4, =sBlenderOpponentsNames
ldr r1, [r4, 0x14] ldr r1, [r4, 0x14]
bl StringCopy bl StringCopy
adds r0, r5, 0 adds r0, r5, 0
@ -1086,12 +1086,12 @@ _0808010C:
.pool .pool
_08080120: _08080120:
movs r5, 0 movs r5, 0
ldr r4, =gUnknown_083399C8 ldr r4, =sBlenderSyncArrowsPos
ldr r6, =gUnknown_020322A4 ldr r6, =gUnknown_020322A4
_08080126: _08080126:
ldrb r1, [r4] ldrb r1, [r4]
ldrb r2, [r4, 0x1] ldrb r2, [r4, 0x1]
ldr r0, =gUnknown_08339AD8 ldr r0, =sBlenderSyncArrow_SpriteTemplate
movs r3, 0x1 movs r3, 0x1
bl CreateSprite bl CreateSprite
ldr r1, [r6] ldr r1, [r6]
@ -1160,7 +1160,7 @@ _080801C8:
ldr r0, [r4] ldr r0, [r4]
ldr r3, =0x000011b8 ldr r3, =0x000011b8
adds r0, r3 adds r0, r3
ldr r1, =gUnknown_0833981A ldr r1, =sText_CommunicationStandby
movs r2, 0 movs r2, 0
bl sub_808417C bl sub_808417C
ldr r1, [r4] ldr r1, [r4]
@ -2121,12 +2121,12 @@ _080809F0:
.pool .pool
_08080A04: _08080A04:
movs r4, 0 movs r4, 0
ldr r5, =gUnknown_083399C8 ldr r5, =sBlenderSyncArrowsPos
ldr r6, =gUnknown_020322A4 ldr r6, =gUnknown_020322A4
_08080A0A: _08080A0A:
ldrb r1, [r5] ldrb r1, [r5]
ldrb r2, [r5, 0x1] ldrb r2, [r5, 0x1]
ldr r0, =gUnknown_08339AD8 ldr r0, =sBlenderSyncArrow_SpriteTemplate
movs r3, 0x1 movs r3, 0x1
bl CreateSprite bl CreateSprite
ldr r1, [r6] ldr r1, [r6]
@ -3095,7 +3095,7 @@ sub_8081288: @ 8081288
mov r8, r7 mov r8, r7
lsls r1, 24 lsls r1, 24
ldr r0, =gUnknown_08339B40 ldr r0, =gUnknown_08339B40
ldr r4, =gUnknown_083399C8 ldr r4, =sBlenderSyncArrowsPos
lsrs r1, 23 lsrs r1, 23
adds r2, r1, r4 adds r2, r1, r4
ldrb r6, [r2] ldrb r6, [r2]
@ -5062,7 +5062,7 @@ _080822B0:
ldr r4, [r6] ldr r4, [r6]
ldr r5, =0x000011b8 ldr r5, =0x000011b8
adds r4, r5 adds r4, r5
ldr r5, =gUnknown_08339831 ldr r5, =sText_WouldLikeToBlendAnotherBerry
bl sav2_get_text_speed bl sav2_get_text_speed
adds r2, r0, 0 adds r2, r0, 0
lsls r2, 24 lsls r2, 24
@ -5263,7 +5263,7 @@ _0808246C:
ldr r4, [r6] ldr r4, [r6]
ldr r0, =0x000011b8 ldr r0, =0x000011b8
adds r4, r0 adds r4, r0
ldr r5, =gUnknown_0833981A ldr r5, =sText_CommunicationStandby
bl sav2_get_text_speed bl sav2_get_text_speed
adds r2, r0, 0 adds r2, r0, 0
lsls r2, 24 lsls r2, 24
@ -5555,7 +5555,7 @@ _080826EC:
adds r1, r0 adds r1, r0
adds r0, r4, 0 adds r0, r4, 0
bl StringCopy bl StringCopy
ldr r1, =gUnknown_083398DD ldr r1, =sText_ApostropheSPokeblockCaseIsFull
b _08082740 b _08082740
.pool .pool
_0808271C: _0808271C:
@ -5575,7 +5575,7 @@ _0808271C:
adds r1, r0 adds r1, r0
adds r0, r4, 0 adds r0, r4, 0
bl StringCopy bl StringCopy
ldr r1, =gUnknown_083398B0 ldr r1, =sText_HasNoBerriesToPut
_08082740: _08082740:
adds r0, r4, 0 adds r0, r4, 0
bl StringAppend bl StringAppend
@ -5856,7 +5856,7 @@ _080829AA:
adds r0, r1 adds r0, r1
strh r2, [r0] strh r2, [r0]
ldr r0, =gStringVar4 ldr r0, =gStringVar4
ldr r1, =gUnknown_08339896 ldr r1, =sText_YourPokeblockCaseIsFull
bl StringCopy bl StringCopy
b _08082A92 b _08082A92
.pool .pool
@ -5872,7 +5872,7 @@ _080829D4:
adds r0, r1 adds r0, r1
strh r2, [r0] strh r2, [r0]
ldr r0, =gStringVar4 ldr r0, =gStringVar4
ldr r1, =gUnknown_08339858 ldr r1, =sText_RunOutOfBerriesForBlending
bl StringCopy bl StringCopy
b _08082A92 b _08082A92
.pool .pool
@ -7276,7 +7276,7 @@ _080834DE:
b _08083854 b _08083854
.pool .pool
_08083518: _08083518:
ldr r4, =gUnknown_083398F5 ldr r4, =sText_BlendingResults
movs r0, 0x1 movs r0, 0x1
adds r1, r4, 0 adds r1, r4, 0
movs r2, 0xA8 movs r2, 0xA8
@ -7329,7 +7329,7 @@ _08083564:
bl ConvertIntToDecimalStringN bl ConvertIntToDecimalStringN
ldr r0, [r7] ldr r0, [r7]
adds r0, 0x9F adds r0, 0x9F
ldr r1, =gUnknown_08339941 ldr r1, =sText_Dot
bl StringAppend bl StringAppend
ldr r0, [r7] ldr r0, [r7]
adds r0, 0x9F adds r0, 0x9F
@ -7374,7 +7374,7 @@ _08083564:
bl ConvertInternationalString bl ConvertInternationalString
ldr r0, [r7] ldr r0, [r7]
adds r0, 0x9F adds r0, 0x9F
ldr r1, =gUnknown_08339914 ldr r1, =sText_SpaceBerry
bl StringAppend bl StringAppend
ldr r1, [r7] ldr r1, [r7]
adds r1, 0x9F adds r1, 0x9F
@ -7397,7 +7397,7 @@ _08083564:
cmp r6, r0 cmp r6, r0
bcc _08083564 bcc _08083564
_0808361A: _0808361A:
ldr r1, =gUnknown_0833992E ldr r1, =sText_MaximumSpeed
movs r3, 0xFF movs r3, 0xFF
mov r10, r3 mov r10, r3
str r3, [sp] str r3, [sp]
@ -7425,7 +7425,7 @@ _0808361A:
bl ConvertIntToDecimalStringN bl ConvertIntToDecimalStringN
ldr r0, [r6] ldr r0, [r6]
adds r0, 0x9F adds r0, 0x9F
ldr r1, =gUnknown_08339941 ldr r1, =sText_Dot
bl StringAppend bl StringAppend
ldr r0, [r6] ldr r0, [r6]
adds r0, 0x4E adds r0, 0x4E
@ -7445,7 +7445,7 @@ _0808361A:
bl StringAppend bl StringAppend
ldr r0, [r6] ldr r0, [r6]
adds r0, 0x9F adds r0, 0x9F
ldr r1, =gUnknown_0833993C ldr r1, =sText_RPM
bl StringAppend bl StringAppend
ldr r1, [r6] ldr r1, [r6]
adds r1, 0x9F adds r1, 0x9F
@ -7463,7 +7463,7 @@ _0808361A:
movs r0, 0x5 movs r0, 0x5
movs r3, 0x51 movs r3, 0x51
bl sub_80840D4 bl sub_80840D4
ldr r1, =gUnknown_0833991B ldr r1, =sText_Time
mov r2, r10 mov r2, r10
str r2, [sp] str r2, [sp]
mov r3, r9 mov r3, r9
@ -7499,7 +7499,7 @@ _0808361A:
bl ConvertIntToDecimalStringN bl ConvertIntToDecimalStringN
ldr r0, [r6] ldr r0, [r6]
adds r0, 0x9F adds r0, 0x9F
ldr r1, =gUnknown_08339921 ldr r1, =sText_Min
bl StringAppend bl StringAppend
adds r1, r4, 0 adds r1, r4, 0
movs r2, 0x2 movs r2, 0x2
@ -7507,7 +7507,7 @@ _0808361A:
bl ConvertIntToDecimalStringN bl ConvertIntToDecimalStringN
ldr r0, [r6] ldr r0, [r6]
adds r0, 0x9F adds r0, 0x9F
ldr r1, =gUnknown_08339928 ldr r1, =sText_Sec
bl StringAppend bl StringAppend
ldr r1, [r6] ldr r1, [r6]
adds r1, 0x9F adds r1, 0x9F
@ -7682,10 +7682,10 @@ sub_80838AC: @ 80838AC
ldr r1, [r0] ldr r1, [r0]
adds r0, r6, 0 adds r0, r6, 0
bl StringCopy bl StringCopy
ldr r1, =gUnknown_0833979D ldr r1, =gText_WasMade
adds r0, r6, 0 adds r0, r6, 0
bl StringAppend bl StringAppend
ldr r1, =gUnknown_08339943 ldr r1, =sText_NewLine
adds r0, r6, 0 adds r0, r6, 0
bl StringAppend bl StringAppend
adds r0, r5, 0 adds r0, r5, 0
@ -7698,7 +7698,7 @@ sub_80838AC: @ 80838AC
adds r5, r0, 0 adds r5, r0, 0
lsls r5, 24 lsls r5, 24
lsrs r5, 24 lsrs r5, 24
ldr r1, =gUnknown_0833994F ldr r1, =sText_TheLevelIs
adds r0, r6, 0 adds r0, r6, 0
bl StringAppend bl StringAppend
mov r0, sp mov r0, sp
@ -7709,7 +7709,7 @@ sub_80838AC: @ 80838AC
adds r0, r6, 0 adds r0, r6, 0
mov r1, sp mov r1, sp
bl StringAppend bl StringAppend
ldr r1, =gUnknown_0833995D ldr r1, =sText_TheFeelIs
adds r0, r6, 0 adds r0, r6, 0
bl StringAppend bl StringAppend
mov r0, sp mov r0, sp
@ -7720,10 +7720,10 @@ sub_80838AC: @ 80838AC
adds r0, r6, 0 adds r0, r6, 0
mov r1, sp mov r1, sp
bl StringAppend bl StringAppend
ldr r1, =gUnknown_08339970 ldr r1, =sText_Dot2
adds r0, r6, 0 adds r0, r6, 0
bl StringAppend bl StringAppend
ldr r1, =gUnknown_0833979B ldr r1, =gText_NewParagraph
adds r0, r6, 0 adds r0, r6, 0
bl StringAppend bl StringAppend
add sp, 0xC add sp, 0xC
@ -8041,7 +8041,7 @@ _08083B9A:
movs r2, 0x1 movs r2, 0x1
movs r3, 0xD movs r3, 0xD
bl SetWindowBorderStyle bl SetWindowBorderStyle
ldr r4, =gUnknown_08339947 ldr r4, =sText_Ranking
movs r0, 0x1 movs r0, 0x1
adds r1, r4, 0 adds r1, r4, 0
movs r2, 0xA8 movs r2, 0xA8
@ -8161,7 +8161,7 @@ _08083C84:
bl ConvertIntToDecimalStringN bl ConvertIntToDecimalStringN
ldr r0, [r7] ldr r0, [r7]
adds r0, 0x9F adds r0, 0x9F
ldr r1, =gUnknown_08339941 ldr r1, =sText_Dot
bl StringAppend bl StringAppend
ldr r0, [r7] ldr r0, [r7]
adds r0, 0x9F adds r0, 0x9F
@ -8395,7 +8395,7 @@ _08083E8A:
movs r3, 0x3 movs r3, 0x3
bl ConvertIntToDecimalStringN bl ConvertIntToDecimalStringN
adds r5, r0, 0 adds r5, r0, 0
ldr r1, =gUnknown_08339941 ldr r1, =sText_Dot
bl StringAppend bl StringAppend
adds r5, r0, 0 adds r5, r0, 0
adds r0, r4, 0 adds r0, r4, 0
@ -8407,7 +8407,7 @@ _08083E8A:
movs r3, 0x2 movs r3, 0x2
bl ConvertIntToDecimalStringN bl ConvertIntToDecimalStringN
adds r5, r0, 0 adds r5, r0, 0
ldr r1, =gUnknown_0833993C ldr r1, =sText_RPM
bl StringAppend bl StringAppend
movs r0, 0x1 movs r0, 0x1
add r1, sp, 0xC add r1, sp, 0xC

View File

@ -1,8 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
.align 2, 0 @ Don't pad with nop.

View File

@ -6763,7 +6763,7 @@ _080DB1CC:
adds r0, r5, 0 adds r0, r5, 0
adds r1, r7, 0 adds r1, r7, 0
adds r2, r6, 0 adds r2, r6, 0
bl species_and_otid_get_pal bl GetFrontSpritePalFromSpeciesAndPersonality
movs r1, 0x90 movs r1, 0x90
lsls r1, 1 lsls r1, 1
movs r2, 0x20 movs r2, 0x20

View File

@ -572,7 +572,7 @@ sub_81302E8: @ 81302E8
ldr r1, [r0, 0x4] ldr r1, [r0, 0x4]
ldr r2, [r0] ldr r2, [r0]
adds r0, r5, 0 adds r0, r5, 0
bl species_and_otid_get_pal bl GetFrontSpritePalFromSpeciesAndPersonality
ldr r7, =gUnknown_030061C4 ldr r7, =gUnknown_030061C4
ldr r1, [r7] ldr r1, [r7]
bl LZDecompressVram bl LZDecompressVram

View File

@ -26,7 +26,7 @@ sub_81754DC: @ 81754DC
ands r0, r1 ands r0, r1
cmp r0, 0 cmp r0, 0
beq _08175522 beq _08175522
ldr r0, =gUnknown_0203BCE4 ldr r0, =gHasHallOfFameRecords
ldrb r0, [r0] ldrb r0, [r0]
cmp r0, 0 cmp r0, 0
beq _08175522 beq _08175522
@ -3675,7 +3675,7 @@ sub_8177388: @ 8177388
bl VarGet bl VarGet
lsls r0, 16 lsls r0, 16
lsrs r0, 16 lsrs r0, 16
bl sub_8133EDC bl GetStarterPokemon
lsls r0, 16 lsls r0, 16
lsrs r0, 16 lsrs r0, 16
bl SpeciesToNationalPokedexNum bl SpeciesToNationalPokedexNum

File diff suppressed because it is too large Load Diff

View File

@ -52,8 +52,8 @@ _081DB462:
bx r1 bx r1
thumb_func_end sub_81DB41C thumb_func_end sub_81DB41C
thumb_func_start sub_81DB468 thumb_func_start CopyMonCategoryText
sub_81DB468: @ 81DB468 CopyMonCategoryText: @ 81DB468
push {lr} push {lr}
adds r2, r0, 0 adds r2, r0, 0
adds r0, r1, 0 adds r0, r1, 0
@ -70,7 +70,7 @@ sub_81DB468: @ 81DB468
pop {r0} pop {r0}
bx r0 bx r0
.pool .pool
thumb_func_end sub_81DB468 thumb_func_end CopyMonCategoryText
thumb_func_start sub_81DB494 thumb_func_start sub_81DB494
sub_81DB494: @ 81DB494 sub_81DB494: @ 81DB494

View File

@ -52022,7 +52022,7 @@ _080241A6:
movs r0, 0 movs r0, 0
movs r1, 0 movs r1, 0
bl sub_81973C4 bl sub_81973C4
ldr r2, =gUnknown_082C8959 ldr r2, =gText_SavingDontTurnOffPower
movs r0, 0 movs r0, 0
str r0, [sp] str r0, [sp]
movs r0, 0x2 movs r0, 0x2
@ -64112,7 +64112,7 @@ _0802A3AE:
movs r0, 0 movs r0, 0
movs r1, 0 movs r1, 0
bl sub_81973C4 bl sub_81973C4
ldr r2, =gUnknown_082C8959 ldr r2, =gText_SavingDontTurnOffPower
str r4, [sp] str r4, [sp]
movs r0, 0x2 movs r0, 0x2
str r0, [sp, 0x4] str r0, [sp, 0x4]
@ -69004,7 +69004,7 @@ _0802CA32:
ldrh r0, [r7] ldrh r0, [r7]
ldr r1, [r7, 0x4] ldr r1, [r7, 0x4]
ldr r2, [r7, 0x8] ldr r2, [r7, 0x8]
bl species_and_otid_get_pal bl GetFrontSpritePalFromSpeciesAndPersonality
str r0, [sp, 0x20] str r0, [sp, 0x20]
add r0, sp, 0x20 add r0, sp, 0x20
ldr r1, [r0, 0x4] ldr r1, [r0, 0x4]
@ -70355,7 +70355,7 @@ _0802D516:
strh r0, [r1, 0x12] strh r0, [r1, 0x12]
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
ldr r2, =gUnknown_082C8959 ldr r2, =gText_SavingDontTurnOffPower
movs r1, 0x1 movs r1, 0x1
str r1, [sp] str r1, [sp]
movs r1, 0xFF movs r1, 0xFF

View File

@ -4211,7 +4211,7 @@ _081B23E8:
movs r1, 0x4F movs r1, 0x4F
movs r2, 0xD0 movs r2, 0xD0
bl sub_809882C bl sub_809882C
bl sub_8098C64 bl GetOverworldTextboxPalettePtr
movs r1, 0xE0 movs r1, 0xE0
movs r2, 0x20 movs r2, 0x20
bl LoadPalette bl LoadPalette
@ -4249,7 +4249,7 @@ _081B243E:
adds r0, r4, 0 adds r0, r4, 0
movs r1, 0 movs r1, 0
bl FillWindowPixelBuffer bl FillWindowPixelBuffer
ldr r5, =gText_Confirm ldr r5, =gMenuText_Confirm
movs r0, 0 movs r0, 0
adds r1, r5, 0 adds r1, r5, 0
movs r2, 0x30 movs r2, 0x30

View File

@ -936,7 +936,7 @@ _08075B9E:
.pool .pool
_08075BB4: _08075BB4:
adds r0, r3, 0 adds r0, r3, 0
bl sub_805F110 bl ShouldPlayNormalPokeCry
cmp r0, 0x1 cmp r0, 0x1
bne _08075BCC bne _08075BCC
lsls r1, r5, 24 lsls r1, r5, 24
@ -976,7 +976,7 @@ _08075BF8:
cmp r0, 0 cmp r0, 0
bne _08075CBA bne _08075CBA
adds r0, r3, 0 adds r0, r3, 0
bl sub_805F110 bl ShouldPlayNormalPokeCry
cmp r0, 0x1 cmp r0, 0x1
bne _08075C22 bne _08075C22
lsls r1, r5, 24 lsls r1, r5, 24
@ -1066,7 +1066,7 @@ _08075CBA:
b _08075D04 b _08075D04
_08075CC0: _08075CC0:
adds r0, r3, 0 adds r0, r3, 0
bl sub_805F110 bl ShouldPlayNormalPokeCry
cmp r0, 0x1 cmp r0, 0x1
bne _08075CD8 bne _08075CD8
lsls r1, r5, 24 lsls r1, r5, 24

View File

@ -2311,7 +2311,7 @@ _080BC870:
movs r2, 0xBE movs r2, 0xBE
bl LoadPalette bl LoadPalette
_080BC87A: _080BC87A:
bl sub_8098C64 bl GetOverworldTextboxPalettePtr
movs r1, 0xF0 movs r1, 0xF0
movs r2, 0x20 movs r2, 0x20
bl LoadPalette bl LoadPalette
@ -8824,7 +8824,7 @@ _080C0168:
adds r3, r5 adds r3, r5
ldrb r4, [r3, 0x5] ldrb r4, [r3, 0x5]
lsrs r4, 4 lsrs r4, 4
bl species_and_otid_get_pal bl GetFrontSpritePalFromSpeciesAndPersonality
lsls r4, 4 lsls r4, 4
movs r2, 0x80 movs r2, 0x80
lsls r2, 1 lsls r2, 1
@ -8950,7 +8950,7 @@ _080C028E:
add r4, sp, 0x10 add r4, sp, 0x10
adds r0, r6, 0 adds r0, r6, 0
adds r1, r4, 0 adds r1, r4, 0
bl sub_81DB468 bl CopyMonCategoryText
adds r0, r4, 0 adds r0, r4, 0
b _080C02AE b _080C02AE
.pool .pool

View File

@ -14656,7 +14656,7 @@ _080CEC86:
adds r1, r3 adds r1, r3
str r0, [r1] str r0, [r1]
adds r0, r6, 0 adds r0, r6, 0
bl pokemon_get_pal bl GetMonFrontSpritePal
ldr r1, [r4] ldr r1, [r4]
ldr r2, =0x00000cdc ldr r2, =0x00000cdc
adds r1, r2 adds r1, r2
@ -14759,7 +14759,7 @@ _080CED7E:
adds r1, r4 adds r1, r4
ldrh r0, [r1] ldrh r0, [r1]
mov r1, r9 mov r1, r9
bl species_and_otid_get_pal bl GetFrontSpritePalFromSpeciesAndPersonality
ldr r1, [r5] ldr r1, [r5]
ldr r3, =0x00000cdc ldr r3, =0x00000cdc
adds r2, r1, r3 adds r2, r1, r3

View File

@ -1116,7 +1116,7 @@ sub_81C4778: @ 81C4778
bne _081C47AE bne _081C47AE
adds r0, r1, 0 adds r0, r1, 0
adds r0, 0xC adds r0, 0xC
bl sub_805F110 bl ShouldPlayNormalPokeCry
cmp r0, 0x1 cmp r0, 0x1
bne _081C47A4 bne _081C47A4
ldrh r0, [r4, 0x2] ldrh r0, [r4, 0x2]

View File

@ -13532,7 +13532,7 @@ _081CDBD0:
adds r0, r4, 0 adds r0, r4, 0
mov r1, r8 mov r1, r8
adds r2, r5, 0 adds r2, r5, 0
bl species_and_otid_get_pal bl GetFrontSpritePalFromSpeciesAndPersonality
mov r2, r9 mov r2, r9
lsls r1, r2, 7 lsls r1, r2, 7
adds r1, r7, r1 adds r1, r7, r1
@ -24408,7 +24408,7 @@ _081D30C4:
adds r0, r4, 0 adds r0, r4, 0
adds r1, r6, 0 adds r1, r6, 0
adds r2, r5, 0 adds r2, r5, 0
bl species_and_otid_get_pal bl GetFrontSpritePalFromSpeciesAndPersonality
mov r1, r9 mov r1, r9
bl LZ77UnCompWram bl LZ77UnCompWram
_081D311A: _081D311A:

View File

@ -4043,12 +4043,12 @@ sub_8137734: @ 8137734
lsrs r1, r0, 24 lsrs r1, r0, 24
cmp r1, 0x1 cmp r1, 0x1
bne _08137760 bne _08137760
ldr r0, =gUnknown_0203BCE4 ldr r0, =gHasHallOfFameRecords
strb r1, [r0] strb r1, [r0]
b _0813776C b _0813776C
.pool .pool
_08137760: _08137760:
ldr r1, =gUnknown_0203BCE4 ldr r1, =gHasHallOfFameRecords
movs r0, 0 movs r0, 0
strb r0, [r1] strb r0, [r1]
adds r0, r4, 0 adds r0, r4, 0
@ -4165,7 +4165,7 @@ _08137838:
movs r1, 0x43 movs r1, 0x43
bl sub_80EE4DC bl sub_80EE4DC
_0813785A: _0813785A:
ldr r0, =sub_8173694 ldr r0, =CB2_DoHallOfFameScreen
bl SetMainCallback2 bl SetMainCallback2
movs r0, 0 movs r0, 0
add sp, 0x1C add sp, 0x1C
@ -4638,7 +4638,7 @@ sub_8137C10: @ 8137C10
thumb_func_start sub_8137C28 thumb_func_start sub_8137C28
sub_8137C28: @ 8137C28 sub_8137C28: @ 8137C28
push {lr} push {lr}
ldr r0, =sub_8174194 ldr r0, =CB2_DoHallOfFamePC
bl SetMainCallback2 bl SetMainCallback2
bl ScriptContext2_Enable bl ScriptContext2_Enable
pop {r0} pop {r0}
@ -7673,7 +7673,7 @@ sub_81394D8: @ 81394D8
bl VarGet bl VarGet
lsls r0, 16 lsls r0, 16
lsrs r0, 16 lsrs r0, 16
bl sub_8133EDC bl GetStarterPokemon
lsls r0, 16 lsls r0, 16
lsrs r6, r0, 16 lsrs r6, r0, 16
bl CalculatePlayerPartyCount bl CalculatePlayerPartyCount

View File

@ -1683,7 +1683,7 @@ _080A05AC:
movs r0, 0 movs r0, 0
movs r1, 0x11 movs r1, 0x11
bl FillWindowPixelBuffer bl FillWindowPixelBuffer
ldr r2, =gUnknown_082C8959 ldr r2, =gText_SavingDontTurnOffPower
movs r4, 0 movs r4, 0
str r4, [sp] str r4, [sp]
movs r0, 0x2 movs r0, 0x2

View File

@ -1,985 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start sub_8133EDC
sub_8133EDC: @ 8133EDC
push {lr}
lsls r0, 16
lsrs r1, r0, 16
cmp r1, 0x3
bls _08133EE8
movs r1, 0
_08133EE8:
ldr r0, =gUnknown_085B1DF8
lsls r1, 1
adds r1, r0
ldrh r0, [r1]
pop {r1}
bx r1
.pool
thumb_func_end sub_8133EDC
thumb_func_start sub_8133EF8
sub_8133EF8: @ 8133EF8
push {lr}
bl LoadOam
bl ProcessSpriteCopyRequests
bl TransferPlttBuffer
pop {r0}
bx r0
thumb_func_end sub_8133EF8
thumb_func_start set_256color_bg_bg0
set_256color_bg_bg0: @ 8133F0C
push {r4-r6,lr}
mov r6, r10
mov r5, r9
mov r4, r8
push {r4-r6}
sub sp, 0xC
movs r0, 0
bl SetVBlankCallback
movs r0, 0
movs r1, 0
bl SetGpuReg
movs r0, 0xE
movs r1, 0
bl SetGpuReg
movs r0, 0xC
movs r1, 0
bl SetGpuReg
movs r0, 0xA
movs r1, 0
bl SetGpuReg
movs r0, 0x8
movs r1, 0
bl SetGpuReg
movs r0, 0
movs r1, 0
movs r2, 0
bl ChangeBgX
movs r0, 0
movs r1, 0
movs r2, 0
bl ChangeBgY
movs r0, 0x1
movs r1, 0
movs r2, 0
bl ChangeBgX
movs r0, 0x1
movs r1, 0
movs r2, 0
bl ChangeBgY
movs r0, 0x2
movs r1, 0
movs r2, 0
bl ChangeBgX
movs r0, 0x2
movs r1, 0
movs r2, 0
bl ChangeBgY
movs r0, 0x3
movs r1, 0
movs r2, 0
bl ChangeBgX
movs r0, 0x3
movs r1, 0
movs r2, 0
bl ChangeBgY
add r1, sp, 0x4
movs r0, 0
strh r0, [r1]
ldr r2, =0x040000d4
str r1, [r2]
movs r1, 0xC0
lsls r1, 19
str r1, [r2, 0x4]
ldr r0, =0x8100c000
str r0, [r2, 0x8]
ldr r0, [r2, 0x8]
movs r0, 0
mov r9, r0
str r0, [sp, 0x8]
add r0, sp, 0x8
str r0, [r2]
movs r0, 0xE0
lsls r0, 19
str r0, [r2, 0x4]
ldr r0, =0x85000100
str r0, [r2, 0x8]
ldr r0, [r2, 0x8]
add r0, sp, 0x4
mov r3, r9
strh r3, [r0]
str r0, [r2]
movs r0, 0xA0
lsls r0, 19
str r0, [r2, 0x4]
ldr r0, =0x81000200
str r0, [r2, 0x8]
ldr r0, [r2, 0x8]
ldr r0, =gBirchHelpGfx
bl LZ77UnCompVram
ldr r0, =gBirchBagTilemap
ldr r1, =0x06003000
bl LZ77UnCompVram
ldr r0, =gBirchGrassTilemap
ldr r1, =0x06003800
bl LZ77UnCompVram
movs r0, 0
bl ResetBgsAndClearDma3BusyFlags
ldr r1, =gUnknown_085B1E00
movs r0, 0
movs r2, 0x3
bl InitBgsFromTemplates
ldr r0, =gUnknown_085B1DCC
bl InitWindows
bl DeactivateAllTextPrinters
movs r1, 0xAA
lsls r1, 2
movs r0, 0
movs r2, 0xD0
bl sub_809882C
bl clear_scheduled_bg_copies_to_vram
bl remove_some_task
bl ResetTasks
bl ResetSpriteData
bl ResetPaletteFade
bl FreeAllSpritePalettes
bl dp13_810BB8C
bl sub_8098C64
movs r1, 0xE0
movs r2, 0x20
bl LoadPalette
ldr r0, =gBirchBagGrassPal
movs r1, 0
movs r2, 0x40
bl LoadPalette
ldr r0, =gUnknown_085B1ED8
bl LoadCompressedObjectPic
ldr r0, =gUnknown_085B1EE8
bl LoadCompressedObjectPic
ldr r0, =gUnknown_085B1EF8
bl LoadSpritePalettes
movs r0, 0x1
negs r0, r0
mov r1, r9
str r1, [sp]
movs r1, 0
movs r2, 0x10
movs r3, 0
bl BeginNormalPaletteFade
movs r0, 0x1
bl EnableInterrupts
ldr r0, =sub_8133EF8
bl SetVBlankCallback
ldr r0, =sub_81341E0
bl SetMainCallback2
movs r0, 0x48
movs r1, 0x3F
bl SetGpuReg
movs r0, 0x4A
movs r1, 0x1F
bl SetGpuReg
movs r0, 0x40
movs r1, 0
bl SetGpuReg
movs r0, 0x44
movs r1, 0
bl SetGpuReg
movs r0, 0x50
movs r1, 0xFE
bl SetGpuReg
movs r0, 0x52
movs r1, 0
bl SetGpuReg
movs r0, 0x54
movs r1, 0x7
bl SetGpuReg
movs r1, 0xC1
lsls r1, 6
movs r0, 0
bl SetGpuReg
movs r0, 0
bl ShowBg
movs r0, 0x2
bl ShowBg
movs r0, 0x3
bl ShowBg
ldr r0, =sub_81341FC
movs r1, 0
bl CreateTask
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
ldr r1, =gTasks
lsls r0, r4, 2
adds r0, r4
lsls r0, 3
adds r0, r1
movs r3, 0x1
mov r10, r3
mov r1, r10
strh r1, [r0, 0x8]
ldr r0, =gUnknown_085B1F10
movs r1, 0x78
movs r2, 0x38
movs r3, 0x2
bl CreateSprite
lsls r0, 24
lsrs r0, 24
ldr r3, =gSprites
mov r8, r3
lsls r1, r0, 4
adds r1, r0
lsls r1, 2
add r1, r8
strh r4, [r1, 0x2E]
ldr r6, =gUnknown_085B1F28
ldr r5, =gUnknown_085B1DEC
ldrb r1, [r5]
ldrb r2, [r5, 0x1]
adds r0, r6, 0
movs r3, 0x2
bl CreateSprite
lsls r0, 24
lsrs r0, 24
lsls r1, r0, 4
adds r1, r0
lsls r1, 2
add r1, r8
strh r4, [r1, 0x2E]
mov r0, r9
strh r0, [r1, 0x30]
ldrb r1, [r5, 0x2]
ldrb r2, [r5, 0x3]
adds r0, r6, 0
movs r3, 0x2
bl CreateSprite
lsls r0, 24
lsrs r0, 24
lsls r1, r0, 4
adds r1, r0
lsls r1, 2
add r1, r8
strh r4, [r1, 0x2E]
mov r3, r10
strh r3, [r1, 0x30]
ldrb r1, [r5, 0x4]
ldrb r2, [r5, 0x5]
adds r0, r6, 0
movs r3, 0x2
bl CreateSprite
lsls r0, 24
lsrs r0, 24
lsls r1, r0, 4
adds r1, r0
lsls r1, 2
add r1, r8
strh r4, [r1, 0x2E]
movs r0, 0x2
strh r0, [r1, 0x30]
ldr r1, =gUnknown_030011F8
movs r0, 0xFF
strh r0, [r1]
add sp, 0xC
pop {r3-r5}
mov r8, r3
mov r9, r4
mov r10, r5
pop {r4-r6}
pop {r0}
bx r0
.pool
thumb_func_end set_256color_bg_bg0
thumb_func_start sub_81341E0
sub_81341E0: @ 81341E0
push {lr}
bl RunTasks
bl AnimateSprites
bl BuildOamBuffer
bl do_scheduled_bg_tilemap_copies_to_vram
bl UpdatePaletteFade
pop {r0}
bx r0
thumb_func_end sub_81341E0
thumb_func_start sub_81341FC
sub_81341FC: @ 81341FC
push {r4,lr}
sub sp, 0xC
lsls r0, 24
lsrs r0, 24
ldr r1, =gTasks
lsls r4, r0, 2
adds r4, r0
lsls r4, 3
adds r4, r1
ldrb r0, [r4, 0x8]
bl sub_81344C8
movs r2, 0xAA
lsls r2, 2
movs r0, 0
movs r1, 0
movs r3, 0xD
bl SetWindowBorderStyle
ldr r2, =gText_BirchInTrouble
movs r0, 0x1
str r0, [sp]
movs r0, 0
str r0, [sp, 0x4]
str r0, [sp, 0x8]
movs r1, 0x1
movs r3, 0
bl PrintTextOnWindow
movs r0, 0
bl PutWindowTilemap
movs r0, 0
bl schedule_bg_copy_tilemap_to_vram
ldr r0, =sub_813425C
str r0, [r4]
add sp, 0xC
pop {r4}
pop {r0}
bx r0
.pool
thumb_func_end sub_81341FC
thumb_func_start sub_813425C
sub_813425C: @ 813425C
push {r4-r7,lr}
lsls r0, 24
lsrs r5, r0, 24
ldr r2, =gTasks
lsls r0, r5, 2
adds r0, r5
lsls r0, 3
adds r6, r0, r2
ldrh r7, [r6, 0x8]
ldrb r4, [r6, 0x8]
ldr r1, =gMain
ldrh r3, [r1, 0x2E]
movs r0, 0x1
ands r0, r3
cmp r0, 0
beq _081342F8
bl sub_8134604
ldr r0, =gUnknown_085B1F40
ldr r1, =gUnknown_085B1DEC
lsls r2, r4, 1
adds r3, r2, r1
ldrb r5, [r3]
adds r1, 0x1
adds r2, r1
ldrb r4, [r2]
adds r1, r5, 0
adds r2, r4, 0
movs r3, 0x1
bl CreateSprite
lsls r0, 24
lsrs r0, 24
strh r0, [r6, 0xC]
ldrh r0, [r6, 0x8]
bl sub_8133EDC
lsls r0, 16
lsrs r0, 16
adds r1, r5, 0
adds r2, r4, 0
bl sub_8134690
lsls r0, 24
lsrs r0, 24
ldr r4, =gSprites
lsls r1, r0, 4
adds r1, r0
lsls r1, 2
adds r2, r4, 0
adds r2, 0x10
adds r2, r1, r2
ldr r3, =gUnknown_085B1ED0
str r3, [r2]
adds r4, 0x1C
adds r1, r4
ldr r2, =sub_8134774
str r2, [r1]
strh r0, [r6, 0xA]
ldr r0, =sub_8134340
str r0, [r6]
b _08134334
.pool
_081342F8:
movs r0, 0x20
ands r0, r3
cmp r0, 0
beq _08134314
cmp r4, 0
beq _08134314
subs r0, r7, 0x1
strh r0, [r6, 0x8]
ldr r0, =sub_8134640
str r0, [r6]
b _08134334
.pool
_08134314:
ldrh r1, [r1, 0x2E]
movs r0, 0x10
ands r0, r1
cmp r0, 0
beq _08134334
cmp r4, 0x1
bhi _08134334
lsls r0, r5, 2
adds r0, r5
lsls r0, 3
adds r0, r2
ldrh r1, [r0, 0x8]
adds r1, 0x1
strh r1, [r0, 0x8]
ldr r1, =sub_8134640
str r1, [r0]
_08134334:
pop {r4-r7}
pop {r0}
bx r0
.pool
thumb_func_end sub_813425C
thumb_func_start sub_8134340
sub_8134340: @ 8134340
push {lr}
lsls r0, 24
lsrs r0, 24
ldr r3, =gSprites
ldr r2, =gTasks
lsls r1, r0, 2
adds r1, r0
lsls r1, 3
adds r2, r1, r2
movs r0, 0xC
ldrsh r1, [r2, r0]
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
adds r1, r0, r3
adds r0, r1, 0
adds r0, 0x3F
ldrb r0, [r0]
lsls r0, 26
cmp r0, 0
bge _0813437E
movs r3, 0x20
ldrsh r0, [r1, r3]
cmp r0, 0x78
bne _0813437E
movs r3, 0x22
ldrsh r0, [r1, r3]
cmp r0, 0x40
bne _0813437E
ldr r0, =sub_8134390
str r0, [r2]
_0813437E:
pop {r0}
bx r0
.pool
thumb_func_end sub_8134340
thumb_func_start sub_8134390
sub_8134390: @ 8134390
push {r4,lr}
sub sp, 0xC
lsls r0, 24
lsrs r0, 24
ldr r1, =gTasks
lsls r4, r0, 2
adds r4, r0
lsls r4, 3
adds r4, r1
ldrh r0, [r4, 0x8]
bl sub_8133EDC
lsls r0, 16
lsrs r0, 16
movs r1, 0
bl PlayCry1
movs r0, 0
movs r1, 0x11
bl FillWindowPixelBuffer
ldr r2, =gText_ConfirmStarterChoice
movs r0, 0x1
str r0, [sp]
movs r0, 0
str r0, [sp, 0x4]
str r0, [sp, 0x8]
movs r1, 0x1
movs r3, 0
bl PrintTextOnWindow
movs r0, 0
bl schedule_bg_copy_tilemap_to_vram
ldr r0, =gUnknown_085B1DDC
movs r1, 0xAA
lsls r1, 2
movs r2, 0xD
movs r3, 0
bl CreateYesNoMenu
ldr r0, =sub_8134400
str r0, [r4]
add sp, 0xC
pop {r4}
pop {r0}
bx r0
.pool
thumb_func_end sub_8134390
thumb_func_start sub_8134400
sub_8134400: @ 8134400
push {r4-r6,lr}
lsls r0, 24
lsrs r4, r0, 24
bl sub_8198C58
lsls r0, 24
asrs r1, r0, 24
cmp r1, 0
beq _08134426
cmp r1, 0
bgt _08134420
movs r0, 0x1
negs r0, r0
cmp r1, r0
beq _08134450
b _0813449A
_08134420:
cmp r1, 0x1
beq _08134450
b _0813449A
_08134426:
ldr r2, =gSpecialVar_Result
ldr r1, =gTasks
lsls r0, r4, 2
adds r0, r4
lsls r0, 3
adds r0, r1
ldrh r0, [r0, 0x8]
strh r0, [r2]
bl dp13_810BB8C
ldr r0, =gMain
ldr r0, [r0, 0x8]
bl SetMainCallback2
b _0813449A
.pool
_08134450:
movs r0, 0x5
bl PlaySE
ldr r0, =gTasks
lsls r5, r4, 2
adds r5, r4
lsls r5, 3
adds r5, r0
ldrb r4, [r5, 0xA]
ldr r6, =gSprites
lsls r0, r4, 4
adds r0, r4
lsls r0, 2
adds r0, r6
ldrb r0, [r0, 0x3]
lsls r0, 26
lsrs r0, 27
bl FreeOamMatrix
adds r0, r4, 0
bl sub_818D820
ldrb r0, [r5, 0xC]
lsls r4, r0, 4
adds r4, r0
lsls r4, 2
adds r4, r6
ldrb r0, [r4, 0x3]
lsls r0, 26
lsrs r0, 27
bl FreeOamMatrix
adds r0, r4, 0
bl DestroySprite
ldr r0, =sub_81344AC
str r0, [r5]
_0813449A:
pop {r4-r6}
pop {r0}
bx r0
.pool
thumb_func_end sub_8134400
thumb_func_start sub_81344AC
sub_81344AC: @ 81344AC
lsls r0, 24
lsrs r0, 24
ldr r2, =gTasks
lsls r1, r0, 2
adds r1, r0
lsls r1, 3
adds r1, r2
ldr r0, =sub_81341FC
str r0, [r1]
bx lr
.pool
thumb_func_end sub_81344AC
thumb_func_start sub_81344C8
sub_81344C8: @ 81344C8
push {r4-r6,lr}
mov r6, r10
mov r5, r9
mov r4, r8
push {r4-r6}
sub sp, 0x34
adds r5, r0, 0
lsls r5, 24
lsrs r5, 24
adds r0, r5, 0
bl sub_8133EDC
adds r4, r0, 0
lsls r4, 16
lsrs r4, 16
adds r0, r4, 0
bl SpeciesToNationalPokedexNum
lsls r0, 16
lsrs r0, 16
add r1, sp, 0xC
bl sub_81DB468
movs r0, 0xB
adds r1, r4, 0
muls r1, r0
mov r9, r1
ldr r0, =gSpeciesNames
add r9, r0
ldr r0, =gUnknown_085B1DE4
ldr r1, [r0, 0x4]
ldr r0, [r0]
str r0, [sp, 0x2C]
str r1, [sp, 0x30]
ldr r3, =gUnknown_085B1DF2
lsls r5, 1
adds r2, r5, r3
mov r10, r2
ldrb r0, [r2]
lsls r0, 8
ldr r1, =0xffff00ff
ldr r2, [sp, 0x2C]
ands r2, r1
orrs r2, r0
str r2, [sp, 0x2C]
adds r3, 0x1
adds r5, r3
ldrb r1, [r5]
lsls r1, 16
ldr r0, =0xff00ffff
ands r0, r2
orrs r0, r1
str r0, [sp, 0x2C]
add r0, sp, 0x2C
bl AddWindow
ldr r4, =gUnknown_030011F8
strh r0, [r4]
lsls r0, 24
lsrs r0, 24
movs r1, 0
bl FillWindowPixelBuffer
movs r0, 0x7
add r1, sp, 0xC
movs r2, 0x68
bl GetStringCenterAlignXOffset
adds r2, r0, 0
ldrb r0, [r4]
lsls r2, 24
lsrs r2, 24
ldr r1, =gUnknown_085B1E0C
mov r8, r1
str r1, [sp]
movs r6, 0
str r6, [sp, 0x4]
add r1, sp, 0xC
str r1, [sp, 0x8]
movs r1, 0x7
movs r3, 0x1
bl box_print
movs r0, 0x1
mov r1, r9
movs r2, 0x68
bl GetStringCenterAlignXOffset
adds r2, r0, 0
ldrb r0, [r4]
lsls r2, 24
lsrs r2, 24
mov r1, r8
str r1, [sp]
str r6, [sp, 0x4]
mov r1, r9
str r1, [sp, 0x8]
movs r1, 0x1
movs r3, 0x11
bl box_print
ldrb r0, [r4]
bl PutWindowTilemap
movs r0, 0
bl schedule_bg_copy_tilemap_to_vram
mov r2, r10
ldrb r1, [r2]
lsls r0, r1, 27
movs r2, 0xFC
lsls r2, 24
adds r0, r2
adds r1, 0xD
lsls r1, 3
adds r1, 0x4
lsls r1, 24
ldrb r4, [r5]
lsls r5, r4, 27
lsrs r5, 24
adds r4, 0x4
lsls r4, 27
lsrs r4, 24
lsrs r1, 8
orrs r1, r0
lsrs r1, 16
movs r0, 0x40
bl SetGpuReg
lsls r5, 8
orrs r5, r4
movs r0, 0x44
adds r1, r5, 0
bl SetGpuReg
add sp, 0x34
pop {r3-r5}
mov r8, r3
mov r9, r4
mov r10, r5
pop {r4-r6}
pop {r0}
bx r0
.pool
thumb_func_end sub_81344C8
thumb_func_start sub_8134604
sub_8134604: @ 8134604
push {r4,lr}
ldr r4, =gUnknown_030011F8
ldrb r0, [r4]
movs r1, 0
bl FillWindowPixelBuffer
ldrb r0, [r4]
bl ClearWindowTilemap
ldrb r0, [r4]
bl RemoveWindow
movs r0, 0xFF
strh r0, [r4]
movs r0, 0x40
movs r1, 0
bl SetGpuReg
movs r0, 0x44
movs r1, 0
bl SetGpuReg
movs r0, 0
bl schedule_bg_copy_tilemap_to_vram
pop {r4}
pop {r0}
bx r0
.pool
thumb_func_end sub_8134604
thumb_func_start sub_8134640
sub_8134640: @ 8134640
push {r4,lr}
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
bl sub_8134604
ldr r1, =gTasks
lsls r0, r4, 2
adds r0, r4
lsls r0, 3
adds r0, r1
ldr r1, =sub_8134668
str r1, [r0]
pop {r4}
pop {r0}
bx r0
.pool
thumb_func_end sub_8134640
thumb_func_start sub_8134668
sub_8134668: @ 8134668
push {r4,lr}
lsls r0, 24
lsrs r0, 24
ldr r1, =gTasks
lsls r4, r0, 2
adds r4, r0
lsls r4, 3
adds r4, r1
ldrb r0, [r4, 0x8]
bl sub_81344C8
ldr r0, =sub_813425C
str r0, [r4]
pop {r4}
pop {r0}
bx r0
.pool
thumb_func_end sub_8134668
thumb_func_start sub_8134690
sub_8134690: @ 8134690
push {lr}
sub sp, 0x10
lsls r0, 16
lsrs r0, 16
lsls r1, 24
lsrs r1, 24
lsls r2, 24
lsrs r2, 24
str r1, [sp]
str r2, [sp, 0x4]
movs r1, 0xE
str r1, [sp, 0x8]
ldr r1, =0x0000ffff
str r1, [sp, 0xC]
movs r1, 0x8
movs r2, 0
movs r3, 0x1
bl sub_818D3E4
lsls r0, 24
lsrs r0, 24
ldr r1, =gSprites
lsls r2, r0, 4
adds r2, r0
lsls r2, 2
adds r2, r1
ldrb r3, [r2, 0x5]
movs r1, 0xD
negs r1, r1
ands r1, r3
strb r1, [r2, 0x5]
add sp, 0x10
pop {r1}
bx r1
.pool
thumb_func_end sub_8134690
thumb_func_start sub_81346DC
sub_81346DC: @ 81346DC
push {r4,lr}
adds r4, r0, 0
ldr r2, =gUnknown_085B1E28
ldr r3, =gTasks
movs r0, 0x2E
ldrsh r1, [r4, r0]
lsls r0, r1, 2
adds r0, r1
lsls r0, 3
adds r0, r3
movs r1, 0x8
ldrsh r0, [r0, r1]
lsls r0, 1
adds r0, r2
ldrb r0, [r0]
strh r0, [r4, 0x20]
movs r0, 0x2E
ldrsh r1, [r4, r0]
lsls r0, r1, 2
adds r0, r1
lsls r0, 3
adds r0, r3
movs r1, 0x8
ldrsh r0, [r0, r1]
lsls r0, 1
adds r2, 0x1
adds r0, r2
ldrb r0, [r0]
strh r0, [r4, 0x22]
movs r1, 0x30
ldrsh r0, [r4, r1]
movs r1, 0x8
bl Sin
strh r0, [r4, 0x26]
ldrh r0, [r4, 0x30]
lsls r0, 24
lsrs r0, 24
adds r0, 0x4
strh r0, [r4, 0x30]
pop {r4}
pop {r0}
bx r0
.pool
thumb_func_end sub_81346DC
thumb_func_start sub_813473C
sub_813473C: @ 813473C
push {lr}
adds r3, r0, 0
ldr r2, =gTasks
movs r0, 0x2E
ldrsh r1, [r3, r0]
lsls r0, r1, 2
adds r0, r1
lsls r0, 3
adds r0, r2
movs r2, 0x8
ldrsh r1, [r0, r2]
movs r2, 0x30
ldrsh r0, [r3, r2]
cmp r1, r0
bne _08134768
adds r0, r3, 0
movs r1, 0x1
bl StartSpriteAnimIfDifferent
b _08134770
.pool
_08134768:
adds r0, r3, 0
movs r1, 0
bl StartSpriteAnimIfDifferent
_08134770:
pop {r0}
bx r0
thumb_func_end sub_813473C
thumb_func_start sub_8134774
sub_8134774: @ 8134774
push {lr}
adds r1, r0, 0
ldrh r2, [r1, 0x20]
movs r3, 0x20
ldrsh r0, [r1, r3]
cmp r0, 0x78
ble _08134786
subs r0, r2, 0x4
strh r0, [r1, 0x20]
_08134786:
ldrh r2, [r1, 0x20]
movs r3, 0x20
ldrsh r0, [r1, r3]
cmp r0, 0x77
bgt _08134794
adds r0, r2, 0x4
strh r0, [r1, 0x20]
_08134794:
ldrh r2, [r1, 0x22]
movs r3, 0x22
ldrsh r0, [r1, r3]
cmp r0, 0x40
ble _081347A2
subs r0, r2, 0x2
strh r0, [r1, 0x22]
_081347A2:
ldrh r2, [r1, 0x22]
movs r3, 0x22
ldrsh r0, [r1, r3]
cmp r0, 0x3F
bgt _081347B0
adds r0, r2, 0x2
strh r0, [r1, 0x22]
_081347B0:
pop {r0}
bx r0
thumb_func_end sub_8134774
.align 2, 0 @ Don't pad with nop.

View File

@ -13814,7 +13814,7 @@ _0807ED98:
movs r0, 0x32 movs r0, 0x32
strb r0, [r1] strb r0, [r1]
ldr r4, =gStringVar4 ldr r4, =gStringVar4
ldr r1, =gUnknown_082C8959 ldr r1, =gText_SavingDontTurnOffPower
_0807EDA6: _0807EDA6:
adds r0, r4, 0 adds r0, r4, 0
bl StringExpandPlaceholders bl StringExpandPlaceholders
@ -14668,7 +14668,7 @@ _0807F50A:
movs r1, 0x3 movs r1, 0x3
strb r1, [r0] strb r1, [r0]
ldr r4, =gStringVar4 ldr r4, =gStringVar4
ldr r1, =gUnknown_082C8959 ldr r1, =gText_SavingDontTurnOffPower
adds r0, r4, 0 adds r0, r4, 0
bl StringExpandPlaceholders bl StringExpandPlaceholders
movs r0, 0 movs r0, 0

View File

@ -153,7 +153,7 @@ _081348FC:
movs r2, 0x20 movs r2, 0x20
bl LoadPalette bl LoadPalette
_08134906: _08134906:
bl sub_8098C64 bl GetOverworldTextboxPalettePtr
movs r1, 0xE0 movs r1, 0xE0
movs r2, 0x20 movs r2, 0x20
bl LoadPalette bl LoadPalette

View File

@ -1,44 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2, 0
gUnknown_0832C0D0:: @ 832C0D0
obj_tiles gUnknown_08C1F1C8, 0x1000, 0xd6ff
.align 2
gUnknown_0832C0D8:: @ 832C0D8
obj_tiles gUnknown_08C1F46C, 0x1000, 0xd701
.align 2
gUnknown_0832C0E0:: @ 832C0E0
obj_tiles gUnknown_08C1F5E8, 0x0800, 0xd6ff
.align 2
gUnknown_0832C0E8:: @ 832C0E8
obj_tiles gUnknown_08C1F5E8, 0x0800, 0xd700
.align 2
gUnknown_0832C0F0:: @ 832C0F0
obj_tiles gUnknown_08C1F76C, 0x0800, 0xd701
.align 2
gUnknown_0832C0F8:: @ 832C0F8
obj_tiles gUnknown_08C1F76C, 0x0800, 0xd702
.align 2
gUnknown_0832C100:: @ 832C100
obj_tiles gUnknown_08C1F8E8, 0x1000, 0xd70b
.align 2
gUnknown_0832C108:: @ 832C108
obj_tiles gUnknown_08C0237C, 0x0100, 0xd704
obj_tiles gUnknown_08C0237C, 0x0120, 0xd705
obj_tiles gUnknown_08C0237C, 0x0100, 0xd706
obj_tiles gUnknown_08C0237C, 0x0120, 0xd707
.align 2
gUnknown_0832C128:: @ 832C128
obj_pal gBattleInterface_BallStatusBarPal, 0xd6ff
obj_pal gBattleInterface_BallDisplayPal, 0xd704

View File

@ -1,167 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2, 0
gUnknown_083390D4:: @ 83390D4
.incbin "baserom.gba", 0x3390d4, 0x20
gUnknown_083390F4:: @ 83390F4
.incbin "baserom.gba", 0x3390f4, 0x400
gUnknown_083394F4:: @ 83394F4
.incbin "baserom.gba", 0x3394f4, 0x246
gUnknown_0833973A:: @ 833973A
.incbin "baserom.gba", 0x33973a, 0x61
gUnknown_0833979B:: @ 833979B
.incbin "baserom.gba", 0x33979b, 0x2
gUnknown_0833979D:: @ 833979D
.incbin "baserom.gba", 0x33979d, 0x33
gUnknown_083397D0:: @ 83397D0
.incbin "baserom.gba", 0x3397d0, 0x4a
gUnknown_0833981A:: @ 833981A
.incbin "baserom.gba", 0x33981a, 0x17
gUnknown_08339831:: @ 8339831
.incbin "baserom.gba", 0x339831, 0x27
gUnknown_08339858:: @ 8339858
.incbin "baserom.gba", 0x339858, 0x3e
gUnknown_08339896:: @ 8339896
.incbin "baserom.gba", 0x339896, 0x1a
gUnknown_083398B0:: @ 83398B0
.incbin "baserom.gba", 0x3398b0, 0x2d
gUnknown_083398DD:: @ 83398DD
.incbin "baserom.gba", 0x3398dd, 0x18
gUnknown_083398F5:: @ 83398F5
.incbin "baserom.gba", 0x3398f5, 0x1f
gUnknown_08339914:: @ 8339914
.incbin "baserom.gba", 0x339914, 0x7
gUnknown_0833991B:: @ 833991B
.incbin "baserom.gba", 0x33991b, 0x6
gUnknown_08339921:: @ 8339921
.incbin "baserom.gba", 0x339921, 0x7
gUnknown_08339928:: @ 8339928
.incbin "baserom.gba", 0x339928, 0x6
gUnknown_0833992E:: @ 833992E
.incbin "baserom.gba", 0x33992e, 0xe
gUnknown_0833993C:: @ 833993C
.incbin "baserom.gba", 0x33993c, 0x5
gUnknown_08339941:: @ 8339941
.incbin "baserom.gba", 0x339941, 0x2
gUnknown_08339943:: @ 8339943
.incbin "baserom.gba", 0x339943, 0x4
gUnknown_08339947:: @ 8339947
.incbin "baserom.gba", 0x339947, 0x8
gUnknown_0833994F:: @ 833994F
.incbin "baserom.gba", 0x33994f, 0xe
gUnknown_0833995D:: @ 833995D
.incbin "baserom.gba", 0x33995d, 0x13
gUnknown_08339970:: @ 8339970
.incbin "baserom.gba", 0x339970, 0x4
gUnknown_08339974:: @ 8339974
.incbin "baserom.gba", 0x339974, 0xc
gUnknown_08339980:: @ 8339980
.incbin "baserom.gba", 0x339980, 0x38
gUnknown_083399B8:: @ 83399B8
.incbin "baserom.gba", 0x3399b8, 0x8
gUnknown_083399C0:: @ 83399C0
.incbin "baserom.gba", 0x3399c0, 0x8
gUnknown_083399C8:: @ 83399C8
.incbin "baserom.gba", 0x3399c8, 0x8
gUnknown_083399D0:: @ 83399D0
.incbin "baserom.gba", 0x3399d0, 0xc
gUnknown_083399DC:: @ 83399DC
.incbin "baserom.gba", 0x3399dc, 0x8
gUnknown_083399E4:: @ 83399E4
.incbin "baserom.gba", 0x3399e4, 0x3
gUnknown_083399E7:: @ 83399E7
.incbin "baserom.gba", 0x3399e7, 0x5
gUnknown_083399EC:: @ 83399EC
.incbin "baserom.gba", 0x3399ec, 0xd4
gUnknown_08339AC0:: @ 8339AC0
.incbin "baserom.gba", 0x339ac0, 0x8
gUnknown_08339AC8:: @ 8339AC8
.incbin "baserom.gba", 0x339ac8, 0x8
gUnknown_08339AD0:: @ 8339AD0
.incbin "baserom.gba", 0x339ad0, 0x8
gUnknown_08339AD8:: @ 8339AD8
.incbin "baserom.gba", 0x339ad8, 0x60
gUnknown_08339B38:: @ 8339B38
.incbin "baserom.gba", 0x339b38, 0x8
gUnknown_08339B40:: @ 8339B40
.incbin "baserom.gba", 0x339b40, 0x98
gUnknown_08339BD8:: @ 8339BD8
.incbin "baserom.gba", 0x339bd8, 0x8
gUnknown_08339BE0:: @ 8339BE0
.incbin "baserom.gba", 0x339be0, 0x44
gUnknown_08339C24:: @ 8339C24
.incbin "baserom.gba", 0x339c24, 0x8
gUnknown_08339C2C:: @ 8339C2C
.incbin "baserom.gba", 0x339c2c, 0x2c
gUnknown_08339C58:: @ 8339C58
.incbin "baserom.gba", 0x339c58, 0x8
gUnknown_08339C60:: @ 8339C60
.incbin "baserom.gba", 0x339c60, 0x18
gUnknown_08339C78:: @ 8339C78
.incbin "baserom.gba", 0x339c78, 0x28
gUnknown_08339CA0:: @ 8339CA0
.incbin "baserom.gba", 0x339ca0, 0x1e
gUnknown_08339CBE:: @ 8339CBE
.incbin "baserom.gba", 0x339cbe, 0x5
gUnknown_08339CC3:: @ 8339CC3
.incbin "baserom.gba", 0x339cc3, 0x5
gUnknown_08339CC8:: @ 8339CC8
.incbin "baserom.gba", 0x339cc8, 0x4c
gUnknown_08339D14:: @ 8339D14
.incbin "baserom.gba", 0x339d14, 0x8

View File

@ -4,7 +4,9 @@
.include "constants/constants.inc" .include "constants/constants.inc"
.section .rodata .section .rodata
.align 2
gUnknown_085B09E4:: @ 85B09E4 gUnknown_085B09E4:: @ 85B09E4
.incbin "baserom.gba", 0x5b09e4, 0x10 .incbin "baserom.gba", 0x5b09e4, 0x10
@ -14,889 +16,3 @@ gUnknown_085B09F4:: @ 85B09F4
gUnknown_085B09F8:: @ 85B09F8 gUnknown_085B09F8:: @ 85B09F8
.incbin "baserom.gba", 0x5b09f8, 0x8 .incbin "baserom.gba", 0x5b09f8, 0x8
gBirchBagGrassPal:: @ 85B0A00
.incbin "baserom.gba", 0x5b0a00, 0x80
gBirchBagTilemap:: @ 85B0A80
.incbin "baserom.gba", 0x5b0a80, 0x18c
gBirchGrassTilemap:: @ 85B0C0C
.incbin "baserom.gba", 0x5b0c0c, 0x1f8
gBirchHelpGfx:: @ 85B0E04
.incbin "baserom.gba", 0x5b0e04, 0xfc8
gUnknown_085B1DCC:: @ 85B1DCC
.incbin "baserom.gba", 0x5b1dcc, 0x10
gUnknown_085B1DDC:: @ 85B1DDC
.incbin "baserom.gba", 0x5b1ddc, 0x8
gUnknown_085B1DE4:: @ 85B1DE4
.incbin "baserom.gba", 0x5b1de4, 0x8
gUnknown_085B1DEC:: @ 85B1DEC
.incbin "baserom.gba", 0x5b1dec, 0x6
gUnknown_085B1DF2:: @ 85B1DF2
.incbin "baserom.gba", 0x5b1df2, 0x6
gUnknown_085B1DF8:: @ 85B1DF8
.incbin "baserom.gba", 0x5b1df8, 0x8
gUnknown_085B1E00:: @ 85B1E00
.incbin "baserom.gba", 0x5b1e00, 0xc
gUnknown_085B1E0C:: @ 85B1E0C
.incbin "baserom.gba", 0x5b1e0c, 0x1c
gUnknown_085B1E28:: @ 85B1E28
.incbin "baserom.gba", 0x5b1e28, 0xa8
gUnknown_085B1ED0:: @ 85B1ED0
.incbin "baserom.gba", 0x5b1ed0, 0x8
gUnknown_085B1ED8:: @ 85B1ED8
.incbin "baserom.gba", 0x5b1ed8, 0x10
gUnknown_085B1EE8:: @ 85B1EE8
.incbin "baserom.gba", 0x5b1ee8, 0x10
gUnknown_085B1EF8:: @ 85B1EF8
.incbin "baserom.gba", 0x5b1ef8, 0x18
gUnknown_085B1F10:: @ 85B1F10
.incbin "baserom.gba", 0x5b1f10, 0x18
gUnknown_085B1F28:: @ 85B1F28
.incbin "baserom.gba", 0x5b1f28, 0x18
gUnknown_085B1F40:: @ 85B1F40
.incbin "baserom.gba", 0x5b1f40, 0x294
gUnknown_085B21D4:: @ 85B21D4
.incbin "baserom.gba", 0x5b21d4, 0x8
gUnknown_085B21DC:: @ 85B21DC
.incbin "baserom.gba", 0x5b21dc, 0x18
gUnknown_085B21F4:: @ 85B21F4
.incbin "baserom.gba", 0x5b21f4, 0x8
gUnknown_085B21FC:: @ 85B21FC
.incbin "baserom.gba", 0x5b21fc, 0xc
gUnknown_085B2208:: @ 85B2208
.incbin "baserom.gba", 0x5b2208, 0x10
gUnknown_085B2218:: @ 85B2218
.incbin "baserom.gba", 0x5b2218, 0x38
gUnknown_085B2250:: @ 85B2250
.incbin "baserom.gba", 0x5b2250, 0x18
gUnknown_085B2268:: @ 85B2268
.incbin "baserom.gba", 0x5b2268, 0x38
gUnknown_085B22A0:: @ 85B22A0
.incbin "baserom.gba", 0x5b22a0, 0x18
gUnknown_085B22B8:: @ 85B22B8
.incbin "baserom.gba", 0x5b22b8, 0x18
gUnknown_085B22D0:: @ 85B22D0
.incbin "baserom.gba", 0x5b22d0, 0x2d0
gPokeblockFlavorCompatibilityTable:: @ 85B25A0
.incbin "baserom.gba", 0x5b25a0, 0x80
gUnknown_085B2620:: @ 85B2620
.incbin "baserom.gba", 0x5b2620, 0xc
gPokeblockNames:: @ 85B262C
.incbin "baserom.gba", 0x5b262c, 0x3c
gUnknown_085B2668:: @ 85B2668
.incbin "baserom.gba", 0x5b2668, 0x30
gUnknown_085B2698:: @ 85B2698
.incbin "baserom.gba", 0x5b2698, 0x3
gUnknown_085B269B:: @ 85B269B
.incbin "baserom.gba", 0x5b269b, 0x2
gUnknown_085B269D:: @ 85B269D
.incbin "baserom.gba", 0x5b269d, 0x2
gUnknown_085B269F:: @ 85B269F
.incbin "baserom.gba", 0x5b269f, 0x5
gUnknown_085B26A4:: @ 85B26A4
.incbin "baserom.gba", 0x5b26a4, 0x4c
gUnknown_085B26F0:: @ 85B26F0
.incbin "baserom.gba", 0x5b26f0, 0x4
gUnknown_085B26F4:: @ 85B26F4
.incbin "baserom.gba", 0x5b26f4, 0x8
gUnknown_085B26FC:: @ 85B26FC
.incbin "baserom.gba", 0x5b26fc, 0x8
gUnknown_085B2704:: @ 85B2704
.incbin "baserom.gba", 0x5b2704, 0x18
gUnknown_085B271C:: @ 85B271C
.incbin "baserom.gba", 0x5b271c, 0x4
gUnknown_085B2720:: @ 85B2720
.incbin "baserom.gba", 0x5b2720, 0x28
gUnknown_085B2748:: @ 85B2748
.incbin "baserom.gba", 0x5b2748, 0x60
gUnknown_085B27A8:: @ 85B27A8
.incbin "baserom.gba", 0x5b27a8, 0x8
gUnknown_085B27B0:: @ 85B27B0
.incbin "baserom.gba", 0x5b27b0, 0x18
gUnknown_085B27C8:: @ 85B27C8
.incbin "baserom.gba", 0x5b27c8, 0x88
gUnknown_085B2850:: @ 85B2850
.incbin "baserom.gba", 0x5b2850, 0x20
gUnknown_085B2870:: @ 85B2870
.incbin "baserom.gba", 0x5b2870, 0x20
gUnknown_085B2890:: @ 85B2890
.incbin "baserom.gba", 0x5b2890, 0x10
gUnknown_085B28A0:: @ 85B28A0
.incbin "baserom.gba", 0x5b28a0, 0x10
gUnknown_085B28B0:: @ 85B28B0
.incbin "baserom.gba", 0x5b28b0, 0x1e0
gUnknown_085B2A90:: @ 85B2A90
.incbin "baserom.gba", 0x5b2a90, 0xb4
gUnknown_085B2B44:: @ 85B2B44
.incbin "baserom.gba", 0x5b2b44, 0x18
gUnknown_085B2B5C:: @ 85B2B5C
.incbin "baserom.gba", 0x5b2b5c, 0x4
gUnknown_085B2B60:: @ 85B2B60
.incbin "baserom.gba", 0x5b2b60, 0x8
gUnknown_085B2B68:: @ 85B2B68
.incbin "baserom.gba", 0x5b2b68, 0x10
gUnknown_085B2B78:: @ 85B2B78
.incbin "baserom.gba", 0x5b2b78, 0x6
gUnknown_085B2B7E:: @ 85B2B7E
.incbin "baserom.gba", 0x5b2b7e, 0xa
gUnknown_085B2B88:: @ 85B2B88
.incbin "baserom.gba", 0x5b2b88, 0xc
gUnknown_085B2B94:: @ 85B2B94
.incbin "baserom.gba", 0x5b2b94, 0xc
gUnknown_085B2BA0:: @ 85B2BA0
.incbin "baserom.gba", 0x5b2ba0, 0xc
gUnknown_085B2BAC:: @ 85B2BAC
.incbin "baserom.gba", 0x5b2bac, 0x8
gUnknown_085B2BB4:: @ 85B2BB4
.incbin "baserom.gba", 0x5b2bb4, 0x40
gUnknown_085B2BF4:: @ 85B2BF4
.incbin "baserom.gba", 0x5b2bf4, 0x12
gUnknown_085B2C06:: @ 85B2C06
.incbin "baserom.gba", 0x5b2c06, 0x12
gUnknown_085B2C18:: @ 85B2C18
.incbin "baserom.gba", 0x5b2c18, 0x9
gUnknown_085B2C21:: @ 85B2C21
.incbin "baserom.gba", 0x5b2c21, 0x9
gUnknown_085B2C2A:: @ 85B2C2A
.incbin "baserom.gba", 0x5b2c2a, 0x26
gUnknown_085B2C50:: @ 85B2C50
.incbin "baserom.gba", 0x5b2c50, 0x78
gUnknown_085B2CC8:: @ 85B2CC8
.incbin "baserom.gba", 0x5b2cc8, 0x14
gUnknown_085B2CDC:: @ 85B2CDC
.incbin "baserom.gba", 0x5b2cdc, 0x14
gUnknown_085B2CF0:: @ 85B2CF0
.incbin "baserom.gba", 0x5b2cf0, 0x340
gUnknown_085B3030:: @ 85B3030
.incbin "baserom.gba", 0x5b3030, 0x10
gUnknown_085B3040:: @ 85B3040
.incbin "baserom.gba", 0x5b3040, 0x64
gUnknown_085B30A4:: @ 85B30A4
.incbin "baserom.gba", 0x5b30a4, 0x30
gUnknown_085B30D4:: @ 85B30D4
.incbin "baserom.gba", 0x5b30d4, 0x30
gUnknown_085B3104:: @ 85B3104
.incbin "baserom.gba", 0x5b3104, 0x18
gUnknown_085B311C:: @ 85B311C
.incbin "baserom.gba", 0x5b311c, 0x8
gUnknown_085B3124:: @ 85B3124
.incbin "baserom.gba", 0x5b3124, 0x8
gUnknown_085B312C:: @ 85B312C
.incbin "baserom.gba", 0x5b312c, 0x16
gUnknown_085B3142:: @ 85B3142
.incbin "baserom.gba", 0x5b3142, 0xc
gUnknown_085B314E:: @ 85B314E
.incbin "baserom.gba", 0x5b314e, 0xe
gUnknown_085B315C:: @ 85B315C
.incbin "baserom.gba", 0x5b315c, 0x14
gUnknown_085B3170:: @ 85B3170
.incbin "baserom.gba", 0x5b3170, 0x2c
gUnknown_085B319C:: @ 85B319C
.incbin "baserom.gba", 0x5b319c, 0x18
gUnknown_085B31B4:: @ 85B31B4
.incbin "baserom.gba", 0x5b31b4, 0x1c
gUnknown_085B31D0:: @ 85B31D0
.incbin "baserom.gba", 0x5b31d0, 0x28
gUnknown_085B31F8:: @ 85B31F8
.incbin "baserom.gba", 0x5b31f8, 0x14
gUnknown_085B320C:: @ 85B320C
.incbin "baserom.gba", 0x5b320c, 0x14
gUnknown_085B3220:: @ 85B3220
.incbin "baserom.gba", 0x5b3220, 0x8
gUnknown_085B3228:: @ 85B3228
.incbin "baserom.gba", 0x5b3228, 0x2c
gUnknown_085B3254:: @ 85B3254
.incbin "baserom.gba", 0x5b3254, 0x2c
gUnknown_085B3280:: @ 85B3280
.incbin "baserom.gba", 0x5b3280, 0x160
gUnknown_085B33E0:: @ 85B33E0
.incbin "baserom.gba", 0x5b33e0, 0x16
gUnknown_085B33F6:: @ 85B33F6
.incbin "baserom.gba", 0x5b33f6, 0xa
gUnknown_085B3400:: @ 85B3400
.incbin "baserom.gba", 0x5b3400, 0x10
gUnknown_085B3410:: @ 85B3410
.incbin "baserom.gba", 0x5b3410, 0x10
gUnknown_085B3420:: @ 85B3420
.incbin "baserom.gba", 0x5b3420, 0x24
gUnknown_085B3444:: @ 85B3444
.incbin "baserom.gba", 0x5b3444, 0x2c
gUnknown_085B3470:: @ 85B3470
.incbin "baserom.gba", 0x5b3470, 0x4
gUnknown_085B3474:: @ 85B3474
.incbin "baserom.gba", 0x5b3474, 0x8
gUnknown_085B347C:: @ 85B347C
.incbin "baserom.gba", 0x5b347c, 0x8
gUnknown_085B3484:: @ 85B3484
.incbin "baserom.gba", 0x5b3484, 0xc0
gUnknown_085B3544:: @ 85B3544
.incbin "baserom.gba", 0x5b3544, 0x20
gUnknown_085B3564:: @ 85B3564
.incbin "baserom.gba", 0x5b3564, 0x800
gUnknown_085B3D64:: @ 85B3D64
.incbin "baserom.gba", 0x5b3d64, 0x8
gUnknown_085B3D6C:: @ 85B3D6C
.incbin "baserom.gba", 0x5b3d6c, 0x10
gUnknown_085B3D7C:: @ 85B3D7C
.incbin "baserom.gba", 0x5b3d7c, 0x8
gUnknown_085B3D84:: @ 85B3D84
.incbin "baserom.gba", 0x5b3d84, 0x8
gUnknown_085B3D8C:: @ 85B3D8C
.incbin "baserom.gba", 0x5b3d8c, 0x8
gUnknown_085B3D94:: @ 85B3D94
.incbin "baserom.gba", 0x5b3d94, 0x20
gUnknown_085B3DB4:: @ 85B3DB4
.incbin "baserom.gba", 0x5b3db4, 0x134
gUnknown_085B3EE8:: @ 85B3EE8
.incbin "baserom.gba", 0x5b3ee8, 0x2
gUnknown_085B3EEA:: @ 85B3EEA
.incbin "baserom.gba", 0x5b3eea, 0x6
gUnknown_085B3EF0:: @ 85B3EF0
.incbin "baserom.gba", 0x5b3ef0, 0xc
gUnknown_085B3EFC:: @ 85B3EFC
.incbin "baserom.gba", 0x5b3efc, 0x1c
gUnknown_085B3F18:: @ 85B3F18
.incbin "baserom.gba", 0x5b3f18, 0x100
gUnknown_085B4018:: @ 85B4018
.incbin "baserom.gba", 0x5b4018, 0x4
gUnknown_085B401C:: @ 85B401C
.incbin "baserom.gba", 0x5b401c, 0x8
gUnknown_085B4024:: @ 85B4024
.incbin "baserom.gba", 0x5b4024, 0x10
gUnknown_085B4034:: @ 85B4034
.incbin "baserom.gba", 0x5b4034, 0xb8
gUnknown_085B40EC:: @ 85B40EC
.incbin "baserom.gba", 0x5b40ec, 0x10
gUnknown_085B40FC:: @ 85B40FC
.incbin "baserom.gba", 0x5b40fc, 0x38
gUnknown_085B4134:: @ 85B4134
.incbin "baserom.gba", 0x5b4134, 0x6f8
gUnknown_085B482C:: @ 85B482C
.incbin "baserom.gba", 0x5b482c, 0x4e4
gUnknown_085B4D10:: @ 85B4D10
.incbin "baserom.gba", 0x5b4d10, 0x4d4
gUnknown_085B51E4:: @ 85B51E4
.incbin "baserom.gba", 0x5b51e4, 0x6a0
gUnknown_085B5884:: @ 85B5884
.incbin "baserom.gba", 0x5b5884, 0x40
gText_ShedinjaJapaneseName2:: @ 85B58C4
.incbin "baserom.gba", 0x5b58c4, 0x5
gUnknown_085B58C9:: @ 85B58C9
.incbin "baserom.gba", 0x5b58c9, 0x10
gUnknown_085B58D9:: @ 85B58D9
.incbin "baserom.gba", 0x5b58d9, 0x323
gUnknown_085B5BFC:: @ 85B5BFC
.incbin "baserom.gba", 0x5b5bfc, 0x200
gUnknown_085B5DFC:: @ 85B5DFC
.incbin "baserom.gba", 0x5b5dfc, 0x1a4
gUnknown_085B5FA0:: @ 85B5FA0
.incbin "baserom.gba", 0x5b5fa0, 0x1a0
gUnknown_085B6140:: @ 85B6140
.incbin "baserom.gba", 0x5b6140, 0xc
gUnknown_085B614C:: @ 85B614C
.incbin "baserom.gba", 0x5b614c, 0x8
gUnknown_085B6154:: @ 85B6154
.incbin "baserom.gba", 0x5b6154, 0xc
gUnknown_085B6160:: @ 85B6160
.incbin "baserom.gba", 0x5b6160, 0x184
gUnknown_085B62E4:: @ 85B62E4
.incbin "baserom.gba", 0x5b62e4, 0x4
gUnknown_085B62E8:: @ 85B62E8
.incbin "baserom.gba", 0x5b62e8, 0x5c
gUnknown_085B6344:: @ 85B6344
.incbin "baserom.gba", 0x5b6344, 0x4
gUnknown_085B6348:: @ 85B6348
.incbin "baserom.gba", 0x5b6348, 0x40
gUnknown_085B6388:: @ 85B6388
.incbin "baserom.gba", 0x5b6388, 0x68
gUnknown_085B63F0:: @ 85B63F0
.incbin "baserom.gba", 0x5b63f0, 0x18
gUnknown_085B6408:: @ 85B6408
.incbin "baserom.gba", 0x5b6408, 0x8
gUnknown_085B6410:: @ 85B6410
.incbin "baserom.gba", 0x5b6410, 0x8
gUnknown_085B6418:: @ 85B6418
.incbin "baserom.gba", 0x5b6418, 0x6
gUnknown_085B641E:: @ 85B641E
.incbin "baserom.gba", 0x5b641e, 0x4
gUnknown_085B6422:: @ 85B6422
.incbin "baserom.gba", 0x5b6422, 0xa
gUnknown_085B642C:: @ 85B642C
.incbin "baserom.gba", 0x5b642c, 0x10
gUnknown_085B643C:: @ 85B643C
.incbin "baserom.gba", 0x5b643c, 0xc
gUnknown_085B6448:: @ 85B6448
.incbin "baserom.gba", 0x5b6448, 0xf3c
gUnknown_085B7384:: @ 85B7384
.incbin "baserom.gba", 0x5b7384, 0x98
gUnknown_085B741C:: @ 85B741C
.incbin "baserom.gba", 0x5b741c, 0x6c
gUnknown_085B7488:: @ 85B7488
.incbin "baserom.gba", 0x5b7488, 0x8
gUnknown_085B7490:: @ 85B7490
.incbin "baserom.gba", 0x5b7490, 0x78
gUnknown_085B7508:: @ 85B7508
.incbin "baserom.gba", 0x5b7508, 0x60
gUnknown_085B7568:: @ 85B7568
.incbin "baserom.gba", 0x5b7568, 0x48
gUnknown_085B75B0:: @ 85B75B0
.incbin "baserom.gba", 0x5b75b0, 0x60
gUnknown_085B7610:: @ 85B7610
.incbin "baserom.gba", 0x5b7610, 0x140
gUnknown_085B7750:: @ 85B7750
.incbin "baserom.gba", 0x5b7750, 0x94
gUnknown_085B77E4:: @ 85B77E4
.incbin "baserom.gba", 0x5b77e4, 0x18
gUnknown_085B77FC:: @ 85B77FC
.incbin "baserom.gba", 0x5b77fc, 0x18
gUnknown_085B7814:: @ 85B7814
.incbin "baserom.gba", 0x5b7814, 0x18
gUnknown_085B782C:: @ 85B782C
.incbin "baserom.gba", 0x5b782c, 0x18
gUnknown_085B7844:: @ 85B7844
.incbin "baserom.gba", 0x5b7844, 0x20
gUnknown_085B7864:: @ 85B7864
.incbin "baserom.gba", 0x5b7864, 0xc4
gUnknown_085B7928:: @ 85B7928
.incbin "baserom.gba", 0x5b7928, 0x20
gUnknown_085B7948:: @ 85B7948
.incbin "baserom.gba", 0x5b7948, 0x8
gUnknown_085B7950:: @ 85B7950
.incbin "baserom.gba", 0x5b7950, 0x28
gUnknown_085B7978:: @ 85B7978
.incbin "baserom.gba", 0x5b7978, 0x80
gUnknown_085B79F8:: @ 85B79F8
.incbin "baserom.gba", 0x5b79f8, 0x18
gUnknown_085B7A10:: @ 85B7A10
.incbin "baserom.gba", 0x5b7a10, 0x30
gUnknown_085B7A40:: @ 85B7A40
.incbin "baserom.gba", 0x5b7a40, 0x7c
gUnknown_085B7ABC:: @ 85B7ABC
.incbin "baserom.gba", 0x5b7abc, 0x30
gUnknown_085B7AEC:: @ 85B7AEC
.incbin "baserom.gba", 0x5b7aec, 0x18
gUnknown_085B7B04:: @ 85B7B04
.incbin "baserom.gba", 0x5b7b04, 0x6
gUnknown_085B7B0A:: @ 85B7B0A
.incbin "baserom.gba", 0x5b7b0a, 0x8
gUnknown_085B7B12:: @ 85B7B12
.incbin "baserom.gba", 0x5b7b12, 0x8
gUnknown_085B7B1A:: @ 85B7B1A
.incbin "baserom.gba", 0x5b7b1a, 0x14
gUnknown_085B7B2E:: @ 85B7B2E
.incbin "baserom.gba", 0x5b7b2e, 0x18
gUnknown_085B7B46:: @ 85B7B46
.incbin "baserom.gba", 0x5b7b46, 0x2
gUnknown_085B7B48:: @ 85B7B48
.incbin "baserom.gba", 0x5b7b48, 0x8d0
gUnknown_085B8418:: @ 85B8418
.incbin "baserom.gba", 0x5b8418, 0x20
gUnknown_085B8438:: @ 85B8438
.incbin "baserom.gba", 0x5b8438, 0x338
gUnknown_085B8770:: @ 85B8770
.incbin "baserom.gba", 0x5b8770, 0x480
gUnknown_085B8BF0:: @ 85B8BF0
.incbin "baserom.gba", 0x5b8bf0, 0x20
gUnknown_085B8C10:: @ 85B8C10
.incbin "baserom.gba", 0x5b8c10, 0x20
gUnknown_085B8C30:: @ 85B8C30
.incbin "baserom.gba", 0x5b8c30, 0x2
gUnknown_085B8C32:: @ 85B8C32
.incbin "baserom.gba", 0x5b8c32, 0x36
gUnknown_085B8C68:: @ 85B8C68
.incbin "baserom.gba", 0x5b8c68, 0x18
gUnknown_085B8C80:: @ 85B8C80
.incbin "baserom.gba", 0x5b8c80, 0x10
gUnknown_085B8C90:: @ 85B8C90
.incbin "baserom.gba", 0x5b8c90, 0x528
gUnknown_085B91B8:: @ 85B91B8
.incbin "baserom.gba", 0x5b91b8, 0x178
gUnknown_085B9330:: @ 85B9330
.incbin "baserom.gba", 0x5b9330, 0x580
gUnknown_085B98B0:: @ 85B98B0
.incbin "baserom.gba", 0x5b98b0, 0x240
gUnknown_085B9AF0:: @ 85B9AF0
.incbin "baserom.gba", 0x5b9af0, 0x11e0
gUnknown_085BACD0:: @ 85BACD0
.incbin "baserom.gba", 0x5bacd0, 0x1e0
gUnknown_085BAEB0:: @ 85BAEB0
.incbin "baserom.gba", 0x5baeb0, 0x20
gUnknown_085BAED0:: @ 85BAED0
.incbin "baserom.gba", 0x5baed0, 0x378
gUnknown_085BB248:: @ 85BB248
.incbin "baserom.gba", 0x5bb248, 0x25c
gUnknown_085BB4A4:: @ 85BB4A4
.incbin "baserom.gba", 0x5bb4a4, 0x48c
gUnknown_085BB930:: @ 85BB930
.incbin "baserom.gba", 0x5bb930, 0x2e4
gUnknown_085BBC14:: @ 85BBC14
.incbin "baserom.gba", 0x5bbc14, 0x6a0
gUnknown_085BC2B4:: @ 85BC2B4
.incbin "baserom.gba", 0x5bc2b4, 0x20
gUnknown_085BC2D4:: @ 85BC2D4
.incbin "baserom.gba", 0x5bc2d4, 0x20
gUnknown_085BC2F4:: @ 85BC2F4
.incbin "baserom.gba", 0x5bc2f4, 0x20
gUnknown_085BC314:: @ 85BC314
.incbin "baserom.gba", 0x5bc314, 0x800
gUnknown_085BCB14:: @ 85BCB14
.incbin "baserom.gba", 0x5bcb14, 0x800
gUnknown_085BD314:: @ 85BD314
.incbin "baserom.gba", 0x5bd314, 0x820
gUnknown_085BDB34:: @ 85BDB34
.incbin "baserom.gba", 0x5bdb34, 0x6b4
gUnknown_085BE1E8:: @ 85BE1E8
.incbin "baserom.gba", 0x5be1e8, 0x334
gUnknown_085BE51C:: @ 85BE51C
.incbin "baserom.gba", 0x5be51c, 0x56c
gUnknown_085BEA88:: @ 85BEA88
.incbin "baserom.gba", 0x5bea88, 0x318
gUnknown_085BEDA0:: @ 85BEDA0
.incbin "baserom.gba", 0x5beda0, 0x140
gUnknown_085BEEE0:: @ 85BEEE0
.incbin "baserom.gba", 0x5beee0, 0x1c0
gUnknown_085BF0A0:: @ 85BF0A0
.incbin "baserom.gba", 0x5bf0a0, 0x200
gUnknown_085BF2A0:: @ 85BF2A0
.incbin "baserom.gba", 0x5bf2a0, 0x200
gUnknown_085BF4A0:: @ 85BF4A0
.incbin "baserom.gba", 0x5bf4a0, 0xa0
gUnknown_085BF540:: @ 85BF540
.incbin "baserom.gba", 0x5bf540, 0x160
gUnknown_085BF6A0:: @ 85BF6A0
.incbin "baserom.gba", 0x5bf6a0, 0x7540
gUnknown_085C6BE0:: @ 85C6BE0
.incbin "baserom.gba", 0x5c6be0, 0x1000
gUnknown_085C7BE0:: @ 85C7BE0
.incbin "baserom.gba", 0x5c7be0, 0x20
gUnknown_085C7C00:: @ 85C7C00
.incbin "baserom.gba", 0x5c7c00, 0x68c
gUnknown_085C828C:: @ 85C828C
.incbin "baserom.gba", 0x5c828c, 0x2ec
gUnknown_085C8578:: @ 85C8578
.incbin "baserom.gba", 0x5c8578, 0x20
gUnknown_085C8598:: @ 85C8598
.incbin "baserom.gba", 0x5c8598, 0x15c
gUnknown_085C86F4:: @ 85C86F4
.incbin "baserom.gba", 0x5c86f4, 0x100
gUnknown_085C87F4:: @ 85C87F4
.incbin "baserom.gba", 0x5c87f4, 0xb0
gUnknown_085C88A4:: @ 85C88A4
.incbin "baserom.gba", 0x5c88a4, 0x84
gUnknown_085C8928:: @ 85C8928
.incbin "baserom.gba", 0x5c8928, 0x20
gUnknown_085C8948:: @ 85C8948
.incbin "baserom.gba", 0x5c8948, 0xa8
gUnknown_085C89F0:: @ 85C89F0
.incbin "baserom.gba", 0x5c89f0, 0xa8
gUnknown_085C8A98:: @ 85C8A98
.incbin "baserom.gba", 0x5c8a98, 0x10
gUnknown_085C8AA8:: @ 85C8AA8
.incbin "baserom.gba", 0x5c8aa8, 0xc
gUnknown_085C8AB4:: @ 85C8AB4
.incbin "baserom.gba", 0x5c8ab4, 0x8
gUnknown_085C8ABC:: @ 85C8ABC
.incbin "baserom.gba", 0x5c8abc, 0x8
gUnknown_085C8AC4:: @ 85C8AC4
.incbin "baserom.gba", 0x5c8ac4, 0x1c
gUnknown_085C8AE0:: @ 85C8AE0
.incbin "baserom.gba", 0x5c8ae0, 0x1c
gUnknown_085C8AFC:: @ 85C8AFC
.incbin "baserom.gba", 0x5c8afc, 0x18
gUnknown_085C8B14:: @ 85C8B14
.incbin "baserom.gba", 0x5c8b14, 0x18
gUnknown_085C8B2C:: @ 85C8B2C
.incbin "baserom.gba", 0x5c8b2c, 0x18
gUnknown_085C8B44:: @ 85C8B44
.incbin "baserom.gba", 0x5c8b44, 0x18
gUnknown_085C8B5C:: @ 85C8B5C
.incbin "baserom.gba", 0x5c8b5c, 0x20
gUnknown_085C8B7C:: @ 85C8B7C
.incbin "baserom.gba", 0x5c8b7c, 0xc
gUnknown_085C8B88:: @ 85C8B88
.incbin "baserom.gba", 0x5c8b88, 0x4
gUnknown_085C8B8C:: @ 85C8B8C
.incbin "baserom.gba", 0x5c8b8c, 0xa
gUnknown_085C8B96:: @ 85C8B96
.incbin "baserom.gba", 0x5c8b96, 0x6
gUnknown_085C8B9C:: @ 85C8B9C
.incbin "baserom.gba", 0x5c8b9c, 0x1c
gUnknown_085C8BB8:: @ 85C8BB8
.incbin "baserom.gba", 0x5c8bb8, 0x8
gUnknown_085C8BC0:: @ 85C8BC0
.incbin "baserom.gba", 0x5c8bc0, 0xc
gUnknown_085C8BCC:: @ 85C8BCC
.incbin "baserom.gba", 0x5c8bcc, 0x28
gUnknown_085C8BF4:: @ 85C8BF4
.incbin "baserom.gba", 0x5c8bf4, 0x6
gUnknown_085C8BFA:: @ 85C8BFA
.incbin "baserom.gba", 0x5c8bfa, 0x14
gUnknown_085C8C0E:: @ 85C8C0E
.incbin "baserom.gba", 0x5c8c0e, 0x16
gUnknown_085C8C24:: @ 85C8C24
.incbin "baserom.gba", 0x5c8c24, 0x1c
gUnknown_085C8C40:: @ 85C8C40
.incbin "baserom.gba", 0x5c8c40, 0x4
gUnknown_085C8C44:: @ 85C8C44
.incbin "baserom.gba", 0x5c8c44, 0x4
gUnknown_085C8C48:: @ 85C8C48
.incbin "baserom.gba", 0x5c8c48, 0xc
gUnknown_085C8C54:: @ 85C8C54
.incbin "baserom.gba", 0x5c8c54, 0x10
gUnknown_085C8C64:: @ 85C8C64
.incbin "baserom.gba", 0x5c8c64, 0x2
gUnknown_085C8C66:: @ 85C8C66
.incbin "baserom.gba", 0x5c8c66, 0x6
gUnknown_085C8C6C:: @ 85C8C6C
.incbin "baserom.gba", 0x5c8c6c, 0xc
gUnknown_085C8C78:: @ 85C8C78
.incbin "baserom.gba", 0x5c8c78, 0x8
gUnknown_085C8C80:: @ 85C8C80
.incbin "baserom.gba", 0x5c8c80, 0x4
gUnknown_085C8C84:: @ 85C8C84
.incbin "baserom.gba", 0x5c8c84, 0xb4
gUnknown_085C8D38:: @ 85C8D38
.incbin "baserom.gba", 0x5c8d38, 0x8
gUnknown_085C8D40:: @ 85C8D40
.incbin "baserom.gba", 0x5c8d40, 0x20
gUnknown_085C8D60:: @ 85C8D60
.incbin "baserom.gba", 0x5c8d60, 0x2c
gUnknown_085C8D8C:: @ 85C8D8C
.incbin "baserom.gba", 0x5c8d8c, 0x14
gUnknown_085C8DA0:: @ 85C8DA0
.incbin "baserom.gba", 0x5c8da0, 0x10
gUnknown_085C8DB0:: @ 85C8DB0
.incbin "baserom.gba", 0x5c8db0, 0xc
gUnknown_085C8DBC:: @ 85C8DBC
.incbin "baserom.gba", 0x5c8dbc, 0x14
gUnknown_085C8DD0:: @ 85C8DD0
.incbin "baserom.gba", 0x5c8dd0, 0x46
gUnknown_085C8E16:: @ 85C8E16
.incbin "baserom.gba", 0x5c8e16, 0xe
gUnknown_085C8E24:: @ 85C8E24
.incbin "baserom.gba", 0x5c8e24, 0x44
gUnknown_085C8E68:: @ 85C8E68
.incbin "baserom.gba", 0x5c8e68, 0x6c
.align 2
gFieldEffectObjectPalette10:: @ 85C8ED4
.incbin "graphics/map_objects/palettes/field_effect_object_palette_10.gbapal"
.align 2
gFieldEffectObjectPaletteInfo10:: @ 85C8EF4
obj_pal gFieldEffectObjectPalette10, 0x1009
.incbin "baserom.gba", 0x5c8efc, 0xe0
gUnknown_085C8FDC:: @ 85C8FDC
.incbin "baserom.gba", 0x5c8fdc, 0x14
gUnknown_085C8FF0:: @ 85C8FF0
.incbin "baserom.gba", 0x5c8ff0, 0x30
gUnknown_085C9020:: @ 85C9020
.incbin "baserom.gba", 0x5c9020, 0x4b0
gUnknown_085C94D0:: @ 85C94D0
.incbin "baserom.gba", 0x5c94d0, 0x500
gUnknown_085C99D0:: @ 85C99D0
.incbin "baserom.gba", 0x5c99d0, 0x18
gUnknown_085C99E8:: @ 85C99E8
.incbin "baserom.gba", 0x5c99e8, 0x10
gUnknown_085C99F8:: @ 85C99F8
.incbin "baserom.gba", 0x5c99f8, 0x10
gUnknown_085C9A08:: @ 85C9A08
.incbin "baserom.gba", 0x5c9a08, 0x14
gUnknown_085C9A1C:: @ 85C9A1C
.incbin "baserom.gba", 0x5c9a1c, 0x14
gUnknown_085C9A30:: @ 85C9A30
.incbin "baserom.gba", 0x5c9a30, 0x23
gUnknown_085C9A53:: @ 85C9A53
.incbin "baserom.gba", 0x5c9a53, 0x41

833
data/data4c.s Normal file
View File

@ -0,0 +1,833 @@
@ the fourth big chunk of data
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
gUnknown_085B21D4:: @ 85B21D4
.incbin "baserom.gba", 0x5b21d4, 0x8
gUnknown_085B21DC:: @ 85B21DC
.incbin "baserom.gba", 0x5b21dc, 0x18
gUnknown_085B21F4:: @ 85B21F4
.incbin "baserom.gba", 0x5b21f4, 0x8
gUnknown_085B21FC:: @ 85B21FC
.incbin "baserom.gba", 0x5b21fc, 0xc
gUnknown_085B2208:: @ 85B2208
.incbin "baserom.gba", 0x5b2208, 0x10
gUnknown_085B2218:: @ 85B2218
.incbin "baserom.gba", 0x5b2218, 0x38
gUnknown_085B2250:: @ 85B2250
.incbin "baserom.gba", 0x5b2250, 0x18
gUnknown_085B2268:: @ 85B2268
.incbin "baserom.gba", 0x5b2268, 0x38
gUnknown_085B22A0:: @ 85B22A0
.incbin "baserom.gba", 0x5b22a0, 0x18
gUnknown_085B22B8:: @ 85B22B8
.incbin "baserom.gba", 0x5b22b8, 0x18
gUnknown_085B22D0:: @ 85B22D0
.incbin "baserom.gba", 0x5b22d0, 0x2d0
gPokeblockFlavorCompatibilityTable:: @ 85B25A0
.incbin "baserom.gba", 0x5b25a0, 0x80
gUnknown_085B2620:: @ 85B2620
.incbin "baserom.gba", 0x5b2620, 0xc
gPokeblockNames:: @ 85B262C
.incbin "baserom.gba", 0x5b262c, 0x3c
gUnknown_085B2668:: @ 85B2668
.incbin "baserom.gba", 0x5b2668, 0x30
gUnknown_085B2698:: @ 85B2698
.incbin "baserom.gba", 0x5b2698, 0x3
gUnknown_085B269B:: @ 85B269B
.incbin "baserom.gba", 0x5b269b, 0x2
gUnknown_085B269D:: @ 85B269D
.incbin "baserom.gba", 0x5b269d, 0x2
gUnknown_085B269F:: @ 85B269F
.incbin "baserom.gba", 0x5b269f, 0x5
gUnknown_085B26A4:: @ 85B26A4
.incbin "baserom.gba", 0x5b26a4, 0x4c
gUnknown_085B26F0:: @ 85B26F0
.incbin "baserom.gba", 0x5b26f0, 0x4
gUnknown_085B26F4:: @ 85B26F4
.incbin "baserom.gba", 0x5b26f4, 0x8
gUnknown_085B26FC:: @ 85B26FC
.incbin "baserom.gba", 0x5b26fc, 0x8
gUnknown_085B2704:: @ 85B2704
.incbin "baserom.gba", 0x5b2704, 0x18
gUnknown_085B271C:: @ 85B271C
.incbin "baserom.gba", 0x5b271c, 0x4
gUnknown_085B2720:: @ 85B2720
.incbin "baserom.gba", 0x5b2720, 0x28
gUnknown_085B2748:: @ 85B2748
.incbin "baserom.gba", 0x5b2748, 0x60
gUnknown_085B27A8:: @ 85B27A8
.incbin "baserom.gba", 0x5b27a8, 0x8
gUnknown_085B27B0:: @ 85B27B0
.incbin "baserom.gba", 0x5b27b0, 0x18
gUnknown_085B27C8:: @ 85B27C8
.incbin "baserom.gba", 0x5b27c8, 0x88
gUnknown_085B2850:: @ 85B2850
.incbin "baserom.gba", 0x5b2850, 0x20
gUnknown_085B2870:: @ 85B2870
.incbin "baserom.gba", 0x5b2870, 0x20
gUnknown_085B2890:: @ 85B2890
.incbin "baserom.gba", 0x5b2890, 0x10
gUnknown_085B28A0:: @ 85B28A0
.incbin "baserom.gba", 0x5b28a0, 0x10
gUnknown_085B28B0:: @ 85B28B0
.incbin "baserom.gba", 0x5b28b0, 0x1e0
gUnknown_085B2A90:: @ 85B2A90
.incbin "baserom.gba", 0x5b2a90, 0xb4
gUnknown_085B2B44:: @ 85B2B44
.incbin "baserom.gba", 0x5b2b44, 0x18
gUnknown_085B2B5C:: @ 85B2B5C
.incbin "baserom.gba", 0x5b2b5c, 0x4
gUnknown_085B2B60:: @ 85B2B60
.incbin "baserom.gba", 0x5b2b60, 0x8
gUnknown_085B2B68:: @ 85B2B68
.incbin "baserom.gba", 0x5b2b68, 0x10
gUnknown_085B2B78:: @ 85B2B78
.incbin "baserom.gba", 0x5b2b78, 0x6
gUnknown_085B2B7E:: @ 85B2B7E
.incbin "baserom.gba", 0x5b2b7e, 0xa
gUnknown_085B2B88:: @ 85B2B88
.incbin "baserom.gba", 0x5b2b88, 0xc
gUnknown_085B2B94:: @ 85B2B94
.incbin "baserom.gba", 0x5b2b94, 0xc
gUnknown_085B2BA0:: @ 85B2BA0
.incbin "baserom.gba", 0x5b2ba0, 0xc
gUnknown_085B2BAC:: @ 85B2BAC
.incbin "baserom.gba", 0x5b2bac, 0x8
gUnknown_085B2BB4:: @ 85B2BB4
.incbin "baserom.gba", 0x5b2bb4, 0x40
gUnknown_085B2BF4:: @ 85B2BF4
.incbin "baserom.gba", 0x5b2bf4, 0x12
gUnknown_085B2C06:: @ 85B2C06
.incbin "baserom.gba", 0x5b2c06, 0x12
gUnknown_085B2C18:: @ 85B2C18
.incbin "baserom.gba", 0x5b2c18, 0x9
gUnknown_085B2C21:: @ 85B2C21
.incbin "baserom.gba", 0x5b2c21, 0x9
gUnknown_085B2C2A:: @ 85B2C2A
.incbin "baserom.gba", 0x5b2c2a, 0x26
gUnknown_085B2C50:: @ 85B2C50
.incbin "baserom.gba", 0x5b2c50, 0x78
gUnknown_085B2CC8:: @ 85B2CC8
.incbin "baserom.gba", 0x5b2cc8, 0x14
gUnknown_085B2CDC:: @ 85B2CDC
.incbin "baserom.gba", 0x5b2cdc, 0x14
gUnknown_085B2CF0:: @ 85B2CF0
.incbin "baserom.gba", 0x5b2cf0, 0x340
gUnknown_085B3030:: @ 85B3030
.incbin "baserom.gba", 0x5b3030, 0x10
gUnknown_085B3040:: @ 85B3040
.incbin "baserom.gba", 0x5b3040, 0x64
gUnknown_085B30A4:: @ 85B30A4
.incbin "baserom.gba", 0x5b30a4, 0x30
gUnknown_085B30D4:: @ 85B30D4
.incbin "baserom.gba", 0x5b30d4, 0x30
gUnknown_085B3104:: @ 85B3104
.incbin "baserom.gba", 0x5b3104, 0x18
gUnknown_085B311C:: @ 85B311C
.incbin "baserom.gba", 0x5b311c, 0x8
gUnknown_085B3124:: @ 85B3124
.incbin "baserom.gba", 0x5b3124, 0x8
gUnknown_085B312C:: @ 85B312C
.incbin "baserom.gba", 0x5b312c, 0x16
gUnknown_085B3142:: @ 85B3142
.incbin "baserom.gba", 0x5b3142, 0xc
gUnknown_085B314E:: @ 85B314E
.incbin "baserom.gba", 0x5b314e, 0xe
gUnknown_085B315C:: @ 85B315C
.incbin "baserom.gba", 0x5b315c, 0x14
gUnknown_085B3170:: @ 85B3170
.incbin "baserom.gba", 0x5b3170, 0x2c
gUnknown_085B319C:: @ 85B319C
.incbin "baserom.gba", 0x5b319c, 0x18
gUnknown_085B31B4:: @ 85B31B4
.incbin "baserom.gba", 0x5b31b4, 0x1c
gUnknown_085B31D0:: @ 85B31D0
.incbin "baserom.gba", 0x5b31d0, 0x28
gUnknown_085B31F8:: @ 85B31F8
.incbin "baserom.gba", 0x5b31f8, 0x14
gUnknown_085B320C:: @ 85B320C
.incbin "baserom.gba", 0x5b320c, 0x14
gUnknown_085B3220:: @ 85B3220
.incbin "baserom.gba", 0x5b3220, 0x8
gUnknown_085B3228:: @ 85B3228
.incbin "baserom.gba", 0x5b3228, 0x2c
gUnknown_085B3254:: @ 85B3254
.incbin "baserom.gba", 0x5b3254, 0x2c
gUnknown_085B3280:: @ 85B3280
.incbin "baserom.gba", 0x5b3280, 0x160
gUnknown_085B33E0:: @ 85B33E0
.incbin "baserom.gba", 0x5b33e0, 0x16
gUnknown_085B33F6:: @ 85B33F6
.incbin "baserom.gba", 0x5b33f6, 0xa
gUnknown_085B3400:: @ 85B3400
.incbin "baserom.gba", 0x5b3400, 0x10
gUnknown_085B3410:: @ 85B3410
.incbin "baserom.gba", 0x5b3410, 0x10
gUnknown_085B3420:: @ 85B3420
.incbin "baserom.gba", 0x5b3420, 0x24
gUnknown_085B3444:: @ 85B3444
.incbin "baserom.gba", 0x5b3444, 0x2c
gUnknown_085B3470:: @ 85B3470
.incbin "baserom.gba", 0x5b3470, 0x4
gUnknown_085B3474:: @ 85B3474
.incbin "baserom.gba", 0x5b3474, 0x8
gUnknown_085B347C:: @ 85B347C
.incbin "baserom.gba", 0x5b347c, 0x8
gUnknown_085B3484:: @ 85B3484
.incbin "baserom.gba", 0x5b3484, 0xc0
gUnknown_085B3544:: @ 85B3544
.incbin "baserom.gba", 0x5b3544, 0x20
gUnknown_085B3564:: @ 85B3564
.incbin "baserom.gba", 0x5b3564, 0x800
gUnknown_085B3D64:: @ 85B3D64
.incbin "baserom.gba", 0x5b3d64, 0x8
gUnknown_085B3D6C:: @ 85B3D6C
.incbin "baserom.gba", 0x5b3d6c, 0x10
gUnknown_085B3D7C:: @ 85B3D7C
.incbin "baserom.gba", 0x5b3d7c, 0x8
gUnknown_085B3D84:: @ 85B3D84
.incbin "baserom.gba", 0x5b3d84, 0x8
gUnknown_085B3D8C:: @ 85B3D8C
.incbin "baserom.gba", 0x5b3d8c, 0x8
gUnknown_085B3D94:: @ 85B3D94
.incbin "baserom.gba", 0x5b3d94, 0x20
gUnknown_085B3DB4:: @ 85B3DB4
.incbin "baserom.gba", 0x5b3db4, 0x134
gUnknown_085B3EE8:: @ 85B3EE8
.incbin "baserom.gba", 0x5b3ee8, 0x2
gUnknown_085B3EEA:: @ 85B3EEA
.incbin "baserom.gba", 0x5b3eea, 0x6
gUnknown_085B3EF0:: @ 85B3EF0
.incbin "baserom.gba", 0x5b3ef0, 0xc
gUnknown_085B3EFC:: @ 85B3EFC
.incbin "baserom.gba", 0x5b3efc, 0x1c
gUnknown_085B3F18:: @ 85B3F18
.incbin "baserom.gba", 0x5b3f18, 0x100
gUnknown_085B4018:: @ 85B4018
.incbin "baserom.gba", 0x5b4018, 0x4
gUnknown_085B401C:: @ 85B401C
.incbin "baserom.gba", 0x5b401c, 0x8
gUnknown_085B4024:: @ 85B4024
.incbin "baserom.gba", 0x5b4024, 0x10
gUnknown_085B4034:: @ 85B4034
.incbin "baserom.gba", 0x5b4034, 0xb8
gUnknown_085B40EC:: @ 85B40EC
.incbin "baserom.gba", 0x5b40ec, 0x10
gUnknown_085B40FC:: @ 85B40FC
.incbin "baserom.gba", 0x5b40fc, 0x38
gUnknown_085B4134:: @ 85B4134
.incbin "baserom.gba", 0x5b4134, 0x6f8
gUnknown_085B482C:: @ 85B482C
.incbin "baserom.gba", 0x5b482c, 0x4e4
gUnknown_085B4D10:: @ 85B4D10
.incbin "baserom.gba", 0x5b4d10, 0x4d4
gUnknown_085B51E4:: @ 85B51E4
.incbin "baserom.gba", 0x5b51e4, 0x6a0
gUnknown_085B5884:: @ 85B5884
.incbin "baserom.gba", 0x5b5884, 0x40
gText_ShedinjaJapaneseName2:: @ 85B58C4
.incbin "baserom.gba", 0x5b58c4, 0x5
gUnknown_085B58C9:: @ 85B58C9
.incbin "baserom.gba", 0x5b58c9, 0x10
gUnknown_085B58D9:: @ 85B58D9
.incbin "baserom.gba", 0x5b58d9, 0x323
gUnknown_085B5BFC:: @ 85B5BFC
.incbin "baserom.gba", 0x5b5bfc, 0x200
gUnknown_085B5DFC:: @ 85B5DFC
.incbin "baserom.gba", 0x5b5dfc, 0x1a4
gUnknown_085B5FA0:: @ 85B5FA0
.incbin "baserom.gba", 0x5b5fa0, 0x1a0
gUnknown_085B6140:: @ 85B6140
.incbin "baserom.gba", 0x5b6140, 0xc
gUnknown_085B614C:: @ 85B614C
.incbin "baserom.gba", 0x5b614c, 0x8
gUnknown_085B6154:: @ 85B6154
.incbin "baserom.gba", 0x5b6154, 0xc
gUnknown_085B6160:: @ 85B6160
.incbin "baserom.gba", 0x5b6160, 0x184
gUnknown_085B62E4:: @ 85B62E4
.incbin "baserom.gba", 0x5b62e4, 0x4
gUnknown_085B62E8:: @ 85B62E8
.incbin "baserom.gba", 0x5b62e8, 0x5c
gUnknown_085B6344:: @ 85B6344
.incbin "baserom.gba", 0x5b6344, 0x4
gUnknown_085B6348:: @ 85B6348
.incbin "baserom.gba", 0x5b6348, 0x40
gUnknown_085B6388:: @ 85B6388
.incbin "baserom.gba", 0x5b6388, 0x68
gUnknown_085B63F0:: @ 85B63F0
.incbin "baserom.gba", 0x5b63f0, 0x18
gUnknown_085B6408:: @ 85B6408
.incbin "baserom.gba", 0x5b6408, 0x8
gUnknown_085B6410:: @ 85B6410
.incbin "baserom.gba", 0x5b6410, 0x8
gUnknown_085B6418:: @ 85B6418
.incbin "baserom.gba", 0x5b6418, 0x6
gUnknown_085B641E:: @ 85B641E
.incbin "baserom.gba", 0x5b641e, 0x4
gUnknown_085B6422:: @ 85B6422
.incbin "baserom.gba", 0x5b6422, 0xa
gUnknown_085B642C:: @ 85B642C
.incbin "baserom.gba", 0x5b642c, 0x10
gUnknown_085B643C:: @ 85B643C
.incbin "baserom.gba", 0x5b643c, 0xc
gUnknown_085B6448:: @ 85B6448
.incbin "baserom.gba", 0x5b6448, 0xf3c
gUnknown_085B7384:: @ 85B7384
.incbin "baserom.gba", 0x5b7384, 0x98
gUnknown_085B741C:: @ 85B741C
.incbin "baserom.gba", 0x5b741c, 0x6c
gUnknown_085B7488:: @ 85B7488
.incbin "baserom.gba", 0x5b7488, 0x8
gUnknown_085B7490:: @ 85B7490
.incbin "baserom.gba", 0x5b7490, 0x78
gUnknown_085B7508:: @ 85B7508
.incbin "baserom.gba", 0x5b7508, 0x60
gUnknown_085B7568:: @ 85B7568
.incbin "baserom.gba", 0x5b7568, 0x48
gUnknown_085B75B0:: @ 85B75B0
.incbin "baserom.gba", 0x5b75b0, 0x60
gUnknown_085B7610:: @ 85B7610
.incbin "baserom.gba", 0x5b7610, 0x140
gUnknown_085B7750:: @ 85B7750
.incbin "baserom.gba", 0x5b7750, 0x94
gUnknown_085B77E4:: @ 85B77E4
.incbin "baserom.gba", 0x5b77e4, 0x18
gUnknown_085B77FC:: @ 85B77FC
.incbin "baserom.gba", 0x5b77fc, 0x18
gUnknown_085B7814:: @ 85B7814
.incbin "baserom.gba", 0x5b7814, 0x18
gUnknown_085B782C:: @ 85B782C
.incbin "baserom.gba", 0x5b782c, 0x18
gUnknown_085B7844:: @ 85B7844
.incbin "baserom.gba", 0x5b7844, 0x20
gUnknown_085B7864:: @ 85B7864
.incbin "baserom.gba", 0x5b7864, 0xc4
gUnknown_085B7928:: @ 85B7928
.incbin "baserom.gba", 0x5b7928, 0x20
gUnknown_085B7948:: @ 85B7948
.incbin "baserom.gba", 0x5b7948, 0x8
gUnknown_085B7950:: @ 85B7950
.incbin "baserom.gba", 0x5b7950, 0x28
gUnknown_085B7978:: @ 85B7978
.incbin "baserom.gba", 0x5b7978, 0x80
gUnknown_085B79F8:: @ 85B79F8
.incbin "baserom.gba", 0x5b79f8, 0x18
gUnknown_085B7A10:: @ 85B7A10
.incbin "baserom.gba", 0x5b7a10, 0x30
gUnknown_085B7A40:: @ 85B7A40
.incbin "baserom.gba", 0x5b7a40, 0x7c
gUnknown_085B7ABC:: @ 85B7ABC
.incbin "baserom.gba", 0x5b7abc, 0x30
gUnknown_085B7AEC:: @ 85B7AEC
.incbin "baserom.gba", 0x5b7aec, 0x18
gUnknown_085B7B04:: @ 85B7B04
.incbin "baserom.gba", 0x5b7b04, 0x6
gUnknown_085B7B0A:: @ 85B7B0A
.incbin "baserom.gba", 0x5b7b0a, 0x8
gUnknown_085B7B12:: @ 85B7B12
.incbin "baserom.gba", 0x5b7b12, 0x8
gUnknown_085B7B1A:: @ 85B7B1A
.incbin "baserom.gba", 0x5b7b1a, 0x14
gUnknown_085B7B2E:: @ 85B7B2E
.incbin "baserom.gba", 0x5b7b2e, 0x18
gUnknown_085B7B46:: @ 85B7B46
.incbin "baserom.gba", 0x5b7b46, 0x2
gUnknown_085B7B48:: @ 85B7B48
.incbin "baserom.gba", 0x5b7b48, 0x8d0
gUnknown_085B8418:: @ 85B8418
.incbin "baserom.gba", 0x5b8418, 0x20
gUnknown_085B8438:: @ 85B8438
.incbin "baserom.gba", 0x5b8438, 0x338
gUnknown_085B8770:: @ 85B8770
.incbin "baserom.gba", 0x5b8770, 0x480
gUnknown_085B8BF0:: @ 85B8BF0
.incbin "baserom.gba", 0x5b8bf0, 0x20
gUnknown_085B8C10:: @ 85B8C10
.incbin "baserom.gba", 0x5b8c10, 0x20
gUnknown_085B8C30:: @ 85B8C30
.incbin "baserom.gba", 0x5b8c30, 0x2
gUnknown_085B8C32:: @ 85B8C32
.incbin "baserom.gba", 0x5b8c32, 0x36
gUnknown_085B8C68:: @ 85B8C68
.incbin "baserom.gba", 0x5b8c68, 0x18
gUnknown_085B8C80:: @ 85B8C80
.incbin "baserom.gba", 0x5b8c80, 0x10
gUnknown_085B8C90:: @ 85B8C90
.incbin "baserom.gba", 0x5b8c90, 0x528
gUnknown_085B91B8:: @ 85B91B8
.incbin "baserom.gba", 0x5b91b8, 0x178
gUnknown_085B9330:: @ 85B9330
.incbin "baserom.gba", 0x5b9330, 0x580
gUnknown_085B98B0:: @ 85B98B0
.incbin "baserom.gba", 0x5b98b0, 0x240
gUnknown_085B9AF0:: @ 85B9AF0
.incbin "baserom.gba", 0x5b9af0, 0x11e0
gUnknown_085BACD0:: @ 85BACD0
.incbin "baserom.gba", 0x5bacd0, 0x1e0
gUnknown_085BAEB0:: @ 85BAEB0
.incbin "baserom.gba", 0x5baeb0, 0x20
gUnknown_085BAED0:: @ 85BAED0
.incbin "baserom.gba", 0x5baed0, 0x378
gUnknown_085BB248:: @ 85BB248
.incbin "baserom.gba", 0x5bb248, 0x25c
gUnknown_085BB4A4:: @ 85BB4A4
.incbin "baserom.gba", 0x5bb4a4, 0x48c
gUnknown_085BB930:: @ 85BB930
.incbin "baserom.gba", 0x5bb930, 0x2e4
gUnknown_085BBC14:: @ 85BBC14
.incbin "baserom.gba", 0x5bbc14, 0x6a0
gUnknown_085BC2B4:: @ 85BC2B4
.incbin "baserom.gba", 0x5bc2b4, 0x20
gUnknown_085BC2D4:: @ 85BC2D4
.incbin "baserom.gba", 0x5bc2d4, 0x20
gUnknown_085BC2F4:: @ 85BC2F4
.incbin "baserom.gba", 0x5bc2f4, 0x20
gUnknown_085BC314:: @ 85BC314
.incbin "baserom.gba", 0x5bc314, 0x800
gUnknown_085BCB14:: @ 85BCB14
.incbin "baserom.gba", 0x5bcb14, 0x800
gUnknown_085BD314:: @ 85BD314
.incbin "baserom.gba", 0x5bd314, 0x820
gUnknown_085BDB34:: @ 85BDB34
.incbin "baserom.gba", 0x5bdb34, 0x6b4
gUnknown_085BE1E8:: @ 85BE1E8
.incbin "baserom.gba", 0x5be1e8, 0x334
gUnknown_085BE51C:: @ 85BE51C
.incbin "baserom.gba", 0x5be51c, 0x56c
gUnknown_085BEA88:: @ 85BEA88
.incbin "baserom.gba", 0x5bea88, 0x318
gUnknown_085BEDA0:: @ 85BEDA0
.incbin "baserom.gba", 0x5beda0, 0x140
gUnknown_085BEEE0:: @ 85BEEE0
.incbin "baserom.gba", 0x5beee0, 0x1c0
gUnknown_085BF0A0:: @ 85BF0A0
.incbin "baserom.gba", 0x5bf0a0, 0x200
gUnknown_085BF2A0:: @ 85BF2A0
.incbin "baserom.gba", 0x5bf2a0, 0x200
gUnknown_085BF4A0:: @ 85BF4A0
.incbin "baserom.gba", 0x5bf4a0, 0xa0
gUnknown_085BF540:: @ 85BF540
.incbin "baserom.gba", 0x5bf540, 0x160
gUnknown_085BF6A0:: @ 85BF6A0
.incbin "baserom.gba", 0x5bf6a0, 0x7540
gUnknown_085C6BE0:: @ 85C6BE0
.incbin "baserom.gba", 0x5c6be0, 0x1000
gUnknown_085C7BE0:: @ 85C7BE0
.incbin "baserom.gba", 0x5c7be0, 0x20
gUnknown_085C7C00:: @ 85C7C00
.incbin "baserom.gba", 0x5c7c00, 0x68c
gUnknown_085C828C:: @ 85C828C
.incbin "baserom.gba", 0x5c828c, 0x2ec
gUnknown_085C8578:: @ 85C8578
.incbin "baserom.gba", 0x5c8578, 0x20
gUnknown_085C8598:: @ 85C8598
.incbin "baserom.gba", 0x5c8598, 0x15c
gUnknown_085C86F4:: @ 85C86F4
.incbin "baserom.gba", 0x5c86f4, 0x100
gUnknown_085C87F4:: @ 85C87F4
.incbin "baserom.gba", 0x5c87f4, 0xb0
gUnknown_085C88A4:: @ 85C88A4
.incbin "baserom.gba", 0x5c88a4, 0x84
gUnknown_085C8928:: @ 85C8928
.incbin "baserom.gba", 0x5c8928, 0x20
gUnknown_085C8948:: @ 85C8948
.incbin "baserom.gba", 0x5c8948, 0xa8
gUnknown_085C89F0:: @ 85C89F0
.incbin "baserom.gba", 0x5c89f0, 0xa8
gUnknown_085C8A98:: @ 85C8A98
.incbin "baserom.gba", 0x5c8a98, 0x10
gUnknown_085C8AA8:: @ 85C8AA8
.incbin "baserom.gba", 0x5c8aa8, 0xc
gUnknown_085C8AB4:: @ 85C8AB4
.incbin "baserom.gba", 0x5c8ab4, 0x8
gUnknown_085C8ABC:: @ 85C8ABC
.incbin "baserom.gba", 0x5c8abc, 0x8
gUnknown_085C8AC4:: @ 85C8AC4
.incbin "baserom.gba", 0x5c8ac4, 0x1c
gUnknown_085C8AE0:: @ 85C8AE0
.incbin "baserom.gba", 0x5c8ae0, 0x1c
gUnknown_085C8AFC:: @ 85C8AFC
.incbin "baserom.gba", 0x5c8afc, 0x18
gUnknown_085C8B14:: @ 85C8B14
.incbin "baserom.gba", 0x5c8b14, 0x18
gUnknown_085C8B2C:: @ 85C8B2C
.incbin "baserom.gba", 0x5c8b2c, 0x18
gUnknown_085C8B44:: @ 85C8B44
.incbin "baserom.gba", 0x5c8b44, 0x18
gUnknown_085C8B5C:: @ 85C8B5C
.incbin "baserom.gba", 0x5c8b5c, 0x20
gUnknown_085C8B7C:: @ 85C8B7C
.incbin "baserom.gba", 0x5c8b7c, 0xc
gUnknown_085C8B88:: @ 85C8B88
.incbin "baserom.gba", 0x5c8b88, 0x4
gUnknown_085C8B8C:: @ 85C8B8C
.incbin "baserom.gba", 0x5c8b8c, 0xa
gUnknown_085C8B96:: @ 85C8B96
.incbin "baserom.gba", 0x5c8b96, 0x6
gUnknown_085C8B9C:: @ 85C8B9C
.incbin "baserom.gba", 0x5c8b9c, 0x1c
gUnknown_085C8BB8:: @ 85C8BB8
.incbin "baserom.gba", 0x5c8bb8, 0x8
gUnknown_085C8BC0:: @ 85C8BC0
.incbin "baserom.gba", 0x5c8bc0, 0xc
gUnknown_085C8BCC:: @ 85C8BCC
.incbin "baserom.gba", 0x5c8bcc, 0x28
gUnknown_085C8BF4:: @ 85C8BF4
.incbin "baserom.gba", 0x5c8bf4, 0x6
gUnknown_085C8BFA:: @ 85C8BFA
.incbin "baserom.gba", 0x5c8bfa, 0x14
gUnknown_085C8C0E:: @ 85C8C0E
.incbin "baserom.gba", 0x5c8c0e, 0x16
gUnknown_085C8C24:: @ 85C8C24
.incbin "baserom.gba", 0x5c8c24, 0x1c
gUnknown_085C8C40:: @ 85C8C40
.incbin "baserom.gba", 0x5c8c40, 0x4
gUnknown_085C8C44:: @ 85C8C44
.incbin "baserom.gba", 0x5c8c44, 0x4
gUnknown_085C8C48:: @ 85C8C48
.incbin "baserom.gba", 0x5c8c48, 0xc
gUnknown_085C8C54:: @ 85C8C54
.incbin "baserom.gba", 0x5c8c54, 0x10
gUnknown_085C8C64:: @ 85C8C64
.incbin "baserom.gba", 0x5c8c64, 0x2
gUnknown_085C8C66:: @ 85C8C66
.incbin "baserom.gba", 0x5c8c66, 0x6
gUnknown_085C8C6C:: @ 85C8C6C
.incbin "baserom.gba", 0x5c8c6c, 0xc
gUnknown_085C8C78:: @ 85C8C78
.incbin "baserom.gba", 0x5c8c78, 0x8
gUnknown_085C8C80:: @ 85C8C80
.incbin "baserom.gba", 0x5c8c80, 0x4
gUnknown_085C8C84:: @ 85C8C84
.incbin "baserom.gba", 0x5c8c84, 0xb4
gUnknown_085C8D38:: @ 85C8D38
.incbin "baserom.gba", 0x5c8d38, 0x8
gUnknown_085C8D40:: @ 85C8D40
.incbin "baserom.gba", 0x5c8d40, 0x20
gUnknown_085C8D60:: @ 85C8D60
.incbin "baserom.gba", 0x5c8d60, 0x2c
gUnknown_085C8D8C:: @ 85C8D8C
.incbin "baserom.gba", 0x5c8d8c, 0x14
gUnknown_085C8DA0:: @ 85C8DA0
.incbin "baserom.gba", 0x5c8da0, 0x10
gUnknown_085C8DB0:: @ 85C8DB0
.incbin "baserom.gba", 0x5c8db0, 0xc
gUnknown_085C8DBC:: @ 85C8DBC
.incbin "baserom.gba", 0x5c8dbc, 0x14
gUnknown_085C8DD0:: @ 85C8DD0
.incbin "baserom.gba", 0x5c8dd0, 0x46
gUnknown_085C8E16:: @ 85C8E16
.incbin "baserom.gba", 0x5c8e16, 0xe
gUnknown_085C8E24:: @ 85C8E24
.incbin "baserom.gba", 0x5c8e24, 0x44
gUnknown_085C8E68:: @ 85C8E68
.incbin "baserom.gba", 0x5c8e68, 0x6c
.align 2
gFieldEffectObjectPalette10:: @ 85C8ED4
.incbin "graphics/map_objects/palettes/field_effect_object_palette_10.gbapal"
.align 2
gFieldEffectObjectPaletteInfo10:: @ 85C8EF4
obj_pal gFieldEffectObjectPalette10, 0x1009
.incbin "baserom.gba", 0x5c8efc, 0xe0
gUnknown_085C8FDC:: @ 85C8FDC
.incbin "baserom.gba", 0x5c8fdc, 0x14
gUnknown_085C8FF0:: @ 85C8FF0
.incbin "baserom.gba", 0x5c8ff0, 0x30
gUnknown_085C9020:: @ 85C9020
.incbin "baserom.gba", 0x5c9020, 0x4b0
gUnknown_085C94D0:: @ 85C94D0
.incbin "baserom.gba", 0x5c94d0, 0x500
gUnknown_085C99D0:: @ 85C99D0
.incbin "baserom.gba", 0x5c99d0, 0x18
gUnknown_085C99E8:: @ 85C99E8
.incbin "baserom.gba", 0x5c99e8, 0x10
gUnknown_085C99F8:: @ 85C99F8
.incbin "baserom.gba", 0x5c99f8, 0x10
gUnknown_085C9A08:: @ 85C9A08
.incbin "baserom.gba", 0x5c9a08, 0x14
gUnknown_085C9A1C:: @ 85C9A1C
.incbin "baserom.gba", 0x5c9a1c, 0x14
gUnknown_085C9A30:: @ 85C9A30
.incbin "baserom.gba", 0x5c9a30, 0x23
gUnknown_085C9A53:: @ 85C9A53
.incbin "baserom.gba", 0x5c9a53, 0x41

View File

@ -149,14 +149,38 @@ gUnknown_08C2A6D4:: @ 8C2A6D4
gUnknown_08C2A6EC:: @ 8C2A6EC gUnknown_08C2A6EC:: @ 8C2A6EC
.incbin "baserom.gba", 0xc2a6ec, 0x27d0 .incbin "baserom.gba", 0xc2a6ec, 0x27d0
gUnknown_08C2CEBC:: @ 8C2CEBC gSubstituteDollPal:: @ 8C2CEBC
.incbin "baserom.gba", 0xc2cebc, 0x24 .incbin "baserom.gba", 0xc2cebc, 0x24
gUnknown_08C2CEE0:: @ 8C2CEE0 gSubstituteDollGfx:: @ 8C2CEE0
.incbin "baserom.gba", 0xc2cee0, 0x240 .incbin "baserom.gba", 0xc2cee0, 0x240
gUnknown_08C2D120:: @ 8C2D120 gSubstituteDollTilemap:: @ 8C2D120
.incbin "baserom.gba", 0xc2d120, 0x600 .incbin "baserom.gba", 0xc2d120, 552
gUnknown_08C2D348:: @ 8C2D348
.incbin "baserom.gba", 0xC2D348, 196
gUnknown_08C2D40C:: @ 8C2D40C
.incbin "baserom.gba", 0xC2D40C, 28
gContestConfetti_Gfx:: @ 8C2D428
.incbin "baserom.gba", 0xC2D428, 288
gContestConfetti_Pal:: @ 8C2D548
.incbin "baserom.gba", 0xC2D548, 40
gUnknown_08C2D570:: @ 8C2D570
.incbin "baserom.gba", 0xC2D570, 316
gUnknown_08C2D6AC:: @ 8C2D6AC
.incbin "baserom.gba", 0xC2D6AC, 36
gUnknown_08C2D6D0:: @ 8C2D6D0
.incbin "baserom.gba", 0xC2D6D0, 40
gUnknown_08C2D6F8:: @ 8C2D6F8
.incbin "baserom.gba", 0xC2D6F8, 40
gUnknown_08C2D720:: @ 8C2D720 gUnknown_08C2D720:: @ 8C2D720
.incbin "baserom.gba", 0xc2d720, 0x210 .incbin "baserom.gba", 0xc2d720, 0x210
@ -1197,8 +1221,44 @@ gUnknown_08DC9608:: @ 8DC9608
.incbin "baserom.gba", 0xdc9608, 0x20 .incbin "baserom.gba", 0xdc9608, 0x20
gUnknown_08DC9628:: @ 8DC9628 gUnknown_08DC9628:: @ 8DC9628
.incbin "baserom.gba", 0xdc9628, 0x2788 .incbin "baserom.gba", 0xdc9628, 0x320
gBerryBlenderMiscPalette:: @ 8DCAB88
.incbin "graphics/berry_blender/misc.gbapal"
gBerryBlenderArrowPalette:: @ 8DC9948
.incbin "graphics/berry_blender/arrow.gbapal"
gUnknown_8DC9988:: @ 8DC9988
.incbin "baserom.gba", 0xdc9988, 0x200
.align 2
gBerryBlenderMarubatsuTiles:: @ 8DC9B88
.incbin "graphics/berry_blender/marubatsu.4bpp"
.align 2
gBerryBlenderParticlesTiles:: @ 8E90818
.incbin "graphics/berry_blender/particles.4bpp"
.space 0x120
.align 2
gBerryBlenderCountdownNumbersTiles:: @ 8DC9F88
.incbin "graphics/berry_blender/countdown_numbers.4bpp"
.align 2
gBerryBlenderStartTiles:: @ 8DCA588
.incbin "graphics/berry_blender/start.4bpp"
.space 0x200
.align 2
gBerryBlenderArrowTiles:: @ 8DCAB88
.incbin "graphics/berry_blender/arrow.4bpp"
gUnknown_08DCB388:: @ 8DCB388
.incbin "baserom.gba", 0xdcb388, 0xA28
gUnknown_08DCBDB0:: @ 8DCBDB0 gUnknown_08DCBDB0:: @ 8DCBDB0
.incbin "baserom.gba", 0xdcbdb0, 0x20 .incbin "baserom.gba", 0xdcbdb0, 0x20

View File

@ -1,46 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
gUnknown_085E5374:: @ 85E5374
.incbin "baserom.gba", 0x5e5374, 0xc
gUnknown_085E5380:: @ 85E5380
.incbin "baserom.gba", 0x5e5380, 0x8
gUnknown_085E5388:: @ 85E5388
.incbin "baserom.gba", 0x5e5388, 0x4
gUnknown_085E538C:: @ 85E538C
.incbin "baserom.gba", 0x5e538c, 0x8
gUnknown_085E5394:: @ 85E5394
.incbin "baserom.gba", 0x5e5394, 0x10
gUnknown_085E53A4:: @ 85E53A4
.incbin "baserom.gba", 0x5e53a4, 0x10
gUnknown_085E53B4:: @ 85E53B4
.incbin "baserom.gba", 0x5e53b4, 0x6
gUnknown_085E53BA:: @ 85E53BA
.incbin "baserom.gba", 0x5e53ba, 0x2a
gUnknown_085E53E4:: @ 85E53E4
.incbin "baserom.gba", 0x5e53e4, 0x18
gUnknown_085E53FC:: @ 85E53FC
.incbin "baserom.gba", 0x5e53fc, 0xd4
gUnknown_085E54D0:: @ 85E54D0
.incbin "baserom.gba", 0x5e54d0, 0x18
gUnknown_085E54E8:: @ 85E54E8
.incbin "baserom.gba", 0x5e54e8, 0x20
gUnknown_085E5508:: @ 85E5508
.incbin "baserom.gba", 0x5e5508, 0x1cc
gUnknown_085E56D4:: @ 85E56D4
.incbin "baserom.gba", 0x5e56d4, 0x1c

View File

@ -4,61 +4,100 @@
.section .rodata .section .rodata
gUnknown_08613F90:: @ 8613F90 gUnknown_08613F90:: @ 8613F90
.incbin "baserom.gba", 0x613f90, 0xc .4byte 0x11F0, 0x1E1, 0x21DE
@ possibly a struct
gUnknown_08613F9C:: @ 8613F9C gUnknown_08613F9C:: @ 8613F9C
.incbin "baserom.gba", 0x613f9c, 0x18 .4byte 0
.4byte bag_menu_change_item_callback
.4byte sub_81AB520
.4byte 0
.4byte 0x80000
.4byte 0x7003011
gUnknown_08613FB4:: @ 8613FB4 gUnknown_08613FB4:: @ 8613FB4
.incbin "baserom.gba", 0x613fb4, 0x78 .4byte gMenuText_Use, ItemMenu_UseOutOfBattle
.4byte gMenuText_Toss, ItemMenu_Toss
.4byte gMenuText_Register, ItemMenu_Register
.4byte gMenuText_Give, ItemMenu_Give
.4byte gText_Cancel2, ItemMenu_Cancel
.4byte gMenuText_Use, ItemMenu_UseInBattle
.4byte gMenuText_Check, ItemMenu_UseOutOfBattle
.4byte gMenuText_Walk, ItemMenu_UseOutOfBattle
.4byte gMenuText_Deselect, ItemMenu_Register
.4byte gMenuText_CheckTag, ItemMenu_CheckTag
.4byte gMenuText_Confirm, unknown_ItemMenu_Confirm
.4byte gMenuText_Show, unknown_ItemMenu_Show
.4byte gMenuText_Give2, unknown_ItemMenu_Give2
.4byte gMenuText_Confirm, unknown_ItemMenu_Confirm2
.4byte gText_EmptyString2, NULL
gUnknown_0861402C:: @ 861402C gUnknown_0861402C:: @ 861402C
.incbin "baserom.gba", 0x61402c, 0x4 .byte 0, 3, 1, 4
gUnknown_08614030:: @ 8614030 gUnknown_08614030:: @ 8614030
.incbin "baserom.gba", 0x614030, 0x4 .byte 0, 2, 14, 4
gUnknown_08614034:: @ 8614034 gUnknown_08614034:: @ 8614034
.incbin "baserom.gba", 0x614034, 0x4 .byte 3, 14, 1, 4
gUnknown_08614038:: @ 8614038 gUnknown_08614038:: @ 8614038
.incbin "baserom.gba", 0x614038, 0x4 .byte 0, 3, 14, 4
gUnknown_0861403C:: @ 861403C gUnknown_0861403C:: @ 861403C
.incbin "baserom.gba", 0x61403c, 0x6 .byte 9, 14, 0, 3, 1, 4
gUnknown_08614042:: @ 8614042 gUnknown_08614042:: @ 8614042
.incbin "baserom.gba", 0x614042, 0x2 .byte 5, 4
gUnknown_08614044:: @ 8614044 gUnknown_08614044:: @ 8614044
.incbin "baserom.gba", 0x614044, 0x2 .byte 3, 4
gUnknown_08614046:: @ 8614046 gUnknown_08614046:: @ 8614046
.incbin "baserom.gba", 0x614046, 0x1 .byte 4
gUnknown_08614047:: @ 8614047 gUnknown_08614047:: @ 8614047
.incbin "baserom.gba", 0x614047, 0x4 .byte 10, 9, 14, 4
gUnknown_0861404B:: @ 861404B gUnknown_0861404B:: @ 861404B
.incbin "baserom.gba", 0x61404b, 0x2 .byte 11, 4
gUnknown_0861404D:: @ 861404D gUnknown_0861404D:: @ 861404D
.incbin "baserom.gba", 0x61404d, 0x2 .byte 12, 4
gUnknown_0861404F:: @ 861404F gUnknown_0861404F:: @ 861404F
.incbin "baserom.gba", 0x61404f, 0x5 .byte 13, 4
.align 2
gUnknown_08614054:: @ 8614054 gUnknown_08614054:: @ 8614054
.incbin "baserom.gba", 0x614054, 0x30 .4byte unknown_item_menu_type
.4byte unknown_item_menu_type
.4byte item_menu_type_2
.4byte display_sell_item_ask_str
.4byte unknown_ItemMenu_Confirm
.4byte unknown_item_menu_type
.4byte display_deposit_item_ask_str
.4byte unknown_item_menu_type
.4byte unknown_item_menu_type
.4byte unknown_item_menu_type
.4byte NULL
.4byte item_menu_type_b
.align 2
gUnknown_08614084:: @ 8614084 gUnknown_08614084:: @ 8614084
.incbin "baserom.gba", 0x614084, 0x8 .4byte BagMenuActuallyToss
.4byte BagMenuCancelToss
gUnknown_0861408C:: @ 861408C gUnknown_0861408C:: @ 861408C
.incbin "baserom.gba", 0x61408c, 0x8 .4byte sub_81AD84C
.4byte sub_81AD6FC
@ probably a struct
gUnknown_08614094:: @ 8614094 gUnknown_08614094:: @ 8614094
.incbin "baserom.gba", 0x614094, 0x10 .4byte 0x1101C00
.4byte 0xFFFF1064
.4byte 0x6FFFFF
.4byte 0x6F
gUnknown_086140A4:: @ 86140A4 gUnknown_086140A4:: @ 86140A4
.incbin "baserom.gba", 0x6140a4, 0xc0 .incbin "baserom.gba", 0x6140a4, 0xc0

View File

@ -5,7 +5,7 @@
.align 2, 0 .align 2, 0
gUnknown_0859EFE4:: @ 859EFE4 gUnknown_0859EFE4:: @ 859EFE4
.incbin "baserom.gba", 0x59efe4, 0xc .2byte 0x2811, 0x1029, 0x1018, 0xE0D, 0x1A1A, 0x1A1D
gUnknown_0859EFF0:: @ 859EFF0 gUnknown_0859EFF0:: @ 859EFF0
.incbin "baserom.gba", 0x59eff0, 0x20 .incbin "baserom.gba", 0x59eff0, 0x20

View File

@ -4,4 +4,17 @@
.section .rodata .section .rodata
gSaveSectionOffsets:: @ 85CDC00 gSaveSectionOffsets:: @ 85CDC00
.incbin "baserom.gba", 0x5cdc00, 0x38 .2byte 0, 0xF2C
.2byte 0, 0xF80
.2byte 0xF80, 0xF80
.2byte 0x1F00, 0xF80
.2byte 0x2E80, 0xF08
.2byte 0, 0xF80
.2byte 0xF80, 0xF80
.2byte 0x1F00, 0xF80
.2byte 0x2E80, 0xF80
.2byte 0x3E00, 0xF80
.2byte 0x4D80, 0xF80
.2byte 0x5D00, 0xF80
.2byte 0x6C80, 0xF80
.2byte 0x7C00, 0x7D0

View File

@ -4,26 +4,22 @@
.section .rodata .section .rodata
gUnknown_0858ABD8:: @ 858ABD8 gUnknown_0858ABD8:: @ 858ABD8
@ replacing .incbin "baserom.gba", 0x0058abd8, 0x18
.4byte gUnknown_085EAD37, 0 .4byte gUnknown_085EAD37, 0
.4byte gUnknown_085EAD41, 0 .4byte gUnknown_085EAD41, 0
.4byte gText_Exit, 0 .4byte gText_Exit, 0
gUnknown_0858ABF0:: @ 58ABF0 gUnknown_0858ABF0:: @ 58ABF0
@ replacing .incbin "baserom.gba", 0x0058abf0, 0x18
.4byte gUnknown_085EAD67, 0 .4byte gUnknown_085EAD67, 0
.4byte gUnknown_085EAD6D, 0 .4byte gUnknown_085EAD6D, 0
.4byte gText_Exit, 0 .4byte gText_Exit, 0
gUnknown_0858AC08:: @ 58AC08 gUnknown_0858AC08:: @ 58AC08
@ replacing .incbin "baserom.gba", 0x0058ac08, 0x20
.4byte gUnknown_085EAD72, 0 .4byte gUnknown_085EAD72, 0
.4byte gUnknown_085EAD84, 0 .4byte gUnknown_085EAD84, 0
.4byte gUnknown_085EAD96, 0 .4byte gUnknown_085EAD96, 0
.4byte gText_Cancel2, 0 .4byte gText_Cancel2, 0
gUnknown_0858AC28:: @ 58AC28 gUnknown_0858AC28:: @ 58AC28
@ replacing .incbin "baserom.gba", 0x0058ac28, 0x30
.4byte gUnknown_085EADA4, 0 .4byte gUnknown_085EADA4, 0
.4byte gUnknown_085EADB5, 0 .4byte gUnknown_085EADB5, 0
.4byte gUnknown_085EADC4, 0 .4byte gUnknown_085EADC4, 0
@ -32,32 +28,27 @@ gUnknown_0858AC28:: @ 58AC28
.4byte gText_Exit, 0 .4byte gText_Exit, 0
gUnknown_0858AC58:: @ 58AC58 gUnknown_0858AC58:: @ 58AC58
@ replacing .incbin "baserom.gba", 0x0058ac58, 0x20
.4byte gUnknown_085EADF9, 0 .4byte gUnknown_085EADF9, 0
.4byte gUnknown_085EAE04, 0 .4byte gUnknown_085EAE04, 0
.4byte gUnknown_085EAE12, 0 .4byte gUnknown_085EAE12, 0
.4byte gText_Exit, 0 .4byte gText_Exit, 0
gUnknown_0858AC78:: @ 58AC78 gUnknown_0858AC78:: @ 58AC78
@ replacing .incbin "baserom.gba", 0x0058ac78, 0x18
.4byte gUnknown_085EADF9, 0 .4byte gUnknown_085EADF9, 0
.4byte gUnknown_085EAE04, 0 .4byte gUnknown_085EAE04, 0
.4byte gText_Exit, 0 .4byte gText_Exit, 0
gUnknown_0858AC90:: @ 58AC90 gUnknown_0858AC90:: @ 58AC90
@ replacing .incbin "baserom.gba", 0x0058ac90, 0x20 .4byte gMenuText_Register, 0
.4byte gUnknown_085E8CCB, 0
.4byte gUnknown_085EAE12, 0 .4byte gUnknown_085EAE12, 0
.4byte gUnknown_085EAE1B, 0 .4byte gUnknown_085EAE1B, 0
.4byte gText_Cancel2, 0 .4byte gText_Cancel2, 0
gUnknown_0858ACB0:: @ 58ACB0 gUnknown_0858ACB0:: @ 58ACB0
@ replacing .incbin "baserom.gba", 0x0058acb0, 0x10
.4byte gUnknown_085EAE27, 0 .4byte gUnknown_085EAE27, 0
.4byte gUnknown_085EAE2C, 0 .4byte gUnknown_085EAE2C, 0
gUnknown_0858ACC0:: @ 58ACC0 gUnknown_0858ACC0:: @ 58ACC0
@ replacing .incbin "baserom.gba", 0x0058acc0, 0x30
.4byte gUnknown_085EAE31, 0 .4byte gUnknown_085EAE31, 0
.4byte gUnknown_085EAE35, 0 .4byte gUnknown_085EAE35, 0
.4byte gUnknown_085EAE39, 0 .4byte gUnknown_085EAE39, 0
@ -66,157 +57,131 @@ gUnknown_0858ACC0:: @ 58ACC0
.4byte gText_Exit, 0 .4byte gText_Exit, 0
gUnknown_0858ACF0:: @ 58ACF0 gUnknown_0858ACF0:: @ 58ACF0
@ replacing .incbin "baserom.gba", 0x0058acf0, 0x10
.4byte gUnknown_085EAD5F, 0 .4byte gUnknown_085EAD5F, 0
.4byte gText_Exit, 0 .4byte gText_Exit, 0
gUnknown_0858AD00:: @ 58AD00 gUnknown_0858AD00:: @ 58AD00
@ replacing .incbin "baserom.gba", 0x0058ad00, 0x10
.4byte gUnknown_085EAE53, 0 .4byte gUnknown_085EAE53, 0
.4byte gUnknown_085EAE5A, 0 .4byte gUnknown_085EAE5A, 0
gUnknown_0858AD10:: @ 58AD10 gUnknown_0858AD10:: @ 58AD10
@ replacing .incbin "baserom.gba", 0x0058ad10, 0x18
.4byte gText_Yes, 0 .4byte gText_Yes, 0
.4byte gText_No, 0 .4byte gText_No, 0
.4byte gUnknown_085EAD6D, 0 .4byte gUnknown_085EAD6D, 0
gUnknown_0858AD28:: @ 58AD28 gUnknown_0858AD28:: @ 58AD28
@ replacing .incbin "baserom.gba", 0x0058ad28, 0x18
.4byte gUnknown_085EAEA2, 0 .4byte gUnknown_085EAEA2, 0
.4byte gUnknown_085EAEAC, 0 .4byte gUnknown_085EAEAC, 0
.4byte gText_Exit, 0 .4byte gText_Exit, 0
gUnknown_0858AD40:: @ 58AD40 gUnknown_0858AD40:: @ 58AD40
@ replacing .incbin "baserom.gba", 0x0058ad40, 0x18
.4byte gText_Lv50, 0 .4byte gText_Lv50, 0
.4byte gText_OpenLevel, 0 .4byte gText_OpenLevel, 0
.4byte gText_Exit, 0 .4byte gText_Exit, 0
gUnknown_0858AD58:: @ 58AD58 gUnknown_0858AD58:: @ 58AD58
@ replacing .incbin "baserom.gba", 0x0058ad58, 0x18
.4byte gUnknown_0827ECBC, 0 .4byte gUnknown_0827ECBC, 0
.4byte gUnknown_0827ECC3, 0 .4byte gUnknown_0827ECC3, 0
.4byte gUnknown_0827ECCD, 0 .4byte gUnknown_0827ECCD, 0
gUnknown_0858AD70:: @ 58AD70 gUnknown_0858AD70:: @ 58AD70
@ replacing .incbin "baserom.gba", 0x0058ad70, 0x18
.4byte gUnknown_0827ECD5, 0 .4byte gUnknown_0827ECD5, 0
.4byte gUnknown_0827ECDD, 0 .4byte gUnknown_0827ECDD, 0
.4byte gUnknown_0827ECE3, 0 .4byte gUnknown_0827ECE3, 0
gUnknown_0858AD88:: @ 58AD88 gUnknown_0858AD88:: @ 58AD88
@ replacing .incbin "baserom.gba", 0x0058ad88, 0x18
.4byte gUnknown_0827ECEB, 0 .4byte gUnknown_0827ECEB, 0
.4byte gUnknown_0827ECF2, 0 .4byte gUnknown_0827ECF2, 0
.4byte gUnknown_0827ECF8, 0 .4byte gUnknown_0827ECF8, 0
gUnknown_0858ADA0:: @ 58ADA0 gUnknown_0858ADA0:: @ 58ADA0
@ replacing .incbin "baserom.gba", 0x0058ada0, 0x18
.4byte gUnknown_0827ED00, 0 .4byte gUnknown_0827ED00, 0
.4byte gUnknown_0827ED06, 0 .4byte gUnknown_0827ED06, 0
.4byte gUnknown_0827ED10, 0 .4byte gUnknown_0827ED10, 0
gUnknown_0858ADB8:: @ 58ADB8 gUnknown_0858ADB8:: @ 58ADB8
@ replacing .incbin "baserom.gba", 0x0058adb8, 0x18
.4byte gUnknown_0827ED18, 0 .4byte gUnknown_0827ED18, 0
.4byte gUnknown_0827ED22, 0 .4byte gUnknown_0827ED22, 0
.4byte gUnknown_0827ED2C, 0 .4byte gUnknown_0827ED2C, 0
gUnknown_0858ADD0:: @ 58ADD0 gUnknown_0858ADD0:: @ 58ADD0
@ replacing .incbin "baserom.gba", 0x0058add0, 0x18
.4byte gUnknown_0827ED36, 0 .4byte gUnknown_0827ED36, 0
.4byte gUnknown_0827ED40, 0 .4byte gUnknown_0827ED40, 0
.4byte gUnknown_0827ED46, 0 .4byte gUnknown_0827ED46, 0
gUnknown_0858ADE8:: @ 58ADE8 gUnknown_0858ADE8:: @ 58ADE8
@ replacing .incbin "baserom.gba", 0x0058ade8, 0x18
.4byte gUnknown_0827ED4F, 0 .4byte gUnknown_0827ED4F, 0
.4byte gUnknown_0827ED59, 0 .4byte gUnknown_0827ED59, 0
.4byte gUnknown_0827ED65, 0 .4byte gUnknown_0827ED65, 0
gUnknown_0858AE00:: @ 58AE00 gUnknown_0858AE00:: @ 58AE00
@ replacing .incbin "baserom.gba", 0x0058ae00, 0x18
.4byte gUnknown_0827ED70, 0 .4byte gUnknown_0827ED70, 0
.4byte gUnknown_0827ED74, 0 .4byte gUnknown_0827ED74, 0
.4byte gUnknown_0827ED78, 0 .4byte gUnknown_0827ED78, 0
gUnknown_0858AE18:: @ 58AE18 gUnknown_0858AE18:: @ 58AE18
@ replacing .incbin "baserom.gba", 0x0058ae18, 0x18
.4byte gUnknown_0827ED80, 0 .4byte gUnknown_0827ED80, 0
.4byte gUnknown_0827ED95, 0 .4byte gUnknown_0827ED95, 0
.4byte gUnknown_0827EDAA, 0 .4byte gUnknown_0827EDAA, 0
gUnknown_0858AE30:: @ 58AE30 gUnknown_0858AE30:: @ 58AE30
@ replacing .incbin "baserom.gba", 0x0058ae30, 0x18
.4byte gUnknown_0827EDB5, 0 .4byte gUnknown_0827EDB5, 0
.4byte gUnknown_0827EDBA, 0 .4byte gUnknown_0827EDBA, 0
.4byte gUnknown_0827EDC1, 0 .4byte gUnknown_0827EDC1, 0
gUnknown_0858AE48:: @ 58AE48 gUnknown_0858AE48:: @ 58AE48
@ replacing .incbin "baserom.gba", 0x0058ae48, 0x18
.4byte gUnknown_0827EDC9, 0 .4byte gUnknown_0827EDC9, 0
.4byte gUnknown_0827EDD5, 0 .4byte gUnknown_0827EDD5, 0
.4byte gUnknown_0827EDE4, 0 .4byte gUnknown_0827EDE4, 0
gUnknown_0858AE60:: @ 58AE60 gUnknown_0858AE60:: @ 58AE60
@ replacing .incbin "baserom.gba", 0x0058ae60, 0x18
.4byte gUnknown_0827EDF0, 0 .4byte gUnknown_0827EDF0, 0
.4byte gUnknown_0827EDF5, 0 .4byte gUnknown_0827EDF5, 0
.4byte gUnknown_0827EDF7, 0 .4byte gUnknown_0827EDF7, 0
gUnknown_0858AE78:: @ 58AE78 gUnknown_0858AE78:: @ 58AE78
@ replacing .incbin "baserom.gba", 0x0058ae78, 0x18
.4byte gUnknown_0827EDF9, 0 .4byte gUnknown_0827EDF9, 0
.4byte gUnknown_0827EDFB, 0 .4byte gUnknown_0827EDFB, 0
.4byte gUnknown_0827EDFD, 0 .4byte gUnknown_0827EDFD, 0
gUnknown_0858AE90:: @ 58AE90 gUnknown_0858AE90:: @ 58AE90
@ replacing .incbin "baserom.gba", 0x0058ae90, 0x18
.4byte gUnknown_0827EDFF, 0 .4byte gUnknown_0827EDFF, 0
.4byte gUnknown_0827EE01, 0 .4byte gUnknown_0827EE01, 0
.4byte gUnknown_0827EE03, 0 .4byte gUnknown_0827EE03, 0
gUnknown_0858AEA8:: @ 58AEA8 gUnknown_0858AEA8:: @ 58AEA8
@ replacing .incbin "baserom.gba", 0x0058aea8, 0x18
.4byte gUnknown_0827EE05, 0 .4byte gUnknown_0827EE05, 0
.4byte gUnknown_0827EE07, 0 .4byte gUnknown_0827EE07, 0
.4byte gUnknown_0827EE09, 0 .4byte gUnknown_0827EE09, 0
gUnknown_0858AEC0:: @ 58AEC0 gUnknown_0858AEC0:: @ 58AEC0
@ replacing .incbin "baserom.gba", 0x0058aec0, 0x20
.4byte gUnknown_085EAEC3, 0 .4byte gUnknown_085EAEC3, 0
.4byte gUnknown_085EAED6, 0 .4byte gUnknown_085EAED6, 0
.4byte gUnknown_085EAEE6, 0 .4byte gUnknown_085EAEE6, 0
.4byte gText_Exit, 0 .4byte gText_Exit, 0
gUnknown_0858AEE0:: @ 58AEE0 gUnknown_0858AEE0:: @ 58AEE0
@ replacing .incbin "baserom.gba", 0x0058aee0, 0x20
.4byte gUnknown_085EAEF6, 0 .4byte gUnknown_085EAEF6, 0
.4byte gUnknown_085EAF02, 0 .4byte gUnknown_085EAF02, 0
.4byte gUnknown_085EAF0E, 0 .4byte gUnknown_085EAF0E, 0
.4byte gText_Exit, 0 .4byte gText_Exit, 0
gUnknown_0858AF00:: @ 58AF00 gUnknown_0858AF00:: @ 58AF00
@ replacing .incbin "baserom.gba", 0x0058af00, 0x20
.4byte gUnknown_085EAF1B, 0 .4byte gUnknown_085EAF1B, 0
.4byte gUnknown_085EAF24, 0 .4byte gUnknown_085EAF24, 0
.4byte gUnknown_085EAF2F, 0 .4byte gUnknown_085EAF2F, 0
.4byte gText_Exit, 0 .4byte gText_Exit, 0
gUnknown_0858AF20:: @ 58AF20 gUnknown_0858AF20:: @ 58AF20
@ replacing .incbin "baserom.gba", 0x0058af20, 0x10
.4byte gUnknown_085EAF34, 0 .4byte gUnknown_085EAF34, 0
.4byte gUnknown_085EAF3E, 0 .4byte gUnknown_085EAF3E, 0
gUnknown_0858AF30:: @ 58AF30 gUnknown_0858AF30:: @ 58AF30
@ replacing .incbin "baserom.gba", 0x0058af30, 0x18
.4byte gUnknown_085EAF4B, 0 .4byte gUnknown_085EAF4B, 0
.4byte gUnknown_085EAF58, 0 .4byte gUnknown_085EAF58, 0
.4byte gText_Exit, 0 .4byte gText_Exit, 0
gUnknown_0858AF48:: @ 58AF48 gUnknown_0858AF48:: @ 58AF48
@ replacing .incbin "baserom.gba", 0x0058af48, 0x40
.4byte gUnknown_085EAF65, 0 .4byte gUnknown_085EAF65, 0
.4byte gUnknown_085EAF70, 0 .4byte gUnknown_085EAF70, 0
.4byte gUnknown_085EAF7D, 0 .4byte gUnknown_085EAF7D, 0
@ -227,14 +192,12 @@ gUnknown_0858AF48:: @ 58AF48
.4byte gText_Cancel2, 0 .4byte gText_Cancel2, 0
gUnknown_0858AF88:: @ 58AF88 gUnknown_0858AF88:: @ 58AF88
@ replacing .incbin "baserom.gba", 0x0058af88, 0x20
.4byte gUnknown_085EAFB6, 0 .4byte gUnknown_085EAFB6, 0
.4byte gUnknown_085EAFCF, 0 .4byte gUnknown_085EAFCF, 0
.4byte gUnknown_085EAFE8, 0 .4byte gUnknown_085EAFE8, 0
.4byte gText_Exit, 0 .4byte gText_Exit, 0
gUnknown_0858AFA8:: @ 58AFA8 gUnknown_0858AFA8:: @ 58AFA8
@ replacing .incbin "baserom.gba", 0x0058afa8, 0x30
.4byte gUnknown_085EB089, 0 .4byte gUnknown_085EB089, 0
.4byte gUnknown_085EB09C, 0 .4byte gUnknown_085EB09C, 0
.4byte gUnknown_085EB0AF, 0 .4byte gUnknown_085EB0AF, 0
@ -243,40 +206,33 @@ gUnknown_0858AFA8:: @ 58AFA8
.4byte gText_Exit, 0 .4byte gText_Exit, 0
gUnknown_0858AFD8:: @ 58AFD8 gUnknown_0858AFD8:: @ 58AFD8
@ replacing .incbin "baserom.gba", 0x0058afd8, 0x18
.4byte gUnknown_085EB002, 0 .4byte gUnknown_085EB002, 0
.4byte gUnknown_085EB017, 0 .4byte gUnknown_085EB017, 0
.4byte gText_Exit, 0 .4byte gText_Exit, 0
gUnknown_0858AFF0:: @ 58AFF0 gUnknown_0858AFF0:: @ 58AFF0
@ replacing .incbin "baserom.gba", 0x0058aff0, 0x10
.4byte gUnknown_085EB02A, 0 .4byte gUnknown_085EB02A, 0
.4byte gUnknown_085EB034, 0 .4byte gUnknown_085EB034, 0
gUnknown_0858B000:: @ 58B000 gUnknown_0858B000:: @ 58B000
@ replacing .incbin "baserom.gba", 0x0058b000, 0x18 .4byte gText_LilycoveCity, 0
.4byte gUnknown_085EB79B, 0 .4byte gText_BattleFrontier, 0
.4byte gUnknown_085EB06E, 0
.4byte gText_Exit, 0 .4byte gText_Exit, 0
gUnknown_0858B018:: @ 58B018 gUnknown_0858B018:: @ 58B018
@ replacing .incbin "baserom.gba", 0x0058b018, 0x18 .4byte gText_SlateportCity, 0
.4byte gUnknown_085EB7A9, 0 .4byte gText_LilycoveCity, 0
.4byte gUnknown_085EB79B, 0
.4byte gText_Exit, 0 .4byte gText_Exit, 0
gUnknown_0858B030:: @ 58B030 gUnknown_0858B030:: @ 58B030
@ replacing .incbin "baserom.gba", 0x0058b030, 0x10
.4byte gUnknown_085EB07E, 0 .4byte gUnknown_085EB07E, 0
.4byte gUnknown_085EB084, 0 .4byte gUnknown_085EB084, 0
gUnknown_0858B040:: @ 58B040 gUnknown_0858B040:: @ 58B040
@ replacing .incbin "baserom.gba", 0x0058b040, 0x10 .4byte gText_LilycoveCity, 0
.4byte gUnknown_085EB79B, 0
.4byte gText_Exit, 0 .4byte gText_Exit, 0
gUnknown_0858B050:: @ 58B050 gUnknown_0858B050:: @ 58B050
@ replacing .incbin "baserom.gba", 0x0058b050, 0x30
.4byte gUnknown_085EB676, 0 .4byte gUnknown_085EB676, 0
.4byte gUnknown_085EB673, 0 .4byte gUnknown_085EB673, 0
.4byte gUnknown_085EB670, 0 .4byte gUnknown_085EB670, 0
@ -285,91 +241,76 @@ gUnknown_0858B050:: @ 58B050
.4byte gText_Exit, 0 .4byte gText_Exit, 0
gUnknown_0858B080:: @ 58B080 gUnknown_0858B080:: @ 58B080
@ replacing .incbin "baserom.gba", 0x0058b080, 0x10
.4byte gUnknown_085EB040, 0 .4byte gUnknown_085EB040, 0
.4byte gText_Exit, 0 .4byte gText_Exit, 0
gUnknown_0858B090:: @ 58B090 gUnknown_0858B090:: @ 58B090
@ replacing .incbin "baserom.gba", 0x0058b090, 0x10
.4byte gUnknown_085EB04A, 0 .4byte gUnknown_085EB04A, 0
.4byte gText_Exit, 0 .4byte gText_Exit, 0
gUnknown_0858B0A0:: @ 58B0A0 gUnknown_0858B0A0:: @ 58B0A0
@ replacing .incbin "baserom.gba", 0x0058b0a0, 0x18
.4byte gUnknown_085EB040, 0 .4byte gUnknown_085EB040, 0
.4byte gUnknown_085EB04A, 0 .4byte gUnknown_085EB04A, 0
.4byte gText_Exit, 0 .4byte gText_Exit, 0
gUnknown_0858B0B8:: @ 58B0B8 gUnknown_0858B0B8:: @ 58B0B8
@ replacing .incbin "baserom.gba", 0x0058b0b8, 0x10
.4byte gUnknown_085EB057, 0 .4byte gUnknown_085EB057, 0
.4byte gText_Exit, 0 .4byte gText_Exit, 0
gUnknown_0858B0C8:: @ 58B0C8 gUnknown_0858B0C8:: @ 58B0C8
@ replacing .incbin "baserom.gba", 0x0058b0c8, 0x18
.4byte gUnknown_085EB040, 0 .4byte gUnknown_085EB040, 0
.4byte gUnknown_085EB057, 0 .4byte gUnknown_085EB057, 0
.4byte gText_Exit, 0 .4byte gText_Exit, 0
gUnknown_0858B0E0:: @ 58B0E0 gUnknown_0858B0E0:: @ 58B0E0
@ replacing .incbin "baserom.gba", 0x0058b0e0, 0x18
.4byte gUnknown_085EB04A, 0 .4byte gUnknown_085EB04A, 0
.4byte gUnknown_085EB057, 0 .4byte gUnknown_085EB057, 0
.4byte gText_Exit, 0 .4byte gText_Exit, 0
gUnknown_0858B0F8:: @ 58B0F8 gUnknown_0858B0F8:: @ 58B0F8
@ replacing .incbin "baserom.gba", 0x0058b0f8, 0x20
.4byte gUnknown_085EB040, 0 .4byte gUnknown_085EB040, 0
.4byte gUnknown_085EB04A, 0 .4byte gUnknown_085EB04A, 0
.4byte gUnknown_085EB057, 0 .4byte gUnknown_085EB057, 0
.4byte gText_Exit, 0 .4byte gText_Exit, 0
gUnknown_0858B118:: @ 58B118 gUnknown_0858B118:: @ 58B118
@ replacing .incbin "baserom.gba", 0x0058b118, 0x10
.4byte gUnknown_085EB062, 0 .4byte gUnknown_085EB062, 0
.4byte gText_Exit, 0 .4byte gText_Exit, 0
gUnknown_0858B128:: @ 58B128 gUnknown_0858B128:: @ 58B128
@ replacing .incbin "baserom.gba", 0x0058b128, 0x18
.4byte gUnknown_085EB040, 0 .4byte gUnknown_085EB040, 0
.4byte gUnknown_085EB062, 0 .4byte gUnknown_085EB062, 0
.4byte gText_Exit, 0 .4byte gText_Exit, 0
gUnknown_0858B140:: @ 58B140 gUnknown_0858B140:: @ 58B140
@ replacing .incbin "baserom.gba", 0x0058b140, 0x18
.4byte gUnknown_085EB04A, 0 .4byte gUnknown_085EB04A, 0
.4byte gUnknown_085EB062, 0 .4byte gUnknown_085EB062, 0
.4byte gText_Exit, 0 .4byte gText_Exit, 0
gUnknown_0858B158:: @ 58B158 gUnknown_0858B158:: @ 58B158
@ replacing .incbin "baserom.gba", 0x0058b158, 0x20
.4byte gUnknown_085EB040, 0 .4byte gUnknown_085EB040, 0
.4byte gUnknown_085EB04A, 0 .4byte gUnknown_085EB04A, 0
.4byte gUnknown_085EB062, 0 .4byte gUnknown_085EB062, 0
.4byte gText_Exit, 0 .4byte gText_Exit, 0
gUnknown_0858B178:: @ 58B178 gUnknown_0858B178:: @ 58B178
@ replacing .incbin "baserom.gba", 0x0058b178, 0x18
.4byte gUnknown_085EB057, 0 .4byte gUnknown_085EB057, 0
.4byte gUnknown_085EB062, 0 .4byte gUnknown_085EB062, 0
.4byte gText_Exit, 0 .4byte gText_Exit, 0
gUnknown_0858B190:: @ 58B190 gUnknown_0858B190:: @ 58B190
@ replacing .incbin "baserom.gba", 0x0058b190, 0x20
.4byte gUnknown_085EB040, 0 .4byte gUnknown_085EB040, 0
.4byte gUnknown_085EB057, 0 .4byte gUnknown_085EB057, 0
.4byte gUnknown_085EB062, 0 .4byte gUnknown_085EB062, 0
.4byte gText_Exit, 0 .4byte gText_Exit, 0
gUnknown_0858B1B0:: @ 58B1B0 gUnknown_0858B1B0:: @ 58B1B0
@ replacing .incbin "baserom.gba", 0x0058b1b0, 0x20
.4byte gUnknown_085EB04A, 0 .4byte gUnknown_085EB04A, 0
.4byte gUnknown_085EB057, 0 .4byte gUnknown_085EB057, 0
.4byte gUnknown_085EB062, 0 .4byte gUnknown_085EB062, 0
.4byte gText_Exit, 0 .4byte gText_Exit, 0
gUnknown_0858B1D0:: @ 58B1D0 gUnknown_0858B1D0:: @ 58B1D0
@ replacing .incbin "baserom.gba", 0x0058b1d0, 0x28
.4byte gUnknown_085EB040, 0 .4byte gUnknown_085EB040, 0
.4byte gUnknown_085EB04A, 0 .4byte gUnknown_085EB04A, 0
.4byte gUnknown_085EB057, 0 .4byte gUnknown_085EB057, 0
@ -377,42 +318,36 @@ gUnknown_0858B1D0:: @ 58B1D0
.4byte gText_Exit, 0 .4byte gText_Exit, 0
gUnknown_0858B1F8:: @ 58B1F8 gUnknown_0858B1F8:: @ 58B1F8
@ replacing .incbin "baserom.gba", 0x0058b1f8, 0x30 .4byte gText_Opponent, 0
.4byte gUnknown_085EB1A0, 0 .4byte gText_Tourney_Tree, 0
.4byte gUnknown_085EB1A9, 0 .4byte gText_ReadyToStart, 0
.4byte gUnknown_085EB1B6, 0
.4byte gUnknown_085EB5BC, 0 .4byte gUnknown_085EB5BC, 0
.4byte gUnknown_085EB5C3, 0 .4byte gUnknown_085EB5C3, 0
.4byte gUnknown_085EB5C8, 0 .4byte gUnknown_085EB5C8, 0
gUnknown_0858B228:: @ 58B228 gUnknown_0858B228:: @ 58B228
@ replacing .incbin "baserom.gba", 0x0058b228, 0x28 .4byte gText_Opponent, 0
.4byte gUnknown_085EB1A0, 0 .4byte gText_Tourney_Tree, 0
.4byte gUnknown_085EB1A9, 0 .4byte gText_ReadyToStart, 0
.4byte gUnknown_085EB1B6, 0
.4byte gUnknown_085EB5C3, 0 .4byte gUnknown_085EB5C3, 0
.4byte gUnknown_085EB5C8, 0 .4byte gUnknown_085EB5C8, 0
gUnknown_0858B250:: @ 58B250 gUnknown_0858B250:: @ 58B250
@ replacing .incbin "baserom.gba", 0x0058b250, 0x10
.4byte gUnknown_085EB29A, 0 .4byte gUnknown_085EB29A, 0
.4byte gUnknown_085EB2A3, 0 .4byte gUnknown_085EB2A3, 0
gUnknown_0858B260:: @ 58B260 gUnknown_0858B260:: @ 58B260
@ replacing .incbin "baserom.gba", 0x0058b260, 0x20
.4byte gUnknown_085EB372, 0 .4byte gUnknown_085EB372, 0
.4byte gUnknown_085EB37F, 0 .4byte gUnknown_085EB37F, 0
.4byte gUnknown_085EB389, 0 .4byte gUnknown_085EB389, 0
.4byte gText_Exit, 0 .4byte gText_Exit, 0
gUnknown_0858B280:: @ 58B280 gUnknown_0858B280:: @ 58B280
@ replacing .incbin "baserom.gba", 0x0058b280, 0x18
.4byte gText_Yes, 0 .4byte gText_Yes, 0
.4byte gText_No, 0 .4byte gText_No, 0
.4byte gUnknown_085EAD6D, 0 .4byte gUnknown_085EAD6D, 0
gUnknown_0858B298:: @ 58B298 gUnknown_0858B298:: @ 58B298
@ replacing .incbin "baserom.gba", 0x0058b298, 0x28
.4byte gUnknown_085EAE6E, 0 .4byte gUnknown_085EAE6E, 0
.4byte gUnknown_085EAE7C, 0 .4byte gUnknown_085EAE7C, 0
.4byte gUnknown_085EAE8A, 0 .4byte gUnknown_085EAE8A, 0
@ -420,14 +355,12 @@ gUnknown_0858B298:: @ 58B298
.4byte gText_Exit, 0 .4byte gText_Exit, 0
gUnknown_0858B2C0:: @ 58B2C0 gUnknown_0858B2C0:: @ 58B2C0
@ replacing .incbin "baserom.gba", 0x0058b2c0, 0x20
.4byte gUnknown_085EB372, 0 .4byte gUnknown_085EB372, 0
.4byte gUnknown_085EB37F, 0 .4byte gUnknown_085EB37F, 0
.4byte gUnknown_085EB397, 0 .4byte gUnknown_085EB397, 0
.4byte gText_Exit, 0 .4byte gText_Exit, 0
gUnknown_0858B2E0:: @ 58B2E0 gUnknown_0858B2E0:: @ 58B2E0
@ replacing .incbin "baserom.gba", 0x0058b2e0, 0x28
.4byte gUnknown_085EB372, 0 .4byte gUnknown_085EB372, 0
.4byte gUnknown_085EB37F, 0 .4byte gUnknown_085EB37F, 0
.4byte gUnknown_085EB389, 0 .4byte gUnknown_085EB389, 0
@ -435,52 +368,44 @@ gUnknown_0858B2E0:: @ 58B2E0
.4byte gText_Exit, 0 .4byte gText_Exit, 0
gUnknown_0858B308:: @ 58B308 gUnknown_0858B308:: @ 58B308
@ replacing .incbin "baserom.gba", 0x0058b308, 0x18
.4byte gUnknown_085EB372, 0 .4byte gUnknown_085EB372, 0
.4byte gUnknown_085EB37F, 0 .4byte gUnknown_085EB37F, 0
.4byte gText_Exit, 0 .4byte gText_Exit, 0
gUnknown_0858B320:: @ 58B320 gUnknown_0858B320:: @ 58B320
@ replacing .incbin "baserom.gba", 0x0058b320, 0x18
.4byte gUnknown_085EB3A4, 0 .4byte gUnknown_085EB3A4, 0
.4byte gUnknown_085EB3B1, 0 .4byte gUnknown_085EB3B1, 0
.4byte gText_Exit, 0 .4byte gText_Exit, 0
gUnknown_0858B338:: @ 58B338 gUnknown_0858B338:: @ 58B338
@ replacing .incbin "baserom.gba", 0x0058b338, 0x18
.4byte gUnknown_085EB3D4, 0 .4byte gUnknown_085EB3D4, 0
.4byte gUnknown_085EB3C6, 0 .4byte gUnknown_085EB3C6, 0
.4byte gText_Exit, 0 .4byte gText_Exit, 0
gUnknown_0858B350:: @ 58B350 gUnknown_0858B350:: @ 58B350
@ replacing .incbin "baserom.gba", 0x0058b350, 0x28 .4byte gText_NormalRank, 0
.4byte gUnknown_085EB1C5, 0 .4byte gText_SuperRank, 0
.4byte gUnknown_085EB1D1, 0 .4byte gText_HyperRank, 0
.4byte gUnknown_085EB1DC, 0 .4byte gText_MasterRank, 0
.4byte gUnknown_085EB1E7, 0
.4byte gText_Exit, 0 .4byte gText_Exit, 0
gUnknown_0858B378:: @ 58B378 gUnknown_0858B378:: @ 58B378
@ replacing .incbin "baserom.gba", 0x0058b378, 0x18 .4byte gText_BattleBag, 0
.4byte gUnknown_085EB212, 0 .4byte gText_HeldItem, 0
.4byte gUnknown_085EB21D, 0
.4byte gText_Exit, 0 .4byte gText_Exit, 0
gUnknown_0858B390:: @ 58B390 gUnknown_0858B390:: @ 58B390
@ replacing .incbin "baserom.gba", 0x0058b390, 0x20 .4byte gText_LinkContest, 0
.4byte gUnknown_085EB227, 0 .4byte gText_AboutE_Mode, 0
.4byte gUnknown_085EB234, 0 .4byte gText_AboutG_Mode, 0
.4byte gUnknown_085EB241, 0
.4byte gText_Cancel2, 0 .4byte gText_Cancel2, 0
gUnknown_0858B3B0:: @ 58B3B0 gUnknown_0858B3B0:: @ 58B3B0
@ replacing .incbin "baserom.gba", 0x0058b3b0, 0x18 .4byte gText_E_Mode, 0
.4byte gUnknown_085EB24E, 0 .4byte gText_G_Mode, 0
.4byte gUnknown_085EB255, 0
.4byte gText_Exit, 0 .4byte gText_Exit, 0
gUnknown_0858B3C8:: @ 58B3C8 gUnknown_0858B3C8:: @ 58B3C8
@ replacing .incbin "baserom.gba", 0x0058b3c8, 0x40
.4byte gText_MenuOptionPokedex, 0 .4byte gText_MenuOptionPokedex, 0
.4byte gText_MenuOptionPokemon, 0 .4byte gText_MenuOptionPokemon, 0
.4byte gText_MenuOptionBag, 0 .4byte gText_MenuOptionBag, 0
@ -491,50 +416,42 @@ gUnknown_0858B3C8:: @ 58B3C8
.4byte gText_MenuOptionExit, 0 .4byte gText_MenuOptionExit, 0
gUnknown_0858B408:: @ 58B408 gUnknown_0858B408:: @ 58B408
@ replacing .incbin "baserom.gba", 0x0058b408, 0x20
.4byte gUnknown_085EB28A, 0 .4byte gUnknown_085EB28A, 0
.4byte gUnknown_085EB290, 0 .4byte gUnknown_085EB290, 0
.4byte gUnknown_085EB295, 0 .4byte gUnknown_085EB295, 0
.4byte gText_Exit, 0 .4byte gText_Exit, 0
gUnknown_0858B428:: @ 58B428 gUnknown_0858B428:: @ 58B428
@ replacing .incbin "baserom.gba", 0x0058b428, 0x18 .4byte gText_SouthernIsland, 0
.4byte gUnknown_085EB2AD, 0 .4byte gText_BirthIsland, 0
.4byte gUnknown_085EB2BD, 0
.4byte gText_Exit, 0 .4byte gText_Exit, 0
gUnknown_0858B440:: @ 58B440 gUnknown_0858B440:: @ 58B440
@ replacing .incbin "baserom.gba", 0x0058b440, 0x18 .4byte gText_SouthernIsland, 0
.4byte gUnknown_085EB2AD, 0 .4byte gText_FarawayIsland, 0
.4byte gUnknown_085EB2CA, 0
.4byte gText_Exit, 0 .4byte gText_Exit, 0
gUnknown_0858B458:: @ 58B458 gUnknown_0858B458:: @ 58B458
@ replacing .incbin "baserom.gba", 0x0058b458, 0x18 .4byte gText_BirthIsland, 0
.4byte gUnknown_085EB2BD, 0 .4byte gText_FarawayIsland, 0
.4byte gUnknown_085EB2CA, 0
.4byte gText_Exit, 0 .4byte gText_Exit, 0
gUnknown_0858B470:: @ 58B470 gUnknown_0858B470:: @ 58B470
@ replacing .incbin "baserom.gba", 0x0058b470, 0x20 .4byte gText_SouthernIsland, 0
.4byte gUnknown_085EB2AD, 0 .4byte gText_BirthIsland, 0
.4byte gUnknown_085EB2BD, 0 .4byte gText_FarawayIsland, 0
.4byte gUnknown_085EB2CA, 0
.4byte gText_Exit, 0 .4byte gText_Exit, 0
gUnknown_0858B490:: @ 58B490 gUnknown_0858B490:: @ 58B490
@ replacing .incbin "baserom.gba", 0x0058b490, 0x18
.4byte gUnknown_085EB2E4, 0 .4byte gUnknown_085EB2E4, 0
.4byte gUnknown_085EB2F0, 0 .4byte gUnknown_085EB2F0, 0
.4byte gText_Exit, 0 .4byte gText_Exit, 0
gUnknown_0858B4A8:: @ 58B4A8 gUnknown_0858B4A8:: @ 58B4A8
@ replacing .incbin "baserom.gba", 0x0058b4a8, 0x10
.4byte gText_Yes, 0 .4byte gText_Yes, 0
.4byte gUnknown_085EB2FC, 0 .4byte gUnknown_085EB2FC, 0
gUnknown_0858B4B8:: @ 58B4B8 gUnknown_0858B4B8:: @ 58B4B8
@ replacing .incbin "baserom.gba", 0x0058b4b8, 0x30
.4byte gUnknown_085EB3DF, 0 .4byte gUnknown_085EB3DF, 0
.4byte gUnknown_085EB3EA, 0 .4byte gUnknown_085EB3EA, 0
.4byte gUnknown_085EB3F1, 0 .4byte gUnknown_085EB3F1, 0
@ -543,14 +460,12 @@ gUnknown_0858B4B8:: @ 58B4B8
.4byte gText_Exit, 0 .4byte gText_Exit, 0
gUnknown_0858B4E8:: @ 58B4E8 gUnknown_0858B4E8:: @ 58B4E8
@ replacing .incbin "baserom.gba", 0x0058b4e8, 0x20
.4byte gUnknown_085EB415, 0 .4byte gUnknown_085EB415, 0
.4byte gUnknown_085EB41D, 0 .4byte gUnknown_085EB41D, 0
.4byte gUnknown_085EB424, 0 .4byte gUnknown_085EB424, 0
.4byte gText_Exit, 0 .4byte gText_Exit, 0
gUnknown_0858B508:: @ 58B508 gUnknown_0858B508:: @ 58B508
@ replacing .incbin "baserom.gba", 0x0058b508, 0x28
.4byte gUnknown_085EB45C, 0 .4byte gUnknown_085EB45C, 0
.4byte gUnknown_085EB469, 0 .4byte gUnknown_085EB469, 0
.4byte gUnknown_085EB475, 0 .4byte gUnknown_085EB475, 0
@ -558,7 +473,6 @@ gUnknown_0858B508:: @ 58B508
.4byte gText_Exit, 0 .4byte gText_Exit, 0
gUnknown_0858B530:: @ 58B530 gUnknown_0858B530:: @ 58B530
@ replacing .incbin "baserom.gba", 0x0058b530, 0x28
.4byte gUnknown_085EB42F, 0 .4byte gUnknown_085EB42F, 0
.4byte gUnknown_085EB43A, 0 .4byte gUnknown_085EB43A, 0
.4byte gUnknown_085EB444, 0 .4byte gUnknown_085EB444, 0
@ -566,14 +480,12 @@ gUnknown_0858B530:: @ 58B530
.4byte gText_Exit, 0 .4byte gText_Exit, 0
gUnknown_0858B558:: @ 58B558 gUnknown_0858B558:: @ 58B558
@ replacing .incbin "baserom.gba", 0x0058b558, 0x20
.4byte gUnknown_085EB48E, 0 .4byte gUnknown_085EB48E, 0
.4byte gUnknown_085EB496, 0 .4byte gUnknown_085EB496, 0
.4byte gUnknown_085EB4A3, 0 .4byte gUnknown_085EB4A3, 0
.4byte gText_Exit, 0 .4byte gText_Exit, 0
gUnknown_0858B578:: @ 58B578 gUnknown_0858B578:: @ 58B578
@ replacing .incbin "baserom.gba", 0x0058b578, 0x30
.4byte gUnknown_085EB4AD, 0 .4byte gUnknown_085EB4AD, 0
.4byte gUnknown_085EB4B9, 0 .4byte gUnknown_085EB4B9, 0
.4byte gUnknown_085EB4C7, 0 .4byte gUnknown_085EB4C7, 0
@ -582,7 +494,6 @@ gUnknown_0858B578:: @ 58B578
.4byte gText_Exit, 0 .4byte gText_Exit, 0
gUnknown_0858B5A8:: @ 58B5A8 gUnknown_0858B5A8:: @ 58B5A8
@ replacing .incbin "baserom.gba", 0x0058b5a8, 0x30
.4byte gUnknown_085EB4EB, 0 .4byte gUnknown_085EB4EB, 0
.4byte gUnknown_085EB4F9, 0 .4byte gUnknown_085EB4F9, 0
.4byte gUnknown_085EB508, 0 .4byte gUnknown_085EB508, 0
@ -591,7 +502,6 @@ gUnknown_0858B5A8:: @ 58B5A8
.4byte gText_Exit, 0 .4byte gText_Exit, 0
gUnknown_0858B5D8:: @ 58B5D8 gUnknown_0858B5D8:: @ 58B5D8
@ replacing .incbin "baserom.gba", 0x0058b5d8, 0x28
.4byte gUnknown_085EB532, 0 .4byte gUnknown_085EB532, 0
.4byte gUnknown_085EB543, 0 .4byte gUnknown_085EB543, 0
.4byte gUnknown_085EB555, 0 .4byte gUnknown_085EB555, 0
@ -599,57 +509,48 @@ gUnknown_0858B5D8:: @ 58B5D8
.4byte gText_Exit, 0 .4byte gText_Exit, 0
gUnknown_0858B600:: @ 58B600 gUnknown_0858B600:: @ 58B600
@ replacing .incbin "baserom.gba", 0x0058b600, 0x20
.4byte gUnknown_085EB56E, 0 .4byte gUnknown_085EB56E, 0
.4byte gUnknown_085EB57E, 0 .4byte gUnknown_085EB57E, 0
.4byte gUnknown_085EB589, 0 .4byte gUnknown_085EB589, 0
.4byte gText_Exit, 0 .4byte gText_Exit, 0
gUnknown_0858B620:: @ 58B620 gUnknown_0858B620:: @ 58B620
@ replacing .incbin "baserom.gba", 0x0058b620, 0x20
.4byte gUnknown_085EB5B6, 0 .4byte gUnknown_085EB5B6, 0
.4byte gUnknown_085EB5BC, 0 .4byte gUnknown_085EB5BC, 0
.4byte gUnknown_085EB5C3, 0 .4byte gUnknown_085EB5C3, 0
.4byte gUnknown_085EB5C8, 0 .4byte gUnknown_085EB5C8, 0
gUnknown_0858B640:: @ 58B640 gUnknown_0858B640:: @ 58B640
@ replacing .incbin "baserom.gba", 0x0058b640, 0x18
.4byte gUnknown_085EB5B6, 0 .4byte gUnknown_085EB5B6, 0
.4byte gUnknown_085EB5C3, 0 .4byte gUnknown_085EB5C3, 0
.4byte gUnknown_085EB5C8, 0 .4byte gUnknown_085EB5C8, 0
gUnknown_0858B658:: @ 58B658 gUnknown_0858B658:: @ 58B658
@ replacing .incbin "baserom.gba", 0x0058b658, 0x18
.4byte gUnknown_085EB5B6, 0 .4byte gUnknown_085EB5B6, 0
.4byte gUnknown_085EB5BC, 0 .4byte gUnknown_085EB5BC, 0
.4byte gUnknown_085EB5C8, 0 .4byte gUnknown_085EB5C8, 0
gUnknown_0858B670:: @ 58B670 gUnknown_0858B670:: @ 58B670
@ replacing .incbin "baserom.gba", 0x0058b670, 0x10
.4byte gUnknown_085EB5B6, 0 .4byte gUnknown_085EB5B6, 0
.4byte gUnknown_085EB5C8, 0 .4byte gUnknown_085EB5C8, 0
gUnknown_0858B680:: @ 58B680 gUnknown_0858B680:: @ 58B680
@ replacing .incbin "baserom.gba", 0x0058b680, 0x10
.4byte gUnknown_085EE14B, 0 .4byte gUnknown_085EE14B, 0
.4byte gUnknown_085EE14F, 0 .4byte gUnknown_085EE14F, 0
gUnknown_0858B690:: @ 58B690 gUnknown_0858B690:: @ 58B690
@ replacing .incbin "baserom.gba", 0x0058b690, 0x20
.4byte gUnknown_085EB2FF, 0 .4byte gUnknown_085EB2FF, 0
.4byte gUnknown_085EB310, 0 .4byte gUnknown_085EB310, 0
.4byte gUnknown_085EB317, 0 .4byte gUnknown_085EB317, 0
.4byte gUnknown_085EB31F, 0 .4byte gUnknown_085EB31F, 0
gUnknown_0858B6B0:: @ 58B6B0 gUnknown_0858B6B0:: @ 58B6B0
@ replacing .incbin "baserom.gba", 0x0058b6b0, 0x20 .4byte gText_CaveOfOrigin, 0
.4byte gUnknown_085EB7B8, 0 .4byte gText_MtPyre, 0
.4byte gUnknown_085EB7C7, 0 .4byte gText_SkyPillar, 0
.4byte gUnknown_085EB7D0, 0 .4byte gText_DontRemember, 0
.4byte gUnknown_085EB7DB, 0
gUnknown_0858B6D0:: @ 58B6D0 gUnknown_0858B6D0:: @ 58B6D0
@ replacing .incbin "baserom.gba", 0x0058b6d0, 0x30
.4byte gUnknown_085EB4AD, 0 .4byte gUnknown_085EB4AD, 0
.4byte gUnknown_085EB4B9, 0 .4byte gUnknown_085EB4B9, 0
.4byte gUnknown_085EB4C7, 0 .4byte gUnknown_085EB4C7, 0
@ -658,7 +559,6 @@ gUnknown_0858B6D0:: @ 58B6D0
.4byte gText_Exit, 0 .4byte gText_Exit, 0
gUnknown_0858B700:: @ 58B700 gUnknown_0858B700:: @ 58B700
@ replacing .incbin "baserom.gba", 0x0058b700, 0x30
.4byte gUnknown_085EB5A6, 0 .4byte gUnknown_085EB5A6, 0
.4byte gUnknown_085EB45C, 0 .4byte gUnknown_085EB45C, 0
.4byte gUnknown_085EB469, 0 .4byte gUnknown_085EB469, 0
@ -667,7 +567,6 @@ gUnknown_0858B700:: @ 58B700
.4byte gText_Exit, 0 .4byte gText_Exit, 0
gUnknown_0858B730:: @ 58B730 gUnknown_0858B730:: @ 58B730
@ replacing .incbin "baserom.gba", 0x0058b730, 0x28
.4byte gUnknown_085EB32D, 0 .4byte gUnknown_085EB32D, 0
.4byte gUnknown_085EB33E, 0 .4byte gUnknown_085EB33E, 0
.4byte gUnknown_085EB350, 0 .4byte gUnknown_085EB350, 0
@ -675,12 +574,10 @@ gUnknown_0858B730:: @ 58B730
.4byte gText_Exit, 0 .4byte gText_Exit, 0
gUnknown_0858B758:: @ 58B758 gUnknown_0858B758:: @ 58B758
@ replacing .incbin "baserom.gba", 0x0058b758, 0x8
.4byte gText_Exit, 0 .4byte gText_Exit, 0
gUnknown_0858B760:: @ 858B760 gUnknown_0858B760:: @ 858B760
@ replacing .incbin "baserom.gba", 0x0058b760, 0x390
.4byte 0x0858abd8, 3 .4byte 0x0858abd8, 3
.4byte gUnknown_0858B758, 1 .4byte gUnknown_0858B758, 1
.4byte gUnknown_0858ABF0, 3 .4byte gUnknown_0858ABF0, 3
@ -797,16 +694,55 @@ gUnknown_0858B760:: @ 858B760
.4byte gUnknown_0858B730, 5 .4byte gUnknown_0858B730, 5
gUnknown_0858BAF0:: @ 858BAF0 gUnknown_0858BAF0:: @ 858BAF0
.incbin "baserom.gba", 0x58baf0, 0x78 .4byte gText_Cool
.4byte gText_Beauty
.4byte gText_Cute
.4byte gText_Smart
.4byte gText_Tough
.4byte gText_Normal
.4byte gText_Super
.4byte gText_Hyper
.4byte gText_Master
.4byte gText_Cool2
.4byte gText_Beauty2
.4byte gText_Cute2
.4byte gText_Smart2
.4byte gText_Tough2
.4byte gText_Items
.4byte gText_Key_Items
.4byte gText_Poke_Balls
.4byte gText_TMs_Hms
.4byte gText_Berries2
.4byte gText_Single2
.4byte gText_Double2
.4byte gText_Multi
.4byte gText_MultiLink
.4byte gText_BattleTower2
.4byte gText_BattleDome
.4byte gText_BattleFactory
.4byte gText_BattlePalace
.4byte gText_BattleArena
.4byte gText_BattlePike
.4byte gText_BattlePyramid
gUnknown_0858BB68:: @ 858BB68 gUnknown_0858BB68:: @ 858BB68
.incbin "baserom.gba", 0x58bb68, 0x8 .byte 0x4A, 0x4B, 0x4C, 0x4D, 0x4E, 0x4F
.align 2
gUnknown_0858BB70:: @ 858BB70 gUnknown_0858BB70:: @ 858BB70
.incbin "baserom.gba", 0x58bb70, 0x10 .4byte gText_SomeonesPC
.4byte gText_LanettesPC
.4byte gText_PlayersPC
.4byte gText_LogOff
gUnknown_0858BB80:: @ 858BB80 gUnknown_0858BB80:: @ 858BB80
.incbin "baserom.gba", 0x58bb80, 0x1c .4byte gText_SlateportCity
.4byte gText_BattleFrontier
.4byte gText_SouthernIsland
.4byte gText_NavelRock
.4byte gText_BirthIsland
.4byte gText_FarawayIsland
.4byte gText_Exit
gUnknown_0858BB9C:: @ 858BB9C gUnknown_0858BB9C:: @ 858BB9C
.incbin "baserom.gba", 0x58bb9c, 0x10 .incbin "baserom.gba", 0x58bb9c, 0x10

View File

@ -52,7 +52,7 @@ gUnknown_0831C688:: @ 831C688
spr_template 0xd6eb, 0xd6eb, gUnknown_0831C630, gUnknown_0831C678, NULL, gDummySpriteAffineAnimTable, sub_80753B4 spr_template 0xd6eb, 0xd6eb, gUnknown_0831C630, gUnknown_0831C678, NULL, gDummySpriteAffineAnimTable, sub_80753B4
.align 2 .align 2
gUnknown_0831C6A0:: @ 831C6A0 gSpriteSheet_EnemyShadow:: @ 831C6A0
obj_tiles gUnknown_08D8FBC0, 0x0080, 0xd759 obj_tiles gUnknown_08D8FBC0, 0x0080, 0xd759
.align 2 .align 2
@ -60,5 +60,5 @@ gUnknown_0831C6A8:: @ 831C6A8
.byte 0x00, 0x40, 0x00, 0x40, 0x00, 0x0c, 0x00, 0x00 .byte 0x00, 0x40, 0x00, 0x40, 0x00, 0x0c, 0x00, 0x00
.align 2 .align 2
gUnknown_0831C6B0:: @ 831C6B0 gSpriteTemplate_EnemyShadow:: @ 831C6B0
spr_template 0xd759, 0xd6ff, gUnknown_0831C6A8, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_805EE48 spr_template 0xd759, 0xd6ff, gUnknown_0831C6A8, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCB_SetInvisible

67
data/starter_choose.s Normal file
View File

@ -0,0 +1,67 @@
@ the fourth big chunk of data
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
gBirchBagGrassPal:: @ 85B0A00
.incbin "baserom.gba", 0x5b0a00, 0x80
gBirchBagTilemap:: @ 85B0A80
.incbin "baserom.gba", 0x5b0a80, 0x18c
gBirchGrassTilemap:: @ 85B0C0C
.incbin "baserom.gba", 0x5b0c0c, 0x1f8
gBirchHelpGfx:: @ 85B0E04
.incbin "baserom.gba", 0x5b0e04, 0xfc8
gUnknown_085B1DCC:: @ 85B1DCC
.incbin "baserom.gba", 0x5b1dcc, 0x10
gUnknown_085B1DDC:: @ 85B1DDC
.incbin "baserom.gba", 0x5b1ddc, 0x8
gUnknown_085B1DE4:: @ 85B1DE4
.incbin "baserom.gba", 0x5b1de4, 0x8
sPokeballCoords:: @ 85B1DEC
.incbin "baserom.gba", 0x5b1dec, 0x6
gStarterChoose_LabelCoords:: @ 85B1DF2
.incbin "baserom.gba", 0x5b1df2, 0x6
sStarterMon:: @ 85B1DF8
.incbin "baserom.gba", 0x5b1df8, 0x8
gUnknown_085B1E00:: @ 85B1E00
.incbin "baserom.gba", 0x5b1e00, 0xc
gUnknown_085B1E0C:: @ 85B1E0C
.incbin "baserom.gba", 0x5b1e0c, 0x1c
gUnknown_085B1E28:: @ 85B1E28
.incbin "baserom.gba", 0x5b1e28, 0xa8
gUnknown_085B1ED0:: @ 85B1ED0
.incbin "baserom.gba", 0x5b1ed0, 0x8
gUnknown_085B1ED8:: @ 85B1ED8
.incbin "baserom.gba", 0x5b1ed8, 0x10
gUnknown_085B1EE8:: @ 85B1EE8
.incbin "baserom.gba", 0x5b1ee8, 0x10
gUnknown_085B1EF8:: @ 85B1EF8
.incbin "baserom.gba", 0x5b1ef8, 0x18
sSpriteTemplate_Hand:: @ 85B1F10
.incbin "baserom.gba", 0x5b1f10, 0x18
sSpriteTemplate_PokeBall:: @ 85B1F28
.incbin "baserom.gba", 0x5b1f28, 0x18
gUnknown_085B1F40:: @ 85B1F40
.incbin "baserom.gba", 0x5b1f40, 0x294

View File

@ -534,25 +534,25 @@ gUnknown_085E8CAC:: @ 85E8CAC
gText_FlyToWhere:: @ 85E8CB4 gText_FlyToWhere:: @ 85E8CB4
.string "FLY to where?$" .string "FLY to where?$"
gUnknown_085E8CC2:: @ 85E8CC2 gMenuText_Use:: @ 85E8CC2
.string "USE$" .string "USE$"
gUnknown_085E8CC6:: @ 85E8CC6 gMenuText_Toss:: @ 85E8CC6
.string "TOSS$" .string "TOSS$"
gUnknown_085E8CCB:: @ 85E8CCB gMenuText_Register:: @ 85E8CCB
.string "REGISTER$" .string "REGISTER$"
gUnknown_085E8CD4:: @ 85E8CD4 gMenuText_Give:: @ 85E8CD4
.string "GIVE$" .string "GIVE$"
gUnknown_085E8CD9:: @ 85E8CD9 gMenuText_CheckTag:: @ 85E8CD9
.string "CHECK TAG$" .string "CHECK TAG$"
gText_Confirm:: @ 85E8CE3 gMenuText_Confirm:: @ 85E8CE3
.string "CONFIRM$" .string "CONFIRM$"
gUnknown_085E8CEB:: @ 85E8CEB gMenuText_Walk:: @ 85E8CEB
.string "WALK$" .string "WALK$"
gText_Cancel:: @ 85E8CF0 gText_Cancel:: @ 85E8CF0
@ -561,7 +561,7 @@ gText_Cancel:: @ 85E8CF0
gText_Cancel2:: @ 85E8CF7 gText_Cancel2:: @ 85E8CF7
.string "CANCEL$" .string "CANCEL$"
gUnknown_085E8CFE:: @ 85E8CFE gMenuText_Show:: @ 85E8CFE
.string "SHOW$" .string "SHOW$"
gText_EmptyString2:: @ 85E8D03 gText_EmptyString2:: @ 85E8D03
@ -582,13 +582,13 @@ gUnknown_085E8D15:: @ 85E8D15
gUnknown_085E8D1A:: @ 85E8D1A gUnknown_085E8D1A:: @ 85E8D1A
.string "STORE$" .string "STORE$"
gUnknown_085E8D20:: @ 85E8D20 gMenuText_Check:: @ 85E8D20
.string "CHECK$" .string "CHECK$"
gText_None:: @ 85E8D26 gText_None:: @ 85E8D26
.string "NONE$" .string "NONE$"
gUnknown_085E8D2B:: @ 85E8D2B gMenuText_Deselect:: @ 85E8D2B
.string "DESELECT$" .string "DESELECT$"
gText_ThreeMarks:: @ 85E8D34 gText_ThreeMarks:: @ 85E8D34
@ -642,7 +642,7 @@ gText_GoBackPrevMenu:: @ 85E8D62
gText_WhatWouldYouLike:: @ 85E8D80 gText_WhatWouldYouLike:: @ 85E8D80
.string "What would you like to do?$" .string "What would you like to do?$"
gUnknown_085E8D9B:: @ 85E8D9B gMenuText_Give2:: @ 85E8D9B
.string "GIVE$" .string "GIVE$"
gText_xVar1:: @ 85E8DA0 gText_xVar1:: @ 85E8DA0
@ -1946,7 +1946,7 @@ gUnknown_085EB057:: @ 85EB057
gUnknown_085EB062:: @ 85EB062 gUnknown_085EB062:: @ 85EB062
.string "GREEN SHARD$" .string "GREEN SHARD$"
gUnknown_085EB06E:: @ 85EB06E gText_BattleFrontier:: @ 85EB06E
.string "BATTLE FRONTIER$" .string "BATTLE FRONTIER$"
gUnknown_085EB07E:: @ 85EB07E gUnknown_085EB07E:: @ 85EB07E
@ -1985,46 +1985,46 @@ gText_Smart:: @ 85EB0F9
gText_Tough:: @ 85EB0FF gText_Tough:: @ 85EB0FF
.string "TOUGH$" .string "TOUGH$"
gUnknown_085EB105:: @ 85EB105 gText_Normal:: @ 85EB105
.string "NORMAL$" .string "NORMAL$"
gUnknown_085EB10C:: @ 85EB10C gText_Super:: @ 85EB10C
.string "SUPER$" .string "SUPER$"
gUnknown_085EB112:: @ 85EB112 gText_Hyper:: @ 85EB112
.string "HYPER$" .string "HYPER$"
gUnknown_085EB118:: @ 85EB118 gText_Master:: @ 85EB118
.string "MASTER$" .string "MASTER$"
gUnknown_085EB11F:: @ 85EB11F gText_Cool2:: @ 85EB11F
.string "COOL$" .string "COOL$"
gUnknown_085EB124:: @ 85EB124 gText_Beauty2:: @ 85EB124
.string "BEAUTY$" .string "BEAUTY$"
gUnknown_085EB12B:: @ 85EB12B gText_Cute2:: @ 85EB12B
.string "CUTE$" .string "CUTE$"
gUnknown_085EB130:: @ 85EB130 gText_Smart2:: @ 85EB130
.string "SMART$" .string "SMART$"
gUnknown_085EB136:: @ 85EB136 gText_Tough2:: @ 85EB136
.string "TOUGH$" .string "TOUGH$"
gUnknown_085EB13C:: @ 85EB13C gText_Items:: @ 85EB13C
.string "ITEMS$" .string "ITEMS$"
gUnknown_085EB142:: @ 85EB142 gText_Key_Items:: @ 85EB142
.string "KEY ITEMS$" .string "KEY ITEMS$"
gUnknown_085EB14C:: @ 85EB14C gText_Poke_Balls:: @ 85EB14C
.string "POKé BALLS$" .string "POKé BALLS$"
gUnknown_085EB157:: @ 85EB157 gText_TMs_Hms:: @ 85EB157
.string "TMs & HMs$" .string "TMs & HMs$"
gUnknown_085EB161:: @ 85EB161 gText_Berries2:: @ 85EB161
.string "BERRIES$" .string "BERRIES$"
gText_SomeonesPC:: @ 85EB169 gText_SomeonesPC:: @ 85EB169
@ -2042,58 +2042,58 @@ gText_HallOfFame:: @ 85EB18B
gText_LogOff:: @ 85EB198 gText_LogOff:: @ 85EB198
.string "LOG OFF$" .string "LOG OFF$"
gUnknown_085EB1A0:: @ 85EB1A0 gText_Opponent:: @ 85EB1A0
.string "OPPONENT$" .string "OPPONENT$"
gUnknown_085EB1A9:: @ 85EB1A9 gText_Tourney_Tree:: @ 85EB1A9
.string "TOURNEY TREE$" .string "TOURNEY TREE$"
gUnknown_085EB1B6:: @ 85EB1B6 gText_ReadyToStart:: @ 85EB1B6
.string "READY TO START$" .string "READY TO START$"
gUnknown_085EB1C5:: @ 85EB1C5 gText_NormalRank:: @ 85EB1C5
.string "NORMAL RANK$" .string "NORMAL RANK$"
gUnknown_085EB1D1:: @ 85EB1D1 gText_SuperRank:: @ 85EB1D1
.string "SUPER RANK$" .string "SUPER RANK$"
gUnknown_085EB1DC:: @ 85EB1DC gText_HyperRank:: @ 85EB1DC
.string "HYPER RANK$" .string "HYPER RANK$"
gUnknown_085EB1E7:: @ 85EB1E7 gText_MasterRank:: @ 85EB1E7
.string "MASTER RANK$" .string "MASTER RANK$"
gUnknown_085EB1F3:: @ 85EB1F3 gText_Single2:: @ 85EB1F3
.string "SINGLE$" .string "SINGLE$"
gUnknown_085EB1FA:: @ 85EB1FA gText_Double2:: @ 85EB1FA
.string "DOUBLE$" .string "DOUBLE$"
gUnknown_085EB201:: @ 85EB201 gText_Multi:: @ 85EB201
.string "MULTI$" .string "MULTI$"
gUnknown_085EB207:: @ 85EB207 gText_MultiLink:: @ 85EB207
.string "MULTI-LINK$" .string "MULTI-LINK$"
gUnknown_085EB212:: @ 85EB212 gText_BattleBag:: @ 85EB212
.string "BATTLE BAG$" .string "BATTLE BAG$"
gUnknown_085EB21D:: @ 85EB21D gText_HeldItem:: @ 85EB21D
.string "HELD ITEM$" .string "HELD ITEM$"
gUnknown_085EB227:: @ 85EB227 gText_LinkContest:: @ 85EB227
.string "LINK CONTEST$" .string "LINK CONTEST$"
gUnknown_085EB234:: @ 85EB234 gText_AboutE_Mode:: @ 85EB234
.string "ABOUT E-MODE$" .string "ABOUT E-MODE$"
gUnknown_085EB241:: @ 85EB241 gText_AboutG_Mode:: @ 85EB241
.string "ABOUT G-MODE$" .string "ABOUT G-MODE$"
gUnknown_085EB24E:: @ 85EB24E gText_E_Mode:: @ 85EB24E
.string "E-MODE$" .string "E-MODE$"
gUnknown_085EB255:: @ 85EB255 gText_G_Mode:: @ 85EB255
.string "G-MODE$" .string "G-MODE$"
gText_MenuOptionPokedex:: @ 85EB25C gText_MenuOptionPokedex:: @ 85EB25C
@ -2138,16 +2138,16 @@ gUnknown_085EB29A:: @ 85EB29A
gUnknown_085EB2A3:: @ 85EB2A3 gUnknown_085EB2A3:: @ 85EB2A3
.string "BLUE TENT$" .string "BLUE TENT$"
gUnknown_085EB2AD:: @ 85EB2AD gText_SouthernIsland:: @ 85EB2AD
.string "SOUTHERN ISLAND$" .string "SOUTHERN ISLAND$"
gUnknown_085EB2BD:: @ 85EB2BD gText_BirthIsland:: @ 85EB2BD
.string "BIRTH ISLAND$" .string "BIRTH ISLAND$"
gUnknown_085EB2CA:: @ 85EB2CA gText_FarawayIsland:: @ 85EB2CA
.string "FARAWAY ISLAND$" .string "FARAWAY ISLAND$"
gUnknown_085EB2D9:: @ 85EB2D9 gText_NavelRock:: @ 85EB2D9
.string "NAVEL ROCK$" .string "NAVEL ROCK$"
gUnknown_085EB2E4:: @ 85EB2E4 gUnknown_085EB2E4:: @ 85EB2E4
@ -2477,22 +2477,22 @@ gUnknown_085EB77D:: @ 85EB77D
gUnknown_085EB78A:: @ 85EB78A gUnknown_085EB78A:: @ 85EB78A
.string "EXCHANGE SERVICE$" .string "EXCHANGE SERVICE$"
gUnknown_085EB79B:: @ 85EB79B gText_LilycoveCity:: @ 85EB79B
.string "LILYCOVE CITY$" .string "LILYCOVE CITY$"
gUnknown_085EB7A9:: @ 85EB7A9 gText_SlateportCity:: @ 85EB7A9
.string "SLATEPORT CITY$" .string "SLATEPORT CITY$"
gUnknown_085EB7B8:: @ 85EB7B8 gText_CaveOfOrigin:: @ 85EB7B8
.string "CAVE OF ORIGIN$" .string "CAVE OF ORIGIN$"
gUnknown_085EB7C7:: @ 85EB7C7 gText_MtPyre:: @ 85EB7C7
.string "MT. PYRE$" .string "MT. PYRE$"
gUnknown_085EB7D0:: @ 85EB7D0 gText_SkyPillar:: @ 85EB7D0
.string "SKY PILLAR$" .string "SKY PILLAR$"
gUnknown_085EB7DB:: @ 85EB7DB gText_DontRemember:: @ 85EB7DB
.string "Dont remember$" .string "Dont remember$"
gText_Exit:: @ 85EB7EA gText_Exit:: @ 85EB7EA
@ -3563,25 +3563,25 @@ gText_BattleTower:: @ 85ED0D3
gText_WSlashStraightSlash:: @ 85ED0E0 gText_WSlashStraightSlash:: @ 85ED0E0
.string "W/{COLOR RED}{SHADOW LIGHT_RED}{STR_VAR_1}{COLOR DARK_GREY}{SHADOW LIGHT_GREY} STRAIGHT/{COLOR RED}{SHADOW LIGHT_RED}{STR_VAR_2}$" .string "W/{COLOR RED}{SHADOW LIGHT_RED}{STR_VAR_1}{COLOR DARK_GREY}{SHADOW LIGHT_GREY} STRAIGHT/{COLOR RED}{SHADOW LIGHT_RED}{STR_VAR_2}$"
gUnknown_085ED104:: @ 85ED104 gText_BattleTower2:: @ 85ED104
.string "BATTLE TOWER$" .string "BATTLE TOWER$"
gUnknown_085ED111:: @ 85ED111 gText_BattleDome:: @ 85ED111
.string "BATTLE DOME$" .string "BATTLE DOME$"
gUnknown_085ED11D:: @ 85ED11D gText_BattlePalace:: @ 85ED11D
.string "BATTLE PALACE$" .string "BATTLE PALACE$"
gUnknown_085ED12B:: @ 85ED12B gText_BattleFactory:: @ 85ED12B
.string "BATTLE FACTORY$" .string "BATTLE FACTORY$"
gUnknown_085ED13A:: @ 85ED13A gText_BattleArena:: @ 85ED13A
.string "BATTLE ARENA$" .string "BATTLE ARENA$"
gUnknown_085ED147:: @ 85ED147 gText_BattlePike:: @ 85ED147
.string "BATTLE PIKE$" .string "BATTLE PIKE$"
gUnknown_085ED153:: @ 85ED153 gText_BattlePyramid:: @ 85ED153
.string "BATTLE PYRAMID$" .string "BATTLE PYRAMID$"
.align 2 .align 2

View File

@ -27,6 +27,6 @@ gUnknown_082C892A:: @ 82C892A
.string "Please exchange the\n" .string "Please exchange the\n"
.string "backup memory.$" .string "backup memory.$"
gUnknown_082C8959:: @ 82C8959 gText_SavingDontTurnOffPower:: @ 82C8959
.string "SAVING…\n" .string "SAVING…\n"
.string "DONT TURN OFF THE POWER.$" .string "DONT TURN OFF THE POWER.$"

View File

@ -345,26 +345,26 @@ gTilesetPalettes_BattleFrontierOutsideEast:: @ 834F984
.align 2 .align 2
gTilesetTiles_InsideBuilding:: @ 834FB84 gTilesetTiles_InsideBuilding:: @ 834FB84
.incbin "data/tilesets/primary/inside_building/tiles.4bpp.lz" .incbin "data/tilesets/primary/building/tiles.4bpp.lz"
.align 2 .align 2
gTilesetPalettes_InsideBuilding:: @ 83508BC gTilesetPalettes_InsideBuilding:: @ 83508BC
.incbin "data/tilesets/primary/inside_building/palettes/00.gbapal" .incbin "data/tilesets/primary/building/palettes/00.gbapal"
.incbin "data/tilesets/primary/inside_building/palettes/01.gbapal" .incbin "data/tilesets/primary/building/palettes/01.gbapal"
.incbin "data/tilesets/primary/inside_building/palettes/02.gbapal" .incbin "data/tilesets/primary/building/palettes/02.gbapal"
.incbin "data/tilesets/primary/inside_building/palettes/03.gbapal" .incbin "data/tilesets/primary/building/palettes/03.gbapal"
.incbin "data/tilesets/primary/inside_building/palettes/04.gbapal" .incbin "data/tilesets/primary/building/palettes/04.gbapal"
.incbin "data/tilesets/primary/inside_building/palettes/05.gbapal" .incbin "data/tilesets/primary/building/palettes/05.gbapal"
.incbin "data/tilesets/primary/inside_building/palettes/06.gbapal" .incbin "data/tilesets/primary/building/palettes/06.gbapal"
.incbin "data/tilesets/primary/inside_building/palettes/07.gbapal" .incbin "data/tilesets/primary/building/palettes/07.gbapal"
.incbin "data/tilesets/primary/inside_building/palettes/08.gbapal" .incbin "data/tilesets/primary/building/palettes/08.gbapal"
.incbin "data/tilesets/primary/inside_building/palettes/09.gbapal" .incbin "data/tilesets/primary/building/palettes/09.gbapal"
.incbin "data/tilesets/primary/inside_building/palettes/10.gbapal" .incbin "data/tilesets/primary/building/palettes/10.gbapal"
.incbin "data/tilesets/primary/inside_building/palettes/11.gbapal" .incbin "data/tilesets/primary/building/palettes/11.gbapal"
.incbin "data/tilesets/primary/inside_building/palettes/12.gbapal" .incbin "data/tilesets/primary/building/palettes/12.gbapal"
.incbin "data/tilesets/primary/inside_building/palettes/13.gbapal" .incbin "data/tilesets/primary/building/palettes/13.gbapal"
.incbin "data/tilesets/primary/inside_building/palettes/14.gbapal" .incbin "data/tilesets/primary/building/palettes/14.gbapal"
.incbin "data/tilesets/primary/inside_building/palettes/15.gbapal" .incbin "data/tilesets/primary/building/palettes/15.gbapal"
.align 2 .align 2
gTilesetTiles_Shop:: @ 8350ABC gTilesetTiles_Shop:: @ 8350ABC

View File

@ -128,11 +128,11 @@ gMetatileAttributes_BattleFrontierOutsideEast:: @ 83AF782
.align 1 .align 1
gMetatiles_InsideBuilding:: @ 83AFB7E gMetatiles_InsideBuilding:: @ 83AFB7E
.incbin "data/tilesets/primary/inside_building/metatiles.bin" .incbin "data/tilesets/primary/building/metatiles.bin"
.align 1 .align 1
gMetatileAttributes_InsideBuilding:: @ 83AFBFE gMetatileAttributes_InsideBuilding:: @ 83AFBFE
.incbin "data/tilesets/primary/inside_building/metatile_attributes.bin" .incbin "data/tilesets/primary/building/metatile_attributes.bin"
.align 1 .align 1
gMetatiles_Shop:: @ 83AFC0E gMetatiles_Shop:: @ 83AFC0E

View File

Before

Width:  |  Height:  |  Size: 1.8 KiB

After

Width:  |  Height:  |  Size: 1.8 KiB

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
0 0 0
255 255 255
213 222 238
180 197 230
148 172 222
115 148 205
82 123 197
49 98 189
255 180 205
255 115 98
255 49 0
205 65 65
189 24 24
148 16 16
74 57 139
8 0 82

Binary file not shown.

After

Width:  |  Height:  |  Size: 682 B

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
0 0 0
255 255 255
205 197 255
172 164 222
139 139 189
106 106 156
74 82 123
41 57 90
213 222 189
180 189 156
148 156 123
115 123 90
255 172 123
246 115 82
238 57 41
156 24 0

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

Binary file not shown.

After

Width:  |  Height:  |  Size: 457 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 293 B

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
0 0 0
0 0 0
0 0 0
255 213 0
255 82 82
98 255 255
0 189 255
98 255 98
205 0 0
255 0 0
255 156 156
0 0 0
255 255 0
255 255 148
189 189 189
255 255 255

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
0 0 0
255 255 255
213 222 238
180 197 230
148 172 222
115 148 205
82 123 197
49 98 189
255 180 205
255 115 98
255 49 0
205 65 65
189 24 24
148 123 197
74 57 139
8 0 82

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.8 KiB

Binary file not shown.

Binary file not shown.

After

Width:  |  Height:  |  Size: 217 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 396 B

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
0 0 0
0 0 0
131 238 197
255 32 32
115 222 180
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
65 65 65
255 255 255

Binary file not shown.

After

Width:  |  Height:  |  Size: 425 B

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
0 0 0
255 255 255
213 222 238
180 197 230
148 172 222
115 148 205
82 123 197
49 98 189
255 230 205
255 164 98
255 106 0
222 65 8
189 24 24
106 106 0
222 65 8
189 24 24

View File

@ -70,7 +70,7 @@ $(tilesetdir)/secondary/battle_frontier_outside_west/tiles.4bpp: $(tilesetdir)/s
$(tilesetdir)/secondary/battle_frontier_outside_east/tiles.4bpp: $(tilesetdir)/secondary/battle_frontier_outside_east/tiles.png $(tilesetdir)/secondary/battle_frontier_outside_east/tiles.4bpp: $(tilesetdir)/secondary/battle_frontier_outside_east/tiles.png
$(GFX) $< $@ -num_tiles 508 $(GFX) $< $@ -num_tiles 508
$(tilesetdir)/primary/inside_building/tiles.4bpp: $(tilesetdir)/primary/inside_building/tiles.png $(tilesetdir)/primary/building/tiles.4bpp: $(tilesetdir)/primary/building/tiles.png
$(GFX) $< $@ -num_tiles 502 $(GFX) $< $@ -num_tiles 502
$(tilesetdir)/secondary/shop/tiles.4bpp: $(tilesetdir)/secondary/shop/tiles.png $(tilesetdir)/secondary/shop/tiles.4bpp: $(tilesetdir)/secondary/shop/tiles.png
@ -287,6 +287,9 @@ graphics/title_screen/pokemon_logo.gbapal: graphics/title_screen/pokemon_logo.pa
$(INTROGFXDIR)/copyright.4bpp: $(INTROGFXDIR)/copyright.png $(INTROGFXDIR)/copyright.4bpp: $(INTROGFXDIR)/copyright.png
$(GFX) $< $@ -num_tiles 39 $(GFX) $< $@ -num_tiles 39
$(interfacedir)/pkmnjump_bg.4bpp: $(interfacedir)/pkmnjump_bg.png $(interfacedir)/pkmnjump_bg.4bpp: $(interfacedir)/pkmnjump_bg.png
$(GFX) $< $@ -num_tiles 63 $(GFX) $< $@ -num_tiles 63
graphics/misc/japanese_hof.4bpp: graphics/misc/japanese_hof.png
$(GFX) $< $@ -num_tiles 29

View File

@ -6,6 +6,8 @@
#include "battle_script_commands.h" #include "battle_script_commands.h"
#include "battle_2.h" #include "battle_2.h"
#include "battle_ai_switch_items.h" #include "battle_ai_switch_items.h"
#include "battle_gfx_sfx_util.h"
#include "battle_util2.h"
/* /*
Banks are a name given to what could be called a 'battlerId' or 'monControllerId'. Banks are a name given to what could be called a 'battlerId' or 'monControllerId'.
@ -252,11 +254,21 @@
#define MOVE_TARGET_FOES_AND_ALLY 0x20 #define MOVE_TARGET_FOES_AND_ALLY 0x20
#define MOVE_TARGET_OPPONENTS_FIELD 0x40 #define MOVE_TARGET_OPPONENTS_FIELD 0x40
// defines for the u8 array gTypeEffectiveness
#define TYPE_EFFECT_ATK_TYPE(i)((gTypeEffectiveness[i + 0]))
#define TYPE_EFFECT_DEF_TYPE(i)((gTypeEffectiveness[i + 1]))
#define TYPE_EFFECT_MULTIPLIER(i)((gTypeEffectiveness[i + 2]))
// defines for the gTypeEffectiveness multipliers
#define TYPE_MUL_NO_EFFECT 0 #define TYPE_MUL_NO_EFFECT 0
#define TYPE_MUL_NOT_EFFECTIVE 5 #define TYPE_MUL_NOT_EFFECTIVE 5
#define TYPE_MUL_NORMAL 10 #define TYPE_MUL_NORMAL 10
#define TYPE_MUL_SUPER_EFFECTIVE 20 #define TYPE_MUL_SUPER_EFFECTIVE 20
// special type table Ids
#define TYPE_FORESIGHT 0xFE
#define TYPE_ENDTABLE 0xFF
#define BS_GET_TARGET 0 #define BS_GET_TARGET 0
#define BS_GET_ATTACKER 1 #define BS_GET_ATTACKER 1
#define BS_GET_EFFECT_BANK 2 #define BS_GET_EFFECT_BANK 2
@ -361,8 +373,8 @@ struct DisableStruct
/*0x0D*/ u8 unkD; /*0x0D*/ u8 unkD;
/*0x0E*/ u8 encoreTimer1 : 4; /*0x0E*/ u8 encoreTimer1 : 4;
/*0x0E*/ u8 encoreTimer2 : 4; /*0x0E*/ u8 encoreTimer2 : 4;
/*0x0F*/ u8 perishSong1 : 4; /*0x0F*/ u8 perishSongTimer1 : 4;
/*0x0F*/ u8 perishSong2 : 4; /*0x0F*/ u8 perishSongTimer2 : 4;
/*0x10*/ u8 furyCutterCounter; /*0x10*/ u8 furyCutterCounter;
/*0x11*/ u8 rolloutCounter1 : 4; /*0x11*/ u8 rolloutCounter1 : 4;
/*0x11*/ u8 rolloutCounter2 : 4; /*0x11*/ u8 rolloutCounter2 : 4;
@ -611,7 +623,7 @@ struct BattleStruct
u8 sentInPokes; u8 sentInPokes;
bool8 selectionScriptFinished[BATTLE_BANKS_COUNT]; bool8 selectionScriptFinished[BATTLE_BANKS_COUNT];
u8 field_58[4]; u8 field_58[4];
u8 field_5C[4]; u8 monToSwitchIntoId[BATTLE_BANKS_COUNT];
u8 field_60[4][3]; u8 field_60[4][3];
u8 runTries; u8 runTries;
u8 caughtMonNick[11]; u8 caughtMonNick[11];
@ -670,7 +682,7 @@ struct BattleStruct
u8 fillerDC[0xDF-0xDC]; u8 fillerDC[0xDF-0xDC];
u8 field_DF; u8 field_DF;
u8 mirrorMoveArrays[32]; u8 mirrorMoveArrays[32];
u16 castformPalette[4][16]; u16 castformPalette[BATTLE_BANKS_COUNT][16];
u8 field_180; u8 field_180;
u8 field_181; u8 field_181;
u8 field_182; u8 field_182;
@ -683,7 +695,7 @@ struct BattleStruct
u8 field_1A4[96]; u8 field_1A4[96];
u8 field_204[104]; u8 field_204[104];
u8 field_26C[40]; u8 field_26C[40];
u8 field_294[4]; u8 AI_monToSwitchIntoId[BATTLE_BANKS_COUNT];
u8 field_298[8]; u8 field_298[8];
u8 field_2A0; u8 field_2A0;
u8 field_2A1; u8 field_2A1;
@ -807,6 +819,18 @@ extern struct BattleStruct* gBattleStruct;
#define B_ANIM_SUBSTITUTE_TO_MON 0x5 #define B_ANIM_SUBSTITUTE_TO_MON 0x5
#define B_ANIM_MON_TO_SUBSTITUTE 0x6 #define B_ANIM_MON_TO_SUBSTITUTE 0x6
// status animation table
#define B_ANIM_STATUS_PSN 0x0
#define B_ANIM_STATUS_CONFUSION 0x1
#define B_ANIM_STATUS_BRN 0x2
#define B_ANIM_STATUS_INFATUATION 0x3
#define B_ANIM_STATUS_SLP 0x4
#define B_ANIM_STATUS_PRZ 0x5
#define B_ANIM_STATUS_FRZ 0x6
#define B_ANIM_STATUS_CURSED 0x7
#define B_ANIM_STATUS_NIGHTMARE 0x8
#define B_ANIM_STATUS_WRAPPED 0x9
#define GET_STAT_BUFF_ID(n)((n & 0xF)) // first four bits 0x1, 0x2, 0x4, 0x8 #define GET_STAT_BUFF_ID(n)((n & 0xF)) // first four bits 0x1, 0x2, 0x4, 0x8
#define GET_STAT_BUFF_VALUE(n)(((n >> 4) & 7)) // 0x10, 0x20, 0x40 #define GET_STAT_BUFF_VALUE(n)(((n >> 4) & 7)) // 0x10, 0x20, 0x40
#define STAT_BUFF_NEGATIVE 0x80 // 0x80, the sign bit #define STAT_BUFF_NEGATIVE 0x80 // 0x80, the sign bit
@ -857,50 +881,6 @@ bool8 LoadChosenBattleElement(u8 caseId);
void DrawMainBattleBackground(void); void DrawMainBattleBackground(void);
void task00_0800F6FC(u8 taskId); void task00_0800F6FC(u8 taskId);
// battle_5
void AllocateBattleResrouces(void);
void FreeBattleResources(void);
void AdjustFriendshipOnBattleFaint(u8 bank);
void sub_80571DC(u8 bank, u8 arg1);
u32 sub_805725C(u8 bank);
// battle 7
void AllocateBattleSpritesData(void);
void FreeBattleSpritesData(void);
void AllocateMonSpritesGfx(void);
void FreeMonSpritesGfx(void);
void BattleMusicStop(void);
void sub_805E990(struct Pokemon *mon, u8 bank);
void sub_805EF14(void);
bool8 BattleInitAllSprites(u8 *state1, u8 *state2);
void sub_805E350(void);
bool8 BattleLoadAllHealthBoxesGfx(u8 state);
void LoadAndCreateEnemyShadowSprites(void);
void SetBankEnemyShadowSpriteCallback(u8 bank, u16 species);
void BattleLoadPlayerMonSpriteGfx(struct Pokemon *mon, u8 bank);
void BattleLoadOpponentMonSpriteGfx(struct Pokemon *mon, u8 bank);
void BattleLoadSubstituteSpriteGfx(u8 bank, bool8 arg1);
void nullsub_24(u16 arg0);
void nullsub_25(u8 arg0);
void ClearTemporarySpeciesSpriteData(u8 bank, bool8 dontClearSubstitute);
void sub_805D714(struct Sprite *sprite);
void DecompressTrainerBackPic(u16 backPicId, u8 bank);
void DecompressTrainerFrontPic(u16 frontPicId, u8 bank);
void FreeTrainerFrontPicPalette(u16 frontPicId);
void sub_805D7AC(struct Sprite *sprite);
bool8 IsMoveWithoutAnimation(u16 moveId, u8 animationTurn);
void sub_805EB9C(u8 arg0);
void sub_805E394(void);
void TrySetBehindSubstituteSpriteBit(u8 bank, u16 move);
void DoStatusAnimation(bool8 isStatus2, u32 status);
void DoSpecialBattleAnimation(u8 activeBank, u8 atkBank, u8 defBank, u8 tableId);
bool8 DoBattleAnimationFromTable(u8 active, u8 atkBank, u8 defBank, u8 tableId, u16 argument);
void CopyBattleSpriteInvisibility(u8 bank);
u16 ChooseMoveAndTargetInBattlePalace(void);
void LoadBattleBarGfx(u8 arg0);
bool8 mplay_80342A4(u8 bank);
void sub_805EEE0(u8 bank);
enum enum
{ {
BACK_PIC_BRENDAN, BACK_PIC_BRENDAN,
@ -921,7 +901,7 @@ u8 GetBankByIdentity(u8 bank);
struct BattleSpriteInfo struct BattleSpriteInfo
{ {
u16 invisible : 1; // 0x1 u16 invisible : 1; // 0x1
u16 flag_x2 : 1; // 0x2 u16 lowHpSong : 1; // 0x2
u16 behindSubstitute : 1; // 0x4 u16 behindSubstitute : 1; // 0x4
u16 flag_x8 : 1; // 0x8 u16 flag_x8 : 1; // 0x8
u16 hpNumbersNoBars : 1; // 0x10 u16 hpNumbersNoBars : 1; // 0x10
@ -930,7 +910,7 @@ struct BattleSpriteInfo
struct BattleAnimationInfo struct BattleAnimationInfo
{ {
u16 field; // to fill up later u16 animArg; // to fill up later
u8 field_2; u8 field_2;
u8 field_3; u8 field_3;
u8 field_4; u8 field_4;
@ -944,6 +924,12 @@ struct BattleAnimationInfo
u8 field_9_x20 : 1; u8 field_9_x20 : 1;
u8 field_9_x40 : 1; u8 field_9_x40 : 1;
u8 field_9_x80 : 1; u8 field_9_x80 : 1;
u8 field_A;
u8 field_B;
u8 field_C;
u8 field_D;
u8 field_E;
u8 field_F;
}; };
struct BattleHealthboxInfo struct BattleHealthboxInfo
@ -966,7 +952,7 @@ struct BattleHealthboxInfo
u8 animationState; u8 animationState;
u8 field_5; u8 field_5;
u8 field_6; u8 field_6;
u8 field_7; u8 shadowSpriteId;
u8 field_8; u8 field_8;
u8 field_9; u8 field_9;
u8 field_A; u8 field_A;
@ -997,6 +983,9 @@ extern struct BattleSpriteData *gBattleSpritesDataPtr;
extern u8 *gLinkBattleSendBuffer; extern u8 *gLinkBattleSendBuffer;
extern u8 *gLinkBattleRecvBuffer; extern u8 *gLinkBattleRecvBuffer;
extern u8 *gUnknown_0202305C;
extern u8 *gUnknown_02023060;
// Move this somewhere else // Move this somewhere else
#include "sprite.h" #include "sprite.h"
@ -1006,8 +995,11 @@ struct MonSpritesGfx
void* firstDecompressed; // ptr to the decompressed sprite of the first pokemon void* firstDecompressed; // ptr to the decompressed sprite of the first pokemon
void* sprites[4]; void* sprites[4];
struct SpriteTemplate templates[4]; struct SpriteTemplate templates[4];
u8 field_74[0x100]; struct SpriteFrameImage field_74[4][4];
u8 *fontPixels; u8 field_F4[0x80];
u8 *barFontGfx;
void *field_178;
void *field_17C;
}; };
extern struct BattleSpritesGfx* gMonSpritesGfx; extern struct BattleSpritesGfx* gMonSpritesGfx;

View File

@ -92,7 +92,11 @@ u8 sub_80A6D94(void);
u8 sub_80A8364(u8); u8 sub_80A8364(u8);
void StoreSpriteCallbackInData6(struct Sprite *sprite, void (*spriteCallback)(struct Sprite*)); void StoreSpriteCallbackInData6(struct Sprite *sprite, void (*spriteCallback)(struct Sprite*));
void oamt_add_pos2_onto_pos1(struct Sprite *sprite); void oamt_add_pos2_onto_pos1(struct Sprite *sprite);
u8 sub_80A6138(u8 bank); u8 GetBankSpriteDefault_Y(u8 bank);
u8 sub_80A82E4(u8 bank); u8 sub_80A82E4(u8 bank);
u8 GetSubstituteSpriteDefault_Y(u8 bank);
// battle_anim_80A9C70.s
void LaunchStatusAnimation(u8 bank, u8 statusAnimId);
#endif // GUARD_BATTLE_ANIM_H #endif // GUARD_BATTLE_ANIM_H

View File

@ -0,0 +1,50 @@
#ifndef GUARD_BATTLE_GFX_SFX_UTIL
#define GUARD_BATTLE_GFX_SFX_UTIL
void AllocateBattleSpritesData(void);
void FreeBattleSpritesData(void);
u16 ChooseMoveAndTargetInBattlePalace(void);
void sub_805D714(struct Sprite *sprite);
void sub_805D770(struct Sprite *sprite, bool8 arg1);
void sub_805D7AC(struct Sprite *sprite);
void InitAndLaunchChosenStatusAnimation(bool8 isStatus2, u32 status);
bool8 TryHandleLaunchBattleTableAnimation(u8 activeBank, u8 atkBank, u8 defBank, u8 tableId, u16 argument);
void InitAndLaunchSpecialAnimation(u8 activeBank, u8 atkBank, u8 defBank, u8 tableId);
bool8 IsMoveWithoutAnimation(u16 moveId, u8 animationTurn);
bool8 mplay_80342A4(u8 bank);
void BattleLoadOpponentMonSpriteGfx(struct Pokemon *mon, u8 bank);
void BattleLoadPlayerMonSpriteGfx(struct Pokemon *mon, u8 bank);
void nullsub_23(void);
void nullsub_24(u16 species);
void DecompressTrainerFrontPic(u16 frontPicId, u8 bank);
void DecompressTrainerBackPic(u16 backPicId, u8 bank);
void nullsub_25(u8 arg0);
void FreeTrainerFrontPicPalette(u16 frontPicId);
void sub_805DFFC(void);
bool8 BattleLoadAllHealthBoxesGfx(u8 state);
void LoadBattleBarGfx(u8 arg0);
bool8 BattleInitAllSprites(u8 *state1, u8 *bank);
void ClearSpritesHealthboxAnimData(void);
void CopyAllBattleSpritesInvisibilities(void);
void CopyBattleSpriteInvisibility(u8 bank);
void HandleSpeciesGfxDataChange(u8 bankAtk, u8 bankDef, bool8 notTransform);
void BattleLoadSubstituteOrMonSpriteGfx(u8 bank, bool8 loadMonSprite);
void LoadBattleMonGfxAndAnimate(u8 bank, bool8 loadMonSprite, u8 spriteId);
void TrySetBehindSubstituteSpriteBit(u8 bank, u16 move);
void ClearBehindSubstituteBit(u8 bank);
void HandleLowHpMusicChange(struct Pokemon *mon, u8 bank);
void BattleStopLowHpSound(void);
u8 GetMonHPBarLevel(struct Pokemon *mon);
void sub_805EAE8(void);
void sub_805EB9C(u8 affineMode);
void LoadAndCreateEnemyShadowSprites(void);
void SpriteCB_SetInvisible(struct Sprite *sprite);
void SetBankEnemyShadowSpriteCallback(u8 bank, u16 species);
void EnemyShadowCallbackToSetInvisible(u8 bank);
void sub_805EF14(void);
void ClearTemporarySpeciesSpriteData(u8 bank, bool8 dontClearSubstitute);
void AllocateMonSpritesGfx(void);
void FreeMonSpritesGfx(void);
bool32 ShouldPlayNormalPokeCry(struct Pokemon *mon);
#endif // GUARD_BATTLE_GFX_SFX_UTIL

View File

@ -15,6 +15,15 @@ enum
EXP_BAR EXP_BAR
}; };
enum
{
HP_BAR_EMPTY,
HP_BAR_RED,
HP_BAR_YELLOW,
HP_BAR_GREEN,
HP_BAR_FULL,
};
#define TAG_HEALTHBOX_PLAYER1_TILE 0xD6FF #define TAG_HEALTHBOX_PLAYER1_TILE 0xD6FF
#define TAG_HEALTHBOX_PLAYER2_TILE 0xD700 #define TAG_HEALTHBOX_PLAYER2_TILE 0xD700
#define TAG_HEALTHBOX_OPPONENT1_TILE 0xD701 #define TAG_HEALTHBOX_OPPONENT1_TILE 0xD701

View File

@ -57,6 +57,6 @@ void HandleBattleWindow(u8 xStart, u8 yStart, u8 xEnd, u8 yEnd, u8 flags);
bool8 UproarWakeUpCheck(u8 bank); bool8 UproarWakeUpCheck(u8 bank);
extern void (* const gBattleScriptingCommandsTable[])(void); extern void (* const gBattleScriptingCommandsTable[])(void);
extern const u8 gUnknown_0831C494[]; extern const u8 gUnknown_0831C494[][4];
#endif // GUARD_BATTLE_SCRIPT_COMMANDS_H #endif // GUARD_BATTLE_SCRIPT_COMMANDS_H

10
include/battle_util2.h Normal file
View File

@ -0,0 +1,10 @@
#ifndef GUARD_BATTLE_UTIL2_H
#define GUARD_BATTLE_UTIL2_H
void AllocateBattleResources(void);
void FreeBattleResources(void);
void AdjustFriendshipOnBattleFaint(u8 bank);
void sub_80571DC(u8 bank, u8 arg1);
u32 sub_805725C(u8 bank);
#endif // GUARD_BATTLE_UTIL_H

View File

@ -20,6 +20,12 @@ struct ContestStruct_field_18
{ {
// unknown size // unknown size
u16 field_0; u16 field_0;
u16 field_2;
u16 field_4;
u16 field_6;
u32 field_8;
u32 field_C;
u32 field_10;
}; };
struct ContestResources struct ContestResources

View File

@ -3,6 +3,8 @@
#include "sprite.h" #include "sprite.h"
extern u8 gDecompressionBuffer[0x4000];
void LZDecompressWram(const void *src, void *dest); void LZDecompressWram(const void *src, void *dest);
void LZDecompressVram(const void *src, void *dest); void LZDecompressVram(const void *src, void *dest);

View File

@ -1,9 +1,9 @@
#ifndef GUARD_HALL_OF_FAME_H #ifndef GUARD_HALL_OF_FAME_H
#define GUARD_HALL_OF_FAME_H #define GUARD_HALL_OF_FAME_H
void sub_8141F90(void); void CB2_DoHallOfFameScreen(void);
void sub_8143648(u16 paletteTag, u8 arg1); void CB2_DoHallOfFameScreenDontSaveData(void);
void sub_81428CC(void); void CB2_DoHallOfFamePC(void);
void sub_8143680(int, u8); void sub_8175280(void);
#endif // GUARD_HALL_OF_FAME_H #endif // GUARD_HALL_OF_FAME_H

View File

@ -12,7 +12,7 @@ s32 GetStringWidthDifference(s32 fontId, const u8 *str, s32 totalWidth, s32 lett
s32 GetMaxWidthInMenuTable(const struct MenuAction *str, s32 arg1); s32 GetMaxWidthInMenuTable(const struct MenuAction *str, s32 arg1);
s32 sub_81DB3D8(const struct MenuAction *str, u8* arg1, s32 arg2); s32 sub_81DB3D8(const struct MenuAction *str, u8* arg1, s32 arg2);
// sub_81DB41C // sub_81DB41C
// sub_81DB468 // CopyMonCategoryText
// sub_81DB494 // sub_81DB494
// sub_81DB4DC // sub_81DB4DC
// sub_81DB554 // sub_81DB554

View File

@ -5,6 +5,12 @@
#define calloc(ct, sz) AllocZeroed((ct) * (sz)) #define calloc(ct, sz) AllocZeroed((ct) * (sz))
#define free Free #define free Free
#define FREE_AND_SET_NULL(ptr) \
{ \
free(ptr); \
ptr = NULL; \
}
extern u8 gHeap[]; extern u8 gHeap[];
void *Alloc(u32 size); void *Alloc(u32 size);
void *AllocZeroed(u32 size); void *AllocZeroed(u32 size);

View File

@ -2,7 +2,7 @@
#define GUARD_POKEDEX_H #define GUARD_POKEDEX_H
void ResetPokedex(void); void ResetPokedex(void);
const u8 *GetPokemonCategory(u16); void CopyMonCategoryText(u16 species, u8 *dst);
u16 GetPokedexHeightWeight(u16 dexNum, u8 data); u16 GetPokedexHeightWeight(u16 dexNum, u8 data);
u16 GetNationalPokedexCount(u8); u16 GetNationalPokedexCount(u8);
u16 GetHoennPokedexCount(u8); u16 GetHoennPokedexCount(u8);

View File

@ -612,8 +612,8 @@ u32 CanMonLearnTMHM(struct Pokemon *, u8);
u32 CanSpeciesLearnTMHM(u16 species, u8 tm); u32 CanSpeciesLearnTMHM(u16 species, u8 tm);
u8 GetMoveRelearnerMoves(struct Pokemon *mon, u16 *moves); u8 GetMoveRelearnerMoves(struct Pokemon *mon, u16 *moves);
void ClearBattleMonForms(void); void ClearBattleMonForms(void);
const u8 *pokemon_get_pal(struct Pokemon *mon); const u8 *GetMonFrontSpritePal(struct Pokemon *mon);
const u8 *species_and_otid_get_pal(u16, u32, u32); const u8 *GetFrontSpritePalFromSpeciesAndPersonality(u16, u32, u32);
const struct CompressedSpritePalette *sub_80409C8(u16, u32, u32); const struct CompressedSpritePalette *sub_80409C8(u16, u32, u32);
bool8 IsOtherTrainer(u32, u8 *); bool8 IsOtherTrainer(u32, u8 *);
void SetWildMonHeldItem(void); void SetWildMonHeldItem(void);

7
include/starter_choose.h Normal file
View File

@ -0,0 +1,7 @@
#ifndef GUARD_STARTER_CHOOSE_H
#define GUARD_STARTER_CHOOSE_H
u16 GetStarterPokemon(u16 chosenStarterId);
void CB2_ChooseStarter(void);
#endif // GUARD_STARTER_CHOOSE_H

View File

@ -16,7 +16,7 @@ void sub_8098858(u8 windowId, u16 tileNum, u8 palNum);
void sub_80989E0(u8 windowId, u16 tileNum, u8 palNum); void sub_80989E0(u8 windowId, u16 tileNum, u8 palNum);
void rbox_fill_rectangle(u8 windowId); void rbox_fill_rectangle(u8 windowId);
const u16* stdpal_get(u8 id); const u16* stdpal_get(u8 id);
const u16* sub_8098C64(void); const u16* GetOverworldTextboxPalettePtr(void);
void sub_8098C6C(u8 bg, u16 destOffset, u8 palOffset); void sub_8098C6C(u8 bg, u16 destOffset, u8 palOffset);
#endif // GUARD_TEXT_WINDOW_H #endif // GUARD_TEXT_WINDOW_H

View File

@ -60,9 +60,9 @@ SECTIONS {
src/battle_2.o(.text); src/battle_2.o(.text);
src/battle_util.o(.text); src/battle_util.o(.text);
src/battle_script_commands.o(.text); src/battle_script_commands.o(.text);
asm/battle_5.o(.text); src/battle_util2.o(.text);
src/battle_controller_player.o(.text); src/battle_controller_player.o(.text);
asm/battle_7.o(.text); src/battle_gfx_sfx_util.o(.text);
src/battle_controller_opponent.o(.text); src/battle_controller_opponent.o(.text);
src/battle_ai_switch_items.o(.text); src/battle_ai_switch_items.o(.text);
src/battle_controller_link_opponent.o(.text); src/battle_controller_link_opponent.o(.text);
@ -85,6 +85,7 @@ SECTIONS {
src/load_save.o(.text); src/load_save.o(.text);
asm/load_save.o(.text); asm/load_save.o(.text);
asm/trade.o(.text); asm/trade.o(.text);
src/berry_blender.o(.text);
asm/berry_blender.o(.text); asm/berry_blender.o(.text);
src/play_time.o(.text); src/play_time.o(.text);
src/new_game.o(.text); src/new_game.o(.text);
@ -175,7 +176,7 @@ SECTIONS {
asm/contest_painting.o(.text); asm/contest_painting.o(.text);
src/battle_ai_script_commands.o(.text); src/battle_ai_script_commands.o(.text);
asm/trader.o(.text); asm/trader.o(.text);
asm/starter_choose.o(.text); src/starter_choose.o(.text);
asm/wallclock.o(.text); asm/wallclock.o(.text);
asm/rom6.o(.text); asm/rom6.o(.text);
asm/battle_records.o(.text); asm/battle_records.o(.text);
@ -214,7 +215,7 @@ SECTIONS {
src/reset_save_heap.o(.text); src/reset_save_heap.o(.text);
asm/field_region_map.o(.text); asm/field_region_map.o(.text);
asm/battle_anim_8170478.o(.text); asm/battle_anim_8170478.o(.text);
asm/hall_of_fame.o(.text); src/hall_of_fame.o(.text);
asm/credits.o(.text); asm/credits.o(.text);
src/lottery_corner.o(.text); src/lottery_corner.o(.text);
src/diploma.o(.text); src/diploma.o(.text);
@ -344,11 +345,11 @@ SECTIONS {
src/util.o(.rodata); src/util.o(.rodata);
data/daycare.o(.rodata); data/daycare.o(.rodata);
src/egg_hatch.o(.rodata); src/egg_hatch.o(.rodata);
data/battle_7.o(.rodata); src/battle_gfx_sfx_util.o(.rodata);
src/battle_interface.o(.rodata); src/battle_interface.o(.rodata);
data/pokeball.o(.rodata); data/pokeball.o(.rodata);
data/trade.o(.rodata); data/trade.o(.rodata);
data/berry_blender.o(.rodata); src/berry_blender.o(.rodata);
src/new_game.o(.rodata); src/new_game.o(.rodata);
data/rom4.o(.rodata); data/rom4.o(.rodata);
data/tilesets.o(.rodata); data/tilesets.o(.rodata);
@ -422,6 +423,8 @@ SECTIONS {
data/contest_painting.o(.rodata); data/contest_painting.o(.rodata);
src/battle_ai_script_commands.o(.rodata); src/battle_ai_script_commands.o(.rodata);
data/data4.o(.rodata); data/data4.o(.rodata);
data/starter_choose.o(.rodata);
data/data4c.o(.rodata);
src/battle_controller_link_partner.o(.rodata); src/battle_controller_link_partner.o(.rodata);
src/battle_message.o(.rodata); src/battle_message.o(.rodata);
data/cable_car.o(.rodata); data/cable_car.o(.rodata);
@ -439,7 +442,7 @@ SECTIONS {
data/intro.o(.rodata); data/intro.o(.rodata);
data/field_region_map.o(.rodata); data/field_region_map.o(.rodata);
data/battle_anim_8170478.o(.rodata); data/battle_anim_8170478.o(.rodata);
data/hall_of_fame.o(.rodata); src/hall_of_fame.o(.rodata);
data/credits.o(.rodata); data/credits.o(.rodata);
src/lottery_corner.o(.rodata); src/lottery_corner.o(.rodata);
src/diploma.o(.rodata); src/diploma.o(.rodata);

View File

@ -354,7 +354,7 @@ static const u8 sUnknown_0831BCF3[] = {4, 4, 4, 4};
void CB2_InitBattle(void) void CB2_InitBattle(void)
{ {
MoveSaveBlocks_ResetHeap(); MoveSaveBlocks_ResetHeap();
AllocateBattleResrouces(); AllocateBattleResources();
AllocateBattleSpritesData(); AllocateBattleSpritesData();
AllocateMonSpritesGfx(); AllocateMonSpritesGfx();
sub_8185F84(); sub_8185F84();
@ -2845,9 +2845,9 @@ static void BattleStartClearSetData(void)
*(i + 3 * 8 + (u8*)(gBattleStruct->mirrorMoveArrays) + 0) = 0; *(i + 3 * 8 + (u8*)(gBattleStruct->mirrorMoveArrays) + 0) = 0;
} }
for (i = 0; i < 4; i++) for (i = 0; i < BATTLE_BANKS_COUNT; i++)
{ {
*(gBattleStruct->field_294 + i) = 6; *(gBattleStruct->AI_monToSwitchIntoId + i) = 6;
} }
gBattleStruct->field_DF = 0; gBattleStruct->field_DF = 0;
@ -2927,8 +2927,8 @@ void SwitchInClearSetData(void)
{ {
gDisableStructs[gActiveBank].substituteHP = disableStructCopy.substituteHP; gDisableStructs[gActiveBank].substituteHP = disableStructCopy.substituteHP;
gDisableStructs[gActiveBank].bankWithSureHit = disableStructCopy.bankWithSureHit; gDisableStructs[gActiveBank].bankWithSureHit = disableStructCopy.bankWithSureHit;
gDisableStructs[gActiveBank].perishSong1 = disableStructCopy.perishSong1; gDisableStructs[gActiveBank].perishSongTimer1 = disableStructCopy.perishSongTimer1;
gDisableStructs[gActiveBank].perishSong2 = disableStructCopy.perishSong2; gDisableStructs[gActiveBank].perishSongTimer2 = disableStructCopy.perishSongTimer2;
gDisableStructs[gActiveBank].bankPreventingEscape = disableStructCopy.bankPreventingEscape; gDisableStructs[gActiveBank].bankPreventingEscape = disableStructCopy.bankPreventingEscape;
} }
@ -3674,7 +3674,7 @@ static void TryDoEventsBeforeFirstTurn(void)
} }
for (i = 0; i < BATTLE_BANKS_COUNT; i++) for (i = 0; i < BATTLE_BANKS_COUNT; i++)
{ {
*(gBattleStruct->field_5C + i) = 6; *(gBattleStruct->monToSwitchIntoId + i) = 6;
gActionForBanks[i] = ACTION_INIT_VALUE; gActionForBanks[i] = ACTION_INIT_VALUE;
gChosenMovesByBanks[i] = MOVE_NONE; gChosenMovesByBanks[i] = MOVE_NONE;
} }
@ -3785,7 +3785,7 @@ void BattleTurnPassed(void)
} }
for (i = 0; i < 4; i++) for (i = 0; i < 4; i++)
*(gBattleStruct->field_5C + i) = 6; *(gBattleStruct->monToSwitchIntoId + i) = 6;
*(&gBattleStruct->field_91) = gAbsentBankFlags; *(&gBattleStruct->field_91) = gAbsentBankFlags;
BattleHandleAddTextPrinter(gText_EmptyString3, 0); BattleHandleAddTextPrinter(gText_EmptyString3, 0);
@ -3876,7 +3876,7 @@ void sub_803BDA0(u8 bank)
gUnknown_0203CF00[i] = *(bank * 3 + i + (u8*)(gBattleStruct->field_60)); gUnknown_0203CF00[i] = *(bank * 3 + i + (u8*)(gBattleStruct->field_60));
r4 = pokemon_order_func(gBattlePartyID[bank]); r4 = pokemon_order_func(gBattlePartyID[bank]);
r1 = pokemon_order_func(*(gBattleStruct->field_5C + bank)); r1 = pokemon_order_func(*(gBattleStruct->monToSwitchIntoId + bank));
sub_81B8FB0(r4, r1); sub_81B8FB0(r4, r1);
if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE) if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE)
@ -3924,7 +3924,7 @@ static void HandleTurnActionSelectionState(void)
gBattleCommunication[gActiveBank] = STATE_BEFORE_ACTION_CHOSEN; gBattleCommunication[gActiveBank] = STATE_BEFORE_ACTION_CHOSEN;
break; break;
case STATE_BEFORE_ACTION_CHOSEN: // choose an action case STATE_BEFORE_ACTION_CHOSEN: // choose an action
*(gBattleStruct->field_5C + gActiveBank) = 6; *(gBattleStruct->monToSwitchIntoId + gActiveBank) = 6;
if (gBattleTypeFlags & BATTLE_TYPE_MULTI if (gBattleTypeFlags & BATTLE_TYPE_MULTI
|| !(identity & BIT_MON) || !(identity & BIT_MON)
|| gBattleStruct->field_91 & gBitTable[GetBankByIdentity(identity ^ BIT_MON)] || gBattleStruct->field_91 & gBitTable[GetBankByIdentity(identity ^ BIT_MON)]
@ -4042,9 +4042,9 @@ static void HandleTurnActionSelectionState(void)
else else
{ {
if (gActiveBank == 2 && gActionForBanks[0] == ACTION_SWITCH) if (gActiveBank == 2 && gActionForBanks[0] == ACTION_SWITCH)
EmitChoosePokemon(0, 0, *(gBattleStruct->field_5C + 0), ABILITY_NONE, gBattleStruct->field_60[gActiveBank]); EmitChoosePokemon(0, 0, *(gBattleStruct->monToSwitchIntoId + 0), ABILITY_NONE, gBattleStruct->field_60[gActiveBank]);
else if (gActiveBank == 3 && gActionForBanks[1] == ACTION_SWITCH) else if (gActiveBank == 3 && gActionForBanks[1] == ACTION_SWITCH)
EmitChoosePokemon(0, 0, *(gBattleStruct->field_5C + 1), ABILITY_NONE, gBattleStruct->field_60[gActiveBank]); EmitChoosePokemon(0, 0, *(gBattleStruct->monToSwitchIntoId + 1), ABILITY_NONE, gBattleStruct->field_60[gActiveBank]);
else else
EmitChoosePokemon(0, 0, 6, ABILITY_NONE, gBattleStruct->field_60[gActiveBank]); EmitChoosePokemon(0, 0, 6, ABILITY_NONE, gBattleStruct->field_60[gActiveBank]);
} }
@ -4331,7 +4331,7 @@ static void HandleTurnActionSelectionState(void)
for (i = 0; i < gNoOfAllBanks; i++) for (i = 0; i < gNoOfAllBanks; i++)
{ {
if (gActionForBanks[i] == ACTION_SWITCH) if (gActionForBanks[i] == ACTION_SWITCH)
sub_80571DC(i, *(gBattleStruct->field_5C + i)); sub_80571DC(i, *(gBattleStruct->monToSwitchIntoId + i));
} }
} }
} }
@ -4355,7 +4355,7 @@ static bool8 sub_803CDB8(void)
static void sub_803CDF8(void) static void sub_803CDF8(void)
{ {
*(gBattleStruct->field_5C + gActiveBank) = gBattleBufferB[gActiveBank][1]; *(gBattleStruct->monToSwitchIntoId + gActiveBank) = gBattleBufferB[gActiveBank][1];
RecordedBattle_SetBankAction(gActiveBank, gBattleBufferB[gActiveBank][1]); RecordedBattle_SetBankAction(gActiveBank, gBattleBufferB[gActiveBank][1]);
if (gBattleTypeFlags & BATTLE_TYPE_LINK && gBattleTypeFlags & BATTLE_TYPE_MULTI) if (gBattleTypeFlags & BATTLE_TYPE_LINK && gBattleTypeFlags & BATTLE_TYPE_MULTI)
@ -4759,7 +4759,7 @@ static void HandleEndTurn_BattleWon(void)
else if (gBattleTypeFlags & BATTLE_TYPE_TRAINER else if (gBattleTypeFlags & BATTLE_TYPE_TRAINER
&& gBattleTypeFlags & (BATTLE_TYPE_FRONTIER | BATTLE_TYPE_x4000000 | BATTLE_TYPE_EREADER_TRAINER)) && gBattleTypeFlags & (BATTLE_TYPE_FRONTIER | BATTLE_TYPE_x4000000 | BATTLE_TYPE_EREADER_TRAINER))
{ {
BattleMusicStop(); BattleStopLowHpSound();
gBattlescriptCurrInstr = BattleScript_FrontierTrainerBattleWon; gBattlescriptCurrInstr = BattleScript_FrontierTrainerBattleWon;
if (gTrainerBattleOpponent_A == TRAINER_OPPONENT_3FE) if (gTrainerBattleOpponent_A == TRAINER_OPPONENT_3FE)
@ -4769,7 +4769,7 @@ static void HandleEndTurn_BattleWon(void)
} }
else if (gBattleTypeFlags & BATTLE_TYPE_TRAINER && !(gBattleTypeFlags & BATTLE_TYPE_LINK)) else if (gBattleTypeFlags & BATTLE_TYPE_TRAINER && !(gBattleTypeFlags & BATTLE_TYPE_LINK))
{ {
BattleMusicStop(); BattleStopLowHpSound();
gBattlescriptCurrInstr = BattleScript_LocalTrainerBattleWon; gBattlescriptCurrInstr = BattleScript_LocalTrainerBattleWon;
switch (gTrainers[gTrainerBattleOpponent_A].trainerClass) switch (gTrainers[gTrainerBattleOpponent_A].trainerClass)
@ -5610,7 +5610,7 @@ static void HandleAction_NothingIsFainted(void)
static void HandleAction_ActionFinished(void) static void HandleAction_ActionFinished(void)
{ {
*(gBattleStruct->field_5C + gBanksByTurnOrder[gCurrentTurnActionNumber]) = 6; *(gBattleStruct->monToSwitchIntoId + gBanksByTurnOrder[gCurrentTurnActionNumber]) = 6;
gCurrentTurnActionNumber++; gCurrentTurnActionNumber++;
gCurrentActionFuncId = gActionsByTurnOrder[gCurrentTurnActionNumber]; gCurrentActionFuncId = gActionsByTurnOrder[gCurrentTurnActionNumber];
SpecialStatusesClear(); SpecialStatusesClear();

View File

@ -36,9 +36,9 @@ static bool8 ShouldUseItem(void);
static bool8 ShouldSwitchIfPerishSong(void) static bool8 ShouldSwitchIfPerishSong(void)
{ {
if (gStatuses3[gActiveBank] & STATUS3_PERISH_SONG if (gStatuses3[gActiveBank] & STATUS3_PERISH_SONG
&& gDisableStructs[gActiveBank].perishSong1 == 0) && gDisableStructs[gActiveBank].perishSongTimer1 == 0)
{ {
*(gBattleStruct->field_294 + gActiveBank) = 6; *(gBattleStruct->AI_monToSwitchIntoId + gActiveBank) = 6;
EmitTwoReturnValues(1, ACTION_SWITCH, 0); EmitTwoReturnValues(1, ACTION_SWITCH, 0);
return TRUE; return TRUE;
} }
@ -120,7 +120,7 @@ static bool8 ShouldSwitchIfWonderGuard(void)
if (moveFlags & MOVESTATUS_SUPEREFFECTIVE && Random() % 3 < 2) if (moveFlags & MOVESTATUS_SUPEREFFECTIVE && Random() % 3 < 2)
{ {
// we found a mon // we found a mon
*(gBattleStruct->field_294 + gActiveBank) = i; *(gBattleStruct->AI_monToSwitchIntoId + gActiveBank) = i;
EmitTwoReturnValues(1, ACTION_SWITCH, 0); EmitTwoReturnValues(1, ACTION_SWITCH, 0);
return TRUE; return TRUE;
} }
@ -206,9 +206,9 @@ static bool8 FindMonThatAbsorbsOpponentsMove(void)
continue; continue;
if (i == gBattlePartyID[bankIn2]) if (i == gBattlePartyID[bankIn2])
continue; continue;
if (i == *(gBattleStruct->field_5C + bankIn1)) if (i == *(gBattleStruct->monToSwitchIntoId + bankIn1))
continue; continue;
if (i == *(gBattleStruct->field_5C + bankIn2)) if (i == *(gBattleStruct->monToSwitchIntoId + bankIn2))
continue; continue;
species = GetMonData(&party[i], MON_DATA_SPECIES); species = GetMonData(&party[i], MON_DATA_SPECIES);
@ -220,7 +220,7 @@ static bool8 FindMonThatAbsorbsOpponentsMove(void)
if (absorbingTypeAbility == monAbility && Random() & 1) if (absorbingTypeAbility == monAbility && Random() & 1)
{ {
// we found a mon // we found a mon
*(gBattleStruct->field_294 + gActiveBank) = i; *(gBattleStruct->AI_monToSwitchIntoId + gActiveBank) = i;
EmitTwoReturnValues(1, ACTION_SWITCH, 0); EmitTwoReturnValues(1, ACTION_SWITCH, 0);
return TRUE; return TRUE;
} }
@ -240,13 +240,13 @@ static bool8 ShouldSwitchIfNaturalCure(void)
if ((gUnknown_02024250[gActiveBank] == 0 || gUnknown_02024250[gActiveBank] == 0xFFFF) && Random() & 1) if ((gUnknown_02024250[gActiveBank] == 0 || gUnknown_02024250[gActiveBank] == 0xFFFF) && Random() & 1)
{ {
*(gBattleStruct->field_294 + gActiveBank) = 6; *(gBattleStruct->AI_monToSwitchIntoId + gActiveBank) = 6;
EmitTwoReturnValues(1, ACTION_SWITCH, 0); EmitTwoReturnValues(1, ACTION_SWITCH, 0);
return TRUE; return TRUE;
} }
else if (gBattleMoves[gUnknown_02024250[gActiveBank]].power == 0 && Random() & 1) else if (gBattleMoves[gUnknown_02024250[gActiveBank]].power == 0 && Random() & 1)
{ {
*(gBattleStruct->field_294 + gActiveBank) = 6; *(gBattleStruct->AI_monToSwitchIntoId + gActiveBank) = 6;
EmitTwoReturnValues(1, ACTION_SWITCH, 0); EmitTwoReturnValues(1, ACTION_SWITCH, 0);
return TRUE; return TRUE;
} }
@ -257,7 +257,7 @@ static bool8 ShouldSwitchIfNaturalCure(void)
return TRUE; return TRUE;
if (Random() & 1) if (Random() & 1)
{ {
*(gBattleStruct->field_294 + gActiveBank) = 6; *(gBattleStruct->AI_monToSwitchIntoId + gActiveBank) = 6;
EmitTwoReturnValues(1, ACTION_SWITCH, 0); EmitTwoReturnValues(1, ACTION_SWITCH, 0);
return TRUE; return TRUE;
} }
@ -400,9 +400,9 @@ static bool8 FindMonWithFlagsAndSuperEffective(u8 flags, u8 moduloPercent)
continue; continue;
if (i == gBattlePartyID[bankIn2]) if (i == gBattlePartyID[bankIn2])
continue; continue;
if (i == *(gBattleStruct->field_5C + bankIn1)) if (i == *(gBattleStruct->monToSwitchIntoId + bankIn1))
continue; continue;
if (i == *(gBattleStruct->field_5C + bankIn2)) if (i == *(gBattleStruct->monToSwitchIntoId + bankIn2))
continue; continue;
species = GetMonData(&party[i], MON_DATA_SPECIES); species = GetMonData(&party[i], MON_DATA_SPECIES);
@ -425,7 +425,7 @@ static bool8 FindMonWithFlagsAndSuperEffective(u8 flags, u8 moduloPercent)
moveFlags = AI_TypeCalc(move, gBattleMons[bankIn1].species, gBattleMons[bankIn1].ability); moveFlags = AI_TypeCalc(move, gBattleMons[bankIn1].species, gBattleMons[bankIn1].ability);
if (moveFlags & MOVESTATUS_SUPEREFFECTIVE && Random() % moduloPercent == 0) if (moveFlags & MOVESTATUS_SUPEREFFECTIVE && Random() % moduloPercent == 0)
{ {
*(gBattleStruct->field_294 + gActiveBank) = i; *(gBattleStruct->AI_monToSwitchIntoId + gActiveBank) = i;
EmitTwoReturnValues(1, ACTION_SWITCH, 0); EmitTwoReturnValues(1, ACTION_SWITCH, 0);
return TRUE; return TRUE;
} }
@ -508,9 +508,9 @@ static bool8 ShouldSwitch(void)
continue; continue;
if (i == gBattlePartyID[bankIn2]) if (i == gBattlePartyID[bankIn2])
continue; continue;
if (i == *(gBattleStruct->field_5C + bankIn1)) if (i == *(gBattleStruct->monToSwitchIntoId + bankIn1))
continue; continue;
if (i == *(gBattleStruct->field_5C + bankIn2)) if (i == *(gBattleStruct->monToSwitchIntoId + bankIn2))
continue; continue;
availableToSwitch++; availableToSwitch++;
@ -554,7 +554,7 @@ void AI_TrySwitchOrUseItem(void)
{ {
if (ShouldSwitch()) if (ShouldSwitch())
{ {
if (*(gBattleStruct->field_294 + gActiveBank) == 6) if (*(gBattleStruct->AI_monToSwitchIntoId + gActiveBank) == 6)
{ {
s32 monToSwitchId = GetMostSuitableMonToSwitchInto(); s32 monToSwitchId = GetMostSuitableMonToSwitchInto();
if (monToSwitchId == 6) if (monToSwitchId == 6)
@ -590,19 +590,19 @@ void AI_TrySwitchOrUseItem(void)
continue; continue;
if (monToSwitchId == gBattlePartyID[bankIn2]) if (monToSwitchId == gBattlePartyID[bankIn2])
continue; continue;
if (monToSwitchId == *(gBattleStruct->field_5C + bankIn1)) if (monToSwitchId == *(gBattleStruct->monToSwitchIntoId + bankIn1))
continue; continue;
if (monToSwitchId == *(gBattleStruct->field_5C + bankIn2)) if (monToSwitchId == *(gBattleStruct->monToSwitchIntoId + bankIn2))
continue; continue;
break; break;
} }
} }
*(gBattleStruct->field_294 + gActiveBank) = monToSwitchId; *(gBattleStruct->AI_monToSwitchIntoId + gActiveBank) = monToSwitchId;
} }
*(gBattleStruct->field_5C + gActiveBank) = *(gBattleStruct->field_294 + gActiveBank); *(gBattleStruct->monToSwitchIntoId + gActiveBank) = *(gBattleStruct->AI_monToSwitchIntoId + gActiveBank);
return; return;
} }
else if (ShouldUseItem()) else if (ShouldUseItem())
@ -614,28 +614,25 @@ void AI_TrySwitchOrUseItem(void)
EmitTwoReturnValues(1, ACTION_USE_MOVE, (gActiveBank ^ BIT_SIDE) << 8); EmitTwoReturnValues(1, ACTION_USE_MOVE, (gActiveBank ^ BIT_SIDE) << 8);
} }
#define TYPE_FORESIGHT 0xFE
#define TYPE_ENDTABLE 0xFF
static void ModulateByTypeEffectiveness(u8 atkType, u8 defType1, u8 defType2, u8 *var) static void ModulateByTypeEffectiveness(u8 atkType, u8 defType1, u8 defType2, u8 *var)
{ {
s32 i = 0; s32 i = 0;
while (gTypeEffectiveness[i] != TYPE_ENDTABLE) while (TYPE_EFFECT_ATK_TYPE(i) != TYPE_ENDTABLE)
{ {
if (gTypeEffectiveness[i] == TYPE_FORESIGHT) if (TYPE_EFFECT_ATK_TYPE(i) == TYPE_FORESIGHT)
{ {
i += 3; i += 3;
continue; continue;
} }
else if (gTypeEffectiveness[i] == atkType) else if (TYPE_EFFECT_ATK_TYPE(i) == atkType)
{ {
// check type1 // check type1
if (gTypeEffectiveness[i + 1] == defType1) if (TYPE_EFFECT_DEF_TYPE(i) == defType1)
*var = (*var * gTypeEffectiveness[i + 2]) / 10; *var = (*var * TYPE_EFFECT_MULTIPLIER(i)) / 10;
// check type2 // check type2
if (gTypeEffectiveness[i + 1] == defType2 && defType1 != defType2) if (TYPE_EFFECT_DEF_TYPE(i) == defType2 && defType1 != defType2)
*var = (*var * gTypeEffectiveness[i + 2]) / 10; *var = (*var * TYPE_EFFECT_MULTIPLIER(i)) / 10;
} }
i += 3; i += 3;
} }
@ -654,8 +651,8 @@ u8 GetMostSuitableMonToSwitchInto(void)
u8 invalidMons; u8 invalidMons;
u16 move; u16 move;
if (*(gBattleStruct->field_5C + gActiveBank) != 6) if (*(gBattleStruct->monToSwitchIntoId + gActiveBank) != 6)
return *(gBattleStruct->field_5C + gActiveBank); return *(gBattleStruct->monToSwitchIntoId + gActiveBank);
if (gBattleTypeFlags & BATTLE_TYPE_ARENA) if (gBattleTypeFlags & BATTLE_TYPE_ARENA)
return gBattlePartyID[gActiveBank] + 1; return gBattlePartyID[gActiveBank] + 1;
@ -711,8 +708,8 @@ u8 GetMostSuitableMonToSwitchInto(void)
&& !(gBitTable[i] & invalidMons) && !(gBitTable[i] & invalidMons)
&& gBattlePartyID[bankIn1] != i && gBattlePartyID[bankIn1] != i
&& gBattlePartyID[bankIn2] != i && gBattlePartyID[bankIn2] != i
&& i != *(gBattleStruct->field_5C + bankIn1) && i != *(gBattleStruct->monToSwitchIntoId + bankIn1)
&& i != *(gBattleStruct->field_5C + bankIn2)) && i != *(gBattleStruct->monToSwitchIntoId + bankIn2))
{ {
u8 type1 = gBaseStats[species].type1; u8 type1 = gBaseStats[species].type1;
u8 type2 = gBaseStats[species].type2; u8 type2 = gBaseStats[species].type2;
@ -771,9 +768,9 @@ u8 GetMostSuitableMonToSwitchInto(void)
continue; continue;
if (gBattlePartyID[bankIn2] == i) if (gBattlePartyID[bankIn2] == i)
continue; continue;
if (i == *(gBattleStruct->field_5C + bankIn1)) if (i == *(gBattleStruct->monToSwitchIntoId + bankIn1))
continue; continue;
if (i == *(gBattleStruct->field_5C + bankIn2)) if (i == *(gBattleStruct->monToSwitchIntoId + bankIn2))
continue; continue;
for (j = 0; j < 4; j++) for (j = 0; j < 4; j++)

View File

@ -449,7 +449,7 @@ static void sub_8064C58(void)
{ {
FreeSpriteOamMatrix(&gSprites[gBankSpriteIds[gActiveBank]]); FreeSpriteOamMatrix(&gSprites[gBankSpriteIds[gActiveBank]]);
DestroySprite(&gSprites[gBankSpriteIds[gActiveBank]]); DestroySprite(&gSprites[gBankSpriteIds[gActiveBank]]);
sub_805EEE0(gActiveBank); EnemyShadowCallbackToSetInvisible(gActiveBank);
SetHealthboxSpriteInvisible(gHealthBoxesIds[gActiveBank]); SetHealthboxSpriteInvisible(gHealthBoxesIds[gActiveBank]);
LinkOpponentBufferExecCompleted(); LinkOpponentBufferExecCompleted();
} }
@ -485,7 +485,7 @@ static void sub_8064D60(void)
if (gSprites[gHealthBoxesIds[gActiveBank]].callback == SpriteCallbackDummy) if (gSprites[gHealthBoxesIds[gActiveBank]].callback == SpriteCallbackDummy)
{ {
if (gBattleSpritesDataPtr->bankData[gActiveBank].behindSubstitute) if (gBattleSpritesDataPtr->bankData[gActiveBank].behindSubstitute)
DoSpecialBattleAnimation(gActiveBank, gActiveBank, gActiveBank, B_ANIM_MON_TO_SUBSTITUTE); InitAndLaunchSpecialAnimation(gActiveBank, gActiveBank, gActiveBank, B_ANIM_MON_TO_SUBSTITUTE);
gBattleBankFunc[gActiveBank] = sub_8064DD0; gBattleBankFunc[gActiveBank] = sub_8064DD0;
} }
@ -1164,7 +1164,7 @@ static void LinkOpponentHandleLoadMonSprite(void)
gBankSpriteIds[gActiveBank] = CreateSprite(&gUnknown_0202499C, gBankSpriteIds[gActiveBank] = CreateSprite(&gUnknown_0202499C,
sub_80A5C6C(gActiveBank, 2), sub_80A5C6C(gActiveBank, 2),
sub_80A6138(gActiveBank), GetBankSpriteDefault_Y(gActiveBank),
sub_80A82E4(gActiveBank)); sub_80A82E4(gActiveBank));
gSprites[gBankSpriteIds[gActiveBank]].pos2.x = -240; gSprites[gBankSpriteIds[gActiveBank]].pos2.x = -240;
@ -1198,7 +1198,7 @@ static void sub_8066494(u8 bank, bool8 dontClearSubstituteBit)
gBankSpriteIds[bank] = CreateSprite( gBankSpriteIds[bank] = CreateSprite(
&gUnknown_0202499C, &gUnknown_0202499C,
sub_80A5C6C(bank, 2), sub_80A5C6C(bank, 2),
sub_80A6138(bank), GetBankSpriteDefault_Y(bank),
sub_80A82E4(bank)); sub_80A82E4(bank));
gSprites[gUnknown_03005D7C[bank]].data1 = gBankSpriteIds[bank]; gSprites[gUnknown_03005D7C[bank]].data1 = gBankSpriteIds[bank];
@ -1227,7 +1227,7 @@ static void LinkOpponentHandleReturnMonToBall(void)
{ {
FreeSpriteOamMatrix(&gSprites[gBankSpriteIds[gActiveBank]]); FreeSpriteOamMatrix(&gSprites[gBankSpriteIds[gActiveBank]]);
DestroySprite(&gSprites[gBankSpriteIds[gActiveBank]]); DestroySprite(&gSprites[gBankSpriteIds[gActiveBank]]);
sub_805EEE0(gActiveBank); EnemyShadowCallbackToSetInvisible(gActiveBank);
SetHealthboxSpriteInvisible(gHealthBoxesIds[gActiveBank]); SetHealthboxSpriteInvisible(gHealthBoxesIds[gActiveBank]);
LinkOpponentBufferExecCompleted(); LinkOpponentBufferExecCompleted();
} }
@ -1239,7 +1239,7 @@ static void DoSwitchOutAnimation(void)
{ {
case 0: case 0:
if (gBattleSpritesDataPtr->bankData[gActiveBank].behindSubstitute) if (gBattleSpritesDataPtr->bankData[gActiveBank].behindSubstitute)
DoSpecialBattleAnimation(gActiveBank, gActiveBank, gActiveBank, B_ANIM_SUBSTITUTE_TO_MON); InitAndLaunchSpecialAnimation(gActiveBank, gActiveBank, gActiveBank, B_ANIM_SUBSTITUTE_TO_MON);
gBattleSpritesDataPtr->healthBoxesData[gActiveBank].animationState = 1; gBattleSpritesDataPtr->healthBoxesData[gActiveBank].animationState = 1;
break; break;
@ -1247,7 +1247,7 @@ static void DoSwitchOutAnimation(void)
if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBank].specialAnimActive) if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBank].specialAnimActive)
{ {
gBattleSpritesDataPtr->healthBoxesData[gActiveBank].animationState = 0; gBattleSpritesDataPtr->healthBoxesData[gActiveBank].animationState = 0;
DoSpecialBattleAnimation(gActiveBank, gActiveBank, gActiveBank, B_ANIM_SWITCH_OUT_OPPONENT_MON); InitAndLaunchSpecialAnimation(gActiveBank, gActiveBank, gActiveBank, B_ANIM_SWITCH_OUT_OPPONENT_MON);
gBattleBankFunc[gActiveBank] = sub_8064C58; gBattleBankFunc[gActiveBank] = sub_8064C58;
} }
break; break;
@ -1382,7 +1382,7 @@ static void LinkOpponentHandleFaintAnimation(void)
if (gBattleSpritesDataPtr->healthBoxesData[gActiveBank].animationState == 0) if (gBattleSpritesDataPtr->healthBoxesData[gActiveBank].animationState == 0)
{ {
if (gBattleSpritesDataPtr->bankData[gActiveBank].behindSubstitute) if (gBattleSpritesDataPtr->bankData[gActiveBank].behindSubstitute)
DoSpecialBattleAnimation(gActiveBank, gActiveBank, gActiveBank, B_ANIM_SUBSTITUTE_TO_MON); InitAndLaunchSpecialAnimation(gActiveBank, gActiveBank, gActiveBank, B_ANIM_SUBSTITUTE_TO_MON);
gBattleSpritesDataPtr->healthBoxesData[gActiveBank].animationState++; gBattleSpritesDataPtr->healthBoxesData[gActiveBank].animationState++;
} }
else else
@ -1455,7 +1455,7 @@ static void LinkOpponentDoMoveAnimation(void)
&& !gBattleSpritesDataPtr->bankData[gActiveBank].flag_x8) && !gBattleSpritesDataPtr->bankData[gActiveBank].flag_x8)
{ {
gBattleSpritesDataPtr->bankData[gActiveBank].flag_x8 = 1; gBattleSpritesDataPtr->bankData[gActiveBank].flag_x8 = 1;
DoSpecialBattleAnimation(gActiveBank, gActiveBank, gActiveBank, B_ANIM_SUBSTITUTE_TO_MON); InitAndLaunchSpecialAnimation(gActiveBank, gActiveBank, gActiveBank, B_ANIM_SUBSTITUTE_TO_MON);
} }
gBattleSpritesDataPtr->healthBoxesData[gActiveBank].animationState = 1; gBattleSpritesDataPtr->healthBoxesData[gActiveBank].animationState = 1;
break; break;
@ -1474,7 +1474,7 @@ static void LinkOpponentDoMoveAnimation(void)
sub_805EB9C(1); sub_805EB9C(1);
if (gBattleSpritesDataPtr->bankData[gActiveBank].behindSubstitute && multihit < 2) if (gBattleSpritesDataPtr->bankData[gActiveBank].behindSubstitute && multihit < 2)
{ {
DoSpecialBattleAnimation(gActiveBank, gActiveBank, gActiveBank, B_ANIM_MON_TO_SUBSTITUTE); InitAndLaunchSpecialAnimation(gActiveBank, gActiveBank, gActiveBank, B_ANIM_MON_TO_SUBSTITUTE);
gBattleSpritesDataPtr->bankData[gActiveBank].flag_x8 = 0; gBattleSpritesDataPtr->bankData[gActiveBank].flag_x8 = 0;
} }
gBattleSpritesDataPtr->healthBoxesData[gActiveBank].animationState = 3; gBattleSpritesDataPtr->healthBoxesData[gActiveBank].animationState = 3;
@ -1483,7 +1483,7 @@ static void LinkOpponentDoMoveAnimation(void)
case 3: case 3:
if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBank].specialAnimActive) if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBank].specialAnimActive)
{ {
sub_805E394(); CopyAllBattleSpritesInvisibilities();
TrySetBehindSubstituteSpriteBit(gActiveBank, gBattleBufferA[gActiveBank][1] | (gBattleBufferA[gActiveBank][2] << 8)); TrySetBehindSubstituteSpriteBit(gActiveBank, gBattleBufferA[gActiveBank][1] | (gBattleBufferA[gActiveBank][2] << 8));
gBattleSpritesDataPtr->healthBoxesData[gActiveBank].animationState = 0; gBattleSpritesDataPtr->healthBoxesData[gActiveBank].animationState = 0;
LinkOpponentBufferExecCompleted(); LinkOpponentBufferExecCompleted();
@ -1586,7 +1586,7 @@ static void LinkOpponentHandleStatusAnimation(void)
{ {
if (!mplay_80342A4(gActiveBank)) if (!mplay_80342A4(gActiveBank))
{ {
DoStatusAnimation(gBattleBufferA[gActiveBank][1], InitAndLaunchChosenStatusAnimation(gBattleBufferA[gActiveBank][1],
gBattleBufferA[gActiveBank][2] | (gBattleBufferA[gActiveBank][3] << 8) | (gBattleBufferA[gActiveBank][4] << 16) | (gBattleBufferA[gActiveBank][5] << 24)); gBattleBufferA[gActiveBank][2] | (gBattleBufferA[gActiveBank][3] << 8) | (gBattleBufferA[gActiveBank][4] << 16) | (gBattleBufferA[gActiveBank][5] << 24));
gBattleBankFunc[gActiveBank] = CompleteOnFinishedStatusAnimation; gBattleBankFunc[gActiveBank] = CompleteOnFinishedStatusAnimation;
} }
@ -1698,7 +1698,7 @@ static void LinkOpponentHandlePlayFanfareOrBGM(void)
{ {
if (gBattleBufferA[gActiveBank][3]) if (gBattleBufferA[gActiveBank][3])
{ {
BattleMusicStop(); BattleStopLowHpSound();
PlayBGM(gBattleBufferA[gActiveBank][1] | (gBattleBufferA[gActiveBank][2] << 8)); PlayBGM(gBattleBufferA[gActiveBank][1] | (gBattleBufferA[gActiveBank][2] << 8));
} }
else else
@ -1850,7 +1850,7 @@ static void LinkOpponentHandleBattleAnimation(void)
u8 animationId = gBattleBufferA[gActiveBank][1]; u8 animationId = gBattleBufferA[gActiveBank][1];
u16 argument = gBattleBufferA[gActiveBank][2] | (gBattleBufferA[gActiveBank][3] << 8); u16 argument = gBattleBufferA[gActiveBank][2] | (gBattleBufferA[gActiveBank][3] << 8);
if (DoBattleAnimationFromTable(gActiveBank, gActiveBank, gActiveBank, animationId, argument)) if (TryHandleLaunchBattleTableAnimation(gActiveBank, gActiveBank, gActiveBank, animationId, argument))
LinkOpponentBufferExecCompleted(); LinkOpponentBufferExecCompleted();
else else
gBattleBankFunc[gActiveBank] = CompleteOnFinishedBattleAnimation; gBattleBankFunc[gActiveBank] = CompleteOnFinishedBattleAnimation;

View File

@ -312,7 +312,7 @@ static void CompleteOnHealthbarDone(void)
} }
else else
{ {
sub_805E990(&gPlayerParty[gBattlePartyID[gActiveBank]], gActiveBank); HandleLowHpMusicChange(&gPlayerParty[gBattlePartyID[gActiveBank]], gActiveBank);
LinkPartnerBufferExecCompleted(); LinkPartnerBufferExecCompleted();
} }
} }
@ -373,7 +373,7 @@ static void sub_814B4E0(void)
{ {
CopyBattleSpriteInvisibility(gActiveBank); CopyBattleSpriteInvisibility(gActiveBank);
if (gBattleSpritesDataPtr->bankData[gActiveBank].behindSubstitute) if (gBattleSpritesDataPtr->bankData[gActiveBank].behindSubstitute)
DoSpecialBattleAnimation(gActiveBank, gActiveBank, gActiveBank, B_ANIM_MON_TO_SUBSTITUTE); InitAndLaunchSpecialAnimation(gActiveBank, gActiveBank, gActiveBank, B_ANIM_MON_TO_SUBSTITUTE);
gBattleBankFunc[gActiveBank] = sub_814B554; gBattleBankFunc[gActiveBank] = sub_814B554;
} }
@ -399,7 +399,7 @@ static void sub_814B5A8(void)
FreeSpritePaletteByTag(0x27F9); FreeSpritePaletteByTag(0x27F9);
CreateTask(c3_0802FDF4, 10); CreateTask(c3_0802FDF4, 10);
sub_805E990(&gPlayerParty[gBattlePartyID[gActiveBank]], gActiveBank); HandleLowHpMusicChange(&gPlayerParty[gBattlePartyID[gActiveBank]], gActiveBank);
StartSpriteAnim(&gSprites[gBankSpriteIds[gActiveBank]], 0); StartSpriteAnim(&gSprites[gBankSpriteIds[gActiveBank]], 0);
UpdateHealthboxAttribute(gHealthBoxesIds[gActiveBank], &gPlayerParty[gBattlePartyID[gActiveBank]], HEALTHBOX_ALL); UpdateHealthboxAttribute(gHealthBoxesIds[gActiveBank], &gPlayerParty[gBattlePartyID[gActiveBank]], HEALTHBOX_ALL);
sub_8076918(gActiveBank); sub_8076918(gActiveBank);
@ -1026,7 +1026,7 @@ static void SetLinkPartnerMonData(u8 monId)
break; break;
} }
sub_805E990(&gPlayerParty[gBattlePartyID[gActiveBank]], gActiveBank); HandleLowHpMusicChange(&gPlayerParty[gBattlePartyID[gActiveBank]], gActiveBank);
} }
static void LinkPartnerHandleSetRawMonData(void) static void LinkPartnerHandleSetRawMonData(void)
@ -1050,7 +1050,7 @@ static void LinkPartnerHandleLoadMonSprite(void)
gBankSpriteIds[gActiveBank] = CreateSprite(&gUnknown_0202499C, gBankSpriteIds[gActiveBank] = CreateSprite(&gUnknown_0202499C,
sub_80A5C6C(gActiveBank, 2), sub_80A5C6C(gActiveBank, 2),
sub_80A6138(gActiveBank), GetBankSpriteDefault_Y(gActiveBank),
sub_80A82E4(gActiveBank)); sub_80A82E4(gActiveBank));
gSprites[gBankSpriteIds[gActiveBank]].pos2.x = -240; gSprites[gBankSpriteIds[gActiveBank]].pos2.x = -240;
gSprites[gBankSpriteIds[gActiveBank]].data0 = gActiveBank; gSprites[gBankSpriteIds[gActiveBank]].data0 = gActiveBank;
@ -1081,7 +1081,7 @@ static void sub_814CC98(u8 bank, bool8 dontClearSubstituteBit)
gBankSpriteIds[bank] = CreateSprite( gBankSpriteIds[bank] = CreateSprite(
&gUnknown_0202499C, &gUnknown_0202499C,
sub_80A5C6C(bank, 2), sub_80A5C6C(bank, 2),
sub_80A6138(bank), GetBankSpriteDefault_Y(bank),
sub_80A82E4(bank)); sub_80A82E4(bank));
gSprites[gUnknown_03005D7C[bank]].data1 = gBankSpriteIds[bank]; gSprites[gUnknown_03005D7C[bank]].data1 = gBankSpriteIds[bank];
@ -1121,7 +1121,7 @@ static void DoSwitchOutAnimation(void)
{ {
case 0: case 0:
if (gBattleSpritesDataPtr->bankData[gActiveBank].behindSubstitute) if (gBattleSpritesDataPtr->bankData[gActiveBank].behindSubstitute)
DoSpecialBattleAnimation(gActiveBank, gActiveBank, gActiveBank, B_ANIM_SUBSTITUTE_TO_MON); InitAndLaunchSpecialAnimation(gActiveBank, gActiveBank, gActiveBank, B_ANIM_SUBSTITUTE_TO_MON);
gBattleSpritesDataPtr->healthBoxesData[gActiveBank].animationState = 1; gBattleSpritesDataPtr->healthBoxesData[gActiveBank].animationState = 1;
break; break;
@ -1129,7 +1129,7 @@ static void DoSwitchOutAnimation(void)
if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBank].specialAnimActive) if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBank].specialAnimActive)
{ {
gBattleSpritesDataPtr->healthBoxesData[gActiveBank].animationState = 0; gBattleSpritesDataPtr->healthBoxesData[gActiveBank].animationState = 0;
DoSpecialBattleAnimation(gActiveBank, gActiveBank, gActiveBank, B_ANIM_SWITCH_OUT_PLAYER_MON); InitAndLaunchSpecialAnimation(gActiveBank, gActiveBank, gActiveBank, B_ANIM_SWITCH_OUT_PLAYER_MON);
gBattleBankFunc[gActiveBank] = sub_814B3DC; gBattleBankFunc[gActiveBank] = sub_814B3DC;
} }
break; break;
@ -1201,7 +1201,7 @@ static void LinkPartnerHandleFaintAnimation(void)
if (gBattleSpritesDataPtr->healthBoxesData[gActiveBank].animationState == 0) if (gBattleSpritesDataPtr->healthBoxesData[gActiveBank].animationState == 0)
{ {
if (gBattleSpritesDataPtr->bankData[gActiveBank].behindSubstitute) if (gBattleSpritesDataPtr->bankData[gActiveBank].behindSubstitute)
DoSpecialBattleAnimation(gActiveBank, gActiveBank, gActiveBank, B_ANIM_SUBSTITUTE_TO_MON); InitAndLaunchSpecialAnimation(gActiveBank, gActiveBank, gActiveBank, B_ANIM_SUBSTITUTE_TO_MON);
gBattleSpritesDataPtr->healthBoxesData[gActiveBank].animationState++; gBattleSpritesDataPtr->healthBoxesData[gActiveBank].animationState++;
} }
else else
@ -1209,7 +1209,7 @@ static void LinkPartnerHandleFaintAnimation(void)
if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBank].specialAnimActive) if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBank].specialAnimActive)
{ {
gBattleSpritesDataPtr->healthBoxesData[gActiveBank].animationState = 0; gBattleSpritesDataPtr->healthBoxesData[gActiveBank].animationState = 0;
sub_805E990(&gPlayerParty[gBattlePartyID[gActiveBank]], gActiveBank); HandleLowHpMusicChange(&gPlayerParty[gBattlePartyID[gActiveBank]], gActiveBank);
PlaySE12WithPanning(SE_POKE_DEAD, PAN_SIDE_PLAYER); PlaySE12WithPanning(SE_POKE_DEAD, PAN_SIDE_PLAYER);
gSprites[gBankSpriteIds[gActiveBank]].data1 = 0; gSprites[gBankSpriteIds[gActiveBank]].data1 = 0;
gSprites[gBankSpriteIds[gActiveBank]].data2 = 5; gSprites[gBankSpriteIds[gActiveBank]].data2 = 5;
@ -1277,7 +1277,7 @@ static void LinkPartnerDoMoveAnimation(void)
&& !gBattleSpritesDataPtr->bankData[gActiveBank].flag_x8) && !gBattleSpritesDataPtr->bankData[gActiveBank].flag_x8)
{ {
gBattleSpritesDataPtr->bankData[gActiveBank].flag_x8 = 1; gBattleSpritesDataPtr->bankData[gActiveBank].flag_x8 = 1;
DoSpecialBattleAnimation(gActiveBank, gActiveBank, gActiveBank, B_ANIM_SUBSTITUTE_TO_MON); InitAndLaunchSpecialAnimation(gActiveBank, gActiveBank, gActiveBank, B_ANIM_SUBSTITUTE_TO_MON);
} }
gBattleSpritesDataPtr->healthBoxesData[gActiveBank].animationState = 1; gBattleSpritesDataPtr->healthBoxesData[gActiveBank].animationState = 1;
break; break;
@ -1296,7 +1296,7 @@ static void LinkPartnerDoMoveAnimation(void)
sub_805EB9C(1); sub_805EB9C(1);
if (gBattleSpritesDataPtr->bankData[gActiveBank].behindSubstitute && multihit < 2) if (gBattleSpritesDataPtr->bankData[gActiveBank].behindSubstitute && multihit < 2)
{ {
DoSpecialBattleAnimation(gActiveBank, gActiveBank, gActiveBank, B_ANIM_MON_TO_SUBSTITUTE); InitAndLaunchSpecialAnimation(gActiveBank, gActiveBank, gActiveBank, B_ANIM_MON_TO_SUBSTITUTE);
gBattleSpritesDataPtr->bankData[gActiveBank].flag_x8 = 0; gBattleSpritesDataPtr->bankData[gActiveBank].flag_x8 = 0;
} }
gBattleSpritesDataPtr->healthBoxesData[gActiveBank].animationState = 3; gBattleSpritesDataPtr->healthBoxesData[gActiveBank].animationState = 3;
@ -1305,7 +1305,7 @@ static void LinkPartnerDoMoveAnimation(void)
case 3: case 3:
if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBank].specialAnimActive) if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBank].specialAnimActive)
{ {
sub_805E394(); CopyAllBattleSpritesInvisibilities();
TrySetBehindSubstituteSpriteBit(gActiveBank, gBattleBufferA[gActiveBank][1] | (gBattleBufferA[gActiveBank][2] << 8)); TrySetBehindSubstituteSpriteBit(gActiveBank, gBattleBufferA[gActiveBank][1] | (gBattleBufferA[gActiveBank][2] << 8));
gBattleSpritesDataPtr->healthBoxesData[gActiveBank].animationState = 0; gBattleSpritesDataPtr->healthBoxesData[gActiveBank].animationState = 0;
LinkPartnerBufferExecCompleted(); LinkPartnerBufferExecCompleted();
@ -1408,7 +1408,7 @@ static void LinkPartnerHandleStatusAnimation(void)
{ {
if (!mplay_80342A4(gActiveBank)) if (!mplay_80342A4(gActiveBank))
{ {
DoStatusAnimation(gBattleBufferA[gActiveBank][1], InitAndLaunchChosenStatusAnimation(gBattleBufferA[gActiveBank][1],
gBattleBufferA[gActiveBank][2] | (gBattleBufferA[gActiveBank][3] << 8) | (gBattleBufferA[gActiveBank][4] << 16) | (gBattleBufferA[gActiveBank][5] << 24)); gBattleBufferA[gActiveBank][2] | (gBattleBufferA[gActiveBank][3] << 8) | (gBattleBufferA[gActiveBank][4] << 16) | (gBattleBufferA[gActiveBank][5] << 24));
gBattleBankFunc[gActiveBank] = CompleteOnFinishedStatusAnimation; gBattleBankFunc[gActiveBank] = CompleteOnFinishedStatusAnimation;
} }
@ -1520,7 +1520,7 @@ static void LinkPartnerHandlePlayFanfareOrBGM(void)
{ {
if (gBattleBufferA[gActiveBank][3]) if (gBattleBufferA[gActiveBank][3])
{ {
BattleMusicStop(); BattleStopLowHpSound();
PlayBGM(gBattleBufferA[gActiveBank][1] | (gBattleBufferA[gActiveBank][2] << 8)); PlayBGM(gBattleBufferA[gActiveBank][1] | (gBattleBufferA[gActiveBank][2] << 8));
} }
else else
@ -1683,7 +1683,7 @@ static void LinkPartnerHandleBattleAnimation(void)
u8 animationId = gBattleBufferA[gActiveBank][1]; u8 animationId = gBattleBufferA[gActiveBank][1];
u16 argument = gBattleBufferA[gActiveBank][2] | (gBattleBufferA[gActiveBank][3] << 8); u16 argument = gBattleBufferA[gActiveBank][2] | (gBattleBufferA[gActiveBank][3] << 8);
if (DoBattleAnimationFromTable(gActiveBank, gActiveBank, gActiveBank, animationId, argument)) if (TryHandleLaunchBattleTableAnimation(gActiveBank, gActiveBank, gActiveBank, animationId, argument))
LinkPartnerBufferExecCompleted(); LinkPartnerBufferExecCompleted();
else else
gBattleBankFunc[gActiveBank] = CompleteOnFinishedBattleAnimation; gBattleBankFunc[gActiveBank] = CompleteOnFinishedBattleAnimation;

View File

@ -437,7 +437,7 @@ static void sub_805FB08(void)
{ {
FreeSpriteOamMatrix(&gSprites[gBankSpriteIds[gActiveBank]]); FreeSpriteOamMatrix(&gSprites[gBankSpriteIds[gActiveBank]]);
DestroySprite(&gSprites[gBankSpriteIds[gActiveBank]]); DestroySprite(&gSprites[gBankSpriteIds[gActiveBank]]);
sub_805EEE0(gActiveBank); EnemyShadowCallbackToSetInvisible(gActiveBank);
SetHealthboxSpriteInvisible(gHealthBoxesIds[gActiveBank]); SetHealthboxSpriteInvisible(gHealthBoxesIds[gActiveBank]);
OpponentBufferExecCompleted(); OpponentBufferExecCompleted();
} }
@ -473,7 +473,7 @@ static void sub_805FC10(void)
if (gSprites[gHealthBoxesIds[gActiveBank]].callback == SpriteCallbackDummy) if (gSprites[gHealthBoxesIds[gActiveBank]].callback == SpriteCallbackDummy)
{ {
if (gBattleSpritesDataPtr->bankData[gActiveBank].behindSubstitute) if (gBattleSpritesDataPtr->bankData[gActiveBank].behindSubstitute)
DoSpecialBattleAnimation(gActiveBank, gActiveBank, gActiveBank, B_ANIM_MON_TO_SUBSTITUTE); InitAndLaunchSpecialAnimation(gActiveBank, gActiveBank, gActiveBank, B_ANIM_MON_TO_SUBSTITUTE);
gBattleBankFunc[gActiveBank] = sub_805FC80; gBattleBankFunc[gActiveBank] = sub_805FC80;
} }
} }
@ -1152,7 +1152,7 @@ static void OpponentHandleLoadMonSprite(void)
gBankSpriteIds[gActiveBank] = CreateSprite(&gUnknown_0202499C, gBankSpriteIds[gActiveBank] = CreateSprite(&gUnknown_0202499C,
sub_80A5C6C(gActiveBank, 2), sub_80A5C6C(gActiveBank, 2),
sub_80A6138(gActiveBank), GetBankSpriteDefault_Y(gActiveBank),
sub_80A82E4(gActiveBank)); sub_80A82E4(gActiveBank));
gSprites[gBankSpriteIds[gActiveBank]].pos2.x = -240; gSprites[gBankSpriteIds[gActiveBank]].pos2.x = -240;
@ -1168,7 +1168,7 @@ static void OpponentHandleLoadMonSprite(void)
static void OpponentHandleSwitchInAnim(void) static void OpponentHandleSwitchInAnim(void)
{ {
*(gBattleStruct->field_5C + gActiveBank) = 6; *(gBattleStruct->monToSwitchIntoId + gActiveBank) = 6;
gBattlePartyID[gActiveBank] = gBattleBufferA[gActiveBank][1]; gBattlePartyID[gActiveBank] = gBattleBufferA[gActiveBank][1];
sub_80613DC(gActiveBank, gBattleBufferA[gActiveBank][2]); sub_80613DC(gActiveBank, gBattleBufferA[gActiveBank][2]);
gBattleBankFunc[gActiveBank] = sub_805FDF0; gBattleBankFunc[gActiveBank] = sub_805FDF0;
@ -1187,7 +1187,7 @@ static void sub_80613DC(u8 bank, bool8 dontClearSubstituteBit)
gBankSpriteIds[bank] = CreateSprite(&gUnknown_0202499C, gBankSpriteIds[bank] = CreateSprite(&gUnknown_0202499C,
sub_80A5C6C(bank, 2), sub_80A5C6C(bank, 2),
sub_80A6138(bank), GetBankSpriteDefault_Y(bank),
sub_80A82E4(bank)); sub_80A82E4(bank));
gSprites[gBankSpriteIds[bank]].data0 = bank; gSprites[gBankSpriteIds[bank]].data0 = bank;
@ -1217,7 +1217,7 @@ static void OpponentHandleReturnMonToBall(void)
{ {
FreeSpriteOamMatrix(&gSprites[gBankSpriteIds[gActiveBank]]); FreeSpriteOamMatrix(&gSprites[gBankSpriteIds[gActiveBank]]);
DestroySprite(&gSprites[gBankSpriteIds[gActiveBank]]); DestroySprite(&gSprites[gBankSpriteIds[gActiveBank]]);
sub_805EEE0(gActiveBank); EnemyShadowCallbackToSetInvisible(gActiveBank);
SetHealthboxSpriteInvisible(gHealthBoxesIds[gActiveBank]); SetHealthboxSpriteInvisible(gHealthBoxesIds[gActiveBank]);
OpponentBufferExecCompleted(); OpponentBufferExecCompleted();
} }
@ -1229,7 +1229,7 @@ static void DoSwitchOutAnimation(void)
{ {
case 0: case 0:
if (gBattleSpritesDataPtr->bankData[gActiveBank].behindSubstitute) if (gBattleSpritesDataPtr->bankData[gActiveBank].behindSubstitute)
DoSpecialBattleAnimation(gActiveBank, gActiveBank, gActiveBank, B_ANIM_SUBSTITUTE_TO_MON); InitAndLaunchSpecialAnimation(gActiveBank, gActiveBank, gActiveBank, B_ANIM_SUBSTITUTE_TO_MON);
gBattleSpritesDataPtr->healthBoxesData[gActiveBank].animationState = 1; gBattleSpritesDataPtr->healthBoxesData[gActiveBank].animationState = 1;
break; break;
@ -1237,7 +1237,7 @@ static void DoSwitchOutAnimation(void)
if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBank].specialAnimActive) if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBank].specialAnimActive)
{ {
gBattleSpritesDataPtr->healthBoxesData[gActiveBank].animationState = 0; gBattleSpritesDataPtr->healthBoxesData[gActiveBank].animationState = 0;
DoSpecialBattleAnimation(gActiveBank, gActiveBank, gActiveBank, B_ANIM_SWITCH_OUT_OPPONENT_MON); InitAndLaunchSpecialAnimation(gActiveBank, gActiveBank, gActiveBank, B_ANIM_SWITCH_OUT_OPPONENT_MON);
gBattleBankFunc[gActiveBank] = sub_805FB08; gBattleBankFunc[gActiveBank] = sub_805FB08;
} }
break; break;
@ -1415,7 +1415,7 @@ static void OpponentHandleFaintAnimation(void)
if (gBattleSpritesDataPtr->healthBoxesData[gActiveBank].animationState == 0) if (gBattleSpritesDataPtr->healthBoxesData[gActiveBank].animationState == 0)
{ {
if (gBattleSpritesDataPtr->bankData[gActiveBank].behindSubstitute) if (gBattleSpritesDataPtr->bankData[gActiveBank].behindSubstitute)
DoSpecialBattleAnimation(gActiveBank, gActiveBank, gActiveBank, B_ANIM_SUBSTITUTE_TO_MON); InitAndLaunchSpecialAnimation(gActiveBank, gActiveBank, gActiveBank, B_ANIM_SUBSTITUTE_TO_MON);
gBattleSpritesDataPtr->healthBoxesData[gActiveBank].animationState++; gBattleSpritesDataPtr->healthBoxesData[gActiveBank].animationState++;
} }
else else
@ -1487,7 +1487,7 @@ static void OpponentDoMoveAnimation(void)
&& !gBattleSpritesDataPtr->bankData[gActiveBank].flag_x8) && !gBattleSpritesDataPtr->bankData[gActiveBank].flag_x8)
{ {
gBattleSpritesDataPtr->bankData[gActiveBank].flag_x8 = 1; gBattleSpritesDataPtr->bankData[gActiveBank].flag_x8 = 1;
DoSpecialBattleAnimation(gActiveBank, gActiveBank, gActiveBank, B_ANIM_SUBSTITUTE_TO_MON); InitAndLaunchSpecialAnimation(gActiveBank, gActiveBank, gActiveBank, B_ANIM_SUBSTITUTE_TO_MON);
} }
gBattleSpritesDataPtr->healthBoxesData[gActiveBank].animationState = 1; gBattleSpritesDataPtr->healthBoxesData[gActiveBank].animationState = 1;
break; break;
@ -1506,7 +1506,7 @@ static void OpponentDoMoveAnimation(void)
sub_805EB9C(1); sub_805EB9C(1);
if (gBattleSpritesDataPtr->bankData[gActiveBank].behindSubstitute && multihit < 2) if (gBattleSpritesDataPtr->bankData[gActiveBank].behindSubstitute && multihit < 2)
{ {
DoSpecialBattleAnimation(gActiveBank, gActiveBank, gActiveBank, B_ANIM_MON_TO_SUBSTITUTE); InitAndLaunchSpecialAnimation(gActiveBank, gActiveBank, gActiveBank, B_ANIM_MON_TO_SUBSTITUTE);
gBattleSpritesDataPtr->bankData[gActiveBank].flag_x8 = 0; gBattleSpritesDataPtr->bankData[gActiveBank].flag_x8 = 0;
} }
gBattleSpritesDataPtr->healthBoxesData[gActiveBank].animationState = 3; gBattleSpritesDataPtr->healthBoxesData[gActiveBank].animationState = 3;
@ -1515,7 +1515,7 @@ static void OpponentDoMoveAnimation(void)
case 3: case 3:
if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBank].specialAnimActive) if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBank].specialAnimActive)
{ {
sub_805E394(); CopyAllBattleSpritesInvisibilities();
TrySetBehindSubstituteSpriteBit(gActiveBank, gBattleBufferA[gActiveBank][1] | (gBattleBufferA[gActiveBank][2] << 8)); TrySetBehindSubstituteSpriteBit(gActiveBank, gBattleBufferA[gActiveBank][1] | (gBattleBufferA[gActiveBank][2] << 8));
gBattleSpritesDataPtr->healthBoxesData[gActiveBank].animationState = 0; gBattleSpritesDataPtr->healthBoxesData[gActiveBank].animationState = 0;
OpponentBufferExecCompleted(); OpponentBufferExecCompleted();
@ -1627,7 +1627,7 @@ static void OpponentHandleChoosePokemon(void)
{ {
s32 chosenMonId; s32 chosenMonId;
if (*(gBattleStruct->field_294 + gActiveBank) == 6) if (*(gBattleStruct->AI_monToSwitchIntoId + gActiveBank) == 6)
{ {
chosenMonId = GetMostSuitableMonToSwitchInto(); chosenMonId = GetMostSuitableMonToSwitchInto();
@ -1670,12 +1670,12 @@ static void OpponentHandleChoosePokemon(void)
} }
else else
{ {
chosenMonId = *(gBattleStruct->field_294 + gActiveBank); chosenMonId = *(gBattleStruct->AI_monToSwitchIntoId + gActiveBank);
*(gBattleStruct->field_294 + gActiveBank) = 6; *(gBattleStruct->AI_monToSwitchIntoId + gActiveBank) = 6;
} }
*(gBattleStruct->field_5C + gActiveBank) = chosenMonId; *(gBattleStruct->monToSwitchIntoId + gActiveBank) = chosenMonId;
EmitChosenMonReturnValue(1, chosenMonId, NULL); EmitChosenMonReturnValue(1, chosenMonId, NULL);
OpponentBufferExecCompleted(); OpponentBufferExecCompleted();
} }
@ -1731,7 +1731,7 @@ static void OpponentHandleStatusAnimation(void)
{ {
if (!mplay_80342A4(gActiveBank)) if (!mplay_80342A4(gActiveBank))
{ {
DoStatusAnimation(gBattleBufferA[gActiveBank][1], InitAndLaunchChosenStatusAnimation(gBattleBufferA[gActiveBank][1],
gBattleBufferA[gActiveBank][2] | (gBattleBufferA[gActiveBank][3] << 8) | (gBattleBufferA[gActiveBank][4] << 16) | (gBattleBufferA[gActiveBank][5] << 24)); gBattleBufferA[gActiveBank][2] | (gBattleBufferA[gActiveBank][3] << 8) | (gBattleBufferA[gActiveBank][4] << 16) | (gBattleBufferA[gActiveBank][5] << 24));
gBattleBankFunc[gActiveBank] = CompleteOnFinishedStatusAnimation; gBattleBankFunc[gActiveBank] = CompleteOnFinishedStatusAnimation;
} }
@ -1843,7 +1843,7 @@ static void OpponentHandlePlayFanfareOrBGM(void)
{ {
if (gBattleBufferA[gActiveBank][3]) if (gBattleBufferA[gActiveBank][3])
{ {
BattleMusicStop(); BattleStopLowHpSound();
PlayBGM(gBattleBufferA[gActiveBank][1] | (gBattleBufferA[gActiveBank][2] << 8)); PlayBGM(gBattleBufferA[gActiveBank][1] | (gBattleBufferA[gActiveBank][2] << 8));
} }
else else
@ -2000,7 +2000,7 @@ static void OpponentHandleBattleAnimation(void)
u8 animationId = gBattleBufferA[gActiveBank][1]; u8 animationId = gBattleBufferA[gActiveBank][1];
u16 argument = gBattleBufferA[gActiveBank][2] | (gBattleBufferA[gActiveBank][3] << 8); u16 argument = gBattleBufferA[gActiveBank][2] | (gBattleBufferA[gActiveBank][3] << 8);
if (DoBattleAnimationFromTable(gActiveBank, gActiveBank, gActiveBank, animationId, argument)) if (TryHandleLaunchBattleTableAnimation(gActiveBank, gActiveBank, gActiveBank, animationId, argument))
OpponentBufferExecCompleted(); OpponentBufferExecCompleted();
else else
gBattleBankFunc[gActiveBank] = CompleteOnFinishedBattleAnimation; gBattleBankFunc[gActiveBank] = CompleteOnFinishedBattleAnimation;

Some files were not shown because too many files have changed in this diff Show More