diff --git a/asm/emerald.s b/asm/emerald.s index b163782291..c55273992d 100644 --- a/asm/emerald.s +++ b/asm/emerald.s @@ -816386,7 +816386,7 @@ sub_81A6AEC: ; 81A6AEC strh r0, [r1] movs r4, 0x1 adds r5, r1, 0 - ldr r3, =gUnknown_08611FC0 + ldr r3, =gBattleFactoryStyleRequiredMoveCounts adds r2, r5, 0 @081A6B5C: mov r1, sp @@ -816426,7 +816426,7 @@ sub_81A6BA4: ; 81A6BA4 lsls r0, 16 lsrs r5, r0, 16 movs r2, 0 - ldr r6, =gUnknown_08612104 + ldr r6, =gBattleFactoryStyleMoveListPointers @081A6BAE: movs r3, 0 lsls r0, r2, 2 diff --git a/data/battle_frontier/battle_factory_style_move_lists.s b/data/battle_frontier/battle_factory_style_move_lists.s new file mode 100644 index 0000000000..5d49aa7cef --- /dev/null +++ b/data/battle_frontier/battle_factory_style_move_lists.s @@ -0,0 +1,194 @@ + .align 2, 0 + +gBattleFactoryStyleRequiredMoveCounts: ; 8611FC0 + .byte 3 + .byte 3 + .byte 3 + .byte 2 + .byte 2 + .byte 2 + .byte 2 + + .align 2, 0 + +gBattleFactoryStyleMoveList_TotalPreparation: ; 8611FC8 + .2byte MOVE_SWORDS_DANCE + .2byte MOVE_GROWTH + .2byte MOVE_MEDITATE + .2byte MOVE_AGILITY + .2byte MOVE_DOUBLE_TEAM + .2byte MOVE_HARDEN + .2byte MOVE_MINIMIZE + .2byte MOVE_WITHDRAW + .2byte MOVE_DEFENSE_CURL + .2byte MOVE_BARRIER + .2byte MOVE_FOCUS_ENERGY + .2byte MOVE_AMNESIA + .2byte MOVE_ACID_ARMOR + .2byte MOVE_SHARPEN + .2byte MOVE_CONVERSION + .2byte MOVE_CONVERSION_2 + .2byte MOVE_BELLY_DRUM + .2byte MOVE_PSYCH_UP + .2byte MOVE_CHARGE + .2byte MOVE_SNATCH + .2byte MOVE_TAIL_GLOW + .2byte MOVE_COSMIC_POWER + .2byte MOVE_IRON_DEFENSE + .2byte MOVE_HOWL + .2byte MOVE_BULK_UP + .2byte MOVE_CALM_MIND + .2byte MOVE_DRAGON_DANCE + .2byte 0 + +gBattleFactoryStyleMoveList_ImpossibleToPredict: ; 8612000 + .2byte MOVE_MIMIC + .2byte MOVE_METRONOME + .2byte MOVE_MIRROR_MOVE + .2byte MOVE_TRANSFORM + .2byte MOVE_SUBSTITUTE + .2byte MOVE_SKETCH + .2byte MOVE_CURSE + .2byte MOVE_PRESENT + .2byte MOVE_FOLLOW_ME + .2byte MOVE_TRICK + .2byte MOVE_ROLE_PLAY + .2byte MOVE_ASSIST + .2byte MOVE_SKILL_SWAP + .2byte MOVE_CAMOUFLAGE + .2byte 0 + +gBattleFactoryStyleMoveList_WeakeningTheFoe: ; 861201E + .2byte MOVE_SAND_ATTACK + .2byte MOVE_TAIL_WHIP + .2byte MOVE_LEER + .2byte MOVE_GROWL + .2byte MOVE_STRING_SHOT + .2byte MOVE_SCREECH + .2byte MOVE_SMOKESCREEN + .2byte MOVE_KINESIS + .2byte MOVE_FLASH + .2byte MOVE_COTTON_SPORE + .2byte MOVE_SPITE + .2byte MOVE_SCARY_FACE + .2byte MOVE_CHARM + .2byte MOVE_KNOCK_OFF + .2byte MOVE_SWEET_SCENT + .2byte MOVE_FEATHER_DANCE + .2byte MOVE_FAKE_TEARS + .2byte MOVE_METAL_SOUND + .2byte MOVE_TICKLE + .2byte 0 + +gBattleFactoryStyleMoveList_HighRiskHighReturn: ; 8612046 + .2byte MOVE_GUILLOTINE + .2byte MOVE_HORN_DRILL + .2byte MOVE_DOUBLE_EDGE + .2byte MOVE_HYPER_BEAM + .2byte MOVE_COUNTER + .2byte MOVE_FISSURE + .2byte MOVE_BIDE + .2byte MOVE_SELF_DESTRUCT + .2byte MOVE_SKY_ATTACK + .2byte MOVE_EXPLOSION + .2byte MOVE_FLAIL + .2byte MOVE_REVERSAL + .2byte MOVE_DESTINY_BOND + .2byte MOVE_PERISH_SONG + .2byte MOVE_PAIN_SPLIT + .2byte MOVE_MIRROR_COAT + .2byte MOVE_MEMENTO + .2byte MOVE_GRUDGE + .2byte MOVE_FACADE + .2byte MOVE_FOCUS_PUNCH + .2byte MOVE_BLAST_BURN + .2byte MOVE_HYDRO_CANNON + .2byte MOVE_OVERHEAT + .2byte MOVE_FRENZY_PLANT + .2byte MOVE_PSYCHO_BOOST + .2byte MOVE_VOLT_TACKLE + .2byte 0 + +gBattleFactoryStyleMoveList_Endurance: ; 861207C + .2byte MOVE_MIST + .2byte MOVE_RECOVER + .2byte MOVE_LIGHT_SCREEN + .2byte MOVE_HAZE + .2byte MOVE_REFLECT + .2byte MOVE_SOFT_BOILED + .2byte MOVE_REST + .2byte MOVE_PROTECT + .2byte MOVE_DETECT + .2byte MOVE_ENDURE + .2byte MOVE_MILK_DRINK + .2byte MOVE_HEAL_BELL + .2byte MOVE_SAFEGUARD + .2byte MOVE_BATON_PASS + .2byte MOVE_MORNING_SUN + .2byte MOVE_SYNTHESIS + .2byte MOVE_MOONLIGHT + .2byte MOVE_SWALLOW + .2byte MOVE_WISH + .2byte MOVE_INGRAIN + .2byte MOVE_MAGIC_COAT + .2byte MOVE_RECYCLE + .2byte MOVE_REFRESH + .2byte MOVE_MUD_SPORT + .2byte MOVE_SLACK_OFF + .2byte MOVE_AROMATHERAPY + .2byte MOVE_WATER_SPORT + .2byte 0 + +gBattleFactoryStyleMoveList_SlowAndSteady: ; 86120B4 + .2byte MOVE_SING + .2byte MOVE_SUPERSONIC + .2byte MOVE_DISABLE + .2byte MOVE_LEECH_SEED + .2byte MOVE_POISON_POWDER + .2byte MOVE_STUN_SPORE + .2byte MOVE_SLEEP_POWDER + .2byte MOVE_THUNDER_WAVE + .2byte MOVE_TOXIC + .2byte MOVE_HYPNOSIS + .2byte MOVE_CONFUSE_RAY + .2byte MOVE_GLARE + .2byte MOVE_POISON_GAS + .2byte MOVE_LOVELY_KISS + .2byte MOVE_SPORE + .2byte MOVE_SPIDER_WEB + .2byte MOVE_SWEET_KISS + .2byte MOVE_SPIKES + .2byte MOVE_SWAGGER + .2byte MOVE_MEAN_LOOK + .2byte MOVE_ATTRACT + .2byte MOVE_ENCORE + .2byte MOVE_TORMENT + .2byte MOVE_FLATTER + .2byte MOVE_WILL_O_WISP + .2byte MOVE_TAUNT + .2byte MOVE_YAWN + .2byte MOVE_IMPRISON + .2byte MOVE_SNATCH + .2byte MOVE_TEETER_DANCE + .2byte MOVE_GRASS_WHISTLE + .2byte MOVE_BLOCK + .2byte 0 + +gBattleFactoryStyleMoveList_DependsOnTheBattlesFlow: ; 86120F6 + .2byte MOVE_SANDSTORM + .2byte MOVE_RAIN_DANCE + .2byte MOVE_SUNNY_DAY + .2byte MOVE_HAIL + .2byte MOVE_WEATHER_BALL + .2byte 0 + + .align 2, 0 + +gBattleFactoryStyleMoveListPointers: ; 8612104 + .4byte gBattleFactoryStyleMoveList_TotalPreparation + .4byte gBattleFactoryStyleMoveList_SlowAndSteady + .4byte gBattleFactoryStyleMoveList_Endurance + .4byte gBattleFactoryStyleMoveList_HighRiskHighReturn + .4byte gBattleFactoryStyleMoveList_WeakeningTheFoe + .4byte gBattleFactoryStyleMoveList_ImpossibleToPredict + .4byte gBattleFactoryStyleMoveList_DependsOnTheBattlesFlow diff --git a/data/data2.s b/data/data2.s index 94bc46b609..0b06fbd556 100644 --- a/data/data2.s +++ b/data/data2.s @@ -10566,11 +10566,8 @@ gUnknown_08611FA0: ; 8611FA0 gUnknown_08611FAC: ; 8611FAC .incbin "base_emerald.gba", 0x611fac, 0x14 -gUnknown_08611FC0: ; 8611FC0 - .incbin "base_emerald.gba", 0x611fc0, 0x144 - -gUnknown_08612104: ; 8612104 - .incbin "base_emerald.gba", 0x612104, 0x1c +; 8611FC0 + .include "data/battle_frontier/battle_factory_style_move_lists.s" gUnknown_08612120: ; 8612120 .incbin "base_emerald.gba", 0x612120, 0x44