(Partially) dump banks $0D and $0F (#99)

* Bank $0f dumping (will not build) * Optimize title logo graphic * Make buildable again * Add some more labels to bank $0f * Add bank $0d, non-building * fix erroneous shim * bank $0D dump buildable * Make buildable again --------- Co-authored-by: vulcandth <[email protected]>
pret · Nov 18, 2023 · 44cdca9 · 44cdca9
1 parent bde9a8d
commit 44cdca9
Show file tree

Hide file tree

Showing 17 changed files with 18,126 additions and 73 deletions.
diff --git a/data/predef_pointers.inc b/data/predef_pointers.inc
@@ -46,7 +46,7 @@ GiveItemPredef::
 	add_predef PlaceGraphic
 	add_predef Function3f068 ; 20
 	add_predef Function3f04a
-	add_predef Function3d08c
+	add_predef AnyPartyAlive
 	add_predef Function3d67c
 	add_predef Function3e1a4
 	add_predef Function3ef19

diff --git a/data/types/type_matchups.asm → data/types/type_matchups.inc b/data/types/type_matchups.asm → data/types/type_matchups.inc
@@ -1,7 +1,3 @@
-INCLUDE "constants.asm"
-
-SECTION "data/types/type_matchups.asm", ROMX
-
 TypeMatchups:
 	;  attacker,  defender,  *=
 	db TYPE_NORMAL,   TYPE_ROCK,     NOT_VERY_EFFECTIVE

diff --git a/engine/debug/field/vram_viewer.inc b/engine/debug/field/vram_viewer.inc
@@ -151,7 +151,7 @@ FieldDebug_DoVRAMViewer:
 	ld bc, $180 tiles
 	call ByteFill
 	call LoadFont
-	callab Function3e39f
+	callab Call_LoadBattleGraphics
 	xor a
 	ldh [hMapAnims], a
 	call EnableLCD

diff --git a/engine/dumps/bank03.asm b/engine/dumps/bank03.asm
@@ -3466,8 +3466,8 @@ Textec69:
 
 Functionec7a:
 	call ClearPalettes
-	ld hl, Function3e39f
-	ld a, BANK(Function3e39f)
+	ld hl, Call_LoadBattleGraphics
+	ld a, BANK(Call_LoadBattleGraphics)
 	call FarCall_hl
 	call GetMemSGBLayout
 	call CloseWindow
@@ -4424,8 +4424,9 @@ Functionf318:
 	call WaitBGMap
 	xor a
 	ldh [hBattleTurn], a
-	ld a, BANK(Function3e5bf)
-	ld hl, Function3e5bf
+; wrong bank
+	ld a, $f
+	ld hl, Function365bf
 	call FarCall_hl
 	pop hl
 	pop af

diff --git a/engine/dumps/bank0b.asm b/engine/dumps/bank0b.asm
@@ -226,10 +226,10 @@ asm_2d4a3:
 	call PlaceString
 	ld a, [wCurSpecies]
 	dec a
-	ld hl, Data4a8b8
+	ld hl, Data418b8
 	ld bc, $7
 	call AddNTimes
-	ld a, BANK(Data4a8b8)
+	ld a, BANK(Data418b8)
 	call GetFarByte
 	ld hl, $c3a0
 	cp $2