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
+
+