dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into frontier-data

Browse Source
This commit is contained in:
garak
2018-11-27 11:35:19 -05:00
parent 091b5194e7 c909aa92de
commit 73cce79753
199 changed files with 13282 additions and 20239 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/battle_anim_815A0D4.s
+11 -11
View File
@@ -125,7 +125,7 @@ sub_815A1B0: @ 815A1B0
adds r4, r0, 0
movs r0, 0x5A
strh r0, [r4, 0x2E]
ldr r0, =sub_80A64B0
ldr r0, =WaitAnimForDuration
str r0, [r4, 0x1C]
movs r0, 0x7
strh r0, [r4, 0x30]
@@ -259,7 +259,7 @@ _0815A2B2:
strh r0, [r5, 0x2E]
strh r7, [r5, 0x32]
strh r6, [r5, 0x36]
ldr r0, =sub_80A6EEC
ldr r0, =StartAnimLinearTranslation
str r0, [r5, 0x1C]
ldr r1, =DestroyAnimSprite
adds r0, r5, 0
@@ -767,7 +767,7 @@ sub_815A6C4: @ 815A6C4
sub sp, 0x4
adds r4, r0, 0
movs r1, 0x1
bl sub_80A69CC
bl InitAnimSpritePos
ldr r0, =gBattleAnimTarget
ldrb r0, [r0]
mov r5, sp
@@ -802,7 +802,7 @@ _0815A6F8:
ldr r0, =0x0000ffce
strh r0, [r4, 0x38]
adds r0, r4, 0
bl sub_80A68D4
bl InitAnimArcTranslation
ldr r0, =sub_815A73C
str r0, [r4, 0x1C]
add sp, 0x4
@@ -824,7 +824,7 @@ sub_815A73C: @ 815A73C
movs r0, 0x1E
strh r0, [r4, 0x2E]
strh r1, [r4, 0x30]
ldr r0, =sub_80A64B0
ldr r0, =WaitAnimForDuration
str r0, [r4, 0x1C]
ldr r1, =sub_815A76C
adds r0, r4, 0
@@ -2216,7 +2216,7 @@ sub_815B27C: @ 815B27C
bne _0815B290
adds r0, r5, 0
movs r1, 0
bl sub_80A69CC
bl InitAnimSpritePos
_0815B290:
ldrh r0, [r5, 0x2E]
adds r0, 0x1
@@ -2291,7 +2291,7 @@ _0815B2D8:
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x36]
ldr r0, =sub_80A6EEC
ldr r0, =StartAnimLinearTranslation
str r0, [r5, 0x1C]
_0815B324:
pop {r4,r5}
@@ -2810,7 +2810,7 @@ sub_815B70C: @ 815B70C
_0815B71E:
adds r0, r4, 0
movs r1, 0
bl sub_80A69CC
bl InitAnimSpritePos
movs r0, 0x90
lsls r0, 4
strh r0, [r4, 0x30]
@@ -4309,7 +4309,7 @@ sub_815C400: @ 815C400
bne _0815C41E
adds r0, r4, 0
movs r1, 0
bl sub_80A69CC
bl InitAnimSpritePos
ldrh r0, [r4, 0x2E]
adds r0, 0x1
strh r0, [r4, 0x2E]
@@ -8448,7 +8448,7 @@ _0815E4EE:
adds r0, r1
lsls r0, 2
adds r0, r4
bl sub_80A68D4
bl InitAnimArcTranslation
mov r1, r10
ldrb r0, [r1]
bl GetBattlerSide
@@ -9605,7 +9605,7 @@ sub_815EE84: @ 815EE84
bne _0815EEA8
adds r0, r4, 0
movs r1, 0x1
bl sub_80A69CC
bl InitAnimSpritePos
ldr r0, =gBattleAnimAttacker
b _0815EEAA
.pool
asm/battle_anim_8170478.s
+4 -4
View File
@@ -1473,7 +1473,7 @@ sub_8171104: @ 8171104
ldr r0, =0x0000ffd8
strh r0, [r4, 0x38]
adds r0, r4, 0
bl sub_80A68D4
bl InitAnimArcTranslation
ldr r0, =sub_8171134
str r0, [r4, 0x1C]
pop {r4}
@@ -2631,7 +2631,7 @@ _08171A26:
ldrsb r0, [r1, r0]
strh r0, [r5, 0x38]
adds r0, r5, 0
bl sub_80A68D4
bl InitAnimArcTranslation
add r4, r10
ldr r0, =sub_8171AAC
str r0, [r4]
@@ -5571,7 +5571,7 @@ sub_817330C: @ 817330C
push {r4,r5,lr}
adds r4, r0, 0
movs r1, 0
bl sub_80A69CC
bl InitAnimSpritePos
movs r0, 0x1E
strh r0, [r4, 0x2E]
movs r0, 0x1
@@ -5600,7 +5600,7 @@ sub_817330C: @ 817330C
ldr r0, =0x0000ffe0
strh r0, [r4, 0x38]
adds r0, r4, 0
bl sub_80A68D4
bl InitAnimArcTranslation
ldr r2, =gSprites
ldr r1, =gBattlerSpriteIds
ldr r0, =gBattleAnimAttacker
asm/battle_anim_effects_1.s
+34 -34
View File
@@ -92,7 +92,7 @@ sub_80FE8E0: @ 80FE8E0
push {r4,r5,lr}
adds r4, r0, 0
movs r1, 0x1
bl sub_80A69CC
bl InitAnimSpritePos
ldr r0, =gBattleAnimArgs
ldrh r0, [r0, 0x4]
strh r0, [r4, 0x2E]
@@ -109,7 +109,7 @@ sub_80FE8E0: @ 80FE8E0
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x36]
ldr r0, =sub_80A6EEC
ldr r0, =StartAnimLinearTranslation
str r0, [r4, 0x1C]
ldr r1, =move_anim_8074EE0
adds r0, r4, 0
@@ -125,7 +125,7 @@ sub_80FE930: @ 80FE930
push {r4,r5,lr}
adds r4, r0, 0
movs r1, 0x1
bl sub_80A69CC
bl InitAnimSpritePos
ldr r5, =gBattleAnimArgs
ldrb r1, [r5, 0x6]
adds r0, r4, 0
@@ -145,7 +145,7 @@ sub_80FE930: @ 80FE930
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x36]
ldr r0, =sub_80A6EEC
ldr r0, =StartAnimLinearTranslation
str r0, [r4, 0x1C]
ldr r1, =DestroyAnimSprite
adds r0, r4, 0
@@ -161,7 +161,7 @@ sub_80FE988: @ 80FE988
push {r4-r6,lr}
adds r4, r0, 0
movs r1, 0x1
bl sub_80A69CC
bl InitAnimSpritePos
ldr r6, =gBattleAnimArgs
ldrh r0, [r6, 0x4]
strh r0, [r4, 0x2E]
@@ -337,7 +337,7 @@ sub_80FEAD8: @ 80FEAD8
ldrh r0, [r6, 0x4]
strh r0, [r4, 0x38]
adds r0, r4, 0
bl sub_80A68D4
bl InitAnimArcTranslation
ldr r0, =sub_80FEB28
str r0, [r4, 0x1C]
pop {r4-r6}
@@ -493,7 +493,7 @@ sub_80FEC48: @ 80FEC48
push {r4-r6,lr}
adds r6, r0, 0
movs r1, 0x1
bl sub_80A69CC
bl InitAnimSpritePos
ldr r0, =gBattleAnimAttacker
ldrb r0, [r0]
bl GetBattlerSide
@@ -528,7 +528,7 @@ _080FEC68:
ldrh r0, [r4, 0xA]
strh r0, [r6, 0x38]
adds r0, r6, 0
bl sub_80A68D4
bl InitAnimArcTranslation
ldr r0, =sub_80FECB8
str r0, [r6, 0x1C]
pop {r4-r6}
@@ -553,7 +553,7 @@ sub_80FECB8: @ 80FECB8
strb r0, [r2]
movs r0, 0xA
strh r0, [r4, 0x2E]
ldr r0, =sub_80A64B0
ldr r0, =WaitAnimForDuration
str r0, [r4, 0x1C]
ldr r1, =sub_80FECF0
adds r0, r4, 0
@@ -581,7 +581,7 @@ sub_80FECF0: @ 80FECF0
bl StartSpriteAnim
movs r0, 0x3C
strh r0, [r4, 0x2E]
ldr r0, =sub_80A64B0
ldr r0, =WaitAnimForDuration
str r0, [r4, 0x1C]
ldr r1, =DestroyAnimSprite
adds r0, r4, 0
@@ -762,7 +762,7 @@ sub_80FEE78: @ 80FEE78
push {r4,r5,lr}
adds r4, r0, 0
movs r1, 0
bl sub_80A69CC
bl InitAnimSpritePos
ldr r5, =gBattleAnimArgs
ldrh r0, [r5, 0x6]
strh r0, [r4, 0x2E]
@@ -859,7 +859,7 @@ sub_80FEF44: @ 80FEF44
push {r4,r5,lr}
adds r4, r0, 0
movs r1, 0x1
bl sub_80A69CC
bl InitAnimSpritePos
ldr r5, =gBattleAnimArgs
ldrh r0, [r5, 0x6]
strh r0, [r4, 0x2E]
@@ -1079,7 +1079,7 @@ sub_80FF0F4: @ 80FF0F4
push {r4-r6,lr}
adds r5, r0, 0
movs r1, 0x1
bl sub_80A69CC
bl InitAnimSpritePos
ldr r0, =gBattleAnimAttacker
ldrb r0, [r0]
bl GetBattlerSide
@@ -1138,7 +1138,7 @@ _080FF174:
ldrh r0, [r0, 0xA]
strh r0, [r5, 0x38]
adds r0, r5, 0
bl sub_80A68D4
bl InitAnimArcTranslation
ldr r0, =gBattleAnimAttacker
ldrb r0, [r0]
bl GetBattlerSide
@@ -1256,8 +1256,8 @@ _080FF260:
bx r0
thumb_func_end sub_80FF1C0
thumb_func_start sub_80FF268
sub_80FF268: @ 80FF268
thumb_func_start AnimMoveTwisterParticle
AnimMoveTwisterParticle: @ 80FF268
push {r4,lr}
adds r4, r0, 0
bl IsDoubleBattle
@@ -1294,7 +1294,7 @@ _080FF28A:
pop {r0}
bx r0
.pool
thumb_func_end sub_80FF268
thumb_func_end AnimMoveTwisterParticle
thumb_func_start sub_80FF2BC
sub_80FF2BC: @ 80FF2BC
@@ -2348,7 +2348,7 @@ sub_80FFB18: @ 80FFB18
push {r4-r6,lr}
adds r5, r0, 0
movs r1, 0
bl sub_80A69CC
bl InitAnimSpritePos
ldr r4, =gBattleAnimTarget
ldrb r0, [r4]
movs r1, 0
@@ -3100,7 +3100,7 @@ _08100060:
adds r0, r1
lsls r0, 2
adds r0, r4
bl sub_80A68D4
bl InitAnimArcTranslation
ldr r0, =sub_8100128
str r0, [r5]
pop {r4-r6}
@@ -3263,7 +3263,7 @@ _08100204:
adds r0, r4, 0
bl StartSpriteAnim
adds r0, r4, 0
bl sub_80A68D4
bl InitAnimArcTranslation
ldrh r0, [r6, 0x8]
adds r0, 0x1
b _081004FA
@@ -3335,7 +3335,7 @@ _08100272:
adds r0, r4, 0
bl StartSpriteAnim
adds r0, r4, 0
bl sub_80A68D4
bl InitAnimArcTranslation
ldrh r0, [r6, 0x8]
adds r0, 0x1
b _081004FA
@@ -3394,7 +3394,7 @@ _081002E8:
adds r0, r4, 0
bl StartSpriteAnim
adds r0, r4, 0
bl sub_80A68D4
bl InitAnimArcTranslation
ldrh r0, [r6, 0x8]
adds r0, 0x1
b _081004FA
@@ -3448,7 +3448,7 @@ _08100380:
adds r0, r4, 0
bl StartSpriteAnim
adds r0, r4, 0
bl sub_80A68D4
bl InitAnimArcTranslation
ldrh r0, [r6, 0x8]
adds r0, 0x1
b _081004FA
@@ -3505,7 +3505,7 @@ _081003D2:
adds r0, r4, 0
bl StartSpriteAnim
adds r0, r4, 0
bl sub_80A68D4
bl InitAnimArcTranslation
ldrh r0, [r6, 0x8]
adds r0, 0x1
b _081004FA
@@ -3557,7 +3557,7 @@ _08100464:
adds r0, r4, 0
bl StartSpriteAnim
adds r0, r4, 0
bl sub_80A68D4
bl InitAnimArcTranslation
ldrh r0, [r6, 0x8]
adds r0, 0x1
b _081004FA
@@ -4624,7 +4624,7 @@ _08100CF2:
bl StoreSpriteCallbackInData6
movs r0, 0x3
strh r0, [r4, 0x2E]
ldr r0, =sub_80A64B0
ldr r0, =WaitAnimForDuration
str r0, [r4, 0x1C]
_08100D28:
pop {r4}
@@ -5704,7 +5704,7 @@ sub_81015AC: @ 81015AC
strh r1, [r0, 0x22]
movs r1, 0x14
strh r1, [r0, 0x2E]
ldr r1, =sub_80A64B0
ldr r1, =WaitAnimForDuration
str r1, [r0, 0x1C]
ldr r1, =sub_81015D4
bl StoreSpriteCallbackInData6
@@ -5728,7 +5728,7 @@ sub_81015D4: @ 81015D4
b _0810166A
_081015EA:
strh r1, [r5, 0x2E]
ldr r0, =sub_80A64B0
ldr r0, =WaitAnimForDuration
str r0, [r5, 0x1C]
ldr r1, =sub_81015D4
adds r0, r5, 0
@@ -5766,7 +5766,7 @@ _08101604:
asrs r0, 24
adds r4, r0
strh r4, [r5, 0x36]
ldr r0, =sub_80A6EEC
ldr r0, =StartAnimLinearTranslation
str r0, [r5, 0x1C]
ldr r1, =sub_8101684
adds r0, r5, 0
@@ -5806,7 +5806,7 @@ sub_8101684: @ 8101684
bne _081016AC
movs r0, 0xA
strh r0, [r2, 0x2E]
ldr r0, =sub_80A64B0
ldr r0, =WaitAnimForDuration
str r0, [r2, 0x1C]
ldr r1, =sub_81016B8
adds r0, r2, 0
@@ -5833,7 +5833,7 @@ sub_81016B8: @ 81016B8
strh r0, [r5, 0x2E]
strh r1, [r5, 0x30]
strh r1, [r5, 0x32]
ldr r0, =sub_80A64B0
ldr r0, =WaitAnimForDuration
str r0, [r5, 0x1C]
ldr r1, =sub_8101774
adds r0, r5, 0
@@ -5900,7 +5900,7 @@ _08101718:
lsrs r0, 24
adds r0, r6
strh r0, [r5, 0x36]
ldr r0, =sub_80A6EEC
ldr r0, =StartAnimLinearTranslation
str r0, [r5, 0x1C]
ldr r1, =sub_8101820
adds r0, r5, 0
@@ -7478,7 +7478,7 @@ _08102390:
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x36]
ldr r0, =sub_80A6EEC
ldr r0, =StartAnimLinearTranslation
str r0, [r5, 0x1C]
ldr r1, =DestroyAnimSprite
adds r0, r5, 0
@@ -9019,7 +9019,7 @@ _08102FDE:
strh r0, [r5, 0x22]
movs r0, 0x8
strh r0, [r5, 0x2E]
ldr r0, =sub_80A64B0
ldr r0, =WaitAnimForDuration
str r0, [r5, 0x1C]
ldr r1, =DestroyAnimSprite
adds r0, r5, 0
asm/battle_anim_effects_2.s
+21 -21
View File
@@ -240,7 +240,7 @@ sub_8103620: @ 8103620
push {r4,lr}
adds r4, r0, 0
movs r1, 0x1
bl sub_80A69CC
bl InitAnimSpritePos
ldr r1, =gBattleAnimArgs
ldrh r0, [r1, 0x4]
strh r0, [r4, 0x2E]
@@ -248,7 +248,7 @@ sub_8103620: @ 8103620
strh r0, [r4, 0x30]
ldrh r0, [r1, 0x8]
strh r0, [r4, 0x38]
ldr r0, =sub_80A64B0
ldr r0, =WaitAnimForDuration
str r0, [r4, 0x1C]
ldr r1, =sub_8103658
adds r0, r4, 0
@@ -269,7 +269,7 @@ sub_8103658: @ 8103658
ldrh r1, [r0, 0x22]
adds r1, 0xF
strh r1, [r0, 0x36]
ldr r1, =sub_80A6EEC
ldr r1, =StartAnimLinearTranslation
str r1, [r0, 0x1C]
ldr r1, =sub_8103680
bl StoreSpriteCallbackInData6
@@ -526,7 +526,7 @@ sub_810387C: @ 810387C
push {r4,lr}
adds r4, r0, 0
movs r1, 0
bl sub_80A69CC
bl InitAnimSpritePos
ldr r0, =sub_80A67BC
str r0, [r4, 0x1C]
ldr r1, =sub_81038A0
@@ -548,7 +548,7 @@ sub_81038A0: @ 81038A0
ldrh r1, [r0, 0x22]
subs r1, 0x20
strh r1, [r0, 0x36]
ldr r1, =sub_80A6EEC
ldr r1, =StartAnimLinearTranslation
str r1, [r0, 0x1C]
ldr r1, =DestroyAnimSprite
bl StoreSpriteCallbackInData6
@@ -594,7 +594,7 @@ _081038EC:
_0810390E:
adds r0, r5, 0
movs r1, 0x1
bl sub_80A69CC
bl InitAnimSpritePos
ldr r4, =gBattleAnimTarget
ldrb r0, [r4]
movs r1, 0x2
@@ -657,7 +657,7 @@ _08103980:
mov r0, r8
strh r0, [r5, 0x32]
strh r7, [r5, 0x36]
ldr r0, =sub_80A6EEC
ldr r0, =StartAnimLinearTranslation
str r0, [r5, 0x1C]
ldr r1, =DestroyAnimSprite
adds r0, r5, 0
@@ -1424,7 +1424,7 @@ sub_8103FE8: @ 8103FE8
push {r4,lr}
adds r4, r0, 0
movs r1, 0
bl sub_80A69CC
bl InitAnimSpritePos
ldr r0, =gUnknown_085934A0
ldrh r0, [r0, 0x2]
bl IndexOfSpritePaletteTag
@@ -1507,7 +1507,7 @@ sub_8104088: @ 8104088
sub sp, 0x4
adds r5, r0, 0
movs r1, 0x1
bl sub_80A69CC
bl InitAnimSpritePos
ldr r4, =gBattleAnimTarget
ldrb r0, [r4]
movs r1, 0x2
@@ -1655,7 +1655,7 @@ sub_81041C4: @ 81041C4
push {r4,r5,lr}
adds r4, r0, 0
movs r1, 0x1
bl sub_80A69CC
bl InitAnimSpritePos
movs r0, 0x14
strh r0, [r4, 0x2E]
ldr r5, =gBattleAnimTarget
@@ -1671,7 +1671,7 @@ sub_81041C4: @ 81041C4
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x36]
ldr r0, =sub_80A6EEC
ldr r0, =StartAnimLinearTranslation
str r0, [r4, 0x1C]
adds r2, r4, 0
adds r2, 0x2C
@@ -1809,7 +1809,7 @@ sub_8104304: @ 8104304
push {r4,lr}
adds r4, r0, 0
movs r1, 0
bl sub_80A69CC
bl InitAnimSpritePos
ldr r0, =gBattleAnimAttacker
ldrb r0, [r0]
bl GetBattlerSide
@@ -1896,7 +1896,7 @@ _08104390:
lsrs r0, 24
adds r0, r6
strh r0, [r5, 0x36]
ldr r0, =sub_80A6EEC
ldr r0, =StartAnimLinearTranslation
str r0, [r5, 0x1C]
ldr r1, =sub_81043F8
adds r0, r5, 0
@@ -4038,7 +4038,7 @@ sub_8105538: @ 8105538
push {r4,lr}
adds r4, r0, 0
movs r1, 0
bl sub_80A69CC
bl InitAnimSpritePos
ldr r0, =gBattleAnimAttacker
ldrb r0, [r0]
bl GetBattlerSide
@@ -5141,7 +5141,7 @@ sub_8105DE8: @ 8105DE8
push {r4-r6,lr}
adds r5, r0, 0
movs r1, 0
bl sub_80A69CC
bl InitAnimSpritePos
ldr r6, =gBattleAnimAttacker
ldrb r0, [r6]
bl GetBattlerSide
@@ -5172,7 +5172,7 @@ _08105E08:
ldrh r1, [r4, 0x6]
adds r0, r1
strh r0, [r5, 0x36]
ldr r0, =sub_80A6EEC
ldr r0, =StartAnimLinearTranslation
str r0, [r5, 0x1C]
ldr r1, =DestroyAnimSprite
adds r0, r5, 0
@@ -5200,7 +5200,7 @@ sub_8105E60: @ 8105E60
bne _08105E7A
adds r0, r4, 0
movs r1, 0
bl sub_80A69CC
bl InitAnimSpritePos
_08105E7A:
movs r1, 0x30
ldrsh r0, [r4, r1]
@@ -5525,7 +5525,7 @@ sub_8106140: @ 8106140
push {r4,r5,lr}
adds r4, r0, 0
movs r1, 0x1
bl sub_80A69CC
bl InitAnimSpritePos
movs r0, 0x5F
strh r0, [r4, 0x2E]
ldrh r0, [r4, 0x20]
@@ -5667,7 +5667,7 @@ sub_810624C: @ 810624C
strh r1, [r0, 0x2E]
ldrh r1, [r2, 0x2]
strh r1, [r0, 0x30]
ldr r1, =sub_80A64B0
ldr r1, =WaitAnimForDuration
str r1, [r0, 0x1C]
ldr r1, =sub_810627C
bl StoreSpriteCallbackInData6
@@ -6543,7 +6543,7 @@ sub_81069B8: @ 81069B8
push {r4,lr}
adds r4, r0, 0
movs r1, 0x1
bl sub_80A69CC
bl InitAnimSpritePos
ldr r0, =sub_810699C
str r0, [r4, 0x1C]
pop {r4}
@@ -7496,7 +7496,7 @@ _08107118:
ldrh r0, [r5, 0x22]
subs r0, 0x48
strh r0, [r5, 0x36]
ldr r0, =sub_80A6EEC
ldr r0, =StartAnimLinearTranslation
str r0, [r5, 0x1C]
ldr r1, =DestroyAnimSprite
adds r0, r5, 0
asm/bug.s
-791
View File
@@ -1,791 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start sub_8110368
sub_8110368: @ 8110368
push {r4-r6,lr}
adds r6, r0, 0
bl IsContest
lsls r0, 24
cmp r0, 0
beq _08110394
adds r0, r6, 0
movs r1, 0x2
bl StartSpriteAffineAnim
ldr r0, =gBattleAnimArgs
ldrh r1, [r0, 0x4]
negs r1, r1
strh r1, [r0, 0x4]
ldrh r1, [r0]
negs r1, r1
strh r1, [r0]
b _081103C4
.pool
_08110394:
ldr r0, =gBattleAnimTarget
ldrb r0, [r0]
bl GetBattlerSide
lsls r0, 24
cmp r0, 0
bne _081103C4
adds r0, r6, 0
movs r1, 0x1
bl StartSpriteAffineAnim
ldr r1, =gBattleAnimArgs
ldrh r0, [r1, 0x2]
negs r0, r0
strh r0, [r1, 0x2]
ldrh r0, [r1, 0x4]
negs r0, r0
strh r0, [r1, 0x4]
ldrh r0, [r1, 0x6]
negs r0, r0
strh r0, [r1, 0x6]
ldrh r0, [r1]
negs r0, r0
strh r0, [r1]
_081103C4:
ldr r5, =gBattleAnimTarget
ldrb r0, [r5]
movs r1, 0x2
bl GetBattlerSpriteCoord2
lsls r0, 24
ldr r4, =gBattleAnimArgs
lsrs r0, 24
ldrh r1, [r4]
adds r0, r1
strh r0, [r6, 0x20]
ldrb r0, [r5]
movs r1, 0x3
bl GetBattlerSpriteCoord2
lsls r0, 24
lsrs r0, 24
ldrh r1, [r4, 0x2]
adds r0, r1
strh r0, [r6, 0x22]
ldrh r0, [r4, 0x8]
strh r0, [r6, 0x2E]
ldrb r0, [r5]
movs r1, 0x2
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
ldrh r1, [r4, 0x4]
adds r0, r1
strh r0, [r6, 0x32]
ldrb r0, [r5]
movs r1, 0x3
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
ldrh r4, [r4, 0x6]
adds r0, r4
strh r0, [r6, 0x36]
ldr r0, =sub_80A6EEC
str r0, [r6, 0x1C]
ldr r1, =DestroyAnimSprite
adds r0, r6, 0
bl StoreSpriteCallbackInData6
pop {r4-r6}
pop {r0}
bx r0
.pool
thumb_func_end sub_8110368
thumb_func_start sub_8110438
sub_8110438: @ 8110438
push {r4-r6,lr}
adds r6, r0, 0
bl IsContest
lsls r0, 24
cmp r0, 0
beq _0811045C
ldr r1, =gBattleAnimArgs
ldrh r0, [r1]
negs r0, r0
strh r0, [r1]
adds r0, r6, 0
movs r1, 0x2
bl StartSpriteAffineAnim
b _08110478
.pool
_0811045C:
ldr r0, =gBattleAnimTarget
ldrb r0, [r0]
bl GetBattlerSide
lsls r0, 24
cmp r0, 0
bne _08110478
ldr r0, =gBattleAnimArgs
ldrh r1, [r0, 0x2]
negs r1, r1
strh r1, [r0, 0x2]
ldrh r1, [r0]
negs r1, r1
strh r1, [r0]
_08110478:
ldr r5, =gBattleAnimTarget
ldrb r0, [r5]
movs r1, 0x2
bl GetBattlerSpriteCoord2
lsls r0, 24
ldr r4, =gBattleAnimArgs
lsrs r0, 24
ldrh r1, [r4]
adds r0, r1
strh r0, [r6, 0x20]
ldrb r0, [r5]
movs r1, 0x3
bl GetBattlerSpriteCoord2
lsls r0, 24
lsrs r0, 24
ldrh r1, [r4, 0x2]
adds r0, r1
strh r0, [r6, 0x22]
ldrh r0, [r4, 0x4]
strh r0, [r6, 0x2E]
ldrb r0, [r5]
movs r1, 0x2
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r6, 0x32]
ldrb r0, [r5]
movs r1, 0x3
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r6, 0x36]
ldr r0, =sub_80A6EEC
str r0, [r6, 0x1C]
ldr r1, =DestroyAnimSprite
adds r0, r6, 0
bl StoreSpriteCallbackInData6
pop {r4-r6}
pop {r0}
bx r0
.pool
thumb_func_end sub_8110438
thumb_func_start sub_81104E4
sub_81104E4: @ 81104E4
push {r4,r5,lr}
adds r5, r0, 0
bl IsContest
lsls r0, 24
cmp r0, 0
beq _08110500
ldr r0, =gBattleAnimArgs
movs r2, 0x4
ldrsh r1, [r0, r2]
lsrs r2, r1, 31
adds r1, r2
asrs r1, 1
strh r1, [r0, 0x4]
_08110500:
adds r0, r5, 0
movs r1, 0x1
bl sub_80A69CC
ldr r1, =gBattleAnimArgs
ldrh r0, [r1, 0x4]
strh r0, [r5, 0x2E]
ldrh r0, [r5, 0x20]
strh r0, [r5, 0x30]
ldrh r0, [r5, 0x22]
strh r0, [r5, 0x34]
movs r2, 0x8
ldrsh r0, [r1, r2]
cmp r0, 0
bne _08110548
ldr r4, =gBattleAnimTarget
ldrb r0, [r4]
movs r1, 0x2
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x32]
ldrb r0, [r4]
movs r1, 0x3
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x36]
b _0811055A
.pool
_08110548:
ldr r0, =gBattleAnimTarget
ldrb r0, [r0]
adds r2, r5, 0
adds r2, 0x32
adds r3, r5, 0
adds r3, 0x36
movs r1, 0x1
bl SetAverageBattlerPositions
_0811055A:
adds r0, r5, 0
bl sub_80A6FD4
ldr r0, =gBattleAnimArgs
ldrh r0, [r0, 0x6]
strh r0, [r5, 0x38]
ldr r0, =sub_811057C
str r0, [r5, 0x1C]
pop {r4,r5}
pop {r0}
bx r0
.pool
thumb_func_end sub_81104E4
thumb_func_start sub_811057C
sub_811057C: @ 811057C
push {r4,lr}
adds r4, r0, 0
bl TranslateAnimLinear
lsls r0, 24
cmp r0, 0
beq _08110592
adds r0, r4, 0
bl DestroyAnimSprite
b _081105AE
_08110592:
movs r1, 0x3A
ldrsh r0, [r4, r1]
movs r2, 0x38
ldrsh r1, [r4, r2]
bl Sin
ldrh r1, [r4, 0x24]
adds r0, r1
strh r0, [r4, 0x24]
ldrh r0, [r4, 0x3A]
adds r0, 0xD
movs r1, 0xFF
ands r0, r1
strh r0, [r4, 0x3A]
_081105AE:
pop {r4}
pop {r0}
bx r0
thumb_func_end sub_811057C
thumb_func_start sub_81105B4
sub_81105B4: @ 81105B4
push {r4,lr}
adds r4, r0, 0
ldr r0, =gBattleAnimTarget
ldrb r0, [r0]
adds r2, r4, 0
adds r2, 0x20
adds r3, r4, 0
adds r3, 0x22
movs r1, 0
bl SetAverageBattlerPositions
ldr r0, =gBattleAnimAttacker
ldrb r0, [r0]
bl GetBattlerSide
lsls r0, 24
cmp r0, 0
beq _081105F0
ldr r0, =gBattleAnimArgs
ldrh r1, [r4, 0x20]
ldrh r2, [r0]
subs r1, r2
strh r1, [r4, 0x20]
b _081105FC
.pool
_081105F0:
ldr r1, =gBattleAnimArgs
ldrh r0, [r1]
ldrh r2, [r4, 0x20]
adds r0, r2
strh r0, [r4, 0x20]
adds r0, r1, 0
_081105FC:
ldrh r0, [r0, 0x2]
ldrh r1, [r4, 0x22]
adds r0, r1
strh r0, [r4, 0x22]
ldr r0, =gBattleAnimTarget
ldrb r0, [r0]
bl GetBattlerSide
lsls r0, 24
cmp r0, 0
bne _08110618
ldrh r0, [r4, 0x22]
adds r0, 0x8
strh r0, [r4, 0x22]
_08110618:
ldr r0, =sub_8110630
str r0, [r4, 0x1C]
pop {r4}
pop {r0}
bx r0
.pool
thumb_func_end sub_81105B4
thumb_func_start sub_8110630
sub_8110630: @ 8110630
push {lr}
adds r3, r0, 0
ldrh r0, [r3, 0x2E]
adds r0, 0x1
strh r0, [r3, 0x2E]
lsls r0, 16
asrs r0, 16
cmp r0, 0x3
bne _08110664
movs r0, 0
strh r0, [r3, 0x2E]
movs r0, 0x3E
adds r0, r3
mov r12, r0
ldrb r2, [r0]
lsls r0, r2, 29
lsrs r0, 31
movs r1, 0x1
eors r1, r0
lsls r1, 2
movs r0, 0x5
negs r0, r0
ands r0, r2
orrs r0, r1
mov r1, r12
strb r0, [r1]
_08110664:
ldrh r0, [r3, 0x30]
adds r0, 0x1
strh r0, [r3, 0x30]
lsls r0, 16
asrs r0, 16
cmp r0, 0x33
bne _08110678
adds r0, r3, 0
bl DestroyAnimSprite
_08110678:
pop {r0}
bx r0
thumb_func_end sub_8110630
thumb_func_start sub_811067C
sub_811067C: @ 811067C
push {r4,lr}
adds r4, r0, 0
movs r1, 0xFD
lsls r1, 6
movs r0, 0x50
bl SetGpuReg
movs r0, 0x52
movs r1, 0x10
bl SetGpuReg
movs r0, 0x10
strh r0, [r4, 0x2E]
ldr r0, =sub_81106A4
str r0, [r4, 0x1C]
pop {r4}
pop {r0}
bx r0
.pool
thumb_func_end sub_811067C
thumb_func_start sub_81106A4
sub_81106A4: @ 81106A4
push {r4,lr}
adds r4, r0, 0
ldrh r1, [r4, 0x32]
movs r2, 0x32
ldrsh r0, [r4, r2]
cmp r0, 0x13
bgt _081106B8
adds r0, r1, 0x1
strh r0, [r4, 0x32]
b _081106F6
_081106B8:
ldrh r1, [r4, 0x30]
adds r0, r1, 0x1
strh r0, [r4, 0x30]
movs r0, 0x1
ands r0, r1
cmp r0, 0
beq _081106F6
ldrh r1, [r4, 0x2E]
subs r1, 0x1
strh r1, [r4, 0x2E]
movs r0, 0x10
subs r0, r1
lsls r0, 8
orrs r1, r0
lsls r1, 16
lsrs r1, 16
movs r0, 0x52
bl SetGpuReg
movs r1, 0x2E
ldrsh r0, [r4, r1]
cmp r0, 0
bne _081106F6
adds r2, r4, 0
adds r2, 0x3E
ldrb r0, [r2]
movs r1, 0x4
orrs r0, r1
strb r0, [r2]
ldr r0, =sub_8110700
str r0, [r4, 0x1C]
_081106F6:
pop {r4}
pop {r0}
bx r0
.pool
thumb_func_end sub_81106A4
thumb_func_start sub_8110700
sub_8110700: @ 8110700
push {r4,lr}
adds r4, r0, 0
movs r0, 0x50
movs r1, 0
bl SetGpuReg
movs r0, 0x52
movs r1, 0
bl SetGpuReg
adds r0, r4, 0
bl DestroyAnimSprite
pop {r4}
pop {r0}
bx r0
thumb_func_end sub_8110700
thumb_func_start sub_8110720
sub_8110720: @ 8110720
push {r4-r7,lr}
sub sp, 0x4
adds r7, r0, 0
bl IsContest
lsls r0, 24
cmp r0, 0
beq _08110740
ldr r1, =gBattleAnimArgs
ldrh r0, [r1, 0x4]
negs r0, r0
strh r0, [r1, 0x4]
b _08110762
.pool
_08110740:
ldr r0, =gBattleAnimAttacker
ldrb r0, [r0]
bl GetBattlerSide
lsls r0, 24
cmp r0, 0
beq _08110762
ldr r1, =gBattleAnimArgs
ldrh r0, [r1, 0x4]
negs r0, r0
strh r0, [r1, 0x4]
ldrh r0, [r1, 0x2]
negs r0, r0
strh r0, [r1, 0x2]
ldrh r0, [r1, 0x6]
negs r0, r0
strh r0, [r1, 0x6]
_08110762:
bl IsContest
lsls r0, 24
cmp r0, 0
bne _081107B2
ldr r0, =gBattleAnimAttacker
ldrb r0, [r0]
bl GetBattlerSide
adds r4, r0, 0
ldr r5, =gBattleAnimTarget
ldrb r0, [r5]
bl GetBattlerSide
lsls r4, 24
lsls r0, 24
cmp r4, r0
bne _081107B2
ldrb r0, [r5]
bl GetBattlerPosition
lsls r0, 24
cmp r0, 0
beq _081107A0
ldrb r0, [r5]
bl GetBattlerPosition
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
bne _081107B2
_081107A0:
ldr r0, =gBattleAnimArgs
movs r2, 0x4
ldrsh r1, [r0, r2]
negs r1, r1
strh r1, [r0, 0x4]
movs r2, 0
ldrsh r1, [r0, r2]
negs r1, r1
strh r1, [r0]
_081107B2:
adds r0, r7, 0
movs r1, 0x1
bl sub_80A69CC
ldr r5, =gBattleAnimTarget
ldrb r0, [r5]
movs r1, 0x2
bl GetBattlerSpriteCoord
adds r4, r0, 0
lsls r4, 24
ldr r6, =gBattleAnimArgs
lsrs r4, 24
ldrh r0, [r6, 0x4]
adds r4, r0
lsls r4, 16
lsrs r4, 16
ldrb r0, [r5]
movs r1, 0x3
bl GetBattlerSpriteCoord
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
ldrh r2, [r6, 0x6]
adds r1, r2
lsls r1, 16
ldrh r2, [r7, 0x20]
lsls r0, r4, 16
asrs r0, 16
subs r0, r2
lsls r0, 16
asrs r0, 16
ldrh r2, [r7, 0x22]
lsrs r5, r1, 16
asrs r1, 16
subs r1, r2
lsls r1, 16
asrs r1, 16
bl ArcTan2Neg
lsls r0, 16
movs r1, 0xC0
lsls r1, 24
adds r0, r1
lsrs r0, 16
movs r3, 0x80
lsls r3, 1
str r0, [sp]
adds r0, r7, 0
movs r1, 0
adds r2, r3, 0
bl sub_80A73E0
ldrh r0, [r6, 0x8]
strh r0, [r7, 0x2E]
strh r4, [r7, 0x32]
strh r5, [r7, 0x36]
ldr r0, =sub_80A6EEC
str r0, [r7, 0x1C]
ldr r1, =DestroyAnimSprite
adds r0, r7, 0
bl StoreSpriteCallbackInData6
add sp, 0x4
pop {r4-r7}
pop {r0}
bx r0
.pool
thumb_func_end sub_8110720
thumb_func_start sub_8110850
sub_8110850: @ 8110850
push {r4-r6,lr}
adds r6, r0, 0
movs r1, 0x1
bl sub_80A69CC
ldr r0, =gBattleAnimAttacker
ldrb r0, [r0]
bl GetBattlerSide
lsls r0, 24
cmp r0, 0
beq _08110870
ldr r1, =gBattleAnimArgs
ldrh r0, [r1, 0x4]
negs r0, r0
strh r0, [r1, 0x4]
_08110870:
ldr r4, =gBattleAnimArgs
ldrh r0, [r4, 0x8]
strh r0, [r6, 0x2E]
ldr r5, =gBattleAnimTarget
ldrb r0, [r5]
movs r1, 0x2
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
ldrh r1, [r4, 0x4]
adds r0, r1
strh r0, [r6, 0x32]
ldrb r0, [r5]
movs r1, 0x3
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
ldrh r1, [r4, 0x6]
adds r0, r1
strh r0, [r6, 0x36]
ldrh r0, [r4, 0xA]
strh r0, [r6, 0x38]
adds r0, r6, 0
bl sub_80A68D4
ldr r0, =sub_81108CC
str r0, [r6, 0x1C]
adds r2, r6, 0
adds r2, 0x3E
ldrb r0, [r2]
movs r1, 0x4
orrs r0, r1
strb r0, [r2]
pop {r4-r6}
pop {r0}
bx r0
.pool
thumb_func_end sub_8110850
thumb_func_start sub_81108CC
sub_81108CC: @ 81108CC
push {r4-r7,lr}
mov r7, r8
push {r7}
sub sp, 0x14
adds r4, r0, 0
adds r2, r4, 0
adds r2, 0x3E
ldrb r0, [r2]
movs r1, 0x5
negs r1, r1
ands r1, r0
strb r1, [r2]
adds r0, r4, 0
bl TranslateAnimArc
lsls r0, 24
cmp r0, 0
beq _081108F8
adds r0, r4, 0
bl DestroyAnimSprite
b _08110988
_081108F8:
movs r0, 0x2E
adds r0, r4
mov r8, r0
ldrh r7, [r4, 0x20]
ldrh r5, [r4, 0x24]
ldrh r1, [r4, 0x22]
mov r12, r1
ldrh r6, [r4, 0x26]
mov r2, r8
add r1, sp, 0x4
movs r3, 0x7
_0811090E:
ldrh r0, [r2]
strh r0, [r1]
adds r2, 0x2
adds r1, 0x2
subs r3, 0x1
cmp r3, 0
bge _0811090E
adds r0, r7, r5
lsls r0, 16
lsrs r5, r0, 16
mov r2, r12
adds r0, r2, r6
lsls r0, 16
lsrs r6, r0, 16
adds r0, r4, 0
bl TranslateAnimArc
lsls r0, 24
cmp r0, 0
bne _08110988
ldrh r0, [r4, 0x24]
ldrh r1, [r4, 0x20]
adds r0, r1
lsls r1, r5, 16
asrs r1, 16
subs r0, r1
lsls r0, 16
asrs r0, 16
ldrh r1, [r4, 0x26]
ldrh r2, [r4, 0x22]
adds r1, r2
lsls r2, r6, 16
asrs r2, 16
subs r1, r2
lsls r1, 16
asrs r1, 16
bl ArcTan2Neg
lsls r0, 16
movs r1, 0xC0
lsls r1, 24
adds r0, r1
lsrs r0, 16
movs r3, 0x80
lsls r3, 1
str r0, [sp]
adds r0, r4, 0
movs r1, 0
adds r2, r3, 0
bl sub_80A73E0
add r2, sp, 0x4
mov r1, r8
movs r3, 0x7
_0811097A:
ldrh r0, [r2]
strh r0, [r1]
adds r2, 0x2
adds r1, 0x2
subs r3, 0x1
cmp r3, 0
bge _0811097A
_08110988:
add sp, 0x14
pop {r3}
mov r8, r3
pop {r4-r7}
pop {r0}
bx r0
thumb_func_end sub_81108CC
thumb_func_start sub_8110994
sub_8110994: @ 8110994
push {r4,r5,lr}
adds r5, r0, 0
ldr r0, =gBattleAnimArgs
movs r1, 0
ldrsh r0, [r0, r1]
cmp r0, 0
bne _081109B0
ldr r4, =gBattleAnimAttacker
b _081109B2
.pool
_081109B0:
ldr r4, =gBattleAnimTarget
_081109B2:
ldrb r0, [r4]
movs r1, 0x2
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x20]
ldrb r0, [r4]
movs r1, 0x3
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
adds r0, 0x12
strh r0, [r5, 0x22]
ldr r1, =move_anim_8074EE0
adds r0, r5, 0
bl StoreSpriteCallbackInData6
ldr r0, =sub_80A67BC
str r0, [r5, 0x1C]
pop {r4,r5}
pop {r0}
bx r0
.pool
thumb_func_end sub_8110994
.align 2, 0
asm/dark.s
+2 -2
View File
@@ -264,7 +264,7 @@ sub_81138D4: @ 81138D4
movs r0, 0x7E
strh r0, [r4, 0x2E]
adds r0, r4, 0
bl sub_80A6E14
bl InitSpriteDataForLinearTranslation
ldrh r0, [r4, 0x30]
negs r0, r0
strh r0, [r4, 0x34]
@@ -563,7 +563,7 @@ _08113B60:
ldr r0, =0x0000fff4
strh r0, [r4, 0x38]
adds r0, r4, 0
bl sub_80A68D4
bl InitAnimArcTranslation
ldr r0, =sub_8113B90
str r0, [r4, 0x1C]
pop {r4-r7}
asm/dragon.s
-793
View File
@@ -1,793 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start sub_8113064
sub_8113064: @ 8113064
push {r4,r5,lr}
adds r5, r0, 0
ldr r4, =gBattleAnimAttacker
ldrb r0, [r4]
movs r1, 0x2
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x20]
ldrb r0, [r4]
movs r1, 0x3
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x22]
ldrb r0, [r4]
bl GetBattlerSide
lsls r0, 24
cmp r0, 0
beq _081130B4
ldr r2, =gBattleAnimArgs
ldrh r0, [r5, 0x20]
ldrh r1, [r2]
subs r0, r1
strh r0, [r5, 0x20]
ldrh r0, [r2, 0x6]
negs r0, r0
strh r0, [r2, 0x6]
ldrh r0, [r2, 0x8]
negs r0, r0
strh r0, [r2, 0x8]
adds r1, r2, 0
b _081130BE
.pool
_081130B4:
ldr r1, =gBattleAnimArgs
ldrh r0, [r1]
ldrh r2, [r5, 0x20]
adds r0, r2
strh r0, [r5, 0x20]
_081130BE:
ldrh r0, [r1, 0x2]
ldrh r2, [r5, 0x22]
adds r0, r2
strh r0, [r5, 0x22]
ldrh r0, [r1, 0x4]
strh r0, [r5, 0x2E]
ldrh r0, [r1, 0x6]
strh r0, [r5, 0x30]
ldrh r0, [r1, 0x8]
strh r0, [r5, 0x34]
ldrh r0, [r1, 0xA]
strh r0, [r5, 0x38]
adds r2, r5, 0
adds r2, 0x3E
ldrb r0, [r2]
movs r1, 0x4
orrs r0, r1
strb r0, [r2]
ldr r1, =move_anim_8074EE0
adds r0, r5, 0
bl StoreSpriteCallbackInData6
ldr r0, =sub_80A66DC
str r0, [r5, 0x1C]
pop {r4,r5}
pop {r0}
bx r0
.pool
thumb_func_end sub_8113064
thumb_func_start sub_8113100
sub_8113100: @ 8113100
push {r4,r5,lr}
adds r5, r0, 0
bl sub_80A6838
ldr r4, =gBattleAnimTarget
ldrb r0, [r4]
movs r1, 0x2
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x32]
ldrb r0, [r4]
movs r1, 0x3
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x36]
ldr r0, =gBattleAnimAttacker
ldrb r0, [r0]
bl GetBattlerSide
lsls r0, 24
cmp r0, 0
beq _08113164
ldr r2, =gBattleAnimArgs
ldrh r0, [r5, 0x20]
ldrh r1, [r2, 0x2]
subs r0, r1
strh r0, [r5, 0x20]
ldrh r0, [r5, 0x22]
adds r1, r0
strh r1, [r5, 0x22]
ldrh r0, [r5, 0x32]
ldrh r1, [r2, 0x4]
subs r0, r1
strh r0, [r5, 0x32]
ldrh r0, [r2, 0x6]
ldrh r1, [r5, 0x36]
adds r0, r1
strh r0, [r5, 0x36]
b _0811318E
.pool
_08113164:
ldr r1, =gBattleAnimArgs
ldrh r0, [r1]
ldrh r2, [r5, 0x20]
adds r0, r2
strh r0, [r5, 0x20]
ldrh r0, [r1, 0x2]
ldrh r2, [r5, 0x22]
adds r0, r2
strh r0, [r5, 0x22]
ldrh r0, [r1, 0x4]
ldrh r2, [r5, 0x32]
adds r0, r2
strh r0, [r5, 0x32]
ldrh r0, [r1, 0x6]
ldrh r1, [r5, 0x36]
adds r0, r1
strh r0, [r5, 0x36]
adds r0, r5, 0
movs r1, 0x1
bl StartSpriteAnim
_0811318E:
ldr r0, =gBattleAnimArgs
ldrh r0, [r0, 0x8]
strh r0, [r5, 0x2E]
ldr r0, =sub_80A6EEC
str r0, [r5, 0x1C]
ldr r1, =move_anim_8074EE0
adds r0, r5, 0
bl StoreSpriteCallbackInData6
pop {r4,r5}
pop {r0}
bx r0
.pool
thumb_func_end sub_8113100
thumb_func_start sub_81131B4
sub_81131B4: @ 81131B4
push {r4,r5,lr}
adds r5, r0, 0
ldr r0, =gBattleAnimArgs
movs r1, 0
ldrsh r0, [r0, r1]
cmp r0, 0
bne _081131D0
ldr r4, =gBattleAnimAttacker
b _081131D2
.pool
_081131D0:
ldr r4, =gBattleAnimTarget
_081131D2:
ldrb r0, [r4]
movs r1, 0
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x20]
ldrb r0, [r4]
movs r1, 0x1
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x22]
ldr r4, =gBattleAnimArgs
movs r0, 0x2
ldrsh r1, [r4, r0]
adds r0, r5, 0
bl sub_80A6864
ldrh r0, [r4, 0x4]
ldrh r1, [r5, 0x22]
adds r0, r1
strh r0, [r5, 0x22]
ldr r0, =sub_80A67D8
str r0, [r5, 0x1C]
ldr r1, =move_anim_8074EE0
adds r0, r5, 0
bl StoreSpriteCallbackInData6
pop {r4,r5}
pop {r0}
bx r0
.pool
thumb_func_end sub_81131B4
thumb_func_start sub_8113224
sub_8113224: @ 8113224
push {r4,lr}
adds r4, r0, 0
ldr r0, =gBattleAnimAttacker
ldrb r0, [r0]
bl GetBattlerSide
lsls r0, 24
cmp r0, 0
beq _0811323E
adds r0, r4, 0
movs r1, 0x1
bl StartSpriteAffineAnim
_0811323E:
adds r0, r4, 0
bl sub_8113100
pop {r4}
pop {r0}
bx r0
.pool
thumb_func_end sub_8113224
thumb_func_start sub_8113250
sub_8113250: @ 8113250
push {r4-r7,lr}
adds r6, r0, 0
ldr r4, =gBattleAnimAttacker
ldrb r0, [r4]
movs r1, 0x2
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
movs r5, 0
strh r0, [r6, 0x20]
ldrb r0, [r4]
movs r1, 0x3
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r6, 0x22]
strh r5, [r6, 0x36]
movs r0, 0x1
strh r0, [r6, 0x38]
ldr r0, =gBattleAnimArgs
ldrh r0, [r0]
strh r0, [r6, 0x3A]
ldr r4, =gBattlerAttacker
ldrb r0, [r4]
movs r1, 0
bl sub_80A861C
lsls r7, r0, 16
lsrs r5, r7, 16
ldrb r0, [r4]
movs r1, 0x1
bl sub_80A861C
lsls r1, r0, 16
lsrs r0, r1, 16
cmp r5, r0
bls _081132B0
lsrs r0, r7, 17
b _081132B2
.pool
_081132B0:
lsrs r0, r1, 17
_081132B2:
strh r0, [r6, 0x3C]
movs r1, 0x3A
ldrsh r0, [r6, r1]
movs r2, 0x3C
ldrsh r1, [r6, r2]
bl Cos
strh r0, [r6, 0x24]
movs r1, 0x3A
ldrsh r0, [r6, r1]
movs r2, 0x3C
ldrsh r1, [r6, r2]
bl Sin
strh r0, [r6, 0x26]
ldr r0, =sub_81132E0
str r0, [r6, 0x1C]
pop {r4-r7}
pop {r0}
bx r0
.pool
thumb_func_end sub_8113250
thumb_func_start sub_81132E0
sub_81132E0: @ 81132E0
push {r4,r5,lr}
adds r4, r0, 0
movs r0, 0x2E
ldrsh r5, [r4, r0]
cmp r5, 0
beq _081132F2
cmp r5, 0x1
beq _0811335E
b _081133E2
_081132F2:
ldrh r0, [r4, 0x3A]
ldrh r1, [r4, 0x38]
subs r0, r1
movs r1, 0xFF
ands r0, r1
strh r0, [r4, 0x3A]
movs r1, 0x3A
ldrsh r0, [r4, r1]
movs r2, 0x3C
ldrsh r1, [r4, r2]
bl Cos
strh r0, [r4, 0x24]
movs r1, 0x3A
ldrsh r0, [r4, r1]
movs r2, 0x3C
ldrsh r1, [r4, r2]
bl Sin
strh r0, [r4, 0x26]
ldrh r0, [r4, 0x36]
adds r0, 0x1
strh r0, [r4, 0x36]
lsls r0, 16
asrs r0, 16
cmp r0, 0x5
ble _08113344
strh r5, [r4, 0x36]
ldrh r1, [r4, 0x38]
movs r2, 0x38
ldrsh r0, [r4, r2]
cmp r0, 0xF
bgt _08113344
adds r0, r1, 0x1
strh r0, [r4, 0x38]
lsls r0, 16
asrs r0, 16
cmp r0, 0xF
ble _08113344
movs r0, 0x10
strh r0, [r4, 0x38]
_08113344:
ldrh r0, [r4, 0x34]
adds r0, 0x1
strh r0, [r4, 0x34]
lsls r0, 16
asrs r0, 16
cmp r0, 0x3C
ble _081133E2
movs r0, 0
strh r0, [r4, 0x34]
ldrh r0, [r4, 0x2E]
adds r0, 0x1
strh r0, [r4, 0x2E]
b _081133E2
_0811335E:
ldrh r0, [r4, 0x3A]
ldrh r1, [r4, 0x38]
subs r0, r1
movs r1, 0xFF
ands r0, r1
strh r0, [r4, 0x3A]
ldrh r1, [r4, 0x3C]
movs r2, 0x3C
ldrsh r0, [r4, r2]
cmp r0, 0x95
bgt _08113386
adds r0, r1, 0
adds r0, 0x8
strh r0, [r4, 0x3C]
lsls r0, 16
asrs r0, 16
cmp r0, 0x95
ble _08113386
movs r0, 0x96
strh r0, [r4, 0x3C]
_08113386:
movs r1, 0x3A
ldrsh r0, [r4, r1]
movs r2, 0x3C
ldrsh r1, [r4, r2]
bl Cos
strh r0, [r4, 0x24]
movs r1, 0x3A
ldrsh r0, [r4, r1]
movs r2, 0x3C
ldrsh r1, [r4, r2]
bl Sin
strh r0, [r4, 0x26]
ldrh r0, [r4, 0x36]
adds r0, 0x1
strh r0, [r4, 0x36]
lsls r0, 16
asrs r0, 16
cmp r0, 0x5
ble _081133CE
movs r0, 0
strh r0, [r4, 0x36]
ldrh r1, [r4, 0x38]
movs r2, 0x38
ldrsh r0, [r4, r2]
cmp r0, 0xF
bgt _081133CE
adds r0, r1, 0x1
strh r0, [r4, 0x38]
lsls r0, 16
asrs r0, 16
cmp r0, 0xF
ble _081133CE
movs r0, 0x10
strh r0, [r4, 0x38]
_081133CE:
ldrh r0, [r4, 0x34]
adds r0, 0x1
strh r0, [r4, 0x34]
lsls r0, 16
asrs r0, 16
cmp r0, 0x14
ble _081133E2
adds r0, r4, 0
bl DestroyAnimSprite
_081133E2:
pop {r4,r5}
pop {r0}
bx r0
thumb_func_end sub_81132E0
thumb_func_start sub_81133E8
sub_81133E8: @ 81133E8
push {r4-r6,lr}
sub sp, 0xC
lsls r0, 24
lsrs r0, 24
lsls r1, r0, 2
adds r1, r0
lsls r1, 3
ldr r0, =gTasks
adds r4, r1, r0
ldr r0, =gBattleAnimAttacker
ldrb r0, [r0]
bl sub_80A8364
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
bne _08113424
ldr r0, =0x04000014
str r0, [sp]
ldr r0, =gBattle_BG1_X
b _0811342A
.pool
_08113424:
ldr r0, =0x04000018
str r0, [sp]
ldr r0, =gBattle_BG2_X
_0811342A:
ldrh r0, [r0]
strh r0, [r4, 0xC]
ldr r0, =0xa2600001
str r0, [sp, 0x4]
mov r1, sp
movs r5, 0
movs r0, 0x1
strb r0, [r1, 0x8]
mov r0, sp
strb r5, [r0, 0x9]
ldr r0, =gBattleAnimAttacker
ldrb r0, [r0]
bl GetBattlerYCoordWithElevation
lsls r0, 24
lsrs r0, 24
adds r1, r0, 0
subs r1, 0x20
strh r1, [r4, 0xE]
adds r0, 0x20
strh r0, [r4, 0x10]
cmp r1, 0
bge _0811345A
strh r5, [r4, 0xE]
_0811345A:
ldrh r3, [r4, 0xE]
movs r1, 0x10
ldrsh r0, [r4, r1]
cmp r3, r0
bgt _08113488
ldr r5, =gScanlineEffectRegBuffers
movs r0, 0xF0
lsls r0, 3
adds r6, r5, r0
_0811346C:
lsls r1, r3, 1
adds r2, r1, r5
ldrh r0, [r4, 0xC]
strh r0, [r2]
adds r1, r6
ldrh r0, [r4, 0xC]
strh r0, [r1]
adds r0, r3, 0x1
lsls r0, 16
lsrs r3, r0, 16
movs r1, 0x10
ldrsh r0, [r4, r1]
cmp r3, r0
ble _0811346C
_08113488:
ldr r0, [sp]
ldr r1, [sp, 0x4]
ldr r2, [sp, 0x8]
bl ScanlineEffect_SetParams
ldr r0, =sub_81134B8
str r0, [r4]
add sp, 0xC
pop {r4-r6}
pop {r0}
bx r0
.pool
thumb_func_end sub_81133E8
thumb_func_start sub_81134B8
sub_81134B8: @ 81134B8
push {lr}
lsls r0, 24
lsrs r3, r0, 24
lsls r0, r3, 2
adds r0, r3
lsls r0, 3
ldr r1, =gTasks
adds r2, r0, r1
movs r1, 0x8
ldrsh r0, [r2, r1]
cmp r0, 0x4
bhi _0811356E
lsls r0, 2
ldr r1, =_081134E4
adds r0, r1
ldr r0, [r0]
mov pc, r0
.pool
.align 2, 0
_081134E4:
.4byte _081134F8
.4byte _0811351A
.4byte _0811352A
.4byte _08113556
.4byte _08113568
_081134F8:
ldrh r0, [r2, 0x16]
adds r0, 0x1
strh r0, [r2, 0x16]
lsls r0, 16
asrs r0, 16
cmp r0, 0x1
ble _0811354E
movs r0, 0
strh r0, [r2, 0x16]
ldrh r0, [r2, 0x14]
adds r0, 0x1
strh r0, [r2, 0x14]
lsls r0, 16
asrs r0, 16
cmp r0, 0x3
bne _0811354E
b _08113548
_0811351A:
ldrh r0, [r2, 0xA]
adds r0, 0x1
strh r0, [r2, 0xA]
lsls r0, 16
asrs r0, 16
cmp r0, 0x3C
ble _0811354E
b _08113548
_0811352A:
ldrh r0, [r2, 0x16]
adds r0, 0x1
strh r0, [r2, 0x16]
lsls r0, 16
asrs r0, 16
cmp r0, 0x1
ble _0811354E
movs r0, 0
strh r0, [r2, 0x16]
ldrh r0, [r2, 0x14]
subs r0, 0x1
strh r0, [r2, 0x14]
lsls r0, 16
cmp r0, 0
bne _0811354E
_08113548:
ldrh r0, [r2, 0x8]
adds r0, 0x1
strh r0, [r2, 0x8]
_0811354E:
adds r0, r2, 0
bl sub_8113574
b _0811356E
_08113556:
ldr r1, =gScanlineEffect
movs r0, 0x3
strb r0, [r1, 0x15]
ldrh r0, [r2, 0x8]
adds r0, 0x1
strh r0, [r2, 0x8]
b _0811356E
.pool
_08113568:
adds r0, r3, 0
bl DestroyAnimVisualTask
_0811356E:
pop {r0}
bx r0
thumb_func_end sub_81134B8
thumb_func_start sub_8113574
sub_8113574: @ 8113574
push {r4-r7,lr}
mov r7, r8
push {r7}
adds r5, r0, 0
ldrh r3, [r5, 0x12]
ldrh r4, [r5, 0xE]
movs r1, 0x10
ldrsh r0, [r5, r1]
cmp r4, r0
bgt _081135CA
ldr r7, =gScanlineEffectRegBuffers
mov r12, r7
ldr r0, =gSineTable
mov r8, r0
ldr r6, =gScanlineEffect
_08113592:
lsls r2, r4, 1
ldrb r1, [r6, 0x14]
lsls r0, r1, 4
subs r0, r1
lsls r0, 7
adds r2, r0
add r2, r12
lsls r0, r3, 1
add r0, r8
movs r7, 0
ldrsh r1, [r0, r7]
movs r7, 0x14
ldrsh r0, [r5, r7]
muls r0, r1
asrs r0, 7
ldrh r1, [r5, 0xC]
adds r0, r1
strh r0, [r2]
adds r3, 0x8
movs r0, 0xFF
ands r3, r0
adds r0, r4, 0x1
lsls r0, 16
lsrs r4, r0, 16
movs r7, 0x10
ldrsh r0, [r5, r7]
cmp r4, r0
ble _08113592
_081135CA:
ldrh r0, [r5, 0x12]
adds r0, 0x9
movs r1, 0xFF
ands r0, r1
strh r0, [r5, 0x12]
pop {r3}
mov r8, r3
pop {r4-r7}
pop {r0}
bx r0
.pool
thumb_func_end sub_8113574
thumb_func_start sub_81135EC
sub_81135EC: @ 81135EC
push {r4-r6,lr}
mov r6, r8
push {r6}
adds r4, r0, 0
ldr r5, =gBattleAnimArgs
movs r0, 0x4
ldrsh r1, [r5, r0]
lsls r0, r1, 1
adds r0, r1
movs r1, 0x5
bl __divsi3
adds r6, r0, 0
ldr r1, =gBattleAnimAttacker
mov r8, r1
ldrb r0, [r1]
movs r1, 0x2
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x20]
mov r2, r8
ldrb r0, [r2]
movs r1, 0x3
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
ldrh r3, [r5, 0x8]
adds r0, r3
strh r0, [r4, 0x22]
movs r1, 0x2
ldrsh r0, [r5, r1]
movs r2, 0x4
ldrsh r1, [r5, r2]
bl Cos
strh r0, [r4, 0x30]
movs r3, 0x2
ldrsh r0, [r5, r3]
lsls r6, 16
asrs r6, 16
adds r1, r6, 0
bl Sin
strh r0, [r4, 0x32]
ldrh r1, [r4, 0x30]
ldrh r2, [r5]
adds r3, r2, 0
muls r3, r1
adds r1, r3, 0
ldrh r3, [r4, 0x20]
adds r1, r3
strh r1, [r4, 0x20]
adds r1, r2, 0
muls r1, r0
adds r0, r1, 0
ldrh r2, [r4, 0x22]
adds r0, r2
strh r0, [r4, 0x22]
ldrh r0, [r5, 0x6]
strh r0, [r4, 0x34]
ldr r0, =sub_811369C
str r0, [r4, 0x1C]
adds r4, 0x2E
ldr r2, =gUnknown_0203A100
movs r1, 0x6
_08113674:
ldrh r0, [r4]
strh r0, [r2]
adds r4, 0x2
adds r2, 0x2
subs r1, 0x1
cmp r1, 0
bge _08113674
pop {r3}
mov r8, r3
pop {r4-r6}
pop {r0}
bx r0
.pool
thumb_func_end sub_81135EC
thumb_func_start sub_811369C
sub_811369C: @ 811369C
push {r4,lr}
adds r4, r0, 0
ldrh r0, [r4, 0x30]
ldrh r1, [r4, 0x36]
adds r0, r1
strh r0, [r4, 0x36]
ldrh r0, [r4, 0x32]
ldrh r2, [r4, 0x38]
adds r0, r2
strh r0, [r4, 0x38]
movs r1, 0x36
ldrsh r0, [r4, r1]
movs r1, 0xA
bl __divsi3
strh r0, [r4, 0x24]
movs r2, 0x38
ldrsh r0, [r4, r2]
movs r1, 0xA
bl __divsi3
strh r0, [r4, 0x26]
ldrh r0, [r4, 0x2E]
adds r0, 0x1
strh r0, [r4, 0x2E]
lsls r0, 16
asrs r0, 16
movs r2, 0x34
ldrsh r1, [r4, r2]
cmp r0, r1
ble _081136E0
adds r0, r4, 0
bl DestroyAnimSprite
_081136E0:
pop {r4}
pop {r0}
bx r0
thumb_func_end sub_811369C
.align 2, 0
asm/electric.s
+2 -2
View File
@@ -345,7 +345,7 @@ sub_810A46C: @ 810A46C
push {r4-r6,lr}
adds r4, r0, 0
movs r1, 0x1
bl sub_80A69CC
bl InitAnimSpritePos
ldr r5, =gBattleAnimArgs
ldrh r0, [r5, 0x6]
strh r0, [r4, 0x2E]
@@ -744,7 +744,7 @@ _0810A7B6:
ldr r0, =gBattleAnimArgs
ldrh r0, [r0, 0x4]
strh r0, [r4, 0x2E]
ldr r0, =sub_80A64B0
ldr r0, =WaitAnimForDuration
str r0, [r4, 0x1C]
ldr r1, =DestroyAnimSprite
adds r0, r4, 0
asm/fight.s
-1649
View File
File diff suppressed because it is too large Load Diff
asm/fire.s
+5 -5
View File
@@ -347,7 +347,7 @@ sub_810916C: @ 810916C
strh r1, [r0, 0x32]
movs r1, 0x50
strh r1, [r0, 0x36]
ldr r1, =sub_80A6EEC
ldr r1, =StartAnimLinearTranslation
str r1, [r0, 0x1C]
ldr r1, =DestroyAnimSprite
bl StoreSpriteCallbackInData6
@@ -421,7 +421,7 @@ sub_810921C: @ 810921C
push {r4,lr}
adds r4, r0, 0
movs r1, 0x1
bl sub_80A69CC
bl InitAnimSpritePos
ldr r0, =gBattleAnimArgs
ldrh r0, [r0, 0x4]
movs r1, 0
@@ -613,7 +613,7 @@ sub_81093A4: @ 81093A4
push {r4,lr}
adds r4, r0, 0
movs r1, 0x1
bl sub_80A69CC
bl InitAnimSpritePos
ldr r1, =gBattleAnimArgs
ldrh r0, [r1, 0x4]
strh r0, [r4, 0x30]
@@ -625,7 +625,7 @@ sub_81093A4: @ 81093A4
movs r1, 0x4
orrs r0, r1
strb r0, [r2]
ldr r0, =sub_80A64B0
ldr r0, =WaitAnimForDuration
str r0, [r4, 0x1C]
ldr r1, =sub_81093E4
adds r0, r4, 0
@@ -1564,7 +1564,7 @@ _08109B12:
_08109B18:
adds r0, r5, 0
movs r1, 0
bl sub_80A69CC
bl InitAnimSpritePos
ldr r4, =gBattleAnimArgs
ldrb r1, [r4, 0x4]
adds r0, r5, 0
asm/flying.s
+6 -42
View File
@@ -5,42 +5,6 @@
.text
thumb_func_start sub_810DE2C
sub_810DE2C: @ 810DE2C
push {r4,lr}
adds r4, r0, 0
ldrh r0, [r4, 0x2E]
adds r0, 0xB
movs r1, 0xFF
ands r0, r1
strh r0, [r4, 0x2E]
movs r1, 0x2E
ldrsh r0, [r4, r1]
movs r1, 0x4
bl Sin
strh r0, [r4, 0x24]
ldrh r0, [r4, 0x30]
adds r0, 0x30
strh r0, [r4, 0x30]
lsls r0, 16
asrs r0, 24
negs r0, r0
strh r0, [r4, 0x26]
adds r0, r4, 0
adds r0, 0x3F
ldrb r1, [r0]
movs r0, 0x20
ands r0, r1
cmp r0, 0
beq _0810DE68
adds r0, r4, 0
bl DestroyAnimSprite
_0810DE68:
pop {r4}
pop {r0}
bx r0
thumb_func_end sub_810DE2C
thumb_func_start sub_810DE70
sub_810DE70: @ 810DE70
push {r4,lr}
@@ -199,7 +163,7 @@ sub_810DFA8: @ 810DFA8
push {r4-r6,lr}
adds r6, r0, 0
movs r1, 0x1
bl sub_80A69CC
bl InitAnimSpritePos
ldr r0, =gBattleAnimAttacker
ldrb r0, [r0]
bl GetBattlerSide
@@ -359,7 +323,7 @@ _0810E0FE:
ldrh r3, [r5, 0x36]
adds r0, r3
strh r0, [r5, 0x36]
ldr r0, =sub_80A6EEC
ldr r0, =StartAnimLinearTranslation
str r0, [r5, 0x1C]
ldr r1, =DestroyAnimSprite
adds r0, r5, 0
@@ -378,7 +342,7 @@ sub_810E13C: @ 810E13C
push {r4,lr}
adds r4, r0, 0
movs r1, 0x1
bl sub_80A69CC
bl InitAnimSpritePos
ldr r1, =gBattleAnimArgs
ldrh r0, [r1, 0x4]
strh r0, [r4, 0x2E]
@@ -1613,7 +1577,7 @@ sub_810EAA0: @ 810EAA0
bne _0810EABC
adds r0, r5, 0
movs r1, 0
bl sub_80A69CC
bl InitAnimSpritePos
b _0810EAC4
.pool
_0810EABC:
@@ -1807,7 +1771,7 @@ sub_810EC34: @ 810EC34
_0810EC46:
adds r0, r4, 0
movs r1, 0x1
bl sub_80A69CC
bl InitAnimSpritePos
movs r0, 0
bl GetAnimBattlerSpriteId
ldr r2, =gSprites
@@ -1927,7 +1891,7 @@ sub_810ED28: @ 810ED28
push {r4,lr}
adds r4, r0, 0
movs r1, 0x1
bl sub_80A69CC
bl InitAnimSpritePos
ldr r1, =gBattleAnimArgs
ldrh r0, [r1, 0x4]
strh r0, [r4, 0x2E]
asm/ghost.s
+3 -3
View File
@@ -10,7 +10,7 @@ sub_811160C: @ 811160C
push {r4,r5,lr}
adds r4, r0, 0
movs r1, 0x1
bl sub_80A69CC
bl InitAnimSpritePos
ldr r0, =gBattleAnimArgs
ldrh r0, [r0, 0x4]
strh r0, [r4, 0x2E]
@@ -2441,7 +2441,7 @@ sub_81129F0: @ 81129F0
push {r4,lr}
adds r4, r0, 0
movs r1, 0x1
bl sub_80A69CC
bl InitAnimSpritePos
ldr r0, =gBattleAnimAttacker
ldrb r0, [r0]
bl GetBattlerSide
@@ -2525,7 +2525,7 @@ _08112A5E:
bne _08112AC0
movs r0, 0x1E
strh r0, [r3, 0x2E]
ldr r0, =sub_80A64B0
ldr r0, =WaitAnimForDuration
str r0, [r3, 0x1C]
ldr r1, =sub_8112ACC
adds r0, r3, 0
asm/ground.s
-1675
View File
File diff suppressed because it is too large Load Diff
asm/ice.s
+7 -7
View File
@@ -370,7 +370,7 @@ sub_810B8EC: @ 810B8EC
push {r4,lr}
adds r4, r0, 0
movs r1, 0x1
bl sub_80A69CC
bl InitAnimSpritePos
ldr r0, =gBattleAnimTarget
ldrb r0, [r0]
movs r1, 0x2
@@ -413,7 +413,7 @@ _0810B936:
ldr r1, =DestroyAnimSprite
adds r0, r4, 0
bl StoreSpriteCallbackInData6
ldr r0, =sub_80A6EEC
ldr r0, =StartAnimLinearTranslation
str r0, [r4, 0x1C]
pop {r4}
pop {r0}
@@ -513,7 +513,7 @@ sub_810BA24: @ 810BA24
sub sp, 0x10
adds r5, r0, 0
movs r1, 0x1
bl sub_80A69CC
bl InitAnimSpritePos
ldr r6, =gBattleAnimArgs
ldrh r0, [r6, 0x8]
strh r0, [r5, 0x2E]
@@ -814,7 +814,7 @@ sub_810BC94: @ 810BC94
sub sp, 0x10
adds r5, r0, 0
movs r1, 0x1
bl sub_80A69CC
bl InitAnimSpritePos
ldr r1, =gBattleAnimArgs
ldrh r0, [r1, 0x8]
strh r0, [r5, 0x2E]
@@ -1103,7 +1103,7 @@ sub_810BED0: @ 810BED0
bne _0810BEF4
adds r0, r5, 0
movs r1, 0
bl sub_80A69CC
bl InitAnimSpritePos
b _0810BF32
.pool
_0810BEF4:
@@ -2762,7 +2762,7 @@ _0810CCA6:
bl StartSpriteAffineAnim
adds r0, r5, 0
movs r1, 0x1
bl sub_80A69CC
bl InitAnimSpritePos
ldr r6, =gBattleAnimArgs
ldrh r0, [r6, 0x8]
strh r0, [r5, 0x2E]
@@ -2796,7 +2796,7 @@ _0810CCCE:
ldrh r0, [r6, 0xA]
strh r0, [r5, 0x38]
adds r0, r5, 0
bl sub_80A68D4
bl InitAnimArcTranslation
ldr r0, =sub_810CD1C
str r0, [r5, 0x1C]
pop {r4-r6}
asm/normal.s
+6 -6
View File
@@ -1584,7 +1584,7 @@ sub_8116388: @ 8116388
bne _081163AC
adds r0, r5, 0
movs r1, 0x1
bl sub_80A69CC
bl InitAnimSpritePos
b _081163B4
.pool
_081163AC:
@@ -1616,7 +1616,7 @@ sub_81163D0: @ 81163D0
bne _081163F4
adds r0, r5, 0
movs r1, 0x1
bl sub_80A69CC
bl InitAnimSpritePos
b _081163FC
.pool
_081163F4:
@@ -1690,7 +1690,7 @@ _08116474:
bne _08116494
adds r0, r4, 0
movs r1, 0
bl sub_80A69CC
bl InitAnimSpritePos
b _0811649C
.pool
_08116494:
@@ -1789,7 +1789,7 @@ sub_8116560: @ 8116560
bne _0811657C
adds r0, r4, 0
movs r1, 0x1
bl sub_80A69CC
bl InitAnimSpritePos
b _08116584
.pool
_0811657C:
@@ -1803,7 +1803,7 @@ _08116584:
ldr r1, =DestroyAnimSprite
adds r0, r4, 0
bl StoreSpriteCallbackInData6
ldr r0, =sub_80A64B0
ldr r0, =WaitAnimForDuration
str r0, [r4, 0x1C]
pop {r4}
pop {r0}
@@ -1824,7 +1824,7 @@ sub_81165A8: @ 81165A8
bne _081165CC
adds r0, r5, 0
movs r1, 0x1
bl sub_80A69CC
bl InitAnimSpritePos
b _081165D4
.pool
_081165CC:
asm/party_menu.s
+9 -9
View File
@@ -1219,7 +1219,7 @@ sub_81B0A9C: @ 81B0A9C
muls r0, r5
ldr r1, =gPlayerParty
adds r0, r1
ldr r6, =gUnknown_0203CEF8
ldr r6, =gSelectedOrderFromParty
bl sub_81B85AC
lsls r0, 24
cmp r0, 0
@@ -9304,7 +9304,7 @@ sub_81B4E8C: @ 81B4E8C
adds r0, r1
mov r8, r0
_081B4EC6:
ldr r0, =gUnknown_0203CEF8
ldr r0, =gSelectedOrderFromParty
adds r4, r5, r0
ldrb r0, [r4]
cmp r0, 0
@@ -9418,7 +9418,7 @@ sub_81B4FA8: @ 81B4FA8
movs r4, 0
cmp r4, r5
bcs _081B502A
ldr r6, =gUnknown_0203CEF8
ldr r6, =gSelectedOrderFromParty
subs r2, r5, 0x1
adds r7, r6, 0
ldr r3, =gUnknown_0203CEC8
@@ -9476,7 +9476,7 @@ _081B502A:
cmp r4, r5
bge _081B5078
_081B504E:
ldr r0, =gUnknown_0203CEF8
ldr r0, =gSelectedOrderFromParty
adds r1, r4, r0
ldrb r0, [r1]
cmp r0, 0
@@ -15518,7 +15518,7 @@ sub_81B8518: @ 81B8518
thumb_func_start sub_81B8558
sub_81B8558: @ 81B8558
push {lr}
ldr r0, =gUnknown_0203CEF8
ldr r0, =gSelectedOrderFromParty
movs r1, 0
movs r2, 0x4
bl memset
@@ -15655,7 +15655,7 @@ sub_81B865C: @ 81B865C
lsls r0, 24
lsrs r2, r0, 24
adds r1, r2, 0
ldr r3, =gUnknown_0203CEF8
ldr r3, =gSelectedOrderFromParty
adds r0, r2, r3
subs r0, 0x1
ldrb r0, [r0]
@@ -15700,7 +15700,7 @@ _081B86C0:
movs r5, 0
b _081B8750
_081B86CE:
ldr r3, =gUnknown_0203CEF8
ldr r3, =gSelectedOrderFromParty
adds r4, r3, r5
ldrb r0, [r4]
movs r1, 0x64
@@ -15731,7 +15731,7 @@ _081B86CE:
bcs _081B8748
movs r7, 0x64
_081B870E:
ldr r0, =gUnknown_0203CEF8
ldr r0, =gSelectedOrderFromParty
adds r5, r0, r4
ldrb r0, [r5]
muls r0, r7
@@ -15787,7 +15787,7 @@ sub_81B8770: @ 81B8770
lsls r0, 24
lsrs r2, r0, 24
movs r1, 0
ldr r3, =gUnknown_0203CEF8
ldr r3, =gSelectedOrderFromParty
_081B877A:
adds r0, r1, r3
ldrb r0, [r0]
asm/poison.s
-306
View File
@@ -1,306 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start sub_810DBAC
sub_810DBAC: @ 810DBAC
push {r4,r5,lr}
adds r5, r0, 0
ldr r4, =gBattleAnimArgs
movs r1, 0x6
ldrsh r0, [r4, r1]
cmp r0, 0
bne _0810DBC2
adds r0, r5, 0
movs r1, 0x2
bl StartSpriteAnim
_0810DBC2:
adds r0, r5, 0
movs r1, 0x1
bl sub_80A69CC
ldrh r0, [r4, 0x4]
strh r0, [r5, 0x2E]
ldr r4, =gBattleAnimTarget
ldrb r0, [r4]
movs r1, 0x2
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x32]
ldrb r0, [r4]
movs r1, 0x3
bl GetBattlerSpriteCoord
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x36]
ldr r0, =0x0000ffe2
strh r0, [r5, 0x38]
adds r0, r5, 0
bl sub_80A68D4
ldr r0, =sub_810DC10
str r0, [r5, 0x1C]
pop {r4,r5}
pop {r0}
bx r0
.pool
thumb_func_end sub_810DBAC
thumb_func_start sub_810DC10
sub_810DC10: @ 810DC10
push {r4,lr}
adds r4, r0, 0
bl TranslateAnimArc
lsls r0, 24
cmp r0, 0
beq _0810DC24
adds r0, r4, 0
bl DestroyAnimSprite
_0810DC24:
pop {r4}
pop {r0}
bx r0
thumb_func_end sub_810DC10
thumb_func_start sub_810DC2C
sub_810DC2C: @ 810DC2C
push {r4-r6,lr}
sub sp, 0x4
adds r4, r0, 0
ldr r5, =gBattleAnimArgs
movs r1, 0x6
ldrsh r0, [r5, r1]
cmp r0, 0
bne _0810DC44
adds r0, r4, 0
movs r1, 0x2
bl StartSpriteAnim
_0810DC44:
adds r0, r4, 0
movs r1, 0x1
bl sub_80A69CC
ldr r0, =gBattleAnimTarget
ldrb r0, [r0]
mov r6, sp
adds r6, 0x2
movs r1, 0x1
mov r2, sp
adds r3, r6, 0
bl SetAverageBattlerPositions
ldr r0, =gBattleAnimAttacker
ldrb r0, [r0]
bl GetBattlerSide
lsls r0, 24
cmp r0, 0
beq _0810DC72
ldrh r0, [r5, 0x8]
negs r0, r0
strh r0, [r5, 0x8]
_0810DC72:
ldrh r0, [r5, 0x4]
strh r0, [r4, 0x2E]
mov r1, sp
ldrh r0, [r5, 0x8]
ldrh r1, [r1]
adds r0, r1
strh r0, [r4, 0x32]
ldrh r0, [r5, 0xA]
ldrh r6, [r6]
adds r0, r6
strh r0, [r4, 0x36]
ldr r0, =0x0000ffe2
strh r0, [r4, 0x38]
adds r0, r4, 0
bl sub_80A68D4
ldr r0, =sub_810DCB4
str r0, [r4, 0x1C]
add sp, 0x4
pop {r4-r6}
pop {r0}
bx r0
.pool
thumb_func_end sub_810DC2C
thumb_func_start sub_810DCB4
sub_810DCB4: @ 810DCB4
push {r4,lr}
adds r4, r0, 0
bl TranslateAnimArc
lsls r0, 24
cmp r0, 0
beq _0810DCC8
adds r0, r4, 0
bl DestroyAnimSprite
_0810DCC8:
pop {r4}
pop {r0}
bx r0
thumb_func_end sub_810DCB4
thumb_func_start sub_810DCD0
sub_810DCD0: @ 810DCD0
push {r4,r5,lr}
adds r4, r0, 0
ldr r5, =gBattleAnimArgs
ldrh r0, [r5, 0x4]
strh r0, [r4, 0x2E]
ldrh r0, [r4, 0x20]
strh r0, [r4, 0x30]
ldrh r1, [r5]
adds r0, r1
strh r0, [r4, 0x32]
ldrh r0, [r4, 0x22]
strh r0, [r4, 0x34]
ldrh r1, [r5, 0x2]
adds r0, r1
strh r0, [r4, 0x36]
adds r0, r4, 0
bl sub_80A6E14
movs r1, 0x30
ldrsh r0, [r4, r1]
movs r2, 0x4
ldrsh r1, [r5, r2]
bl __divsi3
strh r0, [r4, 0x38]
movs r1, 0x32
ldrsh r0, [r4, r1]
movs r2, 0x4
ldrsh r1, [r5, r2]
bl __divsi3
strh r0, [r4, 0x3A]
ldr r0, =sub_810DD24
str r0, [r4, 0x1C]
pop {r4,r5}
pop {r0}
bx r0
.pool
thumb_func_end sub_810DCD0
thumb_func_start sub_810DD24
sub_810DD24: @ 810DD24
push {r4,lr}
adds r4, r0, 0
bl sub_80A656C
ldrh r0, [r4, 0x30]
ldrh r1, [r4, 0x38]
subs r0, r1
strh r0, [r4, 0x30]
ldrh r0, [r4, 0x32]
ldrh r1, [r4, 0x3A]
subs r0, r1
strh r0, [r4, 0x32]
movs r1, 0x2E
ldrsh r0, [r4, r1]
cmp r0, 0
bne _0810DD4A
adds r0, r4, 0
bl DestroyAnimSprite
_0810DD4A:
pop {r4}
pop {r0}
bx r0
thumb_func_end sub_810DD24
thumb_func_start sub_810DD50
sub_810DD50: @ 810DD50
push {r4,lr}
adds r4, r0, 0
ldr r0, =gBattleAnimTarget
ldrb r0, [r0]
adds r2, r4, 0
adds r2, 0x20
adds r3, r4, 0
adds r3, 0x22
movs r1, 0x1
bl SetAverageBattlerPositions
ldr r0, =gBattleAnimAttacker
ldrb r0, [r0]
bl GetBattlerSide
lsls r0, 24
cmp r0, 0
beq _0810DD7C
ldr r1, =gBattleAnimArgs
ldrh r0, [r1]
negs r0, r0
strh r0, [r1]
_0810DD7C:
ldr r0, =gBattleAnimArgs
ldrh r2, [r0]
ldrh r1, [r4, 0x20]
adds r2, r1
strh r2, [r4, 0x20]
ldrh r1, [r0, 0x2]
ldrh r3, [r4, 0x22]
adds r1, r3
strh r1, [r4, 0x22]
ldrh r3, [r0, 0x8]
strh r3, [r4, 0x2E]
ldrh r0, [r0, 0x4]
adds r2, r0
strh r2, [r4, 0x32]
adds r1, r3
strh r1, [r4, 0x36]
ldr r0, =sub_80A6EEC
str r0, [r4, 0x1C]
ldr r1, =DestroyAnimSprite
adds r0, r4, 0
bl StoreSpriteCallbackInData6
pop {r4}
pop {r0}
bx r0
.pool
thumb_func_end sub_810DD50
thumb_func_start sub_810DDC4
sub_810DDC4: @ 810DDC4
push {r4,r5,lr}
adds r4, r0, 0
ldr r5, =gBattleAnimArgs
movs r1, 0x4
ldrsh r0, [r5, r1]
cmp r0, 0
bne _0810DDE0
adds r0, r4, 0
movs r1, 0x1
bl sub_80A6980
b _0810DE16
.pool
_0810DDE0:
ldr r0, =gBattleAnimTarget
ldrb r0, [r0]
adds r2, r4, 0
adds r2, 0x20
adds r3, r4, 0
adds r3, 0x22
movs r1, 0x1
bl SetAverageBattlerPositions
ldr r0, =gBattleAnimAttacker
ldrb r0, [r0]
bl GetBattlerSide
lsls r0, 24
cmp r0, 0
beq _0810DE06
ldrh r0, [r5]
negs r0, r0
strh r0, [r5]
_0810DE06:
ldrh r0, [r5]
ldrh r1, [r4, 0x20]
adds r0, r1
strh r0, [r4, 0x20]
ldrh r0, [r5, 0x2]
ldrh r1, [r4, 0x22]
adds r0, r1
strh r0, [r4, 0x22]
_0810DE16:
ldr r0, =sub_810DE2C
str r0, [r4, 0x1C]
pop {r4,r5}
pop {r0}
bx r0
.pool
thumb_func_end sub_810DDC4
.align 2, 0
asm/psychic.s
+2 -2
View File
@@ -514,7 +514,7 @@ _0810F5EE:
bne _0810F608
adds r0, r4, 0
adds r1, r6, 0
bl sub_80A69CC
bl InitAnimSpritePos
b _0810F610
.pool
_0810F608:
@@ -1449,7 +1449,7 @@ _0810FD60:
ldrh r0, [r5, 0x1C]
strh r0, [r4, 0x38]
adds r0, r4, 0
bl sub_80A68D4
bl InitAnimArcTranslation
ldrb r0, [r5, 0xC]
movs r1, 0x3
ands r1, r0
asm/rock.s
-1469
View File
File diff suppressed because it is too large Load Diff
asm/rom_8011DC0.s
+2 -2
View File
@@ -10149,7 +10149,7 @@ sub_801AAD4: @ 801AAD4
ldr r6, =gPlayerParty
ldr r5, =gEnemyParty
_0801AAE4:
ldr r0, =gUnknown_0203CEF8
ldr r0, =gSelectedOrderFromParty
adds r0, r4, r0
ldrb r0, [r0]
subs r0, 0x1
@@ -10504,7 +10504,7 @@ _0801AE54:
movs r1, 0
movs r2, 0x20
bl memset
ldr r0, =gUnknown_0203CEF8
ldr r0, =gSelectedOrderFromParty
ldrb r1, [r0]
ldrb r0, [r0, 0x1]
cmn r1, r0
asm/script_pokemon_util_80F87D8.s
-1667
View File
File diff suppressed because it is too large Load Diff
asm/water.s
+10 -10
View File
@@ -329,7 +329,7 @@ sub_8107430: @ 8107430
push {lr}
movs r1, 0xA
strh r1, [r0, 0x2E]
ldr r1, =sub_80A64B0
ldr r1, =WaitAnimForDuration
str r1, [r0, 0x1C]
ldr r1, =move_anim_8074EE0
bl StoreSpriteCallbackInData6
@@ -343,7 +343,7 @@ sub_810744C: @ 810744C
push {r4-r7,lr}
adds r5, r0, 0
movs r1, 0x1
bl sub_80A69CC
bl InitAnimSpritePos
ldr r0, =gBattleAnimAttacker
ldrb r0, [r0]
bl GetBattlerSide
@@ -538,7 +538,7 @@ sub_81075EC: @ 81075EC
push {r4,r5,lr}
adds r5, r0, 0
movs r1, 0x1
bl sub_80A69CC
bl InitAnimSpritePos
movs r0, 0x1E
strh r0, [r5, 0x2E]
ldrh r0, [r5, 0x20]
@@ -819,7 +819,7 @@ _0810781E:
movs r7, 0x3
_08107828:
adds r0, r6, 0
bl sub_80A69CC
bl InitAnimSpritePos
ldr r0, =gBattleAnimAttacker
ldrb r0, [r0]
bl GetBattlerSide
@@ -849,7 +849,7 @@ _08107842:
ldrh r5, [r5, 0x6]
adds r0, r5
strh r0, [r6, 0x36]
ldr r0, =sub_80A6EEC
ldr r0, =StartAnimLinearTranslation
str r0, [r6, 0x1C]
ldr r1, =DestroyAnimSprite
adds r0, r6, 0
@@ -876,7 +876,7 @@ sub_8107894: @ 8107894
ldrh r0, [r4, 0x22]
adds r1, r0
strh r1, [r4, 0x36]
ldr r0, =sub_80A6EEC
ldr r0, =StartAnimLinearTranslation
str r0, [r4, 0x1C]
ldr r1, =DestroyAnimSprite
adds r0, r4, 0
@@ -904,7 +904,7 @@ sub_81078D0: @ 81078D0
_081078EC:
adds r0, r4, 0
movs r1, 0x1
bl sub_80A69CC
bl InitAnimSpritePos
_081078F4:
ldr r0, =gBattleAnimArgs
ldrh r0, [r0, 0x4]
@@ -3137,7 +3137,7 @@ sub_8108AC0: @ 8108AC0
strh r1, [r0, 0x36]
ldrh r1, [r6, 0x1A]
strh r1, [r0, 0x38]
bl sub_80A68D4
bl InitAnimArcTranslation
adds r5, 0x1C
adds r4, r5
ldr r0, =sub_8108B2C
@@ -3191,7 +3191,7 @@ sub_8108B2C: @ 8108B2C
mvns r1, r1
strh r1, [r6, 0x38]
adds r0, r6, 0
bl sub_80A68D4
bl InitAnimArcTranslation
ldr r0, =sub_8108B94
str r0, [r6, 0x1C]
_08108B86:
@@ -3339,7 +3339,7 @@ sub_8108C94: @ 8108C94
push {r4,r5,lr}
adds r4, r0, 0
movs r1, 0x1
bl sub_80A69CC
bl InitAnimSpritePos
ldr r5, =gBattleAnimTarget
ldrb r0, [r5]
movs r1, 0x2
data/graphics/pokemon/footprint_table.inc
-415
View File
@@ -1,415 +0,0 @@
.align 2
gMonFootprintTable:: @ 856E694
.4byte gMonFootprint_Bulbasaur
.4byte gMonFootprint_Bulbasaur
.4byte gMonFootprint_Ivysaur
.4byte gMonFootprint_Venusaur
.4byte gMonFootprint_Charmander
.4byte gMonFootprint_Charmeleon
.4byte gMonFootprint_Charizard
.4byte gMonFootprint_Squirtle
.4byte gMonFootprint_Wartortle
.4byte gMonFootprint_Blastoise
.4byte gMonFootprint_Caterpie
.4byte gMonFootprint_Metapod
.4byte gMonFootprint_Butterfree
.4byte gMonFootprint_Weedle
.4byte gMonFootprint_Kakuna
.4byte gMonFootprint_Beedrill
.4byte gMonFootprint_Pidgey
.4byte gMonFootprint_Pidgeotto
.4byte gMonFootprint_Pidgeot
.4byte gMonFootprint_Rattata
.4byte gMonFootprint_Raticate
.4byte gMonFootprint_Spearow
.4byte gMonFootprint_Fearow
.4byte gMonFootprint_Ekans
.4byte gMonFootprint_Arbok
.4byte gMonFootprint_Pikachu
.4byte gMonFootprint_Raichu
.4byte gMonFootprint_Sandshrew
.4byte gMonFootprint_Sandslash
.4byte gMonFootprint_NidoranF
.4byte gMonFootprint_Nidorina
.4byte gMonFootprint_Nidoqueen
.4byte gMonFootprint_NidoranM
.4byte gMonFootprint_Nidorino
.4byte gMonFootprint_Nidoking
.4byte gMonFootprint_Clefairy
.4byte gMonFootprint_Clefable
.4byte gMonFootprint_Vulpix
.4byte gMonFootprint_Ninetales
.4byte gMonFootprint_Jigglypuff
.4byte gMonFootprint_Wigglytuff
.4byte gMonFootprint_Zubat
.4byte gMonFootprint_Golbat
.4byte gMonFootprint_Oddish
.4byte gMonFootprint_Gloom
.4byte gMonFootprint_Vileplume
.4byte gMonFootprint_Paras
.4byte gMonFootprint_Parasect
.4byte gMonFootprint_Venonat
.4byte gMonFootprint_Venomoth
.4byte gMonFootprint_Diglett
.4byte gMonFootprint_Dugtrio
.4byte gMonFootprint_Meowth
.4byte gMonFootprint_Persian
.4byte gMonFootprint_Psyduck
.4byte gMonFootprint_Golduck
.4byte gMonFootprint_Mankey
.4byte gMonFootprint_Primeape
.4byte gMonFootprint_Growlithe
.4byte gMonFootprint_Arcanine
.4byte gMonFootprint_Poliwag
.4byte gMonFootprint_Poliwhirl
.4byte gMonFootprint_Poliwrath
.4byte gMonFootprint_Abra
.4byte gMonFootprint_Kadabra
.4byte gMonFootprint_Alakazam
.4byte gMonFootprint_Machop
.4byte gMonFootprint_Machoke
.4byte gMonFootprint_Machamp
.4byte gMonFootprint_Bellsprout
.4byte gMonFootprint_Weepinbell
.4byte gMonFootprint_Victreebel
.4byte gMonFootprint_Tentacool
.4byte gMonFootprint_Tentacruel
.4byte gMonFootprint_Geodude
.4byte gMonFootprint_Graveler
.4byte gMonFootprint_Golem
.4byte gMonFootprint_Ponyta
.4byte gMonFootprint_Rapidash
.4byte gMonFootprint_Slowpoke
.4byte gMonFootprint_Slowbro
.4byte gMonFootprint_Magnemite
.4byte gMonFootprint_Magneton
.4byte gMonFootprint_Farfetchd
.4byte gMonFootprint_Doduo
.4byte gMonFootprint_Dodrio
.4byte gMonFootprint_Seel
.4byte gMonFootprint_Dewgong
.4byte gMonFootprint_Grimer
.4byte gMonFootprint_Muk
.4byte gMonFootprint_Shellder
.4byte gMonFootprint_Cloyster
.4byte gMonFootprint_Gastly
.4byte gMonFootprint_Haunter
.4byte gMonFootprint_Gengar
.4byte gMonFootprint_Onix
.4byte gMonFootprint_Drowzee
.4byte gMonFootprint_Hypno
.4byte gMonFootprint_Krabby
.4byte gMonFootprint_Kingler
.4byte gMonFootprint_Voltorb
.4byte gMonFootprint_Electrode
.4byte gMonFootprint_Exeggcute
.4byte gMonFootprint_Exeggutor
.4byte gMonFootprint_Cubone
.4byte gMonFootprint_Marowak
.4byte gMonFootprint_Hitmonlee
.4byte gMonFootprint_Hitmonchan
.4byte gMonFootprint_Lickitung
.4byte gMonFootprint_Koffing
.4byte gMonFootprint_Weezing
.4byte gMonFootprint_Rhyhorn
.4byte gMonFootprint_Rhydon
.4byte gMonFootprint_Chansey
.4byte gMonFootprint_Tangela
.4byte gMonFootprint_Kangaskhan
.4byte gMonFootprint_Horsea
.4byte gMonFootprint_Seadra
.4byte gMonFootprint_Goldeen
.4byte gMonFootprint_Seaking
.4byte gMonFootprint_Staryu
.4byte gMonFootprint_Starmie
.4byte gMonFootprint_Mrmime
.4byte gMonFootprint_Scyther
.4byte gMonFootprint_Jynx
.4byte gMonFootprint_Electabuzz
.4byte gMonFootprint_Magmar
.4byte gMonFootprint_Pinsir
.4byte gMonFootprint_Tauros
.4byte gMonFootprint_Magikarp
.4byte gMonFootprint_Gyarados
.4byte gMonFootprint_Lapras
.4byte gMonFootprint_Ditto
.4byte gMonFootprint_Eevee
.4byte gMonFootprint_Vaporeon
.4byte gMonFootprint_Jolteon
.4byte gMonFootprint_Flareon
.4byte gMonFootprint_Porygon
.4byte gMonFootprint_Omanyte
.4byte gMonFootprint_Omastar
.4byte gMonFootprint_Kabuto
.4byte gMonFootprint_Kabutops
.4byte gMonFootprint_Aerodactyl
.4byte gMonFootprint_Snorlax
.4byte gMonFootprint_Articuno
.4byte gMonFootprint_Zapdos
.4byte gMonFootprint_Moltres
.4byte gMonFootprint_Dratini
.4byte gMonFootprint_Dragonair
.4byte gMonFootprint_Dragonite
.4byte gMonFootprint_Mewtwo
.4byte gMonFootprint_Mew
.4byte gMonFootprint_Chikorita
.4byte gMonFootprint_Bayleef
.4byte gMonFootprint_Meganium
.4byte gMonFootprint_Cyndaquil
.4byte gMonFootprint_Quilava
.4byte gMonFootprint_Typhlosion
.4byte gMonFootprint_Totodile
.4byte gMonFootprint_Croconaw
.4byte gMonFootprint_Feraligatr
.4byte gMonFootprint_Sentret
.4byte gMonFootprint_Furret
.4byte gMonFootprint_Hoothoot
.4byte gMonFootprint_Noctowl
.4byte gMonFootprint_Ledyba
.4byte gMonFootprint_Ledian
.4byte gMonFootprint_Spinarak
.4byte gMonFootprint_Ariados
.4byte gMonFootprint_Crobat
.4byte gMonFootprint_Chinchou
.4byte gMonFootprint_Lanturn
.4byte gMonFootprint_Pichu
.4byte gMonFootprint_Cleffa
.4byte gMonFootprint_Igglybuff
.4byte gMonFootprint_Togepi
.4byte gMonFootprint_Togetic
.4byte gMonFootprint_Natu
.4byte gMonFootprint_Xatu
.4byte gMonFootprint_Mareep
.4byte gMonFootprint_Flaaffy
.4byte gMonFootprint_Ampharos
.4byte gMonFootprint_Bellossom
.4byte gMonFootprint_Marill
.4byte gMonFootprint_Azumarill
.4byte gMonFootprint_Sudowoodo
.4byte gMonFootprint_Politoed
.4byte gMonFootprint_Hoppip
.4byte gMonFootprint_Skiploom
.4byte gMonFootprint_Jumpluff
.4byte gMonFootprint_Aipom
.4byte gMonFootprint_Sunkern
.4byte gMonFootprint_Sunflora
.4byte gMonFootprint_Yanma
.4byte gMonFootprint_Wooper
.4byte gMonFootprint_Quagsire
.4byte gMonFootprint_Espeon
.4byte gMonFootprint_Umbreon
.4byte gMonFootprint_Murkrow
.4byte gMonFootprint_Slowking
.4byte gMonFootprint_Misdreavus
.4byte gMonFootprint_Unown
.4byte gMonFootprint_Wobbuffet
.4byte gMonFootprint_Girafarig
.4byte gMonFootprint_Pineco
.4byte gMonFootprint_Forretress
.4byte gMonFootprint_Dunsparce
.4byte gMonFootprint_Gligar
.4byte gMonFootprint_Steelix
.4byte gMonFootprint_Snubbull
.4byte gMonFootprint_Granbull
.4byte gMonFootprint_Qwilfish
.4byte gMonFootprint_Scizor
.4byte gMonFootprint_Shuckle
.4byte gMonFootprint_Heracross
.4byte gMonFootprint_Sneasel
.4byte gMonFootprint_Teddiursa
.4byte gMonFootprint_Ursaring
.4byte gMonFootprint_Slugma
.4byte gMonFootprint_Magcargo
.4byte gMonFootprint_Swinub
.4byte gMonFootprint_Piloswine
.4byte gMonFootprint_Corsola
.4byte gMonFootprint_Remoraid
.4byte gMonFootprint_Octillery
.4byte gMonFootprint_Delibird
.4byte gMonFootprint_Mantine
.4byte gMonFootprint_Skarmory
.4byte gMonFootprint_Houndour
.4byte gMonFootprint_Houndoom
.4byte gMonFootprint_Kingdra
.4byte gMonFootprint_Phanpy
.4byte gMonFootprint_Donphan
.4byte gMonFootprint_Porygon2
.4byte gMonFootprint_Stantler
.4byte gMonFootprint_Smeargle
.4byte gMonFootprint_Tyrogue
.4byte gMonFootprint_Hitmontop
.4byte gMonFootprint_Smoochum
.4byte gMonFootprint_Elekid
.4byte gMonFootprint_Magby
.4byte gMonFootprint_Miltank
.4byte gMonFootprint_Blissey
.4byte gMonFootprint_Raikou
.4byte gMonFootprint_Entei
.4byte gMonFootprint_Suicune
.4byte gMonFootprint_Larvitar
.4byte gMonFootprint_Pupitar
.4byte gMonFootprint_Tyranitar
.4byte gMonFootprint_Lugia
.4byte gMonFootprint_HoOh
.4byte gMonFootprint_Celebi
.4byte gMonFootprint_QuestionMark
.4byte gMonFootprint_QuestionMark
.4byte gMonFootprint_QuestionMark
.4byte gMonFootprint_QuestionMark
.4byte gMonFootprint_QuestionMark
.4byte gMonFootprint_QuestionMark
.4byte gMonFootprint_QuestionMark
.4byte gMonFootprint_QuestionMark
.4byte gMonFootprint_QuestionMark
.4byte gMonFootprint_QuestionMark
.4byte gMonFootprint_QuestionMark
.4byte gMonFootprint_QuestionMark
.4byte gMonFootprint_QuestionMark
.4byte gMonFootprint_QuestionMark
.4byte gMonFootprint_QuestionMark
.4byte gMonFootprint_QuestionMark
.4byte gMonFootprint_QuestionMark
.4byte gMonFootprint_QuestionMark
.4byte gMonFootprint_QuestionMark
.4byte gMonFootprint_QuestionMark
.4byte gMonFootprint_QuestionMark
.4byte gMonFootprint_QuestionMark
.4byte gMonFootprint_QuestionMark
.4byte gMonFootprint_QuestionMark
.4byte gMonFootprint_QuestionMark
.4byte gMonFootprint_Treecko
.4byte gMonFootprint_Grovyle
.4byte gMonFootprint_Sceptile
.4byte gMonFootprint_Torchic
.4byte gMonFootprint_Combusken
.4byte gMonFootprint_Blaziken
.4byte gMonFootprint_Mudkip
.4byte gMonFootprint_Marshtomp
.4byte gMonFootprint_Swampert
.4byte gMonFootprint_Poochyena
.4byte gMonFootprint_Mightyena
.4byte gMonFootprint_Zigzagoon
.4byte gMonFootprint_Linoone
.4byte gMonFootprint_Wurmple
.4byte gMonFootprint_Silcoon
.4byte gMonFootprint_Beautifly
.4byte gMonFootprint_Cascoon
.4byte gMonFootprint_Dustox
.4byte gMonFootprint_Lotad
.4byte gMonFootprint_Lombre
.4byte gMonFootprint_Ludicolo
.4byte gMonFootprint_Seedot
.4byte gMonFootprint_Nuzleaf
.4byte gMonFootprint_Shiftry
.4byte gMonFootprint_Nincada
.4byte gMonFootprint_Ninjask
.4byte gMonFootprint_Shedinja
.4byte gMonFootprint_Taillow
.4byte gMonFootprint_Swellow
.4byte gMonFootprint_Shroomish
.4byte gMonFootprint_Breloom
.4byte gMonFootprint_Spinda
.4byte gMonFootprint_Wingull
.4byte gMonFootprint_Pelipper
.4byte gMonFootprint_Surskit
.4byte gMonFootprint_Masquerain
.4byte gMonFootprint_Wailmer
.4byte gMonFootprint_Wailord
.4byte gMonFootprint_Skitty
.4byte gMonFootprint_Delcatty
.4byte gMonFootprint_Kecleon
.4byte gMonFootprint_Baltoy
.4byte gMonFootprint_Claydol
.4byte gMonFootprint_Nosepass
.4byte gMonFootprint_Torkoal
.4byte gMonFootprint_Sableye
.4byte gMonFootprint_Barboach
.4byte gMonFootprint_Whiscash
.4byte gMonFootprint_Luvdisc
.4byte gMonFootprint_Corphish
.4byte gMonFootprint_Crawdaunt
.4byte gMonFootprint_Feebas
.4byte gMonFootprint_Milotic
.4byte gMonFootprint_Carvanha
.4byte gMonFootprint_Sharpedo
.4byte gMonFootprint_Trapinch
.4byte gMonFootprint_Vibrava
.4byte gMonFootprint_Flygon
.4byte gMonFootprint_Makuhita
.4byte gMonFootprint_Hariyama
.4byte gMonFootprint_Electrike
.4byte gMonFootprint_Manectric
.4byte gMonFootprint_Numel
.4byte gMonFootprint_Camerupt
.4byte gMonFootprint_Spheal
.4byte gMonFootprint_Sealeo
.4byte gMonFootprint_Walrein
.4byte gMonFootprint_Cacnea
.4byte gMonFootprint_Cacturne
.4byte gMonFootprint_Snorunt
.4byte gMonFootprint_Glalie
.4byte gMonFootprint_Lunatone
.4byte gMonFootprint_Solrock
.4byte gMonFootprint_Azurill
.4byte gMonFootprint_Spoink
.4byte gMonFootprint_Grumpig
.4byte gMonFootprint_Plusle
.4byte gMonFootprint_Minun
.4byte gMonFootprint_Mawile
.4byte gMonFootprint_Meditite
.4byte gMonFootprint_Medicham
.4byte gMonFootprint_Swablu
.4byte gMonFootprint_Altaria
.4byte gMonFootprint_Wynaut
.4byte gMonFootprint_Duskull
.4byte gMonFootprint_Dusclops
.4byte gMonFootprint_Roselia
.4byte gMonFootprint_Slakoth
.4byte gMonFootprint_Vigoroth
.4byte gMonFootprint_Slaking
.4byte gMonFootprint_Gulpin
.4byte gMonFootprint_Swalot
.4byte gMonFootprint_Tropius
.4byte gMonFootprint_Whismur
.4byte gMonFootprint_Loudred
.4byte gMonFootprint_Exploud
.4byte gMonFootprint_Clamperl
.4byte gMonFootprint_Huntail
.4byte gMonFootprint_Gorebyss
.4byte gMonFootprint_Absol
.4byte gMonFootprint_Shuppet
.4byte gMonFootprint_Banette
.4byte gMonFootprint_Seviper
.4byte gMonFootprint_Zangoose
.4byte gMonFootprint_Relicanth
.4byte gMonFootprint_Aron
.4byte gMonFootprint_Lairon
.4byte gMonFootprint_Aggron
.4byte gMonFootprint_Castform
.4byte gMonFootprint_Volbeat
.4byte gMonFootprint_Illumise
.4byte gMonFootprint_Lileep
.4byte gMonFootprint_Cradily
.4byte gMonFootprint_Anorith
.4byte gMonFootprint_Armaldo
.4byte gMonFootprint_Ralts
.4byte gMonFootprint_Kirlia
.4byte gMonFootprint_Gardevoir
.4byte gMonFootprint_Bagon
.4byte gMonFootprint_Shelgon
.4byte gMonFootprint_Salamence
.4byte gMonFootprint_Beldum
.4byte gMonFootprint_Metang
.4byte gMonFootprint_Metagross
.4byte gMonFootprint_Regirock
.4byte gMonFootprint_Regice
.4byte gMonFootprint_Registeel
.4byte gMonFootprint_Kyogre
.4byte gMonFootprint_Groudon
.4byte gMonFootprint_Rayquaza
.4byte gMonFootprint_Latias
.4byte gMonFootprint_Latios
.4byte gMonFootprint_Jirachi
.4byte gMonFootprint_Deoxys
.4byte gMonFootprint_Chimecho
.4byte gMonFootprint_Bulbasaur
data/maps/LilycoveCity_ContestLobby/scripts.inc
+3 -3
View File
@@ -57,7 +57,7 @@ LilycoveCity_ContestLobby_EventScript_21A2AA:: @ 821A2AA
closemessage
special sub_80F88DC
setvar VAR_0x4099, 0
specialvar VAR_RESULT, sub_80F8C7C
specialvar VAR_RESULT, GiveMonArtistRibbon
compare VAR_RESULT, 1
call_if 1, LilycoveCity_ContestLobby_EventScript_21A314
applymovement 4, LilycoveCity_ContestLobby_Movement_21A40F
@@ -230,7 +230,7 @@ LilycoveCity_ContestLobby_EventScript_21A47A:: @ 821A47A
closemessage
special sub_80F88DC
setvar VAR_0x4099, 0
specialvar VAR_RESULT, sub_80F8C7C
specialvar VAR_RESULT, GiveMonArtistRibbon
compare VAR_RESULT, 1
call_if 1, LilycoveCity_ContestLobby_EventScript_21A4E4
applymovement 11, LilycoveCity_ContestLobby_Movement_21A53C
@@ -324,7 +324,7 @@ LilycoveCity_ContestLobby_EventScript_21A554:: @ 821A554
goto_eq LilycoveCity_ContestLobby_EventScript_21A5CF
call LilycoveCity_ContestLobby_EventScript_279CC5
call LilycoveCity_ContestLobby_EventScript_21A670
special sub_80F87D8
special SetContestTrainerGfxIds
call LilycoveCity_ContestLobby_EventScript_23BEB6
call LilycoveCity_ContestLobby_EventScript_21A585
call LilycoveCity_ContestLobby_EventScript_21A5EF
data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc
+1 -1
View File
@@ -260,7 +260,7 @@ MossdeepCity_SpaceCenter_2F_EventScript_22400C:: @ 822400C
goto MossdeepCity_SpaceCenter_2F_EventScript_223FDA
MossdeepCity_SpaceCenter_2F_EventScript_224032:: @ 8224032
special ReducePlayerPartyToThree
special ReducePlayerPartyToSelectedMons
setvar VAR_0x8004, 2
setvar VAR_0x8005, 4
special CallFrontierUtilFunc
data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc
+1 -1
View File
@@ -106,7 +106,7 @@ SootopolisCity_MysteryEventsHouse_1F_EventScript_227A58:: @ 8227A58
compare VAR_RESULT, 0
goto_eq SootopolisCity_MysteryEventsHouse_1F_EventScript_227AE2
special SavePlayerParty
special ReducePlayerPartyToThree
special ReducePlayerPartyToSelectedMons
msgbox SootopolisCity_MysteryEventsHouse_1F_Text_227D21, 4
closemessage
compare VAR_FACING, 2
data/maps/UnknownMap_25_34/scripts.inc
+2 -2
View File
@@ -18,7 +18,7 @@ LinkContestRoom1_MapScript1_23B79F: @ 823B79F
LinkContestRoom1_EventScript_23B7AF:: @ 823B7AF
call LinkContestRoom1_EventScript_27A133
special sub_80F8FA0
special ScriptGetMultiplayerId
compare VAR_RESULT, 0
call_if 1, LinkContestRoom1_EventScript_23B7EF
compare VAR_RESULT, 1
@@ -134,7 +134,7 @@ LinkContestRoom1_EventScript_23B8ED:: @ 823B8ED
LinkContestRoom1_EventScript_23B8F8:: @ 823B8F8
setvar VAR_RESULT, 32
special sub_80F8FE8
special ScriptRandom
addvar VAR_RESULT, 1
switch VAR_RESULT
case 1, LinkContestRoom1_EventScript_23BA6B
data/pokedex.s
-244
View File
@@ -1,244 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2, 0
.macro unk_dex_struct texts, a2, a3, a4
.4byte \texts
.byte \a2, \a3, \a4
.byte 0 @padding
.endm
.macro unk_dex_struct_2 text, a2, a3, a4, a5, a6, a7
.4byte \text
.byte \a2, \a3, \a4, \a5, \a6, \a7
.2byte 0 @padding
.endm
.macro unk_dex_struct_3 text, a2, a3, a4
.4byte \text
.byte \a2, \a3, \a4
.byte 0 @padding
.endm
.align 2
gUnknown_0855D30C:: @ 855D30C
.string "$"
@ 855D30D
.include "data/text/pokedex_text.inc"
@ 856B5B0
.include "data/pokedex_entries.inc"
.align 2
gUnknown_0856E610:: @ 856E610
.incbin "graphics/pokedex/black.gbapal"
.align 2
gUnknown_0856E630:: @ 856E630
.4byte 0x000030c8, 0x000000d1, 0x000010ea, 0x000020f3
.align 2
gUnknown_0856E640:: @ 856E640
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
.4byte 0x000020ea, 0x000030f7
.align 2
gUnknown_0856E670:: @ 856E670
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
sText_TenDashes2:: @ 856E688
.string "----------$"
@ 856E694
.include "data/graphics/pokemon/footprint_table.inc"
gUnknown_0856ED08:: @ 856ED08
.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
unk_dex_struct_3 gUnknown_085E87D6, 6, 0, 5
unk_dex_struct_3 gUnknown_085E87EF, 12, 0, 5
gUnknown_0856ED48:: @ 856ED48
unk_dex_struct_2 gUnknown_085E8840, 0, 2, 5, 5, 2, 12
unk_dex_struct_2 gUnknown_085E887C, 0, 4, 5, 5, 4, 12
unk_dex_struct_2 gUnknown_085E88A6, 0, 6, 5, 5, 6, 6
unk_dex_struct_2 gUnknown_085E88A6, 0, 6, 5, 11, 6, 6
unk_dex_struct_2 gUnknown_085E881F, 0, 8, 5, 5, 8, 12
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
.2byte 0xffff, 0x01ff, 0xffff, 0x0200, 0x03ff, 0x0401, 0xff02, 0x0401, 0xffff, 0x0502, 0xffff, 0x0604, 0xffff, 0xff05
.align 1
gUnknown_0856EDB8:: @ 856EDB8
.2byte 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0x05ff, 0xffff, 0x0604, 0xffff, 0xff05
.align 1
gUnknown_0856EDD4:: @ 856EDD4
.2byte 0xffff, 0x01ff, 0xffff, 0x0200, 0x03ff, 0x0401, 0xff02, 0x0401, 0xffff, 0x0602, 0xffff, 0xffff, 0xffff, 0xff04
.align 1
gUnknown_0856EDF0:: @ 856EDF0
.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
.4byte gUnknown_085E89BB
.4byte gUnknown_085E88E9
.4byte NULL
.4byte NULL
.align 2
gUnknown_0856EE24:: @ 856EE24
.4byte gUnknown_085E89D4
.4byte gUnknown_085E88F6
.4byte gUnknown_085E8A02
.4byte gUnknown_085E8905
.4byte gUnknown_085E8A37
.4byte gUnknown_085E8911
.4byte gUnknown_085E8A73
.4byte gUnknown_085E891F
.4byte gUnknown_085E8AAF
.4byte gUnknown_085E892D
.4byte gUnknown_085E8AEA
.4byte gUnknown_085E893A
.4byte 0
.4byte 0
gUnknown_0856EE5C:: @ 856EE5C
.4byte gUnknown_085E8B25
.4byte gUnknown_085E8B26
.4byte gUnknown_085E8B25
.4byte gUnknown_085E8948
.4byte gUnknown_085E8B25
.4byte gUnknown_085E894C
.4byte gUnknown_085E8B25
.4byte gUnknown_085E8950
.4byte gUnknown_085E8B25
.4byte gUnknown_085E8954
.4byte gUnknown_085E8B25
.4byte gUnknown_085E8958
.4byte gUnknown_085E8B25
.4byte gUnknown_085E895C
.4byte gUnknown_085E8B25
.4byte gUnknown_085E8960
.4byte gUnknown_085E8B25
.4byte gUnknown_085E8964
.4byte gUnknown_085E8B25
.4byte gUnknown_085E8968
.4byte 0
.4byte 0
gUnknown_0856EEB4:: @ 856EEB4
.4byte gUnknown_085E8B25
.4byte gUnknown_085E8B26
.4byte gUnknown_085E8B25
.4byte gUnknown_085E896B
.4byte gUnknown_085E8B25
.4byte gUnknown_085E896F
.4byte gUnknown_085E8B25
.4byte gUnknown_085E8974
.4byte gUnknown_085E8B25
.4byte gUnknown_085E897B
.4byte gUnknown_085E8B25
.4byte gUnknown_085E8981
.4byte gUnknown_085E8B25
.4byte gUnknown_085E8987
.4byte gUnknown_085E8B25
.4byte gUnknown_085E898D
.4byte gUnknown_085E8B25
.4byte gUnknown_085E8994
.4byte gUnknown_085E8B25
.4byte gUnknown_085E8999
.4byte gUnknown_085E8B25
.4byte gUnknown_085E899F
.4byte 0
.4byte 0
@ read from type table for each type except ???, entry is 7 byte of length
gUnknown_0856EF14:: @ 856EF14
.4byte gUnknown_085E8B25
.4byte gUnknown_085E8B35
.4byte gUnknown_085E8B25
.4byte gTypeNames + 0
.4byte gUnknown_085E8B25
.4byte gTypeNames + 7
.4byte gUnknown_085E8B25
.4byte gTypeNames + 14
.4byte gUnknown_085E8B25
.4byte gTypeNames + 21
.4byte gUnknown_085E8B25
.4byte gTypeNames + 28
.4byte gUnknown_085E8B25
.4byte gTypeNames + 35
.4byte gUnknown_085E8B25
.4byte gTypeNames + 42
.4byte gUnknown_085E8B25
.4byte gTypeNames + 49
.4byte gUnknown_085E8B25
.4byte gTypeNames + 56
.4byte gUnknown_085E8B25
.4byte gTypeNames + 70
.4byte gUnknown_085E8B25
.4byte gTypeNames + 77
.4byte gUnknown_085E8B25
.4byte gTypeNames + 84
.4byte gUnknown_085E8B25
.4byte gTypeNames + 91
.4byte gUnknown_085E8B25
.4byte gTypeNames + 98
.4byte gUnknown_085E8B25
.4byte gTypeNames + 105
.4byte gUnknown_085E8B25
.4byte gTypeNames + 112
.4byte gUnknown_085E8B25
.4byte gTypeNames + 119
.4byte 0
.4byte 0
gUnknown_0856EFAC:: @ 856EFAC
.byte 0x00, 0x01
gUnknown_0856EFAE:: @ 856EFAE
.byte 0x00, 0x01, 0x02, 0x03, 0x04, 0x05
gUnknown_0856EFB4:: @ 856EFB4
.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
unk_dex_struct gUnknown_0856EF14, 10,11, 18
unk_dex_struct gUnknown_0856EF14, 12, 13, 18
unk_dex_struct gUnknown_0856EE24, 4, 5, 6
unk_dex_struct gUnknown_0856EE0C, 2, 3, 2
.align 2
gUnknown_0856EFF8:: @ 856EFF8
.4byte 0x000000c8, 0x000010d1, 0x000020ea, 0x000030f3
.align 2
gUnknown_0856F008:: @ 856F008
window_template 0x02, 0x00, 0x00, 0x20, 0x14, 0x00, 0x0001
null_window_template
data/pokedex_entries.inc
-776
View File
@@ -1,776 +0,0 @@
.align 2
gPokedexEntries:: @ 856B5B0
.string "UNKNOWN$", 12
pokedex_entry 0, 0, gDummyPokedexText, 256, 0, 256, 0
.string "SEED$", 12
pokedex_entry 7, 69, gBulbasaurPokedexText, 356, 17, 256, 0
.string "SEED$", 12
pokedex_entry 10, 130, gIvysaurPokedexText, 335, 13, 256, 0
.string "SEED$", 12
pokedex_entry 20, 1000, gVenusaurPokedexText, 256, 0, 388, 6
.string "LIZARD$", 12
pokedex_entry 6, 85, gCharmanderPokedexText, 444, 18, 256, 0
.string "FLAME$", 12
pokedex_entry 11, 190, gCharmeleonPokedexText, 302, 9, 256, 0
.string "FLAME$", 12
pokedex_entry 17, 905, gCharizardPokedexText, 256, 1, 302, 3
.string "TINY TURTLE$", 12
pokedex_entry 5, 90, gSquirtlePokedexText, 412, 18, 256, 0
.string "TURTLE$", 12
pokedex_entry 10, 225, gWartortlePokedexText, 332, 10, 256, 0
.string "SHELLFISH$", 12
pokedex_entry 16, 855, gBlastoisePokedexText, 256, -1, 293, 2
.string "WORM$", 12
pokedex_entry 3, 29, gCaterpiePokedexText, 549, 22, 256, 0
.string "COCOON$", 12
pokedex_entry 7, 99, gMetapodPokedexText, 350, 18, 256, 0
.string "BUTTERFLY$", 12
pokedex_entry 11, 320, gButterfreePokedexText, 312, 2, 256, 0
.string "HAIRY BUG$", 12
pokedex_entry 3, 32, gWeedlePokedexText, 455, 22, 256, 0
.string "COCOON$", 12
pokedex_entry 6, 100, gKakunaPokedexText, 424, 17, 256, 0
.string "POISON BEE$", 12
pokedex_entry 10, 295, gBeedrillPokedexText, 366, 2, 256, 0
.string "TINY BIRD$", 12
pokedex_entry 3, 18, gPidgeyPokedexText, 508, -3, 256, 0
.string "BIRD$", 12
pokedex_entry 11, 300, gPidgeottoPokedexText, 331, 10, 256, 0
.string "BIRD$", 12
pokedex_entry 15, 395, gPidgeotPokedexText, 269, 0, 256, 0
.string "MOUSE$", 12
pokedex_entry 3, 35, gRattataPokedexText, 481, 21, 256, 0
.string "MOUSE$", 12
pokedex_entry 7, 185, gRaticatePokedexText, 459, 18, 256, 0
.string "TINY BIRD$", 12
pokedex_entry 3, 20, gSpearowPokedexText, 571, 22, 256, 0
.string "BEAK$", 12
pokedex_entry 12, 380, gFearowPokedexText, 278, 1, 256, 0
.string "SNAKE$", 12
pokedex_entry 20, 69, gEkansPokedexText, 298, 12, 256, 0
.string "COBRA$", 12
pokedex_entry 35, 650, gArbokPokedexText, 256, 0, 296, 2
.string "MOUSE$", 12
pokedex_entry 4, 60, gPikachuPokedexText, 479, 19, 256, 0
.string "MOUSE$", 12
pokedex_entry 8, 300, gRaichuPokedexText, 426, 13, 256, 0
.string "MOUSE$", 12
pokedex_entry 6, 120, gSandshrewPokedexText, 365, 18, 256, 0
.string "MOUSE$", 12
pokedex_entry 10, 295, gSandslashPokedexText, 341, 11, 256, 0
.string "POISON PIN$", 12
pokedex_entry 4, 70, gNidoranFPokedexText, 488, 21, 256, 0
.string "POISON PIN$", 12
pokedex_entry 8, 200, gNidorinaPokedexText, 381, 15, 256, 0
.string "DRILL$", 12
pokedex_entry 13, 600, gNidoqueenPokedexText, 293, 4, 256, 0
.string "POISON PIN$", 12
pokedex_entry 5, 90, gNidoranMPokedexText, 511, 20, 256, 0
.string "POISON PIN$", 12
pokedex_entry 9, 195, gNidorinoPokedexText, 408, 15, 256, 0
.string "DRILL$", 12
pokedex_entry 14, 620, gNidokingPokedexText, 256, 0, 256, 0
.string "FAIRY$", 12
pokedex_entry 6, 75, gClefairyPokedexText, 441, 20, 256, 0
.string "FAIRY$", 12
pokedex_entry 13, 400, gClefablePokedexText, 256, 5, 256, 0
.string "FOX$", 12
pokedex_entry 6, 99, gVulpixPokedexText, 542, 19, 256, 0
.string "FOX$", 12
pokedex_entry 11, 199, gNinetalesPokedexText, 339, 10, 256, 0
.string "BALLOON$", 12
pokedex_entry 5, 55, gJigglypuffPokedexText, 433, 2, 256, 0
.string "BALLOON$", 12
pokedex_entry 10, 120, gWigglytuffPokedexText, 328, 11, 256, 0
.string "BAT$", 12
pokedex_entry 8, 75, gZubatPokedexText, 362, -5, 256, 0
.string "BAT$", 12
pokedex_entry 16, 550, gGolbatPokedexText, 256, 1, 256, 0
.string "WEED$", 12
pokedex_entry 5, 54, gOddishPokedexText, 423, 19, 256, 0
.string "WEED$", 12
pokedex_entry 8, 86, gGloomPokedexText, 329, 13, 256, 0
.string "FLOWER$", 12
pokedex_entry 12, 186, gVileplumePokedexText, 256, 4, 256, 0
.string "MUSHROOM$", 12
pokedex_entry 3, 54, gParasPokedexText, 593, 22, 256, 0
.string "MUSHROOM$", 12
pokedex_entry 10, 295, gParasectPokedexText, 307, 8, 256, 0
.string "INSECT$", 12
pokedex_entry 10, 300, gVenonatPokedexText, 360, 0, 256, -1
.string "POISON MOTH$", 12
pokedex_entry 15, 125, gVenomothPokedexText, 285, 2, 256, 1
.string "MOLE$", 12
pokedex_entry 2, 8, gDiglettPokedexText, 833, 25, 256, 0
.string "MOLE$", 12
pokedex_entry 7, 333, gDugtrioPokedexText, 406, 18, 256, 0
.string "SCRATCH CAT$", 12
pokedex_entry 4, 42, gMeowthPokedexText, 480, 19, 256, 0
.string "CLASSY CAT$", 12
pokedex_entry 10, 320, gPersianPokedexText, 320, 10, 256, 0
.string "DUCK$", 12
pokedex_entry 8, 196, gPsyduckPokedexText, 369, 15, 256, 0
.string "DUCK$", 12
pokedex_entry 17, 766, gGolduckPokedexText, 256, 1, 273, 1
.string "PIG MONKEY$", 12
pokedex_entry 5, 280, gMankeyPokedexText, 404, 19, 256, 0
.string "PIG MONKEY$", 12
pokedex_entry 10, 320, gPrimeapePokedexText, 326, 10, 256, 0
.string "PUPPY$", 12
pokedex_entry 7, 190, gGrowlithePokedexText, 346, 14, 256, 0
.string "LEGENDARY$", 12
pokedex_entry 19, 1550, gArcaninePokedexText, 256, 1, 312, 4
.string "TADPOLE$", 12
pokedex_entry 6, 124, gPoliwagPokedexText, 369, 20, 256, 0
.string "TADPOLE$", 12
pokedex_entry 10, 200, gPoliwhirlPokedexText, 288, 11, 256, 0
.string "TADPOLE$", 12
pokedex_entry 13, 540, gPoliwrathPokedexText, 256, 6, 256, 0
.string "PSI$", 12
pokedex_entry 9, 195, gAbraPokedexText, 363, 14, 256, 0
.string "PSI$", 12
pokedex_entry 13, 565, gKadabraPokedexText, 256, 3, 256, 0
.string "PSI$", 12
pokedex_entry 15, 480, gAlakazamPokedexText, 256, 3, 256, 0
.string "SUPERPOWER$", 12
pokedex_entry 8, 195, gMachopPokedexText, 342, 14, 256, 0
.string "SUPERPOWER$", 12
pokedex_entry 15, 705, gMachokePokedexText, 323, 9, 257, 0
.string "SUPERPOWER$", 12
pokedex_entry 16, 1300, gMachampPokedexText, 280, 1, 269, -1
.string "FLOWER$", 12
pokedex_entry 7, 40, gBellsproutPokedexText, 354, 16, 256, 0
.string "FLYCATCHER$", 12
pokedex_entry 10, 64, gWeepinbellPokedexText, 256, 0, 256, 0
.string "FLYCATCHER$", 12
pokedex_entry 17, 155, gVictreebelPokedexText, 256, 1, 312, 3
.string "JELLYFISH$", 12
pokedex_entry 9, 455, gTentacoolPokedexText, 256, 0, 256, 0
.string "JELLYFISH$", 12
pokedex_entry 16, 550, gTentacruelPokedexText, 256, 0, 312, 1
.string "ROCK$", 12
pokedex_entry 4, 200, gGeodudePokedexText, 347, 18, 256, 0
.string "ROCK$", 12
pokedex_entry 10, 1050, gGravelerPokedexText, 256, 2, 256, 0
.string "MEGATON$", 12
pokedex_entry 14, 3000, gGolemPokedexText, 256, 3, 296, 2
.string "FIRE HORSE$", 12
pokedex_entry 10, 300, gPonytaPokedexText, 283, 8, 256, 0
.string "FIRE HORSE$", 12
pokedex_entry 17, 950, gRapidashPokedexText, 256, 0, 289, 1
.string "DOPEY$", 12
pokedex_entry 12, 360, gSlowpokePokedexText, 256, 10, 256, 0
.string "HERMIT CRAB$", 12
pokedex_entry 16, 785, gSlowbroPokedexText, 256, 6, 296, 2
.string "MAGNET$", 12
pokedex_entry 3, 60, gMagnemitePokedexText, 288, -9, 256, 0
.string "MAGNET$", 12
pokedex_entry 10, 600, gMagnetonPokedexText, 292, 1, 256, 0
.string "WILD DUCK$", 12
pokedex_entry 8, 150, gFarfetchdPokedexText, 330, 2, 293, 2
.string "TWIN BIRD$", 12
pokedex_entry 14, 392, gDoduoPokedexText, 256, 3, 257, -1
.string "TRIPLE BIRD$", 12
pokedex_entry 18, 852, gDodrioPokedexText, 256, 0, 268, 0
.string "SEA LION$", 12
pokedex_entry 11, 900, gSeelPokedexText, 297, 8, 256, 0
.string "SEA LION$", 12
pokedex_entry 17, 1200, gDewgongPokedexText, 256, 0, 275, 0
.string "SLUDGE$", 12
pokedex_entry 9, 300, gGrimerPokedexText, 258, 10, 256, 0
.string "SLUDGE$", 12
pokedex_entry 12, 300, gMukPokedexText, 256, 2, 256, 0
.string "BIVALVE$", 12
pokedex_entry 3, 40, gShellderPokedexText, 675, 24, 256, 0
.string "BIVALVE$", 12
pokedex_entry 15, 1325, gCloysterPokedexText, 256, 0, 269, 1
.string "GAS$", 12
pokedex_entry 13, 1, gGastlyPokedexText, 256, 0, 256, 0
.string "GAS$", 12
pokedex_entry 16, 1, gHaunterPokedexText, 256, 2, 293, 2
.string "SHADOW$", 12
pokedex_entry 15, 405, gGengarPokedexText, 256, 2, 302, 2
.string "ROCK SNAKE$", 12
pokedex_entry 88, 2100, gOnixPokedexText, 256, 1, 515, 14
.string "HYPNOSIS$", 12
pokedex_entry 10, 324, gDrowzeePokedexText, 274, 6, 256, 0
.string "HYPNOSIS$", 12
pokedex_entry 16, 756, gHypnoPokedexText, 256, 3, 257, 0
.string "RIVER CRAB$", 12
pokedex_entry 4, 65, gKrabbyPokedexText, 469, 20, 256, 0
.string "PINCER$", 12
pokedex_entry 13, 600, gKinglerPokedexText, 256, 2, 256, 0
.string "BALL$", 12
pokedex_entry 5, 104, gVoltorbPokedexText, 364, -8, 256, 0
.string "BALL$", 12
pokedex_entry 12, 666, gElectrodePokedexText, 256, 0, 256, 0
.string "EGG$", 12
pokedex_entry 4, 25, gExeggcutePokedexText, 489, -4, 256, 0
.string "COCONUT$", 12
pokedex_entry 20, 1200, gExeggutorPokedexText, 256, 0, 309, 5
.string "LONELY$", 12
pokedex_entry 4, 65, gCubonePokedexText, 545, 21, 256, 0
.string "BONE KEEPER$", 12
pokedex_entry 10, 450, gMarowakPokedexText, 293, 12, 256, 0
.string "KICKING$", 12
pokedex_entry 15, 498, gHitmonleePokedexText, 256, 3, 259, 1
.string "PUNCHING$", 12
pokedex_entry 14, 502, gHitmonchanPokedexText, 256, 2, 277, 2
.string "LICKING$", 12
pokedex_entry 12, 655, gLickitungPokedexText, 256, 4, 256, 0
.string "POISON GAS$", 12
pokedex_entry 6, 10, gKoffingPokedexText, 369, -1, 256, 0
.string "POISON GAS$", 12
pokedex_entry 12, 95, gWeezingPokedexText, 305, 3, 256, 0
.string "SPIKES$", 12
pokedex_entry 10, 1150, gRhyhornPokedexText, 267, 6, 256, 0
.string "DRILL$", 12
pokedex_entry 19, 1200, gRhydonPokedexText, 256, 1, 299, 2
.string "EGG$", 12
pokedex_entry 11, 346, gChanseyPokedexText, 257, 7, 256, 0
.string "VINE$", 12
pokedex_entry 10, 350, gTangelaPokedexText, 304, 1, 256, 0
.string "PARENT$", 12
pokedex_entry 22, 800, gKangaskhanPokedexText, 256, 0, 387, 8
.string "DRAGON$", 12
pokedex_entry 4, 80, gHorseaPokedexText, 399, -1, 256, 0
.string "DRAGON$", 12
pokedex_entry 12, 250, gSeadraPokedexText, 299, 3, 256, 0
.string "GOLDFISH$", 12
pokedex_entry 6, 150, gGoldeenPokedexText, 379, 4, 256, 0
.string "GOLDFISH$", 12
pokedex_entry 13, 390, gSeakingPokedexText, 256, 3, 256, 0
.string "STAR SHAPE$", 12
pokedex_entry 8, 345, gStaryuPokedexText, 326, 1, 256, 0
.string "MYSTERIOUS$", 12
pokedex_entry 11, 800, gStarmiePokedexText, 301, 3, 256, 0
.string "BARRIER$", 12
pokedex_entry 13, 545, gMrmimePokedexText, 258, 6, 256, 0
.string "MANTIS$", 12
pokedex_entry 15, 560, gScytherPokedexText, 256, 1, 293, 2
.string "HUMAN SHAPE$", 12
pokedex_entry 14, 406, gJynxPokedexText, 256, 3, 300, 1
.string "ELECTRIC$", 12
pokedex_entry 11, 300, gElectabuzzPokedexText, 351, 8, 256, 0
.string "SPITFIRE$", 12
pokedex_entry 13, 445, gMagmarPokedexText, 277, 5, 256, 0
.string "STAG BEETLE$", 12
pokedex_entry 15, 550, gPinsirPokedexText, 256, 2, 257, 0
.string "WILD BULL$", 12
pokedex_entry 14, 884, gTaurosPokedexText, 256, 0, 256, 0
.string "FISH$", 12
pokedex_entry 9, 100, gMagikarpPokedexText, 310, 4, 256, 0
.string "ATROCIOUS$", 12
pokedex_entry 65, 2350, gGyaradosPokedexText, 256, 6, 481, 13
.string "TRANSPORT$", 12
pokedex_entry 25, 2200, gLaprasPokedexText, 257, 10, 423, 8
.string "TRANSFORM$", 12
pokedex_entry 3, 40, gDittoPokedexText, 633, 23, 256, 0
.string "EVOLUTION$", 12
pokedex_entry 3, 65, gEeveePokedexText, 476, 18, 256, 0
.string "BUBBLE JET$", 12
pokedex_entry 10, 290, gVaporeonPokedexText, 316, 8, 256, 0
.string "LIGHTNING$", 12
pokedex_entry 8, 245, gJolteonPokedexText, 283, 8, 256, 0
.string "FLAME$", 12
pokedex_entry 9, 250, gFlareonPokedexText, 306, 12, 256, 0
.string "VIRTUAL$", 12
pokedex_entry 8, 365, gPorygonPokedexText, 328, 15, 256, 0
.string "SPIRAL$", 12
pokedex_entry 4, 75, gOmanytePokedexText, 521, 22, 256, 0
.string "SPIRAL$", 12
pokedex_entry 10, 350, gOmastarPokedexText, 307, 7, 256, 0
.string "SHELLFISH$", 12
pokedex_entry 5, 115, gKabutoPokedexText, 454, 21, 256, 0
.string "SHELLFISH$", 12
pokedex_entry 13, 405, gKabutopsPokedexText, 271, 3, 256, 0
.string "FOSSIL$", 12
pokedex_entry 18, 590, gAerodactylPokedexText, 256, 0, 302, 4
.string "SLEEPING$", 12
pokedex_entry 21, 4600, gSnorlaxPokedexText, 256, 4, 423, 11
.string "FREEZE$", 12
pokedex_entry 17, 554, gArticunoPokedexText, 256, 0, 309, 2
.string "ELECTRIC$", 12
pokedex_entry 16, 526, gZapdosPokedexText, 256, 0, 318, 3
.string "FLAME$", 12
pokedex_entry 20, 600, gMoltresPokedexText, 270, 0, 387, 8
.string "DRAGON$", 12
pokedex_entry 18, 33, gDratiniPokedexText, 256, 8, 386, 6
.string "DRAGON$", 12
pokedex_entry 40, 165, gDragonairPokedexText, 256, 0, 411, 5
.string "DRAGON$", 12
pokedex_entry 22, 2100, gDragonitePokedexText, 256, 0, 309, 4
.string "GENETIC$", 12
pokedex_entry 20, 1220, gMewtwoPokedexText, 256, 0, 309, 4
.string "NEW SPECIES$", 12
pokedex_entry 4, 40, gMewPokedexText, 457, -2, 256, 0
.string "LEAF$", 12
pokedex_entry 9, 64, gChikoritaPokedexText, 512, 20, 256, 0
.string "LEAF$", 12
pokedex_entry 12, 158, gBayleefPokedexText, 296, 4, 256, 0
.string "HERB$", 12
pokedex_entry 18, 1005, gMeganiumPokedexText, 256, 0, 277, 1
.string "FIRE MOUSE$", 12
pokedex_entry 5, 79, gCyndaquilPokedexText, 539, 21, 256, 0
.string "VOLCANO$", 12
pokedex_entry 9, 190, gQuilavaPokedexText, 329, 11, 256, 0
.string "VOLCANO$", 12
pokedex_entry 17, 795, gTyphlosionPokedexText, 256, 0, 268, 1
.string "BIG JAW$", 12
pokedex_entry 6, 95, gTotodilePokedexText, 487, 20, 256, 0
.string "BIG JAW$", 12
pokedex_entry 11, 250, gCroconawPokedexText, 378, 13, 256, 0
.string "BIG JAW$", 12
pokedex_entry 23, 888, gFeraligatrPokedexText, 256, 0, 342, 7
.string "SCOUT$", 12
pokedex_entry 8, 60, gSentretPokedexText, 439, 12, 256, 0
.string "LONG BODY$", 12
pokedex_entry 18, 325, gFurretPokedexText, 346, 11, 256, 0
.string "OWL$", 12
pokedex_entry 7, 212, gHoothootPokedexText, 380, -2, 256, 0
.string "OWL$", 12
pokedex_entry 16, 408, gNoctowlPokedexText, 278, 3, 256, 0
.string "FIVE STAR$", 12
pokedex_entry 10, 108, gLedybaPokedexText, 256, 4, 256, 0
.string "FIVE STAR$", 12
pokedex_entry 14, 356, gLedianPokedexText, 256, 2, 256, 0
.string "STRING SPIT$", 12
pokedex_entry 5, 85, gSpinarakPokedexText, 414, 21, 256, 0
.string "LONG LEG$", 12
pokedex_entry 11, 335, gAriadosPokedexText, 316, 8, 256, 0
.string "BAT$", 12
pokedex_entry 18, 750, gCrobatPokedexText, 256, 0, 281, 1
.string "ANGLER$", 12
pokedex_entry 5, 120, gChinchouPokedexText, 424, -2, 256, 0
.string "LIGHT$", 12
pokedex_entry 12, 225, gLanturnPokedexText, 269, 6, 256, 0
.string "TINY MOUSE$", 12
pokedex_entry 3, 20, gPichuPokedexText, 508, 20, 256, 0
.string "STAR SHAPE$", 12
pokedex_entry 3, 30, gCleffaPokedexText, 462, 23, 256, 0
.string "BALLOON$", 12
pokedex_entry 3, 10, gIgglybuffPokedexText, 457, -1, 256, 0
.string "SPIKE BALL$", 12
pokedex_entry 3, 15, gTogepiPokedexText, 507, 23, 256, 0
.string "HAPPINESS$", 12
pokedex_entry 6, 32, gTogeticPokedexText, 424, 17, 256, 0
.string "TINY BIRD$", 12
pokedex_entry 2, 20, gNatuPokedexText, 610, 25, 256, 0
.string "MYSTIC$", 12
pokedex_entry 15, 150, gXatuPokedexText, 256, 6, 318, 4
.string "WOOL$", 12
pokedex_entry 6, 78, gMareepPokedexText, 379, 18, 256, 0
.string "WOOL$", 12
pokedex_entry 8, 133, gFlaaffyPokedexText, 372, 15, 256, 0
.string "LIGHT$", 12
pokedex_entry 14, 615, gAmpharosPokedexText, 256, 4, 256, 0
.string "FLOWER$", 12
pokedex_entry 4, 58, gBellossomPokedexText, 472, 21, 256, 0
.string "AQUA MOUSE$", 12
pokedex_entry 4, 85, gMarillPokedexText, 476, 20, 256, 0
.string "AQUA RABBIT$", 12
pokedex_entry 8, 285, gAzumarillPokedexText, 448, 16, 256, 0
.string "IMITATION$", 12
pokedex_entry 12, 380, gSudowoodoPokedexText, 305, 8, 256, 0
.string "FROG$", 12
pokedex_entry 11, 339, gPolitoedPokedexText, 289, 6, 256, 0
.string "COTTONWEED$", 12
pokedex_entry 4, 5, gHoppipPokedexText, 562, -7, 256, 0
.string "COTTONWEED$", 12
pokedex_entry 6, 10, gSkiploomPokedexText, 387, 0, 256, 0
.string "COTTONWEED$", 12
pokedex_entry 8, 30, gJumpluffPokedexText, 418, -4, 256, 0
.string "LONG TAIL$", 12
pokedex_entry 8, 115, gAipomPokedexText, 363, 6, 256, 0
.string "SEED$", 12
pokedex_entry 3, 18, gSunkernPokedexText, 541, 0, 256, 0
.string "SUN$", 12
pokedex_entry 8, 85, gSunfloraPokedexText, 444, 15, 256, 0
.string "CLEAR WING$", 12
pokedex_entry 12, 380, gYanmaPokedexText, 274, -1, 256, 0
.string "WATER FISH$", 12
pokedex_entry 4, 85, gWooperPokedexText, 479, 21, 256, 0
.string "WATER FISH$", 12
pokedex_entry 14, 750, gQuagsirePokedexText, 256, 4, 256, 0
.string "SUN$", 12
pokedex_entry 9, 265, gEspeonPokedexText, 363, 14, 256, 0
.string "MOONLIGHT$", 12
pokedex_entry 10, 270, gUmbreonPokedexText, 317, 11, 256, 0
.string "DARKNESS$", 12
pokedex_entry 5, 21, gMurkrowPokedexText, 401, -8, 256, 1
.string "ROYAL$", 12
pokedex_entry 20, 795, gSlowkingPokedexText, 256, 0, 309, 5
.string "SCREECH$", 12
pokedex_entry 7, 10, gMisdreavusPokedexText, 407, -8, 256, 0
.string "SYMBOL$", 12
pokedex_entry 5, 50, gUnownPokedexText, 411, 2, 256, 0
.string "PATIENT$", 12
pokedex_entry 13, 285, gWobbuffetPokedexText, 274, 4, 256, 0
.string "LONG NECK$", 12
pokedex_entry 15, 415, gGirafarigPokedexText, 281, 1, 256, 0
.string "BAGWORM$", 12
pokedex_entry 6, 72, gPinecoPokedexText, 445, 2, 256, 0
.string "BAGWORM$", 12
pokedex_entry 12, 1258, gForretressPokedexText, 293, 5, 256, 0
.string "LAND SNAKE$", 12
pokedex_entry 15, 140, gDunsparcePokedexText, 316, 17, 256, 0
.string "FLYSCORPION$", 12
pokedex_entry 11, 648, gGligarPokedexText, 350, -1, 256, 0
.string "IRON SNAKE$", 12
pokedex_entry 92, 4000, gSteelixPokedexText, 256, 0, 516, 13
.string "FAIRY$", 12
pokedex_entry 6, 78, gSnubbullPokedexText, 465, 19, 256, 0
.string "FAIRY$", 12
pokedex_entry 14, 487, gGranbullPokedexText, 256, 4, 256, 0
.string "BALLOON$", 12
pokedex_entry 5, 39, gQwilfishPokedexText, 430, 0, 256, 0
.string "PINCER$", 12
pokedex_entry 18, 1180, gScizorPokedexText, 278, 1, 256, 0
.string "MOLD$", 12
pokedex_entry 6, 205, gShucklePokedexText, 485, 18, 256, 0
.string "SINGLE HORN$", 12
pokedex_entry 15, 540, gHeracrossPokedexText, 256, 0, 256, 0
.string "SHARP CLAW$", 12
pokedex_entry 9, 280, gSneaselPokedexText, 413, -3, 256, 0
.string "LITTLE BEAR$", 12
pokedex_entry 6, 88, gTeddiursaPokedexText, 455, 19, 256, 0
.string "HIBERNATOR$", 12
pokedex_entry 18, 1258, gUrsaringPokedexText, 256, 0, 256, 0
.string "LAVA$", 12
pokedex_entry 7, 350, gSlugmaPokedexText, 329, 15, 256, 0
.string "LAVA$", 12
pokedex_entry 8, 550, gMagcargoPokedexText, 332, 15, 256, 0
.string "PIG$", 12
pokedex_entry 4, 65, gSwinubPokedexText, 324, 20, 256, 0
.string "SWINE$", 12
pokedex_entry 11, 558, gPiloswinePokedexText, 306, 10, 256, 0
.string "CORAL$", 12
pokedex_entry 6, 50, gCorsolaPokedexText, 410, 15, 256, 0
.string "JET$", 12
pokedex_entry 6, 120, gRemoraidPokedexText, 316, 4, 256, 0
.string "JET$", 12
pokedex_entry 9, 285, gOctilleryPokedexText, 296, 3, 256, 0
.string "DELIVERY$", 12
pokedex_entry 9, 160, gDelibirdPokedexText, 293, 11, 256, 0
.string "KITE$", 12
pokedex_entry 21, 2200, gMantinePokedexText, 256, 0, 342, 7
.string "ARMOR BIRD$", 12
pokedex_entry 17, 505, gSkarmoryPokedexText, 256, 0, 271, 1
.string "DARK$", 12
pokedex_entry 6, 108, gHoundourPokedexText, 393, 16, 256, 0
.string "DARK$", 12
pokedex_entry 14, 350, gHoundoomPokedexText, 256, 4, 256, 0
.string "DRAGON$", 12
pokedex_entry 18, 1520, gKingdraPokedexText, 256, 0, 287, 0
.string "LONG NOSE$", 12
pokedex_entry 5, 335, gPhanpyPokedexText, 465, 21, 256, 0
.string "ARMOR$", 12
pokedex_entry 11, 1200, gDonphanPokedexText, 313, 9, 256, 0
.string "VIRTUAL$", 12
pokedex_entry 6, 325, gPorygon2PokedexText, 320, 17, 256, 0
.string "BIG HORN$", 12
pokedex_entry 14, 712, gStantlerPokedexText, 256, 0, 256, 0
.string "PAINTER$", 12
pokedex_entry 12, 580, gSmearglePokedexText, 287, 5, 256, 0
.string "SCUFFLE$", 12
pokedex_entry 7, 210, gTyroguePokedexText, 292, 9, 256, 0
.string "HANDSTAND$", 12
pokedex_entry 14, 480, gHitmontopPokedexText, 256, 2, 257, 0
.string "KISS$", 12
pokedex_entry 4, 60, gSmoochumPokedexText, 440, 20, 256, 0
.string "ELECTRIC$", 12
pokedex_entry 6, 235, gElekidPokedexText, 363, 14, 256, 0
.string "LIVE COAL$", 12
pokedex_entry 7, 214, gMagbyPokedexText, 284, 13, 256, 0
.string "MILK COW$", 12
pokedex_entry 12, 755, gMiltankPokedexText, 280, 5, 256, 0
.string "HAPPINESS$", 12
pokedex_entry 15, 468, gBlisseyPokedexText, 256, 4, 310, 3
.string "THUNDER$", 12
pokedex_entry 19, 1780, gRaikouPokedexText, 256, 0, 345, 7
.string "VOLCANO$", 12
pokedex_entry 21, 1980, gEnteiPokedexText, 259, 0, 345, 7
.string "AURORA$", 12
pokedex_entry 20, 1870, gSuicunePokedexText, 269, 0, 345, 7
.string "ROCK SKIN$", 12
pokedex_entry 6, 720, gLarvitarPokedexText, 472, 18, 256, 0
.string "HARD SHELL$", 12
pokedex_entry 12, 1520, gPupitarPokedexText, 292, 8, 256, 0
.string "ARMOR$", 12
pokedex_entry 20, 2020, gTyranitarPokedexText, 256, 0, 345, 7
.string "DIVING$", 12
pokedex_entry 52, 2160, gLugiaPokedexText, 256, 0, 721, 19
.string "RAINBOW$", 12
pokedex_entry 38, 1990, gHoOhPokedexText, 256, 0, 610, 17
.string "TIME TRAVEL$", 12
pokedex_entry 6, 50, gCelebiPokedexText, 393, -10, 256, 0
.string "WOOD GECKO$", 12
pokedex_entry 5, 50, gTreeckoPokedexText, 541, 19, 256, 0
.string "WOOD GECKO$", 12
pokedex_entry 9, 216, gGrovylePokedexText, 360, 5, 256, 0
.string "FOREST$", 12
pokedex_entry 17, 522, gSceptilePokedexText, 256, -1, 275, 2
.string "CHICK$", 12
pokedex_entry 4, 25, gTorchicPokedexText, 566, 19, 256, 0
.string "YOUNG FOWL$", 12
pokedex_entry 9, 195, gCombuskenPokedexText, 343, 5, 256, 0
.string "BLAZE$", 12
pokedex_entry 19, 520, gBlazikenPokedexText, 256, 0, 301, 4
.string "MUD FISH$", 12
pokedex_entry 4, 76, gMudkipPokedexText, 535, 20, 256, 0
.string "MUD FISH$", 12
pokedex_entry 7, 280, gMarshtompPokedexText, 340, 7, 256, 0
.string "MUD FISH$", 12
pokedex_entry 15, 819, gSwampertPokedexText, 256, 0, 256, 0
.string "BITE$", 12
pokedex_entry 5, 136, gPoochyenaPokedexText, 481, 19, 256, 0
.string "BITE$", 12
pokedex_entry 10, 370, gMightyenaPokedexText, 362, 9, 256, 0
.string "TINYRACCOON$", 12
pokedex_entry 4, 175, gZigzagoonPokedexText, 560, 22, 256, 0
.string "RUSHING$", 12
pokedex_entry 5, 325, gLinoonePokedexText, 321, 7, 256, 0
.string "WORM$", 12
pokedex_entry 3, 36, gWurmplePokedexText, 711, 24, 256, 0
.string "COCOON$", 12
pokedex_entry 6, 100, gSilcoonPokedexText, 431, 19, 256, 0
.string "BUTTERFLY$", 12
pokedex_entry 10, 284, gBeautiflyPokedexText, 298, -1, 256, 0
.string "COCOON$", 12
pokedex_entry 7, 115, gCascoonPokedexText, 391, 20, 256, 0
.string "POISON MOTH$", 12
pokedex_entry 12, 316, gDustoxPokedexText, 269, 1, 256, 0
.string "WATER WEED$", 12
pokedex_entry 5, 26, gLotadPokedexText, 406, 19, 256, 0
.string "JOLLY$", 12
pokedex_entry 12, 325, gLombrePokedexText, 277, 9, 256, 0
.string "CAREFREE$", 12
pokedex_entry 15, 550, gLudicoloPokedexText, 256, 0, 268, -1
.string "ACORN$", 12
pokedex_entry 5, 40, gSeedotPokedexText, 472, 20, 256, 0
.string "WILY$", 12
pokedex_entry 10, 280, gNuzleafPokedexText, 299, 10, 256, 0
.string "WICKED$", 12
pokedex_entry 13, 596, gShiftryPokedexText, 290, 4, 256, 0
.string "TINYSWALLOW$", 12
pokedex_entry 3, 23, gTaillowPokedexText, 465, 21, 256, 0
.string "SWALLOW$", 12
pokedex_entry 7, 198, gSwellowPokedexText, 428, 15, 256, 0
.string "SEAGULL$", 12
pokedex_entry 6, 95, gWingullPokedexText, 295, -2, 256, 0
.string "WATER BIRD$", 12
pokedex_entry 12, 280, gPelipperPokedexText, 288, 1, 256, 0
.string "FEELING$", 12
pokedex_entry 4, 66, gRaltsPokedexText, 457, -3, 256, 0
.string "EMOTION$", 12
pokedex_entry 8, 202, gKirliaPokedexText, 354, 0, 256, 0
.string "EMBRACE$", 12
pokedex_entry 16, 484, gGardevoirPokedexText, 256, 0, 256, 0
.string "POND SKATER$", 12
pokedex_entry 5, 17, gSurskitPokedexText, 375, 17, 256, 0
.string "EYEBALL$", 12
pokedex_entry 8, 36, gMasquerainPokedexText, 378, 8, 256, 0
.string "MUSHROOM$", 12
pokedex_entry 4, 45, gShroomishPokedexText, 513, 22, 256, 0
.string "MUSHROOM$", 12
pokedex_entry 12, 392, gBreloomPokedexText, 324, 6, 256, 0
.string "SLACKER$", 12
pokedex_entry 8, 240, gSlakothPokedexText, 291, 16, 256, 0
.string "WILD MONKEY$", 12
pokedex_entry 14, 465, gVigorothPokedexText, 301, 2, 256, 0
.string "LAZY$", 12
pokedex_entry 20, 1305, gSlakingPokedexText, 256, 2, 300, 1
.string "TRAINEE$", 12
pokedex_entry 5, 55, gNincadaPokedexText, 405, 21, 256, 0
.string "NINJA$", 12
pokedex_entry 8, 120, gNinjaskPokedexText, 383, -9, 256, 0
.string "SHED$", 12
pokedex_entry 8, 12, gShedinjaPokedexText, 372, -8, 256, 0
.string "WHISPER$", 12
pokedex_entry 6, 163, gWhismurPokedexText, 373, 17, 256, 0
.string "BIG VOICE$", 12
pokedex_entry 10, 405, gLoudredPokedexText, 356, 10, 256, 0
.string "LOUD NOISE$", 12
pokedex_entry 15, 840, gExploudPokedexText, 284, 1, 256, 0
.string "GUTS$", 12
pokedex_entry 10, 864, gMakuhitaPokedexText, 256, 10, 256, 0
.string "ARM THRUST$", 12
pokedex_entry 23, 2538, gHariyamaPokedexText, 256, 0, 343, 7
.string "POLKA DOT$", 12
pokedex_entry 2, 20, gAzurillPokedexText, 603, 23, 256, 0
.string "COMPASS$", 12
pokedex_entry 10, 970, gNosepassPokedexText, 256, 9, 289, 3
.string "KITTEN$", 12
pokedex_entry 6, 110, gSkittyPokedexText, 492, 19, 256, 0
.string "PRIM$", 12
pokedex_entry 11, 326, gDelcattyPokedexText, 322, 10, 256, 0
.string "DARKNESS$", 12
pokedex_entry 5, 110, gSableyePokedexText, 451, 17, 256, 0
.string "DECEIVER$", 12
pokedex_entry 6, 115, gMawilePokedexText, 466, 17, 256, 0
.string "IRON ARMOR$", 12
pokedex_entry 4, 600, gAronPokedexText, 419, 23, 256, 0
.string "IRON ARMOR$", 12
pokedex_entry 9, 1200, gLaironPokedexText, 275, 12, 256, 0
.string "IRON ARMOR$", 12
pokedex_entry 21, 3600, gAggronPokedexText, 256, -1, 350, 6
.string "MEDITATE$", 12
pokedex_entry 6, 112, gMedititePokedexText, 465, 17, 256, 0
.string "MEDITATE$", 12
pokedex_entry 13, 315, gMedichamPokedexText, 298, 5, 256, 0
.string "LIGHTNING$", 12
pokedex_entry 6, 152, gElectrikePokedexText, 290, 15, 256, 0
.string "DISCHARGE$", 12
pokedex_entry 15, 402, gManectricPokedexText, 256, 3, 257, 0
.string "CHEERING$", 12
pokedex_entry 4, 42, gPluslePokedexText, 515, -9, 256, 0
.string "CHEERING$", 12
pokedex_entry 4, 42, gMinunPokedexText, 512, -7, 256, 0
.string "FIREFLY$", 12
pokedex_entry 7, 177, gVolbeatPokedexText, 442, 16, 256, 0
.string "FIREFLY$", 12
pokedex_entry 6, 177, gIllumisePokedexText, 572, 19, 256, 0
.string "THORN$", 12
pokedex_entry 3, 20, gRoseliaPokedexText, 677, 20, 256, 0
.string "STOMACH$", 12
pokedex_entry 4, 103, gGulpinPokedexText, 593, 23, 256, 0
.string "POISON BAG$", 12
pokedex_entry 17, 800, gSwalotPokedexText, 256, 6, 345, 3
.string "SAVAGE$", 12
pokedex_entry 8, 208, gCarvanhaPokedexText, 362, 0, 256, 0
.string "BRUTAL$", 12
pokedex_entry 18, 888, gSharpedoPokedexText, 256, 0, 317, 3
.string "BALL WHALE$", 12
pokedex_entry 20, 1300, gWailmerPokedexText, 256, 2, 493, 0
.string "FLOAT WHALE$", 12
pokedex_entry 145, 3980, gWailordPokedexText, 256, 0, 1352, 18
.string "NUMB$", 12
pokedex_entry 7, 240, gNumelPokedexText, 342, 17, 256, 0
.string "ERUPTION$", 12
pokedex_entry 19, 2200, gCameruptPokedexText, 256, 7, 345, 6
.string "COAL$", 12
pokedex_entry 5, 804, gTorkoalPokedexText, 390, 9, 256, 0
.string "BOUNCE$", 12
pokedex_entry 7, 306, gSpoinkPokedexText, 423, 17, 256, 0
.string "MANIPULATE$", 12
pokedex_entry 9, 715, gGrumpigPokedexText, 358, 10, 256, 0
.string "SPOT PANDA$", 12
pokedex_entry 11, 50, gSpindaPokedexText, 321, 4, 256, 0
.string "ANT PIT$", 12
pokedex_entry 7, 150, gTrapinchPokedexText, 298, 17, 256, 0
.string "VIBRATION$", 12
pokedex_entry 11, 153, gVibravaPokedexText, 370, 11, 256, 0
.string "MYSTIC$", 12
pokedex_entry 20, 820, gFlygonPokedexText, 256, 0, 268, 1
.string "CACTUS$", 12
pokedex_entry 4, 513, gCacneaPokedexText, 455, 20, 256, 0
.string "SCARECROW$", 12
pokedex_entry 13, 774, gCacturnePokedexText, 327, 5, 256, 0
.string "COTTON BIRD$", 12
pokedex_entry 4, 12, gSwabluPokedexText, 422, -8, 256, 0
.string "HUMMING$", 12
pokedex_entry 11, 206, gAltariaPokedexText, 327, 0, 256, 0
.string "CAT FERRET$", 12
pokedex_entry 13, 403, gZangoosePokedexText, 256, 3, 256, 0
.string "FANG SNAKE$", 12
pokedex_entry 27, 525, gSeviperPokedexText, 275, 7, 256, 0
.string "METEORITE$", 12
pokedex_entry 10, 1680, gLunatonePokedexText, 300, 3, 256, 0
.string "METEORITE$", 12
pokedex_entry 12, 1540, gSolrockPokedexText, 328, 0, 256, 0
.string "WHISKERS$", 12
pokedex_entry 4, 19, gBarboachPokedexText, 581, -3, 256, 0
.string "WHISKERS$", 12
pokedex_entry 9, 236, gWhiscashPokedexText, 317, 1, 256, 0
.string "RUFFIAN$", 12
pokedex_entry 6, 115, gCorphishPokedexText, 484, 19, 256, 0
.string "ROGUE$", 12
pokedex_entry 11, 328, gCrawdauntPokedexText, 365, 9, 256, 0
.string "CLAY DOLL$", 12
pokedex_entry 5, 215, gBaltoyPokedexText, 457, 21, 256, 0
.string "CLAY DOLL$", 12
pokedex_entry 15, 1080, gClaydolPokedexText, 256, 3, 280, 1
.string "SEA LILY$", 12
pokedex_entry 10, 238, gLileepPokedexText, 305, 8, 256, 0
.string "BARNACLE$", 12
pokedex_entry 15, 604, gCradilyPokedexText, 267, 0, 256, 0
.string "OLD SHRIMP$", 12
pokedex_entry 7, 125, gAnorithPokedexText, 296, 4, 256, 0
.string "PLATE$", 12
pokedex_entry 15, 682, gArmaldoPokedexText, 312, 3, 271, 0
.string "FISH$", 12
pokedex_entry 6, 74, gFeebasPokedexText, 423, -4, 256, 0
.string "TENDER$", 12
pokedex_entry 62, 1620, gMiloticPokedexText, 256, 0, 360, 7
.string "WEATHER$", 12
pokedex_entry 3, 8, gCastformPokedexText, 435, -5, 256, 0
.string "COLOR SWAP$", 12
pokedex_entry 10, 220, gKecleonPokedexText, 316, 10, 256, 0
.string "PUPPET$", 12
pokedex_entry 6, 23, gShuppetPokedexText, 440, 20, 256, 0
.string "MARIONETTE$", 12
pokedex_entry 11, 125, gBanettePokedexText, 262, 9, 256, 0
.string "REQUIEM$", 12
pokedex_entry 8, 150, gDuskullPokedexText, 406, -4, 256, 0
.string "BECKON$", 12
pokedex_entry 16, 306, gDusclopsPokedexText, 256, 3, 299, 1
.string "FRUIT$", 12
pokedex_entry 20, 1000, gTropiusPokedexText, 256, 0, 344, 7
.string "WIND CHIME$", 12
pokedex_entry 6, 10, gChimechoPokedexText, 505, 0, 256, 0
.string "DISASTER$", 12
pokedex_entry 12, 470, gAbsolPokedexText, 301, 3, 256, 0
.string "BRIGHT$", 12
pokedex_entry 6, 140, gWynautPokedexText, 484, 19, 256, 0
.string "SNOW HAT$", 12
pokedex_entry 7, 168, gSnoruntPokedexText, 380, 15, 256, 0
.string "FACE$", 12
pokedex_entry 15, 2565, gGlaliePokedexText, 256, 3, 344, 0
.string "CLAP$", 12
pokedex_entry 8, 395, gSphealPokedexText, 315, 16, 256, 0
.string "BALL ROLL$", 12
pokedex_entry 11, 876, gSealeoPokedexText, 338, 13, 256, 0
.string "ICE BREAK$", 12
pokedex_entry 14, 1506, gWalreinPokedexText, 316, 4, 256, 0
.string "BIVALVE$", 12
pokedex_entry 4, 525, gClamperlPokedexText, 691, 22, 256, 0
.string "DEEP SEA$", 12
pokedex_entry 17, 270, gHuntailPokedexText, 307, 1, 256, 0
.string "SOUTH SEA$", 12
pokedex_entry 18, 226, gGorebyssPokedexText, 278, 5, 256, 0
.string "LONGEVITY$", 12
pokedex_entry 10, 234, gRelicanthPokedexText, 316, 7, 256, 0
.string "RENDEZVOUS$", 12
pokedex_entry 6, 87, gLuvdiscPokedexText, 371, 2, 256, 0
.string "ROCK HEAD$", 12
pokedex_entry 6, 421, gBagonPokedexText, 448, 18, 256, 0
.string "ENDURANCE$", 12
pokedex_entry 11, 1105, gShelgonPokedexText, 311, 12, 256, 0
.string "DRAGON$", 12
pokedex_entry 15, 1026, gSalamencePokedexText, 256, 0, 256, 0
.string "IRON BALL$", 12
pokedex_entry 6, 952, gBeldumPokedexText, 414, -1, 256, 0
.string "IRON CLAW$", 12
pokedex_entry 12, 2025, gMetangPokedexText, 256, 6, 256, 0
.string "IRON LEG$", 12
pokedex_entry 16, 5500, gMetagrossPokedexText, 256, 4, 447, 9
.string "ROCK PEAK$", 12
pokedex_entry 17, 2300, gRegirockPokedexText, 256, 2, 309, 1
.string "ICEBERG$", 12
pokedex_entry 18, 1750, gRegicePokedexText, 256, 0, 301, 2
.string "IRON$", 12
pokedex_entry 19, 2050, gRegisteelPokedexText, 256, 0, 359, 6
.string "EON$", 12
pokedex_entry 14, 400, gLatiasPokedexText, 304, 3, 256, 0
.string "EON$", 12
pokedex_entry 20, 600, gLatiosPokedexText, 256, 0, 294, 3
.string "SEA BASIN$", 12
pokedex_entry 45, 3520, gKyogrePokedexText, 256, 0, 614, 13
.string "CONTINENT$", 12
pokedex_entry 35, 9500, gGroudonPokedexText, 256, 0, 515, 14
.string "SKY HIGH$", 12
pokedex_entry 70, 2065, gRayquazaPokedexText, 256, 0, 448, 12
.string "WISH$", 12
pokedex_entry 3, 11, gJirachiPokedexText, 608, -8, 256, 0
.string "DNA$", 12
pokedex_entry 17, 608, gDeoxysPokedexText, 256, 0, 290, 2
data/script_pokemon_util_80F87D8.s
-7
View File
@@ -1,7 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2, 0
gUnknown_0858D8EC:: @ 858D8EC
.byte 3, 4, 5, 14
data/scripts/contest_hall.inc
+2 -2
View File
@@ -388,7 +388,7 @@ LinkContestRoom1_EventScript_27A1D2:: @ 827A1D2
releaseall
addvar VAR_0x8006, 65535
playse SE_BOWA2
special sub_80F8D28
special ShowContestEntryMonPic
call LinkContestRoom1_EventScript_27A217
return
@@ -517,7 +517,7 @@ LinkContestRoom1_EventScript_27A34F:: @ 827A34F
LinkContestRoom1_EventScript_27A3E5:: @ 827A3E5
setvar VAR_RESULT, 8
special sub_80F8FE8
special ScriptRandom
compare VAR_RESULT, 0
call_if 1, LinkContestRoom1_EventScript_27A65A
compare VAR_RESULT, 1
data/specials.inc
+6 -6
View File
@@ -94,7 +94,7 @@ gSpecials:: @ 81DBA64
def_special sub_80F8390
def_special sub_80F8850
def_special sub_80F82B4
def_special sub_80F87D8
def_special SetContestTrainerGfxIds
def_special sub_80F7F30
def_special sub_80F8970
def_special sub_80F8AFC
@@ -102,7 +102,7 @@ gSpecials:: @ 81DBA64
def_special sub_80F7F7C
def_special sub_80F7FFC
def_special sub_80F8D24
def_special sub_80F8C7C
def_special GiveMonArtistRibbon
def_special sub_80B3000
def_special SaveGame
def_special sub_80FAFF8
@@ -259,7 +259,7 @@ gSpecials:: @ 81DBA64
def_special sub_80F9490
def_special ValidateEReaderTrainer
def_special GetBestBattleTowerStreak
def_special ReducePlayerPartyToThree
def_special ReducePlayerPartyToSelectedMons
def_special BedroomPC
def_special PlayerPC
def_special FieldShowRegionMap
@@ -330,13 +330,13 @@ gSpecials:: @ 81DBA64
def_special sub_80AC81C
def_special sp13E_warp_to_last_warp
def_special sp13F_fall_to_last_warp
def_special sub_80F8D28
def_special ShowContestEntryMonPic
def_special sub_80F8EB8
def_special SetEReaderTrainerGfxId
def_special BattleSetup_StartLatiBattle
def_special SetRoute119Weather
def_special SetRoute123Weather
def_special sub_80F8FA0
def_special ScriptGetMultiplayerId
def_special ScriptGetPartyMonSpecies
def_special sub_81B98DC
def_special nullsub_54
@@ -350,7 +350,7 @@ gSpecials:: @ 81DBA64
def_special BufferLottoTicketNumber
def_special sub_81653CC
def_special sub_80F9370
def_special sub_80F8FE8
def_special ScriptRandom
def_special sub_81AFDD0
def_special sub_80EDCE8
def_special sub_80EE2CC
data/text/pokedex_text.inc
-2321
View File
File diff suppressed because it is too large Load Diff
graphics/interface/menu.png → graphics/battle_interface/textbox.png
View File
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 444 B

After

Width:  |  Height:  |  Size: 444 B

graphics/interface/menu_0.pal → graphics/battle_interface/textbox_0.pal
View File
graphics/interface/menu_1.pal → graphics/battle_interface/textbox_1.pal
View File
graphics/interface/menu_map.bin → graphics/battle_interface/textbox_map.bin
View File
graphics_file_rules.mk
+2 -2
View File
@@ -309,8 +309,8 @@ graphics/pokenav/region_map.8bpp: %.8bpp: %.png
$(MISCGFXDIR)/japanese_hof.4bpp: %.4bpp: %.png
$(GFX) $< $@ -num_tiles 29
$(INTERFACEGFXDIR)/menu.gbapal: $(INTERFACEGFXDIR)/menu_0.gbapal \
$(INTERFACEGFXDIR)/menu_1.gbapal
$(BATINTGFXDIR)/textbox.gbapal: $(BATINTGFXDIR)/textbox_0.gbapal \
$(BATINTGFXDIR)/textbox_1.gbapal
@cat $^ >$@
$(BTLANMSPRGFXDIR)/010.4bpp: $(BTLANMSPRGFXDIR)/010_0.4bpp \
include/battle_anim.h
+29 -3
View File
@@ -73,9 +73,35 @@ void HandleIntroSlide(u8 terrainId);
u32 GetAnimBgAttribute(u8 bgId, u8 attributeId);
// battle_anim_80A5C6C.s
void sub_80A6EEC(struct Sprite *sprite);
void sub_80A68D4(struct Sprite *sprite);
void sub_80A6450(struct Sprite *sprite);
void SetAverageBattlerPositions(u8 battlerId, bool8 a2, s16 *x, s16 *y);
void move_anim_8074EE0(struct Sprite *sprite);
void sub_80A656C(struct Sprite *sprite);
void InitAnimSpritePos(struct Sprite *sprite, u8 a2);
void sub_80A6980(struct Sprite *sprite, bool8 a2);
void StartAnimLinearTranslation(struct Sprite *sprite);
void InitAnimArcTranslation(struct Sprite *sprite);
bool8 TranslateAnimLinear(struct Sprite *sprite);
void TranslateAnimSpriteToTargetMonLocation(struct Sprite *sprite);
void sub_80A8EE4(struct Sprite *sprite);
u8 GetBattlerSpriteCoord2(u8 battlerId, u8 attributeId);
void sub_80A6FD4(struct Sprite *sprite);
u16 ArcTan2Neg(s16 a, s16 b);
void sub_80A73E0(struct Sprite *sprite, bool8 a2, s16 xScale, s16 yScale, u16 rotation);
void sub_80A67BC(struct Sprite *sprite);
void sub_80A66DC(struct Sprite *sprite);
void sub_80A6838(struct Sprite *sprite);
void sub_80A67D8(struct Sprite *sprite);
void sub_80A6864(struct Sprite *sprite, s16 a2);
s16 sub_80A861C(u8 battlerId, u8 a2);
u8 GetBattlerYCoordWithElevation(u8 battlerId);
void WaitAnimForDuration(struct Sprite *sprite);
void sub_80A7938(struct Sprite *sprite);
void InitAnimLinearTranslation(struct Sprite *sprite);
void sub_80A6F98(struct Sprite *sprite);
u8 sub_80A8328(u8 battlerId);
void *sub_80A8050(s16 bottom, s16 top);
void sub_80A8048(s16 *bottom, s16 *top, const void *ptr);
void sub_80A8278(void);
void sub_80A6B30(struct UnknownAnimStruct2*);
void sub_80A6B90(struct UnknownAnimStruct2*, u32 arg1);
@@ -85,7 +111,7 @@ void sub_80A6630(struct Sprite *sprite);
void sub_80A6680(struct Sprite *sprite);
void sub_80A7344(u8 spriteId);
void obj_id_set_rotscale(u8 spriteId, s16 xScale, s16 yScale, u16 rotation);
void sub_80A6E14(struct Sprite *sprite);
void InitSpriteDataForLinearTranslation(struct Sprite *sprite);
void sub_80A7270(u8 spriteId, u8 objMode);
void sub_80A73A0(u8 spriteId);
u32 sub_80A75AC(u8 a1, u8 a2, u8 a3, u8 a4, u8 a5, u8 a6, u8 a7);
include/bg.h
+2 -2
View File
@@ -70,14 +70,14 @@ void CopyToBgTilemapBuffer(u8 bg, const void *src, u16 mode, u16 destOffset);
void CopyBgTilemapBufferToVram(u8 bg);
void CopyToBgTilemapBufferRect(u8 bg, const void* src, u8 destX, u8 destY, u8 width, u8 height);
void CopyToBgTilemapBufferRect_ChangePalette(u8 bg, const void *src, u8 destX, u8 destY, u8 rectWidth, u8 rectHeight, u8 palette);
void CopyRectToBgTilemapBufferRect(u8 bg, const void *src, u8 srcX, u8 srcY, u8 srcWidth, u8 srcHeight, u8 destX, u8 destY, u8 rectWidth, u8 rectHeight, u8 palette1, u16 tileOffset, u16 palette2);
void CopyRectToBgTilemapBufferRect(u8 bg, const void *src, u8 srcX, u8 srcY, u8 srcWidth, u8 unused, u8 srcHeight, u8 destX, u8 destY, u8 rectWidth, u8 rectHeight, s16 palette1, s16 tileOffset);
void FillBgTilemapBufferRect_Palette0(u8 bg, u16 tileNum, u8 x, u8 y, u8 width, u8 height);
void FillBgTilemapBufferRect(u8 bg, u16 tileNum, u8 x, u8 y, u8 width, u8 height, u8 palette);
void WriteSequenceToBgTilemapBuffer(u8 bg, u16 firstTileNum, u8 x, u8 y, u8 width, u8 height, u8 paletteSlot, s16 tileNumDelta);
u16 GetBgMetricTextMode(u8 bg, u8 whichMetric);
u32 GetBgMetricAffineMode(u8 bg, u8 whichMetric);
u32 GetTileMapIndexFromCoords(s32 x, s32 y, s32 screenSize, u32 screenWidth, u32 screenHeight);
void CopyTileMapEntry(u16 *src, u16 *dest, s32 palette1, u32 tileOffset, u32 palette2);
void CopyTileMapEntry(const u16 *src, u16 *dest, s32 palette1, s32 tileOffset, s32 palette2);
u32 GetBgType(u8 bg);
bool32 IsInvalidBg32(u8 bg);
bool32 IsTileMapOutsideWram(u8 bg);
include/contest.h
+6
View File
@@ -226,6 +226,11 @@ extern u8 gUnknown_02039F24;
extern u16 gSpecialVar_ContestCategory;
extern u16 gSpecialVar_ContestRank;
extern u8 gUnknown_02039F30;
extern u8 gContestFinalStandings[4];
extern u8 gContestPlayerMonIndex;
extern s16 gUnknown_02039F08[4];
extern s16 gContestMonConditions[4];
extern u8 gIsLinkContest;
struct Shared18000
{
@@ -427,5 +432,6 @@ bool8 Contest_IsMonsTurnDisabled(u8 a);
bool8 sub_80DE1E8(u8 a);
void SetStartledString(u8 a, u8 b);
s8 Contest_GetMoveExcitement(u16);
void sub_80DEDA8(u8);
#endif //GUARD_CONTEST_H
include/contest_link_80F57C4.h
+3
View File
@@ -1,7 +1,10 @@
#ifndef GUARD_CONTEST_LINK_80F57C4_H
#define GUARD_CONTEST_LINK_80F57C4_H
void sub_80F8264(void);
void sub_80F8290(void);
void sub_80F840C(void);
void sub_80F8438(void);
void sub_80F8484(void);
void sub_80F84C4(u8);
void sub_80FC998(u8 taskId);
include/contest_painting.h
+1
View File
@@ -2,5 +2,6 @@
#define GUARD_CONTESTPAINTING_H
void sub_812FDA8(u32);
void sub_812FDEC(void);
#endif
include/global.fieldmap.h
+2 -2
View File
@@ -192,8 +192,8 @@ struct EventObject
struct __attribute__((packed)) {
u8 x:4;
u8 y:4;
} __attribute__((aligned (1))) as_nybbles;
} __attribute__((aligned (1))) range;
} ALIGNED(1) as_nybbles;
} ALIGNED(1) range;
/*0x1A*/ u8 fieldEffectSpriteId;
/*0x1B*/ u8 warpArrowSpriteId;
/*0x1C*/ u8 movementActionId;
include/graphics.h
+5 -1
View File
@@ -1237,7 +1237,7 @@ extern const u32 gMonBackPic_Pichu[];
extern const u32 gMonShinyPalette_Pichu[];
extern const u32 gMonStillFrontPic_Pichu[];
extern const u8 gMonIcon_Pichu[];
extern const u32 gMonFootprint_Pichu[];
extern const u8 gMonFootprint_Pichu[];
extern const u32 gMonFrontPic_Cleffa[];
extern const u32 gMonPalette_Cleffa[];
extern const u32 gMonBackPic_Cleffa[];
@@ -2860,6 +2860,7 @@ extern const u32 gMonPalette_CircledQuestionMark[];
extern const u32 gMonShinyPalette_CircledQuestionMark[];
extern const u32 gMonStillFrontPic_CircledQuestionMark[];
extern const u8 gMonIcon_QuestionMark[];
extern const u8 gMonFootprint_QuestionMark[];
extern const u32 gMonFrontPic_DoubleQuestionMark[];
extern const u32 gMonBackPic_DoubleQuestionMark[];
extern const u32 gMonPalette_DoubleQuestionMark[];
@@ -4732,4 +4733,7 @@ extern const u32 gUnknown_08D927EC[];
extern const u32 gSlotMachineReelTime_Gfx[];
extern const u32 gUnknown_08D8D410[];
extern const u32 gUnknown_08D8D58C[];
#endif //GUARD_GRAPHICS_H
include/international_string_util.h
+1 -1
View File
@@ -16,7 +16,7 @@ s32 sub_81DB3D8(const struct MenuAction *str, const u8* arg1, s32 arg2);
// sub_81DB494
void PadNameString(u8 *dst, u8 padWith);
void sub_81DB554(u8 *, u8);
// sub_81DB5AC
void sub_81DB5AC(u8 *);
u32 sub_81DB604(const u8 *);
// sub_81DB620
include/pokemon.h
-20
View File
@@ -112,25 +112,6 @@
#define MON_FEMALE 0xFE
#define MON_GENDERLESS 0xFF
#define TYPE_NORMAL 0x00
#define TYPE_FIGHTING 0x01
#define TYPE_FLYING 0x02
#define TYPE_POISON 0x03
#define TYPE_GROUND 0x04
#define TYPE_ROCK 0x05
#define TYPE_BUG 0x06
#define TYPE_GHOST 0x07
#define TYPE_STEEL 0x08
#define TYPE_MYSTERY 0x09
#define TYPE_FIRE 0x0a
#define TYPE_WATER 0x0b
#define TYPE_GRASS 0x0c
#define TYPE_ELECTRIC 0x0d
#define TYPE_PSYCHIC 0x0e
#define TYPE_ICE 0x0f
#define TYPE_DRAGON 0x10
#define TYPE_DARK 0x11
#define FRIENDSHIP_EVENT_GROW_LEVEL 0x0
#define FRIENDSHIP_EVENT_VITAMIN 0x1 // unused
#define FRIENDSHIP_EVENT_BATTLE_ITEM 0x2 // unused
@@ -465,7 +446,6 @@ extern const u8 gUnknown_08329D2A[];
extern const u8 gStatStageRatios[][2];
extern const u16 gUnknown_08329D54[];
extern const struct SpriteTemplate gUnknown_08329D98[];
extern const struct CompressedSpritePalette gMonPaletteTable[];
extern const s8 gNatureStatTable[][5];
void ZeroBoxMonData(struct BoxPokemon *boxMon);
include/script_pokemon_util_80F87D8.h
+1 -2
View File
@@ -1,9 +1,8 @@
#ifndef GUARD_SCRIPT_POKEMON_UTIL_80F87D8_H
#define GUARD_SCRIPT_POKEMON_UTIL_80F87D8_H
u16 sub_80F903C(void);
void ReducePlayerPartyToThree(void);
void ReducePlayerPartyToSelectedMons(void);
void HealPlayerParty(void);
#endif // GUARD_SCRIPT_POKEMON_UTIL_80F87D8_H
include/strings.h
+50
View File
@@ -989,6 +989,56 @@ extern const u8 gUnknown_0827EE03[];
extern const u8 gUnknown_0827EE05[];
extern const u8 gUnknown_0827EE07[];
extern const u8 gUnknown_0827EE09[];
// Pokedex strings
extern const u8 gUnknown_085E87A5[];
extern const u8 gUnknown_085E87D6[];
extern const u8 gUnknown_085E87EF[];
extern const u8 gUnknown_085E8806[];
extern const u8 gUnknown_085E881F[];
extern const u8 gUnknown_085E8840[];
extern const u8 gUnknown_085E887C[];
extern const u8 gUnknown_085E88A6[];
extern const u8 gUnknown_085E88C8[];
extern const u8 gUnknown_085E88DF[];
extern const u8 gUnknown_085E88E9[];
extern const u8 gUnknown_085E88F6[];
extern const u8 gUnknown_085E8905[];
extern const u8 gUnknown_085E8911[];
extern const u8 gUnknown_085E891F[];
extern const u8 gUnknown_085E892D[];
extern const u8 gUnknown_085E893A[];
extern const u8 gUnknown_085E8948[];
extern const u8 gUnknown_085E894C[];
extern const u8 gUnknown_085E8950[];
extern const u8 gUnknown_085E8954[];
extern const u8 gUnknown_085E8958[];
extern const u8 gUnknown_085E895C[];
extern const u8 gUnknown_085E8960[];
extern const u8 gUnknown_085E8964[];
extern const u8 gUnknown_085E8968[];
extern const u8 gUnknown_085E896B[];
extern const u8 gUnknown_085E896F[];
extern const u8 gUnknown_085E8974[];
extern const u8 gUnknown_085E897B[];
extern const u8 gUnknown_085E8981[];
extern const u8 gUnknown_085E8987[];
extern const u8 gUnknown_085E898D[];
extern const u8 gUnknown_085E8994[];
extern const u8 gUnknown_085E8999[];
extern const u8 gUnknown_085E899F[];
extern const u8 gUnknown_085E89A4[];
extern const u8 gUnknown_085E89BB[];
extern const u8 gUnknown_085E89D4[];
extern const u8 gUnknown_085E8A02[];
extern const u8 gUnknown_085E8A37[];
extern const u8 gUnknown_085E8A73[];
extern const u8 gUnknown_085E8AAF[];
extern const u8 gUnknown_085E8AEA[];
extern const u8 gUnknown_085E8B25[];
extern const u8 gUnknown_085E8B26[];
extern const u8 gUnknown_085E8B35[];
extern const u8 gUnknown_085EAEC3[];
extern const u8 gUnknown_085EAED6[];
extern const u8 gUnknown_085EAEE6[];
include/text.h
+7 -11
View File
@@ -109,7 +109,8 @@
#define TEXT_SPEED_FF 0xFF
enum {
enum
{
FONTATTR_MAX_LETTER_WIDTH,
FONTATTR_MAX_LETTER_HEIGHT,
FONTATTR_LETTER_SPACING,
@@ -205,21 +206,16 @@ typedef struct {
struct Struct_03002F90
{
u8 unk0[0x20];
u8 unk20[0x20];
u8 unk40[0x20];
u8 unk60[0x20];
u32 unk0[8];
u32 unk20[8];
u32 unk40[8];
u32 unk60[8];
u8 unk80;
u8 unk81;
};
extern TextFlags gTextFlags;
extern u8 gStringVar1[];
extern u8 gStringVar2[];
extern u8 gStringVar3[];
extern u8 gStringVar4[];
extern u8 gUnknown_03002F84;
extern struct Struct_03002F90 gUnknown_03002F90;
@@ -233,7 +229,7 @@ u32 RenderFont(struct TextPrinter *textPrinter);
void GenerateFontHalfRowLookupTable(u8 fgColor, u8 bgColor, u8 shadowColor);
void SaveTextColors(u8 *fgColor, u8 *bgColor, u8 *shadowColor);
void RestoreTextColors(u8 *fgColor, u8 *bgColor, u8 *shadowColor);
void DecompressGlyphTile(const u16 *src, u16 *dest);
void DecompressGlyphTile(const void *src_, void *dest_);
u8 GetLastTextColor(u8 colorType);
void CopyGlyphToWindow(struct TextPrinter *x);
void ClearTextSpan(struct TextPrinter *textPrinter, u32 width);
ld_script.txt
+58 -59
View File
@@ -147,7 +147,7 @@ SECTIONS {
src/secret_base.o(.text);
src/tv.o(.text);
asm/contest_link_80F57C4.o(.text);
asm/script_pokemon_util_80F87D8.o(.text);
src/script_pokemon_util_80F87D8.o(.text);
src/field_poison.o(.text);
src/pokemon_size_record.o(.text);
asm/fldeff_80F9BCC.o(.text);
@@ -162,16 +162,16 @@ SECTIONS {
asm/fire.o(.text);
asm/electric.o(.text);
asm/ice.o(.text);
asm/fight.o(.text);
asm/poison.o(.text);
src/fight.o(.text);
src/poison.o(.text);
asm/flying.o(.text);
asm/psychic.o(.text);
asm/bug.o(.text);
asm/rock.o(.text);
src/bug.o(.text);
src/rock.o(.text);
asm/ghost.o(.text);
asm/dragon.o(.text);
src/dragon.o(.text);
asm/dark.o(.text);
asm/ground.o(.text);
src/ground.o(.text);
asm/normal.o(.text);
src/battle_anim_utility_funcs.o(.text);
asm/battle_intro.o(.text);
@@ -454,7 +454,6 @@ SECTIONS {
src/field_effect.o(.rodata);
src/option_menu.o(.rodata);
src/pokedex.o(.rodata);
data/pokedex.o(.rodata);
data/trainer_card.o(.rodata);
src/pokemon_storage_system.o(.rodata);
data/pokemon_storage_system.o(.rodata);
@@ -474,7 +473,7 @@ SECTIONS {
src/secret_base.o(.rodata);
src/tv.o(.rodata);
data/contest_link_80F57C4.o(.rodata);
data/script_pokemon_util_80F87D8.o(.rodata);
src/script_pokemon_util_80F87D8.o(.rodata);
src/pokemon_size_record.o(.rodata)
data/field_effect_misc.o(.rodata);
src/field_special_scene.o(.rodata);
@@ -617,10 +616,10 @@ SECTIONS {
{
sound/songs/midi/mus_dummy.o(.rodata);
sound/songs/midi/se_kaifuku.o(.rodata);
sound/songs/se_pc_login.o(.rodata);
sound/songs/se_pc_off.o(.rodata);
sound/songs/se_pc_on.o(.rodata);
sound/songs/se_select.o(.rodata);
sound/songs/midi/se_pc_login.o(.rodata);
sound/songs/midi/se_pc_off.o(.rodata);
sound/songs/midi/se_pc_on.o(.rodata);
sound/songs/midi/se_select.o(.rodata);
sound/songs/se_win_open.o(.rodata);
sound/songs/se_wall_hit.o(.rodata);
sound/songs/midi/se_door.o(.rodata);
@@ -631,12 +630,12 @@ SECTIONS {
sound/songs/midi/se_kouka_m.o(.rodata);
sound/songs/midi/se_kouka_h.o(.rodata);
sound/songs/midi/se_bowa2.o(.rodata);
sound/songs/se_poke_dead.o(.rodata);
sound/songs/se_nigeru.o(.rodata);
sound/songs/midi/se_poke_dead.o(.rodata);
sound/songs/midi/se_nigeru.o(.rodata);
sound/songs/midi/se_jido_doa.o(.rodata);
sound/songs/se_naminori.o(.rodata);
sound/songs/midi/se_naminori.o(.rodata);
sound/songs/midi/se_ban.o(.rodata);
sound/songs/se_pin.o(.rodata);
sound/songs/midi/se_pin.o(.rodata);
sound/songs/midi/se_boo.o(.rodata);
sound/songs/midi/se_bowa.o(.rodata);
sound/songs/midi/se_jyuni.o(.rodata);
@@ -644,21 +643,21 @@ SECTIONS {
sound/songs/midi/se_i.o(.rodata);
sound/songs/se_u.o(.rodata);
sound/songs/midi/se_e.o(.rodata);
sound/songs/se_o.o(.rodata);
sound/songs/se_n.o(.rodata);
sound/songs/se_seikai.o(.rodata);
sound/songs/midi/se_o.o(.rodata);
sound/songs/midi/se_n.o(.rodata);
sound/songs/midi/se_seikai.o(.rodata);
sound/songs/midi/se_hazure.o(.rodata);
sound/songs/midi/se_exp.o(.rodata);
sound/songs/midi/se_jite_pyoko.o(.rodata);
sound/songs/se_mu_pachi.o(.rodata);
sound/songs/midi/se_mu_pachi.o(.rodata);
sound/songs/se_tk_kasya.o(.rodata);
sound/songs/midi/se_fu_zaku.o(.rodata);
sound/songs/midi/se_fu_zaku2.o(.rodata);
sound/songs/midi/se_fu_zuzuzu.o(.rodata);
sound/songs/se_ru_gashin.o(.rodata);
sound/songs/se_ru_gasyan.o(.rodata);
sound/songs/se_ru_bari.o(.rodata);
sound/songs/se_ru_hyuu.o(.rodata);
sound/songs/midi/se_ru_gashin.o(.rodata);
sound/songs/midi/se_ru_gasyan.o(.rodata);
sound/songs/midi/se_ru_bari.o(.rodata);
sound/songs/midi/se_ru_hyuu.o(.rodata);
sound/songs/midi/se_ki_gasyan.o(.rodata);
sound/songs/se_tk_warpin.o(.rodata);
sound/songs/se_tk_warpout.o(.rodata);
@@ -668,15 +667,15 @@ SECTIONS {
sound/songs/se_track_stop.o(.rodata);
sound/songs/se_track_haiki.o(.rodata);
sound/songs/se_track_door.o(.rodata);
sound/songs/se_moter.o(.rodata);
sound/songs/midi/se_moter.o(.rodata);
sound/songs/midi/se_card.o(.rodata);
sound/songs/se_save.o(.rodata);
sound/songs/midi/se_save.o(.rodata);
sound/songs/midi/se_kon.o(.rodata);
sound/songs/midi/se_kon2.o(.rodata);
sound/songs/midi/se_kon3.o(.rodata);
sound/songs/midi/se_kon4.o(.rodata);
sound/songs/se_suikomu.o(.rodata);
sound/songs/se_nageru.o(.rodata);
sound/songs/midi/se_suikomu.o(.rodata);
sound/songs/midi/se_nageru.o(.rodata);
sound/songs/se_toy_c.o(.rodata);
sound/songs/se_toy_d.o(.rodata);
sound/songs/se_toy_e.o(.rodata);
@@ -685,10 +684,10 @@ SECTIONS {
sound/songs/se_toy_a.o(.rodata);
sound/songs/se_toy_b.o(.rodata);
sound/songs/se_toy_c1.o(.rodata);
sound/songs/se_mizu.o(.rodata);
sound/songs/midi/se_mizu.o(.rodata);
sound/songs/midi/se_hashi.o(.rodata);
sound/songs/midi/se_daugi.o(.rodata);
sound/songs/se_pinpon.o(.rodata);
sound/songs/midi/se_pinpon.o(.rodata);
sound/songs/midi/se_fuusen1.o(.rodata);
sound/songs/midi/se_fuusen2.o(.rodata);
sound/songs/midi/se_fuusen3.o(.rodata);
@@ -696,37 +695,37 @@ SECTIONS {
sound/songs/se_toy_dango.o(.rodata);
sound/songs/midi/se_doku.o(.rodata);
sound/songs/midi/se_esuka.o(.rodata);
sound/songs/se_t_ame.o(.rodata);
sound/songs/se_t_ame_e.o(.rodata);
sound/songs/se_t_ooame.o(.rodata);
sound/songs/se_t_ooame_e.o(.rodata);
sound/songs/se_t_koame.o(.rodata);
sound/songs/se_t_koame_e.o(.rodata);
sound/songs/se_t_kami.o(.rodata);
sound/songs/se_t_kami2.o(.rodata);
sound/songs/midi/se_t_ame.o(.rodata);
sound/songs/midi/se_t_ame_e.o(.rodata);
sound/songs/midi/se_t_ooame.o(.rodata);
sound/songs/midi/se_t_ooame_e.o(.rodata);
sound/songs/midi/se_t_koame.o(.rodata);
sound/songs/midi/se_t_koame_e.o(.rodata);
sound/songs/midi/se_t_kami.o(.rodata);
sound/songs/midi/se_t_kami2.o(.rodata);
sound/songs/midi/se_elebeta.o(.rodata);
sound/songs/midi/se_hinsi.o(.rodata);
sound/songs/midi/se_expmax.o(.rodata);
sound/songs/se_tamakoro.o(.rodata);
sound/songs/se_tamakoro_e.o(.rodata);
sound/songs/midi/se_basabasa.o(.rodata);
sound/songs/se_regi.o(.rodata);
sound/songs/midi/se_regi.o(.rodata);
sound/songs/midi/se_c_gaji.o(.rodata);
sound/songs/midi/se_c_maku_u.o(.rodata);
sound/songs/midi/se_c_maku_d.o(.rodata);
sound/songs/midi/se_c_pasi.o(.rodata);
sound/songs/midi/se_c_syu.o(.rodata);
sound/songs/midi/se_c_pikon.o(.rodata);
sound/songs/se_reapoke.o(.rodata);
sound/songs/se_op_basyu.o(.rodata);
sound/songs/midi/se_reapoke.o(.rodata);
sound/songs/midi/se_op_basyu.o(.rodata);
sound/songs/midi/se_bt_start.o(.rodata);
sound/songs/midi/se_dendou.o(.rodata);
sound/songs/midi/se_jihanki.o(.rodata);
sound/songs/se_tama.o(.rodata);
sound/songs/se_z_scroll.o(.rodata);
sound/songs/se_z_page.o(.rodata);
sound/songs/se_pn_on.o(.rodata);
sound/songs/se_pn_off.o(.rodata);
sound/songs/midi/se_pn_on.o(.rodata);
sound/songs/midi/se_pn_off.o(.rodata);
sound/songs/midi/se_z_search.o(.rodata);
sound/songs/se_tamago.o(.rodata);
sound/songs/se_tb_start.o(.rodata);
@@ -863,21 +862,21 @@ SECTIONS {
sound/songs/se_w287b.o(.rodata);
sound/songs/se_w114.o(.rodata);
sound/songs/se_w063b.o(.rodata);
sound/songs/se_rg_w_door.o(.rodata);
sound/songs/se_rg_card1.o(.rodata);
sound/songs/se_rg_card2.o(.rodata);
sound/songs/se_rg_card3.o(.rodata);
sound/songs/se_rg_bag1.o(.rodata);
sound/songs/se_rg_bag2.o(.rodata);
sound/songs/se_rg_getting.o(.rodata);
sound/songs/se_rg_shop.o(.rodata);
sound/songs/se_rg_kiteki.o(.rodata);
sound/songs/se_rg_help_op.o(.rodata);
sound/songs/se_rg_help_cl.o(.rodata);
sound/songs/se_rg_help_ng.o(.rodata);
sound/songs/se_rg_deomov.o(.rodata);
sound/songs/se_rg_excellent.o(.rodata);
sound/songs/se_rg_nawamiss.o(.rodata);
sound/songs/midi/se_rg_w_door.o(.rodata);
sound/songs/midi/se_rg_card1.o(.rodata);
sound/songs/midi/se_rg_card2.o(.rodata);
sound/songs/midi/se_rg_card3.o(.rodata);
sound/songs/midi/se_rg_bag1.o(.rodata);
sound/songs/midi/se_rg_bag2.o(.rodata);
sound/songs/midi/se_rg_getting.o(.rodata);
sound/songs/midi/se_rg_shop.o(.rodata);
sound/songs/midi/se_rg_kiteki.o(.rodata);
sound/songs/midi/se_rg_help_op.o(.rodata);
sound/songs/midi/se_rg_help_cl.o(.rodata);
sound/songs/midi/se_rg_help_ng.o(.rodata);
sound/songs/midi/se_rg_deomov.o(.rodata);
sound/songs/midi/se_rg_excellent.o(.rodata);
sound/songs/midi/se_rg_nawamiss.o(.rodata);
sound/songs/se_toreeye.o(.rodata);
sound/songs/se_toreoff.o(.rodata);
sound/songs/midi/se_hantei1.o(.rodata);
songs.mk
+150
View File
@@ -951,5 +951,155 @@ $(MID_SUBDIR)/se_kouka_l.s: %.s: %.mid
$(MID_SUBDIR)/se_kouka_m.s: %.s: %.mid
$(MID) $< $@ -E -R$(STD_REVERB) -G127 -V110 -P5
$(MID_SUBDIR)/se_mizu.s: %.s: %.mid
$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V020 -P4
$(MID_SUBDIR)/se_moter.s: %.s: %.mid
$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V090 -P4
$(MID_SUBDIR)/se_mu_pachi.s: %.s: %.mid
$(MID) $< $@ -E -R$(STD_REVERB) -G127 -V100 -P4
$(MID_SUBDIR)/se_n.s: %.s: %.mid
$(MID) $< $@ -E -R$(STD_REVERB) -G128 -P4
$(MID_SUBDIR)/se_nageru.s: %.s: %.mid
$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V120 -P5
$(MID_SUBDIR)/se_naminori.s: %.s: %.mid
$(MID) $< $@ -E -R$(STD_REVERB) -G127 -V075 -P4
$(MID_SUBDIR)/se_nigeru.s: %.s: %.mid
$(MID) $< $@ -E -R$(STD_REVERB) -G127 -V090 -P5
$(MID_SUBDIR)/se_o.s: %.s: %.mid
$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V120 -P4
$(MID_SUBDIR)/se_op_basyu.s: %.s: %.mid
$(MID) $< $@ -E -R$(STD_REVERB) -G127 -V100 -P5
$(MID_SUBDIR)/se_pc_login.s: %.s: %.mid
$(MID) $< $@ -E -R$(STD_REVERB) -G127 -V100 -P5
$(MID_SUBDIR)/se_pc_off.s: %.s: %.mid
$(MID) $< $@ -E -R$(STD_REVERB) -G127 -V100 -P5
$(MID_SUBDIR)/se_pc_on.s: %.s: %.mid
$(MID) $< $@ -E -R$(STD_REVERB) -G127 -V100 -P5
$(MID_SUBDIR)/se_pin.s: %.s: %.mid
$(MID) $< $@ -E -R$(STD_REVERB) -G127 -V060 -P4
$(MID_SUBDIR)/se_pinpon.s: %.s: %.mid
$(MID) $< $@ -E -R$(STD_REVERB) -G127 -V090 -P5
$(MID_SUBDIR)/se_pn_off.s: %.s: %.mid
$(MID) $< $@ -E -R$(STD_REVERB) -G127 -V100 -P5
$(MID_SUBDIR)/se_pn_on.s: %.s: %.mid
$(MID) $< $@ -E -R$(STD_REVERB) -G127 -V100 -P5
$(MID_SUBDIR)/se_poke_dead.s: %.s: %.mid
$(MID) $< $@ -E -R$(STD_REVERB) -G127 -V110 -P5
$(MID_SUBDIR)/se_reapoke.s: %.s: %.mid
$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V095 -P5
$(MID_SUBDIR)/se_regi.s: %.s: %.mid
$(MID) $< $@ -E -R$(STD_REVERB) -G127 -V090 -P5
$(MID_SUBDIR)/se_rg_bag1.s: %.s: %.mid
$(MID) $< $@ -E -R$(STD_REVERB) -G129 -P5
$(MID_SUBDIR)/se_rg_bag2.s: %.s: %.mid
$(MID) $< $@ -E -R$(STD_REVERB) -G129 -P5
$(MID_SUBDIR)/se_rg_card1.s: %.s: %.mid
$(MID) $< $@ -E -R$(STD_REVERB) -G129 -P5
$(MID_SUBDIR)/se_rg_card2.s: %.s: %.mid
$(MID) $< $@ -E -R$(STD_REVERB) -G129 -P5
$(MID_SUBDIR)/se_rg_card3.s: %.s: %.mid
$(MID) $< $@ -E -R$(STD_REVERB) -G129 -V112 -P5
$(MID_SUBDIR)/se_rg_deomov.s: %.s: %.mid
$(MID) $< $@ -E -R$(STD_REVERB) -G129 -V080 -P5
$(MID_SUBDIR)/se_rg_excellent.s: %.s: %.mid
$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V110 -P5
$(MID_SUBDIR)/se_rg_getting.s: %.s: %.mid
$(MID) $< $@ -E -R$(STD_REVERB) -G129 -V100 -P5
$(MID_SUBDIR)/se_rg_help_cl.s: %.s: %.mid
$(MID) $< $@ -E -R$(STD_REVERB) -G129 -V095 -P5
$(MID_SUBDIR)/se_rg_help_ng.s: %.s: %.mid
$(MID) $< $@ -E -R$(STD_REVERB) -G129 -V125 -P5
$(MID_SUBDIR)/se_rg_help_op.s: %.s: %.mid
$(MID) $< $@ -E -R$(STD_REVERB) -G129 -V096 -P5
$(MID_SUBDIR)/se_rg_kiteki.s: %.s: %.mid
$(MID) $< $@ -E -R$(STD_REVERB) -G129 -V096 -P5
$(MID_SUBDIR)/se_rg_nawamiss.s: %.s: %.mid
$(MID) $< $@ -E -R$(STD_REVERB) -G127 -P5
$(MID_SUBDIR)/se_rg_shop.s: %.s: %.mid
$(MID) $< $@ -E -R$(STD_REVERB) -G129 -V080 -P5
$(MID_SUBDIR)/se_rg_w_door.s: %.s: %.mid
$(MID) $< $@ -E -R$(STD_REVERB) -G129 -V100 -P5
$(MID_SUBDIR)/se_ru_bari.s: %.s: %.mid
$(MID) $< $@ -E -R$(STD_REVERB) -G127 -V100 -P4
$(MID_SUBDIR)/se_ru_gashin.s: %.s: %.mid
$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V090 -P4
$(MID_SUBDIR)/se_ru_gasyan.s: %.s: %.mid
$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V100 -P4
$(MID_SUBDIR)/se_ru_hyuu.s: %.s: %.mid
$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V110 -P4
$(MID_SUBDIR)/se_save.s: %.s: %.mid
$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V080 -P5
$(MID_SUBDIR)/se_seikai.s: %.s: %.mid
$(MID) $< $@ -E -R$(STD_REVERB) -G127 -V080 -P4
$(MID_SUBDIR)/se_select.s: %.s: %.mid
$(MID) $< $@ -E -R$(STD_REVERB) -G127 -V080 -P5
$(MID_SUBDIR)/se_suikomu.s: %.s: %.mid
$(MID) $< $@ -E -R$(STD_REVERB) -G127 -V100 -P5
$(MID_SUBDIR)/se_t_ame.s: %.s: %.mid
$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V080 -P2
$(MID_SUBDIR)/se_t_ame_e.s: %.s: %.mid
$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V080 -P2
$(MID_SUBDIR)/se_t_kami.s: %.s: %.mid
$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V110 -P3
$(MID_SUBDIR)/se_t_kami2.s: %.s: %.mid
$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V110 -P3
$(MID_SUBDIR)/se_t_koame.s: %.s: %.mid
$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V080 -P2
$(MID_SUBDIR)/se_t_koame_e.s: %.s: %.mid
$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V080 -P2
$(MID_SUBDIR)/se_t_ooame.s: %.s: %.mid
$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V100 -P2
$(MID_SUBDIR)/se_t_ooame_e.s: %.s: %.mid
$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V100 -P2
$(MID_SUBDIR)/se_z_search.s: %.s: %.mid
$(MID) $< $@ -E -R$(STD_REVERB) -G127 -P5
sound/song_table.inc
+7 -7
View File
@@ -3,7 +3,7 @@
gSongTable:: @ 86B49F0
song mus_dummy, 0, 0
song se_kaifuku, 1, 1 @ Healing Item
song se_pc_login, 1, 1 @ PC Logon
song se_pc_login, 1, 1 @ PC Login
song se_pc_off, 1, 1 @ PC Shutdown
song se_pc_on, 1, 1 @ PC Startup
song se_select, 2, 2 @ Cursor Selection
@@ -36,7 +36,7 @@ gSongTable:: @ 86B49F0
song se_hazure, 1, 1 @ Failure
song se_exp, 1, 1 @ Exp. Bar
song se_jite_pyoko, 1, 1 @ Bunny Hop
song se_mu_pachi, 1, 1
song se_mu_pachi, 1, 1 @ Toggle Switch
song se_tk_kasya, 1, 1 @ Mossdeep Gym/Trick House Switch
song se_fu_zaku, 1, 1
song se_fu_zaku2, 1, 1
@@ -44,7 +44,7 @@ gSongTable:: @ 86B49F0
song se_ru_gashin, 1, 1 @ Sootopolis Gym - Stairs Appear
song se_ru_gasyan, 1, 1 @ Sootopolis Gym - Ice Breaking
song se_ru_bari, 1, 1 @ Sootopolis Gym - Walking on Ice
song se_ru_hyuu, 1, 1 @ Falling Down
song se_ru_hyuu, 1, 1 @ Falling Down a Hole
song se_ki_gasyan, 2, 2
song se_tk_warpin, 1, 1 @ Warp In
song se_tk_warpout, 1, 1 @ Warp Out
@@ -74,7 +74,7 @@ gSongTable:: @ 86B49F0
song se_mizu, 2, 2 @ Puddle
song se_hashi, 2, 2 @ Fortree Walkways
song se_daugi, 1, 1 @ Slots - Credits
song se_pinpon, 1, 1 @ Ding-dong!
song se_pinpon, 1, 1 @ Elevator - Reached Destination
song se_fuusen1, 2, 2 @ Red Balloon
song se_fuusen2, 2, 2 @ Blue Balloon
song se_fuusen3, 2, 2 @ Yellow Balloon
@@ -104,7 +104,7 @@ gSongTable:: @ 86B49F0
song se_c_syu, 1, 1 @ Contest - Pokémon Switches Out
song se_c_pikon, 1, 1 @ Contest - Pokémon Switches In
song se_reapoke, 1, 1 @ Shiny Pokémon
song se_op_basyu, 1, 1 @ Opening Movie -> Title Screen whoosh
song se_op_basyu, 1, 1 @ Opening Movie -> Title Screen Transition
song se_bt_start, 1, 1 @ Battle Mugshot whoosh
song se_dendou, 1, 1 @ Audience Cheering
song se_jihanki, 1, 1 @ Vending Machine
@@ -255,14 +255,14 @@ gSongTable:: @ 86B49F0
song se_rg_card3, 1, 1 @ Trainer Card 3 (FRLG)
song se_rg_bag1, 1, 1 @ Bag Scroll (FRLG)
song se_rg_bag2, 1, 1 @ Bag Pocket Change (FRLG)
song se_rg_getting, 1, 1
song se_rg_getting, 1, 1
song se_rg_shop, 1, 1 @ Cash Register (FRLG)
song se_rg_kiteki, 1, 1 @ S.S. Anne Horn (FRLG)
song se_rg_help_op, 1, 1 @ Help Menu Open (FRLG)
song se_rg_help_cl, 1, 1 @ Help Menu Close (FRLG)
song se_rg_help_ng, 1, 1 @ Help Menu Error (FRLG)
song se_rg_deomov, 1, 1 @ Deoxys Moves
song se_rg_excellent, 1, 1
song se_rg_excellent, 1, 1 @ HP Restored (FRLG)
song se_rg_nawamiss, 1, 1
song se_toreeye, 1, 1 @ Trainer's Eye Call
song se_toreoff, 1, 1 @ Trainer's Eye Hang Up
sound/songs/midi/se_mizu.mid
BIN
View File
Binary file not shown.
sound/songs/midi/se_moter.mid
BIN
View File
Binary file not shown.
sound/songs/midi/se_mu_pachi.mid
BIN
View File
Binary file not shown.
sound/songs/midi/se_n.mid
BIN
View File
Binary file not shown.
sound/songs/midi/se_nageru.mid
BIN
View File
Binary file not shown.
sound/songs/midi/se_naminori.mid
BIN
View File
Binary file not shown.
sound/songs/midi/se_nigeru.mid
BIN
View File
Binary file not shown.
sound/songs/midi/se_o.mid
BIN
View File
Binary file not shown.
sound/songs/midi/se_op_basyu.mid
BIN
View File
Binary file not shown.
sound/songs/midi/se_pc_login.mid
BIN
View File
Binary file not shown.
sound/songs/midi/se_pc_off.mid
BIN
View File
Binary file not shown.
sound/songs/midi/se_pc_on.mid
BIN
View File
Binary file not shown.
sound/songs/midi/se_pin.mid
BIN
View File
Binary file not shown.
sound/songs/midi/se_pinpon.mid
BIN
View File
Binary file not shown.
sound/songs/midi/se_pn_off.mid
BIN
View File
Binary file not shown.
sound/songs/midi/se_pn_on.mid
BIN
View File
Binary file not shown.
sound/songs/midi/se_poke_dead.mid
BIN
View File
Binary file not shown.
sound/songs/midi/se_reapoke.mid
BIN
View File
Binary file not shown.
sound/songs/midi/se_regi.mid
BIN
View File
Binary file not shown.
sound/songs/midi/se_rg_bag1.mid
BIN
View File
Binary file not shown.
sound/songs/midi/se_rg_bag2.mid
BIN
View File
Binary file not shown.
sound/songs/midi/se_rg_card1.mid
BIN
View File
Binary file not shown.
sound/songs/midi/se_rg_card2.mid
BIN
View File
Binary file not shown.
sound/songs/midi/se_rg_card3.mid
BIN
View File
Binary file not shown.
sound/songs/midi/se_rg_deomov.mid
BIN
View File
Binary file not shown.
sound/songs/midi/se_rg_excellent.mid
BIN
View File
Binary file not shown.
sound/songs/midi/se_rg_getting.mid
BIN
View File
Binary file not shown.
sound/songs/midi/se_rg_help_cl.mid
BIN
View File
Binary file not shown.
sound/songs/midi/se_rg_help_ng.mid
BIN
View File
Binary file not shown.
sound/songs/midi/se_rg_help_op.mid
BIN
View File
Binary file not shown.
sound/songs/midi/se_rg_kiteki.mid
BIN
View File
Binary file not shown.
sound/songs/midi/se_rg_nawamiss.mid
BIN
View File
Binary file not shown.
sound/songs/midi/se_rg_shop.mid
BIN
View File
Binary file not shown.
sound/songs/midi/se_rg_w_door.mid
BIN
View File
Binary file not shown.
sound/songs/midi/se_ru_bari.mid
BIN
View File
Binary file not shown.
sound/songs/midi/se_ru_gashin.mid
BIN
View File
Binary file not shown.
sound/songs/midi/se_ru_gasyan.mid
BIN
View File
Binary file not shown.
sound/songs/midi/se_ru_hyuu.mid
BIN
View File
Binary file not shown.
sound/songs/midi/se_save.mid
BIN
View File
Binary file not shown.
sound/songs/midi/se_seikai.mid
BIN
View File
Binary file not shown.
sound/songs/midi/se_select.mid
BIN
View File
Binary file not shown.
sound/songs/midi/se_suikomu.mid
BIN
View File
Binary file not shown.
sound/songs/midi/se_t_ame.mid
BIN
View File
Binary file not shown.
sound/songs/midi/se_t_ame_e.mid
BIN
View File
Binary file not shown.
sound/songs/midi/se_t_kami.mid
BIN
View File
Binary file not shown.
sound/songs/midi/se_t_kami2.mid
BIN
View File
Binary file not shown.
sound/songs/midi/se_t_koame.mid
BIN
View File
Binary file not shown.

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