diff --git a/charmap.txt b/charmap.txt index b3188dbba..20f864c48 100644 --- a/charmap.txt +++ b/charmap.txt @@ -264,9 +264,6 @@ QUOTE_END = 7E 39 34 @ ~94 ARG_FRIEND_AREA = 24 68 @ $h ARG_MOVE_ITEM_0 = 24 69 30 @ $i0 ARG_MOVE_ITEM_1 = 24 69 31 @ $i1 -ARG_MOVE_ITEM_0 = 24 69 30 @ $i0 -ARG_MOVE_ITEM_1 = 24 69 31 @ $i1 -ARG_FRIEND_AREA = 24 68 @ $h ARG_VALUE_0 = 24 64 30 @ $d0 ARG_VALUE_1 = 24 64 31 @ $d1 ARG_VALUE_2 = 24 64 32 @ $d2 diff --git a/data/data_80F59C8.s b/data/data_80F59C8.s index 2d33002f5..15c3d32e1 100644 --- a/data/data_80F59C8.s +++ b/data/data_80F59C8.s @@ -12045,7 +12045,8 @@ GroudonPreFightDialogue_9: @ 8102FC4 .global gUnknown_8102FD0 gUnknown_8102FD0: @ 8102FD0 -.string " A-$m3!\0" + @ The "A-" only makes sense when ARG_POKEMON_3 is "Alakazam" (which it is when this is used). Kinda funny. +.string " A-{ARG_POKEMON_3}!\0" .global GroudonPreFightDialogue_10 GroudonPreFightDialogue_10: @ 8102FD8