Merge pull request #3 from pret/master

merge
This commit is contained in:
Tetrable
2018-09-09 20:42:23 +01:00
committed by GitHub
1790 changed files with 14352 additions and 27643 deletions

View File

@@ -90,6 +90,7 @@ tidy:
rm -r build/*
include graphics_file_rules.mk
include event_obj_graphics_makefile_rules.mk
%.s: ;
%.png: ;

View File

@@ -774,7 +774,7 @@ _08150340:
orrs r3, r0
str r3, [r2, 0x8]
ldr r0, [r2, 0x8]
bl warp_in
bl WarpIntoMap
ldr r0, =gFieldCallback
str r4, [r0]
ldr r0, =CB2_LoadMap

View File

@@ -530,7 +530,7 @@ sub_809C2C8: @ 809C2C8
ldrh r1, [r4, 0x2]
b _0809C30E
_0809C2F0:
ldr r1, =gUnknown_08339D64
ldr r1, =gDirectionToVectors
lsls r2, r6, 3
adds r0, r2, r1
ldr r3, [r0]
@@ -631,7 +631,7 @@ _0809C3B4:
lsrs r0, 24
cmp r0, 0x1
bne _0809C400
ldr r1, =gUnknown_08339D64
ldr r1, =gDirectionToVectors
lsls r2, r7, 3
adds r0, r2, r1
ldr r3, [r0]
@@ -1658,7 +1658,7 @@ mapheader_run_first_tag2_script_list_match_conditionally: @ 809CC38
negs r0, r0
cmp r4, r0
beq _0809CC90
bl walkrun_find_lowest_active_bit_in_bitfield
bl StoreInitialPlayerAvatarState
mov r0, r8
adds r1, r4, 0
adds r2, r7, 0
@@ -1699,7 +1699,7 @@ sub_809CC9C: @ 809CC9C
lsrs r0, 24
cmp r0, 0x1
bne _0809CD8A
bl walkrun_find_lowest_active_bit_in_bitfield
bl StoreInitialPlayerAvatarState
adds r0, r7, 0
adds r1, r4, 0
adds r2, r6, 0
@@ -2083,7 +2083,7 @@ _0809CFB0:
lsrs r0, 24
cmp r0, 0x1
bne _0809CFFC
bl walkrun_find_lowest_active_bit_in_bitfield
bl StoreInitialPlayerAvatarState
adds r0, r6, 0
adds r1, r4, 0
adds r2, r5, 0
@@ -2334,7 +2334,7 @@ dive_warp: @ 809D16C
subs r1, 0x7
lsls r1, 16
lsrs r1, 16
bl sub_8085058
bl SetDiveWarpEmerge
b _0809D1C8
.pool
_0809D1A4:
@@ -2353,12 +2353,12 @@ _0809D1A4:
subs r1, 0x7
lsls r1, 16
lsrs r1, 16
bl sub_8085078
bl SetDiveWarpDive
_0809D1C8:
lsls r0, 24
cmp r0, 0
beq _0809D1E0
bl walkrun_find_lowest_active_bit_in_bitfield
bl StoreInitialPlayerAvatarState
bl sp13E_warp_to_last_warp
movs r0, 0xE9
bl PlaySE
@@ -2407,7 +2407,7 @@ sub_809D1E8: @ 809D1E8
subs r1, 0x7
lsls r1, 16
lsrs r1, 16
bl sub_8085058
bl SetDiveWarpEmerge
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -2431,7 +2431,7 @@ _0809D244:
subs r1, 0x7
lsls r1, 16
lsrs r1, 16
bl sub_8085078
bl SetDiveWarpDive
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1

View File

@@ -20,7 +20,7 @@ SetUpReflection: @ 8153ED4
ldrsh r2, [r4, r0]
adds r0, r4, 0
movs r3, 0x98
bl obj_unfreeze
bl CreateCopySpriteAt
lsls r0, 24
lsrs r0, 24
lsls r1, r0, 4
@@ -34,7 +34,7 @@ SetUpReflection: @ 8153ED4
movs r0, 0xC
orrs r1, r0
strb r1, [r7, 0x5]
ldr r2, =gUnknown_084975C4
ldr r2, =gReflectionEffectPaletteMap
lsrs r0, r1, 4
adds r0, r2
ldrb r0, [r0]
@@ -185,7 +185,7 @@ npc_pal_op_B: @ 815401C
bne _0815404C
ldrh r0, [r2, 0x2]
adds r1, r4, 0
bl npc_load_two_palettes__no_record
bl LoadPlayerObjectReflectionPalette
b _0815406A
.pool
_0815404C:
@@ -193,15 +193,15 @@ _0815404C:
bne _0815405A
ldrh r0, [r2, 0x2]
adds r1, r4, 0
bl npc_load_two_palettes__and_record
bl LoadSpecialObjectReflectionPalette
b _0815406A
_0815405A:
adds r0, r4, 0
bl npc_paltag_by_palslot
bl GetObjectPaletteTag
lsls r0, 16
lsrs r0, 16
adds r1, r4, 0
bl pal_patch_for_npc
bl PatchObjectPalette
_0815406A:
adds r0, r4, 0
bl UpdateSpritePaletteWithWeather
@@ -225,7 +225,7 @@ npc_pal_op_A: @ 8154078
beq _0815409C
adds r0, r1, 0
adds r1, r4, 0
bl pal_patch_for_npc
bl PatchObjectPalette
adds r0, r4, 0
bl UpdateSpritePaletteWithWeather
_0815409C:
@@ -277,7 +277,7 @@ _081540E0:
b _08154214
.pool
_081540FC:
ldr r1, =gUnknown_084975C4
ldr r1, =gReflectionEffectPaletteMap
ldrb r0, [r5, 0x5]
lsrs r0, 4
adds r0, r1

View File

@@ -7914,7 +7914,7 @@ sub_80AF0B4: @ 80AF0B4
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
bl warp1_get_mapheader
bl GetDestinationWarpMapHeader
ldrb r1, [r0, 0x17]
adds r0, r4, 0
bl sub_8137360
@@ -8924,7 +8924,7 @@ _080AF914:
bl sub_80AF710
cmp r0, 0
bne _080AF93E
bl sub_80859A0
bl BGMusicStopped
lsls r0, 24
cmp r0, 0
beq _080AF93E
@@ -8934,7 +8934,7 @@ _080AF926:
strh r0, [r4, 0x8]
b _080AF93E
_080AF92E:
bl warp_in
bl WarpIntoMap
ldr r0, =sub_8086074
bl SetMainCallback2
adds r0, r5, 0
@@ -8999,7 +8999,7 @@ _080AF9B2:
bl sub_80AF710
cmp r0, 0
bne _080AF9E8
bl sub_80859A0
bl BGMusicStopped
lsls r0, 24
cmp r0, 0
beq _080AF9E8
@@ -9014,7 +9014,7 @@ _080AF9D0:
ldrb r0, [r0]
cmp r0, 0
bne _080AF9E8
bl warp_in
bl WarpIntoMap
ldr r0, =CB2_LoadMap
bl SetMainCallback2
adds r0, r5, 0
@@ -9076,7 +9076,7 @@ _080AFA44:
bl sub_81BE72C
strh r5, [r4, 0xA]
_080AFA5A:
bl sub_80859A0
bl BGMusicStopped
lsls r0, 24
cmp r0, 0
beq _080AFA7C
@@ -9086,7 +9086,7 @@ _080AFA64:
strh r0, [r4, 0x8]
b _080AFA7C
_080AFA6C:
bl warp_in
bl WarpIntoMap
ldr r0, =CB2_LoadMap
bl SetMainCallback2
adds r0, r6, 0
@@ -9297,7 +9297,7 @@ _080AFC2C:
bl sub_80AF710
cmp r0, 0
bne _080AFC56
bl sub_80859A0
bl BGMusicStopped
lsls r0, 24
cmp r0, 0
beq _080AFC56
@@ -9307,7 +9307,7 @@ _080AFC3E:
strh r0, [r4, 0x8]
b _080AFC56
_080AFC46:
bl warp_in
bl WarpIntoMap
ldr r0, =sub_8086024
bl SetMainCallback2
adds r0, r5, 0
@@ -10049,7 +10049,7 @@ _080B0210:
bl sub_80AF710
cmp r0, 0
bne _080B023A
bl sub_80859A0
bl BGMusicStopped
lsls r0, 24
cmp r0, 0
beq _080B023A
@@ -10059,7 +10059,7 @@ _080B0222:
strh r0, [r4, 0x8]
b _080B023A
_080B022A:
bl warp_in
bl WarpIntoMap
ldr r0, =CB2_LoadMap
bl SetMainCallback2
adds r0, r5, 0
@@ -10492,7 +10492,7 @@ task50_0807F0C8: @ 80B05CC
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
bl sub_80859A0
bl BGMusicStopped
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1

View File

@@ -27,86 +27,86 @@
.byte \param0
.endm
.macro if_hp_less_than bank, param1, param2
.macro if_hp_less_than battler, param1, param2
.byte 0x5
.byte \bank
.byte \battler
.byte \param1
.4byte \param2
.endm
.macro if_hp_more_than bank, param1, param2
.macro if_hp_more_than battler, param1, param2
.byte 0x6
.byte \bank
.byte \battler
.byte \param1
.4byte \param2
.endm
.macro if_hp_equal bank, param1, param2
.macro if_hp_equal battler, param1, param2
.byte 0x7
.byte \bank
.byte \battler
.byte \param1
.4byte \param2
.endm
.macro if_hp_not_equal bank, param1, param2
.macro if_hp_not_equal battler, param1, param2
.byte 0x8
.byte \bank
.byte \battler
.byte \param1
.4byte \param2
.endm
.macro if_status bank, status1, param2
.macro if_status battler, status1, param2
.byte 0x9
.byte \bank
.byte \battler
.4byte \status1
.4byte \param2
.endm
.macro if_not_status bank, status1, param2
.macro if_not_status battler, status1, param2
.byte 0xa
.byte \bank
.byte \battler
.4byte \status1
.4byte \param2
.endm
.macro if_status2 bank, status2, param2
.macro if_status2 battler, status2, param2
.byte 0xb
.byte \bank
.byte \battler
.4byte \status2
.4byte \param2
.endm
.macro if_not_status2 bank, status2, param2
.macro if_not_status2 battler, status2, param2
.byte 0xc
.byte \bank
.byte \battler
.4byte \status2
.4byte \param2
.endm
.macro if_status3 bank, status3, param2
.macro if_status3 battler, status3, param2
.byte 0xd
.byte \bank
.byte \battler
.4byte \status3
.4byte \param2
.endm
.macro if_not_status3 bank, status3, param2
.macro if_not_status3 battler, status3, param2
.byte 0xe
.byte \bank
.byte \battler
.4byte \status3
.4byte \param2
.endm
.macro if_side_affecting bank, sidestatus, param2
.macro if_side_affecting battler, sidestatus, param2
.byte 0xf
.byte \bank
.byte \battler
.4byte \sidestatus
.4byte \param2
.endm
.macro if_not_side_affecting bank, sidestatus, param2
.macro if_not_side_affecting battler, sidestatus, param2
.byte 0x10
.byte \bank
.byte \battler
.4byte \sidestatus
.4byte \param2
.endm
@@ -222,9 +222,9 @@
.byte 0x24
.endm
.macro get_last_used_bank_move bank
.macro get_last_used_bank_move battler
.byte 0x25
.byte \bank
.byte \battler
.endm
.macro if_equal_ param0, param1
@@ -259,9 +259,9 @@
.byte 0x2b
.endm
.macro count_usable_party_mons bank
.macro count_usable_party_mons battler
.byte 0x2c
.byte \bank
.byte \battler
.endm
.macro get_considered_move
@@ -272,9 +272,9 @@
.byte 0x2e
.endm
.macro get_ability bank
.macro get_ability battler
.byte 0x2f
.byte \bank
.byte \battler
.endm
.macro get_highest_type_effectiveness
@@ -295,16 +295,16 @@
.byte 0x33
.endm
.macro if_status_in_party bank, status1, param2
.macro if_status_in_party battler, status1, param2
.byte 0x34
.byte \bank
.byte \battler
.4byte \status1
.4byte \param2
.endm
.macro if_status_not_in_party bank, status1, param2
.macro if_status_not_in_party battler, status1, param2
.byte 0x35
.byte \bank
.byte \battler
.4byte \status1
.4byte \param2
.endm
@@ -325,33 +325,33 @@
.4byte \param1
.endm
.macro if_stat_level_less_than bank, stat, param2, param3
.macro if_stat_level_less_than battler, stat, param2, param3
.byte 0x39
.byte \bank
.byte \battler
.byte \stat
.byte \param2
.4byte \param3
.endm
.macro if_stat_level_more_than bank, stat, param2, param3
.macro if_stat_level_more_than battler, stat, param2, param3
.byte 0x3a
.byte \bank
.byte \battler
.byte \stat
.byte \param2
.4byte \param3
.endm
.macro if_stat_level_equal bank, stat, param2, param3
.macro if_stat_level_equal battler, stat, param2, param3
.byte 0x3b
.byte \bank
.byte \battler
.byte \stat
.byte \param2
.4byte \param3
.endm
.macro if_stat_level_not_equal bank, stat, param2, param3
.macro if_stat_level_not_equal battler, stat, param2, param3
.byte 0x3c
.byte \bank
.byte \battler
.byte \stat
.byte \param2
.4byte \param3
@@ -367,37 +367,37 @@
.4byte \param0
.endm
.macro if_has_move bank, param1, param2
.macro if_has_move battler, param1, param2
.byte 0x3f
.byte \bank
.byte \battler
.2byte \param1
.4byte \param2
.endm
.macro if_doesnt_have_move bank, param1, param2
.macro if_doesnt_have_move battler, param1, param2
.byte 0x40
.byte \bank
.byte \battler
.2byte \param1
.4byte \param2
.endm
.macro if_has_move_with_effect bank, param1, param2
.macro if_has_move_with_effect battler, param1, param2
.byte 0x41
.byte \bank
.byte \battler
.byte \param1
.4byte \param2
.endm
.macro if_doesnt_have_move_with_effect bank, param1, param2
.macro if_doesnt_have_move_with_effect battler, param1, param2
.byte 0x42
.byte \bank
.byte \battler
.byte \param1
.4byte \param2
.endm
.macro if_any_move_disabled_or_encored bank, param1, param2
.macro if_any_move_disabled_or_encored battler, param1, param2
.byte 0x43
.byte \bank
.byte \battler
.byte \param1
.4byte \param2
.endm
@@ -421,33 +421,33 @@
.byte 0x47
.endm
.macro get_hold_effect bank
.macro get_hold_effect battler
.byte 0x48
.byte \bank
.byte \battler
.endm
.macro get_gender bank
.macro get_gender battler
.byte 0x49
.byte \bank
.byte \battler
.endm
.macro is_first_turn_for bank
.macro is_first_turn_for battler
.byte 0x4a
.byte \bank
.byte \battler
.endm
.macro get_stockpile_count bank
.macro get_stockpile_count battler
.byte 0x4b
.byte \bank
.byte \battler
.endm
.macro is_double_battle
.byte 0x4c
.endm
.macro get_used_held_item bank
.macro get_used_held_item battler
.byte 0x4d
.byte \bank
.byte \battler
.endm
.macro get_move_type_from_result
@@ -462,9 +462,9 @@
.byte 0x50
.endm
.macro get_protect_count bank
.macro get_protect_count battler
.byte 0x51
.byte \bank
.byte \battler
.endm
.macro nullsub_52
@@ -526,27 +526,27 @@
.4byte \param0
.endm
.macro is_of_type bank, type
.macro is_of_type battler, type
.byte 0x5f
.byte \bank
.byte \battler
.byte \type
.endm
.macro check_ability bank, ability
.macro check_ability battler, ability
.byte 0x60
.byte \bank
.byte \battler
.byte \ability
.endm
.macro if_flash_fired bank, param1
.macro if_flash_fired battler, param1
.byte 0x61
.byte \bank
.byte \battler
.4byte \param1
.endm
.macro if_holds_item bank, param1, param2
.macro if_holds_item battler, param1, param2
.byte 0x62
.byte \bank
.byte \battler
.2byte \param1
.4byte \param2
.endm
@@ -572,23 +572,23 @@
get_type AI_TYPE2_TARGET
.endm
.macro if_ability bank, ability, ptr
check_ability \bank, \ability
.macro if_ability battler, ability, ptr
check_ability \battler, \ability
if_equal 1, \ptr
.endm
.macro if_no_ability bank, ability, ptr
check_ability \bank, \ability
.macro if_no_ability battler, ability, ptr
check_ability \battler, \ability
if_equal 0, \ptr
.endm
.macro if_type bank, type, ptr
is_of_type \bank, \type
.macro if_type battler, type, ptr
is_of_type \battler, \type
if_equal 1, \ptr
.endm
.macro if_no_type bank, type, ptr
is_of_type \bank, \type
.macro if_no_type battler, type, ptr
is_of_type \battler, \type
if_equal 0, \ptr
.endm
@@ -610,10 +610,10 @@
if_equal 0, \ptr
.endm
.macro if_any_move_disabled bank, ptr
if_any_move_disabled_or_encored \bank, 0, \ptr
.macro if_any_move_disabled battler, ptr
if_any_move_disabled_or_encored \battler, 0, \ptr
.endm
.macro if_any_move_encored bank, ptr
if_any_move_disabled_or_encored \bank, 1, \ptr
.macro if_any_move_encored battler, ptr
if_any_move_disabled_or_encored \battler, 1, \ptr
.endm

View File

@@ -56,14 +56,14 @@
.2byte \param0
.endm
.macro monbg bank
.macro monbg battler
.byte 0xa
.byte \bank
.byte \battler
.endm
.macro clearmonbg bank
.macro clearmonbg battler
.byte 0xb
.byte \bank
.byte \battler
.endm
.macro setalpha param0
@@ -189,14 +189,14 @@
.4byte \param2
.endm
.macro monbg_22 bank
.macro monbg_22 battler
.byte 0x22
.byte \bank
.byte \battler
.endm
.macro clearmonbg_23 bank
.macro clearmonbg_23 battler
.byte 0x23
.byte \bank
.byte \battler
.endm
.macro jumpifcontest param0
@@ -229,38 +229,38 @@
.byte \param4
.endm
.macro monbgprio_28 bank
.macro monbgprio_28 battler
.byte 0x28
.byte \bank
.byte \battler
.endm
.macro monbgprio_29
.byte 0x29
.endm
.macro monbgprio_2A bank
.macro monbgprio_2A battler
.byte 0x2a
.byte \bank
.byte \battler
.endm
.macro invisible bank
.macro invisible battler
.byte 0x2b
.byte \bank
.byte \battler
.endm
.macro visible bank
.macro visible battler
.byte 0x2c
.byte \bank
.byte \battler
.endm
.macro doublebattle_2D bank
.macro doublebattle_2D battler
.byte 0x2d
.byte \bank
.byte \battler
.endm
.macro doublebattle_2E bank
.macro doublebattle_2E battler
.byte 0x2e
.byte \bank
.byte \battler
.endm
.macro stopsound

File diff suppressed because it is too large Load Diff

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_:

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

View File

@@ -399,19 +399,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 +424,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 +446,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 +479,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 +606,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
@@ -2297,8 +2297,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
@@ -2593,7 +2592,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::
@@ -3050,12 +3049,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 +3064,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 +3171,7 @@ BattleScript_PursuitDmgOnSwitchOut::
jumpifbyte CMP_EQUAL, gBattleCommunication, 0x0, BattleScript_PursuitDmgOnSwitchOutRet
setbyte sGIVEEXP_STATE, 0x0
getexp BS_TARGET
BattleScript_PursuitDmgOnSwitchOutRet::
BattleScript_PursuitDmgOnSwitchOutRet:
return
BattleScript_Pausex20::
@@ -3968,17 +3967,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 +4047,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 +4250,7 @@ BattleScript_AbilityCuredStatus::
updatestatusicon BS_SCRIPTING
return
BattleScript_82DB695::
BattleScript_IgnoresWhileAsleep::
printstring STRINGID_PKMNIGNORESASLEEP
waitmessage 0x40
setbyte sMOVEEND_STATE, 0x0
@@ -4285,7 +4283,7 @@ BattleScript_IgnoresAndFallsAsleep::
moveend 0x2, 0x10
end
BattleScript_82DB6F0::
BattleScript_IgnoresAndHitsItself::
printstring STRINGID_PKMNWONTOBEY
waitmessage 0x40
goto BattleScript_DoSelfConfusionDmg
@@ -4463,7 +4461,7 @@ BattleScript_ActionSelectionItemsCantBeUsed::
printselectionstring STRINGID_ITEMSCANTBEUSEDNOW
endselectionscript
BattleScript_82DB87D::
BattleScript_FlushMessageBox::
printstring STRINGID_EMPTYSTRING3
return

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

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

File diff suppressed because it is too large Load Diff

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"

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"

File diff suppressed because it is too large Load Diff

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"

File diff suppressed because it is too large Load Diff

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"

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

View File

@@ -0,0 +1,618 @@
OVERWORLDGFXDIR := graphics/event_objects/pics
$(OVERWORLDGFXDIR)/people/brendan/walking.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/people/brendan/running.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/people/brendan/field_move.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 4 -mheight 4
$(OVERWORLDGFXDIR)/people/brendan/surfing.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 4 -mheight 4
$(OVERWORLDGFXDIR)/people/brendan/mach_bike.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 4 -mheight 4
$(OVERWORLDGFXDIR)/people/brendan/acro_bike.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 4 -mheight 4
$(OVERWORLDGFXDIR)/people/brendan/fishing.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 4 -mheight 4
$(OVERWORLDGFXDIR)/people/brendan/watering.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 4 -mheight 4
$(OVERWORLDGFXDIR)/people/brendan/underwater.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 4 -mheight 4
$(OVERWORLDGFXDIR)/people/elite_four/drake.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/people/elite_four/glacia.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/people/elite_four/phoebe.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/people/elite_four/sidney.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/people/frontier_brains/anabel.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/people/frontier_brains/brandon.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/people/frontier_brains/greta.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/people/frontier_brains/lucy.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/people/frontier_brains/noland.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/people/frontier_brains/spenser.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/people/frontier_brains/tucker.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/people/gym_leaders/brawly.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/people/gym_leaders/flannery.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/people/gym_leaders/juan.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/people/gym_leaders/liza.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/people/gym_leaders/norman.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/people/gym_leaders/roxanne.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/people/gym_leaders/tate.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/people/gym_leaders/wattson.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/people/gym_leaders/winona.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/people/may/walking.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/people/may/running.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/people/may/field_move.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 4 -mheight 4
$(OVERWORLDGFXDIR)/people/may/surfing.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 4 -mheight 4
$(OVERWORLDGFXDIR)/people/may/mach_bike.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 4 -mheight 4
$(OVERWORLDGFXDIR)/people/may/acro_bike.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 4 -mheight 4
$(OVERWORLDGFXDIR)/people/may/fishing.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 4 -mheight 4
$(OVERWORLDGFXDIR)/people/may/watering.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 4 -mheight 4
$(OVERWORLDGFXDIR)/people/may/underwater.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 4 -mheight 4
$(OVERWORLDGFXDIR)/people/ruby_sapphire_brendan/walking.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/people/ruby_sapphire_brendan/running.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/people/ruby_sapphire_may/walking.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/people/ruby_sapphire_may/running.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/people/team_aqua/aqua_member_f.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/people/team_aqua/aqua_member_m.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/people/team_aqua/archie.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/people/team_magma/magma_member_f.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/people/team_magma/magma_member_m.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/people/team_magma/maxie.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/people/artist.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/people/beauty.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/people/black_belt.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/people/boy_1.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/people/boy_2.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/people/boy_3.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/people/boy_4.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/people/boy_5.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/people/bug_catcher.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/people/cameraman.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/people/camper.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/people/contest_old_man.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/people/cook.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/people/cycling_triathlete_f.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 4 -mheight 4
$(OVERWORLDGFXDIR)/people/cycling_triathlete_m.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 4 -mheight 4
$(OVERWORLDGFXDIR)/people/fat_man.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/people/fisherman.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/people/gentleman.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/people/girl_1.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/people/girl_2.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/people/girl_3.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/people/hex_maniac.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/people/hiker.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/people/hot_springs_old_woman.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/people/lass.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/people/leaf.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/people/little_boy_1.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 2
$(OVERWORLDGFXDIR)/people/little_boy_2.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 2
$(OVERWORLDGFXDIR)/people/little_girl_1.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/people/little_girl_2.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 2
$(OVERWORLDGFXDIR)/people/man_1.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/people/man_2.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/people/man_3.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/people/man_4.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/people/man_5.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/people/man_6.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/people/man_7.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/people/maniac.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/people/mart_employee.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/people/mauville_old_man_1.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/people/mauville_old_man_2.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/people/mom.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/people/mystery_event_deliveryman.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/people/nurse.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/people/old_man_1.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/people/old_man_2.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/people/old_woman_1.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/people/old_woman_2.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/people/picnicker.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/people/prof_birch.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/people/psychic_m.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/people/quinty_plump.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 4 -mheight 4
$(OVERWORLDGFXDIR)/people/red.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/people/reporter_f.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/people/reporter_m.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/people/rooftop_sale_woman.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/people/rs_little_boy.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 2
$(OVERWORLDGFXDIR)/people/running_triathlete_f.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/people/running_triathlete_m.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/people/sailor.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/people/school_kid_m.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/people/scientist_1.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/people/scientist_2.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/people/scott.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/people/steven.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/people/swimmer_f.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/people/swimmer_m.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/people/teala.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/people/tuber_f.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 2
$(OVERWORLDGFXDIR)/people/tuber_m.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 2
$(OVERWORLDGFXDIR)/people/tuber_m_swimming.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 2
$(OVERWORLDGFXDIR)/people/union_room_attendant.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/people/unused_woman.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/people/wallace.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/people/wally.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/people/woman_1.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/people/woman_2.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/people/woman_3.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/people/woman_4.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/people/woman_5.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/people/woman_6.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/people/woman_7.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/people/youngster.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/pokemon/azumarill.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 2
$(OVERWORLDGFXDIR)/pokemon/azurill.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 2
$(OVERWORLDGFXDIR)/pokemon/deoxys.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 4 -mheight 4
$(OVERWORLDGFXDIR)/pokemon/dusclops.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/pokemon/enemy_zigzagoon.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 4 -mheight 4
$(OVERWORLDGFXDIR)/pokemon/groudon.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 4 -mheight 4
$(OVERWORLDGFXDIR)/pokemon/ho_oh.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 4 -mheight 4
$(OVERWORLDGFXDIR)/pokemon/kecleon.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 2
$(OVERWORLDGFXDIR)/pokemon/kirlia.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/pokemon/kyogre.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 4 -mheight 4
$(OVERWORLDGFXDIR)/pokemon/latias_latios.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 4 -mheight 4
$(OVERWORLDGFXDIR)/pokemon/lugia.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 4 -mheight 4
$(OVERWORLDGFXDIR)/pokemon/mew.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/pokemon/pikachu.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 2
$(OVERWORLDGFXDIR)/pokemon/poochyena.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 4 -mheight 4
$(OVERWORLDGFXDIR)/pokemon/rayquaza.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 8 -mheight 8
$(OVERWORLDGFXDIR)/pokemon/skitty.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 2
$(OVERWORLDGFXDIR)/pokemon/sudowoodo.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/pokemon/vigoroth.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 4 -mheight 4
$(OVERWORLDGFXDIR)/pokemon/wingull.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 2
$(OVERWORLDGFXDIR)/pokemon/zigzagoon.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 2
$(OVERWORLDGFXDIR)/berry_trees/aguav.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/berry_trees/aspear.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/berry_trees/cheri.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/berry_trees/chesto.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/berry_trees/cornn.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/berry_trees/durin.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/berry_trees/figy.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/berry_trees/grepa.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/berry_trees/hondew.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/berry_trees/iapapa.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/berry_trees/kelpsy.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/berry_trees/lansat.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/berry_trees/leppa.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/berry_trees/liechi.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/berry_trees/lum.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/berry_trees/mago.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/berry_trees/nomel.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/berry_trees/oran.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/berry_trees/pamtre.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/berry_trees/pecha.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/berry_trees/persim.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/berry_trees/pomeg.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/berry_trees/rabuta.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/berry_trees/rawst.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/berry_trees/razz.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/berry_trees/sitrus.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/berry_trees/spelon.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/berry_trees/sprout.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 2
$(OVERWORLDGFXDIR)/berry_trees/tamato.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/berry_trees/wepear.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/berry_trees/wiki.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/misc/breakable_rock.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 2
$(OVERWORLDGFXDIR)/misc/cuttable_tree.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 2
$(OVERWORLDGFXDIR)/misc/mr_brineys_boat.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 4 -mheight 4
$(OVERWORLDGFXDIR)/effects/arrow.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 2
$(OVERWORLDGFXDIR)/effects/ash.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 2
$(OVERWORLDGFXDIR)/effects/bike_hop_big_splash.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 2
$(OVERWORLDGFXDIR)/effects/bike_hop_small_splash.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 1
$(OVERWORLDGFXDIR)/effects/bubbles.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/effects/jump_out_of_ash.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 2
$(OVERWORLDGFXDIR)/effects/mountain_disguise.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/effects/ripple.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 2
$(OVERWORLDGFXDIR)/effects/sand_disguise_placeholder.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/effects/short_grass.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 2
$(OVERWORLDGFXDIR)/effects/surf_blob.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 4 -mheight 4
$(OVERWORLDGFXDIR)/effects/tall_grass.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 2
$(OVERWORLDGFXDIR)/effects/tree_disguise.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OVERWORLDGFXDIR)/effects/unknown_17.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 2

Binary file not shown.

After

Width:  |  Height:  |  Size: 638 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 225 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 225 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 269 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 267 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 288 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 287 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 712 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 262 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 253 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 315 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 310 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 319 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 308 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 783 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 269 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 271 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 288 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 294 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 290 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 297 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 816 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 265 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 268 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 308 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 315 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 310 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 315 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 709 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 226 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 223 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 296 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 300 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 283 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 287 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 680 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 250 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 248 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 281 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 282 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 282 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 278 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 708 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 270 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 272 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 298 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 306 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 301 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 305 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 611 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 216 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 218 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 252 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 253 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 258 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 248 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 620 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 224 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 222 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 253 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 251 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 266 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 266 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 566 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 179 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 181 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 251 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 244 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 194 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 202 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 580 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 223 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 223 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 252 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 252 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 245 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 243 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 626 B

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