Merge branch 'master' into link

This commit is contained in:
PikalaxALT 2018-01-20 22:08:41 -05:00
commit 772f0aa3fd
642 changed files with 35874 additions and 4961 deletions

View File

@ -26963,7 +26963,7 @@ _0810C0E2:
bl sub_80A6B30
mov r0, sp
ldrb r0, [r0, 0x9]
ldr r1, =gUnknown_0854CAD0
ldr r1, =gWeatherFog1Tiles
movs r2, 0x80
lsls r2, 4
mov r3, sp
@ -27245,7 +27245,7 @@ _0810C366:
bl sub_80A6B30
mov r0, sp
ldrb r0, [r0, 0x9]
ldr r1, =gUnknown_0854CAD0
ldr r1, =gWeatherFog1Tiles
movs r2, 0x80
lsls r2, 4
mov r3, sp

View File

@ -2725,13 +2725,13 @@ sub_80AC594: @ 80AC594
ldrb r0, [r0]
cmp r0, 0x1
beq _080AC650
ldr r0, =gUnknown_0854FB5C
ldr r0, =sCloudSpriteSheet
bl LoadSpriteSheet
ldr r0, =gUnknown_0854C290
bl sub_80ABF4C
movs r5, 0
_080AC5B2:
ldr r0, =gUnknown_0854FB78
ldr r0, =sCloudSpriteTemplate
movs r1, 0
movs r2, 0
movs r3, 0xFF
@ -3676,7 +3676,7 @@ sub_80ACD78: @ 80ACD78
b _080ACE98
_080ACD92:
ldrb r7, [r2]
ldr r0, =gUnknown_0854FC2C
ldr r0, =gSpriteTemplate_854FC2C
ldr r2, =gUnknown_0854FB90
lsls r6, r7, 2
adds r2, r6, r2
@ -5461,7 +5461,7 @@ sub_80ADCAC: @ 80ADCAC
bl LoadSpriteSheet
movs r5, 0
_080ADCD0:
ldr r0, =gUnknown_0854FD18
ldr r0, =gSpriteTemplate_854FD18
movs r1, 0
movs r2, 0
movs r3, 0xFF
@ -5792,7 +5792,7 @@ sub_80ADF6C: @ 80ADF6C
bne _080AE008
movs r5, 0
_080ADF80:
ldr r0, =gUnknown_0854FD58
ldr r0, =gSpriteTemplate_854FD58
movs r1, 0
movs r2, 0
movs r3, 0x4E
@ -6240,7 +6240,7 @@ _080AE314:
adds r5, r0, 0
lsls r2, r5, 22
asrs r2, 16
ldr r0, =gUnknown_0854FD8C
ldr r0, =gSpriteTemplate_854FD8C
movs r1, 0
movs r3, 0xFF
bl CreateSpriteAtEnd
@ -6753,7 +6753,7 @@ _080AE758:
adds r6, r0, 0
lsls r2, r6, 22
asrs r2, 16
ldr r0, =gUnknown_0854FDC4
ldr r0, =gSpriteTemplate_854FDC4
movs r1, 0
movs r3, 0x1
bl CreateSpriteAtEnd
@ -6840,7 +6840,7 @@ _080AE818:
adds r1, 0x18
lsls r1, 16
asrs r1, 16
ldr r0, =gUnknown_0854FDC4
ldr r0, =gSpriteTemplate_854FDC4
movs r2, 0xD0
movs r3, 0x1
bl CreateSpriteAtEnd
@ -7239,7 +7239,7 @@ sub_80AEB48: @ 80AEB48
ldrh r2, [r0]
ldrh r0, [r1]
subs r2, r0
ldr r0, =gUnknown_0854FE44
ldr r0, =gSpriteTemplate_854FE44
movs r4, 0
ldrsh r1, [r3, r4]
lsls r2, 16
@ -7306,7 +7306,7 @@ _080AEBE4:
adds r0, 0x14
adds r0, r2, r0
ldr r1, [r0]
ldr r0, =gUnknown_0854FE44
ldr r0, =gSpriteTemplate_854FE44
cmp r1, r0
bne _080AEBFE
adds r0, r2, r5
@ -7332,8 +7332,8 @@ _080AEC1A:
.pool
thumb_func_end sub_80AEBD0
thumb_func_start unc_0807DAB4
unc_0807DAB4: @ 80AEC34
thumb_func_start sub_80AEC34
sub_80AEC34: @ 80AEC34
push {lr}
adds r1, r0, 0
ldrh r0, [r1, 0x2E]
@ -7383,7 +7383,7 @@ _080AEC74:
_080AEC8E:
pop {r0}
bx r0
thumb_func_end unc_0807DAB4
thumb_func_end sub_80AEC34
thumb_func_start sub_80AEC94
sub_80AEC94: @ 80AEC94

View File

@ -8,7 +8,7 @@
.2byte \vram_tile_offset
.endm
.macro window_template_terminator
.macro null_window_template
window_template 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0000
.endm

View File

@ -10645,7 +10645,7 @@ party_menu_held_item_object: @ 81B5C14
bl GetMonData
cmp r0, 0
beq _081B5C3C
ldr r0, =gUnknown_08615EC0
ldr r0, =gSpriteTemplate_8615EC0
ldr r2, [r4, 0x4]
ldrb r1, [r2, 0x2]
ldrb r2, [r2, 0x3]
@ -10671,7 +10671,7 @@ party_menu_link_mon_held_item_object: @ 81B5C48
lsrs r5, r1, 16
cmp r0, 0
beq _081B5C84
ldr r0, =gUnknown_08615EC0
ldr r0, =gSpriteTemplate_8615EC0
ldr r2, [r4, 0x4]
ldrb r1, [r2, 0x2]
ldrb r2, [r2, 0x3]
@ -10896,7 +10896,7 @@ sub_81B5DF0: @ 81B5DF0
add r0, r8
adds r0, 0x43
ldrb r3, [r0]
ldr r0, =gUnknown_08615EC0
ldr r0, =gSpriteTemplate_8615EC0
subs r3, 0x1
lsls r3, 24
lsrs r3, 24
@ -10991,7 +10991,7 @@ party_menu_pokeball_object: @ 81B5ECC
bl GetMonData
cmp r0, 0
beq _081B5EEA
ldr r0, =gUnknown_08615F08
ldr r0, =gSpriteTemplate_8615F08
ldr r2, [r4, 0x4]
ldrb r1, [r2, 0x6]
ldrb r2, [r2, 0x7]
@ -11012,7 +11012,7 @@ party_menu_link_mon_pokeball_object: @ 81B5EF4
lsls r0, 16
cmp r0, 0
beq _081B5F24
ldr r0, =gUnknown_08615F08
ldr r0, =gSpriteTemplate_8615F08
ldr r2, [r4, 0x4]
ldrb r1, [r2, 0x6]
ldrb r2, [r2, 0x7]
@ -11046,7 +11046,7 @@ sub_81B5F34: @ 81B5F34
lsrs r3, 24
lsls r2, 24
lsrs r2, 24
ldr r0, =gUnknown_08615F08
ldr r0, =gSpriteTemplate_8615F08
adds r1, r3, 0
movs r3, 0x8
bl CreateSprite
@ -11078,7 +11078,7 @@ sub_81B5F74: @ 81B5F74
lsrs r3, 24
lsls r2, 24
lsrs r2, 24
ldr r0, =gUnknown_08615F78
ldr r0, =gSpriteTemplate_8615F78
adds r1, r3, 0
movs r3, 0x8
bl CreateSprite
@ -11194,7 +11194,7 @@ party_menu_status_condition_object: @ 81B6064
bl GetMonData
cmp r0, 0
beq _081B608C
ldr r0, =gUnknown_08616008
ldr r0, =gSpriteTemplate_8616008
ldr r2, [r4, 0x4]
ldrb r1, [r2, 0x4]
ldrb r2, [r2, 0x5]
@ -11220,7 +11220,7 @@ party_menu_link_mon_status_condition_object: @ 81B6098
lsrs r5, r1, 24
cmp r0, 0
beq _081B60D4
ldr r0, =gUnknown_08616008
ldr r0, =gSpriteTemplate_8616008
ldr r2, [r4, 0x4]
ldrb r1, [r2, 0x4]
ldrb r2, [r2, 0x5]

View File

@ -8940,7 +8940,7 @@ _080C0250:
b _080C028E
.pool
_080C028C:
ldr r0, =gUnknown_0856E688
ldr r0, =sText_TenDashes2
_080C028E:
movs r1, 0x84
movs r2, 0x19

View File

@ -5393,7 +5393,7 @@ _080CA0C2:
thumb_func_start sub_80CA0C8
sub_80CA0C8: @ 80CA0C8
push {lr}
ldr r0, =gUnknown_08572744
ldr r0, =gWaveformSpritePalette
bl LoadSpritePalette
pop {r0}
bx r0
@ -5498,7 +5498,7 @@ sub_80CA154: @ 80CA154
sub_80CA1C4: @ 80CA1C4
push {r4,lr}
sub sp, 0x8
ldr r0, =gUnknown_0857274C
ldr r0, =gWaveformSpriteSheet
ldr r1, [r0, 0x4]
ldr r0, [r0]
str r0, [sp]
@ -10135,7 +10135,7 @@ _080CC7E6:
lsls r0, r1, 1
adds r0, r1
lsls r0, 2
ldr r1, =gUnknown_085775B8
ldr r1, =gWallpaperTable
adds r6, r0, r1
ldr r0, [r6, 0x4]
ldr r1, [r7]
@ -10646,7 +10646,7 @@ _080CCC70:
adds r1, r6, r1
lsls r1, 16
asrs r1, 16
ldr r0, =gUnknown_0857B0A8
ldr r0, =gSpriteTemplate_857B0A8
movs r2, 0x1C
movs r3, 0x18
bl CreateSprite
@ -10720,7 +10720,7 @@ sub_80CCCFC: @ 80CCCFC
ldr r0, =0x00030200
str r0, [r3, 0x4]
add r1, sp, 0x4
ldr r0, =gUnknown_0857B0A8
ldr r0, =gSpriteTemplate_857B0A8
ldm r0!, {r5-r7}
stm r1!, {r5-r7}
ldm r0!, {r5-r7}
@ -16240,14 +16240,14 @@ sub_80CFC14: @ 80CFC14
push {r4-r6,lr}
sub sp, 0x2C
mov r1, sp
ldr r0, =gUnknown_0857B9E4
ldr r0, =gHandCursorSpriteSheets
ldm r0!, {r2-r4}
stm r1!, {r2-r4}
ldm r0!, {r2,r3,r5}
stm r1!, {r2,r3,r5}
add r4, sp, 0x18
adds r1, r4, 0
ldr r0, =gUnknown_0857B9FC
ldr r0, =gHandCursorSpritePalettes
ldm r0!, {r2,r3,r5}
stm r1!, {r2,r3,r5}
ldr r0, [r0]
@ -16279,7 +16279,7 @@ sub_80CFC14: @ 80CFC14
adds r2, r4, 0
adds r3, r5, 0
bl sub_80CD444
ldr r0, =gUnknown_0857BA50
ldr r0, =gSpriteTemplate_857BA50
movs r2, 0
ldrsh r1, [r4, r2]
movs r3, 0
@ -16353,7 +16353,7 @@ _080CFD3C:
movs r3, 0x15
movs r4, 0x2
_080CFD40:
ldr r0, =gUnknown_0857BA68
ldr r0, =gSpriteTemplate_857BA68
movs r1, 0
movs r2, 0
bl CreateSprite
@ -18324,7 +18324,7 @@ sub_80D0C60: @ 80D0C60
orrs r0, r1
str r0, [r2, 0x4]
mov r1, sp
ldr r0, =gUnknown_0857BC70
ldr r0, =gSpriteTemplate_857BC70
ldm r0!, {r4-r6}
stm r1!, {r4-r6}
ldm r0!, {r4-r6}
@ -21660,7 +21660,7 @@ sub_80D2644: @ 80D2644
mov r2, r9
ldr r1, [r2]
adds r5, r1
ldr r2, =gUnknown_0857BC88
ldr r2, =gSpriteTemplate_857BC88
lsls r4, 2
lsls r1, r0, 4
adds r4, r1

View File

@ -6948,7 +6948,7 @@ sub_81CA818: @ 81CA818
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
ldr r5, =gUnknown_0861FC7A
ldr r5, =gUnknown_0861FC78 + 2
adds r0, r4, 0
movs r1, 0x1
adds r2, r5, 0
@ -6967,7 +6967,7 @@ sub_81CA818: @ 81CA818
thumb_func_start sub_81CA850
sub_81CA850: @ 81CA850
push {lr}
ldr r0, =gUnknown_0861FC86
ldr r0, =gUnknown_0861FC78 + 0xE
movs r1, 0x31
movs r2, 0x4
bl sub_81C7944
@ -6985,7 +6985,7 @@ sub_81CA864: @ 81CA864
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
ldr r5, =gUnknown_0861FC86
ldr r5, =gUnknown_0861FC78 + 0xE
adds r0, r4, 0
movs r1, 0x1
adds r2, r5, 0
@ -26754,7 +26754,7 @@ _081D4368:
b _081D449E
_081D4394:
movs r3, 0
ldr r1, =gUnknown_0862608E
ldr r1, =gUnknown_0862608C + 2
adds r0, r7, r1
movs r2, 0x16
ldrsh r1, [r4, r2]
@ -26887,7 +26887,7 @@ _081D449E:
mov r3, r10
adds r4, r0, r3
ldr r6, =gUnknown_0862608C
ldr r1, =gUnknown_0862608E
ldr r1, =gUnknown_0862608C + 2
adds r0, r7, r1
movs r3, 0x16
ldrsh r1, [r4, r3]

View File

@ -826,7 +826,7 @@ _080778CA:
adds r4, 0x10
_080778DE:
add r1, sp, 0x10
ldr r0, =gUnknown_0832DCAC
ldr r0, =gSpriteTemplate_832DCAC
ldm r0!, {r2,r3,r7}
stm r1!, {r2,r3,r7}
ldm r0!, {r2,r3,r7}
@ -863,7 +863,7 @@ _080778DE:
adds r4, 0x88
_0807792C:
add r1, sp, 0x10
ldr r0, =gUnknown_0832DCAC
ldr r0, =gSpriteTemplate_832DCAC
ldm r0!, {r2,r3,r7}
stm r1!, {r2,r3,r7}
ldm r0!, {r2,r3,r7}
@ -889,7 +889,7 @@ _0807792C:
b _08077B22
.pool
_08077970:
ldr r4, =gUnknown_0832DCAC
ldr r4, =gSpriteTemplate_832DCAC
add r1, sp, 0x10
adds r0, r4, 0
ldm r0!, {r2,r3,r7}
@ -927,7 +927,7 @@ _08077970:
lsls r5, 13
_080779BC:
add r1, sp, 0x10
ldr r0, =gUnknown_0832DCAC
ldr r0, =gSpriteTemplate_832DCAC
ldm r0!, {r2,r3,r7}
stm r1!, {r2,r3,r7}
ldm r0!, {r2,r3,r7}
@ -948,7 +948,7 @@ _080779BC:
adds r6, 0x1
cmp r6, 0x5
ble _080779BC
ldr r0, =gUnknown_0832DC94
ldr r0, =gSpriteTemplate_832DC94
ldr r2, =gUnknown_0832DE24
ldrb r1, [r2]
lsls r1, 19
@ -1450,7 +1450,7 @@ _08077EA0:
adds r4, 0x10
_08077EB4:
add r1, sp, 0xC
ldr r0, =gUnknown_0832DCAC
ldr r0, =gSpriteTemplate_832DCAC
ldm r0!, {r2,r3,r7}
stm r1!, {r2,r3,r7}
ldm r0!, {r2,r3,r7}
@ -1487,7 +1487,7 @@ _08077EB4:
adds r4, 0x88
_08077F02:
add r1, sp, 0xC
ldr r0, =gUnknown_0832DCAC
ldr r0, =gSpriteTemplate_832DCAC
ldm r0!, {r2,r3,r7}
stm r1!, {r2,r3,r7}
ldm r0!, {r2,r3,r7}
@ -1513,7 +1513,7 @@ _08077F02:
b _080780D8
.pool
_08077F48:
ldr r4, =gUnknown_0832DCAC
ldr r4, =gSpriteTemplate_832DCAC
add r1, sp, 0xC
adds r0, r4, 0
ldm r0!, {r2,r3,r7}
@ -1551,7 +1551,7 @@ _08077F48:
lsls r5, 13
_08077F94:
add r1, sp, 0xC
ldr r0, =gUnknown_0832DCAC
ldr r0, =gSpriteTemplate_832DCAC
ldm r0!, {r2,r3,r7}
stm r1!, {r2,r3,r7}
ldm r0!, {r2,r3,r7}
@ -1590,7 +1590,7 @@ _08077FE4:
adds r0, 0x6
_08077FEA:
strb r0, [r2]
ldr r0, =gUnknown_0832DC94
ldr r0, =gSpriteTemplate_832DC94
ldr r3, =gUnknown_0832DE24
ldr r1, [r4]
adds r1, 0x35
@ -1931,7 +1931,7 @@ _080782D4:
movs r2, 0
movs r3, 0
bl CopyToBgTilemapBufferRect_ChangePalette
ldr r1, =gUnknown_0832CABC
ldr r1, =gTradeStripesBG2Tilemap
movs r2, 0x80
lsls r2, 4
movs r0, 0x2
@ -1940,7 +1940,7 @@ _080782D4:
b _0807837E
.pool
_08078324:
ldr r1, =gUnknown_0832D2BC
ldr r1, =gTradeStripesBG3Tilemap
movs r2, 0x80
lsls r2, 4
movs r0, 0x3
@ -2394,7 +2394,7 @@ _08078726:
mov r2, sp
bl GetMonData
mov r0, sp
ldr r1, =gUnknown_0832DF94
ldr r1, =gJPText_Shedinja
bl StringCompareWithoutExtCtrlCodes
cmp r0, 0
bne _08078766
@ -2444,7 +2444,7 @@ _080787AC:
thumb_func_start sub_80787B8
sub_80787B8: @ 80787B8
push {lr}
ldr r0, =gUnknown_0832DAE5
ldr r0, =gText_IsThisTradeOkay
ldr r1, =gUnknown_0203229C
ldr r1, [r1]
adds r1, 0x72
@ -4438,7 +4438,7 @@ _08079772:
lsls r0, 2
add r0, r8
bl sub_80A6DEC
ldr r1, =gUnknown_0832C8BE
ldr r1, =gTradePartyBoxTilemap
ldr r0, [sp, 0x64]
subs r2, r0, r7
lsls r2, 24
@ -4491,7 +4491,7 @@ _080798AC:
b _08079A24
.pool
_080798BC:
ldr r1, =gUnknown_0832C6C0
ldr r1, =gTradeMovesBoxTilemap
ldr r0, [sp, 0x60]
lsls r2, r0, 4
subs r2, r0
@ -4769,7 +4769,7 @@ _08079AFE:
lsrs r4, r0, 16
cmp r4, 0x3
bls _08079ADE
ldr r1, =gUnknown_0832DABC
ldr r1, =gText_EmptyString7
adds r0, r6, 0
bl StringCopy
movs r4, 0
@ -4789,7 +4789,7 @@ _08079B20:
bl StringAppend
_08079B3C:
adds r0, r6, 0
ldr r1, =gUnknown_0832DAD2
ldr r1, =gText_NewLine3
bl StringAppend
adds r0, r4, 0x1
lsls r0, 16
@ -4799,10 +4799,10 @@ _08079B3C:
b _08079B6C
.pool
_08079B5C:
ldr r1, =gUnknown_0832DABC
ldr r1, =gText_EmptyString7
adds r0, r6, 0
bl StringCopy
ldr r1, =gUnknown_0832DADF
ldr r1, =gText_FourQuestionMarks
adds r0, r6, 0
bl StringAppend
_08079B6C:
@ -5326,7 +5326,7 @@ sub_8079F88: @ 8079F88
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
ldr r1, =gUnknown_0832C8BE
ldr r1, =gTradePartyBoxTilemap
lsls r2, r4, 4
subs r2, r4
lsls r2, 24
@ -5698,7 +5698,7 @@ _0807A2B8:
mov r0, sp
b _0807A2D6
_0807A2BC:
ldr r0, =gUnknown_0832DCE4
ldr r0, =gSpritePalette_TradeScreenText
bl LoadSpritePalette
b _0807A2DA
.pool
@ -8571,7 +8571,7 @@ _0807BB68:
lsls r4, r0, 4
subs r4, r0
lsls r4, 2
ldr r0, =gUnknown_08338ED0
ldr r0, =gIngameTrades
adds r4, r0
ldr r0, =gStringVar1
adds r1, r4, 0
@ -9098,7 +9098,7 @@ _0807C1DC:
beq _0807C1FC
bl _0807CFB4
_0807C1FC:
ldr r0, =gUnknown_08338D28
ldr r0, =gSpriteTemplate_8338D28
movs r1, 0x78
movs r2, 0x20
movs r3, 0
@ -9228,7 +9228,7 @@ _0807C318:
bl _0807CFB4
_0807C328:
bl sub_807AB28
ldr r0, =gUnknown_08338E74
ldr r0, =gSpriteTemplate_8338E74
movs r1, 0x78
movs r2, 0x50
movs r3, 0
@ -9296,7 +9296,7 @@ _0807C3B0:
beq _0807C3C4
bl _0807CFB4
_0807C3C4:
ldr r0, =gUnknown_08338DFC
ldr r0, =gSpriteTemplate_8338DFC
movs r1, 0x80
movs r2, 0x41
movs r3, 0
@ -9316,7 +9316,7 @@ _0807C3E0:
ldr r1, [r4]
adds r1, 0x90
strb r0, [r1]
ldr r0, =gUnknown_08338DC8
ldr r0, =gSpriteTemplate_8338DC8
movs r1, 0x80
movs r2, 0x50
movs r3, 0
@ -9455,7 +9455,7 @@ _0807C528:
movs r2, 0x10
movs r3, 0
bl BeginNormalPaletteFade
ldr r5, =gUnknown_08338DC8
ldr r5, =gSpriteTemplate_8338DC8
adds r0, r5, 0
movs r1, 0x6F
movs r2, 0xAA
@ -9604,7 +9604,7 @@ _0807C66C:
adds r1, r4, 0
adds r1, 0x10
adds r0, r1
ldr r1, =gUnknown_08338ECC
ldr r1, =gSpriteAffineAnimTable_8338ECC
str r1, [r0]
ldrb r1, [r2]
lsls r0, r1, 4
@ -9915,7 +9915,7 @@ _0807C8FA:
ldr r1, [r7]
adds r1, 0x90
strb r0, [r1]
ldr r0, =gUnknown_08338DC8
ldr r0, =gSpriteTemplate_8338DC8
movs r1, 0x80
adds r2, r4, 0
movs r3, 0
@ -10091,7 +10091,7 @@ _0807CA86:
bne _0807CA92
b _0807CFB4
_0807CA92:
ldr r0, =gUnknown_08338DFC
ldr r0, =gSpriteTemplate_8338DFC
movs r1, 0x80
movs r2, 0x41
movs r3, 0
@ -10113,7 +10113,7 @@ _0807CA92:
b _0807CFB4
.pool
_0807CAC8:
ldr r0, =gUnknown_08338E74
ldr r0, =gSpriteTemplate_8338E74
movs r1, 0x78
movs r2, 0x50
movs r3, 0
@ -10255,7 +10255,7 @@ _0807CBEC:
b _0807CF48
.pool
_0807CBF4:
ldr r0, =gUnknown_08338D28
ldr r0, =gSpriteTemplate_8338D28
movs r2, 0x8
negs r2, r2
movs r1, 0x78
@ -11160,7 +11160,7 @@ _0807D5B8:
beq _0807D5D8
bl _0807E400
_0807D5D8:
ldr r0, =gUnknown_08338D28
ldr r0, =gSpriteTemplate_8338D28
movs r1, 0x78
movs r2, 0x20
movs r3, 0
@ -11290,7 +11290,7 @@ _0807D6F4:
_0807D704:
movs r0, 0x3
bl sub_807B62C
ldr r0, =gUnknown_08338E8C
ldr r0, =gSpriteTemplate_8338E8C
movs r1, 0x78
movs r2, 0x50
movs r3, 0
@ -11386,7 +11386,7 @@ _0807D7C4:
adds r0, r1
ldr r1, =sub_807AA4C
str r1, [r0]
ldr r0, =gUnknown_08338DC8
ldr r0, =gSpriteTemplate_8338DC8
movs r1, 0x78
movs r2, 0x50
movs r3, 0
@ -11524,7 +11524,7 @@ _0807D924:
movs r2, 0x10
movs r3, 0
bl BeginNormalPaletteFade
ldr r5, =gUnknown_08338DC8
ldr r5, =gSpriteTemplate_8338DC8
adds r0, r5, 0
movs r1, 0x6F
movs r2, 0xAA
@ -11678,7 +11678,7 @@ _0807DA74:
adds r1, r4, 0
adds r1, 0x10
adds r0, r1
ldr r1, =gUnknown_08338ECC
ldr r1, =gSpriteAffineAnimTable_8338ECC
str r1, [r0]
ldrb r1, [r2]
lsls r0, r1, 4
@ -12008,7 +12008,7 @@ _0807DD02:
adds r0, r1
ldr r1, =sub_807AA4C
str r1, [r0]
ldr r0, =gUnknown_08338DC8
ldr r0, =gSpriteTemplate_8338DC8
movs r1, 0x78
adds r2, r4, 0
movs r3, 0
@ -12218,7 +12218,7 @@ _0807DF12:
strh r6, [r5]
b _0807E398
_0807DF16:
ldr r0, =gUnknown_08338E74
ldr r0, =gSpriteTemplate_8338E74
movs r1, 0x78
movs r2, 0x50
movs r3, 0
@ -12360,7 +12360,7 @@ _0807E038:
b _0807E394
.pool
_0807E040:
ldr r0, =gUnknown_08338D28
ldr r0, =gSpriteTemplate_8338D28
movs r2, 0x8
negs r2, r2
movs r1, 0x78
@ -13184,7 +13184,7 @@ sub_807E73C: @ 807E73C
lsls r4, r0, 4
subs r4, r0
lsls r4, 2
ldr r0, =gUnknown_08338ED0
ldr r0, =gIngameTrades
adds r4, r0
ldr r0, =gStringVar1
ldrh r1, [r4, 0x38]
@ -13214,7 +13214,7 @@ sub_807E784: @ 807E784
lsls r4, r0, 4
subs r4, r0
lsls r4, 2
ldr r0, =gUnknown_08338ED0
ldr r0, =gIngameTrades
adds r4, r0
ldr r0, =gSpecialVar_0x8005
ldrh r1, [r0]
@ -13253,7 +13253,7 @@ sub_807E7E8: @ 807E7E8
lsls r2, r1, 4
subs r2, r1
lsls r2, 2
ldr r1, =gUnknown_08338ED0
ldr r1, =gIngameTrades
adds r5, r2, r1
movs r1, 0x64
muls r0, r1

View File

@ -1,607 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start sub_81DA700
sub_81DA700: @ 81DA700
push {lr}
sub sp, 0x8
add r1, sp, 0x4
mov r0, sp
bl sub_8149F58
ldr r0, =gUnknown_0862AD54
ldr r1, [sp, 0x4]
bl LZ77UnCompVram
ldr r0, =gUnknown_0862AF30
ldr r1, [sp]
bl LZ77UnCompVram
ldr r0, =gUnknown_0862B53C
movs r1, 0xF0
movs r2, 0x20
bl LoadPalette
ldr r0, =gUnknown_0862B724
bl LoadCompressedObjectPic
ldr r0, =gUnknown_0862B72C
bl LoadSpritePalette
add sp, 0x8
pop {r0}
bx r0
.pool
thumb_func_end sub_81DA700
thumb_func_start sub_81DA74C
sub_81DA74C: @ 81DA74C
push {r4-r7,lr}
mov r7, r10
mov r6, r9
mov r5, r8
push {r5-r7}
sub sp, 0x4
adds r5, r0, 0
adds r6, r1, 0
ldr r0, [sp, 0x24]
ldr r1, [sp, 0x28]
ldr r4, [sp, 0x2C]
lsls r2, 24
lsrs r2, 24
str r2, [sp]
lsls r3, 24
lsrs r3, 24
mov r10, r3
lsls r0, 24
lsrs r0, 24
mov r8, r0
lsls r1, 24
lsrs r1, 24
mov r9, r1
lsls r4, 24
lsrs r7, r4, 24
ldr r0, =gUnknown_0862B758
lsls r5, 16
asrs r5, 16
lsls r6, 16
asrs r6, 16
adds r1, r5, 0
adds r2, r6, 0
movs r3, 0
bl CreateSprite
lsls r0, 24
lsrs r5, r0, 24
cmp r7, 0x1
beq _081DA7D0
cmp r7, 0x1
bgt _081DA7A8
cmp r7, 0
beq _081DA7B8
b _081DA7AC
.pool
_081DA7A8:
cmp r7, 0x2
beq _081DA7E4
_081DA7AC:
ldr r6, =gSprites
lsls r3, r5, 4
b _081DA7F8
.pool
_081DA7B8:
ldr r2, =gSprites
lsls r3, r5, 4
adds r0, r3, r5
lsls r0, 2
adds r0, r2
movs r1, 0x78
strh r1, [r0, 0x2E]
movs r1, 0x2D
b _081DA7F4
.pool
_081DA7D0:
ldr r2, =gSprites
lsls r3, r5, 4
adds r0, r3, r5
lsls r0, 2
adds r0, r2
movs r1, 0x59
b _081DA7F0
.pool
_081DA7E4:
ldr r2, =gSprites
lsls r3, r5, 4
adds r0, r3, r5
lsls r0, 2
adds r0, r2
movs r1, 0x97
_081DA7F0:
strh r1, [r0, 0x2E]
movs r1, 0x61
_081DA7F4:
strh r1, [r0, 0x30]
adds r6, r2, 0
_081DA7F8:
adds r4, r3, r5
lsls r4, 2
adds r0, r4, r6
mov r2, r8
lsls r1, r2, 24
asrs r1, 24
movs r2, 0
strh r1, [r0, 0x32]
mov r3, r9
lsls r1, r3, 24
asrs r1, 24
strh r1, [r0, 0x34]
mov r1, sp
ldrh r1, [r1]
strh r1, [r0, 0x3A]
mov r3, r10
strh r3, [r0, 0x3C]
strh r2, [r0, 0x36]
strh r2, [r0, 0x38]
adds r1, r7, 0
bl StartSpriteAnim
adds r0, r6, 0
adds r0, 0x1C
adds r4, r0
ldr r0, =sub_81DA848
str r0, [r4]
adds r0, r5, 0
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_81DA74C
thumb_func_start sub_81DA848
sub_81DA848: @ 81DA848
push {r4,r5,lr}
adds r3, r0, 0
adds r2, r3, 0
adds r2, 0x2E
movs r0, 0x20
ldrsh r1, [r3, r0]
movs r4, 0x2E
ldrsh r0, [r3, r4]
cmp r1, r0
bne _081DA874
movs r5, 0x22
ldrsh r1, [r3, r5]
movs r4, 0x2
ldrsh r0, [r2, r4]
cmp r1, r0
bne _081DA874
ldr r0, =SpriteCallbackDummy
str r0, [r3, 0x1C]
b _081DA8B4
.pool
_081DA874:
ldrh r4, [r2, 0x8]
movs r5, 0x8
ldrsh r1, [r2, r5]
movs r5, 0xC
ldrsh r0, [r2, r5]
cmp r1, r0
bne _081DA890
ldrh r0, [r2, 0x4]
ldrh r1, [r3, 0x20]
adds r0, r1
movs r1, 0
strh r0, [r3, 0x20]
strh r1, [r2, 0x8]
b _081DA894
_081DA890:
adds r0, r4, 0x1
strh r0, [r2, 0x8]
_081DA894:
ldrh r4, [r2, 0xA]
movs r5, 0xA
ldrsh r1, [r2, r5]
movs r5, 0xE
ldrsh r0, [r2, r5]
cmp r1, r0
bne _081DA8B0
ldrh r0, [r2, 0x6]
ldrh r1, [r3, 0x22]
adds r0, r1
movs r1, 0
strh r0, [r3, 0x22]
strh r1, [r2, 0xA]
b _081DA8B4
_081DA8B0:
adds r0, r4, 0x1
strh r0, [r2, 0xA]
_081DA8B4:
pop {r4,r5}
pop {r0}
bx r0
thumb_func_end sub_81DA848
thumb_func_start sub_81DA8BC
sub_81DA8BC: @ 81DA8BC
push {r4-r7,lr}
mov r7, r10
mov r6, r9
mov r5, r8
push {r5-r7}
sub sp, 0xC
adds r6, r0, 0
mov r8, r1
ldr r0, [sp, 0x2C]
ldr r1, [sp, 0x30]
ldr r4, [sp, 0x34]
ldr r5, [sp, 0x38]
lsls r2, 16
lsrs r2, 16
str r2, [sp]
lsls r3, 16
lsrs r3, 16
str r3, [sp, 0x4]
lsls r0, 16
lsrs r0, 16
mov r10, r0
lsls r1, 16
lsrs r1, 16
mov r9, r1
lsls r4, 16
lsrs r7, r4, 16
lsls r5, 24
lsrs r5, 24
ldr r0, =gUnknown_0862B758
lsls r6, 16
asrs r6, 16
mov r1, r8
lsls r1, 16
asrs r1, 16
mov r8, r1
adds r1, r6, 0
mov r2, r8
movs r3, 0
bl CreateSprite
lsls r0, 24
lsrs r6, r0, 24
cmp r5, 0x1
beq _081DA94C
cmp r5, 0x1
bgt _081DA924
cmp r5, 0
beq _081DA934
b _081DA928
.pool
_081DA924:
cmp r5, 0x2
beq _081DA960
_081DA928:
ldr r2, =gSprites
lsls r3, r6, 4
b _081DA972
.pool
_081DA934:
ldr r2, =gSprites
lsls r3, r6, 4
adds r0, r3, r6
lsls r0, 2
adds r0, r2
movs r1, 0x78
strh r1, [r0, 0x2E]
movs r1, 0x2D
b _081DA970
.pool
_081DA94C:
ldr r2, =gSprites
lsls r3, r6, 4
adds r0, r3, r6
lsls r0, 2
adds r0, r2
movs r1, 0x59
b _081DA96C
.pool
_081DA960:
ldr r2, =gSprites
lsls r3, r6, 4
adds r0, r3, r6
lsls r0, 2
adds r0, r2
movs r1, 0x97
_081DA96C:
strh r1, [r0, 0x2E]
movs r1, 0x61
_081DA970:
strh r1, [r0, 0x30]
_081DA972:
adds r4, r3, r6
lsls r4, 2
adds r0, r4, r2
mov r3, sp
ldrh r3, [r3]
strh r3, [r0, 0x32]
mov r1, sp
ldrh r1, [r1, 0x4]
strh r1, [r0, 0x34]
mov r3, r10
strh r3, [r0, 0x36]
mov r1, r9
strh r1, [r0, 0x38]
strh r7, [r0, 0x3A]
adds r1, r5, 0
str r2, [sp, 0x8]
bl StartSpriteAnim
ldr r2, [sp, 0x8]
adds r0, r2, 0
adds r0, 0x1C
adds r4, r0
ldr r0, =sub_81DA9BC
str r0, [r4]
adds r0, r6, 0
add sp, 0xC
pop {r3-r5}
mov r8, r3
mov r9, r4
mov r10, r5
pop {r4-r7}
pop {r1}
bx r1
.pool
thumb_func_end sub_81DA8BC
thumb_func_start sub_81DA9BC
sub_81DA9BC: @ 81DA9BC
push {r4,lr}
adds r4, r0, 0
ldrh r0, [r4, 0x32]
bl Sin2
lsls r0, 16
asrs r0, 16
movs r2, 0x36
ldrsh r1, [r4, r2]
muls r0, r1
asrs r0, 12
strh r0, [r4, 0x24]
ldrh r0, [r4, 0x32]
bl Cos2
lsls r0, 16
asrs r0, 16
movs r3, 0x36
ldrsh r1, [r4, r3]
muls r0, r1
asrs r0, 12
strh r0, [r4, 0x26]
movs r1, 0x32
ldrsh r0, [r4, r1]
movs r2, 0x34
ldrsh r1, [r4, r2]
adds r0, r1
movs r1, 0xB4
lsls r1, 1
bl __modsi3
strh r0, [r4, 0x32]
ldrh r2, [r4, 0x36]
movs r3, 0x36
ldrsh r1, [r4, r3]
movs r3, 0x38
ldrsh r0, [r4, r3]
cmp r1, r0
beq _081DAA12
ldrh r0, [r4, 0x3A]
adds r0, r2, r0
strh r0, [r4, 0x36]
b _081DAA16
_081DAA12:
ldr r0, =SpriteCallbackDummy
str r0, [r4, 0x1C]
_081DAA16:
pop {r4}
pop {r0}
bx r0
.pool
thumb_func_end sub_81DA9BC
thumb_func_start sub_81DAA20
sub_81DAA20: @ 81DAA20
push {r4,r5,lr}
adds r5, r0, 0
ldr r4, =0x00002e90
adds r0, r4, 0
bl FreeSpriteTilesByTag
adds r0, r4, 0
bl FreeSpritePaletteByTag
movs r0, 0x10
ldrsh r1, [r5, r0]
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
ldr r4, =gSprites
adds r0, r4
bl DestroySprite
movs r0, 0x12
ldrsh r1, [r5, r0]
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
adds r0, r4
bl DestroySprite
movs r0, 0x14
ldrsh r1, [r5, r0]
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
adds r0, r4
bl DestroySprite
pop {r4,r5}
pop {r0}
bx r0
.pool
thumb_func_end sub_81DAA20
thumb_func_start sub_81DAA74
sub_81DAA74: @ 81DAA74
push {r4,r5,lr}
adds r3, r0, 0
ldr r2, =gSprites
movs r0, 0x10
ldrsh r1, [r3, r0]
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
adds r5, r2, 0
adds r5, 0x1C
adds r0, r5
ldr r4, [r0]
ldr r0, =SpriteCallbackDummy
cmp r4, r0
bne _081DAAC4
movs r0, 0x12
ldrsh r1, [r3, r0]
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
adds r0, r5
ldr r2, [r0]
cmp r2, r4
bne _081DAAC4
movs r1, 0x14
ldrsh r0, [r3, r1]
lsls r1, r0, 4
adds r1, r0
lsls r1, 2
adds r1, r5
ldr r0, [r1]
cmp r0, r2
bne _081DAAC4
movs r0, 0x1
b _081DAAC6
.pool
_081DAAC4:
movs r0, 0
_081DAAC6:
pop {r4,r5}
pop {r1}
bx r1
thumb_func_end sub_81DAA74
thumb_func_start sub_81DAACC
sub_81DAACC: @ 81DAACC
push {r4,lr}
adds r4, r0, 0
movs r1, 0xA
ldrsh r0, [r4, r1]
cmp r0, 0
beq _081DAB20
bl sub_81DA700
ldr r1, =0x00003f41
movs r0, 0x50
bl SetGpuReg
movs r1, 0x80
lsls r1, 5
movs r0, 0x52
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 r1, 0xA0
lsls r1, 3
movs r0, 0
movs r2, 0x2
bl ChangeBgY
movs r0, 0
strh r0, [r4, 0xA]
ldrh r0, [r4, 0x8]
adds r0, 0x1
strh r0, [r4, 0x8]
movs r0, 0x1
b _081DAB46
.pool
_081DAB20:
movs r1, 0x80
lsls r1, 6
movs r0, 0
bl ClearGpuRegBits
movs r1, 0x80
lsls r1, 7
movs r0, 0
bl ClearGpuRegBits
movs r1, 0x80
lsls r1, 1
movs r0, 0
bl ClearGpuRegBits
ldrh r0, [r4, 0xA]
adds r0, 0x1
strh r0, [r4, 0xA]
movs r0, 0
_081DAB46:
pop {r4}
pop {r1}
bx r1
thumb_func_end sub_81DAACC
thumb_func_start sub_81DAB4C
sub_81DAB4C: @ 81DAB4C
push {r4,lr}
sub sp, 0x4
adds r4, r0, 0
movs r1, 0xC
ldrsh r0, [r4, r1]
cmp r0, 0
bne _081DAB64
movs r1, 0x80
lsls r1, 1
movs r0, 0
bl SetGpuRegBits
_081DAB64:
ldrh r1, [r4, 0xC]
movs r2, 0xC
ldrsh r0, [r4, r2]
cmp r0, 0x10
bne _081DAB98
ldrh r1, [r4, 0xE]
movs r2, 0xE
ldrsh r0, [r4, r2]
cmp r0, 0x1F
bne _081DAB92
movs r1, 0x1
negs r1, r1
movs r0, 0
str r0, [sp]
adds r0, r1, 0
movs r2, 0
movs r3, 0x10
bl BeginNormalPaletteFade
ldrh r0, [r4, 0x8]
adds r0, 0x1
strh r0, [r4, 0x8]
b _081DABB0
_081DAB92:
adds r0, r1, 0x1
strh r0, [r4, 0xE]
b _081DABB0
_081DAB98:
adds r0, r1, 0x1
strh r0, [r4, 0xC]
ldrh r1, [r4, 0xC]
movs r0, 0x10
subs r0, r1
lsls r0, 8
orrs r1, r0
lsls r1, 16
lsrs r1, 16
movs r0, 0x52
bl SetGpuReg
_081DABB0:
movs r0, 0
add sp, 0x4
pop {r4}
pop {r1}
bx r1
thumb_func_end sub_81DAB4C
.align 2, 0 @ Don't pad with nop.

View File

@ -1,985 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start sub_81DABBC
sub_81DABBC: @ 81DABBC
push {r4,lr}
adds r4, r0, 0
bl sub_81DAA74
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
bne _081DABD2
ldrh r0, [r4, 0x8]
adds r0, 0x1
strh r0, [r4, 0x8]
_081DABD2:
movs r0, 0
pop {r4}
pop {r1}
bx r1
thumb_func_end sub_81DABBC
thumb_func_start Phase2Task_34
Phase2Task_34: @ 81DABDC
push {r4,r5,lr}
lsls r0, 24
lsrs r0, 24
ldr r5, =gUnknown_0862B770
ldr r2, =gTasks
lsls r1, r0, 2
adds r1, r0
lsls r1, 3
adds r4, r1, r2
_081DABEE:
movs r1, 0x8
ldrsh r0, [r4, r1]
lsls r0, 2
adds r0, r5
ldr r1, [r0]
adds r0, r4, 0
bl _call_via_r1
lsls r0, 24
cmp r0, 0
bne _081DABEE
pop {r4,r5}
pop {r0}
bx r0
.pool
thumb_func_end Phase2Task_34
thumb_func_start sub_81DAC14
sub_81DAC14: @ 81DAC14
push {r4-r6,lr}
sub sp, 0xC
adds r6, r0, 0
movs r1, 0x33
negs r1, r1
movs r0, 0
str r0, [sp]
movs r5, 0x2
str r5, [sp, 0x4]
str r0, [sp, 0x8]
movs r0, 0x78
movs r2, 0
movs r3, 0
bl sub_81DA74C
lsls r0, 24
lsrs r0, 24
strh r0, [r6, 0x10]
movs r0, 0x7
negs r0, r0
str r5, [sp]
movs r4, 0x2
negs r4, r4
str r4, [sp, 0x4]
movs r1, 0x1
str r1, [sp, 0x8]
movs r1, 0xC1
movs r2, 0
movs r3, 0
bl sub_81DA74C
lsls r0, 24
lsrs r0, 24
strh r0, [r6, 0x12]
str r4, [sp]
str r4, [sp, 0x4]
str r5, [sp, 0x8]
movs r0, 0xF7
movs r1, 0xC1
movs r2, 0
movs r3, 0
bl sub_81DA74C
lsls r0, 24
lsrs r0, 24
strh r0, [r6, 0x14]
ldrh r0, [r6, 0x8]
adds r0, 0x1
strh r0, [r6, 0x8]
movs r0, 0
add sp, 0xC
pop {r4-r6}
pop {r1}
bx r1
thumb_func_end sub_81DAC14
thumb_func_start sub_81DAC80
sub_81DAC80: @ 81DAC80
push {lr}
adds r2, r0, 0
ldr r0, =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
cmp r0, 0
bne _081DACA4
adds r0, r2, 0
bl sub_81DAA20
ldr r0, =Phase2Task_34
bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
bl DestroyTask
_081DACA4:
movs r0, 0
pop {r1}
bx r1
.pool
thumb_func_end sub_81DAC80
thumb_func_start Phase2Task_35
Phase2Task_35: @ 81DACB4
push {r4,r5,lr}
lsls r0, 24
lsrs r0, 24
ldr r5, =gUnknown_0862B784
ldr r2, =gTasks
lsls r1, r0, 2
adds r1, r0
lsls r1, 3
adds r4, r1, r2
_081DACC6:
movs r1, 0x8
ldrsh r0, [r4, r1]
lsls r0, 2
adds r0, r5
ldr r1, [r0]
adds r0, r4, 0
bl _call_via_r1
lsls r0, 24
cmp r0, 0
bne _081DACC6
pop {r4,r5}
pop {r0}
bx r0
.pool
thumb_func_end Phase2Task_35
thumb_func_start sub_81DACEC
sub_81DACEC: @ 81DACEC
push {r4,r5,lr}
sub sp, 0xC
adds r5, r0, 0
movs r0, 0
str r0, [sp]
movs r4, 0x4
negs r4, r4
str r4, [sp, 0x4]
str r0, [sp, 0x8]
movs r0, 0x78
movs r1, 0xC5
movs r2, 0
movs r3, 0
bl sub_81DA74C
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x10]
str r4, [sp]
movs r4, 0x2
str r4, [sp, 0x4]
movs r0, 0x1
str r0, [sp, 0x8]
movs r0, 0xF1
movs r1, 0x3B
movs r2, 0
movs r3, 0x1
bl sub_81DA74C
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x12]
movs r0, 0x1
negs r0, r0
movs r1, 0x4
str r1, [sp]
str r4, [sp, 0x4]
str r4, [sp, 0x8]
movs r1, 0x3B
movs r2, 0
movs r3, 0x1
bl sub_81DA74C
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x14]
ldrh r0, [r5, 0x8]
adds r0, 0x1
strh r0, [r5, 0x8]
movs r0, 0
add sp, 0xC
pop {r4,r5}
pop {r1}
bx r1
thumb_func_end sub_81DACEC
thumb_func_start sub_81DAD58
sub_81DAD58: @ 81DAD58
push {lr}
adds r2, r0, 0
ldr r0, =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
cmp r0, 0
bne _081DAD7C
adds r0, r2, 0
bl sub_81DAA20
ldr r0, =Phase2Task_35
bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
bl DestroyTask
_081DAD7C:
movs r0, 0
pop {r1}
bx r1
.pool
thumb_func_end sub_81DAD58
thumb_func_start Phase2Task_36
Phase2Task_36: @ 81DAD8C
push {r4,r5,lr}
lsls r0, 24
lsrs r0, 24
ldr r5, =gUnknown_0862B798
ldr r2, =gTasks
lsls r1, r0, 2
adds r1, r0
lsls r1, 3
adds r4, r1, r2
_081DAD9E:
movs r1, 0x8
ldrsh r0, [r4, r1]
lsls r0, 2
adds r0, r5
ldr r1, [r0]
adds r0, r4, 0
bl _call_via_r1
lsls r0, 24
cmp r0, 0
bne _081DAD9E
pop {r4,r5}
pop {r0}
bx r0
.pool
thumb_func_end Phase2Task_36
thumb_func_start sub_81DADC4
sub_81DADC4: @ 81DADC4
push {r4-r6,lr}
mov r6, r8
push {r6}
sub sp, 0x10
mov r8, r0
movs r6, 0x80
str r6, [sp]
movs r4, 0
str r4, [sp, 0x4]
movs r5, 0x4
negs r5, r5
str r5, [sp, 0x8]
str r4, [sp, 0xC]
movs r0, 0x78
movs r1, 0x2D
movs r2, 0xC
movs r3, 0x4
bl sub_81DA8BC
lsls r0, 24
lsrs r0, 24
mov r1, r8
strh r0, [r1, 0x10]
str r6, [sp]
str r4, [sp, 0x4]
str r5, [sp, 0x8]
movs r0, 0x1
str r0, [sp, 0xC]
movs r0, 0x59
movs r1, 0x61
movs r2, 0xFC
movs r3, 0x4
bl sub_81DA8BC
lsls r0, 24
lsrs r0, 24
mov r1, r8
strh r0, [r1, 0x12]
str r6, [sp]
str r4, [sp, 0x4]
str r5, [sp, 0x8]
movs r0, 0x2
str r0, [sp, 0xC]
movs r0, 0x97
movs r1, 0x61
movs r2, 0x84
movs r3, 0x4
bl sub_81DA8BC
lsls r0, 24
lsrs r0, 24
mov r1, r8
strh r0, [r1, 0x14]
ldrh r0, [r1, 0x8]
adds r0, 0x1
strh r0, [r1, 0x8]
movs r0, 0
add sp, 0x10
pop {r3}
mov r8, r3
pop {r4-r6}
pop {r1}
bx r1
thumb_func_end sub_81DADC4
thumb_func_start sub_81DAE44
sub_81DAE44: @ 81DAE44
push {lr}
adds r2, r0, 0
ldr r0, =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
cmp r0, 0
bne _081DAE68
adds r0, r2, 0
bl sub_81DAA20
ldr r0, =Phase2Task_36
bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
bl DestroyTask
_081DAE68:
movs r0, 0
pop {r1}
bx r1
.pool
thumb_func_end sub_81DAE44
thumb_func_start Phase2Task_37
Phase2Task_37: @ 81DAE78
push {r4,r5,lr}
lsls r0, 24
lsrs r0, 24
ldr r5, =gUnknown_0862B7AC
ldr r2, =gTasks
lsls r1, r0, 2
adds r1, r0
lsls r1, 3
adds r4, r1, r2
_081DAE8A:
movs r1, 0x8
ldrsh r0, [r4, r1]
lsls r0, 2
adds r0, r5
ldr r1, [r0]
adds r0, r4, 0
bl _call_via_r1
lsls r0, 24
cmp r0, 0
bne _081DAE8A
pop {r4,r5}
pop {r0}
bx r0
.pool
thumb_func_end Phase2Task_37
thumb_func_start sub_81DAEB0
sub_81DAEB0: @ 81DAEB0
push {r4-r6,lr}
mov r6, r8
push {r6}
sub sp, 0x10
mov r8, r0
movs r2, 0x8E
lsls r2, 1
movs r6, 0x83
str r6, [sp]
movs r5, 0x23
str r5, [sp, 0x4]
movs r4, 0x3
negs r4, r4
str r4, [sp, 0x8]
movs r0, 0
str r0, [sp, 0xC]
movs r0, 0x78
movs r1, 0x50
movs r3, 0x8
bl sub_81DA8BC
lsls r0, 24
lsrs r0, 24
mov r1, r8
strh r0, [r1, 0x10]
str r6, [sp]
str r5, [sp, 0x4]
str r4, [sp, 0x8]
movs r0, 0x1
str r0, [sp, 0xC]
movs r0, 0x78
movs r1, 0x50
movs r2, 0x2C
movs r3, 0x8
bl sub_81DA8BC
lsls r0, 24
lsrs r0, 24
mov r1, r8
strh r0, [r1, 0x12]
str r6, [sp]
str r5, [sp, 0x4]
str r4, [sp, 0x8]
movs r0, 0x2
str r0, [sp, 0xC]
movs r0, 0x79
movs r1, 0x50
movs r2, 0xA4
movs r3, 0x8
bl sub_81DA8BC
lsls r0, 24
lsrs r0, 24
mov r1, r8
strh r0, [r1, 0x14]
ldrh r0, [r1, 0x8]
adds r0, 0x1
strh r0, [r1, 0x8]
movs r0, 0
add sp, 0x10
pop {r3}
mov r8, r3
pop {r4-r6}
pop {r1}
bx r1
thumb_func_end sub_81DAEB0
thumb_func_start sub_81DAF34
sub_81DAF34: @ 81DAF34
push {lr}
adds r2, r0, 0
ldr r0, =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
cmp r0, 0
bne _081DAF58
adds r0, r2, 0
bl sub_81DAA20
ldr r0, =Phase2Task_37
bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
bl DestroyTask
_081DAF58:
movs r0, 0
pop {r1}
bx r1
.pool
thumb_func_end sub_81DAF34
thumb_func_start Phase2Task_38
Phase2Task_38: @ 81DAF68
push {r4,r5,lr}
lsls r0, 24
lsrs r0, 24
ldr r5, =gUnknown_0862B7C0
ldr r2, =gTasks
lsls r1, r0, 2
adds r1, r0
lsls r1, 3
adds r4, r1, r2
_081DAF7A:
movs r1, 0x8
ldrsh r0, [r4, r1]
lsls r0, 2
adds r0, r5
ldr r1, [r0]
adds r0, r4, 0
bl _call_via_r1
lsls r0, 24
cmp r0, 0
bne _081DAF7A
pop {r4,r5}
pop {r0}
bx r0
.pool
thumb_func_end Phase2Task_38
thumb_func_start sub_81DAFA0
sub_81DAFA0: @ 81DAFA0
push {r4,lr}
sub sp, 0xC
adds r4, r0, 0
movs r0, 0xA
ldrsh r2, [r4, r0]
cmp r2, 0
bne _081DAFCC
movs r1, 0x33
negs r1, r1
str r2, [sp]
movs r0, 0x4
str r0, [sp, 0x4]
str r2, [sp, 0x8]
movs r0, 0x78
movs r2, 0
movs r3, 0
bl sub_81DA74C
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x10]
b _081DB01A
_081DAFCC:
cmp r2, 0x10
bne _081DAFF2
movs r0, 0x7
negs r0, r0
movs r1, 0x4
str r1, [sp]
subs r1, 0x8
str r1, [sp, 0x4]
movs r1, 0x1
str r1, [sp, 0x8]
movs r1, 0xC1
movs r2, 0
movs r3, 0
bl sub_81DA74C
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x12]
b _081DB01A
_081DAFF2:
cmp r2, 0x20
bne _081DB01A
movs r0, 0x4
negs r0, r0
str r0, [sp]
str r0, [sp, 0x4]
movs r0, 0x2
str r0, [sp, 0x8]
movs r0, 0xF7
movs r1, 0xC1
movs r2, 0
movs r3, 0
bl sub_81DA74C
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x14]
ldrh r0, [r4, 0x8]
adds r0, 0x1
strh r0, [r4, 0x8]
_081DB01A:
ldrh r0, [r4, 0xA]
adds r0, 0x1
strh r0, [r4, 0xA]
movs r0, 0
add sp, 0xC
pop {r4}
pop {r1}
bx r1
thumb_func_end sub_81DAFA0
thumb_func_start sub_81DB02C
sub_81DB02C: @ 81DB02C
push {lr}
adds r2, r0, 0
ldr r0, =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
cmp r0, 0
bne _081DB050
adds r0, r2, 0
bl sub_81DAA20
ldr r0, =Phase2Task_38
bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
bl DestroyTask
_081DB050:
movs r0, 0
pop {r1}
bx r1
.pool
thumb_func_end sub_81DB02C
thumb_func_start Phase2Task_39
Phase2Task_39: @ 81DB060
push {r4,r5,lr}
lsls r0, 24
lsrs r0, 24
ldr r5, =gUnknown_0862B7D4
ldr r2, =gTasks
lsls r1, r0, 2
adds r1, r0
lsls r1, 3
adds r4, r1, r2
_081DB072:
movs r1, 0x8
ldrsh r0, [r4, r1]
lsls r0, 2
adds r0, r5
ldr r1, [r0]
adds r0, r4, 0
bl _call_via_r1
lsls r0, 24
cmp r0, 0
bne _081DB072
pop {r4,r5}
pop {r0}
bx r0
.pool
thumb_func_end Phase2Task_39
thumb_func_start sub_81DB098
sub_81DB098: @ 81DB098
push {r4,lr}
sub sp, 0xC
adds r4, r0, 0
movs r0, 0xA
ldrsh r1, [r4, r0]
cmp r1, 0
bne _081DB0C4
str r1, [sp]
movs r0, 0x8
negs r0, r0
str r0, [sp, 0x4]
str r1, [sp, 0x8]
movs r0, 0x78
movs r1, 0xC5
movs r2, 0
movs r3, 0
bl sub_81DA74C
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x10]
b _081DB112
_081DB0C4:
cmp r1, 0x10
bne _081DB0E8
movs r0, 0x8
negs r0, r0
str r0, [sp]
movs r0, 0x1
str r0, [sp, 0x4]
str r0, [sp, 0x8]
movs r0, 0xF1
movs r1, 0x4E
movs r2, 0
movs r3, 0
bl sub_81DA74C
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x12]
b _081DB112
_081DB0E8:
cmp r1, 0x20
bne _081DB112
movs r0, 0x1
negs r0, r0
movs r1, 0x8
str r1, [sp]
movs r1, 0x1
str r1, [sp, 0x4]
movs r1, 0x2
str r1, [sp, 0x8]
movs r1, 0x4E
movs r2, 0
movs r3, 0
bl sub_81DA74C
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x14]
ldrh r0, [r4, 0x8]
adds r0, 0x1
strh r0, [r4, 0x8]
_081DB112:
ldrh r0, [r4, 0xA]
adds r0, 0x1
strh r0, [r4, 0xA]
movs r0, 0
add sp, 0xC
pop {r4}
pop {r1}
bx r1
thumb_func_end sub_81DB098
thumb_func_start sub_81DB124
sub_81DB124: @ 81DB124
push {lr}
adds r2, r0, 0
ldr r0, =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
cmp r0, 0
bne _081DB148
adds r0, r2, 0
bl sub_81DAA20
ldr r0, =Phase2Task_39
bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
bl DestroyTask
_081DB148:
movs r0, 0
pop {r1}
bx r1
.pool
thumb_func_end sub_81DB124
thumb_func_start Phase2Task_40
Phase2Task_40: @ 81DB158
push {r4,r5,lr}
lsls r0, 24
lsrs r0, 24
ldr r5, =gUnknown_0862B7E8
ldr r2, =gTasks
lsls r1, r0, 2
adds r1, r0
lsls r1, 3
adds r4, r1, r2
_081DB16A:
movs r1, 0x8
ldrsh r0, [r4, r1]
lsls r0, 2
adds r0, r5
ldr r1, [r0]
adds r0, r4, 0
bl _call_via_r1
lsls r0, 24
cmp r0, 0
bne _081DB16A
pop {r4,r5}
pop {r0}
bx r0
.pool
thumb_func_end Phase2Task_40
thumb_func_start sub_81DB190
sub_81DB190: @ 81DB190
push {r4,lr}
sub sp, 0x10
adds r4, r0, 0
movs r0, 0xA
ldrsh r1, [r4, r0]
cmp r1, 0
bne _081DB1BE
movs r0, 0x80
str r0, [sp]
str r1, [sp, 0x4]
subs r0, 0x84
str r0, [sp, 0x8]
str r1, [sp, 0xC]
movs r0, 0x78
movs r1, 0x2D
movs r2, 0xC
movs r3, 0x4
bl sub_81DA8BC
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x10]
b _081DB212
_081DB1BE:
cmp r1, 0x10
bne _081DB1E6
movs r0, 0x80
str r0, [sp]
movs r0, 0
str r0, [sp, 0x4]
subs r0, 0x4
str r0, [sp, 0x8]
movs r0, 0x1
str r0, [sp, 0xC]
movs r0, 0x59
movs r1, 0x61
movs r2, 0xFC
movs r3, 0x4
bl sub_81DA8BC
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x12]
b _081DB212
_081DB1E6:
cmp r1, 0x20
bne _081DB212
movs r0, 0x80
str r0, [sp]
movs r0, 0
str r0, [sp, 0x4]
subs r0, 0x4
str r0, [sp, 0x8]
movs r0, 0x2
str r0, [sp, 0xC]
movs r0, 0x97
movs r1, 0x61
movs r2, 0x84
movs r3, 0x4
bl sub_81DA8BC
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x14]
ldrh r0, [r4, 0x8]
adds r0, 0x1
strh r0, [r4, 0x8]
_081DB212:
ldrh r0, [r4, 0xA]
adds r0, 0x1
strh r0, [r4, 0xA]
movs r0, 0
add sp, 0x10
pop {r4}
pop {r1}
bx r1
thumb_func_end sub_81DB190
thumb_func_start sub_81DB224
sub_81DB224: @ 81DB224
push {lr}
adds r2, r0, 0
ldr r0, =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
cmp r0, 0
bne _081DB248
adds r0, r2, 0
bl sub_81DAA20
ldr r0, =Phase2Task_40
bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
bl DestroyTask
_081DB248:
movs r0, 0
pop {r1}
bx r1
.pool
thumb_func_end sub_81DB224
thumb_func_start Phase2Task_41
Phase2Task_41: @ 81DB258
push {r4,r5,lr}
lsls r0, 24
lsrs r0, 24
ldr r5, =gUnknown_0862B7FC
ldr r2, =gTasks
lsls r1, r0, 2
adds r1, r0
lsls r1, 3
adds r4, r1, r2
_081DB26A:
movs r1, 0x8
ldrsh r0, [r4, r1]
lsls r0, 2
adds r0, r5
ldr r1, [r0]
adds r0, r4, 0
bl _call_via_r1
lsls r0, 24
cmp r0, 0
bne _081DB26A
pop {r4,r5}
pop {r0}
bx r0
.pool
thumb_func_end Phase2Task_41
thumb_func_start sub_81DB290
sub_81DB290: @ 81DB290
push {r4,lr}
sub sp, 0x10
adds r4, r0, 0
movs r0, 0xA
ldrsh r1, [r4, r0]
cmp r1, 0
bne _081DB2C2
movs r2, 0x8E
lsls r2, 1
movs r0, 0x83
str r0, [sp]
movs r0, 0x23
str r0, [sp, 0x4]
subs r0, 0x26
str r0, [sp, 0x8]
str r1, [sp, 0xC]
movs r0, 0x78
movs r1, 0x50
movs r3, 0x8
bl sub_81DA8BC
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x10]
b _081DB316
_081DB2C2:
cmp r1, 0x10
bne _081DB2EA
movs r0, 0x83
str r0, [sp]
movs r0, 0x23
str r0, [sp, 0x4]
subs r0, 0x26
str r0, [sp, 0x8]
movs r0, 0x1
str r0, [sp, 0xC]
movs r0, 0x78
movs r1, 0x50
movs r2, 0x2C
movs r3, 0x8
bl sub_81DA8BC
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x12]
b _081DB316
_081DB2EA:
cmp r1, 0x20
bne _081DB316
movs r0, 0x83
str r0, [sp]
movs r0, 0x23
str r0, [sp, 0x4]
subs r0, 0x26
str r0, [sp, 0x8]
movs r0, 0x2
str r0, [sp, 0xC]
movs r0, 0x79
movs r1, 0x50
movs r2, 0xA4
movs r3, 0x8
bl sub_81DA8BC
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x14]
ldrh r0, [r4, 0x8]
adds r0, 0x1
strh r0, [r4, 0x8]
_081DB316:
ldrh r0, [r4, 0xA]
adds r0, 0x1
strh r0, [r4, 0xA]
movs r0, 0
add sp, 0x10
pop {r4}
pop {r1}
bx r1
thumb_func_end sub_81DB290
thumb_func_start sub_81DB328
sub_81DB328: @ 81DB328
push {lr}
adds r2, r0, 0
ldr r0, =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
cmp r0, 0
bne _081DB34C
adds r0, r2, 0
bl sub_81DAA20
ldr r0, =Phase2Task_41
bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
bl DestroyTask
_081DB34C:
movs r0, 0
pop {r1}
bx r1
.pool
thumb_func_end sub_81DB328
.align 2, 0 @ Don't pad with nop.

View File

@ -505,6 +505,5 @@ gUnknown_085CE9B0:: @ 85CE9B0
.align 2
gUnknown_085CE9C8:: @ 85CE9C8
.2byte 0x0000, 0x0010, 0x0400, 0x0000, 0xfffe, 0x0000, 0x0800, 0x0000, 0x0000, 0x0004, 0x0400, 0x0000, 0x0000, 0x0000, 0x1800, 0x0000
.2byte 0x0001, 0xfffb, 0x1000, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000, 0x03e0, 0x001f, 0x001c, 0x001a, 0x0018, 0x0000, 0x0000, 0x0000
.2byte 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x6318, 0x0000, 0x7fff
.2byte 0x0001, 0xfffb, 0x1000, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000

View File

@ -243,7 +243,7 @@ gUnknown_0860CE94:: @ 860CE94
window_template 0x00, 0x00, 0x03, 0x08, 0x10, 0x0f, 0x0010
window_template 0x00, 0x16, 0x03, 0x08, 0x10, 0x0f, 0x0090
window_template 0x00, 0x08, 0x01, 0x0e, 0x02, 0x0f, 0x0110
window_template_terminator
null_window_template
.align 2
gUnknown_0860CEB4:: @ 860CEB4

View File

@ -108,7 +108,7 @@ gUnknown_08610434:: @ 8610434
window_template 0x00, 0x16, 0x0e, 0x08, 0x06, 0x0f, 0x006b
window_template 0x00, 0x16, 0x0e, 0x08, 0x04, 0x0f, 0x009b
window_template 0x00, 0x0f, 0x00, 0x0f, 0x02, 0x0f, 0x00bb
window_template_terminator
null_window_template
.align 1
gUnknown_0861046C:: @ 861046C
@ -345,7 +345,7 @@ gUnknown_086108C8:: @ 86108C8
window_template 0x02, 0x0a, 0x02, 0x04, 0x02, 0x0e, 0x00c1
window_template 0x00, 0x13, 0x02, 0x0b, 0x02, 0x0f, 0x00c9
window_template 0x00, 0x0f, 0x00, 0x0f, 0x02, 0x0f, 0x00df
window_template_terminator
null_window_template
gUnknown_08610918:: @ 8610918
.byte 0x00, 0x00, 0x00, 0x00, 0xff, 0x7f, 0x00, 0x00, 0x1f, 0x00

View File

@ -23,7 +23,7 @@ gUnknown_085B3D64:: @ 85B3D64
.align 2
gUnknown_085B3D6C:: @ 85B3D6C
window_template 0x00, 0x02, 0x01, 0x1a, 0x12, 0x0f, 0x0014
window_template_terminator
null_window_template
.align 2
gUnknown_085B3D7C:: @ 85B3D7C

View File

@ -23,7 +23,7 @@ gUnknown_085EFD28:: @ 85EFD28
window_template 0x01, 0x0b, 0x07, 0x12, 0x04, 0x0f, 0x0055
window_template 0x01, 0x04, 0x0e, 0x19, 0x04, 0x0f, 0x009d
window_template 0x00, 0x02, 0x00, 0x08, 0x02, 0x0f, 0x0101
window_template_terminator
null_window_template
.align 2
gBerryFirmnessStringPointers:: @ 85EFD50

View File

@ -295,7 +295,7 @@ gUnknown_08587F44:: @ 8587F44
window_template 0x00, 0x01, 0x25, 0x09, 0x02, 0x0f, 0x02da
window_template 0x00, 0x10, 0x1f, 0x01, 0x02, 0x0f, 0x02ec
window_template 0x00, 0x0b, 0x23, 0x12, 0x04, 0x0f, 0x02ee
window_template_terminator
null_window_template
.align 2
gUnknown_08587FA4:: @ 8587FA4
@ -303,11 +303,7 @@ gUnknown_08587FA4:: @ 8587FA4
.align 2
gUnknown_085880A4:: @ 85880A4
.incbin "baserom.gba", 0x5880a4, 0x1740
.align 2
gUnknown_085897E4:: @ 85897E4
.incbin "baserom.gba", 0x5897e4, 0xc0
.incbin "baserom.gba", 0x5880a4, 0x1800
gUnknown_085898A4:: @ 85898A4
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00

View File

@ -68,7 +68,7 @@ gUnknown_0858D898:: @ 858D898
window_template 0x01, 0x07, 0x07, 0x0c, 0x02, 0x0f, 0x031a
window_template 0x01, 0x07, 0x0a, 0x0c, 0x02, 0x0f, 0x0332
window_template 0x01, 0x07, 0x0d, 0x0c, 0x02, 0x0f, 0x034a
window_template_terminator
null_window_template
.align 2
gUnknown_0858D8C0:: @ 858D8C0

View File

@ -1493,7 +1493,7 @@ gUnknown_085E6F68:: @ 85E6F68 struct BgTemplate
.align 2
gUnknown_085E6F6C:: @ 85E6F6C
window_template 0x00, 0x00, 0x09, 0x1e, 0x0c, 0x08, 0x0001
window_template_terminator
null_window_template
.align 2
gUnknown_085E6F7C:: @ 85E6F7C

View File

@ -4711,7 +4711,7 @@ gUnknown_0831AA18:: @ 831AA18
window_template 0x00, 0x0c, 0x02, 0x06, 0x02, 0x00, 0x00a0
window_template 0x00, 0x04, 0x02, 0x07, 0x02, 0x00, 0x00a0
window_template 0x00, 0x13, 0x02, 0x07, 0x02, 0x00, 0x00b0
window_template_terminator
null_window_template
.align 2
gUnknown_0831AAE0:: @ 831AAE0
@ -4738,7 +4738,7 @@ gUnknown_0831AAE0:: @ 831AAE0
window_template 0x00, 0x0c, 0x08, 0x06, 0x02, 0x05, 0x013c
window_template 0x00, 0x08, 0x0b, 0x0e, 0x02, 0x05, 0x0148
window_template 0x00, 0x02, 0x0f, 0x1a, 0x04, 0x07, 0x0090
window_template_terminator
null_window_template
.align 2
gUnknown_0831ABA0:: @ 831ABA0

View File

@ -273,7 +273,7 @@ gUnknown_08597C64:: @ 8597C64
window_template 0x01, 0x06, 0x00, 0x12, 0x02, 0x0a, 0x0010
window_template 0x00, 0x03, 0x0f, 0x18, 0x04, 0x0f, 0x000a
window_template 0x02, 0x01, 0x00, 0x1c, 0x20, 0x03, 0x0000
window_template_terminator
null_window_template
.align 2
gUnknown_08597C84:: @ 8597C84

View File

@ -8912,6 +8912,7 @@ BattleFrontier_PokeNav_2B21FC:: @ 82B21FC
.string "Youre an inspiration!\n"
.string "See you again!$"
gText_Mom_Pokenav_2B227B:: @ 82B227B
.string "MOM: Your father and you\n"
.string "Everyone is captivated by POKéMON.\p"
.string "What is the charm of POKéMON?\p"
@ -8919,6 +8920,7 @@ BattleFrontier_PokeNav_2B21FC:: @ 82B21FC
.string "I adore POKéMON that help me with\l"
.string "my everyday chores.$"
gText_Mom_Pokenav_2B2310:: @ 82B2310
.string "MOM: Hi, {PLAYER}!\n"
.string "Your father keeps himself locked\l"
.string "away in the PETALBURG GYM.\p"
@ -8928,11 +8930,13 @@ BattleFrontier_PokeNav_2B21FC:: @ 82B21FC
.string "Im guessing that losing to you\n"
.string "was a big blow to his pride!$"
gText_Mom_Pokenav_2B23F3:: @ 82B23F3
.string "MOM: {PLAYER}\n"
.string "Dont worry about me or the house.\p"
.string "Wear those RUNNING SHOES until\n"
.string "they fall apart, honey!$"
gText_Roxanne_Pokenav_2B2456:: @ 82B2456
.string "ROXANNE: Oh, hello, {PLAYER}!\p"
.string "Ive been hard at work retraining\n"
.string "since we met.\p"
@ -8941,6 +8945,7 @@ BattleFrontier_PokeNav_2B21FC:: @ 82B21FC
.string "But when I do, please visit my GYM\n"
.string "for a rematch!$"
gText_Roxanne_Pokenav_2B250E:: @ 82B250E
.string "ROXANNE: Is this {PLAYER}?\n"
.string "Congratulations!\l"
.string "Ive been hearing about you!\p"
@ -8949,15 +8954,18 @@ BattleFrontier_PokeNav_2B21FC:: @ 82B21FC
.string "But when I do, please visit my GYM\n"
.string "for a rematch!$"
gText_Roxanne_Pokenav_2B25C1:: @ 82B25C1
.string "ROXANNE: {PLAYER}!\n"
.string "My GYM is ready!\p"
.string "Please visit RUSTBORO whenever\n"
.string "you can!$"
gText_Roxanne_Pokenav_2B2607:: @ 82B2607
.string "ROXANNE: At the RUSTBORO GYM,\n"
.string "the fact that we battled, {PLAYER},\l"
.string "is a matter of pride.$"
gText_Brawly_Pokenav_2B2659:: @ 82B2659
.string "BRAWLY: Hey, there, {PLAYER}{STRING 5}!\p"
.string "I learned a lot from the battle we\n"
.string "had together.\p"
@ -8968,6 +8976,7 @@ BattleFrontier_PokeNav_2B21FC:: @ 82B21FC
.string "But if I can reopen the GYM,\n"
.string "I want you to challenge us again.$"
gText_Brawly_Pokenav_2B275D:: @ 82B275D
.string "BRAWLY: Hey, {PLAYER}{STRING 5}!\n"
.string "Congratulations!\p"
.string "Word about your exploits arrived\n"
@ -8979,14 +8988,17 @@ BattleFrontier_PokeNav_2B21FC:: @ 82B21FC
.string "But if I can reopen the GYM,\n"
.string "I want you to challenge us again.$"
gText_Brawly_Pokenav_2B286F:: @ 82B286F
.string "BRAWLY: Hey, {PLAYER}{STRING 5}!\n"
.string "My GYMs ready for action!\p"
.string "Come back to DEWFORD anytime\n"
.string "for another challenge!$"
gText_Brawly_Pokenav_2B28D1:: @ 82B28D1
.string "BRAWLY: {PLAYER}{STRING 5}, I dont think\n"
.string "Ill ever get bored of battling you!$"
gText_Wattson_Pokenav_2B2912:: @ 82B2912
.string "WATTSON: Oh, its you!\p"
.string "After you left, Ive been redoing\n"
.string "my training from scratch.\p"
@ -8995,6 +9007,7 @@ BattleFrontier_PokeNav_2B21FC:: @ 82B21FC
.string "Youll have to wait till then!\n"
.string "Wahahahaha!$"
gText_Wattson_Pokenav_2B29CA:: @ 82B29CA
.string "WATTSON: Wahahahaha!\p"
.string "Youve really done it, havent you?\n"
.string "Ive been getting word about you!\p"
@ -9005,15 +9018,18 @@ BattleFrontier_PokeNav_2B21FC:: @ 82B21FC
.string "Youll have to wait till then!\n"
.string "Wahahahaha!$"
gText_Wattson_Pokenav_2B2AB6:: @ 82B2AB6
.string "WATTSON: Oh, its you!\n"
.string "My GYMs ready!\p"
.string "Visit MAUVILLE anytime!\n"
.string "Wahahahaha!$"
gText_Wattson_Pokenav_2B2B01:: @ 82B2B01
.string "WATTSON: Wahahaha!\p"
.string "A battle with you is always charged\n"
.string "with shocking power!$"
gText_Flannery_Pokenav_2B2B4D:: @ 82B2B4D
.string "FLANNERY: {PLAYER}\p"
.string "When we battled, I learned exactly\n"
.string "how immature I was.\p"
@ -9023,6 +9039,7 @@ BattleFrontier_PokeNav_2B21FC:: @ 82B21FC
.string "When the time comes, {PLAYER},\n"
.string "please challenge us again.$"
gText_Flannery_Pokenav_2B2C0E:: @ 82B2C0E
.string "FLANNERY: Hello, {PLAYER}?\n"
.string "Congratulations!\p"
.string "Word of your success has reached\n"
@ -9033,37 +9050,44 @@ BattleFrontier_PokeNav_2B21FC:: @ 82B21FC
.string "appear beside my name in the\l"
.string "MATCH CALL list.$"
gText_Flannery_Pokenav_2B2CF1:: @ 82B2CF1
.string "FLANNERY: Oh, {PLAYER}?\n"
.string "Our GYMs ready!\p"
.string "Come to LAVARIDGE for a soak\n"
.string "in the hot spring and a challenge!$"
gText_Flannery_Pokenav_2B2D54:: @ 82B2D54
.string "FLANNERY: {PLAYER}\n"
.string "Im positive that you keep getting\l"
.string "better at training every time.$"
gText_Winona_Pokenav_2B2DA4:: @ 82B2DA4
.string "WINONA: Hello, {PLAYER}!\p"
.string "Thanks to our battle, Ive come\n"
.string "to understand my weak points!\p"
.string "When I reopen the GYM, I wont go\n"
.string "down in defeat again!$"
gText_Winona_Pokenav_2B2E2B:: @ 82B2E2B
.string "WINONA: Youve done it, {PLAYER}!\p"
.string "News about the new CHAMPION\n"
.string "has reached us in FORTREE!\p"
.string "But The next time we battle,\n"
.string "its not going to end the same way.$"
gText_Winona_Pokenav_2B2EC2:: @ 82B2EC2
.string "WINONA: Is this {PLAYER}?\n"
.string "Our GYM is back in operation!\p"
.string "Were waiting for you in FORTREE!$"
gText_Winona_Pokenav_2B2F16:: @ 82B2F16
.string "WINONA: {PLAYER}\n"
.string "Though I have lost, my wings will\l"
.string "never break.\p"
.string "Yes, in exactly the same way that\n"
.string "you never lost sight of your dream.$"
gText_TateLiza_Pokenav_2B2F97:: @ 82B2F97
.string "TATE: Oh! Youre\n"
.string "LIZA: {PLAYER}!\p"
.string "TATE: Were in training again\n"
@ -9073,6 +9097,7 @@ BattleFrontier_PokeNav_2B21FC:: @ 82B21FC
.string "TATE: A markll appear by our name\n"
.string "LIZA: On the MATCH CALL list.$"
gText_TateLiza_Pokenav_2B306E:: @ 82B306E
.string "TATE: {PLAYER}, congratulations!\n"
.string "LIZA: {PLAYER}, congratulations!\p"
.string "TATE: The two of us are\n"
@ -9082,6 +9107,7 @@ BattleFrontier_PokeNav_2B21FC:: @ 82B21FC
.string "TATE: A markll appear by our name\n"
.string "LIZA: On the MATCH CALL list.$"
gText_TateLiza_Pokenav_2B3158:: @ 82B3158
.string "TATE: {PLAYER}!\n"
.string "LIZA: {PLAYER}!\p"
.string "TATE: Our GYM is ready!\n"
@ -9089,11 +9115,13 @@ BattleFrontier_PokeNav_2B21FC:: @ 82B21FC
.string "TATE: Please come visit\n"
.string "LIZA: MOSSDEEP anytime!$"
gText_TateLiza_Pokenav_2B31CD:: @ 82B31CD
.string "TATE: {PLAYER}, the battle we had\n"
.string "LIZA: Is an invaluable experience.\p"
.string "TATE: It would be nice if\n"
.string "LIZA: We could all battle again!$"
gText_Juan_Pokenav_2B3249:: @ 82B3249
.string "JUAN: Hmm\n"
.string "{PLAYER}{STRING 5} Was it?\p"
.string "Our battle together--it brought\n"
@ -9102,6 +9130,7 @@ BattleFrontier_PokeNav_2B21FC:: @ 82B21FC
.string "Perhaps you are a genius who may\n"
.string "yet surpass WALLACE!$"
gText_Juan_Pokenav_2B32EC:: @ 82B32EC
.string "JUAN: Fufu {PLAYER}{STRING 5}\n"
.string "Youve finally achieved your goal.\p"
.string "My eye for appraising talent wasnt\n"
@ -9110,12 +9139,14 @@ BattleFrontier_PokeNav_2B21FC:: @ 82B21FC
.string "you, for you have scaled the peak\l"
.string "of power and prestige.$"
gText_Juan_Pokenav_2B33AA:: @ 82B33AA
.string "JUAN: Hoho {PLAYER}{STRING 5}\p"
.string "Our SOOTOPOLIS GYM has finally\n"
.string "reopened.\p"
.string "If you wish to see me, you are\n"
.string "welcome to visit anytime.$"
gText_Juan_Pokenav_2B341E:: @ 82B341E
.string "JUAN: {PLAYER}{STRING 5}\p"
.string "Like the finest music, the battles\n"
.string "we wage together strike chords\l"
@ -9123,6 +9154,7 @@ BattleFrontier_PokeNav_2B21FC:: @ 82B21FC
.string "When I close my eyes, I see visions\n"
.string "of you soaring with the melody$"
gText_Sidney_Pokenav_2B34CC:: @ 82B34CC
.string "SIDNEY: Yo, {PLAYER}!\p"
.string "If you want to battle with me\n"
.string "again, you come on back whenever\l"
@ -9130,6 +9162,7 @@ BattleFrontier_PokeNav_2B21FC:: @ 82B21FC
.string "Ill always be here!\n"
.string "Ill be waiting!$"
gText_Phoebe_Pokenav_2B3561:: @ 82B3561
.string "PHOEBE: Hi, {PLAYER}!\p"
.string "How about coming back here again\n"
.string "sometime?\p"
@ -9137,6 +9170,7 @@ BattleFrontier_PokeNav_2B21FC:: @ 82B21FC
.string "your bond has grown with your\l"
.string "POKéMON.$"
gText_Glacia_Pokenav_2B35E4:: @ 82B35E4
.string "GLACIA: Hello, {PLAYER}.\p"
.string "I trust you havent become\n"
.string "complacent with your power?\p"
@ -9144,6 +9178,7 @@ BattleFrontier_PokeNav_2B21FC:: @ 82B21FC
.string "hot emotions just a little, do come\l"
.string "to the POKéMON LEAGUE$"
gText_Drake_Pokenav_2B368B:: @ 82B368B
.string "DRAKE: That voice {PLAYER}, is it?\n"
.string "You sound well\p"
.string "I understand that there is now\n"
@ -9155,6 +9190,7 @@ BattleFrontier_PokeNav_2B21FC:: @ 82B21FC
.string "the POKéMON LEAGUE!\p"
.string "Dont you agree, {PLAYER}?$"
gText_Wallace_Pokenav_2B3790:: @ 82B3790
.string "WALLACE: Hello, {PLAYER}{STRING 5}.\n"
.string "Have you met STEVEN?\p"
.string "He is\n"
@ -9197,12 +9233,14 @@ MossdeepCity_SpaceCenter_2F_Text_2B39C6: @ 82B39C6
.string " \n"
.string " Click!$"
gText_May_Pokenav_2B3AB3:: @ 2B3AB3
.string "MAY: Hi, {PLAYER}{STRING 5}!\p"
.string "MR. BRINEY retired as a SAILOR,\n"
.string "but I still see him out on the sea\l"
.string "with his pet PEEKO sometimes.\p"
.string "He must love the sea still.$"
gText_May_Pokenav_2B3B3F:: @ 2B3B3F
.string "MAY: Hi, {PLAYER}{STRING 5}!\p"
.string "You know how little towns like\n"
.string "PETALBURG and DEWFORD have GYMS?\p"
@ -9211,6 +9249,7 @@ MossdeepCity_SpaceCenter_2F_Text_2B39C6: @ 82B39C6
.string "When they finally build a GYM there,\n"
.string "I should apply to be the LEADER.$"
gText_May_Pokenav_2B3C13:: @ 2B3C13
.string "MAY: Hi, {PLAYER}{STRING 5}!\p"
.string "Do you remember a man named\n"
.string "the CUTTER in RUSTBORO?\l"
@ -9222,11 +9261,13 @@ MossdeepCity_SpaceCenter_2F_Text_2B39C6: @ 82B39C6
.string " \p"
.string "The ROCK SMASH GUY!$"
gText_May_Pokenav_2B3CF3:: @ 2B3CF3
.string "MAY: {PLAYER}{STRING 5}?\p"
.string "RUSTURF TUNNEL\n"
.string "They named it that because it\l"
.string "joins RUSTBORO and VERDANTURF.$"
gText_May_Pokenav_2B3D4B:: @ 2B3D4B
.string "MAY: {PLAYER}{STRING 5}, how are you?\p"
.string "Im out on ROUTE 111 now.\p"
.string "Im going to get a rest at an old\n"
@ -9234,6 +9275,7 @@ MossdeepCity_SpaceCenter_2F_Text_2B39C6: @ 82B39C6
.string "She lives just north of\n"
.string "the desert.$"
gText_May_Pokenav_2B3DD1:: @ 2B3DD1
.string "MAY: Hi, {PLAYER}{STRING 5}!\p"
.string "Did you know about the MIRAGE\n"
.string "TOWER in the desert?\p"
@ -9241,18 +9283,21 @@ MossdeepCity_SpaceCenter_2F_Text_2B39C6: @ 82B39C6
.string "to mysteriously come and go.\p"
.string "I wish I could see it.$"
gText_May_Pokenav_2B3E69:: @ 2B3E69
.string "MAY: {PLAYER}{STRING 5}, yahoo!\n"
.string "Im on ROUTE 119 now.\p"
.string "Theres a big river here, and\n"
.string "it often rains.\p"
.string "I got soaked!$"
gText_May_Pokenav_2B3ECD:: @ 2B3ECD
.string "MAY: {PLAYER}{STRING 5}, hi.\p"
.string "MT. PYRE is a memorial to POKéMON\n"
.string "whose lives have ended.\p"
.string "Maybe as a result, its infested\n"
.string "with many GHOST-type POKéMON!$"
gText_May_Pokenav_2B3F2B:: @ 2B3F2B
.string "MAY: Hi, {PLAYER}{STRING 5}!\p"
.string "I was thinking of going to the hot\n"
.string "spring in LAVARIDGE.\p"
@ -9260,12 +9305,14 @@ MossdeepCity_SpaceCenter_2F_Text_2B39C6: @ 82B39C6
.string "PASS, I ran into some bad-looking\l"
.string "characters. The mood was ugly!$"
gText_May_Pokenav_2B3FFB:: @ 2B3FFB
.string "MAY: Hi, {PLAYER}{STRING 5}!\n"
.string "Did you see the news?\p"
.string "They say CAPT. STERN discovered\n"
.string "the SEAFLOOR CAVERN while on his\l"
.string "submarine expedition.$"
gText_May_Pokenav_2B402B:: @ 2B402B
.string "MAY: Hi, {PLAYER}{STRING 5}!\n"
.string "Dont you think its neat?\p"
.string "Even if you dont have a boat,\n"
@ -9275,6 +9322,7 @@ MossdeepCity_SpaceCenter_2F_Text_2B39C6: @ 82B39C6
.string "Theres a POKéMON move that lets\n"
.string "you go to the bottom of the sea.$"
gText_May_Pokenav_2B414B:: @ 2B414B
.string "MAY: Hi, {PLAYER}{STRING 5}!\n"
.string "Hope things are okay!\p"
.string "Have you been on the sea and\n"
@ -9285,6 +9333,7 @@ MossdeepCity_SpaceCenter_2F_Text_2B39C6: @ 82B39C6
.string "When you get to the other side,\n"
.string "come up to the surface. Easy!$"
gText_May_Pokenav_2B4228:: @ 2B4228
.string "MAY: Hi, {PLAYER}{STRING 5}!\p"
.string "Hows it going?\n"
.string "Are you filling your POKéDEX?\p"
@ -9293,6 +9342,7 @@ MossdeepCity_SpaceCenter_2F_Text_2B39C6: @ 82B39C6
.string "And there are three of them!\p"
.string "I would love to see even one$"
gText_May_Pokenav_2B42E0:: @ 2B42E0
.string "MAY: {PLAYER}{STRING 5}!\n"
.string "I heard the rumors!\p"
.string "You beat the SOOTOPOLIS GYM\n"
@ -9300,6 +9350,7 @@ MossdeepCity_SpaceCenter_2F_Text_2B39C6: @ 82B39C6
.string "That means you dont have far\n"
.string "to go, do you?$"
gText_May_Pokenav_2B4350:: @ 2B4350
.string "MAY: There isnt a single TRAINER\n"
.string "left in HOENN who doesnt know who\l"
.string "you are, {PLAYER}{STRING 5}!\p"
@ -9307,6 +9358,7 @@ MossdeepCity_SpaceCenter_2F_Text_2B39C6: @ 82B39C6
.string "with you, {PLAYER}{STRING 5}, theyre all\l"
.string "surprised!$"
gText_Brendan_Pokenav_2B43EF:: @ 2B43EF
.string "BRENDAN: Hey, {PLAYER}!\p"
.string "MR. BRINEY retired as a SAILOR,\n"
.string "but I still see him out on the sea\l"
@ -9314,6 +9366,7 @@ MossdeepCity_SpaceCenter_2F_Text_2B39C6: @ 82B39C6
.string "I guess he must love\n"
.string "the sea still.$"
gText_Brendan_Pokenav_2B4486:: @ 2B4486
.string "BRENDAN: Hey, {PLAYER}!\p"
.string "I dont get how little towns like\n"
.string "PETALBURG and DEWFORD have GYMS.\p"
@ -9322,6 +9375,7 @@ MossdeepCity_SpaceCenter_2F_Text_2B39C6: @ 82B39C6
.string "When they finally build a GYM there,\n"
.string "I should apply to be the LEADER.$"
gText_Brendan_Pokenav_2B4560:: @ 2B4560
.string "BRENDAN: Yo, {PLAYER}!\p"
.string "Do you remember a guy named\n"
.string "the CUTTER in RUSTBORO?\l"
@ -9333,12 +9387,14 @@ MossdeepCity_SpaceCenter_2F_Text_2B39C6: @ 82B39C6
.string " \p"
.string "The ROCK SMASH GUY!$"
gText_Brendan_Pokenav_2B463F:: @ 2B463F
.string "BRENDAN: This voice {PLAYER}?\p"
.string "They gave RUSTURF TUNNEL its name\n"
.string "because it joins RUSTBORO and\l"
.string "VERDANTURF.\p"
.string "Did you know that?$"
gText_Brendan_Pokenav_2B46B7:: @ 2B46B7
.string "BRENDAN: {PLAYER}, whats up?\p"
.string "Hey, Im out on ROUTE 111 now.\p"
.string "Im going to rest up at an old\n"
@ -9346,6 +9402,7 @@ MossdeepCity_SpaceCenter_2F_Text_2B39C6: @ 82B39C6
.string "If youre in the area, you should\n"
.string "visit her, too.$"
gText_Brendan_Pokenav_2B4761:: @ 2B4761
.string "BRENDAN: Hey, {PLAYER}!\p"
.string "Did you know about the MIRAGE\n"
.string "TOWER in the desert?\p"
@ -9353,18 +9410,21 @@ MossdeepCity_SpaceCenter_2F_Text_2B39C6: @ 82B39C6
.string "seen only sometimes.\p"
.string "Id like to see that!$"
gText_Brendan_Pokenav_2B47F4:: @ 2B47F4
.string "BRENDAN: Whos this? Oh, {PLAYER}?\n"
.string "Guess what? Im on ROUTE 119 now.\p"
.string "Theres a big river here, and\n"
.string "it rains all the time.\p"
.string "I got soaked to the bone!$"
gText_Brendan_Pokenav_2B4882:: @ 2B4882
.string "BRENDAN: {PLAYER}!\p"
.string "MT. PYRE is a memorial to POKéMON\n"
.string "whose lives have ended.\p"
.string "Thats probably why its infested\n"
.string "with many GHOST-type POKéMON!$"
gText_Brendan_Pokenav_2B4909:: @ 2B4909
.string "BRENDAN: Hey there, {PLAYER}.\p"
.string "I was on my way back to the hot\n"
.string "spring in LAVARIDGE.\p"
@ -9373,12 +9433,14 @@ MossdeepCity_SpaceCenter_2F_Text_2B39C6: @ 82B39C6
.string "Those creeps\n"
.string "I think they were TEAM MAGMA.$"
gText_Brendan_Pokenav_2B49C4:: @ 2B49C4
.string "BRENDAN: Hi, {PLAYER}!\n"
.string "Did you catch the news?\p"
.string "They say CAPT. STERN discovered\n"
.string "the SEAFLOOR CAVERN while on his\l"
.string "submarine expedition.$"
gText_Brendan_Pokenav_2B4A44:: @ 2B4A44
.string "BRENDAN: Hey there, {PLAYER}!\n"
.string "Dont you think its awesome?\p"
.string "Even if you dont have a boat,\n"
@ -9388,6 +9450,7 @@ MossdeepCity_SpaceCenter_2F_Text_2B39C6: @ 82B39C6
.string "travel to the bottom of the sea.\p"
.string "Man, POKéMON can do anything!$"
gText_Brendan_Pokenav_2B4B28:: @ 2B4B28
.string "BRENDAN: Howdy, {PLAYER}!\n"
.string "How are you holding up?\p"
.string "Ever found your way to the other\n"
@ -9397,6 +9460,7 @@ MossdeepCity_SpaceCenter_2F_Text_2B39C6: @ 82B39C6
.string "When you get to the other side,\n"
.string "come up to the surface. Simple!$"
gText_Brendan_Pokenav_2B4C15:: @ 2B4C15
.string "BRENDAN: Hey there, {PLAYER}!\p"
.string "Hows it going? Filling up your\n"
.string "POKéDEX successfully?\p"
@ -9405,12 +9469,14 @@ MossdeepCity_SpaceCenter_2F_Text_2B39C6: @ 82B39C6
.string "And not just one--three!\p"
.string "Id love to catch even one$"
gText_Brendan_Pokenav_2B4CD8:: @ 2B4CD8
.string "BRENDAN: {PLAYER}!\n"
.string "I heard the rumors!\p"
.string "You beat the SOOTOPOLIS GYM\n"
.string "LEADER? Awesome!\p"
.string "Youre getting awful close now!$"
gText_Brendan_Pokenav_2B4D46:: @ 2B4D46
.string "BRENDAN: There isnt a TRAINER in\n"
.string "all of HOENN who doesnt know who\l"
.string "you are, {PLAYER}!\p"
@ -9418,16 +9484,19 @@ MossdeepCity_SpaceCenter_2F_Text_2B39C6: @ 82B39C6
.string "with you, {PLAYER}, they get pretty\l"
.string "envious!$"
gText_Wally_Pokenav_2B4DE2:: @ 2B4DE2
.string "WALLY: Oh, {PLAYER}!\p"
.string "Ive been getting healthier and\n"
.string "more physically fit.\p"
.string "I hope I can become a TRAINER like\n"
.string "you soon, {PLAYER}!$"
gText_Wally_Pokenav_2B4E57:: @ 2B4E57
.string "WALLY: {PLAYER}, hello!\p"
.string "After RUSTURF TUNNEL went\n"
.string "through, WANDAs been very happy!$"
gText_Wally_Pokenav_2B4EA5:: @ 2B4EA5
.string "WALLY: Oh, {PLAYER}!\p"
.string "I I left my uncles place in\n"
.string "VERDANTURF without telling anyone.\p"
@ -9435,6 +9504,7 @@ MossdeepCity_SpaceCenter_2F_Text_2B39C6: @ 82B39C6
.string "{PLAYER}, you understand how\n"
.string "I feel, dont you?$"
gText_Wally_Pokenav_2B4F41:: @ 2B4F41
.string "WALLY: {PLAYER}?\n"
.string "Its me, WALLY!\p"
.string "The world of TRAINERS is amazing!\p"
@ -9443,6 +9513,7 @@ MossdeepCity_SpaceCenter_2F_Text_2B39C6: @ 82B39C6
.string "Its as if everyones getting\n"
.string "connected through POKéMON!$"
gText_Wally_Pokenav_2B4FF3:: @ 2B4FF3
.string "WALLY: {PLAYER}? Its awesome!\n"
.string "That RALTS we caught together?\l"
.string "It evolved, {PLAYER}!\p"
@ -9452,11 +9523,13 @@ MossdeepCity_SpaceCenter_2F_Text_2B39C6: @ 82B39C6
.string "After all, its the POKéMON that\n"
.string "should be praised!$"
gText_Wally_Pokenav_2B50B1:: @ 2B50B1
.string " \n"
.string " \p"
.string "WALLY appears to be out of\n"
.string "the POKéNAVs service area$"
gText_Wally_Pokenav_2B5100:: @ 2B5100
.string "WALLY: Oh, {PLAYER}!\p"
.string "Before I met you, I hardly ever\n"
.string "left my house\p"
@ -9465,6 +9538,7 @@ MossdeepCity_SpaceCenter_2F_Text_2B39C6: @ 82B39C6
.string "{PLAYER}\n"
.string "Thank you$"
gText_Scott_Pokenav_2B5184:: @ 2B5184
.string "SCOTT: Howdy, {PLAYER}{STRING 5}!\p"
.string "You know how POKéMON can be found\n"
.string "everywhere?\p"
@ -9475,6 +9549,7 @@ MossdeepCity_SpaceCenter_2F_Text_2B39C6: @ 82B39C6
.string "As a result, I have to hurry\n"
.string "everywhere, too. Busy, busy!$"
gText_Scott_Pokenav_2B5275:: @ 2B5275
.string "SCOTT: Im on ROUTE 119 right now.\n"
.string "Its teeming with TRAINERS!\p"
.string "Its also overgrown with tall grass\n"
@ -9482,6 +9557,7 @@ MossdeepCity_SpaceCenter_2F_Text_2B39C6: @ 82B39C6
.string "Walking around in shorts here\n"
.string "makes me all ticklish!$"
gText_Scott_Pokenav_2B5323:: @ 2B5323
.string "SCOTT: Hi, hi, {PLAYER}{STRING 5}!\p"
.string "Have you had the chance to climb\n"
.string "MT. PYRE?\p"
@ -9490,6 +9566,7 @@ MossdeepCity_SpaceCenter_2F_Text_2B39C6: @ 82B39C6
.string "Its somewhere every TRAINER\n"
.string "should climb to the top of once.$"
gText_Scott_Pokenav_2B53DB:: @ 2B53DB
.string "SCOTT: Hi, {PLAYER}{STRING 5}!\p"
.string "Ive been hearing about these odd\n"
.string "gangs being a nuisance.\p"
@ -9499,6 +9576,7 @@ MossdeepCity_SpaceCenter_2F_Text_2B39C6: @ 82B39C6
.string "skilled TRAINERS among them.\p"
.string "But if theyre thugs$"
gText_Scott_Pokenav_2B54A5:: @ 2B54A5
.string "SCOTT: Oh, hi, {PLAYER}{STRING 5}.\p"
.string "Might there be tough TRAINERS\n"
.string "at the bottom of the sea?\p"
@ -9506,6 +9584,7 @@ MossdeepCity_SpaceCenter_2F_Text_2B39C6: @ 82B39C6
.string "I cant swim, for one.\l"
.string "And I dont raise POKéMON$"
gText_Scott_Pokenav_2B5541:: @ 2B5541
.string "SCOTT: Hi, hi, {PLAYER}{STRING 5}!\p"
.string "You know that you can challenge\n"
.string "the POKéMON LEAGUE when youve\l"
@ -9522,17 +9601,20 @@ MossdeepCity_SpaceCenter_2F_Text_2B39C6: @ 82B39C6
.string "the POKéMON LEAGUE into the HALL\l"
.string "OF FAME!$"
gText_Scott_Pokenav_2B56CA:: @ 2B56CA
.string " \n"
.string " \p"
.string "SCOTT appears to be out of\n"
.string "the POKéNAVs service area$"
gText_Norman_Pokenav_2B5719:: @ 82B5719
.string "DAD: In RUSTBORO, theres a man\n"
.string "that goes by the odd name of\l"
.string "the CUTTER.\p"
.string "If youre in the area, you should\n"
.string "pay him a visit.$"
gText_Norman_Pokenav_2B5795:: @ 82B5795
.string "DAD: Hm Little by little, but also\n"
.string "very surely, youre getting\l"
.string "tougher, {PLAYER}.\p"
@ -9541,6 +9623,7 @@ MossdeepCity_SpaceCenter_2F_Text_2B39C6: @ 82B39C6
.string "and me\p"
.string "This feeling is hard to explain.$"
gText_Norman_Pokenav_2B584D:: @ 82B584D
.string "DAD: I see\n"
.string "Youve collected four GYM BADGES\p"
.string "Theres no avoiding it now.\n"
@ -9548,6 +9631,7 @@ MossdeepCity_SpaceCenter_2F_Text_2B39C6: @ 82B39C6
.string "Come anytime.\n"
.string "Well all be waiting for you!$"
gText_Norman_Pokenav_2B58E3:: @ 82B58E3
.string "DAD: {PLAYER}! Youd better go visit\n"
.string "Mother every so often.\p"
.string "Im going to remain here and\n"
@ -9555,23 +9639,27 @@ MossdeepCity_SpaceCenter_2F_Text_2B39C6: @ 82B39C6
.string "The way of battling is deep\n"
.string "and unforgiving!$"
gText_Norman_Pokenav_2B5979:: @ 82B5979
.string "DAD: Oh, hi, {PLAYER}!\p"
.string "Whats that? MAGMA EMBLEM?\n"
.string "I dont know what thats about.\p"
.string "But with a name like that, it may\n"
.string "be somehow linked to a volcano!$"
gText_Norman_Pokenav_2B5A07:: @ 82B5A07
.string "DAD: Hiyah! Haah! Dwah!\p"
.string "Oh? {PLAYER}!\p"
.string "You caught me right in the middle\n"
.string "of a POKéMON training session!$"
gText_Norman_Pokenav_2B5A69:: @ 82B5A69
.string "DAD: {PLAYER}!\p"
.string "Who wouldve thought youd become\n"
.string "the POKéMON LEAGUE CHAMPION\p"
.string "Okay!\n"
.string "I wont be left behind!$"
gText_Norman_Pokenav_2B5ACF:: @ 82B5ACF
.string "DAD: Hm? {PLAYER}?\n"
.string "What good timing!\p"
.string "This time, Im going to challenge\n"
@ -9579,9 +9667,11 @@ MossdeepCity_SpaceCenter_2F_Text_2B39C6: @ 82B39C6
.string "Im waiting in the PETALBURG GYM.\n"
.string "Accept my challenge anytime!$"
gText_Norman_Pokenav_2B5B5E:: @ 82B5B5E
.string "DAD: You amaze me, {PLAYER}.\n"
.string "How much higher will you soar?$"
gText_Steven_Pokenav_2B5B95:: @ 82B5B95
.string "STEVEN: Hi, {PLAYER}{STRING 5}!\p"
.string "Have you been to MAUVILLE\n"
.string "already?\p"
@ -9592,12 +9682,14 @@ MossdeepCity_SpaceCenter_2F_Text_2B39C6: @ 82B39C6
.string "You may make a new discovery\n"
.string "there.$"
gText_Steven_Pokenav_2B5C53:: @ 82B5C53
.string "STEVEN: Hi, {PLAYER}{STRING 5}!\p"
.string "Ive met a lot of different\n"
.string "TRAINERS so far.\p"
.string "But youre one of a kind.\n"
.string "Youre not like anyone else.$"
gText_Steven_Pokenav_2B5CC9:: @ 82B5CC9
.string "STEVEN: Hi, {PLAYER}{STRING 5}!\p"
.string "When youre on an adventure with\n"
.string "your POKéMON, what do you think?\p"
@ -9608,6 +9700,7 @@ MossdeepCity_SpaceCenter_2F_Text_2B39C6: @ 82B39C6
.string "Depending on how you think, your\n"
.string "adventures significance changes.$"
gText_Steven_Pokenav_2B5DB4:: @ 82B5DB4
.string "STEVEN: Hello?\n"
.string "{PLAYER}{STRING 5}?\p"
.string "Im involved in a spot of trouble\n"
@ -9615,6 +9708,7 @@ MossdeepCity_SpaceCenter_2F_Text_2B39C6: @ 82B39C6
.string "Im sorry, but I cant talk now.\n"
.string "Bye!$"
gText_Steven_Pokenav_2B5E26:: @ 82B5E26
.string "STEVEN: Oh!\n"
.string "{PLAYER}{STRING 5}!\p"
.string "Theres no need to talk.\n"
@ -9622,10 +9716,12 @@ MossdeepCity_SpaceCenter_2F_Text_2B39C6: @ 82B39C6
.string "You have to believe in yourself\n"
.string "and do whats right.$"
gText_Steven_Pokenav_2B5EA2:: @ 82B5EA2
.string " \p"
.string "STEVEN appears not to be getting\n"
.string "the call$"
gText_Steven_Pokenav_2B5ED9:: @ 82B5ED9
.string "STEVEN: {PLAYER}{STRING 5} Congratulations\n"
.string "for entering the HALL OF FAME.\p"
.string " \n"
@ -9652,6 +9748,7 @@ Route101_Text_2B603A: @ 82B603A
.string "the POKéDEX and POKéNAV, studying\l"
.string "POKéMON becomes more fun, eh?$"
gText_MrStone_Pokenav_2B60C0:: @ 82B60C0
.string "MR. STONE: Oh? {PLAYER}{STRING 5}!\p"
.string "Since you called me, the POKéNAV\n"
.string "must be working properly!\p"
@ -9666,6 +9763,7 @@ Route101_Text_2B603A: @ 82B603A
.string "Wahahaha!\n"
.string "See you again!$"
gText_MrStone_Pokenav_2B61E6:: @ 82B61E6
.string "MR. STONE: Oh? {PLAYER}{STRING 5}!\p"
.string "Whats wrong? Have you forgotten\n"
.string "about that little errand of mine?\p"
@ -9677,6 +9775,7 @@ Route101_Text_2B603A: @ 82B603A
.string "Now, since I am a busy PRESIDENT,\n"
.string "I have to go! Bye-bye!$"
gText_MrStone_Pokenav_2B6302:: @ 82B6302
.string "MR. STONE: Oh! {PLAYER}{STRING 5}!\p"
.string "Ah, so youve met STEVEN!\n"
.string "Id better reward you, then!\p"
@ -9684,6 +9783,7 @@ Route101_Text_2B603A: @ 82B603A
.string "come see me at my office.\p"
.string "Ill be waiting for you!$"
gText_MrStone_Pokenav_2B63A0:: @ 82B63A0
.string "MR. STONE: Oh! {PLAYER}{STRING 5}!\p"
.string "Did you know that DEVON was\n"
.string "digging the RUSTURF TUNNEL?\p"
@ -9694,12 +9794,14 @@ Route101_Text_2B603A: @ 82B603A
.string "live in peace than worry about our\l"
.string "own convenience.$"
gText_MrStone_Pokenav_2B64A2:: @ 82B64A2
.string "MR. STONE: Hello, hello, {PLAYER}{STRING 5}!\p"
.string "I heard from someone in PETALBURG\n"
.string "that youre NORMANs child!\p"
.string "No wonder youre such a capable\n"
.string "being!$"
gText_MrStone_Pokenav_2B6526:: @ 82B6526
.string "MR. STONE: Whats that?\p"
.string "You battled your own father and\n"
.string "defeated him?\p"
@ -9707,6 +9809,7 @@ Route101_Text_2B603A: @ 82B603A
.string "I had no idea that I befriended\n"
.string "someone so special! Wahaha!$"
gText_MrStone_Pokenav_2B65BB:: @ 82B65BB
.string "Hello!\n"
.string "This is DEVON CORPORATI\l"
.string "Oh, hello, {PLAYER}!\p"
@ -9715,18 +9818,21 @@ Route101_Text_2B603A: @ 82B603A
.string "Our PRESIDENT is busy, but you\n"
.string "seem to be just as busy, {PLAYER}.$"
gText_MrStone_Pokenav_2B6664:: @ 82B6664
.string "Huh? Whats that?\p"
.string "GROU Yes? DON?\p"
.string "Youre breaking up\n"
.string "cant hear\p"
.string "BZZZZ$"
gText_MrStone_Pokenav_2B66B1:: @ 82B66B1
.string "Huh? Whats that?\p"
.string "Seaflo Yes? Caver?\p"
.string "Youre breaking up\n"
.string "cant hear\p"
.string "BZZZZ$"
gText_MrStone_Pokenav_2B6703:: @ 82B6703
.string "MR. STONE: {PLAYER}{STRING 5}! Its me!\p"
.string "You were apparently involved in all\n"
.string "sorts of things, but I, being busy,\l"
@ -9736,6 +9842,7 @@ Route101_Text_2B603A: @ 82B603A
.string "Ill always be in your corner!\n"
.string "Take care!$"
gText_MrStone_Pokenav_2B67ED:: @ 82B67ED
.string "MR. STONE: \n"
.string "Is this maybe {PLAYER}{STRING 5}?\p"
.string "Your voice is so full of confidence,\n"

View File

@ -8,51 +8,88 @@
gNewGameBirchPic:: @ 8553A90
.incbin "graphics/birch_speech/birch.4bpp"
.incbin "baserom.gba", 0x554290, 0x66c0
.space 0x3800
.incbin "graphics/unused/intro_birch_beauty.4bpp"
.align 2
gNewGameBirchPalette:: @ 855A950
.incbin "graphics/birch_speech/birch.gbapal"
.align 2
.incbin "baserom.gba", 0x55a970, 0x20
gSpriteImage_855A970:: @ 855A970
.incbin "graphics/misc/pokeball_glow.4bpp"
.align 2
gFieldEffectObjectPalette4:: @ 855A990
.incbin "graphics/map_objects/palettes/field_effect_object_palette_04.gbapal"
.incbin "baserom.gba", 0x55a9b0, 0x480
.align 2
gSpriteImage_855A9B0:: @ 855A9B0
.incbin "graphics/misc/pokecenter_monitor/0.4bpp"
.align 2
gSpriteImage_855AA70:: @ 855AA70
.incbin "graphics/misc/pokecenter_monitor/1.4bpp"
.align 2
gSpriteImage_855AB30:: @ 855AB30
.incbin "graphics/misc/big_hof_monitor.4bpp"
.align 2
gSpriteImage_855AD30:: @ 855AD30
.incbin "graphics/misc/small_hof_monitor.4bpp"
.align 2
gFieldEffectObjectPalette5:: @ 855AE30
.incbin "graphics/map_objects/palettes/field_effect_object_palette_05.gbapal"
.align 2
gUnknown_0855AE50:: @ 855AE50
.incbin "baserom.gba", 0x55ae50, 0x200
.incbin "graphics/misc/field_move_streaks.4bpp"
.align 2
gUnknown_0855B050:: @ 855B050
.incbin "baserom.gba", 0x55b050, 0x20
.incbin "graphics/misc/field_move_streaks.gbapal"
.align 2
gUnknown_0855B070:: @ 855B070
.incbin "baserom.gba", 0x55b070, 0x280
.incbin "graphics/misc/field_move_streaks_map.bin"
.align 2
gUnknown_0855B2F0:: @ 855B2F0
.incbin "baserom.gba", 0x55b2f0, 0x80
.incbin "graphics/misc/darkness_field_move_streaks.4bpp"
.align 2
gUnknown_0855B370:: @ 855B370
.incbin "baserom.gba", 0x55b370, 0x20
.incbin "graphics/misc/darkness_field_move_streaks.gbapal"
.align 2
gUnknown_0855B390:: @ 855B390
.incbin "baserom.gba", 0x55b390, 0x280
.incbin "graphics/misc/darkness_field_move_streaks_map.bin"
.align 2
gUnknown_0855B610:: @ 855B610
.incbin "baserom.gba", 0x55b610, 0x20
.incbin "graphics/misc/spotlight.gbapal"
.align 2
gUnknown_0855B630:: @ 855B630
.incbin "baserom.gba", 0x55b630, 0xbc0
.incbin "graphics/misc/spotlight.4bpp"
.align 2
gUnknown_0855C170:: @ 855C170
.incbin "graphics/unknown/unknown_55C170.4bpp"
.align 2
gUnknown_0855C1F0:: @ 855C1F0
.incbin "baserom.gba", 0x55c1f0, 0x20
.4byte FieldEffectCmd_loadtiles
.4byte FieldEffectCmd_loadfadedpal
.4byte FieldEffectCmd_loadpal
.4byte FieldEffectCmd_callnative
.4byte FieldEffectCmd_end
.4byte FieldEffectCmd_loadgfx_callnative
.4byte FieldEffectCmd_loadtiles_callnative
.4byte FieldEffectCmd_loadfadedpal_callnative
.align 2
@ TODO: something else uses these too
@ -61,7 +98,12 @@ gNewGameBirchOamAttributes:: @ 855C210
.2byte 0
.align 2
.incbin "baserom.gba", 0x55c218, 0x10
gOamData_855C218:: @ 855C218
.2byte 0x0000, 0x0000, 0x0000, 0x0000
.align 2
gOamData_855C220:: @ 855C220
.2byte 0x0000, 0x4000, 0x0000, 0x0000
.align 2
gNewGameBirchPicTable:: @ 855C228
@ -82,13 +124,7 @@ gNewGameBirchImageAnimTable:: @ 855C240
.align 2
gNewGameBirchObjectTemplate:: @ 855C244
.2byte 0xFFFF @ tiles tag
.2byte 0x1006 @ palette tag
.4byte gNewGameBirchOamAttributes
.4byte gNewGameBirchImageAnimTable
.4byte gNewGameBirchPicTable
.4byte gDummySpriteAffineAnimTable
.4byte SpriteCallbackDummy
spr_template 0xFFFF, 0x1006, gNewGameBirchOamAttributes, gNewGameBirchImageAnimTable, gNewGameBirchPicTable, gDummySpriteAffineAnimTable, SpriteCallbackDummy
.align 2
gFieldEffectObjectPaletteInfo4:: @ 855C25C
@ -98,109 +134,318 @@ gFieldEffectObjectPaletteInfo4:: @ 855C25C
gFieldEffectObjectPaletteInfo5:: @ 855C264
obj_pal gFieldEffectObjectPalette5, 0x1010
.incbin "baserom.gba", 0x55c26c, 0x40
.align 2
gOamData_855C26C:: @ 855C26C
.2byte 0x4000, 0x8000, 0x0000, 0x0000
.align 2
gUnknown_855C274:: @ 855C274
obj_frame_tiles gSpriteImage_855A970, 0x0020
.align 2
gUnknown_855C27C:: @ 855C27C
obj_frame_tiles gSpriteImage_855A9B0, 0x00c0
obj_frame_tiles gSpriteImage_855AA70, 0x00c0
.align 2
gUnknown_855C28C:: @ 855C28C
obj_frame_tiles gSpriteImage_855AB30, 0x0200
.align 2
gUnknown_855C294:: @ 855C294
obj_frame_tiles gSpriteImage_855AD30, 0x0200
.align 2
gSubspriteTable_855C29C:: @ 855C29C
subsprite -12, -8, 2, 0, 16x8
subsprite 4, -8, 2, 2, 8x8
subsprite -12, 0, 2, 3, 16x8
subsprite 4, 0, 2, 5, 8x8
.align 2
gUnknown_0855C2AC:: @ 855C2AC
.incbin "baserom.gba", 0x55c2ac, 0x18
.4byte 4, gSubspriteTable_855C29C
.align 2
gSubspriteTable_855C2B4:: @ 855C2B4
subsprite -32, -8, 2, 0, 32x8
subsprite 0, -8, 2, 4, 32x8
subsprite -32, 0, 2, 8, 32x8
subsprite 0, 0, 2, 12, 32x8
.align 2
gUnknown_0855C2C4:: @ 855C2C4
.incbin "baserom.gba", 0x55c2c4, 0x40
.4byte 4, gSubspriteTable_855C2B4
.align 2
gUnknown_0855C2CC:: @ 855C2CC
.2byte 0x0000, 0x0001, 0xfffe, 0x0000
.align 2
gUnknown_0855C2D4:: @ 855C2D4
.2byte 0x0000, 0x0010, 0x0001, 0x0010, 0x0000, 0x0010, 0x0001, 0x0010, 0x0000, 0x0010, 0x0001, 0x0010, 0x0000, 0x0010, 0x0001, 0x0010
.2byte 0xffff, 0x0000
.align 2
gUnknown_0855C2F8:: @ 855C2F8
.4byte gUnknown_0855C2CC
.4byte gUnknown_0855C2D4
.align 2
gUnknown_0855C300:: @ 855C300
.4byte gUnknown_0855C2CC
.align 2
gUnknown_0855C304:: @ 855C304
.incbin "baserom.gba", 0x55c304, 0x18
spr_template 0xffff, 0x1007, gOamData_855C218, gUnknown_0855C2F8, gUnknown_855C274, gDummySpriteAffineAnimTable, sub_80B6828
.align 2
gUnknown_0855C31C:: @ 855C31C
.incbin "baserom.gba", 0x55c31c, 0x18
spr_template 0xffff, 0x1004, gOamData_855C220, gUnknown_0855C2F8, gUnknown_855C27C, gDummySpriteAffineAnimTable, sub_80B68AC
.align 2
gUnknown_0855C334:: @ 855C334
.incbin "baserom.gba", 0x55c334, 0x18
spr_template 0xffff, 0x1010, gOamData_855C220, gUnknown_0855C300, gUnknown_855C28C, gDummySpriteAffineAnimTable, sub_80B6970
.align 2
gUnknown_0855C34C:: @ 855C34C
.incbin "baserom.gba", 0x55c34c, 0x18
spr_template 0xffff, 0x1010, gOamData_855C26C, gUnknown_0855C300, gUnknown_855C294, gDummySpriteAffineAnimTable, sub_80B6970
.align 2
gUnknown_0855C364:: @ 855C364
.incbin "baserom.gba", 0x55c364, 0x10
.4byte sub_80B6214
.4byte sub_80B6250
.4byte sub_80B628C
.4byte sub_80B62B4
.align 2
gUnknown_0855C374:: @ 855C374
.incbin "baserom.gba", 0x55c374, 0x10
.4byte sub_80B6360
.4byte sub_80B63D4
.4byte sub_80B6404
.4byte sub_80B642C
.align 2
gUnknown_0855C384:: @ 855C384
.incbin "baserom.gba", 0x55c384, 0x20
.4byte sub_80B64DC
.4byte sub_80B6574
.4byte sub_80B65A8
.4byte sub_80B66E8
.4byte sub_80B67DC
.4byte sub_80B67F8
.4byte sub_80B6800
.4byte nullsub_97
.align 1
gUnknown_0855C3A4:: @ 855C3A4
.incbin "baserom.gba", 0x55c3a4, 0x18
.2byte 0x0000, 0x0000, 0x0006, 0x0000, 0x0000, 0x0004, 0x0006, 0x0004, 0x0000, 0x0008, 0x0006, 0x0008
gUnknown_0855C3BC:: @ 855C3BC
.incbin "baserom.gba", 0x55c3bc, 0x4
.byte 0x10, 0x0c, 0x08, 0x00
gUnknown_0855C3C0:: @ 855C3C0
.incbin "baserom.gba", 0x55c3c0, 0x4
.byte 0x10, 0x0c, 0x08, 0x00
gUnknown_0855C3C4:: @ 855C3C4
.incbin "baserom.gba", 0x55c3c4, 0x4
.byte 0x00, 0x00, 0x00, 0x00
.align 2
gUnknown_0855C3C8:: @ 855C3C8
.incbin "baserom.gba", 0x55c3c8, 0x1c
.4byte sub_80B6BCC
.4byte sub_80B6C74
.4byte sub_80B6C90
.4byte sub_80B6D04
.4byte sub_80B6DBC
.4byte sub_80B6DD8
.4byte sub_80B6E18
.align 2
gUnknown_0855C3E4:: @ 855C3E4
.incbin "baserom.gba", 0x55c3e4, 0x18
.4byte sub_80B6EC0
.4byte sub_80B6EE0
.4byte sub_80B6F50
.4byte sub_80B6F74
.4byte sub_80B6F84
.4byte sub_80B6FA8
.align 2
gUnknown_0855C3FC:: @ 855C3FC
.incbin "baserom.gba", 0x55c3fc, 0x1c
.4byte sub_80B7114
.4byte sub_80B7190
.4byte sub_80B71D0
.4byte sub_80B7230
.4byte sub_80B7270
.4byte sub_80B72D0
.4byte sub_80B72F4
.align 2
gUnknown_0855C418:: @ 855C418
.incbin "baserom.gba", 0x55c418, 0x14
.4byte sub_80B73D0
.4byte waterfall_1_do_anim_probably
.4byte waterfall_2_wait_anim_finish_probably
.4byte sub_80B7450
.4byte sub_80B7478
.align 2
gUnknown_0855C42C:: @ 855C42C
.incbin "baserom.gba", 0x55c42c, 0xc
.4byte dive_1_lock
.4byte dive_2_unknown
.4byte dive_3_unknown
.align 2
gUnknown_0855C438:: @ 855C438
.incbin "baserom.gba", 0x55c438, 0x18
.4byte sub_80B764C
.4byte sub_80B7684
.4byte sub_80B76B8
.4byte sub_80B7704
.4byte sub_80B77F8
.4byte sub_80B7814
.align 2
gUnknown_0855C450:: @ 855C450
.incbin "baserom.gba", 0x55c450, 0x10
.4byte sub_80B78EC
.4byte sub_80B791C
.4byte sub_80B7968
.4byte sub_80B79BC
.align 2
gUnknown_0855C460:: @ 855C460
.incbin "baserom.gba", 0x55c460, 0x14
.4byte sub_80B7AE8
.4byte sub_80B7B18
.4byte sub_80B7B94
.4byte sub_80B7BCC
.4byte sub_80B7BF4
.align 2
gUnknown_0855C474:: @ 855C474
.incbin "baserom.gba", 0x55c474, 0x8
.4byte sub_80B7D14
.4byte sub_80B7D34
gUnknown_0855C47C:: @ 855C47C
.incbin "baserom.gba", 0x55c47c, 0x8
.byte 0x01, 0x03, 0x04, 0x02, 0x01, 0x00, 0x00, 0x00
.align 2
gUnknown_0855C484:: @ 855C484
.incbin "baserom.gba", 0x55c484, 0x8
.4byte sub_80B7EC4
.4byte sub_80B7EE8
.align 2
gUnknown_0855C48C:: @ 855C48C
.incbin "baserom.gba", 0x55c48c, 0x10
.4byte sub_80B800C
.4byte sub_80B8034
.4byte sub_80B80C4
.4byte sub_80B8198
.align 2
gUnknown_0855C49C:: @ 855C49C
.incbin "baserom.gba", 0x55c49c, 0xc
.4byte sub_80B8280
.4byte sub_80B830C
.4byte sub_80B8410
.align 2
gUnknown_0855C4A8:: @ 855C4A8
.incbin "baserom.gba", 0x55c4a8, 0x1c
.4byte sub_80B8584
.4byte sub_80B85F8
.4byte sub_80B8660
.4byte sub_80B86EC
.4byte sub_80B871C
.4byte sub_80B8770
.4byte overworld_bg_setup_2
.align 2
gUnknown_0855C4C4:: @ 855C4C4
.incbin "baserom.gba", 0x55c4c4, 0x1c
.4byte sub_80B88E4
.4byte sub_80B8920
.4byte sub_80B898C
.4byte sub_80B89DC
.4byte sub_80B8A0C
.4byte sub_80B8A44
.4byte sub_80B8A64
.align 2
gUnknown_0855C4E0:: @ 855C4E0
.incbin "baserom.gba", 0x55c4e0, 0x14
.4byte sub_80B8DB4
.4byte sub_80B8E14
.4byte sub_80B8E60
.4byte sub_80B8EA8
.4byte sub_80B8F24
.align 2
gUnknown_0855C4F4:: @ 855C4F4
.incbin "baserom.gba", 0x55c4f4, 0x54
.4byte sub_80B9204
.4byte sub_80B925C
.4byte sub_80B92A0
.4byte sub_80B92F8
.4byte sub_80B933C
.4byte sub_80B9390
.4byte sub_80B9418
.4byte sub_80B9474
.4byte sub_80B9494
.align 2
gUnknown_0855C518:: @ 855C518
.2byte 0x0008, 0x0008, 0x00e2, 0x0000, 0x001c, 0x001c, 0x1e00, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000
.align 2
gUnknown_0855C530:: @ 855C530
.2byte 0x0100, 0x0100, 0x0040, 0x0000, 0xfff6, 0xfff6, 0x1600, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000
.align 2
gUnknown_0855C548:: @ 855C548
.incbin "baserom.gba", 0x55c548, 0x8
.4byte gUnknown_0855C518
.4byte gUnknown_0855C530
.align 2
gUnknown_0855C550:: @ 855C550
.incbin "baserom.gba", 0x55c550, 0x1c
.4byte sub_80B9804
.4byte sub_80B98B8
.4byte sub_80B9924
.4byte sub_80B9978
.4byte sub_80B99F0
.4byte sub_80B9A28
.4byte sub_80B9A60
gUnknown_0855C56C:: @ 855C56C
.incbin "baserom.gba", 0x55c56c, 0x24
.byte 0xfe, 0xff, 0xfc, 0xff, 0xfb, 0xff, 0xfa, 0xff, 0xf9, 0xff, 0xf8, 0xff, 0xf8, 0xff, 0xf8, 0xff, 0xf9, 0xff, 0xf9, 0xff, 0xfa, 0xff, 0xfb, 0xff, 0xfd, 0xff, 0xfe, 0xff, 0x00, 0x00, 0x02, 0x00
.byte 0x04, 0x00, 0x08, 0x00
.align 2
gUnknown_0855C590:: @ 855C590
.incbin "baserom.gba", 0x55c590, 0x5c
.4byte sub_80B9C28
.4byte sub_80B9C54
.4byte sub_80B9CDC
.align 2
gUnknown_0855C59C:: @ 855C59C
obj_frame_tiles gUnknown_0855C170, 0x0020
obj_frame_tiles gUnknown_0855C170 + 0x20, 0x0020
obj_frame_tiles gUnknown_0855C170 + 0x40, 0x0020
obj_frame_tiles gUnknown_0855C170 + 0x60, 0x0020
.align 2
gUnknown_0855C5BC:: @ 855C5BC
.2byte 0x0000, 0x0000, 0xffff, 0x0000
.align 2
gUnknown_0855C5C4:: @ 855C5C4
.2byte 0x0001, 0x0000, 0xffff, 0x0000
.align 2
gUnknown_0855C5CC:: @ 855C5CC
.2byte 0x0002, 0x0000, 0xffff, 0x0000
.align 2
gUnknown_0855C5D4:: @ 855C5D4
.2byte 0x0003, 0x0000, 0xffff, 0x0000
.align 2
gUnknown_0855C5DC:: @ 855C5DC
.4byte gUnknown_0855C5BC
.4byte gUnknown_0855C5C4
.4byte gUnknown_0855C5CC
.4byte gUnknown_0855C5D4
.align 2
gUnknown_0855C5EC:: @ 855C5EC
.incbin "baserom.gba", 0x55c5ec, 0x18
spr_template 0xffff, 0x111a, gOamData_855C218, gUnknown_0855C5DC, gUnknown_0855C59C, gDummySpriteAffineAnimTable, sub_80B9DB8

View File

@ -4,28 +4,169 @@
.section .rodata
.align 2
.incbin "baserom.gba", 0x58d978, 0x2a0
gSpriteImage_858D978:: @ 858D978
.incbin "graphics/unknown/858E588/0.4bpp"
.align 2
gSpriteImage_858D9F8:: @ 858D9F8
.incbin "graphics/unknown/858E588/1.4bpp"
.align 2
gSpriteImage_858DA78:: @ 858DA78
.incbin "graphics/unknown/858E588/2.4bpp"
.align 2
gSpriteImage_858DAF8:: @ 858DAF8
.incbin "graphics/unknown/858E588/3.4bpp"
.align 2
gSpriteImage_858DB78:: @ 858DB78
.incbin "graphics/unknown/858E588/4.4bpp"
.space 32
.align 2
gFieldEffectObjectPalette7:: @ 858DC18
.incbin "graphics/map_objects/palettes/field_effect_object_palette_07.gbapal"
.incbin "baserom.gba", 0x58dc38, 0x580
.align 2
gSpriteImage_858DC38:: @ 858DC38
.incbin "graphics/unknown/858E5D8/0.4bpp"
.align 2
gSpriteImage_858DCB8:: @ 858DCB8
.incbin "graphics/unknown/858E5D8/1.4bpp"
.align 2
gSpriteImage_858DD38:: @ 858DD38
.incbin "graphics/unknown/858E5D8/2.4bpp"
.align 2
gSpriteImage_858DDB8:: @ 858DDB8
.incbin "graphics/unknown/858E5D8/3.4bpp"
.align 2
gSpriteImage_858DE38:: @ 858DE38
.incbin "graphics/unknown/858E5D8/4.4bpp"
.align 2
gSpriteImage_858DEB8:: @ 858DEB8
.incbin "graphics/unknown/858E5B0/0.4bpp"
.align 2
gSpriteImage_858DF38:: @ 858DF38
.incbin "graphics/unknown/858E5B0/1.4bpp"
.align 2
gSpriteImage_858DFB8:: @ 858DFB8
.incbin "graphics/unknown/858E5B0/2.4bpp"
.align 2
gSpriteImage_858E038:: @ 858E038
.incbin "graphics/unknown/858E5B0/3.4bpp"
.align 2
gSpriteImage_858E0B8:: @ 858E0B8
.incbin "graphics/unknown/858E5B0/4.4bpp"
.align 2
gSpriteImage_858E138:: @ 858E138
.incbin "graphics/unknown/858E5B0/5.4bpp"
.align 2
gFieldEffectObjectPalette8:: @ 858E1B8
.incbin "graphics/map_objects/palettes/field_effect_object_palette_08.gbapal"
.incbin "baserom.gba", 0x58e1d8, 0x428
.align 2
gSpriteImage_858E1D8:: @ 858E1D8
.incbin "graphics/unknown/858E674/0.4bpp"
.align 2
gSpriteImage_858E2D8:: @ 858E2D8
.incbin "graphics/unknown/858E674/1.4bpp"
.align 2
gSpriteImage_858E3D8:: @ 858E3D8
.incbin "graphics/unknown/858E674/2.4bpp"
.align 2
gOamData_858E4D8:: @ 858E4D8
.2byte 0x0000, 0x4000, 0x0800, 0x0000
.align 2
gSpriteAnim_858E4E0:: @ 858E4E0
.2byte 0x0000, 0x0008, 0x0001, 0x0008, 0x0002, 0x0008, 0x0003, 0x0008, 0x0004, 0x0008, 0xffff, 0x0000
.align 2
gSpriteAnim_858E4F8:: @ 858E4F8
.2byte 0x0000, 0x0008, 0x0001, 0x0008, 0x0002, 0x0008, 0x0003, 0x0008, 0x0004, 0x0008, 0xffff, 0x0000
.align 2
gSpriteAnim_858E510:: @ 858E510
.2byte 0x0004, 0x0008, 0x0003, 0x0008, 0x0002, 0x0008, 0x0001, 0x0008, 0x0000, 0x0008, 0xffff, 0x0000
.align 2
gSpriteAnim_858E528:: @ 858E528
.2byte 0x0000, 0x0048, 0x0001, 0x0048, 0x0002, 0x0048, 0x0003, 0x0048, 0x0004, 0x0048, 0xffff, 0x0000
.align 2
gSpriteAnim_858E540:: @ 858E540
.2byte 0x0004, 0x0048, 0x0003, 0x0048, 0x0002, 0x0048, 0x0001, 0x0048, 0x0000, 0x0048, 0xffff, 0x0000
.align 2
gSpriteAnim_858E558:: @ 858E558
.2byte 0x0000, 0x0008, 0x0001, 0x0008, 0x0002, 0x0008, 0x0003, 0x0008, 0x0004, 0x0008, 0xffff, 0x0000
.align 2
gSpriteAnimTable_858E570:: @ 858E570
.4byte gSpriteAnim_858E4E0
.align 2
gSpriteAnimTable_858E574:: @ 858E574
.4byte gSpriteAnim_858E4F8
.4byte gSpriteAnim_858E510
.4byte gSpriteAnim_858E528
.4byte gSpriteAnim_858E540
.align 2
gSpriteAnimTable_858E584:: @ 858E584
.4byte gSpriteAnim_858E558
.align 2
gUnknown_858E588:: @ 858E588
obj_frame_tiles gSpriteImage_858D978, 0x0080
obj_frame_tiles gSpriteImage_858D9F8, 0x0080
obj_frame_tiles gSpriteImage_858DA78, 0x0080
obj_frame_tiles gSpriteImage_858DAF8, 0x0080
obj_frame_tiles gSpriteImage_858DB78, 0x0080
.align 2
gUnknown_858E5B0:: @ 858E5B0
obj_frame_tiles gSpriteImage_858DEB8, 0x0080
obj_frame_tiles gSpriteImage_858DF38, 0x0080
obj_frame_tiles gSpriteImage_858DFB8, 0x0080
obj_frame_tiles gSpriteImage_858E038, 0x0080
obj_frame_tiles gSpriteImage_858E0B8, 0x0080
.align 2
gUnknown_858E5D8:: @ 858E5D8
obj_frame_tiles gSpriteImage_858DC38, 0x0080
obj_frame_tiles gSpriteImage_858DCB8, 0x0080
obj_frame_tiles gSpriteImage_858DD38, 0x0080
obj_frame_tiles gSpriteImage_858DDB8, 0x0080
obj_frame_tiles gSpriteImage_858DE38, 0x0080
.align 2
gUnknown_0858E600:: @ 858E600
.incbin "baserom.gba", 0x58e600, 0x18
spr_template 0xffff, 0x1003, gOamData_858E4D8, gSpriteAnimTable_858E570, gUnknown_858E588, gDummySpriteAffineAnimTable, sub_80FA18C
.align 2
gUnknown_0858E618:: @ 858E618
.incbin "baserom.gba", 0x58e618, 0x18
spr_template 0xffff, 0x1008, gOamData_858E4D8, gSpriteAnimTable_858E574, gUnknown_858E5B0, gDummySpriteAffineAnimTable, sub_80FA2D8
.align 2
gUnknown_0858E630:: @ 858E630
.incbin "baserom.gba", 0x58e630, 0x18
spr_template 0xffff, 0x1008, gOamData_858E4D8, gSpriteAnimTable_858E584, gUnknown_858E5D8, gDummySpriteAffineAnimTable, sub_80FA3FC
.align 2
gFieldEffectObjectPaletteInfo7:: @ 858E648
@ -35,10 +176,27 @@ gFieldEffectObjectPaletteInfo7:: @ 858E648
gFieldEffectObjectPaletteInfo8:: @ 858E650
obj_pal gFieldEffectObjectPalette8, 0x1008
.incbin "baserom.gba", 0x58e658, 0x34
.align 2
gOamData_858E658:: @ 858E658
.2byte 0x8000, 0x8000, 0x0800, 0x0000
.align 2
gSpriteAnim_858E660:: @ 858E660
.2byte 0x0000, 0x0006, 0x0001, 0x0006, 0x0002, 0x0006, 0xffff, 0x0000
.align 2
gSpriteAnimTable_858E670:: @ 858E670
.4byte gSpriteAnim_858E660
.align 2
gUnknown_0858E674:: @ 858E674
obj_frame_tiles gSpriteImage_858E1D8, 0x0100
obj_frame_tiles gSpriteImage_858E2D8, 0x0100
obj_frame_tiles gSpriteImage_858E3D8, 0x0100
.align 2
gUnknown_0858E68C:: @ 858E68C
.incbin "baserom.gba", 0x58e68c, 0x18
spr_template 0xffff, 0x100e, gOamData_858E658, gSpriteAnimTable_858E670, gUnknown_0858E674, gDummySpriteAffineAnimTable, door_restore_tilemap
.align 2
@ This uses one of the secret base palettes, so there is no
@ -46,10 +204,41 @@ gUnknown_0858E68C:: @ 858E68C
gFieldEffectObjectPaletteInfo9:: @ 858E6A4
obj_pal gTilesetPalettes_SecretBase + 5 * 0x20, 0x100E
.incbin "baserom.gba", 0x58e6ac, 0x1b8
.align 2
gSpriteImage_858E6AC:: @ 858E6AC
.incbin "graphics/unknown/858E84C/0.4bpp"
.align 2
gSpriteImage_858E72C:: @ 858E72C
.incbin "graphics/unknown/858E84C/1.4bpp"
.align 2
gSpriteImage_858E7AC:: @ 858E7AC
.incbin "graphics/unknown/858E84C/2.4bpp"
.align 2
gUnknown_0858E82C:: @ 858E82C
.incbin "graphics/unknown/unknown_58E82C.gbapal"
.align 2
gUnknown_0858E84C:: @ 858E84C
obj_frame_tiles gSpriteImage_858E6AC, 0x0080
obj_frame_tiles gSpriteImage_858E72C, 0x0080
obj_frame_tiles gSpriteImage_858E7AC, 0x0080
.align 2
gUnknown_0858E864:: @ 858E864
.incbin "baserom.gba", 0x58e864, 0x1c
obj_pal gUnknown_0858E82C, 0x1000
.align 2
gSpriteAnim_858E86C:: @ 858E86C
.2byte 0x0000, 0x001e, 0x0001, 0x001e, 0x0002, 0x001e, 0xfffe, 0x0000
.align 2
gSpriteAnimTable_858E87C:: @ 858E87C
.4byte gSpriteAnim_858E86C
.align 2
gUnknown_0858E880:: @ 858E880
.incbin "baserom.gba", 0x58e880, 0x18
spr_template 0xffff, 0x1000, gFieldObjectBaseOam_32x8, gSpriteAnimTable_858E87C, gUnknown_0858E84C, gDummySpriteAffineAnimTable, SpriteCallbackDummy

View File

@ -65,40 +65,4 @@ gUnknown_0850E674:: @ 850E674
.4byte GroundEffect_ShortGrass
.4byte GroundEffect_HotSprings
.4byte GroundEffect_Seaweed
.4byte little_step
.4byte little_step
.4byte little_step
.4byte little_step
.4byte little_step
.4byte little_step
.4byte little_step
.4byte little_step
.4byte little_step
.4byte little_step
.4byte little_step
.4byte little_step
.4byte little_step
.4byte little_step
.4byte little_step
.4byte little_step
.4byte double_little_steps
.4byte double_little_steps
.4byte double_little_steps
.4byte double_little_steps
.4byte double_little_steps
.4byte double_little_steps
.4byte double_little_steps
.4byte double_little_steps
.4byte double_little_steps
.4byte triple_little_steps
.4byte triple_little_steps
.4byte double_little_steps
.4byte triple_little_steps
.4byte triple_little_steps
.4byte quad_little_steps
.4byte quad_little_steps
.4byte quad_little_steps
.4byte quad_little_steps
.4byte oct_little_steps
.4byte oct_little_steps

File diff suppressed because it is too large Load Diff

View File

@ -4824,27 +4824,27 @@ gNamingScreenMenu_Gfx:: @ 8DD3838
.incbin "graphics/naming_screen/menu.4bpp.lz"
.align 2
gNamingScreenRWindow_Gfx::
gNamingScreenRWindow_Gfx:: @ 8DD3A04
.incbin "graphics/naming_screen/rwindow.4bpp"
.align 2
gNamingScreenROptions_Gfx::
gNamingScreenROptions_Gfx:: @ 8DD4044
.incbin "graphics/naming_screen/roptions.4bpp"
.align 2
gNamingScreenCursor_Gfx::
gNamingScreenCursor_Gfx:: @ 8DD4224
.incbin "graphics/naming_screen/cursor.4bpp"
.align 2
gNamingScreenKeyboardButton_Gfx::
gNamingScreenKeyboardButton_Gfx:: @ 8DD43E4
.incbin "graphics/naming_screen/keyboard_button.4bpp"
.align 2
gNamingScreenRightPointingTriangleTiles::
gNamingScreenRightPointingTriangleTiles:: @ 8DD4504
.incbin "graphics/naming_screen/right_pointing_triangle.4bpp"
.align 2
gNamingScreenUnderscoreTiles::
gNamingScreenUnderscoreTiles:: @ 8DD4524
.incbin "graphics/naming_screen/underscore.4bpp"
.align 2
@ -5042,47 +5042,49 @@ gUnknown_08DDD704:: @ 8DDD704
.align 2
gUnknown_08DDD728:: @ 8DDD728
.incbin "graphics/interface/textbox.gbapal" @ textbox palette?
.incbin "graphics/text_window/message_box.gbapal"
.align 2
gUnknown_08DDD748:: @ 8DDD748
.incbin "graphics/interface/textbox.4bpp"
gMessageBox_Gfx:: @ 8DDD748
.incbin "graphics/text_window/message_box.4bpp"
.align 2
gUnknown_08DDD908::
.incbin "graphics/unknown/unknown_DDD908.bin.lz"
gWallpaperIcon_Cross::
.incbin "graphics/pokemon_storage/cross_icon.4bpp.lz"
.align 2
gUnknown_08DDD920::
.incbin "graphics/unknown/unknown_DDD920.bin.lz"
gWallpaperIcon_Bolt::
.incbin "graphics/pokemon_storage/bolt_icon.4bpp.lz"
.align 2
gUnknown_08DDD938::
.incbin "graphics/unknown/unknown_DDD938.bin.lz"
gWallpaperIcon_Plusle::
.incbin "graphics/pokemon_storage/plusle_icon.4bpp.lz"
.align 2
gUnknown_08DDD950::
.incbin "graphics/pokemon_storage/pss_window.gbapal"
gWallpaperPalettes_Horizontal:: @ 8DDD950
.incbin "graphics/pokemon_storage/friends_frame2.gbapal"
.incbin "graphics/pokemon_storage/horizontal_bg.gbapal"
.align 2
gUnknown_08DDD990::
.incbin "graphics/pokemon_storage/pss_window.4bpp.lz"
gWallpaperTiles_Horizontal:: @ 8DDD990
.incbin "graphics/pokemon_storage/horizontal.4bpp.lz"
.align 2
gUnknown_08DDDB80:: @ 8DDDB80
.incbin "graphics/unknown/unknown_DDDB80.bin.lz"
gWallpaperTilemap_Horizontal:: @ 8DDDB80
.incbin "graphics/pokemon_storage/horizontal.bin.lz"
.align 2
gUnknown_08DDDC8C::
.incbin "graphics/pokemon_storage/pss_window2.gbapal"
gWallpaperPalettes_Ribbon:: @ 8DDDC8C
.incbin "graphics/pokemon_storage/ribbon_frame.gbapal"
.incbin "graphics/pokemon_storage/ribbon_bg.gbapal"
.align 2
gUnknown_08DDDCCC::
.incbin "graphics/pokemon_storage/pss_window2.4bpp.lz"
gWallpaperTiles_Ribbon:: @ 8DDDCCC
.incbin "graphics/pokemon_storage/ribbon.4bpp.lz"
.align 2
gUnknown_08DDDEDC::
.incbin "graphics/pokemon_storage/pss_window2.bin.lz"
gWallpaperTilemap_Ribbon:: @ 8DDDEDC
.incbin "graphics/pokemon_storage/ribbon.bin.lz"
@ pokenav
@ -5140,7 +5142,7 @@ gUnknown_08DE0644:: @ 8DE0644
.align 2
gUnknown_08DE07C8:: @ 8DE07C8
.incbin "graphics/frontier_pass/tiles.gbapal" @ size in LoadPalette calls is reported as 0xD0 << 1, which is 0x1A0, but this is wrong? todo, investigate? (frontier pass pal)
.incbin "graphics/frontier_pass/tiles.gbapal" @ size in LoadPalette calls is reported as 0xD0 << 1, which is 0x1A0, but palette is only 0x100 bytes long so it loads garbage as well
.align 2
gUnknown_08DE08C8:: @ 8DE08C8

View File

@ -9250,7 +9250,13 @@ gMonShinyPalette_Deoxys:: @ 8D3B7D0
gMonIcon_Deoxys:: @ 8D3B7F8
.incbin "graphics/pokemon/icons/deoxys_icon.4bpp"
.incbin "baserom.gba", 0xd3bbf8, 0x8000
.incbin "graphics/pokemon/icons/deoxys_speed_icon.4bpp"
.incbin "graphics/unused/deoxys_speed_icon_wide.4bpp"
.space 0x6800
.incbin "graphics/unknown/unknown_D437F8.bin"
.align 2
gMonFootprint_Deoxys:: @ 8D43BF8

View File

@ -1,75 +1,221 @@
#include "constants/items.h"
.include "asm/macros.inc"
.include "constants/constants.inc"
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2, 0
.section .rodata
gUnknown_0857F464:: @ 857F464
.incbin "baserom.gba", 0x57f464, 0xe0
.align 2
gUnknown_0857F564:: @ 857F564
.incbin "graphics/interface/bag_spinner.gbapal"
gUnknown_0857F544:: @ 857F544
.incbin "baserom.gba", 0x57f544, 0x5f0
.align 2
gUnknown_0857F584:: @ 857F584
.incbin "graphics/interface/bag_spinner.4bpp"
.align 2
gUnknown_0857F604:: @ 857F604
.incbin "graphics/unused/cherry.4bpp"
.align 2
gUnknown_0857FA84:: @ 857FA84
.incbin "graphics/unused/cherry.gbapal"
.align 2
gOamData_857FAA4:: @ 857FAA4
.2byte 0x0100, 0xc000, 0x0400, 0x0000
.align 2
gSpriteAnim_857FAAC:: @ 857FAAC
.2byte 0x0000, 0x0004, 0xffff, 0x0000
.align 2
gSpriteAnim_857FAB4:: @ 857FAB4
.2byte 0x0040, 0x0004, 0xffff, 0x0000
.align 2
gSpriteAnim_857FABC:: @ 857FABC
.2byte 0x0080, 0x0004, 0xffff, 0x0000
.align 2
gSpriteAnim_857FAC4:: @ 857FAC4
.2byte 0x00c0, 0x0004, 0xffff, 0x0000
.align 2
gSpriteAnim_857FACC:: @ 857FACC
.2byte 0x0100, 0x0004, 0xffff, 0x0000
.align 2
gSpriteAnim_857FAD4:: @ 857FAD4
.2byte 0x0140, 0x0004, 0xffff, 0x0000
.align 2
gSpriteAnimTable_857FADC:: @ 857FADC
.4byte gSpriteAnim_857FAAC
.4byte gSpriteAnim_857FAB4
.4byte gSpriteAnim_857FAC4
.4byte gSpriteAnim_857FACC
.4byte gSpriteAnim_857FAD4
.4byte gSpriteAnim_857FABC
.align 2
gSpriteAffineAnim_857FAF4:: @ 857FAF4
.2byte 0x0100, 0x0100, 0x0000, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000
.align 2
gSpriteAffineAnim_857FB04:: @ 857FB04
.2byte 0x0000, 0x0000, 0x02fe, 0x0000, 0x0000, 0x0000, 0x0402, 0x0000, 0x0000, 0x0000, 0x04fe, 0x0000, 0x0000, 0x0000, 0x0202, 0x0000
.2byte 0x7fff, 0x0000, 0x0000, 0x0000
.align 2
gSpriteAffineAnimTable_857FB2C:: @ 857FB2C
.4byte gSpriteAffineAnim_857FAF4
.4byte gSpriteAffineAnim_857FB04
.align 2
gUnknown_0857FB34:: @ 857FB34
.incbin "baserom.gba", 0x57fb34, 0x8
obj_tiles gBagMaleTiles, 0x3000, 0x0064
.align 2
gUnknown_0857FB3C:: @ 857FB3C
.incbin "baserom.gba", 0x57fb3c, 0x8
obj_tiles gBagFemaleTiles, 0x3000, 0x0064
.align 2
gUnknown_0857FB44:: @ 857FB44
.incbin "baserom.gba", 0x57fb44, 0x8
obj_pal gBagPalette, 0x0064
.align 2
gUnknown_0857FB4C:: @ 857FB4C
.incbin "baserom.gba", 0x57fb4c, 0x4c
spr_template 0x0064, 0x0064, gOamData_857FAA4, gSpriteAnimTable_857FADC, NULL, gSpriteAffineAnimTable_857FB2C, SpriteCallbackDummy
.align 2
gOamData_857FB64:: @ 857FB64
.2byte 0x0000, 0x4800, 0x0800, 0x0000
.align 2
gSpriteAnim_857FB6C:: @ 857FB6C
.2byte 0x0000, 0x0000, 0xffff, 0x0000
.align 2
gSpriteAnimTable_857FB74:: @ 857FB74
.4byte gSpriteAnim_857FB6C
.align 2
gSpriteAffineAnim_857FB78:: @ 857FB78
.2byte 0x0000, 0x0000, 0x1008, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000
.align 2
gSpriteAffineAnim_857FB88:: @ 857FB88
.2byte 0x0000, 0x0000, 0x10f8, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000
.align 2
gUnknown_0857FB98:: @ 857FB98
.incbin "baserom.gba", 0x57fb98, 0x4
.4byte gSpriteAffineAnim_857FB78
.align 2
gUnknown_0857FB9C:: @ 857FB9C
.incbin "baserom.gba", 0x57fb9c, 0x4
.4byte gSpriteAffineAnim_857FB88
.align 2
gUnknown_0857FBA0:: @ 857FBA0
.incbin "baserom.gba", 0x57fba0, 0x8
obj_tiles gUnknown_0857F584, 0x0080, 0x0065
.align 2
gUnknown_0857FBA8:: @ 857FBA8
.incbin "baserom.gba", 0x57fba8, 0x8
obj_pal gUnknown_0857F564, 0x0065
.align 2
gUnknown_0857FBB0:: @ 857FBB0
.incbin "baserom.gba", 0x57fbb0, 0x3c
spr_template 0x0065, 0x0065, gOamData_857FB64, gSpriteAnimTable_857FB74, NULL, gUnknown_0857FB98, ObjectCB_SwitchPocketRotatingBallInit
.align 2
gOamData_857FBC8:: @ 857FBC8
.2byte 0x0000, 0xc000, 0x7400, 0x0000
.align 2
gOamData_857FBD0:: @ 857FBD0
.2byte 0x0300, 0xc000, 0x7000, 0x0000
.align 2
gSpriteAnim_857FBD8:: @ 857FBD8
.2byte 0x0000, 0x0000, 0xffff, 0x0000
.align 2
gSpriteAnimTable_857FBE0:: @ 857FBE0
.4byte gSpriteAnim_857FBD8
.align 2
gOamData_857FBE4:: @ 857FBE4
.2byte 0xc000, 0x0201, 0x0800, 0x0000
.align 2
gUnknown_0857FBEC:: @ 857FBEC
.incbin "baserom.gba", 0x57fbec, 0x90
spr_template 0xffff, 0x7544, gOamData_857FBC8, gSpriteAnimTable_857FBE0, gOamData_857FBE4, gDummySpriteAffineAnimTable, SpriteCallbackDummy
.align 2
gSpriteAffineAnim_857FC04:: @ 857FC04
.2byte 0xffff, 0xffff, 0x60fd, 0x0000, 0x0000, 0x0000, 0x1000, 0x0000, 0xfffe, 0xfffe, 0x40ff, 0x0000, 0xfff8, 0x0000, 0x1000, 0x0000
.2byte 0x0000, 0xfff8, 0x1000, 0x0000, 0x0100, 0x0100, 0x0000, 0x0000, 0x7ffe, 0x0000, 0x0000, 0x0000
.align 2
gSpriteAffineAnim_857FC3C:: @ 857FC3C
.2byte 0xffff, 0xffff, 0x6003, 0x0000, 0x0000, 0x0000, 0x1000, 0x0000, 0xfffe, 0xfffe, 0x4001, 0x0000, 0xfff8, 0x0000, 0x1000, 0x0000
.2byte 0x0000, 0xfff8, 0x1000, 0x0000, 0x0100, 0x0100, 0x0000, 0x0000, 0x7ffe, 0x0000, 0x0000, 0x0000
.align 2
gSpriteAffineAnimTable_857FC74:: @ 857FC74
.4byte gSpriteAffineAnim_857FC04
.4byte gSpriteAffineAnim_857FC3C
.align 2
gUnknown_0857FC7C:: @ 857FC7C
.incbin "baserom.gba", 0x57fc7c, 0x18
spr_template 0xffff, 0x7544, gOamData_857FBD0, gSpriteAnimTable_857FBE0, gOamData_857FBE4, gSpriteAffineAnimTable_857FC74, SpriteCallbackDummy
@ 857FC94
.include "data/graphics/berries/berry_pic_table.inc"
.align 2
gUnknown_0857FDEC:: @ 857FDEC
.incbin "baserom.gba", 0x57fdec, 0x8
obj_tiles gBerryCheckCircle_Gfx, 0x0800, 0x2710
.align 2
gUnknown_0857FDF4:: @ 857FDF4
.incbin "baserom.gba", 0x57fdf4, 0x1c
obj_pal gUnknown_08D9BEF0, 0x2710
.align 2
gOamData_857FDFC:: @ 857FDFC
.2byte 0x0000, 0xc000, 0x0400, 0x0000
.align 2
gSpriteAnim_857FE04:: @ 857FE04
.2byte 0x0000, 0x0000, 0xffff, 0x0000
.align 2
gSpriteAnimTable_857FE0C:: @ 857FE0C
.4byte gSpriteAnim_857FE04
.align 2
gUnknown_0857FE10:: @ 857FE10
.incbin "baserom.gba", 0x57fe10, 0x18
spr_template 0x2710, 0x2710, gOamData_857FDFC, gSpriteAnimTable_857FE0C, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
.align 2
gUnknown_0857FE28:: @ 857FE28
.incbin "baserom.gba", 0x57fe28, 0x18
spr_template 0x0000, 0x0000, gDummyOamData, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80D5860
.align 2
gUnknown_0857FE40:: @ 857FE40
.incbin "baserom.gba", 0x57fe40, 0x18
spr_template 0x0000, 0x0000, gDummyOamData, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80D58F8
.align 2
gUnknown_0857FE58:: @ 857FE58
.incbin "baserom.gba", 0x57fe58, 0x18
spr_template 0x0000, 0x0000, gDummyOamData, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80D5968
.align 2
gUnknown_0857FE70:: @ 857FE70
.incbin "baserom.gba", 0x57fe70, 0x18
spr_template 0x0000, 0x0000, gDummyOamData, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80D5A94
.align 2
gUnknown_0857FE88:: @ 857FE88
.incbin "baserom.gba", 0x57fe88, 0x18
spr_template 0x0000, 0x0000, gDummyOamData, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80D5B48
@ 857FEA0
.include "data/text/item_descriptions.inc"

View File

@ -2,23 +2,92 @@
.include "constants/constants.inc"
.section .rodata
gUnknown_085CE9F8:: @ 85CE9F8
.incbin "graphics/interface/ui_learn_move.gbapal"
gUnknown_085CEA18:: @ 85CEA18
.incbin "baserom.gba", 0x5ceA18, 0x198
.incbin "graphics/interface/ui_learn_move.4bpp"
gUnknown_085CEB98:: @ 85CEB98
.2byte 0
.2byte 0
.2byte 0
.2byte 0
.2byte 0x8000
.2byte 0
.2byte 0
.2byte 0
.2byte 0x4000
.2byte 0
.2byte 0
.2byte 0
gUnknown_085CEBB0:: @ 85CEBB0
.incbin "baserom.gba", 0x5cebb0, 0x8
obj_tiles gUnknown_085CEA18, 0x180, 0x1595
gUnknown_085CEBB8:: @ 85CEBB8
.incbin "baserom.gba", 0x5cebb8, 0x8
obj_pal gUnknown_085CE9F8, 0x1596
gUnknown_085CEBC0:: @ 85CEBC0
.incbin "baserom.gba", 0x5cebc0, 0x10
.byte 0
.byte 0x1B
.byte 16
.byte 1
.byte 0x75
.byte 16
.2byte 0xFFFF
.2byte 0xFFFF
.2byte 0x14CD
.2byte 0x14CD
.byte 0, 0
gUnknown_085CEBD0:: @ 85CEBD0
.incbin "baserom.gba", 0x5cebd0, 0x40
.byte 2
.byte 0xC0
.byte 8
.byte 3
.byte 0xC0
.byte 0x68
.2byte 0
.2byte 0
.2byte 0x1531
.2byte 0x1531
.byte 0, 0
gUnknown_085CEBE0:: @ 85CEBE0
.2byte 8
.2byte 5
.2byte 0xFFFF
.2byte 0
gUnknown_085CEBE8:: @ 85CEBE8
.2byte 9
.2byte 5
.2byte 0xFFFF
.2byte 0
gUnknown_085CEBF0:: @ 85CEBF0
.2byte 10
.2byte 5
.2byte 0xFFFF
.2byte 0
gUnknown_085CEBF8:: @ 85CEBF8
.2byte 11
.2byte 5
.2byte 0xFFFF
.2byte 0
gUnknown_085CEC00:: @ 85CEC00
.4byte gUnknown_085CEBE0
.4byte gUnknown_085CEBE8
.4byte gUnknown_085CEBF0
.4byte gUnknown_085CEBF8
gUnknown_085CEC10:: @ 85CEC10
.incbin "baserom.gba", 0x5cec10, 0x18
spr_template 0x1595, 0x1596, gUnknown_085CEB98, gUnknown_085CEC00, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
gUnknown_085CEC28:: @ 85CEC28
.incbin "baserom.gba", 0x5cec28, 0x8
.4byte 0x1F0
.4byte 0x11E1

View File

@ -42,7 +42,7 @@ gUnknown_082FF048:: @ 82FF048
.align 2
gUnknown_082FF070:: @ 82FF070
window_template 0x00, 0x02, 0x0f, 0x1a, 0x04, 0x0f, 0x016d
window_template_terminator
null_window_template
.align 2
gUnknown_082FF080:: @ 82FF080
@ -52,7 +52,7 @@ gUnknown_082FF080:: @ 82FF080
gUnknown_082FF088:: @ 82FF088
window_template 0x00, 0x03, 0x05, 0x06, 0x04, 0x0f, 0x006d
window_template 0x00, 0x03, 0x02, 0x09, 0x0a, 0x0f, 0x0085
window_template_terminator
null_window_template
.align 2
gMainMenuBgPal:: @ 82FF0A0

View File

@ -15,3 +15,9 @@ gUnknown_0857F384:: @ 857F384
gUnknown_0857F444:: @ 857F444
.incbin "baserom.gba", 0x57f444, 0x20
gUnknown_0857F464:: @ 857F464
.incbin "baserom.gba", 0x57f464, 0xe0
gUnknown_0857F544:: @ 857F544
.incbin "baserom.gba", 0x57f544, 0x20

View File

@ -2,44 +2,129 @@
.include "constants/constants.inc"
.section .rodata
.align 2, 0
.align 2
gUnknown_0850E6C4:: @ 850E6C4
.4byte little_step
.4byte little_step
.4byte little_step
.4byte little_step
.4byte little_step
.4byte little_step
.4byte little_step
.4byte little_step
.4byte little_step
.4byte little_step
.4byte little_step
.4byte little_step
.4byte little_step
.4byte little_step
.4byte little_step
.4byte little_step
.align 2
gUnknown_0850E704:: @ 850E704
.4byte double_little_steps
.4byte double_little_steps
.4byte double_little_steps
.4byte double_little_steps
.4byte double_little_steps
.4byte double_little_steps
.4byte double_little_steps
.4byte double_little_steps
.align 2
gUnknown_0850E724:: @ 850E724
.4byte double_little_steps
.4byte triple_little_steps
.4byte triple_little_steps
.4byte double_little_steps
.4byte triple_little_steps
.4byte triple_little_steps
.align 2
gUnknown_0850E73C:: @ 850E73C
.4byte quad_little_steps
.4byte quad_little_steps
.4byte quad_little_steps
.4byte quad_little_steps
.align 2
gUnknown_0850E74C:: @ 850E74C
.4byte oct_little_steps
.4byte oct_little_steps
.align 2
gUnknown_0850E754:: @ 850E754
.incbin "baserom.gba", 0x50e754, 0x14
.4byte gUnknown_0850E6C4
.4byte gUnknown_0850E704
.4byte gUnknown_0850E724
.4byte gUnknown_0850E73C
.4byte gUnknown_0850E74C
.align 1
gUnknown_0850E768:: @ 850E768
.incbin "baserom.gba", 0x50e768, 0xa
.2byte 0x0010, 0x0008, 0x0006, 0x0004, 0x0002
gUnknown_0850E772:: @ 850E772
.incbin "baserom.gba", 0x50e772, 0x48
.byte 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x01, 0x02, 0x02, 0x01, 0x02, 0x02, 0x01, 0x02, 0x02, 0x01, 0x02, 0x01, 0x01, 0x02, 0x01, 0x01, 0x02, 0x01, 0x01, 0x02, 0x01
.byte 0x01, 0x02, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x01, 0x01, 0x01, 0x00, 0x01, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00
.byte 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
gUnknown_0850E7BA:: @ 850E7BA
.incbin "baserom.gba", 0x50e7ba, 0x7a
.byte 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x01, 0x01, 0x00, 0x01, 0x01, 0x00, 0x01, 0x01, 0x00, 0x01, 0x01, 0x00, 0x01, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00
.byte 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0xff, 0x00, 0x00, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00
.byte 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe
gUnknown_0850E802:: @ 850E802
.byte 0xfc, 0xfa, 0xf8, 0xf6, 0xf5, 0xf4, 0xf4, 0xf4, 0xf5, 0xf6, 0xf7, 0xf8, 0xfa, 0xfc, 0x00, 0x00
gUnknown_0850E812:: @ 850E812
.byte 0x00, 0xfe, 0xfd, 0xfc, 0xfb, 0xfa, 0xfa, 0xfa, 0xfb, 0xfb, 0xfc, 0xfd, 0xfe, 0x00, 0x00, 0x00
gUnknown_0850E822:: @ 850E822
.byte 0xfe, 0xfc, 0xfa, 0xf8, 0xf7, 0xf6, 0xf6, 0xf6, 0xf7, 0xf8, 0xfa, 0xfb, 0xfd, 0xfe, 0x00, 0x00
.align 2
gUnknown_0850E834:: @ 850E834
.incbin "baserom.gba", 0x50e834, 0xc
.4byte gUnknown_0850E802
.4byte gUnknown_0850E812
.4byte gUnknown_0850E822
.align 1
gUnknown_0850E840:: @ 850E840
.incbin "baserom.gba", 0x50e840, 0x6
.byte 0x10, 0x00, 0x10, 0x00, 0x20, 0x00
.align 1
gUnknown_0850E846:: @ 850E846
.incbin "baserom.gba", 0x50e846, 0x4
.byte 0x00, 0x00, 0x01, 0x00
.align 1
gUnknown_0850E84A:: @ 850E84A
.incbin "baserom.gba", 0x50e84a, 0x6
.byte 0x20, 0x00, 0x20, 0x00, 0x40, 0x00
.align 1
gUnknown_0850E850:: @ 850E850
.incbin "baserom.gba", 0x50e850, 0x4
.byte 0x01, 0x01, 0x02, 0x00
// referenced in src/field_map_obj.o
// referenced in data/field_map_obj.s
.align 2
gUnknown_0850E854::
.incbin "baserom.gba", 0x50e854, 0x8
.4byte sub_8097E50
.4byte sub_80964B8
.align 2
gUnknown_0850E85C::
.incbin "baserom.gba", 0x50e85C, 0x8
.4byte sub_8097EF0
.4byte sub_80964B8
.align 2
gUnknown_0850E864::
.incbin "baserom.gba", 0x50e864, 0xc
.4byte sub_80980C0
.4byte sub_80980D0
.4byte sub_8098124
.align 2
gUnknown_0850E870::
.incbin "baserom.gba", 0x50e870, 0xc
.4byte sub_80980F4
.4byte sub_8098108
.4byte sub_8098124

View File

@ -3,9 +3,20 @@
.section .rodata
gUnknown_0858BD78:: @ 858BD78
.incbin "baserom.gba", 0x58bd78, 0x40
.align 2
gUnknown_0858BBF8:: @ 858BBF8
.incbin "graphics/naming_screen/pc_icon/0.4bpp"
.align 2
gUnknown_0858BCB8:: @ 858BCB8
.incbin "graphics/naming_screen/pc_icon/1.4bpp"
.align 2
gUnknown_0858BD78:: @ 858BD78
.incbin "graphics/naming_screen/0.gbapal"
.incbin "graphics/naming_screen/1.gbapal"
.align 2
gUnknown_0858BDB8:: @ 858BDB8
.4byte gText_PkmnTransferredSomeonesPC
.4byte gText_PkmnTransferredLanettesPC
@ -14,13 +25,19 @@ gUnknown_0858BDB8:: @ 858BDB8
gUnknown_0858BDC8:: @ 858BDC8
.string "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz!$"
.align 2
gUnknown_0858BE00:: @ 858BE00
.incbin "baserom.gba", 0x58be00, 0x10
.4byte 0x000001e0, 0x000011d9, 0x000021ca, 0x000031ff
.align 2
gUnknown_0858BE10:: @ 858BE10
.incbin "baserom.gba", 0x58be10, 0x30
window_template 0x01, 0x03, 0x0a, 0x13, 0x08, 0x0a, 0x0030
window_template 0x02, 0x03, 0x0a, 0x13, 0x08, 0x0a, 0x00c8
window_template 0x03, 0x08, 0x06, 0x11, 0x02, 0x0a, 0x0030
window_template 0x03, 0x08, 0x04, 0x11, 0x02, 0x0a, 0x0052
window_template 0x00, 0x00, 0x00, 0x1e, 0x02, 0x0b, 0x0074
null_window_template
gUnknown_0858BE40:: @ 858BE40
.string "abcdef .ghijkl ,mnopqrs tuvwxyz ABCDEF .GHIJKL ,MNOPQRS TUVWXYZ 01234 56789 !?/- "
@ -86,17 +103,18 @@ gUnknown_0858BF28:: @ 858BF28
.4byte sub_80E46E8
gUnknown_0858BF34:: @ 858BF34
.incbin "baserom.gba", 0x58bf34, 0xa
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x01, 0x00
gUnknown_0858BF3E:: @ 858BF3E
.incbin "baserom.gba", 0x58bf3e, 0xa
.byte 0x00, 0x00, 0xff, 0xff, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00
gUnknown_0858BF48:: @ 858BF48
.incbin "baserom.gba", 0x58bf48, 0x8
.byte 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x02, 0x00
gUnknown_0858BF50:: @ 858BF50
.incbin "baserom.gba", 0x58bf50, 0x8
.byte 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00
.align 2
gUnknown_0858BF58:: @ 858BF58
.4byte sub_80E4894
.4byte sub_80E4894
@ -104,13 +122,15 @@ gUnknown_0858BF58:: @ 858BF58
.4byte sub_80E48E8
.4byte sub_80E4894
.align 2
gUnknown_0858BF6C:: @ 858BF6C
.4byte TaskDummy3
.4byte sub_80E49BC
.align 2
gUnknown_0858BF74:: @ 858BF74
.incbin "baserom.gba", 0x58bf74, 0x8
window_template 0x00, 0x09, 0x08, 0x00, 0x05, 0x04, 0x0000
gUnknown_0858BF7C:: @ 858BF7C
.4byte 0x0002010D
@ -134,20 +154,29 @@ gUnknown_0858BF98:: @ 858BF98
.4byte gUnknown_08DD47A0
gUnknown_0858BFA4:: @ 858BFA4
.incbin "baserom.gba", 0x58bfa4, 0x4
.byte 0x0f, 0x01, 0x02
.align 2
gUnknown_0858BFA8:: @ 858BFA8
.incbin "baserom.gba", 0x58bfa8, 0xc
.byte 0x00, 0x07, 0x01, 0x00, 0x01, 0x23, 0x00, 0x00
.4byte gText_YourName
.align 2
gUnknown_0858BFB4:: @ 858BFB4
.incbin "baserom.gba", 0x58bfb4, 0xc
gUnknown_0858BFC0:: @ 858BFC0
.incbin "baserom.gba", 0x58bfc0, 0xc
gUnknown_0858BFCC:: @ 858BFCC
.incbin "baserom.gba", 0x58bfcc, 0xc
.byte 0x00, 0x08, 0x02, 0x00, 0x01, 0x13, 0x00, 0x00
.4byte gText_BoxName
.align 2
gUnknown_0858BFC0:: @ 858BFC0
.byte 0x00, 0x0a, 0x03, 0x01, 0x01, 0x23, 0x00, 0x00
.4byte gText_PkmnsNickname
.align 2
gUnknown_0858BFCC:: @ 858BFCC
.byte 0x01, 0x0f, 0x04, 0x00, 0x01, 0x0b, 0x00, 0x00
.4byte gText_TellHimTheWords
.align 2
gUnknown_0858BFD8:: @ 858BFD8
.4byte gUnknown_0858BFA8
.4byte gUnknown_0858BFB4
@ -155,48 +184,125 @@ gUnknown_0858BFD8:: @ 858BFD8
.4byte gUnknown_0858BFC0
.4byte gUnknown_0858BFCC
gUnknown_0858BFEC:: @ 858BFEC
.incbin "baserom.gba", 0x58bfec, 0x64
.align 2
gOamData_858BFEC:: @ 858BFEC
.2byte 0x0000, 0x0000, 0x0000, 0x0000
.align 2
gOamData_858BFF4:: @ 858BFF4
.2byte 0x0000, 0x4000, 0x0000, 0x0000
.align 2
gOamData_858BFFC:: @ 858BFFC
.2byte 0x4000, 0x8000, 0x0000, 0x0000
.align 2
gUnknown_0858C004:: @ 858C004
.byte 0xec, 0xf0, 0x05, 0x40, 0x0c, 0xf0, 0x40, 0x40, 0xec, 0xf8, 0x55, 0x40, 0x0c, 0xf8, 0x90, 0x40, 0xec, 0x00, 0xa5, 0x40, 0x0c, 0x00, 0xe0, 0x40, 0xec, 0x08, 0xf5, 0x40, 0x0c, 0x08, 0x30, 0x41
.align 2
gUnknown_0858C024:: @ 858C024
.byte 0xf4, 0xfc, 0x01, 0x40, 0x04, 0xfc, 0x20, 0x40
.align 2
gUnknown_0858C02C:: @ 858C02C
.byte 0xec, 0xf4, 0x05, 0x40, 0x0c, 0xf4, 0x40, 0x40, 0xec, 0xfc, 0x55, 0x40, 0x0c, 0xfc, 0x90, 0x40, 0xec, 0x04, 0xa5, 0x40, 0x0c, 0x04, 0xe0, 0x40
.align 2
gUnknown_0858C044:: @ 858C044
.byte 0xf8, 0xf4, 0x01, 0xc0, 0xf8, 0xfc, 0x21, 0xc0, 0xf8, 0x04, 0x41, 0xc0
.align 2
gUnknown_0858C050:: @ 858C050
.incbin "baserom.gba", 0x58c050, 0x8
.byte 0x08, 0x00, 0x00, 0x00
.4byte gUnknown_0858C004
.align 2
gUnknown_0858C058:: @ 858C058
.incbin "baserom.gba", 0x58c058, 0x18
.4byte 0x02
.4byte gUnknown_0858C024
.4byte 0x02
.4byte gUnknown_0858C024
.4byte 0x02
.4byte gUnknown_0858C024
.align 2
gUnknown_0858C070:: @ 858C070
.incbin "baserom.gba", 0x58c070, 0x8
.4byte 0x06
.4byte gUnknown_0858C02C
.align 2
gUnknown_0858C078:: @ 858C078
.incbin "baserom.gba", 0x58c078, 0x48
.4byte 0x03
.4byte gUnknown_0858C044
.align 2
gUnknown_0858C080:: @ 858C080
obj_frame_tiles gUnknown_0858BBF8, 0x00c0
obj_frame_tiles gUnknown_0858BCB8, 0x00c0
.align 2
gSpriteAnim_858C090:: @ 858C090
.2byte 0x0000, 0x0001, 0xfffe, 0x0000
.align 2
gSpriteAnim_858C098:: @ 858C098
.2byte 0x0004, 0x0008, 0x0008, 0x0008, 0xffff, 0x0000
.align 2
gSpriteAnim_858C0A4:: @ 858C0A4
.2byte 0x0000, 0x0002, 0x0001, 0x0002, 0xfffe, 0x0000
.align 2
gSpriteAnimTable_858C0B0:: @ 858C0B0
.4byte gSpriteAnim_858C090
.align 2
gSpriteAnimTable_858C0B4:: @ 858C0B4
.4byte gSpriteAnim_858C090
.4byte gSpriteAnim_858C098
.align 2
gSpriteAnimTable_858C0BC:: @ 858C0BC
.4byte gSpriteAnim_858C0A4
.align 2
gUnknown_0858C0C0:: @ 858C0C0
.incbin "baserom.gba", 0x58c0c0, 0x18
spr_template 0x0002, 0x0004, gOamData_858BFEC, gSpriteAnimTable_858C0B0, NULL, gDummySpriteAffineAnimTable, sub_80E4084
.align 2
gUnknown_0858C0D8:: @ 858C0D8
.incbin "baserom.gba", 0x58c0d8, 0x18
spr_template 0x0003, 0x0001, gOamData_858BFFC, gSpriteAnimTable_858C0B0, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
.align 2
gUnknown_0858C0F0:: @ 858C0F0
.incbin "baserom.gba", 0x58c0f0, 0x18
spr_template 0x0004, 0x0004, gOamData_858BFEC, gSpriteAnimTable_858C0B0, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
.align 2
gUnknown_0858C108:: @ 858C108
.incbin "baserom.gba", 0x58c108, 0x18
spr_template 0x0000, 0x0006, gOamData_858BFEC, gSpriteAnimTable_858C0B0, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
.align 2
gUnknown_0858C120:: @ 858C120
.incbin "baserom.gba", 0x58c120, 0x18
spr_template 0x0001, 0x0007, gOamData_858BFEC, gSpriteAnimTable_858C0B0, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
.align 2
gUnknown_0858C138:: @ 858C138
.incbin "baserom.gba", 0x58c138, 0x18
spr_template 0x0007, 0x0005, gOamData_858BFF4, gSpriteAnimTable_858C0B4, NULL, gDummySpriteAffineAnimTable, sub_80E3B30
.align 2
gUnknown_0858C150:: @ 858C150
.incbin "baserom.gba", 0x58c150, 0x18
spr_template 0x000a, 0x0003, gOamData_858BFEC, gSpriteAnimTable_858C0B0, NULL, gDummySpriteAffineAnimTable, sub_80E3C20
.align 2
gUnknown_0858C168:: @ 858C168
.incbin "baserom.gba", 0x58c168, 0x18
spr_template 0x000b, 0x0003, gOamData_858BFEC, gSpriteAnimTable_858C0B0, NULL, gDummySpriteAffineAnimTable, sub_80E3C6C
.align 2
gUnknown_0858C180:: @ 858C180
.incbin "baserom.gba", 0x58c180, 0x18
spr_template 0xffff, 0x0000, gOamData_858BFEC, gSpriteAnimTable_858C0BC, gUnknown_0858C080, gDummySpriteAffineAnimTable, SpriteCallbackDummy
.align 2
gUnknown_0858C198:: @ 858C198
.4byte gUnknown_0862B88D
.4byte gUnknown_0862B8AE
@ -211,8 +317,30 @@ gUnknown_0858C198:: @ 858C198
.4byte gUnknown_0862B9C7
.4byte gUnknown_0862B9E0
.align 2
gUnknown_0858C1C8:: @ 858C1C8
.incbin "baserom.gba", 0x58c1c8, 0x68
obj_tiles gNamingScreenRWindow_Gfx+0x280, 0x01e0, 0x0000
obj_tiles gNamingScreenRWindow_Gfx+0x460, 0x01e0, 0x0001
obj_tiles gNamingScreenRWindow_Gfx, 0x0280, 0x0002
obj_tiles gNamingScreenKeyboardButton_Gfx+0x20, 0x0100, 0x0003
obj_tiles gNamingScreenROptions_Gfx, 0x0060, 0x0004
obj_tiles gNamingScreenROptions_Gfx+0xA0, 0x0060, 0x0005
obj_tiles gNamingScreenROptions_Gfx+0x140, 0x0060, 0x0006
obj_tiles gNamingScreenCursor_Gfx, 0x0080, 0x0007
obj_tiles gNamingScreenCursor_Gfx+0xA0, 0x0080, 0x0008
obj_tiles gNamingScreenCursor_Gfx+0x140, 0x0080, 0x0009
obj_tiles gNamingScreenRightPointingTriangleTiles, 0x0020, 0x000a
obj_tiles gNamingScreenUnderscoreTiles, 0x0020, 0x000b
null_obj_tiles
.align 2
gUnknown_0858C230:: @ 858C230
.incbin "baserom.gba", 0x58c230, 0x48
obj_pal gNamingScreenMenu_Pal, 0x0000
obj_pal gNamingScreenMenu_Pal+0x20, 0x0001
obj_pal gNamingScreenMenu_Pal+0x40, 0x0002
obj_pal gNamingScreenMenu_Pal+0x60, 0x0003
obj_pal gNamingScreenMenu_Pal+0x80, 0x0004
obj_pal gNamingScreenMenu_Pal+0xA0, 0x0005
obj_pal gNamingScreenMenu_Pal+0x80, 0x0006
obj_pal gNamingScreenMenu_Pal+0x80, 0x0007
null_obj_pal

View File

@ -3,168 +3,294 @@
.section .rodata
.align 1
gUnknown_0861500C:: @ 861500C
.incbin "baserom.gba", 0x61500c, 0x3c
.2byte 0x0005, 0x000e, 0x0019, 0x0022, 0x0026, 0x0044, 0x0045, 0x0066, 0x0076, 0x0087, 0x008a, 0x0056, 0x0099, 0x009d, 0x00a4, 0x00df
.2byte 0x00cd, 0x00f4, 0x00ad, 0x00c4, 0x00cb, 0x00bd, 0x0008, 0x00cf, 0x00d6, 0x0081, 0x006f, 0x0009, 0x0007, 0x00d2
.align 2
gUnknown_08615048:: @ 8615048
.incbin "baserom.gba", 0x615048, 0x670
.4byte 0x00000000, 0x25b4409a, 0x25b4409a, 0x25b4409a, 0x37b4e0ff, 0x37b4e0ff, 0x37b4e0ff, 0x05fdc0fd
.4byte 0x05fdc0fd, 0x05fdc0fd, 0x00000000, 0x00000000, 0x03944490, 0x00000000, 0x00000000, 0x23944092
.4byte 0x03b44090, 0x03b44090, 0x03b44090, 0x07bc48b8, 0x07bc48b8, 0x03b44090, 0x03b44090, 0x01946098
.4byte 0x01946098, 0x0fb5c8fd, 0x0fb5c8fd, 0x27b5e0fa, 0x27b5e0fa, 0x05b440b8, 0x05b440b8, 0x3dfce0fd
.4byte 0x05b440b8, 0x05b440b8, 0x3dfce0fd, 0x1df7cffd, 0x1df7cffd, 0x03944098, 0x03944098, 0x1df7ccfd
.4byte 0x1df7ccfd, 0x03944090, 0x03944090, 0x01944092, 0x01944092, 0x0194409a, 0x219440ba, 0x219440ba
.4byte 0x03944090, 0x03944090, 0x01b46098, 0x01b46098, 0x07be4498, 0x07be4498, 0x03fec0fd, 0x23fec0fd
.4byte 0x1ff6e1fd, 0x1ff6e1fd, 0x03944098, 0x03944098, 0x059c4098, 0x05fc41fd, 0x05fcc1fd, 0x19d6cdfd
.4byte 0x19d6cdfd, 0x19d6cdfd, 0x19f4e1fd, 0x19f4e1fd, 0x19f4e1fd, 0x01944092, 0x01944092, 0x0194409a
.4byte 0x019c4092, 0x019c4092, 0x15b5f1f9, 0x15b5f1f9, 0x35b5f1fd, 0x03944098, 0x03944098, 0x03be4c98
.4byte 0x23feccfd, 0x03954890, 0x03954890, 0x03b6409a, 0x03b44098, 0x03b44098, 0x019c4098, 0x019c4098
.4byte 0x19f4d088, 0x19f4d088, 0x039c5090, 0x039c5090, 0x01965480, 0x01965480, 0x19d6d5fd, 0x01b67098
.4byte 0x19d6cdfd, 0x19d6cdfd, 0x21bc409a, 0x21bc409a, 0x03955880, 0x03955880, 0x01975490, 0x01975490
.4byte 0x19bce0ff, 0x19bce0ff, 0x03b4e1fd, 0x1bf4e1fd, 0x1dffe4ff, 0x01955080, 0x01955080, 0x01bd60ba
.4byte 0x39bde0ff, 0x05bfcffd, 0x0196409a, 0x39fce0fd, 0x039c4090, 0x039c4090, 0x039c4090, 0x039c4090
.4byte 0x039e4890, 0x039e4c90, 0x19f64dfd, 0x239440b2, 0x01fec5fd, 0x1bf4c8fd, 0x19b4c0fd, 0x219460da
.4byte 0x019c4098, 0x00000000, 0x019c4898, 0x019c4498, 0x00000000, 0x03b44098, 0x03bc4098, 0x03b44898
.4byte 0x03b44098, 0x039e4c90, 0x019d6098, 0x019d60d8, 0x019d6098, 0x219d60de, 0x03946090, 0x1dffe1fd
.4byte 0x03bc4090, 0x03b44890, 0x03b44090, 0x039c4898, 0x039c4898, 0x3bfcc898, 0x1bfecdfd, 0x3fffffff
.4byte 0x01b440ba, 0x21b440ba, 0x21b440ba, 0x07b54098, 0x27b54098, 0x3fb5e0fd, 0x01fce0ff, 0x21fce0ff
.4byte 0x21fce0ff, 0x3ff5c098, 0x3ff5c098, 0x03b44490, 0x03b44490, 0x0bd5c093, 0x0bd5c093, 0x01944098
.4byte 0x01944098, 0x03944090, 0x01944890, 0x01944890, 0x07b548fd, 0x05bf4ffd, 0x05bf4cfd, 0x07b74ffd
.4byte 0x07b74ffd, 0x03964c90, 0x03964c90, 0x07944898, 0x1f94c8fd, 0x1f94c8fd, 0x01944092, 0x07fdc0dd
.4byte 0x07fdc0dd, 0x1df7f0fd, 0x05bcc1fd, 0x05944092, 0x05944092, 0x05944092, 0x3ff4cdfd, 0x01944092
.4byte 0x01944092, 0x03944490, 0x05f5c098, 0x05f5c0fd, 0x03b64498, 0x03b64498, 0x03be4c90, 0x23feccfd
.4byte 0x07964c90, 0x00000000, 0x00000000, 0x03b64c98, 0x059570b8, 0x059570b8, 0x05b76cb8, 0x239464b2
.4byte 0x05b57098, 0x1df4c9fd, 0x1df4e9fd, 0x079d4892, 0x239440b2, 0x05b56098, 0x219460fa, 0x27fec4b2
.4byte 0x3ff5c1ff, 0x3ff5e1ff, 0x05b56098, 0x05b56098, 0x05bc6098, 0x05bc6098, 0x05b57098, 0x07b44890
.4byte 0x07b448d0, 0x03bc40fd, 0x03bc4098, 0x03b460b0, 0x03b444b8, 0x03b444b8, 0x039c4098, 0x05b540b8
.4byte 0x05b560b8, 0x079e4c90, 0x03b64c98, 0x00000000, 0x03b460fc, 0x03b460fc, 0x01fec5fd, 0x1bf4c8fd
.4byte 0x19b4c0fd, 0x1dffe9fd, 0x05bdcffd, 0x03b64898, 0x03b64098, 0x03be4098, 0x01b46098, 0x01b46098
.4byte 0x31b4e8fd, 0x03be4c98, 0x03b64c90, 0x07b64592, 0x00000000, 0x00000000, 0x00000000, 0x00000000
.4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000
.4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000
.4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x2bb4c0ff, 0x2bb4c0ff, 0x2bb4c0ff
.4byte 0x03b460ff, 0x3bb4e0ff, 0x3bb4e0ff, 0x05bd4098, 0x05fde0fd, 0x05fde0fd, 0x01b640b8, 0x01b640b8
.4byte 0x27bd4898, 0x27bd4898, 0x00000000, 0x00000000, 0x03944090, 0x00000000, 0x03944090, 0x019c409a
.4byte 0x19fcc09a, 0x19fcc1ff, 0x0595509a, 0x27b7509e, 0x27b7509e, 0x21b44090, 0x23b44092, 0x21b44490
.4byte 0x03b440b0, 0x03b440b0, 0x0194409a, 0x29b4c0ff, 0x1fffe5fd, 0x03bc4090, 0x03bc4090, 0x039e4090
.4byte 0x039e4090, 0x059d4098, 0x059d4098, 0x07bf4c98, 0x07bf4c98, 0x3fffe9fd, 0x01b67490, 0x01b67490
.4byte 0x1df5f898, 0x01b47098, 0x39f6c5fd, 0x01bc4090, 0x01bc6090, 0x039e4090, 0x21bc40ba, 0x23bc40ba
.4byte 0x039c4090, 0x03be4098, 0x23bc4090, 0x23bc4090, 0x01b46098, 0x03b46098, 0x33b46098, 0x19f4e1fd
.4byte 0x19f4e1fd, 0x03b44898, 0x03b44898, 0x05b56098, 0x05b57098, 0x05bd6098, 0x05bd6098, 0x05bd6098
.4byte 0x29b4c0fb, 0x29b4c0ff, 0x019c4098, 0x059d5098, 0x07977498, 0x07977498, 0x07bd4098, 0x039e4498
.4byte 0x1bfec4fd, 0x0fb5c9fd, 0x0fb5c9fd, 0x09fee0ff, 0x1bf6c5fd, 0x1bf6e5fd, 0x03b64498, 0x03b64498
.4byte 0x00000000, 0x019e4498, 0x19fee5fd, 0x23b6409a, 0x39fce0fd, 0x39fce0fd, 0x39fce0fd, 0x1df5d4b8
.4byte 0x1df5d4b8, 0x21b4409a, 0x1dffc0fd, 0x1dffe0fd, 0x1dffe0fd, 0x019c4098, 0x03bc4098, 0x03bc4098
.4byte 0x23be6cba, 0x019e4c98, 0x01be4d98, 0x23b44098, 0x3ffde8ff, 0x01be6098, 0x25b56098, 0x25b56098
.4byte 0x3dfde8fd, 0x079e4898, 0x0bf6c9fd, 0x0bf6c9fd, 0x01b66098, 0x01b66098, 0x21b4609a, 0x21b460da
.4byte 0x1dfe4c98, 0x1dfe4c98, 0x1dfe4c98, 0x21b46098, 0x25b56098, 0x27b56098, 0x00000000, 0x2ffff098
.4byte 0x2ffff098, 0x1df7f8fd, 0x0dfff8fd, 0x0df7f8fd, 0x07be6898, 0x3fb7e8ff, 0x23be6898, 0x23be4c98
.4byte 0x23be4c98, 0x1ffecd98, 0x1bfeecfd, 0x059f4490
.align 2
gUnknown_086156B8:: @ 86156B8
.incbin "baserom.gba", 0x6156b8, 0x2c
.4byte 0x000011f0, 0x000021e1, 0x000003c2
.align 2
gUnknown_086156C4:: @ 86156C4
.4byte sub_81B2658, 0x0d280b18, 0x08201420, 0x08081440, 0x08182526, 0x08182535, 0x03302318, 0x1040220c
.align 2
gUnknown_086156E4:: @ 86156E4
.incbin "baserom.gba", 0x6156e4, 0x20
.4byte sub_81B26BC, 0x0d280316, 0x08200c1e, 0x08080c3e, 0x08180c66, 0x08180c75, 0x03300a58, 0x1040044d
.align 2
gUnknown_08615704:: @ 8615704
.incbin "baserom.gba", 0x615704, 0xc0
.4byte 0x32142810, 0x22103432, 0x1c6c1268, 0x19661b88, 0x346c2a68, 0x31663388, 0x4c6c4268, 0x49664b88
.4byte 0x646c5a68, 0x61666388, 0x7c6c7268, 0x79667b88, 0x22141810, 0x12102432, 0x5a145010, 0x4a105c32
.4byte 0x1c6c1268, 0x19661b88, 0x3c6c3268, 0x39663b88, 0x5c6c5268, 0x59665b88, 0x7c6c7268, 0x79667b88
.4byte 0x22141810, 0x12102432, 0x5a145010, 0x4a105c32, 0x246a1a68, 0x21662388, 0x3c6a3268, 0x39663b88
.4byte 0x5c6a5268, 0x59665b88, 0x746a6a68, 0x71667388, 0x2a142010, 0x1a102c32, 0x2c6a2268, 0x29662b88
.4byte 0x446a3a68, 0x41664388, 0x72146810, 0x62107432, 0x746a6a68, 0x71667388, 0x8c6a8268, 0x89668b88
.align 1
gUnknown_086157C4:: @ 86157C4
.incbin "baserom.gba", 0x6157c4, 0x1c
.incbin "graphics/interface/unknown_6157C4.bin"
.align 1
gUnknown_086157E0:: @ 86157E0
.incbin "baserom.gba", 0x6157e0, 0x1c
.incbin "graphics/interface/unknown_6157E0.bin"
gUnknown_086157FC:: @ 86157FC
.incbin "baserom.gba", 0x6157fc, 0x14
.byte 0x00, 0x03, 0x02, 0x00
gUnknown_08615800:: @ 8615800
.byte 0x01, 0x06, 0x00, 0x0b, 0x0c, 0x01, 0x02, 0x03, 0x01, 0x08, 0x09, 0x00, 0x01, 0x02, 0x00, 0x00
.align 2
gUnknown_08615810:: @ 8615810
.incbin "baserom.gba", 0x615810, 0x40
window_template 0x00, 0x01, 0x03, 0x0a, 0x07, 0x03, 0x0063
window_template 0x00, 0x0c, 0x01, 0x12, 0x03, 0x04, 0x00a9
window_template 0x00, 0x0c, 0x04, 0x12, 0x03, 0x05, 0x00df
window_template 0x00, 0x0c, 0x07, 0x12, 0x03, 0x06, 0x0115
window_template 0x00, 0x0c, 0x0a, 0x12, 0x03, 0x07, 0x014b
window_template 0x00, 0x0c, 0x0d, 0x12, 0x03, 0x08, 0x0181
window_template 0x02, 0x01, 0x0f, 0x1c, 0x04, 0x0e, 0x01df
null_window_template
.align 2
gUnknown_08615850:: @ 8615850
.incbin "baserom.gba", 0x615850, 0x40
window_template 0x00, 0x01, 0x01, 0x0a, 0x07, 0x03, 0x0063
window_template 0x00, 0x01, 0x08, 0x0a, 0x07, 0x04, 0x00a9
window_template 0x00, 0x0c, 0x01, 0x12, 0x03, 0x05, 0x00ef
window_template 0x00, 0x0c, 0x05, 0x12, 0x03, 0x06, 0x0125
window_template 0x00, 0x0c, 0x09, 0x12, 0x03, 0x07, 0x015b
window_template 0x00, 0x0c, 0x0d, 0x12, 0x03, 0x08, 0x0191
window_template 0x02, 0x01, 0x0f, 0x1c, 0x04, 0x0e, 0x01df
null_window_template
.align 2
gUnknown_08615890:: @ 8615890
.incbin "baserom.gba", 0x615890, 0x40
window_template 0x00, 0x01, 0x01, 0x0a, 0x07, 0x03, 0x0063
window_template 0x00, 0x01, 0x08, 0x0a, 0x07, 0x04, 0x00a9
window_template 0x00, 0x0c, 0x02, 0x12, 0x03, 0x05, 0x00ef
window_template 0x00, 0x0c, 0x05, 0x12, 0x03, 0x06, 0x0125
window_template 0x00, 0x0c, 0x09, 0x12, 0x03, 0x07, 0x015b
window_template 0x00, 0x0c, 0x0c, 0x12, 0x03, 0x08, 0x0191
window_template 0x02, 0x01, 0x0f, 0x1c, 0x04, 0x0e, 0x01df
null_window_template
.align 2
gUnknown_086158D0:: @ 86158D0
.incbin "baserom.gba", 0x6158d0, 0x38
window_template 0x00, 0x01, 0x02, 0x0a, 0x07, 0x03, 0x0063
window_template 0x00, 0x0c, 0x03, 0x12, 0x03, 0x05, 0x00a9
window_template 0x00, 0x0c, 0x06, 0x12, 0x03, 0x06, 0x00df
window_template 0x02, 0x01, 0x0b, 0x0a, 0x07, 0x04, 0x0115
window_template 0x02, 0x0c, 0x0c, 0x12, 0x03, 0x07, 0x016b
window_template 0x02, 0x0c, 0x0f, 0x12, 0x03, 0x08, 0x01a1
null_window_template
.align 2
gUnknown_08615908:: @ 8615908
.incbin "baserom.gba", 0x615908, 0x8
window_template 0x00, 0x18, 0x11, 0x06, 0x02, 0x03, 0x01c7
.align 2
gUnknown_08615910:: @ 8615910
.incbin "baserom.gba", 0x615910, 0x8
window_template 0x00, 0x18, 0x12, 0x06, 0x02, 0x03, 0x01c7
.align 2
gUnknown_08615918:: @ 8615918
.incbin "baserom.gba", 0x615918, 0x8
window_template 0x00, 0x18, 0x10, 0x06, 0x02, 0x03, 0x01d3
.align 2
gUnknown_08615920:: @ 8615920
.incbin "baserom.gba", 0x615920, 0x8
window_template 0x02, 0x01, 0x11, 0x15, 0x02, 0x0f, 0x024f
.align 2
gUnknown_08615928:: @ 8615928
.incbin "baserom.gba", 0x615928, 0x8
window_template 0x02, 0x01, 0x11, 0x10, 0x02, 0x0f, 0x0279
.align 2
gUnknown_08615930:: @ 8615930
.incbin "baserom.gba", 0x615930, 0x8
window_template 0x02, 0x01, 0x11, 0x14, 0x02, 0x0f, 0x0299
.align 2
gUnknown_08615938:: @ 8615938
.incbin "baserom.gba", 0x615938, 0x8
window_template 0x02, 0x01, 0x11, 0x12, 0x02, 0x0f, 0x0299
.align 2
gUnknown_08615940:: @ 8615940
.incbin "baserom.gba", 0x615940, 0x8
window_template 0x02, 0x01, 0x11, 0x10, 0x02, 0x0f, 0x0299
.align 2
gUnknown_08615948:: @ 8615948
.incbin "baserom.gba", 0x615948, 0x8
window_template 0x02, 0x01, 0x0f, 0x14, 0x04, 0x0f, 0x0299
.align 2
gUnknown_08615950:: @ 8615950
.incbin "baserom.gba", 0x615950, 0x8
window_template 0x02, 0x17, 0x0d, 0x06, 0x06, 0x0e, 0x039d
.align 2
gUnknown_08615958:: @ 8615958
.incbin "baserom.gba", 0x615958, 0x8
window_template 0x02, 0x15, 0x0d, 0x08, 0x06, 0x0e, 0x039d
.align 2
gUnknown_08615960:: @ 8615960
.incbin "baserom.gba", 0x615960, 0x8
window_template 0x02, 0x13, 0x0b, 0x0a, 0x08, 0x0e, 0x02e9
.align 2
gUnknown_08615968:: @ 8615968
.incbin "baserom.gba", 0x615968, 0x8
window_template 0x02, 0x15, 0x09, 0x05, 0x04, 0x0e, 0x02e9
.align 2
gUnknown_08615970:: @ 8615970
.incbin "baserom.gba", 0x615970, 0x18
window_template 0x02, 0x13, 0x01, 0x0a, 0x0b, 0x0e, 0x02e9
window_template 0x02, 0x02, 0x0f, 0x1b, 0x04, 0x0e, 0x01df
window_template 0x02, 0x00, 0x0d, 0x12, 0x03, 0x0c, 0x039d
gUnknown_08615988:: @ 8615988
.incbin "baserom.gba", 0x615988, 0x46
.byte 0x18, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x1a, 0x20, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x22, 0x20, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x22, 0x20, 0x21
.byte 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x22, 0x28, 0x3b, 0x3c, 0x3a, 0x3a, 0x3a, 0x3a, 0x3a, 0x3a, 0x3d, 0x0f, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x11, 0x2e, 0x2f, 0x2f, 0x2f
.byte 0x2f, 0x2f, 0x2f, 0x2f, 0x2f, 0x30
gUnknown_086159CE:: @ 86159CE
.incbin "baserom.gba", 0x6159ce, 0x46
.byte 0x18, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x1a, 0x20, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x22, 0x20, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x22, 0x20, 0x21
.byte 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x22, 0x28, 0x29, 0x29, 0x29, 0x29, 0x29, 0x29, 0x29, 0x29, 0x2a, 0x0f, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x11, 0x2e, 0x2f, 0x2f, 0x2f
.byte 0x2f, 0x2f, 0x2f, 0x2f, 0x2f, 0x30
gUnknown_08615A14:: @ 8615A14
.incbin "baserom.gba", 0x615a14, 0x36
.byte 0x2b, 0x2c, 0x2c, 0x2c, 0x2c, 0x2c, 0x2c, 0x2c, 0x2c, 0x2c, 0x2c, 0x2c, 0x2c, 0x2c, 0x2c, 0x2c, 0x2c, 0x2d, 0x31, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x34, 0x35, 0x33, 0x33, 0x33
.byte 0x33, 0x33, 0x33, 0x36, 0x37, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x39
gUnknown_08615A4A:: @ 8615A4A
.incbin "baserom.gba", 0x615a4a, 0x36
.byte 0x2b, 0x2c, 0x2c, 0x2c, 0x2c, 0x2c, 0x2c, 0x2c, 0x2c, 0x2c, 0x2c, 0x2c, 0x2c, 0x2c, 0x2c, 0x2c, 0x2c, 0x2d, 0x31, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21
.byte 0x21, 0x21, 0x21, 0x32, 0x37, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x39
gUnknown_08615A80:: @ 8615A80
.incbin "baserom.gba", 0x615a80, 0x36
.byte 0x15, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x17, 0x1e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x1f, 0x25, 0x26, 0x26, 0x26, 0x26, 0x26, 0x26, 0x26, 0x26, 0x26, 0x26, 0x26, 0x26, 0x26, 0x26, 0x26, 0x26, 0x27
gUnknown_08615AB6:: @ 8615AB6
.incbin "baserom.gba", 0x615ab6, 0x2
.byte 0x0b, 0x0c
gUnknown_08615AB8:: @ 8615AB8
.incbin "baserom.gba", 0x615ab8, 0x2
.byte 0x09, 0x0a
gUnknown_08615ABA:: @ 8615ABA
.incbin "baserom.gba", 0x615aba, 0x3
.byte 0x04, 0x05, 0x06
gUnknown_08615ABD:: @ 8615ABD
.incbin "baserom.gba", 0x615abd, 0x3
.byte 0x01, 0x07, 0x08
gUnknown_08615AC0:: @ 8615AC0
.incbin "baserom.gba", 0x615ac0, 0x3
.byte 0x01, 0x0b, 0x0c
gUnknown_08615AC3:: @ 8615AC3
.incbin "baserom.gba", 0x615ac3, 0x2
.byte 0x3b, 0x3c
gUnknown_08615AC5:: @ 8615AC5
.incbin "baserom.gba", 0x615ac5, 0x2
.byte 0x4b, 0x4c
gUnknown_08615AC7:: @ 8615AC7
.incbin "baserom.gba", 0x615ac7, 0x2
.byte 0x39, 0x3a
gUnknown_08615AC9:: @ 8615AC9
.incbin "baserom.gba", 0x615ac9, 0x2
.byte 0x49, 0x4a
gUnknown_08615ACB:: @ 8615ACB
.incbin "baserom.gba", 0x615acb, 0x2
.byte 0x59, 0x5a
gUnknown_08615ACD:: @ 8615ACD
.incbin "baserom.gba", 0x615acd, 0x3
.byte 0x34, 0x35, 0x36
gUnknown_08615AD0:: @ 8615AD0
.incbin "baserom.gba", 0x615ad0, 0x3
.byte 0x44, 0x45, 0x46
gUnknown_08615AD3:: @ 8615AD3
.incbin "baserom.gba", 0x615ad3, 0x3
.byte 0x54, 0x55, 0x56
gUnknown_08615AD6:: @ 8615AD6
.incbin "baserom.gba", 0x615ad6, 0x3
.byte 0x74, 0x75, 0x76
gUnknown_08615AD9:: @ 8615AD9
.incbin "baserom.gba", 0x615ad9, 0x3
.byte 0x84, 0x85, 0x86
gUnknown_08615ADC:: @ 8615ADC
.incbin "baserom.gba", 0x615adc, 0x3
.byte 0x94, 0x95, 0x96
gUnknown_08615ADF:: @ 8615ADF
.incbin "baserom.gba", 0x615adf, 0x3
.byte 0x64, 0x65, 0x66
gUnknown_08615AE2:: @ 8615AE2
.incbin "baserom.gba", 0x615ae2, 0x3
.byte 0x31, 0x37, 0x38
gUnknown_08615AE5:: @ 8615AE5
.incbin "baserom.gba", 0x615ae5, 0x3
.byte 0x41, 0x47, 0x48
gUnknown_08615AE8:: @ 8615AE8
.incbin "baserom.gba", 0x615ae8, 0x3
.byte 0x51, 0x57, 0x58
gUnknown_08615AEB:: @ 8615AEB
.incbin "baserom.gba", 0x615aeb, 0x3
.byte 0x61, 0x67, 0x68
gUnknown_08615AEE:: @ 8615AEE
.incbin "baserom.gba", 0x615aee, 0x3
.byte 0xa1, 0xa7, 0xa8
gUnknown_08615AF1:: @ 8615AF1
.incbin "baserom.gba", 0x615af1, 0x3
.byte 0x11, 0x1b, 0x1c
.align 2
gUnknown_08615AF4:: @ 8615AF4
.4byte gUnknown_085E9E43
.4byte gUnknown_085EA010
@ -209,68 +335,315 @@ gUnknown_08615B60:: @ 8615B60
.4byte gUnknown_085EA0D7
.4byte gUnknown_085EA0DC
.align 1
gUnknown_08615B94:: @ 8615B94
.incbin "baserom.gba", 0x615b94, 0x74
.2byte 0x0108, 0x0151, 0x0160, 0x015b, 0x002e, 0x005c, 0x0102, 0x0153, 0x014b, 0x00ed, 0x00f1, 0x010d, 0x003a, 0x003b, 0x003f, 0x0071
.2byte 0x00b6, 0x00f0, 0x00ca, 0x00db, 0x00da, 0x004c, 0x00e7, 0x0055, 0x0057, 0x0059, 0x00d8, 0x005b, 0x005e, 0x00f7, 0x0118, 0x0068
.2byte 0x0073, 0x015f, 0x0035, 0x00bc, 0x00c9, 0x007e, 0x013d, 0x014c, 0x0103, 0x0107, 0x0122, 0x009c, 0x00d5, 0x00a8, 0x00d3, 0x011d
.2byte 0x0121, 0x013b, 0x000f, 0x0013, 0x0039, 0x0046, 0x0094, 0x00f9, 0x007f, 0x0123
.align 2
gUnknown_08615C08:: @ 8615C08
.incbin "baserom.gba", 0x615c08, 0x130
.4byte gText_Summary5, sub_81B37FC
.4byte gText_Switch2, brm_switch
.4byte gText_Cancel2, brm_cancel_1
.4byte gText_Item, sub_81B4134
.4byte gMenuText_Give, sub_81B4198
.4byte gText_Take, sub_81B4724
.4byte gText_Mail, sub_81B4A08
.4byte gText_Take2, brm_take_2
.4byte gText_Read2, sub_81B4A6C
.4byte gText_Cancel2, sub_81B4D78
.4byte gText_Shift, brm_shift_sendout
.4byte gText_SendOut, brm_shift_sendout
.4byte gText_Enter, sub_81B4E8C
.4byte gText_NoEntry, sub_81B4FA8
.4byte gText_Store, sub_81B50AC
.4byte gText_Register, sub_81B50C8
.4byte gText_Trade4, brm_trade_1
.4byte gText_Trade4, sub_81B52E4
.4byte gMenuText_Toss, sub_81B47E0
.4byte gMoveNames+195, sub_81B5470
.4byte gMoveNames+1924, sub_81B5470
.4byte gMoveNames+3237, sub_81B5470
.4byte gMoveNames+910, sub_81B5470
.4byte gMoveNames+741, sub_81B5470
.4byte gMoveNames+247, sub_81B5470
.4byte gMoveNames+3783, sub_81B5470
.4byte gMoveNames+1651, sub_81B5470
.4byte gMoveNames+1300, sub_81B5470
.4byte gMoveNames+1183, sub_81B5470
.4byte gMoveNames+3770, sub_81B5470
.4byte gMoveNames+2704, sub_81B5470
.4byte gMoveNames+1755, sub_81B5470
.4byte gMoveNames+2990, sub_81B5470
gUnknown_08615D10:: @ 8615D10
.byte 0x00, 0x01, 0x02
gUnknown_08615D13:: @ 8615D13
.byte 0x0a, 0x00, 0x02
gUnknown_08615D16:: @ 8615D16
.byte 0x0b, 0x00, 0x02
gUnknown_08615D19:: @ 8615D19
.byte 0x00, 0x02
gUnknown_08615D1B:: @ 8615D1B
.byte 0x0c, 0x00, 0x02
gUnknown_08615D1E:: @ 8615D1E
.byte 0x0d, 0x00, 0x02
gUnknown_08615D21:: @ 8615D21
.byte 0x0e, 0x00, 0x02
gUnknown_08615D24:: @ 8615D24
.byte 0x04, 0x05, 0x09
gUnknown_08615D27:: @ 8615D27
.byte 0x08, 0x07, 0x09
gUnknown_08615D2A:: @ 8615D2A
.byte 0x0f, 0x00, 0x02
gUnknown_08615D2D:: @ 8615D2D
.byte 0x10, 0x00, 0x02
gUnknown_08615D30:: @ 8615D30
.byte 0x11, 0x00, 0x02
gUnknown_08615D33:: @ 8615D33
.byte 0x05, 0x12, 0x02
.align 2
gUnknown_08615D38:: @ 8615D38
.incbin "baserom.gba", 0x615d38, 0x38
.4byte NULL, gUnknown_08615D10, gUnknown_08615D13, gUnknown_08615D16, gUnknown_08615D1B, gUnknown_08615D1E, gUnknown_08615D21, gUnknown_08615D19
.4byte gUnknown_08615D24, gUnknown_08615D27, gUnknown_08615D2A, gUnknown_08615D2D, gUnknown_08615D30, gUnknown_08615D33
gUnknown_08615D70:: @ 8615D70
.incbin "baserom.gba", 0x615d70, 0xe
.byte 0x00, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x02, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03
.align 1
gUnknown_08615D7E:: @ 8615D7E
.incbin "baserom.gba", 0x615d7e, 0x1e
.2byte 0x000f, 0x0094, 0x00f9, 0x0046, 0x0039, 0x0013, 0x0123, 0x007f, 0x0064, 0x005b, 0x0122, 0x00d0, 0x0087, 0x00e6, 0x000e
.align 2
gUnknown_08615D9C:: @ 8615D9C
.incbin "baserom.gba", 0x615d9c, 0x70
.4byte sub_80D3718, 0x00000007
.4byte SetUpFieldMove_Flash, 0x0000000d
.4byte sub_8135654, 0x0000000d
.4byte hm_prepare_rocksmash, 0x0000000d
.4byte sub_81B5820, 0x00000008
.4byte sub_81B5884, 0x0000000d
.4byte sub_81B5974, 0x0000000d
.4byte hm_prepare_waterfall, 0x0000000d
.4byte SetUpFieldMove_Teleport, 0x0000000d
.4byte sub_813572C, 0x0000000d
.4byte sub_80FA004, 0x0000000d
.4byte hm_prepare_dive_probably, 0x00000010
.4byte hm_prepare_dive_probably, 0x00000010
.4byte SetUpFieldMove_SweetScent, 0x0000000d
.align 2
gUnknown_08615E0C:: @ 8615E0C
.incbin "baserom.gba", 0x615e0c, 0x24
.4byte gText_NotPkmnOtherTrainerWants
.4byte gText_ThatIsntAnEgg
.4byte gText_PkmnCantBeTradedNow
.4byte gText_PkmnCantBeTradedNow
.4byte gText_OtherTrainersPkmnCantBeTraded
.4byte gText_EggCantBeTradedNow
.4byte gText_OtherTrainerCantAcceptPkmn
.4byte gText_CantTradeWithTrainer
.4byte gText_CantTradeWithTrainer
.align 2
gUnknown_08615E30:: @ 8615E30
.incbin "baserom.gba", 0x615e30, 0x40
.incbin "graphics/interface/hold_icons.4bpp"
.align 2
gUnknown_08615E70:: @ 8615E70
.incbin "baserom.gba", 0x615e70, 0x40
.incbin "graphics/interface/hold_icons.gbapal"
.align 2
gOamData_8615E90:: @ 8615E90
.2byte 0x0000, 0x0000, 0x0400, 0x0000
.align 2
gSpriteAnim_8615E98:: @ 8615E98
.2byte 0x0000, 0x0001, 0xffff, 0x0000
.align 2
gSpriteAnim_8615EA0:: @ 8615EA0
.2byte 0x0001, 0x0001, 0xffff, 0x0000
.align 2
gSpriteAnimTable_8615EA8:: @ 8615EA8
.4byte gSpriteAnim_8615E98
.4byte gSpriteAnim_8615EA0
.align 2
gUnknown_08615EB0:: @ 8615EB0
obj_tiles gUnknown_08615E30, 0x40, 55120
.align 2
gUnknown_08615EB8:: @ 8615EB8
obj_pal gUnknown_08615E70, 55120
gUnknown_08615EC0:: @ 8615EC0
.incbin "baserom.gba", 0x615ec0, 0x38
.align 2
gSpriteTemplate_8615EC0:: @ 8615EC0
spr_template 0xd750, 0xd750, gOamData_8615E90, gSpriteAnimTable_8615EA8, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
.align 2
gOamData_8615ED8:: @ 8615ED8
.2byte 0x0000, 0x8000, 0x0400, 0x0000
.align 2
gSpriteAnim_8615EE0:: @ 8615EE0
.2byte 0x0000, 0x0000, 0xffff, 0x0000
.align 2
gSpriteAnim_8615EE8:: @ 8615EE8
.2byte 0x0010, 0x0000, 0xffff, 0x0000
.align 2
gSpriteAnimTable_8615EF0:: @ 8615EF0
.4byte gSpriteAnim_8615EE0
.4byte gSpriteAnim_8615EE8
.align 2
gUnknown_08615EF8:: @ 8615EF8
obj_tiles gPartyMenuPokeball_Gfx, 0x400, 1200
.align 2
gUnknown_08615F00:: @ 8615F00
obj_pal gPartyMenuPokeball_Pal, 1200
gUnknown_08615F08:: @ 8615F08
.incbin "baserom.gba", 0x615f08, 0x68
.align 2
gSpriteTemplate_8615F08:: @ 8615F08
spr_template 0x04b0, 0x04b0, gOamData_8615ED8, gSpriteAnimTable_8615EF0, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
.align 2
gOamData_8615F20:: @ 8615F20
.2byte 0x0000, 0x4000, 0x0800, 0x0000
.align 2
gSpriteAnim_8615F28:: @ 8615F28
.2byte 0x0000, 0x0000, 0xffff, 0x0000
.align 2
gSpriteAnim_8615F30:: @ 8615F30
.2byte 0x0004, 0x0000, 0xffff, 0x0000
.align 2
gSpriteAnim_8615F38:: @ 8615F38
.2byte 0x0008, 0x0000, 0xffff, 0x0000
.align 2
gSpriteAnim_8615F40:: @ 8615F40
.2byte 0x000c, 0x0000, 0xffff, 0x0000
.align 2
gSpriteAnim_8615F48:: @ 8615F48
.2byte 0x0010, 0x0000, 0xffff, 0x0000
.align 2
gSpriteAnim_8615F50:: @ 8615F50
.2byte 0x0014, 0x0000, 0xffff, 0x0000
.align 2
gSpriteAnimTable_8615F58:: @ 8615F58
.4byte gSpriteAnim_8615F28
.4byte gSpriteAnim_8615F30
.4byte gSpriteAnim_8615F38
.4byte gSpriteAnim_8615F40
.4byte gSpriteAnim_8615F48
.4byte gSpriteAnim_8615F50
.align 2
gUnknown_08615F70:: @ 8615F70
.incbin "baserom.gba", 0x615f70, 0x8
obj_tiles gPartyMenuPokeballSmall_Gfx, 0x0300, 0x04b1
gUnknown_08615F78:: @ 8615F78
.incbin "baserom.gba", 0x615f78, 0x80
.align 2
gSpriteTemplate_8615F78:: @ 8615F78
spr_template 0x04b1, 0x04b0, gOamData_8615F20, gSpriteAnimTable_8615F58, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
.align 2
gOamData_8615F90:: @ 8615F90
.2byte 0x4000, 0x4000, 0x0400, 0x0000
.align 2
gSpriteAnim_8615F98:: @ 8615F98
.2byte 0x0000, 0x0000, 0xffff, 0x0000
.align 2
gSpriteAnim_8615FA0:: @ 8615FA0
.2byte 0x0004, 0x0000, 0xffff, 0x0000
.align 2
gSpriteAnim_8615FA8:: @ 8615FA8
.2byte 0x0008, 0x0000, 0xffff, 0x0000
.align 2
gSpriteAnim_8615FB0:: @ 8615FB0
.2byte 0x000c, 0x0000, 0xffff, 0x0000
.align 2
gSpriteAnim_8615FB8:: @ 8615FB8
.2byte 0x0010, 0x0000, 0xffff, 0x0000
.align 2
gSpriteAnim_8615FC0:: @ 8615FC0
.2byte 0x0014, 0x0000, 0xffff, 0x0000
.align 2
gSpriteAnim_8615FC8:: @ 8615FC8
.2byte 0x0018, 0x0000, 0xffff, 0x0000
.align 2
gSpriteAnim_8615FD0:: @ 8615FD0
.2byte 0x001c, 0x0000, 0xffff, 0x0000
.align 2
gSpriteAnimTable_8615FD8:: @ 8615FD8
.4byte gSpriteAnim_8615F98
.4byte gSpriteAnim_8615FA0
.4byte gSpriteAnim_8615FA8
.4byte gSpriteAnim_8615FB0
.4byte gSpriteAnim_8615FB8
.4byte gSpriteAnim_8615FC0
.4byte gSpriteAnim_8615FC8
.4byte gSpriteAnim_8615FD0
.align 2
gUnknown_08615FF8:: @ 8615FF8
obj_tiles gStatusGfx_Icons, 0x400, 1202
.align 2
gUnknown_08616000:: @ 8616000
obj_pal gStatusPal_Icons, 1202
gUnknown_08616008:: @ 8616008
.incbin "baserom.gba", 0x616008, 0x18
.align 2
gSpriteTemplate_8616008:: @ 8616008
spr_template 0x04b2, 0x04b2, gOamData_8615F90, gSpriteAnimTable_8615FD8, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
gUnknown_08616020:: @ 8616020
.incbin "baserom.gba", 0x616020, 0x20
.byte 0x00, 0x01, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00
.align 2
gUnknown_08616028:: @ 8616028
.4byte gText_HP4
.4byte gText_Attack3
.4byte gText_Defense3
.4byte gText_SpAtk4
.4byte gText_SpDef4
.4byte gText_Speed2
.align 1
gUnknown_08616040:: @ 8616040
.incbin "baserom.gba", 0x616040, 0x74
.2byte 0x0108, 0x0151, 0x0160, 0x015b, 0x002e, 0x005c, 0x0102, 0x0153, 0x014b, 0x00ed, 0x00f1, 0x010d, 0x003a, 0x003b, 0x003f, 0x0071
.2byte 0x00b6, 0x00f0, 0x00ca, 0x00db, 0x00da, 0x004c, 0x00e7, 0x0055, 0x0057, 0x0059, 0x00d8, 0x005b, 0x005e, 0x00f7, 0x0118, 0x0068
.2byte 0x0073, 0x015f, 0x0035, 0x00bc, 0x00c9, 0x007e, 0x013d, 0x014c, 0x0103, 0x0107, 0x0122, 0x009c, 0x00d5, 0x00a8, 0x00d3, 0x011d
.2byte 0x0121, 0x013b, 0x000f, 0x0013, 0x0039, 0x0046, 0x0094, 0x00f9, 0x007f, 0x0123

View File

@ -23,16 +23,15 @@
.endm
gUnknown_0855D2B8:: @ 855D2B8
.incbin "baserom.gba", 0x55d2b8, 0x6
.string "{UNK_CTRL_F9 8}000$"
gUnknown_0855D2BE:: @ 855D2BE
.incbin "baserom.gba", 0x55d2be, 0x40
.incbin "graphics/pokedex/caught_ball.4bpp"
sText_TenDashes:: @ 855D2FE
.string "----------$"
.align 2
.align 2
gUnknown_0855D30C:: @ 855D30C
.string "$"
@ -42,29 +41,41 @@ gUnknown_0855D30C:: @ 855D30C
@ 856B5B0
.include "data/pokedex_entries.inc"
.align 2
gUnknown_0856E610:: @ 856E610
.incbin "baserom.gba", 0x56e610, 0x20
.incbin "graphics/pokedex/black.gbapal"
.align 2
gUnknown_0856E630:: @ 856E630
.incbin "baserom.gba", 0x56e630, 0x10
.4byte 0x000030c8, 0x000000d1, 0x000010ea, 0x000020f3
.align 2
gUnknown_0856E640:: @ 856E640
.incbin "baserom.gba", 0x56e640, 0x28
window_template 0x02, 0x00, 0x00, 0x20, 0x14, 0x00, 0x0001
window_template 0x02, 0x19, 0x08, 0x02, 0x02, 0x0f, 0x0281
window_template 0x00, 0x00, 0x0c, 0x20, 0x07, 0x08, 0x0285
window_template 0x02, 0x12, 0x03, 0x0a, 0x08, 0x09, 0x0365
window_template 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0000
.align 2
gUnknown_0856E668:: @ 856E668
.incbin "baserom.gba", 0x56e668, 0x8
.4byte 0x000020ea, 0x000030f7
.align 2
gUnknown_0856E670:: @ 856E670
.incbin "baserom.gba", 0x56e670, 0x18
window_template 0x02, 0x00, 0x00, 0x20, 0x14, 0x00, 0x0001
window_template 0x02, 0x19, 0x08, 0x02, 0x02, 0x0f, 0x0281
window_template 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0000
gUnknown_0856E688:: @ 856E688
.incbin "baserom.gba", 0x56e688, 0xc
sText_TenDashes2:: @ 856E688
.string "----------$"
@ 856E694
.include "data/graphics/pokemon/footprint_table.inc"
gUnknown_0856ED08:: @ 856ED08
.incbin "baserom.gba", 0x56ed08, 0x28
.byte 0x00, 0x00, 0x00, 0x00, 0xbb, 0x03, 0xd5, 0x03, 0xbe, 0x03, 0xd8, 0x03, 0xc1, 0x03, 0xdb, 0x03, 0xc4, 0x03, 0xde, 0x03, 0xc7, 0x03, 0xe1, 0x03, 0xca, 0x03, 0xe4, 0x03, 0xcd, 0x03, 0xe7, 0x03
.byte 0xd0, 0x03, 0xea, 0x03, 0xd3, 0x02, 0xed, 0x02
gUnknown_0856ED30:: @ 856ED30
unk_dex_struct_3 gUnknown_085E87A5, 0, 0, 5
@ -80,18 +91,23 @@ gUnknown_0856ED48:: @ 856ED48
unk_dex_struct_2 gUnknown_085E8806, 0, 10, 5, 5, 10, 12
unk_dex_struct_2 gUnknown_085E88C8, 0, 12, 5, 0, 0, 0
.align 1
gUnknown_0856ED9C:: @ 856ED9C
.incbin "baserom.gba", 0x56ed9c, 0x1c
.2byte 0xffff, 0x01ff, 0xffff, 0x0200, 0x03ff, 0x0401, 0xff02, 0x0401, 0xffff, 0x0502, 0xffff, 0x0604, 0xffff, 0xff05
.align 1
gUnknown_0856EDB8:: @ 856EDB8
.incbin "baserom.gba", 0x56edb8, 0x1c
.2byte 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0x05ff, 0xffff, 0x0604, 0xffff, 0xff05
.align 1
gUnknown_0856EDD4:: @ 856EDD4
.incbin "baserom.gba", 0x56edd4, 0x1c
.2byte 0xffff, 0x01ff, 0xffff, 0x0200, 0x03ff, 0x0401, 0xff02, 0x0401, 0xffff, 0x0602, 0xffff, 0xffff, 0xffff, 0xff04
.align 1
gUnknown_0856EDF0:: @ 856EDF0
.incbin "baserom.gba", 0x56edf0, 0x1c
.2byte 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0x06ff, 0xffff, 0xffff, 0xffff, 0xff04
.align 2
gUnknown_0856EE0C:: @ 856EE0C
.4byte gUnknown_085E89A4
.4byte gUnknown_085E88DF
@ -100,6 +116,7 @@ gUnknown_0856EE0C:: @ 856EE0C
.4byte NULL
.4byte NULL
.align 2
gUnknown_0856EE24:: @ 856EE24
.4byte gUnknown_085E89D4
.4byte gUnknown_085E88F6
@ -208,14 +225,15 @@ gUnknown_0856EF14:: @ 856EF14
.4byte 0
gUnknown_0856EFAC:: @ 856EFAC
.incbin "baserom.gba", 0x56efac, 0x2
.byte 0x00, 0x01
gUnknown_0856EFAE:: @ 856EFAE
.incbin "baserom.gba", 0x56efae, 0x6
.byte 0x00, 0x01, 0x02, 0x03, 0x04, 0x05
gUnknown_0856EFB4:: @ 856EFB4
.incbin "baserom.gba", 0x56efb4, 0x14
.byte 0xff, 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x10, 0x11, 0x00, 0x00
.align 2
gUnknown_0856EFC8:: @ 856EFC8
unk_dex_struct gUnknown_0856EE5C, 6, 7, 10
unk_dex_struct gUnknown_0856EEB4, 8, 9, 11
@ -224,8 +242,12 @@ gUnknown_0856EFC8:: @ 856EFC8
unk_dex_struct gUnknown_0856EE24, 4, 5, 6
unk_dex_struct gUnknown_0856EE0C, 2, 3, 2
.align 2
gUnknown_0856EFF8:: @ 856EFF8
.incbin "baserom.gba", 0x56eff8, 0x10
.4byte 0x000000c8, 0x000010d1, 0x000020ea, 0x000030f3
.align 2
gUnknown_0856F008:: @ 856F008
.incbin "baserom.gba", 0x56f008, 0x10
window_template 0x02, 0x00, 0x00, 0x20, 0x14, 0x00, 0x0001
null_window_template

File diff suppressed because it is too large Load Diff

View File

@ -9,14 +9,23 @@
@ 861CAAC
.include "data/text/nature_names.inc"
.align 2
gUnknown_0861CBB4:: @ 861CBB4
.incbin "baserom.gba", 0x61cbb4, 0x38
.4byte 0x000001f0, 0x000013b9, 0x0000239a, 0x000033db
.align 2
gUnknown_0861CBC4:: @ 861CBC4
.incbin "graphics/interface/unk_tilemap2.bin"
.align 2
gUnknown_0861CBEC:: @ 861CBEC
.incbin "baserom.gba", 0x61cbec, 0xc
.4byte gUnknown_0861CBC4
.byte 0x01, 0x00, 0x0a, 0x02, 0x00, 0x12
.align 2
gUnknown_0861CBF8:: @ 861CBF8
.incbin "baserom.gba", 0x61cbf8, 0xc
.4byte gUnknown_0861CBC4
.byte 0x01, 0x00, 0x0a, 0x02, 0x00, 0x32
.align 2
gUnknown_0861CC04:: @ 861CC04
@ -40,101 +49,385 @@ gUnknown_0861CC10:: @ 861CC10
.align 2
gUnknown_0861CC1C:: @ 861CC1C
.incbin "baserom.gba", 0x61cc1c, 0x8
.byte 0x00, 0x02, 0x03, 0x01, 0x04, 0x05, 0x00, 0x00
.align 2
gUnknown_0861CC24:: @ 861CC24
.incbin "baserom.gba", 0x61cc24, 0xa8
window_template 0x00, 0x00, 0x00, 0x0b, 0x02, 0x06, 0x0001
window_template 0x00, 0x00, 0x00, 0x0b, 0x02, 0x06, 0x0017
window_template 0x00, 0x00, 0x00, 0x0b, 0x02, 0x06, 0x002d
window_template 0x00, 0x00, 0x00, 0x0b, 0x02, 0x06, 0x0043
window_template 0x00, 0x16, 0x00, 0x08, 0x02, 0x07, 0x0059
window_template 0x00, 0x16, 0x00, 0x08, 0x02, 0x07, 0x0069
window_template 0x00, 0x16, 0x00, 0x08, 0x02, 0x07, 0x0079
window_template 0x00, 0x0b, 0x04, 0x00, 0x02, 0x06, 0x0089
window_template 0x00, 0x0b, 0x04, 0x12, 0x02, 0x06, 0x0089
window_template 0x00, 0x0b, 0x06, 0x12, 0x02, 0x06, 0x00ad
window_template 0x00, 0x0a, 0x07, 0x06, 0x06, 0x06, 0x00d1
window_template 0x00, 0x16, 0x07, 0x05, 0x06, 0x06, 0x00f5
window_template 0x00, 0x0a, 0x0e, 0x0b, 0x04, 0x06, 0x0113
window_template 0x00, 0x00, 0x12, 0x06, 0x02, 0x06, 0x013f
window_template 0x00, 0x01, 0x0f, 0x09, 0x04, 0x06, 0x014b
window_template 0x00, 0x01, 0x0f, 0x05, 0x04, 0x06, 0x016f
window_template 0x00, 0x16, 0x04, 0x00, 0x02, 0x06, 0x0183
window_template 0x00, 0x01, 0x02, 0x04, 0x02, 0x07, 0x0183
window_template 0x00, 0x01, 0x0c, 0x09, 0x02, 0x06, 0x018b
window_template 0x00, 0x01, 0x0e, 0x09, 0x04, 0x06, 0x019d
null_window_template
.align 2
gUnknown_0861CCCC:: @ 861CCCC
.incbin "baserom.gba", 0x61cccc, 0x20
window_template 0x00, 0x0b, 0x04, 0x0b, 0x02, 0x06, 0x01c1
window_template 0x00, 0x16, 0x04, 0x07, 0x02, 0x06, 0x01d7
window_template 0x00, 0x0b, 0x09, 0x12, 0x04, 0x06, 0x01e5
window_template 0x00, 0x0b, 0x0e, 0x12, 0x06, 0x06, 0x022d
.align 2
gUnknown_0861CCEC:: @ 861CCEC
.incbin "baserom.gba", 0x61ccec, 0x28
window_template 0x00, 0x0a, 0x04, 0x0a, 0x02, 0x06, 0x01c1
window_template 0x00, 0x14, 0x04, 0x0a, 0x02, 0x06, 0x01d5
window_template 0x00, 0x10, 0x07, 0x06, 0x06, 0x06, 0x01e9
window_template 0x00, 0x1b, 0x07, 0x03, 0x06, 0x06, 0x020d
window_template 0x00, 0x18, 0x0e, 0x06, 0x04, 0x06, 0x021f
.align 2
gUnknown_0861CD14:: @ 861CD14
.incbin "baserom.gba", 0x61cd14, 0x18
window_template 0x00, 0x0f, 0x04, 0x09, 0x0a, 0x06, 0x01c1
window_template 0x00, 0x18, 0x04, 0x06, 0x0a, 0x08, 0x021b
window_template 0x00, 0x0a, 0x0f, 0x14, 0x04, 0x06, 0x0257
gUnknown_0861CD2C:: @ 861CD2C
.incbin "baserom.gba", 0x61cd2c, 0x27
.byte 0x00, 0x01, 0x02, 0x00, 0x03, 0x04, 0x00, 0x05, 0x06, 0x00, 0x07, 0x08, 0x00, 0x09, 0x0a, 0x00, 0x0b, 0x0c, 0x00, 0x0d, 0x0e, 0x00, 0x07, 0x08, 0x0d, 0x0f, 0x0e, 0x00, 0x01, 0x02, 0x00, 0x03
.byte 0x04, 0x00, 0x05, 0x06, 0x00, 0x07, 0x08
gUnknown_0861CD53:: @ 861CD53
.incbin "baserom.gba", 0x61cd53, 0x80
.incbin "graphics/interface/summary_a_button.4bpp"
gUnknown_0861CDD3:: @ 861CDD3
.incbin "baserom.gba", 0x61cdd3, 0x81
.incbin "graphics/interface/summary_b_button.4bpp"
.align 2
gUnknown_0861CE54:: @ 861CE54
.incbin "baserom.gba", 0x61ce54, 0x10
.4byte sub_81C2E00
.4byte sub_81C3530
.4byte sub_81C3984
.4byte sub_81C3D08
.align 2
gUnknown_0861CE64:: @ 861CE64
.incbin "baserom.gba", 0x61ce64, 0x10
.4byte sub_81C2E40
.4byte sub_81C3554
.4byte sub_81C39F0
.4byte sub_81C3D54
gUnknown_0861CE74:: @ 861CE74
.incbin "baserom.gba", 0x61ce74, 0x7
.string "{COLOR LIGHT_RED}{SHADOW GREEN}$"
gUnknown_0861CE7B:: @ 861CE7B
.incbin "baserom.gba", 0x61ce7b, 0x7
.string "{COLOR WHITE}{SHADOW DARK_GREY}$"
gUnknown_0861CE82:: @ 861CE82
.incbin "baserom.gba", 0x61ce82, 0xc
.string "{SPECIAL_F7 0x00}/{SPECIAL_F7 0x01}\n"
.string "{SPECIAL_F7 0x02}\n"
.string "{SPECIAL_F7 0x03}$"
gUnknown_0861CE8E:: @ 861CE8E
.incbin "baserom.gba", 0x61ce8e, 0x9
.string "{SPECIAL_F7 0x00}\n"
.string "{SPECIAL_F7 0x01}\n"
.string "{SPECIAL_F7 0x02}$"
gUnknown_0861CE97:: @ 861CE97
.incbin "baserom.gba", 0x61ce97, 0x125
.string "{UNK_CTRL_F9 0x06}{SPECIAL_F7 0x00}/{SPECIAL_F7 0x01}$"
.align 2
gOamData_861CEA0:: @ 861CEA0
.2byte 0x4000, 0x8000, 0x0400, 0x0000
.align 2
gSpriteAnim_861CEA8:: @ 861CEA8
.2byte 0x0000, 0x0000, 0xffff, 0x0000
.align 2
gSpriteAnim_861CEB0:: @ 861CEB0
.2byte 0x0008, 0x0000, 0xffff, 0x0000
.align 2
gSpriteAnim_861CEB8:: @ 861CEB8
.2byte 0x0010, 0x0000, 0xffff, 0x0000
.align 2
gSpriteAnim_861CEC0:: @ 861CEC0
.2byte 0x0018, 0x0000, 0xffff, 0x0000
.align 2
gSpriteAnim_861CEC8:: @ 861CEC8
.2byte 0x0020, 0x0000, 0xffff, 0x0000
.align 2
gSpriteAnim_861CED0:: @ 861CED0
.2byte 0x0028, 0x0000, 0xffff, 0x0000
.align 2
gSpriteAnim_861CED8:: @ 861CED8
.2byte 0x0030, 0x0000, 0xffff, 0x0000
.align 2
gSpriteAnim_861CEE0:: @ 861CEE0
.2byte 0x0038, 0x0000, 0xffff, 0x0000
.align 2
gSpriteAnim_861CEE8:: @ 861CEE8
.2byte 0x0040, 0x0000, 0xffff, 0x0000
.align 2
gSpriteAnim_861CEF0:: @ 861CEF0
.2byte 0x0048, 0x0000, 0xffff, 0x0000
.align 2
gSpriteAnim_861CEF8:: @ 861CEF8
.2byte 0x0050, 0x0000, 0xffff, 0x0000
.align 2
gSpriteAnim_861CF00:: @ 861CF00
.2byte 0x0058, 0x0000, 0xffff, 0x0000
.align 2
gSpriteAnim_861CF08:: @ 861CF08
.2byte 0x0060, 0x0000, 0xffff, 0x0000
.align 2
gSpriteAnim_861CF10:: @ 861CF10
.2byte 0x0068, 0x0000, 0xffff, 0x0000
.align 2
gSpriteAnim_861CF18:: @ 861CF18
.2byte 0x0070, 0x0000, 0xffff, 0x0000
.align 2
gSpriteAnim_861CF20:: @ 861CF20
.2byte 0x0078, 0x0000, 0xffff, 0x0000
.align 2
gSpriteAnim_861CF28:: @ 861CF28
.2byte 0x0080, 0x0000, 0xffff, 0x0000
.align 2
gSpriteAnim_861CF30:: @ 861CF30
.2byte 0x0088, 0x0000, 0xffff, 0x0000
.align 2
gSpriteAnim_861CF38:: @ 861CF38
.2byte 0x0090, 0x0000, 0xffff, 0x0000
.align 2
gSpriteAnim_861CF40:: @ 861CF40
.2byte 0x0098, 0x0000, 0xffff, 0x0000
.align 2
gSpriteAnim_861CF48:: @ 861CF48
.2byte 0x00a0, 0x0000, 0xffff, 0x0000
.align 2
gSpriteAnim_861CF50:: @ 861CF50
.2byte 0x00a8, 0x0000, 0xffff, 0x0000
.align 2
gSpriteAnim_861CF58:: @ 861CF58
.2byte 0x00b0, 0x0000, 0xffff, 0x0000
.align 2
gSpriteAnimTable_861CF60:: @ 861CF60
.4byte gSpriteAnim_861CEA8
.4byte gSpriteAnim_861CEB0
.4byte gSpriteAnim_861CEB8
.4byte gSpriteAnim_861CEC0
.4byte gSpriteAnim_861CEC8
.4byte gSpriteAnim_861CED0
.4byte gSpriteAnim_861CED8
.4byte gSpriteAnim_861CEE0
.4byte gSpriteAnim_861CEE8
.4byte gSpriteAnim_861CEF0
.4byte gSpriteAnim_861CEF8
.4byte gSpriteAnim_861CF00
.4byte gSpriteAnim_861CF08
.4byte gSpriteAnim_861CF10
.4byte gSpriteAnim_861CF18
.4byte gSpriteAnim_861CF20
.4byte gSpriteAnim_861CF28
.4byte gSpriteAnim_861CF30
.4byte gSpriteAnim_861CF38
.4byte gSpriteAnim_861CF40
.4byte gSpriteAnim_861CF48
.4byte gSpriteAnim_861CF50
.4byte gSpriteAnim_861CF58
.align 2
gUnknown_0861CFBC:: @ 861CFBC
.incbin "baserom.gba", 0x61cfbc, 0x8
obj_tiles 0x08d971b0, 0x1700, 0x7532
.align 2
gUnknown_0861CFC4:: @ 861CFC4
.incbin "baserom.gba", 0x61cfc4, 0x18
spr_template 0x7532, 0x7532, gOamData_861CEA0, gSpriteAnimTable_861CF60, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
gUnknown_0861CFDC:: @ 861CFDC
.incbin "baserom.gba", 0x61cfdc, 0x98
.byte 0x0d, 0x0d, 0x0e, 0x0e, 0x0d, 0x0d, 0x0f, 0x0e, 0x0d, 0x0f, 0x0d, 0x0e, 0x0f, 0x0d, 0x0e, 0x0e, 0x0f, 0x0d, 0x0d, 0x0e, 0x0e, 0x0f, 0x0d, 0x00
.align 2
gOamData_861CFF4:: @ 861CFF4
.2byte 0x0000, 0x4000, 0x0400, 0x0000
.align 2
gSpriteAnim_861CFFC:: @ 861CFFC
.2byte 0x0000, 0x0000, 0xffff, 0x0000
.align 2
gSpriteAnim_861D004:: @ 861D004
.2byte 0x0004, 0x0000, 0xffff, 0x0000
.align 2
gSpriteAnim_861D00C:: @ 861D00C
.2byte 0x0008, 0x0000, 0xffff, 0x0000
.align 2
gSpriteAnim_861D014:: @ 861D014
.2byte 0x000c, 0x0000, 0xffff, 0x0000
.align 2
gSpriteAnim_861D01C:: @ 861D01C
.2byte 0x0010, 0x0000, 0xffff, 0x0000
.align 2
gSpriteAnim_861D024:: @ 861D024
.2byte 0x0010, 0x0040, 0xffff, 0x0000
.align 2
gSpriteAnim_861D02C:: @ 861D02C
.2byte 0x0014, 0x0000, 0xffff, 0x0000
.align 2
gSpriteAnim_861D034:: @ 861D034
.2byte 0x0018, 0x0000, 0xffff, 0x0000
.align 2
gSpriteAnim_861D03C:: @ 861D03C
.2byte 0x0018, 0x0040, 0xffff, 0x0000
.align 2
gSpriteAnim_861D044:: @ 861D044
.2byte 0x001c, 0x0000, 0xffff, 0x0000
.align 2
gSpriteAnimTable_861D04C:: @ 861D04C
.4byte gSpriteAnim_861CFFC
.4byte gSpriteAnim_861D004
.4byte gSpriteAnim_861D00C
.4byte gSpriteAnim_861D014
.4byte gSpriteAnim_861D01C
.4byte gSpriteAnim_861D024
.4byte gSpriteAnim_861D02C
.4byte gSpriteAnim_861D034
.4byte gSpriteAnim_861D03C
.4byte gSpriteAnim_861D044
.align 2
gUnknown_0861D074:: @ 861D074
.incbin "baserom.gba", 0x61d074, 0x8
obj_tiles gUnknown_08D97BEC, 0x0400, 0x7530
.align 2
gUnknown_0861D07C:: @ 861D07C
.incbin "baserom.gba", 0x61d07c, 0x8
obj_pal gUnknown_08D97CF4, 0x7530
.align 2
gUnknown_0861D084:: @ 861D084
.incbin "baserom.gba", 0x61d084, 0x74
spr_template 0x7530, 0x7530, gOamData_861CFF4, gSpriteAnimTable_861D04C, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
.align 2
gOamData_861D09C:: @ 861D09C
.2byte 0x4000, 0x4000, 0x0c00, 0x0000
.align 2
gSpriteAnim_861D0A4:: @ 861D0A4
.2byte 0x0000, 0x0000, 0xffff, 0x0000
.align 2
gSpriteAnim_861D0AC:: @ 861D0AC
.2byte 0x0004, 0x0000, 0xffff, 0x0000
.align 2
gSpriteAnim_861D0B4:: @ 861D0B4
.2byte 0x0008, 0x0000, 0xffff, 0x0000
.align 2
gSpriteAnim_861D0BC:: @ 861D0BC
.2byte 0x000c, 0x0000, 0xffff, 0x0000
.align 2
gSpriteAnim_861D0C4:: @ 861D0C4
.2byte 0x0010, 0x0000, 0xffff, 0x0000
.align 2
gSpriteAnim_861D0CC:: @ 861D0CC
.2byte 0x0014, 0x0000, 0xffff, 0x0000
.align 2
gSpriteAnim_861D0D4:: @ 861D0D4
.2byte 0x0018, 0x0000, 0xffff, 0x0000
.align 2
gSpriteAnimTable_861D0DC:: @ 861D0DC
.4byte gSpriteAnim_861D0A4
.4byte gSpriteAnim_861D0AC
.4byte gSpriteAnim_861D0B4
.4byte gSpriteAnim_861D0BC
.4byte gSpriteAnim_861D0C4
.4byte gSpriteAnim_861D0CC
.4byte gSpriteAnim_861D0D4
.align 2
gUnknown_0861D0F8:: @ 861D0F8
.incbin "baserom.gba", 0x61d0f8, 0x8
obj_tiles gStatusGfx_Icons, 0x0380, 0x7531
.align 2
gUnknown_0861D100:: @ 861D100
.incbin "baserom.gba", 0x61d100, 0x8
obj_pal gStatusPal_Icons, 0x7531
.align 2
gUnknown_0861D108:: @ 861D108
.incbin "baserom.gba", 0x61d108, 0x18
spr_template 0x7531, 0x7531, gOamData_861D09C, gSpriteAnimTable_861D0DC, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
.align 2
gUnknown_0861D120:: @ 861D120
.incbin "baserom.gba", 0x61d120, 0x20
.incbin "graphics/interface/summary_markings.gbapal"
.align 2
gUnknown_0861D140:: @ 861D140
.incbin "baserom.gba", 0x61d140, 0x60
.incbin "graphics/interface/region_map.gbapal"
.align 2
gUnknown_0861D1A0:: @ 861D1A0
.incbin "baserom.gba", 0x61d1a0, 0xd54
.incbin "graphics/interface/region_map.8bpp.lz"
.align 2
gUnknown_0861DEF4:: @ 861DEF4
.incbin "baserom.gba", 0x61def4, 0x314
.incbin "graphics/interface/region_map.bin.lz"
.align 2
gUnknown_0861E208:: @ 861E208
.incbin "baserom.gba", 0x61e208, 0xd5c
.incbin "graphics/interface/region_map_affine.8bpp.lz"
.align 2
gUnknown_0861EF64:: @ 861EF64
.incbin "baserom.gba", 0x61ef64, 0x350
.incbin "graphics/interface/region_map_affine.bin.lz"
.align 2
gUnknown_0861F2B4:: @ 861F2B4
.incbin "baserom.gba", 0x61f2b4, 0xc
.4byte 0x000011f0, 0x000001e1, 0x000021de
.align 2
gUnknown_0861F2C0:: @ 861F2C0
.incbin "baserom.gba", 0x61f2c0, 0x18
.4byte 0x00000000, sub_81C5460, sub_81C5518, 0x00000000, 0x00080000, 0x07003021
.align 2
gUnknown_0861F2D8:: @ 861F2D8
.4byte gMenuText_Use, sub_81C61E0
.4byte gMenuText_Toss, sub_81C62C4
@ -144,35 +437,74 @@ gUnknown_0861F2D8:: @ 861F2D8
.4byte gText_EmptyString2, NULL
gUnknown_0861F308:: @ 861F308
.incbin "baserom.gba", 0x61f308, 0x4
.byte 0x00, 0x02, 0x01, 0x03
gUnknown_0861F30C:: @ 861F30C
.incbin "baserom.gba", 0x61f30c, 0x2
.byte 0x01, 0x03
gUnknown_0861F30E:: @ 861F30E
.incbin "baserom.gba", 0x61f30e, 0x2
.byte 0x04, 0x03
gUnknown_0861F310:: @ 861F310
.incbin "baserom.gba", 0x61f310, 0x4
.byte 0x03, 0x00, 0x00, 0x00
gUnknown_0861F314:: @ 861F314
.4byte sub_81C654C
.4byte sub_81C63D0
gUnknown_0861F31C:: @ 861F31C
.incbin "baserom.gba", 0x61f31c, 0xc
.byte 0x00, 0x02, 0x03, 0x00, 0x03, 0x01, 0x01, 0x02, 0x03, 0x00, 0x00, 0x00
.align 2
gUnknown_0861F328:: @ 861F328
.incbin "baserom.gba", 0x61f328, 0x28
window_template 0x00, 0x0e, 0x02, 0x0f, 0x10, 0x0f, 0x001e
window_template 0x00, 0x00, 0x0d, 0x0e, 0x06, 0x0f, 0x010e
window_template 0x01, 0x02, 0x0f, 0x1b, 0x04, 0x0f, 0x0162
window_template 0x01, 0x18, 0x11, 0x05, 0x02, 0x0f, 0x01ce
null_window_template
.align 2
gUnknown_0861F350:: @ 861F350
.incbin "baserom.gba", 0x61f350, 0x20
window_template 0x01, 0x16, 0x11, 0x07, 0x02, 0x0f, 0x01d8
window_template 0x01, 0x16, 0x0f, 0x07, 0x04, 0x0f, 0x01d8
window_template 0x01, 0x0f, 0x0f, 0x0e, 0x04, 0x0f, 0x01d8
window_template 0x01, 0x0f, 0x0d, 0x0e, 0x06, 0x0f, 0x01d8
.align 2
gUnknown_0861F370:: @ 861F370
.incbin "baserom.gba", 0x61f370, 0x5c
window_template 0x01, 0x18, 0x0f, 0x05, 0x04, 0x0f, 0x01d8
.align 2
gOamData_861F378:: @ 861F378
.2byte 0x0100, 0xc000, 0x0400, 0x0000
.align 2
gSpriteAnim_861F380:: @ 861F380
.2byte 0x0000, 0x0004, 0xffff, 0x0000
.align 2
gSpriteAnimTable_861F388:: @ 861F388
.4byte gSpriteAnim_861F380
.align 2
gSpriteAffineAnim_861F38C:: @ 861F38C
.2byte 0x0100, 0x0100, 0x0000, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000
.align 2
gSpriteAffineAnim_861F39C:: @ 861F39C
.2byte 0x0000, 0x0000, 0x02fe, 0x0000, 0x0000, 0x0000, 0x0402, 0x0000, 0x0000, 0x0000, 0x04fe, 0x0000, 0x0000, 0x0000, 0x0202, 0x0000
.2byte 0x7fff, 0x0000, 0x0000, 0x0000
.align 2
gSpriteAffineAnimTable_861F3C4:: @ 861F3C4
.4byte gSpriteAffineAnim_861F38C
.4byte gSpriteAffineAnim_861F39C
.align 2
gUnknown_0861F3CC:: @ 861F3CC
.incbin "baserom.gba", 0x61f3cc, 0x8
obj_tiles gBattleFrontierGfx_PyramidBag, 0x0800, 0x1024
.align 2
gUnknown_0861F3D4:: @ 861F3D4
.incbin "baserom.gba", 0x61f3d4, 0x18
spr_template 0x1024, 0x1024, gOamData_861F378, gSpriteAnimTable_861F388, NULL, gSpriteAffineAnimTable_861F3C4, SpriteCallbackDummy

File diff suppressed because it is too large Load Diff

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@ -11,7 +11,7 @@ gUnknown_08510404:: @ 8510404 struct BgTemplate
gUnknown_08510408:: @ 8510408
window_template 0x00, 0x01, 0x01, 0x13, 0x09, 0x0f, 0x0155
window_template 0x00, 0x02, 0x0f, 0x1b, 0x04, 0x0f, 0x00e9
window_template_terminator
null_window_template
.align 2
gUnknown_08510420:: @ 8510420

View File

@ -1588,7 +1588,7 @@ gUnknown_082F05A8:: @ 82F05A8
window_template 0x00, 0x00, 0x00, 0x1e, 0x02, 0x0c, 0x0013
window_template 0x00, 0x01, 0x0f, 0x1c, 0x04, 0x0c, 0x004f
window_template 0x00, 0x00, 0x0f, 0x1e, 0x05, 0x0d, 0x004f
window_template_terminator
null_window_template
.align 2
gUnknown_082F05C8:: @ 82F05C8
@ -1772,7 +1772,7 @@ gUnknown_082F0D3C:: @ 82F0D3C
window_template 0x00, 0x03, 0x00, 0x18, 0x03, 0x0f, 0x0001
window_template 0x00, 0x03, 0x04, 0x15, 0x0f, 0x0f, 0x0049
window_template 0x00, 0x18, 0x04, 0x03, 0x0f, 0x0f, 0x0184
window_template_terminator
null_window_template
.align 2
gUnknown_082F0D5C:: @ 82F0D5C
@ -1804,7 +1804,7 @@ gUnknown_082F0DD0:: @ 82F0DD0
.align 2
gUnknown_082F0DD4:: @ 82F0DD4
window_template 0x00, 0x03, 0x0f, 0x18, 0x04, 0x0e, 0x0014
window_template_terminator
null_window_template
.align 2
gUnknown_082F0DE4:: @ 82F0DE4
@ -1833,111 +1833,111 @@ gUnknown_082F0E1C:: @ 82F0E1C
.align 2
gWonderCardBgPal1:: @ 82F0E34
.incbin "graphics/interface/wonder_card_1.gbapal"
.incbin "graphics/wonder_transfers/wonder_card_1.gbapal"
.align 2
gWonderCardBgPal2:: @ 82F0E54
.incbin "graphics/interface/wonder_card_2.gbapal"
.incbin "graphics/wonder_transfers/wonder_card_2.gbapal"
.align 2
gWonderCardBgPal3:: @ 82F0E74
.incbin "graphics/interface/wonder_card_3.gbapal"
.incbin "graphics/wonder_transfers/wonder_card_3.gbapal"
.align 2
gWonderCardBgPal4:: @ 82F0E94
.incbin "graphics/interface/wonder_card_4.gbapal"
.incbin "graphics/wonder_transfers/wonder_card_4.gbapal"
.align 2
gWonderCardBgPal5:: @ 82F0EB4
.incbin "graphics/interface/wonder_card_5.gbapal"
.incbin "graphics/wonder_transfers/wonder_card_5.gbapal"
.align 2
gWonderCardBgPal6:: @ 82F0ED4
.incbin "graphics/interface/wonder_card_6.gbapal"
.incbin "graphics/wonder_transfers/wonder_card_6.gbapal"
.align 2
gWonderCardBgPal7:: @ 82F0EF4
.incbin "graphics/interface/wonder_card_7.gbapal"
.incbin "graphics/wonder_transfers/wonder_card_7.gbapal"
.align 2
gWonderCardBgPal8:: @ 82F0F14
.incbin "graphics/interface/wonder_card_8.gbapal"
.incbin "graphics/wonder_transfers/wonder_card_8.gbapal"
.align 2
gWonderCardBgGfx1:: @ 82F0F34
.incbin "graphics/interface/wonder_card_1.4bpp.lz"
.incbin "graphics/wonder_transfers/wonder_card_1.4bpp.lz"
.align 2
gWonderCardBgTilemap1:: @ 82F1030
.incbin "graphics/interface/wonder_card_1.bin.lz"
.incbin "graphics/wonder_transfers/wonder_card_1.bin.lz"
.align 2
gWonderCardBgGfx2:: @ 82F1124
.incbin "graphics/interface/wonder_card_2.4bpp.lz"
.incbin "graphics/wonder_transfers/wonder_card_2.4bpp.lz"
.align 2
gWonderCardBgTilemap2:: @ 82F1218
.incbin "graphics/interface/wonder_card_2.bin.lz"
.incbin "graphics/wonder_transfers/wonder_card_2.bin.lz"
.align 2
gWonderCardBgGfx3:: @ 82F1300
.incbin "graphics/interface/wonder_card_3.4bpp.lz"
.incbin "graphics/wonder_transfers/wonder_card_3.4bpp.lz"
.align 2
gWonderCardBgTilemap3:: @ 82F13D4
.incbin "graphics/interface/wonder_card_3.bin.lz"
.incbin "graphics/wonder_transfers/wonder_card_3.bin.lz"
.align 2
gWonderCardBgGfx7:: @ 82F14A8
.incbin "graphics/interface/wonder_card_7.4bpp.lz"
.incbin "graphics/wonder_transfers/wonder_card_7.4bpp.lz"
.align 2
gWonderCardBgTilemap7:: @ 82F16DC
.incbin "graphics/interface/wonder_card_7.bin.lz"
.incbin "graphics/wonder_transfers/wonder_card_7.bin.lz"
.align 2
gWonderCardBgGfx8:: @ 82F1824
.incbin "graphics/interface/wonder_card_8.4bpp.lz"
.incbin "graphics/wonder_transfers/wonder_card_8.4bpp.lz"
.align 2
gWonderCardBgTilemap8:: @ 82F1A54
.incbin "graphics/interface/wonder_card_8.bin.lz"
.incbin "graphics/wonder_transfers/wonder_card_8.bin.lz"
.align 2
gWonderCardShadowPal1:: @ 82F1B9C
.incbin "graphics/interface/wonder_card_shadow_1.gbapal"
.incbin "graphics/wonder_transfers/wonder_card_shadow_1.gbapal"
.align 2
gWonderCardShadowPal2:: @ 82F1BBC
.incbin "graphics/interface/wonder_card_shadow_2.gbapal"
.incbin "graphics/wonder_transfers/wonder_card_shadow_2.gbapal"
.align 2
gWonderCardShadowPal3:: @ 82F1BDC
.incbin "graphics/interface/wonder_card_shadow_3.gbapal"
.incbin "graphics/wonder_transfers/wonder_card_shadow_3.gbapal"
.align 2
gWonderCardShadowPal4:: @ 82F1BFC
.incbin "graphics/interface/wonder_card_shadow_4.gbapal"
.incbin "graphics/wonder_transfers/wonder_card_shadow_4.gbapal"
.align 2
gWonderCardShadowPal5:: @ 82F1C1C
.incbin "graphics/interface/wonder_card_shadow_5.gbapal"
.incbin "graphics/wonder_transfers/wonder_card_shadow_5.gbapal"
.align 2
gWonderCardShadowPal6:: @ 82F1C3C
.incbin "graphics/interface/wonder_card_shadow_6.gbapal"
.incbin "graphics/wonder_transfers/wonder_card_shadow_6.gbapal"
.align 2
gWonderCardShadowPal7:: @ 82F1C5C
.incbin "graphics/interface/wonder_card_shadow_7.gbapal"
.incbin "graphics/wonder_transfers/wonder_card_shadow_7.gbapal"
.align 2
gWonderCardShadowPal8:: @ 82F1C7C
.incbin "graphics/interface/wonder_card_shadow_8.gbapal"
.incbin "graphics/wonder_transfers/wonder_card_shadow_8.gbapal"
.align 2
gWonderCardShadowGfx:: @ 82F1C9C
.incbin "graphics/interface/wonder_card_shadow.4bpp.lz"
.incbin "graphics/wonder_transfers/wonder_card_shadow.4bpp.lz"
.align 2
gUnknown_082F1D00:: @ 82F1D00 struct CompressedSpriteSheet
@ -2005,55 +2005,55 @@ gUnknown_082F1DF8:: @ 82F1DF8
.align 2
gWonderNewsPal1:: @ 82F1E08
.incbin "graphics/interface/wonder_news_1.gbapal"
.incbin "graphics/wonder_transfers/wonder_news_1.gbapal"
.align 2
gWonderNewsPal7:: @ 82F1E28
.incbin "graphics/interface/wonder_news_7.gbapal"
.incbin "graphics/wonder_transfers/wonder_news_7.gbapal"
.align 2
gWonderNewsPal8:: @ 82F1E48
.incbin "graphics/interface/wonder_news_8.gbapal"
.incbin "graphics/wonder_transfers/wonder_news_8.gbapal"
.align 2
gWonderNewsGfx1:: @ 82F1E68
.incbin "graphics/interface/wonder_news_1.4bpp.lz"
.incbin "graphics/wonder_transfers/wonder_news_1.4bpp.lz"
.align 2
gWonderNewsTilemap1:: @ 82F1EE8
.incbin "graphics/interface/wonder_news_1.bin.lz"
.incbin "graphics/wonder_transfers/wonder_news_1.bin.lz"
.align 2
gWonderNewsGfx2:: @ 82F1FC4
.incbin "graphics/interface/wonder_news_2.4bpp.lz"
.incbin "graphics/wonder_transfers/wonder_news_2.4bpp.lz"
.align 2
gWonderNewsTilemap2:: @ 82F1FF4
.incbin "graphics/interface/wonder_news_2.bin.lz"
.incbin "graphics/wonder_transfers/wonder_news_2.bin.lz"
.align 2
gWonderNewsGfx3:: @ 82F20B4
.incbin "graphics/interface/wonder_news_3.4bpp.lz"
.incbin "graphics/wonder_transfers/wonder_news_3.4bpp.lz"
.align 2
gWonderNewsTilemap3:: @ 82F2124
.incbin "graphics/interface/wonder_news_3.bin.lz"
.incbin "graphics/wonder_transfers/wonder_news_3.bin.lz"
.align 2
gWonderNewsGfx7:: @ 82F21F0
.incbin "graphics/interface/wonder_news_7.4bpp.lz"
.incbin "graphics/wonder_transfers/wonder_news_7.4bpp.lz"
.align 2
gWonderNewsTilemap7:: @ 82F2280
.incbin "graphics/interface/wonder_news_7.bin.lz"
.incbin "graphics/wonder_transfers/wonder_news_7.bin.lz"
.align 2
gWonderNewsGfx8:: @ 82F235C
.incbin "graphics/interface/wonder_news_8.4bpp.lz"
.incbin "graphics/wonder_transfers/wonder_news_8.4bpp.lz"
.align 2
gWonderNewsTilemap8:: @ 82F23EC
.incbin "graphics/interface/wonder_news_8.bin.lz"
.incbin "graphics/wonder_transfers/wonder_news_8.bin.lz"
.align 2
gUnknown_082F24C8:: @ 82F24C8
@ -2457,7 +2457,7 @@ gUnknown_082F2C70:: @ 82F2C70
window_template 0x01, 0x09, 0x12, 0x0f, 0x02, 0x0c, 0x007a
window_template 0x01, 0x00, 0x02, 0x06, 0x0f, 0x07, 0x0020
window_template 0x00, 0x01, 0x02, 0x07, 0x09, 0x0e, 0x0013
window_template_terminator
null_window_template
.align 2
gUnknown_082F2C98:: @ 82F2C98
@ -2724,12 +2724,12 @@ gUnknown_082F32F4:: @ 82F32F4
window_template 0x00, 0x00, 0x06, 0x09, 0x02, 0x08, 0x03c9
window_template 0x00, 0x15, 0x03, 0x09, 0x02, 0x08, 0x03b7
window_template 0x00, 0x15, 0x06, 0x09, 0x02, 0x08, 0x03a5
window_template_terminator
null_window_template
window_template 0x00, 0x05, 0x02, 0x14, 0x10, 0x0f, 0x0001
window_template 0x00, 0x05, 0x02, 0x14, 0x10, 0x0f, 0x0001
window_template 0x00, 0x04, 0x02, 0x16, 0x10, 0x0f, 0x0001
window_template_terminator
null_window_template
.align 2
gUnknown_082F3344:: @ 82F3344
@ -2744,43 +2744,43 @@ gUnknown_082F334C:: @ 82F334C
.align 2
gBerryCrushGrinderBasePal:: @ 82F336C
.incbin "graphics/interface/berrycrush_grinder_base.gbapal"
.incbin "graphics/link_games/berrycrush_grinder_base.gbapal"
.align 2
gBerryCrushMiscSpritesPal:: @ 82F338C
.incbin "graphics/interface/berrycrush_misc.gbapal"
.incbin "graphics/link_games/berrycrush_misc.gbapal"
.align 2
gBerryCrushTimerDigitsPal:: @ 82F33AC
.incbin "graphics/interface/berrycrush_timerdigits.gbapal"
.incbin "graphics/link_games/berrycrush_timerdigits.gbapal"
.align 2
gBerryCrushGrinderBaseGfx:: @ 82F33CC
.incbin "graphics/interface/berrycrush_grinder_base.4bpp.lz"
.incbin "graphics/link_games/berrycrush_grinder_base.4bpp.lz"
.align 2
gBerryCrushBtnPressGfx:: @ 82F36F8
.incbin "graphics/interface/berrycrush_btnpress.4bpp.lz"
.incbin "graphics/link_games/berrycrush_btnpress.4bpp.lz"
.align 2
gBerryCrushSparkleGfx:: @ 82F3A74
.incbin "graphics/interface/berrycrush_sparkle.4bpp.lz"
.incbin "graphics/link_games/berrycrush_sparkle.4bpp.lz"
.align 2
gBerryCrushTimerDigitsGfx:: @ 82F3BC0
.incbin "graphics/interface/berrycrush_timerdigits.4bpp.lz"
.incbin "graphics/link_games/berrycrush_timerdigits.4bpp.lz"
.align 2
gBerryCrushGrinderTopTilemap:: @ 82F3C8C
.incbin "graphics/interface/berrycrush_grinder_top.bin.lz"
.incbin "graphics/link_games/berrycrush_grinder_top.bin.lz"
.align 2
gBerryCrushContainerCapTilemap:: @ 82F3DBC
.incbin "graphics/interface/berrycrush_container_cap.bin.lz"
.incbin "graphics/link_games/berrycrush_container_cap.bin.lz"
.align 2
gBerryCrushBackgroundTilemap:: @ 82F3F54
.incbin "graphics/interface/berrycrush_background.bin.lz"
.incbin "graphics/link_games/berrycrush_background.bin.lz"
.align 2
gUnknown_082F417C:: @ 82F417C
@ -3100,66 +3100,66 @@ gUnknown_082F449C:: @ 82F449C
.align 2
gUnknown_082F7DF0_UnrefDupe:: @ 82F4698
.incbin "graphics/interface/dodrioberry_bg1.gbapal"
.incbin "graphics/link_games/dodrioberry_bg1.gbapal"
.align 2
.incbin "graphics/interface/dodrioberry_bg2.gbapal"
.incbin "graphics/link_games/dodrioberry_bg2.gbapal"
.align 2
gUnknown_082F7E30_UnrefDupe:: @ 82F46B8
.incbin "graphics/interface/dodrioberry_pkmn.gbapal"
.incbin "graphics/link_games/dodrioberry_pkmn.gbapal"
.align 2
gUnknown_082F7E50_UnrefDupe:: @ 82F46D8
.incbin "graphics/interface/dodrioberry_shiny.gbapal"
.incbin "graphics/link_games/dodrioberry_shiny.gbapal"
.align 2
gUnknown_082F7E70_UnrefDupe:: @ 82F46F8
.incbin "graphics/interface/dodrioberry_status.gbapal"
.incbin "graphics/link_games/dodrioberry_status.gbapal"
.align 2
gUnknown_082F7E90_UnrefDupe:: @ 82F4718
.incbin "graphics/interface/dodrioberry_berrysprites.gbapal"
.incbin "graphics/link_games/dodrioberry_berrysprites.gbapal"
.align 2
gUnknown_082F7EB0_UnrefDupe:: @ 82F4738
.incbin "graphics/interface/dodrioberry_berrysprites.4bpp.lz"
.incbin "graphics/link_games/dodrioberry_berrysprites.4bpp.lz"
.align 2
gUnknown_082F8064_UnrefDupe:: @ 82F490C
.incbin "graphics/interface/dodrioberry_platform.gbapal"
.incbin "graphics/link_games/dodrioberry_platform.gbapal"
.align 2
gUnknown_082F8084_UnrefDupe:: @ 82F492C
.incbin "graphics/interface/dodrioberry_bg1.4bpp.lz"
.incbin "graphics/link_games/dodrioberry_bg1.4bpp.lz"
.align 2
gUnknown_082F8914_UnrefDupe:: @ 82F51BC
.incbin "graphics/interface/dodrioberry_bg2.4bpp.lz"
.incbin "graphics/link_games/dodrioberry_bg2.4bpp.lz"
.align 2
gUnknown_082F96E0_UnrefDupe:: @ 82F5F88
.incbin "graphics/interface/dodrioberry_status.4bpp.lz"
.incbin "graphics/link_games/dodrioberry_status.4bpp.lz"
.align 2
gUnknown_082F9774_UnrefDupe:: @ 82F601C
.incbin "graphics/interface/dodrioberry_platform.4bpp.lz"
.incbin "graphics/link_games/dodrioberry_platform.4bpp.lz"
.align 2
gUnknown_082F98BC_UnrefDupe:: @ 82F6164
.incbin "graphics/interface/dodrioberry_pkmn.4bpp.lz"
.incbin "graphics/link_games/dodrioberry_pkmn.4bpp.lz"
.align 2
gUnknown_082FAAD8_UnrefDupe:: @ 82F7380
.incbin "graphics/interface/dodrioberry_bg1.bin.lz"
.incbin "graphics/link_games/dodrioberry_bg1.bin.lz"
.align 2
gUnknown_082FAD44_UnrefDupe:: @ 82F75EC
.incbin "graphics/interface/dodrioberry_bg2right.bin.lz"
.incbin "graphics/link_games/dodrioberry_bg2right.bin.lz"
.align 2
gUnknown_082FAF94_UnrefDupe:: @ 82F783C
.incbin "graphics/interface/dodrioberry_bg2left.bin.lz"
.incbin "graphics/link_games/dodrioberry_bg2left.bin.lz"
.align 2
gUnknown_082F7A88:: @ 82F7A88
@ -3362,66 +3362,66 @@ gUnknown_082F449C_UnrefDupe:: @ 82F7BF4
.align 2
gDodrioBerryBgPal1:: @ 82F7DF0
.incbin "graphics/interface/dodrioberry_bg1.gbapal"
.incbin "graphics/link_games/dodrioberry_bg1.gbapal"
.align 2
.incbin "graphics/interface/dodrioberry_bg2.gbapal"
.incbin "graphics/link_games/dodrioberry_bg2.gbapal"
.align 2
gDodrioBerryPkmnPal:: @ 82F7E30
.incbin "graphics/interface/dodrioberry_pkmn.gbapal"
.incbin "graphics/link_games/dodrioberry_pkmn.gbapal"
.align 2
gDodrioBerryShinyPal:: @ 82F7E50
.incbin "graphics/interface/dodrioberry_shiny.gbapal"
.incbin "graphics/link_games/dodrioberry_shiny.gbapal"
.align 2
gDodrioBerryStatusPal:: @ 82F7E70
.incbin "graphics/interface/dodrioberry_status.gbapal"
.incbin "graphics/link_games/dodrioberry_status.gbapal"
.align 2
gDodrioBerrySpritesPal:: @ 82F7E90
.incbin "graphics/interface/dodrioberry_berrysprites.gbapal"
.incbin "graphics/link_games/dodrioberry_berrysprites.gbapal"
.align 2
gDodrioBerrySpritesGfx:: @ 82F7EB0
.incbin "graphics/interface/dodrioberry_berrysprites.4bpp.lz"
.incbin "graphics/link_games/dodrioberry_berrysprites.4bpp.lz"
.align 2
gDodrioBerryPlatformPal:: @ 82F8064
.incbin "graphics/interface/dodrioberry_platform.gbapal"
.incbin "graphics/link_games/dodrioberry_platform.gbapal"
.align 2
gDodrioBerryBgGfx1:: @ 82F8084
.incbin "graphics/interface/dodrioberry_bg1.4bpp.lz"
.incbin "graphics/link_games/dodrioberry_bg1.4bpp.lz"
.align 2
gDodrioBerryBgGfx2:: @ 82F8914
.incbin "graphics/interface/dodrioberry_bg2.4bpp.lz"
.incbin "graphics/link_games/dodrioberry_bg2.4bpp.lz"
.align 2
gDodrioBerryStatusGfx:: @ 82F96E0
.incbin "graphics/interface/dodrioberry_status.4bpp.lz"
.incbin "graphics/link_games/dodrioberry_status.4bpp.lz"
.align 2
gDodrioBerryPlatformGfx:: @ 82F9774
.incbin "graphics/interface/dodrioberry_platform.4bpp.lz"
.incbin "graphics/link_games/dodrioberry_platform.4bpp.lz"
.align 2
gDodrioBerryPkmnGfx:: @ 82F98BC
.incbin "graphics/interface/dodrioberry_pkmn.4bpp.lz"
.incbin "graphics/link_games/dodrioberry_pkmn.4bpp.lz"
.align 2
gDodrioBerryBgTilemap1:: @ 82FAAD8
.incbin "graphics/interface/dodrioberry_bg1.bin.lz"
.incbin "graphics/link_games/dodrioberry_bg1.bin.lz"
.align 2
gDodrioBerryBgTilemap2Right:: @ 82FAD44
.incbin "graphics/interface/dodrioberry_bg2right.bin.lz"
.incbin "graphics/link_games/dodrioberry_bg2right.bin.lz"
.align 2
gDodrioBerryBgTilemap2Left:: @ 82FAF94
.incbin "graphics/interface/dodrioberry_bg2left.bin.lz"
.incbin "graphics/link_games/dodrioberry_bg2left.bin.lz"
.align 2
gUnknown_082FB1E0:: @ 82FB1E0
@ -3867,31 +3867,31 @@ gUnknown_082FB714:: @ 82FB714
.align 2
gPkmnJumpPal1:: @ 82FB73C
.incbin "graphics/interface/pkmnjump_pal1.gbapal"
.incbin "graphics/link_games/pkmnjump_pal1.gbapal"
.align 2
gPkmnJumpPal2:: @ 82FB75C
.incbin "graphics/interface/pkmnjump_pal2.gbapal"
.incbin "graphics/link_games/pkmnjump_pal2.gbapal"
.align 2
gPkmnJumpRopeGfx1:: @ 82FB77C
.incbin "graphics/interface/pkmnjump_rope1.4bpp.lz"
.incbin "graphics/link_games/pkmnjump_rope1.4bpp.lz"
.align 2
gPkmnJumpRopeGfx2:: @ 82FB89C
.incbin "graphics/interface/pkmnjump_rope2.4bpp.lz"
.incbin "graphics/link_games/pkmnjump_rope2.4bpp.lz"
.align 2
gPkmnJumpRopeGfx3:: @ 82FBA70
.incbin "graphics/interface/pkmnjump_rope3.4bpp.lz"
.incbin "graphics/link_games/pkmnjump_rope3.4bpp.lz"
.align 2
gPkmnJumpRopeGfx4:: @ 82FBBA0
.incbin "graphics/interface/pkmnjump_rope4.4bpp.lz"
.incbin "graphics/link_games/pkmnjump_rope4.4bpp.lz"
.align 2
gPkmnJumpStarGfx:: @ 82FBC9C
.incbin "graphics/interface/pkmnjump_star.4bpp.lz"
.incbin "graphics/link_games/pkmnjump_star.4bpp.lz"
.align 2
gUnknown_082FBE08:: @ 82FBE08
@ -4077,43 +4077,43 @@ gUnknown_082FC00C:: @ 82FC00C
.align 2
gPkmnJumpPal3:: @ 82FC024
.incbin "graphics/interface/pkmnjump_pal3.gbapal"
.incbin "graphics/link_games/pkmnjump_pal3.gbapal"
.align 2
gPkmnJumpBgPal:: @ 82FC044
.incbin "graphics/interface/pkmnjump_bg.gbapal"
.incbin "graphics/link_games/pkmnjump_bg.gbapal"
.align 2
gPkmnJumpBgGfx:: @ 82FC064
.incbin "graphics/interface/pkmnjump_bg.4bpp.lz"
.incbin "graphics/link_games/pkmnjump_bg.4bpp.lz"
.align 2
gPkmnJumpBgTilemap:: @ 82FC290
.incbin "graphics/interface/pkmnjump_bg.bin.lz"
.incbin "graphics/link_games/pkmnjump_bg.bin.lz"
.align 2
gPkmnJumpVenusaurPal:: @ 82FC440
.incbin "graphics/interface/pkmnjump_venusaur.gbapal"
.incbin "graphics/link_games/pkmnjump_venusaur.gbapal"
.align 2
gPkmnJumpVenusaurGfx:: @ 82FC460
.incbin "graphics/interface/pkmnjump_venusaur.4bpp.lz"
.incbin "graphics/link_games/pkmnjump_venusaur.4bpp.lz"
.align 2
gPkmnJumpVenusaurTilemap:: @ 82FCDB0
.incbin "graphics/interface/pkmnjump_venusaur.bin.lz"
.incbin "graphics/link_games/pkmnjump_venusaur.bin.lz"
.align 2
gPkmnJumpResultsPal:: @ 82FD168
.incbin "graphics/interface/pkmnjump_results.gbapal"
.incbin "graphics/link_games/pkmnjump_results.gbapal"
.align 2
gPkmnJumpResultsGfx:: @ 82FD188
.incbin "graphics/interface/pkmnjump_results.4bpp.lz"
.incbin "graphics/link_games/pkmnjump_results.4bpp.lz"
.align 2
gPkmnJumpResultsTilemap:: @ 82FDC38
.incbin "graphics/interface/pkmnjump_results.bin.lz"
.incbin "graphics/link_games/pkmnjump_results.bin.lz"
.align 2
gUnknown_082FE164:: @ 82FE164 struct BgTemplate
@ -4123,7 +4123,7 @@ gUnknown_082FE164:: @ 82FE164 struct BgTemplate
gUnknown_082FE174:: @ 82FE174
window_template 0x00, 0x13, 0x00, 0x06, 0x02, 0x02, 0x0013
window_template 0x00, 0x08, 0x00, 0x06, 0x02, 0x02, 0x001f
window_template_terminator
null_window_template
.align 2
gUnknown_082FE18C:: @ 82FE18C
@ -4210,11 +4210,11 @@ gUnknown_082FE278:: @ 82FE278
.align 2
gPkmnJump321StartPal1:: @ 82FE284
.incbin "graphics/interface/pkmnjump_321start1.gbapal"
.incbin "graphics/link_games/pkmnjump_321start1.gbapal"
.align 2
gPkmnJump321StartGfx1:: @ 82FE2A4
.incbin "graphics/interface/pkmnjump_321start1.4bpp.lz"
.incbin "graphics/link_games/pkmnjump_321start1.4bpp.lz"
.align 2
gUnknown_082FE6C8:: @ 82FE6C8
@ -4278,11 +4278,11 @@ gUnknown_082FE748:: @ 82FE748
.align 2
gPkmnJump321StartPal2:: @ 82FE758
.incbin "graphics/interface/pkmnjump_321start2.gbapal"
.incbin "graphics/link_games/pkmnjump_321start2.gbapal"
.align 2
gPkmnJump321StartGfx2:: @ 82FE778
.incbin "graphics/interface/pkmnjump_321start2.4bpp.lz"
.incbin "graphics/link_games/pkmnjump_321start2.4bpp.lz"
.align 2
gUnknown_082FEBCC:: @ 82FEBCC

View File

@ -2,40 +2,284 @@
.include "constants/constants.inc"
.section .rodata
.align 2, 0
.align 2
gUnknown_0858E8B0:: @ 858E8B0
.incbin "baserom.gba", 0x58e8b0, 0x40
.2byte 0x0006, 0x0007
.byte 0x05, 0x01
.align 2
.2byte 0x0009, 0x000f
.byte 0x05, 0x02
.align 2
.2byte 0x0003, 0x0013
.byte 0x05, 0x01
.align 2
.2byte 0x0002, 0x0006
.byte 0x04, 0x01
.align 2
.2byte 0x0009, 0x000c
.byte 0x04, 0x00
.align 2
.2byte 0x0006, 0x0017
.byte 0x04, 0x00
.align 2
.2byte 0x000c, 0x0016
.byte 0x04, 0x00
.align 2
.2byte 0x0006, 0x0003
.byte 0x03, 0x02
.align 2
gUnknown_0858E8F0:: @ 858E8F0
.incbin "baserom.gba", 0x58e8f0, 0x3468
.2byte 0x000e, 0x0005
.byte 0x04, 0x01
.align 2
.2byte 0x000a, 0x0006
.byte 0x01, 0x02
.align 2
.2byte 0x0006, 0x0006
.byte 0x03, 0x01
.align 2
.2byte 0x000e, 0x0008
.byte 0x04, 0x01
.align 2
.2byte 0x0003, 0x000a
.byte 0x02, 0x03
.align 2
.2byte 0x0009, 0x000e
.byte 0x00, 0x01
.align 2
.2byte 0x0003, 0x000f
.byte 0x06, 0x00
.align 2
.2byte 0x0002, 0x0011
.byte 0x01, 0x02
.align 2
.2byte 0x000c, 0x0012
.byte 0x06, 0x03
.align 2
.2byte 0x0005, 0x0012
.byte 0x03, 0x01
.align 2
.2byte 0x000a, 0x0013
.byte 0x02, 0x02
.align 2
gUnknown_0858E948:: @ 858E948
.incbin "graphics/misc/rotating_gate_1.4bpp"
.align 2
gUnknown_0858EB48:: @ 858EB48
.incbin "graphics/misc/rotating_gate_2.4bpp"
.align 2
gUnknown_0858F348:: @ 858F348
.incbin "graphics/misc/rotating_gate_3.4bpp"
.align 2
gUnknown_0858FB48:: @ 858FB48
.incbin "graphics/misc/rotating_gate_4.4bpp"
.align 2
gUnknown_08590348:: @ 8590348
.incbin "graphics/misc/rotating_gate_5.4bpp"
.align 2
gUnknown_08590548:: @ 8590548
.incbin "graphics/misc/rotating_gate_6.4bpp"
.align 2
gUnknown_08590D48:: @ 8590D48
.incbin "graphics/misc/rotating_gate_7.4bpp"
.align 2
gUnknown_08591548:: @ 8591548
.incbin "graphics/misc/rotating_gate_8.4bpp"
.align 2
gOamData_8591D48:: @ 8591D48
.2byte 0x0100, 0xc000, 0x2800
.align 2
gOamData_8591D50:: @ 8591D50
.2byte 0x0100, 0x8000, 0x2800
.align 2
gUnknown_08591D58:: @ 8591D58
.incbin "baserom.gba", 0x591d58, 0x270
obj_tiles gUnknown_0858E948, 0x0200, 0x1300
obj_tiles gUnknown_0858EB48, 0x0800, 0x1301
obj_tiles gUnknown_0858F348, 0x0800, 0x1302
obj_tiles gUnknown_0858FB48, 0x0800, 0x1303
obj_tiles gUnknown_08590348, 0x0200, 0x1304
obj_tiles gUnknown_08590548, 0x0800, 0x1305
obj_tiles gUnknown_08590D48, 0x0800, 0x1306
obj_tiles gUnknown_08591548, 0x0800, 0x1307
null_obj_tiles
.align 2
gSpriteAnim_8591DA0:: @ 8591DA0
.2byte 0x0000, 0x0000, 0xffff, 0x0000
.align 2
gSpriteAnim_8591DA8:: @ 8591DA8
.2byte 0x0000, 0x0000, 0xffff, 0x0000
.align 2
gSpriteAnimTable_8591DB0:: @ 8591DB0
.4byte gSpriteAnim_8591DA0
.align 2
gSpriteAnimTable_8591DB4:: @ 8591DB4
.4byte gSpriteAnim_8591DA8
.align 2
gSpriteAffineAnim_8591DB8:: @ 8591DB8
.2byte 0x0100, 0x0100, 0x0000, 0x0000, 0x7ffe, 0x0000, 0x0000, 0x0000
.align 2
gSpriteAffineAnim_8591DC8:: @ 8591DC8
.2byte 0x0100, 0x0100, 0x00c0, 0x0000, 0x7ffe, 0x0000, 0x0000, 0x0000
.align 2
gSpriteAffineAnim_8591DD8:: @ 8591DD8
.2byte 0x0100, 0x0100, 0x0080, 0x0000, 0x7ffe, 0x0000, 0x0000, 0x0000
.align 2
gSpriteAffineAnim_8591DE8:: @ 8591DE8
.2byte 0x0100, 0x0100, 0x0040, 0x0000, 0x7ffe, 0x0000, 0x0000, 0x0000
.align 2
gSpriteAffineAnim_8591DF8:: @ 8591DF8
.2byte 0x0100, 0x0100, 0x0000, 0x0000, 0x0000, 0x0000, 0x10fc, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000
.align 2
gSpriteAffineAnim_8591E10:: @ 8591E10
.2byte 0x0100, 0x0100, 0x00c0, 0x0000, 0x0000, 0x0000, 0x10fc, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000
.align 2
gSpriteAffineAnim_8591E28:: @ 8591E28
.2byte 0x0100, 0x0100, 0x0080, 0x0000, 0x0000, 0x0000, 0x10fc, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000
.align 2
gSpriteAffineAnim_8591E40:: @ 8591E40
.2byte 0x0100, 0x0100, 0x0040, 0x0000, 0x0000, 0x0000, 0x10fc, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000
.align 2
gSpriteAffineAnim_8591E58:: @ 8591E58
.2byte 0x0100, 0x0100, 0x0000, 0x0000, 0x0000, 0x0000, 0x1004, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000
.align 2
gSpriteAffineAnim_8591E70:: @ 8591E70
.2byte 0x0100, 0x0100, 0x0040, 0x0000, 0x0000, 0x0000, 0x1004, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000
.align 2
gSpriteAffineAnim_8591E88:: @ 8591E88
.2byte 0x0100, 0x0100, 0x0080, 0x0000, 0x0000, 0x0000, 0x1004, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000
.align 2
gSpriteAffineAnim_8591EA0:: @ 8591EA0
.2byte 0x0100, 0x0100, 0x00c0, 0x0000, 0x0000, 0x0000, 0x1004, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000
.align 2
gSpriteAffineAnim_8591EB8:: @ 8591EB8
.2byte 0x0100, 0x0100, 0x0000, 0x0000, 0x0000, 0x0000, 0x08f8, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000
.align 2
gSpriteAffineAnim_8591ED0:: @ 8591ED0
.2byte 0x0100, 0x0100, 0x00c0, 0x0000, 0x0000, 0x0000, 0x08f8, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000
.align 2
gSpriteAffineAnim_8591EE8:: @ 8591EE8
.2byte 0x0100, 0x0100, 0x0080, 0x0000, 0x0000, 0x0000, 0x08f8, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000
.align 2
gSpriteAffineAnim_8591F00:: @ 8591F00
.2byte 0x0100, 0x0100, 0x0040, 0x0000, 0x0000, 0x0000, 0x08f8, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000
.align 2
gSpriteAffineAnim_8591F18:: @ 8591F18
.2byte 0x0100, 0x0100, 0x0000, 0x0000, 0x0000, 0x0000, 0x0808, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000
.align 2
gSpriteAffineAnim_8591F30:: @ 8591F30
.2byte 0x0100, 0x0100, 0x0040, 0x0000, 0x0000, 0x0000, 0x0808, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000
.align 2
gSpriteAffineAnim_8591F48:: @ 8591F48
.2byte 0x0100, 0x0100, 0x0080, 0x0000, 0x0000, 0x0000, 0x0808, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000
.align 2
gSpriteAffineAnim_8591F60:: @ 8591F60
.2byte 0x0100, 0x0100, 0x00c0, 0x0000, 0x0000, 0x0000, 0x0808, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000
.align 2
gSpriteAffineAnimTable_8591F78:: @ 8591F78
.4byte gSpriteAffineAnim_8591DB8
.4byte gSpriteAffineAnim_8591DC8
.4byte gSpriteAffineAnim_8591DD8
.4byte gSpriteAffineAnim_8591DE8
.4byte gSpriteAffineAnim_8591E58
.4byte gSpriteAffineAnim_8591EA0
.4byte gSpriteAffineAnim_8591E88
.4byte gSpriteAffineAnim_8591E70
.4byte gSpriteAffineAnim_8591DF8
.4byte gSpriteAffineAnim_8591E10
.4byte gSpriteAffineAnim_8591E28
.4byte gSpriteAffineAnim_8591E40
.4byte gSpriteAffineAnim_8591F18
.4byte gSpriteAffineAnim_8591F60
.4byte gSpriteAffineAnim_8591F48
.4byte gSpriteAffineAnim_8591F30
.4byte gSpriteAffineAnim_8591EB8
.4byte gSpriteAffineAnim_8591ED0
.4byte gSpriteAffineAnim_8591EE8
.4byte gSpriteAffineAnim_8591F00
.align 2
gUnknown_08591FC8:: @ 8591FC8
.incbin "baserom.gba", 0x591fc8, 0x18
spr_template 0x1300, 0xffff, gOamData_8591D48, gSpriteAnimTable_8591DB0, NULL, gSpriteAffineAnimTable_8591F78, sub_80FBAE4
.align 2
gUnknown_08591FE0:: @ 8591FE0
.incbin "baserom.gba", 0x591fe0, 0x18
spr_template 0x1300, 0xffff, gOamData_8591D50, gSpriteAnimTable_8591DB4, NULL, gSpriteAffineAnimTable_8591F78, sub_80FBAE4
gUnknown_08591FF8:: @ 8591FF8
.incbin "baserom.gba", 0x591ff8, 0x10
.byte 0xff, 0xff, 0xff, 0xff, 0x27, 0x26, 0x12, 0x13, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
gUnknown_08592008:: @ 8592008
.incbin "baserom.gba", 0x592008, 0x10
.byte 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x17, 0x16, 0x22, 0x23, 0xff, 0xff, 0xff, 0xff
gUnknown_08592018:: @ 8592018
.incbin "baserom.gba", 0x592018, 0x10
.byte 0xff, 0x11, 0xff, 0xff, 0xff, 0x10, 0xff, 0xff, 0xff, 0x24, 0xff, 0xff, 0xff, 0x25, 0xff, 0xff
gUnknown_08592028:: @ 8592028
.incbin "baserom.gba", 0x592028, 0x10
.byte 0xff, 0xff, 0x21, 0xff, 0xff, 0xff, 0x20, 0xff, 0xff, 0xff, 0x14, 0xff, 0xff, 0xff, 0x15, 0xff
gUnknown_08592038:: @ 8592038
.incbin "baserom.gba", 0x592038, 0x20
.byte 0x00, 0xff, 0x00, 0x00, 0x01, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0xff, 0x01, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0xfe, 0xff, 0x00, 0x00
gUnknown_08592058:: @ 8592058
.incbin "baserom.gba", 0x592058, 0x20
.byte 0xff, 0xff, 0x00, 0x00, 0xff, 0xfe, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0x01, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0xfe, 0x00, 0x00, 0x00
gUnknown_08592078:: @ 8592078
.incbin "baserom.gba", 0x592078, 0x60
.byte 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00
.byte 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x01, 0x00, 0x00
.byte 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 0x01, 0x01, 0x00, 0x00, 0x01, 0x00, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00

View File

@ -760,4 +760,4 @@ gUnknown_0858BBE0:: @ 858BBE0
.incbin "baserom.gba", 0x58bbe0, 0xc
gUnknown_0858BBEC:: @ 858BBEC
.incbin "baserom.gba", 0x58bbec, 0x18c
.incbin "baserom.gba", 0x58bbec, 0xc

View File

@ -46,7 +46,7 @@ gUnknown_08589A70:: @ 8589A70
window_template 0, 1, 11, 12, 2, 15, 0x176
window_template 0, 18, 11, 10, 2, 15, 0x18E
window_template 0, 2, 15, 27, 4, 15, 0x1A2
window_template_terminator
null_window_template
gUnknown_08589AA8:: @ 8589AA8
window_template 0, 21, 9, 5, 4, 15, 0x20E

File diff suppressed because it is too large Load Diff

View File

@ -4,68 +4,156 @@
.section .rodata
.align 2
gBirchBagGrassPal:: @ 85B0A00
.incbin "baserom.gba", 0x5b0a00, 0x80
.incbin "graphics/misc/birch_bag.gbapal"
.incbin "graphics/misc/birch_grass.gbapal"
.align 2
gBirchBallarrow_Pal:: @ 85B0A40
.incbin "graphics/misc/birch_ballarrow.gbapal"
.align 2
gBirchCircle_Pal:: @ 85B0A60
.incbin "graphics/misc/birch_circle.gbapal"
.align 2
gBirchBagTilemap:: @ 85B0A80
.incbin "baserom.gba", 0x5b0a80, 0x18c
.incbin "graphics/misc/birch_bag_map.bin.lz"
.align 2
gBirchGrassTilemap:: @ 85B0C0C
.incbin "baserom.gba", 0x5b0c0c, 0x1f8
.incbin "graphics/misc/birch_grass_map.bin.lz"
.align 2
gBirchHelpGfx:: @ 85B0E04
.incbin "baserom.gba", 0x5b0e04, 0xaa8
.incbin "graphics/misc/birch_help.4bpp.lz"
.align 2
gUnknown_085B18AC:: @ 85B18AC
.incbin "baserom.gba", 0x5b18AC, 0x520
.incbin "graphics/misc/birch_ballarrow.4bpp.lz"
.align 2
gUnknown_085B1BCC:: @ 85B1BCC
.incbin "graphics/misc/birch_circle.4bpp.lz"
.align 2
gUnknown_085B1DCC:: @ 85B1DCC
.incbin "baserom.gba", 0x5b1dcc, 0x10
window_template 0x00, 0x03, 0x0f, 0x18, 0x04, 0x0e, 0x0200
null_window_template
.align 2
gUnknown_085B1DDC:: @ 85B1DDC
.incbin "baserom.gba", 0x5b1ddc, 0x8
window_template 0x00, 0x18, 0x09, 0x05, 0x04, 0x0e, 0x0260
.align 2
gUnknown_085B1DE4:: @ 85B1DE4
.incbin "baserom.gba", 0x5b1de4, 0x8
window_template 0x00, 0x00, 0x00, 0x0d, 0x04, 0x0e, 0x0274
sPokeballCoords:: @ 85B1DEC
.incbin "baserom.gba", 0x5b1dec, 0x6
.byte 0x3c, 0x40, 0x78, 0x58, 0xb4, 0x40
gStarterChoose_LabelCoords:: @ 85B1DF2
.incbin "baserom.gba", 0x5b1df2, 0x6
.byte 0x00, 0x09, 0x10, 0x0a, 0x08, 0x04
sStarterMon:: @ 85B1DF8
.2byte SPECIES_TREECKO
.2byte SPECIES_TORCHIC
.2byte SPECIES_MUDKIP
.align 2
.align 2
gUnknown_085B1E00:: @ 85B1E00
.incbin "baserom.gba", 0x5b1e00, 0xc
.4byte 0x000001f8, 0x00003072, 0x00001063
gUnknown_085B1E0C:: @ 85B1E0C
.incbin "baserom.gba", 0x5b1e0c, 0x1c
.byte 0x00, 0x01, 0x03
.align 2
gOamData_85B1E10:: @ 85B1E10
.2byte 0x00a0, 0x8000, 0x0400, 0x0000
.align 2
gOamData_85B1E18:: @ 85B1E18
.2byte 0x00a0, 0x8000, 0x0400, 0x0000
.align 2
gOamData_85B1E20:: @ 85B1E20
.2byte 0x03a0, 0xc000, 0x0400, 0x0000
gUnknown_085B1E28:: @ 85B1E28
.incbin "baserom.gba", 0x5b1e28, 0xa8
.byte 0x3c, 0x20, 0x78, 0x38, 0xb4, 0x20, 0x00, 0x00
.align 2
gSpriteAnim_85B1E30:: @ 85B1E30
.2byte 0x0030, 0x001e, 0xffff, 0x0000
.align 2
gSpriteAnim_85B1E38:: @ 85B1E38
.2byte 0x0000, 0x001e, 0xffff, 0x0000
.align 2
gSpriteAnim_85B1E40:: @ 85B1E40
.2byte 0x0010, 0x0004, 0x0000, 0x0004, 0x0020, 0x0004, 0x0000, 0x0004, 0x0010, 0x0004, 0x0000, 0x0004, 0x0020, 0x0004, 0x0000, 0x0004
.2byte 0x0000, 0x0020, 0x0010, 0x0008, 0x0000, 0x0008, 0x0020, 0x0008, 0x0000, 0x0008, 0x0010, 0x0008, 0x0000, 0x0008, 0x0020, 0x0008
.2byte 0x0000, 0x0008, 0xfffe, 0x0000
.align 2
gSpriteAnim_85B1E88:: @ 85B1E88
.2byte 0x0000, 0x0008, 0xffff, 0x0000
.align 2
gSpriteAnimTable_85B1E90:: @ 85B1E90
.4byte gSpriteAnim_85B1E30
.align 2
gSpriteAnimTable_85B1E94:: @ 85B1E94
.4byte gSpriteAnim_85B1E38
.4byte gSpriteAnim_85B1E40
.align 2
gSpriteAnimTable_85B1E9C:: @ 85B1E9C
.4byte gSpriteAnim_85B1E88
.align 2
gSpriteAffineAnim_85B1EA0:: @ 85B1EA0
.2byte 0x0010, 0x0010, 0x0000, 0x0000, 0x0010, 0x0010, 0x0f00, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000
.align 2
gSpriteAffineAnim_85B1EB8:: @ 85B1EB8
.2byte 0x0014, 0x0014, 0x0000, 0x0000, 0x0014, 0x0014, 0x0f00, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000
.align 2
gUnknown_085B1ED0:: @ 85B1ED0
.incbin "baserom.gba", 0x5b1ed0, 0x8
.4byte gSpriteAffineAnim_85B1EA0
.align 2
gSpriteAffineAnimTable_85B1ED4:: @ 85B1ED4
.4byte gSpriteAffineAnim_85B1EB8
.align 2
gUnknown_085B1ED8:: @ 85B1ED8
.incbin "baserom.gba", 0x5b1ed8, 0x10
obj_tiles gUnknown_085B18AC, 0x0800, 0x1000
null_obj_tiles
.align 2
gUnknown_085B1EE8:: @ 85B1EE8
.incbin "baserom.gba", 0x5b1ee8, 0x10
obj_tiles gUnknown_085B1BCC, 0x0800, 0x1001
null_obj_tiles
.align 2
gUnknown_085B1EF8:: @ 85B1EF8
.incbin "baserom.gba", 0x5b1ef8, 0x18
obj_pal gBirchBallarrow_Pal, 0x1000
obj_pal gBirchCircle_Pal, 0x1001
null_obj_pal
.align 2
sSpriteTemplate_Hand:: @ 85B1F10
.incbin "baserom.gba", 0x5b1f10, 0x18
spr_template 0x1000, 0x1000, gOamData_85B1E10, gSpriteAnimTable_85B1E90, NULL, gDummySpriteAffineAnimTable, sub_81346DC
.align 2
sSpriteTemplate_PokeBall:: @ 85B1F28
.incbin "baserom.gba", 0x5b1f28, 0x18
spr_template 0x1000, 0x1000, gOamData_85B1E18, gSpriteAnimTable_85B1E94, NULL, gDummySpriteAffineAnimTable, sub_813473C
.align 2
gUnknown_085B1F40:: @ 85B1F40
.incbin "baserom.gba", 0x5b1f40, 0x18
spr_template 0x1001, 0x1001, gOamData_85B1E20, gSpriteAnimTable_85B1E9C, NULL, gSpriteAffineAnimTable_85B1ED4, StarterPokemonSpriteCallback

View File

@ -139,17 +139,14 @@ gUnknown_085E852C:: @ 85E852C
.string "CONTROLS$"
.align 2
gUnknown_085E8538:: @ 85E8538
.string "{UNK_CTRL_F80A}PICK {UNK_CTRL_F800}OK$"
.align 2
gUnknown_085E8544:: @ 85E8544
.string "{UNK_CTRL_F800}NEXT$"
.align 2
gUnknown_085E854C:: @ 85E854C
.string "{UNK_CTRL_F800}NEXT {UNK_CTRL_F801}BACK$"
@ -570,16 +567,16 @@ gText_EmptyString2:: @ 85E8D03
gUnknown_085E8D04:: @ 85E8D04
.string "CANCEL$"
gUnknown_085E8D0B:: @ 85E8D0B
gText_Item:: @ 85E8D0B
.string "ITEM$"
gUnknown_085E8D10:: @ 85E8D10
gText_Mail:: @ 85E8D10
.string "MAIL$"
gUnknown_085E8D15:: @ 85E8D15
gText_Take:: @ 85E8D15
.string "TAKE$"
gUnknown_085E8D1A:: @ 85E8D1A
gText_Store:: @ 85E8D1A
.string "STORE$"
gMenuText_Check:: @ 85E8D20
@ -988,34 +985,34 @@ gText_TurnedOverVar1ForVar2:: @ 85E9677
gText_PokedollarVar1:: @ 85E969C
.string "¥{STR_VAR_1}$"
gUnknown_085E96A0:: @ 85E96A0
gText_Shift:: @ 85E96A0
.string "SHIFT$"
gUnknown_085E96A6:: @ 85E96A6
gText_SendOut:: @ 85E96A6
.string "SEND OUT$"
gUnknown_085E96AF:: @ 85E96AF
gText_Switch2:: @ 85E96AF
.string "SWITCH$"
gUnknown_085E96B6:: @ 85E96B6
gText_Summary5:: @ 85E96B6
.string "SUMMARY$"
gUnknown_085E96BE:: @ 85E96BE
.string "MOVES$"
gUnknown_085E96C4:: @ 85E96C4
gText_Enter:: @ 85E96C4
.string "ENTER$"
gUnknown_085E96CA:: @ 85E96CA
gText_NoEntry:: @ 85E96CA
.string "NO ENTRY$"
gUnknown_085E96D3:: @ 85E96D3
gText_Take2:: @ 85E96D3
.string "TAKE$"
gUnknown_085E96D8:: @ 85E96D8
gText_Read2:: @ 85E96D8
.string "READ$"
gUnknown_085E96DD:: @ 85E96DD
gText_Trade4:: @ 85E96DD
.string "TRADE$"
gText_HP3:: @ 85E96E3
@ -1340,28 +1337,23 @@ gText_EggCantBeTradedNow:: @ 85EA234
.string "An EGG cant be traded now.$"
.align 2
gUnknown_085EA250:: @ 85EA250
gText_OtherTrainersPkmnCantBeTraded:: @ 85EA250
.string "The other TRAINERs POKéMON\ncant be traded now.$"
.align 2
gUnknown_085EA284:: @ 85EA284
gText_OtherTrainerCantAcceptPkmn:: @ 85EA284
.string "The other TRAINER cant accept\nthat POKéMON now.$"
.align 2
gUnknown_085EA2B8:: @ 85EA2B8
gText_CantTradeWithTrainer:: @ 85EA2B8
.string "You cant trade with that\nTRAINER now.$"
.align 2
gUnknown_085EA2E0:: @ 85EA2E0
gText_NotPkmnOtherTrainerWants:: @ 85EA2E0
.string "That isnt the type of POKéMON\nthat the other TRAINER wants.$"
.align 2
gUnknown_085EA320:: @ 85EA320
gText_ThatIsntAnEgg:: @ 85EA320
.string "That isnt an EGG.$"
gText_Register:: @ 85EA333
@ -2498,208 +2490,208 @@ gText_DontRemember:: @ 85EB7DB
gText_Exit:: @ 85EB7EA
.string "EXIT$"
gUnknown_085EB7EF:: @ 85EB7EF
gText_ExitFromBox:: @ 85EB7EF
.string "Exit from the BOX?$"
gUnknown_085EB802:: @ 85EB802
gText_WhatDoYouWantToDo:: @ 85EB802
.string "What do you want to do?$"
gUnknown_085EB81A:: @ 85EB81A
gText_PleasePickATheme:: @ 85EB81A
.string "Please pick a theme.$"
gUnknown_085EB82F:: @ 85EB82F
gText_PickTheWallpaper:: @ 85EB82F
.string "Pick the wallpaper.$"
gUnknown_085EB843:: @ 85EB843
gText_PkmnIsSelected:: @ 85EB843
.string "{SPECIAL_F7 0x00} is selected.$"
gUnknown_085EB853:: @ 85EB853
gText_JumpToWhichBox:: @ 85EB853
.string "Jump to which BOX?$"
gUnknown_085EB866:: @ 85EB866
gText_DepositInWhichBox:: @ 85EB866
.string "Deposit in which BOX?$"
gUnknown_085EB87C:: @ 85EB87C
gText_PkmnWasDeposited:: @ 85EB87C
.string "{SPECIAL_F7 0x00} was deposited.$"
gUnknown_085EB88E:: @ 85EB88E
gText_BoxIsFull2:: @ 85EB88E
.string "The BOX is full.$"
gUnknown_085EB89F:: @ 85EB89F
gText_ReleaseThisPokemon:: @ 85EB89F
.string "Release this POKéMON?$"
gUnknown_085EB8B5:: @ 85EB8B5
gText_PkmnWasReleased:: @ 85EB8B5
.string "{SPECIAL_F7 0x00} was released.$"
gUnknown_085EB8C6:: @ 85EB8C6
gText_ByeByePkmn:: @ 85EB8C6
.string "Bye-bye, {SPECIAL_F7 0x00}!$"
gUnknown_085EB8D3:: @ 85EB8D3
gText_MarkYourPkmn:: @ 85EB8D3
.string "Mark your POKéMON.$"
gUnknown_085EB8E6:: @ 85EB8E6
gText_ThatsYourLastPkmn:: @ 85EB8E6
.string "Thats your last POKéMON!$"
gUnknown_085EB900:: @ 85EB900
gText_YourPartysFull:: @ 85EB900
.string "Your partys full!$"
gUnknown_085EB913:: @ 85EB913
gText_YoureHoldingAPkmn:: @ 85EB913
.string "Youre holding a POKéMON!$"
gUnknown_085EB92D:: @ 85EB92D
gText_WhichOneWillYouTake:: @ 85EB92D
.string "Which one will you take?$"
gUnknown_085EB946:: @ 85EB946
gText_YouCantReleaseAnEgg:: @ 85EB946
.string "You cant release an EGG.$"
gUnknown_085EB960:: @ 85EB960
gText_ContinueBoxOperations:: @ 85EB960
.string "Continue BOX operations?$"
gUnknown_085EB979:: @ 85EB979
gText_PkmnCameBack:: @ 85EB979
.string "{SPECIAL_F7 0x00} came back!$"
gUnknown_085EB987:: @ 85EB987
gText_WasItWorriedAboutYou:: @ 85EB987
.string "Was it worried about you?$"
gUnknown_085EB9A1:: @ 85EB9A1
gText_FourEllipsesExclamation:: @ 85EB9A1
.string " !$"
gUnknown_085EB9AB:: @ 85EB9AB
gText_PleaseRemoveTheMail:: @ 85EB9AB
.string "Please remove the MAIL.$"
gUnknown_085EB9C3:: @ 85EB9C3
gText_GiveToAPkmn:: @ 85EB9C3
.string "GIVE to a POKéMON?$"
gUnknown_085EB9D6:: @ 85EB9D6
gText_PlacedItemInBag:: @ 85EB9D6
.string "Placed item in the BAG.$"
gUnknown_085EB9EE:: @ 85EB9EE
gText_BagIsFull2:: @ 85EB9EE
.string "The BAG is full.$"
gUnknown_085EB9FF:: @ 85EB9FF
gText_PutItemInBag:: @ 85EB9FF
.string "Put this item in the BAG?$"
gUnknown_085EBA19:: @ 85EBA19
gText_ItemIsNowHeld:: @ 85EBA19
.string "{SPECIAL_F7 0x00} is now held.$"
gUnknown_085EBA29:: @ 85EBA29
gText_ChangedToNewItem:: @ 85EBA29
.string "Changed to {SPECIAL_F7 0x00}.$"
gUnknown_085EBA38:: @ 85EBA38
gText_MailCantBeStored:: @ 85EBA38
.string "MAIL cant be stored!$"
gUnknown_085EBA4E:: @ 85EBA4E
gPCText_Cancel:: @ 85EBA4E
.string "CANCEL$"
gUnknown_085EBA55:: @ 85EBA55
gPCText_Store:: @ 85EBA55
.string "STORE$"
gUnknown_085EBA5B:: @ 85EBA5B
gPCText_Withdraw:: @ 85EBA5B
.string "WITHDRAW$"
gUnknown_085EBA64:: @ 85EBA64
gPCText_Shift:: @ 85EBA64
.string "SHIFT$"
gUnknown_085EBA6A:: @ 85EBA6A
gPCText_Move:: @ 85EBA6A
.string "MOVE$"
gUnknown_085EBA6F:: @ 85EBA6F
gPCText_Place:: @ 85EBA6F
.string "PLACE$"
gUnknown_085EBA75:: @ 85EBA75
gPCText_Summary:: @ 85EBA75
.string "SUMMARY$"
gUnknown_085EBA7D:: @ 85EBA7D
gPCText_Release:: @ 85EBA7D
.string "RELEASE$"
gUnknown_085EBA85:: @ 85EBA85
gPCText_Mark:: @ 85EBA85
.string "MARK$"
gUnknown_085EBA8A:: @ 85EBA8A
gPCText_Name:: @ 85EBA8A
.string "NAME$"
gUnknown_085EBA8F:: @ 85EBA8F
gPCText_Jump:: @ 85EBA8F
.string "JUMP$"
gUnknown_085EBA94:: @ 85EBA94
gPCText_Wallpaper:: @ 85EBA94
.string "WALLPAPER$"
gUnknown_085EBA9E:: @ 85EBA9E
gPCText_Take:: @ 85EBA9E
.string "TAKE$"
gUnknown_085EBAA3:: @ 85EBAA3
gPCText_Give:: @ 85EBAA3
.string "GIVE$"
gUnknown_085EBAA8:: @ 85EBAA8
gPCText_Switch:: @ 85EBAA8
.string "SWITCH$"
gUnknown_085EBAAF:: @ 85EBAAF
gPCText_Bag:: @ 85EBAAF
.string "BAG$"
gUnknown_085EBAB3:: @ 85EBAB3
gPCText_Info:: @ 85EBAB3
.string "INFO$"
gUnknown_085EBAB8:: @ 85EBAB8
gPCText_Scenery1:: @ 85EBAB8
.string "SCENERY 1$"
gUnknown_085EBAC2:: @ 85EBAC2
gPCText_Scenery2:: @ 85EBAC2
.string "SCENERY 2$"
gUnknown_085EBACC:: @ 85EBACC
gPCText_Scenery3:: @ 85EBACC
.string "SCENERY 3$"
gUnknown_085EBAD6:: @ 85EBAD6
gPCText_Etcetera:: @ 85EBAD6
.string "ETCETERA$"
gUnknown_085EBADF:: @ 85EBADF
gPCText_Friends:: @ 85EBADF
.string "FRIENDS$"
gUnknown_085EBAE7:: @ 85EBAE7
gPCText_Forest:: @ 85EBAE7
.string "FOREST$"
gUnknown_085EBAEE:: @ 85EBAEE
gPCText_City:: @ 85EBAEE
.string "CITY$"
gUnknown_085EBAF3:: @ 85EBAF3
gPCText_Desert:: @ 85EBAF3
.string "DESERT$"
gUnknown_085EBAFA:: @ 85EBAFA
gPCText_Savanna:: @ 85EBAFA
.string "SAVANNA$"
gUnknown_085EBB02:: @ 85EBB02
gPCText_Crag:: @ 85EBB02
.string "CRAG$"
gUnknown_085EBB07:: @ 85EBB07
gPCText_Volcano:: @ 85EBB07
.string "VOLCANO$"
gUnknown_085EBB0F:: @ 85EBB0F
gPCText_Snow:: @ 85EBB0F
.string "SNOW$"
gUnknown_085EBB14:: @ 85EBB14
gPCText_Cave:: @ 85EBB14
.string "CAVE$"
gUnknown_085EBB19:: @ 85EBB19
gPCText_Beach:: @ 85EBB19
.string "BEACH$"
gUnknown_085EBB1F:: @ 85EBB1F
gPCText_Seafloor:: @ 85EBB1F
.string "SEAFLOOR$"
gUnknown_085EBB28:: @ 85EBB28
gPCText_River:: @ 85EBB28
.string "RIVER$"
gUnknown_085EBB2E:: @ 85EBB2E
gPCText_Sky:: @ 85EBB2E
.string "SKY$"
gUnknown_085EBB32:: @ 85EBB32
gPCText_PolkaDot:: @ 85EBB32
.string "POLKA-DOT$"
gUnknown_085EBB3C:: @ 85EBB3C
gPCText_Pokecenter:: @ 85EBB3C
.string "POKéCENTER$"
gUnknown_085EBB47:: @ 85EBB47
gPCText_Machine:: @ 85EBB47
.string "MACHINE$"
gUnknown_085EBB4F:: @ 85EBB4F
gPCText_Simple:: @ 85EBB4F
.string "SIMPLE$"
gUnknown_085EBB56:: @ 85EBB56
@ -3585,27 +3577,22 @@ gText_BattlePyramid:: @ 85ED153
.string "BATTLE PYRAMID$"
.align 2
gUnknown_085ED164:: @ 85ED164
.string "{STR_VAR_1} SINGLE$"
.align 2
gUnknown_085ED170:: @ 85ED170
.string "{STR_VAR_1} DOUBLE$"
.align 2
gUnknown_085ED17C:: @ 85ED17C
.string "{STR_VAR_1} MULTI$"
.align 2
gUnknown_085ED188:: @ 85ED188
.string "{STR_VAR_1} LINK$"
.align 2
gUnknown_085ED190:: @ 85ED190
.string "{STR_VAR_1}$"
@ -4319,37 +4306,30 @@ gText_FloorsCleared:: @ 85EE39C
.string "Floors cleared: {STR_VAR_1}$"
.align 2
gUnknown_085EE3B0:: @ 85EE3B0
.string "LV. 50$"
.align 2
gUnknown_085EE3B8:: @ 85EE3B8
.string "OPEN LEVEL$"
.align 2
gUnknown_085EE3C4:: @ 85EE3C4
.string "Win streak: {STR_VAR_2}$"
.align 2
gUnknown_085EE3D4:: @ 85EE3D4
.string "Clear streak: {STR_VAR_2}$"
.align 2
gUnknown_085EE3E8:: @ 85EE3E8
.string "Rooms cleared: {STR_VAR_2}$"
.align 2
gUnknown_085EE3FC:: @ 85EE3FC
.string "KOs in a row: {STR_VAR_2}$"
.align 2
gUnknown_085EE410:: @ 85EE410
.string "Floors cleared: {STR_VAR_2}$"
@ -4665,16 +4645,16 @@ gText_MixingRecords:: @ 85EEA7E
gText_RecordMixingComplete:: @ 85EEA8E
.string "Record mixing completed.\nThank you for waiting.$"
gUnknown_085EEABE:: @ 85EEABE
gText_YourName:: @ 85EEABE
.string "YOUR NAME?$"
gUnknown_085EEAC9:: @ 85EEAC9
gText_BoxName:: @ 85EEAC9
.string "BOX NAME?$"
gUnknown_085EEAD3:: @ 85EEAD3
gText_PkmnsNickname:: @ 85EEAD3
.string "{STR_VAR_1}s nickname?$"
gUnknown_085EEAE2:: @ 85EEAE2
gText_TellHimTheWords:: @ 85EEAE2
.string "Tell him the words.$"
gText_MoveOkBack:: @ 85EEAF6
@ -4931,7 +4911,6 @@ gText_WhereShouldNewsBeAccessed:: @ 85EEF94
.string "Where should the WONDER NEWS\nbe accessed?$"
.align 2
gUnknown_085EEFC0:: @ 85EEFC0
.string "Communication standby\nB Button: Cancel$"

View File

@ -2,169 +2,195 @@
.include "constants/constants.inc"
.section .rodata
.align 2, 0
gUnknown_0850E87C:: @ 850E87C
.incbin "baserom.gba", 0x50e87c, 0x120
.align 2
gTextWindowFrame1_Gfx:: @ 850E87C
.incbin "graphics/text_window/1.4bpp"
gUnknown_0850E99C:: @ 850E99C
.incbin "baserom.gba", 0x50e99c, 0x120
.align 2
gTextWindowFrame2_Gfx:: @ 850E99C
.incbin "graphics/text_window/2.4bpp"
gUnknown_0850EABC:: @ 850EABC
.incbin "baserom.gba", 0x50eabc, 0x120
.align 2
gTextWindowFrame3_Gfx:: @ 850EABC
.incbin "graphics/text_window/3.4bpp"
gUnknown_0850EBDC:: @ 850EBDC
.incbin "baserom.gba", 0x50ebdc, 0x120
.align 2
gTextWindowFrame4_Gfx:: @ 850EBDC
.incbin "graphics/text_window/4.4bpp"
gUnknown_0850ECFC:: @ 850ECFC
.incbin "baserom.gba", 0x50ecfc, 0x120
.align 2
gTextWindowFrame5_Gfx:: @ 850ECFC
.incbin "graphics/text_window/5.4bpp"
gUnknown_0850EE1C:: @ 850EE1C
.incbin "baserom.gba", 0x50ee1c, 0x120
.align 2
gTextWindowFrame6_Gfx:: @ 850EE1C
.incbin "graphics/text_window/6.4bpp"
gUnknown_0850EF3C:: @ 850EF3C
.incbin "baserom.gba", 0x50ef3c, 0x120
.align 2
gTextWindowFrame7_Gfx:: @ 850EF3C
.incbin "graphics/text_window/7.4bpp"
gUnknown_0850F05C:: @ 850F05C
.incbin "baserom.gba", 0x50f05c, 0x120
.align 2
gTextWindowFrame8_Gfx:: @ 850F05C
.incbin "graphics/text_window/8.4bpp"
gUnknown_0850F17C:: @ 850F17C
.incbin "baserom.gba", 0x50f17c, 0x120
.align 2
gTextWindowFrame9_Gfx:: @ 850F17C
.incbin "graphics/text_window/9.4bpp"
gUnknown_0850F29C:: @ 850F29C
.incbin "baserom.gba", 0x50f29c, 0x120
.align 2
gTextWindowFrame10_Gfx:: @ 850F29C
.incbin "graphics/text_window/10.4bpp"
gUnknown_0850F3BC:: @ 850F3BC
.incbin "baserom.gba", 0x50f3bc, 0x120
.align 2
gTextWindowFrame11_Gfx:: @ 850F3BC
.incbin "graphics/text_window/11.4bpp"
gUnknown_0850F4DC:: @ 850F4DC
.incbin "baserom.gba", 0x50f4dc, 0x120
.align 2
gTextWindowFrame12_Gfx:: @ 850F4DC
.incbin "graphics/text_window/12.4bpp"
gUnknown_0850F5FC:: @ 850F5FC
.incbin "baserom.gba", 0x50f5fc, 0x120
.align 2
gTextWindowFrame13_Gfx:: @ 850F5FC
.incbin "graphics/text_window/13.4bpp"
gUnknown_0850F71C:: @ 850F71C
.incbin "baserom.gba", 0x50f71c, 0x120
.align 2
gTextWindowFrame14_Gfx:: @ 850F71C
.incbin "graphics/text_window/14.4bpp"
gUnknown_0850F83C:: @ 850F83C
.incbin "baserom.gba", 0x50f83c, 0x120
.align 2
gTextWindowFrame15_Gfx:: @ 850F83C
.incbin "graphics/text_window/15.4bpp"
gUnknown_0850F95C:: @ 850F95C
.incbin "baserom.gba", 0x50f95c, 0x120
.align 2
gTextWindowFrame16_Gfx:: @ 850F95C
.incbin "graphics/text_window/16.4bpp"
gUnknown_0850FA7C:: @ 850FA7C
.incbin "baserom.gba", 0x50fa7c, 0x120
.align 2
gTextWindowFrame17_Gfx:: @ 850FA7C
.incbin "graphics/text_window/17.4bpp"
gUnknown_0850FB9C:: @ 850FB9C
.incbin "baserom.gba", 0x50fb9c, 0x120
.align 2
gTextWindowFrame18_Gfx:: @ 850FB9C
.incbin "graphics/text_window/18.4bpp"
gUnknown_0850FCBC:: @ 850FCBC
.incbin "baserom.gba", 0x50fcbc, 0x120
.align 2
gTextWindowFrame19_Gfx:: @ 850FCBC
.incbin "graphics/text_window/19.4bpp"
gUnknown_0850FDDC:: @ 850FDDC
.incbin "baserom.gba", 0x50fddc, 0x120
.align 2
gTextWindowFrame20_Gfx:: @ 850FDDC
.incbin "graphics/text_window/20.4bpp"
gUnknown_0850FEFC:: @ 850FEFC
.incbin "baserom.gba", 0x50fefc, 0x20
.align 2
gTextWindowFrame1_Pal:: @ 850FEFC
.incbin "graphics/text_window/1.gbapal"
gUnknown_0850FF1C:: @ 850FF1C
.incbin "baserom.gba", 0x50ff1c, 0x20
.align 2
gTextWindowFrame2_Pal:: @ 850FF1C
.incbin "graphics/text_window/2.gbapal"
gUnknown_0850FF3C:: @ 850FF3C
.incbin "baserom.gba", 0x50ff3c, 0x20
.align 2
gTextWindowFrame3_Pal:: @ 850FF3C
.incbin "graphics/text_window/3.gbapal"
gUnknown_0850FF5C:: @ 850FF5C
.incbin "baserom.gba", 0x50ff5c, 0x20
.align 2
gTextWindowFrame4_Pal:: @ 850FF5C
.incbin "graphics/text_window/4.gbapal"
gUnknown_0850FF7C:: @ 850FF7C
.incbin "baserom.gba", 0x50ff7c, 0x20
.align 2
gTextWindowFrame5_Pal:: @ 850FF7C
.incbin "graphics/text_window/5.gbapal"
gUnknown_0850FF9C:: @ 850FF9C
.incbin "baserom.gba", 0x50ff9c, 0x20
.align 2
gTextWindowFrame6_Pal:: @ 850FF9C
.incbin "graphics/text_window/6.gbapal"
gUnknown_0850FFBC:: @ 850FFBC
.incbin "baserom.gba", 0x50ffbc, 0x20
.align 2
gTextWindowFrame7_Pal:: @ 850FFBC
.incbin "graphics/text_window/7.gbapal"
gUnknown_0850FFDC:: @ 850FFDC
.incbin "baserom.gba", 0x50ffdc, 0x20
.align 2
gTextWindowFrame8_Pal:: @ 850FFDC
.incbin "graphics/text_window/8.gbapal"
gUnknown_0850FFFC:: @ 850FFFC
.incbin "baserom.gba", 0x50fffc, 0x20
.align 2
gTextWindowFrame9_Pal:: @ 850FFFC
.incbin "graphics/text_window/9.gbapal"
gUnknown_0851001C:: @ 851001C
.incbin "baserom.gba", 0x51001c, 0x20
.align 2
gTextWindowFrame10_Pal:: @ 851001C
.incbin "graphics/text_window/10.gbapal"
gUnknown_0851003C:: @ 851003C
.incbin "baserom.gba", 0x51003c, 0x20
.align 2
gTextWindowFrame11_Pal:: @ 851003C
.incbin "graphics/text_window/11.gbapal"
gUnknown_0851005C:: @ 851005C
.incbin "baserom.gba", 0x51005c, 0x20
.align 2
gTextWindowFrame12_Pal:: @ 851005C
.incbin "graphics/text_window/12.gbapal"
gUnknown_0851007C:: @ 851007C
.incbin "baserom.gba", 0x51007c, 0x20
.align 2
gTextWindowFrame13_Pal:: @ 851007C
.incbin "graphics/text_window/13.gbapal"
gUnknown_0851009C:: @ 851009C
.incbin "baserom.gba", 0x51009c, 0x20
.align 2
gTextWindowFrame14_Pal:: @ 851009C
.incbin "graphics/text_window/14.gbapal"
gUnknown_085100BC:: @ 85100BC
.incbin "baserom.gba", 0x5100bc, 0x20
.align 2
gTextWindowFrame15_Pal:: @ 85100BC
.incbin "graphics/text_window/15.gbapal"
gUnknown_085100DC:: @ 85100DC
.incbin "baserom.gba", 0x5100dc, 0x20
.align 2
gTextWindowFrame16_Pal:: @ 85100DC
.incbin "graphics/text_window/16.gbapal"
gUnknown_085100FC:: @ 85100FC
.incbin "baserom.gba", 0x5100fc, 0x20
.align 2
gTextWindowFrame17_Pal:: @ 85100FC
.incbin "graphics/text_window/17.gbapal"
gUnknown_0851011C:: @ 851011C
.incbin "baserom.gba", 0x51011c, 0x20
.align 2
gTextWindowFrame18_Pal:: @ 851011C
.incbin "graphics/text_window/18.gbapal"
gUnknown_0851013C:: @ 851013C
.incbin "baserom.gba", 0x51013c, 0x20
.align 2
gTextWindowFrame19_Pal:: @ 851013C
.incbin "graphics/text_window/19.gbapal"
gUnknown_0851015C:: @ 851015C
.incbin "baserom.gba", 0x51015c, 0x20
.align 2
gTextWindowFrame20_Pal:: @ 851015C
.incbin "graphics/text_window/20.gbapal"
.align 2
gUnknown_0851017C:: @ 851017C
.incbin "baserom.gba", 0x51017c, 0xA0
.incbin "graphics/text_window/message_box.gbapal"
.incbin "graphics/text_window/text_pal1.gbapal"
.incbin "graphics/text_window/text_pal2.gbapal"
.incbin "graphics/text_window/text_pal3.gbapal"
.incbin "graphics/text_window/text_pal4.gbapal"
.align 2
gUnknown_0851021C:: @ 851021C
.4byte gUnknown_0850E87C
.4byte gUnknown_0850FEFC
.4byte gUnknown_0850E99C
.4byte gUnknown_0850FF1C
.4byte gUnknown_0850EABC
.4byte gUnknown_0850FF3C
.4byte gUnknown_0850EBDC
.4byte gUnknown_0850FF5C
.4byte gUnknown_0850ECFC
.4byte gUnknown_0850FF7C
.4byte gUnknown_0850EE1C
.4byte gUnknown_0850FF9C
.4byte gUnknown_0850EF3C
.4byte gUnknown_0850FFBC
.4byte gUnknown_0850F05C
.4byte gUnknown_0850FFDC
.4byte gUnknown_0850F17C
.4byte gUnknown_0850FFFC
.4byte gUnknown_0850F29C
.4byte gUnknown_0851001C
.4byte gUnknown_0850F3BC
.4byte gUnknown_0851003C
.4byte gUnknown_0850F4DC
.4byte gUnknown_0851005C
.4byte gUnknown_0850F5FC
.4byte gUnknown_0851007C
.4byte gUnknown_0850F71C
.4byte gUnknown_0851009C
.4byte gUnknown_0850F83C
.4byte gUnknown_085100BC
.4byte gUnknown_0850F95C
.4byte gUnknown_085100DC
.4byte gUnknown_0850FA7C
.4byte gUnknown_085100FC
.4byte gUnknown_0850FB9C
.4byte gUnknown_0851011C
.4byte gUnknown_0850FCBC
.4byte gUnknown_0851013C
.4byte gUnknown_0850FDDC
.4byte gUnknown_0851015C
.4byte gTextWindowFrame1_Gfx, gTextWindowFrame1_Pal
.4byte gTextWindowFrame2_Gfx, gTextWindowFrame2_Pal
.4byte gTextWindowFrame3_Gfx, gTextWindowFrame3_Pal
.4byte gTextWindowFrame4_Gfx, gTextWindowFrame4_Pal
.4byte gTextWindowFrame5_Gfx, gTextWindowFrame5_Pal
.4byte gTextWindowFrame6_Gfx, gTextWindowFrame6_Pal
.4byte gTextWindowFrame7_Gfx, gTextWindowFrame7_Pal
.4byte gTextWindowFrame8_Gfx, gTextWindowFrame8_Pal
.4byte gTextWindowFrame9_Gfx, gTextWindowFrame9_Pal
.4byte gTextWindowFrame10_Gfx, gTextWindowFrame10_Pal
.4byte gTextWindowFrame11_Gfx, gTextWindowFrame11_Pal
.4byte gTextWindowFrame12_Gfx, gTextWindowFrame12_Pal
.4byte gTextWindowFrame13_Gfx, gTextWindowFrame13_Pal
.4byte gTextWindowFrame14_Gfx, gTextWindowFrame14_Pal
.4byte gTextWindowFrame15_Gfx, gTextWindowFrame15_Pal
.4byte gTextWindowFrame16_Gfx, gTextWindowFrame16_Pal
.4byte gTextWindowFrame17_Gfx, gTextWindowFrame17_Pal
.4byte gTextWindowFrame18_Gfx, gTextWindowFrame18_Pal
.4byte gTextWindowFrame19_Gfx, gTextWindowFrame19_Pal
.4byte gTextWindowFrame20_Gfx, gTextWindowFrame20_Pal

View File

@ -1,26 +1,35 @@
#include "constants/species.h"
#include "constants/items.h"
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2, 0
.align 2
gUnknown_0832C6A8:: @ 832C6A8
.incbin "baserom.gba", 0x32C6A8, 0x18
.4byte 0x00000f2c, 0x00003d88, 0x0000001c, 0x00000024, 0x00000064, 0x00000528
gUnknown_0832C6C0:: @ 832C6C0
.incbin "baserom.gba", 0x32c6c0, 0x1fe
.align 1
gTradeMovesBoxTilemap:: @ 832C6C0
.incbin "graphics/trade/moves_box_map.bin"
gUnknown_0832C8BE:: @ 832C8BE
.incbin "baserom.gba", 0x32c8be, 0x1fe
.align 1
gTradePartyBoxTilemap:: @ 832C8BE
.incbin "graphics/trade/party_box_map.bin"
gUnknown_0832CABC:: @ 832CABC
.incbin "baserom.gba", 0x32cabc, 0x800
.align 1
gTradeStripesBG2Tilemap:: @ 832CABC
.incbin "graphics/trade/stripes_bg2_map.bin"
gUnknown_0832D2BC:: @ 832D2BC
.incbin "baserom.gba", 0x32d2bc, 0x800
.align 1
gTradeStripesBG3Tilemap:: @ 832D2BC
.incbin "graphics/trade/stripes_bg3_map.bin"
gUnknown_0832DABC:: @ 832DABC
.incbin "baserom.gba", 0x32dabc, 0xb
gText_EmptyString7:: @ 832DABC
.string "$"
gText_ClrWhtHltTrspntShdwDrkGry:: @ 832DABD
.string "{COLOR WHITE}{HIGHLIGHT TRANSPARENT}{SHADOW DARK_GREY}$"
gText_MaleSymbol4:: @ 832DAC7
.string "$"
@ -29,175 +38,609 @@ gText_FemaleSymbol4:: @ 832DAC9
.string "$"
gText_GenderlessSymbol:: @ 832DACB
.incbin "baserom.gba", 0x32dacb, 0x7
.string "$"
gUnknown_0832DAD2:: @ 832DAD2
.incbin "baserom.gba", 0x32dad2, 0xd
gText_SpaceMove:: @ 832DACC
.string " MOVE$"
gUnknown_0832DADF:: @ 832DADF
.incbin "baserom.gba", 0x32dadf, 0x6
gText_NewLine3:: @ 832DAD2
.string "\n$"
gUnknown_0832DAE5:: @ 832DAE5
.incbin "baserom.gba", 0x32dae5, 0x157
gText_Slash2:: @ 832DAD4
.string "/$"
gText_Lv2:: @ 832DAD6
.string "Lv. $"
gText_ThreeDashes2:: @ 832DADB
.string "---$"
gText_FourQuestionMarks:: @ 832DADF
.string "????$"
gText_832DAE4:: @ 832DAE4
.string "$"
gText_IsThisTradeOkay:: @ 832DAE5
.string "Is this trade okay?$"
gText_Cancel6:: @ 832DAF9
.string "CANCEL$"
gText_ChooseAPkmn:: @ 832DB00
.string "Choose a POKéMON.$"
gText_Summary3:: @ 832DB12
.string "SUMMARY$"
gText_Trade2:: @ 832DB1A
.string "TRADE$"
gText_CancelTrade:: @ 832DB20
.string "Cancel trade?$"
gJPText_832DB2E:: @ 832DB2E
.string "B  $"
gText_Summary4:: @ 832DB3B
.string "SUMMARY$"
gText_Trade3:: @ 832DB43
.string "TRADE$"
gText_CommunicationStandby6:: @ 832DB49
.string "{COLOR DARK_GREY}{HIGHLIGHT WHITE}{SHADOW LIGHT_GREY}Communication standby\nPlease wait.$"
gText_TheTradeHasBeenCanceled:: @ 832DB76
.string "{COLOR DARK_GREY}{HIGHLIGHT WHITE}{SHADOW LIGHT_GREY}The trade has\nbeen canceled.$"
gText_YourOnlyPkmnForBattle:: @ 832DB9C
.string "Thats your only\nPOKéMON for battle.$"
gText_WaitingForYourFriend:: @ 832DBC1
.string "{COLOR DARK_GREY}{HIGHLIGHT WHITE}{SHADOW LIGHT_GREY}Waiting for your friend\nto finish$"
gText_YourFriendWantsToTrade:: @ 832DBED
.string "Your friend wants\nto trade POKéMON.$"
.align 2
gOamData_832DC14:: @ 832DC14
.2byte 0x4000, 0x8000, 0x0400, 0x0000
.align 2
gOamData_832DC1C:: @ 832DC1C
.2byte 0x4000, 0xc000, 0x0400, 0x0000
.align 2
gSpriteAnim_832DC24:: @ 832DC24
.2byte 0x0000, 0x0005, 0xffff, 0x0000
.align 2
gSpriteAnim_832DC2C:: @ 832DC2C
.2byte 0x0020, 0x0005, 0xffff, 0x0000
.align 2
gSpriteAnimTable_832DC34:: @ 832DC34
.4byte gSpriteAnim_832DC24
.4byte gSpriteAnim_832DC2C
.align 2
gUnknown_0832DC3C:: @ 832DC3C
.incbin "baserom.gba", 0x32dc3c, 0x8
obj_tiles gUnknown_08DDC6E4, 0x0800, 0x012c
.align 2
gUnknown_0832DC44:: @ 832DC44
.incbin "baserom.gba", 0x32dc44, 0x50
obj_pal gUnknown_08DDB444, 0x0929
gUnknown_0832DC94:: @ 832DC94
.incbin "baserom.gba", 0x32dc94, 0x18
.align 2
gSpriteAnim_832DC4C:: @ 832DC4C
.2byte 0x0000, 0x0005, 0xffff, 0x0000
gUnknown_0832DCAC:: @ 832DCAC
.incbin "baserom.gba", 0x32dcac, 0x38
.align 2
gSpriteAnim_832DC54:: @ 832DC54
.2byte 0x0008, 0x0005, 0xffff, 0x0000
gUnknown_0832DCE4:: @ 832DCE4
.incbin "baserom.gba", 0x32dce4, 0x8
.align 2
gSpriteAnim_832DC5C:: @ 832DC5C
.2byte 0x0010, 0x0005, 0xffff, 0x0000
.align 2
gSpriteAnim_832DC64:: @ 832DC64
.2byte 0x0018, 0x0005, 0xffff, 0x0000
.align 2
gSpriteAnim_832DC6C:: @ 832DC6C
.2byte 0x0020, 0x0005, 0xffff, 0x0000
.align 2
gSpriteAnim_832DC74:: @ 832DC74
.2byte 0x0028, 0x0005, 0xffff, 0x0000
.align 2
gSpriteAnimTable_832DC7C:: @ 832DC7C
.4byte gSpriteAnim_832DC4C
.4byte gSpriteAnim_832DC54
.4byte gSpriteAnim_832DC5C
.4byte gSpriteAnim_832DC64
.4byte gSpriteAnim_832DC6C
.4byte gSpriteAnim_832DC74
.align 2
gSpriteTemplate_832DC94:: @ 832DC94
spr_template 0x012c, 0x0929, gOamData_832DC1C, gSpriteAnimTable_832DC34, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
.align 2
gSpriteTemplate_832DCAC:: @ 832DCAC
spr_template 0x00c8, 0x133d, gOamData_832DC14, gSpriteAnimTable_832DC7C, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
.align 2
TradeScreenTextPalette:: @ 832DCC4
.incbin "graphics/trade/text.gbapal"
.align 2
gSpritePalette_TradeScreenText:: @ 832DCE4
obj_pal TradeScreenTextPalette, 0x133d
gUnknown_0832DCEC:: @ 832DCEC
.incbin "baserom.gba", 0x32dcec, 0x138
.byte 0x04, 0x02, 0x0c, 0x0c, 0x00, 0x00, 0x02, 0x04, 0x0c, 0x0c, 0x00, 0x00, 0x07, 0x06, 0x01, 0x00, 0x00, 0x00, 0x01, 0x06, 0x07, 0x00, 0x00, 0x00, 0x05, 0x03, 0x0c, 0x0c, 0x00, 0x00, 0x03, 0x05
.byte 0x0c, 0x0c, 0x00, 0x00, 0x00, 0x07, 0x06, 0x01, 0x00, 0x00, 0x06, 0x07, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x09, 0x08, 0x07, 0x06
.byte 0x00, 0x00, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x05, 0x01, 0x01, 0x01, 0x00, 0x00, 0x02, 0x09, 0x08, 0x07, 0x00, 0x00, 0x08, 0x09, 0x06, 0x06, 0x00, 0x00
.byte 0x02, 0x02, 0x02, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0b, 0x0a, 0x09, 0x08, 0x07, 0x06, 0x05, 0x03, 0x01, 0x00, 0x00, 0x00, 0x03, 0x03, 0x03, 0x03, 0x00, 0x00, 0x01, 0x01
.byte 0x01, 0x01, 0x00, 0x00, 0x04, 0x04, 0x04, 0x04, 0x00, 0x00, 0x0a, 0x08, 0x06, 0x00, 0x00, 0x00, 0x0a, 0x08, 0x0c, 0x00, 0x00, 0x00, 0x08, 0x0a, 0x0c, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x07, 0x00, 0x01, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x09, 0x0c, 0x00, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0a, 0x06, 0x00, 0x00, 0x00, 0x00, 0x03, 0x02, 0x01, 0x00, 0x00, 0x00, 0x09, 0x07, 0x00, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0b, 0x0c
.byte 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x01, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x04, 0x03, 0x02
.byte 0x01, 0x00, 0x0b, 0x09, 0x07, 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x02, 0x00, 0x00, 0x00, 0x00
.byte 0x0b, 0x09, 0x07, 0x06, 0x00, 0x00, 0x07, 0x06, 0x00, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x00, 0x00
gUnknown_0832DE24:: @ 832DE24
.incbin "baserom.gba", 0x32de24, 0x1a
.byte 0x01, 0x05, 0x08, 0x05, 0x01, 0x0a, 0x08, 0x0a, 0x01, 0x0f, 0x08, 0x0f, 0x10, 0x05, 0x17, 0x05, 0x10, 0x0a, 0x17, 0x0a, 0x10, 0x0f, 0x17, 0x0f, 0x17, 0x12
gUnknown_0832DE3E:: @ 832DE3E
.incbin "baserom.gba", 0x32de3e, 0x18
.byte 0x05, 0x04, 0x0c, 0x04, 0x05, 0x09, 0x0c, 0x09, 0x05, 0x0e, 0x0c, 0x0e, 0x14, 0x04, 0x1b, 0x04, 0x14, 0x09, 0x1b, 0x09, 0x14, 0x0e, 0x1b, 0x0e
gUnknown_0832DE56:: @ 832DE56
.incbin "baserom.gba", 0x32de56, 0x3e
.byte 0x01, 0x03, 0x08, 0x03, 0x01, 0x08, 0x08, 0x08, 0x01, 0x0d, 0x08, 0x0d, 0x10, 0x03, 0x17, 0x03, 0x10, 0x08, 0x17, 0x08, 0x10, 0x0d, 0x17, 0x0d, 0x00, 0x0e, 0x0f, 0x1d, 0x03, 0x05, 0x03, 0x07
.byte 0x12, 0x05, 0x12, 0x07, 0x08, 0x07, 0x16, 0x0c, 0x08, 0x07, 0x16, 0x0c, 0x06, 0x07, 0x18, 0x0c, 0x06, 0x07, 0x18, 0x0c, 0x08, 0x07, 0x16, 0x0c, 0x07, 0x07, 0x17, 0x0c, 0x00, 0x00
.align 2
gUnknown_0832DE94:: @ 832DE94
.incbin "baserom.gba", 0x32de94, 0x18
.4byte gText_Cancel6
.4byte gText_ChooseAPkmn
.4byte gText_Summary3
.4byte gText_Trade2
.4byte gText_CancelTrade
.4byte gJPText_832DB2E
.align 2
gUnknown_0832DEAC:: @ 832DEAC
.incbin "baserom.gba", 0x32deac, 0x10
.4byte gText_Summary4, sub_807A000
.4byte gText_Trade3, sub_807A024
.align 2
gUnknown_0832DEBC:: @ 832DEBC
.incbin "baserom.gba", 0x32debc, 0x24
.4byte gText_CommunicationStandby6
.4byte gText_TheTradeHasBeenCanceled
.4byte gText_YourOnlyPkmnForBattle
.4byte gText_OnlyPkmnForBattle
.4byte gText_WaitingForYourFriend
.4byte gText_YourFriendWantsToTrade
.4byte gText_PkmnCantBeTradedNow
.4byte gText_EggCantBeTradedNow
.4byte gText_OtherTrainersPkmnCantBeTraded
gUnknown_0832DEE0:: @ 832DEE0
.incbin "baserom.gba", 0x32dee0, 0x4
.byte 0x00, 0x01, 0x02, 0x00
.align 2
gUnknown_0832DEE4:: @ 832DEE4
.incbin "baserom.gba", 0x32dee4, 0x10
.4byte 0x000001f8, 0x00001051, 0x00002062, 0x00003073
.align 2
gUnknown_0832DEF4:: @ 832DEF4
.incbin "baserom.gba", 0x32def4, 0x98
window_template 0x00, 0x04, 0x07, 0x16, 0x04, 0x0f, 0x001e
window_template 0x00, 0x13, 0x0f, 0x0a, 0x04, 0x0f, 0x0076
window_template 0x00, 0x00, 0x05, 0x08, 0x02, 0x0d, 0x009e
window_template 0x00, 0x07, 0x05, 0x08, 0x02, 0x0d, 0x00ae
window_template 0x00, 0x00, 0x0a, 0x08, 0x02, 0x0d, 0x00be
window_template 0x00, 0x07, 0x0a, 0x08, 0x02, 0x0d, 0x00ce
window_template 0x00, 0x00, 0x0f, 0x08, 0x02, 0x0d, 0x00de
window_template 0x00, 0x07, 0x0f, 0x08, 0x02, 0x0d, 0x00ee
window_template 0x00, 0x0f, 0x05, 0x08, 0x02, 0x0d, 0x00fe
window_template 0x00, 0x16, 0x05, 0x08, 0x02, 0x0d, 0x010e
window_template 0x00, 0x0f, 0x0a, 0x08, 0x02, 0x0d, 0x011e
window_template 0x00, 0x16, 0x0a, 0x08, 0x02, 0x0d, 0x012e
window_template 0x00, 0x0f, 0x0f, 0x08, 0x02, 0x0d, 0x013e
window_template 0x00, 0x16, 0x0f, 0x08, 0x02, 0x0d, 0x014e
window_template 0x00, 0x02, 0x05, 0x0e, 0x02, 0x0d, 0x015e
window_template 0x00, 0x03, 0x08, 0x0b, 0x08, 0x0f, 0x017a
window_template 0x00, 0x11, 0x05, 0x0e, 0x02, 0x0f, 0x01d2
window_template 0x00, 0x12, 0x08, 0x0b, 0x08, 0x0f, 0x01ee
null_window_template
.align 2
gUnknown_0832DF8C:: @ 832DF8C
.incbin "baserom.gba", 0x32df8c, 0x8
window_template 0x00, 0x17, 0x0d, 0x05, 0x04, 0x0f, 0x0246
gUnknown_0832DF94:: @ 832DF94
.incbin "baserom.gba", 0x32df94, 0x5
gJPText_Shedinja:: @ 832DF94
.string "$"
gUnknown_0832DF99:: @ 832DF99
.incbin "baserom.gba", 0x32df99, 0x2027
.byte 0x04, 0x03, 0x13, 0x03, 0x00, 0x00, 0x00
.align 2
gTradeBallPalette:: @ 832DFA0
.incbin "graphics/trade/ball.gbapal"
.align 2
gTradeBallTiles:: @ 832DFC0
.incbin "graphics/trade/ball.4bpp"
.align 2
gUnknown_832E5C0:: @ 832E5C0
.incbin "graphics/trade/pokeball_symbol.8bpp"
.align 2
gUnknown_0832FFC0:: @ 832FFC0
.incbin "baserom.gba", 0x32ffc0, 0x1fa0
.incbin "graphics/trade/cable_closeup_map.bin"
.align 2
gUnknown_083307C0:: @ 83307C0
.incbin "graphics/trade/pokeball_symbol_map.bin"
.align 2
gUnknown_083308C0:: @ 83308C0
.incbin "graphics/trade/unknown_3308C0.gbapal"
.align 2
gUnknown_083308E0:: @ 83308E0
.incbin "graphics/trade/gba.gbapal"
.incbin "graphics/trade/shadow.gbapal"
.incbin "graphics/trade/black.gbapal"
.align 2
gUnknown_08330940:: @ 8330940
.incbin "graphics/trade/misc.gbapal"
.align 2
gTradeGlow1Tiles:: @ 8330960
.incbin "graphics/trade/glow1.4bpp"
.align 2
gTradeGlow2Tiles:: @ 8330B60
.incbin "graphics/trade/glow2.4bpp"
.align 2
gTradeCableEndTiles:: @ 8330D60
.incbin "graphics/trade/cable_end.4bpp"
.align 2
gTradeGBAScreenTiles:: @ 8330F60
.incbin "graphics/trade/gba_screen.4bpp"
.align 2
gUnknown_08331F60:: @ 8331F60
.incbin "baserom.gba", 0x331f60, 0x1000
.incbin "graphics/trade/shadow_map.bin"
.align 2
gUnknown_08332F60:: @ 8332F60
.incbin "baserom.gba", 0x332f60, 0x2840
.incbin "graphics/trade/gba_affine.8bpp"
.space 0x40
.align 2
gUnknown_083357A0:: @ 83357A0
.incbin "baserom.gba", 0x3357a0, 0x100
.incbin "graphics/trade/gba_affine_map_cable.bin"
.align 2
gUnknown_083358A0:: @ 83358A0
.incbin "baserom.gba", 0x3358a0, 0x100
.incbin "graphics/trade/gba_affine_map_wireless.bin"
.align 2
gUnknown_083359A0:: @ 83359A0
.incbin "baserom.gba", 0x3359a0, 0x1000
.incbin "graphics/trade/gba_map_wireless.bin"
.align 2
gUnknown_083369A0:: @ 83369A0
.incbin "baserom.gba", 0x3369a0, 0x1000
.incbin "graphics/trade/gba_map_cable.bin"
.align 2
gUnknown_083379A0:: @ 83379A0
.incbin "baserom.gba", 0x3379a0, 0x100
.incbin "graphics/trade/unknown_3379A0.bin.lz"
.align 2
gUnknown_08337AA0:: @ 8337AA0
.incbin "baserom.gba", 0x337aa0, 0x200
.incbin "graphics/trade/wireless_signal_send.gbapal"
.align 2
gUnknown_08337CA0:: @ 8337CA0
.incbin "baserom.gba", 0x337ca0, 0x200
.incbin "graphics/trade/wireless_signal_receive.gbapal"
.align 2
gUnknown_08337EA0:: @ 8337EA0
.incbin "baserom.gba", 0x337ea0, 0x20
.incbin "graphics/trade/black.gbapal"
.align 2
gUnknown_08337EC0:: @ 8337EC0
.incbin "baserom.gba", 0x337ec0, 0x690
.incbin "graphics/trade/wireless_signal.4bpp.lz"
.align 2
gUnknown_08338550:: @ 8338550
.incbin "baserom.gba", 0x338550, 0x7c8
.incbin "graphics/trade/wireless_signal.bin.lz"
.align 2
gOamData_8338C44:: @ 8338C44
.2byte 0x0100, 0x4000, 0x0000, 0x0000
.align 2
gSpriteAnim_8338C4C:: @ 8338C4C
.2byte 0x0000, 0x0003, 0x0004, 0x0003, 0x0008, 0x0003, 0x000c, 0x0003, 0x0010, 0x0003, 0x0014, 0x0003, 0x0018, 0x0003, 0x001c, 0x0003
.2byte 0x0020, 0x0003, 0x0024, 0x0003, 0x0028, 0x0003, 0x002c, 0x0003, 0xfffd, 0x0001, 0x0000, 0x0003, 0xffff, 0x0000
.align 2
gSpriteAnim_8338C88:: @ 8338C88
.2byte 0x0000, 0x0003, 0x0004, 0x0003, 0x0008, 0x0003, 0x000c, 0x0003, 0x0010, 0x0003, 0x0014, 0x0003, 0x0018, 0x0003, 0x001c, 0x0003
.2byte 0x0020, 0x0003, 0x0024, 0x0003, 0x0028, 0x0003, 0x002c, 0x0003, 0xfffd, 0x0002, 0x0000, 0x0003, 0xffff, 0x0000
.align 2
gSpriteAnimTable_8338C88:: @ 8338CC4
.4byte gSpriteAnim_8338C4C
.4byte gSpriteAnim_8338C88
.align 2
gSpriteAffineAnim_8338CCC:: @ 8338CCC
.2byte 0x0000, 0x0000, 0x0100, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000
.align 2
gSpriteAffineAnim_8338CDC:: @ 8338CDC
.2byte 0xfff8, 0x0000, 0x1400, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000
.align 2
gSpriteAffineAnim_8338CEC:: @ 8338CEC
.2byte 0x0060, 0x0100, 0x0000, 0x0000, 0x0000, 0x0000, 0x0500, 0x0000, 0x0008, 0x0000, 0x1400, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000
.align 2
gSpriteAffineAnimTable_8338D0C:: @ 8338D0C
.4byte gSpriteAffineAnim_8338CCC
.4byte gSpriteAffineAnim_8338CDC
.4byte gSpriteAffineAnim_8338CEC
.align 2
gUnknown_08338D18:: @ 8338D18
.incbin "baserom.gba", 0x338d18, 0x8
obj_tiles gTradeBallTiles, 0x0600, 0x15b5
.align 2
gUnknown_08338D20:: @ 8338D20
.incbin "baserom.gba", 0x338d20, 0x8
obj_pal gTradeBallPalette, 0x15b6
gUnknown_08338D28:: @ 8338D28
.incbin "baserom.gba", 0x338d28, 0x48
.align 2
gSpriteTemplate_8338D28:: @ 8338D28
spr_template 0x15b5, 0x15b6, gOamData_8338C44, gSpriteAnimTable_8338C88, NULL, gSpriteAffineAnimTable_8338D0C, sub_807E55C
.align 2
gOamData_8338D40:: @ 8338D40
.2byte 0x0500, 0x8000, 0x0400, 0x0000
.align 2
gSpriteAnim_8338D48:: @ 8338D48
.2byte 0x0000, 0x00c5, 0xffff, 0x0000
.align 2
gSpriteAnimTable_8338D50:: @ 8338D50
.4byte gSpriteAnim_8338D48
.align 2
gSpriteAffineAnim_8338D54:: @ 8338D54
.2byte 0xfff6, 0xfff6, 0x0500, 0x0000, 0x000a, 0x000a, 0x0500, 0x0000, 0x7ffe, 0x0000, 0x0000, 0x0000
.align 2
gSpriteAffineAnimTable_8338D6C:: @ 8338D6C
.4byte gSpriteAffineAnim_8338D54
.align 2
gUnknown_08338D70:: @ 8338D70
.incbin "baserom.gba", 0x338d70, 0x8
obj_tiles gTradeGlow1Tiles, 0x0200, 0x15ae
.align 2
gUnknown_08338D78:: @ 8338D78
.incbin "baserom.gba", 0x338d78, 0x8
obj_pal gUnknown_08330940, 0x15af
.align 2
gUnknown_08338D80:: @ 8338D80
.incbin "baserom.gba", 0x338d80, 0x8
obj_pal gUnknown_083308E0, 0x15b3
.align 2
gUnknown_08338D88:: @ 8338D88
.incbin "baserom.gba", 0x338d88, 0x38
spr_template 0x15ae, 0x15af, gOamData_8338D40, gSpriteAnimTable_8338D50, NULL, gSpriteAffineAnimTable_8338D6C, sub_807AA28
.align 2
gOamData_8338DA0:: @ 8338DA0
.2byte 0x8000, 0x8000, 0x0400, 0x0000
.align 2
gSpriteAnim_8338DA8:: @ 8338DA8
.2byte 0x0000, 0x00c5, 0xffff, 0x0000
.align 2
gSpriteAnim_8338DB0:: @ 8338DB0
.2byte 0x0008, 0x00c5, 0xffff, 0x0000
.align 2
gSpriteAnimTable_8338DB8:: @ 8338DB8
.4byte gSpriteAnim_8338DA8
.4byte gSpriteAnim_8338DB0
.align 2
gUnknown_08338DC0:: @ 8338DC0
.incbin "baserom.gba", 0x338dc0, 0x8
obj_tiles gTradeGlow2Tiles, 0x0300, 0x15b0
gUnknown_08338DC8:: @ 8338DC8
.incbin "baserom.gba", 0x338dc8, 0x2c
.align 2
gSpriteTemplate_8338DC8:: @ 8338DC8
spr_template 0x15b0, 0x15af, gOamData_8338DA0, gSpriteAnimTable_8338DB8, NULL, gDummySpriteAffineAnimTable, sub_807AA7C
.align 2
gOamData_8338DE0:: @ 8338DE0
.2byte 0x8000, 0x8000, 0x0400, 0x0000
.align 2
gSpriteAnim_8338DE8:: @ 8338DE8
.2byte 0x0000, 0x000a, 0xffff, 0x0000
.align 2
gSpriteAnimTable_8338DF0:: @ 8338DF0
.4byte gSpriteAnim_8338DE8
.align 2
gUnknown_08338DF4:: @ 8338DF4
.incbin "baserom.gba", 0x338df4, 0x8
obj_tiles gTradeCableEndTiles, 0x0100, 0x15b2
gUnknown_08338DFC:: @ 8338DFC
.incbin "baserom.gba", 0x338dfc, 0x70
.align 2
gSpriteTemplate_8338DFC:: @ 8338DFC
spr_template 0x15b2, 0x15b3, gOamData_8338DE0, gSpriteAnimTable_8338DF0, NULL, gDummySpriteAffineAnimTable, sub_807AABC
.align 2
gOamData_8338E14:: @ 8338E14
.2byte 0x4000, 0xc000, 0x0400, 0x0000
.align 2
gSpriteAnim_8338E1C:: @ 8338E1C
.2byte 0x0000, 0x00c2, 0x0020, 0x00c2, 0x0040, 0x00c2, 0x0060, 0x00c2, 0x0040, 0x00c2, 0x0020, 0x00c2, 0x0000, 0x00c2, 0xfffd, 0x0008
.2byte 0xffff, 0x0000
.align 2
gSpriteAnim_8338E40:: @ 8338E40
.2byte 0x0000, 0x00c2, 0x0020, 0x00c2, 0x0040, 0x00c2, 0x0060, 0x00c2, 0x0040, 0x00c2, 0x0020, 0x00c2, 0x0000, 0x00c2, 0xfffd, 0x0002
.2byte 0xffff, 0x0000
.align 2
gSpriteAnimTable_8338E64:: @ 8338E64
.4byte gSpriteAnim_8338E1C
.align 2
gSpriteAnimTable_8338E68:: @ 8338E68
.4byte gSpriteAnim_8338E40
gUnknown_08338E6C:: @ 8338E6C
.incbin "baserom.gba", 0x338e6c, 0x8
obj_tiles gTradeGBAScreenTiles, 0x1000, 0x15b4
gUnknown_08338E74:: @ 8338E74
.incbin "baserom.gba", 0x338e74, 0x18
.align 2
gSpriteTemplate_8338E74:: @ 8338E74
spr_template 0x15b4, 0x15b3, gOamData_8338E14, gSpriteAnimTable_8338E64, NULL, gDummySpriteAffineAnimTable, sub_807AB04
gUnknown_08338E8C:: @ 8338E8C
.incbin "baserom.gba", 0x338e8c, 0x18
.align 2
gSpriteTemplate_8338E8C:: @ 8338E8C
spr_template 0x15b4, 0x15b3, gOamData_8338E14, gSpriteAnimTable_8338E68, NULL, gDummySpriteAffineAnimTable, sub_807AB04
.align 1
gUnknown_08338EA4:: @ 8338EA4
.incbin "baserom.gba", 0x338ea4, 0x28
.incbin "graphics/trade/unknown_338EA4.gbapal"
gUnknown_08338ECC:: @ 8338ECC
.incbin "baserom.gba", 0x338ecc, 0x4
.align 2
gSpriteAffineAnim_8338EBC:: @ 8338EBC
.2byte 0xff00, 0x0100, 0x0000, 0x0000, 0x7ffe, 0x0000, 0x0000, 0x0000
gUnknown_08338ED0:: @ 8338ED0
.incbin "baserom.gba", 0x338ed0, 0xf0
.align 2
gSpriteAffineAnimTable_8338ECC:: @ 8338ECC
.4byte gSpriteAffineAnim_8338EBC
.align 2
gIngameTrades:: @ 8338ED0
.string "DOTS$", 11
.align 1
.2byte SPECIES_SEEDOT
.byte 5, 4, 5, 4, 4, 4
.byte 1
.align 2
.4byte 0x9746
.byte 30, 5, 5, 5, 5
.align 2
.4byte 0x84
.2byte ITEM_CHESTO_BERRY
.byte -1
.string "KOBE$", 11
.byte 0
.byte 10
.2byte SPECIES_RALTS
.align 2
.string "PLUSES$", 11
.align 1
.2byte SPECIES_PLUSLE
.byte 4, 4, 4, 5, 5, 4
.byte 0
.align 2
.4byte 0x1210c
.byte 5, 5, 30, 5, 5
.align 2
.4byte 0x6f
.2byte ITEM_WOOD_MAIL
.byte 0
.string "ROMAN$", 11
.byte 0
.byte 10
.2byte SPECIES_VOLBEAT
.align 2
.string "SEASOR$", 11
.align 1
.2byte SPECIES_HORSEA
.byte 5, 4, 4, 4, 5, 4
.byte 0
.align 2
.4byte 0xb4cd
.byte 5, 5, 5, 5, 30
.align 2
.4byte 0x7f
.2byte ITEM_WAVE_MAIL
.byte 1
.string "SKYLAR$", 11
.byte 0
.byte 10
.2byte SPECIES_BAGON
.align 2
.string "MEOWOW$", 11
.align 1
.2byte SPECIES_MEOWTH
.byte 4, 5, 4, 5, 4, 4
.byte 0
.align 2
.4byte 0x16559
.byte 5, 5, 5, 30, 5
.align 2
.4byte 0x8b
.2byte ITEM_RETRO_MAIL
.byte 2
.string "ISIS$", 11
.byte 1
.byte 10
.2byte SPECIES_SKITTY
.align 2
gUnknown_08338FC0:: @ 8338FC0
.incbin "baserom.gba", 0x338fc0, 0x3c
.2byte 0x1006, 0x1232, 0x102f, 0x0161, 0x0c00, 0x0182, 0x1000, 0x1006, 0x0e3b, 0x0000, 0x0a01, 0x1000, 0x161e, 0x018b, 0x0433, 0x1611
.2byte 0x180f, 0x0074, 0x1440, 0x0000, 0x0811, 0x102b, 0x013b, 0x2a34, 0x0c16, 0x1037, 0x1020, 0x0418, 0x0c23, 0x0000
.align 2
gUnknown_08338FFC:: @ 8338FFC
.incbin "baserom.gba", 0x338ffc, 0x10
window_template 0x00, 0x02, 0x0f, 0x1a, 0x04, 0x00, 0x0040
null_window_template
.align 2
gUnknown_0833900C:: @ 833900C
.incbin "baserom.gba", 0x33900c, 0x8
window_template 0x00, 0x15, 0x09, 0x05, 0x04, 0x0f, 0x00bc
.align 2
gUnknown_08339014:: @ 8339014
.incbin "baserom.gba", 0x339014, 0x10
.4byte 0x000001fc, 0x00002051, 0x00002326, 0x00003063
gUnknown_08339024:: @ 8339024
.incbin "baserom.gba", 0x339024, 0x6c
.byte 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x03, 0x03, 0x03, 0x03, 0x04, 0x04, 0x04, 0x04, 0xfc, 0xfc, 0xfc, 0xfd, 0xfd, 0xfd, 0xfd, 0xfe, 0xfe, 0xfe
.byte 0xfe, 0xff, 0xff, 0xff, 0xff, 0x00, 0xff, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x03, 0x03, 0x03, 0x03, 0x04, 0x04
.byte 0x04, 0x04, 0xfc, 0xfd, 0xfd, 0xfe, 0xfe, 0xff, 0xff, 0xff, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x01, 0x01, 0x02, 0x02, 0x03, 0x03, 0x04, 0xfc, 0xfd, 0xfe, 0xff
.byte 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x01, 0x02, 0x03
gUnknown_08339090:: @ 8339090
.incbin "baserom.gba", 0x339090, 0x44
.byte 0x00, 0x01, 0x01, 0x01, 0x02, 0x01, 0x03, 0x01, 0x04, 0x01, 0x05, 0x02, 0x06, 0x02, 0x07, 0x02, 0x08, 0x02, 0x09, 0x02, 0x0a, 0x03, 0x0b, 0x03, 0x0c, 0x03, 0x0d, 0x04, 0x0e, 0x05, 0x0f, 0x02
.byte 0x00, 0x01, 0x01, 0x01, 0x02, 0x01, 0x03, 0x01, 0x04, 0x01, 0x05, 0x02, 0x06, 0x02, 0x07, 0x02, 0x08, 0x02, 0x09, 0x02, 0x0a, 0x03, 0x0b, 0x03, 0x0c, 0x03, 0x0d, 0x04, 0x0e, 0x05, 0x10, 0x01
.byte 0x10, 0xff, 0x00, 0x00

View File

@ -2,7 +2,6 @@
.include "constants/constants.inc"
.section .rodata
.align 2, 0
.macro unk_trainer_card_struct text1, text2, short1, short2, short3, short4
.4byte \text1
@ -13,71 +12,100 @@
.2byte \short4
.endm
.align 2
gUnknown_0856F018:: @ 856F018
.incbin "baserom.gba", 0x56f018, 0x194
.incbin "graphics/trainer_card/stickers_fr.4bpp.lz"
.align 2
gUnknown_0856F18C:: @ 856F18C
.incbin "graphics/trainer_card/unknown_56F18C.gbapal"
.align 2
gEmeraldTrainerCard1Star_Pal:: @ 856F1AC
.incbin "baserom.gba", 0x56f1ac, 0x60
.incbin "graphics/trainer_card/one_star.gbapal"
.align 2
gFireRedTrainerCard1Star_Pal:: @ 856F20C
.incbin "baserom.gba", 0x56f20c, 0x60
.incbin "graphics/trainer_card/one_star_fr.gbapal"
.align 2
gEmeraldTrainerCard2Star_Pal:: @ 856F26C
.incbin "baserom.gba", 0x56f26c, 0x60
.incbin "graphics/trainer_card/two_stars.gbapal"
.align 2
gFireRedTrainerCard2Star_Pal:: @ 856F2CC
.incbin "baserom.gba", 0x56f2cc, 0x60
.incbin "graphics/trainer_card/two_stars_fr.gbapal"
.align 2
gEmeraldTrainerCard3Star_Pal:: @ 856F32C
.incbin "baserom.gba", 0x56f32c, 0x60
.incbin "graphics/trainer_card/three_stars.gbapal"
.align 2
gFireRedTrainerCard3Star_Pal:: @ 856F38C
.incbin "baserom.gba", 0x56f38c, 0x60
.incbin "graphics/trainer_card/three_stars_fr.gbapal"
.align 2
gEmeraldTrainerCard4Star_Pal:: @ 856F3EC
.incbin "baserom.gba", 0x56f3ec, 0x60
.incbin "graphics/trainer_card/four_stars.gbapal"
.align 2
gFireRedTrainerCard4Star_Pal:: @ 856F44C
.incbin "baserom.gba", 0x56f44c, 0x60
.incbin "graphics/trainer_card/four_stars_fr.gbapal"
.align 2
gUnknown_0856F4AC:: @ 856F4AC
.incbin "baserom.gba", 0x56f4ac, 0x20
.incbin "graphics/trainer_card/female_bg.gbapal"
.align 2
gUnknown_0856F4CC:: @ 856F4CC
.incbin "baserom.gba", 0x56f4cc, 0x20
.incbin "graphics/trainer_card/female_bg_fr.gbapal"
.align 2
gUnknown_0856F4EC:: @ 856F4EC
.incbin "baserom.gba", 0x56f4ec, 0x20
.incbin "graphics/trainer_card/badges.gbapal"
.align 2
gUnknown_0856F50C:: @ 856F50C
.incbin "baserom.gba", 0x56f50c, 0x20
.incbin "graphics/trainer_card/badges_fr.gbapal"
.align 2
gUnknown_0856F52C:: @ 856F52C
.incbin "baserom.gba", 0x56f52c, 0x20
.incbin "graphics/trainer_card/gold.gbapal"
.align 2
gUnknown_0856F54C:: @ 856F54C
.incbin "baserom.gba", 0x56f54c, 0x20
.incbin "graphics/trainer_card/stickers_fr1.gbapal"
.align 2
gUnknown_0856F56C:: @ 856F56C
.incbin "baserom.gba", 0x56f56c, 0x20
.incbin "graphics/trainer_card/stickers_fr2.gbapal"
.align 2
gUnknown_0856F58C:: @ 856F58C
.incbin "baserom.gba", 0x56f58c, 0x20
.incbin "graphics/trainer_card/stickers_fr3.gbapal"
.align 2
gUnknown_0856F5AC:: @ 856F5AC
.incbin "baserom.gba", 0x56f5ac, 0x20
.incbin "graphics/trainer_card/stickers_fr4.gbapal"
.align 2
gUnknown_0856F5CC:: @ 856F5CC
.incbin "baserom.gba", 0x56f5cc, 0x248
.incbin "graphics/trainer_card/badges.4bpp.lz"
.align 2
gUnknown_0856F814:: @ 856F814
.incbin "baserom.gba", 0x56f814, 0x2a0
.incbin "graphics/trainer_card/badges_fr.4bpp.lz"
.align 2
gUnknown_0856FAB4:: @ 856FAB4
.incbin "baserom.gba", 0x56fab4, 0x10
.4byte 0x000025b0, 0x000001d9, 0x000031e2, 0x003011f3
.align 2
gUnknown_0856FAC4:: @ 856FAC4
.incbin "baserom.gba", 0x56fac4, 0x20
window_template 0x01, 0x02, 0x0f, 0x1b, 0x04, 0x0f, 0x0253
window_template 0x01, 0x01, 0x01, 0x1c, 0x12, 0x0f, 0x0001
window_template 0x03, 0x13, 0x05, 0x09, 0x0a, 0x08, 0x0150
null_window_template
.align 2
gEmeraldTrainerCardStarPals:: @ 856FAE4
@ -96,20 +124,21 @@ gFireRedTrainerCardStarPals:: @ 856FAF8
.4byte gFireRedTrainerCard4Star_Pal
gUnknown_0856FB0C:: @ 856FB0C
.incbin "baserom.gba", 0x56fb0c, 0x3
.byte 0x00, 0x02, 0x03
gUnknown_0856FB0F:: @ 856FB0F
.incbin "baserom.gba", 0x56fb0f, 0x3
.byte 0x00, 0x04, 0x05
gUnknown_0856FB12:: @ 856FB12
.incbin "baserom.gba", 0x56fb12, 0x6
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
gUnknown_0856FB18:: @ 856FB18
.incbin "baserom.gba", 0x56fb18, 0x8
.byte 0x0d, 0x04, 0x0d, 0x04, 0x01, 0x00, 0x01, 0x00
gUnknown_0856FB20:: @ 856FB20
.incbin "baserom.gba", 0x56fb20, 0x8
.byte 0x4e, 0x4f, 0x50, 0x51, 0x3c, 0x3f
.align 2
gUnknown_0856FB28:: @ 856FB28
.4byte sub_80C4998
.4byte sub_80C49D8
@ -118,182 +147,233 @@ gUnknown_0856FB28:: @ 856FB28
.4byte sub_80C4C84
.4byte sub_80C4DB0
.align 2
gUnknown_0856FB40:: @ 856FB40
.4byte gUnknown_0856FB0C
.4byte gUnknown_0856FB12
gUnknown_0856FB48:: @ 856FB48
.incbin "baserom.gba", 0x56fb48, 0x2
.byte 0x71, 0x68
gUnknown_0856FB4A:: @ 856FB4A
.incbin "baserom.gba", 0x56fb4a, 0x2
.byte 0x81, 0x78
gUnknown_0856FB4C:: @ 856FB4C
.incbin "baserom.gba", 0x56fb4c, 0x9
.byte 0xfd, 0x02, 0xf0, 0xfd, 0x03, 0xf0, 0xfd, 0x04, 0xff
gUnknown_0856FB55:: @ 856FB55
.incbin "baserom.gba", 0x56fb55, 0x2
.byte 0x08, 0x10
gUnknown_0856FB57:: @ 856FB57
.incbin "baserom.gba", 0x56fb57, 0x5
.byte 0xd8, 0xd8
.align 2
gUnknown_0856FB5C:: @ 856FB5C
.4byte gText_LinkBattles
.4byte gText_LinkCableBattles
.4byte gText_LinkBattles
gUnknown_0856FB68:: @ 856FB68
.incbin "baserom.gba", 0x56fb68, 0x6
.byte 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a
gUnknown_0856FB6E:: @ 856FB6E
.incbin "baserom.gba", 0x56fb6e, 0x6
.byte 0x00, 0x04, 0x08, 0x0c, 0x10, 0x14
gUnknown_0856FB74:: @ 856FB74
.incbin "baserom.gba", 0x56fb74, 0x4
.byte 0x0b, 0x0c, 0x0d, 0x0e
gUnknown_0856FB78:: @ 856FB78
.incbin "baserom.gba", 0x56fb78, 0x4
.byte 0x07, 0x07
.align 2
gUnknown_0856FB7C:: @ 856FB7C
.incbin "baserom.gba", 0x56fb7c, 0x20
.incbin "graphics/frontier_pass/map_heads.gbapal"
.align 2
gUnknown_0856FB9C:: @ 856FB9C
.incbin "baserom.gba", 0x56fb9c, 0x20
.incbin "graphics/frontier_pass/map_heads_female.gbapal"
.align 2
gUnknown_0856FBBC:: @ 856FBBC
.incbin "baserom.gba", 0x56fbbc, 0xFEC
.incbin "graphics/frontier_pass/map_screen.4bpp.lz"
.align 2
.align 2
gFrontierPassCursor_Gfx:: @ 8570BA8
.incbin "graphics/frontier_pass/cursor.4bpp.lz"
.incbin "graphics/frontier_pass/cursor.4bpp.lz"
.align 2
gUnknown_08570C44:: @ 8570C44
.incbin "baserom.gba", 0x570c44, 0xBC
.incbin "graphics/frontier_pass/map_heads.4bpp.lz"
.align 2
.align 2
gFrontierPassMapCursor_Gfx:: @ 8570D00
.incbin "graphics/frontier_pass/map_cursor.4bpp.lz"
.incbin "graphics/frontier_pass/map_cursor.4bpp.lz"
.align 2
gUnknown_08570E00:: @ 8570E00
.incbin "baserom.gba", 0x570e00, 0x260
.incbin "graphics/frontier_pass/map_screen.bin.lz"
.align 2
gUnknown_08571060:: @ 8571060
.incbin "baserom.gba", 0x571060, 0x260
.incbin "graphics/frontier_pass/small_map_and_card.bin.lz"
.align 2
gUnknown_08571298:: @ 8571298
.incbin "graphics/frontier_pass/unknown_571298.bin"
.align 2
gUnknown_085712C0:: @ 85712C0
.incbin "baserom.gba", 0x5712c0, 0x38
.incbin "graphics/frontier_pass/record_frame.bin.lz"
.align 2
gUnknown_085712F8:: @ 85712F8
.incbin "baserom.gba", 0x5712f8, 0xe8
.incbin "graphics/frontier_pass/small_map_and_card_affine.bin.lz"
gUnknown_085713E0:: @ 85713E0
.incbin "baserom.gba", 0x5713e0, 0x8
.2byte 0x00d8, 0x0020, 0x00d8, 0x0080
.align 2
gUnknown_085713E8:: @ 85713E8
.incbin "baserom.gba", 0x5713e8, 0xc
.4byte 0x000011f8, 0x000021e1, 0x00000bd6
.align 2
gUnknown_085713F4:: @ 85713F4
.incbin "baserom.gba", 0x5713f4, 0xc
.4byte 0x000001f8, 0x000011e1, 0x000021d2
.align 2
gUnknown_08571400:: @ 8571400
.incbin "baserom.gba", 0x571400, 0x28
window_template 0x00, 0x02, 0x03, 0x0c, 0x03, 0x0f, 0x0001
window_template 0x00, 0x02, 0x0a, 0x0c, 0x03, 0x0f, 0x0026
window_template 0x00, 0x02, 0x0d, 0x0c, 0x04, 0x0f, 0x004b
window_template 0x00, 0x00, 0x12, 0x1e, 0x03, 0x0f, 0x007c
window_template 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0000
.align 2
gUnknown_08571428:: @ 8571428
.incbin "baserom.gba", 0x571428, 0x20
window_template 0x00, 0x00, 0x01, 0x0f, 0x05, 0x0f, 0x0001
window_template 0x00, 0x14, 0x01, 0x0a, 0x0e, 0x0f, 0x004d
window_template 0x00, 0x02, 0x10, 0x1a, 0x04, 0x0f, 0x00da
window_template 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0000
gUnknown_08571448:: @ 8571448
.incbin "baserom.gba", 0x571448, 0x3
.byte 0x00, 0x02, 0x03
gUnknown_0857144B:: @ 857144B
.incbin "baserom.gba", 0x57144b, 0x3
.byte 0x00, 0x01, 0x09
gUnknown_0857144E:: @ 857144E
.incbin "baserom.gba", 0x57144e, 0x6
.byte 0x00, 0x04, 0x05
.align 2
gUnknown_08571454:: @ 8571454
.incbin "baserom.gba", 0x571454, 0x68
.2byte 0x001c, 0x004c, 0x0084, 0x00dc, 0x0054, 0x0084, 0x0084, 0x00dc, 0x0050, 0x0066, 0x0014, 0x006c, 0x0000, 0x0010, 0x0098, 0x00f0
.2byte 0x006c, 0x0086, 0x0014, 0x006c, 0x0018, 0x0030, 0x0014, 0x006c, 0x0032, 0x0042, 0x0014, 0x0024, 0x0042, 0x0052, 0x0020, 0x0030
.2byte 0x0032, 0x0042, 0x002c, 0x003c, 0x0042, 0x0052, 0x0038, 0x0048, 0x0032, 0x0042, 0x0044, 0x0054, 0x0042, 0x0052, 0x0050, 0x0060
.2byte 0x0032, 0x0042, 0x005c, 0x006c
.align 2
gUnknown_085714BC:: @ 85714BC
obj_tiles gFrontierPassCursor_Gfx, 0x100, 0
obj_tiles gFrontierPassMapCursor_Gfx, 0x400, 1
obj_tiles gFrontierPassMedals_Gfx, 0x380, 2
.align 2
gUnknown_085714D4:: @ 85714D4
obj_tiles gUnknown_08570C44, 0x100, 4
null_obj_tiles
.align 2
gUnknown_085714E4:: @ 85714E4
obj_pal gFrontierPassCursor_Pal, 0
obj_pal gFrontierPassMapCursor_Pal, 1
obj_pal gFrontierPassMedalsSilver_Pal, 2
obj_pal gFrontierPassMedalsGold_Pal, 3
obj_pal gUnknown_0856FB7C, 4
obj_pal gUnknown_0856FB9C, 5
null_obj_pal
obj_pal gFrontierPassCursor_Pal, 0
obj_pal gFrontierPassMapCursor_Pal, 1
obj_pal gFrontierPassMedalsSilver_Pal, 2
obj_pal gFrontierPassMedalsGold_Pal, 3
obj_pal gUnknown_0856FB7C, 4
obj_pal gUnknown_0856FB9C, 5
null_obj_pal
@ this doesnt look like its part of the same table.
.4byte 0x0, 0xFFFF
.align 2
gSpriteAnim_857151C:: @ 857151C
.2byte 0x0000, 0x0000, 0xffff, 0x0000
gUnknown_08571524:: @ 8571524
.incbin "baserom.gba", 0x571524, 0x8
.align 2
gSpriteAnim_8571524:: @ 8571524
.2byte 0x0000, 0x0000, 0xffff, 0x0000
gUnknown_0857152C:: @ 857152C
.incbin "baserom.gba", 0x57152c, 0x8
.align 2
gSpriteAnim_857152C:: @ 857152C
.2byte 0x0004, 0x0000, 0xffff, 0x0000
gUnknown_08571534:: @ 8571534
.incbin "baserom.gba", 0x571534, 0x8
.align 2
gSpriteAnim_8571534:: @ 8571534
.2byte 0x0008, 0x0000, 0xffff, 0x0000
gUnknown_0857153C:: @ 857153C
.incbin "baserom.gba", 0x57153c, 0x8
.align 2
gSpriteAnim_857153C:: @ 857153C
.2byte 0x000c, 0x0000, 0xffff, 0x0000
gUnknown_08571544:: @ 8571544
.incbin "baserom.gba", 0x571544, 0x8
.align 2
gSpriteAnim_8571544:: @ 8571544
.2byte 0x0010, 0x0000, 0xffff, 0x0000
gUnknown_0857154C:: @ 857154C
.incbin "baserom.gba", 0x57154c, 0x8
.align 2
gSpriteAnim_857154C:: @ 857154C
.2byte 0x0014, 0x0000, 0xffff, 0x0000
gUnknown_08571554:: @ 8571554
.incbin "baserom.gba", 0x571554, 0x8
.align 2
gSpriteAnim_8571554:: @ 8571554
.2byte 0x0018, 0x0000, 0xffff, 0x0000
gUnknown_0857155C:: @ 857155C
.incbin "baserom.gba", 0x57155c, 0xC
.align 2
gSpriteAnim_857155C:: @ 857155C
.2byte 0x0000, 0x002d, 0x0008, 0x002d, 0xfffe, 0x0000
gUnknown_08571568:: @ 8571568
.incbin "baserom.gba", 0x571568, 0xC
.align 2
gSpriteAnim_8571568:: @ 8571568
.2byte 0x0010, 0x002d, 0x0018, 0x002d, 0xfffe, 0x0000
gUnknown_08571574:: @ 8571574
.4byte gUnknown_08571524
.4byte gUnknown_0857152C
.align 2
gSpriteAnimTable_08571574:: @ 8571574
.4byte gSpriteAnim_8571524
.4byte gSpriteAnim_857152C
gUnknown_0857157C:: @ 857157C
.4byte gUnknown_08571524
.4byte gUnknown_0857152C
.4byte gUnknown_08571534
.4byte gUnknown_0857153C
.4byte gUnknown_08571544
.4byte gUnknown_0857154C
.4byte gUnknown_08571554
.align 2
gSpriteAnimTable_0857157C:: @ 857157C
.4byte gSpriteAnim_8571524
.4byte gSpriteAnim_857152C
.4byte gSpriteAnim_8571534
.4byte gSpriteAnim_857153C
.4byte gSpriteAnim_8571544
.4byte gSpriteAnim_857154C
.4byte gSpriteAnim_8571554
gUnknown_08571598:: @ 8571598
.4byte gUnknown_0857155C
.4byte gUnknown_08571568
.align 2
gSpriteAnimTable_08571598:: @ 8571598
.4byte gSpriteAnim_857155C
.4byte gSpriteAnim_8571568
gUnknown_085715A0:: @ 85715A0
.incbin "baserom.gba", 0x5715a0, 0x10
.align 2
gSpriteAffineAnim_085715A0:: @ 85715A0
.2byte 0x0100, 0x0100, 0x0000, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000
gUnknown_085715B0:: @ 85715B0
.4byte gUnknown_085715A0
.align 2
gSpriteAffineAnimTable_085715B0:: @ 85715B0
.4byte gSpriteAffineAnim_085715A0
.align 2
gUnknown_085715B4:: @ 85715B4
spr_template 0, 0, gUnknown_0852490C, gUnknown_08571574, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
spr_template 1, 1, gUnknown_08524934, gUnknown_08571598, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
spr_template 0, 0, gUnknown_0852490C, gSpriteAnimTable_08571574, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
spr_template 1, 1, gUnknown_08524934, gSpriteAnimTable_08571598, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
.align 2
gUnknown_085715E4:: @ 85715E4
spr_template 2, 2, gUnknown_0852490C, gUnknown_0857157C, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
spr_template 2, 2, gUnknown_0852490C, gSpriteAnimTable_0857157C, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
.align 2
gUnknown_085715FC:: @ 85715FC
spr_template 4, 4, gUnknown_0852490C, gUnknown_08571574, NULL, gDummySpriteAffineAnimTable, nullsub_39
spr_template 4, 4, gUnknown_0852490C, gSpriteAnimTable_08571574, NULL, gDummySpriteAffineAnimTable, nullsub_39
.align 2
gUnknown_08571614:: @ 8571614
.4byte gUnknown_085EDA96
.4byte gUnknown_085ED932
@ -311,6 +391,7 @@ gUnknown_08571614:: @ 8571614
.4byte gUnknown_085EDA78
.4byte gUnknown_085ED931
.align 2
gUnknown_08571650:: @ 8571650
unk_trainer_card_struct gUnknown_085EDAB1, gUnknown_085EDB0F, 0x59, 0x28, 1, 0
unk_trainer_card_struct gUnknown_085EDABE, gUnknown_085EDB4E, 0x21, 0x2A, 1, 0

View File

@ -1,42 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
gUnknown_0862AD54:: @ 862AD54
.incbin "baserom.gba", 0x62ad54, 0x1dc
gUnknown_0862AF30:: @ 862AF30
.incbin "baserom.gba", 0x62af30, 0x1AC
gUnknown_0862B0DC:: @ 862B0DC
.incbin "baserom.gba", 0x62b0dc, 0x460
gUnknown_0862B53C:: @ 862B53C
.incbin "baserom.gba", 0x62b53c, 0x1E0
gUnknown_0862B71C:: @ 862B71C
.incbin "baserom.gba", 0x62b71c, 0x8
gUnknown_0862B724:: @ 862B724
obj_tiles gUnknown_0862B0DC, 0x1800, 11920
gUnknown_0862B72C:: @ 862B72C
obj_pal gUnknown_0862B53C, 11920
gUnknown_0862B734:: @ 862B734
.incbin "baserom.gba", 0x62b734, 0x8
gUnknown_0862B73C:: @ 862B73C
.incbin "baserom.gba", 0x62b73c, 0x8
gUnknown_0862B744:: @ 862B744
.incbin "baserom.gba", 0x62b744, 0x8
gUnknown_0862B74C:: @ 862B74C
.4byte gUnknown_0862B734
.4byte gUnknown_0862B73C
.4byte gUnknown_0862B744
gUnknown_0862B758:: @ 862B758
spr_template 11920, 11920, gUnknown_0862B71C, gUnknown_0862B74C, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy

View File

@ -3,58 +3,14 @@
.section .rodata
gUnknown_0862B770:: @ 862B770
.4byte sub_81DAACC
.4byte sub_81DAC14
.4byte sub_81DABBC
.4byte sub_81DAB4C
.4byte sub_81DAC80
gUnknown_0862AD54:: @ 862AD54
.incbin "baserom.gba", 0x62ad54, 0x1dc
gUnknown_0862B784:: @ 862B784
.4byte sub_81DAACC
.4byte sub_81DACEC
.4byte sub_81DABBC
.4byte sub_81DAB4C
.4byte sub_81DAD58
gUnknown_0862AF30:: @ 862AF30
.incbin "baserom.gba", 0x62af30, 0x1AC
gUnknown_0862B798:: @ 862B798
.4byte sub_81DAACC
.4byte sub_81DADC4
.4byte sub_81DABBC
.4byte sub_81DAB4C
.4byte sub_81DAE44
gUnknown_0862B0DC:: @ 862B0DC
.incbin "baserom.gba", 0x62b0dc, 0x460
gUnknown_0862B7AC:: @ 862B7AC
.4byte sub_81DAACC
.4byte sub_81DAEB0
.4byte sub_81DABBC
.4byte sub_81DAB4C
.4byte sub_81DAF34
gUnknown_0862B7C0:: @ 862B7C0
.4byte sub_81DAACC
.4byte sub_81DAFA0
.4byte sub_81DABBC
.4byte sub_81DAB4C
.4byte sub_81DB02C
gUnknown_0862B7D4:: @ 862B7D4
.4byte sub_81DAACC
.4byte sub_81DB098
.4byte sub_81DABBC
.4byte sub_81DAB4C
.4byte sub_81DB124
gUnknown_0862B7E8:: @ 862B7E8
.4byte sub_81DAACC
.4byte sub_81DB190
.4byte sub_81DABBC
.4byte sub_81DAB4C
.4byte sub_81DB224
gUnknown_0862B7FC:: @ 862B7FC
.4byte sub_81DAACC
.4byte sub_81DB290
.4byte sub_81DABBC
.4byte sub_81DAB4C
.4byte sub_81DB328
gUnknown_0862B53C:: @ 862B53C
.incbin "baserom.gba", 0x62b53c, 0x1E0

BIN
data/unknown_jp_62609C.bin Normal file

Binary file not shown.

Binary file not shown.

View File

@ -1,4 +1,5 @@
.section .rodata
.align 2
gUnknown_089A3470:: @ 89A3470
.incbin "baserom.gba", 0x9a3470, 0x30e0
.incbin "data/unknown_serial_data.bin"

View File

@ -34,7 +34,7 @@ gUnknown_085DFCDC:: @ 85DFCDC
window_template 0, 0xD, 1, 0xD, 4, 0xF, 1
window_template 0, 0, 0xE, 0xB, 2, 0xF, 0x35
window_template 0, 1, 0x11, 0x1C, 2, 0xF, 0x4B
window_template_terminator
null_window_template
sUsePokeblockYesNoWinTemplate:: @ 85DFCFC
window_template 0, 0x18, 0xB, 5, 4, 0xF, 0x83

View File

@ -8,16 +8,288 @@
@ 85507E4
.include "data/wild_mons.inc"
.incbin "baserom.gba", 0x55370c, 0x188
gBattlePyramidPlaceholders_1:: @ 55370C
wild_mon SPECIES_BULBASAUR, 5
wild_mon SPECIES_BULBASAUR, 5
wild_mon SPECIES_BULBASAUR, 5
wild_mon SPECIES_BULBASAUR, 5
wild_mon SPECIES_IVYSAUR, 5
wild_mon SPECIES_IVYSAUR, 5
wild_mon SPECIES_VENUSAUR, 5
wild_mon SPECIES_VENUSAUR, 5
wild_mon SPECIES_VENUSAUR, 5
wild_mon SPECIES_CHARMANDER, 5
wild_mon SPECIES_VENUSAUR, 5
wild_mon SPECIES_CHARMANDER, 5
gBattlePyramidPlaceholders_1Info:: @ 55373C
.4byte 4
.4byte gBattlePyramidPlaceholders_1
gBattlePyramidPlaceholders_2:: @ 553744
wild_mon SPECIES_IVYSAUR, 5
wild_mon SPECIES_IVYSAUR, 5
wild_mon SPECIES_IVYSAUR, 5
wild_mon SPECIES_IVYSAUR, 5
wild_mon SPECIES_VENUSAUR, 5
wild_mon SPECIES_VENUSAUR, 5
wild_mon SPECIES_CHARMANDER, 5
wild_mon SPECIES_CHARMANDER, 5
wild_mon SPECIES_CHARMANDER, 5
wild_mon SPECIES_CHARMELEON, 5
wild_mon SPECIES_CHARMELEON, 5
wild_mon SPECIES_CHARMANDER, 5
gBattlePyramidPlaceholders_2Info:: @ 553774
.4byte 4
.4byte gBattlePyramidPlaceholders_2
gBattlePyramidPlaceholders_3:: @ 55377C
wild_mon SPECIES_VENUSAUR, 5
wild_mon SPECIES_VENUSAUR, 5
wild_mon SPECIES_VENUSAUR, 5
wild_mon SPECIES_VENUSAUR, 5
wild_mon SPECIES_CHARMANDER, 5
wild_mon SPECIES_CHARMANDER, 5
wild_mon SPECIES_CHARMELEON, 5
wild_mon SPECIES_CHARMELEON, 5
wild_mon SPECIES_CHARMELEON, 5
wild_mon SPECIES_CHARIZARD, 5
wild_mon SPECIES_CHARMELEON, 5
wild_mon SPECIES_CHARIZARD, 5
gBattlePyramidPlaceholders_3Info:: @ 5537AC
.4byte 4
.4byte gBattlePyramidPlaceholders_3
gBattlePyramidPlaceholders_4:: @ 5537B4
wild_mon SPECIES_CHARMANDER, 5
wild_mon SPECIES_CHARMANDER, 5
wild_mon SPECIES_CHARMANDER, 5
wild_mon SPECIES_CHARMANDER, 5
wild_mon SPECIES_CHARMELEON, 5
wild_mon SPECIES_CHARMELEON, 5
wild_mon SPECIES_CHARIZARD, 5
wild_mon SPECIES_CHARIZARD, 5
wild_mon SPECIES_CHARIZARD, 5
wild_mon SPECIES_SQUIRTLE, 5
wild_mon SPECIES_CHARIZARD, 5
wild_mon SPECIES_SQUIRTLE, 5
gBattlePyramidPlaceholders_4Info:: @ 5537E4
.4byte 4
.4byte gBattlePyramidPlaceholders_4
gBattlePyramidPlaceholders_5:: @ 5537EC
wild_mon SPECIES_CHARMELEON, 5
wild_mon SPECIES_CHARMELEON, 5
wild_mon SPECIES_CHARMELEON, 5
wild_mon SPECIES_CHARMELEON, 5
wild_mon SPECIES_CHARIZARD, 5
wild_mon SPECIES_CHARIZARD, 5
wild_mon SPECIES_SQUIRTLE, 5
wild_mon SPECIES_SQUIRTLE, 5
wild_mon SPECIES_SQUIRTLE, 5
wild_mon SPECIES_WARTORTLE, 5
wild_mon SPECIES_SQUIRTLE, 5
wild_mon SPECIES_WARTORTLE, 5
gBattlePyramidPlaceholders_5Info:: @ 55381C
.4byte 4
.4byte gBattlePyramidPlaceholders_5
gBattlePyramidPlaceholders_6:: @ 553824
wild_mon SPECIES_CHARIZARD, 5
wild_mon SPECIES_CHARIZARD, 5
wild_mon SPECIES_CHARIZARD, 5
wild_mon SPECIES_CHARMELEON, 5
wild_mon SPECIES_SQUIRTLE, 5
wild_mon SPECIES_SQUIRTLE, 5
wild_mon SPECIES_WARTORTLE, 5
wild_mon SPECIES_WARTORTLE, 5
wild_mon SPECIES_WARTORTLE, 5
wild_mon SPECIES_WARTORTLE, 5
wild_mon SPECIES_WARTORTLE, 5
wild_mon SPECIES_WARTORTLE, 5
gBattlePyramidPlaceholders_6Info:: @ 553854
.4byte 4
.4byte gBattlePyramidPlaceholders_6
gBattlePyramidPlaceholders_7:: @ 55385C
wild_mon SPECIES_WARTORTLE, 5
wild_mon SPECIES_WARTORTLE, 5
wild_mon SPECIES_SQUIRTLE, 5
wild_mon SPECIES_SQUIRTLE, 5
wild_mon SPECIES_SQUIRTLE, 5
wild_mon SPECIES_CHARIZARD, 5
wild_mon SPECIES_CHARIZARD, 5
wild_mon SPECIES_CHARIZARD, 5
wild_mon SPECIES_CHARMELEON, 5
wild_mon SPECIES_CHARMELEON, 5
wild_mon SPECIES_CHARMELEON, 5
wild_mon SPECIES_CHARMELEON, 5
gBattlePyramidPlaceholders_7Info:: @ 55388C
.4byte 8
.4byte gBattlePyramidPlaceholders_7
gBattlePyramidWildMonHeaders:: @ 8553894
.incbin "baserom.gba", 0x553894, 0x180
.byte 0, 1
.2byte 0
.4byte gBattlePyramidPlaceholders_1Info
.4byte NULL
.4byte NULL
.4byte NULL
.byte 0, 2
.2byte 0
.4byte gBattlePyramidPlaceholders_2Info
.4byte NULL
.4byte NULL
.4byte NULL
.byte 0, 3
.2byte 0
.4byte gBattlePyramidPlaceholders_3Info
.4byte NULL
.4byte NULL
.4byte NULL
.byte 0, 4
.2byte 0
.4byte gBattlePyramidPlaceholders_4Info
.4byte NULL
.4byte NULL
.4byte NULL
.byte 0, 5
.2byte 0
.4byte gBattlePyramidPlaceholders_5Info
.4byte NULL
.4byte NULL
.4byte NULL
.byte 0, 6
.2byte 0
.4byte gBattlePyramidPlaceholders_6Info
.4byte NULL
.4byte NULL
.4byte NULL
.byte 0, 7
.2byte 0
.4byte gBattlePyramidPlaceholders_7Info
.4byte NULL
.4byte NULL
.4byte NULL
.2byte 0xFFFF
.2byte 0
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
gBattlePikeMons_1:: @ 8553934
wild_mon SPECIES_SEVIPER, 5
wild_mon SPECIES_MILOTIC, 5
wild_mon SPECIES_DUSCLOPS, 5
wild_mon SPECIES_DUSCLOPS, 5
wild_mon SPECIES_DUSCLOPS, 5
wild_mon SPECIES_DUSCLOPS, 5
wild_mon SPECIES_SEVIPER, 5
wild_mon SPECIES_MILOTIC, 5
wild_mon SPECIES_DUSCLOPS, 5
wild_mon SPECIES_DUSCLOPS, 5
wild_mon SPECIES_SEVIPER, 5
wild_mon SPECIES_MILOTIC, 5
gBattlePikeMonsInfo_1:: @ 8553964
.4byte 10
.4byte gBattlePikeMons_1
gBattlePikeMons_2:: @ 855396C
wild_mon SPECIES_SEVIPER, 5
wild_mon SPECIES_MILOTIC, 5
wild_mon SPECIES_ELECTRODE, 5
wild_mon SPECIES_ELECTRODE, 5
wild_mon SPECIES_ELECTRODE, 5
wild_mon SPECIES_ELECTRODE, 5
wild_mon SPECIES_SEVIPER, 5
wild_mon SPECIES_MILOTIC, 5
wild_mon SPECIES_ELECTRODE, 5
wild_mon SPECIES_ELECTRODE, 5
wild_mon SPECIES_SEVIPER, 5
wild_mon SPECIES_MILOTIC, 5
gBattlePikeMonsInfo_2:: @ 855399C
.4byte 10
.4byte gBattlePikeMons_2
gBattlePikeMons_3:: @ 85539A4
wild_mon SPECIES_SEVIPER, 5
wild_mon SPECIES_MILOTIC, 5
wild_mon SPECIES_BRELOOM, 5
wild_mon SPECIES_BRELOOM, 5
wild_mon SPECIES_BRELOOM, 5
wild_mon SPECIES_BRELOOM, 5
wild_mon SPECIES_SEVIPER, 5
wild_mon SPECIES_MILOTIC, 5
wild_mon SPECIES_BRELOOM, 5
wild_mon SPECIES_BRELOOM, 5
wild_mon SPECIES_SEVIPER, 5
wild_mon SPECIES_MILOTIC, 5
gBattlePikeMonsInfo_3:: @ 85539D4
.4byte 10
.4byte gBattlePikeMons_3
gBattlePikeMons_4:: @ 85539DC
wild_mon SPECIES_SEVIPER, 5
wild_mon SPECIES_MILOTIC, 5
wild_mon SPECIES_WOBBUFFET, 5
wild_mon SPECIES_WOBBUFFET, 5
wild_mon SPECIES_WOBBUFFET, 5
wild_mon SPECIES_WOBBUFFET, 5
wild_mon SPECIES_SEVIPER, 5
wild_mon SPECIES_MILOTIC, 5
wild_mon SPECIES_WOBBUFFET, 5
wild_mon SPECIES_WOBBUFFET, 5
wild_mon SPECIES_SEVIPER, 5
wild_mon SPECIES_MILOTIC, 5
gBattlePikeMonsInfo_4:: @ 8553A0C
.4byte 10
.4byte gBattlePikeMons_4
gBattlePikeWildMonHeaders:: @ 8553A14
.incbin "baserom.gba", 0x553a14, 0x64
.byte 0, 1
.2byte 0
.4byte gBattlePikeMonsInfo_1
.4byte NULL
.4byte NULL
.4byte NULL
.byte 0, 2
.2byte 0
.4byte gBattlePikeMonsInfo_2
.4byte NULL
.4byte NULL
.4byte NULL
.byte 0, 3
.2byte 0
.4byte gBattlePikeMonsInfo_3
.4byte NULL
.4byte NULL
.4byte NULL
.byte 0, 4
.2byte 0
.4byte gBattlePikeMonsInfo_4
.4byte NULL
.4byte NULL
.4byte NULL
.2byte 0xFFFF
.2byte 0
.4byte NULL
.4byte NULL
.4byte NULL
.4byte NULL
gWildFeebasRoute119Data:: @ 8553A78
.incbin "baserom.gba", 0x553a78, 0x4
wild_mon SPECIES_FEEBAS, 20, 25
gRoute119WaterTileData:: @ 8553A7C
.incbin "baserom.gba", 0x553a7c, 0x14
.2byte 0, 0x2D, 0, 0x2E, 0x5B, 0x83, 0x5C, 0x8B, 0x12A, 0

Binary file not shown.

After

Width:  |  Height:  |  Size: 319 B

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
115 197 164
255 222 205
222 164 148
205 131 115
123 90 82
98 98 115
41 57 65
164 106 82
74 49 57
205 205 222
106 213 65
65 172 32
255 98 90
197 65 65
255 255 255
0 0 0

Binary file not shown.

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.3 KiB

Binary file not shown.

Binary file not shown.

View File

@ -0,0 +1,2 @@

$%&'()*+,-./456789:;<=>?DEFGHIJKLMNOTUVWXYZ[\]^_defghijklmnotuvwxyz{|}~у<7F><D183>葛訣誌舶沫<E888B6>圀悃棔、・ヲァィゥェォャュョッエオカキクケコサシスセソトナニヌネノハヒフヘホマヤユヨラリルレロワン゙゚tuvwxyz{|}~у<7F><D183><EFBFBD>諸楓利劒 !"#洟・ヲァィゥェ0123ッエオカキクケコ@ABCソトナニヌネノハPQRSマヤユヨラリルレロワン゙゚

View File

@ -0,0 +1 @@
¼½¾<11><11><11><11><11><11><11><11>לםמן<11><11>

Binary file not shown.

After

Width:  |  Height:  |  Size: 212 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 177 B

Binary file not shown.

View File

@ -0,0 +1,51 @@
JASC-PAL
0100
48
0 0 0
156 213 255
0 115 0
164 180 255
57 172 8
189 0 49
255 106 139
164 0 8
246 0 0
255 189 205
255 164 49
238 230 172
230 164 0
238 189 57
205 205 148
98 213 0
0 0 0
172 238 49
213 255 123
238 230 115
74 156 230
41 131 230
24 65 197
57 131 197
246 213 82
32 74 197
65 106 205
0 0 0
255 230 131
255 156 0
180 0 0
255 255 255
0 0 0
205 238 255
197 213 255
98 98 98
205 205 205
189 123 0
0 0 0
123 180 213
0 115 172
0 57 139
255 172 16
255 57 16
148 0 0
0 0 0
0 0 0
0 0 0

Binary file not shown.

After

Width:  |  Height:  |  Size: 18 KiB

Binary file not shown.

Binary file not shown.

After

Width:  |  Height:  |  Size: 18 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 225 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 225 B

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
0 0 0
164 148 222
172 156 238
255 255 255
205 205 205
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
0 0 0
0 0 0

Binary file not shown.

Binary file not shown.

Before

Width:  |  Height:  |  Size: 198 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 282 B

Binary file not shown.

View File

@ -0,0 +1 @@
#$

View File

@ -0,0 +1,2 @@
           

View File

Before

Width:  |  Height:  |  Size: 642 B

After

Width:  |  Height:  |  Size: 642 B

View File

Before

Width:  |  Height:  |  Size: 626 B

After

Width:  |  Height:  |  Size: 626 B

View File

Before

Width:  |  Height:  |  Size: 329 B

After

Width:  |  Height:  |  Size: 329 B

View File

Before

Width:  |  Height:  |  Size: 282 B

After

Width:  |  Height:  |  Size: 282 B

View File

Before

Width:  |  Height:  |  Size: 395 B

After

Width:  |  Height:  |  Size: 395 B

View File

Before

Width:  |  Height:  |  Size: 1.8 KiB

After

Width:  |  Height:  |  Size: 1.8 KiB

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