Merge with master
This commit is contained in:
DizzyEggg
commit
f70a9ce153
File diff suppressed because it is too large
Load Diff
@ -52,9 +52,9 @@
|
||||
special CallTrainerHillFunction
|
||||
.endm
|
||||
|
||||
@ Unknown, dummied. Only side effect is setting VAR_RESULT to 0.
|
||||
.macro trainerhill_clearresult
|
||||
setvar VAR_0x8004, TRAINER_HILL_FUNC_CLEAR_RESULT
|
||||
@ Unknown, dummied. E-Reader association is assumed. Only side effect is setting VAR_RESULT to 0.
|
||||
.macro trainerhill_getusingereader
|
||||
setvar VAR_0x8004, TRAINER_HILL_FUNC_GET_IN_EREADER_MODE
|
||||
special CallTrainerHillFunction
|
||||
.endm
|
||||
|
||||
|
||||
@ -414,7 +414,7 @@ B_ACTIVE_NAME2 = FD 3D @ no Illusion check
|
||||
NAME_END = FC 00
|
||||
|
||||
@ special 0xF7 character
|
||||
SPECIAL_F7 = F7
|
||||
DYNAMIC = F7
|
||||
|
||||
@ more text functions
|
||||
|
||||
@ -424,15 +424,15 @@ SHADOW = FC 03 @ same as fc 01
|
||||
COLOR_HIGHLIGHT_SHADOW = FC 04 @ takes 3 bytes
|
||||
PALETTE = FC 05 @ used in credits
|
||||
SIZE = FC 06 @ note that anything other than "SMALL" is invalid
|
||||
UNKNOWN_7 = FC 07
|
||||
RESET_SIZE = FC 07
|
||||
PAUSE = FC 08 @ manually print the wait byte after this, havent mapped them
|
||||
PAUSE_UNTIL_PRESS = FC 09
|
||||
WAIT_SE = FC 0A
|
||||
PLAY_BGM = FC 0B
|
||||
ESCAPE = FC 0C
|
||||
SHIFT_TEXT = FC 0D
|
||||
UNKNOWN_E = FC 0E
|
||||
UNKNOWN_F = FC 0F
|
||||
SHIFT_DOWN = FC 0E
|
||||
FILL_WINDOW = FC 0F
|
||||
PLAY_SE = FC 10
|
||||
CLEAR = FC 11
|
||||
SKIP = FC 12
|
||||
|
||||
@ -12,9 +12,9 @@ gRecvCmds
|
||||
gLinkStatus
|
||||
gLinkDummy1
|
||||
gLinkDummy2
|
||||
gUnknown_030030EC
|
||||
gUnknown_030030F0
|
||||
gUnknown_030030F4
|
||||
gReadyToExitStandby
|
||||
gReadyToCloseLink
|
||||
gReadyCloseLinkType
|
||||
gSuppressLinkErrorMessage
|
||||
gWirelessCommType
|
||||
gSavedLinkPlayerCount
|
||||
|
||||
@ -1,4 +1,2 @@
|
||||
.include "constants/gba_constants.inc"
|
||||
.include "constants/global.inc"
|
||||
.include "constants/contest_constants.inc"
|
||||
.include "constants/contest_move_effects.inc"
|
||||
|
||||
@ -1,68 +0,0 @@
|
||||
.set CONTEST_COOL, 0x00
|
||||
.set CONTEST_BEAUTY, 0x01
|
||||
.set CONTEST_CUTE, 0x02
|
||||
.set CONTEST_SMART, 0x03
|
||||
.set CONTEST_TOUGH, 0x04
|
||||
|
||||
.set COMBO_STARTER_RAIN_DANCE, 0x01
|
||||
.set COMBO_STARTER_RAGE, 0x02
|
||||
.set COMBO_STARTER_FOCUS_ENERGY, 0x03
|
||||
.set COMBO_STARTER_HYPNOSIS, 0x04
|
||||
.set COMBO_STARTER_ENDURE, 0x05
|
||||
.set COMBO_STARTER_HORN_ATTACK, 0x06
|
||||
.set COMBO_STARTER_SWORDS_DANCE, 0x07
|
||||
.set COMBO_STARTER_STOCKPILE, 0x08
|
||||
.set COMBO_STARTER_SUNNY_DAY, 0x09
|
||||
.set COMBO_STARTER_REST, 0x0A
|
||||
.set COMBO_STARTER_VICE_GRIP, 0x0B
|
||||
.set COMBO_STARTER_DEFENSE_CURL, 0x0C
|
||||
.set COMBO_STARTER_CHARGE, 0x0D
|
||||
.set COMBO_STARTER_ROCK_THROW, 0x0E
|
||||
.set COMBO_STARTER_YAWN, 0x0F
|
||||
.set COMBO_STARTER_SCARY_FACE, 0x10
|
||||
.set COMBO_STARTER_POWDER_SNOW, 0x11
|
||||
.set COMBO_STARTER_LOCK_ON, 0x12
|
||||
.set COMBO_STARTER_SOFT_BOILED, 0x13
|
||||
.set COMBO_STARTER_MEAN_LOOK, 0x14
|
||||
.set COMBO_STARTER_SCRATCH, 0x15
|
||||
.set COMBO_STARTER_GROWTH, 0x16
|
||||
.set COMBO_STARTER_HAIL, 0x17
|
||||
.set COMBO_STARTER_SANDSTORM, 0x18
|
||||
.set COMBO_STARTER_BELLY_DRUM, 0x19
|
||||
.set COMBO_STARTER_MIND_READER, 0x1A
|
||||
.set COMBO_STARTER_DRAGON_BREATH, 0x1B
|
||||
.set COMBO_STARTER_DRAGON_RAGE, 0x1C
|
||||
.set COMBO_STARTER_DRAGON_DANCE, 0x1D
|
||||
.set COMBO_STARTER_SURF, 0x1E
|
||||
.set COMBO_STARTER_DIVE, 0x1F
|
||||
.set COMBO_STARTER_STRING_SHOT, 0x20
|
||||
.set COMBO_STARTER_LEER, 0x21
|
||||
.set COMBO_STARTER_TAUNT, 0x22
|
||||
.set COMBO_STARTER_CHARM, 0x23
|
||||
.set COMBO_STARTER_HARDEN, 0x24
|
||||
.set COMBO_STARTER_SING, 0x25
|
||||
.set COMBO_STARTER_EARTHQUAKE, 0x26
|
||||
.set COMBO_STARTER_DOUBLE_TEAM, 0x27
|
||||
.set COMBO_STARTER_CURSE, 0x28
|
||||
.set COMBO_STARTER_SWEET_SCENT, 0x29
|
||||
.set COMBO_STARTER_SLUDGE, 0x2A
|
||||
.set COMBO_STARTER_SLUDGE_BOMB, 0x2B
|
||||
.set COMBO_STARTER_THUNDER_PUNCH, 0x2C
|
||||
.set COMBO_STARTER_FIRE_PUNCH, 0x2D
|
||||
.set COMBO_STARTER_ICE_PUNCH, 0x2E
|
||||
.set COMBO_STARTER_PECK, 0x2F
|
||||
.set COMBO_STARTER_METAL_SOUND, 0x30
|
||||
.set COMBO_STARTER_MUD_SPORT, 0x31
|
||||
.set COMBO_STARTER_WATER_SPORT, 0x32
|
||||
.set COMBO_STARTER_BONE_CLUB, 0x33
|
||||
.set COMBO_STARTER_BONEMERANG, 0x34
|
||||
.set COMBO_STARTER_BONE_RUSH, 0x35
|
||||
.set COMBO_STARTER_SAND_ATTACK, 0x36
|
||||
.set COMBO_STARTER_MUD_SLAP, 0x37
|
||||
.set COMBO_STARTER_FAKE_OUT, 0x38
|
||||
.set COMBO_STARTER_PSYCHIC, 0x39
|
||||
.set COMBO_STARTER_KINESIS, 0x3A
|
||||
.set COMBO_STARTER_CONFUSION, 0x3B
|
||||
.set COMBO_STARTER_POUND, 0x3C
|
||||
.set COMBO_STARTER_SMOG, 0x3D
|
||||
.set COMBO_STARTER_CALM_MIND, 0x3E
|
||||
@ -1,49 +0,0 @@
|
||||
enum_start
|
||||
enum CONTEST_EFFECT_HIGHLY_APPEALING @ 0
|
||||
enum CONTEST_EFFECT_USER_MORE_EASILY_STARTLED @ 1
|
||||
enum CONTEST_EFFECT_GREAT_APPEAL_BUT_NO_MORE_MOVES @ 2
|
||||
enum CONTEST_EFFECT_REPETITION_NOT_BORING @ 3
|
||||
enum CONTEST_EFFECT_AVOID_STARTLE_ONCE @ 4
|
||||
enum CONTEST_EFFECT_AVOID_STARTLE @ 5
|
||||
enum CONTEST_EFFECT_AVOID_STARTLE_SLIGHTLY @ 6
|
||||
enum CONTEST_EFFECT_USER_LESS_EASILY_STARTLED @ 7
|
||||
enum CONTEST_EFFECT_STARTLE_FRONT_MON @ 8
|
||||
enum CONTEST_EFFECT_SLIGHTLY_STARTLE_PREV_MONS @ 9
|
||||
enum CONTEST_EFFECT_STARTLE_PREV_MON @ 10
|
||||
enum CONTEST_EFFECT_STARTLE_PREV_MONS @ 11
|
||||
enum CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON @ 12
|
||||
enum CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS @ 13
|
||||
enum CONTEST_EFFECT_STARTLE_PREV_MON_2 @ 14
|
||||
enum CONTEST_EFFECT_STARTLE_PREV_MONS_2 @ 15
|
||||
enum CONTEST_EFFECT_SHIFT_JUDGE_ATTENTION @ 16
|
||||
enum CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION @ 17
|
||||
enum CONTEST_EFFECT_JAMS_OTHERS_BUT_MISS_ONE_TURN @ 18
|
||||
enum CONTEST_EFFECT_STARTLE_MONS_SAME_TYPE_APPEAL @ 19
|
||||
enum CONTEST_EFFECT_STARTLE_MONS_COOL_APPEAL @ 20
|
||||
enum CONTEST_EFFECT_STARTLE_MONS_BEAUTY_APPEAL @ 21
|
||||
enum CONTEST_EFFECT_STARTLE_MONS_CUTE_APPEAL @ 22
|
||||
enum CONTEST_EFFECT_STARTLE_MONS_SMART_APPEAL @ 23
|
||||
enum CONTEST_EFFECT_STARTLE_MONS_TOUGH_APPEAL @ 24
|
||||
enum CONTEST_EFFECT_MAKE_FOLLOWING_MON_NERVOUS @ 25
|
||||
enum CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS @ 26
|
||||
enum CONTEST_EFFECT_WORSEN_CONDITION_OF_PREV_MONS @ 27
|
||||
enum CONTEST_EFFECT_BADLY_STARTLES_MONS_IN_GOOD_CONDITION @ 28
|
||||
enum CONTEST_EFFECT_BETTER_IF_FIRST @ 29
|
||||
enum CONTEST_EFFECT_BETTER_IF_LAST @ 30
|
||||
enum CONTEST_EFFECT_APPEAL_AS_GOOD_AS_PREV_ONES @ 31
|
||||
enum CONTEST_EFFECT_APPEAL_AS_GOOD_AS_PREV_ONE @ 32
|
||||
enum CONTEST_EFFECT_BETTER_WHEN_LATER @ 33
|
||||
enum CONTEST_EFFECT_QUALITY_DEPENDS_ON_TIMING @ 34
|
||||
enum CONTEST_EFFECT_BETTER_IF_SAME_TYPE @ 35
|
||||
enum CONTEST_EFFECT_BETTER_IF_DIFF_TYPE @ 36
|
||||
enum CONTEST_EFFECT_AFFECTED_BY_PREV_APPEAL @ 37
|
||||
enum CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS @ 38
|
||||
enum CONTEST_EFFECT_BETTER_WITH_GOOD_CONDITION @ 39
|
||||
enum CONTEST_EFFECT_NEXT_APPEAL_EARLIER @ 40
|
||||
enum CONTEST_EFFECT_NEXT_APPEAL_LATER @ 41
|
||||
enum CONTEST_EFFECT_MAKE_SCRAMBLING_TURN_ORDER_EASIER @ 42
|
||||
enum CONTEST_EFFECT_SCRAMBLE_NEXT_TURN_ORDER @ 43
|
||||
enum CONTEST_EFFECT_EXCITE_AUDIENCE_IN_ANY_CONTEST @ 44
|
||||
enum CONTEST_EFFECT_BADLY_STARTLE_MONS_WITH_GOOD_APPEALS @ 45
|
||||
enum CONTEST_EFFECT_BETTER_WHEN_AUDIENCE_EXCITED @ 46
|
||||
enum CONTEST_EFFECT_DONT_EXCITE_AUDIENCE @ 47
|
||||
@ -571,11 +571,11 @@ AI_CBM_AttackUp: @ 82DC348
|
||||
end
|
||||
|
||||
AI_CBM_DefenseUp: @ 82DC351
|
||||
if_stat_level_equal AI_USER, STAT_DEF, 12, Score_Minus10
|
||||
if_stat_level_equal AI_USER, STAT_DEF, MAX_STAT_STAGE, Score_Minus10
|
||||
end
|
||||
|
||||
AI_CBM_SpeedUp: @ 82DC35A
|
||||
if_stat_level_equal AI_USER, STAT_SPEED, 12, Score_Minus10
|
||||
if_stat_level_equal AI_USER, STAT_SPEED, MAX_STAT_STAGE, Score_Minus10
|
||||
end
|
||||
|
||||
AI_CBM_SpAtkUp: @ 82DC363
|
||||
@ -586,19 +586,19 @@ AI_CBM_SpAtkUp: @ 82DC363
|
||||
end
|
||||
|
||||
AI_CBM_SpDefUp: @ 82DC36C
|
||||
if_stat_level_equal AI_USER, STAT_SPDEF, 12, Score_Minus10
|
||||
if_stat_level_equal AI_USER, STAT_SPDEF, MAX_STAT_STAGE, Score_Minus10
|
||||
end
|
||||
|
||||
AI_CBM_AccUp: @ 82DC375
|
||||
if_stat_level_equal AI_USER, STAT_ACC, 12, Score_Minus10
|
||||
if_stat_level_equal AI_USER, STAT_ACC, MAX_STAT_STAGE, Score_Minus10
|
||||
end
|
||||
|
||||
AI_CBM_EvasionUp: @ 82DC37E
|
||||
if_stat_level_equal AI_USER, STAT_EVASION, 12, Score_Minus10
|
||||
if_stat_level_equal AI_USER, STAT_EVASION, MAX_STAT_STAGE, Score_Minus10
|
||||
end
|
||||
|
||||
AI_CBM_AttackDown: @ 82DC387
|
||||
if_stat_level_equal AI_TARGET, STAT_ATK, 0, Score_Minus10
|
||||
if_stat_level_equal AI_TARGET, STAT_ATK, MIN_STAT_STAGE, Score_Minus10
|
||||
get_ability AI_TARGET
|
||||
if_equal ABILITY_HYPER_CUTTER, Score_Minus10
|
||||
goto CheckIfAbilityBlocksStatChange
|
||||
@ -610,26 +610,26 @@ AI_CBM_DefenseDown: @ 82DC39C
|
||||
goto CheckIfAbilityBlocksStatChange
|
||||
|
||||
AI_CBM_SpeedDown: @ 82DC3A9
|
||||
if_stat_level_equal AI_TARGET, STAT_SPEED, 0, Score_Minus10
|
||||
if_stat_level_equal AI_TARGET, STAT_SPEED, MIN_STAT_STAGE, Score_Minus10
|
||||
if_ability AI_TARGET, ABILITY_SPEED_BOOST, Score_Minus10
|
||||
goto CheckIfAbilityBlocksStatChange
|
||||
|
||||
AI_CBM_SpAtkDown: @ 82DC3BF
|
||||
if_stat_level_equal AI_TARGET, STAT_SPATK, 0, Score_Minus10
|
||||
if_stat_level_equal AI_TARGET, STAT_SPATK, MIN_STAT_STAGE, Score_Minus10
|
||||
goto CheckIfAbilityBlocksStatChange
|
||||
|
||||
AI_CBM_SpDefDown: @ 82DC3CC
|
||||
if_stat_level_equal AI_TARGET, STAT_SPDEF, 0, Score_Minus10
|
||||
if_stat_level_equal AI_TARGET, STAT_SPDEF, MIN_STAT_STAGE, Score_Minus10
|
||||
goto CheckIfAbilityBlocksStatChange
|
||||
|
||||
AI_CBM_AccDown: @ 82DC3D9
|
||||
if_stat_level_equal AI_TARGET, STAT_ACC, 0, Score_Minus10
|
||||
if_stat_level_equal AI_TARGET, STAT_ACC, MIN_STAT_STAGE, Score_Minus10
|
||||
get_ability AI_TARGET
|
||||
if_equal ABILITY_KEEN_EYE, Score_Minus10
|
||||
goto CheckIfAbilityBlocksStatChange
|
||||
|
||||
AI_CBM_EvasionDown: @ 82DC3EE
|
||||
if_stat_level_equal AI_TARGET, STAT_EVASION, 0, Score_Minus10
|
||||
if_stat_level_equal AI_TARGET, STAT_EVASION, MIN_STAT_STAGE, Score_Minus10
|
||||
|
||||
CheckIfAbilityBlocksStatChange: @ 82DC3F6
|
||||
get_ability AI_TARGET
|
||||
@ -638,20 +638,20 @@ CheckIfAbilityBlocksStatChange: @ 82DC3F6
|
||||
end
|
||||
|
||||
AI_CBM_Haze: @ 82DC405
|
||||
if_stat_level_less_than AI_USER, STAT_ATK, 6, AI_CBM_Haze_End
|
||||
if_stat_level_less_than AI_USER, STAT_DEF, 6, AI_CBM_Haze_End
|
||||
if_stat_level_less_than AI_USER, STAT_SPEED, 6, AI_CBM_Haze_End
|
||||
if_stat_level_less_than AI_USER, STAT_SPATK, 6, AI_CBM_Haze_End
|
||||
if_stat_level_less_than AI_USER, STAT_SPDEF, 6, AI_CBM_Haze_End
|
||||
if_stat_level_less_than AI_USER, STAT_ACC, 6, AI_CBM_Haze_End
|
||||
if_stat_level_less_than AI_USER, STAT_EVASION, 6, AI_CBM_Haze_End
|
||||
if_stat_level_more_than AI_TARGET, STAT_ATK, 6, AI_CBM_Haze_End
|
||||
if_stat_level_more_than AI_TARGET, STAT_DEF, 6, AI_CBM_Haze_End
|
||||
if_stat_level_more_than AI_TARGET, STAT_SPEED, 6, AI_CBM_Haze_End
|
||||
if_stat_level_more_than AI_TARGET, STAT_SPATK, 6, AI_CBM_Haze_End
|
||||
if_stat_level_more_than AI_TARGET, STAT_SPDEF, 6, AI_CBM_Haze_End
|
||||
if_stat_level_more_than AI_TARGET, STAT_ACC, 6, AI_CBM_Haze_End
|
||||
if_stat_level_more_than AI_TARGET, STAT_EVASION, 6, AI_CBM_Haze_End
|
||||
if_stat_level_less_than AI_USER, STAT_ATK, DEFAULT_STAT_STAGE, AI_CBM_Haze_End
|
||||
if_stat_level_less_than AI_USER, STAT_DEF, DEFAULT_STAT_STAGE, AI_CBM_Haze_End
|
||||
if_stat_level_less_than AI_USER, STAT_SPEED, DEFAULT_STAT_STAGE, AI_CBM_Haze_End
|
||||
if_stat_level_less_than AI_USER, STAT_SPATK, DEFAULT_STAT_STAGE, AI_CBM_Haze_End
|
||||
if_stat_level_less_than AI_USER, STAT_SPDEF, DEFAULT_STAT_STAGE, AI_CBM_Haze_End
|
||||
if_stat_level_less_than AI_USER, STAT_ACC, DEFAULT_STAT_STAGE, AI_CBM_Haze_End
|
||||
if_stat_level_less_than AI_USER, STAT_EVASION, DEFAULT_STAT_STAGE, AI_CBM_Haze_End
|
||||
if_stat_level_more_than AI_TARGET, STAT_ATK, DEFAULT_STAT_STAGE, AI_CBM_Haze_End
|
||||
if_stat_level_more_than AI_TARGET, STAT_DEF, DEFAULT_STAT_STAGE, AI_CBM_Haze_End
|
||||
if_stat_level_more_than AI_TARGET, STAT_SPEED, DEFAULT_STAT_STAGE, AI_CBM_Haze_End
|
||||
if_stat_level_more_than AI_TARGET, STAT_SPATK, DEFAULT_STAT_STAGE, AI_CBM_Haze_End
|
||||
if_stat_level_more_than AI_TARGET, STAT_SPDEF, DEFAULT_STAT_STAGE, AI_CBM_Haze_End
|
||||
if_stat_level_more_than AI_TARGET, STAT_ACC, DEFAULT_STAT_STAGE, AI_CBM_Haze_End
|
||||
if_stat_level_more_than AI_TARGET, STAT_EVASION, DEFAULT_STAT_STAGE, AI_CBM_Haze_End
|
||||
goto Score_Minus10
|
||||
|
||||
AI_CBM_Haze_End: @ 82DC47A
|
||||
@ -759,8 +759,8 @@ AI_CBM_CantEscape: @ 82DC5B0
|
||||
end
|
||||
|
||||
AI_CBM_Curse: @ 82DC5BB
|
||||
if_stat_level_equal AI_USER, STAT_ATK, 12, Score_Minus10
|
||||
if_stat_level_equal AI_USER, STAT_DEF, 12, Score_Minus8
|
||||
if_stat_level_equal AI_USER, STAT_ATK, MAX_STAT_STAGE, Score_Minus10
|
||||
if_stat_level_equal AI_USER, STAT_DEF, MAX_STAT_STAGE, Score_Minus8
|
||||
end
|
||||
|
||||
AI_CBM_Spikes: @ 82DC5CC
|
||||
@ -818,8 +818,8 @@ AI_CBM_Safeguard: @ 82DC635
|
||||
end
|
||||
|
||||
AI_CBM_Memento: @ 82DC640
|
||||
if_stat_level_equal AI_TARGET, STAT_ATK, 0, Score_Minus10
|
||||
if_stat_level_equal AI_TARGET, STAT_SPATK, 0, Score_Minus8
|
||||
if_stat_level_equal AI_TARGET, STAT_ATK, MIN_STAT_STAGE, Score_Minus10
|
||||
if_stat_level_equal AI_TARGET, STAT_SPATK, MIN_STAT_STAGE, Score_Minus8
|
||||
|
||||
AI_CBM_BatonPass: @ 82DC650
|
||||
count_usable_party_mons AI_USER
|
||||
@ -909,18 +909,18 @@ AI_CBM_MudSport: @ 82DC71E
|
||||
end
|
||||
|
||||
AI_CBM_Tickle: @ 82DC729
|
||||
if_stat_level_equal AI_TARGET, STAT_ATK, 0, Score_Minus10
|
||||
if_stat_level_equal AI_TARGET, STAT_DEF, 0, Score_Minus8
|
||||
if_stat_level_equal AI_TARGET, STAT_ATK, MIN_STAT_STAGE, Score_Minus10
|
||||
if_stat_level_equal AI_TARGET, STAT_DEF, MIN_STAT_STAGE, Score_Minus8
|
||||
end
|
||||
|
||||
AI_CBM_CosmicPower: @ 82DC73A
|
||||
if_stat_level_equal AI_USER, STAT_DEF, 12, Score_Minus10
|
||||
if_stat_level_equal AI_USER, STAT_SPDEF, 12, Score_Minus8
|
||||
if_stat_level_equal AI_USER, STAT_DEF, MAX_STAT_STAGE, Score_Minus10
|
||||
if_stat_level_equal AI_USER, STAT_SPDEF, MAX_STAT_STAGE, Score_Minus8
|
||||
end
|
||||
|
||||
AI_CBM_BulkUp: @ 82DC74B
|
||||
if_stat_level_equal AI_USER, STAT_ATK, 12, Score_Minus10
|
||||
if_stat_level_equal AI_USER, STAT_DEF, 12, Score_Minus8
|
||||
if_stat_level_equal AI_USER, STAT_ATK, MAX_STAT_STAGE, Score_Minus10
|
||||
if_stat_level_equal AI_USER, STAT_DEF, MAX_STAT_STAGE, Score_Minus8
|
||||
end
|
||||
|
||||
AI_CBM_WaterSport: @ 82DC75C
|
||||
@ -928,13 +928,13 @@ AI_CBM_WaterSport: @ 82DC75C
|
||||
end
|
||||
|
||||
AI_CBM_CalmMind: @ 82DC767
|
||||
if_stat_level_equal AI_USER, STAT_SPATK, 12, Score_Minus10
|
||||
if_stat_level_equal AI_USER, STAT_SPDEF, 12, Score_Minus8
|
||||
if_stat_level_equal AI_USER, STAT_SPATK, MAX_STAT_STAGE, Score_Minus10
|
||||
if_stat_level_equal AI_USER, STAT_SPDEF, MAX_STAT_STAGE, Score_Minus8
|
||||
end
|
||||
|
||||
AI_CBM_DragonDance: @ 82DC778
|
||||
if_stat_level_equal AI_USER, STAT_ATK, 12, Score_Minus10
|
||||
if_stat_level_equal AI_USER, STAT_SPEED, 12, Score_Minus8
|
||||
if_stat_level_equal AI_USER, STAT_ATK, MAX_STAT_STAGE, Score_Minus10
|
||||
if_stat_level_equal AI_USER, STAT_SPEED, MAX_STAT_STAGE, Score_Minus8
|
||||
end
|
||||
|
||||
Score_Minus1:
|
||||
@ -1564,7 +1564,7 @@ AI_CV_EvasionUp7:
|
||||
|
||||
AI_CV_EvasionUp8:
|
||||
if_hp_more_than AI_USER, 70, AI_CV_EvasionUp_End
|
||||
if_stat_level_equal AI_USER, STAT_EVASION, 6, AI_CV_EvasionUp_End
|
||||
if_stat_level_equal AI_USER, STAT_EVASION, DEFAULT_STAT_STAGE, AI_CV_EvasionUp_End
|
||||
if_hp_less_than AI_USER, 40, AI_CV_EvasionUp_ScoreDown2
|
||||
if_hp_less_than AI_TARGET, 40, AI_CV_EvasionUp_ScoreDown2
|
||||
if_random_less_than 70, AI_CV_EvasionUp_End
|
||||
@ -1593,7 +1593,7 @@ AI_CV_AlwaysHit_End:
|
||||
end
|
||||
|
||||
AI_CV_AttackDown: @ 82DCDF8
|
||||
if_stat_level_equal AI_TARGET, STAT_ATK, 6, AI_CV_AttackDown3
|
||||
if_stat_level_equal AI_TARGET, STAT_ATK, DEFAULT_STAT_STAGE, AI_CV_AttackDown3
|
||||
score -1
|
||||
if_hp_more_than AI_USER, 90, AI_CV_AttackDown2
|
||||
score -1
|
||||
@ -1659,7 +1659,7 @@ AI_CV_SpeedDown_End: @ 82DCE96
|
||||
end
|
||||
|
||||
AI_CV_SpAtkDown:
|
||||
if_stat_level_equal AI_TARGET, STAT_ATK, 6, AI_CV_SpAtkDown3
|
||||
if_stat_level_equal AI_TARGET, STAT_ATK, DEFAULT_STAT_STAGE, AI_CV_SpAtkDown3
|
||||
score -1
|
||||
if_hp_more_than AI_USER, 90, AI_CV_SpAtkDown2
|
||||
score -1
|
||||
@ -1745,7 +1745,7 @@ AI_CV_AccuracyDown7:
|
||||
|
||||
AI_CV_AccuracyDown8:
|
||||
if_hp_more_than AI_USER, 70, AI_CV_AccuracyDown_End
|
||||
if_stat_level_equal AI_TARGET, STAT_ACC, 6, AI_CV_AccuracyDown_End
|
||||
if_stat_level_equal AI_TARGET, STAT_ACC, DEFAULT_STAT_STAGE, AI_CV_AccuracyDown_End
|
||||
if_hp_less_than AI_USER, 40, AI_CV_AccuracyDown_ScoreDown2
|
||||
if_hp_less_than AI_TARGET, 40, AI_CV_AccuracyDown_ScoreDown2
|
||||
if_random_less_than 70, AI_CV_AccuracyDown_End
|
||||
@ -3183,7 +3183,7 @@ AI_CV_ChangeSelfAbility_AbilitiesToEncourage:
|
||||
AI_CV_Superpower:
|
||||
if_type_effectiveness AI_EFFECTIVENESS_x0_25, AI_CV_Superpower_ScoreDown1
|
||||
if_type_effectiveness AI_EFFECTIVENESS_x0_5, AI_CV_Superpower_ScoreDown1
|
||||
if_stat_level_less_than AI_USER, STAT_ATK, 6, AI_CV_Superpower_ScoreDown1
|
||||
if_stat_level_less_than AI_USER, STAT_ATK, DEFAULT_STAT_STAGE, AI_CV_Superpower_ScoreDown1
|
||||
if_target_faster AI_CV_Superpower2
|
||||
if_hp_more_than AI_USER, 40, AI_CV_Superpower_ScoreDown1
|
||||
goto AI_CV_Superpower_End
|
||||
@ -3644,12 +3644,12 @@ AI_PreferBatonPass3:
|
||||
AI_PreferBatonPass_EncourageIfHighStats:
|
||||
get_turn_count
|
||||
if_equal 0, Score_Minus2
|
||||
if_stat_level_more_than AI_USER, STAT_ATK, 8, Score_Plus3
|
||||
if_stat_level_more_than AI_USER, STAT_ATK, 7, Score_Plus2
|
||||
if_stat_level_more_than AI_USER, STAT_ATK, 6, Score_Plus1
|
||||
if_stat_level_more_than AI_USER, STAT_SPATK, 8, Score_Plus3
|
||||
if_stat_level_more_than AI_USER, STAT_SPATK, 7, Score_Plus2
|
||||
if_stat_level_more_than AI_USER, STAT_SPATK, 6, Score_Plus1
|
||||
if_stat_level_more_than AI_USER, STAT_ATK, DEFAULT_STAT_STAGE + 2, Score_Plus3
|
||||
if_stat_level_more_than AI_USER, STAT_ATK, DEFAULT_STAT_STAGE + 1, Score_Plus2
|
||||
if_stat_level_more_than AI_USER, STAT_ATK, DEFAULT_STAT_STAGE, Score_Plus1
|
||||
if_stat_level_more_than AI_USER, STAT_SPATK, DEFAULT_STAT_STAGE + 2, Score_Plus3
|
||||
if_stat_level_more_than AI_USER, STAT_SPATK, DEFAULT_STAT_STAGE + 1, Score_Plus2
|
||||
if_stat_level_more_than AI_USER, STAT_SPATK, DEFAULT_STAT_STAGE, Score_Plus1
|
||||
end
|
||||
AI_PreferBatonPassEnd:
|
||||
end
|
||||
|
||||
@ -3566,9 +3566,9 @@ BattleScript_EffectCurse::
|
||||
attackcanceler
|
||||
attackstring
|
||||
ppreduce
|
||||
jumpifstat BS_ATTACKER, CMP_GREATER_THAN, STAT_SPEED, 0x0, BattleScript_CurseTrySpeed
|
||||
jumpifstat BS_ATTACKER, CMP_NOT_EQUAL, STAT_ATK, 0xC, BattleScript_CurseTrySpeed
|
||||
jumpifstat BS_ATTACKER, CMP_EQUAL, STAT_DEF, 0xC, BattleScript_ButItFailed
|
||||
jumpifstat BS_ATTACKER, CMP_GREATER_THAN, STAT_SPEED, MIN_STAT_STAGE, BattleScript_CurseTrySpeed
|
||||
jumpifstat BS_ATTACKER, CMP_NOT_EQUAL, STAT_ATK, MAX_STAT_STAGE, BattleScript_CurseTrySpeed
|
||||
jumpifstat BS_ATTACKER, CMP_EQUAL, STAT_DEF, MAX_STAT_STAGE, BattleScript_ButItFailed
|
||||
BattleScript_CurseTrySpeed::
|
||||
copybyte gBattlerTarget, gBattlerAttacker
|
||||
setbyte sB_ANIM_TURN, 0x1
|
||||
@ -3918,7 +3918,7 @@ BattleScript_EffectMirrorCoat::
|
||||
BattleScript_EffectSkullBash::
|
||||
jumpifstatus2 BS_ATTACKER, STATUS2_MULTIPLETURNS, BattleScript_TwoTurnMovesSecondTurn
|
||||
jumpifword CMP_COMMON_BITS, gHitMarker, HITMARKER_NO_ATTACKSTRING, BattleScript_TwoTurnMovesSecondTurn
|
||||
setbyte sTWOTURN_STRINGID, 0x2
|
||||
setbyte sTWOTURN_STRINGID, 2
|
||||
call BattleScriptFirstChargingTurn
|
||||
setstatchanger STAT_DEF, 1, FALSE
|
||||
statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_BUFF_ALLOW_PTR, BattleScript_SkullBashEnd
|
||||
@ -3964,7 +3964,7 @@ BattleScript_EffectSolarbeam::
|
||||
BattleScript_SolarbeamDecideTurn::
|
||||
jumpifstatus2 BS_ATTACKER, STATUS2_MULTIPLETURNS, BattleScript_TwoTurnMovesSecondTurn
|
||||
jumpifword CMP_COMMON_BITS, gHitMarker, HITMARKER_NO_ATTACKSTRING, BattleScript_TwoTurnMovesSecondTurn
|
||||
setbyte sTWOTURN_STRINGID, 0x1
|
||||
setbyte sTWOTURN_STRINGID, 1
|
||||
call BattleScriptFirstChargingTurn
|
||||
jumpifnoholdeffect BS_ATTACKER, HOLD_EFFECT_POWER_HERB, BattleScript_MoveEnd
|
||||
call BattleScript_PowerHerbActivation
|
||||
@ -4043,16 +4043,16 @@ BattleScript_EffectSemiInvulnerable::
|
||||
setbyte sTWOTURN_STRINGID, 0x5
|
||||
goto BattleScript_FirstTurnSemiInvulnerable
|
||||
BattleScript_FirstTurnBounce::
|
||||
setbyte sTWOTURN_STRINGID, 0x7
|
||||
setbyte sTWOTURN_STRINGID, 7
|
||||
goto BattleScript_FirstTurnSemiInvulnerable
|
||||
BattleScript_FirstTurnDive::
|
||||
setbyte sTWOTURN_STRINGID, 0x6
|
||||
setbyte sTWOTURN_STRINGID, 6
|
||||
goto BattleScript_FirstTurnSemiInvulnerable
|
||||
BattleScript_FirstTurnPhantomForce:
|
||||
setbyte sTWOTURN_STRINGID, 0x8
|
||||
goto BattleScript_FirstTurnSemiInvulnerable
|
||||
BattleScript_FirstTurnFly::
|
||||
setbyte sTWOTURN_STRINGID, 0x4
|
||||
setbyte sTWOTURN_STRINGID, 4
|
||||
BattleScript_FirstTurnSemiInvulnerable::
|
||||
call BattleScriptFirstChargingTurn
|
||||
setsemiinvulnerablebit
|
||||
@ -4741,8 +4741,8 @@ BattleScript_EffectTickle::
|
||||
attackcanceler
|
||||
attackstring
|
||||
ppreduce
|
||||
jumpifstat BS_TARGET, CMP_GREATER_THAN, STAT_ATK, 0x0, BattleScript_TickleDoMoveAnim
|
||||
jumpifstat BS_TARGET, CMP_EQUAL, STAT_DEF, 0x0, BattleScript_CantLowerMultipleStats
|
||||
jumpifstat BS_TARGET, CMP_GREATER_THAN, STAT_ATK, MIN_STAT_STAGE, BattleScript_TickleDoMoveAnim
|
||||
jumpifstat BS_TARGET, CMP_EQUAL, STAT_DEF, MIN_STAT_STAGE, BattleScript_CantLowerMultipleStats
|
||||
BattleScript_TickleDoMoveAnim::
|
||||
accuracycheck BattleScript_ButItFailed, ACC_CURR_MOVE
|
||||
attackanimation
|
||||
@ -4776,8 +4776,8 @@ BattleScript_EffectCosmicPower::
|
||||
attackcanceler
|
||||
attackstring
|
||||
ppreduce
|
||||
jumpifstat BS_ATTACKER, CMP_LESS_THAN, STAT_DEF, 0xC, BattleScript_CosmicPowerDoMoveAnim
|
||||
jumpifstat BS_ATTACKER, CMP_EQUAL, STAT_SPDEF, 0xC, BattleScript_CantRaiseMultipleStats
|
||||
jumpifstat BS_ATTACKER, CMP_LESS_THAN, STAT_DEF, MAX_STAT_STAGE, BattleScript_CosmicPowerDoMoveAnim
|
||||
jumpifstat BS_ATTACKER, CMP_EQUAL, STAT_SPDEF, MAX_STAT_STAGE, BattleScript_CantRaiseMultipleStats
|
||||
BattleScript_CosmicPowerDoMoveAnim::
|
||||
attackanimation
|
||||
waitanimation
|
||||
@ -4804,8 +4804,8 @@ BattleScript_EffectBulkUp::
|
||||
attackcanceler
|
||||
attackstring
|
||||
ppreduce
|
||||
jumpifstat BS_ATTACKER, CMP_LESS_THAN, STAT_ATK, 0xC, BattleScript_BulkUpDoMoveAnim
|
||||
jumpifstat BS_ATTACKER, CMP_EQUAL, STAT_DEF, 0xC, BattleScript_CantRaiseMultipleStats
|
||||
jumpifstat BS_ATTACKER, CMP_LESS_THAN, STAT_ATK, MAX_STAT_STAGE, BattleScript_BulkUpDoMoveAnim
|
||||
jumpifstat BS_ATTACKER, CMP_EQUAL, STAT_DEF, MAX_STAT_STAGE, BattleScript_CantRaiseMultipleStats
|
||||
BattleScript_BulkUpDoMoveAnim::
|
||||
attackanimation
|
||||
waitanimation
|
||||
@ -4829,8 +4829,8 @@ BattleScript_EffectCalmMind::
|
||||
attackcanceler
|
||||
attackstring
|
||||
ppreduce
|
||||
jumpifstat BS_ATTACKER, CMP_LESS_THAN, STAT_SPATK, 0xC, BattleScript_CalmMindDoMoveAnim
|
||||
jumpifstat BS_ATTACKER, CMP_EQUAL, STAT_SPDEF, 0xC, BattleScript_CantRaiseMultipleStats
|
||||
jumpifstat BS_ATTACKER, CMP_LESS_THAN, STAT_SPATK, MAX_STAT_STAGE, BattleScript_CalmMindDoMoveAnim
|
||||
jumpifstat BS_ATTACKER, CMP_EQUAL, STAT_SPDEF, MAX_STAT_STAGE, BattleScript_CantRaiseMultipleStats
|
||||
BattleScript_CalmMindDoMoveAnim::
|
||||
attackanimation
|
||||
waitanimation
|
||||
@ -4861,8 +4861,8 @@ BattleScript_EffectDragonDance::
|
||||
attackcanceler
|
||||
attackstring
|
||||
ppreduce
|
||||
jumpifstat BS_ATTACKER, CMP_LESS_THAN, STAT_ATK, 0xC, BattleScript_DragonDanceDoMoveAnim
|
||||
jumpifstat BS_ATTACKER, CMP_EQUAL, STAT_SPEED, 0xC, BattleScript_CantRaiseMultipleStats
|
||||
jumpifstat BS_ATTACKER, CMP_LESS_THAN, STAT_ATK, MAX_STAT_STAGE, BattleScript_DragonDanceDoMoveAnim
|
||||
jumpifstat BS_ATTACKER, CMP_EQUAL, STAT_SPEED, MAX_STAT_STAGE, BattleScript_CantRaiseMultipleStats
|
||||
BattleScript_DragonDanceDoMoveAnim::
|
||||
attackanimation
|
||||
waitanimation
|
||||
@ -5138,13 +5138,13 @@ BattleScript_FrontierTrainerBattleWon_LoseTexts:
|
||||
trainerslidein BS_ATTACKER
|
||||
waitstate
|
||||
printstring STRINGID_TRAINER1LOSETEXT
|
||||
jumpifnotbattletype BATTLE_TYPE_TWO_OPPONENTS, BattleScript_82DAACB
|
||||
jumpifnotbattletype BATTLE_TYPE_TWO_OPPONENTS, BattleScript_TryPickUpItems
|
||||
trainerslideout B_POSITION_OPPONENT_LEFT
|
||||
waitstate
|
||||
trainerslidein BS_FAINTED
|
||||
waitstate
|
||||
printstring STRINGID_TRAINER2LOSETEXT
|
||||
BattleScript_82DAACB:
|
||||
BattleScript_TryPickUpItems:
|
||||
jumpifnotbattletype BATTLE_TYPE_PYRAMID, BattleScript_FrontierTrainerBattleWon_End
|
||||
pickup
|
||||
BattleScript_FrontierTrainerBattleWon_End:
|
||||
@ -5348,7 +5348,7 @@ BattleScript_SunlightFaded::
|
||||
end2
|
||||
|
||||
BattleScript_OverworldWeatherStarts::
|
||||
printfromtable gWeatherContinuesStringIds
|
||||
printfromtable gWeatherStartsStringIds
|
||||
waitmessage 0x40
|
||||
playanimation2 BS_ATTACKER, sB_ANIM_ARG1, NULL
|
||||
end3
|
||||
@ -5706,11 +5706,11 @@ BattleScript_PerishSongCountGoesDown::
|
||||
end2
|
||||
|
||||
BattleScript_AllStatsUp::
|
||||
jumpifstat BS_ATTACKER, CMP_LESS_THAN, STAT_ATK, 0xC, BattleScript_AllStatsUpAtk
|
||||
jumpifstat BS_ATTACKER, CMP_LESS_THAN, STAT_DEF, 0xC, BattleScript_AllStatsUpAtk
|
||||
jumpifstat BS_ATTACKER, CMP_LESS_THAN, STAT_SPEED, 0xC, BattleScript_AllStatsUpAtk
|
||||
jumpifstat BS_ATTACKER, CMP_LESS_THAN, STAT_SPATK, 0xC, BattleScript_AllStatsUpAtk
|
||||
jumpifstat BS_ATTACKER, CMP_EQUAL, STAT_SPDEF, 0xC, BattleScript_AllStatsUpRet
|
||||
jumpifstat BS_ATTACKER, CMP_LESS_THAN, STAT_ATK, MAX_STAT_STAGE, BattleScript_AllStatsUpAtk
|
||||
jumpifstat BS_ATTACKER, CMP_LESS_THAN, STAT_DEF, MAX_STAT_STAGE, BattleScript_AllStatsUpAtk
|
||||
jumpifstat BS_ATTACKER, CMP_LESS_THAN, STAT_SPEED, MAX_STAT_STAGE, BattleScript_AllStatsUpAtk
|
||||
jumpifstat BS_ATTACKER, CMP_LESS_THAN, STAT_SPATK, MAX_STAT_STAGE, BattleScript_AllStatsUpAtk
|
||||
jumpifstat BS_ATTACKER, CMP_EQUAL, STAT_SPDEF, MAX_STAT_STAGE, BattleScript_AllStatsUpRet
|
||||
BattleScript_AllStatsUpAtk::
|
||||
setbyte sSTAT_ANIM_PLAYED, FALSE
|
||||
playstatchangeanimation BS_ATTACKER, BIT_ATK | BIT_DEF | BIT_SPEED | BIT_SPATK | BIT_SPDEF, 0x0
|
||||
@ -6677,10 +6677,10 @@ BattleScript_WeatherFormChangesLoop::
|
||||
return
|
||||
|
||||
BattleScript_CastformChange::
|
||||
call BattleScript_82DB4AF
|
||||
call BattleScript_DoCastformChange
|
||||
end3
|
||||
|
||||
BattleScript_82DB4AF::
|
||||
BattleScript_DoCastformChange::
|
||||
copybyte gBattlerAbility, sBATTLER
|
||||
call BattleScript_AbilityPopUp
|
||||
docastformchangeanimation
|
||||
|
||||
@ -14,28 +14,28 @@
|
||||
|
||||
.align 2
|
||||
gBattlescriptsForBallThrow:: @ 82DBD08
|
||||
.4byte BattleScript_BallThrow
|
||||
.4byte BattleScript_BallThrow
|
||||
.4byte BattleScript_BallThrow
|
||||
.4byte BattleScript_BallThrow
|
||||
.4byte BattleScript_BallThrow
|
||||
.4byte BattleScript_SafariBallThrow
|
||||
.4byte BattleScript_BallThrow
|
||||
.4byte BattleScript_BallThrow
|
||||
.4byte BattleScript_BallThrow
|
||||
.4byte BattleScript_BallThrow
|
||||
.4byte BattleScript_BallThrow
|
||||
.4byte BattleScript_BallThrow
|
||||
.4byte BattleScript_BallThrow
|
||||
.4byte BattleScript_BallThrow @ ITEM_NONE
|
||||
.4byte BattleScript_BallThrow @ ITEM_MASTER_BALL
|
||||
.4byte BattleScript_BallThrow @ ITEM_ULTRA_BALL
|
||||
.4byte BattleScript_BallThrow @ ITEM_GREAT_BALL
|
||||
.4byte BattleScript_BallThrow @ ITEM_POKE_BALL
|
||||
.4byte BattleScript_SafariBallThrow @ ITEM_SAFARI_BALL
|
||||
.4byte BattleScript_BallThrow @ ITEM_NET_BALL
|
||||
.4byte BattleScript_BallThrow @ ITEM_DIVE_BALL
|
||||
.4byte BattleScript_BallThrow @ ITEM_NEST_BALL
|
||||
.4byte BattleScript_BallThrow @ ITEM_REPEAT_BALL
|
||||
.4byte BattleScript_BallThrow @ ITEM_TIMER_BALL
|
||||
.4byte BattleScript_BallThrow @ ITEM_LUXURY_BALL
|
||||
.4byte BattleScript_BallThrow @ ITEM_PREMIER_BALL
|
||||
|
||||
.align 2
|
||||
gBattlescriptsForUsingItem:: @ 82DBD3C
|
||||
.4byte BattleScript_PlayerUsesItem
|
||||
.4byte BattleScript_OpponentUsesHealItem
|
||||
.4byte BattleScript_OpponentUsesHealItem
|
||||
.4byte BattleScript_OpponentUsesStatusCureItem
|
||||
.4byte BattleScript_OpponentUsesXItem
|
||||
.4byte BattleScript_OpponentUsesGuardSpecs
|
||||
.4byte BattleScript_OpponentUsesHealItem @ AI_ITEM_FULL_RESTORE
|
||||
.4byte BattleScript_OpponentUsesHealItem @ AI_ITEM_HEAL_HP
|
||||
.4byte BattleScript_OpponentUsesStatusCureItem @ AI_ITEM_CURE_CONDITION
|
||||
.4byte BattleScript_OpponentUsesXItem @ AI_ITEM_X_STAT
|
||||
.4byte BattleScript_OpponentUsesGuardSpecs @ AI_ITEM_GUARD_SPECS
|
||||
|
||||
.align 2
|
||||
gBattlescriptsForRunningByItem:: @ 82DBD54
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -40,6 +40,7 @@
|
||||
#include "constants/moves.h"
|
||||
#include "constants/party_menu.h"
|
||||
#include "constants/pokemon.h"
|
||||
#include "constants/roulette.h"
|
||||
#include "constants/script_menu.h"
|
||||
#include "constants/secret_bases.h"
|
||||
#include "constants/songs.h"
|
||||
|
||||
@ -5,73 +5,73 @@
|
||||
|
||||
.align 2
|
||||
gFieldEffectScriptPointers:: @ 82DB9D4
|
||||
.4byte gFieldEffectScript_ExclamationMarkIcon1
|
||||
.4byte gFieldEffectScript_UseCutOnTallGrass
|
||||
.4byte gFieldEffectScript_UseCutOnTree
|
||||
.4byte gFieldEffectScript_Shadow
|
||||
.4byte gFieldEffectScript_TallGrass
|
||||
.4byte gFieldEffectScript_Ripple
|
||||
.4byte gFieldEffectScript_FieldMoveShowMon
|
||||
.4byte gFieldEffectScript_Ash
|
||||
.4byte gFieldEffectScript_SurfBlob
|
||||
.4byte gFieldEffectScript_UseSurf
|
||||
.4byte gFieldEffectScript_GroundImpactDust
|
||||
.4byte gFieldEffectScript_UseSecretPowerCave
|
||||
.4byte gFieldEffectScript_BikeHopTallGrass
|
||||
.4byte gFieldEffectScript_SandFootprints
|
||||
.4byte gFieldEffectScript_BikeHopBigSplash
|
||||
.4byte gFieldEffectScript_Splash
|
||||
.4byte gFieldEffectScript_BikeHopSmallSplash
|
||||
.4byte gFieldEffectScript_LongGrass
|
||||
.4byte gFieldEffectScript_JumpLongGrass
|
||||
.4byte gFieldEffectScript_Unknown19
|
||||
.4byte gFieldEffectScript_Unknown20
|
||||
.4byte gFieldEffectScript_Unknown21
|
||||
.4byte gFieldEffectScript_Unknown22
|
||||
.4byte gFieldEffectScript_BerryTreeGrowthSparkle
|
||||
.4byte gFieldEffectScript_DeepSandFootprints
|
||||
.4byte gFieldEffectScript_PokeCenterHeal
|
||||
.4byte gFieldEffectScript_UseSecretPowerTree
|
||||
.4byte gFieldEffectScript_UseSecretPowerShrub
|
||||
.4byte gFieldEffectScript_TreeDisguise
|
||||
.4byte gFieldEffectScript_MountainDisguise
|
||||
.4byte gFieldEffectScript_NPCUseFly
|
||||
.4byte gFieldEffectScript_UseFly
|
||||
.4byte gFieldEffectScript_FlyIn
|
||||
.4byte gFieldEffectScript_QuestionMarkIcon
|
||||
.4byte gFieldEffectScript_FeetInFlowingWater
|
||||
.4byte gFieldEffectScript_BikeTireTracks
|
||||
.4byte gFieldEffectScript_SandDisguisePlaceholder
|
||||
.4byte gFieldEffectScript_UseRockSmash
|
||||
.4byte gFieldEffectScript_UseDig
|
||||
.4byte gFieldEffectScript_SandPile
|
||||
.4byte gFieldEffectScript_UseStrength
|
||||
.4byte gFieldEffectScript_ShortGrass
|
||||
.4byte gFieldEffectScript_HotSpringsWater
|
||||
.4byte gFieldEffectScript_UseWaterfall
|
||||
.4byte gFieldEffectScript_UseDive
|
||||
.4byte gFieldEffectScript_Pokeball
|
||||
.4byte gFieldEffectScript_HeartIcon
|
||||
.4byte gFieldEffectScript_Unknown47
|
||||
.4byte gFieldEffectScript_Unknown48
|
||||
.4byte gFieldEffectScript_JumpOutOfAsh
|
||||
.4byte gFieldEffectScript_LavaridgeGymWarp
|
||||
.4byte gFieldEffectScript_SweetScent
|
||||
.4byte gFieldEffectScript_SandPillar
|
||||
.4byte gFieldEffectScript_Bubbles
|
||||
.4byte gFieldEffectScript_Sparkle
|
||||
.4byte gFieldEffectScript_ShowSecretPowerCave
|
||||
.4byte gFieldEffectScript_ShowSecretPowerTree
|
||||
.4byte gFieldEffectScript_ShowSecretPowerShrub
|
||||
.4byte gFieldEffectScript_ShowCutGrass
|
||||
.4byte gFieldEffectScript_FieldMoveShowMonInit
|
||||
.4byte gFieldEffectScript_UsePuzzleEffect
|
||||
.4byte gFieldEffectScript_SecretBaseBootPC
|
||||
.4byte gFieldEffectScript_HallOfFameRecord
|
||||
.4byte gFieldEffectScript_UseTeleport
|
||||
.4byte gFieldEffectScript_Rayquaza
|
||||
.4byte gFieldEffectScript_Unknown65
|
||||
.4byte gFieldEffectScript_MoveDeoxysRock
|
||||
.4byte gFieldEffectScript_ExclamationMarkIcon1 @ FLDEFF_EXCLAMATION_MARK_ICON
|
||||
.4byte gFieldEffectScript_UseCutOnTallGrass @ FLDEFF_USE_CUT_ON_GRASS
|
||||
.4byte gFieldEffectScript_UseCutOnTree @ FLDEFF_USE_CUT_ON_TREE
|
||||
.4byte gFieldEffectScript_Shadow @ FLDEFF_SHADOW
|
||||
.4byte gFieldEffectScript_TallGrass @ FLDEFF_TALL_GRASS
|
||||
.4byte gFieldEffectScript_Ripple @ FLDEFF_RIPPLE
|
||||
.4byte gFieldEffectScript_FieldMoveShowMon @ FLDEFF_FIELD_MOVE_SHOW_MON
|
||||
.4byte gFieldEffectScript_Ash @ FLDEFF_ASH
|
||||
.4byte gFieldEffectScript_SurfBlob @ FLDEFF_SURF_BLOB
|
||||
.4byte gFieldEffectScript_UseSurf @ FLDEFF_USE_SURF
|
||||
.4byte gFieldEffectScript_GroundImpactDust @ FLDEFF_DUST
|
||||
.4byte gFieldEffectScript_UseSecretPowerCave @ FLDEFF_USE_SECRET_POWER_CAVE
|
||||
.4byte gFieldEffectScript_JumpTallGrass @ FLDEFF_JUMP_TALL_GRASS
|
||||
.4byte gFieldEffectScript_SandFootprints @ FLDEFF_SAND_FOOTPRINTS
|
||||
.4byte gFieldEffectScript_JumpBigSplash @ FLDEFF_JUMP_BIG_SPLASH
|
||||
.4byte gFieldEffectScript_Splash @ FLDEFF_SPLASH
|
||||
.4byte gFieldEffectScript_JumpSmallSplash @ FLDEFF_JUMP_SMALL_SPLASH
|
||||
.4byte gFieldEffectScript_LongGrass @ FLDEFF_LONG_GRASS
|
||||
.4byte gFieldEffectScript_JumpLongGrass @ FLDEFF_JUMP_LONG_GRASS
|
||||
.4byte gFieldEffectScript_UnusedGrass @ FLDEFF_UNUSED_GRASS
|
||||
.4byte gFieldEffectScript_UnusedGrass2 @ FLDEFF_UNUSED_GRASS_2
|
||||
.4byte gFieldEffectScript_UnusedSand @ FLDEFF_UNUSED_SAND
|
||||
.4byte gFieldEffectScript_WaterSurfacing @ FLDEFF_WATER_SURFACING
|
||||
.4byte gFieldEffectScript_BerryTreeGrowthSparkle @ FLDEFF_BERRY_TREE_GROWTH_SPARKLE
|
||||
.4byte gFieldEffectScript_DeepSandFootprints @ FLDEFF_DEEP_SAND_FOOTPRINTS
|
||||
.4byte gFieldEffectScript_PokeCenterHeal @ FLDEFF_POKECENTER_HEAL
|
||||
.4byte gFieldEffectScript_UseSecretPowerTree @ FLDEFF_USE_SECRET_POWER_TREE
|
||||
.4byte gFieldEffectScript_UseSecretPowerShrub @ FLDEFF_USE_SECRET_POWER_SHRUB
|
||||
.4byte gFieldEffectScript_TreeDisguise @ FLDEFF_TREE_DISGUISE
|
||||
.4byte gFieldEffectScript_MountainDisguise @ FLDEFF_MOUNTAIN_DISGUISE
|
||||
.4byte gFieldEffectScript_NPCUseFly @ FLDEFF_NPCFLY_OUT
|
||||
.4byte gFieldEffectScript_UseFly @ FLDEFF_USE_FLY
|
||||
.4byte gFieldEffectScript_FlyIn @ FLDEFF_FLY_IN
|
||||
.4byte gFieldEffectScript_QuestionMarkIcon @ FLDEFF_QUESTION_MARK_ICON
|
||||
.4byte gFieldEffectScript_FeetInFlowingWater @ FLDEFF_FEET_IN_FLOWING_WATER
|
||||
.4byte gFieldEffectScript_BikeTireTracks @ FLDEFF_BIKE_TIRE_TRACKS
|
||||
.4byte gFieldEffectScript_SandDisguisePlaceholder @ FLDEFF_SAND_DISGUISE
|
||||
.4byte gFieldEffectScript_UseRockSmash @ FLDEFF_USE_ROCK_SMASH
|
||||
.4byte gFieldEffectScript_UseDig @ FLDEFF_USE_DIG
|
||||
.4byte gFieldEffectScript_SandPile @ FLDEFF_SAND_PILE
|
||||
.4byte gFieldEffectScript_UseStrength @ FLDEFF_USE_STRENGTH
|
||||
.4byte gFieldEffectScript_ShortGrass @ FLDEFF_SHORT_GRASS
|
||||
.4byte gFieldEffectScript_HotSpringsWater @ FLDEFF_HOT_SPRINGS_WATER
|
||||
.4byte gFieldEffectScript_UseWaterfall @ FLDEFF_USE_WATERFALL
|
||||
.4byte gFieldEffectScript_UseDive @ FLDEFF_USE_DIVE
|
||||
.4byte gFieldEffectScript_Pokeball @ FLDEFF_POKEBALL
|
||||
.4byte gFieldEffectScript_HeartIcon @ FLDEFF_HEART_ICON
|
||||
.4byte gFieldEffectScript_Nop47 @ FLDEFF_NOP_47
|
||||
.4byte gFieldEffectScript_Nop48 @ FLDEFF_NOP_48
|
||||
.4byte gFieldEffectScript_AshPuff @ FLDEFF_ASH_PUFF
|
||||
.4byte gFieldEffectScript_AshLaunch @ FLDEFF_ASH_LAUNCH
|
||||
.4byte gFieldEffectScript_SweetScent @ FLDEFF_SWEET_SCENT
|
||||
.4byte gFieldEffectScript_SandPillar @ FLDEFF_SAND_PILLAR
|
||||
.4byte gFieldEffectScript_Bubbles @ FLDEFF_BUBBLES
|
||||
.4byte gFieldEffectScript_Sparkle @ FLDEFF_SPARKLE
|
||||
.4byte gFieldEffectScript_ShowSecretPowerCave @ FLDEFF_SECRET_POWER_CAVE
|
||||
.4byte gFieldEffectScript_ShowSecretPowerTree @ FLDEFF_SECRET_POWER_TREE
|
||||
.4byte gFieldEffectScript_ShowSecretPowerShrub @ FLDEFF_SECRET_POWER_SHRUB
|
||||
.4byte gFieldEffectScript_ShowCutGrass @ FLDEFF_CUT_GRASS
|
||||
.4byte gFieldEffectScript_FieldMoveShowMonInit @ FLDEFF_FIELD_MOVE_SHOW_MON_INIT
|
||||
.4byte gFieldEffectScript_UsePuzzleEffect @ FLDEFF_USE_TOMB_PUZZLE_EFFECT
|
||||
.4byte gFieldEffectScript_SecretBaseBootPC @ FLDEFF_PCTURN_ON
|
||||
.4byte gFieldEffectScript_HallOfFameRecord @ FLDEFF_HALL_OF_FAME_RECORD
|
||||
.4byte gFieldEffectScript_UseTeleport @ FLDEFF_USE_TELEPORT
|
||||
.4byte gFieldEffectScript_RayquazaSpotlight @ FLDEFF_RAYQUAZA_SPOTLIGHT
|
||||
.4byte gFieldEffectScript_DestroyDeoxysRock @ FLDEFF_DESTROY_DEOXYS_ROCK
|
||||
.4byte gFieldEffectScript_MoveDeoxysRock @ FLDEFF_MOVE_DEOXYS_ROCK
|
||||
|
||||
gFieldEffectScript_ExclamationMarkIcon1:: @ 82DBAE0
|
||||
field_eff_callnative FldEff_ExclamationMarkIcon
|
||||
@ -90,11 +90,11 @@ gFieldEffectScript_Shadow:: @ 82DBAF2
|
||||
field_eff_end
|
||||
|
||||
gFieldEffectScript_TallGrass:: @ 82DBAF8
|
||||
field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo1, FldEff_TallGrass
|
||||
field_eff_loadfadedpal_callnative gSpritePalette_GeneralFieldEffect1, FldEff_TallGrass
|
||||
field_eff_end
|
||||
|
||||
gFieldEffectScript_Ripple:: @ 82DBB02
|
||||
field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo1, FldEff_Ripple
|
||||
field_eff_loadfadedpal_callnative gSpritePalette_GeneralFieldEffect1, FldEff_Ripple
|
||||
field_eff_end
|
||||
|
||||
gFieldEffectScript_FieldMoveShowMon:: @ 82DBB0C
|
||||
@ -102,7 +102,7 @@ gFieldEffectScript_FieldMoveShowMon:: @ 82DBB0C
|
||||
field_eff_end
|
||||
|
||||
gFieldEffectScript_Ash:: @ 82DBB12
|
||||
field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo1, FldEff_Ash
|
||||
field_eff_loadfadedpal_callnative gSpritePalette_GeneralFieldEffect1, FldEff_Ash
|
||||
field_eff_end
|
||||
|
||||
gFieldEffectScript_SurfBlob:: @ 82DBB1C
|
||||
@ -114,55 +114,55 @@ gFieldEffectScript_UseSurf:: @ 82DBB22
|
||||
field_eff_end
|
||||
|
||||
gFieldEffectScript_GroundImpactDust:: @ 82DBB28
|
||||
field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo0, FldEff_Dust
|
||||
field_eff_loadfadedpal_callnative gSpritePalette_GeneralFieldEffect0, FldEff_Dust
|
||||
field_eff_end
|
||||
|
||||
gFieldEffectScript_UseSecretPowerCave:: @ 82DBB32
|
||||
field_eff_callnative FldEff_UseSecretPowerCave
|
||||
field_eff_end
|
||||
|
||||
gFieldEffectScript_BikeHopTallGrass:: @ 82DBB38
|
||||
field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo1, FldEff_JumpTallGrass
|
||||
gFieldEffectScript_JumpTallGrass:: @ 82DBB38
|
||||
field_eff_loadfadedpal_callnative gSpritePalette_GeneralFieldEffect1, FldEff_JumpTallGrass
|
||||
field_eff_end
|
||||
|
||||
gFieldEffectScript_SandFootprints:: @ 82DBB42
|
||||
field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo0, FldEff_SandFootprints
|
||||
field_eff_loadfadedpal_callnative gSpritePalette_GeneralFieldEffect0, FldEff_SandFootprints
|
||||
field_eff_end
|
||||
|
||||
gFieldEffectScript_BikeHopBigSplash:: @ 82DBB4C
|
||||
field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo0, FldEff_JumpBigSplash
|
||||
gFieldEffectScript_JumpBigSplash:: @ 82DBB4C
|
||||
field_eff_loadfadedpal_callnative gSpritePalette_GeneralFieldEffect0, FldEff_JumpBigSplash
|
||||
field_eff_end
|
||||
|
||||
gFieldEffectScript_Splash:: @ 82DBB56
|
||||
field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo0, FldEff_Splash
|
||||
field_eff_loadfadedpal_callnative gSpritePalette_GeneralFieldEffect0, FldEff_Splash
|
||||
field_eff_end
|
||||
|
||||
gFieldEffectScript_BikeHopSmallSplash:: @ 82DBB60
|
||||
field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo0, FldEff_JumpSmallSplash
|
||||
gFieldEffectScript_JumpSmallSplash:: @ 82DBB60
|
||||
field_eff_loadfadedpal_callnative gSpritePalette_GeneralFieldEffect0, FldEff_JumpSmallSplash
|
||||
field_eff_end
|
||||
|
||||
gFieldEffectScript_LongGrass:: @ 82DBB6A
|
||||
field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo1, FldEff_LongGrass
|
||||
field_eff_loadfadedpal_callnative gSpritePalette_GeneralFieldEffect1, FldEff_LongGrass
|
||||
field_eff_end
|
||||
|
||||
gFieldEffectScript_JumpLongGrass:: @ 82DBB74
|
||||
field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo1, FldEff_JumpLongGrass
|
||||
field_eff_loadfadedpal_callnative gSpritePalette_GeneralFieldEffect1, FldEff_JumpLongGrass
|
||||
field_eff_end
|
||||
|
||||
gFieldEffectScript_Unknown19:: @ 82DBB7E
|
||||
field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo1, FldEff_Unknown19
|
||||
gFieldEffectScript_UnusedGrass:: @ 82DBB7E
|
||||
field_eff_loadfadedpal_callnative gSpritePalette_GeneralFieldEffect1, FldEff_UnusedGrass
|
||||
field_eff_end
|
||||
|
||||
gFieldEffectScript_Unknown20:: @ 82DBB88
|
||||
field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo1, FldEff_Unknown20
|
||||
gFieldEffectScript_UnusedGrass2:: @ 82DBB88
|
||||
field_eff_loadfadedpal_callnative gSpritePalette_GeneralFieldEffect1, FldEff_UnusedGrass2
|
||||
field_eff_end
|
||||
|
||||
gFieldEffectScript_Unknown21:: @ 82DBB92
|
||||
field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo0, FldEff_Unknown21
|
||||
gFieldEffectScript_UnusedSand:: @ 82DBB92
|
||||
field_eff_loadfadedpal_callnative gSpritePalette_GeneralFieldEffect0, FldEff_UnusedSand
|
||||
field_eff_end
|
||||
|
||||
gFieldEffectScript_Unknown22:: @ 82DBB9C
|
||||
field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo0, FldEff_Unknown22
|
||||
gFieldEffectScript_WaterSurfacing:: @ 82DBB9C
|
||||
field_eff_loadfadedpal_callnative gSpritePalette_GeneralFieldEffect0, FldEff_WaterSurfacing
|
||||
field_eff_end
|
||||
|
||||
gFieldEffectScript_BerryTreeGrowthSparkle:: @ 82DBBA6
|
||||
@ -170,12 +170,12 @@ gFieldEffectScript_BerryTreeGrowthSparkle:: @ 82DBBA6
|
||||
field_eff_end
|
||||
|
||||
gFieldEffectScript_DeepSandFootprints:: @ 82DBBAC
|
||||
field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo0, FldEff_DeepSandFootprints
|
||||
field_eff_loadfadedpal_callnative gSpritePalette_GeneralFieldEffect0, FldEff_DeepSandFootprints
|
||||
field_eff_end
|
||||
|
||||
gFieldEffectScript_PokeCenterHeal:: @ 82DBBB6
|
||||
field_eff_loadfadedpal gFieldEffectObjectPaletteInfo4
|
||||
field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo0, FldEff_PokecenterHeal
|
||||
field_eff_loadfadedpal gSpritePalette_PokeballGlow
|
||||
field_eff_loadfadedpal_callnative gSpritePalette_GeneralFieldEffect0, FldEff_PokecenterHeal
|
||||
field_eff_end
|
||||
|
||||
gFieldEffectScript_UseSecretPowerTree:: @ 82DBBC5
|
||||
@ -211,11 +211,11 @@ gFieldEffectScript_QuestionMarkIcon:: @ 82DBBEF
|
||||
field_eff_end
|
||||
|
||||
gFieldEffectScript_FeetInFlowingWater:: @ 82DBBF5
|
||||
field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo0, FldEff_FeetInFlowingWater
|
||||
field_eff_loadfadedpal_callnative gSpritePalette_GeneralFieldEffect0, FldEff_FeetInFlowingWater
|
||||
field_eff_end
|
||||
|
||||
gFieldEffectScript_BikeTireTracks:: @ 82DBBFF
|
||||
field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo0, FldEff_BikeTireTracks
|
||||
field_eff_loadfadedpal_callnative gSpritePalette_GeneralFieldEffect0, FldEff_BikeTireTracks
|
||||
field_eff_end
|
||||
|
||||
gFieldEffectScript_SandDisguisePlaceholder:: @ 82DBC09
|
||||
@ -227,7 +227,7 @@ gFieldEffectScript_UseRockSmash:: @ 82DBC0F
|
||||
field_eff_end
|
||||
|
||||
gFieldEffectScript_UseStrength:: @ 82DBC15
|
||||
field_eff_callnative sub_8145E2C
|
||||
field_eff_callnative FldEff_UseStrength
|
||||
field_eff_end
|
||||
|
||||
gFieldEffectScript_UseDig:: @ 82DBC1B
|
||||
@ -235,15 +235,15 @@ gFieldEffectScript_UseDig:: @ 82DBC1B
|
||||
field_eff_end
|
||||
|
||||
gFieldEffectScript_SandPile:: @ 82DBC21
|
||||
field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo0, FldEff_SandPile
|
||||
field_eff_loadfadedpal_callnative gSpritePalette_GeneralFieldEffect0, FldEff_SandPile
|
||||
field_eff_end
|
||||
|
||||
gFieldEffectScript_ShortGrass:: @ 82DBC2B
|
||||
field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo1, FldEff_ShortGrass
|
||||
field_eff_loadfadedpal_callnative gSpritePalette_GeneralFieldEffect1, FldEff_ShortGrass
|
||||
field_eff_end
|
||||
|
||||
gFieldEffectScript_HotSpringsWater:: @ 82DBC35
|
||||
field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo1, FldEff_HotSpringsWater
|
||||
field_eff_loadfadedpal_callnative gSpritePalette_GeneralFieldEffect1, FldEff_HotSpringsWater
|
||||
field_eff_end
|
||||
|
||||
gFieldEffectScript_UseWaterfall:: @ 82DBC3F
|
||||
@ -255,28 +255,28 @@ gFieldEffectScript_UseDive:: @ 82DBC45
|
||||
field_eff_end
|
||||
|
||||
gFieldEffectScript_Pokeball:: @ 82DBC4B
|
||||
field_eff_loadpal gFieldEffectObjectPaletteInfo10
|
||||
field_eff_loadpal gSpritePalette_Pokeball
|
||||
field_eff_callnative FldEff_Pokeball
|
||||
field_eff_end
|
||||
|
||||
gFieldEffectScript_HeartIcon:: @ 82DBC56
|
||||
field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo0, FldEff_HeartIcon
|
||||
field_eff_loadfadedpal_callnative gSpritePalette_GeneralFieldEffect0, FldEff_HeartIcon
|
||||
field_eff_end
|
||||
|
||||
gFieldEffectScript_Unknown47:: @ 82DBC60
|
||||
field_eff_callnative FldEff_NopA6FC
|
||||
gFieldEffectScript_Nop47:: @ 82DBC60
|
||||
field_eff_callnative FldEff_Nop47
|
||||
field_eff_end
|
||||
|
||||
gFieldEffectScript_Unknown48:: @ 82DBC66
|
||||
field_eff_callnative FldEff_NopA700
|
||||
gFieldEffectScript_Nop48:: @ 82DBC66
|
||||
field_eff_callnative FldEff_Nop48
|
||||
field_eff_end
|
||||
|
||||
gFieldEffectScript_JumpOutOfAsh:: @ 82DBC6C
|
||||
field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo2, FldEff_PopOutOfAsh
|
||||
gFieldEffectScript_AshPuff:: @ 82DBC6C
|
||||
field_eff_loadfadedpal_callnative gSpritePalette_Ash, FldEff_AshPuff
|
||||
field_eff_end
|
||||
|
||||
gFieldEffectScript_LavaridgeGymWarp:: @ 82DBC76
|
||||
field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo2, FldEff_LavaridgeGymWarp
|
||||
gFieldEffectScript_AshLaunch:: @ 82DBC76
|
||||
field_eff_loadfadedpal_callnative gSpritePalette_Ash, FldEff_AshLaunch
|
||||
field_eff_end
|
||||
|
||||
gFieldEffectScript_SweetScent:: @ 82DBC80
|
||||
@ -284,31 +284,31 @@ gFieldEffectScript_SweetScent:: @ 82DBC80
|
||||
field_eff_end
|
||||
|
||||
gFieldEffectScript_SandPillar:: @ 82DBC86
|
||||
field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo9, FldEff_SandPillar
|
||||
field_eff_loadfadedpal_callnative gSpritePalette_SandPillar, FldEff_SandPillar
|
||||
field_eff_end
|
||||
|
||||
gFieldEffectScript_Bubbles:: @ 82DBC90
|
||||
field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo0, FldEff_Bubbles
|
||||
field_eff_loadfadedpal_callnative gSpritePalette_GeneralFieldEffect0, FldEff_Bubbles
|
||||
field_eff_end
|
||||
|
||||
gFieldEffectScript_Sparkle:: @ 82DBC9A
|
||||
field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo3, FldEff_Sparkle
|
||||
field_eff_loadfadedpal_callnative gSpritePalette_SmallSparkle, FldEff_Sparkle
|
||||
field_eff_end
|
||||
|
||||
gFieldEffectScript_ShowSecretPowerCave:: @ 82DBCA4
|
||||
field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo7, FldEff_SecretPowerCave
|
||||
field_eff_loadfadedpal_callnative gSpritePalette_SecretPower_Cave, FldEff_SecretPowerCave
|
||||
field_eff_end
|
||||
|
||||
gFieldEffectScript_ShowSecretPowerTree:: @ 82DBCAE
|
||||
field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo8, FldEff_SecretPowerTree
|
||||
field_eff_loadfadedpal_callnative gSpritePalette_SecretPower_Plant, FldEff_SecretPowerTree
|
||||
field_eff_end
|
||||
|
||||
gFieldEffectScript_ShowSecretPowerShrub:: @ 82DBCB8
|
||||
field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo8, FldEff_SecretPowerShrub
|
||||
field_eff_loadfadedpal_callnative gSpritePalette_SecretPower_Plant, FldEff_SecretPowerShrub
|
||||
field_eff_end
|
||||
|
||||
gFieldEffectScript_ShowCutGrass:: @ 82DBCC2
|
||||
field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo6, FldEff_CutGrass
|
||||
field_eff_loadfadedpal_callnative gSpritePalette_CutGrass, FldEff_CutGrass
|
||||
field_eff_end
|
||||
|
||||
gFieldEffectScript_FieldMoveShowMonInit:: @ 82DBCCC
|
||||
@ -324,22 +324,22 @@ gFieldEffectScript_SecretBaseBootPC:: @ 82DBCD8
|
||||
field_eff_end
|
||||
|
||||
gFieldEffectScript_HallOfFameRecord:: @ 82DBCDE
|
||||
field_eff_loadfadedpal gFieldEffectObjectPaletteInfo4
|
||||
field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo5, FldEff_HallOfFameRecord
|
||||
field_eff_loadfadedpal gSpritePalette_PokeballGlow
|
||||
field_eff_loadfadedpal_callnative gSpritePalette_HofMonitor, FldEff_HallOfFameRecord
|
||||
field_eff_end
|
||||
|
||||
gFieldEffectScript_UseTeleport:: @ 82DBCED
|
||||
field_eff_callnative FldEff_UseTeleport
|
||||
field_eff_end
|
||||
|
||||
gFieldEffectScript_Rayquaza:: @ 82DBCF3
|
||||
field_eff_callnative sub_80B8F98
|
||||
gFieldEffectScript_RayquazaSpotlight:: @ 82DBCF3
|
||||
field_eff_callnative FldEff_RayquazaSpotlight
|
||||
field_eff_end
|
||||
|
||||
gFieldEffectScript_Unknown65:: @ 82DBCF9
|
||||
field_eff_callnative sub_80B9ADC
|
||||
gFieldEffectScript_DestroyDeoxysRock:: @ 82DBCF9
|
||||
field_eff_callnative FldEff_DestroyDeoxysRock
|
||||
field_eff_end
|
||||
|
||||
gFieldEffectScript_MoveDeoxysRock:: @ 82DBCFF
|
||||
field_eff_callnative Fldeff_MoveDeoxysRock
|
||||
field_eff_callnative FldEff_MoveDeoxysRock
|
||||
field_eff_end
|
||||
|
||||
@ -1,37 +0,0 @@
|
||||
.include "asm/macros.inc"
|
||||
.include "constants/constants.inc"
|
||||
|
||||
.section .rodata
|
||||
|
||||
|
||||
|
||||
.align 2
|
||||
gUnref_82EC784:: @ 82EC784
|
||||
.4byte 0x00000000
|
||||
.4byte 0x00000000
|
||||
.4byte 0x04000008
|
||||
.4byte 0x0400000A
|
||||
.4byte 0x0400000C
|
||||
.4byte 0x0400000E
|
||||
.4byte 0x04000010
|
||||
.4byte 0x04000014
|
||||
.4byte 0x04000018
|
||||
.4byte 0x0400001C
|
||||
.4byte 0x04000012
|
||||
.4byte 0x04000016
|
||||
.4byte 0x0400001A
|
||||
.4byte 0x0400001E
|
||||
.4byte 0x02000100
|
||||
.4byte 0x08000400
|
||||
|
||||
gOverworldBackgroundLayerFlags:: @ 82EC7C4
|
||||
.2byte BLDCNT_TGT2_BG0
|
||||
.2byte BLDCNT_TGT2_BG1
|
||||
.2byte BLDCNT_TGT2_BG2
|
||||
.2byte BLDCNT_TGT2_BG3
|
||||
|
||||
gOrbEffectBackgroundLayerFlags:: @ 82EC7CC
|
||||
.2byte BLDCNT_TGT1_BG0
|
||||
.2byte BLDCNT_TGT1_BG1
|
||||
.2byte BLDCNT_TGT1_BG2
|
||||
.2byte BLDCNT_TGT1_BG3
|
||||
@ -71,9 +71,9 @@ BirthIsland_Exterior_EventScript_Deoxys:: @ 8267FC1
|
||||
setfieldeffectargument 0, LOCALID_DEOXYS_ROCK
|
||||
setfieldeffectargument 1, 58
|
||||
setfieldeffectargument 2, 26
|
||||
dofieldeffect FLDEFF_65
|
||||
dofieldeffect FLDEFF_DESTROY_DEOXYS_ROCK
|
||||
playbgm MUS_RG_DEOEYE, 0
|
||||
waitfieldeffect FLDEFF_65
|
||||
waitfieldeffect FLDEFF_DESTROY_DEOXYS_ROCK
|
||||
addobject LOCALID_DEOXYS
|
||||
applymovement LOCALID_DEOXYS, BirthIsland_Exterior_Movement_DeoxysApproach
|
||||
waitmovement 0
|
||||
|
||||
@ -18,7 +18,7 @@ ContestHall_OnTransition: @ 823B79F
|
||||
|
||||
ContestHall_EventScript_ReadyContestMusic:: @ 823B7AF
|
||||
call ContestHall_EventScript_TryWaitForLink
|
||||
special ScriptGetMultiplayerId
|
||||
special GetContestMultiplayerId
|
||||
compare VAR_RESULT, 0
|
||||
call_if_eq ContestHall_EventScript_SaveContestMusicPlayer1
|
||||
compare VAR_RESULT, 1
|
||||
@ -136,7 +136,7 @@ ContestHall_EventScript_SetRandomAudience7:: @ 823B8ED
|
||||
|
||||
ContestHall_EventScript_GetRandomAudienceGfxId:: @ 823B8F8
|
||||
setvar VAR_RESULT, 32
|
||||
special ScriptRandom
|
||||
special GenerateContestRand
|
||||
addvar VAR_RESULT, 1
|
||||
switch VAR_RESULT
|
||||
case 1, ContestHall_EventScript_RandomAudienceNinjaBoy
|
||||
|
||||
@ -35,8 +35,8 @@
|
||||
"movement_range_y": 1,
|
||||
"trainer_type": "TRAINER_TYPE_NONE",
|
||||
"trainer_sight_or_berry_tree_id": "0",
|
||||
"script": "PetalburgCity_EventScript_WallyAunt",
|
||||
"flag": "FLAG_HIDE_PETALBURG_CITY_WALLYS_AUNT"
|
||||
"script": "PetalburgCity_EventScript_WallysMom",
|
||||
"flag": "FLAG_HIDE_PETALBURG_CITY_WALLYS_MOM"
|
||||
},
|
||||
{
|
||||
"graphics_id": "OBJ_EVENT_GFX_WALLY",
|
||||
@ -88,7 +88,7 @@
|
||||
"trainer_type": "TRAINER_TYPE_NONE",
|
||||
"trainer_sight_or_berry_tree_id": "0",
|
||||
"script": "0x0",
|
||||
"flag": "FLAG_HIDE_PETALBURG_CITY_WALLYS_UNCLE"
|
||||
"flag": "FLAG_HIDE_PETALBURG_CITY_WALLYS_DAD"
|
||||
},
|
||||
{
|
||||
"graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
.set LOCALID_WALLY, 2
|
||||
.set LOCALID_BOY, 3
|
||||
.set LOCALID_WALLYS_UNCLE, 5
|
||||
.set LOCALID_WALLYS_DAD, 5
|
||||
.set LOCALID_GYM_BOY, 8
|
||||
.set LOCALID_SCOTT, 9
|
||||
|
||||
@ -68,17 +68,17 @@ PetalburgCity_EventScript_WallyTutorial:: @ 81DC32E
|
||||
PetalburgCity_EventScript_WalkToWallyHouse:: @ 81DC390
|
||||
lockall
|
||||
setflag FLAG_HIDE_MAP_NAME_POPUP
|
||||
applymovement LOCALID_WALLYS_UNCLE, PetalburgCity_Movement_WalkToWallyHouseUncle
|
||||
applymovement LOCALID_WALLYS_DAD, PetalburgCity_Movement_WalkToWallyHouseWallysDad
|
||||
applymovement OBJ_EVENT_ID_PLAYER, PetalburgCity_Movement_WalkToWallyHousePlayer
|
||||
waitmovement 0
|
||||
setvar VAR_0x8004, 7
|
||||
setvar VAR_0x8005, 5
|
||||
opendoor VAR_0x8004, VAR_0x8005
|
||||
waitdooranim
|
||||
applymovement LOCALID_WALLYS_UNCLE, PetalburgCity_Movement_WalkInsideHouseUncle
|
||||
applymovement LOCALID_WALLYS_DAD, PetalburgCity_Movement_WalkInsideHouseWallysDad
|
||||
applymovement OBJ_EVENT_ID_PLAYER, PetalburgCity_Movement_WalkInsideHousePlayer
|
||||
waitmovement 0
|
||||
setflag FLAG_HIDE_PETALBURG_CITY_WALLYS_UNCLE
|
||||
setflag FLAG_HIDE_PETALBURG_CITY_WALLYS_DAD
|
||||
hideobjectat OBJ_EVENT_ID_PLAYER, MAP_PETALBURG_CITY
|
||||
closedoor VAR_0x8004, VAR_0x8005
|
||||
waitdooranim
|
||||
@ -100,7 +100,7 @@ PetalburgCity_EventScript_Boy:: @ 81DC3E6
|
||||
release
|
||||
end
|
||||
|
||||
PetalburgCity_EventScript_WallyAunt:: @ 81DC3FD
|
||||
PetalburgCity_EventScript_WallysMom:: @ 81DC3FD
|
||||
msgbox PetalburgCity_Text_WhereIsWally, MSGBOX_NPC
|
||||
end
|
||||
|
||||
@ -129,7 +129,7 @@ PetalburgCity_Movement_WalkInsideHousePlayer: @ 81DC418
|
||||
walk_up
|
||||
step_end
|
||||
|
||||
PetalburgCity_Movement_WalkToWallyHouseUncle: @ 81DC41B
|
||||
PetalburgCity_Movement_WalkToWallyHouseWallysDad: @ 81DC41B
|
||||
delay_8
|
||||
walk_down
|
||||
walk_down
|
||||
@ -149,7 +149,7 @@ PetalburgCity_Movement_WalkToWallyHouseUncle: @ 81DC41B
|
||||
walk_up
|
||||
step_end
|
||||
|
||||
PetalburgCity_Movement_WalkInsideHouseUncle: @ 81DC42D
|
||||
PetalburgCity_Movement_WalkInsideHouseWallysDad: @ 81DC42D
|
||||
walk_up
|
||||
set_invisible
|
||||
step_end
|
||||
|
||||
@ -155,7 +155,7 @@
|
||||
"trainer_type": "TRAINER_TYPE_NONE",
|
||||
"trainer_sight_or_berry_tree_id": "0",
|
||||
"script": "0x0",
|
||||
"flag": "FLAG_HIDE_PETALBURG_GYM_WALLYS_UNCLE"
|
||||
"flag": "FLAG_HIDE_PETALBURG_GYM_WALLYS_DAD"
|
||||
}
|
||||
],
|
||||
"warp_events": [
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
.set LOCALID_NORMAN, 1
|
||||
.set LOCALID_WALLY, 10
|
||||
.set LOCALID_WALLYS_UNCLE, 11
|
||||
.set LOCALID_WALLYS_DAD, 11
|
||||
|
||||
PetalburgCity_Gym_MapScripts:: @ 8204889
|
||||
map_script MAP_SCRIPT_ON_LOAD, PetalburgCity_Gym_OnLoad
|
||||
@ -213,7 +213,7 @@ PetalburgCity_Gym_EventScript_BeginWallyTutorial:: @ 8204AAC
|
||||
compare VAR_0x8008, 3
|
||||
call_if_eq PetalburgCity_Gym_EventScript_ExitGymWithWallyEast
|
||||
removeobject LOCALID_WALLY
|
||||
setflag FLAG_HIDE_PETALBURG_CITY_WALLYS_AUNT
|
||||
setflag FLAG_HIDE_PETALBURG_CITY_WALLYS_MOM
|
||||
setvar VAR_PETALBURG_GYM_STATE, 1
|
||||
setvar VAR_PETALBURG_CITY_STATE, 2
|
||||
clearflag FLAG_HIDE_PETALBURG_CITY_WALLY
|
||||
@ -433,11 +433,11 @@ PetalburgCity_Gym_EventScript_NormanBattle:: @ 8204E3B
|
||||
delay 40
|
||||
playse SE_DOOR
|
||||
delay 10
|
||||
addobject LOCALID_WALLYS_UNCLE
|
||||
addobject LOCALID_WALLYS_DAD
|
||||
switch VAR_FACING
|
||||
case DIR_NORTH, PetalburgCity_Gym_EventScript_WallysUncleArrivesNorth
|
||||
case DIR_WEST, PetalburgCity_Gym_EventScript_WallysUncleArrivesWest
|
||||
case DIR_EAST, PetalburgCity_Gym_EventScript_WallysUncleArrivesEast
|
||||
case DIR_NORTH, PetalburgCity_Gym_EventScript_WallysDadArrivesNorth
|
||||
case DIR_WEST, PetalburgCity_Gym_EventScript_WallysDadArrivesWest
|
||||
case DIR_EAST, PetalburgCity_Gym_EventScript_WallysDadArrivesEast
|
||||
end
|
||||
|
||||
PetalburgCity_Gym_EventScript_GiveFacade:: @ 8204ED2
|
||||
@ -448,119 +448,119 @@ PetalburgCity_Gym_EventScript_GiveFacade:: @ 8204ED2
|
||||
msgbox PetalburgCity_Gym_Text_ExplainFacade, MSGBOX_DEFAULT
|
||||
return
|
||||
|
||||
PetalburgCity_Gym_EventScript_WallysUncleArrivesNorth:: @ 8204EF5
|
||||
PetalburgCity_Gym_EventScript_WallysDadArrivesNorth:: @ 8204EF5
|
||||
setvar VAR_0x8008, 1
|
||||
goto PetalburgCity_Gym_EventScript_WallysUncleArrives
|
||||
goto PetalburgCity_Gym_EventScript_WallysDadArrives
|
||||
|
||||
PetalburgCity_Gym_EventScript_WallysUncleArrivesEast:: @ 8204EFF
|
||||
PetalburgCity_Gym_EventScript_WallysDadArrivesEast:: @ 8204EFF
|
||||
setvar VAR_0x8008, 2
|
||||
goto PetalburgCity_Gym_EventScript_WallysUncleArrives
|
||||
goto PetalburgCity_Gym_EventScript_WallysDadArrives
|
||||
|
||||
PetalburgCity_Gym_EventScript_WallysUncleArrivesWest:: @ 8204F09
|
||||
PetalburgCity_Gym_EventScript_WallysDadArrivesWest:: @ 8204F09
|
||||
setvar VAR_0x8008, 3
|
||||
goto PetalburgCity_Gym_EventScript_WallysUncleArrives
|
||||
goto PetalburgCity_Gym_EventScript_WallysDadArrives
|
||||
|
||||
PetalburgCity_Gym_EventScript_WallysUncleArrives:: @ 8204F13
|
||||
applymovement LOCALID_WALLYS_UNCLE, PetalburgCity_Gym_Movement_WallysUncleEnterGym
|
||||
PetalburgCity_Gym_EventScript_WallysDadArrives:: @ 8204F13
|
||||
applymovement LOCALID_WALLYS_DAD, PetalburgCity_Gym_Movement_WallysDadEnterGym
|
||||
waitmovement 0
|
||||
playse SE_PIN
|
||||
applymovement LOCALID_WALLYS_UNCLE, Common_Movement_ExclamationMark
|
||||
applymovement LOCALID_WALLYS_DAD, Common_Movement_ExclamationMark
|
||||
waitmovement 0
|
||||
applymovement LOCALID_WALLYS_UNCLE, Common_Movement_Delay48
|
||||
applymovement LOCALID_WALLYS_DAD, Common_Movement_Delay48
|
||||
waitmovement 0
|
||||
delay 10
|
||||
compare VAR_0x8008, 1
|
||||
call_if_eq PetalburgCity_Gym_EventScript_WallysUncleApproachPlayerNorth
|
||||
call_if_eq PetalburgCity_Gym_EventScript_WallysDadApproachPlayerNorth
|
||||
compare VAR_0x8008, 2
|
||||
call_if_eq PetalburgCity_Gym_EventScript_WallysUncleApproachPlayerEast
|
||||
call_if_eq PetalburgCity_Gym_EventScript_WallysDadApproachPlayerEast
|
||||
compare VAR_0x8008, 3
|
||||
call_if_eq PetalburgCity_Gym_EventScript_WallysUncleApproachPlayerWest
|
||||
call_if_eq PetalburgCity_Gym_EventScript_WallysDadApproachPlayerWest
|
||||
msgbox PetalburgCity_Gym_Text_PleaseComeWithMe, MSGBOX_DEFAULT
|
||||
closemessage
|
||||
delay 20
|
||||
compare VAR_0x8008, 1
|
||||
call_if_eq PetalburgCity_Gym_EventScript_WallysUncleFaceNormanNorth
|
||||
call_if_eq PetalburgCity_Gym_EventScript_WallysDadFaceNormanNorth
|
||||
compare VAR_0x8008, 2
|
||||
call_if_eq PetalburgCity_Gym_EventScript_WallysUncleFaceNormanEast
|
||||
call_if_eq PetalburgCity_Gym_EventScript_WallysDadFaceNormanEast
|
||||
compare VAR_0x8008, 3
|
||||
call_if_eq PetalburgCity_Gym_EventScript_WallysUncleFaceNormanWest
|
||||
call_if_eq PetalburgCity_Gym_EventScript_WallysDadFaceNormanWest
|
||||
msgbox PetalburgCity_Gym_Text_LetMeBorrowPlayer, MSGBOX_DEFAULT
|
||||
closemessage
|
||||
setflag FLAG_DONT_TRANSITION_MUSIC
|
||||
playbgm MUS_TSURETEK, 0
|
||||
compare VAR_0x8008, 1
|
||||
call_if_eq PetalburgCity_Gym_EventScript_ExitGymWithWallysUncleNorth
|
||||
call_if_eq PetalburgCity_Gym_EventScript_ExitGymWithWallysDadNorth
|
||||
compare VAR_0x8008, 2
|
||||
call_if_eq PetalburgCity_Gym_EventScript_ExitGymWithWallysUncleEast
|
||||
call_if_eq PetalburgCity_Gym_EventScript_ExitGymWithWallysDadEast
|
||||
compare VAR_0x8008, 3
|
||||
call_if_eq PetalburgCity_Gym_EventScript_ExitGymWithWallysUncleWest
|
||||
removeobject LOCALID_WALLYS_UNCLE
|
||||
call_if_eq PetalburgCity_Gym_EventScript_ExitGymWithWallysDadWest
|
||||
removeobject LOCALID_WALLYS_DAD
|
||||
setvar VAR_PETALBURG_CITY_STATE, 4
|
||||
clearflag FLAG_HIDE_PETALBURG_CITY_WALLYS_UNCLE
|
||||
clearflag FLAG_HIDE_PETALBURG_CITY_WALLYS_DAD
|
||||
warp MAP_PETALBURG_CITY, 255, 15, 8
|
||||
waitstate
|
||||
release
|
||||
end
|
||||
|
||||
PetalburgCity_Gym_EventScript_WallysUncleFaceNormanNorth:: @ 8204FCC
|
||||
applymovement LOCALID_WALLYS_UNCLE, Common_Movement_WalkInPlaceFastestUp
|
||||
PetalburgCity_Gym_EventScript_WallysDadFaceNormanNorth:: @ 8204FCC
|
||||
applymovement LOCALID_WALLYS_DAD, Common_Movement_WalkInPlaceFastestUp
|
||||
waitmovement 0
|
||||
return
|
||||
|
||||
PetalburgCity_Gym_EventScript_WallysUncleFaceNormanEast:: @ 8204FD7
|
||||
applymovement LOCALID_WALLYS_UNCLE, Common_Movement_WalkInPlaceFastestRight
|
||||
PetalburgCity_Gym_EventScript_WallysDadFaceNormanEast:: @ 8204FD7
|
||||
applymovement LOCALID_WALLYS_DAD, Common_Movement_WalkInPlaceFastestRight
|
||||
waitmovement 0
|
||||
return
|
||||
|
||||
PetalburgCity_Gym_EventScript_WallysUncleFaceNormanWest:: @ 8204FE2
|
||||
applymovement LOCALID_WALLYS_UNCLE, Common_Movement_WalkInPlaceFastestLeft
|
||||
PetalburgCity_Gym_EventScript_WallysDadFaceNormanWest:: @ 8204FE2
|
||||
applymovement LOCALID_WALLYS_DAD, Common_Movement_WalkInPlaceFastestLeft
|
||||
waitmovement 0
|
||||
return
|
||||
|
||||
PetalburgCity_Gym_EventScript_WallysUncleApproachPlayerNorth:: @ 8204FED
|
||||
applymovement LOCALID_WALLYS_UNCLE, PetalburgCity_Gym_Movement_WallysUncleApproachPlayerNorth
|
||||
PetalburgCity_Gym_EventScript_WallysDadApproachPlayerNorth:: @ 8204FED
|
||||
applymovement LOCALID_WALLYS_DAD, PetalburgCity_Gym_Movement_WallysDadApproachPlayerNorth
|
||||
waitmovement 0
|
||||
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft
|
||||
applymovement LOCALID_NORMAN, Common_Movement_WalkInPlaceFastestLeft
|
||||
waitmovement 0
|
||||
return
|
||||
|
||||
PetalburgCity_Gym_EventScript_WallysUncleApproachPlayerEast:: @ 8205009
|
||||
applymovement LOCALID_WALLYS_UNCLE, PetalburgCity_Gym_Movement_WallysUncleApproachPlayerEast
|
||||
PetalburgCity_Gym_EventScript_WallysDadApproachPlayerEast:: @ 8205009
|
||||
applymovement LOCALID_WALLYS_DAD, PetalburgCity_Gym_Movement_WallysDadApproachPlayerEast
|
||||
waitmovement 0
|
||||
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown
|
||||
applymovement LOCALID_NORMAN, Common_Movement_WalkInPlaceFastestDown
|
||||
waitmovement 0
|
||||
return
|
||||
|
||||
PetalburgCity_Gym_EventScript_WallysUncleApproachPlayerWest:: @ 8205025
|
||||
applymovement LOCALID_WALLYS_UNCLE, PetalburgCity_Gym_Movement_WallysUncleApproachPlayerWest
|
||||
PetalburgCity_Gym_EventScript_WallysDadApproachPlayerWest:: @ 8205025
|
||||
applymovement LOCALID_WALLYS_DAD, PetalburgCity_Gym_Movement_WallysDadApproachPlayerWest
|
||||
waitmovement 0
|
||||
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown
|
||||
applymovement LOCALID_NORMAN, Common_Movement_WalkInPlaceFastestDown
|
||||
waitmovement 0
|
||||
return
|
||||
|
||||
PetalburgCity_Gym_EventScript_ExitGymWithWallysUncleNorth:: @ 8205041
|
||||
applymovement LOCALID_WALLYS_UNCLE, PetalburgCity_Gym_Movement_WallysUncleExitNorth
|
||||
PetalburgCity_Gym_EventScript_ExitGymWithWallysDadNorth:: @ 8205041
|
||||
applymovement LOCALID_WALLYS_DAD, PetalburgCity_Gym_Movement_WallysDadExitNorth
|
||||
applymovement LOCALID_NORMAN, Common_Movement_WalkInPlaceFastestDown
|
||||
applymovement OBJ_EVENT_ID_PLAYER, PetalburgCity_Gym_Movement_PlayerExitWithWallysUncleNorth
|
||||
applymovement OBJ_EVENT_ID_PLAYER, PetalburgCity_Gym_Movement_PlayerExitWithWallysDadNorth
|
||||
waitmovement 0
|
||||
return
|
||||
|
||||
PetalburgCity_Gym_EventScript_ExitGymWithWallysUncleEast:: @ 820505A
|
||||
applymovement LOCALID_WALLYS_UNCLE, PetalburgCity_Gym_Movement_WallysUncleExitEast
|
||||
applymovement OBJ_EVENT_ID_PLAYER, PetalburgCity_Gym_Movement_PlayerExitWithWallysUncleEast
|
||||
PetalburgCity_Gym_EventScript_ExitGymWithWallysDadEast:: @ 820505A
|
||||
applymovement LOCALID_WALLYS_DAD, PetalburgCity_Gym_Movement_WallysDadExitEast
|
||||
applymovement OBJ_EVENT_ID_PLAYER, PetalburgCity_Gym_Movement_PlayerExitWithWallysDadEast
|
||||
waitmovement 0
|
||||
return
|
||||
|
||||
PetalburgCity_Gym_EventScript_ExitGymWithWallysUncleWest:: @ 820506C
|
||||
applymovement LOCALID_WALLYS_UNCLE, PetalburgCity_Gym_Movement_WallysUncleExitWest
|
||||
applymovement OBJ_EVENT_ID_PLAYER, PetalburgCity_Gym_Movement_PlayerExitWithWallysUncleWest
|
||||
PetalburgCity_Gym_EventScript_ExitGymWithWallysDadWest:: @ 820506C
|
||||
applymovement LOCALID_WALLYS_DAD, PetalburgCity_Gym_Movement_WallysDadExitWest
|
||||
applymovement OBJ_EVENT_ID_PLAYER, PetalburgCity_Gym_Movement_PlayerExitWithWallysDadWest
|
||||
waitmovement 0
|
||||
return
|
||||
|
||||
PetalburgCity_Gym_Movement_WallysUncleExitNorth: @ 820507E
|
||||
PetalburgCity_Gym_Movement_WallysDadExitNorth: @ 820507E
|
||||
walk_down
|
||||
walk_down
|
||||
walk_left
|
||||
@ -573,7 +573,7 @@ PetalburgCity_Gym_Movement_WallysUncleExitNorth: @ 820507E
|
||||
set_invisible
|
||||
step_end
|
||||
|
||||
PetalburgCity_Gym_Movement_WallysUncleExitEast: @ 8205089
|
||||
PetalburgCity_Gym_Movement_WallysDadExitEast: @ 8205089
|
||||
walk_down
|
||||
walk_down
|
||||
walk_left
|
||||
@ -586,7 +586,7 @@ PetalburgCity_Gym_Movement_WallysUncleExitEast: @ 8205089
|
||||
set_invisible
|
||||
step_end
|
||||
|
||||
PetalburgCity_Gym_Movement_WallysUncleExitWest: @ 8205094
|
||||
PetalburgCity_Gym_Movement_WallysDadExitWest: @ 8205094
|
||||
walk_down
|
||||
walk_down
|
||||
walk_left
|
||||
@ -601,7 +601,7 @@ PetalburgCity_Gym_Movement_WallysUncleExitWest: @ 8205094
|
||||
set_invisible
|
||||
step_end
|
||||
|
||||
PetalburgCity_Gym_Movement_PlayerExitWithWallysUncleNorth: @ 82050A1
|
||||
PetalburgCity_Gym_Movement_PlayerExitWithWallysDadNorth: @ 82050A1
|
||||
delay_16
|
||||
walk_down
|
||||
walk_down
|
||||
@ -611,7 +611,7 @@ PetalburgCity_Gym_Movement_PlayerExitWithWallysUncleNorth: @ 82050A1
|
||||
walk_down
|
||||
step_end
|
||||
|
||||
PetalburgCity_Gym_Movement_PlayerExitWithWallysUncleEast: @ 82050A9
|
||||
PetalburgCity_Gym_Movement_PlayerExitWithWallysDadEast: @ 82050A9
|
||||
delay_16
|
||||
walk_down
|
||||
walk_down
|
||||
@ -621,7 +621,7 @@ PetalburgCity_Gym_Movement_PlayerExitWithWallysUncleEast: @ 82050A9
|
||||
walk_down
|
||||
step_end
|
||||
|
||||
PetalburgCity_Gym_Movement_PlayerExitWithWallysUncleWest: @ 82050B1
|
||||
PetalburgCity_Gym_Movement_PlayerExitWithWallysDadWest: @ 82050B1
|
||||
delay_16
|
||||
walk_down
|
||||
walk_down
|
||||
@ -633,7 +633,7 @@ PetalburgCity_Gym_Movement_PlayerExitWithWallysUncleWest: @ 82050B1
|
||||
walk_down
|
||||
step_end
|
||||
|
||||
PetalburgCity_Gym_Movement_WallysUncleEnterGym: @ 82050BB
|
||||
PetalburgCity_Gym_Movement_WallysDadEnterGym: @ 82050BB
|
||||
walk_up
|
||||
delay_8
|
||||
walk_in_place_fastest_right
|
||||
@ -643,7 +643,7 @@ PetalburgCity_Gym_Movement_WallysUncleEnterGym: @ 82050BB
|
||||
walk_in_place_fastest_up
|
||||
step_end
|
||||
|
||||
PetalburgCity_Gym_Movement_WallysUncleApproachPlayerNorth: @ 82050C3
|
||||
PetalburgCity_Gym_Movement_WallysDadApproachPlayerNorth: @ 82050C3
|
||||
walk_right
|
||||
walk_right
|
||||
walk_up
|
||||
@ -652,7 +652,7 @@ PetalburgCity_Gym_Movement_WallysUncleApproachPlayerNorth: @ 82050C3
|
||||
walk_in_place_fastest_right
|
||||
step_end
|
||||
|
||||
PetalburgCity_Gym_Movement_WallysUncleApproachPlayerEast: @ 82050CA
|
||||
PetalburgCity_Gym_Movement_WallysDadApproachPlayerEast: @ 82050CA
|
||||
walk_right
|
||||
walk_right
|
||||
walk_up
|
||||
@ -660,7 +660,7 @@ PetalburgCity_Gym_Movement_WallysUncleApproachPlayerEast: @ 82050CA
|
||||
walk_up
|
||||
step_end
|
||||
|
||||
PetalburgCity_Gym_Movement_WallysUncleApproachPlayerWest: @ 82050D0
|
||||
PetalburgCity_Gym_Movement_WallysDadApproachPlayerWest: @ 82050D0
|
||||
walk_right
|
||||
walk_right
|
||||
walk_up
|
||||
|
||||
@ -24,7 +24,7 @@
|
||||
"movement_range_y": 0,
|
||||
"trainer_type": "TRAINER_TYPE_NONE",
|
||||
"trainer_sight_or_berry_tree_id": "0",
|
||||
"script": "PetalburgCity_WallysHouse_EventScript_WallyUncle",
|
||||
"script": "PetalburgCity_WallysHouse_EventScript_WallysDad",
|
||||
"flag": "0"
|
||||
},
|
||||
{
|
||||
@ -37,7 +37,7 @@
|
||||
"movement_range_y": 0,
|
||||
"trainer_type": "TRAINER_TYPE_NONE",
|
||||
"trainer_sight_or_berry_tree_id": "0",
|
||||
"script": "PetalburgCity_WallysHouse_EventScript_WallyAunt",
|
||||
"script": "PetalburgCity_WallysHouse_EventScript_WallysMom",
|
||||
"flag": "0"
|
||||
}
|
||||
],
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
.set LOCALID_WALLYS_UNCLE, 1
|
||||
.set LOCALID_WALLYS_DAD, 1
|
||||
|
||||
PetalburgCity_WallysHouse_MapScripts:: @ 8204229
|
||||
map_script MAP_SCRIPT_ON_FRAME_TABLE, PetalburgCity_WallysHouse_OnFrame
|
||||
@ -6,12 +6,12 @@ PetalburgCity_WallysHouse_MapScripts:: @ 8204229
|
||||
.byte 0
|
||||
|
||||
PetalburgCity_WallysHouse_OnWarp: @ 8204234
|
||||
map_script_2 VAR_PETALBURG_CITY_STATE, 4, PetalburgCity_WallysHouse_EventScript_PlayerUncleFaceEachOther
|
||||
map_script_2 VAR_PETALBURG_CITY_STATE, 4, PetalburgCity_WallysHouse_EventScript_PlayerWallysDadFaceEachOther
|
||||
.2byte 0
|
||||
|
||||
PetalburgCity_WallysHouse_EventScript_PlayerUncleFaceEachOther:: @ 820423E
|
||||
PetalburgCity_WallysHouse_EventScript_PlayerWallysDadFaceEachOther:: @ 820423E
|
||||
turnobject OBJ_EVENT_ID_PLAYER, DIR_EAST
|
||||
turnobject LOCALID_WALLYS_UNCLE, DIR_WEST
|
||||
turnobject LOCALID_WALLYS_DAD, DIR_WEST
|
||||
end
|
||||
|
||||
PetalburgCity_WallysHouse_OnFrame: @ 8204247
|
||||
@ -28,7 +28,7 @@ PetalburgCity_WallysHouse_EventScript_GiveHM03Surf:: @ 8204251
|
||||
releaseall
|
||||
end
|
||||
|
||||
PetalburgCity_WallysHouse_EventScript_WallyUncle:: @ 8204278
|
||||
PetalburgCity_WallysHouse_EventScript_WallysDad:: @ 8204278
|
||||
lock
|
||||
faceplayer
|
||||
goto_if_set FLAG_DEFEATED_WALLY_VICTORY_ROAD, PetalburgCity_WallysHouse_EventScript_DefeatedWallyInVictoryRoad
|
||||
@ -54,7 +54,7 @@ PetalburgCity_WallysHouse_EventScript_PlayedWithWally:: @ 82042B6
|
||||
release
|
||||
end
|
||||
|
||||
PetalburgCity_WallysHouse_EventScript_WallyAunt:: @ 82042C0
|
||||
PetalburgCity_WallysHouse_EventScript_WallysMom:: @ 82042C0
|
||||
lock
|
||||
faceplayer
|
||||
goto_if_set FLAG_RECEIVED_HM03, PetalburgCity_WallysHouse_EventScript_ReceivedHM03Surf
|
||||
|
||||
@ -448,7 +448,7 @@ Route110_EventScript_MayDefeated:: @ 81EF84A
|
||||
end
|
||||
|
||||
Route110_EventScript_BrendanBattle:: @ 81EF865
|
||||
msgbox Route110_Text_BrendayLetsBattle, MSGBOX_DEFAULT
|
||||
msgbox Route110_Text_BrendanLetsBattle, MSGBOX_DEFAULT
|
||||
switch VAR_STARTER_MON
|
||||
case 0, Route110_EventScript_BrendanBattleTreecko
|
||||
case 1, Route110_EventScript_BrendanBattleTorchic
|
||||
@ -814,7 +814,7 @@ Route110_Text_MayExplainItemfinder: @ 81EFD58
|
||||
.string "me, but I think you should train a lot\l"
|
||||
.string "harder for the next time.$"
|
||||
|
||||
Route110_Text_BrendayLetsBattle: @ 81EFE3F
|
||||
Route110_Text_BrendanLetsBattle: @ 81EFE3F
|
||||
.string "BRENDAN: Hey, {PLAYER}.\n"
|
||||
.string "So this is where you were.\l"
|
||||
.string "How's it going?\p"
|
||||
|
||||
@ -23,8 +23,8 @@ TrainerHill_Entrance_OnWarp: @ 82680CF
|
||||
TrainerHill_Entrance_OnResume: @ 82680D0
|
||||
trainerhill_resumetimer
|
||||
setvar VAR_TEMP_0, 0
|
||||
trainerhill_clearresult
|
||||
compare VAR_RESULT, 0 @ VAR_RESULT always 0 here
|
||||
trainerhill_getusingereader
|
||||
compare VAR_RESULT, FALSE @ VAR_RESULT always FALSE here
|
||||
goto_if_eq TrainerHill_Entrance_EventScript_TryFaceAttendant
|
||||
setobjectxy OBJ_EVENT_ID_PLAYER, 9, 6
|
||||
applymovement OBJ_EVENT_ID_PLAYER, TrainerHill_Entrance_Movement_PlayerFaceAttendant
|
||||
|
||||
@ -542,7 +542,7 @@ ContestHall_EventScript_AudienceHeartEmotes:: @ 827A34F
|
||||
|
||||
ContestHall_EventScript_DisplayHearts:: @ 827A3E5
|
||||
setvar VAR_RESULT, 8
|
||||
special ScriptRandom
|
||||
special GenerateContestRand
|
||||
compare VAR_RESULT, 0
|
||||
call_if_eq ContestHall_EventScript_TryDisplayHeartAudienceMember1
|
||||
compare VAR_RESULT, 1
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
|
||||
@ Interact with cuttable tree
|
||||
EventScript_CutTree:: @ 82906BB
|
||||
lockall
|
||||
goto_if_unset FLAG_BADGE01_GET, EventScript_CheckTreeCantCut
|
||||
@ -18,7 +18,8 @@ EventScript_CutTree:: @ 82906BB
|
||||
goto EventScript_CutTreeDown
|
||||
end
|
||||
|
||||
EventScript_FldEffCut:: @ 8290705
|
||||
@ Use cut from party menu
|
||||
EventScript_UseCut:: @ 8290705
|
||||
lockall
|
||||
dofieldeffect FLDEFF_USE_CUT_ON_TREE
|
||||
waitstate
|
||||
@ -58,6 +59,7 @@ Text_CantCut: @ 829077D
|
||||
.string "This tree looks like it can be\n"
|
||||
.string "CUT down!$"
|
||||
|
||||
@ Interact with smashable rock
|
||||
EventScript_RockSmash:: @ 82907A6
|
||||
lockall
|
||||
goto_if_unset FLAG_BADGE03_GET, EventScript_CantSmashRock
|
||||
@ -77,7 +79,8 @@ EventScript_RockSmash:: @ 82907A6
|
||||
goto EventScript_SmashRock
|
||||
end
|
||||
|
||||
EventScript_FldEffRockSmash:: @ 82907F0
|
||||
@ Use rock smash from party menu
|
||||
EventScript_UseRockSmash:: @ 82907F0
|
||||
lockall
|
||||
dofieldeffect FLDEFF_USE_ROCK_SMASH
|
||||
waitstate
|
||||
@ -89,10 +92,10 @@ EventScript_SmashRock:: @ 82907FB
|
||||
waitmovement 0
|
||||
removeobject VAR_LAST_TALKED
|
||||
specialvar VAR_RESULT, TryUpdateRusturfTunnelState
|
||||
compare VAR_RESULT, 1
|
||||
compare VAR_RESULT, TRUE
|
||||
goto_if_eq EventScript_EndSmash
|
||||
special RockSmashWildEncounter
|
||||
compare VAR_RESULT, 0
|
||||
compare VAR_RESULT, FALSE
|
||||
goto_if_eq EventScript_EndSmash
|
||||
waitstate
|
||||
releaseall
|
||||
@ -141,7 +144,7 @@ EventScript_StrengthBoulder:: @ 82908BA
|
||||
goto EventScript_ActivateStrength
|
||||
end
|
||||
|
||||
EventScript_FldEffStrength:: @ 82908FD
|
||||
EventScript_UseStrength:: @ 82908FD
|
||||
lockall
|
||||
dofieldeffect FLDEFF_USE_STRENGTH
|
||||
waitstate
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
EventScript_FldEffFlash:: @ 82926F8
|
||||
EventScript_UseFlash:: @ 82926F8
|
||||
animateflash 1
|
||||
setflashradius 1
|
||||
end
|
||||
|
||||
@ -115,7 +115,7 @@ EventScript_ResetAllMapFlags:: @ 82715DE
|
||||
setflag FLAG_HIDE_LILYCOVE_MUSEUM_PATRON_4
|
||||
setflag FLAG_HIDE_LILYCOVE_MUSEUM_TOURISTS
|
||||
setflag FLAG_HIDE_PETALBURG_GYM_GREETER
|
||||
setflag FLAG_HIDE_PETALBURG_GYM_WALLYS_UNCLE
|
||||
setflag FLAG_HIDE_PETALBURG_GYM_WALLYS_DAD
|
||||
setflag FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_BRENDAN
|
||||
setflag FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_MAY
|
||||
setflag FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_RIVAL_BEDROOM
|
||||
@ -142,7 +142,7 @@ EventScript_ResetAllMapFlags:: @ 82715DE
|
||||
setflag FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_WALLYS_UNCLE
|
||||
setflag FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_WANDA
|
||||
setflag FLAG_HIDE_VERDANTURF_TOWN_SCOTT
|
||||
setflag FLAG_HIDE_PETALBURG_CITY_WALLYS_UNCLE
|
||||
setflag FLAG_HIDE_PETALBURG_CITY_WALLYS_DAD
|
||||
setflag FLAG_HIDE_PETALBURG_GYM_WALLY
|
||||
setflag FLAG_HIDE_SLATEPORT_CITY_STERNS_SHIPYARD_MR_BRINEY
|
||||
setflag FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_ARCHIE
|
||||
|
||||
@ -6,7 +6,7 @@ Roulette_EventScript_Table1:: @ 82A5AB1
|
||||
getpricereduction POKENEWS_GAME_CORNER
|
||||
compare VAR_RESULT, FALSE
|
||||
goto_if_eq Roulette_EventScript_Play
|
||||
addvar VAR_0x8004, 128
|
||||
addvar VAR_0x8004, ROULETTE_SPECIAL_RATE
|
||||
goto Roulette_EventScript_Play
|
||||
end
|
||||
|
||||
@ -18,7 +18,7 @@ Roulette_EventScript_Table2:: @ 82A5ADF
|
||||
getpricereduction POKENEWS_GAME_CORNER
|
||||
compare VAR_RESULT, FALSE
|
||||
goto_if_eq Roulette_EventScript_Play
|
||||
addvar VAR_0x8004, 128
|
||||
addvar VAR_0x8004, ROULETTE_SPECIAL_RATE
|
||||
goto Roulette_EventScript_Play
|
||||
end
|
||||
|
||||
|
||||
@ -32,8 +32,8 @@ EventScript_TrainerHillTimer:: @ 82C8393
|
||||
|
||||
TrainerHill_1F_EventScript_DummyWarpToEntranceCounter:: @ 82C83A6
|
||||
setvar VAR_TEMP_2, 1
|
||||
trainerhill_clearresult
|
||||
compare VAR_RESULT, 1 @ VAR_RESULT always 0 here
|
||||
trainerhill_getusingereader
|
||||
compare VAR_RESULT, TRUE @ VAR_RESULT always FALSE here
|
||||
goto_if_eq TrainerHill_1F_EventScript_WarpSilentToEntranceCounter
|
||||
end
|
||||
|
||||
|
||||
@ -149,7 +149,7 @@ gSpecials:: @ 81DBA64
|
||||
def_special SaveMuseumContestPainting
|
||||
def_special DoesContestCategoryHaveWinner
|
||||
def_special CountPlayerContestPaintings
|
||||
def_special ShowContestWinner
|
||||
def_special ShowContestWinnerPainting
|
||||
def_special MauvilleGymSetDefaultBarriers
|
||||
def_special MauvilleGymPressSwitch
|
||||
def_special ShowFieldMessageStringVar4
|
||||
@ -336,7 +336,7 @@ gSpecials:: @ 81DBA64
|
||||
def_special BattleSetup_StartLatiBattle
|
||||
def_special SetRoute119Weather
|
||||
def_special SetRoute123Weather
|
||||
def_special ScriptGetMultiplayerId
|
||||
def_special GetContestMultiplayerId
|
||||
def_special ScriptGetPartyMonSpecies
|
||||
def_special IsSelectedMonEgg
|
||||
def_special TryInitBattleTowerAwardManObjectEvent
|
||||
@ -350,7 +350,7 @@ gSpecials:: @ 81DBA64
|
||||
def_special BufferLottoTicketNumber
|
||||
def_special TryHideBattleTowerReporter
|
||||
def_special DoesPartyHaveEnigmaBerry
|
||||
def_special ScriptRandom
|
||||
def_special GenerateContestRand
|
||||
def_special SetChampionSaveWarp
|
||||
def_special TryPutTreasureInvestigatorsOnAir
|
||||
def_special TryPutLotteryWinnerReportOnAir
|
||||
|
||||
@ -2436,7 +2436,7 @@ gTVSafariFanClubText10:: @ 08289D33
|
||||
.string "and make the challenge yourself!\p"
|
||||
.string "Until next time, cheerio!$"
|
||||
|
||||
gTVContestLiveUpdatesText00:: @ 08289DD6
|
||||
ContestLiveUpdates_Text_Intro:: @ 08289DD6
|
||||
.string "“POKéMON CONTEST LIVE UPDATES!”\p"
|
||||
.string "MC: Thanks for joining us!\p"
|
||||
.string "We're live from the just-ended\n"
|
||||
@ -2455,117 +2455,117 @@ gTVContestLiveUpdatesText00:: @ 08289DD6
|
||||
.string "MC: Let's hear what the fans have\n"
|
||||
.string "to say about this CONTEST.$"
|
||||
|
||||
gTVContestLiveUpdatesText01:: @ 08289F53
|
||||
ContestLiveUpdates_Text_WonBothRounds:: @ 08289F53
|
||||
.string "Spectator: The {STR_VAR_2} was tops in\n"
|
||||
.string "both primary and secondary judging!\p"
|
||||
.string "That {STR_VAR_2} will keep winning!$"
|
||||
|
||||
gTVContestLiveUpdatesText02:: @ 08289FB0
|
||||
ContestLiveUpdates_Text_BetterRound2:: @ 08289FB0
|
||||
.string "Spectator: The {STR_VAR_2} didn't do\n"
|
||||
.string "well in the primary judging, but it\l"
|
||||
.string "cleaned up in the secondary judging!\p"
|
||||
.string "It was a miraculous comeback\n"
|
||||
.string "for that {STR_VAR_2}. Yippee!$"
|
||||
|
||||
gTVContestLiveUpdatesText03:: @ 0828A047
|
||||
ContestLiveUpdates_Text_EqualRounds:: @ 0828A047
|
||||
.string "Spectator: The {STR_VAR_2} remained\n"
|
||||
.string "consistent throughout both primary\l"
|
||||
.string "and secondary judging.\p"
|
||||
.string "{STR_VAR_3} and the {STR_VAR_2},\n"
|
||||
.string "they're no ordinary combo!$"
|
||||
|
||||
gTVContestLiveUpdatesText04:: @ 0828A0C6
|
||||
ContestLiveUpdates_Text_BetterRound1:: @ 0828A0C6
|
||||
.string "Spectator: In terms of being {STR_VAR_1},\n"
|
||||
.string "that {STR_VAR_2} was outstanding.\p"
|
||||
.string "I hope it makes better appeals\n"
|
||||
.string "next time, though.$"
|
||||
|
||||
gTVContestLiveUpdatesText05:: @ 0828A132
|
||||
ContestLiveUpdates_Text_GotNervous:: @ 0828A132
|
||||
.string "Spectator: When the {STR_VAR_2} got\n"
|
||||
.string "nervous, I couldn't stop myself from\l"
|
||||
.string "shouting encouragement.\p"
|
||||
.string "I'd like to say this to that\n"
|
||||
.string "{STR_VAR_2}, “Congratulations!”$"
|
||||
|
||||
gTVContestLiveUpdatesText06:: @ 0828A1BE
|
||||
ContestLiveUpdates_Text_StartledFoes:: @ 0828A1BE
|
||||
.string "Spectator: That {STR_VAR_2}'s appeal\n"
|
||||
.string "startled even me!\p"
|
||||
.string "{STR_VAR_2}, you were awesome!$"
|
||||
|
||||
gTVContestLiveUpdatesText07:: @ 0828A202
|
||||
ContestLiveUpdates_Text_UsedCombo:: @ 0828A202
|
||||
.string "Spectator: That {STR_VAR_2}'s combo\n"
|
||||
.string "appeal was stunning!\p"
|
||||
.string "It's shaken me to the core!$"
|
||||
|
||||
gTVContestLiveUpdatesText08:: @ 0828A24E
|
||||
ContestLiveUpdates_Text_ExcitingAppeal:: @ 0828A24E
|
||||
.string "Spectator: The winning {STR_VAR_2}'s\n"
|
||||
.string "appeal got my heart pounding!$"
|
||||
|
||||
gTVContestLiveUpdatesText09:: @ 0828A288
|
||||
ContestLiveUpdates_Text_WasCool:: @ 0828A288
|
||||
.string "{STR_VAR_2}!\n"
|
||||
.string "You were cool!$"
|
||||
|
||||
gTVContestLiveUpdatesText10:: @ 0828A29B
|
||||
ContestLiveUpdates_Text_WasBeautiful:: @ 0828A29B
|
||||
.string "{STR_VAR_2}!\n"
|
||||
.string "You were beautiful!$"
|
||||
|
||||
gTVContestLiveUpdatesText11:: @ 0828A2B3
|
||||
ContestLiveUpdates_Text_WasCute:: @ 0828A2B3
|
||||
.string "{STR_VAR_2}!\n"
|
||||
.string "You were cute!$"
|
||||
|
||||
gTVContestLiveUpdatesText12:: @ 0828A2C6
|
||||
ContestLiveUpdates_Text_WasSmart:: @ 0828A2C6
|
||||
.string "{STR_VAR_2}!\n"
|
||||
.string "You were smart!$"
|
||||
|
||||
gTVContestLiveUpdatesText13:: @ 0828A2DA
|
||||
ContestLiveUpdates_Text_WasTough:: @ 0828A2DA
|
||||
.string "{STR_VAR_2}!\n"
|
||||
.string "You were tough!$"
|
||||
|
||||
gTVContestLiveUpdatesText14:: @ 0828A2EE
|
||||
ContestLiveUpdates_Text_VeryExcitingAppeal:: @ 0828A2EE
|
||||
.string "Spectator: The winning {STR_VAR_2}'s\n"
|
||||
.string "appeal still has my heart pounding!$"
|
||||
|
||||
gTVContestLiveUpdatesText15:: @ 0828A32E
|
||||
ContestLiveUpdates_Text_VeryCool:: @ 0828A32E
|
||||
.string "{STR_VAR_2}!\n"
|
||||
.string "You're the last word in cool!$"
|
||||
|
||||
gTVContestLiveUpdatesText16:: @ 0828A350
|
||||
ContestLiveUpdates_Text_VeryBeautiful:: @ 0828A350
|
||||
.string "{STR_VAR_2}!\n"
|
||||
.string "You're the most beautiful!$"
|
||||
|
||||
gTVContestLiveUpdatesText17:: @ 0828A36F
|
||||
ContestLiveUpdates_Text_VeryCute:: @ 0828A36F
|
||||
.string "{STR_VAR_2}!\n"
|
||||
.string "You're simply the cutest!$"
|
||||
|
||||
gTVContestLiveUpdatesText18:: @ 0828A38D
|
||||
ContestLiveUpdates_Text_VerySmart:: @ 0828A38D
|
||||
.string "{STR_VAR_2}!\n"
|
||||
.string "You're the smartest among the smart!$"
|
||||
|
||||
gTVContestLiveUpdatesText19:: @ 0828A3B6
|
||||
ContestLiveUpdates_Text_VeryTough:: @ 0828A3B6
|
||||
.string "{STR_VAR_2}!\n"
|
||||
.string "You're the toughest of the tough!$"
|
||||
|
||||
gTVContestLiveUpdatesText20:: @ 0828A3DC
|
||||
ContestLiveUpdates_Text_TookBreak:: @ 0828A3DC
|
||||
.string "Spectator: Even when the {STR_VAR_2}\n"
|
||||
.string "took a break from making appeals,\l"
|
||||
.string "I couldn't take my eyes off it.\p"
|
||||
.string "I'm captivated by that {STR_VAR_2}.$"
|
||||
|
||||
gTVContestLiveUpdatesText21:: @ 0828A455
|
||||
ContestLiveUpdates_Text_GotStartled:: @ 0828A455
|
||||
.string "Spectator: When the {STR_VAR_2} was\n"
|
||||
.string "startled by another POKéMON's appeal,\l"
|
||||
.string "I was close to tears.\p"
|
||||
.string "{STR_VAR_2}, you were resilient!\n"
|
||||
.string "Way to go!$"
|
||||
|
||||
gTVContestLiveUpdatesText22:: @ 0828A4CF
|
||||
ContestLiveUpdates_Text_MoveWonderful:: @ 0828A4CF
|
||||
.string "Spectator: Oh…\n"
|
||||
.string "That {STR_VAR_2}'s {STR_VAR_3}!\l"
|
||||
.string "{STR_VAR_2}'s {STR_VAR_3}!\l"
|
||||
.string "{STR_VAR_2}'s {STR_VAR_3}!\l"
|
||||
.string "How could it be so wonderful?$"
|
||||
|
||||
gTVContestLiveUpdatesText23:: @ 0828A51C
|
||||
ContestLiveUpdates_Text_TalkAboutAnotherMon:: @ 0828A51C
|
||||
.string "MC: Well, there you have it. This place\n"
|
||||
.string "is full of the {STR_VAR_1}'s fans!\p"
|
||||
.string "I should also mention that another\n"
|
||||
@ -2573,20 +2573,20 @@ gTVContestLiveUpdatesText23:: @ 0828A51C
|
||||
.string "caught my eye.\p"
|
||||
.string "{STR_VAR_2}'s {STR_VAR_3}…$"
|
||||
|
||||
gTVContestLiveUpdatesText24:: @ 0828A5AC
|
||||
ContestLiveUpdates_Text_FailedToAppeal:: @ 0828A5AC
|
||||
.string "It failed to make a single appeal during\n"
|
||||
.string "secondary judging out of nervousness.\p"
|
||||
.string "Next time, I would like to see this\n"
|
||||
.string "{STR_VAR_1} make even one appeal.$"
|
||||
|
||||
gTVContestLiveUpdatesText25:: @ 0828A638
|
||||
ContestLiveUpdates_Text_LastInBothRounds:: @ 0828A638
|
||||
.string "It came dead last in both primary\n"
|
||||
.string "and secondary judging.\p"
|
||||
.string "I hope that {STR_VAR_1} will retrain this\n"
|
||||
.string "{STR_VAR_2} and erase the shame of\l"
|
||||
.string "this undisputed last-place finish.$"
|
||||
|
||||
gTVContestLiveUpdatesText26:: @ 0828A6CF
|
||||
ContestLiveUpdates_Text_NotExcitingEnough:: @ 0828A6CF
|
||||
.string "It failed to take advantage of\n"
|
||||
.string "the audience's excitement and make\l"
|
||||
.string "an appropriate appeal.\p"
|
||||
@ -2594,7 +2594,7 @@ gTVContestLiveUpdatesText26:: @ 0828A6CF
|
||||
.string "a feel for the audience and whip their\l"
|
||||
.string "excitement to a fever pitch next time.$"
|
||||
|
||||
gTVContestLiveUpdatesText27:: @ 0828A797
|
||||
ContestLiveUpdates_Text_LostAfterWinningRound1:: @ 0828A797
|
||||
.string "While finishing first in the primary\n"
|
||||
.string "judging, its appeals in the secondary\l"
|
||||
.string "judging failed to click.\p"
|
||||
@ -2603,14 +2603,14 @@ gTVContestLiveUpdatesText27:: @ 0828A797
|
||||
.string "I'm sure {STR_VAR_1} is studying how to\n"
|
||||
.string "make more effective appeals now.$"
|
||||
|
||||
gTVContestLiveUpdatesText28:: @ 0828A86D
|
||||
ContestLiveUpdates_Text_NeverExciting:: @ 0828A86D
|
||||
.string "The audience never got excited by its\n"
|
||||
.string "appeals during the secondary judging.\p"
|
||||
.string "We hope it will stop worrying about\n"
|
||||
.string "other POKéMON and learn to pitch\l"
|
||||
.string "its appeals to the audience more.$"
|
||||
|
||||
gTVContestLiveUpdatesText29:: @ 0828A920
|
||||
ContestLiveUpdates_Text_LostBySmallMargin:: @ 0828A920
|
||||
.string "It lost to {STR_VAR_1}'s {STR_VAR_2}\n"
|
||||
.string "by only a small margin.\p"
|
||||
.string "It must be heartbreaking to come\n"
|
||||
@ -2618,7 +2618,7 @@ gTVContestLiveUpdatesText29:: @ 0828A920
|
||||
.string "I wouldn't be surprised if {STR_VAR_3}\n"
|
||||
.string "were weeping over this outcome.$"
|
||||
|
||||
gTVContestLiveUpdatesText30:: @ 0828A9CC
|
||||
ContestLiveUpdates_Text_RepeatedAppeals:: @ 0828A9CC
|
||||
.string "It disappointed the JUDGE by\n"
|
||||
.string "repeating the same appeals.\p"
|
||||
.string "It's an unforgivable error in any\n"
|
||||
@ -2626,14 +2626,14 @@ gTVContestLiveUpdatesText30:: @ 0828A9CC
|
||||
.string "{STR_VAR_1} should feel guilty for\n"
|
||||
.string "this sorry showing.$"
|
||||
|
||||
gTVContestLiveUpdatesText31:: @ 0828AA74
|
||||
ContestLiveUpdates_Text_ValiantEffortButLost:: @ 0828AA74
|
||||
.string "{STR_VAR_1} turned in a valiant effort,\n"
|
||||
.string "but…\p"
|
||||
.string "It was all for naught, finishing last.\p"
|
||||
.string "{STR_VAR_1} should learn from this loss\n"
|
||||
.string "and put the knowledge to good use.$"
|
||||
|
||||
gTVContestLiveUpdatesText32:: @ 0828AB01
|
||||
ContestLiveUpdates_Text_Outro:: @ 0828AB01
|
||||
.string "I'd like to end this program with our\n"
|
||||
.string "usual farewell to the winners.\p"
|
||||
.string "This time, it's {STR_VAR_1} and\n"
|
||||
|
||||
36
gflib/io_reg.c
Normal file
36
gflib/io_reg.c
Normal file
@ -0,0 +1,36 @@
|
||||
#include "global.h"
|
||||
#include "io_reg.h"
|
||||
#include "gba/io_reg.h"
|
||||
|
||||
static const u32 sUnused[] = {
|
||||
0,
|
||||
0,
|
||||
(1 << 26) | (1 << 3),
|
||||
(1 << 26) | (1 << 3) | (1 << 1),
|
||||
(1 << 26) | (1 << 3) | (1 << 2),
|
||||
(1 << 26) | (1 << 3) | (1 << 2) | (1 << 1),
|
||||
(1 << 26) | (1 << 4),
|
||||
(1 << 26) | (1 << 4) | (1 << 2),
|
||||
(1 << 26) | (1 << 4) | (1 << 3),
|
||||
(1 << 26) | (1 << 4) | (1 << 3) | (1 << 2),
|
||||
(1 << 26) | (1 << 4) | (1 << 1),
|
||||
(1 << 26) | (1 << 4) | (1 << 2) | (1 << 1),
|
||||
(1 << 26) | (1 << 4) | (1 << 3) | (1 << 1),
|
||||
(1 << 26) | (1 << 4) | (1 << 3) | (1 << 2) | (1 << 1),
|
||||
(1 << 25) | (1 << 8),
|
||||
(1 << 27) | (1 << 10),
|
||||
};
|
||||
|
||||
const u16 gOverworldBackgroundLayerFlags[] = {
|
||||
BLDCNT_TGT2_BG0,
|
||||
BLDCNT_TGT2_BG1,
|
||||
BLDCNT_TGT2_BG2,
|
||||
BLDCNT_TGT2_BG3,
|
||||
};
|
||||
|
||||
const u16 gOrbEffectBackgroundLayerFlags[] = {
|
||||
BLDCNT_TGT1_BG0,
|
||||
BLDCNT_TGT1_BG1,
|
||||
BLDCNT_TGT1_BG2,
|
||||
BLDCNT_TGT1_BG3,
|
||||
};
|
||||
7
gflib/io_reg.h
Normal file
7
gflib/io_reg.h
Normal file
@ -0,0 +1,7 @@
|
||||
#ifndef GUARD_IO_REG_H
|
||||
#define GUARD_IO_REG_H
|
||||
|
||||
extern const u16 gOverworldBackgroundLayerFlags[];
|
||||
extern const u16 gOrbEffectBackgroundLayerFlags[];
|
||||
|
||||
#endif // GUARD_IO_REG_H
|
||||
@ -342,50 +342,61 @@ u8 *StringExpandPlaceholders(u8 *dest, const u8 *src)
|
||||
|
||||
switch (c)
|
||||
{
|
||||
case PLACEHOLDER_BEGIN:
|
||||
placeholderId = *src++;
|
||||
expandedString = GetExpandedPlaceholder(placeholderId);
|
||||
dest = StringExpandPlaceholders(dest, expandedString);
|
||||
break;
|
||||
case EXT_CTRL_CODE_BEGIN:
|
||||
*dest++ = c;
|
||||
c = *src++;
|
||||
*dest++ = c;
|
||||
case PLACEHOLDER_BEGIN:
|
||||
placeholderId = *src++;
|
||||
expandedString = GetExpandedPlaceholder(placeholderId);
|
||||
dest = StringExpandPlaceholders(dest, expandedString);
|
||||
break;
|
||||
case EXT_CTRL_CODE_BEGIN:
|
||||
*dest++ = c;
|
||||
c = *src++;
|
||||
*dest++ = c;
|
||||
|
||||
switch (c)
|
||||
{
|
||||
case 0x07:
|
||||
case 0x09:
|
||||
case 0x0F:
|
||||
case 0x15:
|
||||
case 0x16:
|
||||
case 0x17:
|
||||
case 0x18:
|
||||
break;
|
||||
case 0x04:
|
||||
*dest++ = *src++;
|
||||
case 0x0B:
|
||||
*dest++ = *src++;
|
||||
default:
|
||||
*dest++ = *src++;
|
||||
}
|
||||
switch (c)
|
||||
{
|
||||
case EXT_CTRL_CODE_RESET_SIZE:
|
||||
case EXT_CTRL_CODE_PAUSE_UNTIL_PRESS:
|
||||
case EXT_CTRL_CODE_FILL_WINDOW:
|
||||
case EXT_CTRL_CODE_JPN:
|
||||
case EXT_CTRL_CODE_ENG:
|
||||
case EXT_CTRL_CODE_PAUSE_MUSIC:
|
||||
case EXT_CTRL_CODE_RESUME_MUSIC:
|
||||
break;
|
||||
case EOS:
|
||||
*dest = EOS;
|
||||
return dest;
|
||||
case CHAR_PROMPT_SCROLL:
|
||||
case CHAR_PROMPT_CLEAR:
|
||||
case CHAR_NEWLINE:
|
||||
case EXT_CTRL_CODE_COLOR_HIGHLIGHT_SHADOW:
|
||||
*dest++ = *src++;
|
||||
case EXT_CTRL_CODE_PLAY_BGM:
|
||||
*dest++ = *src++;
|
||||
default:
|
||||
*dest++ = c;
|
||||
*dest++ = *src++;
|
||||
}
|
||||
break;
|
||||
case EOS:
|
||||
*dest = EOS;
|
||||
return dest;
|
||||
case CHAR_PROMPT_SCROLL:
|
||||
case CHAR_PROMPT_CLEAR:
|
||||
case CHAR_NEWLINE:
|
||||
default:
|
||||
*dest++ = c;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
u8 *StringBraille(u8 *dest, const u8 *src)
|
||||
{
|
||||
u8 setBrailleFont[] = { EXT_CTRL_CODE_BEGIN, 0x06, 0x06, EOS };
|
||||
u8 gotoLine2[] = { CHAR_NEWLINE, EXT_CTRL_CODE_BEGIN, 0x0E, 0x02, EOS };
|
||||
const u8 setBrailleFont[] = {
|
||||
EXT_CTRL_CODE_BEGIN,
|
||||
EXT_CTRL_CODE_SIZE,
|
||||
6,
|
||||
EOS
|
||||
};
|
||||
const u8 gotoLine2[] = {
|
||||
CHAR_NEWLINE,
|
||||
EXT_CTRL_CODE_BEGIN,
|
||||
EXT_CTRL_CODE_SHIFT_DOWN,
|
||||
2,
|
||||
EOS
|
||||
};
|
||||
|
||||
dest = StringCopy(dest, setBrailleFont);
|
||||
|
||||
@ -395,16 +406,16 @@ u8 *StringBraille(u8 *dest, const u8 *src)
|
||||
|
||||
switch (c)
|
||||
{
|
||||
case EOS:
|
||||
*dest = c;
|
||||
return dest;
|
||||
case CHAR_NEWLINE:
|
||||
dest = StringCopy(dest, gotoLine2);
|
||||
break;
|
||||
default:
|
||||
*dest++ = c;
|
||||
*dest++ = c + 0x40;
|
||||
break;
|
||||
case EOS:
|
||||
*dest = c;
|
||||
return dest;
|
||||
case CHAR_NEWLINE:
|
||||
dest = StringCopy(dest, gotoLine2);
|
||||
break;
|
||||
default:
|
||||
*dest++ = c;
|
||||
*dest++ = c + 0x40;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -564,7 +575,7 @@ u8 *StringCopyN_Multibyte(u8 *dest, u8 *src, u32 n)
|
||||
else
|
||||
{
|
||||
*dest++ = *src++;
|
||||
if (*(src - 1) == CHAR_SPECIAL_F9)
|
||||
if (*(src - 1) == CHAR_EXTRA_SYMBOL)
|
||||
*dest++ = *src++;
|
||||
}
|
||||
}
|
||||
@ -579,7 +590,7 @@ u32 StringLength_Multibyte(const u8 *str)
|
||||
|
||||
while (*str != EOS)
|
||||
{
|
||||
if (*str == CHAR_SPECIAL_F9)
|
||||
if (*str == CHAR_EXTRA_SYMBOL)
|
||||
str++;
|
||||
str++;
|
||||
length++;
|
||||
@ -596,15 +607,15 @@ u8 *WriteColorChangeControlCode(u8 *dest, u32 colorType, u8 color)
|
||||
switch (colorType)
|
||||
{
|
||||
case 0:
|
||||
*dest = 1;
|
||||
*dest = EXT_CTRL_CODE_COLOR;
|
||||
dest++;
|
||||
break;
|
||||
case 1:
|
||||
*dest = 3;
|
||||
*dest = EXT_CTRL_CODE_SHADOW;
|
||||
dest++;
|
||||
break;
|
||||
case 2:
|
||||
*dest = 2;
|
||||
*dest = EXT_CTRL_CODE_HIGHLIGHT;
|
||||
dest++;
|
||||
break;
|
||||
}
|
||||
@ -619,7 +630,7 @@ bool32 IsStringJapanese(u8 *str)
|
||||
{
|
||||
while (*str != EOS)
|
||||
{
|
||||
if (*str <= 0xA0)
|
||||
if (*str < CHAR_0)
|
||||
if (*str != CHAR_SPACE)
|
||||
return TRUE;
|
||||
str++;
|
||||
@ -634,7 +645,7 @@ bool32 sub_800924C(u8 *str, s32 n)
|
||||
|
||||
for (i = 0; *str != EOS && i < n; i++)
|
||||
{
|
||||
if (*str <= 0xA0)
|
||||
if (*str < CHAR_0)
|
||||
if (*str != CHAR_SPACE)
|
||||
return TRUE;
|
||||
str++;
|
||||
@ -647,31 +658,31 @@ u8 GetExtCtrlCodeLength(u8 code)
|
||||
{
|
||||
static const u8 lengths[] =
|
||||
{
|
||||
1,
|
||||
2,
|
||||
2,
|
||||
2,
|
||||
4,
|
||||
2,
|
||||
2,
|
||||
1,
|
||||
2,
|
||||
1,
|
||||
1,
|
||||
3,
|
||||
2,
|
||||
2,
|
||||
2,
|
||||
1,
|
||||
3,
|
||||
2,
|
||||
2,
|
||||
2,
|
||||
2,
|
||||
1,
|
||||
1,
|
||||
1,
|
||||
1,
|
||||
[0] = 1,
|
||||
[EXT_CTRL_CODE_COLOR] = 2,
|
||||
[EXT_CTRL_CODE_HIGHLIGHT] = 2,
|
||||
[EXT_CTRL_CODE_SHADOW] = 2,
|
||||
[EXT_CTRL_CODE_COLOR_HIGHLIGHT_SHADOW] = 4,
|
||||
[EXT_CTRL_CODE_PALETTE] = 2,
|
||||
[EXT_CTRL_CODE_SIZE] = 2,
|
||||
[EXT_CTRL_CODE_RESET_SIZE] = 1,
|
||||
[EXT_CTRL_CODE_PAUSE] = 2,
|
||||
[EXT_CTRL_CODE_PAUSE_UNTIL_PRESS] = 1,
|
||||
[EXT_CTRL_CODE_WAIT_SE] = 1,
|
||||
[EXT_CTRL_CODE_PLAY_BGM] = 3,
|
||||
[EXT_CTRL_CODE_ESCAPE] = 2,
|
||||
[EXT_CTRL_CODE_SHIFT_TEXT] = 2,
|
||||
[EXT_CTRL_CODE_SHIFT_DOWN] = 2,
|
||||
[EXT_CTRL_CODE_FILL_WINDOW] = 1,
|
||||
[EXT_CTRL_CODE_PLAY_SE] = 3,
|
||||
[EXT_CTRL_CODE_CLEAR] = 2,
|
||||
[EXT_CTRL_CODE_SKIP] = 2,
|
||||
[EXT_CTRL_CODE_CLEAR_TO] = 2,
|
||||
[EXT_CTRL_CODE_MIN_LETTER_SPACING] = 2,
|
||||
[EXT_CTRL_CODE_JPN] = 1,
|
||||
[EXT_CTRL_CODE_ENG] = 1,
|
||||
[EXT_CTRL_CODE_PAUSE_MUSIC] = 1,
|
||||
[EXT_CTRL_CODE_RESUME_MUSIC] = 1,
|
||||
};
|
||||
|
||||
u8 length = 0;
|
||||
@ -734,7 +745,7 @@ void ConvertInternationalString(u8 *s, u8 language)
|
||||
StripExtCtrlCodes(s);
|
||||
i = StringLength(s);
|
||||
s[i++] = EXT_CTRL_CODE_BEGIN;
|
||||
s[i++] = 22;
|
||||
s[i++] = EXT_CTRL_CODE_ENG;
|
||||
s[i++] = EOS;
|
||||
|
||||
i--;
|
||||
@ -746,7 +757,7 @@ void ConvertInternationalString(u8 *s, u8 language)
|
||||
}
|
||||
|
||||
s[0] = EXT_CTRL_CODE_BEGIN;
|
||||
s[1] = 21;
|
||||
s[1] = EXT_CTRL_CODE_JPN;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
1013
gflib/text.c
1013
gflib/text.c
File diff suppressed because it is too large
Load Diff
70
gflib/text.h
70
gflib/text.h
@ -169,9 +169,9 @@
|
||||
#define CHAR_a_DIAERESIS 0xF4
|
||||
#define CHAR_o_DIAERESIS 0xF5
|
||||
#define CHAR_u_DIAERESIS 0xF6
|
||||
#define CHAR_SPECIAL_F7 0xF7
|
||||
#define CHAR_SPECIAL_F8 0xF8
|
||||
#define CHAR_SPECIAL_F9 0xF9
|
||||
#define CHAR_DYNAMIC 0xF7
|
||||
#define CHAR_KEYPAD_ICON 0xF8
|
||||
#define CHAR_EXTRA_SYMBOL 0xF9
|
||||
#define CHAR_PROMPT_SCROLL 0xFA // waits for button press and scrolls dialog
|
||||
#define CHAR_PROMPT_CLEAR 0xFB // waits for button press and clears dialog
|
||||
#define EXT_CTRL_CODE_BEGIN 0xFC // extended control code
|
||||
@ -179,7 +179,22 @@
|
||||
#define CHAR_NEWLINE 0xFE
|
||||
#define EOS 0xFF // end of string
|
||||
|
||||
// Special F9 chars
|
||||
// CHAR_KEYPAD_ICON chars
|
||||
#define CHAR_A_BUTTON 0x00
|
||||
#define CHAR_B_BUTTON 0x01
|
||||
#define CHAR_L_BUTTON 0x02
|
||||
#define CHAR_R_BUTTON 0x03
|
||||
#define CHAR_START_BUTTON 0x04
|
||||
#define CHAR_SELECT_BUTTON 0x05
|
||||
#define CHAR_DPAD_UP 0x06
|
||||
#define CHAR_DPAD_DOWN 0x07
|
||||
#define CHAR_DPAD_LEFT 0x08
|
||||
#define CHAR_DPAD_RIGHT 0x09
|
||||
#define CHAR_DPAD_UPDOWN 0x0A
|
||||
#define CHAR_DPAD_LEFTRIGHT 0x0B
|
||||
#define CHAR_DPAD_NONE 0x0C
|
||||
|
||||
// CHAR_EXTRA_SYMBOL chars
|
||||
#define CHAR_UP_ARROW_2 0x00
|
||||
#define CHAR_DOWN_ARROW_2 0x01
|
||||
#define CHAR_LEFT_ARROW_2 0x02
|
||||
@ -191,18 +206,30 @@
|
||||
#define CHAR_NO 0x08
|
||||
#define CHAR_UNDERSCORE 0x09
|
||||
|
||||
#define EXT_CTRL_CODE_COLOR 0x1
|
||||
#define EXT_CTRL_CODE_HIGHLIGHT 0x2
|
||||
#define EXT_CTRL_CODE_SHADOW 0x3
|
||||
//
|
||||
#define EXT_CTRL_CODE_UNKNOWN_7 0x7
|
||||
//
|
||||
#define EXT_CTRL_CODE_CLEAR 0x11
|
||||
//
|
||||
#define EXT_CTRL_CODE_CLEAR_TO 0x13
|
||||
#define EXT_CTRL_CODE_MIN_LETTER_SPACING 0x14
|
||||
#define EXT_CTRL_CODE_JPN 0x15
|
||||
#define EXT_CTRL_CODE_ENG 0x16
|
||||
#define EXT_CTRL_CODE_COLOR 0x01
|
||||
#define EXT_CTRL_CODE_HIGHLIGHT 0x02
|
||||
#define EXT_CTRL_CODE_SHADOW 0x03
|
||||
#define EXT_CTRL_CODE_COLOR_HIGHLIGHT_SHADOW 0x04
|
||||
#define EXT_CTRL_CODE_PALETTE 0x05
|
||||
#define EXT_CTRL_CODE_SIZE 0x06
|
||||
#define EXT_CTRL_CODE_RESET_SIZE 0x07
|
||||
#define EXT_CTRL_CODE_PAUSE 0x08
|
||||
#define EXT_CTRL_CODE_PAUSE_UNTIL_PRESS 0x09
|
||||
#define EXT_CTRL_CODE_WAIT_SE 0x0A
|
||||
#define EXT_CTRL_CODE_PLAY_BGM 0x0B
|
||||
#define EXT_CTRL_CODE_ESCAPE 0x0C
|
||||
#define EXT_CTRL_CODE_SHIFT_TEXT 0x0D
|
||||
#define EXT_CTRL_CODE_SHIFT_DOWN 0x0E
|
||||
#define EXT_CTRL_CODE_FILL_WINDOW 0x0F
|
||||
#define EXT_CTRL_CODE_PLAY_SE 0x10
|
||||
#define EXT_CTRL_CODE_CLEAR 0x11
|
||||
#define EXT_CTRL_CODE_SKIP 0x12
|
||||
#define EXT_CTRL_CODE_CLEAR_TO 0x13
|
||||
#define EXT_CTRL_CODE_MIN_LETTER_SPACING 0x14
|
||||
#define EXT_CTRL_CODE_JPN 0x15
|
||||
#define EXT_CTRL_CODE_ENG 0x16
|
||||
#define EXT_CTRL_CODE_PAUSE_MUSIC 0x17
|
||||
#define EXT_CTRL_CODE_RESUME_MUSIC 0x18
|
||||
|
||||
#define TEXT_COLOR_TRANSPARENT 0x0
|
||||
#define TEXT_COLOR_WHITE 0x1
|
||||
@ -242,6 +269,13 @@
|
||||
|
||||
#define TEXT_SPEED_FF 0xFF
|
||||
|
||||
enum
|
||||
{
|
||||
COLOR_FOREGROUND,
|
||||
COLOR_SHADOW,
|
||||
COLOR_BACKGROUND
|
||||
};
|
||||
|
||||
enum
|
||||
{
|
||||
FONTATTR_MAX_LETTER_WIDTH,
|
||||
@ -295,7 +329,7 @@ struct TextPrinter
|
||||
u8 delayCounter;
|
||||
u8 scrollDistance;
|
||||
u8 minLetterSpacing; // 0x20
|
||||
u8 japanese;
|
||||
bool8 japanese;
|
||||
};
|
||||
|
||||
struct FontInfo
|
||||
@ -345,7 +379,7 @@ struct Struct_03002F90
|
||||
|
||||
extern TextFlags gTextFlags;
|
||||
|
||||
extern u8 gUnknown_03002F84;
|
||||
extern bool8 gUnknown_03002F84;
|
||||
extern struct Struct_03002F90 gUnknown_03002F90;
|
||||
|
||||
void SetFontsPointer(const struct FontInfo *fonts);
|
||||
|
||||
|
Before Width: | Height: | Size: 873 B After Width: | Height: | Size: 873 B |
|
Before Width: | Height: | Size: 406 B After Width: | Height: | Size: 406 B |
|
Before Width: | Height: | Size: 346 B After Width: | Height: | Size: 346 B |
|
Before Width: | Height: | Size: 273 B After Width: | Height: | Size: 273 B |
|
Before Width: | Height: | Size: 197 B After Width: | Height: | Size: 197 B |
|
Before Width: | Height: | Size: 205 B After Width: | Height: | Size: 205 B |
BIN
graphics/field_effects/pics/record_mix_lights.png
Normal file
BIN
graphics/field_effects/pics/record_mix_lights.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 199 B |
|
Before Width: | Height: | Size: 197 B After Width: | Height: | Size: 197 B |
|
Before Width: | Height: | Size: 272 B After Width: | Height: | Size: 272 B |
|
Before Width: | Height: | Size: 255 B After Width: | Height: | Size: 255 B |
|
Before Width: | Height: | Size: 256 B After Width: | Height: | Size: 256 B |
BIN
graphics/field_effects/pics/secret_power_cave.png
Normal file
BIN
graphics/field_effects/pics/secret_power_cave.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 356 B |
BIN
graphics/field_effects/pics/secret_power_shrub.png
Normal file
BIN
graphics/field_effects/pics/secret_power_shrub.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 270 B |
BIN
graphics/field_effects/pics/secret_power_tree.png
Normal file
BIN
graphics/field_effects/pics/secret_power_tree.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 304 B |
|
Before Width: | Height: | Size: 174 B After Width: | Height: | Size: 174 B |
|
Before Width: | Height: | Size: 205 B After Width: | Height: | Size: 205 B |
|
Before Width: | Height: | Size: 344 B After Width: | Height: | Size: 344 B |
|
Before Width: | Height: | Size: 389 B After Width: | Height: | Size: 389 B |
|
Before Width: | Height: | Size: 272 B After Width: | Height: | Size: 272 B |
|
Before Width: | Height: | Size: 319 B After Width: | Height: | Size: 319 B |
|
Before Width: | Height: | Size: 100 B After Width: | Height: | Size: 100 B |
|
Before Width: | Height: | Size: 91 B After Width: | Height: | Size: 91 B |
|
Before Width: | Height: | Size: 99 B After Width: | Height: | Size: 99 B |
|
Before Width: | Height: | Size: 102 B After Width: | Height: | Size: 102 B |
|
Before Width: | Height: | Size: 184 B After Width: | Height: | Size: 184 B |
|
Before Width: | Height: | Size: 177 B After Width: | Height: | Size: 177 B |
|
Before Width: | Height: | Size: 95 B After Width: | Height: | Size: 95 B |
|
Before Width: | Height: | Size: 89 B After Width: | Height: | Size: 89 B |
|
Before Width: | Height: | Size: 192 B After Width: | Height: | Size: 192 B |
|
Before Width: | Height: | Size: 203 B After Width: | Height: | Size: 203 B |
|
Before Width: | Height: | Size: 212 B After Width: | Height: | Size: 212 B |
|
Before Width: | Height: | Size: 180 B After Width: | Height: | Size: 180 B |
|
Before Width: | Height: | Size: 1.6 KiB After Width: | Height: | Size: 1.6 KiB |
|
Before Width: | Height: | Size: 353 B After Width: | Height: | Size: 353 B |
|
Before Width: | Height: | Size: 260 B After Width: | Height: | Size: 260 B |
|
Before Width: | Height: | Size: 88 B After Width: | Height: | Size: 88 B |
|
Before Width: | Height: | Size: 256 B After Width: | Height: | Size: 256 B |
Some files were not shown because too many files have changed in this diff Show More
Loading…
x
Reference in New Issue
Block a user