Merge branch 'master' of https://github.com/pret/pokered

94 files changed, 1 insertions, 1 deletions

diff --git a/engine/battle/animations.asm b/engine/battle/animations.asm
index 4110e8b6..4110e8b6 100755..100644
--- a/engine/battle/animations.asm
+++ b/engine/battle/animations.asm
diff --git a/engine/battle/core.asm b/engine/battle/core.asm
index 415b287c..415b287c 100755..100644
--- a/engine/battle/core.asm
+++ b/engine/battle/core.asm
diff --git a/engine/battle/end_of_battle.asm b/engine/battle/end_of_battle.asm
index e64f54e7..e64f54e7 100755..100644
--- a/engine/battle/end_of_battle.asm
+++ b/engine/battle/end_of_battle.asm
diff --git a/engine/battle/ghost_marowak_anim.asm b/engine/battle/ghost_marowak_anim.asm
index 76d89ba9..fd21b29e 100644
--- a/engine/battle/ghost_marowak_anim.asm
+++ b/engine/battle/ghost_marowak_anim.asm
@@ -77,7 +77,7 @@ CopyMonPicFromBGToSpriteVRAM:
 	ld [hli], a
 	ld a, d
 	ld [hli], a
-	ld a, OAM_OBP1 | 4
+	ld a, OAM_OBP1 | OAM_HIGH_PALS
 	ld [hli], a
 	inc d
 	dec c
diff --git a/engine/battle/misc.asm b/engine/battle/misc.asm
index df9145f2..df9145f2 100755..100644
--- a/engine/battle/misc.asm
+++ b/engine/battle/misc.asm
diff --git a/engine/battle/read_trainer_party.asm b/engine/battle/read_trainer_party.asm
index 02fbfeda..02fbfeda 100755..100644
--- a/engine/battle/read_trainer_party.asm
+++ b/engine/battle/read_trainer_party.asm
diff --git a/engine/battle/safari_zone.asm b/engine/battle/safari_zone.asm
index a61f402f..a61f402f 100755..100644
--- a/engine/battle/safari_zone.asm
+++ b/engine/battle/safari_zone.asm
diff --git a/engine/events/card_key.asm b/engine/events/card_key.asm
index 10de5ed2..10de5ed2 100755..100644
--- a/engine/events/card_key.asm
+++ b/engine/events/card_key.asm
diff --git a/engine/events/cinnabar_lab.asm b/engine/events/cinnabar_lab.asm
index bccc95d1..bccc95d1 100755..100644
--- a/engine/events/cinnabar_lab.asm
+++ b/engine/events/cinnabar_lab.asm
diff --git a/engine/events/diploma2.asm b/engine/events/diploma2.asm
index 75ac104a..75ac104a 100755..100644
--- a/engine/events/diploma2.asm
+++ b/engine/events/diploma2.asm
diff --git a/engine/events/elevator.asm b/engine/events/elevator.asm
index 004893a0..004893a0 100755..100644
--- a/engine/events/elevator.asm
+++ b/engine/events/elevator.asm
diff --git a/engine/events/give_pokemon.asm b/engine/events/give_pokemon.asm
index efc184f8..efc184f8 100755..100644
--- a/engine/events/give_pokemon.asm
+++ b/engine/events/give_pokemon.asm
diff --git a/engine/events/hidden_items.asm b/engine/events/hidden_items.asm
index 63b95bcf..63b95bcf 100755..100644
--- a/engine/events/hidden_items.asm
+++ b/engine/events/hidden_items.asm
diff --git a/engine/events/in_game_trades.asm b/engine/events/in_game_trades.asm
index a0a23dfa..a0a23dfa 100755..100644
--- a/engine/events/in_game_trades.asm
+++ b/engine/events/in_game_trades.asm
diff --git a/engine/events/oaks_aide.asm b/engine/events/oaks_aide.asm
index f1801f5c..f1801f5c 100755..100644
--- a/engine/events/oaks_aide.asm
+++ b/engine/events/oaks_aide.asm
diff --git a/engine/events/pewter_guys.asm b/engine/events/pewter_guys.asm
index 532fa4bf..532fa4bf 100755..100644
--- a/engine/events/pewter_guys.asm
+++ b/engine/events/pewter_guys.asm
diff --git a/engine/events/pokecenter.asm b/engine/events/pokecenter.asm
index e007030a..e007030a 100755..100644
--- a/engine/events/pokecenter.asm
+++ b/engine/events/pokecenter.asm
diff --git a/engine/events/pokedex_rating.asm b/engine/events/pokedex_rating.asm
index 1086257a..1086257a 100755..100644
--- a/engine/events/pokedex_rating.asm
+++ b/engine/events/pokedex_rating.asm
diff --git a/engine/events/pokemart.asm b/engine/events/pokemart.asm
index c7cb8115..c7cb8115 100755..100644
--- a/engine/events/pokemart.asm
+++ b/engine/events/pokemart.asm
diff --git a/engine/events/prize_menu.asm b/engine/events/prize_menu.asm
index 87244119..87244119 100755..100644
--- a/engine/events/prize_menu.asm
+++ b/engine/events/prize_menu.asm
diff --git a/engine/events/saffron_guards.asm b/engine/events/saffron_guards.asm
index bf30b8c5..bf30b8c5 100755..100644
--- a/engine/events/saffron_guards.asm
+++ b/engine/events/saffron_guards.asm
diff --git a/engine/events/starter_dex.asm b/engine/events/starter_dex.asm
index 7cfe9af2..7cfe9af2 100755..100644
--- a/engine/events/starter_dex.asm
+++ b/engine/events/starter_dex.asm
diff --git a/engine/events/vending_machine.asm b/engine/events/vending_machine.asm
index 6ff6a5e4..6ff6a5e4 100755..100644
--- a/engine/events/vending_machine.asm
+++ b/engine/events/vending_machine.asm
diff --git a/engine/gfx/animated_objects.asm b/engine/gfx/animated_objects.asm
index 971af6b5..971af6b5 100755..100644
--- a/engine/gfx/animated_objects.asm
+++ b/engine/gfx/animated_objects.asm
diff --git a/engine/gfx/hp_bar.asm b/engine/gfx/hp_bar.asm
index b47b1fbd..b47b1fbd 100755..100644
--- a/engine/gfx/hp_bar.asm
+++ b/engine/gfx/hp_bar.asm
diff --git a/engine/gfx/load_pokedex_tiles.asm b/engine/gfx/load_pokedex_tiles.asm
index a3f69171..a3f69171 100755..100644
--- a/engine/gfx/load_pokedex_tiles.asm
+++ b/engine/gfx/load_pokedex_tiles.asm
diff --git a/engine/gfx/mon_icons.asm b/engine/gfx/mon_icons.asm
index 6e2cf0ba..6e2cf0ba 100755..100644
--- a/engine/gfx/mon_icons.asm
+++ b/engine/gfx/mon_icons.asm
diff --git a/engine/gfx/palettes.asm b/engine/gfx/palettes.asm
index b480c6d0..b480c6d0 100755..100644
--- a/engine/gfx/palettes.asm
+++ b/engine/gfx/palettes.asm
diff --git a/engine/items/item_effects.asm b/engine/items/item_effects.asm
index 00a575f1..00a575f1 100755..100644
--- a/engine/items/item_effects.asm
+++ b/engine/items/item_effects.asm
diff --git a/engine/items/itemfinder.asm b/engine/items/itemfinder.asm
index 7c15d4bb..7c15d4bb 100755..100644
--- a/engine/items/itemfinder.asm
+++ b/engine/items/itemfinder.asm
diff --git a/engine/items/tm_prices.asm b/engine/items/tm_prices.asm
index df9761bd..df9761bd 100755..100644
--- a/engine/items/tm_prices.asm
+++ b/engine/items/tm_prices.asm
diff --git a/engine/items/tmhm.asm b/engine/items/tmhm.asm
index a11cd736..a11cd736 100755..100644
--- a/engine/items/tmhm.asm
+++ b/engine/items/tmhm.asm
diff --git a/engine/items/tms.asm b/engine/items/tms.asm
index 40030675..40030675 100755..100644
--- a/engine/items/tms.asm
+++ b/engine/items/tms.asm
diff --git a/engine/items/town_map.asm b/engine/items/town_map.asm
index d385044a..d385044a 100755..100644
--- a/engine/items/town_map.asm
+++ b/engine/items/town_map.asm
diff --git a/engine/link/cable_club.asm b/engine/link/cable_club.asm
index c75ab200..c75ab200 100755..100644
--- a/engine/link/cable_club.asm
+++ b/engine/link/cable_club.asm
diff --git a/engine/link/cable_club_npc.asm b/engine/link/cable_club_npc.asm
index 4d0a0a8a..4d0a0a8a 100755..100644
--- a/engine/link/cable_club_npc.asm
+++ b/engine/link/cable_club_npc.asm
diff --git a/engine/math/multiply_divide.asm b/engine/math/multiply_divide.asm
index 2fcda158..2fcda158 100755..100644
--- a/engine/math/multiply_divide.asm
+++ b/engine/math/multiply_divide.asm
diff --git a/engine/math/random.asm b/engine/math/random.asm
index c8760157..c8760157 100755..100644
--- a/engine/math/random.asm
+++ b/engine/math/random.asm
diff --git a/engine/menus/league_pc.asm b/engine/menus/league_pc.asm
index 5551fd0b..5551fd0b 100755..100644
--- a/engine/menus/league_pc.asm
+++ b/engine/menus/league_pc.asm
diff --git a/engine/menus/main_menu.asm b/engine/menus/main_menu.asm
index 7d81d2f6..7d81d2f6 100755..100644
--- a/engine/menus/main_menu.asm
+++ b/engine/menus/main_menu.asm
diff --git a/engine/menus/naming_screen.asm b/engine/menus/naming_screen.asm
index 553c47d0..553c47d0 100755..100644
--- a/engine/menus/naming_screen.asm
+++ b/engine/menus/naming_screen.asm
diff --git a/engine/menus/oaks_pc.asm b/engine/menus/oaks_pc.asm
index 7743e5df..7743e5df 100755..100644
--- a/engine/menus/oaks_pc.asm
+++ b/engine/menus/oaks_pc.asm
diff --git a/engine/menus/party_menu.asm b/engine/menus/party_menu.asm
index 32f47f6a..32f47f6a 100755..100644
--- a/engine/menus/party_menu.asm
+++ b/engine/menus/party_menu.asm
diff --git a/engine/menus/pc.asm b/engine/menus/pc.asm
index 4c340e7b..4c340e7b 100755..100644
--- a/engine/menus/pc.asm
+++ b/engine/menus/pc.asm
diff --git a/engine/menus/players_pc.asm b/engine/menus/players_pc.asm
index 1fac030b..1fac030b 100755..100644
--- a/engine/menus/players_pc.asm
+++ b/engine/menus/players_pc.asm
diff --git a/engine/menus/pokedex.asm b/engine/menus/pokedex.asm
index 315e4805..315e4805 100755..100644
--- a/engine/menus/pokedex.asm
+++ b/engine/menus/pokedex.asm
diff --git a/engine/menus/save.asm b/engine/menus/save.asm
index bcb27ddf..bcb27ddf 100755..100644
--- a/engine/menus/save.asm
+++ b/engine/menus/save.asm
diff --git a/engine/menus/start_sub_menus.asm b/engine/menus/start_sub_menus.asm
index c054761c..c054761c 100755..100644
--- a/engine/menus/start_sub_menus.asm
+++ b/engine/menus/start_sub_menus.asm
diff --git a/engine/minigame/surfing_pikachu.asm b/engine/minigame/surfing_pikachu.asm
index 641c4f62..641c4f62 100755..100644
--- a/engine/minigame/surfing_pikachu.asm
+++ b/engine/minigame/surfing_pikachu.asm
diff --git a/engine/movie/credits.asm b/engine/movie/credits.asm
index 938579f3..938579f3 100755..100644
--- a/engine/movie/credits.asm
+++ b/engine/movie/credits.asm
diff --git a/engine/movie/evolution.asm b/engine/movie/evolution.asm
index 624a7f5f..624a7f5f 100755..100644
--- a/engine/movie/evolution.asm
+++ b/engine/movie/evolution.asm
diff --git a/engine/movie/hall_of_fame.asm b/engine/movie/hall_of_fame.asm
index 616a72e3..616a72e3 100755..100644
--- a/engine/movie/hall_of_fame.asm
+++ b/engine/movie/hall_of_fame.asm
diff --git a/engine/movie/intro.asm b/engine/movie/intro.asm
index a9774ff9..a9774ff9 100755..100644
--- a/engine/movie/intro.asm
+++ b/engine/movie/intro.asm
diff --git a/engine/movie/intro_yellow.asm b/engine/movie/intro_yellow.asm
index 673d207c..673d207c 100755..100644
--- a/engine/movie/intro_yellow.asm
+++ b/engine/movie/intro_yellow.asm
diff --git a/engine/movie/oak_speech/clear_save.asm b/engine/movie/oak_speech/clear_save.asm
index 2dd5f4a7..2dd5f4a7 100755..100644
--- a/engine/movie/oak_speech/clear_save.asm
+++ b/engine/movie/oak_speech/clear_save.asm
diff --git a/engine/movie/oak_speech/oak_speech.asm b/engine/movie/oak_speech/oak_speech.asm
index 7acbd693..7acbd693 100755..100644
--- a/engine/movie/oak_speech/oak_speech.asm
+++ b/engine/movie/oak_speech/oak_speech.asm
diff --git a/engine/movie/oak_speech/oak_speech2.asm b/engine/movie/oak_speech/oak_speech2.asm
index af31665b..af31665b 100755..100644
--- a/engine/movie/oak_speech/oak_speech2.asm
+++ b/engine/movie/oak_speech/oak_speech2.asm
diff --git a/engine/movie/splash.asm b/engine/movie/splash.asm
index 0b14dcaa..0b14dcaa 100755..100644
--- a/engine/movie/splash.asm
+++ b/engine/movie/splash.asm
diff --git a/engine/movie/title.asm b/engine/movie/title.asm
index cf1eecdb..cf1eecdb 100755..100644
--- a/engine/movie/title.asm
+++ b/engine/movie/title.asm
diff --git a/engine/movie/title_rb.asm b/engine/movie/title_rb.asm
index 597684df..597684df 100755..100644
--- a/engine/movie/title_rb.asm
+++ b/engine/movie/title_rb.asm
diff --git a/engine/movie/trade.asm b/engine/movie/trade.asm
index 7be100e0..7be100e0 100755..100644
--- a/engine/movie/trade.asm
+++ b/engine/movie/trade.asm
diff --git a/engine/movie/trade2.asm b/engine/movie/trade2.asm
index f0d91846..f0d91846 100755..100644
--- a/engine/movie/trade2.asm
+++ b/engine/movie/trade2.asm
diff --git a/engine/overworld/auto_movement.asm b/engine/overworld/auto_movement.asm
index a68da55f..a68da55f 100755..100644
--- a/engine/overworld/auto_movement.asm
+++ b/engine/overworld/auto_movement.asm
diff --git a/engine/overworld/cut.asm b/engine/overworld/cut.asm
index 564ad65a..564ad65a 100755..100644
--- a/engine/overworld/cut.asm
+++ b/engine/overworld/cut.asm
diff --git a/engine/overworld/cut2.asm b/engine/overworld/cut2.asm
index 1f691eef..1f691eef 100755..100644
--- a/engine/overworld/cut2.asm
+++ b/engine/overworld/cut2.asm
diff --git a/engine/overworld/doors.asm b/engine/overworld/doors.asm
index d38818fa..d38818fa 100755..100644
--- a/engine/overworld/doors.asm
+++ b/engine/overworld/doors.asm
diff --git a/engine/overworld/dust_smoke.asm b/engine/overworld/dust_smoke.asm
index 773def96..773def96 100755..100644
--- a/engine/overworld/dust_smoke.asm
+++ b/engine/overworld/dust_smoke.asm
diff --git a/engine/overworld/elevator.asm b/engine/overworld/elevator.asm
index b873ffad..b873ffad 100755..100644
--- a/engine/overworld/elevator.asm
+++ b/engine/overworld/elevator.asm
diff --git a/engine/overworld/emotion_bubbles.asm b/engine/overworld/emotion_bubbles.asm
index 3ad714e9..3ad714e9 100755..100644
--- a/engine/overworld/emotion_bubbles.asm
+++ b/engine/overworld/emotion_bubbles.asm
diff --git a/engine/overworld/healing_machine.asm b/engine/overworld/healing_machine.asm
index a081811b..a081811b 100755..100644
--- a/engine/overworld/healing_machine.asm
+++ b/engine/overworld/healing_machine.asm
diff --git a/engine/overworld/hidden_objects.asm b/engine/overworld/hidden_objects.asm
index 84108986..84108986 100755..100644
--- a/engine/overworld/hidden_objects.asm
+++ b/engine/overworld/hidden_objects.asm
diff --git a/engine/overworld/ledges.asm b/engine/overworld/ledges.asm
index 9925c528..9925c528 100755..100644
--- a/engine/overworld/ledges.asm
+++ b/engine/overworld/ledges.asm
diff --git a/engine/overworld/map_sprites.asm b/engine/overworld/map_sprites.asm
index c0fb4863..c0fb4863 100755..100644
--- a/engine/overworld/map_sprites.asm
+++ b/engine/overworld/map_sprites.asm
diff --git a/engine/overworld/npc_movement_2.asm b/engine/overworld/npc_movement_2.asm
index 2ced9da6..2ced9da6 100755..100644
--- a/engine/overworld/npc_movement_2.asm
+++ b/engine/overworld/npc_movement_2.asm
diff --git a/engine/overworld/player_animations.asm b/engine/overworld/player_animations.asm
index 5056c0b2..5056c0b2 100755..100644
--- a/engine/overworld/player_animations.asm
+++ b/engine/overworld/player_animations.asm
diff --git a/engine/overworld/trainer_sight.asm b/engine/overworld/trainer_sight.asm
index 816dea7f..816dea7f 100755..100644
--- a/engine/overworld/trainer_sight.asm
+++ b/engine/overworld/trainer_sight.asm
diff --git a/engine/pikachu/pikachu_emotions.asm b/engine/pikachu/pikachu_emotions.asm
index f4963f17..f4963f17 100755..100644
--- a/engine/pikachu/pikachu_emotions.asm
+++ b/engine/pikachu/pikachu_emotions.asm
diff --git a/engine/pikachu/pikachu_follow.asm b/engine/pikachu/pikachu_follow.asm
index 9575c341..9575c341 100755..100644
--- a/engine/pikachu/pikachu_follow.asm
+++ b/engine/pikachu/pikachu_follow.asm
diff --git a/engine/pikachu/pikachu_movement.asm b/engine/pikachu/pikachu_movement.asm
index 91c16999..91c16999 100755..100644
--- a/engine/pikachu/pikachu_movement.asm
+++ b/engine/pikachu/pikachu_movement.asm
diff --git a/engine/pikachu/pikachu_pcm.asm b/engine/pikachu/pikachu_pcm.asm
index bf1aa57f..bf1aa57f 100755..100644
--- a/engine/pikachu/pikachu_pcm.asm
+++ b/engine/pikachu/pikachu_pcm.asm
diff --git a/engine/pikachu/pikachu_pic_animation.asm b/engine/pikachu/pikachu_pic_animation.asm
index 4f56d542..4f56d542 100755..100644
--- a/engine/pikachu/pikachu_pic_animation.asm
+++ b/engine/pikachu/pikachu_pic_animation.asm
diff --git a/engine/pikachu/pikachu_status.asm b/engine/pikachu/pikachu_status.asm
index 5fc92ead..5fc92ead 100755..100644
--- a/engine/pikachu/pikachu_status.asm
+++ b/engine/pikachu/pikachu_status.asm
diff --git a/engine/pokemon/evos_moves.asm b/engine/pokemon/evos_moves.asm
index 3df780c1..3df780c1 100755..100644
--- a/engine/pokemon/evos_moves.asm
+++ b/engine/pokemon/evos_moves.asm
diff --git a/engine/pokemon/experience.asm b/engine/pokemon/experience.asm
index 427d2a7f..427d2a7f 100755..100644
--- a/engine/pokemon/experience.asm
+++ b/engine/pokemon/experience.asm
diff --git a/engine/pokemon/learn_move.asm b/engine/pokemon/learn_move.asm
index d365acd4..d365acd4 100755..100644
--- a/engine/pokemon/learn_move.asm
+++ b/engine/pokemon/learn_move.asm
diff --git a/engine/pokemon/set_types.asm b/engine/pokemon/set_types.asm
index e9235f13..e9235f13 100755..100644
--- a/engine/pokemon/set_types.asm
+++ b/engine/pokemon/set_types.asm
diff --git a/engine/pokemon/status_ailments.asm b/engine/pokemon/status_ailments.asm
index 3da1fc43..3da1fc43 100755..100644
--- a/engine/pokemon/status_ailments.asm
+++ b/engine/pokemon/status_ailments.asm
diff --git a/engine/pokemon/status_screen.asm b/engine/pokemon/status_screen.asm
index a2cfb595..a2cfb595 100755..100644
--- a/engine/pokemon/status_screen.asm
+++ b/engine/pokemon/status_screen.asm
diff --git a/engine/predefs.asm b/engine/predefs.asm
index a9877739..a9877739 100755..100644
--- a/engine/predefs.asm
+++ b/engine/predefs.asm
diff --git a/engine/printer/printer2.asm b/engine/printer/printer2.asm
index b257aff4..b257aff4 100755..100644
--- a/engine/printer/printer2.asm
+++ b/engine/printer/printer2.asm
diff --git a/engine/printer/serial.asm b/engine/printer/serial.asm
index fd4dd056..fd4dd056 100755..100644
--- a/engine/printer/serial.asm
+++ b/engine/printer/serial.asm
diff --git a/engine/slots/game_corner_slots.asm b/engine/slots/game_corner_slots.asm
index 48321974..48321974 100755..100644
--- a/engine/slots/game_corner_slots.asm
+++ b/engine/slots/game_corner_slots.asm
diff --git a/engine/slots/game_corner_slots2.asm b/engine/slots/game_corner_slots2.asm
index a4ba4ec1..a4ba4ec1 100755..100644
--- a/engine/slots/game_corner_slots2.asm
+++ b/engine/slots/game_corner_slots2.asm
diff --git a/engine/slots/slot_machine.asm b/engine/slots/slot_machine.asm
index ba007d9d..ba007d9d 100755..100644
--- a/engine/slots/slot_machine.asm
+++ b/engine/slots/slot_machine.asm