From 271b5a8aaf7811b7248e34a1264beea0487b7dd0 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Mon, 12 May 2014 00:04:00 -0500 Subject: Documented reflect/light screen effect function. Labeled some related text. --- text.asm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'text.asm') diff --git a/text.asm b/text.asm index 5ae15d39..7f533d50 100644 --- a/text.asm +++ b/text.asm @@ -2207,7 +2207,7 @@ _UnnamedText_3fb49:: ; 948c9 (25:48c9) text "No effect!" prompt -_UnnamedText_3fb59:: ; 948d5 (25:48d5) +_ButItFailedText:: ; 948d5 (25:48d5) text "But, it failed! " prompt @@ -2301,13 +2301,13 @@ _UnnamedText_3bb92:: ; 94a6c (25:4a6c) text "!" prompt -_UnnamedText_3bbd7:: ; 94a87 (25:4a87) +_LightScreenProtectedText:: ; 94a87 (25:4a87) text $5a, "'s" line "protected against" cont "special attacks!" prompt -_UnnamedText_3bbdc:: ; 94aae (25:4aae) +_ReflectGainedArmorText:: ; 94aae (25:4aae) text $5a line "gained armor!" prompt -- cgit v1.3.1-sl0p From 13e496cc90a3027b792a5330b404c3a8555e82a5 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Mon, 12 May 2014 15:00:46 -0500 Subject: Documented/labeled lots of move-effect-related stuff. --- main.asm | 269 ++++++++++++++++++++++++++++++++++++++++----------------------- text.asm | 14 ++-- 2 files changed, 180 insertions(+), 103 deletions(-) (limited to 'text.asm') diff --git a/main.asm b/main.asm index d8bede24..f49e888f 100755 --- a/main.asm +++ b/main.asm @@ -17782,10 +17782,10 @@ FieldMoveDisplayData: ; 7823 (1:7823) db $ff ; list terminator -Func_783f: ; 783f (1:783f) +DrainHPEffect_: ; 783f (1:783f) ld hl, W_DAMAGE ; $d0d7 ld a, [hl] - srl a + srl a ; divide damage by 2 ld [hli], a ld a, [hl] rr a @@ -17869,25 +17869,25 @@ Func_7861: ; 7861 (1:7861) ld hl, ReadPlayerMonCurHPAndStatus ld b, BANK(ReadPlayerMonCurHPAndStatus) call Bankswitch - ld hl, UnnamedText_78dc ; $78dc + ld hl, SuckedHealthText ; $78dc ld a, [H_WHOSETURN] ; $fff3 and a ld a, [W_PLAYERMOVEEFFECT] ; $cfd3 jr z, .asm_78d2 ld a, [W_ENEMYMOVEEFFECT] ; $cfcd .asm_78d2 - cp $8 + cp DREAM_EATER_EFFECT jr nz, .asm_78d9 - ld hl, UnnamedText_78e1 ; $78e1 + ld hl, DreamEatenText ; $78e1 .asm_78d9 jp PrintText -UnnamedText_78dc: ; 78dc (1:78dc) - TX_FAR _UnnamedText_78dc +SuckedHealthText: ; 78dc (1:78dc) + TX_FAR _SuckedHealthText db "@" -UnnamedText_78e1: ; 78e1 (1:78e1) - TX_FAR _UnnamedText_78e1 +DreamEatenText: ; 78e1 (1:78e1) + TX_FAR _DreamEatenText db "@" Func_78e6: ; 78e6 (1:78e6) @@ -56224,22 +56224,97 @@ BattleCore: ; These are move effects (second value from the Moves table in bank $E). EffectsArray1: ; 3c000 (f:4000) - db $18,$19,$1C,$2E,$2F,$31,$38,$39,$40,$41,$42,$43,$4F,$52,$54,$55,$FF + db CONVERSION_EFFECT + db HAZE_EFFECT + db SWITCH_AND_TELEPORT_EFFECT + db MIST_EFFECT + db FOCUS_ENERGY_EFFECT + db CONFUSION_EFFECT + db HEAL_EFFECT + db TRANSFORM_EFFECT + db LIGHT_SCREEN_EFFECT + db REFLECT_EFFECT + db POISON_EFFECT + db PARALYZE_EFFECT + db SUBSTITUTE_EFFECT + db MIMIC_EFFECT + db LEECH_SEED_EFFECT + db SPLASH_EFFECT + db $FF + EffectsArray2: ; 3c011 (f:4011) ; moves that do damage but not through normal calculations ; e.g., Super Fang, Psywave - db $28,$29,$FF + db SUPER_FANG_EFFECT + db SPECIAL_DAMAGE_EFFECT + db $FF + EffectsArray3: ; 3c014 (f:4014) ; non-damaging, stat‐affecting or status‐causing moves? ; e.g., Meditate, Bide, Hypnosis - db $01,$0A,$0B,$0C,$0D,$0E,$0F,$12,$13,$14,$15,$16,$17,$1A,$20,$32,$33,$34,$35,$36,$37,$3A,$3B,$3C,$3D,$3E,$3F,$FF + db $01 ; unused move effect? + db ATTACK_UP1_EFFECT + db DEFENSE_UP1_EFFECT + db $0C ; unused move effect? + db SPECIAL_UP1_EFFECT + db $0E ; unused move effect? + db EVASION_UP1_EFFECT + db ATTACK_DOWN1_EFFECT + db DEFENSE_DOWN1_EFFECT + db SPEED_DOWN1_EFFECT + db $15 ; unused move effect? + db ACCURACY_DOWN1_EFFECT + db $17 ; unused move effect? + db BIDE_EFFECT + db SLEEP_EFFECT + db ATTACK_UP2_EFFECT + db DEFENSE_UP2_EFFECT + db SPEED_UP2_EFFECT + db SPECIAL_UP2_EFFECT + db $36 ; unused move effect? + db $37 ; unused move effect? + db $3A ; unused move effect? + db DEFENSE_DOWN2_EFFECT + db $3C ; unused move effect? + db $3D ; unused move effect? + db $3E ; unused move effect? + db $3F ; unused move effect? + db $FF + EffectsArray4: ; 3c030 (f:4030) - db $03,$07,$08,$10,$1D,$1E,$2C,$30,$4D,$51,$FF + db DRAIN_HP_EFFECT + db EXPLODE_EFFECT + db DREAM_EATER_EFFECT + db PAY_DAY_EFFECT + db TWO_TO_FIVE_ATTACKS_EFFECT + db $1E + db ATTACK_TWICE_EFFECT + db RECOIL_EFFECT + db TWINEEDLE_EFFECT + db RAGE_EFFECT + db $FF + EffectsArray5: ; 3c03b (f:403b) - db $03,$07,$08,$10,$11,$1D,$1E,$27,$28,$29,$2B,$2C,$2D,$30 ; fallthru + db DRAIN_HP_EFFECT + db EXPLODE_EFFECT + db DREAM_EATER_EFFECT + db PAY_DAY_EFFECT + db SWIFT_EFFECT + db TWO_TO_FIVE_ATTACKS_EFFECT + db $1E + db CHARGE_EFFECT + db SUPER_FANG_EFFECT + db SPECIAL_DAMAGE_EFFECT + db FLY_EFFECT + db ATTACK_TWICE_EFFECT + db JUMP_KICK_EFFECT + db RECOIL_EFFECT + ; fallthru to Next EffectsArray EffectsArray5B: ; 3c049 (f:4049) ; moves that prevent the player from switching moves? - db $1B,$2A,$FF + db THRASH_PETAL_DANCE_EFFECT + db TRAPPING_EFFECT + db $FF Func_3c04c: ; 3c04c (f:404c) call Func_3ec92 @@ -59281,9 +59356,9 @@ Func_3d65e: ; 3d65e (f:565e) Func_3d69a: ; 3d69a (f:569a) ld a, [W_PLAYERMOVEEFFECT] ; $cfd3 - cp $27 + cp CHARGE_EFFECT jp z, Func_3f132 - cp $2b + cp FLY_EFFECT jp z, Func_3f132 jr asm_3d6b0 @@ -59361,9 +59436,9 @@ asm_3d74b ld c,$1E call DelayFrames ld a,[W_PLAYERMOVEEFFECT] - cp a,$2B + cp a,FLY_EFFECT jr z,.next5 - cp a,$27 ; XXX SLP | FRZ ? + cp a,CHARGE_EFFECT jr z,.next5 jr asm_3d766 .next5 @@ -59373,7 +59448,7 @@ asm_3d74b call PlayMoveAnimation asm_3d766 ld a,[W_PLAYERMOVEEFFECT] - cp a,9 + cp a,MIRROR_MOVE_EFFECT jr nz,.next6 ; 577A call MirrorMoveCopyMove jp z,Func_3d80a @@ -59381,7 +59456,7 @@ asm_3d766 ld [$CCED],a jp Func_3d69a .next6 - cp a,$53 + cp a,METRONOME_EFFECT jr nz,.next7 ; 5784 call MetronomePickMove jp Func_3d69a @@ -59396,7 +59471,7 @@ asm_3d766 jr z,.next8 ; 57A6 call Func_3dbe2 ld a,[W_PLAYERMOVEEFFECT] - cp a,7 + cp a,EXPLODE_EFFECT jr z,.next9 ; 57B9 jp Func_3d80a .next8 @@ -59629,9 +59704,9 @@ HyperBeamCheck: ; 3d8c2 (f:58c2) and a,$CC ld [hl],a ld a,[W_PLAYERMOVEEFFECT] - cp a,$2B + cp a,FLY_EFFECT jr z,.next8 ; 5966 - cp a,$27 + cp a,CHARGE_EFFECT jr z,.next8 jr .next9 ; 596F .next8 @@ -60012,15 +60087,15 @@ Func_3dbe2: ; 3dbe2 (f:5be2) jr z, .asm_3dbed ld de, W_ENEMYMOVEEFFECT ; $cfcd .asm_3dbed - ld hl, UnnamedText_3dc57 ; $5c57 + ld hl, DoesntAffectMonText ; $5c57 ld a, [$d05b] and $7f jr z, .asm_3dc04 - ld hl, UnnamedText_3dc42 ; $5c42 + ld hl, AttackMissedText ; $5c42 ld a, [$d05e] cp $ff jr nz, .asm_3dc04 - ld hl, UnnamedText_3dc4c ; $5c4c + ld hl, UnaffectedText ; $5c4c .asm_3dc04 push de call PrintText @@ -60028,8 +60103,10 @@ Func_3dbe2: ; 3dbe2 (f:5be2) ld [$d05e], a pop de ld a, [de] - cp $2d + cp JUMP_KICK_EFFECT ret nz + + ; if you get here, the mon used hi jump kick and missed ld hl, W_DAMAGE ; $d0d7 ld a, [hli] ld b, [hl] @@ -60047,7 +60124,7 @@ Func_3dbe2: ; 3dbe2 (f:5be2) inc a ld [hl], a .asm_3dc2a - ld hl, UnnamedText_3dc47 ; $5c47 + ld hl, KeptGoingAndCrashedText ; $5c47 call PrintText ld b, $4 ld a, $24 @@ -60059,24 +60136,24 @@ Func_3dbe2: ; 3dbe2 (f:5be2) .asm_3dc3f jp ApplyDamageToEnemyPokemon -UnnamedText_3dc42: ; 3dc42 (f:5c42) - TX_FAR _UnnamedText_3dc42 +AttackMissedText: ; 3dc42 (f:5c42) + TX_FAR _AttackMissedText db "@" -UnnamedText_3dc47: ; 3dc47 (f:5c47) - TX_FAR _UnnamedText_3dc47 +KeptGoingAndCrashedText: ; 3dc47 (f:5c47) + TX_FAR _KeptGoingAndCrashedText db "@" -UnnamedText_3dc4c: ; 3dc4c (f:5c4c) - TX_FAR _UnnamedText_3dc4c +UnaffectedText: ; 3dc4c (f:5c4c) + TX_FAR _UnaffectedText db "@" Func_3dc51: ; 3dc51 (f:5c51) - ld hl, UnnamedText_3dc57 ; $5c57 + ld hl, DoesntAffectMonText ; $5c57 jp PrintText -UnnamedText_3dc57: ; 3dc57 (f:5c57) - TX_FAR _UnnamedText_3dc57 +DoesntAffectMonText: ; 3dc57 (f:5c57) + TX_FAR _DoesntAffectMonText db "@" Func_3dc5c: ; 3dc5c (f:5c5c) @@ -61596,13 +61673,13 @@ MoveHitTest: ; 3e56b (f:656b) .playerTurn ; this checks if the move effect is disallowed by mist ld a,[W_PLAYERMOVEEFFECT] - cp a,$12 + cp a,ATTACK_DOWN1_EFFECT jr c,.skipEnemyMistCheck - cp a,$1a + cp a,BIDE_EFFECT jr c,.enemyMistCheck cp a,$3a jr c,.skipEnemyMistCheck - cp a,$42 + cp a,POISON_EFFECT jr c,.enemyMistCheck jr .skipEnemyMistCheck .enemyMistCheck @@ -61614,7 +61691,7 @@ MoveHitTest: ; 3e56b (f:656b) ; function is not called when those moves are used ; XXX are there are any others like those three? ld a,[W_ENEMYBATTSTATUS2] - bit 1,a + bit 1,a ; is mon protected by mist? jp nz,.moveMissed .skipEnemyMistCheck ld a,[W_PLAYERBATTSTATUS2] @@ -61623,19 +61700,19 @@ MoveHitTest: ; 3e56b (f:656b) jr .calcHitChance .enemyTurn ld a,[W_ENEMYMOVEEFFECT] - cp a,$12 + cp a,ATTACK_DOWN1_EFFECT jr c,.skipPlayerMistCheck - cp a,$1a + cp a,BIDE_EFFECT jr c,.playerMistCheck cp a,$3a jr c,.skipPlayerMistCheck - cp a,$42 + cp a,POISON_EFFECT jr c,.playerMistCheck jr .skipPlayerMistCheck .playerMistCheck ; similar to enemy mist check ld a,[W_PLAYERBATTSTATUS2] - bit 1,a + bit 1,a ; is mon protected by mist? jp nz,.moveMissed .skipPlayerMistCheck ld a,[W_ENEMYBATTSTATUS2] @@ -61813,15 +61890,15 @@ Func_3e6bc: ; 3e6bc (f:66bc) Func_3e6fc: ; 3e6fc (f:66fc) ld a, [W_ENEMYMOVEEFFECT] ; $cfcd - cp $27 + cp CHARGE_EFFECT jp z, Func_3f132 - cp $2b + cp FLY_EFFECT jp z, Func_3f132 jr asm_3e72b asm_3e70b: ; 3e70b (f:670b) ld hl, W_ENEMYBATTSTATUS1 ; $d067 - res 4, [hl] - res 6, [hl] + res 4, [hl] ; no longer charging up for attack + res 6, [hl] ; no longer invulnerable to typcial attacks ld a, [W_ENEMYMOVENUM] ; $cfcc ld [$d0b5], a ld a, $2c @@ -61870,7 +61947,7 @@ asm_3e782: ; 3e782 (f:6782) and a jr z, .asm_3e791 ld a, [W_ENEMYMOVEEFFECT] ; $cfcd - cp $7 + cp EXPLODE_EFFECT jr z, asm_3e7a0 jr Func_3e7d1 .asm_3e791 @@ -61889,7 +61966,7 @@ asm_3e7a0: ; 3e7a0 (f:67a0) asm_3e7a4: ; 3e7a4 (f:67a4) push af ld a, [W_ENEMYBATTSTATUS2] ; $d068 - bit 4, a + bit 4, a ; does mon have a substitute? ld hl, Func_79747 ld b, BANK(Func_79747) call nz, Bankswitch @@ -61900,10 +61977,10 @@ asm_3e7a4: ; 3e7a4 (f:67a4) call Func_3eed3 call Func_3cdec ld a, [W_ENEMYBATTSTATUS2] ; $d068 - bit 4, a + bit 4, a ; does mon have a substitute? ld hl, Func_79771 ld b, BANK(Func_79771) - call nz, Bankswitch + call nz, Bankswitch ; slide the substitute's sprite out jr asm_3e7ef Func_3e7d1: ; 3e7d1 (f:67d1) @@ -61911,9 +61988,9 @@ Func_3e7d1: ; 3e7d1 (f:67d1) ld c, $1e call DelayFrames ld a, [W_ENEMYMOVEEFFECT] ; $cfcd - cp $2b + cp FLY_EFFECT jr z, .asm_3e7e6 - cp $27 + cp CHARGE_EFFECT jr z, .asm_3e7e6 jr asm_3e7ef .asm_3e7e6 @@ -61923,17 +62000,17 @@ Func_3e7d1: ; 3e7d1 (f:67d1) call PlayMoveAnimation asm_3e7ef: ; 3e7ef (f:67ef) ld a, [W_ENEMYMOVEEFFECT] ; $cfcd - cp $9 - jr nz, .asm_3e7ff + cp MIRROR_MOVE_EFFECT + jr nz, .notMirrorMoveEffect call MirrorMoveCopyMove jp z, Func_3e88c jp Func_3e6fc -.asm_3e7ff - cp $53 - jr nz, .asm_3e809 +.notMirrorMoveEffect + cp METRONOME_EFFECT + jr nz, .notMetronomeEffect call MetronomePickMove jp Func_3e6fc -.asm_3e809 +.notMetronomeEffect ld a, [W_ENEMYMOVEEFFECT] ; $cfcd ld hl, EffectsArray3 ; $4014 ld de, $1 @@ -61944,7 +62021,7 @@ asm_3e7ef: ; 3e7ef (f:67ef) jr z, .asm_3e82b call Func_3dbe2 ld a, [W_ENEMYMOVEEFFECT] ; $cfcd - cp $7 + cp EXPLODE_EFFECT jr z, .asm_3e83e jp Func_3e88c .asm_3e82b @@ -61968,15 +62045,15 @@ asm_3e7ef: ; 3e7ef (f:67ef) ret z call HandleBuildingRage ld hl, W_ENEMYBATTSTATUS1 ; $d067 - bit 2, [hl] + bit 2, [hl] ; is mon hitting multiple times? (example: double kick) jr z, .asm_3e873 push hl ld hl, $d06f dec [hl] pop hl jp nz, Func_3e794 - res 2, [hl] - ld hl, UnnamedText_3e887 ; $6887 + res 2, [hl] ; mon is no longer hitting multiple times + ld hl, HitXTimesText ; $6887 call PrintText xor a ld [$cd05], a @@ -61990,8 +62067,8 @@ asm_3e7ef: ; 3e7ef (f:67ef) call nc, Func_3f132 jr Func_3e88c -UnnamedText_3e887: ; 3e887 (f:6887) - TX_FAR _UnnamedText_3e887 +HitXTimesText: ; 3e887 (f:6887) + TX_FAR _HitXTimesText db "@" Func_3e88c: ; 3e88c (f:688c) @@ -62165,9 +62242,9 @@ asm_3e9d3: ; 3e9d3 (f:69d3) and $cc ld [hl], a ld a, [W_ENEMYMOVEEFFECT] ; $cfcd - cp $2b + cp FLY_EFFECT jr z, .asm_3e9e7 - cp $27 + cp CHARGE_EFFECT jr z, .asm_3e9e7 jr .asm_3e9f0 .asm_3e9e7 @@ -62180,7 +62257,7 @@ asm_3e9d3: ; 3e9d3 (f:69d3) jp Func_3eab8 asm_3e9f6: ; 3e9f6 (f:69f6) ld hl, W_ENEMYBATTSTATUS1 ; $d067 - bit 0, [hl] + bit 0, [hl] ; is mon using bide? jr z, .asm_3ea54 xor a ld [W_ENEMYMOVENUM], a ; $cfcc @@ -62223,15 +62300,15 @@ asm_3e9f6: ; 3e9f6 (f:69f6) xor a ld [hli], a ld [hl], a - ld a, $75 + ld a, BIDE ld [W_ENEMYMOVENUM], a ; $cfcc call Func_3ec81 ld hl, asm_3e782 ; $6782 jp Func_3eab8 .asm_3ea54 - bit 1, [hl] + bit 1, [hl] ; is mon using thrash or petal dance? jr z, .asm_3ea83 - ld a, $25 + ld a, THRASH ld [W_ENEMYMOVENUM], a ; $cfcc ld hl, ThrashingAboutText ; $5a79 call PrintText @@ -62241,8 +62318,8 @@ asm_3e9f6: ; 3e9f6 (f:69f6) jp nz, Func_3eab8 push hl ld hl, W_ENEMYBATTSTATUS1 ; $d067 - res 1, [hl] - set 7, [hl] + res 1, [hl] ; mon is no longer using thrash or petal dance + set 7, [hl] ; mon is now confused call GenRandomInBattle and $3 inc a @@ -62251,7 +62328,7 @@ asm_3e9f6: ; 3e9f6 (f:69f6) pop hl jp Func_3eab8 .asm_3ea83 - bit 5, [hl] + bit 5, [hl] ; is mon using multi-turn move? jp z, Func_3ea9b ld hl, AttackContinuesText ; $5a7e call PrintText @@ -62263,9 +62340,9 @@ asm_3e9f6: ; 3e9f6 (f:69f6) Func_3ea9b: ; 3ea9b (f:6a9b) ld a, [W_ENEMYBATTSTATUS2] ; $d068 - bit 6, a + bit 6, a ; is mon using rage? jp z, Func_3eaba - ld a, $63 + ld a, RAGE ld [$d11e], a call GetMoveName call CopyStringToCF4B @@ -63254,14 +63331,14 @@ JumpMoveEffect: ; 3f138 (f:7138) jp [hl] ;jump to special effect handler MoveEffectPointerTable: ; 3f150 (f:7150) - dw Func_3f1fc + dw Func_3f1fc ; dw Func_3f24f - dw Func_3f2e9 + dw DrainHPEffect dw FreezeBurnParalyzeEffect dw FreezeBurnParalyzeEffect dw FreezeBurnParalyzeEffect - dw Func_3f2f1 - dw Func_3f2e9 + dw ExplodeEffect + dw DrainHPEffect dw $0000 dw Func_3f428 dw Func_3f428 @@ -63352,8 +63429,8 @@ Func_3f1fc: ; 3f1fc (f:71fc) Func_3f20e: ; 3f20e (f:720e) ld a, [bc] - bit 5, a - res 5, a + bit 5, a ; does the mon need to recharge? (hyper beam) + res 5, a ; mon no longer needs to recharge ld [bc], a jr nz, .asm_3f231 ld a, [de] @@ -63485,12 +63562,12 @@ UnnamedText_3f2e4: ; 3f2e4 (f:72e4) TX_FAR _UnnamedText_3f2e4 db "@" -Func_3f2e9: ; 3f2e9 (f:72e9) - ld hl, Func_783f - ld b, BANK(Func_783f) +DrainHPEffect: ; 3f2e9 (f:72e9) + ld hl, DrainHPEffect_ + ld b, BANK(DrainHPEffect_) jp Bankswitch -Func_3f2f1: ; 3f2f1 (f:72f1) +ExplodeEffect: ; 3f2f1 (f:72f1) ld hl, W_PLAYERMONCURHP ; $d015 ld de, W_PLAYERBATTSTATUS2 ; $d063 ld a, [H_WHOSETURN] ; $fff3 @@ -63500,12 +63577,12 @@ Func_3f2f1: ; 3f2f1 (f:72f1) ld de, W_ENEMYBATTSTATUS2 ; $d068 .asm_3f302 xor a - ld [hli], a + ld [hli], a ; set the mon's HP to 0 ld [hli], a inc hl - ld [hl], a + ld [hl], a ; set mon's status to 0 ld a, [de] - res 7, a + res 7, a ; clear mon's leech seed status ld [de], a ret @@ -63862,13 +63939,13 @@ Func_3f54c: ; 3f54c (f:754c) call CheckTargetSubstitute jp nz, Func_3f65a ld a, [de] - cp $44 + cp ATTACK_DOWN_SIDE_EFFECT jr c, .asm_3f58a call GenRandomInBattle - cp $55 + cp SPLASH_EFFECT jp nc, Func_3f650 ld a, [de] - sub $44 + sub ATTACK_DOWN_SIDE_EFFECT jr .asm_3f5a9 .asm_3f58a push hl @@ -64003,7 +64080,7 @@ Func_3f64d: ; 3f64d (f:764d) Func_3f650: ; 3f650 (f:7650) ld a, [de] - cp $44 + cp ATTACK_DOWN_SIDE_EFFECT ret nc ld hl, UnnamedText_3fb3e ; $7b3e jp PrintText diff --git a/text.asm b/text.asm index 7f533d50..8cf6e3f4 100644 --- a/text.asm +++ b/text.asm @@ -1340,23 +1340,23 @@ _UnnamedText_3db80:: ; 89a73 (22:5a73) text "!" done -_UnnamedText_3dc42:: ; 89a76 (22:5a76) +_AttackMissedText:: ; 89a76 (22:5a76) text $5a, "'s" line "attack missed!" prompt -_UnnamedText_3dc47:: ; 89a89 (22:5a89) +_KeptGoingAndCrashedText:: ; 89a89 (22:5a89) text $5a line "kept going and" cont "crashed!" prompt -_UnnamedText_3dc4c:: ; 89aa4 (22:5aa4) +_UnaffectedText:: ; 89aa4 (22:5aa4) text $59, "'s" line "unaffected!" prompt -_UnnamedText_3dc57:: ; 89ab4 (22:5ab4) +_DoesntAffectMonText:: ; 89ab4 (22:5ab4) text "It doesn't affect" line $59, "!" prompt @@ -1420,7 +1420,7 @@ _MirrorMoveFailedText:: ; 89b96 (22:5b96) next "failed!" prompt -_UnnamedText_3e887:: ; 89baf (22:5baf) +_HitXTimesText:: ; 89baf (22:5baf) text "Hit @" TX_NUM $cd05, 1, 1 text " times!" @@ -2317,12 +2317,12 @@ _UnnamedText_33f52:: ; 94abf (25:4abf) line "shrouded in mist!" prompt -_UnnamedText_78dc:: ; 94ad5 (25:4ad5) +_SuckedHealthText:: ; 94ad5 (25:4ad5) text "Sucked health from" line $59, "!" prompt -_UnnamedText_78e1:: ; 94aec (25:4aec) +_DreamEatenText:: ; 94aec (25:4aec) text $59, "'s" line "dream was eaten!" prompt -- cgit v1.3.1-sl0p From ebecf8f7b540e670afa974104a3aa9317f696316 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Mon, 12 May 2014 23:22:14 -0500 Subject: Finished documenting/labeling functions in the MoveEffectPointerTable. --- constants/move_effect_constants.asm | 7 + main.asm | 579 ++++++++++++++++++------------------ text.asm | 66 ++-- 3 files changed, 329 insertions(+), 323 deletions(-) (limited to 'text.asm') diff --git a/constants/move_effect_constants.asm b/constants/move_effect_constants.asm index 1a6d1be6..ff7ddc12 100644 --- a/constants/move_effect_constants.asm +++ b/constants/move_effect_constants.asm @@ -31,10 +31,12 @@ BIDE_EFFECT EQU $1A THRASH_PETAL_DANCE_EFFECT EQU $1B SWITCH_AND_TELEPORT_EFFECT EQU $1C TWO_TO_FIVE_ATTACKS_EFFECT EQU $1D +; unused effect EQU $1E FLINCH_SIDE_EFFECT1 EQU $1F SLEEP_EFFECT EQU $20 POISON_SIDE_EFFECT2 EQU $21 BURN_SIDE_EFFECT2 EQU $22 +; unused effect EQU $23 PARALYZE_SIDE_EFFECT2 EQU $24 FLINCH_SIDE_EFFECT2 EQU $25 OHKO_EFFECT EQU $26 ; moves like Horn Drill @@ -71,8 +73,13 @@ ATTACK_DOWN_SIDE_EFFECT EQU $44 DEFENSE_DOWN_SIDE_EFFECT EQU $45 SPEED_DOWN_SIDE_EFFECT EQU $46 SPECIAL_DOWN_SIDE_EFFECT EQU $47 +; unused effect EQU $48 +; unused effect EQU $49 +; unused effect EQU $4A +; unused effect EQU $4B CONFUSION_SIDE_EFFECT EQU $4C TWINEEDLE_EFFECT EQU $4D +; unused effect EQU $4E SUBSTITUTE_EFFECT EQU $4F HYPER_BEAM_EFFECT EQU $50 RAGE_EFFECT EQU $51 diff --git a/main.asm b/main.asm index 47f921e1..2c54666d 100755 --- a/main.asm +++ b/main.asm @@ -25776,7 +25776,7 @@ ItemUseXStat: ; e104 (3:6104) call Delay3 xor a ld [H_WHOSETURN],a ; set turn to player's turn - callba Func_3f428 ; do stat increase move + callba StatModifierUpEffect ; do stat increase move pop hl pop af ld [hld],a ; restore [W_PLAYERMOVEEFFECT] @@ -31688,7 +31688,7 @@ WildMonEncounterSlotChances: ; 13918 (4:7918) db $FC, $10 ; 11/256 = 4.3% chance of slot 8 db $FF, $12 ; 3/256 = 1.2% chance of slot 9 -Func_1392c: ; 1392c (4:792c) +RecoilEffect_: ; 1392c (4:792c) ld a, [H_WHOSETURN] ; $fff3 and a ld a, [W_PLAYERMOVENUM] ; $cfd2 @@ -31754,13 +31754,13 @@ Func_1392c: ; 1392c (4:792c) ld [wListMenuID], a ; $cf94 ld a, $48 call Predef ; indirect jump to UpdateHPBar (fa1d (3:7a1d)) - ld hl, UnnamedText_1399e ; $799e + ld hl, HitWithRecoilText ; $799e jp PrintText -UnnamedText_1399e: ; 1399e (4:799e) - TX_FAR _UnnamedText_1399e +HitWithRecoilText: ; 1399e (4:799e) + TX_FAR _HitWithRecoilText db "@" -Func_139a3: ; 139a3 (4:79a3) +ConversionEffect_: ; 139a3 (4:79a3) ld hl, W_ENEMYMONTYPE1 ld de, W_PLAYERMONTYPE1 ld a, [H_WHOSETURN] @@ -31772,9 +31772,8 @@ Func_139a3: ; 139a3 (4:79a3) ld l, e pop de ld a, [W_PLAYERBATTSTATUS1] - .asm_139b8 - bit 6, a + bit 6, a ; is mon immune to typical attacks (dig/fly) jr nz, PrintButItFailedText ld a, [hli] ld [de], a @@ -31783,11 +31782,11 @@ Func_139a3: ; 139a3 (4:79a3) ld [de], a ld hl, Func_3fba8 call Func_139d5 - ld hl, UnnamedText_139cd + ld hl, ConvertedTypeText jp PrintText -UnnamedText_139cd: ; 139cd (4:79cd) - TX_FAR _UnnamedText_139cd +ConvertedTypeText: ; 139cd (4:79cd) + TX_FAR _ConvertedTypeText db "@" PrintButItFailedText: ; 139d2 (4:79d2) @@ -31796,7 +31795,7 @@ Func_139d5: ; 139d5 (4:79d5) ld b, BANK(PrintButItFailedText_) jp Bankswitch -Func_139da: ; 139da (4:79da) +HazeEffect_: ; 139da (4:79da) ld a, $7 ld hl, wPlayerMonAttackMod call Func_13a43 @@ -31837,7 +31836,7 @@ Func_139da: ; 139da (4:79da) call Func_13a37 ld hl, Func_3fba8 call Func_139d5 - ld hl, UnnamedText_13a53 + ld hl, StatusChangesEliminatedText jp PrintText Func_13a37: ; 13a37 (4:7a37) @@ -31869,8 +31868,8 @@ Func_13a4a: ; 13a4a (4:7a4a) jr nz, .loop ret -UnnamedText_13a53: ; 13a53 (4:7a53) - TX_FAR _UnnamedText_13a53 +StatusChangesEliminatedText: ; 13a53 (4:7a53) + TX_FAR _StatusChangesEliminatedText db "@" Func_13a58: ; 13a58 (4:7a58) @@ -42495,18 +42494,18 @@ CooltrainerMName: ; 27f6c (9:7f6c) CooltrainerFName: ; 27f79 (9:7f79) db "COOLTRAINER♀@" -Func_27f86: ; 27f86 (9:7f86) +FocusEnergyEffect_: ; 27f86 (9:7f86) ld hl, W_PLAYERBATTSTATUS2 ; $d063 ld a, [H_WHOSETURN] ; $fff3 and a jr z, .asm_27f91 ld hl, W_ENEMYBATTSTATUS2 ; $d068 .asm_27f91 - bit 2, [hl] + bit 2, [hl] ; is mon already using focus energy? jr nz, .asm_27fa5 - set 2, [hl] + set 2, [hl] ; mon is now using focus energy callab Func_3fba8 - ld hl, UnnamedText_27fb3 ; $7fb2 + ld hl, GettingPumpedText ; $7fb2 jp PrintText .asm_27fa5 ld c, $32 @@ -42515,9 +42514,9 @@ Func_27f86: ; 27f86 (9:7f86) ld b, BANK(PrintButItFailedText_) jp Bankswitch -UnnamedText_27fb3: ; 27fb3 (9:7fb3) +GettingPumpedText: ; 27fb3 (9:7fb3) db $0a - TX_FAR _UnnamedText_27fb3 + TX_FAR _GettingPumpedText db "@" SECTION "bankA",ROMX,BANK[$A] @@ -42650,7 +42649,7 @@ MoltresPicFront: ; 2bbac (a:7bac) MoltresPicBack: ; 2be02 (a:7e02) INCBIN "pic/monback/moltresb.pic" -Func_2bea9: ; 2bea9 (a:7ea9) +LeechSeedEffect_: ; 2bea9 (a:7ea9) callab MoveHitTest ld a, [W_MOVEMISSED] ; $d05f and a @@ -42674,20 +42673,20 @@ Func_2bea9: ; 2bea9 (a:7ea9) jr nz, .asm_2bee7 set 7, [hl] callab Func_3fba8 - ld hl, UnnamedText_2bef2 ; $7ef2 + ld hl, WasSeededText ; $7ef2 jp PrintText .asm_2bee7 ld c, $32 call DelayFrames - ld hl, UnnamedText_2bef7 ; $7ef7 + ld hl, EvadedAttackText ; $7ef7 jp PrintText -UnnamedText_2bef2: ; 2bef2 (a:7ef2) - TX_FAR _UnnamedText_2bef2 +WasSeededText: ; 2bef2 (a:7ef2) + TX_FAR _WasSeededText db "@" -UnnamedText_2bef7: ; 2bef7 (a:7ef7) - TX_FAR _UnnamedText_2bef7 +EvadedAttackText: ; 2bef7 (a:7ef7) + TX_FAR _EvadedAttackText db "@" SECTION "bankB",ROMX,BANK[$B] @@ -42973,7 +42972,7 @@ DuplicateBitsTable: ; 2fea8 (b:7ea8) db $c0, $c3, $cc, $cf db $f0, $f3, $fc, $ff -Func_2feb8 ; 2feb8 (b:7eb8) +PayDayEffect_ ; 2feb8 (b:7eb8) xor a ld hl, $cd6d ld [hli], a @@ -43011,11 +43010,11 @@ Func_2feb8 ; 2feb8 (b:7eb8) ld c, $3 ld a, $b call Predef - ld hl, UnnamedText_2ff04 ; $7f04 + ld hl, CoinsScatteredText ; $7f04 jp PrintText -UnnamedText_2ff04: ; 2ff04 (b:7f04) - TX_FAR _UnnamedText_2ff04 +CoinsScatteredText: ; 2ff04 (b:7f04) + TX_FAR _CoinsScatteredText db "@" Func_2ff09 ; 2ff09 (b:7f09) @@ -43173,33 +43172,33 @@ RedPicBack: ; 33e0a (c:7e0a) OldManPic: ; 33e9a (c:7e9a) INCBIN "pic/trainer/oldman.pic" -Func_33f2b: ; 33f2b (c:7f2b) - ld hl, $d063 +MistEffect_: ; 33f2b (c:7f2b) + ld hl, W_PLAYERBATTSTATUS2 ld a, [$fff3] and a jr z, .asm_33f36 - ld hl, $d068 + ld hl, W_ENEMYBATTSTATUS2 .asm_33f36 - bit 1, [hl] + bit 1, [hl] ; is mon protected by mist? jr nz, .asm_33f4a - set 1, [hl] + set 1, [hl] ; mon is now protected by mist callab Func_3fba8 - ld hl, UnnamedText_33f52 + ld hl, ShroudedInMistText jp PrintText .asm_33f4a ld hl, PrintButItFailedText_ ld b, BANK(PrintButItFailedText_) jp Bankswitch -UnnamedText_33f52: ; 33f52 (c:7f52) - TX_FAR _UnnamedText_33f52 +ShroudedInMistText: ; 33f52 (c:7f52) + TX_FAR _ShroudedInMistText db "@" -Func_33f57: ; 33f57 (c:7f57) +OneHitKOEffect_: ; 33f57 (c:7f57) ld hl, W_DAMAGE ; $d0d7 xor a ld [hli], a - ld [hl], a + ld [hl], a ; set the damage output to zero dec a ld [$d05e], a ld hl, $d02a @@ -52813,7 +52812,7 @@ AIIncreaseStat: ; 3a808 (e:6808) ld a,$AF ld [hli],a ld [hl],b - callab Func_3f428 + callab StatModifierUpEffect pop hl pop af ld [hli],a @@ -55708,7 +55707,7 @@ Mon071_EvosMoves: ; 3b9e4 (e:79e4) db 18,SLEEP_POWDER db 0 -Func_3b9ec: ; 3b9ec (e:79ec) +HealEffect_: ; 3b9ec (e:79ec) ld a, [H_WHOSETURN] ; $fff3 and a ld de, W_PLAYERMONCURHP ; $d015 @@ -55744,9 +55743,9 @@ Func_3b9ec: ; 3b9ec (e:79ec) ld a, [hl] and a ld [hl], 2 ; Number of turns from Rest - ld hl, UnnamedText_3baa2 ; $7aa2 + ld hl, StartedSleepingEffect ; $7aa2 jr z, .asm_3ba31 - ld hl, UnnamedText_3baa7 ; $7aa7 + ld hl, FellAsleepBecameHealthyText ; $7aa7 .asm_3ba31 call PrintText pop af @@ -55808,7 +55807,7 @@ Func_3b9ec: ; 3b9ec (e:79ec) call Predef ; indirect jump to UpdateHPBar (fa1d (3:7a1d)) ld hl, Func_3cd5a ; $4d5a call BankswitchEtoF - ld hl, UnnamedText_3baac ; $7aac + ld hl, RegainedHealthText ; $7aac jp PrintText Func_3ba97: ; 3ba97 (e:7a97) @@ -55817,19 +55816,19 @@ Func_3ba97: ; 3ba97 (e:7a97) ld hl, PrintButItFailedText_ jp BankswitchEtoF -UnnamedText_3baa2: ; 3baa2 (e:7aa2) - TX_FAR _UnnamedText_3baa2 +StartedSleepingEffect: ; 3baa2 (e:7aa2) + TX_FAR _StartedSleepingEffect db "@" -UnnamedText_3baa7: ; 3baa7 (e:7aa7) - TX_FAR _UnnamedText_3baa7 +FellAsleepBecameHealthyText: ; 3baa7 (e:7aa7) + TX_FAR _FellAsleepBecameHealthyText db "@" -UnnamedText_3baac: ; 3baac (e:7aac) - TX_FAR _UnnamedText_3baac +RegainedHealthText: ; 3baac (e:7aac) + TX_FAR _RegainedHealthText db "@" -Func_3bab1: ; 3bab1 (e:7ab1) +TransformEffect_: ; 3bab1 (e:7ab1) ld hl, W_PLAYERMONID ld de, $cfe5 ld bc, W_ENEMYBATTSTATUS3 ; $d069 @@ -55843,7 +55842,7 @@ Func_3bab1: ; 3bab1 (e:7ab1) ld [wPlayerMoveListIndex], a ; $cc2e ld a, [W_PLAYERBATTSTATUS1] ; $d062 .asm_3bad1 - bit 6, a + bit 6, a ; is mon invulnerable to typical attacks? (fly/dig) jp nz, Func_3bb8c push hl push de @@ -55945,7 +55944,7 @@ Func_3bab1: ; 3bab1 (e:7ab1) ld hl, wEnemyMonStatMods ; $cd2e ld de, wPlayerMonStatMods ; $cd1a call Func_3bb7d - ld hl, UnnamedText_3bb92 ; $7b92 + ld hl, TransformedText ; $7b92 jp PrintText Func_3bb7d: ; 3bb7d (e:7b7d) @@ -55964,8 +55963,8 @@ Func_3bb8c: ; 3bb8c (e:7b8c) ld hl, PrintButItFailedText_ ; $7b53 jp BankswitchEtoF -UnnamedText_3bb92: ; 3bb92 (e:7b92) - TX_FAR _UnnamedText_3bb92 +TransformedText: ; 3bb92 (e:7b92) + TX_FAR _TransformedText db "@" ReflectLightScreenEffect_: ; 3bb97 (e:7b97) @@ -61028,7 +61027,7 @@ HandleBuildingRage: ; 3e2b6 (f:62b6) push hl ld hl,BuildingRageText call PrintText - call Func_3f428 ; stat modifier raising function + call StatModifierUpEffect ; stat modifier raising function pop hl xor a ldd [hl],a ; null move effect @@ -63076,94 +63075,94 @@ JumpMoveEffect: ; 3f138 (f:7138) jp [hl] ;jump to special effect handler MoveEffectPointerTable: ; 3f150 (f:7150) - dw Func_3f1fc ; - dw Func_3f24f - dw DrainHPEffect - dw FreezeBurnParalyzeEffect - dw FreezeBurnParalyzeEffect - dw FreezeBurnParalyzeEffect - dw ExplodeEffect - dw DrainHPEffect - dw $0000 - dw Func_3f428 - dw Func_3f428 - dw Func_3f428 - dw Func_3f428 - dw Func_3f428 - dw Func_3f428 - dw Func_3fb0e - dw $0000 - dw Func_3f54c - dw Func_3f54c - dw Func_3f54c - dw Func_3f54c - dw Func_3f54c - dw Func_3f54c - dw Func_3fb16 - dw Func_3fb1e - dw Func_3f6e5 - dw Func_3f717 - dw Func_3f739 - dw Func_3f811 - dw Func_3f811 - dw Func_3f85b - dw Func_3f1fc - dw Func_3f24f - dw FreezeBurnParalyzeEffect - dw FreezeBurnParalyzeEffect - dw FreezeBurnParalyzeEffect - dw Func_3f85b - dw Func_3f884 - dw Func_3f88c - dw $0000 - dw $0000 - dw Func_3f917 - dw Func_3f88c - dw Func_3f811 - dw $0000 - dw Func_3f941 - dw Func_3f949 - dw Func_3f951 - dw Func_3f961 - dw Func_3f428 - dw Func_3f428 - dw Func_3f428 - dw Func_3f428 - dw Func_3f428 - dw Func_3f428 - dw Func_3fb26 - dw Func_3fb2e - dw Func_3f54c - dw Func_3f54c - dw Func_3f54c - dw Func_3f54c - dw Func_3f54c - dw Func_3f54c - dw ReflectLightScreenEffect - dw ReflectLightScreenEffect - dw Func_3f24f - dw Func_3f9b1 - dw Func_3f54c - dw Func_3f54c - dw Func_3f54c - dw Func_3f54c - dw Func_3f54c - dw Func_3f54c - dw Func_3f54c - dw Func_3f54c - dw Func_3f959 - dw Func_3f811 - dw $0000 - dw Func_3f9b9 - dw Func_3f9c1 - dw Func_3f9df - dw Func_3f9ed - dw $0000 - dw Func_3fa7c - dw Func_3fa84 - dw Func_3fa8a - -Func_3f1fc: ; 3f1fc (f:71fc) + dw SleepEffect ; unused effect + dw PoisonEffect ; POISON_SIDE_EFFECT1 + dw DrainHPEffect ; DRAIN_HP_EFFECT + dw FreezeBurnParalyzeEffect ; BURN_SIDE_EFFECT1 + dw FreezeBurnParalyzeEffect ; FREEZE_SIDE_EFFECT + dw FreezeBurnParalyzeEffect ; PARALYZE_SIDE_EFFECT1 + dw ExplodeEffect ; EXPLODE_EFFECT + dw DrainHPEffect ; DREAM_EATER_EFFECT + dw $0000 ; MIRROR_MOVE_EFFECT + dw StatModifierUpEffect ; ATTACK_UP1_EFFECT + dw StatModifierUpEffect ; DEFENSE_UP1_EFFECT + dw StatModifierUpEffect ; SPEED_UP1_EFFECT + dw StatModifierUpEffect ; SPECIAL_UP1_EFFECT + dw StatModifierUpEffect ; ACCURACY_UP1_EFFECT + dw StatModifierUpEffect ; EVASION_UP1_EFFECT + dw PayDayEffect ; PAY_DAY_EFFECT + dw $0000 ; SWIFT_EFFECT + dw StatModifierDownEffect ; ATTACK_DOWN1_EFFECT + dw StatModifierDownEffect ; DEFENSE_DOWN1_EFFECT + dw StatModifierDownEffect ; SPEED_DOWN1_EFFECT + dw StatModifierDownEffect ; SPECIAL_DOWN1_EFFECT + dw StatModifierDownEffect ; ACCURACY_DOWN1_EFFECT + dw StatModifierDownEffect ; EVASION_DOWN1_EFFECT + dw ConversionEffect ; CONVERSION_EFFECT + dw HazeEffect ; HAZE_EFFECT + dw BideEffect ; BIDE_EFFECT + dw ThrashPetalDanceEffect ; THRASH_PETAL_DANCE_EFFECT + dw SwitchAndTeleportEffect ; SWITCH_AND_TELEPORT_EFFECT + dw TwoToFiveAttacksEffect ; TWO_TO_FIVE_ATTACKS_EFFECT + dw TwoToFiveAttacksEffect ; unused effect + dw FlichSideEffect ; FLINCH_SIDE_EFFECT1 + dw SleepEffect ; SLEEP_EFFECT + dw PoisonEffect ; POISON_SIDE_EFFECT2 + dw FreezeBurnParalyzeEffect ; BURN_SIDE_EFFECT2 + dw FreezeBurnParalyzeEffect ; unused effect + dw FreezeBurnParalyzeEffect ; PARALYZE_SIDE_EFFECT2 + dw FlichSideEffect ; FLINCH_SIDE_EFFECT2 + dw OneHitKOEffect ; OHKO_EFFECT + dw ChargeEffect ; CHARGE_EFFECT + dw $0000 ; SUPER_FANG_EFFECT + dw $0000 ; SPECIAL_DAMAGE_EFFECT + dw TrappingEffect ; TRAPPING_EFFECT + dw ChargeEffect ; FLY_EFFECT + dw TwoToFiveAttacksEffect ; ATTACK_TWICE_EFFECT + dw $0000 ; JUMP_KICK_EFFECT + dw MistEffect ; MIST_EFFECT + dw FocusEnergyEffect ; FOCUS_ENERGY_EFFECT + dw RecoilEffect ; RECOIL_EFFECT + dw ConfusionEffect ; CONFUSION_EFFECT + dw StatModifierUpEffect ; ATTACK_UP2_EFFECT + dw StatModifierUpEffect ; DEFENSE_UP2_EFFECT + dw StatModifierUpEffect ; SPEED_UP2_EFFECT + dw StatModifierUpEffect ; SPECIAL_UP2_EFFECT + dw StatModifierUpEffect ; ACCURACY_UP2_EFFECT + dw StatModifierUpEffect ; EVASION_UP2_EFFECT + dw HealEffect ; HEAL_EFFECT + dw TransformEffect ; TRANSFORM_EFFECT + dw StatModifierDownEffect ; ATTACK_DOWN2_EFFECT + dw StatModifierDownEffect ; DEFENSE_DOWN2_EFFECT + dw StatModifierDownEffect ; SPEED_DOWN2_EFFECT + dw StatModifierDownEffect ; SPECIAL_DOWN2_EFFECT + dw StatModifierDownEffect ; ACCURACY_DOWN2_EFFECT + dw StatModifierDownEffect ; EVASION_DOWN2_EFFECT + dw ReflectLightScreenEffect ; LIGHT_SCREEN_EFFECT + dw ReflectLightScreenEffect ; REFLECT_EFFECT + dw PoisonEffect ; POISON_EFFECT + dw ParalyzeEffect ; PARALYZE_EFFECT + dw StatModifierDownEffect ; ATTACK_DOWN_SIDE_EFFECT + dw StatModifierDownEffect ; DEFENSE_DOWN_SIDE_EFFECT + dw StatModifierDownEffect ; SPEED_DOWN_SIDE_EFFECT + dw StatModifierDownEffect ; SPECIAL_DOWN_SIDE_EFFECT + dw StatModifierDownEffect ; unused effect + dw StatModifierDownEffect ; unused effect + dw StatModifierDownEffect ; unused effect + dw StatModifierDownEffect ; unused effect + dw ConfusionSideEffect ; CONFUSION_SIDE_EFFECT + dw TwoToFiveAttacksEffect ; TWINEEDLE_EFFECT + dw $0000 ; unused effect + dw SubstituteEffect ; SUBSTITUTE_EFFECT + dw HyperBeamEffect ; HYPER_BEAM_EFFECT + dw RageEffect ; RAGE_EFFECT + dw MimicEffect ; MIMIC_EFFECT + dw $0000 ; METRONOME_EFFECT + dw LeechSeedEffect ; LEECH_SEED_EFFECT + dw SplashEffect ; SPLASH_EFFECT + dw DisableEffect ; DISABLE_EFFECT + +SleepEffect: ; 3f1fc (f:71fc) ld de, W_ENEMYMONSTATUS ; $cfe9 ld bc, W_ENEMYBATTSTATUS2 ; $d068 ld a, [H_WHOSETURN] ; $fff3 @@ -63182,7 +63181,7 @@ Func_3f20e: ; 3f20e (f:720e) ld b, a and $7 jr z, .asm_3f222 - ld hl, UnnamedText_3f24a ; $724a + ld hl, AlreadyAsleepText ; $724a jp PrintText .asm_3f222 ld a, b @@ -63200,20 +63199,20 @@ Func_3f20e: ; 3f20e (f:720e) jr z, .asm_3f231 ld [de], a call Func_3fb89 - ld hl, UnnamedText_3f245 ; $7245 + ld hl, FellAsleepText ; $7245 jp PrintText .asm_3f242 jp Func_3fb5e -UnnamedText_3f245: ; 3f245 (f:7245) - TX_FAR _UnnamedText_3f245 +FellAsleepText: ; 3f245 (f:7245) + TX_FAR _FellAsleepText db "@" -UnnamedText_3f24a: ; 3f24a (f:724a) - TX_FAR _UnnamedText_3f24a +AlreadyAsleepText: ; 3f24a (f:724a) + TX_FAR _AlreadyAsleepText db "@" -Func_3f24f: ; 3f24f (f:724f) +PoisonEffect: ; 3f24f (f:724f) ld hl, W_ENEMYMONSTATUS ; $cfe9 ld de, W_PLAYERMOVEEFFECT ; $cfd3 ld a, [H_WHOSETURN] ; $fff3 @@ -63235,11 +63234,11 @@ Func_3f24f: ; 3f24f (f:724f) cp $3 jr z, .asm_3f2d3 ld a, [de] - cp $2 - ld b, $34 + cp POISON_SIDE_EFFECT1 + ld b, $34 ; ~20% chance of poisoning jr z, .asm_3f290 - cp $21 - ld b, $67 + cp POISON_SIDE_EFFECT2 + ld b, $67 ; ~40% chance of poisoning jr z, .asm_3f290 push hl push de @@ -63275,14 +63274,14 @@ Func_3f24f: ; 3f24f (f:724f) set 0, [hl] xor a ld [de], a - ld hl, UnnamedText_3f2e4 ; $72e4 + ld hl, BadlyPoisonedText ; $72e4 jr .asm_3f2c0 .asm_3f2bd - ld hl, UnnamedText_3f2df ; $72df + ld hl, PoisonedText ; $72df .asm_3f2c0 pop de ld a, [de] - cp $42 + cp POISON_EFFECT jr z, .asm_3f2cd ld a, b call Func_3fb96 @@ -63292,19 +63291,19 @@ Func_3f24f: ; 3f24f (f:724f) jp PrintText .asm_3f2d3 ld a, [de] - cp $42 + cp POISON_EFFECT ret nz .asm_3f2d7 ld c, $32 call DelayFrames jp Func_3fb5e -UnnamedText_3f2df: ; 3f2df (f:72df) - TX_FAR _UnnamedText_3f2df +PoisonedText: ; 3f2df (f:72df) + TX_FAR _PoisonedText db "@" -UnnamedText_3f2e4: ; 3f2e4 (f:72e4) - TX_FAR _UnnamedText_3f2e4 +BadlyPoisonedText: ; 3f2e4 (f:72e4) + TX_FAR _BadlyPoisonedText db "@" DrainHPEffect: ; 3f2e9 (f:72e9) @@ -63484,7 +63483,7 @@ UnnamedText_3f423: ; 3f423 (f:7423) TX_FAR _UnnamedText_3f423 db "@" -Func_3f428: ; 3f428 (f:7428) +StatModifierUpEffect: ; 3f428 (f:7428) ld hl, wPlayerMonStatMods ; $cd1a ld de, W_PLAYERMOVEEFFECT ; $cfd3 ld a, [H_WHOSETURN] ; $fff3 @@ -63664,7 +63663,7 @@ UnnamedText_3f547: ; 3f547 (f:7547) TX_FAR _UnnamedText_3f547 db "@" -Func_3f54c: ; 3f54c (f:754c) +StatModifierDownEffect: ; 3f54c (f:754c) ld hl, wEnemyMonStatMods ; $cd2e ld de, W_PLAYERMOVEEFFECT ; $cfd3 ld bc, W_ENEMYBATTSTATUS1 ; $d067 @@ -63901,7 +63900,7 @@ StatModifierRatios: ; 3f6cb (f:76cb) db 35, 10 ; 3.50 db 4, 1 ; 4.00 -Func_3f6e5: ; 3f6e5 (f:76e5) +BideEffect: ; 3f6e5 (f:76e5) ld hl, W_PLAYERBATTSTATUS1 ld de, W_NUMHITS ld bc, $d06a @@ -63912,7 +63911,7 @@ Func_3f6e5: ; 3f6e5 (f:76e5) ld de, $cd05 ld bc, $d06f .asm_3f6fc - set 0, [hl] + set 0, [hl] ; mon is now using bide xor a ld [de], a inc de @@ -63928,7 +63927,7 @@ Func_3f6e5: ; 3f6e5 (f:76e5) add $ae jp Func_3fb96 -Func_3f717: ; 3f717 (f:7717) +ThrashPetalDanceEffect: ; 3f717 (f:7717) ld hl, W_PLAYERBATTSTATUS1 ; $d062 ld de, $d06a ld a, [H_WHOSETURN] ; $fff3 @@ -63937,7 +63936,7 @@ Func_3f717: ; 3f717 (f:7717) ld hl, W_ENEMYBATTSTATUS1 ; $d067 ld de, $d06f .asm_3f728 - set 1, [hl] + set 1, [hl] ; mon is now using thrash/petal dance call GenRandomInBattle and $1 inc a @@ -63947,7 +63946,7 @@ Func_3f717: ; 3f717 (f:7717) add $b0 jp Func_3fb96 -Func_3f739: ; 3f739 (f:7739) +SwitchAndTeleportEffect: ; 3f739 (f:7739) ld a, [H_WHOSETURN] ; $fff3 and a jr nz, .asm_3f791 @@ -63973,7 +63972,7 @@ Func_3f739: ; 3f739 (f:7739) ld c, $32 call DelayFrames ld a, [W_PLAYERMOVENUM] ; $cfd2 - cp $64 + cp TELEPORT jp nz, Func_3fb5e jp PrintButItFailedText_ .asm_3f76e @@ -63987,9 +63986,9 @@ Func_3f739: ; 3f739 (f:7739) .asm_3f77e ld c, $32 call DelayFrames - ld hl, UnnamedText_3fb69 ; $7b69 + ld hl, IsUnaffectedText ; $7b69 ld a, [W_PLAYERMOVENUM] ; $cfd2 - cp $64 + cp TELEPORT jp nz, PrintText jp PrintButItFailedText_ .asm_3f791 @@ -64029,7 +64028,7 @@ Func_3f739: ; 3f739 (f:7739) .asm_3f7d1 ld c, $32 call DelayFrames - ld hl, UnnamedText_3fb69 ; $7b69 + ld hl, IsUnaffectedText ; $7b69 ld a, [W_ENEMYMOVENUM] ; $cfcc cp TELEPORT jp nz, PrintText @@ -64040,29 +64039,29 @@ Func_3f739: ; 3f739 (f:7739) ld c, $14 call DelayFrames pop af - ld hl, UnnamedText_3f802 ; $7802 + ld hl, RanFromBattleText ; $7802 cp TELEPORT jr z, .asm_3f7ff - ld hl, UnnamedText_3f807 ; $7807 + ld hl, RanAwayScaredText ; $7807 cp ROAR jr z, .asm_3f7ff - ld hl, UnnamedText_3f80c ; $780c + ld hl, WasBlownAwayText ; $780c .asm_3f7ff jp PrintText -UnnamedText_3f802: ; 3f802 (f:7802) - TX_FAR _UnnamedText_3f802 +RanFromBattleText: ; 3f802 (f:7802) + TX_FAR _RanFromBattleText db "@" -UnnamedText_3f807: ; 3f807 (f:7807) - TX_FAR _UnnamedText_3f807 +RanAwayScaredText: ; 3f807 (f:7807) + TX_FAR _RanAwayScaredText db "@" -UnnamedText_3f80c: ; 3f80c (f:780c) - TX_FAR _UnnamedText_3f80c +WasBlownAwayText: ; 3f80c (f:780c) + TX_FAR _WasBlownAwayText db "@" -Func_3f811: ; 3f811 (f:7811) +TwoToFiveAttacksEffect: ; 3f811 (f:7811) ld hl, W_PLAYERBATTSTATUS1 ; $d062 ld de, $d06a ld bc, W_NUMHITS ; $d074 @@ -64073,9 +64072,9 @@ Func_3f811: ; 3f811 (f:7811) ld de, $d06f ld bc, $cd05 .asm_3f828 - bit 2, [hl] + bit 2, [hl] ; is mon attacking multiple times? ret nz - set 2, [hl] + set 2, [hl] ; mon is now attacking multiple times ld hl, W_PLAYERMOVEEFFECT ; $cfd3 ld a, [H_WHOSETURN] ; $fff3 and a @@ -64106,7 +64105,7 @@ Func_3f811: ; 3f811 (f:7811) ld [hl], a jr .asm_3f853 -Func_3f85b: ; 3f85b (f:785b) +FlichSideEffect: ; 3f85b (f:785b) call CheckTargetSubstitute ret nz ld hl, W_ENEMYBATTSTATUS1 ; $d067 @@ -64118,24 +64117,24 @@ Func_3f85b: ; 3f85b (f:785b) ld de, W_ENEMYMOVEEFFECT ; $cfcd .asm_3f870 ld a, [de] - cp $1f - ld b, $1a + cp FLINCH_SIDE_EFFECT1 + ld b, $1a ; ~10% chance of flinch jr z, .asm_3f879 - ld b, $4d + ld b, $4d ; ~30% chance of flinch .asm_3f879 call GenRandomInBattle cp b ret nc - set 3, [hl] + set 3, [hl] ; set mon's status to flinching call Func_3f9cf ret -Func_3f884: ; 3f884 (f:7884) - ld hl, Func_33f57 - ld b, BANK(Func_33f57) +OneHitKOEffect: ; 3f884 (f:7884) + ld hl, OneHitKOEffect_ + ld b, BANK(OneHitKOEffect_) jp Bankswitch -Func_3f88c: ; 3f88c (f:788c) +ChargeEffect: ; 3f88c (f:788c) ld hl, W_PLAYERBATTSTATUS1 ; $d062 ld de, W_PLAYERMOVEEFFECT ; $cfd3 ld a, [H_WHOSETURN] ; $fff3 @@ -64148,16 +64147,16 @@ Func_3f88c: ; 3f88c (f:788c) .asm_3f8a1 set 4, [hl] ld a, [de] - dec de - cp $2b + dec de ; de contains enemy or player MOVENUM + cp FLY_EFFECT jr nz, .asm_3f8ad - set 6, [hl] + set 6, [hl] ; mon is now invulnerable to typical attacks (fly/dig) ld b, $64 .asm_3f8ad ld a, [de] - cp $5b + cp DIG jr nz, .asm_3f8b6 - set 6, [hl] + set 6, [hl] ; mon is now invulnerable to typical attacks (fly/dig) ld b, $c0 .asm_3f8b6 xor a @@ -64166,58 +64165,58 @@ Func_3f88c: ; 3f88c (f:788c) call Func_3fbb9 ld a, [de] ld [wWhichTrade], a ; $cd3d - ld hl, UnnamedText_3f8c8 ; $78c8 + ld hl, ChargeMoveEffectText ; $78c8 jp PrintText -UnnamedText_3f8c8: ; 3f8c8 (f:78c8) - TX_FAR _UnnamedText_3f8c8 +ChargeMoveEffectText: ; 3f8c8 (f:78c8) + TX_FAR _ChargeMoveEffectText db $08 ; asm ld a, [wWhichTrade] ; $cd3d cp RAZOR_WIND - ld hl, UnnamedText_3f8f9 ; $78f9 + ld hl, MadeWhirlwindText ; $78f9 jr z, .asm_3f8f8 cp SOLARBEAM - ld hl, UnnamedText_3f8fe ; $78fe + ld hl, TookInSunlightText ; $78fe jr z, .asm_3f8f8 cp SKULL_BASH - ld hl, UnnamedText_3f903 ; $7903 + ld hl, LoweredItsHeadText ; $7903 jr z, .asm_3f8f8 cp SKY_ATTACK - ld hl, UnnamedText_3f908 ; $7908 + ld hl, SkyAttackGlowingText ; $7908 jr z, .asm_3f8f8 cp FLY - ld hl, UnnamedText_3f90d ; $790d + ld hl, FlewUpHighText ; $790d jr z, .asm_3f8f8 cp DIG - ld hl, UnnamedText_3f912 ; $7912 + ld hl, DugAHoleText ; $7912 .asm_3f8f8 ret -UnnamedText_3f8f9: ; 3f8f9 (f:78f9) - TX_FAR _UnnamedText_3f8f9 +MadeWhirlwindText: ; 3f8f9 (f:78f9) + TX_FAR _MadeWhirlwindText db "@" -UnnamedText_3f8fe: ; 3f8fe (f:78fe) - TX_FAR _UnnamedText_3f8fe +TookInSunlightText: ; 3f8fe (f:78fe) + TX_FAR _TookInSunlightText db "@" -UnnamedText_3f903: ; 3f903 (f:7903) - TX_FAR _UnnamedText_3f903 +LoweredItsHeadText: ; 3f903 (f:7903) + TX_FAR _LoweredItsHeadText db "@" -UnnamedText_3f908: ; 3f908 (f:7908) - TX_FAR _UnnamedText_3f908 +SkyAttackGlowingText: ; 3f908 (f:7908) + TX_FAR _SkyAttackGlowingText db "@" -UnnamedText_3f90d: ; 3f90d (f:790d) - TX_FAR _UnnamedText_3f90d +FlewUpHighText: ; 3f90d (f:790d) + TX_FAR _FlewUpHighText db "@" -UnnamedText_3f912: ; 3f912 (f:7912) - TX_FAR _UnnamedText_3f912 +DugAHoleText: ; 3f912 (f:7912) + TX_FAR _DugAHoleText db "@" -Func_3f917: ; 3f917 (f:7917) +TrappingEffect: ; 3f917 (f:7917) ld hl, W_PLAYERBATTSTATUS1 ; $d062 ld de, $d06a ld a, [H_WHOSETURN] ; $fff3 @@ -64241,28 +64240,28 @@ Func_3f917: ; 3f917 (f:7917) ld [de], a ret -Func_3f941: ; 3f941 (f:7941) - ld hl, Func_33f2b - ld b, BANK(Func_33f2b) +MistEffect: ; 3f941 (f:7941) + ld hl, MistEffect_ + ld b, BANK(MistEffect_) jp Bankswitch -Func_3f949: ; 3f949 (f:7949) - ld hl, Func_27f86 - ld b, BANK(Func_27f86) +FocusEnergyEffect: ; 3f949 (f:7949) + ld hl, FocusEnergyEffect_ + ld b, BANK(FocusEnergyEffect_) jp Bankswitch -Func_3f951: ; 3f951 (f:7951) - ld hl, Func_1392c - ld b, BANK(Func_1392c) +RecoilEffect: ; 3f951 (f:7951) + ld hl, RecoilEffect_ + ld b, BANK(RecoilEffect_) jp Bankswitch -Func_3f959: ; 3f959 (f:7959) +ConfusionSideEffect: ; 3f959 (f:7959) call GenRandomInBattle cp $19 ret nc jr Func_3f96f -Func_3f961: ; 3f961 (f:7961) +ConfusionEffect: ; 3f961 (f:7961) call CheckTargetSubstitute jr nz, Func_3f9a6 call MoveHitTest @@ -64281,9 +64280,9 @@ Func_3f96f: ; 3f96f (f:796f) ld bc, $d06b ld a, [W_ENEMYMOVEEFFECT] ; $cfcd .asm_3f986 - bit 7, [hl] + bit 7, [hl] ; is mon confused? jr nz, Func_3f9a6 - set 7, [hl] + set 7, [hl] ; mon is now confused push af call GenRandomInBattle and $3 @@ -64293,11 +64292,11 @@ Func_3f96f: ; 3f96f (f:796f) pop af cp CONFUSION_SIDE_EFFECT call nz, Func_3fb89 - ld hl, UnnamedText_3f9a1 ; $79a1 + ld hl, BecameConfusedText ; $79a1 jp PrintText -UnnamedText_3f9a1: ; 3f9a1 (f:79a1) - TX_FAR _UnnamedText_3f9a1 +BecameConfusedText: ; 3f9a1 (f:79a1) + TX_FAR _BecameConfusedText db "@" Func_3f9a6: ; 3f9a6 (f:79a6) @@ -64307,24 +64306,24 @@ Func_3f9a6: ; 3f9a6 (f:79a6) call DelayFrames jp Func_3fb4e -Func_3f9b1: ; 3f9b1 (f:79b1) - ld hl, Func_52601 - ld b, BANK(Func_52601) +ParalyzeEffect: ; 3f9b1 (f:79b1) + ld hl, ParalyzeEffect_ + ld b, BANK(ParalyzeEffect_) jp Bankswitch -Func_3f9b9: ; 3f9b9 (f:79b9) +SubstituteEffect: ; 3f9b9 (f:79b9) ld hl, SubstituteEffectHandler ld b, BANK(SubstituteEffectHandler) jp Bankswitch -Func_3f9c1: ; 3f9c1 (f:79c1) +HyperBeamEffect: ; 3f9c1 (f:79c1) ld hl, W_PLAYERBATTSTATUS2 ; $d063 ld a, [H_WHOSETURN] ; $fff3 and a jr z, .asm_3f9cc ld hl, W_ENEMYBATTSTATUS2 ; $d068 .asm_3f9cc - set 5, [hl] + set 5, [hl] ; mon now needs to recharge ret Func_3f9cf: ; 3f9cf (f:79cf) @@ -64335,21 +64334,21 @@ Func_3f9cf: ; 3f9cf (f:79cf) jr z, .asm_3f9db ld hl, W_PLAYERBATTSTATUS2 ; $d063 .asm_3f9db - res 5, [hl] + res 5, [hl] ; mon no longer needs to recharge pop hl ret -Func_3f9df: ; 3f9df (f:79df) +RageEffect: ; 3f9df (f:79df) ld hl, W_PLAYERBATTSTATUS2 ld a, [H_WHOSETURN] and a jr z, .player ld hl, W_ENEMYBATTSTATUS2 .player - set 6, [hl] + set 6, [hl] ; mon is now in "rage" mode ret -Func_3f9ed: ; 3f9ed (f:79ed) +MimicEffect: ; 3f9ed (f:79ed) ld c, $32 call DelayFrames call MoveHitTest @@ -64416,25 +64415,25 @@ Func_3f9ed: ; 3f9ed (f:79ed) ld [$d11e], a call GetMoveName call Func_3fba8 - ld hl, UnnamedText_3fa77 + ld hl, MimicLearnedMoveText jp PrintText .asm_3fa74 jp PrintButItFailedText_ -UnnamedText_3fa77: ; 3fa77 (f:7a77) - TX_FAR _UnnamedText_3fa77 +MimicLearnedMoveText: ; 3fa77 (f:7a77) + TX_FAR _MimicLearnedMoveText db "@" -Func_3fa7c: ; 3fa7c (f:7a7c) - ld hl, Func_2bea9 - ld b, BANK(Func_2bea9) +LeechSeedEffect: ; 3fa7c (f:7a7c) + ld hl, LeechSeedEffect_ + ld b, BANK(LeechSeedEffect_) jp Bankswitch -Func_3fa84: ; 3fa84 (f:7a84) +SplashEffect: ; 3fa84 (f:7a84) call Func_3fba8 jp Func_3fb43 -Func_3fa8a: ; 3fa8a (f:7a8a) +DisableEffect: ; 3fa8a (f:7a8a) call MoveHitTest ld a, [W_MOVEMISSED] ; $d05f and a @@ -64507,40 +64506,40 @@ Func_3fa8a: ; 3fa8a (f:7a8a) ld a, [$d11e] ld [hl], a call GetMoveName - ld hl, UnnamedText_3fb09 ; $7b09 + ld hl, MoveWasDisabledText ; $7b09 jp PrintText .asm_3fb05 pop hl .asm_3fb06 jp PrintButItFailedText_ -UnnamedText_3fb09: ; 3fb09 (f:7b09) - TX_FAR _UnnamedText_3fb09 +MoveWasDisabledText: ; 3fb09 (f:7b09) + TX_FAR _MoveWasDisabledText db "@" -Func_3fb0e: ; 3fb0e (f:7b0e) - ld hl, Func_2feb8 - ld b, BANK(Func_2feb8) +PayDayEffect: ; 3fb0e (f:7b0e) + ld hl, PayDayEffect_ + ld b, BANK(PayDayEffect_) jp Bankswitch -Func_3fb16: ; 3fb16 (f:7b16) - ld hl, Func_139a3 - ld b, BANK(Func_139a3) +ConversionEffect: ; 3fb16 (f:7b16) + ld hl, ConversionEffect_ + ld b, BANK(ConversionEffect_) jp Bankswitch -Func_3fb1e: ; 3fb1e (f:7b1e) - ld hl, Func_139da - ld b, BANK(Func_139da) +HazeEffect: ; 3fb1e (f:7b1e) + ld hl, HazeEffect_ + ld b, BANK(HazeEffect_) jp Bankswitch -Func_3fb26: ; 3fb26 (f:7b26) - ld hl, Func_3b9ec - ld b, BANK(Func_3b9ec) +HealEffect: ; 3fb26 (f:7b26) + ld hl, HealEffect_ + ld b, BANK(HealEffect_) jp Bankswitch -Func_3fb2e: ; 3fb2e (f:7b2e) - ld hl, Func_3bab1 - ld b, BANK(Func_3bab1) +TransformEffect: ; 3fb2e (f:7b2e) + ld hl, TransformEffect_ + ld b, BANK(TransformEffect_) jp Bankswitch ReflectLightScreenEffect: ; 3fb36 (f:7b36) @@ -64553,11 +64552,11 @@ UnnamedText_3fb3e: ; 3fb3e (f:7b3e) db "@" Func_3fb43: ; 3fb43 (f:7b43) - ld hl, UnnamedText_3fb49 + ld hl, NoEffectText jp PrintText -UnnamedText_3fb49: ; 3fb49 (f:7b49) - TX_FAR _UnnamedText_3fb49 +NoEffectText: ; 3fb49 (f:7b49) + TX_FAR _NoEffectText db "@" Func_3fb4e: ; 3fb4e (f:7b4e) @@ -64574,23 +64573,23 @@ ButItFailedText: ; 3fb59 (f:7b59) db "@" Func_3fb5e: ; 3fb5e (f:7b5e) - ld hl, UnnamedText_3fb64 ; $7b64 + ld hl, DidntAffectText ; $7b64 jp PrintText -UnnamedText_3fb64: ; 3fb64 (f:7b64) - TX_FAR _UnnamedText_3fb64 +DidntAffectText: ; 3fb64 (f:7b64) + TX_FAR _DidntAffectText db "@" -UnnamedText_3fb69: ; 3fb69 (f:7b69) - TX_FAR _UnnamedText_3fb69 +IsUnaffectedText: ; 3fb69 (f:7b69) + TX_FAR _IsUnaffectedText db "@" Func_3fb6e: ; 3fb6e (f:7b6e) - ld hl, UnnamedText_3fb74 ; $7b74 + ld hl, ParalyzedMayNotAttackText ; $7b74 jp PrintText -UnnamedText_3fb74: ; 3fb74 (f:7b74) - TX_FAR _UnnamedText_3fb74 +ParalyzedMayNotAttackText: ; 3fb74 (f:7b74) + TX_FAR _ParalyzedMayNotAttackText db "@" CheckTargetSubstitute: ; 3fb79 (f:7b79) @@ -81215,7 +81214,7 @@ Func_525af: ; 525af (14:65af) ld b, BANK(PlayBattleMusic) jp Bankswitch -Func_52601: ; 52601 (14:6601) +ParalyzeEffect_: ; 52601 (14:6601) ld hl, W_ENEMYMONSTATUS ; $cfe9 ld de, W_PLAYERMOVETYPE ; $cfd5 ld a, [H_WHOSETURN] ; $fff3 @@ -81229,7 +81228,7 @@ Func_52613: ; 52613 (14:6613) and a jr nz, .asm_52659 ld a, [de] - cp $17 + cp EVASION_DOWN1_EFFECT jr nz, .asm_5262a ld b, h ld c, l diff --git a/text.asm b/text.asm index 8cf6e3f4..af0509ed 100644 --- a/text.asm +++ b/text.asm @@ -2069,22 +2069,22 @@ _UnnamedText_3af4d:: ; 946fb (25:46fb) line "is evolving!" done -_UnnamedText_3f245:: ; 94715 (25:4715) +_FellAsleepText:: ; 94715 (25:4715) text $59 line "fell asleep!" prompt -_UnnamedText_3f24a:: ; 94725 (25:4725) +_AlreadyAsleepText:: ; 94725 (25:4725) text $59, "'s" line "already asleep!" prompt -_UnnamedText_3f2df:: ; 94739 (25:4739) +_PoisonedText:: ; 94739 (25:4739) text $59 line "was poisoned!" prompt -_UnnamedText_3f2e4:: ; 9474a (25:474a) +_BadlyPoisonedText:: ; 9474a (25:474a) text $59, "'s" line "badly poisoned!" prompt @@ -2130,60 +2130,60 @@ _UnnamedText_3f683:: ; 947c9 (25:47c9) text " fell!" prompt -_UnnamedText_3f802:: ; 947d1 (25:47d1) +_RanFromBattleText:: ; 947d1 (25:47d1) text $5a line "ran from battle!" prompt -_UnnamedText_3f807:: ; 947e5 (25:47e5) +_RanAwayScaredText:: ; 947e5 (25:47e5) text $59 line "ran away scared!" prompt -_UnnamedText_3f80c:: ; 947f9 (25:47f9) +_WasBlownAwayText:: ; 947f9 (25:47f9) text $59 line "was blown away!" prompt -_UnnamedText_3f8c8:: ; 9480c (25:480c) +_ChargeMoveEffectText:: ; 9480c (25:480c) text $5a, "@@" -_UnnamedText_3f8f9:: ; 94810 (25:4810) +_MadeWhirlwindText:: ; 94810 (25:4810) db $0 line "made a whirlwind!" prompt -_UnnamedText_3f8fe:: ; 94824 (25:4824) +_TookInSunlightText:: ; 94824 (25:4824) db $0 line "took in sunlight!" prompt -_UnnamedText_3f903:: ; 94838 (25:4838) +_LoweredItsHeadText:: ; 94838 (25:4838) db $0 line "lowered its head!" prompt -_UnnamedText_3f908:: ; 9484c (25:484c) +_SkyAttackGlowingText:: ; 9484c (25:484c) db $0 line "is glowing!" prompt -_UnnamedText_3f90d:: ; 9485a (25:485a) +_FlewUpHighText:: ; 9485a (25:485a) db $0 line "flew up high!" prompt -_UnnamedText_3f912:: ; 9486a (25:486a) +_DugAHoleText:: ; 9486a (25:486a) db $0 line "dug a hole!" prompt -_UnnamedText_3f9a1:: ; 94878 (25:4878) +_BecameConfusedText:: ; 94878 (25:4878) text $59 line "became confused!" prompt -_UnnamedText_3fa77:: ; 9488c (25:488c) +_MimicLearnedMoveText:: ; 9488c (25:488c) text $5a line "learned" cont "@" @@ -2191,7 +2191,7 @@ _UnnamedText_3fa77:: ; 9488c (25:488c) text "!" prompt -_UnnamedText_3fb09:: ; 9489e (25:489e) +_MoveWasDisabledText:: ; 9489e (25:489e) text $59, "'s" line "@" TX_RAM $cd6d @@ -2203,7 +2203,7 @@ _UnnamedText_3fb3e:: ; 948b6 (25:48b6) text "Nothing happened!" prompt -_UnnamedText_3fb49:: ; 948c9 (25:48c9) +_NoEffectText:: ; 948c9 (25:48c9) text "No effect!" prompt @@ -2211,17 +2211,17 @@ _ButItFailedText:: ; 948d5 (25:48d5) text "But, it failed! " prompt -_UnnamedText_3fb64:: ; 948e7 (25:48e7) +_DidntAffectText:: ; 948e7 (25:48e7) text "It didn't affect" line $59, "!" prompt -_UnnamedText_3fb69:: ; 948fb (25:48fb) +_IsUnaffectedText:: ; 948fb (25:48fb) text $59 line "is unaffected!" prompt -_UnnamedText_3fb74:: ; 9490d (25:490d) +_ParalyzedMayNotAttackText:: ; 9490d (25:490d) text $59, "'s" line "paralyzed! It may" cont "not attack!" @@ -2242,58 +2242,58 @@ _UnnamedText_17e27:: ; 9495e (25:495e) line "a SUBSTITUTE!" prompt -_UnnamedText_2ff04:: ; 9497e (25:497e) +_CoinsScatteredText:: ; 9497e (25:497e) text "Coins scattered" line "everywhere!" prompt -_UnnamedText_27fb3:: ; 9499b (25:499b) +_GettingPumpedText:: ; 9499b (25:499b) text $5a, "'s" line "getting pumped!" prompt -_UnnamedText_2bef2:: ; 949af (25:49af) +_WasSeededText:: ; 949af (25:49af) text $59 line "was seeded!" prompt -_UnnamedText_2bef7:: ; 949be (25:49be) +_EvadedAttackText:: ; 949be (25:49be) text $59 line "evaded attack!" prompt -_UnnamedText_1399e:: ; 949d0 (25:49d0) +_HitWithRecoilText:: ; 949d0 (25:49d0) text $5a, "'s" line "hit with recoil!" prompt -_UnnamedText_139cd:: ; 949e5 (25:49e5) +_ConvertedTypeText:: ; 949e5 (25:49e5) text "Converted type to" line $59, "'s!" prompt -_UnnamedText_13a53:: ; 949fc (25:49fc) +_StatusChangesEliminatedText:: ; 949fc (25:49fc) text "All STATUS changes" line "are eliminated!" prompt -_UnnamedText_3baa2:: ; 94a20 (25:4a20) +_StartedSleepingEffect:: ; 94a20 (25:4a20) text $5a line "started sleeping!" done -_UnnamedText_3baa7:: ; 94a35 (25:4a35) +_FellAsleepBecameHealthyText:: ; 94a35 (25:4a35) text $5a line "fell asleep and" cont "became healthy!" done -_UnnamedText_3baac:: ; 94a58 (25:4a58) +_RegainedHealthText:: ; 94a58 (25:4a58) text $5a line "regained health!" prompt -_UnnamedText_3bb92:: ; 94a6c (25:4a6c) +_TransformedText:: ; 94a6c (25:4a6c) text $5a line "transformed into" cont "@" @@ -2312,7 +2312,7 @@ _ReflectGainedArmorText:: ; 94aae (25:4aae) line "gained armor!" prompt -_UnnamedText_33f52:: ; 94abf (25:4abf) +_ShroudedInMistText:: ; 94abf (25:4abf) text $5a, "'s" line "shrouded in mist!" prompt -- cgit v1.3.1-sl0p