Leahnaya/pokeemerald
1
0
Fork 0
mirror of https://github.com/pret/pokeemerald.git synced 2026-08-24 03:00:31 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into item_expansion

Browse Source
This commit is contained in:
DizzyEggg
2019-06-03 11:06:09 +02:00
parent c81d06b712 f64c1dfabf
commit 0eaddd251c
126 changed files with 4905 additions and 5404 deletions
Download Patch File Download Diff File Expand all files Collapse all files

876
asm/pokenav_unk_10.s
View File

@@ -1305,881 +1305,5 @@ _081D0E5A:
bx r1
thumb_func_end sub_81D0E00
thumb_func_start sub_81D0E60
sub_81D0E60: @ 81D0E60
push {r4,lr}
adds r4, r0, 0
ldr r0, =gUnknown_08624BB8
bl AddWindow
strh r0, [r4, 0xA]
lsls r0, 24
lsrs r0, 24
bl PutWindowTilemap
adds r0, r4, 0
bl sub_81D0E84
pop {r4}
pop {r0}
bx r0
.pool
thumb_func_end sub_81D0E60
thumb_func_start sub_81D0E84
sub_81D0E84: @ 81D0E84
push {r4,r5,lr}
sub sp, 0x10
adds r5, r0, 0
ldr r1, =gUnknown_08624BC0
add r0, sp, 0xC
movs r2, 0x3
bl memcpy
ldr r4, =gStringVar1
bl sub_81D07D8
adds r1, r0, 0
adds r0, r4, 0
movs r2, 0
movs r3, 0x2
bl ConvertIntToDecimalStringN
bl DynamicPlaceholderTextUtil_Reset
movs r0, 0
adds r1, r4, 0
bl DynamicPlaceholderTextUtil_SetPlaceholderPtr
ldr r4, =gStringVar4
ldr r1, =gText_RibbonsF700
adds r0, r4, 0
bl DynamicPlaceholderTextUtil_ExpandPlaceholders
ldrb r0, [r5, 0xA]
movs r1, 0x44
bl FillWindowPixelBuffer
ldrb r0, [r5, 0xA]
add r1, sp, 0xC
str r1, [sp]
movs r1, 0x1
negs r1, r1
str r1, [sp, 0x4]
str r4, [sp, 0x8]
movs r1, 0x1
movs r2, 0
movs r3, 0x1
bl AddTextPrinterParameterized3
ldrb r0, [r5, 0xA]
movs r1, 0x2
bl CopyWindowToVram
add sp, 0x10
pop {r4,r5}
pop {r0}
bx r0
.pool
thumb_func_end sub_81D0E84
thumb_func_start sub_81D0EFC
sub_81D0EFC: @ 81D0EFC
push {r4-r7,lr}
mov r7, r8
push {r7}
sub sp, 0x10
adds r7, r0, 0
bl sub_81D0954
adds r5, r0, 0
ldr r1, =gUnknown_08624BC0
add r0, sp, 0xC
movs r2, 0x3
bl memcpy
ldrb r0, [r7, 0xA]
movs r1, 0x44
bl FillWindowPixelBuffer
cmp r5, 0x18
bhi _081D0F60
lsls r1, r5, 3
ldr r0, =gRibbonDescriptionPointers
adds r6, r1, r0
movs r5, 0x80
lsls r5, 17
movs r4, 0x1
_081D0F2E:
ldrb r0, [r7, 0xA]
lsrs r3, r5, 24
add r1, sp, 0xC
str r1, [sp]
movs r1, 0x1
negs r1, r1
str r1, [sp, 0x4]
ldm r6!, {r1}
str r1, [sp, 0x8]
movs r1, 0x1
movs r2, 0
bl AddTextPrinterParameterized3
movs r0, 0x80
lsls r0, 21
adds r5, r0
subs r4, 0x1
cmp r4, 0
bge _081D0F2E
b _081D0FAA
.pool
_081D0F60:
ldr r0, =gSaveBlock1Ptr
ldr r0, [r0]
adds r0, r5
ldr r1, =0x0000318f
adds r0, r1
ldrb r5, [r0]
cmp r5, 0
beq _081D0FB2
subs r5, 0x1
movs r4, 0
ldr r0, =gGiftRibbonDescriptionPointers
mov r8, r0
movs r6, 0x80
lsls r6, 17
_081D0F7C:
ldrb r0, [r7, 0xA]
lsrs r3, r6, 24
add r1, sp, 0xC
str r1, [sp]
movs r1, 0x1
negs r1, r1
str r1, [sp, 0x4]
lsls r1, r4, 2
lsls r2, r5, 3
adds r1, r2
add r1, r8
ldr r1, [r1]
str r1, [sp, 0x8]
movs r1, 0x1
movs r2, 0
bl AddTextPrinterParameterized3
movs r0, 0x80
lsls r0, 21
adds r6, r0
adds r4, 0x1
cmp r4, 0x1
ble _081D0F7C
_081D0FAA:
ldrb r0, [r7, 0xA]
movs r1, 0x2
bl CopyWindowToVram
_081D0FB2:
add sp, 0x10
pop {r3}
mov r8, r3
pop {r4-r7}
pop {r0}
bx r0
.pool
thumb_func_end sub_81D0EFC
thumb_func_start sub_81D0FCC
sub_81D0FCC: @ 81D0FCC
push {r4,lr}
adds r4, r0, 0
ldr r0, =gUnknown_08624BC4
bl AddWindow
strh r0, [r4, 0x8]
lsls r0, 24
lsrs r0, 24
bl PutWindowTilemap
adds r0, r4, 0
bl sub_81D0FF0
pop {r4}
pop {r0}
bx r0
.pool
thumb_func_end sub_81D0FCC
thumb_func_start sub_81D0FF0
sub_81D0FF0: @ 81D0FF0
push {r4-r7,lr}
sub sp, 0x10
ldrh r7, [r0, 0x8]
ldrb r5, [r0, 0x8]
adds r0, r5, 0
movs r1, 0x11
bl FillWindowPixelBuffer
ldr r4, =gStringVar3
mov r6, sp
adds r6, 0xD
adds r0, r4, 0
add r1, sp, 0xC
adds r2, r6, 0
bl sub_81D06E4
movs r0, 0x1
str r0, [sp]
movs r0, 0xFF
str r0, [sp, 0x4]
movs r0, 0
str r0, [sp, 0x8]
adds r0, r5, 0
movs r1, 0x1
adds r2, r4, 0
movs r3, 0
bl AddTextPrinterParameterized
ldrb r0, [r6]
cmp r0, 0
beq _081D1040
cmp r0, 0xFE
beq _081D1048
ldr r1, =gUnknown_08624BE4
b _081D104A
.pool
_081D1040:
ldr r1, =gUnknown_08624BCC
b _081D104A
.pool
_081D1048:
ldr r1, =gUnknown_08624BD8
_081D104A:
ldr r5, =gStringVar1
adds r0, r5, 0
bl StringCopy
movs r1, 0xBA
strb r1, [r0]
adds r0, 0x1
movs r1, 0xF9
strb r1, [r0]
adds r0, 0x1
movs r1, 0x5
strb r1, [r0]
adds r0, 0x1
add r1, sp, 0xC
ldrb r1, [r1]
movs r2, 0
movs r3, 0x3
bl ConvertIntToDecimalStringN
lsls r4, r7, 24
lsrs r4, 24
movs r0, 0x1
str r0, [sp]
movs r0, 0xFF
str r0, [sp, 0x4]
movs r0, 0
str r0, [sp, 0x8]
adds r0, r4, 0
movs r1, 0x1
adds r2, r5, 0
movs r3, 0x3C
bl AddTextPrinterParameterized
adds r0, r4, 0
movs r1, 0x2
bl CopyWindowToVram
add sp, 0x10
pop {r4-r7}
pop {r0}
bx r0
.pool
thumb_func_end sub_81D0FF0
thumb_func_start sub_81D10A4
sub_81D10A4: @ 81D10A4
push {r4,lr}
adds r4, r0, 0
ldr r0, =gUnknown_08624BE8
bl AddWindow
strh r0, [r4, 0xC]
lsls r0, 24
lsrs r0, 24
movs r1, 0x11
bl FillWindowPixelBuffer
ldrb r0, [r4, 0xC]
bl PutWindowTilemap
adds r0, r4, 0
bl sub_81D10D0
pop {r4}
pop {r0}
bx r0
.pool
thumb_func_end sub_81D10A4
thumb_func_start sub_81D10D0
sub_81D10D0: @ 81D10D0
push {r4-r6,lr}
mov r6, r8
push {r6}
sub sp, 0xC
mov r8, r0
bl sub_81D06C4
adds r4, r0, 0
adds r4, 0x1
bl sub_81D06D4
adds r6, r0, 0
ldr r5, =gStringVar1
adds r0, r5, 0
adds r1, r4, 0
movs r2, 0x1
movs r3, 0x3
bl ConvertIntToDecimalStringN
movs r1, 0xBA
strb r1, [r0]
adds r0, 0x1
adds r1, r6, 0
movs r2, 0x1
movs r3, 0x3
bl ConvertIntToDecimalStringN
movs r0, 0x1
adds r1, r5, 0
movs r2, 0x38
bl GetStringCenterAlignXOffset
adds r3, r0, 0
mov r1, r8
ldrb r0, [r1, 0xC]
lsls r3, 24
lsrs r3, 24
movs r1, 0x1
str r1, [sp]
movs r1, 0xFF
str r1, [sp, 0x4]
movs r1, 0
str r1, [sp, 0x8]
movs r1, 0x1
adds r2, r5, 0
bl AddTextPrinterParameterized
mov r1, r8
ldrb r0, [r1, 0xC]
movs r1, 0x2
bl CopyWindowToVram
add sp, 0xC
pop {r3}
mov r8, r3
pop {r4-r6}
pop {r0}
bx r0
.pool
thumb_func_end sub_81D10D0
thumb_func_start sub_81D1148
sub_81D1148: @ 81D1148
push {r4,lr}
sub sp, 0xC
adds r4, r0, 0
add r1, sp, 0x4
add r2, sp, 0x8
mov r0, sp
bl sub_81D0760
bl ResetAllPicSprites
movs r0, 0x28
movs r1, 0x68
bl sub_81D1184
strh r0, [r4, 0x10]
movs r0, 0xF
movs r1, 0
bl sub_81C7990
add sp, 0xC
pop {r4}
pop {r0}
bx r0
thumb_func_end sub_81D1148
thumb_func_start sub_81D1178
sub_81D1178: @ 81D1178
push {lr}
ldrh r0, [r0, 0x10]
bl FreeAndDestroyMonPicSprite
pop {r0}
bx r0
thumb_func_end sub_81D1178
thumb_func_start sub_81D1184
sub_81D1184: @ 81D1184
push {lr}
sub sp, 0x1C
add r1, sp, 0x14
add r2, sp, 0x18
add r0, sp, 0x10
bl sub_81D0760
add r0, sp, 0x10
ldrh r0, [r0]
ldr r1, [sp, 0x18]
ldr r2, [sp, 0x14]
movs r3, 0x28
str r3, [sp]
movs r3, 0x68
str r3, [sp, 0x4]
movs r3, 0xF
str r3, [sp, 0x8]
ldr r3, =0x0000ffff
str r3, [sp, 0xC]
movs r3, 0x1
bl CreateMonPicSprite_HandleDeoxys
lsls r0, 16
lsrs r0, 16
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, 0x1C
pop {r1}
bx r1
.pool
thumb_func_end sub_81D1184
thumb_func_start sub_81D11D8
sub_81D11D8: @ 81D11D8
push {lr}
ldrh r1, [r0, 0x10]
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
ldr r1, =gSprites
adds r0, r1
movs r2, 0x20
negs r2, r2
movs r1, 0x28
movs r3, 0x6
bl sub_81D1258
pop {r0}
bx r0
.pool
thumb_func_end sub_81D11D8
thumb_func_start sub_81D11FC
sub_81D11FC: @ 81D11FC
push {r4,r5,lr}
adds r4, r0, 0
ldrh r0, [r4, 0x10]
bl FreeAndDestroyMonPicSprite
movs r5, 0x20
negs r5, r5
adds r0, r5, 0
movs r1, 0x68
bl sub_81D1184
strh r0, [r4, 0x10]
ldrh r1, [r4, 0x10]
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
ldr r1, =gSprites
adds r0, r1
adds r1, r5, 0
movs r2, 0x28
movs r3, 0x6
bl sub_81D1258
pop {r4,r5}
pop {r0}
bx r0
.pool
thumb_func_end sub_81D11FC
thumb_func_start sub_81D1234
sub_81D1234: @ 81D1234
ldr r2, =gSprites
ldrh r1, [r0, 0x10]
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
adds r2, 0x1C
adds r0, r2
ldr r1, [r0]
ldr r0, =SpriteCallbackDummy
eors r1, r0
negs r0, r1
orrs r0, r1
lsrs r0, 31
bx lr
.pool
thumb_func_end sub_81D1234
thumb_func_start sub_81D1258
sub_81D1258: @ 81D1258
push {r4-r6,lr}
adds r4, r0, 0
adds r6, r2, 0
adds r5, r3, 0
subs r0, r6, r1
strh r1, [r4, 0x20]
lsls r1, 4
strh r1, [r4, 0x2E]
lsls r0, 4
adds r1, r5, 0
bl __udivsi3
strh r0, [r4, 0x30]
strh r5, [r4, 0x32]
strh r6, [r4, 0x34]
ldr r0, =sub_81D1284
str r0, [r4, 0x1C]
pop {r4-r6}
pop {r0}
bx r0
.pool
thumb_func_end sub_81D1258
thumb_func_start sub_81D1284
sub_81D1284: @ 81D1284
push {lr}
adds r2, r0, 0
ldrh r1, [r2, 0x32]
movs r3, 0x32
ldrsh r0, [r2, r3]
cmp r0, 0
beq _081D12C8
subs r0, r1, 0x1
strh r0, [r2, 0x32]
ldrh r0, [r2, 0x30]
ldrh r1, [r2, 0x2E]
adds r0, r1
strh r0, [r2, 0x2E]
lsls r0, 16
asrs r0, 20
strh r0, [r2, 0x20]
movs r1, 0x20
negs r1, r1
cmp r0, r1
bgt _081D12BA
adds r0, r2, 0
adds r0, 0x3E
ldrb r1, [r0]
movs r2, 0x4
orrs r1, r2
strb r1, [r0]
b _081D12D0
_081D12BA:
adds r2, 0x3E
ldrb r1, [r2]
movs r0, 0x5
negs r0, r0
ands r0, r1
strb r0, [r2]
b _081D12D0
_081D12C8:
ldrh r0, [r2, 0x34]
strh r0, [r2, 0x20]
ldr r0, =SpriteCallbackDummy
str r0, [r2, 0x1C]
_081D12D0:
pop {r0}
bx r0
.pool
thumb_func_end sub_81D1284
thumb_func_start sub_81D12D8
sub_81D12D8: @ 81D12D8
push {r4-r6,lr}
bl sub_81D1350
ldr r5, =gUnknown_030012C0
adds r0, r5, 0
bl sub_81D0914
adds r6, r0, 0
ldr r2, =gUnknown_030012C4
movs r1, 0
str r1, [r2]
ldr r0, [r5]
cmp r1, r0
bcs _081D130A
adds r4, r2, 0
_081D12F6:
ldr r0, [r4]
ldm r6!, {r1}
bl sub_81D1370
ldr r1, [r4]
adds r1, 0x1
str r1, [r4]
ldr r0, [r5]
cmp r1, r0
bcc _081D12F6
_081D130A:
ldr r4, =gUnknown_030012C0
adds r0, r4, 0
bl sub_81D092C
adds r6, r0, 0
ldr r2, =gUnknown_030012C4
movs r1, 0
str r1, [r2]
ldr r0, [r4]
cmp r1, r0
bcs _081D133A
adds r4, r2, 0
_081D1322:
ldr r0, [r4]
adds r0, 0x1B
ldm r6!, {r1}
bl sub_81D1370
ldr r1, [r4]
adds r1, 0x1
str r1, [r4]
ldr r0, =gUnknown_030012C0
ldr r0, [r0]
cmp r1, r0
bcc _081D1322
_081D133A:
movs r0, 0x1
bl CopyBgTilemapBufferToVram
pop {r4-r6}
pop {r0}
bx r0
.pool
thumb_func_end sub_81D12D8
thumb_func_start sub_81D1350
sub_81D1350: @ 81D1350
push {lr}
sub sp, 0x8
movs r0, 0x20
str r0, [sp]
movs r0, 0x14
str r0, [sp, 0x4]
movs r0, 0x1
movs r1, 0
movs r2, 0
movs r3, 0
bl FillBgTilemapBufferRect_Palette0
add sp, 0x8
pop {r0}
bx r0
thumb_func_end sub_81D1350
thumb_func_start sub_81D1370
sub_81D1370: @ 81D1370
push {r4-r6,lr}
sub sp, 0x10
adds r4, r0, 0
adds r6, r1, 0
movs r1, 0x9
bl __umodsi3
adds r5, r0, 0
lsls r5, 1
adds r5, 0xB
adds r0, r4, 0
movs r1, 0x9
bl __udivsi3
adds r4, r0, 0
lsls r4, 1
adds r4, 0x4
add r0, sp, 0x8
adds r1, r6, 0
bl sub_81D13BC
lsls r5, 24
lsrs r5, 24
lsls r4, 24
lsrs r4, 24
movs r0, 0x2
str r0, [sp]
str r0, [sp, 0x4]
movs r0, 0x1
add r1, sp, 0x8
adds r2, r5, 0
adds r3, r4, 0
bl CopyToBgTilemapBufferRect
add sp, 0x10
pop {r4-r6}
pop {r0}
bx r0
thumb_func_end sub_81D1370
thumb_func_start sub_81D13BC
sub_81D13BC: @ 81D13BC
push {r4,r5,lr}
ldr r2, =gUnknown_08624BF8
lsls r1, 2
adds r1, r2
ldrh r3, [r1, 0x2]
adds r3, 0x2
lsls r3, 16
ldrh r1, [r1]
lsls r1, 1
adds r1, 0x1
lsls r1, 16
lsrs r1, 16
lsrs r3, 4
adds r2, r1, 0
orrs r2, r3
strh r2, [r0]
movs r5, 0x80
lsls r5, 3
adds r4, r5, 0
orrs r2, r4
strh r2, [r0, 0x2]
adds r1, 0x1
orrs r1, r3
strh r1, [r0, 0x4]
orrs r1, r4
strh r1, [r0, 0x6]
pop {r4,r5}
pop {r0}
bx r0
.pool
thumb_func_end sub_81D13BC
thumb_func_start sub_81D13FC
sub_81D13FC: @ 81D13FC
push {r4,lr}
adds r4, r0, 0
ldr r0, =gUnknown_08624C78
bl LoadCompressedSpriteSheet
ldr r0, =gUnknown_08624C80
bl Pokenav_AllocAndLoadPalettes
ldr r0, =gUnknown_08624D04
movs r1, 0
movs r2, 0
movs r3, 0
bl CreateSprite
lsls r0, 24
lsrs r0, 24
lsls r1, r0, 4
adds r1, r0
lsls r1, 2
ldr r0, =gSprites
adds r1, r0
str r1, [r4, 0x14]
adds r1, 0x3E
ldrb r0, [r1]
movs r2, 0x4
orrs r0, r2
strb r0, [r1]
pop {r4}
pop {r0}
bx r0
.pool
thumb_func_end sub_81D13FC
thumb_func_start sub_81D1448
sub_81D1448: @ 81D1448
push {r4-r6,lr}
mov r6, r8
push {r6}
adds r6, r0, 0
bl sub_81D0944
adds r4, r0, 0
lsls r4, 16
lsrs r4, 16
adds r0, r4, 0
movs r1, 0x9
bl __modsi3
adds r5, r0, 0
lsls r5, 4
adds r5, 0x60
adds r0, r4, 0
movs r1, 0x9
bl __divsi3
lsls r0, 4
adds r0, 0x28
ldr r1, [r6, 0x14]
movs r2, 0
mov r8, r2
strh r5, [r1, 0x20]
ldr r1, [r6, 0x14]
strh r0, [r1, 0x22]
bl sub_81D0954
adds r4, r0, 0
movs r0, 0x9
bl GetSpriteTileStartByTag
ldr r3, [r6, 0x14]
ldr r1, =gUnknown_08624BF8
lsls r4, 2
adds r4, r1
ldrh r1, [r4]
lsls r1, 4
adds r0, r1
ldr r2, =0x000003ff
adds r1, r2, 0
ands r0, r1
ldrh r2, [r3, 0x4]
ldr r1, =0xfffffc00
ands r1, r2
orrs r1, r0
strh r1, [r3, 0x4]
ldrh r0, [r4, 0x2]
adds r0, 0xF
lsls r0, 16
lsrs r0, 16
bl IndexOfSpritePaletteTag
ldr r3, [r6, 0x14]
lsls r0, 4
ldrb r2, [r3, 0x5]
movs r1, 0xF
ands r1, r2
orrs r1, r0
strb r1, [r3, 0x5]
ldr r0, [r6, 0x14]
movs r1, 0x1
bl StartSpriteAffineAnim
ldr r1, [r6, 0x14]
adds r1, 0x3E
ldrb r2, [r1]
movs r0, 0x5
negs r0, r0
ands r0, r2
strb r0, [r1]
ldr r0, [r6, 0x14]
mov r1, r8
strh r1, [r0, 0x2E]
ldr r1, [r6, 0x14]
ldr r0, =sub_81D1538
str r0, [r1, 0x1C]
pop {r3}
mov r8, r3
pop {r4-r6}
pop {r0}
bx r0
.pool
thumb_func_end sub_81D1448
thumb_func_start sub_81D1500
sub_81D1500: @ 81D1500
push {r4,lr}
adds r4, r0, 0
ldr r1, [r4, 0x14]
movs r0, 0x1
strh r0, [r1, 0x2E]
ldr r0, [r4, 0x14]
movs r1, 0x2
bl StartSpriteAffineAnim
ldr r1, [r4, 0x14]
ldr r0, =sub_81D1538
str r0, [r1, 0x1C]
pop {r4}
pop {r0}
bx r0
.pool
thumb_func_end sub_81D1500
thumb_func_start sub_81D1524
sub_81D1524: @ 81D1524
ldr r0, [r0, 0x14]
ldr r1, [r0, 0x1C]
ldr r0, =SpriteCallbackDummy
eors r1, r0
negs r0, r1
orrs r0, r1
lsrs r0, 31
bx lr
.pool
thumb_func_end sub_81D1524
thumb_func_start sub_81D1538
sub_81D1538: @ 81D1538
push {lr}
adds r3, r0, 0
adds r0, 0x3F
ldrb r1, [r0]
movs r0, 0x20
ands r0, r1
cmp r0, 0
beq _081D156A
movs r0, 0x3E
adds r0, r3
mov r12, r0
movs r0, 0x1
ldrh r1, [r3, 0x2E]
ands r1, r0
lsls r1, 2
mov r0, r12
ldrb r2, [r0]
movs r0, 0x5
negs r0, r0
ands r0, r2
orrs r0, r1
mov r1, r12
strb r0, [r1]
ldr r0, =SpriteCallbackDummy
str r0, [r3, 0x1C]
_081D156A:
pop {r0}
bx r0
.pool
thumb_func_end sub_81D1538
.align 2, 0 @ Don't pad with nop.

38
asm/pokenav_unk_2.s
View File

@@ -5,44 +5,6 @@
@ File centered around AllocSubstruct(2)
thumb_func_start sub_81C98D4
sub_81C98D4: @ 81C98D4
push {r4,lr}
movs r4, 0
_081C98D8:
adds r0, r4, 0
bl sub_81CB0C8
ldr r1, =gMapHeader
lsls r0, 24
lsrs r0, 24
ldrb r1, [r1, 0x14]
cmp r0, r1
bne _081C9914
adds r0, r4, 0
bl sub_81CAE08
cmp r0, 0
beq _081C9914
ldr r0, =gSaveBlock1Ptr
ldr r0, [r0]
ldr r1, =0x000009ca
adds r0, r1
adds r0, r4
ldrb r0, [r0]
cmp r0, 0
beq _081C9914
movs r0, 0x1
b _081C991C
.pool
_081C9914:
adds r4, 0x1
cmp r4, 0x4D
ble _081C98D8
movs r0, 0
_081C991C:
pop {r4}
pop {r1}
bx r1
thumb_func_end sub_81C98D4
thumb_func_start sub_81C9924
sub_81C9924: @ 81C9924

160
data/event_scripts.s
View File

@@ -848,86 +848,86 @@ Std_MsgboxAutoclose:: @ 8271494
return
EventScript_ResetAllBerries:: @ 827149D
setberrytree 2, 7, 5
setberrytree 1, 3, 5
setberrytree 11, 7, 5
setberrytree 13, 3, 5
setberrytree 4, 7, 5
setberrytree 76, 1, 5
setberrytree 8, 1, 5
setberrytree 10, 6, 5
setberrytree 25, 20, 5
setberrytree 26, 2, 5
setberrytree 66, 2, 5
setberrytree 67, 20, 5
setberrytree 69, 22, 5
setberrytree 70, 22, 5
setberrytree 71, 22, 5
setberrytree 55, 17, 5
setberrytree 56, 17, 5
setberrytree 5, 1, 5
setberrytree 6, 6, 5
setberrytree 7, 1, 5
setberrytree 16, 18, 5
setberrytree 17, 18, 5
setberrytree 18, 18, 5
setberrytree 29, 19, 5
setberrytree 28, 19, 5
setberrytree 27, 19, 5
setberrytree 24, 4, 5
setberrytree 23, 3, 5
setberrytree 22, 3, 5
setberrytree 21, 4, 5
setberrytree 19, 16, 5
setberrytree 20, 16, 5
setberrytree 80, 7, 5
setberrytree 81, 7, 5
setberrytree 77, 8, 5
setberrytree 78, 8, 5
setberrytree 68, 8, 5
setberrytree 31, 10, 5
setberrytree 33, 10, 5
setberrytree 34, 21, 5
setberrytree 35, 21, 5
setberrytree 36, 21, 5
setberrytree 83, 24, 5
setberrytree 84, 24, 5
setberrytree 85, 10, 5
setberrytree 86, 6, 5
setberrytree 37, 5, 5
setberrytree 38, 5, 5
setberrytree 39, 5, 5
setberrytree 40, 3, 5
setberrytree 41, 3, 5
setberrytree 42, 3, 5
setberrytree 46, 19, 5
setberrytree 45, 20, 5
setberrytree 44, 18, 5
setberrytree 43, 16, 5
setberrytree 47, 8, 5
setberrytree 48, 5, 5
setberrytree 49, 4, 5
setberrytree 50, 2, 5
setberrytree 52, 18, 5
setberrytree 53, 18, 5
setberrytree 62, 6, 5
setberrytree 64, 6, 5
setberrytree 58, 21, 5
setberrytree 59, 21, 5
setberrytree 60, 25, 5
setberrytree 61, 25, 5
setberrytree 79, 23, 5
setberrytree 14, 23, 5
setberrytree 15, 21, 5
setberrytree 30, 21, 5
setberrytree 65, 25, 5
setberrytree 72, 25, 5
setberrytree 73, 23, 5
setberrytree 74, 23, 5
setberrytree 87, 3, 5
setberrytree 88, 10, 5
setberrytree 89, 4, 5
setberrytree 82, 36, 5
setberrytree 2, ITEM_TO_BERRY(ITEM_ORAN_BERRY), 5
setberrytree 1, ITEM_TO_BERRY(ITEM_PECHA_BERRY), 5
setberrytree 11, ITEM_TO_BERRY(ITEM_ORAN_BERRY), 5
setberrytree 13, ITEM_TO_BERRY(ITEM_PECHA_BERRY), 5
setberrytree 4, ITEM_TO_BERRY(ITEM_ORAN_BERRY), 5
setberrytree 76, ITEM_TO_BERRY(ITEM_CHERI_BERRY), 5
setberrytree 8, ITEM_TO_BERRY(ITEM_CHERI_BERRY), 5
setberrytree 10, ITEM_TO_BERRY(ITEM_LEPPA_BERRY), 5
setberrytree 25, ITEM_TO_BERRY(ITEM_PINAP_BERRY), 5
setberrytree 26, ITEM_TO_BERRY(ITEM_CHESTO_BERRY), 5
setberrytree 66, ITEM_TO_BERRY(ITEM_CHESTO_BERRY), 5
setberrytree 67, ITEM_TO_BERRY(ITEM_PINAP_BERRY), 5
setberrytree 69, ITEM_TO_BERRY(ITEM_KELPSY_BERRY), 5
setberrytree 70, ITEM_TO_BERRY(ITEM_KELPSY_BERRY), 5
setberrytree 71, ITEM_TO_BERRY(ITEM_KELPSY_BERRY), 5
setberrytree 55, ITEM_TO_BERRY(ITEM_BLUK_BERRY), 5
setberrytree 56, ITEM_TO_BERRY(ITEM_BLUK_BERRY), 5
setberrytree 5, ITEM_TO_BERRY(ITEM_CHERI_BERRY), 5
setberrytree 6, ITEM_TO_BERRY(ITEM_LEPPA_BERRY), 5
setberrytree 7, ITEM_TO_BERRY(ITEM_CHERI_BERRY), 5
setberrytree 16, ITEM_TO_BERRY(ITEM_NANAB_BERRY), 5
setberrytree 17, ITEM_TO_BERRY(ITEM_NANAB_BERRY), 5
setberrytree 18, ITEM_TO_BERRY(ITEM_NANAB_BERRY), 5
setberrytree 29, ITEM_TO_BERRY(ITEM_WEPEAR_BERRY), 5
setberrytree 28, ITEM_TO_BERRY(ITEM_WEPEAR_BERRY), 5
setberrytree 27, ITEM_TO_BERRY(ITEM_WEPEAR_BERRY), 5
setberrytree 24, ITEM_TO_BERRY(ITEM_RAWST_BERRY), 5
setberrytree 23, ITEM_TO_BERRY(ITEM_PECHA_BERRY), 5
setberrytree 22, ITEM_TO_BERRY(ITEM_PECHA_BERRY), 5
setberrytree 21, ITEM_TO_BERRY(ITEM_RAWST_BERRY), 5
setberrytree 19, ITEM_TO_BERRY(ITEM_RAZZ_BERRY), 5
setberrytree 20, ITEM_TO_BERRY(ITEM_RAZZ_BERRY), 5
setberrytree 80, ITEM_TO_BERRY(ITEM_ORAN_BERRY), 5
setberrytree 81, ITEM_TO_BERRY(ITEM_ORAN_BERRY), 5
setberrytree 77, ITEM_TO_BERRY(ITEM_PERSIM_BERRY), 5
setberrytree 78, ITEM_TO_BERRY(ITEM_PERSIM_BERRY), 5
setberrytree 68, ITEM_TO_BERRY(ITEM_PERSIM_BERRY), 5
setberrytree 31, ITEM_TO_BERRY(ITEM_SITRUS_BERRY), 5
setberrytree 33, ITEM_TO_BERRY(ITEM_SITRUS_BERRY), 5
setberrytree 34, ITEM_TO_BERRY(ITEM_POMEG_BERRY), 5
setberrytree 35, ITEM_TO_BERRY(ITEM_POMEG_BERRY), 5
setberrytree 36, ITEM_TO_BERRY(ITEM_POMEG_BERRY), 5
setberrytree 83, ITEM_TO_BERRY(ITEM_HONDEW_BERRY), 5
setberrytree 84, ITEM_TO_BERRY(ITEM_HONDEW_BERRY), 5
setberrytree 85, ITEM_TO_BERRY(ITEM_SITRUS_BERRY), 5
setberrytree 86, ITEM_TO_BERRY(ITEM_LEPPA_BERRY), 5
setberrytree 37, ITEM_TO_BERRY(ITEM_ASPEAR_BERRY), 5
setberrytree 38, ITEM_TO_BERRY(ITEM_ASPEAR_BERRY), 5
setberrytree 39, ITEM_TO_BERRY(ITEM_ASPEAR_BERRY), 5
setberrytree 40, ITEM_TO_BERRY(ITEM_PECHA_BERRY), 5
setberrytree 41, ITEM_TO_BERRY(ITEM_PECHA_BERRY), 5
setberrytree 42, ITEM_TO_BERRY(ITEM_PECHA_BERRY), 5
setberrytree 46, ITEM_TO_BERRY(ITEM_WEPEAR_BERRY), 5
setberrytree 45, ITEM_TO_BERRY(ITEM_PINAP_BERRY), 5
setberrytree 44, ITEM_TO_BERRY(ITEM_NANAB_BERRY), 5
setberrytree 43, ITEM_TO_BERRY(ITEM_RAZZ_BERRY), 5
setberrytree 47, ITEM_TO_BERRY(ITEM_PERSIM_BERRY), 5
setberrytree 48, ITEM_TO_BERRY(ITEM_ASPEAR_BERRY), 5
setberrytree 49, ITEM_TO_BERRY(ITEM_RAWST_BERRY), 5
setberrytree 50, ITEM_TO_BERRY(ITEM_CHESTO_BERRY), 5
setberrytree 52, ITEM_TO_BERRY(ITEM_NANAB_BERRY), 5
setberrytree 53, ITEM_TO_BERRY(ITEM_NANAB_BERRY), 5
setberrytree 62, ITEM_TO_BERRY(ITEM_LEPPA_BERRY), 5
setberrytree 64, ITEM_TO_BERRY(ITEM_LEPPA_BERRY), 5
setberrytree 58, ITEM_TO_BERRY(ITEM_POMEG_BERRY), 5
setberrytree 59, ITEM_TO_BERRY(ITEM_POMEG_BERRY), 5
setberrytree 60, ITEM_TO_BERRY(ITEM_GREPA_BERRY), 5
setberrytree 61, ITEM_TO_BERRY(ITEM_GREPA_BERRY), 5
setberrytree 79, ITEM_TO_BERRY(ITEM_QUALOT_BERRY), 5
setberrytree 14, ITEM_TO_BERRY(ITEM_QUALOT_BERRY), 5
setberrytree 15, ITEM_TO_BERRY(ITEM_POMEG_BERRY), 5
setberrytree 30, ITEM_TO_BERRY(ITEM_POMEG_BERRY), 5
setberrytree 65, ITEM_TO_BERRY(ITEM_GREPA_BERRY), 5
setberrytree 72, ITEM_TO_BERRY(ITEM_GREPA_BERRY), 5
setberrytree 73, ITEM_TO_BERRY(ITEM_QUALOT_BERRY), 5
setberrytree 74, ITEM_TO_BERRY(ITEM_QUALOT_BERRY), 5
setberrytree 87, ITEM_TO_BERRY(ITEM_PECHA_BERRY), 5
setberrytree 88, ITEM_TO_BERRY(ITEM_SITRUS_BERRY), 5
setberrytree 89, ITEM_TO_BERRY(ITEM_RAWST_BERRY), 5
setberrytree 82, ITEM_TO_BERRY(ITEM_LIECHI_BERRY), 5
return
EventScript_ResetAllMapFlags:: @ 82715DE

128
data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc
View File

@@ -595,76 +595,76 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24C52F:: @ 824C52F
return
BattleFrontier_BattleDomeBattleRoom_EventScript_24C530:: @ 824C530
createvobject 46, 1, 3, 0, 3, 1
createvobject 22, 4, 6, 0, 3, 1
createvobject 5, 6, 8, 0, 3, 1
createvobject 12, 9, 11, 0, 3, 1
createvobject 46, 11, 13, 0, 3, 1
createvobject 66, 13, 15, 0, 3, 1
createvobject 45, 19, 7, 1, 3, 1
createvobject 34, 22, 11, 1, 3, 1
createvobject 11, 25, 15, 1, 3, 1
createvobject 35, 26, 2, 2, 3, 1
createvobject 38, 29, 5, 1, 3, 1
createvobject EVENT_OBJ_GFX_SCIENTIST_1, 1, 3, 0, 3, 1
createvobject EVENT_OBJ_GFX_EXPERT_F, 4, 6, 0, 3, 1
createvobject EVENT_OBJ_GFX_NINJA_BOY, 6, 8, 0, 3, 1
createvobject EVENT_OBJ_GFX_LITTLE_GIRL, 9, 11, 0, 3, 1
createvobject EVENT_OBJ_GFX_SCIENTIST_1, 11, 13, 0, 3, 1
createvobject EVENT_OBJ_GFX_MAN_5, 13, 15, 0, 3, 1
createvobject EVENT_OBJ_GFX_BEAUTY, 19, 7, 1, 3, 1
createvobject EVENT_OBJ_GFX_WOMAN_5, 22, 11, 1, 3, 1
createvobject EVENT_OBJ_GFX_LITTLE_BOY, 25, 15, 1, 3, 1
createvobject EVENT_OBJ_GFX_YOUNGSTER, 26, 2, 2, 3, 1
createvobject EVENT_OBJ_GFX_SCHOOL_KID_M, 29, 5, 1, 3, 1
return
BattleFrontier_BattleDomeBattleRoom_EventScript_24C594:: @ 824C594
createvobject 46, 1, 3, 0, 3, 1
createvobject 22, 4, 6, 0, 3, 1
createvobject 5, 6, 8, 0, 3, 1
createvobject 20, 7, 9, 0, 3, 1
createvobject 12, 9, 11, 0, 3, 1
createvobject 47, 10, 12, 0, 3, 1
createvobject 46, 11, 13, 0, 3, 1
createvobject 66, 13, 15, 0, 3, 1
createvobject 48, 15, 2, 1, 3, 1
createvobject 5, 16, 3, 1, 3, 1
createvobject 20, 17, 4, 1, 3, 1
createvobject 45, 19, 7, 1, 3, 1
createvobject 22, 20, 9, 1, 3, 1
createvobject 34, 22, 11, 1, 3, 1
createvobject 46, 23, 13, 1, 3, 1
createvobject 11, 25, 15, 1, 3, 1
createvobject 35, 26, 2, 2, 3, 1
createvobject 40, 28, 5, 2, 3, 1
createvobject 38, 29, 5, 1, 3, 1
createvobject 83, 30, 6, 2, 3, 1
createvobject 34, 31, 8, 2, 3, 1
createvobject EVENT_OBJ_GFX_SCIENTIST_1, 1, 3, 0, 3, 1
createvobject EVENT_OBJ_GFX_EXPERT_F, 4, 6, 0, 3, 1
createvobject EVENT_OBJ_GFX_NINJA_BOY, 6, 8, 0, 3, 1
createvobject EVENT_OBJ_GFX_WOMAN_2, 7, 9, 0, 3, 1
createvobject EVENT_OBJ_GFX_LITTLE_GIRL, 9, 11, 0, 3, 1
createvobject EVENT_OBJ_GFX_LASS, 10, 12, 0, 3, 1
createvobject EVENT_OBJ_GFX_SCIENTIST_1, 11, 13, 0, 3, 1
createvobject EVENT_OBJ_GFX_MAN_5, 13, 15, 0, 3, 1
createvobject EVENT_OBJ_GFX_GENTLEMAN, 15, 2, 1, 3, 1
createvobject EVENT_OBJ_GFX_NINJA_BOY, 16, 3, 1, 3, 1
createvobject EVENT_OBJ_GFX_WOMAN_2, 17, 4, 1, 3, 1
createvobject EVENT_OBJ_GFX_BEAUTY, 19, 7, 1, 3, 1
createvobject EVENT_OBJ_GFX_EXPERT_F, 20, 9, 1, 3, 1
createvobject EVENT_OBJ_GFX_WOMAN_5, 22, 11, 1, 3, 1
createvobject EVENT_OBJ_GFX_SCIENTIST_1, 23, 13, 1, 3, 1
createvobject EVENT_OBJ_GFX_LITTLE_BOY, 25, 15, 1, 3, 1
createvobject EVENT_OBJ_GFX_YOUNGSTER, 26, 2, 2, 3, 1
createvobject EVENT_OBJ_GFX_HEX_MANIAC, 28, 5, 2, 3, 1
createvobject EVENT_OBJ_GFX_SCHOOL_KID_M, 29, 5, 1, 3, 1
createvobject EVENT_OBJ_GFX_MART_EMPLOYEE, 30, 6, 2, 3, 1
createvobject EVENT_OBJ_GFX_WOMAN_5, 31, 8, 2, 3, 1
return
BattleFrontier_BattleDomeBattleRoom_EventScript_24C652:: @ 824C652
createvobject 5, 0, 2, 0, 3, 1
createvobject 46, 1, 3, 0, 3, 1
createvobject 45, 2, 15, 0, 3, 1
createvobject 66, 3, 5, 0, 3, 1
createvobject 22, 4, 6, 0, 3, 1
createvobject 46, 5, 7, 0, 3, 1
createvobject 5, 6, 8, 0, 3, 1
createvobject 20, 7, 9, 0, 3, 1
createvobject 24, 8, 10, 0, 3, 1
createvobject 12, 9, 11, 0, 3, 1
createvobject 47, 10, 12, 0, 3, 1
createvobject 46, 11, 13, 0, 3, 1
createvobject 45, 12, 14, 0, 3, 1
createvobject 66, 13, 15, 2, 3, 1
createvobject 55, 14, 12, 2, 3, 1
createvobject 48, 15, 2, 1, 3, 1
createvobject 5, 16, 3, 1, 3, 1
createvobject 20, 17, 4, 1, 3, 1
createvobject 24, 18, 6, 1, 3, 1
createvobject 45, 19, 7, 1, 3, 1
createvobject 22, 20, 9, 1, 3, 1
createvobject 23, 21, 10, 1, 3, 1
createvobject 34, 22, 11, 1, 3, 1
createvobject 46, 23, 13, 1, 3, 1
createvobject 48, 24, 14, 1, 3, 1
createvobject 11, 25, 15, 1, 3, 1
createvobject 35, 26, 2, 2, 3, 1
createvobject 17, 27, 3, 2, 3, 1
createvobject 40, 28, 5, 2, 3, 1
createvobject 38, 29, 5, 1, 3, 1
createvobject 83, 30, 6, 2, 3, 1
createvobject 34, 31, 8, 2, 3, 1
createvobject EVENT_OBJ_GFX_NINJA_BOY, 0, 2, 0, 3, 1
createvobject EVENT_OBJ_GFX_SCIENTIST_1, 1, 3, 0, 3, 1
createvobject EVENT_OBJ_GFX_BEAUTY, 2, 15, 0, 3, 1
createvobject EVENT_OBJ_GFX_MAN_5, 3, 5, 0, 3, 1
createvobject EVENT_OBJ_GFX_EXPERT_F, 4, 6, 0, 3, 1
createvobject EVENT_OBJ_GFX_SCIENTIST_1, 5, 7, 0, 3, 1
createvobject EVENT_OBJ_GFX_NINJA_BOY, 6, 8, 0, 3, 1
createvobject EVENT_OBJ_GFX_WOMAN_2, 7, 9, 0, 3, 1
createvobject EVENT_OBJ_GFX_WOMAN_3, 8, 10, 0, 3, 1
createvobject EVENT_OBJ_GFX_LITTLE_GIRL, 9, 11, 0, 3, 1
createvobject EVENT_OBJ_GFX_LASS, 10, 12, 0, 3, 1
createvobject EVENT_OBJ_GFX_SCIENTIST_1, 11, 13, 0, 3, 1
createvobject EVENT_OBJ_GFX_BEAUTY, 12, 14, 0, 3, 1
createvobject EVENT_OBJ_GFX_MAN_5, 13, 15, 2, 3, 1
createvobject EVENT_OBJ_GFX_HIKER, 14, 12, 2, 3, 1
createvobject EVENT_OBJ_GFX_GENTLEMAN, 15, 2, 1, 3, 1
createvobject EVENT_OBJ_GFX_NINJA_BOY, 16, 3, 1, 3, 1
createvobject EVENT_OBJ_GFX_WOMAN_2, 17, 4, 1, 3, 1
createvobject EVENT_OBJ_GFX_WOMAN_3, 18, 6, 1, 3, 1
createvobject EVENT_OBJ_GFX_BEAUTY, 19, 7, 1, 3, 1
createvobject EVENT_OBJ_GFX_EXPERT_F, 20, 9, 1, 3, 1
createvobject EVENT_OBJ_GFX_MAN_2, 21, 10, 1, 3, 1
createvobject EVENT_OBJ_GFX_WOMAN_5, 22, 11, 1, 3, 1
createvobject EVENT_OBJ_GFX_SCIENTIST_1, 23, 13, 1, 3, 1
createvobject EVENT_OBJ_GFX_GENTLEMAN, 24, 14, 1, 3, 1
createvobject EVENT_OBJ_GFX_LITTLE_BOY, 25, 15, 1, 3, 1
createvobject EVENT_OBJ_GFX_YOUNGSTER, 26, 2, 2, 3, 1
createvobject EVENT_OBJ_GFX_FAT_MAN, 27, 3, 2, 3, 1
createvobject EVENT_OBJ_GFX_HEX_MANIAC, 28, 5, 2, 3, 1
createvobject EVENT_OBJ_GFX_SCHOOL_KID_M, 29, 5, 1, 3, 1
createvobject EVENT_OBJ_GFX_MART_EMPLOYEE, 30, 6, 2, 3, 1
createvobject EVENT_OBJ_GFX_WOMAN_5, 31, 8, 2, 3, 1
return
BattleFrontier_BattleArenaBattleRoom_Movement_24C773: @ 824C773

158
data/maps/LinkContestRoom1/scripts.inc
View File

@@ -312,97 +312,97 @@ LinkContestRoom1_EventScript_23BB2B:: @ 823BB2B
return
LinkContestRoom1_EventScript_23BB78:: @ 823BB78
createvobject 5, 20, 3, 2, 3, 1
createvobject 46, 24, 11, 2, 3, 1
createvobject EVENT_OBJ_GFX_NINJA_BOY, 20, 3, 2, 3, 1
createvobject EVENT_OBJ_GFX_SCIENTIST_1, 24, 11, 2, 3, 1
return
LinkContestRoom1_EventScript_23BB8B:: @ 823BB8B
createvobject 45, 0, 2, 3, 3, 4
createvobject 66, 1, 2, 4, 3, 4
createvobject 55, 2, 2, 7, 3, 4
createvobject 46, 3, 2, 8, 3, 4
createvobject 5, 10, 12, 3, 3, 3
createvobject 20, 11, 12, 4, 3, 3
createvobject 24, 12, 12, 7, 3, 3
createvobject 12, 13, 12, 8, 3, 3
createvobject 47, 20, 3, 2, 3, 1
createvobject 46, 24, 11, 2, 3, 1
createvobject EVENT_OBJ_GFX_BEAUTY, 0, 2, 3, 3, 4
createvobject EVENT_OBJ_GFX_MAN_5, 1, 2, 4, 3, 4
createvobject EVENT_OBJ_GFX_HIKER, 2, 2, 7, 3, 4
createvobject EVENT_OBJ_GFX_SCIENTIST_1, 3, 2, 8, 3, 4
createvobject EVENT_OBJ_GFX_NINJA_BOY, 10, 12, 3, 3, 3
createvobject EVENT_OBJ_GFX_WOMAN_2, 11, 12, 4, 3, 3
createvobject EVENT_OBJ_GFX_WOMAN_3, 12, 12, 7, 3, 3
createvobject EVENT_OBJ_GFX_LITTLE_GIRL, 13, 12, 8, 3, 3
createvobject EVENT_OBJ_GFX_LASS, 20, 3, 2, 3, 1
createvobject EVENT_OBJ_GFX_SCIENTIST_1, 24, 11, 2, 3, 1
return
LinkContestRoom1_EventScript_23BBE6:: @ 823BBE6
createvobject 45, 0, 2, 3, 3, 4
createvobject 66, 1, 2, 4, 3, 4
createvobject 55, 2, 2, 7, 3, 4
createvobject 48, 3, 2, 8, 3, 4
createvobject 5, 10, 12, 3, 3, 3
createvobject 20, 11, 12, 4, 3, 3
createvobject 24, 12, 12, 7, 3, 3
createvobject 45, 13, 12, 8, 3, 3
createvobject 22, 20, 3, 2, 3, 1
createvobject 23, 20, 6, 2, 3, 1
createvobject 34, 20, 7, 2, 3, 1
createvobject 46, 24, 8, 2, 3, 1
createvobject 48, 24, 11, 2, 3, 1
createvobject 11, 25, 3, 9, 3, 2
createvobject 35, 26, 4, 9, 3, 2
createvobject 17, 27, 5, 9, 3, 2
createvobject 40, 28, 9, 9, 3, 2
createvobject 38, 29, 10, 9, 3, 2
createvobject 83, 30, 11, 9, 3, 2
createvobject EVENT_OBJ_GFX_BEAUTY, 0, 2, 3, 3, 4
createvobject EVENT_OBJ_GFX_MAN_5, 1, 2, 4, 3, 4
createvobject EVENT_OBJ_GFX_HIKER, 2, 2, 7, 3, 4
createvobject EVENT_OBJ_GFX_GENTLEMAN, 3, 2, 8, 3, 4
createvobject EVENT_OBJ_GFX_NINJA_BOY, 10, 12, 3, 3, 3
createvobject EVENT_OBJ_GFX_WOMAN_2, 11, 12, 4, 3, 3
createvobject EVENT_OBJ_GFX_WOMAN_3, 12, 12, 7, 3, 3
createvobject EVENT_OBJ_GFX_BEAUTY, 13, 12, 8, 3, 3
createvobject EVENT_OBJ_GFX_EXPERT_F, 20, 3, 2, 3, 1
createvobject EVENT_OBJ_GFX_MAN_2, 20, 6, 2, 3, 1
createvobject EVENT_OBJ_GFX_WOMAN_5, 20, 7, 2, 3, 1
createvobject EVENT_OBJ_GFX_SCIENTIST_1, 24, 8, 2, 3, 1
createvobject EVENT_OBJ_GFX_GENTLEMAN, 24, 11, 2, 3, 1
createvobject EVENT_OBJ_GFX_LITTLE_BOY, 25, 3, 9, 3, 2
createvobject EVENT_OBJ_GFX_YOUNGSTER, 26, 4, 9, 3, 2
createvobject EVENT_OBJ_GFX_FAT_MAN, 27, 5, 9, 3, 2
createvobject EVENT_OBJ_GFX_HEX_MANIAC, 28, 9, 9, 3, 2
createvobject EVENT_OBJ_GFX_SCHOOL_KID_M, 29, 10, 9, 3, 2
createvobject EVENT_OBJ_GFX_MART_EMPLOYEE, 30, 11, 9, 3, 2
return
LinkContestRoom1_EventScript_23BC92:: @ 823BC92
createvobject 45, 0, 2, 3, 3, 4
createvobject 66, 1, 2, 4, 3, 4
createvobject 55, 2, 2, 7, 3, 4
createvobject 12, 3, 2, 8, 3, 4
createvobject 39, 4, 1, 3, 3, 4
createvobject 34, 6, 1, 5, 3, 4
createvobject 26, 7, 1, 6, 3, 4
createvobject 48, 9, 1, 8, 3, 4
createvobject 5, 10, 12, 3, 3, 3
createvobject 20, 11, 12, 4, 3, 3
createvobject 24, 12, 12, 7, 3, 3
createvobject 45, 13, 12, 8, 3, 3
createvobject 50, 14, 13, 3, 3, 3
createvobject 52, 15, 13, 4, 3, 3
createvobject 65, 17, 13, 6, 3, 3
createvobject 83, 18, 13, 7, 3, 3
createvobject 116, 19, 13, 8, 3, 3
createvobject 25, 20, 3, 2, 3, 1
createvobject 31, 21, 6, 2, 3, 1
createvobject 33, 22, 7, 2, 3, 1
createvobject 46, 24, 11, 2, 3, 1
createvobject 49, 25, 3, 9, 3, 2
createvobject 35, 26, 4, 9, 3, 2
createvobject 48, 27, 5, 9, 3, 2
createvobject 40, 28, 9, 9, 3, 2
createvobject 38, 29, 10, 9, 3, 2
createvobject 83, 30, 11, 9, 3, 2
createvobject EVENT_OBJ_GFX_BEAUTY, 0, 2, 3, 3, 4
createvobject EVENT_OBJ_GFX_MAN_5, 1, 2, 4, 3, 4
createvobject EVENT_OBJ_GFX_HIKER, 2, 2, 7, 3, 4
createvobject EVENT_OBJ_GFX_LITTLE_GIRL, 3, 2, 8, 3, 4
createvobject EVENT_OBJ_GFX_MANIAC, 4, 1, 3, 3, 4
createvobject EVENT_OBJ_GFX_WOMAN_5, 6, 1, 5, 3, 4
createvobject EVENT_OBJ_GFX_WOMAN_4, 7, 1, 6, 3, 4
createvobject EVENT_OBJ_GFX_GENTLEMAN, 9, 1, 8, 3, 4
createvobject EVENT_OBJ_GFX_NINJA_BOY, 10, 12, 3, 3, 3
createvobject EVENT_OBJ_GFX_WOMAN_2, 11, 12, 4, 3, 3
createvobject EVENT_OBJ_GFX_WOMAN_3, 12, 12, 7, 3, 3
createvobject EVENT_OBJ_GFX_BEAUTY, 13, 12, 8, 3, 3
createvobject EVENT_OBJ_GFX_FISHERMAN, 14, 13, 3, 3, 3
createvobject EVENT_OBJ_GFX_RUNNING_TRIATHLETE_F, 15, 13, 4, 3, 3
createvobject EVENT_OBJ_GFX_MAN_4, 17, 13, 6, 3, 3
createvobject EVENT_OBJ_GFX_MART_EMPLOYEE, 18, 13, 7, 3, 3
createvobject EVENT_OBJ_GFX_DEVON_EMPLOYEE, 19, 13, 8, 3, 3
createvobject EVENT_OBJ_GFX_POKEFAN_M, 20, 3, 2, 3, 1
createvobject EVENT_OBJ_GFX_CAMPER, 21, 6, 2, 3, 1
createvobject EVENT_OBJ_GFX_MAN_3, 22, 7, 2, 3, 1
createvobject EVENT_OBJ_GFX_SCIENTIST_1, 24, 11, 2, 3, 1
createvobject EVENT_OBJ_GFX_SAILOR, 25, 3, 9, 3, 2
createvobject EVENT_OBJ_GFX_YOUNGSTER, 26, 4, 9, 3, 2
createvobject EVENT_OBJ_GFX_GENTLEMAN, 27, 5, 9, 3, 2
createvobject EVENT_OBJ_GFX_HEX_MANIAC, 28, 9, 9, 3, 2
createvobject EVENT_OBJ_GFX_SCHOOL_KID_M, 29, 10, 9, 3, 2
createvobject EVENT_OBJ_GFX_MART_EMPLOYEE, 30, 11, 9, 3, 2
return
LinkContestRoom1_EventScript_23BD86:: @ 823BD86
createvobject 45, 0, 2, 3, 3, 4
createvobject 66, 1, 2, 4, 3, 4
createvobject 55, 2, 2, 7, 3, 4
createvobject 12, 3, 2, 8, 3, 4
createvobject 39, 4, 1, 3, 3, 4
createvobject 34, 6, 1, 5, 3, 4
createvobject 26, 7, 1, 6, 3, 4
createvobject 48, 9, 1, 8, 3, 4
createvobject 5, 10, 12, 3, 3, 3
createvobject 20, 11, 12, 4, 3, 3
createvobject 24, 12, 12, 7, 3, 3
createvobject 45, 13, 12, 8, 3, 3
createvobject 50, 14, 13, 3, 3, 3
createvobject 52, 15, 13, 4, 3, 3
createvobject 65, 17, 13, 6, 3, 3
createvobject 83, 18, 13, 7, 3, 3
createvobject 116, 19, 13, 8, 3, 3
createvobject 25, 20, 3, 2, 3, 1
createvobject 31, 21, 6, 2, 3, 1
createvobject 33, 22, 7, 2, 3, 1
createvobject 46, 24, 11, 2, 3, 1
createvobject EVENT_OBJ_GFX_BEAUTY, 0, 2, 3, 3, 4
createvobject EVENT_OBJ_GFX_MAN_5, 1, 2, 4, 3, 4
createvobject EVENT_OBJ_GFX_HIKER, 2, 2, 7, 3, 4
createvobject EVENT_OBJ_GFX_LITTLE_GIRL, 3, 2, 8, 3, 4
createvobject EVENT_OBJ_GFX_MANIAC, 4, 1, 3, 3, 4
createvobject EVENT_OBJ_GFX_WOMAN_5, 6, 1, 5, 3, 4
createvobject EVENT_OBJ_GFX_WOMAN_4, 7, 1, 6, 3, 4
createvobject EVENT_OBJ_GFX_GENTLEMAN, 9, 1, 8, 3, 4
createvobject EVENT_OBJ_GFX_NINJA_BOY, 10, 12, 3, 3, 3
createvobject EVENT_OBJ_GFX_WOMAN_2, 11, 12, 4, 3, 3
createvobject EVENT_OBJ_GFX_WOMAN_3, 12, 12, 7, 3, 3
createvobject EVENT_OBJ_GFX_BEAUTY, 13, 12, 8, 3, 3
createvobject EVENT_OBJ_GFX_FISHERMAN, 14, 13, 3, 3, 3
createvobject EVENT_OBJ_GFX_RUNNING_TRIATHLETE_F, 15, 13, 4, 3, 3
createvobject EVENT_OBJ_GFX_MAN_4, 17, 13, 6, 3, 3
createvobject EVENT_OBJ_GFX_MART_EMPLOYEE, 18, 13, 7, 3, 3
createvobject EVENT_OBJ_GFX_DEVON_EMPLOYEE, 19, 13, 8, 3, 3
createvobject EVENT_OBJ_GFX_POKEFAN_M, 20, 3, 2, 3, 1
createvobject EVENT_OBJ_GFX_CAMPER, 21, 6, 2, 3, 1
createvobject EVENT_OBJ_GFX_MAN_3, 22, 7, 2, 3, 1
createvobject EVENT_OBJ_GFX_SCIENTIST_1, 24, 11, 2, 3, 1
return
LinkContestRoom1_EventScript_23BE44:: @ 823BE44

2
data/maps/PetalburgCity_Gym/map.json
View File

@@ -25,7 +25,7 @@
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
"script": "PetalburgCity_Gym_EventScript_2049F1",
"flag": "FLAG_HIDE_PETALYBURG_GYM_NORMAN"
"flag": "FLAG_HIDE_PETALBURG_GYM_NORMAN"
},
{
"graphics_id": "EVENT_OBJ_GFX_WOMAN_5",

2
data/maps/SlateportCity_House1/scripts.inc
View File

@@ -58,7 +58,7 @@ SlateportCity_House1_EventScript_209B50:: @ 8209B50
SlateportCity_House1_EventScript_209B5A:: @ 8209B5A
msgbox SlateportCity_House1_Text_209CA4, MSGBOX_DEFAULT
call Common_EventScript_NameReceivedPokemon
specialvar VAR_RESULT, TV_PutNameRaterShowOnTheAirIfNicnkameChanged
specialvar VAR_RESULT, TV_PutNameRaterShowOnTheAirIfNicknameChanged
special TV_CopyNicknameToStringVar1AndEnsureTerminated
compare VAR_RESULT, 1
goto_if_eq SlateportCity_House1_EventScript_209B84

107
data/pokenav.s
View File

@@ -1656,110 +1656,3 @@ gUnknown_08624BA0:: @ 8624BA0
.4byte sub_81D0D8C
.4byte sub_81D0E00
.4byte sub_81D0C54
gUnknown_08624BB8:: @ 8624BB8
window_template 2, 12, 13, 16, 4, 1, 20
gUnknown_08624BC0:: @ 8624BC0
.byte 4, 2, 3, 0
gUnknown_08624BC4:: @ 8624BC4
window_template 2, 14, 1, 13, 2, 10, 0x54
gUnknown_08624BCC:: @ 8624BCC
.string "{COLOR_HIGHLIGHT_SHADOW}{LIGHT_RED}{WHITE}{GREEN}♂{COLOR_HIGHLIGHT_SHADOW}{DARK_GREY}{WHITE}{LIGHT_GREY}$"
.align 2
gUnknown_08624BD8:: @ 8624BD8
.string "{COLOR_HIGHLIGHT_SHADOW}{LIGHT_GREEN}{WHITE}{BLUE}♀{COLOR_HIGHLIGHT_SHADOW}{DARK_GREY}{WHITE}{LIGHT_GREY}$"
.align 2
gUnknown_08624BE4:: @ 8624BE4
.string "{UNK_SPACER}$"
.align 2
gUnknown_08624BE8:: @ 8624BE8
window_template 2, 1, 5, 7, 2, 1, 0x6E
.4byte NULL
.4byte NULL
gUnknown_08624BF8:: @ 8624BF8
.2byte 0, 0, 1, 0
.2byte 2, 0, 3, 0
.2byte 4, 0, 1, 1
.2byte 2, 1, 3, 1
.2byte 4, 1, 1, 2
.2byte 2, 2, 3, 2
.2byte 4, 2, 1, 3
.2byte 2, 3, 3, 3
.2byte 4, 3, 1, 4
.2byte 2, 4, 3, 4
.2byte 4, 4, 5, 0
.2byte 6, 0, 7, 1
.2byte 8, 2, 9, 1
.2byte 9, 3, 9, 4
.2byte 10, 3, 10, 4
.2byte 11, 0, 11, 1
gUnknown_08624C78:: @ 8624C78
obj_tiles gUnknown_08624280, 0x1800, 9
gUnknown_08624C80:: @ 8624C80
obj_pal gUnknown_08623FF8, 15
obj_pal gUnknown_08624018, 16
obj_pal gUnknown_08624038, 17
obj_pal gUnknown_08624058, 18
obj_pal gUnknown_08624078, 19
null_obj_pal
gUnknown_08624CB0:: @ 8624CB0
.2byte 0x100
.2byte 0x8000
.2byte 0x400
.2byte 0x0
gUnknown_08624CB8:: @ 8624CB8
.2byte 0x80
.2byte 0x80
.2byte 0
.2byte 0
.2byte 0x7FFF
.2byte 0
.2byte 0
.2byte 0
gUnknown_08624CC8:: @ 8624CC8
.2byte 0x80
.2byte 0x80
.2byte 0
.2byte 0
.2byte 0x20
.2byte 0x20
.2byte 0x400
.2byte 0
.2byte 0x7FFF
.2byte 0
.2byte 0
.2byte 0
gUnknown_08624CE0:: @ 8624CE0
.2byte 0x100
.2byte 0x100
.2byte 0
.2byte 0
.2byte 0xFFE0
.2byte 0xFFE0
.2byte 0x400
.2byte 0
.2byte 0x7FFF
.2byte 0
.2byte 0
.2byte 0
gUnknown_08624CF8:: @ 8624CF8
.4byte gUnknown_08624CB8
.4byte gUnknown_08624CC8
.4byte gUnknown_08624CE0
gUnknown_08624D04:: @ 8624D04
spr_template 9, 15, gUnknown_08624CB0, gDummySpriteAnimTable, NULL, gUnknown_08624CF8, SpriteCallbackDummy

2
data/specials.inc
View File

@@ -134,7 +134,7 @@ gSpecials:: @ 81DBA64
def_special CompareSeedotSize
def_special GetLotadSizeRecordInfo
def_special CompareLotadSize
def_special TV_PutNameRaterShowOnTheAirIfNicnkameChanged
def_special TV_PutNameRaterShowOnTheAirIfNicknameChanged
def_special TV_CopyNicknameToStringVar1AndEnsureTerminated
def_special TV_CheckMonOTIDEqualsPlayerID
def_special BufferTrendyPhraseString

0
graphics/unknown/unknown_D9AE04.bin → graphics/interface/bag_pyramid_tilemap.bin
View File

0
graphics/unknown/unknown_D9A88C.bin → graphics/interface/bag_screen_tilemap.bin
View File

2
include/constants/flags.h
View File

@@ -725,7 +725,7 @@
#define FLAG_HIDE_ROUTE_111_VICTORIA_WINSTRATE 0x301
#define FLAG_HIDE_ROUTE_111_VIVI_WINSTRATE 0x302
#define FLAG_HIDE_ROUTE_111_VICKY_WINSTRATE 0x303
#define FLAG_HIDE_PETALYBURG_GYM_NORMAN 0x304
#define FLAG_HIDE_PETALBURG_GYM_NORMAN 0x304
#define FLAG_HIDE_SKY_PILLAR_TOP_RAYQUAZA_2 0x305
#define FLAG_HIDE_LILYCOVE_CONTEST_HALL_CONTEST_ATTENDANT_1 0x306
#define FLAG_HIDE_LILYCOVE_MUSEUM_CURATOR 0x307

8
include/constants/trainers.h
View File

@@ -202,8 +202,8 @@
#define FACILITY_CLASSES_COUNT 0x52
#define TRAINER_CLASS_PKMN_TRAINER_1 0x0
#define TRAINER_CLASS_PKMN_TRAINER_2 0x1
#define TRAINER_CLASS_PKMN_TRAINER_1 0x0 // Unused
#define TRAINER_CLASS_PKMN_TRAINER_2 0x1 // Unused
#define TRAINER_CLASS_HIKER 0x2
#define TRAINER_CLASS_TEAM_AQUA 0x3
#define TRAINER_CLASS_PKMN_BREEDER 0x4
@@ -250,7 +250,7 @@
#define TRAINER_CLASS_SWIMMER_F 0x2d
#define TRAINER_CLASS_TWINS 0x2e
#define TRAINER_CLASS_SAILOR 0x2f
#define TRAINER_CLASS_COOLTRAINER_UNUSED 0x30
#define TRAINER_CLASS_COOLTRAINER_2 0x30 // Used for only one trainer.
#define TRAINER_CLASS_MAGMA_ADMIN 0x31
#define TRAINER_CLASS_PKMN_TRAINER_3 0x32
#define TRAINER_CLASS_BUG_CATCHER 0x33
@@ -267,7 +267,7 @@
#define TRAINER_CLASS_FACTORY_HEAD 0x3e
#define TRAINER_CLASS_PIKE_QUEEN 0x3f
#define TRAINER_CLASS_PYRAMID_KING 0x40
#define TRAINER_CLASS_PKMN_TRAINER_4 0x41
#define TRAINER_CLASS_RS_PROTAG 0x41
#define TRAINER_ENCOUNTER_MUSIC_MALE 0 // standard male encounter music
#define TRAINER_ENCOUNTER_MUSIC_FEMALE 1 // standard female encounter music

16
include/graphics.h
View File

@@ -3331,10 +3331,10 @@ extern const u32 gPokedexSearch1_Tilemap[];
extern const u16 gPokedexSearchMenu_Pal[];
// berry tag screen
extern const u32 gUnknown_08D9BB44[];
extern const u32 gUnknown_08D9BF98[];
extern const u32 gUnknown_08D9C13C[];
extern const u32 gUnknown_08D9BEF0[];
extern const u32 gBerryCheck_Gfx[];
extern const u32 gBerryCheck_Pal[];
extern const u32 gBerryTag_Gfx[];
extern const u32 gBerryTag_Pal[];
// rayquaza scene gfx
extern const u32 gRaySceneGroudon_Gfx[];
@@ -4405,6 +4405,7 @@ extern const u8 gFireRedMenuElements_Gfx[];
// item menu graphics
extern const u32 gBagScreen_Gfx[];
extern const u32 gBagScreen_GfxTileMap[];
extern const u32 gBagScreenFemale_Pal[];
extern const u32 gBagScreenMale_Pal[];
extern const u8 gBagMenuHMIcon_Gfx[];
@@ -4674,11 +4675,11 @@ extern const u16 gBattleInterface_BallDisplayPal[];
extern const u32 gBagSwapLineGfx[];
extern const u32 gBagSwapLinePal[];
extern const u32 gUnknown_08D9ADD0[];
extern const u32 gUnknown_08D9AE04[];
extern const u32 gBattleFrontierGfx_PyramidBag[];
extern const u32 gBattleFrontierGfx_PyramidBag_Pal[];
extern const u32 gBattleFrontierGfx_PyramidBagTileMap[];
extern const u32 gUnknown_08D9AF44[];
extern const u16 gUnknown_0860F074[];
extern const u32 gBattleFrontierGfx_PyramidBag[];
extern const u32 gTitleScreenEmeraldVersionGfx[];
extern const u32 gTitleScreenPressStartGfx[];
@@ -5344,7 +5345,6 @@ extern const u32 gBattleStatMask6_Pal[];
extern const u32 gBattleStatMask7_Pal[];
extern const u32 gBattleStatMask8_Pal[];
extern const u32 gUnknown_08D9A88C[];
extern const u32 gContestMiscGfx[];
extern const u32 gContestAudienceGfx[];
extern const u8 gContestApplauseMeterGfx[];

8
include/item_menu.h
View File

@@ -29,9 +29,9 @@ struct BagStruct
u16 scrollPosition[POCKETS_COUNT];
};
extern struct BagStruct gUnknown_0203CE58;
extern struct BagStruct gBagPositionStruct;
struct UnkBagStruct
struct BagMenuStruct
{
void (*mainCallback2)(void);
u8 tilemapBuffer[0x800];
@@ -61,7 +61,7 @@ struct UnkBagStruct
u8 filler2[4];
};
extern struct UnkBagStruct *gUnknown_0203CE54;
extern struct BagMenuStruct *gBagMenu;
// Exported RAM declarations
@@ -85,7 +85,7 @@ void ResetBagScrollPositions(void);
void sub_81AABF0(void (*callback)(void));
void CB2_ChooseBerry(void);
void unknown_ItemMenu_Confirm(u8 taskId);
void bag_menu_yes_no(u8, u8, const struct YesNoFuncTable*);
void BagMenu_YesNo(u8, u8, const struct YesNoFuncTable*);
void sub_81AB9A8(u8 pocketId);

18
include/item_menu_icons.h
View File

@@ -1,11 +1,11 @@
#ifndef GUARD_ITEM_MENU_ICONS
#define GUARD_ITEM_MENU_ICONS
extern const struct CompressedSpriteSheet gUnknown_0857FB34;
extern const struct CompressedSpriteSheet gUnknown_0857FB3C;
extern const struct CompressedSpritePalette gUnknown_0857FB44;
extern const struct CompressedSpriteSheet gUnknown_0857FDEC;
extern const struct CompressedSpritePalette gUnknown_0857FDF4;
extern const struct CompressedSpriteSheet gBagMaleSpriteSheet;
extern const struct CompressedSpriteSheet gBagFemaleSpriteSheet;
extern const struct CompressedSpritePalette gBagPaletteTable;
extern const struct CompressedSpriteSheet gBerryCheckCircleSpriteSheet;
extern const struct CompressedSpritePalette gBerryCheckCirclePaletteTable;
void RemoveBagSprite(u8 id);
void AddBagVisualSprite(u8 bagPocketId);
@@ -19,7 +19,13 @@ void sub_80D4FC8(u8 arg0);
void sub_80D4FEC(u8 arg0);
u8 CreateBerryTagSprite(u8 id, s16 x, s16 y);
void FreeBerryTagSpritePalette(void);
u8 sub_80D511C(u8 berryId, u8 x, u8 y, bool8 startAffine);
u8 LoadSpinningBerryPicGfx(u8 berryId, u8 x, u8 y, bool8 startAffine);
u8 CreateBerryFlavorCircleSprite(s16 x);
#define TAG_BAG_GFX 100
#define TAG_ROTATING_BALL_GFX 101
#define TAG_BERRY_CHECK_CIRCLE_GFX 10000
#define TAG_BERRY_PIC_TILE 0xFFFF
#define TAG_BERRY_PIC_PAL 0x7544
#endif // GUARD_ITEM_MENU_ICONS

3
include/pokenav.h
View File

@@ -125,6 +125,7 @@ void sub_81C7B40(void);
struct Sprite *PauseSpinningPokenavSprite(void);
void ResumeSpinningPokenavSprite(void);
void sub_81C7E14(u32 arg0);
void sub_81C7990(u32 a0, u16 a1);
// pokenav_unk_1.c
bool32 sub_81C9298(void);
@@ -162,7 +163,7 @@ const u8 *sub_81CAFD8(int index, int textType);
u16 sub_81CB01C(void);
u16 sub_81CB02C(int arg0);
void sub_81CB050(u32 arg0, u8 *str);
int sub_81CB0C8(int rematchIndex);
u8 sub_81CB0C8(int rematchIndex);
int sub_81CB0E4(int index);
bool32 sub_81CAE08(int);
int sub_81CB128(int index);

3
ld_script.txt
View File

@@ -305,6 +305,7 @@ SECTIONS {
src/pokenav_main_menu.o(.text);
src/pokenav_match_call_ui.o(.text);
src/pokenav_unk_1.o(.text);
src/pokenav_unk_2.o(.text);
asm/pokenav_unk_2.o(.text);
src/pokenav_unk_3.o(.text);
src/pokenav_unk_4.o(.text);
@@ -314,6 +315,7 @@ SECTIONS {
asm/pokenav_unk_8.o(.text);
asm/pokenav_unk_9.o(.text);
asm/pokenav_unk_10.o(.text);
src/pokenav_unk_10.o(.text);
src/pokenav_match_call_data.o(.text);
src/menu_specialized.o(.text);
src/ereader_helpers.o(.text);
@@ -636,6 +638,7 @@ SECTIONS {
src/pokenav_match_call_ui.o(.rodata);
src/pokenav_unk_1.o(.rodata);
data/pokenav.o(.rodata);
src/pokenav_unk_10.o(.rodata);
src/pokenav_match_call_data.o(.rodata);
src/menu_specialized.o(.rodata);
data/ereader_helpers.o(.rodata);

1262
sound/direct_sound_data.inc
View File

File diff suppressed because it is too large Load Diff

0
sound/direct_sound_samples/86BA7E8.aif → sound/direct_sound_samples/advanced_orchestra_voice_ahhs.aif
View File

0
sound/direct_sound_samples/87240CC.aif → sound/direct_sound_samples/bicycle_bell.aif
View File

0
sound/direct_sound_samples/86D1A2C.aif → sound/direct_sound_samples/dance_drums_ride_bell.aif
View File

0
sound/direct_sound_samples/86CD0C4.aif → sound/direct_sound_samples/drum_and_percussion_kick.aif
View File

0
sound/direct_sound_samples/8717980.aif → sound/direct_sound_samples/emu_ii_pipe_organ.aif
View File

0
sound/direct_sound_samples/8710AB8.aif → sound/direct_sound_samples/heart_of_asia_gamelan.aif
View File

0
sound/direct_sound_samples/86B776C.aif → sound/direct_sound_samples/jv1080_slap_bass.aif
View File

0
sound/direct_sound_samples/88D4A18.aif → sound/direct_sound_samples/register_noise.aif
View File

0
sound/direct_sound_samples/87410E0.aif → sound/direct_sound_samples/sc88_accordion.aif
View File

0
sound/direct_sound_samples/88F6F48.aif → sound/direct_sound_samples/sc88_accordion_duplicate.aif
View File

0
sound/direct_sound_samples/86CC5E4.aif → sound/direct_sound_samples/sc88_bongo.aif
View File

0
sound/direct_sound_samples/86CCAFC.aif → sound/direct_sound_samples/sc88_bongo_low.aif
View File

0
sound/direct_sound_samples/872DE98.aif → sound/direct_sound_samples/sc88_bubbles.aif
View File

0
sound/direct_sound_samples/86FF65C.aif → sound/direct_sound_samples/sc88_flute.aif
View File

0
sound/direct_sound_samples/86F4144.aif → sound/direct_sound_samples/sc88_french_horn_60.aif
View File

0
sound/direct_sound_samples/86FB0D8.aif → sound/direct_sound_samples/sc88_french_horn_72.aif
View File

0
sound/direct_sound_samples/86B6BA0.aif → sound/direct_sound_samples/sc88_fretless_bass.aif
View File

0
sound/direct_sound_samples/86B5D04.aif → sound/direct_sound_samples/sc88_glockenspiel.aif
View File

0
sound/direct_sound_samples/873D874.aif → sound/direct_sound_samples/sc88_harp.aif
View File

0
sound/direct_sound_samples/88D8418.aif → sound/direct_sound_samples/sc88_nylon_str_guitar.aif
View File

0
sound/direct_sound_samples/86B63A8.aif → sound/direct_sound_samples/sc88_organ2.aif
View File

0
sound/direct_sound_samples/86E0D98.aif → sound/direct_sound_samples/sc88_piano1_48.aif
View File

0
sound/direct_sound_samples/86E1CF8.aif → sound/direct_sound_samples/sc88_piano1_60.aif
View File

0
sound/direct_sound_samples/86E3358.aif → sound/direct_sound_samples/sc88_piano1_72.aif
View File

0
sound/direct_sound_samples/86E48B4.aif → sound/direct_sound_samples/sc88_piano1_84.aif
View File

0
sound/direct_sound_samples/86FFDC0.aif → sound/direct_sound_samples/sc88_pick_bass.aif
View File

0
sound/direct_sound_samples/8726EF0.aif → sound/direct_sound_samples/sc88_pizzicato_strings.aif
View File

0
sound/direct_sound_samples/86DB908.aif → sound/direct_sound_samples/sc88_standard_bells.aif
View File

0
sound/direct_sound_samples/86CB6B8.aif → sound/direct_sound_samples/sc88_standard_cymbal_crash.aif
View File

0
sound/direct_sound_samples/86C6200.aif → sound/direct_sound_samples/sc88_standard_hand_clap.aif
View File

0
sound/direct_sound_samples/86C566C.aif → sound/direct_sound_samples/sc88_standard_kick.aif
View File

0
sound/direct_sound_samples/86C5B0C.aif → sound/direct_sound_samples/sc88_standard_snare1.aif
View File

0
sound/direct_sound_samples/86C6A90.aif → sound/direct_sound_samples/sc88_standard_snare2.aif
View File

0
sound/direct_sound_samples/86E5440.aif → sound/direct_sound_samples/sc88_string_ensemble_60.aif
View File

0
sound/direct_sound_samples/86E89E4.aif → sound/direct_sound_samples/sc88_string_ensemble_72.aif
View File

0
sound/direct_sound_samples/86EAD00.aif → sound/direct_sound_samples/sc88_string_ensemble_84.aif
View File

0
sound/direct_sound_samples/86B86A4.aif → sound/direct_sound_samples/sc88_synth_bass.aif
View File

0
sound/direct_sound_samples/86B9318.aif → sound/direct_sound_samples/sc88_timpani.aif
View File

0
sound/direct_sound_samples/87205DC.aif → sound/direct_sound_samples/sc88_timpani_with_snare.aif
View File

0
sound/direct_sound_samples/86EE3CC.aif → sound/direct_sound_samples/sc88_trumpet_60.aif
View File

0
sound/direct_sound_samples/86EF71C.aif → sound/direct_sound_samples/sc88_trumpet_72.aif
View File

0
sound/direct_sound_samples/86F0C2C.aif → sound/direct_sound_samples/sc88_trumpet_84.aif
View File

0
sound/direct_sound_samples/8736C74.aif → sound/direct_sound_samples/sc88_tubular_bell.aif
View File

0
sound/direct_sound_samples/872CC54.aif → sound/direct_sound_samples/sc88_wind.aif
View File

0
sound/direct_sound_samples/873E2A4.aif → sound/direct_sound_samples/sc88_xylophone.aif
View File

0
sound/direct_sound_samples/86CF950.aif → sound/direct_sound_samples/sd90_ambient_tom.aif
View File

0
sound/direct_sound_samples/870AE74.aif → sound/direct_sound_samples/sd90_classical_distortion_guitar_high.aif
View File

0
sound/direct_sound_samples/870DE64.aif → sound/direct_sound_samples/sd90_classical_distortion_guitar_low.aif
View File

0
sound/direct_sound_samples/88DA388.aif → sound/direct_sound_samples/sd90_classical_guitar_harmonics.aif
View File

0
sound/direct_sound_samples/86BBE98.aif → sound/direct_sound_samples/sd90_classical_oboe.aif
View File

0
sound/direct_sound_samples/8709004.aif → sound/direct_sound_samples/sd90_classical_overdrive_guitar.aif
View File

0
sound/direct_sound_samples/8703214.aif → sound/direct_sound_samples/sd90_classical_shakuhachi.aif
View File

0
sound/direct_sound_samples/88F94DC.aif → sound/direct_sound_samples/sd90_classical_whistle.aif
View File

0
sound/direct_sound_samples/88F9F3C.aif → sound/direct_sound_samples/sd90_enhanced_delay_shaku.aif
View File

0
sound/direct_sound_samples/86CDFDC.aif → sound/direct_sound_samples/sd90_solo_snare.aif
View File

0
sound/direct_sound_samples/88F8318.aif → sound/direct_sound_samples/steinway_b_piano.aif
View File

0
sound/direct_sound_samples/86DAA94.aif → sound/direct_sound_samples/unknown_anvil_high.aif
View File

0
sound/direct_sound_samples/86DD11C.aif → sound/direct_sound_samples/unknown_anvil_low.aif
View File

0
sound/direct_sound_samples/86C958C.aif → sound/direct_sound_samples/unknown_bell.aif
View File

0
sound/direct_sound_samples/8715038.aif → sound/direct_sound_samples/unknown_church_organ.aif
View File

0
sound/direct_sound_samples/86C8348.aif → sound/direct_sound_samples/unknown_close_hihat.aif
View File

0
sound/direct_sound_samples/86D925C.aif → sound/direct_sound_samples/unknown_cowbell.aif
View File

0
sound/direct_sound_samples/86CADD4.aif → sound/direct_sound_samples/unknown_cymbal_crash.aif
View File

0
sound/direct_sound_samples/86D9C14.aif → sound/direct_sound_samples/unknown_djembe.aif
View File

0
sound/direct_sound_samples/871F234.aif → sound/direct_sound_samples/unknown_e_piano_high.aif
View File

0
sound/direct_sound_samples/871CBCC.aif → sound/direct_sound_samples/unknown_e_piano_low.aif
View File

0
sound/direct_sound_samples/86DE6C0.aif → sound/direct_sound_samples/unknown_ethnic_drum.aif
View File

0
sound/direct_sound_samples/8701A10.aif → sound/direct_sound_samples/unknown_koto_high.aif
View File

0
sound/direct_sound_samples/8706DCC.aif → sound/direct_sound_samples/unknown_koto_low.aif
View File

0
sound/direct_sound_samples/86C875C.aif → sound/direct_sound_samples/unknown_open_hihat.aif
View File

0
sound/direct_sound_samples/873A594.aif → sound/direct_sound_samples/unknown_polysynth.aif
View File

0
sound/direct_sound_samples/86C2590.aif → sound/direct_sound_samples/unknown_snare.aif
View File

0
sound/direct_sound_samples/8721AAC.aif → sound/direct_sound_samples/unknown_synth_snare.aif
View File

0
sound/direct_sound_samples/86CA520.aif → sound/direct_sound_samples/unknown_tambourine.aif
View File

0
sound/direct_sound_samples/86C7308.aif → sound/direct_sound_samples/unknown_tom.aif
View File

0
sound/direct_sound_samples/86F204C.aif → sound/direct_sound_samples/unknown_trombone_39.aif
View File

0
sound/direct_sound_samples/86F30E8.aif → sound/direct_sound_samples/unknown_trombone_51.aif
View File

0
sound/direct_sound_samples/86DFCA4.aif → sound/direct_sound_samples/unknown_tsuzumi.aif
View File

0
sound/direct_sound_samples/86C4344.aif → sound/direct_sound_samples/unknown_wood_block_high.aif
View File

0
sound/direct_sound_samples/86C2A68.aif → sound/direct_sound_samples/unknown_wood_block_low.aif
View File

0
sound/direct_sound_samples/87322BC.aif → sound/direct_sound_samples/unused_acid_bass.aif
View File

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