Skip to content
This repository
Browse code

givepoke should use decimal.

  • Loading branch information...
commit f72583e80ce4e412d227d55fb248e7c29a6f1e9c 1 parent 699cbaa
iimarckus authored July 04, 2012

Showing 1 changed file with 23 additions and 17 deletions. Show diff stats Hide diff stats

  1. 40  main.asm
40  main.asm
@@ -15226,7 +15226,7 @@ UnknownScript_0x54be4: ; 0x54be4
15226 15226
 	2writetext UnknownText_0x54dae
15227 15227
 	playsound $0002
15228 15228
 	waitbutton
15229  
-	givepoke EEVEE, $14, $0, $0
  15229
+	givepoke EEVEE, 20, 0, 0
15230 15230
 	setbit1 $004f
15231 15231
 	2writetext UnknownText_0x54dc1
15232 15232
 	closetext
@@ -17269,7 +17269,7 @@ UnknownScript_0x56d26: ; 0x56d26
17269 17269
 	closetext
17270 17270
 	writebyte $3f
17271 17271
 	special $0039
17272  
-	givepoke ABRA, $5, $0, $0
  17272
+	givepoke ABRA, 5, 0, 0
17273 17273
 	takecoins 100
17274 17274
 	2jump UnknownScript_0x56d0c
17275 17275
 ; 0x56d54
@@ -17288,7 +17288,7 @@ UnknownScript_0x56d54: ; 0x56d54
17288 17288
 	closetext
17289 17289
 	writebyte $68
17290 17290
 	special $0039
17291  
-	givepoke CUBONE, $f, $0, $0
  17291
+	givepoke CUBONE, 15, 0, 0
17292 17292
 	takecoins 800
17293 17293
 	2jump UnknownScript_0x56d0c
17294 17294
 ; 0x56d82
@@ -17307,7 +17307,7 @@ UnknownScript_0x56d82: ; 0x56d82
17307 17307
 	closetext
17308 17308
 	writebyte $ca
17309 17309
 	special $0039
17310  
-	givepoke WOBBUFFET, $f, $0, $0
  17310
+	givepoke WOBBUFFET, 15, 0, 0
17311 17311
 	takecoins 1500
17312 17312
 	2jump UnknownScript_0x56d0c
17313 17313
 ; 0x56db0
@@ -28350,8 +28350,8 @@ UnknownScript_0x69d37: ; 0x69d37
28350 28350
 	2writetext UnknownText_0x69eb8
28351 28351
 	playsound $0091
28352 28352
 	waitbutton
28353  
-	givepoke SPEAROW, $a, $0, $1, $5db9, $5dbf
28354  
-	givepokeitem GivePokeItem_0x69d98
  28353
+	givepoke SPEAROW, 10, 0, 1, GiftSpearowName, GiftSpearowOTName
  28354
+	givepokeitem GiftSpearowMail
28355 28355
 	setbit1 $0050
28356 28356
 UnknownScript_0x69d73: ; 0x69d73
28357 28357
 	2writetext UnknownText_0x69ed6
@@ -28386,11 +28386,17 @@ UnknownScript_0x69d92: ; 0x69d92
28386 28386
 UnknownScript_0x69d96: ; 0x69d96
28387 28387
 	loadmovesprites
28388 28388
 	end
28389  
-; 0x69d98
28390 28389
 
28391  
-GivePokeItem_0x69d98: ; 0x69d98
  28390
+GiftSpearowMail: ; 0x69d98
  28391
+	db FLOWER_MAIL
  28392
+	db "DARK CAVE leads", $4E
  28393
+	db "to another road@"
  28394
+GiftSpearowName: ; 0x69db9
  28395
+	db "KENYA@"
  28396
+GiftSpearowOTName: ; 0x69dbf
  28397
+	db "RANDY@"
28392 28398
 
28393  
-INCBIN "baserom.gbc",$69d98,$2e
  28399
+	db 0 ; 0x69dc5 XXX is there a reason for this?
28394 28400
 
28395 28401
 UnknownScript_0x69dc6: ; 0x69dc6
28396 28402
 	faceplayer
@@ -36546,7 +36552,7 @@ UnknownScript_0x727ed: ; 0x727ed
36546 36552
 	closetext
36547 36553
 	writebyte $19
36548 36554
 	special $0039
36549  
-	givepoke PIKACHU, $19, $0, $0
  36555
+	givepoke PIKACHU, 25, 0, 0
36550 36556
 	takecoins 2222
36551 36557
 	2jump UnknownScript_0x727d3
36552 36558
 ; 0x7281b
@@ -36565,7 +36571,7 @@ UnknownScript_0x7281b: ; 0x7281b
36565 36571
 	closetext
36566 36572
 	writebyte $89
36567 36573
 	special $0039
36568  
-	givepoke PORYGON, $f, $0, $0
  36574
+	givepoke PORYGON, 15, 0, 0
36569 36575
 	takecoins 5555
36570 36576
 	2jump UnknownScript_0x727d3
36571 36577
 ; 0x72849
@@ -36584,7 +36590,7 @@ UnknownScript_0x72849: ; 0x72849
36584 36590
 	closetext
36585 36591
 	writebyte $f6
36586 36592
 	special $0039
36587  
-	givepoke LARVITAR, $28, $0, $0
  36593
+	givepoke LARVITAR, 40, 0, 0
36588 36594
 	takecoins 8888
36589 36595
 	2jump UnknownScript_0x727d3
36590 36596
 ; 0x72877
@@ -42897,7 +42903,7 @@ UnknownScript_0x78c73: ; 0x78c73
42897 42903
 	playsound $0002
42898 42904
 	waitbutton
42899 42905
 	keeptextopen
42900  
-	givepoke CYNDAQUIL, $5, BERRY, $0
  42906
+	givepoke CYNDAQUIL, 5, BERRY, 0
42901 42907
 	loadmovesprites
42902 42908
 	checkcode $9
42903 42909
 	if_equal $3, UnknownScript_0x78d33
@@ -42928,7 +42934,7 @@ UnknownScript_0x78cb5: ; 0x78cb5
42928 42934
 	playsound $0002
42929 42935
 	waitbutton
42930 42936
 	keeptextopen
42931  
-	givepoke TOTODILE, $5, BERRY, $0
  42937
+	givepoke TOTODILE, 5, BERRY, 0
42932 42938
 	loadmovesprites
42933 42939
 	applymovement $0, MovementData_0x78fab
42934 42940
 	2jump UnknownScript_0x78d33
@@ -42957,7 +42963,7 @@ UnknownScript_0x78cf1: ; 0x78cf1
42957 42963
 	playsound $0002
42958 42964
 	waitbutton
42959 42965
 	keeptextopen
42960  
-	givepoke CHIKORITA, $5, BERRY, $0
  42966
+	givepoke CHIKORITA, 5, BERRY, 0
42961 42967
 	loadmovesprites
42962 42968
 	applymovement $0, MovementData_0x78fb0
42963 42969
 	2jump UnknownScript_0x78d33
@@ -47839,7 +47845,7 @@ UnknownScript_0x7e217: ; 0x7e217
47839 47845
 	2writetext UnknownText_0x7e355
47840 47846
 	playsound $0002
47841 47847
 	waitbutton
47842  
-	givepoke TYROGUE, $a, $0, $0
  47848
+	givepoke TYROGUE, 10, 0, 0
47843 47849
 	setbit1 $0061
47844 47850
 UnknownScript_0x7e231: ; 0x7e231
47845 47851
 	2writetext UnknownText_0x7e36a
@@ -79762,7 +79768,7 @@ UnknownScript_0x18d1c5: ; 0x18d1c5
79762 79768
 	2writetext UnknownText_0x18d697
79763 79769
 	playsound $0002
79764 79770
 	waitbutton
79765  
-	givepoke DRATINI, $f, $0, $0
  79771
+	givepoke DRATINI, 15, 0, 0
79766 79772
 	checkbit1 $00c1
79767 79773
 	special $0094
79768 79774
 	setbit1 $00bd

0 notes on commit f72583e

Please sign in to comment.
Something went wrong with that request. Please try again.