summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--asm/code_808DAB4.s18
-rw-r--r--data/data_80B9BB8.s125
-rwxr-xr-xld_script.txt1
-rw-r--r--src/code_808DAB4.c10
4 files changed, 109 insertions, 45 deletions
diff --git a/asm/code_808DAB4.s b/asm/code_808DAB4.s
index 411e8dd..a619239 100644
--- a/asm/code_808DAB4.s
+++ b/asm/code_808DAB4.s
@@ -5,24 +5,6 @@
.text
- thumb_func_start sub_808DE30
-sub_808DE30:
- push {r4,lr}
- adds r2, r1, 0
- ldr r4, _0808DE4C
- movs r1, 0x58
- adds r3, r2, 0
- muls r3, r1
- ldr r1, [r4]
- adds r1, r3
- bl sub_808DE50
- pop {r4}
- pop {r0}
- bx r0
- .align 2, 0
-_0808DE4C: .4byte gUnknown_203B45C
- thumb_func_end sub_808DE30
-
thumb_func_start sub_808DE50
sub_808DE50:
push {r4-r7,lr}
diff --git a/data/data_80B9BB8.s b/data/data_80B9BB8.s
index ebd9262..2f2c127 100644
--- a/data/data_80B9BB8.s
+++ b/data/data_80B9BB8.s
@@ -10219,39 +10219,48 @@ gUnknown_81076E4: @ 81076E4
.global gUnknown_8107754
gUnknown_8107754: @ 8107754
- .incbin "baserom.gba", 0x107754, 0x8
+ .asciz "Stats"
+ .align 2,0
.global gUnknown_810775C
gUnknown_810775C: @ 810775C
- .incbin "baserom.gba", 0x10775C, 0xC
+ .asciz "Features"
+ .align 2,0
.global gUnknown_8107768
gUnknown_8107768: @ 8107768
- .incbin "baserom.gba", 0x107768, 0x8
+ .asciz "Type:"
+ .align 2,0
.global gUnknown_8107770
gUnknown_8107770: @ 8107770
- .incbin "baserom.gba", 0x107770, 0x14
+ .asciz "Special Abilities:"
+ .align 2,0
.global gUnknown_8107784
gUnknown_8107784: @ 8107784
- .incbin "baserom.gba", 0x107784, 0x4
+ .asciz "$i1"
+ .align 2,0
.global gUnknown_8107788
gUnknown_8107788: @ 8107788
- .incbin "baserom.gba", 0x107788, 0x4
+ .byte 0x87, 0x42, 0x00, 0x00
.global gUnknown_810778C
gUnknown_810778C: @ 810778C
- .incbin "baserom.gba", 0x10778C, 0x4
+ .byte 0x87, 0x40, 0x00, 0x00
.global gUnknown_8107790
gUnknown_8107790: @ 8107790
- .incbin "baserom.gba", 0x107790, 0x8
+ .asciz "$i0$i1"
+ .align 2,0
.global gUnknown_8107798
gUnknown_8107798: @ 8107798
- .incbin "baserom.gba", 0x107798, 0x10
+ .asciz "Info"
+ .align 2,0
+ .asciz "pksdir0"
+ .align 2,0
.global gUnknown_81077A8
gUnknown_81077A8: @ 81077A8
@@ -10291,7 +10300,7 @@ gUnknown_8108F2C: @ 8108F2C
.global gUnknown_8108F40
gUnknown_8108F40: @ 8108F40
- .incbin "baserom.gba", 0x108F40, 0x2
+ .byte 0x00, 0x00
.global gUnknown_8108F42
gUnknown_8108F42: @ 8108F42
@@ -10303,7 +10312,10 @@ gUnknown_8108F4A: @ 8108F4A
.global gUnknown_8108F50
gUnknown_8108F50: @ 8108F50
- .incbin "baserom.gba", 0x108F50, 0x14
+ .asciz "No problem."
+ .align 2,0
+ .asciz "pksdir0"
+ .align 2,0
.global gUnknown_8108F64
gUnknown_8108F64: @ 8108F64
@@ -10407,11 +10419,11 @@ gUnknown_81098EC: @ 81098EC
.global gUnknown_8109908
gUnknown_8109908: @ 8109908
- .incbin "baserom.gba", 0x109908, 0x4
+ .byte 0x87, 0x41, 0x00, 0x00 @ apparently shows A in memory viewer
.global gUnknown_810990C
gUnknown_810990C: @ 810990C
- .incbin "baserom.gba", 0x10990C, 0x4
+ .byte 0x87, 0x40, 0x00, 0x00 @ apparently shows @ in memory viewer
.global gUnknown_8109910
gUnknown_8109910: @ 8109910
@@ -10419,19 +10431,29 @@ gUnknown_8109910: @ 8109910
.global gUnknown_8109928
gUnknown_8109928: @ 8109928
- .incbin "baserom.gba", 0x109928, 0x3
+ .byte 0x87, 0x42, 0x00 @ apparently shows B in memory viewer
.global gUnknown_810992B
gUnknown_810992B: @ 810992B
- .incbin "baserom.gba", 0x10992B, 0x1
+ .byte 0x00
.global gUnknown_810992C
gUnknown_810992C: @ 810992C
- .incbin "baserom.gba", 0x10992C, 0x4
+ .asciz "%s"
+ .align 2,0
.global gUnknown_8109930
gUnknown_8109930: @ 8109930
- .incbin "baserom.gba", 0x109930, 0x24
+ .asciz "$m0"
+ .align 2,0
+ .asciz "pksdir0"
+ .align 2,0
+ .asciz "pksdir0"
+ .align 2,0
+ .asciz "pksdir0"
+ .align 2,0
+ .asciz "pksdir0"
+ .align 2,0
.global gUnknown_8109954
gUnknown_8109954: @ 8109954
@@ -10439,7 +10461,9 @@ gUnknown_8109954: @ 8109954
.global gUnknown_8109984
gUnknown_8109984: @ 8109984
- .incbin "baserom.gba", 0x109984, 0x10
+ .byte 0x00, 0x01, 0x02, 0x03, 0x04, 0x02, 0x01, 0x00
+ .asciz "pksdir0"
+ .align 2,0
.global gStoryMissionText
gStoryMissionText: @ 8109994
@@ -10447,19 +10471,24 @@ gStoryMissionText: @ 8109994
.global gDummyScenarioText
gDummyScenarioText: @ 8109CA8
- .incbin "baserom.gba", 0x109CA8, 0x18
+ .asciz "#CCScenario try dummy#R"
+ .align 2,0
.global gUnknown_8109CC0
gUnknown_8109CC0: @ 8109CC0
- .incbin "baserom.gba", 0x109CC0, 0x14
+ .asciz "#CW???#R"
+ .align 2,0
+ .asciz "pksdir0"
.global gMeetNinetalesText
gMeetNinetalesText: @ 8109CD4
- .incbin "baserom.gba", 0x109CD4, 0x10
+ .asciz "Meet Ninetales."
+ .align 2,0
.global gAvoidCaptureText
gAvoidCaptureText: @ 8109CE4
- .incbin "baserom.gba", 0x109CE4, 0x10
+ .asciz "Avoid capture."
+ .align 2,0
.global gFinalScenarioText
gFinalScenarioText: @ 8109CF4
@@ -10471,19 +10500,46 @@ gDungeons: @ 8109D30
.global gUnknown_810A350
gUnknown_810A350: @ 810A350
- .incbin "baserom.gba", 0x10A350, 0xB
+ @ replacing .incbin "baserom.gba", 0x0010a350, 0xb
+ .byte 0x18, 0x19, 0x1e, 0x27, 0x31, 0x32, 0x33, 0x36, 0x37, 0x3d, 0x3f
.global gUnknown_810A35B
gUnknown_810A35B: @ 810A35B
- .incbin "baserom.gba", 0x10A35B, 0x10
+ @ replacing .incbin "baserom.gba", 0x0010a35b, 0x10
+ .byte 0xed, 0xee, 0xef, 0xb1, 0xe9, 0x24, 0xd8, 0xd2, 0xb0, 0xdc, 0x32, 0x33, 0x34, 0xc2, 0xec, 0xf0
.global gUnknown_810A36B
gUnknown_810A36B: @ 810A36B
- .incbin "baserom.gba", 0x10A36B, 0xD
+ @ replacing .incbin "baserom.gba", 0x0010a36b, 0xd
+ .byte 0x01
+ .byte 0x00
+ .byte 0x00
+ .byte 0x00
+ .byte 0x01
+ .byte 0x01
+ .byte 0x01
+ .byte 0x01
+ .byte 0x01
+ .byte 0x00
+ .byte 0x01
+ .byte 0x00
+ .byte 0x00
.global gUnknown_810A378
gUnknown_810A378: @ 810A378
- .incbin "baserom.gba", 0x10A378, 0x18
+ @ replacing .incbin "baserom.gba", 0x0010a378, 0x18
+ .byte 0x01, 0x00
+ .byte 0x19, 0x00
+ .byte 0x01, 0x00
+ .byte 0x01, 0x00
+ .byte 0xe7, 0x03
+ .byte 0xe7, 0x03
+ .byte 0x23, 0x00
+ .byte 0x28, 0x00
+ .byte 0x14, 0x00
+ .byte 0x0f, 0x00
+ .byte 0x0a, 0x00
+ .byte 0xe7, 0x03
.global gUnknown_810A390
gUnknown_810A390: @ 810A390
@@ -10503,7 +10559,22 @@ gUnknown_810A808: @ 810A808
.global gUnknown_810AA90
gUnknown_810AA90: @ 810AA90
- .incbin "baserom.gba", 0x10AA90, 0x1D0
+ @ replacing .incbin "baserom.gba", 0x0010aa90, 0x1d0
+ .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x09, 0x00, 0x01, 0x00, 0x7c, 0x15, 0x00, 0x00, 0x0a, 0x00, 0x01, 0x00, 0x94, 0x11, 0x00, 0x00, 0x04, 0x00, 0x01, 0x00, 0x40, 0x1f, 0x00, 0x00
+ .byte 0x0c, 0x00, 0x01, 0x00, 0x7c, 0x15, 0x00, 0x00, 0x01, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x01, 0x00, 0x88, 0x13, 0x00, 0x00
+ .byte 0x0c, 0x00, 0x00, 0x00, 0x82, 0x00, 0x00, 0x00, 0x09, 0x00, 0x01, 0x00, 0x88, 0x13, 0x00, 0x00, 0x06, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x64, 0x19, 0x00, 0x00
+ .byte 0x0d, 0x00, 0x00, 0x00, 0x64, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x58, 0x02, 0x00, 0x00, 0x0d, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, 0xbc, 0x02, 0x00, 0x00
+ .byte 0x0a, 0x00, 0x01, 0x00, 0x88, 0x13, 0x00, 0x00, 0x03, 0x00, 0x01, 0x00, 0x64, 0x19, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x00, 0x96, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x26, 0x02, 0x00, 0x00
+ .byte 0x09, 0x00, 0x00, 0x00, 0x58, 0x02, 0x00, 0x00, 0x0f, 0x00, 0x01, 0x00, 0x88, 0x13, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0xf4, 0x01, 0x00, 0x00, 0x01, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00
+ .byte 0x06, 0x00, 0x00, 0x00, 0xf4, 0x01, 0x00, 0x00, 0x09, 0x00, 0x01, 0x00, 0x64, 0x19, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0xf4, 0x01, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00, 0xf4, 0x01, 0x00, 0x00
+ .byte 0x0a, 0x00, 0x01, 0x00, 0x7c, 0x15, 0x00, 0x00, 0x04, 0x00, 0x01, 0x00, 0xc4, 0x09, 0x00, 0x00, 0x04, 0x00, 0x01, 0x00, 0xac, 0x0d, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0xc4, 0x09, 0x00, 0x00
+ .byte 0x06, 0x00, 0x01, 0x00, 0x34, 0x21, 0x00, 0x00, 0x0b, 0x00, 0x01, 0x00, 0x4c, 0x1d, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x64, 0x19, 0x00, 0x00, 0x03, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00
+ .byte 0x04, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0d, 0x00, 0x00, 0x00, 0x20, 0x03, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0xe8, 0x03, 0x00, 0x00, 0x0b, 0x00, 0x00, 0x00, 0xb0, 0x04, 0x00, 0x00
+ .byte 0x0b, 0x00, 0x00, 0x00, 0xe8, 0x03, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x58, 0x02, 0x00, 0x00, 0x07, 0x00, 0x01, 0x00, 0x4c, 0x1d, 0x00, 0x00, 0x07, 0x00, 0x01, 0x00, 0x34, 0x21, 0x00, 0x00
+ .byte 0x0e, 0x00, 0x01, 0x00, 0x7c, 0x15, 0x00, 0x00, 0x0e, 0x00, 0x01, 0x00, 0x7c, 0x15, 0x00, 0x00, 0x06, 0x00, 0x01, 0x00, 0x40, 0x1f, 0x00, 0x00, 0x0d, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00
+ .byte 0x07, 0x00, 0x01, 0x00, 0x28, 0x23, 0x00, 0x00, 0x05, 0x00, 0x01, 0x00, 0x1c, 0x25, 0x00, 0x00, 0x01, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00
+ .byte 0x05, 0x00, 0x00, 0x00, 0xe8, 0x03, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0xe8, 0x03, 0x00, 0x00, 0x03, 0x00, 0x03, 0x00, 0x4c, 0x1d, 0x00, 0x00, 0x02, 0x00, 0x01, 0x00, 0x1c, 0x25, 0x00, 0x00
+ .byte 0x01, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x34, 0x21, 0x00, 0x00
.global gUnknown_810AC60
gUnknown_810AC60: @ 810AC60
diff --git a/ld_script.txt b/ld_script.txt
index b8b4848..34c6db7 100755
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -87,6 +87,7 @@ SECTIONS {
asm/code_80521D0.o(.text);
src/pokemon.o(.text);
asm/pokemon.o(.text);
+ src/code_808DAB4.o(.text);
asm/code_808DAB4.o(.text);
src/dungeon.o(.text);
asm/code_809017C.o(.text);
diff --git a/src/code_808DAB4.c b/src/code_808DAB4.c
new file mode 100644
index 0000000..e7e7110
--- /dev/null
+++ b/src/code_808DAB4.c
@@ -0,0 +1,10 @@
+#include "global.h"
+
+extern void sub_808DE50(void* r0, void * r1, u32 r2, u32 r3);
+
+extern void * gUnknown_203B45C;
+
+void sub_808DE30(void* r0, u32 r1)
+{
+ sub_808DE50(r0, gUnknown_203B45C + (r1 * 0x58), r1, r1 * 0x58);
+}
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-06 12:10:52 +0000