diff options
Diffstat (limited to 'data')
52 files changed, 912 insertions, 9677 deletions
diff --git a/data/battle_ai.s b/data/battle_ai.s deleted file mode 100644 index 0d38042f1..000000000 --- a/data/battle_ai.s +++ /dev/null @@ -1,117 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - - .align 2 -gBattleAICmdTable:: @ 83F6144 - .4byte BattleAICmd_if_random - .4byte BattleAICmd_if_not_random - .4byte BattleAICmd_if_random_1 - .4byte BattleAICmd_if_not_random_1 - .4byte BattleAICmd_score - .4byte BattleAICmd_if_hp_less_than - .4byte BattleAICmd_if_hp_more_than - .4byte BattleAICmd_if_hp_equal - .4byte BattleAICmd_if_hp_not_equal - .4byte BattleAICmd_if_status - .4byte BattleAICmd_if_not_status - .4byte BattleAICmd_if_status2 - .4byte BattleAICmd_if_not_status2 - .4byte BattleAICmd_if_status3 - .4byte BattleAICmd_if_not_status3 - .4byte BattleAICmd_if_status4 - .4byte BattleAICmd_if_not_status4 - .4byte BattleAICmd_if_less_than - .4byte BattleAICmd_if_more_than - .4byte BattleAICmd_if_equal - .4byte BattleAICmd_if_not_equal - .4byte BattleAICmd_if_less_than_32 - .4byte BattleAICmd_if_more_than_32 - .4byte BattleAICmd_if_equal_32 - .4byte BattleAICmd_if_not_equal_32 - .4byte BattleAICmd_if_move - .4byte BattleAICmd_if_not_move - .4byte BattleAICmd_if_in_bytes - .4byte BattleAICmd_if_not_in_bytes - .4byte BattleAICmd_if_in_words - .4byte BattleAICmd_if_not_in_words - .4byte BattleAICmd_if_user_can_damage - .4byte BattleAICmd_if_user_cant_damage - .4byte BattleAICmd_unk_21 - .4byte BattleAICmd_get_type - .4byte BattleAICmd_unk_23 - .4byte BattleAICmd_unk_24 - .4byte BattleAICmd_get_move - .4byte BattleAICmd_if_type - .4byte BattleAICmd_unk_27 - .4byte BattleAICmd_if_would_go_first - .4byte BattleAICmd_if_would_not_go_first - .4byte BattleAICmd_unk_2A - .4byte BattleAICmd_unk_2B - .4byte BattleAICmd_count_alive_pokemon - .4byte BattleAICmd_unk_2D - .4byte BattleAICmd_unk_2E - .4byte BattleAICmd_get_ability - .4byte BattleAICmd_unk_30 - .4byte BattleAICmd_if_damage_bonus - .4byte BattleAICmd_unk_32 - .4byte BattleAICmd_unk_33 - .4byte BattleAICmd_if_status_in_party - .4byte BattleAICmd_if_status_not_in_party - .4byte BattleAICmd_unk_36 - .4byte BattleAICmd_if_effect - .4byte BattleAICmd_if_not_effect - .4byte BattleAICmd_if_stat_level_less_than - .4byte BattleAICmd_if_stat_level_more_than - .4byte BattleAICmd_if_stat_level_equal - .4byte BattleAICmd_if_stat_level_not_equal - .4byte BattleAICmd_if_can_faint - .4byte BattleAICmd_if_cant_faint - .4byte BattleAICmd_unk_3F - .4byte BattleAICmd_unk_40 - .4byte BattleAICmd_if_move_effect - .4byte BattleAICmd_if_not_move_effect - .4byte BattleAICmd_if_last_move_did_damage - .4byte BattleAICmd_if_encored - .4byte BattleAICmd_unk_45 - .4byte BattleAICmd_if_random_2 - .4byte BattleAICmd_unk_47 - .4byte BattleAICmd_get_hold_effect - .4byte BattleAICmd_get_gender - .4byte BattleAICmd_is_first_turn - .4byte BattleAICmd_get_stockpile_count - .4byte BattleAICmd_unk_4C - .4byte BattleAICmd_get_item - .4byte BattleAICmd_unk_4E - .4byte BattleAICmd_unk_4F - .4byte BattleAICmd_unk_50 - .4byte BattleAICmd_get_protect_count - .4byte BattleAICmd_unk_52 - .4byte BattleAICmd_unk_53 - .4byte BattleAICmd_unk_54 - .4byte BattleAICmd_unk_55 - .4byte BattleAICmd_unk_56 - .4byte BattleAICmd_unk_57 - .4byte BattleAICmd_call - .4byte BattleAICmd_jump - .4byte BattleAICmd_unk_5A - .4byte BattleAICmd_if_level_cond - .4byte BattleAICmd_if_taunted - .4byte BattleAICmd_if_not_taunted - - .align 1 -gUnknown_083F62BC:: @ 83F62BC - .2byte EFFECT_EXPLOSION - .2byte EFFECT_DREAM_EATER - .2byte EFFECT_RAZOR_WIND - .2byte EFFECT_SKY_ATTACK - .2byte EFFECT_RECHARGE - .2byte EFFECT_SKULL_BASH - .2byte EFFECT_SOLARBEAM - .2byte EFFECT_SPIT_UP - .2byte EFFECT_FOCUS_PUNCH - .2byte EFFECT_SUPERPOWER - .2byte EFFECT_ERUPTION - .2byte EFFECT_OVERHEAT - .2byte -1 diff --git a/data/battle_ai_scripts.s b/data/battle_ai_scripts.s index dce46a908..855221507 100644 --- a/data/battle_ai_scripts.s +++ b/data/battle_ai_scripts.s @@ -52,18 +52,18 @@ AI_CheckBadMove: @ 81DA09C jump AI_CheckBadMove_CheckSoundproof CheckIfVoltAbsorbCancelsElectric: @ 81DA0CE - get_type 4 - if_type TYPE_ELECTRIC, Score_Down12 + get_type CURRENT_MOVE + if_arg_equal TYPE_ELECTRIC, Score_Down12 jump AI_CheckBadMove_CheckSoundproof CheckIfWaterAbsorbCancelsWater: @ 81DA0DB - get_type 4 - if_type TYPE_WATER, Score_Down12 + get_type CURRENT_MOVE + if_arg_equal TYPE_WATER, Score_Down12 jump AI_CheckBadMove_CheckSoundproof CheckIfFlashFireCancelsFire: @ 81DA0E8 - get_type 4 - if_type TYPE_FIRE, Score_Down12 + get_type CURRENT_MOVE + if_arg_equal TYPE_FIRE, Score_Down12 jump AI_CheckBadMove_CheckSoundproof CheckIfWonderGuardCancelsMove: @ 81DA0F5 @@ -71,8 +71,8 @@ CheckIfWonderGuardCancelsMove: @ 81DA0F5 jump Score_Down10 CheckIfLevitateCancelsGroundMove: @ 81DA100 - get_type 4 - if_type TYPE_GROUND, Score_Down10 + get_type CURRENT_MOVE + if_arg_equal TYPE_GROUND, Score_Down10 AI_CheckBadMove_CheckSoundproof: @ 81DA108 get_ability TARGET @@ -325,10 +325,10 @@ AI_CBM_Roar: @ 81DA572 end AI_CBM_Toxic: @ 81DA583 - get_type 0 + get_type ENEMY_TYPE1 if_equal TYPE_STEEL, Score_Down10 if_equal TYPE_POISON, Score_Down10 - get_type 2 + get_type PLAYER_TYPE1 if_equal TYPE_STEEL, Score_Down10 if_equal TYPE_POISON, Score_Down10 get_ability TARGET @@ -393,9 +393,9 @@ AI_CBM_Substitute: @ 81DA641 AI_CBM_LeechSeed: @ 81DA653 if_status3 TARGET, S_LEECH_SEED, Score_Down10 - get_type 0 + get_type ENEMY_TYPE1 if_equal TYPE_GRASS, Score_Down10 - get_type 2 + get_type PLAYER_TYPE1 if_equal TYPE_GRASS, Score_Down10 end @@ -754,7 +754,7 @@ AI_CV_Sleep: @ 81DAB44 jump AI_CV_Sleep_End AI_CV_SleepEncourageSlpDamage: @ 81DAB57 - if_random 128, AI_CV_Sleep_End + if_random_less_than 128, AI_CV_Sleep_End score +1 AI_CV_Sleep_End: @ 81DAB5F @@ -766,7 +766,7 @@ AI_CV_Absorb: @ 81DAB60 jump AI_CV_Absorb_End AI_CV_AbsorbEncourageMaybe: @ 81DAB71 - if_random 50, AI_CV_Absorb_End + if_random_less_than 50, AI_CV_Absorb_End score -3 AI_CV_Absorb_End: @ 81DAB79 @@ -776,28 +776,28 @@ AI_CV_SelfKO: @ 81DAB7A if_stat_level_less_than TARGET, EVASION, 7, AI_CV_SelfKO_Encourage1 score -1 if_stat_level_less_than TARGET, EVASION, 10, AI_CV_SelfKO_Encourage1 - if_random 128, AI_CV_SelfKO_Encourage1 + if_random_less_than 128, AI_CV_SelfKO_Encourage1 score -1 AI_CV_SelfKO_Encourage1: @ 81DAB94 if_hp_less_than USER, 80, AI_CV_SelfKO_Encourage2 if_would_go_first USER, AI_CV_SelfKO_Encourage2 - if_random 50, AI_CV_SelfKO_End + if_random_less_than 50, AI_CV_SelfKO_End jump Score_Down3 AI_CV_SelfKO_Encourage2: @ 81DABAC if_hp_more_than USER, 50, AI_CV_SelfKO_Encourage4 - if_random 128, AI_CV_SelfKO_Encourage3 + if_random_less_than 128, AI_CV_SelfKO_Encourage3 score +1 AI_CV_SelfKO_Encourage3: @ 81DABBB if_hp_more_than USER, 30, AI_CV_SelfKO_End - if_random 50, AI_CV_SelfKO_End + if_random_less_than 50, AI_CV_SelfKO_End score +1 jump AI_CV_SelfKO_End AI_CV_SelfKO_Encourage4: @ 81DABCF - if_random 50, AI_CV_SelfKO_End + if_random_less_than 50, AI_CV_SelfKO_End score -1 AI_CV_SelfKO_End: @ 81DABD7 @@ -818,14 +818,14 @@ AI_CV_MirrorMove: @ 81DABEC if_would_go_first USER, AI_CV_MirrorMove2 get_move TARGET if_not_in_words AI_CV_MirrorMove_EncouragedMovesToMirror, AI_CV_MirrorMove2 - if_random 128, AI_CV_MirrorMove_End + if_random_less_than 128, AI_CV_MirrorMove_End score +2 jump AI_CV_MirrorMove_End AI_CV_MirrorMove2: @ 81DAC0A get_move TARGET if_in_words AI_CV_MirrorMove_EncouragedMovesToMirror, AI_CV_MirrorMove_End - if_random 80, AI_CV_MirrorMove_End + if_random_less_than 80, AI_CV_MirrorMove_End score -1 AI_CV_MirrorMove_End: @ 81DAC1D @@ -876,19 +876,19 @@ AI_CV_MirrorMove_EncouragedMovesToMirror: @ 81DAC20 AI_CV_AttackUp: @ 81DAC70 if_stat_level_less_than USER, ATTACK, 9, AI_CV_AttackUp2 - if_random 100, AI_CV_AttackUp3 + if_random_less_than 100, AI_CV_AttackUp3 score -1 jump AI_CV_AttackUp3 AI_CV_AttackUp2: @ 81DAC85 if_hp_not_equal USER, 100, AI_CV_AttackUp3 - if_random 128, AI_CV_AttackUp3 + if_random_less_than 128, AI_CV_AttackUp3 score +2 AI_CV_AttackUp3: @ 81DAC94 if_hp_more_than USER, 70, AI_CV_AttackUp_End if_hp_less_than USER, 40, AI_CV_AttackUp_ScoreDown2 - if_random 40, AI_CV_AttackUp_End + if_random_less_than 40, AI_CV_AttackUp_End AI_CV_AttackUp_ScoreDown2: @ 81DACA8 score -2 @@ -898,31 +898,31 @@ AI_CV_AttackUp_End: @ 81DACAA AI_CV_DefenseUp: @ 81DACAB if_stat_level_less_than USER, DEFENSE, 9, AI_CV_DefenseUp2 - if_random 100, AI_CV_DefenseUp3 + if_random_less_than 100, AI_CV_DefenseUp3 score -1 jump AI_CV_DefenseUp3 AI_CV_DefenseUp2: @ 81DACC0 if_hp_not_equal USER, 100, AI_CV_DefenseUp3 - if_random 128, AI_CV_DefenseUp3 + if_random_less_than 128, AI_CV_DefenseUp3 score +2 AI_CV_DefenseUp3: @ 81DACCF if_hp_less_than USER, 70, AI_CV_DefenseUp4 - if_random 200, AI_CV_DefenseUp_End + if_random_less_than 200, AI_CV_DefenseUp_End AI_CV_DefenseUp4: @ 81DACDC if_hp_less_than USER, 40, AI_CV_DefenseUp_ScoreDown2 get_move TARGET - get_move_power + get_move_power_from_result if_equal 0, AI_CV_DefenseUp5 get_move TARGET - get_move_type + get_move_type_from_result if_not_in_bytes AI_CV_DefenseUp_PhysicalTypes, AI_CV_DefenseUp_ScoreDown2 - if_random 60, AI_CV_DefenseUp_End + if_random_less_than 60, AI_CV_DefenseUp_End AI_CV_DefenseUp5: @ 81DACFE - if_random 60, AI_CV_DefenseUp_End + if_random_less_than 60, AI_CV_DefenseUp_End AI_CV_DefenseUp_ScoreDown2: @ 81DAD04 score -2 @@ -948,7 +948,7 @@ AI_CV_SpeedUp: @ 81DAD11 jump AI_CV_SpeedUp_End AI_CV_SpeedUp2: @ 81DAD1E - if_random 70, AI_CV_SpeedUp_End + if_random_less_than 70, AI_CV_SpeedUp_End score +3 AI_CV_SpeedUp_End: @ 81DAD26 @@ -956,19 +956,19 @@ AI_CV_SpeedUp_End: @ 81DAD26 AI_CV_SpAtkUp: @ 81DAD27 if_stat_level_less_than USER, SP_ATTACK, 9, AI_CV_SpAtkUp2 - if_random 100, AI_CV_SpAtkUp3 + if_random_less_than 100, AI_CV_SpAtkUp3 score -1 jump AI_CV_SpAtkUp3 AI_CV_SpAtkUp2: @ 81DAD3C if_hp_not_equal USER, 100, AI_CV_SpAtkUp3 - if_random 128, AI_CV_SpAtkUp3 + if_random_less_than 128, AI_CV_SpAtkUp3 score +2 AI_CV_SpAtkUp3: @ 81DAD4B if_hp_more_than USER, 70, AI_CV_SpAtkUp_End if_hp_less_than USER, 40, AI_CV_SpAtkUp_ScoreDown2 - if_random 70, AI_CV_SpAtkUp_End + if_random_less_than 70, AI_CV_SpAtkUp_End AI_CV_SpAtkUp_ScoreDown2: @ 81DAD5F score -2 @@ -978,31 +978,31 @@ AI_CV_SpAtkUp_End: @ 81DAD61 AI_CV_SpDefUp: @ 81DAD62 if_stat_level_less_than USER, SP_DEFENSE, 9, AI_CV_SpDefUp2 - if_random 100, AI_CV_SpDefUp3 + if_random_less_than 100, AI_CV_SpDefUp3 score -1 jump AI_CV_SpDefUp3 AI_CV_SpDefUp2: @ 81DAD77 if_hp_not_equal USER, 100, AI_CV_SpDefUp3 - if_random 128, AI_CV_SpDefUp3 + if_random_less_than 128, AI_CV_SpDefUp3 score +2 AI_CV_SpDefUp3: @ 81DAD86 if_hp_less_than USER, 70, AI_CV_SpDefUp4 - if_random 200, AI_CV_SpDefUp_End + if_random_less_than 200, AI_CV_SpDefUp_End AI_CV_SpDefUp4: @ 81DAD93 if_hp_less_than USER, 40, AI_CV_SpDefUp_ScoreDown2 get_move TARGET - get_move_power + get_move_power_from_result if_equal 0, AI_CV_SpDefUp5 get_move TARGET - get_move_type + get_move_type_from_result if_in_bytes AI_CV_SpDefUp_PhysicalTypes, AI_CV_SpDefUp_ScoreDown2 - if_random 60, AI_CV_SpDefUp_End + if_random_less_than 60, AI_CV_SpDefUp_End AI_CV_SpDefUp5: @ 81DADB5 - if_random 60, AI_CV_SpDefUp_End + if_random_less_than 60, AI_CV_SpDefUp_End AI_CV_SpDefUp_ScoreDown2: @ 81DADBB score -2 @@ -1024,7 +1024,7 @@ AI_CV_SpDefUp_PhysicalTypes: @ 81DADBE AI_CV_AccuracyUp: @ 81DADC8 if_stat_level_less_than USER, ACCURACY, 9, AI_CV_AccuracyUp2 - if_random 50, AI_CV_AccuracyUp2 + if_random_less_than 50, AI_CV_AccuracyUp2 score -2 AI_CV_AccuracyUp2: @ 81DADD8 @@ -1036,36 +1036,36 @@ AI_CV_AccuracyUp_End: @ 81DADE1 AI_CV_EvasionUp: @ 81DADE2 if_hp_less_than USER, 90, AI_CV_EvasionUp2 - if_random 100, AI_CV_EvasionUp2 + if_random_less_than 100, AI_CV_EvasionUp2 score +3 AI_CV_EvasionUp2: @ 81DADF1 if_stat_level_less_than USER, EVASION, 9, AI_CV_EvasionUp3 - if_random 128, AI_CV_EvasionUp3 + if_random_less_than 128, AI_CV_EvasionUp3 score -1 AI_CV_EvasionUp3: @ 81DAE01 if_not_status TARGET, TOX, AI_CV_EvasionUp5 if_hp_more_than USER, 50, AI_CV_EvasionUp4 - if_random 80, AI_CV_EvasionUp5 + if_random_less_than 80, AI_CV_EvasionUp5 AI_CV_EvasionUp4: @ 81DAE18 - if_random 50, AI_CV_EvasionUp5 + if_random_less_than 50, AI_CV_EvasionUp5 score +3 AI_CV_EvasionUp5: @ 81DAE20 if_not_status3 TARGET, S_LEECH_SEED, AI_CV_EvasionUp6 - if_random 70, AI_CV_EvasionUp6 + if_random_less_than 70, AI_CV_EvasionUp6 score +3 AI_CV_EvasionUp6: @ 81DAE32 if_not_status3 USER, S_ROOTED, AI_CV_EvasionUp7 - if_random 128, AI_CV_EvasionUp7 + if_random_less_than 128, AI_CV_EvasionUp7 score +2 AI_CV_EvasionUp7: @ 81DAE44 if_not_status2 TARGET, S_CURSED, AI_CV_EvasionUp8 - if_random 70, AI_CV_EvasionUp8 + if_random_less_than 70, AI_CV_EvasionUp8 score +3 AI_CV_EvasionUp8: @ 81DAE56 @@ -1073,7 +1073,7 @@ AI_CV_EvasionUp8: @ 81DAE56 if_stat_level_equal USER, EVASION, 6, AI_CV_EvasionUp_End if_hp_less_than USER, 40, AI_CV_EvasionUp_ScoreDown2 if_hp_less_than TARGET, 40, AI_CV_EvasionUp_ScoreDown2 - if_random 70, AI_CV_EvasionUp_End + if_random_less_than 70, AI_CV_EvasionUp_End AI_CV_EvasionUp_ScoreDown2: @ 81DAE79 score -2 @@ -1092,7 +1092,7 @@ AI_CV_AlwaysHit_ScoreUp1: @ 81DAEA1 score +1 AI_CV_AlwaysHit2: @ 81DAEA3 - if_random 100, AI_CV_AlwaysHit_End + if_random_less_than 100, AI_CV_AlwaysHit_End score +1 AI_CV_AlwaysHit_End: @ 81DAEAB @@ -1106,7 +1106,7 @@ AI_CV_AttackDown: @ 81DAEAC AI_CV_AttackDown2: @ 81DAEBF if_stat_level_more_than TARGET, ATTACK, 3, AI_CV_AttackDown3 - if_random 50, AI_CV_AttackDown3 + if_random_less_than 50, AI_CV_AttackDown3 score -2 AI_CV_AttackDown3: @ 81DAECF @@ -1114,11 +1114,11 @@ AI_CV_AttackDown3: @ 81DAECF score -2 AI_CV_AttackDown4: @ 81DAED8 - get_type 0 + get_type ENEMY_TYPE1 if_in_bytes AI_CV_AttackDown_UnknownTypeList, AI_CV_AttackDown_End - get_type 2 + get_type PLAYER_TYPE1 if_in_bytes AI_CV_AttackDown_UnknownTypeList, AI_CV_AttackDown_End - if_random 50, AI_CV_AttackDown_End + if_random_less_than 50, AI_CV_AttackDown_End score -2 AI_CV_AttackDown_End: @ 81DAEF6 @@ -1139,7 +1139,7 @@ AI_CV_DefenseDown: @ 81DAEFE if_stat_level_more_than TARGET, DEFENSE, 3, AI_CV_DefenseDown3 AI_CV_DefenseDown2: @ 81DAF0D - if_random 50, AI_CV_DefenseDown3 + if_random_less_than 50, AI_CV_DefenseDown3 score -2 AI_CV_DefenseDown3: @ 81DAF15 @@ -1161,7 +1161,7 @@ AI_CV_SpeedDown: @ 81DAF35 jump AI_CV_SpeedDown_End AI_CV_SpeedDown2: @ 81DAF42 - if_random 70, AI_CV_SpeedDown_End + if_random_less_than 70, AI_CV_SpeedDown_End score +2 AI_CV_SpeedDown_End: @ 81DAF4A @@ -1175,7 +1175,7 @@ AI_CV_SpAtkDown: @ 81DAF4B AI_CV_SpAtkDown2: @ 81DAF5E if_stat_level_more_than TARGET, SP_ATTACK, 3, AI_CV_SpAtkDown3 - if_random 50, AI_CV_SpAtkDown3 + if_random_less_than 50, AI_CV_SpAtkDown3 score -2 AI_CV_SpAtkDown3: @ 81DAF6E @@ -1183,11 +1183,11 @@ AI_CV_SpAtkDown3: @ 81DAF6E score -2 AI_CV_SpAtkDown4: @ 81DAF77 - get_type 0 + get_type ENEMY_TYPE1 if_in_bytes AI_CV_SpAtkDown_SpecialTypeList, AI_CV_SpAtkDown_End - get_type 2 + get_type PLAYER_TYPE1 if_in_bytes AI_CV_SpAtkDown_SpecialTypeList, AI_CV_SpAtkDown_End - if_random 50, AI_CV_SpAtkDown_End + if_random_less_than 50, AI_CV_SpAtkDown_End score -2 AI_CV_SpAtkDown_End: @ 81DAF95 @@ -1209,7 +1209,7 @@ AI_CV_SpDefDown: @ 81DAF9F if_stat_level_more_than TARGET, SP_DEFENSE, 3, AI_CV_SpDefDown3 AI_CV_SpDefDown2: @ 81DAFAE - if_random 50, AI_CV_SpDefDown3 + if_random_less_than 50, AI_CV_SpDefDown3 score -2 AI_CV_SpDefDown3: @ 81DAFB6 @@ -1224,32 +1224,32 @@ AI_CV_AccuracyDown: @ 81DAFC0 if_hp_more_than TARGET, 70, AI_CV_AccuracyDown3 AI_CV_AccuracyDown2: @ 81DAFCE - if_random 100, AI_CV_AccuracyDown3 + if_random_less_than 100, AI_CV_AccuracyDown3 score -1 AI_CV_AccuracyDown3: @ 81DAFD6 if_stat_level_more_than USER, ACCURACY, 4, AI_CV_AccuracyDown4 - if_random 80, AI_CV_AccuracyDown4 + if_random_less_than 80, AI_CV_AccuracyDown4 score -2 AI_CV_AccuracyDown4: @ 81DAFE6 if_not_status TARGET, TOX, AI_CV_AccuracyDown5 - if_random 70, AI_CV_AccuracyDown5 + if_random_less_than 70, AI_CV_AccuracyDown5 score +2 AI_CV_AccuracyDown5: @ 81DAFF8 if_not_status3 TARGET, S_LEECH_SEED, AI_CV_AccuracyDown6 - if_random 70, AI_CV_AccuracyDown6 + if_random_less_than 70, AI_CV_AccuracyDown6 score +2 AI_CV_AccuracyDown6: @ 81DB00A if_not_status3 USER, S_ROOTED, AI_CV_AccuracyDown7 - if_random 128, AI_CV_AccuracyDown7 + if_random_less_than 128, AI_CV_AccuracyDown7 score +1 AI_CV_AccuracyDown7: @ 81DB01C if_not_status2 TARGET, S_CURSED, AI_CV_AccuracyDown8 - if_random 70, AI_CV_AccuracyDown8 + if_random_less_than 70, AI_CV_AccuracyDown8 score +2 AI_CV_AccuracyDown8: @ 81DB02E @@ -1257,7 +1257,7 @@ AI_CV_AccuracyDown8: @ 81DB02E if_stat_level_equal TARGET, ACCURACY, 6, AI_CV_AccuracyDown_End if_hp_less_than USER, 40, AI_CV_AccuracyDown_ScoreDown2 if_hp_less_than TARGET, 40, AI_CV_AccuracyDown_ScoreDown2 - if_random 70, AI_CV_AccuracyDown_End + if_random_less_than 70, AI_CV_AccuracyDown_End AI_CV_AccuracyDown_ScoreDown2: @ 81DB051 score -2 @@ -1270,7 +1270,7 @@ AI_CV_EvasionDown: @ 81DB054 if_stat_level_more_than TARGET, EVASION, 3, AI_CV_EvasionDown3 AI_CV_EvasionDown2: @ 81DB063 - if_random 50, AI_CV_EvasionDown3 + if_random_less_than 50, AI_CV_EvasionDown3 score -2 AI_CV_EvasionDown3: @ 81DB06B @@ -1294,7 +1294,7 @@ AI_CV_Haze: @ 81DB075 jump AI_CV_Haze3 AI_CV_Haze2: @ 81DB0CA - if_random 50, AI_CV_Haze3 + if_random_less_than 50, AI_CV_Haze3 score -3 AI_CV_Haze3: @ 81DB0D2 @@ -1308,12 +1308,12 @@ AI_CV_Haze3: @ 81DB0D2 if_stat_level_less_than USER, SP_ATTACK, 4, AI_CV_Haze4 if_stat_level_less_than USER, SP_DEFENSE, 4, AI_CV_Haze4 if_stat_level_less_than USER, ACCURACY, 4, AI_CV_Haze4 - if_random 50, AI_CV_Haze_End + if_random_less_than 50, AI_CV_Haze_End score -1 jump AI_CV_Haze_End AI_CV_Haze4: @ 81DB12F - if_random 50, AI_CV_Haze_End + if_random_less_than 50, AI_CV_Haze_End score +3 AI_CV_Haze_End: @ 81DB137 @@ -1336,7 +1336,7 @@ AI_CV_Roar: @ 81DB142 jump AI_CV_Roar_End AI_CV_Roar2: @ 81DB171 - if_random 128, AI_CV_Roar_End + if_random_less_than 128, AI_CV_Roar_End score +2 AI_CV_Roar_End: @ 81DB179 @@ -1349,7 +1349,7 @@ AI_CV_Conversion: @ 81DB17A AI_CV_Conversion2: @ 81DB183 get_turn_count if_equal 0, AI_CV_Conversion_End - if_random 200, Score_Down2 + if_random_less_than 200, Score_Down2 AI_CV_Conversion_End: @ 81DB190 end @@ -1373,7 +1373,7 @@ AI_CV_Heal: @ 81DB1AB AI_CV_Heal2: @ unreferenced if_hp_less_than USER, 50, AI_CV_Heal5 if_hp_more_than USER, 80, AI_CV_Heal3 - if_random 70, AI_CV_Heal5 + if_random_less_than 70, AI_CV_Heal5 AI_CV_Heal3: @ 81DB1D3 score -3 @@ -1381,16 +1381,16 @@ AI_CV_Heal3: @ 81DB1D3 AI_CV_Heal4: @ 81DB1DA if_hp_less_than USER, 70, AI_CV_Heal5 - if_random 30, AI_CV_Heal5 + if_random_less_than 30, AI_CV_Heal5 score -3 jump AI_CV_Heal_End AI_CV_Heal5: @ 81DB1EE if_not_move_effect TARGET, EFFECT_SNATCH, AI_CV_Heal6 - if_random 100, AI_CV_Heal_End + if_random_less_than 100, AI_CV_Heal_End AI_CV_Heal6: @ 81DB1FB - if_random 20, AI_CV_Heal_End + if_random_less_than 20, AI_CV_Heal_End score +2 AI_CV_Heal_End: @ 81DB203 @@ -1399,12 +1399,12 @@ AI_CV_Heal_End: @ 81DB203 AI_CV_Toxic: @ 81DB204 if_user_cant_damage AI_CV_Toxic3 if_hp_more_than USER, 50, AI_CV_Toxic2 - if_random 50, AI_CV_Toxic2 + if_random_less_than 50, AI_CV_Toxic2 score -3 AI_CV_Toxic2: @ 81DB218 if_hp_more_than TARGET, 50, AI_CV_Toxic3 - if_random 50, AI_CV_Toxic3 + if_random_less_than 50, AI_CV_Toxic3 score -3 AI_CV_Toxic3: @ 81DB227 @@ -1413,7 +1413,7 @@ AI_CV_Toxic3: @ 81DB227 jump AI_CV_Toxic_End AI_CV_Toxic4: @ 81DB23A - if_random 60, AI_CV_Toxic_End + if_random_less_than 60, AI_CV_Toxic_End score +2 AI_CV_Toxic_End: @ 81DB242 @@ -1421,11 +1421,11 @@ AI_CV_Toxic_End: @ 81DB242 AI_CV_LightScreen: @ 81DB243 if_hp_less_than USER, 50, AI_CV_LightScreen_ScoreDown2 - get_type 0 + get_type ENEMY_TYPE1 if_in_bytes AI_CV_LightScreen_SpecialTypeList, AI_CV_LightScreen_End - get_type 2 + get_type PLAYER_TYPE1 if_in_bytes AI_CV_LightScreen_SpecialTypeList, AI_CV_LightScreen_End - if_random 50, AI_CV_LightScreen_End + if_random_less_than 50, AI_CV_LightScreen_End AI_CV_LightScreen_ScoreDown2: @ 81DB266 score -2 @@ -1453,7 +1453,7 @@ AI_CV_Rest: @ 81DB272 AI_CV_Rest2: @ 81DB286 if_hp_less_than USER, 40, AI_CV_Rest6 if_hp_more_than USER, 50, AI_CV_Rest3 - if_random 70, AI_CV_Rest6 + if_random_less_than 70, AI_CV_Rest6 AI_CV_Rest3: @ 81DB29A score -3 @@ -1462,7 +1462,7 @@ AI_CV_Rest3: @ 81DB29A AI_CV_Rest4: @ 81DB2A1 if_hp_less_than USER, 60, AI_CV_Rest6 if_hp_more_than USER, 70, AI_CV_Rest5 - if_random 50, AI_CV_Rest6 + if_random_less_than 50, AI_CV_Rest6 AI_CV_Rest5: @ 81DB2B5 score -3 @@ -1470,10 +1470,10 @@ AI_CV_Rest5: @ 81DB2B5 AI_CV_Rest6: @ 81DB2BC if_not_move_effect TARGET, EFFECT_SNATCH, AI_CV_Rest7 - if_random 50, AI_CV_Rest_End + if_random_less_than 50, AI_CV_Rest_End AI_CV_Rest7: @ 81DB2C9 - if_random 10, AI_CV_Rest_End + if_random_less_than 10, AI_CV_Rest_End score +3 AI_CV_Rest_End: @ 81DB2D1 @@ -1497,7 +1497,7 @@ AI_CV_Trap: @ 81DB2DD jump AI_CV_Trap_End AI_CV_Trap2: @ 81DB30A - if_random 128, AI_CV_Trap_End + if_random_less_than 128, AI_CV_Trap_End score +1 AI_CV_Trap_End: @ 81DB312 @@ -1508,22 +1508,22 @@ AI_CV_HighCrit: @ 81DB313 if_damage_bonus 20, AI_CV_HighCrit_End if_damage_bonus 80, AI_CV_HighCrit2 if_damage_bonus 160, AI_CV_HighCrit2 - if_random 128, AI_CV_HighCrit_End + if_random_less_than 128, AI_CV_HighCrit_End AI_CV_HighCrit2: @ 81DB331 - if_random 128, AI_CV_HighCrit_End + if_random_less_than 128, AI_CV_HighCrit_End score +1 AI_CV_HighCrit_End: @ 81DB339 end AI_CV_Flatter: @ 81DB33A - if_random 128, AI_CV_Confuse + if_random_less_than 128, AI_CV_Confuse score +1 AI_CV_Confuse: @ 81DB342 if_hp_more_than TARGET, 70, AI_CV_Confuse_End - if_random 128, AI_CV_Confuse2 + if_random_less_than 128, AI_CV_Confuse2 score -1 AI_CV_Confuse2: @ 81DB351 @@ -1537,11 +1537,11 @@ AI_CV_Confuse_End: @ 81DB363 AI_CV_Reflect: @ 81DB364 if_hp_less_than USER, 50, AI_CV_Reflect_ScoreDown2 - get_type 0 + get_type ENEMY_TYPE1 if_in_bytes AI_CV_Reflect_PhysicalTypeList, AI_CV_Reflect_End - get_type 2 + get_type PLAYER_TYPE1 if_in_bytes AI_CV_Reflect_PhysicalTypeList, AI_CV_Reflect_End - if_random 50, AI_CV_Reflect_End + if_random_less_than 50, AI_CV_Reflect_End AI_CV_Reflect_ScoreDown2: @ 81DB387 score -2 @@ -1578,7 +1578,7 @@ AI_CV_Paralyze: @ 81DB3A5 jump AI_CV_Paralyze_End AI_CV_Paralyze2: @ 81DB3B9 - if_random 20, AI_CV_Paralyze_End + if_random_less_than 20, AI_CV_Paralyze_End score +3 AI_CV_Paralyze_End: @ 81DB3C1 @@ -1588,10 +1588,10 @@ AI_CV_VitalThrow: @ 81DB3C2 if_would_go_first USER, AI_CV_VitalThrow_End if_hp_more_than USER, 60, AI_CV_VitalThrow_End if_hp_less_than USER, 40, AI_CV_VitalThrow2 - if_random 180, AI_CV_VitalThrow_End + if_random_less_than 180, AI_CV_VitalThrow_End AI_CV_VitalThrow2: @ 81DB3DC - if_random 50, AI_CV_VitalThrow_End + if_random_less_than 50, AI_CV_VitalThrow_End score -1 AI_CV_VitalThrow_End: @ 81DB3E4 @@ -1601,21 +1601,21 @@ AI_CV_Substitute: @ 81DB3E5 if_hp_more_than USER, 90, AI_CV_Substitute4 if_hp_more_than USER, 70, AI_CV_Substitute3 if_hp_more_than USER, 50, AI_CV_Substitute2 - if_random 100, AI_CV_Substitute2 + if_random_less_than 100, AI_CV_Substitute2 score -1 AI_CV_Substitute2: @ 81DB402 - if_random 100, AI_CV_Substitute3 + if_random_less_than 100, AI_CV_Substitute3 score -1 AI_CV_Substitute3: @ 81DB40A - if_random 100, AI_CV_Substitute4 + if_random_less_than 100, AI_CV_Substitute4 score -1 AI_CV_Substitute4: @ 81DB412 if_would_go_first USER, AI_CV_Substitute_End get_move TARGET - get_move_effect + get_move_effect_from_result if_equal EFFECT_SLEEP, AI_CV_Substitute5 if_equal EFFECT_TOXIC, AI_CV_Substitute5 if_equal EFFECT_POISON, AI_CV_Substitute5 @@ -1637,7 +1637,7 @@ AI_CV_Substitute7: @ 81DB468 if_status3 TARGET, S_LEECH_SEED, AI_CV_Substitute_End AI_CV_Substitute8: @ 81DB472 - if_random 100, AI_CV_Substitute_End + if_random_less_than 100, AI_CV_Substitute_End score +1 AI_CV_Substitute_End: @ 81DB47A @@ -1662,13 +1662,13 @@ AI_CV_Recharge_End: @ 81DB4A2 AI_CV_Disable: @ 81DB4A3 if_would_go_first USER, AI_CV_Disable_End get_move TARGET - get_move_power + get_move_power_from_result if_equal 0, AI_CV_Disable2 score +1 jump AI_CV_Disable_End AI_CV_Disable2: @ 81DB4B9 - if_random 100, AI_CV_Disable_End + if_random_less_than 100, AI_CV_Disable_End score -1 AI_CV_Disable_End: @ 81DB4C1 @@ -1679,41 +1679,41 @@ AI_CV_Counter: @ 81DB4C2 if_status2 TARGET, S_INFATUATED, AI_CV_Counter_ScoreDown1 if_status2 TARGET, S_CONFUSED, AI_CV_Counter_ScoreDown1 if_hp_more_than USER, 30, AI_CV_Counter2 - if_random 10, AI_CV_Counter2 + if_random_less_than 10, AI_CV_Counter2 score -1 AI_CV_Counter2: @ 81DB4EF if_hp_more_than USER, 50, AI_CV_Counter3 - if_random 100, AI_CV_Counter3 + if_random_less_than 100, AI_CV_Counter3 score -1 AI_CV_Counter3: @ 81DB4FE get_move TARGET - get_move_power + get_move_power_from_result if_equal 0, AI_CV_Counter5 if_not_taunted AI_CV_Counter4 - if_random 100, AI_CV_Counter4 + if_random_less_than 100, AI_CV_Counter4 score +1 AI_CV_Counter4: @ 81DB514 get_move TARGET - get_move_type + get_move_type_from_result if_not_in_bytes AI_CV_Counter_PhysicalTypeList, AI_CV_Counter_ScoreDown1 - if_random 100, AI_CV_Counter_End + if_random_less_than 100, AI_CV_Counter_End score +1 jump AI_CV_Counter_End AI_CV_Counter5: @ 81DB52D if_not_taunted AI_CV_Counter6 - if_random 100, AI_CV_Counter6 + if_random_less_than 100, AI_CV_Counter6 score +1 AI_CV_Counter6: @ 81DB53A - get_type 0 + get_type ENEMY_TYPE1 if_in_bytes AI_CV_Counter_PhysicalTypeList, AI_CV_Counter_End - get_type 2 + get_type PLAYER_TYPE1 if_in_bytes AI_CV_Counter_PhysicalTypeList, AI_CV_Counter_End - if_random 50, AI_CV_Counter_End + if_random_less_than 50, AI_CV_Counter_End AI_CV_Counter_ScoreDown1: @ 81DB556 score -1 @@ -1737,11 +1737,11 @@ AI_CV_Encore: @ 81DB563 if_last_move_did_damage TARGET, 0, AI_CV_Encore2 if_would_go_first USER, AI_CV_Encore_ScoreDown2 get_move TARGET - get_move_effect + get_move_effect_from_result if_not_in_bytes AI_CV_Encore_EncouragedMovesToEncore, AI_CV_Encore_ScoreDown2 AI_CV_Encore2: @ 81DB57C - if_random 30, AI_CV_Encore_End + if_random_less_than 30, AI_CV_Encore_End score +3 jump AI_CV_Encore_End @@ -1839,7 +1839,7 @@ AI_CV_Snore: @ 81DB5F7 end AI_CV_LockOn: @ 81DB5FA - if_random 128, AI_CV_LockOn_End + if_random_less_than 128, AI_CV_LockOn_End score +2 AI_CV_LockOn_End: @ 81DB602 @@ -1853,17 +1853,17 @@ AI_CV_DestinyBond: @ 81DB606 score -1 if_would_go_first USER, AI_CV_DestinyBond_End if_hp_more_than USER, 70, AI_CV_DestinyBond_End - if_random 128, AI_CV_DestinyBond2 + if_random_less_than 128, AI_CV_DestinyBond2 score +1 AI_CV_DestinyBond2: @ 81DB61D if_hp_more_than USER, 50, AI_CV_DestinyBond_End - if_random 128, AI_CV_DestinyBond3 + if_random_less_than 128, AI_CV_DestinyBond3 score +1 AI_CV_DestinyBond3: @ 81DB62C if_hp_more_than USER, 30, AI_CV_DestinyBond_End - if_random 100, AI_CV_DestinyBond_End + if_random_less_than 100, AI_CV_DestinyBond_End score +2 AI_CV_DestinyBond_End: @ 81DB63B @@ -1885,7 +1885,7 @@ AI_CV_Flail_ScoreUp1: @ 81DB66F score +1 AI_CV_Flail3: @ 81DB671 - if_random 100, AI_CV_Flail_End + if_random_less_than 100, AI_CV_Flail_End score +1 jump AI_CV_Flail_End @@ -1906,7 +1906,7 @@ AI_CV_HealBell_End: @ 81DB697 AI_CV_Thief: @ 81DB698 get_hold_effect TARGET if_not_in_bytes AI_CV_Thief_EncourageItemsToSteal, AI_CV_Thief_ScoreDown2 - if_random 50, AI_CV_Thief_End + if_random_less_than 50, AI_CV_Thief_End score +1 jump AI_CV_Thief_End @@ -1927,22 +1927,22 @@ AI_CV_Thief_EncourageItemsToSteal: @ 81DB6B3 .byte -1 AI_CV_Curse: @ 81DB6BB - get_type 1 + get_type ENEMY_TYPE2 if_equal TYPE_GHOST, AI_CV_Curse4 - get_type 3 + get_type PLAYER_TYPE2 if_equal TYPE_GHOST, AI_CV_Curse4 if_stat_level_more_than USER, DEFENSE, 9, AI_CV_Curse_End - if_random 128, AI_CV_Curse2 + if_random_less_than 128, AI_CV_Curse2 score +1 AI_CV_Curse2: @ 81DB6DB if_stat_level_more_than USER, DEFENSE, 7, AI_CV_Curse_End - if_random 128, AI_CV_Curse3 + if_random_less_than 128, AI_CV_Curse3 score +1 AI_CV_Curse3: @ 81DB6EB if_stat_level_more_than USER, DEFENSE, 6, AI_CV_Curse_End - if_random 128, AI_CV_Curse_End + if_random_less_than 128, AI_CV_Curse_End score +1 jump AI_CV_Curse_End @@ -1971,7 +1971,7 @@ AI_CV_Protect: @ 81DB70A if_status3 TARGET, S_LEECH_SEED, AI_CV_Protect_ScoreUp2 if_status3 TARGET, S_YAWN, AI_CV_Protect_ScoreUp2 get_move TARGET - get_move_effect + get_move_effect_from_result if_not_equal EFFECT_LOCK_ON, AI_CV_Protect_ScoreUp2 jump AI_CV_Protect2 @@ -1982,13 +1982,13 @@ AI_CV_Protect2: @ 81DB7A8 get_protect_count USER if_equal 0, AI_CV_Protect_End score -1 - if_random 128, AI_CV_Protect_End + if_random_less_than 128, AI_CV_Protect_End score -1 jump AI_CV_Protect_End AI_CV_Protect3: @ 81DB7BF get_move TARGET - get_move_effect + get_move_effect_from_result if_not_equal EFFECT_LOCK_ON, AI_CV_Protect_End AI_CV_Protect_ScoreDown2: @ 81DB7C8 @@ -1998,19 +1998,19 @@ AI_CV_Protect_End: @ 81DB7CA end AI_CV_Foresight: @ 81DB7CB - get_type 1 + get_type ENEMY_TYPE2 if_equal TYPE_GHOST, AI_CV_Foresight2 - get_type 3 + get_type PLAYER_TYPE2 if_equal TYPE_GHOST, AI_CV_Foresight2 if_stat_level_more_than USER, EVASION, 8, AI_CV_Foresight3 score -2 jump AI_CV_Foresight_End AI_CV_Foresight2: @ 81DB7EA - if_random 80, AI_CV_Foresight_End + if_random_less_than 80, AI_CV_Foresight_End AI_CV_Foresight3: @ 81DB7F0 - if_random 80, AI_CV_Foresight_End + if_random_less_than 80, AI_CV_Foresight_End score +2 AI_CV_Foresight_End: @ 81DB7F8 @@ -2025,7 +2025,7 @@ AI_CV_Endure2: @ 81DB807 jump AI_CV_Endure_End AI_CV_Endure3: @ 81DB80E - if_random 70, AI_CV_Endure_End + if_random_less_than 70, AI_CV_Endure_End score +1 AI_CV_Endure_End: @ 81DB816 @@ -2048,7 +2048,7 @@ AI_CV_BatonPass3: @ 81DB856 if_hp_more_than USER, 70, AI_CV_BatonPass_End AI_CV_BatonPass4: @ 81DB85D - if_random 80, AI_CV_BatonPass_End + if_random_less_than 80, AI_CV_BatonPass_End score +2 jump AI_CV_BatonPass_End @@ -2077,18 +2077,18 @@ AI_CV_BatonPass_End: @ 81DB8B2 AI_CV_Pursuit: @ 81DB8B3 is_first_turn USER if_not_equal 0, AI_CV_Pursuit_End - get_type 0 + get_type ENEMY_TYPE1 if_equal TYPE_GHOST, AI_CV_Pursuit2 - get_type 0 + get_type ENEMY_TYPE1 if_equal TYPE_PSYCHIC, AI_CV_Pursuit2 - get_type 2 + get_type PLAYER_TYPE1 if_equal TYPE_GHOST, AI_CV_Pursuit2 - get_type 2 + get_type PLAYER_TYPE1 if_equal TYPE_PSYCHIC, AI_CV_Pursuit2 jump AI_CV_Pursuit_End AI_CV_Pursuit2: @ 81DB8E0 - if_random 128, AI_CV_Pursuit_End + if_random_less_than 128, AI_CV_Pursuit_End score +1 AI_CV_Pursuit_End: @ 81DB8E8 @@ -2161,14 +2161,14 @@ AI_CV_PsychUp2: @ 81DB98D if_stat_level_less_than USER, SP_ATTACK, 7, AI_CV_PsychUp3 if_stat_level_less_than USER, SP_DEFENSE, 7, AI_CV_PsychUp3 if_stat_level_less_than USER, EVASION, 7, AI_CV_PsychUp_ScoreUp1 - if_random 50, AI_CV_PsychUp_End + if_random_less_than 50, AI_CV_PsychUp_End jump AI_CV_PsychUp_ScoreDown2 AI_CV_PsychUp_ScoreUp1: @ 81DB9C0 score +1 AI_CV_PsychUp3: @ 81DB9C2 - if_random 128, AI_CV_PsychUp_End + if_random_less_than 128, AI_CV_PsychUp_End score +1 AI_CV_PsychUp_ScoreDown2: @ 81DB9CA @@ -2182,41 +2182,41 @@ AI_CV_MirrorCoat: @ 81DB9CD if_status2 TARGET, S_INFATUATED, AI_CV_MirrorCoat_ScoreDown1 if_status2 TARGET, S_CONFUSED, AI_CV_MirrorCoat_ScoreDown1 if_hp_more_than USER, 30, AI_CV_MirrorCoat2 - if_random 10, AI_CV_MirrorCoat2 + if_random_less_than 10, AI_CV_MirrorCoat2 score -1 AI_CV_MirrorCoat2: @ 81DB9FA if_hp_more_than USER, 50, AI_CV_MirrorCoat3 - if_random 100, AI_CV_MirrorCoat3 + if_random_less_than 100, AI_CV_MirrorCoat3 score -1 AI_CV_MirrorCoat3: @ 81DBA09 get_move TARGET - get_move_power + get_move_power_from_result if_equal 0, AI_CV_MirrorCoat5 if_not_taunted AI_CV_MirrorCoat4 - if_random 100, AI_CV_MirrorCoat4 + if_random_less_than 100, AI_CV_MirrorCoat4 score +1 AI_CV_MirrorCoat4: @ 81DBA1F get_move TARGET - get_move_type + get_move_type_from_result if_not_in_bytes AI_CV_MirrorCoat_SpecialTypeList, AI_CV_MirrorCoat_ScoreDown1 - if_random 100, AI_CV_MirrorCoat_End + if_random_less_than 100, AI_CV_MirrorCoat_End score +1 jump AI_CV_MirrorCoat_End AI_CV_MirrorCoat5: @ 81DBA38 if_not_taunted AI_CV_MirrorCoat6 - if_random 100, AI_CV_MirrorCoat6 + if_random_less_than 100, AI_CV_MirrorCoat6 score +1 AI_CV_MirrorCoat6: @ 81DBA45 - get_type 0 + get_type ENEMY_TYPE1 if_in_bytes AI_CV_MirrorCoat_SpecialTypeList, AI_CV_MirrorCoat_End - get_type 2 + get_type PLAYER_TYPE1 if_in_bytes AI_CV_MirrorCoat_SpecialTypeList, AI_CV_MirrorCoat_End - if_random 50, AI_CV_MirrorCoat_End + if_random_less_than 50, AI_CV_MirrorCoat_End AI_CV_MirrorCoat_ScoreDown1: @ 81DBA61 score -1 @@ -2264,27 +2264,27 @@ AI_CV_Fly2: @ 81DBA9F jump AI_CV_Fly5 AI_CV_Fly3: @ 81DBACF - get_type 1 + get_type ENEMY_TYPE2 if_in_bytes AI_CV_Fly_TypesToEncourage, AI_CV_Fly6 - get_type 3 + get_type PLAYER_TYPE2 if_in_bytes AI_CV_Fly_TypesToEncourage, AI_CV_Fly6 jump AI_CV_Fly5 AI_CV_Fly4: @ 81DBAEA - get_type 1 + get_type ENEMY_TYPE2 if_equal TYPE_ICE, AI_CV_Fly6 - get_type 3 + get_type PLAYER_TYPE2 if_equal TYPE_ICE, AI_CV_Fly6 AI_CV_Fly5: @ 81DBAFA if_would_go_first USER, AI_CV_Fly_End get_move TARGET - get_move_effect + get_move_effect_from_result if_not_equal EFFECT_LOCK_ON, AI_CV_Fly6 jump AI_CV_Fly_End AI_CV_Fly6: @ 81DBB0E - if_random 80, AI_CV_Fly_End + if_random_less_than 80, AI_CV_Fly_End score +1 AI_CV_Fly_End: @ 81DBB16 @@ -2303,7 +2303,7 @@ AI_CV_FakeOut: @ 81DBB1B AI_CV_SpitUp: @ 81DBB1E get_stockpile_count USER if_less_than 2, AI_CV_SpitUp_End - if_random 80, AI_CV_SpitUp_End + if_random_less_than 80, AI_CV_SpitUp_End score +2 AI_CV_SpitUp_End: @ 81DBB2E @@ -2342,7 +2342,7 @@ AI_CV_FocusPunch: @ 81DBB65 if_status2 TARGET, S_CONFUSED, AI_CV_FocusPunch3 is_first_turn USER if_not_equal 0, AI_CV_FocusPunch_End - if_random 100, AI_CV_FocusPunch_End + if_random_less_than 100, AI_CV_FocusPunch_End score +1 jump AI_CV_FocusPunch_End @@ -2351,7 +2351,7 @@ AI_CV_FocusPunch2: @ 81DBBA4 jump AI_CV_FocusPunch_End AI_CV_FocusPunch3: @ 81DBBAB - if_random 100, AI_CV_FocusPunch_End + if_random_less_than 100, AI_CV_FocusPunch_End AI_CV_FocusPunch_ScoreUp1: @ 81DBBB1 score +1 @@ -2387,7 +2387,7 @@ AI_CV_Trick3: @ 81DBBE1 AI_CV_Trick4: @ 81DBBF3 get_hold_effect TARGET if_in_bytes AI_CV_Trick_EffectsToEncourage, AI_CV_Trick2 - if_random 50, AI_CV_Trick_End + if_random_less_than 50, AI_CV_Trick_End score +2 AI_CV_Trick_End: @ 81DBC06 @@ -2418,7 +2418,7 @@ AI_CV_ChangeSelfAbility2: @ 81DBC27 jump AI_CV_ChangeSelfAbility_End AI_CV_ChangeSelfAbility3: @ 81DBC2E - if_random 50, AI_CV_ChangeSelfAbility_End + if_random_less_than 50, AI_CV_ChangeSelfAbility_End score +2 AI_CV_ChangeSelfAbility_End: @ 81DBC36 @@ -2462,21 +2462,21 @@ AI_CV_Superpower_End: @ 81DBC77 AI_CV_MagicCoat: @ 81DBC78 if_hp_more_than TARGET, 30, AI_CV_MagicCoat2 - if_random 100, AI_CV_MagicCoat2 + if_random_less_than 100, AI_CV_MagicCoat2 score -1 AI_CV_MagicCoat2: @ 81DBC87 is_first_turn USER if_equal 0, AI_CV_MagicCoat4 - if_random 150, AI_CV_MagicCoat_End + if_random_less_than 150, AI_CV_MagicCoat_End score +1 jump AI_CV_MagicCoat_End AI_CV_MagicCoat3: @ unreferenced - if_random 50, AI_CV_MagicCoat_End + if_random_less_than 50, AI_CV_MagicCoat_End AI_CV_MagicCoat4: @ 81DBCA2 - if_random 30, AI_CV_MagicCoat_End + if_random_less_than 30, AI_CV_MagicCoat_End score -1 AI_CV_MagicCoat_End: @ 81DBCAA @@ -2485,7 +2485,7 @@ AI_CV_MagicCoat_End: @ 81DBCAA AI_CV_Recycle: @ 81DBCAB get_item USER if_not_in_bytes AI_CV_Recycle_ItemsToEncourage, AI_CV_Recycle_ScoreDown2 - if_random 50, AI_CV_Recycle_End + if_random_less_than 50, AI_CV_Recycle_End score +1 jump AI_CV_Recycle_End @@ -2505,7 +2505,7 @@ AI_CV_Revenge: @ 81DBCCA if_status TARGET, SLP, AI_CV_Revenge_ScoreDown2 if_status2 TARGET, S_INFATUATED, AI_CV_Revenge_ScoreDown2 if_status2 TARGET, S_CONFUSED, AI_CV_Revenge_ScoreDown2 - if_random 180, AI_CV_Revenge_ScoreDown2 + if_random_less_than 180, AI_CV_Revenge_ScoreDown2 score +2 jump AI_CV_Revenge_End @@ -2529,7 +2529,7 @@ AI_CV_KnockOff: @ 81DBD0A if_hp_less_than TARGET, 30, AI_CV_KnockOff_End is_first_turn USER if_more_than 0, AI_CV_KnockOff_End - if_random 180, AI_CV_KnockOff_End + if_random_less_than 180, AI_CV_KnockOff_End score +1 AI_CV_KnockOff_End: @ 81DBD21 @@ -2572,7 +2572,7 @@ AI_CV_Eruption_End: @ 81DBD75 AI_CV_Imprison: @ 81DBD76 is_first_turn USER if_more_than 0, AI_CV_Imprison_End - if_random 100, AI_CV_Imprison_End + if_random_less_than 100, AI_CV_Imprison_End score +2 AI_CV_Imprison_End: @ 81DBD86 @@ -2591,11 +2591,11 @@ AI_CV_Refresh_End: @ 81DBD95 AI_CV_Snatch: @ 81DBD96 is_first_turn USER if_equal 1, AI_CV_Snatch3 - if_random 30, AI_CV_Snatch_End + if_random_less_than 30, AI_CV_Snatch_End if_would_go_first USER, AI_CV_Snatch2 if_hp_not_equal USER, 100, AI_CV_Snatch5 if_hp_less_than TARGET, 70, AI_CV_Snatch5 - if_random 60, AI_CV_Snatch_End + if_random_less_than 60, AI_CV_Snatch_End jump AI_CV_Snatch5 AI_CV_Snatch2: @ 81DBDC3 @@ -2605,17 +2605,17 @@ AI_CV_Snatch2: @ 81DBDC3 jump AI_CV_Snatch4 AI_CV_Snatch3: @ 81DBDDD - if_random 150, AI_CV_Snatch_End + if_random_less_than 150, AI_CV_Snatch_End score +2 jump AI_CV_Snatch_End AI_CV_Snatch4: @ 81DBDEA - if_random 230, AI_CV_Snatch5 + if_random_less_than 230, AI_CV_Snatch5 score +1 jump AI_CV_Snatch_End AI_CV_Snatch5: @ 81DBDF7 - if_random 30, AI_CV_Snatch_End + if_random_less_than 30, AI_CV_Snatch_End score -2 AI_CV_Snatch_End: @ 81DBDFF @@ -2623,9 +2623,9 @@ AI_CV_Snatch_End: @ 81DBDFF AI_CV_MudSport: @ 81DBE00 if_hp_less_than USER, 50, AI_CV_MudSport_ScoreDown1 - get_type 0 + get_type ENEMY_TYPE1 if_equal TYPE_ELECTRIC, AI_CV_MudSport2 - get_type 2 + get_type PLAYER_TYPE1 if_equal TYPE_ELECTRIC, AI_CV_MudSport2 jump AI_CV_MudSport_ScoreDown1 @@ -2657,9 +2657,9 @@ AI_CV_Overheat_End: @ 81DBE4D AI_CV_WaterSport: @ 81DBE4E if_hp_less_than USER, 50, AI_CV_WaterSport_ScoreDown1 - get_type 0 + get_type ENEMY_TYPE1 if_equal TYPE_FIRE, AI_CV_WaterSport2 - get_type 2 + get_type PLAYER_TYPE1 if_equal TYPE_FIRE, AI_CV_WaterSport2 jump AI_CV_WaterSport_ScoreDown1 @@ -2676,12 +2676,12 @@ AI_CV_WaterSport_End: @ 81DBE73 AI_CV_DragonDance: @ 81DBE74 if_would_go_first USER, AI_CV_DragonDance2 if_hp_more_than USER, 50, AI_CV_DragonDance_End - if_random 70, AI_CV_DragonDance_End + if_random_less_than 70, AI_CV_DragonDance_End score -1 jump AI_CV_DragonDance_End AI_CV_DragonDance2: @ 81DBE8E - if_random 128, AI_CV_DragonDance_End + if_random_less_than 128, AI_CV_DragonDance_End score +1 AI_CV_DragonDance_End: @ 81DBE96 @@ -2709,7 +2709,7 @@ AI_SetupFirstTurn: @ 81DBEB5 if_not_equal 0, AI_SetupFirstTurn_End get_effect if_not_in_bytes AI_SetupFirstTurn_SetupEffectsToEncourage, AI_SetupFirstTurn_End - if_random 80, AI_SetupFirstTurn_End + if_random_less_than 80, AI_SetupFirstTurn_End score +2 AI_SetupFirstTurn_End: @ 81DBECE @@ -2776,7 +2776,7 @@ AI_SetupFirstTurn_SetupEffectsToEncourage: @ 81DBECF AI_PreferStrongestMove: @ 81DBF07 is_most_powerful_move if_not_equal 0, AI_PreferStrongestMove_End - if_random 100, AI_PreferStrongestMove_End + if_random_less_than 100, AI_PreferStrongestMove_End score +2 AI_PreferStrongestMove_End: @ 81DBF16 @@ -2785,7 +2785,7 @@ AI_PreferStrongestMove_End: @ 81DBF16 AI_Risky: @ 81DBF17 get_effect if_not_in_bytes AI_Risky_EffectsToEncourage, AI_Risky_End - if_random 128, AI_Risky_End + if_random_less_than 128, AI_Risky_End score +2 AI_Risky_End: @ 81DBF29 @@ -2819,10 +2819,10 @@ AI_PreferBatonPass: @ 81DBF3E is_most_powerful_move if_not_equal 0, AI_PreferBatonPass_End if_move_effect USER, EFFECT_BATON_PASS, AI_PreferBatonPass_GoForBatonPass - if_random 80, AI_Risky_End + if_random_less_than 80, AI_Risky_End AI_PreferBatonPass_GoForBatonPass: @ 81DBF5A - if_random 20, AI_Risky_End + if_random_less_than 20, AI_Risky_End score +3 AI_PreferBatonPass_End: @ 81DBF62 @@ -2849,7 +2849,7 @@ AI_HPAware_UserHasMediumHP: @ 81DBF90 jump AI_HPAware_ConsiderTarget AI_HPAware_TryToDiscourage: @ 81DBF9F - if_random 50, AI_HPAware_ConsiderTarget + if_random_less_than 50, AI_HPAware_ConsiderTarget score -2 AI_HPAware_ConsiderTarget: @ 81DBFA7 @@ -2870,7 +2870,7 @@ AI_HPAware_TargetHasMediumHP: @ 81DBFD3 jump AI_HPAware_End AI_HPAware_TargetTryToDiscourage: @ 81DBFE2 - if_random 50, AI_HPAware_End + if_random_less_than 50, AI_HPAware_End score -2 AI_HPAware_End: @ 81DBFEA @@ -3121,7 +3121,7 @@ AI_Roaming_End: @ 81DC0FD end AI_Safari: @ 81DC0FE - if_random_2 AI_Safari_Flee + if_random_100 AI_Safari_Flee watch AI_Safari_Flee: @ 81DC104 diff --git a/data/battle_anim.s b/data/battle_anim.s index 49f286c60..ed880ba77 100644 --- a/data/battle_anim.s +++ b/data/battle_anim.s @@ -1049,53 +1049,3 @@ gBattleAnimBackgroundTable:: @ 837F374 .4byte gBattleAnimBackgroundImage_04, gBattleAnimBackgroundPalette_24, gBattleAnimBackgroundTilemap_05 .4byte gBattleAnimBackgroundImage_04, gBattleAnimBackgroundPalette_24, gBattleAnimBackgroundTilemap_06 - .align 2 -gUnknown_0837F4B8:: @ 837F4B8 - .4byte ma00_load_graphics - .4byte ma01_080728D0 - .4byte ma02_instanciate_template - .4byte sub_8075BB8 - .4byte ma04_wait_countdown - .4byte sub_8075C74 - .4byte nullsub_53 - .4byte nullsub_88 - .4byte sub_8075CB0 - .4byte ma09_play_sound - .4byte sub_8075DE0 - .4byte ma0B_0807324C - .4byte sub_8076A3C - .4byte sub_8076AA0 - .4byte ma0E_call - .4byte sub_8076AF0 - .4byte ma10_080736AC - .4byte ma11_if_else - .4byte ma12_cond_if - .4byte sub_8076BBC - .4byte ma14_load_background - .4byte ma15_load_battle_screen_elements - .4byte ma16_wait_for_battle_screen_elements_s2 - .4byte sub_8076F44 - .4byte ma18_load_background_probably - .4byte ma19_08073BC8 - .4byte ma1A_8073C00 - .4byte ma1B_8073C2C - .4byte ma1C_8073ED0 - .4byte ma1D_08073FB4 - .4byte sub_8076A78 - .4byte sub_8077610 - .4byte ma20_wait_for_something - .4byte ma21_08074164 - .4byte sub_80767C4 - .4byte ma23_8073484 - .4byte sub_807775C - .4byte sub_8076C4C - .4byte sub_8077320 - .4byte sub_80773B4 - .4byte sub_807779C - .4byte sub_8077808 - .4byte sub_807784C - .4byte ma2B_make_side_invisible - .4byte ma2C_make_side_visible - .4byte sub_807794C - .4byte sub_80779FC - .4byte ma2F_stop_music diff --git a/data/battle_anim_80CA710.s b/data/battle_anim_80CA710.s index e138d641e..88d88d99f 100644 --- a/data/battle_anim_80CA710.s +++ b/data/battle_anim_80CA710.s @@ -483,9 +483,18 @@ gSpriteAffineAnimTable_83D67E4:: @ 83D67E4 gBattleAnimSpriteTemplate_83D67F4:: @ 83D67F4 spr_template 10224, 10224, gOamData_837DF94, gSpriteAnimTable_83D66B8, NULL, gSpriteAffineAnimTable_83D67E4, sub_80CBBF0 - .align 2 gUnknown_083D680C:: @ 83D680C - .incbin "baserom.gba", 0x003d680c, 0x24 + .byte 5, 24, 1 + .byte 0, 4, 0 + .byte 8, 16, -1 + .byte 0, 2, 0 + .byte 8, 16, 1 + .byte 0, 2, 0 + .byte 8, 16, 1 + .byte 0, 2, 0 + .byte 8, 16, 1 + .byte 0, 16, 0 + .byte 0, 0, 127 .align 2 gSpriteAnim_83D6830:: @ 83D6830 @@ -596,9 +605,15 @@ gBattleAnimSpriteTemplate_83D6954:: @ 83D6954 gBattleAnimSpriteTemplate_83D696C:: @ 83D696C spr_template 10271, 10271, gOamData_837DF8C, gDummySpriteAnimTable, NULL, gSpriteAffineAnimTable_83D6938, sub_80CC474 - .align 2 + .align 1 gUnknown_083D6984:: @ 83D6984 - .incbin "baserom.gba", 0x003d6984, 0x10 + .2byte 0x1F + .2byte 0x27F + .2byte 0x3FF + .2byte 0x3E0 + .2byte 0x7DC5 + .2byte 0x7D56 + .2byte 0x7EB6 .align 2 gBattleAnimSpriteTemplate_83D6994:: @ 83D6994 @@ -895,8 +910,10 @@ gSpriteAffineAnim_83D6D2C:: @ 83D6D2C obj_rot_scal_anim_frame 0x8, 0x8, 1, 24 obj_rot_scal_anim_end - .align 2 - .incbin "baserom.gba", 0x003d6d44, 0x18 +@ unused + obj_rot_scal_anim_loop 0 + obj_rot_scal_anim_frame 0x0, 0x0, 1, 24 + obj_rot_scal_anim_loop 10 .align 2 gSpriteAffineAnim_83D6D5C:: @ 83D6D5C @@ -904,8 +921,10 @@ gSpriteAffineAnim_83D6D5C:: @ 83D6D5C obj_rot_scal_anim_frame 0x8, 0x8, -1, 24 obj_rot_scal_anim_end - .align 2 - .incbin "baserom.gba", 0x003d6d74, 0x18 +@ unused + obj_rot_scal_anim_loop 0 + obj_rot_scal_anim_frame 0x0, 0x0, -1, 24 + obj_rot_scal_anim_loop 10 .align 2 gSpriteAffineAnimTable_83D6D8C:: @ 83D6D8C @@ -924,9 +943,11 @@ gBattleAnimSpriteTemplate_83D6DAC:: @ 83D6DAC gBattleAnimSpriteTemplate_83D6DC4:: @ 83D6DC4 spr_template 10014, 10014, gOamData_837DF2C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80CD6CC - .align 2 gUnknown_083D6DDC:: @ 83D6DDC - .incbin "baserom.gba", 0x003d6ddc, 0x8 + .byte 64, 64 + .byte 0,-64 + .byte -64, 64 + .byte 32,-32 .align 2 gBattleAnimSpriteTemplate_83D6DE4:: @ 83D6DE4 @@ -1197,7 +1218,10 @@ gBattleAnimSpriteTemplate_83D7114:: @ 83D7114 .align 2 gUnknown_083D712C:: @ 83D712C - .incbin "baserom.gba", 0x003d712c, 0x30 + .2byte 10072,0x7FFF,0x735F,0x6ADF,0x623F,0x59BF + .2byte 10097,0x7FFF,0x6BF9,0x57F4,0x43EF,0x33EA + .2byte 10185,0x7FFF,0x63FF,0x47FF,0x2BFF,0x0FFF + .2byte 10175,0x7FFF,0x7F9A,0x7F55,0x7F10,0x7ECC .align 2 gBattleAnimSpriteTemplate_83D715C:: @ 83D715C diff --git a/data/battle_party_menu.s b/data/battle_party_menu.s deleted file mode 100644 index ce6b49927..000000000 --- a/data/battle_party_menu.s +++ /dev/null @@ -1,34 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - - .align 2 -gUnknown_083B5FCC:: @ 83B5FCC - .4byte OtherText_Summary, BattlePokemonMenu_Summary - .4byte gOtherText_CancelNoTerminator, BattlePokemonMenu_Cancel - .4byte OtherText_Shift, BattlePokemonMenu_Shift - .4byte OtherText_SendOut, BattlePokemonMenu_Shift - -Unknown_83B5FEC: @ 83B5FEC - .byte 2, 0, 1 - -Unknown_83B5FEF: @ 83B5FEF - .byte 3, 0, 1 - -Unknown_83B5FF2: @ 83B5FF2 - .byte 0, 1 - - .align 2 -gUnknown_083B5FF4:: @ 83B5FF4 - .byte 3, 9 - .space 2 - .4byte Unknown_83B5FEC - - .byte 3, 9 - .space 2 - .4byte Unknown_83B5FEF - - .byte 2, 9 - .space 2 - .4byte Unknown_83B5FF2 diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s index f65807005..32d8e6da5 100644 --- a/data/battle_scripts_1.s +++ b/data/battle_scripts_1.s @@ -690,7 +690,7 @@ BattleScript_1D7377: @ 81D7377 resultmessage waitmessage 64 jumpifbyte 4, 0x2024c68, 41, BattleScript_1D7396 - copyarray 0x30041c0, 0x20160e0, 6 + copyarray gUnknown_030041C0, 0x20160e0, 6 printstring BATTLE_TEXT_HitMulti waitmessage 64 @@ -1493,7 +1493,7 @@ BattleScript_1D7C90: @ 81D7C90 resultmessage waitmessage 64 jumpifbyte 0, 0x20160e4, 0, BattleScript_1D7CAF - copyarray 0x30041c0, 0x20160e0, 6 + copyarray gUnknown_030041C0, 0x20160e0, 6 printstring BATTLE_TEXT_HitMulti waitmessage 64 diff --git a/data/battle_scripts_2.s b/data/battle_scripts_2.s index 4bee5101c..0ed54d11e 100644 --- a/data/battle_scripts_2.s +++ b/data/battle_scripts_2.s @@ -38,7 +38,7 @@ gUnknown_081D9E98:: @ 81D9E98 .4byte BattleScript_1DA00A BattleScript_1D9EA8: @ 81D9EA8 - jumpifhalfword 4, 0x20239f8, 512, BattleScript_1D9EB8 + jumpifhalfword 4, gBattleTypeFlags, 512, BattleScript_1D9EB8 printstring BATTLE_TEXT_Used1 pokemoncatchfunction @@ -52,7 +52,7 @@ BattleScript_1D9EBC: @ 81D9EBC pokemoncatchfunction gUnknown_081D9EC2:: @ 81D9EC2 - jumpifhalfword 0, 0x2024c04, 5, BattleScript_1D9ED0 + jumpifhalfword 0, gUnknown_02024C04, 5, BattleScript_1D9ED0 atk60 11 BattleScript_1D9ED0: @ 81D9ED0 @@ -60,35 +60,35 @@ BattleScript_1D9ED0: @ 81D9ED0 capturesomethingf1 BattleScript_1D9EE3 printstring BATTLE_TEXT_AddedToDex waitstateatk - setbyte 0x2024d1e, 0 + setbyte gUnknown_02024D1E, 0 capturesomethingf2 BattleScript_1D9EE3: @ 81D9EE3 printstring BATTLE_TEXT_GiveNickname waitstateatk - setbyte 0x2024d1e, 0 + setbyte gUnknown_02024D1E, 0 capturesomethingf3 BattleScript_1D9EF8 printstring BATTLE_TEXT_SentToPC waitmessage 64 BattleScript_1D9EF8: @ 81D9EF8 catchpoke - setbyte 0x2024d26, 7 + setbyte gUnknown_02024D26, 7 activesidesomething gUnknown_081D9F00:: @ 81D9F00 printstring BATTLE_TEXT_BallCaught2 - setbyte 0x2024d26, 7 + setbyte gUnknown_02024D26, 7 activesidesomething gUnknown_081D9F0A:: @ 81D9F0A printfromtable BattleTextList_4015E6 waitmessage 64 - jumpifbyte 5, 0x20239f8, 128, BattleScript_1D9F34 - jumpifbyte 1, 0x2038808, 0, BattleScript_1D9F34 + jumpifbyte 5, gBattleTypeFlags, 128, BattleScript_1D9F34 + jumpifbyte 1, gNumSafariBalls, 0, BattleScript_1D9F34 printstring BATTLE_TEXT_SafariOver waitmessage 64 - setbyte 0x2024d26, 8 + setbyte gUnknown_02024D26, 8 BattleScript_1D9F34: @ 81D9F34 atkf6 @@ -112,7 +112,7 @@ BattleScript_1D9F4F: @ 81D9F4F printstring BATTLE_TEXT_Used2 waitmessage 64 atk75 - orword 0x2024c6c, 0x100 + orword gUnknown_02024C6C, 0x100 graphicalhpupdate USER datahpupdate USER printstring BATTLE_TEXT_RestoredHealth @@ -161,7 +161,7 @@ BattleScript_1D9FBB: @ 81D9FBB BattleScript_1D9FDA: @ 81D9FDA atk54 17 - setbyte 0x2024d26, 4 + setbyte gUnknown_02024D26, 4 activesidesomething BattleScript_1D9FE4: @ 81D9FE4 diff --git a/data/battle_setup.s b/data/battle_setup.s deleted file mode 100644 index eb790edf4..000000000 --- a/data/battle_setup.s +++ /dev/null @@ -1,77 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - -gBattleTransitionTable_Wild:: @ 839ACF8 - .byte 8, 9, 5, 10, 0, 10, 7, 6 - -gBattleTransitionTable_Trainer:: @ 839AD00 - .byte 4, 11, 2, 3, 0, 10, 1, 6 - - .align 2 -gTrainerBattleSpecs_0:: @ 839AD08 - .4byte gTrainerBattleMode, 0 - .4byte gTrainerBattleOpponent, 1 - .4byte gTrainerMapObjectLocalId, 1 - .4byte gTrainerIntroSpeech, 2 - .4byte gTrainerDefeatSpeech, 2 - .4byte gTrainerVictorySpeech, 5 - .4byte gTrainerCannotBattleSpeech, 5 - .4byte gTrainerBattleEndScript, 5 - .4byte gTrainerBattleScriptReturnAddress, 6 - - .align 2 -gTrainerBattleSpecs_1:: @ 839AD50 - .4byte gTrainerBattleMode, 0 - .4byte gTrainerBattleOpponent, 1 - .4byte gTrainerMapObjectLocalId, 1 - .4byte gTrainerIntroSpeech, 2 - .4byte gTrainerDefeatSpeech, 2 - .4byte gTrainerVictorySpeech, 5 - .4byte gTrainerCannotBattleSpeech, 5 - .4byte gTrainerBattleEndScript, 2 - .4byte gTrainerBattleScriptReturnAddress, 6 - - .align 2 -gTrainerBattleSpecs_2:: @ 839AD98 - .4byte gTrainerBattleMode, 0 - .4byte gTrainerBattleOpponent, 1 - .4byte gTrainerMapObjectLocalId, 1 - .4byte gTrainerIntroSpeech, 2 - .4byte gTrainerDefeatSpeech, 2 - .4byte gTrainerVictorySpeech, 5 - .4byte gTrainerCannotBattleSpeech, 2 - .4byte gTrainerBattleEndScript, 5 - .4byte gTrainerBattleScriptReturnAddress, 6 - - .align 2 -gTrainerBattleSpecs_3:: @ 839ADE0 - .4byte gTrainerBattleMode, 0 - .4byte gTrainerBattleOpponent, 1 - .4byte gTrainerMapObjectLocalId, 1 - .4byte gTrainerIntroSpeech, 5 - .4byte gTrainerDefeatSpeech, 2 - .4byte gTrainerVictorySpeech, 5 - .4byte gTrainerCannotBattleSpeech, 5 - .4byte gTrainerBattleEndScript, 5 - .4byte gTrainerBattleScriptReturnAddress, 6 - - .align 2 -gTrainerBattleSpecs_4:: @ 839AE28 - .4byte gTrainerBattleMode, 0 - .4byte gTrainerBattleOpponent, 1 - .4byte gTrainerMapObjectLocalId, 1 - .4byte gTrainerIntroSpeech, 2 - .4byte gTrainerDefeatSpeech, 2 - .4byte gTrainerVictorySpeech, 5 - .4byte gTrainerCannotBattleSpeech, 2 - .4byte gTrainerBattleEndScript, 2 - .4byte gTrainerBattleScriptReturnAddress, 6 - -@ 839AE70 - .include "data/trainer_eye_trainers.inc" - - .align 2 -gBadgeFlags:: @ 839B1F0 - .2byte 0x0807, 0x0808, 0x0809, 0x080a, 0x080b, 0x080c, 0x080d, 0x080e diff --git a/data/berries.inc b/data/berries.inc deleted file mode 100644 index 7d7d3edd1..000000000 --- a/data/berries.inc +++ /dev/null @@ -1,689 +0,0 @@ - .align 2 -gBerries:: @ 83CD2CC - .string "CHERI$", 7 - .byte BERRY_FIRMNESS_SOFT - .2byte 20 @ size (in millimeters) - .byte 3 @ max yield - .byte 2 @ min yield - .4byte gBerryDescriptionPart1_Cheri - .4byte gBerryDescriptionPart2_Cheri - .byte 3 @ stage duration (in hours) - .byte 10 @ spicy - .byte 0 @ dry - .byte 0 @ sweet - .byte 0 @ bitter - .byte 0 @ sour - .byte 25 @ smoothness - .byte 0 @ padding - - .string "CHESTO$", 7 - .byte BERRY_FIRMNESS_SUPER_HARD - .2byte 80 @ size (in millimeters) - .byte 3 @ max yield - .byte 2 @ min yield - .4byte gBerryDescriptionPart1_Chesto - .4byte gBerryDescriptionPart2_Chesto - .byte 3 @ stage duration (in hours) - .byte 0 @ spicy - .byte 10 @ dry - .byte 0 @ sweet - .byte 0 @ bitter - .byte 0 @ sour - .byte 25 @ smoothness - .byte 0 @ padding - - .string "PECHA$", 7 - .byte BERRY_FIRMNESS_VERY_SOFT - .2byte 40 @ size (in millimeters) - .byte 3 @ max yield - .byte 2 @ min yield - .4byte gBerryDescriptionPart1_Pecha - .4byte gBerryDescriptionPart2_Pecha - .byte 3 @ stage duration (in hours) - .byte 0 @ spicy - .byte 0 @ dry - .byte 10 @ sweet - .byte 0 @ bitter - .byte 0 @ sour - .byte 25 @ smoothness - .byte 0 @ padding - - .string "RAWST$", 7 - .byte BERRY_FIRMNESS_HARD - .2byte 32 @ size (in millimeters) - .byte 3 @ max yield - .byte 2 @ min yield - .4byte gBerryDescriptionPart1_Rawst - .4byte gBerryDescriptionPart2_Rawst - .byte 3 @ stage duration (in hours) - .byte 0 @ spicy - .byte 0 @ dry - .byte 0 @ sweet - .byte 10 @ bitter - .byte 0 @ sour - .byte 25 @ smoothness - .byte 0 @ padding - - .string "ASPEAR$", 7 - .byte BERRY_FIRMNESS_SUPER_HARD - .2byte 50 @ size (in millimeters) - .byte 3 @ max yield - .byte 2 @ min yield - .4byte gBerryDescriptionPart1_Aspear - .4byte gBerryDescriptionPart2_Aspear - .byte 3 @ stage duration (in hours) - .byte 0 @ spicy - .byte 0 @ dry - .byte 0 @ sweet - .byte 0 @ bitter - .byte 10 @ sour - .byte 25 @ smoothness - .byte 0 @ padding - - .string "LEPPA$", 7 - .byte BERRY_FIRMNESS_VERY_HARD - .2byte 28 @ size (in millimeters) - .byte 3 @ max yield - .byte 2 @ min yield - .4byte gBerryDescriptionPart1_Leppa - .4byte gBerryDescriptionPart2_Leppa - .byte 4 @ stage duration (in hours) - .byte 10 @ spicy - .byte 0 @ dry - .byte 10 @ sweet - .byte 10 @ bitter - .byte 10 @ sour - .byte 20 @ smoothness - .byte 0 @ padding - - .string "ORAN$", 7 - .byte BERRY_FIRMNESS_SUPER_HARD - .2byte 35 @ size (in millimeters) - .byte 3 @ max yield - .byte 2 @ min yield - .4byte gBerryDescriptionPart1_Oran - .4byte gBerryDescriptionPart2_Oran - .byte 3 @ stage duration (in hours) - .byte 10 @ spicy - .byte 10 @ dry - .byte 10 @ sweet - .byte 10 @ bitter - .byte 10 @ sour - .byte 20 @ smoothness - .byte 0 @ padding - - .string "PERSIM$", 7 - .byte BERRY_FIRMNESS_HARD - .2byte 47 @ size (in millimeters) - .byte 3 @ max yield - .byte 2 @ min yield - .4byte gBerryDescriptionPart1_Persim - .4byte gBerryDescriptionPart2_Persim - .byte 3 @ stage duration (in hours) - .byte 10 @ spicy - .byte 10 @ dry - .byte 10 @ sweet - .byte 10 @ bitter - .byte 10 @ sour - .byte 20 @ smoothness - .byte 0 @ padding - - .string "LUM$", 7 - .byte BERRY_FIRMNESS_SUPER_HARD - .2byte 34 @ size (in millimeters) - .byte 2 @ max yield - .byte 1 @ min yield - .4byte gBerryDescriptionPart1_Lum - .4byte gBerryDescriptionPart2_Lum - .byte 12 @ stage duration (in hours) - .byte 10 @ spicy - .byte 10 @ dry - .byte 10 @ sweet - .byte 10 @ bitter - .byte 10 @ sour - .byte 20 @ smoothness - .byte 0 @ padding - - .string "SITRUS$", 7 - .byte BERRY_FIRMNESS_VERY_HARD - .2byte 95 @ size (in millimeters) - .byte 3 @ max yield - .byte 2 @ min yield - .4byte gBerryDescriptionPart1_Sitrus - .4byte gBerryDescriptionPart2_Sitrus - .byte 6 @ stage duration (in hours) - .byte 10 @ spicy - .byte 10 @ dry - .byte 10 @ sweet - .byte 10 @ bitter - .byte 10 @ sour - .byte 20 @ smoothness - .byte 0 @ padding - - .string "FIGY$", 7 - .byte BERRY_FIRMNESS_SOFT - .2byte 100 @ size (in millimeters) - .byte 3 @ max yield - .byte 2 @ min yield - .4byte gBerryDescriptionPart1_Figy - .4byte gBerryDescriptionPart2_Figy - .byte 6 @ stage duration (in hours) - .byte 10 @ spicy - .byte 0 @ dry - .byte 0 @ sweet - .byte 0 @ bitter - .byte 0 @ sour - .byte 25 @ smoothness - .byte 0 @ padding - - .string "WIKI$", 7 - .byte BERRY_FIRMNESS_HARD - .2byte 115 @ size (in millimeters) - .byte 3 @ max yield - .byte 2 @ min yield - .4byte gBerryDescriptionPart1_Wiki - .4byte gBerryDescriptionPart2_Wiki - .byte 6 @ stage duration (in hours) - .byte 0 @ spicy - .byte 10 @ dry - .byte 0 @ sweet - .byte 0 @ bitter - .byte 0 @ sour - .byte 25 @ smoothness - .byte 0 @ padding - - .string "MAGO$", 7 - .byte BERRY_FIRMNESS_HARD - .2byte 126 @ size (in millimeters) - .byte 3 @ max yield - .byte 2 @ min yield - .4byte gBerryDescriptionPart1_Mago - .4byte gBerryDescriptionPart2_Mago - .byte 6 @ stage duration (in hours) - .byte 0 @ spicy - .byte 0 @ dry - .byte 10 @ sweet - .byte 0 @ bitter - .byte 0 @ sour - .byte 25 @ smoothness - .byte 0 @ padding - - .string "AGUAV$", 7 - .byte BERRY_FIRMNESS_SUPER_HARD - .2byte 64 @ size (in millimeters) - .byte 3 @ max yield - .byte 2 @ min yield - .4byte gBerryDescriptionPart1_Aguav - .4byte gBerryDescriptionPart2_Aguav - .byte 6 @ stage duration (in hours) - .byte 0 @ spicy - .byte 0 @ dry - .byte 0 @ sweet - .byte 10 @ bitter - .byte 0 @ sour - .byte 25 @ smoothness - .byte 0 @ padding - - .string "IAPAPA$", 7 - .byte BERRY_FIRMNESS_SOFT - .2byte 223 @ size (in millimeters) - .byte 3 @ max yield - .byte 2 @ min yield - .4byte gBerryDescriptionPart1_Iapapa - .4byte gBerryDescriptionPart2_Iapapa - .byte 6 @ stage duration (in hours) - .byte 0 @ spicy - .byte 0 @ dry - .byte 0 @ sweet - .byte 0 @ bitter - .byte 10 @ sour - .byte 25 @ smoothness - .byte 0 @ padding - - .string "RAZZ$", 7 - .byte BERRY_FIRMNESS_VERY_HARD - .2byte 120 @ size (in millimeters) - .byte 6 @ max yield - .byte 3 @ min yield - .4byte gBerryDescriptionPart1_Razz - .4byte gBerryDescriptionPart2_Razz - .byte 1 @ stage duration (in hours) - .byte 10 @ spicy - .byte 10 @ dry - .byte 0 @ sweet - .byte 0 @ bitter - .byte 0 @ sour - .byte 20 @ smoothness - .byte 0 @ padding - - .string "BLUK$", 7 - .byte BERRY_FIRMNESS_SOFT - .2byte 108 @ size (in millimeters) - .byte 6 @ max yield - .byte 3 @ min yield - .4byte gBerryDescriptionPart1_Bluk - .4byte gBerryDescriptionPart2_Bluk - .byte 1 @ stage duration (in hours) - .byte 0 @ spicy - .byte 10 @ dry - .byte 10 @ sweet - .byte 0 @ bitter - .byte 0 @ sour - .byte 20 @ smoothness - .byte 0 @ padding - - .string "NANAB$", 7 - .byte BERRY_FIRMNESS_VERY_HARD - .2byte 77 @ size (in millimeters) - .byte 6 @ max yield - .byte 3 @ min yield - .4byte gBerryDescriptionPart1_Nanab - .4byte gBerryDescriptionPart2_Nanab - .byte 1 @ stage duration (in hours) - .byte 0 @ spicy - .byte 0 @ dry - .byte 10 @ sweet - .byte 10 @ bitter - .byte 0 @ sour - .byte 20 @ smoothness - .byte 0 @ padding - - .string "WEPEAR$", 7 - .byte BERRY_FIRMNESS_SUPER_HARD - .2byte 74 @ size (in millimeters) - .byte 6 @ max yield - .byte 3 @ min yield - .4byte gBerryDescriptionPart1_Wepear - .4byte gBerryDescriptionPart2_Wepear - .byte 1 @ stage duration (in hours) - .byte 0 @ spicy - .byte 0 @ dry - .byte 0 @ sweet - .byte 10 @ bitter - .byte 10 @ sour - .byte 20 @ smoothness - .byte 0 @ padding - - .string "PINAP$", 7 - .byte BERRY_FIRMNESS_HARD - .2byte 80 @ size (in millimeters) - .byte 6 @ max yield - .byte 3 @ min yield - .4byte gBerryDescriptionPart1_Pinap - .4byte gBerryDescriptionPart2_Pinap - .byte 1 @ stage duration (in hours) - .byte 10 @ spicy - .byte 0 @ dry - .byte 0 @ sweet - .byte 0 @ bitter - .byte 10 @ sour - .byte 20 @ smoothness - .byte 0 @ padding - - .string "POMEG$", 7 - .byte BERRY_FIRMNESS_VERY_HARD - .2byte 135 @ size (in millimeters) - .byte 6 @ max yield - .byte 2 @ min yield - .4byte gBerryDescriptionPart1_Pomeg - .4byte gBerryDescriptionPart2_Pomeg - .byte 3 @ stage duration (in hours) - .byte 10 @ spicy - .byte 0 @ dry - .byte 10 @ sweet - .byte 10 @ bitter - .byte 0 @ sour - .byte 20 @ smoothness - .byte 0 @ padding - - .string "KELPSY$", 7 - .byte BERRY_FIRMNESS_HARD - .2byte 150 @ size (in millimeters) - .byte 6 @ max yield - .byte 2 @ min yield - .4byte gBerryDescriptionPart1_Kelpsy - .4byte gBerryDescriptionPart2_Kelpsy - .byte 3 @ stage duration (in hours) - .byte 0 @ spicy - .byte 10 @ dry - .byte 0 @ sweet - .byte 10 @ bitter - .byte 10 @ sour - .byte 20 @ smoothness - .byte 0 @ padding - - .string "QUALOT$", 7 - .byte BERRY_FIRMNESS_HARD - .2byte 110 @ size (in millimeters) - .byte 6 @ max yield - .byte 2 @ min yield - .4byte gBerryDescriptionPart1_Qualot - .4byte gBerryDescriptionPart2_Qualot - .byte 3 @ stage duration (in hours) - .byte 10 @ spicy - .byte 0 @ dry - .byte 10 @ sweet - .byte 0 @ bitter - .byte 10 @ sour - .byte 20 @ smoothness - .byte 0 @ padding - - .string "HONDEW$", 7 - .byte BERRY_FIRMNESS_HARD - .2byte 162 @ size (in millimeters) - .byte 6 @ max yield - .byte 2 @ min yield - .4byte gBerryDescriptionPart1_Hondew - .4byte gBerryDescriptionPart2_Hondew - .byte 3 @ stage duration (in hours) - .byte 10 @ spicy - .byte 10 @ dry - .byte 0 @ sweet - .byte 10 @ bitter - .byte 0 @ sour - .byte 20 @ smoothness - .byte 0 @ padding - - .string "GREPA$", 7 - .byte BERRY_FIRMNESS_SOFT - .2byte 149 @ size (in millimeters) - .byte 6 @ max yield - .byte 2 @ min yield - .4byte gBerryDescriptionPart1_Grepa - .4byte gBerryDescriptionPart2_Grepa - .byte 3 @ stage duration (in hours) - .byte 0 @ spicy - .byte 10 @ dry - .byte 10 @ sweet - .byte 0 @ bitter - .byte 10 @ sour - .byte 20 @ smoothness - .byte 0 @ padding - - .string "TAMATO$", 7 - .byte BERRY_FIRMNESS_SOFT - .2byte 200 @ size (in millimeters) - .byte 4 @ max yield - .byte 2 @ min yield - .4byte gBerryDescriptionPart1_Tamato - .4byte gBerryDescriptionPart2_Tamato - .byte 6 @ stage duration (in hours) - .byte 20 @ spicy - .byte 10 @ dry - .byte 0 @ sweet - .byte 0 @ bitter - .byte 0 @ sour - .byte 30 @ smoothness - .byte 0 @ padding - - .string "CORNN$", 7 - .byte BERRY_FIRMNESS_HARD - .2byte 75 @ size (in millimeters) - .byte 4 @ max yield - .byte 2 @ min yield - .4byte gBerryDescriptionPart1_Cornn - .4byte gBerryDescriptionPart2_Cornn - .byte 6 @ stage duration (in hours) - .byte 0 @ spicy - .byte 20 @ dry - .byte 10 @ sweet - .byte 0 @ bitter - .byte 0 @ sour - .byte 30 @ smoothness - .byte 0 @ padding - - .string "MAGOST$", 7 - .byte BERRY_FIRMNESS_HARD - .2byte 140 @ size (in millimeters) - .byte 4 @ max yield - .byte 2 @ min yield - .4byte gBerryDescriptionPart1_Magost - .4byte gBerryDescriptionPart2_Magost - .byte 6 @ stage duration (in hours) - .byte 0 @ spicy - .byte 0 @ dry - .byte 20 @ sweet - .byte 10 @ bitter - .byte 0 @ sour - .byte 30 @ smoothness - .byte 0 @ padding - - .string "RABUTA$", 7 - .byte BERRY_FIRMNESS_SOFT - .2byte 226 @ size (in millimeters) - .byte 4 @ max yield - .byte 2 @ min yield - .4byte gBerryDescriptionPart1_Rabuta - .4byte gBerryDescriptionPart2_Rabuta - .byte 6 @ stage duration (in hours) - .byte 0 @ spicy - .byte 0 @ dry - .byte 0 @ sweet - .byte 20 @ bitter - .byte 10 @ sour - .byte 30 @ smoothness - .byte 0 @ padding - - .string "NOMEL$", 7 - .byte BERRY_FIRMNESS_SUPER_HARD - .2byte 285 @ size (in millimeters) - .byte 4 @ max yield - .byte 2 @ min yield - .4byte gBerryDescriptionPart1_Nomel - .4byte gBerryDescriptionPart2_Nomel - .byte 6 @ stage duration (in hours) - .byte 10 @ spicy - .byte 0 @ dry - .byte 0 @ sweet - .byte 0 @ bitter - .byte 20 @ sour - .byte 30 @ smoothness - .byte 0 @ padding - - .string "SPELON$", 7 - .byte BERRY_FIRMNESS_SOFT - .2byte 133 @ size (in millimeters) - .byte 2 @ max yield - .byte 1 @ min yield - .4byte gBerryDescriptionPart1_Spelon - .4byte gBerryDescriptionPart2_Spelon - .byte 18 @ stage duration (in hours) - .byte 40 @ spicy - .byte 10 @ dry - .byte 0 @ sweet - .byte 0 @ bitter - .byte 0 @ sour - .byte 70 @ smoothness - .byte 0 @ padding - - .string "PAMTRE$", 7 - .byte BERRY_FIRMNESS_VERY_SOFT - .2byte 244 @ size (in millimeters) - .byte 2 @ max yield - .byte 1 @ min yield - .4byte gBerryDescriptionPart1_Pamtre - .4byte gBerryDescriptionPart2_Pamtre - .byte 18 @ stage duration (in hours) - .byte 0 @ spicy - .byte 40 @ dry - .byte 10 @ sweet - .byte 0 @ bitter - .byte 0 @ sour - .byte 70 @ smoothness - .byte 0 @ padding - - .string "WATMEL$", 7 - .byte BERRY_FIRMNESS_SOFT - .2byte 250 @ size (in millimeters) - .byte 2 @ max yield - .byte 1 @ min yield - .4byte gBerryDescriptionPart1_Watmel - .4byte gBerryDescriptionPart2_Watmel - .byte 18 @ stage duration (in hours) - .byte 0 @ spicy - .byte 0 @ dry - .byte 40 @ sweet - .byte 10 @ bitter - .byte 0 @ sour - .byte 70 @ smoothness - .byte 0 @ padding - - .string "DURIN$", 7 - .byte BERRY_FIRMNESS_HARD - .2byte 280 @ size (in millimeters) - .byte 2 @ max yield - .byte 1 @ min yield - .4byte gBerryDescriptionPart1_Durin - .4byte gBerryDescriptionPart2_Durin - .byte 18 @ stage duration (in hours) - .byte 0 @ spicy - .byte 0 @ dry - .byte 0 @ sweet - .byte 40 @ bitter - .byte 10 @ sour - .byte 70 @ smoothness - .byte 0 @ padding - - .string "BELUE$", 7 - .byte BERRY_FIRMNESS_VERY_SOFT - .2byte 300 @ size (in millimeters) - .byte 2 @ max yield - .byte 1 @ min yield - .4byte gBerryDescriptionPart1_Belue - .4byte gBerryDescriptionPart2_Belue - .byte 18 @ stage duration (in hours) - .byte 10 @ spicy - .byte 0 @ dry - .byte 0 @ sweet - .byte 0 @ bitter - .byte 40 @ sour - .byte 70 @ smoothness - .byte 0 @ padding - - .string "LIECHI$", 7 - .byte BERRY_FIRMNESS_VERY_HARD - .2byte 111 @ size (in millimeters) - .byte 2 @ max yield - .byte 1 @ min yield - .4byte gBerryDescriptionPart1_Liechi - .4byte gBerryDescriptionPart2_Liechi - .byte 24 @ stage duration (in hours) - .byte 40 @ spicy - .byte 0 @ dry - .byte 40 @ sweet - .byte 0 @ bitter - .byte 10 @ sour - .byte 80 @ smoothness - .byte 0 @ padding - - .string "GANLON$", 7 - .byte BERRY_FIRMNESS_VERY_HARD - .2byte 33 @ size (in millimeters) - .byte 2 @ max yield - .byte 1 @ min yield - .4byte gBerryDescriptionPart1_Ganlon - .4byte gBerryDescriptionPart2_Ganlon - .byte 24 @ stage duration (in hours) - .byte 0 @ spicy - .byte 40 @ dry - .byte 0 @ sweet - .byte 40 @ bitter - .byte 0 @ sour - .byte 80 @ smoothness - .byte 0 @ padding - - .string "SALAC$", 7 - .byte BERRY_FIRMNESS_VERY_HARD - .2byte 95 @ size (in millimeters) - .byte 2 @ max yield - .byte 1 @ min yield - .4byte gBerryDescriptionPart1_Salac - .4byte gBerryDescriptionPart2_Salac - .byte 24 @ stage duration (in hours) - .byte 0 @ spicy - .byte 0 @ dry - .byte 40 @ sweet - .byte 0 @ bitter - .byte 40 @ sour - .byte 80 @ smoothness - .byte 0 @ padding - - .string "PETAYA$", 7 - .byte BERRY_FIRMNESS_VERY_HARD - .2byte 237 @ size (in millimeters) - .byte 2 @ max yield - .byte 1 @ min yield - .4byte gBerryDescriptionPart1_Petaya - .4byte gBerryDescriptionPart2_Petaya - .byte 24 @ stage duration (in hours) - .byte 40 @ spicy - .byte 0 @ dry - .byte 0 @ sweet - .byte 40 @ bitter - .byte 0 @ sour - .byte 80 @ smoothness - .byte 0 @ padding - - .string "APICOT$", 7 - .byte BERRY_FIRMNESS_HARD - .2byte 75 @ size (in millimeters) - .byte 2 @ max yield - .byte 1 @ min yield - .4byte gBerryDescriptionPart1_Apicot - .4byte gBerryDescriptionPart2_Apicot - .byte 24 @ stage duration (in hours) - .byte 0 @ spicy - .byte 40 @ dry - .byte 0 @ sweet - .byte 0 @ bitter - .byte 40 @ sour - .byte 80 @ smoothness - .byte 0 @ padding - - .string "LANSAT$", 7 - .byte BERRY_FIRMNESS_SOFT - .2byte 97 @ size (in millimeters) - .byte 2 @ max yield - .byte 1 @ min yield - .4byte gBerryDescriptionPart1_Lansat - .4byte gBerryDescriptionPart2_Lansat - .byte 24 @ stage duration (in hours) - .byte 10 @ spicy - .byte 10 @ dry - .byte 10 @ sweet - .byte 10 @ bitter - .byte 10 @ sour - .byte 30 @ smoothness - .byte 0 @ padding - - .string "STARF$", 7 - .byte BERRY_FIRMNESS_SUPER_HARD - .2byte 153 @ size (in millimeters) - .byte 2 @ max yield - .byte 1 @ min yield - .4byte gBerryDescriptionPart1_Starf - .4byte gBerryDescriptionPart2_Starf - .byte 24 @ stage duration (in hours) - .byte 10 @ spicy - .byte 10 @ dry - .byte 10 @ sweet - .byte 10 @ bitter - .byte 10 @ sour - .byte 30 @ smoothness - .byte 0 @ padding - - .string "ENIGMA$", 7 - .byte BERRY_FIRMNESS_UNKNOWN - .2byte 0 @ size (in millimeters) - .byte 2 @ max yield - .byte 1 @ min yield - .4byte gBerryDescriptionPart1_Enigma - .4byte gBerryDescriptionPart2_Enigma - .byte 24 @ stage duration (in hours) - .byte 40 @ spicy - .byte 40 @ dry - .byte 40 @ sweet - .byte 40 @ bitter - .byte 40 @ sour - .byte 40 @ smoothness - .byte 0 @ padding diff --git a/data/berry.s b/data/berry.s deleted file mode 100644 index 091af4105..000000000 --- a/data/berry.s +++ /dev/null @@ -1,14 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - -@ 83CC740 - .include "data/text/berry_descriptions.inc" - -@ 83CD2CC - .include "data/berries.inc" - - .align 2 -gBlankBerryTree:: @ 83CD780 - .4byte 0, 0 diff --git a/data/bike.s b/data/bike.s deleted file mode 100644 index ab2d7b67c..000000000 --- a/data/bike.s +++ /dev/null @@ -1,57 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - - .align 2 -gUnknown_083DB594:: @ 83DB594 - .4byte sub_80E5168 - .4byte sub_80E517C - .4byte sub_80E51C4 - .4byte sub_80E5270 - - .align 2 -gUnknown_083DB5A4:: @ 83DB5A4 - .4byte PlayerGoSpeed0 - .4byte sub_80593C4 - .4byte sub_80593F4 - - .align 2 -gUnknown_083DB5B0:: @ 83DB5B0 - .4byte sub_80E56F8 - .4byte sub_80E5708 - .4byte sub_80E5744 - .4byte sub_80E57BC - .4byte sub_80E57F8 - .4byte sub_80E5834 - .4byte sub_80E5870 - .4byte sub_80E58AC - .4byte sub_80E5920 - .4byte sub_80E5990 - .4byte sub_80E59A0 - .4byte sub_80E5A30 - .4byte sub_80E5AC0 - - .align 2 -gUnknown_083DB5E4:: @ 83DB5E4 - .4byte CheckMovementInputAcroBikeNormal - .4byte CheckMovementInputAcroBikeChangingDirection - .4byte CheckMovementInputAcroBikeStandingWheelie - .4byte CheckMovementInputAcroBikeBunnyHop - .4byte CheckMovementInputAcroBikeMovingWheelie - .4byte CheckMovementInputAcroBikeUnknownMode5 - .4byte CheckMovementInputAcroBikeUnknownMode6 - - .align 1 -gUnknown_083DB600:: @ 83DB600 - .2byte 1, 2, 4 - -Unknown_3DB606:: @ 83DB606 - .byte 4, 0 - - .align 2 -gUnknown_083DB608:: @ 83DB608 - .4byte 0x1, 0x2, 0xf, 0xf, Unknown_3DB606, Unknown_3DB606, 0x1 - .4byte 0x2, 0x2, 0xf, 0xf, Unknown_3DB606, Unknown_3DB606, 0x2 - .4byte 0x3, 0x2, 0xf, 0xf, Unknown_3DB606, Unknown_3DB606, 0x3 - .4byte 0x4, 0x2, 0xf, 0xf, Unknown_3DB606, Unknown_3DB606, 0x4 diff --git a/data/clock_hand_coords.inc b/data/clock_hand_coords.inc deleted file mode 100644 index 476ffb788..000000000 --- a/data/clock_hand_coords.inc +++ /dev/null @@ -1,361 +0,0 @@ -gClockHandCoords:: @ 83F7B58 - .byte 0, -24 @ 0 - .byte 1, -25 @ 1 - .byte 1, -25 @ 2 - .byte 2, -25 @ 3 - .byte 2, -25 @ 4 - .byte 2, -25 @ 5 - .byte 3, -24 @ 6 - .byte 3, -25 @ 7 - .byte 4, -25 @ 8 - .byte 4, -25 @ 9 - .byte 4, -25 @ 10 - .byte 5, -25 @ 11 - .byte 5, -25 @ 12 - .byte 6, -24 @ 13 - .byte 6, -24 @ 14 - .byte 6, -24 @ 15 - .byte 7, -24 @ 16 - .byte 7, -24 @ 17 - .byte 7, -24 @ 18 - .byte 8, -24 @ 19 - .byte 8, -24 @ 20 - .byte 9, -24 @ 21 - .byte 9, -24 @ 22 - .byte 10, -23 @ 23 - .byte 10, -23 @ 24 - .byte 11, -22 @ 25 - .byte 11, -22 @ 26 - .byte 11, -22 @ 27 - .byte 12, -22 @ 28 - .byte 12, -21 @ 29 - .byte 13, -21 @ 30 - .byte 13, -21 @ 31 - .byte 13, -21 @ 32 - .byte 14, -21 @ 33 - .byte 14, -21 @ 34 - .byte 14, -20 @ 35 - .byte 14, -20 @ 36 - .byte 15, -20 @ 37 - .byte 15, -19 @ 38 - .byte 16, -19 @ 39 - .byte 16, -19 @ 40 - .byte 16, -19 @ 41 - .byte 16, -18 @ 42 - .byte 16, -18 @ 43 - .byte 17, -18 @ 44 - .byte 17, -17 @ 45 - .byte 17, -17 @ 46 - .byte 18, -17 @ 47 - .byte 18, -17 @ 48 - .byte 18, -16 @ 49 - .byte 18, -16 @ 50 - .byte 19, -16 @ 51 - .byte 19, -15 @ 52 - .byte 19, -15 @ 53 - .byte 20, -15 @ 54 - .byte 20, -14 @ 55 - .byte 20, -14 @ 56 - .byte 20, -13 @ 57 - .byte 20, -13 @ 58 - .byte 21, -13 @ 59 - .byte 21, -13 @ 60 - .byte 21, -12 @ 61 - .byte 22, -12 @ 62 - .byte 22, -12 @ 63 - .byte 22, -11 @ 64 - .byte 22, -11 @ 65 - .byte 22, -10 @ 66 - .byte 23, -10 @ 67 - .byte 23, -9 @ 68 - .byte 23, -9 @ 69 - .byte 23, -9 @ 70 - .byte 23, -9 @ 71 - .byte 23, -8 @ 72 - .byte 23, -8 @ 73 - .byte 23, -7 @ 74 - .byte 23, -7 @ 75 - .byte 23, -6 @ 76 - .byte 24, -6 @ 77 - .byte 24, -6 @ 78 - .byte 25, -5 @ 79 - .byte 25, -5 @ 80 - .byte 24, -4 @ 81 - .byte 25, -4 @ 82 - .byte 24, -3 @ 83 - .byte 25, -3 @ 84 - .byte 25, -3 @ 85 - .byte 25, -2 @ 86 - .byte 25, -2 @ 87 - .byte 24, -1 @ 88 - .byte 25, -1 @ 89 - .byte 24, 0 @ 90 - .byte 24, 0 @ 91 - .byte 24, 0 @ 92 - .byte 24, 1 @ 93 - .byte 24, 1 @ 94 - .byte 25, 2 @ 95 - .byte 24, 2 @ 96 - .byte 25, 2 @ 97 - .byte 24, 3 @ 98 - .byte 24, 3 @ 99 - .byte 25, 4 @ 100 - .byte 24, 4 @ 101 - .byte 24, 5 @ 102 - .byte 24, 5 @ 103 - .byte 24, 5 @ 104 - .byte 24, 6 @ 105 - .byte 23, 6 @ 106 - .byte 23, 6 @ 107 - .byte 23, 7 @ 108 - .byte 23, 8 @ 109 - .byte 23, 8 @ 110 - .byte 23, 8 @ 111 - .byte 23, 9 @ 112 - .byte 23, 9 @ 113 - .byte 23, 10 @ 114 - .byte 22, 10 @ 115 - .byte 22, 10 @ 116 - .byte 22, 11 @ 117 - .byte 22, 11 @ 118 - .byte 22, 11 @ 119 - .byte 22, 12 @ 120 - .byte 21, 12 @ 121 - .byte 21, 12 @ 122 - .byte 21, 13 @ 123 - .byte 20, 13 @ 124 - .byte 20, 13 @ 125 - .byte 19, 13 @ 126 - .byte 19, 13 @ 127 - .byte 19, 14 @ 128 - .byte 19, 14 @ 129 - .byte 19, 15 @ 130 - .byte 19, 15 @ 131 - .byte 18, 15 @ 132 - .byte 18, 16 @ 133 - .byte 17, 16 @ 134 - .byte 17, 16 @ 135 - .byte 17, 17 @ 136 - .byte 17, 17 @ 137 - .byte 16, 17 @ 138 - .byte 16, 18 @ 139 - .byte 16, 18 @ 140 - .byte 15, 18 @ 141 - .byte 14, 18 @ 142 - .byte 15, 19 @ 143 - .byte 14, 19 @ 144 - .byte 14, 19 @ 145 - .byte 13, 19 @ 146 - .byte 13, 20 @ 147 - .byte 13, 20 @ 148 - .byte 13, 20 @ 149 - .byte 12, 20 @ 150 - .byte 12, 20 @ 151 - .byte 12, 21 @ 152 - .byte 11, 21 @ 153 - .byte 11, 21 @ 154 - .byte 11, 21 @ 155 - .byte 10, 21 @ 156 - .byte 10, 22 @ 157 - .byte 10, 22 @ 158 - .byte 9, 22 @ 159 - .byte 9, 22 @ 160 - .byte 8, 22 @ 161 - .byte 7, 22 @ 162 - .byte 7, 23 @ 163 - .byte 7, 23 @ 164 - .byte 6, 23 @ 165 - .byte 6, 23 @ 166 - .byte 5, 23 @ 167 - .byte 5, 23 @ 168 - .byte 5, 24 @ 169 - .byte 4, 24 @ 170 - .byte 4, 24 @ 171 - .byte 4, 24 @ 172 - .byte 3, 24 @ 173 - .byte 2, 24 @ 174 - .byte 2, 24 @ 175 - .byte 1, 24 @ 176 - .byte 1, 24 @ 177 - .byte 0, 24 @ 178 - .byte 0, 24 @ 179 - .byte -1, 23 @ 180 - .byte 0, 24 @ 181 - .byte 0, 24 @ 182 - .byte -1, 24 @ 183 - .byte -1, 24 @ 184 - .byte -2, 24 @ 185 - .byte -2, 24 @ 186 - .byte -3, 24 @ 187 - .byte -3, 24 @ 188 - .byte -4, 24 @ 189 - .byte -4, 24 @ 190 - .byte -5, 24 @ 191 - .byte -5, 23 @ 192 - .byte -5, 23 @ 193 - .byte -6, 23 @ 194 - .byte -6, 23 @ 195 - .byte -7, 23 @ 196 - .byte -7, 23 @ 197 - .byte -7, 23 @ 198 - .byte -8, 23 @ 199 - .byte -8, 22 @ 200 - .byte -9, 22 @ 201 - .byte -9, 22 @ 202 - .byte -10, 22 @ 203 - .byte -10, 22 @ 204 - .byte -10, 21 @ 205 - .byte -11, 21 @ 206 - .byte -11, 21 @ 207 - .byte -11, 21 @ 208 - .byte -11, 20 @ 209 - .byte -12, 20 @ 210 - .byte -12, 20 @ 211 - .byte -13, 20 @ 212 - .byte -13, 20 @ 213 - .byte -13, 19 @ 214 - .byte -14, 19 @ 215 - .byte -14, 19 @ 216 - .byte -14, 19 @ 217 - .byte -14, 18 @ 218 - .byte -15, 18 @ 219 - .byte -15, 18 @ 220 - .byte -15, 17 @ 221 - .byte -16, 17 @ 222 - .byte -16, 17 @ 223 - .byte -17, 17 @ 224 - .byte -17, 16 @ 225 - .byte -17, 16 @ 226 - .byte -18, 16 @ 227 - .byte -17, 15 @ 228 - .byte -18, 15 @ 229 - .byte -18, 15 @ 230 - .byte -19, 15 @ 231 - .byte -19, 14 @ 232 - .byte -19, 14 @ 233 - .byte -19, 13 @ 234 - .byte -19, 13 @ 235 - .byte -20, 13 @ 236 - .byte -20, 12 @ 237 - .byte -20, 12 @ 238 - .byte -21, 12 @ 239 - .byte -21, 12 @ 240 - .byte -21, 11 @ 241 - .byte -21, 11 @ 242 - .byte -21, 10 @ 243 - .byte -21, 10 @ 244 - .byte -21, 9 @ 245 - .byte -22, 9 @ 246 - .byte -22, 9 @ 247 - .byte -22, 8 @ 248 - .byte -22, 8 @ 249 - .byte -22, 7 @ 250 - .byte -23, 7 @ 251 - .byte -23, 7 @ 252 - .byte -23, 6 @ 253 - .byte -23, 6 @ 254 - .byte -23, 5 @ 255 - .byte -24, 5 @ 256 - .byte -23, 4 @ 257 - .byte -23, 4 @ 258 - .byte -24, 4 @ 259 - .byte -24, 4 @ 260 - .byte -24, 3 @ 261 - .byte -24, 3 @ 262 - .byte -24, 2 @ 263 - .byte -24, 2 @ 264 - .byte -24, 1 @ 265 - .byte -24, 1 @ 266 - .byte -24, 1 @ 267 - .byte -24, 0 @ 268 - .byte -25, 0 @ 269 - .byte -24, -1 @ 270 - .byte -25, -1 @ 271 - .byte -24, -1 @ 272 - .byte -24, -2 @ 273 - .byte -24, -2 @ 274 - .byte -24, -3 @ 275 - .byte -24, -3 @ 276 - .byte -24, -4 @ 277 - .byte -24, -4 @ 278 - .byte -24, -4 @ 279 - .byte -24, -5 @ 280 - .byte -24, -5 @ 281 - .byte -24, -6 @ 282 - .byte -24, -6 @ 283 - .byte -23, -6 @ 284 - .byte -23, -7 @ 285 - .byte -23, -7 @ 286 - .byte -23, -8 @ 287 - .byte -23, -8 @ 288 - .byte -23, -9 @ 289 - .byte -23, -9 @ 290 - .byte -22, -9 @ 291 - .byte -22, -9 @ 292 - .byte -22, -10 @ 293 - .byte -22, -10 @ 294 - .byte -21, -10 @ 295 - .byte -21, -11 @ 296 - .byte -22, -11 @ 297 - .byte -22, -12 @ 298 - .byte -21, -12 @ 299 - .byte -21, -13 @ 300 - .byte -21, -13 @ 301 - .byte -20, -13 @ 302 - .byte -21, -14 @ 303 - .byte -20, -14 @ 304 - .byte -20, -14 @ 305 - .byte -19, -14 @ 306 - .byte -19, -15 @ 307 - .byte -19, -15 @ 308 - .byte -18, -16 @ 309 - .byte -18, -16 @ 310 - .byte -18, -16 @ 311 - .byte -18, -17 @ 312 - .byte -18, -17 @ 313 - .byte -17, -17 @ 314 - .byte -17, -18 @ 315 - .byte -17, -18 @ 316 - .byte -16, -18 @ 317 - .byte -16, -18 @ 318 - .byte -16, -19 @ 319 - .byte -16, -19 @ 320 - .byte -15, -19 @ 321 - .byte -15, -19 @ 322 - .byte -15, -20 @ 323 - .byte -14, -20 @ 324 - .byte -14, -20 @ 325 - .byte -14, -21 @ 326 - .byte -13, -21 @ 327 - .byte -13, -21 @ 328 - .byte -13, -21 @ 329 - .byte -12, -21 @ 330 - .byte -12, -22 @ 331 - .byte -11, -22 @ 332 - .byte -11, -22 @ 333 - .byte -11, -22 @ 334 - .byte -10, -22 @ 335 - .byte -10, -22 @ 336 - .byte -9, -22 @ 337 - .byte -9, -23 @ 338 - .byte -9, -23 @ 339 - .byte -8, -23 @ 340 - .byte -8, -23 @ 341 - .byte -7, -23 @ 342 - .byte -7, -23 @ 343 - .byte -7, -24 @ 344 - .byte -6, -24 @ 345 - .byte -6, -24 @ 346 - .byte -5, -24 @ 347 - .byte -5, -24 @ 348 - .byte -4, -24 @ 349 - .byte -4, -24 @ 350 - .byte -4, -24 @ 351 - .byte -4, -25 @ 352 - .byte -3, -25 @ 353 - .byte -2, -25 @ 354 - .byte -2, -24 @ 355 - .byte -2, -24 @ 356 - .byte -1, -25 @ 357 - .byte -1, -25 @ 358 - .byte 0, -25 @ 359 diff --git a/data/contest.s b/data/contest.s index f51fe0ca4..4e53035d2 100644 --- a/data/contest.s +++ b/data/contest.s @@ -121,20 +121,21 @@ gSpriteTemplate_83CA43C:: @ 83CA43C spr_template 20009, 20006, gOamData_83CA3EC, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy .align 2 -Unknown_3CA454: @ 83CA454 - .incbin "baserom.gba", 0x3ca454, 0x10 +gSubspriteTable_83CA454:: @ 83CA454 + subsprite -26, -4, 0, 0, 32x8 + subsprite 6, -4, 0, 4, 32x8 .align 2 -gUnknown_083CA464:: @ 83CA464 - .4byte 0x2, Unknown_3CA454 +gSubspriteTables_83CA464:: @ 83CA464 + .4byte 2, gSubspriteTable_83CA454 .align 2 gUnknown_083CA46C:: @ 83CA46C - obj_tiles gContestApplauseGfx, 1024, 0xabe2 + obj_tiles gContestApplauseGfx, 1024, 44002 .align 2 gUnknown_083CA474:: @ 83CA474 - obj_pal gContestPal, 0xABE2 + obj_pal gContestPal, 44002 .align 2 gOamData_83CA47C:: @ 83CA47C @@ -252,9 +253,7 @@ gSpriteAffineAnimTable_83CC43C:: @ 83CC43C .4byte gSpriteAffineAnim_83CC404 .4byte gSpriteAffineAnim_83CC414 .4byte gSpriteAffineAnim_83CC424 - - .align 2 - .incbin "baserom.gba", 0x003cc448, 0x4 + .4byte NULL .align 2 gOamData_83CC44C:: @ 83CC44C @@ -280,13 +279,17 @@ gSpriteTemplate_83CC49C:: @ 83CC49C .align 2 gUnknown_083CC4B4:: @ 83CC4B4 - obj_tiles gBlankGfxCompressed, 4096, 0x80e8 - obj_tiles gBlankGfxCompressed, 4096, 0x80e9 - obj_tiles gBlankGfxCompressed, 4096, 0x80ea - obj_tiles gBlankGfxCompressed, 4096, 0x80eb + obj_tiles gBlankGfxCompressed, 4096, 33000 + obj_tiles gBlankGfxCompressed, 4096, 33001 + obj_tiles gBlankGfxCompressed, 4096, 33002 + obj_tiles gBlankGfxCompressed, 4096, 33003 + .align 2 gUnknown_083CC4D4:: @ 83CC4D4 - .incbin "baserom.gba", 0x003cc4d4, 0x20 + obj_pal 0x20180A4, 33000 + obj_pal 0x20180C4, 33001 + obj_pal 0x20180E4, 33002 + obj_pal 0x2018104, 33003 .align 2 gOamData_83CC4F4:: @ 83CC4F4 @@ -329,17 +332,72 @@ gSpriteTemplate_83CC584:: @ 83CC584 spr_template 33003, 33003, gOamData_83CC4F4, gDummySpriteAnimTable, NULL, gSpriteAffineAnimTable_83CC534, SpriteCallbackDummy gUnknown_083CC59C:: @ 83CC59C - .incbin "baserom.gba", 0x003cc59c, 0x6 + .string "{HIGHLIGHT TRANSPARENT}{COLOR}$" gUnknown_083CC5A2:: @ 83CC5A2 .string "/$" + .align 1 gUnknown_083CC5A4:: @ 83CC5A4 - .incbin "baserom.gba", 0x003cc5a4, 0x10 + .2byte 0x73, 0x19E6, 0x253, 0x4CC4, 0x1F, 0x3E0, 0x3FF, 0x7C00 @ 83CC5B4 .include "data/contest_excitement_table.inc" .align 2 gUnknown_083CC5D0:: @ 83CC5D0 - .incbin "baserom.gba", 0x003cc5d0, 0x100 + .4byte 0 + .4byte 0xFFFF + .2byte SPECIES_TAILLOW + .byte CONTEST_SMART + .string "TAILTA$", 11 + .string "WYATT$", 10 + + .4byte 0 + .4byte 0xFFFF + .2byte SPECIES_BRELOOM + .byte CONTEST_BEAUTY + .string "BRELO$", 11 + .string "LIANA$", 10 + + .4byte 0 + .4byte 0xFFFF + .2byte SPECIES_PELIPPER + .byte CONTEST_COOL + .string "PELEP$", 11 + .string "TIERA$", 10 + + .4byte 0 + .4byte 0xFFFF + .2byte SPECIES_PELIPPER + .byte CONTEST_COOL + .string "PELEP$", 11 + .string "TIERA$", 10 + + .4byte 0 + .4byte 0xFFFF + .2byte SPECIES_PELIPPER + .byte CONTEST_COOL + .string "PELEP$", 11 + .string "TIERA$", 10 + + .4byte 0 + .4byte 0xFFFF + .2byte SPECIES_DELCATTY + .byte CONTEST_SMART + .string "KITSY$", 11 + .string "OMAR$", 10 + + .4byte 0 + .4byte 0xFFFF + .2byte SPECIES_GULPIN + .byte CONTEST_CUTE + .string "GULPS$", 11 + .string "MACIE$", 10 + + .4byte 0 + .4byte 0xFFFF + .2byte SPECIES_LOUDRED + .byte CONTEST_TOUGH + .string "LOUDED$", 11 + .string "BRYANT$", 10 diff --git a/data/contest_ai.s b/data/contest_ai.s index 95e65db58..78f926df3 100644 --- a/data/contest_ai.s +++ b/data/contest_ai.s @@ -4,140 +4,140 @@ .section .rodata .align 2 -gUnknown_08401E60:: @ 8401E60 - .4byte sub_8128AA8 - .4byte contest_ai_get_turn - .4byte sub_8128B0C - .4byte sub_8128B4C - .4byte sub_8128B8C - .4byte sub_8128BCC - .4byte contest_ai_get_excitement - .4byte sub_8128C2C - .4byte sub_8128C6C - .4byte sub_8128CAC - .4byte sub_8128CEC - .4byte contest_ai_get_user_order - .4byte sub_8128D50 - .4byte sub_8128D90 - .4byte sub_8128DD0 - .4byte sub_8128E10 - .4byte contest_ai_get_user_condition_maybe - .4byte sub_8128E90 - .4byte sub_8128ED0 - .4byte sub_8128F10 - .4byte sub_8128F50 - .4byte sub_8128F90 - .4byte sub_8128FBC - .4byte sub_8129008 - .4byte sub_8129054 - .4byte sub_81290A0 - .4byte sub_81290EC - .4byte sub_8129114 - .4byte sub_8129160 - .4byte sub_81291AC - .4byte sub_81291F8 - .4byte contest_ai_get_contest_type - .4byte sub_8129264 - .4byte sub_81292A4 - .4byte contest_ai_get_move_excitement - .4byte sub_8129324 - .4byte sub_8129368 - .4byte sub_81293AC - .4byte sub_81293F0 - .4byte contest_ai_get_move_effect - .4byte sub_8129470 - .4byte sub_81294B0 - .4byte contest_ai_get_move_effect_type - .4byte sub_8129538 - .4byte sub_8129578 - .4byte contest_ai_check_move_has_highest_appeal - .4byte sub_8129638 - .4byte sub_812967C - .4byte sub_81296FC - .4byte sub_8129740 - .4byte sub_8129798 - .4byte sub_81297D8 - .4byte sub_8129818 - .4byte sub_8129858 - .4byte sub_8129898 - .4byte sub_81298F0 - .4byte sub_8129930 - .4byte sub_8129970 - .4byte sub_81299B0 - .4byte contest_ai_get_move_used_count - .4byte sub_8129A44 - .4byte sub_8129A84 - .4byte sub_8129AC4 - .4byte sub_8129B04 - .4byte contest_ai_check_combo_starter - .4byte sub_8129BB8 - .4byte sub_8129BFC - .4byte contest_ai_check_combo_finisher - .4byte sub_8129CB4 - .4byte sub_8129CF8 - .4byte contest_ai_check_would_finish_combo - .4byte sub_8129D98 - .4byte sub_8129DDC - .4byte contest_ai_get_condition - .4byte sub_8129E64 - .4byte sub_8129EA4 - .4byte sub_8129EE4 - .4byte sub_8129F24 - .4byte contest_ai_get_used_combo_starter - .4byte sub_8129FBC - .4byte sub_8129FFC - .4byte sub_812A03C - .4byte sub_812A07C - .4byte contest_ai_check_can_participate - .4byte sub_812A100 - .4byte sub_812A144 - .4byte contest_ai_get_val_812A188 - .4byte sub_812A1C4 - .4byte sub_812A208 - .4byte sub_812A24C - .4byte sub_812A294 - .4byte sub_812A2D8 - .4byte sub_812A31C - .4byte sub_812A360 - .4byte sub_812A3A4 - .4byte sub_812A3E4 - .4byte sub_812A428 - .4byte sub_812A46C - .4byte sub_812A4B0 - .4byte sub_812A4F4 - .4byte sub_812A538 - .4byte sub_812A578 - .4byte sub_812A5B8 - .4byte sub_812A5F8 - .4byte sub_812A638 - .4byte sub_812A674 - .4byte sub_812A6B4 - .4byte sub_812A6F4 - .4byte sub_812A734 - .4byte sub_812A774 - .4byte sub_812A7C4 - .4byte sub_812A804 - .4byte sub_812A844 - .4byte sub_812A86C - .4byte sub_812A898 - .4byte sub_812A8CC - .4byte sub_812A8FC - .4byte sub_812A92C - .4byte sub_812A978 - .4byte sub_812A9C4 - .4byte sub_812AA10 - .4byte sub_812AA5C - .4byte sub_812AAAC - .4byte sub_812AAFC - .4byte sub_812AB4C - .4byte sub_812AB9C - .4byte sub_812ABE8 - .4byte sub_812AC34 - .4byte sub_812AC54 - .4byte sub_812AC84 - .4byte contest_ai_check_for_exciting_move - .4byte sub_812AD50 - .4byte sub_812AD94 - .4byte sub_812ADD8 - .4byte sub_812AE44 - .4byte sub_812AE88 +sContestAICmdTable:: @ 8401E60 + .4byte ContestAICmd_unk_00 + .4byte ContestAICmd_get_turn + .4byte ContestAICmd_unk_02 + .4byte ContestAICmd_unk_03 + .4byte ContestAICmd_unk_04 + .4byte ContestAICmd_unk_05 + .4byte ContestAICmd_get_excitement + .4byte ContestAICmd_unk_07 + .4byte ContestAICmd_unk_08 + .4byte ContestAICmd_unk_09 + .4byte ContestAICmd_unk_0A + .4byte ContestAICmd_get_user_order + .4byte ContestAICmd_unk_0C + .4byte ContestAICmd_unk_0D + .4byte ContestAICmd_unk_0E + .4byte ContestAICmd_unk_0F + .4byte ContestAICmd_get_user_condition_maybe + .4byte ContestAICmd_unk_11 + .4byte ContestAICmd_unk_12 + .4byte ContestAICmd_unk_13 + .4byte ContestAICmd_unk_14 + .4byte ContestAICmd_unk_15 + .4byte ContestAICmd_unk_16 + .4byte ContestAICmd_unk_17 + .4byte ContestAICmd_unk_18 + .4byte ContestAICmd_unk_19 + .4byte ContestAICmd_unk_1A + .4byte ContestAICmd_unk_1B + .4byte ContestAICmd_unk_1C + .4byte ContestAICmd_unk_1D + .4byte ContestAICmd_unk_1E + .4byte ContestAICmd_get_contest_type + .4byte ContestAICmd_unk_20 + .4byte ContestAICmd_unk_21 + .4byte ContestAICmd_get_move_excitement + .4byte ContestAICmd_unk_23 + .4byte ContestAICmd_unk_24 + .4byte ContestAICmd_unk_25 + .4byte ContestAICmd_unk_26 + .4byte ContestAICmd_get_move_effect + .4byte ContestAICmd_unk_28 + .4byte ContestAICmd_unk_29 + .4byte ContestAICmd_get_move_effect_type + .4byte ContestAICmd_unk_2B + .4byte ContestAICmd_unk_2C + .4byte ContestAICmd_check_move_has_highest_appeal + .4byte ContestAICmd_unk_2E + .4byte ContestAICmd_unk_2F + .4byte ContestAICmd_unk_30 + .4byte ContestAICmd_unk_31 + .4byte ContestAICmd_unk_32 + .4byte ContestAICmd_unk_33 + .4byte ContestAICmd_unk_34 + .4byte ContestAICmd_unk_35 + .4byte ContestAICmd_unk_36 + .4byte ContestAICmd_unk_37 + .4byte ContestAICmd_unk_38 + .4byte ContestAICmd_unk_39 + .4byte ContestAICmd_unk_3A + .4byte ContestAICmd_get_move_used_count + .4byte ContestAICmd_unk_3C + .4byte ContestAICmd_unk_3D + .4byte ContestAICmd_unk_3E + .4byte ContestAICmd_unk_3F + .4byte ContestAICmd_check_combo_starter + .4byte ContestAICmd_unk_41 + .4byte ContestAICmd_unk_42 + .4byte ContestAICmd_check_combo_finisher + .4byte ContestAICmd_unk_44 + .4byte ContestAICmd_unk_45 + .4byte ContestAICmd_check_would_finish_combo + .4byte ContestAICmd_unk_47 + .4byte ContestAICmd_unk_48 + .4byte ContestAICmd_get_condition + .4byte ContestAICmd_unk_4A + .4byte ContestAICmd_unk_4B + .4byte ContestAICmd_unk_4C + .4byte ContestAICmd_unk_4D + .4byte ContestAICmd_get_used_combo_starter + .4byte ContestAICmd_unk_4F + .4byte ContestAICmd_unk_50 + .4byte ContestAICmd_unk_51 + .4byte ContestAICmd_unk_52 + .4byte ContestAICmd_check_can_participate + .4byte ContestAICmd_unk_54 + .4byte ContestAICmd_unk_55 + .4byte ContestAICmd_get_val_812A188 + .4byte ContestAICmd_unk_57 + .4byte ContestAICmd_unk_58 + .4byte ContestAICmd_unk_59 + .4byte ContestAICmd_unk_5A + .4byte ContestAICmd_unk_5B + .4byte ContestAICmd_unk_5C + .4byte ContestAICmd_unk_5D + .4byte ContestAICmd_unk_5E + .4byte ContestAICmd_unk_5F + .4byte ContestAICmd_unk_60 + .4byte ContestAICmd_unk_61 + .4byte ContestAICmd_unk_62 + .4byte ContestAICmd_unk_63 + .4byte ContestAICmd_unk_64 + .4byte ContestAICmd_unk_65 + .4byte ContestAICmd_unk_66 + .4byte ContestAICmd_unk_67 + .4byte ContestAICmd_unk_68 + .4byte ContestAICmd_unk_69 + .4byte ContestAICmd_unk_6A + .4byte ContestAICmd_unk_6B + .4byte ContestAICmd_unk_6C + .4byte ContestAICmd_unk_6D + .4byte ContestAICmd_unk_6E + .4byte ContestAICmd_unk_6F + .4byte ContestAICmd_unk_70 + .4byte ContestAICmd_unk_71 + .4byte ContestAICmd_unk_72 + .4byte ContestAICmd_unk_73 + .4byte ContestAICmd_unk_74 + .4byte ContestAICmd_unk_75 + .4byte ContestAICmd_unk_76 + .4byte ContestAICmd_unk_77 + .4byte ContestAICmd_unk_78 + .4byte ContestAICmd_unk_79 + .4byte ContestAICmd_unk_7A + .4byte ContestAICmd_unk_7B + .4byte ContestAICmd_unk_7C + .4byte ContestAICmd_unk_7D + .4byte ContestAICmd_unk_7E + .4byte ContestAICmd_unk_7F + .4byte ContestAICmd_unk_80 + .4byte ContestAICmd_unk_81 + .4byte ContestAICmd_check_for_exciting_move + .4byte ContestAICmd_unk_83 + .4byte ContestAICmd_unk_84 + .4byte ContestAICmd_unk_85 + .4byte ContestAICmd_unk_86 + .4byte ContestAICmd_unk_87 diff --git a/data/contest_painting.s b/data/contest_painting.s deleted file mode 100644 index 071661cb4..000000000 --- a/data/contest_painting.s +++ /dev/null @@ -1,102 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - - .align 2 -gPictureFramePalettes:: @ 83EF198 - .incbin "graphics/picture_frame/bg0.gbapal" - .incbin "graphics/picture_frame/bg1.gbapal" - .incbin "graphics/picture_frame/bg2.gbapal" - .incbin "graphics/picture_frame/bg3.gbapal" - .incbin "graphics/picture_frame/bg4.gbapal" - .incbin "graphics/picture_frame/bg5.gbapal" - .space 10 * 32 - - .align 2 -gPictureFrameTiles_0:: @ 83EF398 - .incbin "graphics/picture_frame/frame0.4bpp.rl" - - .align 2 -gPictureFrameTiles_1:: @ 83F041C - .incbin "graphics/picture_frame/frame1.4bpp.rl" - - .align 2 -gPictureFrameTiles_2:: @ 83F104C - .incbin "graphics/picture_frame/frame2.4bpp.rl" - - .align 2 -gPictureFrameTiles_3:: @ 83F1B84 - .incbin "graphics/picture_frame/frame3.4bpp.rl" - - .align 2 -gPictureFrameTiles_4:: @ 83F2B3C - .incbin "graphics/picture_frame/frame4.4bpp.rl" - - .align 2 -gPictureFrameTiles_5:: @ 83F3C6C - .incbin "graphics/picture_frame/frame5.4bpp.rl" - - .align 2 -gPictureFrameTilemap_0:: @ 83F4260 - .incbin "graphics/picture_frame/frame0_map.bin.rl" - - .align 2 -gPictureFrameTilemap_1:: @ 83F476C - .incbin "graphics/picture_frame/frame1_map.bin.rl" - - .align 2 -gPictureFrameTilemap_2:: @ 83F4C78 - .incbin "graphics/picture_frame/frame2_map.bin.rl" - - .align 2 -gPictureFrameTilemap_3:: @ 83F5184 - .incbin "graphics/picture_frame/frame3_map.bin.rl" - - .align 2 -gPictureFrameTilemap_4:: @ 83F5690 - .incbin "graphics/picture_frame/frame4_map.bin.rl" - - .align 2 -gPictureFrameTilemap_5:: @ 83F5B9C - .incbin "graphics/picture_frame/frame5_map.bin.rl" - - .align 2 -gUnknown_083F60AC:: @ 83F60AC - .4byte OtherText_Cool - .4byte OtherText_Beauty2 - .4byte OtherText_Cute - .4byte OtherText_Smart - .4byte OtherText_Tough - - .align 2 -gUnknown_083F60C0:: @ 83F60C0 - .4byte OtherText_NonstopSuperCool, OtherText_Terminator6 - .4byte OtherText_GoodLookingPoke, OtherText_Terminator7 - .4byte OtherText_MarvelousGreat, OtherText_Terminator8 - - .4byte OtherText_CenturyLastVenus, OtherText_Terminator9 - .4byte OtherText_Terminator10, OtherText_DazzlingSlime - .4byte OtherText_PokeCenterIdol, OtherText_Terminator11 - - .4byte OtherText_LovelyAndSweet, OtherText_Terminator12 - .4byte OtherText_ThePretty, OtherText_WinningPortrait - .4byte OtherText_GiveUsWink, OtherText_Terminator13 - - .4byte OtherText_SmartnessMaestro, OtherText_Terminator15 - .4byte OtherText_ChosenPokeAmong, OtherText_Terminator15 - .4byte OtherText_TheExcellent, OtherText_ItsMomentOfElegance - - .4byte OtherText_PowerfullyMuscular, OtherText_Terminator16 - .4byte OtherText_StrongErEst, OtherText_Terminator17 - .4byte OtherText_MightyTough, OtherText_Exclamation - - .align 2 -gOamData_83F6138:: @ 83F6138 - .2byte 0x3000 - .2byte 0xC000 - .2byte 0x0000 - - .align 2 -gUnknown_083F6140:: @ 83F6140 - .space 4 diff --git a/data/credits.s b/data/credits.s index c6e0ad536..68931ef75 100644 --- a/data/credits.s +++ b/data/credits.s @@ -3,60 +3,108 @@ .section .rodata -gUnknown_0840B7BC:: @ 840B7BC - .incbin "graphics/credits/palette_1.gbapal" - -gUnknown_0840B7FC:: @ 840B7FC - .incbin "graphics/credits/ampersand.4bpp" - gUnknown_0840B83C:: @ 840B83C - .incbin "baserom.gba", 0x0040b83c, 0xf + .byte 0, 1, 0 + .byte 0xFF, 1,0xFF + .byte 0xFF, 1,0xFF + .byte 0xFF, 1,0xFF + .byte 0xFF, 1,0xFF gUnknown_0840B84B:: @ 840B84B - .incbin "baserom.gba", 0x0040b84b, 0xf + .byte 1,0xFF, 1 + .byte 1,0xFF, 1 + .byte 1, 2, 1 + .byte 1,0xFF, 1 + .byte 1,0xFF, 1 gUnknown_0840B85A:: @ 840B85A - .incbin "baserom.gba", 0x0040b85a, 0xf + .byte 1, 0, 0 + .byte 1,0xFF,0xFF + .byte 1, 2, 2 + .byte 1,0xFF,0xFF + .byte 1,0x80,0x80 gUnknown_0840B869:: @ 840B869 - .incbin "baserom.gba", 0x0040b869, 0xf - -gUnknown_0840B878:: - .incbin "baserom.gba", 0x0040B878, 0xf + .byte 1, 3, 1 + .byte 1, 4, 1 + .byte 1, 5, 1 + .byte 1,0xC4, 1 + .byte 1,0xC3, 1 + +gUnknown_0840B878:: @ 840B878 + .byte 1, 6, 7 + .byte 1, 8, 9 + .byte 1,0xFF, 1 + .byte 1,0x88,0x89 + .byte 1,0x86,0x87 .include "data/text/credits.inc" gUnknown_0840CA00:: @ 840CA00 - .incbin "baserom.gba", 0x0040ca00, 0x8 + .byte 104, 36 + .byte 120, 36 + .byte 136, 36 -Unknown_840CA08: - .incbin "baserom.gba", 0x0040ca08, 0x14 -Unknown_840CA1C: - .incbin "baserom.gba", 0x0040ca1c, 0x14 -Unknown_840CA30: - .incbin "baserom.gba", 0x0040ca30, 0x10 -Unknown_840CA40: - .incbin "baserom.gba", 0x0040ca40, 0x14 + .align 2 +gSpriteAnim_840CA08: + obj_image_anim_frame 0, 8 + obj_image_anim_frame 64, 8 + obj_image_anim_frame 128, 8 + obj_image_anim_frame 192, 8 + obj_image_anim_jump 0 + +gSpriteAnim_840CA1C: + obj_image_anim_frame 0, 4 + obj_image_anim_frame 64, 4 + obj_image_anim_frame 128, 4 + obj_image_anim_frame 192, 4 + obj_image_anim_jump 0 + +gSpriteAnim_840CA30: + obj_image_anim_frame 256, 4 + obj_image_anim_frame 320, 4 + obj_image_anim_frame 384, 4 + obj_image_anim_end + +gSpriteAnim_840CA40: + obj_image_anim_frame 384, 30 + obj_image_anim_frame 320, 30 + obj_image_anim_frame 256, 30 + obj_image_anim_frame 256, 30 + obj_image_anim_end .align 2 -gUnknown_0840CA54:: @ 840CA54 - .4byte Unknown_840CA08 - .4byte Unknown_840CA1C - .4byte Unknown_840CA30 - .4byte Unknown_840CA40 - -Unknown_840CA64: - .incbin "baserom.gba", 0x0040ca64, 0x14 -Unknown_840CA78: - .incbin "baserom.gba", 0x0040ca78, 0x14 -Unknown_840CA8C: - .incbin "baserom.gba", 0x0040ca8c, 0x8 +gSpriteAnimTable_0840CA54:: @ 840CA54 + .4byte gSpriteAnim_840CA08 + .4byte gSpriteAnim_840CA1C + .4byte gSpriteAnim_840CA30 + .4byte gSpriteAnim_840CA40 + + +gSpriteAnim_840CA64: + obj_image_anim_frame 0, 8 + obj_image_anim_frame 64, 8 + obj_image_anim_frame 128, 8 + obj_image_anim_frame 192, 8 + obj_image_anim_jump 0 + +gSpriteAnim_840CA78: + obj_image_anim_frame 0, 4 + obj_image_anim_frame 64, 4 + obj_image_anim_frame 128, 4 + obj_image_anim_frame 192, 4 + obj_image_anim_jump 0 + +gSpriteAnim_840CA8C: + obj_image_anim_frame 0, 4 + obj_image_anim_end .align 2 -gUnknown_0840CA94:: @ 840CA94 - .4byte Unknown_840CA64 - .4byte Unknown_840CA78 - .4byte Unknown_840CA8C +gSpriteAnimTable_0840CA94:: @ 840CA94 + .4byte gSpriteAnim_840CA64 + .4byte gSpriteAnim_840CA78 + .4byte gSpriteAnim_840CA8C + gUnknown_0840CAA0:: @ 840CAA0 obj_tiles gHallOfFame, 6144, 1001 @@ -95,4 +143,4 @@ gSpriteAnimTable_840CAE0:: @ 840CAE0 .align 2 gSpriteTemplate_840CAEC:: @ 840CAEC - spr_template 1001, 1001, gOamData_840CAC0, gSpriteAnimTable_840CAE0, NULL, gDummySpriteAffineAnimTable, sub_814580C + spr_template 1001, 1001, gOamData_840CAC0, gSpriteAnimTable_840CAE0, NULL, gDummySpriteAffineAnimTable, spritecb_814580C diff --git a/data/data2.s b/data/data2.s index e5802a44f..fd1fcc0a4 100644 --- a/data/data2.s +++ b/data/data2.s @@ -907,37 +907,37 @@ gUnknown_081F9674:: @ 81F9674 .align 2 gUnknown_081F9680:: @ 81F9680 - .4byte 0x030041D0 + .4byte gUnknown_030041D0 .2byte 0x20 .byte 0x13 .byte 0x10 .4byte BG_VRAM + 0xE104 - .4byte 0x03004250 + .4byte gUnknown_03004250 .2byte 0x40 .byte 0x13 .byte 0x10 .4byte BG_VRAM + 0xF104 - .4byte 0x030041D0 + .4byte gUnknown_030041D0 .2byte 0x60 .byte 0x13 .byte 0x30 .4byte BG_VRAM + 0xE204 - .4byte 0x03004250 + .4byte gUnknown_03004250 .2byte 0x80 .byte 0x13 .byte 0x30 .4byte BG_VRAM + 0xF204 - .4byte 0x030041D0 + .4byte gUnknown_030041D0 .2byte 0x20 .byte 0x13 .byte 0x18 .4byte BG_VRAM + 0xE1C4 - .4byte 0x03004250 + .4byte gUnknown_03004250 .2byte 0x40 .byte 0x13 .byte 0x18 diff --git a/data/decoration.s b/data/decoration.s index 0ca44c847..d37e41823 100644 --- a/data/decoration.s +++ b/data/decoration.s @@ -169,7 +169,7 @@ gSpriteAnimTable_83EC930:: @ 83EC930 .align 2 gSpriteImageTable_83EC934: @ 83EC934 - obj_frame_tiles 0x02038984, 0x800 + obj_frame_tiles gUnknown_02038900+0x84, 0x800 .align 2 gSpriteTemplate_83EC93C:: @ 83EC93C @@ -177,7 +177,7 @@ gSpriteTemplate_83EC93C:: @ 83EC93C .align 2 gUnknown_083EC954:: @ 83EC954 - obj_pal 0x02039184, 3000 + obj_pal gUnknown_02038900+0x884, 3000 .align 2 gUnknown_083EC95C:: @ 83EC95C diff --git a/data/diploma.s b/data/diploma.s index c4edb83d8..508e86c63 100644 --- a/data/diploma.s +++ b/data/diploma.s @@ -3,15 +3,3 @@ .section .rodata - .align 2 -gDiplomaPalettes:: @ 840CB0C - .incbin "graphics/misc/diploma_national.gbapal" - .incbin "graphics/misc/diploma_hoenn.gbapal" - - .align 2 -gDiplomaTilemap:: @ 840CB4C - .incbin "graphics/misc/diploma_map.bin.lz" - - .align 2 -gDiplomaTiles:: @ 840D288 - .incbin "graphics/misc/diploma.4bpp.lz" diff --git a/data/field_effect_helpers.s b/data/field_effect_helpers.s index 629d41df9..d22bd8dde 100644 --- a/data/field_effect_helpers.s +++ b/data/field_effect_helpers.s @@ -7,14 +7,16 @@ .align 2 .string "タマゴ$" + .align 1 gUnknown_08401E2C:: @ 8401E2C - .incbin "baserom.gba", 0x00401e2c, 0x6 + .2byte 0xC, 0x1C, 0x2C gUnknown_08401E32:: @ 8401E32 - .incbin "baserom.gba", 0x00401e32, 0x4 + .byte 0, 1, 2, 3 + .align 1 gUnknown_08401E36:: @ 8401E36 - .incbin "baserom.gba", 0x00401e36, 0xa + .2byte 4, 4, 4, 16 .align 2 gUnknown_08401E40:: @ 8401E40 @@ -28,7 +30,8 @@ gUnknown_08401E48:: @ 8401E48 .4byte sub_8127E30 gUnknown_08401E54:: @ 8401E54 - .incbin "baserom.gba", 0x00401e54, 0x6 + .byte 0, 0, 1, 2, 3 + .align 1 gUnknown_08401E5A:: @ 8401E5A - .incbin "baserom.gba", 0x00401e5a, 0x6 + .2byte 3, 7 diff --git a/data/field_map_obj.s b/data/field_map_obj.s index 9ff432961..ef39f3df6 100644 --- a/data/field_map_obj.s +++ b/data/field_map_obj.s @@ -3,19 +3,6 @@ .section .rodata -gUnknown_0830FD14:: @ 830FD14 - .byte 1, 1, 6, 7, 8, 9, 6, 7, 8, 9, 11, 11, 0, 0, 0, 0 - - .align 2 -gSpriteTemplate_830FD24:: @ 830FD24 - spr_template 0, 0xFFFF, gDummyOamData, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, ObjectCB_CameraObject - - .align 2 -gUnknown_0830FD3C:: @ 830FD3C - .4byte CameraObject_0 - .4byte CameraObject_1 - .4byte CameraObject_2 - @ 830FD48 .include "data/graphics/field_objects/map_object_graphics.inc" diff --git a/data/field_player_avatar.s b/data/field_player_avatar.s index 1491a1ad4..7935c693e 100644 --- a/data/field_player_avatar.s +++ b/data/field_player_avatar.s @@ -2,183 +2,3 @@ .include "constants/constants.inc" .section .rodata - - .align 2 -gUnknown_0830FB58:: @ 830FB58 - .4byte MetatileBehavior_IsTrickHouseSlipperyFloor - .4byte MetatileBehavior_IsIce_2 - .4byte MetatileBehavior_IsWalkSouth - .4byte MetatileBehavior_IsWalkNorth - .4byte MetatileBehavior_IsWalkWest - .4byte MetatileBehavior_IsWalkEast - .4byte MetatileBehavior_IsSouthwardCurrent - .4byte MetatileBehavior_IsNorthwardCurrent - .4byte MetatileBehavior_IsWestwardCurrent - .4byte MetatileBehavior_IsEastwardCurrent - .4byte MetatileBehavior_IsSlideSouth - .4byte MetatileBehavior_IsSlideNorth - .4byte MetatileBehavior_IsSlideWest - .4byte MetatileBehavior_IsSlideEast - .4byte MetatileBehavior_IsWaterfall - .4byte MetatileBehavior_0xBB - .4byte MetatileBehavior_0xBC - .4byte MetatileBehavior_IsMuddySlope - - .align 2 -gUnknown_0830FBA0:: @ 830FBA0 - .4byte ForcedMovement_None - .4byte ForcedMovement_Slip - .4byte ForcedMovement_Slip - .4byte sub_8058AAC - .4byte sub_8058AC4 - .4byte sub_8058ADC - .4byte sub_8058AF4 - .4byte sub_8058B0C - .4byte sub_8058B24 - .4byte sub_8058B3C - .4byte sub_8058B54 - .4byte ForcedMovement_SlideSouth - .4byte ForcedMovement_SlideNorth - .4byte ForcedMovement_SlideWest - .4byte ForcedMovement_SlideEast - .4byte sub_8058B0C - .4byte sub_8058C04 - .4byte sub_8058C10 - .4byte ForcedMovement_MuddySlope - - .align 2 -gUnknown_0830FBEC:: @ 830FBEC - .4byte PlayerNotOnBikeNotMoving - .4byte PlayerNotOnBikeTurningInPlace - .4byte sub_8058D0C - - .align 2 -gUnknown_0830FBF8:: @ 830FBF8 - .4byte MetatileBehavior_IsBumpySlope - .4byte MetatileBehavior_IsIsolatedVerticalRail - .4byte MetatileBehavior_IsIsolatedHorizontalRail - .4byte MetatileBehavior_IsVerticalRail - .4byte MetatileBehavior_IsHorizontalRail - -gUnknown_0830FC0C:: @ 830FC0C - .byte 0x9, 0xA, 0xB, 0xC, 0xD - - .align 2 -gUnknown_0830FC14:: @ 830FC14 - .4byte PlayerAvatarTransition_Normal - .4byte PlayerAvatarTransition_MachBike - .4byte PlayerAvatarTransition_AcroBike - .4byte PlayerAvatarTransition_Surfing - .4byte PlayerAvatarTransition_Underwater - .4byte sub_80591F4 - .4byte nullsub_49 - .4byte nullsub_49 - - .align 2 -gUnknown_0830FC34:: @ 830FC34 - .4byte MetatileBehavior_IsSouthArrowWarp - .4byte MetatileBehavior_IsNorthArrowWarp - .4byte MetatileBehavior_IsWestArrowWarp - .4byte MetatileBehavior_IsEastArrowWarp - -gUnknown_0830FC44:: @ 830FC44 - .byte MAP_OBJ_GFX_RIVAL_BRENDAN_NORMAL, MAP_OBJ_GFX_RIVAL_MAY_NORMAL - .byte MAP_OBJ_GFX_RIVAL_BRENDAN_MACH_BIKE, MAP_OBJ_GFX_RIVAL_MAY_MACH_BIKE - .byte MAP_OBJ_GFX_RIVAL_BRENDAN_ACRO_BIKE, MAP_OBJ_GFX_RIVAL_MAY_ACRO_BIKE - .byte MAP_OBJ_GFX_RIVAL_BRENDAN_SURFING, MAP_OBJ_GFX_RIVAL_MAY_SURFING - .byte MAP_OBJ_GFX_BRENDAN_UNDERWATER, MAP_OBJ_GFX_MAY_UNDERWATER - .byte MAP_OBJ_GFX_RIVAL_BRENDAN_FIELD_MOVE, MAP_OBJ_GFX_RIVAL_MAY_FIELD_MOVE - .byte MAP_OBJ_GFX_BRENDAN_FISHING, MAP_OBJ_GFX_MAY_FISHING - .byte MAP_OBJ_GFX_BRENDAN_WATERING, MAP_OBJ_GFX_MAY_WATERING - -gUnknown_0830FC54:: @ 830FC54 - .byte MAP_OBJ_GFX_BRENDAN_NORMAL, MAP_OBJ_GFX_MAY_NORMAL - .byte MAP_OBJ_GFX_BRENDAN_MACH_BIKE, MAP_OBJ_GFX_MAY_MACH_BIKE - .byte MAP_OBJ_GFX_BRENDAN_ACRO_BIKE, MAP_OBJ_GFX_MAY_ACRO_BIKE - .byte MAP_OBJ_GFX_BRENDAN_SURFING, MAP_OBJ_GFX_MAY_SURFING - .byte MAP_OBJ_GFX_BRENDAN_UNDERWATER, MAP_OBJ_GFX_MAY_UNDERWATER - .byte MAP_OBJ_GFX_BRENDAN_FIELD_MOVE, MAP_OBJ_GFX_MAY_FIELD_MOVE - .byte MAP_OBJ_GFX_BRENDAN_FISHING, MAP_OBJ_GFX_MAY_FISHING - .byte MAP_OBJ_GFX_BRENDAN_WATERING, MAP_OBJ_GFX_MAY_WATERING - -gUnknown_0830FC64:: @ 830FC64 - @ male - .byte MAP_OBJ_GFX_BRENDAN_NORMAL, 1 - .byte MAP_OBJ_GFX_BRENDAN_MACH_BIKE, 2 - .byte MAP_OBJ_GFX_BRENDAN_ACRO_BIKE, 4 - .byte MAP_OBJ_GFX_BRENDAN_SURFING, 8 - .byte MAP_OBJ_GFX_BRENDAN_UNDERWATER, 16 - @ female - .byte MAP_OBJ_GFX_MAY_NORMAL, 1 - .byte MAP_OBJ_GFX_MAY_MACH_BIKE, 2 - .byte MAP_OBJ_GFX_MAY_ACRO_BIKE, 4 - .byte MAP_OBJ_GFX_MAY_SURFING, 8 - .byte MAP_OBJ_GFX_MAY_UNDERWATER, 16 - - .align 2 -gUnknown_0830FC78:: @ 830FC78 - .4byte MetatileBehavior_IsSouthArrowWarp - .4byte MetatileBehavior_IsNorthArrowWarp - .4byte MetatileBehavior_IsWestArrowWarp - .4byte MetatileBehavior_IsEastArrowWarp - - .align 2 -gUnknown_0830FC88:: @ 830FC88 - .4byte sub_8059E84 - .4byte sub_8059EA4 - .4byte sub_8059F40 - - .align 2 -gUnknown_0830FC94:: @ 830FC94 - .4byte sub_805A000 - - .align 2 -gUnknown_0830FC98:: @ 830FC98 - .4byte sub_805A0D8 - .4byte sub_805A100 - .4byte sub_805A178 - .4byte sub_805A1B8 - -gUnknown_0830FCA8:: @ 830FCA8 - .byte DIR_WEST, DIR_EAST, DIR_NORTH, DIR_SOUTH - -gUnknown_0830FCAC:: @ 830FCAC - .byte 0x10, 0x10, 0x11, 0x12, 0x13 - - .align 2 -gUnknown_0830FCB4:: @ 830FCB4 - .4byte Fishing1 - .4byte Fishing2 - .4byte Fishing3 - .4byte Fishing4 - .4byte Fishing5 - .4byte Fishing6 - .4byte Fishing7 - .4byte Fishing8 - .4byte Fishing9 - .4byte Fishing10 - .4byte Fishing11 - .4byte Fishing12 - .4byte Fishing13 - .4byte Fishing14 - .4byte Fishing15 - .4byte Fishing16 - - .align 1 -gUnknown_0830FCF4:: @ 830FCF4 - .2byte 1, 1, 1 - - .align 1 -gUnknown_0830FCFA:: @ 830FCFA - .2byte 1, 3, 6 - -gUnknown_0830FD00:: @ 830FD00 - .string "·$" - - .align 1 -gUnknown_0830FD02:: @ 830FD02 - .2byte 36, 33, 30 - - .align 1 -gUnknown_0830FD08:: @ 830FD08 - .2byte 0, 0, 40, 10, 70, 30 diff --git a/data/field_tasks.s b/data/field_tasks.s index d7de1fe16..122e089e6 100644 --- a/data/field_tasks.s +++ b/data/field_tasks.s @@ -15,16 +15,51 @@ gUnknown_08376364:: @ 8376364 .4byte PerStepCallback_806A07C gUnknown_08376384:: @ 8376384 - .incbin "baserom.gba", 0x00376384, 0x20 + .byte 0, 0,0x59, 2, 0, 1,0x61, 2 + .byte 0, -1,0x59, 2, 0, 0,0x61, 2 + .byte 0, 0,0x52, 2, 1, 0,0x53, 2 + .byte -1, 0,0x52, 2, 0, 0,0x53, 2 gUnknown_083763A4:: @ 83763A4 - .incbin "baserom.gba", 0x003763a4, 0x20 + .byte 0, 0,0x5A, 2, 0, 1,0x62, 2 + .byte 0, -1,0x5A, 2, 0, 0,0x62, 2 + .byte 0, 0,0x54, 2, 1, 0,0x55, 2 + .byte -1, 0,0x54, 2, 0, 0,0x55, 2 gUnknown_083763C4:: @ 83763C4 - .incbin "baserom.gba", 0x003763c4, 0x20 + .byte 0, 0,0x58, 2, 0, 1,0x60, 2 + .byte 0, -1,0x58, 2, 0, 0,0x60, 2 + .byte 0, 0,0x50, 2, 1, 0,0x51, 2 + .byte -1, 0,0x50, 2, 0, 0,0x51, 2 + .align 1 gUnknown_083763E4:: @ 83763E4 - .incbin "baserom.gba", 0x003763e4, 0x34 + .2byte 0 + .2byte 0 + .2byte 0 + .2byte 0 + .2byte 0 + .2byte 0 + .2byte 0x4001 + .2byte 0x4002 + .2byte 0x4003 + .2byte 0x4004 + .2byte 0 + .2byte 0 + .2byte 0x4005 + .2byte 0x4006 + .2byte 0x4007 + .2byte 0 + .2byte 0 + .2byte 0x4008 + .2byte 0x4009 + .2byte 0x400A + .2byte 0 + .2byte 0 + .2byte 0 + .2byte 0 + .2byte 0 + .2byte 0 .align 1 gUnknown_08376418:: @ 8376418 diff --git a/data/hall_of_fame.s b/data/hall_of_fame.s index faf9c4fef..0795e7389 100644 --- a/data/hall_of_fame.s +++ b/data/hall_of_fame.s @@ -12,20 +12,29 @@ gUnknown_0840B524:: @ 840B524 obj_pal gContestConfetti_Pal, 1001 .space 8 + .align 2 gUnknown_0840B534:: @ 840B534 - .incbin "baserom.gba", 0x0040b534, 0x6 - -gUnknown_0840B53A:: @ 840B53A - .incbin "baserom.gba", 0x0040b53a, 0x2a + .2byte 120,210,120, 40 + .2byte 326,220, 56, 40 + .2byte -86,220,184, 40 + .2byte 120,-62,120, 88 + .2byte -25,-62,200, 88 + .2byte 265,-62, 40, 88 + .align 2 gUnknown_0840B564:: @ 840B564 - .incbin "baserom.gba", 0x0040b564, 0x6 - -gUnknown_0840B56A:: @ 840B56A - .incbin "baserom.gba", 0x0040b56a, 0x12 + .2byte 120,214,120, 64 + .2byte 281,214, 56, 64 + .2byte -41,214,184, 64 + .align 2 gUnknown_0840B57C:: @ 840B57C - .incbin "baserom.gba", 0x0040b57c, 0x1c + .2byte 1002 + .2byte 1002 + .space 0x10 + +@ unused data? + .byte 2, 1, 3, 6, 4, 5 .align 2 gOamData_840B598:: @ 840B598 diff --git a/data/heal_location.s b/data/heal_location.s deleted file mode 100644 index 101bec24f..000000000 --- a/data/heal_location.s +++ /dev/null @@ -1,29 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - - .align 2 -gHealLocations:: @ 83E5A20 - heal_location LittlerootTown_BrendansHouse_2F, 4, 2 - heal_location LittlerootTown_MaysHouse_2F, 4, 2 - heal_location PetalburgCity, 20, 17 - heal_location SlateportCity, 19, 20 - heal_location MauvilleCity, 22, 6 - heal_location RustboroCity, 16, 39 - heal_location FortreeCity, 5, 7 - heal_location LilycoveCity, 24, 15 - heal_location MossdeepCity, 28, 17 - heal_location SootopolisCity, 43, 32 - heal_location EverGrandeCity, 27, 49 - heal_location LittlerootTown, 5, 9 - heal_location LittlerootTown, 14, 9 - heal_location OldaleTown, 6, 17 - heal_location DewfordTown, 2, 11 - heal_location LavaridgeTown, 9, 7 - heal_location FallarborTown, 14, 8 - heal_location VerdanturfTown, 16, 4 - heal_location PacifidlogTown, 8, 16 - heal_location EverGrandeCity, 18, 6 - heal_location BattleTower_Outside, 14, 9 - heal_location SouthernIsland_Exterior, 15, 20 diff --git a/data/intro.s b/data/intro.s deleted file mode 100644 index 11cf7d2e5..000000000 --- a/data/intro.s +++ /dev/null @@ -1,514 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - - .align 2 -Palette_406340:: @ 8406340 - .incbin "baserom.gba", 0x406340, 0x20 - - .align 2 -Palette_406360:: @ 8406360 - .incbin "baserom.gba", 0x406360, 0x20 - - .align 2 -gIntroTiles:: - .incbin "graphics/intro/intro.4bpp.lz" - - .align 2 -gIntro1BGPals:: @ 8406974 - .incbin "graphics/intro/intro1_bgpal1.gbapal" - .incbin "graphics/intro/intro1_bgpal2.gbapal" - .incbin "graphics/intro/intro1_bgpal3.gbapal" - .incbin "graphics/intro/intro1_bgpal4.gbapal" - .incbin "graphics/intro/intro1_bgpal5.gbapal" - .incbin "graphics/intro/intro1_bgpal6.gbapal" - .incbin "graphics/intro/intro1_bgpal7.gbapal" - .incbin "graphics/intro/intro1_bgpal8.gbapal" - .incbin "graphics/intro/intro1_bgpal9.gbapal" - .incbin "graphics/intro/intro1_bgpal10.gbapal" - .incbin "graphics/intro/intro1_bgpal11.gbapal" - .incbin "graphics/intro/intro1_bgpal12.gbapal" - .incbin "graphics/intro/intro1_bgpal13.gbapal" - .incbin "graphics/intro/intro1_bgpal14.gbapal" - .incbin "graphics/intro/intro1_bgpal15.gbapal" - .incbin "graphics/intro/intro1_bgpal16.gbapal" - - .align 2 -gIntro1BG0_Tilemap:: @ 8406B74 - .incbin "graphics/intro/intro1_bg0_map.bin.lz" - - .align 2 -gIntro1BG1_Tilemap:: @ 8406F28 - .incbin "graphics/intro/intro1_bg1_map.bin.lz" - - .align 2 -gIntro1BG2_Tilemap:: @ 840725C - .incbin "graphics/intro/intro1_bg2_map.bin.lz" - - .align 2 -gIntro1BG3_Tilemap:: @ 840754C - .incbin "graphics/intro/intro1_bg3_map.bin.lz" - - .align 2 -gIntro1BGLeavesGfx:: @ 8407764 - .incbin "graphics/intro/introgfx.4bpp.lz" - - .align 2 -gIntro3PokeballPal:: @ 84098D4 - .incbin "graphics/intro/intro3_pokeball.gbapal" - - .align 2 -gIntro3Pokeball_Tilemap:: @ 8409AD4 - .incbin "graphics/intro/intro3_pokeball_map.bin.lz" - - .align 2 -gIntro3Pokeball_Gfx:: @ 8409C04 - .incbin "graphics/intro/intro3_pokeball.8bpp.lz" - - .align 2 -gIntro3Streaks_Pal:: @ 840A758 - .incbin "graphics/intro/intro3_streaks.gbapal" - - .align 2 -gIntro3Streaks_Gfx:: @ 840A778 - .incbin "graphics/intro/intro3_streaks.4bpp.lz" - - .align 2 -gIntro3Streaks_Tilemap:: @ 840A7E4 - .incbin "graphics/intro/intro3_streaks_map.bin.lz" - - .align 2 -gIntro3Misc1Palette:: - .incbin "graphics/intro/intro3_misc1.gbapal" - - .align 2 -gIntro3Misc2Palette:: - .incbin "graphics/intro/intro3_misc2.gbapal" - - .align 2 -gIntro3MiscTiles:: - .incbin "graphics/intro/intro3_misc.4bpp.lz" - - .align 2 -gIntro1EonPalette:: - .incbin "graphics/intro/intro1_eon.gbapal" - - .align 2 -gIntro1EonTiles:: - .incbin "graphics/intro/intro1_eon.4bpp.lz" - - .align 2 -gOamData_840ADE8:: @ 840ADE8 - .2byte 0x00A0 - .2byte 0x8000 - .2byte 0x0000 - - .align 2 -gSpriteAnim_840ADF0:: @ 840ADF0 - obj_image_anim_frame 16, 8 - obj_image_anim_end - - .align 2 -gSpriteAnim_840ADF8:: @ 840ADF8 - obj_image_anim_frame 24, 8 - obj_image_anim_end - - .align 2 -gSpriteAnim_840AE00:: @ 840AE00 - obj_image_anim_frame 0, 8 - obj_image_anim_end - - .align 2 -gSpriteAnim_840AE08:: @ 840AE08 - obj_image_anim_frame 48, 8 - obj_image_anim_end - - .align 2 -gSpriteAnimTable_840AE10:: @ 840AE10 - .4byte gSpriteAnim_840ADF0 - .4byte gSpriteAnim_840ADF8 - .4byte gSpriteAnim_840AE00 - .4byte gSpriteAnim_840AE08 - - .align 2 -gSpriteTemplate_840AE20:: @ 840AE20 - spr_template 2000, 2000, gOamData_840ADE8, gSpriteAnimTable_840AE10, NULL, gDummySpriteAffineAnimTable, sub_813D208 - - .align 2 -Unknown_40AE38: @ 840AE38 - .incbin "baserom.gba", 0x40ae38, 0x14 - - .align 2 -Unknown_40AE4C: @ 840AE4C - .incbin "baserom.gba", 0x40ae4c, 0x14 - - .align 2 -Unknown_40AE60: @ 840AE60 - .incbin "baserom.gba", 0x40ae60, 0x10 - - .align 2 -Unknown_40AE70: @ 840AE70 - .incbin "baserom.gba", 0x40ae70, 0x10 - - .align 2 -gUnknown_0840AE80:: @ 840AE80 - .4byte Unknown_40AE38 - .4byte Unknown_40AE4C - .4byte Unknown_40AE60 - .4byte Unknown_40AE70 - - .align 2 -gOamData_840AE90:: @ 840AE90 - .2byte 0x00A0 - .2byte 0x4000 - .2byte 0x0000 - - .align 2 -gOamData_840AE98:: @ 840AE98 - .2byte 0x00A0 - .2byte 0x0000 - .2byte 0x0000 - - .align 2 -gOamData_840AEA0:: @ 840AEA0 - .2byte 0x80A0 - .2byte 0xC000 - .2byte 0x0000 - - .align 2 -gSpriteAnim_840AEA8:: @ 840AEA8 - obj_image_anim_frame 80, 8 - obj_image_anim_end - - .align 2 -gSpriteAnim_840AEB0:: @ 840AEB0 - obj_image_anim_frame 84, 8 - obj_image_anim_end - - .align 2 -gSpriteAnim_840AEB8:: @ 840AEB8 - obj_image_anim_frame 88, 8 - obj_image_anim_end - - .align 2 -gSpriteAnim_840AEC0:: @ 840AEC0 - obj_image_anim_frame 92, 8 - obj_image_anim_end - - .align 2 -gSpriteAnim_840AEC8:: @ 840AEC8 - obj_image_anim_frame 96, 8 - obj_image_anim_end - - .align 2 -gSpriteAnim_840AED0:: @ 840AED0 - obj_image_anim_frame 100, 8 - obj_image_anim_end - - .align 2 -gSpriteAnim_840AED8:: @ 840AED8 - obj_image_anim_frame 104, 8 - obj_image_anim_end - - .align 2 -gSpriteAnim_840AEE0:: @ 840AEE0 - obj_image_anim_frame 112, 8 - obj_image_anim_end - - .align 2 -gSpriteAnim_840AEE8:: @ 840AEE8 - obj_image_anim_frame 113, 8 - obj_image_anim_end - - .align 2 -gSpriteAnim_840AEF0:: @ 840AEF0 - obj_image_anim_frame 114, 8 - obj_image_anim_end - - .align 2 -gSpriteAnim_840AEF8:: @ 840AEF8 - obj_image_anim_frame 115, 8 - obj_image_anim_end - - .align 2 -gSpriteAnim_840AF00:: @ 840AF00 - obj_image_anim_frame 116, 8 - obj_image_anim_end - - .align 2 -gSpriteAnim_840AF08:: @ 840AF08 - obj_image_anim_frame 117, 8 - obj_image_anim_end - - .align 2 -gSpriteAnim_840AF10:: @ 840AF10 - obj_image_anim_frame 128, 8 - obj_image_anim_end - - .align 2 -gSpriteAnimTable_840AF18:: @ 840AF18 - .4byte gSpriteAnim_840AEA8 - .4byte gSpriteAnim_840AEB0 - .4byte gSpriteAnim_840AEB8 - .4byte gSpriteAnim_840AEC0 - .4byte gSpriteAnim_840AEC8 - .4byte gSpriteAnim_840AED0 - .4byte gSpriteAnim_840AED8 - - .align 2 -gSpriteAnimTable_840AF34:: @ 840AF34 - .4byte gSpriteAnim_840AEE0 - .4byte gSpriteAnim_840AEE8 - .4byte gSpriteAnim_840AEF0 - .4byte gSpriteAnim_840AEF8 - .4byte gSpriteAnim_840AF00 - .4byte gSpriteAnim_840AF08 - - .align 2 -gSpriteAnimTable_840AF4C:: @ 840AF4C - .4byte gSpriteAnim_840AF10 - -gUnknown_0840AF50:: @ 840AF50 - .incbin "baserom.gba", 0x0040af50, 0x24 - -gUnknown_0840AF74:: @ 840AF74 - .incbin "baserom.gba", 0x0040af74, 0x20 - - .align 2 -gSpriteTemplate_840AF94:: @ 840AF94 - spr_template 2000, 2001, gOamData_840AE90, gSpriteAnimTable_840AF18, NULL, gDummySpriteAffineAnimTable, sub_813D908 - - .align 2 -gSpriteTemplate_840AFAC:: @ 840AFAC - spr_template 2000, 2001, gOamData_840AE98, gSpriteAnimTable_840AF34, NULL, gDummySpriteAffineAnimTable, sub_813D908 - - .align 2 -gSpriteTemplate_840AFC4:: @ 840AFC4 - spr_template 2000, 2001, gOamData_840AEA0, gSpriteAnimTable_840AF4C, NULL, gDummySpriteAffineAnimTable, sub_813D908 - - .align 2 -gOamData_840AFDC:: @ 840AFDC - .2byte 0x40A0 - .2byte 0xC000 - .2byte 0x0000 - - .align 2 -gSpriteAnim_840AFE4:: @ 840AFE4 - obj_image_anim_frame 0, 10 - obj_image_anim_jump 0 - - .align 2 -gSpriteAnimTable_840AFEC:: @ 840AFEC - .4byte gSpriteAnim_840AFE4 - - .align 2 -gSpriteTemplate_840AFF0:: @ 840AFF0 - spr_template 2002, 2002, gOamData_840AFDC, gSpriteAnimTable_840AFEC, NULL, gDummySpriteAffineAnimTable, sub_813DA64 - - .align 2 -gUnknown_0840B008:: @ 840B008 - obj_tiles gIntroTiles, 0x1400, 2000 - .space 8 - - .align 2 -gUnknown_0840B018:: @ 840B018 - obj_tiles gIntro1EonTiles, 0x400, 2002 - .space 8 - - .align 2 -gUnknown_0840B028:: @ 840B028 - obj_pal Palette_406340, 2000 - obj_pal Palette_406360, 2001 - obj_pal gIntro1EonPalette, 2002 - .space 8 - -gUnknown_0840B048:: @ 840B048 - .incbin "baserom.gba", 0x40b048, 0x8 - -gUnknown_0840B050:: @ 840B050 - .incbin "baserom.gba", 0x40b050, 0x8 - -gUnknown_0840B058:: @ 840B058 - .incbin "baserom.gba", 0x40b058, 0xc - - .align 2 -gUnknown_0840B064:: @ 840B064 - .4byte gUnknown_0840B048 - .4byte gUnknown_0840B050 - .4byte gUnknown_0840B058 - - .align 2 -gOamData_840B070:: @ 840B070 - .2byte 0x00A0 - .2byte 0x4000 - .2byte 0x0400 - - .align 2 -gSpriteAnim_840B078:: @ 840B078 - obj_image_anim_frame 0, 8 - obj_image_anim_end - - .align 2 -gSpriteAnimTable_840B080:: @ 840B080 - .4byte gSpriteAnim_840B078 - - .align 2 -gSpriteTemplate_840B084:: @ 840B084 - spr_template 2002, 2002, gOamData_840B070, gSpriteAnimTable_840B080, NULL, gDummySpriteAffineAnimTable, sub_813E30C - - .align 2 -gOamData_840B09C:: @ 840B09C - .2byte 0x00A0 - .2byte 0x0000 - .2byte 0x0400 - - .align 2 -gSpriteAnim_840B0A4:: @ 840B0A4 - obj_image_anim_frame 1, 8 - obj_image_anim_end - - .align 2 -gSpriteAnimTable_840B0AC:: @ 840B0AC - .4byte gSpriteAnim_840B0A4 - - .align 2 -gSpriteTemplate_840B0B0:: @ 840B0B0 - spr_template 2003, 2003, gOamData_840B09C, gSpriteAnimTable_840B0AC, NULL, gDummySpriteAffineAnimTable, sub_813E4B8 - - .align 2 -gOamData_840B0C8:: @ 840B0C8 - .2byte 0x00A0 - .2byte 0x0000 - .2byte 0x0400 - - .align 2 -gSpriteAnim_840B0D0:: @ 840B0D0 - obj_image_anim_frame 14, 8 - obj_image_anim_end - - .align 2 -gSpriteAnimTable_840B0D8:: @ 840B0D8 - .4byte gSpriteAnim_840B0D0 - - .align 2 -gSpriteTemplate_840B0DC:: @ 840B0DC - spr_template 2003, 2004, gOamData_840B0C8, gSpriteAnimTable_840B0D8, NULL, gDummySpriteAffineAnimTable, sub_813E5E0 - - .align 2 -gSpriteTemplate_840B0F4:: @ 840B0F4 - spr_template 2003, 2004, gOamData_840B0C8, gSpriteAnimTable_840B0D8, NULL, gDummySpriteAffineAnimTable, sub_813E6C0 - - .align 2 -gOamData_840B10C:: @ 840B10C - .2byte 0x00A0 - .2byte 0x4000 - .2byte 0x0400 - - .align 2 -gSpriteAnim_840B114:: @ 840B114 - obj_image_anim_frame 6, 8 - obj_image_anim_frame 6, 8, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_jump 0 - - .align 2 -gSpriteAnimTable_840B120:: @ 840B120 - .4byte gSpriteAnim_840B114 - - .align 2 -gSpriteTemplate_840B124:: @ 840B124 - spr_template 2003, 2004, gOamData_840B10C, gSpriteAnimTable_840B120, NULL, gDummySpriteAffineAnimTable, sub_813E804 - - .align 2 -gOamData_840B13C:: @ 840B13C - .2byte 0x00A0 - .2byte 0x4000 - .2byte 0x0400 - - .align 2 -gSpriteAnim_840B144:: @ 840B144 - obj_image_anim_frame 10, 8 - obj_image_anim_end - - .align 2 -gSpriteAnimTable_840B14C:: @ 840B14C - .4byte gSpriteAnim_840B144 - - .align 2 -gSpriteTemplate_840B150:: @ 840B150 - spr_template 2003, 2004, gOamData_840B13C, gSpriteAnimTable_840B14C, NULL, gDummySpriteAffineAnimTable, sub_813E980 - -gUnknown_0840B168:: @ 840B168 - .incbin "baserom.gba", 0x0040b168, 0x8 - - .align 2 -gSpriteTemplate_840B170:: @ 840B170 - spr_template 2003, 2004, gOamData_840B13C, gSpriteAnimTable_840B14C, NULL, gDummySpriteAffineAnimTable, sub_813EA60 - -gUnknown_0840B188:: @ 840B188 - .incbin "baserom.gba", 0x0040b188, 0x14 - - .align 2 -gOamData_840B19C:: @ 840B19C - .2byte 0x00A0 - .2byte 0x4000 - .2byte 0x0400 - - .align 2 -gSpriteAnim_840B1A4:: @ 840B1A4 - obj_image_anim_frame 2, 8 - obj_image_anim_end - - .align 2 -gSpriteAnimTable_840B1AC:: @ 840B1AC - .4byte gSpriteAnim_840B1A4 - - .align 2 -gSpriteTemplate_840B1B0:: @ 840B1B0 - spr_template 2003, 2004, gOamData_840B19C, gSpriteAnimTable_840B1AC, NULL, gDummySpriteAffineAnimTable, sub_813EBBC - - .align 2 -gSpriteTemplate_840B1C8:: @ 840B1C8 - spr_template 2003, 2004, gOamData_840B19C, gSpriteAnimTable_840B1AC, NULL, gDummySpriteAffineAnimTable, sub_813EC90 - - .align 2 -gOamData_840B1E0:: @ 840B1E0 - .2byte 0x00A0 - .2byte 0xC000 - .2byte 0x0400 - - .align 2 -gSpriteAnim_840B1E8:: @ 840B1E8 - obj_image_anim_frame 16, 8 - obj_image_anim_end - - .align 2 -gSpriteAnimTable_840B1F0:: @ 840B1F0 - .4byte gSpriteAnim_840B1E8 - - .align 2 -gSpriteTemplate_840B1F4:: @ 840B1F4 - spr_template 2003, 2003, gOamData_840B1E0, gSpriteAnimTable_840B1F0, NULL, gDummySpriteAffineAnimTable, sub_813EDFC - - .align 2 -gIntro3PokeballGfx_Table:: @ 840B20C - obj_tiles gInterfaceGfx_PokeBall, 0x100, 2002 - .space 8 - - .align 2 -gIntro3MiscGfx_Table:: @ 840B21C - obj_tiles gIntro3MiscTiles, 0xa00, 2003 - .space 8 - - .align 2 -gInterfacePokeballPal_Table:: @ 840B22C - obj_pal gInterfacePal_PokeBall, 2002 - .space 8 - - .align 2 -gIntro3MiscPal_Table:: @ 840B23C - obj_pal gIntro3Misc1Palette, 2003 - obj_pal gIntro3Misc2Palette, 2004 - .space 8 - - .incbin "baserom.gba", 0x0040b254, 0x4 diff --git a/data/intro_credits_graphics.s b/data/intro_credits_graphics.s index 6320bc332..82931f6ee 100644 --- a/data/intro_credits_graphics.s +++ b/data/intro_credits_graphics.s @@ -7,10 +7,10 @@ gUnknown_084121FC:: @ 84121FC .incbin "graphics/intro/intro2_grass.gbapal" gUnknown_0841221C:: @ 841221C - .incbin "baserom.gba", 0x0041221c, 0x20 + .incbin "graphics/intro/intro2_grass_afternoon.gbapal" gUnknown_0841223C:: @ 841223C - .incbin "baserom.gba", 0x0041223c, 0x20 + .incbin "graphics/intro/intro2_grass_night.gbapal" .align 2 gUnknown_0841225C:: @ 841225C @@ -21,10 +21,10 @@ gUnknown_084126DC:: @ 84126DC .incbin "graphics/intro/intro2_grass_map.bin.lz" gUnknown_08412818:: @ 8412818 - .incbin "baserom.gba", 0x00412818, 0x60 + .incbin "graphics/intro/8412818.gbapal" gUnknown_08412878:: @ 8412878 - .incbin "baserom.gba", 0x00412878, 0x60 + .incbin "graphics/intro/8412878.gbapal" .align 2 gUnknown_084128D8:: @ 84128D8 @@ -38,16 +38,16 @@ gUnknown_08413184:: @ 8413184 .incbin "graphics/intro/intro2_bgclouds.gbapal" gUnknown_084131A4:: @ 84131A4 - .incbin "baserom.gba", 0x004131a4, 0x20 + .incbin "graphics/intro/intro2_bgclouds_afternoon.gbapal" gUnknown_084131C4:: @ 84131C4 .incbin "graphics/intro/intro2_bgclouds2.4bpp.lz" gUnknown_08413300:: @ 8413300 - .incbin "baserom.gba", 0x00413300, 0x20 + .incbin "graphics/intro/intro2_bgtrees2.gbapal" gUnknown_08413320:: @ 8413320 - .incbin "baserom.gba", 0x00413320, 0x20 + .incbin "graphics/intro/intro2_bgtrees2_afternoon.gbapal" .align 2 gUnknown_08413340:: @ 8413340 @@ -66,7 +66,7 @@ gIntro2TreeTiles:: @ 8413CEC .incbin "graphics/intro/intro2_bgtreessmall.4bpp.lz" gUnknown_08413E38:: @ 8413E38 - .incbin "baserom.gba", 0x00413e38, 0x40 @ two palettes? + .incbin "graphics/intro/8413E38.gbapal" .align 2 gUnknown_08413E78:: @ 8413E78 @@ -160,8 +160,36 @@ gSpriteAnimTable_8416B84:: @ 8416B84 .4byte gSpriteAnim_8416B74 .4byte gSpriteAnim_8416B7C +@ array of 8-byte structs + .align 2 gUnknown_08416B94:: @ 8416B94 - .incbin "baserom.gba", 0x00416b94, 0x48 + .byte -128, 72, 32, 100 + .2byte 0xC00 + .space 2 + .byte -128, -98, 32, 100 + .2byte 0xC00 + .space 2 + .byte 65, -64, 40, 101 + .2byte 0x800 + .space 2 + .byte 65, 56, 40, 101 + .2byte 0x800 + .space 2 + .byte 18, 100, 44, 102 + .2byte 0x400 + .space 2 + .byte 18, -104, 44, 102 + .2byte 0x400 + .space 2 + .byte 19, 8, 46, 103 + .2byte 0x100 + .space 2 + .byte 19, 56, 46, 103 + .2byte 0x100 + .space 2 + .byte 19, -16, 46, 103 + .2byte 0x100 + .space 2 .align 2 gUnknown_08416BDC:: @ 8416BDC @@ -189,8 +217,45 @@ gSpriteAnimTable_8416C04:: @ 8416C04 .4byte gSpriteAnim_8416BF4 .4byte gSpriteAnim_8416BFC +@ array of 8-byte structs + .align 2 gUnknown_08416C10:: @ 8416C10 - .incbin "baserom.gba", 0x00416c10, 0x60 + .byte -128, 16, 88, 100 + .2byte 0x2000 + .space 2 + .byte -128, 80, 88, 100 + .2byte 0x2000 + .space 2 + .byte -128, -112, 88, 100 + .2byte 0x2000 + .space 2 + .byte -128, -48, 88, 100 + .2byte 0x2000 + .space 2 + .byte -95, 40, 88, 101 + .2byte 0x1000 + .space 2 + .byte -95, 104, 88, 101 + .2byte 0x1000 + .space 2 + .byte -95, -88, 88, 101 + .2byte 0x1000 + .space 2 + .byte -95, -24, 88, 101 + .2byte 0x1000 + .space 2 + .byte -94, 56, 88, 102 + .2byte 0x800 + .space 2 + .byte -94, 120, 88, 102 + .2byte 0x800 + .space 2 + .byte -94, -72, 88, 102 + .2byte 0x800 + .space 2 + .byte -94, -8, 88, 102 + .2byte 0x800 + .space 2 .align 2 gUnknown_08416C70:: @ 8416C70 @@ -206,8 +271,27 @@ gSpriteAnim_8416C80:: @ 8416C80 gSpriteAnimTable_8416C88:: @ 8416C88 .4byte gSpriteAnim_8416C80 +@ array of 8-byte structs + .align 2 gUnknown_08416C8C:: @ 8416C8C - .incbin "baserom.gba", 0x00416c8c, 0x30 + .byte -128, 24, 88, 100 + .2byte 0x1000 + .space 2 + .byte -128, 64, 88, 100 + .2byte 0x1000 + .space 2 + .byte -128, 104, 88, 100 + .2byte 0x1000 + .space 2 + .byte -128, -112, 88, 100 + .2byte 0x1000 + .space 2 + .byte -128, -72, 88, 100 + .2byte 0x1000 + .space 2 + .byte -128, -32, 88, 100 + .2byte 0x1000 + .space 2 .align 2 gOamData_8416CBC:: @ 8416CBC diff --git a/data/matsuda_debug_menu.s b/data/matsuda_debug_menu.s index b7da90fd4..d1ce9fc3d 100644 --- a/data/matsuda_debug_menu.s +++ b/data/matsuda_debug_menu.s @@ -50,7 +50,10 @@ Unknown_083C924E: .incbin "graphics/unknown/ball.gbapal" gUnknown_083C926E:: @ 83C926E - .incbin "baserom.gba", 0x003c926e, 0x8 + .byte 2, 0 + .byte 17, 0 + .byte 2, 2 + .byte 17, 2 gMatsudaDebugMenuContestTopLeft:: @ 83C9276 .byte 0, 6 @@ -61,10 +64,18 @@ gMatsudaDebugMenuContestTopLeft:: @ 83C9276 .byte 15, 10 gUnknown_083C9282:: @ 83C9282 - .incbin "baserom.gba", 0x003c9282, 0xc + .byte 7, 6 + .byte 22, 6 + .byte 7, 8 + .byte 22, 8 + .byte 7, 10 + .byte 22, 10 gUnknown_083C928E:: @ 83C928E - .incbin "baserom.gba", 0x003c928e, 0x8 + .byte 2, 14 + .byte 17, 14 + .byte 2, 16 + .byte 17, 16 gUnknown_083C9296:: @ 83C9296 .byte 0x08, 0x80, 0x08, 0x80, 0x10, 0x10, 0x30, 0xA8, 0x30, 0xA8, 0x30, 0xA8, 0x08, 0x80, 0x08, 0x80, 0x10, 0x88 @@ -178,5 +189,9 @@ gMatsudaDebugMenuTextList3:: @ 83C93F0 .4byte MatsudaDebugMenuText_Slateport @ Hyper .4byte MatsudaDebugMenuText_Lilycove @ Master +@ OamData + .align 2 gUnknown_083C9400:: @ 83C9400 - .incbin "baserom.gba", 0x003c9400, 0x8 + .2byte 0x4000 + .2byte 0x4000 + .2byte 0xF3FF diff --git a/data/menu_cursor.s b/data/menu_cursor.s index 0e12c519c..f3c5fe956 100644 --- a/data/menu_cursor.s +++ b/data/menu_cursor.s @@ -134,11 +134,11 @@ gUnknown_0842F1C0:: @ 842F1C0 .align 2 gUnknown_0842F240:: @ 842F240 - obj_pal 0x0203a360, 0xfff0 + obj_pal gUnknown_0203A360, 0xfff0 .align 2 gUnknown_0842F248:: @ 842F248 - obj_pal 0x0203a360, 0xfff1 + obj_pal gUnknown_0203A360, 0xfff1 .align 2 gSpriteTemplate_842F250:: @ 842F250 diff --git a/data/metatile_behavior.s b/data/metatile_behavior.s deleted file mode 100644 index 6588828d0..000000000 --- a/data/metatile_behavior.s +++ /dev/null @@ -1,246 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - -gUnknown_08308E2C:: @ 8308E2C - .byte 0b100 - .byte 0b000 - .byte 0b101 - .byte 0b101 - .byte 0b000 - .byte 0b001 - .byte 0b101 - .byte 0b100 - .byte 0b101 - .byte 0b100 - .byte 0b100 - .byte 0b101 - .byte 0b100 - .byte 0b000 - .byte 0b000 - .byte 0b100 - .byte 0b111 - .byte 0b111 - .byte 0b111 - .byte 0b110 - .byte 0b110 - .byte 0b111 - .byte 0b100 - .byte 0b100 - .byte 0b000 - .byte 0b110 - .byte 0b000 - .byte 0b100 - .byte 0b100 - .byte 0b000 - .byte 0b000 - .byte 0b000 - .byte 0b100 - .byte 0b100 - .byte 0b111 - .byte 0b100 - .byte 0b101 - .byte 0b101 - .byte 0b100 - .byte 0b100 - .byte 0b100 - .byte 0b100 - .byte 0b111 - .byte 0b100 - .byte 0b000 - .byte 0b000 - .byte 0b000 - .byte 0b000 - .byte 0b100 - .byte 0b100 - .byte 0b100 - .byte 0b100 - .byte 0b100 - .byte 0b100 - .byte 0b100 - .byte 0b100 - .byte 0b000 - .byte 0b000 - .byte 0b000 - .byte 0b000 - .byte 0b100 - .byte 0b100 - .byte 0b100 - .byte 0b100 - .byte 0b100 - .byte 0b100 - .byte 0b100 - .byte 0b100 - .byte 0b100 - .byte 0b100 - .byte 0b100 - .byte 0b100 - .byte 0b100 - .byte 0b100 - .byte 0b100 - .byte 0b000 - .byte 0b000 - .byte 0b000 - .byte 0b000 - .byte 0b000 - .byte 0b110 - .byte 0b110 - .byte 0b110 - .byte 0b110 - .byte 0b000 - .byte 0b000 - .byte 0b000 - .byte 0b000 - .byte 0b000 - .byte 0b000 - .byte 0b000 - .byte 0b000 - .byte 0b000 - .byte 0b000 - .byte 0b000 - .byte 0b000 - .byte 0b100 - .byte 0b100 - .byte 0b100 - .byte 0b100 - .byte 0b100 - .byte 0b100 - .byte 0b100 - .byte 0b100 - .byte 0b100 - .byte 0b100 - .byte 0b100 - .byte 0b100 - .byte 0b110 - .byte 0b110 - .byte 0b100 - .byte 0b110 - .byte 0b000 - .byte 0b100 - .byte 0b100 - .byte 0b100 - .byte 0b100 - .byte 0b100 - .byte 0b100 - .byte 0b100 - .byte 0b100 - .byte 0b000 - .byte 0b000 - .byte 0b000 - .byte 0b000 - .byte 0b000 - .byte 0b000 - .byte 0b000 - .byte 0b000 - .byte 0b000 - .byte 0b000 - .byte 0b000 - .byte 0b000 - .byte 0b000 - .byte 0b000 - .byte 0b000 - .byte 0b000 - .byte 0b000 - .byte 0b000 - .byte 0b000 - .byte 0b000 - .byte 0b000 - .byte 0b000 - .byte 0b000 - .byte 0b000 - .byte 0b000 - .byte 0b000 - .byte 0b000 - .byte 0b000 - .byte 0b000 - .byte 0b000 - .byte 0b000 - .byte 0b000 - .byte 0b000 - .byte 0b000 - .byte 0b000 - .byte 0b000 - .byte 0b000 - .byte 0b000 - .byte 0b000 - .byte 0b000 - .byte 0b000 - .byte 0b000 - .byte 0b000 - .byte 0b000 - .byte 0b000 - .byte 0b000 - .byte 0b000 - .byte 0b000 - .byte 0b000 - .byte 0b000 - .byte 0b000 - .byte 0b000 - .byte 0b000 - .byte 0b000 - .byte 0b000 - .byte 0b000 - .byte 0b000 - .byte 0b100 - .byte 0b100 - .byte 0b000 - .byte 0b100 - .byte 0b000 - .byte 0b000 - .byte 0b100 - .byte 0b100 - .byte 0b100 - .byte 0b100 - .byte 0b100 - .byte 0b100 - .byte 0b100 - .byte 0b000 - .byte 0b100 - .byte 0b100 - .byte 0b100 - .byte 0b100 - .byte 0b100 - .byte 0b100 - .byte 0b000 - .byte 0b000 - .byte 0b000 - .byte 0b000 - .byte 0b000 - .byte 0b000 - .byte 0b000 - .byte 0b000 - .byte 0b000 - .byte 0b000 - .byte 0b100 - .byte 0b100 - .byte 0b100 - .byte 0b100 - .byte 0b100 - .byte 0b100 - .byte 0b100 - .byte 0b000 - .byte 0b000 - .byte 0b000 - .byte 0b000 - .byte 0b000 - .byte 0b000 - .byte 0b000 - .byte 0b000 - .byte 0b000 - .byte 0b000 - .byte 0b000 - .byte 0b000 - .byte 0b000 - .byte 0b000 - .byte 0b000 - .byte 0b000 - .byte 0b000 - .byte 0b000 - .byte 0b000 - .byte 0b000 - .byte 0b000 - .byte 0b000 - .byte 0b000 - .byte 0b000 - .byte 0b000 diff --git a/data/multichoice.inc b/data/multichoice.inc deleted file mode 100644 index 256038c23..000000000 --- a/data/multichoice.inc +++ /dev/null @@ -1,471 +0,0 @@ - .align 2 -MultichoiceList_00: - .4byte OtherText_Petalburg, 0 - .4byte OtherText_Slateport, 0 - .4byte gOtherText_CancelNoTerminator, 0 - - .align 2 -MultichoiceList_02: - .4byte OtherText_Enter, 0 - .4byte OtherText_Info3, 0 - .4byte gOtherText_CancelNoTerminator, 0 - - .align 2 -MultichoiceList_03: - .4byte OtherText_WhatsAContest, 0 - .4byte OtherText_TypesOfContest, 0 - .4byte OtherText_Ranks, 0 - .4byte gOtherText_CancelNoTerminator, 0 - - .align 2 -MultichoiceList_04: - .4byte OtherText_CoolContest, 0 - .4byte OtherText_BeautyContest, 0 - .4byte OtherText_CuteContest, 0 - .4byte OtherText_SmartContest, 0 - .4byte OtherText_ToughContest, 0 - .4byte gOtherText_CancelNoTerminator, 0 - - .align 2 -MultichoiceList_06: - .4byte OtherText_Decoration, 0 - .4byte OtherText_PackUp, 0 - .4byte OtherText_Registry, 0 - .4byte gOtherText_CancelNoTerminator, 0 - - .align 2 -MultichoiceList_05: - .4byte OtherText_Decoration, 0 - .4byte OtherText_PackUp, 0 - .4byte gOtherText_CancelNoTerminator, 0 - - .align 2 -MultichoiceList_07: - .4byte OtherText_Register, 0 - .4byte OtherText_Registry, 0 - .4byte OtherText_Information, 0 - .4byte gOtherText_CancelNoTerminator, 0 - - .align 2 -MultichoiceList_12: - .4byte OtherText_Mach, 0 - .4byte OtherText_Acro, 0 - - .align 2 -MultichoiceList_13: - .4byte OtherText_Poison, 0 - .4byte OtherText_Paralysis, 0 - .4byte OtherText_Sleep, 0 - .4byte OtherText_Burn, 0 - .4byte OtherText_Frozen, 0 - .4byte gOtherText_CancelNoTerminator, 0 - - .align 2 -MultichoiceList_14: - .4byte OtherText_Dewford, 0 - .4byte gOtherText_CancelNoTerminator, 0 - - .align 2 -MultichoiceList_16: - .4byte OtherText_SawIt, 0 - .4byte OtherText_NotYet, 0 - - .align 2 -MultichoiceList_17: - .4byte OtherText_Yes, 0 - .4byte OtherText_No, 0 - .4byte OtherText_Info3, 0 - - .align 2 -MultichoiceList_18: - .4byte OtherText_SingleBattle, 0 - .4byte OtherText_DoubleBattle, 0 - .4byte OtherText_MultiBattle, 0 - .4byte gOtherText_CancelNoTerminator, 0 - - .align 2 -MultichoiceList_19: - .4byte OtherText_Littleroot, 0 - .4byte OtherText_Slateport, 0 - .4byte OtherText_Lilycove, 0 - - .align 2 -MultichoiceList_20: - .4byte OtherText_Yes, 0 - .4byte OtherText_No, 0 - .4byte OtherText_Info3, 0 - - .align 2 -MultichoiceList_23: - .4byte OtherText_MakeAChallenge, 0 - .4byte OtherText_ObtainInformation, 0 - .4byte gOtherText_CancelNoTerminator, 0 - - .align 2 -MultichoiceList_24: - .4byte OtherText_Lv50_2, 0 - .4byte OtherText_Lv100_2, 0 - .4byte gOtherText_CancelNoTerminator, 0 - - .align 2 -MultichoiceList_25: - .4byte OtherText_Zigzagoon, 0 - .4byte OtherText_Nincada, 0 - .4byte OtherText_Poochyena, 0 - - .align 2 -MultichoiceList_26: - .4byte OtherText_Nincada2, 0 - .4byte OtherText_Lotad, 0 - .4byte OtherText_Roselia, 0 - - .align 2 -MultichoiceList_27: - .4byte OtherText_Shroomish, 0 - .4byte OtherText_Nincada3, 0 - .4byte OtherText_Surskit, 0 - - .align 2 -MultichoiceList_28: - .4byte OtherText_Treecko, 0 - .4byte OtherText_Torchic, 0 - .4byte OtherText_Mudkip, 0 - - .align 2 -MultichoiceList_29: - .4byte OtherText_Seedot, 0 - .4byte OtherText_Shroomish2, 0 - .4byte OtherText_Spinda, 0 - - .align 2 -MultichoiceList_30: - .4byte OtherText_Shroomish3, 0 - .4byte OtherText_Zigzagoon2, 0 - .4byte OtherText_Wurmple, 0 - - .align 2 -MultichoiceList_31: - .4byte OtherText_PokeBall, 0 - .4byte OtherText_SuperPotion, 0 - .4byte OtherText_SamePrice, 0 - - .align 2 -MultichoiceList_32: - .4byte OtherText_Yen135, 0 - .4byte OtherText_Yen155, 0 - .4byte OtherText_Yen175, 0 - - .align 2 -MultichoiceList_33: - .4byte OtherText_CostMore, 0 - .4byte OtherText_CostLess, 0 - .4byte OtherText_SamePrice2, 0 - - .align 2 -MultichoiceList_34: - .4byte OtherText_MaleSymbol, 0 - .4byte OtherText_FemaleSymbol, 0 - .4byte OtherText_Neither, 0 - - .align 2 -MultichoiceList_35: - .4byte OtherText_Males, 0 - .4byte OtherText_Females, 0 - .4byte OtherText_SameNumber, 0 - - .align 2 -MultichoiceList_36: - .4byte OtherText_Male, 0 - .4byte OtherText_Female, 0 - .4byte OtherText_ItDepends, 0 - - .align 2 -MultichoiceList_37: - .4byte OtherText_Six2, 0 - .4byte OtherText_Eight2, 0 - .4byte OtherText_Ten, 0 - - .align 2 -MultichoiceList_38: - .4byte OtherText_One, 0 - .4byte OtherText_Two, 0 - .4byte OtherText_Three, 0 - - .align 2 -MultichoiceList_39: - .4byte OtherText_Six, 0 - .4byte OtherText_Seven, 0 - .4byte OtherText_Eight, 0 - - .align 2 -MultichoiceList_42: - .4byte OtherText_FreshWater, 0 - .4byte OtherText_SodaPop, 0 - .4byte OtherText_Lemonade, 0 - .4byte gOtherText_CancelNoTerminator, 0 - - .align 2 -MultichoiceList_43: - .4byte OtherText_HowToRide, 0 - .4byte OtherText_HowToTurn, 0 - .4byte OtherText_SandySlopes, 0 - .4byte gOtherText_CancelNoTerminator, 0 - - .align 2 -MultichoiceList_44: - .4byte OtherText_Wheelies, 0 - .4byte OtherText_BunnyHops, 0 - .4byte OtherText_Jumping, 0 - .4byte gOtherText_CancelNoTerminator, 0 - - .align 2 -MultichoiceList_45: - .4byte OtherText_Satisfied, 0 - .4byte OtherText_Dissatisfied, 0 - - .align 2 -MultichoiceList_46: - .4byte OtherText_Deepseatooth, 0 - .4byte OtherText_Deepseascale, 0 - .4byte gOtherText_CancelNoTerminator, 0 - - .align 2 -MultichoiceList_47: - .4byte OtherText_BlueFlute2, 0 - .4byte OtherText_YellowFlute2, 0 - .4byte OtherText_RedFlute2, 0 - .4byte OtherText_WhiteFlute2, 0 - .4byte OtherText_BlackFlute2, 0 - .4byte OtherText_GlassChair, 0 - .4byte OtherText_GlassDesk, 0 - .4byte gOtherText_CancelNoTerminator, 0 - - .align 2 -MultichoiceList_48: - .4byte OtherText_TreeckoDoll, 0 - .4byte OtherText_TorchicDoll, 0 - .4byte OtherText_MudkipDoll, 0 - .4byte gOtherText_CancelNoTerminator, 0 - - .align 2 -MultichoiceList_55: - .4byte OtherText_TM32, 0 - .4byte OtherText_TM29, 0 - .4byte OtherText_TM35, 0 - .4byte OtherText_TM24, 0 - .4byte OtherText_TM13, 0 - .4byte gOtherText_CancelNoTerminator, 0 - - .align 2 -MultichoiceList_49: - .4byte OtherText_50Coins, 0 - .4byte OtherText_500Coins, 0 - .4byte gOtherText_CancelNoTerminator, 0 - - .align 2 -MultichoiceList_50: - .4byte OtherText_Excellent, 0 - .4byte OtherText_NotSoHot, 0 - - .align 2 -MultichoiceList_52: - .4byte OtherText_Lilycove, 0 - .4byte OtherText_BattleTower, 0 - .4byte gOtherText_CancelNoTerminator, 0 - - .align 2 -MultichoiceList_53: - .4byte OtherText_Slateport, 0 - .4byte OtherText_Lilycove, 0 - .4byte gOtherText_CancelNoTerminator, 0 - - .align 2 -MultichoiceList_54: - .4byte OtherText_Right, 0 - .4byte OtherText_Left, 0 - - .align 2 -MultichoiceList_56: - .4byte OtherText_Slateport, 0 - .4byte OtherText_BattleTower, 0 - .4byte gOtherText_CancelNoTerminator, 0 - - .align 2 -MultichoiceList_57: - .4byte OtherText_1F_2, 0 - .4byte OtherText_2F_2, 0 - .4byte OtherText_3F_2, 0 - .4byte OtherText_4F_2, 0 - .4byte OtherText_5F_2, 0 - - .align 2 -MultichoiceList_58: - .4byte OtherText_RedShard, 0 - .4byte gOtherText_CancelNoTerminator, 0 - - .align 2 -MultichoiceList_59: - .4byte OtherText_YellowShard, 0 - .4byte gOtherText_CancelNoTerminator, 0 - - .align 2 -MultichoiceList_60: - .4byte OtherText_RedShard, 0 - .4byte OtherText_YellowShard, 0 - .4byte gOtherText_CancelNoTerminator, 0 - - .align 2 -MultichoiceList_61: - .4byte OtherText_BlueShard, 0 - .4byte gOtherText_CancelNoTerminator, 0 - - .align 2 -MultichoiceList_62: - .4byte OtherText_RedShard, 0 - .4byte OtherText_BlueShard, 0 - .4byte gOtherText_CancelNoTerminator, 0 - - .align 2 -MultichoiceList_63: - .4byte OtherText_YellowShard, 0 - .4byte OtherText_BlueShard, 0 - .4byte gOtherText_CancelNoTerminator, 0 - - .align 2 -MultichoiceList_64: - .4byte OtherText_RedShard, 0 - .4byte OtherText_YellowShard, 0 - .4byte OtherText_BlueShard, 0 - .4byte gOtherText_CancelNoTerminator, 0 - - .align 2 -MultichoiceList_65: - .4byte OtherText_GreenShard, 0 - .4byte gOtherText_CancelNoTerminator, 0 - - .align 2 -MultichoiceList_66: - .4byte OtherText_RedShard, 0 - .4byte OtherText_GreenShard, 0 - .4byte gOtherText_CancelNoTerminator, 0 - - .align 2 -MultichoiceList_67: - .4byte OtherText_YellowShard, 0 - .4byte OtherText_GreenShard, 0 - .4byte gOtherText_CancelNoTerminator, 0 - - .align 2 -MultichoiceList_68: - .4byte OtherText_RedShard, 0 - .4byte OtherText_YellowShard, 0 - .4byte OtherText_GreenShard, 0 - .4byte gOtherText_CancelNoTerminator, 0 - - .align 2 -MultichoiceList_69: - .4byte OtherText_BlueShard, 0 - .4byte OtherText_GreenShard, 0 - .4byte gOtherText_CancelNoTerminator, 0 - - .align 2 -MultichoiceList_70: - .4byte OtherText_RedShard, 0 - .4byte OtherText_BlueShard, 0 - .4byte OtherText_GreenShard, 0 - .4byte gOtherText_CancelNoTerminator, 0 - - .align 2 -MultichoiceList_71: - .4byte OtherText_YellowShard, 0 - .4byte OtherText_BlueShard, 0 - .4byte OtherText_GreenShard, 0 - .4byte gOtherText_CancelNoTerminator, 0 - - .align 2 -MultichoiceList_72: - .4byte OtherText_RedShard, 0 - .4byte OtherText_YellowShard, 0 - .4byte OtherText_BlueShard, 0 - .4byte OtherText_GreenShard, 0 - .4byte gOtherText_CancelNoTerminator, 0 - - .align 2 -MultichoiceList_01: - .4byte gOtherText_CancelNoTerminator, 0 - - .align 2 -gMultichoiceLists:: @ 83CDE00 - .4byte MultichoiceList_00, 3 - .4byte MultichoiceList_01, 1 - .4byte MultichoiceList_02, 3 - .4byte MultichoiceList_03, 4 - .4byte MultichoiceList_04, 6 - .4byte MultichoiceList_05, 3 - .4byte MultichoiceList_06, 4 - .4byte MultichoiceList_07, 4 - .4byte MultichoiceList_01, 1 - .4byte MultichoiceList_01, 1 - .4byte MultichoiceList_01, 1 - .4byte MultichoiceList_01, 1 - .4byte MultichoiceList_12, 2 - .4byte MultichoiceList_13, 6 - .4byte MultichoiceList_14, 2 - .4byte MultichoiceList_01, 1 - .4byte MultichoiceList_16, 2 - .4byte MultichoiceList_17, 3 - .4byte MultichoiceList_18, 4 - .4byte MultichoiceList_19, 3 - .4byte MultichoiceList_20, 3 - .4byte MultichoiceList_01, 1 - .4byte MultichoiceList_01, 1 - .4byte MultichoiceList_23, 3 - .4byte MultichoiceList_24, 3 - .4byte MultichoiceList_25, 3 - .4byte MultichoiceList_26, 3 - .4byte MultichoiceList_27, 3 - .4byte MultichoiceList_28, 3 - .4byte MultichoiceList_29, 3 - .4byte MultichoiceList_30, 3 - .4byte MultichoiceList_31, 3 - .4byte MultichoiceList_32, 3 - .4byte MultichoiceList_33, 3 - .4byte MultichoiceList_34, 3 - .4byte MultichoiceList_35, 3 - .4byte MultichoiceList_36, 3 - .4byte MultichoiceList_37, 3 - .4byte MultichoiceList_38, 3 - .4byte MultichoiceList_39, 3 - .4byte MultichoiceList_01, 1 - .4byte MultichoiceList_01, 1 - .4byte MultichoiceList_42, 4 - .4byte MultichoiceList_43, 4 - .4byte MultichoiceList_44, 4 - .4byte MultichoiceList_45, 2 - .4byte MultichoiceList_46, 3 - .4byte MultichoiceList_47, 8 - .4byte MultichoiceList_48, 4 - .4byte MultichoiceList_49, 3 - .4byte MultichoiceList_50, 2 - .4byte MultichoiceList_01, 1 - .4byte MultichoiceList_52, 3 - .4byte MultichoiceList_53, 3 - .4byte MultichoiceList_54, 2 - .4byte MultichoiceList_55, 6 - .4byte MultichoiceList_56, 3 - .4byte MultichoiceList_57, 5 - .4byte MultichoiceList_58, 2 - .4byte MultichoiceList_59, 2 - .4byte MultichoiceList_60, 3 - .4byte MultichoiceList_61, 2 - .4byte MultichoiceList_62, 3 - .4byte MultichoiceList_63, 3 - .4byte MultichoiceList_64, 4 - .4byte MultichoiceList_65, 2 - .4byte MultichoiceList_66, 3 - .4byte MultichoiceList_67, 3 - .4byte MultichoiceList_68, 4 - .4byte MultichoiceList_69, 3 - .4byte MultichoiceList_70, 4 - .4byte MultichoiceList_71, 4 - .4byte MultichoiceList_72, 5 diff --git a/data/naming_screen.s b/data/naming_screen.s index 4e477f4b9..60aba1345 100644 --- a/data/naming_screen.s +++ b/data/naming_screen.s @@ -4,216 +4,6 @@ .section .rodata .align 2 -gSpriteImage_83CE094:: @ 83CE094 - .incbin "graphics/naming_screen/pc_icon/0.4bpp" - - .align 2 -gSpriteImage_83CE154:: @ 83CE154 - .incbin "graphics/naming_screen/pc_icon/1.4bpp" - -@ XXX: what is this? - .align 2 - .4byte 0x2000000 - - .align 2 -gUnknown_083CE218:: @ 83CE218 - .4byte sub_80B5EA8 - .4byte sub_80B5ED0 - .4byte sub_80B5F00 - .4byte sub_80B5F10 - .4byte sub_80B5F38 - .4byte sub_80B5F70 - .4byte pokemon_store - .4byte sub_80B604C - .4byte sub_80B606C - .4byte sub_80B6094 - - .align 2 -gUnknown_083CE240:: @ 83CE240 - .4byte sub_80B6108 - .4byte sub_80B6148 - .4byte sub_80B6170 - .4byte sub_80B6194 - - .align 2 -gUnknown_083CE250:: @ 83CE250 - .4byte sub_80B626C - .4byte sub_80B6274 - - .align 1 -gUnknown_083CE258:: @ 83CE258 - .2byte 0, 0, 0, -1, 1 - - .align 1 -gUnknown_083CE262:: @ 83CE262 - .2byte 0, -1, 1, 0, 0 - - .align 1 -gUnknown_083CE26C:: @ 83CE26C - .2byte 0, 1, 1, 2 - - .align 1 -gUnknown_083CE274:: @ 83CE274 - .2byte 0, 0, 3, 0 - - .align 2 -gUnknown_083CE27C:: @ 83CE27C - .4byte sub_80B6668 - .4byte sub_80B6680 - .4byte sub_80B66EC - .4byte sub_80B6758 - - .align 2 -gUnknown_083CE28C:: @ 83CE28C - .4byte 0x02000006 - .4byte 0x02000004 - -gUnknown_083CE294:: @ 83CE294 - .byte 1, 3, 5, 8, 10, 12, 14, 17, 19 - .byte 1, 3, 5, 8, 10, 12, 14, 17, 19 - .byte 1, 4, 7, 10, 13, 16, 16, 16, 19 - -gUnknown_083CE2AF:: @ 83CE2AF - .byte 1, 2, 3 - - .align 2 -gUnknown_083CE2B4:: @ 83CE2B4 - .4byte sub_80B6B5C - .4byte sub_80B6B98 - .4byte sub_80B6B9C - .4byte sub_80B6C08 - - .align 1 -gUnknown_083CE2C4:: @ 83CE2C4 - .2byte 1, 3, 2 - - .align 1 -gUnknown_083CE2CA:: @ 83CE2CA - .2byte 4, 6, 5 - - .align 1 -gUnknown_083CE2D0:: @ 83CE2D0 - .2byte 0, -4, -2, -1 - - .align 1 -gUnknown_083CE2D8:: @ 83CE2D8 - .2byte 2, 3, 2, 1 - - .align 2 -gUnknown_083CE2E0:: @ 83CE2E0 - .4byte nullsub_40 - .4byte sub_80B6E68 - .4byte sub_80B6EBC - .4byte sub_80B6EFC - - .align 2 -gUnknown_083CE2F0:: @ 83CE2F0 - .4byte sub_80B7660 - .4byte sub_80B7650 - .4byte sub_80B7650 - .4byte sub_80B7670 - .4byte sub_80B7670 - .4byte sub_80B7660 - - .align 2 -gUnknown_083CE308:: @ 83CE308 - .4byte VRAM + 0xE000 - .4byte VRAM + 0xE800 - - .align 2 -gUnknown_083CE310:: @ 83CE310 - .4byte sub_80B7844 - .4byte sub_80B7838 - .4byte sub_80B7838 - .4byte sub_80B7850 - .4byte sub_80B7850 - .4byte sub_80B7844 - - .align 2 -gUnknown_083CE328:: @ 83CE328 - .4byte gWindowConfig_81E6EDC - .4byte gWindowConfig_81E6EF8 - .4byte gWindowConfig_81E6EA4 - .4byte gWindowConfig_81E6EC0 - .4byte gWindowConfig_81E6EA4 - .4byte gWindowConfig_81E6EC0 - .4byte gWindowConfig_81E6F14 - .4byte gWindowConfig_81E6F30 - .4byte gWindowConfig_81E6F14 - .4byte gWindowConfig_81E6F30 - .4byte gWindowConfig_81E6EDC - .4byte gWindowConfig_81E6EF8 - - .align 2 -gUnknown_083CE358:: @ 83CE358 - .4byte nullsub_61 - .4byte nullsub_61 - .4byte sub_80B78F8 - .4byte sub_80B78F8 - - .align 2 -gUnknown_083CE368:: @ 83CE368 - .4byte nullsub_62 - .4byte sub_80B7924 - -gUnknown_083CE370:: @ 83CE370 - .string "♂$" - - .align 2 -Unknown_83CE374: - .byte 0, 7, 1, 0, 0, 0, 0, 0 - .4byte OtherText_YourName - - .align 2 -Unknown_83CE380: - .byte 0, 8, 2, 0, 0, 0, 0, 0 - .4byte OtherText_BoxName - - .align 2 -Unknown_83CE38C: - .byte 0, 10, 3, 1, 0, 0, 0, 0 - .4byte OtherText_PokeName - - .align 2 -gUnknown_083CE398:: @ 83CE398 - .4byte Unknown_83CE374 - .4byte Unknown_83CE380 - .4byte Unknown_83CE38C - .4byte Unknown_83CE38C - -gUnknown_083CE3A8:: @ 83CE3A8 - .string " A B C D E F . $" - .string " G H I J K L , $" - .string " M N O P Q R S $" - .string " T U V W X Y Z $" - .string " a b c d e f . $" - .string " g h i j k l , $" - .string " m n o p q r s $" - .string " t u v w x y z $" - .string " 0 1 2 3 4 $" - .string " 5 6 7 8 9 $" - .string " ! ? ♂ ♀ / - $" - .string " … “ ” ‘ ’ $" - - .align 2 -gOamData_83CE498:: @ 83CE498 - .2byte 0x0000 - .2byte 0x0000 - .2byte 0x0000 - - .align 2 -gOamData_83CE4A0:: @ 83CE4A0 - .2byte 0x0000 - .2byte 0x4000 - .2byte 0x0000 - - .align 2 -gOamData_83CE4A8:: @ 83CE4A8 - .2byte 0x4000 - .2byte 0x8000 - .2byte 0x0000 - - .align 2 gSubspriteTable_83CE4B0:: @ 83CE4B0 subsprite -20, -16, 1, 0, 32x8 subsprite 12, -16, 1, 4, 8x8 diff --git a/data/pokedex_cry_screen.s b/data/pokedex_cry_screen.s index 70e356410..1eb3086e9 100644 --- a/data/pokedex_cry_screen.s +++ b/data/pokedex_cry_screen.s @@ -11,12 +11,15 @@ CryMeterNeedlePalette: @ 83FA65C CryMeterNeedleTiles: @ 83FA67C .incbin "graphics/pokedex/cry_meter_needle.4bpp" + .align 1 gUnknown_083FAE7C:: @ 83FAE7C - .incbin "baserom.gba", 0x003fae7c, 0xa0 + .incbin "graphics/pokedex/cry_meter_map.bin" + .align 1 gUnknown_083FAF1C:: @ 83FAF1C .incbin "graphics/pokedex/cry_meter.gbapal" + .align 2 gUnknown_083FAF3C:: @ 83FAF3C .incbin "graphics/pokedex/cry_meter.4bpp.lz" @@ -34,17 +37,52 @@ gUnknown_083FB274:: @ 83FB274 .align 2 .4byte 0x201C000 + .align 1 gUnknown_083FB6F8:: @ 83FB6F8 - .incbin "baserom.gba", 0x003fb6f8, 0x20 + .incbin "graphics/pokedex/83FB6F8.gbapal" gUnknown_083FB718:: @ 83FB718 - .incbin "baserom.gba", 0x003fb718, 0x20 + .byte 0x11 + .byte 0x11 + .byte 0x11 + .byte 0x11 + .byte 0x22 + .byte 0x22 + .byte 0x22 + .byte 0x22 + .byte 0x11 + .byte 0x11 + .byte 0x11 + .byte 0x11 + .byte 0x22 + .byte 0x22 + .byte 0x22 + .byte 0x22 + .byte 0x11 + .byte 0x11 + .byte 0x11 + .byte 0x11 + .byte 0x22 + .byte 0x22 + .byte 0x22 + .byte 0x22 + .byte 0x11 + .byte 0x11 + .byte 0x11 + .byte 0x11 + .byte 0x22 + .byte 0x22 + .byte 0x22 + .byte 0x22 gUnknown_083FB738:: @ 83FB738 .byte 0xF0, 0x0F gUnknown_083FB73A:: @ 83FB73A - .incbin "baserom.gba", 0x003fb73a, 0x26 + .byte 0x0F,0x0E,0x0D,0x0C,0x0B,0x0A,0x09,0x08,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F + .byte 0xF0,0xE0,0xD0,0xC0,0xB0,0xA0,0x90,0x80,0x80,0x90,0xA0,0xB0,0xC0,0xD0,0xE0,0xF0 + + .byte 0, 0, 0, 200, 1, 2 .align 2 gSpriteAnim_83FB760:: @ 83FB760 diff --git a/data/pokemon_storage_system.s b/data/pokemon_storage_system.s index 584b818cd..e5d3e9282 100644 --- a/data/pokemon_storage_system.s +++ b/data/pokemon_storage_system.s @@ -70,7 +70,43 @@ gPokemonStorageScrollingBGTile:: @ 83B6A30 gPokemonStorageScrollingBGTilemap:: @ 83B6A50 .incbin "graphics/pokemon_storage/scrolling_bg_map.bin.lz" - .incbin "baserom.gba", 0x003b6b4c, 0x48 +@ unused tilemap? + .2byte 0x1281 + .2byte 0x1282 + .2byte 0x1283 + .2byte 0x1284 + .2byte 0x1285 + .2byte 0x1286 + .2byte 0x1287 + .2byte 0x1288 + .2byte 0x128C + .2byte 0x128D + .2byte 0x128E + .2byte 0x128F + .2byte 0x1290 + .2byte 0x1291 + .2byte 0x1292 + .2byte 0x1293 + .2byte 0x0281 + .2byte 0x0282 + .2byte 0x0283 + .2byte 0x0284 + .2byte 0x0285 + .2byte 0x0286 + .2byte 0x0287 + .2byte 0x0288 + .2byte 0x028C + .2byte 0x028D + .2byte 0x028E + .2byte 0x028F + .2byte 0x0290 + .2byte 0x0291 + .2byte 0x0292 + .2byte 0x0293 + .2byte 0x12AD + .2byte 0x12AE + .2byte 0x12A8 + .2byte 0x12A8 .align 2 WaveformPalette: @ 83B6B94 @@ -82,11 +118,11 @@ WaveformTiles: @ 83B6BB4 .align 2 gUnknown_083B6D74:: @ 83B6D74 - .incbin "baserom.gba", 0x003b6d74, 0x20 + .incbin "graphics/pokemon_storage/83B6D74.gbapal" .align 2 gUnknown_083B6D94:: @ 83B6D94 - .incbin "baserom.gba", 0x003b6d94, 0x20 + .incbin "graphics/pokemon_storage/83B6D94.gbapal" .align 2 gUnknown_083B6DB4:: @ 83B6DB4 @@ -200,17 +236,20 @@ gOamData_83B6F2C:: @ 83B6F2C .2byte 0x0000 .align 2 -Unknown_83B6F34: @ 83B6F34 - .incbin "baserom.gba", 0x003b6f34, 0x10 +gSpriteAffineAnim_83B6F34:: @ 83B6F34 + obj_rot_scal_anim_frame 0xFFFE, 0xFFFE, 0, 120 + obj_rot_scal_anim_end .align 2 -Unknown_83B6F44: @ 83B6F44 - .incbin "baserom.gba", 0x003b6f44, 0x18 +gSpriteAffineAnim_83B6F44:: @ 83B6F44 + obj_rot_scal_anim_frame 0x10, 0x10, 0, 0 + obj_rot_scal_anim_frame 0x10, 0x10, 0, 15 + obj_rot_scal_anim_end .align 2 -gUnknown_083B6F5C:: @ 83B6F5C - .4byte Unknown_83B6F34 - .4byte Unknown_83B6F44 +gSpriteAffineAnimTable_83B6F5C:: @ 83B6F5C + .4byte gSpriteAffineAnim_83B6F34 + .4byte gSpriteAffineAnim_83B6F44 .align 2 gWallpaperPalettes_Forest: @ 83B6F64 @@ -441,8 +480,24 @@ gWallpaperTilemap_Plain: @ 83BAE74 @ 12×18 tilemap .incbin "graphics/unused/tilemap_3BAEF8.bin" + .align 1 gUnknown_083BB0A8:: @ 83BB0A8 - .incbin "baserom.gba", 0x003bb0a8, 0x40 + .2byte 0x1CE7, 0x7FFF + .2byte 0x1CE7, 0x7FFF + .2byte 0x1CE7, 0x7FFF + .2byte 0x1CE7, 0x7FFF + .2byte 0x1CE7, 0x7FFF + .2byte 0x1CE7, 0x7FFF + .2byte 0x1CE7, 0x7FFF + .2byte 0x1CE7, 0x7FFF + .2byte 0x1CE7, 0x7FFF + .2byte 0x1CE7, 0x7FFF + .2byte 0x1CE7, 0x7FFF + .2byte 0x1CE7, 0x7FFF + .2byte 0x1CE7, 0x7FFF + .2byte 0x1CE7, 0x7FFF + .2byte 0x1CE7, 0x7FFF + .2byte 0x1CE7, 0x7FFF .align 2 gWallpaperTable:: @ 83BB0E8 diff --git a/data/record_mixing.s b/data/record_mixing.s index 329651039..8b46e1ed3 100644 --- a/data/record_mixing.s +++ b/data/record_mixing.s @@ -28,11 +28,11 @@ recordMixingEasyChatPairs:: @ 83D027C .align 2 gUnknown_083D0280:: @ 83D0280 - .4byte 0x02038738 + .4byte gUnknown_02038738 .align 2 gUnknown_083D0284:: @ 83D0284 - .4byte 0x02024f4c + .4byte gSaveBlock2+0xA8 gUnknown_083D0288:: @ 83D0288 .byte 1, 0 diff --git a/data/rom_810CBB4.s b/data/rom_810CBB4.s index 0eefbaeb9..3860788cf 100644 --- a/data/rom_810CBB4.s +++ b/data/rom_810CBB4.s @@ -54,11 +54,13 @@ gCaveTransitionPalette_Black:: @ 83F806C .2byte 0x0000 .endr + .align 1 gUnknown_083F808C:: @ 83F808C - .incbin "baserom.gba", 0x003f808c, 0x10 + .incbin "graphics/misc/83F808C.gbapal" + .align 1 gUnknown_083F809C:: @ 83F809C - .incbin "baserom.gba", 0x003f809c, 0x10 + .incbin "graphics/misc/83F809C.gbapal" .align 2 gCaveTransitionTilemap:: @ 83F80AC @@ -69,22 +71,52 @@ gCaveTransitionTiles:: @ 83F828C .incbin "graphics/misc/cave_transition.4bpp.lz" gUnknown_083F8340:: @ 83F8340 - .incbin "baserom.gba", 0x003f8340, 0x18 + .byte 1 + .byte 1 + .byte 1 + .byte 0 + .byte 0 + .byte 0 + .byte 0 + .byte 0 + .byte 0 + .byte 1 + .byte 1 + .byte 1 + .byte 1 + .byte 1 + .byte 1 + .byte 0 + .byte 0 + .byte 0 + .byte 0 + .byte 0 + .byte 0 + .byte 1 + .byte 1 + .byte 1 gUnknown_083F8358:: @ 83F8358 - .incbin "baserom.gba", 0x003f8358, 0x4 + .byte 7, 9, 8, 10 gUnknown_083F835C:: @ 83F835C - .incbin "baserom.gba", 0x003f835c, 0x8 + .byte 0, 1 + .byte 1, 0 + .byte 0, -1 + .byte -1, 0 + .align 2 gUnknown_083F8364:: @ 83F8364 - .incbin "baserom.gba", 0x003f8364, 0xc + .byte 7, 16, 0, 0 + .byte 15, 18, 0, 0 + .byte 11, 22, 0, 0 gUnknown_083F8370:: @ 83F8370 - .incbin "baserom.gba", 0x003f8370, 0x6 + .byte 0, 1, 1, 1, 1 + .align 1 gUnknown_083F8376:: @ 83F8376 - .incbin "baserom.gba", 0x003f8376, 0xa + .2byte 0x218, 0x219, 0x21A, 0x21B, 0x21C .align 2 gUnknown_083F8380:: @ 83F8380 @@ -117,19 +149,19 @@ gUnknown_083F83C0:: @ 83F83C0 .4byte gOtherText_CancelNoTerminator gUnknown_083F83E0:: @ 83F83E0 - .incbin "baserom.gba", 0x003f83e0, 0xc + .byte 12, 2, 4, 5, 1, 8, 7, 11, 3, 10, 9, 6 gUnknown_083F83EC:: @ 83F83EC - .incbin "baserom.gba", 0x003f83ec, 0xc + .byte 0, 1, 1, 2, 2, 2, 3, 3, 3, 4, 4, 5 gUnknown_083F83F8:: @ 83F83F8 - .incbin "baserom.gba", 0x003f83f8, 0xc + .byte 3, 3, 3, 3, 3, 3, 4, 4, 4, 4, 5, 5 gUnknown_083F8404:: @ 83F8404 - .incbin "baserom.gba", 0x003f8404, 0x4 + .byte 2, 1, 2, 1 gUnknown_083F8408:: @ 83F8408 - .incbin "baserom.gba", 0x003f8408, 0x8 + .byte 8, 9, 10, 11, 12, 13, 14, 15 gUnknown_083F8410:: @ 83F8410 - .incbin "baserom.gba", 0x003f8410, 0x8 + .byte 8, 13, 14, 11, 10, 12, 15, 9 diff --git a/data/rom_81258BC.s b/data/rom_81258BC.s index b07fdddf1..7b46c77e7 100644 --- a/data/rom_81258BC.s +++ b/data/rom_81258BC.s @@ -689,7 +689,8 @@ gUnknown_08402D08:: @ 8402D08 .byte 1, 9, 2, 0 .space 8 - .incbin "baserom.gba", 0x402d48, 0x8 + .4byte 0xFF00FFEF + .4byte gTileBuffer .align 2 gOamData_8402D50:: @ 8402D50 diff --git a/data/save.s b/data/save.s deleted file mode 100644 index bcb08e0ca..000000000 --- a/data/save.s +++ /dev/null @@ -1,29 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - - .align 2 -gSaveSectionLocations:: @ 8401DA4 - .4byte gSaveBlock2, 0x890 - .4byte gSaveBlock1 + 0xF80 * 0, 0xF80 - .4byte gSaveBlock1 + 0xF80 * 1, 0xF80 - .4byte gSaveBlock1 + 0xF80 * 2, 0xF80 - .4byte gSaveBlock1 + 0xF80 * 3, 0xC40 - .4byte gPokemonStorage + 0xF80 * 0, 0xF80 - .4byte gPokemonStorage + 0xF80 * 1, 0xF80 - .4byte gPokemonStorage + 0xF80 * 2, 0xF80 - .4byte gPokemonStorage + 0xF80 * 3, 0xF80 - .4byte gPokemonStorage + 0xF80 * 4, 0xF80 - .4byte gPokemonStorage + 0xF80 * 5, 0xF80 - .4byte gPokemonStorage + 0xF80 * 6, 0xF80 - .4byte gPokemonStorage + 0xF80 * 7, 0xF80 - .4byte gPokemonStorage + 0xF80 * 8, 0x7D0 - - .align 2 -gHallOfFameSaveSectionLocations:: @ 8401E14 - .4byte gHallOfFame + 0xF80 * 0, 0xF80 - .4byte gHallOfFame + 0xF80 * 1, 0xF80 - -gUnknown_08401E24:: @ 8401E24 - .byte 0x1E, 0x1F @ flash sectors diff --git a/data/save_failed_screen.s b/data/save_failed_screen.s deleted file mode 100644 index 5d22810ea..000000000 --- a/data/save_failed_screen.s +++ /dev/null @@ -1,10 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - -gSaveFailedClockPal:: @ 8411960 - .incbin "graphics/misc/clock_small.gbapal" - -gSaveFailedClockGfx:: @ 8411980 - .incbin "graphics/misc/clock_small.4bpp.lz" diff --git a/data/script_menu.s b/data/script_menu.s deleted file mode 100644 index e28616300..000000000 --- a/data/script_menu.s +++ /dev/null @@ -1,29 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - -@ 83CD788 - .include "data/multichoice.inc" - - .align 2 -gUnknown_083CE048:: @ 83CE048 - .4byte OtherText_Cool2 - .4byte OtherText_Beauty3 - .4byte OtherText_Cute2 - .4byte OtherText_Smart2 - .4byte OtherText_Tough2 - .4byte OtherText_Normal - .4byte OtherText_Super - .4byte OtherText_Hyper - .4byte OtherText_Master - .4byte OtherText_Cool3 - .4byte OtherText_Beauty4 - .4byte OtherText_Cute3 - .4byte OtherText_Smart3 - .4byte OtherText_Tough3 - .4byte OtherText_Items - .4byte OtherText_KeyItems - .4byte OtherText_Balls - .4byte OtherText_TMsHMs - .4byte OtherText_Berries diff --git a/data/scripts/maps/IslandCave.inc b/data/scripts/maps/IslandCave.inc index b52b13b5a..c5d932a91 100644 --- a/data/scripts/maps/IslandCave.inc +++ b/data/scripts/maps/IslandCave.inc @@ -31,7 +31,7 @@ IslandCave_MapScript1_15EF15:: @ 815EF15 setflag 2133 end -gUnknown_0815EF19:: @ 815EF19 +gIslandCave_EventScript_OpenRegiiceChamber:: @ 815EF19 setmaptile 7, 19, 554, 1 setmaptile 8, 19, 555, 1 setmaptile 9, 19, 556, 1 diff --git a/data/shop.s b/data/shop.s index 1974786cf..071874d0e 100644 --- a/data/shop.s +++ b/data/shop.s @@ -36,26 +36,34 @@ gUnknown_083CC708:: @ 83CC708 .4byte sub_80B3BF4 .4byte sub_80B3D7C + .align 1 gUnknown_083CC710:: @ 83CC710 - .incbin "baserom.gba", 0x003cc710, 0x4 + .2byte 0x41EE,0x7FFF + .align 1 gUnknown_083CC714:: @ 83CC714 - .incbin "baserom.gba", 0x003cc714, 0x6 + .2byte 0x284,0x282,0x280 + .align 1 gUnknown_083CC71A:: @ 83CC71A - .incbin "baserom.gba", 0x003cc71a, 0x6 + .2byte 0x285,0x283,0x281 + .align 1 gUnknown_083CC720:: @ 83CC720 - .incbin "baserom.gba", 0x003cc720, 0x6 + .2byte 0x28C,0x28A,0x288 + .align 1 gUnknown_083CC726:: @ 83CC726 - .incbin "baserom.gba", 0x003cc726, 0x6 + .2byte 0x28D,0x28B,0x289 + .align 1 gUnknown_083CC72C:: @ 83CC72C - .incbin "baserom.gba", 0x003cc72c, 0x6 + .2byte 0x2A0,0x2A2,0x2A4 + .align 1 gUnknown_083CC732:: @ 83CC732 - .incbin "baserom.gba", 0x003cc732, 0x6 + .2byte 0x2A1,0x2A3,0x2A5 + .align 1 gUnknown_083CC738:: @ 83CC738 - .incbin "baserom.gba", 0x003cc738, 0x8 + .2byte 0x2A8,0x2AA,0x2AC diff --git a/data/specials.inc b/data/specials.inc index 46fb14058..a955fe3eb 100644 --- a/data/specials.inc +++ b/data/specials.inc @@ -210,7 +210,7 @@ gSpecials:: .4byte SafariZoneGetPokeblockNameInFeeder .4byte sub_810BAF4 .4byte sub_810D32C - .4byte sub_810D378 + .4byte UpdateShoalTideFlag .4byte sub_810D3FC .4byte ScriptGetPokedexInfo .4byte ShowPokedexRatingMessage diff --git a/data/starter_choose.s b/data/starter_choose.s deleted file mode 100644 index 4c549b449..000000000 --- a/data/starter_choose.s +++ /dev/null @@ -1,173 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - - .align 2 -gBirchBagGrassPal:: @ 83F62EC - .incbin "graphics/misc/birch_bag.gbapal" - .incbin "graphics/misc/birch_grass.gbapal" - - .align 2 -gBirchBallarrow_Pal:: - .incbin "graphics/misc/birch_ballarrow.gbapal" - - .align 2 -gBirchCircle_Pal:: - .incbin "graphics/misc/birch_circle.gbapal" - - .align 2 -gBirchBagTilemap:: @ 83F636C - .incbin "graphics/misc/birch_bag_map.bin.lz" - - .align 2 -gBirchGrassTilemap:: @ 83F64F8 - .incbin "graphics/misc/birch_grass_map.bin.lz" - - .align 2 -gBirchHelpGfx:: @ 83F66F0 - .incbin "graphics/misc/birch_help.4bpp.lz" - - .align 2 -gBirchBallarrow_Gfx:: - .incbin "graphics/misc/birch_ballarrow.4bpp.lz" - - .align 2 -gBirchCircle_Gfx:: - .incbin "graphics/misc/birch_circle.4bpp.lz" - -gStarterChoose_PokeballCoords:: @ 83F76B8 - .byte 60, 64 - .byte 120, 88 - .byte 180, 64 - -gStarterChoose_LabelCoords:: @ 83F76BE - .byte 0, 9 - .byte 16, 10 - .byte 8, 4 - - .align 1 -gStarterMons:: @ 83F76C4 - .2byte SPECIES_TREECKO - .2byte SPECIES_TORCHIC - .2byte SPECIES_MUDKIP - .2byte 0 - - .align 2 -gOamData_83F76CC:: @ 83F76CC - .2byte 0x00A0 - .2byte 0x8000 - .2byte 0x0400 - - .align 2 -gOamData_83F76D4:: @ 83F76D4 - .2byte 0x00A0 - .2byte 0x8000 - .2byte 0x0400 - - .align 2 -gOamData_83F76DC:: @ 83F76DC - .2byte 0x03A0 - .2byte 0xC000 - .2byte 0x0400 - - .align 2 -gUnknown_083F76E4:: @ 83F76E4 - .byte 60, 32 - .byte 120, 56 - .byte 180, 32 - .byte 0, 0 - - .align 2 -gSpriteAnim_83F76EC:: @ 83F76EC - obj_image_anim_frame 48, 30 - obj_image_anim_end - - .align 2 -gSpriteAnim_83F76F4:: @ 83F76F4 - obj_image_anim_frame 0, 30 - obj_image_anim_end - - .align 2 -gSpriteAnim_83F76FC:: @ 83F76FC - obj_image_anim_frame 16, 4 - obj_image_anim_frame 0, 4 - obj_image_anim_frame 32, 4 - obj_image_anim_frame 0, 4 - obj_image_anim_frame 16, 4 - obj_image_anim_frame 0, 4 - obj_image_anim_frame 32, 4 - obj_image_anim_frame 0, 4 - obj_image_anim_frame 0, 32 - obj_image_anim_frame 16, 8 - obj_image_anim_frame 0, 8 - obj_image_anim_frame 32, 8 - obj_image_anim_frame 0, 8 - obj_image_anim_frame 16, 8 - obj_image_anim_frame 0, 8 - obj_image_anim_frame 32, 8 - obj_image_anim_frame 0, 8 - obj_image_anim_jump 0 - - .align 2 -gSpriteAnim_83F7744:: @ 83F7744 - obj_image_anim_frame 0, 8 - obj_image_anim_end - - .align 2 -gSpriteAnimTable_83F774C:: @ 83F774C - .4byte gSpriteAnim_83F76EC - - .align 2 -gSpriteAnimTable_83F7750:: @ 83F7750 - .4byte gSpriteAnim_83F76F4 - .4byte gSpriteAnim_83F76FC - - .align 2 -gSpriteAnimTable_83F7758:: @ 83F7758 - .4byte gSpriteAnim_83F7744 - - .align 2 -gSpriteAffineAnim_83F775C:: @ 83F775C - obj_rot_scal_anim_frame 0x10, 0x10, 0, 0 - obj_rot_scal_anim_frame 0x10, 0x10, 0, 15 - obj_rot_scal_anim_end - - .align 2 -gSpriteAffineAnim_83F7774:: @ 83F7774 - obj_rot_scal_anim_frame 0x14, 0x14, 0, 0 - obj_rot_scal_anim_frame 0x14, 0x14, 0, 15 - obj_rot_scal_anim_end - - .align 2 -gSpriteAffineAnimTable_83F778C:: @ 83F778C - .4byte gSpriteAffineAnim_83F775C - - .align 2 -gSpriteAffineAnimTable_83F7790:: @ 83F7790 - .4byte gSpriteAffineAnim_83F7774 - -gUnknown_083F7794:: @ 83F7794 - obj_tiles gBirchBallarrow_Gfx, 0x0800, 0x1000 - .space 8 - -gUnknown_083F77A4:: @ 83F77A4 - obj_tiles gBirchCircle_Gfx, 0x0800, 0x1001 - .space 8 - -gUnknown_083F77B4:: @ 83F77B4 - obj_pal gBirchBallarrow_Pal, 0x1000 - obj_pal gBirchCircle_Pal, 0x1001 - .space 8 - - .align 2 -gSpriteTemplate_83F77CC:: @ 83F77CC - spr_template 4096, 4096, gOamData_83F76CC, gSpriteAnimTable_83F774C, NULL, gDummySpriteAffineAnimTable, sub_810A62C - - .align 2 -gSpriteTemplate_83F77E4:: @ 83F77E4 - spr_template 4096, 4096, gOamData_83F76D4, gSpriteAnimTable_83F7750, NULL, gDummySpriteAffineAnimTable, sub_810A68C - - .align 2 -gSpriteTemplate_83F77FC:: @ 83F77FC - spr_template 4097, 4097, gOamData_83F76DC, gSpriteAnimTable_83F7758, NULL, gSpriteAffineAnimTable_83F7790, StarterPokemonSpriteAnimCallback diff --git a/data/strings.s b/data/strings.s deleted file mode 100644 index f83ad62d0..000000000 --- a/data/strings.s +++ /dev/null @@ -1,2041 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - -gExpandedPlaceholder_Empty:: @ 840DC80 - .string "$" - -gExpandedPlaceholder_Kun:: @ 840DC81 - .string "$" - -gExpandedPlaceholder_Chan:: @ 840DC82 - .string "$" - -gExpandedPlaceholder_Sapphire:: @ 840DC83 - .string "SAPPHIRE$" - -gExpandedPlaceholder_Ruby:: @ 840DC8C - .string "RUBY$" - -gExpandedPlaceholder_Aqua:: @ 840DC91 - .string "AQUA$" - -gExpandedPlaceholder_Magma:: @ 840DC96 - .string "MAGMA$" - -gExpandedPlaceholder_Archie:: @ 840DC9C - .string "ARCHIE$" - -gExpandedPlaceholder_Maxie:: @ 840DCA3 - .string "MAXIE$" - -gExpandedPlaceholder_Kyogre:: @ 840DCA9 - .string "KYOGRE$" - -gExpandedPlaceholder_Groudon:: @ 840DCB0 - .string "GROUDON$" - -gExpandedPlaceholder_Brendan:: @ 840DCB8 - .string "BRENDAN$" - -gExpandedPlaceholder_May:: @ 840DCC0 - .string "MAY$" - -gSystemText_Egg:: @ 840DCC4 - .string "EGG$" - -gSystemText_Pokemon2:: @ 840DCC8 - .string "POKéMON$" - -gMainMenuString_NewGame:: @ 840DCD0 - .string "NEW GAME$" - -gMainMenuString_Continue:: @ 840DCD9 - .string "CONTINUE$" - -gMainMenuString_Option:: @ 840DCE2 - .string "OPTION$" - -gMainMenuString_MysteryEvents:: @ 840DCE9 - .string "MYSTERY EVENTS$" - -SystemText_UpdatingSaveExternal:: - .string "Updating save file using external\ndata. Please wait.$" - -SystemText_SaveUpdated:: - .string "The save file has been updated.$" - -SystemText_SaveUpdatedExchangeBackup:: - .string "The save file has been updated.\pFurther game data cannot be saved\nto the backup memory.\pPlease exchange the backup memory.\pFor details, please contact the\nNintendo Service Center.$" - -SystemText_SaveNotUpdated:: - .string "The save file could not be updated.\pPlease exchange the backup\nmemory.\pFor details, please contact the\nNintendo Service Center.$" - -gSaveFileCorruptMessage:: @ 840DE81 - .string "The save file is corrupt. The\nprevious save file will be loaded.$" - -gSaveFileDeletedMessage:: @ 840DEC2 - .string " The save file has been deleted...$" - -gBoardNotInstalledMessage:: @ 840DEE5 - .string "The 1M sub-circuit board is\nnot installed.$" - -gBatteryDryMessage:: @ 840DF10 - .string "The internal battery has run dry.\nThe game can be played.\pHowever, clock-based events will\nno longer occur.$" - -gMainMenuString_Player:: @ 840DF7C - .string "PLAYER$" - -gMainMenuString_Pokedex:: @ 840DF83 - .string "POKéDEX$" - -gMainMenuString_Time:: @ 840DF8B - .string "TIME$" - -gMainMenuString_Badges:: @ 840DF90 - .string "BADGES$" - -gBirchText_Boy:: - .string "BOY$" -gBirchText_Girl:: - .string "GIRL$" -gBirchText_NewName:: - .string "NEW NAME$" - -gDefaultBoyName1:: - .ifdef SAPPHIRE - .string "SEAN$" - .else - .string "LANDON$" - .endif -gDefaultBoyName2:: - .string "TERRY$" -gDefaultBoyName3:: - .string "SETH$" -gDefaultBoyName4:: - .string "TOM$" - -gDefaultGirlName1:: - .ifdef SAPPHIRE - .string "MARINA$" - .else - .string "TERRA$" - .endif -gDefaultGirlName2:: - .string "KIMMY$" -gDefaultGirlName3:: - .string "NICOLA$" -gDefaultGirlName4:: - .string "SARA$" - -gSystemText_IntroWeCall:: - .string "This is what we call\na POKéMON.$" - -gSystemText_NewPara:: @ 840DFF7 - .string "\p$" - -gDexText_UnknownPoke:: @ 840DFF9 - .string " ????? POKéMON$" @ why 12 spaces? - -gDexText_UnknownHeight:: @ 840E013 - .string "{CLEAR_TO 0x0C}??’??”$" - -gDexText_UnknownWeight:: @ 840E01D - .string "????.? lbs.$" - .string "$" - -gDexText_CryOf:: @ 840E02A - .string "{CLEAR_TO 2}CRY OF$" - .string "$" - -gDexText_SizeComparedTo:: @ 840E035 - .string "SIZE COMPARED TO $" - -gDexText_RegisterComplete:: @ 840E047 - .string "POKéDEX registration completed.$" - -gDexText_Searching:: @ 840E067 - .string "Searching...\nPlease wait.$" - -gDexText_SearchComplete:: @ 840E081 - .string "Search completed.$" - -gDexText_NoMatching:: @ 840E093 - .string "No matching POKéMON were found.$" - -DexText_SearchForPoke:: - .string "Search for POKéMON based on\nselected parameters.$" -DexText_SwitchDex:: - .string "Switch POKéDEX listings.$" -DexText_ReturnToDex:: - .string "Return to the POKéDEX.$" -DexText_SelectDexMode:: - .string "Select the POKéDEX mode.$" -DexText_SelectDexList:: - .string "Select the POKéDEX listing mode.$" -DexText_ListByABC:: - .string "List by the first letter in the name.\n/Spotted POKéMON only.$" -DexText_ListByColor:: - .string "List by body color.\n/Spotted POKéMON only.$" -DexText_ListByType:: - .string "List by type.\n/Owned POKéMON only.$" -DexText_ExecuteSearchSwitch:: - .string "Execute search/switch.$" -DexText_HoennDex:: - .string "HOENN DEX$" -DexText_NationalDex:: - .string "NATIONAL DEX$" -DexText_NumericalMode:: - .string "NUMERICAL MODE$" -DexText_ABCMode:: - .string "A TO Z MODE$" -DexText_HeaviestMode:: - .string "HEAVIEST MODE$" -DexText_LightestMode:: - .string "LIGHTEST MODE$" -DexText_TallestMode:: - .string "TALLEST MODE$" -DexText_SmallestMode:: - .string "SMALLEST MODE$" -DexText_ABC:: - .string "ABC$" -DexText_DEF:: - .string "DEF$" -DexText_GHI:: - .string "GHI$" -DexText_JKL:: - .string "JKL$" -DexText_MNO:: - .string "MNO$" -DexText_PQR:: - .string "PQR$" -DexText_STU:: - .string "STU$" -DexText_VWX:: - .string "VWX$" -DexText_YZ:: - .string "YZ$" -DexText_Red:: - .string "RED$" -DexText_Blue:: - .string "BLUE$" -DexText_Yellow:: - .string "YELLOW$" -DexText_Green:: - .string "GREEN$" -DexText_Black:: - .string "BLACK$" -DexText_Brown:: - .string "BROWN$" -DexText_Purple:: - .string "PURPLE$" -DexText_Gray:: - .string "GRAY$" -DexText_White:: - .string "WHITE$" -DexText_Pink:: - .string "PINK$" -DexText_HoennDex2:: - .string "HOENN region’s POKéDEX$" -DexText_NationalDex2:: - .string "National edition POKéDEX$" -DexText_ListByNumber:: - .string "POKéMON are listed according to their\nnumber.$" -DexText_ListByABC2:: - .string "Spotted and owned POKéMON are listed\nalphabetically.$" -DexText_ListByHeavyToLightest:: - .string "Owned POKéMON are listed from the\nheaviest to the lightest.$" -DexText_ListByLightToHeaviest:: - .string "Owned POKéMON are listed from the\nlightest to the heaviest.$" -DexText_ListByTallToSmallest:: - .string "Owned POKéMON are listed from the\ntallest to the smallest.$" -DexText_ListBySmallToTallest:: - .string "Owned POKéMON are listed from the\nsmallest to the tallest.$" -DexText_Terminator5:: - .string "$" -DexText_DontSpecify:: - .string "DON’T SPECIFY.$" -DexText_None:: - .string "NONE$" -DexText_RightPointingTriangle:: - .string "▶$" @ right-pointing triangle -DexText_Terminator6:: - .string " $" - -gMenuText_WelcomeToHOFAndDexRating:: @ 840E44F - .string "Welcome to the HALL OF FAME!$" - .string "Spotted POKéMON: {STR_VAR_1}!\nOwned POKéMON: {STR_VAR_2}!\pPROF. BIRCH’s POKéDEX rating!\pPROF. BIRCH: Let’s see...\p$" - -gMenuText_HOFSaving:: @ 840E4CD - .string "SAVING...\nDON’T TURN OFF THE POWER.$" - -gMenuText_HOFCorrupt:: @ 840E4F1 - .string "The HALL OF FAME data is corrupt.$" - -gMenuText_HOFNumber:: @ 840E513 - .string "HALL OF FAME No. $" - -gMenuText_HOFCongratulations:: @ 840E525 - .string "LEAGUE CHAMPION!\nCONGRATULATIONS!$" - -gOtherText_Number2:: @ 840E547 - .string "No. $" - -gOtherText_Level3:: @ 840E54C - .string "Lv. $" - -gOtherText_IDNumber:: @ 840E551 - .string "IDNo. /$" - -gOtherText_Name:: @ 840E559 - .string "NAME /$" - -gOtherText_IDNumber2:: @ 840E560 - .string "IDNo. /$" - -gOtherText_BirchInTrouble:: @ 840E568 - .string "{HIGHLIGHT WHITE2}{COLOR DARK_GREY}PROF. BIRCH is in trouble!\nRelease a POKéMON and rescue him!$" - -gOtherText_DoYouChoosePoke:: @ 840E5AB - .string "{HIGHLIGHT WHITE2}{COLOR DARK_GREY}Do you choose this POKéMON?$" - -gOtherText_Poke:: @ 840E5CD - .string "POKéMON$" - -gSystemText_SaveErrorExchangeBackup:: @ 840E5D5 - .string "Save error.\pPlease exchange the\nbackup memory.$" - -gOtherText_FlyToWhere:: @ 840E604 - .string "FLY to where?$" - -OtherText_Use:: - .string "USE$" -OtherText_Toss:: - .string "TOSS$" -OtherText_Register:: - .string "REGISTER$" -OtherText_Give2:: - .string "GIVE$" -OtherText_CheckTag:: - .string "CHECK TAG$" -OtherText_Confirm:: - .string "CONFIRM$" - -gOtherText_Walk:: @ 840E63B - .string "WALK$" - -gUnknownText_Exit:: @ 840E640 - .string "EXIT$" - -gOtherText_CancelNoTerminator:: @ 840E645 - .string "CANCEL$" - -gOtherText_CancelWithTerminator:: @ 840E64C - .string "$CANCEL$" - -OtherText_Item:: - .string "ITEM$" -OtherText_Mail:: - .string "MAIL$" -OtherText_Take2:: - .string "TAKE$" -OtherText_Store:: - .string "STORE$" - -gOtherText_Check:: @ 840E669 - .string "CHECK$" - -gOtherText_None:: @ 840E66F - .string "NONE$" - -gOtherText_ThreeQuestions2:: @ 840E674 - .string "???$" - -gOtherText_FiveQuestionsAndSlash:: @ 840E678 - .string "?????$" - .string "/$" - -gOtherText_OneDash:: @ 840E680 - .string "-$" - -gOtherText_TwoDashes:: @ 840E682 - .string "--$" - -gOtherText_ThreeDashes2:: @ 840E685 - .string "---$" - -gOtherText_MaleSymbol2:: @ 840E689 - .string "♂$" - -gOtherText_FemaleSymbolAndLv:: @ 840E68B - .string "♀$" - .string "Lv.$" - -gOtherText_TallPlusAndRightArrow:: @ 840E691 - .string "{TALL_PLUS}$" - .string "{RIGHT_ARROW}$" - -gMenuText_GoBackToPrev:: @ 840E697 - .string "Go back to the\nprevious menu.$" - -gOtherText_WhatWillYouDo:: @ 840E6B5 - .string "What would you like to do?$" - -gOtherText_xString1:: @ 840E6D0 - .string "×{STR_VAR_1}$" - -gOtherText_Berry2:: @ 840E6D4 - .string " BERRY$" - -gOtherText_Coins2:: @ 840E6DB - .string "{STR_VAR_1} COINS$" - -gOtherText_CloseBag:: @ 840E6E4 - .string "CLOSE BAG$" - -OtherText_TheField3:: - .string "the field.$" -OtherText_TheBattle:: - .string "the battle.$" -OtherText_ThePokeList:: - .string "the POKéMON LIST.$" -OtherText_TheShop:: - .string "the shop.$" -OtherText_TheField:: - .string "the field.$" -OtherText_TheField2:: - .string "the field.$" -OtherText_ThePC:: - .string "the PC.$" - - .align 2 -gUnknown_0840E740:: @ 840E740 - .4byte OtherText_TheField3 - .4byte OtherText_TheBattle - .4byte OtherText_ThePokeList - .4byte OtherText_TheShop - .4byte OtherText_TheField - .4byte OtherText_TheField2 - .4byte OtherText_ThePC - -gOtherText_ReturnTo:: @ 840E75C - .string "Return to$" - -gOtherText_WhatWillYouDo2:: @ 840E766 - .string "What would you\nlike to do?$" - -gOtherText_CantWriteMail:: @ 840E781 - .string "You can’t write\nMAIL here.$" - -gOtherText_NoPokemon:: @ 840E79C - .string "There is no\nPOKéMON.{PAUSE_UNTIL_PRESS}$" - -gOtherText_SwitchWhichItem:: @ 840E7B3 - .string "Switch with which\nitem?$" - -gOtherText_CantBeHeld:: @ 840E7CB - .string "{STR_VAR_1} can’t be held.$" - -gOtherText_CantBeHeldHere:: @ 840E7DD - .string "{STR_VAR_1} can’t be held here.$" - -gOtherText_HowManyToDeposit:: @ 840E7F4 - .string "How many do you\nwant to deposit?$" - -gOtherText_DepositedItems:: @ 840E815 - .string "Deposited {STR_VAR_2}\n{STR_VAR_1}(s).$" - -gOtherText_NoRoomForItems:: @ 840E829 - .string "There’s no room to\nstore items.$" - -gOtherText_CantStoreSomeoneItem:: @ 840E849 - .string "You can’t store\nsomeone else’s item\nin the PC.$" - -gOtherText_TooImportant:: @ 840E878 - .string "That’s much too\nimportant to toss\nout!$" - -gOtherText_HowManyToToss:: @ 840E89F - .string "Toss out how many?$" - -gOtherText_ThrewAwayItem:: @ 840E8B2 - .string "Threw away {STR_VAR_2}\n{STR_VAR_1}(s).$" - -gOtherText_OkayToThrowAwayPrompt:: @ 840E8C7 - .string "Is it okay to\nthrow away {STR_VAR_2}\n{STR_VAR_1}(s)?$" - -gOtherText_DadsAdvice:: @ 840E8EA - .string "DAD’s advice...\n{PLAYER}, there’s a time and place for\leverything!{PAUSE_UNTIL_PRESS}$" - -gOtherText_CantGetOffBike:: @ 840E929 - .string "You can’t dismount your BIKE here.{PAUSE_UNTIL_PRESS}$" - -gOtherText_ItemfinderResponding:: @ 840E94E - .string "Oh!\nThe machine’s responding!\pThere’s an item buried around here!{PAUSE_UNTIL_PRESS}$" - -gOtherText_ItemfinderItemUnderfoot:: @ 840E992 - .string "The machine’s indicating something\nright underfoot!{PAUSE_UNTIL_PRESS}$" - -gOtherText_NoResponse:: @ 840E9C8 - .string "... ... ... ... Nope!\nThere’s no response.{PAUSE_UNTIL_PRESS}$" - -gOtherText_Coins3:: @ 840E9F5 - .string "Your COINS:\n{STR_VAR_1}{PAUSE_UNTIL_PRESS}$" - -gOtherText_BootedTM:: @ 840EA06 - .string "Booted up a TM.$" - -gOtherText_BootedHM:: @ 840EA16 - .string "Booted up an HM.$" - -gOtherText_ContainsMove:: @ 840EA27 - .string "It contained\n{STR_VAR_1}.\pTeach {STR_VAR_1}\nto a POKéMON?$" - -gOtherText_UsedItem:: @ 840EA4F - .string "{PLAYER} used the\n{STR_VAR_2}.{PAUSE_UNTIL_PRESS}$" - -gOtherText_RepelLingers:: @ 840EA61 - .string "But the effects of a REPEL lingered\nfrom earlier.{PAUSE_UNTIL_PRESS}$" - -gOtherText_UsedFlute:: @ 840EA95 - .string "{PLAYER} used the\n{STR_VAR_2}.\pWild POKéMON will be lured.{PAUSE_UNTIL_PRESS}$" - -gOtherText_UsedRepel:: @ 840EAC3 - .string "{PLAYER} used the\n{STR_VAR_2}.\pWild POKéMON will be repelled.{PAUSE_UNTIL_PRESS}$" - -gOtherText_BoxIsFull:: @ 840EAF4 - .string "The BOX is full.{PAUSE_UNTIL_PRESS}$" - -gOtherText_Size:: @ 840EB07 - .string "SIZE /$" - -gOtherText_Firm:: @ 840EB0E - .string "FIRM /$" - -gContestStatsText_Unknown1:: @ 840EB15 - .string "{STR_VAR_1}.{STR_VAR_2}”$" - -ContestStatsText_VerySoft:: - .string "Very soft$" -ContestStatsText_Soft:: - .string "Soft$" -ContestStatsText_Hard:: - .string "Hard$" -ContestStatsText_VeryHard:: - .string "Very hard$" -ContestStatsText_SuperHard:: - .string "Super hard$" -ContestStatsText_RedPokeBlock:: - .string "RED {POKEBLOCK}$" -ContestStatsText_BluePokeBlock:: - .string "BLUE {POKEBLOCK}$" -ContestStatsText_PinkPokeBlock:: - .string "PINK {POKEBLOCK}$" -ContestStatsText_GreenPokeBlock:: - .string "GREEN {POKEBLOCK}$" -ContestStatsText_YellowPokeBlock:: - .string "YELLOW {POKEBLOCK}$" -ContestStatsText_PurplePokeBlock:: - .string "PURPLE {POKEBLOCK}$" -ContestStatsText_IndigoPokeBlock:: - .string "INDIGO {POKEBLOCK}$" -ContestStatsText_BrownPokeBlock:: - .string "BROWN {POKEBLOCK}$" -ContestStatsText_LiteBluePokeBlock:: - .string "LITEBLUE {POKEBLOCK}$" -ContestStatsText_OlivePokeBlock:: - .string "OLIVE {POKEBLOCK}$" -ContestStatsText_GrayPokeBlock:: - .string "GRAY {POKEBLOCK}$" -ContestStatsText_BlackPokeBlock:: - .string "BLACK {POKEBLOCK}$" -ContestStatsText_WhitePokeBlock:: - .string "WHITE {POKEBLOCK}$" -ContestStatsText_GoldPokeBlock:: - .string "GOLD {POKEBLOCK}$" - -gContestStatsText_Spicy:: @ 840EBED - .string "SPICY$" - -gContestStatsText_Dry:: @ 840EBF3 - .string "DRY$" - -gContestStatsText_Sweet:: @ 840EBF7 - .string "SWEET$" - -gContestStatsText_Bitter:: @ 840EBFD - .string "BITTER$" - -gContestStatsText_Sour:: @ 840EC04 - .string "SOUR$" - .string "TASTY$" @ tasty is probably unused, but feel isn't. - .string "FEEL$" - -gContestStatsText_StowCase:: @ 840EC14 - .string "Stow CASE.$" - -gContestStatsText_ThrowAwayPrompt:: @ 840EC1F - .string "Throw away this\n{STR_VAR_1}?$" - -gContestStatsText_WasThrownAway:: @ 840EC33 - .string "The {STR_VAR_1}\nwas thrown away.$" - -gContestStatsText_NormallyAte:: @ 840EC4B - .string "{STR_VAR_1} ate the\n{STR_VAR_2}.{PAUSE_UNTIL_PRESS}$" - -gContestStatsText_HappilyAte:: @ 840EC5C - .string "{STR_VAR_1} happily ate the\n{STR_VAR_2}.{PAUSE_UNTIL_PRESS}$" - -gContestStatsText_DisdainfullyAte:: @ 840EC75 - .string "{STR_VAR_1} disdainfully ate the\n{STR_VAR_2}.{PAUSE_UNTIL_PRESS}$" - -MartText_Buy:: - .string "BUY$" -MartText_Sell:: - .string "SELL$" -MartText_Quit2:: - .string "QUIT$" - -gOtherText_QuitShopping:: @ 840ECA1 - .string "Quit shopping.$" - -gOtherText_HowManyYouWant:: @ 840ECB0 - .string "{STR_VAR_1}? Certainly.\nHow many would you like?$" - -gOtherText_ThatWillBe:: @ 840ECD8 - .string "{STR_VAR_1}? And you wanted {STR_VAR_2}?\nThat will be ¥{STR_VAR_3}.$" - -gOtherText_ThatWillBe2:: @ 840ED01 - .string "{STR_VAR_1}, is it?\nThat’ll be ¥{STR_VAR_2}. Do you want it?$" - -gOtherText_ThatWillBe3:: @ 840ED2C - .string "You wanted {STR_VAR_1}?\nThat’ll be ¥{STR_VAR_2}. Will that be okay?$" - -gOtherText_HereYouGo:: @ 840ED5E - .string "Here you go!\nThank you very much.$" - -gOtherText_HereYouGo2:: @ 840ED80 - .string "Thank you!\nI’ll send it to your home PC.$" - -gOtherText_HereYouGo3:: @ 840EDA9 - .string "Thanks!\nI’ll send it to your PC at home.$" - -gOtherText_NotEnoughMoney:: @ 840EDD2 - .string "You don’t have enough money.{PAUSE_UNTIL_PRESS}$" - -gOtherText_NoRoomFor:: @ 840EDF1 - .string "You have no more room for items.{PAUSE_UNTIL_PRESS}$" - -gOtherText_SpaceForIsFull:: @ 840EE14 - .string "The space for {STR_VAR_1} is full.{PAUSE_UNTIL_PRESS}$" - -gOtherText_AnythingElse:: @ 840EE30 - .string "Is there anything else I can help\nyou with?$" - -gOtherText_CanIHelpYou:: @ 840EE5C - .string "Can I help you with anything else?$" - -gOtherText_FreePremierBall:: @ 840EE7F - .string "I’ll throw in a PREMIER BALL, too.{PAUSE_UNTIL_PRESS}$" - -gOtherText_CantBuyThat:: @ 840EEA4 - .string "{STR_VAR_2}? Oh, no.\nI can’t buy that.{PAUSE_UNTIL_PRESS}$" - -gOtherText_HowManyToSell:: @ 840EEC4 - .string "{STR_VAR_2}?\nHow many would you like to sell?$" - -gOtherText_CanPay:: @ 840EEE9 - .string "I can pay ¥{STR_VAR_1}.\nWould that be okay?$" - -gOtherText_SoldItem:: @ 840EF0C - .string "Turned over the {STR_VAR_2}\nand received ¥{STR_VAR_1}.$" - -OtherText_Money:: - .string "¥{STR_VAR_1}$" -OtherText_Shift:: - .string "SHIFT$" -OtherText_SendOut:: - .string "SEND OUT$" -OtherText_Switch2:: - .string "SWITCH$" -OtherText_Summary:: - .string "SUMMARY$" -OtherText_Moves:: - .string "MOVES$" -OtherText_Enter2:: - .string "ENTER$" -OtherText_NoEntry:: - .string "NO ENTRY$" -OtherText_Take:: - .string "TAKE$" -OtherText_Read2:: - .string "READ$" - -gOtherText_Hp2:: @ 840EF72 - .string "HP$" - -gOtherText_SpAtk2:: @ 840EF75 - .string "SP. ATK$" - -gOtherText_SpDef2:: @ 840EF7D - .string "SP. DEF$" - -gOtherText_WontHaveAnyEffect:: @ 840EF85 - .string "It won’t have any effect.{PAUSE_UNTIL_PRESS}$" - -gOtherText_CantUseOnPoke:: @ 840EFA1 - .if REVISION >= 1 - .string "This can’t be used on\nthat POKéMON.{PAUSE_UNTIL_PRESS}$" - .else - .string "This item can’t be used on\nthat POKéMON.{PAUSE_UNTIL_PRESS}$" - .endif - -gOtherText_CantBeSwitched:: @ 840EFCC - .string "{STR_VAR_1} can’t be switched\nout!{PAUSE_UNTIL_PRESS}$" - -gOtherText_AlreadyBattle:: @ 840EFE8 - .string "{STR_VAR_1} is already\nin battle!{PAUSE_UNTIL_PRESS}$" - -gOtherText_AlreadySelected:: @ 840F003 - .string "{STR_VAR_1} has already been\nselected.{PAUSE_UNTIL_PRESS}$" - -gOtherText_NoEnergyLeft:: @ 840F023 - .string "{STR_VAR_1} has no energy\nleft to battle!{PAUSE_UNTIL_PRESS}$" - -gOtherText_CantSwitchPokeWithYours:: @ 840F046 - .string "You can’t switch {STR_VAR_1}’s\nPOKéMON with one of yours!{PAUSE_UNTIL_PRESS}$" - -gOtherText_EGGCantBattle:: @ 840F079 - .string "An EGG can’t battle!{PAUSE_UNTIL_PRESS}$" - -gOtherText_CantBeUsedBadge:: @ 840F090 - .string "This can’t be used until a new\nBADGE is obtained.$" - -gOtherText_NoMoreThreePoke:: @ 840F0C2 - .string "No more than three POKéMON\nmay enter.$" - -gOtherText_SendRemovedMailPrompt:: @ 840F0E8 - .string "Send the removed MAIL to\nyour PC?$" - -gOtherText_MailWasSent:: @ 840F10A - .string "The MAIL was sent to your PC.{PAUSE_UNTIL_PRESS}$" - -gOtherText_MailboxIsFull:: @ 840F12A - .string "Your PC’s MAILBOX is full.{PAUSE_UNTIL_PRESS}$" - -gOtherText_MailRemovedMessageLost:: @ 840F147 - .string "If the MAIL is removed, the\nmessage will be lost. Okay?$" - -gOtherText_MailMustBeRemoved:: @ 840F17F - .string "MAIL must be removed before\nholding an item.{PAUSE_UNTIL_PRESS}$" - -gOtherText_WasGivenToHold:: @ 840F1AE - .string "{STR_VAR_1} was given the\n{STR_VAR_2} to hold.{PAUSE_UNTIL_PRESS}$" - -gOtherText_AlreadyHolding:: @ 840F1CD - .string "{STR_VAR_1} is already holding\none {STR_VAR_2}.\pWould you like to switch the\ntwo items?$" - -gOtherText_NotHoldingAnything:: @ 840F213 - .string "{STR_VAR_1} isn’t\nholding anything.{PAUSE_UNTIL_PRESS}$" - -gOtherText_ReceivedTheThingFrom:: @ 840F230 - .string "Received the {STR_VAR_2}\nfrom {STR_VAR_1}.{PAUSE_UNTIL_PRESS}$" - -gOtherText_MailTaken:: @ 840F24B - .string "MAIL was taken from the\nPOKéMON.{PAUSE_UNTIL_PRESS}$" - -gOtherText_TakenAndReplaced:: @ 840F26E - .string "The {STR_VAR_2} was taken and\nreplaced with the {STR_VAR_1}.{PAUSE_UNTIL_PRESS}$" - -gOtherText_PokeHoldingItemCantMail:: @ 840F29B - .string "This POKéMON is holding an item.\nIt cannot hold MAIL.{PAUSE_UNTIL_PRESS}$" - -gOtherText_MailTransferredMailbox:: @ 840F2D3 - .string "MAIL was transferred from\nthe MAILBOX.{PAUSE_UNTIL_PRESS}$" - -gOtherText_BagFullCannotRemoveItem:: @ 840F2FC - .string "The BAG is full. The POKéMON’s\nitem could not be removed.{PAUSE_UNTIL_PRESS}$" - -gOtherText_LearnedMove:: @ 840F338 - .string "{STR_VAR_1} learned\n{STR_VAR_2}!$" - -gOtherText_NotCompatible:: @ 840F347 - .string "{STR_VAR_1} and {STR_VAR_2}\nare not compatible.\p{STR_VAR_2} can’t be learned.{PAUSE_UNTIL_PRESS}$" - -gOtherText_WantsToLearn:: @ 840F37C - .string "{STR_VAR_1} wants to learn the\nmove {STR_VAR_2}.\pHowever, {STR_VAR_1} already\nknows four moves.\pShould a move be deleted and\nreplaced with {STR_VAR_2}?$" - -gOtherText_StopTryingTo:: @ 840F3F0 - .string "Stop trying to teach\n{STR_VAR_2}?$" - -gOtherText_DidNotLearnMove2:: @ 840F409 - .string "{STR_VAR_1} did not learn the\nmove {STR_VAR_2}.{PAUSE_UNTIL_PRESS}$" - -gOtherText_WhichMoveToForget2:: @ 840F429 - .string "Which move should be forgotten?{PAUSE_UNTIL_PRESS}$" - -gOtherText_ForgetMove123_2:: @ 840F44B - .string "{PAUSE 32}1, {PAUSE 15}2, and{PAUSE 15}... {PAUSE 15}... {PAUSE 15}... {PAUSE 15}{PLAY_SE SE_KON}Poof!\p{STR_VAR_1} forgot how to\nuse {STR_VAR_2}.\pAnd...{PAUSE_UNTIL_PRESS}$" - -gOtherText_AlreadyKnows:: @ 840F49E - .string "{STR_VAR_1} already knows\n{STR_VAR_2}.{PAUSE_UNTIL_PRESS}$" - -gOtherText_HPRestoredBy:: @ 840F4B5 - .string "{STR_VAR_1}’s HP was restored by\n{STR_VAR_2} points.{PAUSE_UNTIL_PRESS}$" - -gOtherText_CuredPoisoning:: @ 840F4DA - .string "{STR_VAR_1} was cured of its\npoisoning.{PAUSE_UNTIL_PRESS}$" - -gOtherText_CuredParalysis:: @ 840F4FB - .string "{STR_VAR_1} was cured of\nparalysis.{PAUSE_UNTIL_PRESS}$" - -gOtherText_WokeUp:: @ 840F518 - .string "{STR_VAR_1} woke up.{PAUSE_UNTIL_PRESS}$" - -gOtherText_BurnHealed:: @ 840F526 - .string "{STR_VAR_1}’s burn was healed.{PAUSE_UNTIL_PRESS}$" - -gOtherText_ThawedOut:: @ 840F53E - .string "{STR_VAR_1} was thawed out.{PAUSE_UNTIL_PRESS}$" - -gOtherText_PPRestored:: @ 840F553 - .string "PP was restored.{PAUSE_UNTIL_PRESS}$" - -gOtherText_RegainedHealth:: @ 840F566 - .string "{STR_VAR_1} regained health.{PAUSE_UNTIL_PRESS}$" - -gOtherText_BecameHealthy:: @ 840F57C - .string "{STR_VAR_1} became healthy.{PAUSE_UNTIL_PRESS}$" - -gOtherText_PPIncreased:: @ 840F591 - .string "{STR_VAR_1}’s PP increased.{PAUSE_UNTIL_PRESS}$" - -gOtherText_ElevatedTo:: @ 840F5A6 - .string "{STR_VAR_1} was elevated to\nLv. {STR_VAR_2}.$" - -gOtherText_WasRaised:: @ 840F5C1 - .string "{STR_VAR_1}’s {STR_VAR_2} was\nraised.{PAUSE_UNTIL_PRESS}$" - -gOtherText_SnapConfusion:: @ 840F5D7 - .string "{STR_VAR_1} snapped out of its\nconfusion.{PAUSE_UNTIL_PRESS}$" - -gOtherText_GotOverLove:: @ 840F5FA - .string "{STR_VAR_1} got over its\ninfatuation.{PAUSE_UNTIL_PRESS}$" - -OtherText_ChoosePoke:: - .string "Choose a POKéMON.$" -OtherText_MovePokeTo:: - .string "Move to where?$" -OtherText_TeachWhat:: - .string "Teach which POKéMON?$" -OtherText_UseWhat:: - .string "Use on which POKéMON?$" -OtherText_GiveWhat:: - .string "Give to which POKéMON?$" -OtherText_DoWhat:: - .string "Do what with {STR_VAR_1}?$" -OtherText_NothingToCut:: - .string "There’s nothing to CUT.$" -OtherText_CantSurf:: - .string "You can’t SURF here.$" -OtherText_AlreadySurfing:: - .string "You’re already SURFING.$" -OtherText_CantUseThatHere:: - .string "Can’t use that here.$" -OtherText_RestoreWhatMove:: - .string "Restore which move?$" -OtherText_BoostPP:: - .string "Boost PP of which move?$" -OtherText_DoWhatWithItem:: - .string "Do what with an item?$" -OtherText_NoPokeForBattle:: - .string "No POKéMON for battle!$" -OtherText_ChoosePoke2:: - .string "Choose a POKéMON.$" -OtherText_NotEnoughHP:: - .string "Not enough HP...$" -OtherText_ThreePokeNeeded:: - .string "Three POKéMON are needed.$" -OtherText_PokeCantBeSame:: - .string "POKéMON can’t be the same.$" -OtherText_NoIdenticalHoldItems:: - .string "No identical hold items.$" -OtherText_TeachWhichPoke:: - .string "Teach which POKéMON?$" - -gOtherText_Attack:: @ 840F7C6 - .string "ATTACK$" - -gOtherText_Defense:: @ 840F7CD - .string "DEFENSE$" - -gOtherText_SpAtk:: @ 840F7D5 - .string "SP. ATK$" - -gOtherText_SpDef:: @ 840F7DD - .string "SP. DEF$" - -gOtherText_Speed:: @ 840F7E5 - .string "SPEED$" - -gOtherText_HP:: @ 840F7EB - .string "HP$" - -gOtherText_Terminator18:: @ 840F7EE - .string "$" - -gOtherText_OriginalTrainer:: @ 840F7EF - .string "OT/$" - -gOtherText_Type2:: @ 840F7F3 - .string "TYPE/$" - -gOtherText_Power2:: @ 840F7F9 - .string "POWER$" - -gOtherText_Accuracy2:: @ 840F7FF - .string "ACCURACY$" - -gOtherText_Appeal2:: @ 840F808 - .string "APPEAL$" - -gOtherText_Jam2:: @ 840F80F - .string "JAM$" - -gOtherText_Status:: @ 840F813 - .string "STATUS$" - -gOtherText_ExpPoints:: @ 840F81A - .string "EXP. POINTS$" - -gOtherText_NextLv:: @ 840F826 - .string "NEXT LV.$" - -gOtherText_Ribbons00:: @ 840F82F - .string "RIBBONS: 00$" - -OtherText_Event:: - .string "EVENT$" -OtherText_Switch:: - .string "SWITCH$" -OtherText_PokeInfo:: - .string "POKéMON INFO$" -OtherText_PokeSkills:: - .string "POKéMON SKILLS$" -OtherText_BattleMoves:: - .string "BATTLE MOVES$" -OtherText_ContestMoves:: - .string "C0NTEST MOVES$" @why the l33t 0, that's stupid -OtherText_Info:: - .string "INFO$" - -gOtherText_EggLongTime:: @ 840F884 - .string "It looks like this EGG will\ntake a long time to hatch.$" - -gOtherText_EggSomeTime:: @ 840F8BB - .string "What will hatch from this?\nIt will take some time.$" - -gOtherText_EggSoon:: @ 840F8EE - .string "It moves occasionally.\nIt should hatch soon.$" - -gOtherText_EggAbout:: @ 840F91B - .string "It’s making sounds.\nIt’s about to hatch!$" - -gOtherText_CantForgetHMs:: @ 840F944 - .string "HM moves can’t be\nforgotten now.$" - -gOtherText_PlayersBase:: @ 840F965 - .string "’s BASE$" - -gOtherText_OkayToDeleteFromRegistry:: @ 840F96D - .string "Is it okay to delete {STR_VAR_1}\nfrom the REGISTRY?$" - -gOtherText_RegisteredDataDeleted:: @ 840F998 - .string "The registered data was deleted.{PAUSE_UNTIL_PRESS}$" - -gSecretBaseText_NoRegistry:: @ 840F9BB - .string "There is no REGISTRY.{PAUSE_UNTIL_PRESS}$" - -SecretBaseText_DelRegist:: - .string "DEL REGIST.$" -SecretBaseText_Decorate:: - .string "DECORATE$" -SecretBaseText_PutAway:: - .string "PUT AWAY$" -SecretBaseText_Toss:: - .string "TOSS$" -SecretBaseText_PutOutDecor:: - .string "Put out the selected decoration item.$" -SecretBaseText_StoreChosenDecor:: - .string "Store the chosen decoration in the PC.$" -SecretBaseText_ThrowAwayDecor:: - .string "Throw away unwanted decorations.$" - -gSecretBaseText_NoDecors:: @ 840FA64 - .string "There are no decorations.{PAUSE_UNTIL_PRESS}$" - -SecretBaseText_Desk:: - .string "DESK$" -SecretBaseText_Chair:: - .string "CHAIR$" -SecretBaseText_Plant:: - .string "PLANT$" -SecretBaseText_Ornament:: - .string "ORNAMENT$" -SecretBaseText_Mat:: - .string "MAT$" -SecretBaseText_Poster:: - .string "POSTER$" -SecretBaseText_Doll:: - .string "DOLL$" -SecretBaseText_Cushion:: - .string "CUSHION$" - -gSecretBaseText_GoldRank:: @ 840FAB2 - .string "GOLD$" - -gSecretBaseText_SilverRank:: @ 840FAB7 - .string "SILVER$" - -gSecretBaseText_PlaceItHere:: @ 840FABE - .string "Place it here?$" - -gSecretBaseText_CantBePlacedHere:: @ 840FACD - .string "It can’t be placed here.$" - -gSecretBaseText_CancelDecorating:: @ 840FAE6 - .string "Cancel decorating?$" - -gSecretBaseText_InUseAlready:: @ 840FAF9 - .string "This is in use already.$" - -gSecretBaseText_NoMoreDecor:: @ 840FB11 - .string "No more decorations can be placed.\nThe most that can be placed is {STR_VAR_1}.$" - -gSecretBaseText_NoMoreDecor2:: @ 840FB57 - .string "No more decorations can be placed.\nThe most that can be placed is {STR_VAR_1}.$" - .string "This can’t be placed here.\nIt must be on a DESK, etc.$" - -gSecretBaseText_DecorCantPlace:: @ 840FBD3 - .string "This decoration can’t be placed in\nyour own room.$" - -gSecretBaseText_DecorInUse:: @ 840FC05 - .string "This decoration is in use.\nIt can’t be thrown away.$" - -gSecretBaseText_WillBeDiscarded:: @ 840FC39 - .string "This {STR_VAR_1} will be discarded.\nIs that okay?$" - -gSecretBaseText_DecorThrownAway:: @ 840FC62 - .string "The decoration item was thrown away.$" - -gSecretBaseText_StopPuttingAwayDecor:: @ 840FC87 - .string "Stop putting away decorations?$" - -gSecretBaseText_NoDecor:: @ 840FCA6 - .string "There is no decoration item here.$" - -gSecretBaseText_ReturnDecor:: @ 840FCC8 - .string "Return this decoration to the PC?$" - -gSecretBaseText_DecorReturned:: @ 840FCEA - .string "The decoration was returned to the PC.$" - -gSecretBaseText_NoDecorInUse:: @ 840FD11 - .string "There are no decorations in use.{PAUSE_UNTIL_PRESS}$" - -SecretBaseText_Tristan:: - .string "TRISTAN$" -SecretBaseText_Philip:: - .string "PHILIP$" -SecretBaseText_Dennis:: - .string "DENNIS$" -SecretBaseText_Roberto:: - .string "ROBERTO$" -SecretBaseText_TurnOff:: - .string "TURN OFF$" -SecretBaseText_Decoration:: - .string "DECORATION$" -SecretBaseText_ItemStorage:: - .string "ITEM STORAGE$" - -gPCText_Mailbox:: @ 840FD73 - .string "MAILBOX$" - -PCText_DepositItem:: - .string "DEPOSIT ITEM$" -PCText_WithdrawItem:: - .string "WITHDRAW ITEM$" -PCText_TossItem:: - .string "TOSS ITEM$" -PCText_StoreItems:: - .string "Store items in the PC.$" -PCText_TakeOutItems:: - .string "Take out items from the PC.$" -PCText_ThrowAwayItems:: - .string "Throw away items stored in the PC.$" - -gOtherText_NoItems:: @ 840FDF6 - .string "There are no items.{PAUSE_UNTIL_PRESS}$" - -gOtherText_NoMoreRoom:: @ 840FE0C - .string "There is no more\nroom in the BAG.$" - -gOtherText_HowManyToWithdraw:: @ 840FE2E - .string "How many do you\nwant to withdraw?$" - -gOtherText_WithdrewThing:: @ 840FE50 - .string "Withdrew {STR_VAR_2}\n{STR_VAR_1}(s).$" - -OtherText_Read:: - .string "READ$" - -gOtherText_MoveToBag:: @ 840FE68 - .string "MOVE TO BAG$" - -OtherText_Give:: - .string "GIVE$" - -gOtherText_NoMailHere:: @ 840FE79 - .string "There’s no MAIL here.{PAUSE_UNTIL_PRESS}$" - -gOtherText_WhatWillYouDoMail:: @ 840FE91 - .string "What would you like to do with\n{STR_VAR_1}’s MAIL?$" - -gOtherText_MessageWillBeLost:: @ 840FEBB - .string "The message will be lost.\nIs that okay?$" - -gOtherText_BagIsFull:: @ 840FEE3 - .string "The BAG is full.{PAUSE_UNTIL_PRESS}$" - -gOtherText_MailWasReturned:: @ 840FEF6 - .string "The MAIL was returned to the BAG\nwith its message erased.{PAUSE_UNTIL_PRESS}$" - -gOtherText_Dad:: @ 840FF32 - .string "DAD$" - -gOtherText_Mom:: @ 840FF36 - .string "MOM$" - -gOtherText_Wallace:: @ 840FF3A - .string "WALLACE$" - -gOtherText_Steven:: @ 840FF42 - .string "STEVEN$" - -gOtherText_Brawly:: @ 840FF49 - .string "BRAWLY$" - -gOtherText_Winona:: @ 840FF50 - .string "WINONA$" - -gOtherText_Phoebe:: @ 840FF57 - .string "PHOEBE$" - -gOtherText_Glacia:: @ 840FF5E - .string "GLACIA$" - -gContestText_ContestWinner:: @ 840FF65 - .string "CONTEST WINNER\n$" - -gOtherText_Unknown1:: @ 840FF75 - .string "’s $" - -OtherText_Cool:: - .string "COOL $" -OtherText_Beauty2:: - .string "BEAUTY $" -OtherText_Cute:: - .string "CUTE $" -OtherText_Smart:: - .string "SMART $" -OtherText_Tough:: - .string "TOUGH $" -OtherText_NonstopSuperCool:: - .string "Nonstop super-cool -\nthe inestimable $" -OtherText_Terminator6:: - .string "$" -OtherText_GoodLookingPoke:: - .string "Hey, there!\nThe good-looking POKéMON $" -OtherText_Terminator7:: - .string "$" -OtherText_MarvelousGreat:: - .string "The marvelous, wonderful, and\nvery great $" -OtherText_Terminator8:: - .string "$" -OtherText_CenturyLastVenus:: - .string "This century’s last Venus -\nthe beautiful $" -OtherText_Terminator9:: - .string "$" -OtherText_Terminator10:: - .string "$" -OtherText_DazzlingSlime:: - .string "’s dazzling,\nglittering smile$" -OtherText_PokeCenterIdol:: - .string "POKéMON CENTER’s super idol -\nthe incomparable $" -OtherText_Terminator11:: - .string "$" -OtherText_LovelyAndSweet:: - .string "The lovely and sweet $" -OtherText_Terminator12:: - .string "$" -OtherText_ThePretty:: - .string "The pretty $" -OtherText_WinningPortrait:: - .string "’s\nwinning portrait$" -OtherText_GiveUsWink:: - .string "Give us a wink!\nThe cutie POKéMON $" -OtherText_Terminator13:: - .string "$" -OtherText_SmartnessMaestro:: - .string "The smartness maestro -\nThe wise POKéMON $" -OtherText_Terminator14:: - .string "$" -OtherText_ChosenPokeAmong:: - .string "The chosen POKéMON -\nThe one among POKéMON $" -OtherText_Terminator15:: - .string "$" -OtherText_TheExcellent:: - .string "The excellent $" -OtherText_ItsMomentOfElegance:: - .string "’s\nmoment of elegance$" -OtherText_PowerfullyMuscular:: - .string "The powerfully muscular\nspeedster $" -OtherText_Terminator16:: - .string "$" -OtherText_StrongErEst:: - .string "The strong, stronger, and\nstrongest $" -OtherText_Terminator17:: - .string "$" -OtherText_MightyTough:: - .string "The mighty tough\nhyper POKéMON $" -OtherText_Exclamation:: - .string "!$" -OtherText_Petalburg:: - .string "PETALBURG$" -OtherText_Slateport:: - .string "SLATEPORT$" -OtherText_Littleroot:: - .string "LITTLEROOT$" -OtherText_Lilycove:: - .string "LILYCOVE$" -OtherText_Dewford:: - .string "DEWFORD$" -OtherText_Enter:: - .string "ENTER$" -OtherText_Info3:: - .string "INFO$" -OtherText_WhatsAContest:: - .string "What’s a CONTEST?$" -OtherText_TypesOfContest:: - .string "Types of CONTESTS$" -OtherText_Ranks:: - .string "Ranks$" -OtherText_Judging:: - .string "Judging$" -OtherText_CoolContest:: - .string "COOL CONTEST$" -OtherText_BeautyContest:: - .string "BEAUTY CONTEST$" -OtherText_CuteContest:: - .string "CUTE CONTEST$" -OtherText_SmartContest:: - .string "SMART CONTEST$" -OtherText_ToughContest:: - .string "TOUGH CONTEST$" -OtherText_Decoration:: - .string "DECORATION$" -OtherText_PackUp:: - .string "PACK UP$" -OtherText_Count:: - .string "COUNT$" -OtherText_Registry:: - .string "REGISTRY$" -OtherText_Information:: - .string "INFORMATION$" -OtherText_Mach:: - .string "MACH$" -OtherText_Acro:: - .string "ACRO$" -OtherText_Poison:: - .string "PSN$" -OtherText_Paralysis:: - .string "PAR$" -OtherText_Sleep:: - .string "SLP$" -OtherText_Burn:: - .string "BRN$" -OtherText_Frozen:: - .string "FRZ$" -OtherText_Quit:: - .string "QUIT$" -OtherText_SawIt:: - .string "Saw it$" -OtherText_NotYet:: - .string "Not yet$" -OtherText_Yes:: - .string "YES$" -OtherText_No:: - .string "NO$" -OtherText_Info2:: - .string "INFO$" -OtherText_SingleBattle:: - .string "SINGLE BATTLE$" -OtherText_DoubleBattle:: - .string "DOUBLE BATTLE$" -OtherText_MultiBattle:: - .string "MULTI BATTLE$" -OtherText_MrBriney:: - .string "MR. BRINEY$" -OtherText_MakeAChallenge:: - .string "Make a challenge.$" -OtherText_ObtainInformation:: - .string "Obtain information.$" -OtherText_Lv50_2:: - .string "LV. 50$" -OtherText_Lv100_2:: - .string "LV. 100$" -OtherText_Zigzagoon:: - .string "ZIGZAGOON$" -OtherText_Nincada:: - .string "NINCADA$" -OtherText_Poochyena:: - .string "POOCHYENA$" -OtherText_Nincada2:: - .string "NINCADA$" -OtherText_Lotad:: - .string "LOTAD$" -OtherText_Roselia:: - .string "ROSELIA$" -OtherText_Shroomish:: - .string "SHROOMISH$" -OtherText_Nincada3:: - .string "NINCADA$" -OtherText_Surskit:: - .string "SURSKIT$" -OtherText_Treecko:: - .string "TREECKO$" -OtherText_Torchic:: - .string "TORCHIC$" -OtherText_Mudkip:: - .string "MUDKIP$" -OtherText_Seedot:: - .string "SEEDOT$" -OtherText_Shroomish2:: - .string "SHROOMISH$" -OtherText_Spinda:: - .string "SPINDA$" -OtherText_Shroomish3:: - .string "SHROOMISH$" -OtherText_Zigzagoon2:: - .string "ZIGZAGOON$" -OtherText_Wurmple:: - .string "WURMPLE$" -OtherText_PokeBall:: - .string "POKé BALL$" -OtherText_SuperPotion:: - .string "SUPER POTION$" -OtherText_SamePrice:: - .string "Same price$" -OtherText_Yen135:: - .string "¥135$" -OtherText_Yen155:: - .string "¥155$" -OtherText_Yen175:: - .string "¥175$" -OtherText_CostMore:: - .string "They will cost more.$" -OtherText_CostLess:: - .string "They will cost less.$" -OtherText_SamePrice2:: - .string "Same price$" -OtherText_MaleSymbol:: - .string "♂$" -OtherText_FemaleSymbol:: - .string "♀$" -OtherText_Neither:: - .string "Neither$" -OtherText_Males:: - .string "Males$" -OtherText_Females:: - .string "Females$" -OtherText_SameNumber:: - .string "Same number$" -OtherText_Male:: - .string "Male$" -OtherText_Female:: - .string "Female$" -OtherText_ItDepends:: - .string "It depends$" -OtherText_Six2:: - .string "6$" -OtherText_Eight2:: - .string "8$" -OtherText_Ten:: - .string "10$" -OtherText_One:: - .string "1$" -OtherText_Two:: - .string "2$" -OtherText_Three:: - .string "3$" -OtherText_Six:: - .string "6$" -OtherText_Seven:: - .string "7$" -OtherText_Eight:: - .string "8$" -OtherText_FreshWater:: - .string "FRESH WATER{CLEAR_TO 0x48}¥200$" -OtherText_SodaPop:: - .string "SODA POP{CLEAR_TO 0x48}¥300$" -OtherText_Lemonade:: - .string "LEMONADE{CLEAR_TO 0x48}¥350$" -OtherText_HowToRide:: - .string "HOW TO RIDE$" -OtherText_HowToTurn:: - .string "HOW TO TURN$" -OtherText_SandySlopes:: - .string "SANDY SLOPES$" -OtherText_Wheelies:: - .string "WHEELIES$" -OtherText_BunnyHops:: - .string "BUNNY-HOPS$" -OtherText_Jumping:: - .string "JUMPING$" -OtherText_Satisfied:: - .string "Satisfied$" -OtherText_Dissatisfied:: - .string "Dissatisfied$" -OtherText_Deepseatooth:: - .string "DEEPSEATOOTH$" -OtherText_Deepseascale:: - .string "DEEPSEASCALE$" -OtherText_BlueFlute2:: - .string "BLUE FLUTE$" -OtherText_YellowFlute2:: - .string "YELLOW FLUTE$" -OtherText_RedFlute2:: - .string "RED FLUTE$" -OtherText_WhiteFlute2:: - .string "WHITE FLUTE$" -OtherText_BlackFlute2:: - .string "BLACK FLUTE$" -OtherText_GlassChair:: - .string "GLASS CHAIR$" -OtherText_GlassDesk:: - .string "GLASS DESK$" -OtherText_TreeckoDoll:: - .string "TREECKO DOLL 1,000 COINS$" -OtherText_TorchicDoll:: - .string "TORCHIC DOLL 1,000 COINS$" -OtherText_MudkipDoll:: - .string "MUDKIP DOLL 1,000 COINS$" -OtherText_50Coins:: - .string " 50 COINS ¥1,000$" -OtherText_500Coins:: - .string "500 COINS ¥10,000$" -OtherText_Excellent:: - .string "Excellent!$" -OtherText_NotSoHot:: - .string "Not so hot$" -OtherText_RedShard:: - .string "RED SHARD$" -OtherText_YellowShard:: - .string "YELLOW SHARD$" -OtherText_BlueShard:: - .string "BLUE SHARD$" -OtherText_GreenShard:: - .string "GREEN SHARD$" -OtherText_BattleTower:: - .string "BATTLE TOWER$" -OtherText_Right:: - .string "Right$" -OtherText_Left:: - .string "Left$" -OtherText_TM32:: - .string "TM32 1,500 COINS$" -OtherText_TM29:: - .string "TM29 3,500 COINS$" -OtherText_TM35:: - .string "TM35 4,000 COINS$" -OtherText_TM24:: - .string "TM24 4,000 COINS$" -OtherText_TM13:: - .string "TM13 4,000 COINS$" -OtherText_1F_2:: - .string "1F$" -OtherText_2F_2:: - .string "2F$" -OtherText_3F_2:: - .string "3F$" -OtherText_4F_2:: - .string "4F$" -OtherText_5F_2:: - .string "5F$" -OtherText_Cool2:: - .string "COOL$" -OtherText_Beauty3:: - .string "BEAUTY$" -OtherText_Cute2:: - .string "CUTE$" -OtherText_Smart2:: - .string "SMART$" -OtherText_Tough2:: - .string "TOUGH$" -OtherText_Normal:: - .string "NORMAL$" -OtherText_Super:: - .string "SUPER$" -OtherText_Hyper:: - .string "HYPER$" -OtherText_Master:: - .string "MASTER$" -OtherText_Cool3:: - .string "COOL$" -OtherText_Beauty4:: - .string "BEAUTY$" -OtherText_Cute3:: - .string "CUTE$" -OtherText_Smart3:: - .string "SMART$" -OtherText_Tough3:: - .string "TOUGH$" -OtherText_Items:: - .string "ITEMS$" -OtherText_KeyItems:: - .string "KEY ITEMS$" -OtherText_Balls:: - .string "BALLS$" -OtherText_TMsHMs:: - .string "TMs & HMs$" -OtherText_Berries:: - .string "BERRIES$" - -gPCText_SomeonesPC:: @ 8410753 - .string "SOMEONE’S PC$" - -gPCText_LanettesPC:: @ 8410760 - .string "LANETTE’S PC$" - -gPCText_PlayersPC:: @ 841076D - .string "{PLAYER}’s PC$" - -gPCText_HallOfFame:: @ 8410775 - .string "HALL OF FAME$" - -gPCText_LogOff:: @ 8410782 - .string "LOG OFF$" - -gOtherText_99Times:: @ 841078A - .string "99 times +$" - -gOtherText_1Minute:: @ 8410795 - .string "1 minute +$" - -gOtherText_Seconds:: @ 84107A0 - .string " seconds$" - -gOtherText_Times:: @ 84107A9 - .string " times$" - .string ".$" - -gOtherText_BigGuy:: @ 84107B2 - .string "Big guy$" - -gOtherText_BigGirl:: @ 84107BA - .string "Big girl$" - -gOtherText_Son:: @ 84107C3 - .string "son$" - -gOtherText_Daughter:: @ 84107C7 - .string "daughter$" - -OtherText_BlueFlute:: - .string "BLUE FLUTE$" -OtherText_YellowFlute:: - .string "YELLOW FLUTE$" -OtherText_RedFlute:: - .string "RED FLUTE$" -OtherText_WhiteFlute:: - .string "WHITE FLUTE$" -OtherText_BlackFlute:: - .string "BLACK FLUTE$" -OtherText_PrettyChair:: - .string "PRETTY CHAIR$" -OtherText_PrettyDesk:: - .string "PRETTY DESK$" -OtherText_1F:: - .string "1F$" -OtherText_2F:: - .string "2F$" -OtherText_3F:: - .string "3F$" -OtherText_4F:: - .string "4F$" -OtherText_5F:: - .string "5F$" -OtherText_6F:: - .string "6F$" -OtherText_7F:: - .string "7F$" -OtherText_8F:: - .string "8F$" -OtherText_9F:: - .string "9F$" -OtherText_10F:: - .string "10F$" -OtherText_11F:: - .string "11F$" -OtherText_B1F:: - .string "B1F$" -OtherText_B2F:: - .string "B2F$" -OtherText_B3F:: - .string "B3F$" -OtherText_B4F:: - .string "B4F$" -OtherText_Rooftop:: - .string "ROOFTOP$" - -gOtherText_NowOn:: @ 841085E - .string "Now on:$" - -gPCText_Cancel:: @ 8410866 - .string "CANCEL$" - -PCText_ExitBox:: - .string "Exit from the BOX.$" -PCText_WhatYouDo:: - .string "What would you like to do?$" -PCText_PickATheme:: - .string "Please pick a theme.$" -PCText_PickAWallpaper:: - .string "Please pick out wallpaper.$" -PCText_IsSelected:: - .string " is selected.$" -PCText_JumpToWhichBox:: - .string "Jump to which BOX?$" -PCText_DepositInWhichBox:: - .string "Deposit in which BOX?$" -PCText_WasDeposited:: - .string " was deposited.$" -PCText_BoxIsFull:: - .string "The BOX is full.$" -PCText_ReleasePoke:: - .string "Release this POKéMON?$" -PCText_WasReleased:: - .string " was released.$" -PCText_ByeBye:: - .string "Bye-bye, !$" -PCText_MarkPoke:: - .string "Mark your POKéMON.$" -PCText_LastPoke:: - .string "That’s your last POKéMON!$" -PCText_PartyFull:: - .string "Your party’s full!$" -PCText_HoldingPoke:: - .string "You’re holding a POKéMON!$" -PCText_WhichOneWillTake:: - .string "Which one will you take?$" -PCText_CantReleaseEgg:: - .string "You can’t release an EGG.$" -PCText_ContinueBox:: - .string "Continue BOX operations?$" -PCText_CameBack:: - .string " came back!$" -PCText_Worried:: - .string "Was it worried about you?$" -PCText_Surprise:: - .string "... ... ... ... ...!$" -PCText_PleaseRemoveMail:: - .string "Please remove the MAIL.$" -PCText_Cancel2:: - .string "CANCEL$" -PCText_Deposit:: - .string "DEPOSIT$" -PCText_Withdraw:: - .string "WITHDRAW$" -PCText_Switch:: - .string "SWITCH$" -PCText_Move:: - .string "MOVE$" -PCText_Place:: - .string "PLACE$" -PCText_Summary:: - .string "SUMMARY$" -PCText_Release:: - .string "RELEASE$" -PCText_Mark:: - .string "MARK$" -PCText_Name:: - .string "NAME$" -PCText_Jump:: - .string "JUMP$" -PCText_Wallpaper:: - .string "WALLPAPER$" -PCText_Scenery1:: - .string "SCENERY 1$" -PCText_Scenery2:: - .string "SCENERY 2$" -PCText_Scenery3:: - .string "SCENERY 3$" -PCText_Etc:: - .string "ETCETERA$" -PCText_Forest:: - .string "FOREST$" -PCText_City:: - .string "CITY$" -PCText_Desert:: - .string "DESERT$" -PCText_Savanna:: - .string "SAVANNA$" -PCText_Crag:: - .string "CRAG$" -PCText_Volcano:: - .string "VOLCANO$" -PCText_Snow:: - .string "SNOW$" -PCText_Cave:: - .string "CAVE$" -PCText_Beach:: - .string "BEACH$" -PCText_Seafloor:: - .string "SEAFLOOR$" -PCText_River:: - .string "RIVER$" -PCText_Sky:: - .string "SKY$" -PCText_Polka:: - .string "POLKA-DOT$" -PCText_PokeCenter:: - .string "POKéCENTER$" -PCText_Machine:: - .string "MACHINE$" -PCText_Plain:: - .string "PLAIN$" -PCText_WhatDoYouWant:: - .string "What do you want?$" -PCText_WithdrawPoke:: - .string "WITHDRAW POKéMON$" -PCText_DepositPoke:: - .string "DEPOSIT POKéMON$" -PCText_MovePoke:: - .string "MOVE POKéMON$" -PCText_SeeYa:: - .string "SEE YA!$" -PCText_MovePokeToParty:: - .string "Move POKéMON stored in BOXES to\nyour party.$" -PCText_StorePokeInBox:: - .string "Store POKéMON in your party in BOXES.$" -PCText_OrganizeBoxesParty:: - .string "Organize the POKéMON in BOXES and\nin your party.$" -PCText_ReturnToPrevMenu:: - .string "Return to the previous menu.$" - -gPCText_OnlyOne:: @ 8410C1C - .string "There is just one POKéMON with you.$" - -gPCText_PartyFull2:: @ 8410C40 - .string "Your party is full!$" - -gPCText_BOX:: @ 8410C54 - .string "BOX$" - -PCText_CheckMap:: - .string "{CLEAR 0}Check the map of the HOENN region.$" -PCText_CheckPoke:: - .string "{CLEAR 0}Check POKéMON in detail.$" -PCText_CheckTrainer:: - .string "{CLEAR 0}Check TRAINER information.$" -PCText_CheckRibbons:: - .string "{CLEAR 0}Check obtained RIBBONS.$" -PCText_PutAwayNav:: - .string "{CLEAR 0}Put away the POKéNAV.$" -PCText_NoRibbonWin:: - .string "{CLEAR 0}There are no RIBBON winners.$" -PCText_NoTrainers:: - .string "{CLEAR 0}No TRAINERS are registered.$" -PCText_CheckParty:: - .string "{CLEAR 0}Check party POKéMON in detail.$" -PCText_CheckPokeAll:: - .string "{CLEAR 0}Check all POKéMON in detail.$" -PCText_ReturnToNav:: - .string "{CLEAR 0}Return to the POKéNAV menu.$" -PCText_FindCool:: - .string "{CLEAR 0}Find cool POKéMON.$" -PCText_FindBeauty:: - .string "{CLEAR 0}Find beautiful POKéMON.$" -PCText_FindCute:: - .string "{CLEAR 0}Find cute POKéMON.$" -PCText_FindSmart:: - .string "{CLEAR 0}Find smart POKéMON.$" -PCText_FindTough:: - .string "{CLEAR 0}Find tough POKéMON.$" -PCText_ReturnToCondition:: - .string "{CLEAR 0}Return to the CONDITION menu.$" - -gOtherText_NumberRegistered:: @ 8410E22 - .string "No. registered$" - -gOtherText_NumberBattles:: @ 8410E31 - .string "No. of battles$" - -gOtherText_Strategy:: @ 8410E40 - .string "{PALETTE 5}STRATEGY$" - -gOtherText_TrainersPokemon:: @ 8410E4C - .string "{PALETTE 5}TRAINER’S POKéMON$" - -gOtherText_SelfIntroduction:: @ 8410E61 - .string "{PALETTE 5}SELF-INTRODUCTION$" - -gOtherText_Nature2:: @ 8410E76 - .string "NATURE/$" - -gOtherText_InParty:: @ 8410E7E - .string "IN PARTY$" - -gOtherText_Number:: @ 8410E87 - .string "No. $" - -gOtherText_Ribbons:: @ 8410E8C - .string "RIBBONS$" - -OtherText_MakeProfilePage1:: - .string "Make your profile by combining$" -OtherText_MakeProfilePage2:: - .string "four words or phrases.$" -OtherText_MakeMessagePage1:: - .string "Make a message with 6 phrases.$" -OtherText_MakeMessagePage2:: - .string "Max. two 12-letter phrases/line.$" -OtherText_DescribeFeelingsPage1:: - .string "Find words that describe your$" -OtherText_DescribeFeelingsPage2:: - .string "feelings right now.$" -OtherText_WithFourPhrases:: - .string "With four phrases,$" -OtherText_CombineNinePhrasesPage1:: - .string "Combine nine phrases and$" -OtherText_CombineNinePhrasesPage2:: - .string "make a message.$" -OtherText_ImproveBardSongPage1:: - .string "Change just one word or phrase$" -OtherText_ImproveBardSongPage2:: - .string "and improve the BARD’s song.$" -OtherText_YourProfile:: - .string "Your profile $" -OtherText_YourFeelingBattle:: - .string "Your feeling at the battle’s start$" -OtherText_SetWinMessage:: - .string "What you say if you win a battle$" -OtherText_SetLossMessage:: - .string "What you say if you lose a battle$" -OtherText_TheAnswer:: - .string "The answer$" -OtherText_MailMessage:: - .string "The MAIL message$" -OtherText_MailSalutation:: - .string "The MAIL salutation$" -OtherText_NewSong:: - .string "The new song$" -OtherText_CombineTwoPhrasesPage1:: - .string "Combine two phrases and$" -OtherText_CombineTwoPhrasesPage2:: - .string "make a trendy saying.$" -OtherText_ConfirmTrendyPage1:: - .string "The trendy saying$" -OtherText_ConfirmTrendyPage2:: - .string "is as shown. Okay?$" -OtherText_HipsterPage1:: - .string "I’ll combine two phrases and$" -OtherText_HipsterPage2:: - .string "teach you a good saying.$" - -gOtherText_TextDeletedConfirmPage1:: @ 84110EE - .string "All the text being edited will$" - -gOtherText_TextDeletedConfirmPage2:: @ 841110D - .string "be deleted. Is that okay?$" - -gOtherText_QuitEditing:: @ 8411127 - .string "Quit editing?$" - -gOtherText_EditedTextNoSavePage1:: @ 8411135 - .string "The edited text will not be saved.$" - -gOtherText_EditedTextNoSavePage2:: @ 8411158 - .string "Is that okay?$" - -gOtherText_EnterAPhraseOrWord:: @ 8411166 - .string "Please enter a phrase or word.$" - -gOtherText_TextNoDelete:: @ 8411185 - .string "The entire text can’t be deleted.$" - -gOtherText_OnlyOnePhrase:: @ 84111A7 - .string "Only one phrase may be changed.$" - -gOtherText_OriginalSongRestored:: @ 84111C7 - .string "The original song will be restored.$" - -gOtherText_TrendyAlready:: @ 84111EB - .string "That’s trendy already!$" - -gOtherText_CombineTwoPhrases:: @ 8411202 - .string "Combine two words or phrases.$" - -gOtherText_QuitGivingInfo:: @ 8411220 - .string "Quit giving information?$" - -gOtherText_StopGivingMail:: @ 8411239 - .string "Stop giving the POKéMON MAIL?$" - -gOtherText_Profile:: @ 8411257 - .string "PROFILE$" - -gOtherText_AtBattleStart:: @ 841125F - .string "At the battle’s start.$" - -gOtherText_UponWinningBattle:: @ 8411276 - .string "Upon winning a battle.$" - -gOtherText_UponLosingBattle:: @ 841128D - .string "Upon losing a battle.$" - -gOtherText_TheBardsSong:: @ 84112A3 - .string "The BARD’s Song$" - -gOtherText_WhatsHipHappening:: @ 84112B3 - .string "What’s hip and happening?$" - -gOtherText_Interview:: @ 84112CD - .string "Interview$" - -gOtherText_GoodSaying:: @ 84112D7 - .string "Good saying$" - -OtherText_SoPretty:: - .string " so pretty!$" -OtherText_SoDarling:: - .string " so darling!$" -OtherText_SoRelaxed:: - .string " so relaxed!$" -OtherText_SoSunny:: - .string " so sunny!$" -OtherText_SoDesirable:: - .string " so desirable!$" -OtherText_SoExciting:: - .string " so exciting!$" -OtherText_SoAmusing:: - .string " so amusing!$" -OtherText_SoMagical:: - .string " so magical!$" - -gOtherText_Is:: @ 841134B - .string " is$" - -gOtherText_DontYouAgree:: @ 841134F - .string "\nDon’t you agree?$" - -OtherText_WantVacationNicePlace:: - .string "I so want to go on a vacation.\nWould you happen to know a nice place?$" -OtherText_BoughtCrayonsIsNice:: - .string "I bought crayons with 120 colors!\nDon’t you think that’s nice?$" -OtherText_IfWeCouldFloat:: - .string "Wouldn’t it be nice if we could float\naway on a cloud of bubbles?$" -OtherText_SandWashesAwayMakeSad:: - .string "When you write on a sandy beach,\nthey wash away. It makes me sad.$" -OtherText_WhatsBottomSeaLike:: - .string "What’s the bottom of the sea like?\nJust once I would so love to go!$" -OtherText_SeeSettingSun:: - .string "When you see the setting sun, does it\nmake you want to go home?$" -OtherText_LyingInGreenGrass:: - .string "Lying back in the green grass...\nOh, it’s so, so nice!$" -OtherText_SecretBasesWonderful:: - .string "SECRET BASES are so wonderful!\nCan’t you feel the excitement?$" -OtherText_PokeLeague:: - .string "POKéMON LEAGUE$" -OtherText_PokeCenter:: - .string "POKéMON CENTER$" - -gOtherText_GetsAPokeBlock:: @ 8411581 - .string " gets a {POKEBLOCK}?$" - -OtherText_Coolness:: - .string "Coolness $" -OtherText_Beauty:: - .string "Beauty $" -OtherText_Cuteness:: - .string "Cuteness $" -OtherText_Smartness:: - .string "Smartness $" -OtherText_Toughness:: - .string "Toughness $" - -gOtherText_WasEnhanced:: @ 84115C2 - .string "was enhanced!$" - -gOtherText_NothingChanged:: @ 84115D0 - .string "Nothing changed!$" - -gOtherText_WontEat:: @ 84115E1 - .string "It won’t eat anymore...$" - -gSystemText_SaveFailedBackupCheck:: @ 84115F9 - .string "Save failed.\nChecking the backup memory...\nPlease wait.\n{COLOR RED}“Time required: 1 minute”$" - -gSystemText_BackupDamagedGameContinue:: @ 841164E - .string "The backup memory is damaged or\nthe internal battery has run dry.\nThe game can be played. However,\nprogress cannot be saved.$" - -gSystemText_GameplayEnded:: @ 84116CB - .string "{COLOR RED}“Gameplay cannot be continued.\nReturning to the title screen...”$" - -gSystemText_CheckCompleteSaveAttempt:: @ 841170F - .string "Check completed.\nAttempting to save again.\nPlease wait.$" - -gSystemText_SaveCompletedGameEnd:: @ 8411747 - .string "Save completed.\n{COLOR RED}“Gameplay cannot be continued.\nReturning to the title screen.”$" - -gSystemText_SaveCompletedPressA:: @ 8411799 - .string "Save completed.\n{COLOR RED}“Please press the A Button.”$" - -gOtherText_Ferry:: @ 84117C9 - .string "FERRY$" - -gOtherText_SecretBase:: @ 84117CF - .string "SECRET BASE$" - -gOtherText_Hideout:: @ 84117DB - .string "HIDEOUT$" - -gSystemText_ResetRTCPrompt:: @ 84117E3 - .string "Reset RTC?\nA: Confirm, B: Cancel$" - -gSystemText_PresentTime:: @ 8411804 - .string "Present time in game$" - -gSystemText_PreviousTime:: @ 8411819 - .string "Previous time in game$" - -gSystemText_PleaseResetTime:: @ 841182F - .string "Please reset the time.$" - -gSystemText_ClockResetDataSave:: @ 8411846 - .string "The clock has been reset.\nData will be saved. Please wait.$" - -gSystemText_SaveCompleted:: @ 8411881 - .string "Save completed.$" - -gSystemText_SaveFailed:: @ 8411891 - .string "Save failed...$" - -gSystemText_NoSaveFileNoTime:: @ 84118A0 - .string "There is no save file, so the time\ncan’t be set.$" - -gSystemText_ClockAdjustmentUsable:: @ 84118D1 - .string "The in-game clock adjustment system\nis now useable.$" - -gSystemText_Saving:: @ 8411905 - .string "SAVING...\nDON’T TURN OFF THE POWER.$" diff --git a/data/text/berry_descriptions.inc b/data/text/berry_descriptions.inc deleted file mode 100644 index ace0cff17..000000000 --- a/data/text/berry_descriptions.inc +++ /dev/null @@ -1,257 +0,0 @@ -gBerryDescriptionPart1_Cheri: @ 83CC740 - .string "Blooms with delicate pretty flowers.$" - -gBerryDescriptionPart2_Cheri: @ 83CC765 - .string "The bright red BERRY is very spicy.$" - -gBerryDescriptionPart1_Chesto: @ 83CC789 - .string "The BERRY’s thick skin and fruit are$" - -gBerryDescriptionPart2_Chesto: @ 83CC7AE - .string "very tough. It is dry-tasting all over.$" - -gBerryDescriptionPart1_Pecha: @ 83CC7D6 - .string "Very sweet and delicious.$" - -gBerryDescriptionPart2_Pecha: @ 83CC7F0 - .string "Also very tender - handle with care.$" - -gBerryDescriptionPart1_Rawst: @ 83CC815 - .string "If the leaves grow long and curly,$" - -gBerryDescriptionPart2_Rawst: @ 83CC838 - .string "the BERRY seems to grow very bitter.$" - -gBerryDescriptionPart1_Aspear: @ 83CC85D - .string "The hard BERRY is dense with a rich$" - -gBerryDescriptionPart2_Aspear: @ 83CC881 - .string "juice. It is quite sour.$" - -gBerryDescriptionPart1_Leppa: @ 83CC89A - .string "Grows slower than CHERI and others.$" - -gBerryDescriptionPart2_Leppa: @ 83CC8BE - .string "The smaller the BERRY, the tastier.$" - -gBerryDescriptionPart1_Oran: @ 83CC8E2 - .string "A peculiar BERRY with a mix of flavors.$" - -gBerryDescriptionPart2_Oran: @ 83CC90A - .string "BERRIES grow in half a day.$" - -gBerryDescriptionPart1_Persim: @ 83CC926 - .string "Loves sunlight. The BERRY’s color$" - -gBerryDescriptionPart2_Persim: @ 83CC948 - .string "grows vivid when exposed to the sun.$" - -gBerryDescriptionPart1_Lum: @ 83CC96D - .string "Slow to grow. If raised with loving$" - -gBerryDescriptionPart2_Lum: @ 83CC991 - .string "care, it may grow two BERRIES.$" - -gBerryDescriptionPart1_Sitrus: @ 83CC9B0 - .string "Closely related to ORAN. The large$" - -gBerryDescriptionPart2_Sitrus: @ 83CC9D3 - .string "BERRY has a well-rounded flavor.$" - -gBerryDescriptionPart1_Figy: @ 83CC9F4 - .string "The BERRY, which looks chewed up,$" - -gBerryDescriptionPart2_Figy: @ 83CCA16 - .string "brims with spicy substances.$" - -gBerryDescriptionPart1_Wiki: @ 83CCA33 - .string "The BERRY is said to have grown lumpy$" - -gBerryDescriptionPart2_Wiki: @ 83CCA59 - .string "to help POKéMON grip it.$" - -gBerryDescriptionPart1_Mago: @ 83CCA72 - .string "The BERRY turns curvy as it grows.$" - -gBerryDescriptionPart2_Mago: @ 83CCA95 - .string "The curvier, the sweeter and tastier.$" - -gBerryDescriptionPart1_Aguav: @ 83CCABB - .string "The flower is dainty. It is rare in its$" - -gBerryDescriptionPart2_Aguav: @ 83CCAE3 - .string "ability to grow without light.$" - -gBerryDescriptionPart1_Iapapa: @ 83CCB02 - .string "The BERRY is very big and sour.$" - -gBerryDescriptionPart2_Iapapa: @ 83CCB22 - .string "It takes at least a day to grow.$" - -gBerryDescriptionPart1_Razz: @ 83CCB43 - .string "The red BERRY tastes slightly spicy.$" - -gBerryDescriptionPart2_Razz: @ 83CCB68 - .string "It grows quickly in just four hours.$" - -gBerryDescriptionPart1_Bluk: @ 83CCB8D - .string "The BERRY is blue on the outside, but$" - -gBerryDescriptionPart2_Bluk: @ 83CCBB3 - .string "it blackens the mouth when eaten.$" - -gBerryDescriptionPart1_Nanab: @ 83CCBD5 - .string "This BERRY was the seventh$" - -gBerryDescriptionPart2_Nanab: @ 83CCBF0 - .string "discovered in the world. It is sweet.$" - -gBerryDescriptionPart1_Wepear: @ 83CCC16 - .string "The flower is small and white. It has a$" - -gBerryDescriptionPart2_Wepear: @ 83CCC3E - .string "delicate balance of bitter and sour.$" - -gBerryDescriptionPart1_Pinap: @ 83CCC63 - .string "Weak against wind and cold.$" - -gBerryDescriptionPart2_Pinap: @ 83CCC7F - .string "The fruit is spicy and the skin, sour.$" - -gBerryDescriptionPart1_Pomeg: @ 83CCCA6 - .string "However much it is watered,$" - -gBerryDescriptionPart2_Pomeg: @ 83CCCC2 - .string "it only grows up to six BERRIES.$" - -gBerryDescriptionPart1_Kelpsy: @ 83CCCE3 - .string "A rare variety shaped like a root.$" - -gBerryDescriptionPart2_Kelpsy: @ 83CCD06 - .string "Grows a very large flower.$" - -gBerryDescriptionPart1_Qualot: @ 83CCD21 - .string "Loves water. Grows strong even in$" - -gBerryDescriptionPart2_Qualot: @ 83CCD43 - .string "locations with constant rainfall.$" - -gBerryDescriptionPart1_Hondew: @ 83CCD65 - .string "A BERRY that is very valuable and$" - -gBerryDescriptionPart2_Hondew: @ 83CCD87 - .string "rarely seen. It is very delicious.$" - -gBerryDescriptionPart1_Grepa: @ 83CCDAA - .string "Despite its tenderness and round$" - -gBerryDescriptionPart2_Grepa: @ 83CCDCB - .string "shape, the BERRY is unimaginably sour.$" - -gBerryDescriptionPart1_Tamato: @ 83CCDF2 - .string "The BERRY is lip-bendingly spicy.$" - -gBerryDescriptionPart2_Tamato: @ 83CCE14 - .string "It takes time to grow.$" - -gBerryDescriptionPart1_Cornn: @ 83CCE2B - .string "A BERRY from an ancient era. May not$" - -gBerryDescriptionPart2_Cornn: @ 83CCE50 - .string "grow unless planted in quantity.$" - -gBerryDescriptionPart1_Magost: @ 83CCE71 - .string "A BERRY that is widely said to have$" - -gBerryDescriptionPart2_Magost: @ 83CCE95 - .string "a finely balanced flavor.$" - -gBerryDescriptionPart1_Rabuta: @ 83CCEAF - .string "A rare variety that is overgrown with$" - -gBerryDescriptionPart2_Rabuta: @ 83CCED5 - .string "hair. It is quite bitter.$" - -gBerryDescriptionPart1_Nomel: @ 83CCEEF - .string "Quite sour. Just one bite makes it$" - -gBerryDescriptionPart2_Nomel: @ 83CCF12 - .string "impossible to taste for three days.$" - -gBerryDescriptionPart1_Spelon: @ 83CCF36 - .string "The vividly red BERRY is very spicy.$" - -gBerryDescriptionPart2_Spelon: @ 83CCF5B - .string "Its warts secrete a spicy substance.$" - -gBerryDescriptionPart1_Pamtre: @ 83CCF80 - .string "Drifts on the sea from somewhere.$" - -gBerryDescriptionPart2_Pamtre: @ 83CCFA2 - .string "It is thought to grow elsewhere.$" - -gBerryDescriptionPart1_Watmel: @ 83CCFC3 - .string "A huge BERRY, with some over 20$" - -gBerryDescriptionPart2_Watmel: @ 83CCFE3 - .string "inches discovered. Exceedingly sweet.$" - -gBerryDescriptionPart1_Durin: @ 83CD009 - .string "Bitter to even look at. It is so$" - -gBerryDescriptionPart2_Durin: @ 83CD02A - .string "bitter, no one has ever eaten it as is.$" - -gBerryDescriptionPart1_Belue: @ 83CD052 - .string "It is glossy and looks delicious, but$" - -gBerryDescriptionPart2_Belue: @ 83CD078 - .string "it is awfully sour. Takes time to grow.$" - -gBerryDescriptionPart1_Liechi: @ 83CD0A0 - .string "A mysterious BERRY. It is rumored to$" - -gBerryDescriptionPart2_Liechi: @ 83CD0C5 - .string "contain the power of the sea.$" - -gBerryDescriptionPart1_Ganlon: @ 83CD0E3 - .string "A mysterious BERRY. It is rumored to$" - -gBerryDescriptionPart2_Ganlon: @ 83CD108 - .string "contain the power of the land.$" - -gBerryDescriptionPart1_Salac: @ 83CD127 - .string "A mysterious BERRY. It is rumored to$" - -gBerryDescriptionPart2_Salac: @ 83CD14C - .string "contain the power of the sky.$" - -gBerryDescriptionPart1_Petaya: @ 83CD16A - .string "A mysterious BERRY. It is rumored to$" - -gBerryDescriptionPart2_Petaya: @ 83CD18F - .string "contain the power of all living things.$" - -gBerryDescriptionPart1_Apicot: @ 83CD1B7 - .string "A very mystifying BERRY. No telling$" - -gBerryDescriptionPart2_Apicot: @ 83CD1DB - .string "what may happen or how it can be used.$" - -gBerryDescriptionPart1_Lansat: @ 83CD202 - .string "Said to be a legendary BERRY.$" - -gBerryDescriptionPart2_Lansat: @ 83CD220 - .string "Holding it supposedly brings joy.$" - -gBerryDescriptionPart1_Starf: @ 83CD242 - .string "So strong, it was abandoned at the$" - -gBerryDescriptionPart2_Starf: @ 83CD265 - .string "world’s edge. Considered a mirage.$" - -gBerryDescriptionPart1_Enigma: @ 83CD288 - .string "A completely enigmatic BERRY.$" - -gBerryDescriptionPart2_Enigma: @ 83CD2A6 - .string "Appears to have the power of stars.$" diff --git a/data/title_screen.s b/data/title_screen.s deleted file mode 100644 index 7c818eeb2..000000000 --- a/data/title_screen.s +++ /dev/null @@ -1,215 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - - .align 2 -gUnknown_08393210:: @ 8393210 - .ifdef SAPPHIRE - .incbin "graphics/title_screen/kyogre_dark.gbapal" - .incbin "graphics/title_screen/kyogre_glow.gbapal" - .else - .incbin "graphics/title_screen/groudon_dark.gbapal" - .incbin "graphics/title_screen/groudon_glow.gbapal" - .endif - - .align 2 -gUnknown_08393250:: @ 8393250 - .ifdef SAPPHIRE - .incbin "graphics/title_screen/kyogre.4bpp.lz" - .else - .incbin "graphics/title_screen/groudon.4bpp.lz" - .endif - - .align 2 -gUnknown_083939EC:: @ 83939EC - .ifdef SAPPHIRE - .incbin "graphics/title_screen/kyogre_map.bin.lz" - .else - .incbin "graphics/title_screen/groudon_map.bin.lz" - .endif - - .align 2 -gUnknown_08393BF8:: @ 8393BF8 - .ifdef SAPPHIRE - .incbin "graphics/title_screen/water_map.bin.lz" - .else - .incbin "graphics/title_screen/lava_map.bin.lz" - .endif - - .align 2 -LogoShineTiles: @ 8393D14 - .incbin "graphics/title_screen/logo_shine.4bpp.lz" - - .align 1 -gUnknown_08393E64:: @ 8393E64 - .2byte 0x10 - .2byte 0x110 - .2byte 0x210 - .2byte 0x310 - .2byte 0x410 - .2byte 0x510 - .2byte 0x610 - .2byte 0x710 - .2byte 0x810 - .2byte 0x910 - .2byte 0xA10 - .2byte 0xB10 - .2byte 0xC10 - .2byte 0xD10 - .2byte 0xE10 - .2byte 0xF10 - .2byte 0x100F - .2byte 0x100E - .2byte 0x100D - .2byte 0x100C - .2byte 0x100B - .2byte 0x100A - .2byte 0x1009 - .2byte 0x1008 - .2byte 0x1007 - .2byte 0x1006 - .2byte 0x1005 - .2byte 0x1004 - .2byte 0x1003 - .2byte 0x1002 - .2byte 0x1001 - .2byte 0x1000 - - .align 2 -gOamData_8393EA4:: @ 8393EA4 - .2byte 0x60A0 - .2byte 0xC000 - .2byte 0x0000 - - .align 2 -gOamData_8393EAC:: @ 8393EAC - .2byte 0x60A0 - .2byte 0xC000 - .2byte 0x0000 - - .align 2 -gSpriteAnim_8393EB4:: @ 8393EB4 - obj_image_anim_frame 0, 30 - obj_image_anim_end - - .align 2 -gSpriteAnim_8393EBC:: @ 8393EBC - obj_image_anim_frame 64, 30 - obj_image_anim_end - - .align 2 -gSpriteAnimTable_8393EC4:: @ 8393EC4 - .4byte gSpriteAnim_8393EB4 - - .align 2 -gSpriteAnimTable_8393EC8:: @ 8393EC8 - .4byte gSpriteAnim_8393EBC - - .align 2 -gSpriteTemplate_8393ECC:: @ 8393ECC - spr_template 1000, 1000, gOamData_8393EA4, gSpriteAnimTable_8393EC4, NULL, gDummySpriteAffineAnimTable, SpriteCallback_VersionBannerLeft - - .align 2 -gSpriteTemplate_8393EE4:: @ 8393EE4 - spr_template 1000, 1000, gOamData_8393EAC, gSpriteAnimTable_8393EC8, NULL, gDummySpriteAffineAnimTable, SpriteCallback_VersionBannerRight - - .align 2 -gUnknown_08393EFC:: @ 8393EFC - obj_tiles gVersionTiles, 0x1000, 1000 - null_obj_tiles - - .align 2 -gOamData_8393F0C:: @ 8393F0C - .2byte 0x40A0 - .2byte 0x4000 - .2byte 0x0000 - - .align 2 -gSpriteAnim_8393F14:: @ 8393F14 - obj_image_anim_frame 0, 4 - obj_image_anim_end - - .align 2 -gSpriteAnim_8393F1C:: @ 8393F1C - obj_image_anim_frame 4, 4 - obj_image_anim_end - - .align 2 -gSpriteAnim_8393F24:: @ 8393F24 - obj_image_anim_frame 8, 4 - obj_image_anim_end - - .align 2 -gSpriteAnim_8393F2C:: @ 8393F2C - obj_image_anim_frame 12, 4 - obj_image_anim_end - - .align 2 -gSpriteAnim_8393F34:: @ 8393F34 - obj_image_anim_frame 16, 4 - obj_image_anim_end - - .align 2 -gSpriteAnim_8393F3C:: @ 8393F3C - obj_image_anim_frame 20, 4 - obj_image_anim_end - - .align 2 -gSpriteAnim_8393F44:: @ 8393F44 - obj_image_anim_frame 24, 4 - obj_image_anim_end - - .align 2 -gSpriteAnim_8393F4C:: @ 8393F4C - obj_image_anim_frame 28, 4 - obj_image_anim_end - - .align 2 -gSpriteAnimTable_8393F54:: @ 8393F54 - .4byte gSpriteAnim_8393F14 - .4byte gSpriteAnim_8393F1C - .4byte gSpriteAnim_8393F24 - .4byte gSpriteAnim_8393F2C - .4byte gSpriteAnim_8393F34 - .4byte gSpriteAnim_8393F3C - .4byte gSpriteAnim_8393F44 - .4byte gSpriteAnim_8393F4C - - .align 2 -gSpriteTemplate_8393F74:: @ 8393F74 - spr_template 1001, 1001, gOamData_8393F0C, gSpriteAnimTable_8393F54, NULL, gDummySpriteAffineAnimTable, SpriteCallback_PressStartCopyrightBanner - - .align 2 -gUnknown_08393F8C:: @ 8393F8C - obj_tiles gTitleScreenPressStart_Gfx, 0x520, 1001 - null_obj_tiles - - .align 2 -gUnknown_08393F9C:: @ 8393F9C - obj_pal gTitleScreenLogoShinePalette, 1001 - obj_pal 0x0, 0x0 - - .align 2 -gOamData_8393FAC:: @ 8393FAC - .2byte 0x00A0 - .2byte 0xC000 - .2byte 0x0000 - - .align 2 -gSpriteAnim_8393FB4:: @ 8393FB4 - obj_image_anim_frame 0, 4 - obj_image_anim_end - - .align 2 -gSpriteAnimTable_8393FBC:: @ 8393FBC - .4byte gSpriteAnim_8393FB4 - - .align 2 -gSpriteTemplate_8393FC0:: @ 8393FC0 - spr_template 1002, 1001, gOamData_8393FAC, gSpriteAnimTable_8393FBC, NULL, gDummySpriteAffineAnimTable, SpriteCallback_PokemonLogoShine - - .align 2 -gUnknown_08393FD8:: @ 8393FD8 - obj_tiles LogoShineTiles, 0x800, 1002 - null_obj_tiles diff --git a/data/trainer_card.s b/data/trainer_card.s index e73af87a2..75e0041dd 100644 --- a/data/trainer_card.s +++ b/data/trainer_card.s @@ -46,17 +46,17 @@ gUnknown_083B5EF8:: @ 83B5EF8 .4byte gMenuTrainerCard4Star_Pal gUnknown_083B5F0C:: @ 83B5F0C - .incbin "baserom.gba", 0x003b5f0c, 0x20 + .incbin "graphics/trainer_card/83B5F0C.gbapal" .align 2 gBadgesPalette:: @ 83B5F2C .incbin "graphics/trainer_card/badges.gbapal" gUnknown_083B5F4C:: @ 83B5F4C - .incbin "baserom.gba", 0x003b5f4c, 0x20 + .incbin "graphics/trainer_card/83B5F4C.gbapal" gUnknown_083B5F6C:: @ 83B5F6C - .incbin "baserom.gba", 0x003b5f6c, 0x20 + .incbin "graphics/trainer_card/83B5F6C.gbapal" gUnknown_083B5F8C:: @ 83B5F8C - .incbin "baserom.gba", 0x003b5f8c, 0x40 + .incbin "graphics/trainer_card/83B5F8C_map.bin" diff --git a/data/trainer_eye_trainers.inc b/data/trainer_eye_trainers.inc deleted file mode 100644 index 3628ea598..000000000 --- a/data/trainer_eye_trainers.inc +++ /dev/null @@ -1,58 +0,0 @@ - .align 2 -gTrainerEyeTrainers:: @ 839AE70 - trainer_eye_trainer ROSE_1, ROSE_2, ROSE_3, ROSE_4, ROSE_5, Route118 - trainer_eye_trainer DUSTY_1, DUSTY_2, DUSTY_3, DUSTY_4, DUSTY_5, Route111 - trainer_eye_trainer LOLA_1, LOLA_2, LOLA_3, LOLA_4, LOLA_5, Route109 - trainer_eye_trainer RICKY_1, RICKY_2, RICKY_3, RICKY_4, RICKY_5, Route109 - trainer_eye_trainer RITA_AND_SAM_1, RITA_AND_SAM_2, RITA_AND_SAM_3, RITA_AND_SAM_4, RITA_AND_SAM_5, Route124 - trainer_eye_trainer BROOKE_1, BROOKE_2, BROOKE_3, BROOKE_4, BROOKE_5, Route111 - trainer_eye_trainer WILTON_1, WILTON_2, WILTON_3, WILTON_4, WILTON_5, Route111 - trainer_eye_trainer VALERIE_1, VALERIE_2, VALERIE_3, VALERIE_4, VALERIE_5, MtPyre_6F - trainer_eye_trainer CINDY_1, CINDY_3, CINDY_4, CINDY_5, CINDY_6, Route104 - trainer_eye_trainer JESSICA_1, JESSICA_2, JESSICA_3, JESSICA_4, JESSICA_5, Route121 - trainer_eye_trainer WINSTON_1, WINSTON_2, WINSTON_3, WINSTON_4, WINSTON_5, Route104 - trainer_eye_trainer STEVE_1, STEVE_2, STEVE_3, STEVE_4, STEVE_5, Route114 - trainer_eye_trainer TONY_1, TONY_2, TONY_3, TONY_4, TONY_5, Route107 - trainer_eye_trainer NOB_1, NOB_2, NOB_3, NOB_4, NOB_5, Route115 - trainer_eye_trainer DALTON_1, DALTON_2, DALTON_3, DALTON_4, DALTON_5, Route118 - trainer_eye_trainer BERNIE_1, BERNIE_2, BERNIE_3, BERNIE_4, BERNIE_5, Route114 - trainer_eye_trainer ETHAN_1, ETHAN_2, ETHAN_3, ETHAN_4, ETHAN_5, JaggedPass - trainer_eye_trainer JOHN_AND_JAY_1, JOHN_AND_JAY_2, JOHN_AND_JAY_3, JOHN_AND_JAY_4, JOHN_AND_JAY_5, MeteorFalls_1F_2R - trainer_eye_trainer BRANDON_1, BRANDON_2, BRANDON_3, BRANDON_4, BRANDON_5, Route120 - trainer_eye_trainer CAMERON_1, CAMERON_2, CAMERON_3, CAMERON_4, CAMERON_5, Route123 - trainer_eye_trainer JACKI_1, JACKI_2, JACKI_3, JACKI_4, JACKI_5, Route123 - trainer_eye_trainer WALTER_1, WALTER_2, WALTER_3, WALTER_4, WALTER_5, Route121 - trainer_eye_trainer KAREN_1, KAREN_2, KAREN_3, KAREN_4, KAREN_5, Route116 - trainer_eye_trainer JERRY_1, JERRY_2, JERRY_3, JERRY_4, JERRY_5, Route116 - trainer_eye_trainer ANNA_AND_MEG_1, ANNA_AND_MEG_2, ANNA_AND_MEG_3, ANNA_AND_MEG_4, ANNA_AND_MEG_5, Route117 - trainer_eye_trainer ISABEL_1, ISABEL_2, ISABEL_3, ISABEL_4, ISABEL_5, Route110 - trainer_eye_trainer MIGUEL_1, MIGUEL_2, MIGUEL_3, MIGUEL_4, MIGUEL_5, Route103 - trainer_eye_trainer TIMOTHY_1, TIMOTHY_2, TIMOTHY_3, TIMOTHY_4, TIMOTHY_5, Route115 - trainer_eye_trainer SHELBY_1, SHELBY_2, SHELBY_3, SHELBY_4, SHELBY_5, MtChimney - trainer_eye_trainer CALVIN_1, CALVIN_2, CALVIN_3, CALVIN_4, CALVIN_5, Route102 - trainer_eye_trainer ELLIOT_1, ELLIOT_2, ELLIOT_3, ELLIOT_4, ELLIOT_5, Route106 - trainer_eye_trainer ABIGAIL_1, ABIGAIL_2, ABIGAIL_3, ABIGAIL_4, ABIGAIL_5, Route110 - trainer_eye_trainer BENJAMIN_1, BENJAMIN_2, BENJAMIN_3, BENJAMIN_4, BENJAMIN_5, Route110 - trainer_eye_trainer ISAIAH_1, ISAIAH_2, ISAIAH_3, ISAIAH_4, ISAIAH_5, Route128 - trainer_eye_trainer KATELYN_1, KATELYN_2, KATELYN_3, KATELYN_4, KATELYN_5, Route128 - trainer_eye_trainer MARIA_1, MARIA_2, MARIA_3, MARIA_4, MARIA_5, Route117 - trainer_eye_trainer DYLAN_1, DYLAN_2, DYLAN_3, DYLAN_4, DYLAN_5, Route117 - trainer_eye_trainer NICOLAS_1, NICOLAS_2, NICOLAS_3, NICOLAS_4, NICOLAS_5, MeteorFalls_1F_2R - trainer_eye_trainer ROBERT_1, ROBERT_2, ROBERT_3, ROBERT_4, ROBERT_5, Route120 - trainer_eye_trainer LAO_1, LAO_2, LAO_3, LAO_4, LAO_5, Route113 - trainer_eye_trainer CYNDY_1, CYNDY_2, CYNDY_3, CYNDY_4, CYNDY_5, Route115 - trainer_eye_trainer MADELINE_1, MADELINE_2, MADELINE_3, MADELINE_4, MADELINE_5, Route113 - trainer_eye_trainer JENNY_1, JENNY_2, JENNY_3, JENNY_4, JENNY_5, Route124 - trainer_eye_trainer DIANA_1, DIANA_2, DIANA_3, DIANA_4, DIANA_5, JaggedPass - trainer_eye_trainer AMY_AND_LIV_1, AMY_AND_LIV_2, AMY_AND_LIV_4, AMY_AND_LIV_5, AMY_AND_LIV_6, Route103 - trainer_eye_trainer ERNEST_1, ERNEST_2, ERNEST_3, ERNEST_4, ERNEST_5, Route125 - trainer_eye_trainer EDWIN_1, EDWIN_2, EDWIN_3, EDWIN_4, EDWIN_5, Route110 - trainer_eye_trainer LYDIA_1, LYDIA_2, LYDIA_3, LYDIA_4, LYDIA_5, Route117 - trainer_eye_trainer ISAAC_1, ISAAC_2, ISAAC_3, ISAAC_4, ISAAC_5, Route117 - trainer_eye_trainer CATHERINE_1, CATHERINE_2, CATHERINE_3, CATHERINE_4, CATHERINE_5, Route119 - trainer_eye_trainer JACKSON_1, JACKSON_2, JACKSON_3, JACKSON_4, JACKSON_5, Route119 - trainer_eye_trainer HALEY_1, HALEY_2, HALEY_3, HALEY_4, HALEY_5, Route104 - trainer_eye_trainer JAMES_1, JAMES_2, JAMES_3, JAMES_4, JAMES_5, PetalburgWoods - trainer_eye_trainer TRENT_1, TRENT_2, TRENT_3, TRENT_4, TRENT_5, Route112 - trainer_eye_trainer LOIS_AND_HAL_1, LOIS_AND_HAL_2, LOIS_AND_HAL_3, LOIS_AND_HAL_4, LOIS_AND_HAL_5, AbandonedShip_Rooms2_1F - trainer_eye_trainer WALLY_3, WALLY_4, WALLY_5, WALLY_6, NONE, VictoryRoad_1F diff --git a/data/wallclock.s b/data/wallclock.s deleted file mode 100644 index 15ab36097..000000000 --- a/data/wallclock.s +++ /dev/null @@ -1,86 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - - .align 2 -ClockGfx_Misc: @ 83F7814 - .incbin "graphics/misc/clock_misc.4bpp.lz" - - .align 2 -gUnknown_083F7A90:: @ 83F7A90 - obj_tiles ClockGfx_Misc, 0x2000, 0x1000 - .space 8 - - .align 2 -gUnknown_083F7AA0:: @ 83F7AA0 - obj_pal gMiscClockMale_Pal, 0x1000 - obj_pal gMiscClockFemale_Pal, 0x1001 - .space 8 - - .align 2 -gOamData_83F7AB8:: @ 83F7AB8 - .2byte 0x00A0 - .2byte 0xC000 - .2byte 0x0400 - - .align 2 -gSpriteAnim_83F7AC0:: @ 83F7AC0 - obj_image_anim_frame 0, 30 - obj_image_anim_end - - .align 2 -gSpriteAnim_83F7AC8:: @ 83F7AC8 - obj_image_anim_frame 64, 30 - obj_image_anim_end - - .align 2 -gSpriteAnimTable_83F7AD0:: @ 83F7AD0 - .4byte gSpriteAnim_83F7AC0 - - .align 2 -gSpriteAnimTable_83F7AD4:: @ 83F7AD4 - .4byte gSpriteAnim_83F7AC8 - - .align 2 -gSpriteTemplate_83F7AD8:: @ 83F7AD8 - spr_template 4096, 4096, gOamData_83F7AB8, gSpriteAnimTable_83F7AD0, NULL, gDummySpriteAffineAnimTable, sub_810B05C - - .align 2 -gSpriteTemplate_83F7AF0:: @ 83F7AF0 - spr_template 4096, 4096, gOamData_83F7AB8, gSpriteAnimTable_83F7AD4, NULL, gDummySpriteAffineAnimTable, sub_810B0F4 - - .align 2 -gOamData_83F7B08:: @ 83F7B08 - .2byte 0x00A0 - .2byte 0x4000 - .2byte 0x0800 - - .align 2 -gSpriteAnim_83F7B10:: @ 83F7B10 - obj_image_anim_frame 132, 30 - obj_image_anim_end - - .align 2 -gSpriteAnim_83F7B18:: @ 83F7B18 - obj_image_anim_frame 128, 30 - obj_image_anim_end - - .align 2 -gSpriteAnimTable_83F7B20:: @ 83F7B20 - .4byte gSpriteAnim_83F7B10 - - .align 2 -gSpriteAnimTable_83F7B24:: @ 83F7B24 - .4byte gSpriteAnim_83F7B18 - - .align 2 -gSpriteTemplate_83F7B28:: @ 83F7B28 - spr_template 4096, 4096, gOamData_83F7B08, gSpriteAnimTable_83F7B20, NULL, gDummySpriteAffineAnimTable, sub_810B18C - - .align 2 -gSpriteTemplate_83F7B40:: @ 83F7B40 - spr_template 4096, 4096, gOamData_83F7B08, gSpriteAnimTable_83F7B24, NULL, gDummySpriteAffineAnimTable, sub_810B230 - -@ 83F7B58 - .include "data/clock_hand_coords.inc" diff --git a/data/weather.s b/data/weather.s index 814030248..44ef8a8da 100644 --- a/data/weather.s +++ b/data/weather.s @@ -40,7 +40,7 @@ gUnknown_08396FA8:: @ 8396FA8 .align 2 gUnknown_08396FC4:: @ 8396FC4 - .4byte 0x0202f7e8 + .4byte gUnknown_0202F7E8 .align 2 gUnknown_08396FC8:: @ 8396FC8 diff --git a/data/wild_mons.inc b/data/wild_mons.inc index b30bc847d..01ebd8a16 100644 --- a/data/wild_mons.inc +++ b/data/wild_mons.inc @@ -1,3104 +1,3 @@ - .macro wild_mon_difference species1, species2 - .ifdef SAPPHIRE - .equiv SPECIES_\species1\()_\species2, SPECIES_\species2 - .equiv SPECIES_\species2\()_\species1, SPECIES_\species1 - .else - .equiv SPECIES_\species1\()_\species2, SPECIES_\species1 - .equiv SPECIES_\species2\()_\species1, SPECIES_\species2 - .endif - .endm - - wild_mon_difference SEEDOT, LOTAD - wild_mon_difference NUZLEAF, LOMBRE - wild_mon_difference MAWILE, SABLEYE - wild_mon_difference ZANGOOSE, SEVIPER - wild_mon_difference SOLROCK, LUNATONE - wild_mon_difference DUSKULL, SHUPPET - wild_mon_difference DUSCLOPS, BANETTE - wild_mon_difference KOFFING, GRIMER - wild_mon_difference MINUN, PLUSLE - wild_mon_difference ILLUMISE, VOLBEAT - - .align 2 -PetalburgCity_WaterMons: - wild_mon MARILL, 20, 30 - wild_mon MARILL, 10, 20 - wild_mon MARILL, 30, 35 - wild_mon MARILL, 5, 10 - wild_mon MARILL, 5, 10 - - .align 2 -PetalburgCity_WaterMonsInfo: - .4byte 1 @ encounter rate - .4byte PetalburgCity_WaterMons - - .align 2 -PetalburgCity_FishingMons: - wild_mon MAGIKARP, 5, 10 - wild_mon GOLDEEN, 5, 10 - wild_mon MAGIKARP, 10, 30 - wild_mon GOLDEEN, 10, 30 - wild_mon CORPHISH, 10, 30 - wild_mon CORPHISH, 25, 30 - wild_mon CORPHISH, 30, 35 - wild_mon CORPHISH, 20, 25 - wild_mon CORPHISH, 35, 40 - wild_mon CORPHISH, 40, 45 - - .align 2 -PetalburgCity_FishingMonsInfo: - .4byte 10 @ encounter rate - .4byte PetalburgCity_FishingMons - - .align 2 -SlateportCity_WaterMons: - wild_mon TENTACOOL, 5, 35 - wild_mon WINGULL, 10, 30 - wild_mon WINGULL, 15, 25 - wild_mon PELIPPER, 25, 30 - wild_mon PELIPPER, 25, 30 - - .align 2 -SlateportCity_WaterMonsInfo: - .4byte 4 @ encounter rate - .4byte SlateportCity_WaterMons - - .align 2 -SlateportCity_FishingMons: - wild_mon MAGIKARP, 5, 10 - wild_mon TENTACOOL, 5, 10 - wild_mon MAGIKARP, 10, 30 - wild_mon TENTACOOL, 10, 30 - wild_mon WAILMER, 10, 30 - wild_mon WAILMER, 25, 30 - wild_mon WAILMER, 30, 35 - wild_mon WAILMER, 20, 25 - wild_mon WAILMER, 35, 40 - wild_mon WAILMER, 40, 45 - - .align 2 -SlateportCity_FishingMonsInfo: - .4byte 10 @ encounter rate - .4byte SlateportCity_FishingMons - - .align 2 -LilycoveCity_WaterMons: - wild_mon TENTACOOL, 5, 35 - wild_mon WINGULL, 10, 30 - wild_mon WINGULL, 15, 25 - wild_mon PELIPPER, 25, 30 - wild_mon PELIPPER, 25, 30 - - .align 2 -LilycoveCity_WaterMonsInfo: - .4byte 4 @ encounter rate - .4byte LilycoveCity_WaterMons - - .align 2 -LilycoveCity_FishingMons: - wild_mon MAGIKARP, 5, 10 - wild_mon TENTACOOL, 5, 10 - wild_mon MAGIKARP, 10, 30 - wild_mon TENTACOOL, 10, 30 - wild_mon WAILMER, 10, 30 - wild_mon WAILMER, 25, 30 - wild_mon WAILMER, 30, 35 - wild_mon STARYU, 25, 30 - wild_mon WAILMER, 35, 40 - wild_mon WAILMER, 40, 45 - - .align 2 -LilycoveCity_FishingMonsInfo: - .4byte 10 @ encounter rate - .4byte LilycoveCity_FishingMons - - .align 2 -MossdeepCity_WaterMons: - wild_mon TENTACOOL, 5, 35 - wild_mon WINGULL, 10, 30 - wild_mon WINGULL, 15, 25 - wild_mon PELIPPER, 25, 30 - wild_mon PELIPPER, 25, 30 - - .align 2 -MossdeepCity_WaterMonsInfo: - .4byte 4 @ encounter rate - .4byte MossdeepCity_WaterMons - - .align 2 -MossdeepCity_FishingMons: - wild_mon MAGIKARP, 5, 10 - wild_mon TENTACOOL, 5, 10 - wild_mon MAGIKARP, 10, 30 - wild_mon TENTACOOL, 10, 30 - wild_mon WAILMER, 10, 30 - wild_mon SHARPEDO, 30, 35 - wild_mon WAILMER, 30, 35 - wild_mon WAILMER, 25, 30 - wild_mon WAILMER, 35, 40 - wild_mon WAILMER, 40, 45 - - .align 2 -MossdeepCity_FishingMonsInfo: - .4byte 10 @ encounter rate - .4byte MossdeepCity_FishingMons - - .align 2 -SootopolisCity_WaterMons: - wild_mon MAGIKARP, 5, 35 - wild_mon MAGIKARP, 10, 30 - wild_mon MAGIKARP, 15, 25 - wild_mon MAGIKARP, 25, 30 - wild_mon MAGIKARP, 25, 30 - - .align 2 -SootopolisCity_WaterMonsInfo: - .4byte 1 @ encounter rate - .4byte SootopolisCity_WaterMons - - .align 2 -SootopolisCity_FishingMons: - wild_mon MAGIKARP, 5, 10 - .ifdef SAPPHIRE - wild_mon TENTACOOL, 5, 10 - .else - wild_mon MAGIKARP, 10, 15 - .endif - wild_mon MAGIKARP, 10, 30 - wild_mon MAGIKARP, 10, 30 - wild_mon MAGIKARP, 10, 30 - wild_mon MAGIKARP, 30, 35 - wild_mon MAGIKARP, 30, 35 - wild_mon GYARADOS, 35, 40 - wild_mon GYARADOS, 35, 45 - wild_mon GYARADOS, 5, 45 - - .align 2 -SootopolisCity_FishingMonsInfo: - .4byte 10 @ encounter rate - .4byte SootopolisCity_FishingMons - - .align 2 -EverGrandeCity_WaterMons: - wild_mon TENTACOOL, 5, 35 - wild_mon WINGULL, 10, 30 - wild_mon WINGULL, 15, 25 - wild_mon PELIPPER, 25, 30 - wild_mon PELIPPER, 25, 30 - - .align 2 -EverGrandeCity_WaterMonsInfo: - .4byte 4 @ encounter rate - .4byte EverGrandeCity_WaterMons - - .align 2 -EverGrandeCity_FishingMons: - wild_mon MAGIKARP, 5, 10 - wild_mon TENTACOOL, 5, 10 - wild_mon MAGIKARP, 10, 30 - wild_mon LUVDISC, 10, 30 - wild_mon WAILMER, 10, 30 - wild_mon LUVDISC, 30, 35 - wild_mon WAILMER, 30, 35 - wild_mon CORSOLA, 30, 35 - wild_mon WAILMER, 35, 40 - wild_mon WAILMER, 40, 45 - - .align 2 -EverGrandeCity_FishingMonsInfo: - .4byte 10 @ encounter rate - .4byte EverGrandeCity_FishingMons - - .align 2 -MeteorFalls_1F_1R_LandMons: - wild_mon ZUBAT, 16 - wild_mon ZUBAT, 17 - wild_mon ZUBAT, 18 - wild_mon ZUBAT, 15 - wild_mon ZUBAT, 14 - wild_mon SOLROCK_LUNATONE, 16 - wild_mon SOLROCK_LUNATONE, 18 - wild_mon SOLROCK_LUNATONE, 14 - wild_mon ZUBAT, 19 - wild_mon ZUBAT, 20 - wild_mon ZUBAT, 19 - wild_mon ZUBAT, 20 - - .align 2 -MeteorFalls_1F_1R_LandMonsInfo: - .4byte 10 @ encounter rate - .4byte MeteorFalls_1F_1R_LandMons - - .align 2 -MeteorFalls_1F_1R_WaterMons: - wild_mon ZUBAT, 5, 35 - wild_mon ZUBAT, 30, 35 - wild_mon SOLROCK_LUNATONE, 25, 35 - wild_mon SOLROCK_LUNATONE, 15, 25 - wild_mon SOLROCK_LUNATONE, 5, 15 - - .align 2 -MeteorFalls_1F_1R_WaterMonsInfo: - .4byte 4 @ encounter rate - .4byte MeteorFalls_1F_1R_WaterMons - - .align 2 -MeteorFalls_1F_1R_FishingMons: - wild_mon MAGIKARP, 5, 10 - wild_mon GOLDEEN, 5, 10 - wild_mon MAGIKARP, 10, 30 - wild_mon GOLDEEN, 10, 30 - wild_mon BARBOACH, 10, 30 - wild_mon BARBOACH, 25, 30 - wild_mon BARBOACH, 30, 35 - wild_mon BARBOACH, 20, 25 - wild_mon BARBOACH, 35, 40 - wild_mon BARBOACH, 40, 45 - - .align 2 -MeteorFalls_1F_1R_FishingMonsInfo: - .4byte 30 @ encounter rate - .4byte MeteorFalls_1F_1R_FishingMons - - .align 2 -MeteorFalls_1F_2R_LandMons: - wild_mon GOLBAT, 33 - wild_mon GOLBAT, 35 - wild_mon GOLBAT, 33 - wild_mon SOLROCK_LUNATONE, 35 - wild_mon SOLROCK_LUNATONE, 33 - wild_mon SOLROCK_LUNATONE, 37 - wild_mon GOLBAT, 35 - wild_mon SOLROCK_LUNATONE, 39 - wild_mon GOLBAT, 38 - wild_mon GOLBAT, 40 - wild_mon GOLBAT, 38 - wild_mon GOLBAT, 40 - - .align 2 -MeteorFalls_1F_2R_LandMonsInfo: - .4byte 10 @ encounter rate - .4byte MeteorFalls_1F_2R_LandMons - - .align 2 -MeteorFalls_1F_2R_WaterMons: - wild_mon GOLBAT, 30, 35 - wild_mon GOLBAT, 30, 35 - wild_mon SOLROCK_LUNATONE, 25, 35 - wild_mon SOLROCK_LUNATONE, 15, 25 - wild_mon SOLROCK_LUNATONE, 5, 15 - - .align 2 -MeteorFalls_1F_2R_WaterMonsInfo: - .4byte 4 @ encounter rate - .4byte MeteorFalls_1F_2R_WaterMons - - .align 2 -MeteorFalls_1F_2R_FishingMons: - wild_mon MAGIKARP, 5, 10 - wild_mon GOLDEEN, 5, 10 - wild_mon MAGIKARP, 10, 30 - wild_mon GOLDEEN, 10, 30 - wild_mon BARBOACH, 10, 30 - wild_mon BARBOACH, 25, 30 - wild_mon BARBOACH, 30, 35 - wild_mon WHISCASH, 30, 35 - wild_mon WHISCASH, 35, 40 - wild_mon WHISCASH, 40, 45 - - .align 2 -MeteorFalls_1F_2R_FishingMonsInfo: - .4byte 30 @ encounter rate - .4byte MeteorFalls_1F_2R_FishingMons - - .align 2 -MeteorFalls_B1F_1R_LandMons: - wild_mon GOLBAT, 33 - wild_mon GOLBAT, 35 - wild_mon GOLBAT, 33 - wild_mon SOLROCK_LUNATONE, 35 - wild_mon SOLROCK_LUNATONE, 33 - wild_mon SOLROCK_LUNATONE, 37 - wild_mon GOLBAT, 35 - wild_mon SOLROCK_LUNATONE, 39 - wild_mon GOLBAT, 38 - wild_mon GOLBAT, 40 - wild_mon GOLBAT, 38 - wild_mon GOLBAT, 40 - - .align 2 -MeteorFalls_B1F_1R_LandMonsInfo: - .4byte 10 @ encounter rate - .4byte MeteorFalls_B1F_1R_LandMons - - .align 2 -MeteorFalls_B1F_1R_WaterMons: - wild_mon GOLBAT, 30, 35 - wild_mon GOLBAT, 30, 35 - wild_mon SOLROCK_LUNATONE, 25, 35 - wild_mon SOLROCK_LUNATONE, 15, 25 - wild_mon SOLROCK_LUNATONE, 5, 15 - - .align 2 -MeteorFalls_B1F_1R_WaterMonsInfo: - .4byte 4 @ encounter rate - .4byte MeteorFalls_B1F_1R_WaterMons - - .align 2 -MeteorFalls_B1F_1R_FishingMons: - wild_mon MAGIKARP, 5, 10 - wild_mon GOLDEEN, 5, 10 - wild_mon MAGIKARP, 10, 30 - wild_mon GOLDEEN, 10, 30 - wild_mon BARBOACH, 10, 30 - wild_mon BARBOACH, 25, 30 - wild_mon BARBOACH, 30, 35 - wild_mon WHISCASH, 30, 35 - wild_mon WHISCASH, 35, 40 - wild_mon WHISCASH, 40, 45 - - .align 2 -MeteorFalls_B1F_1R_FishingMonsInfo: - .4byte 30 @ encounter rate - .4byte MeteorFalls_B1F_1R_FishingMons - - .align 2 -MeteorFalls_B1F_2R_LandMons: - wild_mon GOLBAT, 33 - wild_mon GOLBAT, 35 - wild_mon BAGON, 30 - wild_mon SOLROCK_LUNATONE, 35 - wild_mon BAGON, 35 - wild_mon SOLROCK_LUNATONE, 37 - wild_mon BAGON, 25 - wild_mon SOLROCK_LUNATONE, 39 - wild_mon GOLBAT, 38 - wild_mon GOLBAT, 40 - wild_mon GOLBAT, 38 - wild_mon GOLBAT, 40 - - .align 2 -MeteorFalls_B1F_2R_LandMonsInfo: - .4byte 10 @ encounter rate - .4byte MeteorFalls_B1F_2R_LandMons - - .align 2 -MeteorFalls_B1F_2R_WaterMons: - wild_mon GOLBAT, 30, 35 - wild_mon GOLBAT, 30, 35 - wild_mon SOLROCK_LUNATONE, 25, 35 - wild_mon SOLROCK_LUNATONE, 15, 25 - wild_mon SOLROCK_LUNATONE, 5, 15 - - .align 2 -MeteorFalls_B1F_2R_WaterMonsInfo: - .4byte 4 @ encounter rate - .4byte MeteorFalls_B1F_2R_WaterMons - - .align 2 -MeteorFalls_B1F_2R_FishingMons: - wild_mon MAGIKARP, 5, 10 - wild_mon GOLDEEN, 5, 10 - wild_mon MAGIKARP, 10, 30 - wild_mon GOLDEEN, 10, 30 - wild_mon BARBOACH, 10, 30 - wild_mon BARBOACH, 25, 30 - wild_mon BARBOACH, 30, 35 - wild_mon WHISCASH, 30, 35 - wild_mon WHISCASH, 35, 40 - wild_mon WHISCASH, 40, 45 - - .align 2 -MeteorFalls_B1F_2R_FishingMonsInfo: - .4byte 30 @ encounter rate - .4byte MeteorFalls_B1F_2R_FishingMons - - .align 2 -RusturfTunnel_LandMons: - wild_mon WHISMUR, 6 - wild_mon WHISMUR, 7 - wild_mon WHISMUR, 6 - wild_mon WHISMUR, 6 - wild_mon WHISMUR, 7 - wild_mon WHISMUR, 7 - wild_mon WHISMUR, 5 - wild_mon WHISMUR, 8 - wild_mon WHISMUR, 5 - wild_mon WHISMUR, 8 - wild_mon WHISMUR, 5 - wild_mon WHISMUR, 8 - - .align 2 -RusturfTunnel_LandMonsInfo: - .4byte 10 @ encounter rate - .4byte RusturfTunnel_LandMons - - .align 2 -GraniteCave_1F_LandMons: - wild_mon ZUBAT, 7 - wild_mon MAKUHITA, 8 - wild_mon MAKUHITA, 7 - wild_mon ZUBAT, 8 - wild_mon MAKUHITA, 9 - wild_mon ABRA, 8 - wild_mon MAKUHITA, 10 - wild_mon MAKUHITA, 6 - wild_mon GEODUDE, 7 - wild_mon GEODUDE, 8 - wild_mon GEODUDE, 6 - wild_mon GEODUDE, 9 - - .align 2 -GraniteCave_1F_LandMonsInfo: - .4byte 10 @ encounter rate - .4byte GraniteCave_1F_LandMons - - .align 2 -GraniteCave_B1F_LandMons: - wild_mon ZUBAT, 9 - wild_mon ARON, 10 - wild_mon ARON, 9 - wild_mon ARON, 11 - wild_mon ZUBAT, 10 - wild_mon ABRA, 9 - wild_mon MAKUHITA, 10 - wild_mon MAKUHITA, 11 - wild_mon MAWILE_SABLEYE, 10 - wild_mon MAWILE_SABLEYE, 10 - wild_mon MAWILE_SABLEYE, 9 - wild_mon MAWILE_SABLEYE, 11 - - .align 2 -GraniteCave_B1F_LandMonsInfo: - .4byte 10 @ encounter rate - .4byte GraniteCave_B1F_LandMons - - .align 2 -GraniteCave_B2F_LandMons: - wild_mon ZUBAT, 10 - wild_mon ARON, 11 - wild_mon ARON, 10 - wild_mon ZUBAT, 11 - wild_mon ARON, 12 - wild_mon ABRA, 10 - wild_mon MAWILE_SABLEYE, 10 - wild_mon MAWILE_SABLEYE, 11 - wild_mon MAWILE_SABLEYE, 12 - wild_mon MAWILE_SABLEYE, 10 - wild_mon MAWILE_SABLEYE, 12 - wild_mon MAWILE_SABLEYE, 10 - - .align 2 -GraniteCave_B2F_LandMonsInfo: - .4byte 10 @ encounter rate - .4byte GraniteCave_B2F_LandMons - - .align 2 -GraniteCave_B2F_RockSmashMons: - wild_mon GEODUDE, 10, 15 - wild_mon NOSEPASS, 10, 20 - wild_mon GEODUDE, 5, 10 - wild_mon GEODUDE, 15, 20 - wild_mon GEODUDE, 15, 20 - - .align 2 -GraniteCave_B2F_RockSmashMonsInfo: - .4byte 20 @ encounter rate - .4byte GraniteCave_B2F_RockSmashMons - - .align 2 -GraniteCave_StevensRoom_LandMons: - wild_mon ZUBAT, 7 - wild_mon MAKUHITA, 8 - wild_mon MAKUHITA, 7 - wild_mon ZUBAT, 8 - wild_mon MAKUHITA, 9 - wild_mon ABRA, 8 - wild_mon MAKUHITA, 10 - wild_mon MAKUHITA, 6 - wild_mon ARON, 7 - wild_mon ARON, 8 - wild_mon ARON, 7 - wild_mon ARON, 8 - - .align 2 -GraniteCave_StevensRoom_LandMonsInfo: - .4byte 10 @ encounter rate - .4byte GraniteCave_StevensRoom_LandMons - - .align 2 -PetalburgWoods_LandMons: - wild_mon ZIGZAGOON, 5 - wild_mon WURMPLE, 5 - wild_mon SHROOMISH, 5 - wild_mon ZIGZAGOON, 6 - wild_mon SILCOON, 5 - wild_mon CASCOON, 5 - wild_mon WURMPLE, 6 - wild_mon SHROOMISH, 6 - wild_mon TAILLOW, 5 - wild_mon SLAKOTH, 5 - wild_mon TAILLOW, 6 - wild_mon SLAKOTH, 6 - - .align 2 -PetalburgWoods_LandMonsInfo: - .4byte 20 @ encounter rate - .4byte PetalburgWoods_LandMons - - .ifdef SAPPHIRE - .equiv JAGGED_PASS_LEVEL_DIFF, 2 - .else - .equiv JAGGED_PASS_LEVEL_DIFF, 0 - .endif - - .align 2 -JaggedPass_LandMons: - wild_mon NUMEL, 19 + JAGGED_PASS_LEVEL_DIFF - wild_mon NUMEL, 19 + JAGGED_PASS_LEVEL_DIFF - wild_mon MACHOP, 19 + JAGGED_PASS_LEVEL_DIFF - wild_mon NUMEL, 18 + JAGGED_PASS_LEVEL_DIFF - wild_mon SPOINK, 18 + JAGGED_PASS_LEVEL_DIFF - wild_mon MACHOP, 18 + JAGGED_PASS_LEVEL_DIFF - wild_mon SPOINK, 19 + JAGGED_PASS_LEVEL_DIFF - wild_mon MACHOP, 20 + JAGGED_PASS_LEVEL_DIFF - wild_mon NUMEL, 20 + JAGGED_PASS_LEVEL_DIFF - wild_mon SPOINK, 20 + JAGGED_PASS_LEVEL_DIFF - wild_mon NUMEL, 20 + JAGGED_PASS_LEVEL_DIFF - wild_mon SPOINK, 20 + JAGGED_PASS_LEVEL_DIFF - - .align 2 -JaggedPass_LandMonsInfo: - .4byte 20 @ encounter rate - .4byte JaggedPass_LandMons - - .align 2 -FieryPath_LandMons: - wild_mon NUMEL, 15 - wild_mon KOFFING_GRIMER, 15 - wild_mon NUMEL, 16 - wild_mon MACHOP, 15 - wild_mon TORKOAL, 15 - wild_mon SLUGMA, 15 - wild_mon KOFFING_GRIMER, 16 - wild_mon MACHOP, 16 - wild_mon TORKOAL, 14 - wild_mon TORKOAL, 16 - wild_mon GRIMER_KOFFING, 14 - wild_mon GRIMER_KOFFING, 14 - - .align 2 -FieryPath_LandMonsInfo: - .4byte 10 @ encounter rate - .4byte FieryPath_LandMons - - .align 2 -MtPyre_1F_LandMons: - wild_mon DUSKULL_SHUPPET, 27 - wild_mon DUSKULL_SHUPPET, 28 - wild_mon DUSKULL_SHUPPET, 26 - wild_mon DUSKULL_SHUPPET, 25 - wild_mon DUSKULL_SHUPPET, 29 - wild_mon DUSKULL_SHUPPET, 24 - wild_mon DUSKULL_SHUPPET, 23 - wild_mon DUSKULL_SHUPPET, 22 - wild_mon DUSKULL_SHUPPET, 29 - wild_mon DUSKULL_SHUPPET, 24 - wild_mon DUSKULL_SHUPPET, 29 - wild_mon DUSKULL_SHUPPET, 24 - - .align 2 -MtPyre_1F_LandMonsInfo: - .4byte 10 @ encounter rate - .4byte MtPyre_1F_LandMons - - .align 2 -MtPyre_2F_LandMons: - wild_mon DUSKULL_SHUPPET, 27 - wild_mon DUSKULL_SHUPPET, 28 - wild_mon DUSKULL_SHUPPET, 26 - wild_mon DUSKULL_SHUPPET, 25 - wild_mon DUSKULL_SHUPPET, 29 - wild_mon DUSKULL_SHUPPET, 24 - wild_mon DUSKULL_SHUPPET, 23 - wild_mon DUSKULL_SHUPPET, 22 - wild_mon DUSKULL_SHUPPET, 29 - wild_mon DUSKULL_SHUPPET, 24 - wild_mon DUSKULL_SHUPPET, 29 - wild_mon DUSKULL_SHUPPET, 24 - - .align 2 -MtPyre_2F_LandMonsInfo: - .4byte 10 @ encounter rate - .4byte MtPyre_2F_LandMons - - .align 2 -MtPyre_3F_LandMons: - wild_mon DUSKULL_SHUPPET, 27 - wild_mon DUSKULL_SHUPPET, 28 - wild_mon DUSKULL_SHUPPET, 26 - wild_mon DUSKULL_SHUPPET, 25 - wild_mon DUSKULL_SHUPPET, 29 - wild_mon DUSKULL_SHUPPET, 24 - wild_mon DUSKULL_SHUPPET, 23 - wild_mon DUSKULL_SHUPPET, 22 - wild_mon DUSKULL_SHUPPET, 29 - wild_mon DUSKULL_SHUPPET, 24 - wild_mon DUSKULL_SHUPPET, 29 - wild_mon DUSKULL_SHUPPET, 24 - - .align 2 -MtPyre_3F_LandMonsInfo: - .4byte 10 @ encounter rate - .4byte MtPyre_3F_LandMons - - .align 2 -MtPyre_4F_LandMons: - wild_mon DUSKULL_SHUPPET, 27 - wild_mon DUSKULL_SHUPPET, 28 - wild_mon DUSKULL_SHUPPET, 26 - wild_mon DUSKULL_SHUPPET, 25 - wild_mon DUSKULL_SHUPPET, 29 - wild_mon DUSKULL_SHUPPET, 24 - wild_mon DUSKULL_SHUPPET, 23 - wild_mon DUSKULL_SHUPPET, 22 - wild_mon SHUPPET_DUSKULL, 27 - wild_mon SHUPPET_DUSKULL, 27 - wild_mon SHUPPET_DUSKULL, 25 - wild_mon SHUPPET_DUSKULL, 29 - - .align 2 -MtPyre_4F_LandMonsInfo: - .4byte 10 @ encounter rate - .4byte MtPyre_4F_LandMons - - .align 2 -MtPyre_5F_LandMons: - wild_mon DUSKULL_SHUPPET, 27 - wild_mon DUSKULL_SHUPPET, 28 - wild_mon DUSKULL_SHUPPET, 26 - wild_mon DUSKULL_SHUPPET, 25 - wild_mon DUSKULL_SHUPPET, 29 - wild_mon DUSKULL_SHUPPET, 24 - wild_mon DUSKULL_SHUPPET, 23 - wild_mon DUSKULL_SHUPPET, 22 - wild_mon SHUPPET_DUSKULL, 27 - wild_mon SHUPPET_DUSKULL, 27 - wild_mon SHUPPET_DUSKULL, 25 - wild_mon SHUPPET_DUSKULL, 29 - - .align 2 -MtPyre_5F_LandMonsInfo: - .4byte 10 @ encounter rate - .4byte MtPyre_5F_LandMons - - .align 2 -MtPyre_6F_LandMons: - wild_mon DUSKULL_SHUPPET, 27 - wild_mon DUSKULL_SHUPPET, 28 - wild_mon DUSKULL_SHUPPET, 26 - wild_mon DUSKULL_SHUPPET, 25 - wild_mon DUSKULL_SHUPPET, 29 - wild_mon DUSKULL_SHUPPET, 24 - wild_mon DUSKULL_SHUPPET, 23 - wild_mon DUSKULL_SHUPPET, 22 - wild_mon SHUPPET_DUSKULL, 27 - wild_mon SHUPPET_DUSKULL, 27 - wild_mon SHUPPET_DUSKULL, 25 - wild_mon SHUPPET_DUSKULL, 29 - - .align 2 -MtPyre_6F_LandMonsInfo: - .4byte 10 @ encounter rate - .4byte MtPyre_6F_LandMons - - .align 2 -MtPyre_Exterior_LandMons: - wild_mon DUSKULL_SHUPPET, 27 - wild_mon MEDITITE, 27 - wild_mon DUSKULL_SHUPPET, 28 - wild_mon MEDITITE, 29 - wild_mon DUSKULL_SHUPPET, 29 - wild_mon VULPIX, 27 - wild_mon VULPIX, 29 - wild_mon VULPIX, 25 - wild_mon WINGULL, 27 - wild_mon WINGULL, 27 - wild_mon WINGULL, 26 - wild_mon WINGULL, 28 - - .align 2 -MtPyre_Exterior_LandMonsInfo: - .4byte 10 @ encounter rate - .4byte MtPyre_Exterior_LandMons - - .align 2 -MtPyre_Summit_LandMons: - wild_mon DUSKULL_SHUPPET, 28 - wild_mon DUSKULL_SHUPPET, 29 - wild_mon DUSKULL_SHUPPET, 27 - wild_mon DUSKULL_SHUPPET, 26 - wild_mon DUSKULL_SHUPPET, 30 - wild_mon DUSKULL_SHUPPET, 25 - wild_mon DUSKULL_SHUPPET, 24 - wild_mon SHUPPET_DUSKULL, 28 - wild_mon SHUPPET_DUSKULL, 26 - wild_mon SHUPPET_DUSKULL, 30 - wild_mon CHIMECHO, 28 - wild_mon CHIMECHO, 28 - - .align 2 -MtPyre_Summit_LandMonsInfo: - .4byte 10 @ encounter rate - .4byte MtPyre_Summit_LandMons - - .align 2 -SeafloorCavern_Entrance_WaterMons: - wild_mon TENTACOOL, 5, 35 - wild_mon ZUBAT, 5, 35 - wild_mon ZUBAT, 30, 35 - wild_mon GOLBAT, 30, 35 - wild_mon GOLBAT, 30, 35 - - .align 2 -SeafloorCavern_Entrance_WaterMonsInfo: - .4byte 4 @ encounter rate - .4byte SeafloorCavern_Entrance_WaterMons - - .align 2 -SeafloorCavern_Entrance_FishingMons: - wild_mon MAGIKARP, 5, 10 - wild_mon TENTACOOL, 5, 10 - wild_mon MAGIKARP, 10, 30 - wild_mon TENTACOOL, 10, 30 - wild_mon WAILMER, 10, 30 - wild_mon WAILMER, 25, 30 - wild_mon WAILMER, 30, 35 - wild_mon WAILMER, 20, 25 - wild_mon WAILMER, 35, 40 - wild_mon WAILMER, 40, 45 - - .align 2 -SeafloorCavern_Entrance_FishingMonsInfo: - .4byte 10 @ encounter rate - .4byte SeafloorCavern_Entrance_FishingMons - - .align 2 -SeafloorCavern_Room1_LandMons: - wild_mon ZUBAT, 30 - wild_mon ZUBAT, 31 - wild_mon ZUBAT, 32 - wild_mon ZUBAT, 33 - wild_mon ZUBAT, 28 - wild_mon ZUBAT, 29 - wild_mon ZUBAT, 34 - wild_mon ZUBAT, 35 - wild_mon GOLBAT, 34 - wild_mon GOLBAT, 35 - wild_mon GOLBAT, 33 - wild_mon GOLBAT, 36 - - .align 2 -SeafloorCavern_Room1_LandMonsInfo: - .4byte 4 @ encounter rate - .4byte SeafloorCavern_Room1_LandMons - - .align 2 -SeafloorCavern_Room2_LandMons: - wild_mon ZUBAT, 30 - wild_mon ZUBAT, 31 - wild_mon ZUBAT, 32 - wild_mon ZUBAT, 33 - wild_mon ZUBAT, 28 - wild_mon ZUBAT, 29 - wild_mon ZUBAT, 34 - wild_mon ZUBAT, 35 - wild_mon GOLBAT, 34 - wild_mon GOLBAT, 35 - wild_mon GOLBAT, 33 - wild_mon GOLBAT, 36 - - .align 2 -SeafloorCavern_Room2_LandMonsInfo: - .4byte 4 @ encounter rate - .4byte SeafloorCavern_Room2_LandMons - - .align 2 -SeafloorCavern_Room3_LandMons: - wild_mon ZUBAT, 30 - wild_mon ZUBAT, 31 - wild_mon ZUBAT, 32 - wild_mon ZUBAT, 33 - wild_mon ZUBAT, 28 - wild_mon ZUBAT, 29 - wild_mon ZUBAT, 34 - wild_mon ZUBAT, 35 - wild_mon GOLBAT, 34 - wild_mon GOLBAT, 35 - wild_mon GOLBAT, 33 - wild_mon GOLBAT, 36 - - .align 2 -SeafloorCavern_Room3_LandMonsInfo: - .4byte 4 @ encounter rate - .4byte SeafloorCavern_Room3_LandMons - - .align 2 -SeafloorCavern_Room4_LandMons: - wild_mon ZUBAT, 30 - wild_mon ZUBAT, 31 - wild_mon ZUBAT, 32 - wild_mon ZUBAT, 33 - wild_mon ZUBAT, 28 - wild_mon ZUBAT, 29 - wild_mon ZUBAT, 34 - wild_mon ZUBAT, 35 - wild_mon GOLBAT, 34 - wild_mon GOLBAT, 35 - wild_mon GOLBAT, 33 - wild_mon GOLBAT, 36 - - .align 2 -SeafloorCavern_Room4_LandMonsInfo: - .4byte 4 @ encounter rate - .4byte SeafloorCavern_Room4_LandMons - - .align 2 -SeafloorCavern_Room5_LandMons: - wild_mon ZUBAT, 30 - wild_mon ZUBAT, 31 - wild_mon ZUBAT, 32 - wild_mon ZUBAT, 33 - wild_mon ZUBAT, 28 - wild_mon ZUBAT, 29 - wild_mon ZUBAT, 34 - wild_mon ZUBAT, 35 - wild_mon GOLBAT, 34 - wild_mon GOLBAT, 35 - wild_mon GOLBAT, 33 - wild_mon GOLBAT, 36 - - .align 2 -SeafloorCavern_Room5_LandMonsInfo: - .4byte 4 @ encounter rate - .4byte SeafloorCavern_Room5_LandMons - - .align 2 -SeafloorCavern_Room6_LandMons: - wild_mon ZUBAT, 30 - wild_mon ZUBAT, 31 - wild_mon ZUBAT, 32 - wild_mon ZUBAT, 33 - wild_mon ZUBAT, 28 - wild_mon ZUBAT, 29 - wild_mon ZUBAT, 34 - wild_mon ZUBAT, 35 - wild_mon GOLBAT, 34 - wild_mon GOLBAT, 35 - wild_mon GOLBAT, 33 - wild_mon GOLBAT, 36 - - .align 2 -SeafloorCavern_Room6_LandMonsInfo: - .4byte 4 @ encounter rate - .4byte SeafloorCavern_Room6_LandMons - - .align 2 -SeafloorCavern_Room6_WaterMons: - wild_mon TENTACOOL, 5, 35 - wild_mon ZUBAT, 5, 35 - wild_mon ZUBAT, 30, 35 - wild_mon GOLBAT, 30, 35 - wild_mon GOLBAT, 30, 35 - - .align 2 -SeafloorCavern_Room6_WaterMonsInfo: - .4byte 4 @ encounter rate - .4byte SeafloorCavern_Room6_WaterMons - - .align 2 -SeafloorCavern_Room6_FishingMons: - wild_mon MAGIKARP, 5, 10 - wild_mon TENTACOOL, 5, 10 - wild_mon MAGIKARP, 10, 30 - wild_mon TENTACOOL, 10, 30 - wild_mon WAILMER, 10, 30 - wild_mon WAILMER, 25, 30 - wild_mon WAILMER, 30, 35 - wild_mon WAILMER, 20, 25 - wild_mon WAILMER, 35, 40 - wild_mon WAILMER, 40, 45 - - .align 2 -SeafloorCavern_Room6_FishingMonsInfo: - .4byte 10 @ encounter rate - .4byte SeafloorCavern_Room6_FishingMons - - .align 2 -SeafloorCavern_Room7_LandMons: - wild_mon ZUBAT, 30 - wild_mon ZUBAT, 31 - wild_mon ZUBAT, 32 - wild_mon ZUBAT, 33 - wild_mon ZUBAT, 28 - wild_mon ZUBAT, 29 - wild_mon ZUBAT, 34 - wild_mon ZUBAT, 35 - wild_mon GOLBAT, 34 - wild_mon GOLBAT, 35 - wild_mon GOLBAT, 33 - wild_mon GOLBAT, 36 - - .align 2 -SeafloorCavern_Room7_LandMonsInfo: - .4byte 4 @ encounter rate - .4byte SeafloorCavern_Room7_LandMons - - .align 2 -SeafloorCavern_Room7_WaterMons: - wild_mon TENTACOOL, 5, 35 - wild_mon ZUBAT, 5, 35 - wild_mon ZUBAT, 30, 35 - wild_mon GOLBAT, 30, 35 - wild_mon GOLBAT, 30, 35 - - .align 2 -SeafloorCavern_Room7_WaterMonsInfo: - .4byte 4 @ encounter rate - .4byte SeafloorCavern_Room7_WaterMons - - .align 2 -SeafloorCavern_Room7_FishingMons: - wild_mon MAGIKARP, 5, 10 - wild_mon TENTACOOL, 5, 10 - wild_mon MAGIKARP, 10, 30 - wild_mon TENTACOOL, 10, 30 - wild_mon WAILMER, 10, 30 - wild_mon WAILMER, 25, 30 - wild_mon WAILMER, 30, 35 - wild_mon WAILMER, 20, 25 - wild_mon WAILMER, 35, 40 - wild_mon WAILMER, 40, 45 - - .align 2 -SeafloorCavern_Room7_FishingMonsInfo: - .4byte 10 @ encounter rate - .4byte SeafloorCavern_Room7_FishingMons - - .align 2 -SeafloorCavern_Room8_LandMons: - wild_mon ZUBAT, 30 - wild_mon ZUBAT, 31 - wild_mon ZUBAT, 32 - wild_mon ZUBAT, 33 - wild_mon ZUBAT, 28 - wild_mon ZUBAT, 29 - wild_mon ZUBAT, 34 - wild_mon ZUBAT, 35 - wild_mon GOLBAT, 34 - wild_mon GOLBAT, 35 - wild_mon GOLBAT, 33 - wild_mon GOLBAT, 36 - - .align 2 -SeafloorCavern_Room8_LandMonsInfo: - .4byte 4 @ encounter rate - .4byte SeafloorCavern_Room8_LandMons - - .align 2 -CaveOfOrigin_Entrance_LandMons: - wild_mon ZUBAT, 30 - wild_mon ZUBAT, 31 - wild_mon ZUBAT, 32 - wild_mon ZUBAT, 33 - wild_mon ZUBAT, 28 - wild_mon ZUBAT, 29 - wild_mon ZUBAT, 34 - wild_mon ZUBAT, 35 - wild_mon GOLBAT, 34 - wild_mon GOLBAT, 35 - wild_mon GOLBAT, 33 - wild_mon GOLBAT, 36 - - .align 2 -CaveOfOrigin_Entrance_LandMonsInfo: - .4byte 4 @ encounter rate - .4byte CaveOfOrigin_Entrance_LandMons - - .align 2 -CaveOfOrigin_1F_LandMons: - wild_mon ZUBAT, 30 - wild_mon ZUBAT, 31 - wild_mon ZUBAT, 32 - wild_mon MAWILE_SABLEYE, 30 - wild_mon MAWILE_SABLEYE, 32 - wild_mon MAWILE_SABLEYE, 34 - wild_mon ZUBAT, 33 - wild_mon ZUBAT, 34 - wild_mon GOLBAT, 34 - wild_mon GOLBAT, 35 - wild_mon GOLBAT, 33 - wild_mon GOLBAT, 36 - - .align 2 -CaveOfOrigin_1F_LandMonsInfo: - .4byte 4 @ encounter rate - .4byte CaveOfOrigin_1F_LandMons - - .align 2 -CaveOfOrigin_B1F_LandMons: - wild_mon ZUBAT, 30 - wild_mon ZUBAT, 31 - wild_mon ZUBAT, 32 - wild_mon MAWILE_SABLEYE, 30 - wild_mon MAWILE_SABLEYE, 32 - wild_mon MAWILE_SABLEYE, 34 - wild_mon ZUBAT, 33 - wild_mon ZUBAT, 34 - wild_mon GOLBAT, 34 - wild_mon GOLBAT, 35 - wild_mon GOLBAT, 33 - wild_mon GOLBAT, 36 - - .align 2 -CaveOfOrigin_B1F_LandMonsInfo: - .4byte 4 @ encounter rate - .4byte CaveOfOrigin_B1F_LandMons - - .align 2 -CaveOfOrigin_B2F_LandMons: - wild_mon ZUBAT, 30 - wild_mon ZUBAT, 31 - wild_mon ZUBAT, 32 - wild_mon MAWILE_SABLEYE, 30 - wild_mon MAWILE_SABLEYE, 32 - wild_mon MAWILE_SABLEYE, 34 - wild_mon ZUBAT, 33 - wild_mon ZUBAT, 34 - wild_mon GOLBAT, 34 - wild_mon GOLBAT, 35 - wild_mon GOLBAT, 33 - wild_mon GOLBAT, 36 - - .align 2 -CaveOfOrigin_B2F_LandMonsInfo: - .4byte 4 @ encounter rate - .4byte CaveOfOrigin_B2F_LandMons - - .align 2 -CaveOfOrigin_B3F_LandMons: - wild_mon ZUBAT, 30 - wild_mon ZUBAT, 31 - wild_mon ZUBAT, 32 - wild_mon MAWILE_SABLEYE, 30 - wild_mon MAWILE_SABLEYE, 32 - wild_mon MAWILE_SABLEYE, 34 - wild_mon ZUBAT, 33 - wild_mon ZUBAT, 34 - wild_mon GOLBAT, 34 - wild_mon GOLBAT, 35 - wild_mon GOLBAT, 33 - wild_mon GOLBAT, 36 - - .align 2 -CaveOfOrigin_B3F_LandMonsInfo: - .4byte 4 @ encounter rate - .4byte CaveOfOrigin_B3F_LandMons - - .align 2 -VictoryRoad_1F_LandMons: - wild_mon GOLBAT, 40 - wild_mon HARIYAMA, 40 - wild_mon LAIRON, 40 - wild_mon LOUDRED, 40 - wild_mon ZUBAT, 36 - wild_mon MAKUHITA, 36 - wild_mon GOLBAT, 38 - wild_mon HARIYAMA, 38 - wild_mon ARON, 36 - wild_mon WHISMUR, 36 - wild_mon ARON, 36 - wild_mon WHISMUR, 36 - - .align 2 -VictoryRoad_1F_LandMonsInfo: - .4byte 10 @ encounter rate - .4byte VictoryRoad_1F_LandMons - - .align 2 -VictoryRoad_B1F_LandMons: - wild_mon GOLBAT, 40 - wild_mon HARIYAMA, 40 - wild_mon LAIRON, 40 - wild_mon MEDICHAM, 40 - wild_mon GOLBAT, 38 - wild_mon HARIYAMA, 38 - wild_mon GOLBAT, 42 - wild_mon HARIYAMA, 42 - wild_mon LAIRON, 42 - wild_mon MEDITITE, 38 - wild_mon LAIRON, 42 - wild_mon MEDITITE, 38 - - .align 2 -VictoryRoad_B1F_LandMonsInfo: - .4byte 10 @ encounter rate - .4byte VictoryRoad_B1F_LandMons - - .align 2 -VictoryRoad_B1F_RockSmashMons: - wild_mon GRAVELER, 30, 40 - wild_mon GEODUDE, 30, 40 - wild_mon GRAVELER, 35, 40 - wild_mon GRAVELER, 35, 40 - wild_mon GRAVELER, 35, 40 - - .align 2 -VictoryRoad_B1F_RockSmashMonsInfo: - .4byte 20 @ encounter rate - .4byte VictoryRoad_B1F_RockSmashMons - - .align 2 -VictoryRoad_B2F_LandMons: - wild_mon GOLBAT, 40 - wild_mon MAWILE_SABLEYE, 40 - wild_mon LAIRON, 40 - wild_mon MEDICHAM, 40 - wild_mon GOLBAT, 42 - wild_mon MAWILE_SABLEYE, 42 - wild_mon GOLBAT, 44 - wild_mon MAWILE_SABLEYE, 44 - wild_mon LAIRON, 42 - wild_mon MEDICHAM, 42 - wild_mon LAIRON, 44 - wild_mon MEDICHAM, 44 - - .align 2 -VictoryRoad_B2F_LandMonsInfo: - .4byte 10 @ encounter rate - .4byte VictoryRoad_B2F_LandMons - - .align 2 -VictoryRoad_B2F_WaterMons: - wild_mon GOLBAT, 30, 35 - wild_mon GOLBAT, 25, 30 - wild_mon GOLBAT, 35, 40 - wild_mon GOLBAT, 35, 40 - wild_mon GOLBAT, 35, 40 - - .align 2 -VictoryRoad_B2F_WaterMonsInfo: - .4byte 4 @ encounter rate - .4byte VictoryRoad_B2F_WaterMons - - .align 2 -VictoryRoad_B2F_FishingMons: - wild_mon MAGIKARP, 5, 10 - wild_mon GOLDEEN, 5, 10 - wild_mon MAGIKARP, 10, 30 - wild_mon GOLDEEN, 10, 30 - wild_mon BARBOACH, 10, 30 - wild_mon BARBOACH, 25, 30 - wild_mon BARBOACH, 30, 35 - wild_mon WHISCASH, 30, 35 - wild_mon WHISCASH, 35, 40 - wild_mon WHISCASH, 40, 45 - - .align 2 -VictoryRoad_B2F_FishingMonsInfo: - .4byte 30 @ encounter rate - .4byte VictoryRoad_B2F_FishingMons - - .align 2 -ShoalCave_LowTideEntranceRoom_LandMons: - wild_mon ZUBAT, 26 - wild_mon SPHEAL, 26 - wild_mon ZUBAT, 28 - wild_mon SPHEAL, 28 - wild_mon ZUBAT, 30 - wild_mon SPHEAL, 30 - wild_mon ZUBAT, 32 - wild_mon SPHEAL, 32 - wild_mon GOLBAT, 32 - wild_mon SPHEAL, 32 - wild_mon GOLBAT, 32 - wild_mon SPHEAL, 32 - - .align 2 -ShoalCave_LowTideEntranceRoom_LandMonsInfo: - .4byte 10 @ encounter rate - .4byte ShoalCave_LowTideEntranceRoom_LandMons - - .align 2 -ShoalCave_LowTideEntranceRoom_WaterMons: - wild_mon TENTACOOL, 5, 35 - wild_mon ZUBAT, 5, 35 - wild_mon SPHEAL, 25, 30 - wild_mon SPHEAL, 25, 30 - wild_mon SPHEAL, 25, 35 - - .align 2 -ShoalCave_LowTideEntranceRoom_WaterMonsInfo: - .4byte 4 @ encounter rate - .4byte ShoalCave_LowTideEntranceRoom_WaterMons - - .align 2 -ShoalCave_LowTideEntranceRoom_FishingMons: - wild_mon MAGIKARP, 5, 10 - wild_mon TENTACOOL, 5, 10 - wild_mon MAGIKARP, 10, 30 - wild_mon TENTACOOL, 10, 30 - wild_mon WAILMER, 10, 30 - wild_mon WAILMER, 25, 30 - wild_mon WAILMER, 30, 35 - wild_mon WAILMER, 20, 25 - wild_mon WAILMER, 35, 40 - wild_mon WAILMER, 40, 45 - - .align 2 -ShoalCave_LowTideEntranceRoom_FishingMonsInfo: - .4byte 10 @ encounter rate - .4byte ShoalCave_LowTideEntranceRoom_FishingMons - - .align 2 -ShoalCave_LowTideInnerRoom_LandMons: - wild_mon ZUBAT, 26 - wild_mon SPHEAL, 26 - wild_mon ZUBAT, 28 - wild_mon SPHEAL, 28 - wild_mon ZUBAT, 30 - wild_mon SPHEAL, 30 - wild_mon ZUBAT, 32 - wild_mon SPHEAL, 32 - wild_mon GOLBAT, 32 - wild_mon SPHEAL, 32 - wild_mon GOLBAT, 32 - wild_mon SPHEAL, 32 - - .align 2 -ShoalCave_LowTideInnerRoom_LandMonsInfo: - .4byte 10 @ encounter rate - .4byte ShoalCave_LowTideInnerRoom_LandMons - - .align 2 -ShoalCave_LowTideInnerRoom_WaterMons: - wild_mon TENTACOOL, 5, 35 - wild_mon ZUBAT, 5, 35 - wild_mon SPHEAL, 25, 30 - wild_mon SPHEAL, 25, 30 - wild_mon SPHEAL, 25, 35 - - .align 2 -ShoalCave_LowTideInnerRoom_WaterMonsInfo: - .4byte 4 @ encounter rate - .4byte ShoalCave_LowTideInnerRoom_WaterMons - - .align 2 -ShoalCave_LowTideInnerRoom_FishingMons: - wild_mon MAGIKARP, 5, 10 - wild_mon TENTACOOL, 5, 10 - wild_mon MAGIKARP, 10, 30 - wild_mon TENTACOOL, 10, 30 - wild_mon WAILMER, 10, 30 - wild_mon WAILMER, 25, 30 - wild_mon WAILMER, 30, 35 - wild_mon WAILMER, 20, 25 - wild_mon WAILMER, 35, 40 - wild_mon WAILMER, 40, 45 - - .align 2 -ShoalCave_LowTideInnerRoom_FishingMonsInfo: - .4byte 10 @ encounter rate - .4byte ShoalCave_LowTideInnerRoom_FishingMons - - .align 2 -ShoalCave_LowTideStairsRoom_LandMons: - wild_mon ZUBAT, 26 - wild_mon SPHEAL, 26 - wild_mon ZUBAT, 28 - wild_mon SPHEAL, 28 - wild_mon ZUBAT, 30 - wild_mon SPHEAL, 30 - wild_mon ZUBAT, 32 - wild_mon SPHEAL, 32 - wild_mon GOLBAT, 32 - wild_mon SPHEAL, 32 - wild_mon GOLBAT, 32 - wild_mon SPHEAL, 32 - - .align 2 -ShoalCave_LowTideStairsRoom_LandMonsInfo: - .4byte 10 @ encounter rate - .4byte ShoalCave_LowTideStairsRoom_LandMons - - .align 2 -ShoalCave_LowTideLowerRoom_LandMons: - wild_mon ZUBAT, 26 - wild_mon SPHEAL, 26 - wild_mon ZUBAT, 28 - wild_mon SPHEAL, 28 - wild_mon ZUBAT, 30 - wild_mon SPHEAL, 30 - wild_mon ZUBAT, 32 - wild_mon SPHEAL, 32 - wild_mon GOLBAT, 32 - wild_mon SPHEAL, 32 - wild_mon GOLBAT, 32 - wild_mon SPHEAL, 32 - - .align 2 -ShoalCave_LowTideLowerRoom_LandMonsInfo: - .4byte 10 @ encounter rate - .4byte ShoalCave_LowTideLowerRoom_LandMons - - .align 2 -ShoalCave_LowTideIceRoom_LandMons: - wild_mon ZUBAT, 26 - wild_mon SPHEAL, 26 - wild_mon ZUBAT, 28 - wild_mon SPHEAL, 28 - wild_mon ZUBAT, 30 - wild_mon SPHEAL, 30 - wild_mon SNORUNT, 26 - wild_mon SPHEAL, 32 - wild_mon GOLBAT, 30 - wild_mon SNORUNT, 28 - wild_mon GOLBAT, 32 - wild_mon SNORUNT, 30 - - .align 2 -ShoalCave_LowTideIceRoom_LandMonsInfo: - .4byte 10 @ encounter rate - .4byte ShoalCave_LowTideIceRoom_LandMons - - .align 2 -NewMauville_Entrance_LandMons: - wild_mon VOLTORB, 24 - wild_mon MAGNEMITE, 24 - wild_mon VOLTORB, 25 - wild_mon MAGNEMITE, 25 - wild_mon VOLTORB, 23 - wild_mon MAGNEMITE, 23 - wild_mon VOLTORB, 26 - wild_mon MAGNEMITE, 26 - wild_mon VOLTORB, 22 - wild_mon MAGNEMITE, 22 - wild_mon VOLTORB, 22 - wild_mon MAGNEMITE, 22 - - .align 2 -NewMauville_Entrance_LandMonsInfo: - .4byte 10 @ encounter rate - .4byte NewMauville_Entrance_LandMons - - .align 2 -NewMauville_Inside_LandMons: - wild_mon VOLTORB, 24 - wild_mon MAGNEMITE, 24 - wild_mon VOLTORB, 25 - wild_mon MAGNEMITE, 25 - wild_mon VOLTORB, 23 - wild_mon MAGNEMITE, 23 - wild_mon VOLTORB, 26 - wild_mon MAGNEMITE, 26 - wild_mon VOLTORB, 22 - wild_mon MAGNEMITE, 22 - wild_mon ELECTRODE, 26 - wild_mon MAGNETON, 26 - - .align 2 -NewMauville_Inside_LandMonsInfo: - .4byte 10 @ encounter rate - .4byte NewMauville_Inside_LandMons - - .align 2 -AbandonedShip_Rooms_B1F_WaterMons: - wild_mon TENTACOOL, 5, 35 - wild_mon TENTACOOL, 5, 35 - wild_mon TENTACOOL, 5, 35 - wild_mon TENTACOOL, 5, 35 - wild_mon TENTACRUEL, 30, 35 - - .align 2 -AbandonedShip_Rooms_B1F_WaterMonsInfo: - .4byte 4 @ encounter rate - .4byte AbandonedShip_Rooms_B1F_WaterMons - - .align 2 -AbandonedShip_Rooms_B1F_FishingMons: - wild_mon MAGIKARP, 5, 10 - wild_mon TENTACOOL, 5, 10 - wild_mon MAGIKARP, 10, 30 - wild_mon TENTACOOL, 10, 30 - wild_mon TENTACOOL, 10, 30 - wild_mon TENTACOOL, 25, 30 - wild_mon TENTACOOL, 30, 35 - wild_mon TENTACRUEL, 30, 35 - wild_mon TENTACRUEL, 25, 30 - wild_mon TENTACRUEL, 20, 25 - - .align 2 -AbandonedShip_Rooms_B1F_FishingMonsInfo: - .4byte 20 @ encounter rate - .4byte AbandonedShip_Rooms_B1F_FishingMons - - .align 2 -AbandonedShip_HiddenFloorCorridors_WaterMons: - wild_mon TENTACOOL, 5, 35 - wild_mon TENTACOOL, 5, 35 - wild_mon TENTACOOL, 5, 35 - wild_mon TENTACOOL, 5, 35 - wild_mon TENTACRUEL, 30, 35 - - .align 2 -AbandonedShip_HiddenFloorCorridors_WaterMonsInfo: - .4byte 4 @ encounter rate - .4byte AbandonedShip_HiddenFloorCorridors_WaterMons - - .align 2 -AbandonedShip_HiddenFloorCorridors_FishingMons: - wild_mon MAGIKARP, 5, 10 - wild_mon TENTACOOL, 5, 10 - wild_mon MAGIKARP, 10, 30 - wild_mon TENTACOOL, 10, 30 - wild_mon TENTACOOL, 10, 30 - wild_mon TENTACOOL, 25, 30 - wild_mon TENTACOOL, 30, 35 - wild_mon TENTACRUEL, 30, 35 - wild_mon TENTACRUEL, 25, 30 - wild_mon TENTACRUEL, 20, 25 - - .align 2 -AbandonedShip_HiddenFloorCorridors_FishingMonsInfo: - .4byte 20 @ encounter rate - .4byte AbandonedShip_HiddenFloorCorridors_FishingMons - - .align 2 -SkyPillar_1F_LandMons: - wild_mon MAWILE_SABLEYE, 48 - wild_mon GOLBAT, 48 - wild_mon GOLBAT, 50 - wild_mon MAWILE_SABLEYE, 50 - wild_mon CLAYDOL, 48 - wild_mon DUSCLOPS_BANETTE, 48 - wild_mon DUSCLOPS_BANETTE, 50 - wild_mon CLAYDOL, 49 - wild_mon CLAYDOL, 47 - wild_mon CLAYDOL, 50 - wild_mon CLAYDOL, 47 - wild_mon CLAYDOL, 50 - - .align 2 -SkyPillar_1F_LandMonsInfo: - .4byte 10 @ encounter rate - .4byte SkyPillar_1F_LandMons - - .align 2 -SkyPillar_3F_LandMons: - wild_mon MAWILE_SABLEYE, 51 - wild_mon GOLBAT, 51 - wild_mon GOLBAT, 53 - wild_mon MAWILE_SABLEYE, 53 - wild_mon CLAYDOL, 51 - wild_mon DUSCLOPS_BANETTE, 51 - wild_mon DUSCLOPS_BANETTE, 53 - wild_mon CLAYDOL, 52 - wild_mon CLAYDOL, 50 - wild_mon CLAYDOL, 53 - wild_mon CLAYDOL, 50 - wild_mon CLAYDOL, 53 - - .align 2 -SkyPillar_3F_LandMonsInfo: - .4byte 10 @ encounter rate - .4byte SkyPillar_3F_LandMons - - .align 2 -SkyPillar_5F_LandMons: - wild_mon MAWILE_SABLEYE, 54 - wild_mon GOLBAT, 54 - wild_mon GOLBAT, 56 - wild_mon MAWILE_SABLEYE, 56 - wild_mon CLAYDOL, 54 - wild_mon DUSCLOPS_BANETTE, 54 - wild_mon DUSCLOPS_BANETTE, 56 - wild_mon CLAYDOL, 55 - wild_mon CLAYDOL, 56 - wild_mon ALTARIA, 57 - wild_mon ALTARIA, 54 - wild_mon ALTARIA, 60 - - .align 2 -SkyPillar_5F_LandMonsInfo: - .4byte 10 @ encounter rate - .4byte SkyPillar_5F_LandMons - - .align 2 -Route101_LandMons: - wild_mon WURMPLE, 2 - wild_mon ZIGZAGOON, 2 - wild_mon WURMPLE, 2 - wild_mon WURMPLE, 3 - wild_mon ZIGZAGOON, 3 - wild_mon ZIGZAGOON, 3 - wild_mon WURMPLE, 3 - wild_mon ZIGZAGOON, 3 - wild_mon POOCHYENA, 2 - wild_mon POOCHYENA, 2 - wild_mon POOCHYENA, 3 - wild_mon POOCHYENA, 3 - - .align 2 -Route101_LandMonsInfo: - .4byte 20 @ encounter rate - .4byte Route101_LandMons - - .align 2 -Route102_LandMons: - wild_mon ZIGZAGOON, 3 - wild_mon WURMPLE, 3 - wild_mon ZIGZAGOON, 4 - wild_mon WURMPLE, 4 - wild_mon SEEDOT_LOTAD, 3 - wild_mon SEEDOT_LOTAD, 4 - wild_mon POOCHYENA, 3 - wild_mon POOCHYENA, 3 - wild_mon POOCHYENA, 4 - wild_mon RALTS, 4 - wild_mon POOCHYENA, 4 - wild_mon SURSKIT, 3 - - .align 2 -Route102_LandMonsInfo: - .4byte 20 @ encounter rate - .4byte Route102_LandMons - - .align 2 -Route102_WaterMons: - wild_mon MARILL, 20, 30 - wild_mon MARILL, 10, 20 - wild_mon MARILL, 30, 35 - wild_mon MARILL, 5, 10 - wild_mon SURSKIT, 20, 30 - - .align 2 -Route102_WaterMonsInfo: - .4byte 4 @ encounter rate - .4byte Route102_WaterMons - - .align 2 -Route102_FishingMons: - wild_mon MAGIKARP, 5, 10 - wild_mon GOLDEEN, 5, 10 - wild_mon MAGIKARP, 10, 30 - wild_mon GOLDEEN, 10, 30 - wild_mon CORPHISH, 10, 30 - wild_mon CORPHISH, 25, 30 - wild_mon CORPHISH, 30, 35 - wild_mon CORPHISH, 20, 25 - wild_mon CORPHISH, 35, 40 - wild_mon CORPHISH, 40, 45 - - .align 2 -Route102_FishingMonsInfo: - .4byte 30 @ encounter rate - .4byte Route102_FishingMons - - .align 2 -Route103_LandMons: - wild_mon ZIGZAGOON, 2 - wild_mon ZIGZAGOON, 3 - wild_mon ZIGZAGOON, 3 - wild_mon ZIGZAGOON, 4 - wild_mon POOCHYENA, 2 - wild_mon POOCHYENA, 3 - wild_mon POOCHYENA, 3 - wild_mon POOCHYENA, 4 - wild_mon WINGULL, 3 - wild_mon WINGULL, 3 - wild_mon WINGULL, 2 - wild_mon WINGULL, 4 - - .align 2 -Route103_LandMonsInfo: - .4byte 20 @ encounter rate - .4byte Route103_LandMons - - .align 2 -Route103_WaterMons: - wild_mon TENTACOOL, 5, 35 - wild_mon WINGULL, 10, 30 - wild_mon WINGULL, 15, 25 - wild_mon PELIPPER, 25, 30 - wild_mon PELIPPER, 25, 30 - - .align 2 -Route103_WaterMonsInfo: - .4byte 4 @ encounter rate - .4byte Route103_WaterMons - - .align 2 -Route103_FishingMons: - wild_mon MAGIKARP, 5, 10 - wild_mon TENTACOOL, 5, 10 - wild_mon MAGIKARP, 10, 30 - wild_mon TENTACOOL, 10, 30 - wild_mon WAILMER, 10, 30 - wild_mon SHARPEDO, 30, 35 - wild_mon WAILMER, 30, 35 - wild_mon WAILMER, 25, 30 - wild_mon WAILMER, 35, 40 - wild_mon WAILMER, 40, 45 - - .align 2 -Route103_FishingMonsInfo: - .4byte 30 @ encounter rate - .4byte Route103_FishingMons - - .align 2 -Route104_LandMons: - wild_mon ZIGZAGOON, 4 - wild_mon WURMPLE, 4 - wild_mon ZIGZAGOON, 5 - wild_mon WURMPLE, 5 - wild_mon ZIGZAGOON, 4 - wild_mon ZIGZAGOON, 5 - wild_mon TAILLOW, 4 - wild_mon TAILLOW, 5 - wild_mon WINGULL, 4 - wild_mon WINGULL, 4 - wild_mon WINGULL, 3 - wild_mon WINGULL, 5 - - .align 2 -Route104_LandMonsInfo: - .4byte 20 @ encounter rate - .4byte Route104_LandMons - - .align 2 -Route104_WaterMons: - wild_mon WINGULL, 10, 30 - wild_mon WINGULL, 15, 25 - wild_mon WINGULL, 15, 25 - wild_mon PELIPPER, 25, 30 - wild_mon PELIPPER, 25, 30 - - .align 2 -Route104_WaterMonsInfo: - .4byte 4 @ encounter rate - .4byte Route104_WaterMons - - .align 2 -Route104_FishingMons: - wild_mon MAGIKARP, 5, 10 - wild_mon MAGIKARP, 5, 10 - wild_mon MAGIKARP, 10, 30 - wild_mon MAGIKARP, 10, 30 - wild_mon MAGIKARP, 10, 30 - wild_mon MAGIKARP, 25, 30 - wild_mon MAGIKARP, 30, 35 - wild_mon MAGIKARP, 20, 25 - wild_mon MAGIKARP, 35, 40 - wild_mon MAGIKARP, 40, 45 - - .align 2 -Route104_FishingMonsInfo: - .4byte 30 @ encounter rate - .4byte Route104_FishingMons - - .align 2 -Route105_WaterMons: - wild_mon TENTACOOL, 5, 35 - wild_mon WINGULL, 10, 30 - wild_mon WINGULL, 15, 25 - wild_mon PELIPPER, 25, 30 - wild_mon PELIPPER, 25, 30 - - .align 2 -Route105_WaterMonsInfo: - .4byte 4 @ encounter rate - .4byte Route105_WaterMons - - .align 2 -Route105_FishingMons: - wild_mon MAGIKARP, 5, 10 - wild_mon TENTACOOL, 5, 10 - wild_mon MAGIKARP, 10, 30 - wild_mon TENTACOOL, 10, 30 - wild_mon WAILMER, 10, 30 - wild_mon WAILMER, 25, 30 - wild_mon WAILMER, 30, 35 - wild_mon WAILMER, 20, 25 - wild_mon WAILMER, 35, 40 - wild_mon WAILMER, 40, 45 - - .align 2 -Route105_FishingMonsInfo: - .4byte 30 @ encounter rate - .4byte Route105_FishingMons - - .align 2 -Route106_WaterMons: - wild_mon TENTACOOL, 5, 35 - wild_mon WINGULL, 10, 30 - wild_mon WINGULL, 15, 25 - wild_mon PELIPPER, 25, 30 - wild_mon PELIPPER, 25, 30 - - .align 2 -Route106_WaterMonsInfo: - .4byte 4 @ encounter rate - .4byte Route106_WaterMons - - .align 2 -Route106_FishingMons: - wild_mon MAGIKARP, 5, 10 - wild_mon TENTACOOL, 5, 10 - wild_mon MAGIKARP, 10, 30 - wild_mon TENTACOOL, 10, 30 - wild_mon WAILMER, 10, 30 - wild_mon WAILMER, 25, 30 - wild_mon WAILMER, 30, 35 - wild_mon WAILMER, 20, 25 - wild_mon WAILMER, 35, 40 - wild_mon WAILMER, 40, 45 - - .align 2 -Route106_FishingMonsInfo: - .4byte 30 @ encounter rate - .4byte Route106_FishingMons - - .align 2 -Route107_WaterMons: - wild_mon TENTACOOL, 5, 35 - wild_mon WINGULL, 10, 30 - wild_mon WINGULL, 15, 25 - wild_mon PELIPPER, 25, 30 - wild_mon PELIPPER, 25, 30 - - .align 2 -Route107_WaterMonsInfo: - .4byte 4 @ encounter rate - .4byte Route107_WaterMons - - .align 2 -Route107_FishingMons: - wild_mon MAGIKARP, 5, 10 - wild_mon TENTACOOL, 5, 10 - wild_mon MAGIKARP, 10, 30 - wild_mon TENTACOOL, 10, 30 - wild_mon WAILMER, 10, 30 - wild_mon WAILMER, 25, 30 - wild_mon WAILMER, 30, 35 - wild_mon WAILMER, 20, 25 - wild_mon WAILMER, 35, 40 - wild_mon WAILMER, 40, 45 - - .align 2 -Route107_FishingMonsInfo: - .4byte 30 @ encounter rate - .4byte Route107_FishingMons - - .align 2 -Route108_WaterMons: - wild_mon TENTACOOL, 5, 35 - wild_mon WINGULL, 10, 30 - wild_mon WINGULL, 15, 25 - wild_mon PELIPPER, 25, 30 - wild_mon PELIPPER, 25, 30 - - .align 2 -Route108_WaterMonsInfo: - .4byte 4 @ encounter rate - .4byte Route108_WaterMons - - .align 2 -Route108_FishingMons: - wild_mon MAGIKARP, 5, 10 - wild_mon TENTACOOL, 5, 10 - wild_mon MAGIKARP, 10, 30 - wild_mon TENTACOOL, 10, 30 - wild_mon WAILMER, 10, 30 - wild_mon WAILMER, 25, 30 - wild_mon WAILMER, 30, 35 - wild_mon WAILMER, 20, 25 - wild_mon WAILMER, 35, 40 - wild_mon WAILMER, 40, 45 - - .align 2 -Route108_FishingMonsInfo: - .4byte 30 @ encounter rate - .4byte Route108_FishingMons - - .align 2 -Route109_WaterMons: - wild_mon TENTACOOL, 5, 35 - wild_mon WINGULL, 10, 30 - wild_mon WINGULL, 15, 25 - wild_mon PELIPPER, 25, 30 - wild_mon PELIPPER, 25, 30 - - .align 2 -Route109_WaterMonsInfo: - .4byte 4 @ encounter rate - .4byte Route109_WaterMons - - .align 2 -Route109_FishingMons: - wild_mon MAGIKARP, 5, 10 - wild_mon TENTACOOL, 5, 10 - wild_mon MAGIKARP, 10, 30 - wild_mon TENTACOOL, 10, 30 - wild_mon WAILMER, 10, 30 - wild_mon WAILMER, 25, 30 - wild_mon WAILMER, 30, 35 - wild_mon WAILMER, 20, 25 - wild_mon WAILMER, 35, 40 - wild_mon WAILMER, 40, 45 - - .align 2 -Route109_FishingMonsInfo: - .4byte 30 @ encounter rate - .4byte Route109_FishingMons - - .align 2 -Route110_LandMons: - wild_mon ZIGZAGOON, 12 - wild_mon ELECTRIKE, 12 - wild_mon GULPIN, 12 - wild_mon ELECTRIKE, 13 - wild_mon MINUN_PLUSLE, 13 - wild_mon ODDISH, 13 - wild_mon MINUN_PLUSLE, 13 - wild_mon GULPIN, 13 - wild_mon WINGULL, 12 - wild_mon WINGULL, 12 - wild_mon PLUSLE_MINUN, 12 - wild_mon PLUSLE_MINUN, 13 - - .align 2 -Route110_LandMonsInfo: - .4byte 20 @ encounter rate - .4byte Route110_LandMons - - .align 2 -Route110_WaterMons: - wild_mon TENTACOOL, 5, 35 - wild_mon WINGULL, 10, 30 - wild_mon WINGULL, 15, 25 - wild_mon PELIPPER, 25, 30 - wild_mon PELIPPER, 25, 30 - - .align 2 -Route110_WaterMonsInfo: - .4byte 4 @ encounter rate - .4byte Route110_WaterMons - - .align 2 -Route110_FishingMons: - wild_mon MAGIKARP, 5, 10 - wild_mon TENTACOOL, 5, 10 - wild_mon MAGIKARP, 10, 30 - wild_mon TENTACOOL, 10, 30 - wild_mon WAILMER, 10, 30 - wild_mon WAILMER, 25, 30 - wild_mon WAILMER, 30, 35 - wild_mon WAILMER, 20, 25 - wild_mon WAILMER, 35, 40 - wild_mon WAILMER, 40, 45 - - .align 2 -Route110_FishingMonsInfo: - .4byte 30 @ encounter rate - .4byte Route110_FishingMons - - .align 2 -Route111_LandMons: - wild_mon SANDSHREW, 20 - wild_mon TRAPINCH, 20 - wild_mon SANDSHREW, 21 - wild_mon TRAPINCH, 21 - wild_mon CACNEA, 19 - wild_mon CACNEA, 21 - wild_mon SANDSHREW, 19 - wild_mon TRAPINCH, 19 - wild_mon BALTOY, 20 - wild_mon BALTOY, 20 - wild_mon BALTOY, 22 - wild_mon BALTOY, 22 - - .align 2 -Route111_LandMonsInfo: - .4byte 10 @ encounter rate - .4byte Route111_LandMons - - .align 2 -Route111_WaterMons: - wild_mon MARILL, 20, 30 - wild_mon MARILL, 10, 20 - wild_mon MARILL, 30, 35 - wild_mon MARILL, 5, 10 - wild_mon SURSKIT, 20, 30 - - .align 2 -Route111_WaterMonsInfo: - .4byte 4 @ encounter rate - .4byte Route111_WaterMons - - .align 2 -Route111_RockSmashMons: - wild_mon GEODUDE, 10, 15 - wild_mon GEODUDE, 5, 10 - wild_mon GEODUDE, 15, 20 - wild_mon GEODUDE, 15, 20 - wild_mon GEODUDE, 15, 20 - - .align 2 -Route111_RockSmashMonsInfo: - .4byte 20 @ encounter rate - .4byte Route111_RockSmashMons - - .align 2 -Route111_FishingMons: - wild_mon MAGIKARP, 5, 10 - wild_mon GOLDEEN, 5, 10 - wild_mon MAGIKARP, 10, 30 - wild_mon GOLDEEN, 10, 30 - wild_mon BARBOACH, 10, 30 - wild_mon BARBOACH, 25, 30 - wild_mon BARBOACH, 30, 35 - wild_mon BARBOACH, 20, 25 - wild_mon BARBOACH, 35, 40 - wild_mon BARBOACH, 40, 45 - - .align 2 -Route111_FishingMonsInfo: - .4byte 30 @ encounter rate - .4byte Route111_FishingMons - - .align 2 -Route112_LandMons: - wild_mon NUMEL, 15 - wild_mon NUMEL, 15 - wild_mon MACHOP, 15 - wild_mon NUMEL, 14 - wild_mon NUMEL, 14 - wild_mon MACHOP, 14 - wild_mon NUMEL, 16 - wild_mon MACHOP, 16 - wild_mon NUMEL, 16 - wild_mon NUMEL, 16 - wild_mon NUMEL, 16 - wild_mon NUMEL, 16 - - .align 2 -Route112_LandMonsInfo: - .4byte 20 @ encounter rate - .4byte Route112_LandMons - - .align 2 -Route113_LandMons: - wild_mon SPINDA, 15 - wild_mon SPINDA, 15 - wild_mon SANDSHREW, 15 - wild_mon SPINDA, 14 - wild_mon SPINDA, 14 - wild_mon SANDSHREW, 14 - wild_mon SPINDA, 16 - wild_mon SANDSHREW, 16 - wild_mon SPINDA, 16 - wild_mon SKARMORY, 16 - wild_mon SPINDA, 16 - wild_mon SKARMORY, 16 - - .align 2 -Route113_LandMonsInfo: - .4byte 20 @ encounter rate - .4byte Route113_LandMons - - .align 2 -Route114_LandMons: - wild_mon SWABLU, 16 - wild_mon SEEDOT_LOTAD, 16 - wild_mon SWABLU, 17 - wild_mon SWABLU, 15 - wild_mon SEEDOT_LOTAD, 15 - wild_mon ZANGOOSE_SEVIPER, 16 - wild_mon NUZLEAF_LOMBRE, 16 - wild_mon NUZLEAF_LOMBRE, 18 - wild_mon ZANGOOSE_SEVIPER, 17 - wild_mon ZANGOOSE_SEVIPER, 15 - wild_mon ZANGOOSE_SEVIPER, 17 - wild_mon SURSKIT, 15 - - .align 2 -Route114_LandMonsInfo: - .4byte 20 @ encounter rate - .4byte Route114_LandMons - - .align 2 -Route114_WaterMons: - wild_mon MARILL, 20, 30 - wild_mon MARILL, 10, 20 - wild_mon MARILL, 30, 35 - wild_mon MARILL, 5, 10 - wild_mon SURSKIT, 20, 30 - - .align 2 -Route114_WaterMonsInfo: - .4byte 4 @ encounter rate - .4byte Route114_WaterMons - - .align 2 -Route114_RockSmashMons: - wild_mon GEODUDE, 10, 15 - wild_mon GEODUDE, 5, 10 - wild_mon GEODUDE, 15, 20 - wild_mon GEODUDE, 15, 20 - wild_mon GEODUDE, 15, 20 - - .align 2 -Route114_RockSmashMonsInfo: - .4byte 20 @ encounter rate - .4byte Route114_RockSmashMons - - .align 2 -Route114_FishingMons: - wild_mon MAGIKARP, 5, 10 - wild_mon GOLDEEN, 5, 10 - wild_mon MAGIKARP, 10, 30 - wild_mon GOLDEEN, 10, 30 - wild_mon BARBOACH, 10, 30 - wild_mon BARBOACH, 25, 30 - wild_mon BARBOACH, 30, 35 - wild_mon BARBOACH, 20, 25 - wild_mon BARBOACH, 35, 40 - wild_mon BARBOACH, 40, 45 - - .align 2 -Route114_FishingMonsInfo: - .4byte 30 @ encounter rate - .4byte Route114_FishingMons - - .align 2 -Route115_LandMons: - wild_mon SWABLU, 23 - wild_mon TAILLOW, 23 - wild_mon SWABLU, 25 - wild_mon TAILLOW, 24 - wild_mon TAILLOW, 25 - wild_mon SWELLOW, 25 - wild_mon JIGGLYPUFF, 24 - wild_mon JIGGLYPUFF, 25 - wild_mon WINGULL, 24 - wild_mon WINGULL, 24 - wild_mon WINGULL, 26 - wild_mon WINGULL, 25 - - .align 2 -Route115_LandMonsInfo: - .4byte 20 @ encounter rate - .4byte Route115_LandMons - - .align 2 -Route115_WaterMons: - wild_mon TENTACOOL, 5, 35 - wild_mon WINGULL, 10, 30 - wild_mon WINGULL, 15, 25 - wild_mon PELIPPER, 25, 30 - wild_mon PELIPPER, 25, 30 - - .align 2 -Route115_WaterMonsInfo: - .4byte 4 @ encounter rate - .4byte Route115_WaterMons - - .align 2 -Route115_FishingMons: - wild_mon MAGIKARP, 5, 10 - wild_mon TENTACOOL, 5, 10 - wild_mon MAGIKARP, 10, 30 - wild_mon TENTACOOL, 10, 30 - wild_mon WAILMER, 10, 30 - wild_mon WAILMER, 25, 30 - wild_mon WAILMER, 30, 35 - wild_mon WAILMER, 20, 25 - wild_mon WAILMER, 35, 40 - wild_mon WAILMER, 40, 45 - - .align 2 -Route115_FishingMonsInfo: - .4byte 30 @ encounter rate - .4byte Route115_FishingMons - - .align 2 -Route116_LandMons: - wild_mon ZIGZAGOON, 6 - wild_mon WHISMUR, 6 - wild_mon NINCADA, 6 - wild_mon WHISMUR, 7 - wild_mon NINCADA, 7 - wild_mon TAILLOW, 6 - wild_mon TAILLOW, 7 - wild_mon TAILLOW, 8 - wild_mon ZIGZAGOON, 7 - wild_mon ZIGZAGOON, 8 - wild_mon SKITTY, 7 - wild_mon SKITTY, 8 - - .align 2 -Route116_LandMonsInfo: - .4byte 20 @ encounter rate - .4byte Route116_LandMons - - .align 2 -Route117_LandMons: - wild_mon ZIGZAGOON, 13 - wild_mon ROSELIA, 13 - wild_mon ZIGZAGOON, 14 - wild_mon ROSELIA, 14 - wild_mon MARILL, 13 - wild_mon ODDISH, 13 - wild_mon ILLUMISE_VOLBEAT, 13 - wild_mon ILLUMISE_VOLBEAT, 13 - wild_mon ILLUMISE_VOLBEAT, 14 - wild_mon ILLUMISE_VOLBEAT, 14 - wild_mon VOLBEAT_ILLUMISE, 13 - wild_mon SURSKIT, 13 - - .align 2 -Route117_LandMonsInfo: - .4byte 20 @ encounter rate - .4byte Route117_LandMons - - .align 2 -Route117_WaterMons: - wild_mon MARILL, 20, 30 - wild_mon MARILL, 10, 20 - wild_mon MARILL, 30, 35 - wild_mon MARILL, 5, 10 - wild_mon SURSKIT, 20, 30 - - .align 2 -Route117_WaterMonsInfo: - .4byte 4 @ encounter rate - .4byte Route117_WaterMons - - .align 2 -Route117_FishingMons: - wild_mon MAGIKARP, 5, 10 - wild_mon GOLDEEN, 5, 10 - wild_mon MAGIKARP, 10, 30 - wild_mon GOLDEEN, 10, 30 - wild_mon CORPHISH, 10, 30 - wild_mon CORPHISH, 25, 30 - wild_mon CORPHISH, 30, 35 - wild_mon CORPHISH, 20, 25 - wild_mon CORPHISH, 35, 40 - wild_mon CORPHISH, 40, 45 - - .align 2 -Route117_FishingMonsInfo: - .4byte 30 @ encounter rate - .4byte Route117_FishingMons - - .align 2 -Route118_LandMons: - wild_mon ZIGZAGOON, 24 - wild_mon ELECTRIKE, 24 - wild_mon ZIGZAGOON, 26 - wild_mon ELECTRIKE, 26 - wild_mon LINOONE, 26 - wild_mon MANECTRIC, 26 - wild_mon WINGULL, 25 - wild_mon WINGULL, 25 - wild_mon WINGULL, 26 - wild_mon WINGULL, 26 - wild_mon WINGULL, 27 - wild_mon KECLEON, 25 - - .align 2 -Route118_LandMonsInfo: - .4byte 20 @ encounter rate - .4byte Route118_LandMons - - .align 2 -Route118_WaterMons: - wild_mon TENTACOOL, 5, 35 - wild_mon WINGULL, 10, 30 - wild_mon WINGULL, 15, 25 - wild_mon PELIPPER, 25, 30 - wild_mon PELIPPER, 25, 30 - - .align 2 -Route118_WaterMonsInfo: - .4byte 4 @ encounter rate - .4byte Route118_WaterMons - - .align 2 -Route118_FishingMons: - wild_mon MAGIKARP, 5, 10 - wild_mon TENTACOOL, 5, 10 - wild_mon MAGIKARP, 10, 30 - wild_mon TENTACOOL, 10, 30 - wild_mon CARVANHA, 10, 30 - wild_mon SHARPEDO, 30, 35 - wild_mon CARVANHA, 30, 35 - wild_mon CARVANHA, 20, 25 - wild_mon CARVANHA, 35, 40 - wild_mon CARVANHA, 40, 45 - - .align 2 -Route118_FishingMonsInfo: - .4byte 30 @ encounter rate - .4byte Route118_FishingMons - - .align 2 -Route119_LandMons: - wild_mon ZIGZAGOON, 25 - wild_mon LINOONE, 25 - wild_mon ZIGZAGOON, 27 - wild_mon ODDISH, 25 - wild_mon LINOONE, 27 - wild_mon ODDISH, 26 - wild_mon ODDISH, 27 - wild_mon ODDISH, 24 - wild_mon TROPIUS, 25 - wild_mon TROPIUS, 26 - wild_mon TROPIUS, 27 - wild_mon KECLEON, 25 - - .align 2 -Route119_LandMonsInfo: - .4byte 15 @ encounter rate - .4byte Route119_LandMons - - .align 2 -Route119_WaterMons: - wild_mon TENTACOOL, 5, 35 - wild_mon WINGULL, 10, 30 - wild_mon WINGULL, 15, 25 - wild_mon PELIPPER, 25, 30 - wild_mon PELIPPER, 25, 30 - - .align 2 -Route119_WaterMonsInfo: - .4byte 4 @ encounter rate - .4byte Route119_WaterMons - - .align 2 -Route119_FishingMons: - wild_mon MAGIKARP, 5, 10 - wild_mon TENTACOOL, 5, 10 - wild_mon MAGIKARP, 10, 30 - wild_mon TENTACOOL, 10, 30 - wild_mon CARVANHA, 10, 30 - wild_mon CARVANHA, 25, 30 - wild_mon CARVANHA, 30, 35 - wild_mon CARVANHA, 20, 25 - wild_mon CARVANHA, 35, 40 - wild_mon CARVANHA, 40, 45 - - .align 2 -Route119_FishingMonsInfo: - .4byte 30 @ encounter rate - .4byte Route119_FishingMons - - .align 2 -Route120_LandMons: - wild_mon ZIGZAGOON, 25 - wild_mon LINOONE, 25 - wild_mon LINOONE, 27 - wild_mon ODDISH, 25 - wild_mon MARILL, 25 - wild_mon ODDISH, 26 - wild_mon ODDISH, 27 - wild_mon MARILL, 27 - wild_mon ABSOL, 25 - wild_mon ABSOL, 27 - wild_mon KECLEON, 25 - wild_mon SURSKIT, 25 - - .align 2 -Route120_LandMonsInfo: - .4byte 20 @ encounter rate - .4byte Route120_LandMons - - .align 2 -Route120_WaterMons: - wild_mon MARILL, 20, 30 - wild_mon MARILL, 10, 20 - wild_mon MARILL, 30, 35 - wild_mon MARILL, 5, 10 - wild_mon SURSKIT, 20, 30 - - .align 2 -Route120_WaterMonsInfo: - .4byte 4 @ encounter rate - .4byte Route120_WaterMons - - .align 2 -Route120_FishingMons: - wild_mon MAGIKARP, 5, 10 - wild_mon GOLDEEN, 5, 10 - wild_mon MAGIKARP, 10, 30 - wild_mon GOLDEEN, 10, 30 - wild_mon BARBOACH, 10, 30 - wild_mon BARBOACH, 25, 30 - wild_mon BARBOACH, 30, 35 - wild_mon BARBOACH, 20, 25 - wild_mon BARBOACH, 35, 40 - wild_mon BARBOACH, 40, 45 - - .align 2 -Route120_FishingMonsInfo: - .4byte 30 @ encounter rate - .4byte Route120_FishingMons - - .align 2 -Route121_LandMons: - wild_mon ZIGZAGOON, 26 - wild_mon DUSKULL_SHUPPET, 26 - wild_mon LINOONE, 26 - wild_mon DUSKULL_SHUPPET, 28 - wild_mon LINOONE, 28 - wild_mon ODDISH, 26 - wild_mon ODDISH, 28 - wild_mon GLOOM, 28 - wild_mon WINGULL, 26 - wild_mon WINGULL, 27 - wild_mon WINGULL, 28 - wild_mon KECLEON, 25 - - .align 2 -Route121_LandMonsInfo: - .4byte 20 @ encounter rate - .4byte Route121_LandMons - - .align 2 -Route121_WaterMons: - wild_mon TENTACOOL, 5, 35 - wild_mon WINGULL, 10, 30 - wild_mon WINGULL, 15, 25 - wild_mon PELIPPER, 25, 30 - wild_mon PELIPPER, 25, 30 - - .align 2 -Route121_WaterMonsInfo: - .4byte 4 @ encounter rate - .4byte Route121_WaterMons - - .align 2 -Route121_FishingMons: - wild_mon MAGIKARP, 5, 10 - wild_mon TENTACOOL, 5, 10 - wild_mon MAGIKARP, 10, 30 - wild_mon TENTACOOL, 10, 30 - wild_mon WAILMER, 10, 30 - wild_mon WAILMER, 25, 30 - wild_mon WAILMER, 30, 35 - wild_mon WAILMER, 20, 25 - wild_mon WAILMER, 35, 40 - wild_mon WAILMER, 40, 45 - - .align 2 -Route121_FishingMonsInfo: - .4byte 30 @ encounter rate - .4byte Route121_FishingMons - - .align 2 -Route122_WaterMons: - wild_mon TENTACOOL, 5, 35 - wild_mon WINGULL, 10, 30 - wild_mon WINGULL, 15, 25 - wild_mon PELIPPER, 25, 30 - wild_mon PELIPPER, 25, 30 - - .align 2 -Route122_WaterMonsInfo: - .4byte 4 @ encounter rate - .4byte Route122_WaterMons - - .align 2 -Route122_FishingMons: - wild_mon MAGIKARP, 5, 10 - wild_mon TENTACOOL, 5, 10 - wild_mon MAGIKARP, 10, 30 - wild_mon TENTACOOL, 10, 30 - wild_mon WAILMER, 10, 30 - wild_mon SHARPEDO, 30, 35 - wild_mon WAILMER, 30, 35 - wild_mon WAILMER, 25, 30 - wild_mon WAILMER, 35, 40 - wild_mon WAILMER, 40, 45 - - .align 2 -Route122_FishingMonsInfo: - .4byte 30 @ encounter rate - .4byte Route122_FishingMons - - .align 2 -Route123_LandMons: - wild_mon ZIGZAGOON, 26 - wild_mon DUSKULL_SHUPPET, 26 - wild_mon LINOONE, 26 - wild_mon DUSKULL_SHUPPET, 28 - wild_mon LINOONE, 28 - wild_mon ODDISH, 26 - wild_mon ODDISH, 28 - wild_mon GLOOM, 28 - wild_mon WINGULL, 26 - wild_mon WINGULL, 27 - wild_mon WINGULL, 28 - wild_mon KECLEON, 25 - - .align 2 -Route123_LandMonsInfo: - .4byte 20 @ encounter rate - .4byte Route123_LandMons - - .align 2 -Route123_WaterMons: - wild_mon TENTACOOL, 5, 35 - wild_mon WINGULL, 10, 30 - wild_mon WINGULL, 15, 25 - wild_mon PELIPPER, 25, 30 - wild_mon PELIPPER, 25, 30 - - .align 2 -Route123_WaterMonsInfo: - .4byte 4 @ encounter rate - .4byte Route123_WaterMons - - .align 2 -Route123_FishingMons: - wild_mon MAGIKARP, 5, 10 - wild_mon TENTACOOL, 5, 10 - wild_mon MAGIKARP, 10, 30 - wild_mon TENTACOOL, 10, 30 - wild_mon WAILMER, 10, 30 - wild_mon WAILMER, 25, 30 - wild_mon WAILMER, 30, 35 - wild_mon WAILMER, 20, 25 - wild_mon WAILMER, 35, 40 - wild_mon WAILMER, 40, 45 - - .align 2 -Route123_FishingMonsInfo: - .4byte 30 @ encounter rate - .4byte Route123_FishingMons - - .align 2 -Route124_WaterMons: - wild_mon TENTACOOL, 5, 35 - wild_mon WINGULL, 10, 30 - wild_mon WINGULL, 15, 25 - wild_mon PELIPPER, 25, 30 - wild_mon PELIPPER, 25, 30 - - .align 2 -Route124_WaterMonsInfo: - .4byte 4 @ encounter rate - .4byte Route124_WaterMons - - .align 2 -Route124_FishingMons: - wild_mon MAGIKARP, 5, 10 - wild_mon TENTACOOL, 5, 10 - wild_mon MAGIKARP, 10, 30 - wild_mon TENTACOOL, 10, 30 - wild_mon WAILMER, 10, 30 - wild_mon SHARPEDO, 30, 35 - wild_mon WAILMER, 30, 35 - wild_mon WAILMER, 25, 30 - wild_mon WAILMER, 35, 40 - wild_mon WAILMER, 40, 45 - - .align 2 -Route124_FishingMonsInfo: - .4byte 30 @ encounter rate - .4byte Route124_FishingMons - - .align 2 -Route125_WaterMons: - wild_mon TENTACOOL, 5, 35 - wild_mon WINGULL, 10, 30 - wild_mon WINGULL, 15, 25 - wild_mon PELIPPER, 25, 30 - wild_mon PELIPPER, 25, 30 - - .align 2 -Route125_WaterMonsInfo: - .4byte 4 @ encounter rate - .4byte Route125_WaterMons - - .align 2 -Route125_FishingMons: - wild_mon MAGIKARP, 5, 10 - wild_mon TENTACOOL, 5, 10 - wild_mon MAGIKARP, 10, 30 - wild_mon TENTACOOL, 10, 30 - wild_mon WAILMER, 10, 30 - wild_mon SHARPEDO, 30, 35 - wild_mon WAILMER, 30, 35 - wild_mon WAILMER, 25, 30 - wild_mon WAILMER, 35, 40 - wild_mon WAILMER, 40, 45 - - .align 2 -Route125_FishingMonsInfo: - .4byte 30 @ encounter rate - .4byte Route125_FishingMons - - .align 2 -Route126_WaterMons: - wild_mon TENTACOOL, 5, 35 - wild_mon WINGULL, 10, 30 - wild_mon WINGULL, 15, 25 - wild_mon PELIPPER, 25, 30 - wild_mon PELIPPER, 25, 30 - - .align 2 -Route126_WaterMonsInfo: - .4byte 4 @ encounter rate - .4byte Route126_WaterMons - - .align 2 -Route126_FishingMons: - wild_mon MAGIKARP, 5, 10 - wild_mon TENTACOOL, 5, 10 - wild_mon MAGIKARP, 10, 30 - wild_mon TENTACOOL, 10, 30 - wild_mon WAILMER, 10, 30 - wild_mon SHARPEDO, 30, 35 - wild_mon WAILMER, 30, 35 - wild_mon WAILMER, 25, 30 - wild_mon WAILMER, 35, 40 - wild_mon WAILMER, 40, 45 - - .align 2 -Route126_FishingMonsInfo: - .4byte 30 @ encounter rate - .4byte Route126_FishingMons - - .align 2 -Route127_WaterMons: - wild_mon TENTACOOL, 5, 35 - wild_mon WINGULL, 10, 30 - wild_mon WINGULL, 15, 25 - wild_mon PELIPPER, 25, 30 - wild_mon PELIPPER, 25, 30 - - .align 2 -Route127_WaterMonsInfo: - .4byte 4 @ encounter rate - .4byte Route127_WaterMons - - .align 2 -Route127_FishingMons: - wild_mon MAGIKARP, 5, 10 - wild_mon TENTACOOL, 5, 10 - wild_mon MAGIKARP, 10, 30 - wild_mon TENTACOOL, 10, 30 - wild_mon WAILMER, 10, 30 - wild_mon SHARPEDO, 30, 35 - wild_mon WAILMER, 30, 35 - wild_mon WAILMER, 25, 30 - wild_mon WAILMER, 35, 40 - wild_mon WAILMER, 40, 45 - - .align 2 -Route127_FishingMonsInfo: - .4byte 30 @ encounter rate - .4byte Route127_FishingMons - - .align 2 -Route128_WaterMons: - wild_mon TENTACOOL, 5, 35 - wild_mon WINGULL, 10, 30 - wild_mon WINGULL, 15, 25 - wild_mon PELIPPER, 25, 30 - wild_mon PELIPPER, 25, 30 - - .align 2 -Route128_WaterMonsInfo: - .4byte 4 @ encounter rate - .4byte Route128_WaterMons - - .align 2 -Route128_FishingMons: - wild_mon MAGIKARP, 5, 10 - wild_mon TENTACOOL, 5, 10 - wild_mon MAGIKARP, 10, 30 - wild_mon LUVDISC, 10, 30 - wild_mon WAILMER, 10, 30 - wild_mon LUVDISC, 30, 35 - wild_mon WAILMER, 30, 35 - wild_mon CORSOLA, 30, 35 - wild_mon WAILMER, 35, 40 - wild_mon WAILMER, 40, 45 - - .align 2 -Route128_FishingMonsInfo: - .4byte 30 @ encounter rate - .4byte Route128_FishingMons - - .align 2 -Route129_WaterMons: - wild_mon TENTACOOL, 5, 35 - wild_mon WINGULL, 10, 30 - wild_mon WINGULL, 15, 25 - wild_mon PELIPPER, 25, 30 - .ifdef SAPPHIRE - wild_mon WAILORD, 25, 30 - .else - wild_mon WAILORD, 35, 40 - .endif - - .align 2 -Route129_WaterMonsInfo: - .4byte 4 @ encounter rate - .4byte Route129_WaterMons - - .align 2 -Route129_FishingMons: - wild_mon MAGIKARP, 5, 10 - wild_mon TENTACOOL, 5, 10 - wild_mon MAGIKARP, 10, 30 - wild_mon TENTACOOL, 10, 30 - wild_mon WAILMER, 10, 30 - wild_mon SHARPEDO, 30, 35 - wild_mon WAILMER, 30, 35 - wild_mon WAILMER, 25, 30 - wild_mon WAILMER, 35, 40 - wild_mon WAILMER, 40, 45 - - .align 2 -Route129_FishingMonsInfo: - .4byte 30 @ encounter rate - .4byte Route129_FishingMons - - .align 2 -Route130_LandMons: - wild_mon WYNAUT, 30 - wild_mon WYNAUT, 35 - wild_mon WYNAUT, 25 - wild_mon WYNAUT, 40 - wild_mon WYNAUT, 20 - wild_mon WYNAUT, 45 - wild_mon WYNAUT, 15 - wild_mon WYNAUT, 50 - wild_mon WYNAUT, 10 - wild_mon WYNAUT, 5 - wild_mon WYNAUT, 10 - wild_mon WYNAUT, 5 - - .align 2 -Route130_LandMonsInfo: - .4byte 20 @ encounter rate - .4byte Route130_LandMons - - .align 2 -Route130_WaterMons: - wild_mon TENTACOOL, 5, 35 - wild_mon WINGULL, 10, 30 - wild_mon WINGULL, 15, 25 - wild_mon PELIPPER, 25, 30 - wild_mon PELIPPER, 25, 30 - - .align 2 -Route130_WaterMonsInfo: - .4byte 4 @ encounter rate - .4byte Route130_WaterMons - - .align 2 -Route130_FishingMons: - wild_mon MAGIKARP, 5, 10 - wild_mon TENTACOOL, 5, 10 - wild_mon MAGIKARP, 10, 30 - wild_mon TENTACOOL, 10, 30 - wild_mon WAILMER, 10, 30 - wild_mon SHARPEDO, 30, 35 - wild_mon WAILMER, 30, 35 - wild_mon WAILMER, 25, 30 - wild_mon WAILMER, 35, 40 - wild_mon WAILMER, 40, 45 - - .align 2 -Route130_FishingMonsInfo: - .4byte 30 @ encounter rate - .4byte Route130_FishingMons - - .align 2 -Route131_WaterMons: - wild_mon TENTACOOL, 5, 35 - wild_mon WINGULL, 10, 30 - wild_mon WINGULL, 15, 25 - wild_mon PELIPPER, 25, 30 - wild_mon PELIPPER, 25, 30 - - .align 2 -Route131_WaterMonsInfo: - .4byte 4 @ encounter rate - .4byte Route131_WaterMons - - .align 2 -Route131_FishingMons: - wild_mon MAGIKARP, 5, 10 - wild_mon TENTACOOL, 5, 10 - wild_mon MAGIKARP, 10, 30 - wild_mon TENTACOOL, 10, 30 - wild_mon WAILMER, 10, 30 - wild_mon SHARPEDO, 30, 35 - wild_mon WAILMER, 30, 35 - wild_mon WAILMER, 25, 30 - wild_mon WAILMER, 35, 40 - wild_mon WAILMER, 40, 45 - - .align 2 -Route131_FishingMonsInfo: - .4byte 30 @ encounter rate - .4byte Route131_FishingMons - - .align 2 -Route132_WaterMons: - wild_mon TENTACOOL, 5, 35 - wild_mon WINGULL, 10, 30 - wild_mon WINGULL, 15, 25 - wild_mon PELIPPER, 25, 30 - wild_mon PELIPPER, 25, 30 - - .align 2 -Route132_WaterMonsInfo: - .4byte 4 @ encounter rate - .4byte Route132_WaterMons - - .align 2 -Route132_FishingMons: - wild_mon MAGIKARP, 5, 10 - wild_mon TENTACOOL, 5, 10 - wild_mon MAGIKARP, 10, 30 - wild_mon TENTACOOL, 10, 30 - wild_mon WAILMER, 10, 30 - wild_mon SHARPEDO, 30, 35 - wild_mon WAILMER, 30, 35 - wild_mon HORSEA, 25, 30 - wild_mon WAILMER, 35, 40 - wild_mon WAILMER, 40, 45 - - .align 2 -Route132_FishingMonsInfo: - .4byte 30 @ encounter rate - .4byte Route132_FishingMons - - .align 2 -Route133_WaterMons: - wild_mon TENTACOOL, 5, 35 - wild_mon WINGULL, 10, 30 - wild_mon WINGULL, 15, 25 - wild_mon PELIPPER, 25, 30 - wild_mon PELIPPER, 25, 30 - - .align 2 -Route133_WaterMonsInfo: - .4byte 4 @ encounter rate - .4byte Route133_WaterMons - - .align 2 -Route133_FishingMons: - wild_mon MAGIKARP, 5, 10 - wild_mon TENTACOOL, 5, 10 - wild_mon MAGIKARP, 10, 30 - wild_mon TENTACOOL, 10, 30 - wild_mon WAILMER, 10, 30 - wild_mon SHARPEDO, 30, 35 - wild_mon WAILMER, 30, 35 - wild_mon HORSEA, 25, 30 - wild_mon WAILMER, 35, 40 - wild_mon WAILMER, 40, 45 - - .align 2 -Route133_FishingMonsInfo: - .4byte 30 @ encounter rate - .4byte Route133_FishingMons - - .align 2 -Route134_WaterMons: - wild_mon TENTACOOL, 5, 35 - wild_mon WINGULL, 10, 30 - wild_mon WINGULL, 15, 25 - wild_mon PELIPPER, 25, 30 - wild_mon PELIPPER, 25, 30 - - .align 2 -Route134_WaterMonsInfo: - .4byte 4 @ encounter rate - .4byte Route134_WaterMons - - .align 2 -Route134_FishingMons: - wild_mon MAGIKARP, 5, 10 - wild_mon TENTACOOL, 5, 10 - wild_mon MAGIKARP, 10, 30 - wild_mon TENTACOOL, 10, 30 - wild_mon WAILMER, 10, 30 - wild_mon SHARPEDO, 30, 35 - wild_mon WAILMER, 30, 35 - wild_mon HORSEA, 25, 30 - wild_mon WAILMER, 35, 40 - wild_mon WAILMER, 40, 45 - - .align 2 -Route134_FishingMonsInfo: - .4byte 30 @ encounter rate - .4byte Route134_FishingMons - - .align 2 -SafariZone_Northwest_LandMons: - wild_mon RHYHORN, 27 - wild_mon ODDISH, 27 - wild_mon RHYHORN, 29 - wild_mon ODDISH, 29 - wild_mon DODUO, 27 - wild_mon GLOOM, 29 - wild_mon GLOOM, 31 - wild_mon DODUO, 29 - wild_mon DODRIO, 29 - wild_mon PINSIR, 27 - wild_mon DODRIO, 31 - wild_mon PINSIR, 29 - - .align 2 -SafariZone_Northwest_LandMonsInfo: - .4byte 25 @ encounter rate - .4byte SafariZone_Northwest_LandMons - - .align 2 -SafariZone_Northwest_WaterMons: - wild_mon PSYDUCK, 20, 30 - wild_mon PSYDUCK, 20, 30 - wild_mon PSYDUCK, 30, 35 - wild_mon GOLDUCK, 30, 35 - wild_mon GOLDUCK, 25, 40 - - .align 2 -SafariZone_Northwest_WaterMonsInfo: - .4byte 9 @ encounter rate - .4byte SafariZone_Northwest_WaterMons - - .align 2 -SafariZone_Northwest_FishingMons: - wild_mon MAGIKARP, 5, 10 - wild_mon GOLDEEN, 5, 10 - wild_mon MAGIKARP, 10, 30 - wild_mon GOLDEEN, 10, 25 - wild_mon GOLDEEN, 10, 30 - wild_mon GOLDEEN, 25, 30 - wild_mon GOLDEEN, 30, 35 - wild_mon SEAKING, 30, 35 - wild_mon SEAKING, 35, 40 - wild_mon SEAKING, 25, 30 - - .align 2 -SafariZone_Northwest_FishingMonsInfo: - .4byte 35 @ encounter rate - .4byte SafariZone_Northwest_FishingMons - - .align 2 -SafariZone_Northeast_LandMons: - wild_mon PHANPY, 27 - wild_mon ODDISH, 27 - wild_mon PHANPY, 29 - wild_mon ODDISH, 29 - wild_mon NATU, 27 - wild_mon GLOOM, 29 - wild_mon GLOOM, 31 - wild_mon NATU, 29 - wild_mon XATU, 29 - wild_mon HERACROSS, 27 - wild_mon XATU, 31 - wild_mon HERACROSS, 29 - - .align 2 -SafariZone_Northeast_LandMonsInfo: - .4byte 25 @ encounter rate - .4byte SafariZone_Northeast_LandMons - - .align 2 -SafariZone_Northeast_RockSmashMons: - wild_mon GEODUDE, 10, 15 - wild_mon GEODUDE, 5, 10 - wild_mon GEODUDE, 15, 20 - wild_mon GEODUDE, 20, 25 - wild_mon GEODUDE, 25, 30 - - .align 2 -SafariZone_Northeast_RockSmashMonsInfo: - .4byte 25 @ encounter rate - .4byte SafariZone_Northeast_RockSmashMons - - .align 2 -SafariZone_Southwest_LandMons: - wild_mon ODDISH, 25 - wild_mon ODDISH, 27 - wild_mon GIRAFARIG, 25 - wild_mon GIRAFARIG, 27 - wild_mon NATU, 25 - .ifdef SAPPHIRE - wild_mon DODUO, 27 - .else - wild_mon DODUO, 25 - .endif - wild_mon GLOOM, 25 - wild_mon WOBBUFFET, 27 - wild_mon PIKACHU, 25 - wild_mon WOBBUFFET, 27 - wild_mon PIKACHU, 27 - wild_mon WOBBUFFET, 29 - - .align 2 -SafariZone_Southwest_LandMonsInfo: - .4byte 25 @ encounter rate - .4byte SafariZone_Southwest_LandMons - - .align 2 -SafariZone_Southwest_WaterMons: - wild_mon PSYDUCK, 20, 30 - wild_mon PSYDUCK, 20, 30 - wild_mon PSYDUCK, 30, 35 - wild_mon PSYDUCK, 30, 35 - wild_mon PSYDUCK, 30, 35 - - .align 2 -SafariZone_Southwest_WaterMonsInfo: - .4byte 9 @ encounter rate - .4byte SafariZone_Southwest_WaterMons - - .align 2 -SafariZone_Southwest_FishingMons: - wild_mon MAGIKARP, 5, 10 - wild_mon GOLDEEN, 5, 10 - wild_mon MAGIKARP, 10, 30 - wild_mon GOLDEEN, 10, 25 - wild_mon GOLDEEN, 10, 30 - wild_mon GOLDEEN, 25, 30 - wild_mon GOLDEEN, 30, 35 - wild_mon SEAKING, 30, 35 - wild_mon SEAKING, 35, 40 - wild_mon SEAKING, 25, 30 - - .align 2 -SafariZone_Southwest_FishingMonsInfo: - .4byte 35 @ encounter rate - .4byte SafariZone_Southwest_FishingMons - - .align 2 -SafariZone_Southeast_LandMons: - wild_mon ODDISH, 25 - wild_mon ODDISH, 27 - wild_mon GIRAFARIG, 25 - wild_mon GIRAFARIG, 27 - wild_mon NATU, 25 - wild_mon DODUO, 25 - wild_mon GLOOM, 25 - wild_mon WOBBUFFET, 27 - wild_mon PIKACHU, 25 - wild_mon WOBBUFFET, 27 - wild_mon PIKACHU, 27 - wild_mon WOBBUFFET, 29 - - .align 2 -SafariZone_Southeast_LandMonsInfo: - .4byte 25 @ encounter rate - .4byte SafariZone_Southeast_LandMons - - .align 2 -DewfordTown_WaterMons: - wild_mon TENTACOOL, 5, 35 - wild_mon WINGULL, 10, 30 - wild_mon WINGULL, 15, 25 - wild_mon PELIPPER, 25, 30 - wild_mon PELIPPER, 25, 30 - - .align 2 -DewfordTown_WaterMonsInfo: - .4byte 4 @ encounter rate - .4byte DewfordTown_WaterMons - - .align 2 -DewfordTown_FishingMons: - wild_mon MAGIKARP, 5, 10 - wild_mon TENTACOOL, 5, 10 - wild_mon MAGIKARP, 10, 30 - wild_mon TENTACOOL, 10, 30 - wild_mon WAILMER, 10, 30 - wild_mon WAILMER, 25, 30 - wild_mon WAILMER, 30, 35 - wild_mon WAILMER, 20, 25 - wild_mon WAILMER, 35, 40 - wild_mon WAILMER, 40, 45 - - .align 2 -DewfordTown_FishingMonsInfo: - .4byte 10 @ encounter rate - .4byte DewfordTown_FishingMons - - .align 2 -PacifidlogTown_WaterMons: - wild_mon TENTACOOL, 5, 35 - wild_mon WINGULL, 10, 30 - wild_mon WINGULL, 15, 25 - wild_mon PELIPPER, 25, 30 - wild_mon PELIPPER, 25, 30 - - .align 2 -PacifidlogTown_WaterMonsInfo: - .4byte 4 @ encounter rate - .4byte PacifidlogTown_WaterMons - - .align 2 -PacifidlogTown_FishingMons: - wild_mon MAGIKARP, 5, 10 - wild_mon TENTACOOL, 5, 10 - wild_mon MAGIKARP, 10, 30 - wild_mon TENTACOOL, 10, 30 - wild_mon WAILMER, 10, 30 - wild_mon SHARPEDO, 30, 35 - wild_mon WAILMER, 30, 35 - wild_mon WAILMER, 25, 30 - wild_mon WAILMER, 35, 40 - wild_mon WAILMER, 40, 45 - - .align 2 -PacifidlogTown_FishingMonsInfo: - .4byte 10 @ encounter rate - .4byte PacifidlogTown_FishingMons - - .align 2 -Underwater1_WaterMons: - wild_mon CLAMPERL, 20, 30 - wild_mon CHINCHOU, 20, 30 - wild_mon CLAMPERL, 30, 35 - wild_mon RELICANTH, 30, 35 - wild_mon RELICANTH, 30, 35 - - .align 2 -Underwater1_WaterMonsInfo: - .4byte 4 @ encounter rate - .4byte Underwater1_WaterMons - - .align 2 -Underwater2_WaterMons: - wild_mon CLAMPERL, 20, 30 - wild_mon CHINCHOU, 20, 30 - wild_mon CLAMPERL, 30, 35 - wild_mon RELICANTH, 30, 35 - wild_mon RELICANTH, 30, 35 - - .align 2 -Underwater2_WaterMonsInfo: - .4byte 4 @ encounter rate - .4byte Underwater2_WaterMons .align 2 gWildMonHeaders:: |