Merge pull request #233 from yenatch/incbins

Get rid of incbins in banks 1, 2, 3, 9, a, b, e, 10.

battle/ai/scoring.asm

@@ -1565,7 +1565,7 @@ AIScoring_HealBell: ; 38d1f
 	ld a, [OTPartyCount]
 	ld b, a
 	ld c, 0
-	ld hl, OTPartyMon1CurHP
+	ld hl, OTPartyMon1HP
 	ld de, $0030
 
 .asm_38d2c
@@ -1784,7 +1784,7 @@ AICheckLastPlayerMon: ; 38e2e
 	ld a, [PartyCount]
 	ld b, a
 	ld c, 0
-	ld hl, PartyMon1CurHP
+	ld hl, PartyMon1HP
 	ld de, PartyMon2 - PartyMon1
 
 .loop

battle/core.asm

@@ -11,7 +11,7 @@ Function3c000: ; 3c000
 	ld [BattleEnded], a
 	inc a
 	ld [$d264], a
-	ld hl, OTPartyMon1CurHP
+	ld hl, OTPartyMon1HP
 	ld bc, $002f
 	ld d, $3
 .asm_3c019
@@ -1234,7 +1234,7 @@ Function3c801: ; 3c801
 	xor a
 	ld [hli], a
 	ld [hl], a
-	ld hl, PartyMon1CurHP
+	ld hl, PartyMon1HP
 	ld a, [CurBattleMon]
 	call GetPartyLocation
 	xor a
@@ -1250,7 +1250,7 @@ Function3c801: ; 3c801
 	ld a, [IsInBattle]
 	dec a
 	ret z
-	ld hl, OTPartyMon1CurHP
+	ld hl, OTPartyMon1HP
 	ld a, [CurOTMon]
 	call GetPartyLocation
 	xor a
@@ -2177,7 +2177,7 @@ Function3ce01: ; 3ce01
 	dec a
 	jr z, .asm_3ce16
 	ld a, [CurOTMon]
-	ld hl, OTPartyMon1CurHP
+	ld hl, OTPartyMon1HP
 	call GetPartyLocation
 	xor a
 	ld [hli], a
@@ -2355,7 +2355,7 @@ Function3cf35: ; 3cf35
 	ld a, [OTPartyCount]
 	ld b, a
 	xor a
-	ld hl, OTPartyMon1CurHP
+	ld hl, OTPartyMon1HP
 	ld de, $0030
 .asm_3cf40
 	or [hl]
@@ -2832,7 +2832,7 @@ Function3d1f8: ; 3d1f8
 	ld a, [$cfa9]
 	cp $1
 	jr z, .asm_3d20a
-	ld hl, PartyMon1Spd
+	ld hl, PartyMon1Speed
 	ld de, EnemyMonSpd
 	jp Function3d8b3
 ; 3d227
@@ -3390,7 +3390,7 @@ Function3d599: ; 3d599
 	ld a, [CurOTMon]
 	cp b
 	jr z, .asm_3d5d0
-	ld hl, OTPartyMon1CurHP
+	ld hl, OTPartyMon1HP
 	push bc
 	ld a, b
 	call GetPartyLocation
@@ -3546,7 +3546,7 @@ Function3d672: ; 3d672
 	ld a, [CurOTMon]
 	cp b
 	jr z, .asm_3d6a7
-	ld hl, OTPartyMon1CurHP
+	ld hl, OTPartyMon1HP
 	push bc
 	ld a, b
 	call GetPartyLocation
@@ -3778,7 +3778,7 @@ Function3d873: ; 3d873
 	ld a, [PartyCount]
 	ld e, a
 	xor a
-	ld hl, PartyMon1CurHP
+	ld hl, PartyMon1HP
 	ld bc, $002f
 .asm_3d87e
 	or [hl]
@@ -3794,7 +3794,7 @@ Function3d873: ; 3d873
 
 Function3d887: ; 3d887
 	ld a, [CurPartyMon]
-	ld hl, PartyMon1CurHP
+	ld hl, PartyMon1HP
 	call GetPartyLocation
 	ld a, [hli]
 	or [hl]
@@ -6514,7 +6514,7 @@ LoadEnemyMon: ; 3e8eb
 	
 .OpponentParty
 ; Get HP from the party struct
-	ld hl, (PartyMon1CurHP + 1) - PartyMon1 + OTPartyMon1
+	ld hl, (OTPartyMon1HP + 1)
 	ld a, [CurPartyMon]
 	call GetPartyLocation
 	ld a, [hld]
@@ -9021,18 +9021,18 @@ GetRoamMonMapNumber: ; 3f9e9
 ; 3fa01
 
 GetRoamMonHP: ; 3fa01
-; output: hl = RoamMonCurHP
+; output: hl = RoamMonHP
 	ld a, [TempEnemyMonSpecies]
 	ld b, a
 	ld a, [RoamMon1Species]
 	cp b
-	ld hl, RoamMon1CurHP
+	ld hl, RoamMon1HP
 	ret z
 	ld a, [RoamMon2Species]
 	cp b
-	ld hl, RoamMon2CurHP
+	ld hl, RoamMon2HP
 	ret z
-	ld hl, RoamMon3CurHP
+	ld hl, RoamMon3HP
 	ret
 ; 3fa19
 

battle/effect_commands.asm

@@ -1951,7 +1951,7 @@ Function349f4: ; 349f4
 	ld e, 0
 	ld b, $20
 	ld c, 0
-	ld hl, OTPartyMon1CurHP
+	ld hl, OTPartyMon1HP
 
 .asm_34a05
 	ld a, [CurOTMon]
@@ -2059,7 +2059,7 @@ Function34a85: ; 34a85
 	push bc
 	ld a, [OTPartyCount]
 	ld e, a
-	ld hl, OTPartyMon1CurHP
+	ld hl, OTPartyMon1HP
 	ld b, $20
 	ld c, $0
 .asm_34a91
@@ -2254,7 +2254,7 @@ Function34b77: ; 34b77
 	ld de, OTPartySpecies
 	ld b, $20
 	ld c, 0
-	ld hl, OTPartyMon1CurHP
+	ld hl, OTPartyMon1HP
 
 .asm_34b82
 	ld a, [de]
@@ -7286,7 +7286,7 @@ BattleCommand23: ; 3680f
 	jr z, .asm_3689a ; 368a3 $f5
 	push af
 	push bc
-	ld hl, OTPartyMon1CurHP
+	ld hl, OTPartyMon1HP
 	call GetPartyLocation
 	ld a, [hli]
 	or [hl]
@@ -7382,7 +7382,7 @@ BattleCommand23: ; 3680f
 
 	push af
 	push bc
-	ld hl, PartyMon1CurHP
+	ld hl, PartyMon1HP
 	call GetPartyLocation
 	ld a, [hli]
 	or [hl]
@@ -7437,7 +7437,7 @@ Function36994: ; 36994
 	jr z, .asm_369ae
 
 	ld a, e
-	ld hl, PartyMon1CurHP
+	ld hl, PartyMon1HP
 	call AddNTimes
 	ld a, [hli]
 	or [hl]
@@ -9860,7 +9860,7 @@ ResetBatonPassStatus: ; 37ab1
 
 
 CheckAnyOtherAlivePartyMons: ; 37ae9
-	ld hl, PartyMon1CurHP
+	ld hl, PartyMon1HP
 	ld a, [PartyCount]
 	ld d, a
 	ld a, [CurBattleMon]
@@ -9870,7 +9870,7 @@ CheckAnyOtherAlivePartyMons: ; 37ae9
 
 
 CheckAnyOtherAliveEnemyMons: ; 37af6
-	ld hl, OTPartyMon1CurHP
+	ld hl, OTPartyMon1HP
 	ld a, [OTPartyCount]
 	ld d, a
 	ld a, [CurOTMon]

home/text.asm

@@ -1158,17 +1158,24 @@ Text_0D:: ; 1562
 ; 156a
 
 Text_14:: ; 156a
-; TX_PREDEF
+; Print a string from one of the following:
+; 0: StringBuffer3
+; 1: StringBuffer4
+; 2: StringBuffer5
+; 3: StringBuffer2
+; 4: StringBuffer1
+; 5: EnemyMonNick
+; 6: BattleMonNick
 ; [$14][id]
 
 	ld a, [hli]
 	push hl
 	ld e, a
 	ld d, 0
-	ld hl, $4000
+	ld hl, Unknown_24000
 	add hl, de
 	add hl, de
-	ld a, $9
+	ld a, BANK(Unknown_24000)
 	call GetFarHalfword
 	ld d, h
 	ld e, l

macros.asm

@@ -138,3 +138,39 @@ endanim: MACRO
 	db $ff
 	ENDM
 
+
+; maps
+
+map: MACRO
+; This is a really silly hack to get around an rgbds bug.
+
+; Ideally:
+;	db GROUP_\1, MAP_\1
+
+\1\@  EQUS "GROUP_\1"
+\1\@2 EQUS "MAP_\1"
+	db \1\@, \1\@2
+ENDM
+
+roam_map: MACRO
+; A map and an arbitrary number of some more maps.
+
+	map \1
+	db \2
+
+IF \2 > 0
+	map \3
+ENDC
+IF \2 > 1
+	map \4
+ENDC
+IF \2 > 2
+	map \5
+ENDC
+IF \2 > 3
+	map \6
+ENDC
+	db 0
+ENDM
+
+

text/phone/bill.asm

@@ -31,7 +31,7 @@ BillPhoneNotFullText: ; 0x1b452a
 	db "waiting!", $51
 	db $14, ", your BOX", $4f
 	db "has room for @"
-	TX_RAM $d099
+	TX_RAM StringBuffer3
 	db $0, $55
 	db "more #MON.", $51
 	db "Get out there and", $4f
@@ -43,7 +43,7 @@ BillPhoneNearlyFullText: ; 0x1b4587
 	db $14, ", your BOX", $4f
 	db "has room for only", $55
 	db "@"
-	TX_RAM $d099
+	TX_RAM StringBuffer3
 	db $0, " more #MON.", $51
 	db "Maybe you should", $4f
 	db "switch your BOX.", $57

text/phone/extra.asm

@@ -222,7 +222,7 @@ UnknownText_0x648dc: ; 0x648dc
 UnknownText_0x649dc: ; 0x649dc
 	db $0, "I'm always with my", $4f
 	db "@"
-	text_from_ram $d0ac
+	text_from_ram StringBuffer4
 	db $0, "!", $51
 	db "It's so cute!", $4f
 	db "I just love it!", $57
@@ -232,7 +232,7 @@ UnknownText_0x64a13: ; 0x64a13
 	db $0, "Changing the topic", $4f
 	db "here, I saw this", $51
 	db "@"
-	text_from_ram $d0ac
+	text_from_ram StringBuffer4
 	db $0, " for the", $4f
 	db "first time.", $51
 	db "It was easy to", $4f
@@ -243,7 +243,7 @@ UnknownText_0x64a71: ; 0x64a71
 	db $0, "I was wondering,", $4f
 	db "do you happen to", $55
 	db "have @"
-	text_from_ram $d0ac
+	text_from_ram StringBuffer4
 	db $0, "?", $51
 	db "I can't seem to", $4f
 	db "catch one. What is", $51
@@ -260,7 +260,7 @@ UnknownText_0x64ada: ; 0x64ada
 	db "Contest!", $51
 	db "I'll be here on", $4f
 	db "@"
-	text_from_ram $d0bf
+	text_from_ram StringBuffer5
 	db $0, "!", $57
 ; 0x64b48
 
@@ -274,11 +274,11 @@ UnknownText_0x64b5f: ; 0x64b5f
 	db "caught you!", $51
 	db "A whole bunch of", $4f
 	db "@"
-	text_from_ram $d0ac
+	text_from_ram StringBuffer4
 	db $0, " have", $51
 	db "appeared around", $4f
 	db "@"
-	text_from_ram $d0bf
+	text_from_ram StringBuffer5
 	db $0, "!", $51
 	db "You have to see", $4f
 	db "this!", $57
@@ -298,7 +298,7 @@ UnknownText_0x64c13: ; 0x64c13
 	db "Let's battle. I'll", $4f
 	db "be waiting for you", $55
 	db "on @"
-	text_from_ram $d0bf
+	text_from_ram StringBuffer5
 	db $0, "!", $57
 ; 0x64c5a
 
@@ -313,7 +313,7 @@ UnknownText_0x64c5a: ; 0x64c5a
 
 UnknownText_0x64cbd: ; 0x64cbd
 	db $0, "My @"
-	text_from_ram $d0ac
+	text_from_ram StringBuffer4
 	db $0, "'s", $4f
 	db "getting stronger,", $51
 	db "exactly as I", $4f
@@ -324,7 +324,7 @@ UnknownText_0x64cf3: ; 0x64cf3
 	db $0, "By the way, we", $4f
 	db "knocked out a wild", $51
 	db "@"
-	text_from_ram $d0ac
+	text_from_ram StringBuffer4
 	db $0, " just", $4f
 	db "the other day.", $51
 	db "Studying up in", $4f
@@ -334,7 +334,7 @@ UnknownText_0x64cf3: ; 0x64cf3
 UnknownText_0x64d4f: ; 0x64d4f
 	db $0, "By the way, a wild", $4f
 	db "@"
-	text_from_ram $d0ac
+	text_from_ram StringBuffer4
 	db $0, " escaped", $55
 	db "on me yesterday.", $51
 	db "A computational", $4f
@@ -348,7 +348,7 @@ UnknownText_0x64da4: ; 0x64da4
 	db "lot better!", $51
 	db "I'm hanging out on", $4f
 	db "@"
-	text_from_ram $d0bf
+	text_from_ram StringBuffer5
 	db $0, ".", $51
 	db "Can you come down", $4f
 	db "for a battle?", $57
@@ -364,7 +364,7 @@ UnknownText_0x64e2f: ; 0x64e2f
 	db "You can have it!", $4f
 	db "Why don't you come", $51
 	db "to @"
-	text_from_ram $d0bf
+	text_from_ram StringBuffer5
 	db $0, $4f
 	db "and pick it up?", $57
 ; 0x64e90
@@ -382,7 +382,7 @@ UnknownText_0x64ed4: ; 0x64ed4
 	db "my strategy!", $51
 	db "I'm waiting on", $4f
 	db "@"
-	text_from_ram $d0bf
+	text_from_ram StringBuffer5
 	db $0, "!", $57
 ; 0x64f1a
 
@@ -393,13 +393,13 @@ UnknownText_0x64f1a: ; 0x64f1a
 	db "gift right away?", $51
 	db "I'm waiting on", $4f
 	db "@"
-	text_from_ram $d0bf
+	text_from_ram StringBuffer5
 	db $0, "!", $57
 ; 0x64f74
 
 UnknownText_0x64f74: ; 0x64f74
 	db $0, "My @"
-	text_from_ram $d0ac
+	text_from_ram StringBuffer4
 	db $0, " is", $4f
 	db "getting prettier!", $51
 	db "I've been taking", $4f
@@ -410,7 +410,7 @@ UnknownText_0x64fb2: ; 0x64fb2
 	db $0, "It took only an", $4f
 	db "instant to KO a", $55
 	db "wild @"
-	text_from_ram $d0ac
+	text_from_ram StringBuffer4
 	db $0, ".", $51
 	db "It must be because", $4f
 	db "you gave me some", $51
@@ -421,7 +421,7 @@ UnknownText_0x64fb2: ; 0x64fb2
 UnknownText_0x6501c: ; 0x6501c
 	db $0, "You know what?", $4f
 	db "A wild @"
-	text_from_ram $d0ac
+	text_from_ram StringBuffer4
 	db $0, $51
 	db "got away from me", $4f
 	db "again.", $51
@@ -434,7 +434,7 @@ UnknownText_0x6501c: ; 0x6501c
 UnknownText_0x65091: ; 0x65091
 	db $0, "Right now, I'm on", $4f
 	db "@"
-	text_from_ram $d0bf
+	text_from_ram StringBuffer5
 	db $0, ".", $51
 	db "If you're close", $4f
 	db "by, let's battle!", $51
@@ -455,7 +455,7 @@ UnknownText_0x650ec: ; 0x650ec
 	db "like it. Come get", $51
 	db "it! I'm waiting on", $4f
 	db "@"
-	text_from_ram $d0bf
+	text_from_ram StringBuffer5
 	db $0, "!", $57
 ; 0x65161
 
@@ -475,7 +475,7 @@ UnknownText_0x651bf: ; 0x651bf
 	db "battle me?", $51
 	db "I'm waiting on", $4f
 	db "@"
-	text_from_ram $d0bf
+	text_from_ram StringBuffer5
 	db $0, "!", $57
 ; 0x6520f
 
@@ -487,7 +487,7 @@ UnknownText_0x6520f: ; 0x6520f
 	db "to someone else.", $51
 	db "I'm waiting on", $4f
 	db "@"
-	text_from_ram $d0bf
+	text_from_ram StringBuffer5
 	db $0, "!", $57
 ; 0x65271
 
@@ -495,7 +495,7 @@ UnknownText_0x65271: ; 0x65271
 	db $0, "I recently began", $4f
 	db "observing wild", $55
 	db "@"
-	text_from_ram $d0ac
+	text_from_ram StringBuffer4
 	db $0, ".", $51
 	db "I've been learning", $4f
 	db "all sorts of new", $51
@@ -511,7 +511,7 @@ UnknownText_0x65318: ; 0x65318
 	db $0, "Oh yes, I managed", $4f
 	db "to knock out a", $51
 	db "wild @"
-	text_from_ram $d0ac
+	text_from_ram StringBuffer4
 	db $0, " a", $4f
 	db "while back.", $51
 	db "Well, considering", $4f
@@ -524,14 +524,14 @@ UnknownText_0x65399: ; 0x65399
 	db $0, "Oh yes, I came", $4f
 	db "close to catching", $51
 	db "a wild @"
-	text_from_ram $d0ac
+	text_from_ram StringBuffer4
 	db $0, ",", $4f
 	db "but it got away.", $51
 	db "For the longest", $4f
 	db "time, I've been", $51
 	db "wanting to observe", $4f
 	db "@"
-	text_from_ram $d0ac
+	text_from_ram StringBuffer4
 	db $0, ". Rats…", $57
 ; 0x65419
 
@@ -542,7 +542,7 @@ UnknownText_0x65419: ; 0x65419
 	db "avoid rusting out.", $51
 	db "I'll be on", $4f
 	db "@"
-	text_from_ram $d0bf
+	text_from_ram StringBuffer5
 	db $0, "!", $57
 ; 0x65471
 
@@ -684,7 +684,7 @@ UnknownText_0x65a63: ; 0x65a63
 	db "about our battle?", $51
 	db "The place is", $4f
 	db "@"
-	text_from_ram $d0bf
+	text_from_ram StringBuffer5
 	db $0, ".", $51
 	db "Hurry over--I'm", $4f
 	db "waiting.", $57
@@ -693,7 +693,7 @@ UnknownText_0x65a63: ; 0x65a63
 UnknownText_0x65ab2: ; 0x65ab2
 	db $0, "Listen to this.", $4f
 	db "My @"
-	text_from_ram $d0ac
+	text_from_ram StringBuffer4
 	db $0, $51
 	db "grins happily when", $4f
 	db "I pinch its cheek.", $51
@@ -706,10 +706,10 @@ UnknownText_0x65b29: ; 0x65b29
 	db $0, "Oh, and recently,", $4f
 	db "my PIKACHU beat a", $55
 	db "wild @"
-	text_from_ram $d0ac
+	text_from_ram StringBuffer4
 	db $0, "!", $51
 	db "A wild @"
-	text_from_ram $d0ac
+	text_from_ram StringBuffer4
 	db $0, ",", $4f
 	db "I tell you!", $51
 	db "Don't you think", $4f
@@ -723,7 +723,7 @@ UnknownText_0x65b29: ; 0x65b29
 UnknownText_0x65bc8: ; 0x65bc8
 	db $0, "Oh, and I saw a", $4f
 	db "wild @"
-	text_from_ram $d0ac
+	text_from_ram StringBuffer4
 	db $0, " a", $55
 	db "little while ago.", $51
 	db "But it wasn't very", $4f
@@ -773,7 +773,7 @@ UnknownText_0x65da6: ; 0x65da6
 	db $0, "What's wrong?", $51
 	db "I'm waiting on", $4f
 	db "@"
-	text_from_ram $d0bf
+	text_from_ram StringBuffer5
 	db $0, ".", $51
 	db "Come pick this up", $4f
 	db "anytime.", $57
@@ -781,7 +781,7 @@ UnknownText_0x65da6: ; 0x65da6
 
 UnknownText_0x65de4: ; 0x65de4
 	db $0, "My @"
-	text_from_ram $d0ac
+	text_from_ram StringBuffer4
 	db $0, " has", $4f
 	db "grown again.", $51
 	db "It was only about", $4f
@@ -793,7 +793,7 @@ UnknownText_0x65de4: ; 0x65de4
 UnknownText_0x65e42: ; 0x65e42
 	db $0, "Oh yeah, I KO'd a", $4f
 	db "wild @"
-	text_from_ram $d0ac
+	text_from_ram StringBuffer4
 	db $0, ".", $51
 	db "It was huge, like", $4f
 	db "this big even.", $51
@@ -805,7 +805,7 @@ UnknownText_0x65e42: ; 0x65e42
 UnknownText_0x65eac: ; 0x65eac
 	db $0, "Oh yeah, I lost a", $4f
 	db "wild @"
-	text_from_ram $d0ac
+	text_from_ram StringBuffer4
 	db $0, ".", $51
 	db "It was huge, like", $4f
 	db "this big even.", $51
@@ -819,7 +819,7 @@ UnknownText_0x65f17: ; 0x65f17
 	db "battle going!", $51
 	db "I'll be fishing on", $4f
 	db "@"
-	text_from_ram $d0bf
+	text_from_ram StringBuffer5
 	db $0, ".", $51
 	db "Swing by if you", $4f
 	db "have the time.", $57
@@ -838,7 +838,7 @@ UnknownText_0x65f88: ; 0x65f88
 	db "it's yours.", $51
 	db "I'll be waiting on", $4f
 	db "@"
-	text_from_ram $d0bf
+	text_from_ram StringBuffer5
 	db $0, ".", $57
 ; 0x65ff2
 
@@ -856,7 +856,7 @@ UnknownText_0x66043: ; 0x66043
 	db "You're lost?", $51
 	db "Our battle will be", $4f
 	db "on @"
-	text_from_ram $d0bf
+	text_from_ram StringBuffer5
 	db $0, ".", $57
 ; 0x66087
 
@@ -865,7 +865,7 @@ UnknownText_0x66087: ; 0x66087
 	db "good for you.", $51
 	db "Hustle over to", $4f
 	db "@"
-	text_from_ram $d0bf
+	text_from_ram StringBuffer5
 	db $0, ".", $57
 ; 0x660be
 
@@ -884,7 +884,7 @@ UnknownText_0x6613c: ; 0x6613c
 	db $0, "Oh yeah, I took", $4f
 	db "down this wild", $51
 	db "@"
-	text_from_ram $d0ac
+	text_from_ram StringBuffer4
 	db $0, ".", $4f
 	db "It wasn't rare", $51
 	db "enough to bother", $4f
@@ -914,7 +914,7 @@ UnknownText_0x66214: ; 0x66214
 	db "worth your time!", $51
 	db "You know where--", $4f
 	db "@"
-	text_from_ram $d0bf
+	text_from_ram StringBuffer5
 	db $0, ".", $57
 ; 0x662a9
 
@@ -1005,13 +1005,13 @@ UnknownText_0x66579: ; 0x66579
 	db "rare #MON.", $51
 	db "Hurry over to", $4f
 	db "@"
-	text_from_ram $d0bf
+	text_from_ram StringBuffer5
 	db $0, ".", $57
 ; 0x665ad
 
 UnknownText_0x665ad: ; 0x665ad
 	db $0, "My @"
-	text_from_ram $d0ac
+	text_from_ram StringBuffer4
 	db $0, "'s", $4f
 	db "adorable, don't", $51
 	db "you think so?", $4f
@@ -1024,7 +1024,7 @@ UnknownText_0x66605: ; 0x66605
 	db $0, "Oh, and we had to", $4f
 	db "battle a wild", $51
 	db "@"
-	text_from_ram $d0ac
+	text_from_ram StringBuffer4
 	db $0, " a while", $4f
 	db "ago…", $51
 	db "My CLEFAIRY came", $4f
@@ -1032,7 +1032,7 @@ UnknownText_0x66605: ; 0x66605
 	db "Isn't that awful?", $51
 	db "I hate those nasty", $4f
 	db "@"
-	text_from_ram $d0ac
+	text_from_ram StringBuffer4
 	db $0, "!", $57
 ; 0x66688
 
@@ -1040,7 +1040,7 @@ UnknownText_0x66688: ; 0x66688
 	db $0, "Oh, and we had to", $4f
 	db "battle a wild", $51
 	db "@"
-	text_from_ram $d0ac
+	text_from_ram StringBuffer4
 	db $0, " a while", $4f
 	db "ago…", $51
 	db "My CLEFAIRY got", $4f
@@ -1060,12 +1060,12 @@ UnknownText_0x66730: ; 0x66730
 	db "I'll be waiting", $4f
 	db "with CLEFAIRY on", $55
 	db "@"
-	text_from_ram $d0bf
+	text_from_ram StringBuffer5
 	db $0, ".", $57
 ; 0x66796
 
 UnknownText_0x66796: ; 0x66796
-	text_from_ram $d0ac
+	text_from_ram StringBuffer4
 	db $0, "!", $51
 	db "It's awful.", $4f
 	db "My CLEFAIRY…", $51
@@ -1089,7 +1089,7 @@ UnknownText_0x66801: ; 0x66801
 	db "I'll give you one!", $51
 	db "Come collect it on", $4f
 	db "@"
-	text_from_ram $d0bf
+	text_from_ram StringBuffer5
 	db $0, ".", $57
 ; 0x66882
 
@@ -1107,7 +1107,7 @@ UnknownText_0x668a3: ; 0x668a3
 	db "can wake it up…", $51
 	db "Please hurry to", $4f
 	db "@"
-	text_from_ram $d0bf
+	text_from_ram StringBuffer5
 	db $0, "!", $57
 ; 0x6691d
 
@@ -1119,13 +1119,13 @@ UnknownText_0x6691d: ; 0x6691d
 	db "CLEFAIRY.", $51
 	db "Please hurry to", $4f
 	db "@"
-	text_from_ram $d0bf
+	text_from_ram StringBuffer5
 	db $0, "!", $57
 ; 0x66980
 
 UnknownText_0x66980: ; 0x66980
 	db $0, "My @"
-	text_from_ram $d0ac
+	text_from_ram StringBuffer4
 	db $0, "'s", $4f
 	db "become tougher.", $51
 	db "We've achieved", $4f
@@ -1135,7 +1135,7 @@ UnknownText_0x66980: ; 0x66980
 UnknownText_0x669b2: ; 0x669b2
 	db $0, "We can easily beat", $4f
 	db "@"
-	text_from_ram $d0ac
+	text_from_ram StringBuffer4
 	db $0, "!", $51
 	db "…Huh? You too?", $4f
 	db "Isn't that great?", $57
@@ -1144,7 +1144,7 @@ UnknownText_0x669b2: ; 0x669b2
 UnknownText_0x669ed: ; 0x669ed
 	db $0, "But get this, a", $4f
 	db "wild @"
-	text_from_ram $d0ac
+	text_from_ram StringBuffer4
 	db $0, $51
 	db "just barely eluded", $4f
 	db "us.", $51
@@ -1155,7 +1155,7 @@ UnknownText_0x669ed: ; 0x669ed
 UnknownText_0x66a3a: ; 0x66a3a
 	db $0, "Right now, I'm on", $4f
 	db "@"
-	text_from_ram $d0bf
+	text_from_ram StringBuffer5
 	db $0, ".", $51
 	db "You know, where I", $4f
 	db "first met you?", $51
@@ -1177,14 +1177,14 @@ UnknownText_0x66ad1: ; 0x66ad1
 	db $0, "Oh, ", $14, "!", $4f
 	db "Hurry, hurry!", $51
 	db "@"
-	text_from_ram $d0bf
+	text_from_ram StringBuffer5
 	db $0, "!", $4f
 	db "FLY over now!", $57
 ; 0x66afc
 
 UnknownText_0x66afc: ; 0x66afc
 	db $0, "My @"
-	text_from_ram $d0ac
+	text_from_ram StringBuffer4
 	db $0, "'s", $4f
 	db "grown impressive!", $51
 	db "My fishing skills", $4f
@@ -1194,7 +1194,7 @@ UnknownText_0x66afc: ; 0x66afc
 UnknownText_0x66b3e: ; 0x66b3e
 	db $0, "We beat a wild", $4f
 	db "@"
-	text_from_ram $d0ac
+	text_from_ram StringBuffer4
 	db $0, "…", $51
 	db "You know, I have", $4f
 	db "more fun fishing", $51
@@ -1207,7 +1207,7 @@ UnknownText_0x66b8f: ; 0x66b8f
 	db "we came this close", $51
 	db "to landing a wild", $4f
 	db "@"
-	text_from_ram $d0ac
+	text_from_ram StringBuffer4
 	db $0, ".", $51
 	db "I tell you, it was", $4f
 	db "huge. Believe me.", $57
@@ -1216,7 +1216,7 @@ UnknownText_0x66b8f: ; 0x66b8f
 UnknownText_0x66bf3: ; 0x66bf3
 	db $0, "I'm fishing on", $4f
 	db "@"
-	text_from_ram $d0bf
+	text_from_ram StringBuffer5
 	db $0, ",", $51
 	db "but nothing's", $4f
 	db "biting today.", $51
@@ -1234,7 +1234,7 @@ UnknownText_0x66c6b: ; 0x66c6b
 	db "while fishing.", $51
 	db "Come pick it up on", $4f
 	db "@"
-	text_from_ram $d0bf
+	text_from_ram StringBuffer5
 	db $0, ".", $57
 ; 0x66ca7
 
@@ -1252,7 +1252,7 @@ UnknownText_0x66cf7: ; 0x66cf7
 	db "They're not biting", $51
 	db "like before on", $4f
 	db "@"
-	text_from_ram $d0bf
+	text_from_ram StringBuffer5
 	db $0, "…", $51
 	db "You have to come", $4f
 	db "for a battle!", $57
@@ -1264,7 +1264,7 @@ UnknownText_0x66d45: ; 0x66d45
 	db "Hah? You don't", $4f
 	db "know where?", $51
 	db "@"
-	text_from_ram $d0bf
+	text_from_ram StringBuffer5
 	db $0, "…", $4f
 	db "Just head from", $51
 	db "MAHOGANY toward", $4f
@@ -1327,14 +1327,14 @@ UnknownText_0x66f52: ; 0x66f52
 UnknownText_0x66f9f: ; 0x66f9f
 	db $0, "Nothing can match", $4f
 	db "my @"
-	text_from_ram $d0ac
+	text_from_ram StringBuffer4
 	db $0, " now.", $57
 ; 0x66fc0
 
 UnknownText_0x66fc0: ; 0x66fc0
 	db $0, "Yeah, we KO'd a", $4f
 	db "wild @"
-	text_from_ram $d0ac
+	text_from_ram StringBuffer4
 	db $0, "!", $51
 	db "That was OK, but I", $4f
 	db "wanted to get it…", $57
@@ -1344,7 +1344,7 @@ UnknownText_0x67001: ; 0x67001
 	db $0, "And yesterday, we", $4f
 	db "spotted a wild", $51
 	db "@"
-	text_from_ram $d0ac
+	text_from_ram StringBuffer4
 	db $0, ".", $4f
 	db "We were debating", $51
 	db "whether to catch", $4f
@@ -1362,7 +1362,7 @@ UnknownText_0x67096: ; 0x67096
 	db "right or what?", $51
 	db "Yep! We'll meet on", $4f
 	db "@"
-	text_from_ram $d0bf
+	text_from_ram StringBuffer5
 	db $0, "!", $57
 ; 0x670eb
 
@@ -1379,7 +1379,7 @@ UnknownText_0x67106: ; 0x67106
 UnknownText_0x6712a: ; 0x6712a
 	db $0, "Haven't you gotten", $4f
 	db "to @"
-	text_from_ram $d0bf
+	text_from_ram StringBuffer5
 	db $0, "?", $51
 	db "Waiting here isn't", $4f
 	db "bad, but I'd sure", $55
@@ -1387,9 +1387,9 @@ UnknownText_0x6712a: ; 0x6712a
 ; 0x6717a
 
 UnknownText_0x6717a: ; 0x6717a
-	text_from_ram $d099
+	text_from_ram StringBuffer3
 	db $0, "'s @"
-	text_from_ram $d0ac
+	text_from_ram StringBuffer4
 	db $0, $4f
 	db "is much stronger", $55
 	db "than before!", $57
@@ -1399,7 +1399,7 @@ UnknownText_0x671a4: ; 0x671a4
 	db $0, "And, and…", $4f
 	db "I just battled and", $55
 	db "beat @"
-	text_from_ram $d0ac
+	text_from_ram StringBuffer4
 	db $0, "!", $51
 	db "I've raised my", $4f
 	db "#MON properly!", $57
@@ -1408,7 +1408,7 @@ UnknownText_0x671a4: ; 0x671a4
 UnknownText_0x671eb: ; 0x671eb
 	db $0, "But, but…", $51
 	db "A wild @"
-	text_from_ram $d0ac
+	text_from_ram StringBuffer4
 	db $0, $4f
 	db "got away from me", $51
 	db "again. It's just", $4f
@@ -1422,7 +1422,7 @@ UnknownText_0x6722e: ; 0x6722e
 	db "time!", $51
 	db "I'll be waiting on", $4f
 	db "@"
-	text_from_ram $d0bf
+	text_from_ram StringBuffer5
 	db $0, "!", $57
 ; 0x67281
 
@@ -1443,6 +1443,6 @@ UnknownText_0x672d5: ; 0x672d5
 	db "Come battle ERIN!", $51
 	db "I'll be waiting on", $4f
 	db "@"
-	text_from_ram $d0bf
+	text_from_ram StringBuffer5
 	db $0, "!", $57
 ; 0x67308

text/phone/extra3.asm

@@ -16,7 +16,7 @@ UnknownText_0x174000: ; 0x174000
 
 UnknownText_0x1740c0: ; 0x1740c0
 	db $0, "My @"
-	text_from_ram $d0ac
+	text_from_ram StringBuffer4
 	db $0, "'s", $4f
 	db "intelligence keeps", $51
 	db "rising. It might", $4f
@@ -28,7 +28,7 @@ UnknownText_0x174106: ; 0x174106
 	db $0, "The other day, I", $4f
 	db "easily defeated a", $55
 	db "@"
-	text_from_ram $d0ac
+	text_from_ram StringBuffer4
 	db $0, ".", $51
 	db "I think swapping", $4f
 	db "tips with you is", $55
@@ -39,7 +39,7 @@ UnknownText_0x174165: ; 0x174165
 	db $0, "Oh, and listen.", $4f
 	db "I missed catching", $51
 	db "a @"
-	text_from_ram $d0ac
+	text_from_ram StringBuffer4
 	db $0, " by", $4f
 	db "just a tiny bit.", $51
 	db "If I'd been a bit", $4f
@@ -55,7 +55,7 @@ UnknownText_0x1741e1: ; 0x1741e1
 	db "logically.", $51
 	db "I'll be in", $4f
 	db "@"
-	text_from_ram $d0bf
+	text_from_ram StringBuffer5
 	db $0, ".", $51
 	db "Give me a shout if", $4f
 	db "you're nearby.", $57
@@ -170,14 +170,14 @@ UnknownText_0x174638: ; 0x174638
 	db "soon!", $51
 	db "I'll be at", $4f
 	db "@"
-	text_from_ram $d0bf
+	text_from_ram StringBuffer5
 	db $0, ".", $57
 ; 0x174688
 
 UnknownText_0x174688: ; 0x174688
 	db $0, "I fancied up my", $4f
 	db "@"
-	text_from_ram $d0ac
+	text_from_ram StringBuffer4
 	db $0, " and", $51
 	db "made it even cuter", $4f
 	db "than before!", $57
@@ -201,7 +201,7 @@ UnknownText_0x174734: ; 0x174734
 	db "A closer look", $4f
 	db "showed it was", $51
 	db "@"
-	text_from_ram $d0ac
+	text_from_ram StringBuffer4
 	db $0, ". I was", $4f
 	db "quite miffed.", $57
 ; 0x1747ac
@@ -220,7 +220,7 @@ UnknownText_0x1747cc: ; 0x1747cc
 	db "me out.", $51
 	db "I'll be at", $4f
 	db "@"
-	text_from_ram $d0bf
+	text_from_ram StringBuffer5
 	db $0, ".", $51
 	db "Please come see me", $4f
 	db "when you can.", $57
@@ -239,7 +239,7 @@ UnknownText_0x174895: ; 0x174895
 	db "There's no need to", $4f
 	db "hurry. Come see me", $51
 	db "in @"
-	text_from_ram $d0bf
+	text_from_ram StringBuffer5
 	db $0, $4f
 	db "when you can.", $57
 ; 0x1748ea
@@ -250,7 +250,7 @@ UnknownText_0x1748ea: ; 0x1748ea
 	db "It won't be like", $4f
 	db "last time!", $51
 	db "@"
-	text_from_ram $d0bf
+	text_from_ram StringBuffer5
 	db $0, "'s", $4f
 	db "where I'm waiting", $51
 	db "for you. Hustle", $4f
@@ -275,7 +275,7 @@ UnknownText_0x1749c7: ; 0x1749c7
 	db "not have forgotten", $55
 	db "about our battle!", $51
 	db "@"
-	text_from_ram $d0bf
+	text_from_ram StringBuffer5
 	db $0, "!", $51
 	db "Hustle over quick!", $4f
 	db "I'm waiting!", $57
@@ -283,13 +283,13 @@ UnknownText_0x1749c7: ; 0x1749c7
 
 UnknownText_0x174a24: ; 0x174a24
 	db $0, "My @"
-	text_from_ram $d0ac
+	text_from_ram StringBuffer4
 	db $0, $4f
 	db "might be greater", $55
 	db "than I imagined.", $51
 	db "I doubt I'll see a", $4f
 	db "@"
-	text_from_ram $d0ac
+	text_from_ram StringBuffer4
 	db $0, " that's", $55
 	db "better than mine.", $57
 ; 0x174a80
@@ -298,12 +298,12 @@ UnknownText_0x174a80: ; 0x174a80
 	db $0, "Oh, and I managed", $4f
 	db "to barely defeat", $51
 	db "@"
-	text_from_ram $d0ac
+	text_from_ram StringBuffer4
 	db $0, " the", $4f
 	db "other day.", $51
 	db "I've never seen a", $4f
 	db "@"
-	text_from_ram $d0ac
+	text_from_ram StringBuffer4
 	db $0, " get", $55
 	db "that strong…", $51
 	db "You shouldn't let", $4f
@@ -317,7 +317,7 @@ UnknownText_0x174b2d: ; 0x174b2d
 	db $0, "And a while back,", $4f
 	db "I tried to catch a", $55
 	db "wild @"
-	text_from_ram $d0ac
+	text_from_ram StringBuffer4
 	db $0, ".", $51
 	db "But it managed to", $4f
 	db "elude me.", $51
@@ -331,7 +331,7 @@ UnknownText_0x174bc5: ; 0x174bc5
 	db $0, "Let's battle!", $51
 	db "I'll be waiting on", $4f
 	db "@"
-	text_from_ram $d0bf
+	text_from_ram StringBuffer5
 	db $0, ".", $51
 	db "Give me a shout", $4f
 	db "when you're close.", $57
@@ -352,17 +352,17 @@ UnknownText_0x174c49: ; 0x174c49
 	db "aren't you here?", $51
 	db "I'll take you down", $4f
 	db "with @"
-	text_from_ram $d0bf
+	text_from_ram StringBuffer5
 	db $0, "!", $57
 ; 0x174c7f
 
 UnknownText_0x174c7f: ; 0x174c7f
 	db $0, "Do you remember my", $4f
 	db "sweet @"
-	text_from_ram $d0ac
+	text_from_ram StringBuffer4
 	db $0, "?", $51
 	db "@"
-	text_from_ram $d0ac
+	text_from_ram StringBuffer4
 	db $0, " runs", $4f
 	db "very fast.", $51
 	db "It's exhilarating", $4f
@@ -374,7 +374,7 @@ UnknownText_0x174c7f: ; 0x174c7f
 UnknownText_0x174cf6: ; 0x174cf6
 	db $0, "Oh, have you ever", $4f
 	db "seen a @"
-	text_from_ram $d0ac
+	text_from_ram StringBuffer4
 	db $0, $55
 	db "before?", $51
 	db "I just battled", $4f
@@ -390,7 +390,7 @@ UnknownText_0x174cf6: ; 0x174cf6
 UnknownText_0x174d86: ; 0x174d86
 	db $0, "Oh, I just saw a", $4f
 	db "wild @"
-	text_from_ram $d0ac
+	text_from_ram StringBuffer4
 	db $0, ".", $51
 	db "I was trying to", $4f
 	db "catch it when I", $51
@@ -412,7 +412,7 @@ UnknownText_0x174e4e: ; 0x174e4e
 	db "I'll be waiting", $4f
 	db "for you around", $51
 	db "@"
-	text_from_ram $d0bf
+	text_from_ram StringBuffer5
 	db $0, ".", $4f
 	db "Look for me, OK?", $57
 ; 0x174eb7
@@ -432,7 +432,7 @@ UnknownText_0x174ee2: ; 0x174ee2
 	db "Did you forget our", $4f
 	db "deal?", $51
 	db "@"
-	text_from_ram $d0bf
+	text_from_ram StringBuffer5
 	db $0, ".", $51
 	db "That's where I'm", $4f
 	db "waiting.", $57
@@ -441,7 +441,7 @@ UnknownText_0x174ee2: ; 0x174ee2
 UnknownText_0x174f2f: ; 0x174f2f
 	db $0, "Hey listen, my", $4f
 	db "@"
-	text_from_ram $d0ac
+	text_from_ram StringBuffer4
 	db $0, "'s stick", $51
 	db "has this really", $4f
 	db "delicious aroma.", $51
@@ -453,7 +453,7 @@ UnknownText_0x174f90: ; 0x174f90
 	db $0, "A while ago, my", $4f
 	db "FARFETCH'D KO'd", $55
 	db "this @"
-	text_from_ram $d0ac
+	text_from_ram StringBuffer4
 	db $0, ".", $51
 	db "You should have", $4f
 	db "seen FARFETCH'D", $51
@@ -464,7 +464,7 @@ UnknownText_0x174f90: ; 0x174f90
 UnknownText_0x174ffd: ; 0x174ffd
 	db $0, "I ran into a wild", $4f
 	db "@"
-	text_from_ram $d0ac
+	text_from_ram StringBuffer4
 	db $0, "…", $51
 	db "I was trying to", $4f
 	db "catch it, but it", $51
@@ -482,7 +482,7 @@ UnknownText_0x17507d: ; 0x17507d
 	db "all worked up and", $4f
 	db "raring to go.", $51
 	db "@"
-	text_from_ram $d0bf
+	text_from_ram StringBuffer5
 	db $0, "'s", $4f
 	db "where I'm at.", $51
 	db "Keep an eye out", $4f
@@ -501,7 +501,7 @@ UnknownText_0x175116: ; 0x175116
 	db "you can have it.", $51
 	db "Catch up to me on", $4f
 	db "@"
-	text_from_ram $d0bf
+	text_from_ram StringBuffer5
 	db $0, ",", $51
 	db "and I'll let you", $4f
 	db "have it.", $57
@@ -527,7 +527,7 @@ UnknownText_0x17520a: ; 0x17520a
 	db "smack me with its", $4f
 	db "stick!", $51
 	db "@"
-	text_from_ram $d0bf
+	text_from_ram StringBuffer5
 	db $0, "!", $51
 	db "Please come as", $4f
 	db "soon as you can!", $57
@@ -539,7 +539,7 @@ UnknownText_0x17529c: ; 0x17529c
 	db "this gift?", $51
 	db "Catch up to me on", $4f
 	db "@"
-	text_from_ram $d0bf
+	text_from_ram StringBuffer5
 	db $0, ",", $51
 	db "and I'll let you", $4f
 	db "have it.", $57
@@ -549,11 +549,11 @@ UnknownText_0x1752f5: ; 0x1752f5
 	db $0, "Listen, dear…", $51
 	db "Do you recall my", $4f
 	db "@"
-	text_from_ram $d0ac
+	text_from_ram StringBuffer4
 	db $0, "?", $51
 	db "Yes, exactly. That", $4f
 	db "lovely @"
-	text_from_ram $d0ac
+	text_from_ram StringBuffer4
 	db $0, ".", $51
 	db "Wouldn't you agree", $4f
 	db "it's a perfect", $55
@@ -563,11 +563,11 @@ UnknownText_0x1752f5: ; 0x1752f5
 UnknownText_0x17536b: ; 0x17536b
 	db $0, "Have I ever faced", $4f
 	db "a wild @"
-	text_from_ram $d0ac
+	text_from_ram StringBuffer4
 	db $0, "?", $51
 	db "You need to ask?", $51
 	db "@"
-	text_from_ram $d0ac
+	text_from_ram StringBuffer4
 	db $0, " I've", $4f
 	db "beaten on numerous", $55
 	db "occasions!", $57
@@ -581,7 +581,7 @@ UnknownText_0x1753c5: ; 0x1753c5
 	db "I would never fail", $4f
 	db "to catch a wild", $51
 	db "@"
-	text_from_ram $d0ac
+	text_from_ram StringBuffer4
 	db $0, "…", $4f
 	db "Oh! Never mind!", $57
 ; 0x17543a
@@ -591,7 +591,7 @@ UnknownText_0x17543a: ; 0x17543a
 	db "battle!", $51
 	db "The place shall be", $4f
 	db "@"
-	text_from_ram $d0bf
+	text_from_ram StringBuffer5
 	db $0, "!", $51
 	db "Don't make me", $4f
 	db "wait! Got it?", $57
@@ -615,14 +615,14 @@ UnknownText_0x1754e5: ; 0x1754e5
 	db "I told you that", $4f
 	db "the place was", $51
 	db "@"
-	text_from_ram $d0bf
+	text_from_ram StringBuffer5
 	db $0, "!", $4f
 	db "Don't try to run!", $57
 ; 0x175530
 
 UnknownText_0x175530: ; 0x175530
 	db $0, "My @"
-	text_from_ram $d0ac
+	text_from_ram StringBuffer4
 	db $0, "'s", $4f
 	db "looking sharper", $55
 	db "than before!", $51
@@ -635,7 +635,7 @@ UnknownText_0x175530: ; 0x175530
 UnknownText_0x175591: ; 0x175591
 	db $0, "Oh yeah, I took", $4f
 	db "down a @"
-	text_from_ram $d0ac
+	text_from_ram StringBuffer4
 	db $0, $51
 	db "in the wild the", $4f
 	db "other day.", $51
@@ -648,7 +648,7 @@ UnknownText_0x175591: ; 0x175591
 UnknownText_0x175611: ; 0x175611
 	db $0, "Oh yeah, I saw a", $4f
 	db "wild @"
-	text_from_ram $d0ac
+	text_from_ram StringBuffer4
 	db $0, "!", $51
 	db "I thought about", $4f
 	db "going for it, but", $51
@@ -664,7 +664,7 @@ UnknownText_0x175693: ; 0x175693
 	db "I promise things", $4f
 	db "will be different!", $51
 	db "@"
-	text_from_ram $d0bf
+	text_from_ram StringBuffer5
 	db $0, "'s", $4f
 	db "where I'll be.", $51
 	db "Give me a shout", $4f
@@ -678,7 +678,7 @@ UnknownText_0x17570a: ; 0x17570a
 UnknownText_0x17571d: ; 0x17571d
 	db $0, "I'm checking out", $4f
 	db "@"
-	text_from_ram $d0ac
+	text_from_ram StringBuffer4
 	db $0, "'s moves", $51
 	db "and devising some", $4f
 	db "strategies.", $51
@@ -694,7 +694,7 @@ UnknownText_0x175786: ; 0x175786
 	db "battle already!", $51
 	db "I'm waiting on", $4f
 	db "@"
-	text_from_ram $d0bf
+	text_from_ram StringBuffer5
 	db $0, "!", $57
 ; 0x1757d4
 
@@ -706,7 +706,7 @@ UnknownText_0x1757d4: ; 0x1757d4
 	db "quickly for me.", $4f
 	db "It's overwhelming!", $51
 	db "@"
-	text_from_ram $d0ac
+	text_from_ram StringBuffer4
 	db $0, "'s grow-", $4f
 	db "ing especially", $51
 	db "quickly. I think", $4f
@@ -716,7 +716,7 @@ UnknownText_0x1757d4: ; 0x1757d4
 UnknownText_0x175869: ; 0x175869
 	db $0, "Oh yeah, we KO'd a", $4f
 	db "wild @"
-	text_from_ram $d0ac
+	text_from_ram StringBuffer4
 	db $0, $51
 	db "with one hit a", $4f
 	db "while back.", $51
@@ -729,7 +729,7 @@ UnknownText_0x175869: ; 0x175869
 UnknownText_0x1758e4: ; 0x1758e4
 	db $0, "Oh yeah, a wild", $4f
 	db "@"
-	text_from_ram $d0ac
+	text_from_ram StringBuffer4
 	db $0, " got", $51
 	db "away from me at", $4f
 	db "the last second.", $51
@@ -747,7 +747,7 @@ UnknownText_0x175976: ; 0x175976
 	db "It won't be like", $4f
 	db "last time!", $51
 	db "@"
-	text_from_ram $d0bf
+	text_from_ram StringBuffer5
 	db $0, "'s", $4f
 	db "where I'll be.", $51
 	db "Let me know when", $4f
@@ -776,7 +776,7 @@ UnknownText_0x175a60: ; 0x175a60
 	db "some with you.", $51
 	db "I'll be waiting on", $4f
 	db "@"
-	text_from_ram $d0bf
+	text_from_ram StringBuffer5
 	db $0, ".", $57
 ; 0x175abe
 
@@ -793,7 +793,7 @@ UnknownText_0x175b1e: ; 0x175b1e
 	db $0, "Let's battle", $4f
 	db "already!", $51
 	db "@"
-	text_from_ram $d0bf
+	text_from_ram StringBuffer5
 	db $0, " is", $4f
 	db "where I am.", $51
 	db "Please get here as", $4f
@@ -804,7 +804,7 @@ UnknownText_0x175b6d: ; 0x175b6d
 	db $0, "How come you're", $4f
 	db "not here yet?", $51
 	db "@"
-	text_from_ram $d0bf
+	text_from_ram StringBuffer5
 	db $0, " is", $4f
 	db "where I am.", $51
 	db "Please get here as", $4f
@@ -815,7 +815,7 @@ UnknownText_0x175bc4: ; 0x175bc4
 	db $0, "I've been spending", $4f
 	db "more time with my", $51
 	db "@"
-	text_from_ram $d0ac
+	text_from_ram StringBuffer4
 	db $0, " than I", $4f
 	db "have with my kids.", $51
 	db "That's a bit sad,", $4f
@@ -825,7 +825,7 @@ UnknownText_0x175bc4: ; 0x175bc4
 UnknownText_0x175c24: ; 0x175c24
 	db $0, "I just beat a wild", $4f
 	db "@"
-	text_from_ram $d0ac
+	text_from_ram StringBuffer4
 	db $0, ".", $51
 	db "I told my kid, but", $4f
 	db "he scoffed that he", $51
@@ -838,7 +838,7 @@ UnknownText_0x175c24: ; 0x175c24
 UnknownText_0x175c9f: ; 0x175c9f
 	db $0, "Yesterday a wild", $4f
 	db "@"
-	text_from_ram $d0ac
+	text_from_ram StringBuffer4
 	db $0, " slipped", $51
 	db "away from me, in", $4f
 	db "front of my kid.", $51
@@ -858,7 +858,7 @@ UnknownText_0x175d40: ; 0x175d40
 	db "For a kid, you're", $4f
 	db "quite agreeable.", $51
 	db "@"
-	text_from_ram $d0bf
+	text_from_ram StringBuffer5
 	db $0, " is", $4f
 	db "the spot!", $57
 ; 0x175db7
@@ -872,13 +872,13 @@ UnknownText_0x175dd9: ; 0x175dd9
 	db $0, "Listen, I… Yowch!", $51
 	db "Uh, sorry! See,", $4f
 	db "@"
-	text_from_ram $d0ac
+	text_from_ram StringBuffer4
 	db $0, " are", $51
 	db "biting like there", $4f
 	db "is no tomorrow", $51
 	db "over here on", $4f
 	db "@"
-	text_from_ram $d0bf
+	text_from_ram StringBuffer5
 	db $0, "!", $51
 	db "Aiyee! Ouch!", $4f
 	db "One jabbed me!", $51
@@ -904,7 +904,7 @@ UnknownText_0x175f11: ; 0x175f11
 	db "I'm waiting for", $51
 	db "you to show up on", $4f
 	db "@"
-	text_from_ram $d0bf
+	text_from_ram StringBuffer5
 	db $0, ".", $51
 	db "You shouldn't make", $4f
 	db "your elders wait!", $57
@@ -924,7 +924,7 @@ UnknownText_0x175fda: ; 0x175fda
 	db $0, "Oh, you have to", $4f
 	db "hear this.", $51
 	db "My @"
-	text_from_ram $d0ac
+	text_from_ram StringBuffer4
 	db $0, " is", $4f
 	db "so adorable!", $51
 	db "It always wants to", $4f
@@ -935,7 +935,7 @@ UnknownText_0x17602d: ; 0x17602d
 	db $0, "And, and! Um…", $51
 	db "We beat a wild", $4f
 	db "@"
-	text_from_ram $d0ac
+	text_from_ram StringBuffer4
 	db $0, " with", $51
 	db "just one hit a", $4f
 	db "little while ago.", $51
@@ -948,7 +948,7 @@ UnknownText_0x176095: ; 0x176095
 	db "We just saw a", $4f
 	db "really gorgeous", $55
 	db "@"
-	text_from_ram $d0ac
+	text_from_ram StringBuffer4
 	db $0, ".", $51
 	db "But I was on the", $4f
 	db "phone, so it got", $51
@@ -965,7 +965,7 @@ UnknownText_0x17610a: ; 0x17610a
 	db "like to battle?", $51
 	db "I'll be waiting on", $4f
 	db "@"
-	text_from_ram $d0bf
+	text_from_ram StringBuffer5
 	db $0, ".", $51
 	db "Let me know when", $4f
 	db "you get here!", $57
@@ -1107,12 +1107,12 @@ UnknownText_0x176816: ; 0x176816
 	db $0, "Listen, listen!", $51
 	db "I saw a beautiful", $4f
 	db "@"
-	text_from_ram $d0ac
+	text_from_ram StringBuffer4
 	db $0, "!", $51
 	db "I wish I could", $4f
 	db "become a beautiful", $55
 	db "@"
-	text_from_ram $d0ac
+	text_from_ram StringBuffer4
 	db $0, " too.", $57
 ; 0x17686d
 
@@ -1126,7 +1126,7 @@ UnknownText_0x17686d: ; 0x17686d
 UnknownText_0x1768b0: ; 0x1768b0
 	db $0, "Listen, listen!", $51
 	db "My @"
-	text_from_ram $d0ac
+	text_from_ram StringBuffer4
 	db $0, "…", $4f
 	db "it… so pretty…", $51
 	db "and… giggle… so", $4f
@@ -1155,7 +1155,7 @@ UnknownText_0x1769da: ; 0x1769da
 	db "away!", $51
 	db "I'll be waiting on", $4f
 	db "@"
-	text_from_ram $d0bf
+	text_from_ram StringBuffer5
 	db $0, "!", $57
 ; 0x176a2f
 
@@ -1163,7 +1163,7 @@ UnknownText_0x176a2f: ; 0x176a2f
 	db $0, "The other day, I", $4f
 	db "was watching my", $51
 	db "@"
-	text_from_ram $d0ac
+	text_from_ram StringBuffer4
 	db $0, " eat", $4f
 	db "some BERRIES.", $51
 	db "It looked like it", $4f
@@ -1180,7 +1180,7 @@ UnknownText_0x176aef: ; 0x176aef
 	db $0, "Lately, I've been", $4f
 	db "running across", $51
 	db "wild @"
-	text_from_ram $d0ac
+	text_from_ram StringBuffer4
 	db $0, $4f
 	db "quite often.", $51
 	db "They're easily", $4f
@@ -1191,7 +1191,7 @@ UnknownText_0x176b45: ; 0x176b45
 	db $0, "Oh yeah, I was", $4f
 	db "battling this", $51
 	db "@"
-	text_from_ram $d0ac
+	text_from_ram StringBuffer4
 	db $0, " the", $4f
 	db "other day…", $51
 	db "It took off when I", $4f
@@ -1207,7 +1207,7 @@ UnknownText_0x176bee: ; 0x176bee
 	db $0, "Come on--let's", $4f
 	db "battle right now!", $51
 	db "@"
-	text_from_ram $d0bf
+	text_from_ram StringBuffer5
 	db $0, " is", $4f
 	db "where I am.", $51
 	db "Come on down if", $4f
@@ -1224,18 +1224,18 @@ UnknownText_0x176c61: ; 0x176c61
 	db "mind-blowing!", $51
 	db "I took a hike in", $4f
 	db "@"
-	text_from_ram $d0bf
+	text_from_ram StringBuffer5
 	db $0, $55
 	db "yesterday, see?", $51
 	db "Well, there were", $4f
 	db "tons of @"
-	text_from_ram $d0ac
+	text_from_ram StringBuffer4
 	db $0, $51
 	db "around! You have", $4f
 	db "to see it!", $51
 	db "I get this feeling", $4f
 	db "that @"
-	text_from_ram $d0ac
+	text_from_ram StringBuffer4
 	db $0, $51
 	db "may be timid.", $4f
 	db "I didn't see any", $51
@@ -1257,7 +1257,7 @@ UnknownText_0x176d85: ; 0x176d85
 	db "our battle, have", $4f
 	db "you?", $51
 	db "@"
-	text_from_ram $d0bf
+	text_from_ram StringBuffer5
 	db $0, "!", $4f
 	db "I'm waiting!", $57
 ; 0x176dd1
@@ -1276,7 +1276,7 @@ UnknownText_0x176dd1: ; 0x176dd1
 
 UnknownText_0x176e5d: ; 0x176e5d
 	db $0, "My @"
-	text_from_ram $d0ac
+	text_from_ram StringBuffer4
 	db $0, " is", $4f
 	db "looking more and", $51
 	db "more like me. It's", $4f
@@ -1287,7 +1287,7 @@ UnknownText_0x176e9c: ; 0x176e9c
 	db $0, "And, you know?", $51
 	db "Now we can KO", $4f
 	db "@"
-	text_from_ram $d0ac
+	text_from_ram StringBuffer4
 	db $0, " easily.", $51
 	db "I should challenge", $4f
 	db "the GOLDENROD GYM.", $57
@@ -1297,7 +1297,7 @@ UnknownText_0x176eee: ; 0x176eee
 	db $0, "And, you know?", $4f
 	db "We just failed to", $51
 	db "beat @"
-	text_from_ram $d0ac
+	text_from_ram StringBuffer4
 	db $0, " by", $4f
 	db "a tiny margin.", $51
 	db "I'm guessing my", $4f
@@ -1315,7 +1315,7 @@ UnknownText_0x176f60: ; 0x176f60
 	db "with me?", $51
 	db "I'll be waiting on", $4f
 	db "@"
-	text_from_ram $d0bf
+	text_from_ram StringBuffer5
 	db $0, ".", $57
 ; 0x176fdb
 
@@ -1356,7 +1356,7 @@ UnknownText_0x177138: ; 0x177138
 	db "battle soon!", $51
 	db "I'll be waiting on", $4f
 	db "@"
-	text_from_ram $d0bf
+	text_from_ram StringBuffer5
 	db $0, ".", $57
 ; 0x17717c
 
@@ -1373,7 +1373,7 @@ UnknownText_0x17717c: ; 0x17717c
 
 UnknownText_0x1771fd: ; 0x1771fd
 	db $0, "My @"
-	text_from_ram $d0ac
+	text_from_ram StringBuffer4
 	db $0, " and", $4f
 	db "I are getting more", $51
 	db "in sync with each", $4f
@@ -1383,7 +1383,7 @@ UnknownText_0x1771fd: ; 0x1771fd
 UnknownText_0x177237: ; 0x177237
 	db $0, "We battled a wild", $4f
 	db "@"
-	text_from_ram $d0ac
+	text_from_ram StringBuffer4
 	db $0, " and", $51
 	db "managed to drop it", $4f
 	db "in a close match.", $51
@@ -1395,7 +1395,7 @@ UnknownText_0x177297: ; 0x177297
 	db $0, "But, you know?", $51
 	db "I still haven't", $4f
 	db "caught @"
-	text_from_ram $d0ac
+	text_from_ram StringBuffer4
 	db $0, ".", $51
 	db "It's getting past", $4f
 	db "frustrating…", $57
@@ -1407,7 +1407,7 @@ UnknownText_0x1772e2: ; 0x1772e2
 	db "again sometime?", $51
 	db "I'll be waiting on", $4f
 	db "@"
-	text_from_ram $d0bf
+	text_from_ram StringBuffer5
 	db $0, ".", $51
 	db "…Could you take it", $4f
 	db "a little easier on", $55
@@ -1437,7 +1437,7 @@ UnknownText_0x1773e7: ; 0x1773e7
 	db "You will come for", $4f
 	db "it, won't you?", $51
 	db "@"
-	text_from_ram $d0bf
+	text_from_ram StringBuffer5
 	db $0, " is", $4f
 	db "where I am.", $57
 ; 0x177465
@@ -1458,7 +1458,7 @@ UnknownText_0x1774c1: ; 0x1774c1
 	db "for our battle?", $51
 	db "Don't forget,", $4f
 	db "@"
-	text_from_ram $d0bf
+	text_from_ram StringBuffer5
 	db $0, "!", $57
 ; 0x17750e
 
@@ -1469,6 +1469,6 @@ UnknownText_0x17750e: ; 0x17750e
 	db "present!", $51
 	db "Hurry over to", $4f
 	db "@"
-	text_from_ram $d0bf
+	text_from_ram StringBuffer5
 	db $0, "!", $57
 ; 0x177561

text/phone/mom.asm

@@ -6,11 +6,11 @@ MomPhoneGreetingText: ; 0x1b4000
 UnknownText_0x1b4021: ; 0x1b4021
 	db $0, "Oh, so you're in", $4f
 	db "@"
-	TX_RAM $d099
+	TX_RAM StringBuffer3
 	db $0, "…", $51
 	db "Isn't that where", $4f
 	db "@"
-	TX_RAM $d0ac
+	TX_RAM StringBuffer4
 	db $0, $51
 	db "is? Did you go", $4f
 	db "take a look?", $57
@@ -18,7 +18,7 @@ UnknownText_0x1b4021: ; 0x1b4021
 MomPhoneGenericAreaText: ; 0x1b406b
 	db $0, "Really, you're in", $4f
 	db "@"
-	TX_RAM $d099
+	TX_RAM StringBuffer3
 	db $0, "?", $51
 	db "I've never gone", $4f
 	db "there. That's kind", $55
@@ -27,7 +27,7 @@ MomPhoneGenericAreaText: ; 0x1b406b
 MomPhoneNewBarkText: ; 0x1b40b1
 	db $0, "What? You're in", $4f
 	db "@"
-	TX_RAM $d099
+	TX_RAM StringBuffer3
 	db $0, "?", $51
 	db "Come see your MOM", $4f
 	db "sometime!", $57
@@ -35,7 +35,7 @@ MomPhoneNewBarkText: ; 0x1b40b1
 MomPhoneCherrygroveText: ; 0x1b40e4
 	db $0, "You're visiting", $4f
 	db "@"
-	TX_RAM $d099
+	TX_RAM StringBuffer3
 	db $0, "?", $51
 	db "How about coming", $4f
 	db "home for a bit?", $57
@@ -43,7 +43,7 @@ MomPhoneCherrygroveText: ; 0x1b40e4
 UnknownText_0x1b411c: ; 0x1b411c
 	db $0, "Wow, you're in", $4f
 	db "@"
-	TX_RAM $d099
+	TX_RAM StringBuffer3
 	db $0, "?", $51
 	db "Good luck on your", $4f
 	db "#MON quest!", $57
@@ -59,7 +59,7 @@ UnknownText_0x1b4150: ; 0x1b4150
 UnknownText_0x1b41a7: ; 0x1b41a7
 	db $0, "By the way, you've", $4f
 	db "saved up ¥@"
-	TX_RAM $d099
+	TX_RAM StringBuffer3
 	db $0, ".", $51
 	db "Do you want to", $4f
 	db "keep on saving?", $57
@@ -77,7 +77,7 @@ UnknownText_0x1b420d: ; 0x1b420d
 UnknownText_0x1b4249: ; 0x1b4249
 	db $0, "By the way, you've", $4f
 	db "saved up ¥@"
-	TX_RAM $d099
+	TX_RAM StringBuffer3
 	db $0, ".", $51
 	db "Want to start", $4f
 	db "saving again?", $57

trainers/attributes.asm

@@ -0,0 +1,425 @@
+
+AI_STATUS_RED    EQU 1 << 0
+AI_STAT_MODS_RED EQU 1 << 1
+AI_TYPES_RED     EQU 1 << 2
+AI_OFFENSIVE     EQU 1 << 3
+AI_SMART         EQU 1 << 4
+AI_OPPORTUNIST   EQU 1 << 5
+AI_AGGRESSIVE    EQU 1 << 6
+AI_CAUTIOUS      EQU 1 << 7
+AI_STATUS_IMMUNE EQU 1 << 8
+AI_RISKY         EQU 1 << 9
+AI_10            EQU 1 << 10
+AI_11            EQU 1 << 11
+AI_12            EQU 1 << 12
+AI_13            EQU 1 << 13
+AI_14            EQU 1 << 14
+AI_15            EQU 1 << 15
+
+
+TrainerClassAttributes: ; 3959c
+
+; Falkner
+	db NONE, NONE ; items
+	db 25 ; base reward
+	dw AI_STATUS_RED | AI_STAT_MODS_RED | AI_SMART | AI_AGGRESSIVE | AI_CAUTIOUS | AI_STATUS_IMMUNE | AI_RISKY
+	db $44, $00
+
+; Whitney
+	db NONE, NONE ; items
+	db 25 ; base reward
+	dw AI_STATUS_RED | AI_STAT_MODS_RED | AI_SMART | AI_AGGRESSIVE | AI_CAUTIOUS | AI_STATUS_IMMUNE | AI_RISKY
+	db $44, $00
+
+; Bugsy
+	db NONE, NONE ; items
+	db 25 ; base reward
+	dw AI_STATUS_RED | AI_STAT_MODS_RED | AI_SMART | AI_AGGRESSIVE | AI_CAUTIOUS | AI_STATUS_IMMUNE | AI_RISKY
+	db $44, $00
+
+; Morty
+	db NONE, NONE ; items
+	db 25 ; base reward
+	dw AI_STATUS_RED | AI_STAT_MODS_RED | AI_SMART | AI_AGGRESSIVE | AI_CAUTIOUS | AI_STATUS_IMMUNE | AI_RISKY
+	db $44, $00
+
+; Pryce
+	db HYPER_POTION, NONE ; items
+	db 25 ; base reward
+	dw AI_STATUS_RED | AI_STAT_MODS_RED | AI_SMART | AI_AGGRESSIVE | AI_CAUTIOUS | AI_STATUS_IMMUNE | AI_RISKY
+	db $44, $00
+
+; Jasmine
+	db HYPER_POTION, NONE ; items
+	db 25 ; base reward
+	dw AI_STATUS_RED | AI_STAT_MODS_RED | AI_SMART | AI_AGGRESSIVE | AI_CAUTIOUS | AI_STATUS_IMMUNE | AI_RISKY
+	db $44, $00
+
+; Chuck
+	db FULL_HEAL, NONE ; items
+	db 25 ; base reward
+	dw AI_STATUS_RED | AI_STAT_MODS_RED | AI_SMART | AI_AGGRESSIVE | AI_CAUTIOUS | AI_STATUS_IMMUNE | AI_RISKY
+	db $44, $00
+
+; Clair
+	db FULL_HEAL, HYPER_POTION ; items
+	db 25 ; base reward
+	dw AI_STATUS_RED | AI_STAT_MODS_RED | AI_SMART | AI_AGGRESSIVE | AI_CAUTIOUS | AI_STATUS_IMMUNE | AI_RISKY
+	db $44, $00
+
+; Rival1
+	db NONE, NONE ; items
+	db 15 ; base reward
+	dw AI_STATUS_RED | AI_STAT_MODS_RED | AI_SMART | AI_AGGRESSIVE | AI_CAUTIOUS | AI_STATUS_IMMUNE | AI_RISKY
+	db $44, $00
+
+; Pokemon Prof
+	db NONE, NONE ; items
+	db 25 ; base reward
+	dw AI_STATUS_RED | AI_AGGRESSIVE | AI_STATUS_IMMUNE
+	db $44, $00
+
+; Will
+	db MAX_POTION, NONE ; items
+	db 25 ; base reward
+	dw AI_STATUS_RED | AI_STAT_MODS_RED | AI_SMART | AI_AGGRESSIVE | AI_CAUTIOUS | AI_STATUS_IMMUNE | AI_RISKY
+	db $44, $00
+
+; Cal
+	db NONE, NONE ; items
+	db 25 ; base reward
+	dw AI_STATUS_RED | AI_STAT_MODS_RED | AI_SMART | AI_AGGRESSIVE | AI_CAUTIOUS | AI_STATUS_IMMUNE | AI_RISKY
+	db $44, $00
+
+; Bruno
+	db MAX_POTION, NONE ; items
+	db 25 ; base reward
+	dw AI_STATUS_RED | AI_STAT_MODS_RED | AI_SMART | AI_AGGRESSIVE | AI_CAUTIOUS | AI_STATUS_IMMUNE | AI_RISKY
+	db $44, $00
+
+; Karen
+	db FULL_HEAL, MAX_POTION ; items
+	db 25 ; base reward
+	dw AI_STATUS_RED | AI_STAT_MODS_RED | AI_SMART | AI_AGGRESSIVE | AI_CAUTIOUS | AI_STATUS_IMMUNE | AI_RISKY
+	db $44, $00
+
+; Koga
+	db FULL_HEAL, FULL_RESTORE ; items
+	db 25 ; base reward
+	dw AI_STATUS_RED | AI_STAT_MODS_RED | AI_SMART | AI_AGGRESSIVE | AI_CAUTIOUS | AI_STATUS_IMMUNE | AI_RISKY
+	db $44, $00
+
+; Champion
+	db FULL_HEAL, FULL_RESTORE ; items
+	db 25 ; base reward
+	dw AI_STATUS_RED | AI_STAT_MODS_RED | AI_SMART | AI_AGGRESSIVE | AI_CAUTIOUS | AI_STATUS_IMMUNE | AI_RISKY
+	db $44, $00
+
+; Brock
+	db HYPER_POTION, NONE ; items
+	db 25 ; base reward
+	dw AI_STATUS_RED | AI_STAT_MODS_RED | AI_SMART | AI_AGGRESSIVE | AI_CAUTIOUS | AI_STATUS_IMMUNE | AI_RISKY
+	db $44, $00
+
+; Misty
+	db FULL_HEAL, NONE ; items
+	db 25 ; base reward
+	dw AI_STATUS_RED | AI_STAT_MODS_RED | AI_SMART | AI_AGGRESSIVE | AI_CAUTIOUS | AI_STATUS_IMMUNE | AI_RISKY
+	db $44, $00
+
+; Lt Surge
+	db HYPER_POTION, NONE ; items
+	db 25 ; base reward
+	dw AI_STATUS_RED | AI_STAT_MODS_RED | AI_SMART | AI_AGGRESSIVE | AI_CAUTIOUS | AI_STATUS_IMMUNE | AI_RISKY
+	db $44, $00
+
+; Scientist
+	db NONE, NONE ; items
+	db 25 ; base reward
+	dw AI_STATUS_RED | AI_STAT_MODS_RED | AI_TYPES_RED | AI_STATUS_IMMUNE | AI_RISKY
+	db $44, $00
+
+; Erika
+	db HYPER_POTION, NONE ; items
+	db 25 ; base reward
+	dw AI_STATUS_RED | AI_STAT_MODS_RED | AI_SMART | AI_AGGRESSIVE | AI_CAUTIOUS | AI_STATUS_IMMUNE | AI_RISKY
+	db $44, $00
+
+; Youngster
+	db NONE, NONE ; items
+	db 4 ; base reward
+	dw AI_STATUS_RED | AI_STATUS_IMMUNE
+	db $44, $00
+
+; Schoolboy
+	db NONE, NONE ; items
+	db 8 ; base reward
+	dw AI_STATUS_RED | AI_STAT_MODS_RED | AI_TYPES_RED | AI_OPPORTUNIST | AI_CAUTIOUS | AI_STATUS_IMMUNE
+	db $41, $00
+
+; Bird Keeper
+	db NONE, NONE ; items
+	db 6 ; base reward
+	dw AI_STATUS_RED | AI_TYPES_RED | AI_OFFENSIVE | AI_OPPORTUNIST | AI_STATUS_IMMUNE
+	db $44, $00
+
+; Lass
+	db NONE, NONE ; items
+	db 6 ; base reward
+	dw AI_STATUS_RED | AI_CAUTIOUS | AI_STATUS_IMMUNE
+	db $41, $00
+
+; Janine
+	db DIRE_HIT, NONE ; items
+	db 25 ; base reward
+	dw AI_STATUS_RED | AI_STAT_MODS_RED | AI_SMART | AI_AGGRESSIVE | AI_CAUTIOUS | AI_STATUS_IMMUNE | AI_RISKY
+	db $44, $00
+
+; Cooltrainerm
+	db NONE, NONE ; items
+	db 12 ; base reward
+	dw AI_STATUS_RED | AI_STAT_MODS_RED | AI_SMART | AI_AGGRESSIVE | AI_CAUTIOUS | AI_STATUS_IMMUNE | AI_RISKY
+	db $44, $00
+
+; Cooltrainerf
+	db NONE, NONE ; items
+	db 12 ; base reward
+	dw AI_STATUS_RED | AI_STAT_MODS_RED | AI_SMART | AI_AGGRESSIVE | AI_CAUTIOUS | AI_STATUS_IMMUNE | AI_RISKY
+	db $44, $00
+
+; Beauty
+	db NONE, NONE ; items
+	db 22 ; base reward
+	dw AI_STATUS_RED | AI_TYPES_RED | AI_OPPORTUNIST | AI_CAUTIOUS | AI_STATUS_IMMUNE
+	db $44, $00
+
+; Pokemaniac
+	db NONE, NONE ; items
+	db 15 ; base reward
+	dw AI_STATUS_RED | AI_STAT_MODS_RED | AI_OFFENSIVE | AI_AGGRESSIVE | AI_STATUS_IMMUNE
+	db $44, $00
+
+; Gruntm
+	db NONE, NONE ; items
+	db 10 ; base reward
+	dw AI_STATUS_RED | AI_STAT_MODS_RED | AI_TYPES_RED | AI_OPPORTUNIST | AI_CAUTIOUS | AI_STATUS_IMMUNE | AI_RISKY
+	db $44, $00
+
+; Gentleman
+	db NONE, NONE ; items
+	db 18 ; base reward
+	dw AI_STATUS_RED | AI_STAT_MODS_RED | AI_AGGRESSIVE | AI_STATUS_IMMUNE
+	db $44, $00
+
+; Skier
+	db NONE, NONE ; items
+	db 18 ; base reward
+	dw AI_STATUS_RED | AI_STAT_MODS_RED | AI_TYPES_RED | AI_STATUS_IMMUNE | AI_RISKY
+	db $44, $00
+
+; Teacher
+	db NONE, NONE ; items
+	db 18 ; base reward
+	dw AI_STATUS_RED | AI_OPPORTUNIST | AI_AGGRESSIVE | AI_STATUS_IMMUNE
+	db $44, $00
+
+; Sabrina
+	db HYPER_POTION, NONE ; items
+	db 25 ; base reward
+	dw AI_STATUS_RED | AI_STAT_MODS_RED | AI_SMART | AI_AGGRESSIVE | AI_CAUTIOUS | AI_STATUS_IMMUNE | AI_RISKY
+	db $44, $00
+
+; Bug Catcher
+	db NONE, NONE ; items
+	db 4 ; base reward
+	dw AI_STATUS_RED | AI_STAT_MODS_RED | AI_STATUS_IMMUNE
+	db $44, $00
+
+; Fisher
+	db NONE, NONE ; items
+	db 10 ; base reward
+	dw AI_STATUS_RED | AI_TYPES_RED | AI_OPPORTUNIST | AI_CAUTIOUS | AI_STATUS_IMMUNE
+	db $41, $00
+
+; Swimmerm
+	db NONE, NONE ; items
+	db 2 ; base reward
+	dw AI_STATUS_RED | AI_STAT_MODS_RED | AI_TYPES_RED | AI_OFFENSIVE | AI_STATUS_IMMUNE
+	db $44, $00
+
+; Swimmerf
+	db NONE, NONE ; items
+	db 5 ; base reward
+	dw AI_STATUS_RED | AI_STAT_MODS_RED | AI_TYPES_RED | AI_CAUTIOUS | AI_STATUS_IMMUNE
+	db $44, $00
+
+; Sailor
+	db NONE, NONE ; items
+	db 10 ; base reward
+	dw AI_STATUS_RED | AI_OFFENSIVE | AI_OPPORTUNIST | AI_STATUS_IMMUNE
+	db $44, $00
+
+; Super Nerd
+	db NONE, NONE ; items
+	db 8 ; base reward
+	dw AI_STATUS_RED | AI_TYPES_RED | AI_SMART | AI_STATUS_IMMUNE
+	db $44, $00
+
+; Rival2
+	db NONE, NONE ; items
+	db 25 ; base reward
+	dw AI_STATUS_RED | AI_STAT_MODS_RED | AI_SMART | AI_AGGRESSIVE | AI_CAUTIOUS | AI_STATUS_IMMUNE | AI_RISKY
+	db $44, $00
+
+; Guitarist
+	db NONE, NONE ; items
+	db 8 ; base reward
+	dw AI_STATUS_RED | AI_STAT_MODS_RED | AI_TYPES_RED | AI_CAUTIOUS | AI_STATUS_IMMUNE
+	db $44, $00
+
+; Hiker
+	db NONE, NONE ; items
+	db 8 ; base reward
+	dw AI_STATUS_RED | AI_OFFENSIVE | AI_STATUS_IMMUNE
+	db $44, $00
+
+; Biker
+	db NONE, NONE ; items
+	db 8 ; base reward
+	dw AI_STATUS_RED | AI_TYPES_RED | AI_STATUS_IMMUNE | AI_RISKY
+	db $44, $00
+
+; Blaine
+	db MAX_POTION, FULL_HEAL ; items
+	db 25 ; base reward
+	dw AI_STATUS_RED | AI_STAT_MODS_RED | AI_SMART | AI_AGGRESSIVE | AI_CAUTIOUS | AI_STATUS_IMMUNE | AI_RISKY
+	db $44, $00
+
+; Burglar
+	db NONE, NONE ; items
+	db 22 ; base reward
+	dw AI_STATUS_RED | AI_OFFENSIVE | AI_CAUTIOUS | AI_STATUS_IMMUNE
+	db $44, $00
+
+; Firebreather
+	db NONE, NONE ; items
+	db 12 ; base reward
+	dw AI_STATUS_RED | AI_STAT_MODS_RED | AI_OFFENSIVE | AI_OPPORTUNIST | AI_STATUS_IMMUNE
+	db $44, $00
+
+; Juggler
+	db NONE, NONE ; items
+	db 10 ; base reward
+	dw AI_STATUS_RED | AI_TYPES_RED | AI_SMART | AI_STATUS_IMMUNE
+	db $44, $00
+
+; Blackbelt T
+	db NONE, NONE ; items
+	db 6 ; base reward
+	dw AI_STATUS_RED | AI_OFFENSIVE | AI_STATUS_IMMUNE | AI_RISKY
+	db $44, $00
+
+; Executivem
+	db NONE, NONE ; items
+	db 18 ; base reward
+	dw AI_STATUS_RED | AI_STAT_MODS_RED | AI_TYPES_RED | AI_SMART | AI_OPPORTUNIST | AI_CAUTIOUS | AI_STATUS_IMMUNE | AI_RISKY
+	db $44, $00
+
+; Psychic T
+	db NONE, NONE ; items
+	db 8 ; base reward
+	dw AI_STATUS_RED | AI_TYPES_RED | AI_OPPORTUNIST | AI_CAUTIOUS | AI_STATUS_IMMUNE
+	db $44, $00
+
+; Picnicker
+	db NONE, NONE ; items
+	db 5 ; base reward
+	dw AI_STATUS_RED | AI_CAUTIOUS | AI_STATUS_IMMUNE
+	db $44, $00
+
+; Camper
+	db NONE, NONE ; items
+	db 5 ; base reward
+	dw AI_STATUS_RED | AI_CAUTIOUS | AI_STATUS_IMMUNE
+	db $44, $00
+
+; Executivef
+	db NONE, NONE ; items
+	db 18 ; base reward
+	dw AI_STATUS_RED | AI_STAT_MODS_RED | AI_TYPES_RED | AI_SMART | AI_OPPORTUNIST | AI_CAUTIOUS | AI_STATUS_IMMUNE | AI_RISKY
+	db $44, $00
+
+; Sage
+	db NONE, NONE ; items
+	db 8 ; base reward
+	dw AI_STATUS_RED | AI_STAT_MODS_RED | AI_TYPES_RED | AI_CAUTIOUS | AI_STATUS_IMMUNE | AI_RISKY
+	db $44, $00
+
+; Medium
+	db NONE, NONE ; items
+	db 10 ; base reward
+	dw AI_STATUS_RED | AI_STAT_MODS_RED | AI_TYPES_RED | AI_CAUTIOUS | AI_STATUS_IMMUNE | AI_RISKY
+	db $44, $00
+
+; Boarder
+	db NONE, NONE ; items
+	db 18 ; base reward
+	dw AI_STATUS_RED | AI_TYPES_RED | AI_OPPORTUNIST | AI_STATUS_IMMUNE
+	db $44, $00
+
+; Pokefanm
+	db NONE, NONE ; items
+	db 20 ; base reward
+	dw AI_STATUS_RED | AI_TYPES_RED | AI_SMART | AI_STATUS_IMMUNE
+	db $44, $00
+
+; Kimono Girl
+	db NONE, NONE ; items
+	db 18 ; base reward
+	dw AI_STATUS_RED | AI_TYPES_RED | AI_OPPORTUNIST | AI_CAUTIOUS | AI_STATUS_IMMUNE
+	db $44, $00
+
+; Twins
+	db NONE, NONE ; items
+	db 5 ; base reward
+	dw NONE
+	db $41, $00
+
+; Pokefanf
+	db NONE, NONE ; items
+	db 20 ; base reward
+	dw AI_STATUS_RED | AI_TYPES_RED | AI_SMART | AI_STATUS_IMMUNE
+	db $44, $00
+
+; Red
+	db FULL_RESTORE, FULL_RESTORE ; items
+	db 25 ; base reward
+	dw AI_STATUS_RED | AI_STAT_MODS_RED | AI_SMART | AI_AGGRESSIVE | AI_CAUTIOUS | AI_STATUS_IMMUNE | AI_RISKY
+	db $44, $00
+
+; Blue
+	db FULL_RESTORE, FULL_RESTORE ; items
+	db 25 ; base reward
+	dw AI_STATUS_RED | AI_STAT_MODS_RED | AI_SMART | AI_AGGRESSIVE | AI_CAUTIOUS | AI_STATUS_IMMUNE | AI_RISKY
+	db $44, $00
+
+; Officer
+	db NONE, NONE ; items
+	db 10 ; base reward
+	dw AI_STATUS_RED | AI_TYPES_RED | AI_OPPORTUNIST | AI_STATUS_IMMUNE
+	db $44, $00
+
+; Gruntf
+	db NONE, NONE ; items
+	db 10 ; base reward
+	dw AI_STATUS_RED | AI_TYPES_RED | AI_OPPORTUNIST | AI_CAUTIOUS | AI_STATUS_IMMUNE | AI_RISKY
+	db $44, $00
+
+; Mysticalman
+	db NONE, NONE ; items
+	db 25 ; base reward
+	dw AI_STATUS_RED | AI_STAT_MODS_RED | AI_SMART | AI_AGGRESSIVE | AI_CAUTIOUS | AI_STATUS_IMMUNE | AI_RISKY
+	db $44, $00
+
+; 39771
+

wram.asm

@@ -1,6 +1,62 @@
 INCLUDE "includes.asm"
 
 
+party_struct: MACRO
+
+\1Species::  db
+\1Item::     db
+
+\1Moves::
+\1Move1::    db
+\1Move2::    db
+\1Move3::    db
+\1Move4::    db
+
+\1ID::       dw
+\1Exp::      ds 3 ; Big endian
+\1StatExp::
+\1HPExp::    dw
+\1AtkExp::   dw
+\1DefExp::   dw
+\1SpdExp::   dw
+\1SpclExp::  dw
+
+\1DVs::
+\1AtkDefDV:: db
+\1SpdSpcDV:: db
+
+\1PP::
+\1PPMove1::  db
+\1PPMove2::  db
+\1PPMove3::  db
+\1PPMove4::  db
+
+\1Happiness::     db
+\1PokerusStatus:: db
+
+\1CaughtData::
+\1CaughtTime::
+\1CaughtLevel::    db
+\1CaughtGender::
+\1CaughtLocation:: db
+
+\1Level:: db
+
+\1Status::   db
+\1Unused::   db
+
+; Stats are big endian.
+\1HP::       dw
+\1MaxHP::    dw
+\1Attack::   dw
+\1Defense::  dw
+\1Speed::    dw
+\1SpclAtk::  dw
+\1SpclDef::  dw
+
+ENDM
+
+
 SECTION "tiles0",VRAM[$8000],BANK[0]
 VTiles0::
 SECTION "tiles1",VRAM[$8800],BANK[0]
@@ -980,8 +1036,10 @@ StringBuffer3:: ; d099
 	ds 19
 StringBuffer4:: ; d0ac
 	ds 19
+StringBuffer5:: ; d0bf
+	ds 19
 
-	ds 21
+	ds 2
 
 CurBattleMon:: ; d0d4
 	ds 1
@@ -1072,7 +1130,7 @@ TempMonStatus:: ; d12e
 	ds 1
 ; d12f
 	ds 1
-TempMonCurHP:: ; d130
+TempMonHP:: ; d130
 	ds 2
 TempMonMaxHP:: ; d132
 	ds 2
@@ -1441,96 +1499,18 @@ OTPartySpecies:: ; d281
 	ds 1 ; any empty slots including the 7th must be FF
 	     ; or the routine will keep going
 
-OTPartyMon1::
+OTPartyMon1:: ; d288
-OTPartyMon1Species:: ; d288
+	party_struct OTPartyMon1
-	ds 1
-OTPartyMon1Item:: ; d289
-	ds 1
-
-OTPartyMon1Moves:: ; d28a
-OTPartyMon1Move1:: ; d28a
-	ds 1
-OTPartyMon1Move2:: ; d28b
-	ds 1
-OTPartyMon1Move3:: ; d28c
-	ds 1
-OTPartyMon1Move4:: ; d28d
-	ds 1
-	
-OTPartyMon1ID:: ; d28e
-	ds 2
-OTPartyMon1Exp:: ; d290
-	ds 3
-OTPartyMon1HPExp:: ; d293
-	ds 2
-OTPartyMon1AtkExp:: ; d295
-	ds 2
-OTPartyMon1DefExp:: ; d297
-	ds 2
-OTPartyMon1SpdExp:: ; d299
-	ds 2
-OTPartyMon1SpclExp:: ; d29b
-	ds 2
-
-OTPartyMon1DVs:: ; d29d
-OTPartyMon1AtkDefDV:: ; d29d
-	ds 1
-OTPartyMon1SpdSpclDV:: ; d29e
-	ds 1
-
-OTPartyMon1PP:: ; d29f
-OTPartyMon1PPMove1:: ; d29f
-	ds 1
-OTPartyMon1PPMove2:: ; d2a0
-	ds 1
-OTPartyMon1PPMove3:: ; d2a1
-	ds 1
-OTPartyMon1PPMove4:: ; d2a2
-	ds 1
-
-OTPartyMon1Happiness:: ; d2a3
-	ds 1
-OTPartyMon1PokerusStatus:: ; d2a4
-	ds 1
-
-OTPartyMon1CaughtData:: ; d2a5
-OTPartyMon1CaughtGender:: ; d2a5
-OTPartyMon1CaughtLocation:: ; d2a5
-	ds 1
-OTPartyMon1CaughtTime:: ; d2a6
-	ds 1
-OTPartyMon1Level:: ; d2a7
-	ds 1
-	
-OTPartyMon1Status:: ; d2a8
-	ds 1
-OTPartyMon1Unused:: ; d2a9
-	ds 1
-OTPartyMon1CurHP:: ; d2aa
-	ds 2
-OTPartyMon1MaxHP:: ; d2ac
-	ds 2
-OTPartyMon1Atk:: ; d2ae
-	ds 2
-OTPartyMon1Def:: ; d2b0
-	ds 2
-OTPartyMon1Spd:: ; d2b2
-	ds 2
-OTPartyMon1SpclAtk:: ; d2b4
-	ds 2
-OTPartyMon1SpclDef:: ; d2b6
-	ds 2
-
 OTPartyMon2:: ; d2b8
-	ds 48
+	party_struct OTPartyMon2
 OTPartyMon3:: ; d2e8
-	ds 48
+	party_struct OTPartyMon3
 OTPartyMon4:: ; d318
-	ds 48
+	party_struct OTPartyMon4
 OTPartyMon5:: ; d348
-	ds 48
+	party_struct OTPartyMon5
 OTPartyMon6:: ; d378
-	ds 48
+	party_struct OTPartyMon6
 
 
 OTPartyMonOT::
@@ -1915,88 +1895,18 @@ PartyEnd:: ; dcde
 	ds 1 ; legacy functions don't check PartyCount
 		 
 PartyMons::
-PartyMon1::
+PartyMon1:: ; dcdf
-PartyMon1Species:: ; dcdf
+	party_struct PartyMon1
-	ds 1
-PartyMon1Item:: ; dce0
-	ds 1
-
-PartyMon1Moves:: ; dce1
-PartyMon1Move1:: ; dce1
-	ds 1
-PartyMon1Move2:: ; dce2
-	ds 1
-PartyMon1Move3:: ; dce3
-	ds 1
-PartyMon1Move4:: ; dce4
-	ds 1
-
-PartyMon1ID:: ; dce5
-	ds 2
-PartyMon1Exp:: ; dce7
-	ds 3
-
-PartyMon1StatExp::
-PartyMon1HPExp:: ; dcea
-	ds 2
-PartyMon1AtkExp:: ; dcec
-	ds 2
-PartyMon1DefExp:: ; dcee
-	ds 2
-PartyMon1SpdExp:: ; dcf0
-	ds 2
-PartyMon1SpclExp:: ; dcf2
-	ds 2
-
-PartyMon1DVs:: ; dcf4
-; hp = %1000 for each dv
-	ds 1 ; atk/def
-	ds 1 ; spd/spc
-PartyMon1PP:: ; dcf6
-	ds 4
-PartyMon1Happiness:: ; dcfa
-	ds 1
-PartyMon1PokerusStatus:: ; dcfb
-	ds 1
-PartyMon1CaughtData:: ; dcfc
-PartyMon1CaughtTime:: ; dcfc
-PartyMon1CaughtLevel:: ; dcfc
-	ds 1
-PartyMon1CaughtGender:: ; dcfd
-PartyMon1CaughtLocation:: ; dcfd
-	ds 1
-PartyMon1Level:: ; dcfe
-	ds 1
-PartyMon1Status:: ; dcff
-	ds 1
-; dd00 unused
-	ds 1
-PartyMon1CurHP:: ; dd01
-	ds 2
-PartyMon1MaxHP:: ; dd03
-	ds 2
-PartyMon1Atk:: ; dd05
-	ds 2
-PartyMon1Def:: ; dd07
-	ds 2
-PartyMon1Spd:: ; dd09
-	ds 2
-PartyMon1SpclAtk:: ; dd0b
-	ds 2
-PartyMon1SpclDef:: ; dd0d
-	ds 2
-
-
 PartyMon2:: ; dd0f
-	ds 48
+	party_struct PartyMon2
 PartyMon3:: ; dd3f
-	ds 48
+	party_struct PartyMon3
 PartyMon4:: ; dd6f
-	ds 48
+	party_struct PartyMon4
 PartyMon5:: ; dd9f
-	ds 48
+	party_struct PartyMon5
 PartyMon6:: ; ddcf
-	ds 48
+	party_struct PartyMon6
 
 PartyMonOT::
 PartyMon1OT:: ; ddff
@@ -2089,7 +1999,13 @@ EggSpecies:: ; df7b
 	ds 1
 	ds 31
 
-SECTION "RoamMons",WRAMX[$dfcf],BANK[1]
+	ds 1
+
+wContestMon:: ; df9c
+	party_struct wContestMon
+
+	ds 3
+
 RoamMon1Species:: ; dfcf
 	ds 1
 RoamMon1Level:: ; dfd0
@@ -2098,7 +2014,7 @@ RoamMon1MapGroup:: ; dfd1
 	ds 1
 RoamMon1MapNumber:: ; dfd2
 	ds 1
-RoamMon1CurHP:: ; dfd3
+RoamMon1HP:: ; dfd3
 	ds 1
 RoamMon1DVs:: ; dfd4
 	ds 2
@@ -2111,7 +2027,7 @@ RoamMon2MapGroup:: ; dfd8
 	ds 1
 RoamMon2MapNumber:: ; dfd9
 	ds 1
-RoamMon2CurHP:: ; dfda
+RoamMon2HP:: ; dfda
 	ds 1
 RoamMon2DVs:: ; dfdb
 	ds 2
@@ -2124,7 +2040,7 @@ RoamMon3MapGroup:: ; dfdf
 	ds 1
 RoamMon3MapNumber:: ; dfe0
 	ds 1
-RoamMon3CurHP:: ; dfe1
+RoamMon3HP:: ; dfe1
 	ds 1
 RoamMon3DVs:: ; dfe2
 	ds 2