diff options
Diffstat (limited to 'engine')
81 files changed, 2 insertions, 2 deletions
diff --git a/engine/battle/anim_hp_bar.asm b/engine/battle/anim_hp_bar.asm index 9248ad4f..9248ad4f 100755..100644 --- a/engine/battle/anim_hp_bar.asm +++ b/engine/battle/anim_hp_bar.asm diff --git a/engine/battle/battle_transition.asm b/engine/battle/battle_transition.asm index 4de4d347..4de4d347 100755..100644 --- a/engine/battle/battle_transition.asm +++ b/engine/battle/battle_transition.asm diff --git a/engine/battle/start_battle.asm b/engine/battle/start_battle.asm index 7627a100..7627a100 100755..100644 --- a/engine/battle/start_battle.asm +++ b/engine/battle/start_battle.asm diff --git a/engine/battle/unreferenced_getgen1trainerclassname.asm b/engine/battle/unreferenced_getgen1trainerclassname.asm index 04532523..04532523 100755..100644 --- a/engine/battle/unreferenced_getgen1trainerclassname.asm +++ b/engine/battle/unreferenced_getgen1trainerclassname.asm diff --git a/engine/battle_anims/anim_commands.asm b/engine/battle_anims/anim_commands.asm index 6ec670d0..a60a2645 100755..100644 --- a/engine/battle_anims/anim_commands.asm +++ b/engine/battle_anims/anim_commands.asm @@ -131,6 +131,7 @@ BattleAnimRestoreHuds: call BattleAnimDelayFrame call WaitTop +; this block should just be "call UpdateBattleHuds" ld hl, UpdateBattleHuds ld a, BANK(UpdatePlayerHUD) rst FarCall @@ -539,7 +540,6 @@ BattleAnimCmd_IfParamEqual: ld [hl], d ret - BattleAnimCmd_IfParamAnd: call GetBattleAnimByte ld e, a @@ -892,7 +892,7 @@ BattleAnimCmd_Transform: ret BattleAnimCmd_RaiseSub: - xor a + xor a ; sScratch call OpenSRAM GetSubstitutePic: ; used only for BANK(GetSubstitutePic) diff --git a/engine/battle_anims/bg_effects.asm b/engine/battle_anims/bg_effects.asm index 2c20b40d..2c20b40d 100755..100644 --- a/engine/battle_anims/bg_effects.asm +++ b/engine/battle_anims/bg_effects.asm diff --git a/engine/battle_anims/core.asm b/engine/battle_anims/core.asm index fcde1be6..fcde1be6 100755..100644 --- a/engine/battle_anims/core.asm +++ b/engine/battle_anims/core.asm diff --git a/engine/battle_anims/functions.asm b/engine/battle_anims/functions.asm index e7bd9beb..e7bd9beb 100755..100644 --- a/engine/battle_anims/functions.asm +++ b/engine/battle_anims/functions.asm diff --git a/engine/battle_anims/helpers.asm b/engine/battle_anims/helpers.asm index 208ab614..208ab614 100755..100644 --- a/engine/battle_anims/helpers.asm +++ b/engine/battle_anims/helpers.asm diff --git a/engine/events/basement_key.asm b/engine/events/basement_key.asm index ab8c39ce..ab8c39ce 100755..100644 --- a/engine/events/basement_key.asm +++ b/engine/events/basement_key.asm diff --git a/engine/events/bug_contest/contest.asm b/engine/events/bug_contest/contest.asm index 6a3f7799..6a3f7799 100755..100644 --- a/engine/events/bug_contest/contest.asm +++ b/engine/events/bug_contest/contest.asm diff --git a/engine/events/bug_contest/display_stats.asm b/engine/events/bug_contest/display_stats.asm index bfa6d90b..bfa6d90b 100755..100644 --- a/engine/events/bug_contest/display_stats.asm +++ b/engine/events/bug_contest/display_stats.asm diff --git a/engine/events/card_key.asm b/engine/events/card_key.asm index c15b1def..c15b1def 100755..100644 --- a/engine/events/card_key.asm +++ b/engine/events/card_key.asm diff --git a/engine/events/engine_flags.asm b/engine/events/engine_flags.asm index 4099dfda..4099dfda 100755..100644 --- a/engine/events/engine_flags.asm +++ b/engine/events/engine_flags.asm diff --git a/engine/events/field_moves.asm b/engine/events/field_moves.asm index 3423f840..3423f840 100755..100644 --- a/engine/events/field_moves.asm +++ b/engine/events/field_moves.asm diff --git a/engine/events/fishing_gfx.asm b/engine/events/fishing_gfx.asm index c4a0b9fa..c4a0b9fa 100755..100644 --- a/engine/events/fishing_gfx.asm +++ b/engine/events/fishing_gfx.asm diff --git a/engine/events/forced_movement.asm b/engine/events/forced_movement.asm index fcd2793f..fcd2793f 100755..100644 --- a/engine/events/forced_movement.asm +++ b/engine/events/forced_movement.asm diff --git a/engine/events/fruit_trees.asm b/engine/events/fruit_trees.asm index 0177eb6f..0177eb6f 100755..100644 --- a/engine/events/fruit_trees.asm +++ b/engine/events/fruit_trees.asm diff --git a/engine/events/haircut.asm b/engine/events/haircut.asm index 32043af1..32043af1 100755..100644 --- a/engine/events/haircut.asm +++ b/engine/events/haircut.asm diff --git a/engine/events/halloffame.asm b/engine/events/halloffame.asm index 53ab9f9a..53ab9f9a 100755..100644 --- a/engine/events/halloffame.asm +++ b/engine/events/halloffame.asm diff --git a/engine/events/happiness_egg.asm b/engine/events/happiness_egg.asm index bb2e949c..bb2e949c 100755..100644 --- a/engine/events/happiness_egg.asm +++ b/engine/events/happiness_egg.asm diff --git a/engine/events/heal_machine_anim.asm b/engine/events/heal_machine_anim.asm index 002d4ad4..002d4ad4 100755..100644 --- a/engine/events/heal_machine_anim.asm +++ b/engine/events/heal_machine_anim.asm diff --git a/engine/events/lucky_number.asm b/engine/events/lucky_number.asm index 2a6991ac..2a6991ac 100755..100644 --- a/engine/events/lucky_number.asm +++ b/engine/events/lucky_number.asm diff --git a/engine/events/magnet_train.asm b/engine/events/magnet_train.asm index 715c801c..715c801c 100755..100644 --- a/engine/events/magnet_train.asm +++ b/engine/events/magnet_train.asm diff --git a/engine/events/misc_scripts.asm b/engine/events/misc_scripts.asm index e9006332..e9006332 100755..100644 --- a/engine/events/misc_scripts.asm +++ b/engine/events/misc_scripts.asm diff --git a/engine/events/overworld.asm b/engine/events/overworld.asm index 4f2ba801..4f2ba801 100755..100644 --- a/engine/events/overworld.asm +++ b/engine/events/overworld.asm diff --git a/engine/events/poisonstep.asm b/engine/events/poisonstep.asm index 98a6e25a..98a6e25a 100755..100644 --- a/engine/events/poisonstep.asm +++ b/engine/events/poisonstep.asm diff --git a/engine/events/poisonstep_pals.asm b/engine/events/poisonstep_pals.asm index 2752f5a7..2752f5a7 100755..100644 --- a/engine/events/poisonstep_pals.asm +++ b/engine/events/poisonstep_pals.asm diff --git a/engine/events/pokerus/check_pokerus.asm b/engine/events/pokerus/check_pokerus.asm index 201a3713..201a3713 100755..100644 --- a/engine/events/pokerus/check_pokerus.asm +++ b/engine/events/pokerus/check_pokerus.asm diff --git a/engine/events/sacred_ash.asm b/engine/events/sacred_ash.asm index d105b2fb..d105b2fb 100755..100644 --- a/engine/events/sacred_ash.asm +++ b/engine/events/sacred_ash.asm diff --git a/engine/events/shuckle.asm b/engine/events/shuckle.asm index 668a99b0..668a99b0 100755..100644 --- a/engine/events/shuckle.asm +++ b/engine/events/shuckle.asm diff --git a/engine/events/specials.asm b/engine/events/specials.asm index 91ca4208..91ca4208 100755..100644 --- a/engine/events/specials.asm +++ b/engine/events/specials.asm diff --git a/engine/events/squirtbottle.asm b/engine/events/squirtbottle.asm index 411b5c2e..411b5c2e 100755..100644 --- a/engine/events/squirtbottle.asm +++ b/engine/events/squirtbottle.asm diff --git a/engine/events/std_collision.asm b/engine/events/std_collision.asm index 8c54c041..8c54c041 100755..100644 --- a/engine/events/std_collision.asm +++ b/engine/events/std_collision.asm diff --git a/engine/events/sweet_scent.asm b/engine/events/sweet_scent.asm index 9b99a256..9b99a256 100755..100644 --- a/engine/events/sweet_scent.asm +++ b/engine/events/sweet_scent.asm diff --git a/engine/events/whiteout.asm b/engine/events/whiteout.asm index 635be636..635be636 100755..100644 --- a/engine/events/whiteout.asm +++ b/engine/events/whiteout.asm diff --git a/engine/gfx/cgb_layouts.asm b/engine/gfx/cgb_layouts.asm index a9a2038a..a9a2038a 100755..100644 --- a/engine/gfx/cgb_layouts.asm +++ b/engine/gfx/cgb_layouts.asm diff --git a/engine/gfx/color.asm b/engine/gfx/color.asm index 37b1d7ba..37b1d7ba 100755..100644 --- a/engine/gfx/color.asm +++ b/engine/gfx/color.asm diff --git a/engine/gfx/mon_icons.asm b/engine/gfx/mon_icons.asm index d0d3856e..d0d3856e 100755..100644 --- a/engine/gfx/mon_icons.asm +++ b/engine/gfx/mon_icons.asm diff --git a/engine/gfx/place_graphic.asm b/engine/gfx/place_graphic.asm index 4092ad35..4092ad35 100755..100644 --- a/engine/gfx/place_graphic.asm +++ b/engine/gfx/place_graphic.asm diff --git a/engine/gfx/sgb_layouts.asm b/engine/gfx/sgb_layouts.asm index db4e929f..db4e929f 100755..100644 --- a/engine/gfx/sgb_layouts.asm +++ b/engine/gfx/sgb_layouts.asm diff --git a/engine/gfx/sprite_anims.asm b/engine/gfx/sprite_anims.asm index a6e717e8..a6e717e8 100755..100644 --- a/engine/gfx/sprite_anims.asm +++ b/engine/gfx/sprite_anims.asm diff --git a/engine/gfx/sprites.asm b/engine/gfx/sprites.asm index 824ceac4..824ceac4 100755..100644 --- a/engine/gfx/sprites.asm +++ b/engine/gfx/sprites.asm diff --git a/engine/items/item_effects.asm b/engine/items/item_effects.asm index 35a7cd6c..35a7cd6c 100755..100644 --- a/engine/items/item_effects.asm +++ b/engine/items/item_effects.asm diff --git a/engine/items/items.asm b/engine/items/items.asm index ef0f10dd..ef0f10dd 100755..100644 --- a/engine/items/items.asm +++ b/engine/items/items.asm diff --git a/engine/items/pack.asm b/engine/items/pack.asm index e7caceca..e7caceca 100755..100644 --- a/engine/items/pack.asm +++ b/engine/items/pack.asm diff --git a/engine/items/tmhm2.asm b/engine/items/tmhm2.asm index eb3eb58e..eb3eb58e 100755..100644 --- a/engine/items/tmhm2.asm +++ b/engine/items/tmhm2.asm diff --git a/engine/link/init_list.asm b/engine/link/init_list.asm index b85cf001..b85cf001 100755..100644 --- a/engine/link/init_list.asm +++ b/engine/link/init_list.asm diff --git a/engine/link/place_waiting_text.asm b/engine/link/place_waiting_text.asm index 5c31c314..5c31c314 100755..100644 --- a/engine/link/place_waiting_text.asm +++ b/engine/link/place_waiting_text.asm diff --git a/engine/math/math.asm b/engine/math/math.asm index d5df3c34..d5df3c34 100755..100644 --- a/engine/math/math.asm +++ b/engine/math/math.asm diff --git a/engine/menus/delete_save.asm b/engine/menus/delete_save.asm index a3ea661d..a3ea661d 100755..100644 --- a/engine/menus/delete_save.asm +++ b/engine/menus/delete_save.asm diff --git a/engine/menus/savemenu_copytilemapatonce.asm b/engine/menus/savemenu_copytilemapatonce.asm index 4b567a58..4b567a58 100755..100644 --- a/engine/menus/savemenu_copytilemapatonce.asm +++ b/engine/menus/savemenu_copytilemapatonce.asm diff --git a/engine/movie/credits.asm b/engine/movie/credits.asm index 533c3d79..533c3d79 100755..100644 --- a/engine/movie/credits.asm +++ b/engine/movie/credits.asm diff --git a/engine/movie/init_hof_credits.asm b/engine/movie/init_hof_credits.asm index 70a9b6e7..70a9b6e7 100755..100644 --- a/engine/movie/init_hof_credits.asm +++ b/engine/movie/init_hof_credits.asm diff --git a/engine/overworld/map_object_action.asm b/engine/overworld/map_object_action.asm index 8f749f84..8f749f84 100755..100644 --- a/engine/overworld/map_object_action.asm +++ b/engine/overworld/map_object_action.asm diff --git a/engine/overworld/map_objects.asm b/engine/overworld/map_objects.asm index 62b1df41..62b1df41 100755..100644 --- a/engine/overworld/map_objects.asm +++ b/engine/overworld/map_objects.asm diff --git a/engine/overworld/movement.asm b/engine/overworld/movement.asm index 1a819acb..1a819acb 100755..100644 --- a/engine/overworld/movement.asm +++ b/engine/overworld/movement.asm diff --git a/engine/overworld/npc_movement.asm b/engine/overworld/npc_movement.asm index 01d49d21..01d49d21 100755..100644 --- a/engine/overworld/npc_movement.asm +++ b/engine/overworld/npc_movement.asm diff --git a/engine/overworld/player_movement.asm b/engine/overworld/player_movement.asm index 6747c0ef..6747c0ef 100755..100644 --- a/engine/overworld/player_movement.asm +++ b/engine/overworld/player_movement.asm diff --git a/engine/overworld/player_object.asm b/engine/overworld/player_object.asm index cd886bc3..cd886bc3 100755..100644 --- a/engine/overworld/player_object.asm +++ b/engine/overworld/player_object.asm diff --git a/engine/overworld/player_step.asm b/engine/overworld/player_step.asm index a290730c..a290730c 100755..100644 --- a/engine/overworld/player_step.asm +++ b/engine/overworld/player_step.asm diff --git a/engine/overworld/time.asm b/engine/overworld/time.asm index a829cd4f..a829cd4f 100755..100644 --- a/engine/overworld/time.asm +++ b/engine/overworld/time.asm diff --git a/engine/overworld/variables.asm b/engine/overworld/variables.asm index 406cf715..406cf715 100755..100644 --- a/engine/overworld/variables.asm +++ b/engine/overworld/variables.asm diff --git a/engine/phone/phonering_copytilemapatonce.asm b/engine/phone/phonering_copytilemapatonce.asm index 6ce141b5..6ce141b5 100755..100644 --- a/engine/phone/phonering_copytilemapatonce.asm +++ b/engine/phone/phonering_copytilemapatonce.asm diff --git a/engine/pokedex/pokedex.asm b/engine/pokedex/pokedex.asm index 039766e7..039766e7 100755..100644 --- a/engine/pokedex/pokedex.asm +++ b/engine/pokedex/pokedex.asm diff --git a/engine/pokemon/caught_data.asm b/engine/pokemon/caught_data.asm index 408e284a..408e284a 100755..100644 --- a/engine/pokemon/caught_data.asm +++ b/engine/pokemon/caught_data.asm diff --git a/engine/pokemon/evolve.asm b/engine/pokemon/evolve.asm index 5c6d68b0..5c6d68b0 100755..100644 --- a/engine/pokemon/evolve.asm +++ b/engine/pokemon/evolve.asm diff --git a/engine/pokemon/experience.asm b/engine/pokemon/experience.asm index 7d026704..7d026704 100755..100644 --- a/engine/pokemon/experience.asm +++ b/engine/pokemon/experience.asm diff --git a/engine/pokemon/health.asm b/engine/pokemon/health.asm index d11a073b..d11a073b 100755..100644 --- a/engine/pokemon/health.asm +++ b/engine/pokemon/health.asm diff --git a/engine/pokemon/mail.asm b/engine/pokemon/mail.asm index 9da39149..9da39149 100755..100644 --- a/engine/pokemon/mail.asm +++ b/engine/pokemon/mail.asm diff --git a/engine/pokemon/mon_stats.asm b/engine/pokemon/mon_stats.asm index 04285f87..04285f87 100755..100644 --- a/engine/pokemon/mon_stats.asm +++ b/engine/pokemon/mon_stats.asm diff --git a/engine/pokemon/move_mon.asm b/engine/pokemon/move_mon.asm index b1988f68..b1988f68 100755..100644 --- a/engine/pokemon/move_mon.asm +++ b/engine/pokemon/move_mon.asm diff --git a/engine/pokemon/party_menu.asm b/engine/pokemon/party_menu.asm index 93f9b93b..93f9b93b 100755..100644 --- a/engine/pokemon/party_menu.asm +++ b/engine/pokemon/party_menu.asm diff --git a/engine/pokemon/switchpartymons.asm b/engine/pokemon/switchpartymons.asm index 24d19df6..24d19df6 100755..100644 --- a/engine/pokemon/switchpartymons.asm +++ b/engine/pokemon/switchpartymons.asm diff --git a/engine/pokemon/tempmon.asm b/engine/pokemon/tempmon.asm index 97ce1ee7..97ce1ee7 100755..100644 --- a/engine/pokemon/tempmon.asm +++ b/engine/pokemon/tempmon.asm diff --git a/engine/pokemon/types.asm b/engine/pokemon/types.asm index 3c9d28cd..3c9d28cd 100755..100644 --- a/engine/pokemon/types.asm +++ b/engine/pokemon/types.asm diff --git a/engine/predef.asm b/engine/predef.asm index e18765b0..e18765b0 100755..100644 --- a/engine/predef.asm +++ b/engine/predef.asm diff --git a/engine/printer/printer.asm b/engine/printer/printer.asm index df8ca355..df8ca355 100755..100644 --- a/engine/printer/printer.asm +++ b/engine/printer/printer.asm diff --git a/engine/printer/printer_serial.asm b/engine/printer/printer_serial.asm index 37b06a9f..37b06a9f 100755..100644 --- a/engine/printer/printer_serial.asm +++ b/engine/printer/printer_serial.asm diff --git a/engine/rtc/reset_password.asm b/engine/rtc/reset_password.asm index b935d747..b935d747 100755..100644 --- a/engine/rtc/reset_password.asm +++ b/engine/rtc/reset_password.asm diff --git a/engine/tilesets/timeofday_pals.asm b/engine/tilesets/timeofday_pals.asm index 8a92484a..8a92484a 100755..100644 --- a/engine/tilesets/timeofday_pals.asm +++ b/engine/tilesets/timeofday_pals.asm |