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

merge mail with master, fix conflicts

Browse Source
This commit is contained in:
DizzyEggg
2017-12-17 20:22:56 +01:00
parent 930fea6fad 6d73bb4b57
commit 46fa2557d7
217 changed files with 22013 additions and 26319 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Makefile
+1 -1
View File
@@ -130,7 +130,7 @@ $(DATA_ASM_BUILDDIR)/%.o: data_dep :=
endif endif
$(DATA_ASM_BUILDDIR)/%.o: $(DATA_ASM_SUBDIR)/%.s $$(data_dep) $(DATA_ASM_BUILDDIR)/%.o: $(DATA_ASM_SUBDIR)/%.s $$(data_dep)
$(PREPROC) $< charmap.txt | $(AS) $(ASFLAGS) -o $@ $(PREPROC) $< charmap.txt | $(CPP) -I include | $(AS) $(ASFLAGS) -o $@
$(OBJ_DIR)/sym_bss.ld: sym_bss.txt $(OBJ_DIR)/sym_bss.ld: sym_bss.txt
$(RAMSCRGEN) .bss $< ENGLISH > $@ $(RAMSCRGEN) .bss $< ENGLISH > $@
asm/battle_anim_80A5C6C.s
+37 -37
View File
@@ -5,8 +5,8 @@
.text .text
thumb_func_start sub_80A5C6C thumb_func_start GetBankPosition
sub_80A5C6C: @ 80A5C6C GetBankPosition: @ 80A5C6C
push {r4,r5,lr} push {r4,r5,lr}
lsls r0, 24 lsls r0, 24
lsrs r5, r0, 24 lsrs r5, r0, 24
@@ -154,7 +154,7 @@ _080A5DB0:
pop {r4,r5} pop {r4,r5}
pop {r1} pop {r1}
bx r1 bx r1
thumb_func_end sub_80A5C6C thumb_func_end GetBankPosition
thumb_func_start sub_80A5DB8 thumb_func_start sub_80A5DB8
sub_80A5DB8: @ 80A5DB8 sub_80A5DB8: @ 80A5DB8
@@ -577,7 +577,7 @@ _080A611C:
_080A6126: _080A6126:
adds r0, r4, 0 adds r0, r4, 0
adds r1, r5, 0 adds r1, r5, 0
bl sub_80A5C6C bl GetBankPosition
_080A612E: _080A612E:
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
@@ -592,7 +592,7 @@ GetBankSpriteDefault_Y: @ 80A6138
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
movs r1, 0x4 movs r1, 0x4
bl sub_80A5C6C bl GetBankPosition
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
pop {r1} pop {r1}
@@ -611,7 +611,7 @@ GetSubstituteSpriteDefault_Y: @ 80A614C
beq _080A6170 beq _080A6170
adds r0, r4, 0 adds r0, r4, 0
movs r1, 0x1 movs r1, 0x1
bl sub_80A5C6C bl GetBankPosition
lsls r0, 24 lsls r0, 24
lsrs r0, 8 lsrs r0, 8
movs r1, 0x80 movs r1, 0x80
@@ -620,7 +620,7 @@ GetSubstituteSpriteDefault_Y: @ 80A614C
_080A6170: _080A6170:
adds r0, r4, 0 adds r0, r4, 0
movs r1, 0x1 movs r1, 0x1
bl sub_80A5C6C bl GetBankPosition
lsls r0, 24 lsls r0, 24
lsrs r0, 8 lsrs r0, 8
movs r1, 0x88 movs r1, 0x88
@@ -642,7 +642,7 @@ sub_80A6190: @ 80A6190
lsrs r5, r0, 24 lsrs r5, r0, 24
adds r0, r5, 0 adds r0, r5, 0
movs r1, 0x1 movs r1, 0x1
bl sub_80A5C6C bl GetBankPosition
lsls r0, 24 lsls r0, 24
lsrs r6, r0, 24 lsrs r6, r0, 24
bl IsContest bl IsContest
@@ -1245,13 +1245,13 @@ sub_80A65EC: @ 80A65EC
ldr r5, =gAnimBankTarget ldr r5, =gAnimBankTarget
ldrb r0, [r5] ldrb r0, [r5]
movs r1, 0x2 movs r1, 0x2
bl sub_80A5C6C bl GetBankPosition
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
strh r0, [r4, 0x32] strh r0, [r4, 0x32]
ldrb r0, [r5] ldrb r0, [r5]
movs r1, 0x3 movs r1, 0x3
bl sub_80A5C6C bl GetBankPosition
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
strh r0, [r4, 0x36] strh r0, [r4, 0x36]
@@ -1442,13 +1442,13 @@ sub_80A6760: @ 80A6760
ldr r5, =gAnimBankAttacker ldr r5, =gAnimBankAttacker
ldrb r0, [r5] ldrb r0, [r5]
movs r1, 0x2 movs r1, 0x2
bl sub_80A5C6C bl GetBankPosition
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
strh r0, [r4, 0x32] strh r0, [r4, 0x32]
ldrb r0, [r5] ldrb r0, [r5]
movs r1, 0x3 movs r1, 0x3
bl sub_80A5C6C bl GetBankPosition
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
strh r0, [r4, 0x36] strh r0, [r4, 0x36]
@@ -1550,13 +1550,13 @@ sub_80A6838: @ 80A6838
ldr r4, =gAnimBankAttacker ldr r4, =gAnimBankAttacker
ldrb r0, [r4] ldrb r0, [r4]
movs r1, 0x2 movs r1, 0x2
bl sub_80A5C6C bl GetBankPosition
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
strh r0, [r5, 0x20] strh r0, [r5, 0x20]
ldrb r0, [r4] ldrb r0, [r4]
movs r1, 0x3 movs r1, 0x3
bl sub_80A5C6C bl GetBankPosition
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
strh r0, [r5, 0x22] strh r0, [r5, 0x22]
@@ -1578,13 +1578,13 @@ sub_80A6864: @ 80A6864
ldr r7, =gAnimBankAttacker ldr r7, =gAnimBankAttacker
ldrb r0, [r7] ldrb r0, [r7]
movs r1, 0 movs r1, 0
bl sub_80A5C6C bl GetBankPosition
lsls r0, 24 lsls r0, 24
lsrs r6, r0, 24 lsrs r6, r0, 24
ldr r0, =gAnimBankTarget ldr r0, =gAnimBankTarget
ldrb r0, [r0] ldrb r0, [r0]
movs r1, 0 movs r1, 0
bl sub_80A5C6C bl GetBankPosition
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
cmp r6, r0 cmp r6, r0
@@ -1646,8 +1646,8 @@ sub_80A68D4: @ 80A68D4
bx r0 bx r0
thumb_func_end sub_80A68D4 thumb_func_end sub_80A68D4
thumb_func_start sub_80A6900 thumb_func_start AnimateBallThrow
sub_80A6900: @ 80A6900 AnimateBallThrow: @ 80A6900
push {r4,lr} push {r4,lr}
adds r4, r0, 0 adds r4, r0, 0
bl sub_80A6F3C bl sub_80A6F3C
@@ -1674,7 +1674,7 @@ _080A692E:
pop {r4} pop {r4}
pop {r1} pop {r1}
bx r1 bx r1
thumb_func_end sub_80A6900 thumb_func_end AnimateBallThrow
thumb_func_start sub_80A6934 thumb_func_start sub_80A6934
sub_80A6934: @ 80A6934 sub_80A6934: @ 80A6934
@@ -3685,7 +3685,7 @@ _080A785C:
ldr r4, =gAnimBankTarget ldr r4, =gAnimBankTarget
ldrb r0, [r4] ldrb r0, [r4]
movs r1, 0x2 movs r1, 0x2
bl sub_80A5C6C bl GetBankPosition
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
ldrh r1, [r6, 0x4] ldrh r1, [r6, 0x4]
@@ -3693,7 +3693,7 @@ _080A785C:
strh r0, [r5, 0x32] strh r0, [r5, 0x32]
ldrb r0, [r4] ldrb r0, [r4]
adds r1, r7, 0 adds r1, r7, 0
bl sub_80A5C6C bl GetBankPosition
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
ldrh r6, [r6, 0x6] ldrh r6, [r6, 0x6]
@@ -3733,7 +3733,7 @@ _080A78CC:
ldr r5, =gAnimBankTarget ldr r5, =gAnimBankTarget
ldrb r0, [r5] ldrb r0, [r5]
movs r1, 0x2 movs r1, 0x2
bl sub_80A5C6C bl GetBankPosition
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
ldrh r1, [r4, 0x4] ldrh r1, [r4, 0x4]
@@ -3741,7 +3741,7 @@ _080A78CC:
strh r0, [r6, 0x32] strh r0, [r6, 0x32]
ldrb r0, [r5] ldrb r0, [r5]
movs r1, 0x3 movs r1, 0x3
bl sub_80A5C6C bl GetBankPosition
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
ldrh r1, [r4, 0x6] ldrh r1, [r4, 0x6]
@@ -3763,7 +3763,7 @@ _080A78CC:
sub_80A791C: @ 80A791C sub_80A791C: @ 80A791C
push {r4,lr} push {r4,lr}
adds r4, r0, 0 adds r4, r0, 0
bl sub_80A6900 bl AnimateBallThrow
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _080A7930 beq _080A7930
@@ -3828,7 +3828,7 @@ _080A798E:
strh r0, [r5, 0x2E] strh r0, [r5, 0x2E]
adds r0, r6, 0 adds r0, r6, 0
movs r1, 0x2 movs r1, 0x2
bl sub_80A5C6C bl GetBankPosition
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
ldrh r2, [r4, 0x4] ldrh r2, [r4, 0x4]
@@ -3836,7 +3836,7 @@ _080A798E:
strh r0, [r5, 0x32] strh r0, [r5, 0x32]
adds r0, r6, 0 adds r0, r6, 0
adds r1, r7, 0 adds r1, r7, 0
bl sub_80A5C6C bl GetBankPosition
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
ldrh r4, [r4, 0x6] ldrh r4, [r4, 0x6]
@@ -5713,7 +5713,7 @@ _080A88A6:
_080A88AE: _080A88AE:
mov r0, r8 mov r0, r8
movs r1, 0x2 movs r1, 0x2
bl sub_80A5C6C bl GetBankPosition
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
ldrb r1, [r4] ldrb r1, [r4]
@@ -5722,7 +5722,7 @@ _080A88AE:
_080A88C0: _080A88C0:
mov r0, r8 mov r0, r8
movs r1, 0x2 movs r1, 0x2
bl sub_80A5C6C bl GetBankPosition
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
ldrb r1, [r4] ldrb r1, [r4]
@@ -5731,7 +5731,7 @@ _080A88C0:
_080A88D2: _080A88D2:
mov r0, r8 mov r0, r8
movs r1, 0x3 movs r1, 0x3
bl sub_80A5C6C bl GetBankPosition
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
ldrb r2, [r4] ldrb r2, [r4]
@@ -5744,7 +5744,7 @@ _080A88E4:
_080A88EA: _080A88EA:
mov r0, r8 mov r0, r8
movs r1, 0x3 movs r1, 0x3
bl sub_80A5C6C bl GetBankPosition
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
ldrb r2, [r4] ldrb r2, [r4]
@@ -5757,7 +5757,7 @@ _080A88FC:
_080A8902: _080A8902:
mov r0, r8 mov r0, r8
movs r1, 0x1 movs r1, 0x1
bl sub_80A5C6C bl GetBankPosition
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
adds r0, 0x1F adds r0, 0x1F
@@ -5798,13 +5798,13 @@ _080A8942:
_080A8946: _080A8946:
adds r0, r4, 0 adds r0, r4, 0
adds r1, r5, 0 adds r1, r5, 0
bl sub_80A5C6C bl GetBankPosition
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
mov r8, r0 mov r8, r0
adds r0, r4, 0 adds r0, r4, 0
adds r1, r6, 0 adds r1, r6, 0
bl sub_80A5C6C bl GetBankPosition
lsls r0, 24 lsls r0, 24
lsrs r7, r0, 24 lsrs r7, r0, 24
bl IsDoubleBattle bl IsDoubleBattle
@@ -5819,12 +5819,12 @@ _080A8946:
eors r4, r0 eors r4, r0
adds r0, r4, 0 adds r0, r4, 0
adds r1, r5, 0 adds r1, r5, 0
bl sub_80A5C6C bl GetBankPosition
lsls r0, 24 lsls r0, 24
lsrs r5, r0, 24 lsrs r5, r0, 24
adds r0, r4, 0 adds r0, r4, 0
adds r1, r6, 0 adds r1, r6, 0
bl sub_80A5C6C bl GetBankPosition
lsls r0, 24 lsls r0, 24
lsrs r3, r0, 24 lsrs r3, r0, 24
mov r0, r8 mov r0, r8
@@ -6392,13 +6392,13 @@ sub_80A8E30: @ 80A8E30
ldr r4, =gAnimBankAttacker ldr r4, =gAnimBankAttacker
ldrb r0, [r4] ldrb r0, [r4]
movs r1, 0x2 movs r1, 0x2
bl sub_80A5C6C bl GetBankPosition
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
strh r0, [r5, 0x20] strh r0, [r5, 0x20]
ldrb r0, [r4] ldrb r0, [r4]
movs r1, 0x3 movs r1, 0x3
bl sub_80A5C6C bl GetBankPosition
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
strh r0, [r5, 0x22] strh r0, [r5, 0x22]
asm/battle_anim_80A9C70.s
+2 -2
View File
@@ -334,7 +334,7 @@ sub_80A9EF4: @ 80A9EF4
ldr r4, =gAnimBankTarget ldr r4, =gAnimBankTarget
ldrb r0, [r4] ldrb r0, [r4]
movs r1, 0x2 movs r1, 0x2
bl sub_80A5C6C bl GetBankPosition
lsls r0, 24 lsls r0, 24
lsrs r0, 8 lsrs r0, 8
ldr r1, =0xffe00000 ldr r1, =0xffe00000
@@ -342,7 +342,7 @@ sub_80A9EF4: @ 80A9EF4
lsrs r5, r0, 16 lsrs r5, r0, 16
ldrb r0, [r4] ldrb r0, [r4]
movs r1, 0x3 movs r1, 0x3
bl sub_80A5C6C bl GetBankPosition
lsls r0, 24 lsls r0, 24
lsrs r0, 8 lsrs r0, 8
ldr r1, =0xffdc0000 ldr r1, =0xffdc0000
asm/battle_anim_80FE840.s
+360 -360
View File
File diff suppressed because it is too large Load Diff
asm/battle_anim_815A0D4.s
+59 -59
View File
@@ -90,7 +90,7 @@ sub_815A160: @ 815A160
ldr r6, =gAnimBankTarget ldr r6, =gAnimBankTarget
ldrb r0, [r6] ldrb r0, [r6]
movs r1, 0x2 movs r1, 0x2
bl sub_80A5C6C bl GetBankPosition
adds r4, r0, 0 adds r4, r0, 0
lsls r4, 24 lsls r4, 24
lsrs r4, 8 lsrs r4, 8
@@ -100,7 +100,7 @@ sub_815A160: @ 815A160
asrs r4, 16 asrs r4, 16
ldrb r0, [r6] ldrb r0, [r6]
movs r1, 0x3 movs r1, 0x3
bl sub_80A5C6C bl GetBankPosition
adds r1, r0, 0 adds r1, r0, 0
lsls r1, 24 lsls r1, 24
lsrs r1, 8 lsrs r1, 8
@@ -210,13 +210,13 @@ sub_815A254: @ 815A254
ldr r4, =gAnimBankTarget ldr r4, =gAnimBankTarget
ldrb r0, [r4] ldrb r0, [r4]
movs r1, 0x2 movs r1, 0x2
bl sub_80A5C6C bl GetBankPosition
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
adds r7, r0, 0 adds r7, r0, 0
ldrb r0, [r4] ldrb r0, [r4]
movs r1, 0x3 movs r1, 0x3
bl sub_80A5C6C bl GetBankPosition
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
adds r6, r0, 0 adds r6, r0, 0
@@ -816,7 +816,7 @@ _0815A6F8:
sub_815A73C: @ 815A73C sub_815A73C: @ 815A73C
push {r4,lr} push {r4,lr}
adds r4, r0, 0 adds r4, r0, 0
bl sub_80A6900 bl AnimateBallThrow
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _0815A75E beq _0815A75E
@@ -1254,13 +1254,13 @@ sub_815AAA4: @ 815AAA4
ldr r4, =gAnimBankAttacker ldr r4, =gAnimBankAttacker
ldrb r0, [r4] ldrb r0, [r4]
movs r1, 0 movs r1, 0
bl sub_80A5C6C bl GetBankPosition
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
strh r0, [r5, 0x20] strh r0, [r5, 0x20]
ldrb r0, [r4] ldrb r0, [r4]
movs r1, 0x1 movs r1, 0x1
bl sub_80A5C6C bl GetBankPosition
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
strh r0, [r5, 0x22] strh r0, [r5, 0x22]
@@ -1510,7 +1510,7 @@ _0815ACEC:
_0815ACEE: _0815ACEE:
ldrb r0, [r4] ldrb r0, [r4]
movs r1, 0 movs r1, 0
bl sub_80A5C6C bl GetBankPosition
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
ldrh r6, [r6, 0x2] ldrh r6, [r6, 0x2]
@@ -1518,7 +1518,7 @@ _0815ACEE:
strh r0, [r5, 0x20] strh r0, [r5, 0x20]
ldrb r0, [r4] ldrb r0, [r4]
movs r1, 0x1 movs r1, 0x1
bl sub_80A5C6C bl GetBankPosition
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
strh r0, [r5, 0x22] strh r0, [r5, 0x22]
@@ -1906,13 +1906,13 @@ sub_815AFF0: @ 815AFF0
ldr r6, =gAnimBankAttacker ldr r6, =gAnimBankAttacker
ldrb r0, [r6] ldrb r0, [r6]
movs r1, 0x2 movs r1, 0x2
bl sub_80A5C6C bl GetBankPosition
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
strh r0, [r4, 0xC] strh r0, [r4, 0xC]
ldrb r0, [r6] ldrb r0, [r6]
movs r1, 0x3 movs r1, 0x3
bl sub_80A5C6C bl GetBankPosition
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
strh r0, [r4, 0xE] strh r0, [r4, 0xE]
@@ -2281,13 +2281,13 @@ _0815B2D8:
ldr r4, =gAnimBankTarget ldr r4, =gAnimBankTarget
ldrb r0, [r4] ldrb r0, [r4]
movs r1, 0x2 movs r1, 0x2
bl sub_80A5C6C bl GetBankPosition
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
strh r0, [r5, 0x32] strh r0, [r5, 0x32]
ldrb r0, [r4] ldrb r0, [r4]
movs r1, 0x3 movs r1, 0x3
bl sub_80A5C6C bl GetBankPosition
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
strh r0, [r5, 0x36] strh r0, [r5, 0x36]
@@ -2373,13 +2373,13 @@ _0815B3BE:
ldr r4, =gAnimBankAttacker ldr r4, =gAnimBankAttacker
ldrb r0, [r4] ldrb r0, [r4]
movs r1, 0x2 movs r1, 0x2
bl sub_80A5C6C bl GetBankPosition
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
strh r0, [r5, 0x20] strh r0, [r5, 0x20]
ldrb r0, [r4] ldrb r0, [r4]
movs r1, 0x3 movs r1, 0x3
bl sub_80A5C6C bl GetBankPosition
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
strh r0, [r5, 0x22] strh r0, [r5, 0x22]
@@ -2817,7 +2817,7 @@ _0815B71E:
ldr r0, =gAnimBankAttacker ldr r0, =gAnimBankAttacker
ldrb r0, [r0] ldrb r0, [r0]
movs r1, 0x3 movs r1, 0x3
bl sub_80A5C6C bl GetBankPosition
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
strh r0, [r4, 0x32] strh r0, [r4, 0x32]
@@ -3624,14 +3624,14 @@ _0815BE2E:
ldr r4, =gAnimBankAttacker ldr r4, =gAnimBankAttacker
ldrb r0, [r4] ldrb r0, [r4]
movs r1, 0 movs r1, 0
bl sub_80A5C6C bl GetBankPosition
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
adds r0, r5 adds r0, r5
strh r0, [r7, 0x20] strh r0, [r7, 0x20]
ldrb r0, [r4] ldrb r0, [r4]
movs r1, 0x1 movs r1, 0x1
bl sub_80A5C6C bl GetBankPosition
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
adds r0, 0x20 adds r0, 0x20
@@ -4994,13 +4994,13 @@ sub_815C95C: @ 815C95C
ldr r4, =gAnimBankAttacker ldr r4, =gAnimBankAttacker
ldrb r0, [r4] ldrb r0, [r4]
movs r1, 0x2 movs r1, 0x2
bl sub_80A5C6C bl GetBankPosition
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
strh r0, [r5, 0x20] strh r0, [r5, 0x20]
ldrb r0, [r4] ldrb r0, [r4]
movs r1, 0x3 movs r1, 0x3
bl sub_80A5C6C bl GetBankPosition
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
strh r0, [r5, 0x22] strh r0, [r5, 0x22]
@@ -5531,13 +5531,13 @@ sub_815CDB4: @ 815CDB4
ldr r5, =gAnimBankAttacker ldr r5, =gAnimBankAttacker
ldrb r0, [r5] ldrb r0, [r5]
movs r1, 0x2 movs r1, 0x2
bl sub_80A5C6C bl GetBankPosition
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
strh r0, [r4, 0x20] strh r0, [r4, 0x20]
ldrb r0, [r5] ldrb r0, [r5]
movs r1, 0x3 movs r1, 0x3
bl sub_80A5C6C bl GetBankPosition
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
strh r0, [r4, 0x22] strh r0, [r4, 0x22]
@@ -5842,13 +5842,13 @@ _0815D05A:
ldr r5, =gAnimBankAttacker ldr r5, =gAnimBankAttacker
ldrb r0, [r5] ldrb r0, [r5]
movs r1, 0 movs r1, 0
bl sub_80A5C6C bl GetBankPosition
adds r4, r0, 0 adds r4, r0, 0
lsls r4, 24 lsls r4, 24
lsrs r4, 24 lsrs r4, 24
ldrb r0, [r5] ldrb r0, [r5]
movs r1, 0x1 movs r1, 0x1
bl sub_80A5C6C bl GetBankPosition
lsls r0, 24 lsls r0, 24
mov r2, r10 mov r2, r10
lsls r1, r2, 16 lsls r1, r2, 16
@@ -6840,7 +6840,7 @@ _0815D896:
ldr r4, =gAnimBankAttacker ldr r4, =gAnimBankAttacker
ldrb r0, [r4] ldrb r0, [r4]
movs r1, 0x2 movs r1, 0x2
bl sub_80A5C6C bl GetBankPosition
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
ldrh r1, [r6, 0x2] ldrh r1, [r6, 0x2]
@@ -6848,7 +6848,7 @@ _0815D896:
strh r0, [r5, 0x20] strh r0, [r5, 0x20]
ldrb r0, [r4] ldrb r0, [r4]
movs r1, 0x3 movs r1, 0x3
bl sub_80A5C6C bl GetBankPosition
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
ldrh r6, [r6, 0x4] ldrh r6, [r6, 0x4]
@@ -7382,13 +7382,13 @@ _0815DCEA:
ldrb r4, [r0] ldrb r4, [r0]
adds r0, r4, 0 adds r0, r4, 0
movs r1, 0 movs r1, 0
bl sub_80A5C6C bl GetBankPosition
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
strh r0, [r5, 0x10] strh r0, [r5, 0x10]
adds r0, r4, 0 adds r0, r4, 0
movs r1, 0x1 movs r1, 0x1
bl sub_80A5C6C bl GetBankPosition
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
strh r0, [r5, 0x12] strh r0, [r5, 0x12]
@@ -7789,7 +7789,7 @@ sub_815E01C: @ 815E01C
_0815E038: _0815E038:
ldrb r0, [r6] ldrb r0, [r6]
movs r1, 0 movs r1, 0
bl sub_80A5C6C bl GetBankPosition
lsls r0, 24 lsls r0, 24
ldr r4, =gBattleAnimArgs ldr r4, =gBattleAnimArgs
lsrs r0, 24 lsrs r0, 24
@@ -7798,7 +7798,7 @@ _0815E038:
strh r0, [r5, 0x20] strh r0, [r5, 0x20]
ldrb r0, [r6] ldrb r0, [r6]
movs r1, 0x1 movs r1, 0x1
bl sub_80A5C6C bl GetBankPosition
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
ldrh r1, [r4, 0x2] ldrh r1, [r4, 0x2]
@@ -7931,7 +7931,7 @@ _0815E14E:
bne _0815E188 bne _0815E188
ldrb r0, [r5] ldrb r0, [r5]
movs r1, 0x2 movs r1, 0x2
bl sub_80A5C6C bl GetBankPosition
adds r4, r0, 0 adds r4, r0, 0
ldrb r0, [r5] ldrb r0, [r5]
movs r1, 0 movs r1, 0
@@ -7951,7 +7951,7 @@ _0815E17C:
_0815E188: _0815E188:
ldrb r0, [r5] ldrb r0, [r5]
movs r1, 0x2 movs r1, 0x2
bl sub_80A5C6C bl GetBankPosition
adds r4, r0, 0 adds r4, r0, 0
ldrb r0, [r5] ldrb r0, [r5]
movs r1, 0 movs r1, 0
@@ -7971,7 +7971,7 @@ _0815E1AC:
ldr r5, =gAnimBankAttacker ldr r5, =gAnimBankAttacker
ldrb r0, [r5] ldrb r0, [r5]
movs r1, 0x3 movs r1, 0x3
bl sub_80A5C6C bl GetBankPosition
adds r4, r0, 0 adds r4, r0, 0
ldrb r0, [r5] ldrb r0, [r5]
movs r1, 0 movs r1, 0
@@ -7990,13 +7990,13 @@ _0815E1D0:
ldr r4, =gAnimBankTarget ldr r4, =gAnimBankTarget
ldrb r0, [r4] ldrb r0, [r4]
movs r1, 0x2 movs r1, 0x2
bl sub_80A5C6C bl GetBankPosition
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
strh r0, [r6, 0x22] strh r0, [r6, 0x22]
ldrb r0, [r4] ldrb r0, [r4]
movs r1, 0x3 movs r1, 0x3
bl sub_80A5C6C bl GetBankPosition
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
strh r0, [r6, 0x24] strh r0, [r6, 0x24]
@@ -8349,14 +8349,14 @@ sub_815E47C: @ 815E47C
mov r10, r0 mov r10, r0
ldrb r0, [r0] ldrb r0, [r0]
movs r1, 0x2 movs r1, 0x2
bl sub_80A5C6C bl GetBankPosition
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
strh r0, [r7, 0x1E] strh r0, [r7, 0x1E]
mov r1, r10 mov r1, r10
ldrb r0, [r1] ldrb r0, [r1]
movs r1, 0x3 movs r1, 0x3
bl sub_80A5C6C bl GetBankPosition
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
strh r0, [r7, 0x20] strh r0, [r7, 0x20]
@@ -8364,14 +8364,14 @@ sub_815E47C: @ 815E47C
mov r8, r0 mov r8, r0
ldrb r0, [r0] ldrb r0, [r0]
movs r1, 0x2 movs r1, 0x2
bl sub_80A5C6C bl GetBankPosition
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
strh r0, [r7, 0x22] strh r0, [r7, 0x22]
mov r1, r8 mov r1, r8
ldrb r0, [r1] ldrb r0, [r1]
movs r1, 0x3 movs r1, 0x3
bl sub_80A5C6C bl GetBankPosition
adds r4, r0, 0 adds r4, r0, 0
mov r1, r8 mov r1, r8
ldrb r0, [r1] ldrb r0, [r1]
@@ -8524,7 +8524,7 @@ _0815E5FE:
lsls r0, 2 lsls r0, 2
ldr r1, =gSprites ldr r1, =gSprites
adds r0, r1 adds r0, r1
bl sub_80A6900 bl AnimateBallThrow
ldrh r0, [r4, 0xC] ldrh r0, [r4, 0xC]
adds r0, 0x1 adds r0, 0x1
strh r0, [r4, 0xC] strh r0, [r4, 0xC]
@@ -8542,7 +8542,7 @@ _0815E634:
lsls r0, 2 lsls r0, 2
ldr r1, =gSprites ldr r1, =gSprites
adds r0, r1 adds r0, r1
bl sub_80A6900 bl AnimateBallThrow
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _0815E6D2 beq _0815E6D2
@@ -8659,7 +8659,7 @@ _0815E724:
strh r1, [r4, 0x3C] strh r1, [r4, 0x3C]
adds r0, r5, 0 adds r0, r5, 0
movs r1, 0x3 movs r1, 0x3
bl sub_80A5C6C bl GetBankPosition
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
strh r0, [r4, 0x22] strh r0, [r4, 0x22]
@@ -8950,7 +8950,7 @@ _0815E970:
_0815E972: _0815E972:
ldrb r0, [r4] ldrb r0, [r4]
movs r1, 0x2 movs r1, 0x2
bl sub_80A5C6C bl GetBankPosition
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
strh r0, [r5, 0x20] strh r0, [r5, 0x20]
@@ -9342,7 +9342,7 @@ sub_815EC48: @ 815EC48
ldr r5, =gAnimBankAttacker ldr r5, =gAnimBankAttacker
ldrb r0, [r5] ldrb r0, [r5]
movs r1, 0 movs r1, 0
bl sub_80A5C6C bl GetBankPosition
adds r4, r0, 0 adds r4, r0, 0
lsls r4, 24 lsls r4, 24
lsrs r4, 24 lsrs r4, 24
@@ -9350,7 +9350,7 @@ sub_815EC48: @ 815EC48
movs r0, 0x2 movs r0, 0x2
eors r0, r1 eors r0, r1
movs r1, 0 movs r1, 0
bl sub_80A5C6C bl GetBankPosition
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
cmp r4, r0 cmp r4, r0
@@ -9771,14 +9771,14 @@ _0815EFEC:
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
movs r1, 0x2 movs r1, 0x2
bl sub_80A5C6C bl GetBankPosition
lsls r0, 24 lsls r0, 24
lsrs r5, r0, 24 lsrs r5, r0, 24
ldrh r0, [r4, 0x3C] ldrh r0, [r4, 0x3C]
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
movs r1, 0x3 movs r1, 0x3
bl sub_80A5C6C bl GetBankPosition
lsls r0, 24 lsls r0, 24
lsrs r1, r0, 24 lsrs r1, r0, 24
_0815F00C: _0815F00C:
@@ -9994,10 +9994,10 @@ sub_815F18C: @ 815F18C
ldr r4, =gAnimBankTarget ldr r4, =gAnimBankTarget
ldrb r0, [r4] ldrb r0, [r4]
movs r1, 0x2 movs r1, 0x2
bl sub_80A5C6C bl GetBankPosition
ldrb r0, [r4] ldrb r0, [r4]
movs r1, 0x3 movs r1, 0x3
bl sub_80A5C6C bl GetBankPosition
ldrb r0, [r4] ldrb r0, [r4]
bl GetBankSide bl GetBankSide
lsls r0, 24 lsls r0, 24
@@ -10387,7 +10387,7 @@ _0815F4C8:
ldr r0, =gAnimBankTarget ldr r0, =gAnimBankTarget
ldrb r0, [r0] ldrb r0, [r0]
movs r1, 0x3 movs r1, 0x3
bl sub_80A5C6C bl GetBankPosition
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
strh r0, [r5, 0x22] strh r0, [r5, 0x22]
@@ -11180,7 +11180,7 @@ _0815FB50:
ldr r0, =gAnimBankTarget ldr r0, =gAnimBankTarget
ldrb r0, [r0] ldrb r0, [r0]
movs r1, 0x1 movs r1, 0x1
bl sub_80A5C6C bl GetBankPosition
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
lsls r3, r5, 16 lsls r3, r5, 16
@@ -11318,7 +11318,7 @@ _0815FC56:
ldr r0, =gAnimBankTarget ldr r0, =gAnimBankTarget
ldrb r0, [r0] ldrb r0, [r0]
movs r1, 0 movs r1, 0
bl sub_80A5C6C bl GetBankPosition
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
cmp r4, r0 cmp r4, r0
@@ -11331,7 +11331,7 @@ _0815FCB4:
ldr r0, =gAnimBankTarget ldr r0, =gAnimBankTarget
ldrb r0, [r0] ldrb r0, [r0]
movs r1, 0 movs r1, 0
bl sub_80A5C6C bl GetBankPosition
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
cmp r4, r0 cmp r4, r0
@@ -11469,7 +11469,7 @@ _0815FD8C:
mov r1, r10 mov r1, r10
ldrb r0, [r1] ldrb r0, [r1]
movs r1, 0 movs r1, 0
bl sub_80A5C6C bl GetBankPosition
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
adds r3, r5, 0 adds r3, r5, 0
@@ -11499,7 +11499,7 @@ _0815FE0C:
mov r2, r10 mov r2, r10
ldrb r0, [r2] ldrb r0, [r2]
movs r1, 0 movs r1, 0
bl sub_80A5C6C bl GetBankPosition
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
adds r3, r5, 0 adds r3, r5, 0
@@ -11566,7 +11566,7 @@ _0815FE92:
ldr r0, =gAnimBankTarget ldr r0, =gAnimBankTarget
ldrb r0, [r0] ldrb r0, [r0]
movs r1, 0x1 movs r1, 0x1
bl sub_80A5C6C bl GetBankPosition
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
adds r0, 0x10 adds r0, 0x10
@@ -11724,14 +11724,14 @@ _08160008:
ldr r0, =gAnimBankAttacker ldr r0, =gAnimBankAttacker
ldrb r0, [r0] ldrb r0, [r0]
movs r1, 0 movs r1, 0
bl sub_80A5C6C bl GetBankPosition
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
adds r5, r0, 0 adds r5, r0, 0
ldr r0, =gAnimBankTarget ldr r0, =gAnimBankTarget
ldrb r0, [r0] ldrb r0, [r0]
movs r1, 0 movs r1, 0
bl sub_80A5C6C bl GetBankPosition
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
adds r2, r0, 0 adds r2, r0, 0
@@ -12169,7 +12169,7 @@ sub_81603A8: @ 81603A8
ldr r4, =gAnimBankAttacker ldr r4, =gAnimBankAttacker
ldrb r0, [r4] ldrb r0, [r4]
movs r1, 0x2 movs r1, 0x2
bl sub_80A5C6C bl GetBankPosition
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
strh r0, [r5, 0x20] strh r0, [r5, 0x20]
asm/battle_anim_8170478.s
+39 -39
View File
@@ -886,7 +886,7 @@ _08170C08:
bl GetMonData bl GetMonData
lsls r0, 16 lsls r0, 16
lsrs r0, 16 lsrs r0, 16
bl ball_number_to_ball_processing_index bl ItemIdToBallId
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
mov r8, r0 mov r8, r0
@@ -907,13 +907,13 @@ _08170C44:
ldr r5, =gAnimBankAttacker ldr r5, =gAnimBankAttacker
ldrb r0, [r5] ldrb r0, [r5]
movs r1, 0 movs r1, 0
bl sub_80A5C6C bl GetBankPosition
adds r4, r0, 0 adds r4, r0, 0
lsls r4, 24 lsls r4, 24
lsrs r4, 24 lsrs r4, 24
ldrb r0, [r5] ldrb r0, [r5]
movs r1, 0x1 movs r1, 0x1
bl sub_80A5C6C bl GetBankPosition
adds r1, r0, 0 adds r1, r0, 0
lsls r1, 24 lsls r1, 24
ldr r2, =gSprites ldr r2, =gSprites
@@ -934,7 +934,7 @@ _08170C44:
mov r0, r8 mov r0, r8
str r0, [sp] str r0, [sp]
adds r0, r4, 0 adds r0, r4, 0
bl sub_8171D98 bl LaunchBallStarsTask
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
strh r0, [r6, 0x1C] strh r0, [r6, 0x1C]
@@ -950,7 +950,7 @@ _08170C44:
ldrb r1, [r5] ldrb r1, [r5]
movs r0, 0 movs r0, 0
mov r3, r8 mov r3, r8
bl sub_81729E8 bl LaunchBallFadeMonTask
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
strh r0, [r6, 0x1E] strh r0, [r6, 0x1E]
@@ -998,10 +998,10 @@ sub_8170CFC: @ 8170CFC
lsrs r4, 24 lsrs r4, 24
ldr r0, =gLastUsedItem ldr r0, =gLastUsedItem
ldrh r0, [r0] ldrh r0, [r0]
bl ball_number_to_ball_processing_index bl ItemIdToBallId
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
bl sub_8076A78 bl LoadBallGfx
adds r0, r4, 0 adds r0, r4, 0
bl DestroyAnimVisualTask bl DestroyAnimVisualTask
pop {r4} pop {r4}
@@ -1018,10 +1018,10 @@ sub_8170D24: @ 8170D24
lsrs r4, 24 lsrs r4, 24
ldr r0, =gLastUsedItem ldr r0, =gLastUsedItem
ldrh r0, [r0] ldrh r0, [r0]
bl ball_number_to_ball_processing_index bl ItemIdToBallId
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
bl sub_8076AE8 bl FreeBallGfx
adds r0, r4, 0 adds r0, r4, 0
bl DestroyAnimVisualTask bl DestroyAnimVisualTask
pop {r4} pop {r4}
@@ -1057,8 +1057,8 @@ _08170D74:
.pool .pool
thumb_func_end sub_8170D4C thumb_func_end sub_8170D4C
thumb_func_start ball_number_to_ball_processing_index thumb_func_start ItemIdToBallId
ball_number_to_ball_processing_index: @ 8170D84 ItemIdToBallId: @ 8170D84
push {lr} push {lr}
lsls r0, 16 lsls r0, 16
lsrs r0, 16 lsrs r0, 16
@@ -1123,7 +1123,7 @@ _08170DFC:
_08170DFE: _08170DFE:
pop {r1} pop {r1}
bx r1 bx r1
thumb_func_end ball_number_to_ball_processing_index thumb_func_end ItemIdToBallId
thumb_func_start sub_8170E04 thumb_func_start sub_8170E04
sub_8170E04: @ 8170E04 sub_8170E04: @ 8170E04
@@ -1138,14 +1138,14 @@ sub_8170E04: @ 8170E04
mov r10, r0 mov r10, r0
ldr r0, =gLastUsedItem ldr r0, =gLastUsedItem
ldrh r0, [r0] ldrh r0, [r0]
bl ball_number_to_ball_processing_index bl ItemIdToBallId
adds r1, r0, 0 adds r1, r0, 0
lsls r1, 24 lsls r1, 24
lsrs r1, 24 lsrs r1, 24
lsls r0, r1, 1 lsls r0, r1, 1
adds r0, r1 adds r0, r1
lsls r0, 3 lsls r0, 3
ldr r1, =gUnknown_0832C588 ldr r1, =gBallSpriteTemplates
adds r0, r1 adds r0, r1
movs r1, 0x20 movs r1, 0x20
movs r2, 0x50 movs r2, 0x50
@@ -1166,14 +1166,14 @@ sub_8170E04: @ 8170E04
mov r8, r2 mov r8, r2
ldrb r0, [r2] ldrb r0, [r2]
movs r1, 0 movs r1, 0
bl sub_80A5C6C bl GetBankPosition
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
strh r0, [r6, 0x30] strh r0, [r6, 0x30]
mov r1, r8 mov r1, r8
ldrb r0, [r1] ldrb r0, [r1]
movs r1, 0x1 movs r1, 0x1
bl sub_80A5C6C bl GetBankPosition
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
subs r0, 0x10 subs r0, 0x10
@@ -1278,7 +1278,7 @@ _08170F50:
_08170F54: _08170F54:
ldr r0, =gLastUsedItem ldr r0, =gLastUsedItem
ldrh r0, [r0] ldrh r0, [r0]
bl ball_number_to_ball_processing_index bl ItemIdToBallId
adds r4, r0, 0 adds r4, r0, 0
lsls r4, 24 lsls r4, 24
lsrs r4, 24 lsrs r4, 24
@@ -1294,7 +1294,7 @@ _08170F54:
lsls r0, r4, 1 lsls r0, r4, 1
adds r0, r4 adds r0, r4
lsls r0, 3 lsls r0, 3
ldr r1, =gUnknown_0832C588 ldr r1, =gBallSpriteTemplates
adds r0, r1 adds r0, r1
adds r1, r6, 0 adds r1, r6, 0
adds r1, 0x20 adds r1, 0x20
@@ -1317,14 +1317,14 @@ _08170F54:
mov r8, r1 mov r8, r1
ldrb r0, [r1] ldrb r0, [r1]
movs r1, 0 movs r1, 0
bl sub_80A5C6C bl GetBankPosition
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
strh r0, [r6, 0x30] strh r0, [r6, 0x30]
mov r1, r8 mov r1, r8
ldrb r0, [r1] ldrb r0, [r1]
movs r1, 0x1 movs r1, 0x1
bl sub_80A5C6C bl GetBankPosition
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
subs r0, 0x10 subs r0, 0x10
@@ -1487,7 +1487,7 @@ sub_8171134: @ 8171134
push {r4,r5,lr} push {r4,r5,lr}
sub sp, 0x4 sub sp, 0x4
adds r4, r0, 0 adds r4, r0, 0
bl sub_80A6900 bl AnimateBallThrow
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _081711D2 beq _081711D2
@@ -1532,7 +1532,7 @@ _08171188:
str r0, [r4, 0x1C] str r0, [r4, 0x1C]
ldr r0, =gLastUsedItem ldr r0, =gLastUsedItem
ldrh r0, [r0] ldrh r0, [r0]
bl ball_number_to_ball_processing_index bl ItemIdToBallId
lsls r0, 24 lsls r0, 24
lsrs r5, r0, 24 lsrs r5, r0, 24
cmp r5, 0xB cmp r5, 0xB
@@ -1549,13 +1549,13 @@ _08171188:
str r5, [sp] str r5, [sp]
movs r2, 0x1 movs r2, 0x1
movs r3, 0x1C movs r3, 0x1C
bl sub_8171D98 bl LaunchBallStarsTask
ldr r0, =gAnimBankTarget ldr r0, =gAnimBankTarget
ldrb r1, [r0] ldrb r1, [r0]
movs r0, 0 movs r0, 0
movs r2, 0xE movs r2, 0xE
adds r3, r5, 0 adds r3, r5, 0
bl sub_81729E8 bl LaunchBallFadeMonTask
_081711D2: _081711D2:
add sp, 0x4 add sp, 0x4
pop {r4,r5} pop {r4,r5}
@@ -2671,7 +2671,7 @@ sub_8171AAC: @ 8171AAC
orrs r0, r1 orrs r0, r1
strb r0, [r3] strb r0, [r3]
adds r0, r4, 0 adds r0, r4, 0
bl sub_80A6900 bl AnimateBallThrow
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _08171ADC beq _08171ADC
@@ -2697,7 +2697,7 @@ sub_8171AE4: @ 8171AE4
str r0, [r4, 0x1C] str r0, [r4, 0x1C]
ldr r0, =gLastUsedItem ldr r0, =gLastUsedItem
ldrh r0, [r0] ldrh r0, [r0]
bl ball_number_to_ball_processing_index bl ItemIdToBallId
lsls r0, 24 lsls r0, 24
lsrs r5, r0, 24 lsrs r5, r0, 24
cmp r5, 0xB cmp r5, 0xB
@@ -2714,13 +2714,13 @@ sub_8171AE4: @ 8171AE4
str r5, [sp] str r5, [sp]
movs r2, 0x1 movs r2, 0x1
movs r3, 0x1C movs r3, 0x1C
bl sub_8171D98 bl LaunchBallStarsTask
ldr r0, =gAnimBankTarget ldr r0, =gAnimBankTarget
ldrb r1, [r0] ldrb r1, [r0]
movs r0, 0x1 movs r0, 0x1
movs r2, 0xE movs r2, 0xE
adds r3, r5, 0 adds r3, r5, 0
bl sub_81729E8 bl LaunchBallFadeMonTask
_08171B36: _08171B36:
ldr r6, =gSprites ldr r6, =gSprites
ldr r5, =gBankSpriteIds ldr r5, =gBankSpriteIds
@@ -3007,8 +3007,8 @@ _08171D86:
.pool .pool
thumb_func_end sub_8171D60 thumb_func_end sub_8171D60
thumb_func_start sub_8171D98 thumb_func_start LaunchBallStarsTask
sub_8171D98: @ 8171D98 LaunchBallStarsTask: @ 8171D98
push {r4-r6,lr} push {r4-r6,lr}
mov r6, r10 mov r6, r10
mov r5, r9 mov r5, r9
@@ -3070,7 +3070,7 @@ sub_8171D98: @ 8171D98
pop {r1} pop {r1}
bx r1 bx r1
.pool .pool
thumb_func_end sub_8171D98 thumb_func_end LaunchBallStarsTask
thumb_func_start sub_8171E20 thumb_func_start sub_8171E20
sub_8171E20: @ 8171E20 sub_8171E20: @ 8171E20
@@ -4476,8 +4476,8 @@ _081729E2:
bx r0 bx r0
thumb_func_end sub_8172944 thumb_func_end sub_8172944
thumb_func_start sub_81729E8 thumb_func_start LaunchBallFadeMonTask
sub_81729E8: @ 81729E8 LaunchBallFadeMonTask: @ 81729E8
push {r4-r7,lr} push {r4-r7,lr}
mov r7, r9 mov r7, r9
mov r6, r8 mov r6, r8
@@ -4563,7 +4563,7 @@ _08172A7E:
pop {r1} pop {r1}
bx r1 bx r1
.pool .pool
thumb_func_end sub_81729E8 thumb_func_end LaunchBallFadeMonTask
thumb_func_start sub_8172AB0 thumb_func_start sub_8172AB0
sub_8172AB0: @ 8172AB0 sub_8172AB0: @ 8172AB0
@@ -5234,12 +5234,12 @@ _0817303A:
ldrb r0, [r4, 0x8] ldrb r0, [r4, 0x8]
mov r8, r0 mov r8, r0
movs r1, 0 movs r1, 0
bl sub_80A5C6C bl GetBankPosition
lsls r0, 24 lsls r0, 24
lsrs r5, r0, 24 lsrs r5, r0, 24
mov r0, r8 mov r0, r8
movs r1, 0x1 movs r1, 0x1
bl sub_80A5C6C bl GetBankPosition
lsls r0, 24 lsls r0, 24
lsrs r2, r0, 24 lsrs r2, r0, 24
movs r1, 0x1E movs r1, 0x1E
@@ -5579,7 +5579,7 @@ sub_817330C: @ 817330C
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
movs r1, 0 movs r1, 0
bl sub_80A5C6C bl GetBankPosition
lsls r0, 24 lsls r0, 24
ldr r5, =gBattleAnimArgs ldr r5, =gBattleAnimArgs
lsrs r0, 24 lsrs r0, 24
@@ -5591,7 +5591,7 @@ sub_817330C: @ 817330C
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
movs r1, 0x1 movs r1, 0x1
bl sub_80A5C6C bl GetBankPosition
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
ldrh r5, [r5, 0x6] ldrh r5, [r5, 0x6]
@@ -5652,7 +5652,7 @@ _081733C0:
sub_81733D4: @ 81733D4 sub_81733D4: @ 81733D4
push {r4,lr} push {r4,lr}
adds r4, r0, 0 adds r4, r0, 0
bl sub_80A6900 bl AnimateBallThrow
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _081733F6 beq _081733F6
asm/clock.s
-175
View File
@@ -1,175 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start sub_809E778
sub_809E778: @ 809E778
push {lr}
ldr r0, =0x00000895
bl FlagSet
bl RtcCalcLocalTime
ldr r0, =gSaveBlock2Ptr
ldr r2, [r0]
adds r2, 0xA0
ldr r3, =gLocalTime
ldr r0, [r3]
ldr r1, [r3, 0x4]
str r0, [r2]
str r1, [r2, 0x4]
ldr r0, =0x00004040
ldrh r1, [r3]
bl VarSet
pop {r0}
bx r0
.pool
thumb_func_end sub_809E778
thumb_func_start DoTimeBasedEvents
DoTimeBasedEvents: @ 809E7B0
push {r4,lr}
ldr r0, =0x00000895
bl FlagGet
lsls r0, 24
cmp r0, 0
beq _0809E7DA
bl sub_813B9C0
lsls r0, 24
cmp r0, 0
bne _0809E7DA
bl RtcCalcLocalTime
ldr r4, =gLocalTime
adds r0, r4, 0
bl sub_809E7E8
adds r0, r4, 0
bl sub_809E858
_0809E7DA:
pop {r4}
pop {r0}
bx r0
.pool
thumb_func_end DoTimeBasedEvents
thumb_func_start sub_809E7E8
sub_809E7E8: @ 809E7E8
push {r4-r6,lr}
adds r5, r0, 0
ldr r0, =0x00004040
bl GetVarPointer
adds r6, r0, 0
ldrh r0, [r6]
movs r2, 0
ldrsh r1, [r5, r2]
cmp r0, r1
beq _0809E84E
cmp r0, r1
bgt _0809E84E
ldrh r4, [r5]
subs r4, r0
lsls r4, 16
lsrs r4, 16
bl ClearUpperFlags
adds r0, r4, 0
bl sub_8122580
adds r0, r4, 0
bl sub_80ED888
adds r0, r4, 0
bl sub_80AEFBC
adds r0, r4, 0
bl UpdatePartyPokerusTime
adds r0, r4, 0
bl sub_8137904
adds r0, r4, 0
bl sub_8137A20
adds r0, r4, 0
bl sub_8139EF4
adds r0, r4, 0
bl sub_813A7F4
adds r0, r4, 0
bl sub_813945C
adds r0, r4, 0
bl SetRandomLotteryNumber
ldrh r0, [r5]
strh r0, [r6]
_0809E84E:
pop {r4-r6}
pop {r0}
bx r0
.pool
thumb_func_end sub_809E7E8
thumb_func_start sub_809E858
sub_809E858: @ 809E858
push {r4-r6,lr}
sub sp, 0x8
adds r5, r0, 0
mov r4, sp
ldr r6, =gSaveBlock2Ptr
ldr r1, [r6]
adds r1, 0xA0
mov r0, sp
adds r2, r5, 0
bl CalcTimeDifference
mov r0, sp
movs r2, 0
ldrsh r1, [r0, r2]
lsls r0, r1, 1
adds r0, r1
lsls r1, r0, 4
subs r1, r0
lsls r1, 5
movs r2, 0x2
ldrsb r2, [r4, r2]
lsls r0, r2, 4
subs r0, r2
lsls r0, 2
adds r1, r0
movs r0, 0x3
ldrsb r0, [r4, r0]
adds r0, r1, r0
cmp r0, 0
beq _0809E8A8
cmp r0, 0
blt _0809E8A8
bl BerryTreeTimeUpdate
ldr r2, [r6]
adds r2, 0xA0
ldr r0, [r5]
ldr r1, [r5, 0x4]
str r0, [r2]
str r1, [r2, 0x4]
_0809E8A8:
add sp, 0x8
pop {r4-r6}
pop {r0}
bx r0
.pool
thumb_func_end sub_809E858
thumb_func_start sub_809E8B4
sub_809E8B4: @ 809E8B4
push {lr}
bl sub_809E778
ldr r0, =c2_exit_to_overworld_1_continue_scripts_restart_music
bl SetMainCallback2
pop {r0}
bx r0
.pool
thumb_func_end sub_809E8B4
thumb_func_start Special_StartWallClock
Special_StartWallClock: @ 809E8C8
push {lr}
ldr r0, =Cb2_StartWallClock
bl SetMainCallback2
ldr r1, =gMain
ldr r0, =sub_809E8B4
str r0, [r1, 0x8]
pop {r0}
bx r0
.pool
thumb_func_end Special_StartWallClock
.align 2, 0 @ Don't pad with nop.
asm/contest.s
+26 -26
View File
@@ -1416,13 +1416,13 @@ sub_80D833C: @ 80D833C
cmp r0, 0 cmp r0, 0
bne _080D83CC bne _080D83CC
ldr r0, =gDisplayedStringBattle ldr r0, =gDisplayedStringBattle
ldr r1, =gUnknown_0827D507 ldr r1, =gText_0827D507
bl StringCopy bl StringCopy
b _080D83D4 b _080D83D4
.pool .pool
_080D83CC: _080D83CC:
ldr r0, =gDisplayedStringBattle ldr r0, =gDisplayedStringBattle
ldr r1, =gUnknown_0827D531 ldr r1, =gText_0827D531
bl StringCopy bl StringCopy
_080D83D4: _080D83D4:
bl sub_80DB89C bl sub_80DB89C
@@ -1753,13 +1753,13 @@ _080D868E:
cmp r0, 0 cmp r0, 0
bne _080D86DC bne _080D86DC
ldr r0, =gDisplayedStringBattle ldr r0, =gDisplayedStringBattle
ldr r1, =gUnknown_0827D507 ldr r1, =gText_0827D507
bl StringCopy bl StringCopy
b _080D86E4 b _080D86E4
.pool .pool
_080D86DC: _080D86DC:
ldr r0, =gDisplayedStringBattle ldr r0, =gDisplayedStringBattle
ldr r1, =gUnknown_0827D531 ldr r1, =gText_0827D531
bl StringCopy bl StringCopy
_080D86E4: _080D86E4:
bl sub_80DB89C bl sub_80DB89C
@@ -2655,7 +2655,7 @@ _080D8F38:
bl StringCopy bl StringCopy
_080D8F48: _080D8F48:
ldr r4, =gStringVar4 ldr r4, =gStringVar4
ldr r1, =gUnknown_0827D55A ldr r1, =gText_0827D55A
adds r0, r4, 0 adds r0, r4, 0
bl StringExpandPlaceholders bl StringExpandPlaceholders
adds r0, r4, 0 adds r0, r4, 0
@@ -3566,7 +3566,7 @@ _080D96D4:
adds r1, r2 adds r1, r2
bl StringCopy bl StringCopy
ldr r4, =gStringVar4 ldr r4, =gStringVar4
ldr r1, =gUnknown_0827E793 ldr r1, =gText_0827E793
adds r0, r4, 0 adds r0, r4, 0
bl StringExpandPlaceholders bl StringExpandPlaceholders
adds r0, r4, 0 adds r0, r4, 0
@@ -3638,20 +3638,20 @@ _080D9774:
asrs r0, r4, 24 asrs r0, r4, 24
cmp r0, 0x1 cmp r0, 0x1
bne _080D97A0 bne _080D97A0
ldr r0, =gUnknown_0827E32E ldr r0, =gText_0827E32E
b _080D97A6 b _080D97A6
.pool .pool
_080D97A0: _080D97A0:
cmp r0, 0x2 cmp r0, 0x2
bne _080D97B4 bne _080D97B4
ldr r0, =gUnknown_0827E35B ldr r0, =gText_0827E35B
_080D97A6: _080D97A6:
movs r1, 0x1 movs r1, 0x1
bl sub_80DEC30 bl sub_80DEC30
b _080D97BC b _080D97BC
.pool .pool
_080D97B4: _080D97B4:
ldr r0, =gUnknown_0827E38D ldr r0, =gText_0827E38D
movs r1, 0x1 movs r1, 0x1
bl sub_80DEC30 bl sub_80DEC30
_080D97BC: _080D97BC:
@@ -3675,7 +3675,7 @@ _080D97DC:
adds r1, r2 adds r1, r2
bl StringCopy bl StringCopy
ldr r4, =gStringVar4 ldr r4, =gStringVar4
ldr r1, =gUnknown_0827E2FE ldr r1, =gText_0827E2FE
adds r0, r4, 0 adds r0, r4, 0
bl StringExpandPlaceholders bl StringExpandPlaceholders
adds r0, r4, 0 adds r0, r4, 0
@@ -3813,7 +3813,7 @@ _080D9904:
adds r1, r2 adds r1, r2
bl StringCopy bl StringCopy
ldr r4, =gStringVar4 ldr r4, =gStringVar4
ldr r1, =gUnknown_0827E6E3 ldr r1, =gText_0827E6E3
adds r0, r4, 0 adds r0, r4, 0
bl StringExpandPlaceholders bl StringExpandPlaceholders
adds r0, r4, 0 adds r0, r4, 0
@@ -4043,7 +4043,7 @@ _080D9B30:
cmp r3, 0 cmp r3, 0
bge _080D9B48 bge _080D9B48
ldr r0, =gStringVar4 ldr r0, =gStringVar4
ldr r1, =gUnknown_0827E73C ldr r1, =gText_0827E73C
bl StringExpandPlaceholders bl StringExpandPlaceholders
b _080D9B74 b _080D9B74
.pool .pool
@@ -4058,13 +4058,13 @@ _080D9B48:
cmp r0, 0x4 cmp r0, 0x4
bgt _080D9B6C bgt _080D9B6C
ldr r0, =gStringVar4 ldr r0, =gStringVar4
ldr r1, =gUnknown_0827E717 ldr r1, =gText_0827E717
bl StringExpandPlaceholders bl StringExpandPlaceholders
b _080D9B74 b _080D9B74
.pool .pool
_080D9B6C: _080D9B6C:
ldr r0, =gStringVar4 ldr r0, =gStringVar4
ldr r1, =gUnknown_0827E76A ldr r1, =gText_0827E76A
bl StringExpandPlaceholders bl StringExpandPlaceholders
_080D9B74: _080D9B74:
ldr r0, =gStringVar4 ldr r0, =gStringVar4
@@ -4402,7 +4402,7 @@ _080D9DD4:
adds r1, r2 adds r1, r2
bl StringCopy bl StringCopy
ldr r4, =gStringVar4 ldr r4, =gStringVar4
ldr r1, =gUnknown_0827E7EA ldr r1, =gText_0827E7EA
adds r0, r4, 0 adds r0, r4, 0
bl StringExpandPlaceholders bl StringExpandPlaceholders
adds r0, r4, 0 adds r0, r4, 0
@@ -4426,7 +4426,7 @@ _080D9E60:
_080D9E6A: _080D9E6A:
bl sub_80DB89C bl sub_80DB89C
ldr r4, =gStringVar4 ldr r4, =gStringVar4
ldr r1, =gUnknown_0827E817 ldr r1, =gText_0827E817
adds r0, r4, 0 adds r0, r4, 0
bl StringExpandPlaceholders bl StringExpandPlaceholders
adds r0, r4, 0 adds r0, r4, 0
@@ -4491,7 +4491,7 @@ _080D9EDC:
adds r1, r2 adds r1, r2
bl StringCopy bl StringCopy
ldr r4, =gStringVar4 ldr r4, =gStringVar4
ldr r1, =gUnknown_0827E58A ldr r1, =gText_0827E58A
adds r0, r4, 0 adds r0, r4, 0
bl StringExpandPlaceholders bl StringExpandPlaceholders
adds r0, r4, 0 adds r0, r4, 0
@@ -4630,7 +4630,7 @@ _080DA038:
adds r1, r2 adds r1, r2
bl StringCopy bl StringCopy
ldr r4, =gStringVar4 ldr r4, =gStringVar4
ldr r1, =gUnknown_0827D56F ldr r1, =gText_0827D56F
adds r0, r4, 0 adds r0, r4, 0
bl StringExpandPlaceholders bl StringExpandPlaceholders
adds r0, r4, 0 adds r0, r4, 0
@@ -5373,7 +5373,7 @@ _080DA668:
ldr r0, [r0] ldr r0, [r0]
str r0, [r1] str r0, [r1]
ldr r4, =gStringVar4 ldr r4, =gStringVar4
ldr r1, =gUnknown_0827D597 ldr r1, =gText_0827D597
adds r0, r4, 0 adds r0, r4, 0
bl StringExpandPlaceholders bl StringExpandPlaceholders
adds r0, r4, 0 adds r0, r4, 0
@@ -11207,7 +11207,7 @@ sub_80DD45C: @ 80DD45C
cmp r1, 0 cmp r1, 0
bne _080DD4DC bne _080DD4DC
ldr r0, =gStringVar3 ldr r0, =gStringVar3
ldr r1, =gUnknown_0827E837 ldr r1, =gText_0827E837
bl StringCopy bl StringCopy
b _080DD52C b _080DD52C
.pool .pool
@@ -11216,7 +11216,7 @@ _080DD4DC:
cmp r0, 0x1 cmp r0, 0x1
bne _080DD4F4 bne _080DD4F4
ldr r0, =gStringVar3 ldr r0, =gStringVar3
ldr r1, =gUnknown_0827E83F ldr r1, =gText_0827E83F
bl StringCopy bl StringCopy
b _080DD52C b _080DD52C
.pool .pool
@@ -11225,7 +11225,7 @@ _080DD4F4:
cmp r0, 0x2 cmp r0, 0x2
bne _080DD50C bne _080DD50C
ldr r0, =gStringVar3 ldr r0, =gStringVar3
ldr r1, =gUnknown_0827E847 ldr r1, =gText_0827E847
bl StringCopy bl StringCopy
b _080DD52C b _080DD52C
.pool .pool
@@ -11234,13 +11234,13 @@ _080DD50C:
cmp r0, 0x3 cmp r0, 0x3
bne _080DD524 bne _080DD524
ldr r0, =gStringVar3 ldr r0, =gStringVar3
ldr r1, =gUnknown_0827E850 ldr r1, =gText_0827E850
bl StringCopy bl StringCopy
b _080DD52C b _080DD52C
.pool .pool
_080DD524: _080DD524:
ldr r0, =gStringVar3 ldr r0, =gStringVar3
ldr r1, =gUnknown_0827E85A ldr r1, =gText_0827E85A
bl StringCopy bl StringCopy
_080DD52C: _080DD52C:
ldr r4, =gStringVar4 ldr r4, =gStringVar4
@@ -13829,13 +13829,13 @@ sub_80DEA5C: @ 80DEA5C
strh r0, [r4, 0x26] strh r0, [r4, 0x26]
movs r0, 0x3 movs r0, 0x3
movs r1, 0 movs r1, 0
bl sub_80A5C6C bl GetBankPosition
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
strh r0, [r4, 0x20] strh r0, [r4, 0x20]
movs r0, 0x3 movs r0, 0x3
movs r1, 0x1 movs r1, 0x1
bl sub_80A5C6C bl GetBankPosition
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
strh r0, [r4, 0x22] strh r0, [r4, 0x22]
asm/crt0.s
+2 -2
View File
@@ -68,8 +68,8 @@ GPIOPortReadEnable: @ 80000C8
.4byte gAbilityDescriptionPointers .4byte gAbilityDescriptionPointers
.4byte gItems .4byte gItems
.4byte gBattleMoves .4byte gBattleMoves
.4byte gUnknown_0832C400 .4byte gBallSpriteSheets
.4byte gUnknown_0832C460 .4byte gBallSpritePalettes
.4byte 0x000000a8, 0x00000864, 0x0000089b .4byte 0x000000a8, 0x00000864, 0x0000089b
asm/dewford_trend.s
+3 -3
View File
@@ -79,8 +79,8 @@ _08122522:
.pool .pool
thumb_func_end InitDewfordTrend thumb_func_end InitDewfordTrend
thumb_func_start sub_8122580 thumb_func_start UpdateDewfordTrendPerDay
sub_8122580: @ 8122580 UpdateDewfordTrendPerDay: @ 8122580
push {r4-r7,lr} push {r4-r7,lr}
mov r7, r10 mov r7, r10
mov r6, r9 mov r6, r9
@@ -253,7 +253,7 @@ _081226BE:
pop {r0} pop {r0}
bx r0 bx r0
.pool .pool
thumb_func_end sub_8122580 thumb_func_end UpdateDewfordTrendPerDay
thumb_func_start sub_81226D8 thumb_func_start sub_81226D8
sub_81226D8: @ 81226D8 sub_81226D8: @ 81226D8
asm/easy_chat.s
+4 -4
View File
@@ -1635,7 +1635,7 @@ _0811AF86:
thumb_func_start sub_811AF8C thumb_func_start sub_811AF8C
sub_811AF8C: @ 811AF8C sub_811AF8C: @ 811AF8C
push {lr} push {lr}
bl sub_8198C58 bl ProcessMenuInputNoWrap_
lsls r0, 24 lsls r0, 24
asrs r1, r0, 24 asrs r1, r0, 24
cmp r1, 0 cmp r1, 0
@@ -1684,7 +1684,7 @@ _0811AFE6:
thumb_func_start sub_811AFEC thumb_func_start sub_811AFEC
sub_811AFEC: @ 811AFEC sub_811AFEC: @ 811AFEC
push {r4,lr} push {r4,lr}
bl sub_8198C58 bl ProcessMenuInputNoWrap_
lsls r0, 24 lsls r0, 24
asrs r1, r0, 24 asrs r1, r0, 24
cmp r1, 0 cmp r1, 0
@@ -1727,7 +1727,7 @@ _0811B03A:
thumb_func_start sub_811B040 thumb_func_start sub_811B040
sub_811B040: @ 811B040 sub_811B040: @ 811B040
push {lr} push {lr}
bl sub_8198C58 bl ProcessMenuInputNoWrap_
lsls r0, 24 lsls r0, 24
asrs r1, r0, 24 asrs r1, r0, 24
cmp r1, 0 cmp r1, 0
@@ -1832,7 +1832,7 @@ sub_811B0E8: @ 811B0E8
thumb_func_start sub_811B0F8 thumb_func_start sub_811B0F8
sub_811B0F8: @ 811B0F8 sub_811B0F8: @ 811B0F8
push {r4,lr} push {r4,lr}
bl sub_8198C58 bl ProcessMenuInputNoWrap_
lsls r0, 24 lsls r0, 24
asrs r1, r0, 24 asrs r1, r0, 24
cmp r1, 0 cmp r1, 0
asm/field_screen.s
+3 -3
View File
@@ -7777,8 +7777,8 @@ _080AEFB6:
bx r1 bx r1
thumb_func_end sub_80AEEE8 thumb_func_end sub_80AEEE8
thumb_func_start sub_80AEFBC thumb_func_start UpdateWeatherPerDay
sub_80AEFBC: @ 80AEFBC UpdateWeatherPerDay: @ 80AEFBC
lsls r0, 16 lsls r0, 16
ldr r1, =gSaveBlock1Ptr ldr r1, =gSaveBlock1Ptr
ldr r2, [r1] ldr r2, [r1]
@@ -7794,7 +7794,7 @@ sub_80AEFBC: @ 80AEFBC
strb r1, [r2] strb r1, [r2]
bx lr bx lr
.pool .pool
thumb_func_end sub_80AEFBC thumb_func_end UpdateWeatherPerDay
thumb_func_start sub_80AEFDC thumb_func_start sub_80AEFDC
sub_80AEFDC: @ 80AEFDC sub_80AEFDC: @ 80AEFDC
asm/learn_move.s
+4 -4
View File
@@ -353,7 +353,7 @@ _08160994:
b _08160E88 b _08160E88
.pool .pool
_081609A8: _081609A8:
bl sub_8198C58 bl ProcessMenuInputNoWrap_
lsls r0, 24 lsls r0, 24
asrs r1, r0, 24 asrs r1, r0, 24
cmp r1, 0 cmp r1, 0
@@ -433,7 +433,7 @@ _08160A50:
b _08160E88 b _08160E88
.pool .pool
_08160A64: _08160A64:
bl sub_8198C58 bl ProcessMenuInputNoWrap_
lsls r0, 24 lsls r0, 24
asrs r1, r0, 24 asrs r1, r0, 24
cmp r1, 0 cmp r1, 0
@@ -493,7 +493,7 @@ _08160ADC:
b _08160E88 b _08160E88
.pool .pool
_08160AEC: _08160AEC:
bl sub_8198C58 bl ProcessMenuInputNoWrap_
lsls r0, 24 lsls r0, 24
asrs r1, r0, 24 asrs r1, r0, 24
cmp r1, 0 cmp r1, 0
@@ -551,7 +551,7 @@ _08160B6C:
b _08160E88 b _08160E88
.pool .pool
_08160B80: _08160B80:
bl sub_8198C58 bl ProcessMenuInputNoWrap_
lsls r0, 24 lsls r0, 24
asrs r1, r0, 24 asrs r1, r0, 24
cmp r1, 0 cmp r1, 0
asm/link.s
+4 -4
View File
@@ -26142,7 +26142,7 @@ _080170E0:
negs r0, r0 negs r0, r0
b _08017110 b _08017110
_080170F2: _080170F2:
bl sub_8198C58 bl ProcessMenuInputNoWrap_
lsls r0, 24 lsls r0, 24
asrs r1, r0, 24 asrs r1, r0, 24
movs r2, 0x80 movs r2, 0x80
@@ -29500,7 +29500,7 @@ _08018BD6:
b _08018C3E b _08018C3E
.pool .pool
_08018BE4: _08018BE4:
bl sub_8198C58 bl ProcessMenuInputNoWrap_
lsls r0, 24 lsls r0, 24
asrs r6, r0, 24 asrs r6, r0, 24
movs r1, 0x80 movs r1, 0x80
@@ -52112,7 +52112,7 @@ _0802426A:
bl sub_8197930 bl sub_8197930
b _080242D0 b _080242D0
_08024270: _08024270:
bl sub_8198C58 bl ProcessMenuInputNoWrap_
lsls r0, 24 lsls r0, 24
asrs r4, r0, 24 asrs r4, r0, 24
movs r0, 0x2 movs r0, 0x2
@@ -71033,7 +71033,7 @@ _0802DA84:
thumb_func_start sub_802DA8C thumb_func_start sub_802DA8C
sub_802DA8C: @ 802DA8C sub_802DA8C: @ 802DA8C
push {lr} push {lr}
bl sub_8198C58 bl ProcessMenuInputNoWrap_
lsls r0, 24 lsls r0, 24
asrs r0, 24 asrs r0, 24
pop {r1} pop {r1}
asm/macros/battle_script.inc
+14 -2
View File
@@ -422,10 +422,10 @@
.byte \bank .byte \bank
.endm .endm
.macro switchinanim bank, param1 .macro switchinanim bank, dontclearsubstitutebit
.byte 0x4e .byte 0x4e
.byte \bank .byte \bank
.byte \param1 .byte \dontclearsubstitutebit
.endm .endm
.macro jumpifcantswitch bank, param1 .macro jumpifcantswitch bank, param1
@@ -1387,3 +1387,15 @@
.macro jumpifnostatus3 bank, status, jumpptr .macro jumpifnostatus3 bank, status, jumpptr
jumpifstatus3condition \bank, \status, 0x1, \jumpptr jumpifstatus3condition \bank, \status, 0x1, \jumpptr
.endm .endm
.macro jumpifmovehadnoeffect jumpptr
jumpifbyte COMMON_BITS, gBattleMoveFlags, MOVESTATUS_MISSED | MOVESTATUS_NOTAFFECTED | MOVESTATUS_FAILED, \jumpptr
.endm
.macro jumpifbattletype flags, jumpptr
jumpifword COMMON_BITS, gBattleTypeFlags, \flags, \jumpptr
.endm
.macro jumpifnotbattletype flags, jumpptr
jumpifword NO_COMMON_BITS, gBattleTypeFlags, \flags, \jumpptr
.endm
asm/macros/pokemon_data.inc
+1 -1
View File
@@ -52,5 +52,5 @@
.byte \max_level .byte \max_level
.endif .endif
.2byte SPECIES_\species .2byte \species
.endm .endm
asm/main_menu.s
+2 -2
View File
@@ -2215,7 +2215,7 @@ sub_8030A70: @ 8030A70
str r2, [sp, 0x10] str r2, [sp, 0x10]
movs r2, 0x70 movs r2, 0x70
movs r3, 0x3A movs r3, 0x3A
bl sub_8076438 bl CreatePokeballSpriteToReleaseMon
lsls r0, r4, 2 lsls r0, r4, 2
adds r0, r4 adds r0, r4
lsls r0, 3 lsls r0, 3
@@ -3025,7 +3025,7 @@ task_new_game_prof_birch_speech_part2_4: @ 8031188
push {r4,r5,lr} push {r4,r5,lr}
lsls r0, 24 lsls r0, 24
lsrs r5, r0, 24 lsrs r5, r0, 24
bl sub_8198C58 bl ProcessMenuInputNoWrap_
lsls r0, 24 lsls r0, 24
asrs r1, r0, 24 asrs r1, r0, 24
cmp r1, 0 cmp r1, 0
asm/menu.s
+3 -3
View File
@@ -2266,8 +2266,8 @@ sub_8198C34: @ 8198C34
bx r0 bx r0
thumb_func_end sub_8198C34 thumb_func_end sub_8198C34
thumb_func_start sub_8198C58 thumb_func_start ProcessMenuInputNoWrap_
sub_8198C58: @ 8198C58 ProcessMenuInputNoWrap_: @ 8198C58
push {r4,lr} push {r4,lr}
bl ProcessMenuInputNoWrapAround bl ProcessMenuInputNoWrapAround
lsls r0, 24 lsls r0, 24
@@ -2282,7 +2282,7 @@ _08198C6E:
pop {r4} pop {r4}
pop {r1} pop {r1}
bx r1 bx r1
thumb_func_end sub_8198C58 thumb_func_end ProcessMenuInputNoWrap_
thumb_func_start sub_8198C78 thumb_func_start sub_8198C78
sub_8198C78: @ 8198C78 sub_8198C78: @ 8198C78
asm/menu_helpers.s
+1 -1
View File
@@ -277,7 +277,7 @@ Task_CallYesOrNoCallback: @ 8121FDC
push {r4,lr} push {r4,lr}
lsls r0, 24 lsls r0, 24
lsrs r4, r0, 24 lsrs r4, r0, 24
bl sub_8198C58 bl ProcessMenuInputNoWrap_
lsls r0, 24 lsls r0, 24
asrs r1, r0, 24 asrs r1, r0, 24
cmp r1, 0 cmp r1, 0
asm/rom4.s → asm/overworld.s
View File
asm/party_menu.s
+11 -11
View File
@@ -2554,7 +2554,7 @@ sub_81B1708: @ 81B1708
push {r4,lr} push {r4,lr}
lsls r0, 24 lsls r0, 24
lsrs r4, r0, 24 lsrs r4, r0, 24
bl sub_8198C58 bl ProcessMenuInputNoWrap_
lsls r0, 24 lsls r0, 24
asrs r1, r0, 24 asrs r1, r0, 24
cmp r1, 0 cmp r1, 0
@@ -4010,7 +4010,7 @@ sub_81B227C: @ 81B227C
push {r4,lr} push {r4,lr}
lsls r0, 24 lsls r0, 24
lsrs r4, r0, 24 lsrs r4, r0, 24
bl sub_8198C58 bl ProcessMenuInputNoWrap_
lsls r0, 24 lsls r0, 24
asrs r1, r0, 24 asrs r1, r0, 24
cmp r1, 0 cmp r1, 0
@@ -7952,7 +7952,7 @@ sub_81B43DC: @ 81B43DC
push {r4-r6,lr} push {r4-r6,lr}
lsls r0, 24 lsls r0, 24
lsrs r4, r0, 24 lsrs r4, r0, 24
bl sub_8198C58 bl ProcessMenuInputNoWrap_
lsls r0, 24 lsls r0, 24
asrs r1, r0, 24 asrs r1, r0, 24
cmp r1, 0 cmp r1, 0
@@ -8485,7 +8485,7 @@ sub_81B48DC: @ 81B48DC
muls r1, r0 muls r1, r0
ldr r0, =gPlayerParty ldr r0, =gPlayerParty
adds r4, r1, r0 adds r4, r1, r0
bl sub_8198C58 bl ProcessMenuInputNoWrap_
lsls r0, 24 lsls r0, 24
asrs r1, r0, 24 asrs r1, r0, 24
cmp r1, 0 cmp r1, 0
@@ -8777,7 +8777,7 @@ sub_81B4BA0: @ 81B4BA0
push {r4,lr} push {r4,lr}
lsls r0, 24 lsls r0, 24
lsrs r4, r0, 24 lsrs r4, r0, 24
bl sub_8198C58 bl ProcessMenuInputNoWrap_
lsls r0, 24 lsls r0, 24
asrs r1, r0, 24 asrs r1, r0, 24
cmp r1, 0 cmp r1, 0
@@ -8883,7 +8883,7 @@ sub_81B4C94: @ 81B4C94
push {r7} push {r7}
lsls r0, 24 lsls r0, 24
lsrs r5, r0, 24 lsrs r5, r0, 24
bl sub_8198C58 bl ProcessMenuInputNoWrap_
lsls r0, 24 lsls r0, 24
asrs r1, r0, 24 asrs r1, r0, 24
cmp r1, 0 cmp r1, 0
@@ -9691,7 +9691,7 @@ sub_81B5430: @ 81B5430
push {r4,lr} push {r4,lr}
lsls r0, 24 lsls r0, 24
lsrs r4, r0, 24 lsrs r4, r0, 24
bl sub_8198C58 bl ProcessMenuInputNoWrap_
lsls r0, 24 lsls r0, 24
asrs r1, r0, 24 asrs r1, r0, 24
cmp r1, 0 cmp r1, 0
@@ -9985,7 +9985,7 @@ sub_81B56D8: @ 81B56D8
push {r4,lr} push {r4,lr}
lsls r0, 24 lsls r0, 24
lsrs r4, r0, 24 lsrs r4, r0, 24
bl sub_8198C58 bl ProcessMenuInputNoWrap_
lsls r0, 24 lsls r0, 24
asrs r1, r0, 24 asrs r1, r0, 24
cmp r1, 0 cmp r1, 0
@@ -12970,7 +12970,7 @@ sub_81B7028: @ 81B7028
push {r4,lr} push {r4,lr}
lsls r0, 24 lsls r0, 24
lsrs r4, r0, 24 lsrs r4, r0, 24
bl sub_8198C58 bl ProcessMenuInputNoWrap_
lsls r0, 24 lsls r0, 24
asrs r1, r0, 24 asrs r1, r0, 24
cmp r1, 0 cmp r1, 0
@@ -13272,7 +13272,7 @@ sub_81B72C8: @ 81B72C8
muls r1, r0 muls r1, r0
ldr r0, =gPlayerParty ldr r0, =gPlayerParty
adds r4, r1, r0 adds r4, r1, r0
bl sub_8198C58 bl ProcessMenuInputNoWrap_
lsls r0, 24 lsls r0, 24
asrs r5, r0, 24 asrs r5, r0, 24
cmp r5, 0 cmp r5, 0
@@ -15054,7 +15054,7 @@ sub_81B82D4: @ 81B82D4
push {r4-r7,lr} push {r4-r7,lr}
lsls r0, 24 lsls r0, 24
lsrs r5, r0, 24 lsrs r5, r0, 24
bl sub_8198C58 bl ProcessMenuInputNoWrap_
lsls r0, 24 lsls r0, 24
asrs r1, r0, 24 asrs r1, r0, 24
cmp r1, 0 cmp r1, 0
asm/player_pc.s
+1 -1
View File
@@ -1378,7 +1378,7 @@ sub_816B9D8: @ 816B9D8
push {r4,lr} push {r4,lr}
lsls r0, 24 lsls r0, 24
lsrs r4, r0, 24 lsrs r4, r0, 24
bl sub_8198C58 bl ProcessMenuInputNoWrap_
lsls r0, 24 lsls r0, 24
asrs r0, 24 asrs r0, 24
movs r1, 0x1 movs r1, 0x1
asm/pokeball.s
-2861
View File
File diff suppressed because it is too large Load Diff
asm/pokemon_storage_system.s
+4 -4
View File
@@ -3409,7 +3409,7 @@ _080C8F0C:
adds r0, 0x1 adds r0, 0x1
strb r0, [r1] strb r0, [r1]
_080C8F22: _080C8F22:
bl sub_8198C58 bl ProcessMenuInputNoWrap_
lsls r0, 24 lsls r0, 24
asrs r1, r0, 24 asrs r1, r0, 24
cmp r1, 0 cmp r1, 0
@@ -4133,7 +4133,7 @@ _080C9584:
b _080C9664 b _080C9664
.pool .pool
_080C95A4: _080C95A4:
bl sub_8198C58 bl ProcessMenuInputNoWrap_
lsls r0, 24 lsls r0, 24
asrs r1, r0, 24 asrs r1, r0, 24
cmp r1, 0 cmp r1, 0
@@ -4927,7 +4927,7 @@ _080C9C78:
b _080C9CAA b _080C9CAA
.pool .pool
_080C9C8C: _080C9C8C:
bl sub_8198C58 bl ProcessMenuInputNoWrap_
lsls r0, 24 lsls r0, 24
asrs r1, r0, 24 asrs r1, r0, 24
cmp r1, 0 cmp r1, 0
@@ -5058,7 +5058,7 @@ _080C9DAC:
b _080C9DE0 b _080C9DE0
.pool .pool
_080C9DC0: _080C9DC0:
bl sub_8198C58 bl ProcessMenuInputNoWrap_
lsls r0, 24 lsls r0, 24
asrs r1, r0, 24 asrs r1, r0, 24
cmp r1, 0 cmp r1, 0
asm/pokemon_summary_screen.s
+3 -3
View File
@@ -1424,16 +1424,16 @@ sub_81C4A08: @ 81C4A08
bl GetMonData bl GetMonData
lsls r0, 16 lsls r0, 16
lsrs r0, 16 lsrs r0, 16
bl ball_number_to_ball_processing_index bl ItemIdToBallId
adds r4, r0, 0 adds r4, r0, 0
lsls r4, 24 lsls r4, 24
lsrs r4, 24 lsrs r4, 24
adds r0, r4, 0 adds r0, r4, 0
bl sub_8076A78 bl LoadBallGfx
lsls r0, r4, 1 lsls r0, r4, 1
adds r0, r4 adds r0, r4
lsls r0, 3 lsls r0, 3
ldr r1, =gUnknown_0832C588 ldr r1, =gBallSpriteTemplates
adds r0, r1 adds r0, r1
movs r1, 0x10 movs r1, 0x10
movs r2, 0x88 movs r2, 0x88
asm/rom6.s
+19 -15
View File
@@ -4188,6 +4188,8 @@ sp0C8_whiteout_maybe: @ 813787C
.pool .pool
thumb_func_end sp0C8_whiteout_maybe thumb_func_end sp0C8_whiteout_maybe
@ time_events.o
thumb_func_start sub_8137890 thumb_func_start sub_8137890
sub_8137890: @ 8137890 sub_8137890: @ 8137890
push {r4,lr} push {r4,lr}
@@ -4244,8 +4246,8 @@ sub_81378E4: @ 81378E4
bx r0 bx r0
thumb_func_end sub_81378E4 thumb_func_end sub_81378E4
thumb_func_start sub_8137904 thumb_func_start UpdateMirageRnd
sub_8137904: @ 8137904 UpdateMirageRnd: @ 8137904
push {r4,lr} push {r4,lr}
lsls r0, 16 lsls r0, 16
lsrs r4, r0, 16 lsrs r4, r0, 16
@@ -4271,7 +4273,7 @@ _08137928:
pop {r0} pop {r0}
bx r0 bx r0
.pool .pool
thumb_func_end sub_8137904 thumb_func_end UpdateMirageRnd
thumb_func_start sub_813793C thumb_func_start sub_813793C
sub_813793C: @ 813793C sub_813793C: @ 813793C
@@ -4385,8 +4387,8 @@ sub_8137A0C: @ 8137A0C
.pool .pool
thumb_func_end sub_8137A0C thumb_func_end sub_8137A0C
thumb_func_start sub_8137A20 thumb_func_start UpdateBirchState
sub_8137A20: @ 8137A20 UpdateBirchState: @ 8137A20
push {r4,r5,lr} push {r4,r5,lr}
adds r4, r0, 0 adds r4, r0, 0
lsls r4, 16 lsls r4, 16
@@ -4405,7 +4407,9 @@ sub_8137A20: @ 8137A20
pop {r0} pop {r0}
bx r0 bx r0
.pool .pool
thumb_func_end sub_8137A20 thumb_func_end UpdateBirchState
@ birch_pc.o
thumb_func_start sub_8137A4C thumb_func_start sub_8137A4C
sub_8137A4C: @ 8137A4C sub_8137A4C: @ 8137A4C
@@ -7605,15 +7609,15 @@ _08139456:
bx r1 bx r1
thumb_func_end sub_81393FC thumb_func_end sub_81393FC
thumb_func_start sub_813945C thumb_func_start SetShoalItemFlag
sub_813945C: @ 813945C SetShoalItemFlag: @ 813945C
push {lr} push {lr}
ldr r0, =0x000008bf ldr r0, =0x000008bf
bl FlagSet bl FlagSet
pop {r0} pop {r0}
bx r0 bx r0
.pool .pool
thumb_func_end sub_813945C thumb_func_end SetShoalItemFlag
thumb_func_start sub_813946C thumb_func_start sub_813946C
sub_813946C: @ 813946C sub_813946C: @ 813946C
@@ -8934,8 +8938,8 @@ _08139EEE:
bx r1 bx r1
thumb_func_end sub_8139ED0 thumb_func_end sub_8139ED0
thumb_func_start sub_8139EF4 thumb_func_start UpdateFrontierManiac
sub_8139EF4: @ 8139EF4 UpdateFrontierManiac: @ 8139EF4
push {r4,r5,lr} push {r4,r5,lr}
adds r4, r0, 0 adds r4, r0, 0
lsls r4, 16 lsls r4, 16
@@ -8954,7 +8958,7 @@ sub_8139EF4: @ 8139EF4
pop {r0} pop {r0}
bx r0 bx r0
.pool .pool
thumb_func_end sub_8139EF4 thumb_func_end UpdateFrontierManiac
thumb_func_start sub_8139F20 thumb_func_start sub_8139F20
sub_8139F20: @ 8139F20 sub_8139F20: @ 8139F20
@@ -10002,8 +10006,8 @@ _0813A7C6:
.pool .pool
thumb_func_end sub_813A7B8 thumb_func_end sub_813A7B8
thumb_func_start sub_813A7F4 thumb_func_start UpdateFrontierGambler
sub_813A7F4: @ 813A7F4 UpdateFrontierGambler: @ 813A7F4
push {r4,r5,lr} push {r4,r5,lr}
adds r4, r0, 0 adds r4, r0, 0
lsls r4, 16 lsls r4, 16
@@ -10022,7 +10026,7 @@ sub_813A7F4: @ 813A7F4
pop {r0} pop {r0}
bx r0 bx r0
.pool .pool
thumb_func_end sub_813A7F4 thumb_func_end UpdateFrontierGambler
thumb_func_start sub_813A820 thumb_func_start sub_813A820
sub_813A820: @ 813A820 sub_813A820: @ 813A820
asm/script_menu.s
+1 -1
View File
@@ -444,7 +444,7 @@ task_yes_no_maybe: @ 80E215C
b _080E21C4 b _080E21C4
.pool .pool
_080E2180: _080E2180:
bl sub_8198C58 bl ProcessMenuInputNoWrap_
lsls r0, 24 lsls r0, 24
asrs r1, r0, 24 asrs r1, r0, 24
movs r0, 0x1 movs r0, 0x1
asm/slot_machine.s
+1 -1
View File
@@ -1581,7 +1581,7 @@ sub_812B158: @ 812B158
thumb_func_start sub_812B1B0 thumb_func_start sub_812B1B0
sub_812B1B0: @ 812B1B0 sub_812B1B0: @ 812B1B0
push {lr} push {lr}
bl sub_8198C58 bl ProcessMenuInputNoWrap_
lsls r0, 24 lsls r0, 24
asrs r1, r0, 24 asrs r1, r0, 24
cmp r1, 0 cmp r1, 0
asm/start_menu.s
+3 -3
View File
@@ -1121,7 +1121,7 @@ sub_80A00EC: @ 80A00EC
thumb_func_start sub_80A0108 thumb_func_start sub_80A0108
sub_80A0108: @ 80A0108 sub_80A0108: @ 80A0108
push {lr} push {lr}
bl sub_8198C58 bl ProcessMenuInputNoWrap_
lsls r0, 24 lsls r0, 24
asrs r1, r0, 24 asrs r1, r0, 24
cmp r1, 0 cmp r1, 0
@@ -1226,7 +1226,7 @@ sub_80A01D0: @ 80A01D0
thumb_func_start sub_80A01EC thumb_func_start sub_80A01EC
sub_80A01EC: @ 80A01EC sub_80A01EC: @ 80A01EC
push {lr} push {lr}
bl sub_8198C58 bl ProcessMenuInputNoWrap_
lsls r0, 24 lsls r0, 24
asrs r1, r0, 24 asrs r1, r0, 24
cmp r1, 0 cmp r1, 0
@@ -1441,7 +1441,7 @@ sub_80A0388: @ 80A0388
thumb_func_start sub_80A03A4 thumb_func_start sub_80A03A4
sub_80A03A4: @ 80A03A4 sub_80A03A4: @ 80A03A4
push {lr} push {lr}
bl sub_8198C58 bl ProcessMenuInputNoWrap_
lsls r0, 24 lsls r0, 24
asrs r1, r0, 24 asrs r1, r0, 24
cmp r1, 0 cmp r1, 0
asm/trade.s
+7 -5
View File
@@ -1,5 +1,7 @@
.include "asm/macros.inc" .include "asm/macros.inc"
.include "constants/constants.inc" .include "constants/gba_constants.inc"
.include "constants/misc_constants.inc"
.include "constants/species_constants.inc"
.syntax unified .syntax unified
@@ -3694,7 +3696,7 @@ _0807920E:
thumb_func_start sub_8079218 thumb_func_start sub_8079218
sub_8079218: @ 8079218 sub_8079218: @ 8079218
push {lr} push {lr}
bl sub_8198C58 bl ProcessMenuInputNoWrap_
lsls r0, 24 lsls r0, 24
asrs r1, r0, 24 asrs r1, r0, 24
cmp r1, 0 cmp r1, 0
@@ -3796,7 +3798,7 @@ _080792D8:
thumb_func_start sub_80792E4 thumb_func_start sub_80792E4
sub_80792E4: @ 80792E4 sub_80792E4: @ 80792E4
push {lr} push {lr}
bl sub_8198C58 bl ProcessMenuInputNoWrap_
lsls r0, 24 lsls r0, 24
asrs r1, r0, 24 asrs r1, r0, 24
cmp r1, 0 cmp r1, 0
@@ -10445,7 +10447,7 @@ _0807CD1C:
str r2, [sp, 0x10] str r2, [sp, 0x10]
movs r2, 0x78 movs r2, 0x78
movs r3, 0x54 movs r3, 0x54
bl sub_8076438 bl CreatePokeballSpriteToReleaseMon
ldr r0, [r7] ldr r0, [r7]
adds r0, 0xD3 adds r0, 0xD3
ldrb r1, [r0] ldrb r1, [r0]
@@ -12550,7 +12552,7 @@ _0807E168:
str r2, [sp, 0x10] str r2, [sp, 0x10]
movs r2, 0x78 movs r2, 0x78
movs r3, 0x54 movs r3, 0x54
bl sub_8076438 bl CreatePokeballSpriteToReleaseMon
ldr r0, [r7] ldr r0, [r7]
adds r0, 0xD3 adds r0, 0xD3
ldrb r1, [r0] ldrb r1, [r0]
asm/use_pokeblock.s
+1 -1
View File
@@ -1240,7 +1240,7 @@ sub_8166D44: @ 8166D44
thumb_func_start sub_8166DE4 thumb_func_start sub_8166DE4
sub_8166DE4: @ 8166DE4 sub_8166DE4: @ 8166DE4
push {r4,lr} push {r4,lr}
bl sub_8198C58 bl ProcessMenuInputNoWrap_
lsls r0, 24 lsls r0, 24
lsrs r4, r0, 24 lsrs r4, r0, 24
asrs r1, r0, 24 asrs r1, r0, 24
asm/wallclock.s
-1515
View File
File diff suppressed because it is too large Load Diff
asmdiff.sh
Regular → Executable
View File
constants/ability_constants.inc
-78
View File
@@ -1,78 +0,0 @@
.set ABILITY_NONE, 0x00
.set ABILITY_STENCH, 0x01
.set ABILITY_DRIZZLE, 0x02
.set ABILITY_SPEED_BOOST, 0x03
.set ABILITY_BATTLE_ARMOR, 0x04
.set ABILITY_STURDY, 0x05
.set ABILITY_DAMP, 0x06
.set ABILITY_LIMBER, 0x07
.set ABILITY_SAND_VEIL, 0x08
.set ABILITY_STATIC, 0x09
.set ABILITY_VOLT_ABSORB, 0x0a
.set ABILITY_WATER_ABSORB, 0x0b
.set ABILITY_OBLIVIOUS, 0x0c
.set ABILITY_CLOUD_NINE, 0x0d
.set ABILITY_COMPOUND_EYES, 0x0e
.set ABILITY_INSOMNIA, 0x0f
.set ABILITY_COLOR_CHANGE, 0x10
.set ABILITY_IMMUNITY, 0x11
.set ABILITY_FLASH_FIRE, 0x12
.set ABILITY_SHIELD_DUST, 0x13
.set ABILITY_OWN_TEMPO, 0x14
.set ABILITY_SUCTION_CUPS, 0x15
.set ABILITY_INTIMIDATE, 0x16
.set ABILITY_SHADOW_TAG, 0x17
.set ABILITY_ROUGH_SKIN, 0x18
.set ABILITY_WONDER_GUARD, 0x19
.set ABILITY_LEVITATE, 0x1a
.set ABILITY_EFFECT_SPORE, 0x1b
.set ABILITY_SYNCHRONIZE, 0x1c
.set ABILITY_CLEAR_BODY, 0x1d
.set ABILITY_NATURAL_CURE, 0x1e
.set ABILITY_LIGHTNING_ROD, 0x1f
.set ABILITY_SERENE_GRACE, 0x20
.set ABILITY_SWIFT_SWIM, 0x21
.set ABILITY_CHLOROPHYLL, 0x22
.set ABILITY_ILLUMINATE, 0x23
.set ABILITY_TRACE, 0x24
.set ABILITY_HUGE_POWER, 0x25
.set ABILITY_POISON_POINT, 0x26
.set ABILITY_INNER_FOCUS, 0x27
.set ABILITY_MAGMA_ARMOR, 0x28
.set ABILITY_WATER_VEIL, 0x29
.set ABILITY_MAGNET_PULL, 0x2a
.set ABILITY_SOUNDPROOF, 0x2b
.set ABILITY_RAIN_DISH, 0x2c
.set ABILITY_SAND_STREAM, 0x2d
.set ABILITY_PRESSURE, 0x2e
.set ABILITY_THICK_FAT, 0x2f
.set ABILITY_EARLY_BIRD, 0x30
.set ABILITY_FLAME_BODY, 0x31
.set ABILITY_RUN_AWAY, 0x32
.set ABILITY_KEEN_EYE, 0x33
.set ABILITY_HYPER_CUTTER, 0x34
.set ABILITY_PICKUP, 0x35
.set ABILITY_TRUANT, 0x36
.set ABILITY_HUSTLE, 0x37
.set ABILITY_CUTE_CHARM, 0x38
.set ABILITY_PLUS, 0x39
.set ABILITY_MINUS, 0x3a
.set ABILITY_FORECAST, 0x3b
.set ABILITY_STICKY_HOLD, 0x3c
.set ABILITY_SHED_SKIN, 0x3d
.set ABILITY_GUTS, 0x3e
.set ABILITY_MARVEL_SCALE, 0x3f
.set ABILITY_LIQUID_OOZE, 0x40
.set ABILITY_OVERGROW, 0x41
.set ABILITY_BLAZE, 0x42
.set ABILITY_TORRENT, 0x43
.set ABILITY_SWARM, 0x44
.set ABILITY_ROCK_HEAD, 0x45
.set ABILITY_DROUGHT, 0x46
.set ABILITY_ARENA_TRAP, 0x47
.set ABILITY_VITAL_SPIRIT, 0x48
.set ABILITY_WHITE_SMOKE, 0x49
.set ABILITY_PURE_POWER, 0x4a
.set ABILITY_SHELL_ARMOR, 0x4b
.set ABILITY_CACOPHONY, 0x4c
.set ABILITY_AIR_LOCK, 0x4d
constants/battle_script_constants.inc
+3 -3
View File
@@ -18,7 +18,7 @@
.set ANIM_ITEM_STEAL, 0x10 .set ANIM_ITEM_STEAL, 0x10
.set ANIM_SNATCH_MOVE, 0x11 .set ANIM_SNATCH_MOVE, 0x11
.set ANIM_FUTURE_SIGHT_HIT, 0x12 .set ANIM_FUTURE_SIGHT_HIT, 0x12
.set ANIM_x13, 0x13 .set ANIM_DOOM_DESIRE_HIT, 0x13
.set ANIM_x14, 0x14 .set ANIM_x14, 0x14
.set ANIM_INGRAIN_HEAL, 0x15 .set ANIM_INGRAIN_HEAL, 0x15
.set ANIM_WISH_HEAL, 0x16 .set ANIM_WISH_HEAL, 0x16
@@ -146,8 +146,8 @@
.equiv sANIM_ARG2, gBattleScripting + 0x11 .equiv sANIM_ARG2, gBattleScripting + 0x11
.equiv sTRIPLE_KICK_POWER, gBattleScripting + 0x12 .equiv sTRIPLE_KICK_POWER, gBattleScripting + 0x12
.equiv sMOVEEND_STATE, gBattleScripting + 0x14 .equiv sMOVEEND_STATE, gBattleScripting + 0x14
.equiv sFIELD_15, gBattleScripting + 0x15 .equiv sBANK_WITH_ABILITY, gBattleScripting + 0x15
.equiv sFIELD_16, gBattleScripting + 0x16 .equiv sMULTIHIT_EFFECT, gBattleScripting + 0x16
.equiv sBANK, gBattleScripting + 0x17 .equiv sBANK, gBattleScripting + 0x17
.equiv sANIM_TURN, gBattleScripting + 0x18 .equiv sANIM_TURN, gBattleScripting + 0x18
.equiv sANIM_TARGETS_HIT, gBattleScripting + 0x19 .equiv sANIM_TARGETS_HIT, gBattleScripting + 0x19
constants/constants.inc
-8
View File
@@ -1,20 +1,12 @@
.include "constants/gba_constants.inc" .include "constants/gba_constants.inc"
.include "constants/misc_constants.inc" .include "constants/misc_constants.inc"
.include "constants/species_constants.inc"
.include "constants/ability_constants.inc"
.include "constants/move_constants.inc"
.include "constants/item_constants.inc"
.include "constants/type_constants.inc" .include "constants/type_constants.inc"
.include "constants/contest_constants.inc" .include "constants/contest_constants.inc"
.include "constants/pokemon_data_constants.inc" .include "constants/pokemon_data_constants.inc"
.include "constants/item_data_constants.inc" .include "constants/item_data_constants.inc"
.include "constants/battle_move_constants.inc" .include "constants/battle_move_constants.inc"
.include "constants/easy_chat_constants.inc"
.include "constants/trainer_constants.inc" .include "constants/trainer_constants.inc"
.include "constants/battle_frontier_constants.inc" .include "constants/battle_frontier_constants.inc"
.include "constants/map_constants.inc" .include "constants/map_constants.inc"
.include "constants/map_object_constants.inc"
.include "constants/berry_constants.inc" .include "constants/berry_constants.inc"
.include "constants/field_object_constants.inc"
.include "constants/contest_move_effects.inc" .include "constants/contest_move_effects.inc"
.include "constants/songs.inc"
constants/easy_chat_constants.inc
-1067
View File
File diff suppressed because it is too large Load Diff
constants/field_object_constants.inc
-251
View File
@@ -1,251 +0,0 @@
.set FIELD_OBJ_GFX_BRENDAN_NORMAL, 0
.set FIELD_OBJ_GFX_BRENDAN_MACH_BIKE, 1
.set FIELD_OBJ_GFX_BRENDAN_SURFING, 2
.set FIELD_OBJ_GFX_BRENDAN_FIELD_MOVE, 3
.set FIELD_OBJ_GFX_QUINTY_PLUMP, 4
.set FIELD_OBJ_GFX_LITTLE_BOY_1, 5
.set FIELD_OBJ_GFX_LITTLE_GIRL_1, 6
.set FIELD_OBJ_GFX_BOY_1, 7
.set FIELD_OBJ_GFX_GIRL_1, 8
.set FIELD_OBJ_GFX_BOY_2, 9
.set FIELD_OBJ_GFX_GIRL_2, 10
.set FIELD_OBJ_GFX_LITTLE_BOY_2, 11
.set FIELD_OBJ_GFX_LITTLE_GIRL_2, 12
.set FIELD_OBJ_GFX_BOY_3, 13
.set FIELD_OBJ_GFX_GIRL_3, 14
.set FIELD_OBJ_GFX_BOY_4, 15
.set FIELD_OBJ_GFX_WOMAN_1, 16
.set FIELD_OBJ_GFX_FAT_MAN, 17
.set FIELD_OBJ_GFX_WOMAN_2, 18
.set FIELD_OBJ_GFX_MAN_1, 19
.set FIELD_OBJ_GFX_WOMAN_3, 20
.set FIELD_OBJ_GFX_OLD_MAN_1, 21
.set FIELD_OBJ_GFX_OLD_WOMAN_1, 22
.set FIELD_OBJ_GFX_MAN_2, 23
.set FIELD_OBJ_GFX_WOMAN_4, 24
.set FIELD_OBJ_GFX_MAN_3, 25
.set FIELD_OBJ_GFX_WOMAN_5, 26
.set FIELD_OBJ_GFX_COOK, 27
.set FIELD_OBJ_GFX_WOMAN_6, 28
.set FIELD_OBJ_GFX_OLD_MAN_2, 29
.set FIELD_OBJ_GFX_OLD_WOMAN_2, 30
.set FIELD_OBJ_GFX_CAMPER, 31
.set FIELD_OBJ_GFX_PICNICKER, 32
.set FIELD_OBJ_GFX_MAN_4, 33
.set FIELD_OBJ_GFX_WOMAN_7, 34
.set FIELD_OBJ_GFX_YOUNGSTER, 35
.set FIELD_OBJ_GFX_BUG_CATCHER, 36
.set FIELD_OBJ_GFX_PSYCHIC_M, 37
.set FIELD_OBJ_GFX_SCHOOL_KID_M, 38
.set FIELD_OBJ_GFX_MANIAC, 39
.set FIELD_OBJ_GFX_HEX_MANIAC, 40
.set FIELD_OBJ_GFX_RAYQUAZA_1, 41
.set FIELD_OBJ_GFX_SWIMMER_M, 42
.set FIELD_OBJ_GFX_SWIMMER_F, 43
.set FIELD_OBJ_GFX_BLACK_BELT, 44
.set FIELD_OBJ_GFX_BEAUTY, 45
.set FIELD_OBJ_GFX_SCIENTIST_1, 46
.set FIELD_OBJ_GFX_LASS, 47
.set FIELD_OBJ_GFX_GENTLEMAN, 48
.set FIELD_OBJ_GFX_SAILOR, 49
.set FIELD_OBJ_GFX_FISHERMAN, 50
.set FIELD_OBJ_GFX_RUNNING_TRIATHLETE_M, 51
.set FIELD_OBJ_GFX_RUNNING_TRIATHLETE_F, 52
.set FIELD_OBJ_GFX_TUBER_F, 53
.set FIELD_OBJ_GFX_TUBER_M, 54
.set FIELD_OBJ_GFX_HIKER, 55
.set FIELD_OBJ_GFX_CYCLING_TRIATHLETE_M, 56
.set FIELD_OBJ_GFX_CYCLING_TRIATHLETE_F, 57
.set FIELD_OBJ_GFX_NURSE, 58
.set FIELD_OBJ_GFX_ITEM_BALL, 59
.set FIELD_OBJ_GFX_BERRY_TREE, 60
.set FIELD_OBJ_GFX_BERRY_TREE_EARLY_STAGES, 61
.set FIELD_OBJ_GFX_BERRY_TREE_LATE_STAGES, 62
.set FIELD_OBJ_GFX_BRENDAN_ACRO_BIKE, 63
.set FIELD_OBJ_GFX_PROF_BIRCH, 64
.set FIELD_OBJ_GFX_MAN_5, 65
.set FIELD_OBJ_GFX_MAN_6, 66
.set FIELD_OBJ_GFX_REPORTER_M, 67
.set FIELD_OBJ_GFX_REPORTER_F, 68
.set FIELD_OBJ_GFX_MAUVILLE_OLD_MAN, 69
.set FIELD_OBJ_GFX_ANABEL, 70
.set FIELD_OBJ_GFX_TUCKER, 71
.set FIELD_OBJ_GFX_GRETA, 72
.set FIELD_OBJ_GFX_SPENSER, 73
.set FIELD_OBJ_GFX_NOLAND, 74
.set FIELD_OBJ_GFX_LUCY, 75
.set FIELD_OBJ_GFX_UNUSED_NATU_DOLL, 76
.set FIELD_OBJ_GFX_UNUSED_MAGNEMITE_DOLL, 77
.set FIELD_OBJ_GFX_UNUSED_SQUIRTLE_DOLL, 78
.set FIELD_OBJ_GFX_UNUSED_WOOPER_DOLL, 79
.set FIELD_OBJ_GFX_UNUSED_PIKACHU_DOLL, 80
.set FIELD_OBJ_GFX_UNUSED_PORYGON2_DOLL, 81
.set FIELD_OBJ_GFX_CUTTABLE_TREE, 82
.set FIELD_OBJ_GFX_MART_EMPLOYEE, 83
.set FIELD_OBJ_GFX_ROOFTOP_SALE_WOMAN, 84
.set FIELD_OBJ_GFX_TEALA, 85
.set FIELD_OBJ_GFX_BREAKABLE_ROCK, 86
.set FIELD_OBJ_GFX_PUSHABLE_BOULDER, 87
.set FIELD_OBJ_GFX_MR_BRINEYS_BOAT, 88
.set FIELD_OBJ_GFX_MAY_NORMAL, 89
.set FIELD_OBJ_GFX_MAY_MACH_BIKE, 90
.set FIELD_OBJ_GFX_MAY_ACRO_BIKE, 91
.set FIELD_OBJ_GFX_MAY_SURFING, 92
.set FIELD_OBJ_GFX_MAY_FIELD_MOVE, 93
.set FIELD_OBJ_GFX_TRUCK, 94
.set FIELD_OBJ_GFX_VIGOROTH_CARRYING_BOX, 95
.set FIELD_OBJ_GFX_VIGOROTH_FACING_AWAY, 96
.set FIELD_OBJ_GFX_BIRCHS_BAG, 97
.set FIELD_OBJ_GFX_ENEMY_ZIGZAGOON, 98
.set FIELD_OBJ_GFX_ARTIST, 99
.set FIELD_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 100
.set FIELD_OBJ_GFX_RIVAL_BRENDAN_MACH_BIKE, 101
.set FIELD_OBJ_GFX_RIVAL_BRENDAN_ACRO_BIKE, 102
.set FIELD_OBJ_GFX_RIVAL_BRENDAN_SURFING, 103
.set FIELD_OBJ_GFX_RIVAL_BRENDAN_FIELD_MOVE, 104
.set FIELD_OBJ_GFX_RIVAL_MAY_NORMAL, 105
.set FIELD_OBJ_GFX_RIVAL_MAY_MACH_BIKE, 106
.set FIELD_OBJ_GFX_RIVAL_MAY_ACRO_BIKE, 107
.set FIELD_OBJ_GFX_RIVAL_MAY_SURFING, 108
.set FIELD_OBJ_GFX_RIVAL_MAY_FIELD_MOVE, 109
.set FIELD_OBJ_GFX_CAMERAMAN, 110
.set FIELD_OBJ_GFX_BRENDAN_UNDERWATER, 111
.set FIELD_OBJ_GFX_MAY_UNDERWATER, 112
.set FIELD_OBJ_GFX_MOVING_BOX, 113
.set FIELD_OBJ_GFX_CABLE_CAR, 114
.set FIELD_OBJ_GFX_SCIENTIST_2, 115
.set FIELD_OBJ_GFX_MAN_7, 116
.set FIELD_OBJ_GFX_AQUA_MEMBER_M, 117
.set FIELD_OBJ_GFX_AQUA_MEMBER_F, 118
.set FIELD_OBJ_GFX_MAGMA_MEMBER_M, 119
.set FIELD_OBJ_GFX_MAGMA_MEMBER_F, 120
.set FIELD_OBJ_GFX_SIDNEY, 121
.set FIELD_OBJ_GFX_PHOEBE, 122
.set FIELD_OBJ_GFX_GLACIA, 123
.set FIELD_OBJ_GFX_DRAKE, 124
.set FIELD_OBJ_GFX_ROXANNE, 125
.set FIELD_OBJ_GFX_BRAWLY, 126
.set FIELD_OBJ_GFX_WATTSON, 127
.set FIELD_OBJ_GFX_FLANNERY, 128
.set FIELD_OBJ_GFX_NORMAN, 129
.set FIELD_OBJ_GFX_WINONA, 130
.set FIELD_OBJ_GFX_LIZA, 131
.set FIELD_OBJ_GFX_TATE, 132
.set FIELD_OBJ_GFX_WALLACE, 133
.set FIELD_OBJ_GFX_STEVEN, 134
.set FIELD_OBJ_GFX_WALLY, 135
.set FIELD_OBJ_GFX_RUBY_SAPPHIRE_LITTLE_BOY, 136
.set FIELD_OBJ_GFX_BRENDAN_FISHING, 137
.set FIELD_OBJ_GFX_MAY_FISHING, 138
.set FIELD_OBJ_GFX_HOT_SPRINGS_OLD_WOMAN, 139
.set FIELD_OBJ_GFX_SS_TIDAL, 140
.set FIELD_OBJ_GFX_SUBMARINE_SHADOW, 141
.set FIELD_OBJ_GFX_PICHU_DOLL, 142
.set FIELD_OBJ_GFX_PIKACHU_DOLL, 143
.set FIELD_OBJ_GFX_MARILL_DOLL, 144
.set FIELD_OBJ_GFX_TOGEPI_DOLL, 145
.set FIELD_OBJ_GFX_CYNDAQUIL_DOLL, 146
.set FIELD_OBJ_GFX_CHIKORITA_DOLL, 147
.set FIELD_OBJ_GFX_TOTODILE_DOLL, 148
.set FIELD_OBJ_GFX_JIGGLYPUFF_DOLL, 149
.set FIELD_OBJ_GFX_MEOWTH_DOLL, 150
.set FIELD_OBJ_GFX_CLEFAIRY_DOLL, 151
.set FIELD_OBJ_GFX_DITTO_DOLL, 152
.set FIELD_OBJ_GFX_SMOOCHUM_DOLL, 153
.set FIELD_OBJ_GFX_TREECKO_DOLL, 154
.set FIELD_OBJ_GFX_TORCHIC_DOLL, 155
.set FIELD_OBJ_GFX_MUDKIP_DOLL, 156
.set FIELD_OBJ_GFX_DUSKULL_DOLL, 157
.set FIELD_OBJ_GFX_WYNAUT_DOLL, 158
.set FIELD_OBJ_GFX_BALTOY_DOLL, 159
.set FIELD_OBJ_GFX_KECLEON_DOLL, 160
.set FIELD_OBJ_GFX_AZURILL_DOLL, 161
.set FIELD_OBJ_GFX_SKITTY_DOLL, 162
.set FIELD_OBJ_GFX_SWABLU_DOLL, 163
.set FIELD_OBJ_GFX_GULPIN_DOLL, 164
.set FIELD_OBJ_GFX_LOTAD_DOLL, 165
.set FIELD_OBJ_GFX_SEEDOT_DOLL, 166
.set FIELD_OBJ_GFX_PIKA_CUSHION, 167
.set FIELD_OBJ_GFX_ROUND_CUSHION, 168
.set FIELD_OBJ_GFX_KISS_CUSHION, 169
.set FIELD_OBJ_GFX_ZIGZAG_CUSHION, 170
.set FIELD_OBJ_GFX_SPIN_CUSHION, 171
.set FIELD_OBJ_GFX_DIAMOND_CUSHION, 172
.set FIELD_OBJ_GFX_BALL_CUSHION, 173
.set FIELD_OBJ_GFX_GRASS_CUSHION, 174
.set FIELD_OBJ_GFX_FIRE_CUSHION, 175
.set FIELD_OBJ_GFX_WATER_CUSHION, 176
.set FIELD_OBJ_GFX_BIG_SNORLAX_DOLL, 177
.set FIELD_OBJ_GFX_BIG_RHYDON_DOLL, 178
.set FIELD_OBJ_GFX_BIG_LAPRAS_DOLL, 179
.set FIELD_OBJ_GFX_BIG_VENUSAUR_DOLL, 180
.set FIELD_OBJ_GFX_BIG_CHARIZARD_DOLL, 181
.set FIELD_OBJ_GFX_BIG_BLASTOISE_DOLL, 182
.set FIELD_OBJ_GFX_BIG_WAILMER_DOLL, 183
.set FIELD_OBJ_GFX_BIG_REGIROCK_DOLL, 184
.set FIELD_OBJ_GFX_BIG_REGICE_DOLL, 185
.set FIELD_OBJ_GFX_BIG_REGISTEEL_DOLL, 186
.set FIELD_OBJ_GFX_LATIAS, 187
.set FIELD_OBJ_GFX_LATIOS, 188
.set FIELD_OBJ_GFX_BOY_5, 189
.set FIELD_OBJ_GFX_CONTEST_OLD_MAN, 190
.set FIELD_OBJ_GFX_BRENDAN_WATERING, 191
.set FIELD_OBJ_GFX_MAY_WATERING, 192
.set FIELD_OBJ_GFX_BRENDAN_UNKNOWN, 193
.set FIELD_OBJ_GFX_MAY_UNKNOWN, 194
.set FIELD_OBJ_GFX_ARCHIE, 195
.set FIELD_OBJ_GFX_MAXIE, 196
.set FIELD_OBJ_GFX_KYOGRE_1, 197
.set FIELD_OBJ_GFX_GROUDON_1, 198
.set FIELD_OBJ_GFX_FOSSIL, 199
.set FIELD_OBJ_GFX_REGIROCK, 200
.set FIELD_OBJ_GFX_REGICE, 201
.set FIELD_OBJ_GFX_REGISTEEL, 202
.set FIELD_OBJ_GFX_SKITTY, 203
.set FIELD_OBJ_GFX_KECLEON_1, 204
.set FIELD_OBJ_GFX_KYOGRE_2, 205
.set FIELD_OBJ_GFX_GROUDON_2, 206
.set FIELD_OBJ_GFX_RAYQUAZA_2, 207
.set FIELD_OBJ_GFX_ZIGZAGOON, 208
.set FIELD_OBJ_GFX_PIKACHU, 209
.set FIELD_OBJ_GFX_AZUMARILL, 210
.set FIELD_OBJ_GFX_WINGULL, 211
.set FIELD_OBJ_GFX_KECLEON_2, 212
.set FIELD_OBJ_GFX_TUBER_M_SWIMMING, 213
.set FIELD_OBJ_GFX_AZURILL, 214
.set FIELD_OBJ_GFX_MOM, 215
.set FIELD_OBJ_GFX_LINK_BRENDAN, 216
.set FIELD_OBJ_GFX_LINK_MAY, 217
.set FIELD_OBJ_GFX_JUAN, 218
.set FIELD_OBJ_GFX_SCOTT, 219
.set FIELD_OBJ_GFX_POOCHYENA, 220
.set FIELD_OBJ_GFX_KYOGRE_3, 221
.set FIELD_OBJ_GFX_GROUDON_3, 222
.set FIELD_OBJ_GFX_MYSTERY_EVENT_DELIVERYMAN, 223
.set FIELD_OBJ_GFX_STATUE, 224
.set FIELD_OBJ_GFX_KIRLIA, 225
.set FIELD_OBJ_GFX_DUSCLOPS, 226
.set FIELD_OBJ_GFX_UNION_ROOM_ATTENDANT, 227
.set FIELD_OBJ_GFX_SUDOWOODO, 228
.set FIELD_OBJ_GFX_MEW, 229
.set FIELD_OBJ_GFX_RED, 230
.set FIELD_OBJ_GFX_LEAF, 231
.set FIELD_OBJ_GFX_DEOXYS, 232
.set FIELD_OBJ_GFX_BIRTH_ISLAND_STONE, 233
.set FIELD_OBJ_GFX_BRANDON, 234
.set FIELD_OBJ_GFX_RUBY_SAPPHIRE_BRENDAN, 235
.set FIELD_OBJ_GFX_RUBY_SAPPHIRE_MAY, 236
.set FIELD_OBJ_GFX_LUGIA, 237
.set FIELD_OBJ_GFX_HO_OH, 238
.set SHADOW_SIZE_S, 0
.set SHADOW_SIZE_M, 1
.set SHADOW_SIZE_L, 2
.set SHADOW_SIZE_XL, 3
.set F_INANIMATE, 1 << 6
.set F_DISABLE_REFLECTION_PALETTE_LOAD, 1 << 7
.set TRACKS_NONE, 0
.set TRACKS_FOOT, 1
.set TRACKS_BIKE_TIRE, 2
constants/flags.inc
-1574
View File
File diff suppressed because it is too large Load Diff
constants/item_constants.inc
-310
View File
@@ -1,310 +0,0 @@
.set ITEM_NONE, 0x000
.set ITEM_MASTER_BALL, 0x001
.set ITEM_ULTRA_BALL, 0x002
.set ITEM_GREAT_BALL, 0x003
.set ITEM_POKE_BALL, 0x004
.set ITEM_SAFARI_BALL, 0x005
.set ITEM_NET_BALL, 0x006
.set ITEM_DIVE_BALL, 0x007
.set ITEM_NEST_BALL, 0x008
.set ITEM_REPEAT_BALL, 0x009
.set ITEM_TIMER_BALL, 0x00a
.set ITEM_LUXURY_BALL, 0x00b
.set ITEM_PREMIER_BALL, 0x00c
.set ITEM_POTION, 0x00d
.set ITEM_ANTIDOTE, 0x00e
.set ITEM_BURN_HEAL, 0x00f
.set ITEM_ICE_HEAL, 0x010
.set ITEM_AWAKENING, 0x011
.set ITEM_PARALYZE_HEAL, 0x012
.set ITEM_FULL_RESTORE, 0x013
.set ITEM_MAX_POTION, 0x014
.set ITEM_HYPER_POTION, 0x015
.set ITEM_SUPER_POTION, 0x016
.set ITEM_FULL_HEAL, 0x017
.set ITEM_REVIVE, 0x018
.set ITEM_MAX_REVIVE, 0x019
.set ITEM_FRESH_WATER, 0x01a
.set ITEM_SODA_POP, 0x01b
.set ITEM_LEMONADE, 0x01c
.set ITEM_MOOMOO_MILK, 0x01d
.set ITEM_ENERGY_POWDER, 0x01e
.set ITEM_ENERGY_ROOT, 0x01f
.set ITEM_HEAL_POWDER, 0x020
.set ITEM_REVIVAL_HERB, 0x021
.set ITEM_ETHER, 0x022
.set ITEM_MAX_ETHER, 0x023
.set ITEM_ELIXIR, 0x024
.set ITEM_MAX_ELIXIR, 0x025
.set ITEM_LAVA_COOKIE, 0x026
.set ITEM_BLUE_FLUTE, 0x027
.set ITEM_YELLOW_FLUTE, 0x028
.set ITEM_RED_FLUTE, 0x029
.set ITEM_BLACK_FLUTE, 0x02a
.set ITEM_WHITE_FLUTE, 0x02b
.set ITEM_BERRY_JUICE, 0x02c
.set ITEM_SACRED_ASH, 0x02d
.set ITEM_SHOAL_SALT, 0x02e
.set ITEM_SHOAL_SHELL, 0x02f
.set ITEM_RED_SHARD, 0x030
.set ITEM_BLUE_SHARD, 0x031
.set ITEM_YELLOW_SHARD, 0x032
.set ITEM_GREEN_SHARD, 0x033
.set ITEM_HP_UP, 0x03f
.set ITEM_PROTEIN, 0x040
.set ITEM_IRON, 0x041
.set ITEM_CARBOS, 0x042
.set ITEM_CALCIUM, 0x043
.set ITEM_RARE_CANDY, 0x044
.set ITEM_PP_UP, 0x045
.set ITEM_ZINC, 0x046
.set ITEM_PP_MAX, 0x047
.set ITEM_GUARD_SPEC, 0x049
.set ITEM_DIRE_HIT, 0x04a
.set ITEM_X_ATTACK, 0x04b
.set ITEM_X_DEFEND, 0x04c
.set ITEM_X_SPEED, 0x04d
.set ITEM_X_ACCURACY, 0x04e
.set ITEM_X_SPECIAL, 0x04f
.set ITEM_POKE_DOLL, 0x050
.set ITEM_FLUFFY_TAIL, 0x051
.set ITEM_SUPER_REPEL, 0x053
.set ITEM_MAX_REPEL, 0x054
.set ITEM_ESCAPE_ROPE, 0x055
.set ITEM_REPEL, 0x056
.set ITEM_SUN_STONE, 0x05d
.set ITEM_MOON_STONE, 0x05e
.set ITEM_FIRE_STONE, 0x05f
.set ITEM_THUNDER_STONE, 0x060
.set ITEM_WATER_STONE, 0x061
.set ITEM_LEAF_STONE, 0x062
.set ITEM_TINY_MUSHROOM, 0x067
.set ITEM_BIG_MUSHROOM, 0x068
.set ITEM_PEARL, 0x06a
.set ITEM_BIG_PEARL, 0x06b
.set ITEM_STARDUST, 0x06c
.set ITEM_STAR_PIECE, 0x06d
.set ITEM_NUGGET, 0x06e
.set ITEM_HEART_SCALE, 0x06f
.set ITEM_ORANGE_MAIL, 0x079
.set ITEM_HARBOR_MAIL, 0x07a
.set ITEM_GLITTER_MAIL, 0x07b
.set ITEM_MECH_MAIL, 0x07c
.set ITEM_WOOD_MAIL, 0x07d
.set ITEM_WAVE_MAIL, 0x07e
.set ITEM_BEAD_MAIL, 0x07f
.set ITEM_SHADOW_MAIL, 0x080
.set ITEM_TROPIC_MAIL, 0x081
.set ITEM_DREAM_MAIL, 0x082
.set ITEM_FAB_MAIL, 0x083
.set ITEM_RETRO_MAIL, 0x084
.set ITEM_CHERI_BERRY, 0x085
.set ITEM_CHESTO_BERRY, 0x086
.set ITEM_PECHA_BERRY, 0x087
.set ITEM_RAWST_BERRY, 0x088
.set ITEM_ASPEAR_BERRY, 0x089
.set ITEM_LEPPA_BERRY, 0x08a
.set ITEM_ORAN_BERRY, 0x08b
.set ITEM_PERSIM_BERRY, 0x08c
.set ITEM_LUM_BERRY, 0x08d
.set ITEM_SITRUS_BERRY, 0x08e
.set ITEM_FIGY_BERRY, 0x08f
.set ITEM_WIKI_BERRY, 0x090
.set ITEM_MAGO_BERRY, 0x091
.set ITEM_AGUAV_BERRY, 0x092
.set ITEM_IAPAPA_BERRY, 0x093
.set ITEM_RAZZ_BERRY, 0x094
.set ITEM_BLUK_BERRY, 0x095
.set ITEM_NANAB_BERRY, 0x096
.set ITEM_WEPEAR_BERRY, 0x097
.set ITEM_PINAP_BERRY, 0x098
.set ITEM_POMEG_BERRY, 0x099
.set ITEM_KELPSY_BERRY, 0x09a
.set ITEM_QUALOT_BERRY, 0x09b
.set ITEM_HONDEW_BERRY, 0x09c
.set ITEM_GREPA_BERRY, 0x09d
.set ITEM_TAMATO_BERRY, 0x09e
.set ITEM_CORNN_BERRY, 0x09f
.set ITEM_MAGOST_BERRY, 0x0a0
.set ITEM_RABUTA_BERRY, 0x0a1
.set ITEM_NOMEL_BERRY, 0x0a2
.set ITEM_SPELON_BERRY, 0x0a3
.set ITEM_PAMTRE_BERRY, 0x0a4
.set ITEM_WATMEL_BERRY, 0x0a5
.set ITEM_DURIN_BERRY, 0x0a6
.set ITEM_BELUE_BERRY, 0x0a7
.set ITEM_LIECHI_BERRY, 0x0a8
.set ITEM_GANLON_BERRY, 0x0a9
.set ITEM_SALAC_BERRY, 0x0aa
.set ITEM_PETAYA_BERRY, 0x0ab
.set ITEM_APICOT_BERRY, 0x0ac
.set ITEM_LANSAT_BERRY, 0x0ad
.set ITEM_STARF_BERRY, 0x0ae
.set ITEM_ENIGMA_BERRY, 0x0af
.set ITEM_BRIGHT_POWDER, 0x0b3
.set ITEM_WHITE_HERB, 0x0b4
.set ITEM_MACHO_BRACE, 0x0b5
.set ITEM_EXP_SHARE, 0x0b6
.set ITEM_QUICK_CLAW, 0x0b7
.set ITEM_SOOTHE_BELL, 0x0b8
.set ITEM_MENTAL_HERB, 0x0b9
.set ITEM_CHOICE_BAND, 0x0ba
.set ITEM_KINGS_ROCK, 0x0bb
.set ITEM_SILVER_POWDER, 0x0bc
.set ITEM_AMULET_COIN, 0x0bd
.set ITEM_CLEANSE_TAG, 0x0be
.set ITEM_SOUL_DEW, 0x0bf
.set ITEM_DEEP_SEA_TOOTH, 0x0c0
.set ITEM_DEEP_SEA_SCALE, 0x0c1
.set ITEM_SMOKE_BALL, 0x0c2
.set ITEM_EVERSTONE, 0x0c3
.set ITEM_FOCUS_BAND, 0x0c4
.set ITEM_LUCKY_EGG, 0x0c5
.set ITEM_SCOPE_LENS, 0x0c6
.set ITEM_METAL_COAT, 0x0c7
.set ITEM_LEFTOVERS, 0x0c8
.set ITEM_DRAGON_SCALE, 0x0c9
.set ITEM_LIGHT_BALL, 0x0ca
.set ITEM_SOFT_SAND, 0x0cb
.set ITEM_HARD_STONE, 0x0cc
.set ITEM_MIRACLE_SEED, 0x0cd
.set ITEM_BLACK_GLASSES, 0x0ce
.set ITEM_BLACK_BELT, 0x0cf
.set ITEM_MAGNET, 0x0d0
.set ITEM_MYSTIC_WATER, 0x0d1
.set ITEM_SHARP_BEAK, 0x0d2
.set ITEM_POISON_BARB, 0x0d3
.set ITEM_NEVER_MELT_ICE, 0x0d4
.set ITEM_SPELL_TAG, 0x0d5
.set ITEM_TWISTED_SPOON, 0x0d6
.set ITEM_CHARCOAL, 0x0d7
.set ITEM_DRAGON_FANG, 0x0d8
.set ITEM_SILK_SCARF, 0x0d9
.set ITEM_UP_GRADE, 0x0da
.set ITEM_SHELL_BELL, 0x0db
.set ITEM_SEA_INCENSE, 0x0dc
.set ITEM_LAX_INCENSE, 0x0dd
.set ITEM_LUCKY_PUNCH, 0x0de
.set ITEM_METAL_POWDER, 0x0df
.set ITEM_THICK_CLUB, 0x0e0
.set ITEM_STICK, 0x0e1
.set ITEM_RED_SCARF, 0x0fe
.set ITEM_BLUE_SCARF, 0x0ff
.set ITEM_PINK_SCARF, 0x100
.set ITEM_GREEN_SCARF, 0x101
.set ITEM_YELLOW_SCARF, 0x102
.set ITEM_MACH_BIKE, 0x103
.set ITEM_COIN_CASE, 0x104
.set ITEM_ITEMFINDER, 0x105
.set ITEM_OLD_ROD, 0x106
.set ITEM_GOOD_ROD, 0x107
.set ITEM_SUPER_ROD, 0x108
.set ITEM_SS_TICKET, 0x109
.set ITEM_CONTEST_PASS, 0x10a
.set ITEM_WAILMER_PAIL, 0x10c
.set ITEM_DEVON_GOODS, 0x10d
.set ITEM_SOOT_SACK, 0x10e
.set ITEM_BASEMENT_KEY, 0x10f
.set ITEM_ACRO_BIKE, 0x110
.set ITEM_POKEBLOCK_CASE, 0x111
.set ITEM_LETTER, 0x112
.set ITEM_EON_TICKET, 0x113
.set ITEM_RED_ORB, 0x114
.set ITEM_BLUE_ORB, 0x115
.set ITEM_SCANNER, 0x116
.set ITEM_GO_GOGGLES, 0x117
.set ITEM_METEORITE, 0x118
.set ITEM_ROOM_1_KEY, 0x119
.set ITEM_ROOM_2_KEY, 0x11a
.set ITEM_ROOM_4_KEY, 0x11b
.set ITEM_ROOM_6_KEY, 0x11c
.set ITEM_STORAGE_KEY, 0x11d
.set ITEM_ROOT_FOSSIL, 0x11e
.set ITEM_CLAW_FOSSIL, 0x11f
.set ITEM_DEVON_SCOPE, 0x120
.set ITEM_TM01, 0x121
.set ITEM_TM02, 0x122
.set ITEM_TM03, 0x123
.set ITEM_TM04, 0x124
.set ITEM_TM05, 0x125
.set ITEM_TM06, 0x126
.set ITEM_TM07, 0x127
.set ITEM_TM08, 0x128
.set ITEM_TM09, 0x129
.set ITEM_TM10, 0x12a
.set ITEM_TM11, 0x12b
.set ITEM_TM12, 0x12c
.set ITEM_TM13, 0x12d
.set ITEM_TM14, 0x12e
.set ITEM_TM15, 0x12f
.set ITEM_TM16, 0x130
.set ITEM_TM17, 0x131
.set ITEM_TM18, 0x132
.set ITEM_TM19, 0x133
.set ITEM_TM20, 0x134
.set ITEM_TM21, 0x135
.set ITEM_TM22, 0x136
.set ITEM_TM23, 0x137
.set ITEM_TM24, 0x138
.set ITEM_TM25, 0x139
.set ITEM_TM26, 0x13a
.set ITEM_TM27, 0x13b
.set ITEM_TM28, 0x13c
.set ITEM_TM29, 0x13d
.set ITEM_TM30, 0x13e
.set ITEM_TM31, 0x13f
.set ITEM_TM32, 0x140
.set ITEM_TM33, 0x141
.set ITEM_TM34, 0x142
.set ITEM_TM35, 0x143
.set ITEM_TM36, 0x144
.set ITEM_TM37, 0x145
.set ITEM_TM38, 0x146
.set ITEM_TM39, 0x147
.set ITEM_TM40, 0x148
.set ITEM_TM41, 0x149
.set ITEM_TM42, 0x14a
.set ITEM_TM43, 0x14b
.set ITEM_TM44, 0x14c
.set ITEM_TM45, 0x14d
.set ITEM_TM46, 0x14e
.set ITEM_TM47, 0x14f
.set ITEM_TM48, 0x150
.set ITEM_TM49, 0x151
.set ITEM_TM50, 0x152
.set ITEM_HM01, 0x153
.set ITEM_HM02, 0x154
.set ITEM_HM03, 0x155
.set ITEM_HM04, 0x156
.set ITEM_HM05, 0x157
.set ITEM_HM06, 0x158
.set ITEM_HM07, 0x159
.set ITEM_HM08, 0x15a
.set ITEM_OAKS_PARCEL, 0x15d
.set ITEM_POKE_FLUTE, 0x15e
.set ITEM_SECRET_KEY, 0x15f
.set ITEM_BIKE_VOUCHER, 0x160
.set ITEM_GOLD_TEETH, 0x161
.set ITEM_OLD_AMBER, 0x162
.set ITEM_CARD_KEY, 0x163
.set ITEM_LIFT_KEY, 0x164
.set ITEM_HELIX_FOSSIL, 0x165
.set ITEM_DOME_FOSSIL, 0x166
.set ITEM_SILPH_SCOPE, 0x167
.set ITEM_BICYCLE, 0x168
.set ITEM_TOWN_MAP, 0x169
.set ITEM_VS_SEEKER, 0x16a
.set ITEM_FAME_CHECKER, 0x16b
.set ITEM_TM_CASE, 0x16c
.set ITEM_BERRY_POUCH, 0x16d
.set ITEM_TEACHY_TV, 0x16e
.set ITEM_TRI_PASS, 0x16f
.set ITEM_RAINBOW_PASS, 0x170
.set ITEM_TEA, 0x171
.set ITEM_MYSTIC_TICKET, 0x172
.set ITEM_AURORA_TICKET, 0x173
.set ITEM_POWDER_JAR, 0x174
.set ITEM_RUBY, 0x175
.set ITEM_SAPPHIRE, 0x176
.set ITEM_MAGMA_EMBLEM, 0x177
.set ITEM_OLD_SEA_MAP, 0x178
constants/map_constants.inc
+1
View File
@@ -1,3 +1,4 @@
@ TODO: these need to match the names in include/constants/maps.h
.set cur_map_group, -1 .set cur_map_group, -1
new_map_group new_map_group
constants/map_object_constants.inc
-258
View File
@@ -1,258 +0,0 @@
.set MAP_OBJ_GFX_BRENDAN_NORMAL, 0
.set MAP_OBJ_GFX_BRENDAN_MACH_BIKE, 1
.set MAP_OBJ_GFX_BRENDAN_SURFING, 2
.set MAP_OBJ_GFX_BRENDAN_FIELD_MOVE, 3
.set MAP_OBJ_GFX_QUINTY_PLUMP, 4
.set MAP_OBJ_GFX_LITTLE_BOY_1, 5
.set MAP_OBJ_GFX_LITTLE_GIRL_1, 6
.set MAP_OBJ_GFX_BOY_1, 7
.set MAP_OBJ_GFX_GIRL_1, 8
.set MAP_OBJ_GFX_BOY_2, 9
.set MAP_OBJ_GFX_GIRL_2, 10
.set MAP_OBJ_GFX_LITTLE_BOY_2, 11
.set MAP_OBJ_GFX_LITTLE_GIRL_2, 12
.set MAP_OBJ_GFX_BOY_3, 13
.set MAP_OBJ_GFX_GIRL_3, 14
.set MAP_OBJ_GFX_BOY_4, 15
.set MAP_OBJ_GFX_WOMAN_1, 16
.set MAP_OBJ_GFX_FAT_MAN, 17
.set MAP_OBJ_GFX_WOMAN_2, 18
.set MAP_OBJ_GFX_MAN_1, 19
.set MAP_OBJ_GFX_WOMAN_3, 20
.set MAP_OBJ_GFX_OLD_MAN_1, 21
.set MAP_OBJ_GFX_OLD_WOMAN_1, 22
.set MAP_OBJ_GFX_MAN_2, 23
.set MAP_OBJ_GFX_WOMAN_4, 24
.set MAP_OBJ_GFX_MAN_3, 25
.set MAP_OBJ_GFX_WOMAN_5, 26
.set MAP_OBJ_GFX_COOK, 27
.set MAP_OBJ_GFX_WOMAN_6, 28
.set MAP_OBJ_GFX_OLD_MAN_2, 29
.set MAP_OBJ_GFX_OLD_WOMAN_2, 30
.set MAP_OBJ_GFX_CAMPER, 31
.set MAP_OBJ_GFX_PICNICKER, 32
.set MAP_OBJ_GFX_MAN_4, 33
.set MAP_OBJ_GFX_WOMAN_7, 34
.set MAP_OBJ_GFX_YOUNGSTER, 35
.set MAP_OBJ_GFX_BUG_CATCHER, 36
.set MAP_OBJ_GFX_PSYCHIC_M, 37
.set MAP_OBJ_GFX_SCHOOL_KID_M, 38
.set MAP_OBJ_GFX_MANIAC, 39
.set MAP_OBJ_GFX_HEX_MANIAC, 40
.set MAP_OBJ_GFX_RAYQUAZA_1, 41
.set MAP_OBJ_GFX_SWIMMER_M, 42
.set MAP_OBJ_GFX_SWIMMER_F, 43
.set MAP_OBJ_GFX_BLACK_BELT, 44
.set MAP_OBJ_GFX_BEAUTY, 45
.set MAP_OBJ_GFX_SCIENTIST_1, 46
.set MAP_OBJ_GFX_LASS, 47
.set MAP_OBJ_GFX_GENTLEMAN, 48
.set MAP_OBJ_GFX_SAILOR, 49
.set MAP_OBJ_GFX_FISHERMAN, 50
.set MAP_OBJ_GFX_RUNNING_TRIATHLETE_M, 51
.set MAP_OBJ_GFX_RUNNING_TRIATHLETE_F, 52
.set MAP_OBJ_GFX_TUBER_F, 53
.set MAP_OBJ_GFX_TUBER_M, 54
.set MAP_OBJ_GFX_HIKER, 55
.set MAP_OBJ_GFX_CYCLING_TRIATHLETE_M, 56
.set MAP_OBJ_GFX_CYCLING_TRIATHLETE_F, 57
.set MAP_OBJ_GFX_NURSE, 58
.set MAP_OBJ_GFX_ITEM_BALL, 59
.set MAP_OBJ_GFX_BERRY_TREE, 60
.set MAP_OBJ_GFX_BERRY_TREE_EARLY_STAGES, 61
.set MAP_OBJ_GFX_BERRY_TREE_LATE_STAGES, 62
.set MAP_OBJ_GFX_BRENDAN_ACRO_BIKE, 63
.set MAP_OBJ_GFX_PROF_BIRCH, 64
.set MAP_OBJ_GFX_MAN_5, 65
.set MAP_OBJ_GFX_MAN_6, 66
.set MAP_OBJ_GFX_REPORTER_M, 67
.set MAP_OBJ_GFX_REPORTER_F, 68
.set MAP_OBJ_GFX_BARD, 69
.set MAP_OBJ_GFX_ANABEL, 70
.set MAP_OBJ_GFX_TUCKER, 71
.set MAP_OBJ_GFX_GRETA, 72
.set MAP_OBJ_GFX_SPENSER, 73
.set MAP_OBJ_GFX_NOLAND, 74
.set MAP_OBJ_GFX_LUCY, 75
.set MAP_OBJ_GFX_UNUSED_NATU_DOLL, 76
.set MAP_OBJ_GFX_UNUSED_MAGNEMITE_DOLL, 77
.set MAP_OBJ_GFX_UNUSED_SQUIRTLE_DOLL, 78
.set MAP_OBJ_GFX_UNUSED_WOOPER_DOLL, 79
.set MAP_OBJ_GFX_UNUSED_PIKACHU_DOLL, 80
.set MAP_OBJ_GFX_UNUSED_PORYGON2_DOLL, 81
.set MAP_OBJ_GFX_CUTTABLE_TREE, 82
.set MAP_OBJ_GFX_MART_EMPLOYEE, 83
.set MAP_OBJ_GFX_ROOFTOP_SALE_WOMAN, 84
.set MAP_OBJ_GFX_TEALA, 85
.set MAP_OBJ_GFX_BREAKABLE_ROCK, 86
.set MAP_OBJ_GFX_PUSHABLE_BOULDER, 87
.set MAP_OBJ_GFX_MR_BRINEYS_BOAT, 88
.set MAP_OBJ_GFX_MAY_NORMAL, 89
.set MAP_OBJ_GFX_MAY_MACH_BIKE, 90
.set MAP_OBJ_GFX_MAY_ACRO_BIKE, 91
.set MAP_OBJ_GFX_MAY_SURFING, 92
.set MAP_OBJ_GFX_MAY_FIELD_MOVE, 93
.set MAP_OBJ_GFX_TRUCK, 94
.set MAP_OBJ_GFX_VIGAROTH_CARRYING_BOX, 95
.set MAP_OBJ_GFX_VIGAROTH_FACING_AWAY, 96
.set MAP_OBJ_GFX_BIRCHS_BAG, 97
.set MAP_OBJ_GFX_ZIGZAGOON_1, 98
.set MAP_OBJ_GFX_ARTIST, 99
.set MAP_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 100
.set MAP_OBJ_GFX_RIVAL_BRENDAN_MACH_BIKE, 101
.set MAP_OBJ_GFX_RIVAL_BRENDAN_ACRO_BIKE, 102
.set MAP_OBJ_GFX_RIVAL_BRENDAN_SURFING, 103
.set MAP_OBJ_GFX_RIVAL_BRENDAN_FIELD_MOVE, 104
.set MAP_OBJ_GFX_RIVAL_MAY_NORMAL, 105
.set MAP_OBJ_GFX_RIVAL_MAY_MACH_BIKE, 106
.set MAP_OBJ_GFX_RIVAL_MAY_ACRO_BIKE, 107
.set MAP_OBJ_GFX_RIVAL_MAY_SURFING, 108
.set MAP_OBJ_GFX_RIVAL_MAY_FIELD_MOVE, 109
.set MAP_OBJ_GFX_CAMERAMAN, 110
.set MAP_OBJ_GFX_BRENDAN_UNDERWATER, 111
.set MAP_OBJ_GFX_MAY_UNDERWATER, 112
.set MAP_OBJ_GFX_MOVING_BOX, 113
.set MAP_OBJ_GFX_CABLE_CAR, 114
.set MAP_OBJ_GFX_SCIENTIST_2, 115
.set MAP_OBJ_GFX_MAN_7, 116
.set MAP_OBJ_GFX_AQUA_MEMBER_M, 117
.set MAP_OBJ_GFX_AQUA_MEMBER_F, 118
.set MAP_OBJ_GFX_MAGMA_MEMBER_M, 119
.set MAP_OBJ_GFX_MAGMA_MEMBER_F, 120
.set MAP_OBJ_GFX_SIDNEY, 121
.set MAP_OBJ_GFX_PHOEBE, 122
.set MAP_OBJ_GFX_GLACIA, 123
.set MAP_OBJ_GFX_DRAKE, 124
.set MAP_OBJ_GFX_ROXANNE, 125
.set MAP_OBJ_GFX_BRAWLY, 126
.set MAP_OBJ_GFX_WATTSON, 127
.set MAP_OBJ_GFX_FLANNERY, 128
.set MAP_OBJ_GFX_NORMAN, 129
.set MAP_OBJ_GFX_WINONA, 130
.set MAP_OBJ_GFX_LIZA, 131
.set MAP_OBJ_GFX_TATE, 132
.set MAP_OBJ_GFX_WALLACE, 133
.set MAP_OBJ_GFX_STEVEN, 134
.set MAP_OBJ_GFX_WALLY, 135
.set MAP_OBJ_GFX_LITTLE_BOY_3, 136
.set MAP_OBJ_GFX_BRENDAN_FISHING, 137
.set MAP_OBJ_GFX_MAY_FISHING, 138
.set MAP_OBJ_GFX_HOT_SPRINGS_OLD_WOMAN, 139
.set MAP_OBJ_GFX_SS_TIDAL, 140
.set MAP_OBJ_GFX_SUBMARINE_SHADOW, 141
.set MAP_OBJ_GFX_PICHU_DOLL, 142
.set MAP_OBJ_GFX_PIKACHU_DOLL, 143
.set MAP_OBJ_GFX_MARILL_DOLL, 144
.set MAP_OBJ_GFX_TOGEPI_DOLL, 145
.set MAP_OBJ_GFX_CYNDAQUIL_DOLL, 146
.set MAP_OBJ_GFX_CHIKORITA_DOLL, 147
.set MAP_OBJ_GFX_TOTODILE_DOLL, 148
.set MAP_OBJ_GFX_JIGGLYPUFF_DOLL, 149
.set MAP_OBJ_GFX_MEOWTH_DOLL, 150
.set MAP_OBJ_GFX_CLEFAIRY_DOLL, 151
.set MAP_OBJ_GFX_DITTO_DOLL, 152
.set MAP_OBJ_GFX_SMOOCHUM_DOLL, 153
.set MAP_OBJ_GFX_TREECKO_DOLL, 154
.set MAP_OBJ_GFX_TORCHIC_DOLL, 155
.set MAP_OBJ_GFX_MUDKIP_DOLL, 156
.set MAP_OBJ_GFX_DUSKULL_DOLL, 157
.set MAP_OBJ_GFX_WYNAUT_DOLL, 158
.set MAP_OBJ_GFX_BALTOY_DOLL, 159
.set MAP_OBJ_GFX_KECLEON_DOLL, 160
.set MAP_OBJ_GFX_AZURILL_DOLL, 161
.set MAP_OBJ_GFX_SKITTY_DOLL, 162
.set MAP_OBJ_GFX_SWABLU_DOLL, 163
.set MAP_OBJ_GFX_GULPIN_DOLL, 164
.set MAP_OBJ_GFX_LOTAD_DOLL, 165
.set MAP_OBJ_GFX_SEEDOT_DOLL, 166
.set MAP_OBJ_GFX_PIKA_CUSHION, 167
.set MAP_OBJ_GFX_ROUND_CUSHION, 168
.set MAP_OBJ_GFX_KISS_CUSHION, 169
.set MAP_OBJ_GFX_ZIGZAG_CUSHION, 170
.set MAP_OBJ_GFX_SPIN_CUSHION, 171
.set MAP_OBJ_GFX_DIAMOND_CUSHION, 172
.set MAP_OBJ_GFX_BALL_CUSHION, 173
.set MAP_OBJ_GFX_GRASS_CUSHION, 174
.set MAP_OBJ_GFX_FIRE_CUSHION, 175
.set MAP_OBJ_GFX_WATER_CUSHION, 176
.set MAP_OBJ_GFX_BIG_SNORLAX_DOLL, 177
.set MAP_OBJ_GFX_BIG_RHYDON_DOLL, 178
.set MAP_OBJ_GFX_BIG_LAPRAS_DOLL, 179
.set MAP_OBJ_GFX_BIG_VENUSAUR_DOLL, 180
.set MAP_OBJ_GFX_BIG_CHARIZARD_DOLL, 181
.set MAP_OBJ_GFX_BIG_BLASTOISE_DOLL, 182
.set MAP_OBJ_GFX_BIG_WAILMER_DOLL, 183
.set MAP_OBJ_GFX_BIG_REGIROCK_DOLL, 184
.set MAP_OBJ_GFX_BIG_REGICE_DOLL, 185
.set MAP_OBJ_GFX_BIG_REGISTEEL_DOLL, 186
.set MAP_OBJ_GFX_LATIAS, 187
.set MAP_OBJ_GFX_LATIOS, 188
.set MAP_OBJ_GFX_BOY_5, 189
.set MAP_OBJ_GFX_CONTEST_JUDGE, 190
.set MAP_OBJ_GFX_BRENDAN_WATERING, 191
.set MAP_OBJ_GFX_MAY_WATERING, 192
.set MAP_OBJ_GFX_BRENDAN_DECORATING, 193
.set MAP_OBJ_GFX_MAY_DECORATING, 194
.set MAP_OBJ_GFX_ARCHIE, 195
.set MAP_OBJ_GFX_MAXIE, 196
.set MAP_OBJ_GFX_KYOGRE_1, 197
.set MAP_OBJ_GFX_GROUDON_1, 198
.set MAP_OBJ_GFX_FOSSIL, 199
.set MAP_OBJ_GFX_REGIROCK, 200
.set MAP_OBJ_GFX_REGICE, 201
.set MAP_OBJ_GFX_REGISTEEL, 202
.set MAP_OBJ_GFX_SKITTY, 203
.set MAP_OBJ_GFX_KECLEON_1, 204
.set MAP_OBJ_GFX_KYOGRE_2, 205
.set MAP_OBJ_GFX_GROUDON_2, 206
.set MAP_OBJ_GFX_RAYQUAZA_2, 207
.set MAP_OBJ_GFX_ZIGZAGOON_2, 208
.set MAP_OBJ_GFX_PIKACHU, 209
.set MAP_OBJ_GFX_AZUMARILL, 210
.set MAP_OBJ_GFX_WINGULL, 211
.set MAP_OBJ_GFX_KECLEON_2, 212
.set MAP_OBJ_GFX_TUBER_M_SWIMMING, 213
.set MAP_OBJ_GFX_AZURILL, 214
.set MAP_OBJ_GFX_MOM, 215
.set MAP_OBJ_GFX_LINK_BRENDAN, 216
.set MAP_OBJ_GFX_LINK_MAY, 217
.set MAP_OBJ_GFX_JUAN, 218
.set MAP_OBJ_GFX_SCOTT, 219
.set MAP_OBJ_GFX_POOCHYENA, 220
.set MAP_OBJ_GFX_KYOGRE_3, 221
.set MAP_OBJ_GFX_GROUDON_3, 222
.set MAP_OBJ_GFX_MYSTERY_GIFT_MAN, 223
.set MAP_OBJ_GFX_TRICK_HOUSE_STATUE, 224
.set MAP_OBJ_GFX_KIRLIA, 225
.set MAP_OBJ_GFX_DUSCLOPS, 226
.set MAP_OBJ_GFX_UNION_ROOM_NURSE, 227
.set MAP_OBJ_GFX_SUDOWOODO, 228
.set MAP_OBJ_GFX_MEW, 229
.set MAP_OBJ_GFX_RED, 230
.set MAP_OBJ_GFX_LEAF, 231
.set MAP_OBJ_GFX_DEOXYS, 232
.set MAP_OBJ_GFX_DEOXYS_TRIANGLE, 233
.set MAP_OBJ_GFX_BRANDON, 234
.set MAP_OBJ_GFX_LINK_RS_BRENDAN, 235
.set MAP_OBJ_GFX_LINK_RS_MAY, 236
.set MAP_OBJ_GFX_LUGIA, 237
.set MAP_OBJ_GFX_HOOH, 238
.set MAP_OBJ_GFX_BARD_2, 239
.set MAP_OBJ_GFX_HIPSTER, 240
.set MAP_OBJ_GFX_TRADER, 241
.set MAP_OBJ_GFX_STORYTELLER, 242
.set MAP_OBJ_GFX_GIDDY, 243
.set MAP_OBJ_GFX_PLACEHOLDER_1, 244
.set MAP_OBJ_GFX_PLACEHOLDER_2, 245
.set SHADOW_SIZE_S, 0
.set SHADOW_SIZE_M, 1
.set SHADOW_SIZE_L, 2
.set SHADOW_SIZE_XL, 3
.set F_INANIMATE, 1 << 6
.set F_DISABLE_REFLECTION_PALETTE_LOAD, 1 << 7
.set TRACKS_NONE, 0
.set TRACKS_FOOT, 1
.set TRACKS_BIKE_TIRE, 2
constants/move_constants.inc
-355
View File
@@ -1,355 +0,0 @@
.set MOVE_NONE, 0x000
.set MOVE_POUND, 0x001
.set MOVE_KARATE_CHOP, 0x002
.set MOVE_DOUBLE_SLAP, 0x003
.set MOVE_COMET_PUNCH, 0x004
.set MOVE_MEGA_PUNCH, 0x005
.set MOVE_PAY_DAY, 0x006
.set MOVE_FIRE_PUNCH, 0x007
.set MOVE_ICE_PUNCH, 0x008
.set MOVE_THUNDER_PUNCH, 0x009
.set MOVE_SCRATCH, 0x00a
.set MOVE_VICE_GRIP, 0x00b
.set MOVE_GUILLOTINE, 0x00c
.set MOVE_RAZOR_WIND, 0x00d
.set MOVE_SWORDS_DANCE, 0x00e
.set MOVE_CUT, 0x00f
.set MOVE_GUST, 0x010
.set MOVE_WING_ATTACK, 0x011
.set MOVE_WHIRLWIND, 0x012
.set MOVE_FLY, 0x013
.set MOVE_BIND, 0x014
.set MOVE_SLAM, 0x015
.set MOVE_VINE_WHIP, 0x016
.set MOVE_STOMP, 0x017
.set MOVE_DOUBLE_KICK, 0x018
.set MOVE_MEGA_KICK, 0x019
.set MOVE_JUMP_KICK, 0x01a
.set MOVE_ROLLING_KICK, 0x01b
.set MOVE_SAND_ATTACK, 0x01c
.set MOVE_HEADBUTT, 0x01d
.set MOVE_HORN_ATTACK, 0x01e
.set MOVE_FURY_ATTACK, 0x01f
.set MOVE_HORN_DRILL, 0x020
.set MOVE_TACKLE, 0x021
.set MOVE_BODY_SLAM, 0x022
.set MOVE_WRAP, 0x023
.set MOVE_TAKE_DOWN, 0x024
.set MOVE_THRASH, 0x025
.set MOVE_DOUBLE_EDGE, 0x026
.set MOVE_TAIL_WHIP, 0x027
.set MOVE_POISON_STING, 0x028
.set MOVE_TWINEEDLE, 0x029
.set MOVE_PIN_MISSILE, 0x02a
.set MOVE_LEER, 0x02b
.set MOVE_BITE, 0x02c
.set MOVE_GROWL, 0x02d
.set MOVE_ROAR, 0x02e
.set MOVE_SING, 0x02f
.set MOVE_SUPERSONIC, 0x030
.set MOVE_SONIC_BOOM, 0x031
.set MOVE_DISABLE, 0x032
.set MOVE_ACID, 0x033
.set MOVE_EMBER, 0x034
.set MOVE_FLAMETHROWER, 0x035
.set MOVE_MIST, 0x036
.set MOVE_WATER_GUN, 0x037
.set MOVE_HYDRO_PUMP, 0x038
.set MOVE_SURF, 0x039
.set MOVE_ICE_BEAM, 0x03a
.set MOVE_BLIZZARD, 0x03b
.set MOVE_PSYBEAM, 0x03c
.set MOVE_BUBBLE_BEAM, 0x03d
.set MOVE_AURORA_BEAM, 0x03e
.set MOVE_HYPER_BEAM, 0x03f
.set MOVE_PECK, 0x040
.set MOVE_DRILL_PECK, 0x041
.set MOVE_SUBMISSION, 0x042
.set MOVE_LOW_KICK, 0x043
.set MOVE_COUNTER, 0x044
.set MOVE_SEISMIC_TOSS, 0x045
.set MOVE_STRENGTH, 0x046
.set MOVE_ABSORB, 0x047
.set MOVE_MEGA_DRAIN, 0x048
.set MOVE_LEECH_SEED, 0x049
.set MOVE_GROWTH, 0x04a
.set MOVE_RAZOR_LEAF, 0x04b
.set MOVE_SOLAR_BEAM, 0x04c
.set MOVE_POISON_POWDER, 0x04d
.set MOVE_STUN_SPORE, 0x04e
.set MOVE_SLEEP_POWDER, 0x04f
.set MOVE_PETAL_DANCE, 0x050
.set MOVE_STRING_SHOT, 0x051
.set MOVE_DRAGON_RAGE, 0x052
.set MOVE_FIRE_SPIN, 0x053
.set MOVE_THUNDER_SHOCK, 0x054
.set MOVE_THUNDERBOLT, 0x055
.set MOVE_THUNDER_WAVE, 0x056
.set MOVE_THUNDER, 0x057
.set MOVE_ROCK_THROW, 0x058
.set MOVE_EARTHQUAKE, 0x059
.set MOVE_FISSURE, 0x05a
.set MOVE_DIG, 0x05b
.set MOVE_TOXIC, 0x05c
.set MOVE_CONFUSION, 0x05d
.set MOVE_PSYCHIC, 0x05e
.set MOVE_HYPNOSIS, 0x05f
.set MOVE_MEDITATE, 0x060
.set MOVE_AGILITY, 0x061
.set MOVE_QUICK_ATTACK, 0x062
.set MOVE_RAGE, 0x063
.set MOVE_TELEPORT, 0x064
.set MOVE_NIGHT_SHADE, 0x065
.set MOVE_MIMIC, 0x066
.set MOVE_SCREECH, 0x067
.set MOVE_DOUBLE_TEAM, 0x068
.set MOVE_RECOVER, 0x069
.set MOVE_HARDEN, 0x06a
.set MOVE_MINIMIZE, 0x06b
.set MOVE_SMOKESCREEN, 0x06c
.set MOVE_CONFUSE_RAY, 0x06d
.set MOVE_WITHDRAW, 0x06e
.set MOVE_DEFENSE_CURL, 0x06f
.set MOVE_BARRIER, 0x070
.set MOVE_LIGHT_SCREEN, 0x071
.set MOVE_HAZE, 0x072
.set MOVE_REFLECT, 0x073
.set MOVE_FOCUS_ENERGY, 0x074
.set MOVE_BIDE, 0x075
.set MOVE_METRONOME, 0x076
.set MOVE_MIRROR_MOVE, 0x077
.set MOVE_SELF_DESTRUCT, 0x078
.set MOVE_EGG_BOMB, 0x079
.set MOVE_LICK, 0x07a
.set MOVE_SMOG, 0x07b
.set MOVE_SLUDGE, 0x07c
.set MOVE_BONE_CLUB, 0x07d
.set MOVE_FIRE_BLAST, 0x07e
.set MOVE_WATERFALL, 0x07f
.set MOVE_CLAMP, 0x080
.set MOVE_SWIFT, 0x081
.set MOVE_SKULL_BASH, 0x082
.set MOVE_SPIKE_CANNON, 0x083
.set MOVE_CONSTRICT, 0x084
.set MOVE_AMNESIA, 0x085
.set MOVE_KINESIS, 0x086
.set MOVE_SOFT_BOILED, 0x087
.set MOVE_HI_JUMP_KICK, 0x088
.set MOVE_GLARE, 0x089
.set MOVE_DREAM_EATER, 0x08a
.set MOVE_POISON_GAS, 0x08b
.set MOVE_BARRAGE, 0x08c
.set MOVE_LEECH_LIFE, 0x08d
.set MOVE_LOVELY_KISS, 0x08e
.set MOVE_SKY_ATTACK, 0x08f
.set MOVE_TRANSFORM, 0x090
.set MOVE_BUBBLE, 0x091
.set MOVE_DIZZY_PUNCH, 0x092
.set MOVE_SPORE, 0x093
.set MOVE_FLASH, 0x094
.set MOVE_PSYWAVE, 0x095
.set MOVE_SPLASH, 0x096
.set MOVE_ACID_ARMOR, 0x097
.set MOVE_CRABHAMMER, 0x098
.set MOVE_EXPLOSION, 0x099
.set MOVE_FURY_SWIPES, 0x09a
.set MOVE_BONEMERANG, 0x09b
.set MOVE_REST, 0x09c
.set MOVE_ROCK_SLIDE, 0x09d
.set MOVE_HYPER_FANG, 0x09e
.set MOVE_SHARPEN, 0x09f
.set MOVE_CONVERSION, 0x0a0
.set MOVE_TRI_ATTACK, 0x0a1
.set MOVE_SUPER_FANG, 0x0a2
.set MOVE_SLASH, 0x0a3
.set MOVE_SUBSTITUTE, 0x0a4
.set MOVE_STRUGGLE, 0x0a5
.set MOVE_SKETCH, 0x0a6
.set MOVE_TRIPLE_KICK, 0x0a7
.set MOVE_THIEF, 0x0a8
.set MOVE_SPIDER_WEB, 0x0a9
.set MOVE_MIND_READER, 0x0aa
.set MOVE_NIGHTMARE, 0x0ab
.set MOVE_FLAME_WHEEL, 0x0ac
.set MOVE_SNORE, 0x0ad
.set MOVE_CURSE, 0x0ae
.set MOVE_FLAIL, 0x0af
.set MOVE_CONVERSION_2, 0x0b0
.set MOVE_AEROBLAST, 0x0b1
.set MOVE_COTTON_SPORE, 0x0b2
.set MOVE_REVERSAL, 0x0b3
.set MOVE_SPITE, 0x0b4
.set MOVE_POWDER_SNOW, 0x0b5
.set MOVE_PROTECT, 0x0b6
.set MOVE_MACH_PUNCH, 0x0b7
.set MOVE_SCARY_FACE, 0x0b8
.set MOVE_FAINT_ATTACK, 0x0b9
.set MOVE_SWEET_KISS, 0x0ba
.set MOVE_BELLY_DRUM, 0x0bb
.set MOVE_SLUDGE_BOMB, 0x0bc
.set MOVE_MUD_SLAP, 0x0bd
.set MOVE_OCTAZOOKA, 0x0be
.set MOVE_SPIKES, 0x0bf
.set MOVE_ZAP_CANNON, 0x0c0
.set MOVE_FORESIGHT, 0x0c1
.set MOVE_DESTINY_BOND, 0x0c2
.set MOVE_PERISH_SONG, 0x0c3
.set MOVE_ICY_WIND, 0x0c4
.set MOVE_DETECT, 0x0c5
.set MOVE_BONE_RUSH, 0x0c6
.set MOVE_LOCK_ON, 0x0c7
.set MOVE_OUTRAGE, 0x0c8
.set MOVE_SANDSTORM, 0x0c9
.set MOVE_GIGA_DRAIN, 0x0ca
.set MOVE_ENDURE, 0x0cb
.set MOVE_CHARM, 0x0cc
.set MOVE_ROLLOUT, 0x0cd
.set MOVE_FALSE_SWIPE, 0x0ce
.set MOVE_SWAGGER, 0x0cf
.set MOVE_MILK_DRINK, 0x0d0
.set MOVE_SPARK, 0x0d1
.set MOVE_FURY_CUTTER, 0x0d2
.set MOVE_STEEL_WING, 0x0d3
.set MOVE_MEAN_LOOK, 0x0d4
.set MOVE_ATTRACT, 0x0d5
.set MOVE_SLEEP_TALK, 0x0d6
.set MOVE_HEAL_BELL, 0x0d7
.set MOVE_RETURN, 0x0d8
.set MOVE_PRESENT, 0x0d9
.set MOVE_FRUSTRATION, 0x0da
.set MOVE_SAFEGUARD, 0x0db
.set MOVE_PAIN_SPLIT, 0x0dc
.set MOVE_SACRED_FIRE, 0x0dd
.set MOVE_MAGNITUDE, 0x0de
.set MOVE_DYNAMIC_PUNCH, 0x0df
.set MOVE_MEGAHORN, 0x0e0
.set MOVE_DRAGON_BREATH, 0x0e1
.set MOVE_BATON_PASS, 0x0e2
.set MOVE_ENCORE, 0x0e3
.set MOVE_PURSUIT, 0x0e4
.set MOVE_RAPID_SPIN, 0x0e5
.set MOVE_SWEET_SCENT, 0x0e6
.set MOVE_IRON_TAIL, 0x0e7
.set MOVE_METAL_CLAW, 0x0e8
.set MOVE_VITAL_THROW, 0x0e9
.set MOVE_MORNING_SUN, 0x0ea
.set MOVE_SYNTHESIS, 0x0eb
.set MOVE_MOONLIGHT, 0x0ec
.set MOVE_HIDDEN_POWER, 0x0ed
.set MOVE_CROSS_CHOP, 0x0ee
.set MOVE_TWISTER, 0x0ef
.set MOVE_RAIN_DANCE, 0x0f0
.set MOVE_SUNNY_DAY, 0x0f1
.set MOVE_CRUNCH, 0x0f2
.set MOVE_MIRROR_COAT, 0x0f3
.set MOVE_PSYCH_UP, 0x0f4
.set MOVE_EXTREME_SPEED, 0x0f5
.set MOVE_ANCIENT_POWER, 0x0f6
.set MOVE_SHADOW_BALL, 0x0f7
.set MOVE_FUTURE_SIGHT, 0x0f8
.set MOVE_ROCK_SMASH, 0x0f9
.set MOVE_WHIRLPOOL, 0x0fa
.set MOVE_BEAT_UP, 0x0fb
.set MOVE_FAKE_OUT, 0x0fc
.set MOVE_UPROAR, 0x0fd
.set MOVE_STOCKPILE, 0x0fe
.set MOVE_SPIT_UP, 0x0ff
.set MOVE_SWALLOW, 0x100
.set MOVE_HEAT_WAVE, 0x101
.set MOVE_HAIL, 0x102
.set MOVE_TORMENT, 0x103
.set MOVE_FLATTER, 0x104
.set MOVE_WILL_O_WISP, 0x105
.set MOVE_MEMENTO, 0x106
.set MOVE_FACADE, 0x107
.set MOVE_FOCUS_PUNCH, 0x108
.set MOVE_SMELLING_SALT, 0x109
.set MOVE_FOLLOW_ME, 0x10a
.set MOVE_NATURE_POWER, 0x10b
.set MOVE_CHARGE, 0x10c
.set MOVE_TAUNT, 0x10d
.set MOVE_HELPING_HAND, 0x10e
.set MOVE_TRICK, 0x10f
.set MOVE_ROLE_PLAY, 0x110
.set MOVE_WISH, 0x111
.set MOVE_ASSIST, 0x112
.set MOVE_INGRAIN, 0x113
.set MOVE_SUPERPOWER, 0x114
.set MOVE_MAGIC_COAT, 0x115
.set MOVE_RECYCLE, 0x116
.set MOVE_REVENGE, 0x117
.set MOVE_BRICK_BREAK, 0x118
.set MOVE_YAWN, 0x119
.set MOVE_KNOCK_OFF, 0x11a
.set MOVE_ENDEAVOR, 0x11b
.set MOVE_ERUPTION, 0x11c
.set MOVE_SKILL_SWAP, 0x11d
.set MOVE_IMPRISON, 0x11e
.set MOVE_REFRESH, 0x11f
.set MOVE_GRUDGE, 0x120
.set MOVE_SNATCH, 0x121
.set MOVE_SECRET_POWER, 0x122
.set MOVE_DIVE, 0x123
.set MOVE_ARM_THRUST, 0x124
.set MOVE_CAMOUFLAGE, 0x125
.set MOVE_TAIL_GLOW, 0x126
.set MOVE_LUSTER_PURGE, 0x127
.set MOVE_MIST_BALL, 0x128
.set MOVE_FEATHER_DANCE, 0x129
.set MOVE_TEETER_DANCE, 0x12a
.set MOVE_BLAZE_KICK, 0x12b
.set MOVE_MUD_SPORT, 0x12c
.set MOVE_ICE_BALL, 0x12d
.set MOVE_NEEDLE_ARM, 0x12e
.set MOVE_SLACK_OFF, 0x12f
.set MOVE_HYPER_VOICE, 0x130
.set MOVE_POISON_FANG, 0x131
.set MOVE_CRUSH_CLAW, 0x132
.set MOVE_BLAST_BURN, 0x133
.set MOVE_HYDRO_CANNON, 0x134
.set MOVE_METEOR_MASH, 0x135
.set MOVE_ASTONISH, 0x136
.set MOVE_WEATHER_BALL, 0x137
.set MOVE_AROMATHERAPY, 0x138
.set MOVE_FAKE_TEARS, 0x139
.set MOVE_AIR_CUTTER, 0x13a
.set MOVE_OVERHEAT, 0x13b
.set MOVE_ODOR_SLEUTH, 0x13c
.set MOVE_ROCK_TOMB, 0x13d
.set MOVE_SILVER_WIND, 0x13e
.set MOVE_METAL_SOUND, 0x13f
.set MOVE_GRASS_WHISTLE, 0x140
.set MOVE_TICKLE, 0x141
.set MOVE_COSMIC_POWER, 0x142
.set MOVE_WATER_SPOUT, 0x143
.set MOVE_SIGNAL_BEAM, 0x144
.set MOVE_SHADOW_PUNCH, 0x145
.set MOVE_EXTRASENSORY, 0x146
.set MOVE_SKY_UPPERCUT, 0x147
.set MOVE_SAND_TOMB, 0x148
.set MOVE_SHEER_COLD, 0x149
.set MOVE_MUDDY_WATER, 0x14a
.set MOVE_BULLET_SEED, 0x14b
.set MOVE_AERIAL_ACE, 0x14c
.set MOVE_ICICLE_SPEAR, 0x14d
.set MOVE_IRON_DEFENSE, 0x14e
.set MOVE_BLOCK, 0x14f
.set MOVE_HOWL, 0x150
.set MOVE_DRAGON_CLAW, 0x151
.set MOVE_FRENZY_PLANT, 0x152
.set MOVE_BULK_UP, 0x153
.set MOVE_BOUNCE, 0x154
.set MOVE_MUD_SHOT, 0x155
.set MOVE_POISON_TAIL, 0x156
.set MOVE_COVET, 0x157
.set MOVE_VOLT_TACKLE, 0x158
.set MOVE_MAGICAL_LEAF, 0x159
.set MOVE_WATER_SPORT, 0x15a
.set MOVE_CALM_MIND, 0x15b
.set MOVE_LEAF_BLADE, 0x15c
.set MOVE_DRAGON_DANCE, 0x15d
.set MOVE_ROCK_BLAST, 0x15e
.set MOVE_SHOCK_WAVE, 0x15f
.set MOVE_WATER_PULSE, 0x160
.set MOVE_DOOM_DESIRE, 0x161
.set MOVE_PSYCHO_BOOST, 0x162
constants/songs.inc
-461
View File
@@ -1,461 +0,0 @@
.equiv SE_STOP, 0
.equiv SE_KAIFUKU, 1
.equiv SE_PC_LOGON, 2
.equiv SE_PC_OFF, 3
.equiv SE_PC_ON, 4
.equiv SE_SELECT, 5
.equiv SE_WIN_OPEN, 6
.equiv SE_WALL_HIT, 7
.equiv SE_DOOR, 8
.equiv SE_KAIDAN, 9
.equiv SE_DANSA, 10
.equiv SE_JITENSYA, 11
.equiv SE_KOUKA_L, 12
.equiv SE_KOUKA_M, 13
.equiv SE_KOUKA_H, 14
.equiv SE_BOWA2, 15
.equiv SE_POKE_DEAD, 16
.equiv SE_NIGERU, 17
.equiv SE_JIDO_DOA, 18
.equiv SE_NAMINORI, 19
.equiv SE_BAN, 20
.equiv SE_PIN, 21
.equiv SE_BOO, 22
.equiv SE_BOWA, 23
.equiv SE_JYUNI, 24
.equiv SE_A, 25
.equiv SE_I, 26
.equiv SE_U, 27
.equiv SE_E, 28
.equiv SE_O, 29
.equiv SE_N, 30
.equiv SE_SEIKAI, 31
.equiv SE_HAZURE, 32
.equiv SE_EXP, 33
.equiv SE_JITE_PYOKO, 34
.equiv SE_MU_PACHI, 35
.equiv SE_TK_KASYA, 36
.equiv SE_FU_ZAKU, 37
.equiv SE_FU_ZAKU2, 38
.equiv SE_FU_ZUZUZU, 39
.equiv SE_RU_GASHIN, 40
.equiv SE_RU_GASYAN, 41
.equiv SE_RU_BARI, 42
.equiv SE_RU_HYUU, 43
.equiv SE_KI_GASYAN, 44
.equiv SE_TK_WARPIN, 45
.equiv SE_TK_WARPOUT, 46
.equiv SE_TU_SAA, 47
.equiv SE_HI_TURUN, 48
.equiv SE_TRACK_MOVE, 49
.equiv SE_TRACK_STOP, 50
.equiv SE_TRACK_HAIK, 51
.equiv SE_TRACK_DOOR, 52
.equiv SE_MOTER, 53
.equiv SE_CARD, 54
.equiv SE_SAVE, 55
.equiv SE_KON, 56
.equiv SE_KON2, 57
.equiv SE_KON3, 58
.equiv SE_KON4, 59
.equiv SE_SUIKOMU, 60
.equiv SE_NAGERU, 61
.equiv SE_TOY_C, 62
.equiv SE_TOY_D, 63
.equiv SE_TOY_E, 64
.equiv SE_TOY_F, 65
.equiv SE_TOY_G, 66
.equiv SE_TOY_A, 67
.equiv SE_TOY_B, 68
.equiv SE_TOY_C1, 69
.equiv SE_MIZU, 70
.equiv SE_HASHI, 71
.equiv SE_DAUGI, 72
.equiv SE_PINPON, 73
.equiv SE_FUUSEN1, 74
.equiv SE_FUUSEN2, 75
.equiv SE_FUUSEN3, 76
.equiv SE_TOY_KABE, 77
.equiv SE_TOY_DANGO, 78
.equiv SE_DOKU, 79
.equiv SE_ESUKA, 80
.equiv SE_T_AME, 81
.equiv SE_T_AME_E, 82
.equiv SE_T_OOAME, 83
.equiv SE_T_OOAME_E, 84
.equiv SE_T_KOAME, 85
.equiv SE_T_KOAME_E, 86
.equiv SE_T_KAMI, 87
.equiv SE_T_KAMI2, 88
.equiv SE_ELEBETA, 89
.equiv SE_HINSI, 90
.equiv SE_EXPMAX, 91
.equiv SE_TAMAKORO, 92
.equiv SE_TAMAKORO_E, 93
.equiv SE_BASABASA, 94
.equiv SE_REGI, 95
.equiv SE_C_GAJI, 96
.equiv SE_C_MAKU_U, 97
.equiv SE_C_MAKU_D, 98
.equiv SE_C_PASI, 99
.equiv SE_C_SYU, 100
.equiv SE_C_PIKON, 101
.equiv SE_REAPOKE, 102
.equiv SE_OP_BASYU, 103
.equiv SE_BT_START, 104
.equiv SE_DENDOU, 105
.equiv SE_JIHANKI, 106
.equiv SE_TAMA, 107
.equiv SE_Z_SCROLL, 108
.equiv SE_Z_PAGE, 109
.equiv SE_PN_ON, 110
.equiv SE_PN_OFF, 111
.equiv SE_Z_SEARCH, 112
.equiv SE_TAMAGO, 113
.equiv SE_TB_START, 114
.equiv SE_TB_KON, 115
.equiv SE_TB_KARA, 116
.equiv SE_BIDORO, 117
.equiv SE_W085, 118
.equiv SE_W085B, 119
.equiv SE_W231, 120
.equiv SE_W171, 121
.equiv SE_W233, 122
.equiv SE_W233B, 123
.equiv SE_W145, 124
.equiv SE_W145B, 125
.equiv SE_W145C, 126
.equiv SE_W240, 127
.equiv SE_W015, 128
.equiv SE_W081, 129
.equiv SE_W081B, 130
.equiv SE_W088, 131
.equiv SE_W016, 132
.equiv SE_W016B, 133
.equiv SE_W003, 134
.equiv SE_W104, 135
.equiv SE_W013, 136
.equiv SE_W196, 137
.equiv SE_W086, 138
.equiv SE_W004, 139
.equiv SE_W025, 140
.equiv SE_W025B, 141
.equiv SE_W152, 142
.equiv SE_W026, 143
.equiv SE_W172, 144
.equiv SE_W172B, 145
.equiv SE_W053, 146
.equiv SE_W007, 147
.equiv SE_W092, 148
.equiv SE_W221, 149
.equiv SE_W221B, 150
.equiv SE_W052, 151
.equiv SE_W036, 152
.equiv SE_W059, 153
.equiv SE_W059B, 154
.equiv SE_W010, 155
.equiv SE_W011, 156
.equiv SE_W017, 157
.equiv SE_W019, 158
.equiv SE_W028, 159
.equiv SE_W013B, 160
.equiv SE_W044, 161
.equiv SE_W029, 162
.equiv SE_W057, 163
.equiv SE_W056, 164
.equiv SE_W250, 165
.equiv SE_W030, 166
.equiv SE_W039, 167
.equiv SE_W054, 168
.equiv SE_W077, 169
.equiv SE_W020, 170
.equiv SE_W082, 171
.equiv SE_W047, 172
.equiv SE_W195, 173
.equiv SE_W006, 174
.equiv SE_W091, 175
.equiv SE_W146, 176
.equiv SE_W120, 177
.equiv SE_W153, 178
.equiv SE_W071B, 179
.equiv SE_W071, 180
.equiv SE_W103, 181
.equiv SE_W062, 182
.equiv SE_W062B, 183
.equiv SE_W048, 184
.equiv SE_W187, 185
.equiv SE_W118, 186
.equiv SE_W155, 187
.equiv SE_W122, 188
.equiv SE_W060, 189
.equiv SE_W185, 190
.equiv SE_W014, 191
.equiv SE_W043, 192
.equiv SE_W207, 193
.equiv SE_W207B, 194
.equiv SE_W215, 195
.equiv SE_W109, 196
.equiv SE_W173, 197
.equiv SE_W280, 198
.equiv SE_W202, 199
.equiv SE_W060B, 200
.equiv SE_W076, 201
.equiv SE_W080, 202
.equiv SE_W100, 203
.equiv SE_W107, 204
.equiv SE_W166, 205
.equiv SE_W129, 206
.equiv SE_W115, 207
.equiv SE_W112, 208
.equiv SE_W197, 209
.equiv SE_W199, 210
.equiv SE_W236, 211
.equiv SE_W204, 212
.equiv SE_W268, 213
.equiv SE_W070, 214
.equiv SE_W063, 215
.equiv SE_W127, 216
.equiv SE_W179, 217
.equiv SE_W151, 218
.equiv SE_W201, 219
.equiv SE_W161, 220
.equiv SE_W161B, 221
.equiv SE_W227, 222
.equiv SE_W227B, 223
.equiv SE_W226, 224
.equiv SE_W208, 225
.equiv SE_W213, 226
.equiv SE_W213B, 227
.equiv SE_W234, 228
.equiv SE_W260, 229
.equiv SE_W328, 230
.equiv SE_W320, 231
.equiv SE_W255, 232
.equiv SE_W291, 233
.equiv SE_W089, 234
.equiv SE_W239, 235
.equiv SE_W230, 236
.equiv SE_W281, 237
.equiv SE_W327, 238
.equiv SE_W287, 239
.equiv SE_W257, 240
.equiv SE_W253, 241
.equiv SE_W258, 242
.equiv SE_W322, 243
.equiv SE_W298, 244
.equiv SE_W287B, 245
.equiv SE_W114, 246
.equiv SE_W063B, 247
.equiv BGM_STOP, 349
.equiv BGM_TETSUJI, 350
.equiv BGM_FIELD13, 351
.equiv BGM_KACHI22, 352
.equiv BGM_KACHI2, 353
.equiv BGM_KACHI3, 354
.equiv BGM_KACHI5, 355
.equiv BGM_PCC, 356
.equiv BGM_NIBI, 357
.equiv BGM_SUIKUN, 358
.equiv BGM_DOORO1, 359
.equiv BGM_DOORO_X1, 360
.equiv BGM_DOORO_X3, 361
.equiv BGM_MACHI_S2, 362
.equiv BGM_MACHI_S4, 363
.equiv BGM_GIM, 364
.equiv BGM_NAMINORI, 365
.equiv BGM_DAN01, 366
.equiv BGM_FANFA1, 367
.equiv BGM_ME_ASA, 368
.equiv BGM_ME_BACHI, 369
.equiv BGM_FANFA4, 370
.equiv BGM_FANFA5, 371
.equiv BGM_ME_WAZA, 372
.equiv BGM_BIJYUTU, 373
.equiv BGM_DOORO_X4, 374
.equiv BGM_FUNE_KAN, 375
.equiv BGM_ME_SHINKA, 376
.equiv BGM_SHINKA, 377
.equiv BGM_ME_WASURE, 378
.equiv BGM_SYOUJOEYE, 379
.equiv BGM_BOYEYE, 380
.equiv BGM_DAN02, 381
.equiv BGM_MACHI_S3, 382
.equiv BGM_ODAMAKI, 383
.equiv BGM_B_TOWER, 384
.equiv BGM_SWIMEYE, 385
.equiv BGM_DAN03, 386
.equiv BGM_ME_KINOMI, 387
.equiv BGM_ME_TAMA, 388
.equiv BGM_ME_B_BIG, 389
.equiv BGM_ME_B_SMALL, 390
.equiv BGM_ME_ZANNEN, 391
.equiv BGM_BD_TIME, 392
.equiv BGM_TEST1, 393
.equiv BGM_TEST2, 394
.equiv BGM_TEST3, 395
.equiv BGM_TEST4, 396
.equiv BGM_TEST, 397
.equiv BGM_GOMACHI0, 398
.equiv BGM_GOTOWN, 399
.equiv BGM_POKECEN, 400
.equiv BGM_NEXTROAD, 401
.equiv BGM_GRANROAD, 402
.equiv BGM_CYCLING, 403
.equiv BGM_FRIENDLY, 404
.equiv BGM_MISHIRO, 405
.equiv BGM_TOZAN, 406
.equiv BGM_GIRLEYE, 407
.equiv BGM_MINAMO, 408
.equiv BGM_ASHROAD, 409
.equiv BGM_EVENT0, 410
.equiv BGM_DEEPDEEP, 411
.equiv BGM_KACHI1, 412
.equiv BGM_TITLE3, 413
.equiv BGM_DEMO1, 414
.equiv BGM_GIRL_SUP, 415
.equiv BGM_HAGESHII, 416
.equiv BGM_KAKKOII, 417
.equiv BGM_KAZANBAI, 418
.equiv BGM_AQA_0, 419
.equiv BGM_TSURETEK, 420
.equiv BGM_BOY_SUP, 421
.equiv BGM_RAINBOW, 422
.equiv BGM_AYASII, 423
.equiv BGM_KACHI4, 424
.equiv BGM_ROPEWAY, 425
.equiv BGM_CASINO, 426
.equiv BGM_HIGHTOWN, 427
.equiv BGM_SAFARI, 428
.equiv BGM_C_ROAD, 429
.equiv BGM_AJITO, 430
.equiv BGM_M_BOAT, 431
.equiv BGM_M_DUNGON, 432
.equiv BGM_FINECITY, 433
.equiv BGM_MACHUPI, 434
.equiv BGM_P_SCHOOL, 435
.equiv BGM_DENDOU, 436
.equiv BGM_TONEKUSA, 437
.equiv BGM_MABOROSI, 438
.equiv BGM_CON_FAN, 439
.equiv BGM_CONTEST0, 440
.equiv BGM_MGM0, 441
.equiv BGM_T_BATTLE, 442
.equiv BGM_OOAME, 443
.equiv BGM_HIDERI, 444
.equiv BGM_RUNECITY, 445
.equiv BGM_CON_K, 446
.equiv BGM_EIKOU_R, 447
.equiv BGM_KARAKURI, 448
.equiv BGM_HUTAGO, 449
.equiv BGM_SITENNOU, 450
.equiv BGM_YAMA_EYE, 451
.equiv BGM_CONLOBBY, 452
.equiv BGM_INTER_V, 453
.equiv BGM_DAIGO, 454
.equiv BGM_THANKFOR, 455
.equiv BGM_END, 456
.equiv BGM_BATTLE_FRONTIER, 457
.equiv BGM_BATTLE_ARENA, 458
.equiv BGM_ME_BATTLE_POINTS, 459
.equiv BGM_ME_MATCH_CALL, 460
.equiv BGM_BATTLE_PYRAMID, 461
.equiv BGM_BATTLE_PYRAMID_SUMMIT, 462
.equiv BGM_BATTLE_PALACE, 463
.equiv BGM_FANFA_RAYQUAZA, 464
.equiv BGM_BATTLE_TOWER, 465
.equiv BGM_ME_BATTLE_SYMBOL, 466
.equiv BGM_BATTLE_DOME_TOURNAMENT, 467
.equiv BGM_BATTLE_PIKE, 468
.equiv BGM_BATTLE_FACTORY, 469
.equiv BGM_BATTLE_LEGENDARY, 470
.equiv BGM_BATTLE_FRONTIER_BRAIN, 471
.equiv BGM_BATTLE_MEW, 472
.equiv BGM_BATTLE_DOME, 473
.equiv BGM_BATTLE27, 474
.equiv BGM_BATTLE31, 475
.equiv BGM_BATTLE20, 476
.equiv BGM_BATTLE32, 477
.equiv BGM_BATTLE33, 478
.equiv BGM_BATTLE36, 479
.equiv BGM_BATTLE34, 480
.equiv BGM_BATTLE35, 481
.equiv BGM_BATTLE38, 482
.equiv BGM_BATTLE30, 483
.equiv BGM_FRLG_FOLLOW_ME, 484
.equiv BGM_FRLG_GAMECORNER, 485
.equiv BGM_FRLG_ROCKET_HIDEOUT, 486
.equiv BGM_FRLG_GYM, 487
.equiv BGM_FRLG_JIGGLYPUFF, 488
.equiv BGM_FRLG_OPENING, 489
.equiv BGM_FRLG_TITLE, 490
.equiv BGM_FRLG_CINNABAR_ISLAND, 491
.equiv BGM_FRLG_LAVENDER_TOWN, 492
.equiv BGM_FRLG_HEALING_TEST, 493
.equiv BGM_FRLG_BICYCLE, 494
.equiv BGM_FRLG_SUSPICIOUS_EYE, 495
.equiv BGM_FRLG_GIRL_EYE, 496
.equiv BGM_FRLG_BOY_EYE, 497
.equiv BGM_FRLG_CONGRATULATIONS_HALL_OF_FAME, 498
.equiv BGM_FRLG_VIRIDIAN_FOREST, 499
.equiv BGM_FRLG_MT_MOON, 500
.equiv BGM_FRLG_POKEMON_MANSION, 501
.equiv BGM_FRLG_CREDITS, 502
.equiv BGM_FRLG_ROUTE_1, 503
.equiv BGM_FRLG_ROUTE_24, 504
.equiv BGM_FRLG_ROUTE_3, 505
.equiv BGM_FRLG_ROUTE_11, 506
.equiv BGM_FRLG_INDIGO_PLATEAU, 507
.equiv BGM_FRLG_BATTLE_LEADER, 508
.equiv BGM_FRLG_BATTLE_TRAINER, 509
.equiv BGM_FRLG_BATTLE_WILD_POKEMON, 510
.equiv BGM_FRLG_BATTLE_CHAMPION, 511
.equiv BGM_FRLG_PALLET_TOWN, 512
.equiv BGM_FRLG_OAK_LAB, 513
.equiv BGM_FRLG_PROF_OAK, 514
.equiv BGM_FRLG_POKEMON_CENTER, 515
.equiv BGM_FRLG_SS_ANNE, 516
.equiv BGM_FRLG_SURF, 517
.equiv BGM_FRLG_POKEMON_TOWER, 518
.equiv BGM_FRLG_SILPH, 519
.equiv BGM_FRLG_CERULEAN_CITY, 520
.equiv BGM_FRLG_CELADON_CITY, 521
.equiv BGM_FRLG_KACHI_TRAINER, 522
.equiv BGM_FRLG_KACHI_WILD_POKEMON, 523
.equiv BGM_FRLG_KACHI_LEADER, 524
.equiv BGM_FRLG_VERMILION_CITY, 525
.equiv BGM_FRLG_VIRIDIAN_CITY, 526
.equiv BGM_FRLG_RIVAL, 527
.equiv BGM_FRLG_RIVAL_POSTBATTLE, 528
.equiv BGM_FRLG_ME_POKEDEX_EVAL, 529
.equiv BGM_FRLG_ME_KEYITEM, 530
.equiv BGM_FRLG_FANFA_POKEMON_CAUGHT, 531
.equiv BGM_FRLG_FANFA_TRAINERCARD_PHOTO, 532
.equiv BGM_FRLG_GAMEFREAK_LOGO, 533
.equiv BGM_FRLG_CAUGHT_POKEMON, 534
.equiv BGM_FRLG_GAME_EXPLANATION_START, 535
.equiv BGM_FRLG_GAME_EXPLANATION_MIDDLE, 536
.equiv BGM_FRLG_GAME_EXPLANATION_END, 537
.equiv BGM_FRLG_POKEMON_JUMP, 538
.equiv BGM_FRLG_UNION_ROOM, 539
.equiv BGM_FRLG_POKEMON_NETWORK_CENTER, 540
.equiv BGM_FRLG_MYSTERY_GIFT, 541
.equiv BGM_FRLG_DODRIO_BERRY_PICK, 542
.equiv BGM_FRLG_MT_EMBER, 543
.equiv BGM_FRLG_TEACHY_TV_EPISODE, 544
.equiv BGM_FRLG_SEVII_ISLANDS, 545
.equiv BGM_FRLG_TANOBY_RUINS, 546
.equiv BGM_FRLG_ISLAND_ONE, 547
.equiv BGM_FRLG_ISLAND_FOUR, 548
.equiv BGM_FRLG_ISLAND_SIX, 549
.equiv BGM_FRLG_FLUTE, 550
.equiv BGM_FRLG_BATTLE_DEOXYS, 551
.equiv BGM_FRLG_BATTLE_MEWTWO, 552
.equiv BGM_FRLG_BATTLE_LEGENDARY, 553
.equiv BGM_FRLG_LEADER_EYE, 554
.equiv BGM_FRLG_DEOXYS_EYE, 555
.equiv BGM_FRLG_TRAINER_TOWER, 556
.equiv BGM_FRLG_HALL_OF_FAME_PALLET_TOWN, 557
.equiv BGM_FRLG_TEACHY_TV, 558
.equiv BGM_ROUTE_118, 0x7fff
constants/variables.inc
-278
View File
@@ -1,278 +0,0 @@
.equiv VAR_0x4000, 0x4000
.equiv VAR_0x4001, 0x4001
.equiv VAR_0x4002, 0x4002
.equiv VAR_0x4003, 0x4003
.equiv VAR_0x4004, 0x4004
.equiv VAR_0x4005, 0x4005
.equiv VAR_0x4006, 0x4006
.equiv VAR_0x4007, 0x4007
.equiv VAR_0x4008, 0x4008
.equiv VAR_0x4009, 0x4009
.equiv VAR_0x400A, 0x400A
.equiv VAR_0x400B, 0x400B
.equiv VAR_0x400C, 0x400C
.equiv VAR_0x400D, 0x400D
.equiv VAR_0x400E, 0x400E
.equiv VAR_0x400F, 0x400F
.equiv VAR_0x4010, 0x4010
.equiv VAR_0x4011, 0x4011
.equiv VAR_0x4012, 0x4012
.equiv VAR_0x4013, 0x4013
.equiv VAR_0x4014, 0x4014
.equiv VAR_0x4015, 0x4015
.equiv VAR_0x4016, 0x4016
.equiv VAR_0x4017, 0x4017
.equiv VAR_0x4018, 0x4018
.equiv VAR_0x4019, 0x4019
.equiv VAR_0x401A, 0x401A
.equiv VAR_0x401B, 0x401B
.equiv VAR_0x401C, 0x401C
.equiv VAR_0x401D, 0x401D
.equiv VAR_0x401E, 0x401E
.equiv VAR_0x401F, 0x401F
.equiv VAR_RECYCLE_GOODS, 0x4020
.equiv VAR_REPEL_STEP_COUNT, 0x4021
.equiv VAR_ICE_STEP_COUNT, 0x4022
.equiv VAR_FIRST_POKE, 0x4023
.equiv VAR_MIRAGE_RND_H, 0x4024
.equiv VAR_MIRAGE_RND_L, 0x4025
.equiv VAR_SECRET_BASE_MAP, 0x4026
.equiv VAR_0x4027, 0x4027
.equiv VAR_0x4028, 0x4028
.equiv VAR_0x4029, 0x4029
.equiv VAR_HAPPINESS_STEP_COUNTER, 0x402A
.equiv VAR_POISON_STEP_COUNTER, 0x402B
.equiv VAR_RESET_RTC_ENABLE, 0x402C
.equiv VAR_0x402D, 0x402D
.equiv VAR_0x402E, 0x402E
.equiv VAR_0x402F, 0x402F
.equiv VAR_0x4030, 0x4030
.equiv VAR_0x4031, 0x4031
.equiv VAR_0x4032, 0x4032
.equiv VAR_0x4033, 0x4033
.equiv VAR_0x4034, 0x4034
.equiv VAR_0x4035, 0x4035
.equiv VAR_STORAGE_UNKNOWN, 0x4036
.equiv VAR_0x4037, 0x4037
.equiv VAR_0x4038, 0x4038
.equiv VAR_0x4039, 0x4039
.equiv VAR_0x403A, 0x403A
.equiv VAR_0x403B, 0x403B
.equiv VAR_0x403C, 0x403C
.equiv VAR_0x403D, 0x403D
.equiv VAR_ALTERING_CAVE_WILD_SET, 0x403E
.equiv VAR_0x403F, 0x403F
.equiv VAR_DAYS, 0x4040
.equiv VAR_0x4041, 0x4041
.equiv VAR_0x4042, 0x4042
.equiv VAR_DEPT_STORE_FLOOR, 0x4043
.equiv VAR_0x4044, 0x4044
.equiv VAR_POKELOT_PRIZE, 0x4045
.equiv VAR_NATIONAL_DEX, 0x4046
.equiv VAR_SEEDOT_SIZE_RECORD, 0x4047
.equiv VAR_ASH_GATHER_COUNT, 0x4048
.equiv VAR_BIRCH_STATE, 0x4049
.equiv VAR_CRUISE_STEP_COUNT, 0x404A
.equiv VAR_POKELOT_RND1, 0x404B
.equiv VAR_POKELOT_RND2, 0x404C
.equiv VAR_0x404D, 0x404D
.equiv VAR_0x404E, 0x404E
.equiv VAR_LOTAD_SIZE_RECORD, 0x404F
.equiv VAR_0x4050, 0x4050
.equiv VAR_0x4051, 0x4051
.equiv VAR_0x4052, 0x4052
.equiv VAR_0x4053, 0x4053
.equiv VAR_0x4054, 0x4054
.equiv VAR_0x4055, 0x4055
.equiv VAR_0x4056, 0x4056
.equiv VAR_0x4057, 0x4057
.equiv VAR_0x4058, 0x4058
.equiv VAR_0x4059, 0x4059
.equiv VAR_0x405A, 0x405A
.equiv VAR_0x405B, 0x405B
.equiv VAR_0x405C, 0x405C
.equiv VAR_0x405D, 0x405D
.equiv VAR_0x405E, 0x405E
.equiv VAR_0x405F, 0x405F
.equiv VAR_0x4060, 0x4060
.equiv VAR_0x4061, 0x4061
.equiv VAR_0x4062, 0x4062
.equiv VAR_0x4063, 0x4063
.equiv VAR_0x4064, 0x4064
.equiv VAR_0x4065, 0x4065
.equiv VAR_0x4066, 0x4066
.equiv VAR_0x4067, 0x4067
.equiv VAR_0x4068, 0x4068
.equiv VAR_0x4069, 0x4069
.equiv VAR_0x406A, 0x406A
.equiv VAR_0x406B, 0x406B
.equiv VAR_0x406C, 0x406C
.equiv VAR_0x406D, 0x406D
.equiv VAR_0x406E, 0x406E
.equiv VAR_0x406F, 0x406F
.equiv VAR_0x4070, 0x4070
.equiv VAR_0x4071, 0x4071
.equiv VAR_0x4072, 0x4072
.equiv VAR_0x4073, 0x4073
.equiv VAR_0x4074, 0x4074
.equiv VAR_0x4075, 0x4075
.equiv VAR_0x4076, 0x4076
.equiv VAR_0x4077, 0x4077
.equiv VAR_0x4078, 0x4078
.equiv VAR_0x4079, 0x4079
.equiv VAR_0x407A, 0x407A
.equiv VAR_0x407B, 0x407B
.equiv VAR_0x407C, 0x407C
.equiv VAR_0x407D, 0x407D
.equiv VAR_0x407E, 0x407E
.equiv VAR_0x407F, 0x407F
.equiv VAR_0x4080, 0x4080
.equiv VAR_0x4081, 0x4081
.equiv VAR_0x4082, 0x4082
.equiv VAR_0x4083, 0x4083
.equiv VAR_0x4084, 0x4084
.equiv VAR_0x4085, 0x4085
.equiv VAR_0x4086, 0x4086
.equiv VAR_0x4087, 0x4087
.equiv VAR_0x4088, 0x4088
.equiv VAR_0x4089, 0x4089
.equiv VAR_0x408A, 0x408A
.equiv VAR_0x408B, 0x408B
.equiv VAR_0x408C, 0x408C
.equiv VAR_0x408D, 0x408D
.equiv VAR_0x408E, 0x408E
.equiv VAR_0x408F, 0x408F
.equiv VAR_0x4090, 0x4090
.equiv VAR_0x4091, 0x4091
.equiv VAR_0x4092, 0x4092
.equiv VAR_0x4093, 0x4093
.equiv VAR_0x4094, 0x4094
.equiv VAR_0x4095, 0x4095
.equiv VAR_0x4096, 0x4096
.equiv VAR_0x4097, 0x4097
.equiv VAR_0x4098, 0x4098
.equiv VAR_0x4099, 0x4099
.equiv VAR_0x409A, 0x409A
.equiv VAR_0x409B, 0x409B
.equiv VAR_0x409C, 0x409C
.equiv VAR_0x409D, 0x409D
.equiv VAR_0x409E, 0x409E
.equiv VAR_0x409F, 0x409F
.equiv VAR_0x40A0, 0x40A0
.equiv VAR_0x40A1, 0x40A1
.equiv VAR_0x40A2, 0x40A2
.equiv VAR_0x40A3, 0x40A3
.equiv VAR_0x40A4, 0x40A4
.equiv VAR_0x40A5, 0x40A5
.equiv VAR_0x40A6, 0x40A6
.equiv VAR_0x40A7, 0x40A7
.equiv VAR_0x40A8, 0x40A8
.equiv VAR_0x40A9, 0x40A9
.equiv VAR_0x40AA, 0x40AA
.equiv VAR_0x40AB, 0x40AB
.equiv VAR_0x40AC, 0x40AC
.equiv VAR_0x40AD, 0x40AD
.equiv VAR_0x40AE, 0x40AE
.equiv VAR_0x40AF, 0x40AF
.equiv VAR_0x40B0, 0x40B0
.equiv VAR_0x40B1, 0x40B1
.equiv VAR_0x40B2, 0x40B2
.equiv VAR_0x40B3, 0x40B3
.equiv VAR_PORTHOLE, 0x40B4
.equiv VAR_0x40B5, 0x40B5
.equiv VAR_0x40B6, 0x40B6
.equiv VAR_0x40B7, 0x40B7
.equiv VAR_0x40B8, 0x40B8
.equiv VAR_0x40B9, 0x40B9
.equiv VAR_0x40BA, 0x40BA
.equiv VAR_0x40BB, 0x40BB
.equiv VAR_0x40BC, 0x40BC
.equiv VAR_0x40BD, 0x40BD
.equiv VAR_0x40BE, 0x40BE
.equiv VAR_0x40BF, 0x40BF
.equiv VAR_0x40C0, 0x40C0
.equiv VAR_0x40C1, 0x40C1
.equiv VAR_0x40C2, 0x40C2
.equiv VAR_0x40C3, 0x40C3
.equiv VAR_0x40C4, 0x40C4
.equiv VAR_0x40C5, 0x40C5
.equiv VAR_0x40C6, 0x40C6
.equiv VAR_0x40C7, 0x40C7
.equiv VAR_0x40C8, 0x40C8
.equiv VAR_0x40C9, 0x40C9
.equiv VAR_0x40CA, 0x40CA
.equiv VAR_0x40CB, 0x40CB
.equiv VAR_0x40CC, 0x40CC
.equiv VAR_0x40CD, 0x40CD
.equiv VAR_0x40CE, 0x40CE
.equiv VAR_FRONTIER_FACILITY, 0x40CF
.equiv VAR_0x40D0, 0x40D0
.equiv VAR_0x40D1, 0x40D1
.equiv VAR_0x40D2, 0x40D2
.equiv VAR_0x40D3, 0x40D3
.equiv VAR_0x40D4, 0x40D4
.equiv VAR_0x40D5, 0x40D5
.equiv VAR_0x40D6, 0x40D6
.equiv VAR_0x40D7, 0x40D7
.equiv VAR_0x40D8, 0x40D8
.equiv VAR_0x40D9, 0x40D9
.equiv VAR_0x40DA, 0x40DA
.equiv VAR_0x40DB, 0x40DB
.equiv VAR_0x40DC, 0x40DC
.equiv VAR_0x40DD, 0x40DD
.equiv VAR_0x40DE, 0x40DE
.equiv VAR_0x40DF, 0x40DF
.equiv VAR_0x40E0, 0x40E0
.equiv VAR_0x40E1, 0x40E1
.equiv VAR_0x40E2, 0x40E2
.equiv VAR_0x40E3, 0x40E3
.equiv VAR_0x40E4, 0x40E4
.equiv VAR_0x40E5, 0x40E5
.equiv VAR_DAILY_SLOTS, 0x40E6
.equiv VAR_DAILY_WILDS, 0x40E7
.equiv VAR_DAILY_BLENDER, 0x40E8
.equiv VAR_DAILY_PLANTED_BERRIES, 0x40E9
.equiv VAR_DAILY_PICKED_BERRIES, 0x40EA
.equiv VAR_DAILY_ROULETTE, 0x40EB
.equiv VAR_0x40EC, 0x40EC
.equiv VAR_0x40ED, 0x40ED
.equiv VAR_0x40EE, 0x40EE
.equiv VAR_0x40EF, 0x40EF
.equiv VAR_0x40F0, 0x40F0
.equiv VAR_DAILY_BP, 0x40F1
.equiv VAR_0x40F2, 0x40F2
.equiv VAR_0x40F3, 0x40F3
.equiv VAR_0x40F4, 0x40F4
.equiv VAR_0x40F5, 0x40F5
.equiv VAR_0x40F6, 0x40F6
.equiv VAR_0x40F7, 0x40F7
.equiv VAR_0x40F8, 0x40F8
.equiv VAR_0x40F9, 0x40F9
.equiv VAR_0x40FA, 0x40FA
.equiv VAR_0x40FB, 0x40FB
.equiv VAR_0x40FC, 0x40FC
.equiv VAR_0x40FD, 0x40FD
.equiv VAR_0x40FE, 0x40FE
.equiv VAR_0x40FF, 0x40FF
.equiv VAR_0x8000, 0x8000
.equiv VAR_0x8001, 0x8001
.equiv VAR_0x8002, 0x8002
.equiv VAR_0x8003, 0x8003
.equiv VAR_0x8004, 0x8004
.equiv VAR_0x8005, 0x8005
.equiv VAR_0x8006, 0x8006
.equiv VAR_0x8007, 0x8007
.equiv VAR_0x8008, 0x8008
.equiv VAR_0x8009, 0x8009
.equiv VAR_0x800A, 0x800A
.equiv VAR_0x800B, 0x800B
.equiv VAR_FACING, 0x800C
.equiv VAR_RESULT, 0x800D
.equiv VAR_ITEM_ID, 0x800E
.equiv VAR_LAST_TALKED, 0x800F
.equiv VAR_CONTEST_RANK, 0x8010
.equiv VAR_CONTEST_CATEGORY, 0x8011
.equiv VAR_MON_BOX_ID, 0x8012
.equiv VAR_MON_BOX_POS, 0x8013
.equiv VAR_0x8014, 0x8014
data/battle_frontier/battle_frontier_mons.inc
+1 -1
View File
@@ -960,7 +960,7 @@ gBattleFrontierMons:: @ 85D97BC
.4byte NATURE_DOCILE .4byte NATURE_DOCILE
@ 137 @ 137
.2byte SPECIES_FARFETCH_D .2byte SPECIES_FARFETCHD
.2byte MOVE_SLASH, MOVE_KNOCK_OFF, MOVE_SWORDS_DANCE, MOVE_AGILITY .2byte MOVE_SLASH, MOVE_KNOCK_OFF, MOVE_SWORDS_DANCE, MOVE_AGILITY
.byte BATTLE_FRONTIER_ITEM_STICK .byte BATTLE_FRONTIER_ITEM_STICK
.byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP
data/battle_frontier/battle_frontier_trainers.inc
+5113 -5113
View File
File diff suppressed because it is too large Load Diff
data/battle_frontier/fallarbor_battle_tent_trainers.inc
+525 -525
View File
File diff suppressed because it is too large Load Diff
data/battle_frontier/slateport_battle_tent_trainers.inc
+513 -513
View File
File diff suppressed because it is too large Load Diff
data/battle_frontier/verdanturf_battle_tent_trainers.inc
+510 -510
View File
File diff suppressed because it is too large Load Diff
data/battle_frontier_2.s
+2
View File
@@ -1,3 +1,5 @@
#include "constants/moves.h"
#include "constants/species.h"
.include "asm/macros.inc" .include "asm/macros.inc"
.include "constants/constants.inc" .include "constants/constants.inc"
data/battle_scripts_1.s
+229 -228
View File
File diff suppressed because it is too large Load Diff
data/battle_scripts_2.s
+25 -23
View File
@@ -1,3 +1,5 @@
#include "constants/items.h"
#include "constants/songs.h"
.include "asm/macros.inc" .include "asm/macros.inc"
.include "asm/macros/battle_script.inc" .include "asm/macros/battle_script.inc"
.include "constants/constants.inc" .include "constants/constants.inc"
@@ -24,13 +26,13 @@ gBattlescriptsForBallThrow:: @ 82DBD08
.4byte BattleScript_BallThrow .4byte BattleScript_BallThrow
.align 2 .align 2
gUnknown_082DBD3C:: @ 82DBD3C gBattlescriptsForUsingItem:: @ 82DBD3C
.4byte BattleScript_82DBE12 .4byte BattleScript_PlayerUsesItem
.4byte BattleScript_82DBE1C .4byte BattleScript_OpponentUsesHealItem
.4byte BattleScript_82DBE1C .4byte BattleScript_OpponentUsesHealItem
.4byte BattleScript_82DBE4B .4byte BattleScript_OpponentUsesStatusCureItem
.4byte BattleScript_82DBE6F .4byte BattleScript_OpponentUsesXItem
.4byte BattleScript_82DBE91 .4byte BattleScript_OpponentUsesGuardSpecs
.align 2 .align 2
gBattlescriptsForRunningByItem:: @ 82DBD54 gBattlescriptsForRunningByItem:: @ 82DBD54
@@ -58,27 +60,27 @@ BattleScript_SafariBallThrow::
handleballthrow handleballthrow
BattleScript_SuccessBallThrow:: BattleScript_SuccessBallThrow::
jumpifhalfword EQUAL, gLastUsedItem, ITEM_SAFARI_BALL, BattleScript_82DBD92 jumpifhalfword EQUAL, gLastUsedItem, ITEM_SAFARI_BALL, BattleScript_PrintCaughtMonInfo
incrementgamestat 0xB incrementgamestat 0xB
BattleScript_82DBD92:: BattleScript_PrintCaughtMonInfo::
printstring STRINGID_GOTCHAPKMNCAUGHT printstring STRINGID_GOTCHAPKMNCAUGHT
trysetcaughtmondexflags BattleScript_82DBDA5 trysetcaughtmondexflags BattleScript_TryNicknameCaughtMon
printstring STRINGID_PKMNDATAADDEDTODEX printstring STRINGID_PKMNDATAADDEDTODEX
waitstate waitstate
setbyte gBattleCommunication, 0x0 setbyte gBattleCommunication, 0x0
displaydexinfo displaydexinfo
BattleScript_82DBDA5:: BattleScript_TryNicknameCaughtMon::
printstring STRINGID_GIVENICKNAMECAPTURED printstring STRINGID_GIVENICKNAMECAPTURED
waitstate waitstate
setbyte gBattleCommunication, 0x0 setbyte gBattleCommunication, 0x0
trygivecaughtmonnick BattleScript_82DBDC2 trygivecaughtmonnick BattleScript_GiveCaughtMonEnd
givecaughtmon givecaughtmon
printfromtable gCaughtMonStringIds printfromtable gCaughtMonStringIds
waitmessage 0x40 waitmessage 0x40
goto BattleScript_82DBDC3 goto BattleScript_SuccessBallThrowEnd
BattleScript_82DBDC2:: BattleScript_GiveCaughtMonEnd::
givecaughtmon givecaughtmon
BattleScript_82DBDC3:: BattleScript_SuccessBallThrowEnd::
setbyte gBattleOutcome, CAUGHT setbyte gBattleOutcome, CAUGHT
finishturn finishturn
@@ -90,12 +92,12 @@ BattleScript_WallyBallThrow::
BattleScript_ShakeBallThrow:: BattleScript_ShakeBallThrow::
printfromtable gBallEscapeStringIds printfromtable gBallEscapeStringIds
waitmessage 0x40 waitmessage 0x40
jumpifword NO_COMMON_BITS, gBattleTypeFlags, BATTLE_TYPE_SAFARI, BattleScript_82DBE01 jumpifword NO_COMMON_BITS, gBattleTypeFlags, BATTLE_TYPE_SAFARI, BattleScript_ShakeBallThrowEnd
jumpifbyte NOT_EQUAL, gNumSafariBalls, 0x0, BattleScript_82DBE01 jumpifbyte NOT_EQUAL, gNumSafariBalls, 0x0, BattleScript_ShakeBallThrowEnd
printstring STRINGID_OUTOFSAFARIBALLS printstring STRINGID_OUTOFSAFARIBALLS
waitmessage 0x40 waitmessage 0x40
setbyte gBattleOutcome, OUT_OF_BALLS setbyte gBattleOutcome, OUT_OF_BALLS
BattleScript_82DBE01:: BattleScript_ShakeBallThrowEnd::
finishaction finishaction
BattleScript_TrainerBallBlock:: BattleScript_TrainerBallBlock::
@@ -106,12 +108,12 @@ BattleScript_TrainerBallBlock::
waitmessage 0x40 waitmessage 0x40
finishaction finishaction
BattleScript_82DBE12:: BattleScript_PlayerUsesItem::
setbyte sMOVEEND_STATE, 0xF setbyte sMOVEEND_STATE, 0xF
moveend 0x1, 0x0 moveend 0x1, 0x0
end end
BattleScript_82DBE1C:: BattleScript_OpponentUsesHealItem::
printstring STRINGID_EMPTYSTRING3 printstring STRINGID_EMPTYSTRING3
pause 0x30 pause 0x30
playse SE_KAIFUKU playse SE_KAIFUKU
@@ -128,7 +130,7 @@ BattleScript_82DBE1C::
moveend 0x1, 0x0 moveend 0x1, 0x0
finishaction finishaction
BattleScript_82DBE4B:: BattleScript_OpponentUsesStatusCureItem::
printstring STRINGID_EMPTYSTRING3 printstring STRINGID_EMPTYSTRING3
pause 0x30 pause 0x30
playse SE_KAIFUKU playse SE_KAIFUKU
@@ -142,7 +144,7 @@ BattleScript_82DBE4B::
moveend 0x1, 0x0 moveend 0x1, 0x0
finishaction finishaction
BattleScript_82DBE6F:: BattleScript_OpponentUsesXItem::
printstring STRINGID_EMPTYSTRING3 printstring STRINGID_EMPTYSTRING3
pause 0x30 pause 0x30
playse SE_KAIFUKU playse SE_KAIFUKU
@@ -155,7 +157,7 @@ BattleScript_82DBE6F::
moveend 0x1, 0x0 moveend 0x1, 0x0
finishaction finishaction
BattleScript_82DBE91:: BattleScript_OpponentUsesGuardSpecs::
printstring STRINGID_EMPTYSTRING3 printstring STRINGID_EMPTYSTRING3
pause 0x30 pause 0x30
playse SE_KAIFUKU playse SE_KAIFUKU
data/battle_tower.s
+4
View File
@@ -1,3 +1,7 @@
#include "constants/easy_chat.h"
#include "constants/items.h"
#include "constants/moves.h"
#include "constants/species.h"
.include "asm/macros.inc" .include "asm/macros.inc"
.include "constants/constants.inc" .include "constants/constants.inc"
data/cable_car.s
+1
View File
@@ -1,3 +1,4 @@
#include "constants/map_objects.h"
.include "asm/macros.inc" .include "asm/macros.inc"
.include "constants/constants.inc" .include "constants/constants.inc"
data/data2b.s
+3
View File
@@ -1,5 +1,8 @@
@ the second big chunk of data @ the second big chunk of data
#include "constants/items.h"
#include "constants/moves.h"
#include "constants/species.h"
.include "asm/macros.inc" .include "asm/macros.inc"
.include "constants/constants.inc" .include "constants/constants.inc"
data/data2c.s
+4
View File
@@ -1,5 +1,9 @@
@ the second big chunk of data @ the second big chunk of data
#include "constants/abilities.h"
#include "constants/items.h"
#include "constants/moves.h"
#include "constants/species.h"
.include "asm/macros.inc" .include "asm/macros.inc"
.include "constants/constants.inc" .include "constants/constants.inc"
data/data4c.s
-33
View File
@@ -5,39 +5,6 @@
.section .rodata .section .rodata
gUnknown_085B21D4:: @ 85B21D4
.incbin "baserom.gba", 0x5b21d4, 0x8
gUnknown_085B21DC:: @ 85B21DC
.incbin "baserom.gba", 0x5b21dc, 0x18
gUnknown_085B21F4:: @ 85B21F4
.incbin "baserom.gba", 0x5b21f4, 0x8
gUnknown_085B21FC:: @ 85B21FC
.incbin "baserom.gba", 0x5b21fc, 0xc
gUnknown_085B2208:: @ 85B2208
.incbin "baserom.gba", 0x5b2208, 0x10
gUnknown_085B2218:: @ 85B2218
.incbin "baserom.gba", 0x5b2218, 0x38
gUnknown_085B2250:: @ 85B2250
.incbin "baserom.gba", 0x5b2250, 0x18
gUnknown_085B2268:: @ 85B2268
.incbin "baserom.gba", 0x5b2268, 0x38
gUnknown_085B22A0:: @ 85B22A0
.incbin "baserom.gba", 0x5b22a0, 0x18
gUnknown_085B22B8:: @ 85B22B8
.incbin "baserom.gba", 0x5b22b8, 0x18
gUnknown_085B22D0:: @ 85B22D0
.incbin "baserom.gba", 0x5b22d0, 0x2d0
gPokeblockFlavorCompatibilityTable:: @ 85B25A0 gPokeblockFlavorCompatibilityTable:: @ 85B25A0
.incbin "baserom.gba", 0x5b25a0, 0x80 .incbin "baserom.gba", 0x5b25a0, 0x80
data/easy_chat.s
+3
View File
@@ -1,3 +1,6 @@
#include "constants/easy_chat.h"
#include "constants/moves.h"
#include "constants/species.h"
.include "asm/macros.inc" .include "asm/macros.inc"
.include "constants/constants.inc" .include "constants/constants.inc"
data/event_scripts.s
+6 -2
View File
@@ -1,8 +1,12 @@
#include "constants/flags.h"
#include "constants/items.h"
#include "constants/moves.h"
#include "constants/songs.h"
#include "constants/species.h"
#include "constants/vars.h"
.include "asm/macros.inc" .include "asm/macros.inc"
.include "asm/macros/event.inc" .include "asm/macros/event.inc"
.include "constants/constants.inc" .include "constants/constants.inc"
.include "constants/variables.inc"
.include "constants/flags.inc"
.section script_data, "aw", %progbits .section script_data, "aw", %progbits
data/field_map_obj.s
+1
View File
@@ -1,3 +1,4 @@
#include "constants/map_objects.h"
.include "asm/macros.inc" .include "asm/macros.inc"
.include "constants/constants.inc" .include "constants/constants.inc"
data/graphics.s
+99 -3
View File
@@ -16,12 +16,108 @@ gUnknown_08C00524:: @ 8C00524
.incbin "baserom.gba", 0xc00c10, 0xa34 .incbin "baserom.gba", 0xc00c10, 0xa34
gUnknown_08C01644:: @ 8C01644 gUnknown_08C01644:: @ 8C01644
.incbin "baserom.gba", 0xc01644, 0xE0 .incbin "baserom.gba", 0xc01644, 0xe0
gUnknown_08C01724:: @ 8C01724 gUnknown_08C01724:: @ 8C01724
.incbin "baserom.gba", 0xc01724, 0xBDC .incbin "baserom.gba", 0xc01724, 0x18
.align 2
gInterfaceGfx_PokeBall::
.incbin "graphics/interface/ball/poke.4bpp.lz" @ 0xBC
gUnknown_08C02300:: @ 8C02300 .align 2
gInterfacePal_PokeBall::
.incbin "graphics/interface/ball/poke.gbapal.lz"
.align 2
gInterfaceGfx_GreatBall::
.incbin "graphics/interface/ball/great.4bpp.lz" @ 0xBC
.align 2
gInterfacePal_GreatBall::
.incbin "graphics/interface/ball/great.gbapal.lz"
.align 2
gInterfaceGfx_SafariBall::
.incbin "graphics/interface/ball/safari.4bpp.lz" @ 0xBC
.align 2
gInterfacePal_SafariBall::
.incbin "graphics/interface/ball/safari.gbapal.lz"
.align 2
gInterfaceGfx_UltraBall::
.incbin "baserom.gba", 0xC019E0, 0xB4
.align 2
gInterfacePal_UltraBall::
.incbin "baserom.gba", 0xC01A94, 0x20
.align 2
gInterfaceGfx_MasterBall::
.incbin "graphics/interface/ball/master.4bpp.lz" @ 0xBC
.align 2
gInterfacePal_MasterBall::
.incbin "graphics/interface/ball/master.gbapal.lz"
.align 2
gInterfaceGfx_NetBall::
.incbin "graphics/interface/ball/net.4bpp.lz" @ 0xBC
.align 2
gInterfacePal_NetBall::
.incbin "graphics/interface/ball/net.gbapal.lz"
.align 2
gInterfaceGfx_DiveBall::
.incbin "graphics/interface/ball/dive.4bpp.lz" @ 0xBC
.align 2
gInterfacePal_DiveBall::
.incbin "graphics/interface/ball/dive.gbapal.lz"
.align 2
gInterfaceGfx_NestBall::
.incbin "graphics/interface/ball/nest.4bpp.lz" @ 0xBC
.align 2
gInterfacePal_NestBall::
.incbin "graphics/interface/ball/nest.gbapal.lz"
.align 2
gInterfaceGfx_RepeatBall::
.incbin "graphics/interface/ball/repeat.4bpp.lz" @ 0xBC
.align 2
gInterfacePal_RepeatBall::
.incbin "graphics/interface/ball/repeat.gbapal.lz"
.align 2
gInterfaceGfx_TimerBall::
.incbin "graphics/interface/ball/timer.4bpp.lz" @ 0xBC
.align 2
gInterfacePal_TimerBall::
.incbin "graphics/interface/ball/timer.gbapal.lz"
.align 2
gInterfaceGfx_LuxuryBall::
.incbin "graphics/interface/ball/luxury.4bpp.lz" @ 0xBC
.align 2
gInterfacePal_LuxuryBall::
.incbin "graphics/interface/ball/luxury.gbapal.lz"
.align 2
gInterfaceGfx_PremierBall::
.incbin "graphics/interface/ball/premier.4bpp.lz" @ 0xBC
.align 2
gInterfacePal_PremierBall::
.incbin "graphics/interface/ball/premier.gbapal.lz"
gOpenPokeballGfx:: @ 8C02300
.incbin "baserom.gba", 0xc02300, 0x7c .incbin "baserom.gba", 0xc02300, 0x7c
gUnknown_08C0237C:: @ 8C0237C gUnknown_08C0237C:: @ 8C0237C
data/graphics/field_objects/berry_tree_graphics_tables.inc
+10 -10
View File
@@ -478,18 +478,18 @@ gFieldObjectPicTable_TamatoBerryTree:: @ 850C758
gBerryTreePaletteSlotTable_Tamato:: @ 850C7A0 gBerryTreePaletteSlotTable_Tamato:: @ 850C7A0
berry_tree_palette_slot_table 2 berry_tree_palette_slot_table 2
.byte FIELD_OBJ_GFX_BERRY_TREE_EARLY_STAGES .byte MAP_OBJ_GFX_BERRY_TREE_EARLY_STAGES
.byte FIELD_OBJ_GFX_BERRY_TREE_EARLY_STAGES .byte MAP_OBJ_GFX_BERRY_TREE_EARLY_STAGES
.byte FIELD_OBJ_GFX_BERRY_TREE_EARLY_STAGES .byte MAP_OBJ_GFX_BERRY_TREE_EARLY_STAGES
.byte FIELD_OBJ_GFX_BERRY_TREE_EARLY_STAGES .byte MAP_OBJ_GFX_BERRY_TREE_EARLY_STAGES
.byte FIELD_OBJ_GFX_BERRY_TREE_EARLY_STAGES .byte MAP_OBJ_GFX_BERRY_TREE_EARLY_STAGES
gBerryTreeFieldObjectGraphicsIdTable:: @ 850C7AA gBerryTreeFieldObjectGraphicsIdTable:: @ 850C7AA
.byte FIELD_OBJ_GFX_BERRY_TREE_EARLY_STAGES .byte MAP_OBJ_GFX_BERRY_TREE_EARLY_STAGES
.byte FIELD_OBJ_GFX_BERRY_TREE_EARLY_STAGES .byte MAP_OBJ_GFX_BERRY_TREE_EARLY_STAGES
.byte FIELD_OBJ_GFX_BERRY_TREE_LATE_STAGES .byte MAP_OBJ_GFX_BERRY_TREE_LATE_STAGES
.byte FIELD_OBJ_GFX_BERRY_TREE_LATE_STAGES .byte MAP_OBJ_GFX_BERRY_TREE_LATE_STAGES
.byte FIELD_OBJ_GFX_BERRY_TREE_LATE_STAGES .byte MAP_OBJ_GFX_BERRY_TREE_LATE_STAGES
.align 2 .align 2
gBerryTreePicTablePointers:: @ 850C7B0 gBerryTreePicTablePointers:: @ 850C7B0
data/graphics/pokemon/animation_delay_table.inc
+1 -1
View File
@@ -81,7 +81,7 @@ gMonAnimationDelayTable:: @ 8329B87
.byte 0x00 @ SPECIES_SLOWBRO .byte 0x00 @ SPECIES_SLOWBRO
.byte 0x00 @ SPECIES_MAGNEMITE .byte 0x00 @ SPECIES_MAGNEMITE
.byte 0x00 @ SPECIES_MAGNETON .byte 0x00 @ SPECIES_MAGNETON
.byte 0x00 @ SPECIES_FARFETCH_D .byte 0x00 @ SPECIES_FARFETCHD
.byte 0x00 @ SPECIES_DODUO .byte 0x00 @ SPECIES_DODUO
.byte 0x00 @ SPECIES_DODRIO .byte 0x00 @ SPECIES_DODRIO
.byte 0x00 @ SPECIES_SEEL .byte 0x00 @ SPECIES_SEEL
data/graphics/pokemon/front_anim_ids_table.inc
+1 -1
View File
@@ -81,7 +81,7 @@ gMonFrontAnimIdsTable:: @ 83299EC
.byte 0x0b @ SPECIES_SLOWBRO .byte 0x0b @ SPECIES_SLOWBRO
.byte 0x54 @ SPECIES_MAGNEMITE .byte 0x54 @ SPECIES_MAGNEMITE
.byte 0x2c @ SPECIES_MAGNETON .byte 0x2c @ SPECIES_MAGNETON
.byte 0x48 @ SPECIES_FARFETCH_D .byte 0x48 @ SPECIES_FARFETCHD
.byte 0x4c @ SPECIES_DODUO .byte 0x4c @ SPECIES_DODUO
.byte 0x41 @ SPECIES_DODRIO .byte 0x41 @ SPECIES_DODRIO
.byte 0x0b @ SPECIES_SEEL .byte 0x0b @ SPECIES_SEEL
data/item_menu_icons.s
+1
View File
@@ -1,3 +1,4 @@
#include "constants/items.h"
.include "asm/macros.inc" .include "asm/macros.inc"
.include "constants/constants.inc" .include "constants/constants.inc"
data/link.s
+1
View File
@@ -1,5 +1,6 @@
@ the second big chunk of data @ the second big chunk of data
#include "constants/species.h"
.include "asm/macros.inc" .include "asm/macros.inc"
.include "constants/constants.inc" .include "constants/constants.inc"
data/map_events.s
+4 -2
View File
@@ -1,7 +1,9 @@
#include "constants/flags.h"
#include "constants/items.h"
#include "constants/map_objects.h"
#include "constants/vars.h"
.include "asm/macros.inc" .include "asm/macros.inc"
.include "constants/constants.inc" .include "constants/constants.inc"
.include "constants/flags.inc"
.include "constants/variables.inc"
.section .rodata .section .rodata
data/maps.s
+1
View File
@@ -1,3 +1,4 @@
#include "constants/songs.h"
.include "asm/macros.inc" .include "asm/macros.inc"
.include "constants/constants.inc" .include "constants/constants.inc"
data/rom4.s → data/overworld.s
View File
data/player_pc.s
+1
View File
@@ -1,3 +1,4 @@
#include "constants/items.h"
.include "asm/macros.inc" .include "asm/macros.inc"
.include "constants/constants.inc" .include "constants/constants.inc"
data/pokeball.s
-14
View File
@@ -1,14 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2, 0
gUnknown_0832C400:: @ 832C400
.incbin "baserom.gba", 0x32c400, 0x60
gUnknown_0832C460:: @ 832C460
.incbin "baserom.gba", 0x32c460, 0x128
gUnknown_0832C588:: @ 832C588
.incbin "baserom.gba", 0x32c588, 0x138
data/scripts/maps/BattleFrontier_Lounge2.inc
+12 -12
View File
@@ -17,29 +17,29 @@ BattleFrontier_Lounge2_EventScript_26065F:: @ 826065F
end end
BattleFrontier_Lounge2_EventScript_26066D:: @ 826066D BattleFrontier_Lounge2_EventScript_26066D:: @ 826066D
compare_var_to_value VAR_0x402F, 0 compare_var_to_value VAR_FRONTIER_MANIAC_FACILITY, 0
call_if 1, BattleFrontier_Lounge2_EventScript_26070A call_if 1, BattleFrontier_Lounge2_EventScript_26070A
compare_var_to_value VAR_0x402F, 1 compare_var_to_value VAR_FRONTIER_MANIAC_FACILITY, 1
call_if 1, BattleFrontier_Lounge2_EventScript_26070F call_if 1, BattleFrontier_Lounge2_EventScript_26070F
compare_var_to_value VAR_0x402F, 2 compare_var_to_value VAR_FRONTIER_MANIAC_FACILITY, 2
call_if 1, BattleFrontier_Lounge2_EventScript_260714 call_if 1, BattleFrontier_Lounge2_EventScript_260714
compare_var_to_value VAR_0x402F, 3 compare_var_to_value VAR_FRONTIER_MANIAC_FACILITY, 3
call_if 1, BattleFrontier_Lounge2_EventScript_260719 call_if 1, BattleFrontier_Lounge2_EventScript_260719
compare_var_to_value VAR_0x402F, 4 compare_var_to_value VAR_FRONTIER_MANIAC_FACILITY, 4
call_if 1, BattleFrontier_Lounge2_EventScript_26071E call_if 1, BattleFrontier_Lounge2_EventScript_26071E
compare_var_to_value VAR_0x402F, 5 compare_var_to_value VAR_FRONTIER_MANIAC_FACILITY, 5
call_if 1, BattleFrontier_Lounge2_EventScript_260723 call_if 1, BattleFrontier_Lounge2_EventScript_260723
compare_var_to_value VAR_0x402F, 6 compare_var_to_value VAR_FRONTIER_MANIAC_FACILITY, 6
call_if 1, BattleFrontier_Lounge2_EventScript_260728 call_if 1, BattleFrontier_Lounge2_EventScript_260728
compare_var_to_value VAR_0x402F, 7 compare_var_to_value VAR_FRONTIER_MANIAC_FACILITY, 7
call_if 1, BattleFrontier_Lounge2_EventScript_26072D call_if 1, BattleFrontier_Lounge2_EventScript_26072D
compare_var_to_value VAR_0x402F, 8 compare_var_to_value VAR_FRONTIER_MANIAC_FACILITY, 8
call_if 1, BattleFrontier_Lounge2_EventScript_260732 call_if 1, BattleFrontier_Lounge2_EventScript_260732
compare_var_to_value VAR_0x402F, 9 compare_var_to_value VAR_FRONTIER_MANIAC_FACILITY, 9
call_if 1, BattleFrontier_Lounge2_EventScript_260737 call_if 1, BattleFrontier_Lounge2_EventScript_260737
compare_var_to_value VAR_0x402F, 3 compare_var_to_value VAR_FRONTIER_MANIAC_FACILITY, 3
call_if 3, BattleFrontier_Lounge2_EventScript_2606F8 call_if 3, BattleFrontier_Lounge2_EventScript_2606F8
compare_var_to_value VAR_0x402F, 4 compare_var_to_value VAR_FRONTIER_MANIAC_FACILITY, 4
call_if 4, BattleFrontier_Lounge2_EventScript_260701 call_if 4, BattleFrontier_Lounge2_EventScript_260701
special sub_8139F20 special sub_8139F20
waitmessage waitmessage
data/scripts/maps/BattleFrontier_Lounge3.inc
+10 -10
View File
@@ -32,7 +32,7 @@ BattleFrontier_Lounge3_EventScript_261DAF:: @ 8261DAF
BattleFrontier_Lounge3_EventScript_261DE9:: @ 8261DE9 BattleFrontier_Lounge3_EventScript_261DE9:: @ 8261DE9
multichoice 20, 4, 87, 0 multichoice 20, 4, 87, 0
copyvar VAR_0x4032, VAR_RESULT copyvar VAR_FRONTIER_GAMBLER_AMOUNT_BET, VAR_RESULT
switch VAR_RESULT switch VAR_RESULT
case 0, BattleFrontier_Lounge3_EventScript_261E30 case 0, BattleFrontier_Lounge3_EventScript_261E30
case 1, BattleFrontier_Lounge3_EventScript_261E3B case 1, BattleFrontier_Lounge3_EventScript_261E3B
@@ -69,7 +69,7 @@ BattleFrontier_Lounge3_EventScript_261E51:: @ 8261E51
BattleFrontier_Lounge3_EventScript_261E75:: @ 8261E75 BattleFrontier_Lounge3_EventScript_261E75:: @ 8261E75
copyvar VAR_0x8004, VAR_0x8008 copyvar VAR_0x8004, VAR_0x8008
special sub_813A9A4 special sub_813A9A4
setvar VAR_0x4033, 1 setvar VAR_FRONTIER_GAMBLER_PLACED_BET_F, 1
special sub_813A8FC special sub_813A8FC
playse SE_REGI playse SE_REGI
msgbox BattleFrontier_Lounge3_Text_262BE0, 4 msgbox BattleFrontier_Lounge3_Text_262BE0, 4
@@ -113,37 +113,37 @@ BattleFrontier_Lounge3_EventScript_261EEB:: @ 8261EEB
BattleFrontier_Lounge3_EventScript_261EF9:: @ 8261EF9 BattleFrontier_Lounge3_EventScript_261EF9:: @ 8261EF9
msgbox BattleFrontier_Lounge3_Text_26346B, 4 msgbox BattleFrontier_Lounge3_Text_26346B, 4
compare_var_to_value VAR_0x4033, 1 compare_var_to_value VAR_FRONTIER_GAMBLER_PLACED_BET_F, 1
goto_if 4, BattleFrontier_Lounge3_EventScript_261F12 goto_if 4, BattleFrontier_Lounge3_EventScript_261F12
goto BattleFrontier_Lounge3_EventScript_261DAF goto BattleFrontier_Lounge3_EventScript_261DAF
end end
BattleFrontier_Lounge3_EventScript_261F12:: @ 8261F12 BattleFrontier_Lounge3_EventScript_261F12:: @ 8261F12
compare_var_to_value VAR_0x4033, 1 compare_var_to_value VAR_FRONTIER_GAMBLER_PLACED_BET_F, 1
goto_eq BattleFrontier_Lounge3_EventScript_261F9E goto_eq BattleFrontier_Lounge3_EventScript_261F9E
compare_var_to_value VAR_0x4033, 2 compare_var_to_value VAR_FRONTIER_GAMBLER_PLACED_BET_F, 2
goto_eq BattleFrontier_Lounge3_EventScript_261F2E goto_eq BattleFrontier_Lounge3_EventScript_261F2E
goto BattleFrontier_Lounge3_EventScript_261F71 goto BattleFrontier_Lounge3_EventScript_261F71
end end
BattleFrontier_Lounge3_EventScript_261F2E:: @ 8261F2E BattleFrontier_Lounge3_EventScript_261F2E:: @ 8261F2E
msgbox BattleFrontier_Lounge3_Text_263334, 4 msgbox BattleFrontier_Lounge3_Text_263334, 4
compare_var_to_value VAR_0x4032, 0 compare_var_to_value VAR_FRONTIER_GAMBLER_AMOUNT_BET, 0
call_if 1, BattleFrontier_Lounge3_EventScript_261F80 call_if 1, BattleFrontier_Lounge3_EventScript_261F80
compare_var_to_value VAR_0x4032, 1 compare_var_to_value VAR_FRONTIER_GAMBLER_AMOUNT_BET, 1
call_if 1, BattleFrontier_Lounge3_EventScript_261F8A call_if 1, BattleFrontier_Lounge3_EventScript_261F8A
compare_var_to_value VAR_0x4032, 2 compare_var_to_value VAR_FRONTIER_GAMBLER_AMOUNT_BET, 2
call_if 1, BattleFrontier_Lounge3_EventScript_261F94 call_if 1, BattleFrontier_Lounge3_EventScript_261F94
msgbox BattleFrontier_Lounge3_Text_2633D4, 9 msgbox BattleFrontier_Lounge3_Text_2633D4, 9
special sub_813A9D0 special sub_813A9D0
msgbox BattleFrontier_Lounge3_Text_2633F2, 4 msgbox BattleFrontier_Lounge3_Text_2633F2, 4
setvar VAR_0x4033, 0 setvar VAR_FRONTIER_GAMBLER_PLACED_BET_F, 0
release release
end end
BattleFrontier_Lounge3_EventScript_261F71:: @ 8261F71 BattleFrontier_Lounge3_EventScript_261F71:: @ 8261F71
msgbox BattleFrontier_Lounge3_Text_263298, 4 msgbox BattleFrontier_Lounge3_Text_263298, 4
setvar VAR_0x4033, 0 setvar VAR_FRONTIER_GAMBLER_PLACED_BET_F, 0
release release
end end
data/scripts/players_house.inc
+1 -1
View File
@@ -114,7 +114,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_29283F:: @ 829283F
LittlerootTown_BrendansHouse_2F_EventScript_292849:: @ 8292849 LittlerootTown_BrendansHouse_2F_EventScript_292849:: @ 8292849
fadescreen 1 fadescreen 1
special Special_StartWallClock special StartWallClock
waitstate waitstate
return return
data/specials.inc
+1 -1
View File
@@ -164,7 +164,7 @@ gSpecials:: @ 81DBA64
def_special sub_8138B8C def_special sub_8138B8C
def_special sub_814FC9C def_special sub_814FC9C
def_special sub_8085784 def_special sub_8085784
def_special Special_StartWallClock def_special StartWallClock
def_special Special_ViewWallClock def_special Special_ViewWallClock
def_special sub_80B1138 def_special sub_80B1138
def_special sub_80B086C def_special sub_80B086C
data/starter_choose.s
+1 -2
View File
@@ -63,5 +63,4 @@ sSpriteTemplate_PokeBall:: @ 85B1F28
.incbin "baserom.gba", 0x5b1f28, 0x18 .incbin "baserom.gba", 0x5b1f28, 0x18
gUnknown_085B1F40:: @ 85B1F40 gUnknown_085B1F40:: @ 85B1F40
.incbin "baserom.gba", 0x5b1f40, 0x294 .incbin "baserom.gba", 0x5b1f40, 0x18
data/text/contest_strings.inc
+134 -94
View File
@@ -202,476 +202,516 @@ gContestMoveTypeSmartText:: @ 827D4FB
gContestMoveTypeToughText:: @ 827D501 gContestMoveTypeToughText:: @ 827D501
.string "TOUGH$" .string "TOUGH$"
gUnknown_0827D507:: @ 827D507 gText_0827D507:: @ 827D507
.string "Appeal no. {STR_VAR_1}!\n" .string "Appeal no. {STR_VAR_1}!\n"
.string "Which move will be played?$" .string "Which move will be played?$"
gUnknown_0827D531:: @ 827D531 gText_0827D531:: @ 827D531
.string "Appeal no. {STR_VAR_1}!\n" .string "Appeal no. {STR_VAR_1}!\n"
.string "But it can’t participate!$" .string "But it can’t participate!$"
gUnknown_0827D55A:: @ 827D55A gText_0827D55A:: @ 827D55A
.string "{STR_VAR_1} appealed with\n" .string "{STR_VAR_1} appealed with\n"
.string "{STR_VAR_2}!$" .string "{STR_VAR_2}!$"
gUnknown_0827D56F:: @ 827D56F gText_0827D56F:: @ 827D56F
.string "{STR_VAR_1} was watching\n" .string "{STR_VAR_1} was watching\n"
.string "the others.{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}$" .string "the others.{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}$"
gUnknown_0827D597:: @ 827D597 gText_0827D597:: @ 827D597
.string "We’re all out of\n" .string "We’re all out of\n"
.string "Appeal Time!{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}$" .string "Appeal Time!{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}$"
gUnknown_0827D5C1:: @ 827D5C1 gText_0827D5C1:: @ 827D5C1
.string "But the appeal was\n" .string "But the appeal was\n"
.string "jammed.$" .string "jammed.$"
gUnknown_0827D5DC:: @ 827D5DC gText_0827D5DC:: @ 827D5DC
.string "It followed another\n" .string "It followed another\n"
.string "POKéMON’s lead.$" .string "POKéMON’s lead.$"
gUnknown_0827D600:: @ 827D600 gText_0827D600:: @ 827D600
.string "But it messed up.$" .string "But it messed up.$"
gUnknown_0827D612:: @ 827D612 gText_0827D612:: @ 827D612
.string "It went better than\n" .string "It went better than\n"
.string "usual.$" .string "usual.$"
gUnknown_0827D62D:: @ 827D62D gText_0827D62D:: @ 827D62D
.string "The JUDGE looked away\n" .string "The JUDGE looked away\n"
.string "for some reason.$" .string "for some reason.$"
gUnknown_0827D654:: @ 827D654 gText_0827D654:: @ 827D654
.string "It worked hard to build on\n" .string "It worked hard to build on\n"
.string "past mistakes.$" .string "past mistakes.$"
gUnknown_0827D67E:: @ 827D67E gText_0827D67E:: @ 827D67E
.string "It can’t make any more\n" .string "It can’t make any more\n"
.string "moves.$" .string "moves.$"
gUnknown_0827D69C:: @ 827D69C gText_0827D69C:: @ 827D69C
.string "It worked frighteningly\n" .string "It worked frighteningly\n"
.string "well.$" .string "well.$"
gUnknown_0827D6BA:: @ 827D6BA gText_0827D6BA:: @ 827D6BA
.string "It worked as hard as the\n" .string "It worked as hard as the\n"
.string "standout POKéMON.$" .string "standout POKéMON.$"
gUnknown_0827D6E5:: @ 827D6E5 gText_0827D6E5:: @ 827D6E5
.string "The JUDGE looked on\n" .string "The JUDGE looked on\n"
.string "expectantly.$" .string "expectantly.$"
gUnknown_0827D706:: @ 827D706 gText_0827D706:: @ 827D706
.string "It worked rather well.$" .string "It worked rather well.$"
gUnknown_0827D71D:: @ 827D71D gText_0827D71D:: @ 827D71D
.string "It worked a little better\n" .string "It worked a little better\n"
.string "than usual.$" .string "than usual.$"
gUnknown_0827D743:: @ 827D743 gText_0827D743:: @ 827D743
.string "{STR_VAR_1} failed to\n" .string "{STR_VAR_1} failed to\n"
.string "stand out at all…{PAUSE_UNTIL_PRESS}$" .string "stand out at all…{PAUSE_UNTIL_PRESS}$"
gUnknown_0827D764:: @ 827D764 gText_0827D764:: @ 827D764
.string "{STR_VAR_1} didn’t stand\n" .string "{STR_VAR_1} didn’t stand\n"
.string "out very much…{PAUSE_UNTIL_PRESS}$" .string "out very much…{PAUSE_UNTIL_PRESS}$"
gUnknown_0827D785:: @ 827D785 gText_0827D785:: @ 827D785
.string "{STR_VAR_1} caught a\n" .string "{STR_VAR_1} caught a\n"
.string "little attention.{PAUSE_UNTIL_PRESS}$" .string "little attention.{PAUSE_UNTIL_PRESS}$"
gUnknown_0827D7A5:: @ 827D7A5 gText_0827D7A5:: @ 827D7A5
.string "{STR_VAR_1} attracted a\n" .string "{STR_VAR_1} attracted a\n"
.string "lot of attention.{PAUSE_UNTIL_PRESS}$" .string "lot of attention.{PAUSE_UNTIL_PRESS}$"
gUnknown_0827D7C8:: @ 827D7C8 gText_0827D7C8:: @ 827D7C8
.string "{STR_VAR_1} commanded\n" .string "{STR_VAR_1} commanded\n"
.string "total attention.{PAUSE_UNTIL_PRESS}$" .string "total attention.{PAUSE_UNTIL_PRESS}$"
gUnknown_0827D7E8:: @ 827D7E8 gText_0827D7E8:: @ 827D7E8
.string "{STR_VAR_1} hasn’t made\n" .string "{STR_VAR_1} hasn’t made\n"
.string "its appeal.{PAUSE_UNTIL_PRESS}$" .string "its appeal.{PAUSE_UNTIL_PRESS}$"
gUnknown_0827D805:: @ 827D805 gText_0827D805:: @ 827D805
.string "Anticipation swelled for\n" .string "Anticipation swelled for\n"
.string "{STR_VAR_1}’s appeal next.$" .string "{STR_VAR_1}’s appeal next.$"
gUnknown_0827D830:: @ 827D830 gText_0827D830:: @ 827D830
.string "$" .string "$"
gUnknown_0827D831:: @ 827D831 gText_0827D831:: @ 827D831
.string "The JUDGE ’s views on\n" .string "The JUDGE ’s views on\n"
.string "{STR_VAR_1} held firm.$" .string "{STR_VAR_1} held firm.$"
gUnknown_0827D855:: @ 827D855 gText_0827D855:: @ 827D855
.string "{STR_VAR_1}’s {STR_VAR_3}\n" .string "{STR_VAR_1}’s {STR_VAR_3}\n"
.string "changed perceptions.$" .string "changed perceptions.$"
gUnknown_0827D872:: @ 827D872 gText_0827D872:: @ 827D872
.string "{STR_VAR_1}’s appeal\n" .string "{STR_VAR_1}’s appeal\n"
.string "effect wore off.$" .string "effect wore off.$"
gUnknown_0827D88F:: @ 827D88F gText_0827D88F:: @ 827D88F
.string "The special appeal’s\n" .string "The special appeal’s\n"
.string "effect wore off.$" .string "effect wore off.$"
gUnknown_0827D8B5:: @ 827D8B5 gText_0827D8B5:: @ 827D8B5
.string "Everyone’s appeals were\n" .string "Everyone’s appeals were\n"
.string "made to look the same.$" .string "made to look the same.$"
gUnknown_0827D8E4:: @ 827D8E4 gText_0827D8E4:: @ 827D8E4
.string "It cheapened\n" .string "It cheapened\n"
.string "{STR_VAR_2}’s appeal.$" .string "{STR_VAR_2}’s appeal.$"
gUnknown_0827D8FE:: @ 827D8FE gText_0827D8FE:: @ 827D8FE
.string "It cheapened the appeal\n" .string "It cheapened the appeal\n"
.string "of those ahead.$" .string "of those ahead.$"
gUnknown_0827D926:: @ 827D926 gText_0827D926:: @ 827D926
.string "It stole attention away\n" .string "It stole attention away\n"
.string "from {STR_VAR_2}.$" .string "from {STR_VAR_2}.$"
gUnknown_0827D947:: @ 827D947 gText_0827D947:: @ 827D947
.string "It cheapened\n" .string "It cheapened\n"
.string "{STR_VAR_2}’s appeal.$" .string "{STR_VAR_2}’s appeal.$"
gUnknown_0827D961:: @ 827D961 gText_0827D961:: @ 827D961
.string "It severely cheapened\n" .string "It severely cheapened\n"
.string "other appeals.$" .string "other appeals.$"
gUnknown_0827D986:: @ 827D986 gText_0827D986:: @ 827D986
.string "Anticipation swelled for\n" .string "Anticipation swelled for\n"
.string "{STR_VAR_1}’s appeal next.$" .string "{STR_VAR_1}’s appeal next.$"
gUnknown_0827D9B1:: @ 827D9B1 gText_0827D9B1:: @ 827D9B1
.string "It cheapened the appeal\n" .string "It cheapened the appeal\n"
.string "of those ahead.$" .string "of those ahead.$"
gUnknown_0827D9D9:: @ 827D9D9 gText_0827D9D9:: @ 827D9D9
.string "It cheapened the JUDGE’s\n" .string "It cheapened the JUDGE’s\n"
.string "favorite appeal.$" .string "favorite appeal.$"
gUnknown_0827DA03:: @ 827DA03 gText_0827DA03:: @ 827DA03
.string "The appeals of others\n" .string "The appeals of others\n"
.string "were cheapened by half.$" .string "were cheapened by half.$"
gUnknown_0827DA31:: @ 827DA31 gText_0827DA31:: @ 827DA31
.string "It stood out to make up\n" .string "It stood out to make up\n"
.string "for being jammed.$" .string "for being jammed.$"
gUnknown_0827DA5B:: @ 827DA5B gText_0827DA5B:: @ 827DA5B
.string "It can’t participate in\n" .string "It can’t participate in\n"
.string "appeals any more.$" .string "appeals any more.$"
gUnknown_0827DA85:: @ 827DA85 gText_0827DA85:: @ 827DA85
.string "It touched the JUDGE for\n" .string "It touched the JUDGE for\n"
.string "a fantastic appeal.$" .string "a fantastic appeal.$"
gUnknown_0827DAB2:: @ 827DAB2 gText_0827DAB2:: @ 827DAB2
.string "Anticipation rose for\n" .string "Anticipation rose for\n"
.string "upcoming appeals.$" .string "upcoming appeals.$"
gUnknown_0827DADA:: @ 827DADA gText_0827DADA:: @ 827DADA
.string "It stood out as much as\n" .string "It stood out as much as\n"
.string "special appeals.$" .string "special appeals.$"
gUnknown_0827DB03:: @ 827DB03 gText_0827DB03:: @ 827DB03
.string "It stood out as much as\n" .string "It stood out as much as\n"
.string "{STR_VAR_1}.$" .string "{STR_VAR_1}.$"
gUnknown_0827DB1F:: @ 827DB1F gText_0827DB1F:: @ 827DB1F
.string "Jammed appeals were made\n" .string "Jammed appeals were made\n"
.string "even less noticeable.$" .string "even less noticeable.$"
gUnknown_0827DB4E:: @ 827DB4E gText_0827DB4E:: @ 827DB4E
.string "Everyone’s appeals were\n" .string "Everyone’s appeals were\n"
.string "made the same.$" .string "made the same.$"
gText_827DB75:: @ 827DB75
.string "It became more conscious\n" .string "It became more conscious\n"
.string "of the other POKéMON.{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$" .string "of the other POKéMON.{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$"
gText_827DBB0:: @ 827DBB0
.string "{STR_VAR_1} can’t make an\n" .string "{STR_VAR_1} can’t make an\n"
.string "appeal after this.{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$" .string "appeal after this.{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$"
gText_827DBE0:: @ 827DBE0
.string "It settled down just a\n" .string "It settled down just a\n"
.string "little bit.{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$" .string "little bit.{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$"
gText_827DC0F:: @ 827DC0F
.string "It became oblivious to\n" .string "It became oblivious to\n"
.string "the other POKéMON.{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$" .string "the other POKéMON.{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$"
gText_827DC45:: @ 827DC45
.string "It became less aware of\n" .string "It became less aware of\n"
.string "the other POKéMON.{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$" .string "the other POKéMON.{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$"
gText_827DC7C:: @ 827DC7C
.string "It stopped caring about\n" .string "It stopped caring about\n"
.string "other POKéMON much.{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$" .string "other POKéMON much.{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$"
gText_827DCB4:: @ 827DCB4
.string "It tried to startle the\n" .string "It tried to startle the\n"
.string "other POKéMON.{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$" .string "other POKéMON.{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$"
gText_827DCE7:: @ 827DCE7
.string "It tried to dazzle the\n" .string "It tried to dazzle the\n"
.string "others.{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$" .string "others.{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$"
gText_827DD12:: @ 827DD12
.string "The JUDGE looked away\n" .string "The JUDGE looked away\n"
.string "from {STR_VAR_1}.{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$" .string "from {STR_VAR_1}.{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$"
gText_827DD3D:: @ 827DD3D
.string "It tried to unnerve the\n" .string "It tried to unnerve the\n"
.string "next POKéMON.{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$" .string "next POKéMON.{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$"
gText_827DD6F:: @ 827DD6F
.string "{STR_VAR_1} became\n" .string "{STR_VAR_1} became\n"
.string "nervous.{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$" .string "nervous.{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$"
gText_827DD8E:: @ 827DD8E
.string "The appeal tried to\n" .string "The appeal tried to\n"
.string "unnerve waiting POKéMON.{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$" .string "unnerve waiting POKéMON.{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$"
gText_827DDC7:: @ 827DDC7
.string "It taunted POKéMON\n" .string "It taunted POKéMON\n"
.string "doing well.{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$" .string "doing well.{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$"
gText_827DDF2:: @ 827DDF2
.string "{STR_VAR_1} regained its\n" .string "{STR_VAR_1} regained its\n"
.string "form.{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$" .string "form.{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$"
gText_827DE14:: @ 827DE14
.string "It tried to jam POKéMON\n" .string "It tried to jam POKéMON\n"
.string "doing well.{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$" .string "doing well.{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$"
gText_827DE44:: @ 827DE44
.string "The standout {STR_VAR_1}\n" .string "The standout {STR_VAR_1}\n"
.string "hustled even more.{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$" .string "hustled even more.{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$"
gText_827DE73:: @ 827DE73
.string "The largely unnoticed\n" .string "The largely unnoticed\n"
.string "{STR_VAR_1} worked hard.{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$" .string "{STR_VAR_1} worked hard.{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$"
gText_827DEA5:: @ 827DEA5
.string "It worked as much as\n" .string "It worked as much as\n"
.string "POKéMON before it.{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$" .string "POKéMON before it.{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$"
gText_827DED9:: @ 827DED9
.string "{STR_VAR_1}’s appeal did\n" .string "{STR_VAR_1}’s appeal did\n"
.string "not go well.{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$" .string "not go well.{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$"
gText_827DF02:: @ 827DF02
.string "It worked as much as the\n" .string "It worked as much as the\n"
.string "preceding POKéMON.{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$" .string "preceding POKéMON.{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$"
gText_827DF3A:: @ 827DF3A
.string "{STR_VAR_1}’s appeal did\n" .string "{STR_VAR_1}’s appeal did\n"
.string "not go well.{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$" .string "not go well.{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$"
gText_827DF63:: @ 827DF63
.string "{STR_VAR_1}’s appeal did\n" .string "{STR_VAR_1}’s appeal did\n"
.string "not go well.{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$" .string "not go well.{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$"
gText_827DF8C:: @ 827DF8C
.string "{STR_VAR_1}’s appeal\n" .string "{STR_VAR_1}’s appeal\n"
.string "went slightly well.{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$" .string "went slightly well.{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$"
gText_827DFB8:: @ 827DFB8
.string "{STR_VAR_1}’s appeal\n" .string "{STR_VAR_1}’s appeal\n"
.string "went pretty well.{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$" .string "went pretty well.{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$"
gText_827DFE2:: @ 827DFE2
.string "{STR_VAR_1}’s appeal\n" .string "{STR_VAR_1}’s appeal\n"
.string "went excellently.{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$" .string "went excellently.{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$"
gText_827E00C:: @ 827E00C
.string "{STR_VAR_1}’s appeal was\n" .string "{STR_VAR_1}’s appeal was\n"
.string "a dud.{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$" .string "a dud.{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$"
gText_827E02F:: @ 827E02F
.string "{STR_VAR_1}’s appeal did\n" .string "{STR_VAR_1}’s appeal did\n"
.string "not work very well.{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$" .string "not work very well.{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$"
gText_827E05F:: @ 827E05F
.string "{STR_VAR_1}’s appeal\n" .string "{STR_VAR_1}’s appeal\n"
.string "went slightly well.{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$" .string "went slightly well.{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$"
gText_827E08B:: @ 827E08B
.string "{STR_VAR_1}’s appeal\n" .string "{STR_VAR_1}’s appeal\n"
.string "went pretty well.{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$" .string "went pretty well.{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$"
gText_827E0B5:: @ 827E0B5
.string "{STR_VAR_1}’s appeal\n" .string "{STR_VAR_1}’s appeal\n"
.string "went very well.{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$" .string "went very well.{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$"
gText_827E0DD:: @ 827E0DD
.string "{STR_VAR_1}’s appeal\n" .string "{STR_VAR_1}’s appeal\n"
.string "went excellently.{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$" .string "went excellently.{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$"
gText_827E107:: @ 827E107
.string "It’s the same type as the\n" .string "It’s the same type as the\n"
.string "POKéMON before--good!{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$" .string "POKéMON before--good!{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$"
gText_827E143:: @ 827E143
.string "It’s not the same type as\n" .string "It’s not the same type as\n"
.string "the one before--good!{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$" .string "the one before--good!{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$"
gText_827E17F:: @ 827E17F
.string "It stood out much more\n" .string "It stood out much more\n"
.string "than the POKéMON before.{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$" .string "than the POKéMON before.{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$"
gText_827E1BB:: @ 827E1BB
.string "It didn’t do as well as the\n" .string "It didn’t do as well as the\n"
.string "POKéMON before.{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$" .string "POKéMON before.{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$"
gText_827E1F3:: @ 827E1F3
.string "{STR_VAR_1}’s condition\n" .string "{STR_VAR_1}’s condition\n"
.string "rose above usual.{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$" .string "rose above usual.{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$"
gText_827E220:: @ 827E220
.string "{STR_VAR_1}’s hot status\n" .string "{STR_VAR_1}’s hot status\n"
.string "made it a great appeal!{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$" .string "made it a great appeal!{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$"
gText_827E254:: @ 827E254
.string "It moved up in line for\n" .string "It moved up in line for\n"
.string "the next appeal.{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$" .string "the next appeal.{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$"
gText_827E289:: @ 827E289
.string "It moved back in line once\n" .string "It moved back in line once\n"
.string "for the next appeal.{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$" .string "for the next appeal.{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$"
gText_827E2C5:: @ 827E2C5
.string "It scrambled up the\n" .string "It scrambled up the\n"
.string "order for the next turn.{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$" .string "order for the next turn.{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$"
gUnknown_0827E2FE:: @ 827E2FE gText_0827E2FE:: @ 827E2FE
.string "The JUDGE looked at\n" .string "The JUDGE looked at\n"
.string "{STR_VAR_1} expectantly.{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}$" .string "{STR_VAR_1} expectantly.{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}$"
gUnknown_0827E32E:: @ 827E32E gText_0827E32E:: @ 827E32E
.string "The appeal combo went\n" .string "The appeal combo went\n"
.string "over well.{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}$" .string "over well.{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}$"
gUnknown_0827E35B:: @ 827E35B gText_0827E35B:: @ 827E35B
.string "The appeal combo went\n" .string "The appeal combo went\n"
.string "over very well.{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}$" .string "over very well.{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}$"
gUnknown_0827E38D:: @ 827E38D gText_0827E38D:: @ 827E38D
.string "The appeal combo went\n" .string "The appeal combo went\n"
.string "over excellently.{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}$" .string "over excellently.{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}$"
gUnknown_0827E3C1:: @ 827E3C1 gText_0827E3C1:: @ 827E3C1
.string "{STR_VAR_1} managed to\n" .string "{STR_VAR_1} managed to\n"
.string "avert its gaze.{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}$" .string "avert its gaze.{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}$"
gUnknown_0827E3EB:: @ 827E3EB gText_0827E3EB:: @ 827E3EB
.string "{STR_VAR_1} managed to\n" .string "{STR_VAR_1} managed to\n"
.string "avoid seeing it.{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}$" .string "avoid seeing it.{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}$"
gUnknown_0827E416:: @ 827E416 gText_0827E416:: @ 827E416
.string "{STR_VAR_1} isn’t fazed\n" .string "{STR_VAR_1} isn’t fazed\n"
.string "by that sort of thing.{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}$" .string "by that sort of thing.{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}$"
gUnknown_0827E448:: @ 827E448 gText_0827E448:: @ 827E448
.string "{STR_VAR_1} became a\n" .string "{STR_VAR_1} became a\n"
.string "little distracted.{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}$" .string "little distracted.{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}$"
gUnknown_0827E473:: @ 827E473 gText_0827E473:: @ 827E473
.string "It tried to startle the\n" .string "It tried to startle the\n"
.string "other POKéMON.{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}$" .string "other POKéMON.{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}$"
gUnknown_0827E4A6:: @ 827E4A6 gText_0827E4A6:: @ 827E4A6
.string "{STR_VAR_1} looked down\n" .string "{STR_VAR_1} looked down\n"
.string "out of distraction.{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}$" .string "out of distraction.{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}$"
gUnknown_0827E4D5:: @ 827E4D5 gText_0827E4D5:: @ 827E4D5
.string "{STR_VAR_1} turned back\n" .string "{STR_VAR_1} turned back\n"
.string "out of distraction.{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}$" .string "out of distraction.{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}$"
gUnknown_0827E504:: @ 827E504 gText_0827E504:: @ 827E504
.string "{STR_VAR_1} couldn’t help\n" .string "{STR_VAR_1} couldn’t help\n"
.string "uttering a cry.{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}$" .string "uttering a cry.{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}$"
gUnknown_0827E531:: @ 827E531 gText_0827E531:: @ 827E531
.string "{STR_VAR_1} couldn’t help\n" .string "{STR_VAR_1} couldn’t help\n"
.string "leaping up.{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}$" .string "leaping up.{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}$"
gUnknown_0827E55A:: @ 827E55A gText_0827E55A:: @ 827E55A
.string "{STR_VAR_1} tripped over\n" .string "{STR_VAR_1} tripped over\n"
.string "out of distraction.{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}$" .string "out of distraction.{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}$"
gUnknown_0827E58A:: @ 827E58A gText_0827E58A:: @ 827E58A
.string "{STR_VAR_1} was too\n" .string "{STR_VAR_1} was too\n"
.string "nervous to move.{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}$" .string "nervous to move.{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}$"
gUnknown_0827E5B2:: @ 827E5B2 gText_0827E5B2:: @ 827E5B2
.string "But it messed up.{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}$" .string "But it messed up.{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}$"
gUnknown_0827E5D0:: @ 827E5D0 gText_0827E5D0:: @ 827E5D0
.string "But it failed to make\n" .string "But it failed to make\n"
.string "the target nervous.{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}$" .string "the target nervous.{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}$"
gUnknown_0827E606:: @ 827E606 gText_0827E606:: @ 827E606
.string "But it failed to make\n" .string "But it failed to make\n"
.string "anyone nervous.{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}$" .string "anyone nervous.{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}$"
gUnknown_0827E638:: @ 827E638 gText_0827E638:: @ 827E638
.string "But it was ignored…{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}$" .string "But it was ignored…{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}$"
gUnknown_0827E658:: @ 827E658 gText_0827E658:: @ 827E658
.string "But it couldn’t improve\n" .string "But it couldn’t improve\n"
.string "its condition…{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}$" .string "its condition…{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}$"
gUnknown_0827E68B:: @ 827E68B gText_0827E68B:: @ 827E68B
.string "Its bad condition\n" .string "Its bad condition\n"
.string "resulted in a weak appeal.{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}$" .string "resulted in a weak appeal.{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}$"
gUnknown_0827E6C4:: @ 827E6C4 gText_0827E6C4:: @ 827E6C4
.string "{STR_VAR_1} was\n" .string "{STR_VAR_1} was\n"
.string "unaffected.{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}$" .string "unaffected.{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}$"
gUnknown_0827E6E3:: @ 827E6E3 gText_0827E6E3:: @ 827E6E3
.string "{STR_VAR_1} disappointed\n" .string "{STR_VAR_1} disappointed\n"
.string "by repeating an appeal.{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}$" .string "by repeating an appeal.{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}$"
gUnknown_0827E717:: @ 827E717 gText_0827E717:: @ 827E717
.string "{STR_VAR_1}’s {STR_VAR_3}\n" .string "{STR_VAR_1}’s {STR_VAR_3}\n"
.string "went over great.{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}$" .string "went over great.{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}$"
gUnknown_0827E73C:: @ 827E73C gText_0827E73C:: @ 827E73C
.string "{STR_VAR_1}’s {STR_VAR_3}\n" .string "{STR_VAR_1}’s {STR_VAR_3}\n"
.string "didn’t go over well here…{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}$" .string "didn’t go over well here…{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}$"
gUnknown_0827E76A:: @ 827E76A gText_0827E76A:: @ 827E76A
.string "{STR_VAR_1}’s {STR_VAR_3}\n" .string "{STR_VAR_1}’s {STR_VAR_3}\n"
.string "got the crowd going.{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}$" .string "got the crowd going.{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}$"
gUnknown_0827E793:: @ 827E793 gText_0827E793:: @ 827E793
.string "{STR_VAR_1} can’t appeal\n" .string "{STR_VAR_1} can’t appeal\n"
.string "next turn…{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}$" .string "next turn…{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}$"
gUnknown_0827E7BA:: @ 827E7BA gText_0827E7BA:: @ 827E7BA
.string "It attracted the crowd’s\n" .string "It attracted the crowd’s\n"
.string "attention.{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}$" .string "attention.{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}$"
gUnknown_0827E7EA:: @ 827E7EA gText_0827E7EA:: @ 827E7EA
.string "The crowd continues to\n" .string "The crowd continues to\n"
.string "watch {STR_VAR_3}.{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}$" .string "watch {STR_VAR_3}.{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}$"
gUnknown_0827E817:: @ 827E817 gText_0827E817:: @ 827E817
.string "{STR_VAR_1}’s\n" .string "{STR_VAR_1}’s\n"
.string "{STR_VAR_2} is ignored.{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}$" .string "{STR_VAR_2} is ignored.{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}$"
gUnknown_0827E837:: @ 827E837 gText_0827E837:: @ 827E837
.string "shyness$" .string "shyness$"
gUnknown_0827E83F:: @ 827E83F gText_0827E83F:: @ 827E83F
.string "anxiety$" .string "anxiety$"
gUnknown_0827E847:: @ 827E847 gText_0827E847:: @ 827E847
.string "laziness$" .string "laziness$"
gUnknown_0827E850:: @ 827E850 gText_0827E850:: @ 827E850
.string "hesitancy$" .string "hesitancy$"
gUnknown_0827E85A:: @ 827E85A gText_0827E85A:: @ 827E85A
.string "fear$" .string "fear$"
gUnknown_0827E85F:: @ 827E85F gText_0827E85F:: @ 827E85F
.string "coolness$" .string "coolness$"
gUnknown_0827E868:: @ 827E868 gText_0827E868:: @ 827E868
.string "beauty$" .string "beauty$"
gUnknown_0827E86F:: @ 827E86F gText_0827E86F:: @ 827E86F
.string "cuteness$" .string "cuteness$"
gUnknown_0827E878:: @ 827E878 gText_0827E878:: @ 827E878
.string "smartness$" .string "smartness$"
gUnknown_0827E882:: @ 827E882 gText_0827E882:: @ 827E882
.string "toughness$" .string "toughness$"
gUnknown_0827E88C:: @ 827E88C gText_0827E88C:: @ 827E88C
.string "TENSION$" .string "TENSION$"
gUnknown_0827E894:: @ 827E894 gText_0827E894:: @ 827E894
.string "COOL Move$" .string "COOL Move$"
gUnknown_0827E89E:: @ 827E89E gText_0827E89E:: @ 827E89E
.string "BEAUTY Move$" .string "BEAUTY Move$"
gUnknown_0827E8AA:: @ 827E8AA gText_0827E8AA:: @ 827E8AA
.string "CUTE Move$" .string "CUTE Move$"
gUnknown_0827E8B4:: @ 827E8B4 gText_0827E8B4:: @ 827E8B4
.string "SMART Move$" .string "SMART Move$"
gUnknown_0827E8BF:: @ 827E8BF gText_0827E8BF:: @ 827E8BF
.string "TOUGH Move$" .string "TOUGH Move$"
gUnknown_0827E8CA:: @ 827E8CA gText_0827E8CA:: @ 827E8CA
.string "???$" .string "???$"
data/text/easy_chat/easy_chat_group_pokemon2.s
+1 -1
View File
@@ -57,7 +57,7 @@ gEasyChatGroup_Pokemon2:: @ 859CE0C
.2byte SPECIES_ESPEON .2byte SPECIES_ESPEON
.2byte SPECIES_EXEGGCUTE .2byte SPECIES_EXEGGCUTE
.2byte SPECIES_EXEGGUTOR .2byte SPECIES_EXEGGUTOR
.2byte SPECIES_FARFETCH_D .2byte SPECIES_FARFETCHD
.2byte SPECIES_FEAROW .2byte SPECIES_FEAROW
.2byte SPECIES_FERALIGATR .2byte SPECIES_FERALIGATR
.2byte SPECIES_FLAAFFY .2byte SPECIES_FLAAFFY
data/text/easy_chat/easy_chat_words_by_letter.inc
+2337 -2337
View File
File diff suppressed because it is too large Load Diff
data/trade.s
+3
View File
@@ -3,6 +3,9 @@
.section .rodata .section .rodata
.align 2, 0 .align 2, 0
gUnknown_0832C6A8:: @ 832C6A8
.incbin "baserom.gba", 0x32C6A8, 0x18
gUnknown_0832C6C0:: @ 832C6C0 gUnknown_0832C6C0:: @ 832C6C0
.incbin "baserom.gba", 0x32c6c0, 0x1fe .incbin "baserom.gba", 0x32c6c0, 0x1fe
data/wild_encounter.s
+1
View File
@@ -1,3 +1,4 @@
#include "constants/species.h"
.include "asm/macros.inc" .include "asm/macros.inc"
.include "constants/constants.inc" .include "constants/constants.inc"
data/wild_mons.inc
+1975 -1975
View File
File diff suppressed because it is too large Load Diff
graphics/interface/ball/dive.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 326 B

graphics/interface/ball/great.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 257 B

graphics/interface/ball/luxury.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 350 B

graphics/interface/ball/master.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 260 B

graphics/interface/ball/nest.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 266 B

graphics/interface/ball/net.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 246 B

graphics/interface/ball/poke.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 249 B

graphics/interface/ball/premier.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 289 B

graphics/interface/ball/repeat.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 257 B

graphics/interface/ball/safari.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 259 B

graphics/interface/ball/timer.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 296 B

graphics/wallclock/graphics_85b1f58.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 204 B

graphics/wallclock/palette_85b21d4.pal
+7
View File
@@ -0,0 +1,7 @@
JASC-PAL
0100
4
0 0 0
74 180 189
255 255 255
0 0 0
include/abilities.h
-81
View File
@@ -1,81 +0,0 @@
enum
{
ABILITY_NONE,
ABILITY_STENCH,
ABILITY_DRIZZLE,
ABILITY_SPEED_BOOST,
ABILITY_BATTLE_ARMOR,
ABILITY_STURDY,
ABILITY_DAMP,
ABILITY_LIMBER,
ABILITY_SAND_VEIL,
ABILITY_STATIC,
ABILITY_VOLT_ABSORB,
ABILITY_WATER_ABSORB,
ABILITY_OBLIVIOUS,
ABILITY_CLOUD_NINE,
ABILITY_COMPOUND_EYES,
ABILITY_INSOMNIA,
ABILITY_COLOR_CHANGE,
ABILITY_IMMUNITY,
ABILITY_FLASH_FIRE,
ABILITY_SHIELD_DUST,
ABILITY_OWN_TEMPO,
ABILITY_SUCTION_CUPS,
ABILITY_INTIMIDATE,
ABILITY_SHADOW_TAG,
ABILITY_ROUGH_SKIN,
ABILITY_WONDER_GUARD,
ABILITY_LEVITATE,
ABILITY_EFFECT_SPORE,
ABILITY_SYNCHRONIZE,
ABILITY_CLEAR_BODY,
ABILITY_NATURAL_CURE,
ABILITY_LIGHTNING_ROD,
ABILITY_SERENE_GRACE,
ABILITY_SWIFT_SWIM,
ABILITY_CHLOROPHYLL,
ABILITY_ILLUMINATE,
ABILITY_TRACE,
ABILITY_HUGE_POWER,
ABILITY_POISON_POINT,
ABILITY_INNER_FOCUS,
ABILITY_MAGMA_ARMOR,
ABILITY_WATER_VEIL,
ABILITY_MAGNET_PULL,
ABILITY_SOUNDPROOF,
ABILITY_RAIN_DISH,
ABILITY_SAND_STREAM,
ABILITY_PRESSURE,
ABILITY_THICK_FAT,
ABILITY_EARLY_BIRD,
ABILITY_FLAME_BODY,
ABILITY_RUN_AWAY,
ABILITY_KEEN_EYE,
ABILITY_HYPER_CUTTER,
ABILITY_PICKUP,
ABILITY_TRUANT,
ABILITY_HUSTLE,
ABILITY_CUTE_CHARM,
ABILITY_PLUS,
ABILITY_MINUS,
ABILITY_FORECAST,
ABILITY_STICKY_HOLD,
ABILITY_SHED_SKIN,
ABILITY_GUTS,
ABILITY_MARVEL_SCALE,
ABILITY_LIQUID_OOZE,
ABILITY_OVERGROW,
ABILITY_BLAZE,
ABILITY_TORRENT,
ABILITY_SWARM,
ABILITY_ROCK_HEAD,
ABILITY_DROUGHT,
ABILITY_ARENA_TRAP,
ABILITY_VITAL_SPIRIT,
ABILITY_WHITE_SMOKE,
ABILITY_PURE_POWER,
ABILITY_SHELL_ARMOR,
ABILITY_CACOPHONY,
ABILITY_AIR_LOCK
};
include/battle.h
+10 -10
View File
@@ -86,7 +86,7 @@
#define BATTLE_FORFEITED 0x9 #define BATTLE_FORFEITED 0x9
#define BATTLE_OPPONENT_TELEPORTED 0xA #define BATTLE_OPPONENT_TELEPORTED 0xA
#define BATTLE_OUTCOME_BIT_x80 0x80 #define OUTCOME_LINK_BATTLE_RUN 0x80
#define STATUS_NONE 0x0 #define STATUS_NONE 0x0
#define STATUS_SLEEP 0x7 #define STATUS_SLEEP 0x7
@@ -616,10 +616,10 @@ struct BattleStruct
u8 focusPunchBank; u8 focusPunchBank;
u8 field_49; u8 field_49;
u8 moneyMultiplier; u8 moneyMultiplier;
u8 field_4B; u8 savedTurnActionNumber;
u8 switchInAbilitiesCounter; u8 switchInAbilitiesCounter;
u8 field_4D; u8 faintedActionsState;
u8 field_4E; u8 faintedActionsBank;
u8 field_4F; u8 field_4F;
u16 expValue; u16 expValue;
u8 field_52; u8 field_52;
@@ -691,8 +691,8 @@ struct BattleStruct
u8 field_182; u8 field_182;
u8 field_183; u8 field_183;
struct BattleEnigmaBerry battleEnigmaBerry; struct BattleEnigmaBerry battleEnigmaBerry;
u8 field_1A0; u8 wishPerishSongState;
u8 field_1A1; u8 wishPerishSongBank;
bool8 overworldWeatherDone; bool8 overworldWeatherDone;
u8 atkCancellerTracker; u8 atkCancellerTracker;
u8 field_1A4[96]; u8 field_1A4[96];
@@ -801,7 +801,7 @@ extern struct BattleStruct* gBattleStruct;
#define B_ANIM_ITEM_STEAL 0x10 #define B_ANIM_ITEM_STEAL 0x10
#define B_ANIM_SNATCH_MOVE 0x11 #define B_ANIM_SNATCH_MOVE 0x11
#define B_ANIM_FUTURE_SIGHT_HIT 0x12 #define B_ANIM_FUTURE_SIGHT_HIT 0x12
#define B_ANIM_x13 0x13 #define B_ANIM_DOOM_DESIRE_HIT 0x13
#define B_ANIM_x14 0x14 #define B_ANIM_x14 0x14
#define B_ANIM_INGRAIN_HEAL 0x15 #define B_ANIM_INGRAIN_HEAL 0x15
#define B_ANIM_WISH_HEAL 0x16 #define B_ANIM_WISH_HEAL 0x16
@@ -846,8 +846,8 @@ struct BattleScripting
u8 animArg2; u8 animArg2;
u16 tripleKickPower; u16 tripleKickPower;
u8 atk49_state; u8 atk49_state;
u8 field_15; u8 bankWithAbility;
u8 field_16; u8 multihitMoveEffect;
u8 bank; u8 bank;
u8 animTurn; u8 animTurn;
u8 animTargetsHit; u8 animTargetsHit;
@@ -933,7 +933,7 @@ struct BattleHealthboxInfo
u8 flag_x1 : 1; u8 flag_x1 : 1;
u8 flag_x2 : 1; u8 flag_x2 : 1;
u8 flag_x4 : 1; u8 flag_x4 : 1;
u8 flag_x8 : 1; u8 ballAnimActive : 1; // 0x8
u8 statusAnimActive : 1; // x10 u8 statusAnimActive : 1; // x10
u8 animFromTableActive : 1; // x20 u8 animFromTableActive : 1; // x20
u8 specialAnimActive : 1; //x40 u8 specialAnimActive : 1; //x40
include/battle_anim.h
+17 -1
View File
@@ -79,11 +79,22 @@ void HandleIntroSlide(u8 terrainId);
// battle_anim_80A5C6C.s // battle_anim_80A5C6C.s
void sub_80A6EEC(struct Sprite *sprite); void sub_80A6EEC(struct Sprite *sprite);
void sub_80A68D4(struct Sprite *sprite);
void sub_80A6F3C(struct Sprite *sprite);
void sub_80A8278(void); void sub_80A8278(void);
void sub_80A6B30(struct UnknownAnimStruct2*); void sub_80A6B30(struct UnknownAnimStruct2*);
void sub_80A6B90(struct UnknownAnimStruct2*, u32 arg1); void sub_80A6B90(struct UnknownAnimStruct2*, u32 arg1);
u8 sub_80A82E4(u8 bank); u8 sub_80A82E4(u8 bank);
u8 sub_80A5C6C(u8 bank, u8 attributeId); bool8 AnimateBallThrow(struct Sprite *sprite);
enum
{
BANK_X_POS,
BANK_Y_POS,
};
u8 GetBankPosition(u8 bank, u8 attributeId);
bool8 IsBankSpritePresent(u8 bank); bool8 IsBankSpritePresent(u8 bank);
void sub_80A6C68(u8 arg0); void sub_80A6C68(u8 arg0);
u8 GetAnimBankSpriteId(u8 wantedBank); u8 GetAnimBankSpriteId(u8 wantedBank);
@@ -99,4 +110,9 @@ u8 GetSubstituteSpriteDefault_Y(u8 bank);
// battle_anim_80A9C70.s // battle_anim_80A9C70.s
void LaunchStatusAnimation(u8 bank, u8 statusAnimId); void LaunchStatusAnimation(u8 bank, u8 statusAnimId);
// battle_anim_8170478.s
u8 ItemIdToBallId(u16 itemId);
u8 LaunchBallStarsTask(u8 x, u8 y, u8 kindOfStars, u8 arg3, u8 ballId);
u8 LaunchBallFadeMonTask(bool8 unFadeLater, u8 bank, u32 arg2, u8 ballId);
#endif // GUARD_BATTLE_ANIM_H #endif // GUARD_BATTLE_ANIM_H
include/battle_move_effects.h
-222
View File
@@ -1,222 +0,0 @@
#ifndef GUARD_BATTLE_MOVE_EFFECTS_H
#define GUARD_BATTLE_MOVE_EFFECTS_H
enum
{
EFFECT_HIT,
EFFECT_SLEEP,
EFFECT_POISON_HIT,
EFFECT_ABSORB,
EFFECT_BURN_HIT,
EFFECT_FREEZE_HIT,
EFFECT_PARALYZE_HIT,
EFFECT_EXPLOSION,
EFFECT_DREAM_EATER,
EFFECT_MIRROR_MOVE,
EFFECT_ATTACK_UP,
EFFECT_DEFENSE_UP,
EFFECT_SPEED_UP,
EFFECT_SPECIAL_ATTACK_UP,
EFFECT_SPECIAL_DEFENSE_UP,
EFFECT_ACCURACY_UP,
EFFECT_EVASION_UP,
EFFECT_ALWAYS_HIT,
EFFECT_ATTACK_DOWN,
EFFECT_DEFENSE_DOWN,
EFFECT_SPEED_DOWN,
EFFECT_SPECIAL_ATTACK_DOWN, // unused
EFFECT_SPECIAL_DEFENSE_DOWN, // unused
EFFECT_ACCURACY_DOWN,
EFFECT_EVASION_DOWN,
EFFECT_HAZE,
EFFECT_BIDE,
EFFECT_RAMPAGE,
EFFECT_ROAR,
EFFECT_MULTI_HIT,
EFFECT_CONVERSION,
EFFECT_FLINCH_HIT,
EFFECT_RESTORE_HP,
EFFECT_TOXIC,
EFFECT_PAY_DAY,
EFFECT_LIGHT_SCREEN,
EFFECT_TRI_ATTACK,
EFFECT_REST,
EFFECT_OHKO,
EFFECT_RAZOR_WIND,
EFFECT_SUPER_FANG,
EFFECT_DRAGON_RAGE,
EFFECT_TRAP,
EFFECT_HIGH_CRITICAL,
EFFECT_DOUBLE_HIT,
EFFECT_RECOIL_IF_MISS,
EFFECT_MIST,
EFFECT_FOCUS_ENERGY,
EFFECT_RECOIL,
EFFECT_CONFUSE,
EFFECT_ATTACK_UP_2,
EFFECT_DEFENSE_UP_2,
EFFECT_SPEED_UP_2,
EFFECT_SPECIAL_ATTACK_UP_2,
EFFECT_SPECIAL_DEFENSE_UP_2,
EFFECT_ACCURACY_UP_2,
EFFECT_EVASION_UP_2,
EFFECT_TRANSFORM,
EFFECT_ATTACK_DOWN_2,
EFFECT_DEFENSE_DOWN_2,
EFFECT_SPEED_DOWN_2,
EFFECT_SPECIAL_ATTACK_DOWN_2,
EFFECT_SPECIAL_DEFENSE_DOWN_2,
EFFECT_ACCURACY_DOWN_2,
EFFECT_EVASION_DOWN_2,
EFFECT_REFLECT,
EFFECT_POISON,
EFFECT_PARALYZE,
EFFECT_ATTACK_DOWN_HIT,
EFFECT_DEFENSE_DOWN_HIT,
EFFECT_SPEED_DOWN_HIT,
EFFECT_SPECIAL_ATTACK_DOWN_HIT,
EFFECT_SPECIAL_DEFENSE_DOWN_HIT,
EFFECT_ACCURACY_DOWN_HIT,
EFFECT_EVASION_DOWN_HIT,
EFFECT_SKY_ATTACK,
EFFECT_CONFUSE_HIT,
EFFECT_TWINEEDLE,
EFFECT_VITAL_THROW,
EFFECT_SUBSTITUTE,
EFFECT_RECHARGE,
EFFECT_RAGE,
EFFECT_MIMIC,
EFFECT_METRONOME,
EFFECT_LEECH_SEED,
EFFECT_SPLASH,
EFFECT_DISABLE,
EFFECT_LEVEL_DAMAGE,
EFFECT_PSYWAVE,
EFFECT_COUNTER,
EFFECT_ENCORE,
EFFECT_PAIN_SPLIT,
EFFECT_SNORE,
EFFECT_CONVERSION_2,
EFFECT_LOCK_ON,
EFFECT_SKETCH,
EFFECT_UNUSED_60, // thaw
EFFECT_SLEEP_TALK,
EFFECT_DESTINY_BOND,
EFFECT_FLAIL,
EFFECT_SPITE,
EFFECT_FALSE_SWIPE,
EFFECT_HEAL_BELL,
EFFECT_QUICK_ATTACK,
EFFECT_TRIPLE_KICK,
EFFECT_THIEF,
EFFECT_MEAN_LOOK,
EFFECT_NIGHTMARE,
EFFECT_MINIMIZE,
EFFECT_CURSE,
EFFECT_UNUSED_6E,
EFFECT_PROTECT,
EFFECT_SPIKES,
EFFECT_FORESIGHT,
EFFECT_PERISH_SONG,
EFFECT_SANDSTORM,
EFFECT_ENDURE,
EFFECT_ROLLOUT,
EFFECT_SWAGGER,
EFFECT_FURY_CUTTER,
EFFECT_ATTRACT,
EFFECT_RETURN,
EFFECT_PRESENT,
EFFECT_FRUSTRATION,
EFFECT_SAFEGUARD,
EFFECT_THAW_HIT,
EFFECT_MAGNITUDE,
EFFECT_BATON_PASS,
EFFECT_PURSUIT,
EFFECT_RAPID_SPIN,
EFFECT_SONICBOOM,
EFFECT_UNUSED_83,
EFFECT_MORNING_SUN,
EFFECT_SYNTHESIS,
EFFECT_MOONLIGHT,
EFFECT_HIDDEN_POWER,
EFFECT_RAIN_DANCE,
EFFECT_SUNNY_DAY,
EFFECT_DEFENSE_UP_HIT,
EFFECT_ATTACK_UP_HIT,
EFFECT_ALL_STATS_UP_HIT,
EFFECT_UNUSED_8D, // incomplete fake out in gen 2
EFFECT_BELLY_DRUM,
EFFECT_PSYCH_UP,
EFFECT_MIRROR_COAT,
EFFECT_SKULL_BASH,
EFFECT_TWISTER,
EFFECT_EARTHQUAKE,
EFFECT_FUTURE_SIGHT,
EFFECT_GUST,
EFFECT_STOMP, // STOMP ASTONISH EXTRASENSORY NEEDLE_ARM
EFFECT_SOLARBEAM,
EFFECT_THUNDER,
EFFECT_TELEPORT,
EFFECT_BEAT_UP,
EFFECT_SEMI_INVULNERABLE,
EFFECT_DEFENSE_CURL,
EFFECT_SOFTBOILED,
EFFECT_FAKE_OUT,
EFFECT_UPROAR,
EFFECT_STOCKPILE,
EFFECT_SPIT_UP,
EFFECT_SWALLOW,
EFFECT_UNUSED_A3,
EFFECT_HAIL,
EFFECT_TORMENT,
EFFECT_FLATTER,
EFFECT_WILL_O_WISP,
EFFECT_MEMENTO,
EFFECT_FACADE,
EFFECT_FOCUS_PUNCH,
EFFECT_SMELLINGSALT,
EFFECT_FOLLOW_ME,
EFFECT_NATURE_POWER,
EFFECT_CHARGE,
EFFECT_TAUNT,
EFFECT_HELPING_HAND,
EFFECT_TRICK,
EFFECT_ROLE_PLAY,
EFFECT_WISH,
EFFECT_ASSIST,
EFFECT_INGRAIN,
EFFECT_SUPERPOWER,
EFFECT_MAGIC_COAT,
EFFECT_RECYCLE,
EFFECT_REVENGE,
EFFECT_BRICK_BREAK,
EFFECT_YAWN,
EFFECT_KNOCK_OFF,
EFFECT_ENDEAVOR,
EFFECT_ERUPTION,
EFFECT_SKILL_SWAP,
EFFECT_IMPRISON,
EFFECT_REFRESH,
EFFECT_GRUDGE,
EFFECT_SNATCH,
EFFECT_LOW_KICK,
EFFECT_SECRET_POWER,
EFFECT_DOUBLE_EDGE,
EFFECT_TEETER_DANCE,
EFFECT_BLAZE_KICK,
EFFECT_MUD_SPORT,
EFFECT_POISON_FANG,
EFFECT_WEATHER_BALL,
EFFECT_OVERHEAT,
EFFECT_TICKLE,
EFFECT_COSMIC_POWER,
EFFECT_SKY_UPPERCUT,
EFFECT_BULK_UP,
EFFECT_POISON_TAIL,
EFFECT_WATER_SPORT,
EFFECT_CALM_MIND,
EFFECT_DRAGON_DANCE,
EFFECT_CAMOUFLAGE,
};
#endif // GUARD_BATTLE_MOVE_EFFECTS_H

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