summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--data/data_80F4278.s53
-rw-r--r--data/text/type_names.inc89
-rw-r--r--src/code_8092334.c10
3 files changed, 121 insertions, 31 deletions
diff --git a/data/data_80F4278.s b/data/data_80F4278.s
index ad14020..9508167 100644
--- a/data/data_80F4278.s
+++ b/data/data_80F4278.s
@@ -7056,11 +7056,26 @@ gUnknown_810ACBE: @ 810ACBE
.global gUnknown_810ACC0
gUnknown_810ACC0: @ 810ACC0
- .incbin "baserom.gba", 0x10ACC0, 0x4C
+ .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+ .byte 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00
+ .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00
.global gUnknown_810AD0C
gUnknown_810AD0C: @ 810AD0C
- .incbin "baserom.gba", 0x10AD0C, 0x40
+ .byte 0x89, 0x00, 0x01, 0x00
+ .byte 0x02, 0x01, 0x00, 0x01
+ .byte 0x81, 0x00, 0x00, 0x01
+ .byte 0x82, 0x00, 0x00, 0x01
+ .byte 0x76, 0x01, 0x01, 0x00
+ .byte 0x77, 0x01, 0x01, 0x00
+ .byte 0x50, 0x01, 0x01, 0x00
+ .byte 0x51, 0x01, 0x00, 0x01
+ .byte 0x83, 0x00, 0x00, 0x01
+ .byte 0xfb, 0x00, 0x01, 0x00
+ .byte 0x54, 0x01, 0x01, 0x00
+ .byte 0xbe, 0x00, 0x00, 0x01
+ .byte 0x70, 0x6b, 0x73, 0x64, 0x69, 0x72, 0x30, 0x00
+ .byte 0x70, 0x6b, 0x73, 0x64, 0x69, 0x72, 0x30, 0x00
.include "data/text/type_names.inc"
@@ -7158,11 +7173,15 @@ gUnknown_810DDE4: @ 810DDE4
.global gUnknown_810DDFC
gUnknown_810DDFC: @ 810DDFC
- .incbin "baserom.gba", 0x10DDFC, 0x10
+ .byte 0xE8, 0xDD, 0x10, 0x08
+ .asciz "#>92.$v03/"
+ .align 2,0
.global gUnknown_810DE0C
gUnknown_810DE0C: @ 810DE0C
- .incbin "baserom.gba", 0x10DE0C, 0x14
+ .byte 0x00, 0xDE, 0x10, 0x08
+ .asciz "#>92.#c2$v03#r/"
+ .align 2,0
.global gUnknown_810DE20
gUnknown_810DE20: @ 810DE20
@@ -7248,7 +7267,9 @@ gUnknown_810DF78: @ 810DF78
.global gUnknown_810DF84
gUnknown_810DF84: @ 810DF84
- .incbin "baserom.gba", 0x10DF84, 0x14
+ .byte 0x7C, 0xDF, 0x10, 0x08
+ .asciz "Size:#>82.$m0"
+ .align 2,0
.global gUnknown_810DF98
gUnknown_810DF98: @ 810DF98
@@ -7258,7 +7279,9 @@ gUnknown_810DF98: @ 810DF98
.global gUnknown_810DFB4
gUnknown_810DFB4: @ 810DFB4
- .incbin "baserom.gba", 0x10DFB4, 0x14
+ .byte 0x9C, 0xDF, 0x10, 0x08
+ .asciz "#>22.#C5$i0#R"
+ .align 2,0
.global gUnknown_810DFC8
gUnknown_810DFC8: @ 810DFC8
@@ -7312,11 +7335,15 @@ gUnknown_8113080: @ 8113080
.global gUnknown_811383C
gUnknown_811383C: @ 811383C
- .incbin "baserom.gba", 0x11383C, 0x14
+ .byte 0x2C, 0x38, 0x11, 0x08
+ .asciz "#+Place: $m0"
+ .align 2,0
.global gUnknown_8113850
gUnknown_8113850: @ 8113850
- .incbin "baserom.gba", 0x113850, 0x18
+ .byte 0x40, 0x38, 0x11, 0x08
+ .asciz "$m1 was defeated by"
+
.global gUnknown_8113868
gUnknown_8113868: @ 8113868
@@ -7334,11 +7361,13 @@ gUnknown_8113898: @ 8113898
.global gUnknown_81138C0
gUnknown_81138C0: @ 81138C0
- .incbin "baserom.gba", 0x1138C0, 0x10
+ .byte 0x9C, 0x38, 0x11, 0x08
+ .asciz "HP#>42.$d0 "
.global gUnknown_81138D0
gUnknown_81138D0: @ 81138D0
- .incbin "baserom.gba", 0x1138D0, 0x14
+ .byte 0xC4, 0x38, 0x11, 0x08
+ .asciz "Attack#>42.$d0 "
.global gUnknown_81138E4
gUnknown_81138E4: @ 81138E4
@@ -7374,7 +7403,9 @@ gUnknown_81139B4: @ 81139B4
.global gUnknown_81139B8
gUnknown_81139B8: @ 81139B8
- .incbin "baserom.gba", 0x1139B8, 0x14
+ .byte 0x1C, 0xAE, 0x10, 0x08
+ .asciz "Item:#>42.$i0 "
+ .align 2,0
.global gUnknown_81139CC
gUnknown_81139CC: @ 81139CC
diff --git a/data/text/type_names.inc b/data/text/type_names.inc
index f1c76c9..feffc64 100644
--- a/data/text/type_names.inc
+++ b/data/text/type_names.inc
@@ -1,57 +1,110 @@
gUnformattedTypeStrings:: @ 810AD4C
@ (Table of pointers to each string)
-.byte 0x1c, 0xae, 0x10, 0x08
-.byte 0x14, 0xae, 0x10, 0x08
-.byte 0x0c, 0xae, 0x10, 0x08
-.byte 0x04, 0xae, 0x10, 0x08
-.byte 0xfc, 0xad, 0x10, 0x08
-.byte 0xf0, 0xad, 0x10, 0x08
-.byte 0xec, 0xad, 0x10, 0x08
-.byte 0xe0, 0xad, 0x10, 0x08
-.byte 0xd8, 0xad, 0x10, 0x08
-.byte 0xd0, 0xad, 0x10, 0x08
-.byte 0xc8, 0xad, 0x10, 0x08
-.byte 0xc0, 0xad, 0x10, 0x08
-.byte 0xbc, 0xad, 0x10, 0x08
-.byte 0xb4, 0xad, 0x10, 0x08
-.byte 0xac, 0xad, 0x10, 0x08
-.byte 0xa4, 0xad, 0x10, 0x08
-.byte 0x9c, 0xad, 0x10, 0x08
-.byte 0x94, 0xad, 0x10, 0x08
+.4byte gNoneText
+.4byte gNormalText
+.4byte gFireText
+.4byte gWaterText
+.4byte gGrassText
+.4byte gElectricText
+.4byte gIceText
+.4byte gFightingText
+.4byte gPoisonText
+.4byte gGroundText
+.4byte gFlyingText
+.4byte gPsychicText
+.4byte gBugText
+.4byte gRockText
+.4byte gGhostText
+.4byte gDragonText
+.4byte gDarkText
+.4byte gSteelText
+.global gSteelText
+gSteelText:
.asciz "Steel"
.align 2,0
+
+.global gDarkText
+gDarkText:
.asciz "Dark"
.align 2,0
+
+.global gDragonText
+gDragonText:
.asciz "Dragon"
.align 2,0
+
+.global gGhostText
+gGhostText:
.asciz "Ghost"
.align 2,0
+
+.global gRockText
+gRockText:
.asciz "Rock"
.align 2,0
+
+.global gBugText
+gBugText:
.asciz "Bug"
.align 2,0
+
+.global gPsychicText
+gPsychicText:
.asciz "Psychic"
.align 2,0
+
+.global gFlyingText
+gFlyingText:
.asciz "Flying"
.align 2,0
+
+.global gGroundText
+gGroundText:
.asciz "Ground"
.align 2,0
+
+.global gPoisonText
+gPoisonText:
.asciz "Poison"
.align 2,0
+
+.global gFightingText
+gFightingText:
.asciz "Fighting"
.align 2,0
+
+.global gIceText
+gIceText:
.asciz "Ice"
.align 2,0
+
+.global gElectricText
+gElectricText:
.asciz "Electric"
.align 2,0
+
+.global gGrassText
+gGrassText:
.asciz "Grass"
.align 2,0
+
+.global gWaterText
+gWaterText:
.asciz "Water"
.align 2,0
+
+.global gFireText
+gFireText:
.asciz "Fire"
.align 2,0
+
+.global gNormalText
+gNormalText:
.asciz "Normal"
.align 2,0
+
+.global gNoneText
+gNoneText:
.asciz "None"
.align 2,0
diff --git a/src/code_8092334.c b/src/code_8092334.c
index f68e59b..d5d17ee 100644
--- a/src/code_8092334.c
+++ b/src/code_8092334.c
@@ -1,14 +1,20 @@
#include "global.h"
+#define NUM_FRIEND_AREAS 58
+
extern u32 gUnformattedTypeStrings[]; // unformatted type names
extern u32 gFormattedTypeStrings[]; // formatted type names
+
extern u8 gUnknown_810AC7C[];
extern u8 gUnknown_810AC6A[];
+
extern u8 *gAbilityNames[];
extern u8 *AbilityDescriptions[];
-extern u8 gBoughtFriendAreas[];
+
+extern u8 gBoughtFriendAreas[NUM_FRIEND_AREAS];
extern u8 *gUnknown_203B468;
+
u32 GetUnformattedTypeString(u8 type)
{
return gUnformattedTypeStrings[type];
@@ -52,7 +58,7 @@ u8 *sub_80923B0(void)
void sub_80923B8(void)
{
s32 counter;
- for(counter = 0; counter <= 0x39; counter++)
+ for(counter = 0; counter < NUM_FRIEND_AREAS; counter++)
{
gUnknown_203B468[counter] = 0;
}
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-06 13:43:07 +0000