Merge pull request #324 from PikalaxALT/master

Movement and map objects

2 files changed, 32 insertions, 26 deletions

diff --git a/data/battle_tower.asm b/data/battle_tower.asm
index 281c359d7..b0455eb10 100644
--- a/data/battle_tower.asm
+++ b/data/battle_tower.asm
@@ -773,7 +773,7 @@ BattleTowerMons1:
 
 	db UNOWN
 	db BERRY
-	db HIDDEN_POWER, NONE, NONE, NONE
+	db HIDDEN_POWER, 0, 0, 0
 	dw 0 ; OT ID
 	dt 1000 ; Exp
 	; Stat exp
diff --git a/data/odd_eggs.asm b/data/odd_eggs.asm
index dd6d36ab8..96a6717b9 100644
--- a/data/odd_eggs.asm
+++ b/data/odd_eggs.asm
@@ -43,43 +43,49 @@ GiveOddEgg: ; 1fb4b6
 	ld a, OddEgg2 - OddEgg1
 	call AddNTimes
 
-	ld de, wEnemyMoveStruct
-	ld bc, $0046
+	ld de, OddEggSpecies
+	ld bc, party_struct_length + 2 * PKMN_NAME_LENGTH
 	call CopyBytes
 
 	ld a, EGG_TICKET
 	ld [CurItem], a
-	ld a, $1
-	ld [wd10c], a
-	ld a, $ff
-	ld [wd107], a
+	ld a, 1
+	ld [wItemQuantityChangeBuffer], a
+	ld a, -1
+	ld [ItemCountBuffer], a
 	ld hl, NumItems
 	call TossItem
 
+	; load species in wcd2a
 	ld a, EGG
 	ld [wcd2a], a
 
+	; load pointer to wcd29 in wcd20
 	ld a, wcd29 % $100
-	ld [CreditsPos], a
+	ld [wcd20], a
 	ld a, wcd29 / $100
 	ld [wcd21], a
-	ld a, wEnemyMoveStruct % $100
+	; load pointer to OddEggSpecies in wcd22
+	ld a, OddEggSpecies % $100
 	ld [wcd22], a
-	ld a, wEnemyMoveStruct / $100
+	ld a, OddEggSpecies / $100
 	ld [wcd23], a
 
+	; load Odd Egg Name in wcd2b
 	ld hl, .Odd
 	ld de, wcd2b
 	ld bc, PKMN_NAME_LENGTH
 	call CopyBytes
 
+	; load pointer to wcd2b in wcd24
 	ld a, wcd2b % $100
 	ld [wcd24], a
 	ld a, wcd2b / $100
 	ld [wcd25], a
-	ld a, BattleMonHappiness % $100
+	; load pointer to wOddEggName in wcd26
+	ld a, wOddEggName % $100
 	ld [wcd26], a
-	ld a, BattleMonHappiness / $100
+	ld a, wOddEggName / $100
 	ld [wcd27], a
 	callba Function11b98f
 	ret
@@ -119,7 +125,7 @@ OddEggs: ; 1fb56e
 OddEgg1:
 	db PICHU
 	db NO_ITEM
-	db THUNDERSHOCK, CHARM, DIZZY_PUNCH, NONE
+	db THUNDERSHOCK, CHARM, DIZZY_PUNCH, 0
 	dw 02048 ; OT ID
 	dt 125 ; Exp
 	; Stat exp
@@ -146,7 +152,7 @@ OddEgg1:
 OddEgg2:
 	db PICHU
 	db NO_ITEM
-	db THUNDERSHOCK, CHARM, DIZZY_PUNCH, NONE
+	db THUNDERSHOCK, CHARM, DIZZY_PUNCH, 0
 	dw 00256 ; OT ID
 	dt 125 ; Exp
 	; Stat exp
@@ -172,7 +178,7 @@ OddEgg2:
 
 	db CLEFFA
 	db NO_ITEM
-	db POUND, CHARM, DIZZY_PUNCH, NONE
+	db POUND, CHARM, DIZZY_PUNCH, 0
 	dw 04096 ; OT ID
 	dt 125 ; Exp
 	; Stat exp
@@ -198,7 +204,7 @@ OddEgg2:
 
 	db CLEFFA
 	db NO_ITEM
-	db POUND, CHARM, DIZZY_PUNCH, NONE
+	db POUND, CHARM, DIZZY_PUNCH, 0
 	dw 00768 ; OT ID
 	dt 125 ; Exp
 	; Stat exp
@@ -224,7 +230,7 @@ OddEgg2:
 
 	db IGGLYBUFF
 	db NO_ITEM
-	db SING, CHARM, DIZZY_PUNCH, NONE
+	db SING, CHARM, DIZZY_PUNCH, 0
 	dw 04096 ; OT ID
 	dt 125 ; Exp
 	; Stat exp
@@ -250,7 +256,7 @@ OddEgg2:
 
 	db IGGLYBUFF
 	db NO_ITEM
-	db SING, CHARM, DIZZY_PUNCH, NONE
+	db SING, CHARM, DIZZY_PUNCH, 0
 	dw 00768 ; OT ID
 	dt 125 ; Exp
 	; Stat exp
@@ -276,7 +282,7 @@ OddEgg2:
 
 	db SMOOCHUM
 	db NO_ITEM
-	db POUND, LICK, DIZZY_PUNCH, NONE
+	db POUND, LICK, DIZZY_PUNCH, 0
 	dw 03584 ; OT ID
 	dt 125 ; Exp
 	; Stat exp
@@ -302,7 +308,7 @@ OddEgg2:
 
 	db SMOOCHUM
 	db NO_ITEM
-	db POUND, LICK, DIZZY_PUNCH, NONE
+	db POUND, LICK, DIZZY_PUNCH, 0
 	dw 00512 ; OT ID
 	dt 125 ; Exp
 	; Stat exp
@@ -328,7 +334,7 @@ OddEgg2:
 
 	db MAGBY
 	db NO_ITEM
-	db EMBER, DIZZY_PUNCH, NONE, NONE
+	db EMBER, DIZZY_PUNCH, 0, 0
 	dw 02560 ; OT ID
 	dt 125 ; Exp
 	; Stat exp
@@ -354,7 +360,7 @@ OddEgg2:
 
 	db MAGBY
 	db NO_ITEM
-	db EMBER, DIZZY_PUNCH, NONE, NONE
+	db EMBER, DIZZY_PUNCH, 0, 0
 	dw 00512 ; OT ID
 	dt 125 ; Exp
 	; Stat exp
@@ -380,7 +386,7 @@ OddEgg2:
 
 	db ELEKID
 	db NO_ITEM
-	db QUICK_ATTACK, LEER, DIZZY_PUNCH, NONE
+	db QUICK_ATTACK, LEER, DIZZY_PUNCH, 0
 	dw 03072 ; OT ID
 	dt 125 ; Exp
 	; Stat exp
@@ -406,7 +412,7 @@ OddEgg2:
 
 	db ELEKID
 	db NO_ITEM
-	db QUICK_ATTACK, LEER, DIZZY_PUNCH, NONE
+	db QUICK_ATTACK, LEER, DIZZY_PUNCH, 0
 	dw 00512 ; OT ID
 	dt 125 ; Exp
 	; Stat exp
@@ -432,7 +438,7 @@ OddEgg2:
 
 	db TYROGUE
 	db NO_ITEM
-	db TACKLE, DIZZY_PUNCH, NONE, NONE
+	db TACKLE, DIZZY_PUNCH, 0, 0
 	dw 02560 ; OT ID
 	dt 125 ; Exp
 	; Stat exp
@@ -458,7 +464,7 @@ OddEgg2:
 
 	db TYROGUE
 	db NO_ITEM
-	db TACKLE, DIZZY_PUNCH, NONE, NONE
+	db TACKLE, DIZZY_PUNCH, 0, 0
 	dw 00256 ; OT ID
 	dt 125 ; Exp
 	; Stat exp