diff options
Diffstat (limited to 'engine/battle')
17 files changed, 21 insertions, 0 deletions
diff --git a/engine/battle/ai/move.asm b/engine/battle/ai/move.asm index dd4357fe2..dd4357fe2 100755..100644 --- a/engine/battle/ai/move.asm +++ b/engine/battle/ai/move.asm diff --git a/engine/battle/ai/redundant.asm b/engine/battle/ai/redundant.asm index d09b4da73..d09b4da73 100755..100644 --- a/engine/battle/ai/redundant.asm +++ b/engine/battle/ai/redundant.asm diff --git a/engine/battle/ai/switch.asm b/engine/battle/ai/switch.asm index d397c8d32..d397c8d32 100755..100644 --- a/engine/battle/ai/switch.asm +++ b/engine/battle/ai/switch.asm diff --git a/engine/battle/anim_hp_bar.asm b/engine/battle/anim_hp_bar.asm index 5c453d0ff..5c453d0ff 100755..100644 --- a/engine/battle/anim_hp_bar.asm +++ b/engine/battle/anim_hp_bar.asm diff --git a/engine/battle/checkbattlescene.asm b/engine/battle/check_battle_scene.asm index 577c36e33..577c36e33 100644 --- a/engine/battle/checkbattlescene.asm +++ b/engine/battle/check_battle_scene.asm diff --git a/engine/battle/consumehelditem.asm b/engine/battle/consume_held_item.asm index d727a44e0..d727a44e0 100644 --- a/engine/battle/consumehelditem.asm +++ b/engine/battle/consume_held_item.asm diff --git a/engine/battle/link_result.asm b/engine/battle/link_result.asm index 8f456da9b..8f456da9b 100755..100644 --- a/engine/battle/link_result.asm +++ b/engine/battle/link_result.asm diff --git a/engine/battle/menu.asm b/engine/battle/menu.asm index 705df3729..705df3729 100755..100644 --- a/engine/battle/menu.asm +++ b/engine/battle/menu.asm diff --git a/engine/battle/move_effects/attract.asm b/engine/battle/move_effects/attract.asm index 026176694..026176694 100755..100644 --- a/engine/battle/move_effects/attract.asm +++ b/engine/battle/move_effects/attract.asm diff --git a/engine/battle/move_effects/present.asm b/engine/battle/move_effects/present.asm index a2ef5bc64..a2ef5bc64 100755..100644 --- a/engine/battle/move_effects/present.asm +++ b/engine/battle/move_effects/present.asm diff --git a/engine/battle/move_effects/transform.asm b/engine/battle/move_effects/transform.asm index 5ae7c1511..5ae7c1511 100755..100644 --- a/engine/battle/move_effects/transform.asm +++ b/engine/battle/move_effects/transform.asm diff --git a/engine/battle/read_trainer_party.asm b/engine/battle/read_trainer_party.asm index 3227236c1..3227236c1 100755..100644 --- a/engine/battle/read_trainer_party.asm +++ b/engine/battle/read_trainer_party.asm diff --git a/engine/battle/sliding_intro.asm b/engine/battle/sliding_intro.asm index 667f18191..667f18191 100755..100644 --- a/engine/battle/sliding_intro.asm +++ b/engine/battle/sliding_intro.asm diff --git a/engine/battle/trainer_huds.asm b/engine/battle/trainer_huds.asm index 0a18098ed..0a18098ed 100755..100644 --- a/engine/battle/trainer_huds.asm +++ b/engine/battle/trainer_huds.asm diff --git a/engine/battle/unreferenced_getgen1trainerclassname.asm b/engine/battle/unreferenced_getgen1trainerclassname.asm new file mode 100644 index 000000000..da8e98b61 --- /dev/null +++ b/engine/battle/unreferenced_getgen1trainerclassname.asm @@ -0,0 +1,21 @@ +Unreferenced_GetGen1TrainerClassName: ; 50a28 + ld hl, Gen1TrainerClassNames + ld a, [wTrainerClass] + dec a + ld c, a + ld b, 0 + add hl, bc + add hl, bc + ld a, [hli] + ld h, [hl] + ld l, a + ld de, wStringBuffer1 +.copy + ld a, [hli] + ld [de], a + inc de + cp "@" + jr nz, .copy + ret + +INCLUDE "data/text/unused_gen1_trainer_names.asm" diff --git a/engine/battle/updatebattlehuds.asm b/engine/battle/update_battle_huds.asm index 0c31f1c36..0c31f1c36 100644 --- a/engine/battle/updatebattlehuds.asm +++ b/engine/battle/update_battle_huds.asm diff --git a/engine/battle/used_move_text.asm b/engine/battle/used_move_text.asm index f2182f378..f2182f378 100755..100644 --- a/engine/battle/used_move_text.asm +++ b/engine/battle/used_move_text.asm |