ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-12-26 11:44:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

contest move data

Browse Source
This commit is contained in:
YamaArashi 2015-10-14 10:40:52 -07:00
parent b6e95f52d6
commit 6dd8d212c6
4 changed files with 2595 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

75
asm/emerald.s
View File

@ -5,6 +5,7 @@
.include "constants/move_constants.s"
.include "constants/item_constants.s"
.include "constants/type_constants.s"
.include "constants/contest_constants.s"
.include "constants/pokemon_data_constants.s"
.include "constants/item_data_constants.s"
.include "constants/battle_move_constants.s"
@ -410260,7 +410261,7 @@ sub_80D8490: ; 80D8490
ldrh r0, [r0, 0x8]
cmp r0, r4
bne @080D856C
ldr r0, =gUnknown_0858C2B4
ldr r0, =gContestMoves
lsls r1, r4, 3
adds r1, r0
ldrb r0, [r1]
@ -412700,7 +412701,7 @@ sub_80D8B38: ; 80D8B38
@080D9A94:
ldr r0, =0x02021ec4
ldr r3, =gUnknown_08587F08
ldr r2, =gUnknown_0858C2B4
ldr r2, =gContestMoves
ldrh r1, [r5, 0x6]
lsls r1, 3
adds r1, r2
@ -415705,7 +415706,7 @@ sub_80DB2EC: ; 80DB2EC
lsls r1, 24
lsrs r3, r1, 24
ldr r2, =gUnknown_0858CDCC
ldr r1, =gUnknown_0858C2B4
ldr r1, =gContestMoves
lsrs r0, 13
adds r0, r1
ldrb r0, [r0]
@ -415769,7 +415770,7 @@ prints_contest_move_description: ; 80DB370
lsls r0, 16
lsrs r0, 16
mov r8, r0
ldr r1, =gUnknown_0858C2B4
ldr r1, =gContestMoves
lsls r0, 3
adds r0, r1
ldrb r0, [r0, 0x1]
@ -415812,7 +415813,7 @@ prints_contest_move_description: ; 80DB370
movs r3, 0x20
bl sub_80DECB8
ldr r2, =gUnknown_0858CDCC
ldr r0, =gUnknown_0858C2B4
ldr r0, =gContestMoves
mov r3, r8
lsls r1, r3, 3
adds r0, r1, r0
@ -415858,7 +415859,7 @@ prints_contest_move_description: ; 80DB370
movs r3, 0x1F
bl sub_80DED10
ldr r1, =gUnknown_0858CDCC
ldr r0, =gUnknown_0858C2B4
ldr r0, =gContestMoves
adds r0, r7, r0
ldrb r0, [r0]
lsls r0, 2
@ -415904,7 +415905,7 @@ prints_contest_move_description: ; 80DB370
movs r1, 0
bl Window_FastFillPixels
ldr r1, =gUnknown_08587C50
ldr r0, =gUnknown_0858C2B4
ldr r0, =gContestMoves
adds r0, r7, r0
ldrb r0, [r0]
lsls r0, 2
@ -419568,7 +419569,7 @@ sub_80DD080: ; 80DD080
ldr r1, [r0, 0x4]
adds r1, r5, r1
ldrh r0, [r1, 0x6]
ldr r2, =gUnknown_0858C2B4
ldr r2, =gContestMoves
lsls r0, 3
adds r0, r2
ldrb r2, [r0]
@ -419806,7 +419807,7 @@ sub_80DD080: ; 80DD080
.align 2, 0
.pool
@080DD29C:
ldr r2, =gUnknown_0858C2B4
ldr r2, =gContestMoves
ldr r5, =0x02039f34
ldr r0, [r5]
ldr r1, [r0, 0x4]
@ -420075,7 +420076,7 @@ sub_80DD45C: ; 80DD45C
ldr r2, =gMoveNames
adds r1, r2
bl gf_strcpy
ldr r3, =gUnknown_0858C2B4
ldr r3, =gContestMoves
ldr r1, [r5]
ldr r0, [r1, 0x8]
ldrb r2, [r0, 0x11]
@ -420703,7 +420704,7 @@ sub_80DD940: ; 80DD940
sub_80DD9F0: ; 80DD9F0
lsls r0, 16
ldr r3, =gUnknown_085899EC
ldr r1, =gUnknown_0858C2B4
ldr r1, =gContestMoves
lsrs r0, 13
adds r0, r1
ldrb r1, [r0, 0x1]
@ -435905,7 +435906,7 @@ sub_80E5414: ; 80E5414
sub sp, 0x4
lsls r0, 16
lsls r1, 16
ldr r2, =gUnknown_0858C2B4
ldr r2, =gContestMoves
lsrs r0, 13
adds r0, r2
ldrb r4, [r0, 0x2]
@ -436651,7 +436652,7 @@ sub_80E5970: ; 80E5970
lsls r0, 2
adds r0, r1
ldrh r0, [r0, 0x6]
ldr r1, =gUnknown_0858C2B4
ldr r1, =gContestMoves
lsls r0, 3
adds r0, r1
ldrb r0, [r0, 0x1]
@ -436940,7 +436941,7 @@ sub_80E5AD4: ; 80E5AD4
adds r0, r6, r0
ldrh r0, [r0, 0x8]
lsls r0, 3
ldr r1, =gUnknown_0858C2B4
ldr r1, =gContestMoves
adds r0, r1
ldrb r0, [r0, 0x2]
ldr r2, =gUnknown_0858CE8C
@ -437262,7 +437263,7 @@ sub_80E5E04: ; 80E5E04
adds r1, r0
ldrh r0, [r1, 0x6]
ldr r3, =gUnknown_0858CDCC
ldr r2, =gUnknown_0858C2B4
ldr r2, =gContestMoves
lsls r0, 3
adds r0, r2
ldrb r0, [r0]
@ -437304,7 +437305,7 @@ sub_80E5E5C: ; 80E5E5C
adds r1, r0
ldrh r0, [r1, 0x6]
ldr r3, =gUnknown_0858CDCC
ldr r2, =gUnknown_0858C2B4
ldr r2, =gContestMoves
lsls r0, 3
adds r0, r2
ldrb r0, [r0]
@ -437733,7 +437734,7 @@ sub_80E611C: ; 80E611C
lsls r0, 2
adds r5, r0, r4
ldrh r0, [r5, 0x6]
ldr r3, =gUnknown_0858C2B4
ldr r3, =gContestMoves
lsls r0, 3
adds r7, r0, r3
ldrb r2, [r7, 0x1]
@ -437797,7 +437798,7 @@ sub_80E620C: ; 80E620C
ldrh r0, [r0, 0x6]
mov r8, r0
movs r6, 0
ldr r0, =gUnknown_0858C2B4
ldr r0, =gContestMoves
mov r12, r0
movs r7, 0
@080E623C:
@ -438518,7 +438519,7 @@ sub_80E6668: ; 80E6668
thumb_func_start sub_80E6778
sub_80E6778: ; 80E6778
push {lr}
ldr r3, =gUnknown_0858C2B4
ldr r3, =gContestMoves
ldr r0, =0x02039f34
ldr r1, [r0]
ldr r0, [r1, 0x8]
@ -438761,7 +438762,7 @@ sub_80E6934: ; 80E6934
movs r7, 0
movs r4, 0
ldr r6, =0x02039f34
ldr r0, =gUnknown_0858C2B4
ldr r0, =gContestMoves
mov r9, r0
movs r5, 0
@080E694E:
@ -661022,7 +661023,7 @@ sub_8156F04: ; 8156F04
adds r2, 0x1E
adds r1, r2
ldrh r0, [r1]
ldr r1, =gUnknown_0858C2B4
ldr r1, =gContestMoves
lsls r0, 3
adds r0, r1
ldrb r0, [r0]
@ -661125,7 +661126,7 @@ sub_8156FCC: ; 8156FCC
adds r1, r2
ldrh r0, [r1]
ldr r2, =gUnknown_0858CDCC
ldr r1, =gUnknown_0858C2B4
ldr r1, =gContestMoves
lsls r0, 3
adds r0, r1
ldrb r0, [r0]
@ -661231,7 +661232,7 @@ sub_81570A0: ; 81570A0
adds r0, r2
ldrh r0, [r0]
ldr r3, =gUnknown_0858CDCC
ldr r4, =gUnknown_0858C2B4
ldr r4, =gContestMoves
lsls r0, 3
adds r0, r4
ldrb r0, [r0]
@ -661339,7 +661340,7 @@ sub_8157174: ; 8157174
adds r0, r2
ldrh r0, [r0]
ldr r3, =gUnknown_0858CDCC
ldr r4, =gUnknown_0858C2B4
ldr r4, =gContestMoves
lsls r0, 3
adds r0, r4
ldrb r0, [r0]
@ -661448,7 +661449,7 @@ sub_8157248: ; 8157248
adds r1, r2
ldrh r0, [r1]
ldr r2, =gUnknown_0858CDCC
ldr r1, =gUnknown_0858C2B4
ldr r1, =gContestMoves
lsls r0, 3
adds r0, r1
ldrb r0, [r0]
@ -661633,7 +661634,7 @@ sub_81573B4: ; 81573B4
adds r1, r2
ldrh r0, [r1]
ldr r2, =gUnknown_0858CDCC
ldr r1, =gUnknown_0858C2B4
ldr r1, =gContestMoves
lsls r0, 3
adds r0, r1
ldrb r0, [r0]
@ -662592,7 +662593,7 @@ sub_8157ADC: ; 8157ADC
lsls r0, 24
cmp r0, 0
beq @08157B18
ldr r2, =gUnknown_0858C2B4
ldr r2, =gContestMoves
ldr r0, =0x02039f34
ldr r0, [r0]
ldr r1, [r0, 0x4]
@ -663393,7 +663394,7 @@ sub_81580C0: ; 81580C0
adds r1, r0
ldrh r0, [r1]
ldr r2, [r4, 0xC]
ldr r1, =gUnknown_0858C2B4
ldr r1, =gContestMoves
lsls r0, 3
adds r0, r1
ldrb r0, [r0]
@ -663747,7 +663748,7 @@ sub_8158364: ; 8158364
ldrh r0, [r1]
ldr r4, [r4, 0xC]
ldr r2, =gUnknown_0858CDCC
ldr r1, =gUnknown_0858C2B4
ldr r1, =gContestMoves
lsls r0, 3
adds r0, r1
ldrb r0, [r0]
@ -681765,7 +681766,7 @@ sub_816137C: ; 816137C
.pool
@081613CC:
ldr r1, =gUnknown_0858CDCC
ldr r0, =gUnknown_0858C2B4
ldr r0, =gContestMoves
lsls r4, 3
adds r0, r4, r0
ldrb r0, [r0]
@ -681833,7 +681834,7 @@ sub_816137C: ; 816137C
cmp r5, 0x7
bls @081613F4
ldr r1, =gUnknown_0858CDCC
ldr r0, =gUnknown_0858C2B4
ldr r0, =gContestMoves
add r0, r8
ldrb r0, [r0]
lsls r0, 2
@ -869777,7 +869778,7 @@ sub_81C240C: ; 81C240C
cmp r3, 0
beq @081C2510
ldr r1, =gUnknown_0858CDCC
ldr r2, =gUnknown_0858C2B4
ldr r2, =gContestMoves
lsls r3, 3
adds r0, r3, r2
ldrb r0, [r0]
@ -872808,7 +872809,7 @@ sub_81C3E2C: ; 81C3E2C
lsls r0, 24
lsrs r0, 24
ldr r3, =gUnknown_08587C50
ldr r2, =gUnknown_0858C2B4
ldr r2, =gContestMoves
lsls r1, r4, 3
adds r1, r2
ldrb r1, [r1]
@ -872873,7 +872874,7 @@ sub_81C3E9C: ; 81C3E9C
.pool
@081C3F00:
ldr r2, =gUnknown_08587C50
ldr r1, =gUnknown_0858C2B4
ldr r1, =gContestMoves
lsls r0, r6, 3
adds r0, r1
ldrb r0, [r0]
@ -873567,7 +873568,7 @@ sub_81C4484: ; 81C4484
ldrh r0, [r2]
cmp r0, 0
beq @081C44D4
ldr r1, =gUnknown_0858C2B4
ldr r1, =gContestMoves
lsls r0, 3
adds r0, r1
ldrb r0, [r0, 0x1]
@ -873644,7 +873645,7 @@ sub_81C44F0: ; 81C44F0
.align 2, 0
.pool
@081C4540:
ldr r1, =gUnknown_0858C2B4
ldr r1, =gContestMoves
ldrh r0, [r3]
lsls r0, 3
adds r0, r1
@ -903167,7 +903168,7 @@ sub_81D2ACC: ; 81D2ACC
.pool
@081D2B6C:
lsls r4, 3
ldr r0, =gUnknown_0858C2B4
ldr r0, =gContestMoves
adds r4, r0
ldr r1, =gUnknown_08587D48
ldrb r0, [r4, 0x1]

68
constants/contest_constants.s Normal file
View File

@ -0,0 +1,68 @@
.set CONTEST_COOL, 0x00
.set CONTEST_BEAUTY, 0x01
.set CONTEST_CUTE, 0x02
.set CONTEST_SMART, 0x03
.set CONTEST_TOUGH, 0x04
.set COMBO_STARTER_RAIN_DANCE, 0x01
.set COMBO_STARTER_RAGE, 0x02
.set COMBO_STARTER_FOCUS_ENERGY, 0x03
.set COMBO_STARTER_HYPNOSIS, 0x04
.set COMBO_STARTER_ENDURE, 0x05
.set COMBO_STARTER_HORN_ATTACK, 0x06
.set COMBO_STARTER_SWORDS_DANCE, 0x07
.set COMBO_STARTER_STOCKPILE, 0x08
.set COMBO_STARTER_SUNNY_DAY, 0x09
.set COMBO_STARTER_REST, 0x0A
.set COMBO_STARTER_VICE_GRIP, 0x0B
.set COMBO_STARTER_DEFENSE_CURL, 0x0C
.set COMBO_STARTER_CHARGE, 0x0D
.set COMBO_STARTER_ROCK_THROW, 0x0E
.set COMBO_STARTER_YAWN, 0x0F
.set COMBO_STARTER_SCARY_FACE, 0x10
.set COMBO_STARTER_POWDER_SNOW, 0x11
.set COMBO_STARTER_LOCK_ON, 0x12
.set COMBO_STARTER_SOFT_BOILED, 0x13
.set COMBO_STARTER_MEAN_LOOK, 0x14
.set COMBO_STARTER_SCRATCH, 0x15
.set COMBO_STARTER_GROWTH, 0x16
.set COMBO_STARTER_HAIL, 0x17
.set COMBO_STARTER_SANDSTORM, 0x18
.set COMBO_STARTER_BELLY_DRUM, 0x19
.set COMBO_STARTER_MIND_READER, 0x1A
.set COMBO_STARTER_DRAGON_BREATH, 0x1B
.set COMBO_STARTER_DRAGON_RAGE, 0x1C
.set COMBO_STARTER_DRAGON_DANCE, 0x1D
.set COMBO_STARTER_SURF, 0x1E
.set COMBO_STARTER_DIVE, 0x1F
.set COMBO_STARTER_STRING_SHOT, 0x20
.set COMBO_STARTER_LEER, 0x21
.set COMBO_STARTER_TAUNT, 0x22
.set COMBO_STARTER_CHARM, 0x23
.set COMBO_STARTER_HARDEN, 0x24
.set COMBO_STARTER_SING, 0x25
.set COMBO_STARTER_EARTHQUAKE, 0x26
.set COMBO_STARTER_DOUBLE_TEAM, 0x27
.set COMBO_STARTER_CURSE, 0x28
.set COMBO_STARTER_SWEET_SCENT, 0x29
.set COMBO_STARTER_SLUDGE, 0x2A
.set COMBO_STARTER_SLUDGE_BOMB, 0x2B
.set COMBO_STARTER_THUNDER_PUNCH, 0x2C
.set COMBO_STARTER_FIRE_PUNCH, 0x2D
.set COMBO_STARTER_ICE_PUNCH, 0x2E
.set COMBO_STARTER_PECK, 0x2F
.set COMBO_STARTER_METAL_SOUND, 0x30
.set COMBO_STARTER_MUD_SPORT, 0x31
.set COMBO_STARTER_WATER_SPORT, 0x32
.set COMBO_STARTER_BONE_CLUB, 0x33
.set COMBO_STARTER_BONEMERANG, 0x34
.set COMBO_STARTER_BONE_RUSH, 0x35
.set COMBO_STARTER_SAND_ATTACK, 0x36
.set COMBO_STARTER_MUD_SLAP, 0x37
.set COMBO_STARTER_FAKE_OUT, 0x38
.set COMBO_STARTER_PSYCHIC, 0x39
.set COMBO_STARTER_KINESIS, 0x3A
.set COMBO_STARTER_CONFUSION, 0x3B
.set COMBO_STARTER_POUND, 0x3C
.set COMBO_STARTER_SMOG, 0x3D
.set COMBO_STARTER_CALM_MIND, 0x3E

2487
data/contest_moves.s Normal file
View File

File diff suppressed because it is too large Load Diff

4
data/data2.s
View File

@ -4478,8 +4478,8 @@ gUnknown_0858C2A4: ; 858C2A4
gUnknown_0858C2AC: ; 858C2AC
.incbin "base_emerald.gba", 0x58c2ac, 0x8
gUnknown_0858C2B4: ; 858C2B4
.incbin "base_emerald.gba", 0x58c2b4, 0xb18
; 858C2B4
.include "data/contest_moves.s"
gUnknown_0858CDCC: ; 858CDCC
.incbin "base_emerald.gba", 0x58cdcc, 0xc0