thorn/kep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/kep-hack.git synced 2025-12-05 02:54:32 +13:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixing a few small bugs

Browse source
This commit is contained in:
MementoMartha 2022-09-28 10:46:42 +01:00
parent f457830786
commit 91c79913fd
6 changed files with 39 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
data/maps/dungeon_maps.asm
View file

@ -1,8 +1,3 @@
; GetBattleTransitionID_IsDungeonMap fails to recognize
; VICTORY_ROAD_2F, VICTORY_ROAD_3F, all ROCKET_HIDEOUT maps,
; POKEMON_MANSION_1F, SEAFOAM_ISLANDS_[B1F-B4F], POWER_PLANT,
; DIGLETTS_CAVE, and SILPH_CO_[9-11]F as dungeon maps
; GetBattleTransitionID_IsDungeonMap checks if wCurMap ; GetBattleTransitionID_IsDungeonMap checks if wCurMap
; is equal to one of these maps ; is equal to one of these maps
DungeonMaps1: DungeonMaps1:
@ -11,6 +6,11 @@ DungeonMaps1:
db SEAFOAM_ISLANDS_1F db SEAFOAM_ISLANDS_1F
db ROCK_TUNNEL_B1F db ROCK_TUNNEL_B1F
db CINNABAR_VOLCANO db CINNABAR_VOLCANO
db POKEMON_MANSION_1F
db VICTORY_ROAD_2F
db VICTORY_ROAD_3F
db POWER_PLANT
db DIGLETTS_CAVE
db -1 ; end db -1 ; end
; GetBattleTransitionID_IsDungeonMap checks if wCurMap ; GetBattleTransitionID_IsDungeonMap checks if wCurMap
@ -25,4 +25,10 @@ DungeonMaps2:
; SILPH_CO_[2-8]F, POKEMON_MANSION[2F-B1F], SAFARI_ZONE, and ; SILPH_CO_[2-8]F, POKEMON_MANSION[2F-B1F], SAFARI_ZONE, and
; CERULEAN_CAVE maps, except for SILPH_CO_1F ; CERULEAN_CAVE maps, except for SILPH_CO_1F
db SILPH_CO_2F, CERULEAN_CAVE_1F db SILPH_CO_2F, CERULEAN_CAVE_1F
; SILPH_CO_[9-11]F
db SILPH_CO_9F, SILPH_CO_11F
; SEAFOAM_ISLANDS_[B1F-B4F]
db SEAFOAM_ISLANDS_B1F, SEAFOAM_ISLANDS_B4F
; all ROCKET_HIDEOUT maps
db ROCKET_HIDEOUT_B1F, ROCKET_HIDEOUT_B4F
db -1 ; end db -1 ; end

15
engine/battle/core.asm
View file

@ -5291,6 +5291,21 @@ AdjustDamageForMoveType:
ld b, a ld b, a
ld a, [hl] ; a = damage multiplier ld a, [hl] ; a = damage multiplier
ldh [hMultiplier], a ldh [hMultiplier], a
and a ; cp NO_EFFECT ;This fixes incorrect type effectiveness messages
jr z, .gotMultiplier
cp NOT_VERY_EFFECTIVE
jr nz, .nothalf
ld a, [wDamageMultipliers]
and $7f
srl a
jr .gotMultiplier
.nothalf
cp SUPER_EFFECTIVE
jr nz, .gotMultiplier
ld a, [wDamageMultipliers]
and $7f
sla a
.gotMultiplier
add b add b
ld [wDamageMultipliers], a ld [wDamageMultipliers], a
xor a xor a

2
engine/movie/oak_speech/oak_speech.asm
View file

@ -157,7 +157,7 @@ OakSpeechText1:
text_end text_end
OakSpeechText2: OakSpeechText2:
text_far _OakSpeechText2A text_far _OakSpeechText2A
sound_cry_nidorina sound_cry_nidorino
text_far _OakSpeechText2B text_far _OakSpeechText2B
text_end text_end
IntroducePlayerText: IntroducePlayerText:

4
home/text.asm
View file

@ -516,7 +516,7 @@ TextCommand_SOUND::
jr .loop jr .loop
.play .play
cp TX_SOUND_CRY_NIDORINA cp TX_SOUND_CRY_NIDORINO
jr z, .pokemonCry jr z, .pokemonCry
cp TX_SOUND_CRY_PIDGEOT cp TX_SOUND_CRY_PIDGEOT
jr z, .pokemonCry jr z, .pokemonCry
@ -546,7 +546,7 @@ TextCommandSounds::
db TX_SOUND_GET_ITEM_2, SFX_GET_ITEM_2 db TX_SOUND_GET_ITEM_2, SFX_GET_ITEM_2
db TX_SOUND_GET_KEY_ITEM, SFX_GET_KEY_ITEM db TX_SOUND_GET_KEY_ITEM, SFX_GET_KEY_ITEM
db TX_SOUND_DEX_PAGE_ADDED, SFX_DEX_PAGE_ADDED db TX_SOUND_DEX_PAGE_ADDED, SFX_DEX_PAGE_ADDED
db TX_SOUND_CRY_NIDORINA, NIDORINA ; used in OakSpeech db TX_SOUND_CRY_NIDORINO, NIDORINO ; used in OakSpeech
db TX_SOUND_CRY_PIDGEOT, PIDGEOT ; used in SaffronCityText12 db TX_SOUND_CRY_PIDGEOT, PIDGEOT ; used in SaffronCityText12
db TX_SOUND_CRY_DEWGONG, DEWGONG ; unused db TX_SOUND_CRY_DEWGONG, DEWGONG ; unused

6
macros/scripts/text.asm
View file

@ -127,9 +127,9 @@ MACRO sound_dex_page_added
db TX_SOUND_DEX_PAGE_ADDED db TX_SOUND_DEX_PAGE_ADDED
ENDM ENDM
const TX_SOUND_CRY_NIDORINA ; $14 const TX_SOUND_CRY_NIDORINO ; $14
MACRO sound_cry_nidorina MACRO sound_cry_nidorino
db TX_SOUND_CRY_NIDORINA db TX_SOUND_CRY_NIDORINO
ENDM ENDM
const TX_SOUND_CRY_PIDGEOT ; $15 const TX_SOUND_CRY_PIDGEOT ; $15

14
scripts/RocketHideoutB4F.asm
View file

@ -182,18 +182,18 @@ RocketHideout4BattleText4:
RocketHideout4EndBattleText4: RocketHideout4EndBattleText4:
text_far _RocketHideout4EndBattleText4 text_far _RocketHideout4EndBattleText4
text_end text_promptbutton
text_asm
SetEvent EVENT_ROCKET_DROPPED_LIFT_KEY
ld a, HS_ROCKET_HIDEOUT_B4F_ITEM_5
ld [wMissableObjectIndex], a
predef ShowObject
jp TextScriptEnd
RocketHideout4AfterBattleText4: RocketHideout4AfterBattleText4:
text_asm text_asm
ld hl, RocketHideout4Text_455ec ld hl, RocketHideout4Text_455ec
call PrintText call PrintText
CheckAndSetEvent EVENT_ROCKET_DROPPED_LIFT_KEY
jr nz, .asm_455e9
ld a, HS_ROCKET_HIDEOUT_B4F_ITEM_5
ld [wMissableObjectIndex], a
predef ShowObject
.asm_455e9
jp TextScriptEnd jp TextScriptEnd
RocketHideout4Text_455ec: RocketHideout4Text_455ec: