From cc23f5352f38c08b944b49d14b5a1a4822286c34 Mon Sep 17 00:00:00 2001 From: AnonymousRandomPerson Date: Wed, 29 Nov 2023 22:41:14 -0500 Subject: [PATCH] Synced from pmdsky-debug --- asm/include/overlay_29_0231CBEC.inc | 2 +- asm/overlay_29_0231CBEC.s | 4 ++-- asm/overlay_29_0234EC38.s | 4 ++-- tools/sync_pmdsky_debug/pmdsky_debug_reader.py | 1 - 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/asm/include/overlay_29_0231CBEC.inc b/asm/include/overlay_29_0231CBEC.inc index 4bb6cdcc..b3f71172 100644 --- a/asm/include/overlay_29_0231CBEC.inc +++ b/asm/include/overlay_29_0231CBEC.inc @@ -38,6 +38,7 @@ .public GetWeatherColorTable .public GINSENG_CHANCE_3 .public GUMMI_BELLY_RESTORE_TABLE +.public GUMMI_IQ_STRING_IDS .public GUMMI_LIKE_STRING_IDS .public HandleMovesMenuWrapper0 .public HandleMovesMenuWrapper1 @@ -111,7 +112,6 @@ .public ov29_0234BA54 .public ov29_023529AC .public ov29_023529B0 -.public ov29_02353324 .public ov31_02385FE0 .public ov31_023860A4 .public ov31_0238619C diff --git a/asm/overlay_29_0231CBEC.s b/asm/overlay_29_0231CBEC.s index 022f1d78..fc807e2f 100644 --- a/asm/overlay_29_0231CBEC.s +++ b/asm/overlay_29_0231CBEC.s @@ -477,7 +477,7 @@ _0231D23C: mov r0, sl mov r1, sb bl LogMessageByIdWithPopupCheckUserTarget - ldr r0, _0231D484 ; =ov29_02353324 + ldr r0, _0231D484 ; =GUMMI_IQ_STRING_IDS mov r1, fp, lsl #1 ldrh r2, [r0, r1] mov r0, sl @@ -635,7 +635,7 @@ _0231D474: .word GUMMI_BELLY_RESTORE_TABLE _0231D478: .word 0x000003E7 _0231D47C: .word 0x00000BF3 _0231D480: .word GUMMI_LIKE_STRING_IDS -_0231D484: .word ov29_02353324 +_0231D484: .word GUMMI_IQ_STRING_IDS _0231D488: .word ov10_022C44CC _0231D48C: .word ov10_022C45E4 _0231D490: .word ov29_023529B0 diff --git a/asm/overlay_29_0234EC38.s b/asm/overlay_29_0234EC38.s index 37cad3e7..74e15708 100644 --- a/asm/overlay_29_0234EC38.s +++ b/asm/overlay_29_0234EC38.s @@ -4088,8 +4088,8 @@ ov29_02353310: ov29_02353318: .byte 0x3F, 0x0B, 0x40, 0x0B .byte 0x41, 0x0B, 0x42, 0x0B, 0x43, 0x0B, 0x00, 0x00 - .global ov29_02353324 -ov29_02353324: + .global GUMMI_IQ_STRING_IDS +GUMMI_IQ_STRING_IDS: .byte 0x4C, 0x0B, 0x4D, 0x0B, 0x4E, 0x0B, 0x4F, 0x0B .byte 0x50, 0x0B, 0x00, 0x00 .global DAMAGE_STRING_IDS diff --git a/tools/sync_pmdsky_debug/pmdsky_debug_reader.py b/tools/sync_pmdsky_debug/pmdsky_debug_reader.py index 83d8dfff..9ab5f50a 100644 --- a/tools/sync_pmdsky_debug/pmdsky_debug_reader.py +++ b/tools/sync_pmdsky_debug/pmdsky_debug_reader.py @@ -19,7 +19,6 @@ SYMBOL_BLACKLIST = set([ 'EXCLUSIVE_ITEM_STAT_BOOST_DATA', 'GAME_STATE_VALUES', - 'GUMMI_IQ_STRING_IDS', ]) def get_pmdsky_debug_location() -> str: