Merge pull request #583 from Eebit/scene-revisit

Decompile the remainder of scene / talk
FireEmblemUniverse · Mar 3, 2024 · 7dd2e48 · 7dd2e48
2 parents 4c0954d + 27fe07b
commit 7dd2e48
Show file tree

Hide file tree

Showing 9 changed files with 286 additions and 475 deletions.
diff --git a/asm/scene.s b/asm/scene.s
diff --git a/data/data_59E8E0.s b/data/data_59E8E0.s
@@ -68,12 +68,12 @@ gPal_YellowTextBox:  @ 0x0859EF80
 Pal_GreenTextColors:  @ 0x0859EFC0
 	.incbin "baserom.gba", 0x59EFC0, 0x20
 
-	.global gUnknown_0859EFE0
-gUnknown_0859EFE0:  @ 0x0859EFE0
+	.global Pal_Text_Inverted
+Pal_Text_Inverted:  @ 0x0859EFE0
 	.incbin "baserom.gba", 0x59EFE0, 0x20
 
-	.global gUnknown_0859F000
-gUnknown_0859F000:  @ 0x0859F000
+	.global Pal_TalkBubble_Inverted
+Pal_TalkBubble_Inverted:  @ 0x0859F000
 	.incbin "baserom.gba", 0x59F000, 0x20
 
 	.global Img_PhaseChangeUnk

diff --git a/data/data_9A31F8.s b/data/data_9A31F8.s
@@ -497,30 +497,30 @@ gUnknown_089E714C:  @ 0x089E714C
 gUnknown_089E7DEC:  @ 0x089E7DEC
 	.incbin "baserom.gba", 0x9E7DEC, 0x44C
 
-	.global gUnknown_089E8238
-gUnknown_089E8238:  @ 0x089E8238
+	.global Img_TalkBubble
+Img_TalkBubble:  @ 0x089E8238
     .incbin "baserom.gba", 0x9E8238, 0xA8
 
-	.global gUnknown_089E82E0
-gUnknown_089E82E0:  @ 0x089E82E0
+	.global Img_TalkBubbleOpening_E
+Img_TalkBubbleOpening_E:  @ 0x089E82E0
 	.incbin "baserom.gba", 0x9E82E0, 0xA4
 
-	.global gUnknown_089E8384
-gUnknown_089E8384:  @ 0x089E8384
+	.global Img_TalkBubbleOpening_D
+Img_TalkBubbleOpening_D:  @ 0x089E8384
 	.incbin "baserom.gba", 0x9E8384, 0x5C
 
-	.global gUnknown_089E83E0
-gUnknown_089E83E0:  @ 0x089E83E0
+	.global Img_TalkBubbleOpening_C
+Img_TalkBubbleOpening_C:  @ 0x089E83E0
 	.incbin "baserom.gba", 0x9E83E0, 0x54
 
-	.global gUnknown_089E8434
-gUnknown_089E8434:  @ 0x089E8434
+	.global Img_TalkBubbleOpening_B
+Img_TalkBubbleOpening_B:  @ 0x089E8434
 	.incbin "baserom.gba", 0x9E8434, 0x50
 
-	.global gUnknown_089E8484
-gUnknown_089E8484:  @ 0x089E8484
+	.global Img_TalkBubbleOpening_A
+Img_TalkBubbleOpening_A:  @ 0x089E8484
 	.incbin "baserom.gba", 0x9E8484, 0x50
 
-	.global gUnknown_089E84D4
-gUnknown_089E84D4:  @ 0x089E84D4
+	.global Pal_TalkBubble
+Pal_TalkBubble:  @ 0x089E84D4
 	.incbin "baserom.gba", 0x9E84D4, 0x20
diff --git a/include/functions.h b/include/functions.h
@@ -55,12 +55,6 @@ void CallARM_FillMovementMap(void);
 // ??? DrawIcon(???);
 // ??? ClearIconGfx(???);
 // ??? LoadIconObjectGraphics(???);
-// ??? sub_8008FB4(???);
-// ??? nullsub_15(???);
-// ??? sub_800903C(???);
-// ??? sub_800904C(???);
-// ??? sub_8009100(???);
-void sub_800915C(int, int, int, int, int, int, int, ProcPtr);
 
 const char * GetStrPrefix(s8 * str, bool capital);
 void InsertPrefix(char * str, const char * prefix, bool capital);