ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-09-29 01:04:28 +02:00
Code Issues Packages Projects Releases Wiki Activity

contest move effects

Browse Source
This commit is contained in:
YamaArashi 2015-10-14 13:26:49 -07:00
parent dd8f08f8a8
commit 078afb798e
3 changed files with 309 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
asm/emerald.s
View File

@ -415705,7 +415705,7 @@ sub_80DB2EC: ; 80DB2EC
lsls r0, 16 lsls r0, 16
lsls r1, 24 lsls r1, 24
lsrs r3, r1, 24 lsrs r3, r1, 24
ldr r2, =gUnknown_0858CDCC ldr r2, =gContestEffects
ldr r1, =gContestMoves ldr r1, =gContestMoves
lsrs r0, 13 lsrs r0, 13
adds r0, r1 adds r0, r1
@ -415812,7 +415812,7 @@ prints_contest_move_description: ; 80DB370
movs r2, 0xB movs r2, 0xB
movs r3, 0x20 movs r3, 0x20
bl sub_80DECB8 bl sub_80DECB8
ldr r2, =gUnknown_0858CDCC ldr r2, =gContestEffects
ldr r0, =gContestMoves ldr r0, =gContestMoves
mov r3, r8 mov r3, r8
lsls r1, r3, 3 lsls r1, r3, 3
@ -415858,7 +415858,7 @@ prints_contest_move_description: ; 80DB370
movs r2, 0x15 movs r2, 0x15
movs r3, 0x1F movs r3, 0x1F
bl sub_80DED10 bl sub_80DED10
ldr r1, =gUnknown_0858CDCC ldr r1, =gContestEffects
ldr r0, =gContestMoves ldr r0, =gContestMoves
adds r0, r7, r0 adds r0, r7, r0
ldrb r0, [r0] ldrb r0, [r0]
@ -419631,7 +419631,7 @@ sub_80DD080: ; 80DD080
subs r0, r7, r6 subs r0, r7, r6
lsls r0, 2 lsls r0, 2
adds r2, r0, r2 adds r2, r0, r2
ldr r3, =gUnknown_0858CDCC ldr r3, =gContestEffects
mov r1, r9 mov r1, r9
lsls r5, r1, 2 lsls r5, r1, 2
adds r3, r5, r3 adds r3, r5, r3
@ -437262,7 +437262,7 @@ sub_80E5E04: ; 80E5E04
lsls r1, 2 lsls r1, 2
adds r1, r0 adds r1, r0
ldrh r0, [r1, 0x6] ldrh r0, [r1, 0x6]
ldr r3, =gUnknown_0858CDCC ldr r3, =gContestEffects
ldr r2, =gContestMoves ldr r2, =gContestMoves
lsls r0, 3 lsls r0, 3
adds r0, r2 adds r0, r2
@ -437304,7 +437304,7 @@ sub_80E5E5C: ; 80E5E5C
lsls r1, 2 lsls r1, 2
adds r1, r0 adds r1, r0
ldrh r0, [r1, 0x6] ldrh r0, [r1, 0x6]
ldr r3, =gUnknown_0858CDCC ldr r3, =gContestEffects
ldr r2, =gContestMoves ldr r2, =gContestMoves
lsls r0, 3 lsls r0, 3
adds r0, r2 adds r0, r2
@ -437752,7 +437752,7 @@ sub_80E611C: ; 80E611C
lsls r0, 29 lsls r0, 29
cmp r2, r0 cmp r2, r0
bne @080E61F8 bne @080E61F8
ldr r1, =gUnknown_0858CDCC ldr r1, =gContestEffects
ldrb r0, [r7] ldrb r0, [r7]
lsls r0, 2 lsls r0, 2
adds r0, r1 adds r0, r1
@ -437832,7 +437832,7 @@ sub_80E620C: ; 80E620C
subs r1, r2 subs r1, r2
lsls r1, 2 lsls r1, 2
adds r1, r3 adds r1, r3
ldr r2, =gUnknown_0858CDCC ldr r2, =gContestEffects
ldrb r0, [r5] ldrb r0, [r5]
lsls r0, 2 lsls r0, 2
adds r0, r2 adds r0, r2
@ -661125,7 +661125,7 @@ sub_8156FCC: ; 8156FCC
adds r2, 0x1E adds r2, 0x1E
adds r1, r2 adds r1, r2
ldrh r0, [r1] ldrh r0, [r1]
ldr r2, =gUnknown_0858CDCC ldr r2, =gContestEffects
ldr r1, =gContestMoves ldr r1, =gContestMoves
lsls r0, 3 lsls r0, 3
adds r0, r1 adds r0, r1
@ -661231,7 +661231,7 @@ sub_81570A0: ; 81570A0
adds r2, 0x1E adds r2, 0x1E
adds r0, r2 adds r0, r2
ldrh r0, [r0] ldrh r0, [r0]
ldr r3, =gUnknown_0858CDCC ldr r3, =gContestEffects
ldr r4, =gContestMoves ldr r4, =gContestMoves
lsls r0, 3 lsls r0, 3
adds r0, r4 adds r0, r4
@ -661339,7 +661339,7 @@ sub_8157174: ; 8157174
adds r2, 0x1E adds r2, 0x1E
adds r0, r2 adds r0, r2
ldrh r0, [r0] ldrh r0, [r0]
ldr r3, =gUnknown_0858CDCC ldr r3, =gContestEffects
ldr r4, =gContestMoves ldr r4, =gContestMoves
lsls r0, 3 lsls r0, 3
adds r0, r4 adds r0, r4
@ -661448,7 +661448,7 @@ sub_8157248: ; 8157248
adds r2, 0x1E adds r2, 0x1E
adds r1, r2 adds r1, r2
ldrh r0, [r1] ldrh r0, [r1]
ldr r2, =gUnknown_0858CDCC ldr r2, =gContestEffects
ldr r1, =gContestMoves ldr r1, =gContestMoves
lsls r0, 3 lsls r0, 3
adds r0, r1 adds r0, r1
@ -661633,7 +661633,7 @@ sub_81573B4: ; 81573B4
adds r2, 0x1E adds r2, 0x1E
adds r1, r2 adds r1, r2
ldrh r0, [r1] ldrh r0, [r1]
ldr r2, =gUnknown_0858CDCC ldr r2, =gContestEffects
ldr r1, =gContestMoves ldr r1, =gContestMoves
lsls r0, 3 lsls r0, 3
adds r0, r1 adds r0, r1
@ -663747,7 +663747,7 @@ sub_8158364: ; 8158364
adds r1, r0 adds r1, r0
ldrh r0, [r1] ldrh r0, [r1]
ldr r4, [r4, 0xC] ldr r4, [r4, 0xC]
ldr r2, =gUnknown_0858CDCC ldr r2, =gContestEffects
ldr r1, =gContestMoves ldr r1, =gContestMoves
lsls r0, 3 lsls r0, 3
adds r0, r1 adds r0, r1
@ -681765,7 +681765,7 @@ sub_816137C: ; 816137C
.align 2, 0 .align 2, 0
.pool .pool
@081613CC: @081613CC:
ldr r1, =gUnknown_0858CDCC ldr r1, =gContestEffects
ldr r0, =gContestMoves ldr r0, =gContestMoves
lsls r4, 3 lsls r4, 3
adds r0, r4, r0 adds r0, r4, r0
@ -681833,7 +681833,7 @@ sub_816137C: ; 816137C
lsrs r5, r0, 16 lsrs r5, r0, 16
cmp r5, 0x7 cmp r5, 0x7
bls @081613F4 bls @081613F4
ldr r1, =gUnknown_0858CDCC ldr r1, =gContestEffects
ldr r0, =gContestMoves ldr r0, =gContestMoves
add r0, r8 add r0, r8
ldrb r0, [r0] ldrb r0, [r0]
@ -869777,7 +869777,7 @@ sub_81C240C: ; 81C240C
adds r5, r0, r1 adds r5, r0, r1
cmp r3, 0 cmp r3, 0
beq @081C2510 beq @081C2510
ldr r1, =gUnknown_0858CDCC ldr r1, =gContestEffects
ldr r2, =gContestMoves ldr r2, =gContestMoves
lsls r3, 3 lsls r3, 3
adds r0, r3, r2 adds r0, r3, r2

290
data/contest_effects.s Normal file
View File

@ -0,0 +1,290 @@
.align 2, 0
gContestEffects: ; 858CDCC
; 0x00
.byte 0 ; effect type
.byte 40 ; appeal
.byte 0 ; jam
.byte 0 ; padding
; 0x01
.byte 0 ; effect type
.byte 60 ; appeal
.byte 0 ; jam
.byte 0 ; padding
; 0x02
.byte 0 ; effect type
.byte 80 ; appeal
.byte 0 ; jam
.byte 0 ; padding
; 0x03
.byte 0 ; effect type
.byte 30 ; appeal
.byte 0 ; jam
.byte 0 ; padding
; 0x04
.byte 1 ; effect type
.byte 20 ; appeal
.byte 0 ; jam
.byte 0 ; padding
; 0x05
.byte 1 ; effect type
.byte 10 ; appeal
.byte 0 ; jam
.byte 0 ; padding
; 0x06
.byte 1 ; effect type
.byte 30 ; appeal
.byte 0 ; jam
.byte 0 ; padding
; 0x07
.byte 1 ; effect type
.byte 30 ; appeal
.byte 0 ; jam
.byte 0 ; padding
; 0x08
.byte 2 ; effect type
.byte 30 ; appeal
.byte 20 ; jam
.byte 0 ; padding
; 0x09
.byte 3 ; effect type
.byte 30 ; appeal
.byte 10 ; jam
.byte 0 ; padding
; 0x0a
.byte 2 ; effect type
.byte 20 ; appeal
.byte 30 ; jam
.byte 0 ; padding
; 0x0b
.byte 3 ; effect type
.byte 20 ; appeal
.byte 20 ; jam
.byte 0 ; padding
; 0x0c
.byte 2 ; effect type
.byte 10 ; appeal
.byte 40 ; jam
.byte 0 ; padding
; 0x0d
.byte 3 ; effect type
.byte 10 ; appeal
.byte 30 ; jam
.byte 0 ; padding
; 0x0e
.byte 2 ; effect type
.byte 30 ; appeal
.byte 20 ; jam
.byte 0 ; padding
; 0x0f
.byte 3 ; effect type
.byte 30 ; appeal
.byte 10 ; jam
.byte 0 ; padding
; 0x10
.byte 4 ; effect type
.byte 30 ; appeal
.byte 0 ; jam
.byte 0 ; padding
; 0x11
.byte 3 ; effect type
.byte 20 ; appeal
.byte 10 ; jam
.byte 0 ; padding
; 0x12
.byte 3 ; effect type
.byte 40 ; appeal
.byte 40 ; jam
.byte 0 ; padding
; 0x13
.byte 3 ; effect type
.byte 20 ; appeal
.byte 10 ; jam
.byte 0 ; padding
; 0x14
.byte 3 ; effect type
.byte 20 ; appeal
.byte 10 ; jam
.byte 0 ; padding
; 0x15
.byte 3 ; effect type
.byte 20 ; appeal
.byte 10 ; jam
.byte 0 ; padding
; 0x16
.byte 3 ; effect type
.byte 20 ; appeal
.byte 10 ; jam
.byte 0 ; padding
; 0x17
.byte 3 ; effect type
.byte 20 ; appeal
.byte 10 ; jam
.byte 0 ; padding
; 0x18
.byte 3 ; effect type
.byte 20 ; appeal
.byte 10 ; jam
.byte 0 ; padding
; 0x19
.byte 4 ; effect type
.byte 20 ; appeal
.byte 0 ; jam
.byte 0 ; padding
; 0x1a
.byte 4 ; effect type
.byte 20 ; appeal
.byte 0 ; jam
.byte 0 ; padding
; 0x1b
.byte 4 ; effect type
.byte 30 ; appeal
.byte 0 ; jam
.byte 0 ; padding
; 0x1c
.byte 3 ; effect type
.byte 30 ; appeal
.byte 10 ; jam
.byte 0 ; padding
; 0x1d
.byte 5 ; effect type
.byte 20 ; appeal
.byte 0 ; jam
.byte 0 ; padding
; 0x1e
.byte 5 ; effect type
.byte 20 ; appeal
.byte 0 ; jam
.byte 0 ; padding
; 0x1f
.byte 5 ; effect type
.byte 10 ; appeal
.byte 0 ; jam
.byte 0 ; padding
; 0x20
.byte 5 ; effect type
.byte 10 ; appeal
.byte 0 ; jam
.byte 0 ; padding
; 0x21
.byte 5 ; effect type
.byte 10 ; appeal
.byte 0 ; jam
.byte 0 ; padding
; 0x22
.byte 5 ; effect type
.byte 10 ; appeal
.byte 0 ; jam
.byte 0 ; padding
; 0x23
.byte 5 ; effect type
.byte 20 ; appeal
.byte 0 ; jam
.byte 0 ; padding
; 0x24
.byte 5 ; effect type
.byte 20 ; appeal
.byte 0 ; jam
.byte 0 ; padding
; 0x25
.byte 5 ; effect type
.byte 30 ; appeal
.byte 0 ; jam
.byte 0 ; padding
; 0x26
.byte 5 ; effect type
.byte 10 ; appeal
.byte 0 ; jam
.byte 0 ; padding
; 0x27
.byte 5 ; effect type
.byte 10 ; appeal
.byte 0 ; jam
.byte 0 ; padding
; 0x28
.byte 6 ; effect type
.byte 30 ; appeal
.byte 0 ; jam
.byte 0 ; padding
; 0x29
.byte 6 ; effect type
.byte 30 ; appeal
.byte 0 ; jam
.byte 0 ; padding
; 0x2a
.byte 6 ; effect type
.byte 30 ; appeal
.byte 0 ; jam
.byte 0 ; padding
; 0x2b
.byte 6 ; effect type
.byte 30 ; appeal
.byte 0 ; jam
.byte 0 ; padding
; 0x2c
.byte 5 ; effect type
.byte 10 ; appeal
.byte 0 ; jam
.byte 0 ; padding
; 0x2d
.byte 3 ; effect type
.byte 20 ; appeal
.byte 10 ; jam
.byte 0 ; padding
; 0x2e
.byte 5 ; effect type
.byte 10 ; appeal
.byte 0 ; jam
.byte 0 ; padding
; 0x2f
.byte 4 ; effect type
.byte 30 ; appeal
.byte 0 ; jam
.byte 0 ; padding

4
data/data2.s
View File

@ -4481,8 +4481,8 @@ gUnknown_0858C2AC: ; 858C2AC
; 858C2B4 ; 858C2B4
.include "data/contest_moves.s" .include "data/contest_moves.s"
gUnknown_0858CDCC: ; 858CDCC ; 858CDCC
.incbin "base_emerald.gba", 0x58cdcc, 0xc0 .include "data/contest_effects.s"
; A look-up table with a 1 for each combo starter ID and a 0 for ID 0, ; A look-up table with a 1 for each combo starter ID and a 0 for ID 0,
; which means "not a combo starter move". ; which means "not a combo starter move".