summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorred031000 <rubenru09@aol.com>2020-07-01 01:22:58 +0100
committerred031000 <rubenru09@aol.com>2020-07-01 01:22:58 +0100
commit7d1b26734fb05f29001958f7e7b62e0c70aedaa4 (patch)
tree1739363d32ccf139a3008733d6b95714fd812d0b
parentf7f84667db5f1e1255ab40832120100f5f625dba (diff)
module 75 fully shiftable + ascii strings
-rw-r--r--arm9/modules/75/asm/module_75.s51
-rw-r--r--arm9/modules/83/asm/module_83.s63
2 files changed, 70 insertions, 44 deletions
diff --git a/arm9/modules/75/asm/module_75.s b/arm9/modules/75/asm/module_75.s
index e195dbcf..ba79d09b 100644
--- a/arm9/modules/75/asm/module_75.s
+++ b/arm9/modules/75/asm/module_75.s
@@ -11116,7 +11116,11 @@ MOD75_021EC3F0: ; 0x021EC3F0
.global MOD75_021EC3F4
MOD75_021EC3F4: ; 0x021EC3F4
- .byte 0x38, 0x67, 0x68, 0x97, 0xFF, 0x00, 0x00, 0x00, 0x90, 0xB7, 0x88, 0xAF, 0xFF, 0x00, 0x00, 0x00
+ .byte 0x38, 0x67, 0x68, 0x97, 0xFF, 0x00, 0x00, 0x00
+
+ .global MOD75_021EC3FC
+MOD75_021EC3FC: ; 0x021EC3FC
+ .byte 0x90, 0xB7, 0x88, 0xAF, 0xFF, 0x00, 0x00, 0x00
.global MOD75_021EC404
MOD75_021EC404: ; 0x021EC404
@@ -11129,6 +11133,9 @@ MOD75_021EC410: ; 0x021EC410
.global MOD75_021EC41C
MOD75_021EC41C: ; 0x021EC41C
.byte 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+
+ .global MOD75_021EC42C
+MOD75_021EC42C: ; 0x021EC42C
.byte 0x20, 0x47, 0x08, 0x2F, 0x78, 0x9F, 0x28, 0x4F, 0x78, 0x9F, 0xB0, 0xD7, 0x20, 0x47, 0xD0, 0xF7
.byte 0xFF, 0x00, 0x00, 0x00
@@ -11169,10 +11176,16 @@ MOD75_021EC4E8: ; 0x021EC4E8
.global MOD75_021EC504
MOD75_021EC504: ; 0x021EC504
- .byte 0x00, 0x00, 0x00, 0x00, 0x71, 0x78, 0x1E, 0x02, 0x7D, 0x79, 0x1E, 0x02, 0x00, 0x00, 0x00, 0x00
+ .word 0x00000000, MOD75_021E7870, MOD75_021E797C, 0x00000000
.byte 0x00, 0x00, 0x09, 0x00, 0x00, 0x00, 0x00, 0x10, 0x20, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00
+
+ .global MOD75_021EC524
+MOD75_021EC524: ; 0x021EC524
.byte 0x50, 0x77, 0x10, 0x37, 0x78, 0x9F, 0x28, 0x4F, 0x90, 0xB7, 0x50, 0x77, 0x90, 0xB7, 0x88, 0xAF
.byte 0x78, 0x9F, 0xB0, 0xD7, 0x50, 0x77, 0xC8, 0xEF, 0x20, 0x47, 0xD0, 0xF7, 0xFF, 0x00, 0x00, 0x00
+
+ .global MOD75_021EC544
+MOD75_021EC544: ; 0x021EC544
.byte 0x20, 0x47, 0x08, 0x2F, 0x50, 0x77, 0x10, 0x37, 0x78, 0x9F, 0x28, 0x4F, 0x90, 0xB7, 0x50, 0x77
.byte 0x90, 0xB7, 0x88, 0xAF, 0x78, 0x9F, 0xB0, 0xD7, 0x50, 0x77, 0xC8, 0xEF, 0x20, 0x47, 0xD0, 0xF7
.byte 0xFF, 0x00, 0x00, 0x00
@@ -11185,9 +11198,9 @@ MOD75_021EC568: ; 0x021EC568
.global MOD75_021EC590
MOD75_021EC590: ; 0x021EC590
- .byte 0x1D, 0x8E, 0x1E, 0x02, 0x1D, 0x8E, 0x1E, 0x02, 0x1D, 0x8E, 0x1E, 0x02, 0x1D, 0x8E, 0x1E, 0x02
- .byte 0x1D, 0x8E, 0x1E, 0x02, 0x7D, 0x94, 0x1E, 0x02, 0xA9, 0x97, 0x1E, 0x02, 0xE5, 0x97, 0x1E, 0x02
- .byte 0x19, 0x98, 0x1E, 0x02, 0x3D, 0x94, 0x1E, 0x02, 0x5D, 0x94, 0x1E, 0x02, 0xFE, 0xFF, 0xFF, 0xFF
+ .word MOD75_021E8E1C, MOD75_021E8E1C, MOD75_021E8E1C, MOD75_021E8E1C
+ .word MOD75_021E8E1C, MOD75_021E947C, MOD75_021E97A8, MOD75_021E97E4
+ .word MOD75_021E9818, MOD75_021E943C, MOD75_021E945C, 0xFFFFFFFE
.global MOD75_021EC5C0
MOD75_021EC5C0: ; 0x021EC5C0
@@ -11209,17 +11222,29 @@ MOD75_021EC624: ; 0x021EC624
.global MOD75_021EC628
MOD75_021EC628: ; 0x021EC628
- .byte 0x00, 0x00, 0x00, 0x00, 0xF0, 0xC3, 0x1E, 0x02, 0xFC, 0xC3, 0x1E, 0x02, 0x00, 0x00, 0x00, 0x00
- .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x6C, 0xC6, 0x1E, 0x02
- .byte 0x2C, 0xC4, 0x1E, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
- .byte 0x00, 0x00, 0x00, 0x00, 0x7C, 0xC6, 0x1E, 0x02, 0x24, 0xC5, 0x1E, 0x02, 0x9C, 0xC6, 0x1E, 0x02
- .byte 0x44, 0xC5, 0x1E, 0x02, 0x01, 0x04, 0x05, 0x0F, 0x16, 0x0F, 0x1A, 0x04
+ .word 0x00000000, MOD75_021EC3F0, MOD75_021EC3FC, 0x00000000
+ .word 0x00000000, 0x00000000, 0x00000000, MOD75_021EC66C
+ .word MOD75_021EC42C, 0x00000000, 0x00000000, 0x00000000
+ .word 0x00000000, MOD75_021EC67C, MOD75_021EC524, MOD75_021EC69C
+ .word MOD75_021EC544
+
+ .global MOD75_021EC66C
+MOD75_021EC66C: ; 0x021EC66C
+ .byte 0x01, 0x04, 0x05, 0x0F, 0x16, 0x0F, 0x1A, 0x04
.global MOD75_021EC674
MOD75_021EC674: ; 0x021EC674
- .byte 0xA5, 0x28, 0x0F, 0x64, 0x40, 0x0C, 0x1E, 0x32, 0x02, 0x0A, 0x05, 0x0F, 0x0A, 0x12, 0x11, 0x12
- .byte 0x16, 0x0F, 0x19, 0x0A, 0x1A, 0x04, 0x00, 0x00, 0xA1, 0x6B, 0x1E, 0x02, 0x6D, 0x6D, 0x1E, 0x02
- .byte 0x01, 0x6F, 0x1E, 0x02, 0xFF, 0xFF, 0xFF, 0xFF, 0x01, 0x04, 0x02, 0x0A, 0x05, 0x0F, 0x0A, 0x12
+ .byte 0xA5, 0x28, 0x0F, 0x64, 0x40, 0x0C, 0x1E, 0x32
+
+ .global MOD75_021EC67C
+MOD75_021EC67C: ; 0x021EC67C
+ .byte 0x02, 0x0A, 0x05, 0x0F, 0x0A, 0x12, 0x11, 0x12
+ .byte 0x16, 0x0F, 0x19, 0x0A, 0x1A, 0x04, 0x00, 0x00
+ .word MOD75_021E6BA0, MOD75_021E6D6C, MOD75_021E6F00, 0xFFFFFFFF
+
+ .global MOD75_021EC69C
+MOD75_021EC69C: ; 0x021EC69C
+ .byte 0x01, 0x04, 0x02, 0x0A, 0x05, 0x0F, 0x0A, 0x12
.byte 0x11, 0x12, 0x16, 0x0F, 0x19, 0x0A, 0x1A, 0x04
.global MOD75_021EC6AC
diff --git a/arm9/modules/83/asm/module_83.s b/arm9/modules/83/asm/module_83.s
index 1a13327a..d490ad35 100644
--- a/arm9/modules/83/asm/module_83.s
+++ b/arm9/modules/83/asm/module_83.s
@@ -26671,8 +26671,9 @@ MOD83_0223A85C: ; 0x0223A85C
.global MOD83_0223A8C4
MOD83_0223A8C4: ; 0x0223A8C4
- .byte 0x64, 0x61, 0x74, 0x61, 0x2F, 0x65, 0x6F, 0x6F, 0x2E, 0x64, 0x61, 0x74, 0x00, 0x00, 0x00, 0x00
+ .asciz "data/eoo.dat"
+ .balign 4
.global MOD83_0223A8D4
MOD83_0223A8D4: ; 0x0223A8D4
.byte 0x16, 0x01, 0x15, 0x00
@@ -27017,57 +27018,54 @@ MOD83_0223B69C: ; 0x0223B69C
.global MOD83_0223B6F0
MOD83_0223B6F0: ; 0x0223B6F0
- .byte 0x6D, 0x79, 0x77, 0x68, 0x5F, 0x53, 0x59, 0x53, 0x53, 0x54, 0x41, 0x54
- .byte 0x45, 0x5F, 0x49, 0x44, 0x4C, 0x45, 0x00, 0x00
+ .asciz "mywh_SYSSTATE_IDLE"
+ .balign 4
.global MOD83_0223B704
MOD83_0223B704: ; 0x0223B704
- .byte 0x6D, 0x79, 0x77, 0x68, 0x5F, 0x53, 0x59, 0x53
- .byte 0x53, 0x54, 0x41, 0x54, 0x45, 0x5F, 0x42, 0x55, 0x53, 0x59, 0x00, 0x00
+ .asciz "mywh_SYSSTATE_BUSY"
+ .balign 4
.global MOD83_0223B718
MOD83_0223B718: ; 0x0223B718
- .byte 0x6D, 0x79, 0x77, 0x68
- .byte 0x5F, 0x53, 0x59, 0x53, 0x53, 0x54, 0x41, 0x54, 0x45, 0x5F, 0x53, 0x54, 0x4F, 0x50, 0x00, 0x00
+ .asciz "mywh_SYSSTATE_STOP"
+ .balign 4
.global MOD83_0223B72C
MOD83_0223B72C: ; 0x0223B72C
- .byte 0x6D, 0x79, 0x77, 0x68, 0x5F, 0x53, 0x59, 0x53, 0x53, 0x54, 0x41, 0x54, 0x45, 0x5F, 0x45, 0x52
- .byte 0x52, 0x4F, 0x52, 0x00
+ .asciz "mywh_SYSSTATE_ERROR"
+ .balign 4
.global MOD83_0223B740
MOD83_0223B740: ; 0x0223B740
- .byte 0x6D, 0x79, 0x77, 0x68, 0x5F, 0x53, 0x59, 0x53, 0x53, 0x54, 0x41, 0x54
- .byte 0x45, 0x5F, 0x53, 0x43, 0x41, 0x4E, 0x4E, 0x49, 0x4E, 0x47, 0x00, 0x00
+ .asciz "mywh_SYSSTATE_SCANNING"
+ .balign 4
.global MOD83_0223B758
MOD83_0223B758: ; 0x0223B758
- .byte 0x6D, 0x79, 0x77, 0x68
- .byte 0x5F, 0x53, 0x59, 0x53, 0x53, 0x54, 0x41, 0x54, 0x45, 0x5F, 0x43, 0x4F, 0x4E, 0x4E, 0x45, 0x43
- .byte 0x54, 0x45, 0x44, 0x00
+ .asciz "mywh_SYSSTATE_CONNECTED"
+ .balign 4
.global MOD83_0223B770
MOD83_0223B770: ; 0x0223B770
- .byte 0x6D, 0x79, 0x77, 0x68, 0x5F, 0x53, 0x59, 0x53, 0x53, 0x54, 0x41, 0x54
- .byte 0x45, 0x5F, 0x4B, 0x45, 0x59, 0x53, 0x48, 0x41, 0x52, 0x49, 0x4E, 0x47, 0x00, 0x00, 0x00, 0x00
+ .asciz "mywh_SYSSTATE_KEYSHARING"
+ .balign 4
.global MOD83_0223B78C
MOD83_0223B78C: ; 0x0223B78C
- .byte 0x6D, 0x79, 0x77, 0x68, 0x5F, 0x53, 0x59, 0x53, 0x53, 0x54, 0x41, 0x54, 0x45, 0x5F, 0x44, 0x41
- .byte 0x54, 0x41, 0x53, 0x48, 0x41, 0x52, 0x49, 0x4E, 0x47, 0x00, 0x00, 0x00
+ .asciz "mywh_SYSSTATE_DATASHARING"
+ .balign 4
.global MOD83_0223B7A8
MOD83_0223B7A8: ; 0x0223B7A8
- .byte 0x6D, 0x79, 0x77, 0x68
- .byte 0x5F, 0x53, 0x59, 0x53, 0x53, 0x54, 0x41, 0x54, 0x45, 0x5F, 0x43, 0x4F, 0x4E, 0x4E, 0x45, 0x43
- .byte 0x54, 0x5F, 0x46, 0x41, 0x49, 0x4C, 0x00, 0x00
+ .asciz "mywh_SYSSTATE_CONNECT_FAIL"
+ .balign 4
.global MOD83_0223B7C4
MOD83_0223B7C4: ; 0x0223B7C4
- .byte 0x6D, 0x79, 0x77, 0x68, 0x5F, 0x53, 0x59, 0x53
- .byte 0x53, 0x54, 0x41, 0x54, 0x45, 0x5F, 0x4D, 0x45, 0x41, 0x53, 0x55, 0x52, 0x45, 0x43, 0x48, 0x41
- .byte 0x4E, 0x4E, 0x45, 0x4C, 0x00, 0x00, 0x00, 0x00
+ .asciz "mywh_SYSSTATE_MEASURECHANNEL"
+ .balign 4
.global MOD83_0223B7E4
MOD83_0223B7E4: ; 0x0223B7E4
.word MOD83_0223B718, MOD83_0223B6F0, MOD83_0223B740, MOD83_0223B704
@@ -27076,26 +27074,29 @@ MOD83_0223B7E4: ; 0x0223B7E4
.global MOD83_0223B80C
MOD83_0223B80C: ; 0x0223B80C
- .byte 0x25, 0x73, 0x20, 0x2D, 0x3E, 0x20, 0x00, 0x00
+ .asciz "%s -> "
+ .balign 4
.global MOD83_0223B814
MOD83_0223B814: ; 0x0223B814
- .byte 0x25, 0x73, 0x0A, 0x00
+ .asciz "%s\n"
+ .balign 4
.global MOD83_0223B818
MOD83_0223B818: ; 0x0223B818
- .byte 0x6E, 0x6F, 0x74, 0x20, 0x6D, 0x79, 0x20, 0x70, 0x61, 0x72, 0x65, 0x6E, 0x74, 0x20, 0x67, 0x67
- .byte 0x69, 0x64, 0x20, 0x28, 0x25, 0x64, 0x20, 0x21, 0x3D, 0x20, 0x25, 0x64, 0x29, 0x0A, 0x00, 0x00
+ .asciz "not my parent ggid (%d != %d)\n"
+ .balign 4
.global MOD83_0223B838
MOD83_0223B838: ; 0x0223B838
- .byte 0x41, 0x44, 0x41, 0x45, 0x00, 0x00, 0x00, 0x00
+ .asciz "ADAE"
+ .balign 4
.global MOD83_0223B840
MOD83_0223B840: ; 0x0223B840
- .byte 0x53, 0x78, 0x34, 0x33, 0x39, 0x74, 0x43, 0x6B, 0x62, 0x72, 0x57, 0x79, 0x52, 0x38, 0x58, 0x32
- .byte 0x00, 0x00, 0x00, 0x00
+ .asciz "Sx439tCkbrWyR8X2"
+ .balign 4
.global MOD83_0223B854
MOD83_0223B854: ; 0x0223B854
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00