diff options
Diffstat (limited to 'engine')
| -rwxr-xr-x | engine/HoF_room_pc.asm | 2 | ||||
| -rw-r--r-- | engine/bank3c.asm | 1 | ||||
| -rw-r--r-- | engine/battle/trainer_ai.asm | 42 | ||||
| -rw-r--r-- | engine/overworld/movement.asm | 2 | ||||
| -rwxr-xr-x | engine/surfing_minigame.asm | 12 |
5 files changed, 30 insertions, 29 deletions
diff --git a/engine/HoF_room_pc.asm b/engine/HoF_room_pc.asm index 9c1c0fd2..c070e8c8 100755 --- a/engine/HoF_room_pc.asm +++ b/engine/HoF_room_pc.asm @@ -319,5 +319,5 @@ INCLUDE "data/credits_order.asm" INCLUDE "text/credits_text.asm" TheEndGfx: - INCBIN "gfx/theend.interleave.2bpp" + INCBIN "gfx/theend.2bpp" TheEndGfxEnd: diff --git a/engine/bank3c.asm b/engine/bank3c.asm index a9bfea8d..10f7ffdd 100644 --- a/engine/bank3c.asm +++ b/engine/bank3c.asm @@ -104,6 +104,7 @@ SetMapSpecificScriptFlagsOnMapReload: BeachHouse_GFX: INCBIN "gfx/tilesets/beachhouse.2bpp" + ds 384 BeachHouse_Block: INCBIN "gfx/blocksets/beachhouse.bst" diff --git a/engine/battle/trainer_ai.asm b/engine/battle/trainer_ai.asm index f4e50562..ddaf1350 100644 --- a/engine/battle/trainer_ai.asm +++ b/engine/battle/trainer_ai.asm @@ -430,28 +430,28 @@ TrainerAIPointers: dbw 1,LanceAI ; lance JugglerAI: - cp $40 + cp 25 percent + 1 ret nc jp AISwitchIfEnoughMons BlackbeltAI: - cp $20 + cp 13 percent - 1 ret nc jp AIUseXAttack GiovanniAI: - cp $40 + cp 25 percent + 1 ret nc jp AIUseGuardSpec CooltrainerMAI: - cp $40 + cp 25 percent + 1 ret nc jp AIUseXAttack CooltrainerFAI: - cp $40 - ld a,$A + cp 25 percent + 1 + ld a,10 call AICheckIfHPBelowFraction jp c,AIUseHyperPotion ld a,5 @@ -467,43 +467,43 @@ BrockAI: jp AIUseFullHeal MistyAI: - cp $40 + cp 25 percent + 1 ret nc jp AIUseXDefend LtSurgeAI: - cp $40 + cp 25 percent + 1 ret nc jp AIUseXSpeed ErikaAI: - cp $80 + cp 50 percent + 1 ret nc - ld a,$A + ld a,10 call AICheckIfHPBelowFraction ret nc jp AIUseSuperPotion KogaAI: - cp $20 + cp 13 percent - 1 ret nc jp AIUseXAttack BlaineAI: - cp $40 + cp 25 percent + 1 ret nc - ld a,$A + ld a,10 call AICheckIfHPBelowFraction ret nc jp AIUseSuperPotion SabrinaAI: - cp $40 + cp 25 percent + 1 ret nc jp AIUseXDefend Sony2AI: - cp $20 + cp 13 percent - 1 ret nc ld a,5 call AICheckIfHPBelowFraction @@ -511,7 +511,7 @@ Sony2AI: jp AIUsePotion Sony3AI: - cp $20 + cp 13 percent - 1 ret nc ld a,5 call AICheckIfHPBelowFraction @@ -519,7 +519,7 @@ Sony3AI: jp AIUseFullRestore LoreleiAI: - cp $80 + cp 50 percent + 1 ret nc ld a,5 call AICheckIfHPBelowFraction @@ -527,14 +527,14 @@ LoreleiAI: jp AIUseSuperPotion BrunoAI: - cp $40 + cp 25 percent + 1 ret nc jp AIUseXDefend AgathaAI: - cp $14 + cp 8 percent jp c,AISwitchIfEnoughMons - cp $80 + cp 50 percent + 1 ret nc ld a,4 call AICheckIfHPBelowFraction @@ -542,7 +542,7 @@ AgathaAI: jp AIUseSuperPotion LanceAI: - cp $80 + cp 50 percent + 1 ret nc ld a,5 call AICheckIfHPBelowFraction diff --git a/engine/overworld/movement.asm b/engine/overworld/movement.asm index cc4a818f..6fb388fd 100644 --- a/engine/overworld/movement.asm +++ b/engine/overworld/movement.asm @@ -670,7 +670,7 @@ GetTileSpriteStandsOn: ld c, a ld b, $0 inc l - ld a, [hl] ; c1x6: screen Y position + ld a, [hl] ; c1x6: screen X position srl a srl a srl a ; screen X tile diff --git a/engine/surfing_minigame.asm b/engine/surfing_minigame.asm index 380093f1..6bfcfb7c 100755 --- a/engine/surfing_minigame.asm +++ b/engine/surfing_minigame.asm @@ -716,7 +716,7 @@ Func_f848d: ld [wSurfingMinigameTrickFlags], a xor a ld [wChannelSoundIDs + CH7], a - ld a, SFX_UNKNOWN_801B3_4 + ld a, SFX_SURFING_JUMP call PlaySound ret @@ -752,7 +752,7 @@ SurfingMinigame_ScoreCurrentWave: call SetCurrentAnimatedObjectCallbackAndResetFrameStateRegisters xor a ld [wChannelSoundIDs + CH7], a - ld a, SFX_UNKNOWN_801B9_4 + ld a, SFX_SURFING_LAND call PlaySound ret @@ -914,7 +914,7 @@ SurfingMinigame_DPadAction: ld hl, ANIM_OBJ_FIELD_E add hl, bc ld [hl], a - ld a, SFX_UNKNOWN_801B6_4 + ld a, SFX_SURFING_FLIP call PlaySound ret @@ -1011,7 +1011,7 @@ SurfingMinigame_TileInteraction: .action_3 xor a ld [wChannelSoundIDs + CH7], a - ld a, SFX_UNKNOWN_801BF_4 + ld a, SFX_SURFING_CRASH call PlaySound and a ret @@ -1559,7 +1559,7 @@ SurfingMinigame_AddRemainingHPToTotal: pop bc dec c jr nz, .loop - ld a, SFX_UNKNOWN_801B0_4 + ld a, SFX_SURFING_ADD_POINTS call PlaySound and a ret @@ -1621,7 +1621,7 @@ SurfingMinigame_AddRadnessToTotal: pop bc dec c jr nz, .loop - ld a, SFX_UNKNOWN_801B0_4 + ld a, SFX_SURFING_ADD_POINTS call PlaySound and a ret |