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

Merge remote-tracking branch 'upstream/master' into shop

Browse Source 
# Conflicts:
#	asm/shop.s
This commit is contained in:
Marcus Huderle
2018-10-13 10:22:58 -05:00
parent fa9d1759bd a2a6700966
commit b24559d69b
3192 changed files with 42738 additions and 556806 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1665
data/anim_mon_front_pics.s
View File

File diff suppressed because it is too large Load Diff

178
data/battle_ai_scripts.s
View File

@@ -13,8 +13,8 @@
.align 2
gBattleAI_ScriptsTable:: @ 82DBEF8
.4byte AI_CheckBadMove
.4byte AI_CheckViability
.4byte AI_TryToFaint
.4byte AI_CheckViability
.4byte AI_SetupFirstTurn
.4byte AI_Risky
.4byte AI_PreferStrongestMove
@@ -47,12 +47,12 @@ gBattleAI_ScriptsTable:: @ 82DBEF8
AI_CheckBadMove:
if_target_is_ally AI_Ret
if_move MOVE_FISSURE, BattleAIScript_82DBF92
if_move MOVE_HORN_DRILL, BattleAIScript_82DBF92
if_move MOVE_FISSURE, AI_CBM_CheckIfNegatesType
if_move MOVE_HORN_DRILL, AI_CBM_CheckIfNegatesType
get_how_powerful_move_is
if_equal 0, AI_CheckBadMove_CheckSoundproof
BattleAIScript_82DBF92: @ 82DBF92
AI_CBM_CheckIfNegatesType: @ 82DBF92
if_type_effectiveness AI_EFFECTIVENESS_x0, Score_Minus10
get_ability AI_TARGET
if_equal ABILITY_VOLT_ABSORB, CheckIfVoltAbsorbCancelsElectric
@@ -60,32 +60,32 @@ BattleAIScript_82DBF92: @ 82DBF92
if_equal ABILITY_FLASH_FIRE, CheckIfFlashFireCancelsFire
if_equal ABILITY_WONDER_GUARD, CheckIfWonderGuardCancelsMove
if_equal ABILITY_LEVITATE, CheckIfLevitateCancelsGroundMove
goto BattleAIScript_82DBFF7
goto AI_CheckBadMove_CheckSoundproof_
CheckIfVoltAbsorbCancelsElectric: @ 82DBFBD
get_curr_move_type
if_equal_ TYPE_ELECTRIC, Score_Minus12
goto BattleAIScript_82DBFF7
goto AI_CheckBadMove_CheckSoundproof_
CheckIfWaterAbsorbCancelsWater: @ 82DBFCA
get_curr_move_type
if_equal_ TYPE_WATER, Score_Minus12
goto BattleAIScript_82DBFF7
goto AI_CheckBadMove_CheckSoundproof_
CheckIfFlashFireCancelsFire: @ 82DBFD7
get_curr_move_type
if_equal_ TYPE_FIRE, Score_Minus12
goto BattleAIScript_82DBFF7
goto AI_CheckBadMove_CheckSoundproof_
CheckIfWonderGuardCancelsMove: @ 82DBFE4
if_type_effectiveness AI_EFFECTIVENESS_x2, BattleAIScript_82DBFF7
if_type_effectiveness AI_EFFECTIVENESS_x2, AI_CheckBadMove_CheckSoundproof_
goto Score_Minus10
CheckIfLevitateCancelsGroundMove: @ 82DBFEF
get_curr_move_type
if_equal_ TYPE_GROUND, Score_Minus10
BattleAIScript_82DBFF7: @ 82DBFF7
AI_CheckBadMove_CheckSoundproof_: @ 82DBFF7
get_how_powerful_move_is
if_equal 0, AI_CheckBadMove_CheckSoundproof
@@ -654,7 +654,7 @@ Score_Plus10:
score +10
end
AI_TryToFaint:
AI_CheckViability:
if_target_is_ally AI_Ret
if_effect EFFECT_SLEEP, AI_CV_Sleep
if_effect EFFECT_ABSORB, AI_CV_Absorb
@@ -707,7 +707,7 @@ AI_TryToFaint:
if_effect EFFECT_REFLECT, AI_CV_Reflect
if_effect EFFECT_POISON, AI_CV_Poison
if_effect EFFECT_PARALYZE, AI_CV_Paralyze
if_effect EFFECT_SWAGGER, BattleAIScript_82DD286
if_effect EFFECT_SWAGGER, AI_CV_Swagger
if_effect EFFECT_SPEED_DOWN_HIT, AI_CV_SpeedDownFromChance
if_effect EFFECT_SKY_ATTACK, AI_CV_ChargeUpMove
if_effect EFFECT_VITAL_THROW, AI_CV_VitalThrow
@@ -1547,8 +1547,8 @@ AI_CV_HighCrit2:
AI_CV_HighCrit_End:
end
BattleAIScript_82DD286:
if_has_move AI_USER, MOVE_PSYCH_UP, BattleAIScript_82DD2B8
AI_CV_Swagger:
if_has_move AI_USER, MOVE_PSYCH_UP, AI_CV_SwaggerHasPsychUp
AI_CV_Flatter:
if_random_less_than 128, AI_CV_Confuse
@@ -1568,18 +1568,18 @@ AI_CV_Confuse2:
AI_CV_Confuse_End:
end
BattleAIScript_82DD2B8:
if_stat_level_more_than AI_TARGET, STAT_ATK, 3, BattleAIScript_82DD2D0
AI_CV_SwaggerHasPsychUp:
if_stat_level_more_than AI_TARGET, STAT_ATK, 3, AI_CV_SwaggerHasPsychUp_Minus5
score +3
get_turn_count
if_not_equal 0, BattleAIScript_82DD2D2
if_not_equal 0, AI_CV_SwaggerHasPsychUp_End
score +2
goto BattleAIScript_82DD2D2
goto AI_CV_SwaggerHasPsychUp_End
BattleAIScript_82DD2D0:
AI_CV_SwaggerHasPsychUp_Minus5:
score -5
BattleAIScript_82DD2D2:
AI_CV_SwaggerHasPsychUp_End:
end
AI_CV_Reflect:
@@ -1735,7 +1735,7 @@ AI_CV_Counter2:
score -1
AI_CV_Counter3:
if_has_move AI_USER, MOVE_MIRROR_COAT, BattleAIScript_82DD4CD
if_has_move AI_USER, MOVE_MIRROR_COAT, AI_CV_Counter7
get_last_used_bank_move AI_TARGET
get_move_power_from_result
if_equal 0, AI_CV_Counter5
@@ -1763,11 +1763,11 @@ AI_CV_Counter6:
if_in_bytes AI_CV_Counter_PhysicalTypeList, AI_CV_Counter_End
if_random_less_than 50, AI_CV_Counter_End
BattleAIScript_82DD4CD:
if_random_less_than 100, BattleAIScript_82DD4D5
AI_CV_Counter7:
if_random_less_than 100, AI_CV_Counter8
score +4
BattleAIScript_82DD4D5:
AI_CV_Counter8:
end
AI_CV_Counter_ScoreDown1:
@@ -2756,15 +2756,15 @@ AI_CV_DragonDance2:
AI_CV_DragonDance_End:
end
AI_CheckViability:
AI_TryToFaint:
if_target_is_ally AI_Ret
if_can_faint AI_TryToFaint_TryToEncourageQuickAttack
get_how_powerful_move_is
if_equal 1, Score_Minus1
if_type_effectiveness AI_EFFECTIVENESS_x4, BattleAIScript_82DDE57
if_equal MOVE_NOT_MOST_POWERFUL, Score_Minus1
if_type_effectiveness AI_EFFECTIVENESS_x4, AI_TryToFaint_DoubleSuperEffective
end
BattleAIScript_82DDE57:
AI_TryToFaint_DoubleSuperEffective:
if_random_less_than 80, AI_TryToFaint_End
score +2
end
@@ -2895,9 +2895,9 @@ AI_Risky_EffectsToEncourage:
AI_PreferBatonPass:
if_target_is_ally AI_Ret
count_usable_party_mons AI_USER
if_equal 0, BattleAIScript_82DDFB3
if_equal 0, AI_PreferBatonPassEnd
get_how_powerful_move_is
if_not_equal 0, BattleAIScript_82DDFB3
if_not_equal 0, AI_PreferBatonPassEnd
if_has_move_with_effect AI_USER, EFFECT_BATON_PASS, AI_PreferBatonPass_GoForBatonPass
if_random_less_than 80, AI_Risky_End
@@ -2906,7 +2906,7 @@ AI_PreferBatonPass_GoForBatonPass:
if_move MOVE_DRAGON_DANCE, AI_PreferBatonPass2
if_move MOVE_CALM_MIND, AI_PreferBatonPass2
if_effect EFFECT_PROTECT, AI_PreferBatonPass_End
if_move MOVE_BATON_PASS, BattleAIScript_82DDF7B
if_move MOVE_BATON_PASS, AI_PreferBatonPass_EncourageIfHighStats
if_random_less_than 20, AI_Risky_End
score +3
@@ -2918,16 +2918,16 @@ AI_PreferBatonPass2:
AI_PreferBatonPass_End:
get_last_used_bank_move AI_USER
if_in_hwords sMovesTable_82DDF75, Score_Minus2
if_in_hwords sMovesTable_ProtectMoves, Score_Minus2
score +2
end
sMovesTable_82DDF75:
sMovesTable_ProtectMoves:
.2byte MOVE_PROTECT
.2byte MOVE_DETECT
.2byte -1
BattleAIScript_82DDF7B:
AI_PreferBatonPass_EncourageIfHighStats:
get_turn_count
if_equal 0, Score_Minus2
if_stat_level_more_than AI_USER, STAT_ATK, 8, Score_Plus3
@@ -2938,39 +2938,39 @@ BattleAIScript_82DDF7B:
if_stat_level_more_than AI_USER, STAT_SPATK, 6, Score_Plus1
end
BattleAIScript_82DDFB3:
AI_PreferBatonPassEnd:
end
AI_DoubleBattle:
if_target_is_ally AI_TryOnAlly
if_move MOVE_SKILL_SWAP, BattleAIScript_82DE04B
if_move MOVE_SKILL_SWAP, AI_DoubleBattleSkillSwap
get_curr_move_type
if_move MOVE_EARTHQUAKE, BattleAIScript_82DE010
if_move MOVE_MAGNITUDE, BattleAIScript_82DE010
if_equal 13, BattleAIScript_82DE062
if_equal 10, BattleAIScript_82DE079
if_move MOVE_EARTHQUAKE, AI_DoubleBattleAllHittingGroundMove
if_move MOVE_MAGNITUDE, AI_DoubleBattleAllHittingGroundMove
if_equal TYPE_ELECTRIC, AI_DoubleBattleElectricMove
if_equal TYPE_FIRE, AI_DoubleBattleFireMove
get_ability AI_USER
if_not_equal ABILITY_GUTS, BattleAIScript_82DDFF5
if_has_move AI_USER_PARTNER, MOVE_HELPING_HAND, BattleAIScript_82DDFED
if_not_equal ABILITY_GUTS, AI_DoubleBattleCheckUserStatus
if_has_move AI_USER_PARTNER, MOVE_HELPING_HAND, AI_DoubleBattlePartnerHasHelpingHand
end
BattleAIScript_82DDFED:
AI_DoubleBattlePartnerHasHelpingHand:
get_how_powerful_move_is
if_not_equal 0, Score_Plus1
end
BattleAIScript_82DDFF5:
if_status AI_USER, STATUS1_ANY, BattleAIScript_82DE000
AI_DoubleBattleCheckUserStatus:
if_status AI_USER, STATUS1_ANY, AI_DoubleBattleCheckUserStatus2
end
BattleAIScript_82DE000:
AI_DoubleBattleCheckUserStatus2:
get_how_powerful_move_is
if_equal 0, Score_Minus5
if_equal MOVE_POWER_DISCOURAGED, Score_Minus5
score +1
if_equal 2, Score_Plus2
if_equal MOVE_MOST_POWERFUL, Score_Plus2
end
BattleAIScript_82DE010:
AI_DoubleBattleAllHittingGroundMove:
if_ability AI_USER_PARTNER, ABILITY_LEVITATE, Score_Plus2
if_type AI_USER_PARTNER, TYPE_FLYING, Score_Plus2
if_type AI_USER_PARTNER, TYPE_FIRE, Score_Minus10
@@ -2979,7 +2979,7 @@ BattleAIScript_82DE010:
if_type AI_USER_PARTNER, TYPE_ROCK, Score_Minus10
goto Score_Minus3
BattleAIScript_82DE04B:
AI_DoubleBattleSkillSwap:
get_ability AI_USER
if_equal ABILITY_TRUANT, Score_Plus5
get_ability AI_TARGET
@@ -2987,96 +2987,96 @@ BattleAIScript_82DE04B:
if_equal ABILITY_PURE_POWER, Score_Plus2
end
BattleAIScript_82DE062:
if_no_ability AI_TARGET_PARTNER, ABILITY_LIGHTNING_ROD, BattleAIScript_82DE078
AI_DoubleBattleElectricMove:
if_no_ability AI_TARGET_PARTNER, ABILITY_LIGHTNING_ROD, AI_DoubleBattleElectricMoveEnd
score -2
if_no_type AI_TARGET_PARTNER, TYPE_GROUND, BattleAIScript_82DE078
if_no_type AI_TARGET_PARTNER, TYPE_GROUND, AI_DoubleBattleElectricMoveEnd
score -8
BattleAIScript_82DE078:
AI_DoubleBattleElectricMoveEnd:
end
BattleAIScript_82DE079:
if_flash_fired AI_USER, BattleAIScript_82DE080
AI_DoubleBattleFireMove:
if_flash_fired AI_USER, AI_DoubleBattleFireMove2
end
BattleAIScript_82DE080:
AI_DoubleBattleFireMove2:
goto Score_Plus1
AI_TryOnAlly:
get_how_powerful_move_is
if_equal 0, BattleAIScript_82DE0B2
if_equal 0, AI_TryStatusMoveOnAlly
get_curr_move_type
if_equal TYPE_FIRE, BattleAIScript_82DE099
if_equal TYPE_FIRE, AI_TryFireMoveOnAlly
AI_DiscourageOnAlly:
goto Score_Minus30
BattleAIScript_82DE099:
if_ability AI_USER_PARTNER, ABILITY_FLASH_FIRE, BattleAIScript_82DE0A7
AI_TryFireMoveOnAlly:
if_ability AI_USER_PARTNER, ABILITY_FLASH_FIRE, AI_TryFireMoveOnAlly_FlashFire
goto AI_DiscourageOnAlly
BattleAIScript_82DE0A7:
AI_TryFireMoveOnAlly_FlashFire:
if_flash_fired AI_USER_PARTNER, AI_DiscourageOnAlly
goto Score_Plus3
BattleAIScript_82DE0B2:
if_move MOVE_SKILL_SWAP, BattleAIScript_82DE0DA
if_move MOVE_WILL_O_WISP, BattleAIScript_82DE14F
if_move MOVE_TOXIC, BattleAIScript_82DE14F
if_move MOVE_HELPING_HAND, BattleAIScript_82DE16D
if_move MOVE_SWAGGER, BattleAIScript_82DE178
AI_TryStatusMoveOnAlly:
if_move MOVE_SKILL_SWAP, AI_TrySkillSwapOnAlly
if_move MOVE_WILL_O_WISP, AI_TryStatusOnAlly
if_move MOVE_TOXIC, AI_TryStatusOnAlly
if_move MOVE_HELPING_HAND, AI_TryHelpingHandOnAlly
if_move MOVE_SWAGGER, AI_TrySwaggerOnAlly
goto Score_Minus30_
BattleAIScript_82DE0DA:
AI_TrySkillSwapOnAlly:
get_ability AI_TARGET
if_equal ABILITY_TRUANT, Score_Plus10
get_ability AI_USER
if_not_equal ABILITY_LEVITATE, BattleAIScript_82DE107
if_not_equal ABILITY_LEVITATE, AI_TrySkillSwapOnAlly2
get_ability AI_TARGET
if_equal ABILITY_LEVITATE, Score_Minus30_
get_target_type1
if_not_equal TYPE_ELECTRIC, BattleAIScript_82DE107
if_not_equal TYPE_ELECTRIC, AI_TrySkillSwapOnAlly2
score +1
get_target_type2
if_not_equal TYPE_ELECTRIC, BattleAIScript_82DE107
if_not_equal TYPE_ELECTRIC, AI_TrySkillSwapOnAlly2
score +1
end
BattleAIScript_82DE107:
if_not_equal 14, Score_Minus30_
if_has_move AI_USER_PARTNER, MOVE_FIRE_BLAST, BattleAIScript_82DE14A
if_has_move AI_USER_PARTNER, MOVE_THUNDER, BattleAIScript_82DE14A
if_has_move AI_USER_PARTNER, MOVE_CROSS_CHOP, BattleAIScript_82DE14A
if_has_move AI_USER_PARTNER, MOVE_HYDRO_PUMP, BattleAIScript_82DE14A
if_has_move AI_USER_PARTNER, MOVE_DYNAMIC_PUNCH, BattleAIScript_82DE14A
if_has_move AI_USER_PARTNER, MOVE_BLIZZARD, BattleAIScript_82DE14A
if_has_move AI_USER_PARTNER, MOVE_MEGAHORN, BattleAIScript_82DE14A
AI_TrySkillSwapOnAlly2:
if_not_equal ABILITY_COMPOUND_EYES, Score_Minus30_
if_has_move AI_USER_PARTNER, MOVE_FIRE_BLAST, AI_TrySkillSwapOnAllyPlus3
if_has_move AI_USER_PARTNER, MOVE_THUNDER, AI_TrySkillSwapOnAllyPlus3
if_has_move AI_USER_PARTNER, MOVE_CROSS_CHOP, AI_TrySkillSwapOnAllyPlus3
if_has_move AI_USER_PARTNER, MOVE_HYDRO_PUMP, AI_TrySkillSwapOnAllyPlus3
if_has_move AI_USER_PARTNER, MOVE_DYNAMIC_PUNCH, AI_TrySkillSwapOnAllyPlus3
if_has_move AI_USER_PARTNER, MOVE_BLIZZARD, AI_TrySkillSwapOnAllyPlus3
if_has_move AI_USER_PARTNER, MOVE_MEGAHORN, AI_TrySkillSwapOnAllyPlus3
goto Score_Minus30_
BattleAIScript_82DE14A:
AI_TrySkillSwapOnAllyPlus3:
goto Score_Plus3
BattleAIScript_82DE14F:
AI_TryStatusOnAlly:
get_ability AI_TARGET
if_not_equal ABILITY_GUTS, Score_Minus30_
if_status AI_TARGET, STATUS1_ANY, Score_Minus30_
if_hp_less_than AI_USER, 91, Score_Minus30_
goto Score_Plus5
BattleAIScript_82DE16D:
AI_TryHelpingHandOnAlly:
if_random_less_than 64, Score_Minus1
goto Score_Plus2
BattleAIScript_82DE178:
if_holds_item AI_TARGET, ITEM_PERSIM_BERRY, BattleAIScript_82DE185
AI_TrySwaggerOnAlly:
if_holds_item AI_TARGET, ITEM_PERSIM_BERRY, AI_TrySwaggerOnAlly2
goto Score_Minus30_
BattleAIScript_82DE185:
if_stat_level_more_than AI_TARGET, STAT_ATK, 7, BattleAIScript_82DE18F
AI_TrySwaggerOnAlly2:
if_stat_level_more_than AI_TARGET, STAT_ATK, 7, AI_TrySwaggerOnAlly_End
score +3
BattleAIScript_82DE18F:
AI_TrySwaggerOnAlly_End:
end
Score_Minus30_:

17
data/battle_anim_80A9C70.s
View File

@@ -86,20 +86,3 @@ gUnknown_0853EF14:: @ 853EF14
.align 2
gUnknown_0853EF18:: @ 853EF18
spr_template 0x2714, 0x2714, gUnknown_085249CC, gUnknown_0853EEF8, NULL, gUnknown_0853EF14, sub_80A8A6C
.align 2
gUnknown_0853EF30:: @ 853EF30
.byte 0xf0, 0xf0, 0x0c, 0x80, 0xf0, 0x30, 0x0d, 0x84, 0x30, 0xf0, 0x0e, 0x86, 0x30, 0x30, 0x08, 0x88
.align 2
gUnknown_0853EF40:: @ 853EF40
.4byte 0x00000004, gUnknown_0853EF30
.align 2
gUnknown_0853EF48:: @ 853EF48
spr_template 0x271a, 0x271a, gUnknown_08524A3C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
.align 2
gUnknown_0853EF60:: @ 853EF60
spr_template 0x2798, 0x2798, gUnknown_08524904, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80A9E44

106
data/battle_anim_80FE840.s
View File

@@ -14,15 +14,15 @@ gUnknown_08592114:: @ 8592114
.4byte gUnknown_085920F0
.align 2
gUnknown_08592118:: @ 8592118
gSleepPowderParticleSpriteTemplate:: @ 8592118
spr_template 0x2753, 0x2753, gUnknown_08524944, gUnknown_08592114, NULL, gDummySpriteAffineAnimTable, sub_80FE840
.align 2
gUnknown_08592130:: @ 8592130
gStunSporeParticleSpriteTemplate:: @ 8592130
spr_template 0x2754, 0x2754, gUnknown_08524944, gUnknown_08592114, NULL, gDummySpriteAffineAnimTable, sub_80FE840
.align 2
gUnknown_08592148:: @ 8592148
gPoisonPowderParticleSpriteTemplate:: @ 8592148
spr_template 0x2751, 0x2751, gUnknown_08524944, gUnknown_08592114, NULL, gDummySpriteAffineAnimTable, sub_80FE840
.align 2
@@ -142,7 +142,7 @@ gUnknown_085922B4:: @ 85922B4
.4byte gUnknown_085922A8
.align 2
gUnknown_085922BC:: @ 85922BC
gLeechSeedSpriteTemplate:: @ 85922BC
spr_template 0x2716, 0x2716, gUnknown_0852490C, gUnknown_085922B4, NULL, gDummySpriteAffineAnimTable, sub_80FEC48
.align 2
@@ -230,7 +230,7 @@ gUnknown_08592400:: @ 8592400
.4byte gUnknown_085923F0
.align 2
gUnknown_08592404:: @ 8592404
gSwiftStarSpriteTemplate:: @ 8592404
spr_template 0x27be, 0x27be, gUnknown_08524974, gDummySpriteAnimTable, NULL, gUnknown_08592400, sub_80FF0F4
.align 2
@@ -353,7 +353,7 @@ gUnknown_08592610:: @ 8592610
spr_template 0x27f0, 0x27f0, gUnknown_08524974, gUnknown_085925AC, NULL, gUnknown_08592608, sub_80FFB18
.align 2
gUnknown_08592628:: @ 8592628
gBattleAnimSpriteTemplate_8592628:: @ 8592628
spr_template 0x27f0, 0x27f0, gUnknown_08524974, gUnknown_085925AC, NULL, gUnknown_08592608, sub_80FFBF4
.align 2
@@ -599,7 +599,7 @@ gUnknown_08592A18:: @ 8592A18
.4byte gUnknown_08592A04
.align 2
gUnknown_08592A1C:: @ 8592A1C
gCuttingSliceSpriteTemplate:: @ 8592A1C
spr_template 0x279a, 0x279a, gUnknown_08524A34, gUnknown_08592A18, NULL, gDummySpriteAffineAnimTable, sub_8100AE0
.align 2
@@ -828,7 +828,7 @@ gUnknown_08592DE4:: @ 8592DE4
.align 2
gUnknown_08592DFC:: @ 8592DFC
spr_template 0x2721, 0x2721, gUnknown_08524904, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80A7820
spr_template 0x2721, 0x2721, gUnknown_08524904, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, TranslateAnimSpriteToTargetMonLocation
.align 2
gUnknown_08592E14:: @ 8592E14
@@ -888,7 +888,7 @@ gUnknown_08592EE8:: @ 8592EE8
.4byte gUnknown_08592ED4
.align 2
gUnknown_08592EEC:: @ 8592EEC
gBattleAnimSpriteTemplate_8592EEC:: @ 8592EEC
spr_template 0x27d3, 0x27d3, gUnknown_0852490C, gUnknown_08592EE8, NULL, gDummySpriteAffineAnimTable, sub_8102540
.align 2
@@ -1157,11 +1157,11 @@ gUnknown_0859337C:: @ 859337C
.4byte gUnknown_0859335C
.align 2
gUnknown_08593380:: @ 8593380
gBattleAnimSpriteTemplate_8593380:: @ 8593380
spr_template 0x2715, 0x2715, gUnknown_08524ADC, gDummySpriteAnimTable, NULL, gUnknown_0859337C, sub_810387C
.align 2
gUnknown_08593398:: @ 8593398
gSonicBoomSpriteTemplate:: @ 8593398
spr_template 0x2713, 0x2713, gUnknown_08524B14, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_81038C8
.align 2
@@ -1189,16 +1189,16 @@ gUnknown_08593424:: @ 8593424
.4byte gUnknown_085933E0
.align 2
gUnknown_08593428:: @ 8593428
spr_template 0x27b3, 0x27b3, gUnknown_08524A14, gDummySpriteAnimTable, NULL, gUnknown_08593420, sub_80A7820
gSupersonicWaveSpriteTemplate:: @ 8593428
spr_template 0x27b3, 0x27b3, gUnknown_08524A14, gDummySpriteAnimTable, NULL, gUnknown_08593420, TranslateAnimSpriteToTargetMonLocation
.align 2
gUnknown_08593440:: @ 8593440
spr_template 0x27b4, 0x27b4, gUnknown_08524A14, gDummySpriteAnimTable, NULL, gUnknown_08593420, sub_80A7820
gScreechWaveSpriteTemplate:: @ 8593440
spr_template 0x27b4, 0x27b4, gUnknown_08524A14, gDummySpriteAnimTable, NULL, gUnknown_08593420, TranslateAnimSpriteToTargetMonLocation
.align 2
gUnknown_08593458:: @ 8593458
spr_template 0x2814, 0x2814, gUnknown_08524A1C, gDummySpriteAnimTable, NULL, gUnknown_08593420, sub_80A7820
spr_template 0x2814, 0x2814, gUnknown_08524A1C, gDummySpriteAnimTable, NULL, gUnknown_08593420, TranslateAnimSpriteToTargetMonLocation
.align 2
gUnknown_08593470:: @ 8593470
@@ -1357,7 +1357,7 @@ gUnknown_08593718:: @ 8593718
.4byte gUnknown_08593704
.align 2
gUnknown_0859371C:: @ 859371C
gBattleAnimSpriteTemplate_859371C:: @ 859371C
spr_template 0x27d6, 0x27d6, gUnknown_08524914, gUnknown_08593718, NULL, gDummySpriteAffineAnimTable, sub_80A77C8
.align 2
@@ -1436,7 +1436,7 @@ gUnknown_08593880:: @ 8593880
spr_template 0x27db, 0x27db, gUnknown_08524AFC, gDummySpriteAnimTable, NULL, gUnknown_08593818, sub_81052A4
.align 2
gUnknown_08593898:: @ 8593898
gBattleAnimSpriteTemplate_8593898:: @ 8593898
spr_template 0x27db, 0x27db, gUnknown_08524AFC, gDummySpriteAnimTable, NULL, gUnknown_08593810, sub_81054E8
.align 2
@@ -1497,7 +1497,7 @@ gUnknown_085939A0:: @ 85939A0
spr_template 0x27e8, 0x27e8, gUnknown_0852490C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_8106140
.align 2
gUnknown_085939B8:: @ 85939B8
gBattleAnimSpriteTemplate_85939B8:: @ 85939B8
spr_template 0x27e8, 0x27e8, gUnknown_0852490C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_81061C4
.align 2
@@ -1514,11 +1514,11 @@ gUnknown_08593A00:: @ 8593A00
.4byte gUnknown_085939E8
.align 2
gUnknown_08593A04:: @ 8593A04
gHiddenPowerOrbSpriteTemplate:: @ 8593A04
spr_template 0x27e9, 0x27e9, gUnknown_0852496C, gDummySpriteAnimTable, NULL, gUnknown_08593A00, sub_810673C
.align 2
gUnknown_08593A1C:: @ 8593A1C
gHiddenPowerOrbScatterSpriteTemplate:: @ 8593A1C
spr_template 0x27e9, 0x27e9, gUnknown_085249CC, gDummySpriteAnimTable, NULL, gUnknown_08593A00, sub_8106878
.align 2
@@ -1620,7 +1620,7 @@ gUnknown_08593B98:: @ 8593B98
.2byte 0xfff8, 0x000c, 0x0400, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000
.align 2
gUnknown_08593BB8:: @ 8593BB8
gBattleAnimSpriteTemplate_8593BB8:: @ 8593BB8
spr_template 0x27f1, 0x27f1, gUnknown_08524914, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_8106E00
.align 2
@@ -1703,7 +1703,7 @@ gUnknown_08595064:: @ 8595064
.4byte gUnknown_08595054
.align 2
gUnknown_08595068:: @ 8595068
gBattleAnimSpriteTemplate_8595068:: @ 8595068
spr_template 0x27a2, 0x27a2, gUnknown_08524A8C, gUnknown_08595064, NULL, gUnknown_08595050, sub_8107260
.align 2
@@ -1990,11 +1990,11 @@ gUnknown_085954D0:: @ 85954D0
.4byte gUnknown_085954B8
.align 2
gUnknown_085954D4:: @ 85954D4
spr_template 0x272d, 0x272d, gUnknown_08524914, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80A7820
gEmberSpriteTemplate:: @ 85954D4
spr_template 0x272d, 0x272d, gUnknown_08524914, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, TranslateAnimSpriteToTargetMonLocation
.align 2
gUnknown_085954EC:: @ 85954EC
gEmberFlareSpriteTemplate:: @ 85954EC
spr_template 0x272d, 0x272d, gUnknown_08524914, gUnknown_085954D0, NULL, gDummySpriteAffineAnimTable, sub_8109198
.align 2
@@ -2031,7 +2031,7 @@ gUnknown_0859556C:: @ 859556C
spr_template 0x272d, 0x272d, gUnknown_08524914, gUnknown_08595540, NULL, gDummySpriteAffineAnimTable, sub_8109364
.align 2
gUnknown_08595584:: @ 8595584
gBattleAnimSpriteTemplate_8595584:: @ 8595584
spr_template 0x272d, 0x272d, gUnknown_08524914, gUnknown_085954D0, NULL, gDummySpriteAffineAnimTable, sub_81093A4
.align 2
@@ -2138,12 +2138,12 @@ gUnknown_08595734:: @ 8595734
spr_template 0x275f, 0x275f, gUnknown_08524914, gUnknown_08595730, NULL, gDummySpriteAffineAnimTable, sub_810A274
.align 2
gUnknown_0859574C:: @ 859574C
gBattleAnimSpriteTemplate_859574C:: @ 859574C
spr_template 0x271b, 0x271b, gUnknown_0852496C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_810A308
.align 2
gUnknown_08595764:: @ 8595764
spr_template 0x27bb, 0x27bb, gUnknown_0852490C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80A7820
spr_template 0x27bb, 0x27bb, gUnknown_0852490C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, TranslateAnimSpriteToTargetMonLocation
.align 2
gUnknown_0859577C:: @ 859577C
@@ -2175,15 +2175,15 @@ gUnknown_085957DC:: @ 85957DC
.4byte gUnknown_085957BC
.align 2
gUnknown_085957E0:: @ 85957E0
gBattleAnimSpriteTemplate_85957E0:: @ 85957E0
spr_template 0x282a, 0x282a, gUnknown_08524974, gUnknown_085957B8, NULL, gUnknown_085957DC, sub_810A5BC
.align 2
gUnknown_085957F8:: @ 85957F8
gBattleAnimSpriteTemplate_85957F8:: @ 85957F8
spr_template 0x271b, 0x271b, gUnknown_0852496C, gDummySpriteAnimTable, NULL, gUnknown_0859578C, sub_810A628
.align 2
gUnknown_08595810:: @ 8595810
gElectricitySpriteTemplate:: @ 8595810
spr_template 0x271b, 0x271b, gUnknown_0852490C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_810A75C
.align 2
@@ -2613,7 +2613,7 @@ gUnknown_08595E80:: @ 8595E80
spr_template 0x279f, 0x279f, gUnknown_08524914, gUnknown_08595E54, NULL, gDummySpriteAffineAnimTable, sub_810CEB4
.align 2
gUnknown_08595E98:: @ 8595E98
gFistFootSpriteTemplate:: @ 8595E98
spr_template 0x279f, 0x279f, gUnknown_08524914, gUnknown_08595E54, NULL, gDummySpriteAffineAnimTable, sub_810CEE0
.align 2
@@ -2651,7 +2651,7 @@ gUnknown_08595F44:: @ 8595F44
.4byte gUnknown_08595F2C
.align 2
gUnknown_08595F48:: @ 8595F48
gMegaPunchKickSpriteTemplate:: @ 8595F48
spr_template 0x279f, 0x279f, gUnknown_085249D4, gUnknown_08595E54, NULL, gUnknown_08595F44, sub_810D278
.align 2
@@ -2841,11 +2841,11 @@ gUnknown_0859623C:: @ 859623C
.4byte gUnknown_08596224
.align 2
gUnknown_08596240:: @ 8596240
gPoisonBubbleSpriteTemplate:: @ 8596240
spr_template 0x27a6, 0x27a6, gUnknown_0852496C, gUnknown_08596164, NULL, gUnknown_0859623C, sub_810DDC4
.align 2
gUnknown_08596258:: @ 8596258
gWaterBubbleSpriteTemplate:: @ 8596258
spr_template 0x27ab, 0x27ab, gUnknown_08524A8C, gUnknown_08595200, NULL, gUnknown_0859623C, sub_810DDC4
.align 2
@@ -2862,7 +2862,7 @@ gUnknown_085962A0:: @ 85962A0
.4byte gUnknown_08596288
.align 2
gUnknown_085962A4:: @ 85962A4
gBattleAnimSpriteTemplate_85962A4:: @ 85962A4
spr_template 0x2719, 0x2719, gUnknown_085249BC, gDummySpriteAnimTable, NULL, gUnknown_085962A0, sub_810DFA8
.align 2
@@ -3067,7 +3067,7 @@ gUnknown_08596624:: @ 8596624
.align 2
gUnknown_0859663C:: @ 859663C
spr_template 0x27b3, 0x27b3, gUnknown_08524954, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80A7820
spr_template 0x27b3, 0x27b3, gUnknown_08524954, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, TranslateAnimSpriteToTargetMonLocation
.align 2
gUnknown_08596654:: @ 8596654
@@ -3268,15 +3268,15 @@ gUnknown_08596A2C:: @ 8596A2C
spr_template 0x27c5, 0x27c5, gUnknown_08524AFC, gDummySpriteAnimTable, NULL, gUnknown_08596A28, sub_811067C
.align 2
gUnknown_08596A44:: @ 8596A44
gLinearStingerSpriteTemplate:: @ 8596A44
spr_template 0x27b1, 0x27b1, gUnknown_0852496C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_8110720
.align 2
gUnknown_08596A5C:: @ 8596A5C
gPinMissileSpriteTemplate:: @ 8596A5C
spr_template 0x27b1, 0x27b1, gUnknown_0852496C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_8110850
.align 2
gUnknown_08596A74:: @ 8596A74
gIcicleSpearSpriteTemplate:: @ 8596A74
spr_template 0x2816, 0x2816, gUnknown_08524974, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_8110850
.align 2
@@ -3342,7 +3342,7 @@ gUnknown_08596B88:: @ 8596B88
spr_template 0x272d, 0x272d, gUnknown_08524914, gUnknown_085954D0, NULL, gDummySpriteAffineAnimTable, sub_8110B38
.align 2
gUnknown_08596BA0:: @ 8596BA0
gBattleAnimSpriteTemplate_8596BA0:: @ 8596BA0
spr_template 0x2815, 0x2815, gUnknown_08524934, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_8110E4C
.align 2
@@ -3500,11 +3500,11 @@ gUnknown_08596DD0:: @ 8596DD0
spr_template 0x27d7, 0x27d7, gUnknown_08524A54, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_81129F0
.align 2
gUnknown_08596DE8:: @ 8596DE8
gBattleAnimSpriteTemplate_8596DE8:: @ 8596DE8
spr_template 0x27d8, 0x27d8, gUnknown_08524A34, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_8112B78
.align 2
gUnknown_08596E00:: @ 8596E00
gBattleAnimSpriteTemplate_8596E00:: @ 8596E00
spr_template 0x27ed, 0x27ed, gUnknown_08524A34, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_8112B78
.align 2
@@ -3533,7 +3533,7 @@ gUnknown_08596E78:: @ 8596E78
.4byte gUnknown_08596E60
.align 2
gUnknown_08596E7C:: @ 8596E7C
gBattleAnimSpriteTemplate_8596E7C:: @ 8596E7C
spr_template 0x272d, 0x272d, gUnknown_08524914, gUnknown_08596E78, NULL, gDummySpriteAffineAnimTable, sub_8113064
.align 2
@@ -3705,7 +3705,7 @@ gUnknown_08597130:: @ 8597130
.4byte gUnknown_08597118
.align 2
gUnknown_08597138:: @ 8597138
gBattleAnimSpriteTemplate_8597138:: @ 8597138
spr_template 0x2737, 0x2737, gUnknown_08524914, gUnknown_08597130, NULL, gDummySpriteAffineAnimTable, sub_81144BC
.align 2
@@ -3774,15 +3774,15 @@ gUnknown_08597254:: @ 8597254
.4byte gUnknown_08597240
.align 2
gUnknown_0859725C:: @ 859725C
gConfusionDuckSpriteTemplate:: @ 859725C
spr_template 0x2759, 0x2759, gUnknown_0852490C, gUnknown_08597254, NULL, gDummySpriteAffineAnimTable, sub_811572C
.align 2
gUnknown_08597274:: @ 8597274
gSimplePaletteBlendSpriteTemplate:: @ 8597274
spr_template 0x0000, 0x0000, gDummyOamData, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_81157FC
.align 2
gUnknown_0859728C:: @ 859728C
gComplexPaletteBlendSpriteTemplate:: @ 859728C
spr_template 0x0000, 0x0000, gDummyOamData, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_81158A4
.align 2
@@ -3799,7 +3799,7 @@ gUnknown_085972C0:: @ 85972C0
spr_template 0x2757, 0x2757, gUnknown_08524914, gUnknown_085972BC, NULL, gDummySpriteAffineAnimTable, sub_81159B4
.align 2
gUnknown_085972D8:: @ 85972D8
gBattleAnimSpriteTemplate_85972D8:: @ 85972D8
spr_template 0x0000, 0x0000, gDummyOamData, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_81160A4
.align 2
@@ -3829,11 +3829,11 @@ gUnknown_08597348:: @ 8597348
.4byte gUnknown_08597330
.align 2
gUnknown_08597358:: @ 8597358
gBasicHitSplatSpriteTemplate:: @ 8597358
spr_template 0x2797, 0x2797, gUnknown_08524A94, gDummySpriteAnimTable, NULL, gUnknown_08597348, sub_8116388
.align 2
gUnknown_08597370:: @ 8597370
gBattleAnimSpriteTemplate_8597370:: @ 8597370
spr_template 0x2797, 0x2797, gUnknown_08524A94, gDummySpriteAnimTable, NULL, gUnknown_08597348, sub_8116420
.align 2
@@ -3845,7 +3845,7 @@ gUnknown_085973A0:: @ 85973A0
spr_template 0x2797, 0x2797, gUnknown_08524A94, gDummySpriteAnimTable, NULL, gUnknown_08597348, sub_8116458
.align 2
gUnknown_085973B8:: @ 85973B8
gBattleAnimSpriteTemplate_85973B8:: @ 85973B8
spr_template 0x2797, 0x2797, gUnknown_08524A94, gDummySpriteAnimTable, NULL, gUnknown_08597348, sub_81164F0
.align 2

2
data/battle_anim_815A0D4.s
View File

@@ -330,7 +330,7 @@ gUnknown_085CE5A8::
spr_template 0x2800, 0x2800, gUnknown_08524904, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815CB88
gUnknown_085CE5C0::
spr_template 0x27f3, 0x27f3, gUnknown_085249DC, gDummySpriteAnimTable, NULL, gUnknown_085CE224, sub_815CC94
gUnknown_085CE5D8::
gBattleAnimSpriteTemplate_85CE5D8::
spr_template 0x27fc, 0x27fc, gUnknown_08524904, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815CDB4
.align 2

2
data/battle_anim_8170478.s
View File

@@ -140,7 +140,7 @@ gUnknown_085E5310:: @ 85E5310
.2byte 0x0100, 0x0503, 0x0506, 0x0004
.align 2
gUnknown_085E5338:: @ 85E5338
gBattleAnimSpriteTemplate_85E5338:: @ 85E5338
spr_template 0x281d, 0x281d, gUnknown_0852490C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_817330C
.align 2

13226
data/battle_anim_scripts.s
View File

File diff suppressed because it is too large Load Diff

365
data/battle_frontier_2.s
View File

@@ -6,371 +6,6 @@
.section .rodata
.align 2
gUnknown_0860F13C:: @ 860F13C
.incbin "graphics/unknown/unknown_60F13C.gbapal"
.align 2
gUnknown_0860F15C:: @ 860F15C
.incbin "graphics/unknown/unknown_60F15C.gbapal"
.align 2
gUnknown_0860F17C:: @ 860F17C
.incbin "graphics/unknown/unknown_60F17C.gbapal"
.align 2
gUnknown_0860F1BC:: @ 860F1BC
.incbin "graphics/unknown/unknown_60F1BC.4bpp"
.align 2
gUnknown_0860F3BC:: @ 860F3BC
.incbin "graphics/unknown/unknown_60F3BC.4bpp"
.align 2
gUnknown_0860F43C:: @ 860F43C
.incbin "graphics/unknown/unknown_60F43C.4bpp"
.align 2
gUnknown_0860F53C:: @ 860F53C
.incbin "graphics/unknown/unknown_60F53C.4bpp"
.align 2
gUnknown_0860F63C:: @ 860F63C
.incbin "graphics/unknown/unknown_60F63C.4bpp"
.align 2
gUnknown_0860F6BC:: @ 860F6BC
.incbin "graphics/unknown/unknown_60F6BC.4bpp"
.align 2
gUnknown_0860F7BC:: @ 860F7BC
.incbin "graphics/unknown/unknown_60F7BC.4bpp"
.align 2
gUnknown_0860F83C:: @ 860F83C
.incbin "graphics/unknown/unknown_60F83C.4bpp"
.align 2
gUnknown_0860F93C:: @ 860F93C
.incbin "graphics/unknown/unknown_60F93C.4bpp"
.align 2
gUnknown_0860FA3C:: @ 860FA3C
.incbin "graphics/unknown/unknown_60FA3C.4bpp"
.align 2
gUnknown_0861023C:: @ 861023C
.incbin "graphics/unknown/unknown_61023C.bin"
.align 2
gUnknown_0861033C:: @ 861033C
.incbin "graphics/unknown/unknown_61033C.4bpp"
.align 2
gUnknown_0861039C:: @ 861039C
.incbin "graphics/unknown/unknown_61039C.gbapal"
.align 2
gUnknown_086103BC:: @ 86103BC
obj_tiles gUnknown_0860F3BC, 0x0080, 0x0065
obj_tiles gUnknown_0860F43C, 0x0100, 0x0066
obj_tiles gUnknown_0860F53C, 0x0100, 0x0067
obj_tiles gUnknown_0860FA3C, 0x0800, 0x006d
null_obj_tiles
.align 2
gUnknown_086103E4:: @ 86103E4
obj_tiles gUnknown_085B18AC, 0x0800, 0x0064
null_obj_tiles
.align 2
gUnknown_086103F4:: @ 86103F4
obj_pal gUnknown_0860F13C, 0x0064
obj_pal gUnknown_0860F15C, 0x0065
obj_pal gUnknown_0860F17C, 0x0066
obj_pal gUnknown_0861039C, 0x0067
null_obj_pal
.align 2
gUnknown_0861041C:: @ 861041C
.4byte sub_819BCCC
.4byte sub_819BC30
.4byte sub_819BCD0
.align 2
gUnknown_08610428:: @ 8610428
.4byte 0x00000180, 0x00003195, 0x000021bb
.align 2
gUnknown_08610434:: @ 8610434
window_template 0x00, 0x00, 0x02, 0x0c, 0x02, 0x0f, 0x0001
window_template 0x00, 0x13, 0x02, 0x0b, 0x02, 0x0e, 0x0019
window_template 0x00, 0x00, 0x0f, 0x14, 0x03, 0x0f, 0x002f
window_template 0x00, 0x16, 0x0e, 0x08, 0x06, 0x0f, 0x006b
window_template 0x00, 0x16, 0x0e, 0x08, 0x04, 0x0f, 0x009b
window_template 0x00, 0x0f, 0x00, 0x0f, 0x02, 0x0f, 0x00bb
null_window_template
.align 1
gUnknown_0861046C:: @ 861046C
.incbin "graphics/unknown/unknown_61046C.gbapal"
gUnknown_08610476:: @ 8610476
.byte 0x00, 0x02, 0x00
gUnknown_08610479:: @ 8610479
.byte 0x00, 0x04, 0x00
.align 2
gUnknown_0861047C:: @ 861047C
.byte 0x00, 0x00, 0x00, 0x80, 0x00, 0x0c, 0x00, 0x00
.align 2
gUnknown_08610484:: @ 8610484
.byte 0x00, 0x00, 0x00, 0x40, 0x00, 0x0c, 0x00, 0x00
.align 2
gUnknown_0861048C:: @ 861048C
.byte 0x00, 0x40, 0x00, 0x80, 0x00, 0x08, 0x00, 0x00
.align 2
gUnknown_08610494:: @ 8610494
.byte 0x00, 0x07, 0x00, 0xc0, 0x00, 0x00, 0x01, 0x00
.align 2
gUnknown_0861049C:: @ 861049C
.2byte 0x0000, 0x0001, 0xffff, 0x0000
.align 2
gUnknown_086104A4:: @ 86104A4
.2byte 0x0000, 0x0001, 0xffff, 0x0000
.align 2
gUnknown_086104AC:: @ 86104AC
.2byte 0x0000, 0x001e, 0xffff, 0x0000
.align 2
gUnknown_086104B4:: @ 86104B4
.2byte 0x0010, 0x0004, 0x0000, 0x0004, 0x0020, 0x0004, 0x0000, 0x0004, 0x0010, 0x0004, 0x0000, 0x0004, 0x0020, 0x0004, 0x0000, 0x0004
.2byte 0x0000, 0x0020, 0x0010, 0x0008, 0x0000, 0x0008, 0x0020, 0x0008, 0x0000, 0x0008, 0x0010, 0x0008, 0x0000, 0x0008, 0x0020, 0x0008
.2byte 0x0000, 0x0008, 0xffff, 0x0000
.align 2
gUnknown_086104FC:: @ 86104FC
.4byte gUnknown_0861049C
.align 2
gUnknown_08610500:: @ 8610500
.4byte gUnknown_086104A4
.align 2
gUnknown_08610504:: @ 8610504
.4byte gUnknown_086104AC
.4byte gUnknown_086104B4
.align 2
gUnknown_0861050C:: @ 861050C
.2byte 0x0005, 0x0005, 0x0000, 0x0000, 0x0000, 0x0000, 0x0100, 0x0000, 0x0010, 0x0005, 0x0000, 0x0000, 0x0000, 0x0000, 0x0100, 0x0000
.2byte 0x0020, 0x0005, 0x0000, 0x0000, 0x0000, 0x0000, 0x0100, 0x0000, 0x0040, 0x0005, 0x0000, 0x0000, 0x0000, 0x0000, 0x0100, 0x0000
.2byte 0x0080, 0x0005, 0x0000, 0x0000, 0x0000, 0x0000, 0x0100, 0x0000, 0x0100, 0x0005, 0x0000, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000
.align 2
gUnknown_0861056C:: @ 861056C
.2byte 0x0080, 0x0005, 0x0000, 0x0000, 0x0000, 0x0000, 0x0100, 0x0000, 0x0040, 0x0005, 0x0000, 0x0000, 0x0000, 0x0000, 0x0100, 0x0000
.2byte 0x0020, 0x0005, 0x0000, 0x0000, 0x0000, 0x0000, 0x0100, 0x0000, 0x0010, 0x0005, 0x0000, 0x0000, 0x0000, 0x0000, 0x0100, 0x0000
.2byte 0x0005, 0x0005, 0x0000, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000
.align 2
gUnknown_086105BC:: @ 86105BC
.2byte 0x0100, 0x0100, 0x0000, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000
.align 2
gUnknown_086105CC:: @ 86105CC
.4byte gUnknown_0861050C
.4byte gUnknown_0861056C
.4byte gUnknown_086105BC
.align 2
gUnknown_086105D8:: @ 86105D8
spr_template 0x0064, 0x0064, gUnknown_0861047C, gUnknown_08610504, NULL, gDummySpriteAffineAnimTable, sub_819A44C
.align 2
gUnknown_086105F0:: @ 86105F0
spr_template 0x0065, 0x0066, gUnknown_08610484, gUnknown_086104FC, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
.align 2
gUnknown_08610608:: @ 8610608
spr_template 0x0066, 0x0066, gUnknown_0861048C, gUnknown_086104FC, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
.align 2
gUnknown_08610620:: @ 8610620
spr_template 0x0067, 0x0066, gUnknown_0861048C, gUnknown_086104FC, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
.align 2
gUnknown_08610638:: @ 8610638
spr_template 0x006d, 0x0067, gUnknown_08610494, gUnknown_08610500, NULL, gUnknown_086105CC, SpriteCallbackDummy
.align 2
gUnknown_08610650:: @ 8610650
obj_tiles gUnknown_0860F3BC, 0x0080, 0x0065
obj_tiles gUnknown_0860F43C, 0x0100, 0x0066
obj_tiles gUnknown_0860F53C, 0x0100, 0x0067
obj_tiles gUnknown_0860F63C, 0x0080, 0x0068
obj_tiles gUnknown_0860F6BC, 0x0100, 0x0069
obj_tiles gUnknown_0860F7BC, 0x0100, 0x006a
obj_tiles gUnknown_0860F83C, 0x0100, 0x006b
obj_tiles gUnknown_0860F93C, 0x0100, 0x006c
obj_tiles gUnknown_0860FA3C, 0x0800, 0x006d
null_obj_tiles
.align 2
gUnknown_086106A0:: @ 86106A0
obj_tiles gUnknown_085B18AC, 0x0800, 0x0064
null_obj_tiles
.align 2
gUnknown_086106B0:: @ 86106B0
obj_pal gUnknown_0860F13C, 0x0064
obj_pal gUnknown_0860F15C, 0x0065
obj_pal gUnknown_0860F17C, 0x0066
obj_pal gUnknown_0861039C, 0x0067
null_obj_pal
.align 2
gUnknown_086106D8:: @ 86106D8
.byte 0x00, 0x00, 0x00, 0x80, 0x00, 0x0c, 0x00, 0x00
.align 2
gUnknown_086106E0:: @ 86106E0
.byte 0x00, 0x00, 0x00, 0x40, 0x00, 0x0c, 0x00, 0x00
.align 2
gUnknown_086106E8:: @ 86106E8
.byte 0x00, 0x40, 0x00, 0x80, 0x00, 0x08, 0x00, 0x00
.align 2
gUnknown_086106F0:: @ 86106F0
.byte 0x00, 0x07, 0x00, 0xc0, 0x00, 0x00, 0x01, 0x00
.align 2
gUnknown_086106F8:: @ 86106F8
.2byte 0x0000, 0x0001, 0xffff, 0x0000
.align 2
gUnknown_08610700:: @ 8610700
.2byte 0x0000, 0x0001, 0xffff, 0x0000
.align 2
gUnknown_08610708:: @ 8610708
.2byte 0x0000, 0x001e, 0xffff, 0x0000
.align 2
gUnknown_08610710:: @ 8610710
.2byte 0x0010, 0x0004, 0x0000, 0x0004, 0x0020, 0x0004, 0x0000, 0x0004, 0x0010, 0x0004, 0x0000, 0x0004, 0x0020, 0x0004, 0x0000, 0x0004
.2byte 0x0000, 0x0020, 0x0010, 0x0008, 0x0000, 0x0008, 0x0020, 0x0008, 0x0000, 0x0008, 0x0010, 0x0008, 0x0000, 0x0008, 0x0020, 0x0008
.2byte 0x0000, 0x0008, 0xffff, 0x0000
.align 2
gUnknown_08610758:: @ 8610758
.4byte gUnknown_086106F8
.align 2
gUnknown_0861075C:: @ 861075C
.4byte gUnknown_08610700
.align 2
gUnknown_08610760:: @ 8610760
.4byte gUnknown_08610708
.4byte gUnknown_08610710
.align 2
gUnknown_08610768:: @ 8610768
.2byte 0x0005, 0x0005, 0x0000, 0x0000, 0x0000, 0x0000, 0x0100, 0x0000, 0x0010, 0x0005, 0x0000, 0x0000, 0x0000, 0x0000, 0x0100, 0x0000
.2byte 0x0020, 0x0005, 0x0000, 0x0000, 0x0000, 0x0000, 0x0100, 0x0000, 0x0040, 0x0005, 0x0000, 0x0000, 0x0000, 0x0000, 0x0100, 0x0000
.2byte 0x0080, 0x0005, 0x0000, 0x0000, 0x0000, 0x0000, 0x0100, 0x0000, 0x0100, 0x0005, 0x0000, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000
.align 2
gUnknown_086107C8:: @ 86107C8
.2byte 0x0080, 0x0005, 0x0000, 0x0000, 0x0000, 0x0000, 0x0100, 0x0000, 0x0040, 0x0005, 0x0000, 0x0000, 0x0000, 0x0000, 0x0100, 0x0000
.2byte 0x0020, 0x0005, 0x0000, 0x0000, 0x0000, 0x0000, 0x0100, 0x0000, 0x0010, 0x0005, 0x0000, 0x0000, 0x0000, 0x0000, 0x0100, 0x0000
.2byte 0x0005, 0x0005, 0x0000, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000
.align 2
gUnknown_08610818:: @ 8610818
.2byte 0x0100, 0x0100, 0x0000, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000
.align 2
gUnknown_08610828:: @ 8610828
.4byte gUnknown_08610768
.4byte gUnknown_086107C8
.4byte gUnknown_08610818
.align 2
gUnknown_08610834:: @ 8610834
spr_template 0x0064, 0x0064, gUnknown_086106D8, gUnknown_08610760, NULL, gDummySpriteAffineAnimTable, sub_819A44C
.align 2
gUnknown_0861084C:: @ 861084C
spr_template 0x0065, 0x0066, gUnknown_086106E0, gUnknown_08610758, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
.align 2
gUnknown_08610864:: @ 8610864
spr_template 0x0066, 0x0066, gUnknown_086106E8, gUnknown_08610758, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
.align 2
gUnknown_0861087C:: @ 861087C
spr_template 0x0067, 0x0066, gUnknown_086106E8, gUnknown_08610758, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
.align 2
gUnknown_08610894:: @ 8610894
spr_template 0x006d, 0x0067, gUnknown_086106F0, gUnknown_0861075C, NULL, gUnknown_08610828, SpriteCallbackDummy
.align 2
gUnknown_086108AC:: @ 86108AC
.4byte sub_819F114
.4byte sub_819F0CC
.4byte sub_819F134
.align 2
gUnknown_086108B8:: @ 86108B8
.4byte 0x00001180, 0x00003195, 0x000001aa, 0x000021bb
.align 2
gUnknown_086108C8:: @ 86108C8
window_template 0x00, 0x00, 0x02, 0x0c, 0x02, 0x0f, 0x0001
window_template 0x02, 0x13, 0x02, 0x0b, 0x02, 0x0e, 0x0019
window_template 0x00, 0x00, 0x0f, 0x14, 0x03, 0x0f, 0x002f
window_template 0x00, 0x15, 0x0e, 0x09, 0x06, 0x0f, 0x006b
window_template 0x00, 0x16, 0x0e, 0x08, 0x04, 0x0f, 0x00a1
window_template 0x02, 0x15, 0x0f, 0x09, 0x05, 0x0e, 0x006b
window_template 0x02, 0x0a, 0x02, 0x04, 0x02, 0x0e, 0x00c1
window_template 0x00, 0x13, 0x02, 0x0b, 0x02, 0x0f, 0x00c9
window_template 0x00, 0x0f, 0x00, 0x0f, 0x02, 0x0f, 0x00df
null_window_template
gUnknown_08610918:: @ 8610918
.byte 0x00, 0x00, 0x00, 0x00, 0xff, 0x7f, 0x00, 0x00, 0x1f, 0x00
gUnknown_08610922:: @ 8610922
.byte 0x00, 0x02, 0x00
gUnknown_08610925:: @ 8610925
.byte 0x00, 0x04, 0x00
.align 2
gUnknown_08610928:: @ 8610928
.4byte 0x00000001, sub_819F20C
.4byte 0x00000001, sub_819F20C
.4byte 0x00000001, sub_819F20C
.4byte 0x00000003, sub_819F1AC
.align 2
gUnknown_08610948:: @ 8610948
.4byte 0x00000001, sub_819F20C
.4byte 0x00000001, sub_819F20C
.4byte 0x00000001, sub_819F20C
.4byte 0x00000002, sub_819F1DC
.4byte 0x00000003, sub_819F1AC
.align 2 @ struct, eight bytes x6 for names in different languages, then 0x28 more bytes of data
gUnknown_08610970:: @ 8610970

40
data/battle_pyramid_bag.s
View File

@@ -1,40 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gOamData_861F378:: @ 861F378
.2byte 0x0100, 0xc000, 0x0400, 0x0000
.align 2
gSpriteAnim_861F380:: @ 861F380
.2byte 0x0000, 0x0004, 0xffff, 0x0000
.align 2
gSpriteAnimTable_861F388:: @ 861F388
.4byte gSpriteAnim_861F380
.align 2
gSpriteAffineAnim_861F38C:: @ 861F38C
.2byte 0x0100, 0x0100, 0x0000, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000
.align 2
gSpriteAffineAnim_861F39C:: @ 861F39C
.2byte 0x0000, 0x0000, 0x02fe, 0x0000, 0x0000, 0x0000, 0x0402, 0x0000, 0x0000, 0x0000, 0x04fe, 0x0000, 0x0000, 0x0000, 0x0202, 0x0000
.2byte 0x7fff, 0x0000, 0x0000, 0x0000
.align 2
gSpriteAffineAnimTable_861F3C4:: @ 861F3C4
.4byte gSpriteAffineAnim_861F38C
.4byte gSpriteAffineAnim_861F39C
.align 2
gUnknown_0861F3CC:: @ 861F3CC
obj_tiles gBattleFrontierGfx_PyramidBag, 0x0800, 0x1024
.align 2
gUnknown_0861F3D4:: @ 861F3D4
spr_template 0x1024, 0x1024, gOamData_861F378, gSpriteAnimTable_861F388, NULL, gSpriteAffineAnimTable_861F3C4, SpriteCallbackDummy

121
data/battle_scripts_1.s
View File

@@ -6,6 +6,7 @@
#include "constants/abilities.h"
#include "constants/moves.h"
#include "constants/songs.h"
#include "constants/game_stat.h"
.include "asm/macros.inc"
.include "asm/macros/battle_script.inc"
.include "constants/constants.inc"
@@ -399,19 +400,19 @@ BattleScript_EffectExplosion::
faintifabilitynotdamp
setatkhptozero
waitstate
jumpifbyte CMP_NO_COMMON_BITS, gMoveResultFlags, MOVE_RESULT_MISSED, BattleScript_82D8B94
call BattleScript_82D8BEA
goto BattleScript_82D8B96
BattleScript_82D8B94::
jumpifbyte CMP_NO_COMMON_BITS, gMoveResultFlags, MOVE_RESULT_MISSED, BattleScript_ExplosionDoAnimStartLoop
call BattleScript_PreserveMissedBitDoMoveAnim
goto BattleScript_ExplosionLoop
BattleScript_ExplosionDoAnimStartLoop:
attackanimation
waitanimation
BattleScript_82D8B96::
BattleScript_ExplosionLoop:
movevaluescleanup
critcalc
damagecalc
typecalc
adjustnormaldamage
accuracycheck BattleScript_82D8BCF, ACC_CURR_MOVE
accuracycheck BattleScript_ExplosionMissed, ACC_CURR_MOVE
effectivenesssound
hitanimation BS_TARGET
waitstate
@@ -424,20 +425,20 @@ BattleScript_82D8B96::
tryfaintmon BS_TARGET, FALSE, NULL
setbyte sMOVEEND_STATE, 0x0
moveend 0x2, 0x10
jumpifnexttargetvalid BattleScript_82D8B96
jumpifnexttargetvalid BattleScript_ExplosionLoop
tryfaintmon BS_ATTACKER, FALSE, NULL
end
BattleScript_82D8BCF::
BattleScript_ExplosionMissed:
effectivenesssound
resultmessage
waitmessage 0x40
setbyte sMOVEEND_STATE, 0x0
moveend 0x2, 0x10
jumpifnexttargetvalid BattleScript_82D8B96
jumpifnexttargetvalid BattleScript_ExplosionLoop
tryfaintmon BS_ATTACKER, FALSE, NULL
end
BattleScript_82D8BEA::
BattleScript_PreserveMissedBitDoMoveAnim:
bicbyte gMoveResultFlags, MOVE_RESULT_MISSED
attackanimation
waitanimation
@@ -446,14 +447,14 @@ BattleScript_82D8BEA::
BattleScript_EffectDreamEater::
attackcanceler
jumpifstatus2 BS_TARGET, STATUS2_SUBSTITUTE, BattleScript_82D8C0E
jumpifstatus BS_TARGET, STATUS1_SLEEP, BattleScript_82D8C18
BattleScript_82D8C0E::
jumpifstatus2 BS_TARGET, STATUS2_SUBSTITUTE, BattleScript_DreamEaterNoEffect
jumpifstatus BS_TARGET, STATUS1_SLEEP, BattleScript_DreamEaterWorked
BattleScript_DreamEaterNoEffect:
attackstring
ppreduce
waitmessage 0x40
goto BattleScript_WasntAffected
BattleScript_82D8C18::
BattleScript_DreamEaterWorked:
accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE
attackstring
ppreduce
@@ -479,7 +480,7 @@ BattleScript_82D8C18::
jumpifmovehadnoeffect BattleScript_DreamEaterTryFaintEnd
printstring STRINGID_PKMNDREAMEATEN
waitmessage 0x40
BattleScript_DreamEaterTryFaintEnd::
BattleScript_DreamEaterTryFaintEnd:
tryfaintmon BS_TARGET, FALSE, NULL
goto BattleScript_MoveEnd
@@ -606,9 +607,9 @@ BattleScript_EffectRampage::
attackcanceler
accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE
attackstring
jumpifstatus2 BS_ATTACKER, STATUS2_MULTIPLETURNS, BattleScript_82D8DAE
jumpifstatus2 BS_ATTACKER, STATUS2_MULTIPLETURNS, BattleScript_EffectRampage2
ppreduce
BattleScript_82D8DAE::
BattleScript_EffectRampage2:
confuseifrepeatingattackends
goto BattleScript_HitFromCritCalc
@@ -922,7 +923,7 @@ BattleScript_EffectFocusEnergy::
BattleScript_EffectRecoil::
setmoveeffect MOVE_EFFECT_RECOIL_25 | MOVE_EFFECT_AFFECTS_USER | MOVE_EFFECT_CERTAIN
jumpifnotmove MOVE_STRUGGLE, BattleScript_EffectHit
incrementgamestat 0x1B
incrementgamestat GAME_STAT_USED_STRUGGLE
goto BattleScript_EffectHit
BattleScript_EffectConfuse::
@@ -1200,7 +1201,7 @@ BattleScript_EffectSplash::
ppreduce
attackanimation
waitanimation
incrementgamestat 0x1A
incrementgamestat GAME_STAT_USED_SPLASH
printstring STRINGID_BUTNOTHINGHAPPENED
waitmessage 0x40
goto BattleScript_MoveEnd
@@ -1354,7 +1355,7 @@ BattleScript_SleepTalkUsingMove::
waitanimation
setbyte sB_ANIM_TURN, 0x0
setbyte sB_ANIM_TARGETS_HIT, 0x0
jumptorandomattack TRUE
jumptocalledmove TRUE
BattleScript_EffectDestinyBond::
attackcanceler
@@ -2297,8 +2298,7 @@ BattleScript_EffectSmellingsalt::
setmoveeffect MOVE_EFFECT_REMOVE_PARALYSIS | MOVE_EFFECT_CERTAIN
jumpifstatus BS_TARGET, STATUS1_PARALYSIS, BattleScript_SmellingsaltDoubleDmg
goto BattleScript_EffectHit
BattleScript_SmellingsaltDoubleDmg::
BattleScript_SmellingsaltDoubleDmg:
setbyte sDMG_MULTIPLIER, 0x2
goto BattleScript_EffectHit
@@ -2400,7 +2400,7 @@ BattleScript_EffectAssist::
waitanimation
setbyte sB_ANIM_TURN, 0x0
setbyte sB_ANIM_TARGETS_HIT, 0x0
jumptorandomattack TRUE
jumptocalledmove TRUE
BattleScript_EffectIngrain::
attackcanceler
@@ -2593,7 +2593,7 @@ BattleScript_EffectSecretPower::
goto BattleScript_EffectHit
BattleScript_EffectDoubleEdge::
setmoveeffect MOVE_EFFECT_RECOIL_33_PARALYSIS | MOVE_EFFECT_AFFECTS_USER | MOVE_EFFECT_CERTAIN
setmoveeffect MOVE_EFFECT_RECOIL_33 | MOVE_EFFECT_AFFECTS_USER | MOVE_EFFECT_CERTAIN
goto BattleScript_EffectHit
BattleScript_EffectTeeterDance::
@@ -2969,7 +2969,7 @@ BattleScript_PayDayMoneyAndPickUpItems::
BattleScript_LocalBattleLost::
jumpifbattletype BATTLE_TYPE_DOME, BattleScript_CheckDomeDrew
jumpifbattletype BATTLE_TYPE_FRONTIER, BattleScript_LocalBattleLostPrintTrainersWinText
jumpifbattletype BATTLE_TYPE_x4000000, BattleScript_LocalBattleLostPrintTrainersWinText
jumpifbattletype BATTLE_TYPE_TRAINER_HILL, BattleScript_LocalBattleLostPrintTrainersWinText
jumpifbattletype BATTLE_TYPE_EREADER_TRAINER, BattleScript_LocalBattleLostEnd
jumpifhalfword CMP_EQUAL, gTrainerBattleOpponent_A, 0x400, BattleScript_LocalBattleLostEnd
BattleScript_LocalBattleLostPrintWhiteOut::
@@ -3050,12 +3050,12 @@ BattleScript_82DAA83::
BattleScript_FrontierTrainerBattleWon::
jumpifnotbattletype BATTLE_TYPE_TRAINER, BattleScript_PayDayMoneyAndPickUpItems
jumpifbattletype BATTLE_TYPE_TWO_OPPONENTS, BattleScript_82DAAAB
jumpifbattletype BATTLE_TYPE_TWO_OPPONENTS, BattleScript_FrontierTrainerBattleWon_TwoDefeated
printstring STRINGID_PLAYERDEFEATEDTRAINER1
goto BattleScript_82DAAAE
BattleScript_82DAAAB::
goto BattleScript_FrontierTrainerBattleWon_LoseTexts
BattleScript_FrontierTrainerBattleWon_TwoDefeated:
printstring STRINGID_TWOENEMIESDEFEATED
BattleScript_82DAAAE::
BattleScript_FrontierTrainerBattleWon_LoseTexts:
trainerslidein BS_ATTACKER
waitstate
printstring STRINGID_TRAINER1LOSETEXT
@@ -3065,10 +3065,10 @@ BattleScript_82DAAAE::
trainerslidein BS_FAINTED
waitstate
printstring STRINGID_TRAINER2LOSETEXT
BattleScript_82DAACB::
jumpifnotbattletype BATTLE_TYPE_PYRAMID, BattleScript_82DAADA
BattleScript_82DAACB:
jumpifnotbattletype BATTLE_TYPE_PYRAMID, BattleScript_FrontierTrainerBattleWon_End
pickup
BattleScript_82DAADA::
BattleScript_FrontierTrainerBattleWon_End:
end2
BattleScript_SmokeBallEscape::
@@ -3172,7 +3172,7 @@ BattleScript_PursuitDmgOnSwitchOut::
jumpifbyte CMP_EQUAL, gBattleCommunication, 0x0, BattleScript_PursuitDmgOnSwitchOutRet
setbyte sGIVEEXP_STATE, 0x0
getexp BS_TARGET
BattleScript_PursuitDmgOnSwitchOutRet::
BattleScript_PursuitDmgOnSwitchOutRet:
return
BattleScript_Pausex20::
@@ -3742,7 +3742,7 @@ BattleScript_SAtkDown2End::
BattleScript_FocusPunchSetUp::
printstring STRINGID_EMPTYSTRING3
waitmessage 0x1
playanimation BS_ATTACKER, B_ANIM_x14, NULL
playanimation BS_ATTACKER, B_ANIM_FOCUS_PUNCH_SETUP, NULL
printstring STRINGID_PKMNTIGHTENINGFOCUS
waitmessage 0x40
end2
@@ -3968,17 +3968,17 @@ BattleScript_MoveEffectConfusion::
waitmessage 0x40
return
BattleScript_MoveEffectRecoil33::
jumpifmove MOVE_STRUGGLE, BattleScript_DoRecoil33
jumpifability BS_ATTACKER, ABILITY_ROCK_HEAD, BattleScript_Recoil33End
BattleScript_DoRecoil33::
BattleScript_MoveEffectRecoil::
jumpifmove MOVE_STRUGGLE, BattleScript_DoRecoil
jumpifability BS_ATTACKER, ABILITY_ROCK_HEAD, BattleScript_RecoilEnd
BattleScript_DoRecoil::
orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE | HITMARKER_x100000
healthbarupdate BS_ATTACKER
datahpupdate BS_ATTACKER
printstring STRINGID_PKMNHITWITHRECOIL
waitmessage 0x40
tryfaintmon BS_ATTACKER, FALSE, NULL
BattleScript_Recoil33End::
BattleScript_RecoilEnd::
return
BattleScript_ItemSteal::
@@ -4048,38 +4048,37 @@ BattleScript_82DB4AF::
waitmessage 0x40
return
BattleScript_82DB4B8::
call BattleScript_82DB4BE
BattleScript_IntimidateActivatesEnd3::
call BattleScript_PauseIntimidateActivates
end3
BattleScript_82DB4BE::
BattleScript_PauseIntimidateActivates:
pause 0x20
BattleScript_82DB4C1::
BattleScript_IntimidateActivates::
setbyte gBattlerTarget, 0x0
setstatchanger STAT_ATK, 1, TRUE
BattleScript_82DB4CD::
trygetintimidatetarget BattleScript_82DB51B
jumpifstatus2 BS_TARGET, STATUS2_SUBSTITUTE, BattleScript_82DB510
jumpifability BS_TARGET, ABILITY_CLEAR_BODY, BattleScript_82DB51C
jumpifability BS_TARGET, ABILITY_HYPER_CUTTER, BattleScript_82DB51C
jumpifability BS_TARGET, ABILITY_WHITE_SMOKE, BattleScript_82DB51C
statbuffchange 0x21, BattleScript_82DB510
jumpifbyte CMP_GREATER_THAN, cMULTISTRING_CHOOSER, 0x1, BattleScript_82DB510
BattleScript_IntimidateActivatesLoop:
trygetintimidatetarget BattleScript_IntimidateActivatesReturn
jumpifstatus2 BS_TARGET, STATUS2_SUBSTITUTE, BattleScript_IntimidateActivatesLoopIncrement
jumpifability BS_TARGET, ABILITY_CLEAR_BODY, BattleScript_IntimidatePrevented
jumpifability BS_TARGET, ABILITY_HYPER_CUTTER, BattleScript_IntimidatePrevented
jumpifability BS_TARGET, ABILITY_WHITE_SMOKE, BattleScript_IntimidatePrevented
statbuffchange 0x21, BattleScript_IntimidateActivatesLoopIncrement
jumpifbyte CMP_GREATER_THAN, cMULTISTRING_CHOOSER, 0x1, BattleScript_IntimidateActivatesLoopIncrement
setgraphicalstatchangevalues
playanimation BS_TARGET, B_ANIM_STATS_CHANGE, sB_ANIM_ARG1
printstring STRINGID_PKMNCUTSATTACKWITH
waitmessage 0x40
BattleScript_82DB510::
BattleScript_IntimidateActivatesLoopIncrement:
addbyte gBattlerTarget, 0x1
goto BattleScript_82DB4CD
BattleScript_82DB51B::
goto BattleScript_IntimidateActivatesLoop
BattleScript_IntimidateActivatesReturn:
return
BattleScript_82DB51C::
BattleScript_IntimidatePrevented:
pause 0x20
printstring STRINGID_PREVENTEDFROMWORKING
waitmessage 0x40
goto BattleScript_82DB510
goto BattleScript_IntimidateActivatesLoopIncrement
BattleScript_DroughtActivates::
pause 0x20
@@ -4252,7 +4251,7 @@ BattleScript_AbilityCuredStatus::
updatestatusicon BS_SCRIPTING
return
BattleScript_82DB695::
BattleScript_IgnoresWhileAsleep::
printstring STRINGID_PKMNIGNORESASLEEP
waitmessage 0x40
setbyte sMOVEEND_STATE, 0x0
@@ -4262,7 +4261,7 @@ BattleScript_82DB695::
BattleScript_IgnoresAndUsesRandomMove::
printstring STRINGID_PKMNIGNOREDORDERS
waitmessage 0x40
jumptorandomattack FALSE
jumptocalledmove FALSE
BattleScript_MoveUsedLoafingAround::
jumpifbyte CMP_NOT_EQUAL, cMULTISTRING_CHOOSER, 0x4, BattleScript_82DB6C7
@@ -4285,7 +4284,7 @@ BattleScript_IgnoresAndFallsAsleep::
moveend 0x2, 0x10
end
BattleScript_82DB6F0::
BattleScript_IgnoresAndHitsItself::
printstring STRINGID_PKMNWONTOBEY
waitmessage 0x40
goto BattleScript_DoSelfConfusionDmg
@@ -4463,7 +4462,7 @@ BattleScript_ActionSelectionItemsCantBeUsed::
printselectionstring STRINGID_ITEMSCANTBEUSEDNOW
endselectionscript
BattleScript_82DB87D::
BattleScript_FlushMessageBox::
printstring STRINGID_EMPTYSTRING3
return

2
data/battle_scripts_2.s
View File

@@ -190,7 +190,7 @@ BattleScript_ActionGetNear:
BattleScript_ActionThrowPokeblock:
printstring STRINGID_THREWPOKEBLOCKATPKMN
waitmessage 0x40
playanimation BS_ATTACKER, B_ANIM_x4, NULL
playanimation BS_ATTACKER, B_ANIM_POKEBLOCK_THROW, NULL
printfromtable gSafariPokeblockResultStringIds
waitmessage 0x40
end2

689
data/berries.inc
View File

@@ -1,689 +0,0 @@
.align 2
gBerries:: @ 858A670
.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

16
data/braille_puzzles.s
View File

@@ -1,16 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnknown_085EFE74:: @ 85EFE74
.byte 0x04, 0x15, 0x05, 0x15, 0x06, 0x15, 0x07, 0x15
.byte 0x08, 0x15, 0x09, 0x15, 0x0a, 0x15, 0x0b, 0x15
.byte 0x0c, 0x15, 0x0c, 0x16, 0x0c, 0x17, 0x0d, 0x17
.byte 0x0d, 0x18, 0x0d, 0x19, 0x0d, 0x1a, 0x0d, 0x1b
.byte 0x0c, 0x1b, 0x0c, 0x1c, 0x04, 0x1d, 0x05, 0x1d
.byte 0x06, 0x1d, 0x07, 0x1d, 0x08, 0x1d, 0x09, 0x1d
.byte 0x0a, 0x1d, 0x0b, 0x1d, 0x0c, 0x1d, 0x04, 0x1c
.byte 0x04, 0x1b, 0x03, 0x1b, 0x03, 0x1a, 0x03, 0x19
.byte 0x03, 0x18, 0x03, 0x17, 0x04, 0x17, 0x04, 0x16

219
data/data2b.s
View File

@@ -1,219 +0,0 @@
#include "constants/items.h"
#include "constants/moves.h"
#include "constants/species.h"
#include "constants/trainers.h"
#include "constants/pokemon.h"
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnknown_082FF1D8:: @ 82FF1D8
.incbin "graphics/link/minigame_digits.gbapal"
.align 2
gUnknown_082FF1F8:: @ 82FF1F8
.incbin "graphics/link/minigame_digits.4bpp.lz"
.align 2
gUnknown_082FF2B8:: @ 82FF2B8
.incbin "graphics/link/minigame_digits2.4bpp.lz"
.align 2
gUnknown_082FF3A8:: @ 82FF3A8
obj_frame_tiles gHeap + 0x8000, 0x800
obj_frame_tiles gHeap + 0x8800, 0x800
obj_frame_tiles gHeap + 0x9000, 0x800
obj_frame_tiles gHeap + 0x9800, 0x800
.align 2
gUnknown_082FF3C8:: @ 82FF3C8
obj_frame_tiles gHeap + 0xA000, 0x800
obj_frame_tiles gHeap + 0xA800, 0x800
obj_frame_tiles gHeap + 0xB000, 0x800
obj_frame_tiles gHeap + 0xB800, 0x800
.align 2
gUnknown_082FF3E8:: @ 82FF3E8
obj_frame_tiles gHeap + 0xC000, 0x800
obj_frame_tiles gHeap + 0xC800, 0x800
obj_frame_tiles gHeap + 0xD000, 0x800
obj_frame_tiles gHeap + 0xD800, 0x800
.align 2
gUnknown_082FF408:: @ 82FF408
obj_frame_tiles gHeap + 0xE000, 0x800
obj_frame_tiles gHeap + 0xE800, 0x800
obj_frame_tiles gHeap + 0xF000, 0x800
obj_frame_tiles gHeap + 0xF800, 0x800
.align 2
gUnknown_082FF428:: @ 82FF428
obj_frame_tiles gTrainerBackPic_Brendan, 0x0800
obj_frame_tiles gTrainerBackPic_Brendan + 0x0800, 0x0800
obj_frame_tiles gTrainerBackPic_Brendan + 0x1000, 0x0800
obj_frame_tiles gTrainerBackPic_Brendan + 0x1800, 0x0800
.align 2
gUnknown_082FF448:: @ 82FF448
obj_frame_tiles gTrainerBackPic_May, 0x0800
obj_frame_tiles gTrainerBackPic_May + 0x0800, 0x0800
obj_frame_tiles gTrainerBackPic_May + 0x1000, 0x0800
obj_frame_tiles gTrainerBackPic_May + 0x1800, 0x0800
.align 2
gUnknown_082FF468:: @ 82FF468
obj_frame_tiles gTrainerBackPic_Red, 0x0800
obj_frame_tiles gTrainerBackPic_Red + 0x0800, 0x0800
obj_frame_tiles gTrainerBackPic_Red + 0x1000, 0x0800
obj_frame_tiles gTrainerBackPic_Red + 0x1800, 0x0800
obj_frame_tiles gTrainerBackPic_Red + 0x2000, 0x0800
.align 2
gUnknown_082FF490:: @ 82FF490
obj_frame_tiles gTrainerBackPic_Leaf, 0x0800
obj_frame_tiles gTrainerBackPic_Leaf + 0x0800, 0x0800
obj_frame_tiles gTrainerBackPic_Leaf + 0x1000, 0x0800
obj_frame_tiles gTrainerBackPic_Leaf + 0x1800, 0x0800
obj_frame_tiles gTrainerBackPic_Leaf + 0x2000, 0x0800
.align 2
gUnknown_082FF4B8:: @ 82FF4B8
obj_frame_tiles gTrainerBackPic_RubySapphireBrendan, 0x0800
obj_frame_tiles gTrainerBackPic_RubySapphireBrendan + 0x0800, 0x0800
obj_frame_tiles gTrainerBackPic_RubySapphireBrendan + 0x1000, 0x0800
obj_frame_tiles gTrainerBackPic_RubySapphireBrendan + 0x1800, 0x0800
.align 2
gUnknown_082FF4D8:: @ 82FF4D8
obj_frame_tiles gTrainerBackPic_RubySapphireMay, 0x0800
obj_frame_tiles gTrainerBackPic_RubySapphireMay + 0x0800, 0x0800
obj_frame_tiles gTrainerBackPic_RubySapphireMay + 0x1000, 0x0800
obj_frame_tiles gTrainerBackPic_RubySapphireMay + 0x1800, 0x0800
.align 2
gUnknown_082FF4F8:: @ 82FF4F8
obj_frame_tiles gTrainerBackPic_Wally, 0x0800
obj_frame_tiles gTrainerBackPic_Wally + 0x0800, 0x0800
obj_frame_tiles gTrainerBackPic_Wally + 0x1000, 0x0800
obj_frame_tiles gTrainerBackPic_Wally + 0x1800, 0x0800
.align 2
gUnknown_082FF518:: @ 82FF518
obj_frame_tiles gTrainerBackPic_Steven, 0x0800
obj_frame_tiles gTrainerBackPic_Steven + 0x0800, 0x0800
obj_frame_tiles gTrainerBackPic_Steven + 0x1000, 0x0800
obj_frame_tiles gTrainerBackPic_Steven + 0x1800, 0x0800
.align 2
gAnimCmd_General_Frame0:: @ 82FF538
obj_image_anim_frame 0, 0
obj_image_anim_end
.align 2
AnimCmd_82FF540:: @ 82FF540
.2byte 0x0003, 0x0000, 0xffff, 0x0000
.align 2
gUnknown_082FF548:: @ 82FF548
.2byte 0x0100, 0x0100, 0x0000, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000
.align 2
gUnknown_082FF558:: @ 82FF558
.2byte 0xff00, 0x0100, 0x0000, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000
.align 2
gUnknown_082FF568:: @ 82FF568
.2byte 0x0028, 0x0028, 0x0000, 0x0000, 0x0012, 0x0012, 0x0c00, 0x0000
.2byte 0x7fff, 0x0000, 0x0000, 0x0000
.align 2
gUnknown_082FF580:: @ 82FF580
.2byte 0xfffe, 0xfffe, 0x1200, 0x0000, 0xfff0, 0xfff0, 0x0f00, 0x0000
.2byte 0x7fff, 0x0000, 0x0000, 0x0000
.align 2
gUnknown_082FF598:: @ 82FF598
.2byte 0x00a0, 0x0100, 0x0000, 0x0000, 0x0004, 0x0000, 0x0800, 0x0000
.2byte 0xfffc, 0x0000, 0x0800, 0x0000, 0x7ffe, 0x0001, 0x0000, 0x0000
.align 2
gUnknown_082FF5B8:: @ 82FF5B8
.2byte 0x0002, 0x0002, 0x1400, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000
.align 2
gUnknown_082FF5C8:: @ 82FF5C8
.2byte 0xfffe, 0xfffe, 0x1400, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000
.align 2
gUnknown_082FF5D8:: @ 82FF5D8
.2byte 0x0100, 0x0100, 0x0000, 0x0000, 0xfff0, 0xfff0, 0x0900, 0x0000
.2byte 0x7fff, 0x0000, 0x0000, 0x0000
.align 2
gUnknown_082FF5F0:: @ 82FF5F0
.2byte 0x0004, 0x0004, 0x3f00, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000
.align 2
gUnknown_082FF600:: @ 82FF600
.2byte 0x0000, 0x0000, 0x05fd, 0x0000, 0x0000, 0x0000, 0x0503, 0x0000
.2byte 0x7fff, 0x0000, 0x0000, 0x0000
.align 2
gUnknown_082FF618:: @ 82FF618
.4byte gUnknown_082FF548
.4byte gUnknown_082FF568
.4byte gUnknown_082FF580
.4byte gUnknown_082FF598
.4byte gUnknown_082FF5B8
.4byte gUnknown_082FF5C8
.4byte gUnknown_082FF5F0
.4byte gUnknown_082FF600
.4byte gUnknown_082FF5D8
.align 2
gUnknown_082FF63C:: @ 82FF63C
.2byte 0xfffc, 0xfffc, 0x3f04, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000
.align 2
gUnknown_082FF64C:: @ 82FF64C
.2byte 0x0000, 0x0000, 0x0503, 0x0000, 0x0000, 0x0000, 0x05fd, 0x0000
.2byte 0x7fff, 0x0000, 0x0000, 0x0000
.align 2
gUnknown_082FF664:: @ 82FF664
.2byte 0x0000, 0x0000, 0x14fb, 0x0000, 0x0000, 0x0000, 0x1400, 0x0000
.2byte 0x0000, 0x0000, 0x1405, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000
.align 2
gUnknown_082FF684:: @ 82FF684
.2byte 0x0000, 0x0000, 0x6e09, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000
.align 2
gUnknown_082FF694:: @ 82FF694
.4byte gUnknown_082FF548
.4byte gUnknown_082FF568
.4byte gUnknown_082FF580
.4byte gUnknown_082FF598
.4byte gUnknown_082FF5B8
.4byte gUnknown_082FF5C8
.4byte gUnknown_082FF63C
.4byte gUnknown_082FF64C
.4byte gUnknown_082FF664
.4byte gUnknown_082FF5D8
.4byte gUnknown_082FF684
.align 2
gUnknown_082FF6C0:: @ 82FF6C0
.4byte gUnknown_082FF558
.4byte gUnknown_082FF568
.4byte gUnknown_082FF580
.4byte gUnknown_082FF598
.4byte gUnknown_082FF5B8
.4byte gUnknown_082FF5C8
.4byte gUnknown_082FF63C
.4byte gUnknown_082FF64C
.4byte gUnknown_082FF664
.4byte gUnknown_082FF5D8
.4byte gUnknown_082FF684

173
data/data2c.s
View File

@@ -8,179 +8,6 @@
.section .rodata
.align 2
.2byte 0x0300, 0x0000
.align 2
gUnknown_0831A988:: @ 831A988
.byte 0x00, 0x03, 0x00, 0xc0, 0x00, 0x00, 0x00, 0x00
.align 2
gUnknown_0831A990:: @ 831A990
.byte 0x00, 0x03, 0x00, 0xc0, 0x40, 0x00, 0x00, 0x00
.align 2
gUnknown_0831A998:: @ 831A998
.2byte 0x0080, 0x0080, 0x0000, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000
.align 2
gUnknown_0831A9A8:: @ 831A9A8
.2byte 0x0080, 0x0080, 0x0000, 0x0000, 0x0018, 0x0018, 0x8000, 0x0000
.2byte 0x0018, 0x0018, 0x8000, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000
.align 2
gUnknown_0831A9C8:: @ 831A9C8
.4byte gUnknown_0831A998
.4byte gUnknown_0831A9A8
.align 2
gUnknown_0831A9D0:: @ 831A9D0
spr_template 0x2710, 0x2710, gUnknown_0831A988, gDummySpriteAnimTable, NULL, gUnknown_0831A9C8, nullsub_17
.align 2
gUnknown_0831A9E8:: @ 831A9E8
spr_template 0x2710, 0x2710, gUnknown_0831A990, gDummySpriteAnimTable, NULL, gUnknown_0831A9C8, nullsub_17
.align 2
gUnknown_0831AA00:: @ 831AA00
obj_tiles gUnknown_08D77B0C, 0x1000, 0x2710
.align 2
gBattleBgTemplates:: @ 831AA08
.4byte 0x00000580, 0x000005c5, 0x000013e6, 0x000033ab
.align 2
gUnknown_0831AA18:: @ 831AA18
window_template 0x00, 0x02, 0x0f, 0x1a, 0x04, 0x00, 0x0090
window_template 0x00, 0x01, 0x23, 0x0e, 0x04, 0x00, 0x01c0
window_template 0x00, 0x11, 0x23, 0x0c, 0x04, 0x05, 0x0190
window_template 0x00, 0x02, 0x37, 0x08, 0x02, 0x05, 0x0300
window_template 0x00, 0x0b, 0x37, 0x08, 0x02, 0x05, 0x0310
window_template 0x00, 0x02, 0x39, 0x08, 0x02, 0x05, 0x0320
window_template 0x00, 0x0b, 0x39, 0x08, 0x02, 0x05, 0x0330
window_template 0x00, 0x15, 0x37, 0x04, 0x02, 0x05, 0x0290
window_template 0x00, 0x15, 0x39, 0x00, 0x00, 0x05, 0x0298
window_template 0x00, 0x19, 0x37, 0x04, 0x02, 0x05, 0x0298
window_template 0x00, 0x15, 0x39, 0x08, 0x02, 0x05, 0x02a0
window_template 0x00, 0x15, 0x37, 0x08, 0x04, 0x05, 0x02b0
window_template 0x00, 0x1a, 0x09, 0x03, 0x04, 0x05, 0x0100
window_template 0x01, 0x13, 0x08, 0x0a, 0x0b, 0x05, 0x0100
window_template 0x02, 0x12, 0x00, 0x0c, 0x03, 0x06, 0x016e
window_template 0x01, 0x02, 0x03, 0x06, 0x02, 0x05, 0x0020
window_template 0x02, 0x02, 0x03, 0x06, 0x02, 0x05, 0x0040
window_template 0x01, 0x02, 0x02, 0x06, 0x02, 0x05, 0x0020
window_template 0x02, 0x02, 0x02, 0x06, 0x02, 0x05, 0x0040
window_template 0x01, 0x02, 0x06, 0x06, 0x02, 0x05, 0x0060
window_template 0x02, 0x02, 0x06, 0x06, 0x02, 0x05, 0x0080
window_template 0x00, 0x0c, 0x02, 0x06, 0x02, 0x00, 0x00a0
window_template 0x00, 0x04, 0x02, 0x07, 0x02, 0x00, 0x00a0
window_template 0x00, 0x13, 0x02, 0x07, 0x02, 0x00, 0x00b0
null_window_template
.align 2
gUnknown_0831AAE0:: @ 831AAE0
window_template 0x00, 0x02, 0x0f, 0x1a, 0x04, 0x00, 0x0090
window_template 0x00, 0x01, 0x23, 0x0e, 0x04, 0x00, 0x01c0
window_template 0x00, 0x11, 0x23, 0x0c, 0x04, 0x05, 0x0190
window_template 0x00, 0x02, 0x37, 0x08, 0x02, 0x05, 0x0300
window_template 0x00, 0x0b, 0x37, 0x08, 0x02, 0x05, 0x0310
window_template 0x00, 0x02, 0x39, 0x08, 0x02, 0x05, 0x0320
window_template 0x00, 0x0b, 0x39, 0x08, 0x02, 0x05, 0x0330
window_template 0x00, 0x15, 0x37, 0x04, 0x02, 0x05, 0x0290
window_template 0x00, 0x15, 0x39, 0x00, 0x00, 0x05, 0x0298
window_template 0x00, 0x19, 0x37, 0x04, 0x02, 0x05, 0x0298
window_template 0x00, 0x15, 0x39, 0x08, 0x02, 0x05, 0x02a0
window_template 0x00, 0x15, 0x37, 0x08, 0x04, 0x05, 0x02b0
window_template 0x00, 0x1a, 0x09, 0x03, 0x04, 0x05, 0x0100
window_template 0x01, 0x13, 0x08, 0x0a, 0x0b, 0x05, 0x0100
window_template 0x02, 0x12, 0x00, 0x0c, 0x03, 0x06, 0x016e
window_template 0x00, 0x06, 0x01, 0x08, 0x02, 0x05, 0x0100
window_template 0x00, 0x0e, 0x01, 0x02, 0x02, 0x05, 0x0110
window_template 0x00, 0x10, 0x01, 0x08, 0x02, 0x05, 0x0114
window_template 0x00, 0x0c, 0x04, 0x06, 0x02, 0x05, 0x0124
window_template 0x00, 0x0c, 0x06, 0x06, 0x02, 0x05, 0x0130
window_template 0x00, 0x0c, 0x08, 0x06, 0x02, 0x05, 0x013c
window_template 0x00, 0x08, 0x0b, 0x0e, 0x02, 0x05, 0x0148
window_template 0x00, 0x02, 0x0f, 0x1a, 0x04, 0x07, 0x0090
null_window_template
.align 2
gBattleWindowTemplates:: @ 831ABA0
.4byte gUnknown_0831AA18
.4byte gUnknown_0831AAE0
.align 2
gBattleTerrainTable:: @ 831ABA8
@ tall_grass
.4byte gBattleTerrainTiles_TallGrass
.4byte gBattleTerrainTilemap_TallGrass
.4byte gBattleTerrainAnimTiles_TallGrass
.4byte gBattleTerrainAnimTilemap_TallGrass
.4byte gBattleTerrainPalette_TallGrass
@ long_grass
.4byte gBattleTerrainTiles_LongGrass
.4byte gBattleTerrainTilemap_LongGrass
.4byte gBattleTerrainAnimTiles_LongGrass
.4byte gBattleTerrainAnimTilemap_LongGrass
.4byte gBattleTerrainPalette_LongGrass
@ sand
.4byte gBattleTerrainTiles_Sand
.4byte gBattleTerrainTilemap_Sand
.4byte gBattleTerrainAnimTiles_Sand
.4byte gBattleTerrainAnimTilemap_Sand
.4byte gBattleTerrainPalette_Sand
@ underwater
.4byte gBattleTerrainTiles_Underwater
.4byte gBattleTerrainTilemap_Underwater
.4byte gBattleTerrainAnimTiles_Underwater
.4byte gBattleTerrainAnimTilemap_Underwater
.4byte gBattleTerrainPalette_Underwater
@ water
.4byte gBattleTerrainTiles_Water
.4byte gBattleTerrainTilemap_Water
.4byte gBattleTerrainAnimTiles_Water
.4byte gBattleTerrainAnimTilemap_Water
.4byte gBattleTerrainPalette_Water
@ pond_water
.4byte gBattleTerrainTiles_PondWater
.4byte gBattleTerrainTilemap_PondWater
.4byte gBattleTerrainAnimTiles_PondWater
.4byte gBattleTerrainAnimTilemap_PondWater
.4byte gBattleTerrainPalette_PondWater
@ rock
.4byte gBattleTerrainTiles_Rock
.4byte gBattleTerrainTilemap_Rock
.4byte gBattleTerrainAnimTiles_Rock
.4byte gBattleTerrainAnimTilemap_Rock
.4byte gBattleTerrainPalette_Rock
@ cave
.4byte gBattleTerrainTiles_Cave
.4byte gBattleTerrainTilemap_Cave
.4byte gBattleTerrainAnimTiles_Cave
.4byte gBattleTerrainAnimTilemap_Cave
.4byte gBattleTerrainPalette_Cave
@ building
.4byte gBattleTerrainTiles_Building
.4byte gBattleTerrainTilemap_Building
.4byte gBattleTerrainAnimTiles_Building
.4byte gBattleTerrainAnimTilemap_Building
.4byte gBattleTerrainPalette_Building
@ plain
.4byte gBattleTerrainTiles_Building
.4byte gBattleTerrainTilemap_Building
.4byte gBattleTerrainAnimTiles_Building
.4byte gBattleTerrainAnimTilemap_Building
.4byte gBattleTerrainPalette_Plain
.align 2
gUnknown_0831AC70:: @ 831AC70
.4byte REG_BG3HOFS

6
data/field_ground_effect.s
View File

@@ -1,6 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2, 0

103
data/field_player_avatar.s
View File

@@ -1,103 +0,0 @@
@ the third big chunk of data
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2, 0
gUnknown_084974B8:: @ 84974B8
.4byte PlayerAvatarTransition_Normal
.4byte PlayerAvatarTransition_MachBike
.4byte PlayerAvatarTransition_AcroBike
.4byte PlayerAvatarTransition_Surfing
.4byte PlayerAvatarTransition_Underwater
.4byte PlayerAvatarTransition_ReturnToField
.4byte PlayerAvatarTransition_Dummy
.4byte PlayerAvatarTransition_Dummy
gUnknown_084974D8:: @ 84974D8
.4byte MetatileBehavior_IsSouthArrowWarp
.4byte MetatileBehavior_IsNorthArrowWarp
.4byte MetatileBehavior_IsWestArrowWarp
.4byte MetatileBehavior_IsEastArrowWarp
gUnknown_084974E8:: @ 84974E8
.byte 0x64, 0x69, 0x65, 0x6a, 0x66, 0x6b, 0x67, 0x6c, 0x6f, 0x70, 0x68, 0x6d, 0x89, 0x8a, 0xbf, 0xc0
gUnknown_084974F8:: @ 84974F8
.byte 0x00, 0x59, 0x01, 0x5a, 0x3f, 0x5b, 0x02, 0x5c, 0x6f, 0x70, 0x03, 0x5d, 0x89, 0x8a, 0xbf, 0xc0
gUnknown_08497508:: @ 8497508
.byte 0xe6, 0xe7
gUnknown_0849750A:: @ 849750A
.byte 0xeb, 0xec
gUnknown_0849750C:: @ 849750C
.byte 0x00, 0x01, 0x01, 0x02, 0x3f, 0x04, 0x02, 0x08, 0x6f, 0x10, 0x59, 0x01, 0x5a, 0x02, 0x5b, 0x04, 0x5c, 0x08, 0x70, 0x10
gUnknown_08497520:: @ 8497520
.4byte MetatileBehavior_IsSouthArrowWarp
.4byte MetatileBehavior_IsNorthArrowWarp
.4byte MetatileBehavior_IsWestArrowWarp
.4byte MetatileBehavior_IsEastArrowWarp
gUnknown_08497530:: @ 8497530
.4byte sub_808C3A4
.4byte do_boulder_dust
.4byte sub_808C484
gUnknown_0849753C:: @ 849753C
.4byte sub_808C544
gUnknown_08497540:: @ 8497540
.4byte sub_808C61C
.4byte sub_808C644
.4byte sub_808C6BC
.4byte sub_808C6FC
gUnknown_08497550:: @ 8497550
.byte 3, 4, 2, 1
gUnknown_08497554:: @ 8497554
.byte 16, 16, 17, 18, 19
.align 2
gUnknown_0849755C:: @ 849755C
.4byte fish0
.4byte fish1
.4byte fish2
.4byte fish3
.4byte fish4
.4byte fish5
.4byte fish6
.4byte fish7
.4byte fish8
.4byte fish9
.4byte fishA_wait_for_a_pressed
.4byte fishB
.4byte fishC
.4byte fishD
.4byte fishE
.4byte fishF
gUnknown_0849759C:: @ 849759C
.2byte 1, 1, 1
gUnknown_084975A2:: @ 84975A2
.2byte 1, 3, 6
gUnknown_084975A8:: @ 84975A8
.string "·$"
gUnknown_084975AA:: @ 84975AA
.2byte 36, 33, 30
gUnknown_084975B0:: @ 84975B0
.2byte 0, 0
.2byte 0x28, 10
.2byte 0x46, 30
gUnknown_084975BC:: @ 84975BC
.byte 0x01, 0x03, 0x04, 0x02, 0x01, 0x00, 0x00, 0x00

15
data/field_special_scene.s
View File

@@ -1,15 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2, 0
gTruckCamera_HorizontalTable:: @ 858E898
.byte 0, 0, 0, 0, 0, 0, 0, 0, 1, 2, 2, 2, 2, 2, 2, -1, -1, -1, 0
gUnknown_0858E8AB:: @ 858E8AB
.byte 0x18, 0xFE
gUnknown_0858E8AD:: @ 858E8AD
.byte 0x17, 0xFE

5189
data/graphics.s
View File

File diff suppressed because it is too large Load Diff

343
data/graphics/berries/berry_graphics.inc
View File

@@ -1,343 +0,0 @@
.align 2
gBerryPic_Cheri:: @ 8D9C3A8
.incbin "graphics/berries/cheri.4bpp.lz"
.align 2
gBerryPic_Oran:: @ 8D9C4FC
.incbin "graphics/berries/oran.4bpp.lz"
.align 2
gBerryPic_Pecha:: @ 8D9C670
.incbin "graphics/berries/pecha.4bpp.lz"
.align 2
gBerryPic_Rawst:: @ 8D9C7E4
.incbin "graphics/berries/rawst.4bpp.lz"
.align 2
gBerryPic_Aspear:: @ 8D9C97C
.incbin "graphics/berries/aspear.4bpp.lz"
.align 2
gBerryPic_Leppa:: @ 8D9CB24
.incbin "graphics/berries/leppa.4bpp.lz"
.align 2
gBerryPic_Chesto:: @ 8D9CC94
.incbin "graphics/berries/chesto.4bpp.lz"
.align 2
gBerryPic_Persim:: @ 8D9CE78
.incbin "graphics/berries/persim.4bpp.lz"
.align 2
gBerryPic_Lum:: @ 8D9CFC8
.incbin "graphics/berries/lum.4bpp.lz"
.align 2
gBerryPic_Sitrus:: @ 8D9D0E4
.incbin "graphics/berries/sitrus.4bpp.lz"
.align 2
gBerryPic_Figy:: @ 8D9D288
.incbin "graphics/berries/figy.4bpp.lz"
.align 2
gBerryPic_Wiki:: @ 8D9D434
.incbin "graphics/berries/wiki.4bpp.lz"
.align 2
gBerryPic_Mago:: @ 8D9D628
.incbin "graphics/berries/mago.4bpp.lz"
.align 2
gBerryPic_Aguav:: @ 8D9D7DC
.incbin "graphics/berries/aguav.4bpp.lz"
.align 2
gBerryPic_Iapapa:: @ 8D9D950
.incbin "graphics/berries/iapapa.4bpp.lz"
.align 2
gBerryPic_Razz:: @ 8D9DC08
.incbin "graphics/berries/razz.4bpp.lz"
.align 2
gBerryPic_Bluk:: @ 8D9DE38
.incbin "graphics/berries/bluk.4bpp.lz"
.align 2
gBerryPic_Nanab:: @ 8D9E020
.incbin "graphics/berries/nanab.4bpp.lz"
.align 2
gBerryPic_Wepear:: @ 8D9E194
.incbin "graphics/berries/wepear.4bpp.lz"
.align 2
gBerryPic_Pinap:: @ 8D9E35C
.incbin "graphics/berries/pinap.4bpp.lz"
.align 2
gBerryPic_Pomeg:: @ 8D9E570
.incbin "graphics/berries/pomeg.4bpp.lz"
.align 2
gBerryPic_Kelpsy:: @ 8D9E718
.incbin "graphics/berries/kelpsy.4bpp.lz"
.align 2
gBerryPic_Qualot:: @ 8D9E8C0
.incbin "graphics/berries/qualot.4bpp.lz"
.align 2
gBerryPic_Hondew:: @ 8D9EA8C
.incbin "graphics/berries/hondew.4bpp.lz"
.align 2
gBerryPic_Grepa:: @ 8D9ECE4
.incbin "graphics/berries/grepa.4bpp.lz"
.align 2
gBerryPic_Tamato:: @ 8D9EE74
.incbin "graphics/berries/tamato.4bpp.lz"
.align 2
gBerryPic_Cornn:: @ 8D9F138
.incbin "graphics/berries/cornn.4bpp.lz"
.align 2
gBerryPic_Magost:: @ 8D9F33C
.incbin "graphics/berries/magost.4bpp.lz"
.align 2
gBerryPic_Rabuta:: @ 8D9F4E0
.incbin "graphics/berries/rabuta.4bpp.lz"
.align 2
gBerryPic_Nomel:: @ 8D9F7D4
.incbin "graphics/berries/nomel.4bpp.lz"
.align 2
gBerryPic_Spelon:: @ 8D9F9B0
.incbin "graphics/berries/spelon.4bpp.lz"
.align 2
gBerryPic_Pamtre:: @ 8D9FBA0
.incbin "graphics/berries/pamtre.4bpp.lz"
.align 2
gBerryPic_Watmel:: @ 8D9FDF0
.incbin "graphics/berries/watmel.4bpp.lz"
.align 2
gBerryPic_Durin:: @ 8DA00D4
.incbin "graphics/berries/durin.4bpp.lz"
.align 2
gBerryPic_Belue:: @ 8DA04A0
.incbin "graphics/berries/belue.4bpp.lz"
.align 2
gBerryPic_Liechi:: @ 8DA0778
.incbin "graphics/berries/liechi.4bpp.lz"
.align 2
gBerryPic_Ganlon:: @ 8DA09D0
.incbin "graphics/berries/ganlon.4bpp.lz"
.align 2
gBerryPic_Salac:: @ 8DA0B68
.incbin "graphics/berries/salac.4bpp.lz"
.align 2
gBerryPic_Petaya:: @ 8DA0DAC
.incbin "graphics/berries/petaya.4bpp.lz"
.align 2
gBerryPic_Apicot:: @ 8DA1054
.incbin "graphics/berries/apicot.4bpp.lz"
.align 2
gBerryPic_Lansat:: @ 8DA11E4
.incbin "graphics/berries/lansat.4bpp.lz"
.align 2
gBerryPic_Starf:: @ 8DA13D8
.incbin "graphics/berries/starf.4bpp.lz"
.align 2
gBerryPic_Enigma:: @ 8DA15A8
.incbin "graphics/berries/enigma.4bpp.lz"
.align 2
gBerryPalette_Cheri:: @ 8DA17C0
.incbin "graphics/berries/cheri.gbapal.lz"
.align 2
gBerryPalette_Oran:: @ 8DA17E8
.incbin "graphics/berries/oran.gbapal.lz"
.align 2
gBerryPalette_Pecha:: @ 8DA1810
.incbin "graphics/berries/pecha.gbapal.lz"
.align 2
gBerryPalette_Rawst:: @ 8DA1838
.incbin "graphics/berries/rawst.gbapal.lz"
.align 2
gBerryPalette_Aspear:: @ 8DA1860
.incbin "graphics/berries/aspear.gbapal.lz"
.align 2
gBerryPalette_Leppa:: @ 8DA1888
.incbin "graphics/berries/leppa.gbapal.lz"
.align 2
gBerryPalette_Chesto:: @ 8DA18B0
.incbin "graphics/berries/chesto.gbapal.lz"
.align 2
gBerryPalette_Persim:: @ 8DA18D8
.incbin "graphics/berries/persim.gbapal.lz"
.align 2
gBerryPalette_Lum:: @ 8DA1900
.incbin "graphics/berries/lum.gbapal.lz"
.align 2
gBerryPalette_Sitrus:: @ 8DA1928
.incbin "graphics/berries/sitrus.gbapal.lz"
.align 2
gBerryPalette_Figy:: @ 8DA1950
.incbin "graphics/berries/figy.gbapal.lz"
.align 2
gBerryPalette_Wiki:: @ 8DA1978
.incbin "graphics/berries/wiki.gbapal.lz"
.align 2
gBerryPalette_Mago:: @ 8DA19A0
.incbin "graphics/berries/mago.gbapal.lz"
.align 2
gBerryPalette_Aguav:: @ 8DA19C8
.incbin "graphics/berries/aguav.gbapal.lz"
.align 2
gBerryPalette_Iapapa:: @ 8DA19F0
.incbin "graphics/berries/iapapa.gbapal.lz"
.align 2
gBerryPalette_Razz:: @ 8DA1A18
.incbin "graphics/berries/razz.gbapal.lz"
.align 2
gBerryPalette_Bluk:: @ 8DA1A40
.incbin "graphics/berries/bluk.gbapal.lz"
.align 2
gBerryPalette_Nanab:: @ 8DA1A68
.incbin "graphics/berries/nanab.gbapal.lz"
.align 2
gBerryPalette_Wepear:: @ 8DA1A90
.incbin "graphics/berries/wepear.gbapal.lz"
.align 2
gBerryPalette_Pinap:: @ 8DA1AB8
.incbin "graphics/berries/pinap.gbapal.lz"
.align 2
gBerryPalette_Pomeg:: @ 8DA1AE0
.incbin "graphics/berries/pomeg.gbapal.lz"
.align 2
gBerryPalette_Kelpsy:: @ 8DA1B08
.incbin "graphics/berries/kelpsy.gbapal.lz"
.align 2
gBerryPalette_Qualot:: @ 8DA1B30
.incbin "graphics/berries/qualot.gbapal.lz"
.align 2
gBerryPalette_Hondew:: @ 8DA1B58
.incbin "graphics/berries/hondew.gbapal.lz"
.align 2
gBerryPalette_Grepa:: @ 8DA1B80
.incbin "graphics/berries/grepa.gbapal.lz"
.align 2
gBerryPalette_Tamato:: @ 8DA1BA8
.incbin "graphics/berries/tamato.gbapal.lz"
.align 2
gBerryPalette_Cornn:: @ 8DA1BD0
.incbin "graphics/berries/cornn.gbapal.lz"
.align 2
gBerryPalette_Magost:: @ 8DA1BF8
.incbin "graphics/berries/magost.gbapal.lz"
.align 2
gBerryPalette_Rabuta:: @ 8DA1C20
.incbin "graphics/berries/rabuta.gbapal.lz"
.align 2
gBerryPalette_Nomel:: @ 8DA1C48
.incbin "graphics/berries/nomel.gbapal.lz"
.align 2
gBerryPalette_Spelon:: @ 8DA1C70
.incbin "graphics/berries/spelon.gbapal.lz"
.align 2
gBerryPalette_Pamtre:: @ 8DA1C98
.incbin "graphics/berries/pamtre.gbapal.lz"
.align 2
gBerryPalette_Watmel:: @ 8DA1CC0
.incbin "graphics/berries/watmel.gbapal.lz"
.align 2
gBerryPalette_Durin:: @ 8DA1CE8
.incbin "graphics/berries/durin.gbapal.lz"
.align 2
gBerryPalette_Belue:: @ 8DA1D10
.incbin "graphics/berries/belue.gbapal.lz"
.align 2
gBerryPalette_Liechi:: @ 8DA1D38
.incbin "graphics/berries/liechi.gbapal.lz"
.align 2
gBerryPalette_Ganlon:: @ 8DA1D60
.incbin "graphics/berries/ganlon.gbapal.lz"
.align 2
gBerryPalette_Salac:: @ 8DA1D88
.incbin "graphics/berries/salac.gbapal.lz"
.align 2
gBerryPalette_Petaya:: @ 8DA1DB0
.incbin "graphics/berries/petaya.gbapal.lz"
.align 2
gBerryPalette_Apicot:: @ 8DA1DD8
.incbin "graphics/berries/apicot.gbapal.lz"
.align 2
gBerryPalette_Lansat:: @ 8DA1E00
.incbin "graphics/berries/lansat.gbapal.lz"
.align 2
gBerryPalette_Starf:: @ 8DA1E28
.incbin "graphics/berries/starf.gbapal.lz"
.align 2
gBerryPalette_Enigma:: @ 8DA1E50
.incbin "graphics/berries/enigma.gbapal.lz"

252
data/graphics/decorations/decoration_graphics.inc
View File

@@ -1,252 +0,0 @@
gUnknown_08DB7AA0::
.incbin "graphics/decorations/decor_heavy_desk.4bpp.lz"
gUnknown_08DB7B34::
.incbin "graphics/decorations/decor_heavy_desk.gbapal.lz"
gUnknown_08DB7B5C::
.incbin "graphics/decorations/decor_ragged_desk.4bpp.lz"
gUnknown_08DB7BEC::
.incbin "graphics/decorations/decor_ragged_desk.gbapal.lz"
gUnknown_08DB7C08::
.incbin "graphics/decorations/decor_comfort_desk.4bpp.lz"
gUnknown_08DB7CE8::
.incbin "graphics/decorations/decor_comfort_desk.gbapal.lz"
gUnknown_08DB7D08::
.incbin "graphics/decorations/decor_pretty_desk.4bpp.lz"
gUnknown_08DB7DCC::
.incbin "graphics/decorations/decor_pretty_desk.gbapal.lz"
gUnknown_08DB7DF4::
.incbin "graphics/decorations/decor_brick_desk.4bpp.lz"
gUnknown_08DB7EA0::
.incbin "graphics/decorations/decor_brick_desk.gbapal.lz"
gUnknown_08DB7EC4::
.incbin "graphics/decorations/decor_camp_desk.4bpp.lz"
gUnknown_08DB7F60::
.incbin "graphics/decorations/decor_camp_desk.gbapal.lz"
gUnknown_08DB7F7C::
.incbin "graphics/decorations/decor_hard_desk.4bpp.lz"
gUnknown_08DB8070::
.incbin "graphics/decorations/decor_hard_desk.gbapal.lz"
gUnknown_08DB808C::
.incbin "graphics/decorations/decor_red_plant.4bpp.lz"
gUnknown_08DB8138::
.incbin "graphics/decorations/decor_red_plant.gbapal.lz"
gUnknown_08DB8160::
.incbin "graphics/decorations/decor_tropical_plant.4bpp.lz"
gUnknown_08DB8218::
.incbin "graphics/decorations/decor_tropical_plant.gbapal.lz"
gUnknown_08DB823C::
.incbin "graphics/decorations/decor_pretty_flowers.4bpp.lz"
gUnknown_08DB8300::
.incbin "graphics/decorations/decor_pretty_flowers.gbapal.lz"
gUnknown_08DB8328::
.incbin "graphics/decorations/decor_colorful_plant.4bpp.lz"
gUnknown_08DB8430::
.incbin "graphics/decorations/decor_colorful_plant.gbapal.lz"
gUnknown_08DB8458::
.incbin "graphics/decorations/decor_big_plant.4bpp.lz"
gUnknown_08DB8528::
.incbin "graphics/decorations/decor_big_plant.gbapal.lz"
gUnknown_08DB854C::
.incbin "graphics/decorations/decor_gorgeous_plant.4bpp.lz"
gUnknown_08DB862C::
.incbin "graphics/decorations/decor_gorgeous_plant.gbapal.lz"
gUnknown_08DB8654::
.incbin "graphics/decorations/decor_red_brick.4bpp.lz"
gUnknown_08DB86C4::
.incbin "graphics/decorations/decor_red_brick.gbapal.lz"
gUnknown_08DB86E0::
.incbin "graphics/decorations/decor_yellow_brick.4bpp.lz"
gUnknown_08DB8750::
.incbin "graphics/decorations/decor_yellow_brick.gbapal.lz"
gUnknown_08DB876C::
.incbin "graphics/decorations/decor_blue_brick.4bpp.lz"
gUnknown_08DB87DC::
.incbin "graphics/decorations/decor_blue_brick.gbapal.lz"
gUnknown_08DB87F8::
.incbin "graphics/decorations/decor_red_tent.4bpp.lz"
gUnknown_08DB88D8::
.incbin "graphics/decorations/decor_red_tent.gbapal.lz"
gUnknown_08DB8900::
.incbin "graphics/decorations/decor_blue_tent.4bpp.lz"
gUnknown_08DB89E0::
.incbin "graphics/decorations/decor_blue_tent.gbapal.lz"
gUnknown_08DB8A08::
.incbin "graphics/decorations/decor_solid_board.4bpp.lz"
gUnknown_08DB8A68::
.incbin "graphics/decorations/decor_solid_board.gbapal.lz"
gUnknown_08DB8A84::
.incbin "graphics/decorations/decor_slide.4bpp.lz"
gUnknown_08DB8B40::
.incbin "graphics/decorations/decor_slide.gbapal.lz"
gUnknown_08DB8B68::
.incbin "graphics/decorations/decor_tire.4bpp.lz"
gUnknown_08DB8C40::
.incbin "graphics/decorations/decor_tire.gbapal.lz"
gUnknown_08DB8C5C::
.incbin "graphics/decorations/decor_stand.4bpp.lz"
gUnknown_08DB8CF4::
.incbin "graphics/decorations/decor_stand.gbapal.lz"
gUnknown_08DB8D18::
.incbin "graphics/decorations/decor_breakable_door.4bpp.lz"
gUnknown_08DB8DB0::
.incbin "graphics/decorations/decor_breakable_door.gbapal.lz"
gUnknown_08DB8DD4::
.incbin "graphics/decorations/decor_sand_ornament.4bpp.lz"
gUnknown_08DB8E80::
.incbin "graphics/decorations/decor_sand_ornament.gbapal.lz"
gUnknown_08DB8EA0::
.incbin "graphics/decorations/decor_glass_ornament.4bpp.lz"
gUnknown_08DB8F58::
.incbin "graphics/decorations/decor_glass_ornament.gbapal.lz"
gUnknown_08DB8F7C::
.incbin "graphics/decorations/decor_surf_mat.4bpp.lz"
gUnknown_08DB9038::
.incbin "graphics/decorations/decor_surf_mat.gbapal.lz"
gUnknown_08DB9058::
.incbin "graphics/decorations/decor_thunder_mat.4bpp.lz"
gUnknown_08DB9130::
.incbin "graphics/decorations/decor_thunder_mat.gbapal.lz"
gUnknown_08DB9154::
.incbin "graphics/decorations/decor_fire_blast_mat.4bpp.lz"
gUnknown_08DB9218::
.incbin "graphics/decorations/decor_fire_blast_mat.gbapal.lz"
gUnknown_08DB9234::
.incbin "graphics/decorations/decor_powder_snow_mat.4bpp.lz"
gUnknown_08DB92FC::
.incbin "graphics/decorations/decor_powder_snow_mat.gbapal.lz"
gUnknown_08DB931C::
.incbin "graphics/decorations/decor_attract_mat.4bpp.lz"
gUnknown_08DB93E8::
.incbin "graphics/decorations/decor_attract_mat.gbapal.lz"
gUnknown_08DB940C::
.incbin "graphics/decorations/decor_fissure_mat.4bpp.lz"
gUnknown_08DB94CC::
.incbin "graphics/decorations/decor_fissure_mat.gbapal.lz"
gUnknown_08DB94E8::
.incbin "graphics/decorations/decor_spikes_mat.4bpp.lz"
gUnknown_08DB95AC::
.incbin "graphics/decorations/decor_spikes_mat.gbapal.lz"
gUnknown_08DB95D0::
.incbin "graphics/decorations/decor_snorlax_doll.4bpp.lz"
gUnknown_08DB96C4::
.incbin "graphics/decorations/decor_snorlax_doll.gbapal.lz"
gUnknown_08DB96EC::
.incbin "graphics/decorations/decor_rhydon_doll.4bpp.lz"
gUnknown_08DB97F4::
.incbin "graphics/decorations/decor_rhydon_doll.gbapal.lz"
gUnknown_08DB981C::
.incbin "graphics/decorations/decor_lapras_doll.4bpp.lz"
gUnknown_08DB9908::
.incbin "graphics/decorations/decor_lapras_doll.gbapal.lz"
gUnknown_08DB9930::
.incbin "graphics/decorations/decor_venusaur_doll.4bpp.lz"
gUnknown_08DB9A54::
.incbin "graphics/decorations/decor_venusaur_doll.gbapal.lz"
gUnknown_08DB9A7C::
.incbin "graphics/decorations/decor_charizard_doll.4bpp.lz"
gUnknown_08DB9B7C::
.incbin "graphics/decorations/decor_charizard_doll.gbapal.lz"
gUnknown_08DB9BA4::
.incbin "graphics/decorations/decor_blastoise_doll.4bpp.lz"
gUnknown_08DB9CB0::
.incbin "graphics/decorations/decor_blastoise_doll.gbapal.lz"
gUnknown_08DB9CD8::
.incbin "graphics/decorations/decor_wailmer_doll.4bpp.lz"
gUnknown_08DB9DAC::
.incbin "graphics/decorations/decor_wailmer_doll.gbapal.lz"
gUnknown_08DB9DD4::
.incbin "graphics/decorations/decor_regice_doll.4bpp.lz"
gUnknown_08DB9EE4::
.incbin "graphics/decorations/decor_regice_doll.gbapal.lz"
gUnknown_08DB9F08::
.incbin "graphics/decorations/decor_regirock_doll.4bpp.lz"
gUnknown_08DB9FFC::
.incbin "graphics/decorations/decor_regirock_doll.gbapal.lz"
gUnknown_08DBA020::
.incbin "graphics/decorations/decor_registeel_doll.4bpp.lz"
gUnknown_08DBA12C::
.incbin "graphics/decorations/decor_registeel_doll.gbapal.lz"

1883
data/graphics/items/item_graphics.inc
View File

File diff suppressed because it is too large Load Diff

15
data/graphics/pokemon/circled_question_mark_graphics.inc
View File

@@ -1,15 +0,0 @@
.align 2
gMonStillFrontPic_CircledQuestionMark:: @ 8C00750
.incbin "graphics/pokemon/front_pics/circled_question_mark_still_front_pic.4bpp.lz"
.align 2
gMonBackPic_CircledQuestionMark:: @ 8C00998
.incbin "graphics/pokemon/back_pics/circled_question_mark_back_pic.4bpp.lz"
.align 2
gMonPalette_CircledQuestionMark:: @ 8C00BE0
.incbin "graphics/pokemon/palettes/circled_question_mark_palette.gbapal.lz"
.align 2
gMonShinyPalette_CircledQuestionMark:: @ 8C00BF8
.incbin "graphics/pokemon/palettes/circled_question_mark_shiny_palette.gbapal.lz"

9619
data/graphics/pokemon/graphics.inc
View File

File diff suppressed because it is too large Load Diff

783
data/graphics/trainers/graphics.inc
View File

@@ -1,783 +0,0 @@
.align 2
gTrainerFrontPic_Hiker:: @ 8D51DC8
.incbin "graphics/trainers/front_pics/hiker_front_pic.4bpp.lz"
.align 2
gTrainerPalette_Hiker:: @ 8D52248
.incbin "graphics/trainers/palettes/hiker.gbapal.lz"
.align 2
gTrainerFrontPic_AquaGruntM:: @ 8D52270
.incbin "graphics/trainers/front_pics/aqua_grunt_m_front_pic.4bpp.lz"
.align 2
gTrainerPalette_AquaGruntM:: @ 8D525D0
.incbin "graphics/trainers/palettes/aqua_grunt_m.gbapal.lz"
.align 2
gTrainerFrontPic_PokemonBreederF:: @ 8D525F8
.incbin "graphics/trainers/front_pics/pokemon_breeder_f_front_pic.4bpp.lz"
.align 2
gTrainerPalette_PokemonBreederF:: @ 8D5292C
.incbin "graphics/trainers/palettes/pokemon_breeder_f.gbapal.lz"
.align 2
gTrainerFrontPic_CoolTrainerM:: @ 8D52954
.incbin "graphics/trainers/front_pics/cool_trainer_m_front_pic.4bpp.lz"
.align 2
gTrainerPalette_CoolTrainerM:: @ 8D52C3C
.incbin "graphics/trainers/palettes/cool_trainer_m.gbapal.lz"
.align 2
gTrainerFrontPic_BirdKeeper:: @ 8D52C64
.incbin "graphics/trainers/front_pics/bird_keeper_front_pic.4bpp.lz"
.align 2
gTrainerPalette_BirdKeeper:: @ 8D52F9C
.incbin "graphics/trainers/palettes/bird_keeper.gbapal.lz"
.align 2
gTrainerFrontPic_Collector:: @ 8D52FC4
.incbin "graphics/trainers/front_pics/collector_front_pic.4bpp.lz"
.align 2
gTrainerPalette_Collector:: @ 8D533C8
.incbin "graphics/trainers/palettes/collector.gbapal.lz"
.align 2
gTrainerFrontPic_AquaGruntF:: @ 8D533F0
.incbin "graphics/trainers/front_pics/aqua_grunt_f_front_pic.4bpp.lz"
.align 2
gTrainerPalette_AquaGruntF:: @ 8D5372C
.incbin "graphics/trainers/palettes/aqua_grunt_f.gbapal.lz"
.align 2
gTrainerFrontPic_SwimmerM:: @ 8D53754
.incbin "graphics/trainers/front_pics/swimmer_m_front_pic.4bpp.lz"
.align 2
gTrainerPalette_SwimmerM:: @ 8D53A14
.incbin "graphics/trainers/palettes/swimmer_m.gbapal.lz"
.align 2
gTrainerFrontPic_MagmaGruntM:: @ 8D53A3C
.incbin "graphics/trainers/front_pics/magma_grunt_m_front_pic.4bpp.lz"
.align 2
gTrainerPalette_MagmaGruntM:: @ 8D53DBC
.incbin "graphics/trainers/palettes/magma_grunt_m.gbapal.lz"
.align 2
gTrainerFrontPic_ExpertM:: @ 8D53DE4
.incbin "graphics/trainers/front_pics/expert_m_front_pic.4bpp.lz"
.align 2
gTrainerPalette_ExpertM:: @ 8D54124
.incbin "graphics/trainers/palettes/expert_m.gbapal.lz"
.align 2
gTrainerFrontPic_AquaAdminM:: @ 8D5414C
.incbin "graphics/trainers/front_pics/aqua_admin_m_front_pic.4bpp.lz"
.align 2
gTrainerPalette_AquaAdminM:: @ 8D54500
.incbin "graphics/trainers/palettes/aqua_admin_m.gbapal.lz"
.align 2
gTrainerFrontPic_BlackBelt:: @ 8D54528
.incbin "graphics/trainers/front_pics/black_belt_front_pic.4bpp.lz"
.align 2
gTrainerPalette_BlackBelt:: @ 8D5488C
.incbin "graphics/trainers/palettes/black_belt.gbapal.lz"
.align 2
gTrainerFrontPic_AquaAdminF:: @ 8D548B4
.incbin "graphics/trainers/front_pics/aqua_admin_f_front_pic.4bpp.lz"
.align 2
gTrainerPalette_AquaAdminF:: @ 8D54C78
.incbin "graphics/trainers/palettes/aqua_admin_f.gbapal.lz"
.align 2
gTrainerFrontPic_AquaLeaderArchie:: @ 8D54CA0
.incbin "graphics/trainers/front_pics/aqua_leader_archie_front_pic.4bpp.lz"
.align 2
gTrainerPalette_AquaLeaderArchie:: @ 8D54FDC
.incbin "graphics/trainers/palettes/aqua_leader_archie.gbapal.lz"
.align 2
gTrainerFrontPic_HexManiac:: @ 8D55004
.incbin "graphics/trainers/front_pics/hex_maniac_front_pic.4bpp.lz"
.align 2
gTrainerPalette_HexManiac:: @ 8D55370
.incbin "graphics/trainers/palettes/hex_maniac.gbapal.lz"
.align 2
gTrainerFrontPic_AromaLady:: @ 8D55398
.incbin "graphics/trainers/front_pics/aroma_lady_front_pic.4bpp.lz"
.align 2
gTrainerPalette_AromaLady:: @ 8D5565C
.incbin "graphics/trainers/palettes/aroma_lady.gbapal.lz"
.align 2
gTrainerFrontPic_RuinManiac:: @ 8D55684
.incbin "graphics/trainers/front_pics/ruin_maniac_front_pic.4bpp.lz"
.align 2
gTrainerPalette_RuinManiac:: @ 8D55A20
.incbin "graphics/trainers/palettes/ruin_maniac.gbapal.lz"
.align 2
gTrainerFrontPic_Interviewer:: @ 8D55A48
.incbin "graphics/trainers/front_pics/interviewer_front_pic.4bpp.lz"
.align 2
gTrainerPalette_Interviewer:: @ 8D55EEC
.incbin "graphics/trainers/palettes/interviewer.gbapal.lz"
.align 2
gTrainerFrontPic_TuberF:: @ 8D55F14
.incbin "graphics/trainers/front_pics/tuber_f_front_pic.4bpp.lz"
.align 2
gTrainerPalette_TuberF:: @ 8D561B8
.incbin "graphics/trainers/palettes/tuber_f.gbapal.lz"
.align 2
gTrainerFrontPic_TuberM:: @ 8D561E0
.incbin "graphics/trainers/front_pics/tuber_m_front_pic.4bpp.lz"
.align 2
gTrainerPalette_TuberM:: @ 8D5646C
.incbin "graphics/trainers/palettes/tuber_m.gbapal.lz"
.align 2
gTrainerFrontPic_CoolTrainerF:: @ 8D56494
.incbin "graphics/trainers/front_pics/cool_trainer_f_front_pic.4bpp.lz"
.align 2
gTrainerPalette_CoolTrainerF:: @ 8D567A8
.incbin "graphics/trainers/palettes/cool_trainer_f.gbapal.lz"
.align 2
gTrainerFrontPic_Lady:: @ 8D567D0
.incbin "graphics/trainers/front_pics/lady_front_pic.4bpp.lz"
.align 2
gTrainerPalette_Lady:: @ 8D56B84
.incbin "graphics/trainers/palettes/lady.gbapal.lz"
.align 2
gTrainerFrontPic_Beauty:: @ 8D56BAC
.incbin "graphics/trainers/front_pics/beauty_front_pic.4bpp.lz"
.align 2
gTrainerPalette_Beauty:: @ 8D56E94
.incbin "graphics/trainers/palettes/beauty.gbapal.lz"
.align 2
gTrainerFrontPic_RichBoy:: @ 8D56EBC
.incbin "graphics/trainers/front_pics/rich_boy_front_pic.4bpp.lz"
.align 2
gTrainerPalette_RichBoy:: @ 8D57170
.incbin "graphics/trainers/palettes/rich_boy.gbapal.lz"
.align 2
gTrainerFrontPic_ExpertF:: @ 8D57198
.incbin "graphics/trainers/front_pics/expert_f_front_pic.4bpp.lz"
.align 2
gTrainerPalette_ExpertF:: @ 8D574B4
.incbin "graphics/trainers/palettes/expert_f.gbapal.lz"
.align 2
gTrainerFrontPic_Pokemaniac:: @ 8D574DC
.incbin "graphics/trainers/front_pics/pokemaniac_front_pic.4bpp.lz"
.align 2
gTrainerPalette_Pokemaniac:: @ 8D5784C
.incbin "graphics/trainers/palettes/pokemaniac.gbapal.lz"
.align 2
gTrainerFrontPic_MagmaGruntF:: @ 8D57874
.incbin "graphics/trainers/front_pics/magma_grunt_f_front_pic.4bpp.lz"
.align 2
gTrainerPalette_MagmaGruntF:: @ 8D57C00
.incbin "graphics/trainers/palettes/magma_grunt_f.gbapal.lz"
.align 2
gTrainerFrontPic_Guitarist:: @ 8D57C28
.incbin "graphics/trainers/front_pics/guitarist_front_pic.4bpp.lz"
.align 2
gTrainerPalette_Guitarist:: @ 8D57FAC
.incbin "graphics/trainers/palettes/guitarist.gbapal.lz"
.align 2
gTrainerFrontPic_Kindler:: @ 8D57FD4
.incbin "graphics/trainers/front_pics/kindler_front_pic.4bpp.lz"
.align 2
gTrainerPalette_Kindler:: @ 8D58340
.incbin "graphics/trainers/palettes/kindler.gbapal.lz"
.align 2
gTrainerFrontPic_Camper:: @ 8D58368
.incbin "graphics/trainers/front_pics/camper_front_pic.4bpp.lz"
.align 2
gTrainerPalette_Camper:: @ 8D58650
.incbin "graphics/trainers/palettes/camper.gbapal.lz"
.align 2
gTrainerFrontPic_Picnicker:: @ 8D58678
.incbin "graphics/trainers/front_pics/picnicker_front_pic.4bpp.lz"
.align 2
gTrainerPalette_Picnicker:: @ 8D58958
.incbin "graphics/trainers/palettes/picnicker.gbapal.lz"
.align 2
gTrainerFrontPic_BugManiac:: @ 8D58980
.incbin "graphics/trainers/front_pics/bug_maniac_front_pic.4bpp.lz"
.align 2
gTrainerPalette_BugManiac:: @ 8D58DD0
.incbin "graphics/trainers/palettes/bug_maniac.gbapal.lz"
.align 2
gTrainerFrontPic_PokemonBreederM:: @ 8D58DF8
.incbin "graphics/trainers/front_pics/pokemon_breeder_m_front_pic.4bpp.lz"
.align 2
gTrainerPalette_PokemonBreederM:: @ 8D59128
.incbin "graphics/trainers/palettes/pokemon_breeder_m.gbapal.lz"
.align 2
gTrainerFrontPic_PsychicM:: @ 8D59150
.incbin "graphics/trainers/front_pics/psychic_m_front_pic.4bpp.lz"
.align 2
gTrainerPalette_PsychicM:: @ 8D5947C
.incbin "graphics/trainers/palettes/psychic_m.gbapal.lz"
.align 2
gTrainerFrontPic_PsychicF:: @ 8D594A4
.incbin "graphics/trainers/front_pics/psychic_f_front_pic.4bpp.lz"
.align 2
gTrainerPalette_PsychicF:: @ 8D597CC
.incbin "graphics/trainers/palettes/psychic_f.gbapal.lz"
.align 2
gTrainerFrontPic_Gentleman:: @ 8D597F4
.incbin "graphics/trainers/front_pics/gentleman_front_pic.4bpp.lz"
.align 2
gTrainerPalette_Gentleman:: @ 8D59AF4
.incbin "graphics/trainers/palettes/gentleman.gbapal.lz"
.align 2
gTrainerFrontPic_EliteFourSidney:: @ 8D59B1C
.incbin "graphics/trainers/front_pics/elite_four_sidney_front_pic.4bpp.lz"
.align 2
gTrainerPalette_EliteFourSidney:: @ 8D59E50
.incbin "graphics/trainers/palettes/elite_four_sidney.gbapal.lz"
.align 2
gTrainerFrontPic_EliteFourPhoebe:: @ 8D59E78
.incbin "graphics/trainers/front_pics/elite_four_phoebe_front_pic.4bpp.lz"
.align 2
gTrainerPalette_EliteFourPhoebe:: @ 8D5A178
.incbin "graphics/trainers/palettes/elite_four_phoebe.gbapal.lz"
.align 2
gTrainerFrontPic_EliteFourGlacia:: @ 8D5A1A0
.incbin "graphics/trainers/front_pics/elite_four_glacia_front_pic.4bpp.lz"
.align 2
gTrainerPalette_EliteFourGlacia:: @ 8D5A524
.incbin "graphics/trainers/palettes/elite_four_glacia.gbapal.lz"
.align 2
gTrainerFrontPic_EliteFourDrake:: @ 8D5A54C
.incbin "graphics/trainers/front_pics/elite_four_drake_front_pic.4bpp.lz"
.align 2
gTrainerPalette_EliteFourDrake:: @ 8D5A8F4
.incbin "graphics/trainers/palettes/elite_four_drake.gbapal.lz"
.align 2
gTrainerFrontPic_LeaderRoxanne:: @ 8D5A91C
.incbin "graphics/trainers/front_pics/leader_roxanne_front_pic.4bpp.lz"
.align 2
gTrainerPalette_LeaderRoxanne:: @ 8D5AC08
.incbin "graphics/trainers/palettes/leader_roxanne.gbapal.lz"
.align 2
gTrainerFrontPic_LeaderBrawly:: @ 8D5AC30
.incbin "graphics/trainers/front_pics/leader_brawly_front_pic.4bpp.lz"
.align 2
gTrainerPalette_LeaderBrawly:: @ 8D5AFC4
.incbin "graphics/trainers/palettes/leader_brawly.gbapal.lz"
.align 2
gTrainerFrontPic_LeaderWattson:: @ 8D5AFEC
.incbin "graphics/trainers/front_pics/leader_wattson_front_pic.4bpp.lz"
.align 2
gTrainerPalette_LeaderWattson:: @ 8D5B334
.incbin "graphics/trainers/palettes/leader_wattson.gbapal.lz"
.align 2
gTrainerFrontPic_LeaderFlannery:: @ 8D5B35C
.incbin "graphics/trainers/front_pics/leader_flannery_front_pic.4bpp.lz"
.align 2
gTrainerPalette_LeaderFlannery:: @ 8D5B6DC
.incbin "graphics/trainers/palettes/leader_flannery.gbapal.lz"
.align 2
gTrainerFrontPic_LeaderNorman:: @ 8D5B704
.incbin "graphics/trainers/front_pics/leader_norman_front_pic.4bpp.lz"
.align 2
gTrainerPalette_LeaderNorman:: @ 8D5BA40
.incbin "graphics/trainers/palettes/leader_norman.gbapal.lz"
.align 2
gTrainerFrontPic_LeaderWinona:: @ 8D5BA68
.incbin "graphics/trainers/front_pics/leader_winona_front_pic.4bpp.lz"
.align 2
gTrainerPalette_LeaderWinona:: @ 8D5BDE8
.incbin "graphics/trainers/palettes/leader_winona.gbapal.lz"
.align 2
gTrainerFrontPic_LeaderTateAndLiza:: @ 8D5BE10
.incbin "graphics/trainers/front_pics/leader_tate_and_liza_front_pic.4bpp.lz"
.align 2
gTrainerPalette_LeaderTateAndLiza:: @ 8D5C254
.incbin "graphics/trainers/palettes/leader_tate_and_liza.gbapal.lz"
.align 2
gTrainerFrontPic_LeaderJuan:: @ 8D5C27C
.incbin "graphics/trainers/front_pics/leader_juan_front_pic.4bpp.lz"
.align 2
gTrainerPalette_LeaderJuan:: @ 8D5C624
.incbin "graphics/trainers/palettes/leader_juan.gbapal.lz"
.align 2
gTrainerFrontPic_SchoolKidM:: @ 8D5C64C
.incbin "graphics/trainers/front_pics/school_kid_m_front_pic.4bpp.lz"
.align 2
gTrainerPalette_SchoolKidM:: @ 8D5C90C
.incbin "graphics/trainers/palettes/school_kid_m.gbapal.lz"
.align 2
gTrainerFrontPic_SchoolKidF:: @ 8D5C934
.incbin "graphics/trainers/front_pics/school_kid_f_front_pic.4bpp.lz"
.align 2
gTrainerPalette_SchoolKidF:: @ 8D5CBD0
.incbin "graphics/trainers/palettes/school_kid_f.gbapal.lz"
.align 2
gTrainerFrontPic_SrAndJr:: @ 8D5CBF8
.incbin "graphics/trainers/front_pics/sr_and_jr_front_pic.4bpp.lz"
.align 2
gTrainerPalette_SrAndJr:: @ 8D5D068
.incbin "graphics/trainers/palettes/sr_and_jr.gbapal.lz"
.align 2
gTrainerFrontPic_WinstrateM:: @ 8D5D090
.incbin "graphics/trainers/front_pics/winstrate_m_front_pic.4bpp.lz"
.align 2
gTrainerPalette_WinstrateM:: @ 8D5D44C
.incbin "graphics/trainers/palettes/winstrate_m.gbapal.lz"
.align 2
gTrainerFrontPic_WinstrateF:: @ 8D5D474
.incbin "graphics/trainers/front_pics/winstrate_f_front_pic.4bpp.lz"
.align 2
gTrainerPalette_WinstrateF:: @ 8D5D840
.incbin "graphics/trainers/palettes/winstrate_f.gbapal.lz"
.align 2
gTrainerFrontPic_Youngster:: @ 8D5D868
.incbin "graphics/trainers/front_pics/youngster_front_pic.4bpp.lz"
.align 2
gTrainerPalette_Youngster:: @ 8D5DB10
.incbin "graphics/trainers/palettes/youngster.gbapal.lz"
.align 2
gTrainerFrontPic_ChampionWallace:: @ 8D5DB38
.incbin "graphics/trainers/front_pics/champion_wallace_front_pic.4bpp.lz"
.align 2
gTrainerPalette_ChampionWallace:: @ 8D5DF8C
.incbin "graphics/trainers/palettes/champion_wallace.gbapal.lz"
.align 2
gTrainerFrontPic_Fisherman:: @ 8D5DFB4
.incbin "graphics/trainers/front_pics/fisherman_front_pic.4bpp.lz"
.align 2
gTrainerPalette_Fisherman:: @ 8D5E398
.incbin "graphics/trainers/palettes/fisherman.gbapal.lz"
.align 2
gTrainerFrontPic_CyclingTriathleteM:: @ 8D5E3C0
.incbin "graphics/trainers/front_pics/cycling_triathlete_m_front_pic.4bpp.lz"
.align 2
gTrainerPalette_CyclingTriathleteM:: @ 8D5E7D0
.incbin "graphics/trainers/palettes/cycling_triathlete_m.gbapal.lz"
.align 2
gTrainerFrontPic_CyclingTriathleteF:: @ 8D5E7F8
.incbin "graphics/trainers/front_pics/cycling_triathlete_f_front_pic.4bpp.lz"
.align 2
gTrainerPalette_CyclingTriathleteF:: @ 8D5EC04
.incbin "graphics/trainers/palettes/cycling_triathlete_f.gbapal.lz"
.align 2
gTrainerFrontPic_RunningTriathleteM:: @ 8D5EC2C
.incbin "graphics/trainers/front_pics/running_triathlete_m_front_pic.4bpp.lz"
.align 2
gTrainerPalette_RunningTriathleteM:: @ 8D5EEE4
.incbin "graphics/trainers/palettes/running_triathlete_m.gbapal.lz"
.align 2
gTrainerFrontPic_RunningTriathleteF:: @ 8D5EF0C
.incbin "graphics/trainers/front_pics/running_triathlete_f_front_pic.4bpp.lz"
.align 2
gTrainerPalette_RunningTriathleteF:: @ 8D5F1B0
.incbin "graphics/trainers/palettes/running_triathlete_f.gbapal.lz"
.align 2
gTrainerFrontPic_SwimmingTriathleteM:: @ 8D5F1D8
.incbin "graphics/trainers/front_pics/swimming_triathlete_m_front_pic.4bpp.lz"
.align 2
gTrainerPalette_SwimmingTriathleteM:: @ 8D5F504
.incbin "graphics/trainers/palettes/swimming_triathlete_m.gbapal.lz"
.align 2
gTrainerFrontPic_SwimmingTriathleteF:: @ 8D5F52C
.incbin "graphics/trainers/front_pics/swimming_triathlete_f_front_pic.4bpp.lz"
.align 2
gTrainerPalette_SwimmingTriathleteF:: @ 8D5F808
.incbin "graphics/trainers/palettes/swimming_triathlete_f.gbapal.lz"
.align 2
gTrainerFrontPic_DragonTamer:: @ 8D5F830
.incbin "graphics/trainers/front_pics/dragon_tamer_front_pic.4bpp.lz"
.align 2
gTrainerPalette_DragonTamer:: @ 8D5FB84
.incbin "graphics/trainers/palettes/dragon_tamer.gbapal.lz"
.align 2
gTrainerFrontPic_NinjaBoy:: @ 8D5FBAC
.incbin "graphics/trainers/front_pics/ninja_boy_front_pic.4bpp.lz"
.align 2
gTrainerPalette_NinjaBoy:: @ 8D5FE88
.incbin "graphics/trainers/palettes/ninja_boy.gbapal.lz"
.align 2
gTrainerFrontPic_BattleGirl:: @ 8D5FEB0
.incbin "graphics/trainers/front_pics/battle_girl_front_pic.4bpp.lz"
.align 2
gTrainerPalette_BattleGirl:: @ 8D601D0
.incbin "graphics/trainers/palettes/battle_girl.gbapal.lz"
.align 2
gTrainerFrontPic_ParasolLady:: @ 8D601F8
.incbin "graphics/trainers/front_pics/parasol_lady_front_pic.4bpp.lz"
.align 2
gTrainerPalette_ParasolLady:: @ 8D60530
.incbin "graphics/trainers/palettes/parasol_lady.gbapal.lz"
.align 2
gTrainerFrontPic_SwimmerF:: @ 8D60558
.incbin "graphics/trainers/front_pics/swimmer_f_front_pic.4bpp.lz"
.align 2
gTrainerPalette_SwimmerF:: @ 8D60828
.incbin "graphics/trainers/palettes/swimmer_f.gbapal.lz"
.align 2
gTrainerFrontPic_Twins:: @ 8D60850
.incbin "graphics/trainers/front_pics/twins_front_pic.4bpp.lz"
.align 2
gTrainerPalette_Twins:: @ 8D60C14
.incbin "graphics/trainers/palettes/twins.gbapal.lz"
.align 2
gTrainerFrontPic_Sailor:: @ 8D60C3C
.incbin "graphics/trainers/front_pics/sailor_front_pic.4bpp.lz"
.align 2
gTrainerPalette_Sailor:: @ 8D60FEC
.incbin "graphics/trainers/palettes/sailor.gbapal.lz"
.align 2
gTrainerFrontPic_MagmaAdmin:: @ 8D61014
.incbin "graphics/trainers/front_pics/magma_admin_front_pic.4bpp.lz"
.align 2
gTrainerPalette_MagmaAdmin:: @ 8D613EC
.incbin "graphics/trainers/palettes/magma_admin.gbapal.lz"
.align 2
gTrainerFrontPic_Wally:: @ 8D61414
.incbin "graphics/trainers/front_pics/wally_front_pic.4bpp.lz"
.align 2
gTrainerPalette_Wally:: @ 8D616E4
.incbin "graphics/trainers/palettes/wally.gbapal.lz"
.align 2
gTrainerFrontPic_Brendan:: @ 8D6170C
.incbin "graphics/trainers/front_pics/brendan_front_pic.4bpp.lz"
.align 2
gTrainerPalette_Brendan:: @ 8D61A30
.incbin "graphics/trainers/palettes/brendan.gbapal.lz"
.align 2
gTrainerFrontPic_May:: @ 8D61A58
.incbin "graphics/trainers/front_pics/may_front_pic.4bpp.lz"
.align 2
gTrainerPalette_May:: @ 8D61D58
.incbin "graphics/trainers/palettes/may.gbapal.lz"
.align 2
gTrainerFrontPic_BugCatcher:: @ 8D61D80
.incbin "graphics/trainers/front_pics/bug_catcher_front_pic.4bpp.lz"
.align 2
gTrainerPalette_BugCatcher:: @ 8D620AC
.incbin "graphics/trainers/palettes/bug_catcher.gbapal.lz"
.align 2
gTrainerFrontPic_PokemonRangerM:: @ 8D620D4
.incbin "graphics/trainers/front_pics/pokemon_ranger_m_front_pic.4bpp.lz"
.align 2
gTrainerPalette_PokemonRangerM:: @ 8D6241C
.incbin "graphics/trainers/palettes/pokemon_ranger_m.gbapal.lz"
.align 2
gTrainerFrontPic_PokemonRangerF:: @ 8D62444
.incbin "graphics/trainers/front_pics/pokemon_ranger_f_front_pic.4bpp.lz"
.align 2
gTrainerPalette_PokemonRangerF:: @ 8D62778
.incbin "graphics/trainers/palettes/pokemon_ranger_f.gbapal.lz"
.align 2
gTrainerFrontPic_MagmaLeaderMaxie:: @ 8D627A0
.incbin "graphics/trainers/front_pics/magma_leader_maxie_front_pic.4bpp.lz"
.align 2
gTrainerPalette_MagmaLeaderMaxie:: @ 8D62A94
.incbin "graphics/trainers/palettes/magma_leader_maxie.gbapal.lz"
.align 2
gTrainerFrontPic_Lass:: @ 8D62ABC
.incbin "graphics/trainers/front_pics/lass_front_pic.4bpp.lz"
.align 2
gTrainerPalette_Lass:: @ 8D62D94
.incbin "graphics/trainers/palettes/lass.gbapal.lz"
.align 2
gTrainerFrontPic_YoungCouple:: @ 8D62DBC
.incbin "graphics/trainers/front_pics/young_couple_front_pic.4bpp.lz"
.align 2
gTrainerPalette_YoungCouple:: @ 8D6317C
.incbin "graphics/trainers/palettes/young_couple.gbapal.lz"
.align 2
gTrainerFrontPic_OldCouple:: @ 8D631A4
.incbin "graphics/trainers/front_pics/old_couple_front_pic.4bpp.lz"
.align 2
gTrainerPalette_OldCouple:: @ 8D636B4
.incbin "graphics/trainers/palettes/old_couple.gbapal.lz"
.align 2
gTrainerFrontPic_SisAndBro:: @ 8D636DC
.incbin "graphics/trainers/front_pics/sis_and_bro_front_pic.4bpp.lz"
.align 2
gTrainerPalette_SisAndBro:: @ 8D63B28
.incbin "graphics/trainers/palettes/sis_and_bro.gbapal.lz"
.align 2
gTrainerFrontPic_Steven:: @ 8D63B50
.incbin "graphics/trainers/front_pics/steven_front_pic.4bpp.lz"
.align 2
gTrainerPalette_Steven:: @ 8D63E88
.incbin "graphics/trainers/palettes/steven.gbapal.lz"
.align 2
gTrainerFrontPic_SalonMaidenAnabel:: @ 8D63EB0
.incbin "graphics/trainers/front_pics/salon_maiden_anabel_front_pic.4bpp.lz"
.align 2
gTrainerPalette_SalonMaidenAnabel:: @ 8D641B8
.incbin "graphics/trainers/palettes/salon_maiden_anabel.gbapal.lz"
.align 2
gTrainerFrontPic_DomeAceTucker:: @ 8D641E0
.incbin "graphics/trainers/front_pics/dome_ace_tucker_front_pic.4bpp.lz"
.align 2
gTrainerPalette_DomeAceTucker:: @ 8D645E4
.incbin "graphics/trainers/palettes/dome_ace_tucker.gbapal.lz"
.align 2
gTrainerFrontPic_PalaceMavenSpenser:: @ 8D6460C
.incbin "graphics/trainers/front_pics/palace_maven_spenser_front_pic.4bpp.lz"
.align 2
gTrainerPalette_PalaceMavenSpenser:: @ 8D649B0
.incbin "graphics/trainers/palettes/palace_maven_spenser.gbapal.lz"
.align 2
gTrainerFrontPic_ArenaTycoonGreta:: @ 8D649D8
.incbin "graphics/trainers/front_pics/arena_tycoon_greta_front_pic.4bpp.lz"
.align 2
gTrainerPalette_ArenaTycoonGreta:: @ 8D64D08
.incbin "graphics/trainers/palettes/arena_tycoon_greta.gbapal.lz"
.align 2
gTrainerFrontPic_FactoryHeadNoland:: @ 8D64D30
.incbin "graphics/trainers/front_pics/factory_head_noland_front_pic.4bpp.lz"
.align 2
gTrainerPalette_FactoryHeadNoland:: @ 8D650AC
.incbin "graphics/trainers/palettes/factory_head_noland.gbapal.lz"
.align 2
gTrainerFrontPic_PikeQueenLucy:: @ 8D650D4
.incbin "graphics/trainers/front_pics/pike_queen_lucy_front_pic.4bpp.lz"
.align 2
gTrainerPalette_PikeQueenLucy:: @ 8D653C8
.incbin "graphics/trainers/palettes/pike_queen_lucy.gbapal.lz"
.align 2
gTrainerFrontPic_PyramidKingBrandon:: @ 8D653F0
.incbin "graphics/trainers/front_pics/pyramid_king_brandon_front_pic.4bpp.lz"
.align 2
gTrainerPalette_PyramidKingBrandon:: @ 8D6575C
.incbin "graphics/trainers/palettes/pyramid_king_brandon.gbapal.lz"
.align 2
gTrainerFrontPic_Red:: @ 8D65784
.incbin "graphics/trainers/front_pics/red_front_pic.4bpp.lz"
.align 2
gTrainerPalette_Red:: @ 8D65A90
.incbin "graphics/trainers/palettes/red.gbapal.lz"
.align 2
gTrainerFrontPic_Leaf:: @ 8D65AB8
.incbin "graphics/trainers/front_pics/leaf_front_pic.4bpp.lz"
.align 2
gTrainerPalette_Leaf:: @ 8D65DF4
.incbin "graphics/trainers/palettes/leaf.gbapal.lz"
.align 2
gTrainerFrontPic_RubySapphireBrendan:: @ 8D65E1C
.incbin "graphics/trainers/front_pics/ruby_sapphire_brendan_front_pic.4bpp.lz"
.align 2
gTrainerPalette_RubySapphireBrendan:: @ 8D66130
.incbin "graphics/trainers/palettes/ruby_sapphire_brendan.gbapal.lz"
.align 2
gTrainerFrontPic_RubySapphireMay:: @ 8D66158
.incbin "graphics/trainers/front_pics/ruby_sapphire_may_front_pic.4bpp.lz"
.align 2
gTrainerPalette_RubySapphireMay:: @ 8D66458
.incbin "graphics/trainers/palettes/ruby_sapphire_may.gbapal.lz"
.align 2
gTrainerBackPic_Brendan:: @ 8D66480
.incbin "graphics/trainers/back_pics/brendan_back_pic.4bpp"
.align 2
gTrainerBackPic_May:: @ 8D68480
.incbin "graphics/trainers/back_pics/may_back_pic.4bpp"
.align 2
gTrainerBackPic_Red:: @ 8D6A480
.incbin "graphics/trainers/back_pics/red_back_pic.4bpp"
.align 2
gTrainerBackPic_Leaf:: @ 8D6CC80
.incbin "graphics/trainers/back_pics/leaf_back_pic.4bpp"
.align 2
gTrainerBackPic_RubySapphireBrendan:: @ 8D6F480
.incbin "graphics/trainers/back_pics/ruby_sapphire_brendan_back_pic.4bpp"
.align 2
gTrainerBackPic_RubySapphireMay:: @ 8D71480
.incbin "graphics/trainers/back_pics/ruby_sapphire_may_back_pic.4bpp"
.align 2
gTrainerBackPic_Wally:: @ 8D73480
.incbin "graphics/trainers/back_pics/wally_back_pic.4bpp"
.align 2
gTrainerBackPic_Steven:: @ 8D75480
.incbin "graphics/trainers/back_pics/steven_back_pic.4bpp"
.align 2
gTrainerBackPicPalette_Red:: @ 8D77480
.incbin "graphics/trainers/palettes/red_back_pic.gbapal.lz"
.align 2
gTrainerBackPicPalette_Leaf:: @ 8D774A8
.incbin "graphics/trainers/palettes/leaf_back_pic.gbapal.lz"

21
data/item_use.s
View File

@@ -1,21 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2, 0
.align 2
gUnknown_085920D8:: @ 85920D8
.4byte sub_81B617C
.4byte CB2_ReturnToField
.4byte NULL
.align 2
gUnknown_085920E4:: @ 85920E4
.byte 0x02, 0x04, 0x01, 0x03
.align 2
gUnknown_085920E8:: @ 85920E8
.4byte sub_80FE03C
.4byte bag_menu_inits_lists_menu

34
data/rom_8525F58.s
View File

@@ -1,34 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnknown_08525F58:: @ 8525F58
.byte 0x48, 0x50, 0x00, 0x00, 0xb0, 0x28, 0x00, 0x00
.byte 0x30, 0x28, 0x00, 0x00, 0x70, 0x50, 0x00, 0x00
.byte 0x20, 0x50, 0x00, 0x00, 0xc8, 0x28, 0x00, 0x00
.byte 0x5a, 0x58, 0x00, 0x00, 0x98, 0x20, 0x00, 0x00
.align 2
gCastformFrontSpriteCoords:: @ 8525F78
.byte 0x44, 0x11, 0x00, 0x00, 0x66, 0x09, 0x00, 0x00
.byte 0x46, 0x09, 0x00, 0x00, 0x86, 0x08, 0x00, 0x00
.align 2
gUnknown_08525F88:: @ 8525F88
.byte 0x0d, 0x0e, 0x0d, 0x0d
.align 2
gUnknown_08525F8C:: @ 8525F8C
.byte 0x00, 0x00, 0x00, 0x00
.align 2
gUnknown_08525F90:: @ 8525F90
spr_template 0xd755, 0xd755, gUnknown_0852497C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
spr_template 0xd756, 0xd756, gUnknown_0852497C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
.align 2
gUnknown_08525FC0:: @ 8525FC0
obj_tiles gMiscBlank_Gfx, 0x0800, 0xd755
obj_tiles gMiscBlank_Gfx, 0x0800, 0xd756

618
data/slot_machine.s
View File

@@ -2,526 +2,8 @@
.include "constants/constants.inc"
.section .rodata
.align 2, 0
gUnknown_085A7424:: @ 85A7424
.4byte 0x1F8
.4byte 0x11C5
.4byte 0x21D6
.4byte 0x11E7
gUnknown_085A7434:: @ 85A7434
window_template 0, 2, 15, 0x1B, 4, 15, 0x194
null_window_template
gUnknown_085A7444:: @ 85A7444
window_template 0, 1, 3, 20, 13, 13, 1
gUnknown_085A744C:: @ 85A744C
.byte 3, 1, 2, 0
gUnknown_083ECAAC:: @ 85A7450
.4byte sub_8101D5C
.4byte sub_8101D8C
.4byte sub_8101DB0
.4byte sub_8101DF4
.4byte sub_8101E10
.4byte sub_8101E3C
.4byte sub_8101F44
.4byte sub_8101F60
.4byte sub_8101F88
.4byte sub_8101FA4
.4byte sub_8102008
.4byte sub_8102034
.4byte sub_8102058
.4byte sub_8102090
.4byte sub_81020C8
.4byte sub_81021E0
.4byte sub_81021FC
.4byte sub_8102264
.4byte sub_81022A0
.4byte sub_81022CC
.4byte sub_81022F0
.4byte sub_8102318
.4byte sub_8102344
.4byte sub_810239C
.4byte sub_81023B8
.4byte sub_81023E0_
.4byte sub_81023FC
.4byte sub_8102424
.4byte sub_8102460
gUnknown_085A74C4:: @ 85A74C4
.4byte sub_812BB34
.4byte sub_812BB68
.4byte sub_812BC20
gUnknown_085A74D0:: @ 85A74D0
.4byte sub_812BF64
.4byte sub_812BF68
.4byte sub_812BF88
.4byte sub_812C01C
.4byte sub_812C0E0
gUnknown_085A74E4:: @ 85A74E4
.4byte sub_812C138
.4byte sub_812C3A0
.4byte sub_812C4BC
gUnknown_085A74F0:: @ 85A74F0
.4byte sub_812C5DC
.4byte sub_812C628
.4byte sub_812C8FC
gUnknown_085A74FC:: @ 85A74FC
.2byte 2, 4, 4, 4, 8, 0
gUnknown_085A7508:: @ 85A7508
.4byte sub_812C238
.4byte sub_812C290
.4byte sub_812C290
gUnknown_085A7514:: @ 85A7514
.4byte sub_812C3C8
.4byte sub_812C3C8
.4byte sub_812C414
gUnknown_085A7520:: @ 85A7520
.4byte sub_812C500
.4byte sub_812C500
.4byte sub_812C55C
gUnknown_085A752C:: @ 85A752C
.4byte sub_812C64C
.4byte j5_08111E84
.4byte sub_812C74C
gUnknown_085A7538:: @ 85A7538
.4byte sub_812C920
.4byte sub_812CA08
.4byte sub_812CB80
gUnknown_085A7544:: @ 85A7544
.4byte sub_812CDA4
.4byte sub_812CDD8
.4byte sub_812CDF4
gUnknown_085A7550:: @ 85A7550
.2byte 5, 10, 15, 0
gUnknown_085A7558:: @ 85A7558
.4byte nullsub_50
.4byte sub_812D264
.4byte sub_812D28C
.4byte sub_812D30C
gUnknown_085A7568:: @ 85A7568
.2byte 0x9E
gUnknown_085A756A:: @ 85A756A
.2byte 0x6E, 0x9F, 0x6F, 0xAF, 0x7F
gUnknown_085A7574:: @ 85A7574
.4byte sub_812D51C
.4byte sub_812D594
.4byte sub_812D60C
.4byte sub_812D63C
.4byte sub_812D6EC
.4byte sub_812D740
.4byte sub_812D774
.4byte sub_812D7E4
.4byte sub_812D870
.4byte sub_812D920
.4byte sub_812D950
.4byte sub_812D9A4
.4byte sub_812DA20
.4byte sub_812DA6C
.4byte sub_812DA90
.4byte sub_812DB04
.4byte sub_812DB8C
.4byte sub_812D950
.4byte sub_812DBBC
gUnknown_085A75C0:: @ 85A75C0
.byte 1, 1, 2, 2
gUnknown_085A75C4:: @ 85A75C4
.2byte 0x40, 0x30, 0x18, 8
gUnknown_085A75CC:: @ 85A75CC
.2byte 10, 8, 6, 4
gUnknown_085A75D4:: @ 85A75D4
.4byte sub_812DD04
.4byte sub_812DD28
.4byte sub_812DD48
.4byte sub_812DD28
.4byte sub_812DD78
.4byte sub_812DD28
.4byte sub_812DDC4
.4byte sub_812DD28
.4byte sub_812DE14
.4byte sub_812DD28
.4byte sub_812DE30
.4byte sub_812DD28
.4byte sub_812DE48
.4byte sub_812DD28
.4byte sub_812DE7C
gUnknown_085A7610:: @ 85A7610
.4byte nullsub_51
gUnknown_085A7614:: @ 85A7614
.2byte 16
gUnknown_085A7616:: @ 85A7616
.2byte 0, 0x40, 0x80, 0xC0
gUnknown_085A761E:: @ 85A761E
.2byte 4, -4, 4, -4
gUnknown_085A7626:: @ 85A7626
.2byte 4, 4, -4, -4
gUnknown_085A762E:: @ 85A762E
.2byte 0, 0xFFD8, 0, 0, 0x30, 0, 0x18, 0
gUnknown_085A763E:: @ 85A763E
.2byte 0xFFE0, 0, 0xFFE0, 0xFFD0, 0, 0xFFD0, 0, 0xFFD0
gUnknown_085A764E:: @ 85A764E
.2byte 16, 12, 16, 0, 0, 4, 8, 8
gUnknown_085A765E:: @ 85A765E
.2byte 0xA0, 0xC0, 0xE0, 0x68, 0x50, 0x40, 0x30, 0x18
gUnknown_085A766E:: @ 85A766E
.byte 0, 4, 2, 6, 5, 3, 1, 3, 4, 5, 6, 2, 0, 5, 3, 6, 2, 1, 5, 3, 6
.byte 0, 4, 6, 3, 2, 4, 6, 5, 5, 3, 1, 3, 6, 4, 2, 3, 6, 4, 3, 6, 4
.byte 0, 5, 1, 6, 3, 2, 6, 3, 5, 2, 6, 3, 2, 5, 6, 3, 2, 5, 6, 3, 4
gUnknown_085A76AD:: @ 85A76AD
.byte 1, 0, 5, 4, 3, 2, 0
gUnknown_083ECCF8:: @ 85A76B4
.2byte 0, 6, 0, 10, 0, 2
gUnknown_083ECD04:: @ 85A76C0
.byte 1, 1, 12
.byte 1, 1, 14
.byte 2, 2, 14
.byte 2, 2, 14
.byte 2, 3, 16
.byte 3, 3, 16
gUnknown_083ECD16:: @ 85A76D2
.byte 0x19, 0x19, 0x1E, 0x28, 0x28, 0x32
.byte 0x19, 0x19, 0x1E, 0x1E, 0x23, 0x23
.byte 0x19, 0x19, 0x1E, 0x19, 0x19, 0x1E
gUnknown_083ECD28:: @ 85A76E4
.byte 0x14, 0x19, 0x19, 0x14, 0x19, 0x19
.byte 0xC, 0xF, 0xF, 0x12, 0x13, 0x16
.byte 0x19, 0x19, 0x19, 0x1E, 0x1E, 0x28
.byte 0x19, 0x19, 0x14, 0x14, 0xF, 0xF
.byte 0x28, 0x28, 0x23, 0x23, 0x28, 0x28
gUnknown_083ECD46:: @ 85A7702
.byte 0xF3, 0xF3, 0xF3, 0x50, 0x50, 0x50, 0x50, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x5, 0x5, 0x5, 0x5
.byte 0x5, 0x5, 0x5, 0x96, 0x96, 0x96, 0x96, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x64, 0x64, 0x64, 0x5
.byte 0x4, 0x4, 0x4, 0x14, 0x14, 0x14, 0x14, 0x50, 0x50, 0x50, 0x50, 0x50, 0x50, 0x64, 0x64, 0x64, 0x28
.byte 0x2, 0x2, 0x2, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x2D, 0x2D, 0x2D, 0x64
.byte 0x1, 0x1, 0x1, 0x2, 0x2, 0x2, 0x2, 0x2, 0x2, 0x2, 0x2, 0x2, 0x2, 0x5, 0x5, 0x5, 0x64
.byte 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x6
gUnknown_083ECDAC:: @ 85A7768
.byte 0xF3, 0xF3, 0xF3, 0xC8, 0xC8, 0xC8, 0xC8, 0xA0, 0xA0, 0xA0, 0xA0, 0xA0, 0xA0, 0x46, 0x46, 0x46, 0x05
.byte 0x05, 0x05, 0x05, 0x19, 0x19, 0x19, 0x19, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x02, 0x02, 0x02, 0x06
.byte 0x04, 0x04, 0x04, 0x19, 0x19, 0x19, 0x19, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x28, 0x28, 0x28, 0x23
.byte 0x02, 0x02, 0x02, 0x03, 0x03, 0x03, 0x03, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x64, 0x64, 0x64, 0x32
.byte 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x28, 0x28, 0x28, 0x64
.byte 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x04, 0x04, 0x04, 0x3C
gUnknown_083ECE12:: @ 85A77CE
.2byte 0x80, 0xAF, 0xC8, 0xE1, 0x100
gUnknown_083ECE1C:: @ 85A77D8
.byte 10, 0, 5, 0
.byte 10, 0, 10, 0
.byte 10, 0, 15, 0
.byte 10, 0, 25, 0
.byte 10, 0, 35, 0
gUnknown_083ECE30:: @ 85A77EC
.byte 0, 0
.byte 5, 0
.byte 10, 0
.byte 15, 0
.byte 20, 0
gUnknown_083ECE3A:: @ 85A77F6
.byte 6, 4, 3, 2, 5, 0, 0, 0
gUnknown_083ECE42:: @ 85A77FE
.byte 0x80, 0
.byte 0x20, 0
.byte 0x40, 0
gUnknown_083ECE48:: @ 85A7804
.byte 16, 0
.byte 8, 0
.byte 4, 0
.byte 2, 0
.byte 1, 0
sSym2Match:: @ 85A780E
.byte 7, 8, 4, 3, 0, 5, 2, 0
sSlotMatchFlags:: @ 85A7816
.2byte 1, 2, 4, 8, 16, 32, 64, 128, 256
sSlotPayouts:: @ 85A7828
.2byte 2, 4, 0, 6, 12, 3, 0x5A, 0x12C, 0x12C
gUnknown_085A783A:: @ 85A783A
.2byte 0xD0, 0x38
.2byte 0xB8, 0
.2byte 0xC8, 8
.2byte 0xD8, 0x10
.2byte 0xE8, 0x18
.2byte 0xD0, 0x48
.2byte 0xD0, 8
.2byte 0xD0, 0x40
.2byte 0xD0, 0x38
.2byte 0xC0, 0x58
.2byte 0xE0, 0x58
.2byte 0xC0, 0x78
.2byte 0xE0, 0x78
.2byte 0x90, 0x38
.2byte 0x110, 0x58
.2byte 0xA8, 0x70
.2byte 0xD0, 0x54
.2byte 0xD0, 0x70
.2byte 0xBC, 0x34
.2byte 0xD0, 0x34
.2byte 0xE4, 0x34
.2byte 0xB8, 0x48
.2byte 0xC4, 0x48
.2byte 0xD0, 0x48
.2byte 0xDC, 0x48
.2byte 0xE8, 0x48
.2byte 0xBC, 0x34
.2byte 0xD0, 0x34
.2byte 0xE4, 0x34
.2byte 0xB8, 0x48
.2byte 0xC4, 0x48
.2byte 0xD0, 0x48
.2byte 0xDC, 0x48
.2byte 0xE8, 0x48
.2byte 0x00, 0x00
.2byte 0
gUnknown_085A78C8:: @ 85A78C8
.4byte sub_812F078
.4byte sub_812F36C
.4byte sub_812F36C
.4byte sub_812F36C
.4byte sub_812F36C
.4byte sub_812F3B4
.4byte sub_812F2CC
.4byte sub_812F078
.4byte sub_812F078
.4byte sub_812F080
.4byte sub_812F104
.4byte sub_812F11C
.4byte sub_812F134
.4byte sub_812F150
.4byte sub_812F1B8
.4byte sub_812F21C
.4byte sub_812F078
.4byte sub_812F470
.4byte sub_812F514
.4byte sub_812F514
.4byte sub_812F514
.4byte sub_812F514
.4byte sub_812F514
.4byte sub_812F514
.4byte sub_812F514
.4byte sub_812F514
.4byte sub_812F5E0
.4byte sub_812F5E0
.4byte sub_812F5E0
.4byte sub_812F5E0
.4byte sub_812F5E0
.4byte sub_812F5E0
.4byte sub_812F5E0
.4byte sub_812F5E0
.4byte sub_812F648
gUnknown_085A7954:: @ 85A7954
.byte 0x19
.byte 0x22
.2byte 0
.byte 0x2
.byte 0
.2byte 0
.byte 0x9
.byte 0x10
.2byte 0
.byte 0xFF
.byte 0
.2byte 0
gUnknown_085A7964:: @ 85A7964
.byte 0xA
.byte 0x1
.2byte 0
.byte 0xB
.byte 2
.2byte 0
.byte 0xC
.byte 0x3
.2byte 0
.byte 0xD
.byte 4
.2byte 0
.byte 0x5
.byte 5
.2byte 0
.byte 0x8
.byte 0x6
.2byte 0
.byte 0xFF
.byte 0
.2byte 0
gUnknown_085A7980:: @ 85A7980
.byte 0x3
.byte 0x7
.2byte 0
.byte 0x8
.byte 0x11
.2byte 0
.byte 0xFF
.byte 0
.2byte 0
gUnknown_085A798C:: @ 85A798C
.byte 0x4
.byte 0x8
.2byte 0
.byte 0x6
.byte 0x9
.2byte 0
.byte 0x6
.byte 0xA
.2byte 1
.byte 0x6
.byte 0xB
.2byte 2
.byte 0x6
.byte 0xC
.2byte 3
.byte 0xFF
.byte 0
.2byte 0
gUnknown_085A79A4:: @ 85A79A4
.byte 0
.byte 0xD
.2byte 0
.byte 1
.byte 0xE
.2byte 0
.byte 0x7
.byte 0xF
.2byte 0
.byte 0xFF
.byte 0
.2byte 0
gUnknown_085A79B4:: @ 85A79B4
.byte 0x13
.byte 0x1A
.2byte 0
.byte 0x14
.byte 0x1B
.2byte 1
.byte 0x15
.byte 0x1C
.2byte 2
.byte 0xE
.byte 0x1D
.2byte 3
.byte 0xF
.byte 0x1E
.2byte 4
.byte 0x10
.byte 0x1F
.2byte 5
.byte 0x11
.byte 0x20
.2byte 6
.byte 0x12
.byte 0x21
.2byte 7
.byte 0x8
.byte 0x11
.2byte 0
.byte 0xFF
.byte 0
.2byte 0
gUnknown_085A79DC:: @ 85A79DC
.byte 0x16
.byte 0x12
.2byte 0
.byte 0x17
.byte 0x13
.2byte 1
.byte 0x18
.byte 0x14
.2byte 2
.byte 0xE
.byte 0x15
.2byte 3
.byte 0xF
.byte 0x16
.2byte 4
.byte 0x10
.byte 0x17
.2byte 5
.byte 0x11
.byte 0x18
.2byte 6
.byte 0x12
.byte 0x19
.2byte 7
.byte 0x8
.byte 0x11
.2byte 0
.byte 0xFF
.byte 0
.2byte 0
gUnknown_085A7A04:: @ 85A7A04
.4byte gUnknown_085A7954
.4byte gUnknown_085A7964
.4byte gUnknown_085A7980
.4byte gUnknown_085A798C
.4byte gUnknown_085A79A4
.4byte gUnknown_085A79DC
.4byte gUnknown_085A79B4
gUnknown_085A7A20:: @ 85A7A20
.4byte sub_812F7C0
.4byte sub_812F784
.4byte sub_812F794
.4byte nullsub_101
.4byte nullsub_101
.4byte sub_812F794
.4byte sub_812F794
.align 2
gUnknown_085A7A3C:: @ 85A7A3C
.2byte 0
@@ -820,50 +302,50 @@ gUnknown_085A7C8C:: @ 85A7C8C
gUnknown_085A7CDC:: @ 85A7CDC
.4byte gUnknown_085A7C8C
gUnknown_085A7CE0:: @ 85A7CE0
spr_template 0, 0, gUnknown_085A7A5C, gUnknown_085A7BF8, NULL, gDummySpriteAffineAnimTable, sub_812E154
gSpriteTemplate_83ED414:: @ 85A7CE0
spr_template 0, 0, gUnknown_085A7A5C, gUnknown_085A7BF8, NULL, gDummySpriteAffineAnimTable, sub_8104F18
gUnknown_085A7CF8:: @ 85A7CF8
spr_template 7, 4, gUnknown_085A7A44, gUnknown_085A7BF8, NULL, gDummySpriteAffineAnimTable, sub_812E2A8
gSpriteTemplate_83ED42C:: @ 85A7CF8
spr_template 7, 4, gUnknown_085A7A44, gUnknown_085A7BF8, NULL, gDummySpriteAffineAnimTable, sub_810506C
gUnknown_085A7D10:: @ 85A7D10
gSpriteTemplate_83ED444:: @ 85A7D10
spr_template 17, 0, gUnknown_085A7A74, gUnknown_085A7BF8, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
gUnknown_085A7D28:: @ 85A7D28
spr_template 0xFFFF, 1, gUnknown_085A7A74, gUnknown_085A7C00, NULL, gDummySpriteAffineAnimTable, sub_812E424
gSpriteTemplate_83ED45C:: @ 85A7D28
spr_template 0xFFFF, 1, gUnknown_085A7A74, gUnknown_085A7C00, NULL, gDummySpriteAffineAnimTable, sub_8105170
gUnknown_085A7D40:: @ 85A7D40
gSpriteTemplate_83ED474:: @ 85A7D40
spr_template 0xFFFF, 2, gUnknown_085A7A44, gUnknown_085A7BF8, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
gUnknown_085A7D58:: @ 85A7D58
gSpriteTemplate_83ED48C:: @ 85A7D58
spr_template 0xFFFF, 3, gUnknown_085A7A44, gUnknown_085A7BF8, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
gUnknown_085A7D70:: @ 85A7D70
gSpriteTemplate_83ED4A4:: @ 85A7D70
spr_template 0xFFFF, 3, gUnknown_085A7A44, gUnknown_085A7BF8, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
gUnknown_085A7D88:: @ 85A7D88
spr_template 0xFFFF, 4, gUnknown_085A7A4C, gUnknown_085A7C18, gUnknown_085A7A7C, gDummySpriteAffineAnimTable, sub_812E6C4
gSpriteTemplate_83ED4BC:: @ 85A7D88
spr_template 0xFFFF, 4, gUnknown_085A7A4C, gUnknown_085A7C18, gUnknown_085A7A7C, gDummySpriteAffineAnimTable, sub_810535C
gUnknown_085A7DA0:: @ 85A7DA0
gSpriteTemplate_83ED4D4:: @ 85A7DA0
spr_template 0xFFFF, 4, gUnknown_085A7A4C, gUnknown_085A7BF8, gUnknown_085A7AAC, gDummySpriteAffineAnimTable, SpriteCallbackDummy
gUnknown_085A7DB8:: @ 85A7DB8
gSpriteTemplate_83ED4EC:: @ 85A7DB8
spr_template 0xFFFF, 4, gUnknown_085A7A4C, gUnknown_085A7BF8, gUnknown_085A7AB4, gDummySpriteAffineAnimTable, SpriteCallbackDummy
gUnknown_085A7DD0:: @ 85A7DD0
spr_template 0xFFFF, 4, gUnknown_085A7A54, gUnknown_085A7C30, gUnknown_085A7ABC, gDummySpriteAffineAnimTable, sub_812E9E8
gSpriteTemplate_83ED504:: @ 85A7DD0
spr_template 0xFFFF, 4, gUnknown_085A7A54, gUnknown_085A7C30, gUnknown_085A7ABC, gDummySpriteAffineAnimTable, sub_810562C
gUnknown_085A7DE8:: @ 85A7DE8
spr_template 0xFFFF, 7, gUnknown_085A7A64, gUnknown_085A7BF8, gUnknown_085A7ACC, gDummySpriteAffineAnimTable, sub_812EB48
gSpriteTemplate_83ED51C:: @ 85A7DE8
spr_template 0xFFFF, 7, gUnknown_085A7A64, gUnknown_085A7BF8, gUnknown_085A7ACC, gDummySpriteAffineAnimTable, sub_8105784
gUnknown_085A7E00:: @ 85A7E00
spr_template 0xFFFF, 5, gUnknown_085A7A5C, gUnknown_085A7C34, gUnknown_085A7AD4, gDummySpriteAffineAnimTable, sub_812EC64
gSpriteTemplate_83ED534:: @ 85A7E00
spr_template 0xFFFF, 5, gUnknown_085A7A5C, gUnknown_085A7C34, gUnknown_085A7AD4, gDummySpriteAffineAnimTable, sub_8105894
gUnknown_085A7E18:: @ 85A7E18
spr_template 0xFFFF, 4, gUnknown_085A7A3C, gUnknown_085A7BFC, gUnknown_085A7AE4, gDummySpriteAffineAnimTable, sub_812ED20
gSpriteTemplate_83ED54C:: @ 85A7E18
spr_template 0xFFFF, 4, gUnknown_085A7A3C, gUnknown_085A7BFC, gUnknown_085A7AE4, gDummySpriteAffineAnimTable, sub_810594C
gUnknown_085A7E30:: @ 85A7E30
spr_template 0xFFFF, 4, gUnknown_085A7A4C, gUnknown_085A7BF8, gUnknown_085A7AEC, gUnknown_085A7C88, sub_812EE14
gSpriteTemplate_83ED564:: @ 85A7E30
spr_template 0xFFFF, 4, gUnknown_085A7A4C, gUnknown_085A7BF8, gUnknown_085A7AEC, gUnknown_085A7C88, sub_8105A38
gUnknown_085A7E48:: @ 85A7E48
spr_template 0xFFFF, 6, gUnknown_085A7A3C, gUnknown_085A7BF8, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
@@ -907,8 +389,8 @@ gUnknown_085A7F68:: @ 85A7F68
gUnknown_085A7F80:: @ 85A7F80
spr_template 0xFFFF, 6, gUnknown_085A7A3C, gUnknown_085A7C40, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
gUnknown_085A7F98:: @ 85A7F98
spr_template 0xFFFF, 4, gUnknown_085A7A3C, gUnknown_085A7BF8, gUnknown_085A7AF4, gUnknown_085A7CDC, sub_812EF54
gSpriteTemplate_83ED6CC:: @ 85A7F98
spr_template 0xFFFF, 4, gUnknown_085A7A3C, gUnknown_085A7BF8, gUnknown_085A7AF4, gUnknown_085A7CDC, sub_8105B70
gUnknown_085A7FB0:: @ 85A7FB0
subsprite -64, -64, 3, 0, 64x64
@@ -916,7 +398,7 @@ gUnknown_085A7FB0:: @ 85A7FB0
subsprite -64, 0, 3, 0, 64x64
subsprite 0, 0, 3, 0, 64x64
gUnknown_085A7FC0:: @ 85A7FC0
gSubspriteTables_83ED704:: @ 85A7FC0
.4byte 4, gUnknown_085A7FB0
gUnknown_085A7FC8:: @ 85A7FC8
@@ -927,7 +409,7 @@ gUnknown_085A7FC8:: @ 85A7FC8
subsprite -32, 4, 1, 16, 32x8
subsprite 0, 4, 1, 20, 32x8
gUnknown_085A7FE0:: @ 85A7FE0
gSubspriteTables_83ED73C:: @ 85A7FE0
.4byte 6, gUnknown_085A7FC8
gUnknown_085A7FE8:: @ 85A7FE8
@@ -935,7 +417,7 @@ gUnknown_085A7FE8:: @ 85A7FE8
subsprite -32, 12, 1, 32, 32x8
subsprite 0, 12, 1, 36, 32x8
gUnknown_085A7FF4:: @ 85A7FF4
gSubspriteTables_83ED75C:: @ 85A7FF4
.4byte 3, gUnknown_085A7FE8
gUnknown_085A7FFC:: @ 85A7FFC
@@ -945,7 +427,7 @@ gUnknown_085A7FFC:: @ 85A7FFC
subsprite -32, 16, 1, 40, 32x8
subsprite 0, 16, 1, 44, 32x8
gUnknown_085A8010:: @ 85A8010
gSubspriteTables_83ED78C:: @ 85A8010
.4byte 5, gUnknown_085A7FFC
gUnknown_085A8018:: @ 85A8018
@@ -954,7 +436,7 @@ gUnknown_085A8018:: @ 85A8018
subsprite -32, 0, 1, 8, 32x8
subsprite 0, 0, 1, 12, 32x8
gUnknown_085A8028:: @ 85A8028
gSubspriteTables_83ED7B4:: @ 85A8028
.4byte 4, gUnknown_085A8018
gUnknown_085A8030:: @ 85A8030
@@ -962,7 +444,7 @@ gUnknown_085A8030:: @ 85A8030
subsprite -8, -4, 1, 0, 16x8
subsprite -8, 4, 1, 0, 16x8
gUnknown_085A803C:: @ 85A803C
gSubspriteTables_83ED7D4:: @ 85A803C
.4byte 3, gUnknown_085A8030
gUnknown_085A8044:: @ 85A8044
@@ -1173,7 +655,7 @@ gUnknown_085A8244:: @ 85A8244
gUnknown_085A825C:: @ 85A825C
.4byte 6, gUnknown_085A8244
gUnknown_085A8264:: @ 85A8264
gUnknown_083EDB5C:: @ 85A8264
.4byte gUnknown_085A7E48
.4byte gUnknown_085A7E60
.4byte gUnknown_085A7E78
@@ -1201,7 +683,7 @@ gUnknown_085A8264:: @ 85A8264
.4byte gUnknown_085A7F08
.4byte gDummySpriteTemplate
gUnknown_085A82CC:: @ 85A82CC
gUnknown_083EDBC4:: @ 85A82CC
.4byte gUnknown_085A8058
.4byte gUnknown_085A8070
.4byte gUnknown_085A8088
@@ -1230,7 +712,7 @@ gUnknown_085A82CC:: @ 85A82CC
.4byte NULL
.align 2
gUnknown_085A8334:: @ 85A8334
sSlotMachineSpriteSheets:: @ 85A8334
obj_tiles gSlotMachineReelSymbol1Tiles, 0x0200, 0x0000
obj_tiles gSlotMachineReelSymbol2Tiles, 0x0200, 0x0001
obj_tiles gSlotMachineReelSymbol3Tiles, 0x0200, 0x0002
@@ -1252,7 +734,7 @@ gUnknown_085A8334:: @ 85A8334
.align 2
.byte 0, 0, 0, 0, 0, 2, 0x12, 0, 0, 0, 0, 0, 0, 2, 0x13, 0, 0, 0, 0, 0, 0, 3, 0x14, 0, 0, 0, 0, 0, 0, 3, 0x15, 0, 0, 0, 0, 0, 0, 0, 0, 0
gUnknown_085A83E4:: @ 85A83E4
gUnknown_083EDCDC:: @ 85A83E4
.4byte gUnknown_08DD19F8
@ might be a palette idk
.byte 0x7B, 0x6F, 0x68, 0x69, 0xAB, 0x36, 0xFF, 0x7F, 0x50, 0x57, 0xC0, 0x7E, 0xBA, 2, 0xBA, 2, 0xFD, 1, 0xFD, 1
@@ -1272,29 +754,29 @@ gUnknown_085A8402:: @ 85A8402
gUnknown_085A8404:: @ 85A8404
.byte 0xBF, 0x4A, 0, 0
gUnknown_085A8408:: @ 85A8408
gUnknown_083EDD08:: @ 85A8408
.4byte gUnknown_085A83FC
.4byte gUnknown_085A83FE
.4byte gUnknown_085A8400
.4byte gUnknown_085A8402
.4byte gUnknown_085A8404
gUnknown_085A841C:: @ 85A841C
gUnknown_083EDD1C:: @ 85A841C
.4byte gSlotMachineMenu_Pal + 0x94
.4byte gSlotMachineMenu_Pal + 0x96
.4byte gSlotMachineMenu_Pal + 0x98
.4byte gSlotMachineMenu_Pal + 0x9A
.4byte gSlotMachineMenu_Pal + 0x9C
gUnknown_085A8430:: @ 85A8430
gUnknown_083EDD30:: @ 85A8430
.byte 0x4A, 0x4B, 0x4C, 0x4E, 0x4D
gUnknown_085A8435:: @ 85A8435
gUnknown_083EDD35:: @ 85A8435
.byte 0, 0
.byte 1, 2
.byte 3, 4
gUnknown_085A843B:: @ 85A843B
gUnknown_083EDD3B:: @ 85A843B
.byte 1, 2, 2
gUnknown_085A843E:: @ 85A843E
@@ -1307,12 +789,12 @@ gUnknown_085A847E:: @ 85A847E
.incbin "graphics/slot_machine/85A847E.gbapal"
.align 2
gUnknown_085A84A0:: @ 85A84A0
gUnknown_083EDDA0:: @ 85A84A0
.4byte gUnknown_085A843E
.4byte gUnknown_085A845E
.4byte gUnknown_085A847E
gUnknown_085A84AC:: @ 85A84AC
gUnknown_083EDDAC:: @ 85A84AC
.4byte gSlotMachineMenu_Pal + 0x20
gUnknown_085A84B0:: @ 85A84B0
@@ -1324,20 +806,20 @@ gUnknown_085A84D0:: @ 85A84D0
gUnknown_085A84F0:: @ 85A84F0
.incbin "graphics/slot_machine/85A84F0.gbapal"
gUnknown_085A8510:: @ 85A8510
gUnknown_083EDE10:: @ 85A8510
.4byte gUnknown_085A84B0
.4byte gUnknown_085A84D0
.4byte gUnknown_085A84F0
.4byte gUnknown_08DCF230
gUnknown_085A8520:: @ 85A8520
gUnknown_083EDE20:: @ 85A8520
.4byte gUnknown_08DCF230
gUnknown_085A8524:: @ 85A8524
gPalette_83EDE24:: @ 85A8524
.incbin "graphics/slot_machine/85A8524.bin"
.align 2
gUnknown_085A8544:: @ 85A8544
gSlotMachineSpritePalettes:: @ 85A8544
obj_pal gUnknown_08DCF170, 0
obj_pal gUnknown_08DCF190, 1
obj_pal gUnknown_08DCF1B0, 2
@@ -1348,10 +830,10 @@ gUnknown_085A8544:: @ 85A8544
obj_pal gUnknown_08DCF1F0, 7
null_obj_pal
gUnknown_085A858C:: @ 85A858C
sReelTimeGfx:: @ 85A858C
.incbin "graphics/slot_machine/reel_time_gfx.4bpp.lz"
gUnknown_085A96E0:: @ 85A96E0
sReelTimeWindowTilemap:: @ 85A96E0
@if anyone knows what this tilemap is please do share
.incbin "graphics/slot_machine/85A96E0.bin"

159
data/starter_choose.s
View File

@@ -1,159 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.include "include/constants/species.h"
.section .rodata
.align 2
gBirchBagGrassPal:: @ 85B0A00
.incbin "graphics/misc/birch_bag.gbapal"
.incbin "graphics/misc/birch_grass.gbapal"
.align 2
gBirchBallarrow_Pal:: @ 85B0A40
.incbin "graphics/misc/birch_ballarrow.gbapal"
.align 2
gBirchCircle_Pal:: @ 85B0A60
.incbin "graphics/misc/birch_circle.gbapal"
.align 2
gBirchBagTilemap:: @ 85B0A80
.incbin "graphics/misc/birch_bag_map.bin.lz"
.align 2
gBirchGrassTilemap:: @ 85B0C0C
.incbin "graphics/misc/birch_grass_map.bin.lz"
.align 2
gBirchHelpGfx:: @ 85B0E04
.incbin "graphics/misc/birch_help.4bpp.lz"
.align 2
gUnknown_085B18AC:: @ 85B18AC
.incbin "graphics/misc/birch_ballarrow.4bpp.lz"
.align 2
gUnknown_085B1BCC:: @ 85B1BCC
.incbin "graphics/misc/birch_circle.4bpp.lz"
.align 2
gUnknown_085B1DCC:: @ 85B1DCC
window_template 0x00, 0x03, 0x0f, 0x18, 0x04, 0x0e, 0x0200
null_window_template
.align 2
gUnknown_085B1DDC:: @ 85B1DDC
window_template 0x00, 0x18, 0x09, 0x05, 0x04, 0x0e, 0x0260
.align 2
gUnknown_085B1DE4:: @ 85B1DE4
window_template 0x00, 0x00, 0x00, 0x0d, 0x04, 0x0e, 0x0274
sPokeballCoords:: @ 85B1DEC
.byte 0x3c, 0x40, 0x78, 0x58, 0xb4, 0x40
gStarterChoose_LabelCoords:: @ 85B1DF2
.byte 0x00, 0x09, 0x10, 0x0a, 0x08, 0x04
sStarterMon:: @ 85B1DF8
.2byte SPECIES_TREECKO
.2byte SPECIES_TORCHIC
.2byte SPECIES_MUDKIP
.align 2
gUnknown_085B1E00:: @ 85B1E00
.4byte 0x000001f8, 0x00003072, 0x00001063
gUnknown_085B1E0C:: @ 85B1E0C
.byte 0x00, 0x01, 0x03
.align 2
gOamData_85B1E10:: @ 85B1E10
.2byte 0x00a0, 0x8000, 0x0400, 0x0000
.align 2
gOamData_85B1E18:: @ 85B1E18
.2byte 0x00a0, 0x8000, 0x0400, 0x0000
.align 2
gOamData_85B1E20:: @ 85B1E20
.2byte 0x03a0, 0xc000, 0x0400, 0x0000
gUnknown_085B1E28:: @ 85B1E28
.byte 0x3c, 0x20, 0x78, 0x38, 0xb4, 0x20, 0x00, 0x00
.align 2
gSpriteAnim_85B1E30:: @ 85B1E30
.2byte 0x0030, 0x001e, 0xffff, 0x0000
.align 2
gSpriteAnim_85B1E38:: @ 85B1E38
.2byte 0x0000, 0x001e, 0xffff, 0x0000
.align 2
gSpriteAnim_85B1E40:: @ 85B1E40
.2byte 0x0010, 0x0004, 0x0000, 0x0004, 0x0020, 0x0004, 0x0000, 0x0004, 0x0010, 0x0004, 0x0000, 0x0004, 0x0020, 0x0004, 0x0000, 0x0004
.2byte 0x0000, 0x0020, 0x0010, 0x0008, 0x0000, 0x0008, 0x0020, 0x0008, 0x0000, 0x0008, 0x0010, 0x0008, 0x0000, 0x0008, 0x0020, 0x0008
.2byte 0x0000, 0x0008, 0xfffe, 0x0000
.align 2
gSpriteAnim_85B1E88:: @ 85B1E88
.2byte 0x0000, 0x0008, 0xffff, 0x0000
.align 2
gSpriteAnimTable_85B1E90:: @ 85B1E90
.4byte gSpriteAnim_85B1E30
.align 2
gSpriteAnimTable_85B1E94:: @ 85B1E94
.4byte gSpriteAnim_85B1E38
.4byte gSpriteAnim_85B1E40
.align 2
gSpriteAnimTable_85B1E9C:: @ 85B1E9C
.4byte gSpriteAnim_85B1E88
.align 2
gSpriteAffineAnim_85B1EA0:: @ 85B1EA0
.2byte 0x0010, 0x0010, 0x0000, 0x0000, 0x0010, 0x0010, 0x0f00, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000
.align 2
gSpriteAffineAnim_85B1EB8:: @ 85B1EB8
.2byte 0x0014, 0x0014, 0x0000, 0x0000, 0x0014, 0x0014, 0x0f00, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000
.align 2
gUnknown_085B1ED0:: @ 85B1ED0
.4byte gSpriteAffineAnim_85B1EA0
.align 2
gSpriteAffineAnimTable_85B1ED4:: @ 85B1ED4
.4byte gSpriteAffineAnim_85B1EB8
.align 2
gUnknown_085B1ED8:: @ 85B1ED8
obj_tiles gUnknown_085B18AC, 0x0800, 0x1000
null_obj_tiles
.align 2
gUnknown_085B1EE8:: @ 85B1EE8
obj_tiles gUnknown_085B1BCC, 0x0800, 0x1001
null_obj_tiles
.align 2
gUnknown_085B1EF8:: @ 85B1EF8
obj_pal gBirchBallarrow_Pal, 0x1000
obj_pal gBirchCircle_Pal, 0x1001
null_obj_pal
.align 2
sSpriteTemplate_Hand:: @ 85B1F10
spr_template 0x1000, 0x1000, gOamData_85B1E10, gSpriteAnimTable_85B1E90, NULL, gDummySpriteAffineAnimTable, sub_81346DC
.align 2
sSpriteTemplate_PokeBall:: @ 85B1F28
spr_template 0x1000, 0x1000, gOamData_85B1E18, gSpriteAnimTable_85B1E94, NULL, gDummySpriteAffineAnimTable, sub_813473C
.align 2
gUnknown_085B1F40:: @ 85B1F40
spr_template 0x1001, 0x1001, gOamData_85B1E20, gSpriteAnimTable_85B1E9C, NULL, gSpriteAffineAnimTable_85B1ED4, StarterPokemonSpriteCallback

BIN
data/tilesets/primary/building/anim/0.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 141 B

After

Width:  |  Height:  |  Size: 179 B

BIN
data/tilesets/primary/building/anim/1.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 144 B

After

Width:  |  Height:  |  Size: 180 B

BIN
data/tilesets/primary/building/tiles.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.8 KiB

After

Width:  |  Height:  |  Size: 1.5 KiB

BIN
data/tilesets/primary/general/anim/0/0.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 183 B

After

Width:  |  Height:  |  Size: 239 B

BIN
data/tilesets/primary/general/anim/0/1.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 182 B

After

Width:  |  Height:  |  Size: 238 B

BIN
data/tilesets/primary/general/anim/0/2.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 183 B

After

Width:  |  Height:  |  Size: 241 B

BIN
data/tilesets/primary/general/anim/1/0.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 518 B

After

Width:  |  Height:  |  Size: 608 B

BIN
data/tilesets/primary/general/anim/1/1.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 581 B

After

Width:  |  Height:  |  Size: 651 B

BIN
data/tilesets/primary/general/anim/1/2.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 534 B

After

Width:  |  Height:  |  Size: 597 B

BIN
data/tilesets/primary/general/anim/1/3.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 527 B

After

Width:  |  Height:  |  Size: 610 B

BIN
data/tilesets/primary/general/anim/1/4.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 461 B

After

Width:  |  Height:  |  Size: 534 B

BIN
data/tilesets/primary/general/anim/1/5.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 460 B

After

Width:  |  Height:  |  Size: 538 B

BIN
data/tilesets/primary/general/anim/1/6.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 480 B

After

Width:  |  Height:  |  Size: 554 B

BIN
data/tilesets/primary/general/anim/1/7.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 521 B

After

Width:  |  Height:  |  Size: 612 B

BIN
data/tilesets/primary/general/anim/2/0.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 194 B

After

Width:  |  Height:  |  Size: 259 B

BIN
data/tilesets/primary/general/anim/2/1.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 243 B

After

Width:  |  Height:  |  Size: 293 B

BIN
data/tilesets/primary/general/anim/2/2.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 262 B

After

Width:  |  Height:  |  Size: 303 B

BIN
data/tilesets/primary/general/anim/2/3.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 280 B

After

Width:  |  Height:  |  Size: 320 B

BIN
data/tilesets/primary/general/anim/2/4.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 232 B

After

Width:  |  Height:  |  Size: 281 B

BIN
data/tilesets/primary/general/anim/2/5.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 220 B

After

Width:  |  Height:  |  Size: 261 B

BIN
data/tilesets/primary/general/anim/2/6.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 203 B

After

Width:  |  Height:  |  Size: 249 B

BIN
data/tilesets/primary/general/anim/3/0.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 136 B

After

Width:  |  Height:  |  Size: 199 B

BIN
data/tilesets/primary/general/anim/3/1.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 154 B

After

Width:  |  Height:  |  Size: 214 B

BIN
data/tilesets/primary/general/anim/3/2.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 133 B

After

Width:  |  Height:  |  Size: 195 B

BIN
data/tilesets/primary/general/anim/3/3.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 130 B

After

Width:  |  Height:  |  Size: 191 B

BIN
data/tilesets/primary/general/anim/4/0.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 304 B

After

Width:  |  Height:  |  Size: 333 B

BIN
data/tilesets/primary/general/anim/4/1.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 311 B

After

Width:  |  Height:  |  Size: 341 B

BIN
data/tilesets/primary/general/anim/4/2.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 314 B

After

Width:  |  Height:  |  Size: 342 B

BIN
data/tilesets/primary/general/anim/4/3.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 328 B

After

Width:  |  Height:  |  Size: 360 B

BIN
data/tilesets/primary/general/tiles.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 7.6 KiB

After

Width:  |  Height:  |  Size: 7.4 KiB

BIN
data/tilesets/primary/secret_base/tiles.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 7.7 KiB

After

Width:  |  Height:  |  Size: 7.0 KiB

BIN
data/tilesets/primary/secret_base/unknown_tiles.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 1.2 KiB

BIN
data/tilesets/secondary/battle_arena/tiles.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.3 KiB

After

Width:  |  Height:  |  Size: 2.1 KiB

BIN
data/tilesets/secondary/battle_dome/tiles.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.5 KiB

After

Width:  |  Height:  |  Size: 3.2 KiB

BIN
data/tilesets/secondary/battle_factory/tiles.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.6 KiB

After

Width:  |  Height:  |  Size: 3.3 KiB

BIN
data/tilesets/secondary/battle_frontier/tiles.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.6 KiB

After

Width:  |  Height:  |  Size: 2.4 KiB

BIN
data/tilesets/secondary/battle_frontier_outside_east/anim/0.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 191 B

After

Width:  |  Height:  |  Size: 230 B

BIN
data/tilesets/secondary/battle_frontier_outside_east/anim/1.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 188 B

After

Width:  |  Height:  |  Size: 227 B

BIN
data/tilesets/secondary/battle_frontier_outside_east/anim/2.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 185 B

After

Width:  |  Height:  |  Size: 225 B

BIN
data/tilesets/secondary/battle_frontier_outside_east/anim/3.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 183 B

After

Width:  |  Height:  |  Size: 228 B

BIN
data/tilesets/secondary/battle_frontier_outside_east/tiles.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.7 KiB

After

Width:  |  Height:  |  Size: 3.7 KiB

BIN
data/tilesets/secondary/battle_frontier_outside_west/anim/0.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 191 B

After

Width:  |  Height:  |  Size: 230 B

BIN
data/tilesets/secondary/battle_frontier_outside_west/anim/1.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 188 B

After

Width:  |  Height:  |  Size: 227 B

BIN
data/tilesets/secondary/battle_frontier_outside_west/anim/2.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 185 B

After

Width:  |  Height:  |  Size: 225 B

BIN
data/tilesets/secondary/battle_frontier_outside_west/anim/3.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 183 B

After

Width:  |  Height:  |  Size: 228 B

BIN
data/tilesets/secondary/battle_frontier_outside_west/tiles.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.8 KiB

After

Width:  |  Height:  |  Size: 5.4 KiB

BIN
data/tilesets/secondary/battle_frontier_ranking_hall/tiles.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.7 KiB

After

Width:  |  Height:  |  Size: 1.5 KiB

BIN
data/tilesets/secondary/battle_palace/tiles.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.6 KiB

After

Width:  |  Height:  |  Size: 1.5 KiB

BIN
data/tilesets/secondary/battle_pike/tiles.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.9 KiB

After

Width:  |  Height:  |  Size: 3.9 KiB

BIN
data/tilesets/secondary/battle_pyramid/anim/0/0.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 228 B

After

Width:  |  Height:  |  Size: 265 B

BIN
data/tilesets/secondary/battle_pyramid/anim/0/1.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 220 B

After

Width:  |  Height:  |  Size: 259 B

BIN
data/tilesets/secondary/battle_pyramid/anim/0/2.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 219 B

After

Width:  |  Height:  |  Size: 254 B

BIN
data/tilesets/secondary/battle_pyramid/anim/1/0.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 261 B

After

Width:  |  Height:  |  Size: 303 B

BIN
data/tilesets/secondary/battle_pyramid/anim/1/1.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 267 B

After

Width:  |  Height:  |  Size: 307 B

BIN
data/tilesets/secondary/battle_pyramid/anim/1/2.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 261 B

After

Width:  |  Height:  |  Size: 303 B

BIN
data/tilesets/secondary/battle_pyramid/anim/1/3.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 105 B

BIN
data/tilesets/secondary/battle_pyramid/anim/1/4.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 86 B

BIN
data/tilesets/secondary/battle_pyramid/anim/1/5.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 86 B

BIN
data/tilesets/secondary/battle_pyramid/anim/1/6.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 106 B

BIN
data/tilesets/secondary/battle_pyramid/anim/1/7.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 393 B

BIN
data/tilesets/secondary/battle_pyramid/anim/1/8.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 105 B

BIN
data/tilesets/secondary/battle_pyramid/anim/1/9.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 111 B

BIN
data/tilesets/secondary/battle_pyramid/tiles.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.4 KiB

After

Width:  |  Height:  |  Size: 3.2 KiB

BIN
data/tilesets/secondary/battle_tent/tiles.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.0 KiB

After

Width:  |  Height:  |  Size: 1.7 KiB

BIN
data/tilesets/secondary/bike_shop/anim/0.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 250 B

After

Width:  |  Height:  |  Size: 290 B

BIN
data/tilesets/secondary/bike_shop/anim/1.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 249 B

After

Width:  |  Height:  |  Size: 286 B

BIN
data/tilesets/secondary/bike_shop/anim/2.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 219 B

BIN
data/tilesets/secondary/bike_shop/tiles.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.4 KiB

After

Width:  |  Height:  |  Size: 3.2 KiB

BIN
data/tilesets/secondary/brendans_mays_house/tiles.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.0 KiB

After

Width:  |  Height:  |  Size: 2.6 KiB

BIN
data/tilesets/secondary/cable_club/tiles.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.5 KiB

After

Width:  |  Height:  |  Size: 2.4 KiB

BIN
data/tilesets/secondary/cable_club/unknown_tiles.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 311 B

After

Width:  |  Height:  |  Size: 332 B

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