From 9bbe86e07bbeb8fb5f5070fb4a86b0495624943f Mon Sep 17 00:00:00 2001 From: AnonymousRandomPerson Date: Wed, 3 Jun 2026 04:18:58 +0000 Subject: [PATCH] Merge pull request #271 from AnonymousRandomPerson/main --- pmdskyeu.xMAP | 138 +++++++++++++++++++++++++------------------------- pmdskyjp.xMAP | 138 +++++++++++++++++++++++++------------------------- pmdskyus.xMAP | 138 +++++++++++++++++++++++++------------------------- 3 files changed, 207 insertions(+), 207 deletions(-) diff --git a/pmdskyeu.xMAP b/pmdskyeu.xMAP index 694b6083..f2bd5edf 100644 --- a/pmdskyeu.xMAP +++ b/pmdskyeu.xMAP @@ -657,7 +657,7 @@ 112](.bss,section) found in local overlay_20.o 112](.rodata,section) found in local overlay_20.o 112](sub_020037A4,func) found in global main_02003328.o - 111](ov19_0238D698,func) found in global overlay_19.o + 111](SpindaBarMenuUpdate,func) found in global overlay_19.o 112](.rodata,section) found in local overlay_19.o 112](.data,section) found in local overlay_19.o 112](ov10_022BCC60,func) found in global overlay_10_022BCC60.o @@ -3783,7 +3783,7 @@ 0201AB58 0000001C .text sub_0201AABC (main_02014D18.o) 0201AB70 00000000 .text $d (main_02014D18.o) 0201AB74 00000000 .text $a (main_02014D18.o) - 0201AB74 00000034 .text sub_0201AAD8 (main_02014D18.o) + 0201AB74 00000034 .text FillCopyToFlatVramCommand (main_02014D18.o) 0201ABA8 00000084 .text ExecuteCopyToFlatVramCommand (main_02014D18.o) 0201AC2C 0000001C .text sub_0201AB90 (main_02014D18.o) 0201AC44 00000000 .text $d (main_02014D18.o) @@ -3813,7 +3813,7 @@ 0201B424 000000B4 .text sub_0201B388 (main_02014D18.o) 0201B424 00000000 .text $a (main_02014D18.o) 0201B4D4 00000000 .text $d (main_02014D18.o) - 0201B4D8 00000100 .text sub_0201B43C (main_02014D18.o) + 0201B4D8 00000100 .text LoadObjPalette (main_02014D18.o) 0201B4D8 00000000 .text $a (main_02014D18.o) 0201B5D8 000000BC .text sub_0201B53C (main_02014D18.o) 0201B690 00000000 .text $d (main_02014D18.o) @@ -3829,18 +3829,18 @@ 0201BA4C 00000024 .text sub_0201B9B0 (main_02014D18.o) 0201BA4C 00000000 .text $a (main_02014D18.o) 0201BA70 00000024 .text sub_0201B9D4 (main_02014D18.o) - 0201BA94 000000A4 .text sub_0201B9F8 (main_02014D18.o) + 0201BA94 000000A4 .text AddSimpleObjToOam (main_02014D18.o) 0201BB34 00000000 .text $d (main_02014D18.o) - 0201BB38 00000010 .text sub_0201BA9C (main_02014D18.o) + 0201BB38 00000010 .text GroupOamAttributesWrapper (main_02014D18.o) 0201BB38 00000000 .text $a (main_02014D18.o) 0201BB44 00000000 .text $d (main_02014D18.o) - 0201BB48 0000001C .text sub_0201BAAC (main_02014D18.o) + 0201BB48 0000001C .text CopyAttributesToOamWrapper (main_02014D18.o) 0201BB48 00000000 .text $a (main_02014D18.o) - 0201BB64 00000058 .text sub_0201BAC8 (main_02014D18.o) + 0201BB64 00000058 .text ChangeSimpleObjTexture (main_02014D18.o) 0201BBB8 00000000 .text $d (main_02014D18.o) 0201BBBC 0000001C .text sub_0201BB20 (main_02014D18.o) 0201BBBC 00000000 .text $a (main_02014D18.o) - 0201BBD8 00000190 .text sub_0201BB3C (main_02014D18.o) + 0201BBD8 00000190 .text InitObjGraphicsControls (main_02014D18.o) 0201BD58 00000000 .text $d (main_02014D18.o) 0201BD68 00000028 .text sub_0201BCCC (main_02014D18.o) 0201BD68 00000000 .text $a (main_02014D18.o) @@ -3857,7 +3857,7 @@ 0201BE1C 00000000 .text $a (main_02014D18.o) 0201BE1C 00000034 .text sub_0201BD80 (main_02014D18.o) 0201BE4C 00000000 .text $d (main_02014D18.o) - 0201BE50 00000038 .text sub_0201BDB4 (main_02014D18.o) + 0201BE50 00000038 .text CopyAttributesToOamBothScreens (main_02014D18.o) 0201BE50 00000000 .text $a (main_02014D18.o) 0201BE84 00000000 .text $d (main_02014D18.o) 0201BE88 0000003C .text sub_0201BDEC (main_02014D18.o) @@ -3866,7 +3866,7 @@ 0201BEC4 00000034 .text sub_0201BE28 (main_02014D18.o) 0201BEC4 00000000 .text $a (main_02014D18.o) 0201BEF4 00000000 .text $d (main_02014D18.o) - 0201BEF8 00000028 .text sub_0201BE5C (main_02014D18.o) + 0201BEF8 00000028 .text GroupOamAttributesBothScreens (main_02014D18.o) 0201BEF8 00000000 .text $a (main_02014D18.o) 0201BF1C 00000000 .text $d (main_02014D18.o) 0201BF20 0000002C .text sub_0201BE84 (main_02014D18.o) @@ -4122,7 +4122,7 @@ 0201F628 0000000C .text HandleSir0TranslationVeneer (main_02014D18.o) 0201F630 00000000 .text $d (main_02014D18.o) 0201F634 00000000 .text $a (main_02014D18.o) - 0201F634 00000028 .text sub_0201F598 (main_02014D18.o) + 0201F634 00000028 .text FillPaletteInitInfo (main_02014D18.o) 0201F65C 0000000C .text DecompressAtNormalVeneer (main_02014D18.o) 0201F664 00000000 .text $d (main_02014D18.o) 0201F668 00000444 .text DecompressAtNormal (main_02014D18.o) @@ -7891,7 +7891,7 @@ 02058BA8 00000290 .text sub_0205882C (main_02054E4C.o) 02058E20 00000000 .text $d (main_02054E4C.o) 02058E38 00000000 .text $a (main_02054E4C.o) - 02058E38 00000040 .text sub_02058ABC (main_02054E4C.o) + 02058E38 00000040 .text OamTileNumberToVramAddress (main_02054E4C.o) 02058E70 00000000 .text $d (main_02054E4C.o) 02058E78 00000000 .text $a (main_02054E4C.o) 02058E78 00000120 .text sub_02058AFC (main_02054E4C.o) @@ -33553,10 +33553,10 @@ 0238AC80 00000000 .text $a (overlay_19.o) 0238ACBC 00000000 .text $d (overlay_19.o) 0238ACC0 00000000 .text $a (overlay_19.o) - 0238ACC0 00000014 .text ov19_0238A180 (overlay_19.o) - 0238ACD4 00000014 .text ov19_0238A194 (overlay_19.o) - 0238ACE8 00000010 .text ov19_0238A1A8 (overlay_19.o) - 0238ACF8 0000000C .text ov19_0238A1B8 (overlay_19.o) + 0238ACC0 00000014 .text SetMiracleDrinkStatCountRange (overlay_19.o) + 0238ACD4 00000014 .text SetBadDrinkStatCountRange (overlay_19.o) + 0238ACE8 00000010 .text GetBarItemResultWeights (overlay_19.o) + 0238ACF8 0000000C .text BarGetDrinkEventWeights (overlay_19.o) 0238AD00 00000000 .text $d (overlay_19.o) 0238AD04 000000B0 .text GetRecruitableMonsterAll (overlay_19.o) 0238AD04 00000000 .text $a (overlay_19.o) @@ -33565,130 +33565,130 @@ 0238AE5C 00000000 .text $a (overlay_19.o) 0238AE5C 000000B8 .text GetRecruitableMonsterListRestricted (overlay_19.o) 0238AF10 00000000 .text $d (overlay_19.o) - 0238AF14 00000018 .text ov19_0238A3D4 (overlay_19.o) + 0238AF14 00000018 .text BarGetUnlockableDungeonPtr (overlay_19.o) 0238AF14 00000000 .text $a (overlay_19.o) 0238AF28 00000000 .text $d (overlay_19.o) - 0238AF2C 0000007C .text ov19_0238A3EC (overlay_19.o) + 0238AF2C 0000007C .text BarPopulateUnlockableDungeons (overlay_19.o) 0238AF2C 00000000 .text $a (overlay_19.o) 0238AFA4 00000000 .text $d (overlay_19.o) 0238AFA8 00000000 .text $a (overlay_19.o) - 0238AFA8 0000003C .text ov19_0238A468 (overlay_19.o) + 0238AFA8 0000003C .text BarTryClosePortraitBox (overlay_19.o) 0238AFE0 00000000 .text $d (overlay_19.o) 0238AFE4 00000000 .text $a (overlay_19.o) - 0238AFE4 000020F8 .text ov19_0238A4A4 (overlay_19.o) + 0238AFE4 000020F8 .text BarCaseManagerSub (overlay_19.o) 0238BF64 00000000 .text $d (overlay_19.o) 0238BFE0 00000000 .text $a (overlay_19.o) 0238CFC4 00000000 .text $d (overlay_19.o) 0238D040 00000000 .text $a (overlay_19.o) - 0238D0DC 00000098 .text ov19_0238C5A8 (overlay_19.o) + 0238D0DC 00000098 .text BarPopulateDrinkableBagItems (overlay_19.o) 0238D170 00000000 .text $d (overlay_19.o) 0238D174 00000000 .text $a (overlay_19.o) - 0238D174 00000030 .text ov19_0238C640 (overlay_19.o) + 0238D174 00000030 .text BarZeroInitPreprocessorFlagsAndReturnCase (overlay_19.o) 0238D1A0 00000000 .text $d (overlay_19.o) - 0238D1A4 00000054 .text ov19_0238C670 (overlay_19.o) + 0238D1A4 00000054 .text BarZeroInitBufferAndPreprocessorArgsZero (overlay_19.o) 0238D1A4 00000000 .text $a (overlay_19.o) 0238D1F4 00000000 .text $d (overlay_19.o) - 0238D1F8 000000EC .text ov19_0238C6C4 (overlay_19.o) + 0238D1F8 000000EC .text BarTrySetEventMainActor (overlay_19.o) 0238D1F8 00000000 .text $a (overlay_19.o) 0238D2E0 00000000 .text $d (overlay_19.o) - 0238D2E4 0000005C .text ov19_0238C7B0 (overlay_19.o) + 0238D2E4 0000005C .text BarZeroInitBufferAndPreprocessorArgsOne (overlay_19.o) 0238D2E4 00000000 .text $a (overlay_19.o) 0238D33C 00000000 .text $d (overlay_19.o) 0238D340 00000000 .text $a (overlay_19.o) - 0238D340 000000F4 .text ov19_0238C80C (overlay_19.o) + 0238D340 000000F4 .text BarPrintHpIncreaseString (overlay_19.o) 0238D428 00000000 .text $d (overlay_19.o) 0238D434 00000000 .text $a (overlay_19.o) - 0238D434 000000F0 .text ov19_0238C900 (overlay_19.o) + 0238D434 000000F0 .text BarPrintOtherStatIncreaseString (overlay_19.o) 0238D514 00000000 .text $d (overlay_19.o) - 0238D524 0000013C .text ov19_0238C9F0 (overlay_19.o) + 0238D524 0000013C .text BarPrintIqAndSkills (overlay_19.o) 0238D524 00000000 .text $a (overlay_19.o) 0238D654 00000000 .text $d (overlay_19.o) - 0238D660 00000094 .text ov19_0238CB2C (overlay_19.o) + 0238D660 00000094 .text BarPrintLevelMaxedOutString (overlay_19.o) 0238D660 00000000 .text $a (overlay_19.o) 0238D6EC 00000000 .text $d (overlay_19.o) - 0238D6F4 0000012C .text ov19_0238CBC0 (overlay_19.o) + 0238D6F4 0000012C .text BarDrawAndUpdateGainedIqSkills (overlay_19.o) 0238D6F4 00000000 .text $a (overlay_19.o) 0238D810 00000000 .text $d (overlay_19.o) - 0238D820 000001D4 .text ov19_0238CCEC (overlay_19.o) + 0238D820 000001D4 .text BarUpdateDrinkEventNewStats (overlay_19.o) 0238D820 00000000 .text $a (overlay_19.o) 0238D9F0 00000000 .text $d (overlay_19.o) - 0238D9F4 00000218 .text ov19_0238CEC0 (overlay_19.o) + 0238D9F4 00000218 .text BarPrintReactionsAndStatIncreases (overlay_19.o) 0238D9F4 00000000 .text $a (overlay_19.o) 0238DBF0 00000000 .text $d (overlay_19.o) - 0238DC0C 00000238 .text ov19_0238D0D8 (overlay_19.o) + 0238DC0C 00000238 .text BarHandleDrinkEventSubcase (overlay_19.o) 0238DC0C 00000000 .text $a (overlay_19.o) 0238DE3C 00000000 .text $d (overlay_19.o) - 0238DE44 00000078 .text ov19_0238D310 (overlay_19.o) + 0238DE44 00000078 .text BarPostDrinkCaseForCustomer (overlay_19.o) 0238DE44 00000000 .text $a (overlay_19.o) 0238DEB8 00000000 .text $d (overlay_19.o) 0238DEBC 00000000 .text $a (overlay_19.o) - 0238DEBC 00000018 .text ov19_0238D388 (overlay_19.o) - 0238DED4 00000078 .text ov19_0238D3A0 (overlay_19.o) - 0238DF4C 00000038 .text ov19_0238D418 (overlay_19.o) - 0238DF84 0000002C .text ov19_0238D450 (overlay_19.o) + 0238DEBC 00000018 .text BarMaybeIsClosedUnkStringIdMenu (overlay_19.o) + 0238DED4 00000078 .text BarCreateUnkStringIdMenu (overlay_19.o) + 0238DF4C 00000038 .text GetUnkStringIdMenuResult (overlay_19.o) + 0238DF84 0000002C .text BarTryShowPortrait (overlay_19.o) 0238DFAC 00000000 .text $d (overlay_19.o) 0238DFB0 00000000 .text $a (overlay_19.o) - 0238DFB0 00000028 .text ov19_0238D47C (overlay_19.o) + 0238DFB0 00000028 .text BarTryHidePortrait (overlay_19.o) 0238DFD4 00000000 .text $d (overlay_19.o) 0238DFD8 00000000 .text $a (overlay_19.o) - 0238DFD8 00000040 .text ov19_0238D4A4 (overlay_19.o) + 0238DFD8 00000040 .text BarInventoryMenuCallback (overlay_19.o) 0238E014 00000000 .text $d (overlay_19.o) 0238E018 00000000 .text $a (overlay_19.o) - 0238E018 00000038 .text ov19_0238D4E4 (overlay_19.o) + 0238E018 00000038 .text BarTryCloseInventoryMenu (overlay_19.o) 0238E04C 00000000 .text $d (overlay_19.o) 0238E050 00000000 .text $a (overlay_19.o) - 0238E050 00000050 .text ov19_0238D51C (overlay_19.o) + 0238E050 00000050 .text BarTryCloseTeamMovesMenu (overlay_19.o) 0238E09C 00000000 .text $d (overlay_19.o) 0238E0A0 00000000 .text $a (overlay_19.o) - 0238E0A0 00000090 .text ov19_0238D56C (overlay_19.o) + 0238E0A0 00000090 .text SpindaBarEntry (overlay_19.o) 0238E124 00000000 .text $d (overlay_19.o) 0238E130 00000000 .text $a (overlay_19.o) - 0238E130 00000090 .text ov19_0238D5FC (overlay_19.o) + 0238E130 00000090 .text SpindaBarResume (overlay_19.o) 0238E1B8 00000000 .text $d (overlay_19.o) 0238E1C0 00000000 .text $a (overlay_19.o) - 0238E1C0 0000000C .text ov19_0238D68C (overlay_19.o) + 0238E1C0 0000000C .text SpindaBarDestruct (overlay_19.o) 0238E1C8 00000000 .text $d (overlay_19.o) 0238E1CC 00000000 .text $a (overlay_19.o) - 0238E1CC 00000448 .text ov19_0238D698 (overlay_19.o) + 0238E1CC 00000448 .text SpindaBarMenuUpdate (overlay_19.o) 0238E600 00000000 .text $d (overlay_19.o) 0238E614 00000864 .rodata .rodata (overlay_19.o) - 0238E614 00000000 .rodata OVERLAY19_UNKNOWN_TABLE__NA_238DAE0 (overlay_19.o) + 0238E614 00000000 .rodata BAR_MIRACLE_EVENT_WEIGHTS (overlay_19.o) 0238E61C 00000000 .rodata BAR_UNLOCKABLE_DUNGEONS_TABLE (overlay_19.o) 0238E628 00000000 .rodata BAR_RECRUITABLE_MONSTER_TABLE (overlay_19.o) 0238E700 00000000 .rodata BAR_AVAILABLE_ITEMS (overlay_19.o) - 0238ECAC 00000000 .rodata OVERLAY19_UNKNOWN_STRING_IDS__NA_238E178 (overlay_19.o) - 0238ECB2 00000000 .rodata ov19_0238E17E (overlay_19.o) - 0238ECB8 00000000 .rodata ov19_0238E184 (overlay_19.o) - 0238ECBE 00000000 .rodata ov19_0238E18A (overlay_19.o) - 0238ECC4 00000000 .rodata ov19_0238E190 (overlay_19.o) - 0238ECCA 00000000 .rodata ov19_0238E196 (overlay_19.o) - 0238ECD0 00000000 .rodata ov19_0238E19C (overlay_19.o) - 0238ECD8 00000000 .rodata OVERLAY19_UNKNOWN_STRUCT__NA_238E1A4 (overlay_19.o) + 0238ECAC 00000000 .rodata BAR_STAT_REACTION_STRINGS (overlay_19.o) + 0238ECB2 00000000 .rodata GOOD_DRINK_REACTION_STRINGS (overlay_19.o) + 0238ECB8 00000000 .rodata BAR_STAT_CHANGE_STRINGS (overlay_19.o) + 0238ECBE 00000000 .rodata NEUTRAL_DRINK_REACTION_STRINGS (overlay_19.o) + 0238ECC4 00000000 .rodata BAD_DRINK_REACTION_STRINGS (overlay_19.o) + 0238ECCA 00000000 .rodata BAR_IQ_CHANGE_STRINGS (overlay_19.o) + 0238ECD0 00000000 .rodata BAR_IQ_UNABLE_TO_CHANGE_STRINGS (overlay_19.o) + 0238ECD8 00000000 .rodata GOURMET_PORTRAIT_OFFSET_TABLE (overlay_19.o) 0238ECE0 00000000 .rodata ov19_0238E1AC (overlay_19.o) 0238ECE8 00000000 .rodata ov19_0238E1B4 (overlay_19.o) 0238ECF0 00000000 .rodata ov19_0238E1BC (overlay_19.o) 0238ECF8 00000000 .rodata ov19_0238E1C4 (overlay_19.o) - 0238ED00 00000000 .rodata OVERLAY19_UNKNOWN_STRING_IDS__NA_238E1CC (overlay_19.o) + 0238ED00 00000000 .rodata BAR_STAT_NAME_STRINGS (overlay_19.o) 0238ED0C 00000000 .rodata BAR_WINDOW_PARAMS_1 (overlay_19.o) 0238ED1C 00000000 .rodata BAR_WINDOW_PARAMS_2 (overlay_19.o) 0238ED2C 00000000 .rodata BAR_WINDOW_PARAMS_3 (overlay_19.o) 0238ED3C 00000000 .rodata BAR_MENU_ITEMS_CONFIRM_1 (overlay_19.o) 0238ED54 00000000 .rodata BAR_MENU_ITEMS_CONFIRM_2 (overlay_19.o) - 0238ED6C 00000000 .rodata OVERLAY19_UNKNOWN_STRING_IDS__NA_238E238 (overlay_19.o) + 0238ED6C 00000000 .rodata BAR_DRINK_NAMES_STRINGS (overlay_19.o) 0238ED84 00000000 .rodata BAR_MAIN_MENU_ITEMS (overlay_19.o) 0238EDA4 00000000 .rodata BAR_SUBMENU_ITEMS_1 (overlay_19.o) 0238EDC4 00000000 .rodata BAR_SUBMENU_ITEMS_2 (overlay_19.o) - 0238EDF4 00000000 .rodata ov19_0238E2C0 (overlay_19.o) - 0238EDF8 00000000 .rodata ov19_0238E2C4 (overlay_19.o) - 0238EE04 00000000 .rodata ov19_0238E2D0 (overlay_19.o) - 0238EE1C 00000000 .rodata ov19_0238E2E8 (overlay_19.o) - 0238EE38 00000000 .rodata ov19_0238E304 (overlay_19.o) - 0238EE58 00000000 .rodata ov19_0238E324 (overlay_19.o) + 0238EDF4 00000000 .rodata BAR_NEW_LINE_CHAR (overlay_19.o) + 0238EDF8 00000000 .rodata BAR_ME_PLAY_TEXT_TAG (overlay_19.o) + 0238EE04 00000000 .rodata DEBUG_MESSAGE_REQUEST_STR (overlay_19.o) + 0238EE1C 00000000 .rodata DEBUG_MESSAGE_REQUEST_AND_RETURN_STR (overlay_19.o) + 0238EE38 00000000 .rodata DEBUG_MESSAGE_BEFORE_SET_STR (overlay_19.o) + 0238EE58 00000000 .rodata DEBUG_MESSAGE_AFTER_SET_STR (overlay_19.o) #>0238EE78 SDK_OVERLAY.OVY_19.SINIT_START (linker command file) #>0238EE7C SDK_OVERLAY.OVY_19.SINIT_END (linker command file) #>0238EE80 SDK_OVERLAY.OVY_19.TEXT_END (linker command file) #>0238EE80 SDK_OVERLAY.OVY_19.DATA_START (linker command file) - 0238EE80 00000000 .data OVERLAY19_UNKNOWN_POINTER__NA_238E360 (overlay_19.o) + 0238EE80 00000000 .data BAR_MENU_PRIOR_CHOICE_INDICES (overlay_19.o) 0238EE80 00000010 .data .data (overlay_19.o) #>0238EEA0 SDK_OVERLAY.OVY_19.DATA_END (linker command file) #>0238EEA0 SDK_OVERLAY.OVY_19.END (linker command file) @@ -34982,7 +34982,7 @@ 022E1854 00000018 .text ov29_022E0F14 (overlay_29_022E08A0.o) 022E1868 00000000 .text $d (overlay_29_022E08A0.o) 022E186C 00000000 .text $a (overlay_29_022E08A0.o) - 022E186C 00000040 .text ov29_022E0F2C (overlay_29_022E08A0.o) + 022E186C 00000040 .text OamTileNumberToVramAddressOv29 (overlay_29_022E08A0.o) 022E18A4 00000000 .text $d (overlay_29_022E08A0.o) 022E18AC 00000000 .text $a (overlay_29_022E08A0.o) 022E18AC 0000028C .text ov29_022E0F6C (overlay_29_022E08A0.o) @@ -35810,7 +35810,7 @@ 022EAFDC 00000020 .text ov29_022EA62C (overlay_29_022E9618.o) 022EAFF4 00000000 .text $d (overlay_29_022E9618.o) 022EAFFC 00000000 .text $a (overlay_29_022E9618.o) - 022EAFFC 000000CC .text ov29_022EA64C (overlay_29_022E9618.o) + 022EAFFC 000000CC .text AnimateWaterShadows (overlay_29_022E9618.o) 022EB0B8 00000000 .text $d (overlay_29_022E9618.o) 022EB0C8 00000000 .text $a (overlay_29_022E9618.o) 022EB0C8 000000F4 .text DisplayAnimatedNumbers (overlay_29_022E9618.o) @@ -37048,7 +37048,7 @@ 02304828 00000000 .text $d (overlay_29_02302A5C.o) 02304838 00000000 .text $a (overlay_29_02302A5C.o) 02304838 00000050 .text ov29_02303E0C (overlay_29_02302A5C.o) - 02304888 000000BC .text ov29_02303E5C (overlay_29_02302A5C.o) + 02304888 000000BC .text DisplayMonsterShadow (overlay_29_02302A5C.o) 02304938 00000000 .text $d (overlay_29_02302A5C.o) 02304944 00000000 .text $a (overlay_29_02302A5C.o) 02304944 000007D0 .text ov29_02303F18 (overlay_29_02302A5C.o) @@ -41645,5 +41645,5 @@ 00000000 00000000 00004000 check.ITCM 00000000 00000000 00002880 check.DTCM -# Link start time: Tue Jun 02 23:01:27 2026 -# Link end time: Tue Jun 02 23:01:28 2026 +# Link start time: Wed Jun 03 04:16:29 2026 +# Link end time: Wed Jun 03 04:16:30 2026 diff --git a/pmdskyjp.xMAP b/pmdskyjp.xMAP index 81d8bcf3..a17ebbfc 100644 --- a/pmdskyjp.xMAP +++ b/pmdskyjp.xMAP @@ -462,7 +462,7 @@ 83](.bss,section) found in local overlay_20.o 83](.rodata,section) found in local overlay_20.o 83](sub_020037A4,func) found in global main_02003328.o - 82](ov19_0238D698,func) found in global overlay_19.o + 82](SpindaBarMenuUpdate,func) found in global overlay_19.o 83](.rodata,section) found in local overlay_19.o 83](.data,section) found in local overlay_19.o 83](ov10_022BCC60,func) found in global overlay_10_022BCC60.o @@ -3763,7 +3763,7 @@ 0201AAF8 00000000 .text $a (main_02014D18.o) 0201AB14 0000001C .text sub_0201AABC (main_02014D18.o) 0201AB2C 00000000 .text $d (main_02014D18.o) - 0201AB30 00000034 .text sub_0201AAD8 (main_02014D18.o) + 0201AB30 00000034 .text FillCopyToFlatVramCommand (main_02014D18.o) 0201AB30 00000000 .text $a (main_02014D18.o) 0201AB64 00000084 .text ExecuteCopyToFlatVramCommand (main_02014D18.o) 0201ABE8 0000001C .text sub_0201AB90 (main_02014D18.o) @@ -3794,7 +3794,7 @@ 0201B3E0 000000B4 .text sub_0201B388 (main_02014D18.o) 0201B3E0 00000000 .text $a (main_02014D18.o) 0201B490 00000000 .text $d (main_02014D18.o) - 0201B494 00000100 .text sub_0201B43C (main_02014D18.o) + 0201B494 00000100 .text LoadObjPalette (main_02014D18.o) 0201B494 00000000 .text $a (main_02014D18.o) 0201B594 000000BC .text sub_0201B53C (main_02014D18.o) 0201B64C 00000000 .text $d (main_02014D18.o) @@ -3810,18 +3810,18 @@ 0201BA08 00000024 .text sub_0201B9B0 (main_02014D18.o) 0201BA08 00000000 .text $a (main_02014D18.o) 0201BA2C 00000024 .text sub_0201B9D4 (main_02014D18.o) - 0201BA50 000000A4 .text sub_0201B9F8 (main_02014D18.o) + 0201BA50 000000A4 .text AddSimpleObjToOam (main_02014D18.o) 0201BAF0 00000000 .text $d (main_02014D18.o) - 0201BAF4 00000010 .text sub_0201BA9C (main_02014D18.o) + 0201BAF4 00000010 .text GroupOamAttributesWrapper (main_02014D18.o) 0201BAF4 00000000 .text $a (main_02014D18.o) 0201BB00 00000000 .text $d (main_02014D18.o) - 0201BB04 0000001C .text sub_0201BAAC (main_02014D18.o) + 0201BB04 0000001C .text CopyAttributesToOamWrapper (main_02014D18.o) 0201BB04 00000000 .text $a (main_02014D18.o) - 0201BB20 00000058 .text sub_0201BAC8 (main_02014D18.o) + 0201BB20 00000058 .text ChangeSimpleObjTexture (main_02014D18.o) 0201BB74 00000000 .text $d (main_02014D18.o) 0201BB78 0000001C .text sub_0201BB20 (main_02014D18.o) 0201BB78 00000000 .text $a (main_02014D18.o) - 0201BB94 00000190 .text sub_0201BB3C (main_02014D18.o) + 0201BB94 00000190 .text InitObjGraphicsControls (main_02014D18.o) 0201BD14 00000000 .text $d (main_02014D18.o) 0201BD24 00000028 .text sub_0201BCCC (main_02014D18.o) 0201BD24 00000000 .text $a (main_02014D18.o) @@ -3838,7 +3838,7 @@ 0201BDD8 00000034 .text sub_0201BD80 (main_02014D18.o) 0201BDD8 00000000 .text $a (main_02014D18.o) 0201BE08 00000000 .text $d (main_02014D18.o) - 0201BE0C 00000038 .text sub_0201BDB4 (main_02014D18.o) + 0201BE0C 00000038 .text CopyAttributesToOamBothScreens (main_02014D18.o) 0201BE0C 00000000 .text $a (main_02014D18.o) 0201BE40 00000000 .text $d (main_02014D18.o) 0201BE44 0000003C .text sub_0201BDEC (main_02014D18.o) @@ -3848,7 +3848,7 @@ 0201BE80 00000000 .text $a (main_02014D18.o) 0201BEB0 00000000 .text $d (main_02014D18.o) 0201BEB4 00000000 .text $a (main_02014D18.o) - 0201BEB4 00000028 .text sub_0201BE5C (main_02014D18.o) + 0201BEB4 00000028 .text GroupOamAttributesBothScreens (main_02014D18.o) 0201BED8 00000000 .text $d (main_02014D18.o) 0201BEDC 0000002C .text sub_0201BE84 (main_02014D18.o) 0201BEDC 00000000 .text $a (main_02014D18.o) @@ -4103,7 +4103,7 @@ 0201F5E4 0000000C .text HandleSir0TranslationVeneer (main_02014D18.o) 0201F5EC 00000000 .text $d (main_02014D18.o) 0201F5F0 00000000 .text $a (main_02014D18.o) - 0201F5F0 00000028 .text sub_0201F598 (main_02014D18.o) + 0201F5F0 00000028 .text FillPaletteInitInfo (main_02014D18.o) 0201F618 0000000C .text DecompressAtNormalVeneer (main_02014D18.o) 0201F620 00000000 .text $d (main_02014D18.o) 0201F624 00000444 .text DecompressAtNormal (main_02014D18.o) @@ -7865,7 +7865,7 @@ 02058B28 00000290 .text sub_0205882C (main_02054E4C.o) 02058DA0 00000000 .text $d (main_02054E4C.o) 02058DB8 00000000 .text $a (main_02054E4C.o) - 02058DB8 00000040 .text sub_02058ABC (main_02054E4C.o) + 02058DB8 00000040 .text OamTileNumberToVramAddress (main_02054E4C.o) 02058DF0 00000000 .text $d (main_02054E4C.o) 02058DF8 00000000 .text $a (main_02054E4C.o) 02058DF8 00000120 .text sub_02058AFC (main_02054E4C.o) @@ -33789,10 +33789,10 @@ 0238B6A0 00000000 .text $a (overlay_19.o) 0238B6DC 00000000 .text $d (overlay_19.o) 0238B6E0 00000000 .text $a (overlay_19.o) - 0238B6E0 00000014 .text ov19_0238A180 (overlay_19.o) - 0238B6F4 00000014 .text ov19_0238A194 (overlay_19.o) - 0238B708 00000010 .text ov19_0238A1A8 (overlay_19.o) - 0238B718 0000000C .text ov19_0238A1B8 (overlay_19.o) + 0238B6E0 00000014 .text SetMiracleDrinkStatCountRange (overlay_19.o) + 0238B6F4 00000014 .text SetBadDrinkStatCountRange (overlay_19.o) + 0238B708 00000010 .text GetBarItemResultWeights (overlay_19.o) + 0238B718 0000000C .text BarGetDrinkEventWeights (overlay_19.o) 0238B720 00000000 .text $d (overlay_19.o) 0238B724 000000B0 .text GetRecruitableMonsterAll (overlay_19.o) 0238B724 00000000 .text $a (overlay_19.o) @@ -33801,130 +33801,130 @@ 0238B87C 00000000 .text $a (overlay_19.o) 0238B87C 000000B8 .text GetRecruitableMonsterListRestricted (overlay_19.o) 0238B930 00000000 .text $d (overlay_19.o) - 0238B934 00000018 .text ov19_0238A3D4 (overlay_19.o) + 0238B934 00000018 .text BarGetUnlockableDungeonPtr (overlay_19.o) 0238B934 00000000 .text $a (overlay_19.o) 0238B948 00000000 .text $d (overlay_19.o) - 0238B94C 0000007C .text ov19_0238A3EC (overlay_19.o) + 0238B94C 0000007C .text BarPopulateUnlockableDungeons (overlay_19.o) 0238B94C 00000000 .text $a (overlay_19.o) 0238B9C4 00000000 .text $d (overlay_19.o) 0238B9C8 00000000 .text $a (overlay_19.o) - 0238B9C8 0000003C .text ov19_0238A468 (overlay_19.o) + 0238B9C8 0000003C .text BarTryClosePortraitBox (overlay_19.o) 0238BA00 00000000 .text $d (overlay_19.o) 0238BA04 00000000 .text $a (overlay_19.o) - 0238BA04 000020FC .text ov19_0238A4A4 (overlay_19.o) + 0238BA04 000020FC .text BarCaseManagerSub (overlay_19.o) 0238C984 00000000 .text $d (overlay_19.o) 0238CA04 00000000 .text $a (overlay_19.o) 0238DA4C 00000000 .text $d (overlay_19.o) 0238DAC8 00000000 .text $a (overlay_19.o) - 0238DB00 00000098 .text ov19_0238C5A8 (overlay_19.o) + 0238DB00 00000098 .text BarPopulateDrinkableBagItems (overlay_19.o) 0238DB94 00000000 .text $d (overlay_19.o) 0238DB98 00000000 .text $a (overlay_19.o) - 0238DB98 00000030 .text ov19_0238C640 (overlay_19.o) + 0238DB98 00000030 .text BarZeroInitPreprocessorFlagsAndReturnCase (overlay_19.o) 0238DBC4 00000000 .text $d (overlay_19.o) - 0238DBC8 00000054 .text ov19_0238C670 (overlay_19.o) + 0238DBC8 00000054 .text BarZeroInitBufferAndPreprocessorArgsZero (overlay_19.o) 0238DBC8 00000000 .text $a (overlay_19.o) 0238DC18 00000000 .text $d (overlay_19.o) - 0238DC1C 000000EC .text ov19_0238C6C4 (overlay_19.o) + 0238DC1C 000000EC .text BarTrySetEventMainActor (overlay_19.o) 0238DC1C 00000000 .text $a (overlay_19.o) 0238DD04 00000000 .text $d (overlay_19.o) - 0238DD08 0000005C .text ov19_0238C7B0 (overlay_19.o) + 0238DD08 0000005C .text BarZeroInitBufferAndPreprocessorArgsOne (overlay_19.o) 0238DD08 00000000 .text $a (overlay_19.o) 0238DD60 00000000 .text $d (overlay_19.o) 0238DD64 00000000 .text $a (overlay_19.o) - 0238DD64 000000F4 .text ov19_0238C80C (overlay_19.o) + 0238DD64 000000F4 .text BarPrintHpIncreaseString (overlay_19.o) 0238DE4C 00000000 .text $d (overlay_19.o) 0238DE58 00000000 .text $a (overlay_19.o) - 0238DE58 000000F0 .text ov19_0238C900 (overlay_19.o) + 0238DE58 000000F0 .text BarPrintOtherStatIncreaseString (overlay_19.o) 0238DF38 00000000 .text $d (overlay_19.o) - 0238DF48 0000013C .text ov19_0238C9F0 (overlay_19.o) + 0238DF48 0000013C .text BarPrintIqAndSkills (overlay_19.o) 0238DF48 00000000 .text $a (overlay_19.o) 0238E078 00000000 .text $d (overlay_19.o) - 0238E084 00000094 .text ov19_0238CB2C (overlay_19.o) + 0238E084 00000094 .text BarPrintLevelMaxedOutString (overlay_19.o) 0238E084 00000000 .text $a (overlay_19.o) 0238E110 00000000 .text $d (overlay_19.o) - 0238E118 0000012C .text ov19_0238CBC0 (overlay_19.o) + 0238E118 0000012C .text BarDrawAndUpdateGainedIqSkills (overlay_19.o) 0238E118 00000000 .text $a (overlay_19.o) 0238E234 00000000 .text $d (overlay_19.o) - 0238E244 000001D4 .text ov19_0238CCEC (overlay_19.o) + 0238E244 000001D4 .text BarUpdateDrinkEventNewStats (overlay_19.o) 0238E244 00000000 .text $a (overlay_19.o) 0238E414 00000000 .text $d (overlay_19.o) - 0238E418 00000218 .text ov19_0238CEC0 (overlay_19.o) + 0238E418 00000218 .text BarPrintReactionsAndStatIncreases (overlay_19.o) 0238E418 00000000 .text $a (overlay_19.o) 0238E614 00000000 .text $d (overlay_19.o) - 0238E630 00000238 .text ov19_0238D0D8 (overlay_19.o) + 0238E630 00000238 .text BarHandleDrinkEventSubcase (overlay_19.o) 0238E630 00000000 .text $a (overlay_19.o) 0238E860 00000000 .text $d (overlay_19.o) - 0238E868 00000078 .text ov19_0238D310 (overlay_19.o) + 0238E868 00000078 .text BarPostDrinkCaseForCustomer (overlay_19.o) 0238E868 00000000 .text $a (overlay_19.o) 0238E8DC 00000000 .text $d (overlay_19.o) 0238E8E0 00000000 .text $a (overlay_19.o) - 0238E8E0 00000018 .text ov19_0238D388 (overlay_19.o) - 0238E8F8 00000078 .text ov19_0238D3A0 (overlay_19.o) - 0238E970 00000038 .text ov19_0238D418 (overlay_19.o) - 0238E9A8 0000002C .text ov19_0238D450 (overlay_19.o) + 0238E8E0 00000018 .text BarMaybeIsClosedUnkStringIdMenu (overlay_19.o) + 0238E8F8 00000078 .text BarCreateUnkStringIdMenu (overlay_19.o) + 0238E970 00000038 .text GetUnkStringIdMenuResult (overlay_19.o) + 0238E9A8 0000002C .text BarTryShowPortrait (overlay_19.o) 0238E9D0 00000000 .text $d (overlay_19.o) 0238E9D4 00000000 .text $a (overlay_19.o) - 0238E9D4 00000028 .text ov19_0238D47C (overlay_19.o) + 0238E9D4 00000028 .text BarTryHidePortrait (overlay_19.o) 0238E9F8 00000000 .text $d (overlay_19.o) 0238E9FC 00000000 .text $a (overlay_19.o) - 0238E9FC 00000040 .text ov19_0238D4A4 (overlay_19.o) + 0238E9FC 00000040 .text BarInventoryMenuCallback (overlay_19.o) 0238EA38 00000000 .text $d (overlay_19.o) 0238EA3C 00000000 .text $a (overlay_19.o) - 0238EA3C 00000038 .text ov19_0238D4E4 (overlay_19.o) + 0238EA3C 00000038 .text BarTryCloseInventoryMenu (overlay_19.o) 0238EA70 00000000 .text $d (overlay_19.o) 0238EA74 00000000 .text $a (overlay_19.o) - 0238EA74 00000050 .text ov19_0238D51C (overlay_19.o) + 0238EA74 00000050 .text BarTryCloseTeamMovesMenu (overlay_19.o) 0238EAC0 00000000 .text $d (overlay_19.o) 0238EAC4 00000000 .text $a (overlay_19.o) - 0238EAC4 00000090 .text ov19_0238D56C (overlay_19.o) + 0238EAC4 00000090 .text SpindaBarEntry (overlay_19.o) 0238EB48 00000000 .text $d (overlay_19.o) 0238EB54 00000000 .text $a (overlay_19.o) - 0238EB54 00000090 .text ov19_0238D5FC (overlay_19.o) + 0238EB54 00000090 .text SpindaBarResume (overlay_19.o) 0238EBDC 00000000 .text $d (overlay_19.o) 0238EBE4 00000000 .text $a (overlay_19.o) - 0238EBE4 0000000C .text ov19_0238D68C (overlay_19.o) + 0238EBE4 0000000C .text SpindaBarDestruct (overlay_19.o) 0238EBEC 00000000 .text $d (overlay_19.o) 0238EBF0 00000000 .text $a (overlay_19.o) - 0238EBF0 00000448 .text ov19_0238D698 (overlay_19.o) + 0238EBF0 00000448 .text SpindaBarMenuUpdate (overlay_19.o) 0238F024 00000000 .text $d (overlay_19.o) 0238F038 00000864 .rodata .rodata (overlay_19.o) - 0238F038 00000000 .rodata OVERLAY19_UNKNOWN_TABLE__NA_238DAE0 (overlay_19.o) + 0238F038 00000000 .rodata BAR_MIRACLE_EVENT_WEIGHTS (overlay_19.o) 0238F040 00000000 .rodata BAR_UNLOCKABLE_DUNGEONS_TABLE (overlay_19.o) 0238F04C 00000000 .rodata BAR_RECRUITABLE_MONSTER_TABLE (overlay_19.o) 0238F124 00000000 .rodata BAR_AVAILABLE_ITEMS (overlay_19.o) - 0238F6D0 00000000 .rodata OVERLAY19_UNKNOWN_STRING_IDS__NA_238E178 (overlay_19.o) - 0238F6D6 00000000 .rodata ov19_0238E17E (overlay_19.o) - 0238F6DC 00000000 .rodata ov19_0238E184 (overlay_19.o) - 0238F6E2 00000000 .rodata ov19_0238E18A (overlay_19.o) - 0238F6E8 00000000 .rodata ov19_0238E190 (overlay_19.o) - 0238F6EE 00000000 .rodata ov19_0238E196 (overlay_19.o) - 0238F6F4 00000000 .rodata ov19_0238E19C (overlay_19.o) - 0238F6FC 00000000 .rodata OVERLAY19_UNKNOWN_STRUCT__NA_238E1A4 (overlay_19.o) + 0238F6D0 00000000 .rodata BAR_STAT_REACTION_STRINGS (overlay_19.o) + 0238F6D6 00000000 .rodata GOOD_DRINK_REACTION_STRINGS (overlay_19.o) + 0238F6DC 00000000 .rodata BAR_STAT_CHANGE_STRINGS (overlay_19.o) + 0238F6E2 00000000 .rodata NEUTRAL_DRINK_REACTION_STRINGS (overlay_19.o) + 0238F6E8 00000000 .rodata BAD_DRINK_REACTION_STRINGS (overlay_19.o) + 0238F6EE 00000000 .rodata BAR_IQ_CHANGE_STRINGS (overlay_19.o) + 0238F6F4 00000000 .rodata BAR_IQ_UNABLE_TO_CHANGE_STRINGS (overlay_19.o) + 0238F6FC 00000000 .rodata GOURMET_PORTRAIT_OFFSET_TABLE (overlay_19.o) 0238F704 00000000 .rodata ov19_0238E1AC (overlay_19.o) 0238F70C 00000000 .rodata ov19_0238E1B4 (overlay_19.o) 0238F714 00000000 .rodata ov19_0238E1BC (overlay_19.o) 0238F71C 00000000 .rodata ov19_0238E1C4 (overlay_19.o) - 0238F724 00000000 .rodata OVERLAY19_UNKNOWN_STRING_IDS__NA_238E1CC (overlay_19.o) + 0238F724 00000000 .rodata BAR_STAT_NAME_STRINGS (overlay_19.o) 0238F730 00000000 .rodata BAR_WINDOW_PARAMS_1 (overlay_19.o) 0238F740 00000000 .rodata BAR_WINDOW_PARAMS_2 (overlay_19.o) 0238F750 00000000 .rodata BAR_WINDOW_PARAMS_3 (overlay_19.o) 0238F760 00000000 .rodata BAR_MENU_ITEMS_CONFIRM_1 (overlay_19.o) 0238F778 00000000 .rodata BAR_MENU_ITEMS_CONFIRM_2 (overlay_19.o) - 0238F790 00000000 .rodata OVERLAY19_UNKNOWN_STRING_IDS__NA_238E238 (overlay_19.o) + 0238F790 00000000 .rodata BAR_DRINK_NAMES_STRINGS (overlay_19.o) 0238F7A8 00000000 .rodata BAR_MAIN_MENU_ITEMS (overlay_19.o) 0238F7C8 00000000 .rodata BAR_SUBMENU_ITEMS_1 (overlay_19.o) 0238F7E8 00000000 .rodata BAR_SUBMENU_ITEMS_2 (overlay_19.o) - 0238F818 00000000 .rodata ov19_0238E2C0 (overlay_19.o) - 0238F81C 00000000 .rodata ov19_0238E2C4 (overlay_19.o) - 0238F828 00000000 .rodata ov19_0238E2D0 (overlay_19.o) - 0238F840 00000000 .rodata ov19_0238E2E8 (overlay_19.o) - 0238F85C 00000000 .rodata ov19_0238E304 (overlay_19.o) - 0238F87C 00000000 .rodata ov19_0238E324 (overlay_19.o) + 0238F818 00000000 .rodata BAR_NEW_LINE_CHAR (overlay_19.o) + 0238F81C 00000000 .rodata BAR_ME_PLAY_TEXT_TAG (overlay_19.o) + 0238F828 00000000 .rodata DEBUG_MESSAGE_REQUEST_STR (overlay_19.o) + 0238F840 00000000 .rodata DEBUG_MESSAGE_REQUEST_AND_RETURN_STR (overlay_19.o) + 0238F85C 00000000 .rodata DEBUG_MESSAGE_BEFORE_SET_STR (overlay_19.o) + 0238F87C 00000000 .rodata DEBUG_MESSAGE_AFTER_SET_STR (overlay_19.o) #>0238F89C SDK_OVERLAY.OVY_19.SINIT_START (linker command file) #>0238F8A0 SDK_OVERLAY.OVY_19.SINIT_END (linker command file) #>0238F8A0 SDK_OVERLAY.OVY_19.TEXT_END (linker command file) #>0238F8A0 SDK_OVERLAY.OVY_19.DATA_START (linker command file) - 0238F8A0 00000000 .data OVERLAY19_UNKNOWN_POINTER__NA_238E360 (overlay_19.o) + 0238F8A0 00000000 .data BAR_MENU_PRIOR_CHOICE_INDICES (overlay_19.o) 0238F8A0 00000010 .data .data (overlay_19.o) #>0238F8C0 SDK_OVERLAY.OVY_19.DATA_END (linker command file) #>0238F8C0 SDK_OVERLAY.OVY_19.END (linker command file) @@ -35224,7 +35224,7 @@ 022E25A4 00000018 .text ov29_022E0F14 (overlay_29_022E08A0.o) 022E25B8 00000000 .text $d (overlay_29_022E08A0.o) 022E25BC 00000000 .text $a (overlay_29_022E08A0.o) - 022E25BC 00000040 .text ov29_022E0F2C (overlay_29_022E08A0.o) + 022E25BC 00000040 .text OamTileNumberToVramAddressOv29 (overlay_29_022E08A0.o) 022E25F4 00000000 .text $d (overlay_29_022E08A0.o) 022E25FC 00000000 .text $a (overlay_29_022E08A0.o) 022E25FC 0000028C .text ov29_022E0F6C (overlay_29_022E08A0.o) @@ -36046,7 +36046,7 @@ 022EBC94 00000020 .text ov29_022EA62C (overlay_29_022E9618.o) 022EBCAC 00000000 .text $d (overlay_29_022E9618.o) 022EBCB4 00000000 .text $a (overlay_29_022E9618.o) - 022EBCB4 000000CC .text ov29_022EA64C (overlay_29_022E9618.o) + 022EBCB4 000000CC .text AnimateWaterShadows (overlay_29_022E9618.o) 022EBD70 00000000 .text $d (overlay_29_022E9618.o) 022EBD80 00000000 .text $a (overlay_29_022E9618.o) 022EBD80 000000F4 .text DisplayAnimatedNumbers (overlay_29_022E9618.o) @@ -37260,7 +37260,7 @@ 0230534C 00000000 .text $d (overlay_29_02302A5C.o) 0230535C 00000000 .text $a (overlay_29_02302A5C.o) 0230535C 00000050 .text ov29_02303E0C (overlay_29_02302A5C.o) - 023053AC 000000BC .text ov29_02303E5C (overlay_29_02302A5C.o) + 023053AC 000000BC .text DisplayMonsterShadow (overlay_29_02302A5C.o) 0230545C 00000000 .text $d (overlay_29_02302A5C.o) 02305468 00000000 .text $a (overlay_29_02302A5C.o) 02305468 000007D0 .text ov29_02303F18 (overlay_29_02302A5C.o) @@ -41844,5 +41844,5 @@ 00000000 00000000 00004060 check.ITCM 00000000 00000000 00002880 check.DTCM -# Link start time: Tue Jun 02 23:03:25 2026 -# Link end time: Tue Jun 02 23:03:26 2026 +# Link start time: Wed Jun 03 04:18:26 2026 +# Link end time: Wed Jun 03 04:18:27 2026 diff --git a/pmdskyus.xMAP b/pmdskyus.xMAP index 46037e87..936214be 100644 --- a/pmdskyus.xMAP +++ b/pmdskyus.xMAP @@ -463,7 +463,7 @@ 83](.bss,section) found in local overlay_20.o 83](.rodata,section) found in local overlay_20.o 83](sub_020037A4,func) found in global main_02003328.o - 82](ov19_0238D698,func) found in global overlay_19.o + 82](SpindaBarMenuUpdate,func) found in global overlay_19.o 83](.rodata,section) found in local overlay_19.o 83](.data,section) found in local overlay_19.o 83](ov10_022BCC60,func) found in global overlay_10_022BCC60.o @@ -3772,7 +3772,7 @@ 0201AAA0 00000000 .text $a (main_02014D18.o) 0201AABC 0000001C .text sub_0201AABC (main_02014D18.o) 0201AAD4 00000000 .text $d (main_02014D18.o) - 0201AAD8 00000034 .text sub_0201AAD8 (main_02014D18.o) + 0201AAD8 00000034 .text FillCopyToFlatVramCommand (main_02014D18.o) 0201AAD8 00000000 .text $a (main_02014D18.o) 0201AB0C 00000084 .text ExecuteCopyToFlatVramCommand (main_02014D18.o) 0201AB90 0000001C .text sub_0201AB90 (main_02014D18.o) @@ -3803,7 +3803,7 @@ 0201B388 000000B4 .text sub_0201B388 (main_02014D18.o) 0201B388 00000000 .text $a (main_02014D18.o) 0201B438 00000000 .text $d (main_02014D18.o) - 0201B43C 00000100 .text sub_0201B43C (main_02014D18.o) + 0201B43C 00000100 .text LoadObjPalette (main_02014D18.o) 0201B43C 00000000 .text $a (main_02014D18.o) 0201B53C 000000BC .text sub_0201B53C (main_02014D18.o) 0201B5F4 00000000 .text $d (main_02014D18.o) @@ -3819,18 +3819,18 @@ 0201B9B0 00000024 .text sub_0201B9B0 (main_02014D18.o) 0201B9B0 00000000 .text $a (main_02014D18.o) 0201B9D4 00000024 .text sub_0201B9D4 (main_02014D18.o) - 0201B9F8 000000A4 .text sub_0201B9F8 (main_02014D18.o) + 0201B9F8 000000A4 .text AddSimpleObjToOam (main_02014D18.o) 0201BA98 00000000 .text $d (main_02014D18.o) - 0201BA9C 00000010 .text sub_0201BA9C (main_02014D18.o) + 0201BA9C 00000010 .text GroupOamAttributesWrapper (main_02014D18.o) 0201BA9C 00000000 .text $a (main_02014D18.o) 0201BAA8 00000000 .text $d (main_02014D18.o) - 0201BAAC 0000001C .text sub_0201BAAC (main_02014D18.o) + 0201BAAC 0000001C .text CopyAttributesToOamWrapper (main_02014D18.o) 0201BAAC 00000000 .text $a (main_02014D18.o) - 0201BAC8 00000058 .text sub_0201BAC8 (main_02014D18.o) + 0201BAC8 00000058 .text ChangeSimpleObjTexture (main_02014D18.o) 0201BB1C 00000000 .text $d (main_02014D18.o) 0201BB20 0000001C .text sub_0201BB20 (main_02014D18.o) 0201BB20 00000000 .text $a (main_02014D18.o) - 0201BB3C 00000190 .text sub_0201BB3C (main_02014D18.o) + 0201BB3C 00000190 .text InitObjGraphicsControls (main_02014D18.o) 0201BCBC 00000000 .text $d (main_02014D18.o) 0201BCCC 00000028 .text sub_0201BCCC (main_02014D18.o) 0201BCCC 00000000 .text $a (main_02014D18.o) @@ -3847,7 +3847,7 @@ 0201BD80 00000034 .text sub_0201BD80 (main_02014D18.o) 0201BD80 00000000 .text $a (main_02014D18.o) 0201BDB0 00000000 .text $d (main_02014D18.o) - 0201BDB4 00000038 .text sub_0201BDB4 (main_02014D18.o) + 0201BDB4 00000038 .text CopyAttributesToOamBothScreens (main_02014D18.o) 0201BDB4 00000000 .text $a (main_02014D18.o) 0201BDE8 00000000 .text $d (main_02014D18.o) 0201BDEC 00000000 .text $a (main_02014D18.o) @@ -3857,7 +3857,7 @@ 0201BE28 00000000 .text $a (main_02014D18.o) 0201BE58 00000000 .text $d (main_02014D18.o) 0201BE5C 00000000 .text $a (main_02014D18.o) - 0201BE5C 00000028 .text sub_0201BE5C (main_02014D18.o) + 0201BE5C 00000028 .text GroupOamAttributesBothScreens (main_02014D18.o) 0201BE80 00000000 .text $d (main_02014D18.o) 0201BE84 0000002C .text sub_0201BE84 (main_02014D18.o) 0201BE84 00000000 .text $a (main_02014D18.o) @@ -4111,7 +4111,7 @@ 0201F534 00000058 .text ConvertPointersSir0 (main_02014D18.o) 0201F58C 0000000C .text HandleSir0TranslationVeneer (main_02014D18.o) 0201F594 00000000 .text $d (main_02014D18.o) - 0201F598 00000028 .text sub_0201F598 (main_02014D18.o) + 0201F598 00000028 .text FillPaletteInitInfo (main_02014D18.o) 0201F598 00000000 .text $a (main_02014D18.o) 0201F5C0 0000000C .text DecompressAtNormalVeneer (main_02014D18.o) 0201F5C8 00000000 .text $d (main_02014D18.o) @@ -7864,7 +7864,7 @@ 0205882C 00000290 .text sub_0205882C (main_02054E4C.o) 02058AA4 00000000 .text $d (main_02054E4C.o) 02058ABC 00000000 .text $a (main_02054E4C.o) - 02058ABC 00000040 .text sub_02058ABC (main_02054E4C.o) + 02058ABC 00000040 .text OamTileNumberToVramAddress (main_02054E4C.o) 02058AF4 00000000 .text $d (main_02054E4C.o) 02058AFC 00000000 .text $a (main_02054E4C.o) 02058AFC 00000120 .text sub_02058AFC (main_02054E4C.o) @@ -33509,10 +33509,10 @@ 0238A140 00000000 .text $a (overlay_19.o) 0238A17C 00000000 .text $d (overlay_19.o) 0238A180 00000000 .text $a (overlay_19.o) - 0238A180 00000014 .text ov19_0238A180 (overlay_19.o) - 0238A194 00000014 .text ov19_0238A194 (overlay_19.o) - 0238A1A8 00000010 .text ov19_0238A1A8 (overlay_19.o) - 0238A1B8 0000000C .text ov19_0238A1B8 (overlay_19.o) + 0238A180 00000014 .text SetMiracleDrinkStatCountRange (overlay_19.o) + 0238A194 00000014 .text SetBadDrinkStatCountRange (overlay_19.o) + 0238A1A8 00000010 .text GetBarItemResultWeights (overlay_19.o) + 0238A1B8 0000000C .text BarGetDrinkEventWeights (overlay_19.o) 0238A1C0 00000000 .text $d (overlay_19.o) 0238A1C4 000000B0 .text GetRecruitableMonsterAll (overlay_19.o) 0238A1C4 00000000 .text $a (overlay_19.o) @@ -33521,130 +33521,130 @@ 0238A31C 00000000 .text $a (overlay_19.o) 0238A31C 000000B8 .text GetRecruitableMonsterListRestricted (overlay_19.o) 0238A3D0 00000000 .text $d (overlay_19.o) - 0238A3D4 00000018 .text ov19_0238A3D4 (overlay_19.o) + 0238A3D4 00000018 .text BarGetUnlockableDungeonPtr (overlay_19.o) 0238A3D4 00000000 .text $a (overlay_19.o) 0238A3E8 00000000 .text $d (overlay_19.o) - 0238A3EC 0000007C .text ov19_0238A3EC (overlay_19.o) + 0238A3EC 0000007C .text BarPopulateUnlockableDungeons (overlay_19.o) 0238A3EC 00000000 .text $a (overlay_19.o) 0238A464 00000000 .text $d (overlay_19.o) 0238A468 00000000 .text $a (overlay_19.o) - 0238A468 0000003C .text ov19_0238A468 (overlay_19.o) + 0238A468 0000003C .text BarTryClosePortraitBox (overlay_19.o) 0238A4A0 00000000 .text $d (overlay_19.o) 0238A4A4 00000000 .text $a (overlay_19.o) - 0238A4A4 00002104 .text ov19_0238A4A4 (overlay_19.o) + 0238A4A4 00002104 .text BarCaseManagerSub (overlay_19.o) 0238B424 00000000 .text $d (overlay_19.o) 0238B4A4 00000000 .text $a (overlay_19.o) 0238C488 00000000 .text $d (overlay_19.o) 0238C50C 00000000 .text $a (overlay_19.o) - 0238C5A8 00000098 .text ov19_0238C5A8 (overlay_19.o) + 0238C5A8 00000098 .text BarPopulateDrinkableBagItems (overlay_19.o) 0238C63C 00000000 .text $d (overlay_19.o) 0238C640 00000000 .text $a (overlay_19.o) - 0238C640 00000030 .text ov19_0238C640 (overlay_19.o) + 0238C640 00000030 .text BarZeroInitPreprocessorFlagsAndReturnCase (overlay_19.o) 0238C66C 00000000 .text $d (overlay_19.o) - 0238C670 00000054 .text ov19_0238C670 (overlay_19.o) + 0238C670 00000054 .text BarZeroInitBufferAndPreprocessorArgsZero (overlay_19.o) 0238C670 00000000 .text $a (overlay_19.o) 0238C6C0 00000000 .text $d (overlay_19.o) - 0238C6C4 000000EC .text ov19_0238C6C4 (overlay_19.o) + 0238C6C4 000000EC .text BarTrySetEventMainActor (overlay_19.o) 0238C6C4 00000000 .text $a (overlay_19.o) 0238C7AC 00000000 .text $d (overlay_19.o) - 0238C7B0 0000005C .text ov19_0238C7B0 (overlay_19.o) + 0238C7B0 0000005C .text BarZeroInitBufferAndPreprocessorArgsOne (overlay_19.o) 0238C7B0 00000000 .text $a (overlay_19.o) 0238C808 00000000 .text $d (overlay_19.o) 0238C80C 00000000 .text $a (overlay_19.o) - 0238C80C 000000F4 .text ov19_0238C80C (overlay_19.o) + 0238C80C 000000F4 .text BarPrintHpIncreaseString (overlay_19.o) 0238C8F4 00000000 .text $d (overlay_19.o) 0238C900 00000000 .text $a (overlay_19.o) - 0238C900 000000F0 .text ov19_0238C900 (overlay_19.o) + 0238C900 000000F0 .text BarPrintOtherStatIncreaseString (overlay_19.o) 0238C9E0 00000000 .text $d (overlay_19.o) - 0238C9F0 0000013C .text ov19_0238C9F0 (overlay_19.o) + 0238C9F0 0000013C .text BarPrintIqAndSkills (overlay_19.o) 0238C9F0 00000000 .text $a (overlay_19.o) 0238CB20 00000000 .text $d (overlay_19.o) - 0238CB2C 00000094 .text ov19_0238CB2C (overlay_19.o) + 0238CB2C 00000094 .text BarPrintLevelMaxedOutString (overlay_19.o) 0238CB2C 00000000 .text $a (overlay_19.o) 0238CBB8 00000000 .text $d (overlay_19.o) - 0238CBC0 0000012C .text ov19_0238CBC0 (overlay_19.o) + 0238CBC0 0000012C .text BarDrawAndUpdateGainedIqSkills (overlay_19.o) 0238CBC0 00000000 .text $a (overlay_19.o) 0238CCDC 00000000 .text $d (overlay_19.o) - 0238CCEC 000001D4 .text ov19_0238CCEC (overlay_19.o) + 0238CCEC 000001D4 .text BarUpdateDrinkEventNewStats (overlay_19.o) 0238CCEC 00000000 .text $a (overlay_19.o) 0238CEBC 00000000 .text $d (overlay_19.o) - 0238CEC0 00000218 .text ov19_0238CEC0 (overlay_19.o) + 0238CEC0 00000218 .text BarPrintReactionsAndStatIncreases (overlay_19.o) 0238CEC0 00000000 .text $a (overlay_19.o) 0238D0BC 00000000 .text $d (overlay_19.o) - 0238D0D8 00000238 .text ov19_0238D0D8 (overlay_19.o) + 0238D0D8 00000238 .text BarHandleDrinkEventSubcase (overlay_19.o) 0238D0D8 00000000 .text $a (overlay_19.o) 0238D308 00000000 .text $d (overlay_19.o) - 0238D310 00000078 .text ov19_0238D310 (overlay_19.o) + 0238D310 00000078 .text BarPostDrinkCaseForCustomer (overlay_19.o) 0238D310 00000000 .text $a (overlay_19.o) 0238D384 00000000 .text $d (overlay_19.o) 0238D388 00000000 .text $a (overlay_19.o) - 0238D388 00000018 .text ov19_0238D388 (overlay_19.o) - 0238D3A0 00000078 .text ov19_0238D3A0 (overlay_19.o) - 0238D418 00000038 .text ov19_0238D418 (overlay_19.o) - 0238D450 0000002C .text ov19_0238D450 (overlay_19.o) + 0238D388 00000018 .text BarMaybeIsClosedUnkStringIdMenu (overlay_19.o) + 0238D3A0 00000078 .text BarCreateUnkStringIdMenu (overlay_19.o) + 0238D418 00000038 .text GetUnkStringIdMenuResult (overlay_19.o) + 0238D450 0000002C .text BarTryShowPortrait (overlay_19.o) 0238D478 00000000 .text $d (overlay_19.o) 0238D47C 00000000 .text $a (overlay_19.o) - 0238D47C 00000028 .text ov19_0238D47C (overlay_19.o) + 0238D47C 00000028 .text BarTryHidePortrait (overlay_19.o) 0238D4A0 00000000 .text $d (overlay_19.o) 0238D4A4 00000000 .text $a (overlay_19.o) - 0238D4A4 00000040 .text ov19_0238D4A4 (overlay_19.o) + 0238D4A4 00000040 .text BarInventoryMenuCallback (overlay_19.o) 0238D4E0 00000000 .text $d (overlay_19.o) 0238D4E4 00000000 .text $a (overlay_19.o) - 0238D4E4 00000038 .text ov19_0238D4E4 (overlay_19.o) + 0238D4E4 00000038 .text BarTryCloseInventoryMenu (overlay_19.o) 0238D518 00000000 .text $d (overlay_19.o) 0238D51C 00000000 .text $a (overlay_19.o) - 0238D51C 00000050 .text ov19_0238D51C (overlay_19.o) + 0238D51C 00000050 .text BarTryCloseTeamMovesMenu (overlay_19.o) 0238D568 00000000 .text $d (overlay_19.o) 0238D56C 00000000 .text $a (overlay_19.o) - 0238D56C 00000090 .text ov19_0238D56C (overlay_19.o) + 0238D56C 00000090 .text SpindaBarEntry (overlay_19.o) 0238D5F0 00000000 .text $d (overlay_19.o) 0238D5FC 00000000 .text $a (overlay_19.o) - 0238D5FC 00000090 .text ov19_0238D5FC (overlay_19.o) + 0238D5FC 00000090 .text SpindaBarResume (overlay_19.o) 0238D684 00000000 .text $d (overlay_19.o) 0238D68C 00000000 .text $a (overlay_19.o) - 0238D68C 0000000C .text ov19_0238D68C (overlay_19.o) + 0238D68C 0000000C .text SpindaBarDestruct (overlay_19.o) 0238D694 00000000 .text $d (overlay_19.o) 0238D698 00000000 .text $a (overlay_19.o) - 0238D698 00000448 .text ov19_0238D698 (overlay_19.o) + 0238D698 00000448 .text SpindaBarMenuUpdate (overlay_19.o) 0238DACC 00000000 .text $d (overlay_19.o) 0238DAE0 00000864 .rodata .rodata (overlay_19.o) - 0238DAE0 00000000 .rodata OVERLAY19_UNKNOWN_TABLE__NA_238DAE0 (overlay_19.o) + 0238DAE0 00000000 .rodata BAR_MIRACLE_EVENT_WEIGHTS (overlay_19.o) 0238DAE8 00000000 .rodata BAR_UNLOCKABLE_DUNGEONS_TABLE (overlay_19.o) 0238DAF4 00000000 .rodata BAR_RECRUITABLE_MONSTER_TABLE (overlay_19.o) 0238DBCC 00000000 .rodata BAR_AVAILABLE_ITEMS (overlay_19.o) - 0238E178 00000000 .rodata OVERLAY19_UNKNOWN_STRING_IDS__NA_238E178 (overlay_19.o) - 0238E17E 00000000 .rodata ov19_0238E17E (overlay_19.o) - 0238E184 00000000 .rodata ov19_0238E184 (overlay_19.o) - 0238E18A 00000000 .rodata ov19_0238E18A (overlay_19.o) - 0238E190 00000000 .rodata ov19_0238E190 (overlay_19.o) - 0238E196 00000000 .rodata ov19_0238E196 (overlay_19.o) - 0238E19C 00000000 .rodata ov19_0238E19C (overlay_19.o) - 0238E1A4 00000000 .rodata OVERLAY19_UNKNOWN_STRUCT__NA_238E1A4 (overlay_19.o) + 0238E178 00000000 .rodata BAR_STAT_REACTION_STRINGS (overlay_19.o) + 0238E17E 00000000 .rodata GOOD_DRINK_REACTION_STRINGS (overlay_19.o) + 0238E184 00000000 .rodata BAR_STAT_CHANGE_STRINGS (overlay_19.o) + 0238E18A 00000000 .rodata NEUTRAL_DRINK_REACTION_STRINGS (overlay_19.o) + 0238E190 00000000 .rodata BAD_DRINK_REACTION_STRINGS (overlay_19.o) + 0238E196 00000000 .rodata BAR_IQ_CHANGE_STRINGS (overlay_19.o) + 0238E19C 00000000 .rodata BAR_IQ_UNABLE_TO_CHANGE_STRINGS (overlay_19.o) + 0238E1A4 00000000 .rodata GOURMET_PORTRAIT_OFFSET_TABLE (overlay_19.o) 0238E1AC 00000000 .rodata ov19_0238E1AC (overlay_19.o) 0238E1B4 00000000 .rodata ov19_0238E1B4 (overlay_19.o) 0238E1BC 00000000 .rodata ov19_0238E1BC (overlay_19.o) 0238E1C4 00000000 .rodata ov19_0238E1C4 (overlay_19.o) - 0238E1CC 00000000 .rodata OVERLAY19_UNKNOWN_STRING_IDS__NA_238E1CC (overlay_19.o) + 0238E1CC 00000000 .rodata BAR_STAT_NAME_STRINGS (overlay_19.o) 0238E1D8 00000000 .rodata BAR_WINDOW_PARAMS_1 (overlay_19.o) 0238E1E8 00000000 .rodata BAR_WINDOW_PARAMS_2 (overlay_19.o) 0238E1F8 00000000 .rodata BAR_WINDOW_PARAMS_3 (overlay_19.o) 0238E208 00000000 .rodata BAR_MENU_ITEMS_CONFIRM_1 (overlay_19.o) 0238E220 00000000 .rodata BAR_MENU_ITEMS_CONFIRM_2 (overlay_19.o) - 0238E238 00000000 .rodata OVERLAY19_UNKNOWN_STRING_IDS__NA_238E238 (overlay_19.o) + 0238E238 00000000 .rodata BAR_DRINK_NAMES_STRINGS (overlay_19.o) 0238E250 00000000 .rodata BAR_MAIN_MENU_ITEMS (overlay_19.o) 0238E270 00000000 .rodata BAR_SUBMENU_ITEMS_1 (overlay_19.o) 0238E290 00000000 .rodata BAR_SUBMENU_ITEMS_2 (overlay_19.o) - 0238E2C0 00000000 .rodata ov19_0238E2C0 (overlay_19.o) - 0238E2C4 00000000 .rodata ov19_0238E2C4 (overlay_19.o) - 0238E2D0 00000000 .rodata ov19_0238E2D0 (overlay_19.o) - 0238E2E8 00000000 .rodata ov19_0238E2E8 (overlay_19.o) - 0238E304 00000000 .rodata ov19_0238E304 (overlay_19.o) - 0238E324 00000000 .rodata ov19_0238E324 (overlay_19.o) + 0238E2C0 00000000 .rodata BAR_NEW_LINE_CHAR (overlay_19.o) + 0238E2C4 00000000 .rodata BAR_ME_PLAY_TEXT_TAG (overlay_19.o) + 0238E2D0 00000000 .rodata DEBUG_MESSAGE_REQUEST_STR (overlay_19.o) + 0238E2E8 00000000 .rodata DEBUG_MESSAGE_REQUEST_AND_RETURN_STR (overlay_19.o) + 0238E304 00000000 .rodata DEBUG_MESSAGE_BEFORE_SET_STR (overlay_19.o) + 0238E324 00000000 .rodata DEBUG_MESSAGE_AFTER_SET_STR (overlay_19.o) #>0238E344 SDK_OVERLAY.OVY_19.SINIT_START (linker command file) #>0238E348 SDK_OVERLAY.OVY_19.SINIT_END (linker command file) #>0238E360 SDK_OVERLAY.OVY_19.TEXT_END (linker command file) #>0238E360 SDK_OVERLAY.OVY_19.DATA_START (linker command file) - 0238E360 00000000 .data OVERLAY19_UNKNOWN_POINTER__NA_238E360 (overlay_19.o) + 0238E360 00000000 .data BAR_MENU_PRIOR_CHOICE_INDICES (overlay_19.o) 0238E360 00000010 .data .data (overlay_19.o) #>0238E380 SDK_OVERLAY.OVY_19.DATA_END (linker command file) #>0238E380 SDK_OVERLAY.OVY_19.END (linker command file) @@ -34938,7 +34938,7 @@ 022E0F14 00000018 .text ov29_022E0F14 (overlay_29_022E08A0.o) 022E0F28 00000000 .text $d (overlay_29_022E08A0.o) 022E0F2C 00000000 .text $a (overlay_29_022E08A0.o) - 022E0F2C 00000040 .text ov29_022E0F2C (overlay_29_022E08A0.o) + 022E0F2C 00000040 .text OamTileNumberToVramAddressOv29 (overlay_29_022E08A0.o) 022E0F64 00000000 .text $d (overlay_29_022E08A0.o) 022E0F6C 00000000 .text $a (overlay_29_022E08A0.o) 022E0F6C 0000028C .text ov29_022E0F6C (overlay_29_022E08A0.o) @@ -35763,7 +35763,7 @@ 022EA62C 00000020 .text ov29_022EA62C (overlay_29_022E9618.o) 022EA644 00000000 .text $d (overlay_29_022E9618.o) 022EA64C 00000000 .text $a (overlay_29_022E9618.o) - 022EA64C 000000CC .text ov29_022EA64C (overlay_29_022E9618.o) + 022EA64C 000000CC .text AnimateWaterShadows (overlay_29_022E9618.o) 022EA708 00000000 .text $d (overlay_29_022E9618.o) 022EA718 00000000 .text $a (overlay_29_022E9618.o) 022EA718 000000F4 .text DisplayAnimatedNumbers (overlay_29_022E9618.o) @@ -37000,7 +37000,7 @@ 02303DFC 00000000 .text $d (overlay_29_02302A5C.o) 02303E0C 00000000 .text $a (overlay_29_02302A5C.o) 02303E0C 00000050 .text ov29_02303E0C (overlay_29_02302A5C.o) - 02303E5C 000000BC .text ov29_02303E5C (overlay_29_02302A5C.o) + 02303E5C 000000BC .text DisplayMonsterShadow (overlay_29_02302A5C.o) 02303F0C 00000000 .text $d (overlay_29_02302A5C.o) 02303F18 00000000 .text $a (overlay_29_02302A5C.o) 02303F18 000007D0 .text ov29_02303F18 (overlay_29_02302A5C.o) @@ -41603,5 +41603,5 @@ 00000000 00000000 00004000 check.ITCM 00000000 00000000 00002880 check.DTCM -# Link start time: Tue Jun 02 22:59:26 2026 -# Link end time: Tue Jun 02 22:59:27 2026 +# Link start time: Wed Jun 03 04:14:22 2026 +# Link end time: Wed Jun 03 04:14:23 2026