entry hazards - stealth rock

bpre.sym

@@ -37,11 +37,12 @@ flag_check = 0x0806E6D1;
 get_bs_elem_env_index = 0x0800FC2D;
 load_battle_screen_elements_1 = 0x0800F261;
 npc_states = 0x02036E38;
-battlescript_counter = 0x02023D74;
+battlescript_cursor = 0x02023D74;
 item_table = 0x0876DD80;
 execute_battle_script = 0x0801BC24;
 dp_01_prepare_buffer = 0x0800D8B1;
 wram_decompress = 0x081E3B70|1;
+battle_script_push = 0x08017544|1;
 
 fade_screen = 0x08070589;
 fade_update = 0x080704D1;
@@ -53,9 +54,10 @@ obj_sync = 0x08006BA9;
 
 clear_flag = 0x0806E6A9;
 
-
 divide = 0x081E4018;
 
+get_side_from_bank = 0x080751C4|1;
+
 decompression_buffer = 0x0201C000;
 superstate = 0x030030F0;
 
@@ -63,10 +65,10 @@ fade_controller = 0x02037AB8;
 
 weather_turns = 0x02023F48;
 battle_type_flags = 0x02022B4C;
-battle_active_side = 0x02023BC4;
+battle_active_bank = 0x02023BC4;
 battle_num_active_sides = 0x02023BCC;
 battle_mode = 0x02023BE3;
-battle_data	= 0x02023BE4;
+battle_participants	= 0x02023BE4;
 battle_data_ability = 0x02023C04;
 battle_data_current_hp = 0x02023C0C;
 battle_executed_move = 0x02023D4A;
@@ -81,6 +83,9 @@ battle_string_message_table = 0x083FDF3C;
 battle_crit_loc = 0x02023D71;
 battle_base_power = 0x02024020;
 battle_side_unknown = 0x02023FDB;
+battle_side_timers = 0x02023DE4;
+battle_hitmarker = 0x02023dd0;
+side_affecting_halfword = 0x2023DDE;
 
 battle_status3_bits_pbs = 0x02023DFC;
 
@@ -94,3 +99,4 @@ mplay_table = 0x084A329C;
 m4aSongNumStart = 0x081DD0F5;
 MPlayStart_rev01 = 0x081DD859;
 MPlayContinue = 0x081DCFF9;
+__aeabi_idiv = 0x081E460C|1;

data/pkmn_tables/pokemon_stats.S

@@ -7,7 +7,7 @@ pokemon_stats:
 .hword 0, 0 
 .byte 255, 20, 100, 4, 15, 15, 0, 0, 0, 8, 0, 0
  
-.byte 45, 49, 49, 45, 65, 65, 12, 3, 45, 64, 0, 1 
+.byte 45, 49, 49, 45, 65, 65, 2, 10, 45, 64, 0, 1 
 .hword 0, 0 
 .byte 31, 20, 70, 3, 1, 7, 65, 34, 0, 3, 0, 0
  

main.asm

@@ -1,6 +1,6 @@
 .gba
 .thumb
-.open "base/bpre0.gba","build/Pokémon SotS.gba",0x08000000
+.open "base/bpre0.gba","build/pkmn_sots.gba",0x08000000
 
 .include "patches/split_physical_special.asm"
 .include "patches/hooks.asm"
@@ -29,7 +29,7 @@
 .include "patches/pokemon_data/pokemon_icons.asm"
 
 .include "patches/battle_engine/malloc.asm"
-
+.include "patches/battle_engine/battle_engine.asm"
 
 .org 0x09000000
 .importobj "object/linked.o"

patches/battle_engine/battle_engine.asm

@@ -0,0 +1,4 @@
+.org 0x08024E80
+ldr r0, =entry_hazards_hook|1
+bx r0
+.pool

src/battle_engine/battle_help.c

@@ -0,0 +1,95 @@
+#include "battle_help.h"
+
+//from kds emerald battle engine upgrade
+
+u8 type_effectiveness_table[TYPE_FAIRY-0x4][TYPE_FAIRY-0x4] = {
+    {10,10,10,10,10,05,10,00,05,10,10,10,10,10,10,10,10,10,10}, //normal
+    {20,10,05,05,10,20,05,00,20,10,10,10,10,10,05,20,10,20,05}, //fight
+    {10,20,10,10,10,05,20,10,05,10,10,10,20,05,10,10,10,10,10}, //flying
+    {10,10,10,05,05,05,10,05,00,10,10,10,20,10,10,10,10,10,20}, //poison
+    {10,10,00,20,10,20,05,10,20,10,20,10,05,20,10,10,10,10,10}, //ground
+    {10,05,20,10,05,10,20,10,05,10,20,10,10,10,10,20,10,10,10}, //rock
+    {10,05,05,05,10,10,10,05,05,10,05,10,20,10,20,10,10,20,05}, //bug
+    {00,10,10,10,10,10,10,20,10,10,10,10,10,10,20,10,10,05,10}, //ghost
+    {10,10,10,10,10,20,10,10,05,10,05,05,10,05,10,20,10,10,20}, //steel
+    {10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10}, //egg
+    {10,10,10,10,10,05,20,10,20,10,05,05,20,10,10,20,05,10,10}, //fire
+    {10,10,10,10,20,20,10,10,10,10,20,05,05,10,10,10,05,10,10}, //water
+    {10,10,05,05,20,20,05,10,05,10,05,20,05,10,10,10,05,10,10}, //grass
+    {10,10,20,10,00,10,10,10,10,10,10,20,05,05,10,10,05,10,10}, //electric
+    {10,20,10,20,10,10,10,10,05,10,10,10,10,10,05,10,10,00,10}, //psychic
+    {10,10,20,10,20,10,10,10,05,10,05,05,20,10,10,05,20,10,10}, //ice
+    {10,10,10,10,10,10,10,10,05,10,10,10,10,10,10,10,20,10,00}, //dragon
+    {10,05,10,10,10,10,10,20,10,10,10,10,10,10,20,10,10,05,05}, //dark
+    {10,20,10,05,10,10,10,10,05,10,05,10,10,10,10,10,20,20,10}  //fairy
+};
+
+u16 damage_type_effectiveness_update(u8 attacking_type, u8 defending_type, u8 atk_bank, u8 def_bank, u16 chained_effect, u8 airstatus)
+{
+	u8 effect,atype=attacking_type,dtype=defending_type;
+    if(!chained_effect || atype==TYPE_EGG || dtype==TYPE_EGG)
+        return chained_effect;
+
+    if(atype>=TYPE_FAIRY)
+        atype=atype-5;
+
+    if(dtype>=TYPE_FAIRY)
+        dtype=dtype-5;
+	effect=type_effectiveness_table[atype][dtype];
+	
+	if (custom_battle_struct.ptr->various.inverse_battle)
+    {
+        if (effect == 20)
+        {
+            effect = 5;
+        }
+        else if (effect == 5 || effect == 0)
+        {
+            effect = 20;
+        }
+    }
+	//handle normal / fighting on ghost
+	if ((((attacking_type == TYPE_NORMAL || attacking_type == TYPE_FIGHTING) && defending_type == TYPE_GHOST && ((battle_participants[def_bank].status2.foresight))) || battle_participants[atk_bank].ability_id == ABILITY_SCRAPPY) && effect == 0)
+    {
+        effect = 10;
+    }
+	//handle other effectiveness changers here
+	
+	switch(effect)
+    {
+        case 0:
+            chained_effect = 0;
+            break;
+        case 5:
+            chained_effect = chained_effect>>1;
+            break;
+        case 20:
+            chained_effect = chained_effect<<1;
+            break;
+    }
+	return chained_effect;
+	
+}
+
+u16 apply_type_effectiveness(u16 chained_effect, u8 move_type, u8 target_bank, u8 atk_bank, u8 airstatus)
+{
+    u8 defender_type1 = battle_participants[target_bank].type1;
+    u8 defender_type2 = battle_participants[target_bank].type2;
+    //set different types
+    if (defender_type2 == defender_type1)
+        defender_type2 = TYPE_EGG;
+    chained_effect = damage_type_effectiveness_update(move_type, defender_type1, atk_bank, target_bank, chained_effect, airstatus);
+    chained_effect = damage_type_effectiveness_update(move_type, defender_type2, atk_bank, target_bank, chained_effect, airstatus);
+    return chained_effect;
+}
+
+u16 type_effectiveness_calc(u16 move, u8 move_type, u8 atk_bank, u8 def_bank, u8 effects_handling_and_recording)
+{
+	u16 chained_effect = 64;
+	//TODO: double_type moves
+	//TODO: get air status
+	chained_effect = apply_type_effectiveness(chained_effect, move_type, def_bank, atk_bank, 2);
+	//TODO: save into structs
+	//TODO: effect_handling_and_recoring
+	return chained_effect;
+}

src/battle_engine/battle_help.h

@@ -0,0 +1,9 @@
+#include <battle.h>
+
+#ifndef BATTLE_HELP_H_
+#define BATTLE_HELP_H_
+
+u16 damage_type_effectiveness_update(u8 attacking_type, u8 defending_type, u8 atk_bank, u8 def_bank, u16 chained_effect, u8 airstatus);
+u16 apply_type_effectiveness(u16 chained_effect, u8 move_type, u8 target_bank, u8 atk_bank, u8 airstatus);
+u16 type_effectiveness_calc(u16 move, u8 move_type, u8 atk_bank, u8 def_bank, u8 effects_handling_and_recording);
+#endif

src/battle_engine/entry_hazards.c

@@ -0,0 +1,70 @@
+#include "battle_help.h"
+#include <bpre.h>
+
+extern void* bs_stealth_rock;
+
+u8 execute_entry_hazards()
+{
+	u8 active_side = get_side_from_bank(battle_active_bank);
+	u8 has_effect = 0;
+	struct side_affecting* active_side_affecting = &custom_battle_struct.ptr->side_affecting[active_side];
+	//Debug
+	//side_affecting_halfword[active_side].spikes_on=1;
+	//battle_side_timers[active_side].spikes_amount=4;
+	active_side_affecting->stealth_rock=1;
+	//side_affecting_halfword[active_side].spikes_damage_done=0;
+	
+	if(side_affecting_halfword[active_side].spikes_on && !(side_affecting_halfword[active_side].spikes_damage_done))
+	{
+		//spikes lay down, deal spiky damage
+		u32 damage = (battle_participants[battle_active_bank].max_hp) / ((5 - battle_side_timers[active_side].spikes_amount) * 2);
+        if (damage == 0)
+            damage = 1;
+        battle_damage_store = damage;
+		
+		side_affecting_halfword[active_side].spikes_damage_done = 1;
+		battle_script_push();
+		battlescript_cursor = (void*)(0x081D8CBE);
+		has_effect = 1;
+	}
+	else if(active_side_affecting->stealth_rock && !(active_side_affecting->stealth_rock_done))
+	{
+		active_side_affecting->stealth_rock_done=1;
+		//check for magic guard here
+		u32 damage = battle_participants[battle_active_bank].max_hp;
+		switch (type_effectiveness_calc(MOVE_STEALTH_ROCK, TYPE_ROCK, battle_active_bank^1, battle_active_bank, 0) >> 4)
+		{
+			case 1:
+				damage = damage >> 5;
+				break;
+			case 2:
+				damage = damage >> 4;
+				break;
+			case 4:
+				damage = damage >> 3;
+				break;
+			case 8:
+				damage = damage >> 2;
+				break;
+			case 16:
+				damage = damage >> 1;
+				break;
+		}
+		if(damage == 0)
+			damage = 1;
+		battle_damage_store = damage;
+		
+		battle_script_push();
+		//spikes for now
+		battlescript_cursor = bs_stealth_rock;
+		has_effect = 1;
+	}
+	
+	if (has_effect)
+    {
+       custom_battle_struct.ptr->various.var1 = battle_active_bank;
+       battle_participants[battle_active_bank].status2.destinny_bond = 0;
+       battle_hitmarker &= 0xFFFFFFBF;
+    }
+	return has_effect;
+}

src/battle_engine/entry_hazards_hook.S

@@ -0,0 +1,17 @@
+.text
+.align 2
+.thumb
+
+.global entry_hazards_hook
+entry_hazards_hook:
+
+	bl execute_entry_hazards
+	cmp r0, #0
+	beq return
+	ldr r0, =0x80250C6|1
+	bx r0
+return:
+	
+	ldr r0, =0x8024F88|1
+	bx r0
+

src/battle_engine/scripts/hazards.S

@@ -0,0 +1,23 @@
+#include <battle_script.h>
+
+.text
+.align 2
+.thumb
+
+.global bs_stealth_rock_int
+bs_stealth_rock_int:
+
+orword 0x2023DD0 0x100100
+graphicalhpupdate 0x0
+datahpupdate 0x0
+setword 0x0203C020 str_stealth_rock
+printstring 0x184
+waitmessage 0x40
+faintpokemon 0x0 0x0 0x0
+faintpokemon 0x0 0x1 0x81D8CDF
+return
+
+.align 2
+.global bs_stealth_rock
+bs_stealth_rock:
+.word bs_stealth_rock_int

src/include/abilities.h

@@ -0,0 +1,198 @@
+#ifndef ABILITY_IDS
+#define ABILITY_IDS
+
+
+#define ABILITY_NO_ABILITY 0x0
+#define ABILITY_STENCH 0x1
+#define ABILITY_DRIZZLE 0x2
+#define ABILITY_SPEED_BOOST 0x3
+#define ABILITY_BATTLE_ARMOR 0x4
+#define ABILITY_STURDY 0x5
+#define ABILITY_DAMP 0x6
+#define ABILITY_LIMBER 0x7
+#define ABILITY_SAND_VEIL 0x8
+#define ABILITY_STATIC 0x9
+#define ABILITY_VOLT_ABSORB 0xA
+#define ABILITY_WATER_ABSORB 0xB
+#define ABILITY_OBLIVIOUS 0xC
+#define ABILITY_CLOUD_NINE 0xD
+#define ABILITY_COMPOUND_EYES 0xE
+#define ABILITY_INSOMNIA 0xF
+#define ABILITY_COLOR_CHANGE 0x10
+#define ABILITY_IMMUNITY 0x11
+#define ABILITY_FLASH_FIRE 0x12
+#define ABILITY_SHIELD_DUST 0x13
+#define ABILITY_OWN_TEMPO 0x14
+#define ABILITY_SUCTION_CUPS 0x15
+#define ABILITY_INTIMIDATE 0x16
+#define ABILITY_SHADOW_TAG 0x17
+#define ABILITY_ROUGH_SKIN 0x18
+#define ABILITY_WONDER_GUARD 0x19
+#define ABILITY_LEVITATE 0x1A
+#define ABILITY_EFFECT_SPORE 0x1B
+#define ABILITY_SYNCHRONIZE 0x1C
+#define ABILITY_CLEAR_BODY 0x1D
+#define ABILITY_NATURAL_CURE 0x1E
+#define ABILITY_LIGHTNING_ROD 0x1F
+#define ABILITY_SERENE_GRACE 0x20
+#define ABILITY_SWIFT_SWIM 0x21
+#define ABILITY_CHLOROPHYLL 0x22
+#define ABILITY_ILLUMINATE 0x23
+#define ABILITY_TRACE 0x24
+#define ABILITY_HUGE_POWER 0x25
+#define ABILITY_POISON_POINT 0x26
+#define ABILITY_INNER_FOCUS 0x27
+#define ABILITY_MAGMA_ARMOR 0x28
+#define ABILITY_WATER_VEIL 0x29
+#define ABILITY_MAGNET_PULL 0x2A
+#define ABILITY_SOUNDPROOF 0x2B
+#define ABILITY_RAIN_DISH 0x2C
+#define ABILITY_SAND_STREAM 0x2D
+#define ABILITY_PRESSURE 0x2E
+#define ABILITY_THICK_FAT 0x2F
+#define ABILITY_EARLY_BIRD 0x30
+#define ABILITY_FLAME_BODY 0x31
+#define ABILITY_RUN_AWAY 0x32
+#define ABILITY_KEEN_EYE 0x33
+#define ABILITY_HYPER_CUTTER 0x34
+#define ABILITY_PICKUP 0x35
+#define ABILITY_TRUANT 0x36
+#define ABILITY_HUSTLE 0x37
+#define ABILITY_CUTE_CHARM 0x38
+#define ABILITY_PLUS 0x39
+#define ABILITY_MINUS 0x3A
+#define ABILITY_FORECAST 0x3B
+#define ABILITY_STICKY_HOLD 0x3C
+#define ABILITY_SHED_SKIN 0x3D
+#define ABILITY_GUTS 0x3E
+#define ABILITY_MARVEL_SCALE 0x3F
+#define ABILITY_LIQUID_OOZE 0x40
+#define ABILITY_OVERGROW 0x41
+#define ABILITY_BLAZE 0x42
+#define ABILITY_TORRENT 0x43
+#define ABILITY_SWARM 0x44
+#define ABILITY_ROCK_HEAD 0x45
+#define ABILITY_DROUGHT 0x46
+#define ABILITY_ARENA_TRAP 0x47
+#define ABILITY_VITAL_SPIRIT 0x48
+#define ABILITY_WHITE_SMOKE 0x49
+#define ABILITY_PURE_POWER 0x4A
+#define ABILITY_SHELL_ARMOR 0x4B
+#define ABILITY_AIR_LOCK 0x4C
+#define ABILITY_TANGLED_FEET 0x4D
+#define ABILITY_MOTOR_DRIVE 0x4E
+#define ABILITY_RIVALRY 0x4F
+#define ABILITY_STEADFAST 0x50
+#define ABILITY_SNOW_CLOAK 0x51
+#define ABILITY_GLUTTONY 0x52
+#define ABILITY_ANGER_POINT 0x53
+#define ABILITY_UNBURDEN 0x54
+#define ABILITY_HEATPROOF 0x55
+#define ABILITY_SIMPLE 0x56
+#define ABILITY_DRY_SKIN 0x57
+#define ABILITY_DOWNLOAD 0x58
+#define ABILITY_IRON_FIST 0x59
+#define ABILITY_POISON_HEAL 0x5A
+#define ABILITY_ADAPTABILITY 0x5B
+#define ABILITY_SKILL_LINK 0x5C
+#define ABILITY_HYDRATION 0x5D
+#define ABILITY_SOLAR_POWER 0x5E
+#define ABILITY_QUICK_FEET 0x5F
+#define ABILITY_NORMALIZE 0x60
+#define ABILITY_SNIPER 0x61
+#define ABILITY_MAGIC_GUARD 0x62
+#define ABILITY_NO_GUARD 0x63
+#define ABILITY_STALL 0x64
+#define ABILITY_TECHNICIAN 0x65
+#define ABILITY_LEAF_GUARD 0x66
+#define ABILITY_KLUTZ 0x67
+#define ABILITY_MOLD_BREAKER 0x68
+#define ABILITY_SUPER_LUCK 0x69
+#define ABILITY_AFTERMATH 0x6A
+#define ABILITY_ANTICIPATION 0x6B
+#define ABILITY_FOREWARN 0x6C
+#define ABILITY_UNAWARE 0x6D
+#define ABILITY_TINTED_LENS 0x6E
+#define ABILITY_FILTER 0x6F
+#define ABILITY_SLOW_START 0x70
+#define ABILITY_SCRAPPY 0x71
+#define ABILITY_STORM_DRAIN 0x72
+#define ABILITY_ICE_BODY 0x73
+#define ABILITY_SOLID_ROCK 0x74
+#define ABILITY_SNOW_WARNING 0x75
+#define ABILITY_HONEY_GATHER 0x76
+#define ABILITY_FRISK 0x77
+#define ABILITY_RECKLESS 0x78
+#define ABILITY_MULTITYPE 0x79
+#define ABILITY_FLOWER_GIFT 0x7A
+#define ABILITY_BAD_DREAMS 0x7B
+#define ABILITY_PICKPOCKET 0x7C
+#define ABILITY_SHEER_FORCE 0x7D
+#define ABILITY_CONTRARY 0x7E
+#define ABILITY_UNNERVE 0x7F
+#define ABILITY_DEFIANT 0x80
+#define ABILITY_DEFEATIST 0x81
+#define ABILITY_CURSED_BODY 0x82
+#define ABILITY_HEALER 0x83
+#define ABILITY_FRIEND_GUARD 0x84
+#define ABILITY_WEAK_ARMOR 0x85
+#define ABILITY_HEAVY_METAL 0x86
+#define ABILITY_LIGHT_METAL 0x87
+#define ABILITY_MULTISCALE 0x88
+#define ABILITY_TOXIC_BOOST 0x89
+#define ABILITY_FLARE_BOOST 0x8A
+#define ABILITY_HARVEST 0x8B
+#define ABILITY_TELEPATHY 0x8C
+#define ABILITY_MOODY 0x8D
+#define ABILITY_OVERCOAT 0x8E
+#define ABILITY_POISON_TOUCH 0x8F
+#define ABILITY_REGENERATOR 0x90
+#define ABILITY_BIG_PECKS 0x91
+#define ABILITY_SAND_RUSH 0x92
+#define ABILITY_WONDER_SKIN 0x93
+#define ABILITY_ANALYTIC 0x94
+#define ABILITY_ILLUSION 0x95
+#define ABILITY_IMPOSTER 0x96
+#define ABILITY_INFILTRATOR 0x97
+#define ABILITY_MUMMY 0x98
+#define ABILITY_MOXIE 0x99
+#define ABILITY_JUSTIFIED 0x9A
+#define ABILITY_RATTLED 0x9B
+#define ABILITY_MAGIC_BOUNCE 0x9C
+#define ABILITY_SAP_SIPPER 0x9D
+#define ABILITY_PRANKSTER 0x9E
+#define ABILITY_SAND_FORCE 0x9F
+#define ABILITY_IRON_BARBS 0xA0
+#define ABILITY_ZEN_MODE 0xA1
+#define ABILITY_VICTORY_STAR 0xA2
+#define ABILITY_TURBOBLAZE 0xA3
+#define ABILITY_TERAVOLT 0xA4
+#define ABILITY_AROMA_VEIL 0xA5
+#define ABILITY_FLOWER_VEIL 0xA6
+#define ABILITY_CHEEK_POUCH 0xA7
+#define ABILITY_PROTEAN 0xA8
+#define ABILITY_FUR_COAT 0xA9
+#define ABILITY_MAGICIAN 0xAA
+#define ABILITY_BULLETPROOF 0xAB
+#define ABILITY_COMPETITIVE 0xAC
+#define ABILITY_STRONG_JAW 0xAD
+#define ABILITY_REFRIGERATE 0xAE
+#define ABILITY_SWEET_VEIL 0xAF
+#define ABILITY_STANCE_CHANGE 0xB0
+#define ABILITY_GALE_WINGS 0xB1
+#define ABILITY_MEGA_LAUNCHER 0xB2
+#define ABILITY_GRASS_PELT 0xB3
+#define ABILITY_SYMBIOSIS 0xB4
+#define ABILITY_TOUGH_CLAWS 0xB5
+#define ABILITY_PIXILATE 0xB6
+#define ABILITY_GOOEY 0xB7
+#define ABILITY_AERILATE 0xB8
+#define ABILITY_PARENTAL_BOND 0xB9
+#define ABILITY_DARK_AURA 0xBA
+#define ABILITY_FAIRY_AURA 0xBB
+#define ABILITY_AURA_BREAK 0xBC
+#define ABILITY_PRIMORDIA_SEA 0xBD
+#define ABILITY_DESOLATE_LAND 0xBE
+#define ABILITY_DELTA_STREAM 0xBF
+
+#endif /* ABILITY_IDS_H */

src/include/battle.h

@@ -0,0 +1,15 @@
+#include <battle_structs.h>
+#include <custom_structs.h>
+#include <battle_locations.h>
+#include <pkmn_types.h>
+#include <abilities.h>
+#include <moves.h>
+
+#ifndef BATTLE_H_
+#define BATTLE_H_
+
+u8 get_side_from_bank(u8 bank);
+
+void battle_script_push();
+
+#endif

src/include/battle_locations.h

@@ -0,0 +1,9 @@
+#ifndef BATTLE_LOC_H_
+#define BATTLE_LOC_H_
+
+u8 battle_active_bank;
+u16 battle_damage_store;
+u32 battle_hitmarker;
+void* battlescript_cursor;
+
+#endif

src/include/battle_structs.h

@@ -0,0 +1,130 @@
+#ifndef BATTLE_STRUCT_H_
+#define BATTLE_STRUCT_H_
+
+#include <types.h>
+
+struct side_affecting_hword{
+    u16 reflect_on : 1;
+    u16 light_screen_on : 1;
+    u16 unkown1 : 2;
+    u16 spikes_on : 1;
+    u16 safeguard_on : 1;
+    u16 unkown2 : 2;
+    u16 mist_on : 1;
+    u16 spikes_damage_done : 1;
+};
+
+extern struct side_affecting_hword side_affecting_halfword[2];
+
+struct status_main{
+    u32 sleep : 3;
+    u32 poison : 1;
+    u32 burn : 1;
+    u32 freeze : 1;
+    u32 paralysis: 1;
+    u32 toxic_poison : 1;
+    u32 poison_counter : 4;
+};
+
+union main_status{
+    u32 int_status;
+    struct status_main flags;
+};
+
+#define STATUS_SLEEP 0x7
+#define STATUS_POISON 0x8
+#define STATUS_BURN 0x10
+#define STATUS_FREEZE 0x20
+#define STATUS_PARALYSIS 0x40
+#define STATUS_TOXIC_POISON 0x80
+
+struct flags2{
+    u32 confusion : 3;
+    u32 flinched : 1;
+    u32 uproar : 3;
+    u32 flag_x80 : 1;
+    u32 bide : 2;
+    u32 locked_and_confuse : 2;
+    u32 multiple_turn_move : 1;
+    u32 trapped_in_wrap : 3;
+    u32 in_love : 4;
+    u32 focus_energy : 1;
+    u32 transformed : 1;
+    u32 recharge : 1;
+    u32 raged : 1;
+    u32 substitute : 1;
+    u32 destinny_bond : 1;
+    u32 cant_escape : 1;
+    u32 nightmare : 1;
+    u32 cursed : 1;
+    u32 foresight : 1;
+    u32 defense_curled : 1;
+    u32 tormented : 1;
+};
+
+struct iv_set
+{
+    u32 iv_hp: 5;
+    u32 iv_atk: 5;
+    u32 iv_def: 5;
+    u32 iv_spd: 5;
+    u32 iv_sp_atk: 5;
+    u32 iv_sp_def: 5;
+};
+
+struct battle_participant {
+    u16 poke_species;
+    u16 atk;
+    u16 def;
+    u16 spd;
+    u16 sp_atk;
+    u16 sp_def;
+    u16 moves[4];
+    struct iv_set ivs;
+    u8 hp_buff;
+    u8 atk_buff;
+    u8 def_buff;
+    u8 spd_buff;
+    u8 sp_atk_buff;
+    u8 sp_def_buff;
+    u8 acc_buff;
+    u8 evasion_buff;
+    u8 ability_id;
+    u8 type1;
+    u8 type2;
+    u8 padd;
+    u8 current_pp[4];
+    u16 current_hp;
+    u8 level;
+    u8 happiness;
+    u16 max_hp;
+    u16 held_item;
+    u8 poke_name[12];
+    u8 trainer_name[8];
+    u32 padd2;
+    u32 pid;
+    union main_status status;
+    struct flags2 status2;
+    u32 otid;
+};
+
+extern struct battle_participant battle_participants[4];
+
+struct side_timer{
+    u8 reflect_timer;
+    u8 reflect_bank;
+    u8 lightscreen_timer;
+    u8 lightscreen_bank;
+    u8 mist_timer;
+    u8 mist_bank;
+    u8 safeguard_timer;
+    u8 safeguard_bank;
+    u8 followme_timer;
+    u8 followme_target;
+    u8 spikes_amount;
+    u8 fieldB;
+};
+
+extern struct side_timer battle_side_timers[2];
+
+#endif

src/include/config.h

@@ -96,52 +96,6 @@
 
 /*For hacking the miracle eye command into set foresight*/
 /*Comment out the first define to deactivate the miracleeye injection in the command table*/
-#define MIRACLEEYE
-#define MIRACLEEYEADDRESS		0x08C158A0
-
-/*Ability index numbers*/
-#define	ABILITY_SAND_VEIL		0x08	/*Is included in vanilla firered*/
-#define ABILITY_NATURAL_CURE	0x1E
-#define	ABILITY_HUSTLE			0x37	/*Is included in vanilla firered*/
-#define ABILITY_GUTS			0x3E	/*Is included in vanilla firered*/
-#define ABILITY_MARVEL_SCALE	0x3F	/*Is included in vanilla firered*/
-#define ABILITY_SAND_STREAM		0x2D	/*Is included in vanilla firered*/
-#define ABILITY_AIR_LOCK		0x4D	/*Is included in vanilla firered*/
-#define	ABILITY_TANGLED_FEET	0x4E
-#define	ABILITY_SNOW_CLOAK		0x52
-#define ABILITY_HEAT_PROOF		0x56
-#define ABILITY_SIMPLE			0x57
-#define ABILITY_SKILL_LINK		0x5D
-#define	ABILITY_SNIPER			0x62
-#define	ABILITY_MAGIC_GUARD		0x63	/*Is not included in the project but needs to be here for consistancy reasons*/
-
-#define	ABILITY_TECHNICIAN		0x66
-#define ABILITY_MOLD_BREAK		0x69
-#define ABILITY_SUPER_LUCK		0x6A
-#define ABILITY_UNAWARE			0x6E
-#define ABILITY_TINTED_LENS		0x6F
-#define ABILITY_FILTER			0x70
-#define ABILITY_SCRAPPY			0x72
-
-#define ABILITY_SOLID_ROCK		0x75
-#define ABILITY_SNOW_WARNING	0x76
-#define	ABILITY_DEFEATIST		0x82
-#define ABILITY_MULTI_SCALE		0x89
-#define ABILITY_TOXIC_BOOST		0x8A
-#define ABILITY_FLARE_BOOST		0x8B
-
-#define ABILITY_REGENERATOR		0x91
-#define ABILITY_BIG_PECKS		0x92
-#define ABILITY_WONDER_SKIN		0x94
-
-#define ABILITY_MOXIE			0x9A
-#define ABILITY_MAGIC_BOUNCE	0x9D
-
-#define ABILITY_VICTORY_STAR	0xA3
-
-#define ABILITY_FUR_COAT		0xAA
-#define ABILITY_TURBOBLAZE		0xA4
-#define ABILITY_TERAVOLT		0xA5
 
 /*Some move effect IDs important for correct implementation*/
 #define MOVE_EFFECT_SACRED_SWORD	0xFF

src/battle_engine/custom_structs.h → src/include/custom_structs.h

@@ -58,8 +58,8 @@ struct side_affecting {
     u8 toxic_spikes_psn : 1;
     u8 toxic_spikes_badpsn : 1;
     u8 toxic_spikes_done : 1;
-    u8 stealthrock : 1;
-    u8 stealthrock_done : 1;
+    u8 stealth_rock : 1;
+    u8 stealth_rock_done : 1;
     u8 lucky_chant : 3;
     u8 lucky_chant_bank : 2;
     u8 tailwind : 3;

src/include/moves.h

@@ -0,0 +1,634 @@
+#ifndef MOVE_IDS_H
+#define MOVE_IDS_H
+
+#define move_target_selected 0
+#define move_target_depends 1
+#define move_target_random 4
+#define move_target_both 8
+#define move_target_user 0x10
+#define move_target_foes_and_ally 0x20
+#define move_target_opponent_field 0x40
+
+#define MOVE_ABSORB 0x47
+#define MOVE_ACID 0x33
+#define MOVE_ACID_ARMOR 0x97
+#define MOVE_ACID_SPRAY 0x1EB
+#define MOVE_ACROBATICS 0x200
+#define MOVE_ACUPRESSURE 0x16F
+#define MOVE_AERIAL_ACE 0x14C
+#define MOVE_AEROBLAST 0xB1
+#define MOVE_AFTER_YOU 0x1EF
+#define MOVE_AGILITY 0x61
+#define MOVE_AIR_CUTTER 0x13A
+#define MOVE_AIR_SLASH 0x193
+#define MOVE_ALLY_SWITCH 0x1F6
+#define MOVE_AMNESIA 0x85
+#define MOVE_ANCIENT_POWER 0xF6
+#define MOVE_AQUA_JET 0x1C5
+#define MOVE_AQUA_RING 0x188
+#define MOVE_AQUA_TAIL 0x191
+#define MOVE_ARM_THRUST 0x124
+#define MOVE_AROMATHERAPY 0x138
+#define MOVE_AROMATIC_MIST 0x255
+#define MOVE_ASSIST 0x112
+#define MOVE_ASSURANCE 0x174
+#define MOVE_ASTONISH 0x136
+#define MOVE_ATTACK_ORDER 0x1C6
+#define MOVE_ATTRACT 0xD5
+#define MOVE_AURA_SPHERE 0x18C
+#define MOVE_AURORA_BEAM 0x3E
+#define MOVE_AUTOTOMIZE 0x1DB
+#define MOVE_AVALANCHE 0x1A3
+#define MOVE_BABYDOLL_EYES 0x260
+#define MOVE_BARRAGE 0x8C
+#define MOVE_BARRIER 0x70
+#define MOVE_BATON_PASS 0xE2
+#define MOVE_BEAT_UP 0xFB
+#define MOVE_BELCH 0x232
+#define MOVE_BELLY_DRUM 0xBB
+#define MOVE_BESTOW 0x204
+#define MOVE_BIDE 0x75
+#define MOVE_BIND 0x14
+#define MOVE_BITE 0x2C
+#define MOVE_BLAST_BURN 0x133
+#define MOVE_BLAZE_KICK 0x12B
+#define MOVE_BLIZZARD 0x3B
+#define MOVE_BLOCK 0x14F
+#define MOVE_BLUE_FLARE 0x227
+#define MOVE_BODY_SLAM 0x22
+#define MOVE_BOLT_STRIKE 0x226
+#define MOVE_BONE_CLUB 0x7D
+#define MOVE_BONE_RUSH 0xC6
+#define MOVE_BONEMERANG 0x9B
+#define MOVE_BOOMBURST 0x24A
+#define MOVE_BOUNCE 0x154
+#define MOVE_BRAVE_BIRD 0x19D
+#define MOVE_BRICK_BREAK 0x118
+#define MOVE_BRINE 0x16A
+#define MOVE_BUBBLE 0x91
+#define MOVE_BUBBLE_BEAM 0x3D
+#define MOVE_BUG_BITE 0x1C2
+#define MOVE_BUG_BUZZ 0x195
+#define MOVE_BULK_UP 0x153
+#define MOVE_BULLDOZE 0x20B
+#define MOVE_BULLET_PUNCH 0x1A2
+#define MOVE_BULLET_SEED 0x14B
+#define MOVE_CALM_MIND 0x15B
+#define MOVE_CAMOUFLAGE 0x125
+#define MOVE_CAPTIVATE 0x1BD
+#define MOVE_CELEBRATE 0x25E
+#define MOVE_CHARGE 0x10C
+#define MOVE_CHARGE_BEAM 0x1C3
+#define MOVE_CHARM 0xCC
+#define MOVE_CHATTER 0x1C0
+#define MOVE_CHIP_AWAY 0x1F2
+#define MOVE_CIRCLE_THROW 0x1FD
+#define MOVE_CLAMP 0x80
+#define MOVE_CLEAR_SMOG 0x1F3
+#define MOVE_CLOSE_COMBAT 0x172
+#define MOVE_COIL 0x1E9
+#define MOVE_COMET_PUNCH 0x4
+#define MOVE_CONFIDE 0x24E
+#define MOVE_CONFUSE_RAY 0x6D
+#define MOVE_CONFUSION 0x5D
+#define MOVE_CONSTRICT 0x84
+#define MOVE_CONVERSION 0xA0
+#define MOVE_CONVERSION_2 0xB0
+#define MOVE_COPYCAT 0x17F
+#define MOVE_COSMIC_POWER 0x142
+#define MOVE_COTTON_GUARD 0x21A
+#define MOVE_COTTON_SPORE 0xB2
+#define MOVE_COUNTER 0x44
+#define MOVE_COVET 0x157
+#define MOVE_CRABHAMMER 0x98
+#define MOVE_CRAFTY_SHIELD 0x242
+#define MOVE_CROSS_CHOP 0xEE
+#define MOVE_CROSS_POISON 0x1B8
+#define MOVE_CRUNCH 0xF2
+#define MOVE_CRUSH_CLAW 0x132
+#define MOVE_CRUSH_GRIP 0x1CE
+#define MOVE_CURSE 0xAE
+#define MOVE_CUT 0xF
+#define MOVE_DARK_PULSE 0x18F
+#define MOVE_DARK_VOID 0x1D0
+#define MOVE_DAZZLING_GLEAM 0x25D
+#define MOVE_DEFEND_ORDER 0x1C7
+#define MOVE_DEFENSE_CURL 0x6F
+#define MOVE_DEFOG 0x1B0
+#define MOVE_DESTINY_BOND 0xC2
+#define MOVE_DETECT 0xC5
+#define MOVE_DIAMOND_STORM 0x24F
+#define MOVE_DIG 0x5B
+#define MOVE_DISABLE 0x32
+#define MOVE_DISARMING_VOICE 0x23E
+#define MOVE_DISCHARGE 0x1B3
+#define MOVE_DIVE 0x123
+#define MOVE_DIZZY_PUNCH 0x92
+#define MOVE_DOOM_DESIRE 0x161
+#define MOVE_DOUBLEEDGE 0x26
+#define MOVE_DOUBLE_HIT 0x1CA
+#define MOVE_DOUBLE_KICK 0x18
+#define MOVE_DOUBLE_SLAP 0x3
+#define MOVE_DOUBLE_TEAM 0x68
+#define MOVE_DRACO_METEOR 0x1B2
+#define MOVE_DRAGON_ASCENT 0x26C
+#define MOVE_DRAGON_BREATH 0xE1
+#define MOVE_DRAGON_CLAW 0x151
+#define MOVE_DRAGON_DANCE 0x15D
+#define MOVE_DRAGON_PULSE 0x196
+#define MOVE_DRAGON_RAGE 0x52
+#define MOVE_DRAGON_RUSH 0x197
+#define MOVE_DRAGON_TAIL 0x20D
+#define MOVE_DRAINING_KISS 0x241
+#define MOVE_DRAIN_PUNCH 0x199
+#define MOVE_DREAM_EATER 0x8A
+#define MOVE_DRILL_PECK 0x41
+#define MOVE_DRILL_RUN 0x211
+#define MOVE_DUAL_CHOP 0x212
+#define MOVE_DYNAMIC_PUNCH 0xDF
+#define MOVE_EARTH_POWER 0x19E
+#define MOVE_EARTHQUAKE 0x59
+#define MOVE_ECHOED_VOICE 0x1F1
+#define MOVE_EERIE_IMPULSE 0x256
+#define MOVE_EGG_BOMB 0x79
+#define MOVE_ELECTRIC_TERRAIN 0x25C
+#define MOVE_ELECTRIFY 0x246
+#define MOVE_ELECTRO_BALL 0x1E6
+#define MOVE_ELECTROWEB 0x20F
+#define MOVE_EMBARGO 0x175
+#define MOVE_EMBER 0x34
+#define MOVE_ENCORE 0xE3
+#define MOVE_ENDEAVOR 0x11B
+#define MOVE_ENDURE 0xCB
+#define MOVE_ENERGY_BALL 0x19C
+#define MOVE_ENTRAINMENT 0x1EE
+#define MOVE_ERUPTION 0x11C
+#define MOVE_EXPLOSION 0x99
+#define MOVE_EXTRASENSORY 0x146
+#define MOVE_EXTREME_SPEED 0xF5
+#define MOVE_FACADE 0x107
+#define MOVE_FEINT_ATTACK 0xB9
+#define MOVE_FAIRY_LOCK 0x24B
+#define MOVE_FAIRY_WIND 0x248
+#define MOVE_FAKE_OUT 0xFC
+#define MOVE_FAKE_TEARS 0x139
+#define MOVE_FALSE_SWIPE 0xCE
+#define MOVE_FEATHER_DANCE 0x129
+#define MOVE_FEINT 0x16C
+#define MOVE_FELL_STINGER 0x235
+#define MOVE_FIERY_DANCE 0x228
+#define MOVE_FINAL_GAMBIT 0x203
+#define MOVE_FIRE_BLAST 0x7E
+#define MOVE_FIRE_FANG 0x1A8
+#define MOVE_FIRE_PLEDGE 0x207
+#define MOVE_FIRE_PUNCH 0x7
+#define MOVE_FIRE_SPIN 0x53
+#define MOVE_FISSURE 0x5A
+#define MOVE_FLAIL 0xAF
+#define MOVE_FLAME_BURST 0x1E1
+#define MOVE_FLAME_CHARGE 0x1E8
+#define MOVE_FLAME_WHEEL 0xAC
+#define MOVE_FLAMETHROWER 0x35
+#define MOVE_FLARE_BLITZ 0x18A
+#define MOVE_FLASH 0x94
+#define MOVE_FLASH_CANNON 0x1AE
+#define MOVE_FLATTER 0x104
+#define MOVE_FLING 0x176
+#define MOVE_FLOWER_SHIELD 0x243
+#define MOVE_FLY 0x13
+#define MOVE_FLYING_PRESS 0x230
+#define MOVE_FOCUS_BLAST 0x19B
+#define MOVE_FOCUS_ENERGY 0x74
+#define MOVE_FOCUS_PUNCH 0x108
+#define MOVE_FOLLOW_ME 0x10A
+#define MOVE_FORCE_PALM 0x18B
+#define MOVE_FORESIGHT 0xC1
+#define MOVE_FORESTS_CURSE 0x23B
+#define MOVE_FOUL_PLAY 0x1EC
+#define MOVE_FREEZEDRY 0x23D
+#define MOVE_FREEZE_SHOCK 0x229
+#define MOVE_FRENZY_PLANT 0x152
+#define MOVE_FROST_BREATH 0x20C
+#define MOVE_FRUSTRATION 0xDA
+#define MOVE_FURY_ATTACK 0x1F
+#define MOVE_FURY_CUTTER 0xD2
+#define MOVE_FURY_SWIPES 0x9A
+#define MOVE_FUSION_BOLT 0x22F
+#define MOVE_FUSION_FLARE 0x22E
+#define MOVE_FUTURE_SIGHT 0xF8
+#define MOVE_GASTRO_ACID 0x17C
+#define MOVE_GEAR_GRIND 0x220
+#define MOVE_GEOMANCY 0x259
+#define MOVE_GIGA_DRAIN 0xCA
+#define MOVE_GIGA_IMPACT 0x1A0
+#define MOVE_GLACIATE 0x225
+#define MOVE_GLARE 0x89
+#define MOVE_GRASS_KNOT 0x1BF
+#define MOVE_GRASS_PLEDGE 0x208
+#define MOVE_GRASS_WHISTLE 0x140
+#define MOVE_GRASSY_TERRAIN 0x244
+#define MOVE_GRAVITY 0x164
+#define MOVE_GROWL 0x2D
+#define MOVE_GROWTH 0x4A
+#define MOVE_GRUDGE 0x120
+#define MOVE_GUARD_SPLIT 0x1D6
+#define MOVE_GUARD_SWAP 0x181
+#define MOVE_GUILLOTINE 0xC
+#define MOVE_GUNK_SHOT 0x1B9
+#define MOVE_GUST 0x10
+#define MOVE_GYRO_BALL 0x168
+#define MOVE_HAIL 0x102
+#define MOVE_HAMMER_ARM 0x167
+#define MOVE_HAPPY_HOUR 0x25B
+#define MOVE_HARDEN 0x6A
+#define MOVE_HAZE 0x72
+#define MOVE_HEAD_CHARGE 0x21F
+#define MOVE_HEAD_SMASH 0x1C9
+#define MOVE_HEADBUTT 0x1D
+#define MOVE_HEAL_BELL 0xD7
+#define MOVE_HEAL_BLOCK 0x179
+#define MOVE_HEAL_ORDER 0x1C8
+#define MOVE_HEAL_PULSE 0x1F9
+#define MOVE_HEALING_WISH 0x169
+#define MOVE_HEART_STAMP 0x213
+#define MOVE_HEART_SWAP 0x187
+#define MOVE_HEAT_CRASH 0x217
+#define MOVE_HEAT_WAVE 0x101
+#define MOVE_HEAVY_SLAM 0x1E4
+#define MOVE_HELPING_HAND 0x10E
+#define MOVE_HEX 0x1FA
+#define MOVE_HIDDEN_POWER 0xED
+#define MOVE_HIGH_JUMP_KICK 0x88
+#define MOVE_HOLD_BACK 0x262
+#define MOVE_HOLD_HANDS 0x267
+#define MOVE_HONE_CLAWS 0x1D4
+#define MOVE_HORN_ATTACK 0x1E
+#define MOVE_HORN_DRILL 0x20
+#define MOVE_HORN_LEECH 0x214
+#define MOVE_HOWL 0x150
+#define MOVE_HURRICANE 0x21E
+#define MOVE_HYDRO_CANNON 0x134
+#define MOVE_HYDRO_PUMP 0x38
+#define MOVE_HYPER_BEAM 0x3F
+#define MOVE_HYPER_FANG 0x9E
+#define MOVE_HYPERSPACE_FURY 0x26D
+#define MOVE_HYPERSPACE_HOLE 0x251
+#define MOVE_HYPER_VOICE 0x130
+#define MOVE_HYPNOSIS 0x5F
+#define MOVE_ICE_BALL 0x12D
+#define MOVE_ICE_BEAM 0x3A
+#define MOVE_ICE_BURN 0x22A
+#define MOVE_ICE_FANG 0x1A7
+#define MOVE_ICE_PUNCH 0x8
+#define MOVE_ICE_SHARD 0x1A4
+#define MOVE_ICICLE_CRASH 0x22C
+#define MOVE_ICICLE_SPEAR 0x14D
+#define MOVE_ICY_WIND 0xC4
+#define MOVE_IMPRISON 0x11E
+#define MOVE_INCINERATE 0x1FE
+#define MOVE_INFERNO 0x205
+#define MOVE_INFESTATION 0x263
+#define MOVE_INGRAIN 0x113
+#define MOVE_ION_DELUGE 0x239
+#define MOVE_IRON_DEFENSE 0x14E
+#define MOVE_IRON_HEAD 0x1BA
+#define MOVE_IRON_TAIL 0xE7
+#define MOVE_JUDGMENT 0x1C1
+#define MOVE_JUMP_KICK 0x1A
+#define MOVE_KARATE_CHOP 0x2
+#define MOVE_KINESIS 0x86
+#define MOVE_KINGS_SHIELD 0x24C
+#define MOVE_KNOCK_OFF 0x11A
+#define MOVE_LANDS_WRATH 0x268
+#define MOVE_LAST_RESORT 0x183
+#define MOVE_LAVA_PLUME 0x1B4
+#define MOVE_LEAF_BLADE 0x15C
+#define MOVE_LEAF_STORM 0x1B5
+#define MOVE_LEAF_TORNADO 0x218
+#define MOVE_LEECH_LIFE 0x8D
+#define MOVE_LEECH_SEED 0x49
+#define MOVE_LEER 0x2B
+#define MOVE_LICK 0x7A
+#define MOVE_LIGHT_OF_RUIN 0x269
+#define MOVE_LIGHT_SCREEN 0x71
+#define MOVE_LOCKON 0xC7
+#define MOVE_LOVELY_KISS 0x8E
+#define MOVE_LOW_KICK 0x43
+#define MOVE_LOW_SWEEP 0x1EA
+#define MOVE_LUCKY_CHANT 0x17D
+#define MOVE_LUNAR_DANCE 0x1CD
+#define MOVE_LUSTER_PURGE 0x127
+#define MOVE_MACH_PUNCH 0xB7
+#define MOVE_MAGIC_COAT 0x115
+#define MOVE_MAGIC_ROOM 0x1DE
+#define MOVE_MAGICAL_LEAF 0x159
+#define MOVE_MAGMA_STORM 0x1CF
+#define MOVE_MAGNET_BOMB 0x1BB
+#define MOVE_MAGNETIC_FLUX 0x25A
+#define MOVE_MAGNET_RISE 0x189
+#define MOVE_MAGNITUDE 0xDE
+#define MOVE_MAT_BLOCK 0x231
+#define MOVE_ME_FIRST 0x17E
+#define MOVE_MEAN_LOOK 0xD4
+#define MOVE_MEDITATE 0x60
+#define MOVE_MEGA_DRAIN 0x48
+#define MOVE_MEGA_KICK 0x19
+#define MOVE_MEGA_PUNCH 0x5
+#define MOVE_MEGAHORN 0xE0
+#define MOVE_MEMENTO 0x106
+#define MOVE_METAL_BURST 0x170
+#define MOVE_METAL_CLAW 0xE8
+#define MOVE_METAL_SOUND 0x13F
+#define MOVE_METEOR_MASH 0x135
+#define MOVE_METRONOME 0x76
+#define MOVE_MILK_DRINK 0xD0
+#define MOVE_MIMIC 0x66
+#define MOVE_MIND_READER 0xAA
+#define MOVE_MINIMIZE 0x6B
+#define MOVE_MIRACLE_EYE 0x165
+#define MOVE_MIRROR_COAT 0xF3
+#define MOVE_MIRROR_MOVE 0x77
+#define MOVE_MIRROR_SHOT 0x1AD
+#define MOVE_MIST 0x36
+#define MOVE_MIST_BALL 0x128
+#define MOVE_MISTY_TERRAIN 0x245
+#define MOVE_MOONBLAST 0x249
+#define MOVE_MOONLIGHT 0xEC
+#define MOVE_MORNING_SUN 0xEA
+#define MOVE_MUDSLAP 0xBD
+#define MOVE_MUD_BOMB 0x1AA
+#define MOVE_MUD_SHOT 0x155
+#define MOVE_MUD_SPORT 0x12C
+#define MOVE_MUDDY_WATER 0x14A
+#define MOVE_MYSTICAL_FIRE 0x253
+#define MOVE_NASTY_PLOT 0x1A1
+#define MOVE_NATURAL_GIFT 0x16B
+#define MOVE_NATURE_POWER 0x10B
+#define MOVE_NEEDLE_ARM 0x12E
+#define MOVE_NIGHT_DAZE 0x21B
+#define MOVE_NIGHT_SHADE 0x65
+#define MOVE_NIGHT_SLASH 0x190
+#define MOVE_NIGHTMARE 0xAB
+#define MOVE_NOBLE_ROAR 0x238
+#define MOVE_NUZZLE 0x261
+#define MOVE_OBLIVION_WING 0x265
+#define MOVE_OCTAZOOKA 0xBE
+#define MOVE_ODOR_SLEUTH 0x13C
+#define MOVE_OMINOUS_WIND 0x1D2
+#define MOVE_ORIGIN_PULSE 0x26A
+#define MOVE_OUTRAGE 0xC8
+#define MOVE_OVERHEAT 0x13B
+#define MOVE_PAIN_SPLIT 0xDC
+#define MOVE_PARABOLIC_CHARGE 0x23A
+#define MOVE_PARTING_SHOT 0x23F
+#define MOVE_PAY_DAY 0x6
+#define MOVE_PAYBACK 0x173
+#define MOVE_PECK 0x40
+#define MOVE_PERISH_SONG 0xC3
+#define MOVE_PETAL_BLIZZARD 0x23C
+#define MOVE_PETAL_DANCE 0x50
+#define MOVE_PHANTOM_FORCE 0x236
+#define MOVE_PIN_MISSILE 0x2A
+#define MOVE_PLAY_NICE 0x24D
+#define MOVE_PLAY_ROUGH 0x247
+#define MOVE_PLUCK 0x16D
+#define MOVE_POISON_FANG 0x131
+#define MOVE_POISON_GAS 0x8B
+#define MOVE_POISON_JAB 0x18E
+#define MOVE_POISON_POWDER 0x4D
+#define MOVE_POISON_STING 0x28
+#define MOVE_POISON_TAIL 0x156
+#define MOVE_POUND 0x1
+#define MOVE_POWDER 0x258
+#define MOVE_POWDER_SNOW 0xB5
+#define MOVE_POWER_GEM 0x198
+#define MOVE_POWER_SPLIT 0x1D7
+#define MOVE_POWER_SWAP 0x180
+#define MOVE_POWER_TRICK 0x17B
+#define MOVE_POWERUP_PUNCH 0x264
+#define MOVE_POWER_WHIP 0x1B6
+#define MOVE_PRECIPICE_BLADES 0x26B
+#define MOVE_PRESENT 0xD9
+#define MOVE_PROTECT 0xB6
+#define MOVE_PSYBEAM 0x3C
+#define MOVE_PSYCH_UP 0xF4
+#define MOVE_PSYCHIC 0x5E
+#define MOVE_PSYCHO_BOOST 0x162
+#define MOVE_PSYCHO_CUT 0x1AB
+#define MOVE_PSYCHO_SHIFT 0x177
+#define MOVE_PSYSHOCK 0x1D9
+#define MOVE_PSYSTRIKE 0x21C
+#define MOVE_PSYWAVE 0x95
+#define MOVE_PUNISHMENT 0x182
+#define MOVE_PURSUIT 0xE4
+#define MOVE_QUASH 0x1FF
+#define MOVE_QUICK_ATTACK 0x62
+#define MOVE_QUICK_GUARD 0x1F5
+#define MOVE_QUIVER_DANCE 0x1E3
+#define MOVE_RAGE 0x63
+#define MOVE_RAGE_POWDER 0x1DC
+#define MOVE_RAIN_DANCE 0xF0
+#define MOVE_RAPID_SPIN 0xE5
+#define MOVE_RAZOR_LEAF 0x4B
+#define MOVE_RAZOR_SHELL 0x216
+#define MOVE_RAZOR_WIND 0xD
+#define MOVE_RECOVER 0x69
+#define MOVE_RECYCLE 0x116
+#define MOVE_REFLECT 0x73
+#define MOVE_REFLECT_TYPE 0x201
+#define MOVE_REFRESH 0x11F
+#define MOVE_RELIC_SONG 0x223
+#define MOVE_REST 0x9C
+#define MOVE_RETALIATE 0x202
+#define MOVE_RETURN 0xD8
+#define MOVE_REVENGE 0x117
+#define MOVE_REVERSAL 0xB3
+#define MOVE_ROAR 0x2E
+#define MOVE_ROAR_OF_TIME 0x1CB
+#define MOVE_ROCK_BLAST 0x15E
+#define MOVE_ROCK_CLIMB 0x1AF
+#define MOVE_ROCK_POLISH 0x18D
+#define MOVE_ROCK_SLIDE 0x9D
+#define MOVE_ROCK_SMASH 0xF9
+#define MOVE_ROCK_THROW 0x58
+#define MOVE_ROCK_TOMB 0x13D
+#define MOVE_ROCK_WRECKER 0x1B7
+#define MOVE_ROLE_PLAY 0x110
+#define MOVE_ROLLING_KICK 0x1B
+#define MOVE_ROLLOUT 0xCD
+#define MOVE_ROOST 0x163
+#define MOVE_ROTOTILLER 0x233
+#define MOVE_ROUND 0x1F0
+#define MOVE_SACRED_FIRE 0xDD
+#define MOVE_SACRED_SWORD 0x215
+#define MOVE_SAFEGUARD 0xDB
+#define MOVE_SAND_ATTACK 0x1C
+#define MOVE_SAND_TOMB 0x148
+#define MOVE_SANDSTORM 0xC9
+#define MOVE_SCALD 0x1F7
+#define MOVE_SCARY_FACE 0xB8
+#define MOVE_SCRATCH 0xA
+#define MOVE_SCREECH 0x67
+#define MOVE_SEARING_SHOT 0x221
+#define MOVE_SECRET_POWER 0x122
+#define MOVE_SECRET_SWORD 0x224
+#define MOVE_SEED_BOMB 0x192
+#define MOVE_SEED_FLARE 0x1D1
+#define MOVE_SEISMIC_TOSS 0x45
+#define MOVE_SELFDESTRUCT 0x78
+#define MOVE_SHADOW_BALL 0xF7
+#define MOVE_SHADOW_CLAW 0x1A5
+#define MOVE_SHADOW_FORCE 0x1D3
+#define MOVE_SHADOW_PUNCH 0x145
+#define MOVE_SHADOW_SNEAK 0x1A9
+#define MOVE_SHARPEN 0x9F
+#define MOVE_SHEER_COLD 0x149
+#define MOVE_SHELL_SMASH 0x1F8
+#define MOVE_SHIFT_GEAR 0x1FC
+#define MOVE_SHOCK_WAVE 0x15F
+#define MOVE_SIGNAL_BEAM 0x144
+#define MOVE_SILVER_WIND 0x13E
+#define MOVE_SIMPLE_BEAM 0x1ED
+#define MOVE_SING 0x2F
+#define MOVE_SKETCH 0xA6
+#define MOVE_SKILL_SWAP 0x11D
+#define MOVE_SKULL_BASH 0x82
+#define MOVE_SKY_ATTACK 0x8F
+#define MOVE_SKY_DROP 0x1FB
+#define MOVE_SKY_UPPERCUT 0x147
+#define MOVE_SLACK_OFF 0x12F
+#define MOVE_SLAM 0x15
+#define MOVE_SLASH 0xA3
+#define MOVE_SLEEP_POWDER 0x4F
+#define MOVE_SLEEP_TALK 0xD6
+#define MOVE_SLUDGE 0x7C
+#define MOVE_SLUDGE_BOMB 0xBC
+#define MOVE_SLUDGE_WAVE 0x1E2
+#define MOVE_SMACK_DOWN 0x1DF
+#define MOVE_SMELLING_SALTS 0x109
+#define MOVE_SMOG 0x7B
+#define MOVE_SMOKESCREEN 0x6C
+#define MOVE_SNARL 0x22B
+#define MOVE_SNATCH 0x121
+#define MOVE_SNORE 0xAD
+#define MOVE_SPIKY_SHIELD 0x254
+#define MOVE_SOAK 0x1E7
+#define MOVE_SOFTBOILED 0x87
+#define MOVE_SOLAR_BEAM 0x4C
+#define MOVE_SONIC_BOOM 0x31
+#define MOVE_SPACIAL_REND 0x1CC
+#define MOVE_SPARK 0xD1
+#define MOVE_SPIDER_WEB 0xA9
+#define MOVE_SPIKE_CANNON 0x83
+#define MOVE_SPIKES 0xBF
+#define MOVE_SPIT_UP 0xFF
+#define MOVE_SPITE 0xB4
+#define MOVE_SPLASH 0x96
+#define MOVE_SPORE 0x93
+#define MOVE_STEALTH_ROCK 0x1BE
+#define MOVE_STEAM_ERUPTION 0x250
+#define MOVE_STEEL_WING 0xD3
+#define MOVE_STICKY_WEB 0x234
+#define MOVE_STOCKPILE 0xFE
+#define MOVE_STOMP 0x17
+#define MOVE_STONE_EDGE 0x1BC
+#define MOVE_STORED_POWER 0x1F4
+#define MOVE_STORM_THROW 0x1E0
+#define MOVE_STEAMROLLER 0x219
+#define MOVE_STRENGTH 0x46
+#define MOVE_STRING_SHOT 0x51
+#define MOVE_STRUGGLE 0xA5
+#define MOVE_STRUGGLE_BUG 0x20A
+#define MOVE_STUN_SPORE 0x4E
+#define MOVE_SUBMISSION 0x42
+#define MOVE_SUBSTITUTE 0xA4
+#define MOVE_SUCKER_PUNCH 0x185
+#define MOVE_SUNNY_DAY 0xF1
+#define MOVE_SUPER_FANG 0xA2
+#define MOVE_SUPERPOWER 0x114
+#define MOVE_SUPERSONIC 0x30
+#define MOVE_SURF 0x39
+#define MOVE_SWAGGER 0xCF
+#define MOVE_SWALLOW 0x100
+#define MOVE_SWEET_KISS 0xBA
+#define MOVE_SWEET_SCENT 0xE6
+#define MOVE_SWIFT 0x81
+#define MOVE_SWITCHEROO 0x19F
+#define MOVE_SWORDS_DANCE 0xE
+#define MOVE_SYNCHRONOISE 0x1E5
+#define MOVE_SYNTHESIS 0xEB
+#define MOVE_TACKLE 0x21
+#define MOVE_TAIL_GLOW 0x126
+#define MOVE_TAIL_SLAP 0x21D
+#define MOVE_TAIL_WHIP 0x27
+#define MOVE_TAILWIND 0x16E
+#define MOVE_TAKE_DOWN 0x24
+#define MOVE_TAUNT 0x10D
+#define MOVE_TECHNO_BLAST 0x222
+#define MOVE_TEETER_DANCE 0x12A
+#define MOVE_TELEKINESIS 0x1DD
+#define MOVE_TELEPORT 0x64
+#define MOVE_THIEF 0xA8
+#define MOVE_THOUSAND_ARROWS 0x266
+#define MOVE_THOUSAND_WAVES 0x267
+#define MOVE_THRASH 0x25
+#define MOVE_THUNDER 0x57
+#define MOVE_THUNDER_FANG 0x1A6
+#define MOVE_THUNDER_PUNCH 0x9
+#define MOVE_THUNDER_SHOCK 0x54
+#define MOVE_THUNDER_WAVE 0x56
+#define MOVE_THUNDERBOLT 0x55
+#define MOVE_TICKLE 0x141
+#define MOVE_TOPSYTURVY 0x240
+#define MOVE_TORMENT 0x103
+#define MOVE_TOXIC 0x5C
+#define MOVE_TOXIC_SPIKES 0x186
+#define MOVE_TRANSFORM 0x90
+#define MOVE_TRI_ATTACK 0xA1
+#define MOVE_TRICK 0x10F
+#define MOVE_TRICKORTREAT 0x237
+#define MOVE_TRICK_ROOM 0x1B1
+#define MOVE_TRIPLE_KICK 0xA7
+#define MOVE_TRUMP_CARD 0x178
+#define MOVE_TWINEEDLE 0x29
+#define MOVE_TWISTER 0xEF
+#define MOVE_UTURN 0x171
+#define MOVE_UPROAR 0xFD
+#define MOVE_VCREATE 0x22D
+#define MOVE_VACUUM_WAVE 0x19A
+#define MOVE_VENOM_DRENCH 0x257
+#define MOVE_VENOSHOCK 0x1DA
+#define MOVE_VICE_GRIP 0xB
+#define MOVE_VINE_WHIP 0x16
+#define MOVE_VITAL_THROW 0xE9
+#define MOVE_VOLT_SWITCH 0x209
+#define MOVE_VOLT_TACKLE 0x158
+#define MOVE_WAKEUP_SLAP 0x166
+#define MOVE_WATER_GUN 0x37
+#define MOVE_WATER_PLEDGE 0x206
+#define MOVE_WATER_PULSE 0x160
+#define MOVE_WATER_SPORT 0x15A
+#define MOVE_WATER_SPOUT 0x143
+#define MOVE_WATERFALL 0x7F
+#define MOVE_WATER_SHURIKEN 0x252
+#define MOVE_WEATHER_BALL 0x137
+#define MOVE_WHIRLPOOL 0xFA
+#define MOVE_WHIRLWIND 0x12
+#define MOVE_WIDE_GUARD 0x1D5
+#define MOVE_WILD_CHARGE 0x210
+#define MOVE_WILLOWISP 0x105
+#define MOVE_WING_ATTACK 0x11
+#define MOVE_WISH 0x111
+#define MOVE_WITHDRAW 0x6E
+#define MOVE_WONDER_ROOM 0x1D8
+#define MOVE_WOOD_HAMMER 0x1C4
+#define MOVE_WORK_UP 0x20E
+#define MOVE_WORRY_SEED 0x184
+#define MOVE_WRAP 0x23
+#define MOVE_WRING_OUT 0x17A
+#define MOVE_XSCISSOR 0x194
+#define MOVE_YAWN 0x119
+#define MOVE_ZAP_CANNON 0xC0
+#define MOVE_ZEN_HEADBUTT 0x1AC
+
+#endif /* MOVE_IDS_H */

src/include/pkmn_types.h

@@ -12,6 +12,8 @@
 #define TYPE_GHOST 0x7
 #define TYPE_STEEL 0x8
 
+#define TYPE_EGG 0x9
+
 #define TYPE_FIRE 0xA
 #define TYPE_WATER 0xB
 #define TYPE_GRASS 0xC
@@ -21,4 +23,6 @@
 #define TYPE_DRAGON 0x10
 #define TYPE_DARK 0x11
 
+#define TYPE_FAIRY 0x17
+
 #endif

src/moves/battle_engine/cmd_setword.S

@@ -24,6 +24,7 @@ ldrb r3, [r0, #2]
 lsl r3, #0x10
 orr r2, r3
 ldrb r3, [r0, #3]
+lsl r3, #0x18
 orr r2, r3
 str r2, [r1]
 add r0, #4

string/de/hazards.txt

@@ -0,0 +1 @@
+str_stealth_rock=\hFD\h13 wurde von Tarnsteinen\nverletzt!

string/de/some_string.txt

@@ -1 +0,0 @@
-first_string=Hallo Dunkelheit, du alter Freund.

string/en/hazards.txt

@@ -0,0 +1 @@
+str_stealth_rock=\hFD\h13 was hurt by\nStealth Rock

string/en/some_string.txt

@@ -1 +0,0 @@
-first_string=Hello darkness my old friend.

string/table.tbl

@@ -1,4 +1,4 @@
- =0x00
+ =0x00
 0=0xA1
 1=0xA2
 2=0xA3
@@ -14,7 +14,7 @@
 .=0xAD
 -=0xAE
 \.=0xAF
-é=0xB1
+Ă©=0xB1
 ,=0xB8
 \k=0xB9
 /=0xBA
@@ -70,12 +70,12 @@ w=0xEB
 x=0xEC
 y=0xED
 z=0xEE
-Ä=0xF1
-Ö=0xF2
-Ü=0xF3
-ä=0xF4
-ö=0xF5
-ü=0xF6
+Ă„=0xF1
+Ă–=0xF2
+Ăś=0xF3
+ä=0xF4
+ö=0xF5
+ĂĽ=0xF6
 \p=0xFD
 \n=0xFE
 \x=0xFF