#= text macro

This commit is contained in:
Kermalis
2023-09-21 20:59:20 -04:00
parent a2f8b9241d
commit 3635746993
7 changed files with 144 additions and 70 deletions

View File

@@ -278,12 +278,12 @@ ARG_POKEMON_8 = 24 6D 38 @ $m8
@ TEXT MACROS
@
@ "#" is a text macro for different things
@ case is insensitive but need different
@ definitions to match
@ case is insensitive but need different definitions to match
CENTER_ALIGN = 23 2B @ #+
UNK_MACRO_3D = 23 3D @ #= (Probably used to manually position text at an x coordinate)
EXTRA_MSG = 23 50 @ #P
WAIT_PRESS = 23 57 @ #W
CENTER_ALIGN = 23 2B @ #+
NEW_LINE = 23 6E @ #n
@@ -322,3 +322,11 @@ GREEN_2 = 49 @ I
CYAN_3 = 4D @ M
YELLOW_5 = 4E @ N
RED_2 = 57 @ W
@ FOR UNK_MACRO_3D
M3D_50 = 32 @ 2
M3D_64 = 40 2E @ @.
M3D_80 = 50 2E @ P.
M3D_120 = 78 2E @ x.
M3D_136 = 88 2E @ ˆ.
M3D_160 = A0 2E @ \u00A0.

View File

@@ -25,7 +25,6 @@ gUnknown_80DBFCC: @ 80DBFCC
.byte 0x02, 0x00, 0x02, 0x00
.byte 0x0A, 0x00, 0x06, 0x00
.byte 0x06, 0x00, 0x00, 0x00
.4byte UnkData_80DBFC8
.global gOthers_MenuOption
@@ -62,9 +61,8 @@ gUnknown_80DC020: @ 80DC020
.byte 0x00, 0x00, 0x00, 0x00
.global UnkData_80DC038
UnkData_80DC038:
UnkData_80DC038:
.byte 0x01, 0x00, 0x0a, 0x00
.global gUnknown_80DC03C
gUnknown_80DC03C: @ 80DC03C
.byte 0x00, 0x00, 0x00, 0x00
@@ -72,7 +70,6 @@ gUnknown_80DC03C: @ 80DC03C
.byte 0x02, 0x00, 0x02, 0x00
.byte 0x18, 0x00, 0x10, 0x00
.byte 0x12, 0x00, 0x00, 0x00
.4byte UnkData_80DC038
.global gWindowBGTitle
@@ -82,9 +79,7 @@ gWindowBGTitle: @ 80DC054
.global gUnknown_80DC064
gUnknown_80DC064: @ 80DC064
.string "Windows#=P.Blue#=x.Red#="
.byte 0xA0
.string ".Green\0"
.string "Windows{UNK_MACRO_3D M3D_80}Blue{UNK_MACRO_3D M3D_120}Red{UNK_MACRO_3D M3D_160}Green\0"
.align 2,0
.global gWindowBGBlueString

View File

@@ -8376,9 +8376,7 @@ gUnknown_80FE748: @ 80FE748
.global OptionsSpeed
OptionsSpeed:
.string "Speed#=P.Slow#="
.byte 0x88
.string ".Fast\0"
.string "Speed{UNK_MACRO_3D M3D_80}Slow{UNK_MACRO_3D M3D_136}Fast\0"
.align 2,0
.global gUnknown_80FE764
@@ -8387,10 +8385,7 @@ gUnknown_80FE764: @ 80FE764
.global OptionsFarOffPals
OptionsFarOffPals:
.string "Far-off pals#="
.string "P.Self#="
.byte 0x88
.string ".Look\0"
.string "Far-off pals{UNK_MACRO_3D M3D_80}Self{UNK_MACRO_3D M3D_136}Look\0"
.align 2,0
.global gUnknown_80FE788
@@ -8399,10 +8394,7 @@ gUnknown_80FE788: @ 80FE788
.global OptionsDamageTurn
OptionsDamageTurn:
.string "Damage turn#=P."
.string "No#="
.byte 0x88
.string ".Yes\0"
.string "Damage turn{UNK_MACRO_3D M3D_80}No{UNK_MACRO_3D M3D_136}Yes\0"
.align 2,0
.global gUnknown_80FE7A8
@@ -8411,10 +8403,7 @@ gUnknown_80FE7A8: @ 80FE7A8
.global OptionsGrid
OptionsGrid:
.string "Grids#=P."
.string "Off#="
.byte 0x88
.string ".On\0"
.string "Grids{UNK_MACRO_3D M3D_80}Off{UNK_MACRO_3D M3D_136}On\0"
.align 2,0
.global gUnknown_80FE7C0
@@ -8423,11 +8412,7 @@ gUnknown_80FE7C0: @ 80FE7C0
.global OptionsMap
OptionsMap:
.string "Map#=P."
.string "Off#=x."
.string "Clear#="
.byte 0xa0
.string ".Shade\0"
.string "Map{UNK_MACRO_3D M3D_80}Off{UNK_MACRO_3D M3D_120}Clear{UNK_MACRO_3D M3D_160}Shade\0"
.align 2,0
.global gUnknown_80FE7E4
@@ -8438,11 +8423,7 @@ gUnknown_80FE7E4: @ 80FE7E4
.global OptionsWindowColor
OptionsWindowColor:
.string "Windows#=P."
.string "Blue#=x."
.string "Red#="
.byte 0xa0
.string ".Green\0"
.string "Windows{UNK_MACRO_3D M3D_80}Blue{UNK_MACRO_3D M3D_120}Red{UNK_MACRO_3D M3D_160}Green\0"
.align 2,0
.global gOptionsWindowColorPtr

View File

@@ -1,10 +1,11 @@
.section .rodata
.string "pksdir0\0"
@ ???
.string "pksdir0\0"
.string "pksdir0\0"
@ START code_80718D8
@ sub_807218C
.string "pksdir0\0"
.global gUnknown_8107010
gUnknown_8107010: @ 8107010
@@ -27,9 +28,6 @@ gUnknown_8107028:
.global gUnknown_810702C
gUnknown_810702C:
.byte 0x00, 0x00, 0x00, 0x00
.string "pksdir0\0"
@ END code_80718D8
.string "pksdir0\0"
@@ -75,7 +73,9 @@ gUnknown_810702C:
.string "pksdir0\0"
@ START code_807CD9C
@ sub_807DF38
.string "pksdir0\0"
.global gUnknown_81070E8
gUnknown_81070E8:
@@ -98,26 +98,35 @@ gUnknown_8107178: @ 8107178
.4byte gUnknown_81070E8
.4byte gUnknown_81070E8
.4byte gUnknown_8107110
@ ???
.string "pksdir0\0"
@ END code_807CD9C
@ ???
.string "pksdir0\0"
@ ???
.string "pksdir0\0"
@ ???
.string "pksdir0\0"
@ ???
.string "pksdir0\0"
@ ???
.string "pksdir0\0"
@ ???
.string "pksdir0\0"
@ ???
.string "pksdir0\0"
@ ???
.string "pksdir0\0"
@ sub_8080B30 - sub_808217C
.string "pksdir0\0"
.global gUnknown_81071D4
@@ -127,19 +136,24 @@ gUnknown_81071D4: @ 81071D4
.global gUnknown_81071E0
gUnknown_81071E0: @ 81071E0
.byte 0x82, 0xdd, 0x82, 0xb3, 0x82, 0xab, 0x97, 0x6c, 0x00, 0x00, 0x00, 0x00
@ ???
.string "pksdir0\0"
@ ???
.string "pksdir0\0"
@ ???
.string "pksdir0\0"
@ ???
.string "pksdir0\0"
.string "pksdir0\0"
@ ???
.string "pksdir0\0"
@ START code_808417C #1
.string "pksdir0\0"
.byte 0x70, 0x6b, 0x73, 0x64
.byte 0x69, 0x72, 0x30, 0x00
@@ -148,10 +162,11 @@ gUnknown_81071E0: @ 81071E0
gUnknown_8107224: @ 8107224
@ replacing .incbin "baserom.gba", 0x107224, 0x10
.byte 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x00, 0x00
.string "pksdir0\0"
@ END code_808417C #1
@ code_8085B0C
.string "pksdir0\0"
.global gUnknown_8107234
gUnknown_8107234: @ 8107234
.byte 0x01, 0x01, 0x00, 0x02, 0x01, 0x03, 0x00, 0x00, 0x02, 0x04, 0x02, 0x05, 0x03, 0x06, 0x00, 0x00
@@ -189,13 +204,15 @@ gUnknown_8107374: @ 8107374
.global gUnknown_8107380
gUnknown_8107380: @ 8107380
.byte 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
@ ???
.string "pksdir0\0"
@ code_8086A3C #1
.string "pksdir0\0"
.global gUnknown_810739C
gUnknown_810739C: @ 810739C
@ replacing .incbin "baserom.gba", 0x10739C, 0x38
.byte 0x04, 0x00, 0x02, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x03, 0x00, 0x02, 0x00, 0x18, 0x00, 0x00, 0x00
.byte 0x04, 0x00, 0x02, 0x00, 0x18, 0x00, 0x00, 0x00, 0x05, 0x00, 0x02, 0x00, 0x0c, 0x00, 0x00, 0x00
.byte 0x06, 0x00, 0x02, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
@@ -203,7 +220,6 @@ gUnknown_810739C: @ 810739C
.global gUnknown_81073D4
gUnknown_81073D4: @ 81073D4
@ replacing .incbin "baserom.gba", 0x1073D4, 0x38
.byte 0x04, 0x00, 0x02, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x03, 0x00, 0x02, 0x00, 0x18, 0x00, 0x00, 0x00
.byte 0x04, 0x00, 0x02, 0x00, 0x18, 0x00, 0x00, 0x00, 0x05, 0x00, 0x02, 0x00, 0x0c, 0x00, 0x00, 0x00
.byte 0x06, 0x00, 0x02, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
@@ -211,56 +227,86 @@ gUnknown_81073D4: @ 81073D4
.global gUnknown_810740C
gUnknown_810740C: @ 810740C
@ replacing .incbin "baserom.gba", 0x10740C, 0x40
.byte 0x04, 0x00, 0x02, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x05, 0x00, 0x02, 0x00, 0x0c, 0x00, 0x00, 0x00
.byte 0x04, 0x00, 0x02, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x04, 0x00, 0x02, 0x00, 0x18, 0x00, 0x00, 0x00
.byte 0x03, 0x00, 0x02, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x0a, 0x00, 0x08, 0x00, 0x00, 0x00
@ code_8086A3C #2
.string "pksdir0\0"
.global gUnknown_810744C
gUnknown_810744C: @ 810744C
@ replacing .incbin "baserom.gba", 0x10744C, 0x18
.byte 0x01, 0x00, 0x02, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x09, 0x00, 0x09, 0x00, 0x00, 0x00
.global gUnknown_8107464
gUnknown_8107464: @ 8107464
@ replacing .incbin "baserom.gba", 0x107464, 0x98
.byte 0x05, 0x00, 0x02, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x04, 0x00, 0x02, 0x00, 0x0c, 0x00, 0x00, 0x00
.byte 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x07, 0x00, 0x00, 0x00
.string "pksdir0\0"
.string "pksdir0\0"
.string "pksdir0\0"
.string "pksdir0\0"
.string "pksdir0\0"
.string "pksdir0\0"
.string "pksdir0\0"
.string "pksdir0\0"
.string "pksdir0\0"
.string "pksdir0\0"
.string "pksdir0\0"
.string "pksdir0\0"
.string "pksdir0\0"
.string "pksdir0\0"
@ ???
.string "pksdir0\0"
.global gUnknown_81074FC
gUnknown_81074FC: @ 81074FC
@ replacing .incbin "baserom.gba", 0x1074FC, 0x48
.byte 0x4e, 0x4f, 0x50, 0x51, 0x4a, 0x49, 0x3e, 0x38
@ ???
.string "pksdir0\0"
@ ???
.string "pksdir0\0"
@ ???
.string "pksdir0\0"
@ ???
.string "pksdir0\0"
@ ???
.string "pksdir0\0"
@ ???
.string "pksdir0\0"
@ ???
.string "pksdir0\0"
@ ???
.string "pksdir0\0"
.global gUnknown_8107544
gUnknown_8107544: @ 8107544
@ replacing .incbin "baserom.gba", 0x107544, 0xB0
.byte 0x02, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x02, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x17, 0x00, 0x08, 0x00, 0x01, 0x00, 0x00, 0x00
.byte 0x07, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x12, 0x00, 0x08, 0x00, 0x01, 0x00, 0x00, 0x00
@@ -272,6 +318,8 @@ gUnknown_8107544: @ 8107544
.byte 0x0d, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x02, 0x00, 0x01, 0x00, 0x00, 0x00
.byte 0x17, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00
.byte 0x12, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00
@ pokemon
.string "pksdir0\0"
.global gUnknown_81075F4
@@ -345,6 +393,8 @@ gUnknown_81076C4: @ 81076C4
.4byte -4
.4byte -8
.4byte -16
@ pokemon_3 #1
.string "pksdir0\0"
.global gIQSkillGroups
@@ -373,7 +423,11 @@ gIQSkillGroups: @ 81076E4
.4byte 9
.4byte 17
.4byte 6
@ pokemon_3 #2
.string "pksdir0\0"
@ pokemon_3 #3
.string "pksdir0\0"
.global gUnknown_8107754
@@ -418,6 +472,8 @@ gUnknown_8107790: @ 8107790
gUnknown_8107798: @ 8107798
.string "Info\0"
.align 2,0
@ dungeon
.string "pksdir0\0"
.align 2,0
@@ -1184,12 +1240,13 @@ gUnknown_8108F4A: @ 8108F4A
gUnknown_8108F50: @ 8108F50
.string "No problem.\0"
.align 2,0
@ items.c
.string "pksdir0\0"
.align 2,0
.global gUnknown_8108F64
gUnknown_8108F64: @ 8108F64
@ replacing .incbin "baserom.gba", 0x108F64, 0x800
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x2c, 0x01, 0x04, 0x00, 0x00, 0x02, 0x00, 0x00
@@ -1396,9 +1453,10 @@ gUnknown_81097F8: @ 81097F8
.byte 0x13, 0x00, 0x00, 0x00
.byte 0x15, 0x00, 0x00, 0x00
.byte 0x17, 0x00, 0x00, 0x00
.string "pksdir0\0"
@ START rescue_team_info.c
.string "pksdir0\0"
.global gRescueRankMaxPoints
gRescueRankMaxPoints: @ 8109810
.4byte 50
@@ -1412,9 +1470,11 @@ gRescueRankMaxPoints: @ 8109810
.global gTeamNamePlaceholder
gTeamNamePlaceholder: @ 810982C
.string "Pokémon\0"
.string "pksdir0\0"
@ END rescue_team_info.c
@ text_util
.string "pksdir0\0"
.global gUnknown_810983C
gUnknown_810983C: @ 810983C
.4byte gUnknown_8109888
@@ -1457,13 +1517,15 @@ gUnknown_8109884:
.global gUnknown_8109888
gUnknown_8109888:
.byte 0x82, 0x4f, 0x00, 0x00
@ ???
.string "pksdir0\0"
.string "pksdir0\0"
@ ???
.string "pksdir0\0"
@ START friend_area.c
.string "pksdir0\0"
.global sUnknown_81098A4
sUnknown_81098A4: @ 81098A4
@@ -1472,11 +1534,13 @@ sUnknown_81098A4: @ 81098A4
.global sUnknown_81098AC
sUnknown_81098AC: @ 81098AC
.string "%s#=%c{COLOR_1 UNK_COLOR_4}%s{END_COLOR_TEXT_1}\0"
.string "%s{UNK_MACRO_3D}%c{COLOR_1 UNK_COLOR_4}%s{END_COLOR_TEXT_1}\0"
.align 2,0
@ END friend_area.c
@ moves.c
.string "pksdir0"
@ END friend_area.c
.align 2,0
.global gUnknown_81098C4
@@ -1513,7 +1577,7 @@ gUnknown_810990C: @ 810990C
.global gUnknown_8109910
gUnknown_8109910: @ 8109910
.string "{COLOR_2}%c%s%s%s#=%c%2d/%2d{END_COLOR_TEXT_2}\0"
.string "{COLOR_2}%c%s%s%s{UNK_MACRO_3D}%c%2d/%2d{END_COLOR_TEXT_2}\0"
.align 2,0
.global gUnknown_8109928
@@ -1533,12 +1597,20 @@ gUnknown_810992C: @ 810992C
gUnknown_8109930: @ 8109930
.string "{ARG_POKEMON_0}\0"
.align 2,0
@ ???
.string "pksdir0\0"
.align 2,0
@ ???
.string "pksdir0\0"
.align 2,0
@ ???
.string "pksdir0\0"
.align 2,0
@ game_options.c
.string "pksdir0\0"
.align 2,0
@@ -1548,19 +1620,29 @@ gWindowBGColors: @ 8109954
.byte 0x80, 0x38, 0x20, 0x00
.byte 0x28, 0x80, 0x48, 0x00
.byte 0x28, 0x80, 0x48, 0x00
@ ???
.string "pksdir0\0"
.align 2,0
@ ???
.string "pksdir0\0"
.align 2,0
@ ???
.string "pksdir0\0"
.align 2,0
@ ???
.string "pksdir0\0"
.align 2,0
.global gUnknown_8109984
gUnknown_8109984: @ 8109984
.byte 0x00, 0x01, 0x02, 0x03, 0x04, 0x02, 0x01, 0x00
.string "pksdir0\0"
@ ???
.string "pksdir0\0"
.align 2,0
.global gStoryMissionText
@@ -1746,7 +1828,9 @@ gDummyScenarioText: @ 8109CA8
gUnknown_8109CC0: @ 8109CC0
.string "{COLOR_1 RED_2}???{END_COLOR_TEXT_1}\0"
.align 2,0
.string "pksdir0\0"
@ code_80972F4.c
.string "pksdir0\0"
.global gMeetNinetalesText
gMeetNinetalesText: @ 8109CD4
@@ -1763,9 +1847,17 @@ gFinalScenarioText: @ 8109CF4
@ replacing .incbin "baserom.gba", 0x109CF4, 0x3C
.byte 0x44, 0x65, 0x66, 0x65, 0x61, 0x74, 0x20, 0x74, 0x68, 0x65, 0x20, 0x66, 0x69, 0x6e, 0x61, 0x6c
.byte 0x20, 0x50, 0x6f, 0x6b, 0xe9, 0x6d, 0x6f, 0x6e, 0x2e, 0x00, 0x00, 0x00
@ ???
.string "pksdir0\0"
@ ???
.string "pksdir0\0"
@ ???
.string "pksdir0\0"
@ ???.c
.string "pksdir0\0"
@ 8109D30
@@ -1860,7 +1952,6 @@ gUnknown_810A3F0: @ 810A3F0 (money related according to PMDe
gTypeGummiIQBoost: @ 810A580
// s16[0x12][NUMBER_OF_GUMMIS = 18]
// relates [type][gummi tyep] -> iq boost amount
@ replacing .incbin "baserom.gba", 0x10A580, 0x288
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00
@@ -1905,7 +1996,6 @@ gTypeGummiIQBoost: @ 810A580
.global gUnknown_810A808
gUnknown_810A808: @ 810A808
@ replacing .incbin "baserom.gba", 0x10A808, 0x288
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3c, 0x00, 0x19, 0x00, 0x19, 0x00, 0x19, 0x00, 0x19, 0x00

View File

@@ -1557,7 +1557,7 @@ MoveRangeThreeTilesDiagonally:
.global RangeText
RangeText:
.string "Range#=@.{ARG_POKEMON_0} \0"
.string "Range{UNK_MACRO_3D M3D_64}{ARG_POKEMON_0} \0"
.align 2,0
.global gUnknown_810CF00

View File

@@ -943,8 +943,8 @@ ALIGNED(4) const u8 gMail_WondersHeadline[] = _(
ALIGNED(4) const u8 gMail_PollText[] = _(
"{COLOR_1 YELLOW}First#=2Gravelerock{END_COLOR_TEXT_1}\n"
"{COLOR_1 YELLOW}Second#=2Oran Berry{END_COLOR_TEXT_1}\n"
"{COLOR_1 YELLOW}First{UNK_MACRO_3D M3D_50}Gravelerock{END_COLOR_TEXT_1}\n"
"{COLOR_1 YELLOW}Second{UNK_MACRO_3D M3D_50}Oran Berry{END_COLOR_TEXT_1}\n"
"In a nationwide survey involving rescue\n"
"teams{COMMA} the most popular item was found to\n"
"be {COLOR_1 GREEN}Gravelerocks{END_COLOR_TEXT_1}. According to Sudowoodo\n"

View File

@@ -35,7 +35,7 @@ extern const u8 gUnknown_8109930[];
// data_810AE24.s
extern const u8* gPtrTypeText; // "Type"
extern const u8 *gRangeNames[];
extern const u8* gUnknown_810CF00; // "Range#=@.$m0 "
extern const u8* gUnknown_810CF00;
// system_sbin.s
extern const struct FileArchive gSystemFileArchive;